From 3843a5378a5d68e91c763e75eb57a50e742f124a Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Thu, 1 Sep 2016 23:31:34 +0300
Subject: [PATCH 001/340] migrated to 2.0

---
 .consulo/compiler.xml                         |  5 ++-
 .consulo/modules.xml                          | 36 +++++++++----------
 .../actionscript/ActionScriptFileType.java    |  2 +-
 .../lang/ActionScriptLanguageVersion.java     |  6 ++--
 .../ClientJavaScriptModuleExtension.java      | 16 ++++-----
 .../ClientJavaScriptModuleExtensionPanel.java |  2 +-
 ...lientJavaScriptMutableModuleExtension.java |  8 ++---
 ...ntJavaScriptPredefinedBundlesProvider.java |  6 ++--
 .../module/sdk/ClientJavaScriptSdkType.java   |  6 ++--
 .../lang/EcmaScript4JavaScriptVersion.java    |  8 ++---
 .../lang/EcmaScript6JavaScriptVersion.java    |  8 ++---
 .../javascript/lang/EcmaScriptFileType.java   |  2 +-
 ...inConcatenatedStringLiteralsIntention.java |  2 +-
 .../intention/test/TestManager.java           |  2 +-
 .../lang/JavaScript16LanguageVersion.java     |  6 ++--
 .../lang/JavaScript17LanguageVersion.java     |  6 ++--
 .../lang/JavaScript185LanguageVersion.java    |  6 ++--
 .../lang/JavaScript18LanguageVersion.java     |  6 ++--
 .../JsonBreadcrumbsInfoProvider.java          |  2 +-
 .../json/jom/JomIconDescriptorUpdater.java    |  6 ++--
 .../mustbe/consulo/json/jom/JomManager.java   |  2 +-
 .../JomModeAsJsonFileDescriptorProvider.java  |  2 +-
 .../jom/proxy/JomProxyInvocationHandler.java  |  2 +-
 .../json/jom/proxy/JomValueConverter.java     |  2 +-
 .../json/jom/proxy/impl/JomBooleanValue.java  |  2 +-
 .../jom/proxy/impl/JomCollectionValue.java    |  2 +-
 .../json/jom/proxy/impl/JomMapConverter.java  |  2 +-
 .../proxy/impl/JomNullableNumberValue.java    |  2 +-
 .../jom/proxy/impl/JomStringConverter.java    |  2 +-
 .../json/lang/JsonJavaScriptParser.java       |  2 +-
 .../json/lang/JsonJavaScriptVersion.java      |  8 ++---
 .../JsonFileDescriptorProvider.java           |  2 +-
 .../JsonFileDescriptorProviders.java          |  2 +-
 .../completion/JsonCompletionContributor.java | 16 ++++-----
 ...ByAnotherPsiElementEditorNotification.java |  4 +--
 ...therPsiElementJsonDescriptionProvider.java |  2 +-
 ...escriptionByAnotherPsiElementProvider.java |  4 +--
 ...scriptionByAnotherPsiElementRegistrar.java |  4 +--
 .../descriptor/JsonPropertyDescriptor.java    |  2 +-
 .../PropertyValidationInspection.java         |  2 +-
 .../reference/JsonPropertyNameReference.java  |  2 +-
 .../JsonPropertyNameReferenceProvider.java    |  2 +-
 .../JSDocumentationProvider.java              |  2 +-
 .../lang/javascript/JSElementTypes.java       |  2 +-
 .../lang/javascript/JSLanguageInjector.java   |  4 +--
 .../javascript/JSSmartEnterProcessor.java     |  2 +-
 .../lang/javascript/JSTokenTypes.java         |  6 ++--
 .../lang/javascript/JavaScriptFileType.java   |  2 +-
 .../JavaScriptTargetElementUtilEx.java        |  4 +--
 .../generation/JSNamedElementNode.java        |  2 +-
 .../JavaScriptHighlightVisitor.java           |  2 +-
 .../javascript/index/JSItemPresentation.java  |  4 +--
 .../JSUnresolvedVariableInspection.java       |  2 +-
 .../inspections/qucikFixes/BaseCreateFix.java |  2 +-
 .../qucikFixes/CreateJSFunctionFixBase.java   |  2 +-
 .../CreateJSFunctionOrMethodFix.java          |  2 +-
 .../lang/javascript/psi/JSExpression.java     |  2 +-
 .../lang/javascript/psi/JSFunction.java       |  2 +-
 .../javascript/psi/JSLabeledStatement.java    |  2 +-
 .../lang/javascript/psi/JSParameter.java      |  2 +-
 .../javascript/psi/JSPrefixExpression.java    |  2 +-
 .../lang/javascript/psi/JSProperty.java       |  2 +-
 .../lang/javascript/psi/JSReferenceList.java  |  2 +-
 .../psi/JSSimpleLiteralExpression.java        |  2 +-
 .../javascript/psi/JSStubElementType.java     |  2 +-
 .../lang/javascript/psi/JSVariable.java       |  2 +-
 .../lang/javascript/psi/impl/JSClassImpl.java |  2 +-
 .../javascript/psi/impl/JSExpressionImpl.java |  2 +-
 .../psi/impl/JSExpressionStatementImpl.java   |  2 +-
 .../psi/impl/JSFunctionBaseImpl.java          |  2 +-
 .../psi/impl/JSFunctionExpressionImpl.java    |  2 +-
 .../javascript/psi/impl/JSFunctionImpl.java   |  2 +-
 .../psi/impl/JSLiteralExpressionImpl.java     |  2 +-
 .../psi/impl/JSNewExpressionImpl.java         |  2 +-
 .../javascript/psi/impl/JSParameterImpl.java  |  2 +-
 .../psi/impl/JSPostfixExpressionImpl.java     |  2 +-
 .../psi/impl/JSPrefixExpressionImpl.java      |  2 +-
 .../javascript/psi/impl/JSPropertyImpl.java   |  2 +-
 .../javascript/psi/impl/JSPsiImplUtils.java   |  2 +-
 .../psi/impl/JSReferenceExpressionImpl.java   |  2 +-
 .../psi/impl/JSReferenceListImpl.java         |  2 +-
 .../javascript/psi/impl/JSReferenceSet.java   |  2 +-
 .../psi/impl/JSVariableBaseImpl.java          |  2 +-
 ...efaultJSPropertyNameReferenceProvider.java |  2 +-
 .../reference/JSPropertyNameReference.java    |  2 +-
 .../JSPropertyNameReferenceProvider.java      |  4 +--
 .../javascript/psi/resolve/JSResolveUtil.java |  4 +--
 .../psi/resolve/ResolveProcessor.java         |  2 +-
 .../psi/resolve/VariantsProcessor.java        |  2 +-
 .../javascript/psi/util/JSLookupUtil.java     |  4 +--
 .../JSStructureItemPresentation.java          |  4 +--
 .../types/JSAttributeElementType.java         |  2 +-
 .../types/JSAttributeListElementType.java     |  2 +-
 .../types/JSAttributeNameValuePairType.java   |  2 +-
 .../javascript/types/JSClassElementType.java  |  2 +-
 .../types/JSFunctionElementType.java          |  2 +-
 .../types/JSImportStatementElementType.java   |  2 +-
 .../types/JSIncludeDirectiveElementType.java  |  2 +-
 .../JSNamespaceDeclarationElementType.java    |  2 +-
 .../types/JSPackageStatementElementType.java  |  2 +-
 .../types/JSParameterElementType.java         |  2 +-
 .../types/JSParameterListElementType.java     |  2 +-
 .../types/JSReferenceListElementType.java     |  2 +-
 .../types/JSUseNamespaceDirectiveType.java    |  2 +-
 .../types/JSVarStatementElementType.java      |  2 +-
 .../types/JSVariableElementType.java          |  2 +-
 .../UpdateJavaScriptFileCopyright.java        |  2 +-
 ...UpdateJavaScriptFileCopyrightProvider.java |  2 +-
 .../ide/JavaScriptIconDescriptorUpdater.java  |  7 ++--
 .../actions/JavaScriptCreateFileAction.java   |  6 ++--
 .../JavaScriptQuickFixFactory.java            |  2 +-
 ...avaScriptKeywordCompletionContributor.java |  6 ++--
 .../JavaScriptSyntaxHighlightFactory.java     |  4 +--
 .../lang/BaseJavaScriptLanguageVersion.java   | 10 ++----
 .../lang/JavaScript15LanguageVersion.java     |  6 ++--
 .../lang/JavaScriptFileTypeWithVersion.java   |  2 +-
 .../JavaScriptLanguageVersionResolver.java    |  4 +--
 .../lang/JavaScriptParsingDefinition.java     |  4 +--
 .../JavaScriptRegexpMultiHostInjector.java    |  2 +-
 .../lang/JavaScriptVersionUtil.java           |  2 +-
 .../lang/StandardJavaScriptVersions.java      |  2 +-
 .../lang/parsing/JavaScriptParser.java        |  2 +-
 .../lang/psi/JavaScriptPrimitiveType.java     |  2 +-
 .../lang/psi/JavaScriptSimpleType.java        |  2 +-
 .../javascript/lang/psi/JavaScriptType.java   |  2 +-
 .../lang/psi/impl/JavaScriptClassType.java    |  2 +-
 .../extension/JavaScriptModuleExtension.java  |  4 +--
 .../JavaScriptMutableModuleExtension.java     |  4 +--
 .../psi/JavaScriptLambdaExpression.java       |  2 +-
 .../impl/JavaScriptLambdaExpressionImpl.java  |  2 +-
 .../javascript/run/debug/V8DebugProcess.java  |  2 +-
 131 files changed, 209 insertions(+), 233 deletions(-)

diff --git a/.consulo/compiler.xml b/.consulo/compiler.xml
index 1e7c90e7..32463230 100644
--- a/.consulo/compiler.xml
+++ b/.consulo/compiler.xml
@@ -7,7 +7,7 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotation-processing>
-    <bytecode-target-level target="1.6" />
+    <bytecode-target-level target="1.8" />
   </component>
   <component name="JavacCompilerConfiguration">
     <option name="MAXIMUM_HEAP_SIZE" value="512" />
@@ -15,5 +15,4 @@
   <component name="ResourceCompilerConfiguration">
     <resourceExtensions />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.consulo/modules.xml b/.consulo/modules.xml
index 8ededfba..7915c07a 100644
--- a/.consulo/modules.xml
+++ b/.consulo/modules.xml
@@ -4,8 +4,8 @@
     <modules>
       <module name="consulo-javascript" dirurl="file://$PROJECT_DIR$" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo 1.SNAPSHOT" custom-plugin-dir-url="file://$MODULE_DIR$/dep" />
-          <extension id="java" sdk-module-name="" sdk-name="1.6" language-level-module-name="" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo SNAPSHOT" custom-plugin-dir-url="file://$MODULE_DIR$/dep" />
+          <extension id="java" sdk-module-name="" sdk-name="1.8" language-level-module-name="" language-level-name="JDK_1_8" special-dir-location="SOURCE_DIR" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
@@ -37,8 +37,8 @@
       </module>
       <module name="inspections" dirurl="file://$PROJECT_DIR$/inspections" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo 1.SNAPSHOT" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
-          <extension id="java" sdk-module-name="" sdk-name="1.6" language-level-module-name="" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -61,8 +61,8 @@
       </module>
       <module name="intentions" dirurl="file://$PROJECT_DIR$/intentions" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo 1.SNAPSHOT" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
-          <extension id="java" sdk-module-name="" sdk-name="1.6" language-level-module-name="" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -122,8 +122,8 @@
       </module>
       <module name="debugger-impl/debugger-impl" dirurl="file://$PROJECT_DIR$/debugger-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="" sdk-name="1.6" language-level-module-name="" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -136,8 +136,8 @@
       </module>
       <module name="debugger-impl/v8-debugger-impl" dirurl="file://$PROJECT_DIR$/v8-debugger-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="" sdk-name="1.6" language-level-module-name="" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -177,8 +177,8 @@
       </module>
       <module name="javascript16-impl" dirurl="file://$PROJECT_DIR$/javascript16-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="" sdk-name="1.6" language-level-module-name="" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -190,8 +190,8 @@
       </module>
       <module name="javascript17-impl" dirurl="file://$PROJECT_DIR$/javascript17-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="" sdk-name="1.6" language-level-module-name="" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -203,8 +203,8 @@
       </module>
       <module name="javascript18-impl" dirurl="file://$PROJECT_DIR$/javascript18-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="" sdk-name="1.6" language-level-module-name="" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -217,8 +217,8 @@
       </module>
       <module name="ecmascript6-impl" dirurl="file://$PROJECT_DIR$/ecmascript6-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="" sdk-name="1.6" language-level-module-name="" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
diff --git a/actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileType.java b/actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileType.java
index ada17144..1b0bda73 100644
--- a/actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileType.java
+++ b/actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileType.java
@@ -23,7 +23,7 @@
 import org.mustbe.consulo.actionscript.lang.ActionScriptLanguageVersion;
 import org.mustbe.consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
diff --git a/actionscript-impl/src/org/mustbe/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/actionscript-impl/src/org/mustbe/consulo/actionscript/lang/ActionScriptLanguageVersion.java
index f7abbfb7..0a0a2010 100644
--- a/actionscript-impl/src/org/mustbe/consulo/actionscript/lang/ActionScriptLanguageVersion.java
+++ b/actionscript-impl/src/org/mustbe/consulo/actionscript/lang/ActionScriptLanguageVersion.java
@@ -1,7 +1,6 @@
 package org.mustbe.consulo.actionscript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import org.mustbe.consulo.javascript.lang.parsing.EcmaScript4Parser;
@@ -10,7 +9,6 @@
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
 import com.intellij.lang.javascript.highlighting.JSHighlighter;
 import com.intellij.lexer.Lexer;
-import com.intellij.openapi.project.Project;
 import consulo.lombok.annotations.Lazy;
 
 /**
@@ -42,7 +40,7 @@ public String getPresentableName()
 
 	@NotNull
 	@Override
-	public PsiParser createParser(@Nullable Project project)
+	public PsiParser createParser()
 	{
 		return new EcmaScript4Parser();
 	}
@@ -56,7 +54,7 @@ public JSHighlighter getSyntaxHighlighter()
 
 	@NotNull
 	@Override
-	public Lexer createLexer(@Nullable Project project)
+	public Lexer createLexer()
 	{
 		return new JavaScriptParsingFlexLexer(myDialectOptionHolder);
 	}
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index 9e0b38ea..c9365369 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -1,26 +1,26 @@
 package org.mustbe.consulo.javascript.client.module.extension;
 
-import org.consulo.module.extension.ModuleInheritableNamedPointer;
-import org.consulo.module.extension.impl.ModuleExtensionImpl;
-import org.consulo.module.extension.impl.ModuleInheritableNamedPointerImpl;
-import org.consulo.util.pointers.NamedPointer;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
 import org.mustbe.consulo.javascript.client.module.sdk.ClientJavaScriptSdkType;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import org.mustbe.consulo.javascript.lang.StandardJavaScriptVersions;
 import org.mustbe.consulo.javascript.module.extension.JavaScriptModuleExtension;
-import org.mustbe.consulo.sdk.SdkUtil;
-import com.intellij.lang.LanguageVersion;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkTable;
 import com.intellij.openapi.projectRoots.SdkType;
-import com.intellij.openapi.roots.ModuleRootLayer;
+import consulo.annotations.RequiredReadAction;
+import consulo.bundle.SdkUtil;
+import consulo.extension.impl.ModuleExtensionImpl;
+import consulo.lang.LanguageVersion;
+import consulo.module.extension.ModuleInheritableNamedPointer;
+import consulo.module.extension.impl.ModuleInheritableNamedPointerImpl;
+import consulo.roots.ModuleRootLayer;
+import consulo.util.pointers.NamedPointer;
 
 /**
  * @author VISTALL
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index eede2cc2..d992cfa8 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -27,7 +27,7 @@
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import org.mustbe.consulo.javascript.lang.StandardJavaScriptVersions;
 import org.mustbe.consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.ui.VerticalFlowLayout;
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index 1f9d3b4b..a302c42a 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -2,15 +2,15 @@
 
 import javax.swing.JComponent;
 
-import org.consulo.module.extension.MutableModuleInheritableNamedPointer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredDispatchThread;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import org.mustbe.consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
-import com.intellij.lang.LanguageVersion;
 import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.roots.ModuleRootLayer;
+import consulo.annotations.RequiredDispatchThread;
+import consulo.lang.LanguageVersion;
+import consulo.module.extension.MutableModuleInheritableNamedPointer;
+import consulo.roots.ModuleRootLayer;
 
 /**
  * @author VISTALL
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index cabe0bc7..20ba444e 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -5,17 +5,17 @@
 import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.bundle.PredefinedBundlesProvider;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManager;
 import com.intellij.ide.plugins.cl.PluginClassLoader;
 import com.intellij.openapi.projectRoots.SdkModificator;
 import com.intellij.openapi.projectRoots.impl.SdkImpl;
-import com.intellij.openapi.roots.types.BinariesOrderRootType;
-import com.intellij.openapi.roots.types.SourcesOrderRootType;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
+import consulo.bundle.PredefinedBundlesProvider;
+import consulo.roots.types.BinariesOrderRootType;
+import consulo.roots.types.SourcesOrderRootType;
 
 /**
  * @author VISTALL
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index e3990ee3..ed194832 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -2,14 +2,14 @@
 
 import javax.swing.Icon;
 
-import consulo.lombok.annotations.Lazy;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.projectRoots.SdkType;
 import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.roots.types.BinariesOrderRootType;
-import com.intellij.openapi.roots.types.SourcesOrderRootType;
+import consulo.lombok.annotations.Lazy;
+import consulo.roots.types.BinariesOrderRootType;
+import consulo.roots.types.SourcesOrderRootType;
 
 /**
  * @author VISTALL
diff --git a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java b/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
index 146ee29b..26a3ad32 100644
--- a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
+++ b/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
@@ -1,15 +1,13 @@
 package org.mustbe.consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.DeprecationInfo;
 import org.mustbe.consulo.javascript.lang.parsing.EcmaScript4Parser;
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
 import com.intellij.lang.javascript.highlighting.JSHighlighter;
 import com.intellij.lexer.Lexer;
-import com.intellij.openapi.project.Project;
+import consulo.annotations.DeprecationInfo;
 
 /**
  * @author VISTALL
@@ -29,7 +27,7 @@ public EcmaScript4JavaScriptVersion()
 
 	@NotNull
 	@Override
-	public PsiParser createParser(@Nullable Project project)
+	public PsiParser createParser()
 	{
 		return new EcmaScript4Parser();
 	}
@@ -43,7 +41,7 @@ public JSHighlighter getSyntaxHighlighter()
 
 	@NotNull
 	@Override
-	public Lexer createLexer(@Nullable Project project)
+	public Lexer createLexer()
 	{
 		return new JavaScriptParsingFlexLexer(myDialectOptionHolder);
 	}
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index f1559e80..aa9ba670 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -16,17 +16,15 @@
 
 package org.mustbe.consulo.javascript.lang;
 
-import consulo.lombok.annotations.Lazy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import org.mustbe.consulo.javascript.lang.lexer.EcmaScript6Lexer;
 import org.mustbe.consulo.javascript.lang.parsing.EcmaScript6Parser;
 import com.intellij.lang.PsiParser;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Factory;
+import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -70,7 +68,7 @@ public String getPresentableName()
 	}
 	@NotNull
 	@Override
-	public Lexer createLexer(@Nullable Project project)
+	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
@@ -84,7 +82,7 @@ public SyntaxHighlighter getSyntaxHighlighter()
 
 	@NotNull
 	@Override
-	public PsiParser createParser(@Nullable Project project)
+	public PsiParser createParser()
 	{
 		return new EcmaScript6Parser();
 	}
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileType.java b/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileType.java
index 17719e84..af42dc3b 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileType.java
@@ -20,7 +20,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 1b88216f..63e625dd 100644
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -19,7 +19,7 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestManager.java b/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestManager.java
index 33ec43db..5a627a90 100644
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestManager.java
+++ b/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestManager.java
@@ -26,12 +26,12 @@
 import java.util.Map;
 
 import org.jetbrains.annotations.NonNls;
-import com.intellij.ide.highlighter.ZipArchiveFileType;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import consulo.fileTypes.ZipArchiveFileType;
 
 public abstract class TestManager {
 
diff --git a/javascript16-impl/src/org/mustbe/consulo/javascript/lang/JavaScript16LanguageVersion.java b/javascript16-impl/src/org/mustbe/consulo/javascript/lang/JavaScript16LanguageVersion.java
index a6d71c04..fbaa1b29 100644
--- a/javascript16-impl/src/org/mustbe/consulo/javascript/lang/JavaScript16LanguageVersion.java
+++ b/javascript16-impl/src/org/mustbe/consulo/javascript/lang/JavaScript16LanguageVersion.java
@@ -16,15 +16,13 @@
 
 package org.mustbe.consulo.javascript.lang;
 
-import consulo.lombok.annotations.Lazy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import org.mustbe.consulo.javascript.lang.lexer.JavaScript16Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Factory;
+import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -62,7 +60,7 @@ public String getPresentableName()
 
 	@NotNull
 	@Override
-	public Lexer createLexer(@Nullable Project project)
+	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
diff --git a/javascript17-impl/src/org/mustbe/consulo/javascript/lang/JavaScript17LanguageVersion.java b/javascript17-impl/src/org/mustbe/consulo/javascript/lang/JavaScript17LanguageVersion.java
index 5be12e27..af8eddfe 100644
--- a/javascript17-impl/src/org/mustbe/consulo/javascript/lang/JavaScript17LanguageVersion.java
+++ b/javascript17-impl/src/org/mustbe/consulo/javascript/lang/JavaScript17LanguageVersion.java
@@ -16,15 +16,13 @@
 
 package org.mustbe.consulo.javascript.lang;
 
-import consulo.lombok.annotations.Lazy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import org.mustbe.consulo.javascript.lang.lexer.JavaScript17Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Factory;
+import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -62,7 +60,7 @@ public String getPresentableName()
 
 	@NotNull
 	@Override
-	public Lexer createLexer(@Nullable Project project)
+	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
diff --git a/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript185LanguageVersion.java b/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript185LanguageVersion.java
index 85bbd75b..a4fc3d6f 100644
--- a/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript185LanguageVersion.java
+++ b/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript185LanguageVersion.java
@@ -16,15 +16,13 @@
 
 package org.mustbe.consulo.javascript.lang;
 
-import consulo.lombok.annotations.Lazy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import org.mustbe.consulo.javascript.lang.lexer.JavaScript17Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Factory;
+import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -62,7 +60,7 @@ public String getPresentableName()
 
 	@NotNull
 	@Override
-	public Lexer createLexer(@Nullable Project project)
+	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
diff --git a/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript18LanguageVersion.java b/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript18LanguageVersion.java
index 54491461..81ce0657 100644
--- a/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript18LanguageVersion.java
+++ b/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript18LanguageVersion.java
@@ -16,15 +16,13 @@
 
 package org.mustbe.consulo.javascript.lang;
 
-import consulo.lombok.annotations.Lazy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import org.mustbe.consulo.javascript.lang.lexer.JavaScript17Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Factory;
+import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -62,7 +60,7 @@ public String getPresentableName()
 
 	@NotNull
 	@Override
-	public Lexer createLexer(@Nullable Project project)
+	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java b/json-javascript-impl/src/org/mustbe/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
index c3873797..4e984637 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import org.mustbe.consulo.json.JsonFileType;
 import com.intellij.lang.Language;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomIconDescriptorUpdater.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomIconDescriptorUpdater.java
index b879d3cb..d12eb2ab 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -17,11 +17,11 @@
 package org.mustbe.consulo.json.jom;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
-import com.intellij.ide.IconDescriptor;
-import com.intellij.ide.IconDescriptorUpdater;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import consulo.annotations.RequiredReadAction;
+import consulo.ide.IconDescriptor;
+import consulo.ide.IconDescriptorUpdater;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomManager.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomManager.java
index 73d84e04..3f71a8b6 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomManager.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomManager.java
@@ -19,7 +19,7 @@
 import consulo.lombok.annotations.ProjectService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.JsonFileType;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.openapi.fileTypes.FileType;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
index 9e716c65..4a21bed7 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
@@ -28,7 +28,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.validation.JsonFileDescriptorProvider;
 import org.mustbe.consulo.json.validation.NativeArray;
 import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomProxyInvocationHandler.java
index fcf2f88b..24d7a0d3 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomProxyInvocationHandler.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomProxyInvocationHandler.java
@@ -6,7 +6,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.jom.JomElement;
 import org.mustbe.consulo.json.jom.JomUtil;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomValueConverter.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomValueConverter.java
index 6d2ceb2c..e4c268fa 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomValueConverter.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomValueConverter.java
@@ -11,7 +11,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.jom.JomElement;
 import org.mustbe.consulo.json.jom.proxy.impl.JomBooleanValue;
 import org.mustbe.consulo.json.jom.proxy.impl.JomCollectionValue;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomBooleanValue.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomBooleanValue.java
index aab388ca..d34a4716 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomBooleanValue.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomBooleanValue.java
@@ -4,7 +4,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
 import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomCollectionValue.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomCollectionValue.java
index 44f842e8..d6c30f4e 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomCollectionValue.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomCollectionValue.java
@@ -5,7 +5,7 @@
 import java.util.Collection;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
 import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomMapConverter.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomMapConverter.java
index 83574d7e..c33b44dc 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomMapConverter.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomMapConverter.java
@@ -6,7 +6,7 @@
 import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
 import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNullableNumberValue.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
index 0e601084..20677c98 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
@@ -4,7 +4,7 @@
 import java.lang.reflect.Type;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
 import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomStringConverter.java b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomStringConverter.java
index 3e20af54..b5d3cf0c 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomStringConverter.java
@@ -3,7 +3,7 @@
 import java.lang.reflect.Type;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
 import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptParser.java b/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptParser.java
index 584c0842..a170477a 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptParser.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptParser.java
@@ -1,12 +1,12 @@
 package org.mustbe.consulo.json.lang;
 
+import consulo.lang.LanguageVersion;
 import consulo.lombok.annotations.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import org.mustbe.consulo.javascript.lang.parsing.ExpressionParsing;
 import org.mustbe.consulo.javascript.lang.parsing.Parsing;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.LanguageVersion;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptVersion.java b/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptVersion.java
index 9531eaa8..15ed70e6 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptVersion.java
@@ -1,8 +1,6 @@
 package org.mustbe.consulo.json.lang;
 
-import consulo.lombok.annotations.Lazy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
@@ -10,8 +8,8 @@
 import com.intellij.lang.PsiParser;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Factory;
+import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -49,14 +47,14 @@ public SyntaxHighlighter getSyntaxHighlighter()
 
 	@NotNull
 	@Override
-	public Lexer createLexer(@Nullable Project project)
+	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
 
 	@NotNull
 	@Override
-	public PsiParser createParser(@Nullable Project project)
+	public PsiParser createParser()
 	{
 		return new JsonJavaScriptParser();
 	}}
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProvider.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProvider.java
index b842b613..3e6aa3e7 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProvider.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProvider.java
@@ -17,7 +17,7 @@
 package org.mustbe.consulo.json.validation;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.PsiFile;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProviders.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProviders.java
index d9d52573..50c2bdbf 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProviders.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProviders.java
@@ -17,7 +17,7 @@
 package org.mustbe.consulo.json.validation;
 
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.JsonFileType;
 import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.psi.PsiFile;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/completion/JsonCompletionContributor.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/completion/JsonCompletionContributor.java
index 775f0c6b..04ded0c7 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -23,7 +23,6 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
 import org.mustbe.consulo.json.validation.JsonFileDescriptorProviders;
 import org.mustbe.consulo.json.validation.NativeArray;
 import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
@@ -31,7 +30,6 @@
 import org.mustbe.consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.codeInsight.completion.CompletionContributor;
 import com.intellij.codeInsight.completion.CompletionParameters;
-import com.intellij.codeInsight.completion.CompletionProvider;
 import com.intellij.codeInsight.completion.CompletionResultSet;
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.completion.InsertHandler;
@@ -49,6 +47,8 @@
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.containers.ContainerUtil;
+import consulo.annotations.RequiredReadAction;
+import consulo.codeInsight.completion.CompletionProvider;
 
 /**
  * @author VISTALL
@@ -58,21 +58,21 @@ public class JsonCompletionContributor extends CompletionContributor
 {
 	public JsonCompletionContributor()
 	{
-		extend(CompletionType.BASIC, StandardPatterns.psiElement(JSTokenTypes.IDENTIFIER), new CompletionProvider<CompletionParameters>()
+		extend(CompletionType.BASIC, StandardPatterns.psiElement(JSTokenTypes.IDENTIFIER), new CompletionProvider()
 		{
 			@RequiredReadAction
 			@Override
-			protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
+			public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
 			{
 				addVariants(parameters, result, true);
 			}
 		});
 
-		extend(CompletionType.BASIC, StandardPatterns.psiElement(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL), new CompletionProvider<CompletionParameters>()
+		extend(CompletionType.BASIC, StandardPatterns.psiElement(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL), new CompletionProvider()
 		{
 			@RequiredReadAction
 			@Override
-			protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
+			public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
 			{
 				PsiElement originalPosition = parameters.getOriginalPosition();
 				if(originalPosition == null)
@@ -87,11 +87,11 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
 			}
 		});
 
-		extend(CompletionType.BASIC, StandardPatterns.psiElement(JSTokenTypes.STRING_LITERAL), new CompletionProvider<CompletionParameters>()
+		extend(CompletionType.BASIC, StandardPatterns.psiElement(JSTokenTypes.STRING_LITERAL), new CompletionProvider()
 		{
 			@RequiredReadAction
 			@Override
-			protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
+			public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
 			{
 				PsiElement originalPosition = parameters.getOriginalPosition();
 				if(originalPosition == null)
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index dac6d5ab..57360b04 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -18,8 +18,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredDispatchThread;
-import org.mustbe.consulo.editor.notifications.EditorNotificationProvider;
 import org.mustbe.consulo.json.JsonFileType;
 import org.mustbe.consulo.json.jom.JomElement;
 import org.mustbe.consulo.json.jom.JomFileElement;
@@ -37,6 +35,8 @@
 import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.ui.EditorNotificationPanel;
 import com.intellij.ui.EditorNotifications;
+import consulo.annotations.RequiredDispatchThread;
+import consulo.editor.notifications.EditorNotificationProvider;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
index 7cff19da..cf2e6121 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
@@ -17,7 +17,7 @@
 package org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.validation.JsonFileDescriptorProvider;
 import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.util.Pair;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
index 389f21be..138c6a99 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
@@ -18,8 +18,8 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredDispatchThread;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredDispatchThread;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
index 4446883d..70df389e 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
@@ -17,11 +17,11 @@
 package org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.editor.notifications.EditorNotificationProvider;
-import org.mustbe.consulo.editor.notifications.EditorNotificationProviders;
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.NotNullFunction;
+import consulo.editor.notifications.EditorNotificationProvider;
+import consulo.editor.notifications.EditorNotificationProviders;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
index 9ca762b8..483e7d2e 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
@@ -18,10 +18,10 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.Exported;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
+import consulo.annotations.Exported;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/inspections/PropertyValidationInspection.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/inspections/PropertyValidationInspection.java
index 8124dec9..0ab991cf 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -26,7 +26,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import org.mustbe.consulo.json.validation.JsonFileDescriptorProviders;
 import org.mustbe.consulo.json.validation.NativeArray;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReference.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
index 153e49b9..27c9d9ed 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
@@ -17,7 +17,7 @@
 package org.mustbe.consulo.json.validation.psi.reference;
 
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import org.mustbe.consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
index 8fa56d53..deb848cd 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ b/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import org.mustbe.consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
diff --git a/src/com/intellij/javascript/documentation/JSDocumentationProvider.java b/src/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 1eefb906..89343aff 100644
--- a/src/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/src/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -26,7 +26,7 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.documentation.CodeDocumentationProvider;
 import com.intellij.lang.documentation.DocumentationProvider;
diff --git a/src/com/intellij/lang/javascript/JSElementTypes.java b/src/com/intellij/lang/javascript/JSElementTypes.java
index 3c39070a..35d34911 100644
--- a/src/com/intellij/lang/javascript/JSElementTypes.java
+++ b/src/com/intellij/lang/javascript/JSElementTypes.java
@@ -27,11 +27,11 @@
 import com.intellij.lang.javascript.psi.stubs.*;
 import com.intellij.lang.javascript.types.*;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.ElementTypeAsPsiFactory;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.psi.tree.ElementTypeAsPsiFactory;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/JSLanguageInjector.java b/src/com/intellij/lang/javascript/JSLanguageInjector.java
index c9d96859..3a2bd559 100644
--- a/src/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/src/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -16,12 +16,10 @@
 
 package com.intellij.lang.javascript;
 
-import org.consulo.util.pointers.NamedPointer;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.Language;
-import com.intellij.lang.LanguagePointerUtil;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
 import com.intellij.lang.javascript.flex.AnnotationBackedDescriptor;
@@ -43,6 +41,8 @@
 import com.intellij.psi.xml.XmlToken;
 import com.intellij.psi.xml.XmlTokenType;
 import com.intellij.xml.XmlElementDescriptorWithCDataContent;
+import consulo.lang.LanguagePointerUtil;
+import consulo.util.pointers.NamedPointer;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/JSSmartEnterProcessor.java b/src/com/intellij/lang/javascript/JSSmartEnterProcessor.java
index 95605552..3f60e2ee 100644
--- a/src/com/intellij/lang/javascript/JSSmartEnterProcessor.java
+++ b/src/com/intellij/lang/javascript/JSSmartEnterProcessor.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.codeInsight.editorActions.smartEnter.SmartEnterProcessor;
 import com.intellij.idea.LoggerFactory;
 import com.intellij.lang.javascript.psi.JSArgumentList;
diff --git a/src/com/intellij/lang/javascript/JSTokenTypes.java b/src/com/intellij/lang/javascript/JSTokenTypes.java
index e40f5b48..f4ff59af 100644
--- a/src/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/src/com/intellij/lang/javascript/JSTokenTypes.java
@@ -19,7 +19,6 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import org.mustbe.consulo.javascript.lang.parsing.JavaScriptParser;
 import org.mustbe.consulo.javascript.lang.parsing.JavaScriptParsingContext;
@@ -27,7 +26,6 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.lang.LanguageParserDefinitions;
-import com.intellij.lang.LanguageVersion;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiBuilderFactory;
 import com.intellij.lang.javascript.parsing.JSDocParsing;
@@ -40,6 +38,8 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.annotations.RequiredReadAction;
+import consulo.lang.LanguageVersion;
 
 /**
  * @author max, maxim.mossienko
@@ -323,7 +323,7 @@ protected ASTNode doParseContents(@NotNull ASTNode chameleon, @NotNull PsiElemen
 			final LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
 			final LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
 			final PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, createLexer(), languageForParser, languageVersion, chameleon.getChars());
-			final JavaScriptParser parser = (JavaScriptParser) LanguageParserDefinitions.INSTANCE.forLanguage(languageForParser).createParser(project, languageVersion);
+			final JavaScriptParser parser = (JavaScriptParser) LanguageParserDefinitions.INSTANCE.forLanguage(languageForParser).createParser(languageVersion);
 
 			JavaScriptParsingContext parsingContext = parser.createParsingContext();
 			doParse(parsingContext, builder);
diff --git a/src/com/intellij/lang/javascript/JavaScriptFileType.java b/src/com/intellij/lang/javascript/JavaScriptFileType.java
index 7f522584..1ab9ac64 100644
--- a/src/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/src/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -24,7 +24,7 @@
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import org.mustbe.consulo.javascript.lang.StandardJavaScriptVersions;
 import org.mustbe.consulo.javascript.module.extension.JavaScriptModuleExtension;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
diff --git a/src/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java b/src/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
index bb09085b..be56fb7b 100644
--- a/src/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
+++ b/src/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
@@ -17,12 +17,12 @@
 package com.intellij.lang.javascript;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.extensions.CompositeExtensionPointName;
-import com.intellij.codeInsight.TargetElementUtilEx;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.psi.PsiElement;
+import consulo.codeInsight.TargetElementUtilEx;
+import consulo.extensions.CompositeExtensionPointName;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/generation/JSNamedElementNode.java b/src/com/intellij/lang/javascript/generation/JSNamedElementNode.java
index 59697df3..77e98b66 100644
--- a/src/com/intellij/lang/javascript/generation/JSNamedElementNode.java
+++ b/src/com/intellij/lang/javascript/generation/JSNamedElementNode.java
@@ -22,7 +22,7 @@
 import com.intellij.codeInsight.generation.MemberChooserObject;
 import com.intellij.codeInsight.generation.PsiElementMemberChooserObject;
 import com.intellij.icons.AllIcons;
-import com.intellij.ide.IconDescriptorUpdaters;
+import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.javascript.JSParameterInfoHandler;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSNamedElement;
diff --git a/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index 46a2d81b..75d48c0d 100644
--- a/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
diff --git a/src/com/intellij/lang/javascript/index/JSItemPresentation.java b/src/com/intellij/lang/javascript/index/JSItemPresentation.java
index ffe77267..d950fda4 100644
--- a/src/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/src/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -19,8 +19,8 @@
 import javax.swing.Icon;
 
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredDispatchThread;
-import com.intellij.ide.IconDescriptorUpdaters;
+import consulo.annotations.RequiredDispatchThread;
+import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSNamedElement;
diff --git a/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java b/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
index 4faa1df6..62093776 100644
--- a/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
+++ b/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
@@ -22,7 +22,7 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.codeInspection.LocalQuickFix;
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index 595d2be5..6a7e9e21 100644
--- a/src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -21,7 +21,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import org.mustbe.consulo.javascript.lang.JavaScriptVersionUtil;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index e19ecf9f..ec8e093e 100644
--- a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -21,7 +21,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.lang.javascript.JavaScriptBundle;
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index 3b0e8f34..91147b42 100644
--- a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -19,7 +19,7 @@
 
 import java.util.Set;
 
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.codeInsight.template.Expression;
 import com.intellij.codeInsight.template.Template;
diff --git a/src/com/intellij/lang/javascript/psi/JSExpression.java b/src/com/intellij/lang/javascript/psi/JSExpression.java
index 7c783fe4..54a7a04c 100644
--- a/src/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/src/com/intellij/lang/javascript/psi/JSExpression.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import consulo.lombok.annotations.ArrayFactoryFields;
 
diff --git a/src/com/intellij/lang/javascript/psi/JSFunction.java b/src/com/intellij/lang/javascript/psi/JSFunction.java
index 0496f7d9..bb957765 100644
--- a/src/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/src/com/intellij/lang/javascript/psi/JSFunction.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
diff --git a/src/com/intellij/lang/javascript/psi/JSLabeledStatement.java b/src/com/intellij/lang/javascript/psi/JSLabeledStatement.java
index 7a8bb6ef..50dab333 100644
--- a/src/com/intellij/lang/javascript/psi/JSLabeledStatement.java
+++ b/src/com/intellij/lang/javascript/psi/JSLabeledStatement.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.mustbe.consulo.DeprecationInfo;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
+import consulo.annotations.DeprecationInfo;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/psi/JSParameter.java b/src/com/intellij/lang/javascript/psi/JSParameter.java
index 5311d465..eedc2770 100644
--- a/src/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/src/com/intellij/lang/javascript/psi/JSParameter.java
@@ -18,7 +18,7 @@
 
 import consulo.lombok.annotations.ArrayFactoryFields;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
 /**
diff --git a/src/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/src/com/intellij/lang/javascript/psi/JSPrefixExpression.java
index ffd65b95..f1e6c652 100644
--- a/src/com/intellij/lang/javascript/psi/JSPrefixExpression.java
+++ b/src/com/intellij/lang/javascript/psi/JSPrefixExpression.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 
diff --git a/src/com/intellij/lang/javascript/psi/JSProperty.java b/src/com/intellij/lang/javascript/psi/JSProperty.java
index eae35fe2..3d1925cd 100644
--- a/src/com/intellij/lang/javascript/psi/JSProperty.java
+++ b/src/com/intellij/lang/javascript/psi/JSProperty.java
@@ -19,7 +19,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import org.mustbe.consulo.javascript.psi.JSComputedName;
 import com.intellij.psi.PsiElement;
diff --git a/src/com/intellij/lang/javascript/psi/JSReferenceList.java b/src/com/intellij/lang/javascript/psi/JSReferenceList.java
index 1a934418..2083ace5 100644
--- a/src/com/intellij/lang/javascript/psi/JSReferenceList.java
+++ b/src/com/intellij/lang/javascript/psi/JSReferenceList.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
 import com.intellij.psi.StubBasedPsiElement;
 
diff --git a/src/com/intellij/lang/javascript/psi/JSSimpleLiteralExpression.java b/src/com/intellij/lang/javascript/psi/JSSimpleLiteralExpression.java
index d889f54f..3ce11d5c 100644
--- a/src/com/intellij/lang/javascript/psi/JSSimpleLiteralExpression.java
+++ b/src/com/intellij/lang/javascript/psi/JSSimpleLiteralExpression.java
@@ -18,7 +18,7 @@
 package com.intellij.lang.javascript.psi;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.tree.IElementType;
 
 /**
diff --git a/src/com/intellij/lang/javascript/psi/JSStubElementType.java b/src/com/intellij/lang/javascript/psi/JSStubElementType.java
index f2eadbae..4fa8be81 100644
--- a/src/com/intellij/lang/javascript/psi/JSStubElementType.java
+++ b/src/com/intellij/lang/javascript/psi/JSStubElementType.java
@@ -25,7 +25,7 @@
 import com.intellij.lang.javascript.psi.stubs.JSStubElement;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.IndexSink;
-import com.intellij.psi.tree.IElementTypeAsPsiFactory;
+import consulo.psi.tree.IElementTypeAsPsiFactory;
 
 public abstract class JSStubElementType<StubT extends JSStubElement<PsiT>, PsiT extends JSElement> extends IStubElementType<StubT,
 		PsiT> implements IElementTypeAsPsiFactory
diff --git a/src/com/intellij/lang/javascript/psi/JSVariable.java b/src/com/intellij/lang/javascript/psi/JSVariable.java
index 3221cc06..f129b06a 100644
--- a/src/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/src/com/intellij/lang/javascript/psi/JSVariable.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
index ffb28fe9..e6ac5a34 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
index b45bae33..2f0b74d6 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSExpression;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index 796fcc3e..7d346bef 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -19,7 +19,7 @@
 import javax.swing.Icon;
 
 import org.jetbrains.annotations.NotNull;
-import com.intellij.ide.IconDescriptorUpdaters;
+import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index ae5efbba..1322c837 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index 3ff5d339..ed4a57f9 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
index b1a03ac6..82dcc370 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index 1d99e35f..94702ee1 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptPrimitiveType;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index d5133b92..da3f951c 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import org.mustbe.consulo.javascript.lang.psi.impl.JavaScriptClassType;
 import com.intellij.lang.ASTNode;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index b0474d68..c3e94f67 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index 6c013552..1359b607 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index ed7a1736..751c96c6 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index eb85bb82..91f22ac3 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import org.mustbe.consulo.javascript.psi.JSComputedName;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 88940c20..9b2896f7 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -26,7 +26,7 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
 import org.mustbe.consulo.javascript.lang.psi.impl.elementType.BaseJavaScriptElementType;
 import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index fcff5aff..07307724 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -20,7 +20,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import org.mustbe.consulo.javascript.lang.JavaScriptVersionUtil;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index 10c751c9..f8f9ab9c 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -21,7 +21,7 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/src/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index 893904d9..a88099fc 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -22,7 +22,7 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JavaScriptBundle;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index 6e13fe79..7968b7f6 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
diff --git a/src/com/intellij/lang/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/src/com/intellij/lang/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
index fc000ab4..0344e16e 100644
--- a/src/com/intellij/lang/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
+++ b/src/com/intellij/lang/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
@@ -19,7 +19,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
diff --git a/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
index b2841aed..0935307d 100644
--- a/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
+++ b/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
@@ -19,7 +19,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
diff --git a/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index aa65678f..c78b2e7b 100644
--- a/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -19,10 +19,10 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
-import org.mustbe.consulo.extensions.CompositeExtensionPointName;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.PsiReference;
+import consulo.annotations.RequiredReadAction;
+import consulo.extensions.CompositeExtensionPointName;
 
 /**
  * @author VISTALL
diff --git a/src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 2a01ae2f..3ca5e423 100644
--- a/src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -31,7 +31,6 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptVersionUtil;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
@@ -63,7 +62,6 @@
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.roots.types.BinariesOrderRootType;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
@@ -106,6 +104,8 @@
 import com.intellij.util.indexing.FileBasedIndex;
 import com.intellij.util.text.StringTokenizer;
 import com.intellij.xml.XmlElementDescriptor;
+import consulo.annotations.RequiredReadAction;
+import consulo.roots.types.BinariesOrderRootType;
 
 /**
  * @author max, maxim.mossienko
diff --git a/src/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/src/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 778af380..fd96d64f 100644
--- a/src/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/src/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -24,7 +24,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index b5c3e555..23bd1b6e 100644
--- a/src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -25,7 +25,7 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NonNls;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
diff --git a/src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
index dfd625ec..ed7fa55e 100644
--- a/src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
+++ b/src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
@@ -18,13 +18,13 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.codeInsight.completion.PrioritizedLookupElement;
 import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.intellij.ide.IconDescriptorUpdaters;
+import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
diff --git a/src/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java b/src/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
index 2c09b25d..71c5c81d 100644
--- a/src/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
+++ b/src/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
@@ -18,8 +18,8 @@
 
 import javax.swing.Icon;
 
-import org.mustbe.consulo.RequiredReadAction;
-import com.intellij.ide.IconDescriptorUpdaters;
+import consulo.annotations.RequiredReadAction;
+import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
diff --git a/src/com/intellij/lang/javascript/types/JSAttributeElementType.java b/src/com/intellij/lang/javascript/types/JSAttributeElementType.java
index a4172011..1e05f743 100644
--- a/src/com/intellij/lang/javascript/types/JSAttributeElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSAttributeElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttribute;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/src/com/intellij/lang/javascript/types/JSAttributeListElementType.java b/src/com/intellij/lang/javascript/types/JSAttributeListElementType.java
index 08928180..84d163aa 100644
--- a/src/com/intellij/lang/javascript/types/JSAttributeListElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSAttributeListElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/src/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java b/src/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
index 5a2a8a55..524eb75a 100644
--- a/src/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
+++ b/src/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/src/com/intellij/lang/javascript/types/JSClassElementType.java b/src/com/intellij/lang/javascript/types/JSClassElementType.java
index 51bfe923..f8580fc2 100644
--- a/src/com/intellij/lang/javascript/types/JSClassElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSClassElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
diff --git a/src/com/intellij/lang/javascript/types/JSFunctionElementType.java b/src/com/intellij/lang/javascript/types/JSFunctionElementType.java
index 6feb86b9..33052c77 100644
--- a/src/com/intellij/lang/javascript/types/JSFunctionElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSFunctionElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSFunctionStubImpl;
diff --git a/src/com/intellij/lang/javascript/types/JSImportStatementElementType.java b/src/com/intellij/lang/javascript/types/JSImportStatementElementType.java
index 037ed8b6..a4122591 100644
--- a/src/com/intellij/lang/javascript/types/JSImportStatementElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSImportStatementElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/src/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java b/src/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
index 2e610d84..9f09e215 100644
--- a/src/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSIncludeDirective;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
index e36d1d14..1117e407 100644
--- a/src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
 import com.intellij.lang.javascript.psi.impl.JSNamespaceDeclarationImpl;
diff --git a/src/com/intellij/lang/javascript/types/JSPackageStatementElementType.java b/src/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
index 90e91905..31f5e8ed 100644
--- a/src/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/src/com/intellij/lang/javascript/types/JSParameterElementType.java b/src/com/intellij/lang/javascript/types/JSParameterElementType.java
index db178aa7..ade966c6 100644
--- a/src/com/intellij/lang/javascript/types/JSParameterElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSParameterElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/src/com/intellij/lang/javascript/types/JSParameterListElementType.java b/src/com/intellij/lang/javascript/types/JSParameterListElementType.java
index 93c1be72..cdcf02e7 100644
--- a/src/com/intellij/lang/javascript/types/JSParameterListElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSParameterListElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/src/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/src/com/intellij/lang/javascript/types/JSReferenceListElementType.java
index edf648b3..57525504 100644
--- a/src/com/intellij/lang/javascript/types/JSReferenceListElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSReferenceListElementType.java
@@ -21,7 +21,7 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/src/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java b/src/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
index 00708b2f..e1e2a763 100644
--- a/src/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
+++ b/src/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.JSUseNamespaceDirective;
diff --git a/src/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/src/com/intellij/lang/javascript/types/JSVarStatementElementType.java
index 0fe4e014..59835562 100644
--- a/src/com/intellij/lang/javascript/types/JSVarStatementElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSVarStatementElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFile;
diff --git a/src/com/intellij/lang/javascript/types/JSVariableElementType.java b/src/com/intellij/lang/javascript/types/JSVariableElementType.java
index bddd9f4b..bdf5bd24 100644
--- a/src/com/intellij/lang/javascript/types/JSVariableElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSVariableElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSVariable;
diff --git a/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java b/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
index 7e8f0724..01284299 100644
--- a/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
+++ b/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
@@ -17,13 +17,13 @@
 package org.mustbe.consulo.javascript.copyright;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.copyright.config.CopyrightFileConfig;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiWhiteSpace;
 import com.maddyhome.idea.copyright.CopyrightProfile;
 import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright;
+import consulo.copyright.config.CopyrightFileConfig;
 
 public class UpdateJavaScriptFileCopyright extends UpdatePsiFileCopyright<CopyrightFileConfig>
 {
diff --git a/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java b/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
index 5e659ec5..2cb3a56f 100644
--- a/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
+++ b/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
@@ -1,7 +1,6 @@
 package org.mustbe.consulo.javascript.copyright;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.copyright.config.CopyrightFileConfig;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
@@ -9,6 +8,7 @@
 import com.maddyhome.idea.copyright.psi.UpdateCopyrightsProvider;
 import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright;
 import com.maddyhome.idea.copyright.ui.TemplateCommentPanel;
+import consulo.copyright.config.CopyrightFileConfig;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java b/src/org/mustbe/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
index 5079bffb..a490ebe7 100644
--- a/src/org/mustbe/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
+++ b/src/org/mustbe/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
@@ -20,16 +20,15 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
 import com.intellij.icons.AllIcons;
-import com.intellij.ide.IconDescriptor;
-import com.intellij.ide.IconDescriptorUpdater;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.javascript.psi.resolve.VariantsProcessor;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.BitUtil;
+import consulo.annotations.RequiredReadAction;
+import consulo.ide.IconDescriptor;
+import consulo.ide.IconDescriptorUpdater;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/src/org/mustbe/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index a67b3bfa..3f8417dc 100644
--- a/src/org/mustbe/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/src/org/mustbe/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -2,10 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredDispatchThread;
-import org.mustbe.consulo.RequiredReadAction;
 import org.mustbe.consulo.javascript.module.extension.JavaScriptModuleExtension;
-import org.mustbe.consulo.roots.ContentEntryFileListener;
 import com.intellij.ide.IdeView;
 import com.intellij.ide.actions.CreateFileFromTemplateAction;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
@@ -21,6 +18,9 @@
 import com.intellij.openapi.vfs.VirtualFileSystem;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.testFramework.LightVirtualFile;
+import consulo.annotations.RequiredDispatchThread;
+import consulo.annotations.RequiredReadAction;
+import consulo.roots.ContentEntryFileListener;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/src/org/mustbe/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
index 0dfd52d2..e1cc014e 100644
--- a/src/org/mustbe/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
+++ b/src/org/mustbe/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
 import com.intellij.openapi.util.KeyedExtensionCollector;
 import com.intellij.psi.PsiElement;
diff --git a/src/org/mustbe/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java b/src/org/mustbe/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
index 9ddadcf3..e139864e 100644
--- a/src/org/mustbe/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/src/org/mustbe/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -17,8 +17,6 @@
 package org.mustbe.consulo.javascript.ide.completion;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
-import org.mustbe.consulo.codeInsight.completion.CompletionProvider;
 import com.intellij.codeInsight.completion.CompletionContributor;
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionResultSet;
@@ -30,6 +28,8 @@
 import com.intellij.patterns.StandardPatterns;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ProcessingContext;
+import consulo.annotations.RequiredReadAction;
+import consulo.codeInsight.completion.CompletionProvider;
 
 /**
  * @author VISTALL
@@ -43,7 +43,7 @@ public JavaScriptKeywordCompletionContributor()
 		{
 			@RequiredReadAction
 			@Override
-			protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
+			public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
 			{
 				PsiElement position = parameters.getPosition();
 				JSReferenceExpression parent = (JSReferenceExpression) position.getParent();
diff --git a/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
index 5a1d2034..17a2f8fe 100644
--- a/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
+++ b/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
@@ -1,11 +1,11 @@
 package org.mustbe.consulo.javascript.ide.hightlight;
 
-import org.consulo.fileTypes.LanguageVersionableSyntaxHighlighterFactory;
 import org.jetbrains.annotations.NotNull;
 import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import com.intellij.lang.LanguageVersion;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
+import consulo.fileTypes.LanguageVersionableSyntaxHighlighterFactory;
+import consulo.lang.LanguageVersion;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/src/org/mustbe/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index d32c8133..1be47d48 100644
--- a/src/org/mustbe/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/src/org/mustbe/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -2,18 +2,15 @@
 
 import java.util.Set;
 
-import org.consulo.annotations.Immutable;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.lang.parsing.JavaScriptParser;
-import com.intellij.lang.BaseLanguageVersion;
-import com.intellij.lang.LanguageVersionWithParsing;
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.project.Project;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.util.containers.ArrayListSet;
+import consulo.lang.BaseLanguageVersion;
+import consulo.lang.LanguageVersionWithParsing;
 
 /**
  * @author VISTALL
@@ -36,7 +33,6 @@ protected void addFeature(@NotNull JavaScriptFeature feature)
 	}
 
 	@NotNull
-	@Immutable
 	public Set<JavaScriptFeature> getFeatures()
 	{
 		return myFeatures;
@@ -53,7 +49,7 @@ public String getPresentableName()
 
 	@NotNull
 	@Override
-	public PsiParser createParser(@Nullable Project project)
+	public PsiParser createParser()
 	{
 		return new JavaScriptParser();
 	}
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScript15LanguageVersion.java b/src/org/mustbe/consulo/javascript/lang/JavaScript15LanguageVersion.java
index 3b39d612..30dc5012 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/src/org/mustbe/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -1,14 +1,12 @@
 package org.mustbe.consulo.javascript.lang;
 
-import consulo.lombok.annotations.Lazy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import org.mustbe.consulo.javascript.lang.lexer.JavaScript15Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Factory;
+import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -45,7 +43,7 @@ public String getPresentableName()
 	}
 	@NotNull
 	@Override
-	public Lexer createLexer(@Nullable Project project)
+	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java b/src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
index 452f856b..bba155aa 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
+++ b/src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/src/org/mustbe/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index 80315cbf..82d2bce9 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/src/org/mustbe/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -19,13 +19,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.Language;
-import com.intellij.lang.LanguageVersion;
-import com.intellij.lang.LanguageVersionResolver;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import consulo.lang.LanguageVersion;
+import consulo.lang.LanguageVersionResolver;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptParsingDefinition.java b/src/org/mustbe/consulo/javascript/lang/JavaScriptParsingDefinition.java
index 3d1f9a06..f757b225 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptParsingDefinition.java
+++ b/src/org/mustbe/consulo/javascript/lang/JavaScriptParsingDefinition.java
@@ -20,7 +20,6 @@
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageUtil;
-import com.intellij.lang.LanguageVersionableParserDefinition;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.impl.JSDocCommentImpl;
@@ -32,6 +31,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.IFileElementType;
+import consulo.lang.LanguageVersionableParserDefinition;
 
 /**
  * @author VISTALL
@@ -79,7 +79,7 @@ public PsiFile createFile(FileViewProvider fileViewProvider)
 	public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right)
 	{
 		PsiElement leftPsi = left.getPsi();
-		final Lexer lexer = createLexer(leftPsi.getProject(), leftPsi.getLanguageVersion());
+		final Lexer lexer = createLexer(leftPsi.getLanguageVersion());
 		return LanguageUtil.canStickTokensTogetherByLexer(left, right, lexer);
 	}
 }
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java b/src/org/mustbe/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
index dec2f696..df5ddd8e 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
+++ b/src/org/mustbe/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
@@ -18,7 +18,7 @@
 
 import org.intellij.lang.regexp.RegExpLanguage;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptVersionUtil.java b/src/org/mustbe/consulo/javascript/lang/JavaScriptVersionUtil.java
index 56bf371a..1881da99 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptVersionUtil.java
+++ b/src/org/mustbe/consulo/javascript/lang/JavaScriptVersionUtil.java
@@ -20,7 +20,7 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NotNull;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
 import com.intellij.psi.PsiElement;
 
 /**
diff --git a/src/org/mustbe/consulo/javascript/lang/StandardJavaScriptVersions.java b/src/org/mustbe/consulo/javascript/lang/StandardJavaScriptVersions.java
index fb9baa2c..9154e2b5 100644
--- a/src/org/mustbe/consulo/javascript/lang/StandardJavaScriptVersions.java
+++ b/src/org/mustbe/consulo/javascript/lang/StandardJavaScriptVersions.java
@@ -22,7 +22,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.ContainerUtil;
 
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParser.java b/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParser.java
index e8c53b7a..8f876cac 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParser.java
+++ b/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParser.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiParser;
 import com.intellij.psi.tree.IElementType;
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java b/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
index 4f8016db..64d46f7f 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
+++ b/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
 /**
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptSimpleType.java b/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptSimpleType.java
index 03d4bf01..c3e753f7 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptSimpleType.java
+++ b/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptSimpleType.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
 /**
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptType.java b/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptType.java
index 1f75af46..d27894f8 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptType.java
+++ b/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptType.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
 /**
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/src/org/mustbe/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
index 7325ee6c..3112be49 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
+++ b/src/org/mustbe/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.psi.PsiElement;
diff --git a/src/org/mustbe/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/src/org/mustbe/consulo/javascript/module/extension/JavaScriptModuleExtension.java
index ca86a153..8e271305 100644
--- a/src/org/mustbe/consulo/javascript/module/extension/JavaScriptModuleExtension.java
+++ b/src/org/mustbe/consulo/javascript/module/extension/JavaScriptModuleExtension.java
@@ -1,9 +1,9 @@
 package org.mustbe.consulo.javascript.module.extension;
 
-import org.consulo.module.extension.ModuleExtensionWithSdk;
 import org.jetbrains.annotations.NotNull;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
+import consulo.module.extension.ModuleExtensionWithSdk;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/src/org/mustbe/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
index 57fb4431..eda602f2 100644
--- a/src/org/mustbe/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
+++ b/src/org/mustbe/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
@@ -16,10 +16,10 @@
 
 package org.mustbe.consulo.javascript.module.extension;
 
-import org.consulo.module.extension.MutableModuleExtensionWithSdk;
 import org.jetbrains.annotations.NotNull;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import com.intellij.lang.LanguageVersion;
+import consulo.lang.LanguageVersion;
+import consulo.module.extension.MutableModuleExtensionWithSdk;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/psi/JavaScriptLambdaExpression.java b/src/org/mustbe/consulo/javascript/psi/JavaScriptLambdaExpression.java
index 7cc97e52..17efa065 100644
--- a/src/org/mustbe/consulo/javascript/psi/JavaScriptLambdaExpression.java
+++ b/src/org/mustbe/consulo/javascript/psi/JavaScriptLambdaExpression.java
@@ -17,7 +17,7 @@
 package org.mustbe.consulo.javascript.psi;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParameterList;
 
diff --git a/src/org/mustbe/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java b/src/org/mustbe/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
index 40d515f0..0775e8fb 100644
--- a/src/org/mustbe/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
+++ b/src/org/mustbe/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
@@ -17,7 +17,7 @@
 package org.mustbe.consulo.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.RequiredReadAction;
+import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.psi.JavaScriptLambdaExpression;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugProcess.java b/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugProcess.java
index 5d4575aa..64f80be6 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugProcess.java
@@ -29,7 +29,6 @@
 import org.chromium.sdk.StandaloneVm;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.Exported;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.process.ProcessHandler;
@@ -53,6 +52,7 @@
 import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
 import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 import com.intellij.xdebugger.ui.XDebugTabLayouter;
+import consulo.annotations.Exported;
 import consulo.javascript.debugger.JavaScriptEditorsProvider;
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
 import consulo.javascript.debugger.JavaScriptListPanel;

From 22dd712d0e171082d4c245f7977866f5270069fb Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Thu, 1 Sep 2016 23:32:02 +0300
Subject: [PATCH 002/340] cleanup

---
 .consulo/modules.xml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.consulo/modules.xml b/.consulo/modules.xml
index 7915c07a..4f0aaa98 100644
--- a/.consulo/modules.xml
+++ b/.consulo/modules.xml
@@ -37,8 +37,8 @@
       </module>
       <module name="inspections" dirurl="file://$PROJECT_DIR$/inspections" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -61,8 +61,8 @@
       </module>
       <module name="intentions" dirurl="file://$PROJECT_DIR$/intentions" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -122,8 +122,8 @@
       </module>
       <module name="debugger-impl/debugger-impl" dirurl="file://$PROJECT_DIR$/debugger-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -136,8 +136,8 @@
       </module>
       <module name="debugger-impl/v8-debugger-impl" dirurl="file://$PROJECT_DIR$/v8-debugger-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -177,8 +177,8 @@
       </module>
       <module name="javascript16-impl" dirurl="file://$PROJECT_DIR$/javascript16-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -190,8 +190,8 @@
       </module>
       <module name="javascript17-impl" dirurl="file://$PROJECT_DIR$/javascript17-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -203,8 +203,8 @@
       </module>
       <module name="javascript18-impl" dirurl="file://$PROJECT_DIR$/javascript18-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -217,8 +217,8 @@
       </module>
       <module name="ecmascript6-impl" dirurl="file://$PROJECT_DIR$/ecmascript6-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="Consulo 1.SNAPSHOT" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="1.6" language-level-module-name="consulo-javascript" language-level-name="JDK_1_6" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
+          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />

From d68df9b9e769353855096b5ab2aa9ea0d3e8ea86 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Fri, 2 Sep 2016 15:43:03 +0300
Subject: [PATCH 003/340] use another project libraries

---
 .../consulo_plugin__com_intellij_regexp.xml   |  8 +++
 ...sulo_plugin__com_intellij_spellchecker.xml |  8 +++
 ...nsulo_plugin__org_intellij_intelliLang.xml |  8 +++
 .../consuo_plugin__com_intellij_xml.xml       |  8 +++
 .consulo/modules.xml                          | 52 ++-----------------
 5 files changed, 37 insertions(+), 47 deletions(-)
 create mode 100644 .consulo/libraries/consulo_plugin__com_intellij_regexp.xml
 create mode 100644 .consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
 create mode 100644 .consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
 create mode 100644 .consulo/libraries/consuo_plugin__com_intellij_xml.xml

diff --git a/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml b/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
new file mode 100644
index 00000000..79ccd048
--- /dev/null
+++ b/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
@@ -0,0 +1,8 @@
+<component name="libraryTable">
+  <library name="consulo-plugin: com.intellij.regexp">
+    <binaries>
+      <root url="file://$PROJECT_DIR$/dep/com.intellij.regexp/lib" />
+    </binaries>
+    <jarDirectory url="file://$PROJECT_DIR$/dep/com.intellij.regexp/lib" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml b/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
new file mode 100644
index 00000000..f107e371
--- /dev/null
+++ b/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
@@ -0,0 +1,8 @@
+<component name="libraryTable">
+  <library name="consulo-plugin: com.intellij.spellchecker">
+    <binaries>
+      <root url="file://$PROJECT_DIR$/dep/com.intellij.spellchecker/lib" />
+    </binaries>
+    <jarDirectory url="file://$PROJECT_DIR$/dep/com.intellij.spellchecker/lib" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml b/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
new file mode 100644
index 00000000..e9bfbcfa
--- /dev/null
+++ b/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
@@ -0,0 +1,8 @@
+<component name="libraryTable">
+  <library name="consulo-plugin: org.intellij.intelliLang">
+    <binaries>
+      <root url="file://$PROJECT_DIR$/dep/org.intellij.intelliLang/lib" />
+    </binaries>
+    <jarDirectory url="file://$PROJECT_DIR$/dep/org.intellij.intelliLang/lib" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.consulo/libraries/consuo_plugin__com_intellij_xml.xml b/.consulo/libraries/consuo_plugin__com_intellij_xml.xml
new file mode 100644
index 00000000..83012e33
--- /dev/null
+++ b/.consulo/libraries/consuo_plugin__com_intellij_xml.xml
@@ -0,0 +1,8 @@
+<component name="libraryTable">
+  <library name="consuo-plugin: com.intellij.xml">
+    <binaries>
+      <root url="file://$PROJECT_DIR$/dep/com.intellij.xml/lib" />
+    </binaries>
+    <jarDirectory url="file://$PROJECT_DIR$/dep/com.intellij.xml/lib" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.consulo/modules.xml b/.consulo/modules.xml
index 4f0aaa98..97b9f72c 100644
--- a/.consulo/modules.xml
+++ b/.consulo/modules.xml
@@ -14,25 +14,10 @@
           <orderEntry type="module-extension-sdk" extension-id="java" />
           <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
           <orderEntry type="sourceFolder" />
-          <orderEntry type="module-library">
-            <library name="consulo:XML">
-              <binaries>
-                <root url="jar://$MODULE_DIR$/dep/xml/lib/jsr173_1.0_api.jar!/" />
-                <root url="jar://$MODULE_DIR$/dep/xml/lib/resolver.jar!/" />
-                <root url="jar://$MODULE_DIR$/dep/xml/lib/xerces.jar!/" />
-                <root url="jar://$MODULE_DIR$/dep/xml/lib/xml.jar!/" />
-              </binaries>
-            </library>
-          </orderEntry>
           <orderEntry type="module" module-name="inspections" />
           <orderEntry type="module" module-name="intentions" />
-          <orderEntry type="module-library">
-            <library name="consulo:Regexp">
-              <binaries>
-                <root url="jar://$MODULE_DIR$/dep/regexp/lib/regexp.jar!/" />
-              </binaries>
-            </library>
-          </orderEntry>
+          <orderEntry type="library" name="consuo-plugin: com.intellij.xml" level="project" />
+          <orderEntry type="library" name="consulo-plugin: com.intellij.regexp" level="project" />
         </module-layer>
       </module>
       <module name="inspections" dirurl="file://$PROJECT_DIR$/inspections" current-layer="Default">
@@ -47,16 +32,7 @@
           <orderEntry type="module-extension-sdk" extension-id="java" />
           <orderEntry type="sourceFolder" />
           <orderEntry type="module" module-name="consulo-javascript" />
-          <orderEntry type="module-library">
-            <library name="consulo:XML">
-              <binaries>
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/jsr173_1.0_api.jar!/" />
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/resolver.jar!/" />
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/xerces.jar!/" />
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/xml.jar!/" />
-              </binaries>
-            </library>
-          </orderEntry>
+          <orderEntry type="library" name="consuo-plugin: com.intellij.xml" level="project" />
         </module-layer>
       </module>
       <module name="intentions" dirurl="file://$PROJECT_DIR$/intentions" current-layer="Default">
@@ -70,17 +46,8 @@
           <orderEntry type="module-extension-sdk" extension-id="java" />
           <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
           <orderEntry type="sourceFolder" />
-          <orderEntry type="module-library">
-            <library name="consulo:XML">
-              <binaries>
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/jsr173_1.0_api.jar!/" />
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/resolver.jar!/" />
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/xerces.jar!/" />
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/xml.jar!/" />
-              </binaries>
-            </library>
-          </orderEntry>
           <orderEntry type="module" module-name="consulo-javascript" />
+          <orderEntry type="library" name="consuo-plugin: com.intellij.xml" level="project" />
         </module-layer>
       </module>
       <module name="client-javascript-impl" dirurl="file://$PROJECT_DIR$/client-javascript-impl" current-layer="Default">
@@ -108,16 +75,7 @@
           <orderEntry type="module-extension-sdk" extension-id="java" />
           <orderEntry type="sourceFolder" />
           <orderEntry type="module" module-name="consulo-javascript" exported="" />
-          <orderEntry type="module-library">
-            <library name="consulo:XML">
-              <binaries>
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/jsr173_1.0_api.jar!/" />
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/resolver.jar!/" />
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/xerces.jar!/" />
-                <root url="jar://$MODULE_DIR$/../dep/xml/lib/xml.jar!/" />
-              </binaries>
-            </library>
-          </orderEntry>
+          <orderEntry type="library" name="consuo-plugin: com.intellij.xml" level="project" />
         </module-layer>
       </module>
       <module name="debugger-impl/debugger-impl" dirurl="file://$PROJECT_DIR$/debugger-impl" current-layer="Default">

From 1e946cef8004a9f18b640fd9bbf0d2dc8ba1e230 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Fri, 2 Sep 2016 15:45:52 +0300
Subject: [PATCH 004/340] fix prefix

---
 ...ellij_xml.xml => consulo_plugin__com_intellij_xml.xml} | 2 +-
 .consulo/modules.xml                                      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename .consulo/libraries/{consuo_plugin__com_intellij_xml.xml => consulo_plugin__com_intellij_xml.xml} (82%)

diff --git a/.consulo/libraries/consuo_plugin__com_intellij_xml.xml b/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
similarity index 82%
rename from .consulo/libraries/consuo_plugin__com_intellij_xml.xml
rename to .consulo/libraries/consulo_plugin__com_intellij_xml.xml
index 83012e33..ab862e03 100644
--- a/.consulo/libraries/consuo_plugin__com_intellij_xml.xml
+++ b/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
@@ -1,5 +1,5 @@
 <component name="libraryTable">
-  <library name="consuo-plugin: com.intellij.xml">
+  <library name="consulo-plugin: com.intellij.xml">
     <binaries>
       <root url="file://$PROJECT_DIR$/dep/com.intellij.xml/lib" />
     </binaries>
diff --git a/.consulo/modules.xml b/.consulo/modules.xml
index 97b9f72c..b1397c7f 100644
--- a/.consulo/modules.xml
+++ b/.consulo/modules.xml
@@ -16,7 +16,7 @@
           <orderEntry type="sourceFolder" />
           <orderEntry type="module" module-name="inspections" />
           <orderEntry type="module" module-name="intentions" />
-          <orderEntry type="library" name="consuo-plugin: com.intellij.xml" level="project" />
+          <orderEntry type="library" name="consulo-plugin: com.intellij.xml" level="project" />
           <orderEntry type="library" name="consulo-plugin: com.intellij.regexp" level="project" />
         </module-layer>
       </module>
@@ -32,7 +32,7 @@
           <orderEntry type="module-extension-sdk" extension-id="java" />
           <orderEntry type="sourceFolder" />
           <orderEntry type="module" module-name="consulo-javascript" />
-          <orderEntry type="library" name="consuo-plugin: com.intellij.xml" level="project" />
+          <orderEntry type="library" name="consulo-plugin: com.intellij.xml" level="project" />
         </module-layer>
       </module>
       <module name="intentions" dirurl="file://$PROJECT_DIR$/intentions" current-layer="Default">
@@ -47,7 +47,7 @@
           <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
           <orderEntry type="sourceFolder" />
           <orderEntry type="module" module-name="consulo-javascript" />
-          <orderEntry type="library" name="consuo-plugin: com.intellij.xml" level="project" />
+          <orderEntry type="library" name="consulo-plugin: com.intellij.xml" level="project" />
         </module-layer>
       </module>
       <module name="client-javascript-impl" dirurl="file://$PROJECT_DIR$/client-javascript-impl" current-layer="Default">
@@ -75,7 +75,7 @@
           <orderEntry type="module-extension-sdk" extension-id="java" />
           <orderEntry type="sourceFolder" />
           <orderEntry type="module" module-name="consulo-javascript" exported="" />
-          <orderEntry type="library" name="consuo-plugin: com.intellij.xml" level="project" />
+          <orderEntry type="library" name="consulo-plugin: com.intellij.xml" level="project" />
         </module-layer>
       </module>
       <module name="debugger-impl/debugger-impl" dirurl="file://$PROJECT_DIR$/debugger-impl" current-layer="Default">

From 1737216b06edc1ccbd3fa1c65f36b390734c10d5 Mon Sep 17 00:00:00 2001
From: Valeriy Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 2 Sep 2016 16:04:02 +0300
Subject: [PATCH 005/340] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index da6c71b2..ff7c9242 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-![Build Status](http://must-be.org/vulcan/statusImage?name=consulo-javascript)
+[![Build Status](http://must-be.org/jenkins/job/consulo-javascript/badge/icon)](http://must-be.org/jenkins/job/consulo-javascript/)

From 3533020504a7ab76afae1d72665134acffae0a83 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 3 Sep 2016 20:19:02 +0300
Subject: [PATCH 006/340] droping old package name (debugger modules)

---
 .consulo/modules.xml                                      | 8 ++++----
 resources/META-INF/plugin.xml                             | 4 +---
 .../consulo/javascript/run/debug/V8BaseVariableValue.java | 2 +-
 .../javascript/run/debug/V8DebugEventListener.java        | 2 +-
 .../consulo/javascript/run/debug/V8DebugProcess.java      | 2 +-
 .../consulo/javascript/run/debug/V8ExecutionStack.java    | 2 +-
 .../consulo/javascript/run/debug/V8ScriptUtil.java        | 2 +-
 .../consulo/javascript/run/debug/V8StackFrame.java        | 2 +-
 .../consulo/javascript/run/debug/V8SuspendContext.java    | 2 +-
 .../consulo/javascript/run/debug/V8VariableValue.java     | 2 +-
 .../consulo/javascript/run/debug/V8WatchValue.java        | 2 +-
 11 files changed, 14 insertions(+), 16 deletions(-)
 rename v8-debugger-impl/src/{org/mustbe => }/consulo/javascript/run/debug/V8BaseVariableValue.java (99%)
 rename v8-debugger-impl/src/{org/mustbe => }/consulo/javascript/run/debug/V8DebugEventListener.java (98%)
 rename v8-debugger-impl/src/{org/mustbe => }/consulo/javascript/run/debug/V8DebugProcess.java (99%)
 rename v8-debugger-impl/src/{org/mustbe => }/consulo/javascript/run/debug/V8ExecutionStack.java (97%)
 rename v8-debugger-impl/src/{org/mustbe => }/consulo/javascript/run/debug/V8ScriptUtil.java (97%)
 rename v8-debugger-impl/src/{org/mustbe => }/consulo/javascript/run/debug/V8StackFrame.java (98%)
 rename v8-debugger-impl/src/{org/mustbe => }/consulo/javascript/run/debug/V8SuspendContext.java (96%)
 rename v8-debugger-impl/src/{org/mustbe => }/consulo/javascript/run/debug/V8VariableValue.java (98%)
 rename v8-debugger-impl/src/{org/mustbe => }/consulo/javascript/run/debug/V8WatchValue.java (96%)

diff --git a/.consulo/modules.xml b/.consulo/modules.xml
index b1397c7f..c498cc8d 100644
--- a/.consulo/modules.xml
+++ b/.consulo/modules.xml
@@ -4,7 +4,7 @@
     <modules>
       <module name="consulo-javascript" dirurl="file://$PROJECT_DIR$" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo SNAPSHOT" custom-plugin-dir-url="file://$MODULE_DIR$/dep" />
+          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo SNAPSHOT" />
           <extension id="java" sdk-module-name="" sdk-name="1.8" language-level-module-name="" language-level-name="JDK_1_8" special-dir-location="SOURCE_DIR" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
@@ -22,7 +22,7 @@
       </module>
       <module name="inspections" dirurl="file://$PROJECT_DIR$/inspections" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
           <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
@@ -37,7 +37,7 @@
       </module>
       <module name="intentions" dirurl="file://$PROJECT_DIR$/intentions" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
           <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
@@ -65,7 +65,7 @@
       </module>
       <module name="json-javascript-impl" dirurl="file://$PROJECT_DIR$/json-javascript-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" custom-plugin-dir-url="file://$MODULE_DIR$/../dep" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
           <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 0921d669..0192d1c7 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -15,7 +15,7 @@
   -->
 
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-	<id>org.mustbe.consulo.javascript</id>
+	<id>consulo.javascript</id>
 	<name>JavaScript</name>
 	<version>SNAPSHOT</version>
 	<category>Custom Languages</category>
@@ -39,8 +39,6 @@
 	</actions>
 
 	<extensions defaultExtensionNs="com.intellij">
-		<errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-
 		<internalFileTemplate name="JavaScriptFile"/>
 
 		<lang.versionResolver language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.JavaScriptLanguageVersionResolver"/>
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8BaseVariableValue.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8BaseVariableValue.java
similarity index 99%
rename from v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8BaseVariableValue.java
rename to v8-debugger-impl/src/consulo/javascript/run/debug/V8BaseVariableValue.java
index 9cf8c4d5..9a33b4cf 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8BaseVariableValue.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8BaseVariableValue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.run.debug;
+package consulo.javascript.run.debug;
 
 import java.util.Collection;
 
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugEventListener.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugEventListener.java
similarity index 98%
rename from v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugEventListener.java
rename to v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugEventListener.java
index bbd6ffc1..442fdeff 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugEventListener.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugEventListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.run.debug;
+package consulo.javascript.run.debug;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugProcess.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugProcess.java
similarity index 99%
rename from v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugProcess.java
rename to v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugProcess.java
index 64f80be6..f905781f 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugProcess.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.run.debug;
+package consulo.javascript.run.debug;
 
 import java.net.InetSocketAddress;
 import java.util.Collection;
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8ExecutionStack.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8ExecutionStack.java
similarity index 97%
rename from v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8ExecutionStack.java
rename to v8-debugger-impl/src/consulo/javascript/run/debug/V8ExecutionStack.java
index 11ad9f0f..03f3ed68 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8ExecutionStack.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8ExecutionStack.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.run.debug;
+package consulo.javascript.run.debug;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8ScriptUtil.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8ScriptUtil.java
similarity index 97%
rename from v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8ScriptUtil.java
rename to v8-debugger-impl/src/consulo/javascript/run/debug/V8ScriptUtil.java
index 2fe42f99..210b201d 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8ScriptUtil.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8ScriptUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.run.debug;
+package consulo.javascript.run.debug;
 
 import java.io.File;
 
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8StackFrame.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8StackFrame.java
similarity index 98%
rename from v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8StackFrame.java
rename to v8-debugger-impl/src/consulo/javascript/run/debug/V8StackFrame.java
index d5b7faf9..153f8f6e 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8StackFrame.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8StackFrame.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.run.debug;
+package consulo.javascript.run.debug;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8SuspendContext.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8SuspendContext.java
similarity index 96%
rename from v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8SuspendContext.java
rename to v8-debugger-impl/src/consulo/javascript/run/debug/V8SuspendContext.java
index 6e9a80a5..836e6d4d 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8SuspendContext.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8SuspendContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.run.debug;
+package consulo.javascript.run.debug;
 
 import org.chromium.sdk.DebugContext;
 import org.jetbrains.annotations.Nullable;
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8VariableValue.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8VariableValue.java
similarity index 98%
rename from v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8VariableValue.java
rename to v8-debugger-impl/src/consulo/javascript/run/debug/V8VariableValue.java
index d288d036..c082a7a1 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8VariableValue.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8VariableValue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.run.debug;
+package consulo.javascript.run.debug;
 
 import org.chromium.sdk.JsDeclarativeVariable;
 import org.chromium.sdk.JsEvaluateContext;
diff --git a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8WatchValue.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8WatchValue.java
similarity index 96%
rename from v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8WatchValue.java
rename to v8-debugger-impl/src/consulo/javascript/run/debug/V8WatchValue.java
index 1bbd7e0a..b02a16d2 100644
--- a/v8-debugger-impl/src/org/mustbe/consulo/javascript/run/debug/V8WatchValue.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8WatchValue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.run.debug;
+package consulo.javascript.run.debug;
 
 import javax.swing.Icon;
 

From 60d2b512d2cbb2750d5a797785dfd2b402c512cf Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 3 Sep 2016 20:24:50 +0300
Subject: [PATCH 007/340] droping old package name (jom module)

---
 .../consulo/json/JsonFileType.java            |  4 +--
 .../consulo/json/JsonFileTypeFactory.java     |  2 +-
 .../JsonBreadcrumbsInfoProvider.java          |  4 +--
 .../consulo/json/jom/JomElement.java          |  2 +-
 .../consulo/json/jom/JomFileDescriptor.java   |  4 +--
 .../consulo/json/jom/JomFileElement.java      |  4 +--
 .../json/jom/JomIconDescriptorUpdater.java    |  2 +-
 .../consulo/json/jom/JomManager.java          |  8 ++---
 .../JomModeAsJsonFileDescriptorProvider.java  | 10 +++---
 .../consulo/json/jom/JomPropertyGetter.java   |  2 +-
 .../mustbe => }/consulo/json/jom/JomUtil.java |  2 +-
 .../proxy/JomBadValueExpressionException.java |  2 +-
 .../jom/proxy/JomProxyInvocationHandler.java  |  6 ++--
 .../json/jom/proxy/JomValueConverter.java     | 16 +++++-----
 .../json/jom/proxy/impl/JomBooleanValue.java  |  6 ++--
 .../jom/proxy/impl/JomCollectionValue.java    |  6 ++--
 .../json/jom/proxy/impl/JomMapConverter.java  |  6 ++--
 .../proxy/impl/JomNullableNumberValue.java    |  6 ++--
 .../json/jom/proxy/impl/JomNumberValue.java   |  4 +--
 .../jom/proxy/impl/JomStringConverter.java    |  6 ++--
 .../json/lang/JsonJavaScriptParser.java       |  6 ++--
 .../json/lang/JsonJavaScriptVersion.java      |  4 +--
 .../consulo/json/lang/lexer/JsonLexer.java    |  2 +-
 .../consulo/json/lang/lexer/json.flex         |  0
 .../JsonFileDescriptorProvider.java           |  6 ++--
 .../JsonFileDescriptorProviders.java          |  6 ++--
 .../consulo/json/validation/NativeArray.java  |  2 +-
 .../completion/JsonCompletionContributor.java | 12 +++----
 ...ByAnotherPsiElementEditorNotification.java | 10 +++---
 ...therPsiElementJsonDescriptionProvider.java |  6 ++--
 ...escriptionByAnotherPsiElementProvider.java |  6 ++--
 ...scriptionByAnotherPsiElementRegistrar.java |  2 +-
 ...DescriptionByAnotherPsiElementService.java |  4 +--
 .../descriptor/JsonObjectDescriptor.java      |  4 +--
 .../descriptor/JsonPropertyDescriptor.java    |  2 +-
 .../PropertyValidationInspection.java         | 10 +++---
 .../reference/JsonPropertyNameReference.java  |  6 ++--
 .../JsonPropertyNameReferenceProvider.java    |  6 ++--
 resources/META-INF/Intentions.xml             |  2 --
 resources/META-INF/ecma6.xml                  |  2 +-
 resources/META-INF/json.xml                   | 32 +++++++++----------
 41 files changed, 115 insertions(+), 117 deletions(-)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/JsonFileType.java (95%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/JsonFileTypeFactory.java (92%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java (94%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/JomElement.java (94%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/JomFileDescriptor.java (90%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/JomFileElement.java (94%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/JomIconDescriptorUpdater.java (97%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/JomManager.java (97%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java (94%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/JomPropertyGetter.java (96%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/JomUtil.java (95%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/proxy/JomBadValueExpressionException.java (90%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/proxy/JomProxyInvocationHandler.java (94%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/proxy/JomValueConverter.java (90%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/proxy/impl/JomBooleanValue.java (87%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/proxy/impl/JomCollectionValue.java (92%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/proxy/impl/JomMapConverter.java (89%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/proxy/impl/JomNullableNumberValue.java (91%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/proxy/impl/JomNumberValue.java (77%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/jom/proxy/impl/JomStringConverter.java (85%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/lang/JsonJavaScriptParser.java (97%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/lang/JsonJavaScriptVersion.java (93%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/lang/lexer/JsonLexer.java (99%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/lang/lexer/json.flex (100%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/JsonFileDescriptorProvider.java (84%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/JsonFileDescriptorProviders.java (91%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/NativeArray.java (95%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/completion/JsonCompletionContributor.java (95%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java (94%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java (89%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java (85%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java (95%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java (99%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/descriptor/JsonObjectDescriptor.java (95%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/descriptor/JsonPropertyDescriptor.java (97%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/inspections/PropertyValidationInspection.java (96%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/psi/reference/JsonPropertyNameReference.java (89%)
 rename json-javascript-impl/src/{org/mustbe => }/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java (87%)

diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/JsonFileType.java b/json-javascript-impl/src/consulo/json/JsonFileType.java
similarity index 95%
rename from json-javascript-impl/src/org/mustbe/consulo/json/JsonFileType.java
rename to json-javascript-impl/src/consulo/json/JsonFileType.java
index a4b34cd4..1de66123 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/JsonFileType.java
+++ b/json-javascript-impl/src/consulo/json/JsonFileType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json;
+package consulo.json;
 
 import javax.swing.Icon;
 
@@ -22,7 +22,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.mustbe.consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.json.lang.JsonJavaScriptVersion;
+import consulo.json.lang.JsonJavaScriptVersion;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/JsonFileTypeFactory.java b/json-javascript-impl/src/consulo/json/JsonFileTypeFactory.java
similarity index 92%
rename from json-javascript-impl/src/org/mustbe/consulo/json/JsonFileTypeFactory.java
rename to json-javascript-impl/src/consulo/json/JsonFileTypeFactory.java
index 65fd97f6..d6f51c66 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/JsonFileTypeFactory.java
+++ b/json-javascript-impl/src/consulo/json/JsonFileTypeFactory.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.json;
+package consulo.json;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java b/json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
similarity index 94%
rename from json-javascript-impl/src/org/mustbe/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
rename to json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
index 4e984637..0a987c37 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
+++ b/json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
@@ -1,10 +1,10 @@
-package org.mustbe.consulo.json.breadcrumbs;
+package consulo.json.breadcrumbs;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.json.JsonFileType;
+import consulo.json.JsonFileType;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.FileViewProvider;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomElement.java b/json-javascript-impl/src/consulo/json/jom/JomElement.java
similarity index 94%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/JomElement.java
rename to json-javascript-impl/src/consulo/json/jom/JomElement.java
index f15ef4c8..f45cb566 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomElement.java
+++ b/json-javascript-impl/src/consulo/json/jom/JomElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.jom;
+package consulo.json.jom;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomFileDescriptor.java b/json-javascript-impl/src/consulo/json/jom/JomFileDescriptor.java
similarity index 90%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/JomFileDescriptor.java
rename to json-javascript-impl/src/consulo/json/jom/JomFileDescriptor.java
index 54e08616..9d989239 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomFileDescriptor.java
+++ b/json-javascript-impl/src/consulo/json/jom/JomFileDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.jom;
+package consulo.json.jom;
 
 import javax.swing.Icon;
 
@@ -28,7 +28,7 @@
  */
 public abstract class JomFileDescriptor<T extends JomElement>
 {
-	public static ExtensionPointName<JomFileDescriptor> EP_NAME = new ExtensionPointName<JomFileDescriptor>("org.mustbe.consulo.javascript.jomFileDescriptor");
+	public static ExtensionPointName<JomFileDescriptor> EP_NAME = new ExtensionPointName<JomFileDescriptor>("consulo.javascript.jomFileDescriptor");
 
 	private Class<T> myDefinitionClass;
 
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomFileElement.java b/json-javascript-impl/src/consulo/json/jom/JomFileElement.java
similarity index 94%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/JomFileElement.java
rename to json-javascript-impl/src/consulo/json/jom/JomFileElement.java
index 08eb6ae9..80e59d47 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomFileElement.java
+++ b/json-javascript-impl/src/consulo/json/jom/JomFileElement.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.jom;
+package consulo.json.jom;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.json.jom.proxy.JomProxyInvocationHandler;
+import consulo.json.jom.proxy.JomProxyInvocationHandler;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.openapi.util.NotNullLazyValue;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomIconDescriptorUpdater.java b/json-javascript-impl/src/consulo/json/jom/JomIconDescriptorUpdater.java
similarity index 97%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/JomIconDescriptorUpdater.java
rename to json-javascript-impl/src/consulo/json/jom/JomIconDescriptorUpdater.java
index d12eb2ab..46ed8225 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/json-javascript-impl/src/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.jom;
+package consulo.json.jom;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.PsiElement;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomManager.java b/json-javascript-impl/src/consulo/json/jom/JomManager.java
similarity index 97%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/JomManager.java
rename to json-javascript-impl/src/consulo/json/jom/JomManager.java
index 3f71a8b6..9686ec35 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomManager.java
+++ b/json-javascript-impl/src/consulo/json/jom/JomManager.java
@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.jom;
+package consulo.json.jom;
 
-import consulo.lombok.annotations.ProjectService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.JsonFileType;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
@@ -30,6 +27,9 @@
 import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.psi.util.PsiModificationTracker;
+import consulo.annotations.RequiredReadAction;
+import consulo.json.JsonFileType;
+import consulo.lombok.annotations.ProjectService;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/json-javascript-impl/src/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
similarity index 94%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
rename to json-javascript-impl/src/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
index 4a21bed7..2a4e4c77 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
+++ b/json-javascript-impl/src/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.jom;
+package consulo.json.jom;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -29,10 +29,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.validation.JsonFileDescriptorProvider;
-import org.mustbe.consulo.json.validation.NativeArray;
-import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
-import org.mustbe.consulo.json.validation.descriptor.JsonPropertyDescriptor;
+import consulo.json.validation.JsonFileDescriptorProvider;
+import consulo.json.validation.NativeArray;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.containers.ContainerUtil;
 
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomPropertyGetter.java b/json-javascript-impl/src/consulo/json/jom/JomPropertyGetter.java
similarity index 96%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/JomPropertyGetter.java
rename to json-javascript-impl/src/consulo/json/jom/JomPropertyGetter.java
index c7d11119..3d0cd702 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomPropertyGetter.java
+++ b/json-javascript-impl/src/consulo/json/jom/JomPropertyGetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.jom;
+package consulo.json.jom;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomUtil.java b/json-javascript-impl/src/consulo/json/jom/JomUtil.java
similarity index 95%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/JomUtil.java
rename to json-javascript-impl/src/consulo/json/jom/JomUtil.java
index 0bfa7e6b..d50b97b5 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/JomUtil.java
+++ b/json-javascript-impl/src/consulo/json/jom/JomUtil.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.json.jom;
+package consulo.json.jom;
 
 import java.lang.reflect.Method;
 
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomBadValueExpressionException.java b/json-javascript-impl/src/consulo/json/jom/proxy/JomBadValueExpressionException.java
similarity index 90%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomBadValueExpressionException.java
rename to json-javascript-impl/src/consulo/json/jom/proxy/JomBadValueExpressionException.java
index 2f902556..e6ba5e1f 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomBadValueExpressionException.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/JomBadValueExpressionException.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.json.jom.proxy;
+package consulo.json.jom.proxy;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/json-javascript-impl/src/consulo/json/jom/proxy/JomProxyInvocationHandler.java
similarity index 94%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomProxyInvocationHandler.java
rename to json-javascript-impl/src/consulo/json/jom/proxy/JomProxyInvocationHandler.java
index 24d7a0d3..553e7d3f 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomProxyInvocationHandler.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/JomProxyInvocationHandler.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.json.jom.proxy;
+package consulo.json.jom.proxy;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -7,8 +7,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.jom.JomElement;
-import org.mustbe.consulo.json.jom.JomUtil;
+import consulo.json.jom.JomElement;
+import consulo.json.jom.JomUtil;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.openapi.util.Comparing;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomValueConverter.java b/json-javascript-impl/src/consulo/json/jom/proxy/JomValueConverter.java
similarity index 90%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomValueConverter.java
rename to json-javascript-impl/src/consulo/json/jom/proxy/JomValueConverter.java
index e4c268fa..07d8b5e2 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/JomValueConverter.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/JomValueConverter.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.json.jom.proxy;
+package consulo.json.jom.proxy;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
@@ -12,13 +12,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.jom.JomElement;
-import org.mustbe.consulo.json.jom.proxy.impl.JomBooleanValue;
-import org.mustbe.consulo.json.jom.proxy.impl.JomCollectionValue;
-import org.mustbe.consulo.json.jom.proxy.impl.JomMapConverter;
-import org.mustbe.consulo.json.jom.proxy.impl.JomNullableNumberValue;
-import org.mustbe.consulo.json.jom.proxy.impl.JomNumberValue;
-import org.mustbe.consulo.json.jom.proxy.impl.JomStringConverter;
+import consulo.json.jom.JomElement;
+import consulo.json.jom.proxy.impl.JomBooleanValue;
+import consulo.json.jom.proxy.impl.JomCollectionValue;
+import consulo.json.jom.proxy.impl.JomMapConverter;
+import consulo.json.jom.proxy.impl.JomNullableNumberValue;
+import consulo.json.jom.proxy.impl.JomNumberValue;
+import consulo.json.jom.proxy.impl.JomStringConverter;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomBooleanValue.java b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomBooleanValue.java
similarity index 87%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomBooleanValue.java
rename to json-javascript-impl/src/consulo/json/jom/proxy/impl/JomBooleanValue.java
index d34a4716..44b4b9cc 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomBooleanValue.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomBooleanValue.java
@@ -1,12 +1,12 @@
-package org.mustbe.consulo.json.jom.proxy.impl;
+package consulo.json.jom.proxy.impl;
 
 import java.lang.reflect.Type;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
-import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
+import consulo.json.jom.proxy.JomBadValueExpressionException;
+import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.psi.PsiElement;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomCollectionValue.java b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomCollectionValue.java
similarity index 92%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomCollectionValue.java
rename to json-javascript-impl/src/consulo/json/jom/proxy/impl/JomCollectionValue.java
index d6c30f4e..1c994cfd 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomCollectionValue.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomCollectionValue.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.json.jom.proxy.impl;
+package consulo.json.jom.proxy.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -6,8 +6,8 @@
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
-import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
+import consulo.json.jom.proxy.JomBadValueExpressionException;
+import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.openapi.util.Pair;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomMapConverter.java b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomMapConverter.java
similarity index 89%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomMapConverter.java
rename to json-javascript-impl/src/consulo/json/jom/proxy/impl/JomMapConverter.java
index c33b44dc..8f598199 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomMapConverter.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomMapConverter.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.json.jom.proxy.impl;
+package consulo.json.jom.proxy.impl;
 
 import java.lang.reflect.Type;
 import java.util.Collections;
@@ -7,8 +7,8 @@
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
-import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
+import consulo.json.jom.proxy.JomBadValueExpressionException;
+import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.openapi.util.Pair;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNullableNumberValue.java b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
similarity index 91%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
rename to json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
index 20677c98..0406df8a 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
@@ -1,12 +1,12 @@
-package org.mustbe.consulo.json.jom.proxy.impl;
+package consulo.json.jom.proxy.impl;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
-import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
+import consulo.json.jom.proxy.JomBadValueExpressionException;
+import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.openapi.util.NotNullLazyValue;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNumberValue.java b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNumberValue.java
similarity index 77%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNumberValue.java
rename to json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNumberValue.java
index 8ba4f8d2..5752d0d7 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomNumberValue.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNumberValue.java
@@ -1,6 +1,6 @@
-package org.mustbe.consulo.json.jom.proxy.impl;
+package consulo.json.jom.proxy.impl;
 
-import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
+import consulo.json.jom.proxy.JomBadValueExpressionException;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomStringConverter.java b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
similarity index 85%
rename from json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomStringConverter.java
rename to json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
index b5d3cf0c..34a49433 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
@@ -1,12 +1,12 @@
-package org.mustbe.consulo.json.jom.proxy.impl;
+package consulo.json.jom.proxy.impl;
 
 import java.lang.reflect.Type;
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.json.jom.proxy.JomBadValueExpressionException;
-import org.mustbe.consulo.json.jom.proxy.JomValueConverter;
+import consulo.json.jom.proxy.JomBadValueExpressionException;
+import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptParser.java b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
similarity index 97%
rename from json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptParser.java
rename to json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
index a170477a..5c46f0c2 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptParser.java
+++ b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.json.lang;
+package consulo.json.lang;
 
 import consulo.lang.LanguageVersion;
 import consulo.lombok.annotations.Logger;
@@ -124,7 +124,7 @@ else if(tokenType == JSTokenTypes.RBRACKET)
 
 	public void parseObjectLiteralExpression(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
+		JsonJavaScriptParser.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 
@@ -170,7 +170,7 @@ public static boolean isNotPropertyStart(final IElementType elementType)
 
 	public void parseArrayLiteralExpression(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
+		JsonJavaScriptParser.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 		boolean commaExpected = false;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptVersion.java b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
similarity index 93%
rename from json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptVersion.java
rename to json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
index 15ed70e6..b64f7401 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
@@ -1,10 +1,10 @@
-package org.mustbe.consulo.json.lang;
+package consulo.json.lang;
 
 import org.jetbrains.annotations.NotNull;
 import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.json.lang.lexer.JsonLexer;
+import consulo.json.lang.lexer.JsonLexer;
 import com.intellij.lang.PsiParser;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/lang/lexer/JsonLexer.java b/json-javascript-impl/src/consulo/json/lang/lexer/JsonLexer.java
similarity index 99%
rename from json-javascript-impl/src/org/mustbe/consulo/json/lang/lexer/JsonLexer.java
rename to json-javascript-impl/src/consulo/json/lang/lexer/JsonLexer.java
index 36f1319d..9ee56765 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/lang/lexer/JsonLexer.java
+++ b/json-javascript-impl/src/consulo/json/lang/lexer/JsonLexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.4.4 on 15.02.16 12:22 */
 
-package org.mustbe.consulo.json.lang.lexer;
+package consulo.json.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/lang/lexer/json.flex b/json-javascript-impl/src/consulo/json/lang/lexer/json.flex
similarity index 100%
rename from json-javascript-impl/src/org/mustbe/consulo/json/lang/lexer/json.flex
rename to json-javascript-impl/src/consulo/json/lang/lexer/json.flex
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProvider.java b/json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProvider.java
similarity index 84%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProvider.java
rename to json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProvider.java
index 3e6aa3e7..afb39668 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProvider.java
+++ b/json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProvider.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation;
+package consulo.json.validation;
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.PsiFile;
 
@@ -28,7 +28,7 @@
  */
 public interface JsonFileDescriptorProvider
 {
-	ExtensionPointName<JsonFileDescriptorProvider> EP_NAME = ExtensionPointName.create("org.mustbe.consulo.javascript.jsonFileDescriptorProvider");
+	ExtensionPointName<JsonFileDescriptorProvider> EP_NAME = ExtensionPointName.create("consulo.javascript.jsonFileDescriptorProvider");
 
 	@RequiredReadAction
 	boolean isMyFile(@NotNull PsiFile file);
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProviders.java b/json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProviders.java
similarity index 91%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProviders.java
rename to json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProviders.java
index 50c2bdbf..7045fa8c 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/JsonFileDescriptorProviders.java
+++ b/json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProviders.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation;
+package consulo.json.validation;
 
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.JsonFileType;
-import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.JsonFileType;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/NativeArray.java b/json-javascript-impl/src/consulo/json/validation/NativeArray.java
similarity index 95%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/NativeArray.java
rename to json-javascript-impl/src/consulo/json/validation/NativeArray.java
index 1a3e9873..346a2260 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/NativeArray.java
+++ b/json-javascript-impl/src/consulo/json/validation/NativeArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation;
+package consulo.json.validation;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/completion/JsonCompletionContributor.java b/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
similarity index 95%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/completion/JsonCompletionContributor.java
rename to json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
index 04ded0c7..d709cad1 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.completion;
+package consulo.json.validation.completion;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -23,11 +23,11 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.json.validation.JsonFileDescriptorProviders;
-import org.mustbe.consulo.json.validation.NativeArray;
-import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
-import org.mustbe.consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import org.mustbe.consulo.json.validation.inspections.PropertyValidationInspection;
+import consulo.json.validation.JsonFileDescriptorProviders;
+import consulo.json.validation.NativeArray;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.validation.descriptor.JsonPropertyDescriptor;
+import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.codeInsight.completion.CompletionContributor;
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionResultSet;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
similarity index 94%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
rename to json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index 57360b04..42b7631e 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement;
+package consulo.json.validation.descriptionByAnotherPsiElement;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.json.JsonFileType;
-import org.mustbe.consulo.json.jom.JomElement;
-import org.mustbe.consulo.json.jom.JomFileElement;
-import org.mustbe.consulo.json.jom.JomManager;
+import consulo.json.JsonFileType;
+import consulo.json.jom.JomElement;
+import consulo.json.jom.JomFileElement;
+import consulo.json.jom.JomManager;
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.project.Project;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
similarity index 89%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
rename to json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
index cf2e6121..db5fac1a 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement;
+package consulo.json.validation.descriptionByAnotherPsiElement;
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.validation.JsonFileDescriptorProvider;
-import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.validation.JsonFileDescriptorProvider;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
similarity index 85%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
rename to json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
index 138c6a99..ac0ed879 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement;
+package consulo.json.validation.descriptionByAnotherPsiElement;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredDispatchThread;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
@@ -31,7 +31,7 @@
  */
 public interface DescriptionByAnotherPsiElementProvider<T extends PsiElement>
 {
-	ExtensionPointName<DescriptionByAnotherPsiElementProvider<?>> EP_NAME = ExtensionPointName.create("org.mustbe.consulo.javascript.jsonDescriptionByAnotherPsiElementProvider");
+	ExtensionPointName<DescriptionByAnotherPsiElementProvider<?>> EP_NAME = ExtensionPointName.create("consulo.javascript.jsonDescriptionByAnotherPsiElementProvider");
 
 	@NotNull
 	String getId();
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
similarity index 95%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
rename to json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
index 70df389e..f69ad7b0 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement;
+package consulo.json.validation.descriptionByAnotherPsiElement;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.components.ApplicationComponent;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
similarity index 99%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
rename to json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index 627a18c0..6f752863 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement;
+package consulo.json.validation.descriptionByAnotherPsiElement;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import consulo.lombok.annotations.ProjectService;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -42,6 +41,7 @@
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
 import com.intellij.util.containers.ContainerUtil;
+import consulo.lombok.annotations.ProjectService;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonObjectDescriptor.java b/json-javascript-impl/src/consulo/json/validation/descriptor/JsonObjectDescriptor.java
similarity index 95%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonObjectDescriptor.java
rename to json-javascript-impl/src/consulo/json/validation/descriptor/JsonObjectDescriptor.java
index 76ac4e11..f32f454d 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonObjectDescriptor.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptor/JsonObjectDescriptor.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.descriptor;
+package consulo.json.validation.descriptor;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.json.validation.NativeArray;
+import consulo.json.validation.NativeArray;
 import com.intellij.openapi.util.Factory;
 import com.intellij.util.containers.ContainerUtil;
 
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/json-javascript-impl/src/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
similarity index 97%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
rename to json-javascript-impl/src/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
index 483e7d2e..365bb1d7 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.descriptor;
+package consulo.json.validation.descriptor;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/inspections/PropertyValidationInspection.java b/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
similarity index 96%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/inspections/PropertyValidationInspection.java
rename to json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
index 0ab991cf..f0fb1e33 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.inspections;
+package consulo.json.validation.inspections;
 
 import gnu.trove.THashSet;
 
@@ -28,10 +28,10 @@
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
 import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.json.validation.JsonFileDescriptorProviders;
-import org.mustbe.consulo.json.validation.NativeArray;
-import org.mustbe.consulo.json.validation.descriptor.JsonObjectDescriptor;
-import org.mustbe.consulo.json.validation.descriptor.JsonPropertyDescriptor;
+import consulo.json.validation.JsonFileDescriptorProviders;
+import consulo.json.validation.NativeArray;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReference.java b/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
similarity index 89%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
rename to json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
index 27c9d9ed..694603f7 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
+++ b/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.psi.reference;
+package consulo.json.validation.psi.reference;
 
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import org.mustbe.consulo.json.validation.inspections.PropertyValidationInspection;
+import consulo.json.validation.descriptor.JsonPropertyDescriptor;
+import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReference;
 import com.intellij.psi.PsiElement;
diff --git a/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
similarity index 87%
rename from json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
rename to json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
index deb848cd..28fc861e 100644
--- a/json-javascript-impl/src/org/mustbe/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ b/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.json.validation.psi.reference;
+package consulo.json.validation.psi.reference;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import org.mustbe.consulo.json.validation.inspections.PropertyValidationInspection;
+import consulo.json.validation.descriptor.JsonPropertyDescriptor;
+import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
 import com.intellij.psi.PsiElement;
diff --git a/resources/META-INF/Intentions.xml b/resources/META-INF/Intentions.xml
index 1bfb1d8a..246895c7 100644
--- a/resources/META-INF/Intentions.xml
+++ b/resources/META-INF/Intentions.xml
@@ -16,8 +16,6 @@
 
 <idea-plugin version="2">
 	<extensions defaultExtensionNs="com.intellij">
-		<errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-
 		<!-- Numbers -->
 		<intentionAction>
 			<className>org.intellij.idea.lang.javascript.intention.number.JSConvertIntegerToDecimalIntention</className>
diff --git a/resources/META-INF/ecma6.xml b/resources/META-INF/ecma6.xml
index c0981983..851d3da3 100644
--- a/resources/META-INF/ecma6.xml
+++ b/resources/META-INF/ecma6.xml
@@ -20,7 +20,7 @@
 		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.EcmaScript6JavaScriptVersion" />
 	</extensions>
 
-	<extensions defaultExtensionNs="org.mustbe.consulo.javascript">
+	<extensions defaultExtensionNs="consulo.javascript">
 		<quickFixFactory key="ECMASCRIPT_6" implementationClass="org.mustbe.consulo.javascript.ide.codeInsight.EcmaScript6QuickFixFactory" />
 	</extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/resources/META-INF/json.xml b/resources/META-INF/json.xml
index bc8eec78..c8047608 100644
--- a/resources/META-INF/json.xml
+++ b/resources/META-INF/json.xml
@@ -17,27 +17,27 @@
 <idea-plugin>
 	<application-components>
 		<component>
-			<implementation-class>org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementRegistrar</implementation-class>
+			<implementation-class>consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementRegistrar</implementation-class>
 		</component>
 	</application-components>
 
 	<extensionPoints>
-		<extensionPoint name="jomFileDescriptor" interface="org.mustbe.consulo.json.jom.JomFileDescriptor"/>
-		<extensionPoint name="jsonFileDescriptorProvider" interface="org.mustbe.consulo.json.validation.JsonFileDescriptorProvider"/>
+		<extensionPoint name="jomFileDescriptor" interface="consulo.json.jom.JomFileDescriptor"/>
+		<extensionPoint name="jsonFileDescriptorProvider" interface="consulo.json.validation.JsonFileDescriptorProvider"/>
 		<extensionPoint name="jsonDescriptionByAnotherPsiElementProvider"
-						interface="org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementProvider"/>
+						interface="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementProvider"/>
 	</extensionPoints>
 
 	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="org.mustbe.consulo.json.JsonFileTypeFactory"/>
-		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.json.lang.JsonJavaScriptVersion"/>
+		<fileTypeFactory implementation="consulo.json.JsonFileTypeFactory"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.json.lang.JsonJavaScriptVersion"/>
 
-		<iconDescriptorUpdater implementation="org.mustbe.consulo.json.jom.JomIconDescriptorUpdater"/>
+		<iconDescriptorUpdater implementation="consulo.json.jom.JomIconDescriptorUpdater"/>
 
-		<projectService serviceImplementation="org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementService"/>
-		<projectService serviceImplementation="org.mustbe.consulo.json.jom.JomManager"/>
+		<projectService serviceImplementation="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementService"/>
+		<projectService serviceImplementation="consulo.json.jom.JomManager"/>
 
-		<completion.contributor language="JavaScript" implementationClass="org.mustbe.consulo.json.validation.completion.JsonCompletionContributor"/>
+		<completion.contributor language="JavaScript" implementationClass="consulo.json.validation.completion.JsonCompletionContributor"/>
 
 		<quoteHandler fileType="JSON" className="org.mustbe.consulo.javascript.lang.JavaScriptQuoteHandler" />
 
@@ -45,18 +45,18 @@
 						 displayName="Property validation"
 						 groupName="JSON"
 						 enabledByDefault="true"
-						 implementationClass="org.mustbe.consulo.json.validation.inspections.PropertyValidationInspection"/>
+						 implementationClass="consulo.json.validation.inspections.PropertyValidationInspection"/>
 	</extensions>
 
 	<extensions defaultExtensionNs="com.intellij.xml">
-		<breadcrumbsInfoProvider implementation="org.mustbe.consulo.json.breadcrumbs.JsonBreadcrumbsInfoProvider" />
+		<breadcrumbsInfoProvider implementation="consulo.json.breadcrumbs.JsonBreadcrumbsInfoProvider" />
 	</extensions>
 
-	<extensions defaultExtensionNs="org.mustbe.consulo.javascript">
-		<propertyNameReferenceProvider implementation="org.mustbe.consulo.json.validation.psi.reference.JsonPropertyNameReferenceProvider" order="before default"/>
+	<extensions defaultExtensionNs="consulo.javascript">
+		<propertyNameReferenceProvider implementation="consulo.json.validation.psi.reference.JsonPropertyNameReferenceProvider" order="before default"/>
 
-		<jsonFileDescriptorProvider implementation="org.mustbe.consulo.json.jom.JomModeAsJsonFileDescriptorProvider"/>
+		<jsonFileDescriptorProvider implementation="consulo.json.jom.JomModeAsJsonFileDescriptorProvider"/>
 
-		<jsonFileDescriptorProvider implementation="org.mustbe.consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementJsonDescriptionProvider"/>
+		<jsonFileDescriptorProvider implementation="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementJsonDescriptionProvider"/>
 	</extensions>
 </idea-plugin>
\ No newline at end of file

From 7c820488a2bb6df3ffe37776b25d15ea62b763a4 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 3 Sep 2016 20:28:49 +0300
Subject: [PATCH 008/340] droping old package name (ts)

---
 resources/META-INF/typescript.xml                               | 2 +-
 .../{org/mustbe => }/consulo/typescript/TypeScriptFileType.java | 2 +-
 .../consulo/typescript/TypeScriptFileTypeFactory.java           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename typescript-impl/src/{org/mustbe => }/consulo/typescript/TypeScriptFileType.java (97%)
 rename typescript-impl/src/{org/mustbe => }/consulo/typescript/TypeScriptFileTypeFactory.java (96%)

diff --git a/resources/META-INF/typescript.xml b/resources/META-INF/typescript.xml
index acfdcb95..f6b7ea71 100644
--- a/resources/META-INF/typescript.xml
+++ b/resources/META-INF/typescript.xml
@@ -16,6 +16,6 @@
 
 <idea-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="org.mustbe.consulo.typescript.TypeScriptFileTypeFactory" />
+		<fileTypeFactory implementation="consulo.typescript.TypeScriptFileTypeFactory" />
 	</extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/typescript-impl/src/org/mustbe/consulo/typescript/TypeScriptFileType.java b/typescript-impl/src/consulo/typescript/TypeScriptFileType.java
similarity index 97%
rename from typescript-impl/src/org/mustbe/consulo/typescript/TypeScriptFileType.java
rename to typescript-impl/src/consulo/typescript/TypeScriptFileType.java
index 8cf7da8a..8f927fa0 100644
--- a/typescript-impl/src/org/mustbe/consulo/typescript/TypeScriptFileType.java
+++ b/typescript-impl/src/consulo/typescript/TypeScriptFileType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.typescript;
+package consulo.typescript;
 
 import javax.swing.Icon;
 
diff --git a/typescript-impl/src/org/mustbe/consulo/typescript/TypeScriptFileTypeFactory.java b/typescript-impl/src/consulo/typescript/TypeScriptFileTypeFactory.java
similarity index 96%
rename from typescript-impl/src/org/mustbe/consulo/typescript/TypeScriptFileTypeFactory.java
rename to typescript-impl/src/consulo/typescript/TypeScriptFileTypeFactory.java
index 0ea279ac..4172ac35 100644
--- a/typescript-impl/src/org/mustbe/consulo/typescript/TypeScriptFileTypeFactory.java
+++ b/typescript-impl/src/consulo/typescript/TypeScriptFileTypeFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.typescript;
+package consulo.typescript;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;

From 269422cf93429b84c9ac42d81a570ef31c473849 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 3 Sep 2016 20:51:22 +0300
Subject: [PATCH 009/340] migarated to new package

---
 .../actionscript/ActionScriptFileType.java    | 10 ++---
 .../ActionScriptFileTypeFactory.java          |  2 +-
 .../lang/ActionScriptLanguageVersion.java     |  8 ++--
 .../ClientJavaScriptModuleExtension.java      | 13 +++---
 .../ClientJavaScriptModuleExtensionPanel.java | 12 ++---
 ...lientJavaScriptMutableModuleExtension.java |  6 +--
 ...ntJavaScriptPredefinedBundlesProvider.java |  2 +-
 .../module/sdk/ClientJavaScriptSdkType.java   |  2 +-
 .../lang/EcmaScript4JavaScriptVersion.java    |  4 +-
 .../parsing/EcmaScript4ExpressionParsing.java |  2 +-
 .../parsing/EcmaScript4FunctionParsing.java   |  2 +-
 .../lang/parsing/EcmaScript4Parser.java       |  2 +-
 .../parsing/EcmaScript4ParsingContext.java    |  2 +-
 .../parsing/EcmaScript4StatementParsing.java  | 10 ++---
 .../EcmaScript6QuickFixFactory.java           |  4 +-
 ...cmaScript6CreateJSFunctionOrMethodFix.java |  2 +-
 .../lang/EcmaScript6JavaScriptVersion.java    |  8 ++--
 .../javascript/lang/EcmaScriptFileType.java   |  2 +-
 .../lang/EcmaScriptFileTypeFactory.java       |  2 +-
 .../lang/lexer/EcmaScript6Lexer.java          |  2 +-
 .../javascript/lang/lexer/ecmascript6.flex    |  2 +-
 .../parsing/EcmaScript6ExpressionParsing.java |  2 +-
 .../lang/parsing/EcmaScript6Parser.java       |  2 +-
 .../parsing/EcmaScript6ParsingContext.java    |  2 +-
 .../parsing/EcmaScript6StatementParsing.java  |  6 +--
 .../EcmaScript6StrictParserBuilder.java       |  4 +-
 .../inspectjs/utils/EquivalenceChecker.java   |  2 +-
 .../javascript/intention/JSIntention.java     |  2 +-
 ...inConcatenatedStringLiteralsIntention.java |  4 +-
 .../psiutil/EquivalenceChecker.java           |  2 +-
 .../javascript/psiutil/JSElementFactory.java  |  2 +-
 .../lang/JavaScript16LanguageVersion.java     |  6 +--
 .../lang/lexer/JavaScript16Lexer.java         |  2 +-
 .../javascript/lang/lexer/javascript16.flex   |  2 +-
 .../lang/JavaScript17LanguageVersion.java     |  6 +--
 .../lang/lexer/JavaScript17Lexer.java         |  2 +-
 .../javascript/lang/lexer/javascript17.flex   |  2 +-
 .../lang/JavaScript185LanguageVersion.java    |  6 +--
 .../lang/JavaScript18LanguageVersion.java     |  6 +--
 .../src/consulo/json/JsonFileType.java        |  6 +--
 .../JsonBreadcrumbsInfoProvider.java          |  6 +--
 .../jom/proxy/impl/JomStringConverter.java    |  8 ++--
 .../json/lang/JsonJavaScriptParser.java       | 10 ++---
 .../json/lang/JsonJavaScriptVersion.java      |  8 ++--
 .../src/consulo/json/lang/lexer/json.flex     |  2 +-
 .../PropertyValidationInspection.java         | 12 ++---
 resources/META-INF/actionscript.xml           |  4 +-
 resources/META-INF/ecma4.xml                  |  2 +-
 resources/META-INF/ecma6.xml                  |  6 +--
 resources/META-INF/json.xml                   |  2 +-
 resources/META-INF/plugin.xml                 | 44 +++++++++----------
 resources/META-INF/regexp.xml                 |  2 +-
 .../javascript/JSDebuggerSupportUtils.java    |  2 +-
 .../lang/javascript/JSElementType.java        |  2 +-
 .../lang/javascript/JSElementTypes.java       |  6 +--
 .../lang/javascript/JSLanguageInjector.java   |  2 +-
 .../lang/javascript/JSTokenTypes.java         |  8 ++--
 .../javascript/JavaScriptCodeContextType.java |  2 +-
 .../lang/javascript/JavaScriptFileType.java   | 10 ++---
 .../javascript/findUsages/JSWordsScanner.java |  2 +-
 .../JavaScriptGroupRuleProviderBase.java      |  2 +-
 .../flex/ECMAScriptImportOptimizer.java       |  2 +-
 .../lang/javascript/flex/JSResolveHelper.java |  2 +-
 .../JSCodeStyleSettingsProvider.java          |  2 +-
 .../formatter/JavaScriptCodeStylePanel.java   |  2 +-
 ...riptLanguageCodeStyleSettingsProvider.java |  2 +-
 .../highlighting/JSHighlighter.java           |  2 +-
 .../JavaScriptColorsAndFontsPage.java         |  4 +-
 .../JavaScriptHighlightVisitor.java           | 10 ++---
 .../javascript/index/JavaScriptIndexer.java   |  2 +-
 .../JSUnresolvedFunctionInspection.java       |  6 +--
 .../JSUnresolvedVariableInspection.java       |  4 +-
 .../JSUntypedDeclarationInspection.java       |  2 +-
 .../inspections/qucikFixes/BaseCreateFix.java |  8 ++--
 .../qucikFixes/CreateJSFunctionFixBase.java   |  4 +-
 .../CreateJSFunctionOrMethodFix.java          |  4 +-
 .../JavaScriptSymbolContributor.java          |  2 +-
 .../lang/javascript/psi/JSElementVisitor.java |  2 +-
 .../lang/javascript/psi/JSExpression.java     |  2 +-
 .../lang/javascript/psi/JSFunction.java       |  6 +--
 .../lang/javascript/psi/JSProperty.java       |  6 +--
 .../javascript/psi/JSStubElementType.java     |  2 +-
 .../lang/javascript/psi/JSVariable.java       |  6 +--
 .../impl/JSAttributeNameValuePairImpl.java    |  2 +-
 .../javascript/psi/impl/JSChangeUtil.java     |  4 +-
 .../lang/javascript/psi/impl/JSClassImpl.java |  4 +-
 .../javascript/psi/impl/JSExpressionImpl.java |  2 +-
 .../lang/javascript/psi/impl/JSFileImpl.java  |  2 +-
 .../psi/impl/JSFunctionBaseImpl.java          | 10 ++---
 .../psi/impl/JSFunctionExpressionImpl.java    |  2 +-
 .../psi/impl/JSIncludeDirectiveImpl.java      |  2 +-
 .../psi/impl/JSLiteralExpressionImpl.java     |  8 ++--
 .../psi/impl/JSNamespaceDeclarationImpl.java  |  2 +-
 .../psi/impl/JSNewExpressionImpl.java         |  6 +--
 .../psi/impl/JSPostfixExpressionImpl.java     |  2 +-
 .../psi/impl/JSPrefixExpressionImpl.java      |  2 +-
 .../javascript/psi/impl/JSPropertyImpl.java   |  8 ++--
 .../javascript/psi/impl/JSPsiImplUtils.java   |  8 ++--
 .../psi/impl/JSReferenceExpressionImpl.java   | 10 ++---
 .../psi/impl/JSReferenceListImpl.java         |  4 +-
 .../psi/impl/JSVariableBaseImpl.java          |  8 ++--
 .../JSPropertyNameReferenceProvider.java      |  2 +-
 .../psi/resolve/BaseJSSymbolProcessor.java    |  6 +--
 .../javascript/psi/resolve/JSResolveUtil.java | 10 ++---
 .../psi/resolve/VariantsProcessor.java        |  4 +-
 .../psi/resolve/WalkUpResolveProcessor.java   |  2 +-
 .../stubs/JSImplementedInterfacesIndex.java   |  2 +-
 .../javascript/psi/stubs/JSNameIndex.java     |  2 +-
 .../psi/stubs/JSQualifiedElementIndex.java    |  2 +-
 .../psi/stubs/JSSuperClassIndex.java          |  2 +-
 .../javascript/psi/util/JSLookupUtil.java     |  2 +-
 .../search/JSClassInheritorsProvider.java     |  2 +-
 .../lang/javascript/search/JSClassSearch.java |  2 +-
 .../search/JSDefinitionsSearchExecutor.java   |  2 +-
 .../search/JSReferencesSearchExecutor.java    |  2 +-
 .../javascript/types/JSClassElementType.java  |  4 +-
 .../types/JSQualifiedStubElementType.java     |  2 +-
 .../types/JSReferenceListElementType.java     |  4 +-
 .../UpdateJavaScriptFileCopyright.java        |  2 +-
 ...UpdateJavaScriptFileCopyrightProvider.java |  2 +-
 .../ide/JavaScriptIconDescriptorUpdater.java  |  2 +-
 .../actions/JavaScriptCreateFileAction.java   |  4 +-
 .../JavaScriptQuickFixFactory.java            |  9 ++--
 ...avaScriptKeywordCompletionContributor.java |  2 +-
 .../ide/completion/SpaceInsertHandler.java    |  2 +-
 .../ide/hightlight/JavaScriptHighlighter.java |  2 +-
 .../JavaScriptSyntaxHighlightFactory.java     |  6 +--
 .../JavaScriptSyntaxHighlightKeys.java        |  2 +-
 .../lang/BaseJavaScriptLanguageVersion.java   |  4 +-
 .../lang/JavaScript15LanguageVersion.java     |  6 +--
 .../javascript/lang/JavaScriptConstants.java  |  2 +-
 .../javascript/lang/JavaScriptFeature.java    |  2 +-
 .../lang/JavaScriptFileTypeFactory.java       |  2 +-
 .../lang/JavaScriptFileTypeWithVersion.java   |  2 +-
 .../javascript/lang/JavaScriptLanguage.java   |  2 +-
 .../JavaScriptLanguageVersionResolver.java    |  2 +-
 .../lang/JavaScriptParsingDefinition.java     |  2 +-
 .../lang/JavaScriptQuoteHandler.java          |  2 +-
 .../JavaScriptRegexpMultiHostInjector.java    |  2 +-
 .../javascript/lang/JavaScriptTokenSets.java  |  2 +-
 .../lang/JavaScriptVersionUtil.java           |  2 +-
 .../lang/StandardJavaScriptVersions.java      |  2 +-
 .../lang/lexer/JavaScript15Lexer.java         |  8 ++--
 .../javascript/lang/lexer/javascript15.flex   |  2 +-
 .../JavaScriptClassContributor.java           |  4 +-
 .../lang/parsing/ContextKeywordCache.java     |  2 +-
 .../lang/parsing/ExpressionParsing.java       | 16 +++----
 .../lang/parsing/FunctionParsing.java         |  2 +-
 .../lang/parsing/JavaScriptParser.java        |  2 +-
 .../lang/parsing/JavaScriptParserBuilder.java |  2 +-
 .../parsing/JavaScriptParsingContext.java     |  2 +-
 .../javascript/lang/parsing/Parsing.java      |  4 +-
 .../lang/parsing/StatementParsing.java        | 38 ++++++++--------
 .../impl/JavaScriptStrictParserBuilder.java   |  8 ++--
 .../lang/psi/JavaScriptPrimitiveType.java     |  2 +-
 .../lang/psi/JavaScriptSimpleType.java        |  2 +-
 .../javascript/lang/psi/JavaScriptType.java   |  2 +-
 .../lang/psi/JavaScriptTypeElement.java       |  2 +-
 .../lang/psi/impl/JavaScriptClassType.java    |  4 +-
 .../BaseJavaScriptElementType.java            |  4 +-
 .../lang/psi/stubs/JavaScriptIndexKeys.java   |  2 +-
 .../extension/JavaScriptModuleExtension.java  |  4 +-
 .../JavaScriptMutableModuleExtension.java     |  4 +-
 .../javascript/psi/JSComputedName.java        |  2 +-
 .../psi/JavaScriptLambdaExpression.java       |  2 +-
 .../psi/impl/JSComputedNameImpl.java          |  4 +-
 .../impl/JavaScriptLambdaExpressionImpl.java  |  6 +--
 .../stubs/index/JavaScriptClassNameIndex.java |  4 +-
 .../typescript/TypeScriptFileType.java        |  2 +-
 169 files changed, 364 insertions(+), 366 deletions(-)
 rename actionscript-impl/src/{org/mustbe => }/consulo/actionscript/ActionScriptFileType.java (87%)
 rename actionscript-impl/src/{org/mustbe => }/consulo/actionscript/ActionScriptFileTypeFactory.java (90%)
 rename actionscript-impl/src/{org/mustbe => }/consulo/actionscript/lang/ActionScriptLanguageVersion.java (83%)
 rename client-javascript-impl/src/{org/mustbe => }/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java (87%)
 rename client-javascript-impl/src/{org/mustbe => }/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java (86%)
 rename client-javascript-impl/src/{org/mustbe => }/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java (87%)
 rename client-javascript-impl/src/{org/mustbe => }/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java (97%)
 rename client-javascript-impl/src/{org/mustbe => }/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java (96%)
 rename ecmascript4-impl/src/{org/mustbe => }/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java (90%)
 rename ecmascript4-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java (98%)
 rename ecmascript4-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java (98%)
 rename ecmascript4-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript4Parser.java (84%)
 rename ecmascript4-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java (91%)
 rename ecmascript4-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java (95%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java (86%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java (93%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java (89%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/EcmaScriptFileType.java (97%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/EcmaScriptFileTypeFactory.java (90%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/lexer/EcmaScript6Lexer.java (99%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/lexer/ecmascript6.flex (99%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java (98%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript6Parser.java (95%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java (95%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java (97%)
 rename ecmascript6-impl/src/{org/mustbe => }/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java (82%)
 rename javascript16-impl/src/{org/mustbe => }/consulo/javascript/lang/JavaScript16LanguageVersion.java (90%)
 rename javascript16-impl/src/{org/mustbe => }/consulo/javascript/lang/lexer/JavaScript16Lexer.java (99%)
 rename javascript16-impl/src/{org/mustbe => }/consulo/javascript/lang/lexer/javascript16.flex (99%)
 rename javascript17-impl/src/{org/mustbe => }/consulo/javascript/lang/JavaScript17LanguageVersion.java (90%)
 rename javascript17-impl/src/{org/mustbe => }/consulo/javascript/lang/lexer/JavaScript17Lexer.java (99%)
 rename javascript17-impl/src/{org/mustbe => }/consulo/javascript/lang/lexer/javascript17.flex (99%)
 rename javascript18-impl/src/{org/mustbe => }/consulo/javascript/lang/JavaScript185LanguageVersion.java (90%)
 rename javascript18-impl/src/{org/mustbe => }/consulo/javascript/lang/JavaScript18LanguageVersion.java (90%)
 rename src/{org/mustbe => }/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java (97%)
 rename src/{org/mustbe => }/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java (99%)
 rename src/{org/mustbe => }/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java (86%)
 rename src/{org/mustbe => }/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java (98%)
 rename src/{org/mustbe => }/consulo/javascript/ide/completion/SpaceInsertHandler.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java (99%)
 rename src/{org/mustbe => }/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java (80%)
 rename src/{org/mustbe => }/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java (98%)
 rename src/{org/mustbe => }/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java (93%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScript15LanguageVersion.java (86%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptConstants.java (73%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptFeature.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptFileTypeFactory.java (95%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java (95%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptLanguage.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java (97%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptParsingDefinition.java (98%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptQuoteHandler.java (97%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java (97%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptTokenSets.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/lang/JavaScriptVersionUtil.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/lang/StandardJavaScriptVersions.java (98%)
 rename src/{org/mustbe => }/consulo/javascript/lang/lexer/JavaScript15Lexer.java (99%)
 rename src/{org/mustbe => }/consulo/javascript/lang/lexer/javascript15.flex (99%)
 rename src/{org/mustbe => }/consulo/javascript/lang/navigation/JavaScriptClassContributor.java (93%)
 rename src/{org/mustbe => }/consulo/javascript/lang/parsing/ContextKeywordCache.java (92%)
 rename src/{org/mustbe => }/consulo/javascript/lang/parsing/ExpressionParsing.java (98%)
 rename src/{org/mustbe => }/consulo/javascript/lang/parsing/FunctionParsing.java (98%)
 rename src/{org/mustbe => }/consulo/javascript/lang/parsing/JavaScriptParser.java (95%)
 rename src/{org/mustbe => }/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java (84%)
 rename src/{org/mustbe => }/consulo/javascript/lang/parsing/JavaScriptParsingContext.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/lang/parsing/Parsing.java (95%)
 rename src/{org/mustbe => }/consulo/javascript/lang/parsing/StatementParsing.java (92%)
 rename src/{org/mustbe => }/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java (90%)
 rename src/{org/mustbe => }/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java (97%)
 rename src/{org/mustbe => }/consulo/javascript/lang/psi/JavaScriptSimpleType.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/lang/psi/JavaScriptType.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/lang/psi/JavaScriptTypeElement.java (94%)
 rename src/{org/mustbe => }/consulo/javascript/lang/psi/impl/JavaScriptClassType.java (91%)
 rename src/{org/mustbe => }/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java (88%)
 rename src/{org/mustbe => }/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java (96%)
 rename src/{org/mustbe => }/consulo/javascript/module/extension/JavaScriptModuleExtension.java (75%)
 rename src/{org/mustbe => }/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java (89%)
 rename src/{org/mustbe => }/consulo/javascript/psi/JSComputedName.java (95%)
 rename src/{org/mustbe => }/consulo/javascript/psi/JavaScriptLambdaExpression.java (95%)
 rename src/{org/mustbe => }/consulo/javascript/psi/impl/JSComputedNameImpl.java (92%)
 rename src/{org/mustbe => }/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java (95%)
 rename src/{org/mustbe => }/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java (89%)

diff --git a/actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileType.java b/actionscript-impl/src/consulo/actionscript/ActionScriptFileType.java
similarity index 87%
rename from actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileType.java
rename to actionscript-impl/src/consulo/actionscript/ActionScriptFileType.java
index 1b0bda73..84d91d05 100644
--- a/actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileType.java
+++ b/actionscript-impl/src/consulo/actionscript/ActionScriptFileType.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.actionscript;
+package consulo.actionscript;
 
 import javax.swing.Icon;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.actionscript.lang.ActionScriptLanguageVersion;
-import org.mustbe.consulo.javascript.lang.JavaScriptFileTypeWithVersion;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import consulo.lang.LanguageVersion;
+import consulo.actionscript.lang.ActionScriptLanguageVersion;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.lang.LanguageVersion;
 
 /**
  * @author VISTALL
diff --git a/actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileTypeFactory.java b/actionscript-impl/src/consulo/actionscript/ActionScriptFileTypeFactory.java
similarity index 90%
rename from actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileTypeFactory.java
rename to actionscript-impl/src/consulo/actionscript/ActionScriptFileTypeFactory.java
index 6ab25e12..1575d177 100644
--- a/actionscript-impl/src/org/mustbe/consulo/actionscript/ActionScriptFileTypeFactory.java
+++ b/actionscript-impl/src/consulo/actionscript/ActionScriptFileTypeFactory.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.actionscript;
+package consulo.actionscript;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
diff --git a/actionscript-impl/src/org/mustbe/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/actionscript-impl/src/consulo/actionscript/lang/ActionScriptLanguageVersion.java
similarity index 83%
rename from actionscript-impl/src/org/mustbe/consulo/actionscript/lang/ActionScriptLanguageVersion.java
rename to actionscript-impl/src/consulo/actionscript/lang/ActionScriptLanguageVersion.java
index 0a0a2010..f92ddc99 100644
--- a/actionscript-impl/src/org/mustbe/consulo/actionscript/lang/ActionScriptLanguageVersion.java
+++ b/actionscript-impl/src/consulo/actionscript/lang/ActionScriptLanguageVersion.java
@@ -1,14 +1,14 @@
-package org.mustbe.consulo.actionscript.lang;
+package consulo.actionscript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.lang.parsing.EcmaScript4Parser;
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
 import com.intellij.lang.javascript.highlighting.JSHighlighter;
 import com.intellij.lexer.Lexer;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.parsing.EcmaScript4Parser;
 import consulo.lombok.annotations.Lazy;
 
 /**
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
similarity index 87%
rename from client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
rename to client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index c9365369..19a00596 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -1,12 +1,9 @@
-package org.mustbe.consulo.javascript.client.module.extension;
+package consulo.javascript.client.module.extension;
 
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.client.module.sdk.ClientJavaScriptSdkType;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.lang.StandardJavaScriptVersions;
-import org.mustbe.consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.javascript.client.module.sdk.ClientJavaScriptSdkType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
@@ -16,6 +13,9 @@
 import consulo.annotations.RequiredReadAction;
 import consulo.bundle.SdkUtil;
 import consulo.extension.impl.ModuleExtensionImpl;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.StandardJavaScriptVersions;
+import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.ModuleInheritableNamedPointer;
 import consulo.module.extension.impl.ModuleInheritableNamedPointerImpl;
@@ -26,8 +26,7 @@
  * @author VISTALL
  * @since 29.06.14
  */
-public class ClientJavaScriptModuleExtension extends ModuleExtensionImpl<ClientJavaScriptModuleExtension> implements
-		JavaScriptModuleExtension<ClientJavaScriptModuleExtension>
+public class ClientJavaScriptModuleExtension extends ModuleExtensionImpl<ClientJavaScriptModuleExtension> implements JavaScriptModuleExtension<ClientJavaScriptModuleExtension>
 {
 	private ModuleInheritableNamedPointerImpl<Sdk> myPointer;
 
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
similarity index 86%
rename from client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
rename to client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index d992cfa8..aec23da5 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.client.module.extension;
+package consulo.javascript.client.module.extension;
 
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -23,16 +23,16 @@
 import javax.swing.JList;
 import javax.swing.JPanel;
 
-import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.lang.StandardJavaScriptVersions;
-import org.mustbe.consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
-import consulo.lang.LanguageVersion;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.ui.VerticalFlowLayout;
 import com.intellij.ui.CollectionComboBoxModel;
 import com.intellij.ui.ColoredListCellRenderer;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.StandardJavaScriptVersions;
+import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
+import consulo.lang.LanguageVersion;
 
 /**
  * @author VISTALL
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
similarity index 87%
rename from client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
rename to client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index a302c42a..e33521b4 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -1,13 +1,13 @@
-package org.mustbe.consulo.javascript.client.module.extension;
+package consulo.javascript.client.module.extension;
 
 import javax.swing.JComponent;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import com.intellij.openapi.projectRoots.Sdk;
 import consulo.annotations.RequiredDispatchThread;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.MutableModuleInheritableNamedPointer;
 import consulo.roots.ModuleRootLayer;
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
similarity index 97%
rename from client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
rename to client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index 20ba444e..4513f0d0 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.client.module.sdk;
+package consulo.javascript.client.module.sdk;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
similarity index 96%
rename from client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
rename to client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index ed194832..ebaeb246 100644
--- a/client-javascript-impl/src/org/mustbe/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.client.module.sdk;
+package consulo.javascript.client.module.sdk;
 
 import javax.swing.Icon;
 
diff --git a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java b/ecmascript4-impl/src/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
similarity index 90%
rename from ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
rename to ecmascript4-impl/src/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
index 26a3ad32..bc192b8c 100644
--- a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
+++ b/ecmascript4-impl/src/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
@@ -1,7 +1,7 @@
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.parsing.EcmaScript4Parser;
+import consulo.javascript.lang.parsing.EcmaScript4Parser;
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
diff --git a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
similarity index 98%
rename from ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
rename to ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
index 2309fa3f..3214151a 100644
--- a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
+++ b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JavaScriptBundle;
diff --git a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
similarity index 98%
rename from ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
rename to ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
index aa753455..57bc7e2c 100644
--- a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
+++ b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JavaScriptBundle;
diff --git a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4Parser.java b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4Parser.java
similarity index 84%
rename from ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4Parser.java
rename to ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4Parser.java
index 52efae37..df21281f 100644
--- a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4Parser.java
+++ b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4Parser.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
similarity index 91%
rename from ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
rename to ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
index 2e1d0326..c1919002 100644
--- a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
+++ b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
similarity index 95%
rename from ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
rename to ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
index f3276a43..1570eb44 100644
--- a/ecmascript4-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
+++ b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import consulo.lombok.annotations.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -327,7 +327,7 @@ else if(JSTokenTypes.COLON_COLON == builder.getTokenType())
 
 	private void parseDefaultNsStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.DEFAULT_KEYWORD);
+		EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.DEFAULT_KEYWORD);
 		final PsiBuilder.Marker marker = builder.mark();
 		builder.advanceLexer();
 
@@ -391,7 +391,7 @@ private void parseImportStatement(final PsiBuilder builder)
 
 	private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @NotNull PsiBuilder.Marker useNSStatement)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NAMESPACE_KEYWORD);
+		EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NAMESPACE_KEYWORD);
 
 		builder.advanceLexer();
 		if(builder.getTokenType() == JSTokenTypes.LPAR)
@@ -454,7 +454,7 @@ private void parseClass(final PsiBuilder builder)
 	private void parseClassNoMarker(final PsiBuilder builder, final @NotNull PsiBuilder.Marker clazz)
 	{
 		final IElementType tokenType = builder.getTokenType();
-		LOGGER.assertTrue(JSTokenTypes.CLASS_KEYWORD == tokenType || JSTokenTypes.INTERFACE_KEYWORD == tokenType);
+		EcmaScript4StatementParsing.LOGGER.assertTrue(JSTokenTypes.CLASS_KEYWORD == tokenType || JSTokenTypes.INTERFACE_KEYWORD == tokenType);
 
 		builder.advanceLexer();
 		if(!getExpressionParsing().parseQualifiedTypeName(builder))
@@ -479,7 +479,7 @@ private void parseClassNoMarker(final PsiBuilder builder, final @NotNull PsiBuil
 	private void parseReferenceList(final PsiBuilder builder)
 	{
 		final IElementType tokenType = builder.getTokenType();
-		LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
+		EcmaScript4StatementParsing.LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
 		final PsiBuilder.Marker referenceList = builder.mark();
 		builder.advanceLexer();
 
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java b/ecmascript6-impl/src/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
similarity index 86%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
rename to ecmascript6-impl/src/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
index ab1ddcfe..f7fd28ae 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
+++ b/ecmascript6-impl/src/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.ide.codeInsight;
+package consulo.javascript.ide.codeInsight;
 
-import org.mustbe.consulo.javascript.ide.codeInsight.quickFixes.EcmaScript6CreateJSFunctionOrMethodFix;
+import consulo.javascript.ide.codeInsight.quickFixes.EcmaScript6CreateJSFunctionOrMethodFix;
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
 
 /**
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java b/ecmascript6-impl/src/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
similarity index 93%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
rename to ecmascript6-impl/src/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
index f134e5b6..5693e825 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
+++ b/ecmascript6-impl/src/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.ide.codeInsight.quickFixes;
+package consulo.javascript.ide.codeInsight.quickFixes;
 
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
 
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
similarity index 89%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
rename to ecmascript6-impl/src/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index aa9ba670..0dace490 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import org.mustbe.consulo.javascript.lang.lexer.EcmaScript6Lexer;
-import org.mustbe.consulo.javascript.lang.parsing.EcmaScript6Parser;
 import com.intellij.lang.PsiParser;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.javascript.lang.lexer.EcmaScript6Lexer;
+import consulo.javascript.lang.parsing.EcmaScript6Parser;
 import consulo.lombok.annotations.Lazy;
 
 /**
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileType.java b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileType.java
similarity index 97%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileType.java
rename to ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileType.java
index af42dc3b..2dc89d01 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import javax.swing.Icon;
 
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileTypeFactory.java b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
similarity index 90%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
rename to ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
index b4e05a40..1eea5a23 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/lexer/EcmaScript6Lexer.java b/ecmascript6-impl/src/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
similarity index 99%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
rename to ecmascript6-impl/src/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
index 040d3d99..41ab54f0 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.4.4 on 03.03.16 6:57 */
 
-package org.mustbe.consulo.javascript.lang.lexer;
+package consulo.javascript.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/lexer/ecmascript6.flex b/ecmascript6-impl/src/consulo/javascript/lang/lexer/ecmascript6.flex
similarity index 99%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/lexer/ecmascript6.flex
rename to ecmascript6-impl/src/consulo/javascript/lang/lexer/ecmascript6.flex
index e4d02cba..c1f28e98 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/ecmascript6-impl/src/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.lexer;
+package consulo.javascript.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
similarity index 98%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
rename to ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
index 69c8ced2..6bc4b895 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6Parser.java b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6Parser.java
similarity index 95%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6Parser.java
rename to ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6Parser.java
index ed351ca9..d73134ce 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6Parser.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6Parser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.PsiBuilder;
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
similarity index 95%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
rename to ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
index fe08e64d..59a9174b 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
similarity index 97%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
rename to ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index d57a9e2d..8689e5eb 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
-import consulo.lombok.annotations.Logger;
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -24,6 +23,7 @@
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.lombok.annotations.Logger;
 
 /**
  * @author VISTALL
@@ -232,7 +232,7 @@ else if(expectContextKeyword(builder, TokenSet.create(JSTokenTypes.STATIC_KEYWOR
 	private void parseReferenceList(final PsiBuilder builder)
 	{
 		final IElementType tokenType = builder.getTokenType();
-		LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
+		EcmaScript6StatementParsing.LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
 		final PsiBuilder.Marker referenceList = builder.mark();
 		builder.advanceLexer();
 
diff --git a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
similarity index 82%
rename from ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
rename to ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
index 83bd6994..694233f5 100644
--- a/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
@@ -1,8 +1,8 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
-import org.mustbe.consulo.javascript.lang.parsing.impl.JavaScriptStrictParserBuilder;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.javascript.lang.parsing.impl.JavaScriptStrictParserBuilder;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/com/sixrr/inspectjs/utils/EquivalenceChecker.java b/inspections/src/com/sixrr/inspectjs/utils/EquivalenceChecker.java
index eb1de566..72fd85c6 100644
--- a/inspections/src/com/sixrr/inspectjs/utils/EquivalenceChecker.java
+++ b/inspections/src/com/sixrr/inspectjs/utils/EquivalenceChecker.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/org/intellij/idea/lang/javascript/intention/JSIntention.java
index 2954736f..10f69a56 100644
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -18,7 +18,6 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
 import com.intellij.lang.Language;
 import com.intellij.openapi.editor.Editor;
@@ -27,6 +26,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.xml.XmlElement;
 import com.intellij.util.IncorrectOperationException;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 public abstract class JSIntention extends PsiElementBaseIntentionAction
 {
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 63e625dd..7b5f872d 100644
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -19,8 +19,6 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -29,6 +27,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptTokenSets;
 
 public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention {
     @Override
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java b/intentions/src/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
index 91de2a3c..94884207 100644
--- a/intentions/src/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
+++ b/intentions/src/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
@@ -15,7 +15,7 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java b/intentions/src/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
index aa2371d5..bbed8911 100644
--- a/intentions/src/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
+++ b/intentions/src/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
@@ -17,7 +17,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageParserDefinitions;
 import com.intellij.lang.ParserDefinition;
@@ -39,6 +38,7 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  */
diff --git a/javascript16-impl/src/org/mustbe/consulo/javascript/lang/JavaScript16LanguageVersion.java b/javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java
similarity index 90%
rename from javascript16-impl/src/org/mustbe/consulo/javascript/lang/JavaScript16LanguageVersion.java
rename to javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java
index fbaa1b29..31ed4b0f 100644
--- a/javascript16-impl/src/org/mustbe/consulo/javascript/lang/JavaScript16LanguageVersion.java
+++ b/javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import org.mustbe.consulo.javascript.lang.lexer.JavaScript16Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.javascript.lang.lexer.JavaScript16Lexer;
 import consulo.lombok.annotations.Lazy;
 
 /**
diff --git a/javascript16-impl/src/org/mustbe/consulo/javascript/lang/lexer/JavaScript16Lexer.java b/javascript16-impl/src/consulo/javascript/lang/lexer/JavaScript16Lexer.java
similarity index 99%
rename from javascript16-impl/src/org/mustbe/consulo/javascript/lang/lexer/JavaScript16Lexer.java
rename to javascript16-impl/src/consulo/javascript/lang/lexer/JavaScript16Lexer.java
index 4ce6e254..f480e6ac 100644
--- a/javascript16-impl/src/org/mustbe/consulo/javascript/lang/lexer/JavaScript16Lexer.java
+++ b/javascript16-impl/src/consulo/javascript/lang/lexer/JavaScript16Lexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.4.4 on 15.02.16 12:38 */
 
-package org.mustbe.consulo.javascript.lang.lexer;
+package consulo.javascript.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/javascript16-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript16.flex b/javascript16-impl/src/consulo/javascript/lang/lexer/javascript16.flex
similarity index 99%
rename from javascript16-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript16.flex
rename to javascript16-impl/src/consulo/javascript/lang/lexer/javascript16.flex
index 7ab7b250..f9d98089 100644
--- a/javascript16-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript16.flex
+++ b/javascript16-impl/src/consulo/javascript/lang/lexer/javascript16.flex
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.lexer;
+package consulo.javascript.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/javascript17-impl/src/org/mustbe/consulo/javascript/lang/JavaScript17LanguageVersion.java b/javascript17-impl/src/consulo/javascript/lang/JavaScript17LanguageVersion.java
similarity index 90%
rename from javascript17-impl/src/org/mustbe/consulo/javascript/lang/JavaScript17LanguageVersion.java
rename to javascript17-impl/src/consulo/javascript/lang/JavaScript17LanguageVersion.java
index af8eddfe..90e2a088 100644
--- a/javascript17-impl/src/org/mustbe/consulo/javascript/lang/JavaScript17LanguageVersion.java
+++ b/javascript17-impl/src/consulo/javascript/lang/JavaScript17LanguageVersion.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import org.mustbe.consulo.javascript.lang.lexer.JavaScript17Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.javascript.lang.lexer.JavaScript17Lexer;
 import consulo.lombok.annotations.Lazy;
 
 /**
diff --git a/javascript17-impl/src/org/mustbe/consulo/javascript/lang/lexer/JavaScript17Lexer.java b/javascript17-impl/src/consulo/javascript/lang/lexer/JavaScript17Lexer.java
similarity index 99%
rename from javascript17-impl/src/org/mustbe/consulo/javascript/lang/lexer/JavaScript17Lexer.java
rename to javascript17-impl/src/consulo/javascript/lang/lexer/JavaScript17Lexer.java
index a13ab646..442e4372 100644
--- a/javascript17-impl/src/org/mustbe/consulo/javascript/lang/lexer/JavaScript17Lexer.java
+++ b/javascript17-impl/src/consulo/javascript/lang/lexer/JavaScript17Lexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.4.4 on 12.02.16 16:59 */
 
-package org.mustbe.consulo.javascript.lang.lexer;
+package consulo.javascript.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/javascript17-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript17.flex b/javascript17-impl/src/consulo/javascript/lang/lexer/javascript17.flex
similarity index 99%
rename from javascript17-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript17.flex
rename to javascript17-impl/src/consulo/javascript/lang/lexer/javascript17.flex
index afcc325f..e3cae27d 100644
--- a/javascript17-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript17.flex
+++ b/javascript17-impl/src/consulo/javascript/lang/lexer/javascript17.flex
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.lexer;
+package consulo.javascript.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript185LanguageVersion.java b/javascript18-impl/src/consulo/javascript/lang/JavaScript185LanguageVersion.java
similarity index 90%
rename from javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript185LanguageVersion.java
rename to javascript18-impl/src/consulo/javascript/lang/JavaScript185LanguageVersion.java
index a4fc3d6f..503165a0 100644
--- a/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript185LanguageVersion.java
+++ b/javascript18-impl/src/consulo/javascript/lang/JavaScript185LanguageVersion.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import org.mustbe.consulo.javascript.lang.lexer.JavaScript17Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.javascript.lang.lexer.JavaScript17Lexer;
 import consulo.lombok.annotations.Lazy;
 
 /**
diff --git a/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript18LanguageVersion.java b/javascript18-impl/src/consulo/javascript/lang/JavaScript18LanguageVersion.java
similarity index 90%
rename from javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript18LanguageVersion.java
rename to javascript18-impl/src/consulo/javascript/lang/JavaScript18LanguageVersion.java
index 81ce0657..7bc67003 100644
--- a/javascript18-impl/src/org/mustbe/consulo/javascript/lang/JavaScript18LanguageVersion.java
+++ b/javascript18-impl/src/consulo/javascript/lang/JavaScript18LanguageVersion.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import org.mustbe.consulo.javascript.lang.lexer.JavaScript17Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.javascript.lang.lexer.JavaScript17Lexer;
 import consulo.lombok.annotations.Lazy;
 
 /**
diff --git a/json-javascript-impl/src/consulo/json/JsonFileType.java b/json-javascript-impl/src/consulo/json/JsonFileType.java
index 1de66123..2a7c47dc 100644
--- a/json-javascript-impl/src/consulo/json/JsonFileType.java
+++ b/json-javascript-impl/src/consulo/json/JsonFileType.java
@@ -20,13 +20,13 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptFileTypeWithVersion;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import consulo.json.lang.JsonJavaScriptVersion;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.json.lang.JsonJavaScriptVersion;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java b/json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
index 0a987c37..699d3fdf 100644
--- a/json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
+++ b/json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
@@ -2,14 +2,14 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import consulo.json.JsonFileType;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiElement;
 import com.intellij.xml.breadcrumbs.BreadcrumbsInfoProvider;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.json.JsonFileType;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
index 34a49433..c5d2ddc2 100644
--- a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
@@ -3,14 +3,14 @@
 import java.lang.reflect.Type;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.json.jom.proxy.JomBadValueExpressionException;
-import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.json.jom.proxy.JomBadValueExpressionException;
+import consulo.json.jom.proxy.JomValueConverter;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
index 5c46f0c2..3b2e2965 100644
--- a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
+++ b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
@@ -1,11 +1,6 @@
 package consulo.json.lang;
 
-import consulo.lang.LanguageVersion;
-import consulo.lombok.annotations.Logger;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.javascript.lang.parsing.ExpressionParsing;
-import org.mustbe.consulo.javascript.lang.parsing.Parsing;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiParser;
@@ -13,6 +8,11 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.psi.tree.IElementType;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.lang.parsing.ExpressionParsing;
+import consulo.javascript.lang.parsing.Parsing;
+import consulo.lang.LanguageVersion;
+import consulo.lombok.annotations.Logger;
 
 /**
  * @author VISTALL
diff --git a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
index b64f7401..e9449f91 100644
--- a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
@@ -1,14 +1,14 @@
 package consulo.json.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import consulo.json.lang.lexer.JsonLexer;
 import com.intellij.lang.PsiParser;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.json.lang.lexer.JsonLexer;
 import consulo.lombok.annotations.Lazy;
 
 /**
diff --git a/json-javascript-impl/src/consulo/json/lang/lexer/json.flex b/json-javascript-impl/src/consulo/json/lang/lexer/json.flex
index bb90507b..b53b99dc 100644
--- a/json-javascript-impl/src/consulo/json/lang/lexer/json.flex
+++ b/json-javascript-impl/src/consulo/json/lang/lexer/json.flex
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.json.lang.lexer;
+package consulo.json.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java b/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
index f0fb1e33..1fa17287 100644
--- a/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -26,12 +26,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.json.validation.JsonFileDescriptorProviders;
-import consulo.json.validation.NativeArray;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
@@ -55,6 +49,12 @@
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.PairProcessor;
 import com.intellij.util.containers.ContainerUtil;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.json.validation.JsonFileDescriptorProviders;
+import consulo.json.validation.NativeArray;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 
 /**
  * @author VISTALL
diff --git a/resources/META-INF/actionscript.xml b/resources/META-INF/actionscript.xml
index ee8b623f..a27549f1 100644
--- a/resources/META-INF/actionscript.xml
+++ b/resources/META-INF/actionscript.xml
@@ -16,7 +16,7 @@
 
 <idea-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="org.mustbe.consulo.actionscript.ActionScriptFileTypeFactory" />
-		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.actionscript.lang.ActionScriptLanguageVersion" />
+		<fileTypeFactory implementation="consulo.actionscript.ActionScriptFileTypeFactory" />
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.actionscript.lang.ActionScriptLanguageVersion" />
 	</extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/resources/META-INF/ecma4.xml b/resources/META-INF/ecma4.xml
index c57170a2..093403f5 100644
--- a/resources/META-INF/ecma4.xml
+++ b/resources/META-INF/ecma4.xml
@@ -16,6 +16,6 @@
 
 <idea-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.EcmaScript4JavaScriptVersion" />
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript4JavaScriptVersion" />
 	</extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/resources/META-INF/ecma6.xml b/resources/META-INF/ecma6.xml
index 851d3da3..e9641f79 100644
--- a/resources/META-INF/ecma6.xml
+++ b/resources/META-INF/ecma6.xml
@@ -16,11 +16,11 @@
 
 <idea-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="org.mustbe.consulo.javascript.lang.EcmaScriptFileTypeFactory" />
-		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.EcmaScript6JavaScriptVersion" />
+		<fileTypeFactory implementation="consulo.javascript.lang.EcmaScriptFileTypeFactory" />
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript6JavaScriptVersion" />
 	</extensions>
 
 	<extensions defaultExtensionNs="consulo.javascript">
-		<quickFixFactory key="ECMASCRIPT_6" implementationClass="org.mustbe.consulo.javascript.ide.codeInsight.EcmaScript6QuickFixFactory" />
+		<quickFixFactory key="ECMASCRIPT_6" implementationClass="consulo.javascript.ide.codeInsight.EcmaScript6QuickFixFactory" />
 	</extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/resources/META-INF/json.xml b/resources/META-INF/json.xml
index c8047608..d1836ddb 100644
--- a/resources/META-INF/json.xml
+++ b/resources/META-INF/json.xml
@@ -39,7 +39,7 @@
 
 		<completion.contributor language="JavaScript" implementationClass="consulo.json.validation.completion.JsonCompletionContributor"/>
 
-		<quoteHandler fileType="JSON" className="org.mustbe.consulo.javascript.lang.JavaScriptQuoteHandler" />
+		<quoteHandler fileType="JSON" className="onsulo.javascript.lang.JavaScriptQuoteHandler" />
 
 		<localInspection language="JavaScript"
 						 displayName="Property validation"
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 0192d1c7..ac02e5ab 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -33,7 +33,7 @@
 	<xi:include href="/META-INF/typescript.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
 	<actions>
-		<action id="JavaScript.File" class="org.mustbe.consulo.javascript.ide.actions.JavaScriptCreateFileAction">
+		<action id="JavaScript.File" class="consulo.javascript.ide.actions.JavaScriptCreateFileAction">
 			<add-to-group group-id="NewGroup1" anchor="after" relative-to-action="NewClass"/>
 		</action>
 	</actions>
@@ -41,28 +41,28 @@
 	<extensions defaultExtensionNs="com.intellij">
 		<internalFileTemplate name="JavaScriptFile"/>
 
-		<lang.versionResolver language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.JavaScriptLanguageVersionResolver"/>
+		<lang.versionResolver language="JavaScript" implementationClass="consulo.javascript.lang.JavaScriptLanguageVersionResolver"/>
 
-		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.JavaScript15LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.JavaScript16LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.JavaScript17LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.JavaScript18LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.JavaScript185LanguageVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript15LanguageVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript16LanguageVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript17LanguageVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript18LanguageVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript185LanguageVersion"/>
 
-		<copyright.updater filetype="JavaScript" implementationClass="org.mustbe.consulo.javascript.copyright.UpdateJavaScriptFileCopyrightProvider"/>
+		<copyright.updater filetype="JavaScript" implementationClass="consulo.javascript.copyright.UpdateJavaScriptFileCopyrightProvider"/>
 
 		<colorSettingsPage implementation="com.intellij.lang.javascript.highlighting.JavaScriptColorsAndFontsPage"/>
 
-		<gotoClassContributor implementation="org.mustbe.consulo.javascript.lang.navigation.JavaScriptClassContributor"/>
+		<gotoClassContributor implementation="consulo.javascript.lang.navigation.JavaScriptClassContributor"/>
 		<gotoSymbolContributor implementation="com.intellij.lang.javascript.navigation.JavaScriptSymbolContributor"/>
 
-		<iconDescriptorUpdater implementation="org.mustbe.consulo.javascript.ide.JavaScriptIconDescriptorUpdater"/>
+		<iconDescriptorUpdater implementation="consulo.javascript.ide.JavaScriptIconDescriptorUpdater"/>
 
-		<fileTypeFactory implementation="org.mustbe.consulo.javascript.lang.JavaScriptFileTypeFactory"/>
+		<fileTypeFactory implementation="consulo.javascript.lang.JavaScriptFileTypeFactory"/>
 
 		<highlightVisitor implementation="com.intellij.lang.javascript.highlighting.JavaScriptHighlightVisitor"/>
 
-		<lang.parserDefinition language="JavaScript" implementationClass="org.mustbe.consulo.javascript.lang.JavaScriptParsingDefinition"/>
+		<lang.parserDefinition language="JavaScript" implementationClass="consulo.javascript.lang.JavaScriptParsingDefinition"/>
 
 		<annotator language="JavaScript" implementationClass="com.intellij.lang.javascript.validation.JSAnnotatingVisitor"/>
 		<readWriteAccessDetector implementation="com.intellij.lang.javascript.findUsages.JSReadWriteAccessDetector"/>
@@ -87,7 +87,7 @@
 		<lang.findUsagesProvider language="JavaScript" implementationClass="com.intellij.lang.javascript.findUsages.JavaScriptFindUsagesProvider"/>
 
 		<lang.syntaxHighlighterFactory key="JavaScript"
-									   implementationClass="org.mustbe.consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightFactory"/>
+									   implementationClass="consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightFactory"/>
 		<lang.commenter language="JavaScript" implementationClass="com.intellij.lang.javascript.JavascriptCommenter"/>
 
 		<lang.braceMatcher language="JavaScript" implementationClass="com.intellij.lang.javascript.highlighting.JSBraceMatcher"/>
@@ -101,7 +101,7 @@
 		<fileStructureGroupRuleProvider implementation="com.intellij.lang.javascript.findUsages.JavaScriptFunctionGroupRuleProvider"/>
 
 		<stubIndex implementation="com.intellij.lang.javascript.psi.stubs.JSNameIndex"/>
-		<stubIndex implementation="org.mustbe.consulo.javascript.psi.stubs.index.JavaScriptClassNameIndex"/>
+		<stubIndex implementation="consulo.javascript.psi.stubs.index.JavaScriptClassNameIndex"/>
 		<stubIndex implementation="com.intellij.lang.javascript.psi.stubs.JSQualifiedElementIndex"/>
 		<stubIndex implementation="com.intellij.lang.javascript.psi.stubs.JSSuperClassIndex"/>
 		<stubIndex implementation="com.intellij.lang.javascript.psi.stubs.JSImplementedInterfacesIndex"/>
@@ -133,11 +133,11 @@
 		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.JSDocTag"
 								 implementationClass="com.intellij.javascript.manipulators.JSDocTagManipulator"/>
 
-		<completion.contributor language="JavaScript" implementationClass="org.mustbe.consulo.javascript.ide.completion.JavaScriptKeywordCompletionContributor"/>
+		<completion.contributor language="JavaScript" implementationClass="consulo.javascript.ide.completion.JavaScriptKeywordCompletionContributor"/>
 
 		<completion.confidence language="JavaScript" implementationClass="com.intellij.codeInsight.completion.SkipAutopopupInStrings" />
 
-		<quoteHandler fileType="JavaScript" className="org.mustbe.consulo.javascript.lang.JavaScriptQuoteHandler"/>
+		<quoteHandler fileType="JavaScript" className="consulo.javascript.lang.JavaScriptQuoteHandler"/>
 
 		<liveTemplateMacro implementation="com.intellij.javascript.JSClassNameMacro"/>
 		<liveTemplateMacro implementation="com.intellij.javascript.JSMethodNameMacro"/>
@@ -145,14 +145,14 @@
 		<inspectionToolProvider implementation="com.intellij.lang.javascript.inspections.JSInspectionToolProvider"/>
 		<targetElementUtilEx implementation="com.intellij.lang.javascript.JavaScriptTargetElementUtilEx"/>
 
-		<sdkType implementation="org.mustbe.consulo.javascript.client.module.sdk.ClientJavaScriptSdkType"/>
-		<predefinedBundlesProvider implementation="org.mustbe.consulo.javascript.client.module.sdk.ClientJavaScriptPredefinedBundlesProvider"/>
+		<sdkType implementation="consulo.javascript.client.module.sdk.ClientJavaScriptSdkType"/>
+		<predefinedBundlesProvider implementation="consulo.javascript.client.module.sdk.ClientJavaScriptPredefinedBundlesProvider"/>
 		<moduleExtensionProvider key="client-javascript"
 								 icon="/icons/javaScript.png"
 								 name="JavaScript (Client)"
 								 allowMixin="true"
-								 immutableClass="org.mustbe.consulo.javascript.client.module.extension.ClientJavaScriptModuleExtension"
-								 mutableClass="org.mustbe.consulo.javascript.client.module.extension.ClientJavaScriptMutableModuleExtension"/>
+								 immutableClass="consulo.javascript.client.module.extension.ClientJavaScriptModuleExtension"
+								 mutableClass="consulo.javascript.client.module.extension.ClientJavaScriptMutableModuleExtension"/>
 
 		<xdebugger.breakpointType implementation="consulo.javascript.debugger.JavaScriptLineBreakpointType"/>
 		<xdebugger.lineBreakpointTypeResolver filetype="JavaScript" implementationClass="consulo.javascript.debugger.JavaScriptLineBreakpointTypeResolver" />
@@ -167,11 +167,11 @@
 		<extensionPoint name="propertyNameReferenceProvider" interface="com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReferenceProvider"/>
 
 		<extensionPoint name="quickFixFactory" beanClass="com.intellij.util.KeyedLazyInstanceEP">
-			<with attribute="implementationClass" implements="org.mustbe.consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory"/>
+			<with attribute="implementationClass" implements="consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory"/>
 		</extensionPoint>
 	</extensionPoints>
 
-	<extensions defaultExtensionNs="org.mustbe.consulo.javascript">
+	<extensions defaultExtensionNs="consulo.javascript">
 		<propertyNameReferenceProvider implementation="com.intellij.lang.javascript.psi.impl.reference.DefaultJSPropertyNameReferenceProvider" id="default"/>
 	</extensions>
 
diff --git a/resources/META-INF/regexp.xml b/resources/META-INF/regexp.xml
index 28b40ce6..13ec5992 100644
--- a/resources/META-INF/regexp.xml
+++ b/resources/META-INF/regexp.xml
@@ -16,6 +16,6 @@
 
 <idea-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<multiHostInjector forClass="com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl" implementationClass="org.mustbe.consulo.javascript.lang.JavaScriptRegexpMultiHostInjector"/>
+		<multiHostInjector forClass="com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl" implementationClass="consulo.javascript.lang.JavaScriptRegexpMultiHostInjector"/>
 	</extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/src/com/intellij/javascript/JSDebuggerSupportUtils.java b/src/com/intellij/javascript/JSDebuggerSupportUtils.java
index f3df9307..acb79ab5 100644
--- a/src/com/intellij/javascript/JSDebuggerSupportUtils.java
+++ b/src/com/intellij/javascript/JSDebuggerSupportUtils.java
@@ -20,7 +20,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.javascript.psi.JSElementFactory;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSNamedElement;
@@ -41,6 +40,7 @@
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.util.PsiTreeUtil;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/JSElementType.java b/src/com/intellij/lang/javascript/JSElementType.java
index 8d9bb462..57acea11 100644
--- a/src/com/intellij/lang/javascript/JSElementType.java
+++ b/src/com/intellij/lang/javascript/JSElementType.java
@@ -18,8 +18,8 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.psi.tree.IElementType;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/JSElementTypes.java b/src/com/intellij/lang/javascript/JSElementTypes.java
index 35d34911..a5fd85e6 100644
--- a/src/com/intellij/lang/javascript/JSElementTypes.java
+++ b/src/com/intellij/lang/javascript/JSElementTypes.java
@@ -17,9 +17,6 @@
 package com.intellij.lang.javascript;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.psi.impl.JSComputedNameImpl;
-import org.mustbe.consulo.javascript.psi.impl.JavaScriptLambdaExpressionImpl;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.psi.*;
@@ -31,6 +28,9 @@
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.psi.impl.JSComputedNameImpl;
+import consulo.javascript.psi.impl.JavaScriptLambdaExpressionImpl;
 import consulo.psi.tree.ElementTypeAsPsiFactory;
 
 /**
diff --git a/src/com/intellij/lang/javascript/JSLanguageInjector.java b/src/com/intellij/lang/javascript/JSLanguageInjector.java
index 3a2bd559..b29271bb 100644
--- a/src/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/src/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -18,7 +18,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.Language;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
@@ -41,6 +40,7 @@
 import com.intellij.psi.xml.XmlToken;
 import com.intellij.psi.xml.XmlTokenType;
 import com.intellij.xml.XmlElementDescriptorWithCDataContent;
+import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguagePointerUtil;
 import consulo.util.pointers.NamedPointer;
 
diff --git a/src/com/intellij/lang/javascript/JSTokenTypes.java b/src/com/intellij/lang/javascript/JSTokenTypes.java
index f4ff59af..45552bf0 100644
--- a/src/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/src/com/intellij/lang/javascript/JSTokenTypes.java
@@ -19,10 +19,6 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.lang.parsing.JavaScriptParser;
-import org.mustbe.consulo.javascript.lang.parsing.JavaScriptParsingContext;
-import org.mustbe.consulo.javascript.lang.parsing.Parsing;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.lang.LanguageParserDefinitions;
@@ -39,6 +35,10 @@
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.TokenSet;
 import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.parsing.JavaScriptParser;
+import consulo.javascript.lang.parsing.JavaScriptParsingContext;
+import consulo.javascript.lang.parsing.Parsing;
 import consulo.lang.LanguageVersion;
 
 /**
diff --git a/src/com/intellij/lang/javascript/JavaScriptCodeContextType.java b/src/com/intellij/lang/javascript/JavaScriptCodeContextType.java
index 288a3731..fd5b2a75 100644
--- a/src/com/intellij/lang/javascript/JavaScriptCodeContextType.java
+++ b/src/com/intellij/lang/javascript/JavaScriptCodeContextType.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.codeInsight.template.TemplateContextType;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.psi.JSFile;
@@ -32,6 +31,7 @@
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.util.PsiTreeUtil;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/JavaScriptFileType.java b/src/com/intellij/lang/javascript/JavaScriptFileType.java
index 1ab9ac64..1c34d467 100644
--- a/src/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/src/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -20,16 +20,16 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptFileTypeWithVersion;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.lang.StandardJavaScriptVersions;
-import org.mustbe.consulo.javascript.module.extension.JavaScriptModuleExtension;
-import consulo.lang.LanguageVersion;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.StandardJavaScriptVersions;
+import consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.lang.LanguageVersion;
 
 /**
  * User: max
diff --git a/src/com/intellij/lang/javascript/findUsages/JSWordsScanner.java b/src/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
index fc52447e..2e83c988 100644
--- a/src/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
+++ b/src/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
@@ -16,11 +16,11 @@
 
 package com.intellij.lang.javascript.findUsages;
 
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.lang.cacheBuilder.DefaultWordsScanner;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JSFlexAdapter;
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.javascript.lang.JavaScriptTokenSets;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java b/src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
index ba355302..7c1c36cb 100644
--- a/src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -20,7 +20,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.actionSystem.DataKey;
@@ -42,6 +41,7 @@
 import com.intellij.usages.impl.FileStructureGroupRuleProvider;
 import com.intellij.usages.rules.PsiElementUsage;
 import com.intellij.usages.rules.UsageGroupingRule;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java b/src/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
index b89f718c..b7f063df 100644
--- a/src/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
+++ b/src/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
@@ -23,7 +23,6 @@
 import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.idea.LoggerFactory;
 import com.intellij.lang.ImportOptimizer;
@@ -54,6 +53,7 @@
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.containers.MultiMap;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/flex/JSResolveHelper.java b/src/com/intellij/lang/javascript/flex/JSResolveHelper.java
index 1a024528..ef324de2 100644
--- a/src/com/intellij/lang/javascript/flex/JSResolveHelper.java
+++ b/src/com/intellij/lang/javascript/flex/JSResolveHelper.java
@@ -31,7 +31,7 @@
  */
 public interface JSResolveHelper
 {
-	ExtensionPointName<JSResolveHelper> EP_NAME = ExtensionPointName.create("org.mustbe.consulo.javascript.resolveHelper");
+	ExtensionPointName<JSResolveHelper> EP_NAME = ExtensionPointName.create("consulo.javascript.resolveHelper");
 
 	// TODO: drop module
 	@Nullable
diff --git a/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java b/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
index b97e2ac1..d2b5349f 100644
--- a/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
+++ b/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
@@ -18,12 +18,12 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.Language;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
 import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/formatter/JavaScriptCodeStylePanel.java b/src/com/intellij/lang/javascript/formatter/JavaScriptCodeStylePanel.java
index 9d471423..294c68e7 100644
--- a/src/com/intellij/lang/javascript/formatter/JavaScriptCodeStylePanel.java
+++ b/src/com/intellij/lang/javascript/formatter/JavaScriptCodeStylePanel.java
@@ -1,8 +1,8 @@
 package com.intellij.lang.javascript.formatter;
 
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.application.options.TabbedLanguageCodeStylePanel;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author VISTALL
diff --git a/src/com/intellij/lang/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/src/com/intellij/lang/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index 340a58a9..2d430d3d 100644
--- a/src/com/intellij/lang/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/src/com/intellij/lang/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.application.options.IndentOptionsEditor;
 import com.intellij.application.options.SmartIndentOptionsEditor;
 import com.intellij.lang.Language;
@@ -11,6 +10,7 @@
 import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author VISTALL
diff --git a/src/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/src/com/intellij/lang/javascript/highlighting/JSHighlighter.java
index b65b8b95..4b86ce0f 100644
--- a/src/com/intellij/lang/javascript/highlighting/JSHighlighter.java
+++ b/src/com/intellij/lang/javascript/highlighting/JSHighlighter.java
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JSDocElementType;
 import com.intellij.lang.javascript.JSDocTokenTypes;
@@ -33,6 +32,7 @@
 import com.intellij.psi.StringEscapesTokenTypes;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.Processor;
+import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java b/src/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
index 1177bd72..fcc8cd1e 100644
--- a/src/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/src/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
@@ -23,14 +23,14 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
-import org.mustbe.consulo.javascript.lang.JavaScript15LanguageVersion;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.options.colors.AttributesDescriptor;
 import com.intellij.openapi.options.colors.ColorDescriptor;
 import com.intellij.openapi.options.colors.ColorSettingsPage;
+import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
+import consulo.javascript.lang.JavaScript15LanguageVersion;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index 75d48c0d..0098c44a 100644
--- a/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -18,11 +18,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.javascript.lang.JavaScriptVersionUtil;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
 import com.intellij.codeInsight.daemon.impl.HighlightVisitor;
@@ -40,6 +35,11 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilCore;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
+import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.lang.JavaScriptVersionUtil;
 
 public class JavaScriptHighlightVisitor extends JSElementVisitor implements HighlightVisitor
 {
diff --git a/src/com/intellij/lang/javascript/index/JavaScriptIndexer.java b/src/com/intellij/lang/javascript/index/JavaScriptIndexer.java
index 47faa307..4fe26234 100644
--- a/src/com/intellij/lang/javascript/index/JavaScriptIndexer.java
+++ b/src/com/intellij/lang/javascript/index/JavaScriptIndexer.java
@@ -11,7 +11,7 @@
  */
 public abstract class JavaScriptIndexer
 {
-	public static final ExtensionPointName<JavaScriptIndexer> EP_NAME = ExtensionPointName.create("org.mustbe.consulo.javascript.indexer");
+	public static final ExtensionPointName<JavaScriptIndexer> EP_NAME = ExtensionPointName.create("consulo.javascript.indexer");
 
 	public void indexFile(@NotNull JSFileStub fileStub, @NotNull final IndexSink sink)
 	{
diff --git a/src/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java b/src/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
index f9069b3f..1cd58f23 100644
--- a/src/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
+++ b/src/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
@@ -23,9 +23,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.PropertyKey;
-import org.mustbe.consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
-import org.mustbe.consulo.javascript.lang.JavaScriptVersionUtil;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.codeInsight.template.TemplateManager;
 import com.intellij.codeInspection.LocalQuickFix;
@@ -51,6 +48,9 @@
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
+import consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory;
+import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.lang.JavaScriptVersionUtil;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java b/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
index 62093776..96440ee3 100644
--- a/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
+++ b/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
@@ -22,8 +22,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemsHolder;
@@ -50,6 +48,8 @@
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.util.PsiTreeUtil;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptFeature;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java b/src/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
index c1fdbe9a..7f664c7c 100644
--- a/src/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
+++ b/src/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
@@ -20,7 +20,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.template.Template;
@@ -49,6 +48,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import consulo.javascript.lang.JavaScriptFeature;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index 6a7e9e21..c859e9b3 100644
--- a/src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -21,10 +21,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
-import org.mustbe.consulo.javascript.lang.JavaScriptVersionUtil;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupItem;
@@ -61,6 +57,10 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.lang.JavaScriptVersionUtil;
+import consulo.javascript.lang.psi.JavaScriptType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index ec8e093e..0ae8ffb4 100644
--- a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -21,14 +21,14 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptFeature;
 
 /**
 * @author VISTALL
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index 91147b42..c4f2f459 100644
--- a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -19,8 +19,6 @@
 
 import java.util.Set;
 
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.codeInsight.template.Expression;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.lang.javascript.psi.JSArgumentList;
@@ -29,6 +27,8 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptFeature;
 
 public class CreateJSFunctionOrMethodFix extends CreateJSFunctionFixBase
 {
diff --git a/src/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java b/src/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
index 92d4edeb..80b8eb77 100644
--- a/src/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
+++ b/src/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
@@ -21,7 +21,6 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -35,6 +34,7 @@
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.util.Processor;
 import com.intellij.util.indexing.FileBasedIndex;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
  * @author maxim
diff --git a/src/com/intellij/lang/javascript/psi/JSElementVisitor.java b/src/com/intellij/lang/javascript/psi/JSElementVisitor.java
index 1ca7ec6c..eb4abfcb 100644
--- a/src/com/intellij/lang/javascript/psi/JSElementVisitor.java
+++ b/src/com/intellij/lang/javascript/psi/JSElementVisitor.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.mustbe.consulo.javascript.psi.JavaScriptLambdaExpression;
 import com.intellij.psi.PsiElementVisitor;
+import consulo.javascript.psi.JavaScriptLambdaExpression;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/psi/JSExpression.java b/src/com/intellij/lang/javascript/psi/JSExpression.java
index 54a7a04c..f570a7d2 100644
--- a/src/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/src/com/intellij/lang/javascript/psi/JSExpression.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.lombok.annotations.ArrayFactoryFields;
 
 /**
diff --git a/src/com/intellij/lang/javascript/psi/JSFunction.java b/src/com/intellij/lang/javascript/psi/JSFunction.java
index bb957765..2c985d06 100644
--- a/src/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/src/com/intellij/lang/javascript/psi/JSFunction.java
@@ -18,11 +18,11 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.psi.StubBasedPsiElement;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
 import consulo.lombok.annotations.ArrayFactoryFields;
 
 /**
diff --git a/src/com/intellij/lang/javascript/psi/JSProperty.java b/src/com/intellij/lang/javascript/psi/JSProperty.java
index 3d1925cd..23cb2931 100644
--- a/src/com/intellij/lang/javascript/psi/JSProperty.java
+++ b/src/com/intellij/lang/javascript/psi/JSProperty.java
@@ -19,10 +19,10 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
-import org.mustbe.consulo.javascript.psi.JSComputedName;
 import com.intellij.psi.PsiElement;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.psi.JSComputedName;
 
 /**
  * @author max
diff --git a/src/com/intellij/lang/javascript/psi/JSStubElementType.java b/src/com/intellij/lang/javascript/psi/JSStubElementType.java
index 4fa8be81..c9716150 100644
--- a/src/com/intellij/lang/javascript/psi/JSStubElementType.java
+++ b/src/com/intellij/lang/javascript/psi/JSStubElementType.java
@@ -21,10 +21,10 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.javascript.psi.stubs.JSStubElement;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.IndexSink;
+import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.psi.tree.IElementTypeAsPsiFactory;
 
 public abstract class JSStubElementType<StubT extends JSStubElement<PsiT>, PsiT extends JSElement> extends IStubElementType<StubT,
diff --git a/src/com/intellij/lang/javascript/psi/JSVariable.java b/src/com/intellij/lang/javascript/psi/JSVariable.java
index f129b06a..34221ca4 100644
--- a/src/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/src/com/intellij/lang/javascript/psi/JSVariable.java
@@ -18,12 +18,12 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
 import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
 /**
  * @author max
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
index 117f6f1e..b58698ca 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
@@ -18,7 +18,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -32,6 +31,7 @@
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiReference;
 import com.intellij.util.IncorrectOperationException;
+import consulo.javascript.lang.JavaScriptTokenSets;
 
 /**
  * @by Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java b/src/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
index fd010671..ea7b9ab2 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
@@ -19,8 +19,6 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageParserDefinitions;
 import com.intellij.lang.ParserDefinition;
@@ -41,6 +39,8 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.util.IncorrectOperationException;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.JavaScriptTokenSets;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
index e6ac5a34..cce2d3d1 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
@@ -18,8 +18,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -40,6 +38,8 @@
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptTokenSets;
 
 /**
  * @by Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
index 2f0b74d6..58cb742d 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSExpression;
 
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
index 08434d78..edee25c4 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
@@ -20,7 +20,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.extapi.psi.PsiFileBase;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JavaScriptFileType;
@@ -40,6 +39,7 @@
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.IncorrectOperationException;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index 1322c837..aae45d83 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -17,11 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -42,6 +37,11 @@
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index ed4a57f9..e7d12be0 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
index 556fc1cc..9514d4d5 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -31,6 +30,7 @@
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
+import consulo.javascript.lang.JavaScriptTokenSets;
 
 /**
  * @by Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index 94702ee1..fb0c7e48 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -17,10 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptPrimitiveType;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -32,6 +28,10 @@
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.tree.IElementType;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.lang.psi.JavaScriptPrimitiveType;
+import consulo.javascript.lang.psi.JavaScriptType;
 
 /**
  * @author max
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
index 5809f9dc..5c0b6436 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
@@ -18,7 +18,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -31,6 +30,7 @@
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
+import consulo.javascript.lang.JavaScriptTokenSets;
 
 /**
  * @by Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index da3f951c..e91eb571 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -17,9 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
-import org.mustbe.consulo.javascript.lang.psi.impl.JavaScriptClassType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSArgumentList;
@@ -30,6 +27,9 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.impl.JavaScriptClassType;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index 1359b607..032ff014 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index 751c96c6..34b3b1e5 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -19,7 +19,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index 91f22ac3..af17ae6e 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -18,10 +18,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
-import org.mustbe.consulo.javascript.psi.JSComputedName;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -36,6 +32,10 @@
 import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.psi.JSComputedName;
 
 /**
  * @author max
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 9b2896f7..890c348c 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -26,10 +26,6 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
-import org.mustbe.consulo.javascript.lang.psi.impl.elementType.BaseJavaScriptElementType;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -60,6 +56,10 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.util.Consumer;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.lang.psi.impl.elementType.BaseJavaScriptElementType;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 07307724..922d9bf4 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -20,11 +20,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
-import org.mustbe.consulo.javascript.lang.JavaScriptVersionUtil;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageNamesValidation;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -55,6 +50,11 @@
 import com.intellij.refactoring.rename.BindablePsiReference;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.JavaScriptVersionUtil;
+import consulo.javascript.lang.psi.JavaScriptType;
 
 public class JSReferenceExpressionImpl extends JSExpressionImpl implements JSReferenceExpression, BindablePsiReference
 {
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index f8f9ab9c..a431a1c2 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -21,8 +21,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -37,6 +35,8 @@
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.util.ArrayUtil;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index 7968b7f6..048eba45 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -17,10 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -43,6 +39,10 @@
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index c78b2e7b..54f951cf 100644
--- a/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -30,7 +30,7 @@
  */
 public interface JSPropertyNameReferenceProvider
 {
-	CompositeExtensionPointName<JSPropertyNameReferenceProvider> EP_NAME = CompositeExtensionPointName.applicationPoint("org.mustbe.consulo.javascript.propertyNameReferenceProvider",
+	CompositeExtensionPointName<JSPropertyNameReferenceProvider> EP_NAME = CompositeExtensionPointName.applicationPoint("consulo.javascript.propertyNameReferenceProvider",
 			JSPropertyNameReferenceProvider.class);
 
 	@Nullable
diff --git a/src/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/src/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index 322f1389..871a420a 100644
--- a/src/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/src/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -24,9 +24,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.javascript.lang.JavaScriptVersionUtil;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.injection.InjectedLanguageManager;
@@ -50,6 +47,9 @@
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlToken;
 import com.intellij.util.ArrayUtil;
+import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.lang.JavaScriptVersionUtil;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 3ca5e423..2f2eb9ba 100644
--- a/src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -31,11 +31,6 @@
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptVersionUtil;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
-import org.mustbe.consulo.javascript.module.extension.JavaScriptModuleExtension;
 import com.intellij.ide.highlighter.XmlFileType;
 import com.intellij.injected.editor.VirtualFileWindow;
 import com.intellij.javascript.documentation.JSDocumentationProvider;
@@ -105,6 +100,11 @@
 import com.intellij.util.text.StringTokenizer;
 import com.intellij.xml.XmlElementDescriptor;
 import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptVersionUtil;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.roots.types.BinariesOrderRootType;
 
 /**
diff --git a/src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index 23bd1b6e..6b6951fe 100644
--- a/src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -25,8 +25,6 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NonNls;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
 import com.intellij.lang.javascript.psi.*;
@@ -37,6 +35,8 @@
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ArrayUtil;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptFeature;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/src/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
index c1587482..400d3fa4 100644
--- a/src/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
+++ b/src/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
@@ -21,7 +21,6 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptFeature;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.index.JSSymbolUtil;
 import com.intellij.lang.javascript.psi.*;
@@ -34,6 +33,7 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.util.ArrayUtil;
+import consulo.javascript.lang.JavaScriptFeature;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java b/src/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
index c31fc94e..9cb7c8e2 100644
--- a/src/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
+++ b/src/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
@@ -17,10 +17,10 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.psi.JSReferenceList;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 public class JSImplementedInterfacesIndex extends StringStubIndexExtension<JSReferenceList>
 {
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java b/src/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
index 1753842c..b3c8d256 100644
--- a/src/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
+++ b/src/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
@@ -20,10 +20,10 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 public class JSNameIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
 {
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java b/src/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
index ad4d6a2d..0b387ad7 100644
--- a/src/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
+++ b/src/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
@@ -20,10 +20,10 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 public class JSQualifiedElementIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
 {
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java b/src/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
index 45ec1a37..dffde979 100644
--- a/src/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
+++ b/src/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
@@ -17,10 +17,10 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.psi.JSReferenceList;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 public class JSSuperClassIndex extends StringStubIndexExtension<JSReferenceList>
 {
diff --git a/src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
index ed7fa55e..df3b4afb 100644
--- a/src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
+++ b/src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
@@ -19,7 +19,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.codeInsight.completion.PrioritizedLookupElement;
 import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
 import com.intellij.codeInsight.lookup.LookupElement;
diff --git a/src/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java b/src/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
index 3aff4d5e..5f25f6b1 100644
--- a/src/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
+++ b/src/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
@@ -26,7 +26,7 @@
 public interface JSClassInheritorsProvider
 {
 
-	ExtensionPointName<JSClassInheritorsProvider> EP_NAME = ExtensionPointName.create("org.mustbe.consulo.javascript.classInheritorsProvider");
+	ExtensionPointName<JSClassInheritorsProvider> EP_NAME = ExtensionPointName.create("consulo.javascript.classInheritorsProvider");
 
 	Collection<JSClass> getImplementingClasses(String parentName, Project project, GlobalSearchScope scope);
 
diff --git a/src/com/intellij/lang/javascript/search/JSClassSearch.java b/src/com/intellij/lang/javascript/search/JSClassSearch.java
index 0d3124c1..10cbb655 100644
--- a/src/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/src/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -22,7 +22,6 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSReferenceList;
 import com.intellij.openapi.extensions.Extensions;
@@ -35,6 +34,7 @@
 import com.intellij.util.Query;
 import com.intellij.util.QueryExecutor;
 import com.intellij.util.QueryFactory;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 public abstract class JSClassSearch implements QueryExecutor<JSClass, JSClassSearch.SearchParameters>
 {
diff --git a/src/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java b/src/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
index b7d26a88..23786f56 100644
--- a/src/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
+++ b/src/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.search;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.javascript.index.JavaScriptIndex;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
@@ -32,6 +31,7 @@
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.util.Processor;
 import com.intellij.util.QueryExecutor;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java b/src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
index 4cbe10c4..b5e4e795 100644
--- a/src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
+++ b/src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.search;
 
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -28,6 +27,7 @@
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.util.Processor;
 import com.intellij.util.QueryExecutor;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/types/JSClassElementType.java b/src/com/intellij/lang/javascript/types/JSClassElementType.java
index f8580fc2..38bd7b8a 100644
--- a/src/com/intellij/lang/javascript/types/JSClassElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSClassElementType.java
@@ -20,8 +20,6 @@
 import java.io.IOException;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
@@ -34,6 +32,8 @@
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.util.io.StringRef;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/types/JSQualifiedStubElementType.java b/src/com/intellij/lang/javascript/types/JSQualifiedStubElementType.java
index e7a7a4cb..7d3092b8 100644
--- a/src/com/intellij/lang/javascript/types/JSQualifiedStubElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSQualifiedStubElementType.java
@@ -19,11 +19,11 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSQualifiedStub;
 import com.intellij.psi.stubs.IndexSink;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
  * @author VISTALL
diff --git a/src/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/src/com/intellij/lang/javascript/types/JSReferenceListElementType.java
index 57525504..beeae444 100644
--- a/src/com/intellij/lang/javascript/types/JSReferenceListElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSReferenceListElementType.java
@@ -21,8 +21,6 @@
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSReferenceList;
@@ -39,6 +37,8 @@
 import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.io.StringRef;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java b/src/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
similarity index 97%
rename from src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
rename to src/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
index 01284299..17247992 100644
--- a/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
+++ b/src/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.copyright;
+package consulo.javascript.copyright;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.PsiComment;
diff --git a/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java b/src/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
rename to src/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
index 2cb3a56f..f50c7613 100644
--- a/src/org/mustbe/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
+++ b/src/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.copyright;
+package consulo.javascript.copyright;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.fileTypes.FileType;
diff --git a/src/org/mustbe/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java b/src/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
similarity index 99%
rename from src/org/mustbe/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
rename to src/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
index a490ebe7..e5909ed5 100644
--- a/src/org/mustbe/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
+++ b/src/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.ide;
+package consulo.javascript.ide;
 
 import javax.swing.Icon;
 
diff --git a/src/org/mustbe/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/src/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
rename to src/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index 3f8417dc..13ec11d9 100644
--- a/src/org/mustbe/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/src/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -1,8 +1,7 @@
-package org.mustbe.consulo.javascript.ide.actions;
+package consulo.javascript.ide.actions;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.module.extension.JavaScriptModuleExtension;
 import com.intellij.ide.IdeView;
 import com.intellij.ide.actions.CreateFileFromTemplateAction;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
@@ -20,6 +19,7 @@
 import com.intellij.testFramework.LightVirtualFile;
 import consulo.annotations.RequiredDispatchThread;
 import consulo.annotations.RequiredReadAction;
+import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.roots.ContentEntryFileListener;
 
 /**
diff --git a/src/org/mustbe/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/src/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
similarity index 86%
rename from src/org/mustbe/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
rename to src/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
index e1cc014e..0637e1e6 100644
--- a/src/org/mustbe/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
+++ b/src/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.ide.codeInsight;
+package consulo.javascript.ide.codeInsight;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import consulo.lang.LanguageVersion;
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
 import com.intellij.openapi.util.KeyedExtensionCollector;
 import com.intellij.psi.PsiElement;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.lang.LanguageVersion;
 
 /**
  * @author VISTALL
@@ -46,8 +46,7 @@ public static JavaScriptQuickFixFactory byElement(PsiElement element)
 		return ourDefaultImpl;
 	}
 
-	public static final KeyedExtensionCollector<JavaScriptQuickFixFactory, String> EP = new KeyedExtensionCollector<JavaScriptQuickFixFactory,
-			String>("org.mustbe.consulo.javascript.quickFixFactory");
+	public static final KeyedExtensionCollector<JavaScriptQuickFixFactory, String> EP = new KeyedExtensionCollector<>("consulo.javascript.quickFixFactory");
 
 	public CreateJSFunctionOrMethodFix createFunctionOrMethodFix(String referenceName, boolean isMethod)
 	{
diff --git a/src/org/mustbe/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java b/src/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
similarity index 98%
rename from src/org/mustbe/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
rename to src/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
index e139864e..33a269ae 100644
--- a/src/org/mustbe/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/src/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.ide.completion;
+package consulo.javascript.ide.completion;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.completion.CompletionContributor;
diff --git a/src/org/mustbe/consulo/javascript/ide/completion/SpaceInsertHandler.java b/src/consulo/javascript/ide/completion/SpaceInsertHandler.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/ide/completion/SpaceInsertHandler.java
rename to src/consulo/javascript/ide/completion/SpaceInsertHandler.java
index 967353c9..cc9a5be9 100644
--- a/src/org/mustbe/consulo/javascript/ide/completion/SpaceInsertHandler.java
+++ b/src/consulo/javascript/ide/completion/SpaceInsertHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.ide.completion;
+package consulo.javascript.ide.completion;
 
 import com.intellij.codeInsight.TailType;
 import com.intellij.codeInsight.completion.InsertHandler;
diff --git a/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java b/src/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
similarity index 99%
rename from src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
rename to src/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
index 30246418..e40f92b3 100644
--- a/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
+++ b/src/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.ide.hightlight;
+package consulo.javascript.ide.hightlight;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
similarity index 80%
rename from src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
rename to src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
index 17a2f8fe..6810f606 100644
--- a/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
+++ b/src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
@@ -1,10 +1,10 @@
-package org.mustbe.consulo.javascript.ide.hightlight;
+package consulo.javascript.ide.hightlight;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import consulo.fileTypes.LanguageVersionableSyntaxHighlighterFactory;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
 
 /**
diff --git a/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java b/src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
similarity index 98%
rename from src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
rename to src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
index 4cb695f4..5d6ee0e5 100644
--- a/src/org/mustbe/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
+++ b/src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.ide.hightlight;
+package consulo.javascript.ide.hightlight;
 
 import java.awt.Color;
 
diff --git a/src/org/mustbe/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/src/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
similarity index 93%
rename from src/org/mustbe/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
rename to src/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index 1be47d48..39725354 100644
--- a/src/org/mustbe/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/src/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -1,14 +1,14 @@
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import java.util.Set;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.parsing.JavaScriptParser;
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.util.containers.ArrayListSet;
+import consulo.javascript.lang.parsing.JavaScriptParser;
 import consulo.lang.BaseLanguageVersion;
 import consulo.lang.LanguageVersionWithParsing;
 
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScript15LanguageVersion.java b/src/consulo/javascript/lang/JavaScript15LanguageVersion.java
similarity index 86%
rename from src/org/mustbe/consulo/javascript/lang/JavaScript15LanguageVersion.java
rename to src/consulo/javascript/lang/JavaScript15LanguageVersion.java
index 30dc5012..3a923197 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/src/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -1,11 +1,11 @@
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import org.mustbe.consulo.javascript.lang.lexer.JavaScript15Lexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.javascript.lang.lexer.JavaScript15Lexer;
 import consulo.lombok.annotations.Lazy;
 
 /**
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptConstants.java b/src/consulo/javascript/lang/JavaScriptConstants.java
similarity index 73%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptConstants.java
rename to src/consulo/javascript/lang/JavaScriptConstants.java
index 87d9c469..02eef68c 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptConstants.java
+++ b/src/consulo/javascript/lang/JavaScriptConstants.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptFeature.java b/src/consulo/javascript/lang/JavaScriptFeature.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptFeature.java
rename to src/consulo/javascript/lang/JavaScriptFeature.java
index e504f047..33155e8e 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptFeature.java
+++ b/src/consulo/javascript/lang/JavaScriptFeature.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeFactory.java b/src/consulo/javascript/lang/JavaScriptFileTypeFactory.java
similarity index 95%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeFactory.java
rename to src/consulo/javascript/lang/JavaScriptFileTypeFactory.java
index c4b5881e..54e4fb58 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeFactory.java
+++ b/src/consulo/javascript/lang/JavaScriptFileTypeFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.JavaScriptFileType;
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java b/src/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
similarity index 95%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
rename to src/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
index bba155aa..e29d1139 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
+++ b/src/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptLanguage.java b/src/consulo/javascript/lang/JavaScriptLanguage.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptLanguage.java
rename to src/consulo/javascript/lang/JavaScriptLanguage.java
index fd6a71cd..3c56e572 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptLanguage.java
+++ b/src/consulo/javascript/lang/JavaScriptLanguage.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.Language;
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
similarity index 97%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
rename to src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index 82d2bce9..8a671185 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptParsingDefinition.java b/src/consulo/javascript/lang/JavaScriptParsingDefinition.java
similarity index 98%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptParsingDefinition.java
rename to src/consulo/javascript/lang/JavaScriptParsingDefinition.java
index f757b225..e749d004 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptParsingDefinition.java
+++ b/src/consulo/javascript/lang/JavaScriptParsingDefinition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptQuoteHandler.java b/src/consulo/javascript/lang/JavaScriptQuoteHandler.java
similarity index 97%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptQuoteHandler.java
rename to src/consulo/javascript/lang/JavaScriptQuoteHandler.java
index 60ada1f7..5488fa76 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptQuoteHandler.java
+++ b/src/consulo/javascript/lang/JavaScriptQuoteHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.editorActions.JavaLikeQuoteHandler;
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java b/src/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
similarity index 97%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
rename to src/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
index df5ddd8e..aafc4252 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
+++ b/src/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import org.intellij.lang.regexp.RegExpLanguage;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptTokenSets.java b/src/consulo/javascript/lang/JavaScriptTokenSets.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptTokenSets.java
rename to src/consulo/javascript/lang/JavaScriptTokenSets.java
index 9aacfec7..32ea61c3 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptTokenSets.java
+++ b/src/consulo/javascript/lang/JavaScriptTokenSets.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/src/org/mustbe/consulo/javascript/lang/JavaScriptVersionUtil.java b/src/consulo/javascript/lang/JavaScriptVersionUtil.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/lang/JavaScriptVersionUtil.java
rename to src/consulo/javascript/lang/JavaScriptVersionUtil.java
index 1881da99..857fe297 100644
--- a/src/org/mustbe/consulo/javascript/lang/JavaScriptVersionUtil.java
+++ b/src/consulo/javascript/lang/JavaScriptVersionUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import java.util.Collections;
 import java.util.Set;
diff --git a/src/org/mustbe/consulo/javascript/lang/StandardJavaScriptVersions.java b/src/consulo/javascript/lang/StandardJavaScriptVersions.java
similarity index 98%
rename from src/org/mustbe/consulo/javascript/lang/StandardJavaScriptVersions.java
rename to src/consulo/javascript/lang/StandardJavaScriptVersions.java
index 9154e2b5..8d3dd2c7 100644
--- a/src/org/mustbe/consulo/javascript/lang/StandardJavaScriptVersions.java
+++ b/src/consulo/javascript/lang/StandardJavaScriptVersions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang;
+package consulo.javascript.lang;
 
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/src/org/mustbe/consulo/javascript/lang/lexer/JavaScript15Lexer.java b/src/consulo/javascript/lang/lexer/JavaScript15Lexer.java
similarity index 99%
rename from src/org/mustbe/consulo/javascript/lang/lexer/JavaScript15Lexer.java
rename to src/consulo/javascript/lang/lexer/JavaScript15Lexer.java
index d63b6a3a..348f90af 100644
--- a/src/org/mustbe/consulo/javascript/lang/lexer/JavaScript15Lexer.java
+++ b/src/consulo/javascript/lang/lexer/JavaScript15Lexer.java
@@ -1,6 +1,6 @@
-/* The following code was generated by JFlex 1.4.4 on 10.02.16 21:11 */
+/* The following code was generated by JFlex 1.4.4 on 9/3/16 9:50 PM */
 
-package org.mustbe.consulo.javascript.lang.lexer;
+package consulo.javascript.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
@@ -10,8 +10,8 @@
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.4
- * on 10.02.16 21:11 from the specification file
- * <tt>R:/_github.com/consulo/consulo-javascript/src/org/mustbe/consulo/javascript/lang/lexer/javascript15.flex</tt>
+ * on 9/3/16 9:50 PM from the specification file
+ * <tt>R:/_github.com/consulo/consulo-javascript/src/consulo/javascript/lang/lexer/javascript15.flex</tt>
  */
 public class JavaScript15Lexer extends LexerBase {
   /** initial size of the lookahead buffer */
diff --git a/src/org/mustbe/consulo/javascript/lang/lexer/javascript15.flex b/src/consulo/javascript/lang/lexer/javascript15.flex
similarity index 99%
rename from src/org/mustbe/consulo/javascript/lang/lexer/javascript15.flex
rename to src/consulo/javascript/lang/lexer/javascript15.flex
index 98ce6108..eff60b17 100644
--- a/src/org/mustbe/consulo/javascript/lang/lexer/javascript15.flex
+++ b/src/consulo/javascript/lang/lexer/javascript15.flex
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.lexer;
+package consulo.javascript.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/src/org/mustbe/consulo/javascript/lang/navigation/JavaScriptClassContributor.java b/src/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
similarity index 93%
rename from src/org/mustbe/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
rename to src/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
index e7d865b6..12d9cec1 100644
--- a/src/org/mustbe/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
+++ b/src/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.navigation;
+package consulo.javascript.lang.navigation;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.navigation.ChooseByNameContributor;
 import com.intellij.navigation.NavigationItem;
@@ -30,6 +29,7 @@
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.indexing.IdFilter;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/ContextKeywordCache.java b/src/consulo/javascript/lang/parsing/ContextKeywordCache.java
similarity index 92%
rename from src/org/mustbe/consulo/javascript/lang/parsing/ContextKeywordCache.java
rename to src/consulo/javascript/lang/parsing/ContextKeywordCache.java
index 2d5b0222..7027b829 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/ContextKeywordCache.java
+++ b/src/consulo/javascript/lang/parsing/ContextKeywordCache.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/ExpressionParsing.java b/src/consulo/javascript/lang/parsing/ExpressionParsing.java
similarity index 98%
rename from src/org/mustbe/consulo/javascript/lang/parsing/ExpressionParsing.java
rename to src/consulo/javascript/lang/parsing/ExpressionParsing.java
index 778384f2..4b684351 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/src/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.tree.IElementType;
+import consulo.javascript.lang.JavaScriptTokenSets;
 
 
 /**
@@ -241,7 +241,7 @@ private static boolean lastSymbolEscaped(String text)
 
 	public void parseObjectLiteralExpression(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
+		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 
@@ -310,7 +310,7 @@ protected void parseProperty(final PsiBuilder builder)
 
 	public void parseArrayLiteralExpression(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
+		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 		boolean commaExpected = false;
@@ -363,7 +363,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 
 	private void parseParenthesizedExpression(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
+		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 		parseExpression(builder);
@@ -519,7 +519,7 @@ else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.
 
 	protected boolean parseNewExpression(PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NEW_KEYWORD);
+		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NEW_KEYWORD);
 		builder.advanceLexer();
 
 		if(builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD)
@@ -537,7 +537,7 @@ protected boolean parseNewExpression(PsiBuilder builder)
 
 	protected void parseArgumentList(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
+		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
 		final PsiBuilder.Marker arglist = builder.mark();
 		builder.advanceLexer();
 		boolean first = true;
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/FunctionParsing.java b/src/consulo/javascript/lang/parsing/FunctionParsing.java
similarity index 98%
rename from src/org/mustbe/consulo/javascript/lang/parsing/FunctionParsing.java
rename to src/consulo/javascript/lang/parsing/FunctionParsing.java
index 3a175fd1..0a17a188 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/src/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParser.java b/src/consulo/javascript/lang/parsing/JavaScriptParser.java
similarity index 95%
rename from src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParser.java
rename to src/consulo/javascript/lang/parsing/JavaScriptParser.java
index 8f876cac..3f367fe0 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParser.java
+++ b/src/consulo/javascript/lang/parsing/JavaScriptParser.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.ASTNode;
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java b/src/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
similarity index 84%
rename from src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
rename to src/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
index 0a0c17a9..797237ca 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
+++ b/src/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.impl.PsiBuilderAdapter;
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParsingContext.java b/src/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
rename to src/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
index abb70a44..5aeb6e45 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
+++ b/src/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
@@ -1,4 +1,4 @@
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.PsiBuilder;
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/Parsing.java b/src/consulo/javascript/lang/parsing/Parsing.java
similarity index 95%
rename from src/org/mustbe/consulo/javascript/lang/parsing/Parsing.java
rename to src/consulo/javascript/lang/parsing/Parsing.java
index 7d8f96f1..35148859 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/Parsing.java
+++ b/src/consulo/javascript/lang/parsing/Parsing.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.parsing.impl.JavaScriptStrictParserBuilder;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.lang.parsing.impl.JavaScriptStrictParserBuilder;
 
 /**
  * User: max
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/StatementParsing.java b/src/consulo/javascript/lang/parsing/StatementParsing.java
similarity index 92%
rename from src/org/mustbe/consulo/javascript/lang/parsing/StatementParsing.java
rename to src/consulo/javascript/lang/parsing/StatementParsing.java
index dc9488d0..d447c100 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/src/consulo/javascript/lang/parsing/StatementParsing.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.parsing;
+package consulo.javascript.lang.parsing;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.PsiBuilder;
@@ -221,7 +221,7 @@ protected boolean parseExpressionStatement(PsiBuilder builder)
 
 	protected void parseYieldStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.YIELD_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.YIELD_KEYWORD);
 		final PsiBuilder.Marker marker = builder.mark();
 		builder.advanceLexer();
 
@@ -240,7 +240,7 @@ protected void parseLetStatement(final PsiBuilder builder)
 
 	PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LET_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LET_KEYWORD);
 		final PsiBuilder.Marker marker = builder.mark();
 		builder.advanceLexer();
 
@@ -267,7 +267,7 @@ PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder)
 
 	void parseIncludeDirective(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
 		final PsiBuilder.Marker useNSStatement = builder.mark();
 		builder.advanceLexer();
 		checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptBundle.message("javascript.parser.message.expected.string.literal"));
@@ -278,7 +278,7 @@ void parseIncludeDirective(final PsiBuilder builder)
 
 	protected void parseTryStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.TRY_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.TRY_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 		parseBlock(builder);
@@ -299,7 +299,7 @@ protected void parseTryStatement(final PsiBuilder builder)
 
 	private void parseCatchBlock(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
 		final PsiBuilder.Marker block = builder.mark();
 		builder.advanceLexer();
 		checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
@@ -337,7 +337,7 @@ private void parseCatchBlock(final PsiBuilder builder)
 
 	protected void parseThrowStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.THROW_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.THROW_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -349,7 +349,7 @@ protected void parseThrowStatement(final PsiBuilder builder)
 
 	protected void parseSwitchStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.SWITCH_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.SWITCH_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -401,7 +401,7 @@ private void parseCaseOrDefaultClause(final PsiBuilder builder)
 
 	protected void parseWithStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.WITH_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.WITH_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -416,7 +416,7 @@ protected void parseWithStatement(final PsiBuilder builder)
 
 	protected void parseReturnStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.RETURN_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.RETURN_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		boolean hasNewLine = hasSemanticLineBeforeNextToken(builder);
 		builder.advanceLexer();
@@ -431,7 +431,7 @@ protected void parseReturnStatement(final PsiBuilder builder)
 
 	protected void parseBreakStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.BREAK_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.BREAK_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 
 		boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
@@ -452,7 +452,7 @@ protected void parseBreakStatement(final PsiBuilder builder)
 
 	protected void parseContinueStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.CONTINUE_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.CONTINUE_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
 		builder.advanceLexer();
@@ -525,13 +525,13 @@ else if(tokenType == JSTokenTypes.FOR_KEYWORD)
 		}
 		else
 		{
-			LOGGER.error("Unknown iteration statement");
+			StatementParsing.LOGGER.error("Unknown iteration statement");
 		}
 	}
 
 	private void parseForStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.FOR_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.FOR_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		final boolean forin = parseForLoopHeader(builder);
 
@@ -596,7 +596,7 @@ else if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
 
 	private void parseWhileStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.WHILE_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.WHILE_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -610,7 +610,7 @@ private void parseWhileStatement(final PsiBuilder builder)
 
 	private void parseDoWhileStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.DO_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.DO_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -626,7 +626,7 @@ private void parseDoWhileStatement(final PsiBuilder builder)
 
 	protected void parseIfStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.IF_KEYWORD);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.IF_KEYWORD);
 		final PsiBuilder.Marker ifStatement = builder.mark();
 		builder.advanceLexer();
 
@@ -654,7 +654,7 @@ protected void parseIfStatement(final PsiBuilder builder)
 
 	protected void parseEmptyStatement(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.SEMICOLON);
+		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.SEMICOLON);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 		statement.done(JSElementTypes.EMPTY_STATEMENT);
@@ -668,7 +668,7 @@ protected void parseVarStatement(final PsiBuilder builder, final boolean inForIn
 	protected void parseVarStatementNoMarker(final PsiBuilder builder, final boolean inForInitializationContext, final @NotNull PsiBuilder.Marker var)
 	{
 		final IElementType declType = builder.getTokenType();
-		LOGGER.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
+		StatementParsing.LOGGER.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
 				declType == JSTokenTypes.CONST_KEYWORD ||
 				declType == JSTokenTypes.LET_KEYWORD);
 
diff --git a/src/org/mustbe/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java b/src/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
similarity index 90%
rename from src/org/mustbe/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
rename to src/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
index ebcc0f78..cc34dae4 100644
--- a/src/org/mustbe/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
+++ b/src/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
@@ -1,18 +1,18 @@
-package org.mustbe.consulo.javascript.lang.parsing.impl;
+package consulo.javascript.lang.parsing.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptConstants;
-import org.mustbe.consulo.javascript.lang.JavaScriptTokenSets;
-import org.mustbe.consulo.javascript.lang.parsing.JavaScriptParserBuilder;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.ThreeState;
+import consulo.javascript.lang.JavaScriptConstants;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.lang.parsing.JavaScriptParserBuilder;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java b/src/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
similarity index 97%
rename from src/org/mustbe/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
rename to src/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
index 64d46f7f..ec88387b 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
+++ b/src/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.psi;
+package consulo.javascript.lang.psi;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptSimpleType.java b/src/consulo/javascript/lang/psi/JavaScriptSimpleType.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/lang/psi/JavaScriptSimpleType.java
rename to src/consulo/javascript/lang/psi/JavaScriptSimpleType.java
index c3e753f7..cc465d76 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptSimpleType.java
+++ b/src/consulo/javascript/lang/psi/JavaScriptSimpleType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.psi;
+package consulo.javascript.lang.psi;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptType.java b/src/consulo/javascript/lang/psi/JavaScriptType.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/lang/psi/JavaScriptType.java
rename to src/consulo/javascript/lang/psi/JavaScriptType.java
index d27894f8..3568993e 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptType.java
+++ b/src/consulo/javascript/lang/psi/JavaScriptType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.psi;
+package consulo.javascript.lang.psi;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptTypeElement.java b/src/consulo/javascript/lang/psi/JavaScriptTypeElement.java
similarity index 94%
rename from src/org/mustbe/consulo/javascript/lang/psi/JavaScriptTypeElement.java
rename to src/consulo/javascript/lang/psi/JavaScriptTypeElement.java
index cc26e168..232faa96 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/JavaScriptTypeElement.java
+++ b/src/consulo/javascript/lang/psi/JavaScriptTypeElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.psi;
+package consulo.javascript.lang.psi;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.psi.JSElement;
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/src/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
similarity index 91%
rename from src/org/mustbe/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
rename to src/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
index 3112be49..522fbb0f 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
+++ b/src/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.psi.impl;
+package consulo.javascript.lang.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.psi.PsiElement;
 
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java b/src/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
similarity index 88%
rename from src/org/mustbe/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
rename to src/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
index 1bff0cad..4d59b8bc 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
+++ b/src/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.psi.impl.elementType;
+package consulo.javascript.lang.psi.impl.elementType;
 
 import org.jetbrains.annotations.NonNls;
-import org.mustbe.consulo.javascript.lang.psi.JavaScriptTypeElement;
 import com.intellij.lang.javascript.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSStubElement;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java b/src/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
similarity index 96%
rename from src/org/mustbe/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
rename to src/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
index 1d17df7d..af555a05 100644
--- a/src/org/mustbe/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
+++ b/src/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.lang.psi.stubs;
+package consulo.javascript.lang.psi.stubs;
 
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
diff --git a/src/org/mustbe/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/src/consulo/javascript/module/extension/JavaScriptModuleExtension.java
similarity index 75%
rename from src/org/mustbe/consulo/javascript/module/extension/JavaScriptModuleExtension.java
rename to src/consulo/javascript/module/extension/JavaScriptModuleExtension.java
index 8e271305..3437218f 100644
--- a/src/org/mustbe/consulo/javascript/module/extension/JavaScriptModuleExtension.java
+++ b/src/consulo/javascript/module/extension/JavaScriptModuleExtension.java
@@ -1,7 +1,7 @@
-package org.mustbe.consulo.javascript.module.extension;
+package consulo.javascript.module.extension;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.ModuleExtensionWithSdk;
 
diff --git a/src/org/mustbe/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/src/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
similarity index 89%
rename from src/org/mustbe/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
rename to src/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
index eda602f2..870ee023 100644
--- a/src/org/mustbe/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
+++ b/src/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.module.extension;
+package consulo.javascript.module.extension;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.MutableModuleExtensionWithSdk;
 
diff --git a/src/org/mustbe/consulo/javascript/psi/JSComputedName.java b/src/consulo/javascript/psi/JSComputedName.java
similarity index 95%
rename from src/org/mustbe/consulo/javascript/psi/JSComputedName.java
rename to src/consulo/javascript/psi/JSComputedName.java
index 66e5d498..b0b93a5f 100644
--- a/src/org/mustbe/consulo/javascript/psi/JSComputedName.java
+++ b/src/consulo/javascript/psi/JSComputedName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.psi;
+package consulo.javascript.psi;
 
 import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.psi.JSElement;
diff --git a/src/org/mustbe/consulo/javascript/psi/JavaScriptLambdaExpression.java b/src/consulo/javascript/psi/JavaScriptLambdaExpression.java
similarity index 95%
rename from src/org/mustbe/consulo/javascript/psi/JavaScriptLambdaExpression.java
rename to src/consulo/javascript/psi/JavaScriptLambdaExpression.java
index 17efa065..3553df71 100644
--- a/src/org/mustbe/consulo/javascript/psi/JavaScriptLambdaExpression.java
+++ b/src/consulo/javascript/psi/JavaScriptLambdaExpression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.psi;
+package consulo.javascript.psi;
 
 import org.jetbrains.annotations.NotNull;
 import consulo.annotations.RequiredReadAction;
diff --git a/src/org/mustbe/consulo/javascript/psi/impl/JSComputedNameImpl.java b/src/consulo/javascript/psi/impl/JSComputedNameImpl.java
similarity index 92%
rename from src/org/mustbe/consulo/javascript/psi/impl/JSComputedNameImpl.java
rename to src/consulo/javascript/psi/impl/JSComputedNameImpl.java
index ac0274fc..02ec4056 100644
--- a/src/org/mustbe/consulo/javascript/psi/impl/JSComputedNameImpl.java
+++ b/src/consulo/javascript/psi/impl/JSComputedNameImpl.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.psi.impl;
+package consulo.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.psi.JSComputedName;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.psi.PsiElementVisitor;
+import consulo.javascript.psi.JSComputedName;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java b/src/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
similarity index 95%
rename from src/org/mustbe/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
rename to src/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
index 0775e8fb..8dc13ebe 100644
--- a/src/org/mustbe/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
+++ b/src/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package org.mustbe.consulo.javascript.psi.impl;
+package consulo.javascript.psi.impl;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.annotations.RequiredReadAction;
-import org.mustbe.consulo.javascript.psi.JavaScriptLambdaExpression;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSParameter;
@@ -29,6 +27,8 @@
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.annotations.RequiredReadAction;
+import consulo.javascript.psi.JavaScriptLambdaExpression;
 
 /**
  * @author VISTALL
diff --git a/src/org/mustbe/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java b/src/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
similarity index 89%
rename from src/org/mustbe/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
rename to src/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
index 0e7cb80e..97a4da86 100644
--- a/src/org/mustbe/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
+++ b/src/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
@@ -17,13 +17,13 @@
 /*
  * @author max
  */
-package org.mustbe.consulo.javascript.psi.stubs.index;
+package consulo.javascript.psi.stubs.index;
 
 import org.jetbrains.annotations.NotNull;
-import org.mustbe.consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
+import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
  * @author VISTALL
diff --git a/typescript-impl/src/consulo/typescript/TypeScriptFileType.java b/typescript-impl/src/consulo/typescript/TypeScriptFileType.java
index 8f927fa0..2f7cadee 100644
--- a/typescript-impl/src/consulo/typescript/TypeScriptFileType.java
+++ b/typescript-impl/src/consulo/typescript/TypeScriptFileType.java
@@ -20,10 +20,10 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.mustbe.consulo.javascript.lang.JavaScriptLanguage;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
+import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author VISTALL

From a1bfefc52dcc3ca20f7bd2510d63c6c49f413815 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 3 Sep 2016 20:55:04 +0300
Subject: [PATCH 010/340] move our code to our package

---
 .../ConfusingFloatingPointLiteralJSInspection.java    |  2 +-
 .../inspectjs/confusing/MagicNumberJSInspection.java  |  1 +
 .../inspectjs/confusing/OctalIntegerJSInspection.java |  2 +-
 .../src/com/sixrr/inspectjs/utils/ExpressionUtil.java |  1 +
 .../validity/StringLiteralBreaksHTMLJSInspection.java |  2 +-
 .../JSJoinConcatenatedStringLiteralsIntention.java    |  2 +-
 .../idea/lang/javascript/psiutil/ExpressionUtil.java  | 11 ++++++-----
 .../json/jom/proxy/impl/JomStringConverter.java       |  2 +-
 .../inspections/PropertyValidationInspection.java     |  2 +-
 .../reference/JsonPropertyNameReferenceProvider.java  |  2 +-
 resources/META-INF/plugin.xml                         |  8 ++++----
 src/com/intellij/lang/javascript/JSElementTypes.java  |  1 +
 .../formatter/JSCodeStyleSettingsProvider.java        |  1 +
 .../highlighting/JavaScriptHighlightVisitor.java      |  1 +
 .../inspections/JSUnresolvedVariableInspection.java   |  2 +-
 .../qucikFixes/CreateJSFunctionOrMethodFix.java       |  1 +
 .../lang/javascript/psi/JSElementVisitor.java         |  1 +
 .../javascript/psi/impl/JSLiteralExpressionImpl.java  |  2 +-
 .../lang/javascript/psi/impl/JSPropertyImpl.java      |  2 +-
 .../lang/javascript/types/JSClassElementType.java     |  1 +
 .../lang/javascript/types/JSFileElementType.java      |  6 +++---
 .../lang/javascript/types/JSFunctionElementType.java  |  1 +
 .../types/JSNamespaceDeclarationElementType.java      |  1 +
 .../lang/javascript/types/JSVariableElementType.java  |  1 +
 .../javascript/validation/JSAnnotatingVisitor.java    |  1 +
 .../formatter/JavaScriptCodeStyleConfigurable.java    |  2 +-
 .../formatter/JavaScriptCodeStylePanel.java           |  3 ++-
 .../JavaScriptLanguageCodeStyleSettingsProvider.java  |  2 +-
 .../javascript/index/JavaScriptIndexer.java           |  4 ++--
 .../qucikFixes/CreateJSFunctionFixBase.java           |  3 ++-
 .../lang/JavaScriptRegexpMultiHostInjector.java       |  2 +-
 .../javascript/psi/JSSimpleLiteralExpression.java     |  3 ++-
 .../DefaultJSPropertyNameReferenceProvider.java       |  3 ++-
 .../reference/JSPropertyNameReferenceProvider.java    |  2 +-
 .../javascript/psi/stubs/JSFileStub.java              |  2 +-
 .../javascript/psi/stubs/impl/JSFileStubImpl.java     |  4 ++--
 .../javascript/types/JSQualifiedStubElementType.java  |  2 +-
 37 files changed, 53 insertions(+), 36 deletions(-)
 rename src/{com/intellij/lang => consulo}/javascript/formatter/JavaScriptCodeStyleConfigurable.java (94%)
 rename src/{com/intellij/lang => consulo}/javascript/formatter/JavaScriptCodeStylePanel.java (85%)
 rename src/{com/intellij/lang => consulo}/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java (98%)
 rename src/{com/intellij/lang => consulo}/javascript/index/JavaScriptIndexer.java (82%)
 rename src/{com/intellij/lang => consulo}/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java (96%)
 rename src/{com/intellij/lang => consulo}/javascript/psi/JSSimpleLiteralExpression.java (91%)
 rename src/{com/intellij/lang => consulo}/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java (91%)
 rename src/{com/intellij/lang => consulo}/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java (95%)
 rename src/{com/intellij/lang => consulo}/javascript/psi/stubs/JSFileStub.java (85%)
 rename src/{com/intellij/lang => consulo}/javascript/psi/stubs/impl/JSFileStubImpl.java (89%)
 rename src/{com/intellij/lang => consulo}/javascript/types/JSQualifiedStubElementType.java (97%)

diff --git a/inspections/src/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index 450791cb..d7c4ca20 100644
--- a/inspections/src/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -3,7 +3,7 @@
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index 34915dd7..6b0f5cf8 100644
--- a/inspections/src/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index 4c1d05df..86b218a3 100644
--- a/inspections/src/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs.confusing;
 
-import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
diff --git a/inspections/src/com/sixrr/inspectjs/utils/ExpressionUtil.java b/inspections/src/com/sixrr/inspectjs/utils/ExpressionUtil.java
index 047bbab9..7a7aede9 100644
--- a/inspections/src/com/sixrr/inspectjs/utils/ExpressionUtil.java
+++ b/inspections/src/com/sixrr/inspectjs/utils/ExpressionUtil.java
@@ -3,6 +3,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.tree.IElementType;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
diff --git a/inspections/src/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index f36d16b6..2ac5801c 100644
--- a/inspections/src/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs.validity;
 
-import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 7b5f872d..805a2309 100644
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -23,7 +23,7 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java b/intentions/src/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
index c3cd76bb..286f0d8e 100644
--- a/intentions/src/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
+++ b/intentions/src/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
@@ -15,15 +15,16 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 
 public class ExpressionUtil {
 
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
index c5d2ddc2..020295c0 100644
--- a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ b/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
@@ -3,7 +3,7 @@
 import java.lang.reflect.Type;
 
 import org.jetbrains.annotations.NotNull;
-import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
diff --git a/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java b/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
index 1fa17287..af95b85c 100644
--- a/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -37,7 +37,7 @@
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
diff --git a/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
index 28fc861e..c21f5530 100644
--- a/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ b/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
@@ -22,7 +22,7 @@
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
+import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index ac02e5ab..02d1e283 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -108,7 +108,7 @@
 
 		<fileTypeIndentOptionsProvider implementation="com.intellij.lang.javascript.formatter.JavaScriptIndentOptionsProvider"/>
 		<codeStyleSettingsProvider implementation="com.intellij.lang.javascript.formatter.JSCodeStyleSettingsProvider"/>
-		<langCodeStyleSettingsProvider implementation="com.intellij.lang.javascript.formatter.JavaScriptLanguageCodeStyleSettingsProvider"/>
+		<langCodeStyleSettingsProvider implementation="consulo.javascript.formatter.JavaScriptLanguageCodeStyleSettingsProvider"/>
 		<liveTemplateContext implementation="com.intellij.lang.javascript.JavaScriptCodeContextType"/>
 
 		<codeInsight.lineMarkerProvider language="JavaScript"
@@ -159,12 +159,12 @@
 	</extensions>
 
 	<extensionPoints>
-		<extensionPoint name="indexer" interface="com.intellij.lang.javascript.index.JavaScriptIndexer"/>
+		<extensionPoint name="indexer" interface="consulo.javascript.index.JavaScriptIndexer"/>
 
 		<extensionPoint name="resolveHelper" interface="com.intellij.lang.javascript.flex.JSResolveHelper"/>
 		<extensionPoint name="classInheritorsProvider" interface="com.intellij.lang.javascript.search.JSClassInheritorsProvider"/>
 
-		<extensionPoint name="propertyNameReferenceProvider" interface="com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReferenceProvider"/>
+		<extensionPoint name="propertyNameReferenceProvider" interface="consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider"/>
 
 		<extensionPoint name="quickFixFactory" beanClass="com.intellij.util.KeyedLazyInstanceEP">
 			<with attribute="implementationClass" implements="consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory"/>
@@ -172,7 +172,7 @@
 	</extensionPoints>
 
 	<extensions defaultExtensionNs="consulo.javascript">
-		<propertyNameReferenceProvider implementation="com.intellij.lang.javascript.psi.impl.reference.DefaultJSPropertyNameReferenceProvider" id="default"/>
+		<propertyNameReferenceProvider implementation="consulo.javascript.psi.impl.reference.DefaultJSPropertyNameReferenceProvider" id="default"/>
 	</extensions>
 
 	<actions>
diff --git a/src/com/intellij/lang/javascript/JSElementTypes.java b/src/com/intellij/lang/javascript/JSElementTypes.java
index a5fd85e6..72055233 100644
--- a/src/com/intellij/lang/javascript/JSElementTypes.java
+++ b/src/com/intellij/lang/javascript/JSElementTypes.java
@@ -31,6 +31,7 @@
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.psi.impl.JSComputedNameImpl;
 import consulo.javascript.psi.impl.JavaScriptLambdaExpressionImpl;
+import consulo.javascript.psi.stubs.JSFileStub;
 import consulo.psi.tree.ElementTypeAsPsiFactory;
 
 /**
diff --git a/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java b/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
index d2b5349f..99e7abfa 100644
--- a/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
+++ b/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
@@ -23,6 +23,7 @@
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
 import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
+import consulo.javascript.formatter.JavaScriptCodeStyleConfigurable;
 import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
diff --git a/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index 0098c44a..ab259a27 100644
--- a/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -40,6 +40,7 @@
 import consulo.javascript.lang.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.JavaScriptVersionUtil;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 
 public class JavaScriptHighlightVisitor extends JSElementVisitor implements HighlightVisitor
 {
diff --git a/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java b/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
index 96440ee3..c3495584 100644
--- a/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
+++ b/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
@@ -30,7 +30,7 @@
 import com.intellij.lang.javascript.flex.AddImportECMAScriptClassOrFunctionAction;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
-import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionFixBase;
+import consulo.javascript.inspections.qucikFixes.CreateJSFunctionFixBase;
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
 import com.intellij.lang.javascript.psi.JSArgumentList;
 import com.intellij.lang.javascript.psi.JSCallExpression;
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index c4f2f459..7a71baa6 100644
--- a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -28,6 +28,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import consulo.annotations.RequiredReadAction;
+import consulo.javascript.inspections.qucikFixes.CreateJSFunctionFixBase;
 import consulo.javascript.lang.JavaScriptFeature;
 
 public class CreateJSFunctionOrMethodFix extends CreateJSFunctionFixBase
diff --git a/src/com/intellij/lang/javascript/psi/JSElementVisitor.java b/src/com/intellij/lang/javascript/psi/JSElementVisitor.java
index eb4abfcb..a991cf2f 100644
--- a/src/com/intellij/lang/javascript/psi/JSElementVisitor.java
+++ b/src/com/intellij/lang/javascript/psi/JSElementVisitor.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.psi.PsiElementVisitor;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
 
 /**
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index fb0c7e48..1711f067 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -21,7 +21,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.psi.LiteralTextEscaper;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index af17ae6e..8fe290bd 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -23,7 +23,7 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
+import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
diff --git a/src/com/intellij/lang/javascript/types/JSClassElementType.java b/src/com/intellij/lang/javascript/types/JSClassElementType.java
index 38bd7b8a..f6918561 100644
--- a/src/com/intellij/lang/javascript/types/JSClassElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSClassElementType.java
@@ -34,6 +34,7 @@
 import com.intellij.util.io.StringRef;
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.types.JSQualifiedStubElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/types/JSFileElementType.java b/src/com/intellij/lang/javascript/types/JSFileElementType.java
index 2ff5c9fb..1b4f9424 100644
--- a/src/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -20,10 +20,10 @@
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.Language;
-import com.intellij.lang.javascript.index.JavaScriptIndexer;
+import consulo.javascript.index.JavaScriptIndexer;
 import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.stubs.JSFileStub;
-import com.intellij.lang.javascript.psi.stubs.impl.JSFileStubImpl;
+import consulo.javascript.psi.stubs.JSFileStub;
+import consulo.javascript.psi.stubs.impl.JSFileStubImpl;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.StubBuilder;
 import com.intellij.psi.stubs.DefaultStubBuilder;
diff --git a/src/com/intellij/lang/javascript/types/JSFunctionElementType.java b/src/com/intellij/lang/javascript/types/JSFunctionElementType.java
index 33052c77..d15fedb9 100644
--- a/src/com/intellij/lang/javascript/types/JSFunctionElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSFunctionElementType.java
@@ -29,6 +29,7 @@
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.util.io.StringRef;
+import consulo.javascript.types.JSQualifiedStubElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
index 1117e407..89725262 100644
--- a/src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
@@ -31,6 +31,7 @@
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.util.io.StringRef;
+import consulo.javascript.types.JSQualifiedStubElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/types/JSVariableElementType.java b/src/com/intellij/lang/javascript/types/JSVariableElementType.java
index bdf5bd24..5ac4fefb 100644
--- a/src/com/intellij/lang/javascript/types/JSVariableElementType.java
+++ b/src/com/intellij/lang/javascript/types/JSVariableElementType.java
@@ -34,6 +34,7 @@
 import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.io.StringRef;
+import consulo.javascript.types.JSQualifiedStubElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/src/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java b/src/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
index 5833c886..a6794422 100644
--- a/src/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
+++ b/src/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
@@ -71,6 +71,7 @@
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlTagChild;
 import com.intellij.util.IncorrectOperationException;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 
 /**
  * @by max, maxim.mossienko
diff --git a/src/com/intellij/lang/javascript/formatter/JavaScriptCodeStyleConfigurable.java b/src/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
similarity index 94%
rename from src/com/intellij/lang/javascript/formatter/JavaScriptCodeStyleConfigurable.java
rename to src/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
index bcaf23e4..14176a70 100644
--- a/src/com/intellij/lang/javascript/formatter/JavaScriptCodeStyleConfigurable.java
+++ b/src/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
@@ -1,4 +1,4 @@
-package com.intellij.lang.javascript.formatter;
+package consulo.javascript.formatter;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.application.options.CodeStyleAbstractConfigurable;
diff --git a/src/com/intellij/lang/javascript/formatter/JavaScriptCodeStylePanel.java b/src/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
similarity index 85%
rename from src/com/intellij/lang/javascript/formatter/JavaScriptCodeStylePanel.java
rename to src/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
index 294c68e7..144d42ea 100644
--- a/src/com/intellij/lang/javascript/formatter/JavaScriptCodeStylePanel.java
+++ b/src/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
@@ -1,6 +1,7 @@
-package com.intellij.lang.javascript.formatter;
+package consulo.javascript.formatter;
 
 import com.intellij.application.options.TabbedLanguageCodeStylePanel;
+import com.intellij.lang.javascript.formatter.JSCodeStylePanel;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import consulo.javascript.lang.JavaScriptLanguage;
 
diff --git a/src/com/intellij/lang/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/src/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
similarity index 98%
rename from src/com/intellij/lang/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
rename to src/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index 2d430d3d..bb242ba5 100644
--- a/src/com/intellij/lang/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/src/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -1,4 +1,4 @@
-package com.intellij.lang.javascript.formatter;
+package consulo.javascript.formatter;
 
 import java.io.IOException;
 
diff --git a/src/com/intellij/lang/javascript/index/JavaScriptIndexer.java b/src/consulo/javascript/index/JavaScriptIndexer.java
similarity index 82%
rename from src/com/intellij/lang/javascript/index/JavaScriptIndexer.java
rename to src/consulo/javascript/index/JavaScriptIndexer.java
index 4fe26234..4fb8fcfa 100644
--- a/src/com/intellij/lang/javascript/index/JavaScriptIndexer.java
+++ b/src/consulo/javascript/index/JavaScriptIndexer.java
@@ -1,7 +1,7 @@
-package com.intellij.lang.javascript.index;
+package consulo.javascript.index;
 
 import org.jetbrains.annotations.NotNull;
-import com.intellij.lang.javascript.psi.stubs.JSFileStub;
+import consulo.javascript.psi.stubs.JSFileStub;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.stubs.IndexSink;
 
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/src/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
similarity index 96%
rename from src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
rename to src/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index 0ae8ffb4..b5d0f0a3 100644
--- a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/src/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections.qucikFixes;
+package consulo.javascript.inspections.qucikFixes;
 
 import java.util.Set;
 
@@ -23,6 +23,7 @@
 import org.jetbrains.annotations.PropertyKey;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.lang.javascript.JavaScriptBundle;
+import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
diff --git a/src/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java b/src/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
index aafc4252..4a563f32 100644
--- a/src/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
+++ b/src/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
@@ -22,7 +22,7 @@
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLanguageInjectionHost;
diff --git a/src/com/intellij/lang/javascript/psi/JSSimpleLiteralExpression.java b/src/consulo/javascript/psi/JSSimpleLiteralExpression.java
similarity index 91%
rename from src/com/intellij/lang/javascript/psi/JSSimpleLiteralExpression.java
rename to src/consulo/javascript/psi/JSSimpleLiteralExpression.java
index 3ce11d5c..4e3a1088 100644
--- a/src/com/intellij/lang/javascript/psi/JSSimpleLiteralExpression.java
+++ b/src/consulo/javascript/psi/JSSimpleLiteralExpression.java
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.psi;
+package consulo.javascript.psi;
 
 import org.jetbrains.annotations.NotNull;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.tree.IElementType;
 
diff --git a/src/com/intellij/lang/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/src/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
similarity index 91%
rename from src/com/intellij/lang/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
rename to src/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
index 0344e16e..e055e222 100644
--- a/src/com/intellij/lang/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
+++ b/src/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.psi.impl.reference;
+package consulo.javascript.psi.impl.reference;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReference;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.PsiElement;
diff --git a/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/src/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
similarity index 95%
rename from src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
rename to src/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index 54f951cf..23070fcb 100644
--- a/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/src/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.psi.impl.reference;
+package consulo.javascript.psi.impl.reference;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSFileStub.java b/src/consulo/javascript/psi/stubs/JSFileStub.java
similarity index 85%
rename from src/com/intellij/lang/javascript/psi/stubs/JSFileStub.java
rename to src/consulo/javascript/psi/stubs/JSFileStub.java
index e541063f..42c4c8ed 100644
--- a/src/com/intellij/lang/javascript/psi/stubs/JSFileStub.java
+++ b/src/consulo/javascript/psi/stubs/JSFileStub.java
@@ -1,4 +1,4 @@
-package com.intellij.lang.javascript.psi.stubs;
+package consulo.javascript.psi.stubs;
 
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.psi.JSFile;
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSFileStubImpl.java b/src/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
similarity index 89%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSFileStubImpl.java
rename to src/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
index 43626bf2..132d29a3 100644
--- a/src/com/intellij/lang/javascript/psi/stubs/impl/JSFileStubImpl.java
+++ b/src/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
@@ -1,10 +1,10 @@
-package com.intellij.lang.javascript.psi.stubs.impl;
+package consulo.javascript.psi.stubs.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.stubs.JSFileStub;
+import consulo.javascript.psi.stubs.JSFileStub;
 import com.intellij.psi.stubs.PsiFileStubImpl;
 import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.util.io.StringRef;
diff --git a/src/com/intellij/lang/javascript/types/JSQualifiedStubElementType.java b/src/consulo/javascript/types/JSQualifiedStubElementType.java
similarity index 97%
rename from src/com/intellij/lang/javascript/types/JSQualifiedStubElementType.java
rename to src/consulo/javascript/types/JSQualifiedStubElementType.java
index 7d3092b8..6729e6a2 100644
--- a/src/com/intellij/lang/javascript/types/JSQualifiedStubElementType.java
+++ b/src/consulo/javascript/types/JSQualifiedStubElementType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.types;
+package consulo.javascript.types;
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

From cf314d92580cca1a78b18280c734c53ef568e8d6 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 4 Sep 2016 15:18:32 +0300
Subject: [PATCH 011/340] change dir name

---
 .consulo/artifacts/dist.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.consulo/artifacts/dist.xml b/.consulo/artifacts/dist.xml
index b4d8a99a..1d95def9 100644
--- a/.consulo/artifacts/dist.xml
+++ b/.consulo/artifacts/dist.xml
@@ -2,7 +2,7 @@
   <artifact name="dist">
     <output-path>$PROJECT_DIR$/out/artifacts/dist</output-path>
     <root id="root">
-      <element id="directory" name="javascript">
+      <element id="directory" name="consulo.javascript">
         <element id="directory" name="lib">
           <element id="zip-archive" name="javascript.jar">
             <element id="module-output" name="consulo-javascript" />

From ea9a995a87cff84fb01011b8820f2f72050bf8ea Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Thu, 15 Sep 2016 21:39:49 +0300
Subject: [PATCH 012/340] fixed compilation

---
 .consulo/runConfigurations/Unnamed.xml                 |  2 +-
 .../highlighting/JavaScriptLineMarkerProvider.java     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.consulo/runConfigurations/Unnamed.xml b/.consulo/runConfigurations/Unnamed.xml
index a2dbf880..a3b3b69d 100644
--- a/.consulo/runConfigurations/Unnamed.xml
+++ b/.consulo/runConfigurations/Unnamed.xml
@@ -5,7 +5,7 @@
     <option name="USE_ALT_CONSULO_SDK" value="false" />
     <option name="ALT_CONSULO_SDK_PATH" />
     <option name="INTERNAL_MODE" value="true" />
-    <java-sdk name="1.6" />
+    <java-sdk name="1.8" />
     <consulo-sdk name="Consulo 1.SNAPSHOT" />
     <artifact name="plugin" />
     <predefined_log_file id="IDEA_LOG" enabled="true" />
diff --git a/src/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java b/src/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
index 8ab80f7b..319a7089 100644
--- a/src/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
+++ b/src/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
@@ -365,7 +365,7 @@ public boolean process(final JSClass jsClass)
 				{
 					if(!addedClassMarker)
 					{
-						result.add(new LineMarkerInfo<JSClass>(clazz, clazz.getTextOffset(), OVERRIDDEN_ICON, Pass.UPDATE_OVERRIDEN_MARKERS,
+						result.add(new LineMarkerInfo<JSClass>(clazz, clazz.getTextOffset(), OVERRIDDEN_ICON, Pass.LINE_MARKERS,
 								ourClassInheritorsTooltipProvider, ourClassInheritorsNavHandler));
 						addedClassMarker = true;
 					}
@@ -381,7 +381,7 @@ public boolean process(final JSClass jsClass)
 							{
 								// TODO: more correct check for override
 								function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
-								result.add(new LineMarkerInfo<JSFunction>(function, function.getTextOffset(), OVERRIDDEN_ICON, Pass.UPDATE_OVERRIDEN_MARKERS,
+								result.add(new LineMarkerInfo<JSFunction>(function, function.getTextOffset(), OVERRIDDEN_ICON, Pass.LINE_MARKERS,
 										ourOverriddenFunctionsTooltipProvider, ourOverriddenFunctionsNavHandler));
 								functionIterator.remove();
 							}
@@ -398,7 +398,7 @@ public boolean process(final JSClass jsClass)
 
 				if(classQuery.findFirst() != null)
 				{
-					result.add(new LineMarkerInfo<JSClass>(clazz, clazz.getTextOffset(), IMPLEMENTED_ICON, Pass.UPDATE_OVERRIDEN_MARKERS,
+					result.add(new LineMarkerInfo<JSClass>(clazz, clazz.getTextOffset(), IMPLEMENTED_ICON, Pass.LINE_MARKERS,
 							ourImplementedInterfacesTooltipProvider, ourInterfaceImplementationsNavHandler));
 				}
 			}
@@ -417,7 +417,7 @@ public boolean process(final JSClass jsClass)
 					if(query.findFirst() != null)
 					{
 						function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
-						result.add(new LineMarkerInfo<JSFunction>(function, function.getTextOffset(), IMPLEMENTED_ICON, Pass.UPDATE_OVERRIDEN_MARKERS,
+						result.add(new LineMarkerInfo<JSFunction>(function, function.getTextOffset(), IMPLEMENTED_ICON, Pass.LINE_MARKERS,
 								ourImplementingFunctionsTooltipProvider, ourImplementingFunctionsNavHandler));
 					}
 				}
@@ -434,7 +434,7 @@ public boolean process(final JSClass jsClass)
 					{
 						function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
 
-						result.add(new LineMarkerInfo<JSFunction>(function, function.getTextOffset(), IMPLEMENTING_ICON, Pass.UPDATE_OVERRIDEN_MARKERS,
+						result.add(new LineMarkerInfo<JSFunction>(function, function.getTextOffset(), IMPLEMENTING_ICON, Pass.LINE_MARKERS,
 								new Function<JSFunction, String>()
 						{
 							@Override

From 133fefe6949a52b0907090d2eadea6efca3510e3 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 25 Oct 2016 20:37:08 +0300
Subject: [PATCH 013/340] fix wrong version resolving

---
 .../consulo_plugin__com_intellij_regexp.xml       |  3 +--
 .../consulo_plugin__com_intellij_spellchecker.xml |  3 +--
 .../consulo_plugin__com_intellij_xml.xml          |  6 ++++--
 .../consulo_plugin__org_intellij_intelliLang.xml  |  3 +--
 .consulo/runConfigurations/Unnamed.xml            |  2 +-
 .../completion/JsonCompletionContributor.java     | 10 +++++-----
 .../lang/javascript/psi/impl/JSFileImpl.java      | 15 ---------------
 .../lang/JavaScriptLanguageVersionResolver.java   |  8 +++++++-
 8 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml b/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
index 79ccd048..69f86df5 100644
--- a/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
+++ b/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
@@ -1,8 +1,7 @@
 <component name="libraryTable">
   <library name="consulo-plugin: com.intellij.regexp">
     <binaries>
-      <root url="file://$PROJECT_DIR$/dep/com.intellij.regexp/lib" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.regexp/lib/regexp.jar!/" />
     </binaries>
-    <jarDirectory url="file://$PROJECT_DIR$/dep/com.intellij.regexp/lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml b/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
index f107e371..fdfa53b8 100644
--- a/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
+++ b/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
@@ -1,8 +1,7 @@
 <component name="libraryTable">
   <library name="consulo-plugin: com.intellij.spellchecker">
     <binaries>
-      <root url="file://$PROJECT_DIR$/dep/com.intellij.spellchecker/lib" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.spellchecker/lib/spellchecker.jar!/" />
     </binaries>
-    <jarDirectory url="file://$PROJECT_DIR$/dep/com.intellij.spellchecker/lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__com_intellij_xml.xml b/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
index ab862e03..506d0d98 100644
--- a/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
+++ b/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
@@ -1,8 +1,10 @@
 <component name="libraryTable">
   <library name="consulo-plugin: com.intellij.xml">
     <binaries>
-      <root url="file://$PROJECT_DIR$/dep/com.intellij.xml/lib" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xml.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xerces.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/resolver.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/jsr173_1.0_api.jar!/" />
     </binaries>
-    <jarDirectory url="file://$PROJECT_DIR$/dep/com.intellij.xml/lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml b/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
index e9bfbcfa..d51c7966 100644
--- a/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
+++ b/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
@@ -1,8 +1,7 @@
 <component name="libraryTable">
   <library name="consulo-plugin: org.intellij.intelliLang">
     <binaries>
-      <root url="file://$PROJECT_DIR$/dep/org.intellij.intelliLang/lib" />
+      <root url="jar://$PROJECT_DIR$/dep/org.intellij.intelliLang/lib/intelliLang.jar!/" />
     </binaries>
-    <jarDirectory url="file://$PROJECT_DIR$/dep/org.intellij.intelliLang/lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/.consulo/runConfigurations/Unnamed.xml b/.consulo/runConfigurations/Unnamed.xml
index a3b3b69d..d45a1195 100644
--- a/.consulo/runConfigurations/Unnamed.xml
+++ b/.consulo/runConfigurations/Unnamed.xml
@@ -6,7 +6,7 @@
     <option name="ALT_CONSULO_SDK_PATH" />
     <option name="INTERNAL_MODE" value="true" />
     <java-sdk name="1.8" />
-    <consulo-sdk name="Consulo 1.SNAPSHOT" />
+    <consulo-sdk name="Consulo SNAPSHOT" />
     <artifact name="plugin" />
     <predefined_log_file id="IDEA_LOG" enabled="true" />
     <RunnerSettings RunnerId="ConsuloDebuggerRunner">
diff --git a/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java b/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
index d709cad1..a0649b38 100644
--- a/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -23,11 +23,6 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.json.validation.JsonFileDescriptorProviders;
-import consulo.json.validation.NativeArray;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.codeInsight.completion.CompletionContributor;
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionResultSet;
@@ -49,6 +44,11 @@
 import com.intellij.util.containers.ContainerUtil;
 import consulo.annotations.RequiredReadAction;
 import consulo.codeInsight.completion.CompletionProvider;
+import consulo.json.validation.JsonFileDescriptorProviders;
+import consulo.json.validation.NativeArray;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.validation.descriptor.JsonPropertyDescriptor;
+import consulo.json.validation.inspections.PropertyValidationInspection;
 
 /**
  * @author VISTALL
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
index edee25c4..fc87dcb1 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
@@ -22,15 +22,12 @@
 import org.jetbrains.annotations.Nullable;
 import com.intellij.extapi.psi.PsiFileBase;
 import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
 import com.intellij.lang.javascript.psi.JSSourceElement;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
@@ -55,18 +52,6 @@ public JSFileImpl(FileViewProvider fileViewProvider)
 		super(fileViewProvider, JavaScriptLanguage.INSTANCE);
 	}
 
-	@Override
-	@NotNull
-	public FileType getFileType()
-	{
-		VirtualFile virtualFile = getVirtualFile();
-		if(virtualFile == null)
-		{
-			return JavaScriptFileType.INSTANCE;
-		}
-		return virtualFile.getFileType();
-	}
-
 	@Override
 	public String toString()
 	{
diff --git a/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index 8a671185..4f84e054 100644
--- a/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -42,7 +42,13 @@ public LanguageVersion<JavaScriptLanguage> getLanguageVersion(@NotNull Language
 		{
 			return StandardJavaScriptVersions.getDefaultVersion();
 		}
-		return getLanguageVersion(language, element.getProject(), containingFile.getVirtualFile());
+		FileType fileType = containingFile.getFileType();
+		if(fileType instanceof JavaScriptFileTypeWithVersion)
+		{
+			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(element.getProject(), element.getContainingFile().getVirtualFile());
+		}
+
+		return StandardJavaScriptVersions.getDefaultVersion();
 	}
 
 	@Override

From ef3d4997fba66743d154863e8ff1596a3c0685f0 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 25 Oct 2016 20:41:29 +0300
Subject: [PATCH 014/340] correct drop cache on add/remove jom info

---
 ...criptionByAnotherPsiElementEditorNotification.java | 11 ++++++-----
 .../lang/javascript/psi/impl/JSPropertyImpl.java      |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index 42b7631e..aca5098b 100644
--- a/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -18,10 +18,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.json.JsonFileType;
-import consulo.json.jom.JomElement;
-import consulo.json.jom.JomFileElement;
-import consulo.json.jom.JomManager;
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.project.Project;
@@ -37,6 +33,10 @@
 import com.intellij.ui.EditorNotifications;
 import consulo.annotations.RequiredDispatchThread;
 import consulo.editor.notifications.EditorNotificationProvider;
+import consulo.json.JsonFileType;
+import consulo.json.jom.JomElement;
+import consulo.json.jom.JomFileElement;
+import consulo.json.jom.JomManager;
 
 /**
  * @author VISTALL
@@ -55,6 +55,7 @@ public DescriptionByAnotherPsiElementEditorNotification(@NotNull Project project
 
 		myPanelKey = Key.create("DescriptionByAnotherPsiElementEditorNotification." + provider.getId());
 	}
+
 	@NotNull
 	@Override
 	public Key<EditorNotificationPanel> getKey()
@@ -134,7 +135,7 @@ public void run()
 
 	private void wantUpdate(PsiFile psiFile)
 	{
-		((PsiModificationTrackerImpl) PsiModificationTracker.SERVICE.getInstance(myProject)).incOutOfCodeBlockModificationCounter();
+		((PsiModificationTrackerImpl) PsiModificationTracker.SERVICE.getInstance(myProject)).incCounter();
 
 		DaemonCodeAnalyzer.getInstance(myProject).restart(psiFile);
 
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index 8fe290bd..dc2eb6e6 100644
--- a/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -23,6 +23,7 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
+import com.intellij.psi.util.PsiModificationTracker;
 import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
@@ -60,7 +61,7 @@ public PsiReference[] getReferences()
 			@RequiredReadAction
 			public Result<PsiReference[]> compute()
 			{
-				return Result.create(buildReferences(), JSPropertyImpl.this);
+				return Result.create(buildReferences(), JSPropertyImpl.this, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
 			}
 		});
 	}

From 2c0c002ffff2b21915c93bd3701e2c6e146f9525 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 26 Oct 2016 15:01:12 +0300
Subject: [PATCH 015/340] fixed wrong completion if property type is
 array(showed as object)

---
 .../json/validation/descriptor/JsonPropertyDescriptor.java  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/json-javascript-impl/src/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/json-javascript-impl/src/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
index 365bb1d7..d2748f67 100644
--- a/json-javascript-impl/src/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
@@ -72,12 +72,6 @@ public Object getValue()
 		return myValue;
 	}
 
-	@NotNull
-	public Class getType()
-	{
-		return myValue instanceof Class ? (Class) myValue : Object.class;
-	}
-
 	@Nullable
 	public String getName()
 	{

From a12ebbd17237a9a7d80b2d2a0f201423485c097e Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 26 Oct 2016 15:02:00 +0300
Subject: [PATCH 016/340] to prev

---
 .../completion/JsonCompletionContributor.java  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java b/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
index a0649b38..47c94815 100644
--- a/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -211,8 +211,8 @@ else if(currentProperty.getValue() instanceof NativeArray)
 			{
 				builder = builder.strikeout();
 			}
-			final Class type = value.getType();
-			builder = builder.withTypeText(StringUtil.decapitalize(type.getSimpleName()), true);
+			final Object type = value.getValue();
+			builder = builder.withTypeText(formatValue(type), true);
 
 			if(quotes && ((JSProperty) jsProperty).getValue() == null)
 			{
@@ -260,4 +260,18 @@ else if(value.getValue() instanceof NativeArray)
 			result.addElement(builder);
 		}
 	}
+
+	private static String formatValue(Object value)
+	{
+		if(value instanceof Class)
+		{
+			return StringUtil.decapitalize(((Class) value).getSimpleName());
+		}
+		else if(value instanceof NativeArray)
+		{
+			return formatValue(((NativeArray) value).getComponentType()) + "[]";
+		}
+		// JsonObjectDescriptor
+		return "object";
+	}
 }

From 2472d9cadffc623d6b32e8744533b01136b051f4 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Fri, 11 Nov 2016 08:45:53 +0300
Subject: [PATCH 017/340] compilation fixed

---
 .../intellij/lang/javascript/psi/impl/ReferenceSupport.java | 5 ++---
 .../src/consulo/javascript/run/debug/V8ExecutionStack.java  | 6 ------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java b/src/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
index 8105b672..4e02158c 100644
--- a/src/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
+++ b/src/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
@@ -25,13 +25,11 @@
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.LibraryOrderEntry;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.OrderEntry;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.roots.SdkOrderEntry;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -46,6 +44,7 @@
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
 import com.intellij.util.Function;
+import consulo.roots.OrderEntryWithTracking;
 
 /**
  * Created by IntelliJ IDEA.
@@ -191,7 +190,7 @@ private static void appendSdkAndLibraryClassRoots(List<VirtualFile> dirs, PsiFil
 			final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
 			for(final OrderEntry orderEntry : orderEntries)
 			{
-				if(orderEntry instanceof LibraryOrderEntry || orderEntry instanceof SdkOrderEntry)
+				if(orderEntry instanceof OrderEntryWithTracking)
 				{
 					dirs.addAll(Arrays.asList(orderEntry.getFiles(OrderRootType.CLASSES)));
 				}
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8ExecutionStack.java b/v8-debugger-impl/src/consulo/javascript/run/debug/V8ExecutionStack.java
index 03f3ed68..4e071ca0 100644
--- a/v8-debugger-impl/src/consulo/javascript/run/debug/V8ExecutionStack.java
+++ b/v8-debugger-impl/src/consulo/javascript/run/debug/V8ExecutionStack.java
@@ -60,10 +60,4 @@ public void computeStackFrames(XStackFrameContainer frameContainer)
 
 		frameContainer.addStackFrames(stackFrames, true);
 	}
-
-	@Override
-	public void computeStackFrames(int firstFrameIndex, XStackFrameContainer container)
-	{
-		throw new UnsupportedOperationException();
-	}
 }

From 3a911b97b8d171bb8f009ebb98cf544ced35921a Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 26 Nov 2016 02:12:39 +0300
Subject: [PATCH 018/340] compilation

---
 .consulo/modules.xml                          | 56 +++++++++----------
 .../ClientJavaScriptModuleExtension.java      | 18 +++---
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.consulo/modules.xml b/.consulo/modules.xml
index c498cc8d..52e3801e 100644
--- a/.consulo/modules.xml
+++ b/.consulo/modules.xml
@@ -4,8 +4,8 @@
     <modules>
       <module name="consulo-javascript" dirurl="file://$PROJECT_DIR$" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="" sdk-name="Consulo SNAPSHOT" />
-          <extension id="java" sdk-module-name="" sdk-name="1.8" language-level-module-name="" language-level-name="JDK_1_8" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-name="Consulo SNAPSHOT" />
+          <extension id="java" sdk-name="1.8" language-level-name="JDK_1_8" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
@@ -22,8 +22,8 @@
       </module>
       <module name="inspections" dirurl="file://$PROJECT_DIR$/inspections" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -37,8 +37,8 @@
       </module>
       <module name="intentions" dirurl="file://$PROJECT_DIR$/intentions" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -52,8 +52,8 @@
       </module>
       <module name="client-javascript-impl" dirurl="file://$PROJECT_DIR$/client-javascript-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -65,8 +65,8 @@
       </module>
       <module name="json-javascript-impl" dirurl="file://$PROJECT_DIR$/json-javascript-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -80,8 +80,8 @@
       </module>
       <module name="debugger-impl/debugger-impl" dirurl="file://$PROJECT_DIR$/debugger-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -94,8 +94,8 @@
       </module>
       <module name="debugger-impl/v8-debugger-impl" dirurl="file://$PROJECT_DIR$/v8-debugger-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -122,8 +122,8 @@
       </module>
       <module name="actionscript-impl" dirurl="file://$PROJECT_DIR$/actionscript-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -135,8 +135,8 @@
       </module>
       <module name="javascript16-impl" dirurl="file://$PROJECT_DIR$/javascript16-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -148,8 +148,8 @@
       </module>
       <module name="javascript17-impl" dirurl="file://$PROJECT_DIR$/javascript17-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -161,8 +161,8 @@
       </module>
       <module name="javascript18-impl" dirurl="file://$PROJECT_DIR$/javascript18-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -175,8 +175,8 @@
       </module>
       <module name="ecmascript6-impl" dirurl="file://$PROJECT_DIR$/ecmascript6-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -189,8 +189,8 @@
       </module>
       <module name="ecmascript4-impl" dirurl="file://$PROJECT_DIR$/ecmascript4-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -203,8 +203,8 @@
       </module>
       <module name="typescript-impl" dirurl="file://$PROJECT_DIR$/typescript-impl" current-layer="Default">
         <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" sdk-name="" />
-          <extension id="java" sdk-module-name="consulo-javascript" sdk-name="" language-level-module-name="consulo-javascript" language-level-name="" special-dir-location="SOURCE_DIR" />
+          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
+          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index 19a00596..a420cd7b 100644
--- a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -3,23 +3,22 @@
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.javascript.client.module.sdk.ClientJavaScriptSdkType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkTable;
 import com.intellij.openapi.projectRoots.SdkType;
 import consulo.annotations.RequiredReadAction;
-import consulo.bundle.SdkUtil;
-import consulo.extension.impl.ModuleExtensionImpl;
+import consulo.javascript.client.module.sdk.ClientJavaScriptSdkType;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.ModuleInheritableNamedPointer;
+import consulo.module.extension.impl.ModuleExtensionImpl;
 import consulo.module.extension.impl.ModuleInheritableNamedPointerImpl;
 import consulo.roots.ModuleRootLayer;
+import consulo.roots.impl.ModuleRootLayerImpl;
 import consulo.util.pointers.NamedPointer;
 
 /**
@@ -32,10 +31,10 @@ public class ClientJavaScriptModuleExtension extends ModuleExtensionImpl<ClientJ
 
 	protected LanguageVersion<JavaScriptLanguage> myLanguageVersion = StandardJavaScriptVersions.getDefaultVersion();
 
-	public ClientJavaScriptModuleExtension(@NotNull String id, @NotNull ModuleRootLayer rootModel)
+	public ClientJavaScriptModuleExtension(@NotNull String id, @NotNull ModuleRootLayer rootLayer)
 	{
-		super(id, rootModel);
-		myPointer = new ModuleInheritableNamedPointerImpl<Sdk>(getProject(), id)
+		super(id, rootLayer);
+		myPointer = new ModuleInheritableNamedPointerImpl<Sdk>(rootLayer, id)
 		{
 			@Nullable
 			@Override
@@ -63,9 +62,9 @@ public Sdk getItemFromModule(@NotNull Module module)
 
 			@NotNull
 			@Override
-			public NamedPointer<Sdk> getPointer(@NotNull Project project, @NotNull String name)
+			public NamedPointer<Sdk> getPointer(@NotNull ModuleRootLayer moduleRootLayer, @NotNull String name)
 			{
-				return SdkUtil.createPointer(name);
+				return ((ModuleRootLayerImpl)moduleRootLayer).getRootModel().getConfigurationAccessor().getSdkPointer(name);
 			}
 		};
 
@@ -126,6 +125,7 @@ public LanguageVersion<JavaScriptLanguage> getLanguageVersion()
 		return myLanguageVersion;
 	}
 
+	@RequiredReadAction
 	@Override
 	public void commit(@NotNull ClientJavaScriptModuleExtension mutableModuleExtension)
 	{

From e9d90b7c60285facb3df75eafb902768c0f67e53 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 6 Dec 2016 18:12:21 +0300
Subject: [PATCH 019/340] drop dead project component

---
 .../JavaScriptIntentionBundle.properties      |   2 -
 .../intention/JSIntentionPowerPack.java       |  58 ------
 .../javascript/intention/test/InfoDialog.java | 142 --------------
 .../intention/test/IntentionTestCase.java     | 101 ----------
 .../test/JSIntentionTestManager.java          |  89 ---------
 .../javascript/intention/test/TestCase.java   | 159 ----------------
 .../intention/test/TestManager.java           | 179 ------------------
 resources/META-INF/Intentions.xml             |   7 +-
 resources/META-INF/plugin.xml                 |   2 +-
 9 files changed, 2 insertions(+), 737 deletions(-)
 delete mode 100644 intentions/src/org/intellij/idea/lang/javascript/intention/JSIntentionPowerPack.java
 delete mode 100644 intentions/src/org/intellij/idea/lang/javascript/intention/test/InfoDialog.java
 delete mode 100644 intentions/src/org/intellij/idea/lang/javascript/intention/test/IntentionTestCase.java
 delete mode 100644 intentions/src/org/intellij/idea/lang/javascript/intention/test/JSIntentionTestManager.java
 delete mode 100644 intentions/src/org/intellij/idea/lang/javascript/intention/test/TestCase.java
 delete mode 100644 intentions/src/org/intellij/idea/lang/javascript/intention/test/TestManager.java

diff --git a/intentions/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties b/intentions/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
index 5e62485c..fafa58fb 100644
--- a/intentions/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
+++ b/intentions/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
@@ -1,5 +1,3 @@
-plugin.JSIntentionPowerPack.name        = JSIntentionPowerPack
-plugin.JSIntentionPowerPack.description = Adds over 40 new JavaScript intention actions for IntelliJ IDEA.
 plugin.test.processing                  = Processing intention: {0}
 plugin.test.title                       = Testing JSIntentionPowerPack plugin...
 plugin.test.summary                     = {0} completed, {1} failed ({2} due to detection, {3} due to fix)
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/JSIntentionPowerPack.java b/intentions/src/org/intellij/idea/lang/javascript/intention/JSIntentionPowerPack.java
deleted file mode 100644
index a5f67486..00000000
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/JSIntentionPowerPack.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2005-2006 Olivier Descout
- *
- * 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.
- */
-package org.intellij.idea.lang.javascript.intention;
-
-import org.intellij.idea.lang.javascript.intention.test.JSIntentionTestManager;
-import org.jetbrains.annotations.NotNull;
-import com.intellij.openapi.components.ProjectComponent;
-import com.intellij.openapi.project.Project;
-
-public class JSIntentionPowerPack implements ProjectComponent {
-    /**
-     * To be set to true if you want to run plugin unit tests (both intention
-     * actions and inspections) when opening an IntelliJ IDEA project.
-     * Test output is printed out on the IDEA log.
-     */
-    public static final boolean RUN_TEST = false;
-
-    protected final Project project;
-
-    public JSIntentionPowerPack(Project project) {
-        this.project = project;
-    }
-
-    @Override
-	@NotNull public String getComponentName() {
-        return JSIntentionBundle.message("plugin.JSIntentionPowerPack.name");
-    }
-
-    @Override
-	public void projectOpened() {
-        //noinspection ConstantConditions
-        if (RUN_TEST) {
-            JSIntentionTestManager.runTest(project);
-        }
-    }
-
-    @Override
-	public void projectClosed() {}
-
-    @Override
-	public void initComponent() {}
-
-    @Override
-	public void disposeComponent() {}
-}
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/test/InfoDialog.java b/intentions/src/org/intellij/idea/lang/javascript/intention/test/InfoDialog.java
deleted file mode 100644
index 27b29254..00000000
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/test/InfoDialog.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2005-2006 Olivier Descout
- *
- * 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.
- */
-package org.intellij.idea.lang.javascript.intention.test;
-
-import com.intellij.concurrency.JobScheduler;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.concurrent.TimeUnit;
-
-/**
- */
-public abstract class InfoDialog extends JFrame {
-    private JLabel       processingLabel;
-    private JProgressBar progressBar;
-    private JLabel       summaryLabel;
-    private int          numCompletedCases;
-    private int          numFailedCasesDueToDetection;
-    private int          numFailedCasesDueToFix;
-    private StringBuffer logBuffer;
-
-    public InfoDialog(int numCases, String title) throws HeadlessException {
-        super(title);
-
-        this.setLayout(new BorderLayout());
-        this.logBuffer       = new StringBuffer("\n");
-        this.processingLabel = new JLabel(" ");
-        this.progressBar     = new JProgressBar(JProgressBar.HORIZONTAL, 0, numCases);
-        this.summaryLabel    = new JLabel(" ");
-
-        this.getContentPane().add(this.processingLabel, BorderLayout.NORTH);
-        this.getContentPane().add(this.progressBar,     BorderLayout.CENTER);
-        this.getContentPane().add(this.summaryLabel,    BorderLayout.SOUTH);
-        this.pack();
-
-        this.setResizable(false);
-        this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-        this.addWindowListener(new WindowAdapter() {
-                @Override
-				public void windowClosing(WindowEvent e) {}
-            });
-
-        this.showDialog();
-        this.setAlwaysOnTop(true);
-
-    }
-
-    protected abstract String getMessage(String key, Object... params);
-
-    private void showDialog() {
-        final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        final Dimension windowSize = this.getSize();
-
-        // Center Dialogue on screen
-        this.setLocation((screenSize.width  - windowSize.width)  / 2,
-                         (screenSize.height - windowSize.height) / 2);
-
-        this.setVisible(true);
-    }
-
-    @Override
-	public Dimension getMinimumSize() {
-        FontMetrics metrics = this.processingLabel.getFontMetrics(this.processingLabel.getFont());
-
-        return new Dimension(300, 3 * metrics.getHeight());
-    }
-
-    public void setProcessedCaseName(String name) {
-        this.processingLabel.setText(this.getMessage("plugin.test.processing", name));
-        this.processingLabel.repaint();
-    }
-
-    public int getNumCompletedCases() {
-        return this.numCompletedCases;
-    }
-
-    public int getNumFailedCasesDueToDetection() {
-        return this.numFailedCasesDueToDetection;
-    }
-
-    public int getNumFailedCasesDueToFix() {
-        return this.numFailedCasesDueToFix;
-    }
-
-    public void close() {
-      JobScheduler.getScheduler().schedule(new Runnable() {
-        @Override
-		public void run() {
-          InfoDialog.this.setVisible(false);
-          InfoDialog.this.dispose();
-        }
-      }, (long)1, TimeUnit.SECONDS);
-    }
-
-    public String getLog() {
-        return this.logBuffer.append(this.getSummary()).toString();
-    }
-
-    private String getSummary() {
-        return this.getMessage("plugin.test.summary",
-                               this.numCompletedCases,
-                               (this.numFailedCasesDueToDetection + this.numFailedCasesDueToFix),
-                               this.numFailedCasesDueToDetection,
-                               this.numFailedCasesDueToFix);
-    }
-
-    public void addCase(String logMessage) {
-        this.logBuffer.append(" - ")
-                      .append(logMessage)
-                      .append('\n');
-    }
-
-    public void addCompletedCase(boolean detectionOk, boolean fixOk, String logMessage) {
-        this.numCompletedCases++;
-        if (!detectionOk) {
-            this.numFailedCasesDueToDetection++;
-        } else if (!fixOk) {
-            this.numFailedCasesDueToFix++;
-        }
-
-        this.progressBar.setValue(this.numCompletedCases);
-        this.addCase(logMessage);
-
-        this.summaryLabel.setText(this.getSummary());
-        this.repaint();
-    }
-}
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/test/IntentionTestCase.java b/intentions/src/org/intellij/idea/lang/javascript/intention/test/IntentionTestCase.java
deleted file mode 100644
index ddbb88df..00000000
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/test/IntentionTestCase.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2005-2006 Olivier Descout
- *
- * 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.
- */
-package org.intellij.idea.lang.javascript.intention.test;
-
-import org.jetbrains.annotations.NonNls;
-
-import com.intellij.codeInsight.intention.IntentionAction;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiFile;
-
-/**
- * A intention test case for the JSIntentionPowerPack plugin
- */
-class IntentionTestCase extends TestCase {
-
-    private JSIntentionTestManager manager;
-
-    public IntentionTestCase(TestManager manager,
-                             String      familyName,
-                             String      caseName,
-                             String      beforeStatement,
-                             String      afterStatement,
-                             boolean     noDetectionExpected) {
-        super(familyName, caseName, beforeStatement, afterStatement, noDetectionExpected);
-
-        if (!(manager instanceof JSIntentionTestManager)) {
-            throw new IllegalArgumentException();
-        }
-
-        this.manager = (JSIntentionTestManager) manager;
-    }
-
-    @Override
-	public void process(InfoDialog infoDialog) {
-        infoDialog.setProcessedCaseName(this.familyName);
-
-        final Project  project = this.manager.getProject();
-        final Editor   editor  = this.manager.getEditor();
-        String         processedStatement;
-        String         suggestionText = EMPTY;
-
-        try {
-            final PsiFile psiFile = this.createCaseBeforeStatement(project, editor);
-
-            for (final Object runner : this.runners) {
-                final IntentionAction action           = (IntentionAction) runner;
-                final String          actionFamilyName = action.getFamilyName();
-
-                if (actionFamilyName != null && actionFamilyName.equals(this.familyName) &&
-                    action.isAvailable(project, editor, psiFile)) {
-                    suggestionText = action.getText();
-                    action.invoke(project, editor, psiFile);
-                }
-            }
-
-            processedStatement = psiFile.getText();
-        } catch (Throwable e) {
-            processedStatement = this.beforeStatement;
-            e.printStackTrace();
-        }
-
-        @NonNls final String  state;
-        final boolean         detectionOk = (this.noDetectionExpected ^ (suggestionText.length() != 0));
-        final boolean         fixOk       = (this.afterStatement.length() == 0 ||
-                                             compareIgnoreBlanks(processedStatement, this.afterStatement));
-
-        if (this.noDetectionExpected) {
-            state = (detectionOk ? "OK (no detection)" : "*** KO *** (unexpected detection)");
-        } else {
-            state = (!detectionOk                                                 ? "*** KO *** (no detection)" :
-                     this.afterStatement.length() == 0                            ? "OK (detection)" :
-                     compareIgnoreBlanks(processedStatement, this.afterStatement) ? "OK (detection and fix)"
-                                                                                  : "*** KO *** (fix failure => " + processedStatement + ')');
-        }
-
-        final String result = this.familyName + ' ' + this.caseName +
-                              (suggestionText.length() == 0 ? "" : " (" + suggestionText + ')') +
-                              ":\t" + state;
-
-        infoDialog.addCompletedCase(detectionOk, fixOk, result);
-//        final boolean        ok     = compareIgnoreBlanks(processedStatement, this.afterStatement);
-//        @NonNls final String result = this.familyName + ' ' + this.caseName + " (" +
-//                                      suggestionText + "):\t" + (ok ? "OK" : "*** KO ***");
-//
-//        infoDialog.addCompletedIntention(ok, true, result);
-    }
-}
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/test/JSIntentionTestManager.java b/intentions/src/org/intellij/idea/lang/javascript/intention/test/JSIntentionTestManager.java
deleted file mode 100644
index 2dbbacd9..00000000
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/test/JSIntentionTestManager.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2005-2006 Olivier Descout
- *
- * 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.
- */
-package org.intellij.idea.lang.javascript.intention.test;
-
-import com.intellij.codeInsight.intention.IntentionAction;
-import com.intellij.codeInsight.intention.IntentionManager;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.Project;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
-import org.jetbrains.annotations.NonNls;
-
-import java.awt.*;
-import java.util.List;
-import java.util.Map;
-
-public class JSIntentionTestManager extends TestManager {
-
-    static final String LOG_CATEGORY = "#org.intellij.idea.lang.javascript.test.JSIntentionTestManager";
-
-    @NonNls private static final String  INTENTION_DESCRIPTION_PATH = "/intentionDescriptions";
-
-    private IntentionAction[] intentionActions;
-
-    public JSIntentionTestManager(Project project) {
-        super(project);
-        this.intentionActions = IntentionManager.getInstance().getIntentionActions();
-    }
-
-    @Override
-	protected TestCase createTestCase(TestManager manager, String familyName, String caseName,
-                                      String beforeStatement, String afterStatement, boolean noDetectionExpected) {
-        return new IntentionTestCase(manager, familyName, caseName, beforeStatement, afterStatement, noDetectionExpected);
-    }
-
-    public static void runTest(Project project) {
-        JSIntentionTestManager       manager       = new JSIntentionTestManager(project);
-        final String                 directoryPath = JSIntentionTestManager.class.getResource(INTENTION_DESCRIPTION_PATH).getPath().substring(6);
-        Map<String, List<TestCase>>  testCases     = manager.getTestCases(directoryPath);
-        InfoDialog                   infoDialog    = new IntentionInfoDialog(testCases.size());
-
-        manager.addIntentions(testCases);
-        for (final String testCaseFamily : testCases.keySet()) {
-            for (final TestCase testCase : testCases.get(testCaseFamily)) {
-                testCase.process(infoDialog);
-            }
-        }
-
-        Logger.getInstance(LOG_CATEGORY).info(infoDialog.getLog());
-        infoDialog.close();
-        manager.release();
-    }
-
-    private void addIntentions(Map<String, List<TestCase>> testCases) {
-        for (final IntentionAction action : this.intentionActions) {
-            final String         actionFamilyName = action.getFamilyName();
-            final List<TestCase> testCaseList     = testCases.get(actionFamilyName);
-
-            if (testCaseList != null) {
-                for (TestCase testCase : testCaseList) {
-                    testCase.addRunner(action);
-                }
-            }
-        }
-    }
-
-    private static class IntentionInfoDialog extends InfoDialog {
-        public IntentionInfoDialog(int numIntentions) throws HeadlessException {
-            super(numIntentions, JSIntentionBundle.message("plugin.test.title"));
-        }
-
-        @Override
-		protected String getMessage(String key, Object... params) {
-            return JSIntentionBundle.message(key, params);
-        }
-    }
-}
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestCase.java b/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestCase.java
deleted file mode 100644
index 87418df0..00000000
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestCase.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2005-2006 Olivier Descout
- *
- * 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.
- */
-package org.intellij.idea.lang.javascript.intention.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
-
-import com.intellij.lang.ASTNode;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.command.CommandProcessor;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiFile;
-
-/**
- */
-public abstract class TestCase {
-    @NonNls protected static final String SPOT_START = "<spot>";
-    @NonNls protected static final String SPOT_END   = "</spot>";
-    @NonNls protected static final String EMPTY      = "";
-
-    protected String       familyName;
-    protected String       caseName;
-    protected String       beforeStatement;
-    protected String       afterStatement;
-    protected boolean      noDetectionExpected;
-    protected List<Object> runners;            // inspections/intentions related to the case
-
-    public TestCase(String  familyName,
-                    String  caseName,
-                    String  beforeStatement,
-                    String  afterStatement,
-                    boolean noDetectionExpected) {
-        this.familyName          = familyName;
-        this.caseName            = caseName;
-        this.beforeStatement     = beforeStatement;
-        this.afterStatement      = afterStatement;
-        this.noDetectionExpected = noDetectionExpected;
-        this.runners             = new ArrayList<Object>(2);
-    }
-
-    protected PsiFile createCaseBeforeStatement(final Project project, final Editor editor) {
-        final String             text        = this.beforeStatement.replace("\r\n", "\n");
-        final String             jsElement   = text.replace(SPOT_START, EMPTY)
-                                                   .replace(SPOT_END, EMPTY);
-        final ASTNode            elementNode = JSElementFactory.createElementFromText(project, jsElement);
-        final CaseDocumentSetter setter      = new CaseDocumentSetter(editor, jsElement, text.indexOf(SPOT_START));
-
-        CommandProcessor.getInstance().executeCommand(project, new WriteActionRunner(setter), EMPTY, EMPTY);
-        return elementNode.getPsi().getContainingFile();
-    }
-
-    public void addRunner(Object runner) {
-        this.runners.add(runner);
-    }
-
-    public abstract void process(InfoDialog infoDialog);
-
-    protected static boolean compareIgnoreBlanks(String s1, String s2) {
-        int  len1 = s1.length();
-        int  len2 = s2.length();
-        int  i    = 0;
-        int  j    = 0;
-        char prev = 0;
-
-        while (len1 != 0 && len2 != 0) {
-            char c1 = s1.charAt(i++);
-            char c2 = s2.charAt(j++);
-
-            len1--;
-            len2--;
-
-            final boolean isPrevCharIdentifierPart = Character.isJavaIdentifierPart(prev);
-
-            if ((Character.isWhitespace(c1) && !(Character.isJavaIdentifierPart(c2) && isPrevCharIdentifierPart)) ||
-                (Character.isWhitespace(c2) && !(Character.isJavaIdentifierPart(c1) && isPrevCharIdentifierPart))) {
-                while (len1 != 0 && Character.isWhitespace(c1)) {
-                    c1 = s1.charAt(i++);
-                    len1--;
-                }
-                while (len2 != 0 && Character.isWhitespace(c2)) {
-                    c2 = s2.charAt(j++);
-                    len2--;
-                }
-            }
-            if (c1 != c2) {
-                return false;
-            }
-
-            prev = c1;
-        }
-
-        while (len1 != 0) {
-            char c1 = s1.charAt(i++);
-            len1--;
-            if (!Character.isWhitespace(c1)) { break; }
-        }
-        while (len2 != 0) {
-            char c2 = s2.charAt(j++);
-            len2--;
-            if (!Character.isWhitespace(c2)) { break; }
-        }
-
-        return (len1 == len2);
-    }
-
-    protected static class CaseDocumentSetter implements Runnable {
-        private final String jsElement;
-        private final Editor editor;
-        private final int    offset;
-
-        public CaseDocumentSetter(Editor editor, String jsElement, int offset) {
-            this.jsElement = jsElement;
-            this.editor    = editor;
-            this.offset    = offset;
-        }
-
-        @Override
-		public void run() {
-            final Document document = this.editor.getDocument();
-
-            document.deleteString(0, document.getTextLength());
-            document.insertString(0, this.jsElement);
-            if (this.offset >= 0) {
-                this.editor.getCaretModel().moveToOffset(this.offset);
-            }
-        }
-    }
-
-    protected static class WriteActionRunner implements Runnable {
-        private final Runnable runnable;
-
-        public WriteActionRunner(Runnable runnable) {
-            this.runnable = runnable;
-        }
-
-        @Override
-		public void run() {
-            ApplicationManager.getApplication().runWriteAction(this.runnable);
-        }
-    }
-}
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestManager.java b/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestManager.java
deleted file mode 100644
index 5a627a90..00000000
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/test/TestManager.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2005-2006 Olivier Descout
- *
- * 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.
- */
-package org.intellij.idea.lang.javascript.intention.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import consulo.fileTypes.ZipArchiveFileType;
-
-public abstract class TestManager {
-
-    @NonNls protected static final String  TEST_SUBDIRECTORY       = "test";
-    @NonNls protected static final String  BEFORE_FILE_NAME_PREFIX = "before";
-    @NonNls protected static final String  AFTER_FILE_NAME_PREFIX  = "after";
-    @NonNls protected static final String  NONE_FILE_NAME_PREFIX   = "none";
-    @NonNls protected static final String  JS_EXTENSION            = ".js";
-
-    @NonNls
-    protected static final CharsetDecoder DECODER     = Charset.forName(System.getProperty("file.encoding")).newDecoder();
-    protected static final byte[]         BUFFER      = new byte[1024];
-    protected static final ByteBuffer     BYTE_BUFFER = ByteBuffer.allocate(BUFFER.length);
-
-    protected Project project;
-    protected Editor  editor;
-
-    public TestManager(Project project) {
-        final EditorFactory editorFactory = EditorFactory.getInstance();
-        final Document      document      = editorFactory.createDocument("");
-
-        this.project = project;
-        this.editor  = editorFactory.createEditor(document, project);
-    }
-
-    public void release() {
-        EditorFactory.getInstance().releaseEditor(this.editor);
-    }
-
-    public Project getProject() {
-        return this.project;
-    }
-
-    public Editor getEditor() {
-        return this.editor;
-    }
-
-    protected abstract TestCase createTestCase(TestManager manager,
-                                               String      familyName,
-                                               String      caseName,
-                                               String      beforeStatement,
-                                               String      afterStatement,
-                                               boolean     noDetectionExpected);
-
-    protected Map<String, List<TestCase>> getTestCases(String directoryPath) {
-        Map<String, List<TestCase>> caseMap         = new LinkedHashMap<String, List<TestCase>>();
-        final VirtualFile           directory       = ZipArchiveFileType.INSTANCE.getFileSystem().findFileByPath(directoryPath);
-        final VirtualFile[]         caseDirectories = ((directory == null) ? null : directory.getChildren());
-
-        if (caseDirectories != null) {
-            for (final VirtualFile caseDirectory : caseDirectories) {
-                final VirtualFile[] caseFiles = caseDirectory.getChildren();
-
-                for (final VirtualFile file : caseFiles) {
-                    final String caseFamilyName = caseDirectory.getName();
-
-                    if (file.isDirectory() && file.getName().equals(TEST_SUBDIRECTORY)) {
-                        final VirtualFile[] testFiles = file.getChildren();
-
-                        for (final VirtualFile subFile : testFiles) {
-                            this.addTestCase(caseMap, subFile, testFiles, caseFamilyName);
-                        }
-                    } else {
-                        this.addTestCase(caseMap, file, caseFiles, caseFamilyName);
-                    }
-                }
-            }
-        }
-        return caseMap;
-    }
-
-    protected void addTestCase(Map<String, List<TestCase>> caseMap, VirtualFile file,
-                               VirtualFile[] caseFiles, String caseFamilyName) {
-        final String fileName = file.getName();
-
-        if (fileName.startsWith(BEFORE_FILE_NAME_PREFIX)) {
-            final String      fileSuffix = fileName.substring(BEFORE_FILE_NAME_PREFIX.length());
-            final VirtualFile afterFile  = getAfterFile(caseFiles, AFTER_FILE_NAME_PREFIX + fileSuffix);
-
-            this.addCase(caseMap, caseFamilyName, fileSuffix, file, afterFile, false);
-        } else if (fileName.startsWith(NONE_FILE_NAME_PREFIX)) {
-            final String  fileSuffix = fileName.substring(NONE_FILE_NAME_PREFIX.length());
-
-            this.addCase(caseMap, caseFamilyName, fileSuffix, file, null, true);
-        }
-    }
-
-    private void addCase(Map<String, List<TestCase>> caseMap, String caseFamilyName, String fileSuffix,
-                         VirtualFile file, VirtualFile afterFile, boolean detectionExpected) {
-        String caseName = (fileSuffix.startsWith(JS_EXTENSION) ? fileSuffix.substring(JS_EXTENSION.length()) :
-                           fileSuffix.endsWith  (JS_EXTENSION) ? fileSuffix.substring(0, fileSuffix.length() - JS_EXTENSION.length())
-                                                               : fileSuffix);
-
-        if (caseName.charAt(0) == '.') {
-            caseName = caseName.substring(1);
-        }
-        if (caseName.charAt(caseName.length() - 1) == '.') {
-            caseName = caseName.substring(0, caseName.length() - 1);
-        }
-
-        List<TestCase> caseList = caseMap.get(caseFamilyName);
-
-        if (caseList == null) {
-            caseList = new ArrayList<TestCase>(2);
-            caseMap.put(caseFamilyName, caseList);
-        }
-        caseList.add(this.createTestCase(this, caseFamilyName, caseName,
-                                         getFileContents(file), getFileContents(afterFile),
-                                         detectionExpected));
-    }
-
-    protected static VirtualFile getAfterFile(VirtualFile[] fileList, String fileName) {
-        for (final VirtualFile file : fileList) {
-            if (file.getName().equals(fileName)) {
-                return file;
-            }
-        }
-        return null;
-    }
-
-    protected static String getFileContents(VirtualFile file) {
-        if (file != null) {
-            try {
-                final StringBuilder builder     = new StringBuilder((int) file.getLength());
-                final InputStream   inputStream = file.getInputStream();
-
-                while (inputStream.available() > 0) {
-                    final int numReadBytes = inputStream.read(BUFFER);
-
-                    BYTE_BUFFER.clear();
-                    BYTE_BUFFER.put(BUFFER, 0, numReadBytes);
-                    BYTE_BUFFER.flip();
-                    builder.append(DECODER.decode(BYTE_BUFFER));
-                }
-                inputStream.close();
-
-                return builder.toString();
-            } catch (IOException e) {
-                // Default processing: return an empty string
-            }
-        }
-
-        return "";
-    }
-}
diff --git a/resources/META-INF/Intentions.xml b/resources/META-INF/Intentions.xml
index 246895c7..da0328b5 100644
--- a/resources/META-INF/Intentions.xml
+++ b/resources/META-INF/Intentions.xml
@@ -14,7 +14,7 @@
   - limitations under the License.
   -->
 
-<idea-plugin version="2">
+<idea-plugin>
 	<extensions defaultExtensionNs="com.intellij">
 		<!-- Numbers -->
 		<intentionAction>
@@ -206,9 +206,4 @@
 		</intentionAction>
 
 	</extensions>
-	<project-components>
-		<component>
-			<implementation-class>org.intellij.idea.lang.javascript.intention.JSIntentionPowerPack</implementation-class>
-		</component>
-	</project-components>
 </idea-plugin>
\ No newline at end of file
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 02d1e283..dbcda46a 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -19,7 +19,7 @@
 	<name>JavaScript</name>
 	<version>SNAPSHOT</version>
 	<category>Custom Languages</category>
-	<vendor>JetBrains</vendor>
+	<vendor>JetBrains &amp; consulo.io</vendor>
 	<resource-bundle>messages.JavaScriptBundle</resource-bundle>
 	<depends>com.intellij.xml</depends>
 	<depends config-file="regexp.xml" optional="true">com.intellij.regexp</depends>

From ddfc8e0735a8e7301a273bbe8ade1b4d1f910e0b Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Fri, 9 Dec 2016 13:52:08 +0300
Subject: [PATCH 020/340] language version cleanup

---
 .../actionscript/ActionScriptFileType.java    |  2 +-
 .../ClientJavaScriptModuleExtension.java      |  7 +++----
 .../ClientJavaScriptModuleExtensionPanel.java |  3 +--
 ...lientJavaScriptMutableModuleExtension.java |  3 +--
 .../javascript/lang/EcmaScriptFileType.java   |  2 +-
 .../json/lang/JsonJavaScriptVersion.java      | 21 +++++++++++--------
 .../lang/javascript/JavaScriptFileType.java   |  2 +-
 .../lang/BaseJavaScriptLanguageVersion.java   | 10 ++++-----
 .../lang/JavaScriptFileTypeWithVersion.java   |  2 +-
 .../JavaScriptLanguageVersionResolver.java    |  9 +++++---
 .../lang/StandardJavaScriptVersions.java      | 14 +++----------
 .../extension/JavaScriptModuleExtension.java  |  3 +--
 .../JavaScriptMutableModuleExtension.java     |  3 +--
 13 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/actionscript-impl/src/consulo/actionscript/ActionScriptFileType.java b/actionscript-impl/src/consulo/actionscript/ActionScriptFileType.java
index 84d91d05..6a861f59 100644
--- a/actionscript-impl/src/consulo/actionscript/ActionScriptFileType.java
+++ b/actionscript-impl/src/consulo/actionscript/ActionScriptFileType.java
@@ -72,7 +72,7 @@ public Icon getIcon()
 
 	@NotNull
 	@Override
-	public LanguageVersion<JavaScriptLanguage> getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
+	public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
 		return ActionScriptLanguageVersion.getInstance();
 	}
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index a420cd7b..05aff40d 100644
--- a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -10,7 +10,6 @@
 import com.intellij.openapi.projectRoots.SdkType;
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.client.module.sdk.ClientJavaScriptSdkType;
-import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.lang.LanguageVersion;
@@ -29,7 +28,7 @@ public class ClientJavaScriptModuleExtension extends ModuleExtensionImpl<ClientJ
 {
 	private ModuleInheritableNamedPointerImpl<Sdk> myPointer;
 
-	protected LanguageVersion<JavaScriptLanguage> myLanguageVersion = StandardJavaScriptVersions.getDefaultVersion();
+	protected LanguageVersion myLanguageVersion = StandardJavaScriptVersions.getDefaultVersion();
 
 	public ClientJavaScriptModuleExtension(@NotNull String id, @NotNull ModuleRootLayer rootLayer)
 	{
@@ -86,7 +85,7 @@ protected void getStateImpl(@NotNull Element element)
 		super.getStateImpl(element);
 		if(myLanguageVersion != StandardJavaScriptVersions.getDefaultVersion())
 		{
-			element.setAttribute("language-version", myLanguageVersion.getName());
+			element.setAttribute("language-version", myLanguageVersion.getId());
 		}
 	}
 
@@ -120,7 +119,7 @@ public Class<? extends SdkType> getSdkTypeClass()
 
 	@NotNull
 	@Override
-	public LanguageVersion<JavaScriptLanguage> getLanguageVersion()
+	public LanguageVersion getLanguageVersion()
 	{
 		return myLanguageVersion;
 	}
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index aec23da5..3dd5b213 100644
--- a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -29,7 +29,6 @@
 import com.intellij.ui.CollectionComboBoxModel;
 import com.intellij.ui.ColoredListCellRenderer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.lang.LanguageVersion;
@@ -55,7 +54,7 @@ public void itemStateChanged(ItemEvent e)
 				if(e.getStateChange() == ItemEvent.SELECTED)
 				{
 					//noinspection unchecked
-					extension.setLanguageVersion((LanguageVersion <JavaScriptLanguage>) e.getItem());
+					extension.setLanguageVersion((LanguageVersion) e.getItem());
 				}
 			}
 		});
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index e33521b4..853b103e 100644
--- a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -6,7 +6,6 @@
 import org.jetbrains.annotations.Nullable;
 import com.intellij.openapi.projectRoots.Sdk;
 import consulo.annotations.RequiredDispatchThread;
-import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.MutableModuleInheritableNamedPointer;
@@ -51,7 +50,7 @@ public boolean isModified(@NotNull ClientJavaScriptModuleExtension originalExten
 	}
 
 	@Override
-	public void setLanguageVersion(@NotNull LanguageVersion<JavaScriptLanguage> languageVersion)
+	public void setLanguageVersion(@NotNull LanguageVersion languageVersion)
 	{
 		myLanguageVersion = languageVersion;
 	}
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileType.java b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileType.java
index 2dc89d01..746af855 100644
--- a/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileType.java
@@ -69,7 +69,7 @@ public Icon getIcon()
 
 	@NotNull
 	@Override
-	public LanguageVersion<JavaScriptLanguage> getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
+	public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
 		return EcmaScript6JavaScriptVersion.getInstance();
 	}
diff --git a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
index e9449f91..f5fdb33f 100644
--- a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
@@ -1,13 +1,16 @@
 package consulo.json.lang;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.PsiParser;
 import com.intellij.lexer.Lexer;
+import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.json.JsonFileType;
 import consulo.json.lang.lexer.JsonLexer;
 import consulo.lombok.annotations.Lazy;
 
@@ -17,14 +20,7 @@
  */
 public class JsonJavaScriptVersion extends BaseJavaScriptLanguageVersion
 {
-	private static final Factory<Lexer> ourLexerFactory = new Factory<Lexer>()
-	{
-		@Override
-		public Lexer create()
-		{
-			return new JsonLexer();
-		}
-	};
+	private static final Factory<Lexer> ourLexerFactory = JsonLexer::new;
 
 	@NotNull
 	@Lazy
@@ -35,7 +31,14 @@ public static JsonJavaScriptVersion getInstance()
 
 	public JsonJavaScriptVersion()
 	{
-		super("JSON");
+		super("JSON", "application/json");
+	}
+
+	@Nullable
+	@Override
+	public FileType getAssociatedFileType()
+	{
+		return JsonFileType.INSTANCE;
 	}
 
 	@NotNull
diff --git a/src/com/intellij/lang/javascript/JavaScriptFileType.java b/src/com/intellij/lang/javascript/JavaScriptFileType.java
index 1c34d467..71a6662e 100644
--- a/src/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/src/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -74,7 +74,7 @@ public Icon getIcon()
 
 	@NotNull
 	@Override
-	public LanguageVersion<JavaScriptLanguage> getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
+	public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
 		if(virtualFile == null || project == null)
 		{
diff --git a/src/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/src/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index 39725354..ac764d39 100644
--- a/src/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/src/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -9,22 +9,22 @@
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.util.containers.ArrayListSet;
 import consulo.javascript.lang.parsing.JavaScriptParser;
-import consulo.lang.BaseLanguageVersion;
+import consulo.lang.LanguageVersion;
 import consulo.lang.LanguageVersionWithParsing;
 
 /**
  * @author VISTALL
  * @since 24.08.14
  */
-public abstract class BaseJavaScriptLanguageVersion extends BaseLanguageVersion<JavaScriptLanguage> implements LanguageVersionWithParsing<JavaScriptLanguage>
+public abstract class BaseJavaScriptLanguageVersion extends LanguageVersion implements LanguageVersionWithParsing
 {
 	private static TokenSet ourLiterals = TokenSet.orSet(JavaScriptTokenSets.STRING_LITERALS, TokenSet.create(JSTokenTypes.NUMERIC_LITERAL));
 
-	private Set<JavaScriptFeature> myFeatures = new ArrayListSet<JavaScriptFeature>();
+	private Set<JavaScriptFeature> myFeatures = new ArrayListSet<>();
 
-	public BaseJavaScriptLanguageVersion(String name)
+	public BaseJavaScriptLanguageVersion(String name, String... mimeTypes)
 	{
-		super(name, JavaScriptLanguage.INSTANCE);
+		super(name, name, JavaScriptLanguage.INSTANCE, mimeTypes);
 	}
 
 	protected void addFeature(@NotNull JavaScriptFeature feature)
diff --git a/src/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java b/src/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
index e29d1139..07e93bf3 100644
--- a/src/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
+++ b/src/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
@@ -29,5 +29,5 @@
 public interface JavaScriptFileTypeWithVersion
 {
 	@NotNull
-	LanguageVersion<JavaScriptLanguage> getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile);
+	LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile);
 }
diff --git a/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index 4f84e054..3c4c57a7 100644
--- a/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -24,6 +24,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import consulo.annotations.RequiredReadAction;
 import consulo.lang.LanguageVersion;
 import consulo.lang.LanguageVersionResolver;
 
@@ -31,11 +32,12 @@
  * @author VISTALL
  * @since 11.12.2015
  */
-public class JavaScriptLanguageVersionResolver implements LanguageVersionResolver<JavaScriptLanguage>
+public class JavaScriptLanguageVersionResolver implements LanguageVersionResolver
 {
+	@RequiredReadAction
 	@NotNull
 	@Override
-	public LanguageVersion<JavaScriptLanguage> getLanguageVersion(@NotNull Language language, @Nullable PsiElement element)
+	public LanguageVersion getLanguageVersion(@NotNull Language language, @Nullable PsiElement element)
 	{
 		PsiFile containingFile = element == null ? null : element.getContainingFile();
 		if(containingFile == null)
@@ -51,8 +53,9 @@ public LanguageVersion<JavaScriptLanguage> getLanguageVersion(@NotNull Language
 		return StandardJavaScriptVersions.getDefaultVersion();
 	}
 
+	@RequiredReadAction
 	@Override
-	public LanguageVersion<JavaScriptLanguage> getLanguageVersion(@NotNull Language language, @Nullable Project project, @Nullable VirtualFile virtualFile)
+	public LanguageVersion getLanguageVersion(@NotNull Language language, @Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
 		if(project == null || virtualFile == null)
 		{
diff --git a/src/consulo/javascript/lang/StandardJavaScriptVersions.java b/src/consulo/javascript/lang/StandardJavaScriptVersions.java
index 8d3dd2c7..e5d48233 100644
--- a/src/consulo/javascript/lang/StandardJavaScriptVersions.java
+++ b/src/consulo/javascript/lang/StandardJavaScriptVersions.java
@@ -17,14 +17,13 @@
 package consulo.javascript.lang;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.lang.LanguageVersion;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.ContainerUtil;
+import consulo.lang.LanguageVersion;
 
 /**
  * @author VISTALL
@@ -56,14 +55,7 @@ public static List<BaseJavaScriptLanguageVersion> getValidLanguageVersions()
 			}
 		}
 
-		ContainerUtil.sort(list, new Comparator<BaseJavaScriptLanguageVersion>()
-		{
-			@Override
-			public int compare(BaseJavaScriptLanguageVersion o1, BaseJavaScriptLanguageVersion o2)
-			{
-				return ((StandardJavaScriptVersions.Marker) o1).getWeight() - ((StandardJavaScriptVersions.Marker) o2).getWeight();
-			}
-		});
+		ContainerUtil.sort(list, (o1, o2) -> ((Marker) o1).getWeight() - ((Marker) o2).getWeight());
 		return list;
 	}
 
@@ -78,7 +70,7 @@ public static BaseJavaScriptLanguageVersion findVersionById(@Nullable String id)
 		LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
 		for(LanguageVersion version : versions)
 		{
-			if(version instanceof StandardJavaScriptVersions.Marker && id.equals(version.getName()))
+			if(version instanceof StandardJavaScriptVersions.Marker && id.equals(version.getId()))
 			{
 				return (BaseJavaScriptLanguageVersion) version;
 			}
diff --git a/src/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/src/consulo/javascript/module/extension/JavaScriptModuleExtension.java
index 3437218f..60ae8e76 100644
--- a/src/consulo/javascript/module/extension/JavaScriptModuleExtension.java
+++ b/src/consulo/javascript/module/extension/JavaScriptModuleExtension.java
@@ -1,7 +1,6 @@
 package consulo.javascript.module.extension;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.ModuleExtensionWithSdk;
 
@@ -12,5 +11,5 @@
 public interface JavaScriptModuleExtension<T extends JavaScriptModuleExtension<T>> extends ModuleExtensionWithSdk<T>
 {
 	@NotNull
-	LanguageVersion<JavaScriptLanguage> getLanguageVersion();
+	LanguageVersion getLanguageVersion();
 }
diff --git a/src/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/src/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
index 870ee023..261caef9 100644
--- a/src/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
+++ b/src/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
@@ -17,7 +17,6 @@
 package consulo.javascript.module.extension;
 
 import org.jetbrains.annotations.NotNull;
-import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.MutableModuleExtensionWithSdk;
 
@@ -27,5 +26,5 @@
  */
 public interface JavaScriptMutableModuleExtension<T extends JavaScriptModuleExtension<T>> extends JavaScriptModuleExtension<T>, MutableModuleExtensionWithSdk<T>
 {
-	void setLanguageVersion(@NotNull LanguageVersion<JavaScriptLanguage> languageVersion);
+	void setLanguageVersion(@NotNull LanguageVersion languageVersion);
 }

From 2d4d45a59f3abeccabd45775a7a8cd8a667628b3 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 23 Jan 2017 02:40:48 +0300
Subject: [PATCH 021/340] compilation fixed

---
 .consulo/modules.xml                          |  6 -----
 .../lang/ActionScriptLanguageVersion.java     |  2 --
 .../module/sdk/ClientJavaScriptSdkType.java   |  2 --
 .../JavaScriptLineBreakpointType.java         |  2 --
 .../parsing/EcmaScript4StatementParsing.java  |  7 +++---
 .../lang/EcmaScript6JavaScriptVersion.java    |  2 --
 .../parsing/EcmaScript6StatementParsing.java  |  5 ++--
 .../lang/JavaScript16LanguageVersion.java     |  2 --
 .../lang/JavaScript17LanguageVersion.java     |  2 --
 .../lang/JavaScript185LanguageVersion.java    |  2 --
 .../lang/JavaScript18LanguageVersion.java     |  2 --
 .../src/consulo/json/jom/JomManager.java      |  9 ++++++--
 .../json/lang/JsonJavaScriptParser.java       |  7 +++---
 .../json/lang/JsonJavaScriptVersion.java      |  2 --
 ...DescriptionByAnotherPsiElementService.java |  8 +++++--
 .../lang/javascript/JavaScriptBundle.java     | 23 ++++++++++++++++---
 .../lang/javascript/psi/JSAttribute.java      | 16 +++++++++++--
 .../lang/javascript/psi/JSExpression.java     | 15 ++++++++++--
 .../lang/javascript/psi/JSFunction.java       | 15 ++++++++++--
 .../lang/javascript/psi/JSParameter.java      | 18 ++++++++++++---
 .../lang/JavaScript15LanguageVersion.java     |  2 --
 .../lang/parsing/ExpressionParsing.java       |  4 +++-
 .../lang/parsing/StatementParsing.java        |  4 +++-
 23 files changed, 105 insertions(+), 52 deletions(-)

diff --git a/.consulo/modules.xml b/.consulo/modules.xml
index 52e3801e..04dab99f 100644
--- a/.consulo/modules.xml
+++ b/.consulo/modules.xml
@@ -6,7 +6,6 @@
         <module-layer name="Default">
           <extension id="consulo-plugin" sdk-name="Consulo SNAPSHOT" />
           <extension id="java" sdk-name="1.8" language-level-name="JDK_1_8" />
-          <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
@@ -67,7 +66,6 @@
         <module-layer name="Default">
           <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
           <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -82,7 +80,6 @@
         <module-layer name="Default">
           <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
           <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -96,7 +93,6 @@
         <module-layer name="Default">
           <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
           <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -177,7 +173,6 @@
         <module-layer name="Default">
           <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
           <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
@@ -191,7 +186,6 @@
         <module-layer name="Default">
           <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
           <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <extension id="lombok" />
           <content url="file://$MODULE_DIR$">
             <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
           </content>
diff --git a/actionscript-impl/src/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/actionscript-impl/src/consulo/actionscript/lang/ActionScriptLanguageVersion.java
index f92ddc99..35445a90 100644
--- a/actionscript-impl/src/consulo/actionscript/lang/ActionScriptLanguageVersion.java
+++ b/actionscript-impl/src/consulo/actionscript/lang/ActionScriptLanguageVersion.java
@@ -9,7 +9,6 @@
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.parsing.EcmaScript4Parser;
-import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -18,7 +17,6 @@
 public class ActionScriptLanguageVersion extends BaseJavaScriptLanguageVersion
 {
 	@NotNull
-	@Lazy
 	public static ActionScriptLanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(ActionScriptLanguageVersion.class);
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index ebaeb246..2922e101 100644
--- a/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -7,7 +7,6 @@
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.projectRoots.SdkType;
 import com.intellij.openapi.roots.OrderRootType;
-import consulo.lombok.annotations.Lazy;
 import consulo.roots.types.BinariesOrderRootType;
 import consulo.roots.types.SourcesOrderRootType;
 
@@ -18,7 +17,6 @@
 public class ClientJavaScriptSdkType extends SdkType
 {
 	@NotNull
-	@Lazy
 	public static ClientJavaScriptSdkType getInstance()
 	{
 		return EP_NAME.findExtension(ClientJavaScriptSdkType.class);
diff --git a/debugger-impl/src/consulo/javascript/debugger/JavaScriptLineBreakpointType.java b/debugger-impl/src/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
index 75e42211..6cda5896 100644
--- a/debugger-impl/src/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
+++ b/debugger-impl/src/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
@@ -16,7 +16,6 @@
 
 package consulo.javascript.debugger;
 
-import consulo.lombok.annotations.Lazy;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import com.intellij.javascript.JSDebuggerSupportUtils;
@@ -36,7 +35,6 @@
 public class JavaScriptLineBreakpointType extends XLineBreakpointTypeBase
 {
 	@NotNull
-	@Lazy
 	public static JavaScriptLineBreakpointType getInstance()
 	{
 		return EXTENSION_POINT_NAME.findExtension(JavaScriptLineBreakpointType.class);
diff --git a/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
index 1570eb44..5b234861 100644
--- a/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
+++ b/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
@@ -1,20 +1,21 @@
 package consulo.javascript.lang.parsing;
 
-import consulo.lombok.annotations.Logger;
 import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.JavaScriptBundle;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.tree.IElementType;
 
 /**
  * @author VISTALL
  * @since 24.08.14
  */
-@Logger
 public class EcmaScript4StatementParsing extends StatementParsing
 {
+	public static final Logger LOGGER = Logger.getInstance(EcmaScript4StatementParsing.class);
+
 	public EcmaScript4StatementParsing(EcmaScript4ParsingContext context)
 	{
 		super(context);
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 0dace490..917a407c 100644
--- a/ecmascript6-impl/src/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -24,7 +24,6 @@
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.EcmaScript6Lexer;
 import consulo.javascript.lang.parsing.EcmaScript6Parser;
-import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -42,7 +41,6 @@ public Lexer create()
 	};
 
 	@NotNull
-	@Lazy
 	public static EcmaScript6JavaScriptVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript6JavaScriptVersion.class);
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index 8689e5eb..20661142 100644
--- a/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -21,17 +21,18 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
-import consulo.lombok.annotations.Logger;
 
 /**
  * @author VISTALL
  * @since 15.02.2016
  */
-@Logger
 public class EcmaScript6StatementParsing extends StatementParsing
 {
+	public static final Logger LOGGER = Logger.getInstance(EcmaScript6StatementParsing.class);
+
 	public EcmaScript6StatementParsing(EcmaScript6ParsingContext context)
 	{
 		super(context);
diff --git a/javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java b/javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java
index 31ed4b0f..e2fb58fc 100644
--- a/javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java
+++ b/javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java
@@ -22,7 +22,6 @@
 import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScript16Lexer;
-import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -40,7 +39,6 @@ public Lexer create()
 	};
 
 	@NotNull
-	@Lazy
 	public static JavaScript16LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript16LanguageVersion.class);
diff --git a/javascript17-impl/src/consulo/javascript/lang/JavaScript17LanguageVersion.java b/javascript17-impl/src/consulo/javascript/lang/JavaScript17LanguageVersion.java
index 90e2a088..b2b1098c 100644
--- a/javascript17-impl/src/consulo/javascript/lang/JavaScript17LanguageVersion.java
+++ b/javascript17-impl/src/consulo/javascript/lang/JavaScript17LanguageVersion.java
@@ -22,7 +22,6 @@
 import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScript17Lexer;
-import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -40,7 +39,6 @@ public Lexer create()
 	};
 
 	@NotNull
-	@Lazy
 	public static JavaScript17LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript17LanguageVersion.class);
diff --git a/javascript18-impl/src/consulo/javascript/lang/JavaScript185LanguageVersion.java b/javascript18-impl/src/consulo/javascript/lang/JavaScript185LanguageVersion.java
index 503165a0..8648bcfe 100644
--- a/javascript18-impl/src/consulo/javascript/lang/JavaScript185LanguageVersion.java
+++ b/javascript18-impl/src/consulo/javascript/lang/JavaScript185LanguageVersion.java
@@ -22,7 +22,6 @@
 import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScript17Lexer;
-import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -40,7 +39,6 @@ public Lexer create()
 	};
 
 	@NotNull
-	@Lazy
 	public static JavaScript185LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript185LanguageVersion.class);
diff --git a/javascript18-impl/src/consulo/javascript/lang/JavaScript18LanguageVersion.java b/javascript18-impl/src/consulo/javascript/lang/JavaScript18LanguageVersion.java
index 7bc67003..84cabaa7 100644
--- a/javascript18-impl/src/consulo/javascript/lang/JavaScript18LanguageVersion.java
+++ b/javascript18-impl/src/consulo/javascript/lang/JavaScript18LanguageVersion.java
@@ -22,7 +22,6 @@
 import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScript17Lexer;
-import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -40,7 +39,6 @@ public Lexer create()
 	};
 
 	@NotNull
-	@Lazy
 	public static JavaScript18LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript18LanguageVersion.class);
diff --git a/json-javascript-impl/src/consulo/json/jom/JomManager.java b/json-javascript-impl/src/consulo/json/jom/JomManager.java
index 9686ec35..76299c2a 100644
--- a/json-javascript-impl/src/consulo/json/jom/JomManager.java
+++ b/json-javascript-impl/src/consulo/json/jom/JomManager.java
@@ -19,6 +19,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.psi.JSFile;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
@@ -29,15 +30,19 @@
 import com.intellij.psi.util.PsiModificationTracker;
 import consulo.annotations.RequiredReadAction;
 import consulo.json.JsonFileType;
-import consulo.lombok.annotations.ProjectService;
 
 /**
  * @author VISTALL
  * @since 10.11.2015
  */
-@ProjectService
 public class JomManager
 {
+	@NotNull
+	public static JomManager getInstance(@NotNull Project project)
+	{
+		return ServiceManager.getService(project, JomManager.class);
+	}
+
 	private static final Key<CachedValue<JomFileElement<?>>> JOM_FILE_ELEMENT = Key.create("jom.file.lement");
 
 	private final Project myProject;
diff --git a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
index 3b2e2965..84f4a4ac 100644
--- a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
+++ b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
@@ -7,20 +7,21 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.tree.IElementType;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.parsing.ExpressionParsing;
 import consulo.javascript.lang.parsing.Parsing;
 import consulo.lang.LanguageVersion;
-import consulo.lombok.annotations.Logger;
 
 /**
  * @author VISTALL
  * @since 05.03.2015
  */
-@Logger
 public class JsonJavaScriptParser implements PsiParser
 {
+	public static final Logger LOGGER = Logger.getInstance(JsonJavaScriptParser.class);
+
 	private int myPropertyDepth;
 
 	@NotNull
@@ -124,7 +125,7 @@ else if(tokenType == JSTokenTypes.RBRACKET)
 
 	public void parseObjectLiteralExpression(final PsiBuilder builder)
 	{
-		JsonJavaScriptParser.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
+		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 
diff --git a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
index f5fdb33f..a72eb5b3 100644
--- a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
@@ -12,7 +12,6 @@
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.json.JsonFileType;
 import consulo.json.lang.lexer.JsonLexer;
-import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -23,7 +22,6 @@ public class JsonJavaScriptVersion extends BaseJavaScriptLanguageVersion
 	private static final Factory<Lexer> ourLexerFactory = JsonLexer::new;
 
 	@NotNull
-	@Lazy
 	public static JsonJavaScriptVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JsonJavaScriptVersion.class);
diff --git a/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index 6f752863..7f1e5441 100644
--- a/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -26,6 +26,7 @@
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.components.StoragePathMacros;
@@ -41,13 +42,11 @@
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
 import com.intellij.util.containers.ContainerUtil;
-import consulo.lombok.annotations.ProjectService;
 
 /**
  * @author VISTALL
  * @since 12.11.2015
  */
-@ProjectService
 @State(
 		name = "JSONDescriptionByAnotherPsiElementService",
 		storages = {
@@ -191,6 +190,11 @@ public void dispose()
 		}
 	}
 
+	@NotNull
+	public static DescriptionByAnotherPsiElementService getInstance(@NotNull Project project)
+	{
+		return ServiceManager.getService(project, DescriptionByAnotherPsiElementService.class);
+	}
 
 	private final Project myProject;
 	private final List<Info> myRegisteredFiles = new ArrayList<Info>();
diff --git a/src/com/intellij/lang/javascript/JavaScriptBundle.java b/src/com/intellij/lang/javascript/JavaScriptBundle.java
index a6ce43e0..99a1b6e6 100644
--- a/src/com/intellij/lang/javascript/JavaScriptBundle.java
+++ b/src/com/intellij/lang/javascript/JavaScriptBundle.java
@@ -16,12 +16,29 @@
 
 package com.intellij.lang.javascript;
 
-import consulo.lombok.annotations.Bundle;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.PropertyKey;
+import com.intellij.AbstractBundle;
 
-@Bundle
-public class JavaScriptBundle
+public class JavaScriptBundle extends AbstractBundle
 {
 	@NonNls
 	public static final String BUNDLE = "messages.JavaScriptBundle";
+
+	private static final JavaScriptBundle ourInstance = new JavaScriptBundle();
+
+	private JavaScriptBundle()
+	{
+		super(BUNDLE);
+	}
+
+	public static String message(@PropertyKey(resourceBundle = BUNDLE) String key)
+	{
+		return ourInstance.getMessage(key);
+	}
+
+	public static String message(@PropertyKey(resourceBundle = BUNDLE) String key, Object... params)
+	{
+		return ourInstance.getMessage(key, params);
+	}
 }
diff --git a/src/com/intellij/lang/javascript/psi/JSAttribute.java b/src/com/intellij/lang/javascript/psi/JSAttribute.java
index 08cccb3a..adef40b4 100644
--- a/src/com/intellij/lang/javascript/psi/JSAttribute.java
+++ b/src/com/intellij/lang/javascript/psi/JSAttribute.java
@@ -16,17 +16,29 @@
 
 package com.intellij.lang.javascript.psi;
 
-import consulo.lombok.annotations.ArrayFactoryFields;
+import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.StubBasedPsiElement;
+import com.intellij.util.ArrayFactory;
 
 /**
  * @author  Maxim.Mossienko
  */
-@ArrayFactoryFields
 public interface JSAttribute extends JSElement, PsiNamedElement, StubBasedPsiElement<JSAttributeStub>
 {
+	public static final JSAttribute[] EMPTY_ARRAY = new JSAttribute[0];
+
+	public static ArrayFactory<JSAttribute> ARRAY_FACTORY = new ArrayFactory<JSAttribute>()
+	{
+		@NotNull
+		@Override
+		public JSAttribute[] create(int count)
+		{
+			return count == 0 ? EMPTY_ARRAY : new JSAttribute[count];
+		}
+	};
+
 	@Override
 	String getName();
 
diff --git a/src/com/intellij/lang/javascript/psi/JSExpression.java b/src/com/intellij/lang/javascript/psi/JSExpression.java
index f570a7d2..416ea46f 100644
--- a/src/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/src/com/intellij/lang/javascript/psi/JSExpression.java
@@ -17,17 +17,28 @@
 package com.intellij.lang.javascript.psi;
 
 import org.jetbrains.annotations.NotNull;
+import com.intellij.util.ArrayFactory;
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
-import consulo.lombok.annotations.ArrayFactoryFields;
 
 /**
  * @author max
  * @since  6:46:19 PM Jan 30, 2005
  */
-@ArrayFactoryFields
 public interface JSExpression extends JSElement
 {
+	public static final JSExpression[] EMPTY_ARRAY = new JSExpression[0];
+
+	public static ArrayFactory<JSExpression> ARRAY_FACTORY = new ArrayFactory<JSExpression>()
+	{
+		@NotNull
+		@Override
+		public JSExpression[] create(int count)
+		{
+			return count == 0 ? EMPTY_ARRAY : new JSExpression[count];
+		}
+	};
+
 	@NotNull
 	JSExpression replace(JSExpression other);
 
diff --git a/src/com/intellij/lang/javascript/psi/JSFunction.java b/src/com/intellij/lang/javascript/psi/JSFunction.java
index 2c985d06..4dde6618 100644
--- a/src/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/src/com/intellij/lang/javascript/psi/JSFunction.java
@@ -20,17 +20,28 @@
 import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.psi.StubBasedPsiElement;
+import com.intellij.util.ArrayFactory;
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
-import consulo.lombok.annotations.ArrayFactoryFields;
 
 /**
  * @author max
  */
-@ArrayFactoryFields
 public interface JSFunction extends JSQualifiedNamedElement, JSSourceElement, JSAttributeListOwner, StubBasedPsiElement<JSFunctionStub>
 {
+	public static final JSFunction[] EMPTY_ARRAY = new JSFunction[0];
+
+	public static ArrayFactory<JSFunction> ARRAY_FACTORY = new ArrayFactory<JSFunction>()
+	{
+		@NotNull
+		@Override
+		public JSFunction[] create(int count)
+		{
+			return count == 0 ? EMPTY_ARRAY : new JSFunction[count];
+		}
+	};
+
 	@Nullable
 	@RequiredReadAction
 	JSParameterList getParameterList();
diff --git a/src/com/intellij/lang/javascript/psi/JSParameter.java b/src/com/intellij/lang/javascript/psi/JSParameter.java
index eedc2770..d80af5d0 100644
--- a/src/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/src/com/intellij/lang/javascript/psi/JSParameter.java
@@ -16,19 +16,31 @@
 
 package com.intellij.lang.javascript.psi;
 
-import consulo.lombok.annotations.ArrayFactoryFields;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
+import com.intellij.util.ArrayFactory;
+import consulo.annotations.RequiredReadAction;
 
 /**
  * User: max
  * Date: Jan 30, 2005
  * Time: 6:43:02 PM
  */
-@ArrayFactoryFields
 public interface JSParameter extends JSVariable
 {
+	public static final JSParameter[] EMPTY_ARRAY = new JSParameter[0];
+
+	public static ArrayFactory<JSParameter> ARRAY_FACTORY = new ArrayFactory<JSParameter>()
+	{
+		@NotNull
+		@Override
+		public JSParameter[] create(int count)
+		{
+			return count == 0 ? EMPTY_ARRAY : new JSParameter[count];
+		}
+	};
+
 	JSFunction getDeclaringFunction();
 
 	@RequiredReadAction
diff --git a/src/consulo/javascript/lang/JavaScript15LanguageVersion.java b/src/consulo/javascript/lang/JavaScript15LanguageVersion.java
index 3a923197..f99e12e0 100644
--- a/src/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/src/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -6,7 +6,6 @@
 import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScript15Lexer;
-import consulo.lombok.annotations.Lazy;
 
 /**
  * @author VISTALL
@@ -24,7 +23,6 @@ public Lexer create()
 	};
 
 	@NotNull
-	@Lazy
 	public static JavaScript15LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript15LanguageVersion.class);
diff --git a/src/consulo/javascript/lang/parsing/ExpressionParsing.java b/src/consulo/javascript/lang/parsing/ExpressionParsing.java
index 4b684351..d5768841 100644
--- a/src/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/src/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.tree.IElementType;
 import consulo.javascript.lang.JavaScriptTokenSets;
@@ -32,9 +33,10 @@
  * Date: Jan 28, 2005
  * Time: 1:18:22 PM
  */
-@consulo.lombok.annotations.Logger
 public class ExpressionParsing extends Parsing
 {
+	public static final Logger LOGGER = Logger.getInstance(ExpressionParsing.class);
+
 	public static final Key<Boolean> WITHIN_ARRAY_LITERAL_EXPRESSION = Key.create("within.array.literal.expression");
 	public static final Key<Boolean> WITHIN_OBJECT_LITERAL_EXPRESSION = Key.create("within.object.literal.expression");
 
diff --git a/src/consulo/javascript/lang/parsing/StatementParsing.java b/src/consulo/javascript/lang/parsing/StatementParsing.java
index d447c100..ab040a9f 100644
--- a/src/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/src/consulo/javascript/lang/parsing/StatementParsing.java
@@ -21,14 +21,16 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.tree.IElementType;
 
 /**
  * @author max
  */
-@consulo.lombok.annotations.Logger
 public class StatementParsing extends Parsing
 {
+	public static final Logger LOGGER = Logger.getInstance(StatementParsing.class);
+
 	public StatementParsing(JavaScriptParsingContext context)
 	{
 		super(context);

From 6f7bc251100a217d8d9fa2a43148d8e0c4c9c70b Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 13 May 2017 13:04:53 +0300
Subject: [PATCH 022/340] fixed
 https://hub.consulo.io/errorReport#7795d357-0ce6-421c-8f76-1f16311651be

---
 .../lang/javascript/search/JSClassSearch.java   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/com/intellij/lang/javascript/search/JSClassSearch.java b/src/com/intellij/lang/javascript/search/JSClassSearch.java
index 10cbb655..b9c69c1e 100644
--- a/src/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/src/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -30,6 +30,7 @@
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.psi.stubs.StubIndexKey;
+import com.intellij.util.CommonProcessors;
 import com.intellij.util.Processor;
 import com.intellij.util.Query;
 import com.intellij.util.QueryExecutor;
@@ -232,17 +233,17 @@ public boolean process(JSClass candidate)
 			}
 		};
 
-		if(!StubIndex.getInstance().processElements(getIndexKey(), name, project, scope, JSReferenceList.class, new Processor<JSReferenceList>()
+		CommonProcessors.CollectProcessor<JSReferenceList> collectProcessor = new CommonProcessors.CollectProcessor<>();
+
+		StubIndex.getInstance().processElements(getIndexKey(), name, project, scope, JSReferenceList.class, collectProcessor);
+
+		for(JSReferenceList referenceList : collectProcessor.getResults())
 		{
-			@Override
-			public boolean process(JSReferenceList referenceList)
+			JSClass parent = (JSClass) referenceList.getParent();
+			if(!processor.process(parent))
 			{
-				JSClass parent = (JSClass) referenceList.getParent();
-				return processor.process(parent);
+				return false;
 			}
-		}))
-		{
-			return false;
 		}
 
 		for(JSClassInheritorsProvider provider : Extensions.getExtensions(JSClassInheritorsProvider.EP_NAME))

From 15b675601343fe438a6ef7ae7ca5e174e15aa6be Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 23 Jul 2017 20:10:43 +0300
Subject: [PATCH 023/340] fixed access error

---
 .../lang/javascript/search/JSReferencesSearchExecutor.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java b/src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
index b5e4e795..9ed4e92a 100644
--- a/src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
+++ b/src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.search;
 
 import com.intellij.lang.javascript.JavaScriptFileType;
+import com.intellij.openapi.application.ReadAction;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNamedElement;
@@ -46,7 +47,7 @@ public boolean execute(final ReferencesSearch.SearchParameters queryParameters,
 				queryParameters.getScope() instanceof GlobalSearchScope &&
 				!(sourceElement.getUseScope() instanceof LocalSearchScope))
 		{
-			final String s = ((PsiNamedElement) sourceElement).getName();
+			final String s = ReadAction.compute(() -> ((PsiNamedElement) sourceElement).getName());
 			if(s == null)
 			{
 				return true;

From af517a81c78f01e3947874534fa109a7a62125d2 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 17 Oct 2017 17:39:50 +0300
Subject: [PATCH 024/340] compilation

---
 .consulo/runConfigurations/Unnamed.xml                    | 1 -
 .../findUsages/JavaScriptGroupRuleProviderBase.java       | 8 +++++---
 .../ide/actions/JavaScriptCreateFileAction.java           | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.consulo/runConfigurations/Unnamed.xml b/.consulo/runConfigurations/Unnamed.xml
index d45a1195..a2857f39 100644
--- a/.consulo/runConfigurations/Unnamed.xml
+++ b/.consulo/runConfigurations/Unnamed.xml
@@ -4,7 +4,6 @@
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="USE_ALT_CONSULO_SDK" value="false" />
     <option name="ALT_CONSULO_SDK_PATH" />
-    <option name="INTERNAL_MODE" value="true" />
     <java-sdk name="1.8" />
     <consulo-sdk name="Consulo SNAPSHOT" />
     <artifact name="plugin" />
diff --git a/src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java b/src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
index 7c1c36cb..43b82c6b 100644
--- a/src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -22,11 +22,12 @@
 import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.actionSystem.DataSink;
 import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.TypeSafeDataProvider;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vcs.FileStatus;
 import com.intellij.openapi.vcs.FileStatusManager;
 import com.intellij.psi.PsiElement;
@@ -90,7 +91,7 @@ protected boolean isAcceptableElement(JSNamedElement element)
 	/**
 	 * @author Maxim.Mossienko
 	 */
-	abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement & NavigationItem> implements UsageGroup
+	abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement & NavigationItem> implements UsageGroup, TypeSafeDataProvider
 	{
 		private SmartPsiElementPointer myElementPointer;
 		private String myName;
@@ -192,7 +193,8 @@ public int hashCode()
 			return myName.hashCode();
 		}
 
-		public void calcData(final DataKey key, final DataSink sink)
+		@Override
+		public void calcData(final Key<?> key, final DataSink sink)
 		{
 			if(!isValid())
 			{
diff --git a/src/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/src/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index 13ec11d9..a4f5985a 100644
--- a/src/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/src/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -48,9 +48,9 @@ protected boolean isAvailable(DataContext dataContext)
 	@RequiredReadAction
 	private static Module findModule(DataContext dataContext)
 	{
-		Project project = CommonDataKeys.PROJECT.getData(dataContext);
+		Project project = dataContext.getData(CommonDataKeys.PROJECT);
 		assert project != null;
-		final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
+		final IdeView view = dataContext.getData(LangDataKeys.IDE_VIEW);
 		if(view == null)
 		{
 			return null;
@@ -67,7 +67,7 @@ private static Module findModule(DataContext dataContext)
 		{
 			return resolve;
 		}
-		return LangDataKeys.MODULE.getData(dataContext);
+		return dataContext.getData(LangDataKeys.MODULE);
 	}
 
 	@Nullable

From 32afcd2a381f4dd5ab0ff2b40960aa0756e95a36 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 4 Nov 2017 20:12:43 +0300
Subject: [PATCH 025/340] disable breadcrumbs for json for now

---
 .../JsonBreadcrumbsInfoProvider.java          | 59 -------------------
 resources/META-INF/json.xml                   |  4 --
 2 files changed, 63 deletions(-)
 delete mode 100644 json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java

diff --git a/json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java b/json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
deleted file mode 100644
index 699d3fdf..00000000
--- a/json-javascript-impl/src/consulo/json/breadcrumbs/JsonBreadcrumbsInfoProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package consulo.json.breadcrumbs;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import com.intellij.lang.Language;
-import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.psi.FileViewProvider;
-import com.intellij.psi.PsiElement;
-import com.intellij.xml.breadcrumbs.BreadcrumbsInfoProvider;
-import consulo.annotations.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.json.JsonFileType;
-
-/**
- * @author VISTALL
- * @since 07.12.2015
- */
-public class JsonBreadcrumbsInfoProvider extends BreadcrumbsInfoProvider
-{
-	@NotNull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
-
-	@Override
-	public boolean validateFileProvider(@NotNull FileViewProvider fileViewProvider)
-	{
-		return fileViewProvider.getFileType() == JsonFileType.INSTANCE;
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean acceptElement(@NotNull PsiElement psiElement)
-	{
-		return psiElement instanceof JSProperty && ((JSProperty) psiElement).getName() != null;
-	}
-
-	@RequiredReadAction
-	@NotNull
-	@Override
-	public String getElementInfo(@NotNull PsiElement psiElement)
-	{
-		if(psiElement instanceof JSProperty)
-		{
-			return ((JSProperty) psiElement).getName();
-		}
-		throw new IllegalArgumentException(psiElement.getClass().getName() + " is not supported");
-	}
-
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public String getElementTooltip(@NotNull PsiElement psiElement)
-	{
-		return null;
-	}
-}
diff --git a/resources/META-INF/json.xml b/resources/META-INF/json.xml
index d1836ddb..6170666c 100644
--- a/resources/META-INF/json.xml
+++ b/resources/META-INF/json.xml
@@ -48,10 +48,6 @@
 						 implementationClass="consulo.json.validation.inspections.PropertyValidationInspection"/>
 	</extensions>
 
-	<extensions defaultExtensionNs="com.intellij.xml">
-		<breadcrumbsInfoProvider implementation="consulo.json.breadcrumbs.JsonBreadcrumbsInfoProvider" />
-	</extensions>
-
 	<extensions defaultExtensionNs="consulo.javascript">
 		<propertyNameReferenceProvider implementation="consulo.json.validation.psi.reference.JsonPropertyNameReferenceProvider" order="before default"/>
 

From 4572295c409798b119990d51b508c33679410478 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 26 Nov 2017 04:22:50 +0300
Subject: [PATCH 026/340] update library names

---
 .consulo/.name                                            | 1 -
 .../libraries/consulo_plugin__com_intellij_regexp.xml     | 2 +-
 .../consulo_plugin__com_intellij_spellchecker.xml         | 2 +-
 .consulo/libraries/consulo_plugin__com_intellij_xml.xml   | 8 +++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 .consulo/.name

diff --git a/.consulo/.name b/.consulo/.name
deleted file mode 100644
index fbe283aa..00000000
--- a/.consulo/.name
+++ /dev/null
@@ -1 +0,0 @@
-consulo-javascript
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml b/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
index 69f86df5..a2442db6 100644
--- a/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
+++ b/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="consulo-plugin: com.intellij.regexp">
     <binaries>
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.regexp/lib/regexp.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.regexp/lib/com.intellij.regexp-2-SNAPSHOT.jar!/" />
     </binaries>
   </library>
 </component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml b/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
index fdfa53b8..b936e506 100644
--- a/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
+++ b/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="consulo-plugin: com.intellij.spellchecker">
     <binaries>
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.spellchecker/lib/spellchecker.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.spellchecker/lib/com.intellij.spellchecker-2-SNAPSHOT.jar!/" />
     </binaries>
   </library>
 </component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__com_intellij_xml.xml b/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
index 506d0d98..2e8845ad 100644
--- a/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
+++ b/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
@@ -2,9 +2,15 @@
   <library name="consulo-plugin: com.intellij.xml">
     <binaries>
       <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xml.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/jing.jar!/" />
       <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xerces.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/relaxng.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/isorelax.jar!/" />
       <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/resolver.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/jsr173_1.0_api.jar!/" />
+      <root url="zip://$PROJECT_DIR$/dep/com.intellij.xml/lib/rngom-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/trang-core.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xmlbeans-2.6.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/rngom-20051226-patched.jar!/" />
     </binaries>
   </library>
 </component>
\ No newline at end of file

From 7ee8af405eeffe305d47c11d587dfe11beac71bd Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 20 Dec 2017 01:10:01 +0300
Subject: [PATCH 027/340] updated libraries name

---
 .../consulo_plugin__com_intellij_xml.xml      | 25 ++++++++++++-------
 ...nsulo_plugin__org_intellij_intelliLang.xml |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.consulo/libraries/consulo_plugin__com_intellij_xml.xml b/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
index 2e8845ad..4abd97bc 100644
--- a/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
+++ b/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
@@ -1,16 +1,23 @@
 <component name="libraryTable">
   <library name="consulo-plugin: com.intellij.xml">
     <binaries>
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xml.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/jing.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xerces.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/relaxng.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/isorelax.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/resolver.jar!/" />
-      <root url="zip://$PROJECT_DIR$/dep/com.intellij.xml/lib/rngom-src.zip!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/trang-core.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/jing-20091111.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/rngom-20051226.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/trang-20091111.jar!/" />
       <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xmlbeans-2.6.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/rngom-20051226-patched.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xml-resolver-1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xercesImpl-2.11.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/consulo.relaxng-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.dom.api-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.psi.api-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.dom.impl-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.psi.impl-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.intelliLang-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.analysis.api-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.spellchecker-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.analysis.impl-2-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.structure.view.impl-2-SNAPSHOT.jar!/" />
     </binaries>
   </library>
 </component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml b/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
index d51c7966..9a13b74c 100644
--- a/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
+++ b/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="consulo-plugin: org.intellij.intelliLang">
     <binaries>
-      <root url="jar://$PROJECT_DIR$/dep/org.intellij.intelliLang/lib/intelliLang.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dep/org.intellij.intelliLang/lib/org.intellij.intelliLang-2-SNAPSHOT.jar!/" />
     </binaries>
   </library>
 </component>
\ No newline at end of file

From 530b0e0a20081881d116d56d540137498ed85f2b Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 23 Dec 2017 14:14:22 +0300
Subject: [PATCH 028/340] preparing for mavenize

---
 .consulo/artifacts/dist.xml                   |  36 ---
 .consulo/artifacts/plugin.xml                 |   9 -
 .consulo/codeStyleSettings.xml                |   9 -
 .consulo/compiler.xml                         |  18 --
 .consulo/copyright/jetbrains_must_be.xml      |   7 -
 .consulo/copyright/must_be.xml                |   7 -
 .consulo/copyright/profiles_settings.xml      |   7 -
 .consulo/encodings.xml                        |   6 -
 .../inspectionProfiles/Project_Default.xml    |  14 --
 .../inspectionProfiles/profiles_settings.xml  |   7 -
 .../consulo_plugin__com_intellij_regexp.xml   |   7 -
 ...sulo_plugin__com_intellij_spellchecker.xml |   7 -
 .../consulo_plugin__com_intellij_xml.xml      |  23 --
 ...nsulo_plugin__org_intellij_intelliLang.xml |   7 -
 .consulo/modules.xml                          | 213 ------------------
 .consulo/runConfigurations/Unnamed.xml        |  31 ---
 .consulo/scopes/package_com_intellij.xml      |   3 -
 .consulo/scopes/scope_settings.xml            |   5 -
 .consulo/uiDesigner.xml                       | 128 -----------
 .consulo/vcs.xml                              |   7 -
 .gitignore                                    |   7 +-
 impl/pom.xml                                  |  90 ++++++++
 .../intellij/javascript/JSClassNameMacro.java |   0
 .../javascript/JSDebuggerSupportUtils.java    |   0
 .../JSImplementationTextSelectioner.java      |   0
 .../javascript/JSMethodNameMacro.java         |   0
 .../javascript/JSParameterInfoHandler.java    |   0
 .../documentation/JSDocumentationBuilder.java |   0
 .../JSDocumentationProcessor.java             |   0
 .../JSDocumentationProvider.java              |   0
 .../documentation/JSDocumentationUtils.java   |   0
 .../JSAbstractElementManipulator.java         |   0
 .../JSAttributeNameValuePairManipulator.java  |   0
 .../manipulators/JSDocTagManipulator.java     |   0
 .../JSIncludeDirectiveManipulator.java        |   0
 .../lang/javascript/DialectOptionHolder.java  |   0
 .../com/intellij/lang/javascript/JSDoc.flex   |   0
 .../lang/javascript/JSDocElementType.java     |   0
 .../lang/javascript/JSDocTokenTypes.java      |   0
 .../lang/javascript/JSElementType.java        |   0
 .../lang/javascript/JSElementTypes.java       |   0
 .../lang/javascript/JSFlexAdapter.java        |   0
 .../lang/javascript/JSLanguageInjector.java   |   0
 .../lang/javascript/JSNodeVisitor.java        |   0
 .../javascript/JSSmartEnterProcessor.java     |   0
 .../lang/javascript/JSTokenTypes.java         |   0
 .../intellij/lang/javascript/JavaScript.flex  |   0
 .../lang/javascript/JavaScriptBundle.java     |   0
 .../javascript/JavaScriptCodeContextType.java |   0
 .../lang/javascript/JavaScriptFileType.java   |   0
 .../JavaScriptHighlightingLexer.java          |   0
 .../lang/javascript/JavaScriptIcons.java      |   0
 .../JavaScriptParsingFlexLexer.java           |   0
 .../javascript/JavaScriptSupportLoader.java   |   0
 .../JavaScriptTargetElementUtilEx.java        |   0
 .../lang/javascript/JavascriptCommenter.java  |   0
 .../intellij/lang/javascript/_JSDocLexer.java |   0
 .../lang/javascript/_JavaScriptLexer.java     |   0
 .../findUsages/JSReadWriteAccessDetector.java |   0
 .../javascript/findUsages/JSWordsScanner.java |   0
 .../JavaScriptClassGroupRuleProvider.java     |   0
 .../JavaScriptFindUsagesProvider.java         |   0
 .../JavaScriptFunctionGroupRuleProvider.java  |   0
 .../JavaScriptGroupRuleProviderBase.java      |   0
 ...ImportECMAScriptClassOrFunctionAction.java |   0
 .../flex/AnnotationBackedDescriptor.java      |   0
 .../flex/ECMAScriptImportOptimizer.java       |   0
 .../javascript/flex/FlexImportSupport.java    |   0
 .../lang/javascript/flex/ImportUtils.java     |   0
 .../lang/javascript/flex/JSResolveHelper.java |   0
 .../javascript/flex/XmlBackedJSClassImpl.java |   0
 .../flex/importer/AS3InterfaceDumper.java     |   0
 .../flex/importer/AS3InterfaceStubDumper.java |   0
 .../lang/javascript/flex/importer/Abc.java    |   0
 .../javascript/flex/importer/AbcDumper.java   |   0
 .../flex/importer/AbstractDumpProcessor.java  |   0
 .../javascript/flex/importer/ByteBuffer.java  |   0
 .../FlexByteCodeInformationProcessor.java     |   0
 .../flex/importer/FlexImporter.java           |   0
 .../javascript/flex/importer/LabelInfo.java   |   0
 .../javascript/flex/importer/MemberInfo.java  |   0
 .../javascript/flex/importer/MetaData.java    |   0
 .../javascript/flex/importer/MethodInfo.java  |   0
 .../javascript/flex/importer/Multiname.java   |   0
 .../javascript/flex/importer/SlotInfo.java    |   0
 .../lang/javascript/flex/importer/Swf.java    |   0
 .../lang/javascript/flex/importer/Traits.java |   0
 .../folding/JavaScriptFoldingBuilder.java     |   0
 .../formatter/JSCodeStylePanel.form           |   0
 .../formatter/JSCodeStylePanel.java           |   0
 .../formatter/JSCodeStyleSettings.java        |   0
 .../JSCodeStyleSettingsProvider.java          |   0
 .../formatter/JSFormattingModel.java          |   0
 .../formatter/JSSpacingProcessor.java         |   0
 .../JavaScriptIndentOptionsProvider.java      |   0
 .../JavascriptFormattingModelBuilder.java     |   0
 .../javascript/formatter/blocks/JSBlock.java  |   0
 .../formatter/blocks/JSDocCommentBlock.java   |   0
 .../formatter/blocks/SubBlockVisitor.java     |   0
 .../generation/BaseJSGenerateAction.java      |   0
 .../generation/BaseJSGenerateHandler.java     |   0
 .../generation/JSNamedElementNode.java        |   0
 .../JavaScriptGenerateAccessorHandler.java    |   0
 .../JavaScriptGenerateConstructorAction.java  |   0
 .../JavaScriptGenerateGetAccessorAction.java  |   0
 ...avaScriptGenerateGetSetAccessorAction.java |   0
 .../JavaScriptGenerateSetAccessorAction.java  |   0
 .../JavaScriptGenerateToStringAction.java     |   0
 .../JavaScriptImplementMethodsHandler.java    |   0
 .../JavaScriptOverrideMethodsHandler.java     |   0
 .../generation/OverrideMethodsFix.java        |   0
 .../highlighting/JSBraceMatcher.java          |   0
 .../highlighting/JSHighlighter.java           |   0
 .../JavaScriptColorsAndFontsPage.java         |   0
 .../JavaScriptHighlightVisitor.java           |   0
 .../JavaScriptHighlightingLexer.java          |   0
 .../JavaScriptLineMarkerProvider.java         |   0
 .../javascript/index/JSItemPresentation.java  |   0
 .../lang/javascript/index/JSSymbolUtil.java   |   0
 .../index/JSTypeEvaluateManager.java          |   0
 .../javascript/index/JavaScriptIndex.java     |   0
 .../javascript/index/predefined/Marker.java   |   0
 .../inspections/CreateClassDialog.form        |   0
 .../inspections/CreateClassDialog.java        |   0
 .../CreateClassOrInterfaceAction.java         |   0
 .../JSDeprecatedSymbolsInspection.java        |   0
 .../JSDuplicatedDeclarationInspection.java    |   0
 .../javascript/inspections/JSInspection.java  |   0
 .../inspections/JSInspectionToolProvider.java |   0
 .../JSUndeclaredVariableInspection.java       |   0
 .../JSUnresolvedFunctionInspection.java       |   0
 .../JSUnresolvedVariableInspection.java       |   0
 .../JSUntypedDeclarationInspection.java       |   0
 .../JSUnusedLocalSymbolsInspection.java       |   0
 .../inspections/qucikFixes/BaseCreateFix.java |   0
 .../CreateJSFunctionOrMethodFix.java          |   0
 .../JavaScriptGotoSuperHandler.java           |   0
 .../JavaScriptSymbolContributor.java          |   0
 .../lang/javascript/parsing/JSDocParsing.java |   0
 .../lang/javascript/psi/JSArgumentList.java   |   0
 .../psi/JSArrayLiteralExpression.java         |   0
 .../psi/JSAssignmentExpression.java           |   0
 .../lang/javascript/psi/JSAttribute.java      |   0
 .../lang/javascript/psi/JSAttributeList.java  |   0
 .../javascript/psi/JSAttributeListOwner.java  |   0
 .../psi/JSAttributeNameValuePair.java         |   0
 .../javascript/psi/JSBinaryExpression.java    |   0
 .../lang/javascript/psi/JSBlockStatement.java |   0
 .../lang/javascript/psi/JSBreakStatement.java |   0
 .../lang/javascript/psi/JSCallExpression.java |   0
 .../lang/javascript/psi/JSCaseClause.java     |   0
 .../lang/javascript/psi/JSCatchBlock.java     |   0
 .../intellij/lang/javascript/psi/JSClass.java |   0
 .../javascript/psi/JSCommaExpression.java     |   0
 .../psi/JSConditionalExpression.java          |   0
 .../javascript/psi/JSContinueStatement.java   |   0
 .../psi/JSDefinitionExpression.java           |   0
 .../javascript/psi/JSDoWhileStatement.java    |   0
 .../lang/javascript/psi/JSDocComment.java     |   0
 .../lang/javascript/psi/JSDocTag.java         |   0
 .../lang/javascript/psi/JSDocTagValue.java    |   0
 .../lang/javascript/psi/JSElement.java        |   0
 .../lang/javascript/psi/JSElementFactory.java |   0
 .../lang/javascript/psi/JSElementVisitor.java |   0
 .../lang/javascript/psi/JSEmptyStatement.java |   0
 .../lang/javascript/psi/JSExpression.java     |   0
 .../psi/JSExpressionCodeFragment.java         |   0
 .../javascript/psi/JSExpressionStatement.java |   0
 .../intellij/lang/javascript/psi/JSFile.java  |   0
 .../lang/javascript/psi/JSForInStatement.java |   0
 .../lang/javascript/psi/JSForStatement.java   |   0
 .../lang/javascript/psi/JSFunction.java       |   0
 .../javascript/psi/JSFunctionExpression.java  |   0
 .../javascript/psi/JSGenericSignature.java    |   0
 .../lang/javascript/psi/JSIfStatement.java    |   0
 .../javascript/psi/JSImportStatement.java     |   0
 .../javascript/psi/JSIncludeDirective.java    |   0
 .../JSIndexedPropertyAccessExpression.java    |   0
 .../javascript/psi/JSLabeledStatement.java    |   0
 .../lang/javascript/psi/JSLetExpression.java  |   0
 .../lang/javascript/psi/JSLetStatement.java   |   0
 .../javascript/psi/JSLiteralExpression.java   |   0
 .../lang/javascript/psi/JSLoopStatement.java  |   0
 .../lang/javascript/psi/JSNamedElement.java   |   0
 .../psi/JSNamespaceDeclaration.java           |   0
 .../lang/javascript/psi/JSNewExpression.java  |   0
 .../psi/JSObjectLiteralExpression.java        |   0
 .../javascript/psi/JSPackageStatement.java    |   0
 .../lang/javascript/psi/JSParameter.java      |   0
 .../lang/javascript/psi/JSParameterList.java  |   0
 .../psi/JSParenthesizedExpression.java        |   0
 .../javascript/psi/JSPostfixExpression.java   |   0
 .../javascript/psi/JSPrefixExpression.java    |   0
 .../lang/javascript/psi/JSProperty.java       |   0
 .../psi/JSQualifiedNamedElement.java          |   0
 .../javascript/psi/JSReferenceExpression.java |   0
 .../lang/javascript/psi/JSReferenceList.java  |   0
 .../javascript/psi/JSReturnStatement.java     |   0
 .../lang/javascript/psi/JSSourceElement.java  |   0
 .../lang/javascript/psi/JSStatement.java      |   0
 .../javascript/psi/JSStubElementType.java     |   0
 .../javascript/psi/JSSuperExpression.java     |   0
 .../javascript/psi/JSSuppressionHolder.java   |   0
 .../javascript/psi/JSSwitchStatement.java     |   0
 .../lang/javascript/psi/JSThisExpression.java |   0
 .../lang/javascript/psi/JSThrowStatement.java |   0
 .../lang/javascript/psi/JSTryStatement.java   |   0
 .../psi/JSUseNamespaceDirective.java          |   0
 .../lang/javascript/psi/JSVarStatement.java   |   0
 .../lang/javascript/psi/JSVariable.java       |   0
 .../lang/javascript/psi/JSWhileStatement.java |   0
 .../lang/javascript/psi/JSWithStatement.java  |   0
 .../lang/javascript/psi/JSYieldStatement.java |   0
 .../psi/impl/JSArgumentListImpl.java          |   0
 .../impl/JSArrayLiteralExpressionImpl.java    |   0
 .../psi/impl/JSAssignmentExpressionImpl.java  |   0
 .../javascript/psi/impl/JSAttributeImpl.java  |   0
 .../psi/impl/JSAttributeListImpl.java         |   0
 .../impl/JSAttributeNameValuePairImpl.java    |   0
 .../psi/impl/JSBinaryExpressionImpl.java      |   0
 .../psi/impl/JSBlockStatementImpl.java        |   0
 .../psi/impl/JSBreakStatementImpl.java        |   0
 .../psi/impl/JSCallExpressionImpl.java        |   0
 .../javascript/psi/impl/JSCaseClauseImpl.java |   0
 .../javascript/psi/impl/JSCatchBlockImpl.java |   0
 .../javascript/psi/impl/JSChangeUtil.java     |   0
 .../lang/javascript/psi/impl/JSClassBase.java |   0
 .../lang/javascript/psi/impl/JSClassImpl.java |   0
 .../psi/impl/JSCommaExpressionImpl.java       |   0
 .../psi/impl/JSConditionalExpressionImpl.java |   0
 .../psi/impl/JSContinueStatementImpl.java     |   0
 .../psi/impl/JSDefinitionExpressionImpl.java  |   0
 .../psi/impl/JSDoWhileStatementImpl.java      |   0
 .../javascript/psi/impl/JSDocCommentImpl.java |   0
 .../javascript/psi/impl/JSDocTagImpl.java     |   0
 .../psi/impl/JSDocTagValueImpl.java           |   0
 .../javascript/psi/impl/JSElementImpl.java    |   0
 .../psi/impl/JSEmbeddedContentImpl.java       |   0
 .../psi/impl/JSEmptyStatementImpl.java        |   0
 .../impl/JSExpressionCodeFragmentImpl.java    |   0
 .../javascript/psi/impl/JSExpressionImpl.java |   0
 .../psi/impl/JSExpressionStatementImpl.java   |   0
 .../lang/javascript/psi/impl/JSFileImpl.java  |   0
 .../psi/impl/JSForInStatementImpl.java        |   0
 .../psi/impl/JSForStatementImpl.java          |   0
 .../psi/impl/JSFunctionBaseImpl.java          |   0
 .../psi/impl/JSFunctionExpressionImpl.java    |   0
 .../javascript/psi/impl/JSFunctionImpl.java   |   0
 .../psi/impl/JSGenericSignatureImpl.java      |   0
 .../psi/impl/JSIfStatementImpl.java           |   0
 .../psi/impl/JSImportStatementImpl.java       |   0
 .../psi/impl/JSIncludeDirectiveImpl.java      |   0
 ...JSIndexedPropertyAccessExpressionImpl.java |   0
 .../psi/impl/JSLabeledStatementImpl.java      |   0
 .../psi/impl/JSLetExpressionImpl.java         |   0
 .../psi/impl/JSLetStatementImpl.java          |   0
 .../psi/impl/JSLiteralExpressionImpl.java     |   0
 .../psi/impl/JSNamespaceDeclarationImpl.java  |   0
 .../psi/impl/JSNewExpressionImpl.java         |   0
 .../impl/JSObjectLiteralExpressionImpl.java   |   0
 .../psi/impl/JSPackageStatementImpl.java      |   0
 .../javascript/psi/impl/JSParameterImpl.java  |   0
 .../psi/impl/JSParameterListImpl.java         |   0
 .../impl/JSParenthesizedExpressionImpl.java   |   0
 .../psi/impl/JSPostfixExpressionImpl.java     |   0
 .../psi/impl/JSPrefixExpressionImpl.java      |   0
 .../javascript/psi/impl/JSPropertyImpl.java   |   0
 .../javascript/psi/impl/JSPsiImplUtils.java   |   0
 .../psi/impl/JSReferenceExpressionImpl.java   |   0
 .../psi/impl/JSReferenceListImpl.java         |   0
 .../javascript/psi/impl/JSReferenceSet.java   |   0
 .../psi/impl/JSReturnStatementImpl.java       |   0
 .../JSSmartCompletionVariantsHandler.java     |   0
 .../javascript/psi/impl/JSStatementImpl.java  |   0
 .../JSStatementWithLabelReferenceImpl.java    |   0
 .../psi/impl/JSStubElementImpl.java           |   0
 .../psi/impl/JSStubbedStatementImpl.java      |   0
 .../psi/impl/JSSuperExpressionImpl.java       |   0
 .../psi/impl/JSSwitchStatementImpl.java       |   0
 .../psi/impl/JSThisExpressionImpl.java        |   0
 .../psi/impl/JSThrowStatementImpl.java        |   0
 .../psi/impl/JSTryStatementImpl.java          |   0
 .../psi/impl/JSUseNamespaceDirectiveImpl.java |   0
 .../psi/impl/JSVarStatementImpl.java          |   0
 .../psi/impl/JSVariableBaseImpl.java          |   0
 .../javascript/psi/impl/JSVariableImpl.java   |   0
 .../psi/impl/JSWhileStatementImpl.java        |   0
 .../psi/impl/JSWithStatementImpl.java         |   0
 .../psi/impl/JSXmlLiteralExpressionImpl.java  |   0
 .../psi/impl/JSYieldStatementImpl.java        |   0
 .../javascript/psi/impl/ReferenceSupport.java |   0
 .../reference/JSPropertyNameReference.java    |   0
 .../psi/resolve/BaseJSSymbolProcessor.java    |   0
 .../psi/resolve/CompletionProcessor.java      |   0
 .../psi/resolve/JSImportHandlingUtil.java     |   0
 .../JSImportedElementResolveResult.java       |   0
 .../javascript/psi/resolve/JSResolveUtil.java |   0
 .../psi/resolve/ResolveProcessor.java         |   0
 .../psi/resolve/VariantsProcessor.java        |   0
 .../psi/resolve/WalkUpResolveProcessor.java   |   0
 .../psi/stubs/JSAttributeListStub.java        |   0
 .../stubs/JSAttributeNameValuePairStub.java   |   0
 .../javascript/psi/stubs/JSAttributeStub.java |   0
 .../javascript/psi/stubs/JSClassStub.java     |   0
 .../javascript/psi/stubs/JSFunctionStub.java  |   0
 .../stubs/JSImplementedInterfacesIndex.java   |   0
 .../psi/stubs/JSImportStatementStub.java      |   0
 .../psi/stubs/JSIncludeDirectiveStub.java     |   0
 .../javascript/psi/stubs/JSNameIndex.java     |   0
 .../psi/stubs/JSNamespaceDeclarationStub.java |   0
 .../psi/stubs/JSPackageStatementStub.java     |   0
 .../psi/stubs/JSParameterListStub.java        |   0
 .../javascript/psi/stubs/JSParameterStub.java |   0
 .../psi/stubs/JSQualifiedElementIndex.java    |   0
 .../javascript/psi/stubs/JSQualifiedStub.java |   0
 .../psi/stubs/JSReferenceListStub.java        |   0
 .../javascript/psi/stubs/JSStubElement.java   |   0
 .../psi/stubs/JSSuperClassIndex.java          |   0
 .../stubs/JSUseNamespaceDirectiveStub.java    |   0
 .../psi/stubs/JSVarStatementStub.java         |   0
 .../javascript/psi/stubs/JSVariableStub.java  |   0
 .../psi/stubs/JSVariableStubBase.java         |   0
 .../stubs/impl/JSAttributeListStubImpl.java   |   0
 .../JSAttributeNameValuePairStubImpl.java     |   0
 .../psi/stubs/impl/JSAttributeStubImpl.java   |   0
 .../psi/stubs/impl/JSClassStubImpl.java       |   0
 .../psi/stubs/impl/JSFunctionStubImpl.java    |   0
 .../stubs/impl/JSImportStatementStubImpl.java |   0
 .../impl/JSIncludeDirectiveStubImpl.java      |   0
 .../psi/stubs/impl/JSNamedObjectStubBase.java |   0
 .../impl/JSNamespaceDeclarationStubImpl.java  |   0
 .../impl/JSPackageStatementStubImpl.java      |   0
 .../stubs/impl/JSParameterListStubImpl.java   |   0
 .../psi/stubs/impl/JSParameterStubImpl.java   |   0
 .../stubs/impl/JSQualifiedObjectStubBase.java |   0
 .../stubs/impl/JSReferenceListStubImpl.java   |   0
 .../impl/JSUseNamespaceDirectiveStubImpl.java |   0
 .../stubs/impl/JSVarStatementStubImpl.java    |   0
 .../stubs/impl/JSVariableStubBaseImpl.java    |   0
 .../psi/stubs/impl/JSVariableStubImpl.java    |   0
 .../javascript/psi/util/JSLookupUtil.java     |   0
 .../lang/javascript/psi/util/JSUtils.java     |   0
 .../refactoring/BaseIntroduceSettings.java    |   0
 .../BasicJavascriptNamesValidator.java        |   0
 .../JSBaseClassBasedIntroduceDialog.java      |   0
 .../refactoring/JSBaseIntroduceDialog.java    |   0
 .../refactoring/JSBaseIntroduceHandler.java   |   0
 .../refactoring/JSNamesValidator.java         |   0
 .../JavascriptRefactoringSupportProvider.java |   0
 .../JSExtractFunctionDialog.form              |   0
 .../JSExtractFunctionDialog.java              |   0
 .../JSExtractFunctionHandler.java             |   0
 .../JSExtractFunctionSettings.java            |   0
 .../JSIntroduceConstant.form                  |   0
 .../JSIntroduceConstantDialog.java            |   0
 .../JSIntroduceConstantHandler.java           |   0
 .../JSIntroduceConstantSettings.java          |   0
 .../introduceField/JSIntroduceField.form      |   0
 .../JSIntroduceFieldDialog.java               |   0
 .../JSIntroduceFieldHandler.java              |   0
 .../JSIntroduceFieldSettings.java             |   0
 .../JSIntroduceVariable.form                  |   0
 .../JSIntroduceVariableDialog.java            |   0
 .../JSIntroduceVariableHandler.java           |   0
 .../introduceVariable/Settings.java           |   0
 .../search/JSClassInheritorsProvider.java     |   0
 .../lang/javascript/search/JSClassSearch.java |   0
 .../search/JSDeclarationRangeHandler.java     |   0
 .../search/JSDefinitionsSearchExecutor.java   |   0
 .../javascript/search/JSFunctionsSearch.java  |   0
 .../search/JSGotoTargetRendererProvider.java  |   0
 .../search/JSReferencesSearchExecutor.java    |   0
 .../JSStructureItemPresentation.java          |   0
 .../JSStructureViewBuilderFactory.java        |   0
 .../structureView/JSStructureViewElement.java |   0
 .../structureView/JSStructureViewModel.java   |   0
 .../structureView/JSSuperGroup.java           |   0
 .../structureView/JSSuperGrouper.java         |   0
 .../JSExpressionSurroundDescriptor.java       |   0
 .../surroundWith/JSStatementSurrounder.java   |   0
 .../JSStatementsSurroundDescriptor.java       |   0
 .../surroundWith/JSWithBlockSurrounder.java   |   0
 .../surroundWith/JSWithDoWhileSurrounder.java |   0
 .../surroundWith/JSWithForSurrounder.java     |   0
 .../JSWithFunctionExpressionSurrounder.java   |   0
 .../JSWithFunctionSurrounder.java             |   0
 .../surroundWith/JSWithIfElseSurrounder.java  |   0
 .../surroundWith/JSWithIfSurrounder.java      |   0
 .../JSWithParenthesesSurrounder.java          |   0
 .../JSWithTryCatchFinallySurrounder.java      |   0
 .../JSWithTryCatchSurrounder.java             |   0
 .../JSWithTryFinallySurrounder.java           |   0
 .../surroundWith/JSWithWhileSurrounder.java   |   0
 .../surroundWith/JSWithWithSurrounder.java    |   0
 .../types/JSAttributeElementType.java         |   0
 .../types/JSAttributeListElementType.java     |   0
 .../types/JSAttributeNameValuePairType.java   |   0
 .../javascript/types/JSClassElementType.java  |   0
 .../javascript/types/JSFileElementType.java   |   0
 .../types/JSFunctionElementType.java          |   0
 .../types/JSImportStatementElementType.java   |   0
 .../types/JSIncludeDirectiveElementType.java  |   0
 .../JSNamespaceDeclarationElementType.java    |   0
 .../types/JSPackageStatementElementType.java  |   0
 .../types/JSParameterElementType.java         |   0
 .../types/JSParameterListElementType.java     |   0
 .../types/JSReferenceListElementType.java     |   0
 .../types/JSUseNamespaceDirectiveType.java    |   0
 .../types/JSVarStatementElementType.java      |   0
 .../types/JSVariableElementType.java          |   0
 .../validation/BaseCreateMethodsFix.java      |   0
 .../validation/ImplementMethodsFix.java       |   0
 .../ImplementedMethodProcessor.java           |   0
 .../validation/JSAnnotatingVisitor.java       |   0
 .../validation/JSUnusedImportsHelper.java     |   0
 .../UpdateJavaScriptFileCopyright.java        |   0
 ...UpdateJavaScriptFileCopyrightProvider.java |   0
 .../JavaScriptCodeStyleConfigurable.java      |   0
 .../formatter/JavaScriptCodeStylePanel.java   |   0
 ...riptLanguageCodeStyleSettingsProvider.java |   0
 .../ide/JavaScriptIconDescriptorUpdater.java  |   0
 .../actions/JavaScriptCreateFileAction.java   |   0
 .../JavaScriptQuickFixFactory.java            |   0
 ...avaScriptKeywordCompletionContributor.java |   0
 .../ide/completion/SpaceInsertHandler.java    |   0
 .../ide/hightlight/JavaScriptHighlighter.java |   0
 .../JavaScriptSyntaxHighlightFactory.java     |   0
 .../JavaScriptSyntaxHighlightKeys.java        |   0
 .../javascript/index/JavaScriptIndexer.java   |   0
 .../qucikFixes/CreateJSFunctionFixBase.java   |   0
 .../lang/BaseJavaScriptLanguageVersion.java   |   0
 .../lang/JavaScript15LanguageVersion.java     |   0
 .../javascript/lang/JavaScriptConstants.java  |   0
 .../javascript/lang/JavaScriptFeature.java    |   0
 .../lang/JavaScriptFileTypeFactory.java       |   0
 .../lang/JavaScriptFileTypeWithVersion.java   |   0
 .../javascript/lang/JavaScriptLanguage.java   |   0
 .../JavaScriptLanguageVersionResolver.java    |   0
 .../lang/JavaScriptParsingDefinition.java     |   0
 .../lang/JavaScriptQuoteHandler.java          |   0
 .../JavaScriptRegexpMultiHostInjector.java    |   0
 .../javascript/lang/JavaScriptTokenSets.java  |   0
 .../lang/JavaScriptVersionUtil.java           |   0
 .../lang/StandardJavaScriptVersions.java      |   0
 .../lang/lexer/JavaScript15Lexer.java         |   0
 .../javascript/lang/lexer/javascript15.flex   |   0
 .../JavaScriptClassContributor.java           |   0
 .../lang/parsing/ContextKeywordCache.java     |   0
 .../lang/parsing/ExpressionParsing.java       |   0
 .../lang/parsing/FunctionParsing.java         |   0
 .../lang/parsing/JavaScriptParser.java        |   0
 .../lang/parsing/JavaScriptParserBuilder.java |   0
 .../parsing/JavaScriptParsingContext.java     |   0
 .../javascript/lang/parsing/Parsing.java      |   0
 .../lang/parsing/StatementParsing.java        |   0
 .../impl/JavaScriptStrictParserBuilder.java   |   0
 .../lang/psi/JavaScriptPrimitiveType.java     |   0
 .../lang/psi/JavaScriptSimpleType.java        |   0
 .../javascript/lang/psi/JavaScriptType.java   |   0
 .../lang/psi/JavaScriptTypeElement.java       |   0
 .../lang/psi/impl/JavaScriptClassType.java    |   0
 .../BaseJavaScriptElementType.java            |   0
 .../lang/psi/stubs/JavaScriptIndexKeys.java   |   0
 .../extension/JavaScriptModuleExtension.java  |   0
 .../JavaScriptMutableModuleExtension.java     |   0
 .../javascript/psi/JSComputedName.java        |   0
 .../psi/JSSimpleLiteralExpression.java        |   0
 .../psi/JavaScriptLambdaExpression.java       |   0
 .../psi/impl/JSComputedNameImpl.java          |   0
 .../impl/JavaScriptLambdaExpressionImpl.java  |   0
 ...efaultJSPropertyNameReferenceProvider.java |   0
 .../JSPropertyNameReferenceProvider.java      |   0
 .../javascript/psi/stubs/JSFileStub.java      |   0
 .../psi/stubs/impl/JSFileStubImpl.java        |   0
 .../stubs/index/JavaScriptClassNameIndex.java |   0
 .../types/JSQualifiedStubElementType.java     |   0
 .../main/resources}/META-INF/Inspections.xml  |   0
 .../main/resources}/META-INF/Intentions.xml   |   0
 .../main/resources}/META-INF/actionscript.xml |   0
 .../src/main/resources}/META-INF/ecma4.xml    |   0
 .../src/main/resources}/META-INF/ecma6.xml    |   0
 .../src/main/resources}/META-INF/json.xml     |   0
 .../src/main/resources}/META-INF/plugin.xml   |   0
 .../src/main/resources}/META-INF/regexp.xml   |   0
 .../main/resources}/META-INF/typescript.xml   |   0
 .../main/resources}/codeStyle/blankLines.txt  |   0
 .../src/main/resources}/codeStyle/indent.txt  |   0
 .../src/main/resources}/codeStyle/spacing.txt |   0
 .../main/resources}/codeStyle/wrapping.txt    |   0
 .../intellij/lang/javascript/flex/flex.png    | Bin
 .../internal/JavaScriptFile.js.ft             |   0
 .../src/main/resources}/icons/as.png          | Bin
 .../src/main/resources}/icons/as@2x.png       | Bin
 .../src/main/resources}/icons/ecmaScript.png  | Bin
 .../main/resources}/icons/ecmaScript@2x.png   | Bin
 .../src/main/resources}/icons/javaScript.png  | Bin
 .../main/resources}/icons/javaScript@2x.png   | Bin
 .../src/main/resources}/icons/json.png        | Bin
 .../src/main/resources}/icons/json@2x.png     | Bin
 .../src/main/resources}/icons/jsx.png         | Bin
 .../src/main/resources}/icons/jsx@2x.png      | Bin
 .../src/main/resources}/icons/typeScript.png  | Bin
 .../main/resources}/icons/typeScript@2x.png   | Bin
 .../JSDeprecatedSymbols.html                  |   0
 .../JSDuplicatedDeclaration.html              |   0
 .../JSUndeclaredVariable.html                 |   0
 .../JSUnresolvedFunction.html                 |   0
 .../JSUnresolvedVariable.html                 |   0
 .../JSUntypedDeclaration.html                 |   0
 .../JSUnusedLocalSymbols.html                 |   0
 .../messages/JavaScriptBundle.properties      |   0
 pom.xml                                       |  47 ++++
 512 files changed, 141 insertions(+), 554 deletions(-)
 delete mode 100644 .consulo/artifacts/dist.xml
 delete mode 100644 .consulo/artifacts/plugin.xml
 delete mode 100644 .consulo/codeStyleSettings.xml
 delete mode 100644 .consulo/compiler.xml
 delete mode 100644 .consulo/copyright/jetbrains_must_be.xml
 delete mode 100644 .consulo/copyright/must_be.xml
 delete mode 100644 .consulo/copyright/profiles_settings.xml
 delete mode 100644 .consulo/encodings.xml
 delete mode 100644 .consulo/inspectionProfiles/Project_Default.xml
 delete mode 100644 .consulo/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .consulo/libraries/consulo_plugin__com_intellij_regexp.xml
 delete mode 100644 .consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
 delete mode 100644 .consulo/libraries/consulo_plugin__com_intellij_xml.xml
 delete mode 100644 .consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
 delete mode 100644 .consulo/modules.xml
 delete mode 100644 .consulo/runConfigurations/Unnamed.xml
 delete mode 100644 .consulo/scopes/package_com_intellij.xml
 delete mode 100644 .consulo/scopes/scope_settings.xml
 delete mode 100644 .consulo/uiDesigner.xml
 delete mode 100644 .consulo/vcs.xml
 create mode 100644 impl/pom.xml
 rename {src => impl/src/main/java}/com/intellij/javascript/JSClassNameMacro.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/JSDebuggerSupportUtils.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/JSImplementationTextSelectioner.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/JSMethodNameMacro.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/JSParameterInfoHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/documentation/JSDocumentationBuilder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/documentation/JSDocumentationProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/documentation/JSDocumentationProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/documentation/JSDocumentationUtils.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/manipulators/JSDocTagManipulator.java (100%)
 rename {src => impl/src/main/java}/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/DialectOptionHolder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSDoc.flex (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSDocElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSDocTokenTypes.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSElementTypes.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSFlexAdapter.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSLanguageInjector.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSNodeVisitor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSSmartEnterProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JSTokenTypes.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavaScript.flex (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavaScriptBundle.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavaScriptCodeContextType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavaScriptFileType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavaScriptIcons.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavaScriptSupportLoader.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/JavascriptCommenter.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/_JSDocLexer.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/_JavaScriptLexer.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/findUsages/JSWordsScanner.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/FlexImportSupport.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/ImportUtils.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/JSResolveHelper.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/Abc.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/AbcDumper.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/ByteBuffer.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/FlexImporter.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/LabelInfo.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/MemberInfo.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/MetaData.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/MethodInfo.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/Multiname.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/SlotInfo.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/Swf.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/flex/importer/Traits.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/JSFormattingModel.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/blocks/JSBlock.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/JSNamedElementNode.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/generation/OverrideMethodsFix.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/highlighting/JSHighlighter.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/index/JSItemPresentation.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/index/JSSymbolUtil.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/index/JavaScriptIndex.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/index/predefined/Marker.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/CreateClassDialog.form (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/CreateClassDialog.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/JSInspection.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/parsing/JSDocParsing.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSArgumentList.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSAssignmentExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSAttribute.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSAttributeList.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSAttributeListOwner.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSBinaryExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSBlockStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSBreakStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSCallExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSCaseClause.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSCatchBlock.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSClass.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSCommaExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSConditionalExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSContinueStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSDefinitionExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSDoWhileStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSDocComment.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSDocTag.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSDocTagValue.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSElement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSElementFactory.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSElementVisitor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSEmptyStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSExpressionStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSFile.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSForInStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSForStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSFunction.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSFunctionExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSGenericSignature.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSIfStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSImportStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSIncludeDirective.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSLabeledStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSLetExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSLetStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSLiteralExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSLoopStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSNamedElement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSNewExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSPackageStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSParameter.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSParameterList.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSPostfixExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSPrefixExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSProperty.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSReferenceExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSReferenceList.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSReturnStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSSourceElement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSStubElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSSuperExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSSuppressionHolder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSSwitchStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSThisExpression.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSThrowStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSTryStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSVarStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSVariable.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSWhileStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSWithStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/JSYieldStatement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSClassBase.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSClassImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSElementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSFileImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSClassStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSStubElement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/util/JSLookupUtil.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/psi/util/JSUtils.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/JSNamesValidator.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/search/JSClassSearch.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/search/JSFunctionsSearch.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/structureView/JSStructureViewElement.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/structureView/JSStructureViewModel.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/structureView/JSSuperGroup.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/structureView/JSSuperGrouper.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSAttributeElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSAttributeListElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSClassElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSFileElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSFunctionElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSImportStatementElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSPackageStatementElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSParameterElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSParameterListElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSReferenceListElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSVarStatementElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/types/JSVariableElementType.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/validation/ImplementMethodsFix.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java (100%)
 rename {src => impl/src/main/java}/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/formatter/JavaScriptCodeStylePanel.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/ide/completion/SpaceInsertHandler.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/index/JavaScriptIndexer.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScript15LanguageVersion.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptConstants.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptFeature.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptFileTypeFactory.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptLanguage.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptParsingDefinition.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptQuoteHandler.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptTokenSets.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/JavaScriptVersionUtil.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/StandardJavaScriptVersions.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/lexer/JavaScript15Lexer.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/lexer/javascript15.flex (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/navigation/JavaScriptClassContributor.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/parsing/ContextKeywordCache.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/parsing/ExpressionParsing.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/parsing/FunctionParsing.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/parsing/JavaScriptParser.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/parsing/JavaScriptParsingContext.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/parsing/Parsing.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/parsing/StatementParsing.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/psi/JavaScriptSimpleType.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/psi/JavaScriptType.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/psi/JavaScriptTypeElement.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/psi/impl/JavaScriptClassType.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/module/extension/JavaScriptModuleExtension.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/JSComputedName.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/JSSimpleLiteralExpression.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/JavaScriptLambdaExpression.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/impl/JSComputedNameImpl.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/stubs/JSFileStub.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java (100%)
 rename {src => impl/src/main/java}/consulo/javascript/types/JSQualifiedStubElementType.java (100%)
 rename {resources => impl/src/main/resources}/META-INF/Inspections.xml (100%)
 rename {resources => impl/src/main/resources}/META-INF/Intentions.xml (100%)
 rename {resources => impl/src/main/resources}/META-INF/actionscript.xml (100%)
 rename {resources => impl/src/main/resources}/META-INF/ecma4.xml (100%)
 rename {resources => impl/src/main/resources}/META-INF/ecma6.xml (100%)
 rename {resources => impl/src/main/resources}/META-INF/json.xml (100%)
 rename {resources => impl/src/main/resources}/META-INF/plugin.xml (100%)
 rename {resources => impl/src/main/resources}/META-INF/regexp.xml (100%)
 rename {resources => impl/src/main/resources}/META-INF/typescript.xml (100%)
 rename {resources => impl/src/main/resources}/codeStyle/blankLines.txt (100%)
 rename {resources => impl/src/main/resources}/codeStyle/indent.txt (100%)
 rename {resources => impl/src/main/resources}/codeStyle/spacing.txt (100%)
 rename {resources => impl/src/main/resources}/codeStyle/wrapping.txt (100%)
 rename {resources => impl/src/main/resources}/com/intellij/lang/javascript/flex/flex.png (100%)
 rename {resources => impl/src/main/resources}/fileTemplates/internal/JavaScriptFile.js.ft (100%)
 rename {resources => impl/src/main/resources}/icons/as.png (100%)
 rename {resources => impl/src/main/resources}/icons/as@2x.png (100%)
 rename {resources => impl/src/main/resources}/icons/ecmaScript.png (100%)
 rename {resources => impl/src/main/resources}/icons/ecmaScript@2x.png (100%)
 rename {resources => impl/src/main/resources}/icons/javaScript.png (100%)
 rename {resources => impl/src/main/resources}/icons/javaScript@2x.png (100%)
 rename {resources => impl/src/main/resources}/icons/json.png (100%)
 rename {resources => impl/src/main/resources}/icons/json@2x.png (100%)
 rename {resources => impl/src/main/resources}/icons/jsx.png (100%)
 rename {resources => impl/src/main/resources}/icons/jsx@2x.png (100%)
 rename {resources => impl/src/main/resources}/icons/typeScript.png (100%)
 rename {resources => impl/src/main/resources}/icons/typeScript@2x.png (100%)
 rename {resources => impl/src/main/resources}/inspectionDescriptions/JSDeprecatedSymbols.html (100%)
 rename {resources => impl/src/main/resources}/inspectionDescriptions/JSDuplicatedDeclaration.html (100%)
 rename {resources => impl/src/main/resources}/inspectionDescriptions/JSUndeclaredVariable.html (100%)
 rename {resources => impl/src/main/resources}/inspectionDescriptions/JSUnresolvedFunction.html (100%)
 rename {resources => impl/src/main/resources}/inspectionDescriptions/JSUnresolvedVariable.html (100%)
 rename {resources => impl/src/main/resources}/inspectionDescriptions/JSUntypedDeclaration.html (100%)
 rename {resources => impl/src/main/resources}/inspectionDescriptions/JSUnusedLocalSymbols.html (100%)
 rename {resources => impl/src/main/resources}/messages/JavaScriptBundle.properties (100%)
 create mode 100644 pom.xml

diff --git a/.consulo/artifacts/dist.xml b/.consulo/artifacts/dist.xml
deleted file mode 100644
index 1d95def9..00000000
--- a/.consulo/artifacts/dist.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="dist">
-    <output-path>$PROJECT_DIR$/out/artifacts/dist</output-path>
-    <root id="root">
-      <element id="directory" name="consulo.javascript">
-        <element id="directory" name="lib">
-          <element id="zip-archive" name="javascript.jar">
-            <element id="module-output" name="consulo-javascript" />
-            <element id="module-production-resource-output" name="consulo-javascript" />
-            <element id="module-output" name="inspections" />
-            <element id="module-production-resource-output" name="inspections" />
-            <element id="module-output" name="intentions" />
-            <element id="module-production-resource-output" name="intentions" />
-            <element id="module-output" name="client-javascript-impl" />
-            <element id="module-output" name="ecmascript4-impl" />
-            <element id="module-output" name="actionscript-impl" />
-            <element id="module-output" name="javascript18-impl" />
-            <element id="module-output" name="javascript17-impl" />
-            <element id="module-output" name="javascript16-impl" />
-            <element id="module-output" name="ecmascript6-impl" />
-            <element id="module-output" name="typescript-impl" />
-          </element>
-          <element id="zip-archive" name="json-impl.jar">
-            <element id="module-output" name="json-javascript-impl" />
-          </element>
-          <element id="zip-archive" name="debugger-impl.jar">
-            <element id="module-output" name="debugger-impl" />
-            <element id="module-output" name="v8-debugger-impl" />
-          </element>
-          <element id="dir-copy" path="$PROJECT_DIR$/v8-debugger-impl/lib" />
-        </element>
-        <element id="dir-copy" path="$PROJECT_DIR$/dist" />
-      </element>
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.consulo/artifacts/plugin.xml b/.consulo/artifacts/plugin.xml
deleted file mode 100644
index a25d7f84..00000000
--- a/.consulo/artifacts/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="plugin">
-    <output-path>$PROJECT_DIR$/out/artifacts/plugin</output-path>
-    <root id="root">
-      <element id="artifact" artifact-name="dist" />
-      <element id="dir-copy" path="$PROJECT_DIR$/dep" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.consulo/codeStyleSettings.xml b/.consulo/codeStyleSettings.xml
deleted file mode 100644
index f0072dc4..00000000
--- a/.consulo/codeStyleSettings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value />
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="MustBe" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.consulo/compiler.xml b/.consulo/compiler.xml
deleted file mode 100644
index 32463230..00000000
--- a/.consulo/compiler.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration" url="file://$PROJECT_DIR$/out" />
-  <component name="JavaCompilerConfiguration" compiler="JavacCompiler" add-not-null-assertions="true">
-    <annotation-processing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotation-processing>
-    <bytecode-target-level target="1.8" />
-  </component>
-  <component name="JavacCompilerConfiguration">
-    <option name="MAXIMUM_HEAP_SIZE" value="512" />
-  </component>
-  <component name="ResourceCompilerConfiguration">
-    <resourceExtensions />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.consulo/copyright/jetbrains_must_be.xml b/.consulo/copyright/jetbrains_must_be.xml
deleted file mode 100644
index 2030692c..00000000
--- a/.consulo/copyright/jetbrains_must_be.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright 2000-2005 JetBrains s.r.o&#10;#if(&amp;#36;{today.year} == 2013)&#10;Copyright &amp;#36;{today.year} must-be.org&#10;#else&#10;Copyright 2013-&amp;#36;{today.year} must-be.org&#10;#end&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
-    <option name="keyword" value="Copyright" />
-    <option name="myName" value="jetbrains+must-be" />
-  </copyright>
-</component>
\ No newline at end of file
diff --git a/.consulo/copyright/must_be.xml b/.consulo/copyright/must_be.xml
deleted file mode 100644
index 4325907f..00000000
--- a/.consulo/copyright/must_be.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="#if(&amp;#36;{today.year} == 2013)&#10;Copyright &amp;#36;{today.year} must-be.org&#10;#else&#10;Copyright 2013-&amp;#36;{today.year} must-be.org&#10;#end&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
-    <option name="keyword" value="Copyright" />
-    <option name="myName" value="must-be" />
-  </copyright>
-</component>
\ No newline at end of file
diff --git a/.consulo/copyright/profiles_settings.xml b/.consulo/copyright/profiles_settings.xml
deleted file mode 100644
index 2a77c1bc..00000000
--- a/.consulo/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="must-be">
-    <module2copyright>
-      <element module="package:com.intellij" copyright="jetbrains+must-be" />
-    </module2copyright>
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.consulo/encodings.xml b/.consulo/encodings.xml
deleted file mode 100644
index f7589596..00000000
--- a/.consulo/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.consulo/inspectionProfiles/Project_Default.xml b/.consulo/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 1735d953..00000000
--- a/.consulo/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Deprecation" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="IGNORE_ABSTRACT_DEPRECATED_OVERRIDES" value="false" />
-      <option name="IGNORE_IMPORT_STATEMENTS" value="false" />
-      <option name="IGNORE_METHODS_OF_DEPRECATED" value="false" />
-    </inspection_tool>
-    <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreObjectMethods" value="false" />
-      <option name="ignoreAnonymousClassMethods" value="false" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.consulo/inspectionProfiles/profiles_settings.xml b/.consulo/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b312839..00000000
--- a/.consulo/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml b/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
deleted file mode 100644
index a2442db6..00000000
--- a/.consulo/libraries/consulo_plugin__com_intellij_regexp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-  <library name="consulo-plugin: com.intellij.regexp">
-    <binaries>
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.regexp/lib/com.intellij.regexp-2-SNAPSHOT.jar!/" />
-    </binaries>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml b/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
deleted file mode 100644
index b936e506..00000000
--- a/.consulo/libraries/consulo_plugin__com_intellij_spellchecker.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-  <library name="consulo-plugin: com.intellij.spellchecker">
-    <binaries>
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.spellchecker/lib/com.intellij.spellchecker-2-SNAPSHOT.jar!/" />
-    </binaries>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__com_intellij_xml.xml b/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
deleted file mode 100644
index 4abd97bc..00000000
--- a/.consulo/libraries/consulo_plugin__com_intellij_xml.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="consulo-plugin: com.intellij.xml">
-    <binaries>
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/jing-20091111.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/rngom-20051226.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/trang-20091111.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xmlbeans-2.6.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xml-resolver-1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/xercesImpl-2.11.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/consulo.relaxng-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.dom.api-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.psi.api-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.dom.impl-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.psi.impl-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.intelliLang-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.analysis.api-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.spellchecker-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.analysis.impl-2-SNAPSHOT.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dep/com.intellij.xml/lib/com.intellij.xml-xml.structure.view.impl-2-SNAPSHOT.jar!/" />
-    </binaries>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml b/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
deleted file mode 100644
index 9a13b74c..00000000
--- a/.consulo/libraries/consulo_plugin__org_intellij_intelliLang.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-  <library name="consulo-plugin: org.intellij.intelliLang">
-    <binaries>
-      <root url="jar://$PROJECT_DIR$/dep/org.intellij.intelliLang/lib/org.intellij.intelliLang-2-SNAPSHOT.jar!/" />
-    </binaries>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.consulo/modules.xml b/.consulo/modules.xml
deleted file mode 100644
index 04dab99f..00000000
--- a/.consulo/modules.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ModuleManager">
-    <modules>
-      <module name="consulo-javascript" dirurl="file://$PROJECT_DIR$" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-name="Consulo SNAPSHOT" />
-          <extension id="java" sdk-name="1.8" language-level-name="JDK_1_8" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="inspections" />
-          <orderEntry type="module" module-name="intentions" />
-          <orderEntry type="library" name="consulo-plugin: com.intellij.xml" level="project" />
-          <orderEntry type="library" name="consulo-plugin: com.intellij.regexp" level="project" />
-        </module-layer>
-      </module>
-      <module name="inspections" dirurl="file://$PROJECT_DIR$/inspections" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" />
-          <orderEntry type="library" name="consulo-plugin: com.intellij.xml" level="project" />
-        </module-layer>
-      </module>
-      <module name="intentions" dirurl="file://$PROJECT_DIR$/intentions" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION_RESOURCE" url="file://$MODULE_DIR$/resources" />
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" />
-          <orderEntry type="library" name="consulo-plugin: com.intellij.xml" level="project" />
-        </module-layer>
-      </module>
-      <module name="client-javascript-impl" dirurl="file://$PROJECT_DIR$/client-javascript-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" />
-        </module-layer>
-      </module>
-      <module name="json-javascript-impl" dirurl="file://$PROJECT_DIR$/json-javascript-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" exported="" />
-          <orderEntry type="library" name="consulo-plugin: com.intellij.xml" level="project" />
-        </module-layer>
-      </module>
-      <module name="debugger-impl/debugger-impl" dirurl="file://$PROJECT_DIR$/debugger-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" exported="" />
-        </module-layer>
-      </module>
-      <module name="debugger-impl/v8-debugger-impl" dirurl="file://$PROJECT_DIR$/v8-debugger-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="debugger-impl" />
-          <orderEntry type="module-library">
-            <library>
-              <binaries>
-                <root url="jar://$MODULE_DIR$/lib/json_simple-1.1.jar!/" />
-              </binaries>
-            </library>
-          </orderEntry>
-          <orderEntry type="module-library">
-            <library>
-              <binaries>
-                <root url="jar://$MODULE_DIR$/lib/lib.org.chromium.sdk.jar!/" />
-              </binaries>
-            </library>
-          </orderEntry>
-        </module-layer>
-      </module>
-      <module name="actionscript-impl" dirurl="file://$PROJECT_DIR$/actionscript-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="ecmascript4-impl" />
-        </module-layer>
-      </module>
-      <module name="javascript16-impl" dirurl="file://$PROJECT_DIR$/javascript16-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" />
-        </module-layer>
-      </module>
-      <module name="javascript17-impl" dirurl="file://$PROJECT_DIR$/javascript17-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" />
-        </module-layer>
-      </module>
-      <module name="javascript18-impl" dirurl="file://$PROJECT_DIR$/javascript18-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" />
-          <orderEntry type="module" module-name="javascript17-impl" />
-        </module-layer>
-      </module>
-      <module name="ecmascript6-impl" dirurl="file://$PROJECT_DIR$/ecmascript6-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" />
-        </module-layer>
-      </module>
-      <module name="ecmascript4-impl" dirurl="file://$PROJECT_DIR$/ecmascript4-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" exported="" />
-        </module-layer>
-      </module>
-      <module name="typescript-impl" dirurl="file://$PROJECT_DIR$/typescript-impl" current-layer="Default">
-        <module-layer name="Default">
-          <extension id="consulo-plugin" sdk-module-name="consulo-javascript" />
-          <extension id="java" sdk-module-name="consulo-javascript" language-level-module-name="consulo-javascript" />
-          <content url="file://$MODULE_DIR$">
-            <content-folder type="PRODUCTION" url="file://$MODULE_DIR$/src" />
-          </content>
-          <orderEntry type="module-extension-sdk" extension-id="consulo-plugin" />
-          <orderEntry type="module-extension-sdk" extension-id="java" />
-          <orderEntry type="sourceFolder" />
-          <orderEntry type="module" module-name="consulo-javascript" />
-        </module-layer>
-      </module>
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.consulo/runConfigurations/Unnamed.xml b/.consulo/runConfigurations/Unnamed.xml
deleted file mode 100644
index a2857f39..00000000
--- a/.consulo/runConfigurations/Unnamed.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Unnamed" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Consulo In Sandbox" singleton="true">
-    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="USE_ALT_CONSULO_SDK" value="false" />
-    <option name="ALT_CONSULO_SDK_PATH" />
-    <java-sdk name="1.8" />
-    <consulo-sdk name="Consulo SNAPSHOT" />
-    <artifact name="plugin" />
-    <predefined_log_file id="IDEA_LOG" enabled="true" />
-    <RunnerSettings RunnerId="ConsuloDebuggerRunner">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <ConfigurationWrapper RunnerId="ConsuloDebuggerRunner" />
-    <ConfigurationWrapper RunnerId="Cover" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="plugin" />
-      </option>
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.consulo/scopes/package_com_intellij.xml b/.consulo/scopes/package_com_intellij.xml
deleted file mode 100644
index f40e63b6..00000000
--- a/.consulo/scopes/package_com_intellij.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="package:com.intellij" pattern="com.intellij..*" />
-</component>
\ No newline at end of file
diff --git a/.consulo/scopes/scope_settings.xml b/.consulo/scopes/scope_settings.xml
deleted file mode 100644
index 922003b8..00000000
--- a/.consulo/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.consulo/uiDesigner.xml b/.consulo/uiDesigner.xml
deleted file mode 100644
index 2416d4c5..00000000
--- a/.consulo/uiDesigner.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-  <component name="uidesigner-configuration">
-    <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="false" />
-  </component>
-</project>
-
diff --git a/.consulo/vcs.xml b/.consulo/vcs.xml
deleted file mode 100644
index 275077f8..00000000
--- a/.consulo/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
-
diff --git a/.gitignore b/.gitignore
index 8e9a305f..d26fae78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-/.consulo/workspace.xml
+/.consulo
+!/.consulo/codeStyleSettings.xml
 /out
-/dep
-/.consulo/sandbox
+/target
+target/
\ No newline at end of file
diff --git a/impl/pom.xml b/impl/pom.xml
new file mode 100644
index 00000000..dc21459a
--- /dev/null
+++ b/impl/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>consulo-plugin</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>consulo.maven</groupId>
+				<artifactId>consulo-maven-plugin</artifactId>
+				<version>2-SNAPSHOT</version>
+				<extensions>true</extensions>
+				<configuration>
+					<repositoryChannel>nightly</repositoryChannel>
+					<dependencies>
+						<dependency>com.intellij.xml</dependency>
+					</dependencies>
+					<packaging>
+						<skip>${dev.mode}</skip>
+						<version>${build.number}</version>
+					</packaging>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>workspace</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xpath-xpath.lang</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xpath-xpath.view</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/src/com/intellij/javascript/JSClassNameMacro.java b/impl/src/main/java/com/intellij/javascript/JSClassNameMacro.java
similarity index 100%
rename from src/com/intellij/javascript/JSClassNameMacro.java
rename to impl/src/main/java/com/intellij/javascript/JSClassNameMacro.java
diff --git a/src/com/intellij/javascript/JSDebuggerSupportUtils.java b/impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
similarity index 100%
rename from src/com/intellij/javascript/JSDebuggerSupportUtils.java
rename to impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
diff --git a/src/com/intellij/javascript/JSImplementationTextSelectioner.java b/impl/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
similarity index 100%
rename from src/com/intellij/javascript/JSImplementationTextSelectioner.java
rename to impl/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
diff --git a/src/com/intellij/javascript/JSMethodNameMacro.java b/impl/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
similarity index 100%
rename from src/com/intellij/javascript/JSMethodNameMacro.java
rename to impl/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
diff --git a/src/com/intellij/javascript/JSParameterInfoHandler.java b/impl/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
similarity index 100%
rename from src/com/intellij/javascript/JSParameterInfoHandler.java
rename to impl/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
diff --git a/src/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
similarity index 100%
rename from src/com/intellij/javascript/documentation/JSDocumentationBuilder.java
rename to impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
diff --git a/src/com/intellij/javascript/documentation/JSDocumentationProcessor.java b/impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
similarity index 100%
rename from src/com/intellij/javascript/documentation/JSDocumentationProcessor.java
rename to impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
diff --git a/src/com/intellij/javascript/documentation/JSDocumentationProvider.java b/impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
similarity index 100%
rename from src/com/intellij/javascript/documentation/JSDocumentationProvider.java
rename to impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
diff --git a/src/com/intellij/javascript/documentation/JSDocumentationUtils.java b/impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
similarity index 100%
rename from src/com/intellij/javascript/documentation/JSDocumentationUtils.java
rename to impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
diff --git a/src/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java b/impl/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
similarity index 100%
rename from src/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
rename to impl/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
diff --git a/src/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java b/impl/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
similarity index 100%
rename from src/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
rename to impl/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
diff --git a/src/com/intellij/javascript/manipulators/JSDocTagManipulator.java b/impl/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
similarity index 100%
rename from src/com/intellij/javascript/manipulators/JSDocTagManipulator.java
rename to impl/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
diff --git a/src/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java b/impl/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
similarity index 100%
rename from src/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
rename to impl/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
diff --git a/src/com/intellij/lang/javascript/DialectOptionHolder.java b/impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/DialectOptionHolder.java
rename to impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
diff --git a/src/com/intellij/lang/javascript/JSDoc.flex b/impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex
similarity index 100%
rename from src/com/intellij/lang/javascript/JSDoc.flex
rename to impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex
diff --git a/src/com/intellij/lang/javascript/JSDocElementType.java b/impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JSDocElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
diff --git a/src/com/intellij/lang/javascript/JSDocTokenTypes.java b/impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JSDocTokenTypes.java
rename to impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
diff --git a/src/com/intellij/lang/javascript/JSElementType.java b/impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JSElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
diff --git a/src/com/intellij/lang/javascript/JSElementTypes.java b/impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JSElementTypes.java
rename to impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
diff --git a/src/com/intellij/lang/javascript/JSFlexAdapter.java b/impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JSFlexAdapter.java
rename to impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
diff --git a/src/com/intellij/lang/javascript/JSLanguageInjector.java b/impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JSLanguageInjector.java
rename to impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
diff --git a/src/com/intellij/lang/javascript/JSNodeVisitor.java b/impl/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JSNodeVisitor.java
rename to impl/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
diff --git a/src/com/intellij/lang/javascript/JSSmartEnterProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JSSmartEnterProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
diff --git a/src/com/intellij/lang/javascript/JSTokenTypes.java b/impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JSTokenTypes.java
rename to impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
diff --git a/src/com/intellij/lang/javascript/JavaScript.flex b/impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
similarity index 100%
rename from src/com/intellij/lang/javascript/JavaScript.flex
rename to impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
diff --git a/src/com/intellij/lang/javascript/JavaScriptBundle.java b/impl/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JavaScriptBundle.java
rename to impl/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java
diff --git a/src/com/intellij/lang/javascript/JavaScriptCodeContextType.java b/impl/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JavaScriptCodeContextType.java
rename to impl/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
diff --git a/src/com/intellij/lang/javascript/JavaScriptFileType.java b/impl/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JavaScriptFileType.java
rename to impl/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
diff --git a/src/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java b/impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
rename to impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
diff --git a/src/com/intellij/lang/javascript/JavaScriptIcons.java b/impl/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JavaScriptIcons.java
rename to impl/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
diff --git a/src/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java b/impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
rename to impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
diff --git a/src/com/intellij/lang/javascript/JavaScriptSupportLoader.java b/impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JavaScriptSupportLoader.java
rename to impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
diff --git a/src/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java b/impl/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
rename to impl/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
diff --git a/src/com/intellij/lang/javascript/JavascriptCommenter.java b/impl/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
similarity index 100%
rename from src/com/intellij/lang/javascript/JavascriptCommenter.java
rename to impl/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
diff --git a/src/com/intellij/lang/javascript/_JSDocLexer.java b/impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java
similarity index 100%
rename from src/com/intellij/lang/javascript/_JSDocLexer.java
rename to impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java
diff --git a/src/com/intellij/lang/javascript/_JavaScriptLexer.java b/impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
similarity index 100%
rename from src/com/intellij/lang/javascript/_JavaScriptLexer.java
rename to impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
diff --git a/src/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java b/impl/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java
similarity index 100%
rename from src/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java
rename to impl/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java
diff --git a/src/com/intellij/lang/javascript/findUsages/JSWordsScanner.java b/impl/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
similarity index 100%
rename from src/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
rename to impl/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
diff --git a/src/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java b/impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
diff --git a/src/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java b/impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
diff --git a/src/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java b/impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
diff --git a/src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java b/impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
similarity index 100%
rename from src/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
rename to impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
diff --git a/src/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java b/impl/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
diff --git a/src/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java b/impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
diff --git a/src/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java b/impl/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
diff --git a/src/com/intellij/lang/javascript/flex/FlexImportSupport.java b/impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/FlexImportSupport.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
diff --git a/src/com/intellij/lang/javascript/flex/ImportUtils.java b/impl/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/ImportUtils.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
diff --git a/src/com/intellij/lang/javascript/flex/JSResolveHelper.java b/impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/JSResolveHelper.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
diff --git a/src/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/Abc.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/Abc.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/AbcDumper.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/AbcDumper.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/ByteBuffer.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/FlexImporter.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/FlexImporter.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/LabelInfo.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/LabelInfo.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/MemberInfo.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/MemberInfo.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/MetaData.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/MetaData.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/MethodInfo.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/MethodInfo.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/Multiname.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/Multiname.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/SlotInfo.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/SlotInfo.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/Swf.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/Swf.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java
diff --git a/src/com/intellij/lang/javascript/flex/importer/Traits.java b/impl/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java
similarity index 100%
rename from src/com/intellij/lang/javascript/flex/importer/Traits.java
rename to impl/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java
diff --git a/src/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java b/impl/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
rename to impl/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
diff --git a/src/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form b/impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form
diff --git a/src/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
diff --git a/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
diff --git a/src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
diff --git a/src/com/intellij/lang/javascript/formatter/JSFormattingModel.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/JSFormattingModel.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
diff --git a/src/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
diff --git a/src/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java
diff --git a/src/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
diff --git a/src/com/intellij/lang/javascript/formatter/blocks/JSBlock.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
diff --git a/src/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
diff --git a/src/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java b/impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
rename to impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
diff --git a/src/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java b/impl/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
diff --git a/src/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java b/impl/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java
diff --git a/src/com/intellij/lang/javascript/generation/JSNamedElementNode.java b/impl/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/JSNamedElementNode.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
diff --git a/src/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java b/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
diff --git a/src/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java b/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java
diff --git a/src/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java b/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java
diff --git a/src/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java b/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java
diff --git a/src/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java b/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java
diff --git a/src/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java b/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java
diff --git a/src/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java b/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java
diff --git a/src/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java b/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java
diff --git a/src/com/intellij/lang/javascript/generation/OverrideMethodsFix.java b/impl/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java
similarity index 100%
rename from src/com/intellij/lang/javascript/generation/OverrideMethodsFix.java
rename to impl/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java
diff --git a/src/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java b/impl/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
similarity index 100%
rename from src/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
rename to impl/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
diff --git a/src/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
similarity index 100%
rename from src/com/intellij/lang/javascript/highlighting/JSHighlighter.java
rename to impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
diff --git a/src/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java b/impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
similarity index 100%
rename from src/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
rename to impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
diff --git a/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
rename to impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
diff --git a/src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java b/impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
similarity index 100%
rename from src/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
rename to impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
diff --git a/src/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java b/impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
diff --git a/src/com/intellij/lang/javascript/index/JSItemPresentation.java b/impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
similarity index 100%
rename from src/com/intellij/lang/javascript/index/JSItemPresentation.java
rename to impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
diff --git a/src/com/intellij/lang/javascript/index/JSSymbolUtil.java b/impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
similarity index 100%
rename from src/com/intellij/lang/javascript/index/JSSymbolUtil.java
rename to impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
diff --git a/src/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java b/impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
similarity index 100%
rename from src/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
rename to impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
diff --git a/src/com/intellij/lang/javascript/index/JavaScriptIndex.java b/impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
similarity index 100%
rename from src/com/intellij/lang/javascript/index/JavaScriptIndex.java
rename to impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
diff --git a/src/com/intellij/lang/javascript/index/predefined/Marker.java b/impl/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java
similarity index 100%
rename from src/com/intellij/lang/javascript/index/predefined/Marker.java
rename to impl/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java
diff --git a/src/com/intellij/lang/javascript/inspections/CreateClassDialog.form b/impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/CreateClassDialog.form
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form
diff --git a/src/com/intellij/lang/javascript/inspections/CreateClassDialog.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/CreateClassDialog.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java
diff --git a/src/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
diff --git a/src/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
diff --git a/src/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
diff --git a/src/com/intellij/lang/javascript/inspections/JSInspection.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/JSInspection.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
diff --git a/src/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java
diff --git a/src/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
diff --git a/src/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
diff --git a/src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
diff --git a/src/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
diff --git a/src/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
diff --git a/src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
similarity index 100%
rename from src/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
rename to impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
diff --git a/src/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java b/impl/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java
diff --git a/src/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java b/impl/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
rename to impl/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
diff --git a/src/com/intellij/lang/javascript/parsing/JSDocParsing.java b/impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
similarity index 100%
rename from src/com/intellij/lang/javascript/parsing/JSDocParsing.java
rename to impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
diff --git a/src/com/intellij/lang/javascript/psi/JSArgumentList.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSArgumentList.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
diff --git a/src/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSAssignmentExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSAttribute.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSAttribute.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
diff --git a/src/com/intellij/lang/javascript/psi/JSAttributeList.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSAttributeList.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
diff --git a/src/com/intellij/lang/javascript/psi/JSAttributeListOwner.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
diff --git a/src/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
diff --git a/src/com/intellij/lang/javascript/psi/JSBinaryExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSBinaryExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSBlockStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSBlockStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSBreakStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSBreakStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSCallExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSCallExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSCaseClause.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSCaseClause.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
diff --git a/src/com/intellij/lang/javascript/psi/JSCatchBlock.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSCatchBlock.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
diff --git a/src/com/intellij/lang/javascript/psi/JSClass.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSClass.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
diff --git a/src/com/intellij/lang/javascript/psi/JSCommaExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSCommaExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSConditionalExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSConditionalExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSContinueStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSContinueStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSDefinitionExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSDoWhileStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSDocComment.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSDocComment.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
diff --git a/src/com/intellij/lang/javascript/psi/JSDocTag.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSDocTag.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
diff --git a/src/com/intellij/lang/javascript/psi/JSDocTagValue.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSDocTagValue.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java
diff --git a/src/com/intellij/lang/javascript/psi/JSElement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSElement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSElementFactory.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSElementFactory.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
diff --git a/src/com/intellij/lang/javascript/psi/JSElementVisitor.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSElementVisitor.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
diff --git a/src/com/intellij/lang/javascript/psi/JSEmptyStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSEmptyStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java
diff --git a/src/com/intellij/lang/javascript/psi/JSExpressionStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSExpressionStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSFile.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSFile.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
diff --git a/src/com/intellij/lang/javascript/psi/JSForInStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSForInStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSForStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSForStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSFunction.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSFunction.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
diff --git a/src/com/intellij/lang/javascript/psi/JSFunctionExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSFunctionExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSGenericSignature.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSGenericSignature.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
diff --git a/src/com/intellij/lang/javascript/psi/JSIfStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSIfStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSImportStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSImportStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSIncludeDirective.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSIncludeDirective.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
diff --git a/src/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSLabeledStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSLabeledStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSLetExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSLetExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSLetStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSLetStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSLiteralExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSLiteralExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSLoopStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSLoopStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSNamedElement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSNamedElement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
diff --git a/src/com/intellij/lang/javascript/psi/JSNewExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSNewExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSPackageStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSPackageStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSParameter.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSParameter.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
diff --git a/src/com/intellij/lang/javascript/psi/JSParameterList.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSParameterList.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
diff --git a/src/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSPostfixExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSPostfixExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSPrefixExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSProperty.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSProperty.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
diff --git a/src/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSReferenceExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSReferenceExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSReferenceList.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSReferenceList.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
diff --git a/src/com/intellij/lang/javascript/psi/JSReturnStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSReturnStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSSourceElement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSSourceElement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSStubElementType.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSStubElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
diff --git a/src/com/intellij/lang/javascript/psi/JSSuperExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSSuperExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSSuppressionHolder.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
diff --git a/src/com/intellij/lang/javascript/psi/JSSwitchStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSSwitchStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSThisExpression.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSThisExpression.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
diff --git a/src/com/intellij/lang/javascript/psi/JSThrowStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSThrowStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSTryStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSTryStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
diff --git a/src/com/intellij/lang/javascript/psi/JSVarStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSVarStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSVariable.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSVariable.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
diff --git a/src/com/intellij/lang/javascript/psi/JSWhileStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSWhileStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSWithStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSWithStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/JSYieldStatement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/JSYieldStatement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSClassBase.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSElementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
diff --git a/src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
diff --git a/src/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
diff --git a/src/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
diff --git a/src/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
diff --git a/src/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java b/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
diff --git a/src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
diff --git a/src/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
diff --git a/src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
diff --git a/src/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSClassStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSStubElement.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java b/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
diff --git a/src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
diff --git a/src/com/intellij/lang/javascript/psi/util/JSUtils.java b/impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
similarity index 100%
rename from src/com/intellij/lang/javascript/psi/util/JSUtils.java
rename to impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
diff --git a/src/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java
diff --git a/src/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java
diff --git a/src/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java
diff --git a/src/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java
diff --git a/src/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
diff --git a/src/com/intellij/lang/javascript/refactoring/JSNamesValidator.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/JSNamesValidator.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java
diff --git a/src/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
diff --git a/src/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form b/impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form
diff --git a/src/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java
diff --git a/src/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
diff --git a/src/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java
diff --git a/src/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java b/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java
similarity index 100%
rename from src/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java
rename to impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java
diff --git a/src/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java b/impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
diff --git a/src/com/intellij/lang/javascript/search/JSClassSearch.java b/impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
similarity index 100%
rename from src/com/intellij/lang/javascript/search/JSClassSearch.java
rename to impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
diff --git a/src/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java b/impl/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
similarity index 100%
rename from src/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
rename to impl/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
diff --git a/src/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java b/impl/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
rename to impl/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
diff --git a/src/com/intellij/lang/javascript/search/JSFunctionsSearch.java b/impl/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
similarity index 100%
rename from src/com/intellij/lang/javascript/search/JSFunctionsSearch.java
rename to impl/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
diff --git a/src/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java b/impl/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
similarity index 100%
rename from src/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
rename to impl/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
diff --git a/src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java b/impl/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
rename to impl/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
diff --git a/src/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java b/impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
similarity index 100%
rename from src/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
rename to impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
diff --git a/src/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java b/impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
similarity index 100%
rename from src/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
rename to impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
diff --git a/src/com/intellij/lang/javascript/structureView/JSStructureViewElement.java b/impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
similarity index 100%
rename from src/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
rename to impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
diff --git a/src/com/intellij/lang/javascript/structureView/JSStructureViewModel.java b/impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
similarity index 100%
rename from src/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
rename to impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
diff --git a/src/com/intellij/lang/javascript/structureView/JSSuperGroup.java b/impl/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
similarity index 100%
rename from src/com/intellij/lang/javascript/structureView/JSSuperGroup.java
rename to impl/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
diff --git a/src/com/intellij/lang/javascript/structureView/JSSuperGrouper.java b/impl/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
similarity index 100%
rename from src/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
rename to impl/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java
diff --git a/src/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java b/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java
similarity index 100%
rename from src/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java
rename to impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java
diff --git a/src/com/intellij/lang/javascript/types/JSAttributeElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSAttributeElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSAttributeListElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSAttributeListElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
diff --git a/src/com/intellij/lang/javascript/types/JSClassElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSClassElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSFileElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSFileElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSFunctionElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSFunctionElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSImportStatementElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSImportStatementElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSPackageStatementElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSParameterElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSParameterElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSParameterListElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSParameterListElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSReferenceListElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
diff --git a/src/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSVarStatementElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
diff --git a/src/com/intellij/lang/javascript/types/JSVariableElementType.java b/impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
similarity index 100%
rename from src/com/intellij/lang/javascript/types/JSVariableElementType.java
rename to impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
diff --git a/src/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java b/impl/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
similarity index 100%
rename from src/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
rename to impl/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
diff --git a/src/com/intellij/lang/javascript/validation/ImplementMethodsFix.java b/impl/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
similarity index 100%
rename from src/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
rename to impl/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
diff --git a/src/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java b/impl/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
rename to impl/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
diff --git a/src/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java b/impl/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
similarity index 100%
rename from src/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
rename to impl/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
diff --git a/src/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
similarity index 100%
rename from src/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
rename to impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
diff --git a/src/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java b/impl/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
similarity index 100%
rename from src/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
rename to impl/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
diff --git a/src/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java b/impl/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
similarity index 100%
rename from src/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
rename to impl/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
diff --git a/src/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java b/impl/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
similarity index 100%
rename from src/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
rename to impl/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
diff --git a/src/consulo/javascript/formatter/JavaScriptCodeStylePanel.java b/impl/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
similarity index 100%
rename from src/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
rename to impl/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
diff --git a/src/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/impl/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
similarity index 100%
rename from src/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
rename to impl/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
diff --git a/src/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java b/impl/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
similarity index 100%
rename from src/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
rename to impl/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
diff --git a/src/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/impl/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
similarity index 100%
rename from src/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
rename to impl/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
diff --git a/src/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
similarity index 100%
rename from src/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
rename to impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
diff --git a/src/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java b/impl/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
similarity index 100%
rename from src/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
rename to impl/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
diff --git a/src/consulo/javascript/ide/completion/SpaceInsertHandler.java b/impl/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java
similarity index 100%
rename from src/consulo/javascript/ide/completion/SpaceInsertHandler.java
rename to impl/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java
diff --git a/src/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java b/impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
similarity index 100%
rename from src/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
rename to impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
diff --git a/src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
similarity index 100%
rename from src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
rename to impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
diff --git a/src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java b/impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
similarity index 100%
rename from src/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
rename to impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
diff --git a/src/consulo/javascript/index/JavaScriptIndexer.java b/impl/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
similarity index 100%
rename from src/consulo/javascript/index/JavaScriptIndexer.java
rename to impl/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
diff --git a/src/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
similarity index 100%
rename from src/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
rename to impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
diff --git a/src/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
similarity index 100%
rename from src/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
rename to impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
diff --git a/src/consulo/javascript/lang/JavaScript15LanguageVersion.java b/impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScript15LanguageVersion.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
diff --git a/src/consulo/javascript/lang/JavaScriptConstants.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptConstants.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptConstants.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptConstants.java
diff --git a/src/consulo/javascript/lang/JavaScriptFeature.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptFeature.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
diff --git a/src/consulo/javascript/lang/JavaScriptFileTypeFactory.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptFileTypeFactory.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
diff --git a/src/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
diff --git a/src/consulo/javascript/lang/JavaScriptLanguage.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptLanguage.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
diff --git a/src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
diff --git a/src/consulo/javascript/lang/JavaScriptParsingDefinition.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptParsingDefinition.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
diff --git a/src/consulo/javascript/lang/JavaScriptQuoteHandler.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptQuoteHandler.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
diff --git a/src/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
diff --git a/src/consulo/javascript/lang/JavaScriptTokenSets.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptTokenSets.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
diff --git a/src/consulo/javascript/lang/JavaScriptVersionUtil.java b/impl/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
similarity index 100%
rename from src/consulo/javascript/lang/JavaScriptVersionUtil.java
rename to impl/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
diff --git a/src/consulo/javascript/lang/StandardJavaScriptVersions.java b/impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
similarity index 100%
rename from src/consulo/javascript/lang/StandardJavaScriptVersions.java
rename to impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
diff --git a/src/consulo/javascript/lang/lexer/JavaScript15Lexer.java b/impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java
similarity index 100%
rename from src/consulo/javascript/lang/lexer/JavaScript15Lexer.java
rename to impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java
diff --git a/src/consulo/javascript/lang/lexer/javascript15.flex b/impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
similarity index 100%
rename from src/consulo/javascript/lang/lexer/javascript15.flex
rename to impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
diff --git a/src/consulo/javascript/lang/navigation/JavaScriptClassContributor.java b/impl/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
similarity index 100%
rename from src/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
rename to impl/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
diff --git a/src/consulo/javascript/lang/parsing/ContextKeywordCache.java b/impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
similarity index 100%
rename from src/consulo/javascript/lang/parsing/ContextKeywordCache.java
rename to impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
diff --git a/src/consulo/javascript/lang/parsing/ExpressionParsing.java b/impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
similarity index 100%
rename from src/consulo/javascript/lang/parsing/ExpressionParsing.java
rename to impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
diff --git a/src/consulo/javascript/lang/parsing/FunctionParsing.java b/impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
similarity index 100%
rename from src/consulo/javascript/lang/parsing/FunctionParsing.java
rename to impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
diff --git a/src/consulo/javascript/lang/parsing/JavaScriptParser.java b/impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
similarity index 100%
rename from src/consulo/javascript/lang/parsing/JavaScriptParser.java
rename to impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
diff --git a/src/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java b/impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
similarity index 100%
rename from src/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
rename to impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
diff --git a/src/consulo/javascript/lang/parsing/JavaScriptParsingContext.java b/impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
similarity index 100%
rename from src/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
rename to impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
diff --git a/src/consulo/javascript/lang/parsing/Parsing.java b/impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
similarity index 100%
rename from src/consulo/javascript/lang/parsing/Parsing.java
rename to impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
diff --git a/src/consulo/javascript/lang/parsing/StatementParsing.java b/impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
similarity index 100%
rename from src/consulo/javascript/lang/parsing/StatementParsing.java
rename to impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
diff --git a/src/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java b/impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
similarity index 100%
rename from src/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
rename to impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
diff --git a/src/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java b/impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
similarity index 100%
rename from src/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
rename to impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
diff --git a/src/consulo/javascript/lang/psi/JavaScriptSimpleType.java b/impl/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
similarity index 100%
rename from src/consulo/javascript/lang/psi/JavaScriptSimpleType.java
rename to impl/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
diff --git a/src/consulo/javascript/lang/psi/JavaScriptType.java b/impl/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
similarity index 100%
rename from src/consulo/javascript/lang/psi/JavaScriptType.java
rename to impl/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
diff --git a/src/consulo/javascript/lang/psi/JavaScriptTypeElement.java b/impl/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
similarity index 100%
rename from src/consulo/javascript/lang/psi/JavaScriptTypeElement.java
rename to impl/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
diff --git a/src/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
similarity index 100%
rename from src/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
rename to impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
diff --git a/src/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java b/impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
similarity index 100%
rename from src/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
rename to impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
diff --git a/src/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java b/impl/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
similarity index 100%
rename from src/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
rename to impl/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
diff --git a/src/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/impl/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
similarity index 100%
rename from src/consulo/javascript/module/extension/JavaScriptModuleExtension.java
rename to impl/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
diff --git a/src/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/impl/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
similarity index 100%
rename from src/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
rename to impl/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
diff --git a/src/consulo/javascript/psi/JSComputedName.java b/impl/src/main/java/consulo/javascript/psi/JSComputedName.java
similarity index 100%
rename from src/consulo/javascript/psi/JSComputedName.java
rename to impl/src/main/java/consulo/javascript/psi/JSComputedName.java
diff --git a/src/consulo/javascript/psi/JSSimpleLiteralExpression.java b/impl/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
similarity index 100%
rename from src/consulo/javascript/psi/JSSimpleLiteralExpression.java
rename to impl/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
diff --git a/src/consulo/javascript/psi/JavaScriptLambdaExpression.java b/impl/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
similarity index 100%
rename from src/consulo/javascript/psi/JavaScriptLambdaExpression.java
rename to impl/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
diff --git a/src/consulo/javascript/psi/impl/JSComputedNameImpl.java b/impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
similarity index 100%
rename from src/consulo/javascript/psi/impl/JSComputedNameImpl.java
rename to impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
diff --git a/src/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java b/impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
similarity index 100%
rename from src/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
rename to impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
diff --git a/src/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/impl/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
similarity index 100%
rename from src/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
rename to impl/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
diff --git a/src/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/impl/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
similarity index 100%
rename from src/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
rename to impl/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
diff --git a/src/consulo/javascript/psi/stubs/JSFileStub.java b/impl/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
similarity index 100%
rename from src/consulo/javascript/psi/stubs/JSFileStub.java
rename to impl/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
diff --git a/src/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java b/impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
similarity index 100%
rename from src/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
rename to impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
diff --git a/src/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java b/impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
similarity index 100%
rename from src/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
rename to impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
diff --git a/src/consulo/javascript/types/JSQualifiedStubElementType.java b/impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
similarity index 100%
rename from src/consulo/javascript/types/JSQualifiedStubElementType.java
rename to impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
diff --git a/resources/META-INF/Inspections.xml b/impl/src/main/resources/META-INF/Inspections.xml
similarity index 100%
rename from resources/META-INF/Inspections.xml
rename to impl/src/main/resources/META-INF/Inspections.xml
diff --git a/resources/META-INF/Intentions.xml b/impl/src/main/resources/META-INF/Intentions.xml
similarity index 100%
rename from resources/META-INF/Intentions.xml
rename to impl/src/main/resources/META-INF/Intentions.xml
diff --git a/resources/META-INF/actionscript.xml b/impl/src/main/resources/META-INF/actionscript.xml
similarity index 100%
rename from resources/META-INF/actionscript.xml
rename to impl/src/main/resources/META-INF/actionscript.xml
diff --git a/resources/META-INF/ecma4.xml b/impl/src/main/resources/META-INF/ecma4.xml
similarity index 100%
rename from resources/META-INF/ecma4.xml
rename to impl/src/main/resources/META-INF/ecma4.xml
diff --git a/resources/META-INF/ecma6.xml b/impl/src/main/resources/META-INF/ecma6.xml
similarity index 100%
rename from resources/META-INF/ecma6.xml
rename to impl/src/main/resources/META-INF/ecma6.xml
diff --git a/resources/META-INF/json.xml b/impl/src/main/resources/META-INF/json.xml
similarity index 100%
rename from resources/META-INF/json.xml
rename to impl/src/main/resources/META-INF/json.xml
diff --git a/resources/META-INF/plugin.xml b/impl/src/main/resources/META-INF/plugin.xml
similarity index 100%
rename from resources/META-INF/plugin.xml
rename to impl/src/main/resources/META-INF/plugin.xml
diff --git a/resources/META-INF/regexp.xml b/impl/src/main/resources/META-INF/regexp.xml
similarity index 100%
rename from resources/META-INF/regexp.xml
rename to impl/src/main/resources/META-INF/regexp.xml
diff --git a/resources/META-INF/typescript.xml b/impl/src/main/resources/META-INF/typescript.xml
similarity index 100%
rename from resources/META-INF/typescript.xml
rename to impl/src/main/resources/META-INF/typescript.xml
diff --git a/resources/codeStyle/blankLines.txt b/impl/src/main/resources/codeStyle/blankLines.txt
similarity index 100%
rename from resources/codeStyle/blankLines.txt
rename to impl/src/main/resources/codeStyle/blankLines.txt
diff --git a/resources/codeStyle/indent.txt b/impl/src/main/resources/codeStyle/indent.txt
similarity index 100%
rename from resources/codeStyle/indent.txt
rename to impl/src/main/resources/codeStyle/indent.txt
diff --git a/resources/codeStyle/spacing.txt b/impl/src/main/resources/codeStyle/spacing.txt
similarity index 100%
rename from resources/codeStyle/spacing.txt
rename to impl/src/main/resources/codeStyle/spacing.txt
diff --git a/resources/codeStyle/wrapping.txt b/impl/src/main/resources/codeStyle/wrapping.txt
similarity index 100%
rename from resources/codeStyle/wrapping.txt
rename to impl/src/main/resources/codeStyle/wrapping.txt
diff --git a/resources/com/intellij/lang/javascript/flex/flex.png b/impl/src/main/resources/com/intellij/lang/javascript/flex/flex.png
similarity index 100%
rename from resources/com/intellij/lang/javascript/flex/flex.png
rename to impl/src/main/resources/com/intellij/lang/javascript/flex/flex.png
diff --git a/resources/fileTemplates/internal/JavaScriptFile.js.ft b/impl/src/main/resources/fileTemplates/internal/JavaScriptFile.js.ft
similarity index 100%
rename from resources/fileTemplates/internal/JavaScriptFile.js.ft
rename to impl/src/main/resources/fileTemplates/internal/JavaScriptFile.js.ft
diff --git a/resources/icons/as.png b/impl/src/main/resources/icons/as.png
similarity index 100%
rename from resources/icons/as.png
rename to impl/src/main/resources/icons/as.png
diff --git a/resources/icons/as@2x.png b/impl/src/main/resources/icons/as@2x.png
similarity index 100%
rename from resources/icons/as@2x.png
rename to impl/src/main/resources/icons/as@2x.png
diff --git a/resources/icons/ecmaScript.png b/impl/src/main/resources/icons/ecmaScript.png
similarity index 100%
rename from resources/icons/ecmaScript.png
rename to impl/src/main/resources/icons/ecmaScript.png
diff --git a/resources/icons/ecmaScript@2x.png b/impl/src/main/resources/icons/ecmaScript@2x.png
similarity index 100%
rename from resources/icons/ecmaScript@2x.png
rename to impl/src/main/resources/icons/ecmaScript@2x.png
diff --git a/resources/icons/javaScript.png b/impl/src/main/resources/icons/javaScript.png
similarity index 100%
rename from resources/icons/javaScript.png
rename to impl/src/main/resources/icons/javaScript.png
diff --git a/resources/icons/javaScript@2x.png b/impl/src/main/resources/icons/javaScript@2x.png
similarity index 100%
rename from resources/icons/javaScript@2x.png
rename to impl/src/main/resources/icons/javaScript@2x.png
diff --git a/resources/icons/json.png b/impl/src/main/resources/icons/json.png
similarity index 100%
rename from resources/icons/json.png
rename to impl/src/main/resources/icons/json.png
diff --git a/resources/icons/json@2x.png b/impl/src/main/resources/icons/json@2x.png
similarity index 100%
rename from resources/icons/json@2x.png
rename to impl/src/main/resources/icons/json@2x.png
diff --git a/resources/icons/jsx.png b/impl/src/main/resources/icons/jsx.png
similarity index 100%
rename from resources/icons/jsx.png
rename to impl/src/main/resources/icons/jsx.png
diff --git a/resources/icons/jsx@2x.png b/impl/src/main/resources/icons/jsx@2x.png
similarity index 100%
rename from resources/icons/jsx@2x.png
rename to impl/src/main/resources/icons/jsx@2x.png
diff --git a/resources/icons/typeScript.png b/impl/src/main/resources/icons/typeScript.png
similarity index 100%
rename from resources/icons/typeScript.png
rename to impl/src/main/resources/icons/typeScript.png
diff --git a/resources/icons/typeScript@2x.png b/impl/src/main/resources/icons/typeScript@2x.png
similarity index 100%
rename from resources/icons/typeScript@2x.png
rename to impl/src/main/resources/icons/typeScript@2x.png
diff --git a/resources/inspectionDescriptions/JSDeprecatedSymbols.html b/impl/src/main/resources/inspectionDescriptions/JSDeprecatedSymbols.html
similarity index 100%
rename from resources/inspectionDescriptions/JSDeprecatedSymbols.html
rename to impl/src/main/resources/inspectionDescriptions/JSDeprecatedSymbols.html
diff --git a/resources/inspectionDescriptions/JSDuplicatedDeclaration.html b/impl/src/main/resources/inspectionDescriptions/JSDuplicatedDeclaration.html
similarity index 100%
rename from resources/inspectionDescriptions/JSDuplicatedDeclaration.html
rename to impl/src/main/resources/inspectionDescriptions/JSDuplicatedDeclaration.html
diff --git a/resources/inspectionDescriptions/JSUndeclaredVariable.html b/impl/src/main/resources/inspectionDescriptions/JSUndeclaredVariable.html
similarity index 100%
rename from resources/inspectionDescriptions/JSUndeclaredVariable.html
rename to impl/src/main/resources/inspectionDescriptions/JSUndeclaredVariable.html
diff --git a/resources/inspectionDescriptions/JSUnresolvedFunction.html b/impl/src/main/resources/inspectionDescriptions/JSUnresolvedFunction.html
similarity index 100%
rename from resources/inspectionDescriptions/JSUnresolvedFunction.html
rename to impl/src/main/resources/inspectionDescriptions/JSUnresolvedFunction.html
diff --git a/resources/inspectionDescriptions/JSUnresolvedVariable.html b/impl/src/main/resources/inspectionDescriptions/JSUnresolvedVariable.html
similarity index 100%
rename from resources/inspectionDescriptions/JSUnresolvedVariable.html
rename to impl/src/main/resources/inspectionDescriptions/JSUnresolvedVariable.html
diff --git a/resources/inspectionDescriptions/JSUntypedDeclaration.html b/impl/src/main/resources/inspectionDescriptions/JSUntypedDeclaration.html
similarity index 100%
rename from resources/inspectionDescriptions/JSUntypedDeclaration.html
rename to impl/src/main/resources/inspectionDescriptions/JSUntypedDeclaration.html
diff --git a/resources/inspectionDescriptions/JSUnusedLocalSymbols.html b/impl/src/main/resources/inspectionDescriptions/JSUnusedLocalSymbols.html
similarity index 100%
rename from resources/inspectionDescriptions/JSUnusedLocalSymbols.html
rename to impl/src/main/resources/inspectionDescriptions/JSUnusedLocalSymbols.html
diff --git a/resources/messages/JavaScriptBundle.properties b/impl/src/main/resources/messages/JavaScriptBundle.properties
similarity index 100%
rename from resources/messages/JavaScriptBundle.properties
rename to impl/src/main/resources/messages/JavaScriptBundle.properties
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..6aa451b9
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.managment</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript.parent</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<modules>
+
+	</modules>
+</project>
\ No newline at end of file

From 780b9acd2bc6584cc36928279c62b31b4db7c0e2 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 23 Dec 2017 16:22:20 +0300
Subject: [PATCH 029/340] working on mavenize

---
 base-api/pom.xml                              |  51 ++++++++++++++
 .../lang/javascript/JavaScriptBundle.java     |   0
 .../lang/javascript/JavaScriptFileType.java   |   8 +--
 .../lang/javascript/JavaScriptIcons.java      |   0
 .../formatter/JSCodeStyleSettings.java        |   0
 .../lang/javascript/psi/JSArgumentList.java   |   0
 .../psi/JSArrayLiteralExpression.java         |   0
 .../psi/JSAssignmentExpression.java           |   0
 .../lang/javascript/psi/JSAttribute.java      |   0
 .../lang/javascript/psi/JSAttributeList.java  |   0
 .../javascript/psi/JSAttributeListOwner.java  |   0
 .../psi/JSAttributeNameValuePair.java         |   0
 .../javascript/psi/JSBinaryExpression.java    |   0
 .../lang/javascript/psi/JSBlockStatement.java |   0
 .../lang/javascript/psi/JSBreakStatement.java |   0
 .../lang/javascript/psi/JSCallExpression.java |   0
 .../lang/javascript/psi/JSCaseClause.java     |   0
 .../lang/javascript/psi/JSCatchBlock.java     |   0
 .../intellij/lang/javascript/psi/JSClass.java |   0
 .../javascript/psi/JSCommaExpression.java     |   0
 .../psi/JSConditionalExpression.java          |   0
 .../javascript/psi/JSContinueStatement.java   |   0
 .../psi/JSDefinitionExpression.java           |   0
 .../javascript/psi/JSDoWhileStatement.java    |   0
 .../lang/javascript/psi/JSDocComment.java     |   0
 .../lang/javascript/psi/JSDocTag.java         |   0
 .../lang/javascript/psi/JSDocTagValue.java    |   0
 .../lang/javascript/psi/JSElement.java        |   0
 .../lang/javascript/psi/JSElementVisitor.java |   0
 .../lang/javascript/psi/JSEmptyStatement.java |   0
 .../lang/javascript/psi/JSExpression.java     |   0
 .../psi/JSExpressionCodeFragment.java         |   0
 .../javascript/psi/JSExpressionStatement.java |   0
 .../intellij/lang/javascript/psi/JSFile.java  |   0
 .../lang/javascript/psi/JSForInStatement.java |   0
 .../lang/javascript/psi/JSForStatement.java   |   0
 .../lang/javascript/psi/JSFunction.java       |   0
 .../javascript/psi/JSFunctionExpression.java  |   0
 .../javascript/psi/JSGenericSignature.java    |   0
 .../lang/javascript/psi/JSIfStatement.java    |   0
 .../javascript/psi/JSImportStatement.java     |   0
 .../javascript/psi/JSIncludeDirective.java    |   0
 .../JSIndexedPropertyAccessExpression.java    |   0
 .../javascript/psi/JSLabeledStatement.java    |   0
 .../lang/javascript/psi/JSLetExpression.java  |   0
 .../lang/javascript/psi/JSLetStatement.java   |   0
 .../javascript/psi/JSLiteralExpression.java   |   0
 .../lang/javascript/psi/JSLoopStatement.java  |   0
 .../lang/javascript/psi/JSNamedElement.java   |   0
 .../psi/JSNamespaceDeclaration.java           |   0
 .../lang/javascript/psi/JSNewExpression.java  |   0
 .../psi/JSObjectLiteralExpression.java        |   0
 .../javascript/psi/JSPackageStatement.java    |   0
 .../lang/javascript/psi/JSParameter.java      |   0
 .../lang/javascript/psi/JSParameterList.java  |   0
 .../psi/JSParenthesizedExpression.java        |   0
 .../javascript/psi/JSPostfixExpression.java   |   0
 .../javascript/psi/JSPrefixExpression.java    |   0
 .../lang/javascript/psi/JSProperty.java       |   0
 .../psi/JSQualifiedNamedElement.java          |   0
 .../javascript/psi/JSReferenceExpression.java |   0
 .../lang/javascript/psi/JSReferenceList.java  |   0
 .../javascript/psi/JSReturnStatement.java     |   0
 .../lang/javascript/psi/JSSourceElement.java  |   0
 .../lang/javascript/psi/JSStatement.java      |   0
 .../javascript/psi/JSSuperExpression.java     |   0
 .../javascript/psi/JSSuppressionHolder.java   |   0
 .../javascript/psi/JSSwitchStatement.java     |   0
 .../lang/javascript/psi/JSThisExpression.java |   0
 .../lang/javascript/psi/JSThrowStatement.java |   0
 .../lang/javascript/psi/JSTryStatement.java   |   0
 .../psi/JSUseNamespaceDirective.java          |   0
 .../lang/javascript/psi/JSVarStatement.java   |   0
 .../lang/javascript/psi/JSVariable.java       |   0
 .../lang/javascript/psi/JSWhileStatement.java |   0
 .../lang/javascript/psi/JSWithStatement.java  |   0
 .../lang/javascript/psi/JSYieldStatement.java |   0
 .../psi/stubs/JSAttributeListStub.java        |   0
 .../stubs/JSAttributeNameValuePairStub.java   |   0
 .../javascript/psi/stubs/JSAttributeStub.java |   0
 .../javascript/psi/stubs/JSClassStub.java     |   0
 .../javascript/psi/stubs/JSFunctionStub.java  |   0
 .../psi/stubs/JSImportStatementStub.java      |   0
 .../psi/stubs/JSIncludeDirectiveStub.java     |   0
 .../psi/stubs/JSNamespaceDeclarationStub.java |   0
 .../psi/stubs/JSPackageStatementStub.java     |   0
 .../psi/stubs/JSParameterListStub.java        |   0
 .../javascript/psi/stubs/JSParameterStub.java |   0
 .../javascript/psi/stubs/JSQualifiedStub.java |   0
 .../psi/stubs/JSReferenceListStub.java        |   0
 .../javascript/psi/stubs/JSStubElement.java   |   3 -
 .../stubs/JSUseNamespaceDirectiveStub.java    |   0
 .../psi/stubs/JSVarStatementStub.java         |   0
 .../javascript/psi/stubs/JSVariableStub.java  |   0
 .../psi/stubs/JSVariableStubBase.java         |   0
 .../javascript/index/JavaScriptIndexer.java   |   0
 .../javascript/lang/JavaScriptConstants.java  |   0
 .../javascript/lang/JavaScriptFeature.java    |   0
 .../lang/JavaScriptFileTypeWithVersion.java   |   0
 .../javascript/lang/JavaScriptLanguage.java   |   0
 .../lang/JavaScriptLanguageVersion.java       |  29 ++++++++
 .../lang/StandardJavaScriptVersions.java      |  49 ++++++++++++++
 .../javascript/lang/psi/JavaScriptType.java   |   0
 .../lang/psi/JavaScriptTypeElement.java       |   0
 .../extension/JavaScriptModuleExtension.java  |   0
 .../JavaScriptMutableModuleExtension.java     |   0
 .../javascript/psi/JSComputedName.java        |   0
 .../psi/JSSimpleLiteralExpression.java        |   0
 .../psi/JavaScriptLambdaExpression.java       |   0
 .../javascript/psi/stubs/JSFileStub.java      |   0
 .../src/main/resources/icons/as.png           | Bin
 .../src/main/resources/icons/as@2x.png        | Bin
 .../src/main/resources/icons/ecmaScript.png   | Bin
 .../main/resources/icons/ecmaScript@2x.png    | Bin
 .../src/main/resources/icons/javaScript.png   | Bin
 .../main/resources/icons/javaScript@2x.png    | Bin
 .../src/main/resources/icons/json.png         | Bin
 .../src/main/resources/icons/json@2x.png      | Bin
 .../src/main/resources/icons/jsx.png          | Bin
 .../src/main/resources/icons/jsx@2x.png       | Bin
 .../src/main/resources/icons/typeScript.png   | Bin
 .../main/resources/icons/typeScript@2x.png    | Bin
 .../messages/JavaScriptBundle.properties      |   0
 base-impl/pom.xml                             |  64 ++++++++++++++++++
 .../JSDocumentationProcessor.java             |   0
 .../documentation/JSDocumentationUtils.java   |   0
 .../com/intellij/lang/javascript/JSDoc.flex   |   0
 .../lang/javascript/JSDocElementType.java     |   0
 .../lang/javascript/JSDocTokenTypes.java      |   0
 .../lang/javascript/JSElementType.java        |   0
 .../lang/javascript/JSElementTypes.java       |   0
 .../lang/javascript/JSLanguageInjector.java   |   0
 .../lang/javascript/JSTokenTypes.java         |   1 +
 .../javascript/JavaScriptSupportLoader.java   |   0
 .../intellij/lang/javascript/_JSDocLexer.java |   0
 .../flex/AnnotationBackedDescriptor.java      |   0
 .../javascript/flex/FlexImportSupport.java    |   0
 .../lang/javascript/flex/JSResolveHelper.java |   0
 .../javascript/flex/XmlBackedJSClassImpl.java |   0
 .../JavaScriptHighlightingLexer.java          |   0
 .../javascript/index/JSItemPresentation.java  |   0
 .../lang/javascript/parsing/JSDocParsing.java |   0
 .../lang/javascript/psi/JSElementFactory.java |   0
 .../javascript/psi/JSStubElementType.java     |   0
 .../psi/impl/JSArgumentListImpl.java          |   0
 .../impl/JSArrayLiteralExpressionImpl.java    |   0
 .../psi/impl/JSAssignmentExpressionImpl.java  |   0
 .../javascript/psi/impl/JSAttributeImpl.java  |   0
 .../psi/impl/JSAttributeListImpl.java         |   0
 .../impl/JSAttributeNameValuePairImpl.java    |   0
 .../psi/impl/JSBinaryExpressionImpl.java      |   0
 .../psi/impl/JSBlockStatementImpl.java        |   0
 .../psi/impl/JSBreakStatementImpl.java        |   0
 .../psi/impl/JSCallExpressionImpl.java        |   0
 .../javascript/psi/impl/JSCaseClauseImpl.java |   0
 .../javascript/psi/impl/JSCatchBlockImpl.java |   0
 .../javascript/psi/impl/JSChangeUtil.java     |   0
 .../lang/javascript/psi/impl/JSClassBase.java |   2 +-
 .../lang/javascript/psi/impl/JSClassImpl.java |   0
 .../psi/impl/JSCommaExpressionImpl.java       |   0
 .../psi/impl/JSConditionalExpressionImpl.java |   0
 .../psi/impl/JSContinueStatementImpl.java     |   0
 .../psi/impl/JSDefinitionExpressionImpl.java  |   0
 .../psi/impl/JSDoWhileStatementImpl.java      |   0
 .../javascript/psi/impl/JSDocCommentImpl.java |   0
 .../javascript/psi/impl/JSDocTagImpl.java     |   0
 .../psi/impl/JSDocTagValueImpl.java           |   0
 .../javascript/psi/impl/JSElementImpl.java    |   0
 .../psi/impl/JSEmbeddedContentImpl.java       |   0
 .../psi/impl/JSEmptyStatementImpl.java        |   0
 .../impl/JSExpressionCodeFragmentImpl.java    |   0
 .../javascript/psi/impl/JSExpressionImpl.java |   0
 .../psi/impl/JSExpressionStatementImpl.java   |   0
 .../lang/javascript/psi/impl/JSFileImpl.java  |   0
 .../psi/impl/JSForInStatementImpl.java        |   0
 .../psi/impl/JSForStatementImpl.java          |   0
 .../psi/impl/JSFunctionBaseImpl.java          |   0
 .../psi/impl/JSFunctionExpressionImpl.java    |   0
 .../javascript/psi/impl/JSFunctionImpl.java   |   0
 .../psi/impl/JSGenericSignatureImpl.java      |   0
 .../psi/impl/JSIfStatementImpl.java           |   0
 .../psi/impl/JSImportStatementImpl.java       |   0
 .../psi/impl/JSIncludeDirectiveImpl.java      |   0
 ...JSIndexedPropertyAccessExpressionImpl.java |   0
 .../psi/impl/JSLabeledStatementImpl.java      |   0
 .../psi/impl/JSLetExpressionImpl.java         |   0
 .../psi/impl/JSLetStatementImpl.java          |   0
 .../psi/impl/JSLiteralExpressionImpl.java     |   0
 .../psi/impl/JSNamespaceDeclarationImpl.java  |   0
 .../psi/impl/JSNewExpressionImpl.java         |   0
 .../impl/JSObjectLiteralExpressionImpl.java   |   0
 .../psi/impl/JSPackageStatementImpl.java      |   0
 .../javascript/psi/impl/JSParameterImpl.java  |   0
 .../psi/impl/JSParameterListImpl.java         |   0
 .../impl/JSParenthesizedExpressionImpl.java   |   0
 .../psi/impl/JSPostfixExpressionImpl.java     |   0
 .../psi/impl/JSPrefixExpressionImpl.java      |   0
 .../javascript/psi/impl/JSPropertyImpl.java   |   0
 .../javascript/psi/impl/JSPsiImplUtils.java   |   0
 .../psi/impl/JSReferenceExpressionImpl.java   |   0
 .../psi/impl/JSReferenceListImpl.java         |   0
 .../javascript/psi/impl/JSReferenceSet.java   |   0
 .../psi/impl/JSReturnStatementImpl.java       |   0
 .../JSSmartCompletionVariantsHandler.java     |   0
 .../javascript/psi/impl/JSStatementImpl.java  |   0
 .../JSStatementWithLabelReferenceImpl.java    |   0
 .../psi/impl/JSStubElementImpl.java           |   0
 .../psi/impl/JSStubbedStatementImpl.java      |   0
 .../psi/impl/JSSuperExpressionImpl.java       |   0
 .../psi/impl/JSSwitchStatementImpl.java       |   0
 .../psi/impl/JSThisExpressionImpl.java        |   0
 .../psi/impl/JSThrowStatementImpl.java        |   0
 .../psi/impl/JSTryStatementImpl.java          |   0
 .../psi/impl/JSUseNamespaceDirectiveImpl.java |   0
 .../psi/impl/JSVarStatementImpl.java          |   0
 .../psi/impl/JSVariableBaseImpl.java          |   0
 .../javascript/psi/impl/JSVariableImpl.java   |   0
 .../psi/impl/JSWhileStatementImpl.java        |   0
 .../psi/impl/JSWithStatementImpl.java         |   0
 .../psi/impl/JSXmlLiteralExpressionImpl.java  |   0
 .../psi/impl/JSYieldStatementImpl.java        |   0
 .../javascript/psi/impl/ReferenceSupport.java |   0
 .../reference/JSPropertyNameReference.java    |   0
 .../psi/resolve/BaseJSSymbolProcessor.java    |   0
 .../psi/resolve/CompletionProcessor.java      |   0
 .../psi/resolve/JSImportHandlingUtil.java     |   0
 .../JSImportedElementResolveResult.java       |   0
 .../javascript/psi/resolve/JSResolveUtil.java |   2 +-
 .../psi/resolve/ResolveProcessor.java         |   0
 .../psi/resolve/VariantsProcessor.java        |   0
 .../psi/resolve/WalkUpResolveProcessor.java   |   0
 .../stubs/JSImplementedInterfacesIndex.java   |   0
 .../javascript/psi/stubs/JSNameIndex.java     |   0
 .../psi/stubs/JSQualifiedElementIndex.java    |   0
 .../psi/stubs/JSSuperClassIndex.java          |   0
 .../stubs/impl/JSAttributeListStubImpl.java   |   0
 .../JSAttributeNameValuePairStubImpl.java     |   0
 .../psi/stubs/impl/JSAttributeStubImpl.java   |   0
 .../psi/stubs/impl/JSClassStubImpl.java       |   0
 .../psi/stubs/impl/JSFunctionStubImpl.java    |   0
 .../stubs/impl/JSImportStatementStubImpl.java |   0
 .../impl/JSIncludeDirectiveStubImpl.java      |   0
 .../psi/stubs/impl/JSNamedObjectStubBase.java |   0
 .../impl/JSNamespaceDeclarationStubImpl.java  |   0
 .../impl/JSPackageStatementStubImpl.java      |   0
 .../stubs/impl/JSParameterListStubImpl.java   |   0
 .../psi/stubs/impl/JSParameterStubImpl.java   |   0
 .../stubs/impl/JSQualifiedObjectStubBase.java |   0
 .../stubs/impl/JSReferenceListStubImpl.java   |   0
 .../impl/JSUseNamespaceDirectiveStubImpl.java |   0
 .../stubs/impl/JSVarStatementStubImpl.java    |   0
 .../stubs/impl/JSVariableStubBaseImpl.java    |   0
 .../psi/stubs/impl/JSVariableStubImpl.java    |   0
 .../javascript/psi/util/JSLookupUtil.java     |   0
 .../lang/javascript/psi/util/JSUtils.java     |   0
 .../search/JSClassInheritorsProvider.java     |   1 -
 .../lang/javascript/search/JSClassSearch.java |   0
 .../types/JSAttributeElementType.java         |   0
 .../types/JSAttributeListElementType.java     |   0
 .../types/JSAttributeNameValuePairType.java   |   0
 .../javascript/types/JSClassElementType.java  |   0
 .../javascript/types/JSFileElementType.java   |   0
 .../types/JSFunctionElementType.java          |   0
 .../types/JSImportStatementElementType.java   |   0
 .../types/JSIncludeDirectiveElementType.java  |   0
 .../JSNamespaceDeclarationElementType.java    |   0
 .../types/JSPackageStatementElementType.java  |   0
 .../types/JSParameterElementType.java         |   0
 .../types/JSParameterListElementType.java     |   0
 .../types/JSReferenceListElementType.java     |   0
 .../types/JSUseNamespaceDirectiveType.java    |   0
 .../types/JSVarStatementElementType.java      |   0
 .../types/JSVariableElementType.java          |   0
 .../validation/JSUnusedImportsHelper.java     |   0
 .../ide/hightlight/JavaScriptHighlighter.java |   2 +-
 .../JavaScriptSyntaxHighlightKeys.java        |   0
 .../lang/BaseJavaScriptLanguageVersion.java   |  10 +--
 .../lang/JavaScript15LanguageVersion.java     |   9 +--
 .../javascript/lang/JavaScriptTokenSets.java  |   4 +-
 .../lang/StandardJavaScriptVersionsImpl.java  |  33 ++-------
 .../lang/lexer/JavaScript15Lexer.java         |   0
 .../javascript/lang/lexer/javascript15.flex   |   0
 .../lang/parsing/ContextKeywordCache.java     |   0
 .../lang/parsing/ExpressionParsing.java       |  30 ++++----
 .../lang/parsing/FunctionParsing.java         |   0
 .../lang/parsing/JavaScriptParser.java        |   0
 .../lang/parsing/JavaScriptParserBuilder.java |   0
 .../parsing/JavaScriptParsingContext.java     |   0
 .../javascript/lang/parsing/Parsing.java      |   0
 .../lang/parsing/StatementParsing.java        |  49 +++++++-------
 .../impl/JavaScriptStrictParserBuilder.java   |   0
 .../lang/psi/JavaScriptPrimitiveType.java     |   0
 .../lang/psi/impl/JavaScriptClassType.java    |   0
 .../BaseJavaScriptElementType.java            |   0
 .../lang/psi/stubs/JavaScriptIndexKeys.java   |   0
 .../psi/impl/JSComputedNameImpl.java          |   0
 .../impl/JavaScriptLambdaExpressionImpl.java  |   0
 .../psi/stubs/impl/JSFileStubImpl.java        |   0
 .../types/JSQualifiedStubElementType.java     |   3 +-
 {impl => plugin}/pom.xml                      |  19 +++++-
 .../intellij/javascript/JSClassNameMacro.java |   0
 .../javascript/JSDebuggerSupportUtils.java    |   0
 .../JSImplementationTextSelectioner.java      |   0
 .../javascript/JSMethodNameMacro.java         |   0
 .../javascript/JSParameterInfoHandler.java    |   0
 .../documentation/JSDocumentationBuilder.java |   0
 .../JSDocumentationProvider.java              |   0
 .../JSAbstractElementManipulator.java         |   0
 .../JSAttributeNameValuePairManipulator.java  |   0
 .../manipulators/JSDocTagManipulator.java     |   0
 .../JSIncludeDirectiveManipulator.java        |   0
 .../lang/javascript/DialectOptionHolder.java  |   0
 .../lang/javascript/JSFlexAdapter.java        |   0
 .../lang/javascript/JSNodeVisitor.java        |   0
 .../javascript/JSSmartEnterProcessor.java     |   0
 .../intellij/lang/javascript/JavaScript.flex  |   0
 .../javascript/JavaScriptCodeContextType.java |   0
 .../JavaScriptHighlightingLexer.java          |   0
 .../JavaScriptParsingFlexLexer.java           |   0
 .../JavaScriptTargetElementUtilEx.java        |   0
 .../lang/javascript/JavascriptCommenter.java  |   0
 .../lang/javascript/_JavaScriptLexer.java     |   0
 .../findUsages/JSReadWriteAccessDetector.java |   0
 .../javascript/findUsages/JSWordsScanner.java |   0
 .../JavaScriptClassGroupRuleProvider.java     |   0
 .../JavaScriptFindUsagesProvider.java         |   0
 .../JavaScriptFunctionGroupRuleProvider.java  |   0
 .../JavaScriptGroupRuleProviderBase.java      |   0
 ...ImportECMAScriptClassOrFunctionAction.java |   0
 .../flex/ECMAScriptImportOptimizer.java       |   0
 .../lang/javascript/flex/ImportUtils.java     |   0
 .../flex/importer/AS3InterfaceDumper.java     |   0
 .../flex/importer/AS3InterfaceStubDumper.java |   0
 .../lang/javascript/flex/importer/Abc.java    |   0
 .../javascript/flex/importer/AbcDumper.java   |   0
 .../flex/importer/AbstractDumpProcessor.java  |   0
 .../javascript/flex/importer/ByteBuffer.java  |   0
 .../FlexByteCodeInformationProcessor.java     |   0
 .../flex/importer/FlexImporter.java           |   0
 .../javascript/flex/importer/LabelInfo.java   |   0
 .../javascript/flex/importer/MemberInfo.java  |   0
 .../javascript/flex/importer/MetaData.java    |   0
 .../javascript/flex/importer/MethodInfo.java  |   0
 .../javascript/flex/importer/Multiname.java   |   0
 .../javascript/flex/importer/SlotInfo.java    |   0
 .../lang/javascript/flex/importer/Swf.java    |   0
 .../lang/javascript/flex/importer/Traits.java |   0
 .../folding/JavaScriptFoldingBuilder.java     |   0
 .../formatter/JSCodeStylePanel.form           |   0
 .../formatter/JSCodeStylePanel.java           |   0
 .../JSCodeStyleSettingsProvider.java          |   0
 .../formatter/JSFormattingModel.java          |   0
 .../formatter/JSSpacingProcessor.java         |   0
 .../JavaScriptIndentOptionsProvider.java      |   0
 .../JavascriptFormattingModelBuilder.java     |   0
 .../javascript/formatter/blocks/JSBlock.java  |   0
 .../formatter/blocks/JSDocCommentBlock.java   |   0
 .../formatter/blocks/SubBlockVisitor.java     |   0
 .../generation/BaseJSGenerateAction.java      |   0
 .../generation/BaseJSGenerateHandler.java     |   0
 .../generation/JSNamedElementNode.java        |   0
 .../JavaScriptGenerateAccessorHandler.java    |   0
 .../JavaScriptGenerateConstructorAction.java  |   0
 .../JavaScriptGenerateGetAccessorAction.java  |   0
 ...avaScriptGenerateGetSetAccessorAction.java |   0
 .../JavaScriptGenerateSetAccessorAction.java  |   0
 .../JavaScriptGenerateToStringAction.java     |   0
 .../JavaScriptImplementMethodsHandler.java    |   0
 .../JavaScriptOverrideMethodsHandler.java     |   0
 .../generation/OverrideMethodsFix.java        |   0
 .../highlighting/JSBraceMatcher.java          |   0
 .../highlighting/JSHighlighter.java           |   0
 .../JavaScriptColorsAndFontsPage.java         |   0
 .../JavaScriptHighlightVisitor.java           |   0
 .../JavaScriptLineMarkerProvider.java         |   0
 .../lang/javascript/index/JSSymbolUtil.java   |   0
 .../index/JSTypeEvaluateManager.java          |   0
 .../javascript/index/JavaScriptIndex.java     |   0
 .../javascript/index/predefined/Marker.java   |   0
 .../inspections/CreateClassDialog.form        |   0
 .../inspections/CreateClassDialog.java        |   0
 .../CreateClassOrInterfaceAction.java         |   0
 .../JSDeprecatedSymbolsInspection.java        |   0
 .../JSDuplicatedDeclarationInspection.java    |   0
 .../javascript/inspections/JSInspection.java  |   0
 .../inspections/JSInspectionToolProvider.java |   0
 .../JSUndeclaredVariableInspection.java       |   0
 .../JSUnresolvedFunctionInspection.java       |   0
 .../JSUnresolvedVariableInspection.java       |   0
 .../JSUntypedDeclarationInspection.java       |   0
 .../JSUnusedLocalSymbolsInspection.java       |   0
 .../inspections/qucikFixes/BaseCreateFix.java |   0
 .../CreateJSFunctionOrMethodFix.java          |   0
 .../JavaScriptGotoSuperHandler.java           |   0
 .../JavaScriptSymbolContributor.java          |   0
 .../refactoring/BaseIntroduceSettings.java    |   0
 .../BasicJavascriptNamesValidator.java        |   0
 .../JSBaseClassBasedIntroduceDialog.java      |   0
 .../refactoring/JSBaseIntroduceDialog.java    |   0
 .../refactoring/JSBaseIntroduceHandler.java   |   0
 .../refactoring/JSNamesValidator.java         |   0
 .../JavascriptRefactoringSupportProvider.java |   0
 .../JSExtractFunctionDialog.form              |   0
 .../JSExtractFunctionDialog.java              |   0
 .../JSExtractFunctionHandler.java             |   0
 .../JSExtractFunctionSettings.java            |   0
 .../JSIntroduceConstant.form                  |   0
 .../JSIntroduceConstantDialog.java            |   0
 .../JSIntroduceConstantHandler.java           |   0
 .../JSIntroduceConstantSettings.java          |   0
 .../introduceField/JSIntroduceField.form      |   0
 .../JSIntroduceFieldDialog.java               |   0
 .../JSIntroduceFieldHandler.java              |   0
 .../JSIntroduceFieldSettings.java             |   0
 .../JSIntroduceVariable.form                  |   0
 .../JSIntroduceVariableDialog.java            |   0
 .../JSIntroduceVariableHandler.java           |   0
 .../introduceVariable/Settings.java           |   0
 .../search/JSDeclarationRangeHandler.java     |   0
 .../search/JSDefinitionsSearchExecutor.java   |   0
 .../javascript/search/JSFunctionsSearch.java  |   0
 .../search/JSGotoTargetRendererProvider.java  |   0
 .../search/JSReferencesSearchExecutor.java    |   0
 .../JSStructureItemPresentation.java          |   0
 .../JSStructureViewBuilderFactory.java        |   0
 .../structureView/JSStructureViewElement.java |   0
 .../structureView/JSStructureViewModel.java   |   0
 .../structureView/JSSuperGroup.java           |   0
 .../structureView/JSSuperGrouper.java         |   0
 .../JSExpressionSurroundDescriptor.java       |   0
 .../surroundWith/JSStatementSurrounder.java   |   0
 .../JSStatementsSurroundDescriptor.java       |   0
 .../surroundWith/JSWithBlockSurrounder.java   |   0
 .../surroundWith/JSWithDoWhileSurrounder.java |   0
 .../surroundWith/JSWithForSurrounder.java     |   0
 .../JSWithFunctionExpressionSurrounder.java   |   0
 .../JSWithFunctionSurrounder.java             |   0
 .../surroundWith/JSWithIfElseSurrounder.java  |   0
 .../surroundWith/JSWithIfSurrounder.java      |   0
 .../JSWithParenthesesSurrounder.java          |   0
 .../JSWithTryCatchFinallySurrounder.java      |   0
 .../JSWithTryCatchSurrounder.java             |   0
 .../JSWithTryFinallySurrounder.java           |   0
 .../surroundWith/JSWithWhileSurrounder.java   |   0
 .../surroundWith/JSWithWithSurrounder.java    |   0
 .../validation/BaseCreateMethodsFix.java      |   0
 .../validation/ImplementMethodsFix.java       |   0
 .../ImplementedMethodProcessor.java           |   0
 .../validation/JSAnnotatingVisitor.java       |   0
 .../UpdateJavaScriptFileCopyright.java        |   0
 ...UpdateJavaScriptFileCopyrightProvider.java |   0
 .../JavaScriptCodeStyleConfigurable.java      |   0
 .../formatter/JavaScriptCodeStylePanel.java   |   0
 ...riptLanguageCodeStyleSettingsProvider.java |   0
 .../ide/JavaScriptIconDescriptorUpdater.java  |   0
 .../actions/JavaScriptCreateFileAction.java   |   0
 .../JavaScriptQuickFixFactory.java            |   0
 ...avaScriptKeywordCompletionContributor.java |   0
 .../ide/completion/SpaceInsertHandler.java    |   0
 .../JavaScriptSyntaxHighlightFactory.java     |   0
 .../qucikFixes/CreateJSFunctionFixBase.java   |   0
 .../lang/JavaScriptFileTypeFactory.java       |   0
 .../JavaScriptLanguageVersionResolver.java    |   0
 .../lang/JavaScriptParsingDefinition.java     |   0
 .../lang/JavaScriptQuoteHandler.java          |   0
 .../JavaScriptRegexpMultiHostInjector.java    |   0
 .../lang/JavaScriptVersionUtil.java           |   0
 .../JavaScriptClassContributor.java           |   0
 .../lang/psi/JavaScriptSimpleType.java        |   0
 ...efaultJSPropertyNameReferenceProvider.java |   0
 .../JSPropertyNameReferenceProvider.java      |   0
 .../stubs/index/JavaScriptClassNameIndex.java |   0
 .../main/resources/META-INF/Inspections.xml   |   0
 .../main/resources/META-INF/Intentions.xml    |   0
 .../main/resources/META-INF/actionscript.xml  |   0
 .../src/main/resources/META-INF/ecma4.xml     |   0
 .../src/main/resources/META-INF/ecma6.xml     |   0
 .../src/main/resources/META-INF/json.xml      |   0
 .../src/main/resources/META-INF/plugin.xml    |   0
 .../src/main/resources/META-INF/regexp.xml    |   0
 .../main/resources/META-INF/typescript.xml    |   0
 .../main/resources/codeStyle/blankLines.txt   |   0
 .../src/main/resources/codeStyle/indent.txt   |   0
 .../src/main/resources/codeStyle/spacing.txt  |   0
 .../src/main/resources/codeStyle/wrapping.txt |   0
 .../intellij/lang/javascript/flex/flex.png    | Bin
 .../internal/JavaScriptFile.js.ft             |   0
 .../JSDeprecatedSymbols.html                  |   0
 .../JSDuplicatedDeclaration.html              |   0
 .../JSUndeclaredVariable.html                 |   0
 .../JSUnresolvedFunction.html                 |   0
 .../JSUnresolvedVariable.html                 |   0
 .../JSUntypedDeclaration.html                 |   0
 .../JSUnusedLocalSymbols.html                 |   0
 pom.xml                                       |   4 ++
 web-browser-impl/pom.xml                      |  57 ++++++++++++++++
 .../ClientJavaScriptModuleExtension.java      |   0
 .../ClientJavaScriptModuleExtensionPanel.java |   0
 ...lientJavaScriptMutableModuleExtension.java |   0
 ...ntJavaScriptPredefinedBundlesProvider.java |   0
 .../module/sdk/ClientJavaScriptSdkType.java   |   0
 501 files changed, 329 insertions(+), 101 deletions(-)
 create mode 100644 base-api/pom.xml
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java (91%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSClass.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSElement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSFile.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java (92%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java (100%)
 rename {impl => base-api}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/index/JavaScriptIndexer.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/lang/JavaScriptConstants.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/lang/JavaScriptFeature.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java (100%)
 create mode 100644 base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java
 create mode 100644 base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
 rename {impl => base-api}/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/psi/JSComputedName.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java (100%)
 rename {impl => base-api}/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java (100%)
 rename {impl => base-api}/src/main/resources/icons/as.png (100%)
 rename {impl => base-api}/src/main/resources/icons/as@2x.png (100%)
 rename {impl => base-api}/src/main/resources/icons/ecmaScript.png (100%)
 rename {impl => base-api}/src/main/resources/icons/ecmaScript@2x.png (100%)
 rename {impl => base-api}/src/main/resources/icons/javaScript.png (100%)
 rename {impl => base-api}/src/main/resources/icons/javaScript@2x.png (100%)
 rename {impl => base-api}/src/main/resources/icons/json.png (100%)
 rename {impl => base-api}/src/main/resources/icons/json@2x.png (100%)
 rename {impl => base-api}/src/main/resources/icons/jsx.png (100%)
 rename {impl => base-api}/src/main/resources/icons/jsx@2x.png (100%)
 rename {impl => base-api}/src/main/resources/icons/typeScript.png (100%)
 rename {impl => base-api}/src/main/resources/icons/typeScript@2x.png (100%)
 rename {impl => base-api}/src/main/resources/messages/JavaScriptBundle.properties (100%)
 create mode 100644 base-impl/pom.xml
 rename {impl => base-impl}/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/JSDoc.flex (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/JSDocElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/JSElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/JSElementTypes.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java (99%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java (99%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java (99%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java (99%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java (100%)
 rename {impl => base-impl}/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java (98%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java (84%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java (87%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java (81%)
 rename impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java => base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java (53%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/lexer/javascript15.flex (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java (94%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/parsing/Parsing.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java (86%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java (100%)
 rename {impl => base-impl}/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java (98%)
 rename {impl => plugin}/pom.xml (84%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/JSClassNameMacro.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/JSMethodNameMacro.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/JavaScript.flex (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java (100%)
 rename {impl => plugin}/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java (100%)
 rename {impl => plugin}/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java (100%)
 rename {impl => plugin}/src/main/resources/META-INF/Inspections.xml (100%)
 rename {impl => plugin}/src/main/resources/META-INF/Intentions.xml (100%)
 rename {impl => plugin}/src/main/resources/META-INF/actionscript.xml (100%)
 rename {impl => plugin}/src/main/resources/META-INF/ecma4.xml (100%)
 rename {impl => plugin}/src/main/resources/META-INF/ecma6.xml (100%)
 rename {impl => plugin}/src/main/resources/META-INF/json.xml (100%)
 rename {impl => plugin}/src/main/resources/META-INF/plugin.xml (100%)
 rename {impl => plugin}/src/main/resources/META-INF/regexp.xml (100%)
 rename {impl => plugin}/src/main/resources/META-INF/typescript.xml (100%)
 rename {impl => plugin}/src/main/resources/codeStyle/blankLines.txt (100%)
 rename {impl => plugin}/src/main/resources/codeStyle/indent.txt (100%)
 rename {impl => plugin}/src/main/resources/codeStyle/spacing.txt (100%)
 rename {impl => plugin}/src/main/resources/codeStyle/wrapping.txt (100%)
 rename {impl => plugin}/src/main/resources/com/intellij/lang/javascript/flex/flex.png (100%)
 rename {impl => plugin}/src/main/resources/fileTemplates/internal/JavaScriptFile.js.ft (100%)
 rename {impl => plugin}/src/main/resources/inspectionDescriptions/JSDeprecatedSymbols.html (100%)
 rename {impl => plugin}/src/main/resources/inspectionDescriptions/JSDuplicatedDeclaration.html (100%)
 rename {impl => plugin}/src/main/resources/inspectionDescriptions/JSUndeclaredVariable.html (100%)
 rename {impl => plugin}/src/main/resources/inspectionDescriptions/JSUnresolvedFunction.html (100%)
 rename {impl => plugin}/src/main/resources/inspectionDescriptions/JSUnresolvedVariable.html (100%)
 rename {impl => plugin}/src/main/resources/inspectionDescriptions/JSUntypedDeclaration.html (100%)
 rename {impl => plugin}/src/main/resources/inspectionDescriptions/JSUnusedLocalSymbols.html (100%)
 create mode 100644 web-browser-impl/pom.xml
 rename {client-javascript-impl/src => web-browser-impl/src/main/java}/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java (100%)
 rename {client-javascript-impl/src => web-browser-impl/src/main/java}/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java (100%)
 rename {client-javascript-impl/src => web-browser-impl/src/main/java}/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java (100%)
 rename {client-javascript-impl/src => web-browser-impl/src/main/java}/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java (100%)
 rename {client-javascript-impl/src => web-browser-impl/src/main/java}/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java (100%)

diff --git a/base-api/pom.xml b/base-api/pom.xml
new file mode 100644
index 00000000..82de0105
--- /dev/null
+++ b/base-api/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-base.api</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java
rename to base-api/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
similarity index 91%
rename from impl/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
rename to base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
index 71a6662e..8c2cf4b0 100644
--- a/impl/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -47,7 +47,7 @@ public JavaScriptFileType()
 
 	@Override
 	@NotNull
-	public String getName()
+	public String getId()
 	{
 		return "JavaScript";
 	}
@@ -78,18 +78,18 @@ public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable V
 	{
 		if(virtualFile == null || project == null)
 		{
-			return StandardJavaScriptVersions.getDefaultVersion();
+			return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 		}
 		Module moduleForFile = ModuleUtilCore.findModuleForFile(virtualFile, project);
 		if(moduleForFile == null)
 		{
-			return StandardJavaScriptVersions.getDefaultVersion();
+			return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 		}
 		JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(moduleForFile, JavaScriptModuleExtension.class);
 		if(extension != null)
 		{
 			return extension.getLanguageVersion();
 		}
-		return StandardJavaScriptVersions.getDefaultVersion();
+		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 	}
 }
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
rename to base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java b/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
rename to base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSClass.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSFile.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
similarity index 92%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
index 2e0c4634..302dfb99 100644
--- a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
@@ -16,11 +16,8 @@
 
 package com.intellij.lang.javascript.psi.stubs;
 
-import java.io.IOException;
-
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubOutputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
rename to base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
diff --git a/impl/src/main/java/consulo/javascript/index/JavaScriptIndexer.java b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
rename to base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptConstants.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptConstants.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptConstants.java
rename to base-api/src/main/java/consulo/javascript/lang/JavaScriptConstants.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
rename to base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
rename to base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
rename to base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java
new file mode 100644
index 00000000..ab3aa9fc
--- /dev/null
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java
@@ -0,0 +1,29 @@
+package consulo.javascript.lang;
+
+import java.util.Set;
+
+import org.jetbrains.annotations.NotNull;
+import com.intellij.lang.Language;
+import consulo.lang.LanguageVersion;
+import consulo.lang.LanguageVersionWithParsing;
+
+/**
+ * @author VISTALL
+ * @since 23-Dec-17
+ */
+public abstract class JavaScriptLanguageVersion extends LanguageVersion implements LanguageVersionWithParsing
+{
+	public JavaScriptLanguageVersion(@NotNull String id, @NotNull String name, @NotNull Language language, String... mimeTypes)
+	{
+		super(id, name, language, mimeTypes);
+	}
+
+	@NotNull
+	public abstract Set<JavaScriptFeature> getFeatures();
+
+	@NotNull
+	public String getPresentableName()
+	{
+		return getName();
+	}
+}
diff --git a/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
new file mode 100644
index 00000000..a0064c42
--- /dev/null
+++ b/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013-2015 must-be.org
+ *
+ * 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.
+ */
+
+package consulo.javascript.lang;
+
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import com.intellij.openapi.components.ServiceManager;
+
+/**
+ * @author VISTALL
+ * @since 11.12.2015
+ */
+public abstract class StandardJavaScriptVersions
+{
+	public static interface Marker
+	{
+		int getWeight();
+	}
+
+	@NotNull
+	public static StandardJavaScriptVersions getInstance()
+	{
+		return ServiceManager.getService(StandardJavaScriptVersions.class);
+	}
+
+	@NotNull
+	public abstract JavaScriptLanguageVersion getDefaultVersion();
+	@NotNull
+	public abstract List<JavaScriptLanguageVersion> getValidLanguageVersions();
+
+	@NotNull
+	public abstract JavaScriptLanguageVersion findVersionById(@Nullable String id);
+}
diff --git a/impl/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java b/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
rename to base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
diff --git a/impl/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java b/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
rename to base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
diff --git a/impl/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
rename to base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
diff --git a/impl/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
rename to base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
diff --git a/impl/src/main/java/consulo/javascript/psi/JSComputedName.java b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/JSComputedName.java
rename to base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
diff --git a/impl/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
rename to base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
diff --git a/impl/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
rename to base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
diff --git a/impl/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
rename to base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
diff --git a/impl/src/main/resources/icons/as.png b/base-api/src/main/resources/icons/as.png
similarity index 100%
rename from impl/src/main/resources/icons/as.png
rename to base-api/src/main/resources/icons/as.png
diff --git a/impl/src/main/resources/icons/as@2x.png b/base-api/src/main/resources/icons/as@2x.png
similarity index 100%
rename from impl/src/main/resources/icons/as@2x.png
rename to base-api/src/main/resources/icons/as@2x.png
diff --git a/impl/src/main/resources/icons/ecmaScript.png b/base-api/src/main/resources/icons/ecmaScript.png
similarity index 100%
rename from impl/src/main/resources/icons/ecmaScript.png
rename to base-api/src/main/resources/icons/ecmaScript.png
diff --git a/impl/src/main/resources/icons/ecmaScript@2x.png b/base-api/src/main/resources/icons/ecmaScript@2x.png
similarity index 100%
rename from impl/src/main/resources/icons/ecmaScript@2x.png
rename to base-api/src/main/resources/icons/ecmaScript@2x.png
diff --git a/impl/src/main/resources/icons/javaScript.png b/base-api/src/main/resources/icons/javaScript.png
similarity index 100%
rename from impl/src/main/resources/icons/javaScript.png
rename to base-api/src/main/resources/icons/javaScript.png
diff --git a/impl/src/main/resources/icons/javaScript@2x.png b/base-api/src/main/resources/icons/javaScript@2x.png
similarity index 100%
rename from impl/src/main/resources/icons/javaScript@2x.png
rename to base-api/src/main/resources/icons/javaScript@2x.png
diff --git a/impl/src/main/resources/icons/json.png b/base-api/src/main/resources/icons/json.png
similarity index 100%
rename from impl/src/main/resources/icons/json.png
rename to base-api/src/main/resources/icons/json.png
diff --git a/impl/src/main/resources/icons/json@2x.png b/base-api/src/main/resources/icons/json@2x.png
similarity index 100%
rename from impl/src/main/resources/icons/json@2x.png
rename to base-api/src/main/resources/icons/json@2x.png
diff --git a/impl/src/main/resources/icons/jsx.png b/base-api/src/main/resources/icons/jsx.png
similarity index 100%
rename from impl/src/main/resources/icons/jsx.png
rename to base-api/src/main/resources/icons/jsx.png
diff --git a/impl/src/main/resources/icons/jsx@2x.png b/base-api/src/main/resources/icons/jsx@2x.png
similarity index 100%
rename from impl/src/main/resources/icons/jsx@2x.png
rename to base-api/src/main/resources/icons/jsx@2x.png
diff --git a/impl/src/main/resources/icons/typeScript.png b/base-api/src/main/resources/icons/typeScript.png
similarity index 100%
rename from impl/src/main/resources/icons/typeScript.png
rename to base-api/src/main/resources/icons/typeScript.png
diff --git a/impl/src/main/resources/icons/typeScript@2x.png b/base-api/src/main/resources/icons/typeScript@2x.png
similarity index 100%
rename from impl/src/main/resources/icons/typeScript@2x.png
rename to base-api/src/main/resources/icons/typeScript@2x.png
diff --git a/impl/src/main/resources/messages/JavaScriptBundle.properties b/base-api/src/main/resources/messages/JavaScriptBundle.properties
similarity index 100%
rename from impl/src/main/resources/messages/JavaScriptBundle.properties
rename to base-api/src/main/resources/messages/JavaScriptBundle.properties
diff --git a/base-impl/pom.xml b/base-impl/pom.xml
new file mode 100644
index 00000000..02ac1661
--- /dev/null
+++ b/base-impl/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-base.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
rename to base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
diff --git a/impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
rename to base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex b/base-impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex
rename to base-impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
similarity index 99%
rename from impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 45552bf0..4fdd643e 100644
--- a/impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -24,6 +24,7 @@
 import com.intellij.lang.LanguageParserDefinitions;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiBuilderFactory;
+import com.intellij.lang.javascript.highlighting.JavaScriptHighlightingLexer;
 import com.intellij.lang.javascript.parsing.JSDocParsing;
 import com.intellij.lexer.FlexAdapter;
 import com.intellij.lexer.Lexer;
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
similarity index 99%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index 00b1a8c6..936877af 100644
--- a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -443,7 +443,7 @@ public JSClass[] getImplementedInterfaces()
 		final JSReferenceList implementsList = getImplementsList();
 		if(implementsList == null)
 		{
-			return JSClass.EMPTY_ARRAY;
+			return EMPTY_ARRAY;
 		}
 		final List<JSClass> classes = getClassesFromReferenceList(implementsList, JSElementTypes.IMPLEMENTS_LIST);
 		return classes.toArray(new JSClass[classes.size()]);
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
similarity index 99%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 2f2eb9ba..b6e7c6f3 100644
--- a/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -808,7 +808,7 @@ class MyProcessor extends ResolveProcessor implements Processor<PsiNamedElement>
 						public MyProcessor()
 						{
 							super(null);
-							putUserData(LOOKING_FOR_USE_NAMESPACES, true);
+							putUserData(ResolveProcessor.LOOKING_FOR_USE_NAMESPACES, true);
 						}
 
 						@Override
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
similarity index 99%
rename from impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
index 5f25f6b1..c8622abb 100644
--- a/impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
@@ -25,7 +25,6 @@
 
 public interface JSClassInheritorsProvider
 {
-
 	ExtensionPointName<JSClassInheritorsProvider> EP_NAME = ExtensionPointName.create("consulo.javascript.classInheritorsProvider");
 
 	Collection<JSClass> getImplementingClasses(String parentName, Project project, GlobalSearchScope scope);
diff --git a/impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
diff --git a/impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
similarity index 98%
rename from impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
rename to base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
index e40f92b3..d1ad3ad5 100644
--- a/impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
@@ -50,7 +50,7 @@ public class JavaScriptHighlighter extends SyntaxHighlighterBase
 
 		TokenSet operations = TokenSet.andNot(JSTokenTypes.OPERATIONS, TokenSet.create(JSTokenTypes.AS_KEYWORD, JSTokenTypes.IS_KEYWORD));
 
-		safeMap(keys1, operations, JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN);
+		SyntaxHighlighterBase.safeMap(keys1, operations, JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN);
 
 		safeMap(keys1, JSTokenTypes.KEYWORDS, JavaScriptSyntaxHighlightKeys.JS_KEYWORD);
 
diff --git a/impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
rename to base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
diff --git a/impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
similarity index 84%
rename from impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
rename to base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index ac764d39..e34a68ab 100644
--- a/impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -9,14 +9,12 @@
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.util.containers.ArrayListSet;
 import consulo.javascript.lang.parsing.JavaScriptParser;
-import consulo.lang.LanguageVersion;
-import consulo.lang.LanguageVersionWithParsing;
 
 /**
  * @author VISTALL
  * @since 24.08.14
  */
-public abstract class BaseJavaScriptLanguageVersion extends LanguageVersion implements LanguageVersionWithParsing
+public abstract class BaseJavaScriptLanguageVersion extends JavaScriptLanguageVersion
 {
 	private static TokenSet ourLiterals = TokenSet.orSet(JavaScriptTokenSets.STRING_LITERALS, TokenSet.create(JSTokenTypes.NUMERIC_LITERAL));
 
@@ -38,12 +36,6 @@ public Set<JavaScriptFeature> getFeatures()
 		return myFeatures;
 	}
 
-	@NotNull
-	public String getPresentableName()
-	{
-		return getName();
-	}
-
 	@NotNull
 	public abstract SyntaxHighlighter getSyntaxHighlighter();
 
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
similarity index 87%
rename from impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
rename to base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
index f99e12e0..7fdfbea6 100644
--- a/impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -13,14 +13,7 @@
  */
 public class JavaScript15LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
-	private static final Factory<Lexer> ourLexerFactory = new Factory<Lexer>()
-	{
-		@Override
-		public Lexer create()
-		{
-			return new JavaScript15Lexer();
-		}
-	};
+	private static final Factory<Lexer> ourLexerFactory = () -> new JavaScript15Lexer();
 
 	@NotNull
 	public static JavaScript15LanguageVersion getInstance()
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
similarity index 81%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
rename to base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
index 32ea61c3..b443b225 100644
--- a/impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
@@ -26,9 +26,9 @@
  */
 public interface JavaScriptTokenSets extends JSTokenTypes
 {
-	TokenSet STRING_LITERALS = TokenSet.create(STRING_LITERAL, SINGLE_QUOTE_STRING_LITERAL, INTERPOLATION_STRING_LITERAL);
+	TokenSet STRING_LITERALS = TokenSet.create(JSTokenTypes.STRING_LITERAL, JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JSTokenTypes.INTERPOLATION_STRING_LITERAL);
 
-	TokenSet WHITE_SPACES = TokenSet.create(WHITE_SPACE);
+	TokenSet WHITE_SPACES = TokenSet.create(JSTokenTypes.WHITE_SPACE);
 
 	TokenSet NAME_TOKEN_TYPES = TokenSet.create(JSElementTypes.REFERENCE_EXPRESSION, JSTokenTypes.IDENTIFIER);
 }
diff --git a/impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
similarity index 53%
rename from impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
rename to base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index e5d48233..484f4253 100644
--- a/impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -1,19 +1,3 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
 package consulo.javascript.lang;
 
 import java.util.ArrayList;
@@ -27,25 +11,20 @@
 
 /**
  * @author VISTALL
- * @since 11.12.2015
+ * @since 23-Dec-17
  */
-public class StandardJavaScriptVersions
+public class StandardJavaScriptVersionsImpl extends StandardJavaScriptVersions
 {
-	public static interface Marker
-	{
-		int getWeight();
-	}
-
 	@NotNull
-	public static BaseJavaScriptLanguageVersion getDefaultVersion()
+	public BaseJavaScriptLanguageVersion getDefaultVersion()
 	{
 		return JavaScript15LanguageVersion.getInstance();
 	}
 
 	@NotNull
-	public static List<BaseJavaScriptLanguageVersion> getValidLanguageVersions()
+	public List<JavaScriptLanguageVersion> getValidLanguageVersions()
 	{
-		List<BaseJavaScriptLanguageVersion> list = new ArrayList<BaseJavaScriptLanguageVersion>();
+		List<JavaScriptLanguageVersion> list = new ArrayList<>();
 		LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
 		for(LanguageVersion version : versions)
 		{
@@ -60,7 +39,7 @@ public static List<BaseJavaScriptLanguageVersion> getValidLanguageVersions()
 	}
 
 	@NotNull
-	public static BaseJavaScriptLanguageVersion findVersionById(@Nullable String id)
+	public BaseJavaScriptLanguageVersion findVersionById(@Nullable String id)
 	{
 		if(StringUtil.isEmpty(id))
 		{
diff --git a/impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java
rename to base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java
diff --git a/impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex b/base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
rename to base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
diff --git a/impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
rename to base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
diff --git a/impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
similarity index 94%
rename from impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
rename to base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index d5768841..3ada1d61 100644
--- a/impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -50,17 +50,17 @@ protected boolean parsePrimaryExpression(PsiBuilder builder)
 		final IElementType firstToken = builder.getTokenType();
 		if(firstToken == JSTokenTypes.THIS_KEYWORD)
 		{
-			buildTokenElement(JSElementTypes.THIS_EXPRESSION, builder);
+			Parsing.buildTokenElement(JSElementTypes.THIS_EXPRESSION, builder);
 			return true;
 		}
 		else if(firstToken == JSTokenTypes.SUPER_KEYWORD)
 		{
-			buildTokenElement(JSElementTypes.SUPER_EXPRESSION, builder);
+			Parsing.buildTokenElement(JSElementTypes.SUPER_EXPRESSION, builder);
 			return true;
 		}
 		else if(isIdentifierName(builder, firstToken) || firstToken == JSTokenTypes.ANY_IDENTIFIER)
 		{
-			buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
+			Parsing.buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
 			return true;
 		}
 		else if(firstToken == JSTokenTypes.NUMERIC_LITERAL ||
@@ -74,7 +74,7 @@ else if(firstToken == JSTokenTypes.NUMERIC_LITERAL ||
 				firstToken == JSTokenTypes.TRUE_KEYWORD)
 		{
 			String errorMessage = validateLiteral(builder);
-			buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
+			Parsing.buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
 			if(errorMessage != null)
 			{
 				builder.error(errorMessage);
@@ -127,7 +127,7 @@ else if(tokenType == JSTokenTypes.LBRACKET)
 				{
 					builder.advanceLexer();
 					parseExpression(builder);
-					checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+					Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
 				}
 				else
 				{
@@ -278,7 +278,7 @@ else if(isNotPropertyStart(builder, elementType))
 			}
 		}
 
-		checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptBundle.message("javascript.parser.message.expected.rbrace"));
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptBundle.message("javascript.parser.message.expected.rbrace"));
 		expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
 	}
 
@@ -298,7 +298,7 @@ protected void parseProperty(final PsiBuilder builder)
 		}
 		builder.advanceLexer();
 
-		checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
 
 		builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
 		if(!parseAssignmentExpression(builder))
@@ -328,7 +328,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 			{
 				if(commaExpected)
 				{
-					final boolean b = checkMatches(builder, JSTokenTypes.COMMA, JavaScriptBundle.message("javascript.parser.message.expected.comma"));
+					final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptBundle.message("javascript.parser.message.expected.comma"));
 					if(!b)
 					{
 						break;
@@ -354,7 +354,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 					}
 				}
 			}
-			checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+			Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
 			expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
 		}
 		finally
@@ -369,7 +369,7 @@ private void parseParenthesizedExpression(final PsiBuilder builder)
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 		parseExpression(builder);
-		checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 		expr.done(JSElementTypes.PARENTHESIZED_EXPRESSION);
 	}
 
@@ -444,7 +444,7 @@ else if(tokenType == JSTokenTypes.LBRACKET)
 			{
 				builder.advanceLexer();
 				parseExpression(builder);
-				checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+				Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
 				expr.done(JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION);
 				expr = expr.precede();
 			}
@@ -484,7 +484,7 @@ public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar)
 			return false;
 		}
 		PsiBuilder.Marker expr = builder.mark();
-		buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
+		Parsing.buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
 
 		while(builder.getTokenType() == JSTokenTypes.DOT)
 		{
@@ -504,7 +504,7 @@ else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.
 			}
 			else
 			{
-				checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptBundle.message("javascript.parser.message.expected.name"));
+				Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptBundle.message("javascript.parser.message.expected.name"));
 			}
 			expr.done(JSElementTypes.REFERENCE_EXPRESSION);
 			expr = expr.precede();
@@ -567,7 +567,7 @@ protected void parseArgumentList(final PsiBuilder builder)
 			}
 		}
 
-		checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 		arglist.done(JSElementTypes.ARGUMENT_LIST);
 	}
 
@@ -649,7 +649,7 @@ private boolean parseConditionalExpression(final PsiBuilder builder, final boole
 			{
 				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
 			}
-			checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+			Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
 				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
diff --git a/impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
rename to base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
diff --git a/impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
rename to base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
diff --git a/impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
rename to base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
diff --git a/impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
rename to base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
diff --git a/impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
rename to base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
diff --git a/impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
similarity index 86%
rename from impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
rename to base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index ab040a9f..d5f0efa5 100644
--- a/impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -29,14 +29,13 @@
  */
 public class StatementParsing extends Parsing
 {
-	public static final Logger LOGGER = Logger.getInstance(StatementParsing.class);
+	private static final Logger LOGGER = Logger.getInstance(StatementParsing.class);
 
 	public StatementParsing(JavaScriptParsingContext context)
 	{
 		super(context);
 	}
 
-
 	public void parseSourceElement(PsiBuilder builder)
 	{
 		final IElementType tokenType = builder.getTokenType();
@@ -261,7 +260,7 @@ PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder)
 					}
 				}
 			}
-			checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+			Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 		}
 		return marker;
 	}
@@ -272,7 +271,7 @@ void parseIncludeDirective(final PsiBuilder builder)
 		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
 		final PsiBuilder.Marker useNSStatement = builder.mark();
 		builder.advanceLexer();
-		checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptBundle.message("javascript.parser.message.expected.string.literal"));
+		Parsing.checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptBundle.message("javascript.parser.message.expected.string.literal"));
 		checkForSemicolon(builder);
 
 		useNSStatement.done(JSElementTypes.INCLUDE_DIRECTIVE);
@@ -304,7 +303,7 @@ private void parseCatchBlock(final PsiBuilder builder)
 		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
 		final PsiBuilder.Marker block = builder.mark();
 		builder.advanceLexer();
-		checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
 
 		final IElementType identifierType = builder.getTokenType();
 
@@ -318,9 +317,9 @@ private void parseCatchBlock(final PsiBuilder builder)
 				if(builder.getTokenType() == JSTokenTypes.IF_KEYWORD)
 				{
 					builder.advanceLexer();
-					checkMatches(builder, identifierType, JavaScriptBundle.message("javascript.parser.message.expected.identifier"));
-					checkMatches(builder, JSTokenTypes.INSTANCEOF_KEYWORD, JavaScriptBundle.message("javascript.parser.message.expected.instanceof"));
-					checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptBundle.message("javascript.parser.message.expected.identifier"));
+					Parsing.checkMatches(builder, identifierType, JavaScriptBundle.message("javascript.parser.message.expected.identifier"));
+					Parsing.checkMatches(builder, JSTokenTypes.INSTANCEOF_KEYWORD, JavaScriptBundle.message("javascript.parser.message.expected.instanceof"));
+					Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptBundle.message("javascript.parser.message.expected.identifier"));
 				}
 			}
 			param.done(JSElementTypes.FORMAL_PARAMETER);
@@ -330,7 +329,7 @@ private void parseCatchBlock(final PsiBuilder builder)
 			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.parameter.name"));
 		}
 
-		checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 
 		parseBlock(builder);
 
@@ -355,11 +354,11 @@ protected void parseSwitchStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
-		checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
 		getExpressionParsing().parseExpression(builder);
-		checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 
-		checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptBundle.message("javascript.parser.message.expected.lbrace"));
+		Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptBundle.message("javascript.parser.message.expected.lbrace"));
 		while(builder.getTokenType() != JSTokenTypes.RBRACE)
 		{
 			if(builder.eof())
@@ -388,7 +387,7 @@ private void parseCaseOrDefaultClause(final PsiBuilder builder)
 		{
 			getExpressionParsing().parseExpression(builder);
 		}
-		checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
 		while(true)
 		{
 			IElementType token = builder.getTokenType();
@@ -407,9 +406,9 @@ protected void parseWithStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
-		checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
 		getExpressionParsing().parseExpression(builder);
-		checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 
 		parseStatement(builder);
 
@@ -549,7 +548,7 @@ boolean parseForLoopHeader(final PsiBuilder builder)
 			builder.advanceLexer();
 		}
 
-		checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
 		final boolean empty;
 		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD)
 		{
@@ -592,7 +591,7 @@ else if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
 			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.in.or.semicolon"));
 		}
 
-		checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 		return forin;
 	}
 
@@ -602,9 +601,9 @@ private void parseWhileStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
-		checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
 		getExpressionParsing().parseExpression(builder);
-		checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 
 		parseStatement(builder);
 		statement.done(JSElementTypes.WHILE_STATEMENT);
@@ -617,10 +616,10 @@ private void parseDoWhileStatement(final PsiBuilder builder)
 		builder.advanceLexer();
 
 		parseStatement(builder);
-		checkMatches(builder, JSTokenTypes.WHILE_KEYWORD, JavaScriptBundle.message("javascript.parser.message.expected.while.keyword"));
-		checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.WHILE_KEYWORD, JavaScriptBundle.message("javascript.parser.message.expected.while.keyword"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
 		getExpressionParsing().parseExpression(builder);
-		checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 		checkForSemicolon(builder);
 
 		statement.done(JSElementTypes.DOWHILE_STATEMENT);
@@ -632,7 +631,7 @@ protected void parseIfStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker ifStatement = builder.mark();
 		builder.advanceLexer();
 
-		checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
 		getExpressionParsing().parseExpression(builder);
 
 		// handle empty expressions inside
@@ -641,7 +640,7 @@ protected void parseIfStatement(final PsiBuilder builder)
 			builder.advanceLexer();
 		}
 
-		checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
 
 		parseStatement(builder);
 
@@ -684,7 +683,7 @@ protected void parseVarStatementNoMarker(final PsiBuilder builder, final boolean
 			}
 			else
 			{
-				checkMatches(builder, JSTokenTypes.COMMA, JavaScriptBundle.message("javascript.parser.message.expected.comma"));
+				Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptBundle.message("javascript.parser.message.expected.comma"));
 			}
 
 			parseVarDeclaration(builder, !inForInitializationContext);
diff --git a/impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
rename to base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
diff --git a/impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
rename to base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
diff --git a/impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
rename to base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
diff --git a/impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
rename to base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
diff --git a/impl/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java b/base-impl/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
rename to base-impl/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
diff --git a/impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
rename to base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
diff --git a/impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
rename to base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
diff --git a/impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java b/base-impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
rename to base-impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
diff --git a/impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
similarity index 98%
rename from impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
rename to base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
index 6729e6a2..78430547 100644
--- a/impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
@@ -29,8 +29,7 @@
  * @author VISTALL
  * @since 03.05.2015
  */
-public abstract class JSQualifiedStubElementType<StubT extends JSQualifiedStub<PsiT>, PsiT extends JSQualifiedNamedElement> extends
-		JSStubElementType<StubT, PsiT>
+public abstract class JSQualifiedStubElementType<StubT extends JSQualifiedStub<PsiT>, PsiT extends JSQualifiedNamedElement> extends JSStubElementType<StubT, PsiT>
 {
 	public JSQualifiedStubElementType(@NonNls String debugName)
 	{
diff --git a/impl/pom.xml b/plugin/pom.xml
similarity index 84%
rename from impl/pom.xml
rename to plugin/pom.xml
index dc21459a..bc27d28b 100644
--- a/impl/pom.xml
+++ b/plugin/pom.xml
@@ -72,14 +72,29 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xpath-xpath.lang</artifactId>
+			<artifactId>consulo.javascript-base.api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xpath-xpath.view</artifactId>
+			<artifactId>consulo.javascript-web.browser.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>consulo-lang-impl-testing</artifactId>
diff --git a/impl/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/JSClassNameMacro.java
rename to plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
diff --git a/impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java b/plugin/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
rename to plugin/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
diff --git a/impl/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
rename to plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
diff --git a/impl/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
rename to plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
diff --git a/impl/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
rename to plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
diff --git a/impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/plugin/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
rename to plugin/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
diff --git a/impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/plugin/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
rename to plugin/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
diff --git a/impl/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
rename to plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
diff --git a/impl/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
rename to plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
diff --git a/impl/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
rename to plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
diff --git a/impl/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
similarity index 100%
rename from impl/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
rename to plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java b/plugin/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java b/plugin/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
rename to plugin/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex b/plugin/src/main/java/com/intellij/lang/javascript/JavaScript.flex
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
rename to plugin/src/main/java/com/intellij/lang/javascript/JavaScript.flex
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
rename to plugin/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
rename to plugin/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
rename to plugin/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
rename to plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java b/plugin/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
rename to plugin/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java b/plugin/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
rename to plugin/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java
rename to plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
rename to plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
rename to plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java
rename to plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java
rename to plugin/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
rename to plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
rename to plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
rename to plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/plugin/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
rename to plugin/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java b/plugin/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
rename to plugin/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java b/plugin/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
rename to plugin/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java b/plugin/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java
rename to plugin/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form b/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
rename to plugin/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java b/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
rename to plugin/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
rename to plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
rename to plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
rename to plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
rename to plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
rename to plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
rename to plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
rename to plugin/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
rename to plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
diff --git a/impl/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
similarity index 100%
rename from impl/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
diff --git a/impl/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java b/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
rename to plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
diff --git a/impl/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java b/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
rename to plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
diff --git a/impl/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java b/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
rename to plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
diff --git a/impl/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java b/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
rename to plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
diff --git a/impl/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
rename to plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
diff --git a/impl/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
rename to plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
diff --git a/impl/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
rename to plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
diff --git a/impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/plugin/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
rename to plugin/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
diff --git a/impl/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
rename to plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
diff --git a/impl/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java b/plugin/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java
rename to plugin/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java
diff --git a/impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/plugin/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
rename to plugin/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
diff --git a/impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/plugin/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
rename to plugin/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
rename to plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
rename to plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
rename to plugin/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
rename to plugin/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
rename to plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
diff --git a/impl/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
rename to plugin/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
diff --git a/impl/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java b/plugin/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
rename to plugin/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
diff --git a/impl/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java b/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
rename to plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
diff --git a/impl/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
rename to plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
diff --git a/impl/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/plugin/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
rename to plugin/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
diff --git a/impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java b/plugin/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
similarity index 100%
rename from impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
rename to plugin/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
diff --git a/impl/src/main/resources/META-INF/Inspections.xml b/plugin/src/main/resources/META-INF/Inspections.xml
similarity index 100%
rename from impl/src/main/resources/META-INF/Inspections.xml
rename to plugin/src/main/resources/META-INF/Inspections.xml
diff --git a/impl/src/main/resources/META-INF/Intentions.xml b/plugin/src/main/resources/META-INF/Intentions.xml
similarity index 100%
rename from impl/src/main/resources/META-INF/Intentions.xml
rename to plugin/src/main/resources/META-INF/Intentions.xml
diff --git a/impl/src/main/resources/META-INF/actionscript.xml b/plugin/src/main/resources/META-INF/actionscript.xml
similarity index 100%
rename from impl/src/main/resources/META-INF/actionscript.xml
rename to plugin/src/main/resources/META-INF/actionscript.xml
diff --git a/impl/src/main/resources/META-INF/ecma4.xml b/plugin/src/main/resources/META-INF/ecma4.xml
similarity index 100%
rename from impl/src/main/resources/META-INF/ecma4.xml
rename to plugin/src/main/resources/META-INF/ecma4.xml
diff --git a/impl/src/main/resources/META-INF/ecma6.xml b/plugin/src/main/resources/META-INF/ecma6.xml
similarity index 100%
rename from impl/src/main/resources/META-INF/ecma6.xml
rename to plugin/src/main/resources/META-INF/ecma6.xml
diff --git a/impl/src/main/resources/META-INF/json.xml b/plugin/src/main/resources/META-INF/json.xml
similarity index 100%
rename from impl/src/main/resources/META-INF/json.xml
rename to plugin/src/main/resources/META-INF/json.xml
diff --git a/impl/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
similarity index 100%
rename from impl/src/main/resources/META-INF/plugin.xml
rename to plugin/src/main/resources/META-INF/plugin.xml
diff --git a/impl/src/main/resources/META-INF/regexp.xml b/plugin/src/main/resources/META-INF/regexp.xml
similarity index 100%
rename from impl/src/main/resources/META-INF/regexp.xml
rename to plugin/src/main/resources/META-INF/regexp.xml
diff --git a/impl/src/main/resources/META-INF/typescript.xml b/plugin/src/main/resources/META-INF/typescript.xml
similarity index 100%
rename from impl/src/main/resources/META-INF/typescript.xml
rename to plugin/src/main/resources/META-INF/typescript.xml
diff --git a/impl/src/main/resources/codeStyle/blankLines.txt b/plugin/src/main/resources/codeStyle/blankLines.txt
similarity index 100%
rename from impl/src/main/resources/codeStyle/blankLines.txt
rename to plugin/src/main/resources/codeStyle/blankLines.txt
diff --git a/impl/src/main/resources/codeStyle/indent.txt b/plugin/src/main/resources/codeStyle/indent.txt
similarity index 100%
rename from impl/src/main/resources/codeStyle/indent.txt
rename to plugin/src/main/resources/codeStyle/indent.txt
diff --git a/impl/src/main/resources/codeStyle/spacing.txt b/plugin/src/main/resources/codeStyle/spacing.txt
similarity index 100%
rename from impl/src/main/resources/codeStyle/spacing.txt
rename to plugin/src/main/resources/codeStyle/spacing.txt
diff --git a/impl/src/main/resources/codeStyle/wrapping.txt b/plugin/src/main/resources/codeStyle/wrapping.txt
similarity index 100%
rename from impl/src/main/resources/codeStyle/wrapping.txt
rename to plugin/src/main/resources/codeStyle/wrapping.txt
diff --git a/impl/src/main/resources/com/intellij/lang/javascript/flex/flex.png b/plugin/src/main/resources/com/intellij/lang/javascript/flex/flex.png
similarity index 100%
rename from impl/src/main/resources/com/intellij/lang/javascript/flex/flex.png
rename to plugin/src/main/resources/com/intellij/lang/javascript/flex/flex.png
diff --git a/impl/src/main/resources/fileTemplates/internal/JavaScriptFile.js.ft b/plugin/src/main/resources/fileTemplates/internal/JavaScriptFile.js.ft
similarity index 100%
rename from impl/src/main/resources/fileTemplates/internal/JavaScriptFile.js.ft
rename to plugin/src/main/resources/fileTemplates/internal/JavaScriptFile.js.ft
diff --git a/impl/src/main/resources/inspectionDescriptions/JSDeprecatedSymbols.html b/plugin/src/main/resources/inspectionDescriptions/JSDeprecatedSymbols.html
similarity index 100%
rename from impl/src/main/resources/inspectionDescriptions/JSDeprecatedSymbols.html
rename to plugin/src/main/resources/inspectionDescriptions/JSDeprecatedSymbols.html
diff --git a/impl/src/main/resources/inspectionDescriptions/JSDuplicatedDeclaration.html b/plugin/src/main/resources/inspectionDescriptions/JSDuplicatedDeclaration.html
similarity index 100%
rename from impl/src/main/resources/inspectionDescriptions/JSDuplicatedDeclaration.html
rename to plugin/src/main/resources/inspectionDescriptions/JSDuplicatedDeclaration.html
diff --git a/impl/src/main/resources/inspectionDescriptions/JSUndeclaredVariable.html b/plugin/src/main/resources/inspectionDescriptions/JSUndeclaredVariable.html
similarity index 100%
rename from impl/src/main/resources/inspectionDescriptions/JSUndeclaredVariable.html
rename to plugin/src/main/resources/inspectionDescriptions/JSUndeclaredVariable.html
diff --git a/impl/src/main/resources/inspectionDescriptions/JSUnresolvedFunction.html b/plugin/src/main/resources/inspectionDescriptions/JSUnresolvedFunction.html
similarity index 100%
rename from impl/src/main/resources/inspectionDescriptions/JSUnresolvedFunction.html
rename to plugin/src/main/resources/inspectionDescriptions/JSUnresolvedFunction.html
diff --git a/impl/src/main/resources/inspectionDescriptions/JSUnresolvedVariable.html b/plugin/src/main/resources/inspectionDescriptions/JSUnresolvedVariable.html
similarity index 100%
rename from impl/src/main/resources/inspectionDescriptions/JSUnresolvedVariable.html
rename to plugin/src/main/resources/inspectionDescriptions/JSUnresolvedVariable.html
diff --git a/impl/src/main/resources/inspectionDescriptions/JSUntypedDeclaration.html b/plugin/src/main/resources/inspectionDescriptions/JSUntypedDeclaration.html
similarity index 100%
rename from impl/src/main/resources/inspectionDescriptions/JSUntypedDeclaration.html
rename to plugin/src/main/resources/inspectionDescriptions/JSUntypedDeclaration.html
diff --git a/impl/src/main/resources/inspectionDescriptions/JSUnusedLocalSymbols.html b/plugin/src/main/resources/inspectionDescriptions/JSUnusedLocalSymbols.html
similarity index 100%
rename from impl/src/main/resources/inspectionDescriptions/JSUnusedLocalSymbols.html
rename to plugin/src/main/resources/inspectionDescriptions/JSUnusedLocalSymbols.html
diff --git a/pom.xml b/pom.xml
index 6aa451b9..ad4f193a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,10 @@
 	<packaging>pom</packaging>
 
 	<modules>
+		<module>base-api</module>
+		<module>base-impl</module>
+		<module>web-browser-impl</module>
 
+		<module>plugin</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/web-browser-impl/pom.xml b/web-browser-impl/pom.xml
new file mode 100644
index 00000000..0e00cb41
--- /dev/null
+++ b/web-browser-impl/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-web.browser.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
similarity index 100%
rename from client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
rename to web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
similarity index 100%
rename from client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
rename to web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
similarity index 100%
rename from client-javascript-impl/src/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
rename to web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
similarity index 100%
rename from client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
rename to web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
diff --git a/client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
similarity index 100%
rename from client-javascript-impl/src/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
rename to web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java

From 450a0b254a8aed9a82c2837576e90205a5ed1dfa Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 23 Dec 2017 16:30:42 +0300
Subject: [PATCH 030/340] compilation

---
 .../consulo/javascript/lang/JavaScriptVersionUtil.java   | 2 +-
 .../impl/reference/JSPropertyNameReferenceProvider.java  | 0
 .../javascript/documentation/JSDocumentationBuilder.java | 0
 .../documentation/JSDocumentationProvider.java           | 0
 .../com/intellij/lang/javascript/index/JSSymbolUtil.java | 0
 .../lang/javascript/index/JSTypeEvaluateManager.java     | 0
 .../intellij/lang/javascript/index/JavaScriptIndex.java  | 0
 .../intellij/lang/javascript/psi/impl/JSClassBase.java   | 2 +-
 plugin/pom.xml                                           | 8 ++++++++
 .../lang/JavaScriptLanguageVersionResolver.java          | 9 +++++----
 plugin/src/main/resources/META-INF/plugin.xml            | 6 ++++--
 .../extension/ClientJavaScriptModuleExtension.java       | 6 +++---
 .../extension/ClientJavaScriptModuleExtensionPanel.java  | 6 ++++--
 13 files changed, 26 insertions(+), 13 deletions(-)
 rename {plugin => base-api}/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java (87%)
 rename {plugin => base-api}/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java (100%)

diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
similarity index 87%
rename from plugin/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
rename to base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
index 857fe297..e2defa24 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
@@ -37,6 +37,6 @@ public static boolean containsFeature(@NotNull PsiElement element, @NotNull Java
 	public static Set<JavaScriptFeature> getFeatures(@NotNull PsiElement element)
 	{
 		LanguageVersion languageVersion = element.getLanguageVersion();
-		return languageVersion instanceof BaseJavaScriptLanguageVersion ? ((BaseJavaScriptLanguageVersion) languageVersion).getFeatures() : Collections.<JavaScriptFeature>emptySet();
+		return languageVersion instanceof JavaScriptLanguageVersion ? ((JavaScriptLanguageVersion) languageVersion).getFeatures() : Collections.<JavaScriptFeature>emptySet();
 	}
 }
diff --git a/plugin/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
similarity index 100%
rename from plugin/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
rename to base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
diff --git a/plugin/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
rename to base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
diff --git a/plugin/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
rename to base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index 936877af..00b1a8c6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -443,7 +443,7 @@ public JSClass[] getImplementedInterfaces()
 		final JSReferenceList implementsList = getImplementsList();
 		if(implementsList == null)
 		{
-			return EMPTY_ARRAY;
+			return JSClass.EMPTY_ARRAY;
 		}
 		final List<JSClass> classes = getClassesFromReferenceList(implementsList, JSElementTypes.IMPLEMENTS_LIST);
 		return classes.toArray(new JSClass[classes.size()]);
diff --git a/plugin/pom.xml b/plugin/pom.xml
index bc27d28b..dd498f26 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -51,6 +51,7 @@
 					<repositoryChannel>nightly</repositoryChannel>
 					<dependencies>
 						<dependency>com.intellij.xml</dependency>
+						<dependency>com.intellij.regexp</dependency>
 					</dependencies>
 					<packaging>
 						<skip>${dev.mode}</skip>
@@ -95,6 +96,13 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.regexp</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>consulo-lang-impl-testing</artifactId>
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index 3c4c57a7..a98c70eb 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -42,7 +42,7 @@ public LanguageVersion getLanguageVersion(@NotNull Language language, @Nullable
 		PsiFile containingFile = element == null ? null : element.getContainingFile();
 		if(containingFile == null)
 		{
-			return StandardJavaScriptVersions.getDefaultVersion();
+			return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 		}
 		FileType fileType = containingFile.getFileType();
 		if(fileType instanceof JavaScriptFileTypeWithVersion)
@@ -50,16 +50,17 @@ public LanguageVersion getLanguageVersion(@NotNull Language language, @Nullable
 			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(element.getProject(), element.getContainingFile().getVirtualFile());
 		}
 
-		return StandardJavaScriptVersions.getDefaultVersion();
+		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 	}
 
+	@NotNull
 	@RequiredReadAction
 	@Override
 	public LanguageVersion getLanguageVersion(@NotNull Language language, @Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
 		if(project == null || virtualFile == null)
 		{
-			return StandardJavaScriptVersions.getDefaultVersion();
+			return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 		}
 
 		FileType fileType = virtualFile.getFileType();
@@ -68,6 +69,6 @@ public LanguageVersion getLanguageVersion(@NotNull Language language, @Nullable
 			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(project, virtualFile);
 		}
 
-		return StandardJavaScriptVersions.getDefaultVersion();
+		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 	}
 }
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index dbcda46a..30cb0d43 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -41,6 +41,8 @@
 	<extensions defaultExtensionNs="com.intellij">
 		<internalFileTemplate name="JavaScriptFile"/>
 
+		<applicationService serviceInterface="consulo.javascript.lang.StandardJavaScriptVersions" serviceImplementation="consulo.javascript.lang.StandardJavaScriptVersionsImpl"/>
+
 		<lang.versionResolver language="JavaScript" implementationClass="consulo.javascript.lang.JavaScriptLanguageVersionResolver"/>
 
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript15LanguageVersion"/>
@@ -135,7 +137,7 @@
 
 		<completion.contributor language="JavaScript" implementationClass="consulo.javascript.ide.completion.JavaScriptKeywordCompletionContributor"/>
 
-		<completion.confidence language="JavaScript" implementationClass="com.intellij.codeInsight.completion.SkipAutopopupInStrings" />
+		<completion.confidence language="JavaScript" implementationClass="com.intellij.codeInsight.completion.SkipAutopopupInStrings"/>
 
 		<quoteHandler fileType="JavaScript" className="consulo.javascript.lang.JavaScriptQuoteHandler"/>
 
@@ -155,7 +157,7 @@
 								 mutableClass="consulo.javascript.client.module.extension.ClientJavaScriptMutableModuleExtension"/>
 
 		<xdebugger.breakpointType implementation="consulo.javascript.debugger.JavaScriptLineBreakpointType"/>
-		<xdebugger.lineBreakpointTypeResolver filetype="JavaScript" implementationClass="consulo.javascript.debugger.JavaScriptLineBreakpointTypeResolver" />
+		<xdebugger.lineBreakpointTypeResolver filetype="JavaScript" implementationClass="consulo.javascript.debugger.JavaScriptLineBreakpointTypeResolver"/>
 	</extensions>
 
 	<extensionPoints>
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index 05aff40d..27e29d85 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -28,7 +28,7 @@ public class ClientJavaScriptModuleExtension extends ModuleExtensionImpl<ClientJ
 {
 	private ModuleInheritableNamedPointerImpl<Sdk> myPointer;
 
-	protected LanguageVersion myLanguageVersion = StandardJavaScriptVersions.getDefaultVersion();
+	protected LanguageVersion myLanguageVersion = StandardJavaScriptVersions.getInstance().getDefaultVersion();
 
 	public ClientJavaScriptModuleExtension(@NotNull String id, @NotNull ModuleRootLayer rootLayer)
 	{
@@ -76,14 +76,14 @@ public NamedPointer<Sdk> getPointer(@NotNull ModuleRootLayer moduleRootLayer, @N
 	protected void loadStateImpl(@NotNull Element element)
 	{
 		super.loadStateImpl(element);
-		myLanguageVersion = StandardJavaScriptVersions.findVersionById(element.getAttributeValue("language-version"));
+		myLanguageVersion = StandardJavaScriptVersions.getInstance().findVersionById(element.getAttributeValue("language-version"));
 	}
 
 	@Override
 	protected void getStateImpl(@NotNull Element element)
 	{
 		super.getStateImpl(element);
-		if(myLanguageVersion != StandardJavaScriptVersions.getDefaultVersion())
+		if(myLanguageVersion != StandardJavaScriptVersions.getInstance().getDefaultVersion())
 		{
 			element.setAttribute("language-version", myLanguageVersion.getId());
 		}
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index 3dd5b213..c50a9718 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -23,12 +23,14 @@
 import javax.swing.JList;
 import javax.swing.JPanel;
 
+import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.ui.VerticalFlowLayout;
 import com.intellij.ui.CollectionComboBoxModel;
 import com.intellij.ui.ColoredListCellRenderer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.lang.JavaScriptLanguageVersion;
 import consulo.javascript.lang.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.lang.LanguageVersion;
@@ -43,7 +45,7 @@ public ClientJavaScriptModuleExtensionPanel(final JavaScriptMutableModuleExtensi
 	{
 		super(new VerticalFlowLayout(true, false));
 
-		List<BaseJavaScriptLanguageVersion> validLanguageVersions = StandardJavaScriptVersions.getValidLanguageVersions();
+		List<JavaScriptLanguageVersion> validLanguageVersions = StandardJavaScriptVersions.getInstance().getValidLanguageVersions();
 
 		ComboBox languageVersionComboBox = new ComboBox(new CollectionComboBoxModel(validLanguageVersions, extension.getLanguageVersion()));
 		languageVersionComboBox.addItemListener(new ItemListener()
@@ -61,7 +63,7 @@ public void itemStateChanged(ItemEvent e)
 		languageVersionComboBox.setRenderer(new ColoredListCellRenderer<BaseJavaScriptLanguageVersion>()
 		{
 			@Override
-			protected void customizeCellRenderer(JList list, BaseJavaScriptLanguageVersion value, int index, boolean selected, boolean hasFocus)
+			protected void customizeCellRenderer(@NotNull JList list, BaseJavaScriptLanguageVersion value, int index, boolean selected, boolean hasFocus)
 			{
 				append(value.getPresentableName());
 			}

From 56580d39ad89ee253e6d22a3f3fa7a227aa455ee Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 23 Dec 2017 16:51:30 +0300
Subject: [PATCH 031/340] working on mavenize

---
 .../lang/javascript/DialectOptionHolder.java  |    0
 .../lang/javascript/JSFlexAdapter.java        |    0
 .../intellij/lang/javascript/JavaScript.flex  |    0
 .../JavaScriptHighlightingLexer.java          |    0
 .../JavaScriptParsingFlexLexer.java           |    3 -
 .../lang/javascript/_JavaScriptLexer.java     |    0
 .../highlighting/JSHighlighter.java           |    0
 .../inspections/qucikFixes/BaseCreateFix.java |    0
 .../CreateJSFunctionOrMethodFix.java          |    2 +-
 .../JavaScriptQuickFixFactory.java            |    0
 .../qucikFixes/CreateJSFunctionFixBase.java   |    4 +-
 .../stubs/index/JavaScriptClassNameIndex.java |    0
 .../lang/JavaScript16LanguageVersion.java     |   78 --
 .../lang/lexer/JavaScript16Lexer.java         | 1207 -----------------
 .../javascript/lang/lexer/javascript16.flex   |  165 ---
 lang-version-impl/actionscript-impl/pom.xml   |   63 +
 .../actionscript/ActionScriptFileType.java    |    0
 .../ActionScriptFileTypeFactory.java          |    0
 .../lang/ActionScriptLanguageVersion.java     |    0
 lang-version-impl/ecmascript4-impl/pom.xml    |   57 +
 .../lang/EcmaScript4JavaScriptVersion.java    |    0
 .../parsing/EcmaScript4ExpressionParsing.java |    0
 .../parsing/EcmaScript4FunctionParsing.java   |    0
 .../lang/parsing/EcmaScript4Parser.java       |    0
 .../parsing/EcmaScript4ParsingContext.java    |    0
 .../parsing/EcmaScript4StatementParsing.java  |    0
 lang-version-impl/ecmascript6-impl/pom.xml    |   57 +
 .../EcmaScript6QuickFixFactory.java           |    0
 ...cmaScript6CreateJSFunctionOrMethodFix.java |    0
 .../lang/EcmaScript6JavaScriptVersion.java    |    0
 .../javascript/lang/EcmaScriptFileType.java   |    0
 .../lang/EcmaScriptFileTypeFactory.java       |    0
 .../lang/lexer/EcmaScript6Lexer.java          |    0
 .../javascript/lang/lexer/ecmascript6.flex    |    0
 .../parsing/EcmaScript6ExpressionParsing.java |    0
 .../lang/parsing/EcmaScript6Parser.java       |    0
 .../parsing/EcmaScript6ParsingContext.java    |    0
 .../parsing/EcmaScript6StatementParsing.java  |    0
 .../EcmaScript6StrictParserBuilder.java       |    0
 lang-version-impl/javascript16-impl/pom.xml   |   57 +
 lang-version-impl/javascript17-impl/pom.xml   |   57 +
 .../lang/JavaScript17LanguageVersion.java     |    0
 .../lang/lexer/JavaScript17Lexer.java         |    0
 .../javascript/lang/lexer/javascript17.flex   |    0
 lang-version-impl/javascript18-impl/pom.xml   |   63 +
 .../lang/JavaScript185LanguageVersion.java    |    0
 .../lang/JavaScript18LanguageVersion.java     |    0
 .../json-javascript-impl/pom.xml              |   57 +
 .../main/java}/consulo/json/JsonFileType.java |    0
 .../consulo/json/JsonFileTypeFactory.java     |    0
 .../java}/consulo/json/jom/JomElement.java    |    0
 .../consulo/json/jom/JomFileDescriptor.java   |    0
 .../consulo/json/jom/JomFileElement.java      |    0
 .../json/jom/JomIconDescriptorUpdater.java    |    0
 .../java}/consulo/json/jom/JomManager.java    |    0
 .../JomModeAsJsonFileDescriptorProvider.java  |    0
 .../consulo/json/jom/JomPropertyGetter.java   |    0
 .../main/java}/consulo/json/jom/JomUtil.java  |    0
 .../proxy/JomBadValueExpressionException.java |    0
 .../jom/proxy/JomProxyInvocationHandler.java  |    0
 .../json/jom/proxy/JomValueConverter.java     |    0
 .../json/jom/proxy/impl/JomBooleanValue.java  |    0
 .../jom/proxy/impl/JomCollectionValue.java    |    0
 .../json/jom/proxy/impl/JomMapConverter.java  |    0
 .../proxy/impl/JomNullableNumberValue.java    |    0
 .../json/jom/proxy/impl/JomNumberValue.java   |    0
 .../jom/proxy/impl/JomStringConverter.java    |    0
 .../json/lang/JsonJavaScriptParser.java       |    0
 .../json/lang/JsonJavaScriptVersion.java      |    0
 .../consulo/json/lang/lexer/JsonLexer.java    |    0
 .../java}/consulo/json/lang/lexer/json.flex   |    0
 .../JsonFileDescriptorProvider.java           |    0
 .../JsonFileDescriptorProviders.java          |    0
 .../consulo/json/validation/NativeArray.java  |    0
 .../completion/JsonCompletionContributor.java |    0
 ...ByAnotherPsiElementEditorNotification.java |    0
 ...therPsiElementJsonDescriptionProvider.java |    0
 ...escriptionByAnotherPsiElementProvider.java |    0
 ...scriptionByAnotherPsiElementRegistrar.java |    0
 ...DescriptionByAnotherPsiElementService.java |    0
 .../descriptor/JsonObjectDescriptor.java      |    0
 .../descriptor/JsonPropertyDescriptor.java    |    0
 .../PropertyValidationInspection.java         |    0
 .../reference/JsonPropertyNameReference.java  |    0
 .../JsonPropertyNameReferenceProvider.java    |    0
 lang-version-impl/typescript-impl/pom.xml     |   63 +
 .../typescript/TypeScriptFileType.java        |    0
 .../typescript/TypeScriptFileTypeFactory.java |    0
 .../src/main/dist}/sdk/clientAny/AJAX.js      |    0
 .../src/main/dist}/sdk/clientAny/DHTML.js     |    0
 .../src/main/dist}/sdk/clientAny/DOMCore.js   |    0
 .../src/main/dist}/sdk/clientAny/DOMEvents.js |    0
 .../sdk/clientAny/DOMTraversalAndRange.js     |    0
 .../src/main/dist}/sdk/clientAny/DOMXPath.js  |    0
 .../src/main/dist}/sdk/clientAny/E4X.js2      |    0
 .../main/dist}/sdk/clientAny/ECMAScript.js2   |    0
 .../sdk/clientAny/ECMAScript_Additional.js2   |    0
 .../src/main/distOriginal}/clientAny/AJAX.xml |    0
 .../main/distOriginal}/clientAny/DHTML.xml    |    0
 .../main/distOriginal}/clientAny/DOMCore.xml  |    0
 .../distOriginal}/clientAny/DOMEvents.xml     |    0
 .../clientAny/DOMTraversalAndRange.xml        |    0
 .../main/distOriginal}/clientAny/DOMXPath.xml |    0
 .../src/main/distOriginal}/clientAny/E4X.js2  |    0
 .../distOriginal}/clientAny/ECMAScript.js2    |    0
 .../clientAny/ECMAScript_Additional.js2       |    0
 pom.xml                                       |    9 +-
 107 files changed, 485 insertions(+), 1457 deletions(-)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/JavaScript.flex (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java (99%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java (100%)
 rename {plugin => base-impl}/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java (97%)
 rename {plugin => base-impl}/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java (100%)
 rename {plugin => base-impl}/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java (95%)
 rename {plugin => base-impl}/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java (100%)
 delete mode 100644 javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java
 delete mode 100644 javascript16-impl/src/consulo/javascript/lang/lexer/JavaScript16Lexer.java
 delete mode 100644 javascript16-impl/src/consulo/javascript/lang/lexer/javascript16.flex
 create mode 100644 lang-version-impl/actionscript-impl/pom.xml
 rename {actionscript-impl/src => lang-version-impl/actionscript-impl/src/main/java}/consulo/actionscript/ActionScriptFileType.java (100%)
 rename {actionscript-impl/src => lang-version-impl/actionscript-impl/src/main/java}/consulo/actionscript/ActionScriptFileTypeFactory.java (100%)
 rename {actionscript-impl/src => lang-version-impl/actionscript-impl/src/main/java}/consulo/actionscript/lang/ActionScriptLanguageVersion.java (100%)
 create mode 100644 lang-version-impl/ecmascript4-impl/pom.xml
 rename {ecmascript4-impl/src => lang-version-impl/ecmascript4-impl/src/main/java}/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java (100%)
 rename {ecmascript4-impl/src => lang-version-impl/ecmascript4-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java (100%)
 rename {ecmascript4-impl/src => lang-version-impl/ecmascript4-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java (100%)
 rename {ecmascript4-impl/src => lang-version-impl/ecmascript4-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript4Parser.java (100%)
 rename {ecmascript4-impl/src => lang-version-impl/ecmascript4-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java (100%)
 rename {ecmascript4-impl/src => lang-version-impl/ecmascript4-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java (100%)
 create mode 100644 lang-version-impl/ecmascript6-impl/pom.xml
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/EcmaScriptFileType.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/EcmaScriptFileTypeFactory.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/lexer/EcmaScript6Lexer.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/lexer/ecmascript6.flex (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript6Parser.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java (100%)
 rename {ecmascript6-impl/src => lang-version-impl/ecmascript6-impl/src/main/java}/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java (100%)
 create mode 100644 lang-version-impl/javascript16-impl/pom.xml
 create mode 100644 lang-version-impl/javascript17-impl/pom.xml
 rename {javascript17-impl/src => lang-version-impl/javascript17-impl/src/main/java}/consulo/javascript/lang/JavaScript17LanguageVersion.java (100%)
 rename {javascript17-impl/src => lang-version-impl/javascript17-impl/src/main/java}/consulo/javascript/lang/lexer/JavaScript17Lexer.java (100%)
 rename {javascript17-impl/src => lang-version-impl/javascript17-impl/src/main/java}/consulo/javascript/lang/lexer/javascript17.flex (100%)
 create mode 100644 lang-version-impl/javascript18-impl/pom.xml
 rename {javascript18-impl/src => lang-version-impl/javascript18-impl/src/main/java}/consulo/javascript/lang/JavaScript185LanguageVersion.java (100%)
 rename {javascript18-impl/src => lang-version-impl/javascript18-impl/src/main/java}/consulo/javascript/lang/JavaScript18LanguageVersion.java (100%)
 create mode 100644 lang-version-impl/json-javascript-impl/pom.xml
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/JsonFileType.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/JsonFileTypeFactory.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/JomElement.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/JomFileDescriptor.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/JomFileElement.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/JomIconDescriptorUpdater.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/JomManager.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/JomPropertyGetter.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/JomUtil.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/proxy/JomBadValueExpressionException.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/proxy/JomProxyInvocationHandler.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/proxy/JomValueConverter.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/proxy/impl/JomBooleanValue.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/proxy/impl/JomCollectionValue.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/proxy/impl/JomMapConverter.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/proxy/impl/JomNullableNumberValue.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/proxy/impl/JomNumberValue.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/jom/proxy/impl/JomStringConverter.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/lang/JsonJavaScriptParser.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/lang/JsonJavaScriptVersion.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/lang/lexer/JsonLexer.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/lang/lexer/json.flex (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/JsonFileDescriptorProvider.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/JsonFileDescriptorProviders.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/NativeArray.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/completion/JsonCompletionContributor.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/descriptor/JsonObjectDescriptor.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/descriptor/JsonPropertyDescriptor.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/inspections/PropertyValidationInspection.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/psi/reference/JsonPropertyNameReference.java (100%)
 rename {json-javascript-impl/src => lang-version-impl/json-javascript-impl/src/main/java}/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java (100%)
 create mode 100644 lang-version-impl/typescript-impl/pom.xml
 rename {typescript-impl/src => lang-version-impl/typescript-impl/src/main/java}/consulo/typescript/TypeScriptFileType.java (100%)
 rename {typescript-impl/src => lang-version-impl/typescript-impl/src/main/java}/consulo/typescript/TypeScriptFileTypeFactory.java (100%)
 rename {dist => plugin/src/main/dist}/sdk/clientAny/AJAX.js (100%)
 rename {dist => plugin/src/main/dist}/sdk/clientAny/DHTML.js (100%)
 rename {dist => plugin/src/main/dist}/sdk/clientAny/DOMCore.js (100%)
 rename {dist => plugin/src/main/dist}/sdk/clientAny/DOMEvents.js (100%)
 rename {dist => plugin/src/main/dist}/sdk/clientAny/DOMTraversalAndRange.js (100%)
 rename {dist => plugin/src/main/dist}/sdk/clientAny/DOMXPath.js (100%)
 rename {dist => plugin/src/main/dist}/sdk/clientAny/E4X.js2 (100%)
 rename {dist => plugin/src/main/dist}/sdk/clientAny/ECMAScript.js2 (100%)
 rename {dist => plugin/src/main/dist}/sdk/clientAny/ECMAScript_Additional.js2 (100%)
 rename {distOriginal => plugin/src/main/distOriginal}/clientAny/AJAX.xml (100%)
 rename {distOriginal => plugin/src/main/distOriginal}/clientAny/DHTML.xml (100%)
 rename {distOriginal => plugin/src/main/distOriginal}/clientAny/DOMCore.xml (100%)
 rename {distOriginal => plugin/src/main/distOriginal}/clientAny/DOMEvents.xml (100%)
 rename {distOriginal => plugin/src/main/distOriginal}/clientAny/DOMTraversalAndRange.xml (100%)
 rename {distOriginal => plugin/src/main/distOriginal}/clientAny/DOMXPath.xml (100%)
 rename {distOriginal => plugin/src/main/distOriginal}/clientAny/E4X.js2 (100%)
 rename {distOriginal => plugin/src/main/distOriginal}/clientAny/ECMAScript.js2 (100%)
 rename {distOriginal => plugin/src/main/distOriginal}/clientAny/ECMAScript_Additional.js2 (100%)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java b/base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavaScript.flex b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/JavaScript.flex
rename to base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
similarity index 99%
rename from plugin/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
index e1664b42..1a1d1a9e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
@@ -21,11 +21,8 @@
  */
 public class JavaScriptParsingFlexLexer extends JSFlexAdapter
 {
-
 	public JavaScriptParsingFlexLexer(DialectOptionHolder dialectOptionsHolder)
 	{
 		super(false, dialectOptionsHolder);
 	}
-
-
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
similarity index 97%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index 7a71baa6..6b253f3c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -90,7 +90,7 @@ protected void addParameters(Template template, JSReferenceExpression referenceE
 			if(features.contains(JavaScriptFeature.CLASS))
 			{
 				template.addTextSegment(":");
-				guessExprTypeAndAddSuchVariable(passedParameterValue, template, var1, file, features);
+				BaseCreateFix.guessExprTypeAndAddSuchVariable(passedParameterValue, template, var1, file, features);
 			}
 		}
 
diff --git a/plugin/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
similarity index 100%
rename from plugin/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
rename to base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
diff --git a/plugin/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
similarity index 95%
rename from plugin/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
rename to base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index b5d0f0a3..b3c7faf9 100644
--- a/plugin/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -67,7 +67,7 @@ protected void buildTemplate(Template template, JSReferenceExpression referenceE
 	{
 		boolean classFeature = features.contains(JavaScriptFeature.CLASS);
 		String referencedName = classFeature ? referenceExpression.getReferencedName() : referenceExpression.getText();
-		addAccessModifier(template, referenceExpression, classFeature, staticContext);
+		BaseCreateFix.addAccessModifier(template, referenceExpression, classFeature, staticContext);
 		writeFunctionAndName(template, referencedName, features);
 		template.addTextSegment("(");
 
@@ -81,7 +81,7 @@ protected void buildTemplate(Template template, JSReferenceExpression referenceE
 			addReturnType(template, referenceExpression, file);
 		}
 
-		JSClass clazz = findClass(file, anchorParent);
+		JSClass clazz = BaseCreateFix.findClass(file, anchorParent);
 		if(clazz == null || !clazz.isInterface())
 		{
 			template.addTextSegment(" {");
diff --git a/plugin/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java b/base-impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
similarity index 100%
rename from plugin/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
rename to base-impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
diff --git a/javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java b/javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java
deleted file mode 100644
index e2fb58fc..00000000
--- a/javascript16-impl/src/consulo/javascript/lang/JavaScript16LanguageVersion.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.lang;
-
-import org.jetbrains.annotations.NotNull;
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.util.Factory;
-import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import consulo.javascript.lang.lexer.JavaScript16Lexer;
-
-/**
- * @author VISTALL
- * @since 11.12.2015
- */
-public class JavaScript16LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
-{
-	private static final Factory<Lexer> ourLexerFactory = new Factory<Lexer>()
-	{
-		@Override
-		public Lexer create()
-		{
-			return new JavaScript16Lexer();
-		}
-	};
-
-	@NotNull
-	public static JavaScript16LanguageVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript16LanguageVersion.class);
-	}
-
-	public JavaScript16LanguageVersion()
-	{
-		super("JAVASCRIPT_1_6");
-	}
-
-	@NotNull
-	@Override
-	public String getPresentableName()
-	{
-		return "JavaScript 1.6";
-	}
-
-	@NotNull
-	@Override
-	public Lexer createLexer()
-	{
-		return ourLexerFactory.create();
-	}
-
-	@NotNull
-	@Override
-	public SyntaxHighlighter getSyntaxHighlighter()
-	{
-		return new JavaScriptHighlighter(ourLexerFactory);
-	}
-
-	@Override
-	public int getWeight()
-	{
-		return 10;
-	}
-}
\ No newline at end of file
diff --git a/javascript16-impl/src/consulo/javascript/lang/lexer/JavaScript16Lexer.java b/javascript16-impl/src/consulo/javascript/lang/lexer/JavaScript16Lexer.java
deleted file mode 100644
index f480e6ac..00000000
--- a/javascript16-impl/src/consulo/javascript/lang/lexer/JavaScript16Lexer.java
+++ /dev/null
@@ -1,1207 +0,0 @@
-/* The following code was generated by JFlex 1.4.4 on 15.02.16 12:38 */
-
-package consulo.javascript.lang.lexer;
-
-import com.intellij.lexer.LexerBase;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.lang.javascript.JSTokenTypes;
-
-
-/**
- * This class is a scanner generated by 
- * <a href="http://www.jflex.de/">JFlex</a> 1.4.4
- * on 15.02.16 12:38 from the specification file
- * <tt>R:/_github.com/consulo/consulo-javascript/javascript16-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript16.flex</tt>
- */
-public class JavaScript16Lexer extends LexerBase {
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 16384;
-
-  /** lexical states */
-  public static final int DIV_OR_GT = 2;
-  public static final int YYINITIAL = 0;
-
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = { 
-     0,  0,  1, 1
-  };
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final String ZZ_CMAP_PACKED = 
-    "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\54"+
-    "\1\21\1\0\1\4\1\63\1\60\1\17\1\64\1\65\1\7\1\55"+
-    "\1\71\1\15\1\13\1\6\1\11\7\1\2\1\1\74\1\70\1\56"+
-    "\1\53\1\57\1\73\1\0\4\2\1\14\1\2\21\4\1\12\2\4"+
-    "\1\22\1\20\1\23\1\62\1\4\1\0\1\33\1\41\1\43\1\37"+
-    "\1\31\1\32\1\52\1\44\1\40\1\4\1\42\1\34\1\24\1\36"+
-    "\1\45\1\50\1\4\1\27\1\35\1\26\1\30\1\51\1\47\1\25"+
-    "\1\46\1\4\1\66\1\61\1\67\1\72\41\5\2\0\4\4\4\0"+
-    "\1\4\2\0\1\5\7\0\1\4\4\0\1\4\5\0\27\4\1\0"+
-    "\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4\16\0\5\4\11\0"+
-    "\1\4\21\0\130\5\5\0\23\5\12\0\1\4\13\0\1\4\1\0"+
-    "\3\4\1\0\1\4\1\0\24\4\1\0\54\4\1\0\46\4\1\0"+
-    "\5\4\4\0\202\4\1\0\4\5\3\0\105\4\1\0\46\4\2\0"+
-    "\2\4\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4\11\0"+
-    "\21\5\1\0\27\5\1\0\3\5\1\0\1\5\1\0\2\5\1\0"+
-    "\1\5\13\0\33\4\5\0\3\4\15\0\4\5\14\0\6\5\13\0"+
-    "\32\4\5\0\13\4\16\5\7\0\12\5\4\0\2\4\1\5\143\4"+
-    "\1\0\1\4\10\5\1\0\6\5\2\4\2\5\1\0\4\5\2\4"+
-    "\12\5\3\4\2\0\1\4\17\0\1\5\1\4\1\5\36\4\33\5"+
-    "\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0\3\5\66\4\2\0"+
-    "\1\5\1\4\20\5\2\0\1\4\4\5\3\0\12\4\2\5\2\0"+
-    "\12\5\21\0\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0"+
-    "\7\4\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0"+
-    "\2\5\2\0\3\5\11\0\1\5\4\0\2\4\1\0\3\4\2\5"+
-    "\2\0\12\5\4\4\15\0\3\5\1\0\6\4\4\0\2\4\2\0"+
-    "\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0\2\4\2\0"+
-    "\1\5\1\0\5\5\4\0\2\5\2\0\3\5\13\0\4\4\1\0"+
-    "\1\4\7\0\14\5\3\4\14\0\3\5\1\0\11\4\1\0\3\4"+
-    "\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5"+
-    "\1\4\10\5\1\0\3\5\1\0\3\5\2\0\1\4\17\0\2\4"+
-    "\2\5\2\0\12\5\1\0\1\4\17\0\3\5\1\0\10\4\2\0"+
-    "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0"+
-    "\1\5\1\4\6\5\3\0\2\5\2\0\3\5\10\0\2\5\4\0"+
-    "\2\4\1\0\3\4\4\0\12\5\1\0\1\4\20\0\1\5\1\4"+
-    "\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4"+
-    "\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4\1\0\3\4"+
-    "\4\0\5\5\3\0\3\5\1\0\4\5\11\0\1\5\17\0\11\5"+
-    "\11\0\1\4\7\0\3\5\1\0\10\4\1\0\3\4\1\0\27\4"+
-    "\1\0\12\4\1\0\5\4\4\0\7\5\1\0\3\5\1\0\4\5"+
-    "\7\0\2\5\11\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4"+
-    "\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4\2\0\1\5"+
-    "\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5\7\0\1\4"+
-    "\1\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4\1\0\3\4"+
-    "\1\0\27\4\1\0\20\4\4\0\6\5\2\0\3\5\1\0\4\5"+
-    "\11\0\1\5\10\0\2\4\4\0\12\5\22\0\2\5\1\0\22\4"+
-    "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5"+
-    "\4\0\6\5\1\0\1\5\1\0\10\5\22\0\2\5\15\0\60\4"+
-    "\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5\47\0\2\4"+
-    "\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4"+
-    "\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4"+
-    "\1\0\4\4\1\5\2\4\6\5\1\0\2\5\1\4\2\0\5\4"+
-    "\1\0\1\4\1\0\6\5\2\0\12\5\2\0\2\4\42\0\1\4"+
-    "\27\0\2\5\6\0\12\5\13\0\1\5\1\0\1\5\1\0\1\5"+
-    "\4\0\2\5\10\4\1\0\42\4\6\0\24\5\1\0\2\5\4\4"+
-    "\4\0\10\5\1\0\44\5\11\0\1\5\71\0\42\4\1\0\5\4"+
-    "\1\0\2\4\1\0\7\5\3\0\4\5\6\0\12\5\6\0\6\4"+
-    "\4\5\106\0\46\4\12\0\51\4\7\0\132\4\5\0\104\4\5\0"+
-    "\122\4\6\0\7\4\1\0\77\4\1\0\1\4\1\0\4\4\2\0"+
-    "\7\4\1\0\1\4\1\0\4\4\2\0\47\4\1\0\1\4\1\0"+
-    "\4\4\2\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0"+
-    "\1\4\1\0\4\4\2\0\7\4\1\0\7\4\1\0\27\4\1\0"+
-    "\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\47\4\1\0"+
-    "\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4\2\0\10\4\12\0"+
-    "\32\4\5\0\113\4\3\0\3\4\17\0\15\4\1\0\4\4\3\5"+
-    "\13\0\22\4\3\5\13\0\22\4\2\5\14\0\15\4\1\0\3\4"+
-    "\1\0\2\5\14\0\64\4\40\5\3\0\1\4\3\0\2\4\1\5"+
-    "\2\0\12\5\41\0\3\5\2\0\12\5\6\0\130\4\10\0\51\4"+
-    "\1\5\126\0\35\4\3\0\14\5\4\0\14\5\12\0\12\5\36\4"+
-    "\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0\132\4\6\0\26\4"+
-    "\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4\1\0\1\4"+
-    "\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4\1\0\7\4"+
-    "\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4\2\0\6\4"+
-    "\4\0\15\4\5\0\3\4\1\0\7\4\17\0\4\5\32\0\5\5"+
-    "\20\0\2\4\23\0\1\4\13\0\4\5\6\0\6\5\1\0\1\4"+
-    "\15\0\1\4\40\0\22\4\36\0\15\5\4\0\1\5\3\0\6\5"+
-    "\27\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4"+
-    "\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4\1\0\3\4"+
-    "\1\0\7\4\3\0\3\4\5\0\5\4\26\0\44\4\u0e81\0\3\4"+
-    "\31\0\11\4\6\5\1\0\5\4\2\0\5\4\4\0\126\4\2\0"+
-    "\2\5\2\0\3\4\1\0\137\4\5\0\50\4\4\0\136\4\21\0"+
-    "\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0"+
-    "\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4\5\0"+
-    "\1\4\1\5\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0"+
-    "\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0"+
-    "\66\4\50\0\15\4\3\0\20\5\20\0\4\5\17\0\2\4\30\0"+
-    "\3\4\31\0\1\4\6\0\5\4\1\0\207\4\2\0\1\5\4\0"+
-    "\1\4\13\0\12\5\7\0\32\4\4\0\1\4\1\0\32\4\12\0"+
-    "\132\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0\3\4\3\0"+
-    "\2\4\3\0\2\4\22\0\3\5\4\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\2\0\1\1\1\2\1\3\1\4\1\5\1\6\1\2"+
-    "\1\7\1\10\1\11\1\12\1\13\1\14\16\3\1\15"+
-    "\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25"+
-    "\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35"+
-    "\1\36\1\6\1\37\2\2\1\40\1\41\1\42\1\0"+
-    "\1\40\1\2\1\43\1\44\2\11\2\12\17\3\1\45"+
-    "\1\46\1\47\10\3\1\50\1\51\1\52\1\53\1\54"+
-    "\1\55\1\56\1\57\1\60\1\61\1\62\1\63\1\64"+
-    "\1\65\1\66\1\67\1\2\1\40\1\42\1\70\1\40"+
-    "\2\0\2\11\2\12\1\3\1\71\11\3\1\72\1\73"+
-    "\2\3\1\74\11\3\1\75\1\3\1\76\1\77\1\100"+
-    "\1\101\1\102\1\103\1\0\2\70\1\104\1\3\1\105"+
-    "\3\3\1\106\4\3\1\107\5\3\1\110\2\3\1\111"+
-    "\1\3\1\112\1\113\1\42\1\0\1\114\4\3\1\115"+
-    "\5\3\1\116\1\117\1\3\1\120\1\121\1\122\1\123"+
-    "\3\3\1\124\1\3\1\125\4\3\1\126\1\127\3\3"+
-    "\1\130\1\3\1\131\1\132\1\3\1\133";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[217];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\75\0\172\0\267\0\364\0\u0131\0\u016e\0\172"+
-    "\0\u01ab\0\u01e8\0\u0225\0\u0262\0\u029f\0\172\0\172\0\u02dc"+
-    "\0\u0319\0\u0356\0\u0393\0\u03d0\0\u040d\0\u044a\0\u0487\0\u04c4"+
-    "\0\u0501\0\u053e\0\u057b\0\u05b8\0\u05f5\0\u0632\0\u066f\0\u06ac"+
-    "\0\u06e9\0\u0726\0\u0763\0\u07a0\0\u07dd\0\172\0\172\0\172"+
-    "\0\172\0\172\0\172\0\172\0\172\0\172\0\u081a\0\u0857"+
-    "\0\u0894\0\u08d1\0\u090e\0\u094b\0\u0988\0\u09c5\0\u0a02\0\u0a3f"+
-    "\0\u0a7c\0\172\0\172\0\172\0\u0ab9\0\u0af6\0\172\0\u0b33"+
-    "\0\u0b70\0\u0bad\0\u0bea\0\u0c27\0\u0c64\0\u0ca1\0\u0cde\0\u0d1b"+
-    "\0\u0d58\0\u0d95\0\u0dd2\0\u0e0f\0\u0e4c\0\u0e89\0\364\0\364"+
-    "\0\u0ec6\0\u0f03\0\u0f40\0\u0f7d\0\u0fba\0\u0ff7\0\u1034\0\u1071"+
-    "\0\u10ae\0\u10eb\0\u1128\0\172\0\172\0\172\0\u1165\0\172"+
-    "\0\172\0\172\0\172\0\172\0\172\0\172\0\172\0\172"+
-    "\0\u11a2\0\u11df\0\u121c\0\u1259\0\u1296\0\u12d3\0\u1310\0\u134d"+
-    "\0\u138a\0\u13c7\0\u1404\0\u1441\0\u147e\0\364\0\u14bb\0\u14f8"+
-    "\0\u1535\0\u1572\0\u15af\0\u15ec\0\u1629\0\u1666\0\u16a3\0\364"+
-    "\0\364\0\u16e0\0\u171d\0\364\0\u175a\0\u1797\0\u17d4\0\u1811"+
-    "\0\u184e\0\u188b\0\u18c8\0\u1905\0\u1942\0\364\0\u197f\0\364"+
-    "\0\172\0\172\0\172\0\u19bc\0\172\0\u19f9\0\u1a36\0\172"+
-    "\0\364\0\u1a73\0\364\0\u1ab0\0\u1aed\0\u1b2a\0\364\0\u1b67"+
-    "\0\u1ba4\0\u1be1\0\u1c1e\0\364\0\u1c5b\0\u1c98\0\u1cd5\0\u1d12"+
-    "\0\u1d4f\0\364\0\u1d8c\0\u1dc9\0\364\0\u1e06\0\364\0\172"+
-    "\0\172\0\u1e43\0\364\0\u1e80\0\u1ebd\0\u1efa\0\u1f37\0\364"+
-    "\0\u1f74\0\u1fb1\0\u1fee\0\u202b\0\u2068\0\364\0\364\0\u20a5"+
-    "\0\364\0\364\0\364\0\364\0\u20e2\0\u211f\0\u215c\0\364"+
-    "\0\u2199\0\364\0\u21d6\0\u2213\0\u2250\0\u228d\0\364\0\364"+
-    "\0\u22ca\0\u2307\0\u2344\0\364\0\u2381\0\364\0\364\0\u23be"+
-    "\0\364";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[217];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
-    }
-    return j;
-  }
-
-  /** 
-   * The transition table of the DFA
-   */
-  private static final int [] ZZ_TRANS = zzUnpackTrans();
-
-  private static final String ZZ_TRANS_PACKED_0 =
-    "\1\3\1\4\1\5\1\6\1\5\1\3\1\7\1\10"+
-    "\1\6\1\11\1\5\1\12\1\5\1\13\1\6\1\14"+
-    "\1\3\1\15\1\16\1\17\2\5\1\20\1\21\1\22"+
-    "\1\23\1\24\2\5\1\25\1\26\1\27\1\30\1\31"+
-    "\1\5\1\32\3\5\1\33\1\5\1\34\1\35\1\36"+
-    "\1\37\1\40\1\3\1\41\1\42\1\43\1\44\1\45"+
-    "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55"+
-    "\1\56\1\3\1\4\1\5\1\6\1\5\1\3\1\57"+
-    "\1\60\1\6\1\11\1\5\1\12\1\5\1\13\1\6"+
-    "\1\14\1\3\1\15\1\16\1\17\2\5\1\20\1\21"+
-    "\1\22\1\23\1\24\2\5\1\25\1\26\1\27\1\30"+
-    "\1\31\1\5\1\32\3\5\1\33\1\5\1\34\1\35"+
-    "\1\36\1\37\1\40\1\61\1\41\1\42\1\43\1\44"+
-    "\1\45\1\46\1\47\1\50\1\51\1\52\1\53\1\54"+
-    "\1\55\1\56\76\0\1\4\7\0\1\4\1\0\1\62"+
-    "\1\63\14\0\1\63\44\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\27\5\25\0\1\6\4\0"+
-    "\1\6\5\0\1\6\56\0\6\64\1\65\1\66\1\0"+
-    "\5\64\1\0\1\64\1\67\1\64\1\70\52\64\1\0"+
-    "\1\4\7\0\1\4\1\71\1\62\1\63\10\0\1\71"+
-    "\3\0\1\63\44\0\1\62\7\0\1\62\100\0\1\72"+
-    "\35\0\1\73\21\0\10\14\1\0\5\14\1\0\1\74"+
-    "\1\75\54\14\10\15\1\0\5\15\1\0\1\15\1\76"+
-    "\1\77\53\15\1\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\3\5\1\100\14\5\1\101\1\5"+
-    "\1\102\4\5\23\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\5\5\1\103\21\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\12\5"+
-    "\1\104\14\5\23\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\10\5\1\105\16\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\4\5"+
-    "\1\106\2\5\1\107\4\5\1\110\4\5\1\111\5\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\112\15\5\1\113\3\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\4\5"+
-    "\1\114\1\115\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\5\5\1\116\13\5\1\117"+
-    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\6\5\1\120\3\5\1\121\14\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\3\5\1\122\23\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\7\5\1\123\11\5\1\124"+
-    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\125\3\5\1\126\6\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\7\5\1\127\11\5\1\130\5\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\131"+
-    "\21\5\75\0\1\132\74\0\1\133\74\0\1\134\1\0"+
-    "\1\135\72\0\1\136\3\0\1\137\70\0\1\140\4\0"+
-    "\1\141\67\0\1\142\5\0\1\143\66\0\1\144\74\0"+
-    "\1\145\27\0\1\65\1\66\43\0\1\146\74\0\1\147"+
-    "\74\0\1\150\2\0\1\151\17\0\1\62\7\0\1\62"+
-    "\2\0\1\63\14\0\1\63\44\0\1\152\7\0\1\152"+
-    "\3\0\1\152\37\0\1\152\17\0\6\64\1\153\1\64"+
-    "\1\0\5\64\1\0\1\64\1\67\1\64\1\70\52\64"+
-    "\10\65\1\0\5\65\1\0\56\65\7\154\1\155\65\154"+
-    "\10\64\1\0\5\64\1\0\56\64\6\70\1\156\1\70"+
-    "\1\157\5\70\1\157\1\70\1\160\2\70\1\64\51\70"+
-    "\1\0\2\71\6\0\1\71\2\0\1\71\14\0\3\71"+
-    "\3\0\1\71\1\0\1\71\1\0\1\71\31\0\3\14"+
-    "\1\161\4\14\1\162\64\14\3\15\1\163\4\15\1\164"+
-    "\64\15\1\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\4\5\1\165\15\5\1\166\4\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\3\5\1\167\10\5\1\170\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\24\5\1\171"+
-    "\2\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\2\5\1\172\24\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\13\5\1\173"+
-    "\13\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\11\5\1\174\15\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\175"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\10\5\1\176\16\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\177"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\3\5\1\200\23\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\201"+
-    "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\202\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\10\5\1\203"+
-    "\16\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\23\5\1\204\3\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\6\5\1\205"+
-    "\1\5\1\206\16\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\11\5\1\207\15\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\5\5\1\210\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\2\5\1\211\6\5\1\212"+
-    "\15\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\12\5\1\213\14\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\214"+
-    "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\215\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\3\5\1\216"+
-    "\23\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\217\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\220"+
-    "\24\5\75\0\1\221\74\0\1\222\74\0\1\223\3\0"+
-    "\1\224\70\0\1\225\22\0\1\152\7\0\1\152\107\0"+
-    "\2\153\12\0\1\153\11\0\1\153\22\0\7\154\1\226"+
-    "\65\154\6\227\1\230\1\155\65\227\23\157\1\64\2\156"+
-    "\12\157\1\156\11\157\1\156\45\157\1\64\51\157\10\70"+
-    "\1\157\5\70\1\157\4\70\1\64\51\70\3\14\1\161"+
-    "\4\14\1\162\6\14\1\74\1\75\64\14\1\0\6\14"+
-    "\1\74\1\75\54\14\3\15\1\163\4\15\1\164\7\15"+
-    "\1\76\1\77\63\15\1\0\7\15\1\76\1\77\53\15"+
-    "\1\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\231\21\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\21\5\1\232\5\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\11\5\1\233\15\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\234\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\4\5\1\235\22\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\236\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\237\21\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\17\5\1\240\7\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\11\5\1\241\15\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\7\5\1\242\17\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\243\24\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\10\5\1\244\16\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\7\5\1\245\17\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\246\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\247\24\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\7\5\1\250\17\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\17\5\1\251\7\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\252\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\253\6\5\1\254\15\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\20\5"+
-    "\1\255\6\5\23\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\10\5\1\256\16\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\13\5"+
-    "\1\257\13\5\75\0\1\260\21\0\6\154\1\261\1\226"+
-    "\65\154\7\227\1\262\65\227\1\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\23\5\1\263\3\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\21\5\1\264\5\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\3\5\1\265\23\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\6\5\1\266\20\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\2\5\1\267\24\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\270\21\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\10\5\1\271\16\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\17\5\1\272\7\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\4\5\1\273\22\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\274\24\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\7\5\1\275\17\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\16\5\1\276\10\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\20\5\1\277\6\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\14\5\1\300\12\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\2\5\1\301\24\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\302\21\5\22\0\6\227\1\230\1\262"+
-    "\65\227\1\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\6\5\1\303\20\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\304"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\305\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\14\5\1\306"+
-    "\12\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\10\5\1\307\16\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\20\5\1\310"+
-    "\6\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\10\5\1\311\16\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\312"+
-    "\21\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\12\5\1\313\14\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\314"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\12\5\1\315\14\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\21\5\1\316"+
-    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\22\5\1\317\4\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\320"+
-    "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\17\5\1\321\7\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\4\5\1\322"+
-    "\22\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\5\5\1\323\21\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\324"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\5\5\1\325\21\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\326"+
-    "\21\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\13\5\1\327\13\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\21\5\1\330"+
-    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\6\5\1\331\20\5\22\0";
-
-  private static int [] zzUnpackTrans() {
-    int [] result = new int[9211];
-    int offset = 0;
-    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackTrans(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-  private static final char[] EMPTY_BUFFER = new char[0];
-  private static final int YYEOF = -1;
-
-  /* error messages for the codes above */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\2\0\1\11\4\1\1\11\5\1\2\11\26\1\11\11"+
-    "\10\1\1\0\2\1\3\11\2\1\1\11\34\1\3\11"+
-    "\1\1\11\11\6\1\2\0\40\1\3\11\1\1\1\11"+
-    "\1\0\1\1\1\11\27\1\2\11\1\0\47\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[217];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-  /** the current state of the DFA */
-  private int zzState;
-
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
-
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private CharSequence zzBuffer = "";
-
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
-
-  /** the textposition at the last state to be included in yytext */
-  private int zzPushbackPos;
-
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
-
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
-
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
-
-  /**
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
-
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
-
-  private IElementType myTokenType;
-  private int myState;
-
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
-
-
-
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 1772) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
-    }
-    return map;
-  }
-
-  @Override
-  public IElementType getTokenType() {
-    if (myTokenType == null) locateToken();
-    return myTokenType;
-  }
-
-  @Override
-  public final int getTokenStart(){
-    if (myTokenType == null) locateToken();
-    return zzStartRead;
-  }
-
-  @Override
-  public final int getTokenEnd(){
-    if (myTokenType == null) locateToken();
-    return getTokenStart() + yylength();
-  }
-
-  @Override
-  public void advance() {
-    if (myTokenType == null) locateToken();
-    myTokenType = null;
-  }
-
-  @Override
-  public int getState() {
-    if (myTokenType == null) locateToken();
-    return myState;
-  }
-
-  @Override
-  public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
-    reset(buffer, startOffset, endOffset, initialState);
-    myTokenType = null;
-  }
-
-   @Override
-   public CharSequence getBufferSequence() {
-     return zzBuffer;
-   }
-
-   @Override
-   public int getBufferEnd() {
-     return zzEndRead;
-   }
-
-  public void reset(CharSequence buffer, int start, int end,int initialState){
-    zzBuffer = buffer;
-    zzCurrentPos = zzMarkedPos = zzStartRead = start;
-    zzPushbackPos = 0;
-    zzAtEOF  = false;
-    zzAtBOL = true;
-    zzEndRead = end;
-    yybegin(initialState);
-    myTokenType = null;
-  }
-
-   private void locateToken() {
-     if (myTokenType != null) return;
-     try {
-       myState = yystate();
-       myTokenType = advanceImpl();
-     }
-     catch (java.io.IOException e) { /*Can't happen*/ }
-     catch (Error e) {
-       // add lexer class name to the error
-       final Error error = new Error(getClass().getName() + ": " + e.getMessage());
-       error.setStackTrace(e.getStackTrace());
-       throw error;
-     }
-   }
-
-   /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   *
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-    return true;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  public final CharSequence yytext() {
-    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the
-   * matched text.
-   *
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch.
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  public final char yycharat(int pos) {
-    return zzBuffer.charAt(zzStartRead+pos);
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of
-   * yypushback(int) and a match-all fallback rule) this method
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-    }
-
-    throw new Error(message);
-  }
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-  /**
-   * Contains user EOF-code, which will be executed exactly once,
-   * when the end of file is reached
-   */
-  private void zzDoEOF() {
-    if (!zzEOFDone) {
-      zzEOFDone = true;
-    
-    }
-  }
-
-
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public IElementType advanceImpl() throws java.io.IOException {
-    int zzInput;
-    int zzAction;
-
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    CharSequence zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
-
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
-
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
-
-      zzAction = -1;
-
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-
-      zzState = ZZ_LEXSTATE[zzLexicalState];
-
-
-      zzForAction: {
-        while (true) {
-
-          if (zzCurrentPosL < zzEndReadL)
-            zzInput = zzBufferL.charAt(zzCurrentPosL++);
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = zzBufferL.charAt(zzCurrentPosL++);
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
-
-          int zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
-
-        }
-      }
-
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 88: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD;
-          }
-        case 92: break;
-        case 29: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COLON;
-          }
-        case 93: break;
-        case 4: 
-          { return JSTokenTypes.WHITE_SPACE;
-          }
-        case 94: break;
-        case 32: 
-          { return JSTokenTypes.REGEXP_LITERAL;
-          }
-        case 95: break;
-        case 81: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD;
-          }
-        case 96: break;
-        case 21: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LPAR;
-          }
-        case 97: break;
-        case 68: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD;
-          }
-        case 98: break;
-        case 44: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GE;
-          }
-        case 99: break;
-        case 84: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD;
-          }
-        case 100: break;
-        case 34: 
-          { return JSTokenTypes.C_STYLE_COMMENT;
-          }
-        case 101: break;
-        case 49: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OROR;
-          }
-        case 102: break;
-        case 56: 
-          { return JSTokenTypes.DOC_COMMENT;
-          }
-        case 103: break;
-        case 58: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD;
-          }
-        case 104: break;
-        case 65: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ;
-          }
-        case 105: break;
-        case 26: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COMMA;
-          }
-        case 106: break;
-        case 13: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQ;
-          }
-        case 107: break;
-        case 37: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD;
-          }
-        case 108: break;
-        case 47: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDAND;
-          }
-        case 109: break;
-        case 43: 
-          { return JSTokenTypes.PLUSPLUS;
-          }
-        case 110: break;
-        case 10: 
-          { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL;
-          }
-        case 111: break;
-        case 3: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER;
-          }
-        case 112: break;
-        case 5: 
-          { return JSTokenTypes.DIV;
-          }
-        case 113: break;
-        case 25: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON;
-          }
-        case 114: break;
-        case 50: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOREQ;
-          }
-        case 115: break;
-        case 82: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD;
-          }
-        case 116: break;
-        case 70: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD;
-          }
-        case 117: break;
-        case 67: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ;
-          }
-        case 118: break;
-        case 57: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD;
-          }
-        case 119: break;
-        case 6: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULT;
-          }
-        case 120: break;
-        case 53: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ;
-          }
-        case 121: break;
-        case 17: 
-          { yybegin(YYINITIAL); return JSTokenTypes.AND;
-          }
-        case 122: break;
-        case 59: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SET_KEYWORD;
-          }
-        case 123: break;
-        case 63: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ;
-          }
-        case 124: break;
-        case 69: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD;
-          }
-        case 125: break;
-        case 36: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ;
-          }
-        case 126: break;
-        case 52: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ;
-          }
-        case 127: break;
-        case 62: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GET_KEYWORD;
-          }
-        case 128: break;
-        case 61: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD;
-          }
-        case 129: break;
-        case 15: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUS;
-          }
-        case 130: break;
-        case 33: 
-          { return JSTokenTypes.END_OF_LINE_COMMENT;
-          }
-        case 131: break;
-        case 71: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD;
-          }
-        case 132: break;
-        case 79: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD;
-          }
-        case 133: break;
-        case 40: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQ;
-          }
-        case 134: break;
-        case 1: 
-          { return JSTokenTypes.BAD_CHARACTER;
-          }
-        case 135: break;
-        case 86: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD;
-          }
-        case 136: break;
-        case 85: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD;
-          }
-        case 137: break;
-        case 76: 
-          { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD;
-          }
-        case 138: break;
-        case 80: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD;
-          }
-        case 139: break;
-        case 46: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ;
-          }
-        case 140: break;
-        case 55: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLT;
-          }
-        case 141: break;
-        case 31: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LT;
-          }
-        case 142: break;
-        case 74: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD;
-          }
-        case 143: break;
-        case 14: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EXCL;
-          }
-        case 144: break;
-        case 38: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD;
-          }
-        case 145: break;
-        case 64: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ;
-          }
-        case 146: break;
-        case 42: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ;
-          }
-        case 147: break;
-        case 48: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OREQ;
-          }
-        case 148: break;
-        case 89: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD;
-          }
-        case 149: break;
-        case 66: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT;
-          }
-        case 150: break;
-        case 45: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGT;
-          }
-        case 151: break;
-        case 27: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TILDE;
-          }
-        case 152: break;
-        case 87: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD;
-          }
-        case 153: break;
-        case 2: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL;
-          }
-        case 154: break;
-        case 19: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOR;
-          }
-        case 155: break;
-        case 30: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIV;
-          }
-        case 156: break;
-        case 16: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GT;
-          }
-        case 157: break;
-        case 39: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD;
-          }
-        case 158: break;
-        case 83: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD;
-          }
-        case 159: break;
-        case 60: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD;
-          }
-        case 160: break;
-        case 77: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD;
-          }
-        case 161: break;
-        case 9: 
-          { return  JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
-          }
-        case 162: break;
-        case 18: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OR;
-          }
-        case 163: break;
-        case 51: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ;
-          }
-        case 164: break;
-        case 8: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUS;
-          }
-        case 165: break;
-        case 35: 
-          { return JSTokenTypes.MINUSMINUS;
-          }
-        case 166: break;
-        case 28: 
-          { yybegin(YYINITIAL); return JSTokenTypes.QUEST;
-          }
-        case 167: break;
-        case 78: 
-          { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD;
-          }
-        case 168: break;
-        case 7: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DOT;
-          }
-        case 169: break;
-        case 72: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD;
-          }
-        case 170: break;
-        case 12: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RBRACKET;
-          }
-        case 171: break;
-        case 24: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RBRACE;
-          }
-        case 172: break;
-        case 91: 
-          { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD;
-          }
-        case 173: break;
-        case 41: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NE;
-          }
-        case 174: break;
-        case 23: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACE;
-          }
-        case 175: break;
-        case 22: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RPAR;
-          }
-        case 176: break;
-        case 20: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERC;
-          }
-        case 177: break;
-        case 73: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD;
-          }
-        case 178: break;
-        case 54: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LE;
-          }
-        case 179: break;
-        case 11: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET;
-          }
-        case 180: break;
-        case 75: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ;
-          }
-        case 181: break;
-        case 90: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.UNDEFINED_KEYWORD;
-          }
-        case 182: break;
-        default:
-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-            zzAtEOF = true;
-            zzDoEOF();
-            return null;
-          }
-          else {
-            zzScanError(ZZ_NO_MATCH);
-          }
-      }
-    }
-  }
-
-
-}
diff --git a/javascript16-impl/src/consulo/javascript/lang/lexer/javascript16.flex b/javascript16-impl/src/consulo/javascript/lang/lexer/javascript16.flex
deleted file mode 100644
index f9d98089..00000000
--- a/javascript16-impl/src/consulo/javascript/lang/lexer/javascript16.flex
+++ /dev/null
@@ -1,165 +0,0 @@
-package consulo.javascript.lang.lexer;
-
-import com.intellij.lexer.LexerBase;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.lang.javascript.JSTokenTypes;
-
-%%
-
-%public
-%class JavaScript16Lexer
-%extends LexerBase
-%unicode
-%function advanceImpl
-%type IElementType
-%eof{  return;
-%eof}
-
-DIGIT=[0-9]
-OCTAL_DIGIT=[0-7]
-HEX_DIGIT=[0-9A-Fa-f]
-WHITE_SPACE_CHAR=[\ \n\r\t\f]+
-
-IDENTIFIER=[:jletter:] [:jletterdigit:]*
-
-C_STYLE_COMMENT=("/*"[^"*"]{COMMENT_TAIL})|"/*"
-DOC_COMMENT="/*""*"+("/"|([^"/""*"]{COMMENT_TAIL}))?
-COMMENT_TAIL=([^"*"]*("*"+[^"*""/"])?)*("*"+"/")?
-END_OF_LINE_COMMENT="/""/"[^\r\n]*
-
-INTEGER_LITERAL={DECIMAL_INTEGER_LITERAL}|{HEX_INTEGER_LITERAL}
-DECIMAL_INTEGER_LITERAL=(0|([1-9]({DIGIT})*))
-HEX_INTEGER_LITERAL=0[Xx]({HEX_DIGIT})*
-
-FLOAT_LITERAL=({FLOATING_POINT_LITERAL1})|({FLOATING_POINT_LITERAL2})|({FLOATING_POINT_LITERAL3})|({FLOATING_POINT_LITERAL4})
-FLOATING_POINT_LITERAL1=({DIGIT})+"."({DIGIT})*({EXPONENT_PART})?
-FLOATING_POINT_LITERAL2="."({DIGIT})+({EXPONENT_PART})?
-FLOATING_POINT_LITERAL3=({DIGIT})+({EXPONENT_PART})
-FLOATING_POINT_LITERAL4=({DIGIT})+
-EXPONENT_PART=[Ee]["+""-"]?({DIGIT})*
-
-CRLF= [\ \t \f]* (\n | \r | \r\n)
-QUOTED_LITERAL="'"([^\\\'\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*("'"|\\)?
-DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
-ESCAPE_SEQUENCE=\\[^\r\n]
-GROUP = "[" [^\]]* "]"
-
-REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimx]*)?
-DIGIT=[0-9]
-
-%state DIV_OR_GT
-
-%%
-
-<YYINITIAL, DIV_OR_GT> {WHITE_SPACE_CHAR}   { return JSTokenTypes.WHITE_SPACE; }
-
-<YYINITIAL,DIV_OR_GT> {C_STYLE_COMMENT}     { return JSTokenTypes.C_STYLE_COMMENT; }
-<YYINITIAL,DIV_OR_GT> {END_OF_LINE_COMMENT} { return JSTokenTypes.END_OF_LINE_COMMENT; }
-<YYINITIAL,DIV_OR_GT> {DOC_COMMENT}         { return JSTokenTypes.DOC_COMMENT; }
-
-<YYINITIAL,DIV_OR_GT> {INTEGER_LITERAL}     { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
-<YYINITIAL,DIV_OR_GT> {FLOAT_LITERAL}       { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
-
-<YYINITIAL,DIV_OR_GT> {QUOTED_LITERAL}      { return  JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;}
-
-<YYINITIAL,DIV_OR_GT> {DOUBLE_QUOTED_LITERAL}      { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL; }
-
-<YYINITIAL,DIV_OR_GT> "true"                { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "false"               { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "null"                { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "undefined"           { yybegin(DIV_OR_GT); return JSTokenTypes.UNDEFINED_KEYWORD; }
-
-<YYINITIAL,DIV_OR_GT> "break"               { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "case"                { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "catch"               { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "const"               { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "continue"            { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "default"             { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "delete"              { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "do"                  { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "else"                { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "finally"             { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "for"                 { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "function"            { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "if"                  { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "in"                  { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "instanceof"          { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "new"                 { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "return"              { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "switch"              { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "this"                { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "throw"               { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "try"                 { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "typeof"              { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "var"                 { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "void"                { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "while"               { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "with"                { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "set"                 { yybegin(YYINITIAL); return JSTokenTypes.SET_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "get"                 { yybegin(YYINITIAL); return JSTokenTypes.GET_KEYWORD; }
-
-<YYINITIAL, DIV_OR_GT> {IDENTIFIER}                    { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER; }
-
-
-<YYINITIAL, DIV_OR_GT> "."                            { yybegin(YYINITIAL); return JSTokenTypes.DOT; }
-
-
-<YYINITIAL,DIV_OR_GT> "==="                 { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ; }
-<YYINITIAL,DIV_OR_GT> "!=="                 { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ; }
-
-<YYINITIAL,DIV_OR_GT> "++"                  { return JSTokenTypes.PLUSPLUS; }
-<YYINITIAL,DIV_OR_GT> "--"                  { return JSTokenTypes.MINUSMINUS; }
-
-<YYINITIAL,DIV_OR_GT> "=="                  { yybegin(YYINITIAL); return JSTokenTypes.EQEQ; }
-<YYINITIAL,DIV_OR_GT> "!="                  { yybegin(YYINITIAL); return JSTokenTypes.NE; }
-<DIV_OR_GT> "<"                             { yybegin(YYINITIAL); return JSTokenTypes.LT; }
-<YYINITIAL,DIV_OR_GT> ">"                   { yybegin(YYINITIAL); return JSTokenTypes.GT; }
-<DIV_OR_GT> "<="                            { yybegin(YYINITIAL); return JSTokenTypes.LE; }
-<YYINITIAL,DIV_OR_GT> ">="                 { yybegin(YYINITIAL); return JSTokenTypes.GE; }
-<DIV_OR_GT> "<<"                            { yybegin(YYINITIAL); return JSTokenTypes.LTLT; }
-<YYINITIAL,DIV_OR_GT> ">>"                  { yybegin(YYINITIAL); return JSTokenTypes.GTGT; }
-<YYINITIAL,DIV_OR_GT> ">>>"                 { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT; }
-
-<YYINITIAL,DIV_OR_GT> "&"                   { yybegin(YYINITIAL); return JSTokenTypes.AND; }
-<YYINITIAL,DIV_OR_GT> "&&"                  { yybegin(YYINITIAL); return JSTokenTypes.ANDAND; }
-<YYINITIAL,DIV_OR_GT> "|"                   { yybegin(YYINITIAL); return JSTokenTypes.OR; }
-<YYINITIAL,DIV_OR_GT> "||"                  { yybegin(YYINITIAL); return JSTokenTypes.OROR; }
-
-<YYINITIAL,DIV_OR_GT> "+="                  { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ; }
-<YYINITIAL,DIV_OR_GT> "-="                  { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ; }
-<DIV_OR_GT> "*="                            { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ; }
-<DIV_OR_GT> "/="                            { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ; }
-<YYINITIAL,DIV_OR_GT> "&="                  { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ; }
-<YYINITIAL,DIV_OR_GT> "|="                  { yybegin(YYINITIAL); return JSTokenTypes.OREQ; }
-<YYINITIAL,DIV_OR_GT> "^="                  { yybegin(YYINITIAL); return JSTokenTypes.XOREQ; }
-<YYINITIAL,DIV_OR_GT> "%="                  { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ; }
-<DIV_OR_GT> "<<="                           { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
-<YYINITIAL,DIV_OR_GT> ">>="                 { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ; }
-<YYINITIAL,DIV_OR_GT> ">>>="                { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ; }
-
-<YYINITIAL,DIV_OR_GT> "("                   { yybegin(YYINITIAL); return JSTokenTypes.LPAR; }
-<YYINITIAL,DIV_OR_GT> ")"                   { yybegin(DIV_OR_GT);       return JSTokenTypes.RPAR; }
-<YYINITIAL,DIV_OR_GT> "{"                   { yybegin(YYINITIAL); return JSTokenTypes.LBRACE; }
-<YYINITIAL,DIV_OR_GT> "}"                   { yybegin(YYINITIAL); return JSTokenTypes.RBRACE; }
-<YYINITIAL,DIV_OR_GT> "["                   { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET; }
-<YYINITIAL,DIV_OR_GT> "]"                   { yybegin(DIV_OR_GT);       return JSTokenTypes.RBRACKET; }
-<YYINITIAL,DIV_OR_GT> ";"                   { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON; }
-<YYINITIAL,DIV_OR_GT> ","                   { yybegin(YYINITIAL); return JSTokenTypes.COMMA; }
-
-<YYINITIAL,DIV_OR_GT> "="                   { yybegin(YYINITIAL); return JSTokenTypes.EQ; }
-<YYINITIAL,DIV_OR_GT> "!"                   { yybegin(YYINITIAL); return JSTokenTypes.EXCL; }
-<YYINITIAL,DIV_OR_GT> "~"                   { yybegin(YYINITIAL); return JSTokenTypes.TILDE; }
-<YYINITIAL,DIV_OR_GT> "?"                   { yybegin(YYINITIAL); return JSTokenTypes.QUEST; }
-<YYINITIAL,DIV_OR_GT> ":"                   { yybegin(YYINITIAL); return JSTokenTypes.COLON; }
-<YYINITIAL,DIV_OR_GT> "+"                   { yybegin(YYINITIAL); return JSTokenTypes.PLUS; }
-<YYINITIAL,DIV_OR_GT> "-"                   { yybegin(YYINITIAL); return JSTokenTypes.MINUS; }
-<YYINITIAL,DIV_OR_GT> "*"                             { yybegin(YYINITIAL); return JSTokenTypes.MULT; }
-<DIV_OR_GT> "/"                             { yybegin(YYINITIAL); return JSTokenTypes.DIV; }
-<YYINITIAL,DIV_OR_GT> "^"                   { yybegin(YYINITIAL); return JSTokenTypes.XOR; }
-<YYINITIAL,DIV_OR_GT> "%"                   { yybegin(YYINITIAL); return JSTokenTypes.PERC; }
-
-<YYINITIAL> {REGEXP_LITERAL}                { return JSTokenTypes.REGEXP_LITERAL; }
-
-<YYINITIAL> "/"                             { return JSTokenTypes.DIV; }
-
-<YYINITIAL,DIV_OR_GT> [^]                   { return JSTokenTypes.BAD_CHARACTER; }
\ No newline at end of file
diff --git a/lang-version-impl/actionscript-impl/pom.xml b/lang-version-impl/actionscript-impl/pom.xml
new file mode 100644
index 00000000..3273dbaf
--- /dev/null
+++ b/lang-version-impl/actionscript-impl/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-actionscript.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-ecmascript4.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/actionscript-impl/src/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
similarity index 100%
rename from actionscript-impl/src/consulo/actionscript/ActionScriptFileType.java
rename to lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
diff --git a/actionscript-impl/src/consulo/actionscript/ActionScriptFileTypeFactory.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
similarity index 100%
rename from actionscript-impl/src/consulo/actionscript/ActionScriptFileTypeFactory.java
rename to lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
diff --git a/actionscript-impl/src/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
similarity index 100%
rename from actionscript-impl/src/consulo/actionscript/lang/ActionScriptLanguageVersion.java
rename to lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
diff --git a/lang-version-impl/ecmascript4-impl/pom.xml b/lang-version-impl/ecmascript4-impl/pom.xml
new file mode 100644
index 00000000..24b7a6c9
--- /dev/null
+++ b/lang-version-impl/ecmascript4-impl/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-ecmascript4.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/ecmascript4-impl/src/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
similarity index 100%
rename from ecmascript4-impl/src/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
diff --git a/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
similarity index 100%
rename from ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
diff --git a/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
similarity index 100%
rename from ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
diff --git a/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4Parser.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4Parser.java
similarity index 100%
rename from ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4Parser.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4Parser.java
diff --git a/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
similarity index 100%
rename from ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
diff --git a/ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
similarity index 100%
rename from ecmascript4-impl/src/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
diff --git a/lang-version-impl/ecmascript6-impl/pom.xml b/lang-version-impl/ecmascript6-impl/pom.xml
new file mode 100644
index 00000000..883983a3
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-ecmascript6.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/ecmascript6-impl/src/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
diff --git a/ecmascript6-impl/src/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileType.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileTypeFactory.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/lexer/EcmaScript6Lexer.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/lexer/ecmascript6.flex
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6Parser.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6Parser.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
diff --git a/ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
similarity index 100%
rename from ecmascript6-impl/src/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
rename to lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
diff --git a/lang-version-impl/javascript16-impl/pom.xml b/lang-version-impl/javascript16-impl/pom.xml
new file mode 100644
index 00000000..117008af
--- /dev/null
+++ b/lang-version-impl/javascript16-impl/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-javascript16.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/lang-version-impl/javascript17-impl/pom.xml b/lang-version-impl/javascript17-impl/pom.xml
new file mode 100644
index 00000000..754e1e72
--- /dev/null
+++ b/lang-version-impl/javascript17-impl/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-javascript17.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/javascript17-impl/src/consulo/javascript/lang/JavaScript17LanguageVersion.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/JavaScript17LanguageVersion.java
similarity index 100%
rename from javascript17-impl/src/consulo/javascript/lang/JavaScript17LanguageVersion.java
rename to lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/JavaScript17LanguageVersion.java
diff --git a/javascript17-impl/src/consulo/javascript/lang/lexer/JavaScript17Lexer.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript17Lexer.java
similarity index 100%
rename from javascript17-impl/src/consulo/javascript/lang/lexer/JavaScript17Lexer.java
rename to lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript17Lexer.java
diff --git a/javascript17-impl/src/consulo/javascript/lang/lexer/javascript17.flex b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/javascript17.flex
similarity index 100%
rename from javascript17-impl/src/consulo/javascript/lang/lexer/javascript17.flex
rename to lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/javascript17.flex
diff --git a/lang-version-impl/javascript18-impl/pom.xml b/lang-version-impl/javascript18-impl/pom.xml
new file mode 100644
index 00000000..e84f2f69
--- /dev/null
+++ b/lang-version-impl/javascript18-impl/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-javascript18.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-javascript17.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/javascript18-impl/src/consulo/javascript/lang/JavaScript185LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript185LanguageVersion.java
similarity index 100%
rename from javascript18-impl/src/consulo/javascript/lang/JavaScript185LanguageVersion.java
rename to lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript185LanguageVersion.java
diff --git a/javascript18-impl/src/consulo/javascript/lang/JavaScript18LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript18LanguageVersion.java
similarity index 100%
rename from javascript18-impl/src/consulo/javascript/lang/JavaScript18LanguageVersion.java
rename to lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript18LanguageVersion.java
diff --git a/lang-version-impl/json-javascript-impl/pom.xml b/lang-version-impl/json-javascript-impl/pom.xml
new file mode 100644
index 00000000..a67d9a0f
--- /dev/null
+++ b/lang-version-impl/json-javascript-impl/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-json.javascript.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/json-javascript-impl/src/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/JsonFileType.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
diff --git a/json-javascript-impl/src/consulo/json/JsonFileTypeFactory.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/JsonFileTypeFactory.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
diff --git a/json-javascript-impl/src/consulo/json/jom/JomElement.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/JomElement.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java
diff --git a/json-javascript-impl/src/consulo/json/jom/JomFileDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/JomFileDescriptor.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
diff --git a/json-javascript-impl/src/consulo/json/jom/JomFileElement.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/JomFileElement.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
diff --git a/json-javascript-impl/src/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/JomIconDescriptorUpdater.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
diff --git a/json-javascript-impl/src/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/JomManager.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
diff --git a/json-javascript-impl/src/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
diff --git a/json-javascript-impl/src/consulo/json/jom/JomPropertyGetter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/JomPropertyGetter.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java
diff --git a/json-javascript-impl/src/consulo/json/jom/JomUtil.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/JomUtil.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/JomBadValueExpressionException.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/proxy/JomBadValueExpressionException.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/proxy/JomProxyInvocationHandler.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/JomValueConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/proxy/JomValueConverter.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomBooleanValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/proxy/impl/JomBooleanValue.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomCollectionValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/proxy/impl/JomCollectionValue.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomMapConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/proxy/impl/JomMapConverter.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNullableNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/proxy/impl/JomNumberValue.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
diff --git a/json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/jom/proxy/impl/JomStringConverter.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
diff --git a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/lang/JsonJavaScriptParser.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
diff --git a/json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/lang/JsonJavaScriptVersion.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
diff --git a/json-javascript-impl/src/consulo/json/lang/lexer/JsonLexer.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/lang/lexer/JsonLexer.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
diff --git a/json-javascript-impl/src/consulo/json/lang/lexer/json.flex b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/json.flex
similarity index 100%
rename from json-javascript-impl/src/consulo/json/lang/lexer/json.flex
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/json.flex
diff --git a/json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProvider.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
diff --git a/json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProviders.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/JsonFileDescriptorProviders.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
diff --git a/json-javascript-impl/src/consulo/json/validation/NativeArray.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/NativeArray.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
diff --git a/json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/completion/JsonCompletionContributor.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
diff --git a/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
diff --git a/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
diff --git a/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
diff --git a/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
diff --git a/json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
diff --git a/json-javascript-impl/src/consulo/json/validation/descriptor/JsonObjectDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/descriptor/JsonObjectDescriptor.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
diff --git a/json-javascript-impl/src/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
diff --git a/json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/inspections/PropertyValidationInspection.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
diff --git a/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReference.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
diff --git a/json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
similarity index 100%
rename from json-javascript-impl/src/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
rename to lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
diff --git a/lang-version-impl/typescript-impl/pom.xml b/lang-version-impl/typescript-impl/pom.xml
new file mode 100644
index 00000000..ff75e464
--- /dev/null
+++ b/lang-version-impl/typescript-impl/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-typescript.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-javascript17.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>consulo-lang-impl-testing</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/typescript-impl/src/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
similarity index 100%
rename from typescript-impl/src/consulo/typescript/TypeScriptFileType.java
rename to lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
diff --git a/typescript-impl/src/consulo/typescript/TypeScriptFileTypeFactory.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
similarity index 100%
rename from typescript-impl/src/consulo/typescript/TypeScriptFileTypeFactory.java
rename to lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
diff --git a/dist/sdk/clientAny/AJAX.js b/plugin/src/main/dist/sdk/clientAny/AJAX.js
similarity index 100%
rename from dist/sdk/clientAny/AJAX.js
rename to plugin/src/main/dist/sdk/clientAny/AJAX.js
diff --git a/dist/sdk/clientAny/DHTML.js b/plugin/src/main/dist/sdk/clientAny/DHTML.js
similarity index 100%
rename from dist/sdk/clientAny/DHTML.js
rename to plugin/src/main/dist/sdk/clientAny/DHTML.js
diff --git a/dist/sdk/clientAny/DOMCore.js b/plugin/src/main/dist/sdk/clientAny/DOMCore.js
similarity index 100%
rename from dist/sdk/clientAny/DOMCore.js
rename to plugin/src/main/dist/sdk/clientAny/DOMCore.js
diff --git a/dist/sdk/clientAny/DOMEvents.js b/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
similarity index 100%
rename from dist/sdk/clientAny/DOMEvents.js
rename to plugin/src/main/dist/sdk/clientAny/DOMEvents.js
diff --git a/dist/sdk/clientAny/DOMTraversalAndRange.js b/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
similarity index 100%
rename from dist/sdk/clientAny/DOMTraversalAndRange.js
rename to plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
diff --git a/dist/sdk/clientAny/DOMXPath.js b/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
similarity index 100%
rename from dist/sdk/clientAny/DOMXPath.js
rename to plugin/src/main/dist/sdk/clientAny/DOMXPath.js
diff --git a/dist/sdk/clientAny/E4X.js2 b/plugin/src/main/dist/sdk/clientAny/E4X.js2
similarity index 100%
rename from dist/sdk/clientAny/E4X.js2
rename to plugin/src/main/dist/sdk/clientAny/E4X.js2
diff --git a/dist/sdk/clientAny/ECMAScript.js2 b/plugin/src/main/dist/sdk/clientAny/ECMAScript.js2
similarity index 100%
rename from dist/sdk/clientAny/ECMAScript.js2
rename to plugin/src/main/dist/sdk/clientAny/ECMAScript.js2
diff --git a/dist/sdk/clientAny/ECMAScript_Additional.js2 b/plugin/src/main/dist/sdk/clientAny/ECMAScript_Additional.js2
similarity index 100%
rename from dist/sdk/clientAny/ECMAScript_Additional.js2
rename to plugin/src/main/dist/sdk/clientAny/ECMAScript_Additional.js2
diff --git a/distOriginal/clientAny/AJAX.xml b/plugin/src/main/distOriginal/clientAny/AJAX.xml
similarity index 100%
rename from distOriginal/clientAny/AJAX.xml
rename to plugin/src/main/distOriginal/clientAny/AJAX.xml
diff --git a/distOriginal/clientAny/DHTML.xml b/plugin/src/main/distOriginal/clientAny/DHTML.xml
similarity index 100%
rename from distOriginal/clientAny/DHTML.xml
rename to plugin/src/main/distOriginal/clientAny/DHTML.xml
diff --git a/distOriginal/clientAny/DOMCore.xml b/plugin/src/main/distOriginal/clientAny/DOMCore.xml
similarity index 100%
rename from distOriginal/clientAny/DOMCore.xml
rename to plugin/src/main/distOriginal/clientAny/DOMCore.xml
diff --git a/distOriginal/clientAny/DOMEvents.xml b/plugin/src/main/distOriginal/clientAny/DOMEvents.xml
similarity index 100%
rename from distOriginal/clientAny/DOMEvents.xml
rename to plugin/src/main/distOriginal/clientAny/DOMEvents.xml
diff --git a/distOriginal/clientAny/DOMTraversalAndRange.xml b/plugin/src/main/distOriginal/clientAny/DOMTraversalAndRange.xml
similarity index 100%
rename from distOriginal/clientAny/DOMTraversalAndRange.xml
rename to plugin/src/main/distOriginal/clientAny/DOMTraversalAndRange.xml
diff --git a/distOriginal/clientAny/DOMXPath.xml b/plugin/src/main/distOriginal/clientAny/DOMXPath.xml
similarity index 100%
rename from distOriginal/clientAny/DOMXPath.xml
rename to plugin/src/main/distOriginal/clientAny/DOMXPath.xml
diff --git a/distOriginal/clientAny/E4X.js2 b/plugin/src/main/distOriginal/clientAny/E4X.js2
similarity index 100%
rename from distOriginal/clientAny/E4X.js2
rename to plugin/src/main/distOriginal/clientAny/E4X.js2
diff --git a/distOriginal/clientAny/ECMAScript.js2 b/plugin/src/main/distOriginal/clientAny/ECMAScript.js2
similarity index 100%
rename from distOriginal/clientAny/ECMAScript.js2
rename to plugin/src/main/distOriginal/clientAny/ECMAScript.js2
diff --git a/distOriginal/clientAny/ECMAScript_Additional.js2 b/plugin/src/main/distOriginal/clientAny/ECMAScript_Additional.js2
similarity index 100%
rename from distOriginal/clientAny/ECMAScript_Additional.js2
rename to plugin/src/main/distOriginal/clientAny/ECMAScript_Additional.js2
diff --git a/pom.xml b/pom.xml
index ad4f193a..353469b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,14 @@
 		<module>base-api</module>
 		<module>base-impl</module>
 		<module>web-browser-impl</module>
-
+		<module>lang-version-impl/javascript16-impl</module>
+		<module>lang-version-impl/javascript17-impl</module>
+		<module>lang-version-impl/javascript18-impl</module>
+		<module>lang-version-impl/typescript-impl</module>
+		<module>lang-version-impl/actionscript-impl</module>
+		<module>lang-version-impl/ecmascript4-impl</module>
+		<module>lang-version-impl/ecmascript6-impl</module>
+		<module>lang-version-impl/json-javascript-impl</module>
 		<module>plugin</module>
 	</modules>
 </project>
\ No newline at end of file

From ed8c663ecedc735658814d4518e245c738f69f2d Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 23 Dec 2017 17:05:09 +0300
Subject: [PATCH 032/340] preparing for mavenize

---
 README.md                                     |   2 +-
 debugger/debugger-impl/pom.xml                |  57 +++++++++++++++
 .../javascript/JSDebuggerSupportUtils.java    |   0
 .../debugger/JavaScriptEditorsProvider.java   |   0
 .../JavaScriptLineBreakpointType.java         |   0
 .../JavaScriptLineBreakpointTypeResolver.java |   2 +
 .../debugger/JavaScriptListPanel.java         |   0
 debugger/v8-debugger-impl/pom.xml             |  69 ++++++++++++++++++
 .../run/debug/V8BaseVariableValue.java        |   0
 .../run/debug/V8DebugEventListener.java       |   0
 .../javascript/run/debug/V8DebugProcess.java  |   1 -
 .../run/debug/V8ExecutionStack.java           |   0
 .../javascript/run/debug/V8ScriptUtil.java    |   0
 .../javascript/run/debug/V8StackFrame.java    |   0
 .../run/debug/V8SuspendContext.java           |   0
 .../javascript/run/debug/V8VariableValue.java |   0
 .../javascript/run/debug/V8WatchValue.java    |   0
 inspections/pom.xml                           |  57 +++++++++++++++
 .../com/sixrr/inspectjs/BaseInspection.java   |   0
 .../inspectjs/BaseInspectionVisitor.java      |   0
 .../sixrr/inspectjs/InspectionComparator.java |   0
 .../sixrr/inspectjs/InspectionJSBundle.java   |   0
 .../com/sixrr/inspectjs/InspectionJSFix.java  |   0
 .../sixrr/inspectjs/InspectionJSPlugin.java   |   0
 .../com/sixrr/inspectjs/JSGroupNames.java     |   0
 .../inspectjs/JSRecursiveElementVisitor.java  |   0
 .../sixrr/inspectjs/JavaScriptInspection.java |   0
 .../AssignmentResultUsedJSInspection.java     |   0
 ...ignmentToForLoopParameterJSInspection.java |   0
 ...gnmentToFunctionParameterJSInspection.java |   0
 .../NestedAssignmentJSInspection.java         |   0
 ...entWithOperatorAssignmentJSInspection.java |   0
 .../SillyAssignmentJSInspection.java          |   0
 .../bitwise/IncompatibleMaskJSInspection.java |   0
 ...ointlessBitwiseExpressionJSInspection.java |   0
 .../bitwise/ShiftOutOfRangeJSInspection.java  |   0
 .../bugs/DivideByZeroJSInspection.java        |   0
 ...ityComparisonWithCoercionJSInspection.java |   0
 .../bugs/InfiniteLoopJSInspection.java        |   0
 .../bugs/InfiniteRecursionJSInspection.java   |   0
 ...tCircuitBooleanExpressionJSInspection.java |   0
 .../ObjectAllocationIgnoredJSInspection.java  |   0
 .../sixrr/inspectjs/bugs/RecursionUtils.java  |   0
 .../inspectjs/bugs/RecursionVisitor.java      |   0
 ...extLabelInSwitchStatementJSInspection.java |   0
 .../AnonymousFunctionJSInspection.java        |   0
 .../confusing/BlockStatementJSInspection.java |   0
 .../confusing/CallerJSInspection.java         |   0
 .../CommaExpressionJSInspection.java          |   0
 .../ConditionalExpressionJSInspection.java    |   0
 ...usingFloatingPointLiteralJSInspection.java |   0
 .../ConfusingPlusesOrMinusesJSInspection.java |   0
 .../DynamicallyGeneratedCodeJSInspection.java |   0
 .../EmptyStatementBodyJSInspection.java       |   0
 ...rementDecrementResultUsedJSInspection.java |   0
 .../confusing/MagicNumberJSInspection.java    |   0
 ...atedConditionalExpressionJSInspection.java |   0
 .../NegatedIfStatementJSInspection.java       |   0
 ...stedConditionalExpressionJSInspection.java |   0
 .../confusing/NestedFunctionJSInspection.java |   0
 .../confusing/OctalIntegerJSInspection.java   |   0
 ...mplexArithmeticExpressionJSInspection.java |   0
 ...yComplexBooleanExpressionJSInspection.java |   0
 ...tlessArithmeticExpressionJSInspection.java |   0
 ...ointlessBooleanExpressionJSInspection.java |   0
 .../confusing/VoidExpressionJSInspection.java |   0
 .../confusing/WithStatementJSInspection.java  |   0
 .../control/BreakStatementJSInspection.java   |   0
 .../BreakStatementWithLabelJSInspection.java  |   0
 ...sionWithIdenticalBranchesJSInspection.java |   0
 ...tantConditionalExpressionJSInspection.java |   0
 .../ConstantIfStatementJSInspection.java      |   0
 .../ContinueStatementJSInspection.java        |   0
 ...ontinueStatementWithLabelJSInspection.java |   0
 ...efaultNotLastCaseInSwitchJSInspection.java |   0
 .../DuplicateConditionJSInspection.java       |   0
 ...lthroughInSwitchStatementJSInspection.java |   0
 ...ForLoopReplaceableByWhileJSInspection.java |   0
 ...ThatDoesntUseLoopVariableJSInspection.java |   0
 ...mentWithIdenticalBranchesJSInspection.java |   0
 ...tementWithTooManyBranchesJSInspection.java |   0
 .../control/LabeledStatementJSInspection.java |   0
 ...opStatementThatDoesntLoopJSInspection.java |   0
 .../NestedSwitchStatementJSInspection.java    |   0
 ...tementWithNoDefaultBranchJSInspection.java |   0
 .../control/TailRecursionJSInspection.java    |   0
 .../TrivialConditionalJSInspection.java       |   0
 .../control/TrivialIfJSInspection.java        |   0
 .../UnnecessaryContinueJSInspection.java      |   0
 .../control/UnnecessaryLabelJSInspection.java |   0
 ...saryLabelOnBreakStatementJSInspection.java |   0
 ...yLabelOnContinueStatementJSInspection.java |   0
 .../UnnecessaryReturnJSInspection.java        |   0
 .../ReuseOfLocalVariableJSInspection.java     |   0
 .../UnnecessaryLocalVariableJSInspection.java |   0
 .../dataflow/VariableAccessUtils.java         |   0
 .../dataflow/VariableAssignedVisitor.java     |   0
 .../VariableUsedInInnerFunctionVisitor.java   |   0
 .../dataflow/VariableUsedVisitor.java         |   0
 .../dom/DocumentWriteJSInspection.java        |   0
 .../inspectjs/dom/InnerHTMLJSInspection.java  |   0
 .../dom/PlatformDetectionJSInspection.java    |   0
 .../XHTMLIncompatabilitiesJSInspection.java   |   0
 .../exception/CatchParameterUsedVisitor.java  |   0
 ...ueOrBreakFromFinallyBlockJSInspection.java |   0
 .../EmptyCatchBlockJSInspection.java          |   0
 .../EmptyFinallyBlockJSInspection.java        |   0
 .../exception/EmptyTryBlockJSInspection.java  |   0
 .../ExceptionCaughtLocallyJSInspection.java   |   0
 .../ReturnFromFinallyBlockJSInspection.java   |   0
 .../ThrowFromFinallyBlockJSInspection.java    |   0
 .../UnusedCatchParameterJSInspection.java     |   0
 .../com/sixrr/inspectjs/fix/RenameFix.java    |   0
 .../CyclomaticComplexityJSInspection.java     |   0
 .../CyclomaticComplexityVisitor.java          |   0
 .../FunctionMetricsInspection.java            |   0
 ...FunctionWithMultipleLoopsJSInspection.java |   0
 ...nWithMultipleReturnPointsJSInspection.java |   0
 .../functionmetrics/LoopCountVisitor.java     |   0
 .../functionmetrics/NegationCountVisitor.java |   0
 .../NestingDepthJSInspection.java             |   0
 .../functionmetrics/NestingDepthVisitor.java  |   0
 .../ParametersPerFunctionJSInspection.java    |   0
 .../StatementCountVisitor.java                |   0
 .../StatementsPerFunctionJSInspection.java    |   0
 ...ThreeNegationsPerFunctionJSInspection.java |   0
 .../naming/ConventionInspection.java          |   0
 .../FunctionNamingConventionJSInspection.java |   0
 ...lVariableNamingConventionJSInspection.java |   0
 ...ParameterNamingConventionJSInspection.java |   0
 .../style/ChainedEqualityJSInspection.java    |   0
 .../ChainedFunctionCallJSInspection.java      |   0
 ...ConstantOnLHSOfComparisonJSInspection.java |   0
 ...ConstantOnRHSOfComparisonJSInspection.java |   0
 .../style/NestedFunctionCallJSInspection.java |   0
 .../NonBlockStatementBodyJSInspection.java    |   0
 .../UnterminatedStatementJSInspection.java    |   0
 .../ui/FormattedTextFieldMacFix.java          |   0
 .../sixrr/inspectjs/ui/RegExFormatter.java    |   0
 .../inspectjs/ui/RegExInputVerifier.java      |   0
 .../ui/SingleCheckboxOptionsPanel.java        |   0
 .../ui/SingleIntegerFieldOptionsPanel.java    |   0
 .../com/sixrr/inspectjs/utils/BoolUtils.java  |   0
 .../inspectjs/utils/ComparisonUtils.java      |   0
 .../inspectjs/utils/ConditionalUtils.java     |   0
 .../inspectjs/utils/ControlFlowUtils.java     |   0
 .../inspectjs/utils/EquivalenceChecker.java   |   0
 .../sixrr/inspectjs/utils/ExpressionUtil.java |   0
 .../inspectjs/utils/ParenthesesUtils.java     |   0
 .../inspectjs/utils/SideEffectChecker.java    |   0
 .../sixrr/inspectjs/utils/StatementUtils.java |   0
 .../BadExpressionStatementJSInspection.java   |   0
 .../DebuggerStatementJSInspection.java        |   0
 .../DuplicateCaseLabelJSInspection.java       |   0
 ...DuplicatePropertyOnObjectJSInspection.java |   0
 ...onWithInconsistentReturnsJSInspection.java |   0
 .../StringLiteralBreaksHTMLJSInspection.java  |   0
 ...ionReferencesGlobalObjectJSInspection.java |   0
 .../validity/UnreachableCodeJSInspection.java |   0
 .../inspectjs/InspectionJSBundle.properties   |   0
 .../AnonymousFunctionJS.html                  |   0
 .../AssignmentResultUsedJS.html               |   0
 .../AssignmentToForLoopParameterJS.html       |   0
 .../AssignmentToFunctionParameterJS.html      |   0
 .../BadExpressionStatementJS.html             |   0
 .../BlockStatementJS.html                     |   0
 .../BreakStatementJS.html                     |   0
 .../BreakStatementWithLabelJS.html            |   0
 .../inspectionDescriptions/CallerJS.html      |   0
 .../ChainedEqualityJS.html                    |   0
 .../ChainedFunctionCallJS.html                |   0
 .../CommaExpressionJS.html                    |   0
 .../ConditionalExpressionJS.html              |   0
 ...onalExpressionWithIdenticalBranchesJS.html |   0
 .../ConfusingFloatingPointLiteralJS.html      |   0
 .../ConfusingPlusesOrMinusesJS.html           |   0
 .../ConstantConditionalExpressionJS.html      |   0
 .../ConstantIfStatementJS.html                |   0
 .../ConstantOnLHSOfComparisonJS.html          |   0
 .../ConstantOnRHSOfComparisonJS.html          |   0
 .../ContinueOrBreakFromFinallyBlockJS.html    |   0
 .../ContinueStatementJS.html                  |   0
 .../ContinueStatementWithLabelJS.html         |   0
 .../CyclomaticComplexityJS.html               |   0
 .../DebuggerStatementJS.html                  |   0
 .../DefaultNotLastCaseInSwitchJS.html         |   0
 .../DivideByZeroJS.html                       |   0
 .../DocumentWriteJS.html                      |   0
 .../DuplicateCaseLabelJS.html                 |   0
 .../DuplicateConditionJS.html                 |   0
 .../DuplicatePropertyOnObjectJS.html          |   0
 .../DynamicallyGeneratedCodeJS.html           |   0
 .../EmptyCatchBlockJS.html                    |   0
 .../EmptyFinallyBlockJS.html                  |   0
 .../EmptyStatementBodyJS.html                 |   0
 .../EmptyTryBlockJS.html                      |   0
 .../EqualityComparisonWithCoercionJS.html     |   0
 .../ExceptionCaughtLocallyJS.html             |   0
 .../FallthroughInSwitchStatementJS.html       |   0
 .../ForLoopReplaceableByWhileJS.html          |   0
 .../ForLoopThatDoesntUseLoopVariableJS.html   |   0
 .../FunctionNamingConventionJS.html           |   0
 .../FunctionWithInconsistentReturnsJS.html    |   0
 .../FunctionWithMultipleLoopsJS.html          |   0
 .../FunctionWithMultipleReturnPointsJS.html   |   0
 .../IfStatementWithIdenticalBranchesJS.html   |   0
 .../IfStatementWithTooManyBranchesJS.html     |   0
 .../IncompatibleMaskJS.html                   |   0
 .../IncrementDecrementResultUsedJS.html       |   0
 .../InfiniteLoopJS.html                       |   0
 .../InfiniteRecursionJS.html                  |   0
 .../inspectionDescriptions/InnerHTMLJS.html   |   0
 .../LabeledStatementJS.html                   |   0
 .../LocalVariableNamingConventionJS.html      |   0
 .../LoopStatementThatDoesntLoopJS.html        |   0
 .../inspectionDescriptions/MagicNumberJS.html |   0
 .../NegatedConditionalExpressionJS.html       |   0
 .../NegatedIfStatementJS.html                 |   0
 .../NestedAssignmentJS.html                   |   0
 .../NestedConditionalExpressionJS.html        |   0
 .../NestedFunctionCallJS.html                 |   0
 .../NestedFunctionJS.html                     |   0
 .../NestedSwitchStatementJS.html              |   0
 .../NestingDepthJS.html                       |   0
 .../NonBlockStatementBodyJS.html              |   0
 .../NonShortCircuitBooleanExpressionJS.html   |   0
 .../ObjectAllocationIgnoredJS.html            |   0
 .../OctalIntegerJS.html                       |   0
 .../OverlyComplexArithmeticExpressionJS.html  |   0
 .../OverlyComplexBooleanExpressionJS.html     |   0
 .../ParameterNamingConventionJS.html          |   0
 .../ParametersPerFunctionJS.html              |   0
 .../PlatformDetectionJS.html                  |   0
 .../PointlessArithmeticExpressionJS.html      |   0
 .../PointlessBitwiseExpressionJS.html         |   0
 .../PointlessBooleanExpressionJS.html         |   0
 ...aceAssignmentWithOperatorAssignmentJS.html |   0
 .../ReservedWordUsedAsNameJS.html             |   0
 .../ReturnFromFinallyBlockJS.html             |   0
 .../ReuseOfLocalVariableJS.html               |   0
 .../ShiftOutOfRangeJS.html                    |   0
 .../SillyAssignmentJS.html                    |   0
 .../StatementsPerFunctionJS.html              |   0
 .../StringLiteralBreaksHTMLJS.html            |   0
 .../SwitchStatementWithNoDefaultBranchJS.html |   0
 .../TailRecursionJS.html                      |   0
 .../TextLabelInSwitchStatementJS.html         |   0
 ...hisExpressionReferencesGlobalObjectJS.html |   0
 .../ThreeNegationsPerFunctionJS.html          |   0
 .../ThrowFromFinallyBlockJS.html              |   0
 .../TrivialConditionalJS.html                 |   0
 .../inspectionDescriptions/TrivialIfJS.html   |   0
 .../UnnecessaryContinueJS.html                |   0
 .../UnnecessaryLabelJS.html                   |   0
 .../UnnecessaryLabelOnBreakStatementJS.html   |   0
 ...UnnecessaryLabelOnContinueStatementJS.html |   0
 .../UnnecessaryLocalVariableJS.html           |   0
 .../UnnecessaryReturnJS.html                  |   0
 .../UnreachableCodeJS.html                    |   0
 .../UnterminatedStatementJS.html              |   0
 .../UnusedCatchParameterJS.html               |   0
 .../VoidExpressionJS.html                     |   0
 .../WithStatementJS.html                      |   0
 .../XHTMLIncompatabilitiesJS.html             |   0
 intentions/pom.xml                            |  57 +++++++++++++++
 .../lang/javascript/JSAbstractBundle.java     |   0
 .../intention/JSElementIterator.java          |   0
 .../intention/JSElementPredicate.java         |   0
 .../intention/JSFunctionVisitor.java          |   0
 .../javascript/intention/JSIntention.java     |   0
 .../intention/JSIntentionBundle.java          |   0
 .../intention/JSMutablyNamedIntention.java    |   0
 .../intention/bool/ComparisonPredicate.java   |   0
 .../intention/bool/ConjunctionPredicate.java  |   0
 .../bool/JSDeMorgansLawIntention.java         |   0
 .../bool/JSFlipComparisonIntention.java       |   0
 .../bool/JSFlipConjunctionIntention.java      |   0
 .../bool/JSNegateComparisonIntention.java     |   0
 .../JSRemoveBooleanEqualityIntention.java     |   0
 .../braces/JSAddBracesIntention.java          |   0
 .../braces/JSRemoveBracesIntention.java       |   0
 .../JSChangeToCStyleCommentIntention.java     |   0
 .../JSChangeToEndOfLineCommentIntention.java  |   0
 .../JSMoveCommentToSeparateLineIntention.java |   0
 .../JSFlipConditionalIntention.java           |   0
 .../conditional/JSFlipIfIntention.java        |   0
 .../JSRemoveConditionalIntention.java         |   0
 .../JSReplaceConditionalWithIfIntention.java  |   0
 .../JSConstantExpressionIntention.java        |   0
 .../JSConstantSubexpressionIntention.java     |   0
 .../JSExtractIncrementIntention.java          |   0
 ...DeclarationAndInitializationIntention.java |   0
 ...DeclarationAndInitializationIntention.java |   0
 .../JSMergeParallelForInLoopsIntention.java   |   0
 .../JSMergeParallelForLoopsIntention.java     |   0
 .../JSConvertIntegerToDecimalIntention.java   |   0
 .../JSConvertIntegerToHexIntention.java       |   0
 .../JSConvertIntegerToOctalIntention.java     |   0
 .../JSReplaceMultiplyWithShiftIntention.java  |   0
 .../JSReplaceShiftWithMultiplyIntention.java  |   0
 .../intention/number/ShiftUtils.java          |   0
 ...eplaceWithOperatorAssignmentIntention.java |   0
 ...RemoveUnnecessaryParenthesesIntention.java |   0
 ...JSDoubleToSingleQuotedStringIntention.java |   0
 ...inConcatenatedStringLiteralsIntention.java |   0
 ...JSSingleToDoubleQuotedStringIntention.java |   0
 .../intention/string/StringUtil.java          |   0
 .../intention/switchtoif/CaseUtil.java        |   0
 .../JSReplaceIfWithSwitchIntention.java       |  25 ++++---
 .../JSReplaceSwitchWithIfIntention.java       |   0
 .../switchtoif/LabelSearchVisitor.java        |   0
 .../switchtoif/LocalVariableUsageVisitor.java |   0
 .../trivialif/JSMergeElseIfIntention.java     |   0
 .../trivialif/JSMergeIfAndIntention.java      |   0
 .../trivialif/JSMergeIfOrIntention.java       |   0
 .../JSMergeParallelIfsIntention.java          |   0
 .../JSRemoveRedundantElseIntention.java       |   0
 .../JSReplaceIfWithConditionalIntention.java  |   0
 .../trivialif/JSSimplifyIfElseIntention.java  |   0
 .../trivialif/JSSplitElseIfIntention.java     |   0
 .../trivialif/JSSplitIfAndIntention.java      |   0
 .../trivialif/JSSplitIfOrIntention.java       |   0
 .../lang/javascript/psiutil/ArrayStack.java   |   0
 .../psiutil/BinaryOperatorUtils.java          |   0
 .../lang/javascript/psiutil/BoolUtils.java    |   0
 .../javascript/psiutil/ComparisonUtils.java   |   0
 .../javascript/psiutil/ConditionalUtils.java  |   0
 .../javascript/psiutil/ControlFlowUtils.java  |   0
 .../javascript/psiutil/DeclarationUtils.java  |   0
 .../psiutil/EquivalenceChecker.java           |   0
 .../lang/javascript/psiutil/ErrorUtil.java    |   0
 .../javascript/psiutil/ExpressionUtil.java    |   0
 .../javascript/psiutil/FindReferenceUtil.java |   0
 .../javascript/psiutil/JSElementFactory.java  |   0
 .../psiutil/JSRecursionVisitor.java           |   0
 .../psiutil/JSRecursiveElementVisitor.java    |   0
 .../lang/javascript/psiutil/NumberUtil.java   |   0
 .../javascript/psiutil/ParenthesesUtils.java  |   0
 .../javascript/psiutil/RecursionUtil.java     |   0
 .../javascript/psiutil/SideEffectChecker.java |   0
 .../lang/javascript/psiutil/TreeUtil.java     |   0
 .../psiutil/VariableAccessUtil.java           |   0
 .../JSAddBracesIntention/after.js.template    |   0
 .../JSAddBracesIntention/before.js.template   |   0
 .../JSAddBracesIntention/description.html     |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../JSDeMorgansLawIntention/after.js.template |   0
 .../before.js.template                        |   0
 .../JSDeMorgansLawIntention/description.html  |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../JSFlipIfIntention/after.js.template       |   0
 .../JSFlipIfIntention/before.js.template      |   0
 .../JSFlipIfIntention/description.html        |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../JSMergeElseIfIntention/after.js.template  |   0
 .../JSMergeElseIfIntention/before.js.template |   0
 .../JSMergeElseIfIntention/description.html   |   0
 .../JSMergeIfAndIntention/after.js.template   |   0
 .../JSMergeIfAndIntention/before.js.template  |   0
 .../JSMergeIfAndIntention/description.html    |   0
 .../JSMergeIfOrIntention/after.js.template    |   0
 .../JSMergeIfOrIntention/before.js.template   |   0
 .../JSMergeIfOrIntention/description.html     |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../JSRemoveBracesIntention/after.js.template |   0
 .../before.js.template                        |   0
 .../JSRemoveBracesIntention/description.html  |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../test/after.template-1.js                  |   0
 .../test/before.template-1.js                 |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../after.js.template                         |   0
 .../before.js.template                        |   0
 .../description.html                          |   0
 .../JSSplitElseIfIntention/after.js.template  |   0
 .../JSSplitElseIfIntention/before.js.template |   0
 .../JSSplitElseIfIntention/description.html   |   0
 .../JSSplitIfAndIntention/after.js.template   |   0
 .../JSSplitIfAndIntention/before.js.template  |   0
 .../JSSplitIfAndIntention/description.html    |   0
 .../JSSplitIfOrIntention/after.js.template    |   0
 .../JSSplitIfOrIntention/before.js.template   |   0
 .../JSSplitIfOrIntention/description.html     |   0
 .../JavaScriptIntentionBundle.properties      |   0
 .../JavaScriptIntentionBundle_fr.properties   |   0
 plugin/pom.xml                                |  13 ++++
 pom.xml                                       |   5 ++
 v8-debugger-impl/lib/json_simple-1.1.jar      | Bin 16046 -> 0 bytes
 v8-debugger-impl/lib/lib.org.chromium.sdk.jar | Bin 587958 -> 0 bytes
 479 files changed, 276 insertions(+), 12 deletions(-)
 create mode 100644 debugger/debugger-impl/pom.xml
 rename {plugin => debugger/debugger-impl}/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java (100%)
 rename {debugger-impl/src => debugger/debugger-impl/src/main/java}/consulo/javascript/debugger/JavaScriptEditorsProvider.java (100%)
 rename {debugger-impl/src => debugger/debugger-impl/src/main/java}/consulo/javascript/debugger/JavaScriptLineBreakpointType.java (100%)
 rename {debugger-impl/src => debugger/debugger-impl/src/main/java}/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java (94%)
 rename {debugger-impl/src => debugger/debugger-impl/src/main/java}/consulo/javascript/debugger/JavaScriptListPanel.java (100%)
 create mode 100644 debugger/v8-debugger-impl/pom.xml
 rename {v8-debugger-impl/src => debugger/v8-debugger-impl/src/main/java}/consulo/javascript/run/debug/V8BaseVariableValue.java (100%)
 rename {v8-debugger-impl/src => debugger/v8-debugger-impl/src/main/java}/consulo/javascript/run/debug/V8DebugEventListener.java (100%)
 rename {v8-debugger-impl/src => debugger/v8-debugger-impl/src/main/java}/consulo/javascript/run/debug/V8DebugProcess.java (99%)
 rename {v8-debugger-impl/src => debugger/v8-debugger-impl/src/main/java}/consulo/javascript/run/debug/V8ExecutionStack.java (100%)
 rename {v8-debugger-impl/src => debugger/v8-debugger-impl/src/main/java}/consulo/javascript/run/debug/V8ScriptUtil.java (100%)
 rename {v8-debugger-impl/src => debugger/v8-debugger-impl/src/main/java}/consulo/javascript/run/debug/V8StackFrame.java (100%)
 rename {v8-debugger-impl/src => debugger/v8-debugger-impl/src/main/java}/consulo/javascript/run/debug/V8SuspendContext.java (100%)
 rename {v8-debugger-impl/src => debugger/v8-debugger-impl/src/main/java}/consulo/javascript/run/debug/V8VariableValue.java (100%)
 rename {v8-debugger-impl/src => debugger/v8-debugger-impl/src/main/java}/consulo/javascript/run/debug/V8WatchValue.java (100%)
 create mode 100644 inspections/pom.xml
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/BaseInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/BaseInspectionVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/InspectionComparator.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/InspectionJSBundle.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/InspectionJSFix.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/InspectionJSPlugin.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/JSGroupNames.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/JSRecursiveElementVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/JavaScriptInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bugs/RecursionUtils.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bugs/RecursionVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/CallerJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/BreakStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/TailRecursionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/TrivialIfJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/fix/RenameFix.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/naming/ConventionInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/ui/RegExFormatter.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/ui/RegExInputVerifier.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/utils/BoolUtils.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/utils/ComparisonUtils.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/utils/ConditionalUtils.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/utils/ControlFlowUtils.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/utils/EquivalenceChecker.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/utils/ExpressionUtil.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/utils/ParenthesesUtils.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/utils/SideEffectChecker.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/utils/StatementUtils.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java (100%)
 rename inspections/src/{ => main/java}/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java (100%)
 rename inspections/{ => src/main}/resources/com/sixrr/inspectjs/InspectionJSBundle.properties (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/AnonymousFunctionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/AssignmentResultUsedJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/BadExpressionStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/BlockStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/BreakStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/BreakStatementWithLabelJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/CallerJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ChainedEqualityJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ChainedFunctionCallJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/CommaExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ConditionalExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ConstantIfStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ContinueStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/CyclomaticComplexityJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/DebuggerStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/DivideByZeroJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/DocumentWriteJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/DuplicateCaseLabelJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/DuplicateConditionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/EmptyCatchBlockJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/EmptyFinallyBlockJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/EmptyStatementBodyJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/EmptyTryBlockJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/FunctionNamingConventionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/IncompatibleMaskJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/InfiniteLoopJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/InfiniteRecursionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/InnerHTMLJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/LabeledStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/MagicNumberJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NegatedIfStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NestedAssignmentJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NestedConditionalExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NestedFunctionCallJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NestedFunctionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NestedSwitchStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NestingDepthJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NonBlockStatementBodyJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/OctalIntegerJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ParameterNamingConventionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ParametersPerFunctionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/PlatformDetectionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ShiftOutOfRangeJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/SillyAssignmentJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/StatementsPerFunctionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/TailRecursionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/TrivialConditionalJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/TrivialIfJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/UnnecessaryContinueJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/UnnecessaryLabelJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/UnnecessaryReturnJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/UnreachableCodeJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/UnterminatedStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/UnusedCatchParameterJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/VoidExpressionJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/WithStatementJS.html (100%)
 rename inspections/{ => src/main}/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html (100%)
 create mode 100644 intentions/pom.xml
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/JSAbstractBundle.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/JSElementIterator.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/JSIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/string/StringUtil.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java (97%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java (100%)
 rename intentions/src/{ => main/java}/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSAddBracesIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSAddBracesIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSAddBracesIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConstantExpressionIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConstantExpressionIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConstantExpressionIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConstantSubexpressionIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConstantSubexpressionIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConstantSubexpressionIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConvertIntegerToHexIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConvertIntegerToHexIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConvertIntegerToHexIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSDeMorgansLawIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSDeMorgansLawIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSDeMorgansLawIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSExtractIncrementIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSExtractIncrementIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSExtractIncrementIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipComparisonIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipComparisonIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipComparisonIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipConditionalIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipConditionalIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipConditionalIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipConjunctionIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipConjunctionIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipConjunctionIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipIfIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipIfIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSFlipIfIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeElseIfIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeElseIfIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeElseIfIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeIfAndIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeIfAndIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeIfAndIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeIfOrIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeIfOrIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeIfOrIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeParallelIfsIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeParallelIfsIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMergeParallelIfsIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSNegateComparisonIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSNegateComparisonIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSNegateComparisonIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveBracesIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveBracesIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveBracesIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveConditionalIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveConditionalIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveConditionalIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveRedundantElseIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveRedundantElseIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveRedundantElseIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/after.template-1.js (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/before.template-1.js (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSimplifyIfElseIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSimplifyIfElseIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSimplifyIfElseIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitElseIfIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitElseIfIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitElseIfIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitIfAndIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitIfAndIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitIfAndIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitIfOrIntention/after.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitIfOrIntention/before.js.template (100%)
 rename intentions/{ => src/main}/resources/intentionDescriptions/JSSplitIfOrIntention/description.html (100%)
 rename intentions/{ => src/main}/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties (100%)
 rename intentions/{ => src/main}/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle_fr.properties (100%)
 delete mode 100644 v8-debugger-impl/lib/json_simple-1.1.jar
 delete mode 100644 v8-debugger-impl/lib/lib.org.chromium.sdk.jar

diff --git a/README.md b/README.md
index ff7c9242..075c9a79 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-[![Build Status](http://must-be.org/jenkins/job/consulo-javascript/badge/icon)](http://must-be.org/jenkins/job/consulo-javascript/)
+[![Build Status](https://ci.consulo.io/job/consulo-javascript/badge/icon)](https://ci.consulo.io/job/consulo-javascript)
\ No newline at end of file
diff --git a/debugger/debugger-impl/pom.xml b/debugger/debugger-impl/pom.xml
new file mode 100644
index 00000000..7a7929b3
--- /dev/null
+++ b/debugger/debugger-impl/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-debugger.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java b/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
similarity index 100%
rename from plugin/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
rename to debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
diff --git a/debugger-impl/src/consulo/javascript/debugger/JavaScriptEditorsProvider.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
similarity index 100%
rename from debugger-impl/src/consulo/javascript/debugger/JavaScriptEditorsProvider.java
rename to debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
diff --git a/debugger-impl/src/consulo/javascript/debugger/JavaScriptLineBreakpointType.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
similarity index 100%
rename from debugger-impl/src/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
rename to debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
diff --git a/debugger-impl/src/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
similarity index 94%
rename from debugger-impl/src/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
rename to debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
index 76b1567e..4a8f831f 100644
--- a/debugger-impl/src/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
@@ -21,6 +21,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.xdebugger.breakpoints.XLineBreakpointType;
+import consulo.annotations.RequiredReadAction;
 import consulo.xdebugger.breakpoints.XLineBreakpointTypeResolver;
 
 /**
@@ -29,6 +30,7 @@
  */
 public class JavaScriptLineBreakpointTypeResolver implements XLineBreakpointTypeResolver
 {
+	@RequiredReadAction
 	@Nullable
 	@Override
 	public XLineBreakpointType<?> resolveBreakpointType(@NotNull Project project, @NotNull VirtualFile virtualFile, int line)
diff --git a/debugger-impl/src/consulo/javascript/debugger/JavaScriptListPanel.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
similarity index 100%
rename from debugger-impl/src/consulo/javascript/debugger/JavaScriptListPanel.java
rename to debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
diff --git a/debugger/v8-debugger-impl/pom.xml b/debugger/v8-debugger-impl/pom.xml
new file mode 100644
index 00000000..db490cf5
--- /dev/null
+++ b/debugger/v8-debugger-impl/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-v8.debugger.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-debugger.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.googlecode.json-simple</groupId>
+			<artifactId>json-simple</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>consulo.internal</groupId>
+			<artifactId>lib.org.chromium.sdk</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8BaseVariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
similarity index 100%
rename from v8-debugger-impl/src/consulo/javascript/run/debug/V8BaseVariableValue.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugEventListener.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
similarity index 100%
rename from v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugEventListener.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
similarity index 99%
rename from v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugProcess.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
index f905781f..7c104612 100644
--- a/v8-debugger-impl/src/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
@@ -251,7 +251,6 @@ public void resume()
 	@Override
 	public void runToPosition(@NotNull XSourcePosition xSourcePosition)
 	{
-
 	}
 
 	@NotNull
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8ExecutionStack.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
similarity index 100%
rename from v8-debugger-impl/src/consulo/javascript/run/debug/V8ExecutionStack.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8ScriptUtil.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
similarity index 100%
rename from v8-debugger-impl/src/consulo/javascript/run/debug/V8ScriptUtil.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8StackFrame.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
similarity index 100%
rename from v8-debugger-impl/src/consulo/javascript/run/debug/V8StackFrame.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8SuspendContext.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
similarity index 100%
rename from v8-debugger-impl/src/consulo/javascript/run/debug/V8SuspendContext.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8VariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
similarity index 100%
rename from v8-debugger-impl/src/consulo/javascript/run/debug/V8VariableValue.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
diff --git a/v8-debugger-impl/src/consulo/javascript/run/debug/V8WatchValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
similarity index 100%
rename from v8-debugger-impl/src/consulo/javascript/run/debug/V8WatchValue.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
diff --git a/inspections/pom.xml b/inspections/pom.xml
new file mode 100644
index 00000000..8d9000a6
--- /dev/null
+++ b/inspections/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-inspections</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/inspections/src/com/sixrr/inspectjs/BaseInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/BaseInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/BaseInspectionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/BaseInspectionVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/InspectionComparator.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/InspectionComparator.java
rename to inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
diff --git a/inspections/src/com/sixrr/inspectjs/InspectionJSBundle.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/InspectionJSBundle.java
rename to inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java
diff --git a/inspections/src/com/sixrr/inspectjs/InspectionJSFix.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/InspectionJSFix.java
rename to inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
diff --git a/inspections/src/com/sixrr/inspectjs/InspectionJSPlugin.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/InspectionJSPlugin.java
rename to inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
diff --git a/inspections/src/com/sixrr/inspectjs/JSGroupNames.java b/inspections/src/main/java/com/sixrr/inspectjs/JSGroupNames.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/JSGroupNames.java
rename to inspections/src/main/java/com/sixrr/inspectjs/JSGroupNames.java
diff --git a/inspections/src/com/sixrr/inspectjs/JSRecursiveElementVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/JavaScriptInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/JavaScriptInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/bugs/RecursionUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bugs/RecursionUtils.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
diff --git a/inspections/src/com/sixrr/inspectjs/bugs/RecursionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bugs/RecursionVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/CallerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/CallerJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/BreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
diff --git a/inspections/src/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/fix/RenameFix.java b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/fix/RenameFix.java
rename to inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/naming/ConventionInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/naming/ConventionInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java
rename to inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java
diff --git a/inspections/src/com/sixrr/inspectjs/ui/RegExFormatter.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/ui/RegExFormatter.java
rename to inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java
diff --git a/inspections/src/com/sixrr/inspectjs/ui/RegExInputVerifier.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/ui/RegExInputVerifier.java
rename to inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
diff --git a/inspections/src/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
rename to inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
diff --git a/inspections/src/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
rename to inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
diff --git a/inspections/src/com/sixrr/inspectjs/utils/BoolUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/utils/BoolUtils.java
rename to inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
diff --git a/inspections/src/com/sixrr/inspectjs/utils/ComparisonUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/utils/ComparisonUtils.java
rename to inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
diff --git a/inspections/src/com/sixrr/inspectjs/utils/ConditionalUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/utils/ConditionalUtils.java
rename to inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
diff --git a/inspections/src/com/sixrr/inspectjs/utils/ControlFlowUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/utils/ControlFlowUtils.java
rename to inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
diff --git a/inspections/src/com/sixrr/inspectjs/utils/EquivalenceChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/utils/EquivalenceChecker.java
rename to inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
diff --git a/inspections/src/com/sixrr/inspectjs/utils/ExpressionUtil.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/utils/ExpressionUtil.java
rename to inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
diff --git a/inspections/src/com/sixrr/inspectjs/utils/ParenthesesUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/utils/ParenthesesUtils.java
rename to inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
diff --git a/inspections/src/com/sixrr/inspectjs/utils/SideEffectChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/utils/SideEffectChecker.java
rename to inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
diff --git a/inspections/src/com/sixrr/inspectjs/utils/StatementUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/utils/StatementUtils.java
rename to inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java
diff --git a/inspections/src/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
diff --git a/inspections/src/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
similarity index 100%
rename from inspections/src/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
rename to inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
diff --git a/inspections/resources/com/sixrr/inspectjs/InspectionJSBundle.properties b/inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties
similarity index 100%
rename from inspections/resources/com/sixrr/inspectjs/InspectionJSBundle.properties
rename to inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties
diff --git a/inspections/resources/inspectionDescriptions/AnonymousFunctionJS.html b/inspections/src/main/resources/inspectionDescriptions/AnonymousFunctionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/AnonymousFunctionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/AnonymousFunctionJS.html
diff --git a/inspections/resources/inspectionDescriptions/AssignmentResultUsedJS.html b/inspections/src/main/resources/inspectionDescriptions/AssignmentResultUsedJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/AssignmentResultUsedJS.html
rename to inspections/src/main/resources/inspectionDescriptions/AssignmentResultUsedJS.html
diff --git a/inspections/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html b/inspections/src/main/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html
rename to inspections/src/main/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html
diff --git a/inspections/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html b/inspections/src/main/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html
rename to inspections/src/main/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html
diff --git a/inspections/resources/inspectionDescriptions/BadExpressionStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/BadExpressionStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/BadExpressionStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/BadExpressionStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/BlockStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/BlockStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/BlockStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/BlockStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/BreakStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/BreakStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/BreakStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/BreakStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/BreakStatementWithLabelJS.html b/inspections/src/main/resources/inspectionDescriptions/BreakStatementWithLabelJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/BreakStatementWithLabelJS.html
rename to inspections/src/main/resources/inspectionDescriptions/BreakStatementWithLabelJS.html
diff --git a/inspections/resources/inspectionDescriptions/CallerJS.html b/inspections/src/main/resources/inspectionDescriptions/CallerJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/CallerJS.html
rename to inspections/src/main/resources/inspectionDescriptions/CallerJS.html
diff --git a/inspections/resources/inspectionDescriptions/ChainedEqualityJS.html b/inspections/src/main/resources/inspectionDescriptions/ChainedEqualityJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ChainedEqualityJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ChainedEqualityJS.html
diff --git a/inspections/resources/inspectionDescriptions/ChainedFunctionCallJS.html b/inspections/src/main/resources/inspectionDescriptions/ChainedFunctionCallJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ChainedFunctionCallJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ChainedFunctionCallJS.html
diff --git a/inspections/resources/inspectionDescriptions/CommaExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/CommaExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/CommaExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/CommaExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/ConditionalExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/ConditionalExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ConditionalExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ConditionalExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html b/inspections/src/main/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html
diff --git a/inspections/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html b/inspections/src/main/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html
diff --git a/inspections/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html b/inspections/src/main/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html
diff --git a/inspections/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/ConstantIfStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/ConstantIfStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ConstantIfStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ConstantIfStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html b/inspections/src/main/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html
diff --git a/inspections/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html b/inspections/src/main/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html
diff --git a/inspections/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html b/inspections/src/main/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html
diff --git a/inspections/resources/inspectionDescriptions/ContinueStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/ContinueStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ContinueStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ContinueStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html b/inspections/src/main/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html
diff --git a/inspections/resources/inspectionDescriptions/CyclomaticComplexityJS.html b/inspections/src/main/resources/inspectionDescriptions/CyclomaticComplexityJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/CyclomaticComplexityJS.html
rename to inspections/src/main/resources/inspectionDescriptions/CyclomaticComplexityJS.html
diff --git a/inspections/resources/inspectionDescriptions/DebuggerStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/DebuggerStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/DebuggerStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/DebuggerStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html b/inspections/src/main/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html
rename to inspections/src/main/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html
diff --git a/inspections/resources/inspectionDescriptions/DivideByZeroJS.html b/inspections/src/main/resources/inspectionDescriptions/DivideByZeroJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/DivideByZeroJS.html
rename to inspections/src/main/resources/inspectionDescriptions/DivideByZeroJS.html
diff --git a/inspections/resources/inspectionDescriptions/DocumentWriteJS.html b/inspections/src/main/resources/inspectionDescriptions/DocumentWriteJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/DocumentWriteJS.html
rename to inspections/src/main/resources/inspectionDescriptions/DocumentWriteJS.html
diff --git a/inspections/resources/inspectionDescriptions/DuplicateCaseLabelJS.html b/inspections/src/main/resources/inspectionDescriptions/DuplicateCaseLabelJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/DuplicateCaseLabelJS.html
rename to inspections/src/main/resources/inspectionDescriptions/DuplicateCaseLabelJS.html
diff --git a/inspections/resources/inspectionDescriptions/DuplicateConditionJS.html b/inspections/src/main/resources/inspectionDescriptions/DuplicateConditionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/DuplicateConditionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/DuplicateConditionJS.html
diff --git a/inspections/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html b/inspections/src/main/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html
rename to inspections/src/main/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html
diff --git a/inspections/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html b/inspections/src/main/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html
rename to inspections/src/main/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html
diff --git a/inspections/resources/inspectionDescriptions/EmptyCatchBlockJS.html b/inspections/src/main/resources/inspectionDescriptions/EmptyCatchBlockJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/EmptyCatchBlockJS.html
rename to inspections/src/main/resources/inspectionDescriptions/EmptyCatchBlockJS.html
diff --git a/inspections/resources/inspectionDescriptions/EmptyFinallyBlockJS.html b/inspections/src/main/resources/inspectionDescriptions/EmptyFinallyBlockJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/EmptyFinallyBlockJS.html
rename to inspections/src/main/resources/inspectionDescriptions/EmptyFinallyBlockJS.html
diff --git a/inspections/resources/inspectionDescriptions/EmptyStatementBodyJS.html b/inspections/src/main/resources/inspectionDescriptions/EmptyStatementBodyJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/EmptyStatementBodyJS.html
rename to inspections/src/main/resources/inspectionDescriptions/EmptyStatementBodyJS.html
diff --git a/inspections/resources/inspectionDescriptions/EmptyTryBlockJS.html b/inspections/src/main/resources/inspectionDescriptions/EmptyTryBlockJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/EmptyTryBlockJS.html
rename to inspections/src/main/resources/inspectionDescriptions/EmptyTryBlockJS.html
diff --git a/inspections/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html b/inspections/src/main/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html
diff --git a/inspections/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html b/inspections/src/main/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html
diff --git a/inspections/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html b/inspections/src/main/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html
diff --git a/inspections/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html b/inspections/src/main/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html
diff --git a/inspections/resources/inspectionDescriptions/FunctionNamingConventionJS.html b/inspections/src/main/resources/inspectionDescriptions/FunctionNamingConventionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/FunctionNamingConventionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/FunctionNamingConventionJS.html
diff --git a/inspections/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html b/inspections/src/main/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html
rename to inspections/src/main/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html
diff --git a/inspections/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html b/inspections/src/main/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html
rename to inspections/src/main/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html
diff --git a/inspections/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html b/inspections/src/main/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html
rename to inspections/src/main/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html
diff --git a/inspections/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html b/inspections/src/main/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html
rename to inspections/src/main/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html
diff --git a/inspections/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html b/inspections/src/main/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html
rename to inspections/src/main/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html
diff --git a/inspections/resources/inspectionDescriptions/IncompatibleMaskJS.html b/inspections/src/main/resources/inspectionDescriptions/IncompatibleMaskJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/IncompatibleMaskJS.html
rename to inspections/src/main/resources/inspectionDescriptions/IncompatibleMaskJS.html
diff --git a/inspections/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html b/inspections/src/main/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html
rename to inspections/src/main/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html
diff --git a/inspections/resources/inspectionDescriptions/InfiniteLoopJS.html b/inspections/src/main/resources/inspectionDescriptions/InfiniteLoopJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/InfiniteLoopJS.html
rename to inspections/src/main/resources/inspectionDescriptions/InfiniteLoopJS.html
diff --git a/inspections/resources/inspectionDescriptions/InfiniteRecursionJS.html b/inspections/src/main/resources/inspectionDescriptions/InfiniteRecursionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/InfiniteRecursionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/InfiniteRecursionJS.html
diff --git a/inspections/resources/inspectionDescriptions/InnerHTMLJS.html b/inspections/src/main/resources/inspectionDescriptions/InnerHTMLJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/InnerHTMLJS.html
rename to inspections/src/main/resources/inspectionDescriptions/InnerHTMLJS.html
diff --git a/inspections/resources/inspectionDescriptions/LabeledStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/LabeledStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/LabeledStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/LabeledStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html b/inspections/src/main/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html
diff --git a/inspections/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html b/inspections/src/main/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html
rename to inspections/src/main/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html
diff --git a/inspections/resources/inspectionDescriptions/MagicNumberJS.html b/inspections/src/main/resources/inspectionDescriptions/MagicNumberJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/MagicNumberJS.html
rename to inspections/src/main/resources/inspectionDescriptions/MagicNumberJS.html
diff --git a/inspections/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/NegatedIfStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/NegatedIfStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NegatedIfStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NegatedIfStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/NestedAssignmentJS.html b/inspections/src/main/resources/inspectionDescriptions/NestedAssignmentJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NestedAssignmentJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NestedAssignmentJS.html
diff --git a/inspections/resources/inspectionDescriptions/NestedConditionalExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/NestedConditionalExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NestedConditionalExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NestedConditionalExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/NestedFunctionCallJS.html b/inspections/src/main/resources/inspectionDescriptions/NestedFunctionCallJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NestedFunctionCallJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NestedFunctionCallJS.html
diff --git a/inspections/resources/inspectionDescriptions/NestedFunctionJS.html b/inspections/src/main/resources/inspectionDescriptions/NestedFunctionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NestedFunctionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NestedFunctionJS.html
diff --git a/inspections/resources/inspectionDescriptions/NestedSwitchStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/NestedSwitchStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NestedSwitchStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NestedSwitchStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/NestingDepthJS.html b/inspections/src/main/resources/inspectionDescriptions/NestingDepthJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NestingDepthJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NestingDepthJS.html
diff --git a/inspections/resources/inspectionDescriptions/NonBlockStatementBodyJS.html b/inspections/src/main/resources/inspectionDescriptions/NonBlockStatementBodyJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NonBlockStatementBodyJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NonBlockStatementBodyJS.html
diff --git a/inspections/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html b/inspections/src/main/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html
diff --git a/inspections/resources/inspectionDescriptions/OctalIntegerJS.html b/inspections/src/main/resources/inspectionDescriptions/OctalIntegerJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/OctalIntegerJS.html
rename to inspections/src/main/resources/inspectionDescriptions/OctalIntegerJS.html
diff --git a/inspections/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/ParameterNamingConventionJS.html b/inspections/src/main/resources/inspectionDescriptions/ParameterNamingConventionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ParameterNamingConventionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ParameterNamingConventionJS.html
diff --git a/inspections/resources/inspectionDescriptions/ParametersPerFunctionJS.html b/inspections/src/main/resources/inspectionDescriptions/ParametersPerFunctionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ParametersPerFunctionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ParametersPerFunctionJS.html
diff --git a/inspections/resources/inspectionDescriptions/PlatformDetectionJS.html b/inspections/src/main/resources/inspectionDescriptions/PlatformDetectionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/PlatformDetectionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/PlatformDetectionJS.html
diff --git a/inspections/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html b/inspections/src/main/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html
diff --git a/inspections/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html b/inspections/src/main/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html
diff --git a/inspections/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html b/inspections/src/main/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html
diff --git a/inspections/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html b/inspections/src/main/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html
diff --git a/inspections/resources/inspectionDescriptions/ShiftOutOfRangeJS.html b/inspections/src/main/resources/inspectionDescriptions/ShiftOutOfRangeJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ShiftOutOfRangeJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ShiftOutOfRangeJS.html
diff --git a/inspections/resources/inspectionDescriptions/SillyAssignmentJS.html b/inspections/src/main/resources/inspectionDescriptions/SillyAssignmentJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/SillyAssignmentJS.html
rename to inspections/src/main/resources/inspectionDescriptions/SillyAssignmentJS.html
diff --git a/inspections/resources/inspectionDescriptions/StatementsPerFunctionJS.html b/inspections/src/main/resources/inspectionDescriptions/StatementsPerFunctionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/StatementsPerFunctionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/StatementsPerFunctionJS.html
diff --git a/inspections/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html b/inspections/src/main/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html
rename to inspections/src/main/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html
diff --git a/inspections/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html b/inspections/src/main/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html
rename to inspections/src/main/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html
diff --git a/inspections/resources/inspectionDescriptions/TailRecursionJS.html b/inspections/src/main/resources/inspectionDescriptions/TailRecursionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/TailRecursionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/TailRecursionJS.html
diff --git a/inspections/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html b/inspections/src/main/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html
diff --git a/inspections/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html b/inspections/src/main/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html
diff --git a/inspections/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html b/inspections/src/main/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html
rename to inspections/src/main/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html
diff --git a/inspections/resources/inspectionDescriptions/TrivialConditionalJS.html b/inspections/src/main/resources/inspectionDescriptions/TrivialConditionalJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/TrivialConditionalJS.html
rename to inspections/src/main/resources/inspectionDescriptions/TrivialConditionalJS.html
diff --git a/inspections/resources/inspectionDescriptions/TrivialIfJS.html b/inspections/src/main/resources/inspectionDescriptions/TrivialIfJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/TrivialIfJS.html
rename to inspections/src/main/resources/inspectionDescriptions/TrivialIfJS.html
diff --git a/inspections/resources/inspectionDescriptions/UnnecessaryContinueJS.html b/inspections/src/main/resources/inspectionDescriptions/UnnecessaryContinueJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/UnnecessaryContinueJS.html
rename to inspections/src/main/resources/inspectionDescriptions/UnnecessaryContinueJS.html
diff --git a/inspections/resources/inspectionDescriptions/UnnecessaryLabelJS.html b/inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/UnnecessaryLabelJS.html
rename to inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelJS.html
diff --git a/inspections/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html b/inspections/src/main/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html
rename to inspections/src/main/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html
diff --git a/inspections/resources/inspectionDescriptions/UnnecessaryReturnJS.html b/inspections/src/main/resources/inspectionDescriptions/UnnecessaryReturnJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/UnnecessaryReturnJS.html
rename to inspections/src/main/resources/inspectionDescriptions/UnnecessaryReturnJS.html
diff --git a/inspections/resources/inspectionDescriptions/UnreachableCodeJS.html b/inspections/src/main/resources/inspectionDescriptions/UnreachableCodeJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/UnreachableCodeJS.html
rename to inspections/src/main/resources/inspectionDescriptions/UnreachableCodeJS.html
diff --git a/inspections/resources/inspectionDescriptions/UnterminatedStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/UnterminatedStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/UnterminatedStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/UnterminatedStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/UnusedCatchParameterJS.html b/inspections/src/main/resources/inspectionDescriptions/UnusedCatchParameterJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/UnusedCatchParameterJS.html
rename to inspections/src/main/resources/inspectionDescriptions/UnusedCatchParameterJS.html
diff --git a/inspections/resources/inspectionDescriptions/VoidExpressionJS.html b/inspections/src/main/resources/inspectionDescriptions/VoidExpressionJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/VoidExpressionJS.html
rename to inspections/src/main/resources/inspectionDescriptions/VoidExpressionJS.html
diff --git a/inspections/resources/inspectionDescriptions/WithStatementJS.html b/inspections/src/main/resources/inspectionDescriptions/WithStatementJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/WithStatementJS.html
rename to inspections/src/main/resources/inspectionDescriptions/WithStatementJS.html
diff --git a/inspections/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html b/inspections/src/main/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html
similarity index 100%
rename from inspections/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html
rename to inspections/src/main/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html
diff --git a/intentions/pom.xml b/intentions/pom.xml
new file mode 100644
index 00000000..99aa9e7c
--- /dev/null
+++ b/intentions/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-intentions</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/intentions/src/org/intellij/idea/lang/javascript/JSAbstractBundle.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/JSAbstractBundle.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/JSElementIterator.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/JSIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/string/StringUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
similarity index 97%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 524c336a..73df89be 100644
--- a/intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -15,20 +15,26 @@
  */
 package org.intellij.idea.lang.javascript.intention.switchtoif;
 
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.formatter.blocks.JSBlock;
-import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.psiutil.*;
+import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
+import org.intellij.idea.lang.javascript.psiutil.DeclarationUtils;
+import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
+import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-
-import java.util.*;
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.util.IncorrectOperationException;
 
 public class JSReplaceIfWithSwitchIntention extends JSIntention {
     @NonNls private static final String IF_KEYWORD                     = "if";
@@ -302,7 +308,6 @@ private static void appendElement(StringBuilder switchStatementString,
                 switchStatementString.append(text);
             }
         } else if (element instanceof JSBlockStatement ||
-                   element instanceof JSBlock   ||
                    element instanceof JSIfStatement) {
             final JSElement[] children = (JSElement[]) element.getChildren();
             for (final JSElement child : children) {
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
diff --git a/intentions/src/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
similarity index 100%
rename from intentions/src/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
rename to intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
diff --git a/intentions/resources/intentionDescriptions/JSAddBracesIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSAddBracesIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSAddBracesIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSAddBracesIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSAddBracesIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSAddBracesIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSAddBracesIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSAddBracesIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSAddBracesIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSAddBracesIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSAddBracesIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSAddBracesIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSChangeToCStyleCommentIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSChangeToEndOfLineCommentIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSConstantExpressionIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSConstantExpressionIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConstantExpressionIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConstantExpressionIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConstantExpressionIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSConstantExpressionIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConstantExpressionIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConstantExpressionIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConstantExpressionIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSConstantExpressionIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConstantExpressionIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSConstantExpressionIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSConstantSubexpressionIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSConstantSubexpressionIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConstantSubexpressionIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConstantSubexpressionIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConstantSubexpressionIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSConstantSubexpressionIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConstantSubexpressionIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConstantSubexpressionIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConstantSubexpressionIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSConstantSubexpressionIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConstantSubexpressionIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSConstantSubexpressionIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToDecimalIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSConvertIntegerToHexIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToHexIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConvertIntegerToHexIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToHexIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConvertIntegerToHexIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToHexIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConvertIntegerToHexIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToHexIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConvertIntegerToHexIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToHexIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConvertIntegerToHexIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToHexIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSConvertIntegerToOctalIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSDeMorgansLawIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSDeMorgansLawIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSDeMorgansLawIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSDeMorgansLawIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSDeMorgansLawIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSDeMorgansLawIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSDeMorgansLawIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSDeMorgansLawIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSDeMorgansLawIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSDeMorgansLawIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSDeMorgansLawIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSDeMorgansLawIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSDoubleToSingleQuotedStringIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSExtractIncrementIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSExtractIncrementIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSExtractIncrementIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSExtractIncrementIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSExtractIncrementIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSExtractIncrementIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSExtractIncrementIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSExtractIncrementIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSExtractIncrementIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSExtractIncrementIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSExtractIncrementIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSExtractIncrementIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSFlipComparisonIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSFlipComparisonIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipComparisonIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSFlipComparisonIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSFlipComparisonIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSFlipComparisonIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipComparisonIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSFlipComparisonIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSFlipComparisonIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSFlipComparisonIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipComparisonIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSFlipComparisonIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSFlipConditionalIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSFlipConditionalIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipConditionalIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSFlipConditionalIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSFlipConditionalIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSFlipConditionalIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipConditionalIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSFlipConditionalIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSFlipConditionalIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSFlipConditionalIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipConditionalIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSFlipConditionalIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSFlipConjunctionIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSFlipConjunctionIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipConjunctionIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSFlipConjunctionIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSFlipConjunctionIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSFlipConjunctionIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipConjunctionIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSFlipConjunctionIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSFlipConjunctionIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSFlipConjunctionIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipConjunctionIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSFlipConjunctionIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSFlipIfIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSFlipIfIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipIfIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSFlipIfIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSFlipIfIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSFlipIfIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipIfIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSFlipIfIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSFlipIfIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSFlipIfIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSFlipIfIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSFlipIfIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSJoinConcatenatedStringLiteralsIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSMergeDeclarationAndInitializationIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSMergeElseIfIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeElseIfIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeElseIfIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeElseIfIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeElseIfIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeElseIfIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeElseIfIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeElseIfIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeElseIfIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSMergeElseIfIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeElseIfIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSMergeElseIfIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSMergeIfAndIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeIfAndIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeIfAndIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeIfAndIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeIfAndIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeIfAndIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeIfAndIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeIfAndIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeIfAndIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSMergeIfAndIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeIfAndIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSMergeIfAndIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSMergeIfOrIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeIfOrIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeIfOrIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeIfOrIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeIfOrIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeIfOrIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeIfOrIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeIfOrIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeIfOrIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSMergeIfOrIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeIfOrIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSMergeIfOrIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSMergeParallelForInLoopsIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSMergeParallelForLoopsIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSMergeParallelIfsIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeParallelIfsIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeParallelIfsIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeParallelIfsIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeParallelIfsIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSMergeParallelIfsIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeParallelIfsIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMergeParallelIfsIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMergeParallelIfsIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSMergeParallelIfsIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMergeParallelIfsIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSMergeParallelIfsIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSMoveCommentToSeparateLineIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSNegateComparisonIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSNegateComparisonIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSNegateComparisonIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSNegateComparisonIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSNegateComparisonIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSNegateComparisonIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSNegateComparisonIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSNegateComparisonIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSNegateComparisonIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSNegateComparisonIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSNegateComparisonIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSNegateComparisonIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveBooleanEqualityIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSRemoveBracesIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveBracesIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveBracesIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveBracesIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveBracesIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveBracesIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveBracesIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveBracesIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveBracesIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSRemoveBracesIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveBracesIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveBracesIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSRemoveConditionalIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveConditionalIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveConditionalIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveConditionalIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveConditionalIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveConditionalIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveConditionalIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveConditionalIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveConditionalIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSRemoveConditionalIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveConditionalIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveConditionalIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSRemoveRedundantElseIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveRedundantElseIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveRedundantElseIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveRedundantElseIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveRedundantElseIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveRedundantElseIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveRedundantElseIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveRedundantElseIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveRedundantElseIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSRemoveRedundantElseIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveRedundantElseIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveRedundantElseIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSRemoveUnnecessaryParenthesesIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceConditionalWithIfIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithConditionalIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/after.template-1.js b/intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/after.template-1.js
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/after.template-1.js
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/after.template-1.js
diff --git a/intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/before.template-1.js b/intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/before.template-1.js
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/before.template-1.js
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceIfWithSwitchIntention/test/before.template-1.js
diff --git a/intentions/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceMultiplyWithShiftIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceShiftWithMultiplyIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceSwitchWithIfIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSReplaceWithOperatorAssignmentIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSSimplifyIfElseIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSSimplifyIfElseIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSimplifyIfElseIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSimplifyIfElseIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSimplifyIfElseIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSSimplifyIfElseIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSimplifyIfElseIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSimplifyIfElseIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSimplifyIfElseIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSSimplifyIfElseIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSimplifyIfElseIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSSimplifyIfElseIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSSingleToDoubleQuotedStringIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSSplitDeclarationAndInitializationIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSSplitElseIfIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSSplitElseIfIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitElseIfIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSplitElseIfIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSplitElseIfIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSSplitElseIfIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitElseIfIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSplitElseIfIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSplitElseIfIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSSplitElseIfIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitElseIfIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSSplitElseIfIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSSplitIfAndIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSSplitIfAndIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitIfAndIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSplitIfAndIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSplitIfAndIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSSplitIfAndIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitIfAndIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSplitIfAndIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSplitIfAndIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSSplitIfAndIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitIfAndIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSSplitIfAndIntention/description.html
diff --git a/intentions/resources/intentionDescriptions/JSSplitIfOrIntention/after.js.template b/intentions/src/main/resources/intentionDescriptions/JSSplitIfOrIntention/after.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitIfOrIntention/after.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSplitIfOrIntention/after.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSplitIfOrIntention/before.js.template b/intentions/src/main/resources/intentionDescriptions/JSSplitIfOrIntention/before.js.template
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitIfOrIntention/before.js.template
rename to intentions/src/main/resources/intentionDescriptions/JSSplitIfOrIntention/before.js.template
diff --git a/intentions/resources/intentionDescriptions/JSSplitIfOrIntention/description.html b/intentions/src/main/resources/intentionDescriptions/JSSplitIfOrIntention/description.html
similarity index 100%
rename from intentions/resources/intentionDescriptions/JSSplitIfOrIntention/description.html
rename to intentions/src/main/resources/intentionDescriptions/JSSplitIfOrIntention/description.html
diff --git a/intentions/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties b/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
similarity index 100%
rename from intentions/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
rename to intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
diff --git a/intentions/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle_fr.properties b/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle_fr.properties
similarity index 100%
rename from intentions/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle_fr.properties
rename to intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle_fr.properties
diff --git a/plugin/pom.xml b/plugin/pom.xml
index dd498f26..fe777eb9 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -89,6 +89,19 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.googlecode.json-simple</groupId>
+			<artifactId>json-simple</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>consulo.internal</groupId>
+			<artifactId>lib.org.chromium.sdk</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
+
+		<!--provided-->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>com.intellij.xml</artifactId>
diff --git a/pom.xml b/pom.xml
index 353469b5..cdd5757e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,12 @@
 	<modules>
 		<module>base-api</module>
 		<module>base-impl</module>
+		<module>inspections</module>
+		<module>intentions
+		</module>
 		<module>web-browser-impl</module>
+		<module>debugger/debugger-impl</module>
+		<module>debugger/v8-debugger-impl</module>
 		<module>lang-version-impl/javascript16-impl</module>
 		<module>lang-version-impl/javascript17-impl</module>
 		<module>lang-version-impl/javascript18-impl</module>
diff --git a/v8-debugger-impl/lib/json_simple-1.1.jar b/v8-debugger-impl/lib/json_simple-1.1.jar
deleted file mode 100644
index f395f41471a796876278a6c5667ded4632546893..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16046
zcmb7r1yo$g)-~?#!QI^n?(XjHE<u93LvVL@g1dy^?hcIwcY+4^$u~1^=4EEyT7UJr
zyKnbBXII@?Rj2G61!+()7@(g?NMG>%|K0o!&~M+eqAG%Pl5%1U3crg%0SW#T+YIB?
zetT^8cA@=MOjb}%QcP4?g<e+dT6SzyMw*U(8eW=?dSYy{UWsvz1+eEdCXC`pD<Lx>
zp$ZfMOg4TK<=&bZse~%6r0kMK?SBM+1Lu+u6@|_kAbpMI#gY(t6-g5*t>heu&T}3A
zoz<h&y%p$>!u-9=U~h%7cQXG^asMvy^R0eLSUKC<{SPsuzlu3q+B(>n{zn?>|EfyI
zPCi!jEx*k-M*M$}mUJ<-m9cbop*OZMbau{C-Bd<ZM|-iW8y3<)_7_F65UmQav9PMh
zHBij$Hp*KvDl+iJGJuX8B_F4cIdy)8ewsU!*7KTr2QQp<cyGi#d&ocIn}3tJo*^1<
zIzYu}?son#!L`}C-=5O_@_gzBWWOT_W6ro9kfsK=1&U5koNJKI&nFf4kUCCbJG4_A
zA+I`CJQc#lp7S|PJ`b~b>6xqByVuNr+?HLxZU-SllwH3}V|$-@zoTON810d1{2LDY
zX5B*!@SO^pN+s0SwK{?Q6SFNrB6G}4BfH)T4LL_4LPL*l$uv{QoXxzW6XROd;?=us
zqn|q@{oOy_$M`WTYq5aexHx0G>W68>iWTd_wvJ6D=O6BY24o#>nMIuBl&iq-GuCXi
z$HBLmu3mvvcc{$|pzuY0enlUNgI>JBu$xA}SXco2IP-9TCmHWK(gY4MTVEu_)O?tn
znQ3jCWXm#m8v3w3$IzTk5M!n4SVbV~tK+ePU4zC6);1e=ajlpTwf04Il~(0Ilc|gV
z9`h3hk|w;lqg?KBuDvgsj9Q;IXU!JzhVgZEgetr>p`C6V%MrH(a^*VxItQLr@t1x$
z_+v_|rJh2F$Z=B}s}@A<J`7xVGM$}fN7qEQs4Y);b-^HRY-`I@gOjHgxmgPrIs2L#
zXHiW24BG+4&p2zg=ZeN$DkeUrvpPjZw|z=T3Y|&~GJ#Ml0meAsZq+JG&l9@7VWS{b
zF%MJMDHd%aP8C}}h8;r6lk3g+GWE^V*v=iZ$)=C&YFd;~3;QjQ$!uq-KH@}MRjCsr
z-xle|J<1F>4I3um=7<Ke_T9z@J1x5$z?l>ra9l!(F--&UD;1!~HE$v5ei4ZBk<0)P
zpb%@~1(-^^rglvb%GnFZn?VxKzVnQ6H$xnmK|q;|^Ew)2;v>1_Y8x@W;lT-?#7Z-7
zxPTkRo(nV(hR`nraH4V%r*=o%D7&kL#1aZZ`{j{*c^>M;);h`~xtXMd;uVy)W9j`w
zF_YEDJ;O`5j(4&lTG0brcu*5l7)TSx5iS^?oiIS4Q12_`QBD(UaFS;`Jai_2BY#6?
z#d!<$2-V%N=-`Ek$3&}k_gY3QN-C~*7;Oih=BD~h7w&pMJn7y-NL>t7OikU2ld1eb
z>I9Rtf|JAO09x-DZuVHJDWuvH*zDCFVr~kr?HHUPIPm1A2)On1!>ehO)T?DW+GP1E
zMc>m*&iC0vN8DT%qW41!wsX^B%BM^^aR)x(d}pA~bmv@Pl_k7n^9%S?m7f(fD2i%V
z()U;}MoQF2#3L0(RHH)4jO$37J0cU9W`yi@p<K+RbYc@_s6WZ%^caWdRVW#`jC@U9
zfUB?BnoB@((iKV$<48zf73PQbFreq-!ZQ1To&w<;f?xZ+Y>u%-L)1Rm^)9+U<a^F`
ze%ot&$c<U&SoB3IM=dYimv?f(sldZc!uVBv5<ejSuzSB5pxa#3!A%e#AUALzAcB7|
zKvK%`a)M4yh919JpbyI0%CiD!FHN!;>|m61x#(zd+7^+>47m-Z3JQ@^5m9ra_ehq0
zjAVzTWq_QEEd42UcdA?#zLBV%jGajULs+|Pq>!|k)5J3G=Gnu9sqc@6EBGGS4m6~I
z-M(5ssC-!q@hD9a**OXpN9i6)J6Nb~gxGcvFbSD8W22~tfwT`f!1#<zy(AMPy~go_
z!uYXJAjwu%Qa+k&bmLR{MP^V#xPs0zQ*_$Xr>123D!j&n+^zjr`^F&lLbGg7ME=^?
zdgOq3F*!1eb!Im0EbWoP6dUE)MX1NZ2l%}LVoX~)hDqyWJhz2(BJ+0(QT01tPHrQ#
zYAsD72aN+h%|Vf^47{q}E$Z@~*zBTv%epE!2Dp}OHBGYPYKw4G&%oUn@l6^_ePxX&
zHe(#Eq~OVpa1Tig<Ko$8V#tStmC>O%;PE|mar~glCR!M0xE&nkLmPqhg|HqX6^j%K
z=UaM*;kz~)%Z%U->iWWB8RZ8N)YlY6)6gQ(DJS;H$m%5}nU%n7F}@LbRrZQ7g{r2q
zG0SypK{*;ZKpAU7u5ft`fputXFWPGE)Pz<v4X*OMx0b1#6q7~mhGb6-jhfba6AjBv
z@`v0y&efW+Q1}o1G5VjJOsSzE3LjCUA%-f@V9K*e4&vj#3vao^hD5MQ-5cE-1RlVP
zA#~ns1p|s}nnAM&TLPq8WIm*JIb!O1l*x+6jaa*sL|X|pQq&>VLEb(rFDX(w@0Z>x
zJim7WBf@q`+S=G5CkX{W%}n>SGxLyyUZ9*9G<ZVt-I+kYSP*_YxdubkN#zbWz@^Lj
zf#5t1dM`!6U*La-wkvW{#4m2Smg|f7SpGRsrM>i4>;U=IqcA7>BO7%4h*MVG4TNsH
z&NfXD$CHItDRVSau~C!QhmJ@^*+jyxSo0A(iPp|hj<yrYaz6cE)_}D#`|q$wXw9g)
zJ~V#`u60vW9{>fjI?IDNV_w1KcmetEz5!4g!nS<t6P|C^zxE9`LnqVU`UdxR`$awo
z2nb#XS62u%R|s}7i0pW;8Ux>MKz#mKhl>~lGQ4a~<<~lq=ghAiF5Y3KY$SmuK8kHV
zYK}hHK8|K~f^y}260yb}MvBxVfj~l?zDjCVPS8^-Vi4pINCqZ`CI)5(z)ZmZT}sJy
zaEBF8ARr7VARxkj>A~_wR;I?kPa>jKY~4^*k$mi~>xRu>Ew!kFiJ<~4*~!!dYxAIj
zh^cG?)KGdCi#lbS3)>ytMkDdNJ$PQgeFXWnx)RlR@%gs6UP!vbSTf*k)02cJhO<0#
z(z2e$*3urHHaB0u9I&e+6f<Q3py>M!e8D95jKPv<5AH<4R64tRB;YAZ68VMO)Wxc}
z18jUgmD}$}yfPIXghjE<J<?1~V%*R-R6X1hWcj!Dln1_fxXJdK!`M-kQkBx&>kytw
z4YH=Q9kvwPu2buyBe8%yldU@O_FY+tIm-^bgwwuW4ff_pyz4g5Dt1#OjK`~h7LmTq
zM_YRBVdCXt(XSfwjIm?`i!nD>k9ra_9B0W0<|<INA&_lXFjp=a(yy3B#55T#h|~pd
z28XCOR7*EMzx6Vz+5ddoYN-(|v|38Zm<S(iZ{|6zEAjm-LgylamtB1!IXP7}bu`G_
ztu)J*?mSO#dq$U0D{(}bh)<|%$^oT>@^wM0z6=l(!f;U(QghK5V9)9W8yMFPgTYEG
zWTgReiE|>gwmO@<&w~;Mu0*4q>>?%G_o1l5@EtsOaR~a_>;>P1g#~k6IT37R3X}iV
zg@|SC^bBK+8=FjSPy1|?_h1Yz-^NZ6p~H|Xb};&46HImMiq!~6w+pvC2q?Ep4bB;}
zV)2&~7(oNlvEDt%5aBW&>|&Da84Y+^2<|<#>MmMQfA4isiFa3{+5my2RfS-3Qga7A
z=6$*K2Q+AESI1jhl#}@jn=76*Q#}NSNAh&K`hA%iB>_$LwFs|+2U+*f$R2)|6fXrE
z6;1fV^-nilhn;J~v)*>+M>E-Vo~n7|Ls|T2FBEtFXC`6YwclcJs*)Qpz!A))JMX}~
zDL(mDRl8gAy&Q?1*d1YS<UepmKt*qJIHIW}af)HVGhr`za|$}EJG4(fA`pR+f)8t)
zQGG?dU>H6XD6V`-Gl|;0YwgZGO6!sp$rdSbS`CA-At6_op5?b8=IeqN1u#(;#Kwim
zRFRaGT-)*xz0E>~OSAdp{P<ATL#S(m=P+2EFnbOqwKNwQa_tQ_A0zd@-^2zra_t=u
zkmbLBt{;LtVJ3Z&7;wHBe(6k>JewmN6Hi2nF;3bJGk;|F5r4c@h8qj{8eirXz_kc1
z_C4?tJ<G!N%MuZ<hQ9CRnt4{)aR%1P1vE510`Kz17yl-$y<wD621Qonc=M~wM47Ci
z+kLLXzV9DMogU~qrWYKVn7{L^dwfcI&`psI(rF5hiw0OyT<GQUiK$<j3JcPIbNZNV
zyyTd?EBWrr4~6||8a`ja5OD{t>>r5#Z5LpHS{#z!>_Pq8MfNXtLD|L0)X-M&pKKVt
z>rXR=AO`Vrl|L4*@>erv2>+WE8}oX0_@oopXof`snqn>LWF;tR=A*~N4N5^0==G~z
zn+u!!sxx@?HUG_;0oPJ-g?k)6zDR184U-8J7(#eH_C*^Tn;4iF7y$u`VTeJPL0}N(
zpbvpg+rYv7XQ}qvl*RR_gGBsox^nln;`}$WtY&EQ;diqft*WhzrjGP7;gn{GMc?j6
zT<51V_N6qVVgOc5FuDRtj3kVR2^6l@WO@B$f|{HO+xYC85k2{VaQ^3r@?BGJ!6?;M
zo+9c83J;k*%~@V^3=AyU;-j0x*^;M>vzp1Yhn)?1e$b^LYwRY%e1IPW0WmEC^?{;;
zgfP=bHk$!K_S-Vf$}KKjMTf-weUJUr03UdCECa_(e+cx<DTV%IYFzb;fB+(JhU9z<
z1}aX?i1!_pJ#&mv$lwLov{6)8i&H^i5zyHMv=Gb2@y+^MnEk8=sYb}^aSCxNm*o+O
z5e+cfqGJ72@Fh%D+i>FD1KBk+?!vvA{@Zxd?sFSd3P@Jxn3N}SQCc9Pk}OHZt!#5F
zmf6gG(<1j_rZHM&r>8SWEIT_}U0agYUpMG$`4Y`}txEDQ9qkAG0=bbIDQ@LrH6*#y
z!(c67KWg=6z)V1^WXg%!9`{Ul>4lR|VQ7Une_93dRJK#`v!l4`Tks5OtdU7}ubm+=
zn|VCf!XRe<$XQ+MVmdI8Ip)F>T?KNCQg(S^@*Wwnq(FH%72Op|GMH<>FQ(j>+Z9TM
zj(AT|HLF4+e>9u%#slHF@TH&Sb80}di%yS+|H$4$?XxZ3)5S^rIB)ov!`O@?^7(;#
zO24Oj&PwgUXNF|PQ!=K`v@$~)GJrno2Qn0<(Lx@al$68UugoQ`Iqb?e#q?f;wF9H$
zAC~%{6S<b&abv?0Fekw9?e@fijbNVgPB&BmQ0%>EYe(9FLGm>RDee;;`HdaZB$sM-
zoW1gPq`k-hI96s%UyV}xu_8Gm(O@$~HG0wU^mlOdOt759236(e>yv$0l0PTcl1~~`
zch3z==<E5e;ydtU7R2qV?|hJWa_*pAgK8U^5Y2Z+j=1Q;kQLuH_S&J_AIKq$wP;&B
zL032xIh#=l<w5jP9XkFp?=hcMQMU{~{9)>P<YP{N$_Nk1R6Jr&)vX96dx9hlA9d}P
zudd#m620*L4bSo00yOXrlhmw#@Dw_95sFTnd~D86TWPa%H(g}AiEUz?suA_6>Jayo
zZTA4YgMIG#6E@TimTJxs`z*%7^tl1-J(WLz0b$s-;cAxFg8rxl-f{Fp?s-)Ey4Wit
zLHl~J{RKPB$EX-CG&4_;g>Y(Nu86fyavX&S;BpcVx@d?f<uk@(!sBgI+|Vogj}J~h
z4^uIlEUXchZkVpzOj(GLRGLv#g}9vgu<OhL@rlT<E<X^)p)8y!JLfNPZr)Y0QD^Kc
zn7RCb@y6e4AcF7EWeRkyQy<H_q8=&ymg7$kY&M*<f#dMGywG_bx4ekOk`2*GuOG+b
zcz$%Dk%f{XOlt>W;l3xi?cF`sa2vM<4WMma8Eg3{e1)(EXSdCNA-WmkBKe{&(tSCw
z(=O$ORIMej8;PMGn2v_avMZ8&`-84un1v=`alht79ve-W<xTEDZ|<TQ8BsKT&~7^t
zyp^1OR*CXwQ`kl`)4U>`1D=(-IypV|G2_m!PO<3EO>1AY)<YJR3`L2LG3I6k$9Rk!
z;N^lwHr?M5r62TQ%<AY)Y09VO;Rv0V<_JGc0Agd#*#`Av5++s!_yq+D;)?TT!``O=
zb4nMa4G3ZzVy9TbO>>%oLA9A0VDMuB3tMfz^M_YzHv(gqI*mtOB5i~fBcyG#B)KS^
z+ZF>bl|@6;<dJGDyQ9MQjyNyofj{5hlK&9&MXff*l)dX7TmbOkZ>m{<Wdm{p#zomg
zN79AL9d00~qoqK+od8C0shzJWz28bmUBZ!F*u9KyH#V=Jw)FoPT>icphWQVJi-Vz)
zv#HZBn_aowETcb1q%Ut5-M=dd+uOMqTH2X9i5VKZ*gO5c@>GqHh55pW7DUn5)OHOy
znQP|-=|C1x5n=A0te|A2q?bQc(Ru-dFJ(g$HeqIP&zHJ?`~p<l%PE>}R9HJC>O58A
zTy|aS#$Nkb3$3`~gW6T}A-0UDcy%+(b@qC=!?p0l%h1^URK7F?c+!UE)i)*ebSsRS
z;I0k-Ye1o5>Wy80Q|@HAh#-+r3Z)trA;bzk@nJE?AGPw^$i%BFM+O261cdUopr-lX
zFKBA#B4KD}Vq@y``@;H@pcE(*TF9$KmP_%9n)P=uq4iYI78EKKWO2$C2h3GQlT>nH
za<tC$Nc<k*@U#Yml>wXhyUth7pu30fpFtdgog;wzsRVU2?M|Lqy-Ak{boo$8cbd~E
ztLDn{v6M2A74p6vOAHRqF6xX`V(P6yEj|-H>py?4`<7+E`ElqWzCNHLO13JFy1ly5
zuD~`R+|52}tJ<Rd?AyB(G5W$J>CbF7woitbD<-rx4Ms^iiNOYB97&8PYBV&7Sq^Lr
zL5{DhO|R-XM-|K9y*(95_3aIL$iTh$N2twfd{a)}{VRyYNfZWGfH6px4YPo_zfL0@
zLpXH;9YZcL$-OWGaQ?e06ZUqDU*9%G1F?XBDE_@Fe{N4G{9jx9ts09oY+Z0w-}#uC
zxtZ6$TWOFDfGyHbtXn4q1I{Z%lbl5Zu~m-uLDGVkW)88PS#RMklYLN#3?Sa-kPr=q
zp#?Egw=j~ljMVQZj(~FF5%+bExsso}JV2cMEbg7d?N;ADOfDolxn_Qrb+^-c-g%d{
zoc(wgIS8Z^)J$w4x)5S+ObUYPS?&POH(<t)F%6Z!H2BRG$4vyOHw(8bvX~%tXr03S
zP7>#7xpj4*gg7-;zTP=D+SAsHJm8~O^7E68SB!t%$(nvJgje<@K41xR>6w_oD||eK
z>lS@Oa<>Mh+ia)Ts<KCzy-P0|3*T%7l)VcXc~IQOizR^Eq(U*!e)--N4D%^V{O}1Y
zBXIs60pI)@EQ4ZscZsL}Tf0rR*)?2-xvkgafHQlS{mv(U1vmS_;ut!JC<IXR#v)}+
zhPbOHvJf#H=?ExLSc~a)y~?&4YyHLcst<h&u6)dJDiz{c);0F_t6zv_1w`N*T|YG5
zI(%hjtZ8?1wsvc7v9mipIO@#P<%PmZt&o`qm`vsR8@Sm&6@NGhg4tSWZ+qWf`8t&2
z|IkdP^ek*wyejQZqG|aA0Y7KIl(dv!fqxk<JdP7zCfMvN%zRvxY#@B5$6;(R9pYk^
z>!Hq`Wi>(WhKSfY-WM*jFwS}x6#)+4d6S#LTx((`Y)Vv|S1Coup-!eOd2R)&X0yi*
z>fhwjO_La^>sG6sA!3}AR+VT4$zr$gy|8D6Jk9RR3H8~|jIBTwv1Q|%3;QA2ELD;}
zeng}{`ie1S9Ja;TE%WeP&ruSYa8~n~(-Y^j#M1_!TPjhIv^jW9ni&mFuQaK$otbz3
zq_nvhO{hL!mIqmV^z7J6cY`XGTTOGneob3fRK|tQ>vCbcfAW&&cwVxFv5^MK+@qj2
zOWIcp$+3BJ3}yTNiVfq3^+dO<?)iBi4d-uX9JAefZ##F1yA_jjno8VD{#g(h6Rtq;
zV^p#7B|(9<OJ@M`8_t$@wg^`T&KICO4EaixqM@X?xr4A?ZQ$B?xW(smONRipn|Cc2
zy4C4{K5#=vn5Fls^eET`f=UQBy}1R>S6=U03_@r#pc7o9Smd0-h4QIp00x-hub-~h
z{Yen?z6J#rxDWRdhTxureB~U#o|9QeMBt0kQ@pG@Jppjap&fCz65w@25pdlz`4F#g
zwr|G`$iru{%pX0TO~}4{CaKQ}Ur?=6Fdyob?D(<`Uq8Hb-x{c#xmQ7Y3ES}vkYeN0
z|9SD!8q&V@35VT&n@v(L(`r#-MEcBC8iv35zLqyZa#T?FeP5J>1f6(s<;NFVk)HZt
z@BC^*#f|U7GHPO0#^~UbnR7J~ptlF5$(L<X`LyQyCmP~|H-tyQThR#8VFHzboeufk
z`XzL*s@q6wI}};^;VK^n*0VNtj*u2E!Wt^5!OD@^lsKgi#(H+m44IDzR!x<1Umw0y
z#*Qoad3-)xX&10OS2@fgsK_m4$!c+ekG~7<sAa*&)ISSl8D76qS|>5BRND!jPf@Rw
zq0Jvq`KYPGF@N4ZpP1TI(lK@bcT9&|{<RFrd1ANI6=u{ACZ_0WYk``8E5-|<S~SDU
zqG|^dZKbHYtI)UVriSLwP2%-2{sn$!Q(<P4@>!PbS?<uD{_yR#I^L&QhdBL6Z&xjk
zvRVjPw-@^}I&{jd@Ju8Lp<7S>J!jNC*cko}SfwKv0tpre0ts3(Lf^#osv>b1p=Gye
zz>m@jdo1C5pnz}nPRbuZ;-aICOMNh22EWlIcwj_uT+g8eUQG<kYmqmYs?f^z)^9Tq
zQVLE+#2U)=%IE>DRH}Uf?qkL2TN4`bY1x*G{75t;5a%8^R%QlwjX;$Vd*P`{dz|#$
zuc-@6@PQ&YwdY56h$HP1ntgoP9KIE_Om5d8oEYd1=TpnQieWX{XFILJRkIOo?J=Bq
ziVrJ%hpXDYDIKZ-_JgKP=NSSG=D7PdGfOC+g1OYcS@4gapL5^OSJr*OM$;i$Y|-gX
zm~YiBJ`XoN0H-ay^tt!dDZbuq6N@F=u4{3f1taE-;*Pl<sHMcd;KdyEo=7J^RAaTo
z9Yn!S^^FWQW7a5#(~He8`oy9?9W*Achz=iRxJ;y`oP6Vz^oeX9WAfASb2`H-y@ED^
z5>;uEW-`m2WjurNL!ZS=7OKVuaRq9UZY`yqd`S|^Dr?%j2@(QNjB|R>uxr1$C(j0J
z4D8&sv#P1nHxOHWT_ssSPP)3pGd6hktno9p2ixw27*ms3F~UGZvH~j_yw!xbLtb$F
zoV$q_gX%0s#)P8wlPayx+&7bHHtRw%Izx1-N)lC_eG3gym?u+45L440f)98t<nT^K
z-<On~bZOLSLyg~C%FJMvbj*Cc#YLFtf?7If0J%jszW*x8y(^yP?<z5EN9Sg8s<M~3
zW0N#{EoxgtXElmYec!XWUg8$UZ|>=p9&NMz@yGH<O@tTj1*YIVBZDg(#Ypjj#H6|=
z(z9c&Oe-pXxd<n@+`K{7foV$P2WH8#6i#w}%0^Ch$=E>)%RWgJ`CQ4w-F#tq@hRHw
z4Q%NUY(z`Ll*y@)YRt&>r^AoKg%$jTx>P2X<DF_I!%FdMQx?%%GsJ`W5(w6-s?75E
zg?r$w=y{P4*rvSnqlS9Y3f6X?z{esfUTcc00}gx|oX$o^j+H;HMcLzNZJRg0IBo#X
z(JV(>cP6PTA;1=GPe{&bs>^#1K+^e3a&46FrG8$p)Z`>vv@AOWRm!9Q<Mmira0eq`
z%q{A0Pd=lMJLq?6JpSzS0V3c3Dtd*}Bc7havB!(1CZ?CQf~4ikr$J+n#$_5Fz5YSO
zy~ZJ4g)dUK?$KB}R4Ud7C#y1>-$fCNR@`evn$#_p@#jz+eI{%ulTM|jO|=idvqnq<
zkQ;{3kcal8x~<SZmgM4m2OkFDEH6gYmZvbLOb&q#DDtxHJd}a+YY}hBI<1!s+RY5n
zWV6`iq~~>92}vvI_N#Dw^H%nSG0b_j`M`mpev@iSbcxA}_rnsKE(ct1Tt4lf7bQIA
zP<>9Yv$=Y=f-N+(c<gZFM|;^hcJV6L@jzd?CI>zSda-f}KWbJdMJU8F2ON<R_ml44
zI*tBF$_^QF`1^;gXU|~Yo^G^kb_~>LvVj5^0v4Z&3)^d${MHd0)s}@Z>YFhNG(O90
zmHP-)*#_KWr(ksrZFIYOo?w!NESU4UZ1snsogfQT52WEh3H*Qv$T*&`U7}L=|NAL&
zMHnBNyDdnHNc`LLF>(A7hsNLjfTG6#+w<S`|4)IDz@sA^@xO(B*ZEr}kk?7wTo?aY
zr2IA=4}}aQyMCLBQ$zgE>G=Q6A4T1bO&we;?d|?J=Q@@{RYZD`tC6OH8kMCy3J6%m
zD2<3v63MGn5|H{tOitd?6A;|CdO{z;?*+Xn@S2Jx%NiGNu?>2_{cit8s2Q_vIgRDo
zo5g%0lgszz`3JlKTp7@NM{YlQ8P@3|1WdQq)Eg3fKSWfJ;+C$#{szA%9eyN65(6~>
zp`J`2(H`M5pWVR@0?80|X%-eMS6!B>sJxN{XE+=GJTk+B<f^0FwshXPj&ptlh!?v?
z9`gewHFf2Rj6+jXV^PUUD(8&whcs0fskSmHMwdn81*OOlX7P8z`gr9wq=`w5CgnX2
zOstm0mZ{eE&e-T~rPktHwyO)SO4?6_@4gm!e{aMdEq~OjJcwk0;_4e&QsED@r!Fu*
zv4n`tgsVxA!s1RW)0SI+bm|b7%k~GmW7RI3+fMGAtIk#3vmu`tIoudeo;@O@)m8T`
z!L@S<K&U`&mA2DKH^7m%VJSGD|3>q1M-YzWOTQ43@ByOHr^wM3q3BYwN&K@jD{|nZ
z)1uRq^0Jwc#9cy+&tLnELl$ZaSCm>8QSRtx$77iqxC3l=1ZK&w^Qf8o`~nN`Y^_@Z
zy3=>kNvAUw5TiKSRIq~5@$9!T`aT(+_21G7$7-gjw^m||mXSw0+62=SWu~WVaaHt5
zV@lH9l(l9SpEE`ceSfa7xBM)9iT&|GYN9yQ0%lT(Ng%d4vUnqw&!r#~f70UxVoF*c
z>bc|=ypG}hiL{9{f~TKP+t!zK`qtb~7*{{ez7{DZ@(NUZAt0h{n9r!S=ahWQhCz66
zZsANy{b7k%D5e(<X1ie35(ijk60b}=anr``qbHPNQYWr6Q4JhdpxF#$?l%pDaq*V{
zUOaInxO@wYYq|)rYzS^CeKlJj10BwrQM^ERK5Qw9U$PpK{ji39y@2g9r?_Ca6!xN@
zx~MLN;k3VDeP+nd|0IsONgM08q@&Y*4HZGx;PVK5Sh{p%kXd0KCEm{-+T8htyq23f
zqLFBt=Y52DpYMOKzv5jaxN}f|fRf08fQbKn{iW$)W9t4}muXD(Fi7lw7|coQ<dAkp
z)gZ(S;kNN3G*W?*Kmiev2;l1R!%jBw7g&lO4k4iyi*%dDXvF{C!!n=0#|Vu+7uNi}
zTvfZGir02tOZz-<=Z<I70~I9XaZx^Pl4Wv?<*wse*L`b>Bo=v^)YRk9l|N|;&j(v@
z70m79Aw5;=s`Oo0=i*??q<qmFeQOT%872=PFXxGB8qFS)=O8ciN1{ykCs%IV!mvX3
z5`&Z+*V(@KV<eZyvdCK~AF4Bw_*I%#?*MV$o7AyAN5?kao1oC!Crdb9Dm;ENcP*=I
zWF8uKxr+_}cyA5quIO+lX={pUdJR+)v|du3zVsOz;`4xf$<(pW$H0xm_|3;dx0~cp
zpYyzCvJ*W1@m&6Us@NAw)Q^kuzWMx~2Mj)sG|%JGzA349V6R9&W~I+P4?!8cDL1-#
zZsI~;s)kf`bye8K<EYhGa~UygV?qlqMYlqd!*&>72ZN=P=g?Hf)09>86gvus1X&~R
zCe(Fxb+mLeGrRp@!(c(sllJ<HoULIZzG0+DrKu(M&|#uwsVb)FYZgi{>>;DHme!K`
z8jgSY@#R6Z9-WLq15Xcg!V*ec{hP|yjH3dY5}K<e#hKDikj5O{wRJ6(i94Rxu9$2I
zvH~8<Mhy~Y<9E;(PKKr)K9<46k@c!Y*V3aHDGO*xDJe-A9?8k`iM#3;6A5KBsExJd
zMtZ<*iY!IB?({XEBByeT3j@{#rJpid!S>Xz)X-Fh(*wQNyRI#5>0*P9iDh}>4~zMd
zjipQ;s;ba09eBR1&abo)*5!4vuNh!E^aUiN(-ayCSzAlCSjraK8CIr2+S$_CSXxDh
z>^PuKi7M+n?moY9MJ%Lsc<u~@JX(OIt*9EF4UML02#>B%icQ2~Cei_pYroz)aJgJN
ziS~8X8?YoDrkblZFzK|DceCpe?8Ibh?(DT>1%G~zZ>6!|c319hd3nFhM>lGGEd3=q
zBK~80gfrj@L-WIzkuchdjhoY<_>i-XM+<K+asrWs&)l3o({V(t4V)`WDEo>eTaBeK
zH&F^<z@axRt(Q)x4iYp+IM|G&=b_ye!nTEq<kKg4u^zteJJ?3!$a4$<n`o9XU*oLV
zAqQIb;*!2E#T!9y+s2BsJB$G;FQ3;5Yq*jf)*2{9B!x-an7c-Bt!+8A=H}3L0<Z1Y
zmX>BZthgA0yN$zFaxF;RaICe`>f5+5#x1M$SC^26E#WxW#M7P1IR=cai51_G)-?5Q
zba}M3%hD7j33K5|wI*tNB&t6o>XViFVFQlrj1x*BsHMruOxPsg)pXFnGNXvBDBbcx
zzz>A1V5fX7oc&&;IjGyJ+GStlkL^ZJ?YQgPtMb}yU-uktH~SB#&zdOg13braDBRqd
zc|X9{$**s&-`<$XxjB3+Y(GuId9*fo;i)fZKV7ciS~s6@#&m8=QdW0cz1H^3&-Sft
zKMkhg#L0~;lU0=XcD57j?DXVL;?-eLBd=Bhq?dn7L@AIm1hP2&1xQzF5rUGuRqQ>7
z0FDKTe&Gv$EKrs_CRnNe0=3lPzFfLAjjkSj3$4KTjD04?$AbhQZ>b#cQc0<ag!oC&
z8*pzbfUR9oH1MNTah)EBR@f&0@sg%Qi9VzS`aI3Zd!@9^IkXK8+^R?$O6%~HD$1}%
zk>hkvhL(JPaUsX`!VG(mH)lgn7G2C-XOpeQ22ugTUMs;yLTcyMh-w6d=$6G<c;Lrm
z1h4}_JeVmp%O|?ewQ#SSi;0lClj4_qJMHfj<l1@*bhca2qq*c}gN+_(ji%y6(MH5o
zaZ<8gpw}t0Ji#{nbUwsNK@FMmmy6o-<0nz>AgDB~3}W^c@Hi3h3=fTtUofvx2ODRO
zoV%5(xVdF0cagEBT8CWivySzqnI!dK(n^BwW?+-jK}t9h`zrqU(E72foQQzmRgy!$
zf#yK!p_qMGcD<0YfVz#mi7#D~U{6$}4?b=D2Z{)ZY#Q=4cHvHHvFXBq7WNTy!Dshx
zD-Ip5=!4g)%B&;RXC6$<i{S(2)rcJC1IC}nLL6pC!qyz{sh(RP12Kyy;c2wH-Yemp
zFSE5SntHo#u3y`<?um}Z5_oex1V>#^Y{8C-Rz|a3VWJ&9p=ETHVBRSQg|c2AsORL2
zl0#)uSX&x0HT0WyPq;!iL*L#lj27V9*+hx7UIx8@#MF46wMhtzWIx={;sfp-Ej5E*
z3tT1C_#+c7$?&M?!uqj^4dW~_wU=Q;ce>20T~R&Gc9@iX=b*=88fonTt+CJ9J~C@A
z(*;6l^9p*_uh-w%nrZEuAYshD*AvagYAG{q?j|`o>FF@KKB*gD3vWqW2Bg9<K6)0@
zDb7+Q_#P);*|*6^<uPjwb*oG!5|pUOm8nb**6co(^Suz?V%}X&ZoB)ebLL1%AD(Pn
z5#K(LiFicoc2~-G8u8ntFq|u&8Feqv*Kk{{sYKjds@Ha3rFvW_$GBFU-daE29B+M9
z3gqGcTFbP`Zj`MR1lBa%G~N`w+SK24Y}3BcROwV()nuw`%pLUOO6n4h-iRR(S4TL}
zM0RaI=X^+7%`%U-@LGs__Z%9^wqAJOu{6at+t^I2nq^KhMn_$2>I0@}C^I{^3I&(*
zdMDRpP_A>mGB~ek#(HSr*(!qXjL&^^u5<hPasObBpENmukJ&%clR}}V1Ynrqc>*?Y
z181#?<FtM|)ah(VW6l5LHZG5W>tzc6-HNBlf%FT(g4_-0ip^d6*W_0{>FTMz-Q%)v
zIcTomRXlw(^XRWaaq$w7q|!y7bnwuixVS9@EEvet+@^aF>V%f@5*zB9Lq|{Xm4?Fc
zNm*Opw?{&Jm<D9s9%<B^)GqUU$~Y|>?)9z)k9il9cDNAVPKhS9S^1gR+<qd7t^%&D
zoShpHGOHQyrQ!J^W7({`;YXN(RBVm2@0EJ}zPqWgU5SScNId$n0UUaX9U?re>K!MZ
z&9da@EHp<YTMAV*hUg;pi>0hYDvw3#Y`TwQuDLpoqh~!5lDA>PibQE`a#Ewx?O6~;
zLk*@p*~XqLbgXLm+*ICTZ5v|r`>w2spUC9GB{#M9mh5uY5xKZLCYvsXb%hsKtjE99
z3ntQs#v{j5xf!e#n%^%?JzQjMTD}%+7-x?!Y9Sn|;O28_LVk3jJ!JGIN}<j$s-tkY
z`fx!%RK(~_F&+EVsSdq*YV|^7u1<07z?{pSxKP6NdRBitc(EmUo!H5m-!?g%HhYjC
z$9+Qnqi@WPd9174Kl`G=RM``vtISPL_$2G<&b4X1i;Lq<&W`wQH?h}ky0n3c>~xo5
zFVk3RSPxs7H!pI4FNS_?w_uv|HQrI$es=nnG^FSf^8Fe9Rfvx6kINxmsRU^gweo`!
zmkO@;gLpp_5e+;Wbw24VSNE{q(PQ(E*GCG?cC=G^rrTr6riMUYtM}+W1jvnLo`=X!
zLInrNagoYVu?V+Y<e%IZBBTcm5;67D>5tBJxKe+Mh{_nQ;PTa^6pmp&NQ_(;<!Xg?
z$}nFsHb5}r>ji5UHI)~q+CU>%lub|Emdt3gQL+<a^tZ2S&ngZIfabA@AZTp$H|S{{
zZjJ7SbTv2GeIE!s+CF?mys+-mvJjQ+L*p^C8jks%%X<d&8?BmQY#4bxSL}0HCh<x4
z=nGBey~7P>llD?}|E*!QXOb;+NdnjD{@jGAew}xy@wfWUU|VYK1^%Rds_@w-+`jKO
z?_PjIRftQNGK(GF2hJMFDaxrkw#CizX5NF%?_}!j-e8p6wQS~P-jg4oa*gk(^jo%$
zrKQ+iigJEVD5kaJXO-6RAg`2rUzSizkI?%5aQ9YNQ^~}Gn<^!6=5~f^o_=1m<jjIU
zkuv&j%5oN^a4s(1Z#z)`3kwq@KNMFBW@2h}N!r!o)baAccff3M!Qr6G&6M6q!sO`w
zk~B+sQ9+un%SX)dj~&kdweXvzK%IyQh|~%8o?)g5Z0Pzm*EOzEY|C;CsifIzDiPV9
zx!n;L_sfUm#!wiChf0GlYAQ1ZX@zOY(&W?$j(LrUz>r<>KBvftUKVQXPX|eO?s)J&
zihJvo_8M_`W_)sKqU~*_e3X=$E{zE%i&v1Ht_D|p0OU%KB%y;_B|=aAF4u!?!B_Xn
zoza^*UPlWK9mpnRp0^JbcrkTW6cj1-l`E&TtFovGk+)Ns>#RPA<Lj~scT*kfiCKl`
z$r_l0PEM^{3(9JzTOBD0dl>E=a4me1ptRj4s9?a6fmOiCV5CyL0;7Wsq#2|V7;q?X
z7+`e#&S6PCxK`k)eU-ptXf$zYR`4dpniwp2V?d#S6n<#{C<ju`5h<gXruZ~t1!fFf
zNHhPPUZhlbIUtIFgdSW6W_Myva31JPm~6OjRs&Q4%HSo?#n8pDS70n)EZ`-uX3$sQ
z-~mFtHiB^mF$UEJ*|{1HAqHIr{<$Iw)Rd^SXqi-$m?}`zdz9s*%@Va54#~M%wIa1D
z4ov{u-qrx@US>g!S{((NQdAKz8Za903b5}1^8suD5WQN0Do6>ItXhGo`<j7ivPvto
zVX#_Y$6&|cIAA#7RRP!Fm{9a0JF@YeVR0h1fPMfO0I_ErPy{dq>;cdLNdQ&AJOHtm
z4#1|j)j0GD^@FJey#t{GzXSLOv^$AAsymB2?7i}Z+6DWC>ji=Xjyr`rraOl_qC0~-
z!4kp?TnB*{&=0N_JTD|Ks2|`hpli@)AZ~$(+Ja1Y4)1&E9T4xOFOVG=S`fX^yx_cW
zPatxD?gHfl<o)FXC;cV^CjBP^8T`6I^uhG&Lc%=WP0#=;05!dfJ)3?tf%bm(0o~xf
zkX_&}_+B_(kUv20#V>R(<N-Oo-G08{uMjVIUX$3=-v}IDpt}%#fPA1{V1GdU;J9bH
zC%EVaPykA<3`nQV2fXaYFbBLW$J7VBY{xhTydoDMdjg9OJ~4$FqP;7KnjYYca>U+Y
z9<YrX#HwN9GyX9^iiOH(=EoGy+=30IWq^_jhX4W@DCiKzCNri$BRa-Nqbd`TL{2_0
zg_&Sx8YbBs5;<Hehs3frg60hJei%&LkEB--VBrAA`In|rD;AapWsZ^xDhDACR^mtD
zuiTr^t8;;Np>o0MfX#_F25Rod(mUI$X~3regb`5ROY9KCrZlEwotWxDNdqy-$acL&
z3nbm6R12pAl?|O7h;Bfp0ZtEs8EEc54?uCCa%Xo(aHrP*r3dW;IMrfQf|3AW9LQQ=
zDk0Sat$QFG=&-<z4M^PamrSBDX5lChn*5G?z5^f}NS0u-5%qxdpzJ{M&|swUa{nhZ
zX&8Ui0fkh`BSeS!|Ar$y>q;z(-~ctse})yyXjIV83hmL?jF|{K0(59|LV~}+oE~b!
zB-TN2fF9*fD5a43?qi&b1rw3?PoM{)&#upoCfrHQj}nhYDlEwSFVJcHKERC9BIIvS
zdM6+e5@1q#H(mlit}q1${x`@8$nnn!)c4a5(D&C5-1M7*0k2Yk>=gzW=8-G-W4rjt
zO@X%wA|8Ny=Mu;OfdYV#W^#$(vHuEzEfpW3GV=h8jNmfhvpp`1ptuM^D6FJ{!v798
zU`P?Uc~I{MM^Hc|r#^wf|9=B7WG3uH{XnEY@d1kfR6q!!#ec&A3=JtnL~cdY8-HXp
zsO;1f82s<BpPK6&?N4n{8W8dms@dj03<zMdx(EvY3NCXa7@&qz(F6X>2jn{f?^qKB
zg@1z^2-JpYEQ`Ppc8i~IAY1%MY@CaLeUzK`D?CbB2Ve~acCBzuL3Z}P0lfFr@8F#U
z-L`>685AO9@e>X*WWUo52#~O{3JL!etiRg9v=S5{&&TX;M_8F(y+fa`-hDuCx17V*
zs?8u@dWCxVWqa!-)>XjuZEINOE%u7^e{FBM*jt<abx&9ji+7gpRAI!nl`_Av^q@&w
z^DDP#Lt+&>720TjE|W=8Fq-3P18f}D>;0tq1u*Mn3OPtPIiDY5kq--~A*f@9{cR?T
zxvTl4*YorKAOjFdYD^v^N!65LxFKtVHB%7N7bfzv#eRpt9r8iCm{nXi&NHVdXA>^+
zue+U;<OMC0NZK0N_3Ft^MWPx0=<imp*=i2Cv%7a~>{_uq5#X|BRO?`2X_S+6HZYit
z58|DQ?k^Mt5b=&?_+H(a)Z^L)rtmHZWP=dh;ut2!c7tY|3KK`_g~Ayf%9i#5Zd2$(
zYP*%)-f1=U^S!&738_ET$cSmSOVYP#VR)t$HpxFyeU=RIDR6h<YZQ?mUR1MWyR*Lb
zDLATPxxp^;Q!QKORB}feG`;C}1c%_gXfd_2wjH;fqA^Vt!{w3*CzAhMOsN(prW9h*
zLAF7p%!#xCEr_i`J-~wUK50k5Lk=bd_}x2js&~ej1{u8ES+tn(!A8R|B!Lxh;abM)
zD;5hp6`J0<n=Vytvleae)*gd3old;(b9XcuEkeRbw&#wkn@2t|$%QyDV}74rHoon1
ze>ERO`fh`mWd#R%AWFcd(QSd7N$m5!2lBv;yazHo2mZqOD=M&0wmWlAXqZ0KMdVio
z@Owt0_e#s#F6BzbE;E+cvPOMhMepDX?|Nre=!GnsVCi@%6+)&sN?#$1d}?=5>7b{d
zcjSXo?xvNbe8mqU8@2*1bf(8t&dbEgU{st{<jd5`c*;47@t1`Y)vP=LA8EEIaugZA
zrwXAKZxm0ZmJOma%XI4I1(mr`&RHL2!Su^?N)tLGuIta6y}UX51B0M}{(ErcTjPC8
zNI<88KfnJHYWauSKL=a>6#khC{eODb{73CCp_l(F<F{V(d-|Di!`uCD@sfY!`FAI=
zpAnP4rJouLZ?}JmpZs^VpAnS5rJrigZ@2$Z`%gUOAKJei`urME`G<a?Kh2wG*00+C
z9bft9EC0szYjD(`T$OMB$G>v@5-Rm8*{{(gf07NoMQ;2f*`I#dzmokL^zkQ|-CIrn
z6WL!wKz?QW)m8jYwh;J#X8W7t_^*_|I%)q&sgLl_lz(yA{*&zQ4e6)1;cw|@i`YT^
zJK2AH5C6Mi{OW!92Th?r)?4)PuT}Ot$v^ud{#m|%_WS#j`r&_5|LO(!EAg*haDNhu
zVEk*DfAxv`mGswR(LYJU2>+GzpAJcXCI0oy=uhIWB>zhMmlLF4`F<Uw|KuxR{~vsR
a8L}0m!Qak)-yAaEKD=*TR-5bRum1-nT1oBz

diff --git a/v8-debugger-impl/lib/lib.org.chromium.sdk.jar b/v8-debugger-impl/lib/lib.org.chromium.sdk.jar
deleted file mode 100644
index 44a17989065e88999b1260d08ce073ca198258f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 587958
zcmb@tV~}R;(j{DWRd?C8ZQHhuyKLLGZQJg$ZC96Vv!~BF??lWuG0z(l6W@;5|1u+X
zUXgocu9bNyNP~jG00BV(0X<}fhy(pE4;T;_ke#DB{r3bAkitJ&!T<I6mzA-Fqn!=F
z#fJW$O%eZhQzsLv|Hd5c|77ms46y#U4+;<z6co_?|MtzK|L7xR=maoU{p(F<Y;EY|
zRHLrxw5W#ijk2j|L~TtN@YBLyss2Dfi=t%Mc0wti5H>kjA-_Zwhg8v?gm_$F!6(Gl
zxd?V!{d54-2fAd++1<Ew_6ze1H0Ny2S3MDz8!aSbzu~5*^JVM7=VZ%iCdKd9^MxJI
z%6=I|DgpK&M>K`Zp-FQ@7%`(pz34$W8U1l=<Z*gDKV2p?W|HDk#I*c=1xD@&bD@XY
zh?CK~$9y-z!7v3@e9D~?3hb>TO5N{Zj2x6j9beTEE2PTB&H`>+B%!+@|KM9SCy6A6
zE^YSaozK^Nv!|*c&6%kSHfBp#ffnbxOZm_o#qHGk>dj`c4d$X$&f1gF&8vdJD-ZG6
zRy#!--lnvoWUzHccI{LyLPFddJmt8`+%YxgtYxNHTP#XDwkj;*EA6IAn=&Lw=~7qt
zSjE`L!i;@1=$QUW5)md%7e}RmEtndX^@U6Cl>`NRs5uSWGm%<@t9^lb=f+?B%L!DD
z8KF`iuzNu`66IHm;&993+A7Og*Si`K+lZH#_=Flh1Il<U%?=OcD`g1EAMZ-Myq0vT
z&?!)jJS?@xL+fdF$Df8aLLvfvso+NgXWz9dfBdan!iAx8&T4^#A#F{(E2y5K5io>^
zGY>F1xQ(%5E3sYE*!HHY+o6+wNUS+nohl?L<^SFzx5HT?Wg!w@w$AO!44Uma6*PPb
zeS|-o-kK20R{@BVR7a}YB9NiZSPsfWhL^-ebAjj%sp{qxnISCt@<VFXBDbR)tCv?`
zs$MD9MY4bykaJaR;NTGNq*pM9u&2VfaAlJEOHn>^rrJg)i&pcK3Qi=CnmQCn=@T0I
zM#Sk%#{xW1O?b?)GWXU*GaQ}Cs%nl@+&~X(8S2c#SYk7&@>|`d3-{qJQe}ThJ_-^E
z0Jt>An}~;{=nh=aY@xdXaS*#N$a<9Nk;Jm|j4Lpwv&cG>vTa70wPs?L1mIh=40Fmb
z+hZ~ex)wfYwh{U6C-ZIJwYohfh8?|~VT|BK8@3l0_wC=Ox>M#`FNikGQ0?Mbg|zx@
zEE4WQ1KAy<MzmpeMz~?F`?{ERl<l!@s9yzG@b`(q%|)EFSn#7tA<HysYn^<V_!Ms`
z`3^KGUUBp(UXk=A)0vfZ`d44Y`rBS(6Oc{FbMOq(2z=E>IKg)hAi?<yLo%F$xSQa%
zrSV2QO$E@yr^>;m=(Y2fw!C_prtGD$(U`8jU2vG2jdMb;%Edw#sHKAjyBN4ZZzA1!
ze&56OHe5`=RCxV~?6QPd^V5@oGhw2wcweQYEBr<&hAPG#uhQ)L-P$-*n6LL}V9bN4
zLuG>2q<7VR(5bj2G3b+y|D#y5=GZZlk;KsD(~QZv({+i%jF5X$RldxzJDuLQGQ6$j
z-9P&9>Xa-q>-CH1j+7=E(kx4%ADwh@r5-No&4`kZQG#fCjqXU9+bhDS_=%`EkF&gx
zLg7korr)tOlH7l@A<&0*(SfvN=otA@_%bW0CQX5K4?Vb+V9HM3YLir?vcB#LBu%(>
zLbKL_`1l^R1sYa&S-R&+Bcy$@1{1m&$(F8AqA=!MJx#KPQmO^L<hpoCm+r2Gqz%FC
z;}FkKf4H}l)dPB2HQj6<vu(<B?sVLM_u9c_)d2MR=>5F0<s;GxyW_Z^Bs>*CEQxwv
z%MN(s>l8|;s$$>`)8gWrd;?TuGk99iq9w)RjH!7*bHzX!e1poGww6~zWb-&zn?S1>
z$!3#QU^5n%Z$lElrsIj~JW-u6Y?cs*Yd4c8N+Nw5#VAl<jdX5|28ceB!4q?)OCfIi
zv#O;mSb-Uj2%cVo+x#bz6?c>scgM<bLv(#(M9HxEs;n!o%8luXD?hif2|8gFCB@?P
zEz&u`I?u#an3N-{m~EhF8a1`5@`)|arS>QJhh@PB)A_UhP<5_7WRn}4{?dT#o^(3#
zol#8GybiQFgPpO-IOb9?*Gxfc%uf04>Iw?tc8A}$Mb^M4tmp|%Szdr)EAiB%Vs6w7
z9A1&G=16M)!*mA<cQ{^|^mBgPb@r&t^{C$Y&lLoNyo>y+=s><qCE>F#4uKIxv2{T#
zEJxh)49Y|NhiPk(SFGc44w7;APrEI$gNQNx=FNx7iFpF1UiHxm(e~OSCalwdk?To~
zdVUW?Sk2bbxuIPmtqpJB5X;k?55@(~nL_6N6G@tV{f9H8l|VuZ+j81`Sh1~rmMFQo
z3c*6;;L^cAAPUluP-2&F3SkgHKv+NjQ)mCrm5ux#E1RH`hpn-gi?fTP>3?e5w1%z|
zvMPqJT+=igU?DY*h)9c%su-HE1ca($SxF$0cDeMP^0%u~CY@}fgPU^s%&Gfc+;27d
z?qO_!jJpL`zX<+72k#j&O)V@7SA~%o=iR1{-V>jl8>bEaKi^kwK*sIJ;z(%+r-P_1
zos|b#I9Ro#ci^_C?U-S)+UG~oEli#buu%@_6zB0=sbI~_uBtF3rB$kDGAZz@DYgE-
z>#l0mmXhL<1ezLEnNF-{7`dkEE;O)1D?M5uyvkx7-4^N8AoC7YmLA9;2}@(7m3fU(
zD!cr~sz<|~rixs!BSsnet+Q*TioGTrsh)PeOWmeXr;z5>Wy#EGxLroe)SPYYiB(=|
zoa|={@lGyv*JIs%wJ}&LmbA1LHEnV9G>7En#$ik=OcN`sj(T*G;%c%~?FpG3Hq}@$
zx~00T7YLksGq>gQQ?l<Q@w0aD>^Q;Hb%96@B*b~}-~;KKw4|1H7%~BqhV>)dF?o@{
zH87;L4C7F%m6jEF0`N!C<yfn!v6q!>ZSPuHdOk(UQG)9^x;v<hgJP|<DK~R{b?vKF
zYr*8gs&i#~sr$-_w>{UDeHtTXpQ~3RL&>8+_OT`-%wXE<*kVa0X0rYmR_Q1MbrMgG
zY~YYj=1ymwVDot9X*A+0n}#|ZcrV<r9H$ACf{q>67iG@RlxVkP)41b!H;GN>@!@oU
z@PF+}cOtGQJ}#M{uVr8X)J^Z2++;PCyL52dz&n+ReM_F~i|Tapm-?%5ZE+E7;8b6M
zy$(g8Yl8)`X5Vdl;q;aqvB`;N8K2j#3u&~g7BXHo9Xpj0M5Ayu^pG{AZ4h><BBkOm
zak|9^3>po$TnIpfwKWLsX=FaLdhQ0DumUdUHuT7390plRE)eoCa8XY?FZg3CMltMQ
zuWYP0e}Z?-P&&;hwM7TGl;WulKxdCSgLK__f_ymW{GMB(t3*=PR&!29F83GzkQhal
zuxUmvHzW<H`%UtjidPTBr5fgPSLuh3`-)`1*2*n*ZBTYS;Ygf7=R-IDYP#kb?dCAx
z#d)1gl^~FFIH*&WxzaEVn$eSUQMOBo8HZDo7L6pxv0XRHZe%YT1Kthqy-iSE(77vj
zFJ8`#>10KhTwmo`Yd+5)Y?J!&2nM@Uz&YXt)5Z6AQ)3>`1^9RilfYk+#}Rr0&GUM7
zO;w3^EyFLoK&K;eA4EUjX9ks(xICho|2dH59_4H?nC4T==(-Agtw>d;9JWzY#+)D?
z&QtZsQOL1Jy}kT%P!R4T^~@bRtlZTC^v1qVI)Qz_1$_Z*su^@?1ISmRFYX(>k9dp?
znEH`hXd@3Tu0VI1N8|-mgx?+Q6@>UZ;zxHKAs*1n0fnQ=&giZpPSK+>@;fMU@{)$Z
z0Jm>^9J}mm6jo93`siF8lN&Gk%Z{)<*9Q>eRq->k=VIW+siciUSC~871JIrF_JqJR
z`z?^?D~-a@$+?}X^(ZRZunU%Fkne6`U8&ux$B1FP!h}SOe*aQV@e3G2_BdNnx!TS9
z%+Q#}j~l05K1;hxT$q7)c$_IV<E?mpQQKVoq;Q^oTigTr{HUGM7kmp4WEoR*<%;Z|
z>DG>NNz5V4g4r|oUpRcvO?`X2(W~smFx~_Ykoy^rb*EPY3E~o4KZF*_UiY<AKiy7I
zck3oM{qtyFt6-<fZ`GO8x8vJ@`L$^)qLL>*o_@A7u+Ig_0~D(6h<Y8-Xs>?0_#m2!
zFRkWjhSeQ3k@d#Dk@e0TPQUZ9Cet${MCuW7Y1D2%QjNnX{V|j<!aj3dz}14|mV_)~
z)XEvMnqTAp7fcgQ>BcF60|B-EKf<&!z}(i*TFKPf(Bpr?^rpIwI_968y{YVsJrbQn
z1v0<^0U<5~6bZlx6opiR;tGs{Afa-3&|XN6X=;uc6gsAa-D-JcMNM0_X4UdesihcP
zNOQ9Dahg2O`=Os-SUvTr?InW~t}O*qX7%3idENZxrt#OV+xl+CukVu}eh`k(Wdfe|
z%Dt-nH<O=+Qvi1=DEeFk`y)(79_rAOp<7nLr|!_Ys1sO0l>_V&j%Yi}*VHv%Mt`f<
zR(yK!JEmUcNcCGw%HF7(h&@*LI@r*gs69x*({$vfi@@_30^e|U@WnWmPYuB{f566x
zwXx+yGwNy2crn0@G}?JXh8oI+%z6<c54VvlQH;ni)=fVmOBs_oW$6|f+;qlMor=?V
z19NfZRvG-8PAL}iP8!C$;X60?S`hrh7(E8F$b-w6G!wZZ0-Bn09_L`Oc@xFG%pHV^
zdX_j+^9-&HL`l$WgAH|v&AM$==~=|-GcYH!xs*I>@gOam_e3VhY#^OC*<AbMR>4kQ
z-@KZ3V}3<&{=404Y6OJjD4OVGoM=q9M#!`x#Wg@BpJyVanbA0wI|_yh7Zw>}{tUm%
zVgwxQI~!~Ovy7Q3ct1gck-YX7FJnlRZiPc6U6iI|lbxsIRC8ENLolUW3XuwNs7=Jn
zrP1>H@Os78$b4ZRW@<an4&PSi`eUq7w6h4R0YI*-Zd*z#0|9(`*pO4Gm<gRG)XGM%
zo(<KpxEq60HG7$^j6;LLhHTp)QjASFvu&TO@$j*vNoS{>F{c#!#YVD{0B5{nOHEC(
zI5$C;(a;QHx*c#d{IVnQrG|(Xy;L{c&SgfLfwKzZUr+;7%!X2)QxBDeB6KeR+`XA9
zZJ0sfBvUUVr9!IS8+gFYfdb4Y{|=v+2@Bo&9T4zcu(M~2Y0Eo&;Tm*}AmK=QSk_lt
z0B8JB%}6Q@LoW~-4oiZ3gMY=@imMjmg0V#ibRGXhwB}k@;&5|_@^EY|IIiH{x|`F+
z%#kytk!0qZkM>ja4V{{kXNAzrZRcxC`XgFK>hf)&0>C}<3D|z~srhXWtVc@7jRntd
z99Fz{av6Y<O-X_?=Dt~3ig|DV$`l~ZU%Eij47P7I{`vmLIDOJ;Bz$z*`CUO;Ix4V&
zJ4lRi@1kRYD746kgDmvmGI8S|;xc6BBTPj0YUZqMz;;sFLL&4GQ<{bG$b+1lDBQ&x
zI*ziuqXw6Y>lVPMqgHQDi_c}VnT{%3wdN@;jsnjWyPqCQY_Z~i^KvF(pd`5Y$A0wG
z9fJ|~S0BAgcZ{v;_GVc}EYvyc)Ws{RZ_RK2F2vSEL+w-OlXqkIU-Ng`-9>wDT)uJq
z3@y&xQDM$B1Y-G76PCE_x49e##vl=rxHra%gNd=GTT2arKcK$FZt5#&xZKzOpzMep
z>5#f0Bpo@nK5XmExyOimnj%v~HV3x3YGm@~9-DPV-<2hH;9b_z@(oR4CUN%`Tqj%$
zhRRx0#jy$wvQ+F`bH{p&f`jWO*mOL^vL`om<o?<pxYh}{;D53RIO58uS{1eJ1~kKp
zb<TDRS+Y{%V|gi*nXQV#d_YkdrkFo;iC)lnZZx*2zJ**`oHCP5$Mo2&@S!;)9RhJ7
zt;;C>`U+#Td`-cJ_&w~KP?N11IRNZi?|3bUysOE#^@8@Tp?sK)I;_hdKmfuKA@AVJ
zuimLRz)MgMGi%|DNqTc%0#?THemDZ$?6`zWQ~_e4-L^1OM*Im}+i++qsvk0eNvcqd
zr5ob5)CIRo)NC<M^f@0Y3Wla*s@e=!PArXa^h)x)$3WYoPF3eP^qct<>~N}~*=BnO
z;8r)>(i+t?yC8NVa6;J=Ebqs%G1m@fD(j^n6(K}iC}g}=;KcgwAZA2i#_JxxWYzgq
zYb)q7u)HmuhdV6njo!)qhVr>{`f>ZK3HX561H-FHYICIq3Y@jD*j#oT9ewMx5g9zf
zNzNnH%IB2)*Uu03YZ(3|34bZ<LRp-XhBnn0HX1|qX3FB7q3ihfJ&<*86pfKQDph<E
zcY@!1f%%J<OdzU)<=2Ei4RdvH&iG*Je$N2m5vJ8sK-$AYl*k&f1sg(J!}E=5M(}tp
zmGECJ#I--3=)BJ+`6fHT=la6Or5?a~D@vA|Uwskzb@$?8q^!1|9K7o|H>-X%*-yJz
z5I)hvDyjxs91sP1XNd!<(q`jdgcHHAveXpR0zFh(E7=tsKvPn@gwBzk9hJ5F`CQv9
zC3FQ-0xvjd%-kqnkt-<&yMh%4H*cr?9%tj(H`bbizaH?vd;-dDk<b!$kHBbXi0kF}
zh^KavbX)|k2~Zhi&oQ-}GcKB@lF8F4)g|9Z0C{9jI5u99ihtmUzcq_*ajbb}x6zA{
z@klscjL~y$O{I9_dV=q%lR5gZj0|Kzcu%;@5bmmtk4+HV4`mMfGL3OC511T}b<m;Z
z7LRxY<@VCGUhN8W20c2>_jl)JEZgfp&;qflwae%2@APHFMpe@^Al4vFg&$-i(Iqu6
z+$)?>-%ptkpyDj5%JEQvy<T9h?|yFuKE6?E5{IzTFYH^1T$93hbJG8^(xtZAzO52f
z3f14_s$8U74wrVJvqHQuUoT~lPWfOA8EqQp@8eZP%MBeVwcfisB(;{nn}~4W&q<-?
zI=d|R95X3+S$qTW<OlujsOFhd4D5OpU=9sww~u^NAXKh!uYyC8<kU<Zjd|xCXyMO~
zy6jyQ@M^v$JPE=vWS&Fc2Xooq)7$3<{BJ(Uh!KwRSC4J_D}eq>O#MIeL5hFmgCeF*
z&W<j|&W1+T|3wJ7pX^roARr)!A>>>kTwNg$#2{jmm-Z727Y>ocAk5&W8N?uJe}66%
z9;&oWWvhrm2%?u;8!5?E>ZuuN5)lU}`6_n$I*KX!+L{4seI2A)eF2hYv3!kEVi3Ub
zT3^{i-OfILimR6nk=Vo_#30BZej1nnZw&W=7%|p^NRmOY{fz?>stg{sCh+f9r~iHb
zIWDSyjO%~lxk{#H|0Uz5d?;h9qKy7xht@=D15kueS!h!&$hrrsT@*z$2t+9f10=y*
zO8IFfZ8S7o9q^-Hf4oWi&0&_r<~V$g<9`<6%x-U6KNyY4ac69KJ@0tUobX&9?Ed-w
zgzdBO&JsnKL{e*%`0WdUeoGJqrzZMPV$q9)Y=wju8CNH&j6B^LERMv6k;vvZ!l1vY
z9=Du$axNy>Bs1M)W7|o(+=Adz(|qWb^@&-g7?Xy{<kADEtTlHEz2fLh$uwn`-pG|L
z+A$no=Y>K^%SKk#ehMCzDpIUnh$GaUm))*OOp-E;B5X0bLb@@MWq%{Su@BpXcNxu3
zkY<%uj-g#%8Fu4HcYJXUGd%Vt;1sXFlOrY<rxk7j)r9Ic!$73Fs4Vz1#Lm08G+i1z
znp_`4Y+F@pn*n#932^ipR=^EQ3X7U}^FNd5p<zmBc>96prehnmFg$P8j%)5iUCG_x
z4c8o8RK#{OE-oI6)#@vQG?<QLO)SisRT7iqQ`^xSQeeD%`-$};v)D`U(*`+&tKm8D
zx>_{V?aStYH)cgwm0LqSZopGY_IhR9Ds)n+AaD6H2%puL1jK=ahY&qEa2AtHlwS`z
z>#?N}YXm{l%mN`XXXW1UMr%)&MfWsk_b}A6(Sbl`j_6behs=hn41U1=3WpxUcDR0b
zgG?-21Wc+fDW>^)t4)TgLJ6>SRb$d(=Wvl~Zso0tu5H--07oDG#3bgBA?Fh<EnB{o
z?11Qj>B3^-O`M5oJ-#+VG`Q3unV>jO7#(*T5lwZBSqj<VgmJ%(n0Ua5KqXx9=iKG`
zTC>Y)rqK`p>1<Yn+^>MsJ&^pnb#ZqBZBUtX#R>Vt6X&AcMb9D4*zrS8Lb4N_LG*`B
zES^DUn#g(uenB0W4}6jgcK8M(mPa6pWS_(xxW*kR(ryE~#CPmc9ZUKUN6Wqs1ZAnj
z6^x`~zJJ>t!V@wsaT4FXt`0e_;Wy=z5V!Ite8oCH!;+0__Gia_7VZzUP_q!05Ns3c
zLStK|OfUXOKxXle8IjVi1mxgsZ_qK!Egn!x7vegk`wdJ9@DSz%m`Fs&)MC!5Fqh3z
zJrZ8}_%e)dNTqZ0;>1}1%~8_g_h(FN;*pnB>JLrWM|>e7H+hVbAh{XXvB95-u!MfZ
zPLY@NiuS-prSJ(Cf`>vww7ZO++k^IeBpJ3z3_%|zjO%C!31%m9cWUfar%knxRz)Po
zca(gvpq)`n>)t6d-pO(el}IHIPKlL@Tpwao{5OU4a3}yK67K*n-(Mmn=qKa>FXhGR
zi<nyl-v`dee*Z!XAXiP~6;L1`64?I^EvWwyEyPW2O&tNo!iLt?Mux^#|A7nB=my&X
z28`evNG$dO0tl)n@c4z2R4$=mC16-2P(?Rm8A}Fe$NkFLl>o@!1wSLY2wu}ZZWgz5
zX8go~Zcdqa7@eW2?UgDE33x^yYF-hy!fB48mes}`AKyix(zvEY&Z>#P91`8f*o3g-
z^lGh=^eYfbW|;9K`4jiPj$iQ*3r(-9Rg`Ti$G>GvCoJD6qcx#BysBV>1#Ok-e%bV{
z+RjEj#daxS`y!J)+P;8-6a>6u(F!5gOz<xu2p(bLef^Oa64Bd4|JMm!M)9ML|Basp
z_`f?Lntwc@{{>G;MC@$;t5)==jN2|MpzzMl%wY&ihcTqK{)}W^E<wV^60HoRB2-ne
zETmiO;ZWNja)^f%`HldWAovN(=N~7ub;6;xfI^ChguT1B?KZ=^y88X}F)9xv?p{j(
zO&bJuKR{iqC{r{P?<h-O?-TmeMCUi_lErQF)xFLN|0kVLxordC1$5OU9vgn5m@3uy
zO*NF(=2_@Fkx&u4x!m(<%5jQa@E4#Hey3Shkb$AyXIxi$NResJjV5lYDnK~leZxVf
z&CF?*nX)Peeyi2ic}s8?=Dl<E{4Bt3{XK%+IeJl`IRzQLqUMt2^>#ZwznefTWJxuI
zF9xT8c$@8uYnj2?^6kPbY3Y7XM6H}bM7l^uF=o>>37a?cndmESGS1uz+{-&VkM|dY
z4Ij@<1X^@@b2A*d>{b?m;abKb_~1O!Yl<Vw(l=95xb4>@k5VeT7KP^IFVk{0EPC@@
z0~cTUgA#@Fpgz_qWohfB4Uzr;0o8)v0-`VgR4xR}XLN1O(4LMExR7CT^z)Ks)po=5
z+%zu-iD|gHH@QEvdPZsAY?ALEb8Ymc!mc4i(EIcvy894sRHm6Gq>WO0*ct_|s0-$i
zCR@cPw2cP1B<Ue=7fNs@;>#MOI>9?oKE~(P%zTqWQ`(274&?j11>p&@XuSgOD9WWG
ziJXKfTvXxZY^6+r24G%kjxV<ifi{S-I1_|xMrYiIRcm_TJ=~R<@eMKJgq?x7Tq)l~
z7T8`5`J;!tg0Z=Q9azwbNceROzUd0Y)8z?7&YVI%kzaFsgEoy9hY{!<Vp}icd=jSL
z|Ly~rT|K<?K!AYM|7za<+z0$~-u}=224HJ0?qcX@@}FNjMO9n<Zzu3A2PK0<CeYCm
zVo8Z2DJ0q4I-iOnO$g2+K$@=CjljIfa7D7nnxS&h<Tr5i<99}-iZgB6Z0`s0CoEms
z6L-?jg*geIu?(N*qfIYA^Sq?pKW}g9K<Ev){S38K=`jTUG8mxkWN96?-C-Aw8S3^$
z*n~6`8qsr!s`kphX~hnj@3p~qe0)%Z=>1eHDAnTju=o?xp@H23>b5=r$}U2NM6Z0_
z6(!Z#M&(vz8m%KEs?oZ$85j}xru`1p?ZsB>CZf63!|Wz1Jlz40Dvg!yN-LOR?Wv6H
z12pCL){Eq7OG;HnycO#x+43eQum}t_(cP7;LI6~_7Y)5}3ay=7J~0|S6c{>A&}$E8
zm36JEw03D1r7`%sQ*7-z_;kx*Z!MhXCR$VsZc<JTohs{Uye!MT^m+#%g>}<+K&hQy
z*=k}%VoI##Qj?VVBgK~Qo~CSS4q5iN`hqKw&G4>G=>0yolwW5V?=9r6+Fb^OaGC)o
zQ<wC4$$|A9P7-42IO!+HA1VispiQmy`e{%8Hl48Z#J=@4zbBGK_>tIV(&d6^+tnXr
ziEfp(au%913e;tim^J$}BVZ5+VMaSHE#!_&#Q^1DKy<k~d>!?xgeY*E>Q=vQz}-QX
zvV*))T=R|aFsaV*RP!U@G5{6-02!6sL8`xuif{0Q=S1u<T@|lOzsR~;EWheEEGkwj
z*p7Qkfl_`ILm$^o(O8s|#_;<JsPYR(Ndu}RU^YrU^gZ&a<?II^d3lkA6069n4mC&|
zyE6ld^Pz&|XpyahURe@-$HB4j;<4zYIqZ5&b>CT959mUehg^#nQF<CoK#0cXX=&hn
zuCz~+SrU)$diq^ykyd>ROkMrJ^J;S<B_xwCN<>-;0%Qq^u{iJkl|Fm+0W;^+ODia`
zBN7Gpp@5LVQrhh8=z4Lr!l>f0XKa@#7$xvvg!#`1{h#gF-l4Jhh%)wPTTjNL9nU{8
zrx1r+9u4u3w<=mBvPVgNWtT#nlZr`ds}sF~M1H~oRh^rthC%7V2UkE0<UJ;1rXlm^
zKWKxwy}@4>MG>2ti2WLj-io^xhW^bS{EUdUCius4e*mx3?dNmIDf|B0%me>9E7+J6
z2y?Zd@8Z<<-fFT~@&$)S#_zm2k{ab^{d{vc$)P*8BNo;h11!u9JB6;`WPQItZ<2M{
zXkTDY2}(gg{03kII&V+QjhW9+x8T=2?KOo29kqnZ_wdgE_B*wnD^UpPNR{=SM?O!G
z_HC(MQ|G39=seHewp;-zbWJ+S#5z%2#>t$=NIuaU<;SPI^c`V8>O<5}J)6L2Hi9Bw
zJJzwsKLOohV;!yW&_W>+YyA%L?<(_b{sFvj-@yep^IaFSL+$*83p`^_y8P2A|Djcm
zCpi$fU_d~6f2q|!!w&8LO}Ugcbu>41{15Jwr~}lI)iHc+!!u|=MSiLXXwh0qEY&+J
zD_O!d(DgTip_fMvn)J=b&t*iQcByyyou8GxL%uJ=*BoWH=508=7kR$-CP^~USaQh9
zUH3TczVN+xv~jcl`TW?t0Sdhp2GVuU%Zl34fhj~!Bb@?k08jHchGB<cZ`vwHx)%(l
zVv-%u`AM7pqYzi!L(F`g6?)a9l)#WM96<-6AY2LRqaI@bl7S>$P=i9c9Z}?m-Ae%w
z*kRIep;<9ZB*3y%z@XMT1>Qy|3z;LmqjXDQ-&C4@Xjw^-7CTg}c|THBYi`+n;aWnm
zNK+NNpoP<?xBS)-*oWB)IU|t~U%d{CMO!aC>+K>XMAE6E9Ip+URL322yBR4diMZ%l
zy|0ccWT3iGFU>wFS7|1xF97}ES+xb4yaoEn{EjfJ(KTmK`a;l&4qVT`!mPspmwGmV
z8*IQTUb4t|a2jl5`rg`Akr_pr9#y%-aoz~XLCK&?+vr9;r8Rv5o;I(y!ZL~m`Lx0x
zJ$c{TJ23eXyoRiV*VA$R&iPr!lPo1$;>0X*w9%a0oNOWEa7pI5Szy)kfvh>OG1+u-
z<Ab9LPK;^PSviB&!egJE_P6w@=r$IrMdV{1@@=V<hg9ZDwBFK8GP)V7abgPi1`{dF
zHRtf$+j_>Mmb#17@;7>zl@9YUYf!p#?TDsUwGpl*O7Z!F8fo5aM>h3bb`wSX!9*b_
zrt61qwMubCZ208(`npx7Wla5cuhi-KjEmzvyp1Fm;<<*$rj|}DHL1p-2k>DCa1Gv7
zU$>d+6w(?tpf6;IU_N}O36`k5ywWVw2NYBoq>UI}+=h906G+gl#LE`Jo>_yOeeCe@
zkFc$(s$HMC?6NvL9u@%=FSbX!p7?jLmi;+tVmePFpSl>kRGvYt3Y*GR`;6pz$4szr
zx5!A9yQ~-rBc>N(!W|ic^7e{w1`C{N!~x|25W+;bvA_rcyD$b?xXpfYS_8IMxiz-4
z!!ALSW}*XZ-k3YC-PkKi9`vQ}o+oDB0c-%SOCCwpsKN$=)FaiW(umDg!X4@ei8t*5
zb~e)5E&(I-?!;@Xo5dQ+M9u966toETtfprgYi^d#!&NqYr_!7qpan?cH5UPBb=-xr
zv4Y(jlvNG1O_F8aQ1}Fm^abMVY;k&GPofUUleoE>kIy0#VZ%H-yZCx~)5?vvZR&Je
zs|QP^)w0HTogJ?-s@v>5G_}qY3into1FS(7LpowxRGovspH0rOQ>{lx9`A8JZldye
zOP;@y6|2pGbNTqkd>qvz-VZL`W%MUqoqPdzNOk|7px;;}&rrNyQ1mhWgY)FKV(Rs#
z=g{7h@r664uN}}L!%TrB&<P@XVor~Und);)qOe+iqOW|kwgXTtUcbv+>4AHr)tHR1
zr!Pr7dz^zVM}0R~V!;4oDe!k_VikT~%TtQCF-)38ZejJBY@a~dH-%X*zR|7x^WPYo
zzG4>OxI>i>ai>efuRZGNOfeulFbs@!vehx3@lQP>ghF$|V7lZ?-LYf!!iVWLnWrV=
zC?jJ9Q>Wya_X_x=bV`?$tzP!MjXt?;W&OIr6;?)X%9pqKa>YruCj`|$3tR|f(@qZ#
zGmzObW?(9XL&X7!Fj;E4uFYg#VI~OuzT}W{b4!xhjyme3SaDw=YDCDNS*ODssjX4>
zI9gaLYn~c=l&+oYuKnUynnqp-hC2Btl#%BwB^#pX2ktQrIA!B514m=+lL>n616>wu
zK@Ouy*1%RF=ZZb*(qwtGO1cg(HBriA0d*RFWS8P-H(V=m94pfEYmZEs*XvX+zirdN
zk#?MD;u-o&!~{5HY@rSTI22}}Iix45{+`x8jzgf~Uapy4ik}?%((lPJV$>V+PZ-;7
zgdTnYZD)k7wfSN9KC8mvAFOzS+FjV%jON^)usqY^XSYsUjsb-uUo5JmtL16ox1;iY
zK-76Yk9l^#=>6l$|E!_E{`eQg8rTroS^qopGeP)&s~Iweo*u$>w*R{xm!qaFk1UAt
zUD{S64SuKuUPmy{3MCD!Xd&7lRR~}S2$k5MY{Z=~TF>mku=)i4#*slml8m1HrZ~vh
zZcUyXqysRSA7^v!y4iMZ{`%wl1;G%8E-Au5ZzxFirXU6rg@h;RPD30(is?WTMM_^l
zAdGe&5sV7KP^_0h))vV+-P%FBM=AWmwMrG^V%x<Uc4<|6pw;an^NI~Ui&4xf>vpad
zL<sQMaOoXn(A`+%15{pMu&UN&by{g|Ijc-p++cTho<nzzNmf1ZyxC%?DkI~-r7-k{
zC~a3(zSoLsx#_o1<9m-LK9?v~XSEu4bQamHzP95#73j>=&BZ0o(bjSfz34$l&rh-D
zL7xlqG#K>=(e#iG9@=ev+1RFpgcSTzS#8-UHN)KBQjy}WaXc0hACBjPUw>T-)P;jR
zUX9qZD(Jp^DJsoSeY$$aTg~~DI!%0Y54cz<lt+PEw6~Bzr<*U9rRr_6T7xruXGLZk
zDVanI+K*D><dqMSI`)pi+?NWaV;ak>b=t(s%gQlzM^C5CgMRxd#)sVN=rBkhDZf+R
zl{&Ku$7p!w^vOIx8p2Y`C<77A8RD>oK1nsG5`GF00C~wjP$f&xjVehOLQ`J)w6{YJ
z?QL=?FocavFi!t5vwFv+COm^Zok3K3rG2{&{nZTaI_43?U!0v+K1C*WwwMz5O7axd
zPw0^&hX_X;N+M<-^vo{#fTY+6JZ>z~+9)25H%Az$-Au+a$Y8sec~8HGaGi+5TY^b^
z7PL!@8>5T7A%uSAj~EzZ8i%;cC1ym;JseAbTW~?X_QIzAL-MC`^lfN_uzjhIos0p}
zt!rS8$0a#ii4C?Dc}4-QtRZvksxwl<vx%QSF3}t0Jz?kUG3R`OxqOn-W3m|F<SoAr
zb}^kWs!u)Z)gi#|w=PEj?x}yw;<9AiN?3;IOp?<nX$I*BY64ooOF}oyog1;xSCqgf
zB4+qF1_@`f#5d%>b>CNq?DM~Tuk!z~@%s13T>0;g)Bjh?NlE^aUlhO@$=lTKs^!3m
z<N`kwT^o_cd`%UQfeQ>oMk*zFg*}^q4yh%!DZAB=pcf>)6ZgA~WAeSRHh>FGAiL_}
znLWAA?Yg+(=l2Ck?>iu2Ib<zXP++Jgj6{sl5>v(qB77e~MPV&3^b+bP5&rbpeq6zP
z^jJOGi8g-cd%+Z-{m!+TPLEY)tg#8rRhr&psFtl$Yq?Mz)Zb;BfDfb$ecbxo_kJ7R
zxVJt#JKtE44!s1-GPzClkP^zvY}VrP7@kh*`p?uc44GM8WRFm+)9F{MQ*U|MsNq<S
zCtIeTRj23Do*Np|tTh8r-xhy+8gTz1n`iM_KEfZMiR?&?0bLM!j)lkTzUxruL)5y_
zEG`W|zM+8hOWK>!+&}0prHek}ant4`n5K3jmyuwmjr#Z&aPZDH+=F}c3+!~~P0%H(
zTueo_wPPWFmZx4l&mBIoW^_NHyk1Lv+gVBw>xxByV~W<Z1PwmxjkVoUy%iW0=2>t+
z#pD96F^Yr}rnSV}7`BEVb!Lw)nLuj;2~Cg|k#KO%$s*F_qo(1j>Oj$uuXW}*blir&
zq{`cFd6hF*)d49)-(LVlG!Y3`nTP~Bt(sH4?ql`TFWbPOBzjzifec3p{S|m6txn!k
zH+KV49H~eff&J(&r4*CZ4nCHc&+OUQj>|+oF75|M@&i$q)b{cKk%^GI5vk-4atH<2
z^(hQ+C>Y4y0D8TdlUop{ugSHTyhSe5bR~nIaQC`jU4LEZcQFTLfnUH<A-(RaXhr>v
zgvc#)WS<DO(YP`Vc%*wVa2i6<b&6K1rTTo>w;EasXG1wKCuK@07e?lX>7~H=&+~KO
z#JqybNf&(LokSA}BPWZbF(_G~Bn8#X<zN5GdFB}1iHyHFkN)3k9Q6M;WP?QA&e7_x
z*6|;@(W42_&{@Xx{lPpHVyMvs3{6Nz5@1M1({CfBKtdvDNCv`~xKheK2%lk+-k%{T
ztZwzPF@3GowLVO@fg~G<NUf$-Bdy({dZA{eeYJ!CwftUw<~5Vk!3>OKzW>0&@RIE{
z<JSA&bJK?4ar)GC4Lld=$2lKZH#y3l?cJj}$evSwpdF&~*6Qso&S#qdwwn@n19<HX
z#kXi*jxgFP-3yaT-fty>`z?+|mQ&uhN3<2oeb_*JKcqPRk{(J)PIVN(ol`zC?Re6j
zy-k`{#=3PSLhE}u#G5{EUx!@f&}4FlJbu|rG__xLf7c|WXYYqN;4U!Zs}~G;7hmkv
z4iv|s7_4vcT7oRAl%NlAR}t7mjlqQz6$8`ZO$bN4fVsG9M?A4g!$Y`P4uW($EzlUT
znmyIf00L=EZ;<cX^b+_bWrrmnJRsX|LBfF-g_$6dlp7u!8Yr7%dCLBbsRNId1qK5t
zM2yJGh{p`(`gi=^!;XawfVqxyaPe-Y<nx~6S;Nc=2WyL!j=c&B%Hnz*)DDycR7hx!
z(DoF#2W|#%N^9QMO7E+rK})|66s9BM{~&*d_i+~zxJ0x6yV!_&Y--5Mw1Bea)dwX7
zZOtR8Z~)Dlx>gxB024=wnY<kqIHEy>5))rdS6|fi%c-9H_bziiZ+(;7WNuXF%j3=C
zhu7!k^P}5~E5a4D4v_+{ev~h9wLBO?VptI`3N$GfSmuROqsE{q$aC!}!!Y#~yeQnC
z*Hb-Ww(=WzY^4^8fL@unkV7xW`P?;pqRW_dW2w8;+$n$&&2SB;7h5SSnCnTgA%ZVy
z!<ahR;w?rF4TIT`Gk`cC_nqdj`IMbCdqzcTDjVhyGYm}4#9j1{I|(8dD^m{ftbuc?
zxu+ZrTFf{`c<J!NF$pg2nnZ*l9BlKkBbRB&egIfeu{^$VsLI(fV+szwe94&pgL+>c
zvLo5c;(&TF4NCZUJrae4DG2<pJ#8vaa2`#atU|SdiKEA}jkhvLCMfrOQpj)0DHyTn
z;0<()aR{`FPWJfYW_MF#U1^27M3q5gkfIKWbe>nU!zHL0{{b@xpFttcr%#+lcWE=u
zgZ2C5EI5p!_qFeGnNgRAH<#&>eZ?}=7zcQHCgCOa^22MW;WiQCL*ptt16~TY3qg4v
zP2$w0*;PT(O-5C_S?<9^5@w<DSPav{zTDtwycCq|Qj}5ySEsR&*hHlb18-{$`LXQ!
zH`$b_OQyu`X5KS<H!JtZ^pywILKR=6%u?;8l{`A-3FQ*!0$&$~6g)IjHG@gEH$fjB
zIg@Np28*Es7woJoaJngoG8IwnwN{U?%%dXG=?+=P-d8wI`f_7IFNSQICubfy=jI>p
z$5D$3HtR*zp!0Vcb8A?MPwg~820@4C17!|9us4G(bk?J?!7NwqISuK2gxEA4Pul1k
z4eKGW_64vfd*0{>24%2$!%x<_ay2M5Y-OztZDWLUN6Ydj&c(|izV$(zCsRB+dau!;
z=DO|(vt9M5n>w#>2pzZF-30d6n8y?W%XZl@I^l%Z12=btuzo;ZVJ_?787OaB@P5vF
z^6n7<$q?P-IBa5%3|1aQHc04P4hgXI2eWWe=-+`>I<Hkrw*>7k>}Sx5(SX-3*gx^T
z4dB}#s!U_id#VwqRH#l>)z2b3-?P~?&5HSiR+a%xJMnB)o6H+M6UxgK$sg3W5R&#S
z>m!{_^eNE|9rILk&9`rS#0~shTgbmCaNwnMnF~vee80^{>TVJ!4Tb5T#qq`}B_}(v
z2?rCCe)%)1pA8O{QABnvp50q#(2=7Ny!)|AlX~7x+$l`08C@<ew{>NL$4e$ii`vj|
zKGx#&#@DMtiHVOsrq5$y;>DM((ih(ba-as&DAUWbN;+u++5EzL!44Z+#bXRJT!vW6
zMniM$t3VsS#M;Ubf+sO@vP?Sq5CN{53seI_P#K&00gS(UUmtN(4ZY$8$xrjcat6h?
z#_ev9WWb|ksthNpqYal==U2MjO>hpgL5CL%+Y8I3@blm0^pHUtZkXw9cNFlj4x2$z
zZ#q%Fytw<ZL5e|Qjlj{dXNSj1-eCxzTTn~0NNf&(U06%oIMSWc%zMKkip1r9xx+U3
zyEX3h2qnt<<#Q}m7yYkeF_d=R(cje*d5`N=mp-b`n0dP8{RunHQwn_C6N*7ZthFK1
zF?fzO{Sd4hDSWsTM-R|DuO#ZZWM9m|Cz=brBHMaoPfq2-4;s@T&1m!nym}&_lR;r0
zHCt((c4f_?EF-31t8$i*u6vF%E67!Zm&eha8s)FIXx%CA$A|&c5^1AfPPc4WGpPZ|
zvqDk}H-ulCoV(GV$ibThf~)oF!U`4`$Mp6>_mcEM*duK4AFY-c9=LJ}Ltm2h!k;)2
z0WlXIH7NFPERkWSz@$El6e&qeenq2RI7e(US}XK>P^l$CpIPtU;(!~rICG8dCHZgY
z7}A(k75kaQ)Fr!={e&~<QeU#Klw$b^N)ti3$TzTt<lGadA8$8K_yMlOYWDUrMMmZG
z%pszq4IDqZY)6r9E{ols(KviuZ)m;(Gihudw<1iFq~=+h@f5;bEUo?3V@m0NYVheF
zY+f{<Kv$y_qj*@Lv6WO%dX$ou_zF!I`+Ahs?+TJ6K2wKWsV)I9c7>X{2QFk(>-L|Q
zIYge7meUf^&g_3YQK{PbD+3t0*CmEw-m%PinHS5G#VXHp#Gd9*QeQf-&)%s&@opHG
zSnvj=l(!veh|6GT)DD;`+ozP=a0$Z<{GrezMHs0>DAmF(t5GNSP^st0EbV(WG7Jx6
zi_fhTMN7yiTGH6NgD^>c*f=v`0+lA{!lcHMK&76erk=ZYOG6XgUXwuG?0xpMhsr|_
zbhQ)B(@6)+ad=fJ=?q7G8q>T|Di-lxWf{RQR}^tsrL2`=m`XN)lGhZ2RrzxWvUyOs
zkC^_BzD0079JfXx)jvaz04yOeV%D4&aZt@?FZU-av&1a3^krhc#LxQXZRW~kxTv~r
zRF0+1Hc<JAb)GvA!Dh6?8t3%EYfzhCfM1J(kKf1TfBPnvH{5Yx-P=z_{Jl9A%2oP@
zZD)5xXTuDzDJ4sQr9iQzL4wsF<E}u>Hm9F8N08Yd*qpE1ybsfW7;0fG?prHV9Mq{3
zAnMM~*XO=5!t*TXErH2y_~t^S$p-^C{Bcl}Y>4RWJvE`QfGLBwT9GcJ(Mu=qs!7g2
zlZ0eQk5gBmHb@TjXmpq*Fu97dQzzhsDhHoe?KcebNB(Z`MoiM}wT_8<?h5amS@3yG
z;nvHn2VnidBWW^wU+n+n71!s(A9*C8f=yaEi>o$O{320Dsa_OuE~V)<ME0)0ov<xq
z!j18T{#(a^ur-{H8YR<1ipav)N2Bg%GUKid;aUxoSLc1k<0@s`^~`P0GE?5711d>B
z3(m8;q6Ei^1jqg1OP&cDjw0fqjA#z;k2%=5d|O8>QDIcQ4yF)zW~Y5aYL*6gy7?r;
zAIlH>1zf^p*y%r%2%+EL7n^~ZLjXbkrl4*4MbdUJ-2f{ZK~hciMl6*XNd;dmVgaj5
zfr$2Gv@`J-3<EocaJdF#UxyA;)I8IaCrmYH4K?WBPUM=yX@)6%I#nvUD^#Z7uROi+
z&T@H;NZ2gvRfo80bCPekFq@Ffp2U#7>B++Z^y3)BdD!*`Lf#_J-o<j@uS~X5_nJi(
z1j@?D%E}M88blcpEX?P|(i^YTua#K8N)soCDO9$P#m4?vTlKHoQw3!Y$|o6V<ztb(
z)p2kl#QV-EhBJ&R#<t+_gPi>N_vA6d@mQMk?>+$p&VMK8{9kqD{}}<0F#gvNKy_1Y
zQ{X3WR&Y87IuXoS44TCv83`rfS&yKE>XJl?Py$TgNsML&xH0i&#e}r}yKv1?W%-XU
ze_xel%@ZPmIgWu;H?z?u^O;!lQNQo+cli9sRZ5bC)dIq@1H{xN1qES6VaY*bc+*gm
zdh)MJm_en*r|QOzla8=PAB|_X9}`ys8%ONl4aRI6f}6+}15Lr|MWR&;3H?~Yl=vRY
z3v9xL*Vizi6{XHYAJ2x;?%Lg^Nv54=nOi%@xhfB}j0NS4{{8MJ90OIGTQA_6k%~cP
z)FNz7XdkcTVfdJ4n*Gslz%L;1$(46pZC7aQKQOAHpvRuKtb%&84wwCW`pI7jtbMy3
z1nx$sediV^7%9EJD+u5ogf$qJ#QXGZt{>vMA9^Xj3|y?LTE*CfEtRzp)Mw!G#3dI^
z<JHIYEDt2ydE#pa>$m&cI*e1;wLS*m==|{vRw3KHN8d{~pJnFbD?6EjOp8|(pMJT>
zY(AA3*F+i2ZZ9h^G6Ylxpg4od-!Anr^RVB7(4T3D(Yb^^zWD&$MNRnzb}(S(e<2Ig
z5pjmP>*e_6WR>1lY*(vb_KMu#7A<)N^SQp;KT@cokb0m>4MyH=5nh1T)+&f+O#W%}
zL=S5m0D1C^(K_PL;HsgD@C9b{Br}MA!UDi&Qb*}gd;?K`id<q(@23|tO7aOHD6?P{
z)Dp*BkeJVCm=$a|K(s+g8u}7pl4nqQLsI7w^cE#AKqGOJV|;9k=E3#A3{`~#k_R|o
zb5gcBq`G3b4U6H9?bG7Tg?Lw<GOxV0iR<3%{a_`WTRz->PSD^b%FOB0i6;o`IBe*i
zbOxAi$&^xvPin}Ne*b%MP-iE>DDW@oq=fwcE4`Wilio23^HLy!D7>qzt3wOb)jyyn
z0?E8-1LK1Qkg2@!R{^-V<_50pw@scfo~NMi<)_#CS@bi5ylykuUdN8Ue|r6ZoE?;e
z{nf$;e~J^vLZ@)sxOmD#(Qz3Ib)1w&&S6+o<u)COys>jKPBlZ&C7RLn%-mQtX3sba
z0Tq0k)ZFtDCy6jRvD)*Y%};fe%%l=!(21m465}PN#Jp=}da$bSseM;_NtgF@PKj66
zIn6$Y9(&U9liWO75Fa4f927{I+hP^!jv`P6&#dGjW_DySEQ}bjWK>a*X4^*pq99f;
z0^jqNHs8u0>USg>TNLO;Hy+C|ph=&kpCe}{Rq0TJxyS9&xwuHcdd2{~M6ZO%j5ftV
zfw`q-%*s3e_vH{Pkm-87zk4{d|Lrc$KO>8fhqI}Qov?+W<6pVh)zs1Xe~uSZR5zWF
zO;P^%Oq(uVrKSciJc7^$X6`_h=QnR{u!IO{*N33Nz-*dq+IFqScom2$p2MSd_iRAo
zXFIq%;B?0`{T_>s`$n93-G3cuVn&EO*_6#xQyQ8&?8=?I$$sG8{r-Hp!UyIFk{7iW
z%nKLh(1|5`jN%9^@@DN*4<f1w6~Q^EBIcmm7lnJcg4)gfJt)Z+eQy}On~UUtbpSF0
z#X(IJ*!xp&|6$UbV>Il6Xdu300PH0RDIRTpj1eb*$Utcbr4+mzZg20<!0nHMo#X44
z!Ape`@z;SQ#LBEf27~its*9J(3eK>2KscO`mLw)%*kp}~fmlEOpwn_ld9e{d>B_S=
z-IFVUKIkbvn<*yMKtsBHAS374lUb-YE2@1LE6LU<OUAgUHf~jCIgXr}NJek~*WXiF
zyYYd^HoWq<zRWc7TRvVtv=UfVJv4hN*eLh68N~=NF{xEiW5vDC_ne)46`Js-zoA?L
z=i*qo9GPv2`9W-rC0#o*1iQRPyFi~#vd|8_@YjY$dwSX693C~Mo%CI@6|Fg8{<&t@
zQedeOXJ!wTZWS2yJ>EOBW=y~MK3tZxz<vsbt4%^8hagmS@ZPD(y1Bi03UO<8CT?<*
zts2-ARJtkDl`P<`_``^&Wj}l`ow7v!C?hI$Y})l&ONbi@gasP&6e)LL5d;oevzv%8
z6b+h;20CX=)|X_>9!w{mA<P3B{jM^2)n0Po!d-a4lt#iG*-p|O`{pMJ^vymJ={CGV
z(o@AN19*X1@}alXxZ?uD5*od@weoVACyuI92Nqui^@Ap<DfOAzFbjNBljZ<w_h{G)
zskeU>&KoN<{y@T9BwJ*IMRix-B#C;;Eh5D#ZQL{#FuwF_a8VuI1`ivfuzmOwY31bH
zYdIHMeTo6zvZVU4CoF9z>&iWbEEZ+I{CO;=@(k0`@XTX#^?bv(q%3K|m=yhF+EHm@
zLWIzJvNWNmeC9VO46ChJuG?%ZHQCFd<uf9-scaF%G330)AFUc<*~yh#s<H!HVzWl3
zS!WyT8V+w|9w(Ar;i65S`L#?z$R5b}J&UsuI%wN&6<jqJvk=Rir85I1=Hs!5>}e`4
zUO!w9a%u@(cP_kRkJVp?ys^AWd?wgCh=ZYPgMlQ9$}qsZPzBY76?(hiN|{6t_o(2=
zSiHw@*o%=RnNpq|L8lE3xKVtevX79T<)g@JFrhZh)PqTn^M&F;D~8{CK+B3dF|{PT
zC8zlg+*b=E+G0*l7f2db+6boXdsa1Qeo)(if5<>;c8TMK?Ju!cEwe{rpyn`0xn1JN
ztZ1>Igo$0--D+tsi|JXnmYdvTc^EGTuDeGO6Zi7^CRSQWp@ObBgGV;(XtMNA^w<a`
zCQwl}5LTnB>aAOmW|bvWbfDaUy|#XG!6K~HfyEFs5{N2a@6q$$@c*j2gR$}E3};@o
zEifAEO5hs=8JCQLa^AX)r5b&e`MbeXjzvx4e{t^usabygxccU#@hiNP8!E3iXzYyC
z8fx{hJ|S=Q_@}PWwyu23w-bwZRH&#(8gFe^kl4bS^UHe>HFeI%#&_G(w6RU?_^s5`
zD*hIA-}Uc|r;d!A{K9~6MbV)(nc{Fn!hMm59Fb7o<PMT62+CdaGZNVhz5E5;k^vt<
z&hNzgkN-j2I{;U@ZtKG7bZpzUZQHifv27b2+qOEk?WAMdcBhk@UTd$t_dWae`p-Re
z|5T-F)~uRe%^L4B2cGea@glcgF+c3Gz-*CX_0x)NvEJ?Am~9N<9}MX?Y5XXqF_{sa
z^(aM93K3X0-Tz(*;iHEe+Yo8{Ds$rjwrvHq#|#s5M3V3xgobEK=ZGr^*!td|#Go-~
zMm~=hh+}_oZH7AWiW;3m9&#WI_I7&pqf<~Y_8Y${$xa$fPQ?vgu~D^0=IbBbindI`
z9jlL)pC-irEQtO`%kQroF)C6TqL&UXX!A+661dI&TmX(0q(eX+4hc02Pg<~Y5GYP*
zI=|%#07oLS*>M-@76%t<^VZ1+Kn*VpPB;|&dShN?Sh<i$zj?dK;!FK)BTCkx#ANhq
zFL*#9%4oAhvgR>tQRp<OR1|e8o0>z_38TY6*!NC_vmyE{L_V<v4as!!iwwuWJHs#G
zr*Y>u`AAuG&x$G0{#AaLOnn4$kmu9Xjsg$81KS}y3C^3pNbDuPxSpyHiu&Q>|M!ZS
z-v_n-Xx#kM6mrtCfb>Wipp+3n!16P=dU>V>-^&LfXZnp2g`hxf)@S*0>qop(uD)@l
zx?X`k<wx4Et~F2hr7s?j-|hc=^Lhtp?vekj>?m*+!Ukq1R<e$6Qs*IXU%^TM<i)!X
zsA81iJ%U;*vteYJdMu<P&KVa*enH7FTtq_bJMC#NL+V92r^M(0|7=7s&vXqLPb<Wc
z6~V=*(r!+f+*hdRWoAY7{dMmpX&UW?Oa5gBDRrHBVqeNzEbF+3{8Vw5WQrsG#V*tu
zQL_Zz9n(j|6ji@hf)zf%wMbcnP3K$kWKV`|t3E@O-1fkYh@9o;0j)@U7ynwL$u7R^
zH6^)24ayN0O9!heD(Evhm0Ha*4O2#tB}(KiRf9&h`#;3b9;KJk*#DpD1l@nDeel0`
z&HgnC^2r&*+8KmL1SBcpwf$q}L;j<7?XMI1_h}A`UxOi&TjO`_{c*DdIT$ceF?fr5
zH8n}lF~&iq12BrAv3`_nUG-$_->DfvO+$SR?TmHmG|7j>xMK{QLA-O^o`sKJM$m<y
zTT%;KUIxgQUkZs+*<ZxWl`{|>?BfvPzxiG8(YbNm-Y7(5I3PqsC`R}N=dVr<=ZH-k
z{cDy)-$?I^-lrRNKdz5i5<J*m1CuR)xeTawzO;x>1tAfBAyJ5b)OX^@0hh}kMp5|N
zEbRAY`?nEYqW|4&L9)`4eSAn6suqo5-xsPQvVdS`0w8fJUCAN*@tAhJFq50lzo@c=
z9qHa~!Cr}mrK7Cq!9OxwPIR)`9Gw2xMeJsOKyO5A1jn{ONJP&CFTP$EYKN!_8hQHZ
zN-$?Xtyi_F@T@>#0YdsU&~yd`iW90W(3V6=MFs(8H)QW}|B0bRt;4B7;+Zq7Qj5YS
z;i2qj%lFv%ou3srUzTn=E5}@4&Md3SGEij|brL0R2hXnMOu12x=MS}$)-??aFwNzW
z>aKRWsu5w5=1Uj~NB0Rpa~H)9Gn@kReWHMX1R(G8S@fZ;HY<P7T%q~q?w+Cuyfao4
zSdQ03bPj>tzmd4}KYjk?6CMf;Xn{Y>JNmaKrvGmtQ`XklUf<Eo#`+&cwA{Kx9~~O^
z=GuyrwZ<VLn9kE@koI~*ygolVvWiYV6~Xhg!nlH7oe4<X?hph;Ve|)s@RsMv5tq)(
zjJ^BwXW(vP7_YNuFmP<cmPQ^Juyycc`<^-f=`Ll7qp-a}Fu`G&FNKq8FF9k%I+ZCc
zv}(o<BUKX`g>$1S8dyHkqS977N}K0%UwmkYbcck6z~Z<R+c!kzeC)8-Cv4(OUukc@
z#je^hYu=Df5~-p`pi0KBn69-G+{M++mZluc3PZCJXwMtq3idufJYDBcuN@TH%WigW
z%L<}iJo@mntx!CG1)`h?TJ^$s4z)!$z_C4qxi9@J@p7$#!8SMajYefV2l%0L1@p_!
zBd#_v;J<AAQP2I}_x|_n{Er6WU*0!SNz(@5m-<Am(NZ;{VM|+6c;7&M<z=C022MOp
zPMoS#mIrDKsEDd<;>@6Tiebjo^TP*gO5LHNO;I5UOKGtzvztt&UUDY4c>a8ThV<3u
zk|qoTB}s~9t@RH9!9jPm%o&b>@L(8Lg-$?=T<koNtRB<DcFU4uP6qV@LmP$Gb+Rfh
ze)YqGIm?-A3dwamKkONHIO(%35%Tt5CmsEKJaQG2tDpv;%4ICJ@EWbBW+5iqjs>$K
z(BQgCJm%i#((EysIDZ>PU#e&V(C7Th_KZDB$12In(Uqg+Tap(RhrLOt);P_!YtwRW
zUv0s<YSIgy?~WkhV&k<TUZoN-co%l&t~IBy3Sl%`l8E85&f@X{)!=3t2}OGaD&#6A
zKaS{Af+e5a+CPp<Ntu@U^0U`Li#I1PT6pP}6J@kSjjqPL$KNV99Ge3O@-C(KHM7}I
zJ6Pd$4?Vp0GeZRkzN)_B_ZCO!GkKHrLxF3#7o0x%3<oytF5L{>pAyZU^Jk}Clt<JI
zExVz3!<WkCP*W)E2k$&&n(xG+-`~xkmkJ=eq*w`olSYm*3taTVydjf^-Bas1CK?8)
z5_x?Sc?^!RClJ)~W968<1xW-<*ZYyRh+F6lM+7!Iv8v$X4?G#SrII%S5_$2j(`O^G
zHjnS0;b#s8AxY~s+M+Rq8tHe(WV~2MTqr4aSQ1$lE_QT?SZjqD#Md6lVNB=U{cJxr
z5zq?Xa+We>#jME`{wbjKJNx{^^Z`fAkL>9G6(s*bFeD~e+04<w4ZZ8M1%L5NEWW9)
zg@(BEWB%UXhEJrVVpbw&CcN8_u2H!-Uz!0l^EK$B!S4^-J;d*y9O{6gQY2mxh4kaX
z{;}<LdGc{nx9iiAU%DuYixrh&-ypE1#!{W_RIgXC7E^+Lss8q-fP0o{!cq{Z$xa0U
zRxg}j0;7_K&)l{hxiEtaIBohqdxNoe>xbJ)Zk24|4P=G2ZGoN?iIG|K^J9?x$}s44
z6FIbKDys@%i`UJhcbFTuBld;Zu4}w|8W`NnU!;$r^p>)CWz9k;sIms7Nqu4=eNRC4
z;07=4Z0-o;kUHh9aj#w0?prXLL2JYJ)Xq8{`-$TGBvginEzW&ppqyDl8%Q-~k(8cD
z9o7ToT^<q+LGcr>B!v2MF1PS0V5lnCY~`Hf`V3d<fH?%rz92ifi}psKEldHlBCSX*
zTIi?eGPuA5C(`Y3oE)JfcLs3?b~3`Jr86_0O*zQPyt+`Dbif8q6=%XX&?>TcHMSgv
z(NS@mF`?<u*uzY%_Eb8^J21Z+F)tOgwMd1qfvS+DSQSvV2~`I~7<C9KL^vAOmN&@i
zeV<Z$;nM&qXHr0l;*}F4h_u{gsG9XWPuS-e7bf2k89gf+_q-=mJBMUoEXeeH66X!q
z1#fgcOEHLYL~H_Ml#G!@G_vI+e}h>tokY;jG{v(B-a~j^HsbciiPf3h|C6w-fGU7R
z`hZ-)hi?1-733KIj5dk#(vkunoR;cDZE@~$as#B6kvw7pm4A$XHv)wvHxDSb*JOA5
zBcP8;d5$n|4leRKDUCnM_wF^1gYlNb$)TacRZd^TGoWEZX+3Q{LA`i6F4hGi)WBDr
za#6DSbw0#0Y{PqPj&qCmk{5W!`)EkzdBqK*Q($#55fT(rxc>NCM8lB4(Wr)%CPL&P
z4iaD6B|C4jzE~H<co}1^lwl_N*!D;hmUfx=`O|~Eb~kqsFdVHDK`*O1lm?r!{91Pv
z&t^(Y5t=X0l`<mMay<y)fdM{_`kUjDBBL<IO}q>G0;aEY&5N;VPNaaVfeYE^;B8&z
zc9B@`K)m>Mqyo;slm4-LTqX~?{IpQ^WOn0?{D5PTlo4?N%9C#M2W86h?5J`F&As0y
zwa_&yV9<>7?|^>=rqbE(984d93G8nJ6XS0afd4EC{(Xo?$?8KG3FrOrVt?)?Q0gB}
z;II4wh*ck2-J^#XStLOa2(+7g?xYA)<ubDVeYk5@h-juCck3&|q;)z(A<=pAdit_k
zR;t?<oA=kB&zOAZQ?qn(F_JUg$O(>A7@>yZLv?;cRBm+y+~ph;91Ca&)vH{lbSXAm
zvOvnoA-Q1a-Fi$J(>z=Jiqm$b&cnP8<=E_1#y_&wVF0&<QNF$=8EU4Rd+h(H+S+gk
z1{aMx$MSGaY_rZ>6@~i7%xkLgz|WU^o`lR2UGeQxpo9phOp2yHnHH3C7%x~d?qh%s
zTNa`f9o0dI2=W8kj&c`1+Mq===|+>L6a3jtt7MktL{m%K&}Y#VZ4<4eK|Sbnf?}n@
zn^|sn^e-SvB{8d+ad&(e3g^dTpV0?hU3HdQUIBVuj3k(a3&>0p0(xn`FK#tb3t)^v
zKp)IaW4Hj5MLJs5(<bySU9b94H)56km<Qf57B@A(LPuP*UGFEtnTbN@hytpZBN9C!
zY@*QrDlLU)u>-!~#AU385f*@-AMV()Sl@UW(i@Ft;O2ySi@UFaqpl4&Ai&QBDF{dp
z`b+~rZ&Vn3mzXI1DK#=7{tW2nOMFV+J&1bSor-Dw6sjcYba-(nvJZYIE~oGgP-JKP
zkG*->m=_Uw4C`4AkuyGEvkLe*&NYHDA|8VtCTl?+8W*~`i5hXTRDA7M7?gLvJ0Ai;
zY)ibL<Zz=h#3kZbT^D*uCaA}fTA0j2OY?vu1zis%@%=RpMaewXF|G?(0E?enO{hJo
zNcOID0OKz`i4I#K6yJh@8xHK0C;0P&$0$fjSNi@SZQ%>PB%6Q0c=2xo+V7$K@8yD=
zv9Z0Xy}s>7O8cjOY4}UytJ+$jA}_Cm1k`|JeqB|s1g|6|7iPu8L$eC6I@Y+nj^V}d
z21XkOn}$X^gDOp=gX773-IKjtO*hE+ZA>F45cuA&1*_9x@-dT<aowhi$LEtRz%GP_
zEtMZzbcDWGF8*S8!!RY92!1r8U4~KUJX;f*J4xAsqe_>xvPtBN)B?@s_yTr*95u#V
zkxENH<w_=&pn!E|>j1jKn8%)Ee2c&BT=@aDHTzn)VIcmofXHDa)Cv3C-h!#{#}qpw
zmKKlWr9WB%ag%+uXKBhU+u%*G85?kL`KQ220_Cbp24s(VjiOm%QmA;{k|`;>@&ak)
z;aL{>?+v5I6Ab+uj3ODQAj<hpaU6~Vv*yh5WtP74&@crRUfyS%4J}Wiswic-YKwrZ
z@3ig&5GdIPlLcHkZHiug(WVq&G}$N=1T3s$P=}wHUxS?`$5facI6Ul5Ko&Da#*SAx
zs@X-pCuA5pH&`EQQ5gZutP5{I$!nLd2CmFA!S!Y3F!U<X1;^r1<8%2X8@*X3CO*+V
z8jB~5v@8~A-JPsz95fnE_X)wtf2CJXRG`@+WG0!qD~mQKKXj`m=ScIuZC8nRk?gG4
zye-Tf7{IVFpaeSCCI=8#oze|eue*BotOb7_`Qo33?OI57Ie;$M&V7oJa)zjfjA<(&
z3>Y5HtX7?e`IAC~9%aZ3*~B&p|6AT+xIGn7PmRxjac+D<9Br)2$&o=3O8Kb;NwdeY
zkrI;hVvE%y3=9mz{M&@A?9~v2_MQB+KsF?Peb{WkMci6xeKF0`4;CTQ4d1Bx4WaTj
zrVulkB3|FZA13e;u;T=;(Ng;Lb4MI&#n+#Jy~VPzzt*HuX;)!3>QUmUT5HrIfD10M
zz&5OlmhzNE$<b8GV7TZNi<$?*0U}Cwi5^wT5|c!IHFjqeo0sge$`UTH?{l76iqh6u
z^0?E*Ct2pj1Dw-kyM>SC)j$RWloi`mOeH$+#bkPT!tkio%!^+N=-AuTvVv9M>6}tc
zFH)JQyfXcnLq(s)$*3EvCpeQV$M`cF4qBg#BjzI1S%`;#L`;Ne#984JSMfR|!ELzv
zbJ}c2Y~au_Qh!)KKrCX3j5wM-F&JaZsH*^{ael8ov5*j1(#|skJ8<5<$m*e}<nv6O
zcRfGvinl-;ec;fiIubYq?>yq@fUE~WAUo9%JE2L@TA8eGaNoVqMpB-Ju|+@={@}Kt
zY@~zJKgP=e|8~5b>9=9*KWRP%V+SWo$A2UjalhySxZq9cxuU_c28o{w6#ilU@;wpM
zz~o>Ca?`&EgVr>XI9U1jMADuB-fmpt$;SJf`{{$4crTL!H&Q{Kt_@xQEWJJ<kTDWR
zDoi!zn!%Xz5k3;9;7DU##-pe!5jv?B2Dn4BV&Xg!o9BXrwdvhA=C1{<kHXw7iS+a|
z!Wl2%g4;}BLi1N{Sdg=iYjozE8&*ipMk{tZ=^mug1((gQ`z`Pwb_j(!d1C3@e2KZQ
zs|U~9LnpREDwWF>3*aeckQkN=b?cmO!`RuNR)={`q+I(f&cv&qWM@O6>XM|XK`1_Q
z-G<<Y)#|bVGg%KPPC_PnwT6S4Ev5T+5a#M$rknmSrE)UZEoWuPPwIP66?0elmEpNh
zi*Y?TFOq1D!4=;r?|vN1$%3R|B(qpepQjL1VlSVwnpUqnW=(3T*3*la<f;N7A|jFc
zkSof~6BLP)#}?@ql`!n{yhY|M41IgQ-q+#Bt=>4GlYRa~cyg{zrB{oYOa?p4G+Lpj
z#Y!&;Kk&->D{Xl-m)D8@NL!pg&iwb8B=c|2``?G<e`(SG3wKeeZ1rmoiMMr~5$l)%
zxmPVgXniU4r}X3x-c`s9BZ0-toMk=_H^q3_k6J&V4KrwSi?&2Jb7rO#Th5|*VMaEZ
z@r`WA!A77i#uRaA+~{(ZeadZewZrG_{<a!`K`mOKukDp_ig!^N3cq;vY!FW*2Dcw@
zBmTM*0yu)fx=b!MUOq<N2yNB{`&+$LOR&u%7Kqi19Tlr8GuPA&T6a#0NJFc6N;-q}
z9L1s*{Wy~Oh5PK9t%atu7v*uK70GF*w)CV2P>bB-X%#YOOqOxz$wRB*m3FYCSIHO3
z{dOKsQ7{Z%tJUlypqbBr1$3PShhvm3qlG(pS&OO^g^6pPxixWJ$y3zIH&FSRV8-R<
zXGzWWL>8QlyhCu&vg^h%_6^Ji-W7VB3+FEjW&0|T-zm-`k<5{D+k!1_og5TzSS=xR
zTS0kYiG9zqcp{tHynNjnbZeaVj4Xy2PI>$SwX+std%boQ3Duc1?v2duJB?q6nDF}D
z#GjBl^J=NjM#<<)p0Vdv4pOorIidQ3Nh=zqMxJ~buuAfcJj*~^`Mav`is5Z1D>>I}
zg5!Z^2I$#&zB@`YOU>Q1t5GECKXGliIKPxW>9m8-o12mj@E)^_Fp)lwyz}44X*zB@
z6<EQ587T;vRcLCgXy+MCn17Q+P=~l_m;@Sk8Vf61JgG9HUTUuk`8=t$*NdUkTM~?F
zC(>t^F@MD{$W#zJBNt4QpQjH#pK#1$h$!h$0{b3dATr2ZcEa<0xFNq&F~j|1ogSjq
zPl!^_g=UC1Khc>RR&$GpjeGNnwff9^l|=@r#~BSrugdRO3=R|<sT|&@(eD<(Gs0e1
zMr&|%i2Nz`>(}Sh<-*bcIu~7|Eh~Eti3Q^BAR$MIP=x)IVH@8R>mjz8ewMbI@{C$U
zi3ClSj305zl&3q&OySP=BZ`4Pply5k-9T*SGj4tQSj_>RW(F<Z9xjeCg|osA`W8G0
z#!6)ClS@CYd*1&Q?ERA&?=>O_geUz^q*ypp6a!iOkSpfki1Y8`Ha`kV;SSNvhHP~r
z<F*`<9{gzWcPZ1n1mC<R?P0?vT!`*tUJhcnM!awcR1UAxwvxf=th2REGwm+y;8SaE
zY9q;^!S&<I!rmCgSiDB#MYTv@phg)6C|egHl!dUkU;@ck;EPP>lnCj`#do4)zBSek
zjuh$xCtr&&@_!>J^vy_l3$6P`Dzrj^ThB!TuLV!?d?u~)8ORaY#t9hW9>!4wK%3AP
zWI82=baFG`Jggp69?3{^z)2?OQ@~UX4R6mDtlke%ByUm`=%&rV47AN2dJIIgoSOAs
zNQHzt;8<+ns7<i*>`<X=jwn>ZnXW&?7p6p=v~M5I1@CYBM!$D3{~1t3^bH+t?EkSW
zGAdeH;xj*7knX<83VQw*{474(y4s#X2^K#-ycppFz)TrNnKMVhcd%<y8ZJH<;s>%;
zF)g)p)oNE=<#XPRjZbU(!?vTgGQ)+;Jk4aEx9hMbSa*bNsih`R%cJ79@r9G5t%O2l
z;9vGj%4RD(D=xl%+wHnCFw2iOUpea6oftT^zHv~fsBg7`4~7J6syetCS++uKTC2`>
zgNiy3?Y~zV)?1J6_HOGLN82aSaINOjcYOlgKFD5W1k4R+ED=4*OZMb#fvMZ;<P46d
zov=%)=Nm&pGkPZd<(*6DUg%ane6RlBvdX_Vp0u%}sg04igMg)t;jdW<VOK+A+kY|3
ziE`YM{d{m<4#|>CBC=G}K%BhY!kPmg&9}Uu(R+`PxX9!)i8}cAq(r^#U+jH6nKOzE
zz0JXd2O}MBw#_9#bPbMS<aaO&_@cn8K<Xcgy{;xMB4Cr+)?jl9l`Y37EoK+@?Fe58
zol>j5v~G94<A2t*mt>RDRxGKo)SA$)T=C51m`ZGA>2!Qn_E2fD>}hOvogB|MG5HF9
zoq3uzu4Uh4aw@yu6W~1y4k!h7lC27s-l3_yf^yRMEz9DTv!6xeCWJ?ff*lV{q8Lcr
zw(b$aJ=P#l%$_aghgw{QCuB{eYfUv&*&gICYZliIrk;LS)8Kz-&EJ&h|HdExF})bv
zNTuDVz<)hhXpq<lwo0HQk0`{HwiASbgP~hA2To;alHP&#4E_e>6AVuAvXu|}Mq<eI
zEkP-O-in3MVRG5wd6J#+aHzU^6M$+*2177~K6a285#@%2W>+GuL>&<rDMUZdNN=)R
z`SUGQz;+|z9wi70n!;DY3s&?BQVDUN@B93CpF!GAo;4en9y*c`8_sfCEJSm6S1@Py
zJsP-)Ra#D2nwKVq9>(_Ws`4|gc=`--Wmk7d1ns|DNCd~0<?nqf`5yB|xnV2Lpm7i6
z!rF3a+DRyN0)*BrcTB6&DIi8Y6U%*v#GX#0<nn}R-KJ%=j2R1&nWW`GX~gNsg&bg5
zz<kY13_@tm>PA)?Q!yD+8now~*~IBOk%sy#z+=zE=nb{%?<_r1O}_2!m*2Qx+<eYV
z4Q1FbfYKPmP@)}yQl&rA>$FB^JJ(CS)@X}zSfcHv;)lN~eduN=8Xlv6lM>G>jehXs
zW0fx1(N3xs7&_3iearY&>t&mr+Jl;?tAtP|t+MHD%vn$e0xm4qRHBwk?$S4gdokBa
zmdE{Y^93T~Y>N5QftQ(Gyov#xT!pP=9ObtCk|TSr^A@bJcfQ+2pFLBcf@9$nz2%Bd
zb|!QXQ)9chf_x!r_-f)WW*3BN$BZC6{Tzn%uyHUo(Teq&^j14elYCwDt@_xomoYi8
zHIhH{K*fmSvSZp=uW{I^mqbqh0ygOvj1M}y(R^XzL;E5Lg?~UAUB&5H=|M14=`q5j
zb2_ermzUl)^Z7BR^Z=27AI;-WXS-Vy(_sfpZ4+dQ143uyFiS8*1nUG-g&6QYLI1+F
zrMdc!(?`8d`nUBu>;HWY_ZPA&mCt1`J~%<b;ZbK{bH%fe%9U9ZzdGLsMDy8?*2r{P
z=*(tcYtMJ5#S0o~x8P2x^!bFBeAwv_b9WP9p+dhXV*P{3@l1!wwHAlR$Lx4rfN-@4
z0)Jz4gjoh7BcXWY2}N*r@UlQa!TwdoH6tB?SpC+G#`-A2_3bQuO{h`MvDwV<5p7i$
zbO`2Ev$B;eLtKnX!SCzba++ECWj5L?DpqdPqOw_nWbmHLHBdHD`pn3#k2frW%?6hz
zP>jrdv%K{%n62LiFi9rH7c8UFSJ&wKn>o=@Li7RpB;*>6{N_m}0~)`&cl&MI16t4C
zH}8t8>8F(0&RN=?`{uIC5V>Czj&=GMceQ)Ec`35GdF=W=71#5av4D}Tw{!CK*3bzI
zxPCfmNp50UJS}8iL9WD<j))Kjp%hbdhf@ucam1S|Z}55xD<^46I}tI|U2MmnPM*K}
zG$}*0c%GDhtSo3G?b*#v3Pu*YNIg-n-Dlpp*um|g+Cz~=9%`V$4>g6{-Yp4SeWk$<
zZtU*hH<w~cn<d<f87$>{OIPyA4SjZZ6Gwcns*7$o1;bwRJxQz<rcfv-rlshZCb5P~
zxrVl<Tq-7nKDzfKe~MRuo8@_fHOsI2(OZ57PIhn$b=wE%`GA!qQr1V{B}+t6rKoq^
zJgojQE;Y>?jGh)1uUuH05<8b_SaSy}<(V%Jwpbb!18W<pZjQW}WcQi1R5l|$HGpiZ
z=|iIlbYOBK*h~2nn`(~VR1|F)rk4|2%KLnG$g>*e_(dFxlxJ$^c#`I8&4JyNiNqEU
z3K;wLDx!9EOXnhi8};*{hp+9T#7^uc?;zqyUjd77>$b=6@UDiMr=6@%lbI(eLZRCJ
zH66mwKRo)R7G8DY2l5mDR@wPKLH=J282Mj{3^=c##C=2XP~D@6zySB0aM7qR{J4}H
zB7^4SLciYGH0Q;@?ER7c09M+MQFN;9oNGPPS+}`lH=C8?!^ICe90ewP*kEj^@hdiN
z8&r#Ap|a;d3^xZ3ovRgN98_Y}><v#UY@ruYUucTPVjuwqSo!R2_}xyJJ<kc${+mEZ
z2dSBGMdTMS>xQI8Z1BSZLx4WF#U*-J(uHwlhC^$nUGWM6?{l$b@tywBLE3ncQ~%s0
z)-Y&e(ZcgGUh{OtYpSC>R*uL>MR!lq-7s|ECBEow%X6K*ERGwoBl=6|Vuncc6CX<)
zBO;WJ)URG3onH`x`+ShugoC|9MLrg^i)9NQDGq`skB?9;K@y|yksl=OfkGe!Bo>51
z=%ai${!U^Zh$DeCR&UXtSQFAsDVJ3BXK{(s*viB45p41PmJ|Q|@kr=9>nj@Co7p-F
zyV}|tJ2-sw#08wpERFsm6Dw6UT`<2RzYU^BG2s|&bAZ!FJ1{CG31;+D*Rx3za!SO+
zTH=Gx@$sR5jXoD2WHex6U@=>nP0}QvW-&8suBX+er1b*3*BE57xCgystrhEHB-E6!
zJdzj=n6!G>*zC;C|5zh%`3}Gq-DQC$q~2%PoYOl!9Sy1NiuFw!&7Zsp85+=mUSYyQ
z&9`uyfX1w*wxl=q8zr$4CpmPJ&E}g1Lnj3~H!?GHM>C$A7qSy{Ti--n_#)F?Q2IWZ
zO2O9R{((Ib@1iYmS4_ID$TcOhP03S3_$JvBy`gIoy+uTVS-6I@UzQ!#w)B!nC5btO
zcX<wPht~bmgncHsOYI3q@AXvkM&9<1UPS<4jqB87fl{u-(L&_CZ&j?k1~jf0dCIz2
zrOGr>^Il^(sZ2?cdB^I?UF0_H*2~D-(B7E6DgLgC-t5^F1;r)vcTYy{c}kP0MYqQS
z$68Nzug_8sj;%RcTi?uZq>~j2$M5E~g`Sm46KLcHv(AK1kjxLm+-kYvVBxR@9#H36
zq}UmW$rYD5iII@c%=I&Etu#}35=nI{OeZ*lbsq!$_Zo#rdlgr04@AQ|P1tV@Nk^9A
zN56~}Gnz0K8YuP+gOAm|#zU+i3Nk`)kgP%MJDX68N_|H)2~v&AC3IL|hV~##i0Xs!
z=`r9Fz2wGG$W(9ftg>EO$RMUr93&u~B)TAMbRk(<npU|@4U%**-hOfcRmhnP)@31F
z2VALVVp$yD?@;b54{JYE2|BD6%U5hjI7FvJFD6Jrh9YS+-!zw7fF74WD*sG9q+ih+
zDMOo{w<3npvEomZ-yCJZQ3=P<iF}ZoXOog_FTxDQh8YshihP#_+1oxp?><;_%7BRw
zFG#DvoZcnw&UGcdaiwMsOkcc}SXpHCbo2=*a|F}w)Vtw=(se1bV^|@Eg>^W9B_I9M
z`PNLnC~`eDXdgZB3}Vqb8DQnn0=HsDt&#KPJIWK`ECMz$SM@IWt60y44W0CmrmN-<
zXWW(ctIUAM#|rI7C$2C<3ZCg}{I{H)uN-fI<&IU+7Hs)?o9|&2(Y(8~95=2qL!!-P
zyVcE;9PKW&ICFMrvTLZPcG#j9@lHxZp+?_zD6*?{CUwv~*-Li~J@a<S&|=hD#_R9b
z?bQd0Ie7Xu9XDL_&*Tp&`yis%8Sxz2j;D|DSdlVbs@RM5PI@*3D^fWrV+vVlU!mtw
zS_KS_dN%!FL#)d1##>dtB?Wf$u3W9tWtK`9tPWyy{fKljg*4gF1-nQX7csN!_`J*m
zKBOZMAfoBf*YCfLJW%emonnyx+)#5UP*iJ0bjY&DOtc7yy_7IdyqsUO9Av<Py?Uhf
zIw*qd5?C_dD<X_Cf<#}YyshLaPD;|Kv3_<|CN2sxu@h!<vAVkP#@W=?9EMdMJBQLK
z`G{qnh+cG#%@EOx+xMxn8D|%h#-F<`p=E{elp#eFgRz_<MP0~K@~7`9%WDj53u%Bu
zqRE*)md|)*!B#wE<_PWdgB#xqlV}uU4I(xX+O7m_m@OdhHddebYdyYRw9T;d<j<yQ
z?+Zvrqj=psMgEH`I@DNasA~R>7V@SL1V2%DVcyo-WZ4NnzPC3y5E=Xd_R+^9Hj>ck
zs1Vz<FAeaFQH;>z%ooHzP3@s)njc^RH(pT<*32x9Uev7PPp7}J!i|u#mi9zDIf4%L
zv6AP({;-YlU;UgIofDBS?JHcR#pO>yo+S27pls0=Z0zpo^zOp=<#M#BHKe3poePo8
z90^^@enWI1TQ~`g{i1bdxnZ{=ytI0{$e=X>&T<<Xli@DV=o~v#`v=ha=Z;X_A5i8)
z(2n)*@rSwgvE7$8_5C@hz)0+e{;u`+83wwEsEUGTqEWV3xYmK&l6Pdy(QigvwZWGi
zwruQJfyC&zajTd|D{Rl6h>pJOfbApK)E`UI0`6d_J(AziHu6C?Y`~Z7#_6QMR2Uqo
z;GuSd@bp^n<X1X-W5TmbugNB@D4v;kC07YYww=f(Dj+M@(E-jN$gd1O<M}58`jSoB
zkW`~j1IVrm&^p*0QaG>oT36wy4`gW`?Viji-#wmb4|P*K+@I+V`6*+au_K)sBB+7;
z{vgAVvW}8JE6n@cJnEymn2MQ=u(QwCqZ+f7Q80&V0`1L<kk1PeySIi)249#xEw-We
zhWjhirkvDYwES3I(D8A*-|yMd-v_jR?~MKV`oD}d1j+W8_kL95hE|PXr7w{FNF9!~
zLmEPGf&K{7uiY%#vrA5&(}j+z-L5{rlGz#341i4<A9SRCi0NEcZ~@wL$EFQT5!Dh-
zGMU)7jcb-dGq)s;Qb2Vv(f4=tGYOhci53WGBZ-~@Y&#*6cJ<Lf8kv8R&3I@dgRl;d
zRGx2eP)iXVhSi<6p;9))NxXI>^+93xk}=bN^_FUt4yT^#^l^(N4S!ERSG})zk;V`x
z9(>BykYrRO7&H1(S!IKNck#joB=Ff-F8<25Xy7Xf^Ol;DGL&rc+0OD8*uuep%Vv{b
zW}JV%Qr!6{M}85{zc(ZMZwr>c$qW7}Sqc**ZRYqslr!lCcJUfs@?_M|Kx8rX<VAQg
z+wuqv2xLG)a<Oc9><@94wH*uY+C45iy}&@AJOH>5^v>GAp&F&<`nun~b)ir7b$P!(
zfp5{UjHYz&laFsppet)J+fH;leJ+O@040EXffwvl*)%4rFC0Vv!a=aLzI5quzjEP0
zlzJ&P^x$ko9Opnnb(9;5)~&|_4Oq33g)N*x^vJ0IO=VJ2Kx?oWz6PsO5oE&s?eRP-
zU#O&sH#l50Hin-PC2Q>a$(MNjiw>pEN?kirmDr`j4bso7=tZ#SJa$;_{Z~~B%Y+I0
z%RSvEX2kyd!Dd;#H(hsM5JK`IozN_T3kjiP<1$<3INIccmwg>r-OVU*j__ss#Ms@&
z<Ss_k*gZvw@T+n9+B2IaMpj|4WJUH)9I8TQnQg}c{lpQO=b<Z7)kFifH^>!)bfSB&
z^SXwxA><$Ta$*apf69T}jc}SBFsnjQ4(ZxtGA}`;lZwcN!8Tt&7tU(077J0$pBNVM
zt7~!PX~mg?3*t0GVeSsBVwqqkp<m?itxH~(Cf+iU#XC~WOy(uF!XjF1c6UybgfL7D
zC_TX`GNpq;)KB6a&#7mO;kbx%_N1OhT@KTG3cpQ+$`>KKN<~&CC~{9vu#H%MI#g^7
zgH$833XV`4U5Xm7)q1=2(P?<Qp-7&&QInBPt`V^Kgq&7vMl~mm-@qd7Qw4DlL7b;#
zo3HlrhjMe3q6d%UBSBsHTP@B142=J%BK`%&X1jQ`e}OTWK!zU-qX7X<0k1?1D+bF%
zym3j#qN8ey({3Bk|1+*HY!F&o6`)Y%{6kIk^73Zn;kIs<&nr-k-#r3}ZA+xO7I|)X
zIZ0J&v$a7`?iC-90I$*T;z=8nh~xu%pQ9#FJK_)SDjiPluS5=3#~d3~`9k)Sfx$T8
zp`V}@;_<f1_Sxn8#qGPOzjr%_NW2g{oR_@!L^oWW6;F1~IVFPKFAT|DlOZrHMFuS%
znj7bj(EZS%*qo_u#w-^*bGVETONUYnamH<<;WltpwYY>IeaO($b7?^6!Rup^)qmD?
zXABeMALNK+?%RnC78@B^Tju%zW2*11_g$|%*R)_(aIF1JQto_Wt^ISOn1Bv<up6gc
zVq6n)b5`W=_d_jM<IR3*ND>n2c{$cvbA4#&V2@%kcsF*4AsL&mZAf{OBm9Kok}tVX
zNAXQ_;}%tDNng9X9T)T%*SP8ZB|N*GT*wkH*m#HyI#qBfp+|Rm;rHW|B++hirfPU}
z+9&K5^i#KCpiXq$Wh*m^`BMuNW1U$l=e<(Yeu6v%v9KqY(iHTXkj+_QlTC9(708;{
z(s-=lp97gxGItUVT_HcS5{iT^2o*<W{sl&y4=@Hns^R?t<M=NyW?Vn>R_na&E7Rof
ze@xEP=%=cD{s5yX)l5{ZMtT9SDzHNkfjmXCJlUV4igK9H82^8P@gD-ON+l~rMAeU$
z975elD@8#kznO9Yl7OCk_`)CsJ`nKj0+C>G<ER$PqLKc$^o{j~hvGZbJHa0V-Z>|r
zKE7S0bJu4iV1OLEl3(mE*$=b4CV#j+zu%$)RORIE02O`J2TI*ak&hj;jDyi0z@jNH
zV94%fr9iP|_Oqbq9JmMSRE$x!73_J0y2dQBa%V-)i&s2_s%@V`f+CG5q8{}&Q5*)@
ztQU);-~ee_Xkq%?NgL^AHD?SE&}hCYa6o<0>Q4kIEZXRpPn{Wk?BdweQu!mx?AYQJ
zz8Z7(%spsGn_O$r@r-!0K20Ec$^<<ahoi2qBaP1UIPGiTeVe}~6shz10aO5wfh(Q*
z8Ufk*j<aO7$85c(SIQZvnl~ah<{tjVlg{EJTJWZMDF3tcjkT&+aN*Y`iRF4X((ya~
zh&$)@3p>NM{x<ysWGV)z6#=Goisash6#^;F?^ieh8ZMq@p~#G6GeIuRbeL#)2B?;O
z_F4=|2s*1~6vJj{{V~DBd(2e%Ir_l)7}mSd{>so6&E+{Ixq;vyEaf>Bx&9P0yp&J;
zg3wNRmyF{+e5i7I9@nZYO@aK%WL><|SwxqPt<loz8sO<;kPs{{7l#91sSh#b@5+X4
zpF8BuYBYMwo3M`)`wrNc*`1U;h{Vem!J)<qZopgR_wku|SXqbYoSUxZL|SHtnN=wF
zqs%K6sOK?=MiL<~ziZ{omn7<bl`xeEPjanL?Q>iSbbg?gWfDqo$j1)k=<+GKwW2xQ
zQPo`v9+trtpt<MafM}_YSQK@3ae|qmn{cD+c8=FSxDpw`k-6VEg9Rnuu*cSPnUGmT
zc+u!k&^b(!6`tiH-Etn|sl{zwoDt<SG1JE_wvxFOE9aK*!QkIf5IT08OB>*O(XAmB
z61qaqyq0r?Ek2rehhU3x07JQ<6ZwJrF1$kDipn?zmn)xE#5sC}RO>@W_buQFCV`iZ
zDO2JMPu%lnh}Z55M<K|XB33?SA@D3|uBP8Qd>zy)An@bJ0O%6}=CJQBO5}91<CM;3
zvhRz(qncRe5b%v?kCRqE+O{@<8A9xPj67WyL18uBj0@M?R}O@qKlp}WAA_)t)5CU7
zW77MP*6Hm5*)TaU3)?}ufM(1*aby*O=bF)FJO8-8vcxAW#pt8)CHlAA)bHcUe>T1p
zjP;G&{#{OysVMy`$??MEwBv!27Q~eBQxGDPi823lQWyoO41_?Cr+|6iX{U0GG9+Sw
zN&ZR^!zYII^y#%ET%9utBS>&1;PHICJ(ZPF<GthQCuq0iS%Ur!KR5`EhO5zsUN%Q4
z;fY?b(q*#CcJV`r&W(`)Nz0>0mN_iny(<I`lD|nRn@jx}-34tSb0F}5JYX3*q+jQF
zgwIoI@N@2q=N2S2ockK@zJ$5Q3DYhkI=xafFs@8=aplrw0AESfRKA#;Z8d6H>}h7H
zEmeFiCNyu0IF(n^P?t=rKHLDswSjh(T_Hq+MmB1OXD8Bnmv|3L)aDGN?NJ^mvxvXD
zwnN&xrq+hpm($jaW5KqrF0nJM{P=R|1le98x1G%S-FeidHjQBsa9PVe`I>1xSEqnf
zbm!{D?4V+(943?F9-V?Q&qkum+!jZD%Q->T+#jXK%y1e;`*H<eH&{jkk#AfB*?T1-
zegax>zlW{4FhDOkZjb=!DEhG`*oJBveP`qtQ1QD<O01q3xEMDWNWH_zJS7)}#Er{-
z2=Y7ywcq>_7c~FOl32&st5n8vI0LA@+?J5Kexc7e@S_C5I&QNYMJ4C`mD)1Jn2SWH
z;m^&QlV?DtzlNoe|27-p_-$(ZpQ!os2GoCtO@qp^!kir1n+&SJ8~}3eMY#Vga9X3K
zFq|-waQP%az*r<IJ~Z)CkrYZpr!P<RBv|t}o6Zlp=y!2Nsxje{NYv-#+siTWo72Z8
zT!0%_qC7}Lc)(qPyp*kZBP8w=1o`fI-%|ph@$hCpb{K1j<^g2zDMm2NaP!6SR^Qcr
zDi$;lvk^Kbhul21q%ZV);mqHt%G1A8mT@XCQ*^{(YgP{n?`wPIeo<>YE@`aOnF;2C
zWrT`F?yw|lG&F~bKVO-us+t^+jfe42YznS}67Rxko~f`tdcf)%3$!V3gp{hH4@5C1
zE~_do!CWycZmmi!*9ysPQd3MEO*1&jc!UvbM=?Lo>r1bzP?s67E@!58Rx*Coi+pir
zjK0)ZBQb$#$$VJ<7VvH7Cs-15SqW_{l{I-aa!VeX@$<+_Qjz@-yr9P%RqG>L5Z<#s
z7-?J}FcqEecArm1j!i&@rq-5KQUDgHTd*VML4DlBD5+;UGgTTYzg8)GQ5p4#XYV!P
z3i^gDc(JX90PjvlD`75X2f~GcTz6ieNAncj0dK298EbrWqwU&#oG&N>P9E7d1PD6A
z`S*UhH(Jgqye4)7cdI8H1m$g?TTD!N`ScK|J|1baxbQObB<6&vSsw1&uFZ`?`$8l&
zCn-fnOZD0jg~UVc`U)#k$FiFyJ)fN;;$8LPRolMl!iBQc@X`s)LS*ljkgwP7QW>ad
zIa6{8JaV7zZnz8DJZJY`4Cp&^g+RmdgNR*&o27gCdux^4LH&?c1?iaU0;Wk-Z>f5$
zRkMOZvAouA*hIB5DuzK0?ci<6aVUKyL5)8DsN><V*t1K;qpn8%$=zGknDG)hts00P
zE(F|}LwJwfdwYk&;R5e=l6fxh8g@ie@HHeZy<o41EKxwxzAiZ<v>Yujq=AUkV}#jg
z@gbcF>vIE%Fqf<h{w98}00nm)=tC1Bb^$<SYmWkS;!hbcF-5oo1ww0CHs)}s<r^R(
z*#$AYBj8B|8}`ZFz*9!4Od7m}9v=#bX1+Ke{eBL!M&M!mHw*c0sQy2+uTF5SFlZlM
z`|IB><>dP9@9*FBP=C!A{WUTtr*HNT5p1U7s`ZEC=8kW+!-gXN1W27+M9hZ(kpw3Y
zD#TBghoGP&r&wqc6lGDk%EqFxD)y5Khk^*_34jNJK3(&(m+36%Wd?f|yMy}q$Bs^)
zPp*CvD3WSTdO0Oup%K$ba1fHTw|{7FKS*;KRI@*TJ%r$0Db1nE?+FK1s+71#dldBg
zNrA{XF1f_1y-c<p5!p7yv&rk2#c2_$SuH~begUUN6|3Z3UG>_mVpi*2=$d*_=dGU2
z0^bUh(gtC$hI1Z`VDj*@E)=9o+s22Dvl!`K6$jClJrApzlIldhdE*ceKmRID$n!DD
zJ_O{ztK@}#=b93>L5h#OeUAkl?I8IrmCJa0Gmcc3)Ob@z;TzAot4VB!w2gW6Pvujr
zmm(*sPVgaA{;B6B?uWJJ1vXjux^p`DswV1tIZDRD>{C5VcCOl3{)IthEyDKJwRx(a
zK30gv)=qEGa1;)UBn4ych?uBfa)zfI!Zs}-DBY#ts-U>jy|Pm1uagaFgH9t68qFq@
ze0<AfWn;^%GYNiXmNMOV9;m}P0tE2%<<Yh?`C*QuikdZtadyK+jhYoe7S@b5cRM3B
zute1rORpP8!MBF|5c~mvvdVlQoluieYa3zZmk2G=6#Hjis<u6RaqYv4$N#Mt=l;J!
z5&d5<61TFo{8LVusc2<0tB1r5Tkkl3auV24>R?%7CExlyfR;=Q8EXVS2^*98RG9$6
zA<=d>VDv757!`*5u{N1(*GnR`J!Kfm@6a~eV~YE5<KeLSk{6)8TOS@UYZ&f2fl%6?
zrYGhq5+9cXzE9({_r)|dYyWY=WgT)TT9*-N)q1mOhscqvaxPa4AE#OVp0C#d<k$-i
zM!Rb&C*!3Pk%fygoK3Y7InZkkC$MK&TI9<-W}5h!`+>OQ{^~^Ft@1Yw8MnO`YtM1H
zMQgd@Y(}uC9MMq~&8o``;`}N^=ZdOBTSh-Cw?mbqn|F1&tyyu4zMJ+cV^~?yWSqY8
zeGe7bVoCAm7t8eWG4XQDn1w^}Ae}8lVRcO{ut%+FQ&_CMA2Q=|vv*z8GV^zi+LVa)
z!Gi`H2o$9EqCzfGf%cqY0;^`NYegK1>W63b5v-l(!0_lEr~Lsr#W~T~z)dw}d_kpr
zy%2q4?-}e38Lar*zCCIiU;&+u4(|PC!&c#Q&CEP^qr4WilGVvz8c6nc_-%m^cQ6Nd
z<rKI;+gx7CYlZ2|0uxM#F;Oe3bi0`L*>f2lcbYj^bjZZL5JNHYgCLpdjIq=lluLtN
z20IzJ43mI|<L}$?ZV8Eab@rnzJd>kr>==|A87-@=o$=M{TzJK>wek0yxonFB7`id<
zOr$=B5}nO>y5ks;X1Fs?gC+hQcWa`FGJbWqyD+&{J1TO0RtSUz3~t#N&X5Cth<g)q
zNGYj4sE*6Og(d%QVfpX$CBLQpuXOa!w=9i~{)@DzFm6oZV=y@Qy*AmjvZ?Ieo4mQC
z5^dU88BQK99Fp>4$Vg0-H0)q!zg7!b>%*}nxROv~m`6Y&-ejlp9(p=_N%=a}<O1MP
zf)q0pmt;&$si6X0fw`nNj4LK9A_|py^1v+k(BA~yr=;k<L*Q&9WIJGk#9mlrW9KyS
zx%7~m5wpQ~xW=&pu;)BE$&srnp++{F+74HI(~vC7BMVFh309E5G(?)$R;nEPsVY*N
zvHo(LEpGHINe5y;w=sAY1FFINHi_3>(Qb-fQy!1IIM%)j?6ttd;%EY`3QX{VX#Ks+
zU|5|C=J@cH58(Op!tBz($uu$~H7^X69m)N%R543KIb}E<U74}QSbI{PpLFmbFHDgB
zLveb7=5u@)guNs3U3}qJ_s@N3Q4iz{;Vl}VXNe$$WHBgYfGot2k#i+W(s^u&e5ShG
z-Rul^af;=aj&!qMP3OuO_${616hhGx5GwrC$BCC66}ZpfCmQ0bzjF@XDIz!Qkj&e&
zo~EbC%8v!8EqgC;*Wv`%IO;~O1r>aOj~7SQCaus1G}Qe?#FCIYM&^C^DVM)h|BCz;
z5PwI+s_5IB{km$A-_Y=*bNi>ms+4b&>7zs9ww4r-Fq1qU?(PPFgs-6D%S8Y~79w(H
zZBR(=kFLV*Z=%2Y<cYM?h@eE3=<0e^TXpI7^m6`lAGw?U1-}))5lAETW@J7NcSHdE
z?h)4d%Z>P83zK?=>nsW9_Qw_8Vzc%c<++6d?$u;MvU-O%Ekqx8ihR+Fn8h%DRRtZ>
zMb9^lkvvR5Y&LO|RL_tZL20EhV0DY6tiF9pla5btJWlpMOq?VQe^61kZ4T{Q7vCx4
z`@y)cp2i@&wWAunsl1e*x)iR!JkJhm<^p_g%hLh33RvvZfP6&Lwd2gCNX~0}*R_kt
z_EM{dhbPzP`5hC`i3wnkSqRcHZ-ABAlIDSB0o}tBVwxXKX#8A{FqG$m1_uT64g3m#
z@o^dvA3xFG)8b11qtp0T16|O@%J$<{Giyf?8+$8#$A4~ADwN}v1>}eGif}!|-{H5?
z*Z&lSYGtNG5Efh#8`#@xq%NYiwo2UQA@rUW^dZbQULz#w4-RA-@SI9de!TyA4Zej{
zi3Um!gPuk^c(BGBM^+Ipsc=cJ5Ih*FIWiPZ6NGn&cEYL=e@=dZ6?D_WopMV&g|s+l
zc~m(+S1wQnzI@TWWJdC3VXtnOk=1Pif>zlXb0MU6G^op4bIF%H>W!QI`A5YnI(<Q!
z=?+da@wrL;OUv8^7yW#2QH}qL0({>!$oyQKUL;B1`a|SGX4VL*2q?<WM7b=gzL^8N
z)}#Y(F4Apunm0;_zU2it_|JmCh0108y#0Kk9%7>~=9FDu$@*1>%SsGcC3>Z?qsX5B
z(65Tg&O0N19Lg`h`Rh<VWUL>l;cZ%w=*Kzy^AF?Wm5sd#t)Z#Cjg^^`6|IAj1+AI&
zhjBmdHmCjl=LrAybIxqmAA10tjsNBW<o~?~IO|(F{rQ;x^R21>$Aa>o-~XTA<Il$k
z={xGHnmL;O^S05#_*H8}dbnU8(pAfE(#L-GWFc982@x7dfqcSX<j4rh0HwnG9gZwA
zJ9V}B+BQHoz^aLSJD*(1`j>!|2x!VGX}KP-I?+9tc)h)U!swws5(KJ&*J9)bHo%?2
z16l?yLDdcb1g}t58n1{6C5=Sp-bk4lXEP?8u2Ki*=ySyBSC!U##>1{Kc#*Dvo1vtW
zpomKrjIIxjc0VA~<FHDv?Aq}%e@=vTU3l(JY-IROu$@n;p~f8NNff7b<E1~~Vf-Vc
zu1%C(arr(KmW*Fk!(>@?nGQZXgRt-P<-u*KZ(a>CJy5D|?FMGRew5BHKaf#-2P@T&
z%Q1|1A)<FEw8KI9u`4-bIh#O7s~#lS?6It9hC8_UKA@MG{zSmh=!PkYHqqkp75&F#
z7+M$x!MI#k1ksZFR^BC2)P~cH3px&RSW$8FjT?dE*DkB<;Uxwpnhh^jy1VU4J#1tQ
z&ZZ*M{-gM{oSCS2BN>l(q%%ltiIl>QokV1<ypD&}PYx-dfWg32?r!Lk1=TwcRnhve
z@(-QgZOE_@YhK*|**rkh2AH)T?a^7^00D0veYafqkrd;7_k92$n~%?%UcJ+qa#kdO
z>?~ID#oqp4uOMi0+<);99)FuE{9nOF!hzr3Uf=Cs>1(CxvkT%P@>>?Q8I>DWq@ktM
z><&}#a9x;`hL(SnVmF+TQM?d1kV0B?VGmA>=*jqS?HsdJyyNC9we%y&G)W<`Hc((=
zNVdld>V3i3V-|?|m>!)dujxi6>!Y`e+vB>&{nUHsBP_tztxNhdKAvEFDzh3xQ&Ie2
zv~YS)h-i=|L>!5m+KO%9XJg@;Ds$J`&)ExCsc0<Q->{!Dw0LQsJMl`BiS7qvJi&D@
z`o~;_d33&CDL<cEWTJI165m6Mdnqbx#)WrL<8H=Y{o43GGGu|#S-lO4;Z0Wa?7NFr
zF3T2_ckEg|7i<D{M83+BDd^VcB&~|aV78pZN-P&z3^^&l&~}8BR57bCJCP}?(P+Za
z7%NM2*#JGI!4f|v(rH8@J8aUbw<l#{5TNiaX%{IYY#R|US1>4pyoTIr`9RCeY{M~&
z<=}ShSRA!Z<SlSp?Ph%w$}Ixr9J|ZGi?Pa{w?S!K7R-^R8odKQMZ*Nxz?^XxJ*&kI
zY17T`0eB7(EpiHqm2kY7m7COXsm|db+&3lnq>obl+mSkOy4}$YL~7o4bJ2}_4lhpz
zj|mm#NSw)je5(I$YKwZlSg7fsMh-b~2na9EIJ5flIOc-@gLVxniO2%8g+$(LK)o5Q
zYs4K1kJRl-a%5h2lBU{>s!vh*K>8s@7hwQ`f(dG07WdSYgi_yEAPzK;soFDOzm4=x
z^3qY7ARwnRYiH5pbmoo$0h)cBan!oQ5gq87$aXUin9rCzTIv?q`QU=)>7G^#a88S!
zQuLpoWU(DWQdyHj2`^I(TMM~hy>do|1BfYg#jCFIu;as4vj<)E;A|*|)B61jwub=I
zwqH`~S#e?#T%3mtf;|e1OpJkm8$q|nmC*OxI=9dU0)j1!jm>7SI4G0cE34J2t#TM9
znuiXjQq{lG9mpXr^sl?I%qxkQy&gP&kyNB+Ofddmti4loCQ!C6TCr_cY?~F^cJjxz
zS+SFfZQHhO+p5@3Zn{tJea^!@J#OEzpV#YLYtA)4)fz1andaN8Prt$i?XtPJNKr?a
zR1MAKS4P~Xx=lKls?RB&t*Z_hb(_!SvNY430bgGsbm3D$zP}G`nrB<7oD>6Nzoj|X
zO6MLJO%f+n>};}%BS^_P!xHE2le-D+h+Ce|-YC6G4^Q8~z;!R&P`_*LbUBCPqz6QA
z@5tcU?)vxeK3oV7i%6fkp}v8};aI@|Bk&%lx7pUTaht6MM2|Yy(8aqmh{aFWP;Tcf
zjQ{vZA~k}esMb97!Rzi{=i2JMB6XG+Cb$-ZOLp#v_*E-?_FV6DO5c*RTMhgK?gT@r
zwqy^6LE@}3%qoF5gj9ORi?@8kj+YGz;(=}Il+h#M7qc;m1$Ew94vV(pQT`p%RI)bY
z_A5P|S}YZPQ&v?on(2XCYp)pO%4%Z7L}nQe8^>_btt;q|!_8za;rgaNG9m*NN0i8A
zWoJQ!j!!5Y(uvkE!+7Rt;LJ24ET;{7r_Q7`BsqMmEbUhIF4Gsc!|=#rze5Er^vFCT
z%_R}?_&xL-!9`YIt;3z)GHZ2dDEE(Lr@DZ|s7I=1OtVmwB^IZuZ54rojJb;1CirTl
z1<}J|?XtA(THfwdD)j;Us>NwpL=Ma8j0c$rrWabNj-QMbo*u=C7{g{C-9Y{csY4GO
zM^kOAtqv>ZLG}zD;>xJ+IG67^m=_LV;$HWnOO>X9(LMA)JIOl3m}w+61!gbEN+HEy
za7ZjDDr@j2XzX`t6+^2=Lrq9|VCD_r4LO%-%_irAN^rfJ$O|nNXNFF#Q5dxkzA#tL
z{Jh-aq@ROt?8;Ljq{ZcC_>o_`6rgQhz|D${ZI1%2R(<`_VrhmF?iqLQBmLsi-Df)&
zp2=Er8f$ri=!Um@LK>&whZCAOi^WVwNmE)KLLFMoOr?dH>?3M4S)AErgSUQ-$tM~G
z;nhyX4IzQICkrv~cCyT%bIgn*a##}>X_KP2A&lkmO4P8L<w>VET%@En!^^!^-x`UJ
z?N-f?)k!X4jbz2@4eZ!nm8<7blRlto{`C#zn?0Fft%D0L+hwD+bbEGxy#hUW-0ppS
zvaWdtdy<bn^^Q}80@79v+cWgTe-9&>Jab`APzaSW|LJrx3ze0f9|dbOj*rVt*~=An
zcZ=Dl*i11IEVPSMH{>~BF;Qu2@yY2+NK^9rJ9x(tO-^CogJ3FhD<P@cl64!<jFy{^
z&2*KY3G|MDzi{0UZ2CDVj8s?n`ocG+;xU(GCY_`#Q`hj~0?8Ah6cv}J;6TUEMB>>>
z-<sVu$`Yz8_Es88y|M-Qr*t&YjP)!388p+h@Y|6K;ekSJ6b+x!um<U96+6WajV#jL
zh_I~~D!yEEK~*6M6A+zz!%wXIMN7kEuPTsvG^?8P_#z(*D)Tzy!4XR(8_02A@%973
zWOi8Mbr+7gnE*C;_5-(~r{N7_rH`{QODyAzO~ozv8qv|=hhDEVN%*n4J|FzY*FXLS
zGwKZk6yHb^9qPaP8~lg;Sjo`V&iH@#<3)`KEu~|uFK?1vehx?~;M{ykDKwC@CFcof
z3&tGbfZE>-=c=AOoctsQGmgkbn<mW<e9JDIZCb9~4V#5pi>fnq&X;SI?b}yRA6Pog
zPam?dgu)UtrqlHy$DG?QbXQlM-P@jh)YYBO$iHcy)xfr*JUh+$y${WXKHlB<djmS&
z|6t(rRP6BTChP*}*>(&3pF9-&#KyvQ6nuDwVxDgH?YG>z{Sn-5Ja`oR5cY(0y)X%G
z4AA(>b|mQkUNf59+tb5(`6vGxwar$%#v*&Ez=(RrjrYph&AQz)=TY*b--&?k8ZhwI
z=&jeS7?#j|hpzTYB$&S0Pw=0Io}zHm&8g6mvS?>nN0b)|3j~1er&;4P@v9t+C<w{j
z>awtKq7^6F2*p??B}K~MbmZ-T0l8M2lbd5E3yG~X3<1Bk7|RYR#shJ4A%&901t-qz
z`JGlmNnoce?NJifEaT5iQbH|EVB!JmYE_Zs4KV^C5iK0tP{vL0QiL={^v?gB^!ojy
zEN`d;pdp&j_?KN2j4dd}VqWuSV&ou5Tk4EbL%KM40}0^7kB;-6IW~3%E7$8Mo2Wq%
z%^tfpto5<ME(svnn<w{5meJr?-*p)Nl~@Uac#}5-f;a?14F3MlibmvX10@%tcFWwU
z^uDG64I+_eG?ps96g>lYJ>?>;kW?JmbfdPP9yDQQ-9$lYy8T+3Bq<28pY(jKy@r>B
zlj}?*wpFTn-%55GkAZr?S}aFp1$25FI>B58=Jb4ou}fMmKmIRNx+?xde#Lq6kptw^
zIEkH!ujCu9kGY4;T49=2p`GY*>JNWR7;D@;T)Y^CRx`b-VoMCJ1iN`z9bH=cIB9+?
z<~Z3^GmBBfk&HeCiDHPl@R)LA;zWXny)vc!rehGQybcv4ZC6!4<P%N0y}>e>lEowd
zIV&|*DpLzfIuuoA2*nRGPBijTS6#-Cx!D9I#A>~^q1hW~D0H^Q5&)DHb;idGj}8}G
zM_W-0PC}ga0M&j&;;dq?#+0f-M&YxJ6wFG;??AT}3VqO9BZ<%3O!hhY=>fumaot|n
z%?qcuI1}DsC&O@8Yp{CYtfVN#Xs%+TdbAY~jW*J7@dItC;M>5}xZv8aVpw|3=I~CM
z{+ZKXp!hAooY0ch8Lv2`?GU&}$W>}m!uz-@bP@EJ$sHyh;lON4qteD#%vM@B%xRf#
zMgG_k=KYe%WoMeVSaijziS|kd+A+qN9y~h7r3MO&Y~1Y;;w>F7UBu<fb`^G~mcNyp
zdZablYPp9<+qq!unfoa?iucen)a==}iuOdDN>V^#o#~}UGLn=BmoeKA-jZQb=4Y9f
zp!}AIUirvg+QMb6)Na5V>YEDoacWftrJlhz`J|5g!eO3^{B290*}8;C1qWRj3-&yv
zJ3qp`O81Pt^n$>&1`)1_(S8ldDZitVqrOLaOq3(`Qu##d)j|0b?kzt@g=@_g?le>R
zgltnkgRJkw07oUmnWOpcg{pJf-s?`{7o$rLX5V0-`5Fg&MiKZPJF?Rclc1)xD$vUN
zQr3dnXgu=LBU04eLRsn9c(;?(^AU5}hzdPcwUo*YARDHx2h$xKx)#)pofjtAa<HsO
zdG}`78L6qI&{e0*vsRjGXmhtvwU*o<mE@Y3&a$!IH(*IhA+nqvVrE*?S1^v{5;xEe
zDnV8JL<+7;Pnt4#tsAtKg4+elEJK>G&~G6%o}MSgs6P}v2(=!9+j3MoEUv25tT)au
zYUKRNiJ7ZVhdMy9R`_kay<h$k9BO{EvME|*F?!{1&=nc6=N_6_g*gn%JJ@#7(I>c%
zdC&hk093XdZ^SIs`wPqi=5E3GOudbFdmXurOTOa63#XpjWFY_E@7_(odLoXtU**C~
zmF`u;@0~24OK?<od~;-v0Keoy_j*6D=he$Sn|?Vl;O*%m26o>0f~d9R`jC(YaSSCI
zwDpmq*Uo51-xr}0v>iM^IY~1Da<T6<m{jM|Mi7ThK%bdMebD;{Ke02ALqQUM^a9CD
zD&D=Wf2P^aI1}?W82uQMFnj0I%oqwqP{dI5(j6i&LZ*;}-a1xGmVYw%(|k#4fa$=t
z=z3uTFU;Wr?pPhhm>g0oOgpJ1JMU8taOX84=&#3FSoPx?ahM6)&ITzRN}B}1WPSR|
zr2GSwXVmj@*>P+#4vV&vpHi<BlbAl4zUaDNxKyG8Gz;}5_sv;@(7x*$$}c$6d9O~Q
z8Q^npp@=GoiyXgMTcVa;YtcazX}SZ%$l=9nmn49Kyc`Gi*qf>%D1cZyF$iI2-hP13
z*VTHvPw)EzsoXtMBu4bdr3#%(Ft=OxLie}YBMQ0ilx0u)wRiHj06HiUHo~<};V~fD
z{e^_Z><kh_+0H?GRi^Y0!78AcZ(&ul#iIE2)?t^<&AhP=t6ZL#TZ){)8!_aYC-?7I
zrgA<d5?*<VH!f^^ab&#L)ypKaO~K(TH;(P#x;t&~S95tuMf7vm6(r;`1<AubFwF)q
z(-8Z?rR5n0M{VO#zsLqZbP7^rL}g-k<`qYM5^_@myYXzv8gLYXns?w8W0fVSb^W+U
zf4au~eK^p86QcmfrUZ7z0^z27!(HPIL?NBRH>dIix8@00$`*(~N^|_AxNykX{;_Pi
zlA|vup#6@+D$npjuy>&FN4&c3LZ-B#N0|%n(xJU|c&fl5&PAypEq)}PWuNA5GS@zE
zf5?8cv0i<BSrT7^{mQL6@*G7y%Cl~6K6w-*dm+Qd$>C1RK0|gIB9Ojvy~FPCeKIk+
z!Jcb;1<rJ4!47^obNGSuesvbN$V`4}C)m!?rnV)S>5h-7_rvH0qL8H#9(aqcT$5E|
zyp^KhaO|h92yY^!hbM&jjvX)MVev#t|7)y<l^edyz_!SHseh(e1WZ4R>-fvi#0K$k
z)kKH#)JJM7(Q)O}dxNwa`kUr0x-eXa0UWk4?Ry^lx-jn}Gy!}VIP&1l6t7z`?zTuS
z5ONo;Gb$gDD;Agljt%hFR}q|6&zFgL|D?@l%&3V~`=XdYCv-lG?Le`8<cV(X3xd@6
z4NTg6>(@WmAhYC)hzL;M(#r1z-~W9j`yY;7s{dHV2?89A|K*6JwyuUFg83zbTt`B)
ztmvVjnX@7YyxF9>CRs^)FA7)4hFbVAN4OdsG-<Q3`Lm?b?FE8|@8u|+o^OW}y@Gdm
zT#Dd5od>@=RY&Nzb&#^7tci(f*VU7bX;<p6&({}>ALQ4@$W(O_PWnt?S}Bq<$65yW
zO_(z5J8YK}ZscJe9n^eVQhVMTDm`cu6eFawfukM=BGoVno(9T@lUB%445$;7DQfym
zzXkB>X*RJ~ThIPh`4b6QRjB7RrZg+hp{cW^6(IHZMqZ#cY*ZLxL^&up-rcRSx`wA4
zcd8-6GP9(zP2XWDO?yNG&@iX0j2UU<Txo19V2Wukv0&Poe*SEj09OT$$Y!PK=N9|v
zy)G8}Hxeh>kh}jwso=FFlYB9qIk-@d9>dhhR1p$jHon4XBWpj5xZP_sk<O|eoO>}2
zgUisT1Mn4;)jh!9MiOtFgLM_0*xWfz^QOYhLv@-)Fm=`Y>IQE}EMZPJ;KChhz9?bC
zyev>^a@d%^gPraATxU5RQ=v@FWjwptc;}!W&7r8l(!|v<T2jfRr;(rnBMp8`cW@b?
zK&9|&HJ?Hx=-*&|#~4D|n?8?AET;)kmtycTH~3DAV>!4ih5S{Q*m90l<RU`OWQdoL
z%clmIb17l4)@+vSpUG_P1r3glI+dM;`!-t-38wU7V;;t6F>xr*ky#b>dCp+yt^bk;
zcaaQt4wr0D8Oye;vfkW*r>C;R{OeCaZ)>R(1IC=s28Z5Rqi$tP#o1(fY^78`u3LI;
zo-9nI*cEkFH4fuZz3@9B;;`k6al^}_%SujnMMA!LC%yISbOl!L%a*&7tkE-O9EGUP
zO`2s`#L<7(sZt$wv_i+l;ni4(L{n<<uR<&p6+D2SMcMgV&dpJlhoVC@#!-}q!`twn
zLi5`RvrGmI=rcE5gog52d~o<VaMy@d9+vlPl-DH9!!I2pL$I|(YpZZDL-!Uo{qI56
zB)5KnRf>CNozGQDVm+SNw7U+^&KdGyVnt^R1Qp+49j14Y0cgJ9#q=oP%nXIuaX^wm
zPAXYbN4Seu2_@fG<iyM5l_{f)(H9Hc)rpAe*?;%1uQSU?9ZO@paw*l06I32Ey_U`l
zHjU17d)F3hJ$K8bayBJ*1ybLS#ZpZ`3REnvW=2-=Pkbm0LZ~{NaMgGG&8rO!`&>7C
zKYLxOQ*=(38e2=SHO&NnTFNqvK?z+?EEnq%T?Yp@l$>s`Y^WA)X&~tSkvnpeigcS#
zJSVN~0LZlgMhW^LHhXc!?1C@C`?<eTENvpFNPk_6mk=ci)sVbHQ%=tCi9SJSh3(Xt
zhD$c3F8KVnVq7|Y6SK_kGUtB>-QX7fAv+1>s02Zpzeg+VTE!r|h7j!GF6I3V3O_fV
zFXiw0Vuf~XVh$Bg43G*OQicF##C|ZSq<bJXphmlH$v98^W-%cC7z#a9hjjE}cGQDp
z?zi{we3@`9>^;Em&5-ydAoYrb8f=?0&?Q9k%3CQys;fAMM~YfG=IseG!FAp@ZiJCZ
z%6E}{B7Z&Rp1X!P1v=M7G#J$F5!mpZmW%l?UwV&?ygWFt(?d*>ua5N$1xGzM;*5YG
z&`a5{2mErAmyn(JqFQ&Z0xPBWr0lgBQ12$Axe?&#mU+)Z@Z3|}&3{i`s8hi_B#cL-
z5vgB2V+5?mh+g6uBMh11#PYzsU_1MP88sg>%hDNq)Rd&s@NJLP6s}Wlrq_R|r_?Q=
zQ~F#kVd0#eRfTZk*-8a(uHBEb0KtW8gCvm&Wh6V3z@RQs2(i?&#5@^e>N)5_RH|N~
z&oe>?wruPYHVbNls19l?8JV8&x;KeeoKng!#cK_MMjzMvaP13WHjT&A9rNA+QM?bO
z-3QTvEA{?QMZF%c*K^Fbn!XC*f9%=+=c6xe3;1vC>OaVv-=K-N%{&d9UsG;^E#iHg
ze;{cfqGBFyXbGyhR5|$JrB!g$`lQF<gXm%LH8TgH{SL%+KH|QNvZMo)_R!<qL<c+b
z<Fwwk?+>>ia@LA{pWhHb_~33N^44d{?a@6Rcltl&Pt%Z~tb(`-5eALKAM>%vB3T4c
zN{w<V9*;TI?F}<wI-sJWj9HpY@*=_}#Eun<qpix2Ila@Vii=5#sVK$aJK&<QW38di
zhYs3;8WY;8!iN@I#}p_F$!ms_hnL<SBLF5cqD$rmZSf{<MMaWiR8hueb1lv_ZNIx6
z@XRfvFcdv~kra*^B<_C1R68X5BXHhOdK+AtI$rjj3I}t2r~dwcw0d-&C<r>#?4kj0
z(5s+(G%C7hc0~DBx2c+jRe!`xW-o65GU2M~*q<)2x3oF%O&kkt=muW!A7uc<TnnGZ
zR(e?XQuHm+aLQo1U(-^%PQKtiJUscK&X@GYT!mrwEYym|sj`MZtp_S>m!TUgksdGY
z1H#AWZk(TEN)<N<yTy~+#sO-olWaTj2P$s&FYKY!9UA?tO^e7IgJkQk6F{umA=C21
zaJpbN1`)PRy8?cAqS!5iH_4F0Z(hwWCJ3%>^mfg{mmlE&Sk`E=(Qz(+gC}kO7FPd{
zriOo(kBqs4gYCa4WQ*#SYT9a8K5VeKCPzJp$ck}@^UBitkg058)>M>!J^Ex=KbiPR
zbWZ?B3>gP@!C9O_QP^5Cwz^u?jpm(d`=nI4*vJ}x#g@xnC#V13VmyQVJzVvaZ86G&
z0~v38udBZD**^Au^m%HZcE8K+eueujqz(zdpwY-c*ax=Km>B7UA`DsmNuCASFQOZO
zAqeD12zq0LNzg0ukF(k9Swy1el;D_<8n9$Rw;$Pmq_XF(ogkwIr^pKv<$~<7rUS2O
zvgWV7AnAAJ1se94>z*rU_{bxsL$1L(N_I(sAWxu%88>y;M~){uda7b?m~R#aRtH8#
z!?L!vW_Pn<pM~{^oXJ+1=@2Ed*pDLBd+X2D$L_hn{3)r=Fm-!bS-m8FGC0^Tp}N^s
zZhU79Ob*S>+t>_IO$^+o!qh6gF!s}>&?<J-M}$-9I7;Spwal<(Ska_9)@7`$5#_dK
zB|6@Et8S$<Oh*3ZAeUz~Y}3&6>}*u-K6EQO!*sE_q}bJPG_jIhi=ZqANjf{)n7UPM
zOl*$axIbblI+$^o=<S;*IE@xJ1;vhQZ2-hzRgu1Z>g&&q)O)mOTLSu34HWtL>t%|k
z(}?<s2<6jnBkzNN440Y<i*@F&CkB+m-ze-}vYs=X9d+q4>p5Aqt_`sInGO1n7Bt4w
zkJu*Hh6efI6XnzbwDP2P?#YOVF^Wg(i)GKVnmP0SI;ml}&s`fct=SfIW_T*>EE~@k
z-e<F9L|RwvGmtroie74sInt7^@9k4$pImQ1!}@hi+6CWBZx$7s_Gdx8cRoyc?pill
zCb}tTtiD$n0?HU93``DnjE~qov_R)?CGlBI7QhttqWLpB!HawHjoU}0*!046ax4wI
znDwJIq7R)Fd`H2XqDEKJn^NAgmaoyWQYuc->W8<M+H0CjJl%s7UMK1V{4U!oHOSS=
zaFZlT{Msbv<nc@+oG5XDGtX+(1zTjDJE^%ltfNMaOV`YayVu6Yme`IuN0<@{PK`Rv
zS+i!YRs7Nn&DV=F3=23C#?UqzR&7UDs`Q)(;3XZo@F5~33Rt~l#JF{r>~T@JWDN!T
zmz_KOskyd-ys>o`Z?L<11C^)TZQMh(D)!T#lcJw?*Ri|u_uJiCwXH)6lCBclUu(2K
z+GvWLoOW{f=b;~Xo42v;DXA$rbM^zC5my&)yhq0noU}zWcf>h|Sl{J`V@QsFi8e=P
zkL;z<_=MZQ{hGgVoN&xmy@r*^VxP|nJ_Bz5vXq9z-QM9HXYP7jfZ<UrlJpxWIy85V
zOD$Qy64+mvjW3!s0~}n7B+{)+EQvV0YF))4ONvfy_7Bz{8IOlb9pg^d;EI~=Ti^^v
zoh96qQHBQ>9k9CnrBfR(bT)04@yfc1=BT}ioL+bQPR9AH?pWPeMsZhv{qi<O^zNLX
z09$6oyK+HX+763ZH+rKau45{`{nPUpncA$)T<-;TOWjLtM?}*NMGh_oAv+L~+Nyjt
zFeA^j#XRB~{wr1b_EY|1wztd8*MMP*yvCSReNPr33MMTQ?Z?oTX2H4Gy5*x)C(JHX
zdiu*+U7x-?hG0j{oz!J4aEN~U<6PxuIJo;L$b$?MmR$upYv`_kB+tNBc|xg?H-iVr
z9-8o)ipsZ3!t9Gddzp8ZBigyL5x%95%)@bFp%Bf}O+3CEIZMO!nfI@zxjk7;tD+$9
z2E@VzAlzPn<fdN3z*alZqDKm?Kr1$nf4=Z7g;)Tj6%wm0q2TQezSApzcPJI8IziZ$
zASr=x1u!s8xm&=N@WT#pL$p>&X%8CwBt0QV*D;wO-mFNV+Kx>z`VM2?g&>Lt<SXdp
zuv#y-zhMRhDc6Z8MkV`f>i)@*6;jqS#3L9B9lV46M#vLM8Cu7OZ~@HB?GLR+XaHWe
zKk_az(LMxM-bF-7wpuzd(jsMfGGd?7?XM6)WZE*pUt8s&YccWSGxCt_izce_icgFZ
zh{axrF({4q)izLCL-`jFTrQyKvo!|gX%6~=d=>A?afAK2nu^)-mGj~bK~`}3^1J2z
zh*O9vzo)|i+iNHZv5J!gZfC$vI=iPYczsf4xOxMR-+LP0u(v9D=ItCWkNCr@Rv6zL
z2w!E6CJg7FhXmm!LE;ou#E4&Uz}TWJk%BhQm{Vo1ADAKU-Hz}C*SiDiQqL;0dOKa*
z-k<Sxg&1JrO(lT{1S-CmC}l^M3V@w}Sv4xlu<BUCnS=sQmBi&WTR=z;+<Avfh@)@O
z-)=jh&v1s%rm<Gh?N+J<YQc!9MgESUnqXKhvLdg5;zY6>V``U8{yQ`?zj8?BE<bCS
zmCoO;H2TxPm)&8Vw*2i~=SJeItAmg<6q_m~B^OB}^^!(u$J$wCRM7mX(a+8^)mm73
z)|=cj5#uN2@SiyU=)f_Lydc=$aLGQ(zZ>AV{}b|zq@$dHg|VU2|Ngj7YC?ITE@FN8
zrf*6!VTsof`q`D700U6ek)gzpi4Y;_WH>;H5li6H88ueUi|X5PEwrqyJ8K))mg*nl
zmX^>F&|{YjD#b3mn;*Nb-s+a}w>_Cxxl?rJKcS7b(%G-xe2?F{o^;)g3dQijW(0lE
zF5DV22(po5;;Fc<Q~c%1?RM=MZ?VuS-2?~Y-6Zd`&<(TEgr`f?Bc{WKk5#;Y^iVtL
zRd&Xo!~Ltvp0T@h{cLyAsq&sxIk|4E1@7_CruW*RyNdJhx9R&4gx`d24o{ih#XH_x
zV1H5ebNYYD4L(nUE=-GDVL<zo8qoQW>iW>Ge2Curl<&AwVc&S7vF{=n^brj1%k4c(
zLw_pzb?@0yrQNvBzJ>VvQn|?vBEL(CU}Rwge4%sDQ@APgN<r(YLV|u4zw`t8&!JCe
zOORATA!Wa=#l;CB0Apm#Oa>{n0i6Q#ktyj;%oZuoiHK!tXS4eH_jlO5MJSTe`v%`E
za|#5=7P!|M0lTO3*{9R4Klu3f)?ul=*ZSPK2HE)GIJ`*SJq%D%9z;hu^bAI#!2ve_
zJtzHYddz4n6Lo}_M_QP(+8w@ra!N06O0M8iTnUsNo?dUiL0Wv6U@t#$4n%etV%)n^
z#$fno)zM&bY#wX|%v>)iyFXY1GD-LTf@a(f#z}$Yc@X`6mo5C~D{V!c@n6W2-2S`z
z74eAX6tauJr8KUM(^rP3E+XLS&0|^mD=UZuTh=LB51WLi$>RJ752q&b9qR#8EAkAI
z>RdiPXZbj;SB$`n(GY;?IlyR}UG^Fg%3r2KE)FItE&PZWF^X}RK#2g+iRk5=UM^Y7
zl<cFcDshSd&|dMB;xbDF&`6}4KA65zdCFWXmIWy8;h!|(T?!w8fmsSxl%}-fr_HB|
zw^RdX&g+4W=+rt6w1!o<>z_cn_xajP$>#;MjJ!3?Y6P{L3e=Rr#Ekv7*?dfWC{W`m
z9V3U@Me9DqH1wdP)Zp9^g?Mm@;mRd7-RU?Eld&NJV|9@`u;UxWjPhz!XyMBbv*Iat
zC43d~oV}!Q{4HME?f@2=Hlhtq#Bp*FI;7$ebrM9V7owXLah@YB>iZ=_(Q2fqzX8Ew
zl08Jrup)W2H1L6ggCim-6KRtA<GLBvb9r1)T}EEfV?p$dd5Kc8{a$qJiRPbmk_y)S
z(f2=_v?l@=T@<h8K!j*;(*0nPvVmlXu@MHD%2mQGTy1LaFfa_VGTJCB2KzuCUFu<l
z0FTfS4FM|q`pV*oi%kiOyK1`W73NuE>%<G09PSOVu=l64DK=zqG^%H!m#0K`cA)I%
z*AZO(=&&~!fC_n%n&ix^i~{)}aRP0O`I9ugRv!;0@wL091f_X(n6<s`?FF%dx+KMR
z=#qhI{hE&0CIIkF;TiS*t~QzjrkoL`m6`q!3KR#gK6b}}qDp1Dg69QXe{OKY+7e3S
z(Ar(Ml(i>OMqoq&&30Ckw+|b$f1MnAWrvJ_U}9sf#I}I);T(w?yeWBBZfFJ-ii%3p
zb%%i{iKT8QN-5;-22CyW3SPn0fH2`k3fv-xPlXJn)JnUxUyD1i^To=V=|xIiVZuJN
zxv(SG>zV_GgsDpjnspvj)3h&RA8o!-$V&;7>0$Xme#*PIZr4?7`>$HpB@m!0K$b`Z
zI?`IWwEsn388<wQWG^dBi=eDrs@>qFxY%kl<f9zw_~#c*Ehjungjj@I1}%OBQ~;jk
zEp0*{Jo<*_YZg_)0&Q#y7DHRW9-=~KRgYk=UVmnbRKMj+J^*iOu_l!a2^)qZ6((*J
z+oM*XzfieUK2dbBMY{itp`<tF0lTXI0lT$SG@nvAU%pb*nMEbvT)BG2DavF<x-U}c
z{2DE-aQ7#j!U;>1Y%w!SnvAK16S_M~n$R6;T6JtPHk4Am9DMnHFJeg2pV}}Oscumi
zGeTDv^8=8p_{GmlH+B5KE>N84=8y(4qLT|HyNEU<6F!5qe?)2hFWEM#W>@_$AKX9)
zP9q{pO$bj7qBPA@MaN5J@?CCD5a*T)GU~=y9s-CuIL<5@1noAZGX(=2pJ5fG9S#o^
zyr>q<NYj6-&RRsZnMDP6LLzBKFbNRe7SjR?ex#J=nAtX<8YIF>+Ru<zWVZ|ms<R8=
z2>H|dN<U%O=8pXS)waebPhx9~swt)ZVqvQViC2BJCY)=tWht`&l;Ik>y6P(39_hZZ
z8*gM%hw(%)sE4<7#I1MT!oBZ5vNb6?g-e(a(o*Xz^(#lqp%v#AwTSC2?x*ve@pRRg
zY`%l*)C>+ix<S>nCxDeRit<XXWyR?FfY81?k+G-PhKy)p(z9;Nag3UwF-q618P(@Z
zAcf2p>RipYftrb@kNHq%V{Wf1W+fSIDYk;!AiTU=7cd6Zp=5DwwMq~P7QE7cAN&y6
z=YhFoNG=uAvUjK>-kqH}w$!Yfsmjd#)x{z*vi|Pe;mv!9I~0`yBCy1-i}`Y>q^)sX
zv<O+h26MZ09i`AV$ZJf)gdLokTsYc-_{5^qswN}&tJa`${p6nhV(^mo@K7odKT(44
zV(d^`*UvnxH+lLG=PJoZUEvbT06ne02ZdW$Y(+(>R*3y)c;U|~!Q`|KZM6O0NTD!N
zocZrT>EPXo`S0#{KWVJ-wsdY&WLi#rU(1v2k7AI$_4Ol#+w*I51U<ZoDtsOyQc$MU
z%fp}c!Q2)(aV}1N0KhWrB4l`bXl)0K$GN>%Z+$Y4tq!_C(isxhCpluon(VF+m6Ghv
z9@y{#<~@O{E}UQs#d6(nV)}NiC39%}Zu2RSbRH<EE{|79SH`AKDGp7kwXgHArQ|~j
zQ=*JhVh%a7yE6cU`3M+4>c~lmR@Z|sXeQw=Eg!`RUI~3H+fdq5WJj8kOhauCbxnaa
zf#ah|G?K><s7Y{OayCrri4BGMyOMk}cpP%A{WmudB1erJ*y0yO7#Ul98Nsco^+>vb
zShqst6@BjT>}HW>y)hHTNOJYrHPS5cgkBYTizI6+M*&)f^>}f8ieL!0=0itK(6<;f
zc8oA$O<d{ob~>CbRRuV1deat=EwVUMyOTqIrTQHX^f|3)#((znpo<O+Z46Zkffido
zlnw2dxa^R8J3zdW#&B7>FePkY?*1%hvAM(*`@@lR#3&)c77;OIj*McDb1A6xt_j!$
zwNQVhgjdI}l<6&Zi1U-cg{Gvnh}Zm15_>c?Q%E;*`APX!=@RJj>o=Dzuo6m2)3vUT
z9@(*gs7&X_ya({ZdJLe=Qxurl{g%e&+xMT?Z$74Fnqx03Gn}2hS^t;k3O)5|mQIEK
z7~&>p@QG{$Cx#>sGcIh8n6uUdYg5>`Rl1RuyDzqz2E1D;+~q)F3(YBu*qk}(lX0&O
z7hN&uAkwDhsq%QGlrU;PB~-=>YEezllw?nRpBB>{<`J&wS)|r%25v)9=D-H%k@Yp5
zcuwx5#`F!B@6o0mEytcSbY7$e<$hDm&mJvK&?*BVy(se*aArGN*<t6DkTXupt)A33
z#Nuom_tEZ5$9r1ETv^rW$zQeuhZP?@6OEpgk#=BP15{3SRo^VngsC&RV8vfseH#_>
zWl~e!lHg*#Y5QgJO#7rPasK6K+IP4(B;1ZV<F?DSflGp${gpj49k>cxx(cA!bs+Du
zNl#S`k=3Myb5^C2FIR9hoy3&ctmS%bN?z^Z!-{bn15uH*y#YLAPS#w0Ll?Si?(^V}
zij6hg?MA)*>Ta0vO16A9=$qO10V?^I00}t<e{Wdk8xE}pD3(15%G%{VS;>vSW{EJ7
z>AH?^=G9;9^(K_7=~k<iw$0b<fOQ8B-5zPMD`llJj!ZX<txTHk=G!;x7Ty;hh_8*&
zq4=^nWEZj4k!bRnj!Z{Mm|e^%8^=T%%1YYCt?iJ<p|!bvb(%P1%k;SfFO9gKxu!Y~
zwN53P9*@GTv&Xu9^~)YGwWPV-WVxkw#a(x7)FZVZ$+96DhkhwmvwX^xk*i~+OqNO6
zq`?TzI%R6J{f&Ek7XVg>DaNJAJY>I(6t)e{)_7m+d1tmK{Oa2eJ_;cNoc0}tyQ+gV
z7cgIE2}8Q1Gy8OFX_$Q>iAaQX%%`0#l0&f+199+}eUTP4uY{~)VC&V}t}>O3Nxr1`
z8x*tgDUtf2cpgl;(3oRC?sAS6Cfwc+whVgiM$Vx?PyQapn*cWoi42u(z0_w4WVRbw
zd^A<H&L|m}znR1QFGw`oCFuU=c=aFUdw}(Bs_6Akm7CCe+pvoWl;=RJU!#d4D|!AX
zTI~r&XwBuEb!{y=`>0<q)tS^0Lojo%j!3OJjtOvf)JGzvu#BdhHhap?@HW|n;A!o3
zS<7SEnwpyb%k3&MY|?H6_Q#JfivO`sl)S??<IKUyUD@64U+8C{ik8}ULcpi24Rat6
zvY<IkLK6#roFuV|W+1AB&>wMe29y#cv=9b3kk%POKxNmPl-JFqh!C1ZW0PFfpx(8_
z2MV9c6K84=AQl4S2;f`)v}&r?)oJQ*`#7xj<Fd~x07S~B;7<|*9bh#I=Q%I}_LoBI
zNRuI0Ig?GBg!=$(_E^gxBYFSy4Kr3h?y}K$c&_#k#W1}QD2ERv@rb=npPJ3R(0(l2
z#)x73@DeGHiCy7bYN1)&u1}o-dfy9ey&{uE;q}&$><WdNbA1I`|69CqrN#N#u6L#S
zeE+zKu^M~1T)mv@gE{!I7g1J*;q}lQB`c1M@$#{nVyzWXrh!?6Nc?EX>`LC)OqRIu
zeyX|`XZjR_6P-x%a($|qqzsF;ckyz1rA}$0k%Ko~)euwIkVr9wzaJ?@sN0mP8>!S9
zT`PHWqc^Q~Irbm}R!JM%B8B_|YkXBjCT|qWLY^vJAj*QJ0DCe0NFS_m+<W=#fn)|(
zrgl3+Dji_cFa;Wv9)A$2-0E)zTz*BdMIqeggawXBop>LwOn@FNi*vQAOulvsye<d8
zwJvTsygbePnn#sMOoRIL{al;qFS9{H)L+>CLv&{n<X)9F-A$%YNHKo1+x_s?wG=O=
z83Q|v>dkM_qELwD;w^UrsVcJriC%+b69o3*tTXT=%Lk}Pr?fuv`@JYLNt(gXc%$Nh
z?|GtD<-$Y<pY1hM$K<f98#36{t?fvQKX4N!8C`;SFE1u^QElbVz;)=Y-jqN*Fp-27
z&b%G6VAPGhzUe^*3}Wp_2c#XMP{Ok7ZC5LS^>rd}_urgBU7lAG6nD~SVC`;#)mIvE
zC!13k)W(17$PulG7&>b!kIM%Jgzt6?MXYUY+ZK_tqa>d^v@S5S0mG?RKr&4^YFMJc
z$MMY-!=5(wZdJlHhk~oFmZ+X}BIjQT)-D-cTkI!S`QDFI*<k!`<AU8m{piu^92S6{
zzMo=lFQHJIUSs+#Lep%4yxv~%C#zv>d^B9{*$sq(pN`ADKEE$m&mjtC8N}NLG$3BK
z`@P3~{SE9b+YzE?7&EGOIS`@J=%wS7v2C7zDD7o5MUo)Y{@`Yn!p~g?5wi=b@<upa
zHIJ0#0(+%U{k4gYSnF{bDdzPP`#`Qkq<wJ>7VVkPq!L(3)vs%&+O95u>tF_^VO1Z^
z!d8+=(ioINp`=uwz+9m(q%XPkCvkAAsMTZO$bRD24RW-0^SaG1!8bzGTxSkk!826N
z<atV#n3)c`<e9dhqj-|s2gr*!8kkBovt(X6x&Ei{nQ9Lbx&HQP;xB1*PrUFn$A#I_
zqYP)ag^coO8&>kg+5DpeE|0~G5NS2Yk)>jM|4w1wOGuEAKQZ>!jQ3Oqz6>*8aNt59
zu1W*bD~{sBn7E#PXD&RiYeQWhZ_}p5$}&hA88xy_vn)KqG07)?hj<hcMG)BRp;Xdd
zTrme2D=(oYPuTmm&8;~r2@TEzF9$|#hUFRt?hN332|tLxSME5P?_eHvP;=b+o)PTG
z$dMmGXGT`AFNQSG(x3ly1#8xg1^tJ5+w`0K@qZ_N{J;7D{C|*5{kKb<l9naPcjTxn
zn@rlI#eBn-ZKDin*iIQLrE>TmDhhJ~>C)->NtV>MRH*iP0pEn2oKU`JkavZ>RAtgY
zKJmK#sf=~6W3FGm-d{jFjF*Wuzt8xfTNH+5HXPP3h%QlUMJZy0wWTJ%$3XHxQ|tKq
zzLM+|zcFyYnl}!WwQ-&ZZgf*)jRi?Rz@Q>bdZG+q(qC0Wbe=(YjtDK6sOpkDQ#K8=
z#6fhRRYVOXWnFkEz{Zg@n#&Qbp=g~hJ|IS<5dB3wvEC&K^%Io7F-d|N-JD9J?&DXj
z9VHXir9Gr=!i6JfqgaM~BYEZilQLK2pl31J`7%zu$#9F3-T8o&_DiS7K3eZp3QgDn
z%pp^mbl}~Na^%X>oFm>KnMzwTz4f*e$i|?@Zz6P%gc=25+8#1h;EFxu-BGJBlqQqb
z5fJA-b}nCtznkwu3`)l?LxTq|tC`ch0F45ri#{PAIWQkh<<gci=EEC3|7k}x6AKtl
z-QU|CUtkOG;Tz;f4v=p2HE?!*7%8p|F%jx6W+euP1i+c6Y1snXJ4k%8gvwJQJJE6j
z41Ryey;20#c_DiH4{I0Ev=5o5la^OdhEi#Jyd(Zs(nXKzZpY|1>ZkT^B~$;uOXgo*
za+!+%DjAn}nQv5nNvm;<@1789E>^KX@upCvrhu<x;P})eF4D%N@6zf!K#79FAK?S&
z<GW@^#Yf@;0Y@80Z{MbouhUo5KSEYE`G3DL3R;P|A?^|qrj1+uQX>Y=M8T$Sn7t$=
zJkM~2ppm_hN7D4RURZbVD7{6vWip&L*)C$j8PWFi+=bl~#sEc(V;?GcXNecdU2)uK
zeo-%o-;j0YL>s)WpBXCM7?GZciE{F&0>x0IvM0-YFWEfE#J(WNvdgP=*y5WXq>0z_
zO0k<g{Y2QOX`U)#+n=d$G8j?s?VxtbASnSybZX=Af9|BcQ|?^q%70YkgvdU~aBS91
zWvLHh+lM(Mb4k&Mh(TVM6-V4<++FqPM2=npLQW$Vy|2VV$+|1AWc?do_6C%7`vv(@
zF5iB^Z9uz&mpf|P*1LwZzJ>DS;_L6xE&n#93dfiY*9Bs=51uViI839J1!ujX$-o0R
zHDrBl^54)9T>2zruWjUqetcE$d;+<52J2`Bt)lM%vQcZk+@Tx)v&_3uF_u>bmGgq}
zj|H^Op_WtrcQIi9TL}0+Dh6?YjgghH48R6p`d|LnjVfBUC}OCeWR`VZR&*_($dV|K
zh*rmSl-6?%5=#Csz@wmnGHdr>GD|3)qaMqfnKBWtFs~?Uzh;v85KC#{5)tKiuG10!
zrfQG}k|3AB)ip35PkdALr;LZ_b$Q*PcbKY7X9LVp2ux>#PGM=ZW%uK0_y(o1>p8uG
zIZ?7rCBA}?k7Q_4p5qABXtz7vi(R^#JdUx2x^92lI;`*e^jD3|JmB2H@*eiYkUSki
zKN<AuC)(04S9!PZ$HNSI(6;n`w26gaAP1_qWnF-Fp@igK7wT+nZtYq3O(<^$PaEUL
zjrY6SX{-oUAR|^vBC=T(V}aAM+pH>h_q%vg3TAsg9^n$Ur}x=}_`zoM<mbE4TyQ0C
zRDsjR+GXmI;BUfIU5$x==gVsY#1jL!82^^Hbg4&cSrS#;uqLW@A#-eK?dFyrL^F}5
z+YB%~(P^`(T%42K(q7&LL#mi>maL&ik9V&1vk}6h!n5T(XNDKVc$UR+<0wbN0|m?(
zs8e=??3GwxE@%XQew@H|DoC+)+Z#I;pB)m1iVGpRJ*-<I1QMGoOISg+qU>z>;YNrd
zGc6+ngid;kWIwezfM<xQe1<T7kqqjOs0MI24LGaC?BNKp6pnpU`DGa+I}h<UcNF4-
zhXwHoW=_OpPnt>>BG9|~(7@v}3Z7$Gq|mGKCTi}xm1-HHp<wg^@WWTXTx86E^_qQ(
zi9X({p$>_=Vp=gS+J(acx`gv>eND`MQiP?SNm(LMo>&k7J3~GTpy}YJ=~|2ewBgI_
zqVbRLJx1U%MCo7ovEmkj3`q#KiPIOj|Kg95H}LSIOFL(G1r%tIfQnlBo-(SR5;#@z
z1>cY>YOQ&McK!VV3QQ$Bm~W^@_Vfy6ZZNq<3g%WHH!7V1zZ;hH&3#i-cUQ9Z@k@P$
zquh6$R0FtJwkvsFgEI<N_|?BIjNqsxJmQLSul$NN4PVNgBM^_0vm&<M!D1SZpN`GS
zc*a?+)Vc0p!zF7$l6<FWjrq%82%00LeKED~56>4Efk}Mpop4UNhLt9YeNGB4gE~?q
zz6BLqZd43CR~}|Xyj<wUvqq~Hw<dyjV`R{ZQ`?NfSRULFz@E<w)YOQO*8<^ht~t{#
zvBvl+WA6F(Pk#hT8nfTp-#2*n-+H+HN4Hqg@xSSx|1||<s%ZT)IHrhJM-yGMs`stZ
zj4~Na_)<S`r%~KMX1jR37Ej$}^s>n>+n5O3n}P4;JJ~f03)(;{szJhaDr?-e%h6=&
zJSJPO3pl0U0~nla(U2<4M*1lSBFQh6#M}gK0?W-zKdZOGk=)R6n9|;Jy9c;`24~l;
zql1zfZP%8S=HR){`E+wv;3qIR_0<d7c-8BcUj?4Jfcv%w7HX>!N~+6EIqXdhRlo#n
zzo2D_lhAJaM(tlIIs{`Kb!RYV@YYd~T*RdU>VCLjizen!DF=Ldrh%r8I(_lOLTcS*
zc*#EBaVdCn@LT-G$`S9<Eu68GvREKkDLlrB3B^=V`Fd+4#3_BY?%}fyhZe2c@GKfj
zNgb|8!c8lq6WTywuMh&ZXUwY>CksA_e2m<t7%O{B$>~M6$ccXI%7SjpCapCTml8uF
zG3GKbTDD+e0o4+o%zKq`AxkZbT&D_CfB58vY0d5>?KN;hav0so=0T-WDk;5_wFZYG
z-ZdBNVVDA~RV2V7HI6z<ZJ;p<Wq}OItZ5zrHJNH{-^`OKIEtEG;*^PLyQo(hwK3*f
zwIW;vqqNRneWnRl!Fcgk?2Fc&hyA@%!Zk}~$uHb+)u+B%%df0dRqo#FeH~{o;d+mP
zv8;00gYDZrwoQdi79l9%IrB!_AC(PZPW6K)+c7|O@No^1ka-P74k+aMt)nQy4%vv_
za%GUgCs^cS`bhovER7j`kfOPw32YreN(HQWza0q>U*MH!vylwt`4!+6itj2A>s9t@
ztANC01F(NfwgsPoItz)_vV^hQm&fkM9tpdrkMef?9-OMhbl!yr@DQfC;vk+K<aZ#q
zhS{FHhPu6R$>ky+%R_Al1)noUnt#2y<t)<-ISV<a@Y73x6r2%enP_{n-CzB)!QI-`
z5!8NrBFKH)VgC;e$p7cn_^)Y4$y#n+9@XcPZOIxn<u1ropoGgSH<UqwMN~ID)ddd#
zV)(32w+Tm`kkqibpm$)($~c7S^SgUUPoJk5zDR+E(R|u5Yu<Cp-NWPcaJ|^@$DR5Z
z0M$_AfFX<Ys;&S9nvArSXflCie$EWKii&~>wQ)^~ye=Khr{JYG%Y+@|YsMVU0<h2T
ziEQK8Oxo~zM%?>ng_79_f2C@lb5<zW$lfHK@LQ^Nvitkgt<M7QGCXI>RVN%(di&^-
z4FPwQyEo8nkiq2gj%``z^5Qf}&vJFrS*!()81j9GPe_k;?-2+p+)@0OP}Na0uvP_k
zooE-aWl)HLs%qY4uxY!`iJK=H66;5>KNc9f%EnLyG@3V+(?n@YfO~LkeR_EdbquX|
zJ%tREBP?lJgbx!&=20HEE(vf<yNBoK{<r15hZgjlFLIFrIYWu@G)iyTc)xrgN#}Zd
zTRZ)EC}7vOjJjo*;Zy6VdYk$IWX_(AHJfVcJjHi1ch~f6nmrO@Dao8k`u(n94+1Wv
zU}&6weU`w~R>N}0W0h&?<YT`_ve5#299_t^*u!{mg$L01YO?Av!QiA?|4w4<L~qS8
zjxZWS$!jzd1JuV;TP+?3VdV|V{h8qzGr;Xm`s-(6S(m_HbLn|u&o*Vkw97eIg+i%%
zVP;0}2z(=ZpnyQ3lp)r>v-^5l<fNKNRzVP)5+pMFXrlr{MmA_8j6Iqi9+e-5nQnzj
z(;N?fi?>AD#9}>*c95xj85Yd`M3a=<GXS88Gxxy44@t&NOM2ioJXqfG{xP3%7;1p1
ze3vi&|J<<te^B)P>t(N0-E>4zLH*h!xi~VUtPNW0L#2sIDewcUkf$*)$6+Cru$%|i
zQaEB;Wz%A7Pu)z1MBsY~c`l;oqaYrP!P3jTu{FS*-mJ)#2{$VmJ-FmO-f*0{^4grt
z_WgL}{%!e8<d5PeN4K1h*%yUrVy{GZHEv87uJ!!WpTkD%hVbanL9EvRmC*=oL**Jt
zsAX_6&~0u8?Eq8otie#;F{zL{g3MKC)0iW>Ia8-n(eb=(w!+fpA-3r}sdaS$<@O!7
zzocRBg!>6jL5pc4cr=^Fz8CBAp$t1|1}`FA({gFA&+JsQzcxsxRtA|hO|U$!sA<VC
zaszgYiAHF{<e4gUd!M!{bz^PuwyBZ(2|IKcl31mPhjvY6Y<{!@a5`w>t>wD((j<|w
z+o7{-lFA)i;B6wl04qt1Y4QaVofKH<z5^4yzaqOwHHh!#6-2m&#}-gm9^tY`7GJuI
zE?GFQs}s>7OI7^cWd`HyV5g4|Gc8cEnEE#qiu8hbZ12ioI}GX0Z^9B@IQw+8y6QSz
z)n#EjiNt;KNZbw;{Mb9ZsMJ;MVp>=)tGHZ*TmuQ)SyH5}k&<%=4yL{c4hoN4^7GfH
zcw1wV&Wn_0udwTqZa|z{X=)WQj4H#;+fk(iFj(8mh+_Q1<1rQNp^H@_^GftZ2C0ga
zz5H3xNTn&&)oT6f!rw4+e=B>1%b;l~-eUD<^37+CES|~CUbc&y(lhetw`}P>F;3j)
zm+UwOhxuNJkD0o5BGj%iDy*yGX2S3`D_L+A+&kZL9Jf}d7Ia~rwgw(7{^4dbQtlZW
zSHLrC6uY?|aWNqw>2Qjcy7H{DHm_2!O=)Y=)}(wDs({u~{5rTds9T<jZ5FWdc4U34
zX;DxgsX`L@BRp01H%856#F{BN?@3g8#r;jn!`Lnvck`s)6-$=f6KJF$y0a|8E=bo$
z=$;97VBcZyhsWFulIb6xe7AU;O~y4^!rzFz`==AkHTQ+4kOjrr#LxK)gDtLERc1!^
zL-Q~r^&AmUJ?okM?s3c=K@!_}N3%WrujDlZZ4+MSsS4{5Ud*r<42RUy&tnRT@bCVJ
zLd`*aKrpk>L7-cYwCBX)diuH6fZv3_J|KdQ6#`&`t{6B!m=pX1pHO#g88gC6pOB!u
z0_;o(X8UYItxd9o60-ubjveLAXk)wKBrQ@qY!rL60v~~F_HsigWXy5%?=WtnlMBEI
zv=Tn;Nn&pmoqCgt!hQwzz+|W}d;p_BGm&%$j{Cr3{etn^dD59xLl7o75w2EfZD;Xh
zvc=8C8c>O83wAxlB9dmtEZW418z@z^orqDw8I?=<#G#e17ykSw0eE!1)9n6xZZ!Iz
z+aCR&ugkxh<D%O3Kf-lCZIIQG(IFd%O4QGUgMPrN7O49q2nvCa0g*=KEqbidjP}*x
zxUxrjI}Jg2D-7Q(Kkr54)AKDv!!AWf+fF^pJ;yLaAKR!xLan9T3oysGw?AdQWjb~_
zK4!Fcf86X(|CrjJ{Mna+(r?T-5i%1Mgjn@+D_TSwj>wPHz8QCbl4m=bL=kz8u)$EJ
z4~Ec5Uxvn%L_7YEvDx~e$3UxwGHJ&I;>ZkMK!*`#S!0glx~g?Bv&8(^aDu<_rCDKS
zO6Gbr?Yc%)@<QmJY=aYIigp9C-lz;&L^X>iv*3J9@MXjHcyQMS9ahx_>0xE*%%pHq
z@}zzE7~>du$QGS%-=#su%5-F1z#sH+1lZ)W*_}01sWhHpb|>e_S{7o0o1c(f&YH|D
zrbz%_hSot>cj;r%tbwTa1zxW%f=kwm9z-yP8vUcttEvK%lGC}VU<>0w5+S)c<(90&
zB(ki|(cell6nXk76?*NKj*|5>^WhofOJ257jDh7)`6~x1#Topj5FwYT%$X!QkHeWJ
zDO~1C-jRsf5WSU}CJK$XG9(up-2z(F)~E<iNxY;ZO6jCR_AK)wswOUVvorKdc~GP-
zl{UevCe~MM>`lspoF*?0`AOBvhOz$WQk&Xij5VZtK9jp+F5wuPH1XGEfoCjQJ1)k;
z?*T&hz~iXo&2<GY@T*Q~eNGADA+xZRsiaa07_0!-79yZ&D1hWsOYTXLOdsVUWeO)&
z^{z7(?@8j#&sU@SeIzW97Q$UPEL<F9R4mRv_RGdr2GXMVU|855quN+nD<<mZ!FMCI
z*HeyKqz)by<UuN2LS>XXXh1hCLFL7PS$J6Bp_5@ly3WBjqHK~3SpN@g?-XQP+hyyf
zZQHhO+qP|6D{b4ht(CU1(zeZ&*!lgn>-_uT?24#3b>_v0m@{HVjGOU}-g|5PX<%P>
zPiYD!?Mo(a#uA%#K4w2&8oVV56zL<ly$_bxol_WCRd>Z$E35(wra{+yQ*z`=x#l@;
zU9y9AOPJpuH{}(UOb^rC0^)RbX~^+jlD@K)*O@r-HD-S(v7vLRs5&N9!kI6s?y#d)
z7N9dqQdm&c?Y>phFcxC69Grx;Ejgyh_aZK(S)(<i6Z@d4#6Qb!Zq88#L%<$Dj9nOR
zN*6o%anNuf^Ql=$U!;5^)U?j{1H{iT+(NHY_k^K!y^Dyw4d&;0Ukg72d0&eL|3dhP
zQ}gj0Ul%4}Z;xmaN;@0*;2`$(cmv5Va1APBJUSR(GtVJ?;$5ntPI1#k>!95lV1yz(
zvB}3bYb04V#eIF@&nd;+>4Ap&gfm7X!XLQ5>W<bzMRQw}1ml09F4#)6O)%TS+{{2+
z*b%?7zK7lr3^_15pkG~l2KtVj*%R!Dj&j}2W#FNnf7ZTJ2(k3aAAp|@g$><{51ou2
z{v|(rD)WHLGsMaxj-}T@HXq-`kc`{M0ct)kD`UhOXPLc3FuP^()mJ<rdNgN{iyb-B
zPxVeE@!I7VhzpJYhG_t9mTV`8oex%Xa~m?=K!0tGETyNmxW`>^K~&zJakMutmytpj
zW}VkpB?#sL;rFB{HXGxPSKn$62G_CEI$gXW&Cb0T71kIXtl1Y<{8&GwW(Y(DIs3Vy
zBYq(NQ)UT)!*%EVlvrwT|6^Uk|9KGp??{7Xm7RaOgs*G0Qw&@g0Ru%5mvc2g6hOow
z1fqEnW{7bJ_+H)CteS-u=?&WVp9IoEGMOT>?)2AP{eyoR1#K5QRR_L~;+I@+uil&M
z?3--Ax92^SJ|s4<d?P(NXeY+QMhtP7wgVH|3XPwR5TVMM`s#N%6lxXB1fM3%y730u
zb?Y#%ya&u8=O`^^NaKadl-BTVr1%K(O@KCQLh2nh4CJ^{{9RYK5D0OHdG`!#)CMW>
zO;@RIVLl?J31{~hJnj4=Q?<KuRx7<umbRGh^l`5yx|r^^>7idB(q1shqg9ydN(Iyk
zdq|scXYB!#O>Q3RP7L|^*WXgx_beEEX4{HGoX(eMBNy{+=g{v|k>`NNO}9vrQHPo4
zVY?b9icQ~fdQc~*O|IQq%30d7{WRG`Y#8g4-&_(so~B+IROp_)WAT?XSiiK8{F=JV
znAVuFrHW3k@;+I_;^Skn3d@fP0hn!q74y3CkVM*EilSk({Rh#u#Uq$r)+viJE|u?(
zef2oj_m<W64m`__(T0eX@e*xOb>k(I{NS&GjyxXe-GlYrBC)QGWCsC|utFKC2_vAf
z#26|KVJ@&1+WYI*vw~r$djM27jnm(Ys##P))gAJp>%MPPo>(xKAd7S<CjoOlbk{YC
z>s+FH52ctWL%=M^YkuV%!nrAB6TP2d4vJ!JI5s{bK=PzLb%3Sw?Ffj-Q^JZosptbo
z^8JPLwLkR*K?Y1c#vM&BcFpz)7KTa-=<AH8^qO@5U8Hp*<^cA6hg`jY%Tx!9`2%Ay
z&!96b1HrKX$p;ClKlp^;(2V@ShazK)0Hns%UskZ2)xHeGZxM+6uKnmATG<_p#7idL
z9CN6QEm<g<2nj*_OPl3o46N-uJtZ@-(HR9si6MyN+Q5NY)N4}zlKY>hqwa-zs`;l0
z8Tc>9OaHH!;QyP*B<1`Mo$nucUDd_%KQY0o*6P@%2!5&3jhbw8PL#H`1<P7?sTSH-
zpw+=9lm-$EkSO(NX(o`;X}X<j!}~RQ=TG>r^bEY>)lVKD$DCgjam@B;5JAHSX*s@T
zCpn(S_cLE_EA+ns+oNwxO;9M(V+BUInHp)F5p_g*A(_)*jbr<LFrcG%ROfzm8FrTu
zOx))Nq0vlu<i(vqY0`~TFi=b|XwXekH0UH4HtM7}=9Q2d$CS_x8g|ef1j49`Wh9`7
z;*W#|A1^l=pRljQbQi6CWd^4%RrVH)`ph;PDZjtR2TRP*taYArg$9GMrR2-4w(gP9
z^ysinAc?)?Vb%&sw@Ei-pJcjOQXI9HXc!K={*m#gRioRElT9^uon)u0A1u&DDP7Bd
z^)zSNbq-%S`OATk+|x>;bf-gyo40^=ux8_<Cv+hw3^^ZcoW{HL94t)4oH1F9zQ|m$
zWaQ_kl{80&!hBZD#+L9WG4Q#4F4l~Rk~SC4Wi+Trxk$?`k1B0euGk*D@|ag|+#?r-
zJdLs;=kUNy5rw^`4iU5FB|Zpm?h#iJ-%4+Q5^K|Nk!|5?J#p{&iF9%|kppxqb6GdZ
zF+W+|og0zzG9luar^g}h9Wh;0I&`$TiiSkzj5kPp$MDJiRwVzL*tuN)g%?sCzG@87
z(43T_id95-@F!iRZOoM3-}+Wf2I~kLd@H@xyuH<Kn5}k^m4Q8a6|9T&MRIF#?F}Y|
z!Z9ffT5VT(oU>P(VMK;bal>y?uv89E(!Bf?0AAIGh_Zn3y7Rp>5<Wp?KB||2Pw9@4
z5Ar}6(mXFKCsOcnKKrwYf{KMli7^&3bGc`Or8Z5y{MTO>pTCl$BYBFB*(It)yA`k5
z;}#giDYRl@!{{<>DsVtP;}Uw$S3y6>yU5Y#LFrgyOs@Vq3^AWB3!23xR8^npNU)7I
z8q}TeX4n<iv8y(qQypL?3MEI1NbBV2Fp+caFOMt#Rx^D=CL%^BTb^6jD6VZqZt3MZ
zVP9yGOnNH^PSiU*n)uV+7Lf;Gc7cK6!A%^MdC~7SIjMHP@VM{OmY(PGRa~R}ERegY
z)8f>zoBVUDb;0Et5lu)Iwj{YjawbcyJ0S3?nCFy$uD|wWJl%xu6Gf&?8M<wnSFLR9
zF%OTU=LPtN!G3`(3-NRE<#1^b@PBqO<n~m%#a<ixV1w(HcIgJxt#2_0>Q;6agLlgN
zuY&8AcacpTd%zZp5zDaKCGCZaJ!Lw%64Tzl1&W%NsbD{XJMj@}^Zlw?4AEKaR1wbo
zBOP%4!n#Gl&lzQA>4MKVg_;i_2nD}wU~MsoGY>ezB)cW`<yC-p(dGj@yrmJa3SPvP
z!c<Z)h8eLKI>|JE=AnqV5mRUdbBRNTM!RpT)nF;@5{m~`SRE3H{cu{6Ea7=Xm3gn@
ze+Pb@U&M7?XO1JJ3nL##oC?A2$!)?xxJLpYSz6|S0M^DI?#6s>D7<V^?w{&bj`m=M
z#;8QJNlr*yalNX7fc?oM<oX?ROb)>-Jn4gdXp7?=Byn*ErR6WCZS4(;OCzr`H-2vd
zTBea(y9=6XPQ@|VSQTWKdP2o9doOy9HJMhPLPM`|%OrVB1zF2Z>8a3$;-V1Qb6VPP
zS<nz|7?61j<$8vcVt|0TuvtK;TkMo<5sf3&3#UwU!m{T0rx|kG%;0e8U##n2fv22z
zKa~f-53u$BKA-$=o~>f8cE&D0A+-NyX4PnV`XG;@eyOGQw046S_w@@zQi27WAOHeE
zveCUlG2JJOF#<}BYiV7AYAUHy8!r&|WNq6@!DqIfVS0_SM8pVZEhMq^+)$q-;GOw?
zuI<oE{?@E98An=5oZidG@x1YVnZowC%=p;=sfYb`G=$bW3xcn!+`nAje_&nKh**hS
z+gkR()w>zMz7<2?4rY&vX&dvfX59|;)+ry^7`~KY-41k*#J@?rvqPWR=cU_>dWr0L
z8Ta@NJ?WSi@HYV3&Sx$Jes7S8kLaL?u6p1zg@b$~4l*(>YK?s8GHLl0WoGO(S|cOg
zu@@;1brIZ@hvXR_ji1a^rek;bQ|JYnsnnE*=%5fpLg8b++^kuANkm9mLIWwvdfsn&
zH%>!{{YgV*;9Xz}<2ghudbK<k=ZSQH+!uJg9g_uC7FRZjRa#@-Ronh=!0);jjryLt
z-wzrmSHL+vf_~Dg$?)?j(V-y53?d0R2c>AT#RgPbkL7l)QsEsB9gpP|n2N0X*j<d3
zneXYx*viC`)9e&}U`AFN%$ZS#=ku_{W-Rtt$-6djA*_&5z+NgBvaxWMBLQ3}ds4Op
zXiCJtDhs0Qz2_}sPhHkzozqrwB($&aW5g}2pH`!{k=#<v>Oj(3Fj!QTsquze^@Wz}
z&A^01@z_bLozNjPt&)<Z<2KAR0RAppXuJ|Lp!Yixn~exHK(y^kE~2Z+vL-=kTA(Op
z)DOK4B3S{EFEK8oD;5p*3ea#(>5^8%l7{`#A~HNWeR59NN*ERj7j@A%HHpJ&+qX<v
zKRKP8xr;|bKM!}xmtIh8LrSr3afvCBTUa9Q4aj9so^X0myJ`<kMcPDY?ua;?!zQJf
zOxz`}vnnMrDKA^FS~{dwG_;5?37)T-lwDc8bD4OaG0IG<twHh3N9l86)Q~7d(&DKR
zNxJjIj9Zw<=aZQz77X$AoUyw*j;b%9iAiNN@qG(h9T9@my~U^^@9T9~eODp=1Pg?H
zZ~;e7`JxVH$|KRwlz<ynCUT)opb~|waegsk$jhs5%v?3cIJbnXg0|euSw|%g%j8TX
zsiu_4B10f`o=`ZjwGx6a`Dhr*Jb6ErK^%2+FSI`mMq`33Vm&rwogH6u7AmY1eye;(
zNAP!K;+o`Ksr1xDF~Mc7qMpWBl#7F7)?I|O!?mkWE#wqcAk|T)z&q<C%P2<Wd9OA)
zo1aS1Sk1GD8WJLp$mCoRi9H#&kv>Os%&6ZoKquTQ=Z+#VeGdv9Wb9Sdsq$o^8HY~e
z2ffv`q8Q@Ncf3%ua>%DJ<ZN><(9S1CX~;@rYO|oYrk+kNl$)>e%5M>1Pgb6<HK4H!
zZl=@KftPlc-6VohnTz5B?Q$pzx>_yRg>$HZ)>m+V)K9)61=Sx>H}O&JUvbbJSwZyy
zj-z}fdxzjSAi5Yr^xJ2w+tq$;?fZxgy4m;Uc|!HU=U2ED{*V~BUbrE_<X5}>VSJ9v
z4!=T!{vJB8nU{)oJa`fs{{d`4{Z_lh{!kl98UR#j^xmrl%tcWz7bE<nOC3+ZY;j{x
z@1A*~c*XUr+l7BkO8?aC*S}TA^iR5ThxCrBXY)<fI7^zrA#?Jgn)~jzZXY8S3;HX;
z#q7>*l8XIk@vC57$ToTjc7RYEb*L}t`WSS=1GI>vzyO5&81dN_%C1iivP%ji-a%OM
zxc;VBszs`utPNI<-XxZwRLXBBeYwGmeXhmE`J+|ticxN4yw}<8bDD;)(3UzkN}Wvg
zbj<RgZC3WHT8xjMyKZLSnDb%jOtI*^-oxiAJ?j*QZem-D20rSd9S^oG2Ms>U_j)am
zQV8-dtY$*JKFCb4Uzyn!kDp)r=RQ#760@d4+M<+s57i+e>%28+aCO)?RtujKchc08
zri`K~*2l;vV?xf%k^-X9ByDb`@k58N^q*g1mlPqI1HhtZ+|uVhxmqQf(!!Igzoazu
z$}^0MZ|JtZq2FMTBB*k0LGh3QU-m*Sxh_Pu(7hb5a<rfHucnuo@cqz2uuiH{`qwXK
z{1Fa+BQAV$O{TF$koQLWHw+BP46F~(b55Sc1QmOxX3K>6n{q}`l<^m}2BUJGNP5#C
z%`eCvH40q}>z1v>M0orhE1ImB-^bEtmB&gO)K|u|t$pCRhYtC&&Fui^!=JNvSYM_m
zlUrFFU8trXuoQUqizqmFXNJi+CvCu8v|0@>I4TCHl?`CiA663cMWEgQ)_)>T5M`&H
zjqo{1Cu~kAZg2KZ58JnyLCyQPW1Jv)Wz#riJjfIoVKs$rjwMytWDBi=f=yF*Q&1qQ
zg*mYxyYN_71GL&3u(D`Kc_<aMBb=y~1Lf}If3q|}vn!uksTlHq3|)|kvKE&qQXd3F
z19-LXlH7SE-VqvDzk^6la$cin$_)++^@N`bt7s-LgoyHH>k=pDj2J<hH>4(EMZkxW
zcIC+CLYLRL>-8;I(m3z#c9`SaXVw=(7@yN@P9uEV^#nPt&9u81W|@w`UE7v<ezu1!
zS=T2ZLTce{+hd;;`hz=QKj{kg3eHgU3AwI%x0ye~Im)JYfyA2Ei;Wmw%qDy<c+a*4
zc_kOq_c3l98bY~;19;;Jt(nra869?nABFL3Q!X*04vomDSkczq1Wi3EhAYUMvu#vT
zXqb!&kjO|q*+nT=&fanCXtjFqixc`ql-VGy$Qg<DaYwvMYj7q=3Z#k7&1!5XCXh@?
z@2M9c2}2-yhy?^QuyA)|aX|UvEWj9rv@lr|P*&(-%MLhtnV^-Kvz;UWWy{THZDezE
zLgC_WuVuTNXzq?B#{rWg?)56OynUk!cL9kl4a5(14UTwB&~*n!X}DTIRRM3WUyxy*
zNmgfw3<}0tm)+?oM!WIVSv5X*>ejV|F0Zz0&gFPNk2}YETd~V{SjRfu5ePRs1~Hv$
zoZ~*aQ!%qKpyhw1G?&Jv+LVd?HHasg$@U;j;_Me<Zc^&atOD!6_Rxq(c8{-(Rw*^z
z2(Z;AWwt?(oIvhqMwuy_CorCxI16RNESs?6qOjX!^NPz+RK>d?Z6|NAZ2dlO`cO}~
z(?^v%kdp|;>W{K1-(ph<2}3(E6=ahW1uF~Uh!&P5)r(GB<>2E^n$XnowA9E;kvTGv
z%lJ^*G-a-90=a$dgrNVm`bfZ**T&=uwvW=2T6vYWcl75K3XgW5|CMUDC7rqfr$XP(
zsz`a0%LfbI;gjZiSUy|zmG~>7?D@|({6GCPy2875#Lvhb8|Qzp=KJ^7?|-U#JsRHs
zq3W?sw>tg}R`V=JsUm|#5D>5sDxsw<{`s&%MRso4EQXk{U)w=F0ru{^e!<Of9F)VL
zBrAU3<MRhG`=O3H-;l{>4h7m(WsLW@&*r{xzGNqT+`Y{H23n1)+n9@D_K^gg3(EjV
zOh1}j1T4Oj0hryl0XVtE3FF-frI-PScmsv=PT=n)5roVKcE%Ark`6_-{9wTsK!Zkd
zfkemjLQmNY&}yccb{Ii%70hx(5jQq)1pD2TzX9xxnJbg7##TtDVWvlaOzd`SB*Km}
z&6KQTa#vr#@m`2VC?-nFWJ!KPXHm&qxvG_{G2|lb9*S8g7{{|;!1Bv}YARkS2Xbpp
z4*kJ7leKE<2x1|LL6tO3jV6abEr73<9T?-V-O%EXhFpVf41sv}8AE*>&6zf>WrafO
zal#qij7nqV$W&qhlMP%b5_+;IX`*tp&5$T@u&kS7tw9Fpw3Ewp?gH&(Ge+o*?x74X
zZv(7~0gP_#Zeh_05#-jfk@v)9Y1OR{=CC40r=+(oZI1>Qoq=OqY>hE$O1!xR?Jo>7
z>*S~!Q6)|-A+-#1m-Ju^6FDCJF-95tbby(-^d$FD`YNsddD+2K1E%KbQ%xcotz=r-
z{<%xXfwOiK%8*ERQWOgC393%VOf?$qA`5-UKVaol%1EUNF<y^;#E$a{zHDP9HkwkF
z56R#QL6+PuI^)@qL@s;Kq&3Lc6)11XbV1NWu$>(bP+Fy2+(|8tFgsm9i>QBDsDdlW
z20YAwX~U;WL1&Y;n`oz37GRI7y{t7;L_ScZ;g{1A_tr_Y>ioY3aa?FCWQQ7kueuG$
zA|&?MqxTegOaz&Ykhet=^t%F8Nf<i=_A_UG#sbS^E_%aV>dR(y8SB&S1;;Yl?2XEq
zO$KHp-86$iw8qe_6Yco$W2<1|Vu(>pbbF0I;p}z0s*rW#9=PfxIw^Nx+sSum+o^YO
zVx};A<<ah(m%PzT*{k^j<E)<gBjB$JBjT?bBjoL52g*KVd(N2pyI8J{antexX)p<_
zT$%&wFr$C8t1yi&Dn`C5Td`-`c{7=pqfmBIf~FZd96hHT=8%~~Yg&sm<TA_$RG3sD
zcaV6<Lko`y^u3#~P!GD#EbIdF2PD84aY_S?Y+FL29Ia~#D}VA>cJwkoL%ZSZ3M9{+
zs-i%i-~!W&w;L!qFe~lx!Mn?41~EAaE$_-yAK+YH3~HiTJxcB_U2ZVf0&*wNE3~%S
zyn<l4YV|=}^@cnWXN4;cA3dy|tFf;=e(hDW@+L;cMU#zS9tYix01Gcabo%ry*5<Ss
zD28l8-gb|&STX>y;RH`|cEp_&pK+4+=tW2cLB4`8I)oMExDIOma!5_tnN9iLs=9ZF
zJ^$uLeO4ndHlq_i^w}*bsJA$rj^?A6VjML+{cZiAq3vEt_qZzf+vo48xwEo5y8Sr7
z)lwehg3ONXs@!j2{Nf*1J*32m!7JJ7?sJv}R(HrTKIp!1^E)KsD;WGDRg^P1qkr&o
zplZCh<;xx;kDN>PU7pCAkhj$>*ea8cPghLp#x1?D6ijH^{CTe>@tiA&-Ci#xT*{hj
z^Wxwc_bG=ohHRHxn0<k>1jFjSw%7_hb>|Z#<W6G64q^0-BgTp&5_@nhxXu}=uD2tK
zV6emngC&QAHL{`oFdY{wvMfLsBH?F;EO)T55^0vs$0zkG_}LYqA+>0j!J!dO0lh2(
z>7+mLxZnC;-K4JZ^4!MvJ>4#Q<3)u@G^e5CNJ3npLwSo)+{kJAfdIoa$#DQbEHcw{
z4&EP|VPc*bgH-d?YBZzQ1+f)>>|%vz`aV~|Z<EML<L)725M=6Pay1HhB+(jAM=vM&
zvUr5QD00x*B&7|?ADjo|=v{emLDvOCt5G=51*r0KegGfeX(UE`U$fJoGVkmEk*#bS
zAsW*31NB-#{Qu|e@NdhKJ(3`T9~uStqZMWE{JK`NIbaPhX$9*%hBgr7SQKTr<$FKP
zC|E0w`}9`eyT8mwHQ5NpBL0u5Z$>x8N`{rOBP+w)?Korn@^ZyKFAfkzLBar0+HuH%
zRPIkBygG``Q-38r6I3nb9EOwDMag5dU=F@z>*7jupmE%xM{!3_ftoA#CJuDX=eq<$
zFdP+3!w+VV_KepE;^ZDTRAT;me$Pi%tB?`THDvKvH;Jbr)7GJB5cli=e<t2zxL$|*
z5V<yM^ZWv~i<J$`lyXXM+|lL)a8PIRU?d(3%BkEsRAds5JCs5?&$!^6tt)Kc)~$n@
z&6kQwzY%89tz@|l+TP#=Wm6$uHDOd16>_SwJp>lDtzo?0#myD96W<LS8)kzA?(>Ah
z1uKk>R-OZm{b}4c%G-(PF@hiObH%S22pD52(iF1H!f6GSPWZn0P?BQskN-S%`(*vS
z`1uVwDyQN+K~AOq>=C@xk5#E+w)G`1RgcBJs>CSE@G0*u^6HVq75fs9R*YzDXKiC+
zt&AE*;7zk=wUz}N=B#No5p#W><BCSQ^wayE_P#uw*f(|#J9r$Zl|K;IU(!e5wC6j7
zp9smaSM*R4pa{fVu0V(ZtIs_dZxmE#1ZF{Fkn4<wH=cIEa0=OxB_E$il1aFi<qWh~
z!mR91PlYRAec>$XeziPkiEi;P1Uf}R0;Krr`8*>1De-X(-cHv;JbFLyf9e&|^9*3}
zpZS0Be`yl`Z_cRxGk5FXoRS`OO=o0rgs+j*o<y2@T8J0Ia4Lwmcw4&-1e-Mk<PC%k
z3>ZR_?)5R~h1y1~w=vo4zkFW;l}ah(<ftI1>Ipn2>?KNP8M?S*10j!ngLbo1&nsIG
zuCoo_A1^1s0KTu|VZiNsWh>HtI771YzM3u__zw!c5X5_<2rQs=uY1Buf!E?u@ogWg
zB!{;AS_w#}%|OC|6$A&vRem-hB?K3vZkvw-XiVfZ^j-}lKT?|}V%^G6R9_vnhj4!u
z)V2|Tu)!1q3w7@PT6L=GE!(e`L{l@CNj=3|IN=MLHW$9Ug?;Ev39G|PIN{0g($e-}
zTi*mDzqEel)R|(8Of*lbGDaMH_8Joz-TJBKT<Ouqhz-WAde+I^iq(Bd;e8_|b~i$9
z>O+QED`1$&;WRSOOc{_-`#VuQ>4e4A;WzC}tHqOJ!L7L~W*B#(xEsNBe0EQvCNL`z
z+0#^0Br9EtFmuZpM`ppm*4T?swhZZ6>p#)ElEHSBJgU3XxR0yQUa5O3wo@ErI!;<>
z(##bR2TouZK28q78{KZibc85TR+gK8%yN9bKSUNC+qci}SE(^8S6(Vug=s@SFK9c$
z>lFybN-eXh+Q>b`N)?TIB&Xd@e3_KoX`nP6seGw1DN$FOZO_CKQG$vYj;ccos+HYR
zI)`27YwxR(7voc=N?3oXlvN%M!4~*|VGeiI(ExSW4~@T_HddP2Y_UjKt`y-ej);P+
zmoiI-@-F|7c9>tI%q*?n1KxF1TWr`i7Z(TT>Nl0K&aTdkUrR!nsx@?<5S7^DU?+P}
z{x)Ycsa$2#J%`c4gD=r?z!8Mz0*o*s_96OU2++R+ar`nz^+D+yeI*HyztaTBJAe*F
zW({_tGcONPZLo%3)TerlEcguuEq4|nF*x(bzZvW{-t-O?+^rH1XfUMxH=F^KaSJEC
zR>Ap3c|0auDqmcQl2&3FR8^IX<!E|AW~!)3aB&!dyQ_%L4uegd&iWuHFDd)&?vv8Q
zUtzGChebf2s2d;;xhcuB<Y$XZoS7*2ov0P~7Shh{VvKdFHn`9&RrNgJN>*-Cb;HW*
zrY9rl75LDHr_A#9CWfJl78SR7LyYQ`$Z~a1ex}Q<+ipV+m5Di1;;cy%naMv$=n?RA
z6E)S>Sj78q_pc%PZUJ0jaR;}3VAu|OFwwzfX)fBj`N|A3oqIuc=`MrtqdN||Dz%oR
zE>MDClD-e)+i>Bj#;#W;DmN`+TF1;-n*Nb#F;nr=q>2bi9U10KnF$7`l|fqmxDGGT
zfl!|VrY^vrya}&jdG0(^FS)>v4-WBP@VR2Zp~IXa{!D_7011zauZTD$FO27;^APak
zwDaB;(QaEI<m>aE__FT(enop=IB5z63z9c<@BL?`elX+~B<BK-NM!(P=c53aXf=Y_
zWX%?kZ85<`MYFE&0S+-Fb?%4rJa^nzsh%EP{wZu?fR+Urxx$Z+YCOQ!x6`8B*Zsdc
zL($ft6s(hMY)jQHa9G#XBwG~0eoJSb3nyhiF+vsPJ)a74dC!bV24^dnoW|24a(%)X
zqM0L>Nk-3EK=XX>mj@~4&5Gk&s=J>c5mWBlMt%XdY86*&!o^C$1B&;TL_{DDfWCAX
z&<FB*HmmQGPu^}5O{3rXpq}JP-KwCT_&MS`_GdQ|FfHMIV)rlKvD)N7^NDWS{*@Nu
z0a@R7YS(mf2@$JJyyLX=zz)ocNR!k_e!oJQCQT%k11N&h%fGAG*C~_GKNbB`?|Y5s
z2I79)K%F^iht$t2=WUPocirx=fj>^+$i*&ImV95P%r+c}QC17yS<sEDzko_-YD|(z
z$L>L?lKhXN7d|X@RtM3s^lsHqI4~YTE=Y+~^TGPo(-8s{k~kHJ`$EMo7Old%U&Uka
zSCmKSAp<Fo%%lbfhX|9<=O9T@b0U|7TjC|rnyeGVjp6I1oYY9rW!nN2=^Ot)Z;dDK
z1NO<EI%W{zf2@xAhfDfTR->|ulck;c|ITVul9k8);gg2OUjfl7P<-|}O3-QS11Tv~
zB?@6vqN)-*o=&etqalyRcDsq#ed_W)f<KC@=I9a$qQXI(r|=y7s2BEpe&26z(0zE@
zWUF$wJpIst&CFQC`R}11YTSPk?SIT`DkL71@!91x9Q>#nvy{z6FDAnD9=6VbHDXQP
z1!PiKrp}(Gwva!hX~DagXl3BQVX+5p^XKIUi4#uGK)<33AG#*z8!@g}6Gn^)jOK*A
zaLCi@n&`7Co7K$k8upfz>*MY`$K^+tF`k9onHs2hXVbmdfG~C_E@!VfuNMNSjm_q|
zZO}B%hlI$f3&*(`G7s8%mr@xMD}K9zQd<K1l!PSUS^;?pH?!1M<0Ga`Fm8O7TtR8{
zK@Koa9zzM#Q)twX3Cl90K9)3Zy7y=~mky9DT|AWzcy-_{T5O_vfADrD?s5M?Psdtr
zul3*gG!Q=R=8ZYnUGHDLoMzZLyD@zy-^(I_MPX%?&=55FJS~}h#KqOOF7-;|syt@j
z$j@{JF*_Hl)sHpjexanPb@gL;0x`xHG)Z2Ou&sPGCI0_PDO|76N3Qr;H~ac8D+#{;
z4)5$=KAZml*8W@Wn%0K&QCVK*KQU#pXL=AKAnc<M>Z2fpPM{4A<|Ras03t&GvA&A;
zj87Ps$<83Ku(jUOvaZpxj<T(B1-7<rs3DX<-KbRQs?fbOdhuQKb8Dm6`QCgnV;YBH
z$QZh*`no^valhex$#(vJ@t^6rxxd7Y<C7D4XlC_nPE+r6)Fe#<>tLBMZON+LCCgc9
zmpmb>Xi+;cWACU5bLFaYSLSOQ6Rw)EwZodlJ~S-q=Gz&(+9Y((;%Uxim+q45*w`ma
zqK_Y~xo?*}fp+za%9`1aDqd;ptca#ho!mH_Cr`V&UnO<->tGgrgv)WC5N_iE+4O<D
zNgU13^5!5>9mKnLtc#*Yokz?mvdbK0%=x?79N^yd#<X4ZpqEp3dwcZZ#;!kpb9>AE
zrn_)S1^+v%E_ITXOP_k7HmUJ~_XE$bZic<RB9Q+6_V24$#iw76z0)Gr-7@%3iuG^y
zE=%5>{bTL7UrrseC-5DXz&qD_@DJj}(|jG9go*rAbbr%l@ZFWk*(GbZw>}_yrAb=C
z)8!*2f9?RUcV+tJ?vv}reR0@F-~?RfgHrKGaQ<SEi=U)c^kVkbe9I>u|IeGV9h5^-
z6hHlM{rE{@r?WIQM0WgrKzRIPabBO`w)WR3F8<?E4F1{&MfR&>@*!6Jg||t&FDU+s
z2W6Qz+y)7P=BDu#RA}*MCd}!AcuY%(_d-SH2@#px@D5|;c2<OlU}BjP+O$`<zm<QD
z0u5Z%IhK~uBhm{rT!r^rmshlBlUEQ|G4F@piO7^0evwI6a|!BOn7c}IG&l8<;;d<I
zE#pGIfV_KE7Jcb12P#ZO2mAD&Z?(kZtlFyGJcIt7I+yFvI$x$2UO_JEF;nkD*SUax
z`(;)|f4E^Obhkc53TFu!!POj_;cX-X&4jpM^V_msOHja(;qu{cEBG|w%%3+56LOy4
zOwOR%q2bgmqWMK1bo%P-dVh_~x;lPU5cOR6GCt0$_9%UZcc$hbv$xjudK^qV!|80W
z+vsfdR(QICBisKnz(9_96Jk8N!a;zIS5%>*h!_H*u!a#4CFW0ZmLxz4r#046NsVbU
zb7$hj8t?-s%O^!(+IaVB%}S6Z%C4v<-8_PJdnW?)Y}My7+5!}4u?vnzB+pDZ&fO-E
z$!lDUZYjnlDGhC0GiG2)nimw;GWZiC^5tOR)frSuzd%p~hklqG@j_Nu1!i50jpU#Z
zGJQ(`71ohmLB@=#6v*3u@}f<}T0lwwPMXPt^}H>?fp!fAuDG;;UiJLfsP{b9A<j}#
znZkgg=N+YSpUBG>F~8nRmj!3t;`cg5o!ZSAlQ(GgKKT)!G>5WrE0!CaRG@-+8*QB-
z42_z~<;6NElS;dq;bT?0i31~<y8T>R8=`FAP_JHTYjsYv;5t&cD|v*<3|(|_x49O7
zXilFluNzFoc<g2Z0RdkGH`wRxbM<FDPcm_OfH0~T+GUfaJw3r~TH~U4y{qDKr;64R
zxoX>(5eT6@#bk88q4<v5YoR*FM)bOxi6svNDG{OBheKCLe2R2w-U#p*QYXo*#lsVY
zmAoUwVtYYglBMGxxdEBTQmxr$8<%b4OfU&jPB0S6IU9CFn<9%zlnIEU3cMLF1G1O&
zgdDR<IhmU=fD-#kE6%<AVhAb0%~Ri=^k^q`NJmRykrA8lv<$Y=a-N`>#kh3rK2}7$
zE)l<8fvHFBka>_?)rlpfaH(YG#43U10!fH`8*(D+Fjn0}TcoOom3&hoKT+2&u13Q7
z!XoHDETB{Q_&=^G|4Npd)Px3uc6u_Fa+8+Kc?zcprLpm;hO>5;!Ds2I+SR#T4I^{N
za6n$b;)t(MyC&<jGkJ~SX3nVMqDL2_`4(!bRLa?GD*v%fMgXh0Cys^9{?t_qyPJ)O
z=xH=6E+C=)tMHexB<6%w%`Pg8>vd2v>w0XVvE{XvDTuU;m?nd#NrA$douxNz4IkqM
zWJX^<NpS9J#qejKeuvGgwczvEUb?9T3*q)MaNLoQ7+R$k0m{VV;*Jd%Nev=M)pjDt
z&y|>*cZdYU6l(6)uulymnrX3S4|mkel}V9_AP>2uxQQ{o{0C<){=BJ~3D;laUsH{H
zE}Yyc{81uqKk#z2-saip5w=jmGKz>paP(rjtnR%+M29o6E=BL`Bhv4<s(cMY5J-yy
z1McuW*H`FWc<PF5J;lw4K%3`-kyG5uKVJA(&_83s(*YafBaoK61v}3Q&O`Q>u|$u#
zu0L{7h)lBnDxqSe63oi^3^ZO7Xyc)KDO6$yx(V$D<$4txoE3xA)9a0K>1U5~oa!g&
zF1?y3_RLq<vD5RJoH*;6qwdy1EznMv70D9fM3ho-Ei;z442&3gYl_l&x%HPA(b7T9
z1Fx!UBUz01S*KVst_qQ&#+(XB)B8iTGnSBH?oUrtydyMtCVd4RQoN-Vl`GPPdkU^B
zbBow4RV%JG7EJ@0hm^Z8jzH-|R!^umA}2SeAG)Pq?D9A4?j+r3;)Pr8n93&_pg;eI
zT}=A^+@2VU{s_lZ**<SpK%v!ke-Fu5GLFGyA`Yw-S;)|;F}Am;=a4n}V@GsoAMdhk
zdX>g%+>y3&u(4<q>Ne7uVP?9@YNX3jQP+$OBb+Q44F_R+1ir)`BhnS^7RhaWbr;p9
zeWaYBEpN6SyEcbA<5oT*@oOHYeWQ#_=xp<0#@NfQc!NL^`|-PmI*j*Z-1IuX<Y8#x
z?>9BgG(owA_c3fGpT0^QKTUF2n3&<{H~8<L-zH7_^D$YC#BM02#_qeqttHjxzMzh;
zAznl~r%D4Z5oB@5{9`%B^R3Ugeo4RK{4%d!*`;isyE%OU+mdo;%JI&eEwlEWw>#Vf
z>q*)UX_0l?NrdUltToKcxqA_!7~Nq$^>rauR&M>G#l5eQ73sB@dvf{Jzf;!b@)g+6
zU(5~rg}7xphyF(T%YTZW@f7f@qM!dD5Bmf9tEB(;zCJT+biX@MDKnVh#x{B+s23Qt
zXvYr5Bg7N-hxS)a|L+rij7Jt+W()i+!(03}c`#l{`Mp>;><@E4%&J10MBHEcd%rP0
z_&+LV{8?Y^Kiq$P_kS<F>4SY|=`(u}eFD?%eG`yc-2<w9C2F*bFuf-B_sGpZb1dE~
zUi(F)uOKos;q7z~?ZM{AV_;cMHM>=>s;{t=#<ClJ&&@fpgw-BlWhyTwuwXwn9y2xb
zOxHX(haS(v2v4qzFxKEa;YA6)%=Liv6r!H4dkAOcqcSbWZ7xGDyZUX<MK(u-s>!%B
z%3@?svWYUF!uD!oM!Y^t5nznJmeMf7+9tALPTKy$8?Ig|wb=F;9gp&rQNMzrnKm8i
zwXra_Qii>v@koRYH0=zrGs<LIwJ`lq>9=CVZ?@b8vh6HLv0ye?FUZQslwO%Zt0?Jo
zi!I2hn#O{aIsq)v!bIy9CMH2soF;6Bc$L0HCQ!0(El9COy_<*tD6>u}luxOhW^A^C
zbu_=fh1aTj2l|<b-}75LY+pkJe~?O5CF1T$K&IMD!`jxe$<sZ++5-MAwuWZhYQfUg
zHnC_~H+oX_Fmr~W5-lKk)znG>5hA_onUEq4wG>5b+R;*hmGiH$V~Ne7M>>bKjcCoT
zVAE#oY#o?Wvl<D9Tt+Ieu3|DCP{!Re&|-ae(OSV`crE*&nrJp*(QiwyTs+aNF{|dj
zw2vKmF-r{ErW7(C$&(N}&3()hO-D0p`8}kP-szc#nUZUxj2ksVh@D9ssAqhy=8OhN
z@5>i=czDRoFB98n#yQgPBCF?>O)^nMOadCHpgwd7NLT~&wvw)3b$kZ@#duUnETd6%
zlT3y@X;#J!5sx3fURG8usic#tW&O<NI%bKRRJ*hZ@PeLFlf~;pN~Hbbds@j{6}N|p
zqcia$nnc!<9X{c;%<0m@Nve4u8}F8ZkaE5l@Kd}rd5VW|IeR{(=fY1sLx(P|AB}v_
zNHaspNt>3AjvOM)mcyT!+LnU9v)pKO@IpxtPm#hW_Aq9>o4K7+%YeGl1)Xiv$VY$R
z;~&ovlQArShM=39IAhTpOvuUO*Q>o12G&lu3-dd<Ewl;m3*R6A_W7QeYj}&VXFO9F
zk4(t!kns;M_E1O&bzlhhJ1hq4j092^WJZJ2q%^U_S}9)pG06FsE%MOL8}`=W77^nk
zw79VRCAQE{P@L1V2J<F;ah>cBo6%ZZ9)H}GGNNuBgef?18JoBU5!H&D#eOS9YJdk&
zUXuaOu4=4&%MhgLQ1tD*yjqe?FMWP}wqxH&*e1kTeJ3GxM>lbX`1=@Uvy?F3$im?U
ziuATpOn4+2M)hc?-z?h!yN3m{3sDhPP{7ZKH?1i;Yq*x=t6=n$4gqxVw@|WT|Gt_<
zhOciAX2ViP`nf`=6V^(c#i7Gz43tY%kVm^37xEjH7l;siOnJts*{sfOy=WjQv~h1Y
zA|5Aihd&x6Nhks@y!QGm<$$O*;8PwoeFT2vK7J6hw_J4QBw05dk^3Zr=#N!Wb5{cu
zj@UI8l5ZR7h4pXr+gLx<WQ_o>U(aPH0uu#UEWU9z0&-q*HLfhsk$d_C0$4|u`)iU(
zS~ASu{6c6@i#G8&j|VTWdx^>eRz|#x4~JsoU-c>Ohk)nQMGK(H-fI=_a_5Bw8|Y{8
z%-l|2`z%o0zCAq<mNKemg+3G1-ro?gWu?s4^{c4Rqqy<I?@di^W6vHYC0em&ld?H2
zw&$M;8Bdy4sd8vwdbU^an$EWTM;<ZrUe#nt5$R4on0>J^d({)SgPD=58U?S&YfDmZ
znYGqcf|e4q$+D98<9Xv${Wx+28)C^jhB}~DdlHtBLPhTk8u2W=NBTGc^`B-e2#lW*
zHD+((O1=~t$wyR3Q4dL17iU_?i<yk~!lm9OgQW8?>(c57334I#1@Y;%14&{xBM-|i
zu-DK>+{N!bxpoS_Z;G(*yuo_%?1Vny%ir1K@`$jX+xd}i>`LJGy|8m@OLUTvXzBPx
zX6}iL?RiCN#VO$1>^8md2!Y$)v~j~MHi=af^zI-S^`dvQX2L86h*e(ek-iCa$^<0~
zRS)yEsPeri>VsxVz$){_x;16nid+(xF@4kdh`uop-3xgRzI|Q7YLr^M$R=pNfl%>e
z!rd#=tWz)sD-EIy-zj`)WQ~nI4pN(A_~qQ!W3aDALM(LV<VCe_v)t3km|(RyV-NEb
zbLHu*${?2#NE#Rnm&s4*wD)<m3nvpbKF$oWY$dI3q%0mKJGo;xc{a1#idj$aI#=vI
zFjQQ3+j{pIWR0-$$NyS1zJkswAFgT7%bQ=8HQoA<IfZ^E@3;letZTW3m*UdaU6!3`
z<As(ZWr`lLpbivYWXvU<+MfOiLqay)qSy*l+?Ir<5O8glu27AwrKX6xF8Vv~goZlr
z$CWSkn{Tho%PW8{1P^cM)59s5<>K+|Ah~Q&xUQd|bau|%Ryio1&@WGeQGm22MP9l0
zl)dO4VS1Cu*!WDXd<wR}7K8Vta5j9QWXLM()SU>Iq=5#V;}gdhPm8zwV|KJcg4{!^
z7kz^_FHXr)S3z-G-W*=R(wftY*W7_-bE2HjrJcK?DM-W|bi$#S6oa*j8PR_g&7U+m
z-cngbQS->v!x{W^lgqqgC8IQodiQ}^72UdqEP^ibRFSLDKtV)*sNVYg+L5bLg|d+R
zRC?m4$v1t6;$oT8Q*kUjPI^qPnP6H<O}%#NGZF*U;l^=TA)hvMFLZB99QOFjg4<-;
z6aJO`s!PXQUU<(iJrRgzYO6X*(ROd3dIT_C>+FH6`jWJG!BI}t|1qd?ou9e6zv+Aa
z^o1->7TSulh2T*GP^|`nM_rl)IIayas(psz(gDzdCfq}+aPDRrjqF-=TBSe>&MJM1
zxyh+8D>_@~TT79~VCXpzIGF@M=)fh192kC}5^(X`kZW<}^n&8IY$+B=RKi8d7qAK-
zv^I5ILe$1{67*{|iuXx!QF&$Fad<yxScMj{{L+z^^A*$^(+Sipw}^9`TEr;s#4hJy
z{}W#H@@G2sU&C8qgC+3(MtDWc<6$9#c03BSkSxG*4mzlUC3c1h&T`gYy^=dY-5~-W
z&J5DgdU*_9J+{pW4DT?R)@{DqWN6YO(D8TqK~6J{RBB%ir;k^hkGLgti|%(XyzhZW
z=q?#WotfUj$F`uc$8C58pxTHAXswVjs%o$b)5y)I206lb@QX%dbwzpS0uB;x274|;
z(38;S6yW@!<IX6g`l92^bElfO`ztBK&~x)JuP1!(2|}-%!LH6{r0)%xZl;gO@02Rk
zA{Tk{vq{xW+aEyoL!FdE<hMYnpGsx=XOGr7e!|s@_DNGqhXHXRj>#HktwDUI<Dkj(
zhE`QvGSZ~kvLn+>BO3H!IYv8?pX7eODycD({86c{%YwK@5v^9wMICH;BG1RphCor9
zAy~MU-2z41XN@g>$Nas?e*~xShh+7GX#Nh*G%)kIH6PFws(=fwXgY;|6fbWFVHTIr
z*j&tXkf;8P_=@gzY4*n?E)_f`@e27$JjAQI^uJtV2*Iga<jB!mKC7#nUt$|x#>@E%
z&Gawx&&SP9Yy$kmaG253i2OKXoC+sy2Fn=I3QjfqsI78797AcFxGBw|igdn`Z0Mai
zbA48p&beOxTj81jGTkjnH$-V|x7^WlZOkGGwQ<g)H@kTF?1cbd{Ss9LR%I8zZ|u_g
zBo$sFxxY0s=;8-w3pmRKuiPc3{j98K>R7w7<tR&c!#_`q%8d~*=G`3&xUQ0>O_$^%
zm-FD<{05hKKCS9h%;?AWvs|zQ8P$q2T`?c^)GkPyGW_0c+}vHLA-{Tb-#JvvV~=+k
zB<6ZeRkyLwoJUuFmmjgBc^Q!;Jj%+o^hTrMbU{F<1D=oEcM1jq4LHEe*xAGw$%-*r
zf>9<Gy=4~ths_JM;H?f~+`kC#om^<wKb{>=yzq(ZzL@=#@AeO1>h8PvJJ89(!DVq7
zz_ERO)Yp*bBUV?&+Tg+JuF=fNS$ow!kluvnW}hgOwS2%YUyKv~pa7nDKe*4Rub3{Z
zb>X@KesY#h6yIJr7}f<+f=u>+{pn^^#29Sl4>vAAUMEkS(#B>7M@F*B=COk_3Un(c
zXVjQ5I*{?YIkIIT@pdn8YXKX&a;r8Xj<Q|aSR1`bPLENGo@iW}HCw`!dS%%aX2S?+
z#r+31PYTO=F1jmFX{?iaZ3v;3$06-TLuA8%P4fI=WyRqtu9FKIX5jand^RU|{~G7O
znFHKJtvRAA5H9IOB+A)~W{K%K^|+*w?}9)61;+$0<wJSoef2^z>`_*6Bg#A(I!91}
zVHVob9fd@OB%-2=RJK%FJ8FRvE`$gc2j4^T)L@9E3*@;n2Odx<4d~rIW<)8}z(qWf
zjuV0eRH{>jN}Na5l95%b1>IjhM1lgCAEs&jgKC-VvCS)_!5TD9t+pzN4cT!`93Z(4
z6h^kS3X6{TXTXoCzfd`WUFHFLP<@>4{x}7vw2_J<>r1g9n$d33ZLYhjm^P$HfLkR=
zrpyAa&XoA%#yqwMNqG>e)D&3hfwa-e4W(I$6nOYp${|=V15ks>7rwdqQ1-jv{0wJ*
zwn;N;Cp;2yExU`4;6pRj7sIe7nUn6=L5&MSwY9AqsCy^|busa;TRl|nn3p+8st+sc
z6R8bF6KqSSW!+WD#{OKE;j)f3M&<xFI|p=zxWvu7Sb78l<+n&fxj!k_V+3z5$`=Tu
z@No(B=sB#HU@dnPr}0SYbbB^x-FCt$gG}CbOL`8^Sle%~t0=gn=Q|Y)p1I~y)r}4m
z6z)JLd|CjEWu$8=Cn)HL9NF?fxB<BhO#)7<rbkv;VzC=^V^w5lm8Y)EX(9BH*_GCG
z$G*46)b2l=VQmYn+=+E&a9iNp7j}6vkJ&-<PNUDY&0TkO%f{TXCdb`11ewrT{OOz&
z7U;>vGadJ3pGWlpBl`uHv#!E*14L!*L1jS;uW6rK$O?b!+E>V$0yvs*Pn1_8RI`a%
zrNAAVtGEc-9OUzfD&a<Acq|%{;ZcKbGu50ZO(8BATBgZD7_TUpUIuO4EoUvjx`>?c
zR&bzl!~s~*F&?7;yienjvTHAfqx<1rPN?}DNHgzxrcqQSSWq=TGMP#xs0l>Jo()8I
z(Puh@4otTJh>q-V2Bh;5FbUUZO1`@Q+YSPdCJm5=u<Jy*iv*_Q1(-(RoBsEdZmB1a
zUK!zRc(*ic3=}fFnS_98D^vpYO15uL00<5o$$=w2U=SCQqnjV}pKk)Rxt4<k8IOpA
zdmv=<k_8TIUsC<yXrTPyB@egS+`1(ys;)D{C>!UlP~hsgg}q##5Lergu9deJrml$<
z4eIV5x{1VB<0ZdXOk`)&gDiIh_59GM_pwu?H&nH>vmB&p(_dkaQnhkJcJqp){6|b9
z-K{;@(x`JP`<IaJdmNf>Yvr0OfYgap9Y{H4wPpmRRr5^GaLNB@ZET<4(ecHdtY0j1
zH7B~sLDF;#uJo`<Ug(j}HnF<h`(R3pX$FiLj%(W9D4!mori6_p=*71P=aYk+r4qQR
z6Nd+kiIO8`B=wAG4Y5#Lw?o*P>K;+%)w1EjC8X+I0)^<x3sr*~)d=1TRI^Ip)i!~T
z4?bDNBh`wPNqbn5X=}2MYiqi>)9IzIW@wj71(Xu4Z^)<Z2y&&5B|Lbpe>g;vWZ+5s
zy;o-l_3Xg9M0F`K3gMwaeOcI;|6#p<>)L$N)%))Z$}f87c)En=6$GN{&Asxx^Zig;
zjx_9#ETvn-Y%`c|{zGVjAvWCj!~_6nQ~a;QNB;kg&?M#jf38*ir^&V^`Cm}9(eK4n
zI$CIzzWne=r4n=#K>7gDWC9CGM5LdcZrQfQ#`+xF=Y?0q4~Fjaa1neT);nR$SsGMe
zT1Y~k$El1AXFq4VtsQ^A4-kf^BM_u9ssw4G2p@Q|I}*ta$`VW|8FI#7ny~V$Jd3y4
zhVA25F0ApT_MA>>8-X6Pro(73C5Z=rV4P=N&(##zyC(t-CH31AH^iLvoOZ0BiuSmA
zjk(x#S%G%S9rCcPuYPPTn>$V2k1T@&rtPvv*45tM8pB?LYVo4dT3<+mCsQeuD;Ymj
zRl?SNm2#a=Qt3!|!5*4TTs<{V912ddHunze3f~Kc(uqC*upWvM2X&ik&mcKERQ0mp
z1!k3W5!u(Q<w|m&Pzy3`letro5ErMm{Z&C-rpL_92kF@AD-Kb~R^f~VK6|IZ<3_Xc
z2O&jHckZK42Kmq>PvFRIqDr3n&s0$2ux;DCEO6}Zc`4?OE09{sKQt|vJlMC%KuY~;
zC6?T|q}JF2JI+*CdZ+1w-LZU+7jyGf#37)t^sXrN<p*@vXC5WZq%>9@H3zU_7P+-L
z>{8eMc3DThhDxF%8xGw2Nx!eUf>zonbdF{i+=s<0_A8ZP3ESGG_fa?!##`Y9{!WI}
z_prELtgsI+U5{Ae0HcU&4;s61NH{jJiu#(<LI}i#iA2wzkV!6X{gR+6$%L4b!Y!d!
zLH|^07i<GArX>iXsQK*pK-93ihe+6DEYv@x2og+mWKuB`CV5i08I|1(dVkm)8KWfg
za!Q-@6+PrOf=MuT!Oa~+;WE0`36F3ep>Z9G)(fBKGEU_-AhPPyPLFG@Tz@?DFR*@O
z_=eqrLWD*1-CNcks+VeaC$zd8>JCv__vJD!cm{xn<imS!;)rm0T_@%#WetTiVUWo@
z*CKKm`4=)!@iuh&pPg={|B{RL|K$Pse|(1j<cFf*oD^lzA=1+BC{Q5emq3X307xwZ
zt5Sis9w97s9kfSm#IS357vb#k_d^Z=Iv$G?ZgUj`C=r&cb+zX0MDsp8`~LlUgAS18
zflwTg3eYBmYR5HT?aKjh$2@Lrp0~>?Xm9oFQ&^Ymj5H)%5W6z}6)Uw9E+>;vLXkl9
z!w{WWSu_}bYB2>6ZZVCPayK%pDU=|VTEI*DWWhYO>9c)Fw?0s@5}6YJU$ngiQ=MzJ
zEgT^D3Iulu?!n#N-7T<icMB4NE!^GRB{&3kcXxMpmyf+q_wCcCZttpH_k62r{epKs
zV~%NKjD^~|<=%^TCvDQ5SR3a~1(|&U*;!S0(61?#)5ZWtyXTCHeh6S6O+;bBrgPw3
ziED}N4{kWd0C#?=H{NX6h%s^V9hC)9S%&9f?}Fj1<C~ct;S*NHS_Z$$b<Osg9jr$7
zI{#4S8c-~9cKYVC!)J3zQjq<~5*CV5B4Z=>`^RJ%5x@V&0oIL*LYL>|-mr*~`Zcxz
z(Cyi2Ph6t!+!l07-fv+Qp2j#k7d2++R!z33c`K6IZ!qbm2!1IpUQ}8(bL0e4E4Y7)
z@K1YalNSrp48jh0Eas=fk}CP0Y=>QhCI90Z>DYG-;ecz;*B~{=#wnVA3;eQ9qZ<;H
zhdo;*s@Hal8qPg}FYEr*kMJ70g>;!~tcr6WwQ9SXlm?|$dQ3z+`*;YIR$&{i+%4Y1
zui?~$&35W+Cv=Y|esR89`N#VuD>TejNZG>8`>db#{kru(U$*|u2vah67v}$C&QBt4
z<KXy@4UpI+>nZ-vpf{Q22G|2{#nFICWJ$%$5|A%{(K-=@x%^K_k+_EChLY)yThZIa
z&B}E+SQ7l70fNJg<*}fYbw@g9XA={?vElH&y9|Q156qQ1-eFCwv(yxNUA--EG}D%r
zi>~c@Cq?2+%1r`ay6VWY#YF*n6eo?|CAti#M`1!$7A3?371It754^WejL#I0_-3kZ
zgGj4cFgn#^vGKgluv3Rcw(V(K@(<R>SNr=+E)cX`{I1;Jkzh{9qRBf$NWF0I*v(0r
zUi(Y15;V8HQ6#g1@(-tM7dx*wv(A-7OBkjKFjDO>g|6Q4^u+V+pQZz3aoHDDIyhY0
z*tvxaT$7fN+}6COSB4wPOfUQgcfNa4A(EdWS;d(?Wlat$thUk*5W(Yo0<|1O<{UGs
zRpR#~7j(46D3Cy1GQSRb2MdWgYb(7kF~ct62Ma6PfvFUaEMt|QV0O<+2j&ZK*IWeR
zle78zFoD_0eS~<;;)@NhyGYy^`Mw>sp^?58uGw=6aFUzL*d2iGI>Pd;n^njbHS5K#
z<ts)?#xU)ZV9Z&0M7Rw@hoqU*mW*Senb788XlMKyO=AF=P&FhcFFiKMr*JR)b8`;1
zeHSw`R7HFAgW4;kIutz{>^uiVL$F2WZTL|`)L=?O+TxnT9!u2+*8NPsr^NcfUcX-M
zw6uP$LY$XBf$fuUn+n`Ju<`tF0^6TUCVy<IlKgAOq)g4sVM-M9$E+RAQlPdr7#wVw
znS=Kb8Uh5VY$~!j*XNjVX8GdzPK63m;xZv|I=8hxX}()%`l+PRaSw6Rq&fnwDcvc8
zcE`t4Nd^vW@s<897qya=J<nBxwYb;kr-Zc+?*{O|nvG^3c;I~`Dq9i#EfHS#IT>I>
zA0~mGNR$!ixMdGx7Yee&Hpq4n2~_jP#E8*VqR(14$E0mQ?>@?I`Pz*mXbNP8hjeG4
zoHg<7ryTEU@NV{@goF}WuK{8|({v4l=Nj$hEKn{{VejZq53Gb@lg(KvQ45>MCStQ0
zU+;&iQXEY%5GsMJw46&FLOa%Mb{s*yxxm8%dppH?I*S-cY%>W>jWYWD1yI8s)QiWU
zZ6Ov_JRIOK((KULOTYm)P1NAX#I7TXdowvl?4xQZAxQ?nRNG*`Yy=;YEof<ni&WpO
zCRmQU42gj_K6Tc(##DgmY64LIiRrA-cWA~+PD6UsWt(WDfQ26*FoKnyI$NCzloK;y
zp}%90vFbn4CNkk}FRRIfBOyl2&~DR>j*ov=%q?9@-O#)>mZTn#r=p;sP=t|qg6w0Y
zGp|!s)?=8KVg$I%#VHG|inocRY2cUWA1#WIE^VsLQVEwa(#3seCZw>?mOBW~*|`Zc
z<d3bF)<DqB^Cr@Qr>k<5D1piJLGC&S**V1s`au1zMeVokrCQSP9RJK!V5TuhfV!bF
z5$=f!1!~3imE<Z=-#zUGs62w-#eWWm3ulB-9$ruMS)www6YIfURerx^QN2KTRA~-r
zqFP01x%0p04@4ADF`C;V!KF-DrZ@~*DE+nxGGaVdPs_TfQs_UZlYd4Mx+*+~l_DM5
zbt~7gEOJI8*g_%XRf%e6Koj%72V^iEr=NQ`NXqh5uN_3~D(+!(oK}*#jLEMS--GK;
zIv4(4l}DecQteQy$;wd2#tfgs97W4-6oP9tW^Yr_7>ryT_cNKFRVWLlx(97E70j+_
zN@-XX3=?XsrW7rg-MW=(dVh1#up;Vyt+F~I(*-{+3t9()!o_#%I;xeFbBX<sG&%!6
ziy9h5KahbiQ72DUPfLFEm$Fx)4vk_7`(%~p#Hc<^<qVLd!E0z0oFiz~!QZ?z9=>`}
zgy6W5_=!$I1a)LN>i+};BO;Qcc$#sBPURH2>iYq?zHetkvt)8<ES(>sB}s1}n&w4Y
z?_we-OD(eqeUk|(OFqL}kxOnX*;Kw8fcwg4T@z5UQ02{wxLk3Z-Mizyi!Fn4WC!rB
zdDU`b?0(~$(_~vAJkDV|W(}m~_u`E1IH$Q8oqTGM3w3s)^LY{GAxJ02iqA2dHo!zW
zv~n>4@^Ny<$~q!J5tl;X&yptVh*=q^-3i_Ix}z)fp>ODZ;`D(sBr$E`Y5`vi^bJH#
z+;0gKVosT;??*yx6)PsDac=X$j3ibgNj~Jg8Bb*Y-V!%ggqB?IM4QRG@B-~a>+KHX
z^ak)3_&GzH;}TceP&d45g|EkxJRY+3(Mgc%ibv4bCk7U>z?4Qb-7)S3vW?lo8ed=%
zLzDl09nsP2TQoBJmop)K(StRqH>Ruk>ko%7-z}X}K+`<9Nn*q-JU+|{R+k&ELd+3-
z!bA5&bv2eck++{;Zy}G>g^$kkcSoV;Z|1YVR>Ag1A353^q$gr`J79ZKj4w$<v1_0P
zYh63ULmHMNM{+d#IdnhLcqZRuWjqsF+WeeE$)tXUaYqG=UkUfj*j34?FDzCyy{d6D
zeIutZ?tSsm+y%QWMOZnm8n1P8^Tdq3G-~EQp`>7R$q)<VWht0&uqLl$u<NC3rI#CW
zC-5|G6&$l_m?MoklIigJlTW0S1#nxw?~{)GrAF7^<P-n>3gMq6U7E7jA2MA$HaJJD
z!P5L#Fh25F_r7rbbPU}L!C-xLmT08US$Xb2|H<gOl*gcFEtyaT5aN0O<Eok={GU?3
zzxP^J-R0KYPwohG<-msZN&N`{<P$+D62YQ=xN){pfec_<;HY5rkkaD)k_}z-MapaH
z-WqGHvZ!-h^23dL_*!8GJ-_fMwO+%4Yz^6MTpNI>78y{t!BibCwYpKDtn3MW_oa0h
zSrdGGS4h~F=jlOjs|+y@<Q(%cURSl>D+}g^4HgJ4Ky*sps*6KD#JUzZ%SK~8$2{iH
zf(9x#*Gm*Lq!`Xh&=Xf#0hwHWlA7K}s~asY$KuUE@9F=!n^<?GHQK?7cxWxtsRMgw
zROtF82VTu^SWmSV7oQREZB@6o+0{~@J^Lpq*ifR8dj5^V*qm72jRGzCdb+{9xx)Yh
zc*(#_zB=7awtx``3~-shWlLv+(>mq}a$FKJdy7l~>)P~UjXVzo-q&x3G+}V%xT^nr
zjF6E%L3>Rmt`l6NwfM!Fj&b#9T+~m0IR+TGF-PY>h=5K@P*xWxQI<pljmpQ)*3~qR
zMgnHsWamars1}t@j2^ft)rz*Au^1C-r6VTo5)SUG9Yv2T0wej^CcD)nu8Ad)+S`7n
z{gCn$+|Fsp&Oi!@TP41wiM5Nyv!aX&tvB+?osO4?4yu!mlFs0H0kb2S2>9Xn#n(>y
zv&q3wD)~2lgrjck!9wIC*H1C*!T41eh%%#D3AS;{pa#S_nCddqEHtw+aT}3ZRmZeb
zg?>7c%gPsM3b@SHY_X3Jm?YsFP#dT#Jj}C{%A5jkf$oVv7|;JypcAHxt+IQkE&6}S
zmihlq!$QQ>z{vIw8JIt$w*JLi(v;sj77CwVWo_V%C|xQ7VS?wsCa4JW7n%x(C1xXj
zLA-aIPp^SL`MO{Y%hwN0;L+aQJLLO|?3H3GwVIm93SgByJe-vFu$#i+@OU*>fA#_W
zoE;WVl)RCixTh4=L2+0LC}}4a+@yo*K^G*lJXetm)aZiqHU1q=C+h*~X+A=eDcSyw
z)}+c%;x9CnFPGjmw0jZU<@uzZn382e+^=aMuDX(J5`^bJk-@j#w@l+uU~2u8eu7F#
zq)^E-c7qxJRcRwJ!J>0H&R%K<NpN@rO(5_15T|dmRzFCxk_TjMryoST=A4%45z$i?
zO~L)N^{zTMR7~~gr{+(RR*ko$YvP(<X7csKX_399MN}<^yh)09(H5RLJH7cNP_1^b
z_1yXXhekiO9qqT(opjo<ET-LrV=AH3OXe}-$Ji&2YJ25;tQ$0cuU$1y`cR{)u*?lp
z$~^a_z1a<PKDZ!9l<wQ#kl4A`WYnl5h6jz%qjO8hGgNegWiXc+OUO12-h0h{Qw+h-
zoQnGs6A@r|zWY-Qen7mIN$jXixJhhPr&7X#jjV7dZhdttFF`<ym)7?duP-#_w#{H?
z8Qe2eI(vdgTz!$*4}}7II^RBDuiKA&-D(TLGz8r>El)1NqD%7<fW8i)EMsiQYM;Wg
zRG3~N)sA02kVi;7MobG(!-hHgsrtX_Jngtq$Y|wU>$&EyD7Xoy5!-(k@1yiWRg(yx
zIN*6;nVjl1p*P464`k31n@%htHU{(@2I3sJ;=vN96$(8S+LlK(dm}`fb;Fdzj4S%F
z^6O4w_BlPSbbi!m5BZSBjq<aK#3G+&fGwM5fW4SzfFqw~K}B05+RMkDtjN6mkyb=1
z6m|=R^M_vd7rcjHSt!PA-N@1$p&y)iiG`afiuX$0#>w->sBAp#FuzxnE2R;PgZH8R
zr6(CFWKDyns!ve{Ib0A(@w4d<^%^DYpS%3G{qqOvQ&eZas(!OhPE}A?_)}!5o=xTT
z?EP^$|D}N4-+EmC-DdmWiUJKKoc9|xQ5f1jPTXEheXe*EA24qt=oBgb4`8C|xKQ91
z0?`7=?VVL6rK*hEvOk2rUBW+0eiP<+cQoYSBc^*mEE=4s)(jE?Cx$DknOd59k#Ui8
z8QYKW@_NB*hrZ8(lL@3sEb@V_MoWy@@<1!!tjt9xsZ|dn^-vBoD(&y<gG(R$y$7dC
zeI7)@r*fVYyM0+nMraTnEG0>Cuie4vYa`FZ?4H<R8InBfMqdX^TGBM<N({AuWa&bW
z@3_%x99yr8NAF;sQzB}h$xw*t^GBmnun>J0l!dFMV{+{>)~25pW)T|BubcC$?VfYo
zoE96woJ;tfH{g<RP|H?B@+s=XZ!}XBAfygVBaiWE@HMH|=j5obqtw5}lnX|OMb|Hs
zC1CF!cWC9OSLPTNNm<HvL}jA~z{!PcqOTe4TUgNb(1{J*6b6%%D~S%zO8agYGo&6g
ze+W{W-_5o%gCZ4%fVH_~Mm$_rM>PITvLT~x?6V=tkhv@yl_+LG7)ZlEID4(<SGrTT
zg_%>hOg-(=ZS2<q>?IyxSP8Y72u9&zh_Vg4(jZEjv;ysdcl9bJr-!|e!ns>ofXGuF
zvnCZP1oHS%=xEY2M`rc6mUjV82t0DDFhi>&mp`Zo?;^J4z*Gx!@wm`}q;;s7S?s;<
zStz&EZOboRwPS#LZnDl%tP!l%wI}lD)eRVjB_@02G|xUPsd04H4#DfX8W^`e^Q=};
zWkTuV?Ebb*>NBWt$elNvH#^fgG+$3OMc&<I8EvF?vg>3K@(jDZxHFdato;2au;V=q
zC!{qP7>WkawO!OV!U1`~#?3Nj4uU#^W?@;k8nSlnHfLnrk-;*SMdLt8s;o_Tb+~9M
z%iKb1mD~%#9t3AJj{$l`AEDo>+YPZ-pt>(&gEy`EF!A&Ln2QJxktR<pT{f_n>bVk&
z1O<g<#rym}H#Q(oe1Zu9h5IoP^sTBB!An$R7oWP?AI7*r(0hvc$h4Lx03)kQ?mGnm
z7~;|K8C6#wRD3Gv7OgBe?d)dxb38oeX#ED2X2sM&izuQjgQIQtNlKHCWm~<fG4-JQ
zWre*46jmplZG>)+zQ-Uj?U}<C(vDDHYE?%}wSJ#-=VdG|V`@Uqo_Xu0`&iO))sdf^
zLtXAr*Mz&Ym)Tvo?==kNeR}e8(UT~U&kVnQ-)-^ZLs33KEjqn6F_jPFBe<kkrUSt-
z1`$t#tlakz$fJOWPwP-EPu2Ra0h#OaXPZ3WQOfYE<Yr{>{r)Gp3ZviWzu`}ib6Cy`
zC{<T~#lHDa)26_rtsJB2Q}Tde*TVeu1!^qDGgbuRW)(2V#dvO%SvszM0T%~gO8X_>
zbIw$bq%d-heQ23k$K)%eqj<XG<<;uPsH9tsQK&<@EBVEDkw-HJDF?Gp3l-W-iJHpn
zfl|2w277_nv6@13fxCBshHM@;f8JoY60&dii9(DGvK2)q_k?`t?2GuU?D&$-a!gdd
z7p_JG)#to6%9WZ`Pq!w(8Q(dzYi8!2&3zy0b$nFJbhUPYyJ_rUdi#ZK8M_plvB}la
zt^kZL^I6=;Ss3P+TsvkwX6=^WMOFxdur{U20+MT3Bj7MX=my`Xcvwh9-!Gdg>yds}
z@Kb|)D?;$|&XldkcU*!E@fgvfn208J0k)VyuG<NDT(T7D9SuxH>pWVH^3;yFYD&3H
zU{oB=Sf;cY{f@W@{Yhv9g#<t3u2b<XnSW7u?~h5vi;rUz5_K1}p;5bUe;x(RhnrH<
zzZ3iUza;j53!VSz->GP1Y-Dd_ZSW5h&osrgcOSdYudMGAjH&7(hJ4N1Iu*j8O+h3|
zO%DZ+ad{Ea&8^)=nYz`8s)diwIUgZQ)_uKxdd0Fgxu8m1efgf0mXvn(WNdtQmyyx-
z;doQ_6IeNIPVmv}av>0fO~}%J-uRp;N)jY`rY;RBC(OG23#yNiH3Cbuw+O36&G=dr
zpMm>$$E|-WYE+3u;^F?BSS=}v69qQo)TpztXj>^tn#7ANl)_FJ<+wyTi5x(;w5Nhj
zd~#iMRq#OQ^zE!j8ee+Sd-|;Vi(U10rTC*DHBN%WTIh5l@a^s9+tIVI`Bl($ZoCGK
zS?qqUG=4)Fq>$ONb+hvxq>wn!Zo<-Km)0>3?lHc(pZ-{3#Yd~GWrUnFek?An+^Kxw
zNtL$~&Y8$hJ-8xNGf)f3I%nYA^n#YYbVPP{w*cdNML)&I*-MzE>-U*|IU2KN+ct~k
zkmF-!MquDEWH7J1znDqO6GW-|9ctWZi;}A@p5si1N0m%fLQtm2Z>MR>YL)g1P{_|K
zY?7{26Mw30T_SD5>LY!<qNh)*F83K@_Yetdw(mJx$(~WsGR{@Dprr)4_0kBc`2n%P
z4eDE89EY9_dNUJ-$Bc^AGvpsF<^w%i$l>=E^B)@a|GCBdw<70%oRj^tCLD<ydhao#
zg5D$)3mBjzDe|=8Ai=l6or3v`-GqpKQb-Dz%g2kOxF<Ixxf1CT-ExEBq(hKc>kD8U
zt6vBQ8q6tEltdbP(?*Piimg4HJdX`W=<2=;)B2htC^eJ{b!CS`YEKlov4mJ?pkmf!
zZr%G+b(!mYx0*V1E#C9vnW}Hf--7CN_{|JW{S`6Qn;u#l)M+Vdq+_S$s@2k}O+47R
z#o0mDC2Hp(T{I9`M5#reTFO=Kihirv>E59gt$FEWWVf)LjxrO|D@~FP2I!4Hg8N1G
z`wZS(gFs6Jm^7JmW;++3jiecW{<0!}3e)yWI|JmwrRd`+2RW!1&3n_;F3ry}bA)t{
zXj#S#HMk4LmQjD}ht@rq(Jd))RpU~4aj;Fo*qmzG>F&`kGqB<u4e=?`P2_ZlC6zTx
zFk-t6->7|e5TdBGe5=kvdl0?8k@)3m!q_3k@Zb}gTfFPBuxJXN{eWUD^ul$Ng~U!w
zpcRs1Y+8>K1e-i#WKWGZ?jRIZgVC3WshZB-JCd%J%3VL8(Xs#~mqZ*W?~xf+aPbGa
z6yN}_a_D?_O**Udi?c}gBAM=a9mQvpD)=utp{$?N`bMc~)CN@eA}VlR5{9_pW3pJi
zi%c54gyGN+FemnZ0-2biRwyN>Vti$nE*OGOiA2~k6Q~I~1~a1E<Z4j?R4j)O$6M@i
zqPR!w-b&Y_!WN{2mLz`K4-o1*@RMht4{HYP%K`--KZ{he3svDGn|~E3BcmwOe()Qn
zH+iEAckZ9CW!;R-eQ0>&NR3#-uw_7R{3(@~MImRU#NJ@N$r{}M@~1Jw>vI&A#XDj3
z_}?R}|1+@vF`lbcUXlI7+B1KewlqXpxZA6vIIql7NZ*HFyvE#zGWq9097B?IfHTm!
zAZf+wdeY?_t9e#<+I0isU1^8Of;3+{u=d+A2b0Oz!{}M6&03oWWJT!VM;dLmTs`6d
z9M)aCsr;id++YqGM(Mi-8pqm0IJ~w+^rn=uKtkQMEuK@dO1hOsf*uQi>heX7U>vZv
z+;QoKQxozBa)W}!+D(`Gexy`=J@V!J8EgVS$_6W-jCvK>jcH%fx9T+DM{`Go3NF4e
zeM1kFP+h*J&--P3z@`K;v;U9YlxUJEryaY6^+mS3R(gwQ;0NDoERf(FNd%EV^i5U{
z6^)Xc10H@|?z{xIobZG-QN75t3Q+iK1_3qDT)32*^gxX*XoXi^1`-VH4O~l$dokV4
zbN}FCAD2P;_}+?9f*GvsA%gPRYNOtxEbiM<=4ahdUYdcfx~H1o<lIV2!&2B!bA5J`
z>c8pY>dyjBuoJ2VT3&7xcFY)SU6iwVF8bM+xS8mGO7$YO{0zt<R}m((3~I>H<cP(M
zRj||B%6)G-u-n=$bs%d)n=nYxx!ot3G%zV^V5)+gB$K2Xb0_za7HmTJdz2&nH=}xN
zuhT-&M(QfQFTQlz$8kR0>Z(rklbuCWZef?5;9A{C^V%%Jd@e|jHVoy3j;R@yojCZ)
zSY%kN%=>{_1tF5svvc0vAeb^6efY5COGYw7PViJBVLA(hfF{%~zPDkZTs-g3xFADb
z;wS45xye4mugb^1iBlZI6K_{VxBkx%J}vVR)^Q}FOH^@uo84c&?XYnleIDz~L#101
zYYwHRY?EYR5EwH6Gubzc36IlU|5I7yq2|KV?LE%H|No2ge`xR5s#?99*M0s`SC$&P
z)dOzsAwsJO=SI<*`GqP@Erd)k`QGk#`Odc6(y|osn)I~rTi}`uNif;#2d`MW+j3L0
zl=&~L2dAsUqfAU=BcrSDCU$KQ4WPcX{musL^5P9mWKOc^2A?CH2JaM|27if9^)c+B
zT!%o(t{PAiKr?R1tYn|zdPn!1iVb|NDy(_uK?%^Pn7mv!_xtyNEhXJbG|;-C$`aD3
zi`rVW3B!+AduVuuH5wSu2K;_t2jUtbi{FBu+o)4Wb8N6t@fY|84n&<!OlYQ9&a>}P
zrI?C0cwhqjFn*&C)2L1A689#IiV^7;PpQYfV5j&6?-KTFi9}+Dv{G@sJTKj%({C^d
zOn50;NRK1MJ^jnTb*rzO+-LY?jKutN7}GpjY^w6>JW4A?74S9nuu_LA?OoZ6qI0Ur
z3*kgvn@``>`YSwa5ip~1t}WqvIJ+iVVy#r1&8V51GwbHfVY2!?@$Kp{8&i`NntAr(
z@frlXc-%-G%BfcZI?1sZekTPrFD_GJm9$!L<e~dtsI^`Bkp+KBDmc>d=e97~3`pqg
zG_#kg4C1LodzJfg&8up(o~*yBScAwMyNHH{8P}a^usE61uIkrD7=nFz<oZ(sPb_kB
zA`Bm|Wq)cSA~if9af<$z0ayrjyklx7qtIIh>fX2H>`kpng(rf8hM(NEelHnNpaIrU
z_!t%<XT&R-yFxfs%-L7y>J!KrMq-e)+PtDQRGfU*x>5X*Bnh3?tkDo?rrFAAsOZRK
z<guW0S4&R0DcnRkiR`;;<P^%*bOYbB)DTYv+2nk)Sn^q6dJD2-K8Y#rFiqGr!-L_A
zKmE+@M%}#f?Z|9!ZU=gr&_Kl8kk_1Np(cA~ao6XSV@{pBi&kDIWU%A|dJq$yTwazJ
zAJjeqcJ2&7UwoW95^n`+DBOxTzNI<L^_B^lKmxx@0h=rHYnd9msD)11z$?3~;EG{^
zZ6ip9)YAV4*%Pc~ENC7BS2K%)7ky1Y48S$6e~;OlDepdQeT%(v{7JUDp72rLPhLo^
zgo$11eg*aAvqraVIl2%Dha9q~%$7bah-FZeFgJF|hW**{nu*gTGW1z=fy4~TJ%ISw
zGi_|zCWBI2kZhRIAIZ?n1ve+_2J`DwYNibt1i7GR=zaJPvv(zncNe2SNE%`t4bb_W
zpxOMT$&kR`>1;|m{QDljKUrFt@}HXkJSl$cPTI-wf?3N;A7sIuuxnwIzan}Ui&7RV
zPv4bQlfZ|wRm~w~Kq9kUv_qdO1XfzSr(iQpt<^NVv-ecSy~_9AY=IgVv_KG9W(Kau
z2Q4+k09<5B^+wtoz1;yJ#HVUJr%z3U1TZf2*I1f(Xt%h(2#UQ!p=GCE_WSum=+|4B
z+>mW)#X8L*44g58#|*#Rz=N!wuFn^dgtE#SeSlfS5ErcYxFP3we76JD(+aWcNQg#N
zqp6T92}m;TRFi;soR377Pu#&DzjvH_B$J4{)1<OZWEFtSh-UoC-+Nv0Zh}o%nPvU=
z!a)3`S~F8}+wMAPOX&AuztSt1oZ%D#1R~~beh#j&o>-3?rUm(ktFAE8SrD@soIZXr
z`*nA@^q~@#QtgFz1iQ+u)A|Edw1AE7e(RxTg+jG_XDTF$6T~O@p$5whLVS(+pIsFW
zAR=s2M((tv_I9$ak}HZ&H~AQF<waEH@vEsVG5a~&C%N@01!05q8O(ZWA2nMOh@^wG
zL6<?%js(6IO?$IETGfSyuHSplO($WE#(_Olak*#%gHs0C(tMR7v*`AYF$JslP^xd<
z%NUwF^l}DKw;%58qC}}{WoXusqeD133`{3do2h5od_2WouRgBgcO|@T{aQB%t&N`V
zpm=PMf0b5b?xh&S62YIF)G29@b?_EmZ70$wx$fmhixaeGC;rqZNM!o*rvT@JMX@Hy
zd)jGuuR8y8-SGbwlK<dWWy(4Zll-VW@ZzR{wEDH0ZD?qPthBSmQ^km;1@zMg>IG*@
z6@uo`M$w<P#wM}adZE33@(o^CW8-ZX33eIYoxYpt{n)Pf(>guVyBBcTpx@c9f-+~T
zgUBXLv!3s*1!c_?8?ao0E2?F;PN4=x>$T3neb8TF!u2BmXnnk-aF=!hCFuutcf7In
zliG#C61=z5`VC@5uixf<e<hv4QkC4e=!9uIxr!Qdm(%*ox1LvTn6-0=2<Jh(16!Mn
zfbwqzDI7B{#L0C=xtOJ@p93onE+~*|;6Vj%F+=IZ(1PTO6OM6EDk`V2Gm>C3620zl
z)!)kS0-OP2mRH?%IFh7z2Pc=2Pd?m$Wutjs{GBh5ON^?%>I)LRTtvaHawHN;pB?0S
zvxw`oS28BWRfYmQ`irXRAo^mWaIT&G4u{J9sm#&g5-atxt@Q>vxkoh`0-n(0flQXt
z6T%SGB&9*HfKtY0_Mq8F;WT+$5gja9!ifP$ku@@{8DuYJpl$KbkJp;bGJ%VLYB9){
z3!tgW5_x`3tpuErE3c7j>G+J%IBl;aDXnBx)pat(<k|v}#V4%C30cnrCiNF;Mgp_A
z4m0elZHQ9+cv0#~nc)qZYoTOWENteZYQYzjc??6o&<%pnb$G9fJv+i4J`x*GRqoEc
z){SZQo<|rFhP?hw{mt4yDdxSx{vmduS)w$|!pzvIde-Pn_=cRhwm*9y^3}%0#P1O~
z@xK?5|A+AZpE=NftxM%aNlA6_f9`v;AeeY8j8Hv-zg8{591oE{5kd7^7s$I~(K$4)
zisCNT9a8G>C1^(^9nH;>)RH4R&sg~WY|Q%b?DqD-*6##4Slytgvb5S#eZHoGRGxcA
zw2#(X+w&J~Bp)KDWahDHPC3fkH-DGQ)tvq+l!i%*A^9r~_}wjNJlIqYf%)2%0Qz&M
z%_W7sfmt%utf=%AE(XR~9;3V51d67S!;e)C7l*}r>d^U=<Aq!iRpeH3$>p9n0gH|)
zZA2~~e{6Wmtd3u*pbl6!PO2yHcf?5u4;%`A=pi50w=8?z>z=fVe8<UYkDb~J99;V?
zTpH<Wnu^j2<&Vj4_w?X6d^js4WV5Z<WR)S{FQPv#KXa!zf@J#)Ar}O55HCbWQ6+Op
ztJ-nV#tc|*CW)%946!OA-)$vwFe<R0pgpC-h|tXr6@%xoVvS&K2V>ES>ivw0jgKWk
zRuf52Az?4P_BqpVWr{LICBDUkwTTKzDoNdg5mn~hns2^6?hGZ#x1~QI{z#5TA9Uq{
z-a8n?f7!th{Cmmq--g=%8vNxc>HOi}%u|1xLWR~X_sq{AD8hCjAR#G^%IvL7kMzX5
zB0JcAdTi{hbu;0WD@Ve65Am$f%QXcV%SzRN$aJ^LvA6u&q-xE};{|FRcDJN|D_+Ms
z!M4DUL(opdEUp}xm$rsz>grhs#lM)qO~PeOi8D?#q#cLGBC6Q?8j5IN>X+4=DoNuc
zv)q7NS!hsVEjd&tyx-~fr8J&{f{`9p!Zvg#QeahH&GKOYo|&^S`TC$T^`*!-`g>!P
zdUr}E?z|4E7c8qTtCrcqTO4^{X2z>+&e)#fS&+njb&v%X#dnJkR&LA~A!{@EhzP9!
zW1yKRHq^C^RM4b5(9W+>9CU$$(leP$0DFglE|y}I{*%E;l;mg<(a&xK(en#)?^U0k
zM(%P<Q4>ATnR_gavFh>Cmu^d0gp+dP>z++c>%|VWk-O~M>*t7*TozRM(haIpB-PhF
z5!kU&adK|<+vhadM?2gkW#{?@A)pvXa!>`g^)p}X#>%a!KEmF8eT^=@VZd%}_X5IR
z-8XA)Z8ygckDYc1M&C-BAqaDrsc>09?By9QoJQL1Bqj5O;UNe*y{P%WQ8ti`s}Q7`
zwUono3Cu8bNSzyNH_Y;-8bYbPjL33^A02-5Sfpy?CosT=L2S!L-+2*YRMpKf8CcWX
z&u-W-b|&+WHoz+X0RJQ8T5fcyAl{*7_b(^Se=Fpaob+w&-xo9O9nFj!WX$aCZS4Pn
zHOjhwR9$aY?$?W&xf>Ba**@9v+1l`QWMw2jBl$H$1jSt^EPq*OG_SI_yU4h{uhK9G
z<BOAAK-_1AR?lfZY(YrqIy)Pi{J2_5T6ws6>XZ8*r7qji?ST!uEkl!wB=$|~TcWF(
z{)AsoWU)A(`c|tcy<wfUTA@?GQ|q}5>b~RB-SYmla1_vy$?=5W?UdI=aH5)y!O-G{
z7zq7V3edw`EId8Nqc2tFo~bz&+Nm|1uX^q^k!tjo|LRgYN}T{*MO+#lUhCZDruE$_
z3!L(~Sb0#1bQ2BCv$V|0rt}OcWDx1hc4)(T>X3{qLs+AcQ5_h#w|j>b>hy~cQ<Q2F
z&8ACLr;z8Hiyy+R<>|2lY3(W#c1PAV7AS>i{-A(-ZP|lO1yj6l(mz|cNN0g$G%LHo
zWe#@`o~_N2Zsx-MLV{vrF}p_a9z|Hc1j8<B7<EAn=Tp(p8Xw1xE{IY3*Mz>E<WS0q
zTjh#FZE&}=CXSxM9JB~FzeV%fwCJx^$xC(TFTVx7@x`kwxmr34Tw3H8^py^SWnT+o
zLX!2Nwi5f-5l$z&Ft>Gv(U>rMFnL-_*i0x8!G|k2KL3IzFsILaT{9^B^wIHUj!_v}
zu=#N<Oaq%5HkpG#`mlWbG~Jq6B8CjiDP>k-GG1cRwq5=eP#Hs^7d*=>A)n}thzeua
zDBJKW3ji|X{xa0n|AutHq;{>r9sZoIhtN-U5qoXjc>oiH(B|vui!a5gOH>t37-ZsU
z-V+ExZx?>wffcF*NFx?#nx~wX;H#0kfgku)<BqS;9|g4?WE*{&l6`|d5E|7<Kd@wo
zMVLg26`@G-_UFRT-sEW1_xC{0{>z*y^!Kp!UxmjXTNVEjFU^yek%D-ap);#rX;jrZ
z>Ra#)nDqs__;L@a>L*zlAc?qIwKSe@920$f`gTd;dJcV`)4fo<t^tw6_MPeKGVv~A
zj_pI=e29FHYT(IdF2Ie0k+SoE{K+jDKwwRlRLG(*w0Uewy%8G8LZ4G81%?MnHtx)Z
zv43}viP>71tlXbGpMzesu@!w)s#yC|S;~dssb%qH?9%~?8d=OJ%t(k5F{6t3H<&c3
zAA5a4I)eg@)6jfwCfmXft>U}(sO}|3sy`O-uJN(5D@SyQY*fs0Uo0L?3E?J$e`*Hm
zfI_@Dz8olqTL6tcQ0WY#8B(7`80W?O(RI_|bgG~id5uydk!BHe+tbx{BK2EH7Raz;
z+1juxM6qP_AyP_OXQ}EcWib`xAn}9+w*K6A$@Sznr+H6&NALgtOu>c!&d2$`pwK@H
z!#pJ!oA(uQ&n3Tn2_?<N{2C9hkFh?=&?F?ng2HJ0#oO@_nagaq(Ux}26K;5vE+k*I
z+0XgbKW?@ou8R>G>j(*IWd&+px^iEwUWJ<6_Kn%Bfi3rpfXi;^gC*E5xT)DUBzLiZ
z78(J0X7q+sDOMm$r3WA2L|oQ<$P-?c?u9IWl#$wZZc_)^6L;+4<n&O?cKKykp{x|J
z_ikjASox$*-;vo&g56rsGg~+yY@84=b>k%xhXZvq61vh>)6OJwhToJ}q=vdywb7%X
zw_+S^_aWmWn*4&}-9sc-Wt8{UVE<=|wP+p15EitnO_<Cd?vIR<a$(<s=LAE>QEH(M
z5()#;Vi`1sp?c~)b+L<jlO_zT*}D$UIKlCq(@fGlHx?AtYA`9R>U`V$@Ky8aDy_;&
z8tATNy*^JLH}3{)ed+Rj!!V$zQ7+}VP+lA;Ct!-FT|ztQjTwhmCh0mYr{~$hU<lDh
zm<ypWC<?@(U|^PI{Q-KE_-JaqC1P6qB@=c$bKhl8#7j@qnXORw^gB`T;EXw%is6C$
z{E+5hfT~+KcR>2EsEsGslk_Oy61E*`Et|j2^+P+iY*)IU2o2I;biJbeEwwQ(-ezmc
zy0Ow}(#LA)%D5ut)i)&rw7i-i*sx(>7-F9(ed&hfU`xWfUCl!Ttli0%B;>OC@K04(
zsZ!_f3>~S?%gOr`e5VT5{`AiVMeax2V61nXNdC)&DDrng@!y3iNkoALjyCq+|B(|F
z{|hOKj>@g(&c>+HujT39&!{MZ(L?;p@HOG_r&i?E>Vt9@Amv`kF1}FwLBcjI4|-DO
zaT#qAli27YJUrXHz~}ow0X@i=@xitg$H18`Y+p5uteM@Q4jT$m8CoP?Z(MqLlgbIp
z)ta$UUwBY8e+oY0S?Fn>Sq5S@G(I(T7&7b_LR^I%*>|#N<xBn$aYvMeDl*lUlL;SU
zC^lwA^?`Hk7x<-|3Dp43tVsj&?<A$`X&zm9@(M%|&ac!#xzcz65~cd?o%9MT2lVVL
zcu`dgUsNxtPF(WL_8<Ux@v<@$M|SBnuVjlY7)f7jdTWf`$HX9+c!MdvtDCUn#Y6(X
zs`a8|xji?!(+NqP5=7v8oXa^UXm^raW+)8gAycsfjPCvN>BF#!hmltW!5%2Rey+4;
zod*XcY|P`Xd==4)(cE<ar)ke=;P3B%)2?SPMcMeXx>vik1nRuQ%J27Y`k$di^zVF6
zNr!*q)c+hW|Ko$I{CNWSnvbd}Df02+E1N*(m!nT2A;LTQBot7eb8Na8XT49XnVPgV
zCf>Gud816T&t9Q(82<6Q=x{Y|LM_D!NzCVZAEVs8TUv84J?-v=sC^jKr}5`Zl~}ig
zV@RC}xq=0d+Y)+*0Gx6r<5w}eVp_4pb^upV_Lq}mIH#AzgjRAC@1Cr7-Mi^Da5??7
zx|ku499!o`SygX=jihn*Ftwc_%M}f2OvVYSeg{TR7+9NIqg8tIT*Ov(OJj7fwe1Ns
zRm@}TWcBF3quubZw^oS{7)j133ckeFk4CndEeVEcEjvNB{BFHk&R>zaJX%IuNr}|}
zfi_hu0T|BY$U>fasq6S}F46K#AivEBn=6km{RH5Q%y#w6Yl^uAzuw05rqHZETJ4<r
z(bJautfy$w8)jc1wF*Z^pYo8lAXnx8dIO6~Ls|W_@m;gYU_x6U$j_Rx>6=4=$I^AK
z0aJ~bFDqVE-sdY|py)w3*R4>}l?r7@jU%}gA6=)B?|7BHoP6fTuTh3ES-@1SS!6af
zEI1@+;3Dl4M~#xjHy6^co4CWjmW&^qgwY&2H;<}Ilm#bg#0XYZY^kPK(8CN%q7iyX
z7Qhe8*2w0h6~^rwVYTybnzyKxq$OxIhR(zc#P4*lC8n8h7Y;i()@}{I#Rk=gv4#nR
zGHSo9DfQdhC7=S*RGRp_sR4V=S)4*=@gH2Q=IBsycY<~_vUfE7s<1oEGM}tSij&?{
zVc$0{7R$>IVY4A>9h;_D1nz!7gw;q~OHY`C**$^{47aZreX7`Fj)+3c<b!MH>U?i5
z8z)5*+-AbU7(b0m)40w0ym-4Hm$CoEuEOumqVN0?wn!cSU3Iq{o`wK?)$zcpf5;Y7
zj4G-W`GEoXJ8B<Q)I|YWzg$%RmT3w0l><ptT1^?~89C^9Sz!2ARDU_%^aCyOcYWyo
zv#5USYfwLB)$D%DkD&RNPt(oi?QbyWc%&ItE0Y1Q6<Um#{G|ujJL96_BW8XJ)5ffy
zf1z%i)cKhUbt+v)#25u~hqb>k-%id;Gp!tkq2@yqvumim!T(Wz*yKL8Q@@wHXE1;D
zJjMRb^ZdWV?LU)$S<Hwv3d4KDLw1rzA_4ue!-X>T15PBpEm#qZFa%m0Iy<V!;lx5M
za)M5ieKS(3D=E9m&u)lw`M?V@IPk9&8|#%kOiw9Ecw_JD+^t{@5rsjVqtFcvfuFRk
zvwcQBsDW#Ls_2pT%B``Fz$#W~8j?RsRA!{<lN?eLS&g|3+c(P92$CVHDz6w^BOgr0
zDI^rCphh-1b_dzYS(tGpVIq)XwT}mdom?5}$&?4DB2Lw7n~|5HV-fI7cNRr$6Gx#%
z_lf4FH=UJEzRZ4HY^;~jAX9}CL*f&D>*T8HP3kr@<fOut^G9huGHCwHIkN5SKAY=7
z<@<ilaO`E+Ilj#1FSA{KIXtu0wZef)EU@BQ9y1J(xKM2LmJmwiCvIl}6;!`2w{X)f
zHw1+paPU)iJ1w6-r#Q41q#3a9P_HMAd%iZhP@wdk8_Lpj`C`EWxUTAl+uR<)57k2!
zFMb{7pBeBxYAu~^enmG0n5mkQQP&juI$BHyP08l?_-pm)Wk_BT4Y(C8^NTa$a;=ld
zb|KEdsge_%WomB5w`SYhJ~0&o`U*XteXBGSM?-nYQN1*~I2TF`FJ4XT!f!Q`HW|y{
z4PnK<&fuWp7)_!z>I!a={}D{-?Y(&O?^v(%m%01@C72|vtehPG5S{)nurE`QcxRHR
zuVfNOmR1n{RZ8)KF?D+Jg5G{rAK}o9kOX*a`IFg&IHxPST(u`~_yQrszraC<<K8O-
zn)LZG2MG&D?OZf}ziPc}G3w>}@#DRd0&blL)MNDr4jb7*nM~2!eGQ{bWwY&Q7lF6}
z2;nT>LUx_Tsd@OOu(})?i%=g-hXA@r55!ygE7;abzLqkQ3|fbU_NnF)<3EHI%a6Iv
zAZ%!dER|>v@Q0(LxXHKyigrZ1=F0MptF~ZN>VEIRD#od4tFV=^?6Bsp(YGu%QsU9Z
zc3C-W1$Wghe>U!)*S7mk+iqH!WNv_bqOG%E^()raQEI4yTz4NsuNNtMmj{j2o1y#4
ze@|G#f743i7krQW$esOVZOw?gPoh-GuvODw*^T~L-C+Ken9lx8jBe|LYnm%bnJG@!
z_0QA5!a46T`Uebf0LoHG)xxt*Vu|kqjZ?1eOkC|Ik$1Q<a}oZfv0q$qKPTFt8uJ{)
zZaLz)Y!!#VjaRnziDtQ{m}`8r46ROIyV2p@jA~okiBMVnOngpUl~fE{W5&|A9OLap
zN6(e(+V5<p>g7E`8{eD1<_kgzJ9v!TI3_@Y9=tYsBFh_EtGc5B=Jc&EwyB@0QbeHO
zHF6_aZAn8)8jLd&MPTQu)w@4|w77WP94}v|FYIpODk#$Zz5G~gV>VvjBwbt^4mvqm
z<oOse(`__9jyv7d`oR5aJ$MxdVyM>P4R0hkhPYV(dU$!*T-72pCFRwn%7cmACL$Kz
zEXS9)`a10%UobOq!dF)W?k0Yj1@2-Qn&A?f!7{l0ydE~GNLr8!^!!2zQot5NDya1P
zSRQji)GMBBdLoLj#m^2ekHzC&!Pdzvl*B#aA$;tKW6iGJjMZtVg+qkd$Xr3km>v>p
zaN(j8zk@KOzGTmb5Q(bZns39;&h~_Npm7U%fw@~334=+(3En6-$(Xk;5a?2BG=)GB
z;LDEs*uOy^{&{zzZjPT#qS}Bt!q<qR4J;0&#u2$7=Y!<+C;M1H_FAXB3wXNYHp7B*
zN;mUmmJ#7HpU@3>3qzHpK8DeExCC3OsK-B7v;@edv1#7X9{87NFY$NK{(q1$VIu=e
zpgqvh%=sTrv`0-#4o3|2wfCEQM<PFALUO(g9RenV#-x-WOdc%gGerU_x%i0`3k`8|
z#j$3Sg;H*vVlMAB<%!q6P+lQo(KM(y?r}cgxv<#88DndHsoOcqeBdaFY0qOX)n+tR
zgYW6-jt{Ik1e!AUT!F38PAc5Gz?8WlJ5mt*it^e(Ao#3MUD-~p2U%#Wd0ghycB~K%
zbRGTf6QlQsPYeX6a!Yp^-bSIi@&3|wct^do0*oI(in^{k=YX_tm5u5txv8Z9E1n!T
zBt_F{@Df-{#YQct<s4DA*FatMNuCWWnh9j&S`8SpFUzqW+zTG5hs~BLQR%X?tXkYr
zDNjQ6uWPNPcKr1zHDQ~%aUc`**h;_7rl+D?)5uGT{Vor#t39~P;cA`)mFnBTmrV>#
zge+^Wpvm+@SRTL}XHML^0N<!XL_H#Mm2}+pxi3rWnaQd!hY+8O?*&iaSNJ|I!-iBG
zE9bi9Ows(k2Cal!20Xxn=@X1jQqD%XYI8e%I?hXIR{g%6r%hZ!SIdFD|6W1vra^E$
z<|y1UbG>-fhJx_Q;0a+~U~({kWGN6EsLow;y=X5C!s*-&IC76wN+3n>U<PG*A%=x}
z_T(w)4sD6{bs)!TVc>P;CHTpaHsbgZmeiLWYVuab{3rp+kC3Wf<901Zagr|G$m-*m
z-Ktywl(bN%A;KOp$N0RI5r_KvZmwp(7;_Gp$7>g$w~mV}Fj)?%R0?V}qS%kxGBh?v
zu(7DrP=|j##bg}s*jwsG8<55JRhP*@gfJ@w@`SnH`)Q6*I;J111hqu<!UUTwcYA_5
zDcc#f&p!JD8)~DC)w%O_3D7Jp3IeIFa$O13t@E_&@Z>CiDYb1?A)AwSoS%EOQtf<7
z*lhf&&Bn#SF;H>ggO90DUWR8K7tG5(XHv9FEbGk0+`Qg-+;Ap=jlY*nd_=Q>{xs?J
z8!JECO^mv7gVrridLjgf=m~9jm5DJ%5(aG-pT1|R>Ld6or9J6+{=OSYoj2z>cz%o|
zXrnonSaysqYm@qV(?UCQ;mI5Fn+Vjon2>AO`Sw21H*zTsH;4p}C8kzg|Jk)%SMXn3
z*VH!##}Xq-lL_3{Jh{Fz;}Bg-t_2f}Yo-q}xkl&-LPNjDtJvP)^}PgCe)u831%15W
zjI=r8cN2;PK9YSt`b~Nw7D?_HbeHH?td0Nl>B5Zk4Rz3Q6On{>B!YmDBQ4gNF(@=z
zLYCYAF?Uzo9*mnPU@a==Y+wVib*c$WGi(MJ`miuK@v;2A6hWwqWP>DVsN@<$kkF5?
zdGD+ra`OQ~JE!&t2<L4WOu{Bk<f7O3#_DvRL=Qo0ND{>-s79Oy?IcaonQ2a+`;hgE
zPm0F7PV54nR%Yy@j~w5KZr1nkU>oLz{~7_mQAU>$zLSPqz+bUY$-jq7|E)RrFHri|
z0H#Mh$Q?%v?JbPfV*7@ZRW?nPFiV0#*YI64dNM!gI9K+#A^u`!-pP*AJFKRXEvi=E
zh4ff4T#%wBk6%a%o>B~=M%xMn##wvnGle|No#zX=hes@1PA$!lJqb1Vrm2hbZp#|i
z?#R;J?O>a3>&JEUXQ2+(VXFD?r=xNIyP!U3_Ep^wY>%H?zHsckBxD52=RgnP4oVN@
z4xxL@zApVoB)jj*0v|Hu<s<soc}ekk%Q9gj98$}>OwRp$jJYXAGj?1hy$R%~?{Rs@
z>_A&skXq-EmG>gybaoy|TQovK5%^&i@w=F2JdA0fOodUxg7uAC$yP_KJh%IOPD7Ih
zJjpo>KRcGpNC0~u`qVJFJ@Zd&J>o<SswL7kO!eAp$b=>+hf-M;rwF;684XErS0qg@
z<lSrp;o$OWT_q83mU0xBD0}K)Qp0CTze<FBI18)^k4d#=61B&M3iacSP3FzlGFYr+
zA7TEKs6fkGt^sm&Cg&NA6%f6SFHlam;e@dXzBZ)DG#e0w%gZgXrqTcEt1mSxES&+=
zL#k4!c5sZY0XT6e0lfK-78^KXKkEKk=<1W*SJ;a*K4J*}g`_$vj8uv%*?DO`QJ9`9
z?;7qMfm64Uh~AYBK2gzqhU`>>kUBo8Nl{KpCWIyJvvoikm=a7(Z>jnFZkxyD%>{Mm
z6qjq#?&lYCu`r3nhFB5p0L}<MH4CTA1_rDO)yBz=r0F!$Fp7^U;N@AAeSrZ`04&(S
z4Xh28F6nvPF{Wc(k!dU%5@r*E1YvRF@(9hw-F=9BvWO#FMGRqMpDmo4m7MAzQ|Dm9
z%J3Y{ujSyX_1hAGs4#${D}fZh>wG@~E!BSFlf%g&3c$u?Ud&durlTZ*Q@=V$?X3Xh
zs7jJhvz@Q<+a;adtcTwAQ!i?8MUC+%v#D(=soegZ%zRj41_{*R%(SQ=GL${QOP*<D
zjdWjVvYn=6eyV)vuq|Tnbg`UN_a@Omp|E(lgK@-u-vK6bxoRaaNPoP7W{QX?LpcBw
zvv}v`ypfqvDO_IS@rQi9m6f6mA!e5JA`h)6V;CC^UivAeeGtrGzZ<Jdkk)p4JU7LL
z+uT<n+_w$n(HqTZ(RiLhEjOZMjw8>9z@yNV(0Wqk2KMPij)HVq;PrN9d@N<cR!UXl
zJ$he#k$o1GKcP-X<hKO#U{}foXDN4guC4<{>X>Ju%<R5u^L!m`XQos-sirqsMylGM
z@}eWLXfy7gE{d&&k!-8!m3!Dv6)GXPRGNQcs5JYX(J!mm`Kx$fh!ypgz?@rWokOCn
zb>a3k2Z!wMsmot5qEi;Cco6)u)z;rH=NDAGfY4UGcsI=MDY*}dd{%ltwLdMDM^?OG
zde(0L2Apreb%&;vN<jk?H&O1P^F!b|mqKgn{6&con-Q=44Ar)CpBB8fg_!rdFcXdX
za6xNmz`Qe)ulOG2b$DDUs6jmfpMxIP3usEY!_06@-IS*{?=~a5X--vIcvp{BVuK~<
zUy>)VlEi3$^d!F=nx5N8q%~*%>?D)VB1Pl&TcsErIIm^hYCK=TsH+qnV>J+L1+SY&
z-9Hi!xs(cZh-9yX)wfpoh(ugT41k7b(IfT$1y6{ba&3=dfB5!_5X<A?OW`EuAT=6L
zUL;(o_j|Fqd1u9#TlOfMgP87cO2UK{1u`$UzqI+Hh4}Q`8axkOCc}<~_R!ETVmmhQ
zE^ga*5<n?$Zker)Q|Grv0;H1|h}~v`ybOZ3U9$^2<0?jxcr_ip3q9nwAekZ^T977M
z(zR}H%1|vQZXorFknff~>K?ps8KlS~)V)bNfjdBqohCyKKsMR9Wn7D%9*HVLN~l}P
z?Fc1qZHP5A#wWnK;g^_57*mUCmHshX9ro07*Z5QV^Nb;Onur_4y<MQHh@8|C9)<XL
zBA=MV3<DFM4X;uiVyogeI8B?cj!We;=4z!^u?W-p3>)n;`kH4(4Zt!s^sd|NU*?>-
zbJvnoWkl3&t`%Xgb-t4r9|&Fw$1)3an6Z5WUQO$08yt?fi$|v#;Mk^AvbfGM*?EIL
zhb=NXn)X@qhg)}O!HR@h_gF<Q2JkfC%`i7%0M&dVNeYV>M~y05?04;gN{m%?v_S~C
z{d<NFsdA{>%@6_m61E5vI)^BhTKrCEAHAFq-jt%fVoI*6L{|2*Zn`uq8K$IixbjkY
zu|>w^#07h;%AK989L}{xM<89VW<1EmMmW`mm-hFvlE5$=Bhx|uA8l_L75Cn(iH6|N
zxO;GS2=4Cg65QP_K#<1WHMmP4NaNDDySoH;2ohx2`<(a8oLO`CUGH6UztLY=|Ek|p
z^+-9TReC{jLMhEfZDH8=Fy3752j`~bt+JWvte-eR71rdjt_0KJygEFo*k(*;2uQV+
zPd#TeZ4uhQdUnG2qm8uW;HYq6u5rS0p6ZCdK<PAm^G9;E${r-><&3h*9O8GpT^!qO
z{o#o=j^RJ~@iXh#?h{Mx#;)z}77WYjmdfSkK!OS<yjLE(TrdH+(Z4gC5ksVlx~*aU
z%gO!3t^y*c4&grgy6)gh*WSTFQ9wwGud>o2&d@22%u(78h=V#boF90u4gP2b+I?__
zJ#A&24R9A6G2csmDT5BUowfIhnoU18?xll4Y1w3=Z}JP~milSlR}>rH{tT%QTsgO6
zNDb>`U47anPRW$tUFVkkGb5p{awsk&+UAw5*#f|-!@`>wW;nofwkQJ>@QSF5sJ|f+
za4U8yvTBZsyi9NiI8*EeB$3NNu5<^?`1r@SmrhIlT5^aFSwH;U1bt9<Y{#F7v1-U&
zQ)gIIR5v;_&*XuBk#djMFttv`6{UY=;bMdovmvUuJM@e=<yTpn%GUD}&f}3bi$Ch?
zhOXPpSE2Q`L;v`5@B^=8cuj70LBgLbn&7^}&d~EehyJln6TW^AtkoDB{}GvROT6%E
z|2}x#6a4=Ia{lMZX|w+ca>lin)d(eU-#8igezZYRQ1fu1?JrRv%8WrkL6X8HkQ<}*
zlk<*w7#U^gSX!`7dkuPJdA&lvLX?ak45(XI`285Ml&ik(f&K3H+l!U>%RTa_Ft*2X
z9#)e_Yv~_8|IO(y0i#?20k6=30uMBS^IjZ*oL&s!9o)rRS0DVmL>VeYqD9qEQ37|}
zKA7Ta<-wx%g)HSV6zY(L)8ZnGsZv0e^(7%NKsN<piuHFNLM>(^&;Pp0EjJ4yeGmCq
z<IPmI&sx1*8CG%~-MLbnSHbJva-2t6w^m~r-#YnhFV&;QLBN}}2Pi%EQLtsGh|&9%
zoSPZBay4A$z`e#cC;sk-%IAIJh*PYLz>FhqHqFe~6Sa?tpLJoclv5=SX}+C9Ny;s>
z$i7v-J%+hZQiyS}l_pY{lGUg!FOM*upXqOFJ9HgzXDg^=QAYHe6}=vSrxwF5@+P1a
zmeH~wHD(g)POXy6e#a{UW`#DME{yrQs=-AX!oDJtbYcbuFFOSS$wm44jRKO1dESn4
z2-nJqpSmin`DMzTQbq6<?AKY}Z#C-F8>enk+LT}9D3{J#iE<7USZ7cuX5?bkkvBsD
z-ET~lHe7eVWF@t^Tm2}G5l`;FWkt{*A*+d9==qhU(zySbim@s;7jVKERf&ATsp0Jg
zlc?{tUgY`!cogthm|~Ly46wzH|L{VnTT9egPNI~il~NL4wO5@<LH|5IHY;@)H0!F0
zn~Auns8dnC!X3wB#sJoOt0b+acd4;$r&Od0W)>;KWvc$c+8iCTLnSAg8NTf$$eWmY
zl%AQ9S8X;DF(4D4HG}TjY}1EPfc;SFHkw%Kk)e4nBj{{HZP(KMgLPFU!I#W9HV3US
zXh+I(iU+7+x)$L*zLMB+ZdM_7WH)cJ)Ied(V_y7uxs=MBNBNS07AJJ1$u<+80I!q&
zvPsvAb<M+C)vZK@KeNvi1-u`W{LEEKzezxe%C43=(B`HxNH2ik5j8?6N*x>e18r5*
z3wd%DtBXuKD`W^q)C-N7){7_P#w)ZY_#;Zjffp?ZwYSnsq349O{TmmaVhzX<`nFlr
ziy%#uJN6G&J3%izV9GeVZ3IRQSg3S024S|uGsLMlvSX~H(_1o!npy#FCHgE+U4?&M
zuY5%;b|7nHxug}23w^;px0fUa2tzoZDT85L&Sr!*He|-0m}jGT2qbMC^L12-6+Dm5
zx*~2PH?~P?W&H*3c2^Lp>IV67>{RatJtp=(+Tv_&ViSfk#h*$&oWO6R*kv1=>83r>
zt@GaQUUs-3N_j22yvS;MVa^<But(Is<cq(J{z3|A5|c8})%%fIifC*yY1t<Va&)L-
zndBo`7EQ}+3}`jOPhT6Kfs4doZM1crvaoxNOgFEek0xUi)7$Y%>yorMIK4Q=VRAuq
z-xb+X0u_i9MQWt2cOcW0ZmLqA@T0y?dKs|ly1)$tH$&kWR}J8!@_s13Ej|z2=;a^?
ziW6*DL0xV!hmlCLHViqt1x&&Dp+E~6!H(n4xPdS@1GCpd+hiis=L-~7(+YAABds}u
z)@y({90(O;zhxwwzSKO^>;q@oYV_&0taOK#f5hLER%QD-p>)7c_~TRNN`o~paYQb0
zd>;Z*pHKA1T(QpvAy$Oa6Bsp-r>k_1tw~WDb_}(oP-La4P}^ZPrNzu{0J7M<&k_~z
zrNeACLEJ$eEhOTwEtNx90m+?nZ7n;@=xN^vR)9lT4}ZwpYDA4eu`~2Ew!bARzJ4d2
z(sx1XNjOf#3;Ct4HO&1YJJzMr9x#agOlsUv+;46)XJItg%JST|8Tv>1N;h#v0sASO
z?~@NzedBvft@x(Yrau70f>eNQ2;kBed31*o>aVCQGdhg%i@CNfBP?$<h0*vT`HL)m
z;GUY!IoRcz*{)wG*DA!oFXfi!TT+p&^1!$CZcXSq9?X>D<Tex#O>BbQwwc7hc8U0(
z1q@hda1A6T{~@n%kJt=^D;0JdD_#%S#SiMlnowMrxX2y#O-ero32H3tc9TkX^OT-E
zjAzNGC^K=fhbaKBWk!TN#@BjHYS)-Q=5v8>*dg<i?AzbVK??53TAKHqwlU0qdY|O}
zy&?R+F}458a`3<CAkEFcG-<C*jD(C~b7bL>k*a9AdmltZ{As$xk)%!F`5oi1kYnjL
z4CwivP}0+JIR&l!u9wBt{a6Gaw>Hh9e~#u`{ZS^!bhBjVyZOrQ%IA9ja&W->;mL_U
zlICg8g$IcHWQyCJqC2-;p%23e=s!Ho1R5ie<4fZ0Ks!+1<T_Ee*ju)=)NJ!wv-f`4
z^DsQM#k*aN71R8D&%ezI82`0~1=e?WCD8N-U#2d`@NFcs*q^&>(uGT$>+;)1?R80m
z0rRgF`;@*MYer=PTVNK0Xd9kRCn5)eP!TB|JZN|+yFZv1YZ$|jEQ!W_E(`(D+bV<k
zpER@W4#>pJ*qY^A<|lPyL0Owa2%aMN>=YKRRL%D}kmlmpVGscJFf^a~w2^#o?^(=T
zKf5;_ltgrueU;ttFj=ruF&k#@P@=vvUMfgrzgUXJ9q)Su-yoO9G)J^r?0t**fdN8I
zi>XHp4#?QmvOj%;t-r)^pD;x<W%#Iuog=m3(~HRB<7p<#*L|Fo<Ak`%!)VgXI!zi)
ziRZkfJnq4E$K`?OJj4327h5(}9iG8(q154h1GTk=y>;t{Hsy6T!d9=@SnC7+QJoBo
zR~rYNK`1JB!hTjF-W^_iRtd^E)|f0_MN`>9=mz#%E%an4Zm}3Y8m%;#=`JjDkg}!>
z=NOBA^$&YIDiqRJ)#v?u<?mi1(ttR*20P`;kptB_Q;SvBx9IAf8{ghvt2ZuwVSHwC
zeIR_=;f-8DU^7<SGI~NXXB-`o@Y%iwp!zm9dK$Gxf`&NF{$qSmZvMSp$ZL#M!R&4W
zfhe4D;$8VIvUY_nZ2p{7$Yugvh=p$DFsfG&M#Hhqm$)RWZ`oIK3=m_QA7&GMP(ClF
zyoL;++ly`H$<;;C!9?I`rYn>c+|gD~()1ljZ$T?=7w=fDgW<XN&KZuZ9?&LvvZ-@F
z&nyJKbkicq@aB7<6lfRBq7L^FyXRmY8K{RLJCUe7)aGq-V(rE3*sa_=jc0UAxS?8P
zU7JYl?k3w<3bWzIi>n>gP6_6fxK;mVDePh`lqOX;Ky#!0BX_7dBOK>L1AnV(F7n&>
zX$cRUa7=RqGxgz7q{zSPZ++d;8v&=p`)Z%|AB{co|6cWqxVRX5|Ai(g{{HJ<N{he5
zcK=DhY1*n`SYrBb#G8>axFqD&=~gMMez5s5UlB;71x>CkYFgJ+Z)cd4GVZXp{;3Z8
z%$)Zu&A&Myu=Xq($Ig=XcM^Nf5sFPIqre3fgi9Sei=X%X>9VW$gzJQF;^y1Sqt=Iu
zozV|LxJY@BrbrYqQM&~pau5$J*xml}946>#1ZZF^XL%VAem92&MIWS9uiXa{GScT-
z_@hF}v2C9ZB)dRv!2~C@UVgEYAQRhTjnOfe(cw6{STf^pbKn#k81G&d5N82>)3`k_
zBHg;Uz-EPwU6%=?F)2!A+zDh(<KuP|ozK039>+xM6Dvi1b`-j*?@mL5q9t)&>Xw<X
zH~RBe`ULx$Qw@y{(CD<OzDV3PwnS>TWdD+)e7K3UrkKWOVh3>3Xa|EJYrv{Hoo-$9
z)C|dyubo++=L*pn5I^$>%OU0pgJ+UpKo6qt*&<?1QWtTRXMa#<`q^ErlaQ9rXi*Vq
z*sG%MlhYuX-Hfc0n#k-pT71^+@<Pp~BcP8JVPmi4Tq?QCEY<4qb8+oQxp%+jszdF)
z3UFopcS};wl<KlNuvH?L+5$kiTi^89@gb0*T}O7@$zu?*duzJ4Zxq`JW3P<6gz|$K
z)bH49|NWoExt#q(5(Y(VYo72GAw|At(z&I2BR`bePS=UH0t+hEn!p_$9RRLo&b~J;
z##)<n%ZwSQ9g7LoM-Y{l)iU}a$SLvN1c(>rEH@xRm{^BWJFRawkk!atYQ?51EjMMh
zHb9m@EhZ%igh=8x1N{)w>@DWSJ(eqoW{?L8?Dvg=AmxG>!6J$S=;tHalDWFHyTpP?
zPG1HNv=gpA(4!NxMPDGd^y%z#$UOvY?=Y>40y{V}rP9iL#_$v`;w@T9(CQ8|t;>@W
z2RT;rIm}I&-Cih<xj5zs>>)*^GQg<>G{soHk<5G!H76!`Am%g5KiBT>@(GLNHnj#8
zVC3`EWQ1ajBHXh>ybKUS1G>$cn$}3av7w5+DZBAd(z@hb0dz}29dc%qSs4|Y8X2kq
zIE;};(7ubs^JEy8))1w)f?vt6GFfgHSA*EL-~c)mtyESH$d3IgD`HPLKCa~Cq(yL;
z;Ws(vr7f3z+J;~87E?B{y7zJ!?IVnt(}%3pMefN?U`<+K^ptK2;b}?o1v}YD-G9SY
zihsq1Aa015-<53$>%MHI_w1FM1bYQ@NJ(c><%H#quTO3rStuzluD{!|zU%LD9oe}O
z&A4rdLUNquhhkAFNcA8&ZWDE<i1SLSLK*aLsrVqo)c#>@7jg)>Z5xRukYvKe1QVjI
zCRGh(e2wFkF8Y(2ePX!N!+bd|5G+JxA`p5@cn8pm6_kPmlT%2;v9t^C&efI1|7j<^
zaJ2FXnTWrK&U|_%eN#Kt5xYUTtgU%NyS{(aL<6W~r*by@eiZFY+X3(9#$PPCHq39Y
z96#B3PU8Qr$v1EkMTPROjS3*FcH1Cz!%jI<&fv-JHOMZ6=8fcc_Ca9>#X&Jn@l**H
z6J-vFG3?OSKWA2Tk{<Cjzv9g$DG|i(;9e!>WyU4#6?);&I53;5AK8lF6pv9KUbqsu
z-@<HwWlUuEg!X@@rPI|v_$Ms(HY+A7CRw1q1~@7A;=x-k$}r0u(znYTrm+a`XG6Y*
zyg4=`f)q*lp)t0Yp(1bCmsI0!LaOU~CcEhf_`fV{k>X^+g3oz^AaD7Fi%-LXP<5cM
zXg8?X@FO}=l;24Hl0>LIJwg+`OP(42k=gh++w%V-v+*xf)&DPlbuw`_ta{Za6~Ff&
zflpefSP&|CsB#s3>N3wDeJyU#2B)VM*=CGT_jjX$@2n84nSXmsmWw|rZ+26CZuy$A
z?wy;_lF{P-^7{xekW`+l5N~mx<rA!0SZs7G_dA+83f~4Q?ieF+ajscd>Fp{e=0?8X
zd!g|IPPZR0XDrlTq@2nQ10pL+&Vaq1Ev7XwApVBMkaCW(P!gXO)nz<Ws}v{f=2QvN
zy?i4h9-ubJ4t6*i$k&&Kl?whEO6HCmoqd83u(B=k=_7EttMoe}LaLS~%dprFGg-Se
zk29yBZSxAj_`x{28qaT}yk}UnpX|L?vEt~8CANjOqmX4*ZgTr`pwCxbzF<k3kKuM-
z<}oc$!_rb@esM-TsgV$wj6CSQmtY+go4Dkd*CR=N`5}($e)`EQ{6OmgpNl^KEZsYC
zN@h@`baAvTHjcQJ&(L;B|3{n$j)`56@?8c_Dot3^0n9s=MBhsbas{=SO)%HM$t7~(
zoKm`!?_hk10u1@-NOMe@dufc8+GPL^H|!+nC{fCu`?>>Sv#*P{H2mboR@msSzE(ia
zkjoa~ExNRKd!!LZIxW-V<G#lOf6iue`Uw1n-GDE>Rr3vg&D2ZZlb!PEE98Mw?nslM
zOoee`5C0Cq6ia`6br?j~-UhrgQ@RVkZOVI@SpsrWnak#fUD8CB(`3)l@RjUGxowD5
zM>vYi3a4AlBLeXqsKA#`U0huoD?3U>$fN3E?YB~Kc)++_B&Hc^rP4`LF@7dn$h?dZ
zv2k^l>yTV1MYXQ8ym=_Ha9NpFM?{A8u2AV#UqqxMd-2UA{vbtsQ#S&yV0I3Cn;c=B
zi5bEa36W-sREajYaf2g;pcU~wa{Qa`Xub<lSwMR$f=I)U$HzN*AAL)O`8+Ty^Xdzj
z<LNQW=(b~v!Zg#cXvNraDUazjY?3Huss?UhIqaVY&IjoFi2*TM^Dme_^VyQ$d7}zR
z&KizYPSCPLp84u-q7sS-6ewCkZKr=-{8fMF;v;r2@31K89~BS(pX={`Te|(L{>C-l
z-g7)qUsF?wtKaJnJs>ZzG&P9u6CD|;3PN3ptbEE_+Sv-R{zYa-o8%jpU>sH6fRNt@
zl5S6yE4=8Ru+zFGn5yW^%Q+qE8IBg6>&q|CFT2zqT(xDv!iJt0t@LJ7VZ#6zmX!R>
z6POaDF&01*$W|rFZ23T=92a}EvtqfR<{5~=d79U1&u2)JGHB4&xOFvUEyLIJgUf$8
z1z+Kw2^<K-(4RA>+{-sJq6DgIdw#SX=q7yB+gwW|YoCPFng0y17``deb@oOb3N$|3
zTo(e+^*YKTnYwqY(v(vUy7rm_wI0ufiF49s`e4Ld`fJfigUtt%;tB^!)Ri7f<k-c`
zzc_gY(@VWwC{b}*0*t(-QVy$i3i^~2w7ietA-Tfu3;dW;66eWKc)&lO#XSid!HJV&
z$B3j^`MbW~zIg))AD4F+9op6^mwg9{Qfs(5UC?MpI=&2oHj*Q4*@26&kWr$8jTg{G
z&DhrDCtOLzrbA{r2dY=(lzW+lo;0f#yw&Ul9R_zHC$O<vz7*irFPzR8&GNUqMG+iq
zREpgktRbsZ*iM6eJke9%E+&5CYn%N*kx7OasaT5nfSc=<b0hTY=b!^E=;FyFYw6Xy
z4;L7k=yr9uGmC0pI>gt<>GUHI#TP1KQQR=?D-e-1xH~f^fA#lhfD;yxTuR(a3Ni4p
zkb8ipL-Xrx0cE|8f!GHbx<YML<0C8^F>VPh^H|BzLy<(Y8kQDB&GZ!sC1W$3h+bcc
z%^5!wMYZo__FME5%8moOgh1z1GgU20YwIeB-UZv`USyFo)EQ)SlBqu>kOz7MiXJ2f
zCei&)w0abM(_h82EE+W5-+0v=mb2|!k6vXV?2|7*tWkOpel5}#J`eQ3?iB+}KFLGJ
z1^>AIr>Cc(D=)T}zYUPVHlMHlx<f(qf3I5pPd*S?S4W4x%sOWO8Y1-6RwXfC7gEuh
zpcUc2P067nSoct<BvF<3Y^BQ4z!1Q}P<OO5{Dw(}8~&LpuwQzMbK96>Z9N;N_<bdV
z|Dar`n7tz#i>#@RM8CA~O6P2O{lf2{e$eOYezNNWD45wqddnX(_(3{CJ-W{h;3`ee
zTH7Z|i04N*NUg1IA~Wa$aIWgR{7}g&IA1q_S}EO3R%97L2M%3RGd!>u|7pi=snNk9
z)?h@$y;dpH^TXZ2+n?%S1oEdF%{qCdhneQ+r2Obrh#Sa$LCtNf0`cd>Std)f(m3Ho
zIJGE3Da8z)C<*Us=Xzg(<Aw_ZGZ-~DlZnl0)FC69+9j3zv#r!0(evxCSsY?K&3$KN
zX{nj8vg3RWaOACq?m3i(SmrR~C)}b;tL?fPm$vIkOmn{pwukjpTV1ZPSf)w1Q4QH|
z^2?8Y!y#kx8~UUkqy%n*n-pqE2Ia&lR!Ng_ipxMVdJTFFh-&Mr^mG}n-a134D*cL;
z(eI+uy@Y+D8twVW@i;BeAl~QJo+2wBhv7!+a@CtLwj2)6mF}T@kglqYt~qE^U^8Wa
zCkS3A2>@2uo|vIMZ&A%C<I*=xKM|l%cf&-DJdw5)A=a9RbUE|u^}V4^T1c3$n_!WC
z+*k>qlg(8El1fR;n?7ebEr8UTpm{LqL7Y11m8m8HEnrSiF(I21JUI;077`>_cC9Cj
z_cLHGp6f?>ANF<Ma`$IqbZ1CD8r-FRV(_}5s8L?H6fZHsU)kzauR>fI#;@*yG(^=$
z#RM~k&gv#_lp_6e9+$0BG=Rb#dZlaC_`6@L&*oaqEp20-R$sLA0G>8%<UO&HX)5ax
z*iY43opB8u9VL2YB-h7O5D)9Qsueu1W)F5<<2k{BWlvpst&S)Bj~ljKrWZ1IEAVBT
z*Dfvac8kSLlRuVSfxMSlOg6i>U%uzn2BHeMJqkNtS>haVt+B;T@vW;Q78dDH5EZf}
zJfkrT`wL4)TzbC#8l`|mqvAn9LJXf71mliJ&yss#TugDt(t~8%u+|hmaAiId=Wnv6
z%jXLJfkz9K%XGA+U4v?adip?Wfs$z?1-WGVYWNuwm8A4wJ=UWaiSMhpf%U|y4mBSE
zRPx0DG8l>~__Ccsfh6W<>4VSffa|T=ZwEoC<ZWB|DY@uvt-gZ>)-$L9eKUq@f&zBa
z1Pp-R%_Iq3eCFgHg0phpAC*s#ZPF$vRChJLUeTC$O#KXE1Btf+9z+)^xm4jZf6@zX
z;N@qNZog(Ac~v&!t$iwZ0mWn`@1i<DZ{*m>&*<M^V7(&36OkN(zP>1ha45K&Z?3j=
zwud!aM^B4rh&x(O2mEcc5AS6o|NZ_tt0DZ;%JJWNo&Qh$M&8=h?Z5XM*Hv-M*W@Kl
zhDz(9m=HNydxY3oO^B65J_QU>u^bMrnHd*7IRZ-po$D$yl<m)#><`fGy?`QGlx_@^
z_8UuF7;gHuCX9m~jGOuufwn(67y69>&o?*B9}J~7x+zKk@}>jbI%D{UJ^G0jj<m}P
zjoC`u*x0JteXBOwGgq<SFdYcA2ijoHKUJDa3|0Ws>4TKTlzyYpvsYpwERH0a>593i
z?FnF~QY`-PvGb)m8ErSeknQ>;3r+9zn_)Xt-)F3G1j9`(xkbamAwth~hS>%0-0_l#
zsm1c<i07ly7@SgwE51VsNmDRqs{$3n1F|!J78darMl2V7hq`RJ#EmLPcF!!C`~?kT
zhBYh*ozgK-|HpGHmNbF5QRp;ih|=oSYK#?z{YWguAXs`)*)Oqkfx~0zdwe0>tEn;g
zPw(Gt;VCh{&4&L~dBn+JTr(b1@u_@nm@TK;aP!ghuVfuZ^oi)kELzASuNI%egl?AM
z10t!A-r9>(=K6T+!+;U6x#31@mT#ZEM6J?w0W;Y99&XC6)je|6X6$Kf+oeU>jeN3*
zaK>9Hq^(a69JA1aeR3bJ&s-d-%NUt=SYJWvsVh<l0DN8bw64@fV3ZhKvHD1km7~gP
zM~}zh7LMlPB$l3b#Dw@&#<$#MT?oHK@j`2)c|3mEm%a*jzah2_KU$%S!oHJ2Jr*TL
z*+&bDmdKWBp)TKawhw!Qoi*^rX6f@4z(-*X93JsU`owFq50an44ufP%41<JJp-Sn3
z2;=?E1JRf`auf0(6fBS5(VI0jW{XE44LH+OGNy|uJ1y}{O@u-_KE@v*t&EE+Wg6aG
zNI8w+p+>H>j0(Q2bPvl<>Qwxt{G)e%OA_a<dx?etrFTB=xmFF{Sd%wubaY&t?V+HL
zh*(-#2D?`gBxg}c=V*||t2J)EP~OC;M3loZnaZ_B)hvt1htjGo+tL;(V^Rc#(5@N$
zm{hrdorYp*gCrhB$fZ;z2^r>~)K-hAXUS&g+zn=d+ji1`GPYtzl4{<mIH=B&V<L*-
zpA<S2I<Q~I$CgMN#N7BL4^XCuN%3Q>n5C462*4Z!RoVTnUTEPK2bbuiBAn1GYT@^l
z;gY{tO)~1fqiT8Opc!&~711CBBPR}V8R2uv2eV*prjh$q(;e07IDNCgVO5>Cn3m0n
zu=E#y{)2xdPO%n+sV=;u0gV+eN8wux<I;$L&L_UZEm;Raz7TRnH=`l-+30YPRhHVw
z3Rj}U=U$69C-0(&Z3n)U<_oish$^^QdbV%sl0dam3)x7qA7~28&5lJ9`xd*m<n;Vu
zee>my<vREvZ}tJN{2{yj7P|Z)(eD<kMs1GzQbF7-HrarJByO8+dRW=57WIXD9k1Z$
zZiv~`6Q>V;<&gXW8G8hmQw+_Qxagy20$?mbMpuDX7hVScH=F`5Yn9&uaW((pYfhjD
zaglkKE}A3$Uu$9il@(&{^7rml&CSKy!ScV^7CTb@4hkH6D@{gT$F2$|2`4Gj$k#~S
zfo%*FCxwzOj6g+a3iE)BS~aL&|Ln3)9&gotk9OOON_hq0hql@4HPKW)lEM_@TgP`W
zHgWNM@P75qQK-`onkCd5QYM=6k<+1Dm?@P1oMw%4DheKYHn6v-H@R0J6gK3wvAcQw
zjM4y}Kj3@3p|ip07bmw4hk5w&`qD~GcQHPss1KrKOLZs9GNR?DkE<5ugZDNbg%%5y
z%nGYW44d<@%M7i&KeAGnlbtQNd7&QZ8wD(Zv_G3{VdLOkO{ZCR2|^x%w9Ji5-}zqw
z+qou&00T#!Q#=M=tTQ{SP3*R_=qRsVm%a35p?XS;@`qGp+?S_Xs`>-pZ(3J`=PR~Q
z78<avSSC7c8iSd5Z@%VavKI5I6sjJgFvfKRvT$D+H)K<UEA?^fO`3{07((xu_F4Yu
zeH*8d$M~(Jj6N-a)$0=3k(sRZjl~xovq$>|-@jkC-dqG2`@&jRnZ+9;k}X3XJUc^2
z$1iINMcEs5POVAyqimlk0kJnrBb}VV9ad&YT2WrAZS~hpwLv91&E*vfi8G%WpZ>gc
zN&z!XzNP%g?$I!pX86vT8*0Z$9FeF2kEfT*#am@TfB?Rxgb6EMItx)<BFl(Yc@NGP
zgyi8NkA2%FSk~o^QzDbfA<gJ6Nv1dWx;0WC!FnvP&Xo)b(I=Tr=h!ojIJ66I{XqRv
zFlea+Bz=j6q(2-WnSHqj*OAroOp0FofHr60z%A$#-ibnV{h{(h$G3uJ+#*j>fiMv2
ziko%J7WxgAFVj!TidoQzYoulO*~!^b)EbzBg5uMQ>UY$}D#NA1Y9ZcJC<iAd8as1m
z_OYI7r#<`IFkK%WSLj$AL_Nr74J(1gl}*g^U1PGxzs=>RJE~@7??Xk$KMoZN{~j~(
zKL>A$_m|z;^#4FjXsxReXkfk>)EkpBD1R(oP%V~a4T)P?L4Z>Yk(EIr`7A9|HLtKl
zg_F1rYBTP8>l5m}>W9ri(>s+P<g$Dw@tX>J;@k~J5oFmNZ1Kd9u6LFsMd9&1ALKdk
zoDk@0TXuYVI%W-wT0+i;MXWv?;3UNk4M%h~2<K9#SoslRzCXf%8Wf4es&5a@0+EWV
z_Un;W8FwIYIn#%%g2?+;={8iH<4BViW_8Gqj%#|lcL2IQO$flVa|+NdTeh^_@v2YN
z;kCZ}m^^C(mG{8hdVvBqV`cHW87`LsICt_W)|4Ay%L$x?AD!r%(ODh2F%kS_XV(up
z!fz@+Fj>Xei*qEXvlr0fFj>rTU;pJpXE}Bh%c_jb$|=^<7K*l9rJ1LG#T1M_iQ@vO
zL_(y0_9o3SsZhss;Feo!V$3rB)y1dybT(|S*D@vN^DY19M=ph_r}g6uYsd82ae0QL
zm9;T>B2LZ>jT;WG7Cvx%WS{Ni5|^N6h1iK3@67^`w0^IoPJgTv;H!{l3`bqnkV{`k
zuR!OJs)p!}rk%_5{Z?ar9&hK3`Y2_tB*A0f`bl2}-lx*^0(0c*`-ALE{JFiGE%BT7
z3OkVRi!%finV1{2+svuWJR@o>;PK*{`=(hi_lDfnu74)`nw3!>q)(KU`!SeBZaQ}O
zDmGG9Hq%qXd<)G04G2h*Dq(+rw~Y?VFA1r|)>CjldZU4I6uCPjAk3pGy_BHqjtm*I
zB{$jfi!>T$2R`C799Nj_rNb2&qtYTxnhJwuZf&?jOF6Q!b_jFHqr{w|T9YUP>1Oah
zJBeuH<DZj@MOY05*)H{^BKW|L5jP`p?is7baA@a+U)cWGwsP7oqhZsxox&1#Tm;+r
z65y4@%}%*ZXbj4X-Q9;2@g#H=X3EZmBfrJR(&9!ihu>lQ8%^oWQ)7)6Tew>;KXj)E
zUc@7+A^VK{p;s+j-<2AR*+ET6y=zxFX`L&?>{KoSVW0(QzsVceQKQ^sHM{U+?xo5w
z=POzcV#X^}i~||01B!sX{<5Cf<L!+-7o&ip>3#A$KwVze>nnsv2(*YaB4TXdHph{|
zVd2$sq_a>=1W(Z<ye84ucPVxO*sG66XfuK(mhrihk|co=%S@RCmL6!~v8SRDvFBvC
z0@bGlkFG1|-KfKshqaWKPze6Q^#0<o{$y4{YKLE}&a}j>?-CEt!MM;xRG-+(;inW-
zF`OV(F@&+A6E^g8`6S>|Jnv?iQ2e6zqCmpAP`9`Op_4|ph){wl1W?@;JdasW1>OY6
zf%<)N#qIPlDU&wQ0kx*5q#*HY7X#`ZUFv}6%A_=zSknSU{P9M`-zO!k5n8fvorSHm
zx9t)G3Y$jzXmhJ%g#rzz0YA4FVBsj+BR&I*69lXPB>8d49>Ch^I)45qN?xgZC$hk-
z@6Rt^-5y9=iOCr7zv(0JNA}$`SP=&0vjGLMyD8Lu45?G-RQBN(e@zN;Lzs0l40bE1
zHIe-Mi@RnBh9bEbFd)n0ZF?Y7=!oq`dPxnV(OzQWKyvW=h<>1Qk^iMe_RKvyLHXmH
zhwZIheyUy}71|eJPu7oTfAa-oQZP;R?{I<%>7U@lzu7GRn+W4yKg6tz9W2fNGa9Hv
z+xER#;`$>~@KD$x7Dr0x>2WloTBWJ3ko7O1t1=<s$V90!yZ__?hW^duj&T<X^^k0r
z`j@#4^cq<{*L)#-fqzB46OaR8Nv2X}W}Ncyq}_j=xG|h)d%Uat?hiAC$Q+A-E4xK8
zQ_nS)AhSg*i5_m0Y{~!;dnLIhm1-*5lmsttoM{RqADrT-<N>B~N%$E4jO;a59$=8;
zwpMdB*k%h{z<qaO$+6FVc25-mc2=EXYJA<OlankiY7Lcew~c9?bF|K_qnNAfXmeoY
z0JR!mv+p3rh5_#8jEA7mG(7Ak7wpv<=?z<U%6VulML{*1m@?>M^`^n^7OrNz&T}}(
z8Y&uIOFS~`wol<dtBfOtWoenSVG|93sa4gszp&Tmd&0RKQHM=M=9sN5B+7QrQ^QHe
zv4+#e4wBv})t2OK87U7Dy&3hSUvt?9xSFg}BAy&7^z(#2DtGWoc*%w|00Pw+7KXDp
zDB7udbsi;r_mh)wYI+&E6l>8RzLaH}E;-4;Jbob+V7`@58DcmoIK^w~zhnt<PYR2m
zyc<zX8J4Nu)3YUU1;iloC9|x-Nm1%Z*P{12(SE86nOyIu06&VAS!@+6OqvY=T^x=i
zvZ5cBD*Y9MlyLonmVj)i;?H&gD@-XIl|LG5M<h-*%Cu=6B?fkl#sEO}UVHD@Y^je_
z4fVCtO5r~VNnHH;Sf#9!chQRFfnF0diFuJ?Wv|cQ$?0ydVlg7%6&8nA-jx`{K*x{8
zv%)P$ABsgBVp`3E5{8zsq;T#5M+Bw!bgg6x1$oe=SlK;;2!=hjfZaw{pKAo@?^|`4
zZ#?EF_-KjkbkH`0-q5^<Ok*#w<q9HbH-x|-Xa<*b06AyS<WxHbqS_;LzAqsq&<&|(
zMxdT+H@YI0rLNnFRk?^Y`_E#$@gYjqud=zL_~LJ>m>VElz1hsd6mC19)m_2sXZ3M(
znp{H*UUIydcKiCTP?+YMut82%@R&>jFp#u7ZnkN$9}PQHZ7-&)#VAAQt9qNn)>7`d
z2Gang7JsCyyVt&ky`o3H7$?+X9?|G|-V~Cr_szyK&bFUX+(Ym#+)ax+oRg0xxOG{y
zEual)csi2t9HTX}WHVaRd;4@<TFq){@SV~Tbs=Jyhb_hqZXa7nTUvlz$E^1ApagX*
zm-d{34H!h)<BSg<K)5wwLBSqAQGznH3-0R5$}%Dy*gDF}dP<w@R)t(Ui{)HW^n223
zHbm~_H3vrJ=Lcm0zZ}1UH?i{%)O=n8xiw`D*|Uoi5VKaDkR3nzD^(c#E74UHZg}fz
zP|yFsHL=P|7(*2Qr7Bd=S(%k<hcxZp2UEb@eW04QIL(5Z1h$`+)~jNy|K^2R38{~4
zpO=sy(=4%&SCyFQp)bL_w+V@EMqhBNU+58R;a`}sIUOeCm&aZNLMgR+ws(RzCUAj~
z(Z40NyhLVtjAuU-E)8e^s2-9%Rx3}(j27kREPToT!g@Q^uDZS~B7H1FZk79@Ks4bT
zQy90)JBSpUMfgH^5#$WmN}W70a)sOgpH;xC+Z30T@gE$2zG4lyj0gZK7^tjWB`j`#
zee=c{fBjC)T7L&C?z<-R{kc67HiS>{d2LW{&L08syTlGn9sn)s?eDEN7F#LT@_SG9
zMEj?ns`&2!(0?4!{)+|D`Qu8Uh4orP>C5PCn)QIzX0O|f9l^+_k)4LYS0rOrS{J`N
zCo7MUdoo|$er2PzZouQ=-Jndf|00V(39V`<V+{$vRJSUemD&q<x1V6b;98__e>dVy
zcGa@g)8vfV86x5@?C`wU<(u@KXgLvjy)RCKumfKNTZIwjg^?5MT%{wBh0LOt1ef(j
z<9dtV3NmeDKtNr|Ts<Uv@zZ@4qS~GnncHTEu<P9w@x%U(xC8HJ*o!0nryrj`f*JbC
z+)tucE7+=Mv2S#-|B@?+JHip+)KP=%9%sxQ_wL;vPsvZYy^7vRzHJS3haa4Yo+FiT
zm$wCqykDhrkZ|vBY8mgVIi{7EyjFQd1*bmHn#)F*5h=u#mE>D6MiD5AJC8M#NFsxf
z8230TuKj_+qH=hVNsZiM3Tx_#{5(|MxWrv}MIFwwvJ!LfQIbE8!gI2tt$<)gv1xL(
zwur#b{p3t(XgC|iW=O^CK31V_`TW>V_h<ok4YWmgnT52igG+Udc@j2Q$yAu+<u~~h
zkWsAaJQ$fo$Hv_HREgpxHns5<B;dzbmv1$pf+jhpfY-7NiqOS=&R~+^lED^tdAvny
zv#)FFp#lsF?Y_bO`HVpAmZc-KUrNr@nK$ig6k?`QmJ{sm{n8RHg$?xsTm05>E;(Dc
zendIc*7B2{R=iS?ygXHA`u<1SN#l&3FCvU7JJ?_^v?S1LfKVw$X}OBT;vjrs_y7j`
zz_r`K>OlmnxrLePgHB?cr5e1$YNj>IZE``)w{}LT9_h@cGMUkm9Efp6TTJ-GY4{q&
z>%Fap5%yTbukDzJq>g>Ti0g2vLt2%&d4McAb=(O11MBeZ8iKO;{GKT8C;16xj1}@;
z93+3AWTEWFoc;v&OakPz_$;lbU-A~yLifo7CmZ}1`0R~E1i+c%b4HO}yiqs#`8jL4
zBzH2Ieiaw$?H>ew;kg8FUG&?8<`^)g;<XID57iIW>_i=f#Fdb1nvCO(T_G2&>ONA(
zb%`e0-=eU{{~+tK{ft$f&4a^>1cx1A($Es?0#=bQO3pBqjh5>0JJ-D8r?FCecXH@u
z+6k6j8GC<*Pt<z~^IH_#0i|6NT4`=I_Sx{j!aU-6>`Dg{<Z}gz=_TWFm$Tpzx7dDe
zF4YOB;=ovK>iu#2xSwkfNOTpll89$Ztts1^`y)Qd#IN6D)L1(-_<j0J364G)TQH`O
z%!J6`Bj%lB9i)n`=H(xkDCB|HGFXz>I^#%&9%uxqO!+*9!i_4UiS3f=Fb?oq9SQ_7
z^m0?sB-5fvcBBA>`)PUuaaS04LRbJp)Huu`N|Svy&oU`EXO#ihhm4Q|^Y%bFbbqE@
z91z1cf|v<XeNOb39W6EsR_g7FXm5sOHL}G-<`FOWMYCu8u7oQ#!vtrdT3IiJ0mm!e
zl-&IS$^JPPe_TAFevQba4$4AAqXa3O(H~;_+fmycl$2b+n2YpLisu>*gOp?~8vhFH
zQWc=oXd<Mntam@=`o%&$rgA3lPUtUJ$e6epH)EAk1+`C22B=CUcm2n|@^ZBdRLVT+
zBXfOeH9eD=)o~axLWNu8a3m%>HIk_7Y|<oRvU<NzdhWv+BoNTZ^lK^30@o`ko3gh&
zBB4C3?{rV%u<Gxa^rf2C{pR#jz0%^jT@lgK+?X~DOXm}2QK~?a_7^np6<cIjEyIie
z&!UtJXF*x`6*eVbz`j8XvA%+c-!5MoH%@@pecW#5@QjfwIUd(|^ru}3Ltw%)Dpw{a
z01d`*xTRd3@|ajo%wta8GTiq5^HN)D<!E}D!}^>sys{rPKK67`^nHeVh0)9oY_yrE
z`0sIv9sdM*Cl`q!0!?wwb2<81H?5QK7Kz6mJxg?ZD=E0-pWA~zDhjGy1j5kg)wMWx
zw8D%jWe#!@^y3<{j?^C0BZkKU!hHRM6Th7n3F&&*T`xl~a)X8V<3=ty)pOt`d$~}o
zk>|Dax7K%VXc~<yr@M1|iG9-g(^O50QC`lqW;?vT!**rqvTDh(%xj^6Vz(G<n3zd5
zB6K{MP>Ma^%}LI0l)2wcn|023lpCCg8U7~|{E))|5dNEp4c%#j8{Tt2EDg4Pty!Re
zfE<nAIlxYzntv;-F>P=8_gG;<Hl#||pY`d+|C;w3*bm-rJ5X8G^G0%~?lrh6yGXL?
zG{L^eAK27y3B0RTz5j^Mbg$uyfoSD}Hl8d1S^Z5@bY%)31jJrh*A<9cIIjeqv7tGT
z2j3PX>|uUfBaiN5Do7Owqx#LivP6GqzE~I55sB-Igz{t2phwc$08owFM+#*{5&egC
z4`2H(1gisg<HAN$f)Gq$$QZi|*AjxFFc+&_n|LVYoV*~jhZ==|!6#*~(Wf8uE2P%}
z(l<)GI?+kK*BRc_U#QUtU2v;qBe>xJN^o!aoF)dYA+^RYbj=VVzYcn>?i7*d=L`JZ
z>7=)XtxjSQG|7MzT%)Ld5C3gc?jH~4tfL`pHg&F-iR|FFNZd_P-3`#_=3YQ13{(5v
zKw{yV4BNL3k=Sb-JEH&z#6JWp%bU|Zuiq4ZE2Tvdg?tgC$8y0VdGx{>kYV>1agF%t
zKrt+pvFaPXpaIHEw0_B267IYsnVZEm=;E)rpY{K)?W{$9K8HWu6zI!@l^qeVe<W;J
zKp{r%TlZv>-CGp)Sz7y}0)nUeWUvA42i}v9jr*y>_kk2e0;!a^OrwJ7=Mw<pl7%>h
zA5$V7g1U9^N=EGCjlORr)>kX7{cmYgk&GOh;ndFQ`d1XWJ+Lp|-u~vsW(0*ac;8oM
zTX_G3T9p1B)bhV&b^LFW;J;u?qxPS_7H6*xa5~bdz@WLAr^BVWYh;OHY1_(>58I3p
zDt=!+Hya!OB=F?opTm2@v&=qn%&D7M%2;S-KNi}H-t{_9Ouj5rV50?i{sm4pdG51)
zC-&n4x&l5JL49c`fW)YefS!&RM%_tAFve#`Ku53$R%XHJ<;M>4!j2+kFy;wwu0t0`
zFGt-F(d}sy3AxIB*4DV}3_`)3V{{PbaKN?IUo`{qJ1#GmH96?<bi_yTW{g|)%*Pxy
zu!L6I*3I<U0w6pMJjuWaf@W}~E!8)iVtorO8CaitsN{7~*+IK-VWiH4np_6PS!>}A
zF&S&~&Em=FnBr~=w808aQsS|n<a!p})jS<pxCM~Js#Q-mID&;N%%RHpYqL!1;`J~*
zWXV|F#`Mev*<8wJnXCIg09zyzV)RMLX%t0fL&T;KHFQWF^=gWBV376^9XMLLcrEr_
z*2b#fs2ww6FK<ozcwdF$&5QV(iHtF{M)jH88Aod#VyUic95VXY^i6cIyIEGb>&@0U
z>3@#0sG*cNjan$kWhtSeljgGZH{A<}CGNc{EPTt^W{T6yLv<KhUGk2yG;@m9x<EJz
zc8}2Ch(G^6YrjgCJdLk{-R>STb?UwV^+`ZgH^SG$QLYse36cMTr^WNtPn^j+>O``q
z<U)z&bysz%$f-Oo+wG^Nf3V|KnFukVLTi(Qg;ID6wXR3xl=!c3a&bBdZ>FlfAp@_4
zs9{r+h%D|t#uvA67N{i6o`t?-CZh5iCuI~FL(EUkYU~VQUW{;_>my|knEL&A*=kpS
zR`u+`%#R8Z%xnlDk$OXHefX$3fCFUtpQ<bd0-h{1`!%yA6;pNjCK$k=Yy^zdp!Uc~
zBYG!w5Dm?esx#VZ(H6uSX*Lm7VIGYF$LWJ9ZskXM0nL@%>m$Y<+!6xuVB-qb(%7I$
zJXIwyG@dRY?G)ngRd>m)tA|=PE#mK~@BdKMqpK?{<I8nQ9X*b_A(mWg^@>jiCp;n>
z7}K%c$u8pUq{0A8kZYola%@%9sVUpa^2k>uw4J8xZK5Q`eKV;}{j?zrbc1+b0#rOa
zVvC0gXJ}oGTlC`GbO~lYrfIzLuUJ?R%c^t9H+Of(RX3n$gK=y39bH)s{-g{F`cj6G
zCcu{kwG*P%V%-#Pb#DD?SFZBcX}cZ+mFuQj+si0~q&X);jq4hbb+GwFaRo9jux12R
zPj?kH^Q2#E5nih1R0uN>cE6smf{ITg3D)TwQ)G^t^KE1EsOZN$Y7MNpS@D2_E5h}6
z&35zR_Ki>P*B8&8Cz$iz#pbXQJ{MZUywAcI-^dJ$H19URP_O8FDZj|bDAT*(#q$sJ
z1JL{>XS0q>u8~%-FT`|+*2G4^-^g_Fu>W*Iw}ly@k<taftiSeL<i&D%{%Om)$hYSg
z26vtdqm}xBcHz}z^aHyoQv{*PzY2d9QoRss*oAf5r7pN(2VNqk;C1a#`GXn!?+<J8
zLVq>vpd0>n%ce(5b4;5Sd!QS?pwuUcxt+cEFit=g3R8ZEVTe<JE6F~t>Kw|n4bi^i
ze9cJfbw|=b=M|$YIUM=NLVB8xwp{GknPhwZRiFXKS=UDGvsHX<_jm4?F8)-U-&*`T
z3*VgeZ`>}r-P^a%CXpQP6xwB!gbXe=$vQ;Zmc=h*vO}MnyI&_Y{G#iGPXhiD46d+F
z8$7)ai(IJx)OMBsy|(+muoeFzD*hvwTiMvf^<O)<an1isglAl@|9nlVehG=Df(R$4
z0%a!#6$B5Gg`No+ES5KNZd)B|isAor9DMa1_pfyB_weFq&n85OBgjyyr+UxxoR)*^
z4p(;eF8{X&cq0T?-WApovB7kpC2s+)?ZFTT2v2m?YHBrPl}>iMSFD9y?{YbjI+Nrr
z_aus*NMA$0muULfc?tiC0s--a9x>_{TMvgoi!J7Tkyd>rC3y4EYRN%DdeJ3%rOH<0
z-8^KIs)jXC(bd$!9GN09iUW=*s}K2&<eQdMp=#wN5?-A=g1jw<DC072gvDU3w;BsK
zm7IFYA0@xHxOhE!lBI`Vl7dr@+WCsZt2Fho`YQWuCB<8mLqK&ah{>BTXv%n{#_J2C
zJz`7wHQaiMRzo&MHVba$>2mvS`Hd^=e$pdK_4DSq=qFHhm40vY?S2p9v8~Sn^1X7B
zjyt@L>t=-x(6psZ(!kPV&m{cv@k`VWnYEY95GU!L{t>&*JWPU8Qb-HEnA7Y*q~enH
zk^c6)MDb0`NU5Wjh7P8q-8{d6r3m%hF~!r=q?GJQrVV#epMqNhwkur(v71#oX;l+)
z>eQoWKgZa$;+F#uS$pR>t!R3SNfv5JZSpeVuFiCwNauuG=L6ZAO#6kOhC9p#<8R-I
zhh{Xyg<ID>WGU>W>v3SyG`V=^&8Nt==a|Y*NL$2lNq5koNtW*JmLW(MVwkJTWTS8e
z5}?>avmH4pKPOOW9w+3|<`!4U>-8fVx|dG{ABGu3$6&Yv5vfOblWCuK5fNE_IL)V-
zc{cnY#a(#=t@HtDBPl$?4$K|>R++W%a!ZJhnO0V9mxSy5tD~R$Ukg9Q3jOu@&*Bw_
zeS0VC%>I$A`?o&-|Ce3Kf58q-1IJluOo2rtPMP)3!ugD+qTham6m6+?jx=Ff9pMzY
zHJ8&})z9?dsRr9h#i|`*#POe#=)i0D)GNcE%?e%$J>bAOTcYQu?&XhWN?++u=I|W&
zFAd(j&aQfXkgQ7-N2w_r)kf$5+3XxpJhA4Ae#D?{s&OZck-=D0limTgwpg3c^%ImR
ztg*40nxq=p!!hr|P13_3kZ!w?!o5d=VZ)p_d|j_eAz8T_x;y1L8l7@4$wC~2&za8D
z8;#CPr*^|BoVug`*&7k$lq7=VXDE0Up{uYU&wwfnT1Pm0N&vj)Iun?7hOZ%6yK=Z&
z*H+k)qMG9|RcUpMAwP_H_X}=6y~nqQ*I)IVv)!{-hV;29r-p0<os72K-6aCF#D{k?
zUP1#aTj)f!*14!LDl|hx?edTD(;HiNhwvdM&nn>NS;9Y3UoL4>OL^#s7xb_*Ki5;c
z8|K)qP_0EmCQR*)O7X_j=Tf_!f%GCO$ySx$lemUrbTKsy0{q!Q+V`O+^J2dUhp>sm
zk&JzNYnRyLh;(Asx)+x*+EAMAuAhI~%N4`UMBEbZUWFg~M8(B3v|=fWBnes@{Aeq+
zCyN!7ci|{EQAQ!+IjK1R{Z(V!m5$dx+tP0k(MEq!0<Rj{9I@GXuonWLyA<|<ja(?K
z9ouDzjqR+}!>scF-KEPN>ly-S&zq0Us5eBal>YQqtRhdXowei33V&3qr@-A<X_!TW
zZm|m=%0i;0SapzpyCkr$NykQ!yfUPqS8QjXxpvzOZ(SLn<746~^YsgFy>8sC7Emlb
zPKFlu@g5|IXMg?Y^SlB)<6cG-c@-r|=LybP7wm%og)U`>SeO>>TLQZ68U7zlS-{m*
zNg4`)HSSTv3`3w4Hj5xT<wF3j)Y2bFJuTzB;K2?3S1cN?X9US}PF};y<ZmR8EAZ}i
zkC0N!P08ckgXzLK=Gq*YEJ}EqJ$udZpfq22p9q1+#Y25{5B~?pbUWO)0zIT#7+)ls
zNMr?PIA7c|yqR0V;M<R4x704tc{E}8KNMumbHpVrJ)laRGK0siPYtJ}_T;mTQEW}v
z%Qm@bf(LtGJip^N#kUWBE8fVn^@S6N1aiyA+6Ojq+~p7aVx9}e9nb+z92;=Ncb4C_
z47<nRRPGP!zmjMN<hOl=CP*J<PM2B2H4gZAaQCF5Kea2NKT~}?Xubhi<NEPyI#}fQ
zUE$S<b?nFuM)c%g&B60!bL;!NTo2<PwJ!fxo5Oz{#{ADzXGVi>5_Fh-1O-g0Bj&{$
zEcnD#dFf<8x{KMfC1g9x;Zp}lp;2*@+aBuOP!e-~waiZ@CY<I;0+tpN85jBogwGET
z@WK!%J_$h6p(0YQKSstCBs}tZLwf0TETcwTEf-#E_w;M47U^`*t-pNSi8##GoWRFT
z1X44e-w`MqZX@mc!vF%m3VyImvZw&mDLe|P+3bc`Fy~DSyjBZZ+fO2Lq+ue*s^~t_
zJZ1Nhf=`kxC`7FKzc#m&c~NBb8rXktn9k|aAuXLzF#sy|^fCg!xfB&wR68*v+~$Tt
z!?5sQ^s$9vBYMtGsdiV2)_(TzJHXBTX*4E~C@U!k*mPYFKKt>pG_mJM0jSRUo@LmR
zsJ<hyRtEPHspZFuM+ZGelcg{B(~+b^egIF_AZn9V*(8a#q(tUdw2-<~q-V@U1LN<M
zU~OL$iA;sxTn&$m8+&`t_1DjzDAqX9=7TE~Cbyen0FrjM1(T9OF!s?VYrRASp3ZUj
zg}x9hX3+#SlN#d&wRZ5#1*b$r_I<J$+6-%!G~Y#u7#Y~A+^9bRE!Rf?F%XP?=t8ND
znNxriA^t4ntd925*uGineS+Qt-xCXE1rM{J9v^Tq$^W43Er9Y`kZoby-Ccsay9IZ5
zcXzkoZo%DMgIjQScMB36f_s4Qf5|!b&bjZ+q~@Oa9~4y-MeTy!t5<uswN*u(&T*N>
zFroO)R^?#rV>k2w*raV#$r3gx3-<hHAV;fBj8eA}!Q4DQv_nbjXf^3ZdF1H>^ZVZG
zhG&Vr!~6J&Zt)Xa>1U8x)(OU!=%~i#NgPd`KGQU4Pw-vas?;J|6Ot!)i4TH9jNcOp
zXA=E^rJH-EP#~XSqI`r?@Lxc<=O8-Q=1eu;q0$iohQP1TLLGyugWRavn8Sc0ukdu>
z;-?r9x^Ib}p?|7?AeHt)2*5rr0|w>)^*VE<|6kq1|FV#S$=dcPf@s5UpxSP*WwxIl
zyai!z>t_a}K`f&e$!#eU3?x3_8GvY~>N2<I@qa&0%oWkMDUcNKCmi!I)1+DAhax*B
z=W#Y;zTr9aJGkFHY!L>+r5r#OmKuKLeCL5Q442|+;<ATjL^fXcA{%N!u5CWkypdwi
zs?dz5c<hcV)b$lU(+gwFE^*zJo^BC=hppS#6D~^i_&)e{>q1kht$wVSf>hXP*fDsc
z9<bUL2Ru}2HQBadHQsLd#9g-LZm1DYUm|S%U^}AU$C_vYxaGNT<4%wLUUc4Xh%cT$
zB9|Tw+stdM<h@%PU*-<u%^Si=1#No=nTg|sW<O)(z7PL)$z*mjS9DVvzWCOK4g`$q
zOA!UrBPx1-;phV61Vr}q=jq|F;ICLNqg!eo92(DlNz5O(Z*+2zRQ7cB(7{!06bP);
zGUI$C-|@>iUL?!4Ol6{3b{yQBD%)tE;7!JQ>8Q6IL3KG~G@ok9dCNcIw<HIDRK>T3
zE1u_6PrD;MaEv#sC{+v_t>xh>K+qbS!^-@|V3c2G*D#D~7P-@}d0`j%V@G6eSeY+_
zdGFXTT+m1HyDOH9>2yMJsd~`4{eaUqpl`66$OEd{clBr}CKO>LWjU}=jlF%VYz0;-
z6kR0OUZ$>RK(o`sNaMioIPlzpB@B>LL2N)$9Yf40PpPYkxgV17bP(}XEORm}_riam
zuQ_^I1>51x!f!wwL)eA7fVQAzi)|ucxjS%_T^L4K(Me2seoqDAiE_^Hk`8Nxn$yVh
zPzz-D{gq`>I-7k}0O0xew~haQ#`B+~{(s|H6nw4z{a3O8)|f?db~H&wQho%+fKTIq
zZT$c|!$<$Za|9y)_xxz{6x-q^L?Owx(FraVuA5Bfsho7cMWS^?AW^ihfTG7oZ$}Xa
zfsfd{Gx1CDrs2tS!`I7L1;;W$g6j_Jfjc^bP9jZP)-X?z9JU#nWvz5}9IcHDoLLJm
z)%#4eOGWK8MQ^_A33JJ8^nAqF2@H7RBk(`3v(hlC&{Tg*`&8}Xt=4Vsb;eP$|0u-0
z!44^pcdiX;h|u~4^C0D+{xgZz59RZS1;-bax&g+9N*4&@t-u}g?{6HIWnEvdo8yX^
z)ZulhRNWr^0gI%$4`#NM%(Ac^ZagWaB59Z&Pq6`berJ>hPoC?T8;b}HYBEFSr@h~q
z2k|2!WoN$p@ENQ0-NkhUO<A>sXPGv>&^;OWm188E2LDsH9*O;~YYT(6(Y%tmm9NWk
zR%Fb_UFTBM_MCl}=8!Gdb;%=**}Ab>UnNL1>eK<=DHfSKmlH<p<`VG*!R|(0u{!*B
z7*Z#0-n@p*So~RT$%zk$6fiy=W#Y=AynJX(WeifXVS?(9w3eP;qDTDVwBz?ZU2zzK
zIx&m1<HUkqP8Nbr^h62)A(f{hixT8N@$6~pia0whjx-1qkDq~0grYGJ0+iV!s#Ab2
z)gDa~KJ{rHLcJf}s!{F}YrV)D%o!yghY$zC5kz%}3+S?NTL5mPTnY#15ZwmC9zJdS
zLf~FjaWmQxcGm2|I(Lz1Tp!5jzCrY_=*5Okyh#p#=IGyEFjoHGu=78gC-@_r{}tE#
zb*v!i!g~Ha)^PW7$yvtWd1>2|aVB?dWi6UMG=d<7sQ5u}OjkF#xI0THO{#Ryo0Op9
zhaJLgLNb2Ipy02thGY(&IqiqfJKoc}*QXD$xj;Ez^P?b|*Bolkz9O7AJJf_c!&!T|
zkO}eZIZ|&rpbrM_kj|KW3riJ~H{rfYJPKk+Mi;wUna-iIGbMj1|9L8;q}bBxHC+2V
zcd{Xeg*CP)0kFN?(%o?-h&af(iiEixMS^UzI5D0P^Fz|QKBCLWE-?r5^tj}(-dM0<
zQ=iu$Dl(IYeKN`c=YizAvajF#bj&_)3doC_xKl?bzvD_CvS<*PE=8a<Up%mj4e`Mi
zos*Isd0=@RUT%~RojezG7-Tsg)`=OnMa>gVfJr6JYXc{U_pVk(jSQH0wS6^K5Bp4o
zD7|twBT^Z{hlp4!Xx=uX#{^eB$RpWEEqErSb8)b|f5dHZf{Z8}Px}1oo7;RoGYmGP
zI=(KbnEjQk(b9zqH%|<4`@SpSF6V>j8H*_!?fgo<mO&U)yGl1?Y`u1a)kY7sf{3+<
zDY##u2>}Mz_6PCTd3~*hG;bA!j#V#7$J&U@;w6Trm`%)ugTYvuuVPfy@x>oHV$i*6
zl=o%?3WY;)Z#Ny+{#fA#Q6FBs1z2#e4oDFFYwNH2pW;i*)y~+((%$a>Mi?MOW<(3s
zZ_#WpJ7#b0W$zjq@~`fB7l$MvBVk;IqrCb)+v|e7<VGTU%#r%4=KWV;hk(`tabmeS
z3+hvPq)J+@!<9py58rklmoF{^fOtg~17gNalN?N8)Ey^>T*I=^aVy!EunxA!$2gdk
z=m^M-QY(qj;9|szcyj!T3ae$>^zb@vikO9H2)te?B5_wS_2k9LuM6W!ydthZ>{`_c
zi}_3`Z6(PjSwe$OID2vFAgn21D0k9BRg46Vn?v~b&Rk%fV@3`QqpZ`vKjoQzG?8)k
zo6Wh=0E0W1E)L#=_QZpY^t@q6zgO;DmRU=3k_Q}GdXciiKfaqqKf+7l>9c_hkfHE+
z^vd&m3%nn$)&GKZkuN`Q1bJq>lWCI``TdOs&Qb0WHkjwY=R8Em^%@GtEkm)uM=|x-
zlOfxYHM4vqB*+yrk#fCt|0_ENw%c%WR+K00N~`dL?F5@iS#DG-rZ_cZa@aQ`w$3r{
zT^fOYQq}JCnG-m`IxOtUTdkGbq#6ChlqlLL8%X7a_Ps^LJP6LF8iS_xT*XHTJz(^c
zQpKVl1XSmVPKh73=ZJ7v287LuRm5T<Q&>7DAjz$A6&@V|X-tC<nWK52Mwl?@Q9Ouz
zv!ZCqA8{k$1Prr7d2s?&AmUbS#|#`vgBa2{>8i8i1%ahCyQ5)mvq>t0anp)Ft=@K8
zCjT*kP>2&@jRGLOgx_9PQ~%$9@~<bI|FX2{*EE8NshO#hlc~vHmcS@a1N>4fpMH9q
z-eMxPg=Q;NmAr^dEJX4JtKc*Pi<sWqZCi~Y=K605tGdyCG2#q*GBz^2kB}-cZ}C@|
zbfN=^vJ6|X=}(*9Tha%Y%c(U$=LIRkIO+|Ib@}~lu*-BRSoNsYq!*s=Oeo#-ZlK-2
zN_feMhbjhDw>xbeDpr9B8}E2oH=vgJ4C9v>knYB#-iJ-i*OKYP(h!VBtYivtG(%Gz
zI=K_IA;&^RHeoYs&!x_?_e;6Px9F}LGiD0r=3sEoVYXkDQ7pj14=J30(La3bEe$hc
zjmr<wW@RkR<HPZWb6bB1vGU@DyUTEs?m&@>@Qo7B%74DVn2Qa*{(LBN{tW$*Wk-+J
zqP-e78g*d|MB0=fX^HNQ?)vOe<EVeo_HB4*AT1Csb8XzblkqaRdA_RIngRQ|%VR#v
znM-~Z|NQbQiF+B|Xg`udiDU4y>A8g{yUj*(e1IuQ7z^CA{1;4E)lf)^pyI1xUeX<D
zzp*7tN)yJ4wIy!~;C=|764uvRw8%B?xUQn{f+AfRtGEWwv2hi6D%>R4yJ>^FNzkH`
zQ%FYsx%dE(K@?z+Ftl#u5qF&Lf-^(~CUEA85D6#Ya_SkBA+XTMnVY8OO7uz{!Kx=s
z{`lOp2`Q(!234Iwrd?r{AJVSOQG#=!&7Y3;qn)v>2L@{8TydzLkqaSHQ4?r1@;ju6
z$ToVo5=@j_b4ZKIyDjNoA%2EV@jKHWe_qv%{4II@ZJhoi$Np>oCFwuGsgmH&ldC^A
z-Hw~B>%zmeL>YG!7#&fCp(1*E*-6=A1{MH7ZSz?xU)N=B_~aJ}3u)XJK)4;t+@T4@
zj>8b#Kk?xr^P%fua_{xKk1y~xyk6+#RZ%2L4ul1mhaA*Ub4>yjD$bXQ4>4ckN6Edo
zBfec~-~Ko`r_1lCQO+hrS;}~mUq3;8QDaA|^HMK;G33UseJX;8U>yHKt0t+BefHIQ
zZd!Z|!h;xmIEZQZiO1A)B|VEYSc^h-wGqXXP8)jtB_w9YP<uae=6N|(&Y8Vjs$f;G
z!ijI!;=m@NQ!gvKR{6_I<@iBI8E-?it@I!XKfwy^&IXr_TQff@hVl=+ja#REixZ?i
zJ$5!GLd%DQ;?MLo!&W6$P_=sfAY;L??&oYh5Ifsy_0<~@DAaxi&-8dGQnDPNJT1um
zq0z+*#?*etzOr!?H19>zD)LAo@KNpFz-+s}17B2)K$~_mG!YT<)8$E-ZlK!TQRA}l
z0>SL5NX{@5=vkkS9oKiv9mlA}3omlPUx@Yh!w{geRf^tXxpLvo`5;dZh-&1KU44`8
zI8dkm6`O4OfA~}du(sZSl+(Yqwi^E%V*7nA`sd{$Q<Go6^XFu`inKhcBH9l*ZSF>y
zd=(K9#hJ)r1+hz2a76+&D;RR26@BhRHv{f@nbMdx_p@mSTO+16#&gym7`d~pD%060
z!kXA;Mh7`J+0N59<34XUi`GC5t*8N!qm)KzCxQ_3Fsu<eabq%Q#1m3?1uwdhUzw``
z%MQUc!Iz=<*rwUe=2B`;Acz%Lkm2(+`{*rky9_@fHR0vseh+;L=R2YYEjU^XSp@0R
zTdg89N2@ija-|q{8}^Y<xM{X+9ZxA+jK(o++HNKLq~Vqwsaa#e=A+JH3-~JyEn}+a
zcpD5Y;58!-mX+f?zkDdRB3lP>F1hTm%-jUok*rV_d?S}zbmc8Q(y*ym;*-V9u@Kco
zZ??mBM%50UsV}_I`3_TJTeVEH9@<XTOy}1sr>LRb$5z~h7`pf90q?8%{Ra*^&w}#x
zdljz6dVMm(V$@C)wCU0Hwkv-mfu793-G<Q5fQpB8!3oF7yscbsM<A|D9(?IJMobn}
z6gKBVUn5-cSE!HWSbZQ{ih#8ZoTG+z6-T1Ekt`Z2b-||Sj<=N(dAW&Y8ojpA3@GRB
zz8SWQ8|#})kvV~Q#LMX_!NqS|Nck;3G{FW^%#D?^R)$1uikutZ_Vlw57d0$4*lwdV
z&&1ck;rlP1tXMnZ#LqR^#!31mSOTWRn}iHW#jP7fe&l=DvC{0daxd^ZoVoq9ox*V!
zK&Qu}<dm-<0k;d%V9@qRRs~V}jD~zS82!h$&Ms$yo*N=9N$r{8yn_nd4Pj-$D@|eB
zH1XzmOyQ_6gyO-<zVCzijpFzXgZYi4yNHDK<BRQOMlUo92{}i*3O|I=^g_vjcCkh>
zfobF#`sSEgC(H_h`4UIP1v<kFp=YVbfk3R-2Yv!BS_R#3_OCnT94j50qXPTmfHmbs
zICK?&V$c3`1ps5!fI7}iM##^bOaJ{r3;537$(+I1!pYv&($$v1*~FT`($2-y$<EM*
z!Hv`I*ZCF(2Pb<Mdt-YWhM&6k&!5EnzkHIVor9~(Z=T2Tx1MJLSV#Bkp=dx*P*6bE
z|Hr>8^7kLAY;S9-WNP*Y85Ac>%7FkbmzDZg0q#ILUczr1q23wPM>3%xf*JSW@TPvL
zM{{476_B{3`+$$g?~iDT2Sq&AJ8(CXKEZnP_QriYe7Md7l+_mx`AmT4;UJM$_Jn0z
z`Gv%R*I_O)2{8n@FnCL%oVGzoQh2+q#zm$-Lap3^ifxt!ea?waQ;6kL6^v>ElWl7W
zU!lpim|M=3HW^8s!X-3ox+jX;96Gu5O2;@YiNluFTLDjdoQ1%yHE73JRx$F_95A8%
zNdB-Yzm!>39MjZt`Z1R=X!3Qh6@xHH^7{daudEc8Yq|B<h0uviK3KAz7Oy%vsh(S%
z2C%Idw8#v+*E|xs@JaK;-KfwYOKO)CuyP>geuds5tSaALK<z%a4jrUGWgTiNrvn9m
z<h=W_VHEKmy1ACxSas+duz@`;^_JJ7sXe5XfOna~u!g_xiuS?K_h#tJUt33aehA_#
z0Z1P2w<P~>-VFP1$o>JeU%>b&LkUAW6PrH|5)~`2%i%I1;R}zXSm%W}9CCFSl;7qn
zc`2efB7+2I41n4v>e4W|eoH=!$@81tItC@|5m(LrqJtLq-pI37Jcotf*=)%7<>3Js
zh`(PB2p8A}qINKELlB>)*Py=HyU*a2c~Q@8u*s#qSVY)*cUHO(KPb0!sM&L&u7qZu
z-u;S!z6n#U@M{Fyrid7sMRx7W05*OJonLNv$!y&O)(M<cdQh*E?ZYjG_Xzq4J7Q;Y
zo9q!t8)H55)i9`}INF2L*rvMdn3qvfW*+GsuUPDdtne~(g!6atd#+%$liS{PN;6Mg
z3!W~^WlDfXTn(LLEJS4W8O8pNR$R87R?a(A@^`rirkQ=p(v5yY<PMu{=<zj}C!;NW
zsLZ;^Ff@vzTkophMoQ2!7R0_Pn7OLg`*+=T$^iO4TA(}Lxr%7H`s7!yGRYmWEKpIq
z3P=hBFj;g6zd8s-P4kRyOUJ7*TXY?-4feRke-=aRnDFlf`&89ej^e|eR-l|NXIc*o
z^u*ueVrOoUVsr>agUl`vsWmbSL)#Td-#eVDF!ma853LcJyrJgok}{*JWzA9h<JVwR
zpZan|0{|y6zx5s^{=TjY+XEQT!{r}gjjMdS9H<~%7JMoX6p`Z0C8T7()C`g06_O|#
zbOh1&NmEywm75&5PKrl17=Hg)p({loczWJ?KI2${?o9!ptex6E-w@CcNBa-WFg)|C
zI{Diza*?~oHg!y$vzrQqsd)HosW6GABX!O0Q?Q3e<Vfr4U2HaTkoA3|!sKqBe4Iu<
zb#%Uiu~`9^f;o&r!qpWRo@v`SY4n|yyN!=t)`i16+2%n_jPc3=;fqB4?D5)N)=jkf
zWu34ox^2RX&i9tk{_E{S^7G=*k`6UxG~+;7+_EB2pmCBg<f8lLV2%OR1a$2$9aOy=
zZae_IIZnX){nw7xfADU9xm15u!tBIRxqe2Z&|z9=y5}wi@m3^gPNF&q|6m|hBIJek
z%(R8=mH0D}OQa4YNCN*bAsMBVW?Ch03B0%6i4QmHzCPZ*!2Wa^&W5WY=$LBIoUYWu
zy->H+_Bu#u-EzhIOqEXk)`9qv<+M#YlEMbv1ulEwuAhu@hH{`U_~_~86JQu-$12`O
z1Y7ktx*H~SjHNB{nv`ZmIK;lsHAPJ6S@<rt|Ius#RYfevo-Gww?3smHX^Eh#;!9o6
zxvL(}XnOf$^=q1elQ<*xDtACc3N^YaQIZ|g^JlnKP~hc?*cv6GGNx44p*P4fOC;nn
zgV65ydfkX>({EAm!je{<aa!MJRoE^bsu&5a30;<QbC<3^%9Yi@KSPv%R=Gz-c&Lxu
z<BvrmS(Ny3JHJp({i6l(js2|hv0+_!kM5az5jZF2<tT>Dvo75kW#v5j9AcL7)G^gT
z_Ab8U3l#{@7ma-+qM0Ch2E8^XLIR<q;q)LDNO4S{CSXc*V{C{_BjFJC=(_tm62|Yw
zUsf2_9vRj|q`N}dp_OIVT=FM-Y$`(mH}l#d4-E6MFuMz+fi8ZAZ>kKwbTt5g{66>f
zZ{Cjkr$lY+Wa;4YSCjy#+756iJlj@SW^S%gfqq}fj^PZJ1{hI7R6?OVkn)`p=2cf6
z#d+vmbyNFCf4}W8k8RLL%7Mo@s6m~DYlGaoiErsF&U+UEUB00H!<USK-pCuV+rUBS
z$&4BRMPWX&Hg(|5_JV_3GOmo8$nw1(+sLPb%jSuIOX$7d{9!?Um|$(G#Gf<4hyV%a
z_OV>T^ij`~ZT4{v3)e(p$pd0qe5sh1-;rHebjasAfChC2yWI2Krgnifb*gYz*nX0e
z;X=}<NP$A6^T2k;2u-l9c0(VmR7OhlOItX386pX*C1?Kehi@tbn?7Sy9O1SpG`hzX
zB)FWVVx%%Erf{1`uepm;x!7&I!yz_O`=Z<XR;{(zFfLM7ci7T9nWcLqxaxe^-`H<i
zG7`O$_i>&SqPOVpu?ABzd`QV^e#nn9$wgEvJG(|tSghqJQ0da(Wp_8~@@C2wq=BvN
zY)!nDjx5iS;vnk9&2^Q1;8DsLuw8UpI2JEffRLXeuenXNK%A~T#{}NnyROFK<(sZ=
zgFD(PG*A99A{Z7O01FiS1)>mwfqf;2U$sWjHPxXrQa3P0&E_(5#jL+>aeE)4rpK-F
zo?6Fxu(}`c^RVwp9?qW$WnH2+X&i9RRa)CeHo+f%l~q%7aBB_#;0pdNyZ^`FQnz%m
zko<G&n5#UK6qq1V75}s@A1eH706BuiJFEyI52!#2oaspfcb_RaM3zoi-^m`xM@q-3
z_cDNGdij-+71K2jh(L#&7Ij-jVrdTID_mUJsAjO(^*1eeygL><%oIL`x?8U1xI9{Y
zSG!2b-ft5jslEEclvc@P7=44Cd&!Qcw0wx2R9`B0%J{``WyT7=l9FadO`GYF@^_N?
ziMBrJv+50<@O{^J^(hvVHDAo=-hm2R_aI+sWkwv2abH8SVzCJ;X(A}O%P@F=#BFrt
zNUnqY@N3cy#NwE420-M<za{d2^N!j-)6qYT<X@FEJ7F5Il@Mvjd_803drdgz)_Vr}
zGRXXQXvN`ZFk&6{3B-0^zJ*TO%!FNr@IC_ZCvhrLmJv0EeKCAYv-f40cpg5*1;XoR
z4E==FY`lUzGmcIL><t+<|Jf>ubqvEPWs0dV-v4#oKr+>%#yT4ZPy19N-mMwKf#0<&
zZZ*ig7@@f8M!cLZzh!J>jK?XRCHb1o%Tt+$r*e(klpIHPYUx!3Q%&)ba(mzYVt*nr
zZq7O6jhM}RLzbhJ(!3mobp6Tnt5k;?I|pZ*L9^i3z-fm9`2I6J?t6~{``0oubccGp
zE&Tqvi^WI}0VpsyKYQt(W9rjLFsP%;(`(Ie0z%L#M-0GcG?$xU_8Y>j;Uzi;#tC`P
zuZy@GeN&s*0AVNsg0g>YS*8EJ*COO(YH00X4~X6*?ab`|%vvbP%5N|t;Wvzj>ZaIR
zXlms_A~^J-;Jpt7rK6s!Mv_pt>jC#f<-p3S+vlWtw8nb`exV%Tl-2%J78e)3*KsuI
zu{qvAn0rnLWB}VGQj6Cs1y%`nB5+=1GIRb;%Dqf9XFN+ozn<b0cX+6nx66qfz<)P;
zp)|L1`7<ACqxvcX_Li{ijS9<6V5d=cz~2svTI)hH+8@WOz?1nPc0Io(-KA18;|R#_
z)(pOPpkv%W+@z8zFLzeUQ%`>>cUoM&rYX20HHnKp>;8He3s0j%kAJZbA#b}vaT}k&
zoj*G%rB4QD7Pb&8Th6D*#+g2*J)RdJx|I4+(AK9={If-fNrxb{XeeC4LVBN@rPhtq
z)A&l9Gj$Z_o|0W#o{|ltVlPxscFU6hRU<}{V7OedMHcT1-7GgpNYsA(94QM2-o4o)
z4aB;AVujq%b9)v?&@rG!abII9ljD8io{R&B75(00%@qdk9Z(;W1<KaDW<gFpC)+fS
zUfCa|_An*VS%CX4_uyHT4qaa{w}m4J!^~(?bSQ4$!>1haf#m*B6F~hqXEo~{qxPD2
z1NYOoHn4tM|7l!fej5e-2RKo1vUf0ba`F5lOZq2H6lJABnUJzqnkw%ql^A}2c4Ey$
z5fO;oD!@q5-0`-@*jlk`CX5QbWkCA*3rJ<zmMee@vWCHRq<1_V?4P~vqXWt1XZP8`
zc!Qusg`hY%xNKw^h0NvQkGI=YIJF_o^g3MVmh(;$umPG$-XT7CtUT3CP;8=eV=zbO
z6gL-jh>}z~M-|bKNnecYPdQXZlZs1FcGuO77z$|3h2Wgzu@qKUxemZhK>();K+!!(
z-wJxJ!cQR>i8Uzc8WY(LPjq&-z1Qc1KKc>sb6^y()FYZ(scp-dHdWsZby*~*(zANu
z=CKW)_IMDBfr$au*zIer?C;N3CQpJq;}7P4%FT)`kNxR%2yZ=jiF)Xw`QYK6q7C%&
zSMrfdqOIkp=BoX_(%heMsj{h)rJ;?b*MDuoERLO&8el{krZ`<|JB19S0B|Y9?YnTu
zWL*(3LmID~X5-8zSt(|^qe9P1;186JClq>Mt9axSe&hnao}NBl5dJ<Z;f8dfuHYna
z5tWu=?l5xhZVcHBE^1!tnaxYY-OEGFo>9r?2z2$w5*(X#<2q!8C8pUVg+EO2s8({C
zQe<U0$kQ4NP_6ODdCY?XcLgr>7a)9yY8V0=Br~sth0U>6R)khE-)TF0TDS6wXQ~$&
z)TiA*ip}f}H1QXfALnboQWD$OGRG!eOx6j5L%ub1W4Hp#W7Iw?#&tiSv<Yb+Rl3Mw
zi^HJ7<p~7k2a;h)b<^sSx`PpE!qIfItP*xEU%9uzT>dH;)KE~i!T>~o@mmr6o7(~Z
znKk<_rTFO<{3Xq^CD+G@HYESVAqd!)(2v^_Bf9{L8WWlpCn3RTz<5=?4udA%?(zkN
zpnv(Q5AqVwjKV3|GXU0MF}-$kc3PwV{p#r+0mxjTWqTyh7*-C-gybM3>wVMgH#yCL
zvf;fngk*;rsD<ZzR->V?cSy~{+Dg>@(F)8&4(qC3GT9MoEXY$9+g%F8@XHCF3(I4a
z;-38Tz{`!Olw44@EDulF3Dx2FGo7p`8_pL&DfkYSbKzo8I`(GkH^wXnO~y30GS>Wk
zpJ%@zQ8F4g)(ZC{w=_F-=kV=+6!byn^QoSELEc$XKBDFlll3JUN=R2I+`elWRpWYb
zojgL3M@82E@sUn|b-^@rHY}Kf>jmNo1{B>YtR*DOzlpFnkui~<Fng#2Y>J~Wdj9?4
zy#O&P1W5AT0+fyos`f{q0JM*fO(x7>%yEON2<oOAEtlSh*w+d@^Z~k*^j6UKD2fQD
z?lo}9i+qh6!(8C1oEi&j_1;i_q=JN=Qfu7+^5*?53I3aN`u|Mcf9c!!A0CX#y3|h|
zw6L}ARR8qg?!%PF54EX~AC87j<8wvzC5A0SHpNEiNd8ff{}I?XiL-rutwPj+Fol>U
z(RnHh?)k^ncL*S!T1EdwkScV8?Dtfx+<QYX1jv;3c8fV0nTqBiMQq5cpdh=hvq}@(
z{m>h4R-9Fq^97rQvjGmkF)!xSN&8|<lIzbN@{L@g2$g(vb!gnuK4#dRlAb)vlN9Hx
zLB=LppIyfy{W(NPGZJ#Ci|IftLgwUtY#;ZAO^9sFj7wCuS+B{BOgCMNM*AP_>%C3(
z4ET)_f_UQ(8OW%Cr}7)gk@6iwflbY1N82s9_Sipx3Qc))*04=Atf^#Q8wr8T=OYJ%
z*Knk{Jfg5bOYs`Vb`BKyzNxxV@x=un1ybodCAlU|`eA71Yt<<~rucXkW@^KOFdWlM
zmS{D$L!@gkUu<uOUxB2YtYOEhhlqsHloti$oN3Spe0huL5Dp3ViC5fZKnFAPTN5*2
zh_d$t0Ta8#9o!OP5+{N*_L$nW1cOl+NE<%k1X_|3wnmk-MJY+({1U^0H5!|<O8l9N
z5^?V!aRY?bcRIf<sR=|{Qs+lSHP8o;pXSqQMKq`jfSkqOh7bP%a{kH`f2j`vQo=ux
zGfeTi(sWm;2lkV%7lIV($`nLklB*Y-+jyGGS4~FAVSV8Ahl3CSu0X?}*JbUDmqcj#
z#LG>lB>&G$(KZ}{&<d=fKrlj(8F7+0M9VM*sBtN8j%K1%?lrIHz7kKP7Nwq!)s9I3
zZ^Kaf3MKbg$8Ll}pg8#;a+eD>UQCA@^I+Y?zQ|6@(vV{IELV_T$cq#kD!ceNp;IA=
zfMXQgMYNnr`TG;~Q!2QIdbzSLkz@r=ngr#OKJAlxTSm-~ZK)$FLb(I1_H!{0Rf%L4
zZ@}^2Qw)JreN=rO=FOp%)JPyib?E82$)SDJ>=b}WUf%uiPGYX>jpBd-JZNfbl&N*a
z#03}>f=$cydty~@9<b~+$n_c;;;7whg>ck8&R}z@n|V62!U25`$4`l+dO?b^10**0
zTW<e1r(6G-t^@e|C#{QEIy=}Hdj2D;mz{Vf)eq>Qk<Y4Lf5~w6-SYpzlo!}1f*h6y
z2Tt>y$GRasot#V(b~7+_50RlK3Pt`Daw=lxRYGXf`TAhT_U8Nj3kX2jcX}%ztqH17
zDX};EJ)KVjd)8bFvcexf)fUh^MJTN?Q8d<rA@Ho-S~}RfkS2t$T?WAHw<^latyq+T
z(ixl4a@_V=xh6Xqi;PTzr5Z-{6nRH;1soixnfEA(ktzF}@Q|nwRt^tNycT7yW?P|0
z!Xe^U1eh%8)rVt>$FLxhcPo@CktZTARi67pB8)!|ZZM!yVTVRgm<OL2QuDs_RIT)c
zuVjaT;Rvg{x)4Y$V)_i~7}Y*lCYe-?{D>mw>sc2W>y9<1lEZ^fH(ppq?mp;TLJnN~
zkevo3@JXZ|UF9OU-5wTK`hI2T;4C`1$BwBFcR={&h6z}l32MPFOw7POYherwN@kmK
z=Y~rD>lU1HD~&mi4j<40wZd!uqLZzcMCNFdX4><D)lme_#G%(~>?XJcoV7%4_zf7V
zA(eh=cO}gqsik_i7P&Y87<PV3{Qu@$!9N4T|BRAIRXiR3ECzg1v6Y`!K=Y+PU9wAZ
z$3j5<Ao#_jl8CZRvWIJ8Vg(9!U~oV~3_GM+x6LggLO@FFomk;cgTR=F-7*$NMD7y#
z^zkv*Va_3MXG^!Q-!rrUHbWm0BVjKHhUkC@Z=?Z|G+qiBoG9gEnt7E3)~=hXP|`XD
z%Ft&YYNHrpC7BB|cd4hzGq@my?;6WkdsUWJZfgp-@Sl3)#x>nk%kkFLWZkW$b}v<C
zWyKq07ZozBOHPhtWy{x7j8$oagj|;u5md!h_0}@Hv|1>+tO+z(K3tIoEu5$Mh{mkN
zwx=(rxA35?u8o&UuL|V|X02{boS8<#tzWdQ^Dn5tr^c#=Q?zw7#x)~Ib_HbFS$Vd&
z<*kz4_2h9BEH^j|ToUK-C}vg|m6@qhaW~tkB}SarV@+wIFRrNDW^+7XLzQUFdwk11
zFOrbra5c{+_JaRxW0YHwZJdn;i+M*q>u9S*g>(o^rONd3^+DZ=r9@lW)w$x1bgMkY
zTD_4jdzxh~y=laIytOx0P-cjQ7gLbTzD-<k2u+Fk+;Aw2IC>0g7ipjIqhja}IcTgv
z^nT`ua|>Qa(VV{C2sOuW{SulNEVUY6&WjE5nsu}6Zwa{4x0qN(`jQSLL&Lx$AD`Gy
z)*bC2DOwwosEDGWH^BNyJ>5sIY34wl19POo_!Ea6q8RrEQIZ5gECu|~`8L-#k)ay&
zkvoEWV7<6u>`=$fSU2)9c;y07ugOx7@^F#N56KyjxS!=ehd*cW5O{DQ5);d<m|aJZ
z@2DU11Yg%;wfeh!tUVL~n?An7<2vH<$(bj-&H}!I^bEkj538RMvaiFl$*<8sXkt|0
zh2(jz6hss3)4VnOsFGQF4y!@@5ja;l&}d`IFt}1e6$A~=e&7cnZ2$>Hd%ygl5WtkX
zzisjQ4;18obR7N<-$;4f4wVV5(@r=c6ite1=9;obw!Ign_B{-Ussyq~A%v>}S(~$&
z9VBEdUp-&^cft?wus@3-8;;U!amY&bwY0g<+z(mlx!qlFK>ml9ji9mIm#v`kST3-;
zMX6#eD;w*vB}U|}DBQd8v#b8SQ;OxC6IUACT#6ofO;-hD?r?hILuR~BMzZwdS?#wp
zscVIcLRWn__9%rghWJ|iPGYf96>??yBFRdpDG4~(jk-prJJ{dmUMhByoIWRd=Euc;
zz1s0$9vn~>TrOa-3Z)8K?0iLqu*W1pN=5Zk+vX{puf5L0v6IR~iu%-@65E+<_}aBl
zYC%^L_O7%l1wlRYdkUB265rtuVtDH`5M9}!IY3*@G4+Xc-9+PMaq&s4GxQs((|zR0
z9vlN^fr6qJf%@*pOP9;gwQe1mZ~=tdWMrx{YF;yQ*e7gmk*1Te>7(sEmLPjJe1<CR
zu@X}e$q-CT;n)!BtInD7J|aa11Ubawcd*T2#c~z$c`0{Q1(Vx@MkWHt$|w9<3D%&9
z5V&tJ5)cf92AP0FHh1Oi`h(UUl1{#Qrk-sZ4^XfxZY|r<q@jAge*Y4v8+`TjzAdW(
z2Ttu|=w}YxTDn$Io(*yv@blmm?!o5cZ$uj*-i;fcm;Ag?59g*qVL;u#qF+Cn^_d$0
zBj5hkp?d$f@>ajD7yWm*^{dLpg!D(1ZT1>+#sC@z3>{uHI5>&OYgjWd$o|3PS?<yr
z4R9VM<dRr$7=veRcw)-ex6==Zb67A)GsvfJVLU@0nuns)Stxmnn|vZ=O?<e8Kk2K(
zapNwyK(_6f0rYT`UcLR(EJZiW2a<wSvzi1bOm`fPAwF?ipRJ5WUnV_f@w#3Y#RhKp
z?3jqcbc*CKr?U))I|0kqqyoN6!uIGk{!D%O;KJEtXf^f&-zL*kYY@XgCUR9zICKRE
zZlmL6fzQ2my=^w<z*|2R_9p3#a1QWxFaYoHU+4V<|JM5xvoSPx7P2?-{4<LK$iD)7
z&>?fHv*xBHtxk`JJWS9NK@H?ar82Z&HC_+tmg5XS0P{k1%k)QI0-0RpT^^AJUob<z
zOxKfXLh5p<IS^;?859n(jo3`I0c`$;8t>UrykMDYBSv#^t8*W5)kjL<wT<<Qk59o3
z+r>t@#~-2<j>lD;39H_>KC3ybv9X(ucCw|zVLSIjk^{=y&V%F>E^=~U<Dag`nIe@u
zFKvc)=qDW7+KD2k%Vu}mo4#_JE(g^~e0T|Z>SH-vf*!BVntf%woY$cZT42^3x~rwo
zv1>$SY2{LGvJaFM(WY+mc}0CO5R0sxhg}<&*^r`ul*+QU<y}n#?VG(=v4_g~KIoT5
zF0^|Jg#0lzov3f$ufqx&IRCwMNEZnP@;gdpmHaXwRZ8D)OL^?eu4RcSWk$x;@7W|&
zZv~{2f4QU#a<c=X0C_F`)+POWGW&)3f5<Fb>5qtWWqhro$qM}?=zh@uJCO<)dSr@F
zK8=sO`!E|@Che+?r9l7IRWIUY;lQz46colu|3NUzM7lHi9}#D%!(MLyBs?MlcG9Fp
zbb#@Ub+gxy7_Ub?d5Y%5{AIfI*^E{G<DL*K1;q%ebry7Vfl>k&0StwQKq?kY@=o?l
zejj^KK|fVFyM!w(c_2+b$vF>=tH|Q6U`ckgBc(EzlE<ee$0B=|v2CZ2n2Y0xS}Ltg
z*_d;R8~%K56jg~ivU1@pW=d9VU5G_-8lw(<1yK&^IKjbG<l<4<FZ#Z%+5;9f9GlZ(
z&WoxgZ);yZMHp)>1I-5q?#4iypV3Gu+{v1Oev=S|u=X`b0K_ovW7{@-euyR?S=Ue3
zwGqq|-a1Jk4&PRl(t(5Ezr)-TrbOPpQve~N4HExGUT4}THKl4uGknIdkxt^ebhP2G
zTXxvm@@)<B5$vZ5I=nWf7y!ii^|#^_{(CCuWN2&pKT@fGR4VaP7bK<TQ|3VSmCk3n
zYEdrz2SlynuaPv1Dk`OV=7(}J;7@g}J3nUV?*<@l7a}!imx7^#i}oq;u71u+Z!muW
z%;a4FUE<}i?>M67fYnl}M3w^UtgW7b&v2Hjp!D2N*%iqSg%+z-p?MO=-+lcN_QN1N
z!bjE<L*5n$H;H49WQtTBJL(fMwX-4>8bqzq$rvft?9NDOn5mJ7px?dq%U;y%=Q1a?
z68&@qjF_(pF?v*XgHW1=jf)W}Xw=l>N_JdPt{=lZgmjw`XiP;v4i}(-MtDnEO1o+$
z19zkY3kcG+Qq9&9IDW&d{y1L!J{`p+GqY+;Q8Q30*P*H^juxeOck835n6O%?g>P3J
zW974q6QmfX#kbb3L-&Q_{SPwaa4E$HRM35NX1kxy`$<HU7v*LwF6PDO<WGX7+Y(cH
z!6JgMGUg`scpe#+k$6~3Yj!s!C1k8C2D%QFAZnk6+s>@%;%T~Lb_0Vg(A&`DMyO^#
zm=(Qhg)WqgQLRZjDwtwtRPS)1(+~P8whPS}PV!8nc^oi;crfKch_k{sdGiQ7moKr7
z*n^l?Gx`Hz^zc=}e>chpe(#1XWS=>6-K_hZdU9i`QPPH>8e*c}VUNB9bqw=_Ven;`
z8?9Zc8$MXJRg7x+E!$}q?@7qQy5jr6ma<*1t-yG;*OYDR=~?I6rn@7x-}V;bG&V2D
z<F5`2dpf=^cmN;{|JI)VJuu3eIy)PhoBkuHDOSF)pHo2Ni^b5A;=odN;q;RSFHw<6
zN%Ke5)hG~Dh$4;3l~UI<x0JM$e5t{c&YHEjUj@W8`r>c{gA5(y4+mY&7km#LT@R-Z
zExAAh`3b?{@Zjza>V1*H-Y_a?tyE(gN>H>{(X!Z<=NHl*Jw)BMM>XqooxPWh$4@?!
zyqBE;_y~=&Kg1{9K*!zT#c>7PVtNR)*Jd6-rf=~ALk;sf>%~Y4?OpldKT!*J%-S|`
z!_A33Xx``wo0oO#w^|z6aOSfadFWBnZ^~|5-P47-%)5P3<2=&z9X{e}BoSpjLxl6n
z_q2$HpJdwTDuL`eyRRG!iD;0WX3eVJS<kYUqHY`N`MM$yT-0vX?p8Y)$77y@IY_Sx
z3CW%<t<>_&DtM$!k>3OS*^GPsD+fyxJO|za23oyrB2^pa_mU=SXXte7#);1=CXZ*@
zii)8_mnOvg=v=%ij^L-t4S?oTOIjA%Y1qPbbM72zR9#9mbCDMBuoUc>1?`66)?KVZ
z#k-C--mNCBni*xqV;|@{HaUbidFR|w=ltMsiFZ+|NGzf)BR9n|JzYd@Fgq-waG0ay
z?_>&I@aSc4T9BgLlq->>^^pZaMqrJc!Ba;o%q=y9`TLGJN3Jo@p>7rRES+D$A`0J<
zq+7?#hnpx5xlJ~RyxB*kmHO15cm_JFNVDGai!sBXF~KNZ5u!n(wmEr!1*3Y!`gT;q
z9l{;ReGoy$ZrUn&*!z0+Yj93M=zM?yfX|Zu2l!Mob#ev_GyTQ-{a4nk>AbCJjau&m
zpzx%C7@{Q@LQq8MVtTRq#ZY#VTslGb$oP?)0O0pYWnsjB71Tg9OnaIhW=Q<-p{o<L
zhYK&15y}v&4>-s-fFB#sNXMGdJ3D%8LyXg#JOd8!<J+)UICGZQ#!*m@O)4(Mtan37
zVTQMz%xroa%&ny~Q#bY*bgW|4U<YZeJ4T}`f?X}1I$6A^755jMYKhFrsT9i~72gF}
z1d&9V=7-eK4eE1*6U>8~`EJ;m=#=_u?kp0jPKK9^LimkIR#;76$Y{c3PtU5lXm+qY
zIen15?Oa)4?=M#Y<9r#?D>tW6gTOq4%7uz;lUoC|izbiTiYi!snl1r>fa7*)KI*Qe
z52Ck8#Eff^W-n^kC3^Q+JRbr4*}A<&4q9Rp^6^)e^G0Y^oE2cv?0;*~#Qv5=`;{RP
zbu+bd`HP&CW$hOLb>!6g_Ae<)-+_~AP$63l0F7ErLbc)O6>7Q>DxKbmmfYIIAMtps
z{2<>#K>@SoA!($=XY6Q}Tq4cpn;o7vcyBLvuaH0;p{2SW3n9b09`6i1zba(!r9?A;
zRdsuCWmG7QZcC0Mqx*{YD2bFS@^hkHc7U(gPHCm9e5{gm-*g_mUpC-1^^gFUW%Xqp
z^4cH8Ij`fXr%%4BYrqbX!5EF$J2;A-V|HI!UpdkF43fP;Q-yt~nms2hl&xZQ$vVVM
zZZKkHM^3X<XGMJ#n5^u1$*ib1DqIZet4KaOQdAiNPd|i=&D*2QU~n^?b*B^WK9C4~
z1ddu6N5Eoa4Z&2aR>%x@tgobdbu&j`CsxwvXe&Nnr9AM_X_J>H*L=)*Jg{D;a3gBy
zd3O|T_k>yv=UQGZEc)=xE#w7{CHJ#p+G7LWn=2W|=f}??yAPjANvzDUSN5v9UVK%e
z@Dj`**&!C+RD)=GDy3@uIc`RI4Ps<o41JRuzJOQha>(?ozd2Tsyzc?=Yk3sC!vLr4
zv*mYxYy{Fhx?0=$h5~f>y>{Yxbp>X_a!_r@j;0ynL96brd%>>9jHcPOGi8w-=Au8y
z%f}=B3&bP*PtQoO)_i6GfFq*cD*JzcqhI|9f5DN`m!BzD{#E%?cE1Dmw@rigx}Pam
zmp=L-huX-NgywuR>BNMRAimI=-H@MI@={TV_4j3%qtIKaH`y0id#BI4s6h1F3!x;q
zA8k2_6&_d%Z!{b&p_1A=k%7n6-^Gvy$hC0f%!0duCFiqTnN4u`fSAv#;1JYd<~YdL
zLQ*B?hti}Ywc^v@bN|RxLzX9@fIdK=W}z#0F!~fNbe47!Y-yfE$raJSOC6dO0aRQQ
zRV+{}q|oS}j^0Z~GNaYNtHvx+9sigye4siPZtJ#>GkGJ8-Vh!C=`(NALJ`jN#rhY_
zo5K>llJCn37#tcg3@g<5<(zC&g^};5gQ%p9@Mv+%3|6~^GhNk-*UW|KXAHb+y*j@2
zd77p6m@*|!A0dTYM0xAf$mM<Jq6blbOHUQ`e-EvW-EG|zXb-9i6pgVGeomw%-jy;8
zXWw(qU}sphze4cM-VibqOU>e|UZAkWeqE;#56~|<7p33$W(SZk({B^1e^0`H+zpVi
zbTj>jgo~AR<<S6Hq7c_%-5ybXl^2g2LH#T+8CJoV`u7Ft@B2{nB;60pj@B$GY|T-9
zL;Z$-b`$`%Qn(Qd&X`=~J3D(HY&v^+J>M)p5Q;QPPQP0VKXMe2f9FMQ(PST`WVz`)
z)uxM}WXWK0)xh-ayO!6qYlibtu4JOKk+YyRgC02vS4!QG+6PWNN1SGGTRc_rvOxJH
zb>Yd}=sH0NQ+VzUxvKHq+lf^nRncz^HFeAZ+40=;+3@U5ZAnuNQQaQa_voi^blxPS
z5q+^rgd>6AuJdBU<#xgEmyw^P!gTM;l}#tfkN9q1v*jw8oJ;z^ZL<uF5pfgc418EJ
zSAwLhBR~u5&oT%C)jn)1r7I7Y)4{M~n+Gn{JT@DDGP6{;vt#e-KS)#3Pg}q)+Za*c
zTDdv<J~*-TK>@zsbM!5N)fblC!%Y*RtV$?alDcTrz&L{E5I-~9-p{}5yhn|G-$zE1
z&pwe$$mg}cQmZ=e)2ax8Ffoo_N5~M(x4@LQM%Y3x+-@-Zx0<v=j*fw5B0*=38;|xI
zIzi+wqDz9!{wsr8myJ*c5$Cc21TbFV$`07uK3eI4wgajI7@u}{#7}SYA`ls7#bvXS
zT58W5dH%=)$$5>;EdqeV`&+8`d)@iM_O`ZwzI-K9X9s&b=RXtjO)CH0^0_7?4V~)L
zjkeHb0PXP}hDa1SSqmijgc`9UFNTj9cd7kc@7)#h3lieb%n%lj994N48VSKtVfNKj
zmb00;-^<HAK2T2IE)W6OC8Pf&5CM~hz)QlezjQ3$CzPFFH8?f5WTE-Q4Xs8voR2>Y
zXTGeRTPKEIQ53T5G|Z6a3g_eD44QKK=C`66!#Njbe{3pJIM;nd__R-jVag51j?m%s
zu0NpGh_bFS$*qG@%2Y2W-Y0|gaHs(Kp-S!9m{p9ll|+F&>HFk|VG;pa3;c$2&r=sM
zPpvC^VhA><2bUDbWW2n|2n@R%jI>BvY~E`N-C%JzjF#pHEZ$tix1{@%aCRR-0jH-N
z^M%rV>IZRcQpB&&1Q50-Tj8;ul%J*gN3iqfre5j~!NKWE??6v?)4X)%9^YR(;>z;9
zYH^fs^B0mNd#Tp+Z?r)x2R8SI+=hyHX~Swc;w8?HXvIq$i=;oDLdQRZkwoj3Vw^X8
zzvlSR9@!>qQkj3+L0_#^)EQwZLmFT`ZQ!S5V0vl8AH2xu{^rSvRW%tY8l)gj2NCvW
ztda?bMLVNaG~BS7cZzUmxm@st`YCmUe%_ZX6c(*RVoI{sp?bE>#4sBqHD4Dz!=wf%
z?t)r}=FD}46S-aSyItQW0iPNF^;=zk9*363hmVC1(y+lHdRAJ8d3Ufs&DDJH9ULOS
z<@v9nrhh)=^Y<_)X=e-=fwD9IGlu#jqm~WuPXQf`!{%%yTHRWAUvV2TF#%mTVG0!*
zFaByB_H#^jvSz#I<lB{hbm8Ds7=Y)0>7QWqJK!Mv_G`!ouU`*T3*G`&!}YPRc^)4M
z>cu($q(JUrZAFD#erd05q8L{|T9$yWTt=<5sH0i|W62{iExNei_8KBvnQD{etIT`t
z&pD&cqPxUxeR0NiepKgpp{rs22^~{cf;{-<SjgDZ#Z@qzZ>9YltqM!|$)M&IDns+x
z-eaD!R1FWwr|J?vmONg|5^-p@oytew{L{AZ(&xxM@>%#tdeO-y3SHdV3nMC${1XS=
z(sX&XKJ<LP2ho}bHYuS@cE18cC4@n$1)0YLdyysDe&2%=++^RweTrKZ`YqGd4z=0$
zu+_J{nMYt%*B>x<1qnr0iMB-tV2Q}zI;MYben8L+Fqa0P3I|J@zZjgKA_8SX3z1*r
zHa@)=3bD__1w9cegZlIsga$6YVQx0Z<Vp^mZjv{>v)=l%RqD#EM;244UBXTX;n4Rm
z;UagM0jP8(st(_nVu)T?#avEv+QHq0m#KPtHIpS72EFFSy}B_~E(&nUUCU!p!Y=!Y
zoP~^Ub=#A^V_VYNk-<f8j96Ge5xhJo5sol1-2#jug#J;PJ29Q`$Nc{E28_D&Frigp
zV%+!7$*I=0Us#o%#djA~Oi3BNY_6X!BcUK8py?A^Do6){W|N|;WlfLU;<9Mtun}^D
z?kf^%D%32g#I<m@))wH*D?>c;!4}*)yh2UcLtpm;n6qkFX2S#Wg)61~0`IWAR`QfF
zk<ai4R&1;ZK`W4toBj2F$|RF)n~MM-6QTbHG67Jwi=mT?*v~B3Kb(Ljr9avU7uK2x
z*VMFo+aZ63bwZ-G$$?5}Ywz^t{|xKsZp|Ovc^^Sv6u-LkMn%p<h8d=%4|k+;czXMJ
zg8Lh<z#H)RX9H;gH)6Af9Wn3M%!H_w=;2J}xqV_=%R!mSH=c={ee?I?<ix|my}6vt
z5HW*xpGEznGPIhGp*Iy*y5xb1BU;FMlZD}F=(80G)=r*r;kUkFSj#cdm<qiqO+f*}
z(8R7sYgTk{i#aD>t)dZ@vc*~WjG`(+bE-@Yk>D@%1%)FhVKN;%Nt~IyF1`5R#(>%k
zkRvtr<w!R=;u*h+sgKAl_2>#@<4YtJ5;u{MVwn7LtP^)THe$j)(4|6J`?}au7-9fH
zF+PfyD5mx0^%)qOwM$D(Tx*a8V)yM)o(uvG2F?2RO*38)2v;S!yh5p3K?Q#y4=Qtk
zx(8$7W@Chy42R<ej;m3kPLKMJ1tgcHOQS!Nn)1JO?EYS#{IBRw&fdk+%+eSz0cvme
z2OBo2{8~EFNnj~FZcrHA`-oM01;n5MLO_mAY`chrYn%*4-O)Cx>)`lp#EtrX*<%|$
zf-t0YbdE`psT`fM-p)y2>W-^xDmGWY8@NY#1<sH!*qe9*aYqme7moWP))@~<)nNKa
z#LJR3XpryI?0u300)9}BGD6Uqcr0SHtmn&Uh71O_`=~j6lXzvw*Ihcg4m^@+Kw*JB
zQpj`XN!vxPNTd0fS;Jf1f`J83f+7s21t8ia+49LK=NXE;&$S42Tkc{H!xo=pE|W!)
zk#5gz_7$0EEwk&-(Wf$_9ex^Q{wYBZ_vkf39EMmE9Yt?WI;JK|gY;p85EcB0IzV$w
zlK7@nwh|{+#$H-)=4aO2wLXM^<b_M==qKo=I~-3DEeDDQ9pbIn?_sYyP{v!?ubk96
z`Q*dM8oUL<XEI0Vdepu|y3k)DO{91jXk{0}%7brk-eMfzb!^9vUN+4{^qoteT)#$F
zvsGeKsfzOS88RE2^6A_#uFf-=o;G%IpeMSSz~Igo(V*D4p19;D@nZ94+Q#0+e0vSL
zGOB$kU4UyoSj_0X@f<K?d=yA+8ujl5;lm`#>$V^<a6s1Dvz}i@d18pyExH(I0t}*|
z(1ONw!eo!>1toKTmb~}c*ABr|@ksmtTkFOyMkm+Nvh8MiktKGK0B_lJ+$mTI{plB{
z1TN3BKmzz=^|xi{zc*g+-&HNrpWpqXnY~zERvKW8eb!4PajidX4+2=FH4l@R;uD${
zOd$Hjx=V~UM}wg|>XH7<HsYmtM5Z)&6a{1`$Aq^%|F7;UogL0z#$IG$k%A;RibKq(
z7z?oFK$xyuHN|+QTb%q;zVC)j@t+Z0+E|+=_f?Mbuw|PlH?lSD8MLYTkBw#ZlCL$n
zn&z%kMm%<siH99J8JoACD%pxFq|cY^b>dS~f)A3}HuuET`?xKiHn6?c)R?6i&062q
zmp2r!wno1AzgKNKY;T`hvl3$n&3{uyFc+DVYjltc9Utm`Ga30&$6{u1loum6Fe3^E
z_Kg@Jn?9jAmLCFmH%|uiqfm*34<u(a<kn9{f3YBgh5+b(BjD>_*A)L=kNE%Li~obv
zi&cIt-sA^ep#~R017q+|zwDK~9Ry<tSQC>(?#m$m?zSQ~HuEKYbi#(jZ}N|@&aDL_
zpbdImwk<vT;{W6A9fNe;mM+m+W!tuG+qP}nTB~f^cGW5yt8Cl0ZQR=XoWA$;cRNmW
zoap|3yb;geH*(I*F*C;)dC!&da`^V}HY5k&4lz}6T?uIgojh%0uzZIqq_E@=Szcen
zH3Z$Xw5YY}>fvtgLY<J>E*m3t5Tt^B^Jx{N`v}6O>V<O}il5-l8*UZQ<GklZ9+{%q
zN?FOIz9N^HQfn?n21i(1miU<31HFk__>nP@>(YB`Q=$@!{cJ>ZdfcI`GwK4O1Fvbp
z?LZ@sB(^M;?T&Gi?92-TZk$psSE+yfpxvE;sN*(GG?n06SWHxV6MZ{AXI|BvJtG_o
z_aM}omu*OJh}o9B*x7%cYf!_9&y#OqPiBM!(S>vFyUD|jXs~*X-6o1x0Ngn|W}Zw*
zbXF(BZ8%MgVkq*+W)ze|Y*1U-gg<W@d*V|jEd(gZ5b>L)lE`L1GNTCnD{ok?*f+GC
zN)wrLawOA~;1I<5t=FTW%Yp&dYTeA^n>IO_MeLammO}QdOxXiouB|lz-fo+DhlOZu
z42lH4B}x@%>-p^y2W^V1W=ZcSYfYZcm@n1IO^=tJOCU93s9V^a*;5gbHiqVy+yIu6
z0bM4_mFFr?f-W*IR1j!9xg_d8&P`6paPz*%SgKb#-PyCK+s4AY1_=a;6wAw`1WjrX
z-bFjJgnXfvD_H?qMLP$&LMW}&520DG06d-<mLAj!7+pcH_e(b*$jO{W2t)e|l#SdN
zAsG_fw%74T8(=f!^qPGMKqpiM$T3fg-Y?!?AzwlkUkZ=D+}4i}AK8la|0r$4@Jt(~
z-^nEc?En1n{(AxZ|ErYwm*IJq;@<?$>~G9c#W#@9<);f>3T7Zulb=fsu5+_X(T=s$
z(4I!Z_b&ua8p=}e3j%4<m)j5Me;^hibl@6<Zc_j)=-03~L&fhm8RPQiTFhWR>N=Oo
zwYUZv<MANnQm+RQ2KPH)rl`4NHZKNs5?$*AX=Y2|O#b!*M5j{Yev&{41*)@(#}LyF
zFrF`j-kBKml=z9qqz-u2-I_7A6540qr-UYiQPB<?s>?YNTh%^eHf;@c(4^?BYH1a=
zA#0Y$>A<lJWwo-vjaz#E)}T!Qr#Uy%GLFZEGR0MriUh$_qo|l*|G>6+EwUT3Um_hE
z+)W4%Xh4pTiG9boG8Z&@gL&07ouLh=je5~<Asr|{&aA7&T&@b9W2FmtL!9luC1xY=
zDao|o8OZzJ;>!Ol3n~4r02Q*cwl*<xHZlJHve5qw_Z7GJ*+A!m<Pj>B6~g_A+9t>Q
zS-&MF<5_;ZA$EIzG4lJ@!m$wYbcmn+f%apjn%w|Gmcwgtjfe(|`ISw3kcsUZoB6H{
z$m<oZk(6YN)BcF>iG!6?R?1}(Dp_d&%kkbN=Y)qF{}vxHw!JYncg}JHSq;OeYlGC>
zcA-~oj8|>V>yR4aEV$%T@*Rglk;K`TInhxpVy3x2LA3tR<Z62`&XySjyz=DDah*!7
zNqD9-ew|epU4I$;bG^uzJ!w`RfYI1}>2okFeP2K!WBJhPlzk{$)IDR!fy)jocS(o4
z2gmJqv1NtAu4`Hy_lrM3F5zdeIYdKEuMQHz7EHf-))FhHHqm0$kH1T^nv28DUvOXi
z--hKs(@F>$7+E<x8W@@Uvr7DHT>h#3vy!QNkgM`M#yTDVdH5zWQ0?RU2@-8KkFeUd
zufSw%2;zNfCBC(}^1FqiWtxGH@T^>S6KsFH_y1NAP3|m*G{J@NVk2CO2Ag!?PxErX
z3|Wts)(d`*F`J}v5yF%i&Y;QQKM=G-RtuSZ899+?3q%<61T}1t6P!JRoD4@TY#SD8
zlb1)ciUeAJ^I_jDyV}_cnQbScVEjZ5LYMTdNNi#+MIrn+`ZCF2QnDAif~tD;;21K-
zZ;_UKMu44sqVdi$rYy=+rGWIVsBoRzRmD(N;HDF&nqLqnWNWC;tWKE9nq(}F|3T+C
z{_Dw^G2^HK$HL4I7d)&b3pavnu_jgRR?$^e5UE8S=HUm&46k~YGX{{~;?*&@_V0u&
zv0wZ!IWX@gXD)y)%l+*k&6v+MK_wv@psWno=DTlGtCR7ow2J^Zd^(T%KYg3JRKNi6
z{wn&_`7Nco-*F}Rw}AgYi>s1}^Z!@@^f#ydU*f7b_T2$N?wngJteUF&nTrKB9|Vuk
z051$FNVFmsFO|ue25}d9&-9Li=KBkeWD|5f6#U!g2sX3NL;LXV>;nj3a)&;+6aCSM
zU7vpOIUNcm_S+ehldb9Spq?cP8pdq_>L1UwOGzj?uKg;O%|uazdC)1U9gr)O%b?%L
zq|l^km0{S_VO<j``AFIjI(I{cVMTJE3@<abLEnSA047eTAiYNSPLYN*3(V05{w2(d
z>q+H`{oq>}CM4^yGG*jzcA*?7Dv`XJ>e}M0Dj}pM@YOL;rxW6yW=$+PS>nNM!+K1)
zdB4iJ39a{}n4X!dM#h$P(`p1DP#{jBS4``EePFJ8OhMr%07LXACqSiigd5i%U4OIV
zI@cdJvA%;M@oz8N|K^h3|H4=P|GmQgH7aX=8PH@w)<NpR4+#I^|8{q#BOL@&?=kOy
zXW)HSO$H3IZMSI0dSStP2jClJZ!Zl4mB^LII7u7fU?RKwTc$E3|B$=e!|KOa@6xwY
z8fSlS+Qvm{?_lp<Ad>?MR3L;9GVdy;Og<E47*ARf&JkyiiE-haOH!P_JhMe@1{@xh
z@=HwC+=OSDpymmlicIj6xbj$BS4om9xd<Y23jTdDEVXuh+Nwf@>$1h6-^Vmd-e<m?
zUhB-Dv${`QoHwnYbsGDpM{MV)H5WahV^?xKShO1%pc)i}be`mf<=HZDM_4)VBNN_L
z0}>B{F>aBHm{2l3AlaSAL#Qah*Y7NM(+|HU?F~j0CW;}Bbx^@=$4`dhrqH)UR*7%g
zyyq6iZXob`>#L2AKo#<<Mjqe~K&jYl?QDM7+h?soJ=_~WcXSkbO@UwCl*nerQZ<iy
zs5cMi8^hCx`5EqGQ#B8N%h9d$FSbp;1I+nvZ{2?uU{QnbPL}b10o?z5YJXePAPc}(
z?bPk{5{A0}xY`ElU=MrMuNxFryNQn?rX~nRo8?l%@VYp`ZSx|%A$lkHJJ9Z?%Op?;
z2_&!6IyyQf6|y?7N7Yw+p~nn1fzEV=Zv;Hx7CgC&SXNO!6T0FDxm`=?HewJ*=$6Of
z?4}`e_lJuD{1xp%kBoahC&qd=QdLoCx|lHicfV^bkbgFjCWxT6?n@Cjes`k69j!XT
zqDF&UtP9{KkF(;dk|6A)R3*4_-4b}NP<*~vj-qG6D#1G#MK7RK=(Q)37Yr~@5EX~J
z^$M}4M-Nrq@Ffu_^5#m9s^%%Coswf9UAu<Fe$eFfI?F`4b7C|qh(-XB>p<kn<B5QR
z-u20c{0>JMBpnNsC8g8RHKCp-myeKpxJGhh-_m=LE-)g=VGpLD^KOV5%5;vVxTqVO
zQTAo$#R+YY7vq!`%}eJ=>(w!cTW_xIy|@R%etQhkd~G(&6#Im}c#J5o=22QkzboRm
zy@)yCDMtspH)hQC!iV^>`%;Jk(&W@)k6ag_M4R6HI`$&!W=roa_nkk722G(AuoBej
z|G?hozF+)7)9sFt0^BOB7MwfU66vxq0|~tZz|P8yU%j-A<?J-R2j8KIVG+DoBR50S
zrZdJxCU><M&yNoPxz#oE{`V|)>s3_y>ieV}{@Ve|f2LegaxpUc<_7&Qk6M=Eh$PVW
zQCm!%X}Ma1J01Xiz!wHaA(rH~7ye$CSR7f!vmrzW<QvGh|2O|IUDzoUiZ~>%__g!5
zXLZ{qpY9fbJ{l{bdXzqmzYAy_l!X5z1Nz2lmr;!`N<#|9rZ|}vWXyLT#@&LM0XE~?
z{^(X;hE!-!=e57+(Y#TfyLm99zf}9X?WV_GKnK;JTI^1$P~-v{)$@BO?;yvCn}su}
z=ogaFe3bl;vUzod&&YVJ!Q5HK6Q+Q>s*9hP$YAN#$jfKK^0?f5EE=TWAb^%E#$B-J
zG=OVD%1_XTt4h72#DgX_UrYfUw?nyuB8$wLFxe&^k(#mPL*TjkMh{hS2P8%&7=|&w
z##dN}5UU}%ZDPA<O#ou!Fr`XN+S{kp4P8`Y%bsi0vKE3huSlNx*F;OZk57M=B4a>j
zPoQqXsN)3a(n~uesMAM*Q4QbtdHJ_6d|J)cx=0WT&?r%bBBSUobeH`A$xWWf9<jKq
zn{vRStw+CDD6^m*A@!;cwG>_cgtiS_DywDPsOq0mHU}!!zNGI1@%C?1&wq9xRM}<!
zws!kgv;FPt_OIKg8WaBMZWdm-m7hO&4d_`LMwW;q0E754Y}k^r0UF+ZQG9`zJ@J=}
z4a2Mg(J&D>AjD?%rR45yYW(rx;speNcBel;2re8K8-biu8q1ds2nCA6+|g+H7m~gi
zoFv@wFu6ojXhP_mX!C~UlNfhRk`o!IP*lonYWj5;q(y5ob^czRv1%lTOhX-|Jc6Wz
z<q4Z`Q1{^l@pc%BBqm%mMCNN*1K}Z$fiT~$3PqBMEU7(D$TNszlKCqCRF?JHzH6x<
za8l;1OaQ<N3(AmmFfSW~>7ZhW6y1XvA|?ep5lavR>0_{lXzm|p&rpvOXrs}KTJi%I
zXXKlodz18a5N;~vK)z&*hGlBDtr1yMUbf<|hW&%fAr*Yk>Ti-7{qtySZ}n*B%7?+C
z(y+&3RN&8Jqo2c3Rc(9${5G|gW_QwhGT8urDDSE_Do2jMjy1tY-mbl+U}r63d$vG8
z?9j{U1-5;Y*e+;~zDf+b_Gh2Wo&eXde*wK8ykvde-*LD8zmN!2+5hK=3;dlI{z)HK
z)RF@HHbos|p{pp;aQzvk+Ykck2^r6y4`o7%BKW<V`*^txtG?h5)tLbKG1z@UetibA
zy4(zR=2_;Q&yoG+W{%#EbHfQyzyW5{n#BG(7^nea)p&IiaprQhB{4N<G!{L#mbnFA
zJ(yQ+^DT!1j53~`+nsE(NK8rJYM(u>E~&CNza6sK1Woi6+e;SGwBTvK`M3F&d~Oq1
z^h(9n5qQ4)wRi$GrR++$SDG?A;jtp|yhE;D8^|ibpNNqezah~lKf5i`B^Mlw;o%7?
zh`#qVDt{`?c_M!?n3V6fBye0<{mjMjsO<f*__L&T4oN6Z1k)8&q7Z%Z%i#pN<g1Z3
z*n2p!z4z>TOjV8(G{cz}f|D$`F_udMb%hyn1ll8$nTV&J2NWv~K`7an5OOt@B<<t<
z7stMMN!-wTp*ztiz>QcxE@AA|Dz+a=mwr>J-7_OyjqOk<9|3DRCAa}9Az;McU_SoK
zw#xiF#z6n}ZY%sp1THZXTN6iv?^pAG4fa36+?o2Mhb)FZn1f=x<4Ebx5QZrwh&Ug(
z7mXVQgB7k19F|_HajB}_vDSG`BRuDIH4wk)r67?X*MD#7d3Av|LN-NP6LC~_G;$qq
zxAC;Oa^zv=YKrRi_0#L=2l&nwH?n@jhIM0x4KK1`JKTkPcZeeQu@DpPZ5}Y(8$CwM
zGd*m~D}0X;WA=4V%mriitwG^LiO+EJOJt;(2{+lE2Sh84WP_59o+?R?UddUx29^pU
z1Pj3)2pdLu{7pWZ%9#5|gr#xEx#&R=qwbAxn%6=^>e`No00viQsrDc(9c9AIg$Myg
zwTD7b<Pr~GdB@HHrOEjt;bQAhMFOl{n?fw5S7&G|ZZ+A))~%zm$J&?!^jin^&{H&U
zD_j0cyKOgy*A$HTV;9!+84z3UdPp`q3hyl;?3)qYE<c}x-FF+$Q{}p8Y90CQ!VPHg
zsdXu)jBXuy;g2&=^bJ)t-ol?pLf7{}ssN#v#qaGYR~?~JrMa#qN=|!q4~<bUcW3Em
zm{^NoFGhEVEvNToEcc<N7QwW6-y4k90C!yHLM^gt`3dV7a!-;iPbHbBRjR0x7mGl5
ziw!Ugh(?t=<{;-WYg6;ZR7=BJ^2p}%16<4sDf5(j%c0j%oy*!5^wn2EX)2d@PhK4c
zePiW^E%!8)b@bDNIrJKlY0_iqdl%8^VdA8V^K@p`<~>ahG2$jfD7?dA?G55Mm{@e`
zO(ljYvsVcT+80Ah5k(iQ+E%AAtW+jUi&#eWAWx%e5N#BsC!*hc$D3AJlDnt_6w%7K
z6_BN(8kFg-#;DcC11;-{864iqW#N?M?6itW5hbxU5)Fq+hzySX0#PHx7P{k$2ZIL}
zVOgvvQqu(xBv2bB88x|xrP(v%fVcc*3|MUC@ZtLKNFrTNZ6Gr=*EPpY%;jX<rz4`s
zlM&I)dnIpij)IC2mAsNjDsi0me%$^ps$YH^TBS6t1mZqEyUH>qD*i3cCaz9q?(6li
z;ow-IeoAV^>(o2Q(H+pW=QXr~0qdkdnq`H!3f37oFZ)QTmMN@IlQ^`WzAN1@$4&m0
zMQL54g27Sr0C@aVR_DWNeCTvfW_>ws-*6TAz=Dxws;*PI(r&s-5YrtGTO@VU$KM+R
zEBp~E@YE+*g2%UG*8VbJ>)V*Ib$;m9{?cdrnRt^DXo`SDzGv5!IY13~NpmwL*gGrW
zEq4=GgQtW)N(lH7a<yB)W?p7%?<=P|wT*#Ww@7#;=kcSCK%j2H(AX+)I5{QU!`QH#
z21(gQKGM1seT9*sj)0*K#c;7IS4@>cRCPKH-_#FefV(a?)l$f?Nl1R02+7GG#AA~c
zrpvkreu0vp97RxhET}YG1DJpzL`{4=f&dwrvC&@^h=EIB969u5jf%W@ITl`pA;e97
zdKa;w2e@+(q_d~o_&s5T>=)7JPffv#Jd?MD%qulheTm*_IP&Qab4r7jIWa*o2cO%o
zJf_!Rmwk>j24_=~Bq4KDY{~lDZFyOv3HbD&@{rj|e^aNJ7o-gXHltO%J>qeW#RNbl
z`Co$K=mFG`^?%d>jiK9wfFNe4I)Y@IbRtK^!?1a6*y`MF4bf>$&xri6jnQm-i@P$G
zAu=2wD0URJ2XUMDVTjtVu1~z^zwL5k_ts<2*14OSg|;Rh7Y<tdU#L8?WON69s_msC
z`*V!=e>Q+r54cbO9~k$%e}4|aPyjn6fD9GVxD(k*5~QY3yBn_hv+X4#`*#`lKv+O+
zhOa4t<EBuvbMW-MYp+Lhy)JG5AIW}G)vQA53%NV7A3KoTaMqpF%d_3~vID#%!5;QC
zJC<}F>a#TcBzUf?H=__X&=&*ZIxrWaDslJkES=d3vwjbY+ma*O`c>Og4I<m_T|99l
z*z?Kiqal&7XKUF}-#)iM+9PsAW6R0n%aM}BCk&75Bi|z5D%XW_M{#Fy2T+ri#Lo?%
z?5FK(7(-y-OO4=T5RMHy*7;WwR}5R$1#@R)3QQ7D5tzl*k8td3JK}0cO_HI-LXC**
z8`ec@3(}IDjhGk%t%%c-O_8X@$`~`X##<9i5vj#hjIiv#?1SuUI^wiucf=|Wt1?Q9
ziYKk}H^p5PioV{kv&IwM6!x)q4T*4gtk*cC4!`|f%o;50B4t6p-MNYWUBCW+)1CXj
zG(rB?KvnshcJQyz<(qII_m6%^cxf)#&tGA>*1He~!jb*(Aob|B>4}%%0~@Y$u3>*B
z0{FV|OwN;I>=6QHaMRPCW<BhR@BVgaIkHFRXZeNcXF1x?lWYp%3TCvQ+`TtaH7mr)
zDyc{m&n&un>B6Pd=5Q*(J4=b6At-Y%7}QWo5^+*Un}&i^Sf;A#fWk#NL9Ii%g)iUb
zdyuM`R|v8Ft6L#ef(r2*iU^c}wMaSHBfa|ovavPvihr)@&MPOx&0LJqQ4nS7UfG|3
z7s>tgu8YtVBWuCUv#|_!iLjAPT9g5C`-`}ZI6kJKgmI#l#BpTLw{uT#a|-vh>==x>
zX@mpQiPaQIbbA-Aej!is1uyvQ?Q<k)ZD1WODh+$~g;ux9%%Sz(a7+>y+?wAPQUnl$
zyv=&fL?k2y-(F!vL<<(b2Ic_e99Fr@2&e1psuQFQ?jJ5J;+lZ3e;M*R{9BNs@qZSi
z5dYnP)T93=SW#P(!&X86%Ich0xez=_R`t|d(=>pR&I?DWSrs`B3NlPl)M|X7XX@@g
zALnF}I*_}eJC1-$zeklhH$u{jOi4A59Q^*JpyNqPpB`|91QAlpkW8mInRYo%K7Dj;
zxp6SzeSU0$0dU@kLW0rbha_OiI%LWcgfmev8`6hWkq;Y$7O({wWG3~24@prtZ)a*#
zI7W^F9dQgQ-unvliNI8wyGIf57-&U%kkEU#V>8~PasO0gEB3B7R+IG9pFD2D((Izb
z_IXUD67*V}9qU5#3_hAxY(+dR1`pCzhLnX^a<0S;e$7>EdY@^nV<F89AF%g?34b%A
z`8FRD^y+0b4>&sHaf(hH8ta7<FDZ7`;}F!%bk!NVauSAD{}HgEor+p7=oZLTmV=Yi
z6j@VZ0s|ncS*Q}2%;9QX*v3dG^9ELt3?W@P#RM^S=zpQvmo&@nK{JRGZw#4Dkjb#K
zcH2oANj2c;0KyNGg7Mt38x0#=3j?q|BM^$zg`$iN=-?YbUPcw%n~H&Ga=`o|@-i5E
z`g5*klra)HPq_MGb;luij76}~wrrMhFg6p>&tEjLPAZX-(nFf$bl%=1?yf)wtM6ro
zHa}1U?spYP7G!314g~iT-zaKp0tTAwitvu9is2}z4FU<Fi)t74%yk>6fR8^hl#5TD
z2hEFKMcqpw3Tlx_a1RTGPE~m`mQpf<Qe|YwJj*NhQbR>+UA2Zr8ma7kH*FG*6rU0|
zSBLx(^4td8YWK7_yBaYDiSbOub1;kkSnqnfCHmUI46~~tHw+M|&=zN49042ta7`La
zCpAMl%;CqRC#25fDKd>|5$0N!bOA~-HtDQ+Z!|M$+!B3KaMTI2>2@rg?SMmFxIRQ<
z;-D+HX#YA}KE8=c^VFnS(7ZVRBQ$v$j<F8ixF=+`eH$7Z&d?nucknJKGZf5UHcE#|
zgH4F5lRg7=FR14Zde2T^Bx{m(y2EREwkuwrUweEE0$8sdifQ7B8n677R#zif`KnFz
z!3P?0QTkbs$p)_oI(4U$qoMjH^t6>_U)<v`O*UnA1Jfmh$|)mFn!E|zDh@JZZinW0
zeUl3r2ttYBSv&GFmzMXXGQmf|y{-WQR<<a2DY!c1^D4;|Jrjr{<Qg56S3V-++noOT
z=;}GLenTfjEeQQ&gu}zK5_l^ZE1DLv_!2PAa8>6;%^a`R(X$;)ZdjG}&!mJxRc;DT
zy!mKMwOXND7Cs@W1<PW4uKhng8Ft^13ZF|#k8<+DenwMQnH)979(*tljW{A@;{#JL
zZ^LI3TTKve0Y9RpGdGwI@6baSHi+O_i>z_uyJi|g#HY6QHOCG&ZvIMchs~DQ6t--+
zplzb=usIFa5h7efSwr=Ly0C%DokMh9vzd1pa^l)$lm7|R-nM6HaTone!@RCArM2JW
zHsZ-8YakzouQQIMeN8t!KsPc_Jw5z~6zxwB!6%L8vzz(RRzbqoFWpa~+jp{8l^2wN
zce7Wv7Z9`;JNoCV@Mx#)dpabN3(l7WvY6;?@)^cJ=Iq|Nc=6O@Lc`o_VjF259wC8n
z`D;=8NMnVD+>-JljhW2nkmpE*pP1PT(=tT%a0tm5i_=Oe+P#!QblC+8!5SqRr!h!g
z4~+Q;2eyKcFL;oSp1wjT$O%h^QGKhoeLol3Gy9>~6=Z4_Pj|%6FHFd;XgDwkKyR7p
z^6l6K0A5uATEfO10q_<8;Cmu0&xdT&pAtr^+%ek0mw%+g&8`bLkxfLk1ggcoqy5!P
zC`nFg;rS-%gu(v1+Wdbfhco;mhYzT~X(2CR_?oTsozq6Z6AJf_d4~C+XjkX**9r#a
zo}mO8%3RcNb$2t?XJv^<c!q_QNm$#;WDGVmvNRQ0%ndd`k~Xn?P)yC0{1pC*<}JSG
zsqb4DAk&n=!!tYd{?6k*S8tt18TIdbd^zth-Ky^_fjaaD1B!95+gb$3-LQF>Y53W{
zi0D=TUIozyEIc?045@#a34-rwplreB0dK_xT!CJ9!gF40BTVkT!0UE%v_1|1bkXT#
z!)+IarvOd^P6N4X41l0i2iIU$gIu?D{2`#T8y$laQV+T#`0Xn-5To)gJRkzH<0~Xb
zBKNSi8k(&jkBK)c+Ni$Bpjg`y=a7yJ+#dNu$*HdC_qP??(uBhpZYT+;jaC0}bU)+B
zPO1TCn~i1J^0Dl1M$rfL)h28zgQ923EEmHI#`(N10-hb_#_6wkY1XQ>p}|?t=HyXE
z@gW~}n|e`EW+o5isX`j2f@aMThBj1-iOK1LQ%~N;AbTzurRFt7O;VyA%mog9iV5sc
z4~~U(v1iyUT^2Dp*DLPxP7Z3JwX@D)>A@{ik~Arab^3>Zl{j9*#aG3K#DS{7<kLlK
zp=h20dz`TpH{#OW4Gi&iWbB{dFPDa0K~32s#hD>U{D_L{2j*crK$@#T(#nZN{?nUG
z5Ih&?)I?6^tkQiJ3igb0dAPCCmThG>0yKN1qG9A@>ckUGjSQ2A%p1;_%J0eo-BO*p
z-;bx<Lfv@VREZC0BJwQA@OA3-<~3yHR)!G9WQ;L%qLW12wI!G1ZCnl!NggBa0=pxg
z0h`tULARnDXEeJaE=kKPo%rm@1s#*2M~2Z3VzY3<pmS)<N|~^ByA6QM{3!Yt1&-y)
zT*I#X*2Yf6FX@4)l@n!cLoMQqkMV&EFl0}ciA=;H8mC`*-jB&?+00gELwlh1)OIF2
z&Ufh!49z|+8wTF+G8MzM*fa~5Ah6KKvMI(w0%i{%_c8Am6@(0>WWnuqKCl?p_2Y#*
zHW3R89*y)H-Q?RSZW+1yC){;r<9W1HR%G|CLaw<g5s<D4+L(i;?}U+hyLJ9eVEEJ^
zGp<p72?#^su~XutAzX&7D<ZORw<f}E4C8+Enm5@U+7L!ah6eADLX^HZgLd?|gLXGv
z{-YvpP&@5Up;SwuzN9i=o{W)OJ5P|fStt=)Qk0^iul$@}Kpc$qWy<|D8HL+1^N#3v
zyFMsteb3-OA&J7HsJp4r(LDP<CPf_;lRiJk>9)LesMOakWf>U}<{Sx=$0Cv~BgYXk
z!mS{qeGR%uoY5kbQ%zhQTQ(0q%om*_<67@i=nQ{avyRaYk-k)E5GBpqK<u{pCxwiQ
zE2f-g(aIL`fpu=x5gAD9E9%+?-Z1b&6yO0-+B$0S27;FF(m_UVaIrB(AE0sC-mj$d
zH0e?<Jgk+E5DDM-JA7a3t<mpgELIR3YZs0we8_~Z8%aTLU%a&_bk>;f<=nBhY@HaU
z>GvsatO;gWkTeN@IC-8HCjShdlz7v2tPeWI5FWhf&*6^V8taz~La&e~(`{~`AlG<N
zF2|;Ham)N6H%N;%O-=iFT_)Ul5x5z<1MyK?y4K&Vz8o)FO<UTVPH`zuCMyP{Ni(Lb
zKeeb=q!1nVp^&OS3{7Hw-3SnuRkNx<!$rK!#LV|7XBu*hWS5mnv9(D5N^w1Rlq3t%
z<gCgFR7{aWcT4RcU2o9$%@(A~#Ivu=wAf+jjwsUq0-|2f;X3GKHm=;ETe2iC^@B6H
zB^o=@{9Jv^i#Eyze8%4YGqEhX<{CZt4AuJU>0ky+eiw^un@j!;Bit@Ow|Sfo!r|Lm
zdka+`tQrOWSEyiU6nK~>HG+#esbT3+yZ9s&W=(>dpQEUi;XS<MOk_2^Ce($9Jns-A
zO1p|TikJDdQ@HkWc$2nZ*F{5+c`NP)dswgeg-hv-6?h^D89b-@69#S?F3Q5&kiv2G
zQ_36NuJ*<jg74B;yZWKd6Gd-SzM{0ggwKvl;(aojY<`0RO(|R=*eKLiUz4N)ZfZBt
zocY*3<&-N>3@a$r!szyp`l--V>n}#$hbhSi&`~U)nbB?+<;a43g_bki3giTJSE};q
zSA-qwUJ`9m@;_r5e3TMHs*X)jnHSxPGyIdTh5_cnQRaiBGyXV+Y_1VJ%T$^OXg0?P
za)L+~=%_fu;j)=1Zw`J<Yy&?!h+uc)+5N|M;eUtrJ<B`qq_bZxZexenM#ts!>x%M8
zVXn=LSmx-fJR0x;HarnV169gli#fzL3Et-dg_I(rT-iIP%Kgw5Ko?^d8WzlrcnEkS
zuBd2{8!9EiOGZ3#ScNQY!E<+L*C~4D{^P>rdv>g5nG4lJVf`xyQGTXi*Qx`sc}Hoq
zggkd!yFEWY<!eQ&_I;}~T@a$b<7s=X8tv`KJnT=v4Rf{P`j;UlVlS#1Q<8ElvfIgh
zX{iZz?^fL{p`<0>z^&-dB0gED=AO#K0>#K(U@NzH&!3noyU41LFjm5N+3*m;B8V=6
zV$#qpEbig%DIP53+qTr*Z1&-0A}{mfWFwoXF$yF4lcZm}#2)tsBpee}N!nGxUrx$1
zCQ~-#k|W3^hwg91P`KDu5xG_AAx)>c)38Vv;NP733{uSub0*<4c$;K%v9QPSFEATC
zMBTk`2VxulXUgAgJhFu3iJ~`^89MB2JrOx)0TSO{ccY0}<0^`-vm_P++@q@0q8h(-
zDibdZvCm-F`^z^o)Hk@o#8=WGDw86}YHR_|tjKPjY3iuz&G`$~EKH&w)=S{0;tq~R
zZlR1{MC!b=ss9Kk>yeIC#~whL!&et5bcB=MV9JKFX-kW>MqEz1hjQ7ZZyaoPkUCO5
z)yo+^Jezm#Z9<NGkRneW@q+6`d+CRtA+OXPn6^hP%$5%8QDk2qCJXAQhd19Q5{3$(
z>*82-4)A_~L8*4}m=(pGz~1oIPf0z|`|WTcrgjGhK`0+dbcZB*;q<7gJ@`w1hDyR1
zqFqIGxLtoDUsYT~a%sitEi|tT`G5Uw@&G~M8FK{=0MLc{-;cWf$4X^&D|@6R44yM8
z4-<{S!5(A*@Lh$P0ijfQL1+j6i81|1BqStpC=IEIPW4R`suBJ4Wa1)^q^3k>IB|=)
z#Nc9rAByzVr2Jgc#W5ChM=`Kj#SPF*Str$#&a1MDo|lrzGz4D$VDWgH?N9Aqf4nAJ
zx1KhrzRrJ^Z2h1IJL**bC3djKfD+?%EkXzE>ZuS$hhl)49UDW&L*JPiS+c)p0hfJ~
z|3fdCsGa*cJo8!wj#JrtB49%|aqo=s(OtpM%;X4*GMj4f&b=oBtyWET^{7V*x1sF0
z80-Sq*%SUwKO+1CmsrJnY)r1JYL|<$t76v+Qj!hBletb|3w6;5qK^@U+P2~RQNE?G
zsV&l2jU4v`8pBkuS%wDlG~3P+qCg97z?#Y+sERzqa736qpQJ&)0#)X8jD-nt0gW6z
z&2ioIOw(*UKcvOKZg4`g8C8-r(!6vgl<ZkUA!0^0M?y=Dp2E!Cpd4>u{87HZq=~Nd
zAQ0ikSh{)XzTer52Lz_CyS-404M|3|ciA|QMWTH&{C>KXt9ZrXRT*as>xlfCCAHXg
zNvzRbn+&MH5ukX%CgZ{0P+)-`fO_skMd~<i@nzy9&a}0GhoqCSr{%N?yf%>)vv@P{
z+>*$uibhh(qX1<wzbf5k*mw2V6??453ZUFw#gFWurA<@dOa?$(N2Wih30F=OV%IN&
zSVBTd5X$ZMtRbw$tsybhHSI}+?xp;WU>`GLBP8qoN;wuPrAig_1}x1be?j4>XK*+Y
zH^LCJ*g#L@p_5(wp;OTz<dg3R{N$TA=l1z@c#DZC$C!DuK0rb1xXL%6%l53GGEGy?
z^>iimdAp0V#4;7$az!&>CMS0-W`{kbKtKAmI{qN&P(X#cAVj69%0?5PGb|l}wf4ZZ
zBARx5S3l4mP@8j1-;!1&TgN5pztGmA-+VrP>D8*!b9`>CZy*jf^rX@;SUxsdwhKo6
zt%9>DYO;^&iW1-~ud@WmOAfSQPlP-_J*Sq8smUKbH6ppFp;cl$C}gkbPI_v^R^Khw
zHX7Gj_NG{RP-R{*fwf=wLb2j`GUqST)#S)rO(;?Kdb3biabIRN+;`Pl^|{0?PLSxS
z5`wuKHUK4_s7bcI%54s(7IaBQSzy6%Zr-oG&D~vh<(VOT((4&DK)|USje&JL-kD4`
z*7EOBv`a%E(%~Xih7~Eb^syZ`4!mw+f2CnDCh4-7?#Lo3d3C3A-v|+M7ZUh@8P)>n
zDZ)gH21Zo<6%VpYVfbTA0Bw1-r{|Y*ANivJ!)9VkAMdzmBb*rg(+>IO?M?{0D4{7M
zCJg(nMCOnWxFKiIiC#|+l0EDbKPht2kS@rl08{oThfVj0rfeiaI_}L5uq-3+>s;T9
z<YB0@hom6aMCF()aB)4HnZ5KtjJG@1)iXU16N>aW9OD~ke8wW=AZ*t`$AC6c2JgLo
zdw4yhrfn}q$!?}U3myk0vA$SSq>+c2IrFOZ#AO<x(cq0%$%vGUgzVSm*^nMtqw}m}
z@ocPk$j`VI3flt=?c|JB$mEUO@>#TkG{kECyCG*4XIotpO>Q^4Mc4{c-$X5Sk%PvP
zf)03<eIx01wh<|RoC}9pnHph=)O58>?xaR`>okZ7`aP<LYynmEuN#Yt^%j4RW4M~i
zop7xKnEsv1_$TbT-<7){BPuJgvt<NyYI!1r*cWibn;`kvk~p#^67^%@^rwYa%Aqpl
z<DEA9t-h5VevH?n4n~$pq_=M7B*@A)Pd2UG#?M}@+KUdWrZ=4c1dkrVH=V#D+!2?#
zHn?6qnFPzxFxi2#?44*J6{Z~#@l5b%qdH{Uyj*+WVj!3MPR#4xI^fMMSh@-k2)nqE
z2odx-Mt+HC>p_@Jwx9XgQSGg5XeOltJlYq!s}XtLp$wF$Wu-zqFtomeWVD0v$hrPM
zXATPv_<Byr<k2%7ur06Axer7-uURL&(TLtW2kx}N6pqu6%Iz-(D${&&eGu=*6UfUP
zz&<Yb&>i3ltkx&x%eH&~P0RuytD;ll?ltxv+uu5(6Lq0*s)JC1ybRtpjug7+E?!Vi
zR<3wMZZQ|C9}VZZr!bT&E3PxQAw>+cn|rl(JV21%ErXiTayUa6SOz``f8J0$e=CAY
z)HvK9e16VIL{{B^er)cclf{)qpJ{zq;?+5bQS?(&4@tgE!D#oIG|`HE@uUiVpecQk
z%>Tp?4Ff&>1E?fIR4$BU8umsnwjL8?2y-e-l^o%sPO)g1<PLw<FSLx$+6@oahm47f
zU~mr4=^E~Oj)>!~Ydz>Y69z;W-j@$m5*P;6+gtto=~WAY78E5#7&b;2O-1PUGra1#
z`PkvHE2WktjXcE=BW^KoTHtDs($<(L$Chj~on12&Dl&Az+?2Rufa7V$_wmW;POAo#
z5|&;SH+LeSuLY+na*I%Vzp~N$ZdY<Ohq4a{j<I~ZV<c56v)Lu`8Za{7^vnWjJmhJ%
z6#9HnsG+qMXl+iNcdy@Bz_Uu;v<iMHer7ccL5%^07PKOKs(iVd?D_{};w>o(mXtQ0
zKDW#){VU~Qp8Ix)<mr{crv>nno^)HdV(F4M;D7@QJ{EEV!FY-E)DuLEM2ICB?+}x&
ziD&Y|L%0=O??pMzAG9K-$(<(5l&uAED5O?Cs{mu5+5m(*bf!m#NF*)>U2eayT?uI<
zIRf(RLFpT4LBo{#jIpw-)O%aVMHD}9XF;gjs$@IGlhcM*f?lbW{hz&shal*3A4*O|
z!ARS$v9s)q6p|+@zUi}02|~E%&2YW0f~ac{OMR|vE0+XoW+RUrbv}O9dc<p;#_ciI
zdW35qInZmc!G`7c!OID(Y%ft<yUG?Lx$>9;W3Zfhrvdk`Ws+TKO|rswlBmP+)Ui}6
zsRYDa{3E(W#$XgHR*B~>lCGigodP49g~lNiD>DKlR+Hk3nPPQ^JK~E;apQqWrd;xM
z2(9rrV?=5G%lL{i<MEce58^KIidn_VX5<TNiKo;>oML5@O67P;<vH@@P&tvxTKY#O
zToe%(h1yLCA^LAhbsronpZ?ZAC7Q0{E~-Z!*^J+`>OOE*J`LoXZlKrPahq;-YGjO;
zNoTTBE)uDmlpI%lJ;9rP60b!Vzme5_Fs*zBS<}T`=#4zu8GEH!S3{4wS_NM$a$7gU
zhFmm3YkewCCV*PnV!rdpVIuE1xfAQSnii6wwZI;XzYqON1L0QLvt}AnTp<K}erEyj
zWMDz#m%#-9dG^0s_iME#n>k?a7&mGLhgzmJUh8%RS(EJOwc?-o`kPwpzYDt62>}4`
zfbrjtA({T!xl2B?!(PA`%&FIXt6Vyh%481=B+f7l?Obs;$|a7T<3H~YOPE;biRH%{
zY)A6iT}itbuMB8Sl%i-Z2UJ<-!-x0(1>k_N%nzTd8k+H}*jTO^E=i?wiq}&#m4;*2
zk>P?*K!Nu-KIuh!_2xC{waJv@efQW7K-*(ipdR#5-YRLx?q5+*+QXti-RI{?Js_~4
zjn&ge{=08V<qj%L2*El$S8n$e9F%Yw)sHkTZn{AIS06%T`BADR^a6I6A@5*;c`(L-
zB?pAoZVKXW{sgVzv&qkq4&KT%5FLH1Raa4^G=`x`j3DjNiRcpOu{j(mCMBdZ>Io*&
zd*#hq9xkJd^HH=8<v&?t7OJi}mxnfE3vcJ=#?|~bx=z}^$v=|dbSUAm8mKo;*jSbp
zPS%da@n%RH63a9S$~K6^?jx7hJU}m-PqkI<?$58=cm$?!4^}PUxS3Mz|74j^PgwNL
zx}i7{883=TYiiE9iZX?;49Q>l)h_C(yJREh2C503BD9=h_pkN2pJ8v%q;9r4<N{k@
z-!_at%hFsCC4@^5z;8GTiB5TeHpeko(^L1Yk=yGeMR7`5%yNu(-V8#wSv@Mv#Kg{6
zaxC<8AgfQ$aEyJ$9-%LiL!1sVFX3&_;KM=&W?tUnP(@W{$oDOZBfC2TW3ERU?RN?#
zC-0paBvAB(naIvI@zoa1_9G1)genhfB>92#%J(CPEe+nWf*_Qh9IsD49~+EO5N9Zi
z@-fO<wp(eLaH*}Lit-N-7PPSy&Lg6qvnLQKee~0gN1mkJ<n@Nmc5XG*iN->Vae3p3
zp{tIvIC?0_+2E~qS{;rnzC+2f{ECNO0U;}ZLqBz<$zbAZPfTZc2S#GR9)JP-FcV<(
z>;EM>w9;ZWM4`P-12|~I*Y-Ta;5xX#IG&77+gE658%Yq2!mu9LiO4o&59N!}SJe_F
zp^#=!nSWqGSYy~dJz>3Wzn6S5V8aJHp^e8Ehk@7(b^f;LE;;9KmijrlvWTy@<}>aC
zGREXsZ?Se*lcR>=rq@GX-&SCL1+U(=7H;N}gu<lR4~J&LWzBVi?i<CWa+iUADHxOP
z<OcnuPamAMOyW@8J<UO`jQ9j`&gYXP2~|;-!zzkBk!Gz%v0J@XQsz}wyZbRZ7xSmO
zA?p-43kkw=6!Euv?&nXnlD2S7=H~djQzlBzts_m#GxpYB6<qmMnDiGj{sYLYWFJN?
z?w6STg5w2r_6{mL<;XX|kv1Ob2CZE8BOL4X=Qhs-V9S57hviES?%I-2)OBD!iIwcF
zy{HD&{K~NLZqC!flS+3jlTG;IqRZic^!7ayL};FQ*Bwxwbo95+v27~1%`O<P^LMLN
zP;7lQ#T2G8_6Y;+8Ma7YRCM}|cKb8nPgIn^FQk1#2lq-jrZKZcFT6(7mbC(stkLpO
zW1I6;H-k$%aAa;_spH-91AK0FDUXHyr!*U8>e6)!%mvUC@0)@jK|`xKKsMs_o>OMw
z58+vE7~h$}&FOMRXJge_qS}OSVTRRSFmH*>6?JZHMeX5;THKP4K(%G*uD{CA1HbHO
z!i4IvAu5I7v<{A?9%I2a!j=#$s&WLC<C@1iSgg5&SFZ<)V)8g%cn#0`jzZ=d<O`7e
zi9^9&xPl$|2HXLp_OEJ{c|%cd2`UrehzRg{EMLeKZyosNZDQ5?ThC_Bs^tS<o-u@^
zuJzEq%5vL*;7K%QP!EQqu#t96X~7RE8B&PeS(5EXsJi^&C$=2TQ`;o9B@#3x_2;k~
zqD&g1N`&5kEpmu2lnQ;)8>V6(HD+;%E}RN|vK#2$*&BS0t0mWzMc0%i*1RECQzYIf
zE%b;k&I+>#FPJU1h%dAXeKH!Z#wFTYh1**pFAkaVHWc%5x)*;vM*M0TJF=oEut}4_
zlF9~r@X7!5EB#4)3MTv!TZ)&b<14)`7y3pKe_KykdckYyUrOaOzq@h<DWAY=*(+v4
zmp7S##NrD05RQ1t3XQ5DLbpLaFT}gv!8q^XWMf^M-dJww3XOKj9sL3pZPepu(a=bn
z+3R6>i;OC>^S;lF`ez8UWuGL+fTo}lg1HSlYW`Sm{&;Hsm~Q^Kdj8mM{`hMC$m#SB
zuDB0Po$4#-;Wp<uNpCmzy}5dcSGbFaCBHI>X_Xpw@If){Vp#yo0f=SEv2!<)rEAdT
zKteG_o<ZW59fw>g<rwJ)N-|Y}{8pjBWZ|=NWMg4Ubt0s77USsGv%yd}5a80oaukn1
zlq_h1&<+}v>8IP`I6TyiF0a%<vk4N=vZo?|QcEu5FRgN5`26T{979|`HuY3Zjh0xy
zs$Hg$BkxH3u_MO)o$ovM*R*VnE=l#`o5>=D_}^c1ng7XnNU>1E8bJx(LPV@WG-P1i
zM33YqWgY(29l#JF!)?u~K8V}RF3oL#S?1Ry(mZRqL$GF?G16sc=KDkMmVko{$Z6MU
z*E_@Mmg-iB+hLP3Y(PD>7VIcMa-+GzcH?bctGVs#A?ME*P&ddsg}<w}2unTaChT4X
zLgJ1taFn~)E^=3KdMiCAkvm$k<snf^WFlipUybrr5It&Ni>*EdG*{#sC?jYlcyuoe
zQN`z<-<WbNt>C9M@H^&P-Qj*u(B4A$ZTebi_nBq~w-|c4d?%g}Ve|1vv}-R1!n7aw
z23%bS9HyjkwQAH<Hg6hJ4;zUY62unhc?ODbmuRJ<2ldHpo#~CH<I<amEln})Nw`Dz
zCj_+zQ?7L$d<^@vbQ!Ygvh}|c>OnW|DRn~Xic<>2guJrP4EK$qjXZ=fm{RH;0bQML
zyIKuN8H?*vTUdT>Nxpp0&@p_lMCi(FNlx9b)AF`f6+fnjGcl!Z$7YyPFG#G_lHQKp
zjjv=*O)F+NE18-O-dnrqF$XsoJzTc}z<4`R73unMRpW2!4r+C^c2pYzf)qNAvMIsY
zrfXy|*5~&E6B1n&RaV+LVPN!`tkr(}@be-;J^f`o%SeQuGM))rsl?wQlV-kC*m&aa
zXJ>bF37_hV&}iqdoaiHgiBm|>a!mBrvguq#bceXdvE(thgvv_7@^gf=)3USv9{Jpm
zHsL6|?S%ds2k454E*V~u`bbM-ZO2s>A?Bd4s)1j}X$*EZ;CDu?^a1BK!psh0jJoWw
z&CG2`vUyYdWqx;@StfEyl<6a-^_Kxv%B?j{Q+LwgN7LpPEwMpcmLdjJ<i*+PK=|;?
ze0-88eNxVoMt-n%h!Sf5%5vpV%T$v1{`rCRpk$=nM*1=}5%JrqFAn(w1>5&uR?xC}
zR`Rk<a}A;or`u^)@P^w$L+1oY0`C`-k<E;Lv5nj|Y!&opP!mJ*YUvMQI2d$AEoceE
zD?JQR$P`dQ#@mkegDZGO@WmdGyH-Nkn9665T1vZb(!&vv#zU<YWKodyrJbfPw{fLC
zZ1EjmKuAmLS~eZwxX<horz#3!Nl_T(><kIG;05(1pnqwVC_5N=a}|x~b{TYED-4r4
z#M#o_g!pX>_f~t6TjCwF40`8EYU4q9q{n!qB};8X;b&tQMT0C()1pfquD7#P{vw0?
zXW%N|9V!9TmyZ4cGQ8T4uO_;aJ%eWGlw4}{F8id4l_JXGPe3uJ6_wkDo==#MdMUnl
ze$zIUz_itN%-iUm2~{iq#AWzUn=gLj@z+yZe)Jb6Q?nP&WtXzb2X{4~3l|cVHLefs
zQj%oqqj+{nVv2?dpI?F(nuZ_aBCB6LNly}cI;G<8y^N-Wc7v)*2A;FmS*YKAXznzj
zDfsn$j1w=o<x6By2e)VxZpI6hnTZ)I)OvuxtCBRMPQ`|CXIl$@fcG~(`nt5}FMJiq
zCrRx002WB;J?TN@^xwBt)5Q)ceA^-V;rXjL`CpRMDquA}LkK*6v))NSU8%mDs1AN5
z+{od_A1xuYth`cC;^kR4v9|b4?=Akhw!ql6jv)jdW(+ijN5BwFq8@U<81&$cK<UUu
zv3ZBPdAo$>L>B;NIo?Mz1+bge{c(d4jkT@efUv;~ydnbA5tuE=zl*avYT?1=>kD*n
zvlwI0{}pUsr7dQhf1!lE+EH-~`#X<&8K)A;H;_F?d<IQ3!1@h%rc3@^_}EDKcU~7=
zp;H+r!YcoRk&jNn?JJd;?GXKM3joSafnZ3Dp8I_1YDh6-m^rS%`dfNUW1Q6k2klt0
zX`(X*d@OouqZU#*18LUXXm1>+I*Ec7v2L^DdNiN$1H$T827Y3o@d|sEVDhfW3P`d)
zMO(zU$5bG4#}xv!Dga`!{qQy>#7<?$at7x?H^^oP#3Dd_prXrwa`5mfa`24wuZb1d
zt1pRqfS|usMscP=elx-6sa)I17W<#fe-l9(6$K^^bq2aI1$+F0W8^np<>ntj<bV?z
z<muLSL!HV9w8SsDgJ!}#SE4~z{O0PAj`l(N53tM=bi{{kWllJuvFX0I!*P5LIt1hm
zcr1)i4dm4illELgHi3Il68>P0l{Kg&oDJPJD=it@A%o9<rD#VzCU&`<N3k``kF9DM
zwoq=W=ls(*W$fi{)-<zdSRV9YFMMJOV`j@MxN%N|owd<jySjJAo+tWyZ=ds2i|u;V
zNKrw_)nS6QaUn`__Jk~ps*s7FQ%%Aw);V~ZI7GrcFi>=cWXM56w`6e8UTt%_khC>*
ztuURrjJ4QaHo<aEc~?t08s+UFHf&a%pG0$ic_2y;JukJfz#FXoSZS11ej55ZaW8PS
zP?A+{x-=57*}k1T75GafnxI&>Oc;LJ;=A@|P8*0p;e;zeJ)CM7*3^1kYmtCTNgK4O
z*Jwrr0QK-)VRCdD8UOmYG`|#SUFsMCAkBu-$AS3^s{w-Ri#EGK=t%JNzos9-CI+UK
zaD|OMqyE1B0}EF({w2z7Y?Jhli4FKD*O=3{--IF3e}Cm?`Df+VcvDkeLivOpAJ1Zf
z=9O0_?q@&@`eEwL{3}-+e-~;RK(Pm`bzFP9cf2#f%S?XuK8duEwTvN5rr?A~COtlc
zv^b2PCG5m#f%U?2=~QnHPx^w_%oN^!I+0zY(q)pT`s2B)^NFMW`TdU?FGvkWj)y#$
z5OcAADprhFEYw)QLk$P6ur@OU+bcKvfWu6tz0r8UhPz;;_gEC!fS+CaOxZS<t@ly@
zp!ZY&t@l<`$@;UOzZr7oeJ(hk<6h$NPwI3tk-JQ=ivAfQ+xPx}Irq%~Cifm8M?K~1
zc>f$q_aK9rU%y3qeHi8z_u4GzsjXNG7<lq88mQ+yg(E6F`%SMe8K5UDqf48rRv;%C
z_VL7VPUNEmq6pS4H3NF4V@*UKgqh7l#QfV3mZ*iIfW@p}SboP?_N1B&PQ+s56{!>A
zTH_*`X;~DFK*uDRPHS^YN%5>$kr}2hu%OPhEr<&$T~lJPtu0=HsLu+DHPU0it3=s{
zm<~zzElQe=l59+-TCVJu6RJG%^yj8D!d4Vm(hDwvJUzi#<+=O30M1{{g6pvS4r;f8
zD^!IA*HN{QM6qyV&M;8yYEfZpcoc5Pk(YlXVpf{A44xNnwmdP+Om~*-F}z^~LV3^Z
z$wKb180)=m%jn5yiXEVpsz*X#+|^IUAGwOG$ctlTA<ZKFLtcZy%_SGukP40o3A)6(
zF}()^O@vW8Dw~_=#&k`vknCz}sNad4&*<FiXj$*CCk>_`<2qeN;EW#BGs!h98<AM7
z(bL&vF&@tXQvlxe94l*1o4i7%GL6b2`5YbIBMS1TP`MD3tVz+4@)^Y^jM;=;vne*Q
zg=@M<kb5QBY=~w9JyCT6_F1--U(1ntcgG&JD)tj~*+^8Ihd^zOc}-PBM_YDt%M?My
zNwP;v#7$oSo+j734Xn|<WIJ|8KG~drhDuOK)4Y&rhE6bVg}K+05^E_@BB>AAQa~$a
zkWka!?&$N;`JhnPp#+I6i%C_iJd_$DF0`d6KJ0|Tj+`dLwDd5F6mHXvjKm2eE&I_q
z9fGQ`@i^amlh4i{q+fw<<D%N*#;Rj-+8d5BvL^?45smHtA?_VxbBm)#%~RX9ZQHhO
z+dXwpZ5yYy-JaTbYg^~7?e^52{xQjXxN|4DnYoj^*<apdCp-I>m9^Gh>v{aelV%l7
zkJ(Cp_U?<doS>Of`*d56;uXEbVS(7+?J2<1J=bFGdrijtxkY?2B_~D6H<!<Rt^01p
zlh!-ZBvHN`9A3+f6()KI1?J(^!H10_<%6%4=SC)}=&r@YaG#C%dgTMXEaw+swxyrI
z)rk?*0|Q}8f?!LE84@Mwi5-x(1O{=U^-3tWpKvU<tYrC@rE{5d!WmiI{cM888_4&3
z$f@@>*`MYb)KQm{nD>0#DUHJJr|NUy4An#vLOJA&-$2C1e+^-+h+mbgKOm3?;W0Dh
zWAzP16ukgqCb=h+1rwb9VBtcb8OrbdgRS#&!65Q2EXprrgTty1R>JQ5E?>$aVj|?L
zcbqC$v?~EHG=F3;l&ar#%pmf2R2B!}$ixDk&TE71;8?$|I6Op5uRkp(WxJQAs;I|Z
zC+AXHyE09l?R?TErRt;*!l)tSs<|A^+qKgPIM!bkRJ1+bHpTgk;Mho{@AE=MTIpFS
znZlOucbnil++$d3W&z^ilUxaou0?a-S~;`(itCTpUyf0$%|c-8Y?htUK$qKUvAtw0
zE~L>Djb-|nOw#)C4={L3O26h;?42hK#_z_4eEYuYI1bsAa@zc-cU}7{&l}r~fM*|{
zV_81-+Z9RNpQa{BbBkZAQ&!fPMw`tKOIGLcS^IInRU-(IR65bqr$YnElOiW-Y&y8K
zIK=j~enyzA3Pk(YjD%<-g(Cn&g1ojtmloYJeYm&<eELM_kmjx7J075Fo|J-GHRVal
zYwvjP>Pi2U_p`tpw@%2lWXIUrYW2h13_0JC-P{yw4=0#l1i*8&9LdRwFtn*&i<8)F
zN@997fN#zVZ+Oi45w2lrmlmiD3|SY!Kslg5{l1l6AZ|-L(q~^huFnjeH1fuY{vvCK
zdj{vf)L3m~7nrE_h#fkt@c4#3ktnBeZqUWnWsCmGT{JrAj+NNgRyj_Ui;2le(RQ7l
zwSEFq#qW2#Ncn`j&IYL7AbVp`UPCtIASHS7uH2)f-cy6}hflw|*za>@dx3Vnz+CJX
zTkns}59Rl>e3pn8g&-SBv3eGT>D!Q6d6+PfEI=~Z*kNE7B}gI!zN1F6yeuoe9~kpo
zZYa5RP*Zg!t9nR>8gNCaLy46C4Gfm5gm5H|z-Xa60eDXRNX?@?DbxJn!wGRh1GA+X
ztis$)E-+z-9kDpC?25Qa`xO{`PlKHyb0s7ul3NU52|6tLEoze63|Qxl-{XzgYAphg
zAgArpjYPTB*mXr~2xzG+u|+LIjG(nES!WB6gJ0F>3}@S6WB|rn*Tj^ekA|>w%Dz3)
zk-_EApXD^|c_J)AQK-LQ?OvLx_h(Vw%T*@x#}I!(GQ2}v0IlXHjKui@V0zvyLSMY$
z@3feQXMyAa8VfF=gZ>)P@%o^?G`&$`;8EC*1sNySN+|mU#+PYx#|5F%a(UQ;xE<MK
z#PaiPP;ux>J>U(*mT+4}1=!+a2+VEWQi(1pEl1L2h+tf&%xEY|3S$U0C@Hb<eA%WI
z>FO~R+@w6W)20Bfl)@1k(a2zO1-m}}6Vg#zWiA8{jysr(Rp^UVm<ulG3oe)o7tl8b
z`@c>@v%4Y~0azUG{!6zp701^ofQ&M;cgzYr@>EcDA%BN*rlfxwi^_G1m(}?ohe_zE
z9O{+HRN$!~?UuqF&zR9;tc6~&ijTlX@@QyPCO`M&^BD2@i6qC)Ve&8K>`Mhl=}OBz
zDdX^=iLD{D@13_$YWEZhI_X{-_SN%@(`8+eR_R|y4p>tTeb@N5bl<{BiSVuLK`@CK
zn3`%2j85>=4g`wh%AUXN%myKP)PV!_!ayRjgn(etUkG$BL{U9LK#)%>^}9ahZ2d9K
zPc8PlJ`<*|9NMK_m%uMDg7^HBqpv}d&+F4AYT^!Dndw5lLhdx&ICLB^R*t8IGveA#
zfL#(S!@{Ce;beAeGC(@-vVdS*Lo_JaKGSEwibS7FIddlVXVC{zR4${s93ds5q~pFZ
zXsH{|$#}mAB56~c>Q+?dgEILi{2^mJ>}yqtVC4PU3F;REuY%14&8w0cx@*;2IZYH#
zr}fytC~5Rz`K=gk{g_U-{09!N5X7g@e{_6SOsSP!zQ3|m;r{Q>`#AqA@0(5!P(zc#
z9_z!CX4DDMM#sR2<IsQx*f>B$6`>Bm0;OPzj2Q%y(GZzDPY*>W<xc5t>StQm5T{bJ
zHokZlSIzDEd_}<JGj&}?g_?ZdE}CZrXRY%6n*u)WH?MyPMwA1?L;C~8@gPm#J8>k+
zhZ(jsrwhVk!}(O;Wrmq+fOH6Cs0!F|q}8u1%dyp#qNMRMQPjQhMNH9^)O8X`i_S(v
zVnNR1Hxp%noMvknZl6`c?|J)~hNGMl7R~g=Kg~1ZFvR{KSgGV|YjfWJ>SR0jiShY0
z?iQn2T9E;#^mFo7VV1?-zjT(x&u(N%F7Ld{d-X`Ya_`(zL6^g?nR$_`gNLoM?J4;;
zUpWLWn`2NfyA{J2emy#tywiqu1C7mir}t1E3%^_(R~WFrA=__K1cc|oY={0O{hT=*
z@bi1g79?mzcVNodEMUB7=K~2{D|AqH9>x0P1Ro`m0q4;8t|>4R4chy=<2v13b537n
zk*8C)7R%gJ)WW3l+XU$ncwo01EcW=2)O3E~Yzqfl%XR2S_T@fB4Z+R9Z#to|7|m~=
z7bx6vkj_x5n8)*H?{L~gE=kCM>x2*^G~5Z?mFR~Bem>9-KjF4E{Dr$W1Z52L4iw6>
z2@P-oMi%sBGT8zLQ=Q|iF9d{C9lBCdPf+t#n-eBf`|{?h)^4KfwK&K5qwSvSi%%J1
zP)-}~gz?8|M_20Cg+dL_ZgbAaK(qyxyi&(~sGt&eRIm<vj;QG6_{%U_NV%poze|re
zevGzi9L5-HUKNK2zC;PQ;tEV#HmudzRPPKjg1f`(HjjO7N9U`K-2hwnatUwBUjP(>
z#_w#8SdLV1!aiRQi}c7?y_(DrM-z^5Flv;^#N&<~f<>w#S65fMZKT!ABY&@AXKPOa
z6zuJ>*yFHjZhm#&Wz|zZ+V=a&??f4cSB+>~A=U|_3+>TL#|=}V?bt5;7B}o(c;_c}
zof;vB);aoAhryjKE@arl>)Tdnf#8DlFm;-IIk9u&3ZqjL=e<ymT%TlO*JE+79tI5l
zsh3_7ZY3_EeTqEW0+IR)d~m{gjetlVEd2GX#@x+E-s;&GRabxQKaQAYzl@e!&tRu?
zW+GB57hIAY;0Y`)HIykHa&zU+&|g5}Q1H#j>_i8B_+EKX3cqN#i<EZ`RaCQC(LNj7
zK!534xu3Pgz*Po5RhdJYPzzt<b88JatT_;Hqlv0DON|0Fnzk0&h14(}wtS!X(exW!
zQnT%Vy}9!w&Kr2(XwXys+|~zF(MOy^+`82_d&0g=qHe!G#)_M(E$I0IGTU<1rJ>Zj
zw$lqCzoxL%mmtE(y%q?V6$$J)IetP2+SGcX4B>~PnFSWe@0IW;c&rCCH=$vf!_usW
z#Wdmd+@Zc&AT6kl<#gkRa*t?jxon(@a&5xB8;B!;$=u2vV^u>^WMF$hU-G9_8D@hR
z9sO1XX6+6yPPTRK!Ac24zE2M=-i*jW&%Z~{gtPlq&g*pV@eTyp`WWrSqQX8bgRFOg
znV;_vCtQI6s=?Q#5?7&F6%x6iT?2`oP!AY_yA=|}z_UmIeBeCqNkQG3PzQ|!#0i%O
zch7=>_!Iz^V0<coOmGe<0AEBA?Z7`chXlYA>?fVr4E}Ob42omQU&YJ}u~rV9{3XFX
zV&SqiBJkvpIST&<<;;Q?HJ<^M88iI(p97QsLQmFye6OjvBK+?U!(9Jeers(yq5sFK
zp$DVyx1aV;ZReJL!%EW<;%cy7MXOv){{m*4I!L3UXZdBnyCoZ&UM(;TE8m}tKM~n5
z``MTsB_<g_7WEYr#e!>A#A0Y_${rrM%VTd>saGVeu;KR7>-N1|>9>1972x;45=h|e
z&hHdhI4jKd%3a&Ua>3>N<HHnt&V@M~3x3!cAPj{VgC=DPfSH)bhBQ0DEGfheH{&iN
ztKSC~+YUAB8fj#13YH#|gICZA=salm2ta-w0O4!G=Q58Zy5r{qbZTO66vn5(H<}2!
zlaBqv9(Dc2Y=c<_8n8j5^xNb%=hQ2Sz$@Ku=HjsikkvS?`d8}LfM=8jt(2w5#2w`&
zzRT<Tp1mDLX)PRVC(g40okKmKAiajT1?NF!l3~-#7dz)^OUG`M)d1B7F)qIqPUT-Z
zRKsb3f}n1a0sc0hJ`f(xK*UZ0L#N36gOtVzz>_DSok#d51jTNPLYDLxi{5hy7Qe9`
zS%XHK`OA_xWd6%%fDs0Xrhh|l%&mwpJl%FCRu#IeMmf7NHz>C#7Ql>7VG|Lr76Wo>
z%H0S%<C!!PtAEy)Z~>9D(9+M3|GFd4gh_B^xHntp>%XqR5?_|%{IeUGX328cb#u^^
zO3Yud3HCT%mm-VP$BI{R(ap3XEwXuo2wdR{5m@CH1RmXOgb4c-NcOkcMZ%L8Lejl^
zD$yv6c;uFSW1l-j%RP4FmbQj_RHY#L9@$k%(8pp`K}IjM%oHEbWbBrDg{=m!0I)Wq
zeo$UglIr(DgG1or6>RbmNX}z2abKLu6sGHF37mo?q0}*ml|SCVxI$AKBOd|?c`Rfx
zb{qm+zM?BC5P7Wl8-mw0Q9yC#1m%{hUoGBlHNuu$T#{3FnpatV8vP^GXBx`V_-Uo#
zteECHeWxoYa8E)@T9eUJM9|(GF9pzLngr+!2I0V7tQ`U0=l+_CX?L+^$j+B2nCUHR
zYL#{@VfZD8o`gwVtYc(PR9Zavp(my_t-l))Xt1ZbW8kGLOG*Rnis<ErAPHwS%}+k+
zoku8NGi}ShFqeo)qOtr-Da0QObwJ9q(@AG2H!j5)a>1Sv8d6TZm%8PC<Jy<0puvCA
z<dyt<zanYbqsiVZ!G4`7%Bs3GP~lj@FGM>WdRXyZD%*`nRu&5MXxYbHp}%;@<EfCH
z4VOD1cl|&ZR-}C9kNr)ss*<6yAajVj=cb*ZLS8LcIklhk+jW~bUWUg`+E!AA_Rm~<
z!)n(OkF{*ZMv>tl=YTFLUnMk9m$%YDtQfgY#*p+|yW)g;yhA3nF&9J6;{lT45_Y7E
z6D=$r9{`ya5D)nYk^P(@eOup<6%fbyiLmglcd@riGSnx<^aZ2y3HJJuz&#o;YV!$4
z`CQLE7BEErMR5G$p#RtNrVOOpV(D*D;oqjh{piBIszM+^$bP2^)zBxT_-w@pW{J&|
zvTR#X%HWogJKCl-huFjAu!c)gJ6~iq&^D|(%3L|z6U3DwSt>um3$M$DBH6Ez)Em^>
z9YtZl`=TDODdx$G(kG@|x!kBV*8Bjq1!)!+!pr)2Fa}AwT{gvqATx++%<OJP6bEWX
zISndEYf<fj(;FL3@vKTW%F0@_ark^U8AY36H%B&hoS53Dz|J3zb=yALn67!wek)dt
zrG%WxXZ<Vu$P#}HdYWOFX!$w+KQiI>vX|)hZ{*Ml{Qv$C%>7>>cv;8WU45D0bH|s>
zJ7rv0lvp@62?S-(90zqo98^U*3Y;>C5<6^TG$Tujm6?rcDtJz_OY5@tFK8=9hOCBl
zqo`;pM(au~qe0C|r^icqxqyJcrH!2)!^c%Fml$gnHROWZtJIbM_2<>yoBys;htu6b
zz*WExVK74`ae+FN=~l;@!JkDhvGKE=H#}T9&)vV>dWnaP(5ExDs7Eslo}=*=#lJKN
zR$~hB+_$L19i4%cTpnf#*1cu>mRP-Y`<MiOI#uE~_1g^|JR^^O7j-Pgt*;%A%KJ@*
zP4iy40v)-IfP`3WCu`S(AY7P#Hy!<;pbXlztXpQot~-%E&9JWA_K^|0DpwQZO$c@u
zUDQRQl4NyzBun}{-PU45eX!`9AF-2C*Ebu)gUSUk+4gHu$dZ`RV0}O}yLXB3BlYH;
zY0s2G+g^tnOK=i!P`;kZGLzt)xIRK$=xiWrp(R2pOTJ7~_^@TzmKIxf(rdW(VAuqO
z+~n`I8P1w@m$>9-8Xpn(J#0xitVg*n@YxRwf>&U2mI&coJ!<-f<jG@yrEKy-jmW@0
zJg6wZ4r&B3jCu?av6y~*{`A+IGH&voC)ZvcUL>g1jEum78f0l^!?-LCk~9h>D+Qsm
z7Wawu`sNCSD0Va=$Ezrh{ZpEo<CbA(SKSY8&ytp?7^X-8A5Xn1LD||cftM||!2%Nw
z@?DNE;K_v7W9jr5XmX~{u~%`{A*@mi(V{;iVH*!(PM}RUq-rfLlS~aRD3P~Wy#*sc
z0^D@x$%u*+CRwu$CaLG_wQ8Wb;52T*x9ZMUpuqjiiW14D%UL4e`cpb3-n6+@CS0xC
z5*~qo4O59Zq_kcl9Cu%64vr5(x5D(i!AQxXM!jUaym^wUA~7nq)kkSEBI%M!5!ma&
zwn!~TnFI?7lcgR-D^KL|DmxjS8J_8z(VwhRZ9Edn+$e(*q~sQjI?kQdq}C4*K1l~v
z?6^Tkns<?RUC(V~WG3mkJTx0$3OOZ#U~9j{2GhpJ9{;dx((@wZ`8{`PhPFNRHxOrQ
zBlir=yhXQBc`d$-N5l1tfqW|;S_+D+EI{F3=ZyRjSz}#neIuY`yLeI&ltRQYDHd;u
zitPZ#^63iI0?;AQb2Igaj~pxdqG2<Uc*aRv9!XG{gNDY6)wPR0^(=mbik|!5*A%FZ
z+xE65Eg}2nV9{$1$5k@#Kn|3G_St~9^@A}F;lp1N{wY#_T-10_BVHDtl=O@sph8LR
znw<>Sts#$ap_aW^#J>VGA@pf7LUyw(D51e+Lj5QLSW8cBm&M=s%%+BPmOdepgAbB%
z=FWjdigc$O-KHT)plpTvDiC;-Ln5K^2?`TCd$^kBTCqE!9SURng#1BN0?#aYdlI(p
zamvi~3S0Z#z)&tpbo!_c6rD4I){#ZnPQ`3Fl)shc+<RE-v(c^hKYP_1=`iHNi^(b(
z@T~ka9ZmJKV5LMY_4}V<gC~BnI04XY*u}a%-8Q5+^<3(qX7{LyUMiu4#6)XeI-q8O
zt`Li(OVmD3+&|VHr$dYanbQtz#Sa&e472vTkK#o-i*fG$de6DUd*6Wmsw8$F^rql9
z^mcfXMM4}~5J;+>B-WEMKW7E3SmYEig1O|n2Y2Rl78RJ{lMR0oc1LEocV7(9c`b*a
zx6z&Ch02%gxBhuNx!oe~YHUY@8uWJ|`%V(2p<Q>=!W*1qXWpVc>%Xw4D9N62rMzW3
zlNF>lb5QGyUud@N(CuG{{MP{2q4L{&P77y*30XC>O-)se|5$HTl+%$!;=9yX%E|zW
zS?DWylDUeTREk#|>el|F&s?mAr#jXc^ni0#Z$?{*?ner51o;{c&-f5DrsPS*(qO<W
ze3gMQJYx3VtN!nVQWi0fZR?q={ISffm%5TPnTK9}sW|L);gmY`{A$$I!N{}^(c6d8
znAi{9)E36Vr(4aeL3bUl6$eY!8M}$fU-TBH&QXyA3l~aM>yv#qbx}FV`||f=S6lpr
zTdy;3$>_Yea(=1#n2S=uZM5mpvP5=#0*6p;DhZI(+*r7>BdwUmvwU?I-mT_B5MkZt
zhR_&Tw+>WRwimNE1VNY;f}m1T(`K2j=reJp5JPhb%lIYgL$Gb%;PfRtpt@7A-gaE&
z8R3+s)2Qr3_o=~L^uGqrqS$f+d4(<N0o#`Q77l!-;5$sqbM0!fKtx1t?y%o?b<K>m
ziLMa41o#~@S_1GH^+(LG%b2?)?Fj|eT$UPDzQ6_Dr*&GN&}f^})Yv5!UE0xwdbPuY
z2?1(>=)E}8G$(9|x4+7WVvicUPp|_mu?6f5%2(4HeaUUYJz-DRr5}F=i+94a&MqsI
zuLHGu&;%bDbINz(;Ff&niU|8{ABlOFd|fJii0B`Y>okz$YW!@#8uQwP1!0!ZUmgry
zO9n%#=fWKG=#<Zefi9pI#MZo=C+(qXaOGHvmn-vb`hnb{1+MaAr5W*bo%Y~Yu$-o7
zdO+x3PofZ1(^}xiRV^LD@KyihdIU~k+IC=fA|@AO(kvaRtuHXv(iDjX;eiqqS$|kr
z_uO05uOwZjLoz#-RIZ@Sxw9#x*CU$w;!U4Mi>Y_HW7%Zs!kx>s`9mj2ax~atdB&<D
z{t6IdSeNkeImphG^N9&a@)8#D3ChzFij=-mA5|ro6uxrPc!Rc{rC6)y52!xUuvaUY
zrM%X#m%}km9SL5KL9H<!7%|lqkO&Ia9;G<%=wg>hN>CW^3Do1b%|#H8S=S+aZxLKz
z1lRGRcZb0uKXDaOkBs3sRh5u{;~(=%a0}txD@>t;z;YG~F(tZ5f$(r)0lbR?`QHwL
za{2=BiSx-4XVCyy&<8Q#cNCy6tU-QZ!o9M@Mr4V76p4M5iG3uAeRx=aAo@hGYg|B(
zCn#$U5`bCDVL%fPV8GueT!sR&&GUUfEAqriTf)I$0nTtZi&0->IPfO13e;^BdfhX6
zPt@b+Qbe9ftt)KFN0t|Tx26iBl0i2cbKyHY(tVs0K9=0Mue`ahpt-N4xv!|XudKN*
z2#qtN`GQXbg|l6k!dIl0N~Z#Y4=&I%q4~<snD0kTEGsY)hzGI!Ysapk>dMo|D<Xqd
zMiNX-Vv}+(?Bzi<q|<**%=5eHK;OO|8(Tz?Ql%AbZCU>}<*|OdWFngxnN6l^FbN%z
z7-j~dsa{@a@e%p=ASxGdIH>`vZ)P2I%tyxhlG?}4ZQneIfJ%`<*}o|J#hSZCw7r#7
zewn{wuB=FvZb07w7t^-%#%58adOFbPH%*$3f}UFsfA-^Dg?j6b=Cab`f|=vYR3P7w
zA>H5KU}M(1niu-H2Z^M$hgeR86|ioFw6kCuh0nJD#)@Bg6>jz^O5q{}*@p&#=?qxJ
z3_@;P*;Q_41-we|_#y@!ZqT3ia1*fLy}EF6m1>*UYxyHBaq*C~sGXcp64_W58~jrX
zGbC+r%u0HZxDF_|>_m)nRW3=IAso64ye+&ntM4ZZXY<7ze_0)5R>I^ut`$wo?ljd*
zx^5(<)QM6VyTccdRCK?2big50y<Ch3S{(%|mEwmD#u;h3C{Vl0<qHTX3u-Sk3mhat
zy%s0uO?!WO9T7x9*6<J#`kC5<)r7->;jn}~Gb-RYPmGWw(<iu~H)|Tttm%Xh#ikNl
zbqJ546pM!m%x%u-Cun2<!L=ydo5sbadDS!IQ<GCa%GT^B^3a<W_4|Li)5u;l*Ir?N
z{Kz2u-=Bc<{C6w*x3?eqA<kGp%9Lfw^bx2i3^pSYG04iaMLR;0Ffl$Vym%w`MSMfU
zdYmtD0cJJvo<?gh)FU;mcK45<0_}QQ&2yF7NBd<>yPkT@@Ag5Tr-w&V*VNPE!T#EN
z(y@TY&ar>*?ERGQ)Nu+`U)MM87(=y@Ac2P%7zp;0+jwjr5x|`|l(!3e8;Yz1d&@_X
zhq`A&l83UVL-LDh*iDq5X_zQ980+G>*t*+#Om5w4J;=0sPuQuO_LtvuywLis6%^!O
z4L(E90`*iUZf5CJr;XbT`}gIbLa)jAKLp&k0cdfa`0e-svm?me=l#B3yYWc))L3MK
z?#AeXP5Wk0`b8g6V2&!k&V);;h1?2sr|5xhB%dV1LSfIMkxXIF8OTO3-;$_a%so85
z-q!uZP}068AB~<pohlzZzpCA?6K$B{>~tDBbS?J1`!4>0Kq_3=%AiQODDX``LakiQ
zDGep9^>dXm8Gy|b0}OSNwRD=Xlghiw&m_IzW)@^+vBzH&_?kngD;^T3&t=BeQIpN=
z!#mc$=`IYe?jT5QsSCcFF}6GzPGM)ZNDyQqN^`UM8^tKA>S>EKD9f9wd{SQ)@u;xX
zg~jeEqYC&|gK~0AC)qZ+NL(+2NmrR?8l=(H>u7haQe`wC^+u&OWuqF{h_x3Wgf;A3
z$z{_go!<ir1A%lGc6R@&>rSVet)>mT<sZeTtSXWd3D^pwfx7>`p2Re=)vGwCYEED*
zHA`5U%ND1y^NcOyI<m%aI*gXVT>B=r0J=jN-*apI-<KoH_*3@gHmXdW>a6wihSujb
zMZRjE;9L!x3wO_6QGtP(=*-+Uk9nJJPWVnIuPOFERPDV5tu+)(Z07Lh$wv_;DkkeY
zh$Wr*wh>$Fyr#9;JVOPMggqw}QNj6@@4au++kF#AS!a2jQ<Y7!UgJQhh??8pKqgid
z(MBA3II4L1$J>q+`n|L2P%65-!=%JLmGck>hph%GsGe%_DI&)(y6v2W)A?kFI^6hI
zvX#Urn<mj$a76|e)5TkiDZ6-Nud;=@k?3**m=4)?8f<++2dnzfAYSim0sTRguS=`E
zM2>pS>Lf2!YtE7G&VJPTJA|Y;(>PPYe_3O)nV&J#h0<cuHqEIc0;8muv`1+Ya2_E>
zI;d^vgH?g;62d!wOG9DGavM6>A4o;-Dsxk?s0$ODqMh7*nfnhrHy8)Bm+9<kSn8T2
zyFGdXwG77n#cWfRz1mGWvQ0LAT(N=48<q0jMrz*;^)Ayo!Eg$V-4X9_dDj{&6B;=k
z>$yA3U$rFM>e3ZHGBX7jr8vu|4l>wMPZ10(XcUcBX%vOWzY2@?qUJRP3-~R`#?$_h
zz*n~)i<r`-(C<s#Y}gQ|(7XyaO=~cHLyH+6+mKzofN9g~dep{<g++-~YB82atem)e
zBG%BwiIt5BR*{KU^6uTo35k)UifP4DuGPR(W^fTqVeZkh{7n#TeNy5`!{*^)YkiRp
znG&e1CHBX?G%umzB-D{c*3hS-tWM7sl{3}RcTHQM^Af|MZ&9??$#eTr_70c1t_#N6
zV--cK>ByM<Kn2flkC}z}l8;#z|Hnl#dEt8SW+s{yF?nG(+^PfBnM*KQoahv?X*#l7
zs5NGhM5HDOCTyd0<cMemx@vf;4NTM~%{a7dg;G6lok~}BnEs;o4|!D!{Un^<!b{gg
zHPiA)GMpq$ImreS>2pFK67qxmbXQ{O6&OaVHOg{!_bIbAsIm)$?Gz9569aqj<%pVE
zZHsYLt2Bqwh%h~T7&b~U4y5QEqzO5S^l5iFs=eyQ8L+vkNlTNsU#r?hZ4(R^*AC;8
z#tNg6N;jC;dNvA#E4;UAImg40`Uk^~7cQm*jLv(U?-NnKZ{(=1`g0Yxg7tFOf^rqb
z8wVL5fgnc#hQi{sb{#frq`j*gFPIUjb5+HrbfOo-g^^B?5D|~^r=yYto1*Qv_wfWP
zO6!>IO8To-ehIb|=8P&Gs1H%Q)@p)ElHNf`FIq34a;m+uoKm6}OTDs;>@T|Oxy>^`
z#-*iW?_h`68eOa#PB^uQECtW!<AoFoz+MUnOhkgUxtUk-oaWSEtou6B!-w`8V{)Ze
zk4^90!o}Xqa;xCUzh=HC?{;QfYd9bOayzM`HBdo!uQMr(lvyDm^lT3-r{`aWYVaUP
zUGKl)seGbR5YE+pm>c76#=%^k+RsW`e-A2Ziu!VHx}k2ktvf1O=MQ_xiTZ+U*1}w>
ztr=#{eX?xEpl-l!#-ME&wk?M~p+1NqrkmoNPp+#)$$vr~TtqDCt^~yrY?%F;puY|A
z!{5;M93>R}A(DRi4K!7oN~RJsSoXY_H14RZ=?2TPcq92EOVDsBqA9war#!1zaZJ8M
z0Q0yN+R0X!m!UkXRDngl1c!De!G}=S2q=FsGf5dMmd*=Q^(K`Bq$o2GCGd72vK@|F
zr=1s0Q2mAXhMh^mYY@qcj=STY#_~5yg(d^F<^W>Q4A3R7QMuRij|pa3sI5DiUrN+R
z%ym`1|FA#gTbn<2Ik=Q^v8(STc%Bb=oA1(aXNCW;jOP#hG>v3;Ws*JeM9kx`J(5N#
zmXEVwcjd7mb3HtzPP9t2!h9WXW>FVJVeG(3yW^KnR2pROfLJ_)$o{ZsvBItW9y+cJ
zOFt#=kiXTqNck&DquHDu)VyXCI2A(Ow0|)ef;~zK^ML;@4z(>|0ooGYc4Xc5r1Zmr
zE<V+a_%wlnj9`d8#1A$J6ZKS`ltDDg4|k}<II|lYqX|l*$+ke<n%a&%6&I{DhuY5C
zC@Q>3Qfgc(Jlyq41in<B6v)$0ZZ44>1-1}jFU)T)HT)6{FX-Q(14vJvmFl%PurmXI
z!t3yfVVVL4;dMeuVpz?s%0e&vQWA5WLNDG^6Kmtb>>W_4mAEMjUb1UTPetVR3&8dZ
zULY$3*WlebL}p1(*1-+L=G<U>2t`&=-3dgPh);Zi9i>4GoIpEwei-C~`k25!43aAo
zp2-Wtap*ynLJ^=t5#U2HunRv9SQca;Kd1&9O3u+i`%s9~lb%op8!F7%LHjU>aFqud
z+J8gvL3~_bPbgUC<dTJ%Ml94tl}}C5Jw9Cp99r$#5M_S&V~f=<>Lj4oG-A1($S)9Z
zxCq5NGF<kvm>o{x>NVE7!)=kpIQX*Aj|()``C|)mR*N%^cVdyTG6&QuY<Qfkqk0of
zjBd!<LoqAMGo`J$*Po_4OQ%2kM_6{=Z0SFkJVN?hN%~w-`Z&Tt0=V|AUo>Nr|J)hu
zhTq;fWRg0K(Z6`mCtin2_2M~Pz)kWs>h6Sb+zGTx@5CwG5$aQUTJIPDIEKNXeudL@
z#3_hk{EDwO-dAN<+{as&!onf!OD5cv=87*;;{w|HbO+CLhm*0g<nf)gzH3<0#~<uU
z+IA==7|Cy1+Qyu&$rCglbK%W89o>`u8cHf1xyI^2a#5IQ+V@$xY!@*dsBPU{JqbV_
zYe+&~TZ{K6JMWIpG;dOKv-5tHXH2lV19(yL#mTQg{kFLCj~)9py8rzXv1C;f{}r0`
zPR;hhVtEH*dAC1xK&8s+9V0{O#KP(=Cri1DKY8#wg*A(df#8A0pD#;Rk086Ycp)e{
z-XEL5${joQm78s}9PrGJlTWhmX6~04%Tyr$3#IrlLz%8G*5?J|Xxk3btY@@c!z{;^
zIi6}?6W6fp+u>}orCH&?zL|{e-N6oHnP*u|=g(|#YfOj-HO=;)r=uS20U@|oX6_I4
zE2qe=3G=Q6^R5~5t`)P8F|&{?%#lZmu_IS-hXBOGlQy%H66oRfIyk#l^KvfX5&=|g
zWXKV2!K*RboD$3{j))M|2^RQAa)A-bgI(}1vAGcNkMx2FRpDz^ke<mOJ#-KcSJ)@p
zG6j4Mi{R{f&8@5g))x3Jw20XbfoCBK!VWlqR*Ry3%3^?}l#m{0_y)f7dQL^lp-C_U
z(V{&>rX!s!$hHM&=j4y=G*BNU_=i05x$QMGP~C!c-CV*JUPN6qC<f;Ld@6rvUHQ3Q
za0U|VfM7zAxgc-?@wowT0?|1#HQ|5Rfma;D|H=YAhK2cfMc~f8u(!%XI*DyOiS*VD
z@iTmQsubJt*B@R`m+kv|C~a-Ksw}y#*i_ics%=+H`l7NM4K&>FuDDd#>Z)xW2kRA<
zVy~;R`ECNEvSGgefg@yBVQZ|m_4rGI#*xxlMHwBTu!O%$!Qpp@a{03B+y%<??tKy`
zHQ!&XLNQ61UaXx5SeSMtoODgU*Xh*Gn`%lutfa5j$s2V=mP48Zp;wA{Hj0%3ntAg~
z(rK>%iF?In{>vtqGwAz1_x()+n)QEHR_XpPQEbJmO&qN(<ZV3uQ+`bT?N|8^IkkkV
ztCOp^h5NVO$L+uBs#c9nM>G~>0Y@=Tn$+|*{lSkW;YkOIzaTWw80nZn(b37UQBZ_A
z1}U8v8+4m^Nqs;*uWv^h^{{<v0eGP(=3Rp?KcTN5zm<K!+vg!&;9L7Suqwii&@X&h
zxjajLIGtsKA1i)xm=)i*GL_k6uoh!w=x6vy&o4^RTGP`KO+rWJr5$U&7RQCaq~*OT
zI&9i_O0Ts7<NZc~Em9+tSm4L&XgudO@dg)fnm6v+vl($3n&d6{iGb?XcpfzCxANXy
zw2t0$fHMq*WnQr(T5r%&R|l9-55xlghL6*%%aI?^v$3E;QA%5g$3nM>NI=r@ZZRH>
z!=UuCXx+GkF*B!cE0s2d?cvyd@Yr$Le}Qv5cb9cJo3Dr=VN8m3?gKm_dgq<CUw=u;
z2Z(a(x{f@h?dL<98N%6l7p~ySxb*w-OH&)pc}P|<#?@Mgso)5vqMkE7D=aCv`B*fW
zvMNbVENwQ)>AQ+`z4Et}Z_flp>Nlr4MySvll}%HLdluHZp{W>96miF*opx$9Sa~rM
z9E;rgwof;3!S!IL2Pn`E4YBH2oJ{rpJx$NDS)Q>)Ln|K~%2l=f?104CnZAIuTzg+#
zV(xxcdZ>bjcYBy#MB_Fp)PkV`=#tn)y=uX%0t9h@=sZgM@WN~T>%an9AkQG|%whl{
zma|J>#xEZxG(w#2`mmo6X}11zcgj+64T?{oK$Ss>ntg5{YHK<dp3t|;6$-j!p`)DY
z+a{L%Kb2qpFCJGX2L}^J^KWUlvy-En1-ZJnv&Dbnmc^VL&29cKqGvS)B|H{nf5ioQ
zowm}F)CHvi2%3j}*&N|QV)RngQij?!YR{DRfd;#Jdna<ncdB+}m%mUq#mZKHYL_r8
zBP3fb60DBA-yaS-I(j-G8-lnH_y=<m#xno8ASv<lKi<R^_A;co^T98#=;jx$%!>^$
zqsdS_-9IR25(>#vFT_3sQu#ZY1HYhGwvt*>&vPw{W>fUtTX1EmT1}w^sVU^CfGe<r
z4`dFKz`uYK^&=bW2&zJLMeLCj=kCh(6f+b{Nj`x&n9`=LFoN7NeFUV?>6Rwb!z(t2
za7lV8cLA>9;|r#Q_nKT6voM%0TBU&c)(<3jq3@|uY4qU@KJn3npN^1wJ@iXiZy{f=
zEJSWdvtZr*a!B={^rkez1e1h@Y!9Ci!tj?c<R)HRNtEzvP}|S<<sa>n4Sa>Y@XcX?
zCRgUFu5n>z6(>ya)wLD!6#8)!>b?w}A*G<xD@;IAb-$OMsGno3wo7Uw#_Z=e*7>AP
za2UKGi%v}ay+y83XFMGk?AHIrgL?xLD0GEy2xRX;)@dze55%U@+oIkM32b@kk=t(n
z(;P*6nM6?i&FS9wpK`kY*N)8p&{0PIKZtPOo<J}bbOD?5*hih(gtl`=cQawGU}#(a
z0%%b^aV*9K8|(5Ja<OEZXFJAkC7o=yT7w5kbiFY5cn{Zc&ep-p;Vn!*r>)?GpeFW_
zV(k2pHZO`~dfTzA%wl9{>%yzH1$7G%s?1+W=Rb|!l?n+^{>A&uaUGXC_sTprsgcjl
zS}<6M6iTrkymKg}$xF9tq#4`c@n(gc3N~o9-!@O$Rkk#N@aTrPUS$Dq8FqK#!jNKK
zqI3AealqRBbOL|RB>w4@*aw(plbS=>L|9`tqQhF$L80mf3f{Wa+L!o)0v*bz>=09p
zW^GGKYXeCQoJK;sl`bzw5I==R_(lZ725w}b@!Ct?LPeS&E&Sz|7j3wzWsKC4(6412
zKtIdY=Vtkh%E!D!?=Pe9W+B&U=Nr8cLNGDJbpQsopFCKo#FUC(UJ)S>)Pyib2SIlK
z1l1(SGR_r#65uN#KR>}&VG3!N`50aQA3<W0<FL*4`;9;UfAGftZ}l<%O=f5LKhf;k
z-hS%K7@v-;Y}Xd7!qD)@pq7aY=6Iml#-P+Cfk6%ILBy#mf|iDZ{pOUp5K$|z(Yk+h
zt2IRIwi|zn(UC+)tLy1y=+^qy%Gue~F6(A!o{RSR9#4~J$v@wM?GbfcPj~#w@xAi=
zCbj!}UrfFcf-@uJ^Qt5ejRRE?GEScx(bn6yqG<J#Ld;xB@!L+hr=wu)Gln#9>sD^j
zsJ`3YLrS^W!FGoU=kEH~!?Ih6F?cR1Xk2CyOFa@}vnAvC=O@mC!?mhjzvDN5ZWWRh
z0Tl`Oa;XOm6u07xPTHl$7!kTSw$6vix5~{D{C1ckpbl;d(9lX-uWi<<_vHzYcp8!V
z-1kiQ_e#DAF~C(^!sQ!1gakNlJy6TJ0M}vrDA)sz8ZJ)U9WQ$12Tt&!M%|#CGGRMF
z<Oo?=e{{=f76MSZdi4(@sw3R+X1B^0q!TeZ8yN}N$u@V0Zctp=9|6?(Fn=I%`Nlp=
z{ca@APMPy>?;?~tsOgRMRvMy}@DBpe#|UHh9Z5EHJ=AyzT~I+r=!l~QbOfaM(amYV
zUA#y0I`pV_aHklvA<>=7&x)UoIB~eOl+zoVanh+P?iP;+6P2KKugZYfC5SldCGy1c
z7&K*wIOS^3(~ZY6CQZIW<R?Spg(?)bk7>4a9k$7Xog|p?+SB-2#*1<;F<ej*H<@k+
z1||C%1l8nS<R_c~OET2NK88XAo%9rc{-qo7e}z>L*-(S~wmuh;ne$%EoWgw4@{k-O
z@Vnt7l3lzUNRksN*7uw*QywzNqW~5*WY}R#xSUiHZK*&iwd^c`^Vo{JDplbc%h*`y
z;gbruKdljBCHAf1RBDk*`7F#{^7$kvNTKgXWwbsjOo`Rq%FT-qu*-Sp#lS=^Tx&a|
z?42+Lxs0hKIr7!wAhl_;XLwd%0>wPWzYke&-038hd&Ix)3tFWZw~PmjJvs6aC2dgJ
zV=TV}+A4FZfS%jKHTc9E>J#eGwQz~JV(Qz<u5~OMk-L&FX0~@>g}C#49olB}RRX2J
ze;1&*d6tujlspv7<<H7@yL-tkir22ijnFWb%T0MOTP2k3<aDB5@j_F%?EGSVXop_&
zBrn@WB5f3}@`7<sr|fiZ&<W}R<18ukXxtOLO1!(Z-B{Re1vVZUWx+H`RLuOR&a=o3
z7I5%(9A<Qx&Pm2l7BB{=nG2LM^kq{dg&Tj+;%;i${PD8)>?p?121x??X&og-pm;~o
z(@6!g9L96v*>xp&W~I;?BSiv|Ni&#ix>VY@-bO=BoxoL*d4CVyM$YCCC4L-L{6ec2
zt?G0J{ro%F>=nQL0=<M1l>7q8_2g@6f&}tU9PO{y-~`_+%{lisoDjMMF3!skk*S>-
zZ>;Nvl(Xvw)zAZ&;3ZK|usZ>0t}d4%0kUwlF1DX~0+qbdZm*9Tbt%T_|9C6l2IT$-
z+Z!m5g3!qOLRf*t`i#|Le;*0sy4Aw643uzo|0lE5A#j#=ki<h?`=M~wdpIaRb>`_n
z8U=S;O%zl?g&yxc2un?-Z8m*WnxfsG>vihZ*|$%R35B&YDg>^}>Qp(07>cR{s+|;T
z4MC>+eU(T)z!;y?q~@o6O^yHD&fv55k}9|@h$0)R*c&9=!bDuYKL(d581<sYv_2mv
z^Ax&EI(43og9@JdiIW@v8*6}j_dLz1nNL2+&j6F7JBX41cfBXT^FA5&&joXTB_O*A
z^U=*&Bar=lGYsh_DLld88R_$UaGiT7%+0y3|1PLq)8_dgF#Ror*FtAU4G+|gOtQo*
zc*@wqtB$08A!OkfQ2{!>`z#JNb`{icP4_!O=%2Kn1-|iWo``MVXNTo3Ex0M(8o4p8
z=V|gj;hgZ<v1uy#+zGyIf)TLh=|KP6j+i$?{)6LiKD5wOzWvI{NMX*dqW+RtYb)!c
z4*L(5ZyH|ARQxZGzYc?xLTJ`qUa);k_9KrlPG@Yo?^U3+f__a1eff3nDXon7@UCOS
z95hUXws3DcEC<U1BKyTLi}htVS5*`^pmSnPImg@*+3F_&7Q^XA%pHw4(H=W2=ju4i
z>R?72q;siJtPvj)toP2i^+j;EF4*qe-y`2v4~_XAdcWHQ!6Ft{&l{cZf}2mE2X_q=
zXe~I#l|K4tev)8m`<n|EQ$Dm#yKx}JT7Zsj9oLq|WwF*!t=x;=a;81qCrml~*mtI{
zB36#GKbV|k+O_*(UYOqJJ#gsT+g)^jDvEgB^E2lSH{ho-+3(qT3Ik+>QUidl{u4Fi
zrN~p2-=^c*zx2xkd(I;ld=S1dHg3moG(Bc)D^v6~Q^C@_Pz?J1D8CKhkz>qB7@D_r
zzv)$5=$(Ef6SM4)D#GN=Pgr|>QVhKLRA*|w1Xe2IJ2_d;Ar;j&INfo9xqCNWpuXxS
zbvR|fq2{_rze#mdhr?z=s~?g6CPN>TOy49?aP_F6@%8Xu+A%_SokNccNyE5wgVL^_
zfA)RknHstt72y@~IE`#|ni%1$$7$wZU9U!N=xesBVhG;yspmTX*3HYoJ{Vv(f|1!?
z$U2z^`EyBLGN7c=?!ul_Zt<Mj1wAYm`u%Jt*ksmFeB5Y;E4FJ%26e!K^(<(RRC6<f
zWw+7lNk}`tA{E7Ghg?Nz%<wk*NLBg`JLMt2=f!C94cF!)8gd~4b3-Y`GJ|C-Tqz|7
zSipZB>IXo8xl(AF;=${OA++PV=xztwxqw(?{PmgH5gwo3I+g6*4&`%!yBerni`l$|
zzUpUNi#m4Z>RAh0og1IcV%!<ME>=RCs}^{M{|EO{DTMxp&ciFyd;8$QqdB+F@X&};
zEj_eMeqrke#@nMC#_>$4G$+jH7sCoApdXkbV-fesedEx3`Y<X{zv{ZJ)^c1d0Oje?
zpP*UyHkG|h9?%fq65^9mf_}yz4Br$vo1v|w!#VH0d1uRn(;mdir^Gqggs)yQ+r(d~
z;H@gBM4tPB-IPzf39v+Pz!k+0noXkEddq_25jX@VpX&2?WqA#t-b(nE8)rjV^|1k-
zct-CsT3GBW(GMN~XhG0L_*qnYtP}V-JW4JX)UJw@j)r$yR~G~go0bXN;ot3K<y3iu
z1liLFWpy*UhM%T6e(pePnN>&`f#13uz5VG$JK&X#VEb6t1H&4=%r?u8@-s|V!{{Aq
zRI<D(x@~wCzH*+Z6)qK4KbkSvYpa^1eHaIr<NHk3h|H$F@WZ@N&2ai%yl_Xz7uoqI
zvmf!r?)gveKpnc}>6lcnDHirIHhgkd3@wC>$i{b-Q+35&W1Fbc6fO%RlSVmbEX>Fh
zO|Ubx%@YsJTVXvhJq?U)YQ&PVr<0L&)hn$G><j9Y2XYZV;5w^<NrrDUSh3$a?9!t*
zD2;{E!syLeo%4&OVIknoDx;tWCd(5?5~VS&)R(o3fXahh%QX5?5G$Xc<-jgYgR4q@
zQiGRT_=zaj0A7n-vnWNc8(xYgb1hoU)PH-@-b(TCBowsdSkj<;o5G&cOi3fy*Uo+!
zjlKzi-Ad>}#utLa=6=I32`V$g|Mt)hm!iOH_!v_(*g4rCDg5mI{&w$Ja9x-ChssK&
zMM=iKwUEX_9b78~pJ_iR+r~g^Ms9AkM^8s)>5S*S!ExrdV_5!Jmfr^8bs%LZBjg`H
ztXmf6lewaW-+P8gXdnvV(V_N&HW}hJ88Zh8!>p??x~s!s*@mLEl44bl5JPB^olEm-
z-=b@~K*)Q;X3np4ZV)aRn2G4bMWu&_)`G_GG*IYtaiH1#Q9ZvvxAH+%QX<O(OaeCC
zGSmFiTHOy#a8ljY8fWB`4ZXZMH63dhRSs(kQw>ymj%JdResfsjS*Dh)HZ8!n*1)AT
zT`Q$rYC;P5KCNBiJ2h{o7d`r6!bc{}iG#R~ShtU0$D&Kb=0QotxKN|*vna^-yO@$H
zBBwMc%a59>#9Elb;!4nDOW-ILjg70ODs>&R@#@f9hH29922HgKrxk_e^eF#K9r5du
zmQXP>_zF6cBV!p`a5#t_rdKhp+^C7B^2&1cL-cGyjmy}lV*hOm@9l=&AM-X`fVQ|u
zH+Jf8CVc3|N=xL1JdyKNh|4sfuMx^_$o_OI%u`eL=5>S5IqT0IrIa#@DM)q4J2zs5
z!8d5;Cn$gSD>CN`>_3Vakt-oCf$zo~JMsVfjk*8FBIdu{B-5FCYMYYiV_z}mp<xv)
zp`rS}^~9L5f=($If|j^RU|7iG&`=jRPf3{y#H9&!EM@aIuTy4POv<KO{AI0PSLzo|
z<(+Icnwwl=$t+>fl-~YsFDJRreEsP<uDK-254dLtWVc7q`pG<XaxxMdZpW)WH9Vf2
zGF@YTRC3uFj(4{QhQPI%xN7n@9g*PA;j}k`r#rce-jD&o_5z@R__uG<i}KJIE+I2H
z!RNY9x*lB-vjbfDjd7?6^}ob=muCF6cpL9JjVFH~BqdU}#wIJ9iKiMpOp~r@4oTjh
z3<JVc|AB&Ow{m*I5}erTI=c6oAvp>a(`P>}#o1&2fb|wlzovApX;om7O;^y3!BwW+
zF?D(m<y6r%MBX8fd$l&=)MW7BtuXr0>~_UY$G}JOjgl5coKn2hP5cUb!aI_9ym(B>
zseQF-EQ{Z*QMG(R7^|6tO^pm*X{Dc6ThTP|s>$2`wy+`i_LGtto1paBc7;y)S$xK0
zMBn?T%JZM+BC+(k94i;AytlUQI$X0tEAM-XF!<L}B?c9E``Oak4WAv4OXK81s%XnR
zP$)W10j^#8213ILy<P+Oro4S+WtGf3*mHQ#Sxz%X8x9)1TIa59^wK6Yb|{9}#WO83
zY~WGlaPibR0BXyJeKH1Ut71_cwpTiZIx^)`EwPD`M$^8SN`p;e@#ptm#ssq%6_dhC
zuux}<r1yq=yn71w!mvvQ@GMVU%HATGr-#ZY4lfwrU@N8g@|=WDc!%ySJ+sZCmb+~~
z6n-+e0EiZ@H!b}OjFK7;(nIAh0{);0*qDWzEGK@9f=UJ<o3TkGNmuhVLxzd#+mZaZ
z+n<-JG@WecKNs9%LvzWU#CX9vgREk`FqLcQ^)_H;UW@(QGkEQR|2S%tZ{Jt%&FV38
zozv`G4wBNpp*2_a`E@zmCIvK%NE^d)>62Yjuv{NGSZi`^BZsQ$unVnP+&u6TO$E4p
z394*o4GdinK)&;~t}W-$Be48fAdaul-o>_9p437(2roS?*%lVgpTrE)w<6G9zxUnZ
zg-6>JEUJ?jFD8FPQIU)(Q(U6L-5(5IxpfJv2KgoDYCl(<3J_d!26S-$rC7xBGoS7M
zHioN2XyHdBl2h5Fb)xPw4jh#{B!M@Ld^LHkFlVVKuTuMYm|Pq7s%~oxCToj!2D&MH
zVb`(}*V^f_nbE5KhElBEM_TqCUvdW(Pa9BV^uiF^)3=9F{D1}pl&&)VNt-EOS{0oS
zC{xXs^ABsIiVQ#!;JQI?3>q`H{sJNR&5YT}%Xzcm`FjqlB&h+dIYh}tx_1yVzu<l*
zCgV8V66!FAx^Tv%W$}iog>E)U`BPHWL8QLwZwYQlr7gDFCUfDai^MWZF>c`}`e}#g
z+0NkRL0GDW%tq1xpSc-(gp^CXB!gGR1q}6U;?j-bG24U6AB5Bi3GfO`TZJq5>@CpC
z4bWxVg5?Y{;briRWkvEO@}MiSIYLkY;Q}a_2jn0^$~iJ{pBfN%Qc(9INZ$D$ygDGc
zTadC8ETAnMOB+3G*8eb1dKu<caIGH?sprtZeUgQhP)=|_FUjV9ff5kUiGUK2&Y6G`
z*!-9l545x`$by`!ggse;o11}m*tW-5B9D=8);@#r!M(pZ?&Ocv*kA6#85@D-dh<L#
z0%eqF=V_qhdN^=@ez(Afv!V-k%&sq17fN2rFEA|sWIqT%)|!*@XA&IrAO0^0t&C&0
zFaGyl-X!w>4>9_`O$I%gHp=Sj7-L`mesa~@WJ`c!q!ntQTc=}UV}Rg<p<oH4BWJjf
zCtOjraBe#=ahvb{kzrj&quMm5h)Kz;g4b=NJ=!dxlqsdHR9CH3x1dccReedFP`6D!
z$^7d1z&$N<fhW5^?EQDub-m^G>o{PxXPc?}ZiooPdO!oqgM|Dy4S@+2DdQUQPZK=G
zBQrYFrYOE7XObwJb$!=87_28V$zJbbG^b>u?)9i*-krT+y`S9%V|)hGV_i93f4Y06
zIIq*D-}I?d#CGfV!4&=GqQ-K#i}z)y1P=x&{njL6h~{rq2#8j1WrCKEgDt6<Ek{k0
z*0lTOu?Lj($I8LC-Yiy&D+vV&VI!usl>m`r3WD)ZQl@BvU*`0z81jlQdqHr$#@r^O
zgOUKQZA?zo0h>jvI0;mg0P<n2dGo<lIXTM$Dpn4Q|AV-93eGHA*KpIZJ2pDDZR?M1
z+qOD((y?vZwr$(ClasY;?dx-O&aN7>=DZv=Z{Cm38wes~!i@zrJb4y0?*xf57%$Jn
z%81M&79}@_a-u#YrS3RWL1Zzo*KnkyGMuIfI<@?i%~k}bI|3>D0zN#Q{v|B7$w<nj
zhZGr050Y;!R>>xIXjFUlpp~(`g$!l)w)dsC!X1}^Wg0r<7RpojiP(*Z#bO}vYURwC
zVEpP38^Xy;lT%FH427fnD`fq|R%arTOepM-<gF_d1)dD{JLnftnSqHKO5tD2Z)6{)
zG)P8kr#vPMc+xgdnIrK<kbfeZCH!9nh^jg)Fro7ctw;cV=f;zl3GLB_DuhUtJ_M<^
zFHa2Fb)~66uaNy%yWm=P3k8d?(LcMW<v|5UI|zp1?8S%uF1Xo?_NhUkoN0{v_J;oP
z$%{)g{M;F#VExDqg@b8K%4VJVxCT`QM}q~Jvasps9OV7{zQW!*ahrpA!UHCv#vJPH
z8OpA@gTl|nTlchC5AT>2e=D1!&2>6^>aWC!jj;4NpNZ>v^htwBI7p4uqiL#mEI;Cl
zzWeMPxO>Z%kf9*_le)?+5<l-Jis<k%!h@x@cXxY<PBnztGR>Wff-te`mI~LiS(%B?
zYYjPBEcQF8O^V&S)>&{QhCWPe<<PQ2l9a6CKNjHdvt0HaU$`yrLF6j_vL#B&67CUr
z$#R2@A<J*M(@NhJilyb=Y^+4kjT}YTFz1a%(dow(5?eld3`NoHQ`vZ->Ka<@8j&B!
zx5ifaZboS^Lt3?Rl{(DkKMBbGTz;0VWY6j~UcMR&H`22&Hjpe2m_hIo&ywdf1r?*s
zmYq?4RG7Y?0T~K^&#=*-IRTc;UlB$<k#4q|b$$5Ch#rOBkTK8}S_wXw=a=Fcqx763
zE$Vlx_{9ED^NsbY*KiaSJE@#r<wb3a)|yCagqq$x(yXahqs1(+CRTbQ`=%ROO#3Z3
z24@!)eH{{4O!W2U{GCE+YBM$4-PexWMChcFq%u|iW-zxFiU|+C8^5u&I=N0KKQwH0
z&#u1l-BMaDtYVO)-nJ#}G;r_oDF(T$GOf^QN1OAzi=U~bs!`HUOq#Sz%L_4rtmIDn
z_rjH=pPD}xQ<;95u9L=I(qt8VC5Z`<!=)V9#v8?seam!;n&I<w`PPkY+I9=a3hg1%
zZb<SjrM$<fD=A6<SI>-iI#g8Jz0Q0hF-b&w$z>*%g%{%J;&w`yxbwVqSTSgWGxmXp
zKLxn+cM<75+m*^!4O)p`utMwdJ(*i6H}%b#Aa4xNq}P03G3HlE({0<9CvIN%7iWWC
z@UgrbNRwjWlcn8;Rm)g2YeStj2*e+qzd|1<w6{zsVcCY6FJO2_T(V=(E_!6u@L!O&
z12!Hzf>3L-y{nw7x<K~W=S~;1vq54j`o{>byE+$=9K<g5bTK@JTW^*l_pICyo9`g(
zlK00uoO3VSDuvn5E^DT-rrYLp&AOtBhHK`{PHnfG(CfHc(8G@8X@hAlAs)(FyDh<S
z={mhz*N%InIKtWCx}wX{vIIV(Cq9EGK2eOf*rLyxR><8#nJ+wP1Nbw9I>N;-L~VoF
zc5)x6-h0y+2)?}(w`>`xzN*B*I|FEI7oxv~PEF`z_JG1*dnRAuC4w>f^%?!z;s*lT
z&hy2v#@sGVv*Dbr6jeA;cRRSG$}&%!U{Bcl&|1Kx6YgAUX1ah%dgO5osr;I1WvARl
z{WL`)8T(02i~XzA*)OycljS#V3=^8xsV+Y2(Z(0!4yl`9H~3devB~+I;Vc2mQ~H@7
zZt$p%YTI^j*fvYL%7_;RMf1$AdH)>01BkyRGCKm{_H;{7=nUgu*enKocTm4Y@>_zm
zv1Vv>1VUN@=F?KhTBZoi@`J4}FilW&wi@qc%F5&!=Hw(M3x}L@0Jn=q6=>VqS`ejl
z#J!{kn?vCL)@dN+y+U9F6q&{Ta(&2%E7xIm1W~S1*x}@JP}of5v@oO_7=sUn=n#p}
z{HC1@Bc#E{ZU9!Y2wEvX%@w5zR;3ciZwf~lpRKAC4N(ydw@fN<GsxNt`%d2rQ_Xi{
zL?4X*I75*sCa=4KM9mM#MIY_UE2Y0TDptwea47~?Q-tA8LSxi9FiZ6}0qdkB0#lZR
zTJ6nqY4&%=WNHB1RS?SlcDEs&wz%5>WUY_X2XkBQ&UcKZ2Eg8L0SdU1%6Z$8RZJ(j
zml@ABC90sGq#XJ*CW$VPDA$<WHjuPJNLm<Bv&o1wWL+B489|$0eZbg4XjGGCGGZdr
zMoWSs@ksMCjT#~%*GA0PFdG#ewHLI=Seir9JdGqKGc%8!pLm(sSgTt#&Lcc6Y^alu
zhF(y8`3`3?vMO7zaMH$y**}(^Ug8Q{d2|x}zdUT1&YJXM4!TYEjjc*lKdez*_PoG3
zT}j%dO@^10Uzyjbo~Z8MEO(V=JaR1|<a2NZTbDu_*AN-;h_~}ss&IwMSp#v`AYCkn
zN1qNl;3dt8_;s*cpAAyN&t0A}6=9vD)8)8EHIy{>UFb&^G{Jj{C3F-y7i@Dk{N2;n
zIb$!4wVOtdlQFM9L>1~{{sctuPvvsL6ud~l|HGOpe*!*JzHr}|wb+@A_dVeg*}hLb
zES?!U_tEimr|Dn6f!Ar?HGBcR`-b>WhD@h+h4=JhBgKR9e-M5B*8`wYbyF2t4CQ<B
zUkw4M$OpghnZ_)kL7oWB;51+`?^nei)QUn$Mq-%sO()lYIob8MRXS@+{D)Fo?nfL?
z8JH{w8S88hneVVKqNb-QVznFr&kFaEiK$Me=dUBz>y6ZpuVq<25I4MSrN8;I{iXDe
zAo^B4e-k>;L`h^UF<|w{Vc|>#-L(7FDZGgSKlNevrB^YqL<PkI<)e%+AP59867LlW
z3Roh|Yx>k8q#&Cva953t?^Q4w#m#S+rRbHgIkqubD;91_C@Kza;K8kXY8(vQ*n|qk
zn}XK$F|)|HgB9(Er3aDBmq$}tr6we!ho#ohtE|;(!&ujECZQ0=+oG?DaUzsfGw``6
zNBnmq4*1u@{Eq^6J^HMv-B!mDCIC=E<aBGRWAsZX_)MgcDaI?MYS$wv;xC@fNj;xa
zDtGuNc5w$j?i&pvvb0Qu8$N~ugc8yl5*SN=chelS5Wo|SOFz&BgKuK*p<*AUhe^A}
zo>QAn@%7ZSt=K>gR%FweZF7vUB}<}eX@kpnx5Xn}vDF)40Gx2gN}fsjmAlRbP-&s@
z`S4`%EHw55&bX@m#QkHhamhipDQNn<n-9dhFT<1iWE`t%19ifevL;Z@MqO(C>jfvO
z;q|fyZSfPK#O@OqE_Vetbtr_h?Av1b%(7opbHT;p8xjj}3`!ndmTMFw8W>N!g*hY}
zg{`K5@bK7cqL>?cQ?*PIHkS#<3$U<TdWKPz*T4-J+(!phH;(aQgM3JM?6AO_jv*c{
z@n>yC^SL^dVKo&*pDg~6_l%5mgv=uD(rM~eYDz<lUQuQXw~*X!6zr%!;cB4Qd!3M5
z!w|5zvIK5UYVEkHC%m}Co3%k%^xV0ouzayeU$p<ahHssPp2-=GEsZ~~sD9nforhrY
zhVK|^MeZQc&S%!W1j>O;_?}SSI@$9|lE@JgwfL7KYW0)B9^Z)xJmYHD=9IsSCpYr5
zU3$sB<U79P2l8=-{P&dIh~fKo9f0#1ms~4dNy#>c@rlJ+t6h#&2Tx<jd>x;prdA~0
zOH+|<a=M_yVWXOpIX2mv96>lfBHgVG!s1P(swlJ|T^z&0bv9+8I7o(5NnDs^b;=Jf
z61@N~8#@yD)7dNctHw;+6wdI$c6Q+IAB9@B#78kQDIfgCz8k92pkKOqM9wT6hA<b9
zIi!<=W6K^{-LL)=+#84L5WFvYi=faszM6oxRKRI;u565(|8IaBQxuVFX?gwr#=0)J
zjNhPxj*ZZ<t-m(jWH+-e_f#IH8J@<Y2gQcx^)DvfT@A%3O-V<kCKid1IzX<y@T9$V
zM5vN+cg1M+DLP`51kdd5>^W0$m72#-xvAP>P2=KjSxNpJ*Vrz6R%uREz!5R#p7`_N
zDZ}fA;_K-%8%Y$FO@inU9MOObvk86k0x8JyI`36Pu-?sQ#P!G~W~x}R6C;|pP>mkv
ztvfLU4?pAUj^X5?JXRL*O%X#FjCG%5j(N5O)wlqJ(xew6-Bivc1RO`RlqMOPH`3%S
z`hZLyTcc!KrW;6t`Rw$^neGuHl{UYt-F+Pv*vt3+H{_PcE6qaH@iw7SlP|P#{S3IJ
zAX7;TnenT>8hrZlw&)}^CBz|RA7ZND-%rRV9!zRQyEH^nb|T0-Q0A-wXxf_Kn7pjw
z+SHi*RLzw^>w(t%Kj-fBKlAo~-{N*iPGsH;Hvl=V6y?1TC1R<;n^;dXq*O_>+lT0Q
z;?0hXGQe=w_f3;GgirER&A9nGamd66Rt%n3+)w^s<go9z3O)?&65!(!F48vbMHX1&
zZJItpj~iyMeiWb}5Lh<)y5rR)UD|q9K}Hpa=t|8HXTb9%v76czR==0P_7zKPf0wA2
zp8+$edCPiN$5Iv5lzO5y2Gpx@u?MuJInS3QXBE}@V8PKaxgBjaae?|0wIQhXN)w8B
zXMN*U6u@N)rN|m!`lh@2qQiZ7TOFX!4Db!ye;790MzD|2<;LrZqIZkdw)o@upbC8`
z62CeZyc~<))7b@W%MEnMP&6i8;EO^uTC4db+Xs@L7RZxDBN_7uZ&3x3@z3J-F@*mS
z12Mm&noHPJ7$*q=^Juq&95x46ytNiNkqxICyyeBv6!{j|Q~o_drP_N5jyGc<3bHzI
zZ3qHYE_BfJ+#UFQ;eV4Q_r;;3d?{g-*OjTInuk9P$o|pPF5KhV<_>>G<`9qt{DNws
zkTW?L<o$weAaq{JFYy0Jq}b~HQ2GzCe-QEiKqCJa*{^2l_+z!`6HV<-QW=R0(F*A(
zUn*q0D!OYBU@Zs?jvUZ}f*4?~(U!FIv{tU|>}qW1QCPU#AbpxxkU3G1N}<a+?^MJP
zIKg~bJmK^f!D)T!7;Qu^NRMlA95A(dpXHeK{FL#0ad!RP`i>6dd9%*$@ZxXPRkG`V
zq8pwMCW@m;k1NC$UPmEfPYaLCRF}F)j~;|727Hf&wr3VX193>6!LIYSJl~&gc(*s%
zGl0Ad$$=r9%09Z<!cDqgmBmY&Kf6|{-N}83)x_H``lF-P?4Zog`1mdfKN5NXda1$?
zRC#*g2F~w<T~&sisfypA&tA%Qg4JvLU@HR7^Y@XqEvstA{YITK&GE;a;FJUKydx}E
zv)kW)OL?i~ZZ<n;+Ubgk7XRXRz7U%m7V7g%9uTZoc2uc~TzyInWUyQoQP{swRt#-g
zt=J14i*)UAw-YoVaZ53>WCuzFyE;6xd%TK{!mQcrTbbtXO&BmPy`h7KrGtkdC*}_P
z>K{|<6;hY$^CI5*4Q;~C*6))Hv#OGcPm36=73Wf2BZ7I%-I8#YgAjwL$?$9C`q{u5
zu<mMlsLu6n=r64wrMfNV14kdj#We}&!(oae!|zgUVk?1f4OJsdNNQ3zvFv9YDt7+$
zluIi#iY}aF5<efq>Z&(s@@p9+!A>(JwWN(pk*!qku7MoERw+t>8!yll8|mQYp(1nF
zjX|@ttLA8)W;|<?9cvzjTOY}wOl9y=CyRT$FIkdu;MTemn(GVBb{4Q+6X0+-UqFdg
zuavpCw<0gx{fm8$CrrheP@j-)=PU>OO2#n8>L!PnhH>JNGRHgi2=6Z3U8gq3s;d8*
zUGZQ!n|R>Wh@s^n)an;R&SVMjZ_w2vyk|D;a*sWwoJt)G5_IOwnKrCatUD9l$}&&u
zOw1D+vv!{Y_KTvLRr3aR(}1>Fq)OXQqQ+XsldRQtumsK?bVYih?INRZ0#`y9iN;pa
z0zlZL-AcW)bkA4S(Rv$4$D2bLa@0fN^gJ8i2Y_bvPl5V`QovP{-4K1S`(^LI`7Ic}
zN<S-StAI+Tt5OZHNkV;~uz_ZI_aHR_6htiEQbE5t3=fp7xhm&Kg>GQ#==^l|;NZFe
zJIgJpJ*-y8uO2&*4m_2#6AgJKfu8XkSgM5MvRpR*T$E8@J&lYfsZthhl6qbr$y2a=
z?u8G68%80^{%wdQJ<D#TJ;B<RijgY+!e=<hTv?*W`{bKS?U`+4F9Z&9ZdqO;W20`y
zjWUftbde5+-VVc~^#@)edsrjf26pP#O<awTRi^wdPWC&nD2DbMj?1+<GGa2Nh*5Qy
z_jp2DhO+YUIz=(lH%D4oWj2$hEYoqy?5V-|E@*wgc&u2`ci%+fnjiP%%t$Rs<(x&i
zMfRLbphKV$EfrS8voo1!w6>_w7Q$67zDTOTbf#NgX&{<+dt_~msF$v*2RLN;XvO}c
zWFcFgVez|dq;P*>?ha|<*P{|VNkGk>Hup&kn(1e#CgyD>9D>P9uA>%{{D`yA@8<A?
zAlz<_oGJZ^nSCPADB|pIMtm*#=9y~BiLpi}{M&_!=#9Pi=3+H7zfy3`&v!h>f&#0D
z{tg+p(3HNmf3m~2t7EY))(U@XYc)q-q7V5_0qGdF;Re*t5+K;0Fi6pwe%T(iWcB?%
zQ|Bw%z|<7^a_SdzJ257X54|mD=|-Lb+Z}ce;w!XQ*|uptcjebj$bcjvl2of-@+j0G
zOQLC;Zzybu8BUr%y0ootOBokQyPt|`%XL`Qb^)J-8&=q$bOB-oyW96z(&BuLPjLw!
zM>K0i`NrF3lj}*G_vB59`m?x#UwWJ{@Ph2U7W4yi=7A~infxQNoo%?|!f1zSwNMYM
zh3|3(a<b^SQg}U-(*;3y_HHMIFRX*#2j<NO>x}{P23htdpf&${*Llq5gl@OU2gCMU
z>^9m5^!m*3C7(C?_d~KWVO2g{cJ2{kq{2JP(A^&$qcJ*$ExKL$JoaD;oL-FhgkcVx
z!U|M$yNtWb8N2v=dtQ-S+V0+%edAQ8jX}_O$VXyD>V<hIB+9_37akdfB|(MFlJiNb
zw!pI%o@aZ{P^vIF{tG;|kWmo0V&)7Jm=73&*bXtYL6z~KV5X1E!l}t`;b)!(qPrPx
z_V?DN6-q%UPL&cS?%`NwHo-lo&SH3>Y)){LGk4T_VQYcS;Wa-FS<G$c6;^+<s6VD@
ze+N$92HU_sA18Bf@UdL7G#i-)dSq(5uSJISvFuI}L6T})Xa8Q2f(PEXFaB)){Y5}T
z3#nY0rTi9D7YqhJTH%}i0(%NsvF%m8VHx;>`H#{LXb&0h{V46||Ao^27m?qXs40sr
z_S3EfX<B|t<CpkL%x{3j_P5nayrm^&4h@(>j}{DI0Z4;?0){!)cI_+@P^Oco+s@7Y
zyR1~kPpL594EU5XpJxgn(7Py+AL*YuoS10+m`Yvk{{H;@4b)tlt49wR?1u0d3Sq{4
zFg*EZtG~u<OZCPNA0K>oIMlx#dME&LHwzy>%tw$pJ}(toP^2%03%cktMV`J`&#yQA
zP)5e|hR&X;n(yM&5K>w#=_)dfJNZWq)2+j#yCzxUHP6>B&Wf@e_AjB<)t42pqca)q
zFlmyv=3vJcaU;^#TqgFaYAY?(hg~ictmhP1uPvUP=Ek&nI#JT8Dkh-TWe!H1GJ2UT
zibvDW0`*UsUMI?~sPB~Hi5sD~1}90bFbs4MJPJ)}-G+pMcUJNfvYg@8^Zs}V1sk{Y
z!#Wq{sT1~J1q-|<Z7Jz(Su>clEG+4at@eOVk8bk7TBYXp<@!y}I=aX2-H-M+n}sn)
zb`A^@O&clTS~Hqz7He^e3X+ziX=SaY9jQYp_L3=?DoF<R?WHnh(Y8eER}Rb8(?XW!
zK|cFux+=W25Fj~LQpelaYy3jg^+GNXa>Hg5Y>AOYB^FW}G9{?k`PF~I!Eb1W#pc9>
z%j%#%?$Y0s;NVD4eNSZNTeU;b|MAUgVpM0c#Uf?BFlA(A>0g9s?!;@`D*B(^IpbaM
zo>$}n98)D%UnU(!nrWq-#<U$3E*h&jPsb32#OY1iWuVZG8mcs9AhX9HCO}uZ77#qd
z7#pD>U-LBQloavGp1C(i7O5P<#f9jnYvLFf;aYmOp!KWO;dv3pbmQQ>6_KkG88IKq
za<T~hda$PGMU+u0)6jYDa6~f!(NQeVDh}N(es9jfKd4HYc47*L4@`Buno+6heBp;p
zOPuVcvXEfix>4hx_$HIuY}+cX(=xv&jpLEYNUFOYh=f0F;!HI;qdYc-DWB`MFY+!4
zs@}1Ey(Tt@MWcTfXcQ~>2H^H!9J{@z(0UW-7S+xR`Z|AnV430D4gjLfM?^KtTg6q1
z!-2&4OOpRy;wBgm&8&Ei3}b<`Y=*<R5qJ)%xJ|f-fO2*!LS2GY)Fqe^;c}6Gw`|BG
zK%lI;ql_=E{TR}Y(987~2deTSP^C<uK|xYO9e=c=AujR@T(;8nch~7ux11xhVzBG(
zBP`puzua-oaX49RL>b6Se50Q?X!h0K(8I4myT5V{_{xpwPjWOeSGgv?ZJn?3pUj7m
zF*WGGN9+onTJV(*=*8rucm2~u^V@<=oIz;H{6gEpRGeYt7lo_S2LD<R6s@&X`%na=
zlhGtg$YQURM$MoX?r@{XkZ>BM2*f$fiT9Y3Uqm4K(>h7gj{>LYSp1eXV?GbQ#s{SN
zYfks5op2oH2@3q4^gDKno)u<p&faZ9U>viu{iR>=*G@$6XU=hVFdnj;>wBP35#?Mb
zY7YoJg4_mqP)yi9gxu%H^M@dO8>#m?bm#d*0Ux<Ho4(}hZ_67|(qguxoK+%<2!Sxk
zAg@I2dCJ~mU)Kv%I2BkpNSuMLMED{d`BQS<ifr63^&y5j0)TeHaeIs4uu`N!<eSID
zp5Ynx$gzm-&i}xsC#x38+J6vxYB2u?$;$uIrc<E2P!@525FZy4>D1VNddYtQN96H~
z*Woyjp!k_F*FYuwVae$+a)rcZZ9l!B_2*G4K(lUqniE{qK$sWOv|_0(qS2tqYJ6%6
z5i5UcYE-FIuK4U+4cIhh!-{|LlTF#5Oi%s(e*d1l?ri@3eSLKel2XYI+I1E9v%szv
zrU_=_*ypDiv2q93`dYMslaRiCc%;c`<75EcMZ@L_xlx)w92R@xOc>g36mxyjqS^Ft
zx<Y%Sjk}G^PHb0=eE8xQ{eJM})B2jbf#YIOaq%Ya2jRqBVp!ZG#EG|L-`YdOiI+J0
zA-=<as|x+0HoPyRv`Yre=iC>NefrWGtvkZoy-+K*qbf6zSSfq*(inXX=CdzcY4uVW
zy?xpuFdWZmGk2SS9Dm!;!^HV?`qCNAchaIhT+a!A;wCdp!<n@_Te%+t?2GnN4(wft
z7@3M~I;ps00UIP$&TA%2Xd?W}kroOI{j!A3OH;~Ms0a3qZAwY*@{+y@GfRyb;o+r^
zKzE{ULT<rOxIgn(wrOdnrnL?0>KW5H3Q8mBnvf{7Nh)+7NULisn^mKymnL=75GN1f
zw~Fi^6qd?=h!0kpJ!0TZsadpCIB@TM0y<~mB0N4s7H%4SnWWhY%`LQI;PogMcxotO
zT%I7YC+*P|iKthMl_$}O*0@D<V>=GPY+PdNIAHkh)j~G63~TJdn8lX$xDo@VU~PHO
zNw7`K&<nKv;c`g0^Lw-4QF85My(Vw%ZXc_pjh4dF-)msyNUAEMY-);ez{irfkNSMu
z9Ans!sgt!+tn(U%4PdJZXK?S4I~x7aBlp7j7JTYD+@ykFQ}s>n6IEt^aQ2GxXrKdu
zX9uCj9E|Ie@O#mS42A_>Db7dcr?za_CedCr&$u$`<$Blj#eJs)hbrhx>)+hn?owUs
zl1$x+amL)#D2>Ay+ei?8e&?lv`T7CFXHg4@#Y+<_rnZZ+*%`2JG2gxawpB!9bGk}^
zu~S;y=L7T0c;9Z0`G`0SwIF`{eVj>ZtQtLl>zJWG)Hzt~D)QK^KiB2y#{o%Lmn?9y
z_MdF;fVusk3qlGR(#ZvMTGk;ARl1@<>ddw=JS?=RXdlD4DL}u9p;^(1%t&|^sS(%(
zr*N3nfm{DUfMQ2n<DqoAn^xMVAsI2)7?bOQ32Xc%BbFvn`#=l}O3NrqW|z4LvVf0O
zhiK0E)v8^?dS0rG%V!8WE9KSx@&w?cSJ{75iKB*E!3RD#)A@H)tUx5r?S5vh(qCB!
z$#sY*0=ArIX_SD7uv<%|Cz{XZXuPNsyL+<EQS9HCvK+hhn}bKH@tf3^p*>+=eU%;Y
zAMJo_>ftK!h49zBM^Sn+u8QpqTA@0YYpYs5|KPtU!vh_x@<h9k9XWcFb}2D1mn(UC
zLqMWh=u10V=u`3O&JOiDHeY_)v>(WHZ8vls1vx&Dk;##QwR$tw$AloC%`n)vbuj39
zAl5~_e>l6juw2$<9oF-kxOB``-%+P%qi+Sk6ffL^xe)9_`s7_#eBu!+oJ}z*ddi_y
zy7zGkQde%y`ZF_k<%nd9S6VBggYx{Q9umgx8nP3toyQIQa<&_cNWbOfY8eM0xuX7U
zPbDpHrtiPn!fV=~>-75`9yz0L^$efZq=HYq-y3D(Knxu|TfLcNrSF6Eom`BdW~3ee
zwAg<(mg6E>9$%@*r_bkbC@wnJpA4E?J0osWebBcCzS+5d4?{2-Csp)lLa#ZT)9|9m
z=i8hz+XTzS!{!DPED#HoNc_+D5Pa^?l4hJ!7vtde-ri0DtZG*MeG$g<*RBi$M<1-L
z3(n`{#%dvWL@r<^ldQKvo?;sU6~E$6J25|6lA<RWl^SmYqo^kvThxIXn-VSlt{~1!
z_6tvJc-AX8lchsuWS)lM>_|k02nnFy-EYa;EPE<b)zIO`I$q-<6}z8G({3EBb%$!2
z*=@U%IR1wdwjQVz7CW;uPO-)Sa(f_`dx%r57x(E!ZpG#ftoTq1?pVzyTCX%;^bd-<
z{?$nRg;w%nmKyEI;fZJCNt0@3B8R`YrFuV`4*4>Oi%|qPQ*X_2wpXZ$lXEITxBr>e
zEB<^!ipqlV<Fp@Ndp8~&+3@qkqehtwe5-%m{vHw~tF@cTc+@BL9`SFPb}orYEv&m{
z@kHs#SQDFHs9+q*b=&zl`eqwI@ws{=-_`!%3LN%Fw;Det*g(_Ml3ccjuWc3gkLJh6
z_Zi5#c*!}T_dC*7Om3_YK^Gt>j{@eE7b3j^?Vi}pX&pIRK=?7*w=y^V2R=;STq}%m
zp0q%FF$%1;(#GS%RHhGkHFdwERSMD1GH2$ZMb>JwT(p$jAu<YyJa#O~Jb?1!O$Q^|
zb2-seF9hJyBi`xj8l9BrMDfeoU`QIH#~g+;$uEb(8sXpPQXItSWZ0ETYaU&=o@s?K
zOmZ{jn1<+c({swU1;RYoC>MC8RJ$Wu&v-L(w<0|rfmBL2)hc~ZEf+OwWjf(}9@9_c
zY{im2APCQz5fr<lB!6I-Ra?dZ91y_LUOqs$8!iZIDuIxMqDJ~%n*@G40X0DH;=oFF
z;MWm1B|zm2Z1%PZ%Tzg?g9hl(1E5W}zuEgFG$rbLf(E0Rub`U@A)4df{Xw7at<8)v
zA;;$sqs!XF;wW9++L6g+<H+0X0gCuTO;5QUjp+M;;b%Snj#da%o)opk2#F9AoQ88g
z{6>nDdpW6;=f2Xdkl3?NjOw4kGzbQDZ%D<(5cyJGe~U-?2~~Wt$~TO&1$^WaSu3;h
zTth49HKng^NPGjdMD92Gn3Lxc8KAPB7U6DAsk&IS5iMl#<NbvJTqIq%1~!H))K${b
zD31t#ni_c@P`8L@3hvl+m>9h{E2SHGt&I3Qu7EtQ^t}VvaI)V?dvp@FPzoO`6kkaw
z*~Ejz;<x4sUco57vf<P5d-Vk`I22zDbc2!#D0G<ggOXd(dxfp!I%DlFdvzHovZFa}
z0M<bYOcYsM>cQ^Vy`N_5Zw0Sd6kWnW-}t@pf){9tE<kv7{GMgOi>`tf5#69RMR+^7
zl>PF${D&HCIR3tN@;sh{JU30ip7|<Dv58y;t9Urp&H^;O0@Z+<v`7#sz4|<ZGL>MV
zDAF3_#Ik6v3YBOkE7EzxtUJY(jQj?VUU>U<^d9QZrFz?|2FUjI<$Dzv7hWTUq_nSl
zA3WtwGwm_XA_G`QFbCGOK7jynri1r5n=?4~IL6UDCDmQ%%AUw_<s=Jdo^s0NN%QZP
zN9Nu)4Jt|IhZb}uOW_W)3sJX?Wt;9vR@}S)yt%pLqmDinOOh5#I3w*D0fl7{j=Xlv
zTSsR_WdTyAw8K#@Xk~#ejq#o#+BNY0fvn&}4aoEWDxolysl2FRVryU+7DOf%wj&EN
z!&nz+tOmv1MH!(8R@C4o6rW3}2Fr1TnKQ(BEW6q!9Ii%3yVRvn?=|R+Ja>CJOTp}=
z$ZPZR3qsui25Gd1c&~a89kdThE$I=O$aBS(;5CMeKHs!QXyPHh#Krr4CTcGN69-!4
z?&mt;U6|S73*K=qXyaTYBn&?;azEMn6rU-5-r;;;udK_&4yLbQ%h%wS%;h`ot?xCZ
zZ%cQPa8sxZF*!mzZGa#cV3m|30f0LQv3mZ3o~)pyx{Rwl@4S!XSWI^_>gh06cA}=9
znMF`O4?$VpDxp3(9=G_xtWJZGQW36DN9l1~XOUa6B&Tw$pi-Hz=rMNYHD&=~+!$78
zkze7JkSL*UT~x6~Q7%bQuAQ(bGj_%}cIGg41{kwoGj;|ueuNr3i%(coPFP$_SY#Pa
zt#~RjYGflR?=1cD3{g|jJ&3QKrl7K~s6aCrvDoD|R!&b))=sKGD;z!Z28mA;9|d$c
zs(UBZz2O)?x{q1>HhvTtJNvnW=-3(Qm<7IZV|E=Uzxt-2y0fCnvx3UAq6%M5#Z`U<
zyrRnQpQE7iTV5qbP9;V`g)grHFTVnhZ_4O#t9=p9y$C6S>F0UR24pa-ln&6bC%&K-
zBgxiGb?++exn=;kM@t73e_oSmeEp>Zjv0UtKgBRpjzqUF_H@8TDBU1MUw`L>yzyC~
zI+fAov^kX#%dG_%+wOQ6(gF#fW;VEsI3HB<O;?@TyO`vpw{HDTX%|doH@l)QqM}c-
zqHnySkE)`tyrR!nEofOSh^V6PyrK`gqAy*jp=Bkdtgk_UhW3f1JcoPq+0iH5#-w^R
zNio|d*3?ApAXOcWBcF5sIl$ue{nsbMB=j_(zAxBMJvXVYPgqN=az+w6R%Jzof3&Xw
zkp@vOP>vpea#OxcuX8fd0=Z}aY7%ZRftp_{myn|qDUeSdpc**{uqWK2lj#F9z*!p<
zb_#`Bp`^4cObILx!q!EIuhq?n1ThHL9+;$_lZUZth``80+s-y|-AdS;lzmuFt84#k
zGPka|tl~0uU9Qi-Rzs?`*2S*7u=GvyPOKVfsQ&zrY_9$kqw4g<$#!$hT6|f>+@4td
z^kq7RoogC!VjqN!L{YAgfTJ9cl0vJeSDp|pOzD67altkCWiiOT5caA@hK6TaehcF6
zgK065v$FC{Co~QrY0p4GOE6eipe7q`8fySTktH2|{Lg@hf;DyzTHzti;NJdee1^vT
z!&3x&5cSh?mdouMjRw@6R-lSx<Q~!iSD=b)<R0n{*nflnpEYP}*dI9m2VB#y%}i6;
zxrASJr9U%w_j-pdK`7=u22>O-aRw<U?c%oq1!l1ZfhcsugBTPxM1z;Zi&_Ohy0v7u
zy2iqKHvZGESk@h(!?(VU$eywW_y><NI`|RS`*>HXd$KPu;a|W1QxyDSvdRR&0|DLB
z{2yer|26JdRC`xcT*dv)_-7Z7A&i*agGE*T*UDeJy(On5ybcVc<uCaHt)~R-fuMtJ
z$1`|twe|DtrHyX;<x{TrDjA=(Dc5|TOls++Z06~9L*-{iyf6XyaM{O<JvZ60*Yxw_
zEALe6$2p(xC-&dzz25{%`Wo;OaH1*qQW#<kM6M?NB?1}&m;+iE0uv$f5l#r0aOx6u
z%qtG#(0P23I921lvpe9sLGm$P7%(k}19?U|(0h_tU3t5f`pkQef4XRoZAW(DI65#z
z1Gt?;`ZWbQa7CHAN_RD}wvbnHk9j-+(-Sh2DWaq-iv&4Q=cyeG&I*6#Y}JG3(`U7p
z?Z9ZstV~(6q_|v`CQSEjEO>1+vUb%xNW1Lj=6D=?LyvLR>*HO53$(T(x~=5=uP{q*
z<CDV^B-{3}WE|xsp95HN&>_)EhRvs5(9C$Y1RDJ^HrlGo74@n}7>emmZX<0bheC>v
zBMX){+fd)QO1HNyi%Ys#^)-g%c)6_E4d0xCxtyW6N==8HhZD~CO!y^|1|X<WAa&KG
zusEh0Xo5@M63kO|VtTFsTak*j$*h|+z$zR`O3`6HerfWuvQxj$I1a(a`TLs}Q;hv#
zF6K62V1f_fR<k$^Nu5vqdd6vD0$xG<%|>N5FB|LCHvv%?Hqj?D6)-U*ol=nxbDCrF
z8>_=eY-TN0yq1yjpdvwYZRIzHM-dW!)>X$TOBHKt7`O5we<G%LSD9oh)W!Mn2nz=)
z0E1z_TbddPuAc9r>&nmzIxAKzhVAY#V>YGxT|vvV_Bn@>mVPC@aq1$m^5{z%yq%2_
zPg-1^{CURLY$By=E{Hb9zol{6aNP}b+RgtaLN@||k6CjkGk-{}o8_*j5R)3B^;c;S
zyTRGR`k7vBLX8%^A#5Xj!Rx~BeShK4d8RNb>FE+!XUNmhXwGXg7LIST6s~VemXh@5
z`;)mzR3@gavf@$J@g~{~<W~9^q8XqU68xL!KQ`IDKQ`G(+U^j$hjK57$|Be-XpSAY
zkxHO!_7Te1z0)_2eoEO>8R8;5TxB;=WiXtST)GPl&`gsti4!riA8MojJt>TQOSUBL
zYiTr1gkk-3pjdASR`XFBumP0@MW$^DNO0XK814te^!2S$TTD!4mg_2f$&=7Iu^or0
ztB)MDp7EcZhoPC{>8T03;)cE?Gt5>ZioqR-DD+4pslZB1O~_F@tUfd$+rl@R8%Qf%
zwdYVcD+B6HV~{=}<yb!7GZQNlyPl~8+h|aZYqOb!ChEwP3{yV~j1?4`*`M3UHPrst
zNEJ6T2<)H2uJJvC#cJqQ_U;k0<J6@awo2Yk(ewk_P??DM7`S+C&uMG@X|hu>N5#fx
zk83Jp)Lj+uP27>S&UF`~${iJl@#hvn#Vdx)_lz5fCm`wR1DdW&J8lJg^-X<T4w`dK
z+?x#>5kqsN*J7{Sw-@8BIDD{5Zwt*0DjqpzWwo%=HLfas2VuIj)~E$l>zMf`*mskq
z^qh~xl|r4`<OLeV^D2Oy)^K?1Ir_HoDb>H-A6_%{lG>aJwbz{>?^!ZjJp?|!ctQLy
zUM2C(9NjAC2SHODp$MEWmuLO=T0GP7{*GpF%E;E`H@*`=zscBDsQM7Sq74h|An9`A
z?<KyT9mz&gm)!&s*kgc#e%UtSYKru@wp~t_e1Wb>UsykEiq@PxFj_1jWR$>E5_%Q$
zZ>r?Iu_+wt=wr%<VB6-}z_B35MX1>52J3!+<yFr5Y9d)k2I7MGU&}V+1Kel(WvvkW
zf!1<%F<g)$c>?qN^tdH4_8LAxzdOaZJve-_z9M%}j_j~(<1{_+X<mYCelRI<>@`3)
z%2{W*-=-~|c)9H;nuWV0aHe6ZW~yfICBcrag$#w-_-xD%I;9=HKDbR@P5CkTu!<S=
zk^Fys-o}KSY_vmxMTlO*L{#yN&<-ciDH)#)b9$(G3s@F6JXHy`njOKM11`S@qUS7B
zrx}62vWn8#7r%ZlY*UI_H%Dr`Z_95VZeQ#6;&FKUcWV26`VBB*wSAl|bbWp)Uv%gD
z;QzxJXXkDS4h~~smZ``qy-G#JNk~&c(C*EBQuaEUs*N%KBEU+KJ5BDRJ{BwqsfpMJ
z>MO7w{$t1xN!rmjpI;Hk0PdM_qoZF_g|q@S)-n_yfA9`GtV&^-Hm4(m#knP*@XIku
zqC4h}?#>9c)m7mNf#7uC0wWo66`|KNh+@BZOTyx;z*}0lyC-%?K;%&ZGUDcGpG3nk
z3@BS372|_V+8D_Tn&6C#S*xm5vXVCubH7KM5r+1_?p5)pD(Y{eMI&00UIv1~Txj6n
zCKL!?9V15rGDl4mOTM^P9|Qdc9qm=1P!NA8-}er-U?(+y&9TQLOIG)=LAu4^l6_9i
z9ujmEcMRTo_u%6PNkge6Mt;a!C5D=Y>{JldJ@gW>%;7F+hDV-tt`l;kgg7aKx*kTD
z#-LO!RR6^LFFx^a#s;F%MKuo~mc_Oto(`~R<dbN^Ef}k;NBYUaa%Kg{+5VN6x`$)X
z519S^$~J%!?P$}JylN&We2RM{chdcz@E|U34Ltb=WaWeMe-Ix0*Horc_0$nX1m*kD
zgpFx^l|R(V=$Em;05Nd|DAd0{kPN*&4kHGHZaYS<aZ-$2^-~kzdr^B(cy4+46@q04
z5lMRb{M<8hNY!=J)pZ|wiOOH7N#WI=Yy|3P0L3u;BG0$ZE7z~L&Q!W@-baGJ;2jh4
zF`5H*<^JnR8&mTBnK<?KVhHs)VY!lnXwk$91~aHm<tMw4xvGA>45;1)v(<eEW}<Dd
zXjaj%S16{qs8tB3r6Ud+zsXlBcWA+$>7~wDotPTy$7dVABCXZ3#^n&N=fNA)mY62g
zHtaf0g7x}NYMJTIPhi(!R;c!y=8+|zI9=98iVSVa_(UC?hUX?$dK@^7VNYr!4Lx1v
zSi=%WJ!%t<%xfEo0PB@D?e3_jse2|&ZS~gl`L1RrNePwMAvb7TnM)N5Dw~rlN#)gz
ziUGu&|7LNLiOUr3rUu6`1uv5dxoC=x+Bjb~RWt7=7Amq<j;eThPFa>Cg}ym63oNp-
z&eXa{rdJ7_xb8!g<2k<2xI~tuqOg;?DAKP8s~c(K$rJ6lN>g#u3`3o>F#g4X-E+gB
zZj9#~5LfH9m?OdJ2s|ZmwxzR-21bvDi@W#D$9-ZqMn0r&5T-ERENx2g>|-WKFd7u<
zV{TCfYep1U`2SOw7qGit)G}W+0B;JYE8vJ`6>m3Bw{agw*<b@M2sVyKjt@2_JPS^o
zb7hM|y@WNMgC5oHqnA9paI~g6!a9vC9bO`1wbdYMf^29X(tcxMPInSY{z-w}6z}Xn
z!ic0Abp}rKH4iDsnz9-q861cyfJb$z1zJ-ntE-gwH5-^Q`Tn4(GATs`F>hXZg<q@Q
z04*|td6wM#;EBfMjGZT6gHDp}Ly^^e7VtJDA=xn2%7+~vBa*YqjH<IPWR2Rn9Xbb_
z6h!f+9m^s}?OUD@?o4#8K>8nc?IOD%oy?J3mL$%sgG+FebrH-X24)eC_InZV`gDSm
zp!h+BtkXrq73HU+6}a<lrmjn9DkHAWNKBMM87i_6ux@KG@SybZsvvjeohaR?1BY*g
zA>V7V2^<7c;@=&j0U08Xo0xIc#e!}~vJ6@d@T3mOJ>fGC4G3SbgCk>UCQ3!pfjdBc
z^ns?ey1kAB+%f2aEjW%CM_G=dZFq@rOq|fAf+rEM_iM!ccKJz{BG#BNlU7*mOn%nT
zItDAOm@G=Yy%7Lf@!ZfN*y&KC*|<H?<a~~RdlCP_oyN42v_r7-rSGf1;ytZg$Kmb0
z|55^NSSWT;jl1%0%A%;?MJzzQUm|HNV28dR7zjN))f^*8kB{sZdwdr!`tvs>-QX92
zSKa#uH%K|B6^NWB1lES>@B3I{a|12l`~CBFsT3&3<C+f5gAZ+HAn0<k#%gpM6yvnD
zg}hgEH?x=;J4*(>&zTf_{v?={qNF;&^UySz#|>%umX2tca~V60ccu3)cAWJUX%vhv
zp^Z+FkFnkvCL>TN*6Ran8=9r3yalyB<TGKzCijK_<i}2V0Nt9rdrILtLf3_m3Wwd{
zW{VA21-b=DX{JkApb>O9{<emjm<in>ahHi-$dDOTT!0Ovg&DOVpq_2PzxZIs!}LMj
zQJ5d>7Gda<61{>8vpD=I4TIubVqjH626IdN4~#Y4^g_KzV9R<Gh#w6iI93C783J9X
z!u!G;%I!Cx0L$|&KLt-53u8M-FU3zxDQulYmbaLkh3%8y@47=<Z!w4-B(|=tHSJ$S
zfoZ_8JqSh2NnIhO>-~jfa<c^q%w_s4T5niM!od2@kn_Qvl_<q`4e>1n6d3Y^y{-(K
zAyb`{Tn<m?p$<s9q>Ze3T>)i8DT^roj%lMnW%P#3U-1wbqhn<wZYbenO?@z1Y=p_}
z2KLD)?273#yJh{}fnZ+D7j9x|Lw)@VKNKsDvU3x&1u}f2Wxl|ezfj*^mmfgh;ht`6
zYh%nHUR>Enx`)d@$Z+=fcIdwmZEv%0X}?8C4d})wCP~!b5l4AY#!0m#DYgX=b%GY<
zX2UOA;4R4|?5zeh@)Glq&u0Yfa%}+R=cm$x`fsf^BI)9sGKjtmf3}6gQ@z^#m|y8}
ztMfC>fQcdQJeDO}UhW)@qen6&9l#KfAhQO6U!WkMS;<4^AwQt-VX{e3z{KWL{i7bN
z2s4?!dn)Q5_VF?LA?(?bA;f-#>%-Vg5NYMerC|TrQNm43&K1=GA-vNyo)Bz>bH{f?
zH=&w6=?@wbBmm_8+YX0>+9P#3peY&0e|p^}XMcS!iRXp3BAX=AQK}#SvEiNmOE5vr
zyfaA%{z5)(upyuit}V)!7_8kA2U}k3jyO5VTwUPKit5*n`0+oxB0RHpfA)XIbJG4V
z#&iB_AJM6*`5&qM^02L6x1z21)yiZMIvQsrC>Qvb94b(f6@3-qm;6a4W}JkH=~C({
zKQ*1m>whE_$oCf=uUVoNp!^_~(l@?&zB3&m9!|lsPxATU^vbd8K6Ad<)93p<c^e3p
zaF0C@rmnSQR{_fq#~y{9lRm4LD&^m#5!NP-;tM}(@;tc%&R|1EYur%e#*IFfDo0ec
z`HT1uM8Ss9$d;?gaufEV=1dgJhQX@4qHB6B7n414<d#RndG`K7Zva)_ECiMbj4y>{
zqP2&PYq1Vd115N1#AOF+S&jQDY(%{w3a}&Ab=uCXTq+7~9wm$r1)gX1`+Z5_n3IVN
zQ={Kv5WXmx@+s1;oVEXzlsf9=u<nL>PWQG`4wGncG#pZJE=48H7LTKsep@>QJ)+Mp
zh|N+e>ByRib9Fwj_ntMDh;TiPgI75_HEzg%%2?Bgk6};KsH<|v?Mb*%i;zuZltiLx
zC%rEd(T`}@Szp0CDgGS60s&S-nu){S7zRkPqf`UHjDCS`P*8{g<*2WvlrVjOR!9QE
z=epdW%qy2yD8rG3oN3ZB`$s7~0gHzTHkAXB(nt(r#d*v%kva(p&VszMU~;Et34xKF
zKad{!qxG0vcd4`oY^ZSN`K!<>h$GczHbV%ssT8EpY6eN36o7uH#~)DIn`h8B!(b@}
zH}$c2Wir(VgL}`cP7Tn5MNhArdkMW}KDKhqRihD6;urOrb~rP4s?l6cA?u5rp-|OY
zZ&Av~P~*Krx$&OX<VQgqbAA<T)p#iPGmqiC8^K$lANq8#M0?jawa2c9B}zvy4E`wj
z)1QR*%6VHF!qV-mn>&9!F<U^p$i8KT_L&kN6+ftRF>Zio%0g|lo0ky;k?nO`R#i^r
zL9zfq<Ejk_bvF?fm|OJDT@DXec%kV3k|%K#+`K2+RJ{r0YN$K$&Y0z|&DshV%p>rs
zI${YN+fgAJ_AXLiI`mhB7Oq*KI8_M`3F@HISc(k!{&qJD5Bla+f*qu30dFEUstatY
z=8;l*VJ(EFXQw+=NM=)$2|V9l*V^>T#daLF*bbNHC)3o{<-&TEa?p9C=CVsR!|l(C
zqQVi%poA1s6}rMg>9Q`m7U{d~WAHQwxnI`ZdIxA{y@GF4#7V^ua@}R-hGMP@Bf#dT
zD|+8xbxv~edl3d_P<KB(O^<p=dqZQEjX{`;7SAGe9_=q&kMe<2;rN8ExLqqYe1yL=
zYV9G$$$Iz}tg@Sfo=O0B1QN6Lwg#!#7@}tno--FOH|)SUDf|%5Ja0(}cFe@sJVrFK
z4%U0V258|zSRV3XK%q1U*`E4Kei;-?BoT%s@_j&-dR>E<y=KQw8RPlOKJW}a9nLlx
zhP{iEM3cA>cZvCKGoDm{Za!ns2#tPR9e^}!4R7TZq*<(IdIdg_oq4uvJt3=K4}(Qg
zAQeRPgQ9z7X=(jIA3xdQZB-LM|2@-B^l;CGao}nn?i;NC#qlZOEz&KgtC!&$X8D09
z_0^cS&p0P6f&;=X_yrp;7T}g{hAD<Nd=pKKgcgm=Ag3G0TGS;Y_s;;Og90{|T82ty
zsqp}Hvb1|P2=unt5AUY91ni4H@{p9dV?9oNkh0&rL#z_EUZ8U!oA^n?SlDoEGXdq!
z7UjUoS^yU%-qku_a&2vLn{_3FAV%yAYDse&NAjb_<k+>`Whm6IexW+YmQM(1suJV|
zp|ugnh6M<rzr<qNknPbut{Z^aN=5RmU%e0Xi(A+m{ZXvcH{uO`qlawd<A0bql9*d&
zyg$4J^56geCrph01$#CsYuf&7{Cy48cHZv%L%8yr0ap;r=t0UML7?ABuwz0;G%EG3
zB|VpC)aS9Byb_)KE&+w~LwFYZhaj#b*g^29`Vi94lNyDb!wzXbYhgN-!I6BeWpZ@A
zJgp0~5)c<403Qr21|NhYFLZgbi!mg_b>XnXiD6$8Lokm(ngDx=x;tFgX38e?m9R7y
z`A!IHJVM`|&rNj{cn-sJnU$TEsKd<q1Ey&>pG?WA+H1pJqHPC=&6(}CJLYQ$TgbG*
zAq)GVzceg{5<LeJmlMV{j-3P@O@W=SKhU+|8H&e1un5kpt7v3JoGZ?0Au00Ow~hOe
zeT37GRi#fz8LZm)1pf2G|L%{E5(ndSx`7dT`Zq^O$yi~HDi`D>#uUC+=~cbr(I@Vf
zTyCE)8mCNSOj8jYYo(OflmoskqznzL3oQ+3#Y7}!6~$P&hNTc1I7`Y?C+c4*b}~Ay
z09LLuob%wO!jkC1xhU?+SyQwj4Onq=5L~6UQAhivJs;{N?=QTLjpts{_r`;;o9R`<
z3$bI5A&jQ4cq8YA5aWX~n01|-98!J^#upp&h3I=yR+q-qKYEu9@spuX2(<o;{=Ebr
z?JeJePLjARj4ZlfOi?oVtSeP^TMo;UAIDnIqH#0C$3+fvA0S1`!Y;J@&6T!0!A6bg
zELCAS_i_)AWwMfq9--c~7fQD{&C25TwK+X_r0yP{VWlzO*t%0Nw+~l!^NS9g+r{MQ
zo|r9EWVp5F49I<W3=+fNY<`+LbV6@NYy_r?6(p;CnoFC_c!#-Y?qe#zn<WgQ#j1A+
z_zqJRK1L6miCSc?&gGNNXk?yuH&3IS%c%1R$~86f>@W(^r0w>H?M_?KX#Nufw*pC=
z&^WeL4|wb&#j0HN73UPX7vF`N+e|GU$-?yssv1mG^!h8+w&Dqw*-tm?L*L1uO$tx-
zn+IUf2n5Y)<Aa;A-2?DJPJf|!xLZHjcct&So=bO%(aC+cd+i6^kzfa{f=i#3+z0y9
zya5rQLU<&SXGJBFexdEv+_8_l$mdrmXe=siPb3z<=L;X|ZSw6^JH|$m<~nh`L9SJc
zE4&<K{|ley8RvhI6M1~HE-h;sEp<IOy}F_KpDIXO=9ZuI52;uB{{y7={~PFv@qa;A
z$?uBT%c#TMRK!n&proLo480=^1b+gIFR-xf%s?1e|MY-CU=KrS7l5HfXgfFd6;(fc
z`gCtTTL$Z{rMeXLrg{`z*`}WA&idxe4?7iQMr%KNRujY44HTd-z8-FEI$rZUXH0WE
zZ*1~?9lLfz*dcX8?lJGxNu1Dwq4|^d8z5M#mG#uu7}ZnL;|{<P8`l%+K`?-dMHhf>
z(V@2hoBKiGX7P&-OXFG!Fz<i><0pKE7~SiydJ%_uv<PsAEraSHy_EDsM#n&DA-}l&
z!{W=`SLEc)-*?3Ne~5dhF43ZGSu<_hwr$(CZQHhO+csC)=1SXku2khcXWx3Q*6L-?
zr}+zd8$Ei&7edf!nKILyk5gt_OAJ`fTO$@e6Rv7C(^4$C9f++qb1t^Tn7X{y*m<p1
zV#;-goQ~uZg({=bWWUR(92F?D7?ZIc%azFD)tW-?Y>CY4gVv;q6D+!0q3^h+X5k<u
zbFR}>3+EZhY6VvU(-sRWRH^5U2|F)lqwNx|6xMl5=4!(ho;I6Wti@sjy7TI@`<2lT
zG+8TFUS<ZTHzm81<jr;4NqZURHzB#8HQX@GX3luc^pdqPpQNPibR_l!=1}XAw;YB-
z*72S(+QnNB7;kl_`jGU8fdl<Dt^14%nIy8=OSHsFi}|p93^wI4^S05fB}867D!X#t
zh{R%qbDFIuFjgHp<O-gt)L2Yd6e)2njd7C2S_TD`JCc-((il2h^O?%)HvlJTpasn5
zJ8sIUE7jrFnZ-t9JLM(``O=Jb6U1Erm%bIe9HUx<i)vra{JkiyzELgVJt$lTvD;uz
zX<<#Tu}bh<X+EoV!WfQsV&<3&#oSt;#)sXk)P&UDs|JXP`A*RT7nOg@N6V?!mj8$2
zIHYFVvZLZ^wCGZH8lE-A-&D^LX-Q$9iJ0At*=cF)a2#&K<A>%_-Rs6_36Z5$DJn}b
z@p5wVht`nHrzbgNsIM&)@bcUk>|b1fCNx~SOx~fBB}DF<6NLVNIxEbz;Dbd34E7cW
z;!6&LXV{Wv|Ipt*;r4Wn3^XeU{t&=#SvGxmLLg&8Z(t`bKFlHZ`<sM5;Jc;tZe*D-
z)IE#Kn}jXJ!3KD?MKVy;+GOpK%Wu4}Gec5lr9*9pp}3}biC564$_-xLK~@|}Mgzq#
zYxlme%J!JaFq)&yNmPtD-XZn1P-`lqFEy#P%NNq)`BXB02VzoXGU}f0!Jix#;mBn&
zT|CS7LuoQW$6&+ngg+(N_~G`+JCFwD87m7bL$d!8t0;FAhUoePa<LKi#9VUumF++H
zsd(Y??<zV|9%N@7k6<>R=nm;xr&?B{z+*kw)l+%g{_Nsr#Bo!)&a%qf4#{@WD;(3R
zC~L5JxL-;3E*bR7?utGz7cWZKNB&vSMZIo+YE|6*e%mIj|Ndt*tAsawXVWpk>gorV
zN_Wu1q)Ecsf*Pt;(xyI&yU9$$&1+Vdy8gYf`D$Cm$3rB#Zj-2U632ebo(1H5^Fx_;
z0URtf8LKkcf{fJ_6?)95SZDHrK20Cg>CktV<AYcu@enuuWfpTyC<!~{t-S3J;;&~r
ze~05!k-A3m18aTUJINOTwUeh9m$SEt_46{hjvv(nNb6<;+;>0AuIP$x+T8lh4Y76k
z$tpfIKhp*XDDVRf^iLmg`6tZk>z1S9C)ht%fTJ3;{EqGg@EcXkAq)*fF}V5c*v>aa
zUC8?n>E75XCy#t!zVgu^U=O!-0-Jy)Cu!t(BR567OCKEXgLcG56f6jN*Um8Vd;28b
z57*=u@3+^FEza#EHg1xbdv9P>pFj!Y9aq)b!ZNyoFgO;lyMnVkFF#@VS6Daxm}m?o
z#Nvox7W7xX%e}tK{cgq5?a~go#S(szutVG3VF|=u&O9Rpm4jjk16dFTdTIvhN<=hP
zs4*0fc;zFnN8mTiVzFQjd75JgLku($3DQ<4x`I4Xc3GYn1_}O!17vYZDx=F6C#^4(
z^SiLvs=Oc9sLSv=(Chw^)q6Xio@!%gRT!j9Q>w}bWwQ4yrB|y7<&aLYe>IMV_#ggx
zA8c^0p8)cY&)DyEFF1=_lGeE5Lw7}fZ*<sZ_dAvA0a%vF5p0f@z_M9xkAHa1<?rf~
zk<2Wt@Gan~0Tu!ZI3leUBFPp)%@(7Gju>;1Xd)sQx(5)m5#|fzaYgzq2U!-IAs!6i
zjWL}%VidQf#E5*k$H~)mbfFXBW+!@Xdi+`_M)@x6;cqZ=0&bxp9yrJF^B_gt@Uq-@
z3E+d}0dj!wopQ;4C(J(iv`P}tx#-LVAGRze#{hck)5M3$w`kIZ77C}~Ov#VhPU2l7
zDR6esLWj7;3r*pR9C8#n1}I#Zp~^8rmtutAiygugIi@I{n4spEp}t}UImHb3aM40B
zbtXjj<#Eypx>39C*b?@I62zSdfNSjIqclUzgkg{-qD7qYB<K((AQEGcCNL6*BTR4<
z87modN=id9>g<d<suJ8!aZ*QEsiB?B@MLxEYF+w3zprPlJDGW<6U!D)v?5zP&9d9)
zu5#GKUkPmKk{4hwbqR|#nY=P%>XH|zO`fPQXBce{WUzxRnde$0dxjRn_(?_K>h(N4
z(4%p7pn8JTo!L#z?HcEPrh-zZwAKD;OrEaWr|oB<Tm1R>g#-fEf`Xm-(-{T8hgqGT
zw@?2Cpns81(gu}lzBS|@{uX_C))=9Ev3+CVi;nsM`adrWt$7p7jo;S=BHDjpZTJtS
zZAR@<8Cw<QXFI{feh~mw+7h~@as+6<k#;2rvIw*gXrFL^;_VM<XGm%GcE?`>Ox&@x
zim!t+4n8ivzK03STt@>jvzpzUd;6+YXZFAc2@Krx7<{K2-qXC(+dOYJ|Ig>CdH}D6
z8Uid3VVVfAVW5`FQw!JwNf?QTl%R4{okI*5q5wkBA*ecV#aMGrv12Z>i4Kx`0-+3u
zAmgM%s<D)yQxp;mAI_OsXt2EHm>`X_b3=&Otg?o17}|Vv&#=_Cx2U$N$}lst<;oG%
zL?@$b$En$hO4H5Bi_n@Z`CSFqCB(K$%nPghO3r^(3eIiE8kAE7#X19u_0SJhoJ6@-
z*>t%wQ|oS1Zf6+5?&DI*Y^{#lD9NE$MGfYyqQNAtj?|@?k~6EM`bhtD<{s_@!e9pW
zvndmuU8YKiKEJvuxq)GxkE<k=49qpjdyjyrr!}V(M^$aFjbQ>!X>ap%%?uu4@Uq#)
z+)2^er(rPPZ4>D+R0{l6t@Md(9~gZk;x;Qg+pVgNJ*T#km*B{bdb##3DzTBZW<`|;
zXk4`$i*-zv4#)yC8lc>yV$P6mno+5*(<-Sw@(f=D_s|DHTS5|sp`r9(4B;LLdqUDN
ztzLvi8C*c-8Cc@Z1|`Cueb!rY8jht{iLuh$DV#k;2dZJ1e>l?eW-vj;*_R2avs<SX
zjkLEim_e5on!AP9)DzgZ>RI;JyD~9p&cw9VnQ}qHPAHjk&@^Xc!cAqk;OT!$XU^}E
zOv8meV6#Y~2}=^v*i^=lHZZcNQZ9D-gQg4FwJN7`u~X|g>*zPKdRK`6-RWHvl7Y*;
z@bSN1W0NH`IT?x5&aSWgmtYRX*CU?bphCiJYtEY{vbMlGgx;$?HJcU2kd%|TgHL6S
zm9YRY1)q%mW@?#5;7V(j6`z~=>C~uV=skWMjl4L7YyJ42E4XVUBKN0FK{Eelv*;!P
z6)WkDKc1#gI`#9p)f9&vimnTYEJY?w8l;(|Q~L<bGqrvG6h!W^VGNBgJTc5Jk#_|8
zm7hIcmD=A}vJ3>99n=*>9SImf+t4*Z&czRVIHXnR<K3+}#=R64Aq^fuc?`P>S1w8+
z*Bw~}sKvKLyVw+6l;iRXQXa$k^z8lP(p(-a?ttj%ZphyAt%s?#AePe8j4|Qk(v0|o
zvCp*!{*Ij8b@a(r23y^Kgk#wivpu!nQ@pjb_rYD!hL~OfWp})q<)V|ZA!KO}z37x(
zUS6?7iDkc=2fN^6zrV|kgUxvxplv``gwj7Q^G*Hs3#ca?-xY!NhmQTUWqEXW$m@?*
z`^F>s^mVz1pP%9vOYx7u_<?x*Ow&Gq`7-1b_1i!s+>q*rb5SBpx-7!wmC@?1w1M2t
zOwx<7QPpwU*Q6L&k`_Rrr9)nW{mHio3Cim>sCmI7y;O7%9WegG+hjZ}@$jablPn~r
zngZVB2cPg94(#~=5%3uj@R<_u858iC6Yv=n@R=0w85QuE70@Fq;3qENCoJG6E#UXl
z540%!(v<%(4uK-hmql&?J3r;|Yj<Tc$ZCT9{GWCl5c(y=l;6-5$bTVp#q=MD(yuVC
zjPt+3I5#sw6CepYGa2I`SO!3rNW=n-kdOw1S)$JJu$kE)91Qd2G)-du0sVM1yp}0l
zsp<)%>NoO~v}UQPrRDO{j8Fm%Whnvu_GWqa-21FM9q-4CzP=x90X}{uN01_8j=BS3
zG$X2{j><yRJ<dx3NmwM!Y(>T}DWi<(eOwfu4jT6{P1#7Odvk`OrLX7!E9fodTYzBy
zF;|{1bCXaz7IREWki%>Xm0`o#D%#Ar9)m8wn^3;@$)aWc*iDkL+7JO;&7b00D_S;N
zJm+Q_R2|2|$qe4%d7PChIgVZ(SF;XvXN=Ld0uPgk`@;zWH~UUBT!>F21N!6#m(*~?
z^J%GV_7Cv!SjJuVLBn|QL}bQk_q3CDBzE4Lxy*F4Q(S7iiw&TlM>xylM&r4hysBFn
z$j$u))g=&eR-E+^Gxdq*+=-0?n)exV-lQYxz>!`|ye=bM^s?X3>pO}NDEn&8#ien^
zU%+8s-w+ODF2$K>_tBuEl1dzBYr`P*(zPRuQk-C}hsI+SQ4&hAOy;`VQFBZ?7Kqh0
zQ|UDr;krTM$XE{3HA+pB?{%f+`n})VFmSnBSW=*}2&8kKu3j}4X~%pI2IzNxO06Tg
z5?x(~$UdE>=^_~JezeF%l17fgT_KQMZ4gOysc)Y%HR^mtN3*k>4q6)KXnToE^PpWj
zRa~n=-OT7RM;P#~+hwOyg|b#Ax!m-)ZjD!*XQPj$Q)?4t8F-#+Kw+u_U#dw;!f^qb
z)@%he)#Hfl&^mS9#d^3VE}Bi)zAXf?uwhEF;bsJIFa~Q8YJaRi5wo4T#S(&*j=!8Z
zI}YR4;zD3A*NK9P!ot3h-WU+i!$`en9w8)}0=jF<At=#FBqHQQ0_?8F1XN*S01i$n
z6Fbu<0UHoxymzp5`0Rl!DB#eOoC`GQin-N}Km~*yty?d7mgom<XEPyudOTED=>ZWs
zy~tA7^Z1Xu0qJWv@LX{LN89)^E};<1C$0jume$nhbh%lBtmwyQp4PiV>wSeGPn}&Q
z>{oeujcu?0F-M6}O1zXdald5Us?R25uPN79gZ*RKa6(CuImc>3KUl9+GZ6nt9eynL
zRCY%H_vavCev1&W-Ku2S#DVSox3tk{J0i%?*$WFykI3#&EdgJmfS!xYzn$4=G-+or
zPOB1d%TrM;+9h<Cq!ZszaD&pr*My8SzmT%}gq}3{ZSjAGujVb;!-QCyiD1jO32Ob}
zRo?+-&*Cl>`~wBN#-h-gd@{~iH12z*LIp*jV|P%Rmn5BFFBrH`T_`9HIUtl=M09S&
z=Aa1N(oHauSA+K-<0xIXLX<v%Hhk{z7bbJWS9-dZ<jU>|lDRUirF??+b5s_(0XLoj
zWdkmT_W$UzZVi46wCt`ovisuG!XIAk9Iu?4cA}v%(n%oDqe0Lw=8g{Nj}GcBRQ-w3
z{l^%e;aw`@7pfQV(PQ^x(nJ)c4};Q1I?@J0#PWl(prn^banln^`&lIy?UMLKAI?C)
zBGMqwJW%T)i3|@(5P{#N=SPp~l~GDSK<%M^C43R|unR3N(wWTu$T^hz@;z73U=|>M
zqJf8GsIV-jOAXQ#k6<xGvt+YhrS6I~I)bdE8<TKZi^RnDSO6CVdCoX^YI1bS8%t+)
zpEjqOT*Lj#iRk$}Ec^P>jw~XOXvX?XdloTZzZ_so*bf-sc@qo($wNDim_y*vP^lAK
zy)i!kxA2`}#+T)FX)Ef|1HbcsYa7X>RjuiNmGG2bcd>#rFbE0&1Ox=YLsqExZ&Ty{
z`~CkbHT(Y*&HgXgNBzSdMHS`yrq9gXTzgW<$`gW`piO$Su$8C<)fC#ca8v285};zw
zc4y1d>}(Bl^T;>ssJH|RpOFj;80&Baq7+LazT{`NPp)@2bSq6P3vK^a_v>@+t<UL}
zv-!{4$J#F7)7~}7i?IaT5SG{hN3IBld6LDb1<+<f`iuq+uw=|(jSbm>2WzBVPBL{U
z2ibApqoWL|<!4q{G?w1l9hmT;s`UB^s<=+}ftx5p&UE)qjAG97R+1_uW*?`$h8zJ;
z_~z)KVmSC}5W{31c8BO%S*a5#gAAU7a4!CSoMp7%;4`)9zARmuD5|>$Zbz_PrAWYO
zh`t-H{*jJzVnMO#&3g!j`nbB67p77<uDC}q+pF(B^K|R+=^GHc&CN81dHJab<C(pF
z_?Mwz1rNf>@<QarWJt?3Zbc>;SEAq=37hsq8u2J~spUhK{3c8CY`3VLyyINb;f09`
z;nYYthLuOMptcy_sDmFe1U_*eqx>6cHie9B8WC)00Q%{ehvvJConjv&iF~gz%JH8f
z38YBCsm7o~nDomKt6-*5-zY-HDc_Nr>_FWj5yej9s!BXq^&4|V`_~hQ#ZB3u-wS3X
z>mTcks2ua0d)-rhgV)sLbF^tKl07un{uJ1aL1~inARL_4yEHI4)gT>jhwAW+)#M-7
z8&@AO5Kzmk{iiO5%iZ&|gBpribgCsl)fmAw##*bQD_do@6A7fDb}3VB409;+G3)d!
zp)T)QSeTjNheDWQ8=4N(dWtX_Ps&#wrYPM93n*^JTp>iVp*=8>L_+T2iH1zbEtvDn
z`}D8bjws!e4H{ZAl9=P^l6gSF>}tvuBXKC^amx(Zfk7Rp$A$^?a-&U5()toDsX|cs
zM0NNW3Mow03+C36gbWeW+k~vv&zM6nOm)N~x7{e)vHK>lU&K7~WN6q!)_Ao@DqtN*
z+82PP+HMc)wWIxgK#C6FX@?I1mRf8$-frM;OCP8YX2fD@VFP5Ur}9&(YOST~i!$v-
zg7uUEZ=t&ypEm7QJ$?-IC6(~cCE;e@V!zPdf~!jX<cpWzl26k?#$YqLCH~N?csgkq
zgRXa2u<LWRa_v*mCCHZ3r()w9#AABimU+C_Qj=?oCL^;XTK$9srJ)#m!f@8>o8u&C
zUZMTISwbEJA+0r;uXVX;Vkuu3Na|v_r73(Y+W94?%-8I1ugYiPCPb|3mhg~0guaY;
z8ba^pJ#lSVWBLY~2;dj5$n$IBGQU9aH=)+^<@mgo8D=QWZ84uzn)W>nqeKxT_&tuM
zb+ISz6@819#ahA$VOGREnr8!W?o`OSV^;J+OeSwjh(_BXTFVuEL^*PMBF=43cx`K<
zABhui<9Oou%Xs<OMNOid<YKP-{5<;1O~j7SA?(#fbX6%WcagM3SGAvg>ZTvjr7p%m
z1(IM_265LsKM^`V89KjU^EYPa8z<a_eu3@}lI}nCvxWZAfNxl*f3PuUyT&R%XvY8C
zJ1TZX6n_LK9N`@QNh6cF1b<E>iih9xOfZF^c-;q~Ad$r-Fevnw*vNc&B?h4s?aA&@
z%!Dq)eN#zgCvm>OpJNh!vEVGti__kb3(@e_74{Q03aN$x_K5t?Eps?N$t#wri164>
zM(%>2db08uR#i!cFU}Rtx*C4B%9$fj-JvMU0C#1maC}CU{I-SzlL*vldDnc`B?tnB
zPh^j6u^O^RJ6r&QT-6(@yK+}NVbcMyJ7V4M0$yQP)))SHrXyrZ;`4t{G0usKm@L1u
zJK?`EyZ?iVnNhcP`9Jl9awm@D$&rzXfMFPzDMm~rGB8L&K#CCrfrRrQf(p|1W^@jQ
zzqt@*<j7W4n&+>ITGikvc$+1y8ZAOW#o(3I)s6JpYpw6|{O@yqf0s_Hk;U7bOh`f*
zjast0x*E>Yyfr>={||2O+n&c;bv^L;fc`f}PP@bzJ=petce4CC>!;$leX229TV&ar
zz8yR9+z#b7H;WGK@UL%(e|oWQ9*bdKrv}=6J^sYQ`ILj~js*Mpz{5{8!++dGpm6R5
zUyrq})05*r?=#~6)(L$$2n;1-<-Hig!Tr07x$39S#veDEk7oe;>;T|@8hF?j_sjEB
z8zO||U$_ej@b9)HLEgkM_LeH(X_LNPD$Z=lj2WF)=@KpInA$QtKaVkn&|$Unw48Qx
z6FKC@?H-$c5>bxaR$P+8jw>ZE_Lb!^eZgGN8<X2~<en(qk>SdkU-D|1x?xniR3ox%
zX=#hOn71YW2U_<DBeZ#yhZl9pqSV`#%A}@%Fp`%%`Ghq)`mJZ2oHwoT(>6z+WyIUt
zm0ZM<pVU=rm?%)N-2_ukTUo9IX1JxA3rba~&0Tca?T&fxB0Xc?@gWtg^xTrTzT86C
z-XyqlJw2l@>$+v@7POHvA~SV1{^YV`)XP1Q8I^&%mYnS}mU6gNA}*O0ZEjJqFA7LY
z-6_fC{eWs$)TcKlVVb03xTHd;w2``c*u8e%J870B+LdfV{W=`G(;`W)6j@qkTBZ$J
zN4HlcX&^a6)|Zp(C1vRv8L%z|e;!x-Yrt>EQ1faG%a2R4FkD*RYg8b#(}FaXCvLSs
zr%=?YSP2D6y_nUd+>9!l&f6(L)Lm-rGw$3X%FJW3XQ4CAKQc~dQJ<Et7=ry>Qfqml
z7d>@XD9O9R+H=Z|DulI016o7Av7Ki~pRx3?N{^E&3y+cBV-~q(k&0zTU|45pz2Fxv
zlY{?#g5$D&J%x|FB@u5J!ir;TvBEGSE1av4;jt^FTvXK&0!HC5?e{SHXd7-y3b(&K
z;GNo$8*7%e23MH?8+t#RM`DHw7jk3oQd2y{K=i-IOiV;w_Th?kNgqh&$%HYYaPsyo
zMcm#@x|BnDXWNoaZ$;<n>LyISpGm*@dPW^bUb&nQDH7zNFH;V+m(zD&el|;@WTcJR
z+FTjroHsGcZE2WJI(QF+ENc_QgEe3b0pg5I$;c(&C4dlByXfUWlwUIpz?U}(gxZ$s
zzJ=xLz(_NaXaQV%h_a0VX@rad=#9u?=|S(g#(+5B*h7Sn#lW%XKO2UsuCFgizl#wC
z<nPNSeWK(q(@9c!E@>;h%|#}rN|Fstjv)o<-;IFWvF*&?O#%3Yx&uW7(c7(38mF8a
zs*;D0rkA$pPc`3yH6WzRb+CV=%<>-2EU;EDgE6DFUAe5Qy`4{-INU5)y~PTg`d=eM
z#y6=et+s7&=2ZJEWi~FF&1s;6l4s;QN=?+Y2!q#-XH10bODOwOE41!Fk;A;>Jix)&
z&t>&&yA1+<!u6-m-~)NU`@`(Xud_DBb}AqXU}3`ELfhm-snqPxnWyp~h7>26nj$lI
z<8GhlQ%lx^)X$sVt8&@({PSlopuRkFWE3l~hPue36x2Y2RW6`Owt0W+AZz$^7Pm(`
zDlf+be1xV-F-1LEOYJ^oTV`(JQRgLXm(fhb$AMO1<Ep@7)_@S0{a~hf&oSw*A~%!G
z8P&*QkcF70K8pbQTN_fzRGY14RlC4H@GR46r^!*(6pmWn-NjpN<t-SgzsxUPh2nM|
z38Kn5GQ`H6c@+B>tBA+=c^%TZyXvwDrnkY%XF#POC<^6nHX}2(<q(Wgsq-ZIpohjP
z-7oL6^iw>v*UP@%5V5UGh=j+OD!o-}^qO9v>i)ymlAD{guWfRBM5vZKyVu!tYeP~*
z)?nqxglbxl_JW`RfKFvxC~P+!fI<j(j7IHEmynw7W#m&k#;mT@VR;Uj?xmSXoY3eo
zzQ{uNdXs_|Y%LAym4S!2mEK_`wA7}22slE_W7z0T6nPd=nnAh60CR0nlhR_u^okea
zp$&C;Fy5(UA8My9>5&v6->59?w<&hmO0J_*6whWXt462}Y4+Vy*3#sgp(k;Jc%CSH
zznTIssK5BeHYXcDm8A=O-<7>9_y+K*+8a3Vi?dg{bjNiJ(c&e9N0_60!5hX@J7~u+
zh26SNOn)Bzi7z&kP=200#QAYmZCtstvzVj4lcOXwN`JJ4$Y$phIhcGG)>0hN=0#Mf
zk2r%b;(P|r)lO`jIVO`BaX_<FJ0fc``>`vmq)xB2n*9t{pjU_MdbT)YrAAa}15rh)
zGfRt`zvTE>txv)MZ4V%iNCSV5*k^jD)~5;o5kigH*9p_N31>+J+t&&7BvQ2kvAR*9
zW`L*>Ej`jzgOUpY`La>dCV-BsQQL)(xNcCd5!2oI2Cxw{KBAU`pl(R{01F3Y?ZC4U
zHe8flOa#at68JU}mu5%Chal;#`fOk~G!}m3`AwqazR}?>QUX%;>33KbdoYUZ=!)2`
z5sAgVF1B7a1j1}d!TDk4-X)@I&xghy$;2F1zdaf;pEpL*tlmXntvK%rf;h0gdTBUz
zdGL*<!oPQe>F@W+J5^_uz_leh{#v)<g?xQeujmI^jLMy7L$N+-%U2+{=4UwJcf^(D
zoOJGcDas{>D#&1^j0pmpl0$Z6iL50o_WBPX_dudV?nv?l@7FyG4Y~be7&D&fRq{kI
zdCF^ptGT7O$rVNtQyh1^SQ$?u86u3)wfPYHINE(8*UQdSMY|^0we#>(Ti^x{?P{?E
zG_M_X=C9y7je|J{XVOBjhea>r2z!n(PHZqoLs8LT4eNM#Lg--)^{yG{@G|*BE`*Ud
zP^ok}0p=r=^!%A4+tTBI)KsE;E0Ed^<2rEBqqz|f-HYV5LPrkxSfah>iEc*J9Q%oa
zT%M<K5Oq2-`nM$(6CnCG-bjT-bDd-nt0D~C^r6kD+tDPQo$YjEF18@gBS7!`qNFJH
zLJE|l6ifbG1Ij(*BovArcmp*bmjti^Ca{(RYC5|S5GMm11%o^g0=+W?;t(XnBaM$i
z936r@00jC33E+_=$Rm!ILmn~zm<w#2%>Yfr5U0fAY3aWQN%1Vo)O&daOI-`N3Ex-+
zUhW?$&94tFjp6&X{n@uMlXi^zkw%*rz@|Uy1QLo`2*-B9`V8(p8fc2}l5KpCnY(B<
z$u#-X^a!rNsm~aIQXrfkGP-r>Ch6CqRsGV;d&I|*MUL%(IvhPeEKPwJj))?hL8w=j
zu3s1)U#Qm;6?(urdW=YeICj3xo*GmQ=?7|hRX7%vu{4#DTWWsE>0bO$G%EAWin?HC
zU}v{Wgq5jV3K-+g-kAQK1A7e;#OdxgX&_dvOP9fU^p@Y^&eD-WPoAL94?IpdjSqiR
z3K~E&$gbkeoJO(PTO;Z>&7l=D^_Sj!cfgPL!}_oO7+(x|#zfS_;^`ev)c^L?4ZHZ$
z$Uy-BtYQ5Z6p8=PyL#0>l#$g@zU}n7HPgf^Dfs49E5i_C;?)pR)G9PsB9LT8Ha18#
z4Go*KZ-8Y#(w|P{q|2AWa~lh3YhPFoWBij>^SU83F@lU~pTf7gy>EI?eRkbvd)*(;
zZu4(}IpX9=dcqiYa?tPMA{-$FbrR+yqZO|NqS%p%=p-|SO?Pw<8Ayp}_o@QiNq?`w
zzn#?jr!(F?orHy;x6&;Sz<~Hr8K?=y7LGkZX7cFJT4Jm`vHL!gO{YnJJvS#W_4v+@
z(2~2(t=cNFCQ1R7U7ty5H5+KxCbhs|QF+)ot&Sh7GP4(Rf=szKB2ua07(<||t`o!;
zUVR?lB*8p?%{Si53b^9V7-&Y7pstd#SXG?qIXSxXO*aa2(!>1qiRvpWPMLvIsfklO
zZQH$QS$iR3wK#>Avgc)P6H{|Y)~>4r(%zGkRbpbTuHSl$VZL)d4!A;qEOaTn`9>XG
zpaJrTI}x><d4dQ`+NBcC8>-FG$W{ZVGA$K!7$wf`O<Dshl*u3mEp`_-3`4PCl^Z2e
z=MxG}Tb{Xtt^Zcegh@KA@~F(@oSA_!XWSqVhT1gbVdGk?FHdk7BWJ7Q`Y$kmyJry^
z;(4>XE~dwk^4(I(6p`k5!w0Y&`XjE7K*yN!6`QJ%R)%Odd|TuzmmzJllnpTAdu2%3
zcO*BPAGO>VuV=bi<i%;3%heZ~=}*Qq2plBE=g?tjJqdX|Ep4e2k-YQR3-#uzG^Moj
za#u!O`cPl&G-SlzlrX&+$c^#1hR(>&CJ^wIDIMe-X+xh>a+vH#9u_FuPc0Sp?I?<w
z;tT@WqnX?c+hKr-Rp3^l5EIf32a^>4h{M=EqYf0roM$B}yNEN=syF&TR54a8cNEyj
z^)fKhHJx6B<x5TBl&{(4@1>Y`dG)24kAc15K2wPEY>!*Aok~jHX0fE^j82)zf*z}B
zHfX2Sjyvq%n@Nt^=ImMDjAM*u14Y3sX*;GsyuEeiu`5+vWadv(`mU;78?n>F?A}LA
z(#M~4y)ysg36RG7&@+~_?=|?9)lGUw2>#^Xu=%O7ES;-MKWs?n^3uDQy9}@9SA7E9
zT8N}yC7CN7V~P6LUvIq87(p!RnR6^Fw1J7MD6cZ<s<P)sYdHqrxqRk+(|@EfjBtcU
zXi->@`O-YI67|oj{H+yseZ)?v%%|^K-DpIyN2nTQl1;ID)ZRpYKOiH^HneeeV|rOC
zHzUVzTddE`pMA2#7EGy&_Jt5AY$x(v0ju0a{XwKz(H1fwx<{C)hL~*$S3~ei=#VZJ
zd;qZ#$3Wm0*Z2fV>WD$Rmv)KL-v@}LG^OW=u)7#KD>xlOQ5C{AIxDnrY+?`O6)X?X
z1B84^BotA88zh!c1JEtZ)6P2RrH&Xz<`;O&(*x!ULgORx6Ncy`1=(E@u^Uv30{V$G
zHuzp*G{UKX96lTR25Ci!fK7;f+Y|f58-B5XL^9uLds$`aiE*&#xKwT-^9$y|*ua#c
zRS&T|8KgPf8>Z4SQ(NF_4r+T*m$EpGmiA~3v5iD^;W_KQJUkmKsAn>FK$;oe!z-ju
z^rK#<{SKjXMEw}ichLAmb-d^MHw=D;{xe+g#vL}y@1XlRWzGef*n~NJ=@Gm!^u#UM
z_gm+lz;g4tax(<b2wxEWL_ddJq?1ns0yx`Rq{RPKOIaWBaUh<Tpa2wx7u>j7u0jAP
zl@PG>M_FskqpgDT5#ysH@xHsJhNv|59cM^Hw?kW2B?NmUoX@6{rx1xNs@<V2=~Beh
zk>JU7ds3X08aQPh@uJ$&hFcmyYz>gY(3>}44hsNc&$gd8ymuL&Af4MG`6()ijNLKf
zADRrYurIla3F6oPWNhv?^>Ms@bq(bIhOY4++Qm$|rUQ;TYS>R2sqCDG$=G(9v1S_Y
z4w2@j2Vq(Q&SoOf-=tQKUnX=EawqFj(ni*K-qW;)WIzJK0S9%oq=Q;hfG|Pm5RoFI
z!JtwgkAeb<_I*-N(R$QzXi$;Nw7++nMT+JAy3~I7`SA<yYu;n-&zARTY`fkUT7ay_
zM6fWQM8=&VFj<dJ)cE?oFiKg62Hr4Fhiuq&FuEgr5+2TdA&9ss4)W{f$T6JbdjPzj
zkAhe|IDV32Ieh6`LrgEz%S4CtXh6&t(@mOVa!mXi!66<#*u5g=YgD48yUu7s%!dh1
zila~%*`XgMF&+=Wp&-81eL{>PJl_4@AySl47VaA9IItE;CA_^=!rm=|?6zI3#eD}}
zx<f_PWrCXqv>1ys%{sS}1UzZhn!DzU1_O(owjwbm?C21(;E>E&Tcv1FIJPXUA<k+r
z<EE4bA@!hqqX|)m@@a*Z5Ij7~jimoy;*+*DvogChg>|dY^O-@qp=Ix+1;p)}H8CO^
z#jctJG|YJ$;hu8r=$yonF?SD&fi*Xlk};$(Q>KW6+AvF!Hc5&Z^cethxftv#_B%b$
z6Ie~Nb%Y%W4V_lMEM#xwHp93`x<jq4#&rrotRw{k`)OF(&F1yh!wCprdOn(e_6Gio
z7TF`OF;jAF*9PWWOwK+tO$TSB-pE=OMcUDvDZFnWp}9!(<Se-*5*g~PeaeHXOFfrO
zXV|Dy0tbYf5u{<U3}17RE9b)Nh-K=7pDz5$(NXNi(=9f=D^gjIiSfpavtN>Y&ySKq
z@++kgbTy<c2GO<F$c)js+|!EIwHWo9(>HrA5z=Q_Qv<mDy@z5(94S$w%x2mX8sMHN
zOFWpR5K*lO7)yi`Ce=$6tr}_~Ycg<;0L_VECYQ$l7BEbE*Q7QGd$$ol8wORqpN%-+
z<)qI1=~1r7)O1eA%I_+`<KOQsa~=*Ic?3nLQ>sH&ITK1l1iA~w2LXxk7-~iSIBB&?
zC=+O_50;YidPoWFippDv7$=$xMu2G7S}Zehzjdu<cEnpU7cHIAyIS^pnf;-aBt}}b
z-Je}TqVk#%(1^D(;~+RWdi_%|x)lmsoQ8XMi0LDyllOecsY7p*m)=0oZom;CeN}1n
zbO?HtsBp7LscK!V+joMZYe^Lp&|C#V!Cn{VwH`kQwZ<2|gfzOTJWEbPj>F4v0Ye?d
zYLHRMeZFRXwwCPY8|LRLX8)YYvdryOjUK9!uPt$NPm*)|M;2}=$}Uto-G;Wya3<xf
z$UUW`Ted3e%L9=Ro{!&prPGo@+tmpEib>37hObR6B}CbUHfz01+N`I2W}+%pxvf%G
zQRsAwHUi0QZl7qFmBF%UkZ3ID*tE0R37;t4K&N3jIM>_TyJ;-I^hUq)CGNaOFZnej
z`BZ{2KU!9ZdHT)nD`QI0$U@B9YYt63rZ&BqhVx@MV4cl~al6Fh@?qv7uI$NZnWxx4
zkHGvT9a+r`uzr?#r6tWT%tZtTHHV@Xk-EEbR$k-dtZw_lV&#yAy0;h!?&R55&fWb-
zqRMC~uVqe_(+D;G8T)N>ocISQuZ?|Q3&j9>m(3V&6Yy43B6vlaf@3Hhh~-X;hL1vg
ze%#!@3VA1<Y$yAj+9W#N-LB%iu<c%t;Ht{HjNvx*ii2;VYAcTD7|y(gv{LV?AJ-vo
zxMHzIk@V`%bB~isWumR<r&GbdY6_JoGQ}<353ah&9?!O1F~$A1C}j<e58H9sP}5M|
zaz!V!9l;Uy(Dze0W7${DH}JV469*{hl+a|#LrI#f5G8KVXPp^L@-8s1eNwpnN3`$!
zKqqpaN!^xC?Bhw^3Wb{ys$&kS)DMN)9D!UXeyo)6g%X|!v)@Wv%6N|Z=llK{rMRUa
zH9hM0Za~|ZqAdAqp97%)uB#&((274zF8yXT!*nhjHgF|>SqyYHijwW0DZb$+_Xlns
z6G}qS&ujw0b@5z)(JjdDMRmMpjY}<3=A(Hnqh>6lhTz&qI8o5&N;I;B9VbSVa)wvv
zy90P66XF-I7=w636XX$&l0n{41o>nW<`9k^LEdQu`NR|GJA!%`p&v%00XTC&HB;L%
zP)+pt5`0@WqQ6ljdM0jxj>N#X7jY7#w*}B7by<t*lq9Oo*;3FWk4TB$ff9RUNc4%4
zm_;6-5`8iy`hp4`Siy(rytuf*x{~2oBwm>;sG2R%%56pOs1-A?d48%&g3OaKqz3uW
z|E3&^XtQ<Oq|F4{=#duN&tGMmxWvWi5f|SkEVxgcd7C`>PM(CP%v`3-z*A(i*D?Hs
zF;Q#8Y@(b4)VyhnI!>O6k2o3=c|az5r%e2ek?@lv=_g3iN1CXo$ky+kBy-2iqReiS
zPLy?5WBbrGY33o{IBuRQGlDaDB*Xj)GwUZU-c4M%oj8Lxc@k&(hm84^+4PQW`iMSx
zQlB!jThH)!D<pe~K;G%wD9&+Eu$>6}DC(S`eYFql{hnngHONp*JQ*TlbFHzevZ5v;
zXDS;iSFd^ss=VPO=dtJIz<m-3kBsZAas6WmW2)#jQ0nQ2;Gh5Ei@wN@eG$L>lYOC7
zXMk)~h*&GYrs{zT^g<z%T`L5y6=RqR{h$@(=<+*;`WHtXor987KyiO=k{FFqbb>>7
za*lRIBVL{i$hQ!gIYo9(u4VMS<pgJ<oE-QZ+I5R8sX6nJ<%A~BI7>=TZlU(0>6uy<
zT(^X;u3Xsa4BfLeo&H4?RK8Xe=mk<rwX|X(-4InPPU?k|N;PVQvU-7_ZY&vVfSD^Q
zXMN{ji629A<1ELi>PbLN4z9_HY2M>9l~N7a2$oU}@dyE>9l=O!Nk=3Kdooe&vbCfm
zG$q?C;>ecsPO0*;4n^HuVTYev)JnSaJ(tp!TokuNV<?I}!3dj@4f#lJNk{ZAP^>W-
z#XZ^R6;;d;q_9U+H(9vRjBI2BC(0FFfB9M81@NzU!WT$qJi#mS5rH5a;?WF<X8?gc
zp+qb}IOGF?U|dHKjJaUguB&4B54r>|zC^BCG2K|60o?drH^)mwu?UkK30R^Gf@F$>
z3{hhQi5N*cVa4bV{#YK6UEl#%-0OYc#yhaJgZ8~q!V=6i#UWVgAHzQTKSOUAJwKrT
z$0bX+mg~n32>{@U{a;w%|3f2bRkKybQb+Nl1A+!I?phgsOG+3O8%~ccixsJ{B(+lY
zsl>pFsqOqzRXs)5OvCn_@*U)JA;Yz_kjb(1q;38$d$H`4ZX5z|Ol}5zw)b`G@n4Sf
z+`}5by&pIOnC_qo08Bja*|0JHb>9mi&L8#+G!nY~$Pi3?GvGU8xxt>05df{kJ44Bu
zsh}E&CM*Gj-FF5$!<lds09=jqgrvKe0p&e4Mbo>|4n3vz(IS`u&mo1{j@f9@*6{{(
zxvP8Ny0fiyMKvaGtJOGI5*cgpi5o35J?i6BBRl;C80}V=I%;sm;LVM|DioR}w&pT9
z_0Xi+=}ME-O)EN7-P)}hs9m+)%1ex3Zo3nTthNxdim6f`vDQ^jG4i+^hGrdkM``3!
zsHH;<v~+xtafA%dOjYPMGpv*lcO_;P@2J9JMK($&n_DZA^nVtSf5SneI(T^;M*SDt
zSd7E%zPfwPAmW)CV8PN^wX#)J7p*HtlH@qO;X^)slgOKyPeXjMYLzXdH7T;hWHVGV
z#=Wc;PyT+9>Nx<UC6wXOykZ7kbC_5_!qYJ5a3kvsmdsbQLp+vfHZ@(;kX1QXQ!)?>
zsRNOAeKYRC6~X8KUX-(u{2&g*Z9wmVa)Ro>QwaSa|1i4DSykmhTaF|cZV)c*JNXik
zM9~#ZNQ^Vp=&q-y(VvlOFQs;5&Sj7C;C|rbTaym0KA7vev+VCy%(-@zoO7-q?H^%y
zsmCbD%{UXIBk`T{wair7bk4U~h6X7#(vHg^bYmcJVGXTpBr!j+NN%2|5WFCyHu&2m
zW*_U)Hf4ZA(i%HnHpr{|sk~=FC$4V2;rZJ2rW~`C!$@A2{(!u;)+*t_#XzHP6hDtl
zfvF1eJ9E*Gf3$n0fG?$RQcn#%nsjmvab@i<b?+!f>Rof-V#f$qZ%QFsi#aIrS~r2Q
zTfV0j7LOU5_*v?johBgG)1#;WW8HNirpIrfg2k>*wofqW?U`ef-*qnutY*$}l{zP9
zyv(8b;%arR;yE#+FSm3I=iADC>XyWJW%sS@o`*)aTQ~>QihzHU|Ff8A+@ZHL5V|SS
zdmt1?Eb?KX83E%fcBwlC6Dmb5+Zk0!siiAK&*Tx4reEy_6hu8YNIb{cR+nDt0RI)x
zjI8z-vl_+_27$DiMv4c1+eXYUSo;NMpqu51ye>Ddq*DE^quk41Y;zv}PPW6o3%P#Y
z3&>v!4(D)kQ@x|xCCK0(NbR|?PU>dd<fQo95yZnhBcCt#+s1?)4)Rg=NaQ==mvLZE
zL_m)S*VI{>`T}+Req4@7e@|S*C(4i$)Zqgd*^zm~gr&{+T<+)U9&v*<!T`a7-#=Kx
zjHZZryAZdh&j_lN=IF_J)x_w;-46`chQBoi%yR2#tfOZvK)1VRVIknRe>66|p;k%v
zp&|8wZYARv1QWt<9kdxR&&8=JMyV+5I6GR`3fA@Fjl^N2*65=S5bZt}LB`QROv09%
zKuV+pZV(c>K}y5~ZV(ebKuRP9P9P<M187)49~4o?#nAzrs-a9eiX7<@kYfXK2;`<M
zPb8n_H;#KU>c<1}^G4b=3R;on?|DD}H(g-)cYD0y*Fnqv-*C|WU$n&U+{9MJ;AOX$
z9z;6RLV!v!SV{{SN2@@EDxwWlf}m%`sMgOR{Tmo+!rt6H@Syw&>US@kt9WrH^K};U
zGvIHu@|!9kqQ?yfG;ex6?tJB&<2>biJ^B7#o2v(i*?$D_a+F8Ir^>JxFaa{$k|&6)
z<k(=KjgHr1NcjW9mo`EUsf9<8p~_Ic*C?=9y(Z)CTW^LIE47W1F~faRrnljgTcuim
zq30>yZnNuRTU>N2w;pDHo#i#->QjEC!l6?A;q~_pws%iu26Tu{eVQ`RV#a~j%NnxB
zkClzGfbTa<m|KgHXYK{GDg170yf#lA)>~O`XOm6pPvso99xv;~>eH-~qhTFaGqG;>
zkAP)g#4ML-q2-izQ>Rj$eSCerV!r4&H%XBatB&+T)|lmv23(#%rNKeM%15Zc12STa
zJc8pSORx7pUoJ!-xh=>(#VsvX>rd8j1}acw=P7CPiFVu!Z<MTd+wmL(54UME9f3TP
zs9kKoDWi&aLO39g5Nj1qLNjO`oT=O>T7*5O9)q`vfDa{t)8B||sVQ7g`3}kKGW`TT
z(37y)WDWA<uId)kG&iVc*!(fm)y63`<?_J7KR<1!>s{um)~L$*G&OZNCan9<y|zHA
z^c=43CbQa1Uv>GNzQjrps90#KG=y_QUTn3%Yy*NW&!S=9>CHpFXydckFgkMYa#2O4
zJzxVV$OY2Ay(0rDF2;YesTMWTMxvtNbQBw-96_zA@(z?yL2Ih#2Vmc148E8i)CBKq
z^Wq!Rl-7K!A4Z#dARbo3tUJ6dD<${d3JGtk+Kj)%Pp2`>!tD88u`Qh`xyG~058n#k
ze(IL@f~?qkj79QuFEhT%yQ>~4nuBhckb|d+A6Z6Q$S>Ufx=?%PkULyo6_X>FjY4m6
zsdg&Y<*p)eVy9ixW_p{4oLcI431EVp(35R5j`x3)bU1&qczV5uL=eupkqey}*~iz1
zGhAB#%_n#m`hcK4^%LHthwv{H)g$_6eFG{!<dJTQUKFqzU9lP-vKn9FhP$l=wT&aq
z+EWmY&rzSe@DG!9;2#$l2Cb+!^{}-IHHOL^p4~jcK1wG;Y__a`yr#6Ywc8u1(ci6j
zg+6n36atA!!fP<ZlE}T2#PQmW5ef(`q+kfG_6ZIbl7v49Of;qi{2W4j7!%(CXtaIt
zAtpPH^VYfVXba;qKkN$5uf)8GJl!Z~u~?c;!D)nXhE$2d^=v_Y*KlC1iY2X#TdSjq
zD>p>t+t3bl0*1IJU506vew+s}2*w#utO)Tennw|}hSClvA2y*CC#fe|l}7+X_3vOR
z3=iZX3O^^y5Td5}{O3~R+MSZB=CrnoNy>USRhY?QwoC%$Y-B8lV~msKX2!x!Gb4rL
z?qh0l_?nnS7l$?Qtv4Qj8ZwaqUJCKR=bfPf5N^PZ!8@=@R5Kz!5pEGQ=r8$JC3yyU
z4t{<urQi_lZE+b2zjF=azcAOB{{veX$?$YhImR5#&z?S#BSU6lN05jJ6f6#zV1lGr
z2dPX53K0GiQd9uM&Yb@1Q@Z7lCa8=Uv1(ndZEI7ib*)^ELZb$;R&gj@vEtp9`#C#z
z>dO6ISjx-00dJjqoe?6-+=oaK+N0b3N_&0n+5Pad_jvp|)dylgzwK&7X^)z+rQ$ms
zytYF*e6*V$!lk-#5gx%Uy>d(M*rKI-?U=t7gYF}sd#!paf>!T#h>fD}Z1@Yh9jb@=
z+IeS+`da-~h0W^mClq|-%lhCUp~Gi8){5t9RE38q%|m6xm@b2=Z~ym%x@?>uW#7e!
zE#GlRYdAkd$3w|=<8D|URj$*q6RK;c_1F>xOx0I>Pyn>X#hb*!He;>2r)j7uR>NF0
zb||I;h+={0Ytf(#Z_7G3B}0s~Gpsi=VEZosPl9Y(g1|(((1gZJBQhYb;bTU@ps~jl
zTN|b=ECvp=l-Df3lst)1c%V)hv)e)Cv;b3{24<tNPr$-DrZ?#;(8I&~PYaUR^dfO!
zV032)rvXS2Be!Ar6$HO%a-@L#cpO$vqcNgCicA!Fv6#)Z!E(Yflv>_sjv;R$xZ0~7
zvk)Zbl+!kpI7lUP)!0Ffi?;COLxkOPDYx4+XKW}P^BEkkVaS?p580P#tOlW4{yiqT
ztILLAohBj+Z87!VU1^?P_QABt0^CL7%cl&=ouybg&gM6cSs~PLxvMZX&`Ywx12!!k
zB<6z&38Nr2gshZTlBf9>RWB7K<d_fLK=1R}1Vq`4wvid#rumlXVIt7%2ad~W+bGV<
zv%+DuWNNkXUUL3LquzX@F=0mLEDgjmeyo!iCSnV1Um~Zr3&+3tI|^(R6jApB+<p2J
z0cXoqMj4Tz^(|C??HvuJZ_DS(kEXYiBQl*-j^D(}h|K_(i~vSs9MW-gk=m0R5%6_f
zvT-pPENmTzaI%;^mqDa$xQ))x%2n50&m}>o&&Z5P(KImIYjMQQaz(6fjGa)?A_(H*
zktnl~#G+Z$1vBxY&x0Rq^MbT2N7(2PBC@|0A`mtHHg{P!o)HDH+QDI>FYcgf%8JWp
zFQ#~T3o(7UmcQ1BZ{&IzGv#Dqo5;|d3tVzFPefPh4P-ff;ybEU)~*LZnXybyP^)th
zq2xF>&GG1VY!k@{Zjmc;+d+XpG|ovpMd;QOtUGXFHW*apO67;Ny^?q%r}Qkf4VrP)
znX~0g%Qf2SX2K5fG9+|)3uR(<jqpvuX4C-P;9){e$?Wf9f+8zMV_Xan;k@i|`lt(@
zVnTp{ew%Wk!+jvN#aI11pmfQnt$n;+pN!{YggsmjrsJWfBZk6~-~aQxXXG;-9NIA)
zjLvX05dABs6LU-kGqayFn2eIaqd^}o0&Wvdf#qYqYPt=YOQZ2F-b@`Kq0&>Iea{0y
zhD)W%b@%VKsok~eL9OJrAesGG^j1N&$YWc-C6!=8Vlx)5QA1s*Y4<fO%=xA%F13@A
zexh-oJnpIXkkQq9-+|Sk8pnCw@rHz`v74JrhLs0p1yM$9%Ix?$!T*cNRs6RA;eF@Z
zGg0hFBscnx&G1ee>I&Ig66$i3s5fP@nQ!T#v`ww1p43<fTGnDBV?K$o@b^EOrBF1)
zda9`e6-g-`N@G&X0KX*dX%E~(d*Ep>@p1rmz4ibX)S6rf6P2Imd^)tv(9KLS1axL6
z0}s0fU6F=duPEB8!Dsqoa!DrG(=``@b;GHMyY%O$u>zIUC=(9~^WMXEvqufDNuFJ1
znhRMiS)DbezE*@(BUN6wtveZwS;0i1Y{96^9Tfd2m3yvIWwa%4UY6RglTpI}6weEq
zUn(jU6n}<hp;&Rq=xZ$}-d;zUtI;jyJRjW5#$SDK7KiGaM>^I@Q@RAV=pc#9%S-uG
z?w^Ny1d=?~92Pw%VRl8U@rY!VjG?mU_)U4ss1fxRF%CEP?k%>buiHCji~2wlbMiI=
zv@;_-6rBhnmFU2qQ?~$nTp#o6Kc`SBP2cYvn{>yU1X1t6GOzsLr0Z`uQEIHX!tW4K
zYwBEZL!Kq)0R3pjjP=U<AU*Pf=iBh@uaq(me6d!yfHeE;`c`Nz2gp6#iX$s@hZlAp
zjX2aD8&YlQf}ZdzRCMZy!&Gb>>!L7MgBLA=T$>_OEdGavDR1Hhb?R_Kt`Mc)Wx@{p
z#FinfsaFuU%`IjaS+4|TUhuI^CRnQus^jE_$wc{e1wf+3Xl9<lczPp){U_)Tg){yL
zrm1;`DbS=nneCF%F9YWqD(?JLS#d>0+lq$}O`%!22;=fP9{J@Q^a?rXikG}WT(?sh
z$G)J=z4e2)zOXYpYlwGv$z^omQC4xf(ee*m**~lMQduXbOHO={#hZ%+fLZBQ$Uo68
zsEJVu;gsi%LR*;*J>gn%o!=ZNr3b)nt_tR;*y|)^N)E1oTJ~_YuPPS1MAw@ozTqvm
zNiX6hUyPRiLL2!>FXkm*?|%z>!PZVnSDY+b8(UJz3%@`u{UtZ_6JOX%zGyA|#W!}7
zU*Jo=h%J9q65Nc_+>G%yV#|fQDW$tR0j`g5HYUo2KFk-tLtFewuXiOr+!w!tTYgBc
z`z1c?7r$Sx<}W}k%8%ydI8irV_g4cXvx2m0F<i5dn_G~kS5@9v(X(2WKw6rbg*T%W
zqSVg!n1bArkE$mNYq6xcS!J`OPM1WucEcalVhg;!Agul$;@<H)(y)Ek?2c`l-LX-z
zZQHJ(V<#Qkwrv|7Rcza~lTOmvdH1|Cvu6H){rghSTJ^PRt?N0j`#z6ji5T=Swq}$?
z4uxE3hr^nIWO5V_GJ1KE34!G0jhM%ql;BFUC|9Cn&ybC-D4S&is>($J%VwQ{s*#Xu
zUxE&olNocvz@tP@mjQP9T6^`{x`h(1%E<@kUL+b5L-_TuOm(O4cyr`Ij`UQcYBd;Q
z%I*9+;4vzL%md>~`)Sm8m}x61+!hg7D&pA30O7xLMibl-PJz+C{;awS0zHV5FM<3}
z^!FTAJtoA`1own$F>kZ0?<{A}B`$mhCu`mqkC#(;$4m@q1}p)q=O1d6>{A1lmKxRz
zYHy0`S4r8&Vd9^tuN!Huk{U*#Z1ACM-F^G%>NIi#mK}FN-FlOi?%deBWN>p5eQXyX
zqAkKXqjf5ZrhCPb#X?~o;tY;ZdFw&h>hKt#P~}oYWK+9l+2jDrB^gBX>&YyZ;Bt+i
zrcNY(HGaubU{MQFXEWkTp<Zxi)1$j+Ctj@e@{XS?y?9f!yV5#cHZMf1^NB0>w9sZH
zs*r%#RlXjUO%juN@P6S#>S#}Yv%Du`)cMJaaZ>|?WOO(6<%@At90Le-PgEdb3(O2K
zLXT3+I>0-<=S?Fl3{_9wEu27GB>v+y=PY;PNuk6#US^jc3F=wU6&{mXEwf!~Y>1yG
z<;~LXw~7vRb1jtoMT!6E=@<~&Vr!I}#()Dj6+V4bf4iy-z_&6IU&9jDCeAiznQLL4
zBa3SC70(cZUYihK#+(orSv|oUON<VY|B3HIlNnvZs3->EXbE1bC}t@&cSUk3KZg|m
z<T-amc8OTDDYu3%)p>lOirNV`({eP^k^^^1U(}u4)EfWfI=3aX#v|p0ZFT+QlCP-y
z>yNzkhajN<@rGe7>%fV4BxRGbK&ewf`&i0FveqC1|Mt`w^AqQqZkl<Vak|Wq{C8<w
zY$5|HnV#cRK}WYe*0tNkw6s%=<nWq)*&6tS7IJ~K7tDN9s8S)Ha5$0KmZvU*Cn<K-
z!B-`eCgE;_;{45uAQxDfAD<gP!{)d6iE<6r3pO;Ylw9(O9BTd>^@icc%jEu_&{+<s
zjW<!E8?p_u+T24@YTb*2Uq;*J>I}vB%D+?Yd~mlbZ!s?peTZ`U8mT^r|Mxm~)NSuS
zD~U#;|MTly*8gIay0u~5|I;$Ko;2Ocq`$_)HPnO_k`1Ax2*T+vA@N#4h!(4SVD^af
zAC={XN72#2F1k`LQnNRpX)Z3S{+^_+RKHNoP^>*Gt!HnmSE1h2blUEgLXimj!7u&(
za(CtPwcySD%<;PBI-VR({PegX{e}rR$QxG3P7CckFo_JwJ#AZu#rM4$)O;6?XdN47
zbkRK;<k%o5eg?KF4A*Ae>@4G5xe4c~_1G-e4}>??%?Cr@<e_)o;FrJY5F$&Bgt}ZT
zITRCkiVhcY*SHkm#*RMoaT6`y@(|)5uIm%_F5d>lR35A+a_7v|3%TYl-A19Cy#&Ts
zu=6r@G6JmLWAUD>+?57$aR=|>Fzqzg2qHOj>P1H)<`plcotm{$WP|$6n)BU_!2$~z
zn#hcQBrr!BNyWGu+p@J3(5>J^as(&Hncaq{ndM9NM~F?>ubu(t;Htkg0RpIq;sX>w
z`5$9=6G2)nOlFN{eGSR#Ow2|stEZX9iL(YP{)-M;1>u&`fxAhC?0VR?4f3riiDCwD
z95~T~==G*dsL_*>;sN1`Z2dE|CM*jW35t*A04by!SHlELs}>fUpmbT$)QnwB85ML8
z(}}d%speUSg#?+pjrK~^@S)>bY`|aHNR)}7MMZ;dCVDMP(4M-DCJ2GPj4FpBm;Q&o
zRYxgdbz;&#I@URq7MRvLtqh=nGS|RZ!h#Y^W;~|ZsUF>BxJz=P&w7(3cseIg1l8KN
z!3wu}Ru`)zes9fk24Oj~KF(VK8H>i0`l4TPV0=|gHRX9iUR4_Ol!mDgg3i~pJQq;P
zU<9Qx$(p%XVP)i8kDE2W3{`FJ5p<fh`ZI(qf6%m}#e?HqGb?J&6An4rTsJzNXEnV^
z%AC%;MK+RyU4mSl!l5DL;}W{GAe2CvRF5cvP1CwEY{&*G)i}S%1otm(Chh*Lq!#bO
z0zu2z(E@$i?}{uk1vg&j8Z{}~G_o~7NA+0~CzTo5#EGPw0N5#lMlmLBrieOs{KVBr
z5YiMLqloxViR45xIr{vpwzl=x)I^iZ1Y@rFdYPERCJF`UghLGDtW{e8mxN~ZZt@c$
z&b9~-ldmu|5~c~aQyJAY)r66O(yEeXGI`PB3R*NN_hbm19WY5YQ|=&Y@y<-PL`4os
zHT$l@=9hPghEn`xe4(unrlO}C5-|qneCnwh;_v*4>Roo}dm0md1qz-YV|xj6HRX3z
z41vQeLRiN#(PHhmK;Y<X&~Dbm3ETc<x&6Oca&tlMQuIQZzs@ewm&3=CBQ=t2v;Wi;
z$pT}0`lS~}P5PMjPqbXkmw8q!AvG2$Q>6mt3*ti*xwDWMM)Ad2Mq`b0bGSelvg)PU
zZcKsp9UC>@B?9s)$esMS#euk!0YbDy#OnO62-#1zlzfRQo)kXg4MDZZ-zyk0q9Chr
zNz)6UT`D=X8MdRT)6PK71or#2?%76b%rLzO{<uH1e%<^m@a5+G=MIegP&zdK%n(QW
zODRj$&>!vDMN0e?rV&fqZ?Wu_>}R4|Z)5PU_xLJ^Iwz@{Vk;giS$A5OIM90*cR+71
ze)4W!L5hv0X>lq4e)N6H$3##J81*{VI`@TQ1Z}*)TwA@YL@V4NbAtTAvU+`(fv3J|
z?tj-!k_O+Cj7AXHi6Y)k|GgBBVVbv<%n#n8)lmo-F6WVJ`5cKO{*ZjQ(rhv~M(?nQ
zOFsaKhO1`~)Bgg%I0t4}G~g#v{H?ocb4AFrlTC3_;O*~N15d@ztV{3FJrXlX5ty|U
ze@`0w5K27aOb<6K44KBodLFD!$b3`atQmOZGs)8(z?Kl5YInVZDkIMpOQH0#wbYu3
zYDP#*RsOEPerOT&^Vnxe33R#e!#Qk=Zx8-8dj_4M<^)$$OY5ivr2_8X=YnLj`0?7&
z`5TOCuIeg<=B$ZST|;O>UeWdCNo9v<R6^8W-@BuG(rBK<2YM9v)*0Rq-%SlfRX8OU
z6Pz43#yd=O3{rG+DzsedW@nQeY23{BJw-DtAGuX&^U|`ZsmPb+4=fUad$@@ZsDe3P
zj8d@yBigi@Sy7fb3|km_4M?A}xE#d<owDQd4R8<F(t#0U?O{CF@|GiOo!a-Z3@-!+
z+!Ue#1F()DgTpM`;U5-;Ff>e92+1=_bTUL|xd?uR8C%20T`J7NAI4hZWv<E{*;#hw
zIjZ!Fjtf|QLhKW=bJ=3Q=&AC43-<nzzga`&QDXXapzrS5*HYAG4}F0g+m%`bnI<>A
zMFkNhp=8MmRay@%2HHQdz8E4%cvYcFi_`|f?^0UBhZVoix{+eVH_uybKtBC?SX3-E
zV(t+F=g2TFY$38Jf;q*bhHucsz^Mn<HZ-Mu`14_p!P7dx{(C{6Al1W3W3}avU1fuZ
zZDyU_0{M-N{5?ZLm&9dAX~~R68=-iz5B4Bhtq*ie<t$u<bM000c1(SbaBUCaQ2HVf
zWAmH|&uk@VciuY&dgl;el0DVZ#CJLGTHqE<baPsL(g^us4VSEMK>RxTTzB@Ih!bJ>
zyMT7m0_Hh2=rW>i(|SATv8P`b)FUjVb#Il>P(yW|&`_8+cIx8k^7RdOr=onc)EGnV
zz_GN7E6o^^)GF=`mkzTbybF6V=S->8*mv>5h)t5w6grC)qy!t6p_Hy>Sd*f%#K~+N
z-F=uBg6bO?4M37j*mS(h5UiF4Lh=q$E;%^AY5)%=pjsw?hdYpmqK$UPso6LU!i{=0
zoL>XW+a2qj0`}^zon_~zlzl6ho7X1V#v<+pWgp-7+)_-+IdW>P^6A7|$?$$yN!{4#
z#6CpH4YFXJ1NwxvoT)aVaBB!}aawUnU6E1ozflNRF#2YaW!X5*u>7@szaTHG>M5gH
zwCP8!ZNzUGlIY`E!Fia>;cbe>uL21R9a!xO*B$-njU%mIq+L1Jr7zz$rU>h9(|Jcy
zRlMN0hlmS2I6SOY^<ZX;eG(WhRh+GIg&6m>I+~`9+HS$5qkV9`#9s~|nKa|Bs8f*d
z0$%M7!oFG>$Xe5kKyc2T5F6*$o+Dl-2oQE2-RjVIOJv8o)kg^GY#V<0hKxgO9DB>0
z!^Gbw11eql<sAbK!ge191Sv$-+K;?ouSE?^SiNUHvaGF;d{-v}RAO*&q=V$qT{$!?
zZQ|`4hJ-C1`}<O0Idw=8u+WF=*$dM2=sfFXM1Q#!-_#=(5O*pe7`lZCUDz=P*<uE+
za_m|lN95bY;!NdWQrhHFnf(ewy~x8E+QK$jktoRWp$0jIIczXgw2P=Zqyo~PQQ5u2
z(gr0WsJnEt`b)#gy(<9G(-^EC)oDZLLj=ApWrsrbevH`n?uBX7=*FnOP$OTtm8Kan
zEpE;S(R#G9hJK+Q-|!46_sFGnsX@Fl)Mp7$;Jw%x-Ij`x|JJWMcpIeomjQF%DvJKw
zK=jpuOnnE{0atW25GOnzL$WuVvdIfu@rD=OLZyvAG2nwsQ+m{pTdD^!(b$w8a>0zv
zymW*MT}T=hucovW>g==)+)h(d{{9Jd3vRBVQM%unf*1Q9ML*0r8z7pH98{VgeWNag
zKOyCAB<xVv9<(gV_p?%A-|9lRKQb<5>Wah)gE^y>p5CPnoFY1LVN_@iLP~EVIi=%8
zG~tKT*^xz}GrJUD7c>3iO*Dm`$Q;?0^jtFq`^#0+LL9Dt!XlaAqiKdwg&PAUdyM`&
zt#>L2PH_ym<fAooy6@St3gykiYz>;(m3*p@Ia;rOsdV|4E;HbIJ}r>YwAkv2{1(br
z(1d{>Q=ycrcEAjf3*z-=t)?4tCZ^nmAF+mFpfLX4kg*nhc44P#!Ka=5Xvyx8Ge>$J
zJ8O%Bgl{H-h;5}Qp|HaQxNlKnaB(KEz+))seQY}OHOT*spH6o{0WJ0W#DM@L=$VMq
z{dJyOLlET+&`#x|rqkhBx`lWA(}{ahAPnx49=OA3MGhU#Ys3A?Y@boNJBM`moqX6J
zr$%G!BzhDs5X>~!OAVGn2ECI2<G5UTFgqiTpT3;s6b`SGg>l4BH|{<b#u2lo#DYOm
zieW^|LlDO|$oh_|QTOoCBboD{nU_rCb*^h{`AF^Qn8qMp!^1@X(5QV(<5=w<vu}br
zQT`TbqL#%FA|ZyB`Ym^dpkDP^yE^Al{aKuVT=DZ?d7xP^7e$`*$Qo)=i`p`u6+E16
zB9tsq8*VV9j;&6k%M~n!AZbnL4~_v!J3oz$ApSk9m%(ZrD!Tzghf)@8DX2)PV<<St
zECz3bjk11a;yH!r*RTV*g~aAt6gX{8720z{aLCYIHSFMeMk#i$m7(&c8=Ve1Z=NwH
zEW3-V4*UFlbsE%v&#2={J$fF|Dob(GJPs9q6^LB}+>uHJ|HVceGX<`BEKHR?(E)qK
zY+0MP^Ihrw1*Pu1F#acqeJ@t$|Bm?W8zb5OKoI*ceQr^6`#<!#e|ElgQg|F}^fOp>
z<;C=hYl8W~DOk--O*7xvNhEcKWE%eTn{!^-St?mCs(*(5UEtix;x617iSls<3G_LD
z4ECeAr%uWg<T0l=gRq28oaw$Y*YkfMbY4@>n@-Oglh~i$e{ucD-KUW`86u86U<1FO
zg@Tp!#l>}@2vUboM!nn^f8&pWLg}wVPNmSrs-Q*FM=PM^cZRrO0g2v6AnOVX2cQW;
z{_sx2_(-x;ot1@FjKPJahJ_Nron8UqEdLn(p(-X5!_NE?(w?FO($>Ze;OnSK)5B|}
z8#2a;!96l%V>ZL1W>1XJ9!)Q+SdS=oqUT<(ani|FE3lfciw??<r^&7_JjT%WUzc`l
z`!JSwiqA|jUaDz3)g%_XAE45XIA{sp@SGQZm{~>*Iqg_s%RN+zK2MzWzqO(?a$CS2
z_(Z+CK4nQb;KxvLDHce?)0iOTuZgE1U`5l#KPsUCapf;-X;CeUji3O$=<|zg7iX+;
zrR6I+fNm^F*ut!`F_+ZMns2AyWB`9Okws4PCec}acrWwvFjC`O*T$2&*i??GGupdr
zdQfOSF<P_Cs7Y5Sp;D!gDNBsa*vJY@)yt?%aI5W~P&L&_0PD8mUi2ac=x^Xx+$UAc
zHv3rR^AT3l(Pd9b=-))Du6hrI64rS;?AQZZT&fe>So&r<xfm?z9qWRBqD7c3a&WSv
ziV-hhTGU25aty9I>sf0D=fD0A73x|73ls;*Qf*cMdK7Fe9W_mTQ95s(QM~FE`YRDc
zh6M3MG312O>H_NGjZW5rSO@9~r<sz&_=X<C@@eBCT9YIr*2AfHf2BNpgb?nc$}IlW
zuoe@ehMG{{eF8cx*~Qz_hjDdb{io-UU!k*583q({?zaR4*<Xr^b}drqT7(I33;=1W
z&1}>nU2)5k@}FnwmK=ztPg*jx<=kJP?#4oEXN1-%IutBa>C4js;y7`EP!E#IQVx8$
zsQgmI={rf8qa#5^;sI^`t)lm?DAzkBb?ub9n-X_zs6o)Y5n$LV!*X_0ixC)(mb{Z<
zv-Ferxjy}z1}&B|dStyZOu8$BvUw`mv*9YXF)t=%u3Loj5R^dJ7wIN9`@Bz~@0EFM
z3KIzCpv(5AIkOWfc8vnJWxlbxf6DroQ+A~)owXQcrwZEa>UxN-wggy#Uds8dzx#NU
z{qMRdjZQc;T+RbnTKmj`{Bpb#$c32~!|P<+xvNj4LPUZsb$*T!M#Xf!LjF0JeqI$<
zPx@^&`f6-Rh0;eeibC2=b0v(lxtZzIRu{^T4HQ&^Vh9qW&X0|(EBmn^b7LZKCaI!O
zh?Ox~_RQGFw^j!;t%uh(BWN40IAX9%!Ux@$I1?taKwOd=O2L0t9%7nmY_U^3<fnrO
zjlJuV4Sa#2%oXg29s@2DzHF2pDRn?>Tdwqm{pqf99gkRQRHrpvHJVA+{owDHp(4ao
z$0+7SMt;Mo%3pJmpc1ByXsGIcBpupyRdk-iMm?zAP44xl_#Ih&=T;WiE0O#T{xm8;
zM)Mh@{%S#x`dcXVopx%xmz3c%#_AP$Bk9w5Mxvo@M%KX6J_iChs;o;Mq6O_=Aq5}!
zCrianioL8b{_WxRQR*phy@xJ9E51XLWcNkV=rvqzgT;A=qB&r_km5c8)Q7v(;b(8K
ze@vx=YkQs*x;(Gtgx?23&&keNflFV9^txYJZw<PerBsb#C}8O_`OXu32<A$kSK)xV
z_>8pW!qJ9ldjOExVE$Va^o|X7=QDD*ExN)26h`n8W>^T>0HECEksgRykHog1h!Niz
zQDE4^M9$OjSZ1q;_To1`c!j{+?|kFqJ6FUeA)cO1jJ#`N;jGPOd1UL56c=<dZB?E!
zr;p(d*AVtcxwd`o)3i@#nM<Zb(fq+94nCXJ9=j<l=>oB-1xKxv9ylvAqotn`Dy?DG
z&Uu`%OE87a<a&soTFuFDpAX#~Yee_E9rPkR1qkUGhUtuBK7Gq}_1gl=Yu8^J1{Bxj
zA_-?b3BM<!lxE+|hkgPQ7M2AAkv@C>GnYCYUDQ#&lsLgC{{wUB|0e&X`uvBx4$57G
zr-kh^Uc`~L*W?8F#i6d0J4E#{MmYRwAQhB!*Z@Q}{V}%E(5tSqnty&iLT5Ah^I0Uv
zJ-;W*H~-K(^}yp?Vo=B`KYy%G&yoOXOE~}i>T0X|IOpE$YdA6dep}A{hp>adA7um+
zS)iqS>k2W>3~?)u(EVbL!DuAL)=Cb*9_VZ%&-f+AgxiOSc`as7AJ9pIfZ2|NHX>md
zah_qhB-V&JfU3#dWWoyaxGJZruvhig5%OwRX4x#hOlY^kpeYGB*BaJSIOfnTwN#5Z
zb^NEl*1$L494+j5-ev2)l#<TS9&>z<1!j;;qtE@zUEFia1(4Xv*V<uq)CCK<o3NY0
zWg<G|{d}PXd5gQwu_@a}l{(oFFxhueQg2oSAJU!kbQzK}@adA+_ytcl;1{^=O~>xp
z{HM2!@H5HbE=qh{yTzkYS(mc8UfWQC?EE0AzhPH<Z}l2sJbh@~f=qRnKbX7F@Rf;-
ze;`apw^5hcJ@i1xa<1hBx7~{~I-%$Xj$25;N;5Q9<AGMpBs;L(ay5msct<{Q$WzG6
z%rbp^-&WJPbo7Ht#I!9W40OZ0tX=JHJWN1H;K>08Ig40GXA8ohYQ==m-D<K4&r!l`
zg8!xF=2kG}yIOzObY*#=EHt}MDIgh75S^kmtpBSnNl#V+QfOJ%ga^PjZfWUx`7Pab
zF}{7T#9}-~uT{6XcxU04(|UF0R)L~q-^9*+k@USPU&=a@(=!%rC6N|uOm^%0;x&E}
zKL@UQhYh9-Br9Jhz|Goilgh<Z!;>auy;&E<deJM6df8>Ryp79g4ej*lu4mmvl!_oU
zMw&pUt(N2-Y)~~Wi{k`P>lGs}_2`JH=Vt2s_XDwKVTdiIo5;e$mn7p7pf7Gfu-(@c
zaSgit-h(~-d<(8V``0!v&ti=Q-eZ&Iyk-A1#u<pgaI%3*<6CC9+Z%#1rp8+tHw73f
zFqyuoH|VERwV9^5GCSKS?LD`0j+CYJ`T!2m9LQ-feMt6&bLmWHiVaL%qn%r;IV=%q
z#O@Ejgj@RJ4S)G+jqW1>zTu|;a|e;3S`0cuaTn#=b8w3-g_5<2f(?smwPpL(w;}mB
zbOZLm@P(xt-Ve<C6T<OzO%$%*IMO#kr<QacE<Ex{RiFD>H1Z|t<f*LVhyUtlXO$p(
z@p%aZLZ7H-+BGVH(j%;8jp-p5v1&FYGDhnO<=wy4OlB>Zm2QCZ&6bXK%?-w$A!ez+
z($?SFEW*2A)FOg;!$xL|lcY-~qa8bN-&ys1!_zErwjoL!ya$~s^rB0fuOpjVr69aK
zQzShNykjLV3n8&oKmFQo!JY^FwLW_>u(J++x-e==yr!c3gb+9>e4o9A13NjM=jc5Q
z?0TXQ2uvXShv1)C-dk|V96%dBLmnic;4{`Llx6INU?g}hta&aj%M;^T4ZW$&sDH@Q
z%?%I5G-8dD{lFnx%j`@NJpaJa|4*IDAWuh3dx#3Og1Q%%_s+OqMLeU^6_K-aa6{fi
zq4GQEuNOa*Da7So^3pJjv$(xu?6G>6IAfd}8I;(TPvD?GUkpap06=H=<l0+=D2n3K
zPm-)7FpcDT#Rr(}8D?*JHuwugK@Wxy+3Z!)Kc^y|0>4Qm%EV6^VULnN99<jkXY>5Y
zvN%&-ar}aK{M^(CU^^(nZY^i{+~)1o&EFve$2Ja5jhyI~S~;qE4SRnCb_=pCM8f;)
z<_@v2fxUy8t~Z!i`0vqt(ugsOe-Y&vvc?tEz%C?q{m=>mKhK!5<M6-SN<YK6r530Q
z^vTZ53iL^V<^~Hg><cn-ii~{7XNP!an7WTjpSy)IQf)2V3oYGc+GmWG0)9{2Ru+;x
zGHY~Jzv5kEitZ_V;7gk!i<*mnG=V2@h^!SAO-imY=YE+@SQA|H#J!viv@fYI@!8j`
z(`x2u(4EOGuci5`W7OAUTQW8X$=Zqck~3o+Ob?mSXk%}h2WJVL;r0m$)`c|AP&)*O
zxB70kr9&JXA$_8!@}u#p6${<UX9<B1MC_iqc(@Ce$#{olN<{l>Pz;vVX){X>I*mp8
z@L})J-Np+*jZC878xYCu^3~vA%NkBuCKXuZjuOoawAf;K6$Cewml#UUD-*mzxhJZF
z8U?+!b6s#Crqe|Q>&Fr?XCNf5YZvz)H$pKi&X0sg*jiHk&;*v&h5@>~yA~Ja6M@w?
z)P)(5pa7Mh{K9}2hm-v^{WtDrKlOl$cFV=FlLeZSxhs`nXh5;8$~bb-{qhMwC{t&F
zOi(m?m3~YFd)&JDnj$beQJNX0f}0WZdv(9U%xPqSzWTpWhvtA4hhV%Yfx<o{PdxS$
zn*t%fA?+skK@=*|3IjtDB`C!mNAYyfwMp`_{t6Z8-(UZk&B~09(->dGauu}yf!X~3
z;2qBuFf_i1<vx==J9{)FJ(_fCnnduH<zd>v5mfNXDSL(L+!rwye=ffGSXkr3C9!N)
z^G#M63miU0%=J=oI{28%iGOE{K9$hl0M8AySn2|bON`H3Ty9g>S@%50IXw5n+r1x1
zdC<S0>aj})nW}c0h%Ex_O(?>uB_UAy%5XsMC&+trprM-xVss&AQfk*9AMR>YvXG~{
zSpi=lZj~Euk&}oT+|yIYMJh{#Ve}L}d<8Qb+Dhz(TW?SPn#>sU%nDQkfN4ccPu|df
zf#lV?ec`2Q645`at2pxYPA$r&upKk_+SBGs)R`1)F`PD9V7@9vJglX~1OZP+syqr|
zzTvz+J0v16O;*6Cy!@kk?Hr^3*xwn-97NbH_QkrF5LX0>Q7g_YPs>I2hq4`v*6kS5
zf4K1ms%LcV!fq~r;8t-Xw6mEd(WEq~7t@q&^?0#^^~32nmOaXL?tqGX2r9`pZK1qR
ztJ*z=0L%swK)EzG5a_EqIa)@|M8h7kGuo=GJvB?8=y<?WklEoBwX2+NYO7q`B+m@N
z0@U|hn*76{Tt0FpC8HD@aH=-;Mk6XojM`82_%jzwzdvbe^_JCR{2h6P{7AHq3pX3)
z;4VlC{~;oSQu^@rQu!tXEV%<*P3Kk+xyh#JeVM@Ov+9T<ST1B9e^|#Y>s%R^o;{at
z0<b^_MbBD|O<Pniww6ZDu;;;-$=dXiez01vY)75?@9U$wJmDzl<XdM>$yi<VyMczY
zYMxZ3VQCYoUe*Gif~-xcB4XipR->XgbDWK!L6*S~RhFz6ZuO+Jm?I6GaP7IylSKqu
zamXmUsgPMHIRuUVvf(EtbLKJ<^pKc#rXwRoI`clJf&}+nAV-w;0`r9~JDFa@7>GF8
zh3wlTQ_Nl(Sfo({+N6-sRr!eZ3tBrZprby5uESP1w_eSwUaOAUA6nIcRJGcJ=wB|S
zr@R}>&|L)tHea%TF^76%OH28y&6tBvh(={wnJ|#1`0##mb5l<bL7-U`BtO)H03<%9
zIbCtKKTKBDi4jSFhBw!4j282ZH5yLD#|g~DgBa*(Xs4QA7G5AARO7rSU)w{UFz^m3
z$HX?SLg0**`Z2nvc6&(@j=L)Q6DNeD^er#EC%-j-0lm#qY%`gEhP;4q{zAkr<BDNz
zRZb!DVf3=ZL&64^Zngzs+42osbu;iyc(4)T`s2yKaygohZK)6b#%<^DnrviSg#9=1
z`YW_$QTGWP+@u_v*QhyP#%Lf3@P_v(zWIX!+5aQ>5>6YViA)>}xtk1QeWqs*<(xb{
zmSVoXh4RJt(k*Y$Zh#neL(INv|9eYPj&OGl{*8wxUvrN2$psY`A(p%wUEx_B=h9Ah
z;2C}y&qcCMS6^pP#v8NvoQ`Q5`T$P+ZR82mh{_Ezbw?~!M{IrcZ{b;=2%mS>rn~9c
z(OyC1-VpM4T7;Wg=84_`m`|v}cOBiG?R}PBhV(Q);%QWK=v^<E#ZbTpfd_L06VguJ
z4$8c{KfqrX7L=y@sO+no)QH+8$-=3$pd-4<i2L**B282v-$x4R!v==DYaGuE8CuC3
zi#j$FOU@R7Fl>eOqEA+%O)*b7@CZx#Dbzur?~#9kfxc{mYi3q`7i*RT?hZQ~+3b>S
zjyx&HoZc;pe<;ZyBJu0bIakN|$`#|T%l5;Dx2myMIPXnv{*4aIt%1_`ufm*dF>r%^
zyPha<Uj;l&HgU;gh}r!B;lW24ymP7FVoQSZNHfx^8tCzyl8t%s10N{OgPS5uPe04~
zjjN9!AphNU{JAzBU;DHD^|QnOJOl(~vmhbAy5%5=`Yj!olYl)GdJ%21{TdR}72YxU
z&mdrWTo?2IVk!Xs2aI>D|7ArErTtfq1&@X%Oc#V_@&|$||2ssBEK$q%ObQSP3Ig!|
z&1h2VY*rZ>^GCC%O>!jy&VO;9<DEC;!K^lxtSq>*`Ag<qO9Wg?KE*AvI<~!<6XNM+
z7nm;*Ha5GxuKAAdzhYbC&D-zpXPIwq`_12;jP=<{ecTsfS--39C4LXO(PUq9P-lyM
zV@B}{ft(%m4tvXgt2+op6(m%D2mGvoouv>nfy(Q@GZ~Cc<S%*;`^&sLTtu7;XNZ0A
zZCUm$?sm5e*&1%a`A6}3qcydUyo{+cB(f;I7d4trOLbAal=$4O6Y7Ao^ZEi>{Gv$7
z5l*Eig_%waW+R$+@)#h#?Z`47m$qEtJTefji+WPtiMm(!?t<@`8YU*A#18pqle4x0
zt>$S&jb)`aMSi+We0eY?-w}fAcF-<5x5gp?AHUm4(%Vr|ovqt}>^$Lg9cC$~i_*Zt
zPu5Y$Js>>n6PsvtT1wiyjR<dNwtjnqyGLLsKd%E}g+bqjtNVsRY^4ofwiIC9RLD}9
zXWz2k30+(I>%KE-K8gLiu&e@Ch?!$-1rmPAE&{cC+n~A60?BF4eh*+A>T+QeCaGsu
zfu35Qi2(EB<ZR2-9aN9#6kemjXl=#Sq2TYREfl<|(WdhnuU2Wi;)}Eo9B#GeIxdgW
z;bBQ>nE*SzYhZ%lpJW}G9~0D?BuW$J)bqjld75Thlr;;;ro};RE^>Mt(&McTiVP=b
zDW`0=pJBpwSzp>;9hTNHFkN5d0}Z7*TZoU8>{u>O5@Z#ice1ur4Npy)Vg=m|q~LOH
zkXT+PMAj<CORh<lpn00wm;+hdOsRVXS_z#2DVbdKNUvAbB`hoERZ)cV5(o}wc8vJV
zZ$Yv`&O59^-dGAWI6aVWWhA@>v-Z3PnxsHnX^UBrlm`Z9-*iS1V_b1%6zChSSzgRR
z!Zy~hQs(1<<3M*P1DHK6-r-5Q7=FlV@{pXc&?x7TrmQ&1Nnp5t9Mk^5JzR+ZTPO<S
zK2G>ZU9zn95fw2H#k4cXIqJZ?3dHguH-tnqi4)#t2VaGa(Il6i-<Gp5;f}=Jl(uLw
z+aMy;6~-8GR7}znB*c6?UPTamTbWmkz`V~9mdcDdNX>gNKnrKyN?!STbCyDziq78K
zK!vVk(zkTcjD*VVxLcS}X4)(^UC8ON=e|b7oONg-&Ye876jN{QHF&}ZGkOvKMy#%<
zGytYeS5i7p`0<wR_j{w6&%EU_Gr#^E6hH=4H=%}IB_2uRl?!M0c+eR;=KEn^f)DAI
zyb*zBRusauIE%o_S5uqJJWb*KQh0!-r8=TmT&&zN>e<|i@s6lx2Zc+AX8=~>-nCut
zsKuh&zfh8+MV5_iK&5<e25}#yV-5PX3!=qoXSV|PdT}8P=%=mhp~8Bfsug0d)c8p=
zGgQj%yQguthUSYc-E^#{D*Nyct2tGPYkOza?^*hqvZq><b3OY8><p*t3;+hisNnY3
zJHzPr#vZE)AbPkv6C<w{vt;-4ypSNS-lVssB{od`!o%7#UYUf3iVO~d15UUfP-+WG
ze{3}RSJ+?k+<XMZV$Ol9bt#vg_95`4ZJM@2g<3-1$-m@{bo!!c*sv5Cehaj*lH?lX
zzuS?0v3<d>SVl!Tcx*4t$dA173|Z5c(7S$vL2}RFn~khtY8Fn5Y;)RUS$G{U%iI?9
z8L&OKL`ht}t#`RN*%aJQ&XJjm4Q$dr1-gH0rbsJ&j#chuwNxV($^83O%*NwhgbZ55
zd8%+AP)%jdV=z|K>$h5rE1JK#S16Gt0HL;IzZ3R<6v5ov30w!QdEI_HrJVtFkHp}c
zBJhS4UXWK-&Ix&MWRtp@5m)dF(t6|cz=@T2g1(jSK)u={w1GS#R_Hl~YYX(8S@<2u
zD#`v$Jqr){D7StgW3M)<jO&(@XU3U2iBydKB7B`@(w)T@5OF-(mq|bop3$&#DabM8
zY4`{O?Gx<um-9q`Gct(W#Zaq0+sDdqgbhC5V<t`=GkG-PS_c}#dEKK$_!7L+1dOSJ
zp(OMcez%qRpw*OrYc2;Ey4ni8QCQ`YUCtNzgfvYjJaHxPE6icHy)lv%^r!}KbnctH
z5)vmi`7qdu&c#TrP4QmFG&H#^TMgeg&2HRM71%Q5*)q8CO3(HPuPsZyVb1v`HyMy$
zE=#>3&h^NzaZ0{THZ%p_>dAV2PR<aG&&wy}+fwJ*zW%c86<hn2_{3B6L1e|4@bp&n
z@!jgT<Qj4OQ}rkEB}K``0_RCdPh&!DvtLWIE`^24_7!sG-=*0n_4JEp72pF0yJsk#
ztzu!WQsHyitQqjZ3HShS-fO`8rf2lzmAiVqY}RP7tM#I=dTqo1=F-mEGU2;l+^`L>
zxSfXLv=I$PkJ6ueV>ldFO+HcmO}>d_4&7E#8P2?~-f?|*w(Fvxsh(?zd|uO4%|-Sg
z(BM^eiRezd{m_*jThCMWePO$=^xt>(Gve8@f3R|AxwBROg1P@;UY>0i&3akY`8%1H
z3k63tqNYP<0tD8VWq%T<z|DSFpWu2W7R*CR)|fqsxK)s!#Gd{O4ePrHb>p(3kKo$?
z;SNa@fBDls_29<dfIvMTc$GfDS7vT&FvwC%TD1pO@%g{qFD<s0>x*A0GX>*+AZ7j+
z**BT-9}qQe$adnyK^B4+Ne~1q4lac-3q`s;s<5z<;Me+>DIYa1AaqoUg(($~D){Xd
zY)!ked5gwUho<<Jp(P=&%u*+^c?<a4xw#U1eQ`Xu#?|GqWzG1qb2=;CG$dV>RLS??
zg7xk0^4jO=`LY{1a{2S^UFO@-&M;Ed;PK(UE2hDWeJFT)+q}QFH#0H3eX6&&)Bp#x
z`L5k-o5Vmjl5X^y>G%g;4;?gbUjDfMB!Gk#8R)JUXfPy#*Hf@(P1AEF2urkNubHwP
z7fXJ3D+m2!_dE2D0)+t=Jfc|?_1m%#B19fG-V&qIkYV<R3U}dwN4%VcI*oy7JiED@
zq>xN@-fE-VkU}K+x2T9;m4FgsLI1`9i<k9Qcagrbde(}aJCI`A{Qf0eC|Hl?A9Snj
ztJ`{Nf`yNqoV7fn$48u;D|;%uyO4LAvlubHOHbA3rVudk$XTV@JSw}nli81PtCB_h
zCztuV2&eiDV31G8cI&w1F@y<uy&ZX1P3yYl{Kr=htig$SGY@+G18Q=u^U*$NiEaKY
zrTrc=EV(ZaRsU$29F@GlP{(7Rqg&$n<<YRT)Z?6E0Kd8x5ZSJQ(^Mf5{nWD7tUj*I
z<<>^W%)VJq58phW=@8wMH;VypQ*7*0nads=O<H^PYhEg-w_3W>N{b_BH$P%OumFhJ
z6df|$`~YCI5jFmILN!T}4$vv=aC^h+URRYfiZX?ap>^|&zA9tHIKVrkzk~Fd9fDi3
z(5ylYON`)veAV+Dd;qq9nUN0+MrFA+0%IbMp&S?qC~@FnMRpquxT0=@<mTJ!EYv74
zWSLWn)CELmyHwdzE8O|Z&Gjcw%F;E+2l&<w_wS-voz|-?i243NUd9Um(HNc7vJ`K@
zS`F<WPQ50^?i!_rCpx1tHqcXZG8bQJ(ylFt7~zKk*wS?L>!pR{({@#uC?xSk`sB^e
zMT&M1Av=70^=e`^j;Z+3B7(cUsS8*GMYIczh@p#*y46O(12h9Y{R&0B-3w7KqFfz-
z20W$mGl_5ESyFvsDRZ__m<of~Cr|h}YSoi+>VK))?Ay$V__M+xjQtIrBqRp&R5J(T
zu3Y9e(%N(;&Y0e~$&Oe+kUSK%MaeJ1mf7M>Y9MIv&y6LD_EUuiSKO`3>iTM>sSY{}
zn`f=Jk%hb6B6X&7!s?RyaUaLeZYt|I4Vg`_)O|7kRQrT4j%-mC*t26cdTVC^DRy}q
znFC}^+-a`01UA0j90Ive9wg)VFfCZ5L;4@LI-Q-)mz+P9FZ{s}CceGn6ciu4l#0*=
z)Pz}m55s0T=M1!8H}02BpNV1U`b#mA%&u~B3QSb?_57{dSEsQZAVrikMv_Y3&UHt<
zm2Nu%QjihlYSie??!8ii!Tc5NDSxM=-)LKoW8;j~0c1WPPurW=j_zCWjmlp`A?693
zoAJMgC<fG3lGk*TW4OY0`Ewrb)BCrgqPjzG44IoMd59Na7fn|idZyHubLk}%r^-H#
zu8MGVzAlL7q)djBa%EOe&#2}k6f5wSJnds)3Mkjvu`!^~Y!NOwwg^gVr*JliZ!gsm
zUC}4DTjA+fjLQ_VUOqEP@xLFL?nV7lC=ASZb)H}#z-+u5Q;PGor_yws()k>APfyj@
zulJ;IF<Z`Ee0|Jk7#%va*n&K$ZU!V8F7X%(UD^KAcd8w|Op@XzC(o3HZsSFCHehP_
zBF(Z4fMQXbyRbT0M~IahV_2`^43JBnV#itUBRWrXr<m@SBxCO%uI$K1__}H4zo?jI
z*}9KbAFNeYp1<kwqzMFHeRCF;TA$9oVA_VSBNw2w5XiFNfZ!3a{H~sFbRLY%GWwpH
zSfshj$z~&cnD2|@Iqh^mJ7YzxvKC{r*po|lc>OmJgIm6@D5w*eSu@leIFViWX(DxM
zeh;<$qgjuZI0&S($fUJ{q@DRQ7h^otl92;Y^b@bzwUMhL20!$XRi3Rfrmry$j@CQ)
zgVh8g9HTbO24#GIuKIq^P8%!aA^=~_)Jq&wQlWyA`@(MCQ;qD=^4em&{#{jrG7D?&
zv|`_WX?2tG$pmLTG~C6t(MmVm=NshDO*m^g+I_3WDScxFO+v=%qjdHAh<l_waSlXg
z9b<u*e(puR0-^y3D-HJb2<e5OP1tEgadzCQlBy3t(7+D^saojbqGeIf$s#w*2vOS8
z>H&n=5V(4x#XY<U)XX|b8<4UCJzfxYWpE6;F)arSc%~S(w=sTzG0#)jH#-#43v8o}
zA7pJ3gZ7FSe@N@$Lx<!EP`lm5FNAtmtZSxx0nFLHRRg8rZq#=(A&9!g>?kW?)-ONy
z4bgS(?c;vu_BAUy3<A{-9sP2?9cAj840*4Qg^d}B5{9I@w3q$KULxSHapO6^X!A$K
zZKWeO<QRlb`;HGT7@S`asIbH4nAHCRGh2S$DyczQUDlF=He@gyjBG~*swTA9xqm7-
zlf;B=xG3u<?GV38bC_El?=eH@B`#E~9I>}GsLvN-FEH8Db3pVD7OQy#t_X`699l1k
z?kaGzrS0JxNUdiAr#^WF@2!feLr`3axTKcLUkYD7&vfA14{Z6<;b2F50qHjfrNeI}
zIi^G%Ic$WQf9T{zXS{331}~#>c+$Mwj3e6Mi}&ng(Vq=V+OX{$h${v^G)a&O<azx(
z9lqfY1(sxC{aB=+1#@Ih{4EqjH8|NS-ZLs&&7#2^>cG8vrV(3i4sjsajuin()ha&n
zSS7yomImfDiea_^y`k$k(R>NTzXK36=O)fBWmZ$CX=8vNv7#m^MMS>aL;dCvMne2!
zWB|e=h~y3C4mH3#iG-MZWEl3&D!@B|B$sTY@ECW5iA){PJM0SU*b;8%2{&?jN-|Ct
z=W6#H=+&8NC&DX3@gd40NHL8%3QOkUFR4$FkQ#PC!MlfvE&|RcH;f`@9F{R+p(D)a
z%&32CI1Q0OW?h9LfZ3vY8__H>s9Bu$x|}F>Nl6W4e5C>!6tAhMzTqwQ$T$B|yv$U6
z!&>Z-Yra;z?97c?Bh*ST6^~fM9r!sqfhw7h8#k*kdSYSv;KcHm689q_YKy$kAaV9r
z8bz-~!h4F;9nX(Z;;BZ8)pSTx54e%LT_N?TZzBR|2e~kJ(-5!N0q?Xz|Ds7g<>Nj{
zMt-9m{D!$RfO!2C!0VIae=$@O^~HJneku>mMeFr1K4Ks}uzpHc)?rQQOqF@E+^B?=
z*zTtp*YKZxXY<M4O(}#<)`RV<#?fBB(f3Y%nHANNvT6c;n~Etuo2+0{RZ;OFQ|Irv
z$#Ju$EE&S$*k4=?EI?`g6c^^BJT?b6BmZ>2Ipg*3+q&0aOpe7L9cLJEiy}f1V@Ag2
zP##H%5|ADfWU(}NW#Z}cB0tzoS@4sm+Hs9bCQN4pp;+ahZt-oJiyP*m(xDP%v=YW&
zs+h^4OhA&LiD)f(DuoEuX$e4n7JQj2>Ee>oC0T`@>{psRJyh)os_ad|bsYNXB)pkK
zDFRepSVG7pZImDpQBRl!vH&Rxf3RrFh-<_v!Q(b3%yOHLc$!P%vmOA=M?&uDMC_)(
z9OdCgxCR2Vc)&<F(GQv-%F&BbNe}}rNJiuXF32Q_g`i*@d4&GLvbg8?Z={Y06fc3b
zkBV|KLLPM4ykbLpoQ6Vru)z<(P=h4vLowVE_862m<RZKzZ#|VaWFj~d_o9p3(W$S-
zrJ31%K8c6qq#{x^$wP{9#zmPyN^cG_A+e_Hm*lJIr{rA3t$U42y|ilDflf9GMbTZh
zBO?S=J5teo3hx1w&O0Hj1SiAq548`pEP%Mc>GbLKI*hwdn!|WdYh6%GwP}0A;Ue8~
z<Hm#|{J7K$4N`s8P~(ZjzyFKu&}0UNWdBtSJEHg>c<=u&sI~e3_2DM6@tVreHZ_$O
zWAvNo%mzRd1}OU9#2M1O{E=~mPqlMp?Zn5hcnB<<zh&p|dBwi@|LbtSQ&U8-&LML>
z=M3{bzfW;Jn|{83$-}<!!t3=JA|Qw`HyKh%cVd&ZVGS@TCqz-XD+zH2q#B3qnL!r9
z=||@i?W4+$Jho8OO0nRI5U4PVGF2Oj_YsJcjSwyyh8?tNv8Y2q;qE1-m;p?Fxakd;
zt(=V6+{o3WZ)ndSsdGkkrJhZ#Ol71PxLpKLVX|rTmcov+5=3UM9mNgt)mvGL4L@CU
z*(OwI-Zia5c^u~CABP;#W_WnC&e#8Ti68}-pJT|Gh--pu%IkoDNbf}oDJRgB6YDS`
z>1zbjfmh0y2`bAVNMHnCOkoAfA0`$?#@#9;1!(E$T;Iwt!th+=2N^V_xV*?Wgrav`
zQ`<iJCq?RTrsPyn6L(#^klbk4Ugk$1{4eQqd{eo!VTCYz0jA!P7>>iWB@<La)1a<p
z3%;CQ&Vfi@2FwYS)MTD;<<w>w`K>e*meEw;-gzo1?N|5aR?3t<hSvQ@45TS09q1Oy
z(P5)669F-{G{WctL%Dy3n-oDs0fy6PRlonKc!NM5Mo+w<$Pd_jllu!TxIpVJs62W#
zIKWm8ZGCsUO|gMj3E=G@gZTRT+rgYqLesjC(&#LNe83|z-)BntMBHD;Q+P}2@1UMM
z<vhBZ?N8L<b$5vbw|&h%uRDZT6U=P5yPsH9STTVCqdzlHE0Nq<xJ~&#Jfj`C#Li-G
zeqxlU8=P$HYja$O6}U;bpC>-pWW@AnhMcO{0M4Eh#H`p`gKSD7|ADWQkYv#I;jgK>
z+C3RoH7zd9fg7-fxvFQUsfjP7ciDRAYF;(ftC_IT6UV3G_YrH6f0kl@7>Rzt;xyUl
zq#X^Kbz;J42-CQY4ImGc-oh+W#SknyWAGEi8l)jYDI$X&e7GvTZ<G@Cd$z3*&`akh
z9)zh@A9y5wce*?ncoNyd?0`9d53*_(dKt=$>OuID{qTzv9Z=5q4Rc)^9vA<zMm7C7
z!KRQ(QqM5O)UeV9zte57z;+QJehHT<|BEVoHr!L|WJaqi2EB7#q~SV3JHYOYMp;WI
z)_`KAp3qCOLa-*}Uh<60cIhPTiJx!S@d3^D^e<+_zK%U@Rs4gfKxVRDFUzAYx{}o^
zjPWwx*9sePGMeXbfX5vOJ=xu<Nc?cIa}mq`N9gZan6kL(O6y4@*xApp^4tQU4+QLm
zH%kqHVa!K(U5#E*<qtTYvt=CB-hsNmh{|WJn(DpJqzp5mBl8Ex+#TN9p>`Cok_oPS
zqNhd$$lVY;f={-Xofx-1C(rYZ%2LxLR%1We_Wq*&i)<*^0f{gzy@UlIQni)Ov|<p=
za*0P#fFnC-!GXI^F%H~Y7B^4UKGH|fNkjTTnl!bL1Zs(Xe*e#jiFfV$huRmmCh-ep
z_<!1r$ogN5;iQ&_J^C@`XLW6|n*cEm0+bCMexU8DI7ezUq<nNFvp5t`>1T=6iMIB-
zb&;M+GfUco^!!85^~~IZqzrOG0>=uQ9hj7g<@~=ytI~OE&xxk&ucrz3yoq!|&#z{*
zhB#aX7Z!x=*6sC=EwA3^t>?EK&~*39pvpIny@Vh=cXZ+{x;=V^jh|m-xa66TH?c0c
zfUvj7*$C*D8(03WK;-L#flghVlpDLQP~>aOTYl^<#=Sr?emWyu{=I&Q*LP-q?=0lp
zxH^p70~%tCTWV~6`h2{fuYXy|h!S={QmDDfieJU&ATjT$;At7nP)1493nPB-cw~dU
z0cunOtXnnIQb;;j+F^^oNjpV&XUhxrC-$9w9G^)n)$aQ#SWi%hd^ntPYOP%nW};1b
zt;;zfiw?;}LW@810C{pJ5ty86-)m4Q2{e#@t<m^h&blmKz|+>J;i2FBiMHIl;+%l}
zWj{w@#k&_B9OKTusVt`l>s8u0lEzW(Sy*C(D?~0^Ti`I>sYB@$Q5+)Pfdu%4L}f0^
zj-SB)>glb8;#SnPwQ<X0@8l%m%E?)>vC(#EwsQosZOJUIcUNUco)T5lp)-7zTY;la
z*+axZWzWmVKwFBbBvsbKIee-~Qcd+MFM+tID^PHMj+HAH8eh(eR6ZqpgY*#(n@D|S
z*W1L7jY5?*qmxa5>qS-VCx?5LwwBPev_4|2y;B?{*N~2yT9#y}D9Pq!U|H1UwK)U@
z5GE%06+^@#P%GiHe<!CwCAs9rQY}m|KXIOlY_aYze}rlKQmERgIIzVkdR9qAPb9BG
zT6RiaeN__zDwO^-lpL|WeIH+VfR$HIl%DvPG1Xx&DVVcb&tz537+Laak;LfVblDMd
zEERg`$=)5vEMkDtr|MjWMnqXr+8KZpg9Z;FM-N1#@(jbC(UapUKd250g0v;VoicM-
zalL?{m}r`37kk`;;AtfZXK`|_;HEM|R*I*t=MPLG9Cv65Q*{Cl!cg%NWam45$=zPy
zrOM;2zWRVt<6}n>RYR}9+$oj*lam>co;{taf(R80v1jt`tqc&!7{F<kYl)`j=G;od
z3J+1cHZ=U~q3E3_b)iJ2zrAoaHt#D6G1}5oHINDR^UoZvC%G-E_&ic8CWKUOdc!i#
z1QGPeR>=6LfQfG)RD9qmykv;Un1XMQ)qxvW00M_09yXyW(05KXM(jsyaqTL8y3xhE
zwHkRH^K(lvZt5b&(+}`_2O@7{%s7JkAO>PzBIvx#3_%mOu=2(fl1;Hp7{}}q^oW_|
zj9!7MugfLtM7FyOIO4ZVOSi30`e57!`R$$~fiZHfZ}XF*F+cD%+0+Fx6D-ryClDo$
zi5<|g5N>>VmPi*5nA5Qp8x7n-7hsBcaG9Uo$=dcqPR(C9at;Pm5ROrIycp~so+I3~
z|McnF^DU+jA%|{0J#Xx=B5e0Ha@B(}?+D5c<(yB2p9%#Tl`&zLOkWtt5E5r_g!2yh
z023%f=T7K{45-+(<sS9ivQ|fkRR;L1m`)}B#9voC<bydEDRIxYbPQh)veP0DS{VV|
zu)w#^52U(IpcE|BqGnZoWp<WF6E&x~;}dO3!|B;pO6zp;s<5OZbq)G$kcCZ(Zu3jA
zG(E&@hu@=?O8g;5LiiND*u06?V!GJGyj<^xy5+K+HH=6+T6Be{q@WJRjYc>@!=ssZ
zE~M<yGsC!~K2;7~$s7eV?3~iS%u%Gft@SjUt;nq{Vr_YYK0<m}Jk*HRwaQR1-u38J
zSu;6PhcukU)78JfkVEs4sx1Tk5UB(qd*4pm!3Bvp<~?QBIue)ktj_JURh$H;DXB`-
zkC76(1JqeZN`L>MndXA|m*O;n59|&~@HmK7$C${!@jl1(%#78?OD#l+n=VxB`6lIy
zSA54>mXJFn?|Ce5DMYL<<wQy|x@OnFkWT=<BC-S}#USGTU5)H1;(rnMmO+uWTecvD
zySo<d?(XjHPU7xRxFqiG?(PnSOX2QPxVscZ!SH?OOyB8_xMyNc^qtOM8JQXR=h^Ri
z*4k^!jcGVI!~@JuJJN50uq#rWG*5nd7pl8SQGAS}U7o0)%@)*`+E2~75Z@*x)@*(&
zi2)fB(q@b!-oO^e1jU-(_-*6+@{TI7pvGud6*n#V{k$>6sTil2&w`Ni6Y$YK%ferr
z+K!!))sm+Rqa`c(I%uxBLkEI#Goh51y}!tI!f9Z>C~^l@?*{UPwus(q@$kd}id@R8
zwFIIteD3Kg%^Mos5UZx!vK#)K6x$y1GVjRz3VP!k{w;}qO=Q~gh9>f$x;QQ<TJ+}P
zd0?0?|4z<xxRbB@j^T4x=Op!B6XS}_pq7vu?8zPz^WYEefeMSnk1&fiqkwls^59io
z&`#caUw~P}CB`yvCRTxVo=w0Pg{SlYsv$aL!yt-0VNe(}Q4|vSz->_I3p&GqP}dW!
z!+`FYw_E(|)o3Wxl$Vb+WAX^`x;O8P5=w93Ntc+SIS9rPcc#qnFljucbS_S#yiU?Q
zUHCLjoAum+P@;YUS;;ik7fkm-2)HAn`tUD?{eyOPC^$&_0g-jkXA<_t2|wmPn*WBx
zD?@l^5zzgO0KJRl4beP<4KZFWzq7m_o1fge9sXBZgP2(T8w;+LjuOKn2H*?LT5l&7
z)R_WkjVx%2icrqfTEKf!z<X4{dse`ET7UsXKI6cT0C~CZh^b*;Qsaa*(!aR!!Oh;H
z&)&l4qrv2(!3C%wr9+h4{?_T^ntdgkZIRA*hAnU6hEqBUnv7H)A)_-UFE=SEw>SiE
z4hmo(&;J2!N&ZDY;fpH`+-wE<Yz2J2B&tvx9SE+(5HU!eC`i~P=}vtB2rdhZ(H1DE
zmVXa8Q`CrLqYFqCaA-L{dC7#mN)$miif1`Mq7{*_mC&vlC8ru<s~Sh(sGoSblM3pD
z8gaHR7!0wDD}Q{=Ngk1@(J4T<>%>BYBp%(je?&{_WGw^T3CoH2e%-!l2rBl}Bt4w_
z@QG=vd-IIX9rlf0&G^am7b4*Y!4f|^rBb?o=dNod@QfPLDC=t@y_%%1@_1)`keey_
zy)u4VQR<d4-j*CBt!11z^BAe6diVzCAnbZxd<_|8*(G!Wn5zSR3Aeg%iUQNSsIDr8
z+P19ZVfy}WjNK;72@nRs3<%H8OysR4%_^&2W%lP?PfYe)Jax3;9!-D?CjCkg1(HMk
zD5nY9)E0V;b@q3OiN>s>8n%^%ZiKhG5XxE6dxp&4RtAwsyP|Aud$cdOksp7r9(fTO
zg0lN0d|~+i1Ei0e!PM5+#id8fMh<Tc<Gr>4X9K=}KSW4Mib6k=95__`gMpZ=IWPp>
zL?p7QxOiheivN53Z8R?{h4Jsz-kocYR{z%`6+c&xt{Pk^PW7g~S2e>k(MmOS^`%N{
z+DHEq+Xa_8sMLT64Q)N*oeXY|EAHdp(;df~du1QKdr%+-VRgf^k!{0H*s3O;U7&=+
zuK30WKUbr=(>aEi(840usE*Jlqc(mhXGaf;2*bC6QbrbnY6cRGA|@AVA+OMyw9^2G
zxmx$fx!Af{70$LxcDG=2Rc=0)3^V?kMsG7OGnX5jP;_G!qik1aDJAqu7A9!58zg9M
zKgJ;(6dQ4}Sm@whp-wLmS^r_Ekk#tY&e1jxCuw(;1t-yY!qc1NLYGOC`u2bm%;vZ=
zrijl^G?{%|Yte2;YyOJe>Qz#>XP`xgt1{+z^o8!QV`f3S%*YI3<skJ}aRTL1LSg+A
zOQiwu*V81Q;jUHGM$>7-sTb+-GeI?Evq2*fq3fMlFR|(RNQa7XrqP{M6xn!m(*80y
zrQs<zvP7{tb4R}@#I>RL+?INdk*i0-XiM#03SFPf9%lBUg>P;b-$WED`<J2+v+%s$
zOxDQW)750_mQneQhu=84<;d0aGO@vE=!E{$WG)CSUrM457#L^86h>kYXkP+?kS6F^
zXO#AFS=m~N@QuT#oD><jMXvQtpgUZXwD#>s8Z00R;C_<B;*f@xUGKj|&aeQs9>R}T
zpX1wQkjaBZmx6@%x5XFocmdwxQH;4H@$f~LNQsk)`A(+hIXo!zS24+ahVh()0hB)r
zn}B&3#mw-6?fnQFZWi{_WBSvnrM@(f!Ld1<!6B<F40e-flvXoz==7xgi3GfDjlL1@
zCo)`?c=XA2*7o9q?d68wuF8Upq4rkeZIaXY(pdTGYTBYiUi7}Xafqv*#ZlE1R2{hS
zohNT*Gn+-?HhC<#g+X{@@DQpvfe@+O8vBG8JHnx+60;ADdmB6x<giFSPoOLlj5qoL
zVkz7TMw%_uA9jmOUeY5ux;2JJos@^U8sVpkVr@>|@!Q-+IUewz;d{RS!FL-`WYQ~#
z3>!#Lq<Kk>RNQB!5r~>m?(6i3V{L|yxT?s?wdd`<lA7G)DOGJzy72<uYEBl6{YZ4s
zITbEba=bA1woM|8NweLdt1fAFLi1Yqu?_G|gC?NL(Aai_NMr^sGwaUaLD(N_La$g%
zG-NpG=?`Pwh%@_052xK?G#pjY)EWy7dv#av;6KxNzV>Ev?pvxiSvKOhtRG&PWQ~bb
zcm_m`81`Lte5fbWXn$0G4>&oFcq|F?9!^zT`q&ASBqTZua`r0jvVKgwP`m72ZcnYc
zdrE)`9g)FL<TGfrveAwzr2?~Po23Shw!NH)uF>k-uXV$zc$A$@I_8^<s9DCkEgJjU
zuWxIcI-w<&vlIEVAI2dneP$GFWe!ABf|`WUle>D|t~CQ1-v5+eCySpWfd$fAn_}>3
zk#-1S*M*DLknxx+yFka1ePZlZeV)MXQ_!?1G%>XfyRQs|cvi7Z^gCjHjydA|0*Unr
zlBM*P7}bIk8hcTWpvWKk5Xz(kz~c6mPp-L5e4!I1Nx%~w$+}Cp&CUSFr5Bscjxf~J
zDS-ZDh`3W?R%*F(ESL+G>$8ZKm`~)6r#@}AI$yWH$TJ$;*qdB#g%BSB|CN;<GqGQ7
zlqFg17(q<*PsKHfJKC*{r8R;t!CdD1d0>>=z_8l+g4A{p54C|TebGD5zy;)Ln<l@Y
zP<p}E*O|1jdqDZR{KaB#*w#ASY|Axi$<|1~Q=wQQO_n617lIch6SJ2`G&a0&bC&=<
z<rb(a?p_zTpj<q9wvtdDX*d9*`@Qyin*=UNMi6Ip|CA#t7#phnvgC{yV<~v}K`S|1
zxDc5}E-E-T>Xkze5IBuhKmd0QYoQ?}1&dm{UofY;D&PgjOOZC0zS$8%(clR)CA+%R
z5uLh0AiMgfT5MiaYTyfJTtRO8FXG!f)5sIW@T9x~_21l2Hhtd**BK+S4EN%nY#uE8
z2AMB8PZs>5WY@3BHTS~{Galf7qQ@XDT(beCTq3VxXLG_oh_ed}!&w^1J?rA`?qaYh
zaQYEEuL`2+>X5SuB`#%G5lpTSv2EIA_u!-{Bm=sdV<X-Q_AUr6&_san5<kRL_|k{4
zi67+19Ha)SF+?tr=IvVEM2tRr14n{}3GQ$XH?_NN;%qP*mqJ}vD~#AXx6kruv|=Kf
ztmE%@@~fme|4`$+$U$8Sd1Y}C7y6kf3IaTfk1}ppt8o6{nh>rV=3DxU=R9$;S^G<V
z4h6iJf0v&7jrC;pkt)$OZj`vJ_w`6r%#xKbZEaKR{70ky!9hqg9Jf%1UqUSjBtm&d
z@W@y2kAjk_&%c-czSI5X1@);K>U}EaJDRfG&w1L2rJkrA5^cCW81CK_Xk=Y>k$Z{`
z`u8v9Dxf1&ZgMJkgYMm6g!<1v`8^p;{;^u}YRoHB<Figh3GM&?+nw#7lZclzwiNNz
zKf59R7`dlz4an*0(6?5pKvWVSFNzCP(<$Zu2&0=fk{bg&r4pp)tW8cPn*2<9M|)jt
z>&20`WlB8h`iNz|rL8%hW-x@a!#x#vVS1kaY@CnV`CO9z&ENNJVFqNopOU8VMF?>a
zRw9Wlj=aEFPDMbDBt{ojK*oqK0^C`;c~1ir4VHr3MyB6Ry3k9ap8)7?fUwDK?@+zf
z6r!(pZYovn*hRAp3B*=mjV0~Qp7J$(fv5Fa*<hMXJWj2#Ub~6X1s;MAxU}2ZS`ZLw
zZ48uq+V5u8%2&&<Gugw<e+N_68)sPNj@rBrU1@PJe<{ZL6J}tRWyT?EzK<czQ_n87
z%h`3G<&%ZS;lU9d`Y3M<Imj<xFSsiCWXjzpb+mDpN_tdv=(b0H@0La7z0KayGr%uf
zdp_h@uFaz8IToMY?GPzr)PZ<d0T^<wHj3W+X=SM~=BU(|nLLBb#0oxQjy)e5kfrO=
zjarx=q#lnnDorB}nerQ=jV^VFA9#E9fqF`U)ULdOlA35p1y$0ep_F-~pbTk$XX|Za
zZ5G{O1-o-S@uXbfv$2)E%U-lPU=p`US*LrB{0jBqfo+y2g}GU25lJmu`go=)Za-0|
zxW~t%(jJnAKFLhS31$UbS411?MOR!O9*5(s*w$Fbcfp;@eBL$9TmuD_zIT^>9wDdn
zQ(?qSY~-MKEZNH_wYZ1;=S-I{(8A}(8rMV$eJ2bP6tH+r#KqMDgHBM@MRc{=dAJrb
z)wf*xX|}uN%E_Tj7Lr|!ZyI2z$XQJ}GYbJ5l-XeC%MiI}ikn3<n1h9lS9xElik{me
z3S)i(ued-V%<KbWh}{$#`YU*PM>vAB4R-0X{)WW4R<-%8?R(3W1<aGrx+6b2XxwDz
z%AiG=9-hT%epmzCl44J~?Y_GAjb%O@3d-wA^TNGU8dUBPX1OO$&X8BA23T{_T=f-k
z=XzJvsz-D9u626?_WE_Z#7D(Cg_#ul4X!V9A(>^Vse$S+1u`YzyJiokJ4#&i(|bTF
zQGrj4Y)%4{l$azDNl(~NW$hKoFWH!l&Y2j3V;LR03|LMNKQLdUQ*~-_gWPZ7*x$gH
zH*mgv#j*Px{e(+;$NvijK{<LZ3vrz&+~%`e;614HPYmKEk=`8Pe&@8&2@3p~GW@C2
z!2@`y8-}bmEyp8z@8SaSs~iGW?LNZSw<IScr5lKCG0wef;xq6?%J!i0AOi?aDuXkx
zM?K+wUBzP7-;2;F=-s~0uCG(14dgqsl0|Y!!cCJx*^Z4s^waeO^x<;_mWPGlmtx0a
z<(C2Jy(jRL;awMKn?3?Gzcz+9!fk)VHbpcFKMwpbN9O7#?4C(U$3U98n4=%@jK5G|
z8)XjpW3<cvu?8aBpF4x#Gw=NNKQJzx?Vs}&|H?b#X%f6^B=jT}>hs!Xb2)8Q<8f-B
zQ${YZak!&qrf*INXY)AWI<Cx*q>^6ZS{)8GD_v#H2a6=NHa82&Y&?McL?38A#7;l`
z&ZIX8&&mYAuH7So1nybm_O|IzCz5tlps9}Rx2^AdyMFfDdG5-+NHh2|au1@hXC<h^
zj4MRBO$=;~jz)3^F)#yzHkOkk!We7-3BrEf%VDucBicC}j0M?_*%-bd#JPSfSP9EA
z>z)bA^5r@h{0;C?8VLi_3W$5TQNDdk#};4!DuT}jD84#IAu$tOK^rj$90u<V=6oS^
zPmAsX_~?vSkS(5RZ{W@*iGqcpNw5gis|3|4Dw@Xxo^OzYw`G(jTuGm0L?<N7VztbR
zCagNH%aAu#NKyEaB{JEO+MSJ$X_ZxML@<-GWVYJUnv-+0XSR^)!duVUk#4VajOMHr
zm9a{6lKacGfwLzOu+RS<kwlQBDzLz%9Cp)<d(fdat+F3Uf?U#wiA;hG*Fc+-qT(rx
zJ54CIM-+EQip6H``gRKcU5DPt>svKfTwMf(oT(-UyHxnAQDS0eImSYguQw0zw!U#n
zk+z(HSwZxS!Hw)OJa=Idre;};9Ea7+Bn%>@OkK@r?8Txa!6NvGQ8MzXE1h}tI?NBV
zboDy<beL~FAz*-PHwaKuD<XYUBuY=U7&OmVFE({WCz7KVxpj(t0i4kswGR0pL5f79
zwA`PYo3ryIUEY_j1NbB?AN9FTY|N9z!Ki$vPbwCe8X9pC0NRY@hgU6zpRy^PMjdQc
z>7q|e7%7vI^peV#W+-srVB#|ePqN{_QnXD(V{Qz@d=ZgfNUBpDte+cT;92w|lKZks
zxk&5QrH5V3zKyWR1{Ljkt}BF%wH}`3)mXS|yAzI8$KU8Y)|*D$cj~7b;qPZVjMaY&
zC9)cSxJ^}y^=dFCbuZ@Rr4oA5GUwYHIVy}V@(*Dm$q=(<vl454zS>TyBXj+|q)Lxm
zZ^BHPWMyU8lGyT8F*|v%CYQ`srt&Rz?o6mIMSe7T3T7|ThUQ9_IEXczDHW;#l`^QE
z2&ul=Fi<N2dAs`lq1{{;x2F!^oI6h!W`23XM9E$Nguxnu<f8)4Ks10Rd?g%^LLQWo
zvRt()L6|aEvr4tHWac-uq~3}}_~EHF(3`QVgnj3Q69;}v)r&lYbxU4)dw|;?tChKm
zipv@GUQN!DX|<MlIGaz|#r8#aL>lHBV}>S5iZ*XT^n+GKGQfV{Cd%}1yV{CUWteS6
zGkzw|_IAXU1c!4TbSpokbgLATQ)RNW8?AYe+n=CyUI#gD?}v#eUpOT)#<$#qTv!kn
zYN8?Pp)#Yu(68Zx*qJDGHTG$@i^-X^%zCqQ_Mme^MmmadZQ<?i=njj+mtq+Yy-t}B
z)#Yk4au@EYV%EJZ4(%7-zx%pUxIOTP?G}CwBFR-*=*<Jl1YDhdWBFG1;u}nWX+QP4
zI&V^c;jPVAMt!Z@)vtU}`8sK!)v@28-XtKarLsH-VBl*qO|?3QVQm`3t`kDfx>)}~
z?cObUQd9&S_ipUY4rV~@7_Rv?|H{HdQTM#2(OVey17DqNO_E7+IAzs%G0$wyqYuum
zmjwVd^>&686jE}Nuiy&s6R$xdNSM)iSu50ZI`Zy~F~#%`2;Dp0jbO<7UY%pN6ZW~r
z@V&E=wcM}Z5@&jPz&iF`34+R_P^JU!%b|Vw1i$6yqC$l11!tXlNCF>?g4{B<xge04
z^AVlg*4VqX_~`=S5pNuakr;H(j-emNkhZP}-Wge;#gyF_@CS|?Rxf<#gNDH$+~BdM
zeo4p1FXlCZr<q*3>Dcx>ft^jzPf>t9Rwac2+8p46ZT}tl5d5Klj$d|ao{&-p(S0)1
zY&jpayce|bA&RXUp<8^2%jmrY{jLvcI@$4p?pS`<&Khq$Ojd=iQRMe;xi>u_WTsKk
zHF{^)DGit1-!;h|l_*TVq1aOh6ym$I^9LC;!y&t!fm?@=THiaggy<dW@3`W#+cBCb
zq<I8#%0!^+yY~wkHzFJ|llWx!dIg;*6i9pFPECBaBjl1#)ERZ$sf#5qAkNps&wcOV
zZHO|Z_4hDEnu5Jo<rIXOyktNE^-!RAufEY>*%d}R>ih<Q6t&AACQ-S02TN9Q)Gc(9
zzayKVL|%aPTd%p#d9K#+W+^4VhE@X4HVgD@1?G{iz%NNDk8%+U=26#DxmUh@hj{b4
zQ2v(zPB}f|BBF?$TmI2z*Ffm{k<g`Mek*$ZbOkiK=a;io(8a7-&E*Eo6rmpLM$==3
zz$fy;KVRnF<1PKgnguD=^N>#!BOWYVFJ?|x4b@yP-h)h^)0{5ePr06izSs#Oc3P79
zz-nXMN`nTD3M<ivOfV9h2X#PP{X(^`6;k(wQGcupt29iiOp{)6kXmw(Ub>cAx|Uud
zl3F5?UdoeN%G<%NL_B0QI6Ghly(EU(=|*k7rvdoXUQA&DuE{X3`J#aDO<J@5kZ|X?
zl#VT{e1WAfdJFE5Q3hX`e=Z`Xn$*e8;!=^FFp{0rk)1e@om`Wh5Rskak)0Tlo$QdE
z2%acS7s+ym*&nLotL??NVD+w0VSj1O<YR{0a@#6CwDaTz44tX01)gsboM%r~F_cU(
zMwU<!eD}Ia66@M!x`D-nDG1S}8H&~zD172Ek$5D@*AP_)uvPl8RW!|2L(WywKv&VE
zR<VbdyKJYY&oQ4A>K}EJu53iA$mZxK>!=X7n1pxrFJD4#1c=JHz{pRfSWZA}w4~wM
zqG|b5`gB(yka-Y~+mUt1lX;+wFG<<6j`yS<Fi3>0M>3>*?oKrB4y75<rJk$9Z~zPS
zgzMlfjcx-w{CNrDfrHW5S`sprTG8~>`D0SYjaxf9emKR<2}4^?9@F7#l+Bn4l=cN#
zl+Cyami7fj)cN~NW2)i$k7k&iVvd4sty1}yVMC`)T9d4<wS8ab`RUxk9KuA70gJs(
z^{zn3i>|Q%7`lwjva9yh03D*(uU^#hwXQA`4clM~IP~ibXYv@w4gi*@52&pPojpm)
zJcpl6Ux>bky}<7gZo+-||6LT2HI4;}@tGes#QpDAkSYKdS7T>a31?$FfQW;c7un|r
zZnmys02fndD@Ru=2m62Ihf9?DWx$w`b3VIXmMb53g=YvKOoSLkdbCRN(P3LW_2;(=
zN~aV=66qgS_+GyFC3Bq@1f2-O%MsoKIq%K4w+#)x?1FkzUli9<?sAExFg8tK(3nVs
zi;szjrCFgmdU|u{l&2(0%;_OkvzM1M?pmrSFOmzK=378Igxjhq>%xN8N-oa;-Y@Jb
zs#Jg`)a>F9#nG<Y5?Q+Y$w()MqV;U<EeaV05~_~p(?vBtv7&bI$BOZnzqlSMhXU!B
zk3Xxd)BLlT^?5JK>KTn*yX@V>y9Z!75!w$bsrq!ej0;(A5k;>a%e=lo2|8|lBY9|(
z2o3N_-CiLWZGt#b{=WNRj`{@@S4nUVbv6X^ST~zI8pae&<sGlS$9N;U3!k98h2VtZ
z66voZj_)A>d{kdRKrli7)p_ZGfPgqSTQHhhIy=}|x!EzgnAtE|*}DRq?Tu|2-MQ?I
zU9H>!jE>F@t`4RSwx3@)y16ony94Z96&zfx%&km6f8bzGrsm}c&@i@j1Bg1<n_2y@
z6KheGSKJUn&z2Y2EVdU_!L>Y<oDWKV2q0Gwhj~CQQ6W!~C8=5&)*eu?;MA!jeH`!)
zf-4Vu4|p$+v;b34E+)+Uneu%3&4G`X_wN1m&pu^<emCPD&hmt3tTzs=mdDLNzbw#1
zlg0`O`>w|QyVA*NgHid5N`x>AKdSjq97*M(55XPPu0-iCy9OggGr69*=L~4i<nUY#
zQ>zjU_$#cEkW+EKSP0|Z*LAt>o1v2mxl#kZ_akXQs50N(5fMh4GedXAoJJT=;WAx=
zfj>hsfhBDmU`%znW;liizN8=<S=dBsZq2Z@!!*wc4Q~HYouy}H=?_#)7)k6evEl(9
zD6&$%#R!;Ti;P!QL$3a5>O2>yECz$UmS9eX?ZUmn@X}xp`2NB4p;_$#OyHjqA7iak
zs6YMTdkcw>tZJ$s-9r;pXguht#AR_ft-5~8k?omgH3}Ps-%*8Y9woWyOZ<JW1y^G!
zU|k#L!{(?43VxvgzKzYndcN&}Uch$99?Vcr6^OZHkj&<<7GpU&<g?|fOco^)YbsBf
zASgCEoE#Yk*O%D*6*6yg3?CJrA+rPa-ybrP0DFM5u`9q#gG=e3!K7sD>;iBm`#Wq5
znK{V*slZw^?NrhJT3{;eE-gnUUZAqLo|%dag9l0iI<FFm4bO-gInUW;TWf6Gl(mKx
zd5LtE=2y=u&I2fY%3}Sa=*#_#nqGcVE}w3E&HsFueV_ep+Qs4h_4rv3<iJ?m39{*@
zi>l9&30IUZ4eV!~BBO+Tl!5ZF2z*qbzV)axe3>I9khr>BE2aR<#$;{_o4&8iM1MF9
z-bs{`!^=y)4fKlnAWHW&wicq-$_i+T7kKWxvEsT@kqP9W&%$^QSSar=)7SLp>PM!}
zz|egLOJjX|8G)sUiq)NqmQO1Usys?*V_$gcusKg{WtH%rBB))`8})!6Ev(SlwE=9c
zv;bBroL2nXn;V7^{7qy$8;f+QXWjzinCd}A!{XhH#X<4SPg0g!`9_!dnsl1lISh4l
z_(Td{vP#n?Dqb=R^zAzY*<^%iRyjN@=(g^~;+MAv_PG^sUGqrzTlMm^m-XYiDo9xe
z-iocV-qA(l?PDSaXlI}6m_sbGSqMxd=bC?+C~fUtRrVUsNm<M>yV}Tm$P=$X4U*`<
z8?~>XdZ>z`C)IN)0F^rPrddBHVh#Fq&h8W!7nmYmWHRYueg$0Vbn4H=9;XayW9;CU
z4LSC*b2DXAevAG--7E4dLE$vDYHC4SpvcyJWtV-&)pj0(`I2P^prn5Vk(y_kZlkk_
zN^Z#6iuI5w2T4MRu_L3RZE}JN<tjqA;XV%06G&Xj$+xqF&}ZrG$LjS}!x?mCms38W
z6w46zS$Geo<af25R;<N(3dEHI&mq^<eis+RZZMbkjRAfS7tv@~en|%>fV07YG?u}2
zlo^EPa;-F9&6sJDjaZgS!`(<bt(bg|uHe`+zi^=bZv7P^Z7hG1YpK!{OG-|fmp1S+
zYe~XIpE4HiN0w9iDys2>if;>03A<BqS^#4MzN&_49knGWC~-y;J0XSKGLx%=b!$h-
z9CSD2K&k&$Eqn2y`+)-aaYLzxe5Yh0ennJ_kaJMub@<E=Pr{F0B>PQJd(5$RZbe<?
zzGs&fhSHczeSM<r(ph?w_SAJxT#xc=iN(StMbI$0cYIEXg#mU>5Y>r*Z(1=&wk!q2
z2go8S#CWQdbS*f>BtR#laGM};c<gX8g};9C7k@LL@f$SY31u4pYh&&&47=Y-Px<d8
z82(~A*ey!0juO)QriuH-(Q5ffe~>l3AvMp=*sX{4#L9pD(h4MjOpzNr8oM>8*&Cd?
zVDrK(XkcHjeiD%Qofpmk&o_)ePMl~OwN@sDzq{yd;X@Qbxwhlz&9{kW@B$Mt4CY#G
z@toj8!r2r!>Un&{>P?uCLgtKJnr1KM%^nHvl_IW(Bc?K5AUVDt#1buVNYgmMevs@0
zPiu;;T)Pis3Dlh+(@3F?Fo|S(RJwqIaSlfgDL!J7KrZ>HB14Pik(k3PX(|{cK5{}Z
zMNc_r^G4b0n=3QX8y@N#pv6dv7MnemXy)anw-59-8nsf)3O56SxCwYOH2Th$T@7N4
zYGC+~)Bw-9@2E=wzj4gX4D^PMlNCvL#Xe}ek#5g-Zydr8_{IsS_Ta?+kxln|<9NvX
zOjPN^|BnFWKPS?*XxMxLCAJ^pCs4vC7AjH8*vZR=4}}U*LoAk}Gh;KL;+A{@r9x8Z
zl)X7)c<Vyn0^^_j|Amx2-N(pOG(4~rtZPlz9eme+*6vpX`#!#Wg`<sBO~;J0`N@nn
zXr-r_5Jw!O&FmuDjiEL<%)~enszEp62+C=SJ&+iAh`p|inq@z1`P&YImZsM%9IsRP
z@G#LHV$*aCbNK;5AI@iC9)6Sqbmg$M?zC5x6@i{IjQpLyOgs4av)+~S6D2eMfs%`c
zct(x8?HE(#oz3WrY<1nW8Lcz=x^2xd%meJ4?HV2gJIwe|sb_(87zkz4Fy=oamHG;F
zrDwWlB(b$}3-rf215ynTSRbS?Y;sL)a<!{;^|I(0Ca*K<Uep(45i38TQJt`Zl}#pL
ze1pTI>@R3ElaXX{0ip$6sd|oL;?YKRo;z`Nlu4B5vDq#34Ime17Lk0QUjLSb-=i**
z%dlZg=g32{uG-XJ)}+rorQ!nGr?{@5JDal56%K;{H{_W)GfL7!#CdQ;D*Pra$_IRb
zRTVxTPBfv;c&ly&Rdjqw>ei?3;<{S;`#?t2hOWw=S$}xO%(IeSsvQ#(!WJ06><lKG
zcdXNq-%!_|$_KCbE;PW<nydqQ$MZWk;pqJ1_q6PWXEh$&OnnvVel(-imA_~>kARAn
zNevT!v0cMQ-+Rsb+`OB6eFijS;{RB+Bc$aCw7Ib<Eg#s%l6Xl}Qe5J*!%N-Ia0kTx
zRxiUJCGf!-<?hCk<lK%Zg0k56Bx-iMal?_#){QAb(|3Xo;PH4nsjXnbF5MPFQ3|;D
z-Z(AmX-wQPDg1%~EYTdndizSse7I;Gn?uP={YVGV>adJhdCuo*U|Bn2Y$88IA^JFr
zpJ;T#(><+L%}U29YNcufF-VqsN&b^WaS`g)R<iO#NE8N&l8g~{yOg82;CJW+1J9#S
z9;R>Fy0D6$SZS6q{i6>NQ7FJL;+i5(H5A?galKQH$peB_+G8EQOhVFYngMILjU;74
z@Op(fcmB`u2%anE@u|66=9P`HE3|vQ!@&kw%dQ*=u@qE(f~REckeD-NxiQ1+G+ECU
znf9cfl;I|*Y~GfLEKgIYk~iMo10o6Sso`8B0s!tz6z1&<zbTtY#cs07a2VMrO!U{;
zFu(8_S6nQ-8{8NZdJ-eQH7KQ_;zsvfN3##6mYXYM_e8p=S-l9vD*m|HSIR;cFhwR&
z=kSA7pCg!ccSn;F(%zWX(Tp8OXTD8>+}}8M_q>*d<F=%?T7>3caW~5~WsZdLso;>z
za+=HW&DQ94X6gt|!xADDMY>K-3b(Um;A2!C%;lS-^^FlIhlC8Yg1en}q^T)+#aNnS
zW%iMO$ep>x2tz*6l{9?*gEVnG4jA{-F4<WWOJMS+X|%GMK*5?p$cIE;q!R|(2W*v^
z91E&&+>g0hF$E=m()xYZQgJaBc|<opPl`qiE7g^&Sl=4hTA7+Xi5Q>AY<$7N<mxB`
zAB9J<O3`lrP!HnTUtN8~iA`i}Md6IdfBqI8H;`$7q)%|9_@4pCe~v|M(fqBdDvAD{
zO7<-BPjD<D7rVKmDG6v!CV}*lwoLB5aBc#^aXy=01)Kbanmb*L_5G^Bv%Zsk`ms2=
zM$V)>r!1Skca_`pjc{kpW!nCeL%xH7_|~60f+pR$Nc)xk<cj#g!{Ri=M9-~xU@I|d
zi|^u`T{kR(KkE27&Ytc}E3)VdcgLwtcB|n^L-jr@Fl2m6Jz>U)7hOPfXA*a3R{~qB
z)wnYj$2->%G#JW$jwQy4oh~vfsJ#^Xna|HAq=3N&1D`M?*XZS{1S5L7-JqXIlV1n+
zb1Rb}Cmkhn?x3BiY50Q<-T;-?-xj272@}&D-|k4zacT(GW~QMwnmH2-1^?QvdzXVR
zEhM%Uut0cTPe&Q#H;zt93;T{6{0>d3t+AZN@$plFWq;*i+w;jwP=Q9o<_SUZR{*}G
zCmP4IFHZ3$ttTJ36c`fKyeQn^C$suBV6($XIu)lAixJHnQgN0(#s}qV5lhUocXW!3
zXHF+M89I!yM}Lcv#TCO^JAR4(OedX|p^QTh$)r~o*>(8`J*k{e0Vq|OG|j4l{AJLU
zX2DBLT67ejhun&TQMhumr9+hoak-^OoxqT=Sj^wh%{jj>?t&SV_ZR-*Z=Mw0TxNNT
zU+InG@~X+8Kis4=C!Oz1l7yc_h}MOX1{V{CYXtBdU3^p1)L4}E=WbK1Y3||W?*b4b
z08<nl-)VV<ULuJ+H{s3c1i2;zkY_pzEFxu7<rZ2kM*ajngv|TSGuy4SWe-$CYi#*|
za^ARsTHI)W(tDByYGf<y+RZNKrd`^r*pmlRuu;xJ&|Hp_3Reu8rE>+*6=-o6*yX9G
z7B__$?3TuY4*rBYPwNqb01VJ$>QjoEbu~6&^8~6_v#q#N8R{6we;>$%SLIyNbi;)e
zz293aGtDusz?G;f)M(8=NWzeKCVGZ7PEbi)cQ&nTDx4=9L0OUjWR<-Z7aV4!1=8(B
zf=)vcVuW=Po16{dEUPGDy;QLsVx2`4eNdv{D5$@7ex|1r=w<sWIJZb5BAqDnQZ!|0
zQoL|ih^0;sT@RuAf711gE6mF>MoO&Fp2+y-l;dX0PypaSEsGh7CC+56Da*~L=ce5=
z^~rUdr%PrWf=d(~iYT^vVx+vG<{lVKew^+oHG$dTz0Szo@;<~YK-<AlHecT|%)zKg
z(98xZjOp^n+yfpVW1Q(Jmfk$`g_7hh!(jJT1DVusbD4M*a)-myNR4|Q8LU6Vwrp2O
z<xmKSc?4GeKtFbIwQi=b3jZ0r`o<-IZx=CbU*Knth45pGS4u!_p!%G_pzA3;m)DFu
zg79I%l(VoKSB&4w4G-p$lB|W-a?Y<G=Tg%Z`PJSIihter!RDDM|4(exIs=1^zmfE}
ze5GiVQq0Id5JC9F;3y^BkzW?)KE8>e#j;3n;}tg*JQJ7R3IM5Sh>+V5=KAIeOtnVG
z`sQf~ilU`vk4^Mlob?RA55FTO$;CvQWrDD8dyzEiPLv(>5I||L`;=Ep{NTPr8CiN^
zrcg6z-b0(9%ph=n=iUx^3#@-$k#!}SLm2z1y7=esvP&ck6x!lXv^4r3KucDp|Ipn3
zK_#`qg&V2VB2{!3P)VFb^F=zWilGCM<CT)PFB-W+|7McOPe_llf~y%M3K<oDj^sX6
z8Lzp)BO_yj#^s(azA?;v^M87KoVoS~85^)3fsl(B)xS-T{Yheueoz!{q%k=e(H0c+
ziz?DY&vL*7{n(K)(vOZ>E4C1W)@0!im7RaSk$Qg`JoBgA_Vg0}OKzLNWxclkSGk=I
zOida@{m5OY?suuJ`rw+F)ni$)+d|TtR`Rt8Xb9S`wHX1*$_k6$Pv~Y^{oZVGlieVs
z&~wSMQD3<w7;Lbtz<tpfcdX1dlAsKEwcC>MJW}+D4?M)t39W{+JY512O;c+)<!(L7
zNU0odS(_KRoqdz=AACT?fiPrc8z)7AVnP3GZgcUNpXXN;Ge1N(S8x%T^@Y8@F|h+E
zd+=XTATB{anwHwVqQMI{3eeou-S&Ef67!uVQ@hkaEF2BzH;!xpe5VRCT7yhamLsn+
zMQY`N;?3CKZ}J(AC|;>4j1xXJc4OKdj?S^bV2xStGhK>E2f{_=tU6}yI8BS|H+@~L
zje}1n=~Q32n^pA5B+rvxY*QbY?;OwAcf-=>=`^!Szy+W<T1;;$9e6m5#pSvtJ+RT!
zz6Bnt{>rVW!Pb%KwYQx*SI=<&i2<=AGp%K0iB-Wx9Du-!gHrne^R?~hSFQaE#KQf|
z=FwatT03N)O(e~QA0Wg5`cZ94wbhtA*Q##D#ea}`^agon*b#zgWH#d2^km==TL9E<
zs+-<4!o`NUxrh`fpmZFYz0D2*Ie5TJ1qvHaptY<H!$?P##trSCV|*HO3n4frCC8Hz
zX?iRzC&e%Osk2k|&(;;Qu`)SLm>Q@}l1jbHk))Yiv-K=sTd`Bm3z`|~gN%PNKA}1#
zP@V;Qw$iVCt1bu$E=t6La8SjYpZz7{j+NtGtti_od-;`GkYr)1KEtOYPI0i&VaUVO
zqCx~HJ8Gv-kxm5uNhNjQ%S8U7l4(P2BpH)^7b`HIRMO&#fG4WTwW(9;xrJ#RoOhP<
zjz1CCk(v;z7;ILmn^e+-qyue{X~ohaX!|OG&b+py_ByD9;kuAGWm}x8CCt&9C}C;Q
z!E#k}pCQ?h{ATnadLG&h8f($mN5nb$J2WW&N$87QnPU%R-5k|23FuK8X@CTCMJzrq
zJ~xjXy^mvh4&@ILwl<Nll-g0tSG1{n-x((PPcCW6{0E-?H&@#_=7#8xg$J~3A{Y<g
zvA=|@6H!goDgRL3#9;L`^WyKBJw6h8Co?9Yzo_IHh0a)|)6gQ!(9*_<+VyTEPXwVG
ztd$!sjvFS}89d|?-^dd8WH|&~mH6o}_^(CjhCX42u(9BHF+@}3sfUkbv%8|BBF`@A
zjsiF$bLJ4^&q2y;8!<OKC(2BPMh}L@DM8E<Bqz+<n<z6dXLS(nA=7N(Ql(=Bt&)sl
z?o#WEPWAgzHl+5_HG4WSn-U7K9!%8dg?M?Y{1Io!*M@sw;WqF6b$JJL<29c;o9!Pp
z>4>3ok^k>h((vEPVM`cW*#gW&9qjCk?ae;@21f^b7XX>Kv$KP<7{K-OOP9Zs+W#;f
zTGTe|7le@c6*fQ1LEx+k9tLW_rMy|`)xMTgMyg<mvw)Kmt3VVw=a9QKtR$F9{;ad4
zRR#xr%!m`2>_m|fA4b!bZOYBzZn7|Ue?G3O69lQ=bAn{Ks%Vdcf^CGoqftW-(ULON
zBHu5((Nd|W+so9p#~yL-=+&(3_EhJH;V;suQNuVvWg~@tGs+50-FKIwcbN`Kv~lB!
zR_l0gm?G<D{*zy_0Tp=7olxeHN#q(9Mz@<<<&o!1>)I*j0OfbG(JNc(j(*0A9?ve@
zd#v594ajMo;iX&Y(^UXxlu>eyu{g3RqS(7M;*@ct=R~#Y`GE!5m85r<rPjv0uy+AC
zxNOR|zwBx*973nLCV%m|pFPv*w7E?+fCCF_iwq4+oXG68>p-A&1WzL*&d?=9Ywa6T
z>fyk@3dwQ}VA#`PV1p(g<oa~Yr>s!AsPd)8yP1kPZQG!pUh5&_x?{djbVye(WfDPf
zY&eN|v!;<~f|DX>4o!_)dxopSbb*<c7{l7&9yu0K0+|_%A57HI`4W|gz@cD7ThCo+
zM$CF=SE44~iJL@eR=xc__NxrLFDwlXWZREFA}*I{demt6Z6a!{l<|ywBp!eoW@b!*
z(o*d*>wHrt<)iTeq)xyC%J~z|M7iNs^1Hl&$J`Gd)Z4Qg@PklBY@T2`kO;T{tHkvV
zJaZ<zjS5*Z@o;srQ?TUF;SSZ}*!M4*j;fBMHLJ%Q^X;N{+2d#vV$o|3@g7Ywcj%{R
zW(U{B<Z-93*+M+8Ns%&+MmVJC0&8%bab36BgH%)6uM71-3CW%Z?9q1eACQ0L;Z1x~
z<gGt#8{E&;694=DTho6l>_sh&?JWRupQg^=M%!onJAOU~|0(R199;gN4vw<C?5F4E
z``IYgx47<oyB%x*e<FTUSPPpPR5+X!=8CtzXxm7(7W&SP^bX>m%mt@{@<0Yj5!XH5
z?KRll)7K5kHDDiYA5AFA+GYR&KoIr)FdCYjosa@jwRDb!+X=1?l-%i9nLv$;q<7#~
zsTi!TojFp=^w)bBrsuQ#D(}v;_Og#gD4c(QA2mHc;?w8Ksvz0-dzwsvna3&cy0Wcb
zq{Nz*9hKb99H&VuV}6BK>|05p1RltCVCJhCfWL2TGBs!`)YfG;U8z78G!t#tlo7ne
zo1biBlj;|SJ}2f*)qV6>Yt&YN_2n=Ca82N`DLy`TNnF%5qJW7aELCt?wpfCM;N@Yf
zOWDeKAjmgElU7=y*(*OpTpB@TDMzg$wiYe_P3C4F=so`O+<5<`=VtkT`ruUlI^ur<
zm&#v`DSCF9U0Y3!MpaPmx7nyKJ<tY=mHFt&I^AAUZ3XgM@~LFHCv{#oU~g2nHM7Aa
z2E`q6M^pPfIEl}3E1V#st1<N`#z{&~!kx$k@|GTUnWtj<ycSz2uqu?fv+e8>9rh$W
zngRnH1+PXui0imPd|VgWoS3&mYih?8H$_+l@=DWVVv`Cn@ZP0jN4E71@>&yjUpvvP
zMk+@qN(iQS`>HSLG_p}NQgBet;y64SI`>8fPTOE4Rk@Qwdi?Bz6qb^nywl6!Ol{+b
zkrkZo!lpvI<ap|`+wYg*k1~EP4VIXnW95V#A#KylhlfP86Dg=q#x;pz(+$Gzc~!u`
z9Dn2(5+iFUWv8I}LoR}hcn3}{NAloWvS_rs{DBMfU6xrD=}-|JYNH`#Zl!5a{OcJk
zPmkhe|2#_Yf9Zw&A3Msw{M7$yrK;)Lpb4YDQ%E<-cebQiwrtxKsS)Yj2oKShv~S56
zwIl)qUX&=-h;edqw9P%h{?NX|`J(vTK)n<VH7U;(QZ<`H9_bxTW?$=Z<@Nczf$x5~
zVw)W(p|IBSa9r!h0KT>^vg{a_+izX6E`p-L0ZXK;Z@Z-+2cBMp63p3IL~CC+Csf{R
zs}D^xxZ6i&VdWBK$VF^ow$QlKXiOb>b>Q%*asfd@!`n_Yphcz`vPC#Q$5s<K@pY5N
zNNyWnVkq4hs*fhJ_~!Z2(Dq7}56msm^-ILBAWUl|NeZ(lDFp04`t5#)VC5A!QAs{%
z8;1ttfuCubLUB?@-$4v+^nL#oNOH)5whZT%@X$fy_qrw^PWL-RXb4?oz-<#l+uD_4
zy>IyEwG#4_sOoCLY8qf$m$J$6gFVj?tF3;|1ThOfc<nf)Ur@9azZu87N$7O<slxBw
zgC5&px_SuSM!Ad#_$_B!+41H=oDw!}!2UV^$Bi{GMm(n(BV}rzdg8oU!H*lleMScd
zSoQ(K?&g+qq~3vj$-Q{$D&-vx>-7Dt=h=uz$xG4);@*`b0yJ)XLNb`^Ig8*lEnK64
zucbSng}NtPyb$le^o!=+GM-sOfXjn3#7ct>qvR3n^mVO2#9xsYO11@k@ELg$pEIlf
zLVs8g5NHsP`^-?uPu%#A7whM{|1ZY9gPZGL&i()XIuZZ({!qf!*uq5~;NoKZe?v}*
zy3J?i4ciY>fvW?*8618@R#%s1udqy|MhZDoqCg6@xgr1Qh(a3?YKA-)j#O~iaCYXB
zi|ItJEbndBaPd^mW{3YvmQ=Pen?+;O@80YC?lfPI=NbRJ4@4tabI^r$im(hama(dI
zd6E7{^dqLc0Zppn8}>-&_JW_Kk)dQN?S!Kyu+l!HShCLUw6Opfy5R)bpWqWTG&CC6
zujcZj@JHD59rF}BKfSTjQw@%$-d1UXRb26c_B_X3#mJj&2D*OOU`o%Ew@ufmUu8J=
zFv`{HZfaH7MS6dCEIsfB_MUddUS+v2puX0e$&{2#u|7bD5xXzIblXANjXQ;CHn(5H
z<?V@CkdY>&45gF8i`q?;2zl~3^3RhOUk4pK74mK^xfPSilCLt2OB1tHI(XLF0b8#)
z2~SH!eGuCoYOKPbj#6i{a`D>TR_3>uEP;W&LJDt<H@^1Jg^|)_z14~qr`Rkxk8AdX
zi&Q)GZELBsKVu6t!Dd{eeX`8@%w5F3m7w{W>G`woK1zm!7luE*bF?Hz^463VysFCw
zCnEAkI`KR!*qaTKRoR~`4F^%X5Lhy<h({>h)&Oa)thGiwaDl?{7rLCXxYf$VxL13<
zkx;n3qe$pYK%(0uVBT%KalI@zjzUk*bNLs1dpHDqB=$w6mDzZ)273EYGEA)%BcovB
zcYeH(f;U8X@ie(ya7?F7<d#{ckmt<0K2mL-(6Bhr!9|p8LMANzjU$ENMnftL%qsY_
zIA@w|q2oh0$8ymV>|;b(K-|O80XCL%Rb>!|*;mfxWk<3Jk7C@lp{W%ZbDqhKD-gHf
z-x!tp2R{QhPb`^Tjdr$cUGH&7v@jRxdeojivU;~p>WgVrv(q&I&&XH~Y};dRAktq-
z##H-RMY5bNurF2e7~0jdi{N;{ewjWX?2~!Nmkg75&q>Z--tK(QEwI4qL1Q%T3vl+w
zYPcIBe8qmsXHjFgAfCQKmt~V?dJ8;=z5}IhTrf9T)9Mtgy4b@WM2xK)KZSy4OrRM4
z{w_m9(bPatyyEBeXv@dX)e&4^INlMYIwxB)mtLA?4n11v$oi5fl2c|xi+;i1$l?fz
zIQ^4ZU<l18dLbme2>hrZ>4?rGB%NZ5`{x@t?WYh!ot(uX=(k8_A&<Prj)856!5=Bd
z-e;SMuMN%qY9`Am-3iA=6nGaIj*fw)enKOl=>+p4DUhm4)B6G!(MKKh!)z^>79}oQ
zzvM)yW7by!#cwg~<?qZr6Z#%%>*swJ|5u~XC-R_!Ktn@=-2E5i`FDZhui~!%3=}H*
ziW^Mm{8t{b*v+9=N&TyXS_$<bo<b(LXR9>w)=^?8*9vD4O+&SMWgl>C2v$hHzr0Zm
z$wR{1@#WJe*gMC~aCZpY4j;zlfpFY*Mp9tTH)@IE)W8z1C=DdB<fh(67d$9f9d5HW
zFMCs((0G!$jtSaOiduPW6EdSeO-iv$J|?FIlRcI2qx*?T6<L6y5WrN;zvI%io3b09
zJVYaSIeyM!OiWjlFzg^vtP&q8+tA@+Pw}yhVGWFEm;Tg(-8P?BkTVNP!KN{lpY%82
z5q~iAB9NjX@S^ge>alA+CfQ)b1&Oi#V2?bNU#(u`+tS(#p@DIV@v|VM*~<+QB2h_R
zNOQ1m(iBwsX84mFJ{*6cWhYe5J0-9tZ0IeFN8X*LknDGGUlIXNm8(=#l#PGUDR+9o
zEiZ?hNd>`R);BGWc;62($XM58w}@$dZ{|+ga+MloP9Z{WZ;o{fqn&tO$=)rhYJbVw
z<XL?4asd)V=I|Xc0=S!Un?EYXsh@2QQ^o@KwHBQt7=K+p%lPLa@t>E^?|;c)|IH9k
zHFa?O&mmBwW~YcIjO^FSsP`>fBx)BgoJvMFc_C6JXilg<pL$tq5DHDucH>a1d&BPP
z>9voo6j$&C>`i&3LnAqWDBLk=@^W&T?>_U-?fr%ah<f#b6UG8eR)g_=W(=RXUH0fB
z{*mqG_bD+}hrQI$4NOdI7F`||_-VKjF|B(q^oTK$2;x5y7c9|y2{M^w@VX_Pi2Q9m
zSZ6{bfp~5L?J77ZG*?|c7{f6aFl~6&MH}lLZnm8bPFZ$a7#k#!?UY9_jxF7y#5SFz
z*du2u5t>f3sC&BGchaiW=N!)-o>XYR+E`4V%!caS*KexeJE#(%-0X6t+2P$)M~!v)
z(xfXx2O(vDcaPF16R6dn>>^(AV2>t(VLjt-N~UC&+*Lq@h|&A+8sQ)j@C}#(Ey^Zi
zjsFNDbBNJC@u9qbS>v)x0{&3v4K`p^Qw(rc5|)ShqDcU>ZCdv18L#(A^dh<~y*2-~
z83&b>A-C|@akp6tQ*w9W+~}&8b<wsD(}d~m^fkF)iavQlv};vrXX|Lo49%nDx-Yt!
z<YYc!1HAAC%TwRR(2=DXvV*N0O|``1@Rb=Zh@fPeK+Ih0Mba;fEoQmb5)U?v+Z)Z6
zjEEFhGSD-j_*sfn{3Bz6vVKO&SJ=B@Ua~aKwuCG37i?ABrX-7$agZkp&QFLS8dP~B
zT&(bb3SwxA(~$mC5(edPbOt1!y4}t1yrIf6L*oahJrkzzzy99hp-TA3P4O9&E1$XY
z|8{Ir1vve)KFz`TAG)bVMgK3d&7Wl3+ZH3;qN7{W0xJy;^-89djI4$!;v+@<;KYhE
zUy+r;lY#I~MO1D01@15P>uC|w@<MjPm)-UJIbOi;!sqw<A#DKvW?g=WJd&<Dx?@!&
ztbJPjWezX-h1x0btqcCpl8NsG(R&8F)7O+z4_}v6{WN)Iq^^BlL5G0S=Ur-4VTxR^
zWdz3<)n3ITlSd%A&QOZp?jqWEQVE%2DRxizgDiKH&y8kpz%oIHwq<`Plcv8bBSOlD
z#8<<PM8DXAVOfObLFe*gR(h7z6t(I(B{kTUC-LbkAvrosvyUjjk?v)9!5Sxt0-|Zv
z+aV*6SA!M!vv+=if4n@bxxzPr4s5AFx+Z=m#e$Oo%kN|qQCXZ`EIb9dOAD?c_8k7Q
zZ#!JEee~vmDDAr=Ic>&}_kdxnLUDe>dGlE<p`?x$cgnjaL`}JGIDt0`hBq(wSx#qJ
zT`5t3t<bIdqOkLUUBV-!C(=_a-ISu%WTE^3#d7K-f1`lTm5<mJ>zxDZ<IaVf9yz?f
zvm<>~#(kB}(Q|oYpN%UfG|w>=J_H=PAhCx#adRZ!9wf?na-)}YeFHk({z&L91K^h`
zujHv^;2l(blOTl_@#ffp!~19OKtWIKX4J2LqMY2n6n7H;9wU}>aIkT6{LeR?ny%ua
z5c)fi-j(`CjUEIeG;Nx51qsPGYN1JVgm`on-!GP~=q-_rHP?-p&uC(kKqc~d=qD=4
zb^p;wXCqRN#JZE6d!KWi&3ak4v*Qn<HJS=E*gPHP!~6+Q4hELcJ*?WAF=q}pM*=Wt
z;rTaWuS0m@@1vGc>Rec1309i3b+jzA^{+OL(5UtM{|wB332vlCf*8y{eEA7DND;dM
zrs*}Fq|&)O2S6$KD8$HUIa$Li(&4O{cc4nmMDR7ad)o5&QGw=lnfv}YE>OiXXOAzS
zlU+$x)`}5XNW9~!yo%6?*(m&;uhH&*0$Ye@y)u!{-76bu5cT}vR~+mPyuAk%)KC<k
zZk@Ah3(=i#gX2Zt(si{(#f3nxU)rulMES7XIRd<HPGdqLdcTP>!{hI?hB$<!m}5<E
zV!uWaGZJ0jTB~TY9H?X1(8vLgHPN=DqcoD0l`v<rU9ad}bfUIgP6m@BySO(8y%C=q
zP;?0o>LbG7<KCYcW_>$BhgFp$ZFRxr69exrjj(%_{#2+o`2Zhfiv{FcX!+x==zPtW
z-`}I!>aaN&?una27xcQ$H)9eF^2V+7Aie)D+TMXX6Li}et=JXYw(Y9ewr$&~=#6dL
zwo|d4imi%WaV5ELckg@dx6gNW-!XcO^BbP^EX+0MT-+@lb2#$lu@!!JEAf;*G<Nwx
z>XD}3UC73Phk7~Q$k_(vF~h*Q*IrM4eTHReGLJq)cLRM$cYp+IvN`~P7Y>Q}D#VH)
z2p^9CGtVrf!;CY8<r#}QU5tT`8cdPsvz!p6Y&k4HSU8)**^_rh%R;FD-|hX3>jkf?
zn{Rth$tFBggA%n!6`n!;YnDf>Vwm~^oLPR4hk3@3N70;(EA#YL*7aFMH>!l1VxfRF
z_p~eCp;1tzw5+XsFC_vyIRnrXtm%{?t?&+<|Dd2}gQ2A(fT=Y8Ujyd<+~)nm=vTIP
zbu#|<B43=iZimW@1n@tawP}SbmPDm01sF?nX;gRx{D1`kAuDQ1hW@p++NRyw>2~N*
z*n<HbFbILzE36vDnROxxZf(i;&i~H$;PE}n=LOyXq1D`x0JBRImN_yK1VaeC4J{AZ
zpdK*6u49<Cs-o2{4xd@s4aSVYht9Lh*qj*Ngu5W=?uJdH%bEm#$6tKtmV;2_OAkp+
zeV-F9+Cf`&yKiqabWw>su#i&^6Z=>_rjm0rcO6G-q(!eJ;8zx+Y&;fQ<w(In&DqX7
zj(?T8G3+EABSsRB3%|%u%VNYKHx@;_LfR%D5py~@2tyf$SuuLWxdk>;wrdq^+C-`|
za1TvvC(;(K4Ilf#sSBv~|KfrWg4daZHFH2De{3S?VXb`K!+4rOhw3H4Ik)Y3SMi!<
z=$irhyM9CeS)<5PaXnXk%U$gxm?E>%zw$j~a!xU4g>0tC4W71C<gMTw{<F!s1%5J7
z-tw8C82upLYM9svRiTh?=iTRXeknr5%OAAvf_ZD@GaIxWYrdyjN-{9!qb&;L>tteZ
zaPQlBEm7oI<jt&xh6G0u-D_xyrP*D}M71g&kq60=wiuI3>VJd`nm^LqcVNP_{@+NL
zYFz(HmVba=|0=(#y6U*9Xq%jgvBWY@&`Bv2eu{%}QX@+RRMhiEG#b$K`F$F`X+;Z6
z7bX;P6pqiAj5kB-I4WA5=ck$0&%(b!1fEqk-ADWDMuV);8`7L-fG4rKXL^pNf8X3L
zAAPFXIRgo<M;oEkh%w{=oH=F<AUtct)8>wg`yp}Oq(?}iS315}JKZ{?Q=_*YIOqaz
zp91hOj8>wI@mftc@Z0Ta0R>-dX#J1udfMn6j5qJCyj+)^&(tbwIIjff=|?#EN9yh$
z0*#;4)_>sUoOP-$FKwo5TReMN8V=ZSL}#?W=?>_iDYV`Wt!IW9=@BI`9>Psl{)h(j
zUcU$z+8)zyH{2r>_RR(qs2VS&n8T)xs5^(&*mALVAA6@LYx}r5Ne@OfA#{p%9Y}tX
zV%F{Gk)sD!yUYe)%zdh&j+>dxk?OyW@ZL^R(u&cvSfnj!wN<g19t16#f&wj`92+;2
z2jgwOR72=A@kj|i-vi(m%Arna#vC%jn7riG-V>|rsrfG#u$jNy9NzYVE%UlSpongl
z2^eX+C@$(OUV_r359l077<+87MceYQ8Oaiv-0V4YZGt7ZYu#_0xF~lWw{%r_E+kYX
zj4UxqenG%In95$Ni|z!SsD-UC#2`m-UYWbbC}HaYEE_)w31jOw!0_GSwq!DbF<7Pz
zdP*IpPXW%@+S$q9!d5x(#fpkqU$(Qg*)uxPH0-)7c5Npu+Cpo=0WoL8;HvAc8W$dB
zE#eDP<HC)n%JI)z`#SZ}X3q8cf&??;zNl|F;smyPE8YQ6daS+y>64PzJw9kwRCTkI
zzx~NIdL~m3xqD&?ClZwuzHuxzTUtKP2!HFv#S6Wr5IY?EM0#|%>dX)bQcg*_mCq?k
z`>}@~rjO(WVj4@p7&8dHgc6l2+JY-MljY>*0Ka>VDxyc!h56~;u5Gl`4GZ8-&b7P>
z>NAd3sh|N)+JLzL6=rtiCw6|L7(-kW2qB``OLQ`!gQ}B=eV_M*JAs^f6J?vUZ$ca#
zPB+kabsHJk8^3I|6bm|ETIB?!{R_?lc*Y4apIaG*pgW72NdBI$&c)C7$UVuQ+XBLE
zSy8lOeP9-^65y8#T-<nVqyfA*k`!R>bT7ER#RIKk+#7uo^>`-+Rc(kj@cV~gS*xKh
z;Ha$)GtT49E~ijM4JWh^w>hsc_3foxl?F$zaZfk7f`o)OxrSrCO#Y-vR!MslPj3gU
zXy%HB{%jWOXwpl`<cF}dIi<DNTk^X>d5CUQ+o2i;mZol#;&>r}6{yhNBHV!3kf%&~
z^wWy2Fdc*1H@H92N%}(b&N?uaAOV5R|J=;~fp`7`h*SAb&Dej#B$aLD7ZiY+65R8U
z8xHVnsy#R+NF}VaxTv^En6U&FcwLO|={23yn4NBx_Ly&)IECSazd_!q_S=muIK_p2
z3ER(jdQIPDIeX2-=5F_ZQSFJsT5G6_3q+%FB#aivix7twlck`p$QVQ#u9an}>n}&Q
zHam5%ahVyY0?L7>ROVew2V8^*NO^{t-0?ksm-y+hR+zKj8`4QRy7_4>q2rjRaiP`3
ziNoW1zRjO!WEgj}sJW82w(CcHVdS6LEzw@HU>c;=i)5VyvMZYFHV^zZZFquBTxVFa
z0Vi;Wk9}=jNFc(Zk3QOs3_i8={Vf<xTb6+)KFcmmmjTvNbB9_Zk45I5F+W2ZP^G5o
zeCFc&s1ZRIev$(mpYsR8ZT&==*^qa&<W}|om@gQFQ5|;Q46C=Ts6q-)Na8r}u~F$0
zGVo)}H1N(7rA{ATOsF21`m4Naba@KSlZb6jIe$^_8nmS#V{@vc_MF~|Q0+eVN!nH>
zf#;alA<zfmpPR*rG6(UWvnGAK$}?rXgF$Vok8Mkba_QZeSuDuEPN{c6Y`ZEAS+~lz
z4#gdBTLRwJH)`^IT(di@Tz?F`u^J1%1pb_^i~GP;4azOj8}GqyX{W_r5*HDTYy3&x
zN_M!*T<sds!T`XVPXiYgv!y5*&5e0tJ(v;u&FxhtG`ZjziWG_U<KZW4Zm)pxIjvEM
zjn5t2Fx+Z5y_fHKG5u`1Xx6l9f;MS}>xM8vWN?)Z@(u&>u_pHhrI#uF?pOV5;_hSv
zE-5BvGOS4G%eWl|7>sbgE66@mJ{%++V%`Pu6ic-x>28jkg!?M<>UYpT!n`Wo3&RQ6
zXtDimqxDb2+|}8^)XwDJ=M1I4cC{zVYaK0XT7rxO+K7-5P@>2tm8C7vmEEPbD`M`6
z2~!v!DJ0MYe*`$Qw&0g;G}*ND$;@<2kFklf1=epEEs<pg+^)3b2a2u=&UI1>To_7e
zsDU<xtCXXjR)a7!_{5%!;gCA|4PPzdt;7*DSIo7Fo}toMjge73@QcBC@T}3p$qH_c
z0kD>BDRe~(U}I5fPCRqtW%;n>Qj=uNKjimdQVSVkjWMoC0~2ad_z#XqOly1@uXG!!
zofX{c0j`+1D=vz?7=0(-?J17m0|t~^4wr&c3a6kXksRKJmNSB`oJW-v2M@w}Z)$%>
zHtJ;>_!F@EPijBkDq~PIhDtRT5GR7%M`N(m4SDTzuALi0alc~Di&mlUth5=(hmKCh
z4Q+bIL75Q5cQ;x>ik?YxfSTgcE`56JUbJ%;YhpX2`~Iis)p?Z4QWn_vc>OIL_77iB
z&D6;msGa<eFSrJLLHRAMf4!h8(i*JVLrx3OJ5pAPL;JUO1d+#|yFHt?Pxne}!W8N0
zoQ&5jjJ5JJpR`u!3ZkS=Q=~=<PxF2nq~|$M6)}l}uZk`F@q(i;<F>?}oZ&Az`t^Pm
ztcxu;b+f=1yb)(H7bBs#UXy}yVVb8wkrdhAML?f-px2b3^iIHL-gT);Rs=&=N=|b$
zDw}boOFF;iG6NALqPkZpfch;{G}(N0m~G8r`1zDUt?twa;fw)xg^26@aRNMB(7|I|
z$WGRRTh2oe2DIk;lNRf>FNY^hL>e9n*ZYa-)$ao7I^M_(!Ix^EXBfD|6Y*lLxwx@!
z4^e-;pnJ=SF&sB9+zH7NtV309<D3A?1LUOrb`T%YUD$ax0xOl4egow>Ua~?xuETcz
z(gyWhKU(|KpJa*#LAe0A|KBH+_-C~SxT1Bjv~&G$^NxzO^1>H1{&lta6r%YEL?r#L
zHCVBm5Da80)ygJSI8~pi;5t-L%RtNiC->hld8CEYTz<Dff>Pa?YSc-NJS&#&k6WAk
zj~mYRk0UcP`XEueuHfnps_@GNT!1rVmwhqbVMpcuYNmO`2Fm_6dPAjt6*NT|@!6Pk
zCYHS)RZI<r8|Zi4OqY?|l)C}Jq41%V4EniCIs+{~FK)Snk2Weg@@aCc)1>rt<yl3f
z0CwdyM-BjslPgC^Zgb6zu{5jZ@k;pTO-{<6Hsb0{=p!{)dZOhFwbYG1V+*V;hqtYl
zy`Pmj+~!p1b*bB93{OrZBi1<#H2}P0OvzkGDlr_cmqm%D0EJ<_pCsG^dl0n^gV~<0
zV`TC+(@QFiRXl*Yv+1}_BL$(xDMN&Q7rI3ij$ug@;~?6zn2WUxTbh=m8t)nsF6@+%
zyDlwNS2<6SN`#DJE%}fnOitDo^LF?fUlwDoh9F&KIg=kn6vE<Ts?F>b5xM#Lzo}uI
ze|&-8g_)|N#g~DuFCbrcX7gJ{(!$$JoD~gVAZ9H52DAs37(X5`#vXAL>PN*UpG2+g
z#ye#x6Hvv5qgq~AusU(Q_$9Y=OEaj_uM7~Ww1PpIF`+YxBQ}V8#$z<;LNkk_A>B{b
z0MK=ir!9E>{D|~sLJ|a{+18J%DH&&pYX0;aipp4>rlMIUc@hoouDxF<W!H+fyA$f$
z%fT$b%1fl2cWy(pfSt$fZAel(TlofnBafM?*8a03af$)pHtxSR*A0uwPPj!mD)0rZ
z<to?qi|kt1fuO{D^Ou@0Xw(z~PXcJ#WcYLp3gV#=hv%qSg{==*-Q)251-q64l4_qy
zkHy&>Glp3YJVS|ufOan0282i}Vh(WmaJddt-|Q`Dqx{6xX(*!oM7Yo+qh^~VOM|$i
zjS<%@_~frV1c$J`FhY*u2%*44$fvQJ+}?w|TYZyb@@Ee=G;+do<jExKLi6nG^NUAL
zaQNCE7OV(^Iff4ily>c~KQ4PR`A*b<CH~5B@Ca=iZZCd*P3Z!8^P@Fpumh(`gKo<J
z-;~{WVcDEA5sOEnQO_uuY{)LosIdvP*Hpiqc@5-HYAS&DIGyJi_m2Wv%vm}i2J91`
z{+0;!5C5)+sgbL>xvA5?=U-K8b)fio6RZzrOeEo(#u^Pxvk*#lMYB;o5vY_0S+YUd
zuR}7O{x2-3M*%PDFSKh6H;T)rtq;Qf%IfMf+3naA#8rp$jI7RA{N`7_kNii|f*)@;
zl;5m9Fb1G8Ob?8Y`-}ty`jy}(G<IWE1?aBDnF01Ud4$$fHzQtnh>AbcahbK=<c15e
zAnUM(DEw0kp9CUU`Hn-W#EhSi1;?H=hmEl_g3G3I+9u0bV3hO%b=YwcrdAT-^i~%i
z*qdvx*_#hEIutV#W@|OsTl?TgQkZt2+G6z7)tf2w=}*{&opmC6?V4)01R^jpsMXvw
z7t=E+qEK61h22ZYvv346SQJx`(pg)v%$E_=9B|Ris;!fG_5-IX)EKQ(rbmoe_Rf!s
zT>XZctgKu|Sa3Vm6)vjzRXOp@u(fnIbIGP&1e7yVPSR8xYcgsUT<~3UR5!GuH7h4u
znsN5`tR|`JDRnkPBy@A~sA51(U^V==$oBGE!g_nLASRpX)GV01Ei5XMQ5t@k9c}R9
zVwci4^^)tH?){wOyR^R|@Rs9c?@oVUK~h9PAs4T_jK|r%C2~aH@XC(;%&kleAy6C~
z8#{T}3RjXUWB&4E9=}C}219E%NT|iG0@r8imV6#WQo@blCS<%OI6lr;h1}c5TCvgH
zM=*3fGB`%c#_(rbkvm&fM~s~Nu4Xbj{wA9ZHabqK%yLD8H;*~iX;~>Po@gIdg~=ju
zd!8y&gfmME8j}renW1<e<&#Puc2;se?aEM2R7W5rJOo89@Qhd;+Dcp14n~bMm+xfG
zD0OD4;~+5@8kd9VIc-|MGK{-mm-4X<4}JpExTCx6f`V=LTotQo7V82|qddExDSXQ`
zt3JFBS@HhwQS&Wfbk|c~GbU+gnaG!b40`*On4g=j&Og)%p(Pj5m{(Xw64UIn4WESa
zUJdjsJFD7cLpXD;{7g4I5wQ;?cboi|N3G!y2^f-=POi7im2EAG%4Seyb+_DZW;rsu
zE+|G~Q~Xmii`JWwT_@FyCpx-kEqG@5?>NfMJ5|M3mmP03hOe8y-Tk`51<_?b7R`8s
zeN$TK((U4OMXk;*y&};064f(ujm^(EFO$sTb<CgP2|;~_!5^!a|M)3>()w5TU^v)l
z`Z-9!ch9lh1!pYZUwlE(@d!wL(0#e&fzn$UP$7;opSCblzxb=0#GwZ-cQGSPb$$Dd
z^Y$Hbl(OrY8By}a7(5{uk0J7RC5iq!em!QGdx<`5@x<4cWFlSk6JHU+3z=y^!fT)j
zy1s&nxl<9V=0(D}w;#H2)5V!kpRrR{>Q?#2HrCFU)eT&#?v)*aN3U;`-QUg*Zc-)o
zXc3>Xa?w083z{1VG+{ZZN}xD_2PY+M5<#>T>&SW1eNLFK2JPa{YlZ2;zmX%?k%3ER
z=+}b!$bO^ry-t;I8TkOvnDPYY!e1wX_$lom#wTFBm-NOas=lS$T%yalWw1$8Y?5a@
zBl+-si-o$raZB_-mDz3KTK*0`bE^%n@J6Zbe3C>plPY0<FdyVs{~ScD$MZY!>IFeg
z@(F^{`NUA*7fC~{W5!vO2M?nHHrV4yy97c)DX4ydmrjXojR6P*4!ZDKD%iz@$vWFu
zl+kC_Hen@mQQv1)_aVE2xc8wz8Rt8KQjs#0OHXl!5C1<>EVsL+%>{6$rvJB|d;c)S
zin;+UL4c+Y|CVBh)HaoY*xtt`Qp2-`7Br#jNvM7j08JyZ3@vV4ou17{;+t00Q04&&
z21lo(J8HT9{gC6Z`0GJptiZbCaUN?7q8y>m{r8ioC1*?};$XRvQ?^W-=|9>fzeo3(
z_Q&`4W%=))jt4N2W%e3;y75JMYl7!cLjdJWznB<;nem4gp_S4UnQ%qnotY>1v#~JZ
zQffsZCYagwG6LNT!}h(fXdB-2&^WJq@Elm9R3QkdcHr+PHt1j=UB?@OS?!#b(HVp-
zR_fsGgLlnHn)@bnINOt#7jld>p7VV(s3%Z8chA+MS6istT$?HmuuF1SbnMHl(}}t4
zj;P*mk_^LFm552RM01!WQRP=P?HHU#;x71$m3D?m3=O!F8?w84cGpraaY72Hf1Ui=
zIM*=~Ht8k?e5<o?N=!N0FtXUh^Z;P;`ZTk#@L*{@0K239-JA=B+>B;RJMAq#caMNw
zlPQP7n1SNLyjD9TYt$Y^x6OJuvGTmmcG*oL%9tV9ZaxFY87jE$<CUE3X4y>!&!L1;
z`4mftHcGSLv)e8rd&PQHmon3pl%idv54L)CP*E4QWer%Zt}aXSHqW}w21vHXtX(ON
z5xhQ5><kYEa}Tu0%>7PfGm9!cYCucSgkz<KCQ2(t`v7~x&y)6(>qJ+J;2j^$5Qiu1
zyf`kLd4d@`C6Qc&?-eXS@;lJ`pS#i^nmB>u_Mr0sN!R~(EX2KyM4T#~>^eCmEdwqK
zsaA!JH~A+BPxLb;6`MTuAxoPIrmxA1b*V9x>6<=LI4P3eeSsRz;iBjmFIY{amGT`8
z;nwJ)J`y&S4m%as3Q7tkC}n+N5wQwJZMXXMc}8$e6X5g}lIVmJqq${IXu0K2c&+8Z
zALVt6HpPR(IRY==omq%kiusCHNGYQipTBzd=LhrUtxF36jG^vgOT0W7O^>}nlh9T6
z-ST^@@q|5`JlUGrI=IGWKggc74!_tX9Bvj?H;WC8Wkn<77RvRgAYl*-K0bA9@M`=<
zwRSWNS6C!BA+_PlFw-umd{8W?a&}+Rcfn~SK^?MhQaOKw%Jbrit4AYd?CKWo;Fc!e
z3%9HQ`_Mqi(Me-HII1@{4CB*5Ps+a#&qU@Z2r?uB8rLJ>Sb@|Qveg=O8ubKXo<J^q
zem4A-HH-~@&Bxv&j9*aHo!ABUKnnV(kQxOwV_(?wDo`-yQI<JqqH}Wd(XTc85xXIp
z1YZ3vVD~#}<=$HXN?7adGY%Fcy6kEnut{MiD&B|xUf{@772-ZicKF1R0Y$1swnd^^
z4Zm*DSrXDT$|0xo`o3#F_T;P;*7fnFF3=-j%h<&iG$01$oFZ^jYE9V#hH=4}0RMPI
zQ%8hyH5*Jk(5--BLkvY<@oM>anDdw%^cy?yx(|%MNiZF+r48jVPpC8-3rGmx<iZM>
zPy!0h=7q8w6#qfMb3%-I7!S2>UZ+tuW4DyjZ0gGm&gl)$n5{`O?k++^-8$zNUrb3k
zlBYNdB&9Gqcxo)Q>yi(Akav;VKxx=5uW#{C!4^s9V8OKC9Q8Bu0`ja)zxm<FL6Qzm
zp-clv{K5W6j)|dwuu@=h>;-Z#|1(Z0`OjuYAwy$p7bnC2wk)ew{!3|+S>%|&lhh#z
z6XH}VxuGOH1g3<fgrWt*UaX{iPi&8CzTeT@9p5<po#+OY2s{i*;9D%{aLJd&gM1;4
zrSo&0>73Q{w}-b0^-tO!2_v#q!+UBV5F68dR7A17+(}MUm=2haY#Ynh--ur~5OnSX
z`>I^!o`SUr5b@4b^MXnHhvAiL{RZPKCjtyKj@tq}@SlB=32uADF$zg-FY#|?qaV$O
zqj=m#;Mei7c~X4wq_(4dtogW_bwCloE;SR)LDVlrGzt}HETv}>;&DXBtsGxfLN+kG
zjre}XSTG%g0w-Xn+`LpXCX?ADzB|l~UeXvSBMESg*!&gM;I<KQnAQUf0woP~v3z>B
zjWoOGz4Xi*Y@8(*6~zU`&~jsfGaim>iGh;OaIx5HANf3hCBeKdw71dx@sDqGa=Nes
zOXT1D!J3P&?hL-DZ(6muBO+#8*aAvZEw>@SPlq;wy%kxo{Uu$2S5iK6Pc&Ov^XcEI
zsIj_`=z~Y(^N^lqnSS>tu}MD2rtKmxru6tS5Qnrv$U?X5bw8~l5|ksHqbK=$E=s}N
zH9>T(TNDRdtMaFJ9ioJ<&>9=d86mSd&MJbI+IF4=&f2N@fyHBt&_bJ#6NF|0IVim`
z@<iDVPB-xS_Gsf5f;&vQngq;nGlTHY(ak89<s!7oW*IEVuYL+nV#1;Wt}mMXt|2C{
zoPK{His9VSI6y4w@o)EV|1co`PkI*6fz9k+t2iKc0re{u|H2Xjy>vi@s@*)zX^YMh
zZ#0q*6^e8O*^+^ePKqIK+c}%J<=zYnvi+YbkekeW5v%Rs&}{zgR@S4etIXBs`_~cq
zPq7L!q@ldrQ3hWT+{GOjV_)mUfOL{rW;z@Vj=Fv(oc4wZeaewnJ`)33fQ-0UJxJy(
ztq{B!E40VTH4wE&9#E48<XpH3dD0~q^YT0yL=ycp+<9`VCE%(*cI?C**XWpUHAQhx
zT(P4~#wQSs8No!mz!7%S1t-}uSZT>f9njn)T|n^c#U9osIZnM_T79Hewvk-EdCXEM
zYs;M+#Q(}(ynQVUNX2yf%BHe1nt%OvApuEd)f|(RV@z3peSu$ENpE)ej_hu1>U2#i
zY&m-{a+yB2*jIiwQCfcmp0gPvjO<~3q}-`xXd6W3Y`Yu(NJf@&wB$cewf@{9Ba~_n
zb7+3+vq@_e5-!Qd6hBf1gNmwRmbY%dlP@WLTOUA4k+YW`PA!A0VQQfx)QL^;-aJv~
ziCr2l7g9W)^Lt{O3`72nQf%f1wMY7tyi(H^VJfdB7J)5eR3bRv4#C}>OBr8|xvR}U
zv20d0uJDXFq+pF)NVHjzN7z(p&>^|t5v}xuU+)!GEtC6eMT<+|FG~KK484?mAYy<`
zk|he_+$NWPd%}|BfI2HN#uS~T5P@{T-<=#K-soyppH}WGc8Xi$BhC@+j#h;Ey;mX7
zl3rtW@J>XL;xqz-_Wopguw-<SE_@1^qq%H+gM_U%I`yR7!X@*(j6}%=ks&`$k@En>
zj_C1E!Az}XG_EEvo(2CFA(#4R3HJY!I{jP!S*`p>K%>1wVzk(#O2div!R<u1z*dG0
zgBu4zpf&V@mDHMa;J1RUXPfbA|C)IMvT>pj1zvVym1Y=J<8Qx2WuB*Vr#??}9%Vg0
zyxn1blJ?*Vu1u30tb%}Z#@1<cz~`ic-!+45Wl7^yWK%T4@}Uzh&t*!A(7pt@a-iJF
zzdApW0KAXGOehzF_6;N}CHIw;br@i|no_y#naPSUde9R|Z>bU>R`4Z+Z?WTa5U<1I
z)<pP>Sc_Cp@0Tpp5c076Ac6JVaUlrNnTT=Fik}}>4k$F*jA&N2RIuAku-0x`-@v4W
zPjA5-OWCSot)mCzE8ty}bKTDW=2tfuZ6TS9-?QL^*JF*!b)*FB@=tXS*ltO2mkv>9
zwoMt}3)_z#P$crZV4yOgy4%nh%mIP|qv<YDDvc9f8|?OSWcl0ejj<7-<Bl&|JAEz~
znthX<v|kC)jaJ?<u|$b$UA|yh7ht^hg!%19XEV?U*OZ3AOCL$R!gUs8$Py?)Rgd2-
zW}BZ~nz?2hKJ$?}0lnKfXLrBK@WBmjJy7oR+>V@91b3$stoTYUC~VNQ`*$vchu>Qr
zjL0He0iIb6<Tc!^q52n+pq+np(UB3#QbY&HI;AynGBJIzF8>W=J-i4Me9z)E6ENHX
zgPibm4oIQir)@a&F&ig3q=$Gk4nAOml#D?-r=nm2NRJv~c%n(-lFO&(!KCrEvpI(Q
z>?d)o%I1Bc8nZ*eq`D-z7<&x*j7w2+oXY{jWayo4LRj+~{EzNHiil}k6d1f;|CW;Y
z4}<sLlCgxnv&+A-aiYGx5;N9tZa+2@Rs+I^eD-ub4C~#Xr?E*oCaVcj31%93CtYYi
z4<h}^$*%JWdN_sOC&8qfivX+xwT!Hui}lj)rKSFUZ}0D@z07(TyZh;}n<OkAm&Ucw
zh^mB80(wjyM?5X?#VJbtSwLe%(aBGMjc}Fu92OJnd+GV?lOBVWV+nEriozVGTu;UV
znc_lW0$nFkUH_b4=gnj?jfGQ8(6!M7V<u>WZ;SydYFI;s2DfUCw3H-RxVElkg<mM$
zvR3kNPwU%|94A8yPSutTG!UbA)YuRRk-Jr`7uCfGxPG3;VrfL?^F2zbSQM*G*L1UV
z-WtU4A5~nrMKojIf?<nZtaz$gW#bC$el;>h)46sWxbV%V4Lyj*n*Xkil7%<*f~-D}
zXC19FFl=<Hd?gm#;+PQ_p_`qiz*g+MrKPh?%UKxgnsod_?WT5dIYvzz{bFVARNynV
zKo#g{U3-_fi}i_Kd!^iw?CzWYi$~|^+=TN`;iHJQ^gaD41lmcs;e`Y2Lo^O{Qu%c8
z7!5}m!xZ?+AjS|VO&fpiZ^%`bs%x<H$_wfS{nSrTaNj^LckFPkcHi~CiNB!j=w8Uw
zx4?6~KwW=A+<d8z7EkibvdW!pO>D_Y=#MtFycD?A>ys=$P=<@}|C6mKF$l4L4cuS=
z{x;5J{#lX)Dxd$$diCGaq|yYCwS~qnH!s7JonR&<<S95_*o2ZogCQX*k<SK7ov(!A
zdL=XYV``G?*5g*62pk12h3<)JhlfwJu?(rj<=p$+*{8Nf(Es@wxtHORp)dsQGl!2y
zn}+bFIC?6d&Vxfp{)>j`xPYOBt*iW?%(aLKvwyrMwsfQWM_7JC?MOoYmTJ0>W)Z0+
zz$gg`)y<VGfz&W5(mxK}yUGc0q-$$LfRCG9L2~%)(U0z#Aw%Z#K!vI{MV5<W>so|b
z1IJ5GcQvsAYs@QF)IfQsGw2j+c#<56y@Yu%QpZzAlJRTM<^8>@q7wf73noPZ{-M&E
z#?EW6r)L|+4v!r;kg)|~wF2*e>yE|qLFoyUd>Q<biHS&ycr~5pQso@D#E$aExj17(
zUri%ECWHrEyw@$*KYqp{$SD^0PjB;^6j7R7|KP0+V5f;ZscU!5aLu&{p|Q?vlQ1>I
zzNBxvhjQlPiH|48zb}@`T|y9R1eglt7Ql>C&8@BZfjwXpKT=)!1b)X?bK5dJVb4yg
z7s4tKS|O4RbJh?~G~036UeqARxYNbAKG@9j#XqOjrS*j7PiQNhK~0(c{paRu^1z><
z2N*Z1f7>kn!?^js^3(roB~q<20hG$4@h=2(IqIx|Q^np=B#{-nYSSpjSJ1&K1}Sww
z)4-{rn(xUt^2PJV44M-Mc+fq45`c9ap)Xc+Q;>ex;1+Pc#NOt8e?EIf{DiwgM-<x0
zLANon-xCd0hIWG_jX|JU#ylDAsc<6hL#0PKP!k4B7sRdf!sYH*4U1|QaRA*#R1v$0
z>)=O#JDAY8?cvQ%ocR2td~X%OXc~YY-5RnK9YC^%;DHAx)K|Bx7JuaxB!OVc;<CTx
ztq#x<Ax7M|Q5$W>gL6ltuI58;qnRrd>BN_h9_$G-zKo1etf}I}y7k2duQftXNVa+n
zi*3)ez;1i>`N1^oT;WZ|XImxTW1^AP^ltcT<b6T%^kMvl4_NozT*!pKJ7Vxiu(G*H
zG|a{etjd!pd8)mMV;iqumXY0xDB}ngH)`v%(^~K{3NtD&ho8goEAT_P((#TK?(_~D
z1NPE0v@{&+V3+$df?REw*k(#UVdOA%aUs&PoQnop&#|>&YyEIPnkQFDmRa<fpWl|>
zB*ETp>JXjE4GR)r4;tef${T7#6(wUH@2^wMuGwHy$^>BLd>qx(i9xLuG*10IlI^C>
z$X^$WmrD_zqnJ`I>UqMhdWT>oRGy~ecOC>uafr{6!&y%oAWu7EsX>~c>Jp|<rJ_$|
zy_Yx8kADNeVRx|$rK^m}!Kh9arbN)=F>;~PB0D9c=<v###GRpSN=(ruOi!_Ogsiif
zSxUQyfhEB-Mma70Zl6s4K=`AqifJP%@dL~1)c;1h`@h5XUuKHcD!R&lq`Um)bq2U5
z(Hm`r$`leh5>}R!KBy+JY&C+@ogn!Wj-(xqlXElP{TU~*kyt4IZ-V1DW?zd2G8=d^
zH?lUeyzT571pR$KKnxJhAP(ww`ujHdF5BB;$H@qG@`J=bV_=Vy5~zJfLB}dz{H)%s
zz*I*eY^O|P*#eB)pL+tX>mB0Ctn}rBXC|}gbGTd0(}yXaJ=$hSEk`H~mhi^YI`Hvv
zA??+vk!?ePrp5UNE0!l^S5Tqx1fwQ9Bi)ZZDq<oLq3;&Lj-=xKgko#QUqXB2CYhN1
zfM*})FdQde3yjiftz7}X1K<bDs?a6NTVkHVUc=+_w|@?Fpyw=Xk|JZ#`uZdo+UdN6
z?h-!F4C`{H#*PrH`+hejDSx?doYlk0?-5N3i8)XFO-7P(wCG<{->?}YSMY_cXi=Fb
z^Cd#}>q(c=*D_-gOE~8;Zvrcg+c@#QpvV#Ug?&@kx^qK_o*-33`MTlRwlo|rkMZkU
zk~RrvBp5r9eG%>fhU^|VZd#R0nMJ$vU)u=wmW$>N$FO8ZSKkbmAaQd`OqGpA$#C|}
zSITl~H#|*l_y(`{1n>H2HZ4PIIB79#yT>x}W`@W%>0+x~O^(TnI6kne9w1N&m2;`B
zoDab0j5D+tn{_7*Fdo{YXb()Ww}>;HQc}j#*C^|1NBsth;kUF3WTXyCJ_|&UjU-Ir
zGjfst5xbx|ya*=oXC|8xLmOl{+U2ge?qxGdQg;Wy*mYJAWw!R$dl>u6y1^_kDohv{
zyt98Byt4nSRx6vj2sxP=T07VS9lHOmSU0O(*rAF8<ti&%x{YjuaY~^|uxZ20Fp*%k
zAe{j#X$E^fY#b?10kdZOS{O^bOJ1A>h_g^ML~#*=VAr*bD)-Za)Pya)dDjEZGn3O<
z-j~_!tbTV_+qEEc`L;WlziBdQE%63a@t5K8M5&_*73EN0WX1Jj=+3B)HD>F}2Idui
zIPgbPZ_L&u3^z5QBd9_$rQH+l7%sNH`fizXHE3D$TWqdZ@LMcr-Y@-Z0pJYCOnlZQ
zSj-XOJHD1%Kl6@<#y&+r?nt>~Lepiu)OwpXo`54EfNZh9(1ST2T|ZPKKX};B$wR!i
zo0*9&qG868ohe3l9L2sQM6++d8Qp58-~Oyqi5;T1laex~E+*REKtDw^U3=i-e1z;y
za>%Co0LrMfR43(OPdt$OY*=gW3;!g2g|sA@FfkwxuNr*aj-Lb=Ags6RnTjim_)P9s
zu?yitdU<(WXL|L-mS71z^04l9JoawDgv|fz#n{fD5iQ;!*gl-=bSQrDU~c`>vgddE
zP8~B!91}85IU$Kac`59en6S{%QT+`BEH(m(q3lP>OY_jr*`$Fnn4TnY@t?^fcaiX=
zkZ&u(z~)O*@%3#<22Auy=r_?EkFT|JCZ*g|EHKH+0qYc}ZN^3jn6g<y!auKL2{;|`
z8Y!0QP50bwGP%Mv$In2D+0~PJ81RX9Q3g&y9GR>9L6lWzlPKfm@i?F5&gcCQpV-(&
zP&wsbtSy+co_~Ec(ZCtl@0qVScDwlYd4JceT6MLiy2{peiF0(}&=K|o41*_YOm{t&
zI-d1;w~$ueeB2FhE0S%aSnBCxzK3}_IdT1a+EFMYYX$6DMDlEOr;ggt2K3`VWl`Rq
zxjo`Qcx;#{RTLqt+`@!M6u~^q<ak5j$W`#Eul&;i?;GLqNSVX5f_IA8`&Uq$)#iTX
zx}!9Y@G&6@$9L)k#yBq!;AxF=<8$|UxN$r!mElQ>B>pT}npau1=@)74am80ucq{p@
zJ-Z{4Mll;Xl&#XiHM@8;Z2O;oLW8tEn#_*k<tY%{ktr2`R%a+!1k4r*MYesJCvR{-
zmJEsb#SW4E#E8&OTjAO}Nh`DI9ZotE=M!Qnly1&cq)-xEve@L=U@DZV`bltKy8)sg
zM-7eVZEU4+dzYetIw-IsWB~>YH<&|t_|M&0+BSNZ6R^3O_*)vQ+&}y5|7~~nmreR#
zLtuBxwj2<_82(PZ&Y&A%@m!c!KxGAD8d6X|#7rWRAry^-(#3?`lE~7wY3tT1>w}To
zCsHdxb_3!=wV%Fe1~$Y?c{!A|>Rj^uPS$)T=j~5qE>feB>02lTf##^eR<LbfuQ4hd
zhLZ-HV#{nSIjX!YpYiCWb1OX-tac7%plfPqKC~<yE0%YzHrgj)J5?_hE#qU_sdHt6
z&01xHG8+E+1v`QWgIL0j18Ozj(9T!BxYM39wgOUY7L^LW*}Ck)Ui)#kh0kZXHYcJa
z*KOABDf|RuF?HGjgwHWoYks^|&7|Ii!h0TMEuvVrfV7zA8YXz20HVhdLNc81NlkO5
z=#HjhrCOvBqDySnCT&UY2%EycH7W@1KDX*#vY)T*);o}NYmd1lhzvz~Vo@k@cPbKf
z591>91lWkqKVtQq3KX!yCb)RH^C$>b_INPk(n~&es+zAbs5ZflN(45*4mc!~puBAH
z5?q%M0Y4`7n463pZ_-o>?fJN!EhRsK^|C!w%t}%Pw76HpWaR~#1B7UWjO|fFUf7H)
z3MTqZh@6oovbqaODw^ZspfsShBM&~+8!jq`sTyMNTJKdmF=OC(Tkq>Z?MLW~dUtq5
z+~k@6jH%35b|u%tGAO0;SuPoO(}o`y@!9+!uX2g-Viqc!7#ewcuONkNv}BP?fJ&3Q
zHoy(qEau2<=_npj(Umsr*igVN_7?)wHiC8BHcw;&sxK{=bzYyD!nNzWqsti#qE%>`
zm#Cef8l5SbykT&e4e2z2$7jsk9a8r^W%l)GfR=M<??Gdz2i}U!&PJE}Ajg<gh7@|7
zxUtSyQQvi)lJ;O=#RyU@IDT1W38?;9l#d_8(an@RC;X#rBi+xPjR#h~hrj&{^8f5J
z2-}z%I{k;*2b5|`;{v6csD-%uR%|zge%AU{^e$g~kmy3N&<EKgAh*pq2Y5O<Q7Ibp
z{iWkE{&Yl<x~i#0zyCUj-^Thl$sGz*Yi?d;YJakR;tInVZe&sf1dXB4n8F*3_d!7|
zz=Lh86r8&Q)*{>)yaL5ZVA@L)9q#U^h3oUz6Y}@UMK~5#QcK8xhs9Ntf+1(a7B>85
z)MzrVn5et5M7`aaJk}^?zG`7?ld5715A(1mMOM2fyTSrq@*%BJUYDe|7g0*1Cmj+M
zM}7U`)=83-32*uVVuIzXMYfrH`~%!c-4uPY$L5Y*nLEvqIg%UmPQyX5zaWyFj`h4-
zyB!|N{$^g}*^u;hCB+X1Fwgf?-Q9ncTb94CL1v4iKCoU+XpevO<1zO0V+K9oemUwO
z9Pz&8J7ob|?!!k*u14YQuzVGtcq1pP$cGB2A<l%2QLdf=ztHD5XKamm!}OfupmXCU
zDXb!mlB#e4G>h6Ay#U?9YdGJ^#l6(r<L_im--shf2Z<qXtg!~TbjB&JRIy654@zOh
zoUiJ2)ZhMGq+No|pX32YQL?`sMgL)N{5K+(n4z(Yy_4r(sd7r)+8q@rBx;pqo%%IZ
zsN@-@!Au`ZW${&8+A>c88jVUVGD41Wfyo8P=Ta=Q7ge}<^YghQJT7gU)O!E){l#A=
z$J=~Ojw0VA1Wk4+quu#v%lBdRXv6ywXmLsC56bl|*VJYx5J)*ky+x71X4XJ~W!dwP
z4Wutbj{#Q)z{l!ikn1GQ1)QOzn7Hh^!q|^`pxTce_pPIB#n*=;dZ~*siu=hAWBB>&
z_agwF!t72jsf3-K3;@I_Ee$xr>SCPDje34^jf^zTkoPvD8Wl#9R4voFLDOm8qV8C7
z=5)NNO0_F$dXKl%l$~+&vg(bpLlX1^9O&x$Ka?QWo#+=?lv0i`_&8l<GVh$YrvwVQ
zV-gl9&=#A|iwyyTSp^JjEd>byJ}l0vnkvAPHb0dTgC$V`l`gtC7M~#OymLNL*pSP&
zaH`c05Vfma_Xs!NLKyKIu6hoc8l+0ZWwDz|wT%(UcWUjHot~zQ%?em%WMp%ojm$~Z
z;*LqR1WK=w@Gft@FSajc*~Zm2pc-*$@RBNp&&X)!Nb0p(MMmsWGr-&e#efSn)tT*9
zzl3%7Q%o%)JdYS=7Nb?f+&2K+)w+x;zsRz-6vk5XO}7y3`OGz(BNTI>CeEpfG&gr6
z4K|jNAOHm9nTzdw5y%q5v-tM``K><a^yt5n$##WVd^TJz$YBT-odIm*pE*gPN%N0b
zrSkPBvC0d)@U`#}_pmG$8L8l7=W{^?s*fx(%&nvDYmAdVa6fR8v>F#5Dj*G8!;5}#
znydxkEiS<^T#zkaHV87D>0m|^#UmIgj+G4+ACN<4ca-Dksb%Vw98eTm`s+WjooTZ4
zRC)=)tYb&Agqq(~Qw`7*Ucw!<8GCXtI=5QWIY&#?v1>Np;*6dNBD>IkpWC&lSvi5l
z$d_)Dy<(tolPk2nyrNmOakcp_SS4n^w8ehewO%C*^fTyw*Xk-9w||O2?ny0OBeA5|
zUTtjhtVlUohSVBqiq&et_%Y3p%-5tohs8i9&%TvRk*!guEHYhJ1yS3ZSG$f=-9*sX
z?5UOBVCNLV5EjaLxer@qLdKn=JS&58=+kgxB^{Y@LCAPuS>HwJ;-|8u_14vy>%AId
zyD}YD6EyyGtI7TCP$8EoYWXDD&dab!{!BO`Nh{_T_CP#O+@K;a_#OAa9FIZZ9vbLN
zpni`DRwa~dFgy4I`armsL%+8b^rbcMq}`r+PdfNFlpagqiSHONfBoF=*!9-n9<GqR
z`i_sm%=@*K=uuv56+O@=Wj!6MGE=&XDm0FQOk~z?6baX)zLYB5oh(^4KNMB_<z0H(
zz3B_=+cN|+PJ;Z;3BHTM?A><wJ;n!YRZv=cF)N(iqz+%!l>eOTjrZn?n){Xc5xS3b
zb4*uT*2Q$gmXT2^b66TB(RbKAC-Aw^cj`PZ(NJ?qIa_<clP?OY9{u++$Z#ZquKTQV
z#AVbaeUNC~cG+BT=rImvHvfv`vYY>>ujd8cps{&^X?&91Q!e(j`Ic@DGc6<;{?T7-
zFpzlP3_Z{~AwoI$#ONusB;jYHz#;1ezu}8Ud3|aR#_GeELlM0|E$e=#y4`gQpxK8B
z$mj*ZD{{x10EmzUOrz`tH@oZWS3!sGvxi>0L3dHU#k=@R?YJ6I8LWm2bJ10~?pa!~
zM=r5qQIwF<qTJ*Z{$OQTDG47zih&ToFXHx*DF|NDoaaGywN#fl1CN2rM@j1qmr^t#
zmeNKubWf+E1S>a<m^UOI2bY5=$ci*-7Kgy58{m<R0o1GM{=8ywdDImUR+~1eVBzIy
z`z7ikMt#LN5tE;M&efWLe^fryxDT2GXMoT&Z<E&<TtiggOE2moUXKWSuINu^cHPx`
zISdEl#%Tt@VXq5ov=)s?{lGlu6~5IHcbMwPUB`zux}+yGa~`u@pC1;jSQ#p0Xfs0V
zp&G2%r&IhZGx%3#;XGohWNnQ^Zgrd<f@E!cvgZM43Ga|iUUTr)Dha_3hsNkIGLCQY
z+A%#_2O|%U?3JtGA<aX$O0*%OK<`$)0AHjwRx~9vb4<Mk=)w~grg8XRXU%^0r={Zq
z>BXv;e@F57hm}dj()s_G*#BLUR{bxnPI+^sYjg7-N{=5wAUAnbfz`0Zgc0<AX>~Zs
zGwI*yMUnXaFg@9`dE+VzB{3V7HoLt=G5dLVe}di1uv8i^ED-QaN1^CYw_^}b>|7*d
z8jDTA(YgkI(r_sW(2)&kK!(D%)GF9lE>c*~-E9p~4F5ouS?`I!s$jR}+q%HTFXP%#
zyaH6tN}<B$B0dTmE-Ksx%&ECI&$!w^)gQ8>uO`IrndOD!Et;ai$P=)bWb$z6dID(+
zOa7%7I+6Jf3NH1*rkJ!EuJL_1!iU>_{R$sJYMQ8rOD{!^G`#gkl6S?eynwBv;)c(l
z$PWopDjC)Di>s3Nw*~VS?AQ;(V-KA8QfCJWPd8<8l9z3aLb06HiuvN9LsPkP)f^mg
zC3=#Oq!YcwStM7VsMkPP*B=cKCHRf@Vm8o9U>chOU+5zFWP5!}6WU4hSCO4B|HKj5
zGL$=YfjvhCuqpk|<eh)`vi}nl^Ir&flJ+0^kC6{Jb{KM<ssbm}fC`--pSF;YAiyue
zc#M;=357cV5*;TtEu$mznAvmKzK_D(IYsqMwsCvcaovYm+d2G4-(SxjTM0k?R2VJ5
zeT3iOWU@E-(F=wTr)klaDvF6wXhv;CAU5UngKz#uV<aMm9q2uVnxkcAk(;(*G+G5g
zK0Vub0`uOWwe|Bhy8B{5%8u2+#(yG3k4+wf)oKI|yVn3Cc*kj~bs%nG{BG(?M@l1U
zP=h+XwxQ+nZSbDbN>4K<qs`%kV<ia~I#+-_gsN&eP37of#leFeIng>MAG~eqkvS%I
z$3xdFkj}YF#fSvIOu-?z;@xt%-rpP{<<+m7Wus>_dixeZrf{At-FO^6Co1lRem~E!
zklwJHFS(q*9ilWaUE3n)AYOcB6YQF+(+DSQ4(~U$dH)8B{*?lZRnL#sP4rsvSff<m
z-sZ$<h)HlRYaz(x(Aw;z&w|GAK>I6R?)D4y+JpH!WnIUI<4F~+8ybJAigL0_Vh@g^
zufC(=UU4;*aexVQ2EMl9?$@#qr=gkB{?v@Sdc3hpES2H`&aPvIU!`M@Y6s#p+L$qf
z!3U3lmDzbk#seaZ(+P50%c|9jWWpq62=5Wb=LT1SSI)~1>P6c0&R-RIx=^??k4L_R
zSEeyB2hvgi3QxEov0zKxkg>gRQLFZ;2Nsm28e+^{R`!d3ti@Dkg&RH$*0aLDlZs5v
z-mS@A86xseW&cu)w@fLF7v<+q=3>1^KW9Z)bBNKR*URenw3^BQd2xW5E0hwI&AL+F
z7W4J4xlj%|i(a`Gx^UmaiH2lGyW+|MwX_e`5dXqJiG-qxO11!<&I`&CQIExvgEE#b
zHo8el^h|~_?*Xbwk~up5^!Z{_{a6rJ;x1G|EZf8&p<&8PovL#I#*&!WQh7n&fK80e
zHLP%v8;9JF>Zi`o6q}s*S(X+bX<PE}Sj#kaB=^9{(J9|a`|twy&v35MxE7LE%>?lu
z+r#*$tSaU^B)(uO>or9z%h%w`toSaTYRrYMzyFldL5(=7pa9$dz5k8*@PGV{|Ap-T
z#rFWD*lA0NfTLXpYQ$&K<&nS|eM4JVF*1rD95Ln9#AsoiI&Zpd`~_1O-t$@*W!{?E
zq7;{L&E#x0opr^V%FX)S&;J#~0Q=06j45~6m=23+A<S^Aw;+HVOdbp6tj6IUQrO1J
zESI>4ej;mEs}J3$RgHVcYKG@pf>k4~<?up#9N{6Jr3O(q7X&`N3rWY;JLSrGzKdSs
zFzq2f0lig?`R%s;1a>O9j<2zYhVEjiT~k#_THC9n>cmPmlf0%Ctu>}H!6tI!kv`Ns
zbs6jBtmf)8JEN|d7GmIs%kF4}c8NL62%Y62thsH8?EU3V*m}k{OFt!55wrqG-mgg(
z61ok^+KZiPAx=`SwwdoO`##T6N262iIj_H=g)_eEa>^$7CA#HZbP)~oz6i}+wI}kH
z&(oJ%#KSBS4%Wxz1_zkCG?`O}S_2kOrVCn6({0nT32lYM@mB4qu$0J`^QEh(Y33Y+
zGkNE9k~}>H!{lioS5L|^ODx(a)GPEJbZ+nEPNR2Pq#H_XdiEi!xxMr_>A|@=er471
zpD072wF@Mfg3)4=#j{-V1*vu!q}gzfdK0+Q*(-B5!(yUEOjSm6OzLaKDnn&WjrK|d
zIMr2{z*KU^CTd%FV>b^5>sBC?_YKkMzd~E36KhBCsCz9qw_EUcoRh~gcri<V=+Xgh
z{C|K)9v9~(_T|~LeGTFXcC*w<Cp%dezB;E~!PNSd$H)eoR2!Giy}<NE5E98JZkZV?
zKwaViJgt4kJg!#wKw_Uw2(l6v3l{&gdtbdP$cV(CBWf#24Br@*r12%KSHvBCfeZAs
z;x#Yvs>nc<q?rMlG595Ur{hLR`mP*i{vjjug&o=&zl<2(SrI~2!Zz}&N5s<%t4s(-
ziAf@LIMnF8Cmy2kt9aVyLwGaEVP^3=b{yj*dHdkBUgeG0QmRr@8FHn+cmYkNW&4Z3
z;>P~Bc6|!}5OMj_C;C4@E=hmN=|?^=A-yX=ab?m}CxYgqLtzVu`_g(vvZD-xuY1-R
zif8W=YIL8_{4k@x?!yUwBOLdzOFy)P6xxVf_nyAw{@CVzZ2Io^@dRUl%$R^R60Ad^
ztiY7q>i}!XCr6apTecw}NtD~q_KOSF5e@rAf34=?yV1%lEtJ_h8{R^5RD?ryvhza*
z(r3=iyBgc=Mn(dfPJ!08R;3lwuw;=SR(KVgRP`XUXm4J#DPs8&lGBn#Yp<3j-s!aO
z_N`bn=)0O?zT2p>ycRgs!}*5Fax?7sh27^FJ)1v=fhIqSm@&klA5_=T^8%K4?6H}l
z;(;;tw`vnjPq4xj7~I&9jOrsuM>R?IOeUR4<8f7Rt%k2H4&)EX<Jj{php@4!B1Gs7
zx>|j8KAkP&1fTU`=%qPnl`Ypvu1|kQ(|4A>7ed^z@Wfz4G^Qyt#WF*<8&G*fK!lW-
z633Xsrd((3zI|Bp4g9oCfZ=gE=S|vYuZ6&1XB=<!2=eg{k}6nb)9sk=o9|paUB7RR
zJ*&heY#Cp~2NY*UEf<Tp1o_%7z(5;|T=~gb?&;rG<&7Pp$+&a7PB*IZ?zjp@O(^NG
zJK%8#ncoPj1HvHL$yU~kM^6rgQke@e1!S)}f8Phr0WTD~eyfr<d7M*b^aFW~$gw}B
zH#1_TJf<~!F&_~3xdab4qTt3Ly<^S3=p(B3{I%ePNF8MaZQS(p2Kw=2AwK~DCzFYh
zWfaiC17H@aa7ry~%W>e8itpZKkgu<glf9_JUl3&WvRbaoW<C^>jZPa5Hw<i$M_EuA
zRpy&Qzp+4$#kjG+Cy>0!6RsC;Ayes8AOl{V);*S@P)Vl%%~pX^QD#<ImU9+4wJNGn
zIz*(-KrWvI9=-kpjueVCB+LbVj_SW<7XHJ}@jqho|JDAfoLT+BFD#L4%yeBJZdz(t
zvSPPlShGE=&I{AfVmlzA5c$o$3O_bHCAT8oYkotHRsjJ4JhzN8V-pxA`g`~D`D7NW
zdC%Qcy8Y2>EaUd4b7Mg`e02nq`s&?`0JIiYof#t#2-A&O2W8>-uelDbNIkf4falNd
zq&QQUIh4PJQ=tN&*^;p4FSznF6aBUupnCAQ=SE?@?CD3~LarQ_Gw?k4Tqyc+URjb_
zT<Ebw_Nkg;sJ;#gD`I}_eJwzuq^9Z>hyQ<gd#CWqqitWXV%x6Rwkx)6+cqk!*tTsu
zS+P|yS8P=(MrZGR?!Dc&`|R&Kw{Q1)T2KF%Ip!E+j`2grXzX!_0=7N|+6aT&uZMyQ
zl*^LL{RnZkGuXcAE(WhVb}N^*K|hH#Rtp|{E)Xzm>v5;GA`ym--uzJO?>%Xo$D~4v
z@H)fF+2)e=w2tB?8k$S$P4gFsp#%#YA~mw~VbcLat)>SXd#g%NTF=1~Gw}*sDZsHN
zJsd9mJ_f+giwvqFV?cjm1in41?Hhk+C8FBW5Wz)yef^}OT&+0n19mQD=%}KCsx&;@
zA{<}p$8Z0<c1^TFQu^XZ>DSKAF~|tH3O$&9=Z=*&?E(c*MJ4b7N5wZgyVBC8+yyPH
z!KTl$Xg%+u#(UicUHQ{^bC>%=$6S8^-}F^N4WD?&9Za=vWJjFS6w6<nNRTVzP;b^R
zMc%+DMLUFZ))0;!H&~-fT4e|Mgj%(`KZj`bXr=-pK6=kLa1IG1KVOGVK-6!UM)Y#7
za)4(;wqR+{+@aH+J7%_DvahVV#EAJz=+h2BU2XnmEjj_cGQG-E!GFfB7~6mj&sW@L
z{QnoX|D#X(r@nZpRMND&oXNUs4f|hIb}Yx@C&hZzhGt7iof6brv2@!o)4i*&!1YfH
z(pLPZ00C>(98}DcA*A_{ZlBB1RL1k|pL36Iyp|a8qX>AIm0q?RWBJy=(lv)eC*C+*
z5hIdr+-XskWL{EclufjOz`O_Xg%~2%g9p|8J-;yNcLlei$$0)bKWF{R@*lZm{t97r
zVzV;9X4>vr=oFv@z?M%HWzg9Jcfkt<oQ3a36kQ56xL|P}7}zza_)2r@^*dlz4SA9Y
znK17Hl0+SCe6%38rHa2c$uoQCZ7%!A(4D4u0`{18r2a<1{mQ0dVj;olZV7ZKBTQt0
zwnMRzIN4Fc-DvKY-Nj;3l*)!U>mhdQhmlWd(p-wfM7G0wn<`;?rji>X*veu8EaWH)
z;aP8RSNn1Pw~YbVD^}YNesDF~p6^g@Y}o5jRSJZ1VaHJb6Ds*Azv97+-L39it*<WS
zlGSZ72#3XJH3!XB|A|}f<Kj~VAmVL<$<M1!li@>d9dQJUZ+#{s%1^Q_d0~Fes`&?B
zhDargq=vf@<e^@=Drtd3S~DC6!*&W;e}0f1I>lkEn_r@Jk%o~|@TZ^9mE8Ftgl582
zpr7;+%<>Hz#8x`b%n$mYuAnOLtbvx_4rnV@vx(+#W`z@EO^#4$O-FFdgD?M7A6Lf{
z!UX+_KlOhLVEEsfH~+)2uSfOrA6rd+5jedG>w@pFB$28YP>rzuhHN9hzOzBdN;7@n
z|8u8lWp0u6C3K$|NS6798%w^OS->_nc{AFl;AQ<<<G5V$yLj||KHVYovk)SXMg<Yr
zn=uE4!rNOUj06SmF*#Fd6<y>f4j4nqz{`h2LHy~Z$A*0LLSDSE4=tFp0f{3)G23M>
zeoPG9%3P3}75rUEzMqQq<?+SBCLGRp!&61f*+|;msxJOabE9gz-f+7d@%>2LHi~Lb
zPDxS{7V`#1WTuf*^uT6~Lpc=wc^&22k#W~(u?mlVkRlX;Kc#?e78`e1plohZeZ9<k
zMK$<rddc()`Mvye&gbnrG6(PBAHzHwtIJweJ4CagZ(-V>jXDL5qki<3MYt6=>?_^m
z(2+*1n$niBW0zu$ONb#FHP=@cg!nK!a~4`%F6PWrZ{)4D#+OkDR&W_l^eN=Dh~xEy
zFFzwCv+ax!)dq+4HeG<mQ(}bs3>5WKOz#$iv?vjm#>3(}qhMhTR7$Uh&qZ|)3f=I8
zEVd7DaYkKrdJ@JtITv9IfAt9j-oh!a@xcBnR$6}IjOM;0vQu+YWg4}3#<p!Z_T(zp
zMFEHVEF}1?uLTVaU4OUI{9tvf`a8$_Q|7);e&LLHjXKliZ~{it>lPgBP^DOa{AZdK
ze&G*80u4*oBsWBrcG%acU2UupN@O^`PmI&HGVE%#JCQ?^dJ|KDK`)hYq$KuuI>C>i
znME`B?x0{f&@}*lCCu~zj%wOSffMFR1XU>Bc$-VRluPDW)~J}a+~N%M)voaR_AM#4
zpMcoX#^^K5Ke_{8;Ag1iSCr%YTVa9!tx?YQ-{>^|;&*MdyX|GN6)Q?pBcy%n_@Spr
zMDx=#-&%~c3`7~?w%sXpXkabIciiJAIQq{as2inUT9m>+LOs8yUgU7Ix|n;IFYojQ
ze87HrI2^|hr-tH7Q`BmW<tGoj!ErjO(3+vO$!;2HX5QpqJYs7GCrk9+?~lTZmndD%
zHP(3t84dp};gT2EL&?3d{~<a5#WmpJyKfNyi}Bo*fR7>|Br9H*P>ysI+*Kljh73Nh
ztiSdQR*ZQwJrM2TjAb-IktXCy;vY8&Ajx(rH$JTBSCZnBH$D#JNWal!6GOl4r7F8P
z+zN-U(x)1m`<3iFA|ik)I$W<-QEC+i&YK{J3k9%h))}q2QuJgF)mmp+!shq{Zm3J0
zM2HyVT?2@8)(G!l%Fgg585I*4U*%AcRA<E@)bKD<?N-Z~zghu^6yJU`Mr4XJj;p=g
z7&|Wbm}iWMA;iH&uUlq1g)0AY0BL3>1;WH;r!>T@>iy=Sn^{iaWbZ!Bngvr!mt{|B
z>3K+BmK(Mc%Y~YM!<4rtW<_o&cJA9JPQ3^xgG5>!25jdm8U38iK7NdUZn0jc2aa})
z_9>X=B|6--avsJDLjuyAFmcRWW9XlD==W;iLNpLue4^t6B15B$Y17-O;eqf1EmZ*E
zs}=B?#F%I9Ezj#MbbFcXVTa4RKaJWNJ2{j+Adc$+k=2ar8djxAULmQ8*rvpG-zO@#
z_Rnp)>u(=V(ystD`2Qjee@#o&jhwBFjBU--zX;m@S9*4h+W9}y@JA`VZ5JJuj?#d#
zn38lyHKuAYbgDLKabUsfP~M^$Rg{m_gL2+TKyTp4kHQF~T@jpFhGA@E5o?b`Rtt+6
z-{XhNnYcWIKCrQ(<bLogh`ruue_83ViC;$2Bj25!WG5Aw(EeeV%95x^&KG|ZU*MtD
z=IS5@;1h9`xL~C^PbJSz9MIEfM<ryw|J@FR3yWKeykt|o>~E0U;#Bjv&Z*SNb)>T|
zuMvy#@s=r<8-1{y=1|>u%<L^wXYZos2tEITjeJK6ogj8_TG~|?sqv1rXNS${Pt`$3
zfAl8}XT~hGhHpshk(ftRca^byHrM0o>b9SgZZx*pEO(MX+TMs_zW(8XLqkwP(XG-v
z=f|50Dzb^th<L7bB|TrxSkqcXZyz?EO-t%l>9$Z2bETGCz&K^r<xj;HM@%40)Y)3n
z*}29R(y6qy&9g>s(qa7?OQC-zWVeWgZpi?x2QYz9s4xE>%nSkMIl<)3>~7dloF8Z=
z&HA;4Vy#vLtEne+lIceBqtYC9p%Hp~8LwXkS%p)2#6ti!3z4DYNbBVXg|LTdY@IQR
ze4r|pbtKy^9xM|MDz<d%&|Xzzt<W55H{6v@)jQ(M<baR>;4Nm+xSt}6)_#mUx(%*=
z7e)qdg!Pu;ol!W1srw~s&Rac|*8j>%3K)1XDUn;))s=PuPa*l?KTSY_3^5TuF8`jj
zRrR^nH<RvK>V#bu;3XIoK9Ak6mN<C-0HSn1$CvjC{{WF-BHBm%@PN%P({P%wisJ1e
zMV-FiVQNf~eXvG)pYRY7E9Mwu3W+*SJk}nBzJ*RoHaaers(UcL$8*V$-9CV@E><41
zM*)FiX%&s4oNwkB1u6~Xh;izSB56nS?vNS#egLf}=XIC--4CQfa}Vnuxg2b-6t3p$
zs!adeT(0uJI0pF=crx>Jwf!<U`JZ40|B=p>_!S13(D}mSe^8;*3`DLz#n%sosQ&&*
zQi>i{cqMOK5;jzePr2vdCTzS5byI}QSb+8m!boP;<M?rg^7(!LFG4>AB+Bv}QUjiG
z9C5p{b_dGfhtnGs?f_hYi-4Q@sjnxC$;~K568yWSm6t|ZL^BczwIt3E1;((f=F(lt
zNmoZD_LYf=OYTe!wVK`?jnAGmuT=|`r%OesO3VSAO}3QWfZQc!%f5*S{cLT#nj2{n
z&umE!GG+%pOGpK^OhMDb77;g2VMT=<je{EA-i=4uANN)$qI3A9fax*Ecc?E3Hm)Fv
zzC{M{EMsMaUon!8C-CyK`u(XPd?Bhuj43a|w#Yo1w{o3A;jMG$-K||2IsbG}VmI=t
z!}{94Kz*Iff4+bDUp$xp=NI_@SwQyEc~KpiKhjLbT@;iAJW=^h=o=+<xo^u{dOTw|
zHabor8EcrZL_(-ie2Ho*%i!P*qG1?dj(YG~Ks9_T$|!O9)B3%=%fjP&yQykvY3I}T
z33?ayg3ol5ZWn8cnyW5fwV!%(&n%a}O)a`ylPbP*%u{MOJ<?2FLp8dJs;RTmSa_H~
zeMMEavb^3~V}Ku~vBfMCcA4C?E$91RGRqXE`@O?{tCns|2;1IOQk$jdy)d9aR8eUj
zM~wP=2QWMWD_q|2Vh1{BXy-AyhfA7-6E>Pk?qOkw>RLsb@^-mLebUNPWiNzUo{N&W
z&#Wd{gI3*3ET~bnCi75CMtEjj+knO)-q^ujwVD_8_m(=kwtSN0$x&_7HTF+54tU;(
z_j)0(<cdo%mnvJC_RsQTGM9@34qNmxpFBPN*fZ7T{L}E<6b_GW&&4&EvBF;_RSM+o
z!=KB1TP`G>I34o!mqP-1JH*7{g{K{fL@(prA;wrVDGV2_RyKE2Wu=F9eL}7a=?mE>
z>d>K;<eVq?@zjk2+{hY;i{=%hOEW4x5WLbRD>{EWW(ooz4EFx8XYXHMc0<Cc!JP9S
z<{M!?vSWMZ1L;cJm#mQMff5L$Tp~F#gPo7bBZaj_(Fhar=n%PR*4P&5aKr7E>B!~e
zFBL|K^ZmdN>ijyZ8jZKpT*qLlgI0_(r0$Bdnc8ED-|Od4J5B9kN1bvvMzPHf?HjJQ
ze01*tXK-n!y}V*rm5oe*cL>Q?w*yZJdDjCn8T>;m5#!|J!1`!DhJ0w4#SjXqI~7Zj
z7cjrPcrP(Y0DKKM&`0vN>8SuMfWQy19)N#0<zp%+bcEm+&Y@eZ_KF%N<IDAIMPhk~
zZZn1q6PcdD|Bl#^5#><O{gG-C*c~X-an`(n))6*7io+Ncq`9BSa<2i@(<s=(MR^sz
zA#Wr(dK4sHab+($-YK|&d<V5|^cU?10fB0IQ38pBDL=m72StSO6rK-<;H&r$<60E&
z(@WaGuK#*^#ICjI;)%G+S?w3ULoS><_~DV?^^?NyX^_07OM3>P`VaD3Pirg)0xgIg
zcG;wInw8R@<c~hrsCo^spW*+JR_hPuGzGr)HQfJpy3F@qOsnc#ip~zM4kiw^|H_{w
zsb0FeOBkcG892Kve7m<}(qqP`r17B_iA(T<KfarWF@c3y%7hzz7cmT*N~D<AZc(?>
zwy{}Sx2$oiig{H@V!LW-$z0d&!h6))@3q<Vp2?62vU-UNojrc{-}w^Zdfa@y^7-@N
z-+RpPEj=n=5(;a%b3V$=i;En|&;AK&`A^AD9rexzl&q)5NXBW{j}ph0EbX^Ve8rn`
z0A{NV`i08s1V{NUb0~4E9W0^7>db>DgaVcBWUI(P66{I?ztDgRtb*w)JA?x58_$M3
z#4Obt<VJmv1%`V=43($65$8sE&@skC{iWJX5a6$^39P>A>Zp5gP#XF}6M^DQBY<lo
zBuE1tv2m;1un$1CksPFfQMzW1-d*a5w&6hIsR!h1&BEv|aD>~af!$X1MBPZj=q|a@
zu~ksIX$3em@v9B+!j?7h%MEnFDp<S{KwLNE7VP>hU(-DO0A|?ED&G_Un%4Xk1|(qH
z8s2+@;xIk}FS%h6>pv6+D65ZYo>YOLt%Axo833XteuaVKYC)x&P{5xx{d{C}{jrBK
zSS6sCZ9wT<fg|rm6b285KH%XPRu7iZ>=iDQyE=_}O6^IeHH~&k#S>zK7K0{KqoGIJ
zs25<+&?8=;1FT!SQq=7Ct`Qaiy4lugXpVUY14u$S8+)XT8UR^q>#%amI_RnO+m&<5
zo_HHMure4|#$7r<=+Hi+E(xII@&-n%agPYlGSs87M+S(!+=UTq)+1q*0q|M-PzQ2_
zJ~q7P0GvbnEPVO^x3Hi64<MmvnnbExN<jVAfT_XoyBh^)uPR@H9HAZDkjx{|#x|Zt
zfeh?lW{{OCTX>Zwx2|kBNRJv0l@Z~K4RZ5m1EwT7zsO#yHf*$;^@4Vf$ZC4o6D62K
zc(i@dEl%%SUf+mAKu>=kJ#xO_A;XqbEMeKgJO%$=n(Ho|#wwmE<*fH^88uirMR*d4
z`QX^8kFVQW+&qF&DmSH4J-@AmZSn3#r^Sz4YV%e{!$NYJ+gM*kg(X2Jhz4KR?qef6
zfm>=lk#>_+sh>Xo3lW^Dp7fXP>0a9g%#9#9#m-00qN|R575hfz2W&pMmtPEe@zxmR
z*~XhbDB;rDN!_2Cl48(lkh(H%E>R(e{Nd3hSTAk7b@fFK<^HkKafa|nBI~pJN$)5`
z76-H)@bM}gxJIVmY^uimhxE4hE3eu*er}yrS%4f`E4WOr0(jz`^||<z*Q{B0Dy&!Y
zyguUQ#7IL+s}hXnFkCN;P!W(EUpCgQ4a4%5X*}5GyV4NTjYzjy#qWw62Y(hqN}x#j
z&J|TzytDWR3_11-aK7rFhZ3gbA1or0o@ijgk+@(?eVABK&9*Jm2EC7RV?v@4ibH;f
z9Xo~|kFBN5_tkX0$gb9<W37@|i3rHvR&d-y^`k!-INp4sO_ywTslGNny{Wd1K^M`@
zR&L#YSd82c*HAm!fB5ke01H?LzrGcdl=UKcoAA8w0nZP*wqHIQzyU0f4liBg%*hk%
zp`x_o2`Wk;MAOKjJScdC5v*?<cpi+@aP{H0L!hO;*hJnE_SxFR+D5OvLK^j{3O+TZ
z+m@+I=&o>1wKT!Zxmhw0@5lnYXIR1-Nr@ePCX5`)xk^|uW}4iV3$o5($b|v)-qFXC
z-hL8>97TTWiydm@&0EWh0^ToyrqPrOO&xncki^ZB22Z*k{DM7b7Y@RLXm{L9eWD_}
zF{BZ1t8LlDg=jwI;ot0>jRM*C#a6OnCgeRi&c?S_C+6TUEJ2$emff5^xmUVk<VHd?
zix|=NQ=<DQ(wh47tD4+&WodWtEenax%BPNr3p_=)_B;@$qVDn`C>SXcJRsIq#RiPY
z=0$+cu)lZ1tY9*IXAcYpcYRf^P-q#ZWZFdg2#f-3mY8u&jw}HJ^2|50PfP$n9Y^0!
zj3+EGi(OJkc|g(KO&#RSKnEm4e<&nj6npcosw?SZx>bMQ?oRW(R4r4=)d3gZ1hIzq
zq~Y&CzYCYbtis!7kT~W8a@Jcey8@6n)=E=0_Viz6<=1FyN47LzxyeV8B)PG}tiRuq
z9h2i+x#Zs1T>Le-8i{k@C8%zqr<Rh6RV@3P66r9cMj#id!E#Ne<i?M1ZunG;Xfm&)
z#Ru^q(U@zmAaGEm;Ne5|w;;RI<>Dhm3#p}V5_i8nJ2IMiYAvs(oNOES(<)2)$oa5k
zM3V18UaY`HiCRS^L3Y#R_^{mm0;wD5L-70>${$<&QtnHrp-;q)M(v?q1B`D^eY3-b
z*j||KMg`kGy1gEgJ_K^?>cw`CrahYFnl^`v`}J@C8ulq1H*MZv^tmfA)mE51r+lIE
z$tujEJ|E?K`(_{joGjZsC~f*;F_oI=E?MAzWDl0ON+_S2QY6Zgom)v+Y29Ht!ym9g
zbiNcOH2>@`FowC+!iFuXW?UeWFDa&Rl`QdYq$d{OI7ya1R4;{hoj*t?JzOA_nC`fU
zYV=4l@Fvy=KayGsFNCC#%8Btrd(ZgU{`1+{1rn_yT{YHTUjO?c5f1`e#lWrbnq>r@
zCRvIEr$k}!TEXz<@PSN(?DQ~%xA%!Ij-`}EtS1@{kG^JRjl8{ydjhHFfn;xVVyjU&
ziiC?NyupZbR+4??PcvJB279p4adX%3#rvtWa~Hfcorry}IdCnqtsKWv4}J*Bi7>zC
z_YkJDu{s=Wr(!{rIKq#!$!#HT7<%jv>xa7>UFTwhG)4u9eQ|<QsGkNoM?fHkOFzWt
zw~zqg#mI)YM3C=(s^<bVaaMl1=V;n_zh9D<%UT4A{%Y0CTKVap!)Y7*eo0(TYw0a?
z>s!`n=`H>1R^wplr*f{Ny|erhyX?`@TlUwlhRE_=@mxY%aM}CEIi<GX(o4qjY>R(_
znm@XjQk6)RN|lUF?6Pi+mv+jsZ;gEogf>D=sCHB{rVV>bs%1-asx?7@Tk*1zwuB8q
zkz4gLOU-_BstrM%ThMYuwIV>!<eNFpCm$;9*l2|(+jn`=Oxd#N&rOb9dB;t#nXF&P
zaRoND%@~TGu+_icu>wi)=pi(g?8iEwbou(3eZQ&CFU|S$D9B&lyGUusH=t&_c2`I&
z-QVfO>#+af80&gAj3u##Se5E<pa0!OzCx9m{IXA{h0Lp;h*o9x+m<HAzrgM1WI5yG
zOkF3&-N+@l+m_McmH?gE$3XHk7t*l`@7;B`JbPM(N3_ai$lD<67QbzQw1x18=-j?n
zK{s|=vT`rlX1K$WU!sw6>&k%kX1k=dQCm9xB^Sd$36D)nElqe6VeZXOBl5$O5ZE-}
z-NkPAIdQnf*z_i1En-!_6;4<F4JH*Tox4`4VMKn4NeXN%GJb|l3@Sc77sV_tttJJR
zyw+jRJ_KcY$Fe9;3Luf;wQLHc2B^rH5zzC=Jz=x%R3g`+*RpIay8>|ltka-2sg5l-
zwu|*g(6bo17MR+9Lb0G3*`lgVLTy5@GKQCpf#d)gxkYV?ZrvxYrXg+O3zS-R`bk<{
z$_rMR8gC#ZFy#okN~vASGlhG>8dIPCf>S~Z1c(V_KeDV+<D$Z68P&7{TmnY3Oln#H
z1c37?mUD0*T4<knY*R18CiNRalWtphXxG$jCqK!ioqT;EfFICvBx=*+DBC`pZEA;n
zg+<5|*SH6O0SdV^_CDi<CLN*Y2$E-WlxgDt<p4WuajhJ14k+8!@{50S$b1{UqW{tZ
zRYLmg)HTas^C)~fwXFOkp5TGknQF@!01KErJNdR=%5J%**CY6ID8MoF=UjHhxuC|A
z#1Y;3DBu|8bEvv?2CMhSldwzcUlm|fNPziFLo1vCoo@v9%1g&h380VZ`1Frc#tq~2
z^YS4;1KPlfVNPLG4WN+)S7QKUK>B9$N7E+!rUkH)!T$25&*&T6A$h$L1K`Yvs>uqq
z1L{nXFV_ItV6NHHw7Wt);66umOV2k*eY-kz{}2E?GDo#MV0P$z<2r<Qc6>quY`k4R
zUqb>cmbLq^dJUeCN>{vpJP84N%ya%q0K-E*O<$@7;RNa4u$uJi9#MdOnFz}}A)ofO
z-AN?!c#%N_40zH(1l%0a(C!E8OgyUz79v{pB5O<nt47L}s4&B&@rsVPQoRT%WcR`B
z!NvVy)~JJF9b};#bl<5P3&M(5!^p`>5hkUiZExZ=IesT3uh0Ep0fbQ`CU8_!;FyWP
zja%Xck(t<9QsUT%KuKjFP$ot<6(kjJhB1wM;*pS{*`5$*Sc*iOCL+9(Nvy?x&#)a7
zPo(B3mMmSbk2tWzYmJv}0+J<~*m8vy1Hu+1Y3#UyizmXGBuh8yV@$&kj^n4Afx3xW
z9N7}ec7qUPO?K_SOk)wSlBQaK%86bay5cN5VYHH%tBx4s!g#gB+{<A$Qr5QZxuyvS
zoQZU;0~A`ugLY&xcB^uYQ(^pMlXmUF2V8hp6k0}uJ!FJ<SELm!K!4Oa1f;~@Yd6Rd
zvti*<XLg<;#RFk|P!1s7UMG`5{*k!jSi;Qj3W2EUFeUZqBmFc~!ETC(e&}1$eNh`H
zuco}Rp#)3_4?iF-LTO%Ja)b=>n@(sQIs77~OX>=q?~B@yu|yC!28?x~WEzlC_tiCj
zZscROi4a@`dT)Z!Ix(^V1uRG2cSpgHUE2$$l^{oXD|baljiGrn^G6#Hmw8|EXB#kH
z2sXZ7ts(};62!Y+{A@O1v~|7+o{oL5Uvl~;@7@VSx4_9hs}5Ssi2}k~pk<%xLRs*>
z8fLlBW}k0D9`m*hhRzT;Cb%HkdR&FdWWVkzAN#jYd3|H>=m1J<;OJgf2HEIF8HHED
z)VkCJ<LUZ2CfU&XeQ@1V&N#IT|NisO@p&K;z)=P93mS#@?`BUw{+A!GYOYrQ@qiuH
zg7H;(^!xmv)0$1pWyXeQCN_iy*=R%|#*cNvw>1flrsGa!=E6dG7{nY)tPBom)mf%r
zTX6SiYAu#nuqUudt3^C#O0JPgi)Gka+S2fFecalzQI>po?|USh!~$9KJ)4#Id<^(}
z{QSK7b6wZ_9Lfl~N=%J}2xLd<jWlrCr}EcB=qm`@`F*2<+k5mgY=!1#<LsH&`bm%d
zEf<R6trzP{ra)EVb1X`5B+v7<?5Q(M@J~K&K&}3V@Ss5_$`B{t$*@5Me?X1?r}*@T
z`t*mqou8cFyHCp}(eDc)_O~P`w<n9gcZ}B02K<{Z4rhO}tRJqepO82|&^}ATKGg?5
z%Ygw)Hvzc4heE9SD>q?K{=QwH8cTn)A+}xj=|O<M$_uK6@%5dgJ8*Ta#TJVJQ9XMU
z3VTYdbrhWxDTEhEX8IM0hx%H?OZr;WRo%*@Rs4<O_J5>ns{f8%Hp&yXizNNcw4E!K
zSKP{zFO7D6kfq`=!e?sKBBh@LiwH@$ij-i*Atep$U&53bYP<xM@EeTpUrWJf2Ui==
z1VA5B#NwR}oZND0R0fYHSo%_B##VUv%x4h9p~&hmWf1;}i!Mt-YuF4CWc8jPl0h~g
z!F|lLmlADiSPT<PkvC5w9d8dPFWJc@oEh2kfk-hC=U_>UEolt4P!6NWg4Ub{-#8DZ
zEGjGd@ML2?LZU!3@xePPY>c&6r-YtLI$SK&t@nL!B8f6BA}xC<q|SoK85<l`z$IM+
z*$*+y|0wm0AXo0F4q(fSc_AH#3H~k##Lqq?-EVj*H{3Bcf?LK`FkPHS$uiX$W-gfw
zmnq#0Vn>fTjt-t5vfLc|6JO;2HlRr%GbEoY3xk*(N#^indjXn^9RPy6+a94Z*X4Sz
zauB&GI{+HVUBM&>5d&T}zEAmD6H{fe&KWbt5f9Wtwx3zWO8vnr1(O2$+HBnXEymoa
zIA-XVP+;a}#kl!TUR1pOBi+n{fCJ1-u`CCtdsvPsrsF`r*464B3ae!gxvRp$3sQnx
zPZZg!`{Kx0ejnPkUZ>hew7mpPcU|tfy%jk&zXn&H@!jN_Ji9Ehgh7r(G4SPSm;FzD
zRzR7Y6}`+flLW@@v0<4kn%FpL_t0<6iD{b~$i*??WzjSuc#nrW?&fCG)(pc_-KW&u
zNjqPw9NLP9wNBk)$}BDi1fmJZN?W3dYg9gifb$p!r!zMi6;;9^hf)t%_q3y5?y&XJ
z(GzdKL#!|rblBEtJgtP(cBBvK<i(d7rmC@}mzJlB*2BI)NX3z3`Euxe;*F;nC_mwt
zms#j+JCev%6d0HjW605#*DlqY`7@*_-ZEB2Y3!eTNP&ukYr0&~f|Rz<&reNP-rqH!
z&?ATXEs=&<4NaBDMZ?D8lJy%iZp_7>_d4Zf)A8=m-5FsB#rbKNIIQVmdt2EKX2;1n
zzqyu|(2fsNHu5(-A^4miFj0;C4NZYch%99lU*D0*IesrPpm!5wHZD%KLrx{FQ5IP-
zra1=HOCiPVg1U@sDpM`j8+KH+ofz7d@~n-nS>z*;sSV00u?${Yfiy869h6ZE$BYn7
ziN-L`(qdG0k%4!z8hex1{zJ1U8y@W%hRIFfE}u+ND`{^!G-leFh=vB92gN~D!6C3$
z$HR~3MxC<&nr_uKnp8A}`k3}@v9uxSTe8QRt2VKI5~MjY<Yf@6&UujCALv?6lhU1M
zmC%i`VB~7Or)oop`HB#9c_>ubNULD}$0s)xl?W|ge;$GhiVQZ@9F`nE9ceM4pCc><
zx_pH49ty=rWX^b1(g%lSHO^ybQb!A<kkfgLv=+<w8^5Ip-aP|{V;Exg7E7cu-PTGW
z``F+(<iL=I_D3|?wi5^^<**~HFjx>~OY>Q=qT(vCHIihqrOAjCerpNU%Wn-fFP}E*
zU8xTu>Rlz|6#w{|&n@0kuhmQvS{cn&?niG<j;M{64NFXvfk{g65bzfj{^D7woYc26
zG1p4`&`Eo}Atbm4bh%}xy6asXS6w9exSc8z#hQqw$)7GH3_|-Pi6#4Z(4IY>dqQ3>
zmEg^uEs#RF`u><kl>U*X&s{8~NL{QjiV=N^x+e>;K1mZ0vN=^N0K5kpKHK)3vgC)*
zZ@5P6YMhwbwSKI#<NQ8k(qFn|(VxFH`|GCW$Ce<QogsO|;`R)v5lSM~i>2ZxEctdz
z6$`_INpR^FO&dRG?Wss;d}R<M9Q4yf`x{t?C<h1gyHdo7ksRUtp%QoLxCu`wS>?Es
zp15hUldJ`QlS&d=XY_bG1+$)f<)cdH(3kE3xPA{a0=*#-YjRQ@`)g`*&m7q}=&Ltp
zSx~Tyn*m_m-yG(<rNL$oC0w~OZVw-EXrg|705z<@fM3)^%7tLZ)|C;#UxYJMHgv+1
zb7<J*zODCG+TYCB*k`4K?nDF^h+?2XWUQi!<OIW3n_Nb*DXm76hi$D_EZddRM-9`Y
zXSUu-|7|iZheTYK=L-zW(nNsj^u)`y7f<ck%X4k+IT!`Fxd(*c9Mg_m3a4{>Q^5Dl
z9eyS*x|3?go)_B9mh%u!Y=M!P?k*ce_LV=n3hIB6z+XV6Nk_wYg2KB}7{n!b_wLWu
z_jn6x$y6$FIHr?(oM*Q3#);#U#oaMTSMNC1shO_#P!@N6j`@}L=p)Yl{An19M9JC-
z`>qq!WzVChwfngFb{T$&amfGkYS&*qP!FhRT2IR6S$*tSZZqeK=%FFOw7NF$Mn%G<
zy2rkvdrRflu_ta!$2&7Yn-o*pg!5OfzN>joj%t8OiXZdr<h<8@xeItCriiHmY1Wp2
zE|v}32&SOM#!6dBK(}RO&N<YEG3gb5L#Xj7%N*Lef270Rgx;zF=wRDoP;{>2Nm4$H
zA}8y8&Y~7mr$)_&7_l#trgAw35uF!fWp!4NkYby${rg)`E?oP9-P)(%N^R?=il@5#
zZx$uLUfE*~+}hPc`UVDqbtY7=l~Jv#k!6aue(u@WK^%U!zYCX~&59=*0rPeO>$TSL
zv`@-UMTN)yACLYU0V{OzqYWrMT;PA(@C$KSV!?d7!WDo`-A=G~sFY^E9Pe*nHX$el
zqJ(B#ZO{-+ekpLq?h4`ck9J7-!EyRS9I~u=f|%tgS>l4YY>n?we6+6GoX-w2dlAZi
zOi(fovist!-=Nb}Zei^Lt*#+XRLXrbbO<P@&kLOH(dOLS>%so6Mo?TF>A+dkh#iF9
zA`>3{LHS@y?&9FVM_iad94P&Z+@Xw@w$ZE)U>OiomBWmu-$&#6VG0#d-3I;S%okRU
zunFRX!j#1hsv6igPL7p#3ErWLe6I(9UA9S6;_tSHr4@<Yn!!EpR4@*%8}Wjvnz(_r
z)}G9=nVdEGD^~3_L4CaaBL1hCy7m`!J#4JR*sxL}TQobm2SJAoML-v~1F1}8v%9e!
z1$hxud3Fn*2dGKu*amZKI(0ZdSA>eG5e_-#@d}IZMkGuvcl>Vbl5T@LdB@~S>K^Ct
z32t(aSp6aHb^$T{8C18B$wYc;BKeuFK6K+0rm$$kCCP@6^gag%hMdOkU-ldcdac6+
zZK3jK*i5+swyeZL)66LHeU-!xe#VTt*HZE(1pU||QCmfF%KAwB8qzY4#E+T-D=e=I
zGN^E_fI#1alHXeK%A}8nCFl($2c?yivefhvSn?|KW+Clc$(zl|)q2!djlJY{)Jy$N
z2<KGz2yq4?C5a1o&5u?%{7Ov8tbB!hHdTr9=*tj(F<4Hc<kgIWDC}E?a*RdxtDK=R
zi(y)J3t1(42la{QwWIqK4psDy97GtaKhPuNLhRa?BMa9^j&sP4^*r0;W+a|e9W`Du
z8H|$_BHI#hJCew{RgpVFU#MYktwutxk6&3S&cx5DdZVC?W_s}yGJ6|QcY+_0o8eNP
z^nLT_0X&OszduxsK2<{B6<j_^Dd3zjmT+%1!9Tyj_(NW|*xBMa(csCvVAF6svS;|q
zu3z(1QCK_4NXF>s<g~~;tDKwi@jyL(AxQ}lx+ZNbHDa>)<EE|8Sj$?h*G=WqDk|1r
zKxr6@yxJ?gU^ghtTHpC)Nc@8UPv6aaQx60s@Sd>kNB`XSE6k<&N5X#MtWQ|LK1d{5
z1t?@jQ_9`e#~00PkG8Pn;t##v2BXhW+ylc;4&{Zd29OrzC*d9}20Saj?OOp9NvcB6
zX<QKmm7Ne;aQ#&W<J?q!P4BguJ?$q0p(L9zAQW80KsGj?$e;2=I`)T0G<K0*7z|&v
zPI}L}7!60YEN5ICdGxc*0v(uCeY56jnX|jqOars1V=1SfIx>Zy<K@y3%U)^Jt)A*l
zh$eqTo^fY|HOmcNMi14V`B31^njDK=z`igTKWf!pWZcVbd}xyk-u6@LTPjD;gk>%%
zhiYpneJ_X{+qNK~P+b2jajAGIp5cx`D+yXgWYXGrbKT7PGyJx^Bp$4K^H|y7AhvMz
zy1>|g>8D>%!9?Sb(Zt|%OHznqUC>-*VK>H;mBmcvodO9T!PR4Hr?p<%+{n=*=#@_@
zU#>`zwiQ;h^|9iTwiC{4m<?^|+^w@pjXO+^S#s)xa*{c+syNkZ)cchD<HpFUw3mqQ
zjU?K#6f5ot5&hn%eh1X687JbHJh&+qNh4I8G#p`)I{xvtlND=+PdYyM*p|YAA?;kC
z&n@*E+w;!sjdLty^?U$PW3U+lv;R7q#GUM*{{Y)yQt4w9_p4U7<eFzXrJ&4MtT1$=
z`+K$>8eTz91a4;eoapt!O@|0BMIE3DNdE3Nb}nj&bLoZp_~)s+rhXPBAC^cUvP;G>
z;*Ho7F~v{XT29&$-LFlW<2ing)oO3q3ioj%%(PVPG^7)$CXu1^?47NU@b@@~ZEEl;
zNl)llYxYTsZgR@Y4P3h+U_Fq!QX6}+yBH|qK2;e;YU>PKzJXZ8NNLd<VO$^DvBT2B
zjS&2vZf6Z9R$2;7yAfMF&@Wxm98KD+@ibVJeB@ePF@5=!#(>6TU_lOp6C@LxuN+$_
zPRJ&tli-2SYuXu_`Oc!x4mJn7XcbA~5L38SRBK>&0A;(b!KTlA-gG%T4TFG*6^H56
z0IC7KeD?zjU;psK>?v~mv5v&_r5Q}<Xi=an>tH}MK$XMT)8O*+pGqJ&Cs<N+NZ-Cy
z(EhuZx$yt1m-&BVVw5E5{X^+FY=`<ie-d^W)_=FH+)fD-84X-m7@1T`jYQj_JHvj|
z-7$l_s|iB(O+w$Y5WAa6{~z?fRy<G)v>}e1+?))*nGBEZKYv!*uD_K!3dZS2Yme=l
z6WIe>aiqDE=}i?IEbZvNG|e~7P8?huTv=~8#qvv_abTC+wvXhCOO92|%8#)d|0qlK
z^efW2F{awUpOW_xV?$OdN0iNr>wz<RZWU!Ls_h)=$3QLcQ6^b!B_>0{KSU~%Xx@2Z
zXAZ%s30m^l)825JHUmRq+G16;!6SX-eZ-yUHvk3FE!Qu(Dp^``fHc*q6S9;H#6w=`
zITf0^xmEN`ppaFGFFsuaGR!gY%3I3sn&UkLAd52l5C<6PdOUDQ;<4SDXZGwIz&=sj
zN{M}E(<qfqm48qL1+HBk&a+#~Av~Q|9SJdERP(H~8!53+uEFPf<&+dtY@l9y9Inis
z2fcNN#~r=l$YeAqoQHsy#4Wpq4XBT4!Zu3hcW196u(?oVCqbUT;J7kcH=JRf`kakn
zh9|07x}A81ODi|#6{q*!{<$}9SSRy&z*NCOddYUek@#ARBSh%3bTg#;Jj+15qr`eo
zlv@VFV*F+f1z=L)DIjMSipeVbFb@st(2QKTZ*q#vtjH_0Dn5bJOle>=OsSLfD=b5Y
zw47QXG=vL%LO|2O9>Nh}?Omm;pV2;KT_yC!7H~yzk0p!8Lj^c159Sj`Ul8X2kWAeZ
z-d7>KiGss;v(VxrX7)h|9Os|dgk~tlY|TuuI_zhbLFC=@l7__wiGMN-zcTJizXf2d
z7_ZgtLq^`BU`JRB^!&>;(!8L8%k>NO#Q$$O9RF41)Bk`@{A2n=_JyNxG;?<Kk~gw5
zlQ462HFN$KqGDS8pFz(LM*nWuqL~aD1gj1%s*Vm(pjx0xPu*Nl5{8v!hcmh7-lo+m
z_k`2?OzF$S7cXhNS2d5l|H-_qwGO#XL30{x$MR@$mF;u1eJb1c_VNVN?^o?TAFPE%
z=so{a3(42>0FaF*#F(9q^<ct@8KUb-d?5BHHJ6ADVBm8z${5IFi$UeA2}URx%X69B
zqX<S{bh8&{GYiPOX4RESaVfzx;-_xWTzIm=!p^=GHRYa(|Al8RG;^IPu0)S@_@2Yr
zSg8_UYw2vJuR+%WFbisl?k*V5cs5nrYE-3Pow80CNK%GtuC;Xz^SBg4dPmEyOq)pU
zF4BzD4VFH5@Z8phN0XCy5u+Qvc@Q*8XNmMp>T9i#8lM*BNsz0q79+KSG;n5ZC6pOu
znYT6P?!_=Wk+-W+lx6A6*fu|bt?0B4#o-yHWNB{r)gV&xIINcAkQ~KrUz(CFP8hH`
zMyoB(tY)N<gJ`2sGPvmBewDA9HQU@FV6~poGhPeYW;qCNvwzE9QaF}bh;?8cOz}Zs
zBQ`&wt6y@~qgtb<#1~fL#5>Tj()BCFaFS^`Q9UWjC_lAvI6H3FS`1mt4Eh6v!~O(9
z8`~1HW~N=lt7iRr9C?_IZ9h~;>9#bwG2?hvb$)5PDJB#17WFIs^q}o7Jsib_i9q4&
z*5Nih%V6$kQ6a@>6gX^1&6-fdLP&RxHfyf5U<RQj+rt9kP{RJUmKMu&Hx#+<<OxVo
zPpY1J{@VEjJge}EpUj^YSWHIv&vSTFzKoysfAfP<SksU~WM3UbxLui9m0vjZo#ztH
zrIMn!lO_D=_q_zIh%J&5)e{NIe~-dyK?*qt9AcAa9|tTH$T4y*MKP8;l+(#C_Mj)b
zVuxeDS*0?jEPtE9D?a*w!h;0l3Uk@maRXl=-fX>UaJy#iq!#8G3hi`PiZ|yt6(|Jr
zrMNSY`V{ZIP6r?b2}<#b1b~M4eiIy5GQJ!{({=Vdsdy|%ljN4tr&u#WbN-hK=NMg)
z(6=w_67Rp|nydZ4D>DE03;5saPK~OZ!{QHQzbq~%v`q>*tDkpE!c@<oSn?PUA*v~r
z$_tnf&Vh>~T8VZ9yp5bFZ|EOl?TSMnKf$4IvyhE1+Eem@is&-DUAZ}44({ge0dFr~
z3fg*`(jueE-%}Uc!_Il`tjHRw_rqc_!VdgSCI7|~>r-)HHzTx>W3#B8{>t%hqwX&2
zwo0PVaHF^9Y^MzVl&q+Ty>~;m^qF<>0jSh@cxu?fl!S~L+VaNUaM)hG0xZ4_CRLud
z$W`rk=&fC6`k(hFBd+mmazNQ2YB+zN$~~r8akgt}XvLz>qqaI$P(HY>W<9Yh0L2)L
z0#xjlES}Rg4P$V|<$Gkk0+i2(&jg4Z7mwsOqE(Z>D|DN#W+Fq7&%y-H#O!C*(%KXJ
z_GFZ8jwKnC1{MQXxlHQRaTeU#uC?|W;3wD~El3=o<W=|OMjQ1EcrG&)3EIpIVX47f
zxT=aw^P^!0k3<nC>v@5VteQz;)sI;{%mjR&NPc#O7w~I+=VOl7pVZ|Q#eD=?MDz1T
zBW`mp)eA29q)&Tn<xnTNrB-GOvT2wR3&g8B+Cz?ErYx%dVL}VoIEJ_#$bsIJ&Z(vZ
z{nM!v;lGw>u2BMl!SU3?h!wsi2aDgqf%uaLI*jf5KzFh^^Fihe^I<}BNa-It<_0o`
zI5p;tooG%8kgP|cT!O8~%xBZ22nzXx4>{Uy!jTr4M4~gGFzGqzB3{<*(oEx;OPX8J
zEzH38<l@kaaY3KDEo=_`cK8SEj^P28hwH0$SpD1DVfw#4bXBbE9Bs}1=VH>5Z1b-U
zN=rMHp7uL5)pm=qRf?FXsE}~bmjVZB<kK`)asj-(N7iNY&paRzv*D0V;cb)Pgr|EK
zTgi`P<)*cc3+_MJP1o5O27P_+-<Tp_nXx6YEe93hrHWlQBj*oVci>-RN=!sYsYHf=
zUITME+q-7=Yn$U*U!H}Ooa1vm<OCI^INoSb(;}12p38bA!#P%`zn+!-#XMzvhY=m^
zQ#U3zlRo&~u$9gmC0ik8>7f<urd19og{gte=?VlAo=qH#m=MpdW~RM{QQC2wRx6WQ
zYi_gClgisPwY@FHBADSD>R%>m(y5_pH@b)BdK=ogn$Y2lDb4#(A|vOdbDwA21xH}q
zsi>oo6gk3DT2;DEwEIWHg_>FTJhF3`3f0V0*~xOeA{h)X)zcJYFGztbZ889F*>ioV
z7X5J{Ms?`s&*bS`fQ$~rf<r^aOUc%c9#1=rUd=UREw}WnR_?~W+%FpTK;O5@*jYq3
zTSZDzQWsMOuj0wBBh1_1Qfj%SZ^k%n2WG?B_p_F>AL)a=@D#F}>?k5#vCL?Xj=4rJ
zra$F$hse?VPB@u&|LA}24Az)r1HDvC=B(tOJa#on%?9Rr#c5f5C{K*`D}b<i$B<hu
zs`np+^O9vNL)0$|LPgw`_um>0Eb2|IvDOi%*<6)3eqvg;p$s503*<+c`(Zd_i!&le
z`_jPCy%YZd`P-|(_KdRbj<JH<ez|N|s3wbU;lxnC7`9@fY%r%B_v{URB>bxY7M6LR
zSlr}q^ffzt&BPo{bS;jtE+S5xa7wi486`;`a*ae!oe+*%ve2CYf}&r$J9y>a_Hqzi
zLC_K+II%1|q&EjcrW1$4@E3broc7?WUnt2lIL-eecvs!P0n@%N3irRw@mBx)FN&M7
z<A2h6^{8*iqbZ^5m7#~Vs&rs5dWuzHmcx_Kz!riA{SLBh7<pn#7QsoMVOz8+iiqd~
zTI@zeB8^bW`I6rX#V}gG!I*4XXyY=l3lrEaxNKR}d?^k3v|Ri5`a<MmdAwWpXMB4*
zL7QItHUsP?dT;+;iUo$<pP#OeT0{(!_P!cQTi8L9X#_)xTFd+!!8*(wiTSrEPa^y_
zic2gj+Yo!O!XazZW~P#bo3>SK7PXo}Wh%u{iCA4v{-LGAI!n`LBawUsj=+pvmJa+~
zh>@d>sD=x-JV#B$n{8_lPF$9{wiLalx%i|-^5$k@Ax^VNd8hITr>YLEV<_Uf`NZ!O
z(@$3`&(Y=k8})5Ru}lz1>S?=%en-JZQt9cjBRezs7B#b&tD_4Ng*7mOTd|gWnojHD
zlm*n#`Mp2z`wU8Rukkx=5C<lYo7<4`LQ8*iaZ2_**nNKDf7j?HsfVYxwntF9AP*%M
zxp3&AH9=8fGODU5kzzkT$OvJckc=G6Je?Y(W8Qwny2j>=VdI`_zKxv$)AiU7BS}OZ
z!2u-Htf>s3%mx!G`Cy=44iSBu2y2K8Q#%S|EGV(!b(ja^b82&i((|4nc3#Y5`lB8h
zXC+*s&7tfOWjSUkniPGW9zP$8U6LM+_e&-{nK?9zMcz1bTWSPkGtmhT28XqM&~X}r
z$P9lJ2FGrdaUU6xwfH0W%Ol1w&o$*&B%r3!0^6mmTe1vZ;#edh@(?-BmiD=gR;?wp
z@NsZykYWm+QC-7;U2PmWy$p>UJq$|id@qw!tx9AnXBBhc1W78oKz~#27x7@IWVQ9|
z!A00k?2#lyO^>FZ-7fTdnRVck<UP3^NWz?CL9UX)#xwo}H3FYyLF<f`uGlZ_4$DCG
z3zu(_7}DWT<&V%~wHTh*shk7>*Z4bnY}7<)l8uNwuf=ra`4XloB7W(C){@|b4#?59
z{gXGKEtAcfqxGOtvgZ&oF@p>6j4edax1^v?qVRbHBcx*0EGFsd;6<W#ys@Y&%-S_j
zuRqlz+=+kJ9z@9Za1qcX%8Tz5rqU-d_U^qevjz|k)eXHN2>BX};?uB(PfQ7+UW|Dk
z<%h(M&<<^C8TX2Iktp}h)UMnJiWs_ZX{>}UYLwm-z$q~WSr1n1{21pA<q5gk`2pbp
zE(TP@e<jRzf6>2i0vs2Z;t$)`%}P!7lz;w{$Q*dU6B+T<19HLtYtZmz;rEp({$z$q
ze5Hi{{-gi;=iqF?XkzK?U}xoK$LL~e!}z7HZsu%nWXtHzWpCta<!;9Kb>mIGC_oO*
zjQ=^4MdZKwDRnL}cQbp}uRii$-~JCoyz-<x=$8>eC<wU3091Yio=0FrOdLc+U8tlk
zGMn{kS^?s)k#rd1PD#YbP$<!^1kUw0T(?6~xpg1=S^mfQ-fjVYu+<T3NX*p5U!-}$
z#Gxd?TM3tQJ;{Rw3j%}cB2Ww-oj<Rt>Sx1qzKpy`!3;coRsV)6k&fHs2|r*bzD{Ty
z#T&KVpPx8K4e%@zjK|wi8E_2x>p*H0UM5&H6c7MgMDt1b+_X!p!r&zYrP!gHMIv1L
zb(WG6?x&x-zJwee#!+j#<73I3!-4k_f0N4RV;@eek#Pl<?W~JxQ$#|n6tpxl*VD$Y
zk|zSv?T(bgf0CZlSo44OL`~;n!{AX@uS$L&cf6@9U^*ZXx`Np`w7AT5g%{~owbweo
zH=}zIzNb(kY1}g{V-oTCY7d#Uf0W)qtFL+fxQJDR$5}s)fIFb>{jo`64ue5qyP6I*
zqFy{fCw@U^1jkJ$+rpg_JtKNZ*sy`LcCgyPk=jHVQlYDAI;8FW&jFPvb`h%Y7j5b3
ztG4{-hb{JBJ?#JP_V_;?cZ~*&4&Dj|KN1-~S<D*hK2?PYFVKbwdveuDy59*N6cn6E
z2z}Ik-#s1@c{z0+T4cp_r;SZ-p~p(a!y$15&gs0^X5G~xK=@Nku<X){H5eImLwLlO
zaJt*$y5lj|W5@5Y=V2$U_8Zr)00>7cRFKUWFTtG|@CLl`Z_1Ld&tv7Y)u>*4zcAB<
z4h*FZz@UwZ1DiDA4PmaK_i{WnkgrF4$hK*3MZd*(8X#YfLV-Sg7btEPs5TWq9g?_h
z_%0BuP(DgYE`ZTrc8e4Gu0{U0<6G{~F?p^s#g{duSOlXKAN@BFJE|OxDM{to!|3cl
zP79p1U{nJP%QJ&1TxQyY+{+~s3p$lJ93^>J_&C$4HAmZ-sbbV;RW2++H2GrsLD}>1
z8(|CWHdHuqu0-Hm;Zl|Y*?!nsH?w+M;I$-4PJJwFbgM1F#WppF0vQ@7_?bAWl?h#5
zCdZVNAJ2HgNP?`ag8ZquuwPd&p$)^pjnBj_v5mR0I71rqAVk$Ztw?k^!!W1caypYS
z<nTTym|3W}CN0_|8F$LGPBdG}!s0CqY1(wLOBjJl%&9+&XzMp+L!Bv{NNox!)y=7M
zIB%|sGK;|(?9gIbGDin)@z?0nw+lL#iFxJdgF9xiS<!*lM&<IM*K)8%0ciSKy3P#Z
zdK-RsgM=SK#M1Sm6!ddS?y9x0#I5J7$-hRXM3*Q2rjJO9$Kg3e)Uj%NuoY4!Ey^PQ
zyzvGbEatYDlq<=ULI2$;O5YoOrp3!o-b;Kd7vTW&<Pyeict+i#F{_dIWvb-__qdI4
ziX|KPagMEf%T<-dJqV9<%yR1FVX2GomvJPz`mj3KAy$cub`!~IYhiF+b^^Ou2wEe>
z60?124cv=10UilOxb4F4GGk^a4IGk|N!4(yq$f>M6n=`eIc2Guv5_ZnjJhxg&YR`B
zIF))%E!Iefl&__dGkJmnW~sULgx*X8c88SQJWdrkmjG~k>QyT8IB)-2|I#|din^2V
z#Be?uohx}Hhr6-e*xOs)NwJkE1!KXlke+d0-SahO2Cvjf-o*7=$;YkJ=BsaY?{F#B
zY+LMk?gx>+Pw6tM)!R;K`N5XNX)^Ld__ocYXU_jHJghA^j^l4TR1GfAEgfe=*flUa
z?0VlHL9ic*9o|@SFz&`ABG2-P+JA)ggu>7EO3^$o$y0w2&QocxI}EOU?5@BFKaDJv
zy*p%blSQW<0>a+l|6uJMyE9>!Y~ee$oeny-?T&5RNnf$mF|OFQZQHhOn;r9H=6UCQ
zn0Kvb&8&5PL{;tDwQFxvFXHSb)Y3)C!(oOLI9%^g8dL^LHwbmsci8Twn;&d<5y0&|
zR~b}<?%{IWPhWu~{4ZyAW;FSJ%jbBbr)k_z|8A*w+5YWZ^*}u(8n#E*U~qztQPaIB
zhDr5MA81|`$SalN^ZBzpd1vn0^zvc3en{g0ZPjD4PpX-&Qb%jq0UG?_-bq*VLs7-0
z*5NHH%d*yAmuuYAGn#-_Gb(MLe{MA_R@)U_kFrNoXiN}oRP<@iSKmANVuL9tJcvI$
zmmTT7KuPFKL6X+n*`{!pV#;+-cCKiq#X|L5-A5aywD5ILwC9ltsHeRprJoljv+2{D
zJOcEjGu3uwjqVc2h^ChC7w35sWw~2M;B7a4+Zp`TVXGb{^6KP>?(0gedLoUt*+og&
zHju4a_o&8-rY|%OIz=$bWQ=>AvtMjLQf*+9dJJ60eYAx^e&gqBwr|C)8d<eut!u_u
z&Xgq1Qk^W!^zOoG?zYyU(jUaXdR&Z^AWu~}hW9cbWKz<!94*an)R`~c6ML3$uhK8a
zcuX0Bmt7!*O>6{2T8h$jXUsc(3)2n0+{4NMZ^qVS^!I599=un0EnrSoeN9TUi{1Bn
zd2ScKsZ6hjuqq*$n;#jmICTizEf+%;YXM|;td(1NL;LO|liu!!n076Bh~fsv&dtn^
zJM<d}erBJxDtsLOjDA_K49B{3A>@Sl{K|PCF4J0{%71nDRy7pJZY()+MB){>MWdLg
zCKtzrngLm{g-yiLSOnot$pg__u)A_vXXXXXf1~f^S^5O^oEDmk*r_?#oJ70pID-%5
ztz^i1MYU+_I5WlZ_A>>i+;5NA8C{BDIOv3~lm>cY)zFa+LM&t{c&n{@69f(&^F>%O
zY-`!W?XL^UyVy6S>NT%);R}HW-$D}%7;~BpGw-@-h8(h96@n|{QP>e~4M?z!Iqi9`
zt%`QiJH>|!iwO8bVH<<H?obYUiEN5ZK(oDt%=?xt*9zz98|_e^kr5Dkbu6^p<B?=&
z1->kqE|mT{AD!j0`q3US6n}|jKR*7JWMAH+!E@Rgcxh}+Pb3@0N`0w7*nHdn<Bpz$
z^oCXF?9!!od;nj!D@OeG9_aY>=BoY1?4q{Ir3D#Knr}&vUiSgL7G6DD&i$$`|0RSy
zWWy^nCML0Juf!B3j<d!}4(GJU5@$H3;wYwMlhFI5WEpYyZA3+N(KMRjiY81_xi3<h
zx4_7hx4<{iE!mOUC9~=c<9Y>tjPB>!_eW=Mw){pqqa#c!RJodj^cFL;`7>CWs3ov?
z6WrUko0_bXI#$h*!vHC(AXHh@{hY3%5zBTTmPU0;Qn$p|g#av4RMM?@N7P=O>dKh(
zt|79V3m4JG3yH<LZ6~F^{=L$=+TaP|LKEV4Rf;DZ?=KeKUlJgvh!+C<M2mvqa%~)T
zxFMcEhsssWvH9gO-qy&rS`^goyJc_u%K6`XD1BiDpY&T(&!BE;&hYI1um6k^F|s3`
z1pCIPRsYt8SnPj|I{t55(0_v+lbY_HDvKDOHq0!pNl+l9F^VyR(2_slEkh)KNkXGa
zf|6l_10GC|VtG?0Q#mAbU>ld{rL-$`8^SA%PW2kuu>p%VT9;kF)!SFSwzVt6w!K(V
zW#T~0P+#9(#J4(JlO3mDrd+35pN>MY2tA>D9A-~M`L1quKc0QD%I%A>Tz6}*T=xU`
zo%Tb{o@0;*hr~(wsc)GWI-XmgvU?~N_X!xT2E8n{iWg4aRM(3akA1PkZ+%f&O3Zjm
z)}kamhr&~zE08WZ_XdUCR)WQExI(AjZXi4rE8odN#l5~CQyz^F3Dj-nB|HbitM@GV
zJ@K~{&ODVPKa<j4t=V>X_&u@Y%Z8OvxBu?FJ^LXE3`8%K5SC9DlX>qAVLp6(JKh1a
z%dhm^YT>6P-j(*$LF2U<0D#T9N^8es)68>jEr_DV>)EGMzZ!x|1Sd@xmbG<C#!@m&
zSuKx+v!#A2;hsekF<HyXp0Tn=jXVzI3+Vx3Gip=`;3MQji79EG2WL$+f0_0XKS|Bj
ziR6O|&S(KnIJ=rF9H*8MQ5cmaN4}Uj^_($j(<z^!a3ulU*{%(rVcE4ze*YOuJm_Q)
zEr$GnzYb**G%E$Xmo4uQkv4GccPQrAtf+zJ?3wa8wElyhaXAX>3O?$J1~RP5WEh08
zq06AMT8?uzN+Y*%QtLXr!!Jl2!9Uva#MTlLI`X8EB0G5|v~6Vb4Wev~S4g<_G?ga@
zS+wAzkws*TB$w+6ra&;dTDui!GcoS?Boux6TgxcGCZYP}?3Ni{%d*soV19U}NEIC}
z8!DY4Un=WKWH>BSYC~<rhnnLUd~k$_srRhTwlRDu9iwZ-PKDyRv$XmdE-Vi&HXf0_
zf#|Iif@ZhO9tS8(u&T<+D!){EH$dny3b}}rm6d}fAXX*hy(zZ7j=xEiV_4`TNL-R0
zBVBw%LD2|oBlhTJ6h@P?6QUs1O7@T3g^Cp(%K67_uA6>ha*?cYA~xdfP$RXpv*v+n
zFhTR-3eHtCYIpo|=K$e}UZ}uY>AO7p>^O62Ui_~j-3>(rY^)&w#<(Mk@N)WS$Y=>n
z<2_Dqr&x(|$^}+*|9N6Dsx)QM13VyJ)*JLZOeV)zgc3^(C{f!*sWhOJWE7Ms^(RsU
zs1->Yf$C$1kDjt-sWF+4x`ba$Q7gwwS|*>s)j8zN0%*?$PxDd=i+dpdTGN<`J5m*y
z`5u|}m};s|KxJob%2xW=8Jsa?2Tbc@>I6n-H=SStGJhvaU7{nl=qz!=zv82|V^klP
zOqidI_tW~MpVYS;M<?|4$$d&NWp6X%>kP$m7^Z^W+G28~{2vZX0AA;u*9Eru#bR+`
z>h`7x;X!0m@HQh9<9xcnJ*f#Pzf-Q0X2n38Rj$5SV|8NjzLiW`cKL$}^J}(xxYx(h
z>BkfstXH5=;2O)E(cIrP;@g_ARTJ7oXx#OSw)3!*P?3rm#xayt!)Z$uE>9<HSv&&_
zcc0|v-~oYB+vLh?NafaQ;^{7zP^DkOXiGJFfR!*Gz%$2Ze_!!#w_DPpe81y!Ht_h?
zADDidH((!GDiMQFY*<cZcVxG>k`|_AX3`RG5sFGB#kPwqC)+a96ITI4wSoI;pGeNz
zR}Mq?W=CQZCp14m%A|>AY7~|>CXUYJ_m@JW4V{~bs>s49jWgf}h^!123q;!|(qZxs
zcv%(bZt^K~bC?XK2}GW1nlQ#n3(lWrRB+~&dsa-rJgu>#$pCdU$3fmBJ=qEM-<v|Q
zE5uW?B88mlXmA5Ub;4+>d0J>}MkwcRf$ri%0HfLxvKQ7`5!yKsUmaBGL1v&%?=BPZ
zLrKc~fJ3cNSYnz+VM3+yyA^6V1bxa$sGNbUB5~XKrARu9&;IG!9ZW-J6I!3-e%+4I
z0RF&9eaEky5io}75z%zAn(wYioq|A7mC5@d<0;RL9=hr|Rln-Su0b39@<=XvmeNfC
zyAa*{X<yCN^jmqk?93BOz;q)a+N3|Mj5j?}c`LPK^5b_@1+~mv%D#tYw8tfD)dXs>
zF>jol19!HV^>9snRgLHn!7K*``>o1s23MNCTbc+H*U9MYZoRioSyU^3Ny*sm9Q#<C
z68^{~i@h$>Ui*14JKn}uqf4`kO?!pA<$0TIfsdjE;&`q@;U5I8Gv+FZQ$rj1aYyIP
zjr!n(-xXVuNo4gAmvwF`$SqaWUqm-5f38FA9T#LZHF1F#m2?Or#pno*KVn-Jw@qW(
zl*=8aC9U#uPF>KQQ6NdiIty)pm+`uQ#5*OT#0zwQQviX95z$=Mg=*k0QY<SBs<WSI
z#Q<}AR^Hx2P%tili16kEU9Ci*yQ6NM0B*t_FX)_Zwp>9dCLf*}EG)0y2FMM#<rS@n
zgj)Uue}O}Uko)gN(TDm?cjPsTz=zMtKZ}M`$4AMO5q3UD<c6;y=SfzRWel`n2kmk{
zofkI6RMU+V0M*2LTmnPD<embQa7Se&w%0SFXiSnSC8-Am34{KYJJqcDLlf$S%s)L=
z)G~LWQ7JYo+M4DOzXXm`Xy2UP?q<cJaE4JD1;o_$Xiby>c3PVV3%|>~8nzg-c*1AJ
zWe@2%Ca<Li6L;h1gN+}uQ}01E_xq@$t;3y9Hd6FhuGkz=7%(?34A(QmARkn0vt_Gv
za?*@zYjW5BL^4HwFODBcFJFlyx^qZaCgUez{QQf<S5+=i*0}3Rn{=YWhN|5$6@9wP
zEu@A7YWW2JOuup>A-r23sKX@nk3NxC>^jnEFV$5Bc2}i|iW6Nm4rfdkFWXe^omlAf
zG~=8qY6P40cw6>*j3NIX1UAs#;^E!YUe_2;<_RW1J1xQIH1zJe!uQPX-19)~SlPYk
z2H4%YQFDpG!uL%gJ)tD9xkdH1_g{0tZudV4wiCu%Krz0sXQ<YXT=S24S8pFag$c?~
zi3S`)PqiZ{*9RPx2ztAt&o9(K*#WoH@i|2+d39j~!tR1C-?Km_T9UaLdSDlNg)0*W
zHz|+nlUyKIn$S%LEFjg4*oSF<`qPAH;wx5AcuWqMu++8$+7b~PqJ)DD>>|?-XxF0H
zivQROci9M%`_bvDsKv+B8RJDTHMin}(k)CmNG^3}_h@3(OS9raxqj4pxiXe0&Gn}C
z!xoB-JCNQgU*BvWQb$IU-olm6#ejm;IbvVw!au#domuH5x?&k|KhX_?j-fZR1wQ$&
zx_S9fQiB|yj=)G#p&dbStxaf5AQ7pH^u5%*WD4q^9$@EmKLtuvg$F^JNFZunh$-g-
zdZXj5>mk#`hM<<J)6AmxoFMct7-xO2;<;-AeG$pDgHgLf$Gl62GMC;<A!wpTh-QQK
ziz$C4NbD_gI8{Rj==!P;mAH<O%~io<yH&)p!=%NJeVP`2^=YlnIWd2pAGAWCl3IL0
zsOUz83GCrp(kPmyPqYbm#RkRJt|CT+m5D7%I33%=?jJ2-@`DeJ8Razy^aKMJ@bgf1
z?ACwa<L=v!v5ziF@CS7K@>7;~Xe%8HyU$Eo%XPLwal7-IGIANa!J~IFKvdXUKCZ->
zMz8PNq3ms7n)I(x#iImHUAOv8=g@VHf|n1S8syMC7&F1kdTcB<#(!Str;<xH1Op!&
zR0e>iSc@AXpt_Nk&?X3-9&~!LB}vL_AYGECBA8`A5!b*KZNntUF1CY~cevAdf(HK3
zRTb02;edwq$ffhM)aC09E1q@{JW~BK@4E%1Cbfxi`v||0?hp(Kny&jB=~Cp5_GL35
zoBCcG3`;G86h{x2f{r)fLge!eX~MecyN!_-shyt>e_DXs1n76tp$6J9-8#N(f|c+&
zyyJ9nLDde}n8O`{UjXP6VUpNeq77H0w7UPSIXqS%WA{jPtFWk1*)Af0b@eP!2zJJ?
zZWFIi9W8nVS_=4erNMV3A>-BfMa^@S!we90r0yRZ(r@+Y<m~XJ1U(sGZUwZg0@XVU
zQ%{N}w4oaUXa=c1tVK%w<vJ5r2L=<%ZV-<^4_~?5C|JUHezc#aHk)$llydUgQo7*e
zvj?C0u9I!i-4g6@Nl_XC6$sqE#r<JSQ1y$OCwA^BP}f5)pHswc_HH7rC0HyvS;_wy
zIUe^bpz_BzaUM+a??}-9VAB6r<oW-f1pP0`M4_ssGO8lBH)aUN2C57lO??9DZJk0I
zW+2u~DsF`sZuk9ZO@^KGs_A3j!q-VOXZ$ArJ=m+F?6oGN{m*&7RKDw7zG?TVKYYi_
z*MtHfynQa<U@2(*9oU$8AqGrgnk9+_u{fk7#yHZ<Nv0JNA#AC!C3j)!G>*fwbjm_S
zCaY|!>&=yISBt8}9wlc*<JR#w7LJQ1Ra*xZwZ_s-@kItGj{!7>b?HSbAUU#zuKKR1
z0GJ<GT(ySUxS8gwXXNvUy6J%T$xx}7Lnmd|zo`6VZ)WXI|9tMBU1S9+^p-im2$O9d
zRCjm;t=no2{+zTMolB`5w$gpKr4c4(Mg1x0ZkV<~k3C_}34s0JP99OHIe3!c;7v!w
zl}$p_h%bd?v9wribgn;2FSlE7y1-xSv*?P|r8KhVm5q_Ywyk%ovMGTWXKXnNYk?+T
zowe%RMYX8lkf6<g=^Y-D#AfDmJ!mslc$^+N3Z+$AvP6g4ZZF(&$rS%76O}|az4Y8f
zZ`Cr3-!CdC)w;pV*6%=x&9kxDT*jP5?FOvyCmKM97gDstSVkX+RldP<$FYQ6swFa3
z76cJ3d+(~3>~u{_TTTSKQy5AL45B|u2Ddyks?PfTa*m#2s1lNxaXMG=0Qh0Qr2SAo
z&L($K7I+!XUTg_S5|l=mE*w}qpQyNUC^k$*d{Rc2c?~u41|gpVw26j&aCGgcFs!~W
z2(w+ird5)2Y{p%+WN4}N$v8X`V)f(vT)eo4Fi=^II%aLr#PG{F+qGKGWU;qF*dgdd
zLTNL~gB~)<(*cQ7sqHGjErKGG(8uc!Y?G_!1%-~qlbpmCmYO6aiP7Q|V|>8KC7FX_
z6f#bk>0uTFsJy>G4>2OzXKwagvM+Ow{xj;gU@oz3cj)A^uw4CXsBD^Psjrc1-~y5S
zcXMESN&#E%V^qPf!BDyz2t(A~>liT3yG+i)$vEv+#I<MrHBN{F{#dyWHtpX<fTSDQ
zKfid9K33u5NQLi9itOUe`U`&iI>#DBs{oSx%i6#COt=8<`*;=eZ_Sq^{<rlfX!d>B
z61KIr16Y~<H$q@gLt7n99sLs#T#P(`7*?-rL2C_|E+{H3ScxpyiyUK6a?dS;Xm7%d
zW=;;>x%&3uUER5^rr(GJ?OfR;f2rklChQ~Z6Lfi&CF%PQ6?tr9S_NC`s(E&2cjxr#
z_G<k0*UK%%KY#2rMGz3fSE3M6GND5_{ppWuwFeaO&}IYlP=-;^XM<yWy-|oE@fOka
z;E68=k>y}Rps_I({h&HHgJRj-X2OGSYC^<sN*te39AiZzgzP88#(S8KCZf5biy=xt
zrx<+&&t{!%AX!)IS_Tz7el4oLAq$5y{7zx&c35NGvtYhz&fE7^ZEh_cPxHxBO}2LS
ze~Z4EHKCoLlV-brY=aJ<F!;`)Zp$hAtH8`ZHc8~JLLzB8qhLZuoL=@f1JmPTo|=m<
zF1$PtKzT62_<?WCipjVKqq+~~IOhUOmgWaEbln0$zT(^*W8xpdkn2|j8gm``^{fJo
zezPV>tbJC&RIL;Bs|~9Jq0hC(wvb#&yBnNnVe~hcBpH>#v@-@Mt|omLF845LMq6aS
zCk0z;;#|k0T~WheW92AX7;VT=A>s%M7cIQkahHw`N))ge#MsSUsj=Z&R%;h3tjaDK
zPKgMy)7iZKp%W&Q2#3T|TrTKCJ9VaXO?HjZh7oQav1yHiNu@4}`Bf?=7I~s_#TJKS
zZ<gy6m*|qru?KIoB9R75K^W+0x#Y3tES42Rw&9nF>V(|@M@nj^=1bM<PiM%W1x`vP
zvy<T~38U<$(}RYZHJ}Wdm1IXSjeMrfaIv<D7-mk!8;k|fL7I!e0Ouy!SMC-`R0C@%
zPG#r+U|C1-7m3_iJCXsOdrH5!KyoFB1Dl;Qt<>K#opGV0x;3h<O!7M<5ynlskH<~D
z?~j{)AJnr#kGPx=f6@&MJ@m6qAJ(%{pZc>_A4ki`jQjbEA!kZ*tVFrCKhEC|_q&5I
z&FR)x2So2e{LH+<!JWrf2cuxJ34JDcTdz8~_X~6@8zAN+vGnB2lq44tty%a-E0_Kh
zmi3DX+Z?w#Dus2Tg!jBBrbphUiILwV5RT~WFhLtjhq5szcNp3(kw!Ak$ERn8wTjbJ
zTvxEQ@Qf*P9Y~-;$Gv6Yh2!`pJ{_}{!R1<)FM71ZK<SJN95P))?F+0RbN|8?ZnPyu
z6VeJOdN@GKjBUug*`O1FOW~huHyvb`S&J76`$-A8-i&U5dHjNJ2G~9|T^@Nr#YUen
zsS0m25?56K(=fE>OB0(jlsygez5cC8Tv>`>0BIuoqwvvxclzCBVRD~fw9#PCzOT-%
zhqgb7?2b{CSs=r-7qXRH{vo;<YanvmgBZBqn)o#d-&)MyKdZ_tYTaQ)cf51u-$Q>c
zhs|!D^o*>@bL^CJ)y1t96K%zpz3h-qXyG7hlo;71!w<b)bQY&HsD$&d`fjDPR8mr2
zhcXMD=+(BHAAgD2gKO{chD`!(6ebERLKW#A>}t~kHinPJuc7GMVv5n}|6bf2&03JJ
zw=K26Oel44oPxKo>M~zxii0&JTVPs1J2fiNT*b^~e8D!Yo=XmD=oFc;V9oH3eKB^P
zN;6$}>+bvw-IAb<a?~g1B=sd;g!71T5TLbjS>pGX3ewTTyKPHSK3G9SKc}H<7k5Rq
zjYf!0S5)1DN2&(Qbyn9|3eI((U|EXFvxMXa{KIdF^)_e_g4a!Tfylfr;1B>^zMmx^
zPGR2mM#tJJP4E;RJgy>DF!h*wK=~nZdB=1<23XxTgSV_b%6U>1h*wSFs(MhCw$YHY
z9;B4*z>H){h&wBSEH!iCPo1aPxG?@Us>c%fr}tB=(RUN{Q9<WkEq>??i;A-dcy6vZ
z#TecQ@0F}b&=wV@EW2Fuc|4@4!W>A=!8&O~($88(p98!q$MF`$*t9ZA={>@+dI8a9
z$PLs55NkIxu}&DQV>p0GXozpCnDEpBs|4d7;wz9apbg<5DF-QL0^&KN3_1ER!wNx7
z(O13GB>%Bz5QToK!g%8PI*qaUu|~Co&)S514(av^f!E^43<71_BTvMl#C=e8{!wsI
z(40~i^U51-dn;7>cX`(Q`Ti#9Uuk(~MW`Ue-#)ATsQ(TZO8q~XOaBE8za9U+1IEz3
zZBSRqX=O!98~3Fv6@_zjEovbJYXTMgVSe_`yn5IFL2I&dVQEiac~yP~^EMl53YaR%
z{y0E#z?<Hbr45v$Fi4ZJamoHO%{A@bdb}m@^>WDZ&vib5I4T#{1X)a<cz()oA0_`#
zo<A8xHfhez5@k}Xya5EnOGDXClTK68FO+jwepLk{3FnqXc9F`>66k3b{PbOqQTrch
zUB}$A^_vU4#`-MQ`Yr6u4RTXQU8^W-V<@riKop<p`#BbPngHl#9dQc9;YFK80R1(q
zb`e>VN6A97!CF!Gh@Aind{FV@@47MMaUP(7M3RiQRYN-4?$u42=!o0sY^&;F71egT
zfsB|h2)xB?Q)s{-pFDCMH#pSXG8K8)^3oxVu=`BTbJUdv>!QV*7Fh!MqO8r2^*&3k
zCJIn_oLdH7VN-eK@b)abM(63;=C+xnK-eee*}Hxz2^Y;rc*Y8(XxgCGBW$D+E9ob<
zU`y-mhK9J)7gonzH#LF=kJQym?RGmze#oa*wOQTz!)g>F=?R9o(b}--hYx03h$R0^
z^&;NIRzRb!$991cWlPn56?8V^*oHSbsj+=~uBzv9!w)bFbHYs3Ir50ElY;0p*t;@T
zDqsgn!UatIfGpm=niszaHY!H(<(bi9!fMO?0%$k+sp2iV)usb)o;v1dmNDgu(k)Jt
zYDZwQYDb7Y23iT_iel{0F>D#Ni+wPWK;Rykjl6%uW|LR_i;2=&r}U}nEku{fO=4K}
zZDg43?Iuekl8!tz=M`m1>5QSm4}7s{gAs(BqO|iOhH1KTv4@U{!zw->&w0w9R>$t>
z(EWE`u1QkG+UM&+Sfsz0ba<qbX`KQuZ8^I%Ih?PaqWpi0MOpTr8N&}w9N>&Rlxh~K
zNvxMMqKm@YUj<=EQsGc|Q*d7l=1*D%!+SHV>$$0U93c^hD8~x&90H^-JBZ$ATvFE)
zM8=LU3{beqMe*_rLJf(PGkE))>s{ne<^ob^&JH#wzNzRPY%yr2hAAZt3i+7Ne*^}%
z?f6i-`3f?F$DK@NW-*xKq()s}X9OP9g!1mwdm!3+I)vmML%=1Nc^;5yc|MS1FN{Ty
z3MlF4IECQ+EZq{t*xcmyQ1ya4Ksx<6+AThb$(UaC)3`+<c99uoE)OXptlwb|uNH?n
zpWg0?_TUAGU1C0PV#Ot7#F3bAdkGaJ%_4SDrmhLVAyt@}gw6_HXgJ095&CRUxuyBN
zeyKPFPVZW`9n#OKD~->+qVF9%Y5NIC>&D%k!d4b2$21h&BDOx*EGHtnN5{Yu8Hd<V
zr@a5Lhgjv5m5*J{b(P+%sr{@u09#M)AN~3kN%zPw$|qa34U9u?Lz9|^@`aqrdWI~Y
z05WPw`=(jh?VL$Jzg1aK(7xPE-K5`k>2GlVt~W{lZ+nxnu>-))N!ZrP%GCH<L;T-h
zbEWEkWIbZ@tpg$Fe{z)i`sd_Xw+5!8x2hCwz|s+$+IhmCY7tw{Nh&YsAFwbmE`Db{
zVm%w<JxFUEP-7N(t(bLh@*Q8eu3vZa`#>;;A;2J<JQ@EJ;0-T`!bEE%B7`sYf!*Ii
zD9=bFC??WJnkALe*ARk(QV-vSvpI7~+3&_^sD&fCUOSPYH$fG2UzPWRy&0aZ{6ZGD
ztn%94G|Lu?g-Va|q=*TB%?R1ZERBVg+$o?M!*P9MO{KZs1R$A`mbR%xx0$LQ;oq5$
zg`HHEJEmPECQ?*bz$!hx&cu>_m^L|oE)F*j@9-M<6BtXg?N@MoqC9znP-U+r$3m-q
z2s>w<o|alz=sBx~`PgDuo!a!Nw)|UokS~J1(+*}0MMAF;c0)-Gwy0K*sgkEC2nlz3
z-87fkl`_t>F}YujA<n4Ix=4U|z!HQ*TmgJlixa<=D>-+qB-=zH6N>o#mDxMPXiyCs
zSE;G&l6<iv-PFcRT$I;we1|I_fjK;B2+NrQto<`lM)-PxPjyI^bq;`|>n4cIe1vQq
zviQ>%J`*t@PBk*3PLb7$&$Z*^W-49-2TlXMmed%>9*0H)BQ_>>AT1=BdFeK6PcMGW
zFr^c9YN_DI1==x#z0~51kfdUMMfn=T*C;)3(VzraI8%g4ZxX5>ez@oG8;Lwh*)sm0
zZ64>HM?(EprIG37J?Zi$Eh4YVb)MV%`^G(QL|||J{0;)J#PbKsMwY<h&~O>rpQ2bA
zb>6-ikqJ{x$;F%^3$AGc)rDd?l&2fj>6yl9R>`x0-ozP9kJDTm-@ku-xjsUM$kRjt
zSGhj=Enmo1+q$+ziVl_5_iIoyLi&Dp^bLDS;d}Xw{}?iEi2Z>$hw3naBK{zA!;S+Z
zbHiEU&$X9&_HX0B?<4ZuhLlFekt#6{f!+n%;PgdDM%>w^z>Y0o6aM*Ae86jAenoQ0
zrtT^3k^tr;m;Lo0!+S%}XdQb+^^`!wH5yLP&#{Od#H+TJey6f@dV4e?p;ICtBUeE(
zC%6#U<==O5(CUz2;#UzNGh%|TKz)&ze}t;c`~J1nvXMOisJ^#a0+@eSp-lg?3RUBj
zFtz&rfcuwfa#IV&?Z+U-=Wr6=oK`3r1rrK*9P<2_II<*{&U)ZVSp3LCtk#ghJm?RA
zb$Er#q($NYgp~G%5LLq=WkSBfNi0DFf@CN@JZYy;E?wt|*Y=aHhr|731?_m!&$x{0
zd&@2jmNc)ot*<C|+oRQJfwvu!f0pXWVAXapA&U3ZAg%|jVQq%-VXp?-2QKKN+A-`p
zw0rqlnnAC7|M0mHZdDr~@hkWt?FsMg_rqTGi&Ha(L_1ty(7d734tYZm4ucWE@BT9!
z_#+;+thO6|kMPf3O^kcYz90mR9o#VburMAHjT?9{dc}ZYlsu(IfV|p{@^b@Jb}x$H
z3+1pm7lE=u`0(a)2KJNs&fjOyVKn&gfU+uEbrPO6SMdf#9y46{tr)}KY6|LTFm%1Q
zqQEk{fw0K6%p%;(B6Dz<MEuH+%3TB7-`d-vAAGs8BCGD9ZORBIWlVU`>uM9&Hf9>g
ztdW70xGvpg6l@$_0}5NHEJlxzKqVh*fdHD{Vr+ZMI4liUCZ6qP52fqQvNtRwWn0x+
zOt*ZECw1aRFu=ylA~w8`2n{pdqzEX~S$w|~L(8PxGr!D8pvAC@h2Q5;Wg35(Cb)5G
z;c0<jc@@tYsTP{CSl}+d4}SzZU_HLykS_M;4>l~~R`PW>t}P_Ag!}!qi{s9;s;GyH
zpKKko@TBnPu#nR`Q3ahX_FZMjIU<lQz(jGyDE}$@z<%1pz~C@DfB41%{CTj<+Q5%I
z?m||~!Vn!+EL5;)G%e?pye0}l&-^4nI*Kw<isT<w0Mzf}l{Fh}3UZ|<!^txTY}D(s
z)pTPkCy#&(UMO+tp{fg3fV>TIJF`{1mhM@JXXySoe3qS6iZ3bM-t9mKew^@G_-S5Q
z2o6QOMW>bs371+m`+%LOo>oyODoda;yS9bS`Kos)X02oBgtt%e$R9uJBuR@^V^WQJ
zRuW<z4R%sDrVJK&Y<RfJ1idM#ES^7z<0Tg5el<80BnT+eg(%X>*0L?X214RzxVnT4
zJ2fL$ir9wiTCm}yxax4NR3l5O4l%H!Fw6r=C3h(Ykm|W&(hf;b!TXDhb73zl0uM6S
z70){w^TG2i#khMXtf=k+t$`6GP3imPq^Wm;q^0rGBJ4ZQxERt*#w!=oRTHZ;0bCO+
zu`z3l(EOzGwE(9PDnpS0s$6a04e|N{TeyfTh4UuL7^G-z(mbB3A*OMtDvEPyHxn&Q
zAA&oCnvd~J#PH~yVPu7Y=~==W?u$KOesTnHj*2AN#2)o=5`D<dg9+I@J8rIHni`c-
zxCR=X&P(@l*X}&&@u=(ZuPNV6fjTxjdT?Q3bu%ArD%I&<(#)UTQyQw$VeZOJXZLbZ
zi;sU<u;wq)IMC5B9UEnRGPAQ99Xb?lIvCUAX#;iB_>9DaLjjm9VT>Ekdtz?lQ^@8G
zn(8LJC$hLMv{j~ik0B7;IZm^&!On~eCSWO;s7rfiCn12)3B{^Q8)-zv*~+e;#pYDW
znp%BCr5XIWS>~nrDr{U`lE-4)xFdL$lNs#75UDXzc7cdAMXK?GQX$)gLl=6H4cs<Y
zisXlOQMR**;rr`O2>UHz`#j(g^coR#FWvArQSM?bsO<4-BI|f)i_X3GqgN`qO<0j`
ztytPMiTmw(o=Drr&wg0nDiuy|+O97V&lf7)zpz{^RcKZ|L${6$-hTQH?_=Tm`y6=P
z4|`9~V8eu+&uE_$w^$6HVZ|LGJ5<yedhZB6PkV&V6vN#mdRW?3!nba7E>SyK_Z#6p
z`v8!0oG9~7w<vm<2){6Q$1Nk1O!PWto73>Mg%j!*w?rziv2aBlIrFdlYf&H>7pSd=
zDtF^z-2xNJ3+Zp00|&J|)4~Z+?%F!gk9xfh6}k11aZX3aqg&=6Rkze+Is?wnmwLqh
z)u52kGYjZiI6&|dS86zWRkCWGDEtFNO<@~n_nY+C0L)7cpcp6oRldB?dd^wK7U-0o
za_k;&gH}JCnn7pAc?%(L2k!^^7tCB0UOP(h)l5U*ZOMc)zvQ0NI@`%BXN}dkhCLp!
zk2;7pnf(d{V_G0Z(@Gir;6(u?D|`Q{VY&rPU8T#)N6nU0+f9$7$o~}uhaDPawT98I
zQQ(`Au*eK?eQ~7yQa6Y?)--?v2&1o*q4G^%T;BD`P@+*#S}1!IteMGUy1enXxkE;;
zx_|$Cr+LPG{B;$^-k6_62D1AYq9oL#C@J_~*={7IWl1Aer`o)QXy0K@HbIn>>4aBx
zRp#2|diCYQlHAJ<vJ}K~LWGG@edDtJ&Ck86pAZIF=IWK!pVoM7RVQgoR?#u_?~SY0
zSkZF%1<Bq0Iob-X^R&h-cPUN-NAok><s<5%&A^Sx8mFW&K-ahfYpe+MxW1ma5gHZs
z6r7wB9bsNFH);`4l2+tzyQ1ucEcM~D6NK`xE<fu_tcM2Y2B<fQpi~(=R_9D3^?S+^
zH(WtSR`M(F;%DL2Tix`{)hAQTRUEy!pIC2>`u5=+rN`8Ss(IK2X!d1z8)?RtpSC9V
zXyz&*DPp96S-nQEJx=c`l>CstE<xNp!n=<K@=rxIzp=W0c3uc;8CS+i$1~YyYwllj
zj=?nspj)Lboswj<i=0SXCLvljg<LC4WsTe&hu3-{#W+TWFLGj(4^%tv_MdVF46&SQ
z!%X?7A33oUO_OW6<3vUb)wRLYypc(=cu}*07WV`V&j_(p3kTNM`iUV;^$wv2Oo}K=
z<+n#Ia>(SF*rtiMdLBEyd{PHPR{oCfwss*2k-cmEaXFA5=r$*tDc1WJMGK=l(Wc5(
zHqQyQid_98U!#vg@rX8oqxI3CcVeD9dz=k|e?~!F0OV;6>;@W}9wuL_ZcT!^(TFHi
zAQb#f(j*+5Vz9uFjU*5erd$)0HkJjXCSglISUo4c#ibB|_@o`ML=vfV$11nCa@0#x
zh~NRBis(wnY?=u(P}g)th7~sd;8&69<1wZmK49mJL)C5+j&hupC!vVX2>u(I3I*n-
z8g|MTI3#LJ!c_QXjfLO@b7{lrkG4e6YmWe>AURah@xrdMFkdf9w!#xM2*z5NJ`0`%
zeOid4))sM~Bd68|O0h4su={{2nMndxJrp!271;ufg$62zsaTt7M^BmtJt<X4M%|Mo
zh%cV-iKc@<Le;X2;%Cs<R^^Q<-M-8pc1U9rP=_?$HkzqiLQukO13HdWnc3^i8-#Kr
z_UehId14XggpjnWRWa~@v!X^K#)Qb#E+W>Ra_K9#GG-6D$EdVYkep<nLXZ}<r=*2B
z0<WYmQlg~3U4z~wnZXFw8@iv)yr<z86o_7|AhB}SDg+WwYOh;g;!;%VQdsJOwwQ9D
zE!6v*rqZB8eyek}WB7!c1*=7v-52Huld+<5<bh3rkWgo*{DQ8A*s@|+kv4D!ld&;S
zTw~UwzO}QDRswKXUTpWY(O(tJPy+t-G%bJHC4;(|W8wRwuv#FK>(Wy!lXEr0Jbl@B
z&<Lj5V2X?QGA6xDC|Kwzr!2U;UkFv3Bm|7f7GBQ_Z;GrhOdCPy!4G_vqwUo#>D|<b
zehaZ+n7yPJdmCMOqf{WwiQ)S7DFBUz6c>dgO@kPV?{RVr+mXaCIo`lGJpYI%zp6Y@
zHE=#cPvFs=DO49>q8G-oLtSTp0I|n8dO+Hp+;@PxMvfnNJ$c{}eIJDOb044|QS8N(
zbr;mXueC=68tCL1rRU_>5wy=8b*_tNd+7FKc%94UpZ%6wfJ#k}DwpTC_xA>^`E?I~
z)dd--B{cwoyFA;{wGqHp`aZ0@|C1jGH#WF^z#F<7$q)P2cE{qiD`n|A_<22x?>Te)
zUuLRh7%GSw-%B+i>A!>REdMju{;zdf^84BNU%<Um{Z##%-TUH`z{Um^1})9y=@z8@
z0^~G>K$N3X1_4DuDO(UnExApZ(J0VhEjF7iHlMushV#8^!i6lS6$RX)j-OWrip4u^
z$$$AGgIe<+SU-JSU2p!`?zH{<d|Lia&+Ts(UGWbd*zRX;+C@qAC=0Zo1(J!FNbHDm
zMwP%b$c@a{DZx{ao-j)xqk#h9(d@5%O7)otg2;%7dXs8lMvY|l5(24k=G|n5_T7Z~
z0FaE7o50>m7hPFWH~-w9E8B~UTq8AXZc3RdV3OMNU~M>&7GkW(1xea;4OD%@@w3SC
zq^$D>zv0u=SdsY+Q<>;+;7EzlKqhNiO-nos>Q)u3t>d7$=bDg31k25SKN7*nGmqf&
zqBJ$MSZl#=Bty_0gy5^8b(k5-kEboZiDUC#ngy~XK(GZoks0rA;3^F}r>$bM_LuSJ
zX{BKolk+{oL{6ZMh$c$c@n9~WW;l>uTCKt-zWjzy$C^)#npU*Xr_m@sSJHLX0f=ZL
zqIfDwgri;;h=vp|S-rx?oI4Bw!JCE6=3xJN8^;XGq)WS{<vMW^C|YlQoA9;ZW*NB6
zB^NQ8Xrm|MpmVne#_CM5g)1^!LCgNweKGyIdl0NDpZ`GX(}5H?M8)u{i+~e0bjz}W
zw5{%ouu&t9gzbM+ZBg=+WuJ~D<&{pt1MrvOqGVp(^GdnW^Wy+)IE<OrxD8Sb9U=jX
zv;o9khxXy}7AApQ!HQ+j+8J`Y1c1_EIrETG)e6R>Ua<2c?To#3+mm^Cs|d3^k<HFL
z6rk~{k+<GzK^cX6kLa~3f@(o8!Pndlg(tJPIc86b>6+Qf!hTuej#>_dAud>HDG1Xd
z7siqO`eY0l#oQtjYjrZEXyqS$s2BUZ72(n4ps6h3Bc@}Cc_m%|RNyrz5zCM+o!kuf
zjkt2oDtrt+D}osIPm_40KZ`B#H>AAB=nco;(vF%NH(6m}FyY4O>`Il%QFhqX+l-9N
zq;AKs0kT9o+b~v)CZKb157WV$2ypzUGiV`=Np$>5lqU~nKZ&kpoyG*?qDKyb!?4}|
zo6G3k{B3-q5e_v`K&LY!Cx~(=sC8CYuW&%=hQgqTswX4aJI+b6ivdx+S26RF7PySj
z;m3i|5mc{2vTU-KCgykB<nMY@75IeS5sfsm2+Kbpj-I`|OReay#o22xSJSxCm#6T_
z1d-@3ZwJivmfaxpEZbr6q~C@64rZbOrs-s4EQ;WaR|HnGSdV3ilX>>fIA=0b39qx6
zhgDona4|7n=)b`!Zv0|6^oqTu@j4A{_jxBpS|=7iL*F1F_TpAgsyhHel=c^uIwlH@
z{wbitJ~JtSrq?Eg@2;lke=}(<$cZ0kJJq<KpqIBJiEB%@-plN{k(Yz9UX|sLG#Oih
z8Jqo;$_%m2?6N6!-PlpbD;&^oaxkJb?+p1^-oX|~L0bI#QQ5lU#+3R@_Po3uT?yUZ
zQIO|C8#Y7PTC?#nsVsD`Ie)y_duQ;$Rhs*d$e)Mo;v|JuK0jQgspia6Adc*`$IBvu
zq0{7V^*$Yqs>QN~<3}e>){AEOd(`6ll%0XDUu5PzMptCl{NEZ?bj>qsbd2ORp;wQs
zpv?vcxX8YRBV}zJZI1BwHNI}&%wj`+o5C+8a{!cA*L9#wy64mgN-$xg?|gYbfj>H5
z?oXtL1$8AB=N0KrU*Q5jkI0qpKZsl9`-khoCH-~^AIz+PthMaksvaIKo&bM=pOZN?
zSD;~LM1RV7A6O{)kA0!Fm>YBSh)_@y9@~HYO?c<@B@gx`Y|dYeecVUHBRvZesf7sM
z$$e;Nj=imr5z|bS@%8;t<tLNn_Ej+AgywI&PeX}QSxMfVKwm;*my@Pu7o@O*`^mTl
z5J%yjN%jATFMu1^TDweEU=O(KdhPzHZUh!N^&NQv(JwgdO38E5=`WkFx}|CL**WHj
z!@&p*BUCEFCaPpg&FO;Twex507EJ1fWb#Yo97|#k5C5FE^>eR7P~;g;Fxfbb9Iue1
z@AP2@dlyr21bkMyWf8s7>x3czo)abA2O|;n>NJ+o4Py{h=r9Po&+bfQaY_?p8sY#3
zu9g)}HTD4dN>&oG1fyPWce!w=!r^xt%K4yI6cZd%Sna~mCKVeQ#tL&lne>VWiu-Z$
z$-3CZCSx}t66a+=%WQ32aK-+o4S6Xp_a%Q=^EzzUOqjWyx!~;Ae^AH;m~|7O-{&nQ
zwEqW_?!O4C|9i*MI9Ep#NB@$A)`SiZOvb(Jhq6W^fUImpr&L8I#qB`_&t8;ufuTv?
zY-ty)ZDeR<c&oYAdRbube9R~-yac?BX3ck(6pOEKtp=*+q%BCuxlp*8c|T2EZ?!rG
z3w(awV*SHo*NJz|G(o8NiGAA_EsU`eG7B5AYX=dvQ{rn38udpp3Qe!WKOTb<B2>T#
zbk8(~rUo($YhS{R31l&RKINdEZA;1{w|^&u3d9^d1%5A~fNg+GHeB*n5(HCNmer<=
zipNO8L0(O+zpt$-g)hxS6E<=cpJ_sblHU+lk}VTn^Ug$K(Ry%!jE;4&NV<u;Fi>p$
z6@#uY1%U>H2isGpwqjr|w8TiWESJS<8p`=PjtZQ_4qKHx-7|K6E&*L?y$my~BuO?i
zOHNh&k{&4S7tGdTFz-+a6UE%}2VT>#B&?*3IYn*=-BBbAKw27#eGs5Hs`7GOF=H)X
z(m>A`2wUgPQ*5fE)Ywo8EfN3MLw26=iJE;B+KxG<RyO`#gwi6tENjHlooc=&vL#nh
zo!UD16<Rj-PlSom+@ay16i!<qE3N8bg{A~5ky4-L0c@j5dfi0Rthh0>u;~Ih2ckqN
zZL5D`)bJ=X(67UYMBJQ}g-5)!-azc6^T{tmTuQR2FeUdRDVJ~}4ADXHy0s;)j%Aik
zOOEt09`O>S=F7B{c2$Y84IF5oTh>vdkLM}^Ka8^#(RTGMa5JAV_3a-`5Svex+GZSd
zO<H%?!hXbxHd@1C63!xzHjDVS)DNQ{GvT>w=HLmgS)$)|n=gHt<VdRb;RzS=QV)*r
zE(XsibfVkI_(v<0!=hlaWv<v^F!Ar3+Yb)kk&DIsG{adN9EA%QVN5%{fpRz50Z3k=
zJxMFnS{!W=t3e19SvTFDAH;39MZV1<9g*Sie4@}|K!osJ=8Pq4w$_!=M152{%>f>_
z<Rpqcz7B>xFrC)wyAF5blEX0;MB8j;6|NcF3*=iOe$<=V5P3V*o?>GD{^Nm)5Qdw=
zkZL={f#qi)C8j+>b@)ms96TLFp%SpEW5_(;>9ge|$!)=vZzGjtM;jO`9*cytL>p}b
zToU4#<{c9H9En~V4D6jz`9}bLu_zCP2gjFhse!=!nX7ukYumB)IY=-;M*9S@>Vi;>
z72pxF{EH04+hC#Efxyw-r`Ca7n6oAfA4z1~@3g2vTI>lEA|zL*j@juhE&f7Vv9nTt
zY#f@3cU-w%ShnO>^*kV1;UeRCGnJ64RUEjkG))tAeNsY0q;b`2XBS#2TstqdQ7S-3
zQOmLb;a`p+(4~VTt2k9a)+L-QDvHVEmXO<t{3^bFRR2OmoMgBO3TN0F{S%YK<l;+3
zkOrw`XDlzzN@wv<MzWS7W?k18s!kNRt};YNz~{h@!B`Mx{1z7Gl~{QhK|wP{N6dV_
z;Uy|H`@2v&JKM&ejGs_o1H@zg<*MT}<e2Y%GYql~l~=TqzGbJ#Ro8f4wr1!k-Hxqk
zLqu}ly2UnTBdGZFG<WtF_VkRh)0#7M4$8aHY@oF!ZK#;zecI4<?^RA*ciNG{Ss#Kp
zgSggyM98n6f6AB+e%g#pj1k|dg)H@EEV;DJx7}2*WUI#8QDlvm7}t|h=SShp?HZ;8
z{0e%erH1kmdWlV1zxkAcY_Z8Tsxe7!-`eDbirwYOu&Q#M&YcU|t|{tlC>qn}h9c~z
zQ_&AF$GrTUBUG5b0^I(w$!*fTf&11859&)vojsSl)@oLe?Zokv+`+-cFY7tfulkrV
z(_p<=BA#Q@WpE{^#unNH`wA}1{Y4%{jCVrkZ_{`?RqMhL2doaygzj_tqOo3)MskbN
z!7#n1I1y%xfhGesFl3Z6^LDv)2f6%)PpPl-ujzT^Go0e`*KR<i0Nylfvw~MVf(I^p
zqIsQujBPh@`}e63W9BtK{*0)hsFz-?3nkbVf!0F(fvM&=zn9V1U&0qmK!90s#X1Ci
zz3!#?IdMfyY4F8og<<#W*Ma=Pd(a%UKein)Am$xG$rG7j-`>JHCoA&)oC)bm9pZ~d
zn8m8WZR}r06}ZWKWa!^RX9oHI<<MdN|JJK-@x-^R&)WvGZnehXS43kMyjmF%$nu(&
zvLZS$CHu1wWx{DPeL7r))uY*CP;d9F{!WCqLN^x)<5|T1@n=cYv5lHmpLfWDiNn*?
zs$<sQjOO;2w`^C!e{_bfaUEKSld}&U*uuRNRNwRVv@ih)EZE7*=MJs0q8#LPEuq?c
zDFX>%Qb|@e<tb`R`Fr%jF7r;nmnD^!wy~J6{MVHYR)k@v<%m<da1Jo-mVNlPg*usG
zO{Pi&V7cmUCC*YC1+L2q<NGVnupQ({XP$|Dyb5O}eM5s*o~v)IX0uVsO5ztE>d3zL
zxPH|kJ-pR$$(r{s*wgbSODHsWAI!K>ygBFg;#g5&Ral85kVJL;@Tq?Y_6c(WBbXFS
zRj`*nEsO5j*igO3<_$i_YNCz)i8|`^ErV3dJmFiCI@-BAj$Y7au_kwda#Gvp<6i+m
zpcqwBig5LIq&0Bp3#u4JIPDmY=8<VwGy@Y}L;-3D6HLI?-%}DI*6(!wcf%HT`8f7C
z0&AN|r3;i)HQ^s&iWS1qfW+aAxQD50`G@$UV<%UJ3Hjxrb!PN*$*j^!>4i=<6c5bo
z+CtImV?6x?$b<sGvO}OePWpatTS<9K@xHo>Gu~iMl<~+pXOyi|Mh{;9Y@nGj=T_Ex
z>5R+ShVhJ<7F!2<!9G91iCc&`>RCpZJN~hva&68&2lC?RSEd+@o1fuDIBw)oIiDkS
z684o-AS#R72~4<$tXn_0%o8Hp=N8vY_D>ow5OL}pUKPyoMvAJz8+CEM4)Mw%-Liq_
z-bc;@6nk6JQo%(3i>8KEt2iEN!MPp+<Uw7bqtsswBJcr00bvF9hYD6WNnK+D6hRx!
zUlj#-&lyW_L92m^GN3241&@gRWF8z3^Do^0kR`_p!_Figv9`^X%)!-!dsE!d0Wu3V
z!Iff7YBbg$X`*aMRPok<N*kifmT|>)VN0w4FnRklHNG{ZJ@_f1ti$bHorp#m5305-
zx-Jmqt^7YPd~@UN3Q){EGg9~Kf-YEmjXr+$vArztyYApwwjcvL4jd8JFj=Fwk((_F
zC(>;P<f0|7c-H8q_jDc@w31e2eOKWPdcXRmrFzSueM(GQgR{j!NCL}qu|yL_-hSg5
zNizdgY~noiBfPeMB8)1~B=P6jLW##YF2D+}JLdQPw6g#!i&^;c`vi_iy@zCnpqA)S
zm1Vq}{PuyW2VA242i$BOkOoQpzK2%-TMH|;{~59JpYhbn-zGHxTbqB?{-h?96Z$aD
zrx<s`oCR6nuRQE^Ux*O2y+BY6jg%E?-y0Z1d=yOkF$>#R%*{(Zo2NkZIL=Pa$$?Wo
zdsL+mgeI~Y$%}z+w(>M|e*gaJo}jy<<DI4X+XDY)3*<WJsez@P<?AW=<(OfZ<g4?E
z|DQ{@JlIM%LZ6Oo0h|5rP4jm@6q%=l7(~=917Xq)3XbYCrOykt58iQfv~-KEn6<|=
zKC0Y^hOaTI+?YlP&&zN-=>}as%CLz?YSj?D-0dm=(FIArCE1p*AB(?NUtkpFD&Agz
zpKN!YS#1{t2WgKb<D?#ypTZbn*aI19^qH67XdqhR**^l)Q?W1E#1lt9_EyzXwr?5d
zj6`crg7c%SH0o@$Q_|8QOz@ONmTwhb*;>09r$+&WV5PO*HO5f$IfgqIs1$_)H&`*N
z*pG)01XzgAglBVM#}@vxA{7N}s4c+YP`Zu5$49~`%BPTJ!%RD2R2@#45#|C#miQ16
zZ^no&H%lm(by{zNK9v%X5QYc@S1;FWu%A1X!l|XiI-~N=X>$zWgxBn2r)A044kk<?
z@FHcy9nB@JfFP07#h2G;5CCf)MAA{`$LC1CwD;v3gk4rSfehTlUPLM@O<^fnhZ%2p
z&^1}dPHvhf?80K|rQQgdGeR1~p=SVJ&usLAE+gL)_J|uF#ji1FZWsGO(}YvBYh~`1
z)4H&Kd;Ysmzy+JB7#eps1B{9y)`9o8LxLX10P;yw9(VtHjp5lJrCSufR(br;+2q%n
z!qQqIHo%SRlW`9Y%SoLLt(v{JZKIVlHhZEGII0t|`Y^F?9bLZyM;TA-hC*GbyDn94
zfnN-4KWM+2k6jjuDM&Is1Fp^?(ligjf_9NcPBX!#Vj~mZn8MbCZqC%w<Zl6#nI+3h
zD&_baggAqe{!ZCV3tIL(i+%X$*SlwtIS1OwupnB)^HokP62yAqmJM#C1hbqX&{bX?
zKA|*|BtBY>lHr9?Kl{2!bouapMmxU;;}Z6ZE;pTM+%n<ki+|i}l9tS-D!i~JV9}p0
zXdC(V^`dko@a`HmxoRB>zlWEobkN(oPLIx&C^HuG|6%PNf<+0NF5R<j+qP}nwr$&I
z+qP}nwr$%w+rInjzTJKA<d1*Q74_DvqGlDDYh^y`4F;j)JbO-t%z7=x)-hK1Qbe^a
z9v&4zP{6bR`21GV{kSRQ^W(Op8E1Hx@pfpW*4|B5r*0k3UBF~6ZHZ-}f4);`oLFOI
z8{d|`UHR`-QrsQ6%~iJaS%wgb5*kizqB0AQpcQmy<mu*7^stdf5aF16Zw9=D0Da0;
zQg$9Y;l9?9QvBm&7G8^&aEx`T<wPNTyG2hn91<mBut14-JV9+M4$JwSR}v#kwDU=i
zR=LTF&u;_;gA^87qj9~()O3nc_<Gd&gYBu1tyF3sL$c&9!DN`L?P<rOtfgmwl#SFY
z>!2WR+h9ua9`aW@`bw4vR~n-X?U={#sEF=g=kvphr7+$yE@787m+Yt@#Gc8zfv*jt
zHHW~9PxF_wn&`{<DcTS$@8Trhm&nM~N8`2uA9RdE3p9}IPz^E*^BG+#Q*&fy+je%%
ztl9kWijhTOB`qzi!Ttg%6*_x7{|f5{o0uojnT;;-s#(pqS;yU}_J<+o7*j{r+msg9
zkof}=9<K#1GhXV<EpZ34OjIW>2oA&IgbY~`+V-meYgnwdJ4jdk(g2yYsywJ|$Qr@Y
z0G+(CU6=3j2qGW3ewMbB{OYxTsYrf${ixdI`dBrpbAh^)MN;GAkS&Mh$}Fkg&q=yc
z6@_iEeDZVt)l2Kh*N>3ThoBI#6zC%WAP84VcS5`$2!5aFd<yh2X#u$hW{|!ydg8Ce
z0ebtZ-|oj*+oH7RcEq2m{RrGOd*|+^5aid8zM-QepSt~ccVZxZ1JlscAmlzLL6}Sh
zZw}d!cV?19B96&-Xdr&WyTqS5{d{+F7n~=K6MbU@6-?-^x_OLg2CKo8uEd{_`OReo
zgOlup?~h6)O$9#B)-|&e$v>uH+CjhrS{nz2bj33add9_{!U}yCth-e+Uy~uX&<Y7j
zT9Q^>7$+nyT4cL5eC7&4x2iHSu_hHSp1OS|%1GU8gM%b2>p!{KPmBuoa0%AV<Nv%;
z?J1_`)-w}EvQQZ=-O_OVyb&9b3E+?idQZF=%JLmnU*dSrTdH<f4L+CvUX-o{m+0j-
z(w?$=18?M6MkN)`y}NH0?|%v-nHfF?g(GXV>ZD>xUQLocsMwbfe&?9X9sDT-MGxjl
z_^RJN_gnHxwbjCear78Xp3{+UktzzKud#^8A{nX2Z(g78ZKa*f3xadB;D43{Tk@?M
z#G;k*+simI#ey&~os!(CIkdW`<VBhqA7G|~hfb@S>3B+W8Jf^?|I{N^n*-q+VbH}|
zsLom`FevhniBhImP#+$byO&ZbMJeA!#8X-_C>~21q1859XhT;J&WX)#KR%;V(#ML@
zxI;b!n8`CpBUxZ33$Vh7;#GvKE~0s0F88NckoOn+TP)4JX!baKGhdkZ{GGilRgirM
z9<1)~v~Y!tEScxW!+bk9umF~YG^i~+1yx>j;sPvE$Dx?#52z)qUrpGnCO%UoaHI<n
z-$OuTmF{FK9v0?%{$n_@Y--5*w>xOcY}E+<*l+{^uu0aWveGh4w8sy3T+N4&NILk{
zJzKw^h^<Y!Y@8GUG92q)I2d<$x#u&!>c4QJoFQe$&Y@q>2}wT&bvu|8hIxZEXezwA
zKIr7>l%^bH;F>DJA*Z0aG`iE86yut*PUqSzVa!$)i*{woakUi0-GVnjGxf)+@s*y?
z&@AdDi~M=g#E`U*@>(w_CoH6cD8q?CaE3RjQI0CT{a9eyG1BPo$2lCr+1iI3H-b_b
zj)>MYz#TyeU>5^@ba?L#<epIxafg!MhQzqTa|4UO9Po2rN#zW&Vx+K3w?Fl@_1d|&
z{=uIl<DH^8gHmal)-l>=rA&et7qaiK79zI7A1N#ys8SDOfkcilM@<$WLd6ddGo&Nh
zUGbGA-)VdD1)#N6*%33}Kt!9>S+cJ=LaIH2$rV!6<xJ~8eRGsnqjc^_s`h3d^x*_-
zMlhR<tYS*cqaoHvJ9dY0S4ExBk)F~bWwnha7jsna*PGg;c|BM#w`PrS_Lp-<E+Ul~
zPR{kwjxSiHD51PvOWi37`lVZ~Jf@~DUZFe&k0z=u>{i-0Rvyz1P^0Ax)6KnO06)Zp
z>7*3LXU&U~E~$0yjQrO5XDr4a%$B{8nmBFm(3&CR?w7Z-eG}Tot{@X@7u07L(9SG4
zy9$7mMEkq=w4|Xu%fUNxoj`z|AM1ImNROZZIMQ}Be@_~lmKvoeE-A;Ac8*5P)J|Wo
zGC7zLdV{s|;@Y<G?l<pTQ{CIu^AkIeOvr{z#tMqFZ~M5mv$Jbf#rso$7J~^)TvEKm
zEkq5UX(c71w7<90U%NI;G#cTnnbzzv^E>5T8Dn2C0X<{&?{%9N-BAQo<ZCv?pS1!X
zdsS}SiMDIZl$8wv*6>R1Jzhz3<PNRwak^kt{%3XrL`~tG%r8e#^S|5*{cqN*|HlaY
z-vX&dq!;os%Fp&y0zs#cJGdY)g0qy6Ah^6RbXc5B+#GR{1|qSI|M(3F^wbPBQzL-4
z{PkdkP4(~f9K0-PrKMHIO{n@2w9>PC>-Hh{`quoly-rd)ZS+9Do7&EFy5n@i(ffN&
zNo&7fhEoBm2K^@Lu(vPbm1C8G*#t!$;CU3V1IqX7LWmHif>1;-TR_PI$Qco^`xKt+
ziSG8q;zVjS?W>?i9S8$D?cIQ1_I4PvhB^z{;9kV;ZM(!|y3~GcBVf3_F9qd;e#R~s
zIFb2?P!@0efa2FYLO=0AB1~TDKLFk1EyY-^(6fm-eOJ1J5hmK}Rue{@)|Wwl&khJh
zWH3{fZHQydU&Hu4#7IqE8Go}6s%%`hayE_#RwXjmovTwh6|txpI%v|xJ4{DnVNBME
z<uC9UyVo%NHv~-=pNp-qRBdiWH}9r(H8K+yl4jH+TpBGhzft{_kAXcpNvqB#Wc}^8
zBqRnFtv4E2GH+6DY=`mbYu5?rvqP*ZZn+t%ps^4V>y;y`iw!bTWk`#~Zc+-UC);9f
ziE$#8(yR0`#~enpoj2-~t`{cRTgZTrfKjZlg^pAtFb1EBv^p1^u3EUuW#Tbo$xKGr
za56P7DAu#D!?})lZlJd0$y*HO02!0K{L}Bh(cj7QC)0PX(98YVH#DQ>v$5R7sff1K
z^MP+zxZw6xE<s#n@e-VETN4l3%W{LJUI_+o;-|C9OQ9z+E+y%#-e4HP;QCS4m_zg<
zs~An*zZ{dRL=iWDI4FIShMJ@yrX*j73Wvvl1u%#+M*{+X7+~;9fta~xj=^9SCpxme
ziMuz>I$}2QeHPIFicx05VRegEixgWS^;m827@f0b%x_Z2l!WY~V|AenDh(njn|jG&
z_*dM+S@_b(^pKtxF>M*uiNnY_66&%O%yF2E4vWTB=E*VXM&;mBApa3_K2BOD2b}mb
zCO$CUA<@3AJZ}EXAEHscL|8m8s~IEKtXbqYCSmcK6eD-&#92`<Iht7~IGU+YTnJi<
zPRrSHKmn7xde5AL5GE%CiO^>IC;z$XI`iCLqWKmLy^1qu*ur!kf^>dOlVmTFvnS}(
z`M2Sjzf-}PJ+#8?sX2t6xp)QDowJu6_0XQPR}jPdMUhF2O1-v(+@8JS_RKEkA2Rxm
zH5MGIe2S08E+3LfZp}J>0`{)d<Mz(qYY{tt!uI9{6<j72_|44+@HK$S#%bvrDWo&v
z(WpHbb?@KT{a6%zjnD=HYL%p<r*D>e-T}Kxs}Z8Lxhz<y?!7ZyW{2=WUHKBlwDOzO
zhdU@@M&+IYTaqG|ai2@5F~&F+<uerT*H-yQVQg5{LtV!vd5N9*jGQlYsG_cN9POLv
zDk|)^)dyUsR|+Lp7+F?OOP<(6hrZM4onw`X#Qn-1SiYo~q@^c!y2kT+j=h-;F%)%y
zD-OP~Q=#8+vd1k9Y`DE@8hrgb*)R<Yq=vv?oGq>}wXoYr*FTX1l<d<Gwh2~lW^>=9
zEy@oTcYj1XJK!dZ8jJ+^C*Mm%ay3xHjSnT#izTZ_d`4|qc}%0#O$gj{_4}$+6||p#
z|5?uoYECt9K(%_1T^037iTE=PjqO`XH^a~!$;mhSbE)imcQ!>KbuOJ}p1v^}ZG7mA
z&(P9bCs~@ILHGCUI8a-V?@rO+H;C+R@63;V+X;slLSE~ew}EWu%3VKcEJ{+W+0ow2
z!I*3+YbVls*IF%qYpf=>@HI_+Mu+B4Cx7kwnc1!O&rr#Y9q+b`n`2_ZV_}gxEQ*Vm
z*Xh;+Z@1E<Pa?$k<B`Zz6Fol{+B=nsCnzt@Ow2Te_|bn2KkNcE8}5Sl^JeswIHbU)
z;vQu>%IOq6mu4q<%qi!OUCfEp(sKt+q`1la*r==BOqi&ZiVgCC*ka)PY|Sg^X!PVA
zHyF*)E<Qbo64J7tV5V=u2L7uL@ncYi8Uqv?od7*FIY%%wb0?r(OYq&)SXW8ABqfsM
zz~7k9Ft>_gv$3<Z*3ZV&1^{y-2XvDaBEdd(e7PI4TE;4j06cmwustc<PD>6lIjlx)
zGs?hJhxwtERcGi<?>i|!V)VC=2?nerOOaaxLQaGPUXl4Mt0R?xG^QSO+ycjEHjC-_
z0K)e8f*Y}{Qe^t9?zgOS|7Qaw34g-gTk(!9yqw@fUS7cwD!&X8G#jTIz~Y_a$WjMj
z^|loF@}?fz%KtU*!DBl!jyS87AiD8(!8--t6_yIwlr>VdB9+$OdIC71tFas!#&2aV
z)OG=q#0~L+Sm4#3tjiV%?10d?WRH7{#?Wa9+IxCMFsbd|nD#=gdc2x7%5uukThmnV
z2q`INq$_f+K@A?xtBob<F7(Qbx~e@gkikoh><)PRr5*Wv$Ks3;xm1TQJ&w`^pflv+
zqmDh2-bahmXdy&i*O9FXm?^#~cwsu#Z&TK%YS;zCmY-8LV&TJ;G4IbcAC7zFAJ}?m
z+XX~c5BFlkhuaTuf$snb<^XH@SD(vNQ5EC9E12s^pMdq?_uZV!i?&hdU;|verxuXb
zO1_&zj+^diT#b;?cCV~1wtWWXxk&?N$74(LPG)OA923l&SG?o}=Bv56AvzeY;E-0!
zC6wCyt|Jy|ZRvCx^U2ZvSqh<Rt=0=jLbLj!CuUXnyh{+;Lc$kCw4R`1uS&`RG<%>@
zmS#x;4Vj|UV0+Rqn&3^y4bZiuvob$__~Alzz*q<Oh%_D%p4^h|Szz@m{0*k@)d1jJ
zsWx9W1!$*h6-<|l(SjKETbNJfP+CGAK@CseY(e}0dFS&>aEnKN@LT8uH@xmYlH7lQ
z7<#rv^k~Iy%q)DPPDUlUBa(|v9z9SqIa&^o)>JCK@Bfi+aJb?}%f{sP>)mO@><;m`
zr+ak`wAwjvhkx8{SEIBI+=FHL{ox~N;PjRF)=N(L`X3R~6qG=E6~Drr4Ca3&+q3@n
z#5*AaYim)*-z1;^GZ@vZ0pb21LZ2MtxD+WJH2|OiN)&v;UJ%XzDFgtZL>>fiJ*CeS
z_gJ4X=}edWoaW_%rJK#NrIwXet7fw#2|@hI28>p73vF}ra*gZmizUrt?~4rS_!K|c
zAX%K-ZRc&yPtI2kQV#q5Sm7Vku@u3jd@&x+<-;=1M-PQqU!Yj`_*f&$W2lRJ5ujMl
z{o&N5Nh8pnE0Ow-f60X2D0)h<wUwg|Pwrchc6*s1?t;;B70IPtuc$e+1FiQsbUFQv
zy4<0s-LJH|^60xtdcC!#be?ao{+u77pt_25bXc$Pn0{Boa(7Bk$7Z^p*tKP=dhYj9
zpB3PZcUC~X_Xn-7*@izapx<Y~aDJ*`ehOk=%aOhNw-NDv=&z-Ouc>H}_jW8^&EU2B
zd>8i}{y&}$fMnf(2)>EfLXO?)fxd*{qjB6q|6mw^;nSk`>u{>!H0slEkkGvfR7<zf
z@hymUKjVL6@0@`nGYIFqdHuwg7cj1F9)|%xd<1+WLaO6#`x@$wf#KGAMqVYmrJ4oh
zi}qWtcFaB?8c30TlZl4HUx^5OFD_iYFTnu9PGLX>U8USkZMi7PSN1MD2Yt!VA)q8P
zo;ARz^~NA?pPD)5_1)<xAPv9G>n7(BZ4i-1KI3V*RxEE3rkq~fxccK_1Kv9e6}YZm
zsY9>ce5{`OqFL3xSo0w_1H8tK-Ih?b*%3FAg;?1@jAkY(ltru~nki;ft4{R#+sdw6
z%cIRZQD8JXg<4G8EQ~`-IE?=MmQJ@7qVg#nzk~3KS!-Zb^1tXiheB3Y*I?l0bah9i
zDuU#cI1)=)pmo*L6>;h_%-byGAsdQKaqjx&e4EXU6`RhL)*2hzwPpM7mXMT|5gM9+
z2<0GEt`l_yu@Ct{fl=5|?YR0&%!?MgwYj;DNOPF#YnaP38RLY`L0K-3lHdn5&_MyS
z<~@GQJ%n}})_kT`oxSo{;IXl@lAu{Tr52?a+<UEj0Id-;9$B$CfG+&R#fxfraVPXv
zab0@sIygilxIhVd6{D+2k%1odI4<*v78;sxeCi0UoP$UXLe!_uM#0tGrpg!$#7G$g
zobX|rnB(1DYZr?U7gS36qB;0l0uf}(+G}D9fx03?Ti0+i>UmJ)BB00$3WBve{v%Pn
ziG%aPL<E7em7+W3De=+sxW7g>mh5M(ok>`u&<r~MiGafNTs+bXyanmbrlth|>yA`O
zqeo)b>TY8aWqxIO#e>-=@~eLjr?B!r3%3%%l=0J^{ebBdr#58}sPbIt#)tAU23C2+
zOBYnk=rN;>{pYIAlR#kA=TSX*5+PYoReUo@rE(yxtdcOpI72~efrTPGs+s&2eyiTm
z8)N0B@+hXX)srG7^NlIi4052<^aDkD-#)fbJ&WLrHusC11X$kqu1FPWkTGR@Ir;M(
z-2tubt1#hbyIah^>RAfDPHt>k23B;{`B~NMtj-jJQ%u++aSFzxaw6;ya<p@7&Q>EM
z5|Uju4wjO+NYtgUq3&)(79JX++nuvKH6-gFvq#b>xS5Rr&OFq(CX^JlRm#DCBE^J6
zp)!;bmoV}e;i-FfV}>WJEG>a?FxLHEljBWPXE@ZE++V$2+^?cJKOaquvw}e)f~P+D
z!h=Ty;({TI^o#kBYtg!F;%~}!b@7(ep6ENAk`ZLA`$UnZFX}O5NHOcjhitV;$}k0d
z#1Juz3Q%lFH|9rPvC5H;A5ccrk<j+0*W>8u9SCR-Xlx0|Nl2f^*_B3|NRjN3Zk?4R
z9gtLz>fGFJP1-UU6-d+B^(LUxttXJvCoXrBEEu=rFiNsWm|)UPCe{@V#oH-P$E=aG
z?n#l@Ca{rc)(j6MwM`_0r;cfuxpAenE0Nicnc3pQHyy^}B$X<PHj+FXYY2FiERB08
zpp5egBBeE|dX&cyS-ID@7`ou4H7K2AG)kE3vM8*94LJMEvr!r+w>dWpK~0J^FJQQ2
zGzh3*G)yKeHH;2qu?;yG%fg!H%Ur~*gk}b-Bdn__Toh-q4JSA)=uNs6b!?t7X5wH-
zu?A&AtW}K?DW(?^qHn309T;38EJY>9H%#v&vCXN;O7n=#fh%XowTwx%CHFbsmQWt)
zA-1HlP0S|<HVUR&77-wrM=k^retd1Elj71f?vaC`I?I%nprzHzSBv!pMU)yATp;39
zF05Bwz`gFz?>CN<qC?1vJ|YwtvgK70>t(1`g^FDm=PyoZTZqn_iR;nnl23H;%O<M=
z#U20tJy!2&5jX2fKvx)QqT9sGwJk-}*sTM15?K(Dv0}YGqW3*1c~&iS?qn*O&`nQY
zqi}KUBG68uq0y02Db;D=GY@9f+~*&YMGk8w+P6Tzj_~)+jZ0Ut4-@KA%T0ASKL4kl
zRF=1V8_a5E9PeyxBWV<o5wXbOvJt?WdPS`E5ssfmj~@3FFF&^O1pu|mu)RMc{x`V0
zgHd?_ZK^`t_G5v$YxrB-EET1BH3Z1!VvWPXkV~eCDXD^SPVu85+O<qdqf<D0@tXKu
z`1&(7_xx5-bWfoCE8{|=>^|;Vc%WuvVv(dpIXk)z9UXi?5#>$csU&qZF=uK>xxrG}
z$|?}p_EK$67_=s&SR(~KfJ$s{O~~u|>izOjEhwMOHvf85r3fZ9o;7-DI!B*f-c3CC
zW+TFQC<@z{9<5A^6tzqF>pO~-pckZns9KG)>JoE-8xu#hN@Q2KYYZJdr_NU+M@CAu
zhoJy_{t))fmX12COTkCM6IAr*P$&!pE~al(QI;oBmy63nrKK6rUnz+hO`r5a9<HAg
zxlowJ@{gFSxu<bw$>_-|rxzkmgVa1xCc}d5Avf6O+YaxM5160&z@?9M+vC`CxKTP~
zFo*1jRv1~`<2S@7tu@q_H|U>s09^OC<DQAau}bcc&um9zQ8>tuDJYJYo1>5d+_WsT
z%C|DysG6z^0b3InIBu0MbfPv}meKmIgk>*?-P9uo#u%tKlecbkJ;r>r;#R_+4DS7R
zVF5hSWz6L-a->H?$MpF~3ZJxz(}jSEg#cXX%B;B6z^n;IIlPh=ebM74+_7Ku7F6b}
zYSgI{n#fud1F|Eft}uvhKVd{y7GP~j+9ic4)U&*T&Xxy+U>G4FSZV>*>LI@E2!VH&
zo!dU6H>%yCth|4)B*|JNEdOj$xbSS!yknRpk+{<_;s@c?pzpuBKvD<?n%Gn3{KU^A
zBsbmx?%6#Jr6vKWu~5c{Eagd1S_XI)cqAZLzmELxm#aTJ7a3r@F&A516GV61MKoo=
zv#XJ6=B6@kLRlL5;-PI)2(=MNu_f&@g!}?@ro15<f%LjDeJn>`*+O}uqxsrkok_nb
z({$x=W=IY4LMdcIJ)v>8GC&?2e%#s~Tz<ckp9|m?q);9{m;_GBqqt-}S*-G6vawL^
z*g1p7H(9(>wu(}U%aI&hu$O@-mJ|wqvBuA2$OpveVO#YvZI?@vI>hglM(#hBmty3(
zXu)nKI@vE5c*#YG+fu5`kH^#nPag({9fr+SWAIzyP^On-6O&84>Vz>Axx6R4ep{Yv
z5ffX!3dcM23M-!F?zGiNC##2;{#Ga5^it|ua?6a0m_l^{*ocFUA3#PB&RVqA_<Fhc
zZaE{u8-4Vx;Ptjl0(-iL86W2%urvl<F)<(U$oBXfb<wCw2ON>~=yrEDnv}_};--y{
zvNFz-@|Q%}@{5Bu&fjGi+F|yPL9jak$?7F~keq@a#?P|@vT?;4*K@3-K_ug{e!d{M
zQij(v<3K!#%Vo9&?eZa}gz%3=#9e8wQp8y~QeS48dm85$Wy5y9@K<+C!@a^+^(=O2
zkl)><O2VfmUh1>qfs>0v>87dN2e4>OK_37)_;U%$CkoQ5QkH)jv@U?{Ng=&5Uvga2
zwX}a$(Lv%?8T$LkUVXg?5xS%`O(vozus-U==bWJ<-59~>5U__AOlMLkVy{LW^V^s>
z%27IwAUljr@Kh^4J1g)iJ$AR8{uN(@CKQ}w{JWzj-RGbldYFo)Gmk;L-xQp<ljtY`
zW1<he@d!;ZG}4BoV|vWy93agX9o3A9VL=JKY3)SZy@`=xN97=+AME3K-!;=M{OJh4
z*kJ&X-g_}gV7CfczwjM~3dhqAD?&Uq75&6FqDp2bTbEiu!jqNCIxw^dv$&fjQ`}$Y
z^Z^hVtusAU$a<k)!Cj%{2EV6l<*qV_os;D!@n11702HnK7{$W#c?J3&%De;C*f^v3
z{2$#;Tk0%&#4ivK^S_jS|C`;;|CD}Z3~UX|{@4EYvig6z9Sj~fMkYEY4-Ie)baC;&
z$O#gL;8H`x#e(1@=mm&Fpqm$yQ&Nod>EVsQb2rr~v@0vcDxIs<EtZL@4d4+}>Nb_l
zAGX&$Yd*!uo;O}}iQ|G(M?$@lygQw@v_FpDKRF+}zkH}KI6!rhl=k_*T*zDJAuw)j
z_ZnNrf;_xrc)6*uo!j19ha=suf}o)EY5sHvQnp*6fsXp(ydfx2ZSm0xXsU<b(AWd}
z(A<B)j@J;_F7D#6;0_Tujuj}z;_lNvy|rPnRqUst3AqVQ{WSU$ZIi?ka~zEzdI*Po
zSb+2f7ctyH^-^QanC8Ol#{BIhg?dPmeYALci1>P`w009?Zzo6LkU!~h_#BN$e5>|2
z*knG-15QysrTb?W@1fXcQh<7u@2Eg}QN`^R0{UgATgCWoAc7yoe;2?-pUVCKZvp(o
z*mu$)o<%|!x8AJ0H)pt0!&j}BJh6bcZ2)Z((4fYi0isD`+c5J5YL<2WZe?HCn!|{7
zSb6ir+uPyqXdyk_mO}&?dJ-3bSiP?*i0A3mGO#p1K7(MbD0!FAO;LOpW&#P!AgeQB
zVQ{Uokkl5SFW0(_bZ$PGGsD9|EX{~cloXL5?^{C$0oFeO@*F$W6PQG!aDiOO81&LA
zzy&?FxZ9QDuIIaet|$JcLRj=?YZBx4R?B)-k@cljXYfpIHpQ*j{5e|q{I17;nV#tH
z5obqz4i3b=h#a;2)Rb;4vYi+F&fAGgg0A*AugW*9P<G;7?kp6wGFt1^%X^C|Bf~}L
zj&whgW)0dI@qA>kvr_!!TL*;i-QHqB^@$`hv&^i=+t=E*8(0TCqqC8@CFO@s5!v67
zgwLllxR>yo{pOkmP}o0BrdZJ-DtGF|zNdv{Iy0dR#;02hXm=?@UYHz8k(W{|vnZ)M
z`ULh*&QiQa_bJs@vG;<Ht(Ppy?CZ<F3_J4~(Ct!&({5v%8^o?j*0At-2s0QJcvkUX
z$G$ozLcin?2rD*j>mSMn<}4H-<QnhY*ENq40)Wc)+x_aJ_(!{KdY%pW-j3!<VpFJh
zWa!q~u*+ZtSOEe^speMd4^s4t6I8AUU17M<VB^*;Qm@A+^R|-2D756Y;uFAB&?on*
z_8tBk7GNdg_*St}1DZaVJWREU9Ru;E)2l>vzN!p4_94m9%k-jU+)VOuH1eczsm6Lx
zAXX<gGA|^Q`N)jM5fG5RWPAG9k7)=fnn{b*qZy<tj4sEG6QSkH(lK-eRt!Ap6|lX`
z+?;41rj8fRRTkMl|EQB)p!Fbi^(U{?y*tcP#vR(Z#{kbiYiNP&<_A1uWk<Y(jC5!@
zc93I2kLW>8$ZX0^e0aNOCtSS5FPEbk-#|e8<o{!%8}3sNef}6>`f3<5Pg4xb3>|do
z#SXCo19_J5^zWIBce(kV+TMJHM3f_^FpRuqF~-YPvqV)&*fVRcbRn^BYB+X8(6Hmv
z+hMQJXf}lgCj{_SzCwLh9B5n1*F#KGvK}^5>c+B>zh*}C9^yfMmmlc8wgwzheg`5!
zepen4%a(`XR~-1b_wu_)ddoPad4}z)ih!%E31c>jqqy$NBM8@0W(g_?cTj2%R7XH#
z%g+ZRQI?uk5K6Uabe2wWG%H%PM6@2*DE&20ZO`o(Q&BXIp*-1_6gjFe>=`4<FDJzF
zQc=K%RH^58SFVqHjua^nAC_6@w-T<WM2$p5S*;JoIyw|ppsus$uG?$}0_yfOoP;oL
z9uDkRWI~bz@-633LMW!5RFal&cMR|Qv|wdzmX_xAPq>dk#g*OGj3aTSUauRzHeyYF
z9x1F}knLvPQlU&QUqY^DRM8&aOjOd|%i_ReMDpGifbg1@5}!Hh2;wrk&?pTn1{7hM
zr<7V};`cCGBV)I7h2RLU9a~#WMpDpFxPg<<$nQhx$i@1_ta&fkA)_eyHl`7@mUKrt
z8Qnj&@FLDv<!;|+Q=5PG=&-dW0|%s_15JN<l9M7V3pMx+JFiG*i!V=_{_?3!ZL8`R
z8q70*<|@jJU6gVqE3UNN{Fl4J7!b&l_B74<O(WK7#6HlqPiBVAPS&zd?&i%BxP6it
zOZDs-$&PR%1vJU)Y%`D?Pneh-h&c;K;>QMCy9_T-f<&BqQKK4B33=`;S(fh;D0I<B
z=GXtuLWgn{yo7u_xmHJNuE_4lG%_niUyQGEs~sSYLeu72wgySYTj-PXa6SF&-A~X_
z9Pw~c=lB{HlXSvVPcZpck~y#`*k`Dun@hUoo?weC8H;K|6hD5j;4TxT1xO#PF;%JU
zd{R9El|6{I#9}#>=ionN=Q`WPc=4m`+jH1$LB%E?fITH-acoVyjARF9(zt#Os3jZO
zNnt)hV|DBxB^4>1HLwUifVfl$z>n!@Vgl(O{n?NozDupRK9lT1xtspk3qq4spIptO
z9Y5k$?}k3$1>O>4P!!$g3lD2|EWqBa0+tVrSuk_h_y?BP%0P?+q(+cHwGiBDZemAK
z3BDyChF(*#{`WLTUq3hi>?+<rW!ao|4ryty{Qj6P3dde{z)Zkv6zcS=aYaI4mVvSi
z*_2N)7xjRGzfI-_4c|$ZJ!Kdmnn~K=H({Dd%tv7>l<NMV8IYmqPU*5RJafjl)Mdju
z01iXCYNY85kWG3l%Gam-LwSDfP9~BMjaxstE^Fme^nrFsR%u$}2&nQ59d&>{A29NB
z-h*%8;)Xq+pm*GOJz4Wf6Z3Pl;6Elmfx-@+)Y9OI;-+mw!g!MH;h7<NWQEaCmzDa9
z(xlqswy$_-Q&1Q29H`%cK1eOfkjjecWK2=7E&#lOcwkC6CkpL)SDTn4m9#={KTJM~
z<&cgb=m$vmd-n#XMuJBjs`TMH6`NLLi_HLyN>t%HLUN+K#uTzwYWV-K12E+;QM5sA
zt2TTE5oUX{VS-DVONz$v1q6h~ZHw}w4A86d1PMZ+h6W8g3`s|V2+tV};+wG7h2i_B
zw@$g!nX%HcCFlt@B>^PYah!?b0=56mrzQ+5cK)K~oadJxd1z(;5GL}3&nxzDc5U77
zajr+S_z{UeKcEmaQmYdq6($4b;TcxVxKfBhUq7;$a(ur2Oi0(z57B-%!>i(qc%<}f
zv!^$>5d=!W2YF(w6^gRMbF}C9hafX?8xWKZl4Uef*+;K*;>J3lZGw3fa1E>slFC$l
z9K6VQsx8|z{+L?Fl!%7#;6K#kiV0XtkBpl3fCzcq%{1fS?|ao;<N~k5F=@nSZC5Sb
zc#H3X?BY%ps=ysIoNQ5fD;vi8a^3mb72)5W;j5EbG-6a<-{^<;jAdEVmy9ZLmXa|b
zL{7kv+@d&*C^W5DZi)|Jn1V2QS-uAf*+C*9kY9|Sjek9uN$wj3Je9*nR`!pESV7m7
z29D1#xK{OmCBg)-kQ`}El_f$AVk=6-ni?%GU2A+w+n`YOV=ucj2QRkj{LMysY*Qha
zs}9kPgs>y2erFn6q7Xsq4z_ENzJ(RQlLnzPqQn_}q$HcaC7?1g7K`}Z7P~G=+iVY{
zO@?R^WTbq<M!YNY%|14N`G}{rSYVIGy_TeSB!N(3l7oW`Gy#>XYS{J-D?}vr1yPLc
z!|>=HK{@M`2Q(D@E@ogd>$FnwuUFU3O?_<M#F2zkm*yUSc4Bm+v5-NbDC<JE@w#W~
zs0(y@Xk7zQt1EhC4EBI!LdB>`_U)9~zs1mc)4Uy8P;(*N{A;3X6)Y|NYLUcDhFCdV
z9dyFELGDLUjzo>1LE{Lpwo1ICh*0^^P>&*RK}MgX93D|iuPkeasDzxo9gl^(?pVa5
zd`B2J|Ln@v1E5#<`m)1#FC3>C35e#Y&dYKesP;oqBDhU-!*)CEB%{I5bU8*0L+E!`
zqCSQ|>)`o>)1t>C#w}y(!+Rr2)41w%&`kYV?r_8#YY;Z7wqs<VQ`I{K5Im*3d*N1i
z;*v~%CB~nGP!a>5fr%%%g&Mj2MO8p;@odn1cRbN;8pM}IF2_}v!z?0QL1vFs9vQw|
zf}UAY6Hx%(KrI;ExZg;PineKaXRZ}2j9dKfmBVFOw8rgEHREoz2lck36Ya>|!@yI|
zZ?ON&NIUSu{XzL{JY)#|E1QMwzh|=u{_i-X|Kqbvt3#+`FXQ}lo2+Yu_}dc$2VfRZ
z#RUh&4T^@L3yB9IhVjc6u;RFqO$K#uWl!f<Z&=z`Rq}K-S8uFPMQ4=p6RKRIRNGve
zXnEy6_uLXyfBl%5!KJWhi1+wTqwO%<e%(G?OZ|9!O8l7=iH>6B#y_;aqRCq>bzd7D
z4CLk>8XV-lI^F-H=UW6Hd%&O@ErFh@5Y+u?5)c~5jeXEKN+Lb+%A6CY5JN`7O;QM$
z8~-~J5PwgdbI3Kzv_AM&tM&7G2lD-GNKi9qX3`Zjd*3?C)Q1Ln&)73|)~o#2>CObh
zZI24EXF{)sv=CP>^$upoTS*kChh%@V>n$d#xa+MZ$~32!Z2yB%)vy+cZ|^OX`!g&Q
zZ&JOV&6lu{r6yvP_)~dcmiSY9fDRZx&lxmOvuL|kv`|wy&s~W6jNwt<o<I7PS!jR`
z<YagirxS+eY`H7YQ<+T=0U*?1`wgY~&<$97J3p*;oCy&E<WW73;sVD;6K#HJ-d-FI
zv*xv06(I8l1zrcRK@ZN7r@pUF6dmf(TudJ4*~+^u`8h{^u9Arh&}5ryDcdqp59U4N
zJvt2c5g}t?pZG?`QvQh{fvLoae^isW>^;-92DT!kM@i~%Jb=hJ0avG1EQ$vZB^%4j
z^MkXc`Nj4eV{OHupI=Pw*FBHre{kN)?$IYNXbv?LAPQbuQb~FxZHi&>lxN!jCVbLq
zCoi?Sbe1q9TR0E^@bVg~gqS*)t?>AZGW8Daq5PAFIqzZT(}YFD>CqpNK7R=v^i{=2
zW6();=_CLj6BHFkc2rtuKV|-}A|xY*xsAt}+wl^ZuI?U~flwY1YSF*NpZ>|hKTcrd
zf>XheaZuzd<N{;6D1=7oXqoN=96we(NY&=+U@L$sw?wu!Jb+L-U&o6w<^(Z?I$l}0
zwPR6GAx3eC?8>5ccY+#qv6a~k?QY3U_LSW8?7Jiy(*$LEvF812kXRK}==m0+B&HF3
zrSxr?r@L@yBTEN?1$(6{d=rqS{mjSS#fuzXK2V~~#ZsBbIoPuUyg;e%T*9zsQUO=d
zidp85fADBr+yGIYNa0Z~;5L(Eru>wCuLT}~mxaX)?&wICd-Hx;ZSHf4f8$Zv`Pyo!
zKYT<)`MACudp!KilnkELg0>}nk(bt{X1S{5D~pFc-?`RraLxeg<g#AF9v3d0Vu6yN
zzV6o}xc*OzMQR*a5#BTG?Hsr0<s%(-rfYA@cA92dl@ers*bP?xV3$9@28}k;9OIX&
z77xyX-$?T9y_Kc#fE~Er#0bR;q_G5xP7wV?_?dwb{ayyFvo@v{uajdElOS=ktnbJ;
znO`R#Dh`7BQDy>j!;*Lf+dAVW15{-LQFLJyLfQ-?0Q)#h6(pU5E(zOg&H6gY{Z>L_
zA{0_$%AMA~e0C(JNpQQdz{vXMj4+es!~8o}8m$)Ty^}2CDe|+Q$R*p&?x;{x+?0p9
z0OY2T!&XjGN`2%MM?Z4Zdvh#jS@C0~cI^q?Jp7=#fCq=#0DwozwJ=%`JJHqv+#TBy
z4@lPg7Pv1++hH3--_pI8ITYwYB6~|pR<1AK>C*Sv@K-~C=&$L*U=AztS0KF~BIXgc
ziapf0L)Yv!VcLB;$nU7$I&8n<xU~9y?P=(DHV8kpJGf7!fnH?n{!7T6U@K%wXF&wk
z_)*LSWCOIf1bcEpL|GAJa1DfD!Fb{L04)1L!iZsPk)$w1k)&`({}3aumdf2IrWkKC
z!}73pLtF+DO5l{Er~)w<bL+<=QG^GL{nJBB%bQ(w8i&8U)2sDdSpzs?)nStIs5)Fu
z#j-wd5Y*!Bl6WShJb5HK!ur0Z8X9PeU%IxX5v{;tf%!W9n1O^%#i9r*h5&HO5$xd{
znZfO;RBM2cu_qXTicFarQNR_khItzIV)<PTC-Qc8E8I_OH$-)wEjsyq4e2SJ7$e{F
zN-g}O5CWpH(|OCin{PTYUdw}ZM}H|I-9iI+EB<n+_(@-G%ThG=P<=`CjaGlkj(x6-
zkG~$QCnaE0K^*FFWTN49Ba8v8$XNt7J|mA>2W6Uq3+5w}$Td5@a(t4;4N(9V2UgCK
zkUdz%Ck=KnHp&ty&<Z-6wC<BZk{Teg&A;1a&oh}j5f9-AkRN1>Y&tC4hq_8gKZ!AI
zTr}}|#H??Ym?d_~MIqss0d2V`*B6;jUF88=HrQttn0ngixPr0OKgoHJakePg4f;4(
zp;on1bq^)Zi-2!E`Q<Ma_8w74c9t+-M>dF9h;I7+Q=q$xRW*gY9;exJx-I}|X?u4&
z4>2=N#B@b4R0FJ!gzrQQ(}5VO0X9qxUmFh7(QxX%9*}jcl^>dvBWWBj_7Tv|vH9#Y
z*YHX4&SL2pdxE6t%Ufqf(dZ02S#%BM_z4|M$}Rhucs|K~9=}l2WV#_6!#VC*1Rv&;
zFf_0Y=1UzSuCr84s{^-T$6C7YhrsFu`;&1lp+A#Zm97hRA`J(eG5PAj|G?=hJf}VW
zg);2~G5gl`cZ6VrCx9DyZtE=P?{qd>2=_|@!`e2~XxweiDSF_b4oS3tquSc&p0gUq
zsJwk&QA6^GCXy@76+6^trXPa>l^9n=9WK<o|6)A=%+PJH^QE@9G#J{xVV^d`&wzHl
zu*XS+$!~^gEBq>~)9}9`0}aB`@gLU6pH>8Hp_P(XJ9hAN5p(t+L4cIP_%v6xC?N?4
z--z(~#e*)W;vpH9`5FRPSuz>MQ5J_Oi5RPU)iTo2W>PX%&BegUgCooVlR}T=4~C;r
zi(PjtNHPUxX8(iIv}}&4m_#*_F2}oyBsD~)6f?$_K4ed(@_*dQ@bQ?8xtY?f2~nfc
zDnsGK>6#`C$1DtCkebi@jqa8O>2K3yIoKZw16)(FS~A{}p8>&g`dr=`f3H87{<fNc
z;QHqPw~+Wh;7$E`HU-)7pQlbLmY(ob)%R1Kn3107uj&JM#|7&Nvu*U9)G%0fOQ^p>
zB6m_ttXCwZWa43#%rVac=d$Rfnr1$hSWL>~&0_vF$rmScL`xnq=grWpvxVQ_sm}3F
zROR$_BfIZGki$|wKjgW?BM96MflpfN=s^z4tR0j&Dz2U@K1mMC45!x?vrZWQ9ZWL7
zsl}1?26{hwE)0W7&%B4NN*?SZ3Wrf6$oyNAbVM)V)I=cCus*Rwb6vbvbnN13OEO<V
zTw%9HqPS&@-~`*rQ6?7Bm5rk|W3U#Jr`eAniX+jM@U8>ck$9;YSWZc3)sU>we^6|q
zZR5#54WY<~Uww!sACe*Orx_Zow(zVGpO7~&4J*o#!heVbPRS`mt$(`-@uDB~N&6;8
zQr-m}_r<&N_(<T4;u^!TKt4I#c8`@X;N6j;GMLEX>}2(Dtrpq#?^@_;9!Plid3^dZ
z_HSDva-Qg@H8!esnjMxfDv4DzwbW*gQBw5PwLZ!2JbxaQ7|f;TaLnu|lb+C);QYxO
zcPO@?!P=%B4J8kZ2ff=TUaka>sb5y`)pqBaz=9RBwZ{{ThKUBNH}B<&eZoC8#4f#=
z9TR#<jOFDAU6UGF6D!~iO1!hzbgYtMR8BQ6n=u@-s#sAqEv;pX!#IR?nV*8BZshjF
zE_G4DbcQHG#?NHKCF(G;I3aH|M?sWh+c!m;r5PWyX}r4H)1T&w^S^{IKfPzxjv?NK
zZRBRG@vpM@Rnu*F<4J<YKB=-mJ}XqfXh~>tY3IJcEywpSQf@#>UDE8WClk+W{l905
zdZQD|@CrU6K}h#@_`*SVSpL~UT&Mi233r<`U*#qyt;<5C3L&jeh?uNsU>dn6C2a7-
zHj~XeE-ykjRJpOh%+0@eqt?8`Ufw?~Pr@!C_hyhGNX;+-c4ms$yjPgaMLEI~C=7~4
zK|$e=%4$P$(@?Y}#ZZSV?d)(E2NpI>sgZurBztqzUYGrM=HB9vpf}nWjg-s$`*_*Y
zh5E2KfoSt=N%(7pJFEdFy<805C8~DA6uu(|1E$s}Xvx3v$FMQ|<SD2w@B}6XP*UFE
z043~)D^)W^)(fC!aI!6D=C-f!b!>xjX>put36^>8lXCh8mF$o&Cg2C~KfOi?7`GkR
zZ?6&Yf1}qBva@wIad#GUv9LD&UoJ<tx|S2N2=cdQ;+3^27;8wJFftNDNF9_lB0Qi#
z+?KR65~08TT|lA?8AbzF=hRFHzAge?*<ZuAgU(xdknjx3d9n&>8lOiM8XCPvH1(8H
zGgCLx%wk6Z6UFoM^P2~s(pe6lcj=ywm&#gzrh|+q&MeB(6Owr)5j$m3o&&@Y<JW$Y
zs7Y{r!GR)Zj0|;G&4HvS7efU>K}AuJ1Aw!GbVM1>zf1=fW8eft{m6nE7|m&@(;D+r
z!1F;)1uqRj4~V+)ca(v>qw<N|gL#kVoNSy(mZU_wR2{G8t_4iRncgE;iZaOpxXf)#
z`1>p&7dPq5v6&gX^Z6sC(n8S>1c{|2T{H5BGZ@<07da;#6r>pZ%0_@*VP=e)l4j=N
z#Zlqr-V5R+&DM+=7?}~4LxyLTgq+(Yl_jjxg*v$Lt|9u|R_Gp66KfVOn$e`nK7^je
zkIV>*h(7=_t5bo{otdiAbv9}FO-w8!7=jEkr$FmR<ZLnJg%GrBiViFcRhSv>ZlF@r
z646sFRvgMP2wV-ChEZ5WmgdUNV6PfxA^E))n-lSvH-^rJaf=?i4A|NrO_yGi?>lX0
znjqQ+&Isl*{s^+adnI<#Yp&aI5&$c;B~GyDau^Of<rfY)V|Eoq671CzfEWj64OymM
z$~5sT;su1Ib-!d+<UJ#3tq9>@H7Y95fOY8XaBPunL_}j#2Ty1+N;Xy+SShMH#^*<1
zHm+-O-WwALkDd2~bKt?fih%wnbs+#k3eLKfzsonaU91LcNen83+!HjT>{R~}>%E|z
z>~<_lo5Y-p#Bzc5!k&tvjJS;!&bfPvW>X7g0KC0u^N-y~D(~4z5<*r^R72uTOmYK~
z<caMgirIIi8_hMfCv>Kn7dl0g25E0}{keKDw@lKT@H<b{Um#WtWwkunq;hRM$diki
z7Yf6Z8VvG3WeuP~Lg(}G1Fj)E<_q<~Tq(m2;0OJ^ICuaLVM1cOW-|cKWjdTyW0nYo
z>B!dtyPZw7SMjDVN>YxtnH+Lht2f(cvah6wUxPC8tgSuOmfEO7q=m4hGK2EBc+0)3
zbo;g1$TM2U?=~;R8cn}6ScC>|_jK|nypo_+7>Ov(hLs>`_kBR{_JlxE9Yp$7yo>bV
z@sy_P4H-LxA?3h@HYZ$WmbJRAl3&o@SE>~C(=;;|Tb%!Bn$_8$SjU{9{UjFT44Bbe
zVCQ$}$&|LsvW&sn1?%T#gM|C`J6O`G>m3=AYva)?J;S4j%0!~Ipe>Pez=#jWk*6{9
zOjc{MIm}el%5I26qA;E#U-K+hrVCxLAJ1-Jd#@}Z8Us%tJ1okcs1PU2q7Hzz45b*V
z{RFra(9hgy*Xx_$gh0s*d!!6#4sr$>%>J8584v`3TU68F@d168r>H@x6ibEV5qd-u
zVe-LlmcIp${unZMhcz*9g(}`3qj|Me2drLFElAoBwZxK-saBWEb?r1S+CUw&<px#f
z5g0s6MeGL35yp@_dlOHa&Ns&WMwpK`d;pJ<FYWTf{U^@e-~-!#2@(`4(Ui#Fc}CPQ
zN?6sJk39fiF&E+^tQ?8|T$o*S-Y})~qEYeZa*$2I6U_gPI_XlnE=isGlBNkmoE;40
zlm>J-#U35Eb%l|^9X=F$4P2kbu*Uy$rB4J7&<P$rXAG)E^But7qY5j1@O=~HUn=)M
z0I?mi3P7=MiBY+J`ygoxjtQ0iohcK>b(Ht0-iv!V`rBOm^v1|O?}9#i{zhZV`U(wn
zihmpf58%;Lg#pN2wGED_ScHvb6<gvs^?%<R%W{OKudzT(yF@Ad1O=YTL)$rKx1=X-
ziA6{A6f#P%78UlBiV-0oLhKYiFecVq=6^t&>%%VTs3_N7;@08h*J8^I`8>uda2hB*
zFNYRs(*<MIbEq$XMKC}<zHEmyaP|4TxaCvSdhmc^?ka=G+AxFdsU5}0C7;)gt)%xw
z=-}pd1N97@Ahf615O~+<nl99m8h7E1dkYi31h`%o8v{i{>!W0AIs+YFzXjw6;{UjS
z-A5Hlh8i(*SZi3I!nJ3{4?}-Mo_#;}O|nbwpxv3UdW-xKVn5ky=F&<Wh)+aT2TAES
zg^LS1j4>gGhH6EegW$gWbM02JWG7;=k8ywS`oR9pJp(RF>$oKI8c~_(lmsF)FuVU|
zC`rv(=B75li$kY=saGUS6h}-IZ<`<ghX)J)+eS51?7TZZN9*f23FfjcI*0KpS5tEy
zZ1;cUkVh)Bjph8pNJ9Qg0@i<1Zu|ct3I6wzm)fNrmI(Zh&2K?{s#zM_1W`<g3>5QV
zpYU(2FbQ$fB4Hzcso%z<b{6Y2<6-;U7H2^18<H3vQ5=L|Plz~!75^TA_?t8+jfcyw
zbd99`XuCT-JAHTNYHI82X|}c(2t9DoAG~DAo+XO5D}P@TouF$yoT;rQq;(*z&lz2!
zXh7Vk1Zl7>-@MUa%78a2bIg3qQeB_DbE3LT?_S3MEpe*>a!Y;QK9V3|Q_6Vm)LP43
zBJ!i>4g(Qml!_$EWR@Z`*>QlbhWO--@&#tr*`x=1n~ZOGjy6?>k8^<DQ+}zb_|Dpv
zM0M1Lc3LG~JY29i38}}9vjwroa-*bcM1LqF#TL=RFNYw>IU=Adj=`p0o&qhXbqoqs
zVa6CcP|M>c{i0nIx;&BL@4jT?UO}NVyG?ke>M#<fZDQ_X&Z#>ELAa=-nqm4!5UYVh
zXVRF&Y?G7=tn*yhCC35-cBHzk2&t)fCOK)gWBTUs=71Z{CffXVNr01;Nx-mFzW`hs
ziM1hI%jf+c1NQVp<Zx;?E7+CK2m^S=5No0RT{9-N<Q+3+cKf0dkH|54KW9+%4R4Aq
z1sIMHsB;!I^aN~<Ylxl%U6ht7gw%agBGg3K_?08);iiazNZbPJ$)mIok&p+j&av!;
z!;msf>$9j(&8=!HN_H*wQ)O<UsWeLUQn%e(1DD9LX^YJ|?A)S8L0T>mnA?l7!<d+d
zw!A~;4wuJ0T9l$}tyEp6AS#Ja!|lcS&==>&!<v|vd;btP7w@207Vm<<!n{F#h0wl)
zkc1eMG|Zbzb$^kklJhKMbUS`hK3%9+)$_Cy-edc8gR=67!hTbA?%$c9G_HoqVR|p+
z)Q}FbL;?s&{ypZ9dQOr(J}6Hs>F8~ji1LD$s}j52&c7%p0+wQ8qGe7rEW6(CnR3nL
zzsPr80!n(2W=;6q6?C_hU>-GPjPz(8kO;D*w3|K+6bnsaBMnP59i9+a1=nLUjK$O?
zzOj=TR*_7_W!13^l#08AJRjW2B_-9;VVh8rVG=*gR$SG7S3~X!Lu)*xC?&&iHR|@{
z(#E7lRrt&BQq&SiJw!(E*vq&%npuTY`>=RR>Z6+!;er^{0oSjei@dbeS15rwm49q2
zgIG{GlJin>)L_tTF=b7PU=edzY;z0C#hR%6Oiy$LO$)tX-H)KJ(AA`Ki1LK@{-OH!
z{h{XJe1ex9h{Gb7n-)ZOAUVYfa4QJf15Wa_aX#+(C8p`Rm&qABuXN^bK&MNOSb{I0
zxcN3n*EH&I)KtNx0nvJbgK9yCm;4TTDs3g|)dlVh^ed66cZ>qzApfdD!@j~+tG=a+
z;HMK+DmyY*^BLv>ct*luoQ=VLgw1{K7zV77va8k08XjS?us8b3anw^C0!Hk>S6YwS
zz=S_y`n=`leEa_R5{rEy^GB=E*a~G6-{9}Ji_Z$76O;iR<tuavdZL`cLiX>5nY$;0
z*Mivk;2biCiXRitfKYCpX`R_**{J18F7H0LgQcE(r1eB2GRMw)7k3}({ioh<N`Yqx
z`%R3|g89GTE&Ts}cK<JZsafsgKghpt&;)7?R0KTojnd-eQV4L=eoX>?0U&k4e9dMZ
zRw4EEtCEkfHMi@|AAw(9jJ22M&~w&v>vPt(1kcLzj48<c-a3B5;MLVs_U+EwO*WU?
zPtVKc?H|v39qf<zg!!m>&nN@!5v;U0hA0UPGlv>n3+exdwRa4XG}_WeyQ{0ZY}>YN
z+qP}9i&?hq>auOyMwV@Nv8!&KGiT=B`Ee&EzVBqb8Ic+JCu8rm_j(qdXN{!|%VcHT
z8|}$rHjIw8`nP#C5>pQ!nRbRmGSThYLZ+Is7^;u~sSDbuc5xxEnFfKRo0hUn4@I=x
zxw9!Y6?xtv!HL>(Cts6Lm06LBzbm^wBFRVHfzjvg#uREFA<*&_XSRE1<kwW4EnR8?
zB*w=b0mF@Uca}A^y_e8ufr7-|^C=}*noG+=-V7LsB~1Q;=`6B#zhRafIihiD)I6=}
zF}F4H&{=29+lD0xMi|ho&_y?#Xs4Jg%1_$DlT;~6&FoURMJHUI6}(?Fw3LtmR!7L1
z(lhZTrTceAHK57)o;Jm!tm^Fd#O2Kw>*d4DEMpFAQD;e_!qit`zp**(TGWQyYih;&
zK?VX~2{S7uj7ja<O{0%<B=*S|lqlD7EayQ7w!k4U>S%&0h*Zul{0RVyaJ4d5&OEZj
z@YB`%fPx!BpbX}L;<HCt++i~W8bCM}1l*ZqHO?{oFJ;q-cp0cHNXUF2X&|%5x1JMB
zY%{$rxg=Xd^ALlM*Q6bDwCebCNx>;7)5w=>KC1JZ+o+u1hdHt;vH-;dTnt7U+jJxP
zVys~h&i%!K$}BP+PGisJ;Stw(sSLcypCiF6V2f#Gm?^>>%0S(EC#2Ru(F0VRUO_P0
zQE3gOy#0(|Q?Q><P%;`w5l~w}vN`IrVB&!ly~2`xt}fIXeXx+%)X(4WrJg1FMxI6b
zem~3f$^NIHE2KX4^UrN2oXuLFX_ro;xq984OiHIrHtTd_YApJQm_T*Lyd4O=f=ON1
zKgK89Xmv2i+{wkGZQLn-{pqMw2d4*iuFIH6sz|a=Y5V2P)Gi(+)h~1=rMAfK+c(I$
z_*~TG$TmTQo6FsaFZQ)ql^4A)dECcmKL@%Cthjl0YzKftxL@)VV`KGaHI}^bMG7<O
z`k6M-e>IwX^Wjtp_^1Dpi04?(XRqBIa#mX6;kp!@twD*^Y&eX?5?W>AwOO7L(Uk#4
z%+bo0EjkwUZs}rT;D0k4W3!MZj@3@D>GZ4W3&Mm*t7oDsqBanCExda%F!l^ijb)7<
zDDU?3x!^WzlTQ{hl&}H_izv2EN^gbcy5g5{Q{`N>dn@S4hTpw{I|9(kA%fxUn~SLf
zRKu#jnnugp&)h6F+fh2N_wja(?<rqAlIY8GcDMMmko_)+eSDoZA}M|DfsdQYjTVTc
z7<KTGWMabR?ROC(U?}yMlZi%gGeIw3GadJcGN6VWIF6glZ$W&^Sr^C&H@dV{2p1#g
ze?h~|iO(9IJ>~=a{DE^X&>ADQi|-QltR8@MjInQ@JDOIgJ@osWofNYon+jqE9SYFl
z!%o@m3etbv|AtU>EHwc}T}EaMHm$>^m66}@%Bs2JFqReAF)YL1gP-9gpyF9aD@yUB
znngYb?`h{)DK6l!tQaw<XRfqFjiqf+JJx9DmCrZaKwuX?q%*Gb@jmkd=E{s%IVOoX
z`U_6X7$2A+2WVm($%qHAPK-;&wkJTV#`6%XIHbIBN^qO<6FpAF_?PrI!@@Q}xly}}
zC1&+Vbp(-k2dD5}m9B;y>x*KK-1Cp<ut*-Zhrq%wBEtHq44zba?KbT#+C8wnKUODc
zt^ZtF(oIxaR}x3_9@HrcabXg`{*<VTnO42%Qk@ew&06J>i&BHkGQ3+>AkFgKbp-u^
zxE>q#3-<Tl<8uz-83;xWA;+H)Wm*x<ciR(#bJTSl>!)jok)QDYxbIgl5iKLZzI{vo
zAC>n0m*DpQt6%V+;5J#+)_Fk;!H<qHg;vC<U)o<tF`QBkC<0l;Qf0YrltosBV*z7#
zIuY97!U3W=FG2oE&&4w9R)YT)u)TQd@;DC}G!<nVdu3|>w08XG&mX<dw-Nnsc6+Hz
zN4N12P-?1`eH6yH*id%m905y6cBFsJ=6x#n*!U>-VVaSK<W+qD!;-+hW2k0SpZpza
zKmm_S0o58iW^dl5XAVRrT`UnIqfMIMDtqO?EI!9=Z`g%7U|$l^3&;x4#!H=6z`&(;
z0cm500G^2jAzX9h5Vv5mSu1PPyJJGhZll56m+XiC^_WH872a}|tT%W?bMN4BN${kj
zA$iBNlRc*@F6Y^e!43s=t~TR46t-&xo@3);a_RAt7Q%?2-1?pQiUgz-uGUKg88)Ys
zrs|L<1QLxp_$JNq&PBde<=+&gS0E0S#T+a*u))v6QnrrdxxI5V4#p(fIDDi%YW083
z)tPbn8-~#s!t-DYyD~dp>wk}hR##*oKCrT?TKjt!+h?NoneD!#ZhsweY=ax+o8kHV
zitz3$aJg_Xb2?Yy#wD>}xgPhWhXu}tPE>fsprFbS{|S|6_68S@#pOm}fY=4qr)C$N
zrzG3r8IfNRN!FJICfRuW$y+{z6!m?wmiN1oyR~|207M05kz}To)5@h{+$q8cWHjXq
zBaN&>Bg|#^9Y2Kcsdl%tv>;8iT#AD1FNU2QUxI?(C!+YHy)zXa%4iQLRb733^Hv@0
zX(W!680%KQ9(hlLw8h_=tsG{uFkty8+*Nkxc|#74S-u5{Ku<i-{)X`VR&N%f@%va9
z>G>HE7<22wFLAwH-OAJHcz?sHKXOL<*Dh*z6lB9LqJ@q)^U)+lU6kk8U`8N+SrWMp
z25-BDO~zhIAd~C6<M!uo#cZQK>qt*++%_}$Jnu~I<MzleNJ7Le8#ap#tK=Oy^B1ty
z@}G`aG>Q|F=)Bg=PPGTY67-7Z$jnaQOQ|2Xd)4%ejyR{x9KzR$PQS^1i2|m?sOk)(
zlF+ZdwPq0W2oZ|5-a$3=6x@)@@%V-B1v&*QWp@)N#pdA!m6zSYeZMT}J!am=;lMn7
z_Rqsi-Y5o!q$Vz^>-l%}j;YVaIE+_*MoaOc|BY$G<dJVl_0S|x%DdwXWs80azX)RQ
zJZ)>?)T-Fy@_dOiBdz`ApxOu9Us~*wS|{Wikn@LYdhP_NDogNB=FHo|Gm?Ac;paa`
z+JmV-b*6oZ?Q#5%VtfB5hyTC8o~<&DD1zTnOl>U<PJl$gGt$0QOvfk~$<ZN#F@(qs
z!7YKsB1UM}?rLpIM^i^=-~3%<a+2T8*FOwXEum-}uTgu+q?yR+;^o*WZxxNDYJMyE
z{dRhlewy=gp1b|=jRCF!8>@O^#+%B^u@L;2VKYb&c+p2;rh+snb(MnSt>2dgg?bOg
zr=XxvTe<`H1EZ0118u8u$XEXv<~Ms=F}B<gD=p)`XN<ctD6r87Occ;}IsgJl4%|<6
z9&SHYnY1E3PGxf{!G)MPQnR~{nEK(Ye4sM}i8D|qaiA6ieBf%CC=f`%ma~+$H)5Ze
z#jMQi<{M^MhU!n)O}ArEcck@|p_0#N#*|@vkBh0=%<&gf!{92(PB4%_mC>eAqps-J
zKB_>AhC%rXbE$#Mhu0Rh!esutRjuDo_L;r|8G^AXG>jC?#)8VpQD_!oQ5V>Mj2Nfc
zCS-Kjg@Yq?n<>PyJW5dVD|w8vdrlWPIJc<dLlG0um^Ros@pOv<^8fbPw>^UD#Ms(8
zwWZ|}C2mTar85a50rpI8*9~ia?}6(x^9kt#KI$P-K(4^taT3yFrX2WqomLO(Jw)z#
z`luhni-3n>oq-)NU9OUfSA+m1?LWEQ@F7_zq)*Y&U{`=KINsC3JhO{=J&7MI2y1s}
z!Pm~G+hs2MWO+L>9W+6&^ZQqw^g#vLTTSK%j?&~e&)*NVWxZ?85w3EK;ny$FgW3;N
zc!ei3oY;T=nLa6<#E+g_1&B6W-UUJ|XD0w+Z^8kDS<4Lm$1GWWzp?lRd|~bPoMGW_
zzIgVIsy|YJRCJ22VY)aEjFzi;?O58$fByCb73B>wI36fk$*8zg!m%W6&gsaspv28P
zai=5@Zdyefv|_YmF;q5x<}m~9sUc85o4lMU7hH{gy|T@RQV%i0Wy@qy#ABn{rAGWS
zS@4>Fl_4{6Jywg!`Z~$5EmUV;kDlq?(PZY@jf?skOpguo!=9bMkTgX0*rRv5{>KMJ
zR-^XyuNdE;0%(a2X+GMAwZfF7-Pd1_LVd4wRugmFDZ9&`CTQlT)!WkUFMK4gZ>Ia-
z!j#bSLxsry=Jwr__y)9ANDxS}B#-g^n9%V6h?rrI>03|)>^g9DLGA2|zFHCH_Dg$U
z-j&@zxnz(|(ICkpT#lQ$&BpgC?<K;%E-CyfWh0+Y1)h5Z9UQycPQ<e~evz{Qtu%BZ
z)ftGx4oB)FZVrL@aeos>7i8SPvtc$A{uqGI3U1e&gxs^5?qWaeZ~R0D5TmPP74dn+
ze;XEZ_{08+>LsO!Yzy05L3!bB^32%BN4R=z+$XoA1j;R_VkT16=hndRJKFlrcp#%R
z{xG-`Mg*;76g|BB1MX3etRp%n2+hyxMs`yd6?G+!+!HBr_uYLIX;cmBI$>KN-mFOB
zZGos<%mo2|PsN<wwim2Z>H){G1`(H3GUmjzKt1eF{5#uRY#qQmd-Ff)Q_wU<F?wI|
z>LA?z6t8mp?|R|>o8-WM0+?*&DZ2#$gby}I$FtT(ScSazCQ|=IBAfy=RS?H;tucz;
z?~8BCYh2KotXkZNv0zC2sNi`1>;ikei3DcR@PrN)Ruc^k4fnpxIq84@oKL8K(*^1Z
zpsMR|w4NEkuIT8Dz*baouR7F@DNF&FY~3*0{|*icvapOv#E1)WdEiQ9Ll(9{k#%I4
zI}ruqsatK|#6yVNFA59sCuo_)V!FM*>{k5%NYP_L0E)X8_trdIC?=)-N=N5U$Pv}S
zff60`QK*?TKQKBKtPQ;)ewPtU`~l8oK2iP^qp9al37AdiN$6+LxzYZs?$iHc$Q378
z1Q}YHBNWV%p779i_{Kj=9>MFUxXo3hi49R5{eA9V>LzbCt|b$BaVp8;nA`}PG#DJ<
zgTg={IJzu+i^E1AE<B$W-uh|*+_e4=z$UVPPLVfq^)L^z=m*;5Y&tuh@LG$keq(Z0
zIfte&Ao*9s^v-JQ-V5SDIsQiv?H3@6pNDX_2n+p<Ik3QjaPCrv({60zxyBaK$mC0R
z=EfnpAr`Jz-`K(z*u-D>kmE*5lTeuee}ii->D6{+1PQA}%@KMJHUL-kr*iA#+aJh7
zW0kEbh4-|AQgjrSUJY7`b}-Q?C7k_9nvY|YZnd3>)--S3{zIO8)&y$L2$#)x{+{pu
zK*qzLNO2F}zkSpHvMvSbAD}4TARr*V-DQM`e;Lz%z5b6Z>tEinSXo;hSrCI)S*k_1
zxfTtqGg9SJbWKSRk)A%9ghW(E>Xna1SaVgnft&P$LQkfX|JiEqnt_bW>izrh^JODt
z3wq?nR|bTg*L?b=+n(?9<pxmzRT{I%QCIvYGgnDGejhAw(GfbtLo+Is6xI~Bg%xNh
zF=k6Xu8vXuNMNJ+#|^_nZls}LN_XP67{d2T%R7=Ubvmck3h0_Dd=-vbbIC{YKs@4p
zfD8!f-?=eLB-Dgv0~^rTyd7$YX(8-)?cP-)QHQs=V)Hy1JlA8uj5PfgRJZp=RN2N8
z0V;X~&c~}y`jVa!_a#FX9|t2GvIi9;7Ox@gUW3+(JM+7(ip(0D8^+8x^xARa&~Ks~
z+%M9i9(L?<Q*}#?iFK0cBsvdy-DpiwFD8ozdw=XsdD|^$^j5n<$PPRci{=M01B{6x
zBSUC8pyTIJoj~x<E5rF-Um7eAf3Wi99Y4v}0H=B)8z)}pKy%&BI9N=mD_(NfdC1Yv
z6U7ObWWiYVmtwDTV6!O7;W5>s)0}0-kv_pCL)`bJsOEKCOG=j&M%DA%Ux*Av8-F_w
zpoS7R<H*{{+`0F9ZCTyC%c+HE)6dxOtLM6=70%BMN-*7_be~ANG^3PUqRj3kX5nY0
z4_6F|TO>M*R6)q1DPQ4lz|1XJ7InnojuG@rAZ7kwq?}-1rx&XmTr)i2Ndnk0w)ltd
z9}!~Lj?>TXRlIpl>EzEiJ~jw_+GF{*N9^a=-I$hE@);K=av8E#>7O28D7&-9``pL-
z;rHId9p9CJ$htnU+|n=Y{*i-TlG&qv#ySJ0d#wdYy2Tg6Ygr|?mE*8Wh-WX*|FG^4
z38hmHkZ<2Kzhb|Cvvo87OKMpQQbR`_^#dNpIdtR)l7vNxWP=<8LINRS6(RyM1f)s=
z0SSwNjn8CfFH6HLJ9BWWNY#3~{Zjjqm9AE*)<QWU%4JD&^VOS{d(~UF>cX<~HILcP
zv^c|w6`yVGqi*k+yWB^;yBlQpO;`hJRg2Xq_t6b*R*ze{0Blx{n=24t@DoI*dQk7w
z-5<VyrwMxe*&9J%f#5(D2>!f6Fub+Ji1<NZEEJIJh7q>7wd))HNErw)fE$dD@J14L
z!l45ozuO2v%%be2xS|pOHGX+!;UflX)!w>7Y*in?0;a~k-L8S)3>+U^-h;qfP>cj&
zb^C`Nj1FMcycvD(4yKpB?N;)y*|P@GM}G$NvO^M_*zVR^vVuojEJh(^!3H=GEK7`5
zm0pl>WDxr$Dgf~yGT-*{`4+eg9>6?{ig@>!12+MvaXpuU;x+`mEX_^gm3}q$y%E76
zw{h%e{710C#wDn1fm`{PhQw$XOkGoA46PeXLT1_)3@2q(=8`nbSj?4aSfp8%X;Nfu
zrG95EU$n=ED@M(9fBETiW}guznR6~gIp6B6*RBN^Eb>42#-3pz8k;zVW1+?!Aae@-
zh<EJpY2C&pJ*KPXaKj++47&zw>&<J#Y@9PMqfBo;+pYD%s0)IE4lgz#5ZLvgfZdo9
zLO~5zyi$$4!u=y6o9w!9Qt_TO^y_P;LPaoOijBpEly*M}n)W=8E;7lCfk?5_@j+Q9
zUk$&VhF^gF?K$3y)QwpOun>&_5z)vq%CA}4nvDuZD_&y|9ny>VcGZAqI9S=Pn_VzG
z+)8*unQF;YxW(JsnFNKY|KrwGR!l{SDib4v{O8C(10naeg+<Re22-aXG4R?pLL{&R
zvD)6GJw%uBqkRQK<v<1PrMcG~w0q)3VaGcQ0#jq!A7uL&X9R8m^~79rAML)|53hi;
z!N3{vw)h8({%j*{e{7!w$M`&7hTys-3^s&xhue@ZAKP!+Bu6961Mb+=8Lp=6f%D&@
zd8Sym!;jc3m8F)R^s!?7xPKHvainI{hUS9*P{PpX@<X)MKZw4QLv)x4GV=m6(xjLW
z*EltHz=H#WD)V^-Rv9ysa>NMZOABrdY*H~FHNS%;^ul|#I^Qwmd*dbD$>eL-a7EzP
zxkcQr{q7bw$KGmibT(%(gKK77Z7~fQaB1$!+ie>i(fP64%E_m@Gs3gZW0|DDoIGC5
zLjEM9*VlO6A)r80qzm1OABN$ln%*ij2F5sXldfxH7m(|~XoHEz;#=wUOZl~hW+Ac4
zLYW8QAv1-Xx#~6jh_nM<;m;|1)h(X?A?h<_pKp@(&51wmo*T>;=`twmn=on@`r_wZ
zs1Q>_u#8<&X{v*4^E>+d$q*kgkkhcH)@uE#AOUOz2CUFrTNZZiu9D~19o!*huD~(m
zR@N?-=LV6z_F<LUR&y~!XA<M!R73wwzgNvNYWP>jvb(^g2Ki{cW;=O@lJqKiln7_h
zQ$}4tnEpspt6V7jyBhRzn_0=%zzj@3x*KTRp1~Rq{*+>(gv}aPo``J(x0#s|p%MFA
z?tty{FE%&D>1TM$5pzqrd8E#pIqt7Meb;x`PZAf}-k4Mc#t<uQk5P!9?|<eGR48Y9
zKtHOCzkMQl$c+5D<rli=aj6fERQ9Z3o@QlEdL8w~!8N~a?M3FwApvhu=Q@m6CKsd=
zeBrWG$=l}uxMmIBT+D8bugBAsD*QImDq1k2nk!36nT*k@Dr#0yNS8yOW6B1)Fn0W)
zJ@(C%qdq~(R-32V8aZvuSiWiYJECdDmLzQMxu&9v3%-L9Ouw5+*-gWg%ldAUF}Iaj
z<$T2=uaT>2N2tSe856&gZRka2lY8lwJ<HL87v*3;=msBL(w2zYm{RL$=1ZCH+WlIO
zc^213Ev?#xrTO^NOz)8?x%57xm9Il1t1;qSvj;QtB%=vc^ETIIx|uB~2l?ENy$_Ww
zcEhoa6gl-Cr!e}5Hg!Ok3tMmVEr2W8hXlihBXFl2k^Kq(@T#Yvs@``T##2l!-caMr
z<teZU0KGQ5mL>%j5p^<X(@d6VNroGlA~IFWpPuJ7o@gkDC-!xOE4T<7lpgRh)+GBm
z*|;&W`Ye^m(5+9Y5GR;L^Ek6VX{FtRe()T(@~o?Hm?Z-0&;EQ3LJQd;u}U0W6<4Rd
z7Yd`b6CwX?ZO3CyY61AsJd_0>JF>vs)kMr~jk2^&za@gRALF;vG~-Covjwd>Zd@=-
zAKO06Vp=G-+>6D=ZHQk?BsxzQiBHz(2Qj6n4?P0AfeHNuq!c|&AB}&`+YU<??=Lxx
z#fuL$5C@rbw-hx6{Cx?wv4Tg!0q25mMv!8r<KUG)b+XIs)hrq-%Z!G!4Zpy5dqonP
zpZ|5xcuB01eOyc1B#_c}OWb*dunU0k$hNlJkcoXbN`Tztn=lbSRT;5NTrd5jIW*7)
zH-YgMLRGgWd4qD(-Q1==y9uC2tK+adCWq%eyfpwclMN_bPtH$sT5+f&%2_LW%}&%i
zr<UQ`Yl_+*HIiKL(~S)-@p-nCeRCz7mVu;ZVwC5eF$w5UNg<(`S;Z)eeN1NyN2VV8
z*`MQSWe5T5Ov#RucduF1sx%`-zi7bRN#F<a;<IFg{n?(heL!)`Tw?{==6)j$N4MXh
z49f@jeXA=k)9c2Ad)HIE_%-wS)`)BJ9?D~~=T?v7499K+^B}r^O!;n@z>6)qSM}J1
zTb{T_E=uq`9vNy{0AJ8B+ZslcSM{pXss%&PQMX&`!tJpAeshlnE!xNtPj1Q5nBvmW
znpndL-q~&#l_MC5BPr@oDtSZ`K(5eFRGo)YNetesh?h|Y6Ka9!HCE+<VZ!O1pZ`7D
z$2{ED_F#j#PT2BfM2@A-?5+y4BW@z8Mg-c8xd+L`2wn>_1l7lW;PBlRcjgz`A3=sR
z*40?JR*y|Ap3LK;LhA6WB5(gwyn`pI*~H2~vRPV(kY2(7ya2s`V+b5Hk1rY@h`0dA
zOi+I1+(>GyB?*GPfu;`6R*NHwG-M$~qQUm~H?EP|%8^T)fVZ5ph1O@56zLQEV7=sy
zu}h5a*-j0%YBw&1JyCl|{n;9x&`=dXIabT1vfGv~d6J6|jo?U|PIhVS1uc|$FPZ|^
zsJ75Cn_jPS5meQ}lunC0+EsCF%r{%8r-3Mu@cvDcL5(YtD_@QXzo9~T!py?0A~2_=
z%)!;ZcX*?3--ms9a{?+5jHqC3UKpy)fXWz8lu^#8!xK9v2({A%0t8-YrXY0<HxPri
zBB9S*F}t7zt?`snW8>_S?5<IUvhu1;fd;m^Tf^LSbSv4%ZWOT(wc>Y^Iw4~5Nr`8x
z8|QVwTFK4PkW!Mk6Ul=`Tf@E;I+kR<)=hVK;3*73<TpagjK%V8m&}mi`hzQDj^UQ1
z)^xl*tb~l-{jVZ}$rT<-_4cLCNRA?^i;y3BW3s`cuH3e~Dkg1T&&4R!ahjckSjxe-
z^^x{VaYR=m(#QNPnPxkFEK35*H8JjjBJpOjCOcWH&5Xr%)-u<`Dp$ngc=Ua&WiL|k
zkSI)Y>AIBt6H{cGjSMtiJWO6#hq9CKvJ*+rsR>RCP`!9OcBBSt$86if#CMmQhQ`<L
zC~EZlLFI}zli!IoXl2hNm@P5jB5K#wsaY$KCKASz_mVx5kt$irbjqr9q)z5p@|^`m
zn`LT_Vr%-WFBdyvbDcaHwJnf$ze9{vIUH=IxG*LMTS|;6rle&g6|Tx@gR5FiQvwAe
zbv$tO>=*bZgFN3C%h||qh>lf;f!(x>(Dt=sRvv}8$yi$^;>7^=4aKruFU;i0Q(BLT
zsj{H&2?%ZFDeCqKmSn`api$K%_~`eNy(dO|kQlm?;{9on*eKC0yO-l%x|C|&G;FhG
z-maWTpUYn|=Wm*UnH=&5h1tFq^b7pMJwekxA{-mAclR$Ip!7S((hPyAclXy>BOkky
z=7M6aZ&Ud=)qu9iH$NUBQEuSpKS_t5LJOx8UlVW5ss0TC!#^7XzJyMM?QLxh?M(h7
zV8~Wm^Tt+3{fs7&R=*p?i%ne)&rDjB#4U~q&y0)XutX7!QJqMj9&<XVB=)4CP9bGX
z0M?^ZG$#3m)~6OLG@Hz`VZ$2I2480L`-9_o9PIDsJ6zo&nCyYqKKR~q_c+h+PIMhd
zxx77|vwx4;i}mxkvH6DIAL?8BaufdzZ$SKT-`MGJ|L!*2%?BwLNdnS`OW>VZ=|wXj
zs`t3)*)sq$fL`L3GoZ2;z4)0lKr`SA;ZuW<gLP94)j%GAcGC?VgB^i(6Asx!Wg$JM
zp!Co>XzhSe`ibvE^|}{77xZcdTua`*fgFSS5e(r&WuZUEqtHWPfTR{#Kp%k7N#BwN
z1oloS`G^|m?L?r|K&64K6nW?x2<`w-e$gnPd`-G$2SWq%BO21?duQ>de3wD{aP~y#
zx!FyH5+O++9YkVQ1oPfkt>947Xe^&7KDv|e^|LHeu}o7NqKK`;DaDAMkKl9yPO?Xe
zE<~uLrbdsy6W$?A0rr`9VLWf}p~cCV%N&9anr~G+B4$%#ii{T08v_MQh_W~kqetqC
z)RgC3$g;*c)V5rl$c8rN;}2L28E~g?q(ui37sfP*3I((`f#qjWgN3_`Sh74Rc59-H
zUAHDqPG(vqjEOlhWHE_J(IxYBCPF0`@VNxU(MF~NWg1^HMAq?^wdmy(UQ9^Y)3u%q
zJUQVd)1nE=3w0hUcKhQJh_T|t=@c(^+Kl6}$^m#i29+4ZriDs4lI)dA#S-94Ly_s_
z&MwMgvSyQjDX}shA*lMh-_oL7=Ov<cW-HY(o0qP{>TbaW&p+D~sQk9eqIEk`E6S)>
z`5T>s=y>AKIw@!JR2Y$`4m&MPqkPg?`2J+;C@?U(xKDAjqshjqLyK`*Ymj0Nh98t+
zOn`3HDHShr6c|`!d(^oqjm|F*8-<Tw>(UEr{h?Q>Ql-jlGek)_`I%j6RH@(w(jHn=
zr$q1zU<!+rGzAraq`X4~JKrJG=OG<zQQXGUJf{s`R3Teo5R+<x#QSMlr~Ok=G1-15
zBSL?d6|C^{7Xhm5yVj8QEjB8tjzV2<J$#GmJ6ccSIP{WKp^9b3{GKh9QXU#gNvD0G
z;CR%*2T!)z025SET6{z^SY)-Ns2Y-fmqD^sbbExR<c|<hF7yVOvQiF8)^gKjY`~HO
z+hNhP_VKvtWL=L}z80~QRD!{#%>nI#M!9Mk2kP%)CGE%ca(?2+?2vj(jjFSTO1jiD
zS~-dqXPhRTDmvCvhM5|&t;!V{PobX+s0-z(<*2AHOIQ<P@oZ=uJcke0a#Q1)3XC&i
zIKm-gBPM)`4A!u2b-f|j(6HU1Sh}?lMCQ$2TJctGHfUI6VERdC)t{XjWKpj~O(mUi
z<f@%uDG}TI@K9XKY`9?bNfoGT9Kzh%SWM|X0x@N6f12Qgifk6oLzgo*oAfO8x4nqT
zLy20C4#f+VSg@hoU^a1mzI2P4$kOpOM&5rpIk>?8Rp1l*q<xM3Gr<N1!3;Oek>={K
z+?NP<gp=iblN9tDmuG)R6MTl#V@q(LuQLb?{1}%7SI43DWT!yHWvq`FNMa5Tl_Keu
zUtpUsAnSzvewSleENAm2a|vogQPb-ReHA%~!g6wY*hH|#UbnY;O{}l9u>~uCLbYz!
z=N$i|(as|)=d2tvXU9axY3GzuSEg4sR2nT`_lNopENl<Vb}=^}mjx<Be2s478{wZN
zaqId0jWz+wF{Dj7%j-PQZBO#P;6wxW6V^sbblb35)@NM@B-a*D%t978<vejMq$@YM
zYh9ZP55gNep0=}%M|Ccqap2<)tcR0VZ&izafET7<2`*k&V%czGh3rbY8}sGuS(nUP
z+SdNUwdwkdOX61=2G_tV_h_kwVSD`ji(lCj@WOTkZy|(l(w+SRH&w$w>J#=NN1GR#
zc5U<#w_FX+yglV3qWs9tv_0UX0)6)NeZnVqIlm|T#qS8bQSR^5Bs>#;k>xAK{lH|b
zh3+fyWGoZBb-Q1bXYh+-m3Ax>zPX>!`5bxLNE(0n<5}Y5zSed{k>kcgMf&~f13mSM
zSs{1!{rZXYu@Bqp0;i!dLH2?~Q?kFy282XgcCWp0nE$#bx?o52CTMvyFQ_24Hzb$M
z1^G#%W1K*PV_M$Cup-E&Sa9CPFo$4lG=^YJw8tw`5_a0SuHYWipehNuF#8BF6r7De
zcIvCO1N3q2M*0R;f1nY&LB1^s{p00W+WmE^|C_rmxo?ZW0E6r)hKr0+&s2UWS9R)e
zA^gl99#5$EEzzrEHrX>9+rE6`6MZZEXD=G5f7Ljdjk1u30B4xsp`wlY5rWDGV3UQg
zkPa8V<BA+8=={nN8z1U|>j4iNvvHVj`K!hUywztl;%S$Xf{x$Qk6)7R>X|^NrsJK@
zM?mpI&QNzcm^a!Sga4WS9|=525!rky@NeH7|HnqX|7Chw@{5<_WM^peFM`g0_~RxO
zS^KZThwnyGtEF@gg~GUcz_&3lX)uu@m1GMkLM25+0FKwjD)q|Ly7lF{;@b*`L+GzQ
ze8H$q3aJGs8A|ZCG3K|e>F)H$r(FGR5DoFE{)`ZCG(0VjL5BM^h)pF$q8KE=nj6a8
z?}K3o<NWbjwozMfG8l@pCb-}Y<gH9%^+CxzB7mnp$woouYYYQfEKkjnd-5OKCxHqE
z3E>S7UTy+hTt~|%Y()9M?pkq4S%B!5U~zNu&w1pGT~o&51(x}GkcC~Q8w{zY*AL0)
zT$Rp3Pl|Oz8caPDl_MoMO_EL%kpovOT2uhfonGetXwyw_#5K#7qCkT8;E7Yq$W4`+
zNvKAJNSo9;mFyl1r{fU%D=+4N?;Mbxh^g`<NR19LxjKik)KhIV|1R{@`Td!Kgn#RN
zuI+ayEIW+z0oht+gznHin=J}+L$2cm;!*FS%=IFU9qNKLJkbw5SCJqUb)bz3__nR^
z&moa>slJ<X1@qy9%ttukAxIyo-x(@?7kGDkEu^tN-ZkD7zyqAfUklWsVv;A(6Br4R
zt&hJmH-VF{SEVW)M&zS5+IWc`DcQM(f3MliH87s4)27orVKP72$YG{`)lT;-16opD
z>`&=E2#cA141n^IzTV2q&R-Z|5oGn*#Hcf-?(?8I=?pSeb<0(dL()b7d#89B0<}4-
z_t;FOTZOM7fkRz5*M%~zQnyj=#X13^9HMWuyNuPz)II-fC$LLMOQQYCDf@mk%l}{J
zl>eI`-hbBOl9l`ZQH%4n&TN&`MG~^4MA5SFAEb0Gi_4=D5<--afW%RHoGlNHZjfr;
ztR&tTBPS5>`My01jf5Kb1HV_C&@5X5A{@_Xtf65)z2$x@=GWhkTjXB2=DXHlR^w&p
z(cNjDE29C?p&?%MCrl{gYN|R3F)GvA7&uHPOMS9rTR^rM%2Qx1zW5JLEKtcOmN+id
zx+5wK{w1DdW5mV*4Y&ogmCmm*z~z2qO)|O6JY~~*el8l^1`b$?>I^8EN|Ee^g5ra3
zorM%ic4CC;;5;d2{IFalx<45_YMRg-g>Oj^Q9OC>Uy{W|dU1ypDUd)k{(k8_f9Oq}
zB$@CHjE7jlKwl<>{-)*2a?`dDFXTX}F&RG2U1*VePD8#-<x){3a;+hq_gi#Td{hX!
z&iD6(cOLb=QE;z2-Tf*gl&o1YB~2Oz?6sqJUS@^GSzJs<E$m3ShT#nW_1(SIFy;lx
z=#w%i5?P41P<4NHSc#BHBiH!^^uoOG$&-a>{KlM_!)UFQA}vG~pbi)N3=pje1$*^M
z@6=u2Xhi$_%9+;V2{-Zi^G!NMgT&gv-<`tLbeMh*3eB+O0xPA2VFc93AN_oLm%#^c
z{42zC<LytnvzR0I0M!8DTh986fCs+iC*^={#-f~KbW7BEaA$&QJySZirZ9V*R7H?>
zYjg!>o~R6Ytn?gs+kc2KntgU6z<t@=)mIzKzuD&gRi#T--n3g_z~GhZFuP>Z8dhV&
zV8|2rHT)$Q#sKT63=0__9hpz)cub~tKIKYAewj$%0cjVPhM;rvjR$4VSt~$bQ<P}v
z<NYtr8_utfm-9FHZ@L#rb^aS}t;&Ls+S09&-gH+T7Oft=3h53@3`Cd}N%?qLcaTpb
zWh#F3YEr>vQICAWl(^$XbrZ9&M$9(@`QhSDJa>sFlc`*&V$O&1IaWF2;Wx3u#4`)R
z)h_}V+J9xN()r9imL~Q2J|(J<0Y>yOpu((iS~$_-zJ^;j-9$4|2%$RJ4#byUM>JYc
zFa|ezR<ttmU$%GPneZkPO&9MpBa0Ie{Eh9nHsk2JWef3*qydwSPPWjRBW8pQh2F&N
z<Coh;9SFkI58QH&crOQvc|)8wkAwX1lu)P?9-4xSKH&|~kpVWm1=YjfLkbg%YC7=m
zD}R-dG7ah3<zlIqj(0H!_Vk_E>0!c!hLq9EI=5_em$O4kY(tkk6`}4Zj5Mr&elizM
z^r3Y{A~gj=|5j_j0%1wadvL>f<)u-6fYS7Cq?^^Tb*JlH-#~X**H?VbB2}|&Wa#x?
ztY@-TcSNnI#cct+!W@0gV!UyBgU*^}N5So+^?UuHG!}?&@fnM$;G4noqkh@75?SRt
zw&oNpu&6Ce7TC{PuQuA^e|ntoWLWl&{SQyutLmKd_p1;L_3tPIt8x4*=9PDKad36{
z4^JB%(<Ajm5M$7MKRvPz5ydBD)r3%$pjZ%v=zB7X+xDgJg)MM{_s<M(RtWr#aJV~L
zVDbVC4D<WZ{rTS?y->%b(^8XQ5u?>;t@;-}vr4ReEo3cB%l7lFgMIPIf7cb6cqizd
z50YEvj~5R~T69dSIC-3+iahVVoDo`K)_7a1!f{ELI#~iNzv<AsiJwVoIcf2k9+%d4
zV!qv*=LYR@8*A>I)pkGHN>^`v5~S=)7(B*0|4IQt@9Fh*HAyZ30YQ$+Kmj4A@b8mn
z#6=2lnq++Y`H!W;T<W@8`l^+ad@bMq_38YtrBgPw`!D+Nl;Wloh#<;`TzaP2p}zfW
z$Yvt}=)4#~y_Nw+RhSE6)VV>$zRhH1!pxlL^}Hzjtgxu@Fp@31DEibC=P~!MZTF+Y
z$5TuJRBtpl+5<?@sl!@z>)-{-#DR7_iEW{Hg_EUe7=l(S2Ew0{xd=|jN*NjqRc&NE
zYU{>q=FJ99Chk9tuf(TaxmAcadQ^8=(qwIUvsMG5S`%be?=wsk8IIjLuarXgR=8B&
z!foZ8;>=rzPJ>K7BA}a3WN?I*yPjTjQG%7UDG-_T7??WDBarc^HlbJU&uE|Y<GN1U
zeFs`S?*z{{Je6BMF{6q(e~&2<Z$g`oA5RHjR2`;un){_!44D4Ne??xakQ4eiXM#2r
zI*+B3pztM*cX+6Hu>>)Moe-z&=b}Nj&7d&7fvF$X9!Tj^*Mr-*b_2IGZYUuO0b!d@
zXaC1`m6tgcN`7q>{lDWf{l|9wlkP2MY4e3H|7GdXT~Pf32*KumBcTFA;Pa!Q)dGtN
zzCIclx|4}_dbB~OO5d!}_<XhLclswMYr}B+a5vOE?L!&_2nJIK<uWK8u4B<(e<-vi
z)Mj2)Npp5{WmZrfGqu%00WtI2^sshSY1<r@H&)O5BgUPHI(O`+)Y3#ImM&y4@N5r_
z+7z{r$bKI_5k1ec&xp`MMDln4C4t;0o6t&2f=`th?iMF#oP}|Puyx6R-OQtX;QPm_
z;J~tcul+LOKVR?ve<SAn`qkdaoZi^N$==q|)t27b#G2mnU$~myjl<5+#nR1`{=ds@
z{U@$zQvF9K2+BuEQZ+605E9*%Vq{VvO_+t^LmyO8iG+|OGQLlm-AKJl$HGN%yg0J&
z>@Q;?LW@248*$7TJ7^SXBf{FT>B*c4_i6Uy$%|`#e!uS?VaJL(LgV;k#$iO8p_DSz
z9tgtpX7BK_eU*WnKb!idil${71|O*gMD*5CWw+~1r*5n=l&h_Btkc%ZYlCf1)>3wv
z0bw1c9Alb*7di9+rx065Wor|fD=gUju12t$Wl~C~ruNegdd!sFZUc{0uApD3nsR8E
z{hFF+Ft?qC;p}=<Bp0%JOp*zs(tElG&AY!^f(>&~e^?khp#_-AUU3AHK>wa$;uPmW
z9a(VQMd;U37ddZsDW;QETH;lwX6b6ESKC+f6y|WX<Rl_MvnRxdz|_mt|0ea$%Pup6
z26be~oMNlJUK1?MRG=h#*y0&vP1ZuC)z<`D;Upyaf$beKEAo;%JN8H6yJE2z<eij4
zeN1gqCP#|)tr3!87;2IExzW(go5_twnfZHXDak~NomA+Z7V=dJ4Yfy+(f3%@($-2M
z03YgKj{<^1BhW}t=RxzAAiA?^LfY+vvWWA%w0m<4E`SWW-jGb>RiB~f7;gC^(!i1E
z1^xiAtc>A-yMIcR#xk<<fhJW@{;-|rHQOu%x8l<5WYHcX@w)O&U0Z(KzT>tUgb}6*
zAMiNeJiD1^8!E>^((Tiz>!<N3(Bvhj9n0AMQusg)0Soi23qC7DE0KWb^@jKx+Rk4s
z5&|s2!^;YthPNwH!3&;u+ecj|pHT?VD^6me66A^#gaP;^9AnT3mPmSzFy(uC4N>PC
zEX)xY239W5@(a!YkXb^D@yiu;1tLswV%zGw9TCn!^3C^O1y7fYctmdsT#h}nuh#zD
z%MTobvO8>J8nx{~9p4wc1Kg3mIAxCb$QV!$gzGg&&OskJ?8I|D|2QsU_#Bp_Ux-ZV
zD>(gkAD4eYvMIG0=M52*kL5aAZAIk;GO!ld5To^?o&z#l$$bQi%|;Fm*hRw0hvpP_
z9MU@~;xWwr@Ll<x-k#njoiFOsZm+`$em^8YyN!{jD*AE}YlIFL5L9`*>AU^5)ncFf
z=Tx8n9l`)E_e{cAa-f6DNMrdHZ)?R7+?^H0mBdkgAOi4)g~vdWYGVmL0b|VEkO^~J
zpp6VOGSQ3zpBY_#!{)J+ACGLhvNuikbaC^`n*q;ejqe9WR6<feH5c#+EE-7Dp|{!C
z%+q4Xj$NX^!Dx#KA@4K-)Q;n+eG2wmLH03UDGpaMUKyK0#fW(!I)SsMK<tCPS^`_c
zM+(2viRYF}*5-!knS21(KJ*5*@OZPY+MvAt?qFy`^U7E8(%B*-U)Zg;Qv;bvc@(l_
zaH!6e6{#HWZsb~M_<J84Jn*#QPT^_X0iLxBM6`@&2_Tw@!zL45rwesU4hSjNs$Q^>
z_$fQ;KyS_Ro<?ZfR&NI0Og(^mjT~$Utd?Fu7Hy%Vv>QLW=m(x?DGvL^a>QfeE5#Bn
zP%CP%3a6}}Iop9gN;M5wL`&<T;|)~JjW=J48z8H+6ziFGhf$1I8>^VI{@7r|hu{)z
zepDKlye1oE;EjVD7$SsJEMF2HNip<$Xpm$04fmAzck`Fm_~mXI&7;b3iS-K91ZYOJ
zg6Cb{DdMy`y(u_R|9b^*S*z>}($giwLSm?B8=6?bat9IZ$m8i3tTC9V!o&y_r0Nk!
z#-=cq9T5I;{wy&t@{{Z~Z1;8a%``7CdY6M|dvU|Oxp>FRRa-+P+6-S|X7`k+(gzLV
zRGE4H26Et~&^znrYw)4Ctw<5)%NFvISr?IyK5NfQdYJFUO!G<^Lh_0MI$+G}8oXv9
z3=IH{zZ7BD8HPW={v&qc^OU*Fd4lN0>BT2!_Z(tf+%5OB;4KF;kF04wAc8O!MR$in
zwS6jjP8iq!1DANBh+VfeuJr+TwZ&wRL9j=X^_e<mp=M6YA4ZO-GeeeW!|fwo0M_f6
z?lX9`AZH1l!Oj19&%^C~{6WQsDqdF3a!rNJ*MBe(?oV*R4ffD;Hp8a^BcJ_lqjB)E
zWtO6&Ge@N59Zc1Vquk5U%}-57)2{IQLE6Tx0`juT7E3kdWiXwhMPcio4TEf7qKgjc
z!J`Uz>JG_82CZUDgDPVBNLFF-`B4dx;Wm30OE&M`7V=3Bgx<Q2o?;arDwC<&=iHOb
zB!66ocnUoRlUxJn=8VUoJcAisCij0b_N*y#=(t9zbrmLQ5u7*IqbcUON3KA6$t}o8
z4M`b7;qR#MM61_DtR$TNM+>G>p0>=v7Z$1esyqF=uabXtsa2`i$}cFO_+6<jGe*h?
zfQpEgb(X0Jgoh7@6*4b%A+XH`%coY?3$1hjU6p^u=PnIm7(efb`z751_tHo*EQIEB
zoO8Bv?s<5RxA6WxdqEgrJ~5~D9{N2P*XI^cL+LF!$_7xHR#Q6*k2J<$0%#lVhGT(V
z@$9mMPckiZq67BqlWLc}4+Eo#gz%HoL2=@KBg~mfBK@e}X<0YoHTMzObERVOS-`q3
zf@?xFeODeZkhtN5U*oZ#^YMAjB&MhAnJqXK3y1mw@x6-Oj8_s>yRl~z^8+0`Yp059
zZfZgyuW1KN40GLEQEwb(sKTW-s*Zi>OV^a3Ug8Y%kQ|@<7e_cBvSHFAETmT^-pYq>
z?9Z^K3=~m`zq_6MEI17H7Nswb%!tv%z5i*q+Z^D`00ZnR_zvxkN%k>qZy?##TsaAa
zhN)H>qSg|E)--$8{Evr=c2vjkThMNBKDqOE`=(Ab;pP#|t<5K3nBi%U^m*&Z%{%^l
zyKvK9zLr(#GJa?|Zih-JxGiY|4||U?2R8_od3(Z!3tRa#m+-C)^|{cp&v<l8L7|)E
zq>2{x`r?OittEehzHMB@yBejs>p1DpHyII=-zPj~CqDHTY3uq_LRddI<o)7i5ff0p
zzt9_mZZqY^J(pG=m|JMQ@HV0|${=2x3uYUXgD-$SV)*%s`4G1T^F<kAF&~&O^#r_A
zE!WENh11*?8!cbA3b+N-50Andrd?b}HhLkgk<USF7E1IiIwB4&0H|W;tpZn7Sz-50
z?1$4Kl|(5rOZaDT&~l<aLI2?nEji`0b-&zU^Zyt<{x8wve-}{tPxRQOzNw6@it@Qh
zVv^~aU#CGug}TuQ5J2u1A3~~?g&@NMp-oC!u9-SwqoL_Y--O+(fd9bfdnw1o#LPam
zHplrS8My_@Vo`uX2gGAu@p@msJZC#!@g5(|{POz(2{71%I)jxMe24?On1;Z_cp)vA
zbObR5a)1rQ-?Y?QN+%{oPevcIU1!Wq3JHxkg{0ciZ$C-xGl0_=<@*ky`R3ZJM68+S
zGz*8^)xmEtcS`4(hRp_ROTo={+S*>e)VnHd$XvE-B~~QOzh#z|T09HJva8R<LN?-k
zUn~KU{ejERS<1Sq{XYOVIP@zO>3>xLZE!HS%R)ziSM66KVwl77HS%G<U6kF;G5-|c
zj^@&;9V7bZs{#au%N?M61lc|7x>b+<L};;D94htAs~D>`x!!K-z=ZiT%D5TuN`CK9
zIkf8@TjgSDDHJAGbeE9BK@07esxeh}Z3{L9bYI9tTUXnuEtEH(esQW(b@hy&`LtFQ
zT9!mMmtgzNFajr-Hb9v=3U4!3twGCv=x-PkjOxn$I1wh|o%|9WIO9(%4I2?F;5E&x
z$YhO-;^xfWTVC112iW<|eh2iev{ATpC0txv(IfM%ElZr04!b~aK2-J!)HY3lH65Ma
z;=s|Kt3s)7k~Q%+%MYJFeAKihq*k?8-FoT{=0B;HwF=0SGgw;z4&!b>+*hh1f>pst
zd6aJOexh`SP(y7EcR*De$@UrZDBgf|tK6XOL3N`Iu!l)2peE&0mikkBL{Nov1-+q4
zLUEs~OmZQVP@R(wDoj}!)pZII8jj|YW)Ru0+1j;7pSvHfW-n@<5eUCtgv5P~eLWTn
zoObvN%AP^!X_e`+Gag8FXRm!lpH=CVLnG^Q_E&KZ)kJlnbzfvyYy@MO>&z}R7Fl<i
zSo#exEM5kEJUxcMi9kcgr_rjOSDxsbG)7l-fFAjfH3#Pc4Vbu;LU3*AZf`SHefX_M
z3*0sg!(R{r#8eE@cV!|NHgexwS<GA^^c4x*47?C<_#*NF?Mk@5Cp;i=-{iVO2R+=u
zE=)YiJ`Wfw`hU+T`{~WBYU)MxcKS)RMP4mffVL~_e-yBKL#JV5g5JGarTc8$Lx}K}
ztoCPC^)&>;=h=T4Pu>TwYc#%{r+O|`s9fTEH8IGoO?N=1>>*^vkRH0_-Cv**(gPYa
zcyNbSKR%I|j?gnb6KUKOiy^4Eo`B!avS;KX^Hzl-Q+`6&a8D2TJG?ClNG}t3sZ)5D
zns{j5ev4jaFIaSoPWgQ(OkWASBnqBbN(6ZZ8DGo5^@MLMf(HF2UKoxuE9qn`f}{**
zec6HuevZ!)A7+X6ore)S83a}dCkQ@WzXs@c+4$}{bBUH?dC%ZVcr7TAPDsz-NXB*d
zYdSdfOE&rTE`Pt^j)u+iprG&@sX3h6@tbmn6dRoUQ}DsGYayNU>u&n-Kh}}{m-myD
zp_`$zv6H2Pi<<5KD<|Eh@urXS)z~4Yf#HV9MoKwB9Bxac1wyh>G9}!nu_^#WTOGBN
zNVIaqAe#tYOTXlSu<*5BT7R{v7<ONJU1p)O#IAbH#Q!Yy<9V89;J$$CpefDusdxUG
zUfzA2b=~!p#r*!3-Lm!50qIj_2SE+_WF#7Nxt4BkA98SY5{oasx8a$@`>zT&-(~=!
z4?y-8Tfofj{lzi##c|}tF=z7)Dch?Pj(*=gqz@|n;4M-2u$X@AKK64-m_6xikbOgL
zsz@iz9xCEC;w)PUW`?tzz{F0S=l8m(wj!ui{wmC~N^LEbs=&_Dg~<R*<@iU>wfWT!
zeoW^SR_)$0%LS^EWYY;6OFK$i`l=$<0YzHj<%J4!*tI#erHB2yavSOtHMb+_H6=}a
zRD$(tUA1UZ#BI_<&udcR^VfpPN{G06K)x2HZnJH2Wfo2)EAmg=QV<N&+eYf|I_;9K
z-@^;e4qobM_q-=XuZ#DLjB}f<9CER^l!}S-teGP^wGt*KN<@M1iv=d-#TX+g<rC+e
zcTGKNhSS=_b!d@_G&-oW>Fy9lVs!VsCCHR}WQvS!C8eg~%&-M}ZzQG_)4|2#)TW8e
zT7&SXB&a5l5XiU0T(rqeP?|NOajNmyH;dv8YZVJC;W3SL*h4N`bu5J(>;83G)`(ay
zuEJ#(!n{oDI9F06BTaA%th1-h2;Q1Xsxq6jn1dZw3?C_=gQyD{^BArdXiLFjp`|Y;
zCr+#R4xqpl0zIzIcC*mtsOH-d5U-LJIkj(9V&vY~Q@n`3%u?A-0Uj=)Xke{Dgw5nK
z%Ic=X{k$u44-a6;O3@|n>IEDahHAY*+>JB@O{`1Rsq71vtJ4I-L>IZlKo31?B_=n`
zKOTNhK#_s#@Y*Sp1m-{%;yrQ~-N2Qo3yKNmPPVSa6O(1Czx-~z)haqRE``KAC^w68
zr}kKxwjVto=9QP@`CSZC<9D4_YdnQ`cu{eW>XOYp7}d%bbh6c)<-4abBByr5vKr!$
z)Y>ei)n+m)5Pbjw{P4ia8j(@oV4g!PC}YZ+H0>;$7@;UMvLZd93}ss?gXtvF)P4bB
zMS=MGN-czGPuDrxBh?N$lO|g|jc|tqfERHlbd0~ha}eTE7n3r<12)aZ9O6zxMmpSS
z1E54?$0^=Uvx2CDjkkmNu?$UFe*a94K;cL7Xl8YBsWO&y^_RmsgDfH0h1eoB1Zxk=
zmBQ%F^9RRb*F(}9nh|{$>bHI_4%XjYIq(pqE-N{gc!u?(-gSTO3gef+7&1os2+InF
zH<s&1^%3c(rIAt)h`v2XvfGy@`k>jRUqx^f@5lB~?$^FJtPbwkvrpnD?l+D}Om4Y#
zUvJlKJO;TctIg2vtfmq<h;L`t?Y%AGx){D&x^%mC(+tQsJJDe+<eE5ATF#l3H4T~8
zD(!wJwj#G)=l%}Qx{*BxK3Bb-1}G^gH?##lUX$QH>{OVEv7HcUqSHFtW=GgA9;n>6
z_~oI6Uab#qDV|gW>EN%pe(FH9Ze1L&=#9&z8dt?q&$MO~=cw0=@igFsI~XYMWBAI1
zub9Xl!>YTBY#HMRJ=swz__cyeUqwA($===1ZJzu;w7v6_B~Z5gSy^e@wr$(CZQH7}
z&6~C}D{b4hZ5x%9-|T+<V&YB2bo9KK`QgU>1MWR%pS||lpQY&Wm~SyIt<7Z-p}MZ5
zV2y7FwKhRiei^d1xp^o==5E<s%kXAm=){&gHHEZFcYY`*l*xbb!Cic>m)3u}bV&=!
ze3Lp+a#S1FPzJksiMI-tvlcL<s_9M{0LIqY>s?AWWd?<EF2tAA!GQ_a1qj?OT-(FK
zb?Rc%Tx=hfV_SLfIR|7;q7R=yK`T2SFl*~X@{G(?3ub-xQ5>XfC-iwWb(9d{S0vdR
zi_gUg=f%PaATg?WoL%vGc?akG<kb$l7VyXh`*7g@Bs+yfGA|IfB=HpT_;FKG+8fyf
z&mfm5!^YPb;5&eAQ4Yo#>84~%Kq)^9ZdhoHvHu+A7`TkFS!qGY+&il~ShFd30TZ+(
zuyH#IHn^5>fNjB#dl9=OGIAU6nkjJ!+_2Jr^;8(+hfm@ibV@ckfI-+XGA5O=;lC&h
zcL{%o8u0OgfJX-3ezqgIUlih!MB*O_!EqJx1s5B^LA+n}>t#+R`f*$St9<A-!XwsU
zT{Agn1a}}T&Sm6X>tp?W5LTk)r`kG4N@=UObB@@qV&rMo?ggcZL(W4=KS_+%t3{;u
zpcwisA)aic(dd1vvIma50Lhi*p-*lO0dL7#+Zl4*s^--=hWnA9JcC1V(l7e^Cpoyz
zxZy?7w~a;_I|lJYAciZMd$n3ryn7IFyn7PhLz0k$lMBgu#a%(Nwiq-WsA(+i%+jWb
z%?)zP*!32#<rj7B89U?8LJu$TW%QpH_=TL9QGDg(pVSN2nmwf%Gdickjo|E|T5|ed
z$-j5@yn6y_tipvL3W$FxI8KFe><JIr9SAgCr^MUQ%+exR=3H0(_MUbBg2m~KP}^I!
z-PAT@7?U4ZXncWQm9JALfParKZL6xyC1cguLF?EUkyAC+C%z;yw05mE{`tYR3n%~?
zXmMQQU(j`*a}KFjyP1S2&hDNdMkV5bHdXQtrP0WL*aA(WgL^HLsZ4gVjH6lQiQ>fR
zD@OU*zDcw#Y`NQI>nKGW=9raZ{0hW}5Osjl<sZLoe#$95Q~Bs~UdP81#rg;4?!WK>
zNY%6Ni{C0=FvkA}?fL&;hcNwjYty7^`z?$k_%+jZ3CU|C-03RHg#>2N5)lkzP?N<|
zks)+rI_spl-CaM|w^YA_NAJK!MELj7lOYx2{{i|-aiCLfP(;!hENy3IZ}tq>0+_$}
z{bS-U0NJp`;J}N<?iJrRMI&d#fks?Mfq}uwV77}UY`<_<r4T8=pO!HDop@&xs%&}|
z)_>qECHa(YE$)FB#EB20lfp|L>0z?VCVYHD6PkuvZq=-<K93H&6I=1yM(Bvjfv1BL
zmqUxC4VS9Cn3~rq1lBg~LQdfT^`0kjsYNZUXn6;u0mf1nJwcU8!6dIb1%vE4$$3nb
zXz{`CR8zDP<zN#%U=|*OEfk*dE4_uYzCWI7g35eURirnU^^a;zYPM<|jW6mM*LGx~
z$e%5?lKpxH89X0)wS<Z}-2*R2TiX2$LQWp08H0FIxvnE>>EC<G{@$r3!fk&d!kv%Z
zehsf=mk6h}^*&i33tmyKxN5R825^&kIj)Pq-;;qcSnku6$jFQsfhjNc2-5%v@y#1~
zE6TfC+oyH4UT5j@O#h0}TMps+hpoO~q{bC`!_dd3puju>K@TbLI9Q&s^r*?TA`C(9
zTwPe;gq(ETxwqIfi%N1K0vtL}Of(4Qy=enWw%EAw@m!lQil|9}_j!=sd}K6#vD~HE
zEuwS*a|mxYuw)4Sl$>wtKPA&Jv_X#OXD8{2rwni=SwMmC>Ge!Bv(6d-)ghU3fK1z9
zNJ7E=s1Nxq;UgZo_j&R~!1gy_)J|Au4Z5HbcyJ^ZA;?>>h+Dwt{71szlG-9GOw;)S
zJT$q5iU9gh^ni@}LM~Yp&KaK#@29P;O*#KR+ID+p%URd&w!P-xdRe&s-wu8LN5JEh
z7PODb65z{!Y;yDP_!v?!G%XzHo+Ow+D3BodM;`(Oq=mp-=2$!oU~<rtpl-jCPfLHv
zs!7z^w{c#}_D(dg{6<aNy=B9;X?@F8f8DlYW6QN8?plfFvzwVc$rF@J*d-0W?PSw=
z`h{obB8%Jp@7^0a5KX?ia~(AP*a18jznnu{-T=uwg>+buM5#@^rO8TyG#p^rgYamS
zSbc<O-gTT<xX=ezR3%TD5cNorF~x#q$glssbU}q`sV=BwY!UM(qb_l2EPzG05WuBn
zk;-E>VH_K~=29Z&>^fQa{Tr4RMo%x7$&CCgz{#L5LO(2sLObV>Il@vsEkg^XcC9F|
zim`H`DG}|ruCCIpQp}DmZj=zwOcZ}=R3YIO_nHXKcV^Y9DNInaSj;=%v0Ahw%`Tmz
z!aYGAt6%bT;j2y<(Td5qpOv|ADhDh}+XsnZhuolf+RUH+#I5c(uWZabnj?#&?LSoO
zd!@{8qm5g)Y!bu0uh(U`iQf+KbV-15KW|KOJ9A;wEttE;X=e$eTNqs|i~12bxBt)v
zEUU+i;Q|gByG)DC#$r!AX|ZK}&1^kD7}v6VadUR}>Sd+f<_eAl37T^a_qG0O;}ZMU
z+lNrdaPoZW_y_%%?aSlqqyon-nakizO?0Q1Y{>k|!s<Ev<6^rP@Lxaq)*iOiE%gbB
zEuh@9>aCWn1dr!7>yfgiM|clxbw<d-jV;t`OLy=fyq-9PG`I{`MuKRg=XKjDYr0k!
z>5bwkbXHdTD~rAD_hnXWI$Q0Awzg~qlmX95atx#R`rv#G%XML(<s_r)=o*Rv+#ulV
z<4?jC`hIg$rd(^~-=-|FDR{Z$jghsDKK=WumjtUBf41z_@Z)B-(5`Qsz_}*r=;M+b
z-*rpe!!U10J6J8CpS)HfQe|y~*)sW<jnG4QuV>p^Wy|S*j~Zy3G2}S92$ji&IQhUH
zgBv?q9vT(9r301ZC7c@C)QmlPb;zjW@71A<<7um-0omJFt^qn<#(rgbNY0|(!UVfL
zrjaU31I_WBI*XPnLv&1Cv4XceMtBCJP#dLKGE8D$nsO5;KnJz|*>>Q+P<H+>dFk-<
zApfYIxVd-^PA-v793nn!EwIvJax`4C4q}`~oaPC64HgF2i%pPsV0+@+{{eDO;-_I`
z<ev_QY&wc?yeV><e68o%nnPd#8?rmTZ=VvNxei;1go9*snNMjrD_W;KjU=9_BLvQA
zE4l^e$%>J&kJ7j#TXyyik8swj3)D!cOmjVoRh<$3qF;1Yy0ZAh`Q(U3(puPaCD?_3
zTMM%O+?y5PP}xW(csPb&6Vt(Q@cuM=SyfRe<ju+@aUX(-^)w*}soy8T2fuF|<YyPo
zuz~+bjl0{9kG*!IvA=(L$?U#XY;7`Au%tqQFdjwduaoOozA+zpC`M3G1;*agk@VC_
zDu|<`97RGakpwW%@^v}OHFg@CdQqsA<k6c>(E=`rS;rTY<}Ivt_N}*XoZuyv=gY#7
z)gPP2VA{OcE3r;<l-FFDX36UoJn5J>7qHh2y#^*t{8rIl^gKj+aWEX*;{YBt)-pxP
zq`N3cbpw}o8N5)u8}1vy&vd49+|6l51Re9D9EQ`NAAcHOcONpvy0APU_+MAqc!?q9
zMih$Tw~nu0!Zt5Ffg#z`O3V1Z<O5Y>HB>U!X3#8m(Caq9$&%W};&4D6+fDdeyLs-4
z(jNcbT`;=a&)ziP@Hani&o`}HB?iXxU^zliY}fe^m(tVcZWJ04ik5pPPPVY_x;uvK
z!Y7mFBk_s7DAR#FYbFRK3D(p@oJ9L)$!}XmxjRbzHu_5*ks;^#OKxI@oZT&ZdKxwC
zkFDWvbtM~U>umXftiTCvDkBNagQ_q;xC^K6)LfSFB$!$vv%ImJr+O@6a;+}vlE$gM
zhjqN)BSX5GBP}EHs|@+?a|cQHbsI2%x+i*KrIR?O{zVKnEsPk<d+<dZWfzdmzS=bI
zV#cUtke|nSu9`|V?LvkN*xwJwTFQrDP)Y~#EjY<d{S2t@XE2Vl4^r)PQFSiPQaG!7
zg><7TmgCr5(VSR}#)~@{_KS(4j4fR0a)4d?;L-#dz20OqV_(qh>5`mi=fuR{8-1S8
z4mpRLX$1Fmx7?;4yXZqCLe5GaH^+I_qtkUS&5JRO$A}&Mqbe8AYVVFqr?$|AjnBPb
z6J6WHq_2%6L{TCTz`nOw4#sf-?zc4oc#l{RyBHmF>G9Z82J|<-#DKwc<#5bWO^H<3
zoQ7otfq`2$dx17BcWFCq6~g<mt_~2}iIgW@13i1hg1~eobC1jHXH{K(F+7ljR?IDd
z=?bqv0k2@X@ZvH!(EE}pqoqPXvm>y{ZVRsGVV{u&*_F&-J#w~xC%a@&dO!X2)h?Np
z27Pyvd&PuEbBNsL@j6ndVj5RtZ5<}f1JfI(2HO(MWj~c`k76*Up|Xem5X$j$Z|ucw
znpusmm_vtY&%7Q}8Fv;Lr^h-Co9TVI^D6O3#dM+H8Yu+|>K1W_oTrcC#bY`3^CD0#
zI)Tdhji6>;3tF*_!%8LgK(GRA^X!os*Ffo%C8%E<#xa8NSew30{78}SsiYJss9!k3
z!euhcewqo!E60v_PUa&`M&vV*M}8{Vj~U^*xn4W6L0dd~>ADA0qc|Dg;eD-f$Fx$)
zCo#!-y77qXiNkhU9&XQTJInl7B{(yO7!%s67xx<y1}k;#!f~=U?zBv7#yKK>OwEeL
zXx9A<Ek=*wRMaa%A(;YX<f3L2S2&65+baL*Vr|snY8D5elB)W}+|+~`>{;6Vclp$`
ze?LM`!-+C?u6lz~vbf!kGF<+_Csn@EYvmM`PMhq^W+3dem5YqdNfi1e@vy*Uk#ngZ
z&g?L9)K<%~LW$I3>7{e>q-}ny8e)o8o+3X{x&jrTMxkS1ah~368i&K}rdGtUXOhaG
zqC3D+^{Xjo!qeX%{&u0Ud#s4#Gs}m<i`JnY`G`VCD@0St>*XQwlaPKQi2&RBbWVnP
z)umfrcDzMs?R*__xezBh&`!UF^cbs7reE7Kf(z*CDy#7$Y=JY(yfQ8ydOV4qfGRNz
z0$MqYAmlgiHFL2s{K`Y0o{%xrknHYoyN|Ny{+k+Z;m79(N0tq>{1fCAOLe>bd=(e&
zMdJh9Xc{Nqiw)7CSKw5kewwEVdEf3^NuB(p@&t9_XJ9SQnYN{tq7a71Eiy8DkbPwT
zZtuvzu800;u!*te2P)p!;IROvF(vkp(y+$39H6bit;r$q4!r%SvT}VSb?&Eml}1XX
z5VM8p^S$l?m%*jHC0!<qY*A+<>exe&4Z5ED=uK3u8k?U*_|YWV;oy|4XA}WtOwU+U
zXq?S+7l?M#@q9EtW~Pvt`vQ@)q!MnuaLr+X>vUr)bxJxkfAtDXvtztr^{Wc<O}iq%
zCch6zQ8&zLeg5NfraX??H1M}$p!s`}v2ojqy}flJzOU?K<p<@Oi^w!vur+zA#Yhj(
zWG5R96g-2_ix*go&w~N29GZII4xv7UFV3E|lFy?g+|6=%tzyj$Teb}s`5``UU`k2<
zWKqM^^>y%?qW^);!KpKRv$UWBj``x%d8xviBk(<LYEs$R9Voqna{zaj&!+WgdHHbL
zA-=KTXGS7#sIu;1<?7=d9VMsmeZkz{g1e`*_dw@oNoApm16?jw%;|o*^dFb$gewV~
z)Cm(32t1oJ{d#^kL1`b%hk;~V*C%&CI@6!!JZJ*(xrBZfAu;9w_2Y!A)Z)9RIDu@@
zStkYuEt_(9%elgOrc2Iwr6?r~{H2V(2A~6UqL5nwoEE)n7K41OrMG)fm*6V$uY}jI
z`%+O>v@J|VzkSeLI3kzx!PF^P#7qK0LT@c~QhsvKBYN0M?E<%M|Llfq8{KPet+!gf
zRLWe)Idb7>B4$8Bv{eaj7DW>ep&T}M2+E)zj%k&Q(2CA%ORM(E9XipVobLc_p&~^+
zVB4JLD0T<ugOBkBcPJg2P8u~1{pF=7vQ%YwICI>iw7~$C^{fQ`5~gT@EvQKTKz+&8
zM2N!e9GgdyutyuY7e#zp0J9>FSrf;kgKyf(H~tNP-1FKTYJgipUS|FNIAhG9JG2bF
zYYmgGLZ!QEFDc55^-rW{jH)sWlR*{epzh-NDB2!$wa)avpeQ4m{!TaJUSXVKL@j>7
z5s{l>nC75CDXC*B!4F}EMvtsHbOoa}Gcz}RLNHs>fEtTsoDoF3lsarUO0FHA>0gRW
zQI%>$Ra8^km42-^at%RZmwpo2v{~W~|G<ocJz<!5VZH=LoQo|S99Gcp3qt!~XMPZB
zvIA-0u8cK+YnYe<bS7<1;`VF8vKek#8rPgKuBZxgbdcHMyNdq7n>4A0sFWs#D6Co*
z)vS)H*D|l;N(%W)g%`;1#L$iQWY@92rAbU-42{+Qhi%Ug1bTG}ech@;d6s|jDl^j0
z6ogI6A5HnQy?|d@acVz>)B`3goo^5Ol`IZo$u6owPg6-xRhKz9vaUKpV<^t}_CoOw
zm-fMdm7clOj?(67s*k)#m)3F4VVi``2V0ykxV$*ULZytR&8fi>HbYsT80@p~>Jtl<
zCv*iGZ%vtv3L=n|w>cG^N9NETmd*JX0_xg1>xNf$0xo+dd!Ut?{*?4HdTkl=hNbn5
z$%qZUm~BwuJM5uSkQ)Rju|}0lLycgi50*5^crDqvC^B1d1e?s>3HP68I_<wRYYJab
zQFnN$d-k<R{!vS>-Yf_B4nW%{O+5nOe-XLwq;&%Ioe#fYFD`dDNc=_<u3B2N?^DFU
zIkGIO4$L*;*p^k;a*lFvR~&9Qm&;!7`^viE_aQ=)>EOhkd}rrhn6`%?Qd3rK4cFp4
zF^;qL4K^lPZg~x_jD!0Xqxx+<a_U5v<3v^_E`i6robFFhQBZt9WCz^ez8oj#Z~Glj
zvGf|BpGYM*JcsJb_>Ir^o1v|e{jQ{Xq`9dz3r|>9sVhV4sxrPfc-Hq_bcoQz77PlR
z^OBH@S>(?wiJc2Hxe)QS5thb&c8)v7tK6`ra((}gxYsJk*X#0=gFHdh4s$1*Ge~>3
zw7y7s#MQ>qC9<Pvc;yCf?si`8+D+ThHA^<gIa}W;rb)Lmk6@oKO=FeBQ@s2^9xA1A
z#p{TmVKWx=OrNsX6<JIU`mu3bP6ua*u$*v&_8_p<PBcZSv2hT8^Z#D3#P6rV#x9(?
z{}Y~rCb697grWp$rc8>agsSG?&q^zVyi^c!UYqSkwRL6Kp*5P}3(Rj&F0BxRU*S`i
zL+S_PU-4W{UopeC&7C`Mj_)_vMYDvxWS(0*BQ&k;UsJH;7Hf=1Q<#d{w->jM5wXuP
z&OsE<-|WHz+8n1)ut$H2QQ;g%EI%MmWBZl7<_B%B9Z&}l2Qlo6t_sVWBeY=tM(q>I
z%w4A&75tjoBeM&M4z1cGgXK3Sxv71rfSp_hfM*A|Nj9Hv{yB%3KB1^9nW`wqA`!14
zWm(OBF04|CJ$#Y0$F0j|XXnW31YATAuZ526a=7gC_7NFlLsH$9Kd$$G)N}<TA~w2k
z;p$}CCTbLNvz8t}&^ZkM&=8x8KbZ8yHASiun;rMDp|j);q+M<&UiAXW#p-WPvnm3!
z>baeTY?<YagfqIbi#u@hOWweptR`|bMEhu`J3vQ-%k~%<i_iYq#ti2qi&8JDSs>e*
zU09@qaXc6csaJQ5g^3U=W>uljy&13lnZc|c7$|nN*k^T}7gf{*<3XR+k!P3V+JJb|
z=W=g=d1d;pw_E|=F$RwgOCSIQqXglufZ@Kt$0Pm0C=}$8P}ASx@&kW%={3Hl@8*;X
zrx4o$Zc9S?luS#WeL<}~q<p)=W?!l~atkNYe|q22W{~w&+ARzRE|c8}<IB1^w@nAL
zb0mK=7Jikcc+;`=PR-figfU}4wW^nkA}mPJM3<2D;D+PWocV>C^Y*1;x5;`jrS+xT
zsaSC&+~9)%>Me@mP!IavR}Qm?rWyZ@Je@QwRNtv+>6RL{$BcdMR=(G9a^-erM6q~}
zJ@x=c>$VaZ2mTV$+SHH`I2m7f+40c%=0#)V6Iq6hyB)1)PoF03W2FFRS`oj5V#7AV
z)W}t5?e7f{Bk&j6mmv_l#!!iHWcuaeYy!~&Vt`uL7m6=q&R4&`wuf2ylMSm5BaT{#
z01TSm8}}c1F7afP%lqRm`dH20lk!&3ELPBt*xh|YoqL%2R-M%?fUXl|8Z>E|WZNxF
zDi7)rp^^{netmJccaJ(qoHG)dHnj*k{)Y&0TlgRA#`R*gj#aCPDz}`a>Be=U%C3w!
z|CLoIN7|2Z*H|5%{;R@GyyNHchis1|-(z{4HXHe=$ESyE|9@Iu5(ENY7Lk7Z5c-zK
z{-14I|DksFKbefo|1As;seLJb#|V7cK;S@z73Hx3+0KbULVEmCDc7)t)sK{2M9KjC
zZPjTW8#|(Fa349P|0_QouEu>3_nGgnQfi;}Ls5yGfvF3y;k&l+;(6oy+?DqEk?Vc~
zM3a~CE5d%sK^nGYsWy3#p<CJr#ywHOSX0s+)+blw=S!#qK0n6mTrY6wBAt5!YaQ+q
zH4y~Pj&VBuTfN;H>=}D@nI&iw?!=uCA@8+Thcq61wyt5dOBoGwI@IuS&9}6H8(MyV
zpm^H4+<qJEa%tpEOi7k(#JgW_W)PC^uNx8EvNtzfFcBmG0<-MDYYUae|C{Fp4zWQi
z*8#jg6xrkiri$s8VO?4}%4o)+Y~7qq+gc{nQOyD89&hMN+rp2m^ie!ZZbIw@)liSQ
z-;kjRi3btliq6`jwB1+p;}&D3&XrDQWjj|xtwwQs%anoB)5!K>2y1LZg9_IXt*MW~
zJI}iBi;+T=^}lr=Gi9%r*hFXVy97=-#MVc_qhR3qbAg<6sNnFGq2lnvwl=>?nm?y;
z*%SMFxsJ{&lDl;f39A(cx!dNIyC-PVyj?4iq(&-Vk|FThTE#31o)f~><dieu3nd+I
z+xbR~&Boa80_>L>9D@y8k(9bqJS(#W#v<`0wW~O}hWI2Bu*YS&Mpb9rK7Vb}MAh!C
z$ovV0Mb<ak9OR5nm)L_wE^M_h`Ux-lCps~L2@l{AO%7u$-dDrdAWB_yugLAsSZhfX
z2DS9ZGBM4t9K7jVDKjoe%DWd>DwH;K4LOBupnoiz<(7J2SrdokC<;Yz)U<4hvGY`^
zD{MQfTiX?>j_0#n=whOr1ivau;Ws0SlkT&7Y5HQ4&Wfj-qg`xW1oOpSmuuSB$IkA8
z47rt@0eh=T^`R4b37lKSL+fnuQ2CQJFXv?Z^&&rwJ}l#sF$2s+Zuw6JN%RuKcBvs{
z$|cVq8Rc)MfcLnZa@x6AJ}+{Ih->6DNi9K`PnNh7Xm5iz0Po;^gZJr#`M!7f$xhxE
zsc+04H5PbY4dLf&hKcf6Fna{Gf_qZsYe|d-Igjaq)L&GMfKZGs-^XEn<6U?RQ_|_q
z;a$XA&f;FM1T#sQdO}+RC;TE?0ZC0AVr0wqPu&p|OQ!SqkmfnCeJ_8pwRh-~rAKn4
z9@K4uH#A|!&cy_LOzeO@B@>754aehI4KU{PB}6j^U^L9kg?Ad+fzD@dAa>NP!x<vF
zc$btzMifWAkFp#=BFitpFxEYAg#SNznmgd5Z#Ca$&TFXuA8v(z8N<6$|G7so@}-<g
zM+=PtL`$JpDbPkkv<nK-s8fZesDR|l0QlacXx}3BCVX}Dc^MMvB;$ME4P(mDM2pHR
z$*UWi224-CWlPTh&Q|R4`GGO|K0&bZCk!><(2p1rgF~eyix@LRu!mKm$>)Ae#Iy!h
zQq`2FD>!BgZtSWJ@209A4m*eD1RkWi8c(@WnJLV5%{%kn%1Y}aG&{%=quXW~oW@7i
z)V@Zgpg+f<!}#_P(%fuGMF*QC17D}AOfoFek5axRw~T2`@8^*7fOV-Eku8$jZR#_3
zP1Z(Y!x&&}!86$Ex3aZ7#!$1pOu^<$k9JN_6X|QVFr|^0&Ns^XNAB6)82(^2t3P(Z
zWq|grgpr!2gbYm$w2bNyET-55@3fd3PY4w5d82ZdedE<qF<HhKhDWq93%)P*3NVC-
zLvZbyZ^u#_L0S@7@jJYK<}QCu&Q#k?1jg+OG4~0&Kx>(JkG#on<Af1LuDNK93O+uX
zee><W$WZf%^iB9J-bbRI)yq2Ai5dEl)FG^tUC(5WoqCY)UU0jTl^B|tzTg0(i<L1~
zKp3J1EAF5&;Fz_*5C;m|5^ru%xt_bhGT8nd47IsfxZfNK-6~A#o{qy*RB>3m&usWg
z1qCDgVbD;3k?agd$o?6fT!I^J1z++^SFT}#!J`1g7>&aNW`#9_e&MM-gd}_*9JlVV
zAswpD>Z-`6wFYU2zMt#9NFQ5arAg+gF$t*KGYm}&;{w9_QV&BWU0_~rrPeO`K>vGv
znT+e&O*Vot-@$z^UL6*G&5uU9MZyYJypK1qxT7j&+td#JYr#d<%7vFjP_o!$0+^)y
zLRc~eUy2L<G_ktyghOuj+Ad>?DAX%ackM52?PV{T(OMtvqA7O@EybF9nZK;PF^8lv
z&OKa4FJ*?bb&+W5jDVhuxg#A>jZpq);wzX;KB1WWmiHhuNy^_Ag~~y*GuTWa>P#{6
zOvo|umL_5+YNXL!o;pliao&U&@`M<<h_665O1}I(#V>9WJ_5{v3x?T>2pko*D3;6}
z(*kBDLi4UuVi&eWBTKAzVSI1~38nlVJmJ$k%~YqQP|L=JW0$gZ0l>~*7DFWEI}oSV
zs5Os$?te_e7I9T?6u!^x!oP*Y|1Ycgzg*Z|>Q~>@9OH{NI14gt7dmy8s~C$K<o33y
zQOgDrs4kB!AWzMjJ&jeTZPWCc4(2cC=QjN`i|Piz?-KlrqIAZN4uLS6(}IS1O*d!j
z<b~&>^SaCT<vS;$X4ms4@T(LY`;mh*oc@F%-FIw2_8|K!TSP;;JW)thXb4H-=#w#`
zG}g6+h8aiQ)Rjv_rgp%HtRjTScP|8E?!?V%2$rf0u-`GBO~V!U(9HZt?%8!stKJX;
zJ8z5CQe~+AHWLjwLe7A#vG?*`Kof0rm2^?ILATwS>0U9n@D7PhdDNJ#_W6Lr9f2Ef
zt&Oo{JXk6K79Q!K*5omGN*_g!qXQcT`71Df$3K|?38_%&L{D>oN_ZzxhY3TGa6U5N
z*M48gQK>o0rtyz~CJ8j6c+oiZA*ZJAOkAmC?Nnn>=V-$}6hF3{rA5d^njZ<TI2BF8
zO}FX|Fm&p^;n{k$koGZYHU(Kaj+8o)n+=Cwgp6cYGY$t3X3D86f7&gfatYLk0o})K
z0oLtowoB&$iWW}hTUIIDN1eCUH3!hHaeWAFqS5Jmb0G2iRKVBDn{jx-Q|vE?btjwk
z7df-Hzm(`sJZoAAeiqEdv<$2J9dB&bwkb101&GffP$oZ@w@O$PbjlC7bWoVWS4+L@
zq8^O`8%eU?<=73u7eWjO5axMkA2l)jN(61W1{lpL5kBjM>m*tw5<ACQcJP(AQ3cAj
zR2_I%oxOtOo?{GB;+8U29l-F-GX}<eW6E@e6-U7E&OL%hxcqvNLzTVLrmxZq&@^g@
z;rW+t3u7&L3eO#r3Cz-CdeyREzh6MDp4Z9>e+C^&wTFa(F|FSfAZHwoZq=6+j5IzF
z_WEY!HIMG=BN1VX^uOBWVQW2oL-mQ5!jIyS>WeoB+Vu>$S-QFoZ*bEh+_^K#O#qI(
z#w*3}S|sPG-4MyZqe3xssbkkq)o^AS2*qB-rf%cTH7XMNxd6l0BMIB*yRY+3k+u6N
z+3T@L&*q@+>ZJLh0bHuKBK`0ph5-rgFFRKygf#doVy_8NmLCI3Y4aMunwHl+M`n#i
zjqtyqUVn6T2XyBXuEBo48wkq)UV$0qv}FJ-u<Xm?9Spw0m3>aFEm8RW#6*D2FVhmN
z(=i$L*-XhHtZ-8$U)V=eJ;J|<(~rA6F^;39W_Xrb7f!Mk=(n7Q9}h&s!kbh^QuA+P
zllG^cu(m;F%hExAhV%|rsiu6Ddx-16eG}7rmlF&`qw8U_jNwz#>&R3n#A?Xm2?Yx!
z43LxuWmE8(^G~M~T%@2ruuG2~$rIzq^z*-9AMrX>)Z%}}O$1#+vOJ>@UutI7F4okd
z&@HUMD_2&wiuKn}`>_cPz!ra?rx$aI;q&Xy;~tJE;Ru_oBj15AR>$Wg3qxIEv{k;j
zL%tZ!`r(m5-3|V8Oz&!4WykvMUN!%>?$!VBa#G_^Gj(#dw6_y8HFR-xGIjp1oz-mR
z9s79&6h3q)&`Y-7v17kiV>!@8)f1!CRt(J4wb5}U499nY>vrl3Fj`95yPMlBbA2Dh
zq$!KXx$n#ApiQ?Sfq<qC{v^wL#=Se|;py=u*Pb8908<T#pf83)=hqNOxI>b7OKaPd
ztXgmu#2d)qE}Z-h>Rt|nGze3Ok)t;KVsdDAwPi)~97Va*8)g8Y{))xac&BcoWF@u3
zJIpDYQ+J^m4_V@3Tuj)rZAoJ#r9Y}VvSJA$I<2|MNVeJ{#;UHq7y)A;#i}}Q1&g$+
zHsa(o!xC_f{BzHyMoxfY-8;HhWUVp%xXB%$T-ZU|DVb&))O^0k_{Q0avgz9(y*p>1
zU2?=UQb60*Vx_op$=KG7)u?5(_=K}Ol&Wl|{z5a+m;pL)i*rtN;^X!j-=+?--{s~o
zXjnnV3de3qerk^PrlIV)q3Mpnd%3zQx^&@UGh*ruQZi*X)&PSpT^YJ%=vz*yx9VDc
zkczW@Ju|o*t(K=yVC5a#Cq?G3YG#mA47^^5RJ2zBV$47n0P{kczN?s+i4tuLKVT-z
z=+U)Vpr)***hS_{;_+i5>y9uW<trgw;6A#s-n$nD9hBwLEsU$mESI=hO5k!Xb%e^^
zVY@1W8r~&*$ARkO9si|`OJ@W%?Uo(EAoL<&4n}?8WvsW<2OqTGRG2%09FtcNe+(b^
zEm#nO4wOKkKib~+hfE*KJBN-~MUoNf91lC-3$%O&VH{uZl{dT}9HAfoj&E}$<?=g|
zOtUA2GnYNtFOsY84}+E=itRDaI`x1BaiPV@bYT})G#gi>n<0xWOii|5Ix)@OOvequ
zwTQof4LOZZh=;3q_&Z&qjFUf11U&-RKo$uoV{dpVhT)GS8JJ&0K?G+YD11XAZ>b3W
zWh^z=yX~|_D>IJt>lDy^s)yQ*x9I;U;6qk-v7O&mmh^v%`sV)6tStZc4V3@x$E($B
zl{da)o<J7sLp&tsXW4uqEw`32unZS|e3MWa5Ejyd7eS=v-MmKG#Y9qh<|FbySM`&p
zizGw8mlz+#UE9eaGt*6=etKVSY;^eAy{vVm`Tym8#TG#1H)r?-2^;iE6$IT{)7M*+
z45dURWhphZf;FGM%n+mryR%#Jhq^pn*-?6^Gcb9z?vIV&kULbKfW9Nnb&Bor$ELbN
z;kg&=z~<d%2`US0&)>mXoIc*Lwc+imf#9Z*n0o07-#P>hw`}h<p$LT&nh_)r{!Hm$
zhUWad-<Qj6f%z3jx88!zncf#R8)Q>M71m7NL7u6XBjbFSVSxaWi4Zz{8;3e1`51DF
z^y!#vklKmZStdU82|Q~lB<Qwtx(#D70-B97t!|1gAeRJt@R-=H=8KML!d{1#uE4*&
zr7XDZo=^UFVtOZ+Ez5-V@a?rHa!B?Q&LQ9B7`ExBVX)u!&h}9W#ni;EwOWuF7~Y=u
zR$s1f0CKImGw{seL~8Wy{KZ)}-By0RmXplJ6K!eT_)x6&iX%2OSLj_$>;%Py#$aNk
zDXzQ1TwP!XSB1usBfPcBQYn4?fKCaKAl<#d5ImQahWeet2pF5|pYV~!Go%!T6iJE3
zsjN^$$KpIEud?D#GyoDk^rR0FkJ)|3E^S3#3#<&OL)vR8ERwZ#AmsQ0zBqO9<$ANu
zl&jQ8Lsz5yeJYN&Nnlqw4icDT%0gz6xV#I6oRUrH2w8l8c}$rJz|v`F28}!lsu?LO
zqu9#*Jpy1%1sdc%Io-^&&BxQ&M4bHwV&Zlwoy}1~7STP<IV4DlnP`_eCj)S!dMV80
zQ=%oi?Zyr<dgX1~$Y$mm>mmf!<?x2crjePj;*xLz$1fxW5_4H3UC*m44{U2#EDQu%
zIB;oi{BWNRfd-IQ&++xD{1E|tuXQH=&7$2L*p$SJw|(y044tsbq0SRM59}0==PRrb
z8g{fKelxE3t~(52xkFqYi1+@J`0cJI?@&LF{0nBB`SDo4!2UrV>#XnNkso9IGZ4m)
z)H)QttP~kcb03N?*hkARIL>&HsL6>2H=ygGF(wJ>>52IHtof6?RjQ%r6KE>w!qz2A
zQncV5>a1FW8?UfO;Fz>=sug|4JNB=}9nQOz4I^Pth6h$XL06m5#SiY&5jrx112i0?
z!67cK{IJ3V^tv!5tRdF>Mj;=c$eGa%8*VtxXHH4|;5t9a)HVey;hc3oud28MBuV!C
zL>ynReKy&fH*6O7@O67-Os_ud*PM6e#qF?A+Ib$K8UKG=8vb<w`IFzTek_=O*RB7D
zmxdaLkd3{uwWXc;Kh!)ULu2dzs;t%j!XAX8H8(;Jjf>ua>9riyhda$JQ>n~a%&i*1
z(vxjmX`nTCOzDOH#r6;E7Kj(Ym;EC<?BUiipKN4g#lFVrJPml8b~l@z{PX&BME%Q?
zC)Nl-2}ZIAL<TZFmI#J25L15I%Z)RXbMtxejY6mudFWe$&_JjiolTpAnHpmXE;5NA
z%wnd_BFtHV`P*Ne($-X->{?H9Us7>OIyBG2%MhAvJ7uOZo~fp))<WA*(#E=0b2*-|
z=P;q*;%UF8fMXjsQGBGjrQ*(7n4#>_RaMqu89Jx72>--Cx;9O~oEg$&#3em?ht*<R
zJPxgM#M0b<EB1~)*>1{JVs(C4(Gi=)Y|T1UhSI9b4x3q;^oDCHpWr%FHcmgmt>a3e
zHVCx|(?&N)aNk^6G1%h}{ZR$HX#`w^>z8*rt7S{!>R$&+!}y5aM3vu~ie5<#eRKmd
z&}LhI&a-<zy_Ct>bwx6*pUCB^ujk4v5HC+9eDCMocxeezAiB_`(p}?8%Db#r)3A+$
z=m-O;f#wMRf;pVY0lMPQh^6oS`@X#p0A|RNEjmI}q^iC^y=jEuX}daN&6CfzDjzOE
zOuP?N{}V6LBN!F2QV&^NZctUnSmX3Gj}az&GHuVYMJ?0tsE0b<N~;doBeXO5@)+`5
z`P|iRwwQ_dNZw9Tnzs2;Y5k<J#-iPSI>&u*EOVOrDmljmGExwtMlRH_oEQD3+j&wf
zcl^5XkMy3Tml4>WFCoM4?s8t?btp-(dUn?z&ui}FWmgX|kXglQHZZ*mViK{<8p9Iv
zDS;2CcYA#EnP^099N&bi(3rEE_*jH>E+LPLA6*gMz7U6z3^)b30gb*Q@CYBN8QWp6
z5oV#EuaJoZJ^@C<6vsHCx2-ZPv%qwE_BiO_0Y5O&9V0YY-e|%8&@JEteME2qsY3v<
zSTW%|!(qo*pRSzQKich<(A$6hlYQe&9ZR$JU3O>xEeGL0K0*J&1}Qk%8=E>i+y9HF
zGNtk1j=hBVx5mht*7J%)F0f8A{0F|nAxC5qf=qUas|_OcXljB^kaDlCH2XbQrEXmZ
zlVmQ6ML_DyccQyzBPbFU_9!QgUr0~Hz}e<j3XOPVJc_g2mGiUSR2TEZ7NCu};bRM4
z-xqfG$290Hv?@>P;DHN5N515!<ZRIG07L<*XPr}SIsmDPVBN5#@RzAzH-9)Y$42bV
zzB`g1J%vBSZrrOfHXg+OjE8~)F9{yJ^s97y>KD~s0s-ETvC*47(qFtmy8JswNO^`v
zc?vJF12dYm6^z658fRx2Wtu2$q#Tn~F7C@K3}qHuLCIXRA3^*%9DY0*CZ{p<loL`#
z29;VO%=Mb8Gh+KJPR_yk#3QuQWA`F`)95y#!j1!zV)IcY3ChrI;VGQBimsWN?FFK#
zVXi}J->wihkIB&^iP8yCqnhzsWhudiq|I^c_90#Y7~-c<?BC-uMn^FE6eh|bimWc7
z`R~Eib@Aa>(2+yDtqUayC7?kLSHB6*HBjLaQ6$PW=M@<^jWe-L`1juhlt-T#*D0d)
zXAJL446!YRqcCENw+0X&iY}UlP0HF45Em92wP*AKAZ}bl{bO)QFM@}S%g^QjbrElX
z2oo0<A3rWYdUSC?`5R#H&#DCv-OoB9)kN#@wL#1M7kow6CBE@nJ%46G4^YEp2Zbwu
zsRbr8Q<kB#&eEF-VN356rl}yYl=`Lw^?H?2#eR#pO&z*w)Lv?+oEo0DF4_unaf;$a
zRgT$fGoAFO21K?EoQl5aa=Fnc${r2vP5F`E*n}|50k$K>ct!>4#F2-XstwY(oKlWX
z&16y?EH@7+b>(FvOo#s<4$Q`6Al|}=D)sNxvmt<J5;bP1h`(ly1e%L(@GR<DGp+8=
zrmhT|ik}q}RH8o#CpyS!k0X&&C3-rxJhTh&5v7Z*28qd)BFYE*k>od~s|^ORs}1K1
zHtr)W9hr#+<-Ch51tW7LA3Cqd?7r@6E8Wa#t6jJjI%Z&uvE$*!Feo!^Sj!KyC!|qz
z`jue>XGj!-=<ZAW9M{vvd5`wqzFK9wnLk9yDg?;YLI)3idEgW&r_jiC4K6%tOF|3y
z3V%on)YQpzrv9!ls4R`3pyDS;-rz64pK!wwg#iZ*EzZRlXcsHKlF)jP+6_y|v4)U{
zj07#sF($@}c75wtb2fEXN&Yk#r%1Q-%cPnYb1$ZRhV;YqW~3mF2EzPYB|bnneZRD>
z3Nga4y|zkenh|<n-oNXN_6;BP0HRmcw3EAzM|g}3RyP&7%aEam11IgIJAmz^+@r;`
zKfsle#EyqC-3-qp>7+j3?VMqtnAabzOv{h%tB$u@&2P-lWt!9(WfOWPf=4ZuehrKE
z-v`FT-zUcGK}zL!I|?8)1`)@wvm19o;!C}w|D!$Ze=E80T#D0tH1FN-kari=@8A=Z
z=;q6))$vpDNtaud5)7ltEJ-m5)iRu_Jy^b+Rofd-37Ws2O}ow8Vv5FF6+A<+RK0eQ
z0A_8WN{g+;oLS>G)o9%S3ublq)Y)O>Ofe|Sg6GjNaB&~Qd7jL7ZdaeBGW2m#VT8(5
ziu3L@Ml8EuNfwo%L2j(3gI(<A-A>qL=$;}^=>xD{tSKpIm@`SvFI_)Ds|#EG-MyKH
z!Ni4Frt_$u+A(=Yxk2K^8KQ?5{UKdf`<D2eZ77~%eSE1?$d#LX+MM)InvApN%nd3K
zA{Y9@mLhO_MZe8hzIsMBEOP>%)mmgK`Pap4)RqB6pFA^F(T{c!^!@0?L=NI7@@WZK
zpsOu;XZ%nL{w0?T@CY{u_Js$APcIB4EsIO|-vy*R4nUdx-t@ibc%47cy2F>-qHbqG
z)~Je98+8SCvxu+Iyq=N3cG>p%Vt<g$Mqo7Wff!~CGE@iawzZ=217`tx$Fcwd=gww7
zFUSg%fSwVi3RC_D#NPTNVytqmF4PC^nv*v9iHpoDI*x8>D9r`r9+Wj~2k7sn#YVzK
z?_-oBG%!XZQ+QPpuhuZ7kU*sKqR;W6<E?f;c}70kVf{hE<;xO3$=H_@AEjCEs{<|_
zpI%k|IV;?p?(pN0W89}vd)2g`^8j-5y4*ME6~uf8eU;~ywE30c4X9ZzTYSaS=3<?%
zH4yh?@b0B%x57ELlb~-$N(m&<dd&QnSR;?3bCDpqJw_|o%N|%dsY!Mt7P&pdrY~u<
zZ@N&RNu+(#LTeBMSp?MpJ0;;0FBi$=ELD>l-tqto6o~E5S*Z3EB7#$lRsoAt-0b>}
znWaY4WFIf`D~+3l0DFg~i-jC%-*s=y-0cv~nNo6TzE9V&Qg?2?uCU|&h8H_aV$+_x
zJaL}W>i*)TrM7f!$%x)fFi>dKbl)e&(uDH<$#Vm;%Dcqx1||%oy(Qlrbj2qiJGbzH
z$Ze{6e|=_-5~p_@$ALP+E2e5s?@@V_>wu`nz5DAUTg4Gq(JrrU2EUh1+ygtL<l}`V
zz$5mQe*QI)|Ms8SlFHQ_w#Iky=K8nmO+5cu-~4}Zzy7rX^52bfllq1FKL**bo>e3h
z!d38%%@WGk`^0%_<z*BQ8OiDa!$M7NNmYi14Vl+=3YQ;-`d?!FuWQalQoN;~%kZC>
z>p6eTB7TMj#T!kp0mic1+^;{kxL>CKJl)v$0CNQ7UetjP)MF-0mDvoNJmlC66R$=^
zP>|jEp<wDL-v$JhLlmUP?hEUvI}ito`JnW5v{H)Wi{}wyi^9E87|ohGOA8A2MGKhd
zF&pO`qqxZTRS9^^<3pEGPRwWfDLd<Kp@ze*$q@oF9WM(M>BzSJ=+w{5HMJ$$YUtSj
z%Eb-BP|UGX=?Ij5D!!?=G**?LNCMC-;*+y%k6>qNX#-O8HEs2zGcr^q<UC>xQ7J^9
z&@D><OHR&EGIZK&RXsxJ9E#P-8U34C#>t&BjA~QDYlim24#wF(ODo&jl-y~iWTxG<
zGt4J1Ds6C<X{z(MmHIgcm^z_<_6%Ah*I`m9FD&)iY;DFy3)JpRFW|}wKaNYZr7vYm
zp20(Q$wo707>|CT8Y%P>{|LCwh>mhaBpjkWacY<59LNkTJ6z4lZjhBr8P{_%0(9)q
zp|Mi)*L09>IJxd%2%>_sA-t(5NjmFnNtWntU{%HslUVM`$<dFE7N*Lg(&pL`#BcMN
zMwl#5(?dKi5jcZ>m+ibNE@8Y}mN@I@wdCHhYEKGP8bI<A!yY3`Xj9^iBfmEafcdmZ
zJHs#)H_-;K4``$=d!k(&>yrb0M~0(&wpLJT;bF!QRl6(Y#<W;M1XET;Siey0_~=qn
zhy1cWX#pJ86YN<<^vThZhuExl9MCL%5awz>JWWke{t6Ns*@B>62miZ*BYZ`rGnNfC
zY_?_}7DsIkNIjr*A7&itSaow4H{h>rxKY3-wH+qCc8;PBAo+uCwvEcmK|RlUqK^pF
zr(&Pkr)D2|Q}wnu^7n01puLJu)QyVEUQVR+YtC3>vrZpP1LUxb`;fQ%gI4Y_laxP#
zg})=2>TRLGi5hch@6eaG4eB2fhBu~t)m;@@hlkUS_LUZ@fK7dJ?%&Fh%ax+#)#!y*
zu@RuuElQOYCnK)P+88OS+z4r&d*^P&<^d``*`In8SDcI~mprw!fgl;I?zRw+IyI70
z74LQSuJ1WTRU1q%A8o0l^)(!Ku2%Z46h-W=)N7Nt5_Y(AK0AY4+@81{N(ZJD#+rro
z=IN4XtXS9uC6vn(!>FoZHkG~g{nn<M_+6y6)H&A}THLhM2UwE9p&CrW)x&ly+?6Mt
zIaX5Qtde=Q0}n^WwcgqNRA=C91}Ge@dway`8_907!{8%&d{X^WQ}vxdmzsNjazv+Z
zG*ABI6n}p~k0I`^1c1;digREI<Dxu=A&a9CB8j6brg5}}3mCaOAoht^TOj6(SbHGu
z4H8qpx7NdnA9Wvs=W>m#R{VWsh%H3E4_qHAO{CWqLD-Y(<){zF{V82`GWEcRC6+_L
z<$8&@$RA6WAK+d`Zjr^6>@hlpPvj6M8?PUp>k(Yi@OPInLtD7V=)}0OF*LQ7`j<6H
z*q2D*CCOO|7tgJ#;@n^iaCZS@>@Ujsnk23mGrl1$#~_3)5&B#`%)>YN5g4d$M)WcV
z=5t4+QlGNuNKL0lHaX?)@h9_HS%UTWer}El*RIV{@Dqf7&zjAU-m*Yw|3W>%8-5H(
zs#b|%=~f*<UE&6m?Rp!*pi783JIfzbk?il(W@p))mm+iOHMW2YfD|o8UR(%2)*z}B
z@6AJ0woT3Zv=reK-zfVD0-VF*v?I0c8h+J@vooB1=+TDj+X^`J=id8&t)+_pxG<3W
z);e$hZ6xgf`riJR)u2gL_aDec-i76wkPsnN1(0ejRH*v!aM1{OH3ozVNYW?I)mYOj
zw-&$_+uodralxJVE3yO$7{1SAAHHd4gDzjANPYkrH***BOP2FZc3f^xw=XzD%p1r)
zhO%rkG}drOLT|9uwMF`(0mG@Row<zN#>HlpRqI5&7tuF-@jJ8gAwN5nmNPcqGt)cg
z7NbO6N0V_9_H4OIZ0dGg)fm9uW-e8Eon{4a3m1oR^dGoqQif@`+HO>m2-^^2K5^Kw
zf-=T0=*87TR3e<zjy>WxD~ojlbM#p=CJoitriBhYj64cIiCJ%txAxg0leQWv{`SH(
zE`H5oC>t{U`gU@UPO^wrc)~8A;O(KrqFCv+cYiCEvP;<AiZ-4nTUs&PN2+^Ex+BPf
z3}XnME2FhOP9QM6qPg>GyH5<*>(t+7DN2^jLfuA!V(MI|TpK-wp_OF6fn&KLiuZXZ
zsxXz)9xXIT+2pUpL{14*keVe422zcb>X_8V2>!+tIdKSK^*LJ!Wg0CiZeZJ`T$TAU
zDd_KkA)X{Pg#Q4ob^4qmegl`+Y~=xs3$7&3EMs_9tl{Kb`MFKQ92;+-F(rCvlQ%<-
zL!8xnyy1DPxD>Fd;T22$1jB+P9K}WnZR=*P!K=?Cv{|`Y3wNvTI&WlVY#VzQ&vLhc
z>Z;E}NV|Mtp_O(iykh$d%H<#Euq<X%{I^oQP;+t>lA<%9`BTBj$EWgYXa)I?bQ;C?
z#M8ow`dl&R@J5=oJKNgJK{leb-{E$Y>P2NS3qrfF(~6bg2PD(RKhB$R2Zs=jNvmTO
za>xAy55c`uM%)mh45;%|B)Wj+v=g6VeYU~FfoXpuD8|qkhBMHE>s9534zyw=-YQ%O
zCf?y@S(3jAkl>G<C<`RodEydC9%vy*L9I9jDZHE(jDjTW4APz(x5g;CELen_A*Bnc
z>vUaK??7}ttM5nb{6qYMzTJ3S{gy7?|E+ZKzdk|#8u~Y>{R?_ptxE@;427XsWVNJ3
z7xha6bWWj9Kueb5EXaQ03W9oL%j|pKEZ1nC7R&!f#NcjF9N%kUw0Sc$1S=SpMZI&$
z$>iI#>-6>SogM!l>HSG=6c|YptvX~}vtZT8xar9gx}eHXC76p`>`7egQ%EZ<D4WLN
z^jv}Vs<s37^+36?)f%Y|^<?h4drUG%Hs-<$?6@69i&Pof+w*Fk*&Xf1DqTjTYcP!B
zz4Iz(0`*Ge888b|5+um6L$cL5b*<)$A<Z5l5qSmMC3|G#m}c^&IVWg42(cpR>@)+~
z1|GRqu=|gg7KHN&M8YK2X`sUL)3t*STE!$;u6j%n$TMpytwioHZ~O*gCT1AD@s^Y|
zhb*Mxj@IpTI{jn06x^yK&o*0Zk}B1nTKW0eP1LA%DJ#L+O|<H-eUBicA2Oj!4c~YM
z)mw@MPd(WB{LcMQP3PdikHrD$SYvMa5OE$TTj~^VS=0p?J6j9T8OEv@<doBN`iWq&
z@ev)#zqaG>I_2>L$p)IuWDSRz9Q)dLJ~)P_6sxS_=o6un(*nv*<VDsh#iY{gwrM&O
z(Dn;-)T3n{zrv`DPF3e(=}^BJ8HgiUk%E(z7{kQvG1aa(Pv?**Q2>JGPw1vmT`C&g
zy|D#7QP4Qd<r(5380PB3UxX$0O2Xm7kOL#ia%BESSwk9BHrnq29z~knWHQ~KLa~ny
zQqOMt__26c_ZvN5_-V5DVSg{^1{#>DkdPkXYzonhIna_mp%IGFo+(+Il4p@eL^HB{
z8?^->5DR?I=5%WxSLuY#?sS6}b`aJG{UAOY#m-o6!GIep{&vHsIbb^dh1-|<^^_<V
z7XDn?L-dHuD0vEbvnK?>-E9fEeARKAisLJ8h3_*P5Nh;;%3YmNq;|!Jc3FJGa1-Lv
zf$LIyu6BWR>=dtHN{lZdVFu+1eMf>Q+;>L;hdtr3Fya8s4%y0}CM}iQ@0KzeA%-AE
z5ef&zCcT@=Y!)*GA3H|>XG1HV?HBMr4jXDcP(JXt(w_Kl{WbsV!^ZMoQhSs7hcdD{
z%3r$Rs!&x1C@58F+jXKc!3*F%C25fmu%=&@wv|_=4ZY)L>|0xTk9RMR>fB3$jZMtH
z@?Rx#SMKZqAV@go;DE9JL)$wCXWlLC{;_S_wr$&!WMbR)+_7yN6FZsM$;7s8YfhfM
zpZ%Wt;q2P=o^z`1|G!mtt<~MD`|8hidBE3wm;J_dbSe0U-xFdRt$Qt;KTRnX5mkz$
z(vT$(tES0_u%=}fLcnSet%QBzyhpxxv}xDaC!t4uefHWCBzMQz)cadMKKys6W7$~+
z?Ad1X;<_?nnDgH{eoUw7PIbpR3fty1GOIDXF(;-rCvPQ;4h&~rcb3Mz&afKgagTSA
zC(vzVzWogm!ZmTLAm&;`1aw+{Rzll0{9y9(zvJD!ET`iGn@mb7u@YzF?@CIM7_?&0
zqoB~d3x&n@{n#jx##=pA^XRR)51UjB7w^sXtK_9w&YUQmXB+1Kpc~2^&;SMYO3A5~
zrq^&#(s%5q<G?ZWryaFzlC$PTjYM{>bQI+@7qjN(An=W++sEno78M*p)a<OPq00)t
zvdm2Q4AG+%CFZhx6r4SqRdA@Kb!ssA=60$zyBdy8uJ_PCS%t*`zO%rwAgB41!`D&|
zxvY4r#xV)^&JXDWwE@(Ua_qfMptoG@)WkTGEY7<PF+j&%M{W%!(d3h}dT4BvTGSJ?
zA{m+LeA^t3Cfi?318I?&I0K_m!UDW6qDzg~Sp1p^!k+0<SdW~f*T&~GVCZ-oi)gfI
z4owXXt+T**tj}3$Y%?WHjd(c;1`c*t4Lh5lUqrwz_ld1zPPn)cW0{WA0X8^dWv>9g
zjuKFf6lrZZZh$NI&%j`8cxRkL?Phj5D6*1`1oO01`eZ3{y=<=h0%yf&ZotJWUv#2b
z?KaBjtRrS54?>>ou>Sed418v!_D05;w@Nt-PfQOnBtGR%LRbt*H_C`je>@VGuD}L=
z;95V}Eq~*87XFxVTzTZ{v}Odtz!;R2uUEZ*D9+_cYpf~0?{mfmnU1fisUP(4y2000
z=tGe5iF17SPM@R|IZiivn&%g!VEfcf9XX}XmYN{m0S65_a03^ywx?U7RAJjCsf(y~
znAKL(j*eA77~xJO^@mr>iRp0JCi&@uY6*Sn&q`Vq=bu&*`0!pG34~?In%^Q+qMtZ=
zqP4Dhi?$q)3kEH8@859rzE>n*16oUAjMH?_Y%co9qzh|Q$xK?mTwftQes!WgxV1t*
z9&2Qm6vpc|l_aP-+%4)Z2UtBFgl`TheUms|9SfXuJpS>PQ0<vH2J7|Q8@~@JrRv>b
zMGUlcPMO4Zw-mkP(ZxS9<H`0Tp}G5063KU%Aivxmd{U4~6K|JQL3A4!;jTP%kE1h&
zGw*U(@>&Dj3_!>LL$UINB(I3vvG6M>MSUPsNnGX{{$0ulQM56qUJ_hB`pe1DFoev@
zF==t#`j}A?30NmjIrZxMk0IIpI`wm;)<^#KP$O&M#PFJB7@cv)*q<VpP{{?fk60Z5
zog~N3A+Bz_st`T;*qP=Cx52jXI=93Vg)d1eDc*1&9)Jr(qs+H&hE?aw`Rh|`Q!w$4
zvGFtc(SLT2Q+MDhD^<_|)xWoA%Wz6{S@;bBuiueGA5M~zYk0!im*7?kHI&nA-Aq(a
zoS`GWzk_S?1!wyXZfe#&jnxGqI4k+?{-j7<o3pV7x8zb}g!?f|ER(&n)KIMd4GD+g
zGg1MbkdHDr#T6VJM<SUAwStj(SF6=8)$zv_mY~cqwybTQnO~w`cuebSJ^i1qaP6X9
z-ha9pb_IIuqkg>=UjOgB71;k)5NUk-C$HMAU_`^1lf1<AIJ!03IFu);xo7}hI_j+C
zS!9oF;(9<w8;?C=KYoAu9Z~-ooUcW6JOr}j_dBkKMS380R<e4c7{Tcfs{oI;-RIPb
zz2@h|0^=``)|j7aQG3m3xkK>-A|N;sFqZ?&LE`ACH|c1yDs+@_eGzEn;JL%p#Z}ui
zK@maTaH|BItY4K7#*#Z$NoDgK!|_^7m$i#K?B$|D{u#DeJ_+3pmKQaYt^w9VGdw5j
zumf$DkyefaogK#GA^jz`cR}qgRQFunsPZ0$J*=b#6;8?yJ&R8wzjior-INW>fXrix
zfs_Wk?0iQD{Z7?gigZeNh5UxS({S8b4_0CqbHGr8m2zFesGeq=>8F?wD`)w)!Hd&&
zhw_nhn+M{pJ^ott{s*6s4DxPTN5!ogWEJoyXq}gM2A&+lZ@#?!4@^OCY7-0ig?qM_
zW_{dFvyG#A;exL3so1lUkhNQ${2{c%Mv+}jqt$MPgU#~2)jz~(94by`lB_%Tj$TF<
zN@hw7UGQlV`8O}Nd7Qw;TGp99iW*i#g+Ef>iPSswS>zC+NZxktCC>7vy;)=UG7@<S
zZjr(Jhjy0L@hW(^OFiZ;dD>g8M|Mg?$=WFH!tzbOYNMsvRrVd*wQn%p(@Ns<{n(v_
zJ8Tqeas@T{fsEJ+p?-4xpjDO@Ml${FXt*l6Jy`&4pAjZMv>F$^B32(39n}1o*k}*d
z`E|5uzlkpTRBXE}FzRe>O^@z2!{k4Ezn?%EayYX~h#9jTw4AqiTqu8hSoiI}!Fx7I
zG$d5bG+&b?YnnqKYgj)#daLHx2p(7`j4#miFH3Yab}F~EC}3)LDKoNW{n=u04Bv#7
zZa-HED^f`?0^$$1zpn_NaYwPd?Ur4&6+<dEXG!&kNy+q$kh(M%BTS?YY9N!OMtTN4
zlCtW~8Sv&p^h`yWqmoH^;iqayi6tPy=yi_b>pw<pO^e0X9?lgi{|KX&*cDmklrTGh
zp4Yjg6f;9airub5)Fx?zN#2LGIwfa+rYyO^%ns0`+9gcF68$lF9T5F2g$eBrK+@|&
zBhEarmi3LUh47W452l@01P|}=ZrZB8mrqO~=MP+Vq5I%0fJvTsAstJMj4@=IMA0@m
z2^q*06e<Y)#W~vQQpY@yerhcDB=Sau(h304veG8F%-hb+%gY!S41I(vg|L_VnY7AS
zyi58jD{KR;<QIkec}HRQviA;l=aJh8T_0We)E1@gQ|og1{jUOTL8NK8{i{HW|G!h9
zar_-4)c)B|XrQmM#iSyF3JTCEYLr4o?!|~=GmwfPo4?+ToHL~ZUDK=Yu-(Rd_LdV1
zMjSHtPr8|Ej+=eV-!XK*T#t4Bz3y%P`T6#M+rzRcfz(^@YFZFxL=Az@XcT6s{h@!V
z6`pXB9HWl^)3u5ji`|Y~&Q6=$E{A0T9j_&eIaaTfq%t|m-6f;^b#|;1v)Q3I-JZ(~
z+v~&lgggaHV@<T^0(R+8qomo)`TL@n**N<9{RDA8L5rt$D-1EE?TI~$kHRK=fo#oP
zDBMn`GZ_{H%q#|BMRJ0J;BA6<Mt+cJso;K%+8cnSYHA3G=68*}foG(54$<Ulb{K`m
zNn^VvyZjFFh(o<YpLM4~GZDX_!Ln#{naZU{WxU}%$8cnWbxs3)ciZdct{Zp50awbl
zn_D6fiMTd}lX|LALiGwSB(=;dCPOum1>MSiqpw{A>vtZvZ8YSiZ-Dq1{UUpWEyir9
z20yb4A8FUTNeR-Kn)8~qwi<=f2o!oA^(8c36?Lb^YRgEP7z(pB4*KClH&4aq;i>o-
zS5W&n_UTw)P>5H!fq2&1KzY!;H1=yOMXXo*Ii-?N7tKo!0XFpNgS<m`bwogN$G*w&
zU5GysO$?(Ooxa)g>Uw{{m5O*hzSY`6wv9Wj{<6Gg^M)T0onPHg{TwBgNrf^xA9n4I
zyNkjgY_Ed?7hmJ)UB?Bo0F6_ut^~u^T`aOQB<Zthqykr><ZduodR-CO53yt1ayGcR
zUzn%FSi`;v@Z_i?P(yk8kf+q1)M<)f1v5NpuL$(`?IK$J=w578c}hTN>IgO<jvUwl
z(Tkus1~M5vWPt+h(nV~lWb%+EW>N(+R@YOB5`)7*A)3e4rL!3-^2B2$nJR;JDudT(
z(6!IJ?6vSc(GUh-TM3{ake99u!uT{!py<7<6Y>1(2I&JnwIy)~R$T!{9!N?Br6gfJ
z{(s$|HA7_jzxoOP9;Wr*e&TTc>xuK?jH-_Jr;}~+P^$>umOKnAPs*Yf$Z6iGrBUe^
zSRNjYv3Zn3uYCo+BU9u?qzBes92^ZD{p?2&6gw9w*IpFsXW1v~6w~&T?Q8;Do*Xsn
zXm`t%cjwi|$0eaA<0ps#^OPqOD*rq3UTiC71JT=bWC)_K64*J)^wkgC3PfoO5Env~
z<%=JP5L@X2T2gnz0Rj9VkFVRqd6);wM?;BO*VKNujREGJ%i-o5%U6TWTs@YEuMSYZ
zVLf^yvGFdD^wF*p0#dOl;H9iwf6|bz78lvDBsE<oKomKws?0l78tKqtiN&BKsx?VQ
zJg`pKE<}rQEt(%olV`(a-h9$MLTD$#lP{);l8K})l%_4fVyB=dQe}|iW)uM+PuWIQ
zAod-CiDf^ivw>_AD9BBMowdp>BAPOY(QybP>sHqb&hHA~rX=_oSmo^0+1mKC&*P&R
z$|Z|Y{VNp~!(;$`Th5^hHMF23y7V~A)@tN)`w-Q*soM+V(%!vaw77a{xm7#qkEHx>
zUUHhyNiyGdq*B_I6)DK+H>oqJ^;k{6aY~?Yen5^RD^QOznUZ#n&NtDw71F<#S=!4f
zXh+n<Cn*r{!(E!`=rrnQ=X>JyIaxIb$0BOPUK1}?rS|5lv8wIA)cxR+PMPZOpDR4u
zhhmpMl^ZQ6OGts@oUWsD+~L!0#RCW;78aVP;_dZb%u`*$8X}J?HG=h09Gwdq@c`se
zk09FHL+4GkTzMBsIP7Xj5bb0zMLFhZY%5?yU6|NWO4f$S2FAi27pxMD6_C%2LLEA#
zkt0>A<YiV!R$Q-Y12n-pGpemY^b2v!mP(hXA-%}O<#9uvD2g=_4UdPsRti|hB0iPs
zmcHyk9TWGA-&M2yle1Yt79<m$5(na72f{Yfd9gc@`E3XG&3<^-RFp~Z^(2>4+0GhO
z*d^TB)-RL}gLjhe+IEr}F^G_u73vJ&tuq=C#KcL9R}FW7Y@*%>#IUd_2q7D!xose3
zTTZGZECs%A8t)q+58nV6pF9w0n`6xq#iHGIhaox!75b5Vy}m_yiFU~Z&~LB>N=w)l
zC*jU0N$kX{2C0$18-(R^oF(KHLwch}FA8vD&A|tciN%>~Da`~)OeyP5Gm85Rn$j{x
zI3a)E!v%Oh)As`Fdk6U@U?+W*l6taW^kWjhTM=B7o<5<(z*~`QL|NF(F_W~v{gktc
zF?hNeL_Ur%pbA~vr0^^Q;8A|M(c1M7!MUTSfL7EEvUm10tz=BpIu=+}1rTC=(cGO_
z=&)l2N2p3{T*st05^QCe@u1M7srGQSBW6f~bvDIR;jWU@Eo*}jt;mV>w{=7~g<iiK
zM>DI|P_xTJkwWB}9R8TkaFkBlqANXYiDEEn2<0U1=uUk!<KHcnjW9DPEk94R6>XZ9
zE&GAmnmj{QLz6d}sRTCm?&kT^H1TqK5AdPF9Q2(l3XLFkikQLEU1wKV6Pu=FSC`g)
z8p<{qqCPQJvwp77>qZ1;s1$Rg;xrsAKlGbrljLPNXK?&=1pj8T)D2hD+c%i;%n>~N
zz3{U;GDzFByd?2Bfkv~LB~58<?5kj)>Uo%p<P6f#X@3GM3!9(C8&+J~MNI`Ik9=B_
z?{^OKbX>6s8HQZHXWKyUPEJ5_?=TI4FT}eg!3lauu6O*I2_|lxY{)nDdEP2Hf>i);
zx@<#;hAMBr9o!kQ07tX$aGh}XmuEFE$T4tY07JP7ceAZaqcTSLBr~S;9V~=fJ?wtd
zq@@lFll;p7UP$<xZ1{&IZ;+Y*%3x|ZOeIIS&45yUERmJzre80UpJRq<dN5Gf>)8j_
zv?T<RFN#plrFuR5Rhz70WS8S<GErGsGcJ(L@Orpp`7$6=aF?#zRn?7QqevsV>txDm
z36HYU!8|Ay*x~hfU;2ljDuT!r7_nuYbF;JBT=s1w>jA^XDAFo$%4M@GqiU|nRfibY
zZIZQ!EiFnvbL98Yb{kZ}V(+o-UKBd=M1q1pEb}vy9m+pKEslD>NFoHZ$EeS6!kR|t
z+4#MEc$?5p4^~yg$Kp;>7&yeIO<IyQx<C3kY^mMVr=oq90wg}^L$@q-tw@F;9T6tc
zM9BAd6PJZ}DLGKg7O1LB(VD{zGNBg{>_Y<<X|JIyIwDp;RxiE}tFO}<z>Y2|zaipr
z_?)3nAWeIMGXTe1yEv8yFaRT>nx;%3{G@7k&R-RGzutau{`DS(z0uU)${0-aG$obi
zWeFZxkY(FIk3FFhWpy%)P!HVT9=omF$Ixrc@v!F+q(SK>Lc$9&2gQOqqD)@5e$dO&
z8F<0)``2Fyl+(eKZRv|dxr6lY)VTlc1j_Z#1X}zzY&E4Dj~}sGTnOB!x58FAhO@3S
z461Pmj4i(?+;2^P$!U6%-CZ-tzi(hbkpc(x4-iFx7^;7O;24*zqR<**v91$mN5dN*
zD{q7I-PzMqF3`{o7YKYmO}m3+uO2#ZlvH$$ftq-$0Jds;Uuy)kTt#arHTV;H5xN{}
zfUvibcAqwl^Ab8ke_Ja1__f^H*g}Q++6~%79Lw9!1VghyH<|Xjon`a}jhT(zl<s4w
zZuKVl@o)a>=;`>1S`5Owe+<pB+x7aHD>uLV?%XOu-S$Ol90LuzUBAg+i{U<U$Z-mc
zF)fUUq4m{yXm2TeTW4(<WWH3lyGd{$>(8=G-{k9eDd3MV$sukv!2}0)9&8+#(<vtU
z>ef>wQZyUkc4i&LP#<-(P-UA*wU{#IP?Q>z@352EF~sx9pL&HiSSDa7^sVv9>v6~8
zeyi*}l@yv>VIM})R#ouAo#Lt=ZQ=gGYK(2V#$G-9<rH;Z5X23i>YyzuNTBq-3j5th
zZuf{iYxu{b^bq^~b^#z%OX*swpCkp1&U%DMHnoml1yIJ<s(+{<?XR(n1|cpuV|ARF
zT|9U`x4|tRgiW!=%_K@h9BJO%)mJDIXOWBxaM*Yrp!xuxaI<bjU#_Q`m*K7#H_YR$
z&P5XWV_Z?|L(Z7>>XN6e_fpwVJ;;{(_+$?LWEJy1{*-CQ&n;PcKSve;7c38QzhrU?
zUZbpdQZVJ1(k?HD0p(hd)_E+%Mk5=02<-L7EYtyE*%(8_BZW{5c<NEvnvQ=B>~Y2c
zdqOI3)QU;wckwIH!*3P&K8o;&gZzlWe~wy{pg<~MM2uJ?`dCA}eocQ&cA!J`0G_`g
znoz4&&pF(aFY18D>3f}lcuC5%Cb>^L@0;ZrinK;9e{|XF8RO#>OZ66j_2v=P{JXTv
zwKjF|*!is|5-fo%cs`Jt=e}eF6#jwod^~{B*d&h^PndDE+hHH^uj`aCl|y&%RgWJ0
z-<fZ5|NWv<wY5k2Vi#jjL3%WW>8!2Nl$Zlocgff+%wy5!>l_?_()%5k9xV5y?8VSQ
zK0>BHYs*J5mk9R!+V*Fj(oga$W2_t9nBZ&R{XKCx@x?8E!4g6qL_4gD69dsqG@-X@
zHQCO9SZW%<X*KLITCT_WX}axF>0|IxVa%;}@N`gS55LBL22OaFU${?X@mPHuPYMxu
z--WXD_R(w*hIh_FM!;QjZ*rYRoWaP3ZB*>wSVF?DjQj9S<l-hpHb-vIy>)G0#_D|z
z8(9)AGFf!Yv}65jnf({DQ#-Fp>qWgv_o`8v9oYJba<m~FehBfxwd5EwuZr`8fO^mq
zME89V&69^@8T+IpdlLWfL+I?8n)vj?8iXCrNIKPaN;uk7dTX>gs(bBF?e!6g+_Kji
zj|Mi!Nyhp2C6hV!l_Yhl*pA2Nz+q5sjK^}Ps!%usCU<_tvV`$aQDzgVT$8F6gdeC(
z>%6cXfgNyXr6hk=x+ku(ZkXLA+uNgkcJgk270p*2yA}5-@yV9$R5lki020Lt(JL3M
zO*3jgbS%C9tlaSfihtFYG_c)Ddx6mLm#$UP-=?Ke_~uOGij9I?`h)O(CcFlWcz=is
zl3-N+5<fSE+5;<9$P;EF=yONQ86el~MLVpGLZ9XKvd1kdOe5a)kop5}nV@|;8Q&cM
zH@ZHsnx%y)O8YrRG<7Pbv}~#qW{`pcTo-4O{t5Sjf>Vro573PBXZhzKh?<8@hVJWB
z-hK5N{@2))|1ijleW7H`Rlk(tU+awj59qLMOvhgioZ?r{5wQ|ry@E=(m~>*b>a>F-
z2ET?3^`aYUSN8Yl-hl*V<ZN6sU_-rI@4N(afDVtvkHwBr0D%4s#kLhRIz#h@p1vHW
z969$X++^L(j<xri`aAg#49$?hL`Kf@B|I0W9oBq-bOPv&<pY78YWZ}g*Jh(BmNS!|
z;;DV-6|nMJ?{wPG=i;RmS`i4%1`op&_q5-Ob)tB(YO+Ew0+mEvn<QQ!aD>w38)Zbo
zXks2A|GK#WsB(hsUy3`(e`_eq|DS2{{>xDIzeM%_66Iy9{cAK$XNyU#WUp&8SaG4E
zB^0j#%?OT~00JRp+zD2?2CcU|m9Sx({C%JGueo&R%eLTk>GSr%xsI6XV9})8)H(N7
z)=M|H`Qu#66Cu!q5pjgR#V6Aa;tN(mS`;auoXbUyHcgqS@~biH4QCbk4LkUoMl!B9
z+~_TXz2nBNljN3#%xGnb$4K0@@?{{K%&)le`it{piH$m3vxfYRCVt;LP9XZzo70la
zbhEUpkc?T>nEjMZ8mY^4`g~0o@{XD9`p4xu_?`CVy;3cv;uCrnwtBt8=ggcxOuyB!
zNXR=VuwKVY(5xpV)VaQWssMWH<xACfVorXwWFvp420iA|EJ9Nl-L0V=Q9X}wH3Kw;
zW|tH(pUoLIjvnW#@HG&pe8)A~VzrgNF5~hw{32XRjnHf%K7%jhK<99KVHst*%`p#<
z&K>y`JHJu;lcM~hgCBR3Z)>3GY}ZqD_&&%7L-QK1gdAE?fQYFMXCOAnB!Pye&Ic5a
z{mH3r70U2CWc8Zv!pl_?i(sL!p&L%re2RYcXhHExSMyDUgJvK?mu18E65CaV$|Ks4
ze@))nb%--$5OMM2jm7O!=d^mxy4^%JA#p5c38@Wc*5##eK9M;D75bMhkamTZK{?>Q
z32Me4C^!VCV1=Yha)hEOoRo>)KO~OBGo<zrA-*3dyQnU7S_nM#%TCi1CDjq$?~f{G
zqqDEw5lwylBSyZlu0fvkGpSQ|I+uhZls!{>2IG<9qMyX;6iFgwD3odhmx>ZdX1)pa
zI*bh$Q9(T0Hne!Iich9VC)ofi$|v5QhwzB){-|aEa-95JJ6k-?pcYZ*atVGxO}Byo
z&m0i?i$Y>tP-76T0nAV;+WNc9Q4!JI4<$pRouBQ|ye6b0B%zgTk;+w=y;uLZA92lR
zwoP9#B>La(dj9wC$KT?oY-M>_P-Y}w%OyMdg~eB8{{YAbgCZggG)8e@t?IJ-oJ#<Q
zEk~e9%eMWErUwe&Gw8eW?)mID`$@yi{e#I)!`ru~574|&J5Y5Ok#oQ@Y~63A4rK|`
z7Py7IL}XE>+HeyK@v)IoK783HilK}&1ry_Z$-eU4Zn9vT3O-P*48$QR&gnjH=?Qg{
zjgVngbJgV1bxP+NIf`uL48~Up6D#7EGQnC)8oAqZ8@jHR%QE-LX^*D1$b&8#y!Oh1
zhIB0`oSUhERWDPDSeDFHvH@XK+%jg}nv=<C1|4Vmi4eqLR%~;)P})iTB8;nk?*2g?
z0WQfOp8+YMMvhcw6mZmgA>_`l;E&SM;I0u(3GY1=gNOA+f%JVe&9dsSwtYan#US@%
zVe|?ggnz{?syr_n`mdPv`fuZwz<(CE{=ZscuKyXh&aD1nBrM%vw!u-i>QSD$T9Xm!
z799pwNRom9Q~oJMeSc)aN;YR_mbxNec18UBg#&?s5ePse&yg+=R-HF9beqcJKFYk}
zb$)sLxYGoRy=IE^T(6Dqm4~h5P|<3rwd-wiNF`2mF+JCyN5k&fKBpqTH|yEc8h~q(
zDC5o9S};_6^wwV&xGj<i(crs=U>`)~M%tvMe^y4D9bnMxByIdwiF(aiZgLxxub+ip
z)c8AY6K*YtcqvY%^YTeY<myI4D5qHB_|72L+H%O)e6`HbgJ&<oE;)=>K%Ok5jF+TN
ziGrFmb4=L=?-uw8q=rYIbw<VYwD_cnV&sx4QOVX3&k}i<MGf$V1}Dze-~Bk)%q9Y(
zdd?vSgKi}IB8;UvRwLDJxYo<fg@B<{=a9Q|kREb%U(mC0Nh?UK^EHF~ykuHNlzOc~
zHyu$N=(fa%$&F}t#MvhEy|N{1jzP_rYx6_4c`T%wA7J7<@MOW|g(c`;{q+<}tj-o%
z=XH3>LYM1i237g|>lIt$6D2~ueFM9_4MR)79syMEmD>tdi_AWzYM70KphNcsOhce|
zeb`Vg=aT~U9G@ZX0t=TT#R2({zBOdrIOOQw0xRSkvj~BPQp*1sbo&D-j|m0`6zdG8
zX4VI032;N(s^FXP-s5RyT97k%oJsgJPL&@wr7}goPQi_Fxvfv}_79aw&nXru`d46>
z`nNWO{~HJJUy(so&-x#-NSg)<J6jvu_p((S&B@SqEwP|-0WA`!@*rw(Ldr}-)(bPY
z^o@{LZ?N14VHlWCApax}N@y{;=!73DZC}n_U!utLx4omKD<HRPqEOTI5z@#^j^^7D
zgS8=gTyk6nQI3nz0bi3n22iXlO&RDe%v&;KXwfe8lb$<op3`yRE!p<r9JTW4h|ta2
z8V{P#KJR>R!5Grj<)a8lk&Xul;42yOxg)sf+XA9wQ3z|sQy9QPirVf&-WKv}fV;?T
zRTD{WXsE7iLk<^xKVau1h_anmt#xlsLMDs{sXUrR8GDUPvdwiMbRD)0rqivW7zQVK
zrJ-cxl51`xUwoP`Tz-QU3GT&>ZMxfo8a{ki&J<A|CVX1W4~smho^e)x-qisiCKz1}
zE9X7iaczl3VJl`TS0t8}bw!<|xlAAK2X!`QHt9~H2|Hkey8y2<R{V|(ohCls$^T~!
zf7qT>;`Euh*O5b(W^wczT(SQaifD;V&iasci`?h!A19;bEYt|w(_y-Y40sKyG}<B#
zy@I+R*nK_nGv?}O%J0>_z?C^hCwEjOLjH-+kHDCtZc)*Ei?s-IU8xS9LDx~M>qPtA
z#CJ7rFlTdwK!lP&gO1Z+Jz8H*u#c>*91&Xst{L>VphuQT6wNOwly?x9`4$IZQ?~10
zbc}z%zSO!wO+mkoo5%l&<M#hz4oEl|+Ww2pQLXV!^UM13Q-Q_A0P7MnI#p*)O*9W5
zCvQ-wmm_QdVihN%S?i1myRXNDVoFY{`B%@cJVt@XY90F2Rnvuo%-`K_g6+Dy0*OUP
z$EPwXgl1E=SN6Fd7Y$F`{-1Ams6dWr-=?FV$nUp}Xc>s9jQ}l#jYb%Rw_90ZNnpT)
zH(RC**(qQ6D(J6&2Jxr#GZr><Wb2f8ikJ_{t}39WAi1SssG{BIv>_&ANe?h}-`-wM
zBmSEyxpBt}6^<U8)Vy4OW(L~~fnKr1ma^2sIwqSl!gFxajtX#a5>uQpcF1Lko!OqC
zCO<c<cmR7ifF}IdmSK#>$7!pD>*Y36qh-#CEwY)hBLTpcu<C2JJf*!-nPF;Z7oE<R
z{@Q||26W6o+#`B_hZU>fQw3yTX&E6UxTPGQ5<x!vF!B?3$KW1^+pzqmI!V63{M^d7
zQi5+1MyxMb30Ga|<6vs4x5NiH(IJ9~xmd}tomI&{rfzrx3c+L|f$M^Vl8$dbUCA;D
z91d%(8IV`dPPrtLUvPb4QWm_6M?o``J*%-*58#cma>ACtg@(=-C`?n5Ou;2?{l(+r
z4wHPXXH7<}-^2eqt~sjI3ir;cw`Irt93GidoGwyH%xCD@_1>Rz?by<O{6zm2=-0+f
zV4-Qzs9-K!gCqtn9f`^i15bv4^)=SL8eu8xdQjBTb$b-2Lu6Xw4YwUD+>*7-5T;VN
z12*lniHYzKLnqpdk7Ol_Q!D+RdWd+{C{rziktiU%GfMwnxzSXsRvgX52U-#U%k#b$
zeTa_kmg}tA<RnupkyVWwo!`adqE>k-$m${#qk#@EnE#no<EZ%rNewXDTe0$AsN+_O
z9AID2yH=JCy+rK2h3rCq0cA+MH<NGagRS2;bs|e%p#QDK&J~~iHl^!=_kh4yTJdf7
zUd`p@cr!Oq#rKU>dW}tbtd^eO>~`=HvjSy5ynkWW(<7n6vi(eA3UThCV|C=?>nl@H
z-6|8NBS;r1RWz;@asC6QL;hd7%an{gmlz3a7QJHe<^%S%%~pLXdDf_feP{NO9+a3l
z(#lW*Yhf#DPvO#J3E)l<LQ}5kl~LJvLCCRB&T@W;TBfd{49i0e8wXgr=HQ-bQZQ`4
zz&NC`H8D*~)z%Ya5x6a)F>jK7dkcjS0@2nl;OnNatOy*ep(Cz}*2MbS8!g7Vh&3JE
zxyYvY8pbMN95Ar`%pd&5xS2N#!>z(pexa-{Nx&oO;j*Z%*;?zE+p*CKxqAS2SXxj>
zi(`<Nqth`N3DnFXdKO6$MYnBdB-Zv5#OOu97H*#<NdYEx7O^&PKN~G7IeB>l8G7j_
zGuR^(9hs5XKv@_w@{w2;CNlyb`6No<)r>w$8r95?t1@^MUVQJcMSI7X47c2(dxP`>
z<6u)j$P2L!`FEb?nYQQ}Z*Tu$Fa@~s_if1t)Y;z~2C>oy&?M)YQFUAK2L8`rc$Dc-
ztIX11VAJBhmmKcK?dNXm?sU(H?G{Uljw)34uOPmve)c$^^D;#X@{HG1Ab<W5_JjjZ
zBqF~;-on2%to{$Ptc<g`o1u-Xp^NF?0q}o1YEEju_~Q<u|B30GUA`TfGQ>>+;bu~+
z%ck15qUm6$L#0HRQs!lrmWgd@Z03w_y!`USyAL2}Y`h1OnN?W@;b%%J1T+g6!Q9K`
zKlx6-J(I2~TD+Mxu1clg(bij55W1P0n{VFu4tKVA-E5iXfY(C*fhr(qfplcwWMm-R
zZY6~RCqzReL`mhPy*BhA3ya+~#&ZWp9@t23g(Sqhx;)?_zbp-Ig~&yk%Z1w&$U1yh
zBflIj4b}?$9X4Z5djmvJH6Z$&)#{V82b-)F&gjI4H-JTeoGQuPjW$5Trx8AU6GHSx
zHk`^m#GPXVh2I!ew1Y+J^)m%)k+(6;Sf?<1G#@N@HC^UJ!&{`mcH__^!_cxLMe5$N
z4mF!vvPA`l9z-;6PzqatR#e+Vk1=@GZpamI%0OCtMX2z2vPfLbD9k$EF_D&Xyg(<)
z*O3^(YOxGA!!U>Ql{4sBE#W9h-QL9p96ZG&noHS;4NZP_S%(zO<8^HmrBdP(o3r+_
zY-Dd5#+DcvCG1s_Rky4rXY5=$EIHbWMUpkn3l$C5Ma>I2dzmdWqs05JDmix(eQjBq
zqcYT%hmzgs{~Y(<s-|q50i~3BEw1BJvZun1eqF&Jfe`-Kk1JklHY^E2z6BxzYVyd+
z>M43)pf~)btBW;eOc3);RwP_^Y%1u7;R0W4yuaD~W<2B0EFE+Q+*<yDYa0UxPm*K9
zqOPsZt+EAOQ371Vp+>>^R<cu-att)im^NU|{KkItK$+1UZCfqMF_dnO+1QN42!U6$
zUx6(6K%l;mBX7wZ47Gs%#1V>am&)}ZEvXJ?-Ib*T5qgBGlg29wxPZ?le);!rTu{u&
zsXu%sR?eWCk(rVVRT(Y`;&9bJ%9J+jEv36yYfAA7x2EX<=-TzL7@+OsK~uHvloJB^
zdXGUIb8^Qz5g6AdtK?X2DZ5&{58XS!Mh848adc)Bi8?enGr`6gEMixW{A{UtcRi7t
zQ%27ZcJ_*iycX%qyM{Uso<$klQw|dje4>)X#+p<1gR-bre<*7j$cEpru~z(=#%)Ut
zDdBm3?p*|Xore%SB>?sB7!CY}N`qc|8A&)%h#!YLR&e|1nZ{+v6RES9)J}}M)g)`0
z5$O8n9(Fx>SwcsC1@ntUhhach;Dan2pH-E#{a_#8xG!^*W5=^H&a;V#`gW>+Z103@
zqhw{DY%L<6<~-j#p<|g6;aB{9c#HeZZg~FKj}Qlp8CmTvB_&y)(OQARoO}vvamt&8
z5oQbF9*)rJv@-5!T`8>QBoH#wjn+d8%em!LqJ=PBeY_>uoN>JG=FjFHb%;-qPXn^*
z*z~2H^UQBq)$l)QJ!T^Yvl~9lzd3r^Z~)=`Mkx&PjLI)YntYEa-?mepdXlogViMEq
zs5gMvAi7tb38O&2>Z_)K!z(4I+z;`|&U?s;_~6Rh#rL4ZU!=*AL>%T+^FiIxfx3_n
zdTinDF5K<ls#Lk^OwK<-m)fOyWzO66o>uP+z~t^$Bwz6SwQi`rTIQe;Ls<4q>_@i$
zS{ISKU5Y2DdgJ^av@1QxcteZ+YslV-!&{+xw`F(Xz!@BE_)4uaWUKNS^s^OdnFIFb
zQ*5w1LU50fW|zo*S)Ya*FtYyb&aFr>@p4dbtGq<F5hZf(CtRlNu^iXuP_20#3v#w|
zTU*@T6<h~qxl>6WA7k>tM4K;&=vtpQs7(CJusv}pElVo1mbkk055c#jd6%&()zEgt
zE1IdfL*RkALO#`aRz5cKy9DQTG>e17ES~Sv=&l%(TRR(dWwoj6pwPxP?ayM0b{1#l
zt(XLMnD-*eGLw)~b>e51n6oTkO=)@GemU+9xj2&#o{#$Uuj%S4Cv=s+1Yvh?V_2~{
zBXC9Ft+k4$=6dp;5U*3iY1Kp;|CFR`po2AE@?~4d5*4YT=IrcLPHo_;%sL9r==zS6
z!G%w%K>ebWsM>;m%v&>TQl4|dU%t#(+(rD#ERXiO0ggwd3W52<J%37?{N!=f>@-ip
zl&ashxUsbO$A_-1=J!^E%q9=I5X~gZo7S?%J9rAXcDK)Yz12W=St39+xp+f8gk~YZ
zE+!bNDVyHX+?-iEYx^56MQ=_)AR_KQ38CJSP(BQY2q}9P6s{xw03n&$Y=In#N4OdH
z25u$}#dfBM_WZ9;IvOoDCO`!?l_c(>Vjm$q8yny~Uq~ul$RI0)HbEZW7NUmS4Ze(|
z+$wCJ1}}lGLpjEDzyw!6IKW_=1+(zNqZ+LYS(!~%8FwaVX~v4#YVa)FFK*x$0dH78
z4T_+AvHb0Q8}FKBl73UB#zp=L&GS?~pzsba2+!LwI4KE+z(v~PaVCui(0Cd(Qv;K6
zMKtL-Pk5WSsaWU(2V=>&P+VF<ttQ4T+_!=?j}1mnlsw}EtQkg|e;daFzYx1pcAwY@
z8WI-RB!#r@E~92A<9uIxd|i7SxB9wY_M?$Lv5*Y|*vlQso~WJOq}}d*dP3(mRFq3@
zXibLeX_sne<1oElv|u-}EF>?hpC!h4$+`2!R98YXCiBsulNvFPbMBd5Y?{({57>xG
zPIGN~xlupOZ`5OcOQ?q`v5X+qhh_vsy=GHg<<Q&m5KY=q=X6a5OikxO<6c_Liht7j
zuODOCLucON!h5GgQ_bKH3E<i;ygIr{m4+RO0SHc#Bx*YRClC^%qs!kg5QE7Blo?F!
zR|32At(vfV3dY#tI&)wtzbWqW$QpRM=2gpZf{Vx!Nr^ih6i%Jyv{=4+6%LVrhU<nK
z>?*ERrf3|1^!#O^GJZcB1L>2lVDvclr6?`DNR-!Vva)#Va^=8t1hp<TUy~z<rZ_08
zmMdFP2uPw9{((HPKs39+I@e?FQN|RnF{m^!pPZsG*+=2NP^=*=0VP!~(V1X4DHkX_
zE7&%x{&MpkO%_q<!(0RpS$sjZ<VY9=U}U2?PQbn}UIgkq1pM3XG-7BJ6gSQg)Q*y9
zqg@Ka2E~DrE)FF>P9a<B=8D48{cF^mMj_obiwN2{UdwwVMv?7@n>g}?fMsde6;#hG
zKH00c?wfe04Od`OLv?eB5XJpY*X^r7XU65QQn)qMjJ~WB;ERi<Bs?nlK1Lo9S61Sm
zd4q0~|3o`l?l$X-*$qG_2H`Y<kvwjLc|xi|Z;f8;;#Io&hv>7+*ELZe8VD$q@ZSw%
z{=-V{zXlEe!e5CPI-CA2TGNnsM*R}_laA}i>Khj>$6Z^ZP>$43f&f=NgVuugL97Ib
zwe>l6;!Nx=)L6M6j0ujBV=@#FsiSdL+-9njcgAA`e_^GRlg3?s%l$s%<lpFe8~%Q^
z3ECPX17X~n(o0o?XbdKJx&sKz#D?2lMY6Nx7K{S%n_UfB#Atd*2sEX)$89y<t_f5R
zoKM)}p0N!KT)$5dsy|*z>ake4nKx_bt`0JHT04+wK3|*NNC+%Ex-nw$Itc-RH5FX0
zJ5LS#?w;XFTXmrmgIV5_Skt6=ZL)t(ZC$B!f986!5Hai8Qry)+Bick|5F)>(L2St3
zG~8<m=C{ArJzg!rT3?Yp$LuEl1AdFNraSURgvXAR=y$m8OY(YR3T+pDB@TE@%UoUA
zUD>+j_p7kLKyQ%452EW}ZyFLb>Ws6T(x3v`ekI5DHSm^D-Xy3RtI!&zhvFlSwV5<q
z@s$WF_COUz<TH$l2fw<*U<B|w2BmXQ{!QMgxG{mt{!j9V9w~Ms4!aQv-g5YL!6e4m
zmhaTOR-x24;|sy%C|A%X6@IL>>Z3EJjwRML-)Dy9Om33H8=e=%pb_P&4E46}cj$C%
zdF<rDK`3b|E+ws0PE54Y*lv(w;gaODh5_O7{Cq>Gs9W1nJ!Aec&EZ!}<Vwd)Ip9MG
zki$KyfslV7uBErnQg4IHtNU<{7-$(Di5=?4R~!Bm?t?A9CYyj*VrvLCwK>_f=bp$O
z&z1^2l~Er1)9feNuq6$1ur5{m5@<&_yWM#F^u<E}*=sBGbBPRpkC}?8Lg-xi{Sn#I
z3qj}5P>QFZzYFOOC#UPzu9{TkAG4RGofPE6^ao;>JsFI`i1d1zI>u}msPu+C4y}EH
zTX6K#kpZGD7&r$s>OIPW_y(I|PM?5sT@3eBZMX__VR32?1Wb4(iVL&--gtToDx*j@
z$1@VxFU?%AuRvyP^8E_S=M$p5YNl^`{aX=uSz}zjK-I&*Ppq-u%?4I9ptdxa$8avj
zaSu!zW^GQOn9Q-#bTe%wsipmN4-L;brN>^m$1Hw5rYNiqu-tNYIG!~n@z1Dt5M~L+
zv?c<$tltltyUlq7?|@0^vyKUt6qsh;1ZLCv(Jv{Vsa8K}7?jP*_4a?ynb1t8{me^~
z`2+t~1OD651ft2;U^V3HPXDimtAhVo176J3%+S@wMa9(F!QRf<RLaoK#K!b*B3GBz
z-#ia!I%rv8AtbS=Mag|bq%S!Qny45VSO$@d?E<-W-(P!nHcFM%O-)y!j~{+Z0^RD>
zh-2LRABWr@-mf!{_fr&|Y|B*Ke(C8Gn{OSz+MKV})4!M=SN=d2y^IKIJ5=^DHxf=p
zq!QpE*&~u-0p}q-Z_Jc<VQ9n=HzZVCmjhsGHAv1v!TMpXsK0x*S;I-vq+rrq3P32c
zxWZLIa$I-WrX13b!1%7j;5nTZznrajpiaSSoMU43_a|jRrg-Z(9xhCQe{$93&~}a~
zu~-}%a>q|c6RfbA1`D4ru&rEIsE`m-V)ZC(6CQv0f?->|4;M?1CbFR~6rRqM6^Qfu
zothSA_j2IGvYy|ZNz9`XaNegSM0ujbL&p{%*HDz_jB3cUBulTL=GL987>~?~=~BjP
z6M!}8;*g^MB#5M~;Cl<qfBWp|V97^%j}Ti{+AY!4ROhxCi}%Fvy8JC-flS1rg1czU
zEFIbSOmW~@nR(+h%BT4#>!{)ol0=0qg~QT6_~Scoz2O3VEX9k4hpO9J!yI;ELIrjb
zs-vFl$eWa6a<r>^t?d<=7dU=INm@4C+PZcFG;&yh^+hHC`&^%&<j$2g15av5!qiv_
zN8Pey;%6wis}>8|CojJx=P)`<H#uDpRb;#;8CLT;r#)b-%*HHC8Akl6L|4q~p>@y=
z@FqNnr+8<+oS9rW8dM(Ynk+DwSW>E4*jm_mP6?}`)~x&8qG$)ZlRLnKD#cR{(p=dW
zF~F)=T!=H7nOqJer6qEX8<hpVeps|$22{PknSxzXL_{Zy<VJWlsH(_EATz?3djd@a
zF<r$YC}A<e1o$Vkhh7h^iytdjF;l93OL1HJj!lYZ5_79FijOB{<`GwugTfI3N$H@%
z5w^%T?)*E%_-THGyS|v(41rG@yBrk+8aLLPJ-8ETQo1Yk=iVk3*3?P9IB^@{NGQY%
zaW=z-uwlnE!zUH@guO<U1HJYq>O|*VW?=gW4_JHE`$!K+OsY?D-GL4goN20Ue&nk?
zP{1T)Bec9=e%mbeg$mn}LnUp(lvXP7@Pca1M}DAC=9vqto{Iq54YB}69r_yBU#(N0
zq3O(q^Mim~*k_S})aMApVNg)mXPp7gR-)Z+KEt&(HECCgD0?m(N~Ycpi{He2Vg--|
zw-dq$Uydp7>7nC;ZjZ=CY)q-Ld8;5LVpYYI+D3)-w1D_jv2`y0?3*9!I9(W1rJ`VC
zJ(~F9KL0{VvrpClz=%vJz2h0TGw%iaUUrbz7dX00SB*LRq$HtHUkldj6|&C@t)WS0
z_@f)PRfg$}IqfNp>N3)XxzO#6{K*SC+CGTJ*ouP6q&JDh(aI{d#Xsn9NUV{tv-l&`
zkL8!MG?0sZOfd-)Rj6q~wANZ~WZYg2efnMM!)2i@<q<>?7I<f{1gm!&xADNno_yLb
z%Hy+w;6aIIY#r8f^^}gIYy8_+h)^#`5Hu(~?@*uK!p*?XUj1LOF`;ps%e-7-sD8hG
z^X{Jw;dpV_7ae&BbVZi$PM1Yt>Q<JXT0f{ol>gjm3dw1Wo#8@UJ8_)yU@vxqoE$JH
z)izN5fL}f<jTfAC00mz%D6H!l{;?D%X$(oo`!i6l*<iJ-nryF!2Bb`sT4Sz%9h?){
zx}{q?@3=>y2glV2GrfpSSaY>;_*GuE><@hNcXLD7s!>;rs5BI*{%LTa&Bog;ljeZe
zZU8kJ^F8Ng(1+6=nixQ6P9CjgrShUh$qPJIS6Euxa?X{m!w1}S;gLG&Xh%`4@j&y)
zIs5ee^-OEi13%fvlq0gw4NY}Ts>VtL`DVW*!^z2vy{$ebOIr~Ie!q{SpgwYSL(D-?
zc|VC)wb4v-Gt}-mtWoGg|9+ZeT-uq?YgB{X@RAam*N`rl@S|}a=tQm84Ywd5&|itt
zK&c0{MVXjLOD7BoQ1AGC6yyniTUW{x3zC)U$h6c4iWECZ8)J-WAdxFeqg$-<U@Io2
z@RUbmUF<=fk0m-I9#_i~-E^+3c&0*NwUV~1GPlnP7ePl*_s+j6eMl$4+hudU-Lk5*
z9KO7~jY&`T(32x<|6az)8y~{r4#E;OX#W)%ueVNn%(XFDafZWTqqO=F>IcJcZDCOJ
zpzV=AZLiMks>}Dx(|;<3_G{@u48G)`gsA@ql9{Tplcj^p-x?vZe^sdetWJ{^>a0M7
z(XvVpH59?6Z7q>;Ig40|(7=SH4O1`MJhLj#a?W#}9I0=CU#M;vFi6T-2E9S=HYeV*
zesu$P=KY-3I7XRg-j^^UgUe0v9BEtuyc;M&;tM``*#_}r*zX~Vv`;Daj;!+#^XdOU
z_nsn?bJMLCiM@Uu?tK*rGA|u3Kk7><xYCzob+hX?Q?%H!u;1wlN#DaNw&E!JXfn<{
zd74y^6ZZJDR}vv&Qwr7zq0m9M-rjMikgCis=vF=^%ZB|c``>IZ=ns75cB+3nei!=B
zvj6{YU-n-E_~MkeFDwkw@UOL$9C}PDs<5yKEp(lIkMTkhCFXJr>z+6)|5XB7JUsV(
z0{D0APihL3Ac{}mPvxPNGim5*nJJ2{mF&!yiEgt;zxVf7{2ns>qPU?n9}CMyW8Gdc
z9B8>_(qL-vIZLXCsi+`ra7FY9<^W-O?G%TIzX%p8Ekl!4Q}PXC55C}$aOvzSFYBm-
zO5;qb&Dr?!TdwDz{esi$7rqzC-gai+a=32mQ#YWJ@7>@zd8cZp;h09o>sref4(Tqj
z*=M5Y@bNMdRG7XX7Df($LSvFi1CvN%<;E6pQS+7B0o*@%G+FMQRtY5?HgoN^j>B;u
zO6hT|W>jJX7H&aiRju7Mu&F|Kni=&2QkyABmFwueBWob+{Wff1^qr)-TlZ*aSnV7^
zZiCvqvxE8O%Nnu{cLf|T$Xw(&NC%{xa$EV1kMOBa9?{kmEpCkfPbT#2H-_~4#zq4v
z`_=Bk$W*|3@Mj7vF9p9P;S$|Oqh9~2Hs)qcSM_#!1Ua9kBR;2^OTjmB#1u=|!Ycze
z5f%+KID>~jLWwj4yT}KME)e7{#*;J){Q2H+#Uq_tZOSkg(Ei%Rc_U2d#9LS;g?Lne
zwz9c=XL^x~2ydGc*NxIhNXI$n<662!_HOgERUW}84TX$s4r;T)RkmMSNECuKBPuwA
zDW2PsKLgaX3Q`j^Opj^G8GJ)OFT#aKc%$q{2UxJvLx7~mq}oqW?yrOyySk*SJqM5|
zSJKCG0}dn<k;b!0KGW5h?`K%00X?Ye1*JHRyfd+Daqe3{mmz70A<1bu_EMd{4-{vb
zbKZiMkFgV&*$nUlXSky6;)hhA@`7E5k!ZfTJI2;JK?HjU<-o0I1SS!EN%+BZC`PPd
z)ILS?Y*dLV5DfE39*oJ>$OZfX^Wr`{9_qv|970cv^1o*;JfaLi2ANTw_u~*X{E{&0
zNuSrH66`-pLs*c<;4r3><#q%{i4$l%Cn;5beHGG>P^ZL6m=|A@-tvFD9r?d?wf;q1
z(z4aW6-V=f0HGZfA!$~*ZbGO1DL*J<*|Ug}fP$k>#;mgyI>~0Uaz3;n5484sm2lSi
z-uic)+CARKCE}M3iEnd7-a~dCNtNsTay|WR;;W=?a|dkwd416YQf=J|K5|qQI1E0P
z<O=~O6Or0Y2@(e{CqknGcLZ$_l``fIL$89U10afU1-q`qLz6@znzEK|lY$enmZ96h
zS+6s3v^E!SBZ!je+ZM}dE>mz?D2=iGz~^k;g9_boTdjvxww-H^@M^<yz5S-##lxYK
z&fHe1DdsXNjpUNvL1L$T6q8Al619`K+yJ+6S#k;Y-7KsLj#l~5Mb-T$D<7UEeo3@j
z^dT0ABP}CVpXCM`?ZGafw!x>LNZNmuB=xAZdfZJNE6&dVs9*PtuVe&0LUoaC2Wins
zwVP@s#o97OSg*Jqck+4Fu~KW_%ukPteB33(9Emg|+&{32IJxx#Dw9g*P)EIyLOdK_
zK1p|jCET=iteyk7U*&Bifs?c9ouOX@HqG<$)*{A-76W=N&SED+Wnl?UGXq!we<{IG
zXWn+L9=jxSCKZ;>hh{v7fY`;ePZgMsn_z(NiEl2`ky<I$b2O5d(bY#p*g5q~Vx{EK
zym1TFsUCbMA*#>9n#?y=(_?<yj5x#5c7u+sNnPQYUD|@g->4iAt8f6Gu2KYk0B)Z-
zFE6`3z--rME*g^3xgX}V$pfVgFc_j)%aA&CYC&LM_fI7=oRv?@Fyt2V&~DAt(C<B>
z>F!CTnKD!wgvC-~4*7}ZfKIxslvh3yth8sl{B7W3+V;$JZXq%>+iA0d24-0;ud)?#
z>;(`(A_txlfzqwv2;2+<X$p>xzP7Af2OF`hbtWBdSOR^pF6Sz3HL3<dCt6`Eoo@K~
z#~c)Vi^(Kce472J7*N8Jg|2=gZ@x5-K>wLPv-v<~s>xYkx#75`{dk(sB38;_<JQ>i
zuZQL1?i%T)dla_*8F@hig2qh>fB2@@h{|-QCK;w%KraO6``#1ZO|*hC3c-H5K9f9!
zvf4axr7v^A2*v4IA0*Go>F5ie$<u|gB9F$`Z5eq4UYyu=SR$wb;yZcj`7^zGRw<PR
z>h}@mh`)AZ1W|vm27<Kfr(iWR<iq=E`B<yJ(LJiMR0H@A<taf#KC7`Po>aD`mov}Y
zzV*G*SnJX}Pc>D5V=IQJbWK}|e5Sd><YHvI8aK^TD)*9Z0K0<CpD<a9susfJpxN(o
zf}(TUt-`BzD@Xjh*ESB7^2xA2=lC0QFN^Wx!}z9w?n~z2rFl;5p%`bx4^3a&0SJmH
z1i1bn92_@b_{NGeFIpA5=w5DfLOlbO_i9~NO#1zvBbn3SoytF6f`!^ovhlVg0}KiE
zT)JKex@dn1wXwdS{r=#1BwZ%((x7-kHc49+rNX%W1qmuB9PK(25Yt=Zd+)Yg#~CZb
z>WW%p;)u+D?;@o^TpkHEW-`HXv)oIDA7Iq_KWKZ$=*+ifU$kR)Y}>Xww$ZWKv7L1E
z#5TKQ+qP||W83NIKI>iU-TRz9&R%zoyU!i@l95jt|5;VDX8lkx-~{e;n8&&JIoEye
zbFB25`?OsQJM_Kkmaov_BfYn5X7Iagw((aKN7z3F&{L4aFd4k)c+}C`-zYuNTK8Dn
z1CL85AZ8J#y}CIo?7R`T(Jdj;(Bs7Cb(Rljo|1od_C>fK#o^tmAr>QS(U|eoL0QNd
z<(H5IY39yIbvY3%dNs>mezM*2=>=&K{LVVhvqt}My7i&cQ{<kqsu|yQ^o;vQz1^Br
z5eEgbJG1{*3iLm!w}1I_Rj98i&wasqZ>&e4r&g7xp~+RJf`ADaEy?}v0v@45H13YQ
znuP){MY-a91>y~%50<vgbQ0-!F2eneD;zuv2k8~}*7UKxb}48w_sg&I1Dpw<15YEq
zf5R0GKBzSv?f{{H#ur5z&J2O-z#>0tD$OtlYldcmKF%Ua+nTn6Awp&jbBG$)YN5HV
z$>g%M&mi*ESElMHof2L}dvT2Vmlc4RV)y8pE4cE<a6$WdVtsF+u^sMa;{k@?HvoCF
z@o}MgTD`NOYO}hlwIQapN*%w_Lr`)8QR~*&y30L^!n20+7d9&m01*K9xD^e@ZE=f7
z#Jz_>8Pdk1Z|Ac89O0sUiBopA{_s4&w(>NZ*bi#7dYP@5!(dnsFc|OUc@-cxh+osJ
z%b~K%GJ=9>$F0`E%I_XuP@+w4qs9eLBk^Kg3EVjt$@Aa0aV;CxpG7D)CFK?mcs^11
zQ8F<)h`|_|))PSkn4T;?)4(5l{;j@Hqn0O{&le*9>^+mSxn;`uP~yNng;MlXdd>~;
zz8agbsN&`-P6m;_n5o8OlR`!3RAY&W-mZ9!;zYALU6~7}OVi3+m5XT!Frl{t`1_Tz
zkKK=&t|7NKD<6E0Ypht8_fOdu?*Z)tdjFK{2oMw>_3@9KG4$On{K|2%%yO3Np#?<q
zWErQnp9sM>!8HPz;Hk722%0Dx@Z%nR=<rtTDf0zpM$FUTl0~fN#*!L1fWrFrtb>oP
zJNPgsaAs-30Pqci3TW~KM}trCY^-;3N=L_oF14FKH_(JFNLG@uc|MK76A~qI3(pah
z2scYvCF1$(-c6VOe&JZ}#UF-?$HD8CjZJJ6H6uL3?S&r-^{xO};RTB?4wx<mC(`<a
zLL94TbM>CKCCQ!&pogA}cMCPSMHCgp6M9xd_1hbA`|$*R?U<6ATfK)z%nu)%4JBDK
zKFyqth+I}s>jg=p9vq%S2qvIPIE%@`Bib%7-V#aG++=G%Mjn7X`13NUCzdhfdUz=s
zX`X%cUa?4<y2FG`JWNo;T;sj!YV6N-I;U1<kEp;&qW#}CJVO8ME%ASzB>wv`(V;45
zH}?fC(<KuzGKcsJbz+q|f4yoiLs9alQYr|NU|5h*pHsg0f=S!@Q&GIwCmDN?et*L5
z7-7D)oG;toQD9_Fbz{uT4xc^V?$-_(KiL{`f5FBCquWycL>Qr_Q@IoVWj}hBrj1fj
zOZOD|iMLP&)XAp6(vEGJ@<sTfD3WcJBF<7mD@jn{i{L3O<tP8@0``?GRUV1RbsOBZ
zi1<!+Fm@c#N-repthfc1sKE>^vv0C9V4l<xmJgBZ(-smj1s8=TUpdn83MJCI*A|X#
z(ycyn@wF0Sod(4p=|=){41s%Nunvo<&sj=PD;u~)F#I_`Y7!?8E>eA~`n>Srz^5jL
zDee^aE3{u<^f>iLYWChQPsrHik2g_Ae-~;GG$5htAl3wVhH}q82aiu1`7hp`<n<CL
z4Wh`uK-IE0v~@qgSM0=a3X1v5-tf`lIz*-_Xk$OC?I;N)Dab^9W#-dkb`<dra-X6_
zq=XfZZbZ7`=QG(NlgIr0x=DFLpUs~=cKTzhgO>uhJn~tjH?BF7)#A&1)5^hF{{e?n
zJ4yd<sKn@(df)43?A!pS7Q_^%&aJ6k&?$ir&F?CFIFZi~b%S0ETcw2F|KjI6Q$gWP
z0w1A(zvV^#&w}T#cDX}U*KUppjbDBaQP{w=8w>Z>ouM(x$nSckFCwPh`Jaiye_s^n
zSxKIcy3!K3Zxi;w5fMCryaFxUwFcSTzf_2l4Lw}*4;}s<e16|O<^1F_4~pi%-OZv7
z`lLa>D~<gXTl%pe{(@M<(59nri__&R6J32i%9KPPn4#WvU}Ee*vb_81wz%0X^-)`A
zJ-h+*V<Jjnnxhp2F{0M$U2eYJ-Ir*{xbx1ie8*m@Z1G+Cfh@d;qZ+Qgy!j3^*Wx7f
zspgZy-uV**mO0eu?YGr4mZ*Eb?axv2K@F>-F`q3fN}xp2!ZEuP9hKuoc`8vx8<|6J
z0d616X_Jc=8dPq4h?h3wNcH!_WIJKw;Z46EJ1#m8jOF#aE2Wif3QmAVCQBPEl_6By
zW}(`}0F5t6pG~4kSkERV1*FeP>_v&2{D{_A%TgRN49%mzEpXtjsKL6&YnCqTx>x3{
zippX(hMrL?(&orwRto1~5kx_^^a%v|<i~}mc!&ZTk*9exMYq@{4`5ZBsl75hV}9=p
zV!9K`$MSM}SfbdAGVI`C^px_FIr-8!#Td1(_YYE{$)D869KUiX^#;p^%(kQsF>a&W
z3%q3lTLE>8fhkhj`a_n=XAoQ21HpfB%`Wi-BG!SSH1q#sDE-w5{8@*Pd``I>m;eCK
zf_m=+5gGEcSs9s6YOoMA1<*=~BIKX7y`(TQH!M2Bxa{|!dV<yQ{uNEjFa<PtiX?`X
z{B?D=o1H7yzh7dietlXO*^t0a@fkPn35gIx{K}_eTFe(Ky($4;P_WMtxHcbVkZLJK
zo{i}F(%ZiCLM>*d&2wOxftxlpB(&seI`|1-piOO<PCdmU6c<8o!(+J4-bxA8!6dU8
ztgLB>rqH+Dx}*MC>`9}2J8-@eO;f*2mT#9vD!8PIT~by;0}vyVFvphs0kOu(gP~a{
z*Nlt1(j=EvNYY5+ac$+_uUarl_mvraJyjT~FXTf*!OO>rDv@6=<W|7w%I&_p9~e<D
zO;3MB)V_#3VNY_nN|w~Z3UXr^D&i8Dsy%Br{XFRSPjM&~u^-rtloEvK52_jgv8#e4
zxTtkr%@ft!VofJyQLh}&e3Rr0OSu-Md0JwkZjF(z)HB81dAwiA83RNJ#4f7As;Bn2
zxztSdX851(K8s^>Mb$xovD-#&5}n4<SK;+OJA=NqewvCxiS9Pd?4#4LNwAoVvAj@;
zRteR34w#k7?l9)-5>vG&KFo1sz<73Q7F{g(K(z-9f>tz(nI%1B4zVu{Ma{fY{?S=l
zvZr6{00V0NZv#sBpIvPKg|n^b_-_*9pM%8>4J&)xujudUjSbOsywNwM`V~|R%gQLv
z$dr}%pwS6zkcUE<sXS<-TC2<91-f~<1r8qQ7BU`*5>zhKcOV65lHb9<@mdneXEf%}
z3qGkp`hxUbL76>)!83u;|I)2kw33lCS?ObPA8d2G>^N*Y^gdj7npzmE;&(#+f~$AE
zO|jk<5Tg*b=#zVIdHodm^jdD=GZ_NA&bWIkP~MGc;;rQDI}(!cR2vC3dW}w4di4`A
z!CkWc0y97#JtoAbcwotUIi~963Ywsz+t^)akkiClC6bSLS6g5n&R@!VEu`oQANv>m
z(4#l>ju3VcIAojr*i$F?FaN~VGOI$*-o&lTIX3o%3`KYmcCvCl>nmE;<rF*x$zrZb
zve|E4mHqRHL6yGz>?mQ;g?A==S&>*ZHIkVLD(Uf|c$f2NtiC!?8Ypo++}!^2^f`-)
z4XFs5Wt0iw7_1K`TI=&+ct?VTcwb3i#BjsT2n7no<)nul0-3H;!H=Q4ay2U+(Q^SE
zv(e6cLijj`<+eHoWSBSUc@B9sV!|&walucGTocO-hB7M1Hxq#<(q8we((f<3>8*@e
zc<L%4iQ7Rm?lXDPMv77c15F#6H1kQ-K2mIom+^&WH?5AM>~5uf$8jJFOgpXO80qP7
z{;qJyHs}rqRTMdSO!;`?Wug0y36X?MXu9|)u4sUD^T)kw{*)3VhaW8GM5Or6V*B4q
zM28+|b~O>356%`<K)+{LOsc~`g)`rrfKYooN)rCcQjY&-MrzAok4zqCpKnb9wV~~<
zZOCO;A4Z!;t;Vc2#3-1kXfxoyQK!O;4%38IgNTFKtAU$Gax%Elf>-TaGAtUH<%)8`
zOi^DP$r`!UGs%A@IgOhS1h$B_3j$=Z6^;uD7Epm6Ezw02<BM2IDqbzTiO3BvlEg&O
z;!w(-i2<Ia%n~^lIzK^5FX0azE`-=~WX}jupV`usioTFknWA-|a{i8&V#hF-WU|P^
zzCRp3)#j-4P{n58C11BkAaQRW<r>RsJrz~O=S<5@Wv+^dE}f}4Q)g|y;Bu*Md|nKA
zZ70goAa3<k<s63qTdx}Ema;&~u|&0oFpI%Bor{jxGj?d_+iteD9YI}+fF4pU9GTsU
zD$+C^qqbGR7Ob@j_3=#p`MfU6v5$fLfr~rklq<%kHIOIAw`%&TF*t`pWLTb>n-eO!
z{7uYCLMeWyI1=_7j<&Xz#aNFKN_*LZ#pKruZkhVV`Y<qGOBp=mhA6NV@d|Q}u-Fel
z?I|atx`<5I?OEQGvsv;)^k|xlU>bfIwczYWgrj3s)eU^i5uf|lmJHFW=bW6i7^Gfb
zyn#@{45VvgFpl5Awbj0Q$E#viDM6D)2&gwo7?N<t8!;I5qp3H>IIMi52ZJvtFfO7}
z)!^)Ehg&;_j-e2KOqJM$xnc`Hec6sGzXd3X%{jAjl|#+}aNuZGMU@pwjP9LSCSR`M
z8J=oT+g_Ig1q6Kqe*AVoPBGy-9dc@>+w~CC>yALt!q7I9)>s_<TI?;>`vp1Jr?EEz
zcZ3V>L8FT6cp){Sf2*PJ>6*2jY}Zuq^EN+<?YM)C!Z)%kRrWcERnrze$xFO~Rw1WE
z8~T%Z^d5?XKtnw;ih$qMIh3j@HlKMOm+@t$DCv$;c0R$_L>#7bP8Dpl!`8jxxbWFw
zk0nZ{5gzFHgu1(#*!m)Tm8-tZ*Fm1q>wl)nahXw;b#R?sr*S-($@TT5+DY$P)HOv&
zEotU3LdS>`6P7Agph4|B5n4b?TuW~WZEr{oe@*x3o@F1?DKfb5FUaEHZhAEGg&%g3
znmB0|J34A$VX$Lzqo0~+g^rDc+z7@G@h~M<4gVomdkED9Cg)0=%CQ?J>9>w#YOwH1
z07IUL;;@v`^sW7{OK~3kMrJ_kT1G~`G0xt}P_TI~e6}$<7aX}?u6S!=hn`C0iz?Tr
zUvxH4o5Ux0o&33wAf;tuIenKdXNDUhCG@Z1d5OQiaG_-f;H3+B9D%CC*KB75gq(*H
zKgi|KsqzHR#<D?tXu>(u{%E+m;SNK0hqk(=TJVU3<&Taf%S#~jWe~Plk7Njio2GDH
z8xw!RFgDF8Qu15{xzoy001D&qwr$)q=-18QQdBeqLPlBP_I@~yr10LXT|e+ejKKvf
z?CZYbA5D;+=~H=A#4w2pnZaF(g|TBGnF&UY!WHAdmS+mxmlHMg3zzQT{xnPNr5SHV
z0^``RwW_QSuhPal@=+C))ynd(tZj)atocU#AZ9d$a;}N_aPqti;#wP2U-P)OY!x)|
zRgri;TgZSz#vk|9BcSVhQu7X|J}aR&Iq$D9x0Nj)4tHIP^ic)l3GQ<K5SKX(eMf>N
z4|^DPC$^Vz1D{}_7bi^Ltlc7C<;+vcDPh4klBypM+Z&BnN)O?|I6=XTt?-@SS928I
zAzdB>hBXL&3Urs%zoyi`ek~rVs(@HD{gMfRV~+%;(>nkLrznqNm3^4b@(W+5&bqkl
ztR<4P#g%`_HnjntC+f8C9@k2`$U#JIWuH}7Pr$0Z4xGA)^IhCFHY(co6dLXokk?gU
z+tug!nw{rYeYa*E<-+ybWlJ4iGv9d&8v9P8;&F##tPbCua8p6XO?%$sJ@}r*R*-HN
zOmSI7y2bMyk@Q=Fd#W;M4iB2Ia*(Gz)m0((dMfIPUp|IkuC1S|gZlZAY7~|#r#XQ`
zSY3*HQtrNY6K|%RHZGBjY9C}oF@s%k&`Q~$6*C3g;2ykjS|YYtI6SYGY3-^$*YB^Z
z&zxorU94qqfvoSAmd#naLWLVj6bj6B8#4_X+f^Gz6UGhT3FPWl(Sj`ZJRlt`(IZ$1
zaR!63@$!-Z3Ng(!s}!3<jKui$vS&?s!VEC_0yfxcql24Q`v`TJ<gAACn%5du9jEpk
z_pWRAc9Wh_<6Y6;$qYO8gtAn3RzC|Z={2<D{nYX*R&zlNRBH;ncST_|Dq=zF4B|B3
zsd3n5$Z&?xED%v9AH@D1zwrAfzDbhgijX=?9|<+CvRT8I<~|DJB00d<Goj0s_EQK}
z*3A2MovIC-N5>A-E7cTZP`3jqRMTgK;leNn5Xo)C?Y>6)Cj4#3;)`L`3vP~MSPO1a
z+lHV86n}w$nAI;$E6%@#w-FH73s|XIa8d-I#w5yRyPxSG`PIj&!6rjuU>I6vb)Vdc
zEt$JIesohh1(_4=H@Rjr4P7>7KmLTtC80hP=Lu`7ElRF1>-5rSJG-jfLUuxdD!w+%
z-VA(|C%yeTbxo;hz}M?wyYlB^jjxBc<TXJ46yR?;k^itk{BKaye~&)??M3wP+c7!2
z@n<dxtkFUv5ft>W%p4*IyT58!@Lk@BgZ1dnee}9a;D<D7*bL$yB2tG3Pc}(L<RkJX
z)~34Kv++7suda{RR|o?bE9`v5L=j7H%fveOP)&3v8oknKY!=-<nrU2nzye^m(dBm9
zg@@$mXtRe>cUi#Arf;^*s&PAlVX3d-cjHq0P1N?a9H8Ehs=YTi90HQbLc4KdBi+=U
z;1P=^#ed`B1ZCyQV}f`$tZRY05jFy)oy2<kD|WyR)0d^Oig_c+#Y`|G$|WQYKSJk+
zmNxS<Z8p|Ld)dBk*p;!rW=xbFdld0W7MadvGhXB_Ad;t;H0cm}#SCYaqmmaDWPQ)z
zhA4XBRZigZ_&@NQ>{M%pe>MhDdJmae3^MT`sTh7LKmxH&#*q+Tnx^lwJ>`9oSihsj
zY4Cz1?CVjR#vc42f4aTK9%;ylrS+PaD9v~OT7OIint~*#o{k&1q8dV4+@usH4v5pG
zw3mBVAAX`VQt;KgPzY9Uk{i1Y+VCBE6FK~n$KhLG2;RiD{zY8m^B9hLwR8o$Y#j3*
zBSrZRd*6+Vve|O8FP%e}j=xzcH{;Lr$KuOHMi;4mPS0GbA#05;^9oKvZIF)12>Oq-
z5Ay)a*62BBrBcNk50Ao6QalE&wF!3zv6QD&mZyrbv8?+mD%CgZ)QLB4WSz5#0n9k$
z@YUbf*uLdt_u;Pxw}%WlFb2#>No$wBB8;ZMP0Ac*s`wnf_#CzjYZ_wmf1UK8@tJ~h
z7uBD=1(OOkaaF%~0h5A2A#wO@L?488NgqL!|A3`p^5dd!ER8aMB1oH`JW{xrzwb7-
zo=$Iz!jd&-(@Qx{l{qHN8Sw5+Lot{3FDov!5D%mzAl`}hx86bj!zB1?g!4xd%qgPz
z+CC~n1tX}ciVBstBIE~zw$nuzrXjPCf3A(8C|Hj)T8i(ad#YlK!+P67ypq74Iv>p}
z59>}p%bat%yuE8*_j)*ejQQ~?xjJ14)`J*UL^6*nvMn`%nQ^xSKFTn^LYqdA`KiW^
zhoet=!XYEw;fRNx)xvVKM`EJh=VG<Bpy8{{2Ira%scd(HO%?H7;l(uqFcB;~PjVy8
z;SCfUtuxxtWghu1m=hU<+s@S>>Mm}>MItEQ)lZj|F(Eug>gBq|k@ld7TeWP1Aw_C;
z@azHB6ZOw+KO3et_<eqnOu0`mJD26O6}rb{N-4nsZa&qN$|SlLj=b?af{vM|j$-~k
z&SkPJ6V@*CTT5L;Fl3E%x#G2TQyL@*Txa5+bJGEM%8I=hDZgmUhZ^K5^3JZcnjO2U
ztgQ&{02F41&sl$`;^+Xf40nEk`tb<RI+_w4%<B2%(Mh*kag?C?%R~}N-`~Gmj|QR_
z-{ycy0djz8fbhPGcC9ez>MP{^<FnQR2i*|s`GNKYArBO+?*1VxfT?r~hXuA)L;VVr
z*0}+a+XTMl7G}(Sq}n?v5qq(UKt_iog^Jas);zpI*Fv^m|6WvYc;*WHF~1SX3!Z0*
z@!|9MyCDAfw2u5-eIoI`V{XkS%M+G~3$nM`;h7UGO{>^gr0kt_Y7K{XH05ht6#Zdx
z!_54jAbQ(8Qsnh@&HfokeeR%5B<UWrMsh|!rieMcVwEvH+9KvjOiG{7XFcp2pfXPa
zF1HBIQMMlQ$!GhVK;Q7CU;;>HM6N0FQ;)18sDfMw=jsLK3NW*wOeO%td}N>5>j}0U
zH0llcdZ0DyayC4a<C1H>j{q|O)Ks>B)$d=B|KcuvOad?k$p1D4ME=>JK%Gm{)Y={>
zlKnUHNX*^X)ZQ6rTlD9opdelW=%R%+_=DPSk%V5E-e>^>1rd5s?kqSc94glmbvDqZ
z8F36;+|?Y2WSlRZgylmCevykB^d;Ekg`)xSv}jH6*-UfGexBe>X!-5)jNZ+g$SS#;
z7Kcwd71dr{ZDklk>_e0Up8+2>diq(UcK;Dvq>?^~E4saMx~TnB*{tlGcm3R+e!@Lj
z7669Lw5Pr9(zcH6%jeclmDp)COh8TUJhm@HG<=hDe%g5sUw=6=To<@GolJwK<*-Ds
zgpRncv7Gfg$6i9XOKXQ6t2F5WQ{bR+OzoEdOoQs%pw2<!w0U7EfE%zMMzr<Td{LkV
zPaPrwB4=9#uIM|U2dQ1Y-fDc%A5%{%Amzk}>!)zDxLj9#)jdo~x+V^bAq{_d=|Tz5
z`w{VsSEA@?WLxVB#WgB9lgFeV?@NOTe>%Tb1hmsEMXiQADJK?5&w<v7d&VVDX5?j8
z8XrL7If1ti0%sppwX&no&=%F1tNdjwYWXcgWUmI@n4WJiVOcJPvya2ln&tSLO+Y`%
zJyg;SYavEqrQiG=UPE<wl8(t6$>Ib(oeE~&*_^u^a>g}{r=EKlLiwMHSWW6tx;EfY
z$sdTA{P(<T(SH^zQnt>fj<$x@e+`$&)SOHm|N8yUV5v}+QvjM<`G75thJ=TPLfPTn
z8IeK(cW-^lHIkGid;eY_`^|7I{=9L!$>RzNxJ8Io2z45ajKI~LqRwu!J;mq4-3M%1
zbVGbad|;3uXQ$=@kgi5$!pkzEiaHsi;2C#=_b4Xj{{vi}50Cf#H7P+aNce@CSEgB}
zH>XU)!q*5p%uuG;xFTrGX95-XB}mJh$MEY*PSZ4LVyoeBDZLn;lk8E&px~hmc_&`&
zw^#mkYc)=sOA|Jv+636NR0zLBy^6s*Bu3)49?|rXVBbWl6g!`hpp$sQBGNcmT=w4k
z-)0=y#>T^s=>x%~uk6clBzKuZJ;N3hcyC6{+d?}N#2lZYA3ye~a#}hGdRJCoG5lkh
zDXltfI3$J*!I)-*4KX69(&Qnv>%4G1P-!XZlm-fuIEV4iw4N3Im;s{N(^&8WkLwwj
z-v8s{`j6E9lVT`qXK3>8B>#(E7}FySv=IV)%(vE9S&3aC@Tr1>Wy1!f1W=*z(cKBi
z6|L1<Hj=IQa3TI-P(u;memuZEKK1I|_j>z${|>SRVjQMyL`Ec1#vVds&(fls?;$tX
zm<>@$c}wq-PuHTQHiP?B&@8t+ebLI7gF`59;4b*w|INpYoB=!=N1wLidSbKQ3tgSp
zRLA6UxYYK9Dm{APa#60JgS+2DqzqfLjjRK;naAw2ewMLd9U5p+b&B82X0rC8($)o`
z8ytu~f#dz}W0yPs{35Dau;;lcCRr_#I<QR4K)XLa<_0Xs`x-E^1%My)zyFxx|19?Z
z)AZ*L8914^i>>h=MN-w!(cIMeuTrV@>yLKf{enZC6P60P_@_u_vx_8zpBz#Dm;P9I
zx#hh#<;pzkHk(!39l`Ckk6;R%KtyqUpRa^$gI)dZt1d*fR0(wF{EyjAotLjC8$&<r
zeu1R+SfjvFpoH#*2gq{f4!as7r3XkssK86r81weJ$jPwWVK#aMo~kj7dCoY=YGxaU
zPG!vAVPHYBhAgbO0G8t$sIh*-7NQ}ZG$3pzK8dS6*(djuovt&#`M6`<Hp-^txV11K
z#AwK@Q^Umw>BcE@$*5hl2HZtJj8UHsCL1q|d&;?S(za6bZ%gVe;ChVk*Ad@|NnC~7
z#2FQseVv0Mew%JFgwE*Rogjta39PkkEi~tbcVi8adLW*Y`{8UMkn%?V5`w$ddxia*
zAS5#<DZrA)8bY~zt#RMorf!9jhQDE;17AV13+7nR`|*hSN}Tp;M1IE%i)R@s7tYJ!
zW7%*bW$^$b)TlKuR7-$gECx48%{F9)EZi&&N83%3VZ3UBpz=|e62WTL<XBEcul^*O
zI9cw8`PSC5>@yope5#TIC=5=-E{52E%etZiDscapZOGC#8SOA@<Oi=4<oVIQl6?sA
zM^_1pDC>LEFVt}pnGvR$i)f3-?PC93Qq8zU)SEHFg1Ym#LS6>OzG3}gEEb6h*uf(`
zwWI8Uw#gs(@g#R-GjfzPQe*Xq^7WhsS{Ljjj9?iAo{zJ-@ZQ4kKSplh&i!+yyJD`8
zBn4>letiN+9U2SdEj-HZ3lROr18aE<t(5;(g|s3@7l6ragQ;5|FGWXmQiT2_?e9za
z{Sy3+ln9p;D@m9?Fz!1?gG5Fz)g<b1FjIb^8cjV8xdI@9Ori(COkm<1mhDWWJ4mg?
z?yO|v$R&kM)f_%o1O9eSg%wU|kFjJQy+|ch{{itwekA4-L6idvO*xRt{NLw?#6QcA
z|Ipa|r<vbhx}5*CO#t?>Zm2*8VIjR{t>&ttWE`hhF%k-~jfWL=ZUH@qh8B_H&)jCY
z!sBEU&NG>c+}zxN+yD|hKR{+4#Ou~|#^F;2AHk(HM-By?jj+X3T3S}iBk;%RaB}a`
z&+h~53*yCyMogX1x5<&^@3$-@sb~{xEDT#&NSgx#NWJciL9WFtg|QfL*w}b;Mu|zx
zVDv$nI`Ofn79KFIM+h@$WI7mcVl%0^HDt>ucrcf&;AhwqCuc@nOy5#hL_G)DZqgGJ
zG}2^X<eFMa%3At$sw!7k@f2k5KI1&Mmzv9`il=KQ8$O`+6U!}~^}$2sxfq>g8dzYn
zv1I1hsLnm7Cj8hruymo3U_H+h*P4(kE~Mz}7{S=)5U~idcU+e}fa8WFFF9Su8!t&7
zuym*vu;alrL}^pgwEaPCqMBi@{L0ezY#K+G3b4tK(&@E73oxbxJS8SfINoxlDb}_7
z9UhhQ6j3;qX3LRDWh4(LCo(dy!n5~6i_mgkUgN6V26<I(Zx&gr%+;Bc4eWRV4D*RG
zD8!_L*l5$HZX?Be%ncIi`ydwTpEM`39UgbYZ5r8hQ>9NV;}`2<M&_fp2ky|CU;(ya
zl2!A3%cch#DDpEUxfM=Qi_NC*pMM`}YmXc|ik@C~@L+|f%ijj@n;kJ6%>b-X$wkXX
z-~g5idn%3Jc%A!sa~IN5oyq5-Egd%m1{itQYsJv7rB<phFw(D&4YT_3<d4VV^Q~L1
z^3qM6XsA#Qr0PxT*~Y57(vva<`<zUg$rd$BD5YU1@)_~J!r3xAZIecXMJi0()St81
zreFT<y4=L+a}`7o?D<UCGeY9}ILoA0PUhYH39@VxMc<tM!ZmODYZHeEQ-P^eFLOzd
zq@JbuIHj^eje}^zQ$l5!hyZ07GI}+LL?MXzGn1I2Ja%;2fdsq5b!FM-TU+E$5R5zI
z5E<2)kpimKh+omXgJQ_NbGK*&lCIJMbeAi(oPdj+AvzPUk^)YfbGEF!Nw*6F>>Lz(
z+@AD$=^>h~1A_?B*LxJ;!KUyKAbhwqFcrmQ!5iLSTW9+0_f|Nygz&0pmi>=zGQEBW
z2E(eE8Ug#8hSJVGvt@0CsJtbUEU4rhZW?)SvJ*e!kr+ZYc&ofl#5f<96$)zyD@}EC
zH_U}~?+v?^^t-_gpa$6M+mew6a69VA2os*oc%V2(#MdIPz_~&^QYSTDVR9Gw32tw1
zt##HB%Cj`gB?9EHFD-*Ep$cX4lMFLgwW;1mW!h<mZ;`w-6A?|y9u@sIF<TrjnJqId
zGI0TBNBvYvd9Yd3JiH4bDTX2XgQ{@x6E<T=#u_57rL@AAH|0+qDXvTE?bX4)yS6`v
zM#Zb`HFTuzc-s)<b^y66^mh#@o$19X#@D~5(Y(GNyxc7WrIaAV!ZXEG%+p+G402e9
zxW6kVJs|xq#)PKbfwOon5Pl9XTUSE6N*u7DG^(Ez9eDKDRDyAGfx&8(<4;YnDD*SJ
zenFQ*L=Ls{1TVpkks4tbX0M+ep#9Q>HZb<nhM*XWd|GT)cHN%9yX&w3%`YekKFL>4
zf3HXtkXRkEL-(5hG7ILp5#bg3J>c%;oOn;VIwPW6*t8ny^Uo!SJneNb+?(!1l4GP`
z#S#<m2sS%LVb#%4>6H#&yc?v$5<BEtv3@l;3!fkkK#i_n&VFaNt!vGiZV4~+F2mvu
z0m;)!12XNm6dUI)c05;27o>a6;XtMuJff)#X4yL0o_8V9-kGaU*Pe5?JM1xEnJ_+3
zw;{?OrY1;o3|2IdNF|jA5f$5Go`o714dhJgQvyyNLP)9>7hxOV>^u}n^%_S(X=*J&
z@ZaGhq-auV_DGU>anPltiyiPDotSFByEO1L_x+$1>QKZ*E1u2NNX!oqBf{|e^uU(w
z&m#Zbo}=v)WXEGxjBEc}_8@lCk8av|y8>tJ7`UVSG}6=o1ENr7v=0uW&m~{}+|#bm
zkUBLBWJH>w{oOSp`OmJA|AJfp%SQLFzlj<;8~)j70eAnZ0C`#b+R|X`-q2d2V#wjj
zio(wTbrV<?p1Bz)JOVuZMnh_UHpBSD<2;3TgpYv9Bd)$c!EVBRcTVb?8MJTojBT8p
zkD2_B7ZVdzzlH=s#tkY^na4*><r!`rv@muQtA83u^{|LoFKv@=(`XQT%{5`qFC~*_
zx+Jt!dh3j=$t%r0;<cG1%A~hB{lreD#EZySorxdd-<7mD<!GVNtF%t#?UjO5#Rgmi
zkUsU~$U#3QZ8MYIyu5~5nNBgmn4}9o!ms5HPtxZ}nwUy3jfX&*S_SXD*P5$`i7bF&
zYZE*M1<;AK*|9_}7;%c`=#-zx|2FKOCZ}oTN-VOmj{%x&?dWAk5lPYkIh0MK(;V5W
zW}%g9yv_y+o7MdpjwM7ud5A%L5u@Gd`uagM@sF~};wE#&D6gq-82L?$+%rr~7T9do
z?}nD`FpbXQ2dE{oV{n#`lSqfa&8M8)ocw)TY^1pq1y}D<3sz;4<UTaUdZSPCIM`qB
z#7<5Ixs@7-)bRBaO2q{ikUFCL_KVUKtGunHDClQcDet{4;<9-VTvxT77cX4)_2ziB
zT~}rX3W-A`KRkM=OH{?6RMDH_6la2M(ZQPYz89)qd_c^$-$WQXmKAr<pQ+GW^s{;C
z!|E|baxi6Mn`NX5!yo&JGsEkaLiOEIsvQyHiis|!m1mZ-$gL98k{%V@0~bhf=z^T%
zo6Mjq_7m}2*3TJ;zw{&4``!0l%;F@-KVUx&s|S8s9|Du?1mP<UNU@Aj?U}K+CxM3U
z?qm;8s^0ue#;jg2@^d0anS$b%pTt^<Oek6alqf907+cs8%%DgZNfauu(4$cZhiUAJ
zmMXA?6|wKXsmC1Tw+kTn|1hKh*D0dG?7=A%>2{%U_$+%l_s$cDTOXq+;bMgBaC4``
z|9c4%rY)5ChVO1};9s_+{c0_71HcY!^KVtr|1fp_SIcR#|4mf}Y{}d`{!E<-4Q-V*
zakO`gNYkKZ9!1Fv3UE#k;2ThqT2ZT)JQzokxj9%bm_G7Lau}J@>DvS4@6AW&!W!0`
zxrdyr$-5GTH}0(Lq~I0}2%V#RraG<j?Axr%O#U|W{a+uRH>BSQymh0^naGuITSLWz
zAY>!1h{i+A-R;!7eUJs(d-M;$MMYH&vN_>Eb4g0C3PT0j2Z}Jo=(cS@E<>+&bs286
zLm#jGKWTQei0G1;72__}myf{=G~4Ajx?$x@>3)q=lH-sYFex4xNp%_xtT)mM@A-rh
zPCIriD#|Pe#A2L7RK!WpwAq!V*t6i%uJ2<@6UrH^awdFr8|UT7*<2+}V|(llzV}gc
zSN2oRs;??y*`kpY(5t~krSf{xQL+`4$9j5*${|%(%==Lk<Xok<Q-`o=Dg@<HvkP#^
zGHnv8eXTGAY%b>dSVXY6i>o*oDdMZUm{Mfvs7HEuXy(PW+S5>2DXl0zx3M18sH=q^
zYt$5i2E&Q1)1rp6=UPsJ!i1tC9-68y)|+xSPF5f6ETIh$W4>9i*vlGMEAj~|jVm;v
zPfk&%x3jj%M|#(^Zz#r@Q5TJixMEdi3kT(lZvn7%s8+`8Zh0ybB*(;cKGBP>@Nc@9
zo>UT4qeJI^8<;G4a{z&HeEaS(bbO4(C0ep=QFvy3W<F+*%vCv}i(O;!O>1*`YJ?QV
zxQ|KWP$AYY^dYQ-WV8m0+-=MCD`wwrF6WQ6Xm=XlL~FO}!VFG+DBF9-rbdQ-dd%A*
zf=VN@Bo3p|pwX0$hpRpMY)X{MEf1KgEj1W=4O8gM{ZC2u=u2e98pffSziPU#M|)c=
zP~w*jnmq;wws{cAu(pOyAnZ>Lz9$E<agbXZYIjEm>3X{}AMxY8k-`uft8`PM2n?9R
zyG<d=n*KI;nPRA-W|rwbgwGN?hvs}vkQWBgX9Az{6=zOtyh+zANl#F9R?}2*OKRqC
zCEJn#Y<wJHaY5v*Rqi!>%bwHGT2kXD-lA<aAGf7~q`tP2Pl4+KwY$CHIB~&D$_s&m
zd3FX8HpDk7%qz{F9q-ORp6{GB968HOSRM2GIor6s$_-xJCq~su`!#$0h#ylG<E~AL
zDbr`(XH;3JPaR;X7(uC9X}k6gjEFUIXlj<daZX1uM-?XNQo|jb8-Bkh5eAv%-%I((
zvU8fyHu7|RqhcZdZGD=93-`<ZHQcdMtj#euFVUum0@0=`cj`0Xfn*Y#4LDCH^*K)Z
z8NFn1vT$80{X=!);m9R%rVauG$HU(fj;cWEr$DNhr9EQy0Np4-53aQz_(N8OV;|(T
z;!Du#Q1KuE!#31<ejFf^MQa9fncp^X#t$hgI!tglKP7v&=W=`E%M+yU=31Z~^KdQI
z)R%RU0V4^FSy^+)B(Q9LReH#^3_eX&#6*Xc!deOiNOtUb0WzW(x#L=d->9OmvTyps
zMfzd=cFiJ?+zs2AGeEPNb>UE|Ydy@?Fn2hyJg6pWP#gEp9qw_lm$6=NSY)FjWYlrq
zwtJ>H*oAS*)nob6oVY`6RC0;4b#d;s@Fx#jloy&hC&NDl0s$e<Se`b!eye+x`_4Ce
zIJbK^Hqzwm0+Cyl#>ScXE$v9wMN~<6A>()fXiO(xV6mKtAV7zO<hQcHuxl}4wzf?#
zzAMXjgV6O@x$;W&Ko)lUF=+^+^83ttC7Zntzo~Igx%N+Q(@PN2P=z|H8bW~GbzY30
z-eun;|7ldAG{2LF5A0?#{#M^1{m;6Y|Cf^dZ?JVj-3HjtAo*6(BUA`UtEr;t6MchW
z1o6fc^}w_SDVe)mVnYoec8ISh6&xnqiX_^F8dBidc}l^1oXwS_osC0urEpto+c0<g
zu{L4)`0|4INjy%0C@jOMnH;btmD!y|CckZqV(y?I`AE(uIlGw}<N$+6&Sw-$yRPnR
zyCzoI70Wa-oxQ|=YPzMcgdt_#;{b2BdeCY21h2JtFDs{iyN*!Sp7UIQxk^%HFUUq~
zO$Bu}goV-@rg@+z)ypO_){cY=nglkssE&|fcfg77gD4Dx08K?uuGz^#XP8W^d!MlT
znG?Zoz)9bRWqe*lOWwf!b5p}8e+ZQNz_eMU(aJb(r(H|5atz69q;@pAEK~a=9+W{s
z5WAF&zCSU?c``gtTlqeg%zjkvHvgemhWe~#ihNTyzszeD{UCT0yg@22;4Tr_h)&%R
zUsxb%q*CQu`UJiTZL>N%&j@M`qYAal!i#pr1v1bFV?T)}w0k-kk!k}EsK)vj_hlR#
za1lWi7L5DaN3z?>U)tSns?1>;Qx05e^B~=EK{)*5F6^nL_KV`f*$|>Qk5G2JN7LEy
zU?w@}`Le=B>~tY(x{LGLJ^j!)c2Bx?JadQ#b`}?79s)kgEEj1WoPr6RfzqIgiRoT-
zzx|Dy8;j?(47nd3rDQ#!iEuAVpr<njSveCthuSepHaiP<`6_uii|m`%sH$oqvh1oW
zJsIF0vSQOD;{wsG{Bl}(D%8`a0I8Q9@GcAXHYgej{FmiRs5wJQw%pzi-R8I1$fT32
zsvM^B^^R?02eS)_PEYh@;+Q_m1#Ax@=M}b<NJ%?D><ku+q0FdCv$1?(y?5kNahs#Z
zFDQb;lsqMoLJcJnzqM@egOkNy78b={7gqHNS;p0h`I#}uWeN7fAxxY*QDK**Qn<aN
z<ikn>y%*!C<3w9jU>ikFHuO%kX{I*NT|N|SEp{`=ANt7o=pByiOj$!8=0f}E0QTH1
z2OYLj2?<=wi7NlJS%`s^81hs~E?!BW9uSgGHxG0Yl&H5Qo#6_bES*&t2UoqD^Mwb?
zc}J?ZCm4jDVE*lnEf!9OPR|uKWD!Goq-_>%VNlN*=!Eo(cj1R@{^vndLEtP43K}jd
z%}W7@d7%GoXZ3$6jsJp+EB@Nw)L6mqmDxxHTl}O|lbBK#3L8MCK{WFn>)TT&KgYg7
zoB2h-=oAZx_cIVJMoc{dE}J2U`c57d)v@RLXl9<B=3{1dxmLxf4<c(w9C+KD7t%(-
zGMsTVz>iAWY?u3ehCqV~2aA=-)*ztgn|+#FbE4YC8BR5JE&7n#FMv=BHCYy>G)xzr
z2U6(w9=-e5^mFSMy^W|7*XjnVt~~^TezT1GSN#Vk_+$Gugd1`&azJO^IeVqM+*6g$
z<r_htGHrgD@HQ>O`C#Nu&KlA~e6e^#I5g;z%CkD!x%sA=ZFBcDl`~j%pHs9gOaAC)
zGSTO+y5xFd_oY|Au1d+Iew9kl**X4N_$6m3ecSs9ki^iR@q+|5-Z$TZ?#N&~9P>F^
z!=a&SGhs1-*BJ@cNt1gPPDf1}b-S_2bQ`3QZqI&17_k=PH?#FNaUlX<EpW*v{J2Ky
zfC`*bYEiulsRbZ2dN5gM;q3k-+Fm&KRHGi5y5N}QD$)>ml``>td_YsDrbA;ESO+jd
zdW{-FPf^u0?$4AG1XtE`2JLyF2k=$qsZVHF>NdrX;D-oLD5MmpY`PSTPhBk$1oc+)
zvgMGWh81P9%3{8c+*8xu=$_1r*F8}Bzz6PeFjS>})KZcst<Tg%5``a|V$oz)<h^`r
zw%KurxY&fhuMZPtD0+eZnU)@YaR}b=)-2oh)q-8-msEP)Kn+;+&JzgAK#ZhsC_0pd
zYy!y@ejuCHHBSVwPGBcXrExP%o$RWo-Opx)PcH^PVtM*oMDhjuB)708Bi}xV@_tYf
zL8Zq^t%tJP&BA;~d*ig-C8?;KjSiO5ku;a&2oN~xl6ifF{3H4$X&l-Bz;}h~-%fVr
z{@Eq=UyzSK5f3qUXH#1fQxkPdCrf8L$3Gtz6)L(iK)VY5yvDioB-4lcGm*P#WrcVW
zB}-`GE$PcS9_zf*GZtRjhb8YLsJpyerTl4FmJEOHN4<-o7N~=Jn^({+&>=LBaNTgw
z0RsPXSbdf(D)}0P>J7>KA~C8BvT)%77)LqkmR1-IyxY|80-+j5ib{A$XgUgEl1(l8
zgkpr~yWd`F7mP&?z-50=z8S}OwJN{hd<!0RYo|p2EXrcPWBaQ`J@Y<KQF6m0+TAC=
zB@!WR7PM?OQnX>Naz5GO7GdLA9bA)BHgO1-WXr5;N_+z7zahu*lZ&kRg=IG1o?LSa
zeoS1Rd2iC&rlc=%>ON5>#m!s=CS0)pHsTwyP6hA@c<v`D<{+y0PKzCILPG{UnX;I@
zwbw*S4;qlzVrjy}ZCRei8H~qK)Ew**SVZwH2m0FzMPGmolhrFiAhxlb_ib9W@yg{N
z2l=V|SGYV7zVi56`1T(j<o{tr4}=K+G|&3qfx(J|U*CXR1O~gLc5LGd3ze*F-t3%^
z?Rcmp!C-=2bF_3y*>J9;DKZ?gTwN)~FAli9lV&3V0uZ-E!pud)n2EG%tG!&OGM}^R
zex==>zZ_P5%FaDE?)VId!l7wC->r=C5+Goz2W(*WMm9M6PkWN(q5=l}neQsZ(nk~h
z8|eu<5&9l`Y_TrRAsMkh3!fSh_&9SYdGyX*!+fPkn1r4v(j{eKPx4+yu#QK1ZK#Wr
zRXJUC8u5gm2wD`Si!mXyTuU|Vx@CL{t4oV2FD#JCzK+n5V9C-*7~R|@4*U=T8WW9F
zufoI(sM^!ZjzguXP-Kg#zQn1EoASc%%WoHhyUJcqC}Ml0Qj#8ThQ?7S*!(ma<;zp^
zv%Ej%yeI=^f9<Az_%GCwOw@hK@~-b)o5Vt=U>R+a7iGC;4bKeL=;$hlnDf0436KQ2
z3t#YM1PGY<^pR2x_Z4h>tXZt}mGvR3{ANzgQ)uE0Pd}8soU`qN4~Fu*I*>vEH99#k
zeJo!dXwvsej3DU4o5e3PsB)T<JHL1EN*u%QtDup(XJtb`Zc*(*uAtZ&*_hcOgDw;K
zLAY&sHE8O9JlGSK>7D;e@3yqUqd5SKALzf;l*s?HLhxT^b7JoHra%nT)?C=o*vi?_
z(AZSP+0_2eN{|#g0YsM3f)&1<FKac>Jb^Qu4E}^ereV;c$AHwigPA=xmCc|K@s<8D
z5&TEgq}9OD!?Gh??5}5zrQE(>|AySc8G>1biN=z5ydgaw`IZAo!9hD^Ki44{HR17K
zG$9OtaGT>!IsNMGQ5KvcvxD17ATk$6s8vHWWWOM1Zba>VrF^Z*^XtX*7)(z1eL^tV
zLx+Hld0FmbgF`l$ebYpIKna<z${?GPb=3RP7w-GwGI+*}VyUEk>*9-0DfP-23Z+oU
zwk2HbkIma5HDv7k$rq9gFIpBHFB+`Lcbs|&tpt3kZJji;qETU(tlO%~{_h`hGX@65
zIeZN~eV<Rhl($)k@>8pw4Xl;7Vth8X$+<h*{W<dr{zqExRyn-j0*{6NZ()9g|KYJX
zni^V(xtiKK|L3`M#P!I7{(<<DT)>hLVfla{y4TDEGHdRF^h*lw82<RlkkFvmn!mPT
z{~+g$@CWK|dPaf?ff_YPF(GSyaOpkQ*)G5j#x;-~1BlTDsLQ(kq{pULWptQaXUTMl
z284xqINQaSj2H6Z%Qfq$U%%?W(K_w?a0U?}C2!*kR@b<hF<QQyGDp)a*{uwvSPTsn
zmSF{~ez9WVC!bAJ282x7(>eCA(xP9IOQYwCLX}ayd5G4LxRIAbcMi1XpO`5}4dYcx
zIHIZwWAjRxg>F0WPY(d)I>gLr<drt|&t2^cOe3<QOUm3^4-yLwLYH|HOiyw{MvcDm
ztDPUKJt=7iI}M4`Ku#`h8xA0&3nyuNZ|JKBJUlsCnX1|H7i@c1RCLTL3?=I}U2S*X
zWyi*SK17!%JtY;1xw7_u>HeTbl^O+sXUF!pCHWto-G8G${tpaQ!qgc^x%umMjh_Nq
z8=(z#)or*M(od^eCJFEOi(GFNQx2EL{sgTN3e0~zewdNpn2cYs+3oQgO$dYf`1C=w
zo6+b<#2=f?Jsy*C`O?mLn<ePy_Xc?d%S#Mf9CD?EctzHo{N=cTgU63n(c+>3;&r!P
z1{9ax=E$4vEVe^6D~NPK9j7e6qTKaRb9(B9$N1hnV=&RQgg=Lml2%cG6>#Q|TN|ly
zRg<)u9r?n6e=?(Jwo#>wi-D6geBG(kLXhAs@%3Bc9%iC$5k;PgX)DaihW1$~@3|7g
zRYwaK+iIK4#r?-<ZO4bNEJc?kIqWpj_wE@KxwFp5^$4$DdeH5fu%t-7QW6}6h^sBL
zsf^wNipFZ<$OWI)K+PY`!oCdTnC8kV_@2O1nR(@sGmzO=+c$nBb~Ph%!d|W0tQ3A%
zi2wQkKVUAn{k9bqf}Smtutluy!Jq&ET?09!F$AgT5O)Ia*j>gM82TK$s>&2B>xy`7
z5#Pu?v(yZab>!d|bKQ-o3qe5pCl9+M(f}kF7y*U<HzMHw%)|cob^LF})t?cNrN}Jb
z_XR0aCLl`gQ%Yz$30tNpx@ZVGnM52_?5tfhIT!bjytcZeCZ(%S1i@SqLTHLajmvSa
z=4KKvf7VpZ$UH1c&>E{mqeF08@w!!p0?!&3HI5`_1uIRQsm0jj^W|7Z?PU66!2bLM
zZ#(HwQ;L&+P*XT(XStlcccC(8GQ^~K9eM*9ds;!JH?wQNU5#z|&WkeC=JUK9kN!>O
z()P|G=7PAs%PLk8=m4SP+c$@}ghe>zQ==)&Vc%##FtfFj+@!;k$V1k%VU5u~#NY=4
z5)Aa+w3;8$^w1}0_v#^Nhvhr_=2Mtxu)-rYYJk!W%pWB)?b=ED30M#-fgk?ACoBBJ
zwEHKW(7%T>6)M_)=(yk4Wo8pWbq#SJt^8TYYKbY-aERp411<M+5$-qSWKSn*Xempc
zwA;V;gYBdd0(Yd7lBpv>11Fd|T~3qcFQ-ikKS21pvv^9IPj<BM(RJJ$`Ud1Mo3Jt^
zl*jg9L|UBOx)qPp6qzzFWa#w@XB3w?y^DuuPcpujfi$tq!5NcdkEI$~PWw!{6bGF<
z6ae_Rj4aN+$+hk{&{2WId-)hk_%bz8#9QtSZO1XXkdz;c{%~bi*i(H9w4D+~_U~w<
zKyt9Q_WIo3Q8TdBxvyN1oUU<khxnZM5`G%z7pqYsp}j(7EBfr6_$Yw+g%sn$2N}8)
zkLAqyy|6EgJq#w2WQk1fHFv`YSs^l7Os~ZZE-I(#)37mVCk{b4(Fk19X2l1e?zV9;
zVd^}jk%ZY&J<rt18(oN`dnuTyk<nhT<RFE0w^)?nOIL=i0X8js8(f<s;NY5Bciqgr
z@h2>N#z#<)%Wp+B&&|(ob+Gg#v1~D9Kjb~1iz|J=y%dCDTvoHzk9NV&qclHd$(i_>
zz*LZUu*M8|?}%qNvp8Xdr8z^I-+K1H{2(HDhcrSz>`q?;cj)}?F3YT$*yMT%CrzmM
zevidUbqSRi0@p10&cd*No#H@lPPu!8R)MjCSMM-;?Kt^;)$NaH<61H3y#_{F>EHHE
z%Kx7(=>OE>{;vee|76K@XuRm7EunvGni?(}&IeP43xOfSFr3_kN`qI_em78xq$=TP
zzy=uNr){i^PohX>xXrnx3(VHb{kp7gkh4aYvM~N-Ip_BBaX05=4)7UgXg#xS6&we0
zWil_hAHAlyA2)ptyX-n4enNe~7+@;DGBf5P#K34EZ4Z%LdgzGq3ZQlCd28ekp^{|x
ztGu3Df=q?RUSWN>tCP(ff_saK#y;}J#DqU#2{3G-l5p%M;O(h^czSE~!#zcYVqR-*
zK61Z5@m;=v`gw&Rde?kr+?4_Cq|1efz<Z(v)kD5g1JTF4l7qaCED?`vE@04rpVi>2
zOh?w0r&u8CE4-EZ?Fcz!1d{~<|Bk&958)j_%#|-+lzZ`nbk71Gg=@xEuEP<Pnj9XS
z!0Kce1(;|q4>^3<sV$f&GyG}{T(QYox^f_POxbtRUS4EEySuV&^j(1>#Oc0y4*aXJ
z?qa;n2E2rfJ!2oD1kUtMx=Z5rbM(zmnx46AYOSbH<~$U`T`e8{tZ=!q18xtkqHKVJ
zNZdX3%KTH)+VP<%QzpaMBZq=261|JGE7H8Un$>Ks8qyU$;M+^mc4svIvsvBYycrzI
zD&%a;aI1jPC^G>7A>TtRJEf0WX0C5nE51t9Ksh45h&thC+buXG&#g@X@k>m+FF!Um
zo0<oM;q-b!9uCAxBVJ}`&S|NUrFiCx=p?mM(O%HlUJkn`)XlkB`7$8T#NAy;2~}sE
z_-s>nes4H-Gnp@ha$obtqz-fHcvF0X(%D#RF{Gn~O>tP~dWGy}U~z}qg@$6Q?T+8F
zBy9KL48l8x0?T2DdwZ@Qr>_8XWk>V3TIhQXZ>Z<YIU7=f<tKpR^&nMrvsu67Ko}N>
zcu!e=$AwlEB|KwS2I@r051mL_Y=WDisnXVVt{(h^c+Fh+$90ehp`Y_Iqe>0K>Df#O
zV~X(n*7@b4qmE`MY7;7-VXKbAkt0T~)6{T5eZOdOEpSTv@SrEw+d;UGG;uCqI&4j*
z0)#o>>*x`~aSQ0Uq%6}_W$6v&2C%f?Ap9DE`uK#!SRUFU=hJc=RyvpPn=b`>3KrK#
zI7xK+)Bg`|ZxtNZvTcc4wwReEi<z03nVFfH8A>H)W@ct)W@eTwX2}*=mY()L_uPKb
z@p`}W(cKkM5$kK!M`q5NIp%=$#zvqU;|c~=1=piaQG^)y$QEbu;=O^R<=H$j_2$F8
z80<q<MpKyw8>I>}O)^n`oH=+n+GG-1a%g_QcP18idJ>PL2yy2T%#p~4kw$4$G2-u=
zFbmh!3|$>#(E772JvDT|)QL^g2e%5P5|urV1MSlT(^-l12(E&=tGybX;y*stadY8+
zkUQpy^D$}{TC~U8n|?VheV2qRlpct^s{rKgeSQyEL29Kv5Mm_TfVs*ZYrm7|Mho{F
zRgRm|GIr=l-oCDqW(|M=v$5(IDRudc*Jg@E!M5V+0GVG?NV@{rsd=;Q__EQUdWULB
zx<a(S`qA#QKUW9rN~Qsc_Me`E0sIHHQ2qnCq+P+i63^7{WP3Nr?~0y&mdiVlj#2=r
zf`#j}d{3iSXwt|4|Al^+KjFD>vgCDHwSi7PW|%bm(x7jVhU!QsyucVEcNyTHi%mwb
zx6FN!5H}RyywtL=H%^}NWN<Q_Jz%}>#;!yZC!S5X^9x4)_AYO3XVeYdJwcCFB*MLx
zPNNsDe+O#q13f)y00(}Yv2XFY*|7_M?&2U?#sqdMP*oeEt$N)(lI=z`pHJD)V?6Bs
z3*s|hrQFm4aF_A;HIr7*%J?YvUd&{eNrvm_xo`xu_`>;u0}kW1ybQ7Zq5mNr+FX<J
zDUpjExx<?RHSN~_`C(74OXV`ow?4}{{9zW>RQ%=@i}2UAE469Dy+XO9rjE{rk9-1Q
zDJo#KJOPcVdux7l5;ncSrzKKkt!FT5(N>UE{bNVdb(k(=bkg<6$P5X8FW^L46R>HX
zpY4))X|2On+C8jm#be!Sie~Pi7p?tvL&`csY<cD1<OKSAl?T%E7F1cb#ONGWc=k0m
z7?#^^5^^vwfeD{>Ere|@A4Jt+PaQiztHbq6KSA&I+U^kTb?FJns~7(p3CtGWc^8QO
zDOrUO^{swh>N!ps)Kxc#TQty@!=myPgp8<9ZwOs2^h#!c@Z7%0F-YJ${+G+vL6Z$}
zvRB6?Ru_Pl*j34#>vIZ$!eC9|<1d!BF+mN)ua&KWq~cp(rf&%%$hhZeFw1dZ%~5^G
zBJ^6s`L@$S)(-PAn@+(?82xdPuVGgVa~Z)}Pi*IE1iEeEaIIVTc12W?v1UvS-+tMU
zXJ|;L)T^zo)zQvo=u{H3czi8v%{Rru=|)+XW!r$6`x;eDK6fazZ1!?yuypH(KCw_c
zO=twjAz!5PbYSyxe8lK8e0x7S57qr+wNQIU^<+k=UYabwUscH?+U>`8rC|QR*8-45
z(0x!~6xeqk5`*GQu%r@^Imn8pIp86Dxoi!+<&)#@<>+M7BgXmKtegFK0B-4cVeiUD
zUucNsj#s1Ce+-lF%U*xv0H>c+a$bV%pXiSjogQLO0$L~dtO<&YBS_30sOC2QXtmTY
z=e?Z#SV4WIntFle-)V7TK-_X@=o8?eZRtoaNY=B}w{J3Eyy4n2YwAw?bj8&|XS|7=
z(Zxco$zm_F$n&ka5BqmY{dT2)dmr|<#;}f8XS)U$j#u~Ip!15#8u5Hn7Vh~jV<_(3
zK3<oRuJe34ka%9HCDQt2O$+mK8gIOI&p~c_VQNGjzS`ADuppQ=rL21tFk)wTNA>pA
z7$SnYAauR&+TCAf%|JkL1NIyzV2Ed5k*|MI!Mv;lH%sizf30cUq|R));3K&z74>m~
zXUoH*-{U)97q#~;`!)E|+;(Nwx-ISWo5B(N))tp@1+cgzr{E3TfUy4hOwbc6UbZYr
zCw67$1Gk&^DEa!1<?}CVV=v&~n&+ppmM-2uwb?5Fn;V~h_u9?s|6-@CaO@a~5aj2_
z!H^DHPA!8kd<k3t{RS1z2pSAk#ICu68A#(vlFk<Ug7OE(cLr8cn0s-Ch1vI1{#<yo
zv7s%)(!r6(`09F|^W^vAX65_a?-P9x*#3%9&#3XyY=#U5y;wGxr9!maP{we2YzGkc
z!KE&Y5maQjw2>&AnTb)~mq(CM+)-h0Q*BnF3@c1c)y)G5CKhs<#pUS)iDxyZ3}#tF
za@b`@z#yW$mK$G*?V6e(J(`i69W@(mLva@@>TYNJA=C(#&^7Q{1juoWH4xcytIMeb
zD@zSeN{@34EgDRy3YE8Ly{Qtt_E=Wl@!Ashf}~8kJqE??6vyI3lMBe5likiX@j$A!
zJ-13eonZh)QIk_>P3)jlDi%^(o3vUXm>ez=C5~6L)ot-LR-hXF0vygziiJ&}+oH70
zaG>~jD+f?+{Ovnh8$rsRLMKjMB_zn|EImM}RYKe)$M%x`6a|Z54beB3<|aAg*?d|#
zlw01R*Z?+4B)f{W*>Y*QpAg;Af+lNMv1v7>FzrKgwb7BzZ@9HHZko~%zQsrtKd7KL
z>KO=G>1oeFZ4jQxF+ls^7v@p<n=!n<eki_#HMK>mh0M&AQf+cxl8L}_A#D0@Q&4BU
zHXJp%ekL_EodHv@>1Tz0G#<q|pevaC9qFh#bk7JobVt#Pb{VcF7`79xP(QQfl(BGN
zj4YVq99=@i)lXAQUeST6GWw+*<SZq;4AQ1?Sd~^6EV7w_-29Tt)WW{HH@;(dyf34r
zS4fLOZps!**(u)^nG~OEy5I*h=(S7w3@1EKA`W<`muaou90u^6MIOGL+_hV|uSk9T
zbXMkG^Pt|PhZ6SfA&@WaDAQ>_Vvaao{*ex}`e=$|hE>lEAAqQYC(2i~FO7;ChH^Xd
z&vLrqn3%})(re3MlvUV?gBO=aY(YMEKy+nLGld*1=KYawYuF*V?HEGY>H9$PCM7;_
z$rXZgwbSAt1r~2?aSMhQB`umd<7S_C=I#R){XGaX3V~538_B5KJKKe8zbcW~{fZwV
zb>A<#1sQm1naaU+_PQamx-Q_{$Ybz@>a2-S8t+f-9@VyIjiN0q$n3(>;&14x(i^m|
zy!`ps#jv6fyuxu$g%Hna=Mh!P8*)BhJuT0LhU6cDy1uFGoUemy3OYcXm|VdLserx*
z5Jl=bfbZ_J@_9tR>H@IzyoyNFsAm*6#M}Cg=SP&<X3!a@@V(cnkKXuNs<!(|0e*{-
zW~=4cqP6lT7)~WBn0NC#d4{yVI(PF@8a6&2#Q`^<zjs?8{Hc{~l0<Llu)hsa1c)I^
zI-L`A#rOhKB@yaOSsGwB)~W33$WM)}+op58Xt;S9#UC|e@(}*ySP^3iMBPjEs4G4p
z6vH?Tae{N6p7X(uI9|{LGAIYlb6#61!66q`M=7+r=o1lrb$AAb<K8gShs1v@iZ#1Y
z%@)30jC}Pv{R91CdfoEzw<WnGu_Lbe=k0C@_Wx?3`}e3=P5Un_?;R+eN>{0((6w9H
zLSO?EW?`)gEs+>O5OL?YE;ljY*1DdJ{B!=fVD=qRh5=Fb4dk8TFui3<O;*a1eVfzS
zY{tFD+0F0I`#VY>q>~{4Nj=|)APN#()oWXo0e1w7M8$=ue4$1W%ozHb64M;=v*C@6
zp-3}OIN{B4#p`DW4Nh^!y*9NSd}^=V0}-CJ&c$s0rBiOhJawd7Tb4<kquoG7x=mko
zhED4pV|a0a5<^(!TC++@MxCO&r{|(C&JvJHWWA7L91c4uRMk9pM+%Io(%$<aw&V1y
zQ`|Jwtv=Eqo3+zrjs2Lguj!;`?l#uP5MbC-Tp}VqHoHTF(atrZH#BN|C&mKy1CsXA
zneh;dRPK??_(j!tdyaab;aAsD<PyI?>9bRD8+~ofYfU2zBGd%)&+jp_o%eQ8=wH1T
zqu2Bwb@nrAWTlTH<|@7PX=<I6i<lPDMJpw^sqy!{1<hk>^8zhsI?!f+FsJ;iyK&G9
zE#_1a`cxlu_8g(+I@cedv+#&W1q1cqd?l<s08zkEj|zhX!-LbK#>^;%=()JzBtVWD
zL*YJ_+1X`t3kBufvce`%dC7X-D2=xx<}8{iT*-tC&RNz2IF12EuMGFcp3oPUA5+VV
z4QnP7pB>bH+;)`$lxCXUjSmMJa#_<`hOJoZLzc-T<|w>Mdyu95Mw}cOO6s`3AcqMQ
z?J8BRb%|^*NG*PSoVf53JbDY4_fvI#?~4*I0k&zxT&+dsbN{TkIs3~a2>$xX4EeV@
zSw>$OYiS8|K3#;hi@xF+&L$js_!zj<YMR^Y(>{yiEFvqA&FhP+!7a{OAKOOHLKWPf
zpYVcydHj1c^BF}@7r1l+e$Dg;N_d6<vGx_#I<S_I$LWB#(Qo&<-uJ1FA#ReMxsQ@C
z2TFdQ;Q@0mE%41Da|YR4z=q%&cBd9i*MeRvc&G;Xu!dPx(m$+u9mtZp#fS_#yUYSk
zc8IQxRwhXfcB<u@ZNkP7+b2e+<y>e5+}nt93tE6OWfq{~Z&zgfQcw2iCt<@4ZUDK$
zzhG7XRUs?EC&Wqy{eSg@{@Z;wY1;0SlQsHr*yd=ggZ=fW&<Bkn4jix?pg>xIAEre~
zQ5_Mm(|UJ6vu54oMzr%a{M#&u5)v{5en6;DlroHvoM<%d&CJY{y_=i)D!;$)2S{GD
z85~<pTiW0<wvLXo!*)M(eg=ZdaVy>yNt?Hrn^N}V6KDU06|F2ex+WPjL@Q)uEt4AV
zdgpj&THU6!Eb31PGT9{tsD@kHyfvGqu;BR)^mgp=JdzxERa~jVkL<zRh$lefx`NhG
zCg5ax9jLcWzLw3B)D@Mp;N+f$EAgO&J5*))bD<~fDMWF&O=V+v1W{lu(~|04SkIg|
z;iUyB{1T{ia^9Q(tXtB#>P8|)8WIv0ObwUFSZLRldoJaPU4Ox}ly$_N_Kk;^)wioO
ziZ}m|{VmAIdo!1EJ!)Cv(nS0qi0xH2@KE<<chGigzhl--81iBi@|k86JKTf9i4%mo
zO?r((k_(WYlB!^d9(r}ESB=CbkD3G1^0>>R_FOZ2*Ieq=O@Swk_Kxn5A^$)m9cyq0
z(^l=RFIa6~*K<22l)Xt6A^ZViuJH(+{(%mcb+|KvJd=ua?X15>^U5RYmqk#WK%&z(
zoM4ms!{-9gC2WG_!!jtB{so#Yx;w?uGb?n`HoDieg`=(C5B&l+>tJW(`Q`7Bs+sKJ
zj@wVv@8us+KaKya`ThR}_7$8gZ7p3a-AvU!qlHby42?g@6Q2JA`>Xzpuh>-kobg}?
zWr3!OYiU@nYgn#;uR&gDeC9t2;=7D1g&sBc<7Y$JS*5IvxheeCZ_Z{>puQTF+bEJu
zB$Lf(@;BXRZ;@OuSgbfl*c!cS&vl;RJ=wb5^q2Psae#|v5Ua=S=io!XmBeIsU=9)_
zd9g}H$i3fJ1I;z04RS3ak{}*5U58|I;1(L?$A~*&M(RQQR7WNyP9(chW}BvMuq>rm
zl|x9$+O;IZwcDMI4C+|-juRZS$TBX-uCt&e<}1xbixv3o&S_h9CNsGE%ammlV`gm0
z;8s~Mg_7KxJq8Fg6c@R^KKC7zrPaoh2s@}Qt6ZQD8u-+VAWB?xLJwMedTf<%Zzx7Z
zbS;udHs!4znaQ%L^tgwBT=YoQgu@M2SanYDay3md;N^0kS?@GOCyE9(6}u&hYp|m_
zHQQiStQd@q!g${YW?4*V5${7L;uj?<KEx#(!%(jOPy^Z!KK%x5G+u*>+rRQSR*BUF
zUi^?>9cQNL(fYD2d?KS=UUZ2QQEq`AQfLipj{Bt4v7=%Vy}84;{m3@h7fcEa)2XE{
z!P3?$ke#N6voA0as{B==%@W_R!*)IaoT%InBDady4-achL%l<vfuUg9^2jb4$!dYT
zmF!C;nkaKHQ5A`<?Kv1+ErVP`u8+0{^`SoC_MzXS+x;LAI{xndTtauCtAi}CtmXCK
zKE$w69egm8qtpsI2UhLzqYmK`&NS^dp1yZR7P?Jb^hjNyeqzvfXLE){X?<gAr&=og
zQcP|_iFoQ+t-v?#+?ewn87-DBzm(iYJE0=v>tJ0sow^j~+2fsD#g3$@H2s#XnEmEW
zoI$8YQ5l&B^%HfRyz*8duktE#i4<1B1qDWN#)C*$%8dKy>|F8=om)d{)`OR*SVu$9
zjC{_K{ZORP``X%0X~eLQo30V&4V4SFPXhZhl;=XFkzPFqmYKeu4eZGu<Phnfk*x4u
z{AV{`Z}eVyaZ6a68KRY&r01qA@H6;_`i!+;<A@NOLS`M~#pV_JntZdY;BVSOYl#i~
zQF09(E}*_%A_~X8V)i~U48a?Z#3KDPdfOk*+i}OT9>P3j0)Qcm<gytr%sXTGutrWk
zq7B{VNN?t8Kv>3bHO(y(17Z>H4BnRqqukOIjr1JT)qT^L#W5ev-mfO3I;S{q%7pb4
zKMqlTb>aN_x^v@kI;Vp$94XFmc(vc#gYWl+twqk0^YNDK%%OVkZD1Dj?1blLACx<b
z0KMJbn2>6kG?m%*;#(lOLG0z$lakPLo$^eoEjHQ<bCeyP(It7^s4s*cX|i<-^>@Rd
zV@+ruRL(5nG$j{2Y8G+D0Ms8JAa(^!Y`^&bnmxR(@a25@tUyx#_`j$5pH-p%KL+x@
zbRy15rjD+r&i_4XZvM2M|4h;0MG;D=QY4D-=oJeA)hQ^mKopFN6jLZrdEr=>8BR9E
zcnTUZ=O2ZrUI<#C;_s`y?f-rYLF3IvNEALHH8rT?<t3kcos;wP<mNjcNLyG}1iVhv
zqJyL;t}rxRW!OPPgl=1f5#}nYj(VK3gK)nruqNmllX{2O?ykY%n)@*lTG(i%0l;kN
zw2DS2+)!~y7iQk$z`M^7KzPi{xV1zuXtLurk?}rMp9<%%=`1asVHlq>ENkn!c92s~
z)g-C-a}sR7187@}ZF>x9KU4>6pJdq4iWcA-2|EwfNrK7s03<zrJ1TI%zb}wXsOhS9
zc8=!;Zmj|o&kzR-(KY04qcLAruf4YJP@@=KWE>W0oP5Lcw}v!#nPqIZsx@AdZeC&}
zY|BotU15q;`LC@%89rpSQ}pqF<VvNEORwG;O3u{UGHn>Mo?);e8gN7i?H?9^D*YaR
zW^7ZKqio49BL|rWbdcmKkOD99o>?oClcT3%fDSGsA4#=N(?8TSwVR@q?2_UR!3t$i
zC1UfD$&6*^-g!fz?HIdkBwYa`W8h$Do{SWsG=s(d0(l%W%J-*JEtvQ=(9=G5<#XL+
zRoGv(AuKY;n+<-)(3QZZ|LV@1){onOaxv8ZDtVb)303jyL*cx<3N%+{kF5k%hMXZ-
z6FA^sCqn<Qf=Jai7zc$U2Ih`sca?=J?Dbn!5Ust@$b1ag;|FWoeGlJjB?`jIcWbz#
zBq@B<A$MDzFGy8>QvEUs1CwCwrtX&u3A7VWO9DDBR=s?08@=UX`LOL4@b|iQzgPD-
zuWdJ)6XF6SE;$dE(<}8SNWP3H@UH;FJ`F}Ya@~ZRBIl|~m~W6IYxA#YuZT`d7{$2y
zFmUr2k*ZXG?h%-jx<ZOeN)tUVO^8}vzl5D0x|qRTIiI<QRS~nz^}-*?8Z>Y}Yhb@h
zJ+yvd(*08fPN_cXz{9W@j3UA-l+o!3P5Jt6lO43gC0_XeGQC4GmhLj0E}76Id5{2Z
zeLXf_A+~J=iv<k>qxJ_A60u?p8$6g(nkL{vp-dN#6ulvSJA~H-S@f4XCNalnST@VA
z26Kz+%5l{M{jg#GzZu99s<ZV1pY1CY%s;iS|KTzIHxJ;yC|D%_mPA@Q+gdt1o0<q)
zm>OG~n*2}RJ<W>!a(~&ez=S{-P~3uKcqky)42**w7F!7kb>(fPx_u+Qs#$LV?B1Ik
z^dsCBMlEgx-x=|=Wp<@|+Pm$L{7o7#00`o^y7=P0o<gzEk1M#5D)94W!gvHmHwm~)
ziR~VZ3w3%ohozs%+Lj%(JE<(8otaWgfyI2aX6l}<p_HYNbw#amX<M0}W?PcS(j=Zs
z$1K!Eq)vGm9$e}uhE<;-OCo2AUP<r(FjJ*u!W1%XSa6o7S-p<i(-{XoP94)NwW`>#
zKQkIUm$6lRLxB748@SG2MKDJ%V^TGx<Yz4I|1`j8^`<zC<l|{QLZ;qO6*%$&GsH~J
z`W!W#fNK<5|F9f@ZXVL3e!%C(*`iswA7Ffe@>iWT8T`=3{_OTp{*i>G{ePy;{x{;O
zX6uZi`e`wiaZGk5wQ##okk_wCC=0V$VBuLWBur%?l~37!UYa>gs@t(1{Tunr{Ua`>
ziHiBtYY&3?K5*WD&*QozO^zM!jAMFg$N4GCIrlSUeP(<2<NX)=m()91a869C^l75l
zc1GOMBO1OTaV(wwQQTaIDf9Rd9c*>9?vj)XO^2<q17#WqpApAI<M@3K`Lz!6Uby1#
zDgaydkoIv!Q;A+b<GE|Dn4eTFx4vi0Q%gFvwrMyyoAm=R`>kxz40Se#DZNK&(uRm$
zO8&mjT*6dqbw0i^#^L!2?7WpYG%(^##qPV#xps~|GjTT$f0lcQ7mPhHTa7qL909gJ
zkMWQ+crCY5rt5T5|B`{=kFGooQn}k{#GuhI_~>&X!-PuCs00&gI%+2nsyE_#(qFO^
zw~}SBIYP6pqPhutq<HO`lBqIb_1&IQbgiCH2yY?CCeAQKB_)Nv)z{hFXYQMnKZ^VW
z7{Zj=E`6JI+E9e;5<Ul1WW`W2m|WPMraO%*Aw}K%I!jn6*{l3S2KX%LCk+N|E!%=S
zvB@07gh5JKvW7k3^!KD=GJvLAhZ^$^-x13EARa5^W!K>#lMRh}F(UI#TU9jAq*0@6
z(7v@=bQY-o{EbDySHgqNyYBeSv%1U>%@xktqf9210~;HEpPFidc${<jqi;9)7{wAC
z_W~Bi-k_S%UwlJX=xlI>qD1fz{XizB7Hh&@uMjr!gWnAJibN7)xP$<}U}y?$y6@M;
zSglT6$)h~HSGA0+Mq`~ypj}<xh5X}BV+DE`XQ*T!R<`<+y0H<~TuRw@Ys_=gwzb?P
z8hhTtMHV)GJg3RBY`HS}oJ#g;ad3tjkM%{Ql{y=JaM;im*Z8Uh7EcDkE_c|W09BnN
zdOWzR1WO1OD0L<<df?&BVVyL2vveA{!0j6bG~js3Wep_S&iBMFIh6SEV72r`#PWKM
zms@C7vrBs6$-*5iJS>q~p8p&5ERS$OS8)9Iuw(*E0?~**n5;t8$VbjD1UxG>|9}T?
zgCv`(Hx%Sc3=$Mf0h92r{)oQq5N4P9X)qL512zk)H7?P)jIYE>mz>Y9&PA*4ag-*l
zjBK*AY)yDw&C$k#GI)_eo}zvJ2gvUcQ`zUj*BQ#4lu6@zkR^rA%xw}Z;jL#wk{ijN
zIVt$9jzr1*B)+~`VnCBbk5Cuq(~l8Hm}HgXzje85SSS<;pS8R5a}x3w+32$q`+R!H
z2>Htl<-b29pHKEq=JduEPWHBzuD0~fCf4+p|K*WI|H+88`^+bHa-siU)0G(i!#Bv9
zIy)Ph|5s#rwmOuD$}-x!JrlD%lP5@njDY}wML=8#fzXfuB?+t{iwp}^z5q2}LaK=g
zQ*h&#@|6}h$7<>A3fpBZ>m@bOIKnW|&5Z>uYmDZNjb*E4x`GuoYoyoR-+E*)!mxhh
zPdnM(v!7Q+=l6%)-#Hv_w|-w9hAr`{L~?<hykq^mo@M>r_jk5058N+p2u~-6AeV8m
z5UiIIp%4g`YqYzT2w+cR;=K@Dj~#b)J~xTKzu)b3uGQ`<B6OWT>@oVt%lYp{fA_fM
z@S_0pC;1L>e{1|U6ixo)r~J`W;{6@-i-#1SUrucHa|p!enES_}CFMsH&g{hZ-js-3
z=R;4*XB@cR<e9FxP_j2UK0kW@cfpu<3UU90jQ7itNbL6mLA=)@ar*J(RMt1uL27)O
zkxHi{*7kdLg!dSKiPrbCk&A@^LG~SoLs^8KfnJub>iylXHL4}^h9h7<1z4;`aEQf-
z49QsD#QRz|!dylUc+EzwnBy5bWIi6<oTZs?Bb~IJrIizVRSldTJV(?D*^*(!t%&Pu
zY8;v>Thi^Bdo&CVs6Ot|-dCat{V&c196Za4U5y7j;(BEX%!Pvk+)ev-yNrx8Kc<eV
zg)v51TR?^14J?cs`PWdjNEJ-5!ZB5LQlb{YlQCFE3c`z!WNR3SD3t{+)W{_vQ4#Je
zljBeIY;E#=^t9Wktw@v|Cvx1Hh7t;Gad{h)yqX?0SS-a7zlP+eMBC=C2-H~`A66Vy
z+rBH1;m<o%wRCTWkx!Y}7XCU`TTO6a$<m=x&|@3|Iop{pIj%x-U>V^$y?Q=&Sb{C_
zVoSe^tEV)Y2pHOk9>XTaPwBmq6mQ_3T3lrrJ<w&rkNpKu=4}p-nQk`Z!i~j_-!Rz<
zBWoEt7}w%1jx2uMuYpX0U)||6?Hd@_FEEB*KSTR&W&D`;gM7+DJZx0j)fFbosM4%U
zTWOrOoP<=i(EP4`G0#Oqqdxx7gzd1~=XZ6hdt2*~RmSKTR4PmotR^f&l^7FQe$6QG
zGrV}}JXs|62;6;*!|GHvLuT{9Mr;&!Kd7Z>z9;>+N(oDsa1HS^ln0ZjG>&LCsHkv7
z<6=}MUbWl)lUfuM19I?6%Dj<x)|#_OS#rKa8t?vy1_?SZvlzQ*0JUPFc!^nMGEuhp
z6(Pzx)}%2D_hn!E!K2_Y-VG-vA~(deSrhfT?Pm%go22o$#zNQ_Z?Lu6DQj2delPaU
z;@rTJTl%;H4LYG1)v<|jl_RQ#Az6aqLY$Ez0y#Fs8c8fa_?U;{um*DOa@dZc8+Q5F
z7iu<NhQ%nw`q7H?yb0;;u%H@jYK21La)T&t{-(`qeBye}v<L>;#s(4A3w(8<=r&F)
z>&DQ5Da3Dq-z~<Ml4)xv{Jg{jf}A~h?0&*m`nPzn*}GW>LTw)G7g>_}n65=3>R68^
z{X!UYzb3sx>iqRXZ463Yn+DCET^&eTec>iJlg#B})0cf|E6ys>e#?(Xm{omfY_aSJ
zd1K8{bqJXs>+V7*5<}+{60F*fpA|CgvX2U%<MSilWgi(HZ?_MR%Wg=vV-BFb^R;TC
zto~d9!*igJI1F9($Au6ESeHI5wxOmy8@G+RW>N<x`N)OEh!uJ@|Ar#^1x;f^Q8-iw
z1*&KV1v+WRZG@7n%+fH)zVSXACY~w!%p?ixa;h%FjdDjCP08s2D5EMLPe&S%+Lci^
z>C6bop@>2*xjNy>s9cdrx-64o(jS~`%jiYSSSVahxk>UOH8Hay8j?oru)xqe(c;RC
zW9sN#Da#VoQHEN^1+SMJ{@O-YA<`TpKQ5vhZSA5+?5`J1e_>Qph8EDbq*z~JjJI-e
zDzYlT6grqwiaTX&O_c%r1gnQwy!znc*pOCxD3e~V>{2fvW}9DT{GIl840qOCaXIl|
z7QVVlQv`W=xZG%-!K2BBYu1LGb%sA?F%`j~?8AdC+G&}Vt78{MX>gC0;ptf`wy(%|
znHnyp$VRpQJZ6Dx6$YXs64^qTeKN=p1r@<uhZc{F@5e-eD^7S`J8wCMVYf~D`RMJj
zX|cdP#b)BRvJP&J;iHzb8%B;ABlNfN$(|A}Pib<^CZf1xSLp^MoV)z6gqsLBI4a}@
zp^W8j!)pt%#!nZfs#vs~9_8|%W*10J=MihIAR`g0D73g&46T!k93B~c3{(>qY^@oW
zTs3ST*#4EdyUOc)$wjbulShEQh6v+`s12-35=s6C<Z{_>+m)Zc#=8LTnOR_d{6a~b
zfa!P&Vk#m+x5#k7WK?SwKMS5Q(BJ;$LJ-XB5yHh#TS15}>!r=P1{U<_#O%!B5_W>?
z;M}hSi3B7$?hH422Nf?rCB-ZdY}DDjc|8RDLH&7C=)RC`4%wur!(@4S0)5oRF`Y$4
z!Ee$gan<c&kpye<wq7KaD(5bE;T&eW!$wP;(bFFH%iWgoDBEw04zZQSrKkp0?Jtbq
zST&&Pe#xikrWB4ha6VkcC)N7phNwNJv&A?ogb{hV@7=JTKWV)mvkHyZFWy!=M`uS`
z=kC>V;Eo-2HaQ`P9P$0As@w?P+ICP;y8%83*8Dj5%mbo;uyR(|1hu+XS{0i~((H7k
zgB6GtS`&eBBDp%w+itO}b~WK)<}})Dd_#;ZUmt!EITCg#+TVbYCD3TZ=qlKX;)1^i
z#Sbps*>}Da?ZLhHC71i~MaMUd;skmrYgSWrJJ!)x99|*5@%v#g>$0UxnL8@lEAH>#
zibW}vZUr3C2~^)@lgEU)mIzN473cP`TpEG!Go`^W^V6UJq&_ont^r}u_J)u`jt^ui
z$Z7}W9r1BBj&^UdBX(tTkQ9X)@eqo5D8(RbBPs%@bIsW=Ss^H@bxto?K@aI_;$$`{
zZ0RMS=2CIqkYLyeH^wc%Bw+PT0p{is6zF;UCzjtVl#y6O@2SJthOp!6t<a$bN?o~-
zMj`C+1&o`qd@Oauq+VFeaDtX84#y`3>X&7f!pToAXFG8uQ#T{4c@|1WUFc)4Y|EtO
zP9ON%MMpbq=5yBEl#%dXb|b6FBa-aIvnTM6hC0o&N6t5*o^&gZc<o(4rax)vBUN0X
zt9N0YJL%ddN*m@FsvdZM(uBY1rLH<cR8afMao%@uEtFL)c46}>?x<1Px0hsVpPX~w
z|KvNpNW0-Jt66=_H`8sF-wbZ&W;*LiI|b#N{NWR`d@s5(LOQfpoCch1a{{AsAgypf
zL%$tRi?yBuSf?LfXh^O)f56E+M9VD6N+1R1_N$j4sY&gOByZlK?G)aO;CX!69rD`>
zA9cjY5&51o!0Unjbl|xan(ELSG^&azzRBp5K<PH8#Z1>1A|r<*IG9Q7=noI#fFzD>
zE7xC&miK5(RINA0SrS*;rV)6O7X&MbQ(GoAxj(K~VvfwCj$)L10uRBfQ)}>}DA)Q9
zY^MEGmd}{L7FJ+#VO|gqS<BC3Cscfp6m*%;<K-vrfQlogDz4UtxJA@1UaD2wR08n?
ze4&m-n-1=P%pLw6S^a6jgjbdviaNuP5Rxn&UQ*gBwR^!M;S`ExR+lhRKc`iw&Sv$1
zX?%#?YGhw(!+DxNEMBb1vZJb)IPI>}H06uokK@r$8#gny2P1oXJy8e~MsE^nNit5;
zB48=7u7F(m9zWSUUu>01?dMo5Xl5||zIKDPqv^69%~(7OdKKpvbJsdE#3^(T{%I1v
z;5&c@VUBVMRdqEqtU}?1jq-3yxewVZ5m=lcRm%M;HTYNc^e&-v*~m2eJm)vQrr0fm
zQR?3NFI%E8zt^zbOge&Gk1>EEw7Fr{&1lwR<Jx4uq@cfteb~AUmhXgeH7t}*CzBkC
zT4t?;1}*=t^U(c;PvfbQ!Z!JbSjWioM!_Ikp!ULcFj2M9BfgQ|@m;m1OUBLzO!-cW
z41`qVkd|f>*K%4e1n1}(yGPC!3N0jy_&$GMEjk8iwDsif_D!gTc~P2`sf)RSdfWhI
zji$ogsN6>t?wzj1I}9vX=_`asb_>EnBl{ZKP7%93-1ssq7<k#ds9TL$Sx#J`SVNz4
zs6$64s&gq`cR&KT8G10hPt*5Fw|LCd()l`=VbSRG?j{RS{<qG$Q^AlO!CMwVzw*>L
z47t8dmPgv7pSmhk-!dkDVOMD#8}F~|!H!8>4tdse{fp`~GaZgD^2vSx!~Q3Lise7N
zqI@D!c7MqM|Lq%{tuXniG(+VLF%-l98WC}=y9dNh?QjUph|43f(rKd>{x+PS-Gq18
z+J5`(jp8tSKJ0pl>`HQ$_i1bNV)FqefcR2$Ev617e^R0MQ#ziNs-*=SQ9yx5-p_J@
zl_mcZ`)p}%av3%1Y@I@-?Zoc8C*^I~EYa2~)VZWF3jwq-s*T$DNbz%W7)9hLFNF>5
zW$s9t2~VeC;$~YE_ASw&^5N;t)}|aQ+r*(AD%=a7WA@9oq$L{<?K$YG%gNuG^lyGB
z)hO|lrW>FWJsjeYe4u_>ug*f>@c#7Am>RhkA|<h?2A-WHW4`)pg9v*s?|U>5r0hR`
zSQp8n`c2&KKU-JC1?B_Z03gC)kOVrypNzqCFt$3m4zlvE1L%ylM)zajY~i%|%3a!J
zh$|AxB{+cPzqJQFjy4BupSaXNiv$1Db@@x*>uh0Y{cjanvC^az@ux;R`7?hYk<rTM
z;xtV2bVN;ENCZQ$o)DXXYU=Y)%(HE)%DOf`Yaa+H{IxuHY65r;#%WqhzDvBN*B3{>
z?y&mU)O4m&`We)Nf;}-{=+JfFj4&@S>AZQAlyoki9g!JTd?-Wg#CT*y&yB))KEN3f
z<?B6NHuxTAW3kw@rS!e}lhqv4hV?csyz^Ovr13q)oYTpqaBjjN7pQkII{Np>gg#Wc
z%x+hELhM46vY>Z}T`n?q9q3i`xS1u*xWr)a*;nW>Cm>n_C1lD-OuJ<`ufY{5gd0cW
z^cz9slz)K=FE?bHII5pA??jI&Uzf>1956JA{bF8*`;DQ>p%eJ48rrW=O%RM9iw*c~
zQ3M=JOh?b_>be;ccJMt8$|u|MkRKD%>W24e^E<B@#U*@)cHW2)s2laM&3MrfE>KZr
zoLMYI*a=ruCQodG#8WLkn3q4N@12LhJ@#!oz#!uKt7M)W;bICjGbq?`d?^M5om3sS
z4qXzsqrlzY!{)M6^^3n$WJmu9KmMo7EMsYBs$^<t^6zC%{x`1JI9_6?EVX+oO;vqF
zYFjU;SMjwvZox=ensFGY6mOSk+sLv$G!1N_=pmviDBCp<1MW+k<C=+tq#%j?IX%sF
z0LH$9gbM!5+Geqh=Q<4C%JRN$KjAsaI@$WMD$f4~X~5lcn~(I34|l|Xk!=rBn!XWr
z-!!aM+|zS7)KEl|>v#|{rjcc0va%~{?}$}Tu3;Nfnu`9gYse$KkzaNMfN;UN2T5j1
z(lz&)>PCsB%(p~LNqiI>*c25Nu(j*V#N*VYEdT&})3qeFE(fw!kvV5X&ix)MqBhFB
zU7@cNV`t*D9%Eu<B~@7Wm*TAk{&XpGm+ThrW6sG;o0|#>6hz<Gl!n=~V!9=DCGJI`
z*ex?_%&<H|eGkY{9Zl5ALc}BI_jVO-<pQe+mXBKEp&@WBKFsLb@VocmNX1^AD!dfT
ztK!E~P8_T#f8eW4ssiMot*zv;kqg%Y(&f(DRVZ+Bq0fND>A(zF%@QjUX3ItB`pK}8
z5!*3jQ4$R&2bQhP%`NE&OjAk)7O7(AVsZ)8B3Dw@U@1<M^7?WR)<lGhi=1#vEN)>C
zdT*oMueSZgUx$$^(wD0gQXjfY*EyvsMohx)m!l<x2yr%k#`ytjUM0`<)kH(2H*ANz
z7dV3*I+!fs(WHMwmHPonoR`AHq&UAz=DGbkb#b?+NvH3n9!q|ND|R-MxtLFk{N)z0
zI3kA%m?J-Q1tV*K)|#v66O!v!O9`@2bHM(LfM%dRj0$4EEeUG$kRI8D-nh#Oa$kGZ
zoucxHO>Okh@8?Y6Ggy51WNnH+r^(XYo{>Z62;wLjmrMP|uw1guuuR<6BXL6uW7e<;
z>NBfQ5%ww|v_>g6<Pwx*wP41gHB-#TX-k32Ksu@7L!<ERLaF+Q+IafVAURA3nq}-B
z*x!4mgzgA)J}Oc`Su#nmu(9O%);(PrmB<pmWSKP?JPC)6kPOI(wxCS*vXt5AE*hs|
zQ@03fBbAN=SD_X>Pm&99g1~F(Bui&-h5xM{sQ3=RB1Nb#DsiG3lGrZq;Vv(AaUxfg
zGBhjCP&DpfofKTgBD0T?YX#56G;cn&TV`3-blaFB)~s*PiBwCnNo&N0b5=|4_ea1|
z?w+4{;5SROS)tp$lv;oxQ$Sm7=qMkC;VDw@n=qXhKyW7R&c*i%%N0WbWm~9$%(UqB
zT=#>S@KBPVI|ONP)qd%0%4nDK4(B7ZDa4sgNGf<Bdfi!S_%h!hH-Lw_4Xivu*LjF5
zpe;sg8Q5O%!pX6>b>FnCCM6&sKt5Lp`ch#NAPZ_l>^3Kve2B_j4^u}9E;@@dOPTF>
zD(#Zl-^AJfV-j+SyWj~vf?LxDZfSN9qq<iRC$?MDIoPhv23FN!apUXvVs%kTHl-lh
zqz!m&Yj3(C`@si~z=Fmm9B&&J+coI~7`ztod4OCe*UzH)6VXd&1N7`t6;lBd$Y5`L
zsirSaIhBL)f3iLINLLj{kwJ8|&pW|uml#72oaq>!o^Cu*{JV53l4^)<X0$1FNA1Mv
zT*-0!^(mvb`#ap+i!&>FHxDg}EoAkmB3qU`+9+Eu<>E`a9O5sAGfCwi%EG|u3Wvh=
zv9br(+{-$GCWMHruZ{kUeXa0!VsVSW7pKb=mlfZmUi$GzH&A=4D{>>gp#u!`5(Wgm
zP9m*c{OKV@eZC7e6!j$Gxi<fR(Ny#&-MRR^=8wj^R=U0N%n&hsf`UMc!{U`>#Yw6%
zW$iLy?sD-@Bd6%AqHU0$`8dI+{S@#-k*N;g-9NeKLL)f<^o#+uXWwUdar<Y(_Ap@g
z*<UeSzAL^38hZ$QxZ>}(-5RMpI|!*5$Set?WirqOg@p%)MH;8ojiV8gXcqkT8#pMT
zScXIa;{{lQ=!#SlVTaj6A|zJE`dN2KCQt}b8#b1cGer)OoDmSBu|a)P=<?6k2@Cj5
zNL275pH$@^HeK)xG9f&<c2?Z=djHTlNyaMc&B-=ZxDRb&37>G`twIY|IohIWKI%|7
z)*E|r8|S<Af$-Oat3R(E4CK=S#^fKF1Z@9dhxb1^iGL5Tl2vS#aXyDvbR;$%HXf4s
zh(44n6_TG1_9+CcP?RFV1tbQPRNW-0CWehTPsJ;_3;KKJ<~FBmSbt8V_{R|BM(?)Z
zSQgnhjs|zSpSB+Evre*{KVF|&cR^?h%8iiSg*24n2kyaS_8Jk@RJMjs?&H+r1=Z*(
zshrwM4QK(bXu)HZ&tLU{3Xq1v6&PqqDk4R-wLd<r+ij>QsLLqUj4-K+s9z2S^xSy6
zHD^>YOQ1vFkmNHulB?L-KJ5h4uilhl_k9?(H^wklAF0}Z7vY{!;A~ZqPu5gtx|Sz3
z%ZwhCbWX#`Gw4v+s;)>aSP-kzm99E@r)NvmOwF}s8e(d!$ZqQzp2iNhVtv)D6k{6%
z+eQ_wZKuD4-em{CnyR+fPuuF|$OAxH^SNOS=I%=<FRS|T#N$lr4c1+y`dTtNR%N)F
z3ybVJ2H4u;U2N^RXeZqgFSe>U;rvK0D`7x&ETMk)HDtoRtZA=H$7Kes0<zB$1&fk-
zT94XAfP2$Px$%Npu!7qpoP*5|UStt8yX1`P+|a@*wV5fjEi!j)q!l$~w$S&+uPSvA
zDhUmfmEt&EM-L?d2IcLes`E~+3kAaK_m>rIrP4~FolR4d9wg)Gs)J5tT{r`_8mw^N
z_n`OBf5rsavuusV04ckKH5!=M>#6WnX(k=?xL_(#)d#;_TD3)4g6&#8!|z(J4WfY|
zusU2a>+no7=zBrM88XmQHguyGlLf1z&FSw27$$X07iCG>YXzaQ0>haJEXoQ6S8LgA
zM;74<G9a&+IJP;OwK7)n4iyHGU@LY#aUu<iaB7?UC3dimXHSmMzT-{7CYr-hxiU37
z#<Q2FJ=C*{v%LEg<5$42KO|CflOsk>Lg8I3yDZJ|Z*)-OaJOW}`{MI3@RZ&`FGvNe
zl;a0`wfem0DNDyZeQo)ZGUYNF{ACgo%zs2K@hVxfYgL(*!0)zgzYAERT$Cij*{4lw
zh<w`K=;_lKPZC|@s#RLA5xe&3$?{CXtE2dHF;ON_7~unTXV{y>JNMBSlaLcGqBk^)
zqvIvc&68^}Gc<gNQG;mV3HFaXl7vW*Ei6ySeWblZ@(Q67+y>Y!(tt)O+8kHOGp6I1
zJ98k`LW<o7SvSF-7n=ih3R{5LX4_ovJ?uFOAlKM|ya12*Z4`DJd;?PpTI8F5jt=Z(
z<d{U#k3xBdTV^`xJ7*EM7)M5?m65hCZ2Q9mm837feFGvvA)Y}Ahb-8I15Ox$BuBjh
z38GW`Ty}?K3vD5)Tm8Z`za_T_@)&(0G>xbU2y=^w-JO2~zjTr~Zi#=QAhz*DdgNym
zLG%nmKz#$Hez>de1%JrGznL&eP__D8+a+34MlN6%$`@}!?fRbn&0xy({Dz78$zUq@
z$ABXC|FG^T+ka9UT-2Qm9X?}<{>utO#rBgvkLXvD#j8c7AaGP%Cb0Zf=x`E4nS>B7
zS~kLmqW{*>dpjxd@v))R{3rRd^P5OPIDg-BW|XtIWm!c2T<6yG_2m@v!_>@mtiFEl
zH;))u9BE6$l*P6XG#pQySV&{EeavEhRc^n`xN@(YrK1+euUKmyGHK=IYSJtlPW&u>
z7UyEp^YwQC2Hzf~UtTbPA1N2@W|<BuW!)IxMdlMrG}LFpS-7W5QUnz$R+8+{vW=^`
z?A9p3rxT4d9d$<ACL#rj>0EtvhuwrAq7?ZOi<gCiRMli9)5_X&d~n>bmA;FFBbHcA
zAYBRPZ(HoBY8|h^LDIj&UwDaG$u~uc!O-6(^U43pM(>%mL=-Dt{fUNyY(`H!)a>8|
z3cnSjlD~c!ra~&i<*z_or4z{Ce~nB&rLPAo<n>fY{AVojsZu~<c{_z%rY!w=mYQ+L
z5|qbL=KDi+e`NB9IDeAe7w7tYsZFHi4(MiLYP+sQU%5=h5Xf4HShxH?%wq<uue_u@
zIGEwL=NrppDnMoOfop}wXl|}+PP_JVzuG~_$dC^_85|tI9i2^U9blHd6S78k$;Y4Q
zZurhj!$Koyc-7+PE$2y2do<{X=SmRXMWgjad$fICA?F2ZxN?+_q3KtYH~B_TbcS$T
z|Gr6P2)|OJKAIB7!MyoX`0J4s&8<Niv4eTsW6tNVv9v7{^=^zKJ+Tn=K4X+$Chsaj
zNJeo?(;Jj{8W={LqKRwBnS1}XZ~4YR0m}Y)<-++#Yc!7kaBu$CV3tJU|8@1sR@VJX
z+rcZ`x^3HuP5}nek04?jS*IjOqe3GHDN7}5V=Lr?J)wo(+GyrJd4n8g#DbmkM{$IE
z6DV*AvmKh=?mn~iN#RKUv}t(*j~nztg+4a&i10)^q>91>zmtKFbRsV`lo))#q)j#H
zsv<1j57DV9^BB)tqDp2GHW~c^Q8JmA3Siil&GgPWW28yOYqey7*DW<|)&{!Yj@JR~
zJAyWWH%|M$ZaTXj)?WDb8I9RQ*06W%+RIv&?uBX<m&l=ew26e8d<Uajb?p||s=Li1
ziE-yPzJ+gol@oPu`TR9wjIEnW7gAh{=1``KoCJZvrqXGhS1UbdE6+W$Sgd8bFJpCy
z@A|$a{4FNymJXdWy3z?Q=|o`C8t+`f9T1A;5boI~zeCYq;30^x3REj8+jiY7c{il#
z@aCc6I;ByiCWju;wo)uwq5pVjk*n8NEV|(ww~%h1>h=ZE)Eu^Sr5|$LYp4pYZB28!
z$Q0%s^68yn4ySds#TZWxeZv#RjCY^;=@W@<z$qjyRf4?QtyqcOLM)+AmEC^O+2C)&
z=Ci=+{!Q1#u=bI|gVDPCddwAWh-u{l!Tfw!)GI0YXIb(Azy)+JD}fnUY-(Vk<fcS~
zI1EbG?+{vmm2rf@4fY!t2m|O*7-A4LCRv+A@xylSd^UvzU4Mp5x^xH7=Z$^)whF&h
zsCd)I^`l9?yF@W%O)yLZk%*h!HAceioq8#85*um*Oi#I*D0>IeDtbPriUS2Rp)xcH
z#*mHU7bG_Rp``jAH{hGhHF;8Z5xSJvEE2ac52P!pCp9F>zCLQG98&EyWvPV9Y@Zxm
zv^z_clJM%7$9n>0v<!oJd=f2jQxF&|2KoEn+x`oARdoF4wpaSJw*6o85xD-tZU3*5
z{69l}!&*=}xT~HY{&ftK3;_Z{LJ}?YQK(H}!jRcx4IqJl<^WI$=mr$irYOT|)70yk
z38!op+03Qz#AA!B!FGCa#{;$$QUSK`qoHu;pK>>yvI`sC3HXv*B(hsK-rSwseFU`B
zq`%}p9gL2BS3i7rpL(8F^gqs&<-b`J-XY_Tuou6iu<WKBe=mL^x6D~>_Y}-|*Ua#b
zU-eHe^-nzBEq;k%`6S!$yWkG{TRqd`B|qE4?Jm|U?ex|bV)M`45xt9-{87mGZuwjv
zqxDwX^(K<zM}?xd0Er!+3+=L`NXSf-D<=Au9l^R#L_aUFswfX+F<nSXRRXJ?D^n_@
z!kcbVDpcjtD%UDp_R}hCOlBRhq~)*YQ>ip2uTCtH$#9DP93~>dahntcPq=mj+L`#C
zlCh<o7qx3<!1;BApp|$<vz?!!C9r8x>a!&qCFmWOg7e$1Pzpq2+s-o*9Avmym7r&9
zSyqbKasf>pGR3X{8HCh~Xpv-9fA)uxEJMkvp2tMCm_{MR^jWNiJBiJR3`w6|!^9W$
zSvTa$up34ak(hVvNs*7+md&*jv9Ab{I>6JeJ$P))&)ksJ9z{I~a<Uo*ONrF9a3PNd
zgSSJy#N^z*U*ck4V-YTa-!RUm(SEWBNLdU=P*S!Rvd_68LwJJ+0W}6Rd^7ro_2Ujs
z4Wx{29i%jug=R&=F`0@jbat(<qe7*$o!lenA(sv`S~p7ZnrILZ2)L(M6Ob|+`x4S5
zY<&1JF|DBOtp_}nOl#}AjUN_I`H8>1gR%?Be{1smLYhdkA7CqdWMocgf({(O@Nn3(
zVDMmCW9M05o?|YWryDWtYY5&4*fLfDx;ZJYmDWY4Cr<Z8N^LW{45D-krLPodu%$*0
z)t2lSZIAJ+&Qx^OY0&GZ$}}<+ED&30zjYouI$KFe>LE>>CItZ<CXK|lVaUQKP|RFt
z7!7mK6IQZJzE3GIbn_>G%tDIG4=2pm6H8KCBAs_%-9*%#cLA)>nJKW~W5s2;vCI>~
zaV4Cz3#dP7+~}QDS*OnBn|R@*CiADD-jXzyop4w^c3PZL6krp|FgqxCnGts?F<#^~
zRZWlC#>S3hd+j6LH4daMClG<$$03$m$=vs5=W+s5E~YC8;sc53#Ot$`6*P?TO`}Fn
zVxd)Gp1GygR4&QXB1<I4%@^m5k0lI|X<5h%^(1@fH*n&Ek9<N^hLkG5ogib6fP=@z
zp!)7MQQ0L#m@!)4#>bUmW5%(PnVlKXnTSWHJT!K)1#@|k%mUngfb{@!lkakkl#B6a
z`r!&77@wN6ku+0(D}{+x)#o%4T1!blwd&z*zmkq?I;}HEb8p+rQA&FRAL}H%%#bCM
zX|Rs&b2hTjPzwwNaIJ2bv6a4XStMG%%T5~2ih^`n@nBs=mb9+9U{+Z=gyTtx6&htP
zjLueKa1OIM-`{2olF83(x-7f(Xjem+Crj-_A3WZ92KoeJYkRfwFVu1Fmi;uN<Q`rl
zVhmo@l~9zprzA#};{Z+2@jXCJc%kv$sqxmfo2egap|)1Wc733hzmcS>eCRuW$#>sX
z;d)~`iZlB9drd!MsaF^K%J6Wh0;xh-ug_Is*I<RZUG8YlfJLaZu{ppFD0GSQtGc=x
zpkQ}Q7x6efNksuY(_(gHht}?{tKSa8e&1BZ7T?@s_>f%D@^j1f;n*uR>8$;V>1n3R
zcFc5CGIE2k0Kd(zpoTGH!Ro4O2GS!rIHpXO$m+m6qOXgIiPpV!Y&*MFXB<>B*50+d
z{L5OdJy*6r!#IPjwJq`Gxbiwm10`zK_W40+LH~PtP|uHf(!wD(#e?_U+8g>Z8Rm}5
zXa6}<LBWe%oCuEQB0gN{5n(lZ4Y!!{5WsZ80BjdXui2jZo!2*WB<5S}w}e1O4e;wh
zdhBNwd?p9*C+xa-mRl?yv%P4K#6V?8tTvoOa6RgWl3N(?ov2XAOy`*w8G$N?U~&-k
z!qVz`Ps+^7nXWGzR2ja(?n1$j3%1~Tq56!sUj_ixlYH$FGp#sb#D)swu2@U5-GCVD
zGMV<8hqdGv7B3d7>};iwv7C;j`AWL1GG=9;bCqr;vU6O9)4aVk&*>dwh40&fr<!b3
zzY=1K1<oSnNUsbt(`6fU@e9H6kdeAyA~9t)=&&lgfMCgaf`66__nbW>3PFOw&lvVc
zs4-3f8=j^O(+~qw;)Y%%`WQAC=Y#{YbYN>RBh!%IrEDgP`zvUYY24k?L*cOd3t#9O
zxecLO3jyyJ9T(OvQ+bC!or1;A06&7o;dD}d-1+$g%(`xyv0yh|v}r`dXuH<P*bxM2
z^win0-^!&3x=S5s9tz2sq^BFToc=$wy<>Ez{kAO_+qP|1Y}>Z2itT@FyJD-7ify}M
z+o;%`_q}^}-yVJU9($bA=j-$F8S}R=*IIKPOFE#Y^|@o;!FZW<^?97xPKPNLCP8#Y
z%EriJqZQQq960P1DlYm$C~Wlag&ZE(6@-9#GQ9T5X!l(#X=frK91ix~9=a=h{1)W~
zr!~wlINw|_Iy<Z^apfoZmK{%1!#SY6oJx^~^>I1T`Wh}lU1w<{sW4rCNZ8qgTR@J;
zU_2D*G)|D~fB$Q?65?KQ+?@vRfX<O4pX5GJEU$jIspmBn&+xjXT{~m}Wav3QJO%hM
z1=;~y*U$xwk5^ERL3V_^8Hm+^XHPbVAG~c>>GDyJRV52$r_xhBWV~DJaW$egG{##;
z%`uq??^Vu5S$PytN!Wlb5Gv@}Z(J3kC)c0Y^LPZiin3(%o1n4=!$TM2$yMN!Tsy?>
zprG9-$W7c20cXEXdop8a?;(BMr?pu6`59!(Ex;|twANR(#e%VWzMFD^E`?AtrQPHP
z*g0{jaRqjaRxd);w6ro0Bm=uJ*Z7-2ES|lU7_Ys_GGq=?(h+Uhu5S|R2p_RGK2lAp
zp(8889u?HEVyHG31@QW9g!H|SvGO}uAMX)?A489o-w}x<-!0eI*PiVzX?eYhBT}qK
zz3<{GS3aC3FR#DXHEszB*A|{^^!B<Zu6!1irhR%;`0^eWc=<oda;Lv%JR|Nx`1!GJ
z_FdH8jx6nnAU}qIHfSQJiyT<)&{dQu^-j}DSkznN3<maDJ^j2oc+=z?yVWr0%d|>{
zz$sNi)f9;N6<A`G47T`EvLjGi)S0qoo($3mIPgKFEdx3$gL2)MAjKafsOYt8#CR>o
z@NGm0ZX|Fp$$Utb_u$zCE-T$K#FgTUPy;`ea->yN2+EGjYf;>HFkZTyS*T*Ivc0g}
zCb98IK<@}oq%@o`-e6n2m7)Hu&g+F2Wo@~^qX}{@!>w*>b;7`9xGja*g0nY*xGxM`
z7>JoRR5?8{oBm;hkyR=LoGA{Bh@y~cHBoWHd!`))l<A0SlP<PHu`ovuHABIs#FuGB
z>ZSt9O%0UPv~6!KoSd0Zgb~_j-6VLt8Tv@IHqGhLk@mUVCIyd}w(I-0yEpB+?u>m&
zclJ)F{sXyk95-(u6(n0k>k}_iqIsg=;E(5^q6Btjy0YUhLHV^G^9adGJY!Zoi!<`Y
zlK9iq6411Ngut!k%#EzCiG9*NxoGZfo+P2W{m=-V(L6VAYB#wWV<E7XtKX}XZ;pE~
zTW|TIe{wa(sM}?UwFBvQh?TG2opT*~`^Zh#-0PYDf)u?dNnQ;tGnH*(8LnQg@xpJP
zNnj@Jx%z?dtq?QC1&G}R3HKPmHeX~}4D|R1(Sx#pm!)C`hT;1IcL}s%C-%J8jgybC
zpTO=_oTDiw73tECW6I?pJ4rZG@Rm;taf<83(W!NQ3(Q|9+t>F|h?9n|CK-lQsZKb`
z1u+YF5{7}g{hW8T<|F%SZY7K!2*p9ObZ)xl8tWNugUO(m($D(9ubcKK7IhLNjG<!m
zQJ|d!IGw=gcR=6fa96H2L)^S(ihJDBG|+=+G?S*cnI)2t2@=r_*uxN@pF4ZSF<fo-
z;2zldbL%UlgW@(LQM_<pC)bq3u0}YS=D9(nms9*vyNm0dZHE>SkjH#8LJF@?N`tZ2
zb0-Pf>VCNQ{%~)1VQ|(&A(#%>+zrqluy$h*eKW#zQUW~rQ0RMkHXT>6I%xz<o=sIK
zGQ<iI2F3ADVE7G~W#l?xY(#+ep|-^Dj+RfACMw6%)A}I%j+qnK^?36;xQUq-vf&Ne
zrJP}n>EpVC8G_`jmX1%hcbZEC6U+kZ5khaiSPqkyr{gc)pcq2GgVx`cs7sy759FVO
zedBzX6_cksnia!z3|CQIU1?8l=$7E}W-9bY!t|U+-egZdyeI%-MbIx#&>DWvQfhqo
z0gz#Y*2l?RxK6%HYw?FZQ%uL1V}jg0CoA7}&Paa4@k3o$90ln_)Ha0hO>_oNrF4SK
zpOum+hV#tX>*x5c4a_&l&l{%f1=u*dwLP83TT0_f^CND+LZ?yi)1R$%_G}~!Eynwy
z(2i;rsH@EhyLHuKpe9|uu#1;CI69;>2HZ8k?UUg=rlDJ-$}ZqWqw#bD*Ht${%mr&2
zT)aFxdl7Gd#vuDf*R?OCn~Qssc9SjAq3>(toF}-lH#V==$a_osbh?`XSemGH3ar!2
zpIb+Jv3rY^usv->{$%i*7Wpn^KhPZ~a82}ZB>oom1PEJQea;U59B~GZa!z_1eo7iV
zQ{Ml@;2$aAe4r3PLtl3Z_T_lx2_s!hOHVGz_s+GHI1v2-;(wCwU}XRDf&Q@?+(N{$
z+ugh6g`|QofVbd(1hWldHg{ODO@3z(z#Im=Ne9XJ!;&0fdV7Q%PA|TN;BYnp_LwU#
zP{mFM?nj>cBaKg#^CaxV`Be(YXF!_sCy@p&zODhmQG(Z{M5{pWdrtQC)$Rv6KR!>Z
zKY3i<{)Za>vjDxyry7rM<ve2LVjOU3-u}EuV@n9?bCd@M<$+xG^jjASo1?)gZNAP8
z$ptM#{`>kPTH4#+JNo1-vJch>U+XKh|E{Cu{V#U3{~U1)s_ST=YM_0{Gsr>(i=rus
zVyZV1heKnO<3te^7y|1Al`Uw8jZ(vru^O3!=v)7Ke0{I*t(|VscKl`IdS8zCPW}$;
zdn$6lpF|9YQbp@)3BqOZaNarH{P;1&fArYx{{r6gW%MFWI;B20t%=3sSc3x3$!Ln%
zhc)Pd#kgIN-l-WO<3SxVZbX$H{{s+@AOeB7XC@n&_hs)E_lbB@B$bZg#@eSLKJiny
zN`{GSKg3Zzh`Kj1-U29?_s7}#`6N~9AUy!aTe=|=6)q<jz=f?*Doa{<(BMSNhq~mF
zmDQFQu~t%`!`0uoM=g@G<5nxgud2g(N9M^{agw<)=*X#^8<olo5Ufo&gkulRoC>>L
zfwqsOLB&p7K)|U;#8#1&<8AK?0Gf0xtGdrzgLWC2QCTIUW@!|MEKT7e&sDk`eRAp_
zaTHVV67|(k&7}oNVU<oTy*-_X2lY^a)&cye*r)f>(U^l5aUD}12~Kq0bvhOC=Yn<)
znaCVlvog`QSjNCNz=R}yl*?@fC2?fUYw%ocpA%0sXV*iHD^#J-m?J5sH3!G0{^<mL
zJ3tQbvRhG$%yP~ggXK<k@K>$URq^RQuVZLiESy>2K`w2{<Y0fTz{GP>I7U&!Hr6M!
zpeQL<Kf~;GC$Hy*TN3QBvVg+;6>+aYrfXKFteT>u?(8iQB%5@=oRUteUh9%>awJD1
zRHiX%N>P>$SB?T)rA6*wli?BQNy=NOYp35NpdBQsho;DBwl9~Gw*Yo^Mj+m3fTbk$
z;=*pCnaR&Ja6ui+;w2}J89TZhN@;qI(Qsy&<b;&NqTdS-T|3qip~Irze}=Lde?zfZ
zkX)jB$)4f!ZJM4WDWut~BiP-lIVJ6<IgR8y4Mj{_GMg;$1>bH?^p|Z~G$Qy^+%<Fm
zlmx2I5apAuIER<1PhhQ?Pp}Ex8e#9ZRcM<(w4?xaYoCKJKU~k2O_VNj5&^%-a^Gab
zCz|1Lohl<Sw!|en`f<J&b^^u{t8_U0g8@-rSC@TTLZ_(>I_P?hh41ZNfiv>g75OTB
zvNdZ?G~Vhedwf%MbIdvfIvH)H)~3#pquzHek!uTfg?oGSd$e_kP|Gn&i~-TiTvF|%
z{F0;`R-G>>S5J7Qdqhl3K7ZiuH<cHKgQJ^kj?%Tsps~CP&$PXD3hWYjTie`mZg(Xe
zUnUe+^sFyP<hOpd_zLf6mCnsN5yNOV87sqp&I1l56=1FEwFqR%$kt0luJG(AxD)kQ
z^ck~I%m(-Lcu$0usAo2aT}bbC{Y8%SvS-vV6eIw8pQ|ufULVfVWA{7Yu@r4omp|5a
z<m)6wvvFK{laKv5GNszW%<->hF`<UF{X-a=z&=6vp6k;5Xo+f4O*|40f2Na0Q)v@j
zW-XZLA%1(i1GhG*enfgAP~K($`S6v2f>H1rR?)2LoiZV9-}bPf(QMfquq9m0Mz^jf
zbefZ&=>YB$g1$fu!G(q-<0XggAS=KP<h;`b^Ctmv^1h6F2io#g{Ssr0za*-2B+U0N
ztAfAM5&iwJw*1Pv4_m)_N^Xl~4@*~2Vuzg2G`ZXoF6WNSE8Igq2BbsOjW0Q;)V?yf
z6=B`ykIa6KLUPW6vjUcxE`1aY0Lv1G948uubE&6m(?aO9#VAcb7+4irZnN^i34^kr
zJ$1yA$bNc_x_MN2lcN0aQ+SJk5+_j92SMX4oFT^pkC}c0KfFys&;wtGgPTdJtBFHb
zR%{NTziiAcp(WoS!Z7z#t>>~ey3L(iY&Z1TeRJKInxhI(Z~lNNcSY7I|0x0+>jkB@
zd}wYFHNxKx0BVm#YL}XF5HxR&Oi9f-j^p92WEj$o(H{eKCV}rI<Yw3bBjFpU;-6dJ
z+b`&$+dZtc{6S*RI5`QD)h9M>ls!P5R{Jjh4H6HQP=0Sk5-J$$J81Mg)m>2N&sv2y
zqE@siP%O8`-2U4s&Y)ycd{@JO9>{Xr(75wh9;>MA^0I-_qI>KWAE`Z!>vzz<hUP%4
zPk5JKEUD;MZu!?t>3=z|{6he$SXIvf<!eaLpoo$Bi)NM4?!ByR1_oBsCPiEhN=~vV
z9c><Rt7#mpM9*#FvZwZs7~z}OHRMxav^!=&QIpi5l=;zA2G`MMtGk=u+uH-aApA63
zk<)k&j=hB=r2D)kha=)MUCoyyEhIMqOOabB;{q%|G~Z(+-gbn+qQw?AuQ@E3l%T^Y
zmRI<DlMDXU474a)UVzkZOkz;1iPWpxA3Iz|BhV}LW-|@zengPQoOOMd5#&CDpj$U|
z=$w8}@(^REl8+&k0J4h8kh|Mo+~8=}mP*4AB2AMi^umKuSvzJs!WAlBDtBHkZH<pQ
zwvYaeScjs^$wt|~n&HGH5J1zeBB-cgOXJk|-NX?N8c*7D;X=38jw%@2xxdMoDzYd6
ziVKYkBDGcHmCK*o3is+G=y{pz;e(C5n|xS0G9y~1`)5vWQg=Zs`W9q|RRBi~rLjgf
zsR1tMObd+apWO&5F*XjIH8MvdOEl<!-@>!86~^!>*K`UGUaA=5CCoLKbJ#XM1AG;)
z`js2JhMHVa1a`y^e>}%r^q>r>FsIDoFnPlQVqu`-Os2nM6F8<tAzz`qZ_Npu9h4V<
z<mktjk(XH*&cx-CSAxXQ5&i1r5B4RJ3C5l@N!~;8oxDMq*t4#R@9zuQpkSvL?h<?r
z7iD;ccFr<LFn%gzBlJF>_Y->C({ys0$W+!HP(C-qrbWGwU=t5d_3@{v=v7r+6(tSC
zy*Z~)x00O`f!59Ml5Zk-m7G`68n{;lRI#HaLU@L+eH|A<LT&%lNtXH|_s#w-x&L2=
z>^~HdauO%yahbmqk>uxWp{aKoW)S%i_!Jejz`)fMog%c$m47G;t>;WqG27aj@^oNQ
zk|FQ{DFo3F-++bRP)O&C(Ku>eO>Eub#tl0=IlCbkf;*G%Go$awg)}2?!lHH4RKKMP
z`hDzm3FcelkSUf^%kkv6<(%hMl~zSB%970cTB%)o8}~LRqXq~*hb@{`mb=7iJ}a{}
zVN=rEtX9m&>g_S9uO|IwiRnyP#m7F|(@Vljti=&Wt&RSuYolh$zI(T}#$yMA7;P~~
zj{my-DVCcWrFd6LJtA~ncS~D?dyMvy0^{e4K&QIMjFmfXhk;LjdWDgJ{G<6jX3M2-
zkalC8Vv8jPiq)(`P|5J!GiIkNWWtHYmGwhQz>u%6s%OY#ZbPb3q^l&G(vR-)jPL5!
znFdwUOB-BMJXRv!BJ7CSXC3{4q{;Xr>IYr6aCTinzl?rVhDQXj{`dw^@->XnIpF2m
z_;AnQ`Vn98u6OLSw-U0~DEhAF7u^T&H8-e%JBPPnojCK54Z)t)8<<20f~<L1fV(p`
z@RVu~k1Qsn{ok`5=2_O1;;+rprhn^C@Lz@l+y9!u7bolerHc<RC?(XI@2R+qy6UBx
zaVypu7PQRz)@U!8vZ_~Sg}L5Z{yVc|D!J%YZJmgjxMdsix)5nti@l;A7Ahjqgm5ix
z%G>9hP@vlvvMx4_%k*0EQ=QKAhBFQ&H{HW}7dzN@s55b#uXcQcxZmd$RA4W5SZ&Lb
zLp{=+uYNE-27-mInz_UJRcOlzGEg9KF9G!d5UZL1h4z?DwN1l&A3VbKXCps6vrD-z
zrl^+9NQVadg2`oU6ln=uoy$m)<2~0f-A;xaVYsjcD)t^rr2ZnQ29-c^Bad@l8wym?
zBWgxye$R+%<d$1WwHThB9?5G)G=<oos-OvuRLB;v(LK*Sn59innRUZpwD#F=JTh|K
zLz!Rx{eUmnbw3VNqa%fz8dk&Xw`&b`DdgDwn_`8ZgeYjYh4F83_-VU+!xbiG6H>(C
zfy@|)#d7Y%gZLe}f>3;9KnJ6C0+!NYsTYMllP!e;X1{o10M=npy>+=ScJ7}Md^|*u
zUT-*=gR`h5FsUtRHv;LH7XC>8Agd_qNRL7*;rFed@h*tC9+HnTsh7BgiZdy|@x?5}
z3XxsBw%pDfWxt?FAJ8f)j|_jWaz)d;1}#u_VsM<~h4TN<NiS~F7jr(z3HCdzXWKbX
zU?0)`J<ZfbGI^b4c!Jy%jJFm;9firtNR45?<0jh`+>WXrQ}uvV9;ZRFk`+0S&ZOLe
z`FObpyuy|$<)5HUyD+uAt0f2?wSuRVswA&dX3*mQH%jYg())S8f>!$fOweNg2TIlc
zm(XGf{f1k+VCOct!w)qXp(fn}ig0-GBp3*|tNDu}I9vBoeYg+uLPUy9!szM0L>BGn
ziwy_bvNkffoToUpTF+O$AnFIo6rqfR1H-M1^*do$6XKDnrguR~cY!J2NV%U)gk?Fw
zuV#cv$E`Ed>cYcb58ygqdzmo@9dhKj2FH8(^jd?Nu2b`iGAQwkvk#`|j1HwQ(Z#fG
zf+_C`!Pqp5Sm}FZP<}TZem%h=ZJ&29?Ki2ZRK2LL-Qgtb4KxZgD+nem1?VB#mGwt(
zslzto_$*=$<(dX^o1&5U=`{Ce8T-}s@{F~bDu$-&B?P+qt=)}=X+C|65jX9b)IpKF
z5rk~Z2}Mf*v%;S;x*tCB=ReAfohAe?WSNfX?F{;(0a^f;eK{mAQDU{-CcT|Sg8o}n
z1U`%grue3n@S&2r=gM`5*J62&w1~j213)f0flNwf;M8_3E$rBNrpZbTW6mlo@_CCI
z{3HB?QExzOG%#osMC!F*e`H`7(Lz@tB{o(Mc*Wf19~tOV7oC2ZgYCN-RyYD-TYx;#
zSpmB1pIUn7+#@fz`3*(#ZeQf8uNe6*sA$D%8e63<|CsQLYs;J<MVYsD6Wd;^@6j1m
zMXaLg$C|>U|A?i>K-~-<5czLwyX3MK(G;VnT5L0{&t_I;Q9f3&NecMX$qKJx1l-bL
zK}M-p%WpAQ8v*)Q??CELA<I14gEI<OWU8fJF}9|?$rw}HysEDSnf4^MGi6NPuvfkO
zq#xkW01+g;-Ube)<uxeFvix;0<%Xyhw7|z*76|0=8k8sWpUT?`l02I~9`X512orcS
z^g-1e@=seLZREz5&}r;NF_`D@#6dVnlkw~&_VCw>nT7nbkh2R{i1Mv0b**G~)LG;N
z^35hF=ez%wj!{*x;I0398m0esM}_~tOl|y=-1yp5`74C;*^4w32c`%I-n=Un)e!w8
zW+RT=&c{Jf9+oNPzdqzDVV1cVbu#pag$COVB<zV3)-6o|1eA(K`ue&~kG3vR{;h7f
z&3su)+VdOA!jWD${EXN>q-AvGdj`!553xOS0I^^7ug1M>%uqV4T>0o6N|FZi{4p`*
zB8iAOdF{#D0j-)S6B9ia_Fc)gdg3z2vEz@a@bEm^>UCJayO3VusP{)8CD+oe>1oy6
z?d)PSF;<o;i>+*Os>9e|ek0@?Q>m=GG1#=lI*q?RIp`K)e?ultg*p!9TJAd`JDi-3
zwKk-_1{-@Z`k$0Pc^B_;_alW;_qiCY)KHy_dggOj%}$i!uu9S2E{9se_+vV2GyzlP
zW5E;Bxh&_4CMKG+Kj(@MNq@C)dAv$|dQ%D$yjGkFdj)?QsAj<u!?G+T*=25(HNiKT
zvlRto%RpSXyj4+I&#Z~drt-<m%5Zb|nm=vBE?@6xu<@&j9a-A->gX5-@5;~`LLLRu
zobG}gU@;UlldKizAZg<ILA(MEsa5u8&+&!7)h_RvZA4Z}op=3VshJ^|F=&c#jciMX
zt@jB!c)<Ou^rIk9%k2Kj^=bb$*9-iIP!TeA{>#YC<^Qm9H>q*<mr%{;2HRwl(QD0&
zA#xyyRb5fFWpVj$Wg(FK+9G;zw5BZbjc+UP?YP=L1y6mDWuGCeeskEsw5)!vLjux#
z?n#XslPpC=gcGK2Ux!}VTb}FQ{_U@i0{(B%hDZY6j1do?4~&uYG?5&sp#&Hpoxrc4
zJUF0$Vc))|7}Q({L!qQ$w30b@vvpIoJK|&4=<Ftr6`KLm3c2jEESZAugIR*O01iDx
z#*WbUqRDjHoT7xHZ8D9cEy(9pWr00eq!`ev8oMgUe@9c8VfP?0xq6D#W38f$&&g3&
zP^+_9RT{&|Y4If`U^GbUj$@9LbXq2*G|IYschX8|RVs`zM~4f|Cr8gq&y>^4$-~ad
z<mMA;m^2F?4Kg!nETOPak<X%NNM4FgOrg3Jf!-JqJs=mEE)UgRkgXMkP0ftKm~V<1
zk@0W)Em<5<p%p1~t27?Z##)Q3?qWMz6ljY+&hV>#c%^cgN(?T#EYmuMWgWgfi#=5y
zH_~coHwAgvRU2|e*_B?XS}|G^UW#jpbCG9wn{a8q;}%*?g#xBkY*6yX?RId^jGBiM
zn}#qg+0RCb9ou>&@MY$Q<w=J;0-T<LHJC_Phmwc%B(+y>n_z-gc2mH)b;MDk#$Ak1
zi~i>Nky}kf<GriMWZAxSpg9`#B<gBK7KduonHvv}7p=kNX^O?P`GBkOdTH=gdkQ{n
zQ>LYyluV)qgQRCWXO@vY6jQiqxHVQ#>5?h=bXurnD8}8<=dhNCm)Togqd6Mw&VJ*R
zV=ZRouTXE=mMXg__l&94(VCzckMyFXc?6YoYt0LBb~m008zHGwt6r~{*H`SCP@8SQ
zsr6m;y#oaPwh*N?toHMMCcYEhrsDw$59VaQ;ew40Sdv$7d<rX#z=QYKm~U!B^n5sq
zB$kAZ1Z0)6-ol_>2tf(SQDuN;leEG;g?881hiF&Chiunm9peU?AKeKuFM=~5m;_;u
zD8~RfZ;#gAQDb09w=KAxy_lV77kAx+^LYZvMRA?poU>geS`jt*RnDrJW0)DwgJyU(
zX~s?c-qPoLFfaCLUv`4H&FZtWK6Hx$UT4b)fJAHH;PGUKkHM@VYTz1fo}hkXiqGtp
zX1YnytBKV`;JLTw)}A7^k($#=={pyI&y3_SW;L5=B2}$o$!HDtf$iS(4+e~?>Df>B
zrBq2B3r^=-Mfo$y<+Wv2&5;`E5)7-10zF}N`cVA=aG&YFlo$Z0`Yu<SLVWU!FwV@n
z*gmhE3RMB86UXT2GveRSZBSi!E3-Ok2+Qp3>HFh{4=W@`F3hivCGWEm^Znb^SmEpi
z7(anu@XiVxcm!6t8j=>KMpO8IAS9fNAjTj%U=!vuCwvaIU;-zSass$JM7Q*8Lda$&
z-bY9m#0dJk1%=<Qpm+n~0DXO=Y`j2GZxC)(uf#YaehmDgj`;09ST&4sgRX3|oHLJ@
ztEBlake0C_P=yDSaALwAioRRi+SrS;>X6=3gfQ_HIhEWk6~$M~+@9x0i}h<^1{Wx=
z$1gOQ$8CAyX){9L-GT=M#m0cLiDoHog+VzLt+cWtyx6^O5RP%?aY;)n##Z44gmuNh
zFI47DcP#RXJS}%HgJliH#2w;J07qoX^3eMbe~f-IaHPU#s7dr$acN5t58wVSi~bL&
zmAJV#{-=-PMlfIpD32s)EL2D79?o~6ovoiTrkr}(8LVW^K!gUE(X-){+6otTAE6=K
z?YO`?T(%mN81T}+2k~%njgY^|w>jt5(c3T2+V$j8>VaVL8v5EVtE>g&SlacFl~@A$
z#W(7@=<B@k>gMrMvn}H99L?1@Ri*~<l+%A*IeTng{t7@^xq=TrE_v+|EbK&ls%>yF
z=to~CdB<#tWjy(y-{^*A`}o`IQ+$2nD)+0H4nzKT#FgNGm<s-%<vucbGZ$H_FL6lw
zf39DrDE#dr>5IOe0v;N79e`=gd+LOWiaG#>a`{U(Rk)cwr*GKvuftK3sEC2A2_t>;
z%??l2JcBDjpi3s2Sw<&vCff)tb~Z{ma|PPKwVQ=7@l)69>Xl!K8ah_GMcc_K%v8e;
z{G!iqh2AY%Fn6Q3PC^#h-lP{fr1&xJzwWamtasdn<_qhSqt6WdekysZ8B;la5*`&^
zdx<+)b0!wX*F34f=gz5?RU1>tADJRrrP%C`pHYm0Q<P?)gMe6!%$}4m&Vr-l7IGS9
zFyCN?t@oSt!Dy)%Dc*Jc-JR5xFUxIx{VK1o-1@IsK%xKeXZ|1a>OZTnYE}Qgmf3w}
zWa4rmRU4_wG#jm{$I!1WD#(fgC6(FhgKh+B-EFuy?awwBM<lNI(#x>q-hlk5_RfEm
zq#8?>rLAvFt>thyxVax5)j9|O(e3!*kha*8#AHXvq_aDkfoaH*C2%;wFTt-fDKaUV
zN|xIRjHO|XsS)EgwbKvgZml+uIxIbi44NH-H6_Ypv4^TYSo4wetFiA~e!o}do}@@K
zEATuH>(VyTq=xHZZ61uTf{J5})_9K>u)Fx(>a()|Dojz)=Nd#W@v?duAVr@C47Vtb
z^<4`(n`$?Nm%BCkjf9+S1=p_onQ|9s05;QO9bR;RHfW)343k)-;K%JZn*wsZuFEr`
zd5PC6&MQ1)O<49Y!f&~bzvy{EIq0MNnjB$L3FNe>j1qRD^&KGPm+QWyg*sLcI8<gq
zz9)9u-AFnyJ_3|S!3$=$S(;n(p;O`LbXsC~T<9T|#R0M!y$vr2<hI)k{mO(E?mQLs
zu|AmLzoiRK!w9l9vjV;0Oz=%|%tO~Lo)pW5yhLiwAO5IKC-Fv(;l79YY5oDaPr5=!
zNeet_VGx^2lUB{Dg`}zQ+e-Zd+J49}^3H{r?c0{RB7b?K^*gy}4gD;gZ!x1$ocC@O
zO610&;2}S)QbKpYzm9NI9WeZ9V~|i-lU|~36lBKIrdg(iFv}CkEIe%0DBmPLvHNCG
zw+js5PfQU6bWv-A((SVOR(seQgJ``dJP;lISex~fb>-w>#+x>a%IoPO>FpwYwl;nO
zDraPByEDi0z_uvAY$N{ZOZ+nj30ije592n;d(y(8#Rz5y1=Zw(i7~=$Ih+0Lx$xM_
z-$%&UfQcE8uTF#L-*y`RJ(&N~@<46vJFXZKAL+QZRf9TOXu6?2bhzQT)S?>^k|}I-
zJu3JL1T8v@N5HIC0*C%ZWas`L*p3@?Pd9Wjv~rN#XZ%g-sVe&}CB=l|%$1DX+)L*+
zZ}Tr}m!&NrIz!qp=#Em-xJTDmd&?(55wT%T3|HOZ#8?`B)eVUXoyF^VWu4jU2!I+q
z2RO@YENbc@7>%odWyYfXc5_aP9bm1!WKYa(TWTp9<RlbdAbjG$d?W&$-N$ArwhPL%
z)C3YeQ_F>yvI0i6RHBa6S%au^*I^B$^eooGVc?<!e?37iEzx+RxyV}sA~y3e#0uO1
z2t<7H_S|qV#mG|S=iM8VG%OjL=geB6{MH^6pq8dzYs-d{-Wqlvm&d8`LI4XYlN7Ah
zWk$2uPhm5ygtjxa^=0NKPr{zJQ~<bC_E`;gm)06y4NSDVDbX58vjPHSj5Z5Gm^`8o
zO1h=!+^Sw$4p|?aQDFALOTM0sJ63YNRj4-Mx#9Qm`Bz!HZ&xeocUL|th)1e7cq>2D
z582lXn!&8mAi*;95^C1S2m%RXoxYRNIqkQYr=6x=j7b!Kd<-VR8l`C70|+5gI}gin
zvbnoD&~$UN)fB|0Z?w<c8uuJ*%CM=nqXS9I;bcw3x6heRN>_-ts+Xg(oA@+Uvm9`r
z&|KlqAigCR%l-B(nb_c_u7J=VJnM)O=WGWF?YEl0=CV2bERAJe*N_$3h6Lfr#ZBya
zen0RE`$kYEtPrV^mTDGeWaSqt*2X-yv2wq&lCYvzc4q}A#%p85xXE6N>YRHu&9O&?
z98F27u)XUKfW>@D-uJxC1yG@>hTcd?H=sME&S7$Di$wYhGERTMDfvY%5LlRS4)crP
zZ`;WJ<VdWK#bh458iypS72LR_i^`oOY!$c>b~cG)uD^lXGtl>poVfBH&1GY2a@jRW
zL?ph3w~&+W7Q;xSsvfY&n4|k{>Xd+iep=(s?gi>V(G*FwL(hUmLi2#6XFMO@R=#tA
zhwf3fOzYu4n_i$x{|R;j+ekUWFW$zVet<CHf>K5c(h%9B*pViv?BJS7%&!1s)z&G>
z=xYrN2IeDyAEr%jeW5&ESRyldRgSB~Lo|uBgk%E!2-$f1MzcziKZl><ov%n%DS@K2
zA@K^wa#mDrA7r1lXO8aPH56)QZry|#Su1H=mGv&*c=`twYuMsbIL=n!gPUPbn(<Qu
zaj@F}`Cvdi@|pd_GqwRu<U9RySFk%O@6t;5z&Ej1)Z-6%r5A0A;Y_`LABxAnPf7zI
z<A?jcdQB<l|3C8L|8`QU;_@X_VPxxIZ>G-qk0Y;yUTIJvIKbyZ+gVL@wJ$Iu-*GW$
zZb&4iQN1FP?lr&tp4;jQc1Fhi4(}5Xe=;Y%us4b*BJnfP=x3OZPgf^s%K+7&RHRTO
zalQtG6^61-f1C!g#ZX=Q?>X-WYI*2qP>yfc6TCXY-G_D47Dt%3DLyF$@X}FZnH8?F
za!6vh+QTZs>J_Ua@JI{O8%xe-)=Km_cB*So-I}mwAUveMpyY8rjrEY+XKM_`*xPTq
z?r)|R?<h_Wi|zCVL+6w{>Tok{;gCxF<4NF}H7u>Hojx0PX^<$obtI`ij+R3Nj|Vuz
zYl|6nptOp3l_7_jz1Aw?`qL%0ayH0BP%7C*yZ&Z_fWY{l!M@56^shMmuS*e;|F9JK
zf3@~x{~rT_PR)Ou^m=OjqzeQA*M?k!sV2*ZpTQiLDGx9HL2VhVs9mj>Xs0RZwr5WI
zG8^~OJI#GBu^pY7!LrAB8qNBF`5Cm=+KxE^h)E?&mwh<r^PYCj{Yy0Ba+1)$^9j0#
zQyTe>n7okik&JE>%22D%n?=~eK%C=JMsnP8Ffs(ubVM`338oTd(X??dFvJxbUza}-
z`cMR#(CIndfd4R!5=9jn7v(3M-L3V|x9Vw3*g@XlpO#pe>}eV@<kbT}5Y!Fj+T@ew
zoLQ^N0%}PBdx}s7uA?z(z;&bj@dI3ckK=`Xy&7OUJL5MNw{lxPeF`jY=C1<#eX02r
z7FKINwO=lq7-K&=%TeRjsOQI!v&}H>z7uPW*;BgqFVcxjQrgL|ON-6_OtNBas9v#2
z)uyvvR2*yxHyB1J$BZ#vkzY$K!N6)$F=rU=^k|F&_cb=i&x`ym)B~9p-guI7DgWwa
za=h=7Htr_2lncsR`!XsJLQBXtuna0HW#q;C@WPXPolJcCP1$R7ktzYp58GaOKelfo
zBe@b=hXZ~yZ=$0si_>DZLvd?qfsXL^Mu|}KA)*Mo-y5+qMpkO>{Aev@RJ$8qsaD*d
zX7Q3f*5993x~gU-SH0ngxwTqtlY7lGyo7v^{2eycIw8L+?G)Cm&0ll1(b&%dH4{94
zkC3NvG*L0Qik(A2iHutmb|}8^W1EC8Re|$k)N7|qmDX07vuKyIv2ja(5dKb*NcqkA
z;D9SdR(%Bbn?VO{w5$$e2+qGt*3`FU!alhyp}sS_<9MD@z3g<n51ZhzQLBk%wd2w@
zo}iGH7X=35x+2JVWR_rMrU)*^DSZ-PG{hBMV+gwjZ=!dg`3x|sp{DAw#5&}*F!=`O
zEFzp>)Ws!LKokfK;E@~E1y5s|LT0>eHv;Iu$0X|;S726#D3r-^*z`*OC=l>k?;AtH
zI=sraiBV_%JZ(K)_@p5Aj^Y%OaL&9~nSTYCux}D|^CsN<u8%{$Kq$D_V11?a(75O{
z$dP?IHQ{%&rGZ0rrR3}n{WOiZbqP2t4PL>1alLs_fE3U0J3592p4s5lK9*U1BGBHA
zAnffbRfp9tv`LOl>|qOP357CelC0Km=J;wg9WOa)3K>&?1Gz*n<ZFGw7WX3fz}yj;
z`xhWRDk0S2oFJo4$CRq#gVAe-v?~H#!KHd_bPX?N5;#S_6W!p=&GBn5?WIXPAZ5T^
zis;AXK`R&9HCsPvv3N>T9x~!_Ea?V_aDcW*b04nj4a5J0Q|j6JVFWfJ-YeGz%MF@|
zMAn5t1|i`mK~*oKiuUCKsvPm120uuevJ}O!?2ema3u&R5?bO1u-<_?YTU`-{w}>rV
zN|q}b0=)QJ0h`<`RD6uEa|T&9He^;Pk440qU9VlBDljEBioo8&h_j0t<ZH>^pN_Rk
zl4S?uMNfwLg+v+Q&i%MmxiY@{LJB5IMM|+<z#dxP{71OGatI=Fe~6^iPM!A}V(H_7
z6O|H=j#C&$eAFHVE>h$t&>>=B3;xJc0qT3Ze63i=-iZ4R%xD;!j;{+J>_>C-s}-g)
z#!t18_;_IA_R-6G!w{4!VsXh>;eJg{;Yxwv(7Hbye=(zew*{I*Uq{HyDE}^Oiv5RS
z^Iv4D|IN8Y-9`gf49gE9(Ke9*T*WfM7*=vE9!5%s(K0@gI$;4wS{X)NCu|Zam8{)~
zG1*|(;M!(Z-D}^n`?Zj_s{vQ|7#a=1XJmqh_3GY}amD}h^^6e6Jzv5R+F+a<Rg95<
zDqSr;h9umf0LoClYoF|1kztEwgf=}+crYkvkf|$b*PAX>DZC(D0)~KAQ>kujM#Zs3
zX;*C?X*{V_yL0TvA)JV222Hb_5v$82a&TuaZNUhwOP6IUpm(W)<czz991C!p<r77z
zCs9kmK0l*7jsi%!%ZpmCDZ(ZJ@3eKyGq7VX--ZMnCzfTzj$ofrh#cshmi#GEleflA
z)tcYXo?}o;Y}<hv-~L@>;?!T0m6~MhWf#-5ip$58l1nih)TZQ)4_JsuK6DkKgVsmE
zh^UB*Tp6{<Xw4|@vrRDSd0d;3Q|_nN;T(<bMs={1=5Vpd%xC3qnm`&!Cl@ZzIn{Br
zvFW3c7R5I9RN4D&W`FW$y#<aFmm65XIkm;idNi))r=xan7Xcv;f_>sl+!5!JDV3{H
zb(VSzF{XeWzYit!o7hr*GzOl`wYGN9Bvc>qXX{wZcNWTfP5TYx;uSl&1^f-RktbxM
zDSOz-6uRmT;(69S$JS0Qkj&i$n%j=cgBhD)F`By)6rEmFZf7~vCcaGRVyyF|K_A_q
zVR?f={IzmWflEmNh)34VuH=3d?O#e0vq2}?nIoq^rP~qlvf_7X#IN%siQy`-2H`7y
zx!<w(zhUnY^08GEtq>mkNs4@A{;^AKU*-YG!>++MfM1w^gp;Y+IcA^rNyg#ouSQje
z?f*?j86YhZ%e7E;l^^3PfL>KTqgWs$I&Ydil&@GH`!fh0@M;kfT=FV}6=jnpTo@^r
zCqyms;M10~Gv~LpkD>F!%MpQI5MKbrVQU;)zk1B=E}i?tKUy6p9Io?~d<z6U#mm3r
zph;4m&p~>NXLY(->ZNqPS@aL_=xS#1QqDnUUR)Hw!;fnFL>-om*QGGq-hp)sg6U*e
zDMxxfS=ugesf?X+Rg<e}m{L9s9BzI|f)VRwCL-PTTS4udy9{K_e4IGYEa-QF8G-_i
zOvuK~B9&eqP(m`d*^FfoLs!IJHSQ3%{0?ExUj2NNVHMY?MJ(TSAlgR$L3BsBKJjdO
zRRidu_#Zht-}p(Ot%#&3pD|=RM4!Y|5*+TOq8#gp&tLiE-BHQTX`i!p69K3ZYx}Va
zca$U_7`|_~FBlI$YGSVn&L)Mcyx-WpHqYaWq|<eK!5s*P#O8?Uw?sqKg&r19%#t=`
zcPoAns_j-FOG9}6i8@*t9{8>BM!imaf=ng4K_1C#<v~jw!FXHdO*R{-5Z)Ca|1$K-
zR=Uj!p5%f|lsfI*_XKhRaaTR!(h)N;Mr>MAM33@;G7rBabQQYrf$-25+@ba@`gIZx
zk%N=8{!yRw0djdt=e#>{r<V7Y6%34O0w`skg+XOosNm(KCT=P?AIhu+aY;Dg^KXWV
z3L|pe?km1w{#$>E|1`e+%d+sFELHJ8XNB_sw-xPgLqku?0U%moP<!w<<XDwuXdcw7
zoADhB)^bUl-`9yh&?RLhd9OjAl)}%Hg?LiJW<@`^ANabCHqZXv^|%J|14pP?z0^i0
zw{2Vg?i8HwHn9hgZOA{tqW9>l!|6I2=8dPZ{0t>zPL?w`jCp0ifrF(dz%CYON}@Br
zUbUjR)1SE2-G`eNF7_5$So-oJB^zlE7Az4zP96@N<(*_LmYY$U6-*bIY>+)30?X?>
zt(PtK9CJLL9%WY<e*g|{C~XVc4`V@h0E{NgI6N!Kj(jg8As}?5zwm<NR_6i5%AGz^
zG)dd1zYnoe0QgL9eMrn`pwvL(Cpb+;6coFZdBKToNtd}TC`uHNOV}&uc~1XKXnSXi
zRAZRmv@v?AINQOn_vVD07QwCw6RT3`I#k`?Md<%nk&=|22DsCp(X!4`I=4y&J_#P9
z?eX}#S-nYkS$N21tnslTHyyjC9{<8Pb<H9O5FbM)7PF4hEO@D$Jtu}CEm~aX0=C)Y
z6Uu)^ADmu9b3Gk*LGlQ^UGOgSgdcAK(&?#e;Vgl+Z1gTZ#6;uIVe#WK(tR=M0NmH#
zOj*iZ+*Q|7z^yFTh07GG;I_yX2E)`C2AbnGs`R?5p15DX($2n=s62!Jl|nB(s)7FU
zLu>tl*}v{Q{`(O7=T4-G&R^r`k97+A3l`-eEVK0?s2SJro=qf<{0Ql!F~EY=IWps~
zxf!xpJd1FDa1>M&#4jEcZMQ|WET`=YVh{BKuRceo2HpN|V0EGD@EG=)C+hg$>^17u
z2f0P|(uZ^DT-1+q)q^PEXgA{C(q9wq9x1LZ;L!QPzh60_6Z8v*L26e_^GIQ^a`ITw
zEV%s*vD!A}P(LO`mWarK=~oc}>0gS}abKidriHRqH)U}C%oX}HOMVA5zsad*viJ*m
zzmbi6%}TE=9+T$UPe!bD`{c+C5-t?$Ji@^cI#;uvJ<uAG2EyP}=v-j9+N0Z%wSuR0
z#pBNMDh?f7i-Y&?eZT7{S!y^FT#8P|;`7&8gciJiDh3{lk`9+f^Ru{^p3312u*A(>
zSI>a1xH}>~;_C+N{RpZE7Go<nbskb31O-ezOHn1yka=)pk2maKI&(=)eniYzjUiUE
z;_M4V@{U{4Y$Z9f8pUju%Uv}sSf=9ula(8WBwNw#lKje-sVt?6L2B;w1X=X+2vUCK
z88e8X!C})lCaH^(VdE+M6-7?he|Ljk6>a5{csOD2FLE+Yec+Bd_8@RjX&IZsA>oZv
zT79WN^|Rg>dr7=m-6^Li6vy5$P`%PcxgUSwr1|=>!ODNB;{ER^_BJ9B`4`0c|A!&=
zPgh5E9rra+q>n{)Ivu5~`0eB-DXU1>t|GNe!N4Y|aybx)QhLs!WXGg~m_qT?Xfj9;
zyv=9igOs$6yX+F`w0_XIH;Qehb_@!N%RsjKU^g}%p4-W0R?^RhqquIMbRqiC!WKFL
zjR6z+exyS+-QSKNwN_X??D-7VcT^FbOYC%pO12%$;cT0#O6oTl{g!sL`{Vjn8+S6f
z?W6DUuW+G}M;vfA8;_Z8?N(s-@P+uRu}bR>J{dd9B`2o5TlUK}C&?S?JXHXGjx4y7
zF?{EFHrwgt!V=Ur&YfkU5xvXGGA6u>b2SqDjAT7+nOJNvUc>a2xNxGDbr`$pYLA$&
z%A}KlN|r>oIe4Nm@(eCGss!EZL%nt7J66r5yG464Jh@>=*9ipuG-6DJh28aasza0Z
zzF!>Z&THhw>JD#z^NPsJ>G*8#{A4u~6?yFxHh`vSytX-u{gN?@J&cX?>oMe@&o>Wx
z7pa2r!5Ox=wV<&yh=vPWp2FSO*2tbOtlHS@;+Ry5%{}kJV4uXPip;NSvgn`$MbZT~
zU55_pkkkqe!b7mPYtyBLqN*1bZm#0+;a{?liG@tPTVeb*WR65u%aB1!ZL=0eqeL>*
zzF+Mc#Izd~Q9w8v<SMY~{e{O^w=sl*xYXGen^kto8S8{kiuL=3Eq9hV&<wEtc?pYu
zWh9o}R&0W$aFQOHzefj$es$IogXmJVD}qnBV?r}5GN<6XUK+0I)5qjHBdmNw-M^j>
zbP?)Y=-nxLcVxN-8ox}4P9@5ICmU-(SX%kw;gv1!C7fW!sHkFHVs;a7ICIC=e`-`J
zcA004$%k~Uh{0El=1B5-tOsn?*iK9HaP^@y@QW$?oK3$t4!%{rTHcIR*6cNNpI|mL
zQ>zyBV8D*b*rf_@-cGWC=Cf*2FG|KE>C;mK4iiC^u)hzrRWZ9H?gYu#7d;bZVXo)8
zE*<fEF*30R4$d6N!gHzRPkxy>mQL8o+vh$6O+RbM`nOj6f!lV)KLSSEZXf*1B4lp)
zmqea%bS7x9GnU|sRKlQ1WGDM^9ouj$NGh*%qs-XEM4wLD!^wF`DL%wC=OpYLewd*3
z7s5VnS#G;?dsx1ofjp+2LYsJF1ya}^bFU|{VI%D$H{hn!k@B41M^uVHPE-v24Mhjh
z`njxz9QB2nNvJpqO_QGcp1^vSFH4f*uh&>KyG&5QQRf=rD2iZN(&Nn~Bd;P*QAOAy
zZ~0D88gWGRqlNhb+?1qfw|3B|6GLwr{~!e;{xHD#@%VHTNa#ogX#C^A&_vbEc*4+4
zqG@0PvnA<qyYGb(?19WEMOz5F&@%{CHVbYoD(K2fnW0Rkl6-m9$u@ZNlWY&YgT|H8
z5qemXTjV>Ag9%*%$p(tN@SEM)+h+cwd&+{rU+FIm-7}K<D=t0#TdwoJpZ@-_P+P4k
z<ABPH^pU-kXlf;s)D$jZDHA~EYm4J02okBdAeo}fAarnUU*$4tj_;X65*rSB?I1`Z
z?6}>NKp2WuswDLTs@SMFr+zrs;cYVd{e3vC7Kmn9o+L0!d_SfoB`9>ws>o?rxK}vB
z=qCO388gzoy`UA-#k(y(Wg8z5`r_<2fv><#diV<0<aFJs7$ryriwnm}X>*?+({v7A
zRLPGhg3O|Ns{9M@QF1hP>5S8;;X;-C!tobnaGUL~kg+%s#q<#VKYczceH0>XLwfYT
z$2;YhEIjTgvoS66K`wc;Z-~yNi*o=jYr+D!NGi|BK*8@lu)Ll9*ELM!iy2&*+4eU9
z#Of(>y-YffAU8!zTxh4%0(YY<25AhBh%J96d@Q3g?wA60Zd}m*tR=^1q|TTO8qlD9
zDu2j^Rl13|wC;i_B}HN}i^2kgD~P?v(Agav&+Fr}AYzs;AZi#z7%eYgeaW)E;U(Km
z7;g@Nli3w9nUDr&$I$PWEvkHPP&8W3!5c^(CG(=A&S0&=xMWGDr04AKFArBDnM}dw
z*=WAK`-2@lHQ)6~&C-e2vBGP|0H}^|!dCzA^r4$qv7CLy%E@BYgN!d3!nL#(YY_H_
z&}!3%Wm^>jW1d@?(<ZEH+>|J4oRw(2gRVz3jWbLz4RQmmtrMLih;C?!re#XIqp5+f
z$D1>!*MA8gdELr3h~peq$f+geaOvW3kxy{GW8H=8?kkl9bqJqYLrz{mB9Fuk&KcJv
z#_z{d|8mZ(WRo|+cO#K%B4J370HMqiyZxp4hw?8pzk}&<=zLMga{qSJ_uohJKNfGR
zzYZtAv>`v_QPRnx0|eux>oMyAAt>5W&6^=mIPhZR%G8?_{ZcGu=@G1`)}KKRU1!0*
zGm!WB46Vy<YI@_8{>kH=lqOK|Rnk_AW3A^6(~lPo)0^H?Tc7LRP}{r}%y)Zo_U5e_
zQ6@kR)E+#ss3U{3f$o}b3{ki16VA@`vEUt;rJ;|l&jDspbhOv8i0#*Osb5x;*9n6D
zH%*kVZcPPTT5GHEv6T3ME?+*9*qyt}XX18zdo?v?*11OJ<_I(fXjrQ=6H05$V_)*V
zu<W(kw-|g9)@LBW&snR0ROWNphU|y3j$t-k1?@Q{N0A@xU8#tsMTre%)0vrP(i+=u
zLRlkFGN-vlI-c#isZ+=LPz5J<Gyop%@@<pA8ZNm<+aovoPHPxlJ}3)K7XohKA!oMn
z>ebjZt;T!y6Fv7v>y+&*AgtF!BkWD|z}iHK0qcvR{ycYEDWb$*8pVPNn|1rYR=t$C
z!K*D3ix?fwGFywdAf`c$Lf%P%0#6Eaj9eml=kl|fWXg8PbWrl%mDALk7S*nyt5YX3
zb@D&HF4-n>Ch9Y(<^&{m_s8I-MQB+;VC24kd~eaDRkBHIVJ{{}x_w-7s2?W8Jl`n8
zmR{_%O5owrwXiN$-p=%>XU3FlR3#<PDQFK>ZXz}>7HdB|{yue$-#$!@+7S$w^=la$
zpq87aKd7&EL(PUhy^|bi!Bn)1C9aw+u5Ebkf0P+X;<72`2n|;uNnC9llm$mMQXGjg
zMx#G0hF)tFIjBPSRnR!94B~M9iSw8R0j=Iu13q}&H!@KN-Z(xW)e;pu7x4ZL8<UQD
z+$q-PP2V``_ANNr-y#3y%;|dz`odn(MN&aY&w`6yo9Yb(CAfO5cG{3ze_lghN^Ty+
z0_tzcpYJplI{r~_1w}_P$ecr?n-rj7XRTZ2YO`l6L`<6$^J@oHO>NQ~LJW`Tg<r@}
zU(wJ>HdrVsmf5;fiR%y!bPjW??paT2wa6~2eF5r3Bst#W2D*Fru5{yFLF=cG0$?k+
z6Not~?~0o%6XYRT$dfAOAXeVXf-0V}C&^wFCvzplA1^l`cAII1H$$CmFT(DFT^K5d
z>>^%tZ~}<a>>$JF4`4m537LhnrSF(!-e@Ps3+sem3_l^jT(TL7f<`-ivVmBf2+ShT
zcM)EA3%~9lTdHD#HiGc^c`P9n!aL;CqI)9gAt3teEeE#6l)BBfBbPi#^u0#By);ZS
zX>Q>%T_59hP7m<cq=D2}CD!}Vr680N+826vpSVN6rBQ5af^v%YU?Ko1up=mS_gT{T
z`V@g*VzipB4a@z$$7xaeeiYgxR~vsq?0-iS(<i4({9zBK%d#z9*B@>V%Qw*$yos^d
zCIPWtTIMq&nrj(PiL)O8;aLFA<=Yyh*(t<2girLx(hF8$dY*{)1NTLEdHS7)>jE)y
zO2GFr>E0Lq5?Hs-OgJVVR>Sf4uy4Oa`cU+=FNhZ2BP+SE!=4$O`;cUlu;iOx%_o21
z^HIWb_h0d@NNJ(a_bYp6{txpb-~Mk&N}InVDZfcMQ*dQ14>diZtl_YCcIoPff&C&G
z6eK<klYH;!)JbeeTdQj>f5LoYhryUd^ivXgSK773u`WQCnh(y($l35T&s$k}zq#F`
z1j=ej5yH`kp~7{dhlO2o9@zneMuLYKJp_auq(wHb_4%*PUc}bekb6WKl{^FyI&#F@
zcYiVj+X?p(Es~&&_0jb2&+1km6_WEHpIpQb*N0<&vr%T(tt~gDJ#JiI-g0jyufBF6
zD$KNH3!y<2R?KX)hj8-T=))1I8RMh>U74fKW9o6up^IddPeRb9eM4n0Q@qi3_Yms0
zSzI#a3k311j|A=&wc~0gTeTyGlXEr4AY!fa5=3kOOL9{*zlwT_y#+hUs+L56=-vu5
z(Q+i4@$!|vcRcXMn#)O^0W-lz0vcK`8j!NhEvvOr-!!rXE0mEb0j7iTBa3Ddo&`8A
z9Q^SvlRZim5($`NoZ&ceq4v^SfGAg7PuUgD;OH1S3Om_CQxi~f?n~wst!2})SOjB)
zv1G40x<Mm*SPtw(2|gFVtBH~cReBarOE)9s$+1zk{M<lkN~S*2<?As1P#rT1Q-7cT
zW1OcK8od{FQfQDBUjUn{frg4eCiY9IQjyO8#oAlORJv{H!niKny>NGT3U_yRcc*Z7
zcXut^-QC@x&_W7#3j5gmobG%2p6;EU+aC!DStRSnJI6ccn9q2`HK&r6B#ubOIR&9F
zD_MvnYe|SC`%%1$)E9)AWT6rJDM};3b%o9l9z*})R7CsKpsi?XGw2pRoZT19_Z&8d
z1HL;-k^V`Ro<pi{3?WVbDVt9U`$^Qf`!V0xlR`rKq&jN^<OCH)eNdwweQeqQ+?7kH
zn>4F1j3tIIa(JSA@=uN5O3Cbt_UG}f_Ls-E=-(V?`~&X$7mnXQjVvXcO>F)toJsup
zhl}ONhh4{czhXWSQNR}}$erE_Mo~%y!$4?>KF}c0mJ=pQ&<!jmW>OzoIWqh|Icb?T
z2yl+Q?U|FA9=E<dk3Xj_YJTwhfVf9Dp`y_ght(zNbN0dHHy1YE5I`m0N23UCGMObX
zEU0SYKX~F<#EO*a&sc996mTG^2H($Oy*M30DM8M2&LzL-K0w`jR~6f!^>dD8=B^LB
zHoR_T<eWY-eOfwEo)<3_jCP`}>tOwAAWqbi{K15q;c4<oz^Wfp(Zn)_R^{Btzq2{)
zJfI1R{pGe78z<JExjU+I_z*>nW1q2u1swEqtISvBt%5{UPY-!JTIx%YSc#p}vqmsJ
ze<$TyJK{<~43#Bx4vOnXOIMKS7t`R`tuv{k05oV_#O9Gp>dzqgQ1VVJ^0?Z2yP@Il
zuf&5;a#0j_3G}?XD#Ix~K+5br#J`6Vp-_01B};orV(<NdC@+G|rT2X-%&vjVgR-9q
z&v-Y?p$az)ZbAEiRHyL`@&TUOrx=`g?v+<BU`h@VSUe(yY~gK+v42|Z65aScXMW-)
zn}5ms|0AyQ?<7?ITRHqAN<!J(@zdAzANA0rZY7Vig7!{_OoMFITVF>g!RR1C4W=H@
zDhsG4(6`=)QVIlRbzPvFm()~0ujruWzM%Fla+xRbW=9~m$zY+CNo1)r5?C$Q8L>$y
znJIc(I+6BqE@2)!aPu)<pLbG2MsC)IO=lY5^}PHHpS<mUJih<P;)KjY@pZ`uCr)17
z3qdIKx^dvcbv6QoKH0az<o4o$@STX_@EwN0BJ1J16@und1rgpxL*<G-i6$kEJf-dp
zgONR_o{HjT0A<S|(|KWwl1j7FkWf1W4HSAE$pVjTs)x>~?m9j3=sklFTp(YGurt0P
z=X$M0*X-D`cSqDfbI|SJhrkG>^w$&a@P(*+<;6}OR%z3dBB?TnY~BMH_LPi?)=;IF
zSTmi$pNcLLL|}c>mKc6Bb)T;>Pq8*nIBfw)Fr%~^Jcr)T7FkDQD-sdnOo2bSGA|C2
z&{_`{Nq8*E)6fmP0lqi121-!Nh4HS~Tk?@}HTOqQnmYLzEFil-oEitk6(3_C)r!oa
zT2T*JZO^OIBtoZ7kkJwYrgeE~66FFS$S$RZM@;sCMvSh&?&FGL#6$Xz(nZKy2!n^?
z@OU5%dBQNiN!5!w@uAdL4~Sc`d}~vVnzqD@TMV-uJiPL=&QMgo=wK!x=P;@3OUt+F
zCL-oi2`gQ}Tu<#!q}ZZLr>O!J%A?rZ0Rf*|0VgjaPSBfsdkcI<R*6mgN_Lwx^`#;K
z{r-r!8nd}*_P{TxHd|;Y#4^|q@(l11;%5i*gpLM`EwOCCYY}vy1LJ16Rh+Zh`y9C%
z78|x2WEW{3tS1b_4*L`ncDeTz31Qa&I5v#K-v)q_Qt~}a>>Bgv6%>hoaG%I0h#ZWE
za&N?4a!{^TW>AiibkEFPb8zN5%Fj%MCsZ%Y9iKi<kVtk9Rp`?yLVGZhgH~U25McVL
z6cMnN#B47Pb#9_WK>|@E`e`2m*eVUqyc18fD2)zl*c7GTO+^hQh45i1mlPFk^pPqN
zJZkfb&pgZWyCw1oh9%M+wiE6QP%GEPfWk$pafp0FuYrBa4*Ri>0P;?;C-=lW5Mw1P
zM>R-#eSE|rnm}^EN-|)n;;#a1hkCO6J>}DKVnT@kOEVSGQKN-MRw-nC^K|D4Y|R9T
z$fAZoW@VYnPB$kJECRiW`fgZ}Mvjs`Sdc{HwnRXnHxqC##FTGY(y7FVl7JR*=;hft
z_^Yybv0YC+?jmcp1?)J7uhGl!(6z1b{Kj)%B_4BJMv7_FU`b(36V<?~i?;2w>)1i*
zlD4%EFJ0wAwOae^!}6AQ4Fi3pF{DTjcjew=Pwz&Os-pR5bpc%RWPqAN$k&1DP$wWb
zc&AwtEj4P)fRhj_p%^D=_8=h(oZSi5mToCvP*-^pv>r)~Wh{XbcvU^d&F>aI`3z61
zu&B7~J+3-9A%xH>CD%EOn(zZ2=kB<jO6nEFjuJb4TjW6a#U+XSbV_>>r@nh}G$udI
zIIaHhQbvet0EH0kTS9!8_2}-I)uDQL4wbX8191AI^*GdzHgWe2D5_#S72XfQm}=Tu
za)Nl3ZxINO(RXn7bJTT+yd%49?xf4c;>jaQHIEUCsVjT>{uS9if?}hx02Qnut}`gE
z&Q7GoLS!O|I(|y>HZ;(ox|xjZ$hP;>s4+T44zDqlr0%A6j~&{w)js;<p4t8a_DNa0
zaCSlb)Qe6fF3@a%4k@-{6l|v;BL+SW&s;-ai$nS)#zw_}WD-TFu?m-{X62-YJz;n-
zaY9BCBr(9M(}=cjf&oTXD)okpR$2qLR1MP$+)Jg_V25$G?jRLuptoN42Cz}XDm)v6
z{shFavs(q@?cv@6vbcOh7V^_1kBy*Z)}4B)pT!MXd*3P>;?`r_boZ)BX5hpsSM*r|
z$Cvqs7-#h3{F96FF5lvw&*Cny^PDA0_Aq1nwL<Uv9(n4T-m5iab`#phJUQ3Hyoaq{
zdG~@orE*kB{uPWRlb%zV@uGMu{QM>-=p)Uc;x{R4Vs*YiG^aAxFI_r`x)m};l_Wcy
z{z4~f6<C!%U@z;6Wl{!H-IR+ioJwW<!4NYpaKfH%i?5mIH3b>VJnWM@pi1hwWY#>9
zE|42$b1b1a6AT%g7MAan=#yV?aoss@lly;z(}<q&bF8~Mz+6<{G)KZ69+l=HG@{8V
ze-%a(UR)wIwrHoSkzSOSP*%~Q3xKP>h3ohDG_2zSmdn@?ib3Vu<O02vxLE@Okkp}L
zT)B0MbbG*l)Dkj8w#-F6u1Yp%yw+zdIgPGp5J%hX>%ePJZ%jQPZ%#nitd3@!d57W=
z$n{I@Kgx$gQtsgk5;qN;y92n(s<r}07{kaJ1a;2A?i(On>LsLiDVmzx_APKnm{ApG
z6xrW!75L>EFzh3+H!QHt$}zeG_Ho2_?G_#1QOv{(Fs|Wc_jT4iV~Z*UB9`=HbmZVH
zh)vb0t6Ub=Wi>nS%+?G#2gw|!W0tDQ@|>*d@OV)}A^LRBNbuGvt6yp(3m))(|A^V*
z@k!4JKha1qLHJD>AmOwbxIXNw1OeT84iDVtYf$XxfBHDbAvbn}SS#0?=NIb_z52mN
z_0wZ~j*8$@H^}|LKK||@Nq~{N>I)L$6b2$jBb69<Qv>+iiM#M{pdRAxH^gIIOJVWA
zxU*kN7Z|Mxqng4J>9y6xZfE>H*tkPHvu$ryF}vknFreSpPu~CRJwXHCg`YmX{72CK
zY7Y4S+-#^hS~#0H{%f=G2_9*oh++DKf}y82=>y4?iAZhW_6`Z11A_y9wE#sG;`LjH
z&t%kSSd)45)3mDM-MWWt^!4lDL-3}W*S$M&x%8alS9+Nu6G&1gJtSgIx9j%kdGtKW
z%znPj{ow;?kNe}i*QawMDky@klN=JXp0jEX0HFfdt$bzQ3_yya;wYWpObc+Z;OPOy
zVE8O56)(TWh`_X@pOk1+B`RKFSQZ^+Ux=p~sQCIx(NY~m`c%N305UB)3mDY_zW{g^
z<f;3xDQWPpiaTarYF9*oYz7<sculQG(6PIM>kdxs@ow1#Sg0=aTC*~lU#x9Ux+iRE
z4qCf&9HIiQ=sP-<k!|H@cYt9oj$~>|b9Wcf8N~1kjGju2q=FVoY<>p<5ccoCTB|XI
zO9AE-$f+?k7fNVL0`>yz&58+xXwES=+Xr=&VyK79q;nR#aBX|7bM)&0g)YT&N^pYp
z!kfJ%Y;+oo5lh*hlan@E2kufiaSnEhXCiLb5yaw%1a4+Nc9_IY)cL|2!{bROZk(TO
zJ7BJ^ithL`NSYrL7CP4m#V0f<40zs#?OYX#+Mwqf$Yf|Nff)`UD~S6gNe#CeGBM*}
z*zo&dAuIMm1HjH!PnfwBUv5DF;2Lls?5qcIYWkL~!5~7Guskfd0}dfVA63;5up;1#
z+!P8^5BG4}zj|tRl;G%i;P^n`B3r9=;V-D3qz8EKET3?@0OzdE3-$zh6z+MuQas96
z$ssk@a06E#)wo=nE(Vq4Hsd$d0!=HmR8J`eUY;?yHXfZ7m1E}XZMCZ`3z=xPbB&zm
zAb3E(C$lTb=_?p)F&h_n-`?)xnND8^NyceFe>6G|)J6BY1fT!fB*zpYfbT#WsRK(T
zC%T@WcJ6iRM~Hpigjh04IBhyF<}!>YF6TxG6F?jxrhiEI!LFNEO`KD<UVIX)g=(oE
zc;O)NDA37OE0QV0(7x%sn{b(f?PRE+4v5}IQ8L27dRWq=(=or_J|awXG}h<9@x3^m
zx^Lpd&~T_~M3P(ix!sg>e9Y(ctE$*%uYA$Qk>zIdKBy)(#q-AIIw-riVIQoGXCU0&
zX7Y$w+!3#7InI^6s+V~7fyfOOOJR==EnO;<nN~!D*h4WPtEMB1jTTm9I*n7)L*WxA
zJ#4iSn!g`cMQ=k3JIMre>^m)iH#*3}_aJ80$K52;0>++xPJOSp)|OIiG}3w(&(GX8
z(YedB5|G|z70}A;^d3b9E~G9CU0<<a5yD40bt6@Z?M<i)83`ltBp__ZrSl0~$1GUP
z5h5O*4Y)NgRNKxpUX!_PM06nWzsdzH3iMLmsqXZY*4@n~_T*iQk(3*KH`nyP0fko;
zo$4`!93YS<C^R`4`*BiC?n}FH0}qoBBzi^?{$^glCbLXgKQlYY5}e+rV7xq5RCY-W
zn+QzZ==_@%C8Ru$Uy#pPM78Wq*kWulRJHEbtP|NvrYetCB&mRUwJBm1W}P|^%{l4A
zg)ZN_UizDyF`B2RTCE)?Ahn>jgIYOOUSPICbpWlvJGm&Q@cGvPqnvZK0V2EL_|`#9
zVKPN76f3r-nj;kXHTtgP4Ggw5c&X;t;kmukcHj4We57wudIR}oUfH={15De?a$_q#
zK>h%vLOgL?<~{+biN6G-r2giW?LU$yWDKlL?Hp}PjQ{z8h`W)A{r`#KtV)=$MPWn@
z@nuiVpG!(fNlJ0FAQZ7s#H5=juoe9Jl`^w=tpg<y+w^Sw0jOq(3K<sPFH{hBCMpkR
z3?v-ugnvZr<Jrsld1S`!2Qbe_A;f9x(P4M04Lvt7K7=`ArMdx$Tu8rq`I5#58mQ+)
z?c%~XSM_Ebd3ss?6Q<BxvGP0~lk&Q!P>7{mEZD$}0M#{})J!nv;SscoDkK*f4LL{E
zgyE8o_(ZM8Wa8s`k)bn9<)M+o9VvQh%!3)!izM`dRBKZ}r5(h2RN+(qv9hU!u^0hy
zc@{$ic|5cBnv{*UvZ1C^8zf-rVF&bMurTPmgY#aL@;<0<z!%z1pMxF%07q>@)*|N9
z*2BY$_Gfx=_fKg^A+zBaCxd8|>~!_cl=qx|$9M8=Jfgvb)RI&<dM#jAteE$SC5Fnk
z^b^UZ7X;_CJki()d?;JuUe<`nMoj@wm2nH7`CrN&U*i=jUC8wHoF<qo0*PjcZs}Ah
zU|~^gcTC}n8&ds*9KYFhEoAE(WXzW2bY<1*wn_%fEIUyD$f~wS|IReEPQJX)St-M1
z+P6-n;jMfO86fNC8*s{UM#;)MVXzT=&Q3!Cd7D1+JO1Ke%dIZuaY1MRw9@bz<Bxip
zU~l=p@(BUV{UrqOckAiD62PSG%*+f7txY6s?OmLeoIhcJf5Jjl3U#s|Us1DyK@Wrl
z<jYyn^>;<JqT!H)9Ow1`%M*2+=ohZ^m*^i8<AePOSA|iYrEuZV;aZcO?CF!9^e@-X
z5AZw4pad#+*c|3Narr(~jrHt+rCsyko#-h+CTEc1!#A>Qsc)#agOpvp!bIuNiXtDx
z-(1TbLwxl2TIEZ)Hdbd7P$`A1Dw>KMh;FpG7IgF}e$FLGSFlmeU|3Z*CKrkH(?VyP
zh0q|#G^RX+3#UkMy^%gf<l{+ouv#$Sf>U49v@&^ZtjmE{38h0LFV7CfNf}=WHROxS
zDtoLhkKPiMf+I9R#9-Qfn3#pww&@Z%PZIp3#?lCh<QMZCDQm5v)<vsaoio^S*<^Im
z=Jo{lbPxfD3%yt5>5CayZUL52>oZyv>Ntp5fbne^^giQy$ZiSX^Q!p=r>X-<qLcS?
z)mZ;h%_03acY*(bmQ12(Vq@q0xq7B{|3vdX6}$Zch~Ctzn!>%qayxk#Y}dm5bK+kZ
zEv@HY=3|Oyw-`Gj36A<c*DNfOky33R_h(nShaJ;x)5jB-eI$!0{jk87s!@Ke2W|Vr
zL>E>Z|L?ytL!-Z`)hm=Fq_;Gcn}P)9O_jFUy5u|5s41s>t<^swNG9{w9p=`W?X(qS
z)TU5sZ(2{t#&sRWgq~betykAtzL%9!vo*2d(I~_|sbac_u1c+P$a?No83?&Kc?xFn
z)XY#rKPHe9Y-0&I(<#g%#(?KciCK@$QN^M1ijwkQ<EKMPd!53AhRWJO%&r!I)cLY=
zLN5vlxP2ne%_m@hqv=CDQb6v6rYku3(=1~Lnmq^P^Vtu5{{GK=w!i!A|NA#a&c*rP
zUYRc00R~K-77HP%{9;;uYGfgU-T<^g#c~kJ0wMYItwqT#GS|DI-LAAaOm`rBm|d_G
zB6Jd-O>e&J3+{<af*Ly@I)_zJJZ}Oaf)~J)RdI5cL0PP<8DM*rhD3;6UUM7cM0-9k
zja>Ewk_>rFI*#h{M}b)?l^G@kS&Wp4=4xeaJ}ISQ$aMB{!f^Pg(}{MAe}0;n6jM2s
zVh;VXwgt6BWRMmz*9<@dKf|2%oH(2&(fLN}D)~ExR7cw{b7$<z!Ni^MD}tY2sm$@l
zrQ>Qt$U?L!gt%G2MH~w%Mr^Ek=>xg0X0IH28J=_30bLdPpYKfRZE_UNz))^Om(k+p
zM{+5=YKrr!Gy6pvr)^f3A8$uK#1Df8WX@(>*KUA$8#Mj^yestuSJmAk)#gC+e)H`z
zgTRKB_n#+c^0^`o-{+cf{pC9&^Ecm_{|4+dbFnsX{5J@^O8Fn&QKnk$T{L+VEfFy4
zO|&VrVP$@)K|mIYjFcgeKT=E-A(}f(T_dpX37!kC-**tM#IR<paTMD~<flxJZnB-a
znUA~@pYLBr<bWF7<3wT9l*A2rqM@Zr?BUu-s!JU}*_kl~w}tzJ<NK_y7@SYD@|EF?
zw_M$fXA!4D@N6&F`qi|5$Cy!{JncpbP`yY@c*hggk$C0fGbP=cMbKC?4W<U#NUrIj
z@#)#IHMe^GwDt%BD1)wCv*A(Rb;AuW#Xyaz?%$Ujjj}0-Ttft^Tzk`{@{$8MpOs}@
zlA?RJ_ANQ{<kiA^XYfpx!6mD^WRftMerc<SlyQ(6xjVN<a3ebhiNT3~gEW@<=pULT
z?oalkiams#!J5bUs?_eKa@-AvU+wg5WzCI7okB~T*vN3WV8U@@Fe{ilZ6zZ`(r)}x
zdb8=1sYpwcmuhg%f1kALpeF6BV9e!8Rt5~a)iN`P42p>^S9%m5I3=t(?Sdku$XP8_
zd|*0Z5>n@tUoljdDe2yfvG}XMW<w=|I6gGC?%Mkz{`GtEeKPjIvBU0qaDkYtVTqOy
z&{zULW4p-}E(lu^NhgX&dy~|Xu*|Vt4>9Y7W8F*(R>@2W?0}aWwtiMl8){<==x@~p
zD$$-`UBTbxO%Q>6UzCjX`XZEa4ZQNI{C%)rh|I$AgHS8&V_b!3-LghRzGzx#wo_sb
zif1~bT#r(}z}3ZuA>5(z_dNv+Cgt=Du-J2qNNM);Q|P)KjN%`RCXnJBwg%O?#%Qrv
z4Tg2`???)dZiEe3erkCk=*0HXwDUX?rc;Yb^;(R>(n3%uE$6{X_AI2uu&)1fbbz$r
zBlrHSdAh%x`N;mwy8rJ@2$alSoQ>_=Y?Um`Yz?gcaav@{Fv9mUAUeUY$Riq>nvx;o
z5DN-2FgokYE|h&TCS4?U?EpM}VuUc(VbBQ8#xK*4Bli&c{)A$qjQU}Q8*%fQor{14
zl|3GbL!<97=LjUfG#6e;W)g@ES2f3jxDu*vN|5Pjg>5^@h^6Lou++3}_KspTysW(}
z>B*)Wnx`4w*+jXGSgNE>vRna)D`gbLV}pF07Kd0VzBQo$05BiatcMfEn<{Z<J-$1K
z`=5J+<y*n;+RrC}_m_M7|L$4+GlTG-qRD?gD+L+3&yzJ<#2Oq4v8OK*8uDrf+YW}1
zkwiFwj5n!BH?_SyxPHUB1^Xid($|lFytNntQ8Mbx<e@8_{nqv9_SYLIkZoScKtB8k
zlw?f+m^Zrcd_q71bb#pqW;{j!Zw$thDzkxizqU2J*kU{_80Ul&R(yOOl%<t(V0RVO
z#5FE+0&F1NQNWP!@1k3mA<zZe6Z?p~G=>li$?-A)`D13Z4nAlhY$A8-$_Lg~`?_12
zr@=@v4lnF|IyEA(Z&_HIF6Ct(7a6wITVVukUmFhWk~TM`ZHI4UJM4Z`turl*%4WQE
z4iWFp<{W)zRlN+&M;(kucN<n-x3mF9Q>&8>Wd=i_X5%F**B=~_9Pamn4OjA9^fi<t
zZFN_|(IOk4_~~3m)cSro@}+fal_VgNf5ZX`(fAAB8chK0C{<^bJOoRy%WC@WCQA?d
zz|g1QTZ$@kbG(*68tu~yL!pHytG7BusR`1)2<;!<90t3U?RKBb-1(P{@84bOe>)B&
zY(LQ`N0-k_)Mo?yUr?!p8QXOM#Ni%r$Os1<5JH)ZX5jL8KPq+01*HPru$xlBHpIi(
zjp0iD$gap`scq^|3PpHtKR)Fp4I$-l`wFUw{q(i;A6^~5^m+(<L7sw2VnJLb)dz5n
z&be-z!yZM>7{QpjkjdgBv>1)`e_+9kC`!B}=Wm~W?6mMiwP6Q?S`}gAHPv8s=HSDG
z+;=PQIi_qvISttvjw`=#?On67&kscwnT;@+l<81VN2SYDIa?VKb4<a~B_Wq!+_Io4
ze{%n)D58c%$sJRIPVA8-S4!M*H3w9<mWD$>@nnL|Ei9ue7f%OZ?vUVAdB%i!H^2ro
zE!*k<&nX-75`4gzul_md;#rcVUEMqtztn*xuRu|+iF(OSft%&&3;OKedls3M-y?h^
z@!ny#tY*6~j`{UD93sXh7Nl_Uq|-Z@4~~JyvttqTvtM}~-B5ob#(5{BwLsO$!P#^c
znOo_~THy%%R8b&SU&tN;`6kU8)$KF<i|0$vB+nPqRO28l<}@|>G#R(N8S(9`1KLDB
zl#@7dJ=Hiz_v|$r<$4+&o^6Az+mAm*(|ps``DLFqg7=p-qVzYn&i|p!{zLso@}K`x
zHn4K~$DUB7_D>OYkafL`yTsR`h2^q2K|!d-vUqu_;(RcaGO&WDZfo0wU}N@%j(j_=
zQ{|D%cX0lvrfGA7v#8H-<eu_<cUxWYykLI`eMh&)v$h$J>9!f~KV^Y-Kx+9NjA01I
z00Z4&2HObJufw#1q%`gJTEoc5$SFEc@*y}97>ax65wPFsHXU|}p{<x8;!>c^boxVr
zqJm;ct(ophZA50MM1+pg%?p(2nB0-ur>BAo3^g_lujt|fRpect+Utd8^zGNdr(mR+
zCduKL2^3&U6y~Xl!;-hc&D*DBbSOowmFBAI4c6m9ftc-CG^2Vy?f4sxFm0ooquEjn
z>}fDHre{+Zox2q&Z5*6*)~FJOQdyLX(-c1A0#>5o<6#CYJMuw8D}*gLDO45uOO<C-
z^`LVZN3A-IS9$V}03nBSb*=%B8S1FX3X;T>#c9lw$TKCaCX^odJ*7AGRajgD=Ssm9
zkFdC~!tq6lQ^SaSuw?gV)R`eRWulA&GT+C?Q#Vyzlf@P0ZsQwmEWhP!Zgv!dLatd;
zt|}gl9~P^f%1TnIEeSM8^dBL2=lMaFCvZSm1Z9A!wKTU`j*xgs;4WzDs+~nhn7BU`
z$W1BMH5m%CIyV_+Xtxl<k^qowo0U8!704Xd%hIUy7K6%OGP23Qz!B*75+GBrlOgp2
z@mul~OYn`qZePcU2N1UAXKJ(Fv_JTny#+&n`|41<<BD9ZKqv}M2lBuGj=q!5M~NFY
zfsf;?H24r7wOA)ollEyB7N5%Mu<y3h@vIKR4_v*bh`8Ld8z27Qjguk6=9`_>-=ami
zH&c|!U5b%??M?ckb+<zchNXx%R04ymf;mu(LQ0lDXkRFU4ya>8#6;&Nb_$ur3i?*2
z-o#o=*j!OAV!c)Pd0?Zd6j%F?Nvy9_!dr`!3L<7MVyo3}MzK;#L&IR;M8?P_3ei%O
z3|VMfsomU%uQ@j)OgJQ(SwR6F<-|HjkFN=3M|#>S^tiXZ*(I%tnkR@SP$v~-s;tc<
zSxxRwUoZ00`PqN(>CPHzlmfX0*BjlR;_7mSjm$~`4L-HsZt7O7P=0fa6Rk--m+Wb-
ziXtWtUSQx{kPkB^pB_f?;lhNU>$^a!efO!;m~Csw^hv$O)_8MfkEZ(#d7ytRSG$AX
z?o(Py*C|_-=mi98C;zK_d%_(BIINJUD)2xA>I~%hK28Si9k@C6!uvB!Ch-;SNRiLN
zi=f&p-*?9w=CMR>d!WsXFgKLfpPhBP_F=iwyT2XTR{bUTo)UsBaDR6e--|g0X=I-&
zT$k&HixTduLr9LF=OQ1;FYl)-AmXPG<TrG+D?Fkn{FN)v>V2fWCnV_CAQqpJt(#O!
zO{dRPu^`0$C8n}_FwZ)F=+miV_Gk&|xebowbE+*DrAu4E>=4k)xJ#&S$0Y9;PU6Vh
zw|paULFQFMFL&!-zg)a~RIEx@8LFtqi_2X>PxJHTZ}PgZ!KGmiWmo;yBmcSgEwCU`
z4w~GX%PT;Qu$v;p!QUFR?5#`Yfm)Vb^u#u*TK0DUX6TFWAFvUh?<h(7Ckz=3_^V6s
z-`yGi?etVMak96wbutmQaI!aWHZuRW!H(Ofi{!g(qG^V)Uz#GNqB)Gp0vH!CRf}O?
zNM5pp5_YBb(!!X=*zB0}vi5Ax9{n*hUDZzD1iABPj{C1jDc?}~W$%*sn03eS&Maon
zT<_<HmdC7gyN}mBDWDO3lK7zmAW=okpcFx9v4tYOYJEwVn&P-#XmIjkd#dmS4rad-
z)agAJ4<_QJqj`>4cGStwsQA|2xGSv^c3ne`d~RDMX3gpaw!r3}tg0*v55ZPWQnxy`
zo_HhoP3=aNP(5d>%?w@(b)}U38VhW1SRo6~+k(<GjDr)hLJVi~GFp?6=O(+lyA$XZ
z_3cLXR^c5bNgd;@U{eg86ck10;jkquyWMj{H7V5YfnT!=uWZ-$a>z&Pmr?4k&-av;
z7};wrrlhW-zQCQdJmXbsY}#5T#{%X~>JuZ6kBlYRkDm&VSS4D5kFHD7ZbdSSER{3P
z;oM0eNLLje+v*e#v*WsJZ<SccSik}0?I^7wt>%)tq3?L+iUDeMI6_pq!XkYlXm)$F
z;7(NA!=xd%9~e0>c&uo!t&<F`;K5Yr3TpNuL)>2~9{IUO(_O2jw5OSP_2hfdI=}Bx
zRhPHM;85A_r35@GcgErl_>VmL=l|9g3nFYtzp`7B=VO9%`N4W_%JHVuRaBy|8}bzp
zML?T;4Box=>sO0E<&}&SGwueIw%Tepn^im^a3^k<z$_x3SADV<<1>s+$1O^{pw&bR
z<&rbl<+Y*&F!@mD)xGT{=4%eDJ9dls43Wm++aZiaul>czjU9^k1LG3yRodBzINx~X
zAxq|9V#xx2$yUQqdMhyvh;j{$3OY5wv*jk0?SQXS$GkmByib1G?$_H7!o?59@6(|-
zIZ)K6>|GK2!5CZjQ@>@$f7|l(xZ33K6_}lcivq^bTX0go_`#%LP2X+vhK!jxiN^2^
z1>UKcrbl(+pOhm+U5xTJ!Y8r_ITD;(=09Pn6K*_m8oCL6?`pgdj#`F19$69J$LS=Y
z9aE})u@@K~qBvX)yNBG%e-qqQs`U)}A;v$TCVo5w7hE6WuVP&B8220Or1G0P9Cw7(
z>htyQ0k}XNgt&9QEwK;-v^tf+?{3gCWRs~y$Eggl7!<LC>=I>um&bR6*&pKQKTvWA
z<Ok*M2CkXk6ki1&dg4cF%61<Sef{NQklz_`i&|Odqju#-`vhA`0B@dA`)C!XDhcp&
z{9{}Xg>qkY`@qry0=U}gJV>IoBND0y2ra}$5tGP78&eqsGr-R2N0iF;Kqtu){^8t>
zELAPt_t{sG{-rKP<^S*A>OYjoRm$hGf8=W~*mgAP<fTvr49`@U<W~;WP*IRT0S|=2
zoP6YSH^X*t8@uhIMTLhW?82HGvR;QG><D39qRtzhBS38#Uruhf9c^=)%}ieM^ZNp)
z^$Eg&ww6jOq(hrbvM8qE_9|nOO8=^L-dtfEU~nAW>i79VtdVG|0+vtg9kRJj$A6GA
z@z&mi1|FlAYl5kqAF9huQP|D<>D*3-DQU%2rqv|+h4-kpLC|x?@l_m*&#j7L$ETG(
za8#2Yrqp_@Y&R&lK4t{4Ru%Tb=2lE!k*s3(!-PTATMsOf?o(%T>MnSwMnPtM#alP^
zC>S!Ogk~KWAm|p~&kwC4<rH%%OpnQj@sjo8%jM}l-Ty;4`KwkE8xnu#&nLtE-VLNa
zwjU0`zdh@Rx2O<s@4e3!QGWpR-4}jLp^XdcRMQo#Y*CG4kbgTd4>SCpY$+!0;Yg$K
z(JTW@%@oDfDu!3ua`06iWg^DXw{>Braa<yYwCCq|+?QWOmf{-%;Bs)r4r2lkA^u-Y
zLKv*|QD@4mJA@^cW*M#Y;b$boy-Nb`HrMWdPFI&HFe)zHaGs)W!^nvmF8Pw5SZ8Sy
z=5SeY{lxk?(?;-lg<%q0C+1XKS1SsAw-=y_z*xdc;~B^|5Rac#1#1!Mm8Z=4DgS_a
zb;ilo$KcJzVmo`EU0{?Mk}^eQ0?Go9A6s;}EM8wap;zdJno9XC%9I{SC}7yZsUF%?
zmKBLvN@j41u?l+X)qhY;Guj}_I)S0rQ=8DL@#p@hH@7^-u*>N#MWINcrc~Mw#Fu&S
zcYBa5^FX@?u#t{F0?z=uroLE2yDAf?%EN>+?z;=rT-l;g+|sapSLzBsZrX1*t&vC>
z>B<Knq*F*u9vM0$KY(I#n4Sqpl!V=}5E9G(q@h1sqcv1~VmRub{E0s>XBZ$LC?KHQ
zjNm`$694%_{`uGcOw@GxPj4(&j!!}cC>Sab6ciND&Hwc!ynp{o{>5#}=3hKa)S(4%
zm$2UPX#g~!ga_Sqv&I@<4lG3+iD<?$wn#y~GOA>q$&O~2K)RVpST|YnuCHrqZG39}
z?PR{!{Um}mjFwq<Z(8qo=)QcZX2buHxkdwPO%ZqCemRx-@%sMpcA4w_ur!hbR4Yw0
zDu%~LA1aoO`!KNtOn&OXK!A^%5F2_pOCCz>$WgJAh60|D2mc0x?^FN<db8`m>Gc&}
zj)LQ25S6EVC-UYw2xY-uk?JV{_2m#Gt6vEwNA)Vo%SW}(Np^C?Z}TGpx0|XZmtKHc
zchvvBbVr@9JER6<2j{6Iz>e~%IpC6Gci0WBGcEK|V)uvIRUpr6EfC%7Xn5OGo$?C`
z<!R~7{S3^N)2m?jTQRQB;b6@*4tS5tp4(Fwif=Cg+Ur>O5=Yt2jBI7{tsd&DioT?$
zP2k*Cm59(3bOX7;w+>GtkP3F}B_lW_TKtuLn0GRU^1dC_Spd$QsuHscFx0{CjFp<l
zMySaLox*!dR%mA2@^DNYon3Ra=-38)ElP&V`fqkxW=c*{M<KrjjDCguj?S58tNF3e
z*;cjigX&8sNH8h^dsEq3wFvUJW-yVwvV6|jpKV#4x_X()4gF?=?Un%>Mxt&Ub2=yp
z=Vj1hGQ8+ZM66v+3R8f`Q`UJx+Y6@5exwDaUM%S~x>{pYEK}*oVb7>E4d&yjgCDZ)
zdmBx7-=zEa!{Cv^LK?%6mNu-wRbwUgLXx6xoLwW-gnlmzt9{3h)q<eIi%g8Rpg~nI
z48OWNRan4?$>a(ozZ#AYz!r;(_fWKVH}5J;LzKh%p{14hQ=(-u>&8Gs@MI|8o~Jxd
zWMyxDz{0gzn8h^QOilh$VvmQi`u;Q@y=#NP#m+hN>%js6TNdo}VPHa;#Z8`q4>2|y
zT)#?!smkrL)l)=}hy#vM5BgF&Nm<i=v}}SB5z^|}txL1}>y%B7tX*DtI;6Qu+WHFA
zUF&dW%2ARt+BrxJ1o5D{+)Z%dw=Z*DDzQx#TEy*O{ZN+iuC(YWGh;HLZM?V`t>y*k
zgaaGgjf+rE<XL7|73i!7mL=ujEwHUjz3GIHqyRxVQsdRKYqnDIgS~h~HnIJ1{O~G#
z%M~N0-V=aF{NjnzX<ZtU)hx0D6-5zfAD&Ouh+tx{Mjt=g>qIv>>TBl5Xnew8!V3Z4
z#`Y>&8w)LW7jmI`K`2`hb&WW6zx0JZ5qe<*kHI$v19)a<1=ICr`xaZ0N$2r^vK$cU
zKHoN^*@cM73WuLI9@s53RdtP^x~o>i>z2dr{s7+ihiyqs{jFH~8@|SiPpjAaI9oB^
z4HXCQk+f-HG;Pj->u<1vyd(@;VVYRI4Xb4vnQZmUI#?6&sL3cvyGClg2j}xs!-Ov1
z+P)itBx{aeU)2T+exu2AVP-FBrxN`=rsW@WzBPus&r5qBTUI1Xi&=DhLn@U5B`o@#
zu#jLn+&!VmYAg>}su(y`cGIsR<crnH{8!qEqLjAkh`IJ?=Ee!q^Q9xSgs2v??FxMo
zjlpzZ8j5LEVkFqpGd^PzEIPM37M-EPWBEE@T{MDWUaED6^avYw^`VK?f;||{PH?q~
zS%;>G@Aj;AvAZpaFmPHL@#LC<sZ!A&N=U-uLuA?&1>l+BY&jzdG^|<ZWmsm8<xqJV
zH{At$WOrrmXj-V9CG|&MY2<`LRp@2da>c5_y(vz9w&_&$!p&5;QE8(FwZhf%sPUx{
zUc1V|{#42e6tm7gztQ}k3s-y|eguNihL?>|@f}k)hZCW{GH%03uaQNU<500iD=ufv
z8_TE;ktj^&I7+XC^n$dZQ5~9|$kJNh1f|$A8y1&~YN939iDjr3L{K6Rl`|c>?c3@`
zRiu%*l_UyG_Tq0RR-}dVf?&up=tiU!N3120{46u9PIH5g*ZT(FN$qYHwM(Kc7_{G~
z-a69w`~=JzK&{i<`}=mWirTQdcic%_)4!e(b&6Tc-MopQenS+R`+V5R_`0@!rY3VE
zI*#4PVG!y<|6B1`d8WG<Q_*COg%IwxUrTiMH0LJidA$y%T_}B<Y}7F8>Ep04U-HO!
zqUulPt0MB+Lt)*|5b$n;z|wfU`zMAtTJ^y=yvBxnPQ)vgMi0<mRW(db;)}~M7@LGP
zWsQuXNKw~`#t}z1GR+x%dep1w^`9{00eE!-%Z3azGg4x1*X^_>1$%>rzUR^7Z?A1t
zge^<!;@*bG{e&Elqo{(|Do8j~_1*S^kJ0kcyLj#*P+2@)*pz~@Zl_V+j$zh%jj2iR
z6uS!K&zX#An&@m;QTqlg^C0~*lTbjm2QeH?-5!||6A~OG>&ED-as6nN5+wiqp;_;u
z@`ua>JEp^eZGWV3i%#aU9e3OAQTU#Q;R4@r-hF18U;hf*(PYDY0ZX8;*>WWF4x1$b
zcS$0XdZ+{NsXT&zq(azQeG?dmUO@EbtwT0Af9{&PgAUOPua)V9*_5>aE%rlk7JUj{
z8EXS{lWB7vI-ZuSmFa@{*h<x##9|$s4sOfs2{?tl{q`PT1a8Z5pgn=GEdgrV^gdS)
zg6ty@3|EZcxe#Hh2wqY4VyK~;2?1Hh_uukNew290VvMZ4D+^qkp$cAz3*RN!3K3#J
zQ|b(!x#^WB1R%F&MkG;<SW67xej4JT?|RUPfm+Uu>L6r1J;GFuupZcNkQqV}Eyvbs
z(TE2%CFB{$yJEK^iLklB-Pwmuhf7Z1xM}5Hby#dqRw$XrJxKPLN)R9zIr5vro{5;`
zt?PMjVxQs`Wv0j5rtCifuP2Dijx&7PgEs0;FD)vCU|UT$ciQwD$KX`yQ#IE6`BR%7
zn=;s&0Bku2I^uF#kEOuh%7m%g*inLA3+%C$6Ksijlb|Z|2o4v$XbqEe4XXCE=UPyy
z_|l}Ie1aL{k)?xa?i}5a9CZuZt--m`&J^wOf&yCDsN8Wr^gdt~1pDCV<Dbq+rVB?o
zosUKNek284`&1+{T#(`3LX80ZoIq9INo`fWFJysb6U2auJAh*|Bz>dUM-qMhN^>?s
z1ep^=U5jDj5(C`IZOR!_kRYF`JmZKvVA!T<SX1%RH(WK%IB|^%1If@L6jrG2x~W5p
zQm06EY`_tt&&gVqR|3kiHkEaQh{mZGL1newufFPFZe|OVeWyhH4*jh&(N9~f0!Q2p
zhttkDXG?fG6U*N%?iRhkjXHLMJ6-9LY|m}y+vZq{+pepZ-*<#Pp;zktdBM@;fid$<
z={U`2XIfH@QF^r&b&n2iwEV3xC^V&CRY^G_Z&mIXu_kP+ZDqgU9Y@PlM$0@P3Lo&X
znjUSH?Mv1AUSx^&`gBSeb^2aHhh%1ZI}*)0B4O$|X6#Y=&QzQ(gk&GOmFc)2ikV#6
z(Y8I~B4cM$Jv}7(B_}UFhb^{|;=ki2vQoBTC&snI7Iso|;s`(`it*<s5;denV1(|z
zppNKr)I&BMYF_diNT}JY7dcZhLu!cpGDg1D;->tR=tz9|MNwZn;M?yFX4j4&>AE!L
zZ3a(qOH^}upnCvbA*)J2p3MQSBKzjvaA?Ukz@KiAdSAPkG2#9+t|&@t{1t>xr~*=c
z@SA+Vi~%}+zZcJB@0k%3Z@<v9IW~z)dF?V%Gj(Dd>VN|_Da^&z;KDr<ZvFbU7>A9V
z<rkVzCu8_axg`;t_yLQs1Cn4^Q3JUI50Qj52~#tEI#f(LgD)}x%%r<UW{L9Liv8hH
z$b2~o_Q@)GXU9LEsd5ElR`oo<FwW(GH4K9z=&x7^y+c$k+gN6&g}Fjs0`m^Xc&PMk
zsHTl{y&P%uX>mc8ON->0d^3<5(|;wj<x<1;BzqCJ*(5sJ*jnBDv4lI~8$+x*{?xql
z+y7Gkprv0VL3n7EPEI_9X2g)H%RhKfpZ<$h$q%+9?*d8{f1pBW6uZ}QyWI-j;5X2+
zW77rV4MLGMMg6!hcraZFIlZFa`5|$qKp*uNf}|nXr7>cS&=QvhkNjRmEwGoF*Mm;3
zwjU8ag|zIs&)X5Q(=EHGwlh<{cz*zY&o|@2>z~}iV!Xcs{{A{D=D*xT{_jh~e_qfP
zW#m4C0=;EZXrcuN+@#tb;_m!lA+b>xr53})DRIjjkEhm}kd<oiJi5NWQ_y9_as25N
zwl-B!!J!Owzk@a7$vnfn%)_(21<KLygW_@);*PQB9mX3nT+TG^Yf|RcjuN7;Z!|WG
zPfa}2U`(}zz_=7-9b-dsC(NNTh=%#pCW+NMi;YFRB@oGy9CSCbJmt>f#-^arzwm^i
zHY{Zp^s^j;41FCt{qgBAS3e;tA^6>W)l6OKq*w8`oo_s+B96;DVd`Vl6;-O&Ze>gS
zk}xgPjL|N5jq&s`679=YZV}!a93$W(mPP1x-jpsuNTuw8C->Km<UzpueP(#0Omez+
zs*mkHB7vs**TCI_C4%8v-7qKG$tXSP8sh`37+r>?BDE<2UX+om!(`qaX3Iv^MubKq
zRxTDK5yCAF57jTZwtcpe-;%8h!4R%OtgX`h$d=_R=d~KY?-|_$Yty#+sCuZYUeK*o
z)VEd{1wL`HO_;-O9DtrB)%e|{eCs_$`D4vhZ#*GFKgVE5e>n#G->mt6cz3B<Ic+E-
z@~%KD6i`HGetO;I!;u!tZi?EPTj(YQ{PI&enrn5*=Rtc`Rj`y2Rpgmuc*PBwF)$y!
z`izvaGsK)u*6BE44X+c6?P%}td^nq1_kFt^$ptFey)!_>!jssXXAHK$yWDS%;eHaJ
zy*y3ptBm2Cv{IK(L3pu8Ah_S_j)}bvUr$@Q5)hIdC<Wo2E5V5|12cv7*-3ja-BH^*
zufR&tORL5h>usPi#njMUt9Z((oJkv6E>NCQvr6`W(6HxaZzr#fJLMP`mdNA&m0H}Z
z-*<m7?&=~05nB}vLn{RSqnV17+J33s;!JfG{EPkpuN=f$1X@T!%Cqd(D7l8TqI2d9
zyteMts;7J!Sm$EYcAt~bU-K!pI%^Q$nE<q6&9v$J5wRc>uvR{Z=@W20t@?dT)g!uE
z`IqVWQi$`F8eb_uon&+z`B&>pY7x_yr77)imD9zOVdxpYeOXd;a4~T)iac~&0eY_0
zqtR+g(;pWT(iNcpz2Q%bp)>US{FWqRqu~;1eZZ4x+?LZoQz+9@X)x9+gbD!cX89Xv
zv(-kS!F`8Vz7ij3_b*`L8%BX61(myQ3!w+_45Wgr$PR}2*IYG)*a5sEFTv;zyV_M8
zCX6ad>hji7+Uf|H`7LSz*1c@<5Rqx;>iEi`6)TnMIYw;m3s>6u7bNGS&CaadM1=u3
zq6rnn)$a}M&d!lw7p`GhI*mkZZVh$fcm<1)jz$|}OT{bw$kfU$)|pJ$GsYamR3H2I
ze8UZV`x;1@OTF^O?IGJ!O6~GFF;SAt8a<jOzngm1X1x=*GPxAq1FMA{N{Pjo)T}m-
zUTbCcX+`!6r!8n24_9&kC^KO5rI=7bLOB#-&FKZ$WSr-<Lliq&lkGM5cn;w=UdV0A
z^KpunLfMg<ZK$zW@cp3IWHAK1HBafPuTk9~jZ?U$LvFaD46vP&OL6f+Ib-c4899d4
zNm?_|+B}nb=lL(eg@R7g3t#N{U5Xz2+F@RfzP>JJSv~Mwt`*HVVRvdv;E4s?WO8lc
z_F;a&kUWFBqZ6eo7p8n5wtE2fd8+JgF4&M?L4F(mCLKJu6hE_1?uDA+-2_!{?QKB%
z@vAjVp)7Z?#i0$05U<AL%&k$+36*w)ns$W8?YkLqV$avJd@GEt4tF8i)>DslcsB?g
z9{v#^TrS&gbk`y@SHLC9!22YOO7zJcT_f)u-ABM~GVgIuf$yk%vku^_QE7X1C_S4)
zo&NXSh%(ioi8+s&#Y>KA?1@)rFm@t%nlPqNnlX0Zo$gQvW3MwxR6EWH>+soO;-h`G
zNs-}bcqlg6yQpHJotm^Z2)jMA?KrBmDNtsT{sMMxgZiKuulGNg?zUzyP|%+vrj5S@
zi2pac&Ohzkij`#S7CvdMnME#!0671vH-#_A7F4?xBJzt7Qd&ill(>qAlf(F&8|xj(
zUDuZ&p8<Bg2s?hQS8j+#C@LycB&gQsXVYihEzAwfKYYBOVf680vCDQ-BEdIZ9Z=kG
zH(l&!`n>%`xK%aGWOhV;6vY!nDJ7Ok?3wM>)if3>Ppr;VF6Ku?mv}7@WKj(m^K*u`
zq#0{jnCQV+yB(QoV8JZ9N{fR?c^9ADlVB-)qYz`%()30db*E5LIaV^Nvey9u+3sFW
zx)@}d2&2`y<(gaD(O*Ye)4`T0=*nt5|2~PF2+MO(opr?P8;7MSn)(nnuT#&2sYD@v
zj*iq0$}9o;tvCW`z2T9cGokI^>CqW6Q~KoC?`$;)K82T~%+oyYd>0u1#%T(#K%k*@
zIJP+EmA#M{rn0x8XW=kYQ!{xXR~<6RWc(Pk+(g;<@HxxJp2`@JLBq@_`upX%FX}XZ
z7febUIC`rpI$_2XQRXI=3O-z`byx5A(y}Xr)~=;k#4fqAPO~bISkgjupAnH1-8NST
z=u`z|Jy^98z%L#Q&--o2u$i*%%)Sqfz?$5>ngZUTniQ_swMgF_;0Vgv2&=>LU#)#k
z(J$EMDKQRKd9OZy#&GMj9nb&4ZU_FXqyHK5{NL2jf8^LEY)Rt$VRX<?*Fjd~Gq|ey
z0@o&wq*gSGDrG0k7`LuCu`TC1V(jcHYD&hJstet940;DAnLmp`$(tF1DclzuoSl8k
zf8_QvYwdRbvgHzp?W#Qh8DGR5cUK}vB;=}Vao$&-f|iyXfTBf)0$8vqAJXN&gnCJK
zL#1qLmS~e~O%CQoCHIo!f?!bA(uD0OZgmPsnrg1w;yBkxobbW#IHO2ehyC6bk$uFq
zKW^?YAN43En$U7%wB+6}CVvUjBV%TkzPP2c|B63z()fGc@g*+zO5I_LbUq=qzzX$k
z4ckt!5ZNG`CBq<Muqge2IKSTRHyavveVOO`O`Vm9uBE3|={U#ui^5aR7!gm+9<X4D
zo7+XG!OwzYxon~M-%#{euGKTgv?~{@>I9dHY%BX>{cOWb>^OR#96s|CP$4z`i+s@$
zZ@Wu%*C4e!luHG|f%S9qO5(h^qVxhzTHSWndZP8AJCopgM|fA!OrXTZ5YTJ#@kZ4T
z$h?41ieU$s1tE7AD9E!r<Y%iWfat*_+~^Orga-C6AKG72<Z;xU$`CYj350<n51{3F
z64gIl!{8<kbb1?VUlIOjb7b~?mU=&nW#%v2oWCXr|8;Bof2=Y-yIyCLfAV~kZR8f@
zQGMvBt=M4#qg!OWzACWGL%;-l&PW*z+5w5vL&2CzqIg5qtU4nE*RiAGgXSz=557;o
ziKC8ELV%F@)0)OSE}SkokNA!nAAO$RcA5ROMj^g@!TMCKi$sOD;t69qZB9ysfmvL`
zKdQ$u^gAf@Q;c*V7vNq>ggHoui!(z7E9Orkj%$>ZFX3)6p^3S$K(q;<xK7Jw%2bWX
zQ)s&KYHZY3g=|}rWM<YRw4azamt&8W6lP>r7^JUH8!B=VC5z@?ucvV&a}FU+RwYY5
zYq!a38iXC>@^a$#s86M&Brl!q^9c1ijnOlUPdq!awTy@E36pAhWvF4|SGmc@`HHb>
zc8(kJ%#C#lPOlfKhD5ZNCu>H-P0@YFftU)r2(hBa${C5=IE~3*QErf>wArdGMaD})
zq|;<wDl2QAc6(^XkZ#JqZt7_+(JgXOa!bJsnUPl&SEg8Bn=e-b7OBasSg5B=q@Ttp
za-O;hScx6_Ii*UxRhN+RgixeT+fl;1=)ovdDpc~k%rt%7z(}^wmm>U`=zbChg0(+7
z+8XjJCtP2B7>d1cQ@AbMAT9sW7y+~0iidVUpU0t+-wJ0VDQ8^sNiG<0JJOTvX{u!Q
zrb>Qa#Ki0j7jz<fZC20;<7YoOpny<_Kg{tk;;uz0C;)Wi01Utg*C9KQtA%@j*MYq1
zA|195KXP5^PWWj3HS%^ecR2kZ{6)H3>=76Yf7XR)2S($077nHLv|6cW>;|>rY7RCm
zQOW4#>hhgfTR6)~tp7eeD2TE?RB~IM^tIeKNFFY-+gscds+EMIwP=LYu|?{e&is*^
z#3<=offPiM+@O~Y7rIJ*G=A~=mS~OQeG8Ieg&_{;IR5H|f|el(>QjiWSLroE#V_)o
zSFjoh7q>;*y)qc3jDwj{@gO=Mf$6IRf4n<E<LAkJp93n`za$we{J+nZNK`q5>}+g4
z<6Zutjrf;&lZw?J9y7d3Ft8irIM?7*1?W^Xe28Ge63|Eo@#-Y;b_=eG=&oj&TN+W}
zzT?7$=6eWND`j(-g^b&4=n-LH0E_kPHqRMOrz5`KyDJ-yK(_khLE+!w%mv1U34X&B
z$!HJwg>yil)G`$LR^zl<?4<Y`gqYGR7t5RQP>SfT<rrgTJiZnr>)rCM!0S*`SgSWH
z_or^wCC!+~-*}m*AngNOP?{T;NCu`B75coX0oPG#hya<}X4J_1Oq6$~8BSx1?8lo;
zjot35M>Hetsx@GtjdAl~CmlLiDFvto+c5+2Y2=1n2X{m$M@^0$4u2vVHy%nhv8uCa
z)1f8lu9sS+yla6`kb%I!{!QFu?X}E)s^^@Wn;fI$%he3@wpw-6_W&pmUDW;WTn{Dv
zxvC*2`#YxQwK{63*41GNRZMBW{K*@}TTB%6&bWRYqzstMQEfmOv~GxDawwyJ*R=7W
zFgt9-OKKgjp{;oiSfF(&aV_V8DPDYzMAntlaB<}6>6`7&MaX9R73`xsxyrSV=h?tq
z#wfwE=ZY+m#lVm-NO8eX6l-q_Y9tY5BzU{Y%8)KhenIMh#0zo3%)>K0p3nDPv@J=i
zblt4=|D)|4qx0Un_2D*VW81cE+qP}1v2EM7t;R-^G)|K=XzZl#-R`{)pWXl1=bU$p
z+#}z9ALhK)HL>Qprb8I>_Z`DBiR0&!M>gk}h8OkE#Get##{;=;lb#JfFSv&6IPQE?
ztOLrFC9P^doi}Xx#<AI|XW=Z|66ap-hEuxHxu|zLKvQl8-6iZ;4#jvyh}7??<R$Ir
zbYc${%gSUfjAJ`#jaIgd{y5{j3nZh21Oxfh^3AePLQ7~%lsUdQU6m<p4xIj3FYvZh
zkKiuAm7z&kckP~NYD;eDIvxFEqKRG89Mqg-qhhM!`<x1UUNT`Cp3Vh3`NoG2mt=PG
zTo;%wMwf4?Vc9Wu{bBhP3zBbrXanBGw`|TkUPUgIlMRJS(F^QCn4T`EhY&haDYR=#
z!gJZB?t3>m9eIuk(j*;0%QANPzO7Xl-A@8Dxt)Sir=LjdA-jc<2M-{eKyeTvMvz{0
zng?Hg?O(f{!zq6Q9KO!q9zOEl9zIDYJ6jcJi$7=gtJO}lkXLYg;h?!D=)(d&MnqGg
zwYRnDCg={86ub}Az(*K1Tx$Y`X=^*JYHZAtk@1wEV<?gMZb2)P(Ik_ZhAI<DtQ@VE
zaVW7)=aa+xYL?ORouiYhvyXQ5TWIzKNAJXQXSdm1p<k~baG&nR;`R}|xN4t><Y1I{
z`jWkDD4v7|N9_*P!BOAd!2=~N$VE^L*(D3kQreP2Os&;}=)0}OizMwIDIs=N4>2*C
z-fDvjoZlQ2baUn`b`nC&SiI#%Rf&P!WjAwEQ@>9@N3(2$WBQVl_#yYjy1an!EnNt{
z<4c@Qz|>v5MAS{O)kU}v1B=Bz<{+&jVKkXe+eyNT4mP^mH)iI=h`F%k&;i0qs4+@k
z_|jNngwq;Jde+wGV}r1s4kLF-k`*OOW~lmbG`rm=FWXSbW5Z-RkGf)!&>{)9zL&zU
zLX6o8rnpd;;<SMs?ErY{9h+Wnun<0eKUuI{%W6Yv8Tt(7H65)1$!0lfF=iJlt6@~r
zcgGSB@o<Vva>A`-!A+K3R!LZe?KoA>^lB>jxOCx!nq)#uY2hl*@y+G**!i?`T~%~h
z7hYIXDTJq(xe~fqm>48OwTw)f%z|TleDIq>NEPa6>e|?YervrCh%=oS^<5><L1M~!
zcGT*ng#YG%$b|Z*MvsT4V;BuHB~@>03!Gw{<movI|LV%oQ!b-yv{mIv>U;(KY*12z
z5F9%B{8?W8QsqayE~73BDIJYL4ZzEf)ykZF7`%qFG?Rt_A2(|bqY5f5&T?A&(;rQp
zmcbR=;EdQDQof^-C5E)0CH1pg*U#8Vr5-=&4CP594vZAbHn3x=DiC%vu+16kZ8VF^
z8;1#AyGtSp*>X&=bhj|sbUackvKoyjW<8*-5}GNsSea-Ui}e%G&Axjx79I4%$BgZ`
zZ@gSz3+1>vKQ>p)(-2{F%{WDnkqJ%QGaFC<a@#efras;Wp-5E)0v|ENaPj#h%VDHy
zryRp?qH3DzJmrmINDpiVPh^GR4%-V~M!}y3raOuyJ(j_2w4M5Z0vEKK%sLycgXwFt
zE%Opm#HrsYz(jr@Xd$_Y=k0wD3fs$afx5|RkMX@OJ;f0Mhub(?Eg*k8C_5q+T!o;m
z;V_`@>EMP`=GAu0GlgiGjxOAP%P1yvIU=0V9#rk%yc0~c@6BANn^E^1<Xb8iM^ePd
zh{<=Ga~6%#%RDP^vVthWomI#QhZ%4!*q8TyNvR$hIabItYx7{ZgQ@H>)dF6G=HtnE
zUcCJ^+VmH=n`o;oqC|;&SfH3I=ghE?U~fTeFxsQAYdU-T$mSID^c5OcFKSccvXhG8
z)b=u&ZfmB~8XPF^SEiw?t*O}MOvVS-fRF0cef;IntVSXn2tz$Xykc(YZ-aU5ieQ%5
zP@b=L@SOy<^|chvk|ET9k`$glIZhCcpQA>UJ^Nigm>Z;KWR&)YH-GsW(=d0F2O}jT
zVuYR0(V`SAN7kDzuI}I)1=x?JWJ+3MmF}&;&G8s;!`o#%&|Qe1ml0YkviP)G?s2F*
zDV<QjqH5Nc)iO_J+w#yE5vp>;gt7iOrZd$GT*N97=dC$P_e}5VWCFL9BLeB&Wv3B@
z-X4-5K01BBO+^s?^gO&V?U6L4!1$3;lcIQEmtvy#1Akm)w6@)jERyByBp(=8o!r^O
zgKmJA175A-TjB%q_xF;%n7R4guik}2er@sv{$_{oAz*W92%4TRIVdH}Q<H@9d=PvE
z7YMnyz9Jmm2ixYquvoW2y;4$Ez|yKlw9kT*=N8)Y4)ENxrCy#3;nXuD$}l+?Bh1r(
zDA3wjixFa%);@U<J9vKs|4~@|{Ut*N%Z(*_0C>B+WIV4ScSI=Tu@?@en!i_ixyvg~
zzK1fb^X9-4TE2^K82=%-I$!Ghj{H;33Ni2e{P_9le2>Mj1ADmqD11tYycl@QBL})}
zi8dSyys$hxc{yNo;s8d}D}xYu!D?4-L7H43+q`|FMGJP(?cyP>puNhyFKL6Fmo1mL
zr9Y5vxTU+u!rg+rO3$G-k($y+yy6??RqZJ@*RVI&+NVJm59*fYp!F{~1?UpJ`DCn>
zJlX<qYw|)X`v+Azp=uHzyuntyNn?4W9F|HQmR#O2l803JVrA?K7F$0~4L4NWrI4_S
z@G}K5N?jbLl|i2_kX->CUH<%IKLV}eqx(pi<oRA17nygY&n{}oE1x@c{c8O@xD;}S
zFq=>4Q)=4OVcY$S&T+69PnVqOLteAdAyCUrDDMzYq&d3AkZQvqS;hDCQC3mJtkF9w
z^Dc~WfhtvaUBcPa{5=%L<w_6g*>3_?Q~cM7a6Ns^%+MhCZ^5Xrdc^3y@YOk8CE8aR
zwp<=|3>bDyu&L=?ZfRW{=Q{0FW6uqt_vO-8f{Y$hj2<$<32I*kLJcvxWSiL1`ZI@I
zsOSO-;PgICY=1DFot)7R4N)M(9CQbpGwPaH5csa%7n4|=O4Ku<{oaK|m2m63Skyh8
z_A3?5tIT6{p(%eheaieC$7#aYJ(Z7x@ZNT+(?ubMUML0C0jt@bjZqpmdrLX^2$c|x
z0`05h#rN^(cvV6#=SrWq+%fcx(asI3leUmMs+@)z!Y6QrA51g+7$pd59(6pxG?w6H
zRqq|@Nb}wDrGyCKM0jc;O<qp_7{0XQX;Rq$%#tl5{cfI&;<p)ty`!D8ospfjy@8{X
ziQ}({vVT36#`sS@V*z*#;{wP-etqv>PpAq0kG}V_da$$o_p+f_K}HG~aKCiCvew+v
z{0$DCy9^xIv+1UR963TVd9!hSw&bhPnCWoufyBkn_qgGWk=w&sNbXE_UoRP@dwTeI
z-)ryEiy{p|JR^uAd_a%E4WircY7)TkxXu{kCO5<IRI)0TYa)lzpm!b_ub?+D&&i=d
z*9_N^4C$BF@KDQ8ej<yvtcWtDMe-!*s(7%gM_G>GCS^KQ<JR&rQ?_ug_x?H#c3eHn
zeNWpqdEAvT0<f|USh2@$l!L3}O$LFlbMef6b%ivzUv*@(I|7gJssXy)HP~QX!>;Bk
zO0OInBQ(sl4Yu5y4qeP#o?qFALa9I`*KnOBZ1ddSz;1<kera?i5Kr^`*e{%wBFOia
zGQA`3Ih#{ZWvimke>Frn2e(`C01c5l!0+$7XTN{x{$Eh?Z|)WQxd<H412Gn|Gd7X7
zFmyC<^!T$MqWFhnELs8kI;(FRc_0G7Z?^+*Q3RlG0}Db^ez~S3lVl9)RU-!k?(Lml
z68m}txu-SIwP{Eyn}O*jpYGPXtUL`tTr6HzAM3|e(=y&5BZPKdweq%IRr(~mJ@vGd
z-DRi~qtJXuGnbdCi#hyx6Z7ny_!Ai<&qiljqhnh1EAUVsu-anqq-s}V>hlE&a_QL6
z2*%r(n6__DM2!zr$L;Y=Fl;zBAp*>do`ee$`rxttQQ7niY66B$3-PLuY^rJevWUr?
z<pEX#dIz#F4FNb9n6@QmFvT^pGQ?|)iFPkyoVeFyx+75IFlWPyCS@iC{=1j-X>Q5+
zz36AJd`jPF#2;47F*=|VUfXe3g<@K0xuR%qv#f&)7BpaxV|4p+#>Nbit;6AkFX|#G
zJq|b^S*oVkZ_{-~5e*W9cp{+42gtNZsS#7Uc7I8??`q}^Dg!)u1E>`K-ka+G%fm%1
z|C0_BU2L5#Y)t-}jEt1rIzZ&;hZJrIGs*jJ%(GVs>_PHNie50gh|P*cWfl0lJ!vYd
z%bU^5tQXDfBH!}yKEefa?x`0;?Fidg=yF|WrY~*sy*$BgBi&h*872;+M!HdNdaYj8
zQOWZxi<XiB6;JQ9^S9g4CG#7VML(qsqm4)JiwMWx=EIse(`K9YLZmEEWkWn{6-zBz
zm@48_(zWJi6s=+UKlPy>JjF{RidYopyX@h2IkGNmU=yeE0oy1ZL`4OJH<rWNFdHO5
zJ9CFOD2oYfjnuOMJHnx|9z!~F4dPvCg2glMZBx6fMS1-Y7G3-vGJ1CDt6P;I9CIC<
zqYSAmm`>t+L<b`8EkHNY!ZqVsmHl}#_*>;yXe;jX>v-sI7j=^bV*_S$S9N6ePd{oU
z^-ml|N<&BKj>7<gE-II5A=|~`HF5XpP53&;vIOU!)CHrBqnT&(_DOZ)RdPw<ZR1S&
z8{fgm7vNoVh~br}XNXlPtwdwjvq@3GTUXDOf2xM<%C{bQ0=*0JuBmm6Eg_#$^1&=l
zR?=#$>Rq%HFj2KasN|lpM6$ZZK%F5We`2k*Fk-1KFblKk8X5o9;!#sc>F5C9=jY<y
zzsHZp{|G<-iVcYWdTOrhVgF~Vv^n9|OhCw%M2a<%V$Ty~7NrXLjeMbQIb}XXMF9#v
zXqy+Cs{QIJ)w;mG*{yOpxbHhYD27c@h-Pe0^LzR|kLBxW_tW*xT()<-291HFy2b8^
zyEOT?8dx|z@EP4_PJ;8TLL%zZO$uTQ5;Ys;lTxHs=`_Y3wAnG2*rYpxUV?6P_x)pp
zS<{pyU+hN6SLllGBYxzVEJq7F?3@bAkqyAn1+xlp5J@R;U|AbXNOIO@%_df4f$2ol
zMxYqW53b6VIFWrhechw%406qOKB^`-z4=CH^dTsgQWE<^Ol-_`J>|f;D{G3HV$yun
z5H<qm^Ga|<K+8y}IvIEE!QEukjIn4?^=7Vy95n3dBFZ=Z(eNt1rN_~<C6Rz&WUQcm
zzcg@zgZpKO*IruWQg=o%G6Wu&Q2PtJHJQ!)emFW`8F_55byTqco_f893*eh<G}t0*
zEf(zorj{>yShHVI5PPV;zKExjoT{Z&8J;m1M58s&OHns`r?=W>;gopB{n_oKoV|n&
z0zd)$w@}dhzk|Zh?u4p=wTp?Mfzw}DQ2eDy#gik=H5M1gIxD#KUK6lSTiiNQ9bQ2g
zWlgf2u-@6UYVmjo*MocZ4a%<{NChZ-G$j_OMogjjDo(v`q=&a<hUf5`_v_so(Z|p>
zw1SA@cN6bbE7V~X`ZZzSuf4YgZySV1r9>d*NwoY_x3Of39_?6NpdHhwEbP@C_!`(R
zKI9r|@D#5+&uf~tej4*Yg<Gr*TR3+6${V;f7p`yaT8#KS?2bQ)fL9dM)WP}HA{Xm;
z8fmt5l+n!mRH2tw4*D|a5M(8nibR_1z=QUvL(eiIHX3)r5c^<Ef;bsP^pbfzs)cje
zVnl{kdY>3gwPcP-0A?d%==gZtf9I?9t70Zj=`k7{afz9S_f>#d@kk^A4^Om+X|XCX
z`RVb%kf9nU9CWYMZ6Csl1Lz41;JS=l=&-h$<1!TKXjT9%qAa-3`Xr%|Mn!eCg?;J>
zACb(kFa~qrof|;AYLpzq)EAdn$YkMQM^V;uS^m>_*6AA-PMe5Cjp8&$4OgtmLE-@?
zH}la=#_suCPlwBgmRHbCEN0%ktA>MIqi+k#cV_P2>0eWHmF<(4J*1N>W3h%Dk(|_r
zpi*Y3=Mo^9+Q5=jqB|1ADl+xA$}fN>!EaD*P=p7@@1T{vgcl2Vh^g^EH<rBu_y(YS
z#>%UC1^`{*Z$YR1e+N1_LrW7Q=l=#f895+8+8B&ttOKebALEM+kCf@Y<Q@lNBzTiY
zpgUm;JZzil>?ZS|fg2V6ORIq$RPIP&p(s1O$AigkEq12W?Omz)<Ar=}URX6FrU^5~
z%ZBj$w{%9L5KlkC9FUcPsE0Fq!okz1eCL{|aawfDv)mOiV6fUu;e`A(HPOxeOZhb~
zhQ;|glKfd<gXHVpKwVZ<ihMK>;Cv?!3dIhHn&|kJN|6jnAnqF^uHBtg()w|u9MM?q
zbZJc@=G--6sR3cRV430r%A9Z9N*Q_*hVbc8+G0K|O#{;(Qla7rf6$KEkb8~aE<Dj3
z4?)7pkH~&RNg7`@L4T3sgK0h}XGC7Nt?TYB599H)kL7(g*rLSL%8l46X%^gt3)S?l
z_Zn)M!&hJ@y$i^Djg1^_XxkvS4qTn6ww<4dA0<sICRw40b!NSY8jS=;*#RdRkm`d&
zY_#O5{LD`Lf191K{S)v0B#nQM9l>!kl7M`FgzR<CvU#n7CM;|>|7bW*O|Ae1*-A<W
z^n^lZ)Yg(!Bf+}3_G>@*MgGv|K-Bzg0^=Tl*uvoC;mR}kyDWaDkJ0Z~fz9d7JFJgN
zDLSrK*%xv0nerEt1TMGj`|^BCnlA^W3h6FHjK|T&fY6!480~6KjGB0?6q|GljO5#y
z(xWdFDUId3T}4CpeVI{_`t>VwE$EQE<77XeOm~$#9Fm%~A$krC+xdqM#LVV0lFJ2+
ze{%BUT~STTyL+S$klHb-ozl1CT^Exh7ZGlG6YvxrGndq#?d^rF<=pqQJ`EGAX9=G~
zJkQZ<U&O6OjVN7qN5V*kI+?x7y~S8GRq7aI5Y6d7-{^15Y(md&=cns+&li>wNM8gh
z-+c!pN&O}P-<gys?{D(dN}-wWcngU>Kv^X~qXyxk{sZi%r@YJ8P(=Wqg8Hqe*#D`g
zL@i9L|5S-DPWV*;glv_aJ$-(9_5bB5(Ao%mbp?y+#cDLUV^?jZMu{;~&_C2rB(ow`
zaiO4a1x-n3CNHM<U-xcd`v_Qps=(Bt>uBZAO_vvw$jEM+r6u$|?0T1zXBZdfiFc~q
z#)-v%pi4*8>AD-fM&TOQbiV^JZBE7sDJtC;*$zsqmKu1N`>cFmk>-*kXwudd&w0vm
zVq@(h*Ab=dUL)>iDfGDU^}+8LskFL`fZoT-32mW$p1RC=7_oOdu!q(^+SIm7@>tfS
zqS^wV8fg`Cp4Ja{K)fS}n~j`XD%)x9%bd1~lH`aO9gks~daWp0G?Rb!oO2@gpf!Wm
zBWQcQ=CDt=K%)ze&T=JCs2}dq3<$_qa2w1s+TpH|v-oUqqjCt{8}wX<H(nzoZWH8H
zss^?kg6%%yk{)2t0cO**oU_I>q44iAE#okgTSD-tbz#LlV(KH~zp4TILpDx*fEQDK
z>qX9g>P00NL+5`>*SK!&R(Qd{z=*(bUBPHw!E8mrVr~`_w&w#D2}QvWU}bWvh8l!l
zvxd5yeSQ>GE$$;)iGodUPu_G5CCnEn=UKu|!IO>ZtL4?Tz=jzFmk)l(B+%}EEEX9n
zw@v5ZR|4sZxV{dMN|dC8R=nkpz`&5cik!bqWQw?QVv=&YjZ|v5WxAGBjJ!g0x`B?k
zlDbN~c7j5Tj8KZaiN67o5p0c!j`xrE4}TAWu7Qq`hN1q^TNOVx+#fcKfZ7%81N{`_
zufTIr{4hKSFa#XHTz{YVa{W_N$+}ou|5Qi(qv{QglaU(ahY#5*Z<%{q!W9v|oGpY7
zAd?d$qHIY<?{;4sA+Y^&nle=~+xxX2Z#x!|4Yw-vBk=Vj?_{61Z@1q&b|Jn2+n{a;
z9>M#5RoXqO;`G^GnraL+&581_3+dY81HOtFwNSo_#ZU`UMpdc08cK*CzFUf#TR0N<
zfyPUwHumB-p(&~ve3xKCv!Y#naOOCC=O*gl$%BCylX)EE^HB(8wV&@(_Y$QR7`-I!
z=<yUeX_i)M<mu99L6u-~z0DxToa}hb$?RL!Mo(IuG1(U%p#0Vj=JaXy>!8Asy~-IF
zh#=Jqmc`|PCpqgvq$`24f;=1UK=jNb!^(5?_0`8;?6Qa-yaEC+bir?p{rg9X|E1?3
zVC(TmDF2x}{z)-9GTl%E^ypo+%c|KRJ`g%EZS3sF+r;c)aPSN8N()6r<+Ex|7w^5v
z>x&aN?Xm9%yZL6&KC+BZ%p(&GNRQdqr{9#!sb<%-Bm2|qQO9!l*_*bhRJpYVjeTCy
z{S?UBpmT1$K<1@8X1#O^iFJsA#P%IZ2d!%STzVb9`yeEF6O=5AqP@1rtk-Ga<_A3i
zJfSl{Y>9t^0!Aw)&imI=(=PUs*<1jqCIG*`huuH2#LtNMt3G#Bw6g>BIjjwwoPy;i
z0C5qSr@XrGR>gsYFd~u`w#{LuA`&Vh)&LvSAvq?MfhCd4m@)V*1DdZd7LiFuJ?K3!
z+kM=1+rF=lpEnTupl#3@1Q!Ar&?|V2j%eyyT;Hb4Fso_}VJiLeLU{&-|7%f;F4|2I
z6%PY*LrV8mh7F0m_kwwm0&D8G)Hq0w2G|bxqp75Fp@$1Ri%C(lYyGf<(axK1uGIFc
zwi3w`W8eo8Tzss`L6gq9itsKAhwR4LjT0t!U)yF~2r5_H%B#uDlH-ewW-u}xFP$FU
zAb|o8;-1Hn8ZMj{Io;aR^FQ*FEkb212)H@i*I_;h@GERDL!2BL75dY`2gz9fkzV@X
zO2qvHUeRxX$NNuD`F}%RbZmD7kN|v8<&x8@#0O^9<sq;{uC^l>+BhNL%l9K+OtW2F
zP17|%^`^FQ`$7}eML-xBj|%cD_&R7;uJJx%JRxu*bRc*J2~Zx4knT=NtUEVP5z|5z
zUhc0vCN*wTgJ+|Oy4UN{*uA0Ux4MGkO~kSaqSIEaPGwZ$k1;EWi9A$6UQTyv<2im9
z%W0+=)-q|ksBx}m3ceEH=KF%QX$6F3qSVuSbIEwNo`b7z1C*~I)A&u6MiAQWHpI0U
zR`|!yBw&@MaC-n?3)KHxYyASJjES?k-Jj<)SpF9+`Y72H-c|;nAt-R)90ic|EA>Z2
zG#87~<+L2f0cbJgKhh$#c%Of|$Hiu*!PlR%Xnmk}M5m&wk+TF%xz@*sJqj6+;P=5S
zM8{CLb-AC9AGK+TckHz>YZ-kNf-}s|F^sxz#xnx!pX4oqQb<v*QsIs6tSOyE%xQ~g
z2XD^#=Hr(rHNb?JeSM?8gZT_Nbd#jen&2gw-FoXep_-0NWCfP79F4XPS`8Gtl#82A
zn^sH;Gx#8lySs{7#&ez67`o`<d>_i?gXgT|863+(l4CE|>GqUO<u?z~7D9oo`mso=
znU4pG3~C!#AI{oB`2b~TZFKlccvK@K0~Z2d@1KfPe@_Vf{{*4Gk}hdG17m<XFQ6G~
z_Gb&WSm}?EwDaX^Eeb3wB$HjN0&Ai2vgciRjZgHXu;|cICAsGvoDn)w9VtV8Bt!^>
za~GfSOt@QVO`(V2&RIF+rg`jUIC$<4Yis%5af`CRLQX(Ql24F-DkJ}-FA@e$VT{7a
zi;P=Iu@7QNu@B0dP(Ko9zNp8#Nndr6v$Zq{ymj)~K<>ni*SrNwy=MaF?9)Ba%uN>2
z`8|!^dJ9cyp;wm?2rpdK`6y;!(aKf}#J6X!PM9mj#+vVJFd>KENhdP7zsj25V(2D~
zBb6kybj1wEE!nKBL3-ItZ0*^E+U}Q)oO^|=ki5p>IZf@@sujwwpDm9ks!W~ajAfJF
z+bCG8D>!=0Ahtj+mF>B#HwVIov`c;JqGY4sWUsRzv=}_^;D+!SN2Y@mvi#y4($7Uy
z56gBcbK}JpmSX6hZ>PE5vd!n#Z>Ex@#6Wddn>Vk>Yv6wOgG6O=uRJ2NjRjd_vg{LN
z{3wi&X&0BK(ZZ#+p(=T@80VG^o~9}PX=P#KhNFA0UgxP?tXZ{9%^cI%ELI}xAt>-i
zdbXjizVrff4R`!#sx;t1m3dUiVFfV#Tm&w$7bFXq6>(CcOu@Hn@(-_-VIr+cjd7HE
zaqOYQK!!%|S0pO@HtIfN#b=ueDHf><W%2UYR8eOUcwEKWW3+<0ZG?NH#t(c6s~0y?
zAlqH+6|g)wc)(CB6&H&j6d6}8Dhn4+m-Qv1;mtF#mH?K<s2+N^Fha39wiR-%Fb-2<
zp)As&LCRQfa7nTedGTiVlPR9nU!27ON#@jVM{xfUYJY|?xnJ_+2G;+fYzUs6`dQ(D
zU;I#BUwTrZ3kV~}^<>^wkPFaKu1fCkyiBqUWnsyr{%oE9XN6Y<?q%Q4p8$Dnl<=#-
z`^W@fikLd2e6b_mweezZ`3y*})?${z0V=B^T=M0Gh4d_`fwwkB-Gi4ZNtQWpi>TWM
zQ<9yF8dgE6M99ZX_;6>8XJ|n$S{IavT;@)7r|A*0$N=DTn7w^ZXAySWWuv?Iq2#M?
zeEa>D$+SRGBXaj+Q}jR6sPLPm&)O>O<fV3k7&Ejls>suxnVLG{Y7Iz!oB~HQwOBHy
zS)Kz5fPD~W$4C&>^lI|4sH%R;teggX5DLhSR&@9yoE@uWa#1qYKEEcPNjY%qApt~D
z^?yeezs&9mP&KqLHu;ZckDHPNWUiw>w0?55F32AoEyjZqRi;kF;Cb036Vm3=h{c-8
zuQwG4kWUH6g1gi2^M8C}VEW7GV5=YMko1S>y_uV3jwLA#S39etVlW$2O?!kXxw0cg
z=}$+ST^sVuG{({k!k0%N$)an}KYZ5=p~`on^~K^wU?p?wpS26Bc)duprBzmra~&%n
zhJ!0HaKzDJ#CBU?;DCGn)VSvt2VQ90aiI^-_l1mYA#P`5HLJ9C8M%ShJ-OSV97lr&
znXcM_l%)c>g>d4BcYr~YHrmwJB+ih+Y3P*i7)<mxT{U^hxT=2Ec);J`ypbO^*Pzi2
zaD=RzFbt5iwtiwgi0HKg{Qqfmfq%l#BDO9zzgkd$*<oXgf0yJhR@PEl;75K_ggPcU
zP^{6FSLjy^BBZ1QMTRPa0frO7z3JDO2Mw@jA*J}{cO_tkOb7Q<yneJ%20}*5%-P-C
z?LO<f_g1Ud^#02C?|knj^?BaIwzDUs$!?>XCbUI!L2e9N!`vIT(Y3-UPm(~yt1;9X
z3JeznAT!BahNQZtX&l4^)I<xp4mql<&^w8oe?=LJ9O)U}sF*^z32wYzUw;${aGu0U
z*+JCeT#)DODa6-=C!tM;jkHsp=-k*e?IabM#}YLA`k@il<1SF)z7HP{8f##4<`}$%
z9BavOnxcCgBW1!SGQB;5Mmrz6alkrsy<MeJv*t4$M5S?CNZqG-{<LSEgCM_0>LD^T
z+{q?S2#?RYd`65`y`tM9ID>0!kBSe~omlx$YhhuVOhS=Wk;emTNUonPBwn-yp5ym9
z%k%o=!%qfGX;a~^&e|p&*)-DWjc#E?RsfSpmtWysvU0Vx@5(^)dUGtS?&D5uWw@_g
zIkk5Vk&_Nv4>4c7>{?c%-tNJwxdtr1<OwS%+ho^bG#ms@MQ0^cV9vXj<s<1(;##N=
zG(-f1phQ)wFV%&NLM2H&buV6k$e}og*yS03sG;o7(91J}MBo3w8~6&IhcNzW?3g24
zu3VBy@(jTXN;LD(ybw}~E)5E{jV*$fiJHv#GZrMMgc^6Ha+{8R%!{<K=5(^<b;Ou6
zP}O24IW~RgCq1?H;_H{KT^fi&q8pk8e%0gD6q};v%$^X0n>-wah}-#|Si;UGQF9sN
zUj8vzZ_$0C?6q0BAK6U-l*GKUD8SB`7qjR?@bc>(r-y>=*8(+U@;&l<?MEk$dTa;B
zz9L%C$GnusrI9d;5~YBplOYZi#Mw|qCg+a$KEbZcaXmNCdYtL6L7#@$go)hoAl%@Q
zg*_<KU_cVvmhl1qOwN@rIJ;NKM~<jL&BC=BEI%7Hm2%C0V=%<CY*QNE$td``V-Jjx
z=M^p;`;4vCbL{TAOSU^I&a8P}(TEL4JsLk8WcQgU_Bn;9XDKtSs#?kKSD}vmY2FMT
z&>d#@QzhqLj}QE#<M)&E{_JT888|sx*qZ%^s!0I;blQsLGX8;ISojkDX7}St){wAr
zRJ`#myj)^)G?JNF%IDAgzEgpC+hXC}xRd=KLk%j*D`-1-dpG&sZNszxuR`cEeWVG>
zATr@@ABq<v$IXR7z&!lbkt&g)V_fL@#LHjy!TKv<hjIqItF59H*ym3(h#hg|YNp<t
z@k-%!>oZYm3_KOe(ack=#So#b?SO)QMDPu<KrTl*Mib(od=Uej`A7VwR&@aeR>0e!
zj{BE0{8PG?p!w*r#w&A%tvTfD={PzAh2nL{T2Gsx6c;0eZceO9YSiQF%!l%EaT-Lk
z?&vDnBB`<PUKRYsLxt|SAi|n^eS@d2TvEp|P+yNNbwP50^in9fVFD0o8V2e<M&-vX
zBV{AcV11NjeV$Ock037Q-oJuU-m6+ABY+=I0l&Y`VE?g${uMu($aLBQ6qU0M46eoF
z!4A-*2PG(kgaeZZBZU1$;?LP>r{k|_G;<%>BfQ_?1sjTos$rf@o15NwbG!n%j|fF5
zL@*fWvwPPkp%^6ioZc!>)e7aSu6MII@V*kmtkghoE*nBhq#Uv_cunc8-HB)sMlEYc
z*4s_9fy#YH35~vM)^S{IKVqM(!5GLYmj9~N=Il~l@g>%gKofGUGSJ?5@GY;np<oRq
zX!Lm$(toz!rA+LoVCBMhkW(D<MUMikmFMM`$x<CN7={1=1LL<Q6Z$71<v(KjKL?fI
z_+OVBA*J5c0pt(K=tj)AVY=44OYZmq2t@k&w;xN-8TISe6Kqn0{^&w6PJ70sS?}f_
zcQMU4liKn9!ZqR@&+4WAN+1u|Qn)b7`KqbD0vFh0<26DcU?gTQC{eW4o)GciY7r8K
z5;`C8bXB(iIq+(h*deS{ksvV8%j$+6a>Fr(O*GbI&4&RATA*2=AUo<pLlc8syW186
zo2LjyO;E1=fyQ2MNXc0ZCW4O$Bg@puCK$oyd_g%t>Pw5?iX8*{SPA$ML`m4{2;Zkd
z1x9VeBiI~I-_mtcdz)PfI6WhzG2&g<myu#ubgTRaZr14_(J2vYhOZi?^kvngcYzoo
z#t#l(5vf8kqpWA<B>eEz^yNPimLrzGKyXV|y#jjVISKM1P+vlkZRFdZfM5)eS^y$)
zL7dipzr5y1$Zr0#M~?8@?yAH;^_u*jBUiu5<o`Nc0q`9F@F82tv6PhLdcI=a1c25W
z!rriX0YM1Jpien$RSNBA)LT0b!pmR#1<WJ^!FEhDyO^HOPnjCeeqL~VR5~?@8v&aj
zoj{#v3C4l$1Uhy)sJsxwSKzROCZ@X$q>8g5-|EJ?<Em*-#fi=G7UG(>k}7n^$sDUI
z1@f;9Vbxhb#`vN(*n`8({dpWtXHRMd7ahk^%nR58Xl1q4|1PtB$@t{kk^^}Dysu84
zrUm!7nT6N<_qFO-@?NbU2OCO(Xtvsi64gCeAPrd2cZW&*<MD$ZS*4iX@6Q|!uTG6`
z#H6R-VvcsJdf&c2vT+#nK~YmT7;8XLi}+9YJ;(zE=R%UveuyvlF)oJ~keNt3_bsX*
zFRda5f0JB;KZIEbK|Oz0g<4EQS=b?&5V(P18w}F(eWfNBu7Lq&d|{0h!mhqHDiQm{
zTufMl%YJ!AeK5M0fE90U&9bPtw9+-RBtb#Ss0xxLX9;5^dt`E!X>yoK&fso)no7iU
zQtz+EosTT2U<knZ%)h;;{KwA!D-8X0WQAOuobCQxsFVEXjR{%v+1iszH7+0?$-le<
z*42V)P*v8XI$Mh@b;fEb|6D};S@5qr6O^U^=v{+PFxP!dUHfOR2Pp4o^+y9~;3{yf
zk;sEJql1t%5z26Lo5-w3%8V%sdW@Hs<BuZ68B)<@^)E8bvznX3&DmKwQ6;3$j?$qH
z+7zVc%jaZ6HD%N5H)gpimp+aKJ?qVnSTt@5OSIP_AzfJ!%sIw6z8W8WT>w2MTRwi^
zZbn)?BN-1*g9}0t8ly`FY>-JJsr#`fc-Nixo(aLNjB;`w8UowIiDt~GM*E{}P-M2M
z{X#dPeVWXDn-Dsev6UY_oMwc5Ox}uD7o05@4bWR}!9+|Dzsb(o2QqGFbc3%Hky(}?
z5c_p07h-YT{@lp+l)Fj5a8{3vR00@VJg2JmolhV^gP2u=qMQz8eP6+UX7O?~2h|b)
z|Ec`;@cyH*w|_;sf_8S+zarP48AW`jETDQ7`M%!_uj~JT0Hh!+uOE>HC06(&guqw=
z5TzLt)CXOzD^H?>74nC7yihyE_%a~Ft1CH79fj#LwfAuE%vQteQ1THBGUc-+vYGO|
zy|1Lp?rqKyZK-g2V$K<@o*rjsO1({{#63)=ikm&<ld@#@r4e1d+Ak>&{KpsNuY(zu
zCx9j)p6@}4nwX6U{E!G!Y$xBi(Wz%znM<v`v8{oXPnvc!&slctIldU-ZRY{4zkqu*
zX_8#O6YVYyeP~%AY^uhJ++PCRnw5VN{aMRSi_??<YFTxjWLhJ#w=A&y`nvNEWLfS5
z{qwe{M3#sU#qbAps1@*(Wne0TXNOUBi09pTs=!Jf?-{<S4|-l2TI*l`>V6H_Vy<HY
zyfP2?{eAB6d%gbuaxw7JD}Pa{3}6h=`fqskkBgaRygAEi))wEufKbfgkGNF2!V2Yt
z<lVIli%Y~>tmRLw+$h`+z%L5B(lC_GyTc%x={|0E>7Vy+&mKYhSW~3P4O2{FOma;6
z2MU5o{C8_2lpDz6tg2c;ub!XQ(8`*W_j7LtsJ67nD?esgN_jDw1Bf*{{c&G(7>JC<
zhO@@a$hpijA4_kmol?>pX{_%IGuvDaT*tz2tBtHaW}4|FNfY$&6p!1}mra4w5{f-~
zxw<RW7QZmYD;^!iC1Wc~>f2S{mrU*&lqUyju48XLSx98=&yg05tjPRtak^32RxfMy
z&iP&=*KjCXerK^K)(j><sG=IA8rCTo{)IoDjDhY}s&Z*n74o(w<!}SY@No*4K8Og^
zZ{HB)kYfmhHwh!8<?S+#EKt)FsF!^DI0j=Mh28z}z}otbfibL1ex)3_{z@T*fW2}y
zM!eBN89=VCAzunva_Km+eD=Z0RWOHT%Wq>V<SZEq8LdpwsrWusAXL6VM;;og((owx
z{W_eR<r!j;00;>ENv{8T<e2KWk=5G5)x-o)O#cOk-^?2S{%QDs`;au?%OZd;1N5t1
ztpB`VDOS{xTjWRP0X|6qJ+KlO{tl139ZY&*d=rdMj6Q(5`mim<<V-u!=UkGW9`MG3
z_wxRYeD91>-pFv*Hu0|LP<Dpr{?7Zy<t^4nnl8x;;{FAY84yl9?O6pbERb_Nbt&JK
zPw?c#?zHqy!Ye*<&ilwD?)}0uWn8-?NIp;4R2G}ZjZD51GsQUasE=WN{ZAwL*MZD@
z_cgOB@nA0LmRMt27K(+nVM#H?Zh+^eMWNEC3=Y!yj1JXv$FN?Jy-&uLtLEItA!aG(
zUvrF!lY=)-7)@1Ct$o9}v_Da$W9E?agzK)q$J6Dgv0eoASro{{T&rIedGzwL`(bcA
zB1z$cpW6dBeK-EZWpT%XF+AT$F#f_wg&kWa0V!Q$=Zz>{p}2GhQX;2);Iy_9^6K&<
z%cAj)vhLLn^+|8sv%OYKx47@+OM+)9S`t$;*Hf-Vk%OIcvZ&?gyoInmb++i{8W0dt
zS*;gM3=8hNsKzv`U2fF2o=;1xMsA;I3?Avu37q<faW9>KV(luanrXKx%^g(omd;@w
zgB&922id3C7tUWmeiDCuQ@BG309$asZB_o1T>X2M)xU+rUqtiA{o5a$pDjNj3k0}(
zLyK4NCasC$%frfSQ&Jt;4#<NSm)8Ek#5P;MAiMVAa$Wu5y>C)I6I6V3xbs}j^AX44
zX6(!X*GH@@VfH9{VRkCR6L);H4XI+hMyh18F6|Fd+2NBIG+C3-!v%a8ys)JhWIawQ
zXo>AC?bJ>?^J)amW|c-H%KE!~%IbSEhDobM=kROYtwGRq(XI$FkcWGUUg_73&W;sr
zmCct9I;0z~`Av#t;B^IfT``mopL}iSCCv>bGcN*_rQ6gW(O<nQz0O=v=?n+XP&r+#
zrCH?MB2BC_@Uv7|gCcIFy}zf~|KJnrg<OHQMSy@+4$TO{VHRq_Dlq-j3J<ynWlq-x
zd%EK0mCf_6=T{-$qW)0^8Q=)I-$vlyXHb9Zh(FFIvAmtruXfs>+cvV}`hPZ$Lw+oF
zoYXX<a(mq8p#gg$$|+K-LrJ34CY*ox**cbJ*{<~Xc`fV!1a-ST?7x$X@zsp?>)!Pl
zP9KIShpQ6|Xb1r%UalsZ^CI9S6;7@+D46j{w1LNWPQ5u{EJXISV-}qi&S?r~(wv$_
zO-Sr%E-V+JSk9y1d@3s)<uM$PX|riMlUu-|x=zuMCy}3r)5Q2h$2pm)`pUm63(O2p
zSF2;Po{s))-3&bdeRq`3PYLIX&*1f=VIl4YfD5dZA%@P#`=ts`6*p;Bl|}p`{kA4S
zKs?3gPOi!3z|~t59aD=r98c>^yEN*~9a6-55Cf|oel0&D-S7+j0RVU2ZzHVK{|x?r
zT3yz}P1(`JL>3Tj|2P8G3KOz|4Di`Nn-fwZeJh*6w$=qyfeZ{F(II*7cSls(rSsO-
zH=DZA{icEeZ4?Y}LSDmNL5umU9Hxczh3Sct1*Uh{eX0<*@XHwcO=0l@K5n%>WTXL9
z`C?s%)r*B-fr5rvH}mFb17LF}947KTvzRtYkcV+c94PdzLxuG$_0mS?A@|yrv8vF+
z$yxXxish;<Nf{$rCCuYzMN%nyuN6`~zZTXj3q@uKxSUhoI(m*imY3#WTkI%FwMgN3
zA88H6U?6tB#{0g&$>~Y5$(GsGn<--Lq$@90-0^t$t)=w4vMuS3xD#b#lXEYvxnI8N
zh4!kaYl#QBm_HUXb^J)vCkm1Qs}AP&7dUY0Q48dX;tu=@L^`s4G@}9p2E$0N^BFsk
zdjB0nY99R{VG_A+i8+`mc?Tz#iheYGo_I37T&JYvI~IsQpmG-V4^Y2uT|$mf4wL|X
zJpSzo`rr9d&f54t`?47z*@i3t@6%nw1VbGFUG@=*6!&JA*ptyp8sdE+L6t!`8eCC&
zIdydRm&9{i-nWdO<JsftOm%&hh6ACA(z+GjZoO2Ne4b7YAwRadBkWm3nE}ZVffLg|
zf4d#&;f^a$DapMHP%7C%2=k81zX6gk=!P1{#M|Qt)eFt%KWSvxS8cw@VSgEtT)thf
zp84!g30^+qS2PadDEdvg61YG+c;K@>Q{@7zY?Xsyq<8t?1hft--o#zfG!BOUU0pY0
z*|#V-Z8^^hyEdNDS2<^wp0hAko9Vgx-XlEQxdoKtX|cO(X6H5~ZCZWbN@fArqs%Ky
zwS@?VlvY>O=hW}BwQ<vlQoZh09U?BW-&{mE%_>z*ShR(rNN}AKKm1t9Q!6?VST}3!
z6%qsGi}WP+zs#Z05j~M?{4rTJkXeD|@3w;F`P`N#8)f3(%+*fpe>_pT@#RY?HAK~B
ze`c3TAkqEZ+X!d;M}FWXG&a!ld`S9DzEOxh7TLVvE(uc>`r%9FLr`2tY=#!AX&5KW
z!z?ksMcl?sh}`U)#mUFWQy`;(A3!UH)P~fO?44oYQH@bf3Rl0<YlcP$xi$b`?0*~k
z{&#>;HgR`$F|Zc4Fg5)%{>A>9$qXfHK3}t0sv!H$b2R)hr-(32RUS2{#a*s-;jHO%
z(Z1ZA+VwW@gZ!>C0>$nyU_IogmrrbV-|1@K*+Y3zG%2p4#33)3f7R`Kn{(h*k|Hs}
zr*XQ<r^;i<n=gaMfjWA@Y<n=QmZosB8b2oyYw(Y*>C>9e;`n3{-pvrq`&2eKW~tj}
zz?Z>~!kbVUKSE_>E$?4t5Z$=Zp@^zvMir5Kv)4|HG>cJu0Dup4CEB=$^VOynleexu
zTX4(A%`J{8#7~G@9__YE7`sYgl3TOJgn8|v)m%oiI#vff4LZ+eJE3zhk@(v$TR%vF
zKo<2~gmwDB7Sq|%E#v5mb6aW5?d2Xw_Id`B`zcp~&WbL7wGp-#$C7?_{bqhk$G?}O
z`P(4)pR*AGBO?>1zt&DEYDobpz`w<GZZ6YIHALPJb{oUd++=_tk`5~t5Zt(L@Ep~<
zuua#z)l`A!=i$x9MwrS#5e9s^zL+|joMap9>fz~r$1eDpAF7x-VO82_;$w&+=DNix
zeUav^Yw4V6-5LKajagnmJa%l=Y<F`J9^`@3%+<aygqo-uWf&0IMODc~@NT@lO$0Of
zyr!_GcCa9h(wB@I6X$`vGqp~bCyQ;UkS-b@2M*lZppLIRvD_kD_H8Q%k|TEm<zm1X
zj9EW|=Vzq9#Sjg|J(&9-FfiX${-~8$Vq_WBnly6`sCOJnj|x}wHF99zN3tb^9u&sJ
z2#Gwf$;xjp(qTY0%t;x2?QvPcf+7<PrX>?e9g>epPb`U-4TS&tsX?4EVJr}1H7N;1
zdSG$GLO*!+<>8~szJ#el-x{HZ8}9oXaN_ernI6aM#j1zTrm^2f=<Z?8Ou=3e!jD^n
zuy>xa`bM~Z=9+9@Fg=X`p8cuY@b~4c{67n}|MraLuR7#EyZMhp*Q{(~g(Lv)+v1^t
zB&VcRZMUQuol*2{ZHNvLfmoRV+s1-qo9wf8is{|~>#0rzpA;X3?*;e++6&$81__UO
zf2!m_KQ9v()666+)AQ@$iru?!?&`v*tr6q~*?X*`I5CW)I$)deZ|dD%1KV96fK0S{
zV1!T{H>7M}W1h<!#uOxyImK91aGCaVkNL%BFc_09LkZRyd4}a3UGiE+2WuMaj8{rC
zNmktFzl&EI`FN&BKXDq{>lncWt+bk!jS3;$Z9?M+kAuyl_3$cJlorOb#9v0y=~7T?
zh*lgXm_$-{DoxZh<u}NL94JuZq~9yE-w}nhCKFHKGy6l_+V4}%ZEk(uJpPb`#!^{I
zvBS<{GMRS%(co4N5<Nl-kDDc;39@X7W&VC@)$?0%441;&gdGp&C!ynQpcHKD?e{`n
zt~5sKQJ;h90)ZJQQg?>^ZuW@JHcu_7OPRR5=0~{2*$xFXbHOQS98T_w#Ei#eHRei=
zc}EgHun5s!8XT!@BwjmrygrR~WU7mWY_g9_!)*c)RD)+v6tO^H7}VThoGKaih?~X3
ze<GUj-A0s{9)hH5ll}yd2^b?Hb(hpU&0K#72#%!?;DuyQ1gVwAF6pm#hFux!k#y8v
zf^FE6CR`y0DvKA(q5Mh?c=~Jz#V&OOpF_kgr%tFXyz^`8_j=_9;yVEHhCzRazTdwE
z{BPXy|3Dw{uV$AX{U0doR<}_?{*2;FJ1GsfhtC)m5%FPwl8|$}Ap?{|6hzGp1SAEv
z1FI$7A}_zxtEDs)WyRW1*Ol#irkW9ArQ&mNg)(KbvPu6?MVg&fvR-_}3oO$02G^9a
zDF_mgEsB%fefxcmQ_f+Q*SXExT`k`aP=2&?%UL4$w3s~D1r~3~;7d&q3-pHcIeM%S
zZ4iSrgslFqta|tm5|VWKQ+nOlZEkFenUG6YbX)X6Oh*HEOjH)_*gQxngN?Y?&W3i1
zOggbT=yV9z?QVKf7H^U$HkOU~3m5+<jD@;+rE-ohIV>gIEA-6XLi!VR$+(9Tafz%T
z1!y+w_RlmtsZ5SQXbCY~nc`FJvLlmbi0wCm15G@G%`Q|1>5(Dvtld>7?y}?ch!Rj>
z<mfDp9urnnbL&*_RO<IpC%U?=CG%flBpyhoV$p~XDco7TNFvPX(w4qpzqdf@NM<XE
zfu3w8JG>R)F+lJ$bobm8_vjAI9oYm8Ts+E&*Ja|~jg1mlvdy#$9|3-inCvLBz!G|#
zY}$!ASwJPJFG`%RhWx^E&`AfA;mZ1btbg<cDGWwi4nt$c**b*Cd96vNRxZzhhZ+fp
z#mQ5)-9eCF+k_nj+JfZU{Dp6PEUo|L)aa&2C@2Cfx4><N<Ux97Tawc$qmD>dH;H}6
zM1EJ%P9R~@`5{oTR>)i?lhceyr*y(>fj4*0-9-WaSz2i+D(#6zGCDN@Ca-ZZ{=7FU
zjSG}=E1s!(rS?c`J~8MtM~ul)LPK1oE3g#kz3P}QTHETI^5?gqFW59+MrSHIy!Tj(
zw1o__$BVU@PGmlNhD_U)2LI^8xz=9DIiuNP?1>YR)3=gk<Vbcn%BAp#jN<TMGl9u)
z9Bh6~#m7mMWbu~LcfKaV8$P^nMBW;4WA<i?_`dV3@bV51^2Tl;hd`doPQyV(p{N*7
zG`=skfIaMke~Li%!-B(1IF*cpO5z@g24U)p`gUI)CcTrx`sHqnVzm~}0Ta@L1hSaD
zw5*<*okvWQZC<0d>Z=h4O`Tm}@>|L5#R3^vMF2NbV)Ipw1<6yk^hiD3RkKVydqyh{
zlhU}!9@tfOvV<G0ou<WL^69H|p2uoTX>^orDGCmD><ltQhQo$Ca_gnj=Z)}Pv^LCP
zItIeJYQ^FZz4|L|o(e<MaUyaHS%56=A}Nw+@fL?pPIxoQce)>2Ua7^tN|NJD#}u6c
z)^9Oqp16{o6N0+z{h+iqIXJ2TT~k?2DQVI`UMfC0W*bNx=~SY-^Q#x~mnrpLdkQ%m
zjbQ76C%U=I?e*3Y94)1puIDO77J-@LOHl249S5*qnL3KcG9^bjX_Lf9EWYD-!26~6
zj#-T!o0Xe<i{SSY@?^DI<$jE*5xX%W><ze8ozx?nPQD(@QG&lzrPm?<3>DG0{Z*N+
z>4K;%x))78IE{PkAsi)<49*Ldg*!~vz9`a;t{~(3W5zRlB2H!56OUd6IhdfOK2^tO
zQRu`AMA-(uVZDzD^j^4Apeia|uL>L&r7=X6W#<n>K=s>Df~j15!!6Bh)pi*D{Cd|o
z*oAF(yaS2#87jiK&YOcNIs9Tu+epHx^`&HaA(ojym8(zuJS$@sk~6H9XOPUGydtk_
zovw^+QS#fybqwy{qX+Wg=OukSi}yjC8G^a^q{*R+>Ox9oW!{}x_uxPrVU0&*by{ta
zdX2TJ%5AF?Ew}>Ac^{&!-SDTsj{vVup-k<&;aNl!h9)!`cjHx~>x0y6!`C=CgJrAt
zDNx5hX70bCn)S*t@)0JtN^I+7l{DjeN9n$N@M#mHNw~uz?n&ppk*8gUKlI6AhLiV2
z)!SYmJUC>>EXsjD`_S;ZiU&KUzYV1OelZaSm#_W;OM71l#i#qsDyJWvRsl87&CJ`U
z)^UnK7!N_UIix6L;sqF2Fzkr{R;ZZ;ZcchmNVLa59TFhSqmNExosM3R+JG-sqTGZz
z;aE`5O!kfQM+6RI!<Y%5FPDjS%ADsTudB?a*up-g>*!sTeyw&_z*m&h6Yb$Qa4}W*
zAJyY?N<mGiEs13&TwxFttCF)`5Ebe8n)E|`FiiABFykmS9?_K}5MJ174Ebev#VI->
z-{39*yC2`JC_8;6w-IS;;WuVl$fK`Cdq%lcL9CH`rD%Glf=UW`lMq985M1QhEvZnv
zi2;snlf4jO6@shRg97!*B!?f{M}RVlJ1R`Za%nIw1oK${s@;n`p^j0Z^)>o3oM>EF
z_wYT7M#x<dw7Qr&h$fkUdpne#JVC4|Uyz<t9Q^`y-2#kA<O2*M+l2mPyl&#&HL<h5
zuW1rfZCv5_J8dek?F`4;pzoFe=P1Sq)7sGEu71@;K72q2O^uoqYg>8Z<V|)pB-C#^
zg=eY{niI1vwn=q})#C$>eRhpg2z6p7k<Q;Z-_y;FVPX5Fezco^yk`Z`&T+UYgJ4&m
z9Ec&@&i(<t?SN;G(o?iXfo-}qm>#O$z9z&{r9!uDF8)SzMuTnUn`5vw`o{hI{;o4_
zl<Rc;Ld6@F<&P&^r41aD9)Ka4!9V3c{`H{D|1aU6;ji$oqpZAw@^(khbU#fWmX`(-
zM2}ezb|lPD7Dy6~Tn(b&pHQIMJ*mC@E!(Tq?Hpe{b7*mm)aD84T1jHQ>^0wFVWbIi
zwL`U8PJ^m)#^YRR>nf?ap#ktLkJl{Z{Yd|Eh%?RCms6+d&F9nCv+kLLz?rufw0Bw;
zH9$lV1L63X_Jn<fiIg#5280xtQvTJ1C_xc+Aob8OtMRHkP?Dm<Wf6l=vgPQ|1weaH
zvf%ZITgZt_0cWj}m&7?xyB1j}WVs5LHYkV6*npLtD2FKCa{W#MRU`K*FZ?$%kzYd#
z9u?pbjFDf2`y+#{2!z;>MipJx>|xg>socZi+3C4Rg6=d^&YLndIjgUm3MX7c3NH~x
zWiiu@nX}n3Sg6(9sHdVbM#^f)VAu{;Yj9ep%+ZiI(`E}xnM$;B57#8sQ<Aap7$$=X
zwSo?G$eI*rG8|wXXwR;4_-h%gEo?{TAd9~|mGg?Nbe@6CfI+c-f5FzAGTK-hQS_mh
zl4yh})?;FNs-Fsq52<2TY78lS2A4Z>Xmxr0BEC`B2+5)*HyObjr^SIU%yG*hLA|j~
z`(16*MBUSkl%tHxXDx3mX`Gg;CjB+TD9j_~h^b0>1SPWdSPa57YWP-pI`S<$#H7t8
zsKU_g*i0+d+@c(8EA>PDdNB%OLX$}UgooGv$J;waXWnkxzNy%@Z5wY;v2EM7ZQB()
z6`K{?wr#tTojK>)XYF>{S>N5+7jJ9-`}e_k`sm}=SyA3nKd&Z#GoHGIF4IbtXP{h4
zuP*`XzP>k4bxf&>rXF#wxp(}MUQM-a%OZFav?c63=J*}V*Bn$+pN2#;I5vnb7?bQC
z=n`8JV?4G{_^a!^g8)Sf^ys_c?1S@69^~;Zc+NjjW-kW2JD|YiXYSgQquzvwwqLGc
zoc!3X`EkHUM|PYYh1%Ii6{Zv!n2Ws7)>>(;?&o!Y*B#TEjD#*eS)9fT=Y}TXHbSW@
zC3QEcHdR57v~|uM$~IAnZ+73uIa>3AHyVXPF)Us4%VF=$R%oU6lb_Q!Nxx)=IN$7a
z7PT*J2E7kdSLH?%vS#0ms53w+_=yY>vAZmVX);`zKydC5v3XAtGG;}%Y`yCCFACCf
zthg*vMg@sSX#@yAg|MqseL}2yGfo|u(PXs95f?`%<<Y8KeVjO{*h3vE1u-vDAH$7Q
zUnJMXs1C5d;8{&D5qU^89qc}$Z;TZ57VIv^iw&fLz43;g_A^)OGF`!Ar=W5;68x43
zJk$V{`*|!7rF~>=P$%YbVUf+{p+%RotlW@e%z-z73Z3AeQu$sTtR)?{;1FN2vQ4}1
zh%m(l<T=nze5^5SlMz>9q7Qt#s3S|rYyaJMh^f$T*%g1VK-UE;DE26N8Ky_#<!Vm&
z2b~t9+Krg(wN#?;6(;DH%h(HXU$e&#@A|`(ZEhGPs(hzYP$x>W))UU7R^c-rk#Xry
z8Tqak>U?AMV^^EmVcCRd5sQsx?aA7?xbyv}P8xW$87D5aPL5AGJL=nNbJ~JFfF!{<
z4_QUg!Z-~z(|UmcZ<@VbzwXb<z3Ox@$wuKowd2lp+bnVhli4PK5!q!h6RDKb(zO*f
zw3JQ4TF3qU0dhH4<;Aih)u!PkJ9@*HO_4UZ1>K6?z~7K}mF1kt#Evxb7(~~P>DkF#
zj)85h;K!Rh#blOG%u3Ya0E;Y-i=Qmskm1mM`!>=RqEIzI0?zXShAiBx$86Ty9;3j{
z2H^3->a!4qXr6gqk4+-Sc$ZIUX{ODjX%0~iV{pFnuwUpqQ@W{Mp4qzM4jWjCZIJow
zv@S)g4INiq%0N;AEI{p8b%ZP?)-j*D!)8b=4Rza;(Vt|ER^hnlG1f_Q4=31;;JmiQ
z1~0TNZe{weZEjUw>G!->-qn<)4_4G7oeZvJlm|WxzED*gDVOUU^CUAwRix=Gpp?NX
zl4;E0-z$NY)SCn<aWAp2BEb4BIbSF?&U;agfmylkTWUSwcGdHkaNQ9W1x@|{)KH#|
zRl4PF+`}dt(BlezO}d~H?4w+D&Gj(s|72h0dokx9J0(<=M<8AZV_S%8V)Ym04z6+r
zW#Wz$lMv#;6N11S{u#N?2xky3YM%%jJui`+Pdb$tV@4GMbD$qM*D6h~b_`o`f@(X5
z$(J|(5<j(bE&UF`8xeOx<t;tEgW`#uJEw6s$E7KHT-?9CCwHkiG(_^-1FB;)ZurJz
zsUs+VCSVhQZSsb%`?xCvdW&{(_+$evNP%ybC#?^pvod^4UkI@&y`Khry*;h2e2X-X
za6{=Y=k)Ob%*i>TO(+Iz{y{WScD|bcVf7-dnnu(ap<CkN0FL2^{cxMF(n&*;&&80R
zLFS#ZyhoY4JN=0a_7^&5hkpk>oVp#&yNcExrb)UT452FXCtTpGPV!&4n>Z(~im!-F
ztmOVb_8{Vp85n3EU;!j;Kv8$n1F>=WnmU-;(~~gtdRI@YoPW9JWA`vyLZk&lq;nYh
zg6(lNpBQb-s=TFnh=Yn<e~K?nA&lOYWVPynsxBMTL!N>9Q{47+pMSs5hR*^lewTae
zLqG1_pyFrut(92(?x@?XNbZi=EUAwQwxy#qT4f*<XE4O-3dZ&XYjQ@av;aOoQ2~Fp
zS`n`?!qGAH{}Z6vJ|Nmnd_C8%eKi?mhxY}(8lo#}P9}a6UdhLP<gXBQw$ZJ+AVKLd
zpyTAaGDMWhOQc^5_32j^RNN4OiTuO8h`~iabh?h@y_mx;Ulx%UmfhgoAeH>H@^BbD
zR6B{k2kHs9`DO4cNA!lVVRg`l=NZWxW7=`spI{#h^z+|1(~o4mA<XZ1OT_>C)yaS5
zkW6YoIV*ohSlTjYJex8n2@sz62M`HE_A^TZ|3nrb0|V_h3|z^h^D)-dx4$Ew>NB*V
zxzb$FY(j5ruCAj8!$4-GUa>4U$5>vn)LPG3%kc#8F3~rKN&fLNGcaY&ZvvHzo9MXy
z`@H4%`g#5NJbk+(CI^7aga0#kV?qJi%=22e+1p~}qJ1&o(yGhXU9by|r{^L#93z_@
zl64T7<>D<PX*+xCf~RJ_l5bRs((h0ix}J?0VK)-DUc6?Px~J9JAHn00w&Bqd>*c&r
zxgT{`DK_lGP47Y+Za04Y?gGd&iVB5r0Tdaeg@*kq8zkYzPuVxRs}tk%{FP2xWjF5-
z5z7Y`XXUP#*U4fW8f4W$QYQ~Utuw^VLAL)b?FZeOs-B8v1CLXeJ~|yjmvG|gHymnS
zM3a1SHyn8UE~L5<ttq-f0B^%QsZY6u7c)SDmr(mB<Qq`am{}*xshc#rMk=4$xL!wu
z3NI=nrLR6NYLv7qHz4GwM?1w9+dShr9!^nEB5)dMZ?CeznkE+bVL7b@c*g7;Q`}(9
zRTU%UZJ3x8lSeA!B$j#qy=(E-w6Wps{V}Ha`-A$Fy?|+LMipl_xUE@MU&v-od!=^i
zUG4X}x$8g{xgTy+luXG|cvf%YX-auU%A9f|xk<#3%_MdAU241uy_|CuOJQZSi-9Dy
zCNZ9<dlM4e=yh@}sj&;io};6`AMjL&7Wc#z>hGsEA{x|O26+w2)Ww4yaFUV@NXT%u
zqC!EUGGQ0&CzG2p40X1Ly5)HT1N>i47Aa#5Wqua4hKDC(1MA6XQ_{>^;i55BlL^&V
z;U=25J<<Ef0TVgA#$c0lPMBlJ%&HkGNpQeM$%8Qus{}AEE@3iXbIoYua%obe$A<YZ
zldHJ>r1w;9C)0-1ETcp?n;K35Zx^E)Acj>i<}0}pIy<eP_<3KM(4Da(?Xkjm`U0-s
z<LyYRCdL6=9#<%sTHZq9$j(Wq6XJgu>1Db=fipNt9F?!AR@Q#;L0vVs&N_TD7i#(3
zZ_V7m)<C5C!EF~Kji2mQBs3*8tZbvlh5mkg=%&OT;T6ij@={)eRQ1UmsZ@@#;#Y;^
zl#FpTUjCz=ox<6?v@s{621}JfNli36SskUF9ZS)Xnad-<nY^gLZ|GwVcc_Oj)htfD
zW<U=;`mpo?K`oo+YyOfWa6Us|jiFgP5n^_m9eUki55#Z3>w$}EjvuHwC{QKLd7+Y`
zt?AhtV%mAqCw;RJt!2#kna6>DOD&`8!sE%}oq*#@xua7wke|LBInaevyaLJL+2DSN
z)%bCvUN&1Pn~^rK|4ScS=LN}kLhDUDbdfs4)Z&o>IXtbX2F9aL+Z_vnt#hxh(tR?7
z%N!L`Yvq~b1B)Yk`4o+QA`MfT@;AjXt0cd!+pe-ji|5UwhK~HFfmsOt0G<Xn>&HXc
z!kAQxu=>v-!40&!)SCv;;x0CWK_Q*h)f!x3U%~Dm803e|Xvqsda`~pdJMc;Re&`B9
zuIo$b&`qoePaSs<{<Js_9e0=s`$fV!vh&DLy&Kb)msyjkIBQK!!Se!9XRDZ^c5Y4>
z*j14>r*5{7M7NK4)QCd-KVR){_(>dGbf+^IIdA*<tnvMSjX_5KAUmG7_RQt8OhBjU
zyCK5asSIBf1;)siSmE)${1&+NOqz}WTfYUyv$qf%h{PeHaV=?ciJx+l$pN_BkH@~C
zoV}SGpVRCJrW&JN+NAo#+>MiKQ5!1oWXP0Mxke<bI8p`+)FHt-K8d?#k?b;-CN2=9
z*0vM(%9mP}Bzn|TPufvJJ7eY|GS}B-d(pC~1qeG|h`O~{Acb3mDDny<S2W6aoWn5E
z`E`A#G211H2r0>e9eqqcLhTdD59{$-m&L<@^(3URn8<iD^Z|UQ<woTu6B+!2zHV)g
z--#v96ehTOW)Wtu&V^=eo2;2~UD+JCrgr92w1dgi$8M!Rt&>l1SAUYJqyVHfxH#0_
zN*?l8o-wV_$hvA7vOIzM=k(S-@RL`L)Gm9RBRBuftkdB7*k5I}V-&}*=MFbRRO3fm
zG?r7f3@?S%`<!)Y(<^y~Dp(ax8u9q=p4wIA7eTmc2}ziY!fWr=@doYkD4o$9@Wt8i
zhjOg(KIulA&%80!cPX9=nH1`7?36hxTe=l&8PzyH7%IoAQLXA`&zwA*;2-aE)<GU?
zA0hIF={=ly?OHg$0AhJD>2#VaeT)E4(c=^*+SQ5l^WJNR)Ti|&+Dp_;c<Dr?j<8Yy
z=UlPvpgLa6#j?sa2YemsXDG=O{F;SIuZKq6nuT+DPpq_HK?0x<`h0uOY~)BqFp=`$
zK9!A~YG<`nNy_Y$s~_^DCSFY4brbt{$;Em0G?d!N&@I#ZTS1nmRZ5pxI}RmXRjCK*
z;qxN^y!D$OpWr$Zs5Bxt!<T!7#1iCLMZd~agFB$fT0@=JVv$<Wb+zLxHw54~dc(3t
zU$jO}@fO^0*se&k>;^Sj@s9W4o%iUo<2vflp7)41#H^n8Edl;Gw}@)KVKlD0KQBZX
z@Oym$kwGg#%d=rER9+Bq`@DdkUpWO~e_s&gpmClem_N%;dm9XCb5N8V1YT}C(<3kj
zai2~mtxMAO$m)=5m^0G`SKUQ0-F2Mz;2eHzp=RBrwnlHxrnqZa58DmMyi~Q~{Xu!&
z!Mi2&Wq7-RxP|?s)a~imW9y{wjp2`Qqw*rSjzYLKyG8nxbmpU^9@2{(yL~Q5cnK30
zrzNCT0d$Sm1x}0NFQ=H3gu-~JtL<8M+Z1@SnMq;hq8#tcdtdcgHyXjk-O0ut?*Xnl
zK&oC~O+Jj$v0i9hPKA48o4lP6gNpb%(xrWJ3;AMh*9-)Xt}YgS(>FV~;+f$^_e8)S
z<x2y8TAi1#PMWXR1uSJpx1kY@Nn*VkS{K1#>^HKQ#n`iq74enQl0wd#m2qgegN{XA
zoa|{KRSZIukMIoAt0%A8C#)nyr?qhhLz=jnp8ZOm#)wDROg^0$aFLL6_>uD7%7XRW
zDZO!zDKggqhINhJ6GOR7FtE}e+^r6>e$M$7Fcgg0tu54d$r(%?37;<>%^l5TZ>kz`
zV29$Dr6DEug<=GswEeUJhUlRw`a2$2D`&0VyD6xgK%aj-nyxY)#(FmbsXjhRiIQe_
z!sGjicCc`hd4a9V=fW?Wn$lWKp+ZeQrZ^h}HU7p_-bK)K>65O#dp?NT)`p?v#bjei
zP;#ABucbrTfVLdD=rS+h9YKPnD1EfTD7vCR<{XUyFO4kwB1}~Rg<%?H@L^O7D^q}L
zHDIqor&)eDFrkq?upROOD7?A7B<@zADJf1@3Yjf;k-;o&RV6i&aj;>RmA#B_%YlFY
z1KAR&8-CYcB%L7m0Mlb|MH0;va!3@NBpAT3CnbTpdrWCWYj9$8Z>z$@e6C6-k%8XY
zx?`&Ld4vLOyOlacK%<c`rYB%Bk(<Q-rT<EUM5k1gZ_Mm{2Lyemrp$z8lmUy5lX`S(
z2%MzQZ=5}0EFG-3Ky5ZfC@Llgv?<YcR_b+HBt1rIVr*Fx?1O9FR@;Cl+gCk8Q`lvU
z*gQ27;W{+Cip{CoEK4Hb3(Oh>w1||K0cwu^!;(;-0cwWI_*}cbDZ$!?SnK$2Zr!7z
zcIp{O1C-h?xz>4TMEX@(UD;JMu$1U2wK+gpBF$@uWS7olc#mYI5xU(rct_A*3;rWV
zK+OKB>+9Efb#E!=iUzJ07dTfYF2$|s_GBHrmxmwEe`<5pFn?@x7$6`^-2dy1!~aU_
znpAyP!cjr}v=y%(b)^a~eh85vqeH}BN2g2uCSaps;{zA$fTUd@(_6c;bl@cO5B~9Y
z7@AtKpfGok{5yF3f=%Ej)0EQz#VXLF;4nnsNN}9vb@lA?ypi<xD9-EohxTA(Fg_Nn
z1QwjQsKo-#&xYvZS&B>y(oV|VV#qfWVJ1QY`93(TMR&45gW0(7qY`sPX4L4haDCc9
zE2L;Cca=U?A<9y&>R!T0bJMN#YeV@^x^a7O=}8y3G=p-orr%YT73CUOF5U*K;$EXm
z$(P0p4~a%*9(<MUZ;@kk)AqEJ$}-)SnB32fv6rhB>&kYRsIvF4ydpF~jm!#~8Hf}-
zw{yJ`p*#LnD9M?qEzxz}uD$jpO<+m1E>t{K87!IogPq2(4m4@c1ABbluy;G}79__G
z>%`Ezy0#8AarxcIX;|DVT6+f^f4658VWo1XSLreAF)K7R#V`w`GS54-4fLI0e}sWI
zncOHgr{qr>4BOw6&%)L~UymQiY(OCVY>%1wqb`Q$U}J^Rh-X6S`IuZ<tR~u&T~i*6
zCE04I$b{?0J9#_iKd$7uC4nQPT}JQ)^Z6?<B6t~#JWf{`OeUPh9i##I2(>e!1+_EA
z4f5XhFD7`b07YmCk!`wXbO+P;lVP*n;zW-6>maoBJ@OWB@=Xql2fNu3uWbd0E4!6e
zKWogpncNXwoY^?h0)f7r`-J<LQ)|lUw38AC?hi2|bKDlg_Jl=RUh=7;$CUz6jIv>L
z8;TPB9~QGG(6F?TyjWmT<_4|qK!=+WL;>>+ukYS&R~nr!sCxFSW_0wnJ%4t5Wt5A~
zbey2Z!?upPmDi^7B)<L*P)LTKW{8asHF=%?=pUIqr0L4&6iG9vc1Vam{!r_XZd6ti
zHz*@f+Bf21JD=#SRAyraZ%U&^--mv@R$prd#Asc~7+w0ebF>WWN)!CSfBMXVeWJky
zgR*MF<wXpQl`OqrNx5Th8~y`4+VzPvO`nM=+j!wd8Yc_}YLaSU_?AQI&-Yp;k<vfS
z6PjNrVH0}(#p&b_@cD#u;ugsV75KpKhkcAFKr-1bFXBqr4#l3eBCunW33`LtWKh?`
zH{gLyBSJAiiF(sW5NfU{r_zX85%=c5l4iaxuz2~4v%a=I4$-jXL!BZ@w>4bKpFi>y
zh(OH5Tok4WHHB;xy&&avKnL_(5G+`1{g3eFlk}OE80E_H%MZ&n0>U{I0G@PJp(o1h
zDz^v7aP!hEYde&QE6QR64yUe~5~VHuP6Y7T8pq9ns@4w*+gH$zS)pOI*V>v{3WOD#
zkqh|Ph7QhgXmjJ-9pHD=$qRgBYZSZ-7Uu?t6NBdjW36<f+;>!pQ<78EK?{+<HPg4I
z{9obW8W1rj3QF4&jUmovlD-mam3#FJ)7}y}w#Wso`_PlzNS}CSM7w7~jH>tHJ>aCy
z67Jyc!ta<e!uJ<K*%+dtwA3&ff22m<`a=L7pn|?X1${*XePslFr38J&1byWMKLrFo
z#RWfw1wSPPKcxjf1qDB!{vb08yo>Phi)9IaMgh8Hk3~*RI-`lsa2S7@7Y4gR*Mt=M
z{o7LuBaWs}@olN||2{MSXPeLeFP)bEN~UX4)w078LH#7x@Uj`U5K=64$&%*?jxVxk
zSx)A*G0(!0_*FtmM7FEQz7^9j>bZPDCR4$uqU>`JKoP$akk%at3MU_tN<sPwq8K6o
z8Q>q-s@IoMx37KXs1y(2VL6`2b~@tO#+?rH>wL%e2T_lo#rYwm2dXuTQ8HUdl>MDT
z0P^9aDJnUn4{1gWX+#-_I5p-@8z>2TKN=oA3k`^^gPhuh>h=KyLv=rmBIYFCM#H8M
zahsf!xbpE{YBkUcsaT5sQbOBiktQ=~)rAmp9~e=uIOgFN>gRr}``A#ficYMrk`|+|
zfjm$iE*`u~w|skh6*?%|u6HgSSJqLZpqQVmY=)DWI<crJBs1Z`BICVW(deJ1u4b>q
zOfBU}wWKa#Dm~BKJ;Ysam~SqBI5n1ibfy!@#GlKiGoNytmNn{S8YFgE#SW?GGEslS
z;^!&nDLgBZNIXmar8>#9$n?@l2#cvY_1t<_{enr%dvC#ejMXe628qu?+kb8xp29tj
zna^I;P8|Ig);f?_9#2f?q`rY`eU9#09O(@0Vx+>r;?0}q^2DqRktaAN2$lzwkEPm%
zsybmZqn(+N+4+c6uaC$rCW`w99wQZ17?gbiu#7dIz|n~{uiuXw=32wFLfH5;ws3U0
zDWt~|IAHyUuTeGoScGS$h3d&^L0c}d6q20G96V(wLs>OpQOym|7<v#abyG(dr}0f~
z+fFI<#NGs?b+<XsnqEBi&u@rL+YhWpNB4cAh&>`!F{Y5{=u=AAZ;la65|OVQH>0zS
zKnYeeq!m;`d@x@wiRn3Z90g7YSXRC%m_%K2|L7wZ{;?Bm))KK4R%BlQRewxh5P=Bp
zI@Xz|N}z_6yQ?5*3L+R)f*c74$FTf1jd5sJtu=!|6p#vwhC1m!@a-)@Zbm;@AbpAd
za(FV+Y1xz@iI}jypX4FiZ^udPA%ISiU&7(x0sMKjoo7tpTjz15X$upZ$g|hvZ%ZFE
zjiH(m<<NkbeGG?<QqBEzn9!7b(&XRtgL5r^w=_fVqGh*B64|<hv8u$^Q%kW^y)^Y&
z#a^@3DF|+HBNdZXA~3k`RyPFE6fLig>oHx50V$Q4qHAcV9oF-tD&2u<uc}K+(Nqe0
zcQ5R$H8q%IlHyhoBdQXjRJ<6i5=ge!L$!&!Cw}C3uCx4Ks+Q|zD)&5Mf8jm#lk?#Z
zAF#{B0*5-p9pjIp-)`V)Z<j=pyXaHdW;jOBE=T|Z`{uq#*tdj_G7F@M!R4izDI9~o
z6j*7UYwcc0hgEih74X_(_O+KF%5>8QQ&y1TzaANgmY?_p84B;f`}P+TM3gtIJ3{0Y
zBc+y+Y!EgC4&7;M!(~SGJvwlci~^QxS?C83&R4u)R7T|im<U}#?_>5?9vM1X?RW^?
zF=s^^*lF8>lWZ5_l6`lnt&QO;GECKnx?6dzS@u|Jl&TWhPQXp5e{DclhF2!|e!{(@
zLOo$&uN<2j>gglABa5x5aZYuMa=e2JUBC~mwkZGoQ<&%u!S{}zwt~<);X8!(L{eR!
zdqez=R)a{4+YuG4%iFsVsQPvmuFtV{QpYa6#=8Q8H9QLf_D-2&>ukvXO;9aZz|9)~
zbBI{`i9OmXnF_zlSVfXN8%yGkdHZ|D34~$C0Q>erhuWP-@=Y`GplT7VYB8aS^z;o$
zlbAkv{3PBX+PB9}-+CPR6$ULNTChk|j^HCOl<bbQ>O>$@jJm&4yw@I>0_H=}e5f3S
z5PaeHzABcg1C2bVTuw=8nM;HMhpXZrotZ|6=cLyvckJWx?NBo&EZ8rof0;Pjrs%cQ
zzb$lte>~l(|Ix&$WaMaJ@BH6f>lD><ClnRbuTA45nZ749%Hr@f$q-hm;576%0dp8^
zi}AwZaP^DkRd%hpq6=FARApuPo0vGPk81B-kSPHN=b>2!&i(C!@Z$^Hd7DJTH=<{U
ztF}M)9mh?t@7sEQ5VbJdVl&Wm(VEitjQv97(U{KorXHNbLaAX~_>M@}cSv(t-{!YF
zX4uqp+B(e1WQA}-Xu4n+fFA5_6(W7e4SQuLN}owi&CP5FpmTWrS*Ud^3&Gf%a-Rfi
z8I&-u$dPOEWV)iH9O=p>;AHf*(b9r~wIRMKwmh^Pi<u8S9M=3OIe%KqBZ%E%+Vog|
zD_ug?B>E#;H(e_8)JcNZ%tBOll3dKXif?gYE%nL`CRpqtBij-URwmD>>DfzE31ssf
zip=~7W(f7CFofA6j3smBk!d1HYW}h5iF1tY({Y1_&Dh)=@Se-u^{i8Slb*hu^<wt=
zFlf=IcjoU!xHB%BRz{9;tim(nrRLmR#Rj8_{QE65NmWq}ux4eG$d_t8ct;Cgq_RTl
z-~zRF)xVt2)cguLv$X7V`zW42YCts&FAu}v<#DW>d6q*LxfFH9#?S)u<NLykvC-dU
zdkC!Lpcd$%sboXia1YU-;1B0wW&PR9ovHR_M>QfTA^4Z38f|DJZPM#DoFUDWog8$8
zz)Pm!%I~XL`i~NIjeciS^ZX>jlRJz5fgB3S+7BfFCb86X55{Jds^5B$9>>qm)d66N
znxJA*mdXoMq6uM}VtTYV25VMjR9S6JUMv|E?3poRW)1t@dCv{ZOaYcTp0lYo(_k@q
zQnEz6A1a_HXPH-t>*WUqOk)h55X<Sy_q$>HJT<5B*H2W-*kM#_F~wf^3uQzx!Co2f
ziXE0zpI8P|@6moWfOiZN*zj!44x}RcV6$assXk~Sv}{oJTw`A$6~z=Mho&L4?Jf>9
z{$Qqe$~ek3dg*ARThjq$uNN9_&riw9*i>4RQz*fC&uPjNBg>W>I)rU1&S2kme!gn`
z?51<6O;Kyr8yvRiiV8Ohwy6r#@%J_X#}qh0{rM#9o_Yv+(@f)4is=u%^LR(s?eJQj
zI9WNRQ-y|-qde(V83P4Ut0<q|QY9Ji#aE9+Nb5@Fewrf=UeZ+0JBP2aVMQ7r39ZwH
zSKN;Wy5i_!7YLtYpA}Iofi~%LK3TKO^HXaK*ZEcaHJ$ubF(;=FB4KTSKf{$DkRRX{
zD6#8r2K-<5fT0-3Id@>>VoyvVV@FUcrbsx>2#izXE|6f^3$Tk6A>-}(hU&f5X5vv>
z&Bq-w?2I{}$p;Fc{1+ebXQWm&W5mY8QX8wt!hOy47U@2A&}AW$0ez~yRcfU2bZU|@
zHz~x@3SnGzC?@5|^m63e8OiWn#ep_zB!qnv4h=~}l44)h3PESXPv}us!b3;i6JiL+
zRXxdv0*LP{bsS1$pC(LuhU}W;!$a!bSk%>+c6&D1XUKYIh{Q?7yB^)go~7j8rPkV@
zW~l8<kZ8_egXKP^7T6$d_ngeAl{qWt!}ijlz(H)7wLv;SXrRca7}VlVe(9ErhF0Mw
zok-uH89UDri185y1AGQkwE)H!YnJ0a;3Zbbga`(KwixiIIbcidGm%g{HibQ^*)yi*
zwuu$fxYD!TEX26gdg+*9iWLhISI+c4p@QquHkO<hs2``cdvXh({{COKdk72gOf~RX
zTAMbk%oJ;{zCZt7)&s5mk{Limyo?tCZYltIG~~e+nJZb_OQ-VeO5)zaOfWAB^@=p+
zlZ!idKIJj1NwA*r%_I%`{E5RGL`<-Y@aH{T$@U;?FM>b;!%z6n05EnZDeowatJho}
zlvz0V#Uc)S{!gvx?VXl+t4?(Uzc$fOKcR;Qq2GAY!pn5=N*C@S1?Sg<h&IGOor6eh
zjvhtL{w@HsFS;@8SZMMKou4$2@{8bVU7_KrkHaH-AtArVBX{A)_E*mfCI_3{9@Q)3
zJqf>gyx=S0dLIyCq2OLe3>P)FmU;+=N}6V0F-hR19<%CzdT16jmKS?N8Nf_xjS55`
zxxUFh&YgaOOn&`)3`De?AO`k3*zpzqpI#8O|9Hm;S=%|8{EIa#V_^Ru|5b{rmE5{1
zs_z!5eqy>7I%RD|NOB5kE%;coYslOztmarTBPLyO2j;O2qr=5Soy98usoe@+;~b))
z`1!EJyUcv!{o2q0dj!#~?(`woG}p1q=iBi!KhVaI6_gcn&JbdsCoC)ua(6;4mQcq^
zivdY!rFz`lWGZHNj1kT>DIhK%<=n7=WLE^j)##*Gs_v^AWIIaA?LG+87d41Dw2M<2
zb#KR=EPq4*{E)1FM^#s?LPggEGA#vK=y@!_vFrd>Yu>3+(j=6qy&Mg0(3N(|zWCGC
z)yl)v%F8sisC_K9Y9-U+z@=df2KE9>sH0b}2D)<9*>tcmlFMbAc|22TN(H7k+jM1v
z8I||Ag3^oo8CUeqGysM)vv)cB4!@;&fUJLf_0S6+NQWu1t<(!byUDCsD|=FBO-}}r
zIiD<-OxK>NW!f^-bef5D4ldic`P6<;8O=wlj@4iU0<-R!&5+sWRsH>Z5?5tPM&{G+
zL+JEtB(?{K-Z5*}v^}Fz`W`7F?Ii)Sei1Fh<V1WvndlzYrlO~RCTofnP42j)s*FtY
z-2je#Y+=W)#eEfUa8+=2(rn+vyRT{$=hpN<ZHL`lfK{MP11}NX1X(5$E-bK~U%+Dw
z$b14sHi)adXT<iMP9W<jb289bs-{ek&(mpGNO>Vm>vkh*WklFy#und+$S}@nWld@c
zX3jacZ6xi0rBzsz#hN(uPaOsw8Wp$81u}n|kVB!Ur^Z+De-+sNsl9p>(Z2#0HPIff
z1(g|M<uhvaMLJHbzAq?HI<o1$5j{k^r5$Ny7*LckyjPv2LRk<<g!YJ9Gf$_sPbcqh
z45QOsr~pmG5JrSxmYl(=w&6beY)dcD(x$>)jNlX27$U|WWz-)l+o6C;ji$DSij5YM
zU-H7f-%kZu6gAVyV18IsT`RG%5S^{cZ#_#ps6R>XR)rH~*xejow5YU9Xgm{aGbCv1
z87MqMXLjik&|x@~*;7ITO_Z%)<YKE5ouF*CnC(|8?L5d$vMhK_#va_UvyPq-+o$$v
z7ZeXan719+EI!Gl4qRdqzJ;=#^Nn^j3K#fr$ql&7CTesFyn!OVChX?3_?~A1_w-@G
zQk-g5v?V!oRZNwgnJwEOpcE7Kc^@Oo6cXg}3N&Z;j#hX5z`T8SMs-a=seVL_=|6Y`
zZ-@LWt>#jLYl*+_d=HRa+LQrvEB6mxZ!D0#`El_Ew70sANWdS0+t<<47UunX$N*rE
zIeh$5F!lXGd36N}e?9j>cJ&I6V2-W|F=}u@w`X=jI@Hc*OhW7qOtc|pX-E(z>>Od9
zc%Uhezzf2cJlc-(Lw^X)-{t+&%%YnB^aDmG!~*~EqovNx_h6Igx9ms66wAW}si$20
z3!}pilkircS#kwqg-ALH1vq(SDo1icI4^b(S5Y6=#D^raSXCm7qmTt<LKlj7PXR?>
zPt^RAZOr%^6}W)=pFpv>b;eOZ^gwQH)%b`z9?a=A5(dmb8P<{p%>Jnl`LEidR(SwY
zC;Vii-0{;PZBPGikV(}}gA+vp;AgHIz#;OJF{jHe?+J;>M_R*IFs4Jgt4Y$OT~+AP
z+23<bj80XLL!Jk3C->>rOYwL?6!DDDZUC&km?KRTX^ePMaE-24N!#G1DIbpA(vo3G
z*^6oW9#W+4VBYABT`6bsM<}6ADW);!U_2(Dsf>r0tg4%Nm)1VZ;sJ|_-nEXezMT1f
zRchVdRAuXtU=aa0Jr~~Bzjd7ARXTOr?@E9DA1nQTK863g(kJ~d7i>)Q&u<DjsxXCS
z%u*n4VAS4Ro|rtUc6d|{VM)G>42py%!f_vnJ0;U#h}PGQS^D&G*H#>bKO8c&BofL%
z+huk<L@`+}07G_jjqcg;`=N=D)`hg@X)=~%O`|100hzj#BCR~dUSXBaP%WLI%H7ZQ
z{-d7l2V`O))7&NNv#w`g<1q82%;;2_W@IYidsr$xu$BKcY!ISmu)+xB{?2@@!wZp*
z6ve;upLp{|2g<*%nbYsz|14$E{o_USFXGDoi(3_wFe&@Ztr|AVm#-oW^!Lv^k)RwR
z_Z+Zi$~4DD5Nu^IQBqs4It_c%%n=8Cb8nIzT#3RVBW&JsS2I?(Cv5-297BDA8|jNp
z&P;Ak4u$XFzCaquaq8Wt4{&Z^Bh1qQB@xZjcj~o8@f+#m!}G+XS`85D`o>*q%LQqA
zPm=)C@j&W~w;_P!Qgoxm;M36?qC=l)a3~Pc>)}12-U~QGrpvqs@F|TK_BDArjD)Ob
zL_Hwg5%1!0#auN|7F1h)nPCJ(3nf7&r4$22Gn|suH64w`iZX}`hUqxC9O?Dvj_`8L
z7|4v3B->D#0E>MA_ydOI_B(_JHq07GaRtG@qP<x^Y7r3C#jauLer7QZ3vA6u1O!;-
zfsGhA;Ik)}Mt%n~ftqClR};lBh)z7+Vk$<3(_LsPhX+Zl;uiR86m$|NE3@TzMqch|
ziq@NY!Jdj(Vu_VgTDmB*6`CHG9h%VEB&Z0f`hZDIkzJP-JSqPNRW<aPnCkI8h4}Q3
zQ;78c_@Dlt#l`=#u)o8ZzUidANx`Hs(gYTihl>!(D#)a`EA40Gz)-t=1qx3nW(U&y
z(IotuZ)&xIhTnlJ3gIjzDVeE~b%(cIW>eW-(-R+`_xBk7Zk*<Mfp|O@OSRuzF@Z;M
zoL_h_tm~f{fHd2j(-GbTry3U2vWNXTWcB+dh1~m9aWW9D$Z*!bobj{r<ZDN2`ea!r
z%0R$VVn)hyamJa{#5(-4f*k3jx6;Qf9C&g%Hq0rQSZ#kPWm9yfGa>AF1Ll@<s#;f~
zdzK6b$6s9*hocq>dnxP~A7a~za4V#DZpPF}Wlnstew7p6bGs4Em7dLUzi*?8fT_y5
zm>Z{3{MNKXIjfBqu#<4(;I_&h@<1*_Si@dvmGCsGod5DdL0lvUD6Ep=^SDQ-!Q<zh
z<weK@Jk|4z!KufNDY2XdQt+zm6JIv-NO9lK2xYX4@sasjC#B^LjhNXcSUx`@gkMLG
zm91yr_n@mr*6HU3goOyARjTiQa2u8GXc!00c0bBK;T_JkXpPBTE7<PN(jB5}bP9_c
zuRq){cnX5O`-OgYDqgyGpyead@@Fc(!2YFV3`!G#Redi6)qiA`vHs&i_?L$9uar##
zTjTG!(|=7A+d2NH+MLvca#vnN`@A+b-7>zbM@(h(M?@zI4hB+)mk1Zc6l5gLgw?Ob
z4$Ba`(@$k&`2oB(+1}WsYSYvdCB?C(skI7>M6(2@rM151v+dTgqC+Y9^}dyrCLC&>
z_+%xK?v~~>&GXFv#e2LFV5aN)q5vc%oPsfaBf$W0?}?Jz?bUYWui9bJZM})VxKOhf
z;6oUT6Y@|G>Ax$K>qTO?b5O26Q@g2!81AI(BT?KoD;_9>jvXHzKIoesO&C5LMsd85
z;CfP~m))^I;LDZb)w|il@}7-i*!`yTKN*sD6SMiKi~){&mk%bE58v!Y9=9j@TW&4^
z-Voc9{m(Z(ueTuOM`8FMBT?KR>aM<tVYz!|x*xcI;-h@2_<hM-J~XF3MSJbKUhs0#
zD*S485OiN|{RMn|D6uz@q3sX`=0|mZG%?{XCqB-~Qx_MbekkM-k`U!;D)#1r0y3Du
z7$7OFgl-{AK?!$kEiKF;8=<8w*3j3mD$XR%XDiGL8kFMPRM~FJ$*e%{`ceZQ^KAp_
zON8qis5eri2Oe_NRjBK`B;!h(i~*=s6>;Q>n&wi<g`^lq&8NR^<=ZLBp*CKy(-y(k
zfz#ZyvCV6+OnWQjB`f6y3^&G1MupX-ijhaTgnG*1*x8p`e%o2wo~$fjYOnt+W^?%<
z0@A?(qQ^ePp*<-xUZ+fhzo1{KCt8^ie7CfgvZ`N`Zn1+qRR}bHQ{LH|B{rhY8#*5<
z$#-oWw;Gorklw(ul1joXSFPenkgky%cytcrp<%bcgiG+H(`vTZWepj&gGP)z(ibzT
zEo7T%tnVs3R2*Gtur^;T$lpr6)ZVLJEU%NzGv#cCKi_}F0n2`jfGpQqDH?7%%2`3D
z!%C)2aV2*rXAezmzt9Sra!$)ZR%h+wnA?yLT6}ahQ?|v*uU43)Vb_cny=4bkOh%7`
z+)#FHZs3SZRo4g<(Xs<r%S{u+(gli7;~GnoaBX2lN`_hnY#LPYR8j1S;<D;(<3?Ht
zwXLPfG8>K+W<sUVkRZimp=N=Vz#&^-MwC9TAXZ66YeBgv8s+3zMh`ZIPdzhRn<+!l
z60p%uAeH~*gq(0k%L8>(T!a5{?JotUDeALDGu_*!oy9#6Er8QDNXYBN-9Uhn7RXQY
z0yEE%#O4QfMT=8wu^`M9CSsH?XVCJRI>h<<6PvNqB){3Xo5xz@Ci_zJny_B|w9{4^
zD=roFBo!(xB#}zuk6=_?m1YGGl3apH%ikJeKi3U1jI~dg2wmirSYc@*jbL>$Y%(R^
zRsSOA#AQb_!e0FxCGs%s%u~WJJ~92iJjL<^)6h9lShb?)>SAM70>m;o#HL!8xfZiu
zm~2J;OI*;O6+3o-&qSkMdb;K@&QG^!&LxDy6-=7Ai{S!7fN&(exFwHgqjI~9Xo15M
z)hMV;!20mW-q;ss4BE%9Kfnypa61=QAAi=X@VbiMBe|QLedL%&L27m5L|yJzei!N`
ziMq7RRy-OXEk84YM~Jq&SLR3;SM{_wTBoPr9P^^4COM%qXbx;>;KXX8?MybMR(&>%
zrb$p}lrX>Jn~sH&MoH^53ofmvo=Ai?v9;4)datrK%U3HpAY7@`{b-?l35)dG6G4Mh
zA0KlJrld=dl&$z~jdndq1}SUDs-mS8NDNYaNDW$alFIX-%Z)sD{oaGsiN>l?lw*ot
zqHy<NGt@87p@tim(hsH%mUkeqRhT8h{e3^J11KjJTiXoHqt3R5O8c-MuLD}56jTTi
zJE(8AV(XVMnUf4E9u<}Y^x1D-GHiC7w5v;^=_Zsys-V3V2q1-2P$KV(!oL_=_|!#y
z8-J;X#?_{^`YW^0sbnZ5NjxiflHuJ_)>Q2oQPvM&D9Q|ptCa>x6$-*fD{dmFqW3D&
zzgu9*m3sgt9W)l<@<<zf${JhQqQ@%k6tPA+-n$B2OA{|GE0J<EaUS*gsvTJsrX)K7
zR3=rmigYql8pBxXsWk5ny$O{;K=~)1LP_MS{@+@AV<5@`Z8R9+5NhhdzJz`?x>`f&
z1X=x6%4HZ@yiGjuolXO(VIqj>PV)HI)ia<i$|-tU^>$cVggdg1iKyL;<tG#9dq3^<
z!Si!hIz#92@%rTY<F~gG&!V;oafnxG2%L5jz&R3$-}Iy^tQkxk7;_wKw?WsM<ogoa
z9nOVS7e~%t_O`+7s~py8SM>XO49-InvvZ5FJvAYB#b&QM2QP8Ux&hg}0@v|7-=v%?
zW*}D-jzR@vXjWSjeVMQaP8M5<)SAb}Uz*8n?lMMB{uY$$7=DU^x_Bml*~=n&V@U$W
zDk`G#-xshVUX7_$q?W7gy;BME3rw%t+cd}`@Q~VyuCg$pU^a-I0Z8``xXTUAJwpOC
zKg$V<WrXm`$0Cb(HnYQVwj8jaVjrznKYp%FCZ+Nl`=?@-A>WS*1&3{r1KROO$l(&O
zy{S&2i!+-xEeeU(rAvonrh@B#L(EX!hq{==U+Db`pWng?dUaoV#t{9%37NE|tQj?0
zut^IUgo>|>T7NTsxzu=RWqkV#U7=;qE*ayYy2ZRNu<IXxtHbduGM42e)M6+WtPO4K
z-pn|zb!6sL`|87CYKR2@+DIophir~C`8$|dl3)X|R5x8QdR1eVOP0F%C)y`f)mkp0
z2`aZOd)+@KdwpPw&b}TjIfWpg@PpD3zF)%^w%YY+Gc3RM(&Bi*;2@QO6ZYD7>}UsC
zC|B!q9CBHW7{M(c)F(Z}a-tv1{CI*?iGh7zvd28bwcB=NL*;41bN#4t^{j`jBxFy6
zvJq=V$ro}9?C*$E&vk`2Hh%6sD19@y3Ouznk59GHh+WMCm(Lgy>O;Og!O$!3u>689
zVCtAFaBqLA*!IfigRj+TC2_p;(MS;fDSx0w+Ic(1TS<<9+~$sI7$NU~NRt^wst#8~
zxE4f<F`*+BQ~V(yDz9&v>9mS_tg7IE?4qiu^o*(@6CY{@#;UbF;ascC0FQX1K~`8X
zdsBj6Vxm357_KRVayP$OGMK7VUNa!HN*K_`5jr!<hg4U$8ASi4j!E~+5x#J6EV?_9
zZb`jST_l^o%6>MsEtT&y#&IfRt-8L6jMiq|Tq(B65kifeOA}<;LRvYVJ81QWQoMl*
z^?`C_6kTQ=%+>8USNO_;bHEd<t5l&#f0_#0wB4OyQSW<-6=Qph%~8mU&Q6v*jz*S{
zxC8C)4c82<kK$?=RUFawb#jiL50DaqzUHlm7?JmsP<l1qU^HK{<Tif)#M50QN&2B%
zN)lA{7)g2;!k}+UovG~YE1w&|(G?4TZkuB|;4f=gin*@Mdoz5<2kaaP&gz<Qx86_N
zmcl^JMWyNhSQ|1$HRQv}h&Q$Y>Y-d);-;|Nxm>HZDy#T!n~uzBxjS#yHS^RS&dPND
z5Su&6ma)5j&E<5Ld&BND;H)i&E^N1yTWeU$8jr^sk7I?qy542O{Jb@SyXe}q-y`&>
zU8csw*G~0D^|WCNLt$s6$@_tw-j@d?n9*BV_>n%ALtO45|2M%sSSF-yTVBIkoxqN*
za;*Z900mo`nxZ@s`kgF}N2&1VgcI_$hx&wiLa$dU((#;dWf)5bXG>T^hewWQ#54ZY
zttQAkjQNlvj1mP|=`P*?0|W|Yl<go7+!cqq_|d)gR_J<FnUbYG*`Xcdlt@rW3Y7~)
zF{$AFjyDtvYNu3h$Fx3pHn?)VST=0DY`y^VDp8FpdXU;Y>gZ114G#vc;2~79`iHjo
zQmX1m9iQ@T-3ciAc-Zu6+#tN@uT|f)X%X3u*!RsN@7_F*-1iq>?5v<u*eaA5GrDah
z8Rn5vs7+*ic}zlW1cp(jh}c}&>0i@Ts`Do>r<;clW^}{AxK{hF>vV!T;vHnk^g$O`
zz~FF-(1nlqic1EKTUPSyVfh!fARhrcNR1X4tYzsMuY6v`q?U8yIMws%Q~HRciB@Qx
zUu4mxPz0P7!=VU{2+upZNp8+*{WIr)NHPS$Po7&eQSM|r&XKlvX4t`dbRisx&W)#%
zVVMHe8pd1<aYbgE=p-}UgNJ=Vth?cH-9sYUUq{iHLNGZi5DY#q!P62uc#Xef9dJKz
z7;}Q!-Wbi|nAib*GI$g_|N4-P&pl}K8v{~ju8vpu@bwOFFR|YYgX5SLhdGmGXFcXK
zoR(lr8p^&mQBMEybd*G?Ei)k7t8>sR*6@>57i!j6^Nk6oz*4H-7?Aq7TTrO(i>MUW
zI}NMngh=*&IjAc%Bc{tMlO+A;qJKE%n4&gNj-MlUdanrm?hA>we^8boX^Z){^D*-e
zdLiCi-+dGOeww>!>HFJ%^VRmJd9kKozZt<q|0IU6{o{K{(n-YiJJa|(cj-IZ!}*(y
z_1{h4Nfj+Ql%J@dC7Z7KsBP#}(2)g>dOt*p!vzDve@f62^|l!B^z^y5Tn+Z{-z=(q
zg)ktJG4Z`0Fc9agraG<`{4g@iyvpWsntGjbIU3&mX7q?M<qF^pDFeg_1M5JM-6_i*
z(Bdp_I0HCy7KlQi(6G>wsB@SHDB#9#N-zt$d}v@Lm!@DsLq+<LYyS3S+NZu|N@O32
zXdNFxyTP_Gu%Ow^+hd8M+n5Q>bKrI8zkp3n+F6AjLJjYgJk9;`nwH7+BDO-Y8_wFT
z9$_RE$@sP2<cxM8U?dWsb%eeA4cF_f4^CohJBRMmxYXI$yKXaev=SQkh&8Y=mc;$G
z`dp$hnD*ra<DPIuB_#w<49LzRRa>p3!m<bV&kWpq^cOnWrqYc9eub7&3R6agr8!0d
zJu?470n^=R#2a&$TTy-bjapt2%lLYQ9N-p=wv{|3PJ1@eSl<F`Q##(E1)#oNIEAF>
z&%i1}-+~q)VO9$MmJUX^6yabM?JC?wPjl91MHEcuRc^EM+0CrgH||ZM2|m@2qC6c=
ztIPN+jvA$G#%^v2T=dl?Vh8JJ{?P0_f05|;p$HP2y~olY!L2&rsnkRpU<o2Ww)WYd
zPqV}iFgB8wF!j$k;`$Vyn+vDL1lIb<txb?KMR9>&20mlPyw_b8H__#LEq213GDqtW
z55is^AJ%4`7oWk{%}+73vXoTWDecOU=8ZbJmOi?5?}lsCP5C5koL%t#k@j(xDXMtL
z%tmqfg=5Otc}YP=ZBAO`EYvOQTt2UaR-7U!u?@av(a5Z6^!HsqHzGVQq5IZ<HIn>|
zTnhNRgsqBhy)+i4{vxfW*82k@ton@fOa2W4JZx?ZKRH5OQ)2iD5ht#6FLwsu?Ehlf
z&>ok`P!=OVO!Y$%!r+I+0`g+y`AN|>owETb2gm~kSuk^Z(H!Y0@EP`~7;r@rYk_eg
z!uPpMB&Bmg&cnnlvCHlWc_>SUUha{`dY!@<hN&=HSrC`ce-mW@6!eom6qURqgR}Ur
z&s!Ym0%i4FW?mBNs(IA%=fAbs<#n(>Sl>DY^!JS5|13oQ^WOVEv{+#ir+-^8{<m0>
zqN4C0gRyH8*>|u>ref`&szRa+A^LiO012>apZt3~JOW=Gsa8Gf>W=AtG{PsM&)#VF
z&0cgl3m@m(Ui4oX+2QMr-^4?z9wS`aIlSLNJ3P-vR}IJfpP>3sO|bO4ve@jYgPjaV
zAWSrds)N5x>@ieEE3xI}!O8P!e@h*Zz~DfeJ{;DW8AP2BB?Rig05g2sdb)C!mC`pa
zL&H);X)atpd`su7_^KCh^8IipCElphz-+_D9XrIXFl>u2!NXEKQQvxrwoTT2cX-_&
z%8o^>b&YOCTQ;vj{X%IO%&(Y5h;})qm)-5{57>y8#Fzi}_r$#AQ=nRD!4@xl^u$#_
zuZN^H;8byp)vH#bJ*#^*tQ&_x<=<QUaoPz%*bHh$U$SYv<mGrc<buys7(cdW*3y-0
zIS+;A5Nmt+c@Pq?9xGwf%4>IJ9TA@N!^ZXfN0`H_H_2UG7M)(>O=fiY*d5Im6Tzt0
zuJDkiZ4Fy?qynYm{m^;By1Vx_Z>&dg=k&X6meB}?D1^>O^msdjn5QcJ;bwa+bZPro
zVTHVQrA<||YuV?z#ppuE-`d^H`;eUhjZKl!CZ?!38|fVt92WP@A*+$~)@UjmwE=0P
zu|8fLcu90Vg);5<x)?B8YU$6Uv=Ez+N``eP-n}j-sj#ek#%DiqO6jgVfb9)->%cp4
z$ZtxDu}IrXDxG(ly4+aau>SQuY6swDLXKhDEyC`p5j*eZ6R9Z#d07kpU?uz>dvtKd
zU!7b6bE6ax;z-9z@1{;b=R74iq`;jKOluzLl!P(F5nM&ehWpGov^N$BTs=><U|W6b
z{-T097NiHr*b%ToBuIvqq>72yT|&u*3^z8!)vDo@lk%#>=<3EgSDaNN?~>zSSDf4Z
zA87k~IffTdM-kDb;$|t9NaPJk6-{#SV<wF)jx~)>a&2=9l1lAkiK<2jG((n0(;~qN
z8GlHTSHT%1xCEI}%t$HjTqUPk#4}5a_4NIMiX1fGu%3MKm6no+{)qm>yruF8wCams
zbP3F!A#Rk_&ydr{HhVA?M^rahSBZVA_9lF>P(K#nU_CtVpYpTmfv0|xK5)RfW=?%s
z*LO3->UZP7qOpo7VSD09rK7#&w;t&CMQCaK6NBp$YmS^XQZ2{wB{V_w_uo)&ZMf_R
zyYC&n_1)+GpLaC-Ki;PQU+UxkmZPhbZN9HlMBgV$IyLw*N|Bo?%al1_2uh|<$!M8H
z@(^moj}_~htf!rJu`A7juf9Kq#MpoJKQ7{!r?$|NAqlEIM=vKPF90m}8yBB1uiqqY
zmEWi0`nq(lq@wbegN*3N>e7iOR6ke(OhU)SHbymVOZ!cnv|hrhAHe#JU2+K==6CB&
zmayOZ&Z=1kI&9Xb6(<}QA2mxBpEhDQ&(nSHdm2sD+!J|@SgxWJA)m*b=yu<$OAVu%
z8#{1d549I|{zzqP8-=HAkfU)cG!?I$xnTFLAHq>kZZ@?x4D)LFJjXDpaD!k*M<(~t
zaBVz;X{eH@Ch6px&Y3B7@&F`I&}<~~2O-A|FsTyE?a%%5F;faJB&-D{g|ocj**u_M
z-1PyWYk75pgPUWj<;@zao(g_St3DdrRDX20359)zZ6&rYJqA{uda87RY9Q0ce(|%c
zX<={Oq5zSF4Bz<9Knwcs`Pm9EC2u%*<&fp9Tb7wl{lZ-&{Cig4h`ZckVx{D~Zp#vY
z79{IC)I$ji!kq{{bkox#WQ>Uqr(PaVnO<x}@L0wOc%`t!N-Y>fAqvaaO>iznqJy<c
zps*$bh~T~L(bdt>8W2Q~GdtVF&J0!*D@LmOlh#S65_t|Y%C?MyTBw)@kfku-1|4F=
z<{z$_!TLbDmYB!P%lhvlSBd78GDc7(p0cD`l!diY2#07>lqcZQ9q<dj2d0N^=Z*F(
zl2QThIJY(-{BE@RU$njTS6yqDC7j@LaCdii_u%gC?(S{}cXxLQ?hu^d?(RVY0fIx5
z``)Urf2j9<qq@4sIQ#qo&z^fdOXixhO>X9drRPL>8}8Sp%EhkQDHYk|?Rv#s(&=Nr
zJHTJ~<%M5Z;*~Wgc3lPLxrn4YkA6ws8Dmv&Yv8q)I}Eoro?ZF}bjUQLruiQCHGddS
z{lSOE{D;7}_J~o)$Eaof|2EG5-dq1Lg|kQgNE?Clv}w(R=uLXoLsCMT`Rv0QRSD%x
zLe@biSqKBn{Vn6MtGdzr4;(VL`VaYH1koSHaQhkHmBqfA9VX`R+g!&yX<Uup-d`S|
z^CKovU38>LBAk%Vum%-p6=hL8bVuOu*nnRc>t2;|KH98$+f5L;xNAiPC-=W)*Wp5r
zoko0meP<H~h}^xW`7EKg)3)$_Z8qrgteCA(io5D<o6cx8P+&ILuA@zh4b)!gUDb+6
z^w7~=o;yvey;J0uBAb2+z8-W9U3O~w2`ik5WSo|n?B&Ql*ttB<sJLnsDN8~hMzmU3
zGhX8htSQH%lJy-}GJ!01F8>bNzwUga$b9o;r`j^gw^;v7k06HMe7v>cN=2`#Rj{$O
zZ{K#}&}x6_avy>g;&E=PoAW}1H?Ws1e9>?0Az%-09Aw-q!bZB8Kr)RSXT!!gE-n{J
z9UOaIV9hnxy7{Jz1Tc{gvm^{{3It#SD6|vFS7B^UYAJbUS$@pfF>YkC2!V=b7gXWi
z2{Uf+sflA*&Azy9n5;zeO2;@T-KuZ6^;>3Vl*sKU7Kuca!&w-F_C!cNnKkIh;UP-G
z-kKTA+#i8S#vv6E5T%@A)WJLhSB_^a5|+TQJ`=>3EJ7UuoH#|F=Kx9pUO&Rar4o9w
z<4Y?aLx0W~J&0$(qY+S*$rIT++He-A&M{9RU(ZF?I^^?+cifPUI1st#(bCJEu4DkK
zRs4zG&?1VeIB_qLo5Nq#r&+Vvp&KJ<cJ=xf5p|2$<bP6+au3UA&&)@lqBR4@wXpA)
zUjCAe^i#0z*ZIKj*Z<r2{d>17Md6SC6lyl)cVZ!-mmY5ggybE?eWAh#=t#wZ?sIm9
zA1#ud=?{&(86H<wdvVM?n-24^d|jS7a>v~h_tPU30r<bqD2wn6dHUr-bcOGPwR3cl
z$3`efgiC%Ri(0@psoqDqRKGOh;+U<0Vo0+j>K)&cX^xh1BMMq<XjS=ae@8@R=?=U>
zL6Yy5z9U8>%7C?HIjmvblY&@ux1_fHwWC`t?C|#EJX^uv36`J=Cr6v$jpA(LAnM?v
z*49R6#?7g$p+cJYoUIN>UC?=|Axv|RDz+AZ8EZ~G1qJD^gP)S{b%3j&aqW|f;$ANo
z)d3aJb|TZB93%R~3D1w1EMzO4D)7fp*V>rFG;Vgx@fBJX*(OYy6>8KSbt86xX8k`=
zgrQ;GiTGnycl`1E``eP^A8$)3LpQ^JrM+slVur>p_D-IXwhlIbi*u=6DB-AL`oTln
zXaxCaXi+W%8NlglN?Aw2H5p->SVJv_P->aB7{bwv+L^f<R=e+^{Xp<<+Ltjj8HT-*
z@<KaxW@m~3Lmi7|bmrf>>6w1czTda;d*5H){xq>~jrOXc;-D{@l`Wt!8*GYZ=tHS4
z367xpB|g$XbVyu7wO~IXGA==_u9T1@1)Ybhn#O|`ah7Fu!-+ftxh=(Qqfl+dF{hzf
zeW~k0ce25EzBwlG_xBZ!t{`jG7az|d%7@rz83uJJ=s;@(WtwrElMOW|z9dO9=O-^S
znzFAYOB_zx)|#ISU|lHi)^Fg}r*TU7SinN`pj~LSS`N1{poYkAKz558ZDDSU>DDLC
zQ}QzHraZI?iv=!Fqm{NC=-R(R54^=5Lf@k6%wJ8?*0;ta8s8j9(!SD-TD6>5YnIhn
zKaH=i*PeJrES)8!+M@f6f7m$GTXaN>s^vhq^-P?(c~7Q;1ebXx9mMv*M&|_v2Xu&}
zZN=7Gcfjx?g|j<q?5LH6X3=8hnkV+neJh@Hhg+}Wto>TEL`0D}TigmE8^~i0Qnl68
zmrW@!G-a}C;!LzgL0V~dv50n$@s`k|H8hozMrEwR`kJlEp2H_luD;Y{P!pq?q|ba_
zs8+LzHbRHvciI`GS&`xPtlC-qQ_D>;)p?+lx=6`f)-vYtocyr=GE)&+DhID>N4bSw
z+qGVyvN<}__4h_lyV0l~CRYj9{+uGJNLyt<%)<`Ib*cmH54G8gWvVpFy&2Ma9n@te
z5{G-XBq}C$Ff$AM_jO*m8&1%VYNShX_1Y@{Ym)NUgG}GCqRk#GxW3pmm_D@5dz=Z(
z2Jby6)=*X(DdVh>M^KO89tf3@S1d-V;EPWH$W+DGGCyG1SvFlx{7=6_e?QJ2N~>vk
z1$Xvf5Jpc2lCLYcW9GT`so)(CV7zWQkta_R3&Pcl)v8X!Zu%mnN$yv=;VOV-miCln
zx!zf(VFot=|4&Wz2bxMcx<jAnMRueJ@xJgZpS#8mBwJ*IAOEfZ4aW!^gBpny<P5OJ
zEm8&VLhG%6W71-I%k{d*7LS{0@eEKng4&(5ByOIbz|Y^;^RS}ieMTO;;l9M#QO}V;
zDg-1}4}Q}fD&HMn#N2}Si8aDSX^K|3$CH_Ji$9~1xlsokBq{9Ik97~K#v!g|=W+=i
z-xzbWBY9xgSS|8Z3}(VjEq?kI^L|Z8ihKuoS)8})*UWHxil`eFUfQme$^YekE)L3E
z%&*jnVSp7=$A&cA4RVAE!Zwuxd-}+edn9}thEfK}Df|Z44#EUzZBjU~&g)95hauvW
zF|}Rvg1q)dDk#y12kxFh0}g9|xb@ZCAv^Qe*E1+S8R4G{KfI9+Djc6_RN67VkOpEN
z`_<YRK>u`eacT~M{P6<&Cl)>BE0j`v?6+}#`0)JuSj78}vFN|d+$BC(1U9CB^9NEs
zI6~`xI6_2&vY85$A@+&Vs$>|ncQc^*_~8$ATFCKmQ1r7)_*lW+@SQlh1=9;61OZ{f
z(XvLG27w)EIop^1=11Rdt{(0QKKTTvezu0NVJ?3zp9bPD|5)`H*|C0JhWmDG_C3`8
zxBqs2l{@#>I82rEUJRW$Qf7;$oVN_;l~%7X9=wq)0lb%uZ={p7WIu-$2Sb<lk$Unr
zmzWXxyKRnG(4nPZLPrcL2zOPFv!#xaiy@nd(qI@sd~=>`n(?ZZF9-x$d7&XOQk_`|
zK~)N5Cd=l`I(PW(8;5l<!a6XbRJJLZCGi$+$db^>;EgM$Nwnt$DlyE4<!Zh>n!D@R
zJi8u6j0aUoHgnW6i-2bmh#G%gyO!wiKn!7>TI8#B;N3yN>MU2GZB0~%V8!x@E3xlb
zW{wR~G@<^v1PBqM@~}YXdvW@LT4-WmqBw~RV#;wKMf5teF&>L)^Qxb~3<{wfPg^u-
zfGsu1@<myJoP9@R7;TT*XQE9^XZplELg3IN)&rm4yi2eP3NEs2ghIM5`;w+k$QvzD
zPtCAf$Mdi5%qoF{^B;%$^nYZM{4*l{)tyl?H5c`85Oy*(w05w!v~y80bTT*n+f?a4
zD!LXvu66uELc&5qje3Uf(A3zL;YdVG=(1~L_lGOVC8j?c+(lnd{O<KF3Yi}IeyIB=
zJ6?Jb0wKy1$1f(%rzUPDHnv_~?mj9yE?${|!5UOAM$<hv2+4yFLD#N`pa@GKKHcef
zC%%ZkXVg!J&QaCPS_rMmCy<=f;>14U0fWmQj(#zH8crNwBKn%t*A30x^e!=9IYiT^
zTs@p)tg+UvOOb4(@^%$h7hTs^7cN_DY}en!22!aJwXREbU7K!$q`sV1pm*)IyQuAV
z&<DjMy5sJG7dN$HRv$}2cP||DF!-RjV@|N0jQ1`A<ekJ5-bg1~lueB9LthGz^=s^*
zDZtKc?<syW8L|Lyk2GvObE_go#vB!zTXQwG;6i?tR5jr3AxI#;=J-C%Z`PS(K6M^~
zVYR*vWhl@rQo}}pv8;nvy{2zj_2vvy-y4ZlR94gAH?f`^Dji<WPBFOMoUAc=YGKW(
zwwB=46N_X=?AOlAKv@yRbfQm@3|*bmu9+C3JELFj@(;Xx+jK@jz$BNa&ns|v!p}%I
zr+k$U1&r!EOq&<NYDF9mtCWq-oX9s6)-6{SY;Z&ZdoB4Lj%A8Qz?cu@v`NS<s54o~
zEVV*00-C^1EKMw$ziSck2r=tEfT&UWiR~F5%uAnvXBPK<0$`U?0TST=&E2zMQG&&x
znpk{kg^i5IJc)(}9@mhGKbaI>Vh>JTc2SVM8Id0pXwP?XC7qav^ZgQgp^&<zplb~=
zjgeO1q>Pak4c8D1M-U7~n56sw%f?c+U+Y(_ll8=A^F7#Q_@HPqi|@^fO)JRbZ4nKS
zUd19$S(sLm`q3r~LQE1_8~)|?87XqS6!DQ38~tNi%=h09f+B`CHb#cV)_-&M<^LG1
zV`kf0&ktHv<?n2YbhGY=*6;Q0$O~$-iN=|BYVNmW>8{8=IpBYo+Dgd;5n?m=r9GOZ
zKl*J6=xu+(HCpcj2J;Is94^g;2sjK6MUH^+1ZRQkD(WkxJS05^HQKmbN$iLbE3%Hm
zQLNy}3^+2j!;PpnmN|IwMbTf<B;Ck_R?`X$f5||iuD~5BYd(<l-PP13z9P=S8D<Ej
zJ^GoWJPw*usxss**0={}3p5?;L+?vqkC@hrmJ`i=V%K{THr=44e*G5o{5i!*ZZ$Fg
zX46fiqz#(1IaNF8?PnGg@LhYJoX{e_S}ZC*LalFE3h35{=MvfTSkiVytt0+b5W%!1
zYO>||ul+kxVWVjHk61JOkD2g4AN>E;308G5`54Ch%c<ypx9J+v&{juLM}3P8kzocS
z@er*y%BqDZ2SzQyQeh_%T1Zev5O>cKW%OG}>`jDNT)diDTQ)CkF?`EMh(uVMTU@SP
z^q(8ycdx0vWI;)cH!&ovR>fawyyv>Pu>a{x@BQoe+qXCPd<22jS$NH2|F6Hwu-;h5
z^H7nz9Tj`YkU$baj=roUAjhN6hC~O96K6iQQTLCQkQah?z-jWt8uUPO>D2F1tLruH
zVyAswzk*1!hw;$v<pI<jGeb+JjhND9EsT(=CaFS<NKlhiy%iT*HjwY=LKq6CFk@+=
zUEvQb)n((1mF{&U%7xBDdz#RT9Bh>ZN-!((_kIGFN>DPgF<s)|z{avX2wS=iqvWa1
zJ4?Au6_L?<CMVNZQBj>l46BkA<t4JNs*X;im^1Yn#8I<QNlsTb1R%5rn-G_dG2c_~
zkU*GYp#ir~?@o2W2`eVXorGsuthD4u<|XCB0Yc2_g0;wApec+%c}s4pEM6Vc4M+&8
zol*w}Bd$;o{v!x3b-*J;sE%6dJJ$iS7h8zV@FqZWzM?-f&n2cGRyX;GOkPbrF;|g_
zg>VN&tKv<Qij71(CIYZebL=6@CaKJ;sH>{P!p2A?%4(s}EhRMziG{t9bBsmnN76bK
zpO`qX+HR>CbKPo56FTQe<*BEHR(l+S?yE**G_s@({p%Z__z<HexXEO?j3#nj?~Ib6
zS=+gu|11Qz^`v}+bm2;-;-RPLR1KjL*)rRWfki3IAcG>(O@z&nCZ@DC3}l(ei842+
z)WS3+);MgrfmxfHII|9Tw$_}|Znlv_xl(P2jDtuU<BA8haAYaV;3gSOZkC#~m#w+A
zIT!Izf?5hzD4|T5Hnlkv*NrU@kH)=kapISp1&#OkIvx&oTr{?}P19xY*kI%kF~rui
zUM)Vu>RZA|l#>oYxM(FN<am-saZ5qh7|WS%DUH;1TeW3vZZ1B=x6Uyu?VHy&!0I>=
zhwcfL)>B)_(59waHaf*^*4JBfy0EsPqZo=C$O24R^Tjsa;;RnssAPC22}oWC9!B6X
zE@!kkF6MAKsJ!F4V|<qJ8C-1|=tec@4kBcmDrB!A{FNu(CtugDb$L~qR2z*svkIH+
z8C!1XlPjj!!w^vYo!9^dyayP47MrDLDOXgnZ+&=cHQ;yJBC-<Bi3NTm+poF1-?=5{
zRuy_WG36H8GqI*>F$$!Lv>>%oF4cMwTx#tl^eK15fw|4Ufv%nmma|rly0iND8p<p~
zGp)amf~E%G+E}d}bxXW4tE*B9^&CBd*ARjtYamqDYZUx!aW<>HLtvlV>-<+R`0)UY
z9!o1E%JwaL)CFQ(NhQAi3%Z_*YFgYhvMx5E!Lu5SjH){aSK=Uj6-@dQ0u!o4J2-b(
zptV|w4W|{);mnLKywrFr^4q80C(1paJ0C^G3A%EMZTp4h_{g4!=1!z&e~b|J_uGp$
zc#O`;C-$VxuH1cE@*Yk$KlvtstPv2(W)z=`dqkSuE1Br_fcPCWn+V2dV)YIZdv%ix
zDhbTA)7oKQAxjd3WAuzp!?6==DuNIwk;{I>OygM+)hReJ*v!y3g*4O&?xbeClZQ;o
z(;tr6Q~{Z<iM!+Z>w7R_+6?QeEL1Ep1!y1}78K8fCZ;$lW3G|d+f)rEk3MD=<-xCh
zbR6>0ILWq60}u`L+3$Sy$hEMnH=)87xx!Nf{Yv;t{gFQ3z7G_p>GzMP*kM<;XB2{^
zv&5m$m)T#O`i09bzNUZH8jZv1Li>8P11(;Oj#+gDg;NR}W!Xo`=3odtnS@aH$d8@2
zQ(Q)O-<LYWZ0Q}a^lU+RTBD6oe}Q3R-wU?vMr&lQxZWJzQrO~+<Slcd*Y~`CfbkFo
z^NXXUK4)dbZTFLPk(oV**b2T(om(WW-C%Yve<H_>a6(t;2xTkYZPPX}vJ_7)Apm2P
zqR)SK&!1gOuGHno)L9S4b2SuU#<qFiQfK6IB46=+;yFq8_L%>9M{E(rx<h1f-YpWg
zfXFY}6QZhDfj<RKqg7ew!^h$W@E^rU|Jf$=AFr7IoKdLh{?X~+OXA$}YLwjY`Fu!&
zs%%rXASXdJWDDb(n7Bt;BBu-^v1H<oEZ@1s)_ImJ&`Ti5d({g{i2tlWn(reK&Oz#j
zBD}Hcs=VB?$6BkNyV{=1bwAN<UVEJP?)Q$;%gZm@E2uXDb>tFl=!a=<Bs8MgRkCZ#
z#`!hVT}64uK`1OX>W|UM+*K`*c;F$XV+hny_W_QlZJ1Br129~<5B1f;c^iWt6tncc
zEvM4kNItStx}Sqj6QTHw5ml<THH)PxS34<2YpV6~pcn;ede?0#)mvDDx!l`sC$lz(
zCc!WRkkASu@)G1?Qun<s{SuU-aR`y7Bh>(tMpC?*!)m>M{a~G4b6C1|^n&hElFbg=
zSV;8=GKnF~yKBNX;S``~75hEzJThP7aH@9YHsn{gp*9WNh)SR)!YXYsOAfv;t0>8@
zcq?tu-Xxe6l!N)mqv{*%0$JoW+ny0;_Q#17P<if7R&SZ7!+<RJB^~KY2}348DGLEh
zH1b&K1FwaHx8&uyg@zHP9TVdLg2-1>aIP$m^x!bF%qqi--Lcu5<s&1~HMp-~?J#|J
z4eM7j^~9=|!}z90(J+vjsd)2lzAz)1P?fc&2H@%d8H2fA)Gdy>NCehoK=p1W5CKj{
zTyuaNd`B|Lcn87^V6$5snDr2j>SFS_<OsE08*m&4=!^F$4vV>1?+0KWd0$e^og0@u
zc!bG<O8(eDs$k0YL)K-Y6+pXYl-a!V=pKLLKdb7x<tN3Xhux(r?kIMiNA1ZQJH7#|
z$rh@sUsJj9c!f=PqZB*jyLj0|N(Ev$)q<&Xvib-^%ym$kD4uBX#T$GrZW2VAl=i($
zK5ZVO8K`in(7g(kDT^>HRUa--%uo!i`NCDjX&8fdr+Qtn@Y}iq>C024MnUfr?D&4@
zWmNE&)w7?+RP_qTvUosIee)(!`0w*ErXhByMFykAm9s7hScN}POGlpo-E;;4_=3|@
zZ-7+afItFE)&TR0n0eeCX<qRfq@FX*z~h2TN`{>h@_y0G8o#UuwBXgeUO$oOT@1i$
z=))^}`B$xc^4|q|!xQ{i=<N{>tU$MrubqjW;1r!CxW;YEz$;nx5Ov4O2nA7E!1o9!
zqCSPpR~(V^H-Z^^Q*#0X4M%JM(ugJf72U3nIMExv<O^b<yf~DsOV0UM5|IZ@Y&_6s
z3`w}g5J&EV-w;y@1VuEa@FOP|)X2Af8ERO!ggQkePlJx|48tfAitpHWmK`>ge#yf>
z75!7y^kPmlD4xZ5um1`gEsFb{V;>c8*FW|}{wHDM?~zZ9s`VeH5TCMD866rFWe=L`
z5Pve=olsM_7zjj-0hsj*=ce3R--R7ZrzpyMvR}fNnCnJ?(7|s8U7chSFzDr*CT?!i
z8(jAr-tL!gFRve_vLI%OJ8ffzq)2_F;@lCK%($AdxFR-cTw{60m=fk=fLYI0YAm4i
zSi*RXnCK~+Vm&k#U3+TXxNy~uFHZE6>!IUD@uB);<<+6|Nwdv+=uGYcpn_~9!D|aW
zmx2$15mmajHbYIf6K>HeUGJ`@0$1NkeC4RJM0MVume=x}j0Hy2>0U01d|)S1S9e~C
zK1l^WX#u%z#fetGeafl)U8Ez5MB7$EQ`Jwov&Xu<MU&VdFrY=m7{iyTF^vKhV{jYY
z#)Xq2$5Fj1lUN-f|5O}o$gHb{fz#g<s?4HJeKz+?auYwC=oddhvUOg{U}Ys&zrE!c
zqQ7jr4TS2`lCx|JmDw}u{;V>exDc88W@^hpAq@Zb-ETo<L12gtI~px#RAs+)o?Kfq
zg>mNr(_S&{BK=B5lB)RYkZ`zYoOVpKw`6=&(YvSv-MI*e0|W20tRuF-417t>OU8pZ
zEu+{@K)YR;XWIOU(M*5t?~C)a&eG>k)DZiOg;?b9W6(LT1EF!eu5PhA*!f7}L0Wc+
zxxW@3E8dAyO|uO0eozJV?eKkRjW6`Bv<=+Hgv0t_y}tDtutLmA(L?-;yfq>)4iD^`
zaL{$jEW8j%nInYF0g__QW<g|AO+!0DxZiNSTxE^FLe7AvR@|Pjg+DaPt`C;FMXXWy
zB?;@L@~uc)prKJjD9?VA7aoNXboL<Xuq8Y#y;!jSE@Ev$Iq#}5>Dymp`_;G4FCHIt
zFT;nG$iHv?{ZByt_gtt(RrfzZp2D90P*aZfTwwD##R3Vg7_&)@B>dX3Bc~~NebdYh
zmi&#%_YcTd^F;Qlt}jywslJO}kT*7ZA5FC%Z*@A~AOB?7{w!li4j+4ld%`J<dHj74
zNhp<MB*8p<f?C_t833AbPA%fmS0M>B(Ohkqvr{Y4LsE^3-)%64u~xM>{AM3)__aVM
zcD?DPLlq_0hitRuup4zPC6lP$WL=3tqu;e;{1eb<b=Gyj#-glZO?IHBn<e=|(iV1H
zgT2|x^QJ%Lq}$}=gt&curf`T+BLRm-YYay6kWqr}bCm7+ZL+aC$SVOeBxl1yM>5-C
zbJIRosWFx*h!mI$ZmIh$Mx(bUh@;;NUf&7*aWTuOg{t~N<gR3%3uCnTn6;5EW@_Ep
zaMWogE1yy;q!Cm%!^7d4Iay2fY0K4GCiCF70=>3hO3$56l5ONF|B%Ov%Cw@wwP{(6
zY<u|&0`sH#RY=|^VW}2NuG)sP>5^p!E9fswqgU0->7AssY}zV^3BC&3v#2AiA{7iL
zk_KSrn3wlH0hsu&<^^1rj1#vK{f=n`4jahM8^+%WTr%Cca%i9E&Mmj6-cAEg_(LLz
zd{Jis#$kscQ*X2V;(^>eVg7J4;lyHe9CGsDr!NcsNTc<#b@I2U{rT_s`PvdQe6#hv
zk^o4+ZL{r9KM5P6Ok;f{udMCC-VypB{m*?CBNkzVz(!8UR4*BoWA}1lyegeH$o@RX
z!Yr#Z0u>C0gr$Kt)D`_c4MzPTw#)&{Lhs07&`3Y1)_BrXi8>akDh@|#<N-?=gJiSq
zJ*Sm-4ESA$2<mt~rP;p%dGaNGhx`9ijQ_3ER->Z(XLipAnhf57sui>6UQ-3KXg5SY
zY~T|=V-dU-{(BM7iNfugLDmTBd&Ti+P{{POgK))w72|HH9AUu(*U8g(pS$Y)+i%k6
z`SFk@0Q=I6DQujp*wGYUlXhfY6_y6QR<mtN0ryw$tdBoWba6sKByBQQgE)2Y>ldm5
zoX>H@LRO7vr?qDnr*#yNd>p^F+mx^h&^~0O;6txUPR?dR^f24#Kr+F)5N8P)r;x03
zh+YM$E%BLo>8C^L8wTR7LV64+n~IUAA-ZE{7(6KmO)Aj5cvp6{hM$PinL88vYvz7c
z^-RZb?ra=!BWHdF+!^y)du#okB*BL^pIckahhot+TmxDU#M7#`P?~^bj+uXN9tiwB
zSQ@=a`C_KEzAqvtq3rn?ytG3;bQR7Qr>f1A1aw^tzty(7z+^x)V)rcquXt|6-x;*F
z<ML)I_bNKn6}Ser|D9WI^>a}pmx5mQO+CJ5b}#LQp~Xag9l90ZUJjF7#83a`ExpX%
ze8Dz}R(W29;O=wti7=}B(AnEAh%HmW3zMrS_I<r;9x_<)jlk$2cMgu_8YsF(J?1?=
z9)%>fCoQ5Dp(QAEN1%@D9f`&r3i3}$>3j)i8)%;q;>q6<Q-;vyh(9YEDPx$TmnsQ*
z`AJ5vE)jqP{-&Jw48R32P`)I9WHy1X>t~FUoPH{ueqKo$QgcU?c9+yT7`dcP+&vl*
zPX`B*oY%j0HARL)_Q^jWsrirQjsKId%l5B^V~NV99EuPo-#mKDCVi7yA7!LJ+IkQz
zaX3`pr-WijG-H|%&R>$7!>X;B`|N{^p2dg4${%y|eU1xqquu@)^3BKJ=NT-=>mOti
zzxM}d1EgtY#w$U6De^f=bH%>u2&RdX(}F-xP<D~u@ts2mk?x(sSRR849_zN(3SCG-
z2f(lGFd;^DmAMoPE#tw0U=Zk7(eAHYfGjrsX4|r&7f>v`6``|kx^4x^xK6iC#ReR^
zYeCfMF?8byHei?AF3oBxYZZBLeEu50z=0d8)bbKkz1VUI#Q+>o%<=~t<l?wDpu+YW
z8Kx84Nrd{Wka9VMeMbnYRnNdCUu|(uT%XEH!e>y-CHix-j1H+5@Ma#x%GBpvoy+En
z&7&R%muZqY>xei&^;mqx_=j_;#Ox`=HBOAKQ8CD4M1V<!O!A4cuPuA9f+NMkYmN0K
zMEzt30hRc<#HR4&*G^BqxOj}*{ind&H3rd@Yi)FV<56J<E?7^U28G^+KnnEQ57Ht`
zu2x$N51<Oe4-}Aetj%6GR_7$73p^Gf4<V|F6BUS-vt(otfvodk-);&`?!WeTTr;=`
zHY{~vCpZ=>eGpix6VwN?`cff3c5Ueeh^-k4C*CsbFoQqCs8&hb#_O2=#;j&`kN$GV
zlc;~EA~WNP`h;l0B-vbIjocY&Jwp+!Buq=!C_)TPr^7{@LPA<97caGgBh~|;jJZoD
ze?HfcROfI=%9X!gX)Q0@7(!38SUAhnx(6!)<Uz9Dlx<|xn^7-yM0t1Dhd=Wz3<8*h
zwvtpB2&LVPRbt9yyiA|c-a!A9*`5a6Fy<eaHvLCT3;kmY{r{)T{?9^N<!^5N0==#J
z8Y&tZLwQxI(rRHj5h22omCTYfm?uHYfSW<*`uP;{d%*kPLv_U9kKm7D+myF4RKXSm
zMyA31NarZadHv>Q`D3DZxhI5Q=AfH|1AbtDmM|g<+6vfUXPjiLpY*N52&Hxr@mK9q
zhQ7~p7=oK%M7;-dG7j$Z!3QI@dg6^0ow%BSCYg5QQCvxpT#jAWZUH2RgIuonY@ip?
zE#lW*#OI3!aS+S-n8NMQGasmk533FI;sM9j^|EMYTfHZXG`>KXVfEH|^aj(|k$Rsp
z#f7o~3?@&+Q%wjLnFpRvnH=OOk51TtHY_%<z(f+zYvz;MD2tS@&!iQc1>>)5_>z-9
zVH&x`0dcXH-kG6Y6e^8LVA>(76>>aTK3VG#iEHZ`mceKz;5uYT-Ij1zw0E9)khvEj
zfvs&a>M%5h$nAR-3x27;yVDn2NG-u@35J=k^q>}@*U4>IWwOPF1}SAw_S0D^lqo9u
zN1$R0x_+)#-O27!gWhAFilm?T<}C6b85ja4SeoRDhao;zjChR%0kGn7-~*Uwk8uL6
zLZL5ttO|<al^x>Fmv&!e@Z4Sn;}9fqT-UyRiK5Ch;=%@lU_NZP#0zk<BF%KcdKz{F
zHkqF^3BEvGl&np_Yt-}v%UsZi@s|OQ!>urPK*_^1PufFn+CK4_(;FpLvrh0jYN?m|
z3LW7z0P^01A2<UPRz%y9*L27sYm3XO4mjgQv6dBzm1Fw9qtG4v!W7BTW0x#jrnGz-
z7gRm_*8r#vk1t661HB{vh+g4;MDKq&1^<r$kf@!DljnZ~<$vYE^Gm6zqSRJs-vmWN
zLfrx}1lDf*AezCnWN~~*=S`K+-OOFxtmn-Ag9Q4gF$l0@5Z*rdCtptqBh?IQ%$-lP
z&wr5f?$6D7-XEUedSTR<G5ch&sW!$8&|BFu=f}JBCQ#9pG)yq-+s|6sy3>Sn3&(^8
z4OB`{EBAg8B7Pp|cGYjD^A>;1oxiR&@Sb)up-eugy$gUW-1EjyTbEC^k0QKUl*z03
z9&g8KJ30`H47fA&lzKF4R;#dAv5srWRn3ZP#jcW%GBx4|s%`Q=$;Gyr;Y`ejwK?4l
z!HGTNX2sGr##G%C6$dkn@h)~W@=g18kUDO<ZWS_?U|T7bihB}b3Sn<&LGwmrTX*q7
zE>gH>pHzPBDjumdVhz1`K*y1IGC#h4FgAPLXGpv;D-v@jscu@{0XQ^d6Tf5iySz8s
zJbnenpfIJydRBY|vOlK(G@(5EnF>*UNibU7>K2NJJ{~L%$N+9Dws`!oh$DY5ZOg9$
z94Iix4{N}r29nX@r1xrqYGyMzz#n5tQCz1HJ(qC;c|@3*2alWRLf@+>SlViKCw|Q-
z4b}rKJA%c2<Vwxtv+`ofDWeW>4zY6YR{thi8wFp(;^WfE&;F3ZB#~?GHN9a;Z=VsF
zcnR`AfOf7AQ#R`fJD_;tiIvo1Ad)=8q4toT+(J6^E_@L@COG*#;Y<Cb3r^g`AW1?;
zj!r~J5^J3hy(09sVEFd13pJnI99O$9*0dcW^bAJiixNkE2hJNs^Zf<vPtYBqN&G4P
z0o$5?gssT`Ic)#H_dhrsB}%g&$pk8&d#8&joq}Q&B@8wJ3<7Q9gORoD>foSD5qW&i
zM>fG+$0Kdl3g$l`a6LK*DG(4xytSH|uBC^4WOzBj<viW)Y+hUI|Nhw_V40tK<#yL-
zen1*QJH$%cQq=`2<w!1X2e_($yhL1bnC8eGf209G7F#N!MVHjaG`&}zp_5aQ(|{9A
z1bp!^D`E{<Gp{LuMoBnMe2h~x6BF_=YEX%pCnU%Pm%^B{NB|2XPBTm`6-M}$L7VEC
zo59iOMJH^$^!ofL3*Ox+*%~)shl=MmpjS1(PM<{@GBWu?MJJpP$qUs7FMF)bV)clY
zpdtZ%Xr=C2>PG)mZhL_JbBOz-=$WTBHBZ`eNbry|w9s>D^!<&f`w>x)e{zg0tpL^f
zx0v;idmA-4>2fa*(Fcbzbd=L~451bM+tQHkA*Bu5w^RD_^4@y)-Q#PI<-_mxp(UI8
z4t}Y(e7RL*51`|`%jA$d#-aPCfCh*vtr1YMB`oKwI=hTvm7bB=jIsHPUooSB6<xY~
zeac72(VXr^^?~N5K2yAy&gq_k&$V&lB_RLWvYDk^)TsWLtM2_Hk3;ky!ST;GvbvL@
zgTsHqBWe0WF$Qt?n`3qd8!!X}4V97(EIA+~5EeNWq(q7Ai<AP&nCE`=99^t!jqMvR
zIt3{_?<a)NblGSHNqD5YK9=Xnb9*!QCINrn_s=`fmmTE><DoHhkgd2jC~9leYMx;V
zmMyVRzx9|CL$uU~e#tUnN%0{Lgs0ruAxHj@urOUJu{a)~c6P`b_&JyG{jgvnlG2~X
zg`Dj}zH&tArzr8biI~HdbwVk5-MZ}U3PPMKv*OU;v>1U8+Og6I@vr9sHOn_8lLn?~
zo8<6-I>(LzhLgNf_^A&8kKYL1kbMR-u-rP|-v*g?^%}j2`C$Z*uUCG;$(y7@)_6wL
zEvfHo9E2X}bsa@7GBZNDLlN>?&@b=q_sR@Dy@c1@!uLnDR6N-9Gz!@Vu4uY|wC165
zCqIwrm|rlw7mVI148iO^VliYWytg(4L+qaTJ9!F@>mn7@%M^A`$`1h_sp}>(Je}ab
zx~=}gRP26-TUxgCNO>m*R2s$j+NXZPU~9Qk9uvhp<)*K9%3y<4KP7i+9{grzo#LSt
zy`4^$?6I#qKt6H|bG@Y*an{Dv%;A`OL4I~zH_*Pd&}q;)v9T+s{;#{xYJMqU=mR&@
zAFQx{-xN~(AK*sL)LqQg&e+A$-cHWm#Pt8;t=6cW{RuH|r7g5{RXRhRL27j1n~`W;
z`IJyl3qh#6_YFD8vln)aor?rL$>i7!0zRMgd!=P$WPITEGcM5C={|$axlB!EIQKYD
zaj;O_9R4hu{sgSg7Q|`dME>5i3sp<zfIZ;kr7PFy)JEh=;)JQ{pxj3X?vAO&7k1O7
zdjNCE+;sRjekj<NKc$84PA<FY+CI*h)R>cKR?Xw4sWP6a?NbXqz8_nXl}V-NpogkA
zRL{3wCrc+DNu@;V*lOi9ibxM0qi&<_(chv2eviprR+UOr7Ujw&(!#YeFQs^Y%a()z
z5Lf9kNx~p%jfR%?2;oZO&bNV7!z@hVC%E7;y!L7C8qP7zfD}=mVs~*Cbq~pg94l|7
zFRy!UIxm~BE|2QicM2=WnmMZ&hiW{G9KG_$a<RUX`#~?y4ocn{Kti01eE-WUW9~!}
z?jZMs!DVuxCQ<DQ*D&R~AXzZtHi=0y#jtjat06j`onrf)gsQxRoUZ((t57oSW)*j0
zFHq-1hOIps?lM~(bRx$a^|<bmK7FV|s}B?gLusMk)Lq#$7{ibP#_dBky(xZuy{8>d
z-Sm{&i>Y9bkz3WpP-=+P>|j|DEpFy3aYPigS%UI4rYG<bbi*7NJDH=a;XMo|-v=Uc
z<d3CN_npy|5CdrV@IIXoL;)!BHZkM4W6uc@sR%>^mv-S7Ni#63+OM}p?r$Y7z=3ez
zJZP2y?k@Uy&61zuGgvJAS{LLivLP?Z7lbofoTWh<-8yJdwfCn4jaL|2HXRbHtVcTM
z=|`_Av8Uk2w7bag03O&Wkw3v3*kcXfk0Lw~=6zaNMk+WG*$m$T*KL4Hh@Sn1F=BDY
z>06U18gfv7>s@!d!}Db>n7}c77qsvvqPK`NQuftm5vyOxHO}6H9HM~3T-dKoN0{SJ
z@6tfy+cOb=MAEbAz%Ng9#00bbS6-m4L;8;=#uaQ;pQ3ho>A|410uV_;G>UG%#yi^#
zWN6W8N*=G19%_lxbrDBdzXo`aO#MWZ6Ay46ZIw*0`y?X7{P9Ct3csQVL4-ymZrh7f
zhek;kq~ZHEJhO!?&SAPF@{9E&VeUF`KBtYLK4D1WmvxFiAYBz8<q|);nH~JA1-7}n
zO``m93;clofAvMn+nD^jFZyq@7bqJ^bm*^3PZo+Kz?norOKVtRTd)vd7+gt@<EqX;
zzZu7+UB1>k!aJCMjaHKju4}fVi_0+9JJH?7Bt)vL2MfUaC)a)MPoLur=jqA3cm7xC
zUc#Q}e3T3`mz^5Q4{gODd>JT5rEvSG)#P;9s8AlG)EFa(50jG6tJsGPG;6MFO~gGu
zChcSg{r*nmEo07ojqK@6Px@U@;E(KF{VP<!uVh09nj)H(Nn7A(wI!O;X{0H7vlEl)
z@v>6puEV&(ZE|gmbMA6>qA7Q&)oBGS)v%;v+Pdjx#Ir*fR;F}m4Ogb+3NpWmMHVGa
zCE{_F6|g|d{9ej)NHNtlSDCKnV9>f6N|XHoh)`nrg@x5T*^t{&>cATVs~?MluSRon
zr}1!)xfLCZ4*0veg8He@$Wr)svZ1+X5vM?@DF=w2P>wonmNoz{L@(xxM>=(?3oyg?
zhg$!)niXC>Sj?}W;+~eHT#+5@Maeo!myh#~(%_d9)S|?z89yd#sn4XO)T4!|k2NwC
z5g|o!zRyu9(;rU2)Ld6`3Zg^eCv1o8aJTLb6C{66BGyoXtE9=yZRM0*ui_nxC7<eZ
z1B=R5%kMUoCgnpUNHL8WmDui^0AU;`I-rmmO1dtW&>%K%^x0?41~<?#XFlv#uULjp
zn({*1rk-+8pKYaVVc_nN3JZik3MNWq8BZOfU{xHf;SpVC*h`y@kvGX6a%RpAqb5P1
zH^VUTp&pDfQWN|Zjb_2DHp^fr3yduUD|C63NFf<Ol~89SEdoQvOE#^Bbp%Dd%2Dp3
z0o3PsGq!e(sfH2xF5F6b^fLNU<AoVs{ct7Pbq1b|$c!8A)wE;6Md*2{_2iGARt=7N
zrMUkfeW>CsET?Y0co5{Cyt*Qt^ntuf$EXeM7*w*P_+Gc`HbXri)K_P#o|WGs?Izo@
z%%$yCqj35Ig5{R9p|2n3vPPB3g<vqV!(wO=`QCk%y3d81ZkLGd{W(>MI%0q7+*{^Z
zp9o>l{fqh+kcBUGF?lN@IblLwzomKN#8dj>4IK7Y$odfl0P17wR4PORE6^w+Ic>py
z6wEFKpDzl@=Ho`(W}`N*3whY*{W<gsbs6T*X+nM=v}L}0rd@4~P-w7+g#*YVZhaw{
z%);~&XB}lH@{Q4GD0EaWvHxE8`RmL*2<ekw6k`twWZdW-dHXZ|*V!o|UeRo|X*Jwk
z)mxBD8AKC_IbPt5e-jsJfqXxiAo;85tv6|yg$b)zVjR+1KNe7&G*o9=_Hrz)7P7rz
z{H8a)KOl@ztaC_f8HH6{kQksH4!nXrAY7T|udB7K>+Al}v@rMBOpoW)Y>_6|b}}2G
zikOQ8ZR;DPfq2Y8AU844etOw1*Rg!xZ;j${;d=G9f?}WULgFzH#ds*XBH<Au6#vbK
zFlN0kW{E8|XxM+54S#@c`XSLAR|<me{aO>qJC3;J@~zb|ci57;+u4I)nw@PQd}3D=
z+xrS>F-7LS5E7ajHskh0`}joX*db=ge#Rq7Ec86p@+JDW=I;0RKXp@5U_xf%M|$H4
z_fG*4@4rfM{*@8`tCIIk=$0E`L=BBQk^hch8z@Z0$jI0Po1mc?PaRLJ%7}{2&QU*?
zJQ#rs8KG{x^Vx%PP<D=1lyT*F?6`Azd0Bs(An#MHqnUxp&S39KFO|si2_Fg|mZC(V
zG5xsxJ65#9kF~aRnd1r=UH_6fQfg!l1ij7BuZ1%Dse`g`0#_kBM19t8!<*^jGrAUN
zqwxXopY`f&1?ZRimrZy~7+BT4@Fl6|GG+LHdd{5E`@{(Vbi9qxe6xu;S=ht0>&RnS
znRW(%Te7m6%p&-v)#8yaDvH5!jed$PWAvK`)__5$eC8m-0~c)D(YOYy=JC61<#=zM
zNR{ZjL5ro`3b=%<M#`E4^`^+zxi>LLoXu?qNX}{(jSq9Z%HPH=l5~~ZrHk!&?;lAd
zBvgLIVFATQQu*uS`S(dB{(p7i!cO+?&i_$m#KcWYfiitm85OSkOO?&4SG9#fm{+Hh
zMg@eoJ9*xj@E1!LW|9r3jh=t{*pAdnu!ZRZCOxC}W<6cq-?~6JM{4_1g{2L%X1dr0
zYH46vW<3*pC4D(Kh#V9wP_RL6IoF`aoyWb{6Vjx`M<|x3;+k_jIL0e8;EN!APd1ee
z{IB5jz86=SkDE^D5GC=z@F;aSrnGL1JEd;w>zXUySU`DylSRXE7CtV;JnM6yUV;wu
z_tbdWc@yYD=FWp<E_)6Rwd_BM+v+4%F+K4)nB{vWTmX@W3c)@KI}KqgF2pHBuBa`d
zauiX4%hE{cq+5+dydy;m%1^xgtIygc4NCg@aZGjp{ezTp7IJbj{JRU~s~{^q$cUI@
zbGEdkt1BSb?P-Gq@X$p<RiV}8MeQ<Qk2h=0qLrk6TIPKKeNo)ga0REs@1N-Myg4$}
z+s@Vhw1fH^1QWatuNOX0!6D6&Oh>dgDk)je<xb<OBuQ)alN*vKL|_r8EVC^b9d!{#
zgQkM^l%>_rj07948>Ya5`Nu@8afWC^d9dI6q*?WlVmK7mnb!LrT!zvnz;@Kg_F)GQ
zj?L;u`8qSH85tTT{x|n$u1c|XJDI+(rZEk{3oYz&{3cMiE&%^k+*jI;tSOJcJic=S
z|N9?#de%Pux+UY<-kN7d^eGy6_3{CN2zg<x_dX!})rN~BV<VV^4e+}Rq(N}mnnaAf
z)sP|+9P2h`cz=+}SrR0V_Hnoq|0f5mY;5mf`mf*+qbMu?A&cu9oHCY1>=*d4|M;1n
z{d%Vl*=Q!+LP93ML;tK4U0S;1gUNB!N3ave3?C}8sIXyjFYC7D&BOBic=z^s2UnbX
zjGLPKH*|YgSzuFti^8vr_-{A7SUR1;R243`4sT*wwNPJv$P~wl1ik&Bq__peQw>`3
z$C2!5H06wvJB^7YSOMN4KZuy~vM$_IIezs@6-aER8X`>&iOdkA66TY{ENbi_T!<?~
zDPba)p6_ospd{5<z>q$I%Z!;4lnL2|nPxX*KaW4*YN6<N>}6}s+8qCuz2tOe_RYFw
z0wOQOW|{ypwaZn<ZDKmYTv=V%GXbgK;aOMsLO?{KaA;VDQ*Q~ZAoF3~5`-x9WRBGi
z4jdlpY$d!dd=g4}#b}GYQE6qj8%NYz!<07^h&E+)0+@^D-p4iuGL5HqR{H#fc?4#7
zN%4=@vG~#I`fmmgDQC40g`U4(Ns8k5N4!SFy-%2dEJ+4A?EM@e;vFEN<1Iu;Bq)($
zF%+1Ur9l*vMaWZ;tiRv;N6|KBU|%pY1R?j%tBa-6&)eS<+~LESs3%4j#~bkKO=Ntj
z3)aK1K$hk-wHaUFiz4chs$*SXd(N_8w%TY==bL~!JL}+rL9^|cr_u$OD=F%pX<tOp
zDc$2Ni^k#}WRI{c4Ej#N<<+!9b18xUD3?IC1+kp;DBK1;VCcEJmswsTIIV)+&WnUE
z;>zh|@`HMQuz9Cy;yV*9@N6=rnfFaL&n)5DSJx<V?8*i?vFwOdE`_ERL~`sxK4ZR1
z9@xi?WAbc{tiPG}GR`V{Hce26iAnuky<1FK43yBO(6lZ_HW<$a>)a?S9qo3aCz#tX
zu8>-_LK99S<o9FWUmOwtv!`XIkHeSv?;pOBsg0qh{NKwDJa_iX{16ZjBoJ<H5Nd7^
z>|zkLJ1=vE2P&--*(zcXx%ms(gHrD{-PMB)U&J6HUJ6}a526cSHYVnDUiXr1e9L)B
zf<H-w`pFsTb@ccvsaZKe&rpg%kV8Njm>57L$^dBpx@i<hmr6`N0;I#o^WOxEnyHiX
zM^EDK%Ux~N8Pyc=-Pc>zjaf1^BqRhEg0XIOGO(PI6fEfz_9PK01PIi`rJNhZ`OvwI
zjDjNS&&CBvgvf>~A_mWJ)kF~~SpBB4Z@nDv2rxsJtE;$KG0n}}x67OQ?(a_zW^XU|
z$NHafdykp*1|_ldvJ+=R6rqiobvz`8Ipw?~e1U1u(B_&xv1vCY9#|M2?UcKT(N5(P
z@RCsDD?mj(;;xXDL~>(fMLi>C7n%AuQ+`}?y`T!xPI*ZQ={91*Fy#mr>I$;S=m2{M
zsT?()#!~#BxC<<1X#wskapbBj))pXi;Cq)F{I%poIiQltQC4E=2su<N%~*{B_Uidg
zIa}qHKSn93JUi}+?S4a@U**vlmAUHlF6KqXuSW{;Rlu2}5KUq#i#W!>mG)ct=&-qL
zt;?ig%|j1N^(7-+07jx!gr~{5SrW!`_A?V^l_i}zy3=Vuju^mtxQyV-&5E{HUAFFb
zg+Ygul{c(3RkX*^iOO$V?P>>lWG8AGe$LjKEOM?^{Qf$R2`y`B*jRN}9l(N?xu$`t
zZE>hj5|k2?Y4z|cKC@*vWpF`;Rvl3G%{8DSs8fussXke-$p0+5v37oj5>qI727H5x
zr4-9#PUcWaP;^veeTA^(fUxK=h5JP`@!r40jl2<BN{pO`t74jw`BV}b7*fM5@|oN0
zH!SWtt@g-CYk;#>N9*q?(|B=ZO_J)I8Lq%cx)TEtWEpTx8Jd+Scs)I&a;+-cuZHD~
zItJ*I66vZAXkV!<hUvlM3PtnXXhvXiKgg``MN#q89&oxadLwLswpm)DLL6HPGhu$2
zz5NrvP47HHT(<^YWB2IBGJ{%IH{iNRc6Gsj?)rig?1+F9)Q`tqM+C`VV`cFPV@Mjp
zRE!NdQ7ZJ*S8(7?E^n#F<5uR2PaZ62vv1%(YT4xyoN8k?cicIz<wcH2uAeF=s$wKv
zm88p(D<S#LWj<!lZ)ROa5##G(y;36pWI5b71g+}>tFAFRpCK>}xNFErKrTda{G%f4
zwSRrF;B}<KVl(~{Vq7_EeFXOUC^x<sNNTlm;OHWLTP`PM=l}kxGp%&dLk%b60E**F
zkDDd;B2?({q=^VtryMw;I)&yO%Lt04^HOEM=6T`0JPH_oAZW_Q(wCp5%SE8x7V>y<
zO&H4+KYu3-%6IZ}O2T{(++hyU2-+8y{+8mITAV7kKqROl`_UO}`i#C9?bblzu_iJ6
zyWzIfWv-FF4$ORqUI(R*tSxP~9h7Ru4U)`e%QE9Dsj5O7Jxpt)%%W1;c`28<!J=#q
zTnH6#N04GRa?+CA!ZZFk!YjH5+^N7ttKjoxuY5eZnxZFd>9$h}%U+A_VKlECZ>B4c
z0E8oFcInQ~_~37S&vYA8j~{wWVJkK`uNXwr7y(w|RHntzAeF@dOM+}QL00`jyrTTn
zRKT)`<6fe@jvdOw{FBW3SAsgBWH4I!k{fVN_}T$QBW(;H<(1=i@^82ar@V8$<ZAg)
z8)EK^@*FRpTCH<M;b<tGcksu8&p4vWe^|aiTn<0tz%$)nrKytiv02-VbUD+3f3^Z3
z2Ef1+edYtZ!z%Q$yeQJg$Q^KeQsWMc`T|bti!sVq?73hyjPmE7&6Q1;I>(+wB8;}~
z64D|3iSK^5mIz<BiG4+qdnf`*DW1$fpEZqTyI<EPOGCJ%TlWjv_(^^E1#FdJnl>6X
zFa!za^`N5*;(`%gv!gHwVh_`>&L<KpG8e^Xe06e@p02>FoWCwSb3Glfz+e<6uP0_J
zzc1@?#ONjhrQPN(`+#?f?dxO{<5&@PdxZbCxYQQifp+e))8t!8UAAz|*OfZ9%&u?f
z_j-l9Vbo>|4hN#bEY#bLVtc{50ITNAG@-mAcg8ig;CaPijYh8!O0RUIU$_c`RLaOE
z4<<6h7)dE<EHQs?2ceu!eu`Z?gF`LCP)^%JIHjImue2zFX48*ViLZVQ@tQ~Gojs?m
za*SSOYp<13@)N<wa<VD7T4mkqF=J}<_X=n|3fX(UiUg)d0QWA`#)#cE=**kv>aw)%
zO_1&*N%1t^KHQZBePO+WoX?pZ<4-GXPbLf5f`QyuqDlb)@qdvaT)#O6aDMC(s(%O!
z{`)(K;Nym}cQR)%ws5kywRE**a5k}KkaCtcvNARPdrLM&Y5h;R!#8`nB;9OPbq9=V
zfuesRRRN=eL9^Gm;<Niuh&(SP)vW(^6il!q9x>lsBdp#R7H=|@!D3GC`R?Hh>JV-V
zc?QppYr{P8+`mN1aRdwtDp07^X?|pJCyVoGHFQOMR0ZPJUpAe>*n%2jN{MLMfSxQR
zC-*l7Muu~HzwJfXy&K`$Fio(62<)*h75n{?Uc25(nd>=gZh{Hsbdhb`*UMZVVeboW
z=styxz!(+hYY-OKdAoJKW!QzR1%0CwCFZ){)Qa29=iTx<l!t=|%Tli4GPO@pZiikY
zfaAb$OvW@`kvxWn{xY4|=zXnX?|0|RAZ$7WnpWR-v`NopydsN&Me*C3L#3L}5lO-;
zY{Q}L`PB?-$v=l*<jos@K!M5?UnRB=FE|mS9lfO_)76<gWtm8%NPu~=mr=+%(a(&1
zAifV(@R=1i(wr)j$OWR&C9@Zo=%zv<HXfW-$s|O9G_K@}Ef&p(G(tH>y%a65nY8ux
zuN6gQmjQSGkNgMwAIE5f|JA$vGd&e^GPM0W{j^OOm-`S$0m>s`2_2GeVO(|%4wBn3
z(UZnoTp^FNF&vsuPRK}>iFmMM@CP86^5U_iLp7efT-?7OXa7EX-beXVyW1PAi|`wh
z6{P8BKP3~?Y?@ajbnwxms6VY)P?=h2*H`3qGlk!(h_G4MCcS9^S>rwIpVLT+NK(Xj
zvE&{^62V*SN4rH#^%M&;3r5G8I194TT5t*VOL)>ao25n~AfFe&4<F{rD@+}_#$LT8
zrbNWG44L{@UNN5wQ4SL^vum7scC$JE7iaGnpXb`F54UM-JB@9lv2EM7(b#NkHg0U&
zPGdE;**N*%&01?e&)&OFfA4-j+@F#!*PL_CIdjZ0$M_Qr^NAPBiPJ{r$H@?U&D6L*
z&I$P-4T=H=%mQ&dE|@Ie7ZpVvNYAFlwZ=0Zd2lo%dQ9#@IU5DulbK_#QV#E*n;!wv
zmHje5dZil?JA6sZ?NKOFOUTtKbIMOmI&-sWE&+{>-07K5;Ll7Jt4*pjSPO=gH<I_m
zE6|xmFC5t4s>s*^=5TSzheYmrDW&1&txOP`CZE*=oRsw+GgbWGoz%Z()c;EU66Al#
zBhjOC<?vWYpcG{j5cr`qXse3QHciQ!)GKsVEnqb1O<AcX8rMk1I&IIsk>)NeicZ*!
z4wJ*V?yL7ck+Kg>=&X6abB#p%X#O$NZNZ4_qa6;!h%7`rVl#OYeK#FdJ@;qM2m2|H
z<@*(V-S<5w#@`}#hJQAW3Z9063b3=`iC20f9wU`#HDbaAAr`-UU%ffXP!x$gmn;-Z
zCx&4}XIVAt3Pv+4wLD2}7?8yS2Zd(uSS1np#!-a`rZ$C^N@OrC-%8uZyp?<$Ss9n#
z>aBV9ov$doo+HF6ogzr-l6z0bO~4+7xmkIDf}k+$KD=&sB34*GP!_VB>kfMMASg|9
zm>Vt_I+Vwwk_93~b^xtDX~sD1r}3xeB#QK>cKmNL{Ffs=8)VrEDJhIWCvvhe;&rA4
zDb)%|bF7r{b|&r)3Wrx|gE=cwj5uMpRmjj13gaVk+|XDKr!jhNn45a9ngO-7S7+h3
zvL>!K9qbI2<5uKT{=Gn4cOa#?;9tIJlvBuQ^>5~tXQ!Jq`V;%uVo<`C7_^2f1zR-k
zopXO=(;N^8#&SKjwTO_ZJW+I6xh01TP)gkyq|Kt;K*%(xQGI~<Rnw!U{)`_1ct+$O
z@9=-{j5qX2QBVIb&v5#}1J@;s+&58nm<#R?^C>(@)e6*K6uNH}5TPGLv^Cn(0IN`P
zdab5<@q*IQ(ysuXP;t8jq3fIJLp_PGk9f?BLYeWyAs=Gvz%uQC_rWBCSTAMp$uXv`
zg-CVuqoX7`16mWSO20LxXyK$DW~I$1wPMdYSOcN``KGp`G0H@`2bD2!y>sdnx0p+)
z?rqXaJ(61|SL&!xAw2ZYFdvPQfsv$qIzYN0bCeEDz29mg9N3K2DuCbL0)GGbJ^JnU
zi#z<&*!k=Gt)l+{;4BP|vVN`$eSUYN-&w-i<tJ2J+0HB3!*XI>O{8}4Hvs3S82FP8
z!`N%>v*hm8(esB+n0_D;paCG#06ru6Vt*^7ji<}Q@4@1SLg$eum>7GM_aAH^dLHXo
ztg2Uqd=WO{NlnV^CMeFga>qh!t46l_N)=N4<i>=PVI<Z-tVrrv0=_dza}+W*Yky<y
zTefU^5(D3&imkIxNN=Nw+`XA_hPF&z(buZ3`^;dru?Kfi{?pw^>*leK+jnwnVJrLw
zlHb>}{6P~X9mEBe?rv=Z-IyBougyAmUnf0x0QNEk_|5;>X3Bc@X1~_;{bMr#?!XHz
zR3Tw1?#6_t+J$<d3Lk3K&<TVerue-rEvh@72x&}`;*J>=F!mpKUh4-*UW0zL#C=)U
z(ayvDUULhtA5WNne`i>x(G+=O`)RXlfpbi|l-x<7!1`zEYKxJR=>A%}(YK#ViZuP)
z_^6jL67S(a(y#oc{Yp4-JW5J5eFA=%a;T(uR~IPHbs$MEi#*vNU5EUL9EPkvzTuZz
zFwaC~IH=CBIe-ZoD5y$lp7zBK5K_)BSx>NCX+Ap3Gi;k2#@VpUa4*+XnD2LI#tJoo
zRk{Bplf=7^*GfiUiHF#R5#L*GsDCX8Uq7kSZ*?r1P)X?x=JD2m40Z5@_yt<#|IwBN
zfdBYk`Osf@JCUN>Ke$?;yoC*-96T2qYT^J8N;G8O90i3eHAtTb9!y?W05HB?jObIX
zrAo7tS}I8DT?Lg?>37qIMO>rw7I*=Jz?LD&@eDw2bUI$Kw&n#yww{j$#K3J>MMyxh
zSp~;;Y#(=px1GEGabnN|exrSzFaD8~Ad{gnZPvL>!2o_KOPUF^*g7@UNtY})hDCqD
z61vPwnyWhKgD1maBrMOa;p~)5KY6CM{`uT$orP4>s=0mnT-y9BsDJXIB9@H>L(kl!
z67Z=)U-G%~^1<k^;fAiOD1iXXkD1gsKAD;&@ri7#@5W}Hx@37+1H;9!jL0=vaRZ6g
zKP6I>S~vP-l_H|_57Mp2$&-h9x2nAFM4i-FZ!Wk6j#Hg)B!j;Vh;T^lB;2$YN06e@
zvrlublb7_jy4vK_8%u-k>~P!`SIK;orc(0AcL;n@b4;ocZ5;CUlH^C25acuwr6G)~
z^hHBF)%CFE2bT!3MG{KJcU8jhmtYPexrr!Xg!-n@W*~(VSAO%#WI#sK9^IyzfAlgr
z>y<B_smvt$NUgZ3iN(v!a4UB@kN8<X^F8gH9Tc=3zsu0oR+^uu?-t_tL;yOX;SXmj
z@p~-M@vCs#g@zaKfMb<L8vJvhfds#0!+bSNmMWuxgV{m*FwXSr_xjGHZtrgwW9?(E
zW1LrN9OTc}xffFqBS|(2A8`0tsW@oY*@Ndnxw}BUutaIFfLD0H*$Zp+we-YWCY_`Z
zq9?k>UtqE8$qm3|{edH&qI=o)#&F>`xg)Wjnu_>42}_kW|B8_Ax2lTrfV@HNkE9pE
z-+8E@k-n43-vZ!&-S;|$WocwSc&;&{U?F%^AvNHH5(&xV{kS1a|5HD}t|ZCoFC=XO
z>@3R;Ly~a5xEBVW&p$ko8AySt=z?{DnZy>)%&;rX7Jl=7disgeDN*`K)xPprS4g)R
zMMPMLy)JJ~>);lc#5p%)Dlt(_IK^MdS8hU70Co<zpG#m!W37k{5glr9A-c1szuzkz
zwEUGgQXnDN+Ihxdd1lQ2>${9pB`8aKArh;shj?W6r72P09fnI{=qr*G6{e=R;b;b5
z3=*6Xq=Q{yGZ!7BAU-7-kQgSnVd^&YcdcIBss&lq_d)l}G?z5QixT=MDaZZ{Kn_Wl
zwfbd4nOPeZ<q!!d4{>wKn70#wX8}MuSgc{U8aKPAFq0)8tYA0WY6j1OCGvQPs3&0E
zS9S_t7Z-$sjZ76{V<$@Ndc|uV&YV^f+#dxG)4ektK;}l24QX5awxSBz20nfvx>86;
z=3mK|KLi1<K~0`5m|&RSjqYBM4ZfNZNg<+uEMGk3)1_CY9aqS5j^BkT)#7|Lt|9{p
z_eKe=2>wAzo!iN^|M7|g!ty1p9Eh@^F%&3rS-PG8k1k-dIO-h14ovrxub9P|e%RJD
zHV%K}Gseo%<LzQr--qzDK7kh=l{~$QC^rjSy{;u8&iV+_pO477mV5N06`i8_VUQXo
zB~kSCvt<u&N}+dS++gnj4mI|Fcc_1t_WR4B+LV`n&2hX4o6i#ritUv8740;FZx;8G
z!6ajXLlA4)vRaZZ=PxfBJI{4ex}GrJ!E3u(0me8wplUVLihP#By)sg4+FzMoB>^r4
zU<(7;gYLp`G6Q5VTHJL*Q=K_e_LeAYT#36T<)Y<_T1Px}?f{b-5A!%W6=YqM%o8z7
z6Atq~wv_ui8H398*XIMMm`Rel#U$A4*sj>sEJV{s8S^Cg9ZE(g6EjwfOkJK_IMU&X
zF&Fr8q3Ed$=edm1l-1mnNQ+XviuJwLahq@voWCJ;q>M_PM)Py=hHZlg6w>PZqPq&g
zS^^~X(c6j8O>Ie|Oq=-iTs*TzQ)!aw)n<lcoXZ1E3b&*e<T&G%dv2$XG`e?!(-N@#
zH*k%fWbCIj)5u7*tR0v!6e&{}554or+yk~f%1!Nw2K((>Hr>kC8M;KXapphM?#FY?
z>0A&iI9d)lW$)j4H@Cu#Kzv%$9I9%MyJ{vsB2C$FC~?oQK6;JmJ9`~1+X;u#p+4If
zt09cX&G#Tm>*UfVK8?odP^gEq(7)k@a;tSAF+0PsoWdk5^P}b>zSPDusHPw4BO1D5
zjk&}luK<~XtWm6OB_S=0LyjBDW8xLp=$_X+VD2li%PA(x5wuR;`ie#-QOZu^q$Sgu
z>7a*2ACaly7<4M!V0C%|6@GetAD)R6lrN#>30;HM?51&*rc;raL)4aUY|m%~uJuzK
z#JlgN6p~Bjh6>$vjBfSey8$|PaJ;c@W6=3@ihg4tjZftxy2qr%k!NixL8}y_3mtqJ
zv_4t4UW6c9m`87;%&3Jc?-qT;`~aL8r>_XY8GWW;a-U&<LUNQXXbpl3%>#=a*F#5~
zFjjHiD(n=k`=@D)6}(aSdZbmNW4vRc*6^f#86&T^eaEkX>%_$X&!_k!+vvBURNUdM
zf%fmOy@G|!lrFLt2PAcA%lkC{E*4S>OAbRcoAm(v!&=|oYU*AYoRU(cVR_xq3)1^O
zr%*=BG499Qh&|8wWa@Fb*sJr_JwT;%eLa6>!}FdhXFE6~|6O7gfu3;p^Sf@>&QSr3
zt@rla`Uqc)1ksI+1Tl6ECFwsC5cb<j38!x;K)AhcM>98S%Z7w6!G(o>KOAI);apYh
z!XYfu8L?E4b?}h+!#br+xw+<%`}te$>@t|JU!Mtx>#TUpo{f#74rFwgxzO@w1p<*O
zS?cPzvCAWSqZY|mL=6z9nmmYP&*g^lGg+IT$pKA<-@I#8Eze>f5N2y5>?`UF7L+^-
z#Yhop72HU5*^5t)g58^oH6m;0>ZD3yq;9CO6_=gbn(~)PO7>7usN0O_)_6d~T*hlh
zPg8wDB~F(`t>m0tCi2>!QWq<)ttSe^Gl?7qo7|_R#?wcr)!LNHzf3YWvuD?NIR9|9
zW(W;C(l&HLmaGX(k(2Fg4*2SGm#~9ObS}vUc~y=vkmm=^C}&)d97>Ngkms`zu6{5(
zpJo*<7!X(N;Hl{RGtxaNK>Fp({(Z?_aDM}x$D&4ys~$^MjwkH22*D1aBqcAp9sS{E
zd^kPY7PLsNB~v_k_ZKxyuoJ8*cK)Bh*x)*JwvZDh`assvH+F02eWbS2kve_vcyOTk
z(qAFZ$ORMWZ1Fcx)pn?$8)CM-Qfbtb2|mC*7X{u2E<k)1QOT1~)m^d+9#{#C5UMs2
z=awTqzQ4oKrzUfg#>4HI5aZo8j7I7k8G<M6;g%L=!$@Gm*diixK*YRx#yhk#wXpc=
z&sVnVM3*=F8CJM9bz4`mWC)gji9R5=BR7?#m=|6E{JRCX!u*zM7qHa^b9^!Jmt}s;
zTQ=kU^dRX)f=EXK-1|2S;>`bCy%ga5Pyau{{$H)ie|LVRBl%@z_?G}f2~<C}XjwdX
zd4o<C<Ro}^e|apzqR^^hqZTr;LPG4Mkh|Cm;^}tYtn3Qj$3h-V6Ox14X=$%p_6O{Y
z(~sd1DFs!WHEZ|dr;8(t2~YDp9nTQ!EbWlIzQqP`j}*#Ec}^?6@55V4hbq|&V~k>^
z=?alPnkAdO1P0L=X!rO932CciCNc@Ss!hThQJIIBsqPwy^+0YVQA80#qa71o9j%P}
zrcj8=LauQYi_%TqxaX&Q<0w<kC)T5xHqGoG`H~u$x?J3+0f##Pr%qhBR2;DAb=56V
z@7idvOPj1TSXlFjC=9$zX{-?FNFy;0vNp8CU>sXSQ<O5Xr=2yL_PBcy6X2uUGUVr`
zmpHl?S05n97q+P7K%2qrLQ7TCCn@ZQNkhyiG#zVu^wQb;ER!M^nIr00Sr=>0nRnC_
zYj>1jS?DZphMFEnaZ=PRb&3UX6f>G~H500m@nE)M&idowz}PW+t4cEWSW!ZH+Q>Uo
zA^&uSqV(~Lz_7<iS<8tP1d>fiQdHu;<71436A0C9?P={NsY@aeRlUZtl_9nKmD3vz
zWQ=I7>yMw1>Is#X$$7XPGhH#vHFmxw4XEp28n-DdW3D@;g-w<T7pj#XHyw|h&y*Yw
zbb36Ilwwxe$@F<b)Yv$g=;FXZe-8KpGm3AB*RLPi2LzRqyr-1hM-UDkP8M#2N(ug5
zSBr+<uR_ymhP=fh##G0*?J*aU<dv2Z0_!;vp<-$`jbzKdbF3G$Ers=<Mwh6d5z)tX
zwWl%|>LZPN<F;OJPf;*EToRY29<=n;4|!l*ppY$3*|U&9@cZvA(b~HEDBC(AV%Kg!
zPy8+!$MbdrHEW&G3pgKx5g$?7Rb=lvC-XmGX^Kuj13FVVh04)}Xco~2U`16sDM{x%
z9wT-rS+=JO$SfN1Lxl@J8Q6a^K=d`sPSA^GXKYdMtz&cez7Q(zkdj?a7!uzKRX!2~
zoTr3D!>hXqOHaBIid6|Blk<CS?47OUEEx1$N}x~VKr(y<XP_8F$-?8~D}Mm_4uYWo
zf`PW3N+QY|ebkltBS7~I*dr*;PYT2%F;#cE%SV?LI1S>^Zwxf}6^};YIkC)<-h8p0
z#xL=taFbf&M1Q54xfyN*c4`jz{fQLfWPvdJ{wC=A8?QNc*n`ER@wI~G_XYI)HEdE>
z4T3dJ!3CsZanbq8+}RqRa(T*a?9kS>z<Ffn4J#x*i9)ROwQ#Cz%XRHFCL}++iENYS
z(R$PXkf!@TstNw~0aS1VsHW;!+E^PYTm6k40B9sY^za!3@_lf;lW8uZ5mK%8gryLm
z#4(MxQyEl&Kb)tXLp#Ra#v9X_fyK@zQ(6x^Y&fPX&c4XJbM?W3wSvWgRe{E204`31
zet0f+DwdTnanRcBCbgjN7fKPvV$%EO$?I>;7J|W)>k=q5Ip+$i1<M6H53NofM5dz~
zo9z+9&ai(2Hl45{8Y31L=4QK;Cjh!97;%N3K?(+{<!5k`zznM7Ds)g{?qDrZcrIsR
zIFkZqhM1z}Z|9|>#?Z*+dcqyb_gHadSw*n-N+i>JF?>Lv7<*bFs6n4{LSks^lI_me
zP6c@cM6yi&bAQuE8#E)-1X?0Z@`<d*T*_mC91|LSW*__e+RPF3p{-;Q-+q93`X;$j
znyv7BZL3v#5yJ%y`CRs2IPif>Qzk6{X;}Fq+VFe(yIC9jGqU%W{r^Q<kaqsXTz~~I
z6}EfR)AM?_Et8&F0mKD2n5<uvh3E9%R>$Y;sn*!h6~+0m?HRw=(I-xeF}i=_Ibdho
zcdZY%8k!VAxZ`C+Kv&-j9Xt$S2;DcO<TpL^kuN?BhM{8s!=v7j8s(EDRnjxiG0@Tb
zyd#7n{J{7DDx|Lyk|+gz;SJN%bZ#C@0Mw&3fZu<{r-*)6vHsTrZ$Ujry}v%wNcwNK
zQlS2O!u9X21!ycA!zf(v&|s7P4NgC(GyqH`jc%JOfM9_LMj<g@ghMhbuFY!No0B1F
z2JQ##BRmK{KKf66vbj1|E668ViP{v>M$cgpYOmW-ZftO&ce!yE4=ME+j;9*yN1_qF
zfXW%5C~2jN*FO3nW21^6<3TQ;f>CuDI0mf)J2CdL&S9!j%dz!yB{{4Av=>PmwhBQ&
zi}%`-9zwbISYkz}a=Q>7ldKT@c@lUd9@F=4^nxw@BakT=cGlTfZ%^?KBwfV>;PY|+
z=msReGtfVIsIr-Z89-V6FB3%qwC%fjk<)`0>X7Taa!KK^>4;b^!2A6%kzhh0m{;ek
zi~FWhf7J7gzum=^`XFSGZtdN%Ww)A|vtR9-PLL>!pXjjQ&ZtFrO(@!f#4>)8bl8Zc
z;{KDZUkLDR_{-yE1GG)xCDtyqjW{8uLUV;}#{KQv?zCzt9iD5tl1)}1+_pb`p*7eb
z_Vhad_3DjNG+#UYCM+YsWriXqK^R2%gY3wnyw}w2TbQlaHzP6Qpm3s$5xujHky*~I
zAgsbEBp1Hqvy1slPBeyE@IojZ&v70s37|CPpE}<B9tqFXabu;Gb)v@b;LO{F%A}>f
zX6-SI$*HWB>^m9{^`-TCXpJ8Pwn9(mtHPan0`jYhW0+2{cHw?O?CaSWQJ4TrCjgS4
z|Ll&xwf388=P$JM-?_C3v4E0S4ms#GaKQ@79$xW0BupLA5PBmDD^?!~iC;<tSJ$PP
zEbVmM`sb+6%DJxg`LE6LQtYBoLo-duHpVC38OASb-d-6W7J5^=B?46-D<Ghl=Z~;P
zbXr~7%Ol4)kqSEc=^s;P#kxbgA^Eg2$y@P9Pp`zd!gFUDUDxV}@09&umOsL_$MM$*
z;JC0!I;D!`D0M$2?50UbN<(y@ZP*@yb<eoGq!=%qruu&f{1WRXXOR>)nC4ZkRD@{k
zb-m27lUiS&pIg3<C@qk5AA)5U=RuPYIR4E;<UtionF3hvP-<my)uA0pFnIMwat<oi
znH61eih5)tyXVk$=M!T0G+Q&bc8lk#VTlaZ536p?wX3R)xN~zB{+-Pn8l9|4wkZ!n
z+@wl*rd-9B2Gv}r-k5-TNY<9C3Kgj7^875Qd_q(VQlnnp0GU3Il}a?d8dqPrtH^0X
z*P<K#XPB)h#%XE|B)`{M<51pYUN0$0#KcNy@T{HqyQ{8ekW;9%qV>!oQVFB@0P#Cs
zRaE5wg>JKro(!W=aFZQRX*Sx=M4Iq4khoA;;8}^o-fzX9TL2_U4ZscljH8kM?$QAu
zG;2WP8$iI4v@tRHhwz&a^LM|Y>ZE^Gy`;{(4dUZcIHl0}<d%Mp?0(KVm$g8%QyOn9
z^_}^fXzr-8oMylh@FihNip|UR$@2~hFD_0HQV>fIxi5^{X002^jEFb{lF5p?9>zHM
znCfF;Z@zk8N_{t7IufRW39wF-!chPmo@1UZVZy%AH^W8e<&(&|7&!*k)l6E#Paa`j
zh6C#2dgWdsFx<qXO>qx!Ly0Kmn&=zlk6$=<D*4WQWox3aM2Z~4HQ4sd6GJ_$AUqT@
z(gdNWCE=Hh>W)Bk?7DaQYrUcaE#mEnbBDINm%-b{X1xH|%;PvX>v9wq9=x+`sroGI
z7thX`m%a~7bDV+>W4V5-fNp-h>{TmopAA1VID#v~gw_NdIM3T-P*U*q{MSYa&p+P2
z-<tg&!U168J7AX6@o#!?hWuOF;rU^BI5>pBi&S{)J&pBO5$PbGm}Fg|@4XsoN9wB0
zc_)bX79XG9zmOUDCJ6rM?G<=r$N(^e>pb6>2SHq5X|NQq_2BF|X9;wrXtw;#>K=H8
zp4K!?^qL5;-|CKJ@5^sXyK_Q<%Du1~tvm<(LgpcMgbo6&g{Bw@;sbgNr&RbnX}(7i
zhw-!W-xEEFjun!D|A_w{J)oEQr3{mC1(JOMKR)$>&mV;Ei`xf@rr6jL;m+FKRJv~@
z2ehU+Oiz93PnHU=Qisxc4WgvU%{%YY96{&g%CUrpx2WlHnx^J5w6i>Rg#!u8N4IMy
z`Xg-P>1J>FkF3=XK_wqfIfWKvKEEd}xZToCvVDPT2-xaS!vMlJQd#oCHVLf^FzVC?
z9fwwl&d{TYy0UAB-=dhKW(<s6)D|AnAOA_Ik7bc^O!_N4GIrdTNdgWi?vDpV_PcxW
zuiiA#zYC}XTGZk|fLX~X>vD@k<JVVW?IJlSrz8S7cyI~du-h$;h4|Cq<0XM>7A+91
z>vvp=j>>`A*_J`<-d7n8?TjsFxD__<r0tUVvC~NErH<hd0h<dMi1LmyNpF;NfPJAQ
zj}hgiR7&(*2|=fNKjO1r9BCmv0@suQp**BYC?*tkW8!O5)j{+ptR)0Q<Z`+(Vmjto
zhe~G=vJbcjbx_xaJ(*2{pDFT^v9+Hro@V?6GiR#wKlS%4&UZzB7>0sEibAm_)>MH_
zIT5l83h0j4&);4N7ty;7oUgI@bUPJkt|m2mCCD~4+Fi^t?yYbBY9?>ROi?EuYIJS?
zBHD7PE`(&<E-(ER)hw?{che{OwS@!!F#~nO6;xSgEy|XOv3->|-Xtrf@)>G@O)$c{
z&a{vB`wSJ@;wJ;C(!F8Y?7a)8AfqtmY~6JTwfZR}_{8WB(A^BmY}Fk76&Gr_8dwqU
zF4IwZP@#MH{iu;pV@s)5<$l};+`O?u&W*Bux&zMhJs{8j&(Ga&&-0)BQo+bd&(_q&
z{_iGXf|8m7mI(X{XqjqsFELRi4lKrUD121{{6J_VZ8RRjcRnIMKZnLdBWQ~<=Y-jE
zq!;lQADyRI#fWc`N`ngWJ0`E#DimC~ALOvhMe~(pWW0aq;4(fwtf_bdB@cXguh}Vp
z68`>Lw-|Rz^d6u4cueP6)PSA$8_LBUe_xX4ATWIAH#%*(iv(3e5VHB;R#jxh(wmK=
zcfxY;!a^v-C`Kqp&@tUh_I6e2<lDGOj7>Y;?)P@(y`9P!pz`%fF3cl8CMCZx-W|3M
z!;f&!W}1mjFpuV0Yc%h%t=PvAYtNdu)c2sFgB~q0wzoZnk6V=MX+VD`>7OahFcgsr
zYIA`Zu|11Bx;qB-kF9PXAD5l0bX_g6wks^PO38yTvC?8>Wg37#N|d*AiR9>+Ej>9V
zy3raa$JAz4TPr70NHw!IbI(tk4mmoeKICx=>Y08D-A$qCF?=GbAC$7HkX1|e?9JvF
z1L?`Hfx!UEh(Dwti{v|b?Zx+**oX(u4f#Nv<hoa@PC3wtU=c)lF*|Lc!}9HO1|+!{
z<LW_7sY}0o)0Qi9LkXdvx)X$<N3Zk+_%Piw>>86QG=7`XQmvI-`hlxT_E!^#ED=6I
zbEG{CSuf&c2gi2(5W@lK>yw~&!L}HT&<cBBGAbWP0>mVX?^pt)R$w=fR-o~t)DG7c
zsnE;IOp(1m?JiX*@9E#vFRQjH6{;bu%cb?FB%mm-1=2;L*R|zFE^;6gzz3mNsK}~%
zP0+ay53zwJn2`Sr5H5sz@Glx1Z2`;DyBqY@J0hR&W6SJJ_(|0kX(XDtkfbzW=Q6)K
zK9eM=QGq@ujiyDMi7=MQ>EdVVZl7YwqM$B~a%t9V@b$;Ef<4Y9xydenL%SrW7iut{
zHL<jBx*1gz?fhXnB$xCpd5_TDz6-=z3@2ZM8Qc?icuWk#O~lJ{t;m(|1ZA!JyFenq
zEAdVOJKJP>-sg-sevN3Gf~zkOQgF}~dtMZh`MoPHZU~gdD6U#<2E?*10nqE2?Ctm4
zuUiEw-82$t22wSNQ24}jB9FMSRCk(%YcNC_)|BxHUtV%Un>?@A0Lr2tz`!ko{9yuM
zL1eO^;Yr9sq-ZZ7qI<xbkh=7xY)MsXQA*JS?!a*sqVGxC8bYuOc?U{_d?EQ!uXn|t
z-WxqUaD!TtPtZFK(1vJUv(h<=e(Lcy5M;nY2nX#BmfH!G{1n3Xz~Uy&mrw_(AL<B4
zA0cF}7A7875U)bCmo`(NH@vB^;-}M2zkIxRkz!d9%{^dsiIImB6HIUg-kqdkw@2+q
zWlxm?vSM}9Doi8vY_j{3qg<7Q?j`-q)46ZV#xTztk4!M;8G(c1A~`h})4&PSiHSgi
zxFN5?YQlkR67rKPjF~p~HULz#opx`%%lp?mg83u2p8$X@zW?Lu)ZfOP|Fy07ud-%L
zK}rHZG4%YtRCkkm^Y}>c5xEQG2Co!cU0pU_917%%9gM}2qe}In{;RLbYZTbU@fXCx
zGG#|7aUt6epHjrMcXy0-?{_v3I$4ydM%9uVDm&>M%8j%z7vWLL3FOwxAsplMt`}|t
z$H_ki5!3=^zU2`0@+9T<Y_#kQ4A(VO^#^ycfVYLW8|9N$$`F)W1Ba#7j2cyW$}T}0
zP;R+eENid13Xwu16n|oL*hzmlSv;+SJ!JT{yrDG44bid(+K$j*d}8s@B)2>IG!{R0
z1iHBT`m;3wHTr4$SPSl2<zl$F2IgM2cdEfz7<Q1A*y*ciEL+hHFs|a}5pj-djj98B
z=1Z_<M-zWP(yjx>S;g(UUbSmWAPzb$Sb~!<KSf2E8u}Gw3AmuyGe+60&!#G^rI1Pd
z9?uL03(xPF<|?2+dA5T4;|MrW@FyRwAF^@E`)cIs@9&B+&_QS4z>tUvMntoUYx`{)
zpcgK_W2lYo0~X?VA-Y#cww^FqdR2pt(dxy62@+%oBvK1Mrdw2GxPkn2)(+(OXo-L~
z=KCM9Wb)tV3~#I@K*FFeY~*NQ`cF0;Df9PXH``gvdfmy%d{i_AjD1;M=vK*+UCUl%
zTKBLp{}7E;@=gQu_Tdpvr}+vZH>zh0C}TYsZO&*b-qG0g%Iz%}tQSKz*l%JSmi@G)
z!Ob7^XVEY6+^37T$waz=uN~tY;2wA{z&U3|B5;a4fG-eO;K4GYh*(O<mOXV7ajhL=
zdK+wd``J{BA~vN4DuXs4Yc<@$B&*fFutYwCvU*S91Z^p9(!In}<S4@G6mfQ5IA(Tl
zp>N73cgXfK$zCVWu)wtMlA;K886zcMpD87dQ6TqjN*P*MXPyz;8wsqxNHNteny-v*
z{KW}P;EGkdx3e;6M}zYF5E;S}9<p3iXI0a2Hh-JdG4hQyLdn8c%|Z%cm>n{b3`|V9
zr?)~zeX^LI1YrDg!0$gl@V_<wzY_w80EnLB-!FWm!Wp2K1@EOzhAcjCNAHxD#xX!b
zmtQS5!;6X<1Oee!71wxITsh1kkrwZKF=0<-C!D)z@=CVVhC>gZ6xcANRqit3Fwxfb
z@^bZz=3^EA6~2;u1EHE=ir^B_(9-UT&5u1aR>oBb-;d}vETj;6L;3OKsEtHG)QMTe
zBpNF*{}ZzU7VHgvkMOkfgZSA(6<83fY>-G+yl30djYa*=Vb+fbz~%?Rqce*eR<KCt
zaK2H;pQ&eu6g|7a7#kZ3W7n=7mMpB4!bOWBM6T^-s_r9Lj!t{LN2%As*F#IV7}~~Z
zq)WvG$*Hp{iu3fPUhJ%dp5M%FnQC&`K}~QJpb}Xo-A;MbQ*-oHgIY#xA5+UCHG?Nl
ztN0j&m2z#&%J<+E=thuY#3!)*vt)FS5?PBziCmH%B)*-nb3G??1(J}4L#E3MhuH|J
z3nMHOIHS**=q6T$m@p{Y*;wvIN5=^I;d4{RD;Jq8q26c@?vezVy2xB-N<1jrSPsah
zwz7D?ADQ=TJ1E~Vk8xHjz{OM5+T471DRzo9@>zcvJVgI}13+!>Yw-4cjIgc_LZje0
zln}JbV9;|q|4q0m=6n+T`C9)J{N);ab3o^NU-C`{wfk?-E>)X*2h9M+3W4ACJAE&U
z9iWXGtaXA@hZEQJ`BHp-_xXNtbtVX&KwNlO1^siN7ze>;Uc@In)CVy+TR}=^vIuyE
zUqlrtv|FL$N$R%jC`cg{t+|+sXVBgIHrYBK?9JKyj$aWWWw3aT8&E-L{NE$On^Ouo
z8(BL_nmITcS^pCeGNSn;05i-3uXYYqb<GC_+MLC~r}})H;GdL1a@KPyJ?4YTYovtZ
zqC8pPyx#G|C-<IiBKLNVd_j9TdtDuQ95}-A!Ah5hCKpB~1@<>XDG_95pvcotp9Nk;
znui_{6eoeeUK}Le!WaRkc@mv*iypU-Ly<xmJSJ{5sUd*_QL!u|*&=^mmSRakcy>o}
zTg_j<?@=(!>CR9Vo*yQtPd(vX8Bx}qdebqJLpD<HmCRVjb)CWUVpJQ9vSm)#`k>8@
zk8Y*DkJ1Ra2QeXq%Ze(MQ9bb05ZGi{c|P1Q0bcVZr{u+$5LVm@hjRke9m#L`HDZ|%
zZ^4(nR$}r42-EGlYBTlihT6wkPQf*MU3)EW!!v_p^X8?h+}vdc?zdn-p3R1f4+sPV
zf2`hq8w}))tZW>O-i8pR0BT8Q)+YZES3ccNpXnvo>)no+(H90ahWT&M@vjlNi|m<|
zr`Vaw-t;NOwO&8J(N@R5r{#A3*R-5uegrfSUf%<IsN2EAi<nyR5V2(hbOf{{G+yT*
zP;IO)NUy#w2w-Z?@(n;>ToiQ+2fQR-0l)uaxKlK8byRQ!EcvpMwE@7T|205o^o8CU
zFaQgf7WaQI5DS}M;2V@+50WRE2yZb&M!l5WN43xr+ZJWd0tp)}K#YN>Rp6F-UvYPJ
z<JtbswaXyDE&z<bHE~(dc!(s%0*E-^VrsFU@@P$Q@o+sjn2xMA>CrQn3qN^GE&Q&U
zL3ynvpK^H^F(}32NV6j~)_+LY`(bomU8&e2f_0oG>QDfopqxg~t4PaeNt~%A?ydqc
zv%H!tfjZzb&*92#BR<E|yA6!@{KiQQu<qde<pJEC*iUw@#Gfw4FrMGmq9tz=t&ae#
z^NYv$pDjcI`0M}TF#bEC=kHyee?!Xh04YEKmobUvM?IC_O^NPv5kWnXb1rvcax|#u
zSOHP|^-$9CiBwai2W^vw#byVh=j7dA5d5+bqIyhH6Jw2o@pyWMPKWms@HuECqGl=D
z1^g_*rK@7+7Gmalad>LD3H1HCuDADXv>q4R25u8iJ;Nm-7p55V<p=jbGr8G%#i@3K
z!C5R%(897{KRx1TamRrR-ef}V5HbZ=$H81~R(nJfv4M{x0eXy+#@oRI!UOi$k3;7(
z-ZDsWlY@-QUv6DZ>+S`65{0{+74@4SA+#!3tsymGBG;9#!P&QClmlL5v&!=WZag?R
zQJhWKm<YtwYowOd$r03xmFjQPyOP=->7_JDz6Gl<ll$a|8&<?rRpJPzMCWIIOp`qx
z3gu5=e`F%{<czP}-fRknX+4+ajj1P+AA^#YBG~yQA2)-+VoiYTBuXxvUW5ZJZE6%W
z&nQ}4N*5+_rS7;{6H<TR=ppjy$4{D`Wwrd5U{ZF9*VwQe(QfU#v18nV0FOCYts~5o
z49p)*5(6@<TyhbuLYHEq)gOfbTLEK#Jb*e&j{_wR?M`n~SjXHHfT-r6&up>`V>G6E
zy-%lAy-SB}>Mdu7cClp@TIqRK6FjBR4+rPIlPFD8LLC`*q4E+seG<Q?tWJnOU&8$r
z#?w87wyyx;WaE$E!S7w^Z-$JZk%6V2y`H0)^WVvZQ}nOhV(<g63I+yKMRlaO*<eDp
zT^6(cI+KVO@aOG6Xb$R^Ef;?vXN~#8tqX*v`FvG`>lyV9x*r>O3*u1F`iAtd2G<a3
z<j;%^VKQ}&0bN68?dw?M<`qmM30H*t?ym&fOOy&t=pq4mvPONLR>T|TB^#Gito4Ta
z)??zcl)J_fEOsvPrq)d=Soh4<jz21)6g2R0<6$c;HzD=rE?e;tgS>5*9?rocCm-{x
z?UckkN}3$T_@15F$4X+kq|oGD0Rp(HK+6<$CS2k?tTk0F--W4^l)PSZCGZ^mP67tx
z1w$&a99fIV3=NJ0i~NaHmxQ^nfwTOUGM}w4-+-BHTTpCZfNc~0n794Wwto#^{gU%E
z{Og)JMbk?IN+hAz03#_D2~jbDBp^(x?^7VY@!;_Uq;#v_`$G*xENC|^k+FRQ@Y5rC
z`2+N?_l~|~8t-mho#1rB2m=Ln7I#L|0T^DjYnM-MeH@51G!-8`6(rg$pZaUDFuv8L
z2YP;%AUoAzw#mJq0Z%9HIJe5Z?@}d+ubJ#BS2+|y=m+D~;$Gb%p|BM~f3n}1VYfal
zh4lTPS1TY^qDkGM!ubj(5$*kz1(Pz1jmDE12I=T#sqtYiD4lmdpF=z=Cn9=-t%<XV
zs#tVU?9gLBS5n=ld694R^)0x0Tam@B0z#McAFW3DyWsY>Jjbt6<8K82pN5%}Y!_hO
z3EmTA1w{~qZwt&62rbQZ2RI}MxaWPFD`m@=JXx7pOA$c+0PZ|D;sd=o)Ai)M+tuo*
z<J+=3%}t_yy$He}vbc>^vmoOVuGH{^b@k*389xP*Bf6P{Gjmd*hbb67BE}R3WQ`Lr
z`!JX;+i6U-qzl8{WBDD4(`k?nq-jd_v6?RNR62QXQ9`Z4XPpIypF<KN?&iuEoTQiZ
zWEP(zgd<4gkkVQNwJE7FzUdr>-(=HAVT?DRaOQ@2T0}_tIc+~7!5$nusJqf~37qV0
zZ5^aDK}W*mQ{hH+1naNAF75D{c~SO^76`0Ov#3q3da+A4z@XF9Ay;zuA)X)urdGhd
zgBl#mw@WUDD54yH*UB&Q@tlF6RDFb#4Ij?>6%erePU3zQ8?%2jKh^KdFYfSfq2Rxd
z9c0Lj0ql>S4i^m~*q0Tj9ogL{)oQyQl4{CCWWBv!7EjwK+nnZ{G$?V$`>S;_ynxv!
zc&p3F6gU2PTDq{pW`g#ebQPK|B`;;CvkwkG<)$T>;<#tdjOZXnj$1KvT07!gHSvsr
zN1Ta%Ub3vU%P9o&;{iTrT?G;&#E!q%t{peri7Tr1B3zY9UV4>ccL<gCxoq-6mirwe
zpD(?-c~k7CjvEbSefH!V@W?BXAv09cCC~+@N3x;F?eK+xHCkv}1{5ehwg(MOm6R;F
zgvmHty431XaIiq)&lt_GRDQNkp0gSCZmA?BTNijnXOh>4WlBIf+scd2cE$YQvLCSL
zzS|x*8&JZgSsVAr=prcvYhOL7*S*00GWt2k{Vf*2;CO#b>V9i<z=lCbJ$uKu**+mx
zKsNm^*?_X>s$ZHwLT8luzVg6~60Cw~R8^q#KBh_H38`hvB~^Y{1BuvR-vhJOZP4%D
zaYJr6k{2OBxn6qSs-N9?eQt02(AaI~mka!%yR(F%63$>EpP*G!GGij}^L6=*6ZyAb
z{*@|vtWQ5~4znYZ$x2!irL2dlO+$?=TIxhvUNkYZC&J=wlMhzxi#!9|p23oj4#Kij
z(d(NUoyN)P55}^<Wr&vVzf1*n*hirTc<q|g&Z?%N^E|#hys(pLn3>RGNq4)A>?Sg8
zI6hV^+UFbYBY@*D6;2Z$=V0A<<xYlkbn&$g__4;lym4I~0`$F)0DcMie>Wl^VEm_|
z#44)lSL!He0<#d{BPb9D2VO8FX7&Rpffy40c~M&{D!Imy`*Dlxm;LMta_BUUP3v-5
z9a?nC-+9r8pJV8WtCBfejAPcBEjB97N5N=xGic{0C=tBY%&M`P$f3P{wUGqJ6|Pqo
z8wf1yI}odvkDnr|a#6-gD2)oBqb+G>gx)+&KQ8ItZJi}XYKLVw^7rO|-DsKLC`+UB
z-Z`yC+M^+Y2XbUYf6#?~UqKik6G`_IcWw3TUEG^y1~(MBZY#hl7=OIa)W5sW|4duG
z5n=y_ZzV*(1=OI|t^^e1o*!Vc{Q5{07M#hvU)47CvUI7X$f>9o>w`?L)<2xf_AipS
z`-XEpdz(DmWU+tt_ImHy=@d1BtrFm?oD*wZ$jP^oP(I6FuHL|GNBLw=sQt{TjuBDQ
zm!~<8TNl#B^p%MlIbg$*cDB6a0h_QuNqCu~R~cdW_4~)d!X<^;&Em&z_Eiby)|kd?
zPx|tn^>D-P&bK(RwjRJ7KcvwMp{1<qTs?FsF<c=;z9{qtLQ*z-zL<!N!!o#8TlWOY
z2|kq-W)tW?P1owb_1rFXZ`9=yHNSf!ZfwhH3vK~y<NrtN(frPO|LT?f8W{Q?=F102
z9{oZ(6^{DLX6H~i-L7S6K{+AZ;qyWG;5A=)BlM(Nr1)bK{+2w_pYsPRTOYvQh3WCI
z`FM5ta1Ff<57I-@<D)0KK$AaDqg`U&YHPHWeiJj<K_`5Fr5=zC)Pt%=XBH8$lnN&;
zSA1vW#<0{;+rD|Zy4+;F%egXkm!hJ-Tgq~=`@Q&rfC4Gj^epZnxiXG336$eG@(eL}
z`v;}fR(|TfI)Zb@_m7f&{&*2y?%{NnD6Oakn<@<o#LJ{lq~sg>6>y{A0kBJljt~}u
zz5!gN4OrJ}kD$s(sAlS7$JU925`)!GZ<CLy;`2@C088Qi@qYf+mj46BGP31+YtH|b
z5+x{D$V>xx*{gLLEpn%HD}t>#mIBFmuFFKx>~X{+i3?SR7YZteWX@#=>YHHR@ezU%
z!aXJc{qolQ@6_->R`$}Fx9NNAN$t<idylm5j$BcKLqs4-b(Q$VySIQzD*MNpBZh!M
zvd$x5Fltt8hDGgP75lMoCx|#rq9tzBbLE$*8Hp4p?izDF3Je&@P?lL%V)Jj@g}>md
zIIT!)ueoHDAGln#wZYxb3ooC=V=psuyM@0Ng9M4@_v6i_?KD91dp308QM0&wYcWdD
zyZ_-7uOFPcbM-)(a$FapKeWh*-d|E+HS=V>Y>TD7{1u5@wzR`!VOSBaR)E^Z%$c;p
zz1++Na`9*;`5Q;GF*Ec0_Eb*0sfCvRz_{5olh8Cv8+Fh&NIvBvNmZL?TtQ@s@xUDC
z8Zj|`&j)+C27Y@xAC3BF>x)A!8<aa0=g%svtI4g)LtUdv<t6K&9TMaqwCD0b2n;F-
zDwRH8{T@}J$B2xPNA2UbjbRy~4SL2H1)WB!iW5>KopmeSA3G<xzIh!@9YUx1mq3?W
zY<!*I(5$O$6Xxjzeir(Ef^36?$Ak4?xWCt!C3+PoTM)uF)d&&f#(z6_Mfx4=F>H`L
zfHt5=tGWs=G4Bav1@?*+0YX}&0Drd~-yJdri9jIWlVL&)(@H)fr*t^c2=N@=B$Q~=
z&OK6Z6itqVYp2IR51t7G1B2lN$Gv3SdEvzeeG73!0QZ{kqfY?3Ps}^A@9!c&b*WH&
z><&orb7atJiGR|6t^ev7@vTf1ck7UT;d=)T5dv{qKbaMt6d@IUI1C3$cV_h<h!@86
z=kQ*{n1LDR!?(ejo-@)}XMi`a{t*NFtw)PlJL_4R8U8)1^<ONwziV;8ih97CGhmV<
zTSf-y=aal&hH8MsrQZlIC5j2h-$<KJUh+)$%&R?u6bgph8O$&q4+_DrpY~$n?7Yib
zv;4+{YxHFVxwPe%CoGO*GGt508N%}><wS5oH=G^8|4@ANg&I^yz;({xII2{)Qv_C6
zJP3dl41VA{Vj>elLSUGL=BadYK)fpt(c;4H*ypkt#-Trb&^8?V`j}$YCft3ylw68A
z@p;%O*rR^+3(&^mNy6YeavMRLX|`&MK>UWd7w>QA+mauH8`T!UJMV(D1ImguK2dn`
zz)BwRP2Q(!MA=Erf<)^DZ~Np)+K=)+pDEFqK8>Fvd&Jn5?T~2l!oDJMA$l!<qaS~D
z2~W%!Gjq^A+c)IpQ<?-qroV^(IY~(sJ9$b9kIevbjTcTUTst?5&2SWg=uAx-awW6`
z`8C8g(N!clNvzdA>|{Naz^#lq_?V;4FIN%C+$p9mZ&!gLcX_!tc214iaJHe+lty1E
zHudn0KV~aEH0=Qh_&|TGiGO>n|ARk9B&=s<>GWT1b$Nj30v~)S=*mt$-sXoaBKvo6
z<?hJcAo%$B=DcE@up_`=Nm|t{cOSfBE_A<!0#r0GJRnFp!5#K9PY=Ew9;BRQeW87a
zHh8oU<zI;;0L+f#0nlS}7a+6P6z8utTb?RY>%Ph>-13=d9#&}ILPSq&>^NPSvltVu
z@e*P)V?XVr!__j$BO&ZL;=#DxYCjj6h{c&!GU%Wqq(NfROSL~n!t4vw3rultn!yY+
z(NpdIh|b!U!{lik;WX2U`cix5obP$xP|)0}xKplGo+x1n@jc9pT;pDezftuNk$|~y
zLcch%dgsP)Chk<LQ!vCOJ=9`22-5F3z1M6KO~ztFc|49ykR%j1mLm$hPbenf`Ux7`
zWF*RG?Hfaj^9xUDzd#qHUq=ko!;TgiziJ<*i9BBb(^plIpe>lFFYHLAy`=jaI615V
zI)&#{8j)P*-Nb1M`>2jTTfl1uX_%<{6%l$DrsIhopnhf5VRtyhmVk3y_~U~^`@6^c
ze-gj|2WbFcU;fQV3XEuj>;{N!PTUk$)%oFZ`($T_zgH3AgNKCW=8M3up94lLxig0a
zC}$AY!@_E{_B5H?jo-TSWWGb)r*}ke4)B$0NMIHok}#LjuTzeqOBqKzVoDM*nJ}~4
zeX-qivJ?w(uD6vho7O}Ka?;HVEzu2usOhM_P#+9;ashg*b5&rlPJlW~Aibu<nF##;
zxn*LQUhjGy3mzOsQG}WwsjQlL^2OMv=m~)$2p_up&8dBm$($+ypNjX#Oor}v#`sqz
z^Ec~<=)aRuqqStZ>CgjZ^sJ-cg74@fU4qa72cwNauWhQ&&(EZ{?};-;Wr=eD`NB&3
zM$p0lg`m;5S-q{@<Fr}+GST4jZjY_D(m?M^XUb(fB~SF{(o?fhaOu<^_!;uFUkR>1
z6E}e`m*tlQ@8Lr!rgi>wBP&W3#j(HQf6jDPN&<BRrM$CIrdb_hG#(TW`ix8%(+UYi
z<GWbMU?`636rg*_^3`lu-Y?vkH6{nGb&zN`Zb1T!@JyJ21Cvy<sGl=|r~RhG)H!EY
z>Fknqivv#MGA<N)0q4tg1v^h?O-j<b<MU|$^zlt7Q6;LDl~Zis2fwWwI=@^VNs{+`
z?`xEpz{BWjS0}%{Q?P(agR-*F>Yn5Ow8V90zA$c%qoj4zOlg3N(lfWp;4Jm{=9nV%
zR@pRwbNDks^|xp79|Fuj`-l?aBy5oA0nnTE$K||m^(DmYR!HDf<laPWiWst_Fi}x*
zQL(g^E#}aX{+3IQ1UABUxO8~zyLX?-W-dsCWTQouFWou6WDPL>{F1fS{$XK28pCZx
ztxIX;#&)8oJ{SzTuV8Ap9^JmqJqzC(JvdgcF1PkG7Y1A&`>uZo(@}=%dC^3q{ZR^o
zjR=L&`I4p(k^tmu!rT<LFsBqTM(24gQkou~Fv-V~AvVz-mo70x`=fVUdW!lbHT#EG
zp!q$4(V;iz(UqPF6j)e6&Q@N-R7G-U>6eTj1vTOPS^X8rsW#ebptfH&1%rmOgj};U
zkvDbq)UO(sO%bYR6a>bsl-sOp9yiZQHNtVdAS<S`a#q4gg$L{H-K@1CKkqu{I(N(v
zgel|)i%dmrPKqF8exdkCe>}d%6I3^{=;1mln}*g^*|0BXHc?tg$|02}Ym)$dkX+~O
z?EUC%dyFsgB_M~F);JV2!B=^N2!v@mP+0F4YGH3wa~M1Q^26};Z6T~`7sbk~P7kPC
z(>kF#d;0A*Wg<FvO!6c3lL4xBO7m!UMs28tVZ{^wr!l8kYs2L=qJCwPAKg}|S88)A
zrj{}JK9A?&#IY+4k`?VfH~I(Izd~7br8U|Nz++(lm}$`ef4jYZaht{dMidj`#;o65
zX7#frON&)@K8SjDZ5}ahCu9^+7<>YSQW!6j-066~_z#kn7#D@m4|uEKMDTte;5r5H
z`=$B$BD2|DIT<tW-7LTSH6)G{e>J!s<<C^FS-M#sX@zx*PPJ&DYL<D<cnasbaI51i
zBN#n{UhRZ2oYz&U+}x;nN|$$=o2g62WJIPN5v-N7)cOe?6Ak3^<c7Gp$Dt(Y00W76
zT1mSodMg0UF!%1<QjO-Bhm6N24ptoNG0uDNvMv3ZgAMoG=yJ%T;+GXgfI-qH=4FRk
z4z<IFCmb3{;Qu40N|K=Oywnk6l&MuY)8)g@Md+Wp2&g>|YiQ^0Of3NeP_~CBx$6G9
z(h@%fG9yrSSdT<xXqA^#w~LT0Q-}oGQ6iP_VDrk$Y%?!KZ8q?OwcykiKK``L%4zPb
zSs<f7e&X@XvA>_fkSG4(DzU3Ij%944?LY1@Ip%#FX!U@F@jyA#@i3XEmbbSaJsRi4
zTQB6$ehE@4{|tSU8)_#;Lnw3!gRm<9^vTt*Oy+A<K#9+HrUZ-^%rdjx67uOXW$vzr
zu=qeY!vbg~iJZ<y9^F%$WQok9S}%XciC(h_sVNpoxiltgj1v|}CL4H0e;lep9EVX#
z#a)WA`RehvY!%1*ynF}XLxg|yA%@@ikdn27ldY|dy`z!g-@=stBV)}_u(FwwMfRdO
zI|>u%?+;4*ssOf=&!JPm_q<*(1pU329gzpMQ7>aMwjSL(kpvb|>eoZC)zkp9>=R?k
zlkRZp=8@@OeRjsf<Mn=_YnttpOt&$uvwji;KMcZ@KMA>rj8gP#HLtP~I9HU1-HM55
z(+Yj0wg0DbGYt{2N9bc10sD!1&56p^pzk>6WKUn{i?mvprA-EB0jvEQqHtPFVBMRS
zU-H1JFq!RKCw|_svHu*cl{^FKvEI0>9wF=l6)>Ezb_mLEHoIu>*N*#y8)2NpdC<IV
zG)d<On~rd{;E3^Un(GUd%jDT|)W9;|ql%7t>)CxT+)KF5bMKwyzE;oSesHFNI?fQ=
z>Q=dhBT-*5aB5yp+e2W2HFDThV(M4FTeRD6*h?P@`*hOucc0R~fAf1M;2b+J;=5?&
zAks(SyuUQAbK!sjcP<+u5}-Ar(<l$g-Cs_&jJz2dW@M;Xiq|9il9a(nm1W1V2ZPoN
zX&~G&QN|*WPiHWoP_CQ0B>2*@3t{8taD|k4(t^$qcpx~en$nl;n|7TSd(GQDxB;2C
z|2=;nxmzi(Pkc~1yev9O))GZ6*1~Z!L>{IxKVg`si#rNlJUBQcJ}9KXz%YIYoq(Hv
zGtIJ5S{|PobM<Qwd-bIklx9!R=X?#sSTPBoAfj#KcZ&rM0gmD&5tZ2q(mAF(3RIal
zG9#{uMP&$c9FcKxY^ge|{bG@J^6#T6%eO!;a$choHwh2(gp?H@VRw$uNk}r>7S(T%
z{N^Hr)0A4-)LOY}TqTTuyu7`Yr}yf@%76q8=Z|}(e($xmhJc}>{~G2X`qdqF(z6sa
zGdBLK&I*i@692#lFWeC}6u}rO-20(%ke|=eHZ59;pBLSh-rZ+BZ~7o_8tFmAo(1h=
zr$8uIb98SYh|sM6Ey~Ts{ZH8S_s_^~VT}AFfmx+~i)`IHV^&qW73m-qOqB6gJ!J9X
zn5X_I0bRIy*FC9NLt#sU8*IXt)v)!5jQIw;hei$SnG<znlqJqD?GSlvq${(^)#gS=
zWsn-Xs94T<u$g_UVC9A8O+=1xMYpCAl}KY5NEbKZYpj{O7IJRgH{N?lKskX0MN({h
zpX^EHp~Q}_J^mkUR{{>@*TttOv{5LcLJCEZEM+JAzDGrav1A#`P?8o|A{0?si%1lu
zkhG&nD5a1}N_%M$Y2!ODiFan+X=c8E@AJ&_)c^aszjMw#=iGD8J@;HC?WK)^acNm;
zE{@2$@k%mF3OP*Cq8atcQnPu=sBd`PF!|F&E_q)Eyrj%kbGhBIrq`rE2%3|vJ|*==
zd!F}QK7Bo-*|8<BfAqBqPJX}c%-IE>wwXOUlpTHj)y{3(w<Y-nt;v~~{iV~@&DBj+
z;f&Icp~nw1v+Y;S-MFsn)C>IduYxC(%5Ux6{Y_n3vLwErgA*P&3@fu)7XM~SL}YBP
z&oW8tMxyQcqzn55&HVEhI2S9-{u2J?qeI8j#Jyk7uhn-pO<xfzZkZia9uw~R(eZk*
znNn!x(XgM_f{t~WeQ4VpW|N&Qq-=FVJ$|CbW?#VzW?}O<x%uCIK4_+DD1Gg-G>_K%
z!}U){ghhebe3`aOSW?4Vj$3+PdNU{5jJtKkiU^hTh-;^QeigpJpE<XBAHQN;<JOD%
z(r2ZP9DJLQ{nN&Iu<e^c+L@A-*KPDucbe)f;yHh(*=D6-u-Dd3=V@uGlYF;$b&jh#
zlCtEwMg;!Zpv08Yo3n21Ej;*Xaa&r-+_b{o6MM4_*Zr#LIAwBD)bwQJi`L~P_K{y!
zl#A|md7qe(Rl54eB%AhuuzE3pX9?-L`@7bNTsYGI_2Uiuxw_9L6^*lzwQ~JtSmJi@
zq?i%$d>?-bvDWotLj8$|nc_VC(i3_Ht|)(gc=%UZ&JX#<O+E=_PP^@MKa}0;KD_Gf
zB$=MpD_a^%y&ZCw&GNYD;5+;nQ(oE)y|<u8QZ&~Os=73`>Ogc@jRHn$&xcJhbWa0x
zm*j~s-H@T^T>8E;V)Di%@b-kCt)Hxr_=H(3kMd;VJ!GT1YN7%<S^CYK7EYSPd#3!x
zxh-GQAAa4_qJW!q&>~j+I%~78aL!lOD6t;iZJm-6bM3rK_lt;oy5>y|J8fRrDZEnO
z_nX2-xwA!tr#IS6uEl?glJg9=yoC?Ska{)WcBO#e76Er3`}?eUMrqLn#Z4T+M@V5u
zH*$PxTi=xNRry-@6R-JQ3LAeWzw#{VP24Sab<+{q3OSt$`+yIG2b(|lB>#B6s8G}Q
z3sFZyU0QwHM6EEXDf=FG^Ty;z1bseVUs}1fV(}N*^R0{POcCpBmR|Af6WHDk#;p@A
z(ZB#-f{zQiM2mgk$a7VVdSmBy+`8E-Cy8H~A+<onB3q9~@5^;Q>HaNZKVtjkC#i1V
z6XTROPGSZeUFZ@^&zwDUllKa%cT7^YwtB`a&6T=lbEeqhAN%KCOlJMC^8<^T-_dhz
z#oz2|v#rjh=!ma-@p#g=EYgz-#~uEa1=(u}&&oAF=}6bTkB`3CAp2bQg}iQGZSR4{
zym!1@*S?jTr5o0#miNsgwnVleW1q0&%S_i|RXy_=Uos!-v9mAQWt|@}XvPwDNho^S
zE5~ixvhFdp_nY+I4Aq=<#M|c}*C^*RA+O&Z4WJJ=5$~euf!yjs%PY`CX%ZyeLb;vq
zSF_KYIroa@<aHm}Cxyv}X?{08T`ig>=@J)p<|A&d!NXm-CNdwYoF6MYer4M(r!$2m
zQuwNIpcKc&Zz3YBZja=nA3m?M@4UK7v((>uSK4}Z4#P(-%IB6>)V0T?m2`E~z7tKJ
z`Fi24Wo=#&7R7o7m0f4&biaMDVL@y{q;z+8z=Aii^PXugw5|N&n4l}9_$qSk54p8B
z1;41ZYps`2KY;(JGB}h_k32F>s0hT-4L|HMAgTsQzKzs!$NRVukOI-bfRU`aH<DFX
zAv}5z_jy{Cu*jk}6E(+OJ!@Qf+E_THDrcw5rwNAnM_L1O-u8FxNle()<lg^o&$7pB
zW-m)}zrXP7i+7KE(gQwZ4*cxxW!tW;9H&`*k<V2|OjsDN8o5={cXg5s*O8~8-K!I2
zDueBG(tB9=kEG8t*d!`cVOLj3FuXN6c$|Tc>BfSiFJ3#G(eQobXQbfvHZD@%OzQrl
zf(`G^^`_oCkstSn^UaH^McuEJ%JTV(0-qR{_S_x6*>FPP+FIgS4zI4s?Mu%*e>hu9
z;!tQp?_}`6W#x9aS?e#qS-sHzSi5l$ylE2HI5VJkou#^ClYhO%nKI`Jg3m(JfntFV
z6S@+wh5j<L^%f~eeQ9qZm+@w``>E9mq!7c6Qr#S@R_UHhS^L9q`-{5O@y`p{cR6NX
z&U_$JcGj)wp?O2W%ABWn^s_`~b;aV@y1WF=K3VRWGA-`p-hBsch!v6F>YZ*@Z7aF;
z>D#2DkGw|Wn_|Ug?2>Iyhz;X#;dxkT#Whj-#QJcp^eXYl*Q)E%SE;w2dOK~6!O;gt
zAGWqBOx+`CG;k|y`}4kg-)&Vw+qQ+8D_*Qn?=V#h4ez|isx(1-59^A#UFMCyoG<Xb
z;hBDouSoNXVpdwxx9C!#Ejld{nupjq%5`L(wm4W0vKF!Zy7}t!w)b<x6n{<VwA^L%
zszUu>&aw2;&WZZI8A199dseIOa!^mr<X6+^dNq&4akfpVyI*Ca@O=GG^*3}=!w-E{
z*p;jyK^p&!&wO6>s(GXz>Ks1~*RWljKJSZu2S<cG3BTBB@+12N4>kALM3>yoo1>+;
zvO_}<A47x--6f^o7Tcm0eCC^^oGbnQCI6I9Gou%1UVF0PsRH66TRcMgcK$W|qf5s}
zjx&*W{(kGY`Ax{P^Qf@2TCfK1ig^XAPF&M$r?oh|v!;{idW)aivoeydE?W@V@3-V9
zPOWZ}VYQHCcw73pJptWskrtBbEO{&ANzHsD+f|{eyi@M&zWF%(vftfjb#jH`d+WSq
zx+FT=I0>Smyl)g;#Wy+=#9o|CJ3Tjf#?_rQRc3pGP3^ZnN$peon71r5HLGXCrFy}+
zpAy6*mG+)_wZ%BHfbhQfOS-yvWL@?l#l+0EefU*=Rf$DU%>~V>N=w80?)kR9F|*$h
z#d6Dz=eD_<_>vXhFKPWeZ=AXozhLsW<DZ-7%BQ7qrtN*uvqZ_TeQxZ+N|P5i?Y0WG
zW-q?jC9+sVfkUH)qpH`Ym(SpMF5m3-j;PL{_E4GhU%E|vd=`2R3#<0(M5<0vl74Zp
zYRR=89^)+azPWW@Ob0jhnP)s3cRD=qv!`Ns5x@A1{p|dBZP`mh^{G5*--OM;KYyp0
zbX^WEi=s9Wb;^gFjClA263|W>!h{Xbw>ZMI+2l>X<vP;qqRHoFp4@*9E$%9~DsEN3
z<%{FjTX@F}f`l(w2HXl#>=$>3C`NI1pL6Uuuz355Ohy0raV%doBtB<msf7O8wN<Q?
zBc3la@9j=yLwrtQ^-;eEHoI4KrL9!dHuM%*zV*m5D{XIq?_RFaFZq_$Z?NSk-Po%i
zweMs5k^Y+(MeoU*3CBs~u3Q$|ePp1{-ajJYvE>Pc?@~PubM@q=?AvzIWy%z(9FM@K
zA+K=e^Y-Sl{w$l<v?q0b@wzXkyN9x}4JF>}^&ku6!YsB6m!l>veK#Mtu%|@~^dXIg
z>SV{vg_g#q0&vXCt+`)xucm=oe?^JllS+}IHP&I`g=GfX+CmoRtQxP|8_COm-aP%`
zcY*H#o1fI~n0GHI)!>m{bXdXlL^)@*9}PWs`#WpCD&g2#znps0$)EM$XaDOjJqH@`
zZ%^nS-g~N9dS#&I`FOo$E57byBObjo$4=tAt&Ydb&IwthMP8C~@G{Nz4|GKCSRI{v
zpS|~|yOyXv7)<3albfxrdzPHwKj!r$@8YFFjkUX%pMFypIPt1t`dzO<iJ9S@!EY0n
zev7_c+!18+T9G}Eo4DtAirMkd<3}!k>{i?=!tEFGkds}mPb9Xq_%wc5!^ABaA5UL+
zAsU=w89nH5+IvxI^ilsc*X+yd4Jyy3)CS8w4X8Qh@UibQtIdOjXA-vL&9Ld;TzzS+
zUC(v>j73MjZna(5?@YRTa{B&&8#Rv%`TdR*aXY9yww)`_{$ucgc6gjbGn`|EFBtF<
z|40-)fuE)w-*aKn;c(4_CwPu0tE;$m_D9uDy7gT;BxX|0O1H_I;{A(b7dbc;TMbM=
zycu_Qyjv_xHSKqBsZKZfiaqpqGV4g*D`N_e%0zS|&)8>SFqwdNTF*Xte?`!G_5#*|
zYO||XUX(8ke7i6?<Kr{F{&7FW!@2p)`0SPYUuWFvxcjK)WxLY$>5Y8x{1aJU7)T@s
zOo7h07r5*Se3JLs5GQ50g?F#pFCie%neHF{<5h44&&e=>jvMn5a}%#^N^MWN8PU*E
zu{J=#@l#F1S{@OZ4L19h3~sNnHC6qo?QUs*&G$`1S38$aw&V0Om2V^;2|s-qGPN5X
zv^J1yy8bLOuJP@pMrqNHg|{CZU(L6V{hY{`)QGJC{NYW5XEk;OW$f`SE|e4EvOi{W
z+_;s6<-*)2rwR_Q>Ck1rkoluUese3QX1Ifr!>^=QY@I{JKo4_{r?7#fC26`Ld1{75
zarQG@QI5W=5Me3<eRR3fr$!sc>bqN*3!8^WYI#UV2@Bg9;G+keP71R9nAX<_dseoO
z;?;AEbC!D*&yR!c?&WQ&mvLUFj1qFoMO`X9CV46gn3g*nVEdJ2ebV@N%*FjN9lG*z
zYL72+eHJS0H{RW6!|wK0&oy~Y?u)!4x5`C|{6(Q|#vbkapQ}E|UClN3L`lKp-E%7Z
z%!-1o^B%O<O@5p8ZmoEg@OpU9@m8m1jDu25yl>#Uibr$8cspNoB!#OV6l!#toq2_a
zT~TWWf6lfag27j&m@Cz2FB=@v(K``2>i0n|iZopkRmq_?C8JJ>%!S7nZ-C3<+8->>
z91)OPxSn4xp>lc3-uouPhuI}&zN_&&&A&0o#x>|yInUPZ^LW!sWe#`oeyDtY<y=(9
zA(ibLAIeluQ5oNpoKzQ5dDq>%Jn1IUwyUD<oTJ;8r%APC5oOQ&3H(o%W*I-{!7JK(
zRh#(E_o~}>$0IFsm!iZXv3pVS<0=lZRU77=eZFj4VQ{2s=X=eb10kwPd6fr~_rl#G
z`?d_b;}4tJKUlY_DRO>a>zyRYv1c$<WPH|+@3Y}_O-iV1YIemqrC;(D!p_ZJY-i11
zvLnWAa!fbq9te(huI2B7`;%JL!ozhr<3G_#hUL1U{(}zo?)W+FxV(2&rdF+_cUnK$
zZ;sbED$BcsPqg}Y(eV>!N(?1-w>WHi7N>TtxSBuCwFNS*!Ahsq%Ou+jpx7m|NBQN7
zrNqI3AK%!nEOQ7K7U8}s_+o*P!6rcsp2^BCgjnrk<+V!tU8;i}_9r|E)~@89n02gR
zO7UmiN3A_ZHA_4)FZJASljlpCI#lWsxKbwyZx{H`#-_tBqpZ!_O{sm}X<|ue;gRz%
zGF#m98V$PmyEf-qow&UD;te62g5+g8lQ!_&+kEc&sn6YuVzNRT-uSDXBfT&f?{uTX
z$4Jim$Q^GYfA`TcLX*G^+oDTut4)ue&)HYH{Csj@aFNH^&nd_2WAfvR?4~xzecLr4
z*mVEF#FH5*8tsLtWv>fmj53|^^Y03koprv`*O}UOTJGfA#KgTXCInlb{oZwe<>Bc^
z-X|R%|CpT;-JD)@T;T1(jVdy=tDk(IRP^bse7;ar-i%BcNr#}=Fb`#0UxAI^@l#|b
z_|2WMOJ-Hn*Y)gg_B-!OTeVX5lyjhG%WV~Z<&dm#TiqtE9%yJh^wpHpv|-l%R{_y?
z&Musp_)u7V#p7EXnKgO+b|0sO`^{0fvR9OJVA(bil~W(s1-1HhcHv{3YEOn{4|vpn
z`4Pb0Pt<+N^>VAwrYQ;B<F&%=V(Rn-e4g%i%sX?WcENt3+njq}yl{)>T3Nn*NrKwv
z_>irpla_T`D*HLzUiedDAgnc3zjAt)R(L4a^ib)iEDK)kY`RU<)Z9}<uzZKlxj&^(
z+FprONpYRx3&X9~#V>IU#6-F1yyD!ZzU$@kh5dfhwW{aG&Pp5{isJ6edz-t1>wHc#
z*F#m8$rq~MB@pN{<BX98Mz>3MO$s{%4UFop&3>jIJ4+-wvN}BGYwn5i){|aqwx%Oj
zKkLd1kILwU;g_E23F^3z@^vWlI=*Jg)X14xst1aVbTkAxY*h_qgiB5|uD|~BVc#a{
z(s|cqI~T4CdtK{sWuFy?=CwD<(*g?<Hh$GqOUx{{USu_eE&Rm?gF}W(i3N`)>@ZW=
zQ&YT)<LiAPE6es!^Q@(o9r0o(`@~Z}hVN17EH}{64~aI}n18Oj!YO#l+s&JLZF^nY
z4i|7At>X=q%26nlek$p?UQsmtB&p}w;a^GK(pIcCk}<rc-?LdF=T|;oX&zWNxLG8<
z==%mP_606^Rtvojp9o&yEWO;Vb<rl{%Ue6jiuXNRQZU<;6w3WWdMbBdT*&M|r{z<7
zhEm|avU<-+fH%%#d@UoN46^6We{X|Khl}H@-rS$SqxloZ=}>(A?d+usMMYUT1ym1{
z(sIj7a@yZq4jyU^eSo_=Li$F1n*L*WfU)OC@6;z8&XK}Za#d4>7n2C#oF>yF&#cdB
zxi9J679Zf86jG>t_gJK~eZj54@KdcZoL4>Ziw4RbFM8b*5y*Q$z-{BocbhCP_1wF}
z<8Z>$S}*VGz`*LK-<DqtSibEB$FItXV)u+%nyS6so@Mn`ON%IHE;ixYI8Vgr*7se$
z8)FX5V83{f<AI*<bWcv(+G(x2v;AhAXJuJ?)Xrtvl{@c-LhPoxl9~tLmM=5Do{>wB
z>}lzdL`gex+eKxKr;}Hy_1j-dR5xiHQSHAYqG>+8deT+S)`f-@sS6jh9qSl=7iZrt
zr@K){!=JyK;?|gMxA2hThk3ZhQ%9VwYf|F_Csy&+S**R55I;52|4db=?N1l+3%#M!
z<yGcthgIIa`0Kn7$@o0?#C7}|8)}2)=Y>qOz3`sn<}`xo`vKcyvdsgt*Iw*Zh71zR
zp*y0z)sE%*5-lZG;-Lpxd7V0Tw?qjga_lkkURJ-h=2AxZHjl_2Wt)j_j%nSPb+RG;
zOS;+KxHd<D;>65gvH99ORf$W!#cE|a?^aI8a?Jg4W%?8a7VEgGPM>AVdM9tN?w(at
zqMWD3Js6T}^FzP2Aah&ys%)9`OpnyrX(eHbCD%&7)UJ}U^h@7#r?|m)S%IRKoDx@6
zlOFf;&aWpwwY^G9bSv3$v30ghHe64572C9Dwd67$8I4)?D~yh=t|Z0qT1CrgofyBN
zdf=Rtlf*T`t8g~HJmQ20&zIGOTc+-?t6WhDi6c#&^27Wc$m;7A`YHyg()~fRXiJf<
zfNwMc)bb+!dG9r1j|`F^)E=xpc#yB@It%;E2jzPgv$ATO;(FIoUR~X=<lSsex6X0O
zN#(^H?wvfcRcUO8f-iM*;v{s0CkjV~`z<NuO|dcPYOz?XNi0_8dV0~vXvzIto^X$i
z9dEL^T&+I|a3*kBcu(4YD6Z({QP(~azN7mBi(MLleV=2Jm!M2a*ZoOvW97H&7fmWt
zvN2guKd^8DYgklS?Z!P<Hl{@l<gx8~6x*~?I9q7*Q1voP*d#S1K{$n`>Qj{ox#|xm
z2v-pToc%p~M=w?;n+<1BW)&wZh^yKzS*z}JLb!Xark)Yc%xiJyv*y&Pd)y#x_$faN
zVmZQvh=}TgLT3)j?g_Z1@^#DBi`#Ioo;<vs5a+D9VDC{SUUMN`djkQn@CVXget2~8
z^Xl$wJrMp`i%0*_RPDstaNm{<YS&l#UdWH1wP>AUwA#kZ1DB+o1Pxm5Zty7D8vT&F
z;Nb?*4x>etnW;uz=`#!jIK$fq*@;%C++}-C=1Sjj9OSGHo1<XovCtuc`?GtzXGzR>
z*A}a%vpX9OIXN09ec=cx?3<kR>Uw^ki(`b{`;+ksDSP8&HQkP%3rtc;IZ>pnl=Z1*
z&99nvU*&z7ooyS9lYB24+JxWqChb<Q6<+gAS(hb^Gn^&KX0;9>!n*ljf>vm$!g?78
zX{9|{@77G<;oBWs-C8nfNMGme=-Ma`^FpHO)aja=k;K->o!8$P+=xBK8-{j+<@xUw
z)kOEQxHM^>i59XIms_63YBWvgW@Yj-J&nYW@+F(M&n>WebDDM8?r#Tcc7A>F<7Lm}
zE7N+WJey*v`PjfQ*hi(aGx&^Hj>e{YQ?riMuaA(lUdnO&ZfR#`%f%Dn*0z`5_p{xS
zp8qb^J7v?^7uk`M0~%6(ol#BRIn#kZbh(N4%F54?@}YO_9~{V360175i{r%03PM!H
zJ`tX^9lH%U!dd+i%{Q^n7y2l(?A7azMrjU7u8S*TNI!>GKdlo9aaEwi$V0f;DUub`
z44b0Oh^RJH-3CGz1oW09!&Jo(&VfU@pB2tBHMZDQy1M%Mgwlj0;jkI(;;qE{G7hKP
z_Wff2<~?%&w=JpMElZE}n#7BSDLt?RhK6h%=NnUWCH~4>js9bDAxm#BB>A-Ja$ol;
zzw?u)u5L!mV$Zgzv7a+lI<plD9$LN8wUw$X-#f5%$;n^7`9@Yd*pjDSn565u^4GKT
zq_-N$3s)`_{GuaUYIR3kDY@f-{aI^L>QcjfeSIxCrW-QVqkQ|=<{i4Y%r*N<`t1Sy
z7Xm>!rFdF+&)`oz#h)4br?XFOZgQU?FSI>;P3>C_`+30vc9lK_sp6+no=01*SGd_R
z6yBZCzHsL~NbCwtnXaTJQ_6cXqBh>c2M6dK@@ThG2WV9qG|@+A;?<lxPwSo}Rwv$Z
zdKp`N;Y%}*&P18tElc6)FSYU<aoMGh9$3o8ChS<Oc)3J;#XTumvE&4ehYRHLmp>|%
zlsj21cBWiZZfU6=XHHzkj;MsIqL;<jsjWC74p%gn+g?^&ux6fRsln<c)lLU-@J8!V
zu03vZ_XaiUOD-{ynpmJ-UauyxSngbSf<_Aa`BpxDKK_Gz>e~|{5_Y8Qm{98k*U<NQ
zO<Aj+x_ewsWX6ttaonJCZ0u%tH!0VEFpyWnu~m?&xF}T+E^GyQkxc#nZ1aZ0h+OlV
z5JvE*oGpyb?``_N`ds3Y)VOi4>%x5uCghsw<r?B+wTz6pQ&N()rcGA6vS$XdWU@@y
zdN$X_9U-?^ULef{p{b{Li8qP;z1bTPIc_<7?aytZ!8-2i+)}KntlXta<Fvw53`tJ@
z+P+R6mqf$wW-2vWzti5c$WioK<y}tG$8nj_C3{udKfY10HC(koEc{}J)sY1^!xO5M
zW&H^i$qtVK**fOjx@NH{zt)N9uXZ4zQ`#-HIz>7nG5oyHg%jOV<abZ?(c1Rp{LdMw
zcQ2SFTrjXOQOZA<exOZ0p8eOL=!|Jw_lvQnk;Kw}Nu7mP#_KGJ9}hSStS8-Xt)6yk
zjdCIWz=y|T?YcXQt76w2@mbO8<Z9PAbcyNt-m*&M0@DVX&XVc`P%LCbZ(k2Dg0{au
z(H~Wv9g)yvP=%DSKJ<Do|MJ}y+)~z;aT7i@-Ynj6Slnu!kf&CI*S^nUyoVYlL&^P&
zLEcB|5$i<7!at<%JG5o!uG|&HYN2Y4T?y)I#nno!3k|i;)~&D;-*MzdTZ6@=+MJ}L
zdKRV+cx=bdcePx4qhn3p#WI~IN&1G`i7E+&B+CU$wwcUrUL26)(#vu>xb{WL4Tbv-
z8wBc_)6>p<DsId@u-hV+|Mi1IC*NpQk3X>O>9#Dfj$4PO+oc+=lds<KY#WiS<+^z4
z{yQt4Z#vwtcjNBdx(ioaJRhx;Tze?~Y|8j?JLWjd8Q5-OdwBP{?Q-g^Zyp<@?0Rr9
zO4#$^%I~e5B7MDne5;0PMh@z(m^}f6T}4ydm8dxfR00Tb2ct<K^7H=R7ohS>{aOm%
z>#J<)Im|whmDA$WlkCHio5a6lUN1kIX1rf?@qj!h;&czLtDdyA9=~kQg<zuV<HwE;
z<I>j~$>g+(9KJMNbF=BGkiAR$x!sJ-QVBMm5@DxZ{T1iy9W9VnUT!iY{a2%sT3zAd
zgPTZY7RJ|phTd3`(M9l1=GeE}BudpcS1CEel()h7YEfpyiOcnO^1ajdwixI>?w3D(
z!M9-AnK$L$S$xye2R?ppY`>MvX&7+GukhvCB-ZwA15=2x2}|xi4B<a1V{fui!Lgc`
zqi>*Bkc;cfZJm>*r^2>YAD5~Wa*8P}GO0*+lD#DHAT!WwO5)JA<oNj)&Pe};6q-_2
zp(<r+_iRNi38bOc9_Xbl4)T<6(M(XRGhJ|;g~*0*&7BKoPpZSsV2>8L(;MQ-VIse=
zR#o?c)CA5a=Im(;C-8U`ADPqO?y7dVY#wx2$}!&{DE^A8@HrRH_q#od9xd$>-E5<n
zsk+2NOXrx~!S;<ei5Z@0ZzUJK^!~E{L%Qgr8(QV~#a;OU0!6h-1rbY6+debvEa;u=
z>==4J$j`g7r|zeRVn%>%!m7*!J>#HU>2JnyAJQU!8Hux+WQd)QH0@3F&hzcNT&}5+
z6{UPpWAj`Vq0YH6_3DG~gs*cLy1ZxqaqX1=;*_~I*Q6qON_Cn7RHY`sQLRK>%@Z97
zq%4Pv9fuur1~_J@Oi?*IN6e(K?2`N&16Ol}Y2`C2re6y)^Od<48jCklGL96r{L-?v
zf85rjgZ5dw%&tlLbDn#d{-d`2$IZptW#7qq$&lDHGzueZbzTNq^S|YIFHo3!anZSe
zJ2E7WcP1;I$4y;<U+~qx+FMwqYMQXa`pRIU;tSc#<h8Txx(n}U54u2QaI~)H(Sl6Z
zZhYdpi97WPNqw(1+r&!zp|1g3K~ngU1<qgA-gqmvv~=>XjK)X&L0Y-IM>|Ac?`f;J
zIg|LI#v(j#_h3b?;~ISHe8E9g@vN^c7U5OA%?H)p*KZY{ba|(Z`c$tikG)q3&pphq
znC5<+<No*<t+h4siQ?aeR>4TewOWW@V4>-RsS2EO6*Tkr@P-C0LBs86(6=l08XLlf
zI<f=Wz?I(nZf@EqGWTijI8#lc&E)+S5!r0Sc2aD9+PYS+m;t$A=a4f&V|h1zUeKl&
z83a|;j>qHDv!rg%Xcb#N{^p%e)oprF;YA9mHzU3zH)maz>@(559=Y|Si?LvC@uB+6
zUwHqe)^#eH0d3pxu}=9Mb3SA>J2nX9eM<5!;xz1y-)J{?*6H(iWw*vIzs0WWkT10?
zBz=+gF;k-rEOS@Ia70ygZAg%4yZl{8X{+C(Ega+7!h0N_ZmktND<3m|mQ?vc*}Xet
z`;u=D9C=)RKh@juhG=K_?eEa;gVeYK=0UB*K<I?9TDInD-3hhjJ2q$(Z=UQ`w0iOC
z8k?&+jVCVKJ#25ixmq{#+|EZE-VepYCr-cNNA8M?)0_rPM)ZETBFlo{roG7*rTe+&
z!`D>r77465ZgYHAuV~1zS+kTmdUI^JCWWoJP$PH3<1Dl%u^3Dp>d|IYXvUf!wxV9y
z_3?#o!@AG?Zkd;~*Nl~RKDnRHX1_8uw&6cgC{|LGJfknWtC6GT_QF$2uX9@DyZjfI
z&(iXl+{s_Y@kx-|<owR*+n##duugD&Y+(H*e&U0f9s};Zt8Df)tHj>z5t5d-Uv#K`
zaY(r9(Zy-I7u!v$yc#C6MLt`tS93-Fy-!9NSz3x~M7|e_e)GHB=LD~IB-CoX`m7dn
zqa~0ph&}4^QlnP`rE~DxIOG;`Z8)eBQ@J#Y-)ySqp|S|^ewAhxw>iD#JCe6QePUZ2
zq0`(yr2onb1UooD@SKbbo>KoQqCm3zsA-b{9FnNCc;y8)G-tO6Z8<e-R(4*JL$%QK
zaJemq%J6H}xH-An{4AUMeY@(SRO`KF60a^j3@Ly4FrfQo%MZ5gp6N1H{BOe7C!{v(
zRCc8-AU&9$yH9#+(}v6!J-3xFM{3DFw_8$SdxYQdqx7?795tr0)7zI^J(LsOCEpU}
z`zfto#{b=eI<Hf)*V2rWMN2}O-gmd14>d`St_zgxzFTjX!P&6Bb6UXS?*{h8B^jEP
zw?)77g|~{Fy+0V=yU@VX9@?PZZf%=hz-ck*(XDcsO0L$(wH?#yd=1LKnU1e~-mz?t
zx_H(xixl7Or>mkSguRsh5&bAgWzJQ{-bovZ6dv&$-r;;}<3pTS=5Vc3`2<C`sUZBB
zG=;Cjh}M&Nd$I{gTw@3mP%~Il?`M3sC@5qG$J?xkOcCvDJ@)V`$%kva1<F1xJ73>u
z5L!C-J1+E?dwtRDg({HKOBq~oIbd4P&(Hm=Pq@}hnGi{c<kj>M63G%M{!+p&ia&ej
zT{%lj_qjV~=M;v2IUdrXc|c)K_v=Mh{lk~8o3q$Nd|-dGk2U{&_WZKrTZ%Z^CQF=K
z`SzT7_5AVYXD6~~mlu`Bi%svnVJ2&K>HVYp!%LrDn)4{=z2&t>K78!?H|HCDySSm@
z$=jn1vE0>l&!#rXhIVhc(atHXcDZG(j_bRf!qHiJiYc1?2^IsZQ@Eq>hgHvo|7@L{
zC9TSi-`1zkC(oXHxpzuh_>sXr)7H#HgJbpfirPY=^(nI3;u6C}U&I|)<}ki~mF`(d
ze`3&derH3S<m-!0<Pdl~By%LYisKhJH|RtSEJjvnUYo3DWOcqobIuGHnKLS$3O#SR
ziR+Mgi|lYNdsdK4AUN8J;MbMhCdAB2)(~PXVqNFcek!i$%*}U2t&VTA=iS~Db3N%2
z4|fG$W6gz^$}gw%eDC`?{s~VA%-hsR5n%<cgk9|qJ*R0^;!E!ZPK<x9bmz>w)f}(y
z#b3(x=|2B3&Xe`-%uLeLReqWtHs*QjoLfcs=I911FYG#*+x4b$WA-jx)*z*)6JvaB
ziHD5m&%T>)b6ELisFjAJXz1e2uk2pNC|#81T2>S*ldRuTab4ldK|3YAq?;$hPrg*{
zPu!TP`B?D!S{;$SV)JKcMf<LZ`gkPA>AXSsKDRUbq^C5CrJ1Gs8H)dO*yVenUuTL^
z_~(wzk?S;nsfBR$y-eaR*e$QX9-gFX_`StEb?^1l@l)pHULgg&dtUq*Z<}zh?1VMH
zSEW&!eS$`#baABj2~WcZcRwj1Gv}7O;j|{qT<y@zjT=7+HwlMh$KiTXBXnW9{(P)B
zI3GfNNKwx~9kNZv{#R2`|AOKj23r4gI_jUA!`~>Xh-m%unW%rho!UPSBzbr(MaJO4
z@!;6m*>RtNXPtN7%%Ud3!|Pl)+yc}XC75GC(<TpRYZz@fj3ggYxPILp3%Juz216pv
z@JGLRHY!{Vk);s;Z^GyVlK$K%CLdHshHn=S%+ncQ6g{XM2%SPyLxWm+xcT6{pe`2w
z`*th&pm|d#7lr|O2jM3^N+$d%lNW1HNEDO&1D%I%Ur^^C7i7nMA9D4gli_(j)Tlu~
zJatmX@NYr*eTRdb+IPFvcyGXXlAyjwlc>=zXExTjx=0U753<*G$Oo1U3J!4qd$0vP
zKsxb^e%A%C1|CDO=qh+giMlBKUuI041BT=PGlw2|>s+jnM+6K_9CZWn{=e_?k<(oH
zVAbO`P%@WkP_{oxF#M@k1Z(6mG#eBA|2%#{K6GBcU-}ymM*$Fx9$EsLPg0*hBmCxI
zI9vIfYRJZ|t4o2QXMv>AL;HYus1H4)zm^nFCXrK};{U>M1!&wvK^zXb_&xeL!C$El
zJw_m+wnTr=KYcUF2VeU*!6^*rmH-1r58e-{slN_BEbWn-yySy>j&C?M7j*g-{Lq89
zK$3vo!Ix3j!1EdNpL&CytN}NV9^66=YjDkA62XcH=R*E4r9tpq$4DDja>`rP6R#qt
zP<`-24=$*UH8_Q)V2LFp|AX-ys$vn-!5W-GSFi@x=iT|C4XCyN0OU6I=$EC7HTYO<
zL8oHK<<ghyv=rG-*HMh#s)sfD7-ua?d-NNdh<lOUiWw**axZxFQ!>CBeJt&!@B$0;
zbR_yv*O(peSo)X4&;p<}=;4nT(lh*TL&B2$i77dpJTQC?xJC5v@+OQ7kD>4RckZoR
z4#Hul5Kg`sBg4y57tZt?*8@nZx&?%Tl%|h<$`)9|Qz|75zdnU%9GM1-=Xh{sXaF{A
zEP%19V@4qO+xkNfU@V*cxxw5a9t0EwAV{tD=*MD*1wd)D!<$^{GIAHav~&PQ7Xp`q
z6ugdpJ@!}#WAzj9^?%XPW76NHAHcYHU<3_e<%k7A$pk7lMQ+1+#n)5b0)!I<M8bM3
z2x9`to#>(;py@?)MivvYgCKGUuMKuj13{U@K$*~7bl|ZdFq8?)+8WmiokV(3B*Vg`
zFgg+Nr?W0t5SVj;1v0m+LUkpG3F&c&1}S!990bF#7dPTtydZ422;nXo#LNQ=1Ua-A
z-d95U%byT{G*HwG^zd@QGLGhNA1$APa1aAQg9!U#fsD1j;XnUn)ofpMRcIlI>H&B_
z<ZyfRbN9mnp}`5(te6Q*olPC4H-H%!jCnb>E&8AfSi3H07@C`~AZB1N9B<=0R(B*o
z;-wIp@n$R-N{hE3;9Y`g`K~~&ifMen%^rw-A+j6u?c72?%<x8z7EbYnm=@&a(0#y;
z@)#7z!EeXH8Ecm#i|k0GV21bbr|ylD4vQ^DO65NQ5_0A=`ss%;f+RBnrSI*FvGH9f
zMvBb_rZ$2AHAZpZPfx<JpvGE{h8OgAcL^T;PhJF<zqrrs;d^k%W01RnJBSF!e4iq*
z;Aq*=NMBnGXJ>E~)TOCs+8o3Un21EJ#vtNw+jcR7IqH|R;Pe{ykv=3HqQ5tugo?Sb
zk~FhX6!64Qp}@ljMuIHBP~rn?ocXA6jA)J%r06r$5S-?K$Rh=#UmSe{A_Y7IiUiH1
zC5Ja7h93g@i?+ySMutTmp|$lOxnpJ*Zm%w>76%`;gohkwavUwW{*lKp`33<R{{Hx2
zY$ItByT`@J0gFCN9-5!DB!+N?dbeWZII3*v-vfa~5hpp$j7)}bhK`<*KIPOc!d`yK
ziWZok3NU&!KO8v>;0&P{!3A!trFl=E3d?MmpJ&|UIC@7J#WD6kYDB2>6C2&&`)~>l
z7cGv%A(arLUtJ*sI3o{UVhir9Ljo(}{@p+s&_JB$82}o2Q4=}urq0n7o6ZY2V1{e~
z487J&zQO>|7z@G*Io3U2LplOTvq2ZoNUD`gB4I=w5|ZxQ*8)ltXapL`u$loRJ$MM+
zi(riR!DD8_KKq`YR}9|X6k<;_()3yekPL>q6d>w=B|SxFI~Hp|noBWHk~f(|!jRsL
z_KWUcKzc5qdT5^BHZXuRWV6GzgvFC4+q4UZfFB!3Q=*ad?=Xpk!PCjFi|b23dX*F!
zVbQ`Q5=JPxbH}R{pMWRi<OCg2`95F(33}?onuM4w_EEwtv+rx7VUh#{$)V~y7=ju(
z5yf6FyrZ=v&cJ%nGMyai%4>$8Mjy7oQi=s{Qdq=bs&YUD(E^0t=9CG~KOqdoQac6;
zLo0eio+;b}uBzZH1`Xx=nIWi=;1JuNKgf6F&Ijj*q(0D4NBbFoLe{{c&Q>IU%yjgW
z`S|u<{IG{N$KjBwoYAl1I|EQ-)?948F#j0YfY_A<_&>-PkNM_9-8Myb8hf(FsvwqT
zJlkE^)(bL38WEwvR`D?phM^l%S6#M7UKCKF;Or=DD;VJHPb4O)M+_iQUxd>Nqm;cs
z5pRJbL~}L=lH3e{{RziJvFB{n(xlUVz?l<;82dyR1oQVml#$l5bymT8-~)gKf#X#l
zqaHY1^8yCI{%rOTuZYcBYrOknX^>+p$PtYuBf$XL*zk;oAYZSSnotk=h%A<9v|G^S
zmF`&^iP2#5LGUN|IAa8A13we^JwcLNC?v@t!vGqYS!3DSw~|kxn*nV+1=>^D{{s!f
z*f`51@kq*<2&)-dl67!bhHgoc^M<iRfAcJ`7X{wRK~pqPI#~pXO1jYuhTp+Lv~kF^
zu|#Qh#<gHRz%^08X{h`^a2T?Di*q!M2CbYA@<elYSB(L<KeGH|demLl#a_onNM+~?
z@FtolVcyhW01k<O$9NNL6MuQ9F(DZ6vO$_?Jk?bU;8_Mb`T7&#9E9XS2%xp&%L!HA
zfYcNq9q_bJ{E6u@fHziI5FdseDde#F#_$7!sUXl*D8Onx1^}rrh^3&meO~x=z}`7P
z)kYzj8Zv;0j!n>=)5#Avh&kV{ECvPr0GU)B6y!W(1|Z3_X2g?H*VN1_*XOhXo9jTZ
zx+u&`(71?hv!~7`mTWb|jAly$qj+Ex4LaG9c~E_C??4(gHiHt0g~GsPA7m=@QJkKz
zVE~j&x?>*sqAuVsbMFs$1D{`^F2(=_yJ`(Xu%jW<7))%JAgUO1QXImxdPvTpaV1=s
z#2wu`xM1V94hqO=!`w>1ss)GNW4;?37{W!lzA-FgDV62-ZxfKdxRNlxMq^-cxF{cn
zfd6D8MTh=0Vn2w3qCUmltLnTa0?Yegn$gH}Nem%lPB9kGJ2%LGLUtN+D3CKZGKow!
z$yms{Dwoag1D-8mM~~*Yelr8e)Eu%w0311vKJrNJB@;x${q@0)32@wxMpoYTe<BZE
z(!xf5_te7W7)bjfg|r9ZvOV3t@=p*!@E;13praCOTWOxGi|9@)I}JQ9nTo?1qjXz1
ziUDL)2oECmaQ?e;^DfI%XanetkmNu^o5V5%jk4#FzYO1`_or@GcU0A^SAwjcz`h*{
zUB-Ob2@F8flsA@sKago!_Z`?)fGmjV7-Sr7bt(hcWUB=k+gRXt`E#RofTFno^H72_
z=DT%>A@EUS79E-C;jqpO@BgQj1G#~1{MGT~5STVM7#JG8F`EJOzla@+cMXX(%@M$R
z3#?se^tVU<Lv)ONg2nr$Ur3P{vY&+Nq%mJNB&z5(ag?D^lROspUQ)WHCV(GHfq&`5
ze~OR6|HRX~ayuX#L=HYI$8Zl6on!!?np+>%#UZVr;oXnSj`o}Z0!W0F9ICg*eD8|?
zPXb1=X@4Ujq4QQevNeqX8Q6{?09sR*FhBxob2IuX^pMM6g=97S2`<<%#pCT;3Sq`^
zAz+ATA|%c-NyMl#7z*D+|4xMX2k1@#l6Vi3u^J@_`*REsLE94yonX2Q{eMQ60jy(p
zNfZ^a7wDqG*PlotIumIh=r2Q!e4oLQJ$!rvNi@&*(X~+vFEU2?@c1qef>NCJcMfRG
zL27aZK~q+tm<VAW#FFSuz&!V_v~4Lk1Bh{8An5Iz+GVEMLJ)_~7Du&U?5z{)-kOpZ
zz#h_xQ4htY+f}APq3nzV?_gk?q4m<OQsDT8{2>~(s*-8cAzi1%>w!#xlP>@@90ZKs
zs=lgb8g;m;j~48B_t#RlLA28W8V##m^MAr3btEHiERn|>3YCqIk$x8D;Azl1)!165
zVSmpoEq2c=f7g!8Z5$X5dZ#)Es?h0J>;L$bG1fVHn_l0?l}KHcSLjuoMHoh2azO)Y
z*E0<~5@if~dFsF?#l*`e0WflJ6b;<cz%(#oxR!8Z2ww2qOu)E$qxtQ?sUQGW22rE;
zZ1zy7#H6T4IHp;nw4qgd=OsYC2d0GHLl`tMjXWllp`~C4HnV9XU9IkbxY5|*cbUc>
z%Qe}eIo4gC4mxYH7qB});^_U0{5__zVMRcMy~-oN7cR(Qdrir{mMuqs>1Pl(pksI~
zsC!~^y3v*;ie0?3ZE^eU9$@_oOgS3e<pI;^sNj*-r1vBZ&VxD)+)SWA9kou~gX&er
zc^}FNVJ^i>O`58;0qGt{TLXp0`<NLt9WT6FfF{ue<MyNPuaf=i0q!XU+zr?@Fv%P?
z98pT;ksv_Tz)WhPxI5U%44jTXJl90aL7HiHS1$#?qZEJ(x|jhphN@Volfu^39?d3Q
z<n9d-K+zmtg8+bWf&PAw4qK!er`&Eg1E3Iah(2T3@QNA0A*<95f+AdOOzkBP-$4o%
zCj-6+jd}VF)0n<QsGGpXG}&Bx2OJ$vnS#%xcg$c8C#sB~M+-LQ-SFNiNIwi@yM&I5
zA9XW@N%Z!HYC9;3hcaiZVp6H&JRMTNXbb?OLGhoM0oC_$CVE3Y^0(?z4<ynSJXwL<
zztjX!bXd#+o|kd8)o_K9YoweTnvr44_ha7u8;JKY1wBHe9{9oxDhQT@_a_Z`1#Hx?
zmb<cSz$bEb7#$UR_c4PyWGp5`l838@GmSfiKiwB_Oax{j<v<n{zwKuR_K#;5MgD{x
zoYr#5K5_+icS8mW9V2>tX9gE$b*vI&%lQV^f&EY+g4+V%Xkfix%m9;hT*C&o4fOkj
zD6<{~@P`3rfQL6)T0}1|f-}4kiVb`+yZo2~051T2Mn}bwxbaL_ktW{RljM(ghIdeg
zWR8t|@nPR%q-~Nuu#84_7|#syP`kC^N`;}A6dT!d{re}bfV>iTMjt2iK*0p#o`b@g
zu%SD?>#Y3%&`41R8oGG`GtfxGM1l*MepC0Cev9R+k^vg&$Bf<ysKTvV#<{i(9J+8r
z7xp++v8pYA?FDS3u}z_rk8x}pMU$c1EU*z7%Bs;iN=O{^DRc*H77D&~r!a?&Mx}M{
zsKkR9YXXM|A@d=%fC?TLPh$pqs4oU|%XP6)L=!=M%JuBWe@D`Ce!x09ciPXx3_NwQ
zTfq`WO9*-Ulgm|L;fkJy!`Y#Pa2t{Uj88tM5JZRU-cg#mFgPSO??I|sE<raFG#N<{
z-~aby$WSLE?CHdgi%^%)3kQm5GA6;b&;Onbj6;_8rO7t$K{E|!kdt8|{V&MCsQ6>A
zQ@R-dtGp9j4?;_$QsG~av7Gv(+;<W;^Mgq#m`zT`1+{-ch8%S=zJ|YQ#et>xPbDX#
z1XjuaUN_{alkxNDx0s*csqarACqv2fUyz|dos9Y4Y+AoVX~zNRxr5e?OIH7a3`Oc>
zq*sRgybY3IhtnA}8EWhQ1sN--laX`hTpn`!A{DH~9_2;%dox1@dNU~s%lMxz%&Q0_
z2rDqI(k^<RFy}a|DGy*xLDQk_%M=~x*nB9bHsr@4d+q`aNwNB!+?0D>2E|;sehNA^
z`7=WY)ksQos4F#1d1!R2DX4&YEEgh|#|9EJbo^~~lfhWt^nEUb2!ijp$wf}bQYhp2
z?|p|1#`?B&b@$vpSY}oD$mzHn`A_J;Sm1QqdakFz0(T8+hR}LyzW1Ndfw96>ue(lo
z3Uu6{po4VapU{D^#5EM%6FU!1ef4B=c|6YiCv;$}aRahm83qsu_DGS_A)ND1=)hRy
z5)&UxJOI9QE7Yc<^`qzXKcNF-l~ZZ*6?z8xkxHQ-GtU1LIxv<wL;lC^s^CAw;o>=3
z9-)>0gbs{#t|H^{4rB1?#uV$ER_(u_V;P1&wZHAc{{U#14%-E^JoxJW2^|>zly&Ld
z=}BO>tQ2;;x%r>af#FZZ46Qwvf_@}{?V{zezwMvUf#FXB63qFR108!Q=rHd1Cv;%=
z(`wQ-NfU@pTV|8XgX8%>p##I8erk6V+zj&IrjSR+hkrr`hCdZ<$=Ip@Tc}{TV}RC=
z&fb4Q2ZlfOXnRz93hYIJ!d?y!{u4Sd{OQ@U_=9FZ2Ok9;t*k8nARb$W;ZKEcY<!By
z;tcGf(DQPN<6qDri{Vel<=Uu@gMIB%5pp_+y#Is_41apwKhTB?*4qe*IJsZspU{Ef
zPc4@E-{OJw#S#)Q=y};I@lWW$@Tbzf?b<uQe<)I{`;u^0`rq#xWHJ0{nfLqldmxYf
z6!Dmx!atz{!=IKA#!vGFdwC&BJ}-%C|AY<<f4b%5&tKNyKlXu7Me9e5;Xk1R!=Lu6
zSF?Eo4N=g`0!@dT**~EJ!=HB72B+G9ewaa~5KYHg`+q_QhCfZ;wju@T4gHhCudj6a
z7j!Jg@TX}vW{u~Cd2yUgE{_h^e?kX_KfMyZU0EFRFi1TgdS15pGD8RXfw<^!KR$|w
zF3Br6e>N={MEZDiz}{gkDnBOa&kP+DhkA5prndf+|AI8nSqE7mG$oECW+?e<Mo1p(
zCdbE#2M9>7s)ZDk><a!zlwhoOoV?Q)BdvqiQ&5t-^&e4!vEEIKXo{gOle;_r1tqf5
zShM34nrw_TC7un@h$Bj4Kkj0NlD}s#X%sBp{vx#zF=Hhl$Qeb<%iYWn^Y`?!=*a7+
z)briP4(?td2LwT|jB`g3bQp@I8IMaCAjksm<A%}eBSQ2MJ5=G}bRc3vQ{}nmA5n!A
z?or8wW8F@XMak-U0%KGW14$#7NXAz3O7nEiD1(XE3k$F|3P3)QDS)9$Ae!Y}_XXc-
zBE`c$Kq1kPj{BK|L<%oyLR!x4U4gXTZ2?DxhIBf}6y#9dEKSIUCn=|(AQ)!^!bL;=
zNM#O^;P-pI!0MEEJDlARDb!1tKwb%{m%$XI5s~N_=u4ALo^4!Ba4iSt32f@1^hf6~
zQ<#>-K!0c2vzc<Y^hrD5alv5(8Z$VXDNGy1-#lWM(w<1!JQGfza7cnm7sY4oQKm45
z>$n1F3OAru+yi=Z;E=9BXwZ}S%z*|5_!4|vXo8+rGudH671ZxIQ=q@AhG~N4D&*bN
zfhp~W6;lr--sOc%fg(3_JbVIaE7FRMc3$tnB{)LFk4F7?iYe5g7n`ATB~4!UMMdt)
z1Jo;!V??7`f+uEV{rm0HM_$^diFzV>h2d<_qpu)keUyZK&ohPkryh_d>`9L}0Xu+I
z1G_=Pj=RJZ>{!nWI|z)Yi426K>$Cw@1LTap_0@ERDcI2<gC@Ir)f1k51mlUMz>TkB
z3KzvLb~n5Fu5EKK0j@R7t`TZ>`>rvCJ9e{1lVhDVoE9n|=?35!jl86mDP#(cv7&6(
zu-IK%fP9+*`FY)cgp9H0IoQE_0k)pFo3H?(Ydy0Ym_sIvdA^yZxaU7RbUOi<Mh@al
zP!qkUi799@=P_JqM?G-wX1VkFFesTQu#Ud<mEO!0ww4zG?>~C;iYDVPDi5a2fz`o!
z7CHF2`%Hn8`D&USQkJJ$o=4hsrGn(qoLfF(3Y@HboF?aNHGWnzK;%zh%F*CbkP=~H
zy?}aZ3ZY{eSxMfpXUO$0IoKbd!7n`h@4zwaOmjDW-XQ=lgvA4W*KXPiroe~2I0f_6
z)m?k})io;tJ%s{&@oT2gshS#=;B5pnW<s?*&IY_2n)hdK|3h>P$#-rajBp2Zey}(+
zx^wq`h>nrTAvK3=LV9F4Qt+<-=|4orIIm!NdUSFjpf^zP{-%d1bn^QPG_73@AAE8a
zxEkbA5V}VSFNAJPSo`n0>RxbJkj&*#SNl_4w^yrzyIBDik0ziHD)N{hfV$daZ?(2_
zR{C1PnYSFAH!Gu-IIo|K5inXyPn}i%SF`jbIdQoB#pJhXB_^{n#Of##cJFZ4tb9c%
z9K<0N^O`8Ws%HN`XjmSkR`Q4j4kl6w)(!MT=D{%sBNK_{?oYEP6G*%063{QBjLj`A
z>6^4t5g7IWhSA-2#GzH<e@XzB432-C+zG{axD_A+7nIDO&Ht}Su=Ieow1mG2Wqa4k
zm}r<4MaY+XpeULm_McPqr{iicHL|c0jZnWg=964ZFImVdJw$(s7BZ{&j?6%=2=&7}
zXpI>dy1p?ww2k7>;SJo78OEY+)=s`64J<I>MGz`#qX1o?k2!sM_nVhLo7}%ZCaUi&
z6o46xnopjRdLYLrB)qxgIduQ{FPJCaXyr@>O+r$)=<JY(CZm`mcl-W8Vj0w%qcg^d
zz`|Gs#SMBW*}m3h5OnOd+&{R~XLS2YnaiRO4E%sZ4SGAj!|1<2#o|_OL9YkYY~bd?
zajYSV+d1Y8;*#Cl{0qYcyjIhYdfs`W<d1S*wxSEzMp2L8h56=W&dk&G(J+e^+~kj1
z2Cb)S_+f6a`?StJpt67m0B%Dqjx0)W>)q%A7@;3)X3kX`j!S`=ISF=-2Ds<V7yw2D
z%u#gYwlQSr?7^bZZ$aMjqYGdt*s=tdh<VXLViAiY@}{#f9Q30hwr!ycVssX;#8iIZ
z7GDhbrP;uRJZc_dBj|$A!h3lQU17(bYd>{P94}xP3zK7PPNWNCm<^hb{v2gfCb9uW
z3}B#po%LkWg)zG4!)9c+l|pSMC~YKI1scThI9(vWLv5NbT9)kRlGz2WYz<V*p+TIW
z2P++m(^$R2n)cTB(>-=W)Rh9}hXye{%Qy&zg-o#hdI3()aEhS9Xb`oFbb*XjUo1{0
zOFG3nfViq*Lx2WRzREZV1}E1CXY7R@4@3J+MU<5cUZV>HWhGdw4Cq<B-UKm_9ZU=w
z#jchK6bxPlHSfN@2`h)&B61Xkn@pf!?9e$@8D}kmxWf;$7|n}2oUziY#c)#c`;s~J
zW#1?9V3HI_EEJ3qjne;^E)@OWk1hT-OzJ4EgBQ5q&NdDb8)PWEJLy6}`7f;5zhWJb
z37sZzlR%l#ybL~L0tI9C`R`r)d=E5O6p+v;PSBWuj(M?B{5>P4L-hjGC03B{e?%V;
zmQqM8<0WG#mT(%0^}wLu)aBz&0WW><L-S(vnr@V#4vab;Ua03g$8J(}<|%r>^%I-{
zX!8n`?K{1p3kAKhU`@Zp;Wb8GAg*FCO*BjboIuhsF=Q|p^Y5|3G-DlbQwCawhIt4t
zq%jVIVg7`RcT-jX1Phoy8s;$cMWX`-y;5QcZARhk@69kT;e6yU>fh*sL0*>)aQ64`
zCE0jmulqz<kK2JDv?6dbXl_ErO`wMx)Izoli<<=Xu&>RqZPHvx{$QppD_t<7DnK(<
z>R_w=Rs^cn4bdw=jrsP?q6-JTn#p4E(>%xe0~8A5?!x+y#>p383I{`{13gdpz$O~!
z2FixU!Ovp~2Scf^ZTJ*_0o33itj}nif%$ad*eL!kb<iQ;NrC=^0P5azTk(#pdXU>}
zh-a0?%nlAG0uRqKVLVt96tXy85^iweZi5M-fovDk1!SYB=|yz*gnnI!N;pB1fI3H3
z@0$cx1IS9SQ#4S@5;}o?uR4F(7VF~Pt~Y_{`3TV<IyG!BPZtn{31P`@^2hcstsuMa
zz!n;5hBA{#80yV?dR!LL!6p&R2#sU~MH6(W10_!w3Vw0NrY>%f-ggS=UDad~3F8Rm
zo@QxH1@M$W!IP>UlSmksI@<BmrI2|-d^cKpPDV^3VO-l#@Fgrqo(<@PJrx=$$CODV
zjEfnmjhT{g(-8NZLie8AFo}e5^+IChas%Y$bU4={<7v4)lSmksE4FhRsa1fpV}q~}
zExo$6bRmu1_R?Jb_LjZ%E(M<AK-1CBes-^;3+Yb?{Kpw#ISKK@o4t_kh|s!@3~Cyl
zSttxIapeu)d|u$H5f(!93!_J!=z^m35{g)CSzTfwK)W>DCJHPu0@GL+d}-`>t+N|&
z?m=9P=4-zjU07t1<WQ~(W8pm(8o18^GPzOn$g$$!B~Us%twF%ZS>|t4?3i-R%X&^1
zu&QvtL-S=DL>JZ{EgV^Tv7fK&IwduJJ$R;hkhelVWhw^uhw0!8-fF-HdXb>!Yp50I
za06n0>TCU{M@t;4!H|(F1!%A@+vx&B@0LfnqYm~)IBC{<(8PRLN7PZF(t<F$z^Kj`
zmfk;UwA2|7ULzAcJQ{6##Q%YYq4{q;UB7aJhWJwO_A%!FK*L!3N#bmRjWA_MVWI{~
zl78`Yp;6ZnEKz<CRNV~?sc}sda7BCnA2<wIddQ`AKLxmE3b=3Z)C<!VAc`SO+m}8I
zioviW!I5a9glUjW7aW<>GV@37fgo>1P&WhXs9>&SFatpd2+(+*hv>q?FaxaFyZ=mT
z&pyCgK!N9*{eR(MOrM=Zo#c6#z8zo=S}1u2<kE%r=d@_Vo&4nmRc_x!?kWKI4VYYo
z0z8yQ7a&<;QPdjVyP`RTk0!|vv;&eVprR2?^65hS!{V_2MBcR-VV1hmB;^QAK%Un*
z0V{(JipR79x)4Vr24tBN9qCbTh4*(OU?{3->A_ofz=OKNRc~Ds=6R^$qr(pWta_ud
z*YDK`d#SCqK9_I}7<~*DsfPj`UqTlsnKceYn!o=W_A3PD%}<XY4??EFVu40gIZGGn
z*nn0PwI~Abn}VrN>g2eT5Trphaz7Y-5Pti@e}RhS5%d=Morfl0xFAp_H12^b{|PRJ
zXTY84h(Ru+z@=8QO6%k*x^T&qcvyM0H<6IMvx|*KfCmZdHdRa8O1o<S%?@jdF-ol*
zuF(ZeMVG;dq2;<4_zIf&lxHXXejp8$k-B;l6m(_{UC?A2t-Z+?nngnz=TA9{C5hlm
zUBlSw%*)gOdpSrPUGOV+<Nw1(>RN`%cd)_pW7m(10C2ccMF#$<jxKPFDCLhgp;fMy
z@+rWeAEaFb1fV(ZsizB^`YJmz)gwy=b+Ie9t*?ZR`nUqnHZ-_<BVFM1Xd9MwZ;q^L
z4Tdmu-5m0F3Gd&g3!F^fM&p^W3nR7%*Prhv2xTF-X2^(Iq4fP0^u?!R*`OOAO9J7G
zj>rjt(k+CXIhum<$Nw<}7@n>%<5~rBa|jML$SAOX`X5t(5!HUbubPPibOVsVYSb*$
zchN-wb^SN<_wa^ppFxD7-k-m(Szzmep7pI_b(jebNC?=WsIYiV7Zrb5SAQ?H0Tu+m
zKxl7`b@=E~HMnLrOb0i(U^E&0@BjxLDmh~Azf}|3uns>4=MmuT5fA{K-Q5Y!o&=Y_
z1gfq4+~RN#8+RV8a}7!w72R}^!KgIG8VFW>s3?k%d!K0$0xt&mKvuzj`1!)I2d|9{
z(KA<p!B3b?Ug9>ZhrSVM*3n<`^LmOrkA<wE%TWYZ4AM6|%$N_dY-07PJ@(4>EwWf4
zsaiCG#kh$yRAf{nNH7rKj`ze;!mEdiC%{lR7qCb)!U`7p5R5#0;H5=8<{5ihFbf|K
z*nBqZ^w9NT=^XSSjPfv6b;eFKi?lc^wEV^i04L}Y9-e9RVOYW;6oF*xkN3r_XvB$~
zh(qqhSwKjxh??$G&=U;XUPmY6w>F9D(Gb^yWk!7);Phm|V)7%xJZ}0>hFSTWYT+LA
z3xa*)R#BYP1ViyHJ=~DvU`@`G(`%BDcRC=kOO}^!5@!+#V}X-tl1<J9b3wXIpicn8
z7c+^3v5*ztK3Js;JRt|UXrz5oOd?^Nb6J_XDHj7$9;h}NX@xYCNEqi_3+Gy=B7GJP
zfb`J$WGh)Fkz}xRLg(S551AmlC}>=ZPVsJ&qYq2NDFAsYhD3+qp2}}E?f`?`49uyc
z3^zuJKCn?^5;Y-^keihRA1sf`A6b7JslgM13DZEKwJ6hvMwK-zNp5G`TT=-$rVrb7
zG~6Y%{|64k#Bi*t-&jG8$UzYr?t>P6aAUl=B?(q1ycf}jV1sdbxV0yH^>tW0WT2=;
z3nfe^ZTjF)`XTz)*id|C%tNT|#?6A*P#Xo9Vn81t27lP$==)8DI3z4T2e4?!U{m@a
zF?qyNnxD10F$iQ81>{5X{}&QNaSreX$4CHNKj<l%OEs(i7ZSrs|6*OIum<$h7%UMD
z*}nS!g~agIIp)nrLV?Rv3iZif^Z!C(xb2psw|}e!E^R5eOo0<S`WN!wvCmi&5yhxe
z5c$0QTN<d(L-0E~C?j!qW(0DKTm2mx>5~ZF)Uy{XI|o+vLkL;JOP=@LNMI6kIBK<W
zhpZ9Cv%irc0)fc+5>oAqPBwRWGYM+z?*ThPTA()-&K`$XW^vGLf$T=mq5%3pN8(Il
zyq7D{-<vSfjpr{r!SmDgFCa%2a-dCysA=6CNFOlT5g8HP-0)6b1byUfc}o(A8Dnmr
za42Ms2Vf)@YJ>uo-bf!XhSP=aE#5>D5P<cPb@F=)0pz>{xrC2KKCy{DWa=yrmp0Sl
znax90EEG_efZ3vRzb=~@K^|j676i9IFZ@VnAZ%0G@GJW}QuRCs7)R%R*FqUQJsyL4
zgktF)NOB==^s)4C^TB&jH)DL~i3%d%UI67rWAEDf|6u?2UNl>5s5W|K9Rut+6xadV
z>BAnL>@gxAO2POC`jR|A&uJO8>b6?Z6!0VwkdClKsrZ2~`mixn9EmGL|NL)Oc+UXp
zf}denWONl6UjXYbnt<Xc`Us$4ex#TKc}^Qoa(1Wf*1mc1o+$u@N2)ljQ4;9cO&<Y&
zxbznt8#z)+U~Jffm0=P?ks!2(776gm>hCx;NRi_1@wd-)5f5N}$c4-{x)_W=|Da>|
zp;1L{^EqT<6e#d?m`C)ksQ_N9!8TkJ{p3(%g*7&(;^Q`nodYzs9TWx)mYKmk7)Ers
z?%b<8$eK3}0MTGP+027s#D&Jsw%)q}V7Dm5xH^Y<FpP*WyzYJSRZ#oM6n;M9DDz;W
zE(oTRgwb!bw`orP06?DyXmgahU(IJ8`p+rQ@EV7`uOX_GSU&_~zYjHI;wX64LR#<!
z0Yo2kiwi6pmOzc_TS{wG-`}r&`r`eekYdP+v4&lS8ulzB!+L->4kUSaQFw`!RZq^&
z1D%5xm&xjD*vc3n`_K4DF+0%*Tli1y4_8?M))$z6bYQdpEHik2`bcXLT?j@VPX2g*
zjQRmv>-`lKfQ%$1&}Td@=a@kr<y3U&rB;hTXuIf5_)9Fi==P_{;Xnl&P=P*N$pLe~
zc9mpm@<-m(_!k`sgRmRTM9Qn$zXvjo02%fuwK{q6KO+M%nBiB8@mP<nKP)?Jji>{>
z=0?_5T=dF+Mu(}>1~|<43ng3fAI#JSO5o{UvQ+)}N(LxFc*YjH?@NW1$V2P<0R)|@
zKT*XXh>i!r3uAZqF}MF(6-+88Afa#b_+MiX#WK)|1g)B>hi=V65iLm0EgOF5yDu5n
z8N@LO^zuTsWYmE!C?36i2pGBvKXfQFsg?mC4WHm)RY2;AF=Q7ySAQ?UQx5#lP&_vn
zfI`$@`2A)JA`zovtX1mBlS<%dCP1O{+B@qQg!(I6c9E%b*#QUHW}vZ(Z!(BA#FjCE
z<W9s8;g8inNqV5*4G=S_1An96f(8b#h7=sB^@H6igc5ETZhhg3xy2m7)d~2ik3zwp
z+HWy{hD?|#Y?p|zL!@C^;q!l0Aon;Z(JY!6MGGSM`+K+$XrKw!-f`ms4=n@HiUx|e
znmY`jY5N3v)ARc1;a|4LmjQF{;D?6Oxz7L`BFf)>Lkk~()Lv1y>I43%GS$EpKLy-N
zxNJoCQi#CO!=1l~qC4W?r-N#0p@ccRjX}5(?r1;e8fr2@GZFxiax#4s;Oz$t0zwhj
z=#%h&i7-s1o);oF)UAO}G;G5|24Tth)CvqB5ixRQl|HlE1p)RB{Lq12+~fZfR+C8d
z8k%A1dh|FyRd+X_YJr^5shjyv7(^bCvoQpdUPF$Kim<W5^Tnt+Ui6d}wigry5#S}@
zk+6;;E-x;L_B#qpaZ+qN0~j0F2#~Y^36dgk&xN`K%T{kU<^iy!pfb8BE+V@a;$j4B
zM2^EtAa&4%54S}P0vOU(7p<q9FPH)y=J3x892ohg$XC42Edla1@QO|*N4)%hU`+@c
zt^5fD6VM#${K}kRH!TNXUzkxeu=(r%2iVlhg*Nb$<{L?fkG%yyG;rA4{|DF#E^P$j
zy;ga+Vss)`cr<&nGk_v{eRL|B=RH%vXtmOCMmp6|7k2ychcj>h3+2jWO<X^BGX(u-
zf5nJu=bc_r9}H`D6=WFDTTS0j|0Vix$7)B6$FzPXIbP?3;yEq~Dv00y0TmceY1u?=
zpFMLj4!1#&TozNuv(Z@PDLmv~X5zOjF!Fel^?1#Z`r_?C33^8Ir~U&fFcN&{8kekD
z4H~ITK}Fk)e?SFB=1(VoUfdK&y?uiUt3@bpf0mCH6~h-bu<v5#wn?p)1n$~_J4w{I
z0`q8%tK~%uARwDRV?0J-zRKYn)%h^uYxto@&Jv|H@+iev$>i$;iTi`WMfHKNkV4U%
z12@31V^AdMq!Jp8%~M}9nm3^khPHvQWC?2MO=7f$9xDzkvY*{j;cuJ*F`h7ab>t2S
zT4N)VM_;>%mi7sk`GN9D;6Ts~`ikXgAy5=TW9!S>sp-)~fPnCj3_@xpEr>C*I`V)X
z)<u@$H8oD*FtzOffv)i!RG|eyO-@*IvDM785~*`INrCZFonZ_N_qFtNyT1tN(o6WE
z`N-2^7z4vOeLrk=6x#6O6rti4U8^dkO$%deqoKc+F}2O}4M1`bNb@{&)!;dOS|C&>
z1UYwu3q{l;fEcZp_oHE2oM2keNH+~>Aq{I699hH7q0t*uv~K>1YC6SE1D>wK51lf)
zWI_vxDo<K8Z%3WkkaxZxTrAS25e=naMhj|;$yockKsIGKR;Cr6mzh614{wR!E`U0q
zPri^BOR+s8O(-lIY8x2$6RAyH3PBSZtjV5vFbrc#>YiJ%kt$f(I_AMJtV-*8_%r1B
zHKg+)nzPjP%!6U9?7{0-PI3b<q@o!OCgsdL7)E{9sW~cPrT_-l^2oA9<6M~s!>r7$
zS)BMm7vPWwF*H%j>1B6Xa5Sw<+lPd8T+}3fZ#9zTdkQw7g~AK+WEu~#ZY+nj;qLte
zq|j&)_+V`m;686!fV2&c=FNdeogMQnfxlNA<Oi`giOfU7PI%<PG_o7UJ`3EpBOw*q
z<l=&-lEY^NFb@y=Vfx??=ReO91A%{r-yD>{i#Ab#AC@!q#pZ$`i|DWaHFoAfRaa3Q
zM;l7fuqKx@70~BGWs1%;*cd9P2;(TJ5s_A?FT`Pay$2|g;$E6Emf5(J0s@AT8)ljo
z6qUH(#^Olj3ND$5Iig@z-}4rJocBAw-{Z}^;prcr@9%Esp5MLao(se-pn5Wt_gn!L
zXik`o&0d-1pR;H}Cvc9dSTU&rE7UU5Y>v`c9PcpLGb9+C3Je_nTt`0;S=Jk<<mXDe
z*?86uELz&<tf})wmd=u0n4vOf2I|R#FK1Py39O06*r=2V8X4G<3g2Jgk4gRw_`{sF
zVu8T2=c$v+I4QAsb{fjq4THjqwWH^U0xQ&F+jx;-A!WW5Qvi!cg?Ter)kgx1Y=bq0
zk4)>lq5iXDpy8faHy=h@vO=IKu8WN8;rZqH-N4+(m*Y0A6mixbJ2`5ajPuSqHLnJ!
znRr4c+$sSVYH<uv8MoZBuq}<J92M?Nx`+#pGRJ7|AI`lWF?k|d;Y}EuUcf4!p146k
z<;&Pcy3W1A4@v``pw%VX;p(lx@T=%kf!92%f?VGJmR{_W2jKHC#2onaS^?PH<(7fB
z7uQ8n28@4HPuOmq1hiNOzD|*Svj?UYpzC4f$mt2&Y!rdk(XRu%G5f%#foNVzmBWkN
zezO2<9vvnZc}ntkC2P?H1^9B{$_xpZ5<gwv*{<;zwDTlj6dq&1U*%)Y6o5_30osW(
zE@pI1r<1j7(K3A%9Dc3ADMVF247In4Zmx!uB_4eXz@)y-nXR$~rq%tYk)k)9ZO_fB
zqt{J}1MbJ3vrVqRRD!-JvRZ3i8&cTt^*BH&yAFq@Z55yn+ln<`oP12wnBeM+o9pTL
zR4a5%9?RvOCqNaeXwZA3>-NW%UwffGTVe5oQ|q<~R7W?OWQ>b4%}g+BYyen%eY$*(
zXQjY>PMx_^psH3<<Zd5%D$lPksB~<`m$lX8-2&C_dZ75z#u%-!u`+gjNnT|DTIwx4
zEXSVSBVe1GI0}N*3jOoV@b~h;llB6dW8eEm3u{fBp?|h*$hom8AEWSD_;T#|eFD}N
zeQ&i;SaURK?oh9*He5UgBuzyeTlB4fr412VXubX|@L!~kuD**(xP(s27ho^%7qHE(
zy>1+NhUxL{6uYt(U(OwHP~zIn%P8Y?MCV6Qo&vcqq{a1La~@Sd*=RU-`5_&y%b=9!
z7TsDyUAF??7r<9Oh2IO@W?k2AakQ5G>RxHMPf29F(aZRHaX_H}4#n+oO;w=pNi;5*
zmUa`*Nl{{)Tu>yCvCNVfWlprZb=J%~+Bc#EwDW!U5XiJs$H@<V6v!CA)-l(D!BHLd
z_NXf$F9w;faeEdEWQS*F^$1)%^oG#02kL<KLUr&p?r}d0XvO?eh@1;{@$G&U$>8F;
z11I*nUj(+31u~jO>f|pljXzSBit1>M5y+o=R*Aq4iBFD-jhTU7M~Uj1CVF|ata#9)
zPb}D!nwPUj9u?S56Ecpu#l#|kw#;78v40Ysknsk8ApR<!w#Nmw^Tg~pLnp(7{o*oS
z0+_s$K?)haI+qG?r7`VusX^CIS-mU1OF8JCXiiSgIw8<Cszqx7u}50njvCN$vz?nC
zd-igq09Scd>SwpPLm?U=ZM6-NW5Q7_l=X~9VLw|Y;9rloB$+7l2l8wg%{1m+^qK1~
zW)2_=8-yZo{)q~SPiwe}6K8O_6Tfxik+C<y9)Ri@!m6kJS%I%rJ#>?v+;_?c4ZU&)
z;Dr$30uko~f#y@1BP)%=i;@K{q(^3xGu~Szu&v6aK$69Tq-Xj9%eHuW?|?upzPtog
zzexfX+Y1hsCJ>?+7(;%qzQEa-)cVEtKEwrX;534&i#iVg+x@-dS|w@3JapXH;1h=G
zX@m$DD80}E0f*h!j$kR>8`tJIs)t?;cuto2mjnT3k;!((#3vc`>*$%<^yrnK)1oWi
zb<DpkD1=1E!`lu@K;*sBWnD}wzh`e>PZ6Ay`<qK_tQI7ko5A{T7o|9}G<!rP>d7B6
ze7Da1svx1V(l#Gb-{T$sRd8|zG{|Cbjp5e>4L0DEy3%ir%9rC_qnnUxU^TeLoa?SM
znhahLoxr1bI(b|_%Di{L7iHKA9j-Czrl8^69QN5#f9g4XbnoFR)D<NW;Tos^YJrB+
zdbV7S*m>7ikc0IQJ(p{AsBM9U)1tMk@z^4d;bfxPLx-OpsJ|^}sQQ)iAJ!NHjrC`*
zh1IhudlcQ*%T+w?2rAAkVzX0@jd{%sQbGBjtSUxXXr-I0<o?|P6^F5Myl82d#Qf2R
z&fJ1Z5mfl~HYe{2Dymm*LsQao-EG;hvN^*JLxy$}_<@Vw_XHWW<8BC#vsrfiL0_|a
z-%s>@Fbhq?btcveI_l!swtXj<n?|SH(bfeI?dA@hVpVy{?h87qE|3ssiitIjHk%X7
zy6)`ugIA~1yY+hL@B<_x8U!6?#HgkeLuS#pWKYdKyrB|8BOvrD{wkl`MoCC|Av9R;
zGLLmNg)Mt$N)Xi@-69a6=-}72hk}$+1oleQlyZ2I&5@MbDSywOUFkiyze+3Ok)WmS
z4`PBsS!-CI?ic8sMF(gFvT|McSJ2Wbm(9<%g;(g7ZNIyJ^pnu*tkR2cYom6T)MZok
zb^S@AQ+Q@Mb&nsQH-?q30?U9Z_e`sN4#Q+Go4#gr&a6Fw&@6#wDAQbyOPpJ*Db%U6
Xt~-|P@oLd}aO<ge;WW5oVbkq@Il7wI


From 51949d412796cee33a0a71670742fdbc4d689131 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 23 Dec 2017 17:14:36 +0300
Subject: [PATCH 033/340] finished mavenize

---
 plugin/pom.xml | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index fe777eb9..030f83aa 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -89,12 +89,84 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-actionscript.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-ecmascript4.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-ecmascript6.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-javascript16.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-javascript17.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-javascript18.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-json.javascript.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-typescript.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-inspections</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-intentions</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
 			<version>1.1.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-debugger.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-v8.debugger.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>consulo.internal</groupId>
 			<artifactId>lib.org.chromium.sdk</artifactId>

From a501c971761e76bb73e1857ee9da579875d37c5e Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 25 Dec 2017 23:33:32 +0300
Subject: [PATCH 034/340] missed files

---
 .../lang/JavaScript16LanguageVersion.java     |   78 ++
 .../lang/lexer/JavaScript16Lexer.java         | 1207 +++++++++++++++++
 .../javascript/lang/lexer/javascript16.flex   |  165 +++
 3 files changed, 1450 insertions(+)
 create mode 100644 lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java
 create mode 100644 lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript16Lexer.java
 create mode 100644 lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/javascript16.flex

diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java
new file mode 100644
index 00000000..e2fb58fc
--- /dev/null
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2013-2015 must-be.org
+ *
+ * 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.
+ */
+
+package consulo.javascript.lang;
+
+import org.jetbrains.annotations.NotNull;
+import com.intellij.lexer.Lexer;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
+import com.intellij.openapi.util.Factory;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.javascript.lang.lexer.JavaScript16Lexer;
+
+/**
+ * @author VISTALL
+ * @since 11.12.2015
+ */
+public class JavaScript16LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
+{
+	private static final Factory<Lexer> ourLexerFactory = new Factory<Lexer>()
+	{
+		@Override
+		public Lexer create()
+		{
+			return new JavaScript16Lexer();
+		}
+	};
+
+	@NotNull
+	public static JavaScript16LanguageVersion getInstance()
+	{
+		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript16LanguageVersion.class);
+	}
+
+	public JavaScript16LanguageVersion()
+	{
+		super("JAVASCRIPT_1_6");
+	}
+
+	@NotNull
+	@Override
+	public String getPresentableName()
+	{
+		return "JavaScript 1.6";
+	}
+
+	@NotNull
+	@Override
+	public Lexer createLexer()
+	{
+		return ourLexerFactory.create();
+	}
+
+	@NotNull
+	@Override
+	public SyntaxHighlighter getSyntaxHighlighter()
+	{
+		return new JavaScriptHighlighter(ourLexerFactory);
+	}
+
+	@Override
+	public int getWeight()
+	{
+		return 10;
+	}
+}
\ No newline at end of file
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript16Lexer.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript16Lexer.java
new file mode 100644
index 00000000..f480e6ac
--- /dev/null
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript16Lexer.java
@@ -0,0 +1,1207 @@
+/* The following code was generated by JFlex 1.4.4 on 15.02.16 12:38 */
+
+package consulo.javascript.lang.lexer;
+
+import com.intellij.lexer.LexerBase;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.lang.javascript.JSTokenTypes;
+
+
+/**
+ * This class is a scanner generated by 
+ * <a href="http://www.jflex.de/">JFlex</a> 1.4.4
+ * on 15.02.16 12:38 from the specification file
+ * <tt>R:/_github.com/consulo/consulo-javascript/javascript16-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript16.flex</tt>
+ */
+public class JavaScript16Lexer extends LexerBase {
+  /** initial size of the lookahead buffer */
+  private static final int ZZ_BUFFERSIZE = 16384;
+
+  /** lexical states */
+  public static final int DIV_OR_GT = 2;
+  public static final int YYINITIAL = 0;
+
+  /**
+   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+   *                  at the beginning of a line
+   * l is of the form l = 2*k, k a non negative integer
+   */
+  private static final int ZZ_LEXSTATE[] = { 
+     0,  0,  1, 1
+  };
+
+  /** 
+   * Translates characters to character classes
+   */
+  private static final String ZZ_CMAP_PACKED = 
+    "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\54"+
+    "\1\21\1\0\1\4\1\63\1\60\1\17\1\64\1\65\1\7\1\55"+
+    "\1\71\1\15\1\13\1\6\1\11\7\1\2\1\1\74\1\70\1\56"+
+    "\1\53\1\57\1\73\1\0\4\2\1\14\1\2\21\4\1\12\2\4"+
+    "\1\22\1\20\1\23\1\62\1\4\1\0\1\33\1\41\1\43\1\37"+
+    "\1\31\1\32\1\52\1\44\1\40\1\4\1\42\1\34\1\24\1\36"+
+    "\1\45\1\50\1\4\1\27\1\35\1\26\1\30\1\51\1\47\1\25"+
+    "\1\46\1\4\1\66\1\61\1\67\1\72\41\5\2\0\4\4\4\0"+
+    "\1\4\2\0\1\5\7\0\1\4\4\0\1\4\5\0\27\4\1\0"+
+    "\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4\16\0\5\4\11\0"+
+    "\1\4\21\0\130\5\5\0\23\5\12\0\1\4\13\0\1\4\1\0"+
+    "\3\4\1\0\1\4\1\0\24\4\1\0\54\4\1\0\46\4\1\0"+
+    "\5\4\4\0\202\4\1\0\4\5\3\0\105\4\1\0\46\4\2\0"+
+    "\2\4\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4\11\0"+
+    "\21\5\1\0\27\5\1\0\3\5\1\0\1\5\1\0\2\5\1\0"+
+    "\1\5\13\0\33\4\5\0\3\4\15\0\4\5\14\0\6\5\13\0"+
+    "\32\4\5\0\13\4\16\5\7\0\12\5\4\0\2\4\1\5\143\4"+
+    "\1\0\1\4\10\5\1\0\6\5\2\4\2\5\1\0\4\5\2\4"+
+    "\12\5\3\4\2\0\1\4\17\0\1\5\1\4\1\5\36\4\33\5"+
+    "\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0\3\5\66\4\2\0"+
+    "\1\5\1\4\20\5\2\0\1\4\4\5\3\0\12\4\2\5\2\0"+
+    "\12\5\21\0\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0"+
+    "\7\4\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0"+
+    "\2\5\2\0\3\5\11\0\1\5\4\0\2\4\1\0\3\4\2\5"+
+    "\2\0\12\5\4\4\15\0\3\5\1\0\6\4\4\0\2\4\2\0"+
+    "\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0\2\4\2\0"+
+    "\1\5\1\0\5\5\4\0\2\5\2\0\3\5\13\0\4\4\1\0"+
+    "\1\4\7\0\14\5\3\4\14\0\3\5\1\0\11\4\1\0\3\4"+
+    "\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5"+
+    "\1\4\10\5\1\0\3\5\1\0\3\5\2\0\1\4\17\0\2\4"+
+    "\2\5\2\0\12\5\1\0\1\4\17\0\3\5\1\0\10\4\2\0"+
+    "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0"+
+    "\1\5\1\4\6\5\3\0\2\5\2\0\3\5\10\0\2\5\4\0"+
+    "\2\4\1\0\3\4\4\0\12\5\1\0\1\4\20\0\1\5\1\4"+
+    "\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4"+
+    "\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4\1\0\3\4"+
+    "\4\0\5\5\3\0\3\5\1\0\4\5\11\0\1\5\17\0\11\5"+
+    "\11\0\1\4\7\0\3\5\1\0\10\4\1\0\3\4\1\0\27\4"+
+    "\1\0\12\4\1\0\5\4\4\0\7\5\1\0\3\5\1\0\4\5"+
+    "\7\0\2\5\11\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4"+
+    "\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4\2\0\1\5"+
+    "\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5\7\0\1\4"+
+    "\1\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4\1\0\3\4"+
+    "\1\0\27\4\1\0\20\4\4\0\6\5\2\0\3\5\1\0\4\5"+
+    "\11\0\1\5\10\0\2\4\4\0\12\5\22\0\2\5\1\0\22\4"+
+    "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5"+
+    "\4\0\6\5\1\0\1\5\1\0\10\5\22\0\2\5\15\0\60\4"+
+    "\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5\47\0\2\4"+
+    "\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4"+
+    "\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4"+
+    "\1\0\4\4\1\5\2\4\6\5\1\0\2\5\1\4\2\0\5\4"+
+    "\1\0\1\4\1\0\6\5\2\0\12\5\2\0\2\4\42\0\1\4"+
+    "\27\0\2\5\6\0\12\5\13\0\1\5\1\0\1\5\1\0\1\5"+
+    "\4\0\2\5\10\4\1\0\42\4\6\0\24\5\1\0\2\5\4\4"+
+    "\4\0\10\5\1\0\44\5\11\0\1\5\71\0\42\4\1\0\5\4"+
+    "\1\0\2\4\1\0\7\5\3\0\4\5\6\0\12\5\6\0\6\4"+
+    "\4\5\106\0\46\4\12\0\51\4\7\0\132\4\5\0\104\4\5\0"+
+    "\122\4\6\0\7\4\1\0\77\4\1\0\1\4\1\0\4\4\2\0"+
+    "\7\4\1\0\1\4\1\0\4\4\2\0\47\4\1\0\1\4\1\0"+
+    "\4\4\2\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0"+
+    "\1\4\1\0\4\4\2\0\7\4\1\0\7\4\1\0\27\4\1\0"+
+    "\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\47\4\1\0"+
+    "\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4\2\0\10\4\12\0"+
+    "\32\4\5\0\113\4\3\0\3\4\17\0\15\4\1\0\4\4\3\5"+
+    "\13\0\22\4\3\5\13\0\22\4\2\5\14\0\15\4\1\0\3\4"+
+    "\1\0\2\5\14\0\64\4\40\5\3\0\1\4\3\0\2\4\1\5"+
+    "\2\0\12\5\41\0\3\5\2\0\12\5\6\0\130\4\10\0\51\4"+
+    "\1\5\126\0\35\4\3\0\14\5\4\0\14\5\12\0\12\5\36\4"+
+    "\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0\132\4\6\0\26\4"+
+    "\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4\1\0\1\4"+
+    "\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4\1\0\7\4"+
+    "\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4\2\0\6\4"+
+    "\4\0\15\4\5\0\3\4\1\0\7\4\17\0\4\5\32\0\5\5"+
+    "\20\0\2\4\23\0\1\4\13\0\4\5\6\0\6\5\1\0\1\4"+
+    "\15\0\1\4\40\0\22\4\36\0\15\5\4\0\1\5\3\0\6\5"+
+    "\27\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4"+
+    "\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4\1\0\3\4"+
+    "\1\0\7\4\3\0\3\4\5\0\5\4\26\0\44\4\u0e81\0\3\4"+
+    "\31\0\11\4\6\5\1\0\5\4\2\0\5\4\4\0\126\4\2\0"+
+    "\2\5\2\0\3\4\1\0\137\4\5\0\50\4\4\0\136\4\21\0"+
+    "\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0"+
+    "\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4\5\0"+
+    "\1\4\1\5\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0"+
+    "\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0"+
+    "\66\4\50\0\15\4\3\0\20\5\20\0\4\5\17\0\2\4\30\0"+
+    "\3\4\31\0\1\4\6\0\5\4\1\0\207\4\2\0\1\5\4\0"+
+    "\1\4\13\0\12\5\7\0\32\4\4\0\1\4\1\0\32\4\12\0"+
+    "\132\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0\3\4\3\0"+
+    "\2\4\3\0\2\4\22\0\3\5\4\0";
+
+  /** 
+   * Translates characters to character classes
+   */
+  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
+
+  /** 
+   * Translates DFA states to action switch labels.
+   */
+  private static final int [] ZZ_ACTION = zzUnpackAction();
+
+  private static final String ZZ_ACTION_PACKED_0 =
+    "\2\0\1\1\1\2\1\3\1\4\1\5\1\6\1\2"+
+    "\1\7\1\10\1\11\1\12\1\13\1\14\16\3\1\15"+
+    "\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25"+
+    "\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35"+
+    "\1\36\1\6\1\37\2\2\1\40\1\41\1\42\1\0"+
+    "\1\40\1\2\1\43\1\44\2\11\2\12\17\3\1\45"+
+    "\1\46\1\47\10\3\1\50\1\51\1\52\1\53\1\54"+
+    "\1\55\1\56\1\57\1\60\1\61\1\62\1\63\1\64"+
+    "\1\65\1\66\1\67\1\2\1\40\1\42\1\70\1\40"+
+    "\2\0\2\11\2\12\1\3\1\71\11\3\1\72\1\73"+
+    "\2\3\1\74\11\3\1\75\1\3\1\76\1\77\1\100"+
+    "\1\101\1\102\1\103\1\0\2\70\1\104\1\3\1\105"+
+    "\3\3\1\106\4\3\1\107\5\3\1\110\2\3\1\111"+
+    "\1\3\1\112\1\113\1\42\1\0\1\114\4\3\1\115"+
+    "\5\3\1\116\1\117\1\3\1\120\1\121\1\122\1\123"+
+    "\3\3\1\124\1\3\1\125\4\3\1\126\1\127\3\3"+
+    "\1\130\1\3\1\131\1\132\1\3\1\133";
+
+  private static int [] zzUnpackAction() {
+    int [] result = new int[217];
+    int offset = 0;
+    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAction(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /** 
+   * Translates a state to a row index in the transition table
+   */
+  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
+
+  private static final String ZZ_ROWMAP_PACKED_0 =
+    "\0\0\0\75\0\172\0\267\0\364\0\u0131\0\u016e\0\172"+
+    "\0\u01ab\0\u01e8\0\u0225\0\u0262\0\u029f\0\172\0\172\0\u02dc"+
+    "\0\u0319\0\u0356\0\u0393\0\u03d0\0\u040d\0\u044a\0\u0487\0\u04c4"+
+    "\0\u0501\0\u053e\0\u057b\0\u05b8\0\u05f5\0\u0632\0\u066f\0\u06ac"+
+    "\0\u06e9\0\u0726\0\u0763\0\u07a0\0\u07dd\0\172\0\172\0\172"+
+    "\0\172\0\172\0\172\0\172\0\172\0\172\0\u081a\0\u0857"+
+    "\0\u0894\0\u08d1\0\u090e\0\u094b\0\u0988\0\u09c5\0\u0a02\0\u0a3f"+
+    "\0\u0a7c\0\172\0\172\0\172\0\u0ab9\0\u0af6\0\172\0\u0b33"+
+    "\0\u0b70\0\u0bad\0\u0bea\0\u0c27\0\u0c64\0\u0ca1\0\u0cde\0\u0d1b"+
+    "\0\u0d58\0\u0d95\0\u0dd2\0\u0e0f\0\u0e4c\0\u0e89\0\364\0\364"+
+    "\0\u0ec6\0\u0f03\0\u0f40\0\u0f7d\0\u0fba\0\u0ff7\0\u1034\0\u1071"+
+    "\0\u10ae\0\u10eb\0\u1128\0\172\0\172\0\172\0\u1165\0\172"+
+    "\0\172\0\172\0\172\0\172\0\172\0\172\0\172\0\172"+
+    "\0\u11a2\0\u11df\0\u121c\0\u1259\0\u1296\0\u12d3\0\u1310\0\u134d"+
+    "\0\u138a\0\u13c7\0\u1404\0\u1441\0\u147e\0\364\0\u14bb\0\u14f8"+
+    "\0\u1535\0\u1572\0\u15af\0\u15ec\0\u1629\0\u1666\0\u16a3\0\364"+
+    "\0\364\0\u16e0\0\u171d\0\364\0\u175a\0\u1797\0\u17d4\0\u1811"+
+    "\0\u184e\0\u188b\0\u18c8\0\u1905\0\u1942\0\364\0\u197f\0\364"+
+    "\0\172\0\172\0\172\0\u19bc\0\172\0\u19f9\0\u1a36\0\172"+
+    "\0\364\0\u1a73\0\364\0\u1ab0\0\u1aed\0\u1b2a\0\364\0\u1b67"+
+    "\0\u1ba4\0\u1be1\0\u1c1e\0\364\0\u1c5b\0\u1c98\0\u1cd5\0\u1d12"+
+    "\0\u1d4f\0\364\0\u1d8c\0\u1dc9\0\364\0\u1e06\0\364\0\172"+
+    "\0\172\0\u1e43\0\364\0\u1e80\0\u1ebd\0\u1efa\0\u1f37\0\364"+
+    "\0\u1f74\0\u1fb1\0\u1fee\0\u202b\0\u2068\0\364\0\364\0\u20a5"+
+    "\0\364\0\364\0\364\0\364\0\u20e2\0\u211f\0\u215c\0\364"+
+    "\0\u2199\0\364\0\u21d6\0\u2213\0\u2250\0\u228d\0\364\0\364"+
+    "\0\u22ca\0\u2307\0\u2344\0\364\0\u2381\0\364\0\364\0\u23be"+
+    "\0\364";
+
+  private static int [] zzUnpackRowMap() {
+    int [] result = new int[217];
+    int offset = 0;
+    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
+    int i = 0;  /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int high = packed.charAt(i++) << 16;
+      result[j++] = high | packed.charAt(i++);
+    }
+    return j;
+  }
+
+  /** 
+   * The transition table of the DFA
+   */
+  private static final int [] ZZ_TRANS = zzUnpackTrans();
+
+  private static final String ZZ_TRANS_PACKED_0 =
+    "\1\3\1\4\1\5\1\6\1\5\1\3\1\7\1\10"+
+    "\1\6\1\11\1\5\1\12\1\5\1\13\1\6\1\14"+
+    "\1\3\1\15\1\16\1\17\2\5\1\20\1\21\1\22"+
+    "\1\23\1\24\2\5\1\25\1\26\1\27\1\30\1\31"+
+    "\1\5\1\32\3\5\1\33\1\5\1\34\1\35\1\36"+
+    "\1\37\1\40\1\3\1\41\1\42\1\43\1\44\1\45"+
+    "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55"+
+    "\1\56\1\3\1\4\1\5\1\6\1\5\1\3\1\57"+
+    "\1\60\1\6\1\11\1\5\1\12\1\5\1\13\1\6"+
+    "\1\14\1\3\1\15\1\16\1\17\2\5\1\20\1\21"+
+    "\1\22\1\23\1\24\2\5\1\25\1\26\1\27\1\30"+
+    "\1\31\1\5\1\32\3\5\1\33\1\5\1\34\1\35"+
+    "\1\36\1\37\1\40\1\61\1\41\1\42\1\43\1\44"+
+    "\1\45\1\46\1\47\1\50\1\51\1\52\1\53\1\54"+
+    "\1\55\1\56\76\0\1\4\7\0\1\4\1\0\1\62"+
+    "\1\63\14\0\1\63\44\0\2\5\1\0\2\5\3\0"+
+    "\2\5\1\0\1\5\7\0\27\5\25\0\1\6\4\0"+
+    "\1\6\5\0\1\6\56\0\6\64\1\65\1\66\1\0"+
+    "\5\64\1\0\1\64\1\67\1\64\1\70\52\64\1\0"+
+    "\1\4\7\0\1\4\1\71\1\62\1\63\10\0\1\71"+
+    "\3\0\1\63\44\0\1\62\7\0\1\62\100\0\1\72"+
+    "\35\0\1\73\21\0\10\14\1\0\5\14\1\0\1\74"+
+    "\1\75\54\14\10\15\1\0\5\15\1\0\1\15\1\76"+
+    "\1\77\53\15\1\0\2\5\1\0\2\5\3\0\2\5"+
+    "\1\0\1\5\7\0\3\5\1\100\14\5\1\101\1\5"+
+    "\1\102\4\5\23\0\2\5\1\0\2\5\3\0\2\5"+
+    "\1\0\1\5\7\0\5\5\1\103\21\5\23\0\2\5"+
+    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\12\5"+
+    "\1\104\14\5\23\0\2\5\1\0\2\5\3\0\2\5"+
+    "\1\0\1\5\7\0\10\5\1\105\16\5\23\0\2\5"+
+    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\4\5"+
+    "\1\106\2\5\1\107\4\5\1\110\4\5\1\111\5\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\5\5\1\112\15\5\1\113\3\5\23\0\2\5"+
+    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\4\5"+
+    "\1\114\1\115\21\5\23\0\2\5\1\0\2\5\3\0"+
+    "\2\5\1\0\1\5\7\0\5\5\1\116\13\5\1\117"+
+    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\6\5\1\120\3\5\1\121\14\5\23\0"+
+    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
+    "\3\5\1\122\23\5\23\0\2\5\1\0\2\5\3\0"+
+    "\2\5\1\0\1\5\7\0\7\5\1\123\11\5\1\124"+
+    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\14\5\1\125\3\5\1\126\6\5\23\0"+
+    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
+    "\7\5\1\127\11\5\1\130\5\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\131"+
+    "\21\5\75\0\1\132\74\0\1\133\74\0\1\134\1\0"+
+    "\1\135\72\0\1\136\3\0\1\137\70\0\1\140\4\0"+
+    "\1\141\67\0\1\142\5\0\1\143\66\0\1\144\74\0"+
+    "\1\145\27\0\1\65\1\66\43\0\1\146\74\0\1\147"+
+    "\74\0\1\150\2\0\1\151\17\0\1\62\7\0\1\62"+
+    "\2\0\1\63\14\0\1\63\44\0\1\152\7\0\1\152"+
+    "\3\0\1\152\37\0\1\152\17\0\6\64\1\153\1\64"+
+    "\1\0\5\64\1\0\1\64\1\67\1\64\1\70\52\64"+
+    "\10\65\1\0\5\65\1\0\56\65\7\154\1\155\65\154"+
+    "\10\64\1\0\5\64\1\0\56\64\6\70\1\156\1\70"+
+    "\1\157\5\70\1\157\1\70\1\160\2\70\1\64\51\70"+
+    "\1\0\2\71\6\0\1\71\2\0\1\71\14\0\3\71"+
+    "\3\0\1\71\1\0\1\71\1\0\1\71\31\0\3\14"+
+    "\1\161\4\14\1\162\64\14\3\15\1\163\4\15\1\164"+
+    "\64\15\1\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\4\5\1\165\15\5\1\166\4\5\23\0"+
+    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
+    "\3\5\1\167\10\5\1\170\12\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\24\5\1\171"+
+    "\2\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\2\5\1\172\24\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\13\5\1\173"+
+    "\13\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\11\5\1\174\15\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\175"+
+    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\10\5\1\176\16\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\177"+
+    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\3\5\1\200\23\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\201"+
+    "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\14\5\1\202\12\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\10\5\1\203"+
+    "\16\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\23\5\1\204\3\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\6\5\1\205"+
+    "\1\5\1\206\16\5\23\0\2\5\1\0\2\5\3\0"+
+    "\2\5\1\0\1\5\7\0\11\5\1\207\15\5\23\0"+
+    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
+    "\5\5\1\210\21\5\23\0\2\5\1\0\2\5\3\0"+
+    "\2\5\1\0\1\5\7\0\2\5\1\211\6\5\1\212"+
+    "\15\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\12\5\1\213\14\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\214"+
+    "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\14\5\1\215\12\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\3\5\1\216"+
+    "\23\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\14\5\1\217\12\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\220"+
+    "\24\5\75\0\1\221\74\0\1\222\74\0\1\223\3\0"+
+    "\1\224\70\0\1\225\22\0\1\152\7\0\1\152\107\0"+
+    "\2\153\12\0\1\153\11\0\1\153\22\0\7\154\1\226"+
+    "\65\154\6\227\1\230\1\155\65\227\23\157\1\64\2\156"+
+    "\12\157\1\156\11\157\1\156\45\157\1\64\51\157\10\70"+
+    "\1\157\5\70\1\157\4\70\1\64\51\70\3\14\1\161"+
+    "\4\14\1\162\6\14\1\74\1\75\64\14\1\0\6\14"+
+    "\1\74\1\75\54\14\3\15\1\163\4\15\1\164\7\15"+
+    "\1\76\1\77\63\15\1\0\7\15\1\76\1\77\53\15"+
+    "\1\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\5\5\1\231\21\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\21\5\1\232\5\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\11\5\1\233\15\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\5\5\1\234\21\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\4\5\1\235\22\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\5\5\1\236\21\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\5\5\1\237\21\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\17\5\1\240\7\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\11\5\1\241\15\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\7\5\1\242\17\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\2\5\1\243\24\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\10\5\1\244\16\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\7\5\1\245\17\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\5\5\1\246\21\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\2\5\1\247\24\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\7\5\1\250\17\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\17\5\1\251\7\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\5\5\1\252\21\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\2\5\1\253\6\5\1\254\15\5\23\0\2\5"+
+    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\20\5"+
+    "\1\255\6\5\23\0\2\5\1\0\2\5\3\0\2\5"+
+    "\1\0\1\5\7\0\10\5\1\256\16\5\23\0\2\5"+
+    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\13\5"+
+    "\1\257\13\5\75\0\1\260\21\0\6\154\1\261\1\226"+
+    "\65\154\7\227\1\262\65\227\1\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\23\5\1\263\3\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\21\5\1\264\5\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\3\5\1\265\23\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\6\5\1\266\20\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\2\5\1\267\24\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\5\5\1\270\21\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\10\5\1\271\16\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\17\5\1\272\7\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\4\5\1\273\22\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\2\5\1\274\24\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\7\5\1\275\17\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\16\5\1\276\10\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\20\5\1\277\6\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\14\5\1\300\12\5\23\0\2\5\1\0\2\5"+
+    "\3\0\2\5\1\0\1\5\7\0\2\5\1\301\24\5"+
+    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
+    "\7\0\5\5\1\302\21\5\22\0\6\227\1\230\1\262"+
+    "\65\227\1\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\6\5\1\303\20\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\304"+
+    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\14\5\1\305\12\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\14\5\1\306"+
+    "\12\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\10\5\1\307\16\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\20\5\1\310"+
+    "\6\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\10\5\1\311\16\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\312"+
+    "\21\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\12\5\1\313\14\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\314"+
+    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\12\5\1\315\14\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\21\5\1\316"+
+    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\22\5\1\317\4\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\320"+
+    "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\17\5\1\321\7\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\4\5\1\322"+
+    "\22\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\5\5\1\323\21\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\324"+
+    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\5\5\1\325\21\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\326"+
+    "\21\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\13\5\1\327\13\5\23\0\2\5\1\0"+
+    "\2\5\3\0\2\5\1\0\1\5\7\0\21\5\1\330"+
+    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
+    "\1\5\7\0\6\5\1\331\20\5\22\0";
+
+  private static int [] zzUnpackTrans() {
+    int [] result = new int[9211];
+    int offset = 0;
+    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackTrans(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      value--;
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /* error codes */
+  private static final int ZZ_UNKNOWN_ERROR = 0;
+  private static final int ZZ_NO_MATCH = 1;
+  private static final int ZZ_PUSHBACK_2BIG = 2;
+  private static final char[] EMPTY_BUFFER = new char[0];
+  private static final int YYEOF = -1;
+
+  /* error messages for the codes above */
+  private static final String ZZ_ERROR_MSG[] = {
+    "Unkown internal scanner error",
+    "Error: could not match input",
+    "Error: pushback value was too large"
+  };
+
+  /**
+   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
+   */
+  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
+
+  private static final String ZZ_ATTRIBUTE_PACKED_0 =
+    "\2\0\1\11\4\1\1\11\5\1\2\11\26\1\11\11"+
+    "\10\1\1\0\2\1\3\11\2\1\1\11\34\1\3\11"+
+    "\1\1\11\11\6\1\2\0\40\1\3\11\1\1\1\11"+
+    "\1\0\1\1\1\11\27\1\2\11\1\0\47\1";
+
+  private static int [] zzUnpackAttribute() {
+    int [] result = new int[217];
+    int offset = 0;
+    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+  /** the current state of the DFA */
+  private int zzState;
+
+  /** the current lexical state */
+  private int zzLexicalState = YYINITIAL;
+
+  /** this buffer contains the current text to be matched and is
+      the source of the yytext() string */
+  private CharSequence zzBuffer = "";
+
+  /** the textposition at the last accepting state */
+  private int zzMarkedPos;
+
+  /** the textposition at the last state to be included in yytext */
+  private int zzPushbackPos;
+
+  /** the current text position in the buffer */
+  private int zzCurrentPos;
+
+  /** startRead marks the beginning of the yytext() string in the buffer */
+  private int zzStartRead;
+
+  /** endRead marks the last character in the buffer, that has been read
+      from input */
+  private int zzEndRead;
+
+  /**
+   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
+   */
+  private boolean zzAtBOL = true;
+
+  /** zzAtEOF == true <=> the scanner is at the EOF */
+  private boolean zzAtEOF;
+
+  private IElementType myTokenType;
+  private int myState;
+
+  /** denotes if the user-EOF-code has already been executed */
+  private boolean zzEOFDone;
+
+
+
+  /** 
+   * Unpacks the compressed character translation table.
+   *
+   * @param packed   the packed character translation table
+   * @return         the unpacked character translation table
+   */
+  private static char [] zzUnpackCMap(String packed) {
+    char [] map = new char[0x10000];
+    int i = 0;  /* index in packed string  */
+    int j = 0;  /* index in unpacked array */
+    while (i < 1772) {
+      int  count = packed.charAt(i++);
+      char value = packed.charAt(i++);
+      do map[j++] = value; while (--count > 0);
+    }
+    return map;
+  }
+
+  @Override
+  public IElementType getTokenType() {
+    if (myTokenType == null) locateToken();
+    return myTokenType;
+  }
+
+  @Override
+  public final int getTokenStart(){
+    if (myTokenType == null) locateToken();
+    return zzStartRead;
+  }
+
+  @Override
+  public final int getTokenEnd(){
+    if (myTokenType == null) locateToken();
+    return getTokenStart() + yylength();
+  }
+
+  @Override
+  public void advance() {
+    if (myTokenType == null) locateToken();
+    myTokenType = null;
+  }
+
+  @Override
+  public int getState() {
+    if (myTokenType == null) locateToken();
+    return myState;
+  }
+
+  @Override
+  public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
+    reset(buffer, startOffset, endOffset, initialState);
+    myTokenType = null;
+  }
+
+   @Override
+   public CharSequence getBufferSequence() {
+     return zzBuffer;
+   }
+
+   @Override
+   public int getBufferEnd() {
+     return zzEndRead;
+   }
+
+  public void reset(CharSequence buffer, int start, int end,int initialState){
+    zzBuffer = buffer;
+    zzCurrentPos = zzMarkedPos = zzStartRead = start;
+    zzPushbackPos = 0;
+    zzAtEOF  = false;
+    zzAtBOL = true;
+    zzEndRead = end;
+    yybegin(initialState);
+    myTokenType = null;
+  }
+
+   private void locateToken() {
+     if (myTokenType != null) return;
+     try {
+       myState = yystate();
+       myTokenType = advanceImpl();
+     }
+     catch (java.io.IOException e) { /*Can't happen*/ }
+     catch (Error e) {
+       // add lexer class name to the error
+       final Error error = new Error(getClass().getName() + ": " + e.getMessage());
+       error.setStackTrace(e.getStackTrace());
+       throw error;
+     }
+   }
+
+   /**
+   * Refills the input buffer.
+   *
+   * @return      <code>false</code>, iff there was new input.
+   *
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  private boolean zzRefill() throws java.io.IOException {
+    return true;
+  }
+
+
+  /**
+   * Returns the current lexical state.
+   */
+  public final int yystate() {
+    return zzLexicalState;
+  }
+
+
+  /**
+   * Enters a new lexical state
+   *
+   * @param newState the new lexical state
+   */
+  public final void yybegin(int newState) {
+    zzLexicalState = newState;
+  }
+
+
+  /**
+   * Returns the text matched by the current regular expression.
+   */
+  public final CharSequence yytext() {
+    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
+  }
+
+
+  /**
+   * Returns the character at position <tt>pos</tt> from the
+   * matched text.
+   *
+   * It is equivalent to yytext().charAt(pos), but faster
+   *
+   * @param pos the position of the character to fetch.
+   *            A value from 0 to yylength()-1.
+   *
+   * @return the character at position pos
+   */
+  public final char yycharat(int pos) {
+    return zzBuffer.charAt(zzStartRead+pos);
+  }
+
+
+  /**
+   * Returns the length of the matched text region.
+   */
+  public final int yylength() {
+    return zzMarkedPos-zzStartRead;
+  }
+
+
+  /**
+   * Reports an error that occured while scanning.
+   *
+   * In a wellformed scanner (no or only correct usage of
+   * yypushback(int) and a match-all fallback rule) this method
+   * will only be called with things that "Can't Possibly Happen".
+   * If this method is called, something is seriously wrong
+   * (e.g. a JFlex bug producing a faulty scanner etc.).
+   *
+   * Usual syntax/scanner level error handling should be done
+   * in error fallback rules.
+   *
+   * @param   errorCode  the code of the errormessage to display
+   */
+  private void zzScanError(int errorCode) {
+    String message;
+    try {
+      message = ZZ_ERROR_MSG[errorCode];
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+    }
+
+    throw new Error(message);
+  }
+
+
+  /**
+   * Pushes the specified amount of characters back into the input stream.
+   *
+   * They will be read again by then next call of the scanning method
+   *
+   * @param number  the number of characters to be read again.
+   *                This number must not be greater than yylength()!
+   */
+  public void yypushback(int number)  {
+    if ( number > yylength() )
+      zzScanError(ZZ_PUSHBACK_2BIG);
+
+    zzMarkedPos -= number;
+  }
+
+
+  /**
+   * Contains user EOF-code, which will be executed exactly once,
+   * when the end of file is reached
+   */
+  private void zzDoEOF() {
+    if (!zzEOFDone) {
+      zzEOFDone = true;
+    
+    }
+  }
+
+
+  /**
+   * Resumes scanning until the next regular expression is matched,
+   * the end of input is encountered or an I/O-Error occurs.
+   *
+   * @return      the next token
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  public IElementType advanceImpl() throws java.io.IOException {
+    int zzInput;
+    int zzAction;
+
+    // cached fields:
+    int zzCurrentPosL;
+    int zzMarkedPosL;
+    int zzEndReadL = zzEndRead;
+    CharSequence zzBufferL = zzBuffer;
+    char [] zzCMapL = ZZ_CMAP;
+
+    int [] zzTransL = ZZ_TRANS;
+    int [] zzRowMapL = ZZ_ROWMAP;
+    int [] zzAttrL = ZZ_ATTRIBUTE;
+
+    while (true) {
+      zzMarkedPosL = zzMarkedPos;
+
+      zzAction = -1;
+
+      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+
+      zzState = ZZ_LEXSTATE[zzLexicalState];
+
+
+      zzForAction: {
+        while (true) {
+
+          if (zzCurrentPosL < zzEndReadL)
+            zzInput = zzBufferL.charAt(zzCurrentPosL++);
+          else if (zzAtEOF) {
+            zzInput = YYEOF;
+            break zzForAction;
+          }
+          else {
+            // store back cached positions
+            zzCurrentPos  = zzCurrentPosL;
+            zzMarkedPos   = zzMarkedPosL;
+            boolean eof = zzRefill();
+            // get translated positions and possibly new buffer
+            zzCurrentPosL  = zzCurrentPos;
+            zzMarkedPosL   = zzMarkedPos;
+            zzBufferL      = zzBuffer;
+            zzEndReadL     = zzEndRead;
+            if (eof) {
+              zzInput = YYEOF;
+              break zzForAction;
+            }
+            else {
+              zzInput = zzBufferL.charAt(zzCurrentPosL++);
+            }
+          }
+          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
+          if (zzNext == -1) break zzForAction;
+          zzState = zzNext;
+
+          int zzAttributes = zzAttrL[zzState];
+          if ( (zzAttributes & 1) == 1 ) {
+            zzAction = zzState;
+            zzMarkedPosL = zzCurrentPosL;
+            if ( (zzAttributes & 8) == 8 ) break zzForAction;
+          }
+
+        }
+      }
+
+      // store back cached position
+      zzMarkedPos = zzMarkedPosL;
+
+      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+        case 88: 
+          { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD;
+          }
+        case 92: break;
+        case 29: 
+          { yybegin(YYINITIAL); return JSTokenTypes.COLON;
+          }
+        case 93: break;
+        case 4: 
+          { return JSTokenTypes.WHITE_SPACE;
+          }
+        case 94: break;
+        case 32: 
+          { return JSTokenTypes.REGEXP_LITERAL;
+          }
+        case 95: break;
+        case 81: 
+          { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD;
+          }
+        case 96: break;
+        case 21: 
+          { yybegin(YYINITIAL); return JSTokenTypes.LPAR;
+          }
+        case 97: break;
+        case 68: 
+          { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD;
+          }
+        case 98: break;
+        case 44: 
+          { yybegin(YYINITIAL); return JSTokenTypes.GE;
+          }
+        case 99: break;
+        case 84: 
+          { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD;
+          }
+        case 100: break;
+        case 34: 
+          { return JSTokenTypes.C_STYLE_COMMENT;
+          }
+        case 101: break;
+        case 49: 
+          { yybegin(YYINITIAL); return JSTokenTypes.OROR;
+          }
+        case 102: break;
+        case 56: 
+          { return JSTokenTypes.DOC_COMMENT;
+          }
+        case 103: break;
+        case 58: 
+          { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD;
+          }
+        case 104: break;
+        case 65: 
+          { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ;
+          }
+        case 105: break;
+        case 26: 
+          { yybegin(YYINITIAL); return JSTokenTypes.COMMA;
+          }
+        case 106: break;
+        case 13: 
+          { yybegin(YYINITIAL); return JSTokenTypes.EQ;
+          }
+        case 107: break;
+        case 37: 
+          { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD;
+          }
+        case 108: break;
+        case 47: 
+          { yybegin(YYINITIAL); return JSTokenTypes.ANDAND;
+          }
+        case 109: break;
+        case 43: 
+          { return JSTokenTypes.PLUSPLUS;
+          }
+        case 110: break;
+        case 10: 
+          { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL;
+          }
+        case 111: break;
+        case 3: 
+          { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER;
+          }
+        case 112: break;
+        case 5: 
+          { return JSTokenTypes.DIV;
+          }
+        case 113: break;
+        case 25: 
+          { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON;
+          }
+        case 114: break;
+        case 50: 
+          { yybegin(YYINITIAL); return JSTokenTypes.XOREQ;
+          }
+        case 115: break;
+        case 82: 
+          { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD;
+          }
+        case 116: break;
+        case 70: 
+          { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD;
+          }
+        case 117: break;
+        case 67: 
+          { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ;
+          }
+        case 118: break;
+        case 57: 
+          { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD;
+          }
+        case 119: break;
+        case 6: 
+          { yybegin(YYINITIAL); return JSTokenTypes.MULT;
+          }
+        case 120: break;
+        case 53: 
+          { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ;
+          }
+        case 121: break;
+        case 17: 
+          { yybegin(YYINITIAL); return JSTokenTypes.AND;
+          }
+        case 122: break;
+        case 59: 
+          { yybegin(YYINITIAL); return JSTokenTypes.SET_KEYWORD;
+          }
+        case 123: break;
+        case 63: 
+          { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ;
+          }
+        case 124: break;
+        case 69: 
+          { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD;
+          }
+        case 125: break;
+        case 36: 
+          { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ;
+          }
+        case 126: break;
+        case 52: 
+          { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ;
+          }
+        case 127: break;
+        case 62: 
+          { yybegin(YYINITIAL); return JSTokenTypes.GET_KEYWORD;
+          }
+        case 128: break;
+        case 61: 
+          { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD;
+          }
+        case 129: break;
+        case 15: 
+          { yybegin(YYINITIAL); return JSTokenTypes.PLUS;
+          }
+        case 130: break;
+        case 33: 
+          { return JSTokenTypes.END_OF_LINE_COMMENT;
+          }
+        case 131: break;
+        case 71: 
+          { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD;
+          }
+        case 132: break;
+        case 79: 
+          { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD;
+          }
+        case 133: break;
+        case 40: 
+          { yybegin(YYINITIAL); return JSTokenTypes.EQEQ;
+          }
+        case 134: break;
+        case 1: 
+          { return JSTokenTypes.BAD_CHARACTER;
+          }
+        case 135: break;
+        case 86: 
+          { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD;
+          }
+        case 136: break;
+        case 85: 
+          { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD;
+          }
+        case 137: break;
+        case 76: 
+          { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD;
+          }
+        case 138: break;
+        case 80: 
+          { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD;
+          }
+        case 139: break;
+        case 46: 
+          { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ;
+          }
+        case 140: break;
+        case 55: 
+          { yybegin(YYINITIAL); return JSTokenTypes.LTLT;
+          }
+        case 141: break;
+        case 31: 
+          { yybegin(YYINITIAL); return JSTokenTypes.LT;
+          }
+        case 142: break;
+        case 74: 
+          { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD;
+          }
+        case 143: break;
+        case 14: 
+          { yybegin(YYINITIAL); return JSTokenTypes.EXCL;
+          }
+        case 144: break;
+        case 38: 
+          { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD;
+          }
+        case 145: break;
+        case 64: 
+          { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ;
+          }
+        case 146: break;
+        case 42: 
+          { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ;
+          }
+        case 147: break;
+        case 48: 
+          { yybegin(YYINITIAL); return JSTokenTypes.OREQ;
+          }
+        case 148: break;
+        case 89: 
+          { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD;
+          }
+        case 149: break;
+        case 66: 
+          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT;
+          }
+        case 150: break;
+        case 45: 
+          { yybegin(YYINITIAL); return JSTokenTypes.GTGT;
+          }
+        case 151: break;
+        case 27: 
+          { yybegin(YYINITIAL); return JSTokenTypes.TILDE;
+          }
+        case 152: break;
+        case 87: 
+          { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD;
+          }
+        case 153: break;
+        case 2: 
+          { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL;
+          }
+        case 154: break;
+        case 19: 
+          { yybegin(YYINITIAL); return JSTokenTypes.XOR;
+          }
+        case 155: break;
+        case 30: 
+          { yybegin(YYINITIAL); return JSTokenTypes.DIV;
+          }
+        case 156: break;
+        case 16: 
+          { yybegin(YYINITIAL); return JSTokenTypes.GT;
+          }
+        case 157: break;
+        case 39: 
+          { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD;
+          }
+        case 158: break;
+        case 83: 
+          { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD;
+          }
+        case 159: break;
+        case 60: 
+          { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD;
+          }
+        case 160: break;
+        case 77: 
+          { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD;
+          }
+        case 161: break;
+        case 9: 
+          { return  JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
+          }
+        case 162: break;
+        case 18: 
+          { yybegin(YYINITIAL); return JSTokenTypes.OR;
+          }
+        case 163: break;
+        case 51: 
+          { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ;
+          }
+        case 164: break;
+        case 8: 
+          { yybegin(YYINITIAL); return JSTokenTypes.MINUS;
+          }
+        case 165: break;
+        case 35: 
+          { return JSTokenTypes.MINUSMINUS;
+          }
+        case 166: break;
+        case 28: 
+          { yybegin(YYINITIAL); return JSTokenTypes.QUEST;
+          }
+        case 167: break;
+        case 78: 
+          { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD;
+          }
+        case 168: break;
+        case 7: 
+          { yybegin(YYINITIAL); return JSTokenTypes.DOT;
+          }
+        case 169: break;
+        case 72: 
+          { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD;
+          }
+        case 170: break;
+        case 12: 
+          { yybegin(DIV_OR_GT);       return JSTokenTypes.RBRACKET;
+          }
+        case 171: break;
+        case 24: 
+          { yybegin(YYINITIAL); return JSTokenTypes.RBRACE;
+          }
+        case 172: break;
+        case 91: 
+          { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD;
+          }
+        case 173: break;
+        case 41: 
+          { yybegin(YYINITIAL); return JSTokenTypes.NE;
+          }
+        case 174: break;
+        case 23: 
+          { yybegin(YYINITIAL); return JSTokenTypes.LBRACE;
+          }
+        case 175: break;
+        case 22: 
+          { yybegin(DIV_OR_GT);       return JSTokenTypes.RPAR;
+          }
+        case 176: break;
+        case 20: 
+          { yybegin(YYINITIAL); return JSTokenTypes.PERC;
+          }
+        case 177: break;
+        case 73: 
+          { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD;
+          }
+        case 178: break;
+        case 54: 
+          { yybegin(YYINITIAL); return JSTokenTypes.LE;
+          }
+        case 179: break;
+        case 11: 
+          { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET;
+          }
+        case 180: break;
+        case 75: 
+          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ;
+          }
+        case 181: break;
+        case 90: 
+          { yybegin(DIV_OR_GT); return JSTokenTypes.UNDEFINED_KEYWORD;
+          }
+        case 182: break;
+        default:
+          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+            zzAtEOF = true;
+            zzDoEOF();
+            return null;
+          }
+          else {
+            zzScanError(ZZ_NO_MATCH);
+          }
+      }
+    }
+  }
+
+
+}
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/javascript16.flex b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/javascript16.flex
new file mode 100644
index 00000000..f9d98089
--- /dev/null
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/javascript16.flex
@@ -0,0 +1,165 @@
+package consulo.javascript.lang.lexer;
+
+import com.intellij.lexer.LexerBase;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.lang.javascript.JSTokenTypes;
+
+%%
+
+%public
+%class JavaScript16Lexer
+%extends LexerBase
+%unicode
+%function advanceImpl
+%type IElementType
+%eof{  return;
+%eof}
+
+DIGIT=[0-9]
+OCTAL_DIGIT=[0-7]
+HEX_DIGIT=[0-9A-Fa-f]
+WHITE_SPACE_CHAR=[\ \n\r\t\f]+
+
+IDENTIFIER=[:jletter:] [:jletterdigit:]*
+
+C_STYLE_COMMENT=("/*"[^"*"]{COMMENT_TAIL})|"/*"
+DOC_COMMENT="/*""*"+("/"|([^"/""*"]{COMMENT_TAIL}))?
+COMMENT_TAIL=([^"*"]*("*"+[^"*""/"])?)*("*"+"/")?
+END_OF_LINE_COMMENT="/""/"[^\r\n]*
+
+INTEGER_LITERAL={DECIMAL_INTEGER_LITERAL}|{HEX_INTEGER_LITERAL}
+DECIMAL_INTEGER_LITERAL=(0|([1-9]({DIGIT})*))
+HEX_INTEGER_LITERAL=0[Xx]({HEX_DIGIT})*
+
+FLOAT_LITERAL=({FLOATING_POINT_LITERAL1})|({FLOATING_POINT_LITERAL2})|({FLOATING_POINT_LITERAL3})|({FLOATING_POINT_LITERAL4})
+FLOATING_POINT_LITERAL1=({DIGIT})+"."({DIGIT})*({EXPONENT_PART})?
+FLOATING_POINT_LITERAL2="."({DIGIT})+({EXPONENT_PART})?
+FLOATING_POINT_LITERAL3=({DIGIT})+({EXPONENT_PART})
+FLOATING_POINT_LITERAL4=({DIGIT})+
+EXPONENT_PART=[Ee]["+""-"]?({DIGIT})*
+
+CRLF= [\ \t \f]* (\n | \r | \r\n)
+QUOTED_LITERAL="'"([^\\\'\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*("'"|\\)?
+DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
+ESCAPE_SEQUENCE=\\[^\r\n]
+GROUP = "[" [^\]]* "]"
+
+REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimx]*)?
+DIGIT=[0-9]
+
+%state DIV_OR_GT
+
+%%
+
+<YYINITIAL, DIV_OR_GT> {WHITE_SPACE_CHAR}   { return JSTokenTypes.WHITE_SPACE; }
+
+<YYINITIAL,DIV_OR_GT> {C_STYLE_COMMENT}     { return JSTokenTypes.C_STYLE_COMMENT; }
+<YYINITIAL,DIV_OR_GT> {END_OF_LINE_COMMENT} { return JSTokenTypes.END_OF_LINE_COMMENT; }
+<YYINITIAL,DIV_OR_GT> {DOC_COMMENT}         { return JSTokenTypes.DOC_COMMENT; }
+
+<YYINITIAL,DIV_OR_GT> {INTEGER_LITERAL}     { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
+<YYINITIAL,DIV_OR_GT> {FLOAT_LITERAL}       { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
+
+<YYINITIAL,DIV_OR_GT> {QUOTED_LITERAL}      { return  JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;}
+
+<YYINITIAL,DIV_OR_GT> {DOUBLE_QUOTED_LITERAL}      { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL; }
+
+<YYINITIAL,DIV_OR_GT> "true"                { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "false"               { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "null"                { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "undefined"           { yybegin(DIV_OR_GT); return JSTokenTypes.UNDEFINED_KEYWORD; }
+
+<YYINITIAL,DIV_OR_GT> "break"               { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "case"                { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "catch"               { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "const"               { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "continue"            { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "default"             { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "delete"              { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "do"                  { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "else"                { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "finally"             { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "for"                 { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "function"            { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "if"                  { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "in"                  { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "instanceof"          { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "new"                 { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "return"              { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "switch"              { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "this"                { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "throw"               { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "try"                 { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "typeof"              { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "var"                 { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "void"                { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "while"               { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "with"                { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "set"                 { yybegin(YYINITIAL); return JSTokenTypes.SET_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "get"                 { yybegin(YYINITIAL); return JSTokenTypes.GET_KEYWORD; }
+
+<YYINITIAL, DIV_OR_GT> {IDENTIFIER}                    { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER; }
+
+
+<YYINITIAL, DIV_OR_GT> "."                            { yybegin(YYINITIAL); return JSTokenTypes.DOT; }
+
+
+<YYINITIAL,DIV_OR_GT> "==="                 { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ; }
+<YYINITIAL,DIV_OR_GT> "!=="                 { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ; }
+
+<YYINITIAL,DIV_OR_GT> "++"                  { return JSTokenTypes.PLUSPLUS; }
+<YYINITIAL,DIV_OR_GT> "--"                  { return JSTokenTypes.MINUSMINUS; }
+
+<YYINITIAL,DIV_OR_GT> "=="                  { yybegin(YYINITIAL); return JSTokenTypes.EQEQ; }
+<YYINITIAL,DIV_OR_GT> "!="                  { yybegin(YYINITIAL); return JSTokenTypes.NE; }
+<DIV_OR_GT> "<"                             { yybegin(YYINITIAL); return JSTokenTypes.LT; }
+<YYINITIAL,DIV_OR_GT> ">"                   { yybegin(YYINITIAL); return JSTokenTypes.GT; }
+<DIV_OR_GT> "<="                            { yybegin(YYINITIAL); return JSTokenTypes.LE; }
+<YYINITIAL,DIV_OR_GT> ">="                 { yybegin(YYINITIAL); return JSTokenTypes.GE; }
+<DIV_OR_GT> "<<"                            { yybegin(YYINITIAL); return JSTokenTypes.LTLT; }
+<YYINITIAL,DIV_OR_GT> ">>"                  { yybegin(YYINITIAL); return JSTokenTypes.GTGT; }
+<YYINITIAL,DIV_OR_GT> ">>>"                 { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT; }
+
+<YYINITIAL,DIV_OR_GT> "&"                   { yybegin(YYINITIAL); return JSTokenTypes.AND; }
+<YYINITIAL,DIV_OR_GT> "&&"                  { yybegin(YYINITIAL); return JSTokenTypes.ANDAND; }
+<YYINITIAL,DIV_OR_GT> "|"                   { yybegin(YYINITIAL); return JSTokenTypes.OR; }
+<YYINITIAL,DIV_OR_GT> "||"                  { yybegin(YYINITIAL); return JSTokenTypes.OROR; }
+
+<YYINITIAL,DIV_OR_GT> "+="                  { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ; }
+<YYINITIAL,DIV_OR_GT> "-="                  { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ; }
+<DIV_OR_GT> "*="                            { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ; }
+<DIV_OR_GT> "/="                            { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ; }
+<YYINITIAL,DIV_OR_GT> "&="                  { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ; }
+<YYINITIAL,DIV_OR_GT> "|="                  { yybegin(YYINITIAL); return JSTokenTypes.OREQ; }
+<YYINITIAL,DIV_OR_GT> "^="                  { yybegin(YYINITIAL); return JSTokenTypes.XOREQ; }
+<YYINITIAL,DIV_OR_GT> "%="                  { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ; }
+<DIV_OR_GT> "<<="                           { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
+<YYINITIAL,DIV_OR_GT> ">>="                 { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ; }
+<YYINITIAL,DIV_OR_GT> ">>>="                { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ; }
+
+<YYINITIAL,DIV_OR_GT> "("                   { yybegin(YYINITIAL); return JSTokenTypes.LPAR; }
+<YYINITIAL,DIV_OR_GT> ")"                   { yybegin(DIV_OR_GT);       return JSTokenTypes.RPAR; }
+<YYINITIAL,DIV_OR_GT> "{"                   { yybegin(YYINITIAL); return JSTokenTypes.LBRACE; }
+<YYINITIAL,DIV_OR_GT> "}"                   { yybegin(YYINITIAL); return JSTokenTypes.RBRACE; }
+<YYINITIAL,DIV_OR_GT> "["                   { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET; }
+<YYINITIAL,DIV_OR_GT> "]"                   { yybegin(DIV_OR_GT);       return JSTokenTypes.RBRACKET; }
+<YYINITIAL,DIV_OR_GT> ";"                   { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON; }
+<YYINITIAL,DIV_OR_GT> ","                   { yybegin(YYINITIAL); return JSTokenTypes.COMMA; }
+
+<YYINITIAL,DIV_OR_GT> "="                   { yybegin(YYINITIAL); return JSTokenTypes.EQ; }
+<YYINITIAL,DIV_OR_GT> "!"                   { yybegin(YYINITIAL); return JSTokenTypes.EXCL; }
+<YYINITIAL,DIV_OR_GT> "~"                   { yybegin(YYINITIAL); return JSTokenTypes.TILDE; }
+<YYINITIAL,DIV_OR_GT> "?"                   { yybegin(YYINITIAL); return JSTokenTypes.QUEST; }
+<YYINITIAL,DIV_OR_GT> ":"                   { yybegin(YYINITIAL); return JSTokenTypes.COLON; }
+<YYINITIAL,DIV_OR_GT> "+"                   { yybegin(YYINITIAL); return JSTokenTypes.PLUS; }
+<YYINITIAL,DIV_OR_GT> "-"                   { yybegin(YYINITIAL); return JSTokenTypes.MINUS; }
+<YYINITIAL,DIV_OR_GT> "*"                             { yybegin(YYINITIAL); return JSTokenTypes.MULT; }
+<DIV_OR_GT> "/"                             { yybegin(YYINITIAL); return JSTokenTypes.DIV; }
+<YYINITIAL,DIV_OR_GT> "^"                   { yybegin(YYINITIAL); return JSTokenTypes.XOR; }
+<YYINITIAL,DIV_OR_GT> "%"                   { yybegin(YYINITIAL); return JSTokenTypes.PERC; }
+
+<YYINITIAL> {REGEXP_LITERAL}                { return JSTokenTypes.REGEXP_LITERAL; }
+
+<YYINITIAL> "/"                             { return JSTokenTypes.DIV; }
+
+<YYINITIAL,DIV_OR_GT> [^]                   { return JSTokenTypes.BAD_CHARACTER; }
\ No newline at end of file

From d67600917dced8983562b57ede99b0c110a57ec1 Mon Sep 17 00:00:00 2001
From: Valeriy Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 15 Jan 2018 13:24:48 +0300
Subject: [PATCH 035/340] fixed compilation

---
 .../actions/JavaScriptCreateFileAction.java   | 47 ++-----------------
 1 file changed, 5 insertions(+), 42 deletions(-)

diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index a4f5985a..eebcfe67 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -1,7 +1,5 @@
 package consulo.javascript.ide.actions;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.ide.IdeView;
 import com.intellij.ide.actions.CreateFileFromTemplateAction;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
@@ -12,15 +10,10 @@
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileSystem;
 import com.intellij.psi.PsiDirectory;
-import com.intellij.testFramework.LightVirtualFile;
 import consulo.annotations.RequiredDispatchThread;
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
-import consulo.roots.ContentEntryFileListener;
 
 /**
  * @author VISTALL
@@ -56,50 +49,20 @@ private static Module findModule(DataContext dataContext)
 			return null;
 		}
 
-		final PsiDirectory orChooseDirectory = view.getOrChooseDirectory();
-		if(orChooseDirectory == null)
+		final PsiDirectory directory = view.getOrChooseDirectory();
+		if(directory == null)
 		{
 			return null;
 		}
 
-		Module resolve = findModuleByPsiDirectory(project, orChooseDirectory);
-		if(resolve != null)
+		Module resolvedModule = ModuleResolver.EP_NAME.composite().resolveModule(directory, JavaScriptFileType.INSTANCE);
+		if(resolvedModule != null)
 		{
-			return resolve;
+			return resolvedModule;
 		}
 		return dataContext.getData(LangDataKeys.MODULE);
 	}
 
-	@Nullable
-	@RequiredReadAction
-	private static Module findModuleByPsiDirectory(Project project, final PsiDirectory orChooseDirectory)
-	{
-		LightVirtualFile l = new LightVirtualFile("test.js", JavaScriptFileType.INSTANCE, "")
-		{
-			@Override
-			public VirtualFile getParent()
-			{
-				return orChooseDirectory.getVirtualFile();
-			}
-
-			@NotNull
-			@Override
-			public VirtualFileSystem getFileSystem()
-			{
-				return LocalFileSystem.getInstance();
-			}
-		};
-		for(ContentEntryFileListener.PossibleModuleForFileResolver o : ContentEntryFileListener.PossibleModuleForFileResolver.EP_NAME.getExtensions())
-		{
-			Module resolve = o.resolve(project, l);
-			if(resolve != null)
-			{
-				return resolve;
-			}
-		}
-		return null;
-	}
-
 	@Override
 	protected void buildDialog(Project project, PsiDirectory directory, CreateFileFromTemplateDialog.Builder builder)
 	{

From fed729fab3098005771cd8efa40dd0628f87c8af Mon Sep 17 00:00:00 2001
From: Valeriy Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 15 Jan 2018 15:00:50 +0300
Subject: [PATCH 036/340] impl getFileTypeForModuleResolve

---
 .../ide/actions/JavaScriptCreateFileAction.java          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index eebcfe67..f3a06e9f 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -1,5 +1,6 @@
 package consulo.javascript.ide.actions;
 
+import org.jetbrains.annotations.Nullable;
 import com.intellij.ide.IdeView;
 import com.intellij.ide.actions.CreateFileFromTemplateAction;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
@@ -7,6 +8,7 @@
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
@@ -38,6 +40,13 @@ protected boolean isAvailable(DataContext dataContext)
 		return module != null && ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class) != null;
 	}
 
+	@Nullable
+	@Override
+	protected FileType getFileTypeForModuleResolve()
+	{
+		return JavaScriptFileType.INSTANCE;
+	}
+
 	@RequiredReadAction
 	private static Module findModule(DataContext dataContext)
 	{

From bd0348624fd85aab3f7e985d2fac47a1723fa066 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 17 Apr 2018 16:29:26 +0300
Subject: [PATCH 037/340] fix npe

---
 .../inspections/PropertyValidationInspection.java        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index af95b85c..7a323773 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -155,7 +155,7 @@ public static Collection<JSProperty> buildPropertiesAsTree(PsiElement element, @
 			return Collections.emptyList();
 		}
 
-		final Deque<JSProperty> queue = new ArrayDeque<JSProperty>();
+		final Deque<JSProperty> queue = new ArrayDeque<>();
 		PsiTreeUtil.treeWalkUp(element, null, new PairProcessor<PsiElement, PsiElement>()
 		{
 			@Override
@@ -218,10 +218,15 @@ else if(node instanceof JSObjectLiteralExpression)
 		}
 		else if(node instanceof JSArrayLiteralExpression)
 		{
-			Set<Object> types = new THashSet<Object>();
+			Set<Object> types = new THashSet<>();
 			JSExpression[] expressions = ((JSArrayLiteralExpression) node).getExpressions();
 			for(JSExpression expression : expressions)
 			{
+				if(expression == null)
+				{
+					continue;
+				}
+
 				Object typeOfExpression = getTypeOfExpression(expression);
 				ContainerUtil.addIfNotNull(types, typeOfExpression);
 			}

From ca6611684b99a2b852059d56961dacdec26048d9 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 6 May 2018 22:13:03 +0300
Subject: [PATCH 038/340] migrated to jsr305

---
 .../lang/javascript/JavaScriptFileType.java   |  12 +-
 .../lang/javascript/psi/JSAttribute.java      |   5 +-
 .../lang/javascript/psi/JSAttributeList.java  |   9 +-
 .../javascript/psi/JSAttributeListOwner.java  |   2 +-
 .../psi/JSAttributeNameValuePair.java         |   2 +-
 .../intellij/lang/javascript/psi/JSClass.java |   2 +-
 .../lang/javascript/psi/JSDocTag.java         |   2 +-
 .../lang/javascript/psi/JSExpression.java     |   9 +-
 .../lang/javascript/psi/JSFunction.java       |   9 +-
 .../javascript/psi/JSFunctionExpression.java  |   4 +-
 .../psi/JSNamespaceDeclaration.java           |   2 +-
 .../lang/javascript/psi/JSParameter.java      |   6 +-
 .../javascript/psi/JSPostfixExpression.java   |   2 +-
 .../javascript/psi/JSPrefixExpression.java    |   2 +-
 .../lang/javascript/psi/JSProperty.java       |   6 +-
 .../javascript/psi/JSReferenceExpression.java |   2 +-
 .../lang/javascript/psi/JSReferenceList.java  |   9 +-
 .../lang/javascript/psi/JSTryStatement.java   |   6 +-
 .../lang/javascript/psi/JSVariable.java       |   6 +-
 .../lang/javascript/psi/JSYieldStatement.java |   2 +-
 .../stubs/JSAttributeNameValuePairStub.java   |   2 +-
 .../javascript/index/JavaScriptIndexer.java   |   5 +-
 .../javascript/lang/JavaScriptFeature.java    |   4 +-
 .../lang/JavaScriptFileTypeWithVersion.java   |   6 +-
 .../javascript/lang/JavaScriptLanguage.java   |   2 +-
 .../lang/JavaScriptLanguageVersion.java       |   9 +-
 .../lang/JavaScriptVersionUtil.java           |   7 +-
 .../lang/StandardJavaScriptVersions.java      |  12 +-
 .../javascript/lang/psi/JavaScriptType.java   |   8 +-
 .../lang/psi/JavaScriptTypeElement.java       |   4 +-
 .../extension/JavaScriptModuleExtension.java  |   5 +-
 .../JavaScriptMutableModuleExtension.java     |   4 +-
 .../javascript/psi/JSComputedName.java        |   3 +-
 .../psi/JSSimpleLiteralExpression.java        |   5 +-
 .../psi/JavaScriptLambdaExpression.java       |   5 +-
 .../JSPropertyNameReferenceProvider.java      |   7 +-
 .../javascript/psi/stubs/JSFileStub.java      |   4 +-
 .../documentation/JSDocumentationBuilder.java |  10 +-
 .../JSDocumentationProcessor.java             |  10 +-
 .../JSDocumentationProvider.java              |  13 ++-
 .../documentation/JSDocumentationUtils.java   |  34 +++---
 .../lang/javascript/JSDocElementType.java     |   4 +-
 .../lang/javascript/JSElementType.java        |   4 +-
 .../lang/javascript/JSElementTypes.java       |  17 +--
 .../lang/javascript/JSLanguageInjector.java   |   5 +-
 .../lang/javascript/JSTokenTypes.java         |   6 +-
 .../javascript/flex/FlexImportSupport.java    |   4 +-
 .../lang/javascript/flex/JSResolveHelper.java |   3 +-
 .../javascript/flex/XmlBackedJSClassImpl.java |  18 +--
 .../highlighting/JSHighlighter.java           |   6 +-
 .../javascript/index/JSItemPresentation.java  |   2 +-
 .../lang/javascript/index/JSSymbolUtil.java   |   2 +-
 .../inspections/qucikFixes/BaseCreateFix.java |   6 +-
 .../lang/javascript/psi/JSElementFactory.java |   6 +-
 .../javascript/psi/JSStubElementType.java     |   7 +-
 .../psi/impl/JSArgumentListImpl.java          |   4 +-
 .../impl/JSArrayLiteralExpressionImpl.java    |   4 +-
 .../psi/impl/JSAssignmentExpressionImpl.java  |   5 +-
 .../javascript/psi/impl/JSAttributeImpl.java  |   9 +-
 .../psi/impl/JSAttributeListImpl.java         |  13 ++-
 .../impl/JSAttributeNameValuePairImpl.java    |   9 +-
 .../psi/impl/JSBinaryExpressionImpl.java      |   8 +-
 .../psi/impl/JSBlockStatementImpl.java        |   7 +-
 .../psi/impl/JSBreakStatementImpl.java        |   4 +-
 .../psi/impl/JSCallExpressionImpl.java        |   4 +-
 .../javascript/psi/impl/JSCaseClauseImpl.java |   4 +-
 .../javascript/psi/impl/JSCatchBlockImpl.java |   9 +-
 .../javascript/psi/impl/JSChangeUtil.java     |  18 +--
 .../lang/javascript/psi/impl/JSClassBase.java |  17 +--
 .../lang/javascript/psi/impl/JSClassImpl.java |  11 +-
 .../psi/impl/JSCommaExpressionImpl.java       |   4 +-
 .../psi/impl/JSConditionalExpressionImpl.java |   5 +-
 .../psi/impl/JSContinueStatementImpl.java     |   5 +-
 .../psi/impl/JSDefinitionExpressionImpl.java  |  10 +-
 .../psi/impl/JSDoWhileStatementImpl.java      |   5 +-
 .../javascript/psi/impl/JSDocCommentImpl.java |   4 +-
 .../javascript/psi/impl/JSDocTagImpl.java     |  11 +-
 .../psi/impl/JSDocTagValueImpl.java           |   7 +-
 .../javascript/psi/impl/JSElementImpl.java    |   4 +-
 .../psi/impl/JSEmbeddedContentImpl.java       |   9 +-
 .../psi/impl/JSEmptyStatementImpl.java        |   5 +-
 .../impl/JSExpressionCodeFragmentImpl.java    |   5 +-
 .../javascript/psi/impl/JSExpressionImpl.java |   4 +-
 .../psi/impl/JSExpressionStatementImpl.java   |   8 +-
 .../lang/javascript/psi/impl/JSFileImpl.java  |  19 ++--
 .../psi/impl/JSForInStatementImpl.java        |   9 +-
 .../psi/impl/JSForStatementImpl.java          |   9 +-
 .../psi/impl/JSFunctionBaseImpl.java          |  13 ++-
 .../psi/impl/JSFunctionExpressionImpl.java    |   9 +-
 .../javascript/psi/impl/JSFunctionImpl.java   |   9 +-
 .../psi/impl/JSGenericSignatureImpl.java      |   5 +-
 .../psi/impl/JSIfStatementImpl.java           |   5 +-
 .../psi/impl/JSImportStatementImpl.java       |   9 +-
 .../psi/impl/JSIncludeDirectiveImpl.java      |   6 +-
 ...JSIndexedPropertyAccessExpressionImpl.java |   4 +-
 .../psi/impl/JSLabeledStatementImpl.java      |   7 +-
 .../psi/impl/JSLetExpressionImpl.java         |   5 +-
 .../psi/impl/JSLetStatementImpl.java          |   5 +-
 .../psi/impl/JSLiteralExpressionImpl.java     |  15 +--
 .../psi/impl/JSNamespaceDeclarationImpl.java  |  10 +-
 .../psi/impl/JSNewExpressionImpl.java         |   6 +-
 .../impl/JSObjectLiteralExpressionImpl.java   |   8 +-
 .../psi/impl/JSPackageStatementImpl.java      |  15 +--
 .../javascript/psi/impl/JSParameterImpl.java  |   6 +-
 .../psi/impl/JSParameterListImpl.java         |   5 +-
 .../impl/JSParenthesizedExpressionImpl.java   |   5 +-
 .../psi/impl/JSPostfixExpressionImpl.java     |   7 +-
 .../psi/impl/JSPrefixExpressionImpl.java      |   8 +-
 .../javascript/psi/impl/JSPropertyImpl.java   |  14 +--
 .../javascript/psi/impl/JSPsiImplUtils.java   |  20 ++--
 .../psi/impl/JSReferenceExpressionImpl.java   |  24 ++--
 .../psi/impl/JSReferenceListImpl.java         |  10 +-
 .../javascript/psi/impl/JSReferenceSet.java   |  13 ++-
 .../psi/impl/JSReturnStatementImpl.java       |   4 +-
 .../JSSmartCompletionVariantsHandler.java     |   7 +-
 .../JSStatementWithLabelReferenceImpl.java    |   9 +-
 .../psi/impl/JSStubElementImpl.java           |  15 +--
 .../psi/impl/JSSuperExpressionImpl.java       |  11 +-
 .../psi/impl/JSSwitchStatementImpl.java       |   5 +-
 .../psi/impl/JSThisExpressionImpl.java        |   4 +-
 .../psi/impl/JSThrowStatementImpl.java        |   5 +-
 .../psi/impl/JSTryStatementImpl.java          |   7 +-
 .../psi/impl/JSUseNamespaceDirectiveImpl.java |   8 +-
 .../psi/impl/JSVarStatementImpl.java          |   9 +-
 .../psi/impl/JSVariableBaseImpl.java          |  15 +--
 .../javascript/psi/impl/JSVariableImpl.java   |   4 +-
 .../psi/impl/JSWhileStatementImpl.java        |   5 +-
 .../psi/impl/JSWithStatementImpl.java         |   5 +-
 .../psi/impl/JSXmlLiteralExpressionImpl.java  |   5 +-
 .../psi/impl/JSYieldStatementImpl.java        |   5 +-
 .../reference/JSPropertyNameReference.java    |  10 +-
 .../psi/resolve/BaseJSSymbolProcessor.java    |  11 +-
 .../psi/resolve/JSImportHandlingUtil.java     |  16 +--
 .../javascript/psi/resolve/JSResolveUtil.java |  36 +++---
 .../psi/resolve/ResolveProcessor.java         |   8 +-
 .../psi/resolve/WalkUpResolveProcessor.java   |   7 +-
 .../stubs/JSImplementedInterfacesIndex.java   |   4 +-
 .../javascript/psi/stubs/JSNameIndex.java     |   4 +-
 .../psi/stubs/JSQualifiedElementIndex.java    |   5 +-
 .../psi/stubs/JSSuperClassIndex.java          |   5 +-
 .../javascript/psi/util/JSLookupUtil.java     |   7 +-
 .../lang/javascript/search/JSClassSearch.java |   6 +-
 .../types/JSAttributeElementType.java         |  17 +--
 .../types/JSAttributeListElementType.java     |  17 +--
 .../types/JSAttributeNameValuePairType.java   |  17 +--
 .../javascript/types/JSClassElementType.java  |  18 +--
 .../javascript/types/JSFileElementType.java   |  17 +--
 .../types/JSFunctionElementType.java          |  13 ++-
 .../types/JSImportStatementElementType.java   |  17 +--
 .../types/JSIncludeDirectiveElementType.java  |  17 +--
 .../JSNamespaceDeclarationElementType.java    |  17 +--
 .../types/JSPackageStatementElementType.java  |  17 +--
 .../types/JSParameterElementType.java         |  16 +--
 .../types/JSParameterListElementType.java     |  17 +--
 .../types/JSReferenceListElementType.java     |  19 ++--
 .../types/JSUseNamespaceDirectiveType.java    |  17 +--
 .../types/JSVarStatementElementType.java      |  17 +--
 .../types/JSVariableElementType.java          |  17 +--
 .../validation/JSUnusedImportsHelper.java     |   2 +-
 .../JavaScriptQuickFixFactory.java            |   4 +-
 .../ide/hightlight/JavaScriptHighlighter.java |   9 +-
 .../qucikFixes/CreateJSFunctionFixBase.java   |   6 +-
 .../lang/BaseJavaScriptLanguageVersion.java   |  17 +--
 .../lang/JavaScript15LanguageVersion.java     |  11 +-
 .../lang/StandardJavaScriptVersionsImpl.java  |  11 +-
 .../lang/parsing/ContextKeywordCache.java     |   2 +-
 .../lang/parsing/ExpressionParsing.java       |   3 +-
 .../lang/parsing/FunctionParsing.java         |   9 +-
 .../lang/parsing/JavaScriptParser.java        |  10 +-
 .../parsing/JavaScriptParsingContext.java     |  15 +--
 .../javascript/lang/parsing/Parsing.java      |   8 +-
 .../lang/parsing/StatementParsing.java        |   5 +-
 .../impl/JavaScriptStrictParserBuilder.java   |   2 +-
 .../lang/psi/JavaScriptPrimitiveType.java     |   6 +-
 .../lang/psi/impl/JavaScriptClassType.java    |   7 +-
 .../psi/impl/JSComputedNameImpl.java          |   6 +-
 .../impl/JavaScriptLambdaExpressionImpl.java  |   9 +-
 .../psi/stubs/impl/JSFileStubImpl.java        |  10 +-
 .../stubs/index/JavaScriptClassNameIndex.java |   5 +-
 .../types/JSQualifiedStubElementType.java     |   5 +-
 .../javascript/JSDebuggerSupportUtils.java    |  12 +-
 .../debugger/JavaScriptEditorsProvider.java   |   8 +-
 .../JavaScriptLineBreakpointType.java         |  12 +-
 .../JavaScriptLineBreakpointTypeResolver.java |   7 +-
 .../debugger/JavaScriptListPanel.java         |  10 +-
 .../run/debug/V8BaseVariableValue.java        |  19 ++--
 .../javascript/run/debug/V8DebugProcess.java  |  25 +++--
 .../run/debug/V8ExecutionStack.java           |   3 +-
 .../javascript/run/debug/V8ScriptUtil.java    |   6 +-
 .../javascript/run/debug/V8StackFrame.java    |   8 +-
 .../run/debug/V8SuspendContext.java           |   2 +-
 .../javascript/run/debug/V8VariableValue.java |  14 ++-
 .../javascript/run/debug/V8WatchValue.java    |   8 +-
 .../com/sixrr/inspectjs/BaseInspection.java   |  15 +--
 .../inspectjs/BaseInspectionVisitor.java      |   6 +-
 .../com/sixrr/inspectjs/InspectionJSFix.java  |  11 +-
 .../sixrr/inspectjs/InspectionJSPlugin.java   |   5 +-
 .../AssignmentResultUsedJSInspection.java     |  10 +-
 ...ignmentToForLoopParameterJSInspection.java |  13 ++-
 ...gnmentToFunctionParameterJSInspection.java |   8 +-
 .../NestedAssignmentJSInspection.java         |  11 +-
 ...entWithOperatorAssignmentJSInspection.java |  13 ++-
 .../SillyAssignmentJSInspection.java          |   9 +-
 .../bitwise/IncompatibleMaskJSInspection.java |  13 ++-
 ...ointlessBitwiseExpressionJSInspection.java |  12 +-
 .../bitwise/ShiftOutOfRangeJSInspection.java  |  10 +-
 .../bugs/DivideByZeroJSInspection.java        |  13 ++-
 ...ityComparisonWithCoercionJSInspection.java |  15 +--
 .../bugs/InfiniteLoopJSInspection.java        |  13 ++-
 .../bugs/InfiniteRecursionJSInspection.java   |  11 +-
 ...tCircuitBooleanExpressionJSInspection.java |  14 ++-
 .../ObjectAllocationIgnoredJSInspection.java  |  13 ++-
 .../sixrr/inspectjs/bugs/RecursionUtils.java  |   7 +-
 .../inspectjs/bugs/RecursionVisitor.java      |   8 +-
 ...extLabelInSwitchStatementJSInspection.java |  10 +-
 .../AnonymousFunctionJSInspection.java        |   8 +-
 .../confusing/BlockStatementJSInspection.java |  10 +-
 .../confusing/CallerJSInspection.java         |   8 +-
 .../CommaExpressionJSInspection.java          |  10 +-
 .../ConditionalExpressionJSInspection.java    |   8 +-
 ...usingFloatingPointLiteralJSInspection.java |  12 +-
 .../ConfusingPlusesOrMinusesJSInspection.java |   8 +-
 .../DynamicallyGeneratedCodeJSInspection.java |  10 +-
 .../EmptyStatementBodyJSInspection.java       |  18 +--
 ...rementDecrementResultUsedJSInspection.java |   8 +-
 .../confusing/MagicNumberJSInspection.java    |  10 +-
 ...atedConditionalExpressionJSInspection.java |  11 +-
 .../NegatedIfStatementJSInspection.java       |  11 +-
 ...stedConditionalExpressionJSInspection.java |   9 +-
 .../confusing/NestedFunctionJSInspection.java |   8 +-
 .../confusing/OctalIntegerJSInspection.java   |   8 +-
 ...mplexArithmeticExpressionJSInspection.java |  10 +-
 ...yComplexBooleanExpressionJSInspection.java |  10 +-
 ...tlessArithmeticExpressionJSInspection.java |  10 +-
 ...ointlessBooleanExpressionJSInspection.java |  14 +--
 .../confusing/VoidExpressionJSInspection.java |   9 +-
 .../confusing/WithStatementJSInspection.java  |  10 +-
 .../control/BreakStatementJSInspection.java   |  12 +-
 .../BreakStatementWithLabelJSInspection.java  |  11 +-
 ...sionWithIdenticalBranchesJSInspection.java |   9 +-
 ...tantConditionalExpressionJSInspection.java |  10 +-
 .../ConstantIfStatementJSInspection.java      |  11 +-
 .../ContinueStatementJSInspection.java        |  12 +-
 ...ontinueStatementWithLabelJSInspection.java |  11 +-
 ...efaultNotLastCaseInSwitchJSInspection.java |  11 +-
 .../DuplicateConditionJSInspection.java       |   8 +-
 ...lthroughInSwitchStatementJSInspection.java |   8 +-
 ...ForLoopReplaceableByWhileJSInspection.java |  14 +--
 ...ThatDoesntUseLoopVariableJSInspection.java |  15 +--
 ...mentWithIdenticalBranchesJSInspection.java |  11 +-
 ...tementWithTooManyBranchesJSInspection.java |   8 +-
 .../control/LabeledStatementJSInspection.java |  10 +-
 ...opStatementThatDoesntLoopJSInspection.java |  15 +--
 .../NestedSwitchStatementJSInspection.java    |   9 +-
 ...tementWithNoDefaultBranchJSInspection.java |   8 +-
 .../control/TailRecursionJSInspection.java    |  11 +-
 .../TrivialConditionalJSInspection.java       |  11 +-
 .../control/TrivialIfJSInspection.java        |  13 ++-
 .../UnnecessaryContinueJSInspection.java      |  11 +-
 .../control/UnnecessaryLabelJSInspection.java |  16 +--
 ...saryLabelOnBreakStatementJSInspection.java |  13 ++-
 ...yLabelOnContinueStatementJSInspection.java |  14 ++-
 .../UnnecessaryReturnJSInspection.java        |  13 ++-
 .../ReuseOfLocalVariableJSInspection.java     |  18 +--
 .../UnnecessaryLocalVariableJSInspection.java |  10 +-
 .../dataflow/VariableAssignedVisitor.java     |  15 +--
 .../VariableUsedInInnerFunctionVisitor.java   |   9 +-
 .../dataflow/VariableUsedVisitor.java         |  12 +-
 .../dom/DocumentWriteJSInspection.java        |  10 +-
 .../inspectjs/dom/InnerHTMLJSInspection.java  |   9 +-
 .../dom/PlatformDetectionJSInspection.java    |  10 +-
 .../XHTMLIncompatabilitiesJSInspection.java   |   9 +-
 .../exception/CatchParameterUsedVisitor.java  |   6 +-
 ...ueOrBreakFromFinallyBlockJSInspection.java |  11 +-
 .../EmptyCatchBlockJSInspection.java          |  10 +-
 .../EmptyFinallyBlockJSInspection.java        |   9 +-
 .../exception/EmptyTryBlockJSInspection.java  |  10 +-
 .../ExceptionCaughtLocallyJSInspection.java   |  11 +-
 .../ReturnFromFinallyBlockJSInspection.java   |  11 +-
 .../ThrowFromFinallyBlockJSInspection.java    |  11 +-
 .../UnusedCatchParameterJSInspection.java     |  10 +-
 .../com/sixrr/inspectjs/fix/RenameFix.java    |   4 +-
 .../CyclomaticComplexityJSInspection.java     |  11 +-
 .../CyclomaticComplexityVisitor.java          |  15 +--
 ...FunctionWithMultipleLoopsJSInspection.java |   8 +-
 ...nWithMultipleReturnPointsJSInspection.java |   8 +-
 .../functionmetrics/LoopCountVisitor.java     |  10 +-
 .../functionmetrics/NegationCountVisitor.java |   6 +-
 .../NestingDepthJSInspection.java             |  10 +-
 .../functionmetrics/NestingDepthVisitor.java  |  14 +--
 .../ParametersPerFunctionJSInspection.java    |  10 +-
 .../StatementCountVisitor.java                |   5 +-
 .../StatementsPerFunctionJSInspection.java    |  11 +-
 ...ThreeNegationsPerFunctionJSInspection.java |  11 +-
 .../FunctionNamingConventionJSInspection.java |   6 +-
 ...lVariableNamingConventionJSInspection.java |   7 +-
 ...ParameterNamingConventionJSInspection.java |   7 +-
 .../style/ChainedEqualityJSInspection.java    |  15 +--
 .../ChainedFunctionCallJSInspection.java      |  10 +-
 ...ConstantOnLHSOfComparisonJSInspection.java |  13 ++-
 ...ConstantOnRHSOfComparisonJSInspection.java |  13 ++-
 .../style/NestedFunctionCallJSInspection.java |  10 +-
 .../NonBlockStatementBodyJSInspection.java    |  19 ++--
 .../UnterminatedStatementJSInspection.java    |  11 +-
 .../com/sixrr/inspectjs/utils/BoolUtils.java  |  12 +-
 .../inspectjs/utils/ComparisonUtils.java      |  10 +-
 .../inspectjs/utils/ControlFlowUtils.java     |  76 ++++++-------
 .../inspectjs/utils/EquivalenceChecker.java   | 104 +++++++++---------
 .../sixrr/inspectjs/utils/ExpressionUtil.java |   3 +-
 .../inspectjs/utils/SideEffectChecker.java    |  17 +--
 .../BadExpressionStatementJSInspection.java   |   8 +-
 .../DebuggerStatementJSInspection.java        |   9 +-
 .../DuplicateCaseLabelJSInspection.java       |   8 +-
 ...DuplicatePropertyOnObjectJSInspection.java |   6 +-
 ...onWithInconsistentReturnsJSInspection.java |   9 +-
 .../StringLiteralBreaksHTMLJSInspection.java  |   8 +-
 ...ionReferencesGlobalObjectJSInspection.java |   8 +-
 .../validity/UnreachableCodeJSInspection.java |   9 +-
 .../intention/JSElementPredicate.java         |   4 +-
 .../javascript/intention/JSIntention.java     |  16 +--
 .../intention/JSMutablyNamedIntention.java    |  11 +-
 .../intention/bool/ComparisonPredicate.java   |   4 +-
 .../intention/bool/ConjunctionPredicate.java  |   5 +-
 .../bool/JSDeMorgansLawIntention.java         |   8 +-
 .../bool/JSFlipComparisonIntention.java       |   8 +-
 .../bool/JSFlipConjunctionIntention.java      |   8 +-
 .../bool/JSNegateComparisonIntention.java     |   7 +-
 .../JSRemoveBooleanEqualityIntention.java     |   8 +-
 .../braces/JSAddBracesIntention.java          |   8 +-
 .../braces/JSRemoveBracesIntention.java       |   9 +-
 .../JSChangeToCStyleCommentIntention.java     |   8 +-
 .../JSChangeToEndOfLineCommentIntention.java  |   9 +-
 .../JSMoveCommentToSeparateLineIntention.java |   9 +-
 .../JSFlipConditionalIntention.java           |   9 +-
 .../conditional/JSFlipIfIntention.java        |   9 +-
 .../JSRemoveConditionalIntention.java         |   9 +-
 .../JSReplaceConditionalWithIfIntention.java  |   9 +-
 .../JSConstantExpressionIntention.java        |   9 +-
 .../JSConstantSubexpressionIntention.java     |  12 +-
 .../JSExtractIncrementIntention.java          |   9 +-
 ...DeclarationAndInitializationIntention.java |   8 +-
 ...DeclarationAndInitializationIntention.java |   8 +-
 .../JSMergeParallelForInLoopsIntention.java   |   9 +-
 .../JSMergeParallelForLoopsIntention.java     |   9 +-
 .../JSConvertIntegerToDecimalIntention.java   |   9 +-
 .../JSConvertIntegerToHexIntention.java       |   9 +-
 .../JSConvertIntegerToOctalIntention.java     |   8 +-
 .../JSReplaceMultiplyWithShiftIntention.java  |   9 +-
 .../JSReplaceShiftWithMultiplyIntention.java  |   9 +-
 ...eplaceWithOperatorAssignmentIntention.java |   9 +-
 ...RemoveUnnecessaryParenthesesIntention.java |   9 +-
 ...JSDoubleToSingleQuotedStringIntention.java |   9 +-
 ...inConcatenatedStringLiteralsIntention.java |   9 +-
 ...JSSingleToDoubleQuotedStringIntention.java |   9 +-
 .../JSReplaceIfWithSwitchIntention.java       |   9 +-
 .../JSReplaceSwitchWithIfIntention.java       |   8 +-
 .../trivialif/JSMergeElseIfIntention.java     |   8 +-
 .../trivialif/JSMergeIfAndIntention.java      |   8 +-
 .../trivialif/JSMergeIfOrIntention.java       |   9 +-
 .../JSMergeParallelIfsIntention.java          |   9 +-
 .../JSRemoveRedundantElseIntention.java       |   8 +-
 .../JSReplaceIfWithConditionalIntention.java  |   9 +-
 .../trivialif/JSSimplifyIfElseIntention.java  |   9 +-
 .../trivialif/JSSplitElseIfIntention.java     |   9 +-
 .../trivialif/JSSplitIfAndIntention.java      |   9 +-
 .../trivialif/JSSplitIfOrIntention.java       |   9 +-
 .../lang/javascript/psiutil/BoolUtils.java    |   3 +-
 .../javascript/psiutil/ControlFlowUtils.java  |  27 ++---
 .../lang/javascript/psiutil/ErrorUtil.java    |   4 +-
 .../javascript/psiutil/ExpressionUtil.java    |   6 +-
 .../javascript/psiutil/FindReferenceUtil.java |  24 ++--
 .../javascript/psiutil/JSElementFactory.java  |  50 +++++----
 .../javascript/psiutil/RecursionUtil.java     |   6 +-
 .../lang/javascript/psiutil/TreeUtil.java     |  14 +--
 .../psiutil/VariableAccessUtil.java           |  50 +++++----
 .../actionscript/ActionScriptFileType.java    |  12 +-
 .../ActionScriptFileTypeFactory.java          |   5 +-
 .../lang/ActionScriptLanguageVersion.java     |  13 ++-
 .../lang/EcmaScript4JavaScriptVersion.java    |   9 +-
 .../lang/parsing/EcmaScript4Parser.java       |   4 +-
 .../parsing/EcmaScript4ParsingContext.java    |   8 +-
 .../parsing/EcmaScript4StatementParsing.java  |   6 +-
 .../lang/EcmaScript6JavaScriptVersion.java    |  13 ++-
 .../javascript/lang/EcmaScriptFileType.java   |  12 +-
 .../lang/EcmaScriptFileTypeFactory.java       |   4 +-
 .../lang/parsing/EcmaScript6Parser.java       |   7 +-
 .../parsing/EcmaScript6ParsingContext.java    |   6 +-
 .../parsing/EcmaScript6StatementParsing.java  |   5 +-
 .../lang/JavaScript16LanguageVersion.java     |  11 +-
 .../lang/JavaScript17LanguageVersion.java     |  10 +-
 .../lang/JavaScript185LanguageVersion.java    |  11 +-
 .../lang/JavaScript18LanguageVersion.java     |  11 +-
 .../main/java/consulo/json/JsonFileType.java  |  12 +-
 .../consulo/json/JsonFileTypeFactory.java     |   4 +-
 .../consulo/json/jom/JomFileDescriptor.java   |  10 +-
 .../java/consulo/json/jom/JomFileElement.java |  10 +-
 .../json/jom/JomIconDescriptorUpdater.java    |   4 +-
 .../java/consulo/json/jom/JomManager.java     |  12 +-
 .../JomModeAsJsonFileDescriptorProvider.java  |  13 ++-
 .../main/java/consulo/json/jom/JomUtil.java   |   7 +-
 .../jom/proxy/JomProxyInvocationHandler.java  |   8 +-
 .../json/jom/proxy/JomValueConverter.java     |  11 +-
 .../json/jom/proxy/impl/JomBooleanValue.java  |   6 +-
 .../jom/proxy/impl/JomCollectionValue.java    |   7 +-
 .../json/jom/proxy/impl/JomMapConverter.java  |   4 +-
 .../proxy/impl/JomNullableNumberValue.java    |   7 +-
 .../jom/proxy/impl/JomStringConverter.java    |   5 +-
 .../json/lang/JsonJavaScriptParser.java       |   6 +-
 .../json/lang/JsonJavaScriptVersion.java      |  12 +-
 .../JsonFileDescriptorProvider.java           |   7 +-
 .../JsonFileDescriptorProviders.java          |   3 +-
 .../consulo/json/validation/NativeArray.java  |   6 +-
 .../completion/JsonCompletionContributor.java |  11 +-
 ...ByAnotherPsiElementEditorNotification.java |  11 +-
 ...therPsiElementJsonDescriptionProvider.java |   6 +-
 ...escriptionByAnotherPsiElementProvider.java |  20 ++--
 ...scriptionByAnotherPsiElementRegistrar.java |   6 +-
 ...DescriptionByAnotherPsiElementService.java |  28 ++---
 .../descriptor/JsonObjectDescriptor.java      |  19 ++--
 .../descriptor/JsonPropertyDescriptor.java    |  14 +--
 .../PropertyValidationInspection.java         |  18 +--
 .../reference/JsonPropertyNameReference.java  |   3 +-
 .../JsonPropertyNameReferenceProvider.java    |   6 +-
 .../typescript/TypeScriptFileType.java        |  10 +-
 .../typescript/TypeScriptFileTypeFactory.java |   4 +-
 .../intellij/javascript/JSClassNameMacro.java |   9 +-
 .../JSImplementationTextSelectioner.java      |   7 +-
 .../javascript/JSMethodNameMacro.java         |   9 +-
 .../javascript/JSParameterInfoHandler.java    |  28 ++---
 .../javascript/JSSmartEnterProcessor.java     |   5 +-
 .../javascript/JavaScriptCodeContextType.java |   6 +-
 .../JavaScriptTargetElementUtilEx.java        |   4 +-
 .../lang/javascript/JavascriptCommenter.java  |   2 +-
 .../JavaScriptClassGroupRuleProvider.java     |   5 +-
 .../JavaScriptFindUsagesProvider.java         |  19 ++--
 .../JavaScriptFunctionGroupRuleProvider.java  |   5 +-
 .../JavaScriptGroupRuleProviderBase.java      |   8 +-
 ...ImportECMAScriptClassOrFunctionAction.java |  15 +--
 .../flex/ECMAScriptImportOptimizer.java       |   4 +-
 .../lang/javascript/flex/ImportUtils.java     |   6 +-
 .../flex/importer/AS3InterfaceDumper.java     |  20 ++--
 .../flex/importer/AS3InterfaceStubDumper.java |   8 +-
 .../lang/javascript/flex/importer/Abc.java    |   6 +-
 .../javascript/flex/importer/AbcDumper.java   |  20 ++--
 .../flex/importer/AbstractDumpProcessor.java  |   7 +-
 .../javascript/flex/importer/ByteBuffer.java  |   4 +-
 .../FlexByteCodeInformationProcessor.java     |  22 ++--
 .../flex/importer/FlexImporter.java           |   5 +-
 .../javascript/flex/importer/MemberInfo.java  |   6 +-
 .../formatter/JSCodeStylePanel.java           |   4 +-
 .../JSCodeStyleSettingsProvider.java          |   6 +-
 .../formatter/JSFormattingModel.java          |   7 +-
 .../JavascriptFormattingModelBuilder.java     |   5 +-
 .../javascript/formatter/blocks/JSBlock.java  |  10 +-
 .../formatter/blocks/JSDocCommentBlock.java   |  10 +-
 .../formatter/blocks/SubBlockVisitor.java     |   2 +-
 .../generation/BaseJSGenerateAction.java      |   5 +-
 .../JavaScriptGenerateAccessorHandler.java    |   8 +-
 .../highlighting/JSBraceMatcher.java          |   7 +-
 .../JavaScriptColorsAndFontsPage.java         |  12 +-
 .../JavaScriptHighlightVisitor.java           |  20 ++--
 .../JavaScriptLineMarkerProvider.java         |   9 +-
 .../CreateClassOrInterfaceAction.java         |   9 +-
 .../JSDeprecatedSymbolsInspection.java        |   9 +-
 .../JSDuplicatedDeclarationInspection.java    |  11 +-
 .../javascript/inspections/JSInspection.java  |  10 +-
 .../JSUndeclaredVariableInspection.java       |  15 +--
 .../JSUnresolvedFunctionInspection.java       |  22 ++--
 .../JSUnresolvedVariableInspection.java       |  15 +--
 .../JSUntypedDeclarationInspection.java       |  17 +--
 .../JSUnusedLocalSymbolsInspection.java       |  18 +--
 .../JavaScriptSymbolContributor.java          |   7 +-
 .../refactoring/JSBaseIntroduceHandler.java   |  10 +-
 .../JavascriptRefactoringSupportProvider.java |   2 +-
 .../JSExtractFunctionHandler.java             |   7 +-
 .../search/JSDeclarationRangeHandler.java     |   7 +-
 .../search/JSDefinitionsSearchExecutor.java   |   5 +-
 .../search/JSGotoTargetRendererProvider.java  |   2 +-
 .../JSStructureViewBuilderFactory.java        |   4 +-
 .../structureView/JSStructureViewElement.java |   3 +-
 .../structureView/JSStructureViewModel.java   |  27 ++---
 .../structureView/JSSuperGroup.java           |   2 +-
 .../structureView/JSSuperGrouper.java         |   9 +-
 .../JSExpressionSurroundDescriptor.java       |   7 +-
 .../surroundWith/JSStatementSurrounder.java   |  10 +-
 .../JSStatementsSurroundDescriptor.java       |   7 +-
 .../JSWithParenthesesSurrounder.java          |   9 +-
 .../JSWithTryCatchFinallySurrounder.java      |   5 +-
 .../validation/BaseCreateMethodsFix.java      |   4 +-
 .../validation/ImplementMethodsFix.java       |   9 +-
 .../ImplementedMethodProcessor.java           |   2 +-
 .../validation/JSAnnotatingVisitor.java       |  49 +++++----
 .../UpdateJavaScriptFileCopyright.java        |   5 +-
 ...UpdateJavaScriptFileCopyrightProvider.java |  13 ++-
 .../JavaScriptCodeStyleConfigurable.java      |   5 +-
 ...riptLanguageCodeStyleSettingsProvider.java |   9 +-
 .../ide/JavaScriptIconDescriptorUpdater.java  |   6 +-
 .../actions/JavaScriptCreateFileAction.java   |   2 +-
 ...avaScriptKeywordCompletionContributor.java |   4 +-
 .../JavaScriptSyntaxHighlightFactory.java     |   7 +-
 .../lang/JavaScriptFileTypeFactory.java       |   4 +-
 .../JavaScriptLanguageVersionResolver.java    |  13 ++-
 .../lang/JavaScriptParsingDefinition.java     |   9 +-
 .../lang/JavaScriptQuoteHandler.java          |   4 +-
 .../JavaScriptRegexpMultiHostInjector.java    |   4 +-
 .../JavaScriptClassContributor.java           |   7 +-
 .../lang/psi/JavaScriptSimpleType.java        |   9 +-
 ...efaultJSPropertyNameReferenceProvider.java |   6 +-
 .../ClientJavaScriptModuleExtension.java      |  28 ++---
 .../ClientJavaScriptModuleExtensionPanel.java |   4 +-
 ...lientJavaScriptMutableModuleExtension.java |  14 +--
 ...ntJavaScriptPredefinedBundlesProvider.java |   4 +-
 .../module/sdk/ClientJavaScriptSdkType.java   |   8 +-
 513 files changed, 2653 insertions(+), 2331 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
index 8c2cf4b0..68fe9613 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -16,10 +16,10 @@
 
 package com.intellij.lang.javascript;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
@@ -46,21 +46,21 @@ public JavaScriptFileType()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getId()
 	{
 		return "JavaScript";
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDescription()
 	{
 		return JavaScriptBundle.message("javascript.filetype.description");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDefaultExtension()
 	{
 		return "js";
@@ -72,7 +72,7 @@ public Icon getIcon()
 		return JavaScriptIcons.JavaScript;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
index adef40b4..beb3cb24 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.StubBasedPsiElement;
@@ -31,7 +32,7 @@ public interface JSAttribute extends JSElement, PsiNamedElement, StubBasedPsiEle
 
 	public static ArrayFactory<JSAttribute> ARRAY_FACTORY = new ArrayFactory<JSAttribute>()
 	{
-		@NotNull
+		@Nonnull
 		@Override
 		public JSAttribute[] create(int count)
 		{
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
index 8981a4f3..b0c46774 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.StubBasedPsiElement;
@@ -35,8 +36,8 @@ public interface JSAttributeList extends JSElement, StubBasedPsiElement<JSAttrib
 
 	JSAttribute[] getAttributes();
 
-	@NotNull
-	JSAttribute[] getAttributesByName(@NotNull String name);
+	@Nonnull
+	JSAttribute[] getAttributesByName(@Nonnull String name);
 
 	enum AccessType
 	{
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
index 28acdae6..eb6ba92e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.psi.PsiElement;
 
 /**
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
index 112a5297..e2c2f4bc 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.StubBasedPsiElement;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
index 1bc772c0..78944358 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.StubBasedPsiElement;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
index 09e5e89c..8454225c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.psi.PsiNamedElement;
 
 public interface JSDocTag extends PsiNamedElement, JSElement
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
index 416ea46f..a70cee6b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.util.ArrayFactory;
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
@@ -31,7 +32,7 @@ public interface JSExpression extends JSElement
 
 	public static ArrayFactory<JSExpression> ARRAY_FACTORY = new ArrayFactory<JSExpression>()
 	{
-		@NotNull
+		@Nonnull
 		@Override
 		public JSExpression[] create(int count)
 		{
@@ -39,10 +40,10 @@ public JSExpression[] create(int count)
 		}
 	};
 
-	@NotNull
+	@Nonnull
 	JSExpression replace(JSExpression other);
 
-	@NotNull
+	@Nonnull
 	@RequiredReadAction
 	JavaScriptType getType();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index 4dde6618..761216fd 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.util.ArrayFactory;
@@ -34,7 +35,7 @@ public interface JSFunction extends JSQualifiedNamedElement, JSSourceElement, JS
 
 	public static ArrayFactory<JSFunction> ARRAY_FACTORY = new ArrayFactory<JSFunction>()
 	{
-		@NotNull
+		@Nonnull
 		@Override
 		public JSFunction[] create(int count)
 		{
@@ -57,7 +58,7 @@ public JSFunction[] create(int count)
 	@RequiredReadAction
 	boolean isConstructor();
 
-	@NotNull
+	@Nonnull
 	JavaScriptType getReturnType();
 
 	String getReturnTypeString();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
index 14a607b2..b0924085 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author max
@@ -24,6 +24,6 @@
  */
 public interface JSFunctionExpression extends JSFunction, JSExpression
 {
-	@NotNull
+	@Nonnull
 	JSFunction getFunction();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
index d06e8de3..59e0cf1b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSNamespaceDeclarationStub;
 import com.intellij.psi.StubBasedPsiElement;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
index d80af5d0..0240e5c0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ArrayFactory;
 import consulo.annotations.RequiredReadAction;
@@ -33,7 +33,7 @@ public interface JSParameter extends JSVariable
 
 	public static ArrayFactory<JSParameter> ARRAY_FACTORY = new ArrayFactory<JSParameter>()
 	{
-		@NotNull
+		@Nonnull
 		@Override
 		public JSParameter[] create(int count)
 		{
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
index c647474f..7ce81739 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.psi.tree.IElementType;
 
 /**
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
index f1e6c652..3df962c3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
index 23cb2931..6d56558c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
@@ -17,8 +17,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.psi.PsiElement;
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
@@ -42,7 +42,7 @@ public interface JSProperty extends JSNamedElement
 	@RequiredReadAction
 	JSComputedName getComputedName();
 
-	@NotNull
+	@Nonnull
 	@RequiredReadAction
 	JavaScriptType getType();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
index 3a32a5b9..0e565e0c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiPolyVariantReference;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
index 2083ace5..8278a5e8 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
 import com.intellij.psi.StubBasedPsiElement;
@@ -27,14 +28,14 @@
 public interface JSReferenceList extends JSElement, StubBasedPsiElement<JSReferenceListStub>
 {
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	JSReferenceExpression[] getExpressions();
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	String[] getReferenceTexts();
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	JSClass[] getReferencedClasses();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
index 943a975c..cfafa152 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -30,7 +30,7 @@ public interface JSTryStatement extends JSStatement
 {
 	JSStatement getStatement();
 
-	@NotNull
+	@Nonnull
 	JSCatchBlock[] getAllCatchBlocks();
 
 	@Deprecated
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index 34221ca4..dbe37f48 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
 import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.util.IncorrectOperationException;
@@ -42,7 +42,7 @@ public interface JSVariable extends JSQualifiedNamedElement, JSAttributeListOwne
 
 	void setInitializer(JSExpression expr) throws IncorrectOperationException;
 
-	@NotNull
+	@Nonnull
 	JavaScriptType getType();
 
 	@Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
index bdc3990c..b0f6120b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * User: max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
index 3299fbbb..9edba051 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.stubs;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import com.intellij.psi.stubs.StubElement;
 
diff --git a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
index 4fb8fcfa..0047f001 100644
--- a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
+++ b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
@@ -1,6 +1,7 @@
 package consulo.javascript.index;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.javascript.psi.stubs.JSFileStub;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.stubs.IndexSink;
@@ -13,7 +14,7 @@ public abstract class JavaScriptIndexer
 {
 	public static final ExtensionPointName<JavaScriptIndexer> EP_NAME = ExtensionPointName.create("consulo.javascript.indexer");
 
-	public void indexFile(@NotNull JSFileStub fileStub, @NotNull final IndexSink sink)
+	public void indexFile(@Nonnull JSFileStub fileStub, @Nonnull final IndexSink sink)
 	{
 	}
 
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
index 33155e8e..bc767370 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -38,7 +38,7 @@ public enum JavaScriptFeature
 		myName = name;
 	}
 
-	@NotNull
+	@Nonnull
 	public String getName()
 	{
 		return myName;
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
index 07e93bf3..9382f919 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
@@ -16,8 +16,8 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.lang.LanguageVersion;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -28,6 +28,6 @@
  */
 public interface JavaScriptFileTypeWithVersion
 {
-	@NotNull
+	@Nonnull
 	LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile);
 }
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
index 3c56e572..aea26664 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.openapi.fileTypes.LanguageFileType;
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java
index ab3aa9fc..daefc66b 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java
@@ -2,7 +2,8 @@
 
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.Language;
 import consulo.lang.LanguageVersion;
 import consulo.lang.LanguageVersionWithParsing;
@@ -13,15 +14,15 @@
  */
 public abstract class JavaScriptLanguageVersion extends LanguageVersion implements LanguageVersionWithParsing
 {
-	public JavaScriptLanguageVersion(@NotNull String id, @NotNull String name, @NotNull Language language, String... mimeTypes)
+	public JavaScriptLanguageVersion(@Nonnull String id, @Nonnull String name, @Nonnull Language language, String... mimeTypes)
 	{
 		super(id, name, language, mimeTypes);
 	}
 
-	@NotNull
+	@Nonnull
 	public abstract Set<JavaScriptFeature> getFeatures();
 
-	@NotNull
+	@Nonnull
 	public String getPresentableName()
 	{
 		return getName();
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
index e2defa24..007d2d92 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
@@ -19,7 +19,8 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.lang.LanguageVersion;
 import com.intellij.psi.PsiElement;
 
@@ -29,12 +30,12 @@
  */
 public class JavaScriptVersionUtil
 {
-	public static boolean containsFeature(@NotNull PsiElement element, @NotNull JavaScriptFeature feature)
+	public static boolean containsFeature(@Nonnull PsiElement element, @Nonnull JavaScriptFeature feature)
 	{
 		return getFeatures(element).contains(feature);
 	}
 
-	public static Set<JavaScriptFeature> getFeatures(@NotNull PsiElement element)
+	public static Set<JavaScriptFeature> getFeatures(@Nonnull PsiElement element)
 	{
 		LanguageVersion languageVersion = element.getLanguageVersion();
 		return languageVersion instanceof JavaScriptLanguageVersion ? ((JavaScriptLanguageVersion) languageVersion).getFeatures() : Collections.<JavaScriptFeature>emptySet();
diff --git a/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
index a0064c42..ffc74eee 100644
--- a/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
@@ -18,8 +18,8 @@
 
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.openapi.components.ServiceManager;
 
 /**
@@ -33,17 +33,17 @@ public static interface Marker
 		int getWeight();
 	}
 
-	@NotNull
+	@Nonnull
 	public static StandardJavaScriptVersions getInstance()
 	{
 		return ServiceManager.getService(StandardJavaScriptVersions.class);
 	}
 
-	@NotNull
+	@Nonnull
 	public abstract JavaScriptLanguageVersion getDefaultVersion();
-	@NotNull
+	@Nonnull
 	public abstract List<JavaScriptLanguageVersion> getValidLanguageVersions();
 
-	@NotNull
+	@Nonnull
 	public abstract JavaScriptLanguageVersion findVersionById(@Nullable String id);
 }
diff --git a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java b/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
index 3568993e..bff6470b 100644
--- a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
+++ b/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
@@ -16,8 +16,8 @@
 
 package consulo.javascript.lang.psi;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
@@ -30,7 +30,7 @@ public interface JavaScriptType
 	JavaScriptType UNKNOWN = new JavaScriptType()
 	{
 		@RequiredReadAction
-		@NotNull
+		@Nonnull
 		@Override
 		public String getPresentableText()
 		{
@@ -45,7 +45,7 @@ public PsiElement getTargetElement()
 		}
 	};
 
-	@NotNull
+	@Nonnull
 	@RequiredReadAction
 	String getPresentableText();
 
diff --git a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java b/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
index 232faa96..454d0b0e 100644
--- a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
+++ b/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.lang.psi;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSElement;
 
 /**
@@ -25,6 +25,6 @@
  */
 public interface JavaScriptTypeElement extends JSElement
 {
-	@NotNull
+	@Nonnull
 	JavaScriptType getType();
 }
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
index 60ae8e76..112d5c1f 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
@@ -1,6 +1,7 @@
 package consulo.javascript.module.extension;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.ModuleExtensionWithSdk;
 
@@ -10,6 +11,6 @@
  */
 public interface JavaScriptModuleExtension<T extends JavaScriptModuleExtension<T>> extends ModuleExtensionWithSdk<T>
 {
-	@NotNull
+	@Nonnull
 	LanguageVersion getLanguageVersion();
 }
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
index 261caef9..34dcf6de 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.module.extension;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.MutableModuleExtensionWithSdk;
 
@@ -26,5 +26,5 @@
  */
 public interface JavaScriptMutableModuleExtension<T extends JavaScriptModuleExtension<T>> extends JavaScriptModuleExtension<T>, MutableModuleExtensionWithSdk<T>
 {
-	void setLanguageVersion(@NotNull LanguageVersion languageVersion);
+	void setLanguageVersion(@Nonnull LanguageVersion languageVersion);
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
index b0b93a5f..cce7278f 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.psi;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
 
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
index 4e3a1088..35b52077 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
@@ -17,7 +17,8 @@
 
 package consulo.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.tree.IElementType;
@@ -28,7 +29,7 @@
  */
 public interface JSSimpleLiteralExpression extends JSLiteralExpression
 {
-	@NotNull
+	@Nonnull
 	@RequiredReadAction
 	IElementType getLiteralElementType();
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
index 3553df71..02e3f5b7 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParameterList;
@@ -27,7 +28,7 @@
  */
 public interface JavaScriptLambdaExpression extends JSExpression
 {
-	@NotNull
+	@Nonnull
 	@RequiredReadAction
 	JSParameterList getParameterList();
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index 23070fcb..27303b86 100644
--- a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -17,8 +17,9 @@
 
 package consulo.javascript.psi.impl.reference;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.PsiReference;
 import consulo.annotations.RequiredReadAction;
@@ -35,5 +36,5 @@ public interface JSPropertyNameReferenceProvider
 
 	@Nullable
 	@RequiredReadAction
-	PsiReference getReference(@NotNull JSProperty property);
+	PsiReference getReference(@Nonnull JSProperty property);
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
index 42c4c8ed..09f9c26d 100644
--- a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
+++ b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
@@ -1,6 +1,6 @@
 package consulo.javascript.psi.stubs;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.psi.stubs.PsiFileStub;
 
@@ -10,6 +10,6 @@
  */
 public interface JSFileStub extends PsiFileStub<JSFile>
 {
-	@NotNull
+	@Nonnull
 	String getName();
 }
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
index aa6a7a3b..d22a00c1 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
@@ -28,8 +28,8 @@
 import java.util.regex.Pattern;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.ide.BrowserUtil;
 import com.intellij.lang.javascript.index.JSSymbolUtil;
@@ -157,7 +157,7 @@ public boolean needsPlainCommentData()
 	}
 
 	@Override
-	public boolean onCommentLine(@NotNull String line)
+	public boolean onCommentLine(@Nonnull String line)
 	{
 		String trimmedLine = line.trim();
 		boolean parametersStarted = false;
@@ -239,8 +239,8 @@ private void setResult(final StringBuilder builder)
 	}
 
 	@Override
-	public boolean onPatternMatch(@NotNull MetaDocType metaDocType, @Nullable String matchName, @Nullable String matchValue,
-			@Nullable String remainingLineContent, @NotNull final String line, final String patternMatched)
+	public boolean onPatternMatch(@Nonnull MetaDocType metaDocType, @Nullable String matchName, @Nullable String matchValue,
+			@Nullable String remainingLineContent, @Nonnull final String line, final String patternMatched)
 	{
 		if(metaDocType == MetaDocType.DEFAULT)
 		{
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
index 4b3badc3..31b81845 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
@@ -22,8 +22,8 @@
  */
 package com.intellij.javascript.documentation;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public interface JSDocumentationProcessor
 {
@@ -35,8 +35,8 @@ enum MetaDocType
 
 	boolean needsPlainCommentData();
 
-	boolean onCommentLine(@NotNull String line);
+	boolean onCommentLine(@Nonnull String line);
 
-	boolean onPatternMatch(@NotNull MetaDocType type, @Nullable String matchName, @Nullable final String matchValue,
-			@Nullable String remainingLineContent, @NotNull final String line, final String patternMatched);
+	boolean onPatternMatch(@Nonnull MetaDocType type, @Nullable String matchName, @Nullable final String matchValue,
+			@Nullable String remainingLineContent, @Nonnull final String line, final String patternMatched);
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 89343aff..1c75abbd 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -23,9 +23,10 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.documentation.CodeDocumentationProvider;
@@ -424,7 +425,7 @@ private static void appendAttrList(final JSAttributeListOwner jsClass, final Str
 
 	private static
 	@Nullable
-	String generateReferenceTargetList(final @Nullable JSReferenceList implementsList, @NotNull String packageName)
+	String generateReferenceTargetList(final @Nullable JSReferenceList implementsList, @Nonnull String packageName)
 	{
 		if(implementsList == null)
 		{
@@ -793,7 +794,7 @@ public PsiElement getDocumentationElementForLink(final PsiManager psiManager, St
 	}
 
 	@Nullable
-	private static PsiElement getDocumentationElementForLinkStatic(final PsiManager psiManager, String link, @NotNull PsiElement context)
+	private static PsiElement getDocumentationElementForLinkStatic(final PsiManager psiManager, String link, @Nonnull PsiElement context)
 	{
 		final int delimiterIndex = link.lastIndexOf(':');
 
@@ -891,7 +892,7 @@ protected static JSAttributeNameValuePair findNamedAttribute(JSClass clazz, fina
 		JSResolveUtil.processMetaAttributesForClass(clazz, new JSResolveUtil.MetaDataProcessor()
 		{
 			@Override
-			public boolean process(@NotNull JSAttribute jsAttribute)
+			public boolean process(@Nonnull JSAttribute jsAttribute)
 			{
 				if(type.equals(jsAttribute.getName()))
 				{
@@ -943,7 +944,7 @@ public PsiComment findExistingDocComment(PsiComment contextElement)
 
 	@Nullable
 	@Override
-	public Pair<PsiElement, PsiComment> parseContext(@NotNull PsiElement element)
+	public Pair<PsiElement, PsiComment> parseContext(@Nonnull PsiElement element)
 	{
 		return null;
 	}
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
index b26feb09..b453ffb1 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
@@ -30,8 +30,8 @@
 import java.util.regex.Pattern;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeInsight.documentation.DocumentationManager;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -440,7 +440,7 @@ else if(text.startsWith("/*") || text.startsWith("//"))
 
 	static
 	@Nullable
-	ASTNode findTrailingCommentInFunctionBody(final @NotNull JSFunction function)
+	ASTNode findTrailingCommentInFunctionBody(final @Nonnull JSFunction function)
 	{
 		final ASTNode block = function.getNode().findChildByType(JSElementTypes.BLOCK_STATEMENT);
 		if(block == null)
@@ -464,7 +464,7 @@ else if(JSElementTypes.STATEMENTS.contains(prev.getElementType()))
 
 	static
 	@Nullable
-	ASTNode findLeadingCommentInFunctionBody(final @NotNull PsiElement element)
+	ASTNode findLeadingCommentInFunctionBody(final @Nonnull PsiElement element)
 	{
 		final ASTNode functionNode = element.getNode();
 		final ASTNode block = functionNode.findChildByType(JSElementTypes.BLOCK_STATEMENT);
@@ -597,7 +597,7 @@ else if(shouldSkipPrevExprStatement &&
 
 	private static
 	@Nullable
-	String getPropertyNameFromExprStatement(@NotNull PsiElement element)
+	String getPropertyNameFromExprStatement(@Nonnull PsiElement element)
 	{
 		String propName = null;
 
@@ -638,14 +638,14 @@ public boolean needsPlainCommentData()
 				}
 
 				@Override
-				public boolean onCommentLine(@NotNull final String line)
+				public boolean onCommentLine(@Nonnull final String line)
 				{
 					return true;
 				}
 
 				@Override
-				public boolean onPatternMatch(@NotNull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-						@Nullable final String remainingLineContent, @NotNull final String line, final String patternMatched)
+				public boolean onPatternMatch(@Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
+						@Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched)
 				{
 					if(isparameter && type == MetaDocType.PARAMETER && matchName != null && matchName.equals(name))
 					{
@@ -696,14 +696,14 @@ public boolean needsPlainCommentData()
 					}
 
 					@Override
-					public boolean onCommentLine(@NotNull final String line)
+					public boolean onCommentLine(@Nonnull final String line)
 					{
 						return true;
 					}
 
 					@Override
-					public boolean onPatternMatch(@NotNull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-							@Nullable final String remainingLineContent, @NotNull final String line, final String patternMatched)
+					public boolean onPatternMatch(@Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
+							@Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched)
 					{
 						for(MetaDocType expectedType : expectedTypes)
 						{
@@ -788,14 +788,14 @@ public boolean needsPlainCommentData()
 				}
 
 				@Override
-				public boolean onCommentLine(@NotNull final String line)
+				public boolean onCommentLine(@Nonnull final String line)
 				{
 					return true;
 				}
 
 				@Override
-				public boolean onPatternMatch(@NotNull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-						@Nullable final String remainingLineContent, @NotNull final String line, final String patternMatched)
+				public boolean onPatternMatch(@Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
+						@Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched)
 				{
 					if(type == MetaDocType.DEPRECATED)
 					{
@@ -958,14 +958,14 @@ public boolean needsPlainCommentData()
 			}
 
 			@Override
-			public boolean onCommentLine(@NotNull final String line)
+			public boolean onCommentLine(@Nonnull final String line)
 			{
 				return true;
 			}
 
 			@Override
-			public boolean onPatternMatch(@NotNull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-					@Nullable final String remainingLineContent, @NotNull final String line, final String patternMatched)
+			public boolean onPatternMatch(@Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
+					@Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched)
 			{
 				if(type == MetaDocType.OPTIONAL_PARAMETERS && matchName != null && matchName.equals(name) && matchValue == null)
 				{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
index 3f231259..8015ee6b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
@@ -17,14 +17,14 @@
 package com.intellij.lang.javascript;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author yole
  */
 public class JSDocElementType extends JSElementType
 {
-	public JSDocElementType(@NotNull @NonNls String debugName)
+	public JSDocElementType(@Nonnull @NonNls String debugName)
 	{
 		super(debugName);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
index 57acea11..c2511649 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.psi.tree.IElementType;
 import consulo.javascript.lang.JavaScriptLanguage;
 
@@ -29,7 +29,7 @@
  */
 public class JSElementType extends IElementType
 {
-	public JSElementType(@NonNls @NotNull String debugName)
+	public JSElementType(@NonNls @Nonnull String debugName)
 	{
 		super(debugName, JavaScriptLanguage.INSTANCE);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 72055233..498e3a83 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.psi.*;
@@ -47,7 +48,7 @@ public interface JSElementTypes
 
 	IElementType EMBEDDED_CONTENT = new ILazyParseableElementType("EMBEDDED_CONTENT", JavaScriptLanguage.INSTANCE)
 	{
-		@NotNull
+		@Nonnull
 		@Override
 		public Language getLanguage()
 		{
@@ -58,14 +59,14 @@ public Language getLanguage()
 	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = new JSFunctionElementType("FUNCTION_DECLARATION")
 	{
 		@Override
-		public JSFunction createPsi(@NotNull JSFunctionStub stub)
+		public JSFunction createPsi(@Nonnull JSFunctionStub stub)
 		{
 			return new JSFunctionImpl(stub, this);
 		}
 
-		@NotNull
+		@Nonnull
 		@Override
-		public PsiElement createElement(@NotNull ASTNode astNode)
+		public PsiElement createElement(@Nonnull ASTNode astNode)
 		{
 			return new JSFunctionImpl(astNode);
 		}
@@ -149,14 +150,14 @@ public PsiElement createElement(@NotNull ASTNode astNode)
 	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_EXPRESSION = new JSFunctionElementType("FUNCTION_EXPRESSION")
 	{
 		@Override
-		public JSFunction createPsi(@NotNull JSFunctionStub stub)
+		public JSFunction createPsi(@Nonnull JSFunctionStub stub)
 		{
 			return new JSFunctionExpressionImpl(stub, this);
 		}
 
-		@NotNull
+		@Nonnull
 		@Override
-		public PsiElement createElement(@NotNull ASTNode astNode)
+		public PsiElement createElement(@Nonnull ASTNode astNode)
 		{
 			return new JSFunctionExpressionImpl(astNode);
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index b29271bb..69f414fe 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.Language;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
@@ -59,7 +60,7 @@ public class JSLanguageInjector implements MultiHostInjector
 	private static final NamedPointer<Language> CSS_LANGUAGE = LanguagePointerUtil.createPointer("CSS");
 
 	@Override
-	public void injectLanguages(@NotNull MultiHostRegistrar registrar, @NotNull PsiElement host)
+	public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement host)
 	{
 
 		if(host instanceof XmlAttributeValue)
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 4fdd643e..a34bd129 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -17,8 +17,8 @@
 package com.intellij.lang.javascript;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.lang.LanguageParserDefinitions;
@@ -317,7 +317,7 @@ public JSChameleonElementType(@NonNls String name)
 
 		@Override
 		@RequiredReadAction
-		protected ASTNode doParseContents(@NotNull ASTNode chameleon, @NotNull PsiElement psi)
+		protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElement psi)
 		{
 			final Project project = psi.getProject();
 			final Language languageForParser = getLanguageForParser(psi);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
index b30c3499..bc050ee2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.lang.javascript.psi.resolve.JSImportedElementResolveResult;
@@ -133,7 +133,7 @@ else if(o instanceof Object[])
 		}
 	}
 
-	public static JSImportedElementResolveResult resolveTypeNameUsingImplicitImports(@NotNull String referenceName, @NotNull JSFile file)
+	public static JSImportedElementResolveResult resolveTypeNameUsingImplicitImports(@Nonnull String referenceName, @Nonnull JSFile file)
 	{
 		final PsiElement context = file.getContext();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
index ef324de2..022e5cf7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.flex;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
+
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index c61d05e1..31868e35 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -24,9 +24,11 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSLanguageInjector;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
@@ -206,7 +208,7 @@ public PsiElement getNameIdentifier()
 	}
 
 	@Override
-	public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException
+	public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException
 	{
 		final int i = name.lastIndexOf('.');
 		if(i != -1)
@@ -239,8 +241,8 @@ protected boolean processMembers(final PsiScopeProcessor processor, final Resolv
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @NotNull final ResolveState substitutor,
-			final PsiElement lastParent, @NotNull final PsiElement place)
+	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState substitutor,
+			final PsiElement lastParent, @Nonnull final PsiElement place)
 	{
 		boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
 
@@ -523,7 +525,7 @@ public boolean isEquivalentTo(final PsiElement element2)
 	}
 
 	@Override
-	public PsiElement add(@NotNull PsiElement element) throws IncorrectOperationException
+	public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		if(element instanceof JSFunction || element instanceof JSVarStatement)
 		{
@@ -598,7 +600,7 @@ public static String findScriptNs(XmlTag rootTag)
 	}
 
 	@Override
-	public PsiElement addBefore(@NotNull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException
 	{
 		if(anchor == null)
 		{
@@ -761,7 +763,7 @@ protected void process(final JSFile file)
 					InjectedLanguageUtil.enumerate(value, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 					{
 						@Override
-						public void visit(@NotNull PsiFile injectedPsi, @NotNull List<PsiLanguageInjectionHost.Shred> places)
+						public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places)
 						{
 							if(places.get(0).getHost() instanceof XmlAttributeValue)
 							{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
index 4b86ce0f..0be300c7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
@@ -19,7 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JSDocElementType;
 import com.intellij.lang.javascript.JSDocTokenTypes;
@@ -53,7 +53,7 @@ public JSHighlighter(DialectOptionHolder dialectOptionsHolder)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Lexer getHighlightingLexer()
 	{
 		return new JavaScriptHighlightingLexer(myDialectOptionsHolder);
@@ -134,7 +134,7 @@ public boolean process(IElementType type)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public TextAttributesKey[] getTokenHighlights(IElementType tokenType)
 	{
 		return pack(keys1.get(tokenType), keys2.get(tokenType));
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index d950fda4..fc5e1bc1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -18,7 +18,7 @@
 
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredDispatchThread;
 import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.javascript.psi.JSClass;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
index dd3121b4..08f535b3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index c859e9b3..e14e78d4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -19,8 +19,8 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupItem;
@@ -72,7 +72,7 @@ public abstract class BaseCreateFix implements LocalQuickFix
 
 	@Override
 	@RequiredReadAction
-	public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor)
+	public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor)
 	{
 		final PsiElement psiElement = descriptor.getPsiElement();
 		PsiFile file = psiElement.getContainingFile();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
index 2e84e313..d8e30133 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.impl.JSExpressionCodeFragmentImpl;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
@@ -30,8 +30,8 @@ private JSElementFactory()
 	{
 	}
 
-	@NotNull
-	public static JSFile createExpressionCodeFragment(@NotNull Project project, CharSequence text, PsiElement context, boolean isPhysical)
+	@Nonnull
+	public static JSFile createExpressionCodeFragment(@Nonnull Project project, CharSequence text, PsiElement context, boolean isPhysical)
 	{
 		JSExpressionCodeFragmentImpl codeFragment = new JSExpressionCodeFragmentImpl(project, "fragment.js", text, isPhysical);
 		codeFragment.setContext(context);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
index c9716150..657ad9a0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
@@ -19,8 +19,9 @@
  */
 package com.intellij.lang.javascript.psi;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.psi.stubs.JSStubElement;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.IndexSink;
@@ -42,11 +43,11 @@ public String toString()
 	}
 
 	@Override
-	public void indexStub(@NotNull final StubT stub, @NotNull final IndexSink sink)
+	public void indexStub(@Nonnull final StubT stub, @Nonnull final IndexSink sink)
 	{
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getExternalId()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
index 91ae5719..51f362ca 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSArgumentList;
@@ -54,7 +54,7 @@ public JSExpression[] getArguments()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
index 7457686f..6fc5502d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -75,7 +75,7 @@ else if(type == JSTokenTypes.COMMA)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
index 6c69e53e..462462b4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -37,7 +38,7 @@ public JSAssignmentExpressionImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index 885cdaf4..0aa5d150 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -75,7 +76,7 @@ public JSAttributeImpl(final JSAttributeStub node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -100,7 +101,7 @@ public String getName()
 	}
 
 	@Override
-	public PsiElement setName(@NonNls @NotNull final String name) throws IncorrectOperationException
+	public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException
 	{
 		throw new IncorrectOperationException();
 	}
@@ -190,7 +191,7 @@ public PsiElement handleElementRename(final String newElementName) throws Incorr
 		}
 
 		@Override
-		public PsiElement bindToElement(@NotNull final PsiElement element) throws IncorrectOperationException
+		public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException
 		{
 			return null;
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
index b5a784ca..12385c6b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
@@ -19,8 +19,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -54,7 +55,7 @@ public JSAttributeListImpl(final JSAttributeListStub stub)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -92,9 +93,9 @@ public JSAttribute[] getAttributes()
 		return getStubOrPsiChildren(JSElementTypes.ATTRIBUTE, JSAttribute.ARRAY_FACTORY);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSAttribute[] getAttributesByName(final @NotNull String name)
+	public JSAttribute[] getAttributesByName(final @Nonnull String name)
 	{
 		List<JSAttribute> attributes = null;
 		for(JSAttribute attr : getAttributes())
@@ -186,7 +187,7 @@ public boolean hasModifier(final ModifierType modifier)
 	}
 
 	@Override
-	public PsiElement add(@NotNull final PsiElement element) throws IncorrectOperationException
+	public PsiElement add(@Nonnull final PsiElement element) throws IncorrectOperationException
 	{
 		if(element.getNode().getElementType() == JSTokenTypes.OVERRIDE_KEYWORD)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
index b58698ca..f24ebb26 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -53,7 +54,7 @@ public JSAttributeNameValuePairImpl(final JSAttributeNameValuePairStub node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -78,7 +79,7 @@ public String getName()
 	}
 
 	@Override
-	public PsiElement setName(@NonNls @NotNull final String name) throws IncorrectOperationException
+	public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException
 	{
 		throw new IncorrectOperationException();
 	}
@@ -108,7 +109,7 @@ private ASTNode findValueNode()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public PsiReference[] getReferences()
 	{
 		final @NonNls String name = getName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
index 95d078b1..22ee156f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -75,7 +75,7 @@ public IElementType getOperationSign()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -88,8 +88,8 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		final IElementType operationType = getOperationSign();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
index 942b2e6e..e1a7d050 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -61,7 +62,7 @@ public JSLabeledStatement setLabel(String label)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -74,7 +75,7 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@Override
-	public PsiElement add(@NotNull final PsiElement element) throws IncorrectOperationException
+	public PsiElement add(@Nonnull final PsiElement element) throws IncorrectOperationException
 	{
 		if(element instanceof JSStatement)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
index ed292af6..a9149a5c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -41,7 +41,7 @@ public JSBreakStatementImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
index 73eac990..720a79ae 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSArgumentList;
@@ -54,7 +54,7 @@ public JSArgumentList getArgumentList()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
index b480d312..bdf83574 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -70,7 +70,7 @@ public JSStatement[] getStatements()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
index 661f7f2d..0beef76e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSCatchBlock;
@@ -58,7 +59,7 @@ public JSStatement getStatement()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -71,8 +72,8 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		if(lastParent != null)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
index ea7b9ab2..a8114af3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
@@ -16,9 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageParserDefinitions;
 import com.intellij.lang.ParserDefinition;
@@ -79,7 +81,7 @@ public static ASTNode createNameIdentifier(Project project, String name)
 		return refExpression.getNode().getFirstChildNode();
 	}
 
-	@NotNull
+	@Nonnull
 	public static JSExpression createExpressionFromText(Project project, @NonNls String text)
 	{
 		text = "{\n" + text + "\n}";
@@ -299,7 +301,7 @@ public static boolean isBlockStatementContainer(final JSElement jsElement)
 		return jsElement instanceof JSIfStatement || jsElement instanceof JSLoopStatement;
 	}
 
-	public static PsiElement blockDoAddRangeBefore(final PsiElement first, final PsiElement last, final @NotNull PsiElement anchor) throws
+	public static PsiElement blockDoAddRangeBefore(final PsiElement first, final PsiElement last, final @Nonnull PsiElement anchor) throws
 			IncorrectOperationException
 	{
 		BlockAddContext addContext = new BlockAddContext(anchor)
@@ -314,7 +316,7 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
 		return addContext.doAddElement(first, last);
 	}
 
-	public static PsiElement blockDoAddRangeAfter(final PsiElement first, final PsiElement last, final @NotNull PsiElement anchor) throws
+	public static PsiElement blockDoAddRangeAfter(final PsiElement first, final PsiElement last, final @Nonnull PsiElement anchor) throws
 			IncorrectOperationException
 	{
 		BlockAddContext addContext = new BlockAddContext(anchor)
@@ -329,7 +331,7 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
 		return addContext.doAddElement(first, last);
 	}
 
-	public static PsiElement blockDoAddAfter(final PsiElement element, final @NotNull PsiElement anchor) throws IncorrectOperationException
+	public static PsiElement blockDoAddAfter(final PsiElement element, final @Nonnull PsiElement anchor) throws IncorrectOperationException
 	{
 		BlockAddContext addContext = new BlockAddContext(anchor)
 		{
@@ -343,7 +345,7 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
 		return addContext.doAddElement(element);
 	}
 
-	public static PsiElement blockDoAddBefore(final PsiElement element, final @NotNull PsiElement anchor) throws IncorrectOperationException
+	public static PsiElement blockDoAddBefore(final PsiElement element, final @Nonnull PsiElement anchor) throws IncorrectOperationException
 	{
 		BlockAddContext addContext = new BlockAddContext(anchor)
 		{
@@ -368,7 +370,7 @@ abstract static class BlockAddContext
 		final JSBlockStatement newlyAddedBlock;
 		final PsiElement codeBlockAnchor;
 
-		BlockAddContext(final @NotNull PsiElement _anchor) throws IncorrectOperationException
+		BlockAddContext(final @Nonnull PsiElement _anchor) throws IncorrectOperationException
 		{
 			final ASTNode codeBlockNode = JSChangeUtil.createStatementFromText(_anchor.getProject(), "{ a }");
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index 00b1a8c6..a6e601c5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -26,8 +26,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSClass;
@@ -85,7 +86,7 @@ public JSClassBase(final JSClassStub stub, final JSStubElementType<JSClassStub,
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -236,7 +237,7 @@ public JSVariable findFieldByName(String name)
 	}
 
 	private
-	@NotNull
+	@Nonnull
 	Map<String, JSVariable> initFields()
 	{
 		Map<String, JSVariable> name2FieldsMap = myName2FieldsMap;
@@ -268,7 +269,7 @@ Map<String, JSVariable> initFields()
 	}
 
 	private
-	@NotNull
+	@Nonnull
 	Map<String, Object> initFunctions()
 	{
 		Map<String, Object> name2FunctionMap = myName2FunctionMap;
@@ -350,7 +351,7 @@ public JSClass[] getSupers()
 		return superClasses.toArray(new JSClass[superClasses.size()]);
 	}
 
-	private List<JSClass> getClassesFromReferenceList(final @Nullable JSReferenceList extendsList, @NotNull IElementType type)
+	private List<JSClass> getClassesFromReferenceList(final @Nullable JSReferenceList extendsList, @Nonnull IElementType type)
 	{
 		final PsiElement element = extendsList != null ? extendsList : this;
 
@@ -365,8 +366,8 @@ private List<JSClass> getClassesFromReferenceList(final @Nullable JSReferenceLis
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @NotNull final ResolveState substitutor,
-			final PsiElement lastParent, @NotNull final PsiElement place)
+	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState substitutor,
+			final PsiElement lastParent, @Nonnull final PsiElement place)
 	{
 		final ResolveProcessor resolveProcessor = processor instanceof ResolveProcessor ? (ResolveProcessor) processor : null;
 		final boolean toProcessClass = resolveProcessor != null && resolveProcessor.isTypeContext();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
index cce2d3d1..65845273 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -94,7 +95,7 @@ else if(nameIdentifier != null)
 
 	@Override
 	@RequiredReadAction
-	public PsiElement setName(@NonNls @NotNull String newName) throws IncorrectOperationException
+	public PsiElement setName(@NonNls @Nonnull String newName) throws IncorrectOperationException
 	{
 		newName = newName.substring(newName.lastIndexOf('.') + 1);
 		final String oldName = getName();
@@ -185,7 +186,7 @@ protected boolean processMembers(final PsiScopeProcessor processor, final Resolv
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @NotNull final ResolveState substitutor, final PsiElement lastParent, @NotNull final PsiElement place)
+	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState substitutor, final PsiElement lastParent, @Nonnull final PsiElement place)
 	{
 		boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
 
@@ -197,7 +198,7 @@ public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @
 	}
 
 	@Override
-	public PsiElement addAfter(@NotNull final PsiElement element, PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addAfter(@Nonnull final PsiElement element, PsiElement anchor) throws IncorrectOperationException
 	{
 		if(anchor == null)
 		{
@@ -216,7 +217,7 @@ public PsiElement addAfter(@NotNull final PsiElement element, PsiElement anchor)
 	}
 
 	@Override
-	public PsiElement addBefore(@NotNull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException
 	{
 		final PsiElement superElement = super.addBefore(element, anchor);
 		CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), superElement.getNode());
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
index 5821bbf5..69c4e8bc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSCommaExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -37,7 +37,7 @@ public JSCommaExpressionImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
index e79ecd92..c495fa53 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -114,7 +115,7 @@ public JSExpression getElse()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
index 1f82ef7d..461fa33e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -55,7 +56,7 @@ public JSStatement getStatementToContinue()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
index aef23b2b..f67a1621 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -69,7 +69,7 @@ public String getName()
 	}
 
 	@Override
-	public PsiElement setName(@NotNull String name) throws IncorrectOperationException
+	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
 	{
 		final JSExpression expression = getExpression();
 		if(expression instanceof JSReferenceExpressionImpl)
@@ -80,7 +80,7 @@ public PsiElement setName(@NotNull String name) throws IncorrectOperationExcepti
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -98,8 +98,8 @@ public Icon getIcon(int flags)
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		if(lastParent == null)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
index 0ab15299..ee6bf132 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSDoWhileStatement;
@@ -54,7 +55,7 @@ public JSStatement getBody()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
index daccdd40..fbf41733 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.psi.JSDocComment;
@@ -40,7 +40,7 @@ public IElementType getTokenType()
 	}
 
 	@Override
-	public void accept(@NotNull final PsiElementVisitor visitor)
+	public void accept(@Nonnull final PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index 28194438..9834e4e7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JavaScriptBundle;
@@ -55,13 +56,13 @@ public String getName()
 	}
 
 	@Override
-	public PsiElement setName(@NonNls @NotNull final String name) throws IncorrectOperationException
+	public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException
 	{
 		throw new IncorrectOperationException();
 	}
 
 	@Override
-	public void accept(@NotNull final PsiElementVisitor visitor)
+	public void accept(@Nonnull final PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -79,7 +80,7 @@ public JSDocTagValue getValue()
 		return findChildByClass(JSDocTagValue.class);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public PsiReference[] getReferences()
 	{
@@ -197,7 +198,7 @@ public PsiElement handleElementRename(final String newElementName) throws Incorr
 		}
 
 		@Override
-		public PsiElement bindToElement(@NotNull final PsiElement element) throws IncorrectOperationException
+		public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException
 		{
 			return null;
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
index 03447650..ce4abbe6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDocTagValue;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -38,7 +39,7 @@ public JSDocTagValueImpl(final ASTNode node)
 		super(node);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public PsiReference[] getReferences()
 	{
@@ -126,7 +127,7 @@ else if("returns".equals(name))
 	}
 
 	@Override
-	public void accept(@NotNull final PsiElementVisitor visitor)
+	public void accept(@Nonnull final PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
index e78fab9d..a8055df5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.stubs.StubElement;
@@ -33,5 +33,5 @@ public JSElementImpl(final ASTNode node)
 	}
 
 	@Override
-	public abstract void accept(@NotNull PsiElementVisitor visitor);
+	public abstract void accept(@Nonnull PsiElementVisitor visitor);
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
index 3adc1ad4..b4353d5e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -45,7 +46,7 @@ public JSEmbeddedContentImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		visitor.visitElement(this);
 	}
@@ -91,8 +92,8 @@ public boolean processElements(PsiElementProcessor processor, PsiElement place)
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		return JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
index 645365e9..dc72a938 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSEmptyStatement;
@@ -37,7 +38,7 @@ public JSEmptyStatementImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
index 5911a3af..76d9f225 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.psi.JSExpressionCodeFragment;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.project.Project;
@@ -69,7 +70,7 @@ public PsiElement getContext()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public FileViewProvider getViewProvider()
 	{
 		if(myViewProvider != null)
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
index 58cb742d..1e4d0762 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
@@ -33,7 +33,7 @@ public JSExpressionImpl(final ASTNode node)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getType()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index 7d346bef..15a86497 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
 import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -54,7 +54,7 @@ public JSExpression getExpression()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -67,8 +67,8 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		if(lastParent == null)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
index fc87dcb1..1c68994a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
@@ -18,8 +18,9 @@
 
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.extapi.psi.PsiFileBase;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -59,8 +60,8 @@ public String toString()
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @NotNull final ResolveState state, @Nullable PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, @Nullable PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		boolean result = JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
 		if(lastParent == null)
@@ -90,7 +91,7 @@ public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -103,7 +104,7 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@Override
-	public PsiElement addRangeBefore(@NotNull PsiElement first, @NotNull PsiElement last, PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addRangeBefore(@Nonnull PsiElement first, @Nonnull PsiElement last, PsiElement anchor) throws IncorrectOperationException
 	{
 		if(JSChangeUtil.isStatementOrComment(first))
 		{
@@ -119,7 +120,7 @@ public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOp
 	}
 
 	@Override
-	public PsiElement addAfter(@NotNull PsiElement element, PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
 	{
 		if(JSChangeUtil.isStatementOrComment(element))
 		{
@@ -129,7 +130,7 @@ public PsiElement addAfter(@NotNull PsiElement element, PsiElement anchor) throw
 	}
 
 	@Override
-	public PsiElement addBefore(@NotNull PsiElement element, PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
 	{
 		if(JSChangeUtil.isStatementOrComment(element))
 		{
@@ -150,7 +151,7 @@ public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement an
 	}
 
 	@Override
-	public PsiElement add(@NotNull PsiElement element) throws IncorrectOperationException
+	public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		return addAfter(element, null);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
index 9793513d..478e2008 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -119,8 +120,8 @@ else if(passedRParen && JSElementTypes.STATEMENTS.contains(child.getElementType(
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		if(lastParent != null)
 		{
@@ -142,7 +143,7 @@ public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNul
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
index 4df7a57d..12d92fbb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -132,8 +133,8 @@ else if(passedRParen && JSElementTypes.STATEMENTS.contains(child.getElementType(
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		if(lastParent != null)
 		{
@@ -155,7 +156,7 @@ public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNul
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index aae45d83..9e68bee4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -95,7 +96,7 @@ public JSSourceElement[] getBody()
 		return result;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getReturnType()
 	{
@@ -120,7 +121,7 @@ public JavaScriptTypeElement getReturnTypeElement()
 	}
 
 	@Override
-	public PsiElement setName(@NotNull String name) throws IncorrectOperationException
+	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
 	{
 		final ASTNode newNameElement = createNameIdentifier(name);
 		final ASTNode nameIdentifier = getNameIdentifier().getNode();
@@ -178,8 +179,8 @@ public int getTextOffset()
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		if(lastParent != null && lastParent.getParent() == this)
 		{
@@ -213,7 +214,7 @@ public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNul
 	}
 
 	@Override
-	public PsiElement addBefore(@NotNull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException
 	{
 		if(anchor == getFirstChild() && element instanceof JSAttributeList && anchor.getNode().getElementType() == JSTokenTypes.FUNCTION_KEYWORD)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index e7d12be0..ba683862 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
@@ -47,7 +48,7 @@ public JSFunctionExpressionImpl(final JSFunctionStub stub, IStubElementType type
 		super(stub, type);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public JSFunction getFunction()
 	{
@@ -55,7 +56,7 @@ public JSFunction getFunction()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -80,7 +81,7 @@ public JSExpression replace(JSExpression newExpr)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getType()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
index 82dcc370..d729e9cc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -103,7 +104,7 @@ public JSAttributeList getAttributeList()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -142,7 +143,7 @@ public String getQualifiedName()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public SearchScope getUseScope()
 	{
 		if(isConstructor())
@@ -170,7 +171,7 @@ public PsiElement getNavigationElement()
 	}
 
 	@Override
-	public PsiElement setName(@NotNull String name) throws IncorrectOperationException
+	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
 	{
 		String oldName = getName();
 		PsiElement element = super.setName(name);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
index f4ebecd3..c1307a2a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSGenericSignature;
@@ -30,7 +31,7 @@ public JSGenericSignatureImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
index b8f5b5bb..94225a82 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -82,7 +83,7 @@ public void setCondition(JSExpression expr)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
index ab0b5bbe..493440f6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -43,7 +44,7 @@ public JSImportStatementImpl(final JSImportStatementStub stub)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -56,8 +57,8 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @NotNull final ResolveState state, final PsiElement lastParent,
-			@NotNull final PsiElement place)
+	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
+			@Nonnull final PsiElement place)
 	{
 		return true;
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
index 9514d4d5..d91d20ad 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -48,7 +48,7 @@ public JSIncludeDirectiveImpl(final JSIncludeDirectiveStub stub)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -61,7 +61,7 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public PsiReference[] getReferences()
 	{
 		ASTNode node = getIncludedFileNode();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
index 939d36bc..f83cfa6d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -82,7 +82,7 @@ public JSExpression getIndexExpression()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
index 2ce8e111..61896790 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -73,7 +74,7 @@ public JSLabeledStatement setLabel(String label)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -92,7 +93,7 @@ public String getName()
 	}
 
 	@Override
-	public PsiElement setName(@NotNull String name) throws IncorrectOperationException
+	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
 	{
 		JSChangeUtil.doIdentifierReplacement(this, getLabelIdentifier(), name);
 		return this;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
index 5775285d..0a7acad9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -46,7 +47,7 @@ public JSExpression getExpression()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
index 3a55fcdb..e6b115b1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSBlockStatement;
@@ -36,7 +37,7 @@ public JSLetStatementImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index 1711f067..031af263 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -48,7 +49,7 @@ public JSLiteralExpressionImpl(final ASTNode node)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public IElementType getLiteralElementType()
 	{
@@ -58,7 +59,7 @@ public IElementType getLiteralElementType()
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getType()
 	{
@@ -87,7 +88,7 @@ else if(JavaScriptTokenSets.STRING_LITERALS.contains(literalElementType))
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public PsiReference[] getReferences()
 	{
 		JSReferenceSet referenceSet = myReferenceSet;
@@ -126,7 +127,7 @@ public PsiReference[] getReferences()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -145,13 +146,13 @@ public boolean isValidHost()
 	}
 
 	@Override
-	public PsiLanguageInjectionHost updateText(@NotNull String text)
+	public PsiLanguageInjectionHost updateText(@Nonnull String text)
 	{
 		JSExpression expressionFromText = JSChangeUtil.createExpressionFromText(getProject(), text);
 		return (PsiLanguageInjectionHost) replace(expressionFromText);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public LiteralTextEscaper<? extends PsiLanguageInjectionHost> createLiteralTextEscaper()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
index 5c0b6436..6f06140f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -48,7 +48,7 @@ public JSNamespaceDeclarationImpl(final JSNamespaceDeclarationStub node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -67,7 +67,7 @@ public JSAttributeList getAttributeList()
 	}
 
 	@Override
-	public PsiElement setName(@NonNls @NotNull String newName) throws IncorrectOperationException
+	public PsiElement setName(@NonNls @Nonnull String newName) throws IncorrectOperationException
 	{
 		final String oldName = getName();
 		if(newName.equals(oldName))
@@ -151,8 +151,8 @@ public boolean isDeprecated()
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @NotNull final ResolveState state, final PsiElement lastParent,
-			@NotNull final PsiElement place)
+	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
+			@Nonnull final PsiElement place)
 	{
 		return processor.execute(lastParent, state);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index e91eb571..005a7670 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSArgumentList;
@@ -46,7 +46,7 @@ public JSNewExpressionImpl(final ASTNode node)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getType()
 	{
@@ -78,7 +78,7 @@ public JSArgumentList getArgumentList()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
index 7b57d146..7664eb94 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -60,7 +60,7 @@ public JSProperty[] getProperties()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -78,8 +78,8 @@ public Icon getIcon(int flags)
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @NotNull final ResolveState state, final PsiElement lastParent,
-			@NotNull final PsiElement place)
+	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
+			@Nonnull final PsiElement place)
 	{
 		if(lastParent == null || !(place instanceof JSProperty))
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
index a9d29252..0a3e465d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
@@ -18,8 +18,9 @@
 
 import java.io.IOException;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -56,7 +57,7 @@ public JSPackageStatementImpl(final JSPackageStatementStub stub)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -114,7 +115,7 @@ public void setQualifiedName(final String expectedPackageNameFromFile)
 	}
 
 	@Override
-	public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException
+	public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException
 	{
 		VirtualFile virtualFile = getContainingFile().getVirtualFile();
 		String expectedPackageNameFromFile = JSResolveUtil.getExpectedPackageNameFromFile(virtualFile, getProject(), false);
@@ -145,8 +146,8 @@ public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperatio
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @NotNull final ResolveState substitutor,
-			final PsiElement lastParent, @NotNull final PsiElement place)
+	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState substitutor,
+			final PsiElement lastParent, @Nonnull final PsiElement place)
 	{
 		if(lastParent != null && lastParent.getParent() == this)
 		{
@@ -165,7 +166,7 @@ public PsiElement getNameIdentifier()
 	}
 
 	@Override
-	public PsiElement addBefore(@NotNull PsiElement element, PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
 	{
 		if(JSChangeUtil.isStatementOrComment(element))
 		{
@@ -177,7 +178,7 @@ public PsiElement addBefore(@NotNull PsiElement element, PsiElement anchor) thro
 	}
 
 	@Override
-	public PsiElement addAfter(@NotNull PsiElement element, PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
 	{
 		if(JSChangeUtil.isStatementOrComment(element))
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index c3e94f67..29f263d4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
@@ -94,7 +94,7 @@ public boolean isOptional()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
index b3b284cf..7dbfe052 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -51,7 +52,7 @@ public JSParameter[] getParameters()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
index 61505eb3..ed8d8a70 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -46,7 +47,7 @@ public JSExpression getInnerExpression()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index 032ff014..6b919e98 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
@@ -43,7 +44,7 @@ public JSPostfixExpressionImpl(final ASTNode node)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getType()
 	{
@@ -66,7 +67,7 @@ public IElementType getOperationSign()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index 34b3b1e5..c58683a9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
@@ -69,7 +69,7 @@ public PsiElement getOperatorElement()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -82,7 +82,7 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getType()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index dc2eb6e6..324d03f4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -51,7 +51,7 @@ public JSPropertyImpl(final ASTNode node)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public PsiReference[] getReferences()
 	{
 		return CachedValuesManager.getCachedValue(this, new CachedValueProvider<PsiReference[]>()
@@ -66,7 +66,7 @@ public Result<PsiReference[]> compute()
 		});
 	}
 
-	@NotNull
+	@Nonnull
 	@RequiredReadAction
 	private PsiReference[] buildReferences()
 	{
@@ -96,7 +96,7 @@ public String getName()
 	}
 
 	@Override
-	public PsiElement setName(@NotNull String name) throws IncorrectOperationException
+	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
 	{
 		final PsiElement nameNode = getNameIdentifier();
 		assert nameNode != null;
@@ -106,7 +106,7 @@ public PsiElement setName(@NotNull String name) throws IncorrectOperationExcepti
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getType()
 	{
@@ -142,7 +142,7 @@ public JSComputedName getComputedName()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 890c348c..2c91901b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -23,9 +23,11 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -75,7 +77,7 @@ public class JSPsiImplUtils
 
 	@Nullable
 	@RequiredReadAction
-	public static JavaScriptTypeElement findTypeElement(@NotNull PsiElement element)
+	public static JavaScriptTypeElement findTypeElement(@Nonnull PsiElement element)
 	{
 		if(element instanceof StubBasedPsiElement)
 		{
@@ -100,7 +102,7 @@ public static JavaScriptTypeElement findTypeElement(@NotNull PsiElement element)
 	@Nullable
 	@RequiredReadAction
 	@SuppressWarnings("unchecked")
-	private static <T> T findChildrenByClass(@NotNull PsiElement element, Class<T> aClass)
+	private static <T> T findChildrenByClass(@Nonnull PsiElement element, Class<T> aClass)
 	{
 		for(PsiElement cur = element.getFirstChild(); cur != null; cur = cur.getNextSibling())
 		{
@@ -228,8 +230,8 @@ JSPackageStatement findPackageStatement(JSFile file)
 	}
 
 	static
-	@NotNull
-	PsiElement findTopLevelNavigatableElement(@NotNull JSQualifiedNamedElement jsClass)
+	@Nonnull
+	PsiElement findTopLevelNavigatableElement(@Nonnull JSQualifiedNamedElement jsClass)
 	{
 		PsiElement sourceElement = findTopLevelNavigatableElementWithSource(jsClass, null);
 		if(sourceElement != null)
@@ -240,7 +242,7 @@ PsiElement findTopLevelNavigatableElement(@NotNull JSQualifiedNamedElement jsCla
 	}
 
 	@Nullable
-	public static PsiElement findTopLevelNavigatableElementWithSource(@NotNull JSQualifiedNamedElement jsClass, @Nullable Consumer<JSQualifiedNamedElement> candidatesConsumer)
+	public static PsiElement findTopLevelNavigatableElementWithSource(@Nonnull JSQualifiedNamedElement jsClass, @Nullable Consumer<JSQualifiedNamedElement> candidatesConsumer)
 	{
 		if(candidatesConsumer != null)
 		{
@@ -391,7 +393,7 @@ static String getQName(final JSNamedElement element)
 
 	public static
 	@Nullable
-	String getTypeFromAnnotationParameter(@NotNull JSAttributeList attributeList, @NotNull String annotationName, @Nullable String annotationParameter)
+	String getTypeFromAnnotationParameter(@Nonnull JSAttributeList attributeList, @Nonnull String annotationName, @Nullable String annotationParameter)
 	{
 		String arrayType = null;
 		final JSAttribute[] byName = attributeList.getAttributesByName(annotationName);
@@ -446,7 +448,7 @@ static void doRenameParentDirectoryIfNeeded(VirtualFile file, String name, Objec
 
 	static
 	@Nullable
-	String getQNameForMove(@NotNull PsiElement targetElement, PsiElement elementToBind)
+	String getQNameForMove(@Nonnull PsiElement targetElement, PsiElement elementToBind)
 	{
 		String qName = null;
 		Project project = targetElement.getProject();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 922d9bf4..5de24d69 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -18,8 +18,8 @@
 
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageNamesValidation;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -66,7 +66,7 @@ public JSReferenceExpressionImpl(final ASTNode node)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getType()
 	{
@@ -145,7 +145,7 @@ public PsiElement resolve()
 		return resolveResults.length == 0 || resolveResults.length > 1 ? null : resolveResults[0].getElement();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	@RequiredReadAction
 	public String getCanonicalText()
@@ -186,7 +186,7 @@ PsiElement handleElementRenameInternal(String newElementName) throws IncorrectOp
 
 	@Override
 	@RequiredReadAction
-	public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException
+	public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final PsiElement parent = getParent();
 
@@ -387,7 +387,7 @@ JSClass findEnclosingClass(PsiElement elt)
 		return jsClass;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	@RequiredReadAction
 	public Object[] getVariants()
@@ -452,7 +452,7 @@ public boolean isSoft()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -465,7 +465,7 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public ResolveResult[] multiResolve(final boolean incompleteCode)
 	{
 		return ResolveCache.getInstance(getContainingFile().getProject()).resolveWithCaching(this, MyResolver.INSTANCE, true, incompleteCode);
@@ -475,10 +475,10 @@ private static class MyResolver implements ResolveCache.PolyVariantResolver<JSRe
 	{
 		private static final MyResolver INSTANCE = new MyResolver();
 
-		@NotNull
+		@Nonnull
 		@Override
 		@RequiredReadAction
-		public ResolveResult[] resolve(@NotNull JSReferenceExpressionImpl referenceExpression, boolean incompleteCode)
+		public ResolveResult[] resolve(@Nonnull JSReferenceExpressionImpl referenceExpression, boolean incompleteCode)
 		{
 			return referenceExpression.doResolve();
 		}
@@ -685,7 +685,7 @@ public Set<JavaScriptFeature> getFeatures()
 		}
 
 		@Override
-		public void process(String type, @NotNull final BaseJSSymbolProcessor.EvaluateContext evaluateContext, PsiElement source)
+		public void process(String type, @Nonnull final BaseJSSymbolProcessor.EvaluateContext evaluateContext, PsiElement source)
 		{
 			if(evaluateContext.visitedTypes.contains(type))
 			{
@@ -784,7 +784,7 @@ public boolean ecma()
 		}
 
 		@Override
-		public void setUnknownElement(@NotNull final PsiElement element)
+		public void setUnknownElement(@Nonnull final PsiElement element)
 		{
 			if(!(element instanceof XmlToken))
 			{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index a431a1c2..d07c0e57 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -20,7 +20,7 @@
 import java.util.Collection;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -54,7 +54,7 @@ public JSReferenceListImpl(final JSReferenceListStub stub, IStubElementType stub
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -67,14 +67,14 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JSReferenceExpression[] getExpressions()
 	{
 		return findChildrenByClass(JSReferenceExpression.class);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	@RequiredReadAction
 	public String[] getReferenceTexts()
@@ -100,7 +100,7 @@ public String[] getReferenceTexts()
 		return result;
 	}
 
-	@NotNull
+	@Nonnull
 	@RequiredReadAction
 	@Override
 	public JSClass[] getReferencedClasses()
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index a88099fc..e23bd48c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -19,9 +19,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
 import com.intellij.lang.ASTNode;
@@ -241,7 +242,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
 		}
 
 		@Override
-		public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException
+		public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException
 		{
 			String qName = JSPsiImplUtils.getQNameForMove(getElement(), element);
 			if(qName != null)
@@ -356,7 +357,7 @@ public boolean isSoft()
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		@RequiredReadAction
 		public ResolveResult[] multiResolve(final boolean incompleteCode)
 		{
@@ -577,9 +578,9 @@ static class MyResolver implements ResolveCache.PolyVariantContextResolver<MyPsi
 	{
 		private static final MyResolver INSTANCE = new MyResolver();
 
-		@NotNull
+		@Nonnull
 		@Override
-		public ResolveResult[] resolve(@NotNull MyPsiReference ref, @NotNull PsiFile containingFile, boolean incompleteCode)
+		public ResolveResult[] resolve(@Nonnull MyPsiReference ref, @Nonnull PsiFile containingFile, boolean incompleteCode)
 		{
 			return ref.doResolve(containingFile);
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
index 534fc086..d1d3b5cc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -46,7 +46,7 @@ public JSExpression getExpression()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
index ca4ecd1c..d60d2814 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
@@ -22,8 +22,9 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -48,7 +49,7 @@
  */
 public class JSSmartCompletionVariantsHandler
 {
-	static Object[] getSmartVariants(final @NotNull PsiElement expr, final boolean ecma)
+	static Object[] getSmartVariants(final @Nonnull PsiElement expr, final boolean ecma)
 	{
 		final PsiElement parent = expr.getParent();
 
@@ -198,7 +199,7 @@ else if(qualifier instanceof JSReferenceExpression)
 		}
 
 		@Override
-		public boolean process(final @NotNull JSAttribute jsAttribute)
+		public boolean process(final @Nonnull JSAttribute jsAttribute)
 		{
 			if("Event".equals(jsAttribute.getName()))
 			{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
index f7ae3206..4cef220a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
@@ -19,8 +19,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSFunction;
@@ -56,7 +57,7 @@ public String getLabel()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public PsiReference[] getReferences()
 	{
 		final String text = getText();
@@ -138,7 +139,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
 		}
 
 		@Override
-		public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException
+		public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException
 		{
 			return null;
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
index e78cda0e..7d04ab4f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.extapi.psi.StubBasedPsiElementBase;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.index.JSItemPresentation;
@@ -56,7 +57,7 @@ public JSStubElementImpl(final T t, IStubElementType type)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -102,7 +103,7 @@ public ItemPresentation getPresentation()
 	}
 
 	@Override
-	public PsiElement addBefore(@NotNull PsiElement element, PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
 	{
 		if(JSChangeUtil.isStatementOrComment(element))
 		{
@@ -120,7 +121,7 @@ else if(JSChangeUtil.isBlockStatementContainer(this) && anchor != null)
 	}
 
 	@Override
-	public PsiElement addAfter(@NotNull PsiElement element, PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
 	{
 		if(JSChangeUtil.isStatementOrComment(element))
 		{
@@ -137,7 +138,7 @@ else if(JSChangeUtil.isBlockStatementContainer(this) && anchor != null)
 	}
 
 	@Override
-	public PsiElement addRangeBefore(@NotNull PsiElement first, @NotNull PsiElement last, PsiElement anchor) throws IncorrectOperationException
+	public PsiElement addRangeBefore(@Nonnull PsiElement first, @Nonnull PsiElement last, PsiElement anchor) throws IncorrectOperationException
 	{
 		if(JSChangeUtil.isStatementOrComment(first))
 		{
@@ -172,7 +173,7 @@ else if(JSChangeUtil.isBlockStatementContainer(this) && anchor != null)
 	}
 
 	@Override
-	public PsiElement add(@NotNull PsiElement element) throws IncorrectOperationException
+	public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		return addAfter(element, null);
 	}
@@ -184,7 +185,7 @@ public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOp
 	}
 
 	@Override
-	public PsiElement replace(@NotNull PsiElement newElement) throws IncorrectOperationException
+	public PsiElement replace(@Nonnull PsiElement newElement) throws IncorrectOperationException
 	{
 		final ASTNode myNode = getNode();
 		final ASTNode result = newElement.getNode().copyElement();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
index cf8c6858..106f3ccb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSClass;
@@ -54,7 +55,7 @@ public JSSuperExpressionImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -73,7 +74,7 @@ public PsiReference getReference()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public PsiReference[] getReferences()
 	{
 		if(references != null)
@@ -157,7 +158,7 @@ public PsiElement handleElementRename(final String newElementName) throws Incorr
 					}
 
 					@Override
-					public PsiElement bindToElement(@NotNull final PsiElement element) throws IncorrectOperationException
+					public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException
 					{
 						return null;
 					}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
index 23f569d3..023ac2a2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSCaseClause;
@@ -62,7 +63,7 @@ public JSCaseClause[] getCaseClauses()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
index 40faff9b..5889f14f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSThisExpression;
@@ -37,7 +37,7 @@ public JSThisExpressionImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
index 2fda403c..d073b9dc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -46,7 +47,7 @@ public JSExpression getExpression()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
index ae2947fc..fe4b289a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -105,7 +106,7 @@ public JSStatement getFinallyStatement()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
index 0c247b0a..55a4464a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -44,7 +44,7 @@ public JSUseNamespaceDirectiveImpl(final JSUseNamespaceDirectiveStub stub)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -69,8 +69,8 @@ public String getNamespaceToBeUsed()
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		if(processor instanceof ResolveProcessor && ((ResolveProcessor) processor).lookingForUseNamespaces())
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
index 247851a3..a1edf190 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -63,7 +64,7 @@ public void declareVariable(String name, JSExpression initializer)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -76,8 +77,8 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent,
-			@NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
+			@Nonnull PsiElement place)
 	{
 		final JSVariable[] vars = getVariables();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index 048eba45..8b0d4eb8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -91,7 +92,7 @@ public String getInitializerText()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public SearchScope getUseScope()
 	{
 		return JSResolveUtil.findUseScope(this);
@@ -129,7 +130,7 @@ public void setInitializer(JSExpression expr) throws IncorrectOperationException
 		throw new UnsupportedOperationException("TODO: implement");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptType getType()
 	{
@@ -174,7 +175,7 @@ protected String doGetType()
 	}
 
 	@Override
-	public PsiElement setName(@NotNull String name) throws IncorrectOperationException
+	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
 	{
 		final PsiElement nameNode = getNameIdentifier();
 		if(nameNode == null)
@@ -187,7 +188,7 @@ public PsiElement setName(@NotNull String name) throws IncorrectOperationExcepti
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -285,8 +286,8 @@ public void delete() throws IncorrectOperationException
 	}
 
 	@Override
-	public boolean processDeclarations(@NotNull final PsiScopeProcessor processor, @NotNull final ResolveState state, final PsiElement lastParent,
-			@NotNull final PsiElement place)
+	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
+			@Nonnull final PsiElement place)
 	{
 		if(lastParent != null && lastParent.getParent() == this)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
index 11aa227a..e19ec24c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSClass;
@@ -63,7 +63,7 @@ public PsiElement getNavigationElement()
 	}
 
 	@Override
-	public PsiElement setName(@NotNull String name) throws IncorrectOperationException
+	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
 	{
 		String oldName = getName();
 		PsiElement element = super.setName(name);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
index 8f38f57b..1ee55f1d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -54,7 +55,7 @@ public JSStatement getBody()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
index c2bf993a..b0f957dd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -54,7 +55,7 @@ public JSStatement getStatement()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 3c16ee1d..7180b4c6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.psi.PsiElementVisitor;
@@ -32,7 +33,7 @@ public JSXmlLiteralExpressionImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		visitor.visitElement(this);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
index b2eb8025..cc04b80a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -42,7 +43,7 @@ public JSExpression getExpression()
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
index 0935307d..98b6436e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
@@ -17,8 +17,8 @@
 
 package com.intellij.lang.javascript.psi.impl.reference;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
@@ -72,7 +72,7 @@ public PsiElement resolve()
 		return myProperty;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	@RequiredReadAction
 	public String getCanonicalText()
@@ -88,7 +88,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
 	}
 
 	@Override
-	public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException
+	public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		return null;
 	}
@@ -116,7 +116,7 @@ public boolean isReferenceTo(PsiElement element)
 		return proxyExpanded && element == element2;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	@RequiredReadAction
 	public Object[] getVariants()
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index 871a420a..6ea0fb1d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -22,8 +22,9 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.injection.InjectedLanguageManager;
@@ -1140,14 +1141,14 @@ public void setSource(final PsiElement source)
 
 	public interface TypeProcessor
 	{
-		void process(@NotNull String type, @NotNull EvaluateContext evaluateContext, final PsiElement source);
+		void process(@Nonnull String type, @Nonnull EvaluateContext evaluateContext, final PsiElement source);
 
 		@Deprecated
 		boolean ecma();
 
 		Set<JavaScriptFeature> getFeatures();
 
-		void setUnknownElement(@NotNull PsiElement element);
+		void setUnknownElement(@Nonnull PsiElement element);
 	}
 
 	public interface GenericTypeParametersClient
@@ -1168,7 +1169,7 @@ public SimpleTypeProcessor(Set<JavaScriptFeature> features)
 		}
 
 		@Override
-		public void process(@NotNull final String _type, @NotNull final EvaluateContext evaluateContext, final PsiElement _source)
+		public void process(@Nonnull final String _type, @Nonnull final EvaluateContext evaluateContext, final PsiElement _source)
 		{
 			setType(type != null && !type.equals(_type) ? ANY_TYPE : _type, _source);
 		}
@@ -1199,7 +1200,7 @@ public boolean execute(final PsiElement element, final ResolveState state)
 		}
 
 		@Override
-		public void setUnknownElement(@NotNull final PsiElement _element)
+		public void setUnknownElement(@Nonnull final PsiElement _element)
 		{
 			setType(ANY_TYPE, _element);
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index 5b611d63..ee18f088 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -22,8 +22,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.flex.FlexImportSupport;
 import com.intellij.lang.javascript.flex.JSResolveHelper;
@@ -77,7 +77,7 @@ public Result<Map<String, JSImportedElementResolveResult>> compute()
 		}
 	};
 
-	public static String resolveTypeName(final String _str, @NotNull PsiElement context)
+	public static String resolveTypeName(final String _str, @Nonnull PsiElement context)
 	{
 		final JSImportedElementResolveResult resolveResult = _resolveTypeName(_str, context);
 		if(resolveResult == null)
@@ -88,7 +88,7 @@ public static String resolveTypeName(final String _str, @NotNull PsiElement cont
 	}
 
 	// TODO _str should be JSReferenceExpression for caching!
-	private static JSImportedElementResolveResult _resolveTypeName(final String _name, @NotNull PsiElement context)
+	private static JSImportedElementResolveResult _resolveTypeName(final String _name, @Nonnull PsiElement context)
 	{
 		String name = _name;
 		if(name == null)
@@ -239,7 +239,7 @@ private static JSQualifiedNamedElement resolveTypeNameInTheSamePackage(final Str
 
 	public static
 	@Nullable
-	JSImportedElementResolveResult resolveTypeNameUsingImports(@NotNull final JSReferenceExpression expr)
+	JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull final JSReferenceExpression expr)
 	{
 		if(expr.getQualifier() != null)
 		{
@@ -260,7 +260,7 @@ JSImportedElementResolveResult resolveTypeNameUsingImports(@NotNull final JSRefe
 
 	private static
 	@Nullable
-	JSImportedElementResolveResult resolveTypeNameUsingImports(final @NotNull String referencedName, PsiNamedElement parent)
+	JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String referencedName, PsiNamedElement parent)
 	{
 		final Map<String, JSImportedElementResolveResult> map = myImportResolveCache.get(ourImportResolveCache, parent, null).getValue();
 		JSImportedElementResolveResult result = map.get(referencedName);
@@ -391,7 +391,7 @@ private static JSImportedElementResolveResult checkTheSamePackageOrGlobal(final
 		return null;
 	}
 
-	public static boolean tryResolveImports(final PsiScopeProcessor processor, PsiNamedElement parent, @NotNull PsiElement place)
+	public static boolean tryResolveImports(final PsiScopeProcessor processor, PsiNamedElement parent, @Nonnull PsiElement place)
 	{
 		if(!isAdequatePlaceForImport(parent, place))
 		{
@@ -480,7 +480,7 @@ public static void importClassViaHelper(final PsiScopeProcessor processor, final
 		}
 	}
 
-	public static boolean isAdequatePlaceForImport(final PsiNamedElement parent, @NotNull PsiElement place)
+	public static boolean isAdequatePlaceForImport(final PsiNamedElement parent, @Nonnull PsiElement place)
 	{
 		if(parent instanceof JSFile && !parent.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4))
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index b6e7c6f3..c38d85fd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -29,8 +29,8 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.ide.highlighter.XmlFileType;
 import com.intellij.injected.editor.VirtualFileWindow;
 import com.intellij.javascript.documentation.JSDocumentationProvider;
@@ -124,7 +124,7 @@ public class JSResolveUtil
 
 	public static final String COMMENT_DELIMITERS = "|/";
 
-	public static void processInjectedFileForTag(final @NotNull XmlTag tag, @NotNull JSInjectedFilesVisitor visitor)
+	public static void processInjectedFileForTag(final @Nonnull XmlTag tag, @Nonnull JSInjectedFilesVisitor visitor)
 	{
 
 		for(XmlTagChild child : tag.getValue().getChildren())
@@ -488,7 +488,7 @@ public static PsiElement getTopReferenceParent(final PsiElement parent)
 		return currentParent;
 	}
 
-	public static PsiElement getTopReferenceExpression(final @NotNull PsiElement parent)
+	public static PsiElement getTopReferenceExpression(final @Nonnull PsiElement parent)
 	{
 		PsiElement element = parent;
 
@@ -661,7 +661,7 @@ public static String getTypeFromSetAccessor(final JSNamedElement jsNamedElement)
 		return jsParameters[0].getTypeString();
 	}
 
-	public static boolean shouldProcessTopLevelGlobalContext(@NotNull PsiElement place, @NotNull PsiScopeProcessor processor)
+	public static boolean shouldProcessTopLevelGlobalContext(@Nonnull PsiElement place, @Nonnull PsiScopeProcessor processor)
 	{
 		PsiElement placeParent = null;
 
@@ -672,7 +672,7 @@ public static boolean shouldProcessTopLevelGlobalContext(@NotNull PsiElement pla
 				placeParent instanceof JSNewExpression);
 	}
 
-	public static boolean shouldProcessImports(@NotNull PsiElement place, @NotNull PsiScopeProcessor processor)
+	public static boolean shouldProcessImports(@Nonnull PsiElement place, @Nonnull PsiScopeProcessor processor)
 	{
 		if(!(processor instanceof ResolveProcessor) || ((ResolveProcessor) processor).isLocalResolve())
 		{
@@ -737,7 +737,7 @@ public static boolean processTopLevelClasses(PsiScopeProcessor processor, Resolv
 		return result;
 	}
 
-	static boolean walkOverStructure(@NotNull PsiElement context, Processor<PsiNamedElement> processor)
+	static boolean walkOverStructure(@Nonnull PsiElement context, Processor<PsiNamedElement> processor)
 	{
 		PsiNamedElement parent = PsiTreeUtil.getNonStrictParentOfType(context, JSQualifiedNamedElement.class, PsiFile.class);
 
@@ -888,7 +888,7 @@ public static boolean processGlobalThings(PsiScopeProcessor processor, ResolveSt
 
 	public static
 	@Nullable
-	JSParameter findParameterForUsedArgument(@NotNull JSExpression mainOccurence, @NotNull JSArgumentList parent)
+	JSParameter findParameterForUsedArgument(@Nonnull JSExpression mainOccurence, @Nonnull JSArgumentList parent)
 	{
 		int paramIndex = 0;
 
@@ -931,7 +931,7 @@ JSParameter findParameterForUsedArgument(@NotNull JSExpression mainOccurence, @N
 	public static abstract class JSInjectedFilesVisitor implements PsiLanguageInjectionHost.InjectedPsiVisitor, XmlBackedJSClassImpl.InjectedFileVisitor
 	{
 		@Override
-		public void visit(@NotNull final PsiFile injectedPsi, @NotNull final List<PsiLanguageInjectionHost.Shred> places)
+		public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
 		{
 			if(injectedPsi instanceof JSFile)
 			{
@@ -1195,7 +1195,7 @@ public Result<PsiElement[]> compute()
 	}
 
 	@Nullable
-	private static PsiElement processFunctionDeclarations(final @NotNull PsiScopeProcessor processor, final @Nullable PsiElement context)
+	private static PsiElement processFunctionDeclarations(final @Nonnull PsiScopeProcessor processor, final @Nullable PsiElement context)
 	{
 		if(!(context instanceof JSElement))
 		{
@@ -1279,7 +1279,7 @@ public boolean process(JSClass jsClass)
 	/**
 	 * @return true if processor said enough
 	 */
-	private static boolean visitAllImplementedInterfaces(JSClass clazz, @NotNull Collection<JSClass> visited, Processor<JSClass> processor)
+	private static boolean visitAllImplementedInterfaces(JSClass clazz, @Nonnull Collection<JSClass> visited, Processor<JSClass> processor)
 	{
 		if(visited.contains(clazz))
 		{
@@ -1664,13 +1664,13 @@ public static boolean isExprInTypeContext(final JSReferenceExpression expr)
 	}
 
 	@Nullable
-	public static PsiElement findClassByQName(final String link, final @NotNull PsiElement context)
+	public static PsiElement findClassByQName(final String link, final @Nonnull PsiElement context)
 	{
 		return findClassByQName(link, context.getProject(), context.getResolveScope());
 	}
 
 	@Nullable
-	public static PsiElement findClassByQName(final String link, @NotNull GlobalSearchScope scope, @NotNull Project project)
+	public static PsiElement findClassByQName(final String link, @Nonnull GlobalSearchScope scope, @Nonnull Project project)
 	{
 		return findClassByQName(link, project, scope);
 	}
@@ -2775,7 +2775,7 @@ public interface OverrideHandler
 
 	public interface MetaDataProcessor
 	{
-		boolean process(final @NotNull JSAttribute jsAttribute);
+		boolean process(final @Nonnull JSAttribute jsAttribute);
 
 		boolean handleOtherElement(final PsiElement el, PsiElement context, @Nullable Ref<PsiElement> continuePassElement);
 	}
@@ -2949,7 +2949,7 @@ public String getText()
 		}
 
 		@Override
-		public void accept(@NotNull PsiElementVisitor visitor)
+		public void accept(@Nonnull PsiElementVisitor visitor)
 		{
 			if(visitor instanceof JSElementVisitor)
 			{
@@ -2979,7 +2979,7 @@ public boolean isPhysical()
 			return false;
 		}
 
-		@NotNull
+		@Nonnull
 		@Override
 		public ASTNode getNode()
 		{
@@ -3021,7 +3021,7 @@ public void setInitializer(JSExpression expr) throws IncorrectOperationException
 		{
 		}
 
-		@NotNull
+		@Nonnull
 		@Override
 		public JavaScriptType getType()
 		{
@@ -3072,7 +3072,7 @@ public String getName()
 		}
 
 		@Override
-		public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException
+		public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException
 		{
 			throw new IncorrectOperationException();
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index fd96d64f..423b56bd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -208,7 +208,7 @@ public List<PsiElement> getResults()
 	}
 
 	@Override
-	public boolean execute(@NotNull PsiElement element, ResolveState state)
+	public boolean execute(@Nonnull PsiElement element, ResolveState state)
 	{
 		if((element instanceof JSVariable && !(element instanceof JSParameter)) || element instanceof JSFunction)
 		{
@@ -511,7 +511,7 @@ public static String getName(final PsiNamedElement element)
 	}
 
 	@Override
-	public <T> T getHint(@NotNull Key<T> hintClass)
+	public <T> T getHint(@Nonnull Key<T> hintClass)
 	{
 		return null;
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
index 400d3fa4..d080e643 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
@@ -20,7 +20,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.index.JSSymbolUtil;
 import com.intellij.lang.javascript.psi.*;
@@ -153,7 +154,7 @@ public Set<JavaScriptFeature> getFeatures()
 					}
 
 					@Override
-					public void process(@NotNull String type, @NotNull final EvaluateContext context, final PsiElement source)
+					public void process(@Nonnull String type, @Nonnull final EvaluateContext context, final PsiElement source)
 					{
 						if(context.visitedTypes.contains(type))
 						{
@@ -180,7 +181,7 @@ public boolean processClass(final JSClass clazz)
 					}
 
 					@Override
-					public void setUnknownElement(@NotNull final PsiElement element)
+					public void setUnknownElement(@Nonnull final PsiElement element)
 					{
 					}
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
index 9cb7c8e2..48cf6ca2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.stubs;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSReferenceList;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
@@ -24,7 +24,7 @@
 
 public class JSImplementedInterfacesIndex extends StringStubIndexExtension<JSReferenceList>
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public StubIndexKey<String, JSReferenceList> getKey()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
index b3c8d256..2985b164 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
@@ -19,7 +19,7 @@
  */
 package com.intellij.lang.javascript.psi.stubs;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
@@ -27,7 +27,7 @@
 
 public class JSNameIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public StubIndexKey<String, JSQualifiedNamedElement> getKey()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
index 0b387ad7..f0ea3d69 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
@@ -19,7 +19,8 @@
  */
 package com.intellij.lang.javascript.psi.stubs;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
@@ -27,7 +28,7 @@
 
 public class JSQualifiedElementIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public StubIndexKey<String, JSQualifiedNamedElement> getKey()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
index dffde979..28da1f31 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.psi.stubs;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSReferenceList;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
@@ -24,7 +25,7 @@
 
 public class JSSuperClassIndex extends StringStubIndexExtension<JSReferenceList>
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public StubIndexKey<String, JSReferenceList> getKey()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
index df3b4afb..bf145728 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi.util;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.codeInsight.completion.PrioritizedLookupElement;
@@ -49,7 +50,7 @@ public static enum LookupPriority
 
 	@Nullable
 	@RequiredReadAction
-	public static LookupElement createLookupItem(@NotNull PsiElement value, @NotNull String name, @NotNull LookupPriority priority)
+	public static LookupElement createLookupItem(@Nonnull PsiElement value, @Nonnull String name, @Nonnull LookupPriority priority)
 	{
 		LookupElementBuilder builder = LookupElementBuilder.create(name);
 		builder = builder.withIcon(IconDescriptorUpdaters.getIcon(value, Iconable.ICON_FLAG_VISIBILITY));
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index b9c69c1e..be6cc77b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -21,7 +21,7 @@
 import java.util.Collection;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSReferenceList;
 import com.intellij.openapi.extensions.Extensions;
@@ -109,7 +109,7 @@ protected JSClass[] getSupers(final JSClass candidate)
 			}
 
 			@Override
-			public boolean execute(@NotNull final SearchParameters queryParameters, @NotNull Processor<JSClass> consumer)
+			public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull Processor<JSClass> consumer)
 			{
 				final THashSet<JSClass> visited = new THashSet<JSClass>();         // no abstract classes in ActionScript !
 
@@ -175,7 +175,7 @@ protected Collection<JSClass> getInheritors(JSClassInheritorsProvider provider,
 	}
 
 	@Override
-	public boolean execute(@NotNull final SearchParameters queryParameters, @NotNull final Processor<JSClass> consumer)
+	public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull final Processor<JSClass> consumer)
 	{
 		return processDirectInheritors(queryParameters.getTargetClass(), consumer, queryParameters.isCheckDeepInheritance(), null,
 				queryParameters.getScope());
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
index 1e05f743..53fde8aa 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttribute;
@@ -45,35 +46,35 @@ public JSAttributeElementType()
 		super("ATTRIBUTE");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSAttributeImpl(astNode);
 	}
 
 	@Override
-	public JSAttribute createPsi(@NotNull JSAttributeStub stub)
+	public JSAttribute createPsi(@Nonnull JSAttributeStub stub)
 	{
 		return new JSAttributeImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSAttributeStub createStub(@NotNull JSAttribute psi, StubElement parentStub)
+	public JSAttributeStub createStub(@Nonnull JSAttribute psi, StubElement parentStub)
 	{
 		return new JSAttributeStubImpl(psi.getName(), 0, parentStub);
 	}
 
 	@Override
-	public void serialize(@NotNull JSAttributeStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSAttributeStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getName());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSAttributeStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSAttributeStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef name = dataStream.readName();
 		return new JSAttributeStubImpl(StringRef.toString(name), 0, parentStub);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
index 84d163aa..275cefff 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttributeList;
@@ -45,22 +46,22 @@ public JSAttributeListElementType()
 		super("ATTRIBUTE_LIST");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSAttributeListImpl(astNode);
 	}
 
 	@Override
-	public JSAttributeList createPsi(@NotNull JSAttributeListStub stub)
+	public JSAttributeList createPsi(@Nonnull JSAttributeListStub stub)
 	{
 		return new JSAttributeListImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSAttributeListStub createStub(@NotNull JSAttributeList psi, StubElement parentStub)
+	public JSAttributeListStub createStub(@Nonnull JSAttributeList psi, StubElement parentStub)
 	{
 		String namespace = psi.getNamespace();
 		int flags = JSAttributeListStubImpl.getFlags(psi);
@@ -68,15 +69,15 @@ public JSAttributeListStub createStub(@NotNull JSAttributeList psi, StubElement
 	}
 
 	@Override
-	public void serialize(@NotNull JSAttributeListStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSAttributeListStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getNamespace());
 		dataStream.writeInt(stub.getFlags());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSAttributeListStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSAttributeListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef namespaceRef = dataStream.readName();
 		int i = dataStream.readInt();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
index 524eb75a..4f5977f8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
@@ -45,22 +46,22 @@ public JSAttributeNameValuePairType()
 		super("ATTRIBUTE_NAME_VALUE_PAIR");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSAttributeNameValuePairImpl(astNode);
 	}
 
 	@Override
-	public JSAttributeNameValuePair createPsi(@NotNull JSAttributeNameValuePairStub stub)
+	public JSAttributeNameValuePair createPsi(@Nonnull JSAttributeNameValuePairStub stub)
 	{
 		return new JSAttributeNameValuePairImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSAttributeNameValuePairStub createStub(@NotNull JSAttributeNameValuePair psi, StubElement parentStub)
+	public JSAttributeNameValuePairStub createStub(@Nonnull JSAttributeNameValuePair psi, StubElement parentStub)
 	{
 		String name = psi.getName();
 		String simpleValue = psi.getSimpleValue();
@@ -68,15 +69,15 @@ public JSAttributeNameValuePairStub createStub(@NotNull JSAttributeNameValuePair
 	}
 
 	@Override
-	public void serialize(@NotNull JSAttributeNameValuePairStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSAttributeNameValuePairStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getName());
 		dataStream.writeName(stub.getValue());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSAttributeNameValuePairStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSAttributeNameValuePairStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef name = dataStream.readName();
 		StringRef value = dataStream.readName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
index f6918561..46c23096 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
@@ -48,7 +48,7 @@ public JSClassElementType()
 	}
 
 	@Override
-	public void indexStub(@NotNull JSClassStub stub, @NotNull IndexSink sink)
+	public void indexStub(@Nonnull JSClassStub stub, @Nonnull IndexSink sink)
 	{
 		super.indexStub(stub, sink);
 
@@ -59,22 +59,22 @@ public void indexStub(@NotNull JSClassStub stub, @NotNull IndexSink sink)
 		}
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSClassImpl(astNode);
 	}
 
 	@Override
-	public JSClass createPsi(@NotNull JSClassStub stub)
+	public JSClass createPsi(@Nonnull JSClassStub stub)
 	{
 		return new JSClassImpl(stub, this);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSClassStub createStub(@NotNull JSClass psi, StubElement parentStub)
+	public JSClassStub createStub(@Nonnull JSClass psi, StubElement parentStub)
 	{
 		String name = psi.getName();
 		int flags = JSClassStubImpl.getFlags(psi);
@@ -83,16 +83,16 @@ public JSClassStub createStub(@NotNull JSClass psi, StubElement parentStub)
 	}
 
 	@Override
-	public void serialize(@NotNull JSClassStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSClassStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getName());
 		dataStream.writeName(stub.getQualifiedName());
 		dataStream.writeInt(stub.getFlags());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSClassStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSClassStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef nameRef = dataStream.readName();
 		StringRef qualifiedRef = dataStream.readName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index 1b4f9424..539b422d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -18,7 +18,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.Language;
 import consulo.javascript.index.JavaScriptIndexer;
 import com.intellij.lang.javascript.psi.JSFile;
@@ -45,7 +46,7 @@ public JSFileElementType(final Language language)
 	}
 
 	@Override
-	public void indexStub(@NotNull final JSFileStub stub, @NotNull final IndexSink sink)
+	public void indexStub(@Nonnull final JSFileStub stub, @Nonnull final IndexSink sink)
 	{
 		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensions())
 		{
@@ -58,9 +59,9 @@ public StubBuilder getBuilder()
 	{
 		return new DefaultStubBuilder()
 		{
-			@NotNull
+			@Nonnull
 			@Override
-			protected StubElement createStubForFile(@NotNull PsiFile file)
+			protected StubElement createStubForFile(@Nonnull PsiFile file)
 			{
 				if(file instanceof JSFile)
 				{
@@ -72,20 +73,20 @@ protected StubElement createStubForFile(@NotNull PsiFile file)
 	}
 
 	@Override
-	public void serialize(@NotNull JSFileStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSFileStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getName());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSFileStub deserialize(@NotNull final StubInputStream dataStream, final StubElement parentStub) throws IOException
+	public JSFileStub deserialize(@Nonnull final StubInputStream dataStream, final StubElement parentStub) throws IOException
 	{
 		StringRef name = dataStream.readName();
 		return new JSFileStubImpl(null, name);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getExternalId()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
index d15fedb9..730c64e4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
@@ -38,7 +39,7 @@
  */
 public abstract class JSFunctionElementType extends JSQualifiedStubElementType<JSFunctionStub, JSFunction>
 {
-	public JSFunctionElementType(@NotNull String name)
+	public JSFunctionElementType(@Nonnull String name)
 	{
 		super(name);
 	}
@@ -63,7 +64,7 @@ protected boolean doIndexQualifiedName(JSFunctionStub stub, String name, String
 
 	@RequiredReadAction
 	@Override
-	public JSFunctionStub createStub(@NotNull JSFunction psi, StubElement parentStub)
+	public JSFunctionStub createStub(@Nonnull JSFunction psi, StubElement parentStub)
 	{
 		String name = psi.getName();
 		String qualifiedName = psi.getQualifiedName();
@@ -73,7 +74,7 @@ public JSFunctionStub createStub(@NotNull JSFunction psi, StubElement parentStub
 	}
 
 	@Override
-	public void serialize(@NotNull JSFunctionStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSFunctionStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getName());
 		dataStream.writeName(stub.getQualifiedName());
@@ -81,9 +82,9 @@ public void serialize(@NotNull JSFunctionStub stub, @NotNull StubOutputStream da
 		dataStream.writeVarInt(stub.getFlags());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSFunctionStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSFunctionStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef nameRef = dataStream.readName();
 		StringRef qualifiedRef = dataStream.readName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
index a4122591..4991a5b4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSImportStatement;
@@ -45,36 +46,36 @@ public JSImportStatementElementType()
 		super("IMPORT_STATEMENT");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSImportStatementImpl(astNode);
 	}
 
 	@Override
-	public JSImportStatement createPsi(@NotNull JSImportStatementStub stub)
+	public JSImportStatement createPsi(@Nonnull JSImportStatementStub stub)
 	{
 		return new JSImportStatementImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSImportStatementStub createStub(@NotNull JSImportStatement psi, StubElement parentStub)
+	public JSImportStatementStub createStub(@Nonnull JSImportStatement psi, StubElement parentStub)
 	{
 		String importText = psi.getImportText();
 		return new JSImportStatementStubImpl(importText, parentStub, this);
 	}
 
 	@Override
-	public void serialize(@NotNull JSImportStatementStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSImportStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getImportText());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSImportStatementStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSImportStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef importText = dataStream.readName();
 		return new JSImportStatementStubImpl(StringRef.toString(importText), parentStub, this);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
index 9f09e215..c2f976de 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSIncludeDirective;
@@ -46,14 +47,14 @@ public JSIncludeDirectiveElementType()
 	}
 
 	@Override
-	public void serialize(@NotNull JSIncludeDirectiveStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSIncludeDirectiveStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getIncludeText());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSIncludeDirectiveStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSIncludeDirectiveStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef includeText = dataStream.readName();
 		return new JSIncludeDirectiveStubImpl(StringRef.toString(includeText), parentStub, this);
@@ -61,21 +62,21 @@ public JSIncludeDirectiveStub deserialize(@NotNull StubInputStream dataStream, S
 
 	@RequiredReadAction
 	@Override
-	public JSIncludeDirectiveStub createStub(@NotNull JSIncludeDirective psi, StubElement parentStub)
+	public JSIncludeDirectiveStub createStub(@Nonnull JSIncludeDirective psi, StubElement parentStub)
 	{
 		String includeText = psi.getIncludeText();
 		return new JSIncludeDirectiveStubImpl(includeText, parentStub, this);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSIncludeDirectiveImpl(astNode);
 	}
 
 	@Override
-	public JSIncludeDirective createPsi(@NotNull JSIncludeDirectiveStub stub)
+	public JSIncludeDirective createPsi(@Nonnull JSIncludeDirectiveStub stub)
 	{
 		return new JSIncludeDirectiveImpl(stub);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
index 89725262..2bd99e40 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
@@ -45,22 +46,22 @@ public JSNamespaceDeclarationElementType()
 		super("NAMESPACE_DECLARATION");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSNamespaceDeclarationImpl(astNode);
 	}
 
 	@Override
-	public JSNamespaceDeclaration createPsi(@NotNull JSNamespaceDeclarationStub stub)
+	public JSNamespaceDeclaration createPsi(@Nonnull JSNamespaceDeclarationStub stub)
 	{
 		return new JSNamespaceDeclarationImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSNamespaceDeclarationStub createStub(@NotNull JSNamespaceDeclaration psi, StubElement parentStub)
+	public JSNamespaceDeclarationStub createStub(@Nonnull JSNamespaceDeclaration psi, StubElement parentStub)
 	{
 		String name = psi.getName();
 		String qualifiedName = psi.getQualifiedName();
@@ -69,16 +70,16 @@ public JSNamespaceDeclarationStub createStub(@NotNull JSNamespaceDeclaration psi
 	}
 
 	@Override
-	public void serialize(@NotNull JSNamespaceDeclarationStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSNamespaceDeclarationStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getName());
 		dataStream.writeName(stub.getQualifiedName());
 		dataStream.writeName(stub.getInitialValueString());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSNamespaceDeclarationStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSNamespaceDeclarationStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef nameRef = dataStream.readName();
 		StringRef qualifiedRef = dataStream.readName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
index 31f5e8ed..d3e95edc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
@@ -45,22 +46,22 @@ public JSPackageStatementElementType()
 		super("PACKAGE_STATEMENT");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSPackageStatementImpl(astNode);
 	}
 
 	@Override
-	public JSPackageStatement createPsi(@NotNull JSPackageStatementStub stub)
+	public JSPackageStatement createPsi(@Nonnull JSPackageStatementStub stub)
 	{
 		return new JSPackageStatementImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSPackageStatementStub createStub(@NotNull JSPackageStatement psi, StubElement parentStub)
+	public JSPackageStatementStub createStub(@Nonnull JSPackageStatement psi, StubElement parentStub)
 	{
 		String name = psi.getName();
 		String qualifiedName = psi.getQualifiedName();
@@ -68,15 +69,15 @@ public JSPackageStatementStub createStub(@NotNull JSPackageStatement psi, StubEl
 	}
 
 	@Override
-	public void serialize(@NotNull JSPackageStatementStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSPackageStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getName());
 		dataStream.writeName(stub.getQualifiedName());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSPackageStatementStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSPackageStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef nameRef = dataStream.readName();
 		StringRef qualifiedRef = dataStream.readName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
index ade966c6..2a97bdb8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSParameter;
@@ -45,22 +45,22 @@ public JSParameterElementType()
 		super("FORMAL_PARAMETER");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSParameterImpl(astNode);
 	}
 
 	@Override
-	public JSParameter createPsi(@NotNull JSParameterStub stub)
+	public JSParameter createPsi(@Nonnull JSParameterStub stub)
 	{
 		return new JSParameterImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSParameterStub createStub(@NotNull JSParameter psi, StubElement parentStub)
+	public JSParameterStub createStub(@Nonnull JSParameter psi, StubElement parentStub)
 	{
 		String name = psi.getName();
 		int flags = JSParameterStubImpl.buildFlags(psi);
@@ -71,7 +71,7 @@ public JSParameterStub createStub(@NotNull JSParameter psi, StubElement parentSt
 	}
 
 	@Override
-	public void serialize(@NotNull JSParameterStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSParameterStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getName());
 		dataStream.writeVarInt(stub.getFlags());
@@ -80,9 +80,9 @@ public void serialize(@NotNull JSParameterStub stub, @NotNull StubOutputStream d
 		dataStream.writeName(stub.getQualifiedName());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSParameterStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef nameRef = dataStream.readName();
 		int flags = dataStream.readVarInt();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
index cdcf02e7..4448817e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSParameterList;
@@ -44,35 +45,35 @@ public JSParameterListElementType()
 		super("PARAMETER_LIST");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSParameterListImpl(astNode);
 	}
 
 	@Override
-	public JSParameterList createPsi(@NotNull JSParameterListStub stub)
+	public JSParameterList createPsi(@Nonnull JSParameterListStub stub)
 	{
 		return new JSParameterListImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSParameterListStub createStub(@NotNull JSParameterList psi, StubElement parentStub)
+	public JSParameterListStub createStub(@Nonnull JSParameterList psi, StubElement parentStub)
 	{
 		return new JSParameterListStubImpl(parentStub, this);
 	}
 
 	@Override
-	public void serialize(@NotNull JSParameterListStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSParameterListStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSParameterListStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSParameterListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		return new JSParameterListStubImpl(parentStub, this);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
index beeae444..27bd6522 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
@@ -19,8 +19,9 @@
 
 import java.io.IOException;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSReferenceList;
@@ -53,7 +54,7 @@ public JSReferenceListElementType(@NonNls String name)
 	}
 
 	@Override
-	public void indexStub(@NotNull JSReferenceListStub stub, @NotNull IndexSink sink)
+	public void indexStub(@Nonnull JSReferenceListStub stub, @Nonnull IndexSink sink)
 	{
 		if(this == JSElementTypes.EXTENDS_LIST)
 		{
@@ -76,29 +77,29 @@ private static void doIndex(IndexSink sink, JSReferenceListStub stub, StubIndexK
 		}
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSReferenceListImpl(astNode);
 	}
 
 	@Override
-	public JSReferenceList createPsi(@NotNull JSReferenceListStub stub)
+	public JSReferenceList createPsi(@Nonnull JSReferenceListStub stub)
 	{
 		return new JSReferenceListImpl(stub, this);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSReferenceListStub createStub(@NotNull JSReferenceList psi, StubElement parentStub)
+	public JSReferenceListStub createStub(@Nonnull JSReferenceList psi, StubElement parentStub)
 	{
 		String[] referenceTexts = psi.getReferenceTexts();
 		return new JSReferenceListStubImpl(referenceTexts, parentStub, this);
 	}
 
 	@Override
-	public void serialize(@NotNull JSReferenceListStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSReferenceListStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		String[] referenceTexts = stub.getReferenceTexts();
 		dataStream.writeVarInt(referenceTexts.length);
@@ -108,9 +109,9 @@ public void serialize(@NotNull JSReferenceListStub stub, @NotNull StubOutputStre
 		}
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSReferenceListStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSReferenceListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		int count = dataStream.readVarInt();
 		String[] refs = ArrayUtil.newStringArray(count);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
index e1e2a763..0cc691ce 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSStubElementType;
@@ -45,35 +46,35 @@ public JSUseNamespaceDirectiveType()
 		super("USE_NAMESPACE_DIRECTIVE");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSUseNamespaceDirectiveImpl(astNode);
 	}
 
 	@Override
-	public JSUseNamespaceDirective createPsi(@NotNull JSUseNamespaceDirectiveStub stub)
+	public JSUseNamespaceDirective createPsi(@Nonnull JSUseNamespaceDirectiveStub stub)
 	{
 		return new JSUseNamespaceDirectiveImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSUseNamespaceDirectiveStub createStub(@NotNull JSUseNamespaceDirective psi, StubElement parentStub)
+	public JSUseNamespaceDirectiveStub createStub(@Nonnull JSUseNamespaceDirective psi, StubElement parentStub)
 	{
 		return new JSUseNamespaceDirectiveStubImpl(psi.getNamespaceToBeUsed(), parentStub, this);
 	}
 
 	@Override
-	public void serialize(@NotNull JSUseNamespaceDirectiveStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSUseNamespaceDirectiveStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getNamespaceToUse());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSUseNamespaceDirectiveStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSUseNamespaceDirectiveStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef nameRef = dataStream.readName();
 		return new JSUseNamespaceDirectiveStubImpl(StringRef.toString(nameRef), parentStub, this);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
index 59835562..d29360fc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
@@ -54,35 +55,35 @@ public boolean shouldCreateStub(ASTNode node)
 		return element instanceof JSClass || element instanceof JSPackageStatement || element instanceof JSFile;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSVarStatementImpl(astNode);
 	}
 
 	@Override
-	public JSVarStatement createPsi(@NotNull JSVarStatementStub stub)
+	public JSVarStatement createPsi(@Nonnull JSVarStatementStub stub)
 	{
 		return new JSVarStatementImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSVarStatementStub createStub(@NotNull JSVarStatement psi, StubElement parentStub)
+	public JSVarStatementStub createStub(@Nonnull JSVarStatement psi, StubElement parentStub)
 	{
 		return new JSVarStatementStubImpl(parentStub, this);
 	}
 
 	@Override
-	public void serialize(@NotNull JSVarStatementStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSVarStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSVarStatementStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSVarStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		return new JSVarStatementStubImpl(parentStub, this);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
index 5ac4fefb..f392b449 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
@@ -19,7 +19,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -75,22 +76,22 @@ public boolean shouldCreateStub(final ASTNode node)
 				discriminatingParentType instanceof JSFileElementType;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElement createElement(@NotNull ASTNode astNode)
+	public PsiElement createElement(@Nonnull ASTNode astNode)
 	{
 		return new JSVariableImpl(astNode);
 	}
 
 	@Override
-	public JSVariable createPsi(@NotNull JSVariableStub stub)
+	public JSVariable createPsi(@Nonnull JSVariableStub stub)
 	{
 		return new JSVariableImpl(stub);
 	}
 
 	@RequiredReadAction
 	@Override
-	public JSVariableStub createStub(@NotNull JSVariable psi, StubElement parentStub)
+	public JSVariableStub createStub(@Nonnull JSVariable psi, StubElement parentStub)
 	{
 		String name = psi.getName();
 		int flags = JSVariableStubImpl.buildFlags(psi);
@@ -101,7 +102,7 @@ public JSVariableStub createStub(@NotNull JSVariable psi, StubElement parentStub
 	}
 
 	@Override
-	public void serialize(@NotNull JSVariableStub stub, @NotNull StubOutputStream dataStream) throws IOException
+	public void serialize(@Nonnull JSVariableStub stub, @Nonnull StubOutputStream dataStream) throws IOException
 	{
 		dataStream.writeName(stub.getName());
 		dataStream.writeVarInt(stub.getFlags());
@@ -110,9 +111,9 @@ public void serialize(@NotNull JSVariableStub stub, @NotNull StubOutputStream da
 		dataStream.writeName(stub.getQualifiedName());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public JSVariableStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException
+	public JSVariableStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
 	{
 		StringRef nameRef = dataStream.readName();
 		int flags = dataStream.readVarInt();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index adb38c63..42eac636 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
diff --git a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
index 0637e1e6..e2d8509d 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.ide.codeInsight;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
 import com.intellij.openapi.util.KeyedExtensionCollector;
 import com.intellij.psi.PsiElement;
@@ -31,7 +31,7 @@ public class JavaScriptQuickFixFactory
 {
 	private static final JavaScriptQuickFixFactory ourDefaultImpl = new JavaScriptQuickFixFactory();
 
-	@NotNull
+	@Nonnull
 	public static JavaScriptQuickFixFactory byElement(PsiElement element)
 	{
 		LanguageVersion languageVersion = element.getLanguageVersion();
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
index d1ad3ad5..512a3f45 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
@@ -19,7 +19,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSDocElementType;
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -121,12 +122,12 @@ public boolean process(IElementType type)
 
 	private Factory<Lexer> myFactory;
 
-	public JavaScriptHighlighter(@NotNull Factory<Lexer> factory)
+	public JavaScriptHighlighter(@Nonnull Factory<Lexer> factory)
 	{
 		myFactory = factory;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer getHighlightingLexer()
 	{
@@ -134,7 +135,7 @@ public Lexer getHighlightingLexer()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public TextAttributesKey[] getTokenHighlights(IElementType tokenType)
 	{
 		return pack(keys1.get(tokenType), keys2.get(tokenType));
diff --git a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index b3c7faf9..2bcb0c6a 100644
--- a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -19,7 +19,7 @@
 
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import org.jetbrains.annotations.PropertyKey;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.lang.javascript.JavaScriptBundle;
@@ -47,14 +47,14 @@ public CreateJSFunctionFixBase(String name, @PropertyKey(resourceBundle = JavaSc
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getName()
 	{
 		return JavaScriptBundle.message(myIntentionNameKey, myName);
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getFamilyName()
 	{
 		return JavaScriptBundle.message("javascript.create.function.intention.family");
diff --git a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index e34a68ab..869996fc 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -2,7 +2,8 @@
 
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
@@ -25,42 +26,42 @@ public BaseJavaScriptLanguageVersion(String name, String... mimeTypes)
 		super(name, name, JavaScriptLanguage.INSTANCE, mimeTypes);
 	}
 
-	protected void addFeature(@NotNull JavaScriptFeature feature)
+	protected void addFeature(@Nonnull JavaScriptFeature feature)
 	{
 		myFeatures.add(feature);
 	}
 
-	@NotNull
+	@Nonnull
 	public Set<JavaScriptFeature> getFeatures()
 	{
 		return myFeatures;
 	}
 
-	@NotNull
+	@Nonnull
 	public abstract SyntaxHighlighter getSyntaxHighlighter();
 
-	@NotNull
+	@Nonnull
 	@Override
 	public PsiParser createParser()
 	{
 		return new JavaScriptParser();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public TokenSet getWhitespaceTokens()
 	{
 		return JavaScriptTokenSets.WHITE_SPACES;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public TokenSet getCommentTokens()
 	{
 		return JSTokenTypes.COMMENTS;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public TokenSet getStringLiteralElements()
 	{
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
index 7fdfbea6..223ca200 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -1,6 +1,7 @@
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
@@ -15,7 +16,7 @@ public class JavaScript15LanguageVersion extends BaseJavaScriptLanguageVersion i
 {
 	private static final Factory<Lexer> ourLexerFactory = () -> new JavaScript15Lexer();
 
-	@NotNull
+	@Nonnull
 	public static JavaScript15LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript15LanguageVersion.class);
@@ -26,20 +27,20 @@ public JavaScript15LanguageVersion()
 		super("JAVASCRIPT_1_5");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableName()
 	{
 		return "JavaScript 1.5";
 	}
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter()
 	{
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index 484f4253..2ab8e9fb 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -3,8 +3,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.ContainerUtil;
 import consulo.lang.LanguageVersion;
@@ -15,13 +16,13 @@
  */
 public class StandardJavaScriptVersionsImpl extends StandardJavaScriptVersions
 {
-	@NotNull
+	@Nonnull
 	public BaseJavaScriptLanguageVersion getDefaultVersion()
 	{
 		return JavaScript15LanguageVersion.getInstance();
 	}
 
-	@NotNull
+	@Nonnull
 	public List<JavaScriptLanguageVersion> getValidLanguageVersions()
 	{
 		List<JavaScriptLanguageVersion> list = new ArrayList<>();
@@ -38,7 +39,7 @@ public List<JavaScriptLanguageVersion> getValidLanguageVersions()
 		return list;
 	}
 
-	@NotNull
+	@Nonnull
 	public BaseJavaScriptLanguageVersion findVersionById(@Nullable String id)
 	{
 		if(StringUtil.isEmpty(id))
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
index 7027b829..40a76161 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
@@ -3,7 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.psi.tree.IElementType;
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 3ada1d61..2d5ae52f 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
+
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index 0a17a188..ad0cb078 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -16,8 +16,9 @@
 
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -49,7 +50,7 @@ private void parseFunction(PsiBuilder builder, boolean expressionContext)
 		parseFunctionNoMarker(builder, expressionContext, builder.mark());
 	}
 
-	public void parseFunctionNoMarker(final PsiBuilder builder, final boolean expressionContext, final @NotNull PsiBuilder.Marker functionMarker)
+	public void parseFunctionNoMarker(final PsiBuilder builder, final boolean expressionContext, final @Nonnull PsiBuilder.Marker functionMarker)
 	{
 		if(builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD)
 		{ // function keyword may be ommited in context of get/set property definition
@@ -139,7 +140,7 @@ public void parseParameterList(final PsiBuilder builder)
 		parameterList.done(JSElementTypes.PARAMETER_LIST);
 	}
 
-	public void parseParameter(@NotNull PsiBuilder builder, @Nullable PsiBuilder.Marker parameterMarker)
+	public void parseParameter(@Nonnull PsiBuilder builder, @Nullable PsiBuilder.Marker parameterMarker)
 	{
 		if(parameterMarker == null)
 		{
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
index 3f367fe0..1a28a77c 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
@@ -1,6 +1,6 @@
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import consulo.lang.LanguageVersion;
 import com.intellij.lang.PsiBuilder;
@@ -13,9 +13,9 @@
  */
 public class JavaScriptParser implements PsiParser
 {
-	@NotNull
+	@Nonnull
 	@Override
-	public ASTNode parse(@NotNull IElementType root, @NotNull PsiBuilder originalBuilder, @NotNull LanguageVersion languageVersion)
+	public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder originalBuilder, @Nonnull LanguageVersion languageVersion)
 	{
 		JavaScriptParsingContext parsingContext = createParsingContext();
 
@@ -30,13 +30,13 @@ public ASTNode parse(@NotNull IElementType root, @NotNull PsiBuilder originalBui
 		return builder.getTreeBuilt();
 	}
 
-	@NotNull
+	@Nonnull
 	public JavaScriptParserBuilder createBuilder(PsiBuilder builder)
 	{
 		return new JavaScriptParserBuilder(builder);
 	}
 
-	@NotNull
+	@Nonnull
 	public JavaScriptParsingContext createParsingContext()
 	{
 		return new JavaScriptParsingContext();
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
index 5aeb6e45..fc009333 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
@@ -1,6 +1,7 @@
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.psi.tree.IElementType;
@@ -42,37 +43,37 @@ public boolean isIdentifierName(PsiBuilder builder, IElementType tokenType)
 		return JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(tokenType);
 	}
 
-	@NotNull
+	@Nonnull
 	protected FunctionParsing createFunctionParsing()
 	{
 		return new FunctionParsing(this);
 	}
 
-	@NotNull
+	@Nonnull
 	protected StatementParsing createStatementParsing()
 	{
 		return new StatementParsing(this);
 	}
 
-	@NotNull
+	@Nonnull
 	protected ExpressionParsing createExpressionParsing()
 	{
 		return new ExpressionParsing(this);
 	}
 
-	@NotNull
+	@Nonnull
 	public FunctionParsing getFunctionParsing()
 	{
 		return myFunctionParsing;
 	}
 
-	@NotNull
+	@Nonnull
 	public ExpressionParsing getExpressionParsing()
 	{
 		return myExpressionParsing;
 	}
 
-	@NotNull
+	@Nonnull
 	public StatementParsing getStatementParsing()
 	{
 		return myStatementParsing;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index 35148859..2a93df13 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -16,8 +16,8 @@
 
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.psi.tree.IElementType;
@@ -39,7 +39,7 @@ public Parsing(JavaScriptParsingContext context)
 	}
 
 	@Nullable
-	public IElementType expectContextKeyword(@NotNull PsiBuilder builder, @NotNull TokenSet tokenSet)
+	public IElementType expectContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
 	{
 		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 		{
@@ -56,7 +56,7 @@ public IElementType expectContextKeyword(@NotNull PsiBuilder builder, @NotNull T
 		return null;
 	}
 
-	public void advanceContextKeyword(@NotNull PsiBuilder builder, @NotNull TokenSet tokenSet)
+	public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
 	{
 		IElementType elementType = expectContextKeyword(builder, tokenSet);
 		if(elementType != null)
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index d5f0efa5..6f2a4fd8 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -666,7 +667,7 @@ protected void parseVarStatement(final PsiBuilder builder, final boolean inForIn
 		parseVarStatementNoMarker(builder, inForInitializationContext, builder.mark());
 	}
 
-	protected void parseVarStatementNoMarker(final PsiBuilder builder, final boolean inForInitializationContext, final @NotNull PsiBuilder.Marker var)
+	protected void parseVarStatementNoMarker(final PsiBuilder builder, final boolean inForInitializationContext, final @Nonnull PsiBuilder.Marker var)
 	{
 		final IElementType declType = builder.getTokenType();
 		StatementParsing.LOGGER.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
index cc34dae4..dacd60b9 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
@@ -3,7 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.openapi.util.text.StringUtil;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
index ec88387b..f7832449 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
@@ -16,8 +16,8 @@
 
 package consulo.javascript.lang.psi;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
@@ -41,7 +41,7 @@ public JavaScriptPrimitiveType(String name)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableText()
 	{
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
index 522fbb0f..cde4385b 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
@@ -16,8 +16,9 @@
 
 package consulo.javascript.lang.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.JSClass;
@@ -37,7 +38,7 @@ public JavaScriptClassType(JSClass aClass)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableText()
 	{
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
index 02ec4056..90958305 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
@@ -16,8 +16,8 @@
 
 package consulo.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
@@ -36,7 +36,7 @@ public JSComputedNameImpl(ASTNode node)
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		visitor.visitElement(this);
 	}
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
index 8dc13ebe..e667426b 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.psi.impl;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSParameter;
@@ -43,7 +44,7 @@ public JavaScriptLambdaExpressionImpl(ASTNode node)
 
 	@Override
 	@RequiredReadAction
-	public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
 	{
 		if(lastParent != null && lastParent.getParent() == this)
 		{
@@ -68,7 +69,7 @@ public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNul
 	}
 
 	@Override
-	public void accept(@NotNull PsiElementVisitor visitor)
+	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
@@ -81,7 +82,7 @@ public void accept(@NotNull PsiElementVisitor visitor)
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public JSParameterList getParameterList()
 	{
diff --git a/base-impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java b/base-impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
index 132d29a3..9497d7bc 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
@@ -1,7 +1,7 @@
 package consulo.javascript.psi.stubs.impl;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSFile;
 import consulo.javascript.psi.stubs.JSFileStub;
@@ -17,13 +17,13 @@ public class JSFileStubImpl extends PsiFileStubImpl<JSFile> implements JSFileStu
 {
 	private StringRef myName;
 
-	public JSFileStubImpl(@Nullable JSFile file, @NotNull String name)
+	public JSFileStubImpl(@Nullable JSFile file, @Nonnull String name)
 	{
 		super(file);
 		myName = StringRef.fromString(name);
 	}
 
-	public JSFileStubImpl(@Nullable JSFile file, @NotNull StringRef name)
+	public JSFileStubImpl(@Nullable JSFile file, @Nonnull StringRef name)
 	{
 		super(file);
 		myName = name;
@@ -35,7 +35,7 @@ public IStubFileElementType getType()
 		return JSElementTypes.FILE;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getName()
 	{
diff --git a/base-impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java b/base-impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
index 97a4da86..d5af6b3d 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
+++ b/base-impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
@@ -19,7 +19,8 @@
  */
 package consulo.javascript.psi.stubs.index;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
@@ -30,7 +31,7 @@
  */
 public class JavaScriptClassNameIndex extends StringStubIndexExtension<JSClass>
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public StubIndexKey<String, JSClass> getKey()
 	{
diff --git a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
index 78430547..5af5199d 100644
--- a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
@@ -17,8 +17,9 @@
 
 package consulo.javascript.types;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSQualifiedStub;
@@ -37,7 +38,7 @@ public JSQualifiedStubElementType(@NonNls String debugName)
 	}
 
 	@Override
-	public void indexStub(@NotNull StubT stub, @NotNull IndexSink sink)
+	public void indexStub(@Nonnull StubT stub, @Nonnull IndexSink sink)
 	{
 		final String name = stub.getName();
 		final String fqn = stub.getQualifiedName();
diff --git a/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java b/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
index acb79ab5..ba085b7f 100644
--- a/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
+++ b/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
@@ -18,8 +18,8 @@
 
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSElementFactory;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSNamedElement;
@@ -52,7 +52,7 @@
 public class JSDebuggerSupportUtils
 {
 	@Nullable
-	public static TextRange getExpressionAtOffset(@NotNull Project project, @NotNull Document document, final int offset)
+	public static TextRange getExpressionAtOffset(@Nonnull Project project, @Nonnull Document document, final int offset)
 	{
 		PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(document);
 		if(file == null)
@@ -84,7 +84,7 @@ public static TextRange getExpressionAtOffset(@NotNull Project project, @NotNull
 				InjectedLanguageUtil.enumerate(psiLanguageInjectionHost, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
-					public void visit(@NotNull final PsiFile injectedPsi, @NotNull final List<PsiLanguageInjectionHost.Shred> places)
+					public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
 					{
 						final PsiLanguageInjectionHost.Shred shred = places.get(0);
 						final int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
@@ -155,7 +155,7 @@ public static Document createDocument(final String text, final Project project,
 	}
 
 	@Nullable
-	public static PsiElement getContextElement(VirtualFile virtualFile, int offset, final @NotNull Project project)
+	public static PsiElement getContextElement(VirtualFile virtualFile, int offset, final @Nonnull Project project)
 	{
 		Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
 		PsiFile file = PsiManager.getInstance(project).findFile(virtualFile);
@@ -206,7 +206,7 @@ public static PsiElement getContextElement(VirtualFile virtualFile, int offset,
 				InjectedLanguageUtil.enumerate(parent, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
-					public void visit(@NotNull final PsiFile injectedPsi, @NotNull final List<PsiLanguageInjectionHost.Shred> places)
+					public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
 					{
 						final PsiLanguageInjectionHost.Shred shred = places.get(0);
 						final int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
index 381941d4..de0b57eb 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
@@ -16,8 +16,8 @@
 
 package consulo.javascript.debugger;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.lang.javascript.psi.JSElementFactory;
 import com.intellij.openapi.fileTypes.FileType;
@@ -35,12 +35,12 @@ public class JavaScriptEditorsProvider extends XDebuggerEditorsProviderBase
 	public static final JavaScriptEditorsProvider INSTANCE = new JavaScriptEditorsProvider();
 
 	@Override
-	protected PsiFile createExpressionCodeFragment(@NotNull Project project, @NotNull String text, @Nullable PsiElement element, boolean isPhysical)
+	protected PsiFile createExpressionCodeFragment(@Nonnull Project project, @Nonnull String text, @Nullable PsiElement element, boolean isPhysical)
 	{
 		return JSElementFactory.createExpressionCodeFragment(project, text, element, isPhysical);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public FileType getFileType()
 	{
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
index 6cda5896..892f32ac 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
@@ -16,8 +16,8 @@
 
 package consulo.javascript.debugger;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.javascript.JSDebuggerSupportUtils;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.openapi.editor.Document;
@@ -34,7 +34,7 @@
  */
 public class JavaScriptLineBreakpointType extends XLineBreakpointTypeBase
 {
-	@NotNull
+	@Nonnull
 	public static JavaScriptLineBreakpointType getInstance()
 	{
 		return EXTENSION_POINT_NAME.findExtension(JavaScriptLineBreakpointType.class);
@@ -44,16 +44,16 @@ public JavaScriptLineBreakpointType()
 	{
 		super("javascript", "JavaScript Breakpoints", new XDebuggerEditorsProvider()
 		{
-			@NotNull
+			@Nonnull
 			@Override
 			public FileType getFileType()
 			{
 				return JavaScriptFileType.INSTANCE;
 			}
 
-			@NotNull
+			@Nonnull
 			@Override
-			public Document createDocument(@NotNull Project project, @NotNull String s, @Nullable XSourcePosition sourcePosition, @NotNull EvaluationMode evaluationMode)
+			public Document createDocument(@Nonnull Project project, @Nonnull String s, @Nullable XSourcePosition sourcePosition, @Nonnull EvaluationMode evaluationMode)
 			{
 				return JSDebuggerSupportUtils.createDocument(s, project, sourcePosition == null ? null : sourcePosition.getFile(), sourcePosition == null ? 0 : sourcePosition.getOffset());
 			}
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
index 4a8f831f..857da33d 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
@@ -16,8 +16,9 @@
 
 package consulo.javascript.debugger;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.xdebugger.breakpoints.XLineBreakpointType;
@@ -33,7 +34,7 @@ public class JavaScriptLineBreakpointTypeResolver implements XLineBreakpointType
 	@RequiredReadAction
 	@Nullable
 	@Override
-	public XLineBreakpointType<?> resolveBreakpointType(@NotNull Project project, @NotNull VirtualFile virtualFile, int line)
+	public XLineBreakpointType<?> resolveBreakpointType(@Nonnull Project project, @Nonnull VirtualFile virtualFile, int line)
 	{
 		return JavaScriptLineBreakpointType.getInstance();
 	}
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
index 998863a7..3cedcb01 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
@@ -21,11 +21,11 @@
 import java.awt.event.MouseEvent;
 import java.util.Comparator;
 
+import javax.annotation.Nonnull;
 import javax.swing.JList;
 import javax.swing.JPanel;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.ide.actions.OpenFileAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
@@ -42,7 +42,7 @@
  */
 public abstract class JavaScriptListPanel<T> extends JPanel
 {
-	@NotNull
+	@Nonnull
 	private final Project myProject;
 	private SortedListModel<T> myModel = SortedListModel.create(new Comparator<T>()
 	{
@@ -59,7 +59,7 @@ public int compare(T o1, T o2)
 		}
 	});
 
-	public JavaScriptListPanel(@NotNull Project project)
+	public JavaScriptListPanel(@Nonnull Project project)
 	{
 		super(new BorderLayout());
 		init();
@@ -114,7 +114,7 @@ public void mouseClicked(MouseEvent e)
 	}
 
 	@Nullable
-	public abstract VirtualFile toVirtualFile(@NotNull T value, boolean toOpen);
+	public abstract VirtualFile toVirtualFile(@Nonnull T value, boolean toOpen);
 
 	public void add(T value)
 	{
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
index 9a33b4cf..864d1214 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
@@ -18,6 +18,7 @@
 
 import java.util.Collection;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
 import org.chromium.sdk.JsArray;
@@ -25,8 +26,8 @@
 import org.chromium.sdk.JsObject;
 import org.chromium.sdk.JsValue;
 import org.chromium.sdk.JsVariable;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.icons.AllIcons;
 import com.intellij.xdebugger.frame.XCompositeNode;
 import com.intellij.xdebugger.frame.XNamedValue;
@@ -41,20 +42,20 @@
  */
 public abstract class V8BaseVariableValue extends XNamedValue
 {
-	@NotNull
+	@Nonnull
 	protected final JsEvaluateContext myEvaluateContext;
 
-	protected V8BaseVariableValue(@NotNull JsEvaluateContext evaluateContext, @NotNull String name)
+	protected V8BaseVariableValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull String name)
 	{
 		super(name);
 		myEvaluateContext = evaluateContext;
 	}
 
-	@NotNull
+	@Nonnull
 	protected abstract JsValue getValue();
 
 	@Override
-	public void computeChildren(@NotNull XCompositeNode node)
+	public void computeChildren(@Nonnull XCompositeNode node)
 	{
 		XValueChildrenList valueChildrenList = new XValueChildrenList();
 
@@ -78,7 +79,7 @@ else if(value instanceof JsObject)
 		node.addChildren(valueChildrenList, true);
 	}
 
-	@NotNull
+	@Nonnull
 	protected Icon getIconForValue(JsValue value, JsValue.Type valueType)
 	{
 		if(value instanceof JsArray)
@@ -118,7 +119,7 @@ private static boolean canHaveChildren(JsValue value, JsValue.Type valueType)
 	}
 
 	@Override
-	public void computePresentation(@NotNull XValueNode valueNode, @NotNull XValuePlace xValuePlace)
+	public void computePresentation(@Nonnull XValueNode valueNode, @Nonnull XValuePlace xValuePlace)
 	{
 		final JsValue value = getValue();
 		final JsValue.Type valueType = value.getType();
@@ -153,7 +154,7 @@ else if(value instanceof JsObject)
 			}
 
 			@Override
-			public void renderValue(@NotNull XValueTextRenderer textRenderer)
+			public void renderValue(@Nonnull XValueTextRenderer textRenderer)
 			{
 				switch(value.getType())
 				{
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
index 7c104612..15aa193e 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
@@ -21,14 +21,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import org.chromium.sdk.Breakpoint;
 import org.chromium.sdk.DebugContext;
 import org.chromium.sdk.JavascriptVm;
 import org.chromium.sdk.JavascriptVmFactory;
 import org.chromium.sdk.Script;
 import org.chromium.sdk.StandaloneVm;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.process.ProcessHandler;
@@ -72,14 +73,14 @@ public class V8DebugProcess extends XDebugProcess
 
 	private Map<Breakpoint, XLineBreakpoint> myBreakpoints = new HashMap<Breakpoint, XLineBreakpoint>();
 
-	public V8DebugProcess(@NotNull XDebugSession session, ExecutionResult result, int port) throws ExecutionException
+	public V8DebugProcess(@Nonnull XDebugSession session, ExecutionResult result, int port) throws ExecutionException
 	{
 		super(session);
 		myScriptListPanel = new JavaScriptListPanel<Script>(session.getProject())
 		{
 			@Nullable
 			@Override
-			public VirtualFile toVirtualFile(@NotNull Script value, boolean toOpen)
+			public VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen)
 			{
 				return V8ScriptUtil.toVirtualFile(value, toOpen);
 			}
@@ -109,14 +110,14 @@ public boolean checkCanPerformCommands()
 		return myVm != null && myVm.isAttached();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public XDebuggerEditorsProvider getEditorsProvider()
 	{
 		return JavaScriptEditorsProvider.INSTANCE;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public ExecutionConsole createConsole()
 	{
@@ -129,7 +130,7 @@ public boolean checkCanInitBreakpoints()
 		return false;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public XBreakpointHandler<?>[] getBreakpointHandlers()
 	{
@@ -137,7 +138,7 @@ public XBreakpointHandler<?>[] getBreakpointHandlers()
 				new XBreakpointHandler<XLineBreakpoint<XBreakpointProperties>>(JavaScriptLineBreakpointType.class)
 				{
 					@Override
-					public void registerBreakpoint(@NotNull final XLineBreakpoint lineBreakpoint)
+					public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint)
 					{
 						String presentableFilePath = lineBreakpoint.getPresentableFilePath();
 						int line = lineBreakpoint.getLine();
@@ -161,7 +162,7 @@ public void failure(String s)
 					}
 
 					@Override
-					public void unregisterBreakpoint(@NotNull XLineBreakpoint breakpoint, boolean b)
+					public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint, boolean b)
 					{
 						String presentableFilePath = breakpoint.getPresentableFilePath();
 						myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), breakpoint.getLine(), Breakpoint.EMPTY_VALUE, false, null, null, null);
@@ -249,18 +250,18 @@ public void resume()
 	}
 
 	@Override
-	public void runToPosition(@NotNull XSourcePosition xSourcePosition)
+	public void runToPosition(@Nonnull XSourcePosition xSourcePosition)
 	{
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public XDebugTabLayouter createTabLayouter()
 	{
 		return new XDebugTabLayouter()
 		{
 			@Override
-			public void registerAdditionalContent(@NotNull RunnerLayoutUi ui)
+			public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui)
 			{
 				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIcons.JavaScript, null);
 				content.setCloseable(false);
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
index 4e071ca0..040cf68e 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
@@ -19,9 +19,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import org.chromium.sdk.CallFrame;
 import org.chromium.sdk.DebugContext;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.xdebugger.frame.XExecutionStack;
 import com.intellij.xdebugger.frame.XStackFrame;
 
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
index 210b201d..8808c649 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
@@ -19,7 +19,7 @@
 import java.io.File;
 
 import org.chromium.sdk.Script;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Key;
@@ -35,8 +35,8 @@ public class V8ScriptUtil
 {
 	private static final Key<Object> SOME_VALUE_TO_EQUALS = Key.create("some-value-to-equals");
 
-	@NotNull
-	public static VirtualFile toVirtualFile(@NotNull Script value, boolean toOpen)
+	@Nonnull
+	public static VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen)
 	{
 		String scriptName = value.getName();
 		assert scriptName != null;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
index 153f8f6e..ae6ff4a9 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
@@ -25,8 +25,8 @@
 import org.chromium.sdk.JsValue;
 import org.chromium.sdk.JsVariable;
 import org.chromium.sdk.TextStreamPosition;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.icons.AllIcons;
 import com.intellij.ui.ColoredTextContainer;
 import com.intellij.ui.SimpleTextAttributes;
@@ -57,7 +57,7 @@ public XDebuggerEvaluator getEvaluator()
 		return new XDebuggerEvaluator()
 		{
 			@Override
-			public void evaluate(@NotNull final String expression, @NotNull final XEvaluationCallback callback, @Nullable XSourcePosition expressionPosition)
+			public void evaluate(@Nonnull final String expression, @Nonnull final XEvaluationCallback callback, @Nullable XSourcePosition expressionPosition)
 			{
 				final JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
 				evaluateContext.evaluateSync(expression, Collections.<String, JsValue>emptyMap(), new JsEvaluateContext.EvaluateCallback()
@@ -93,7 +93,7 @@ public boolean isCodeFragmentEvaluationSupported()
 	}
 
 	@Override
-	public void computeChildren(@NotNull XCompositeNode node)
+	public void computeChildren(@Nonnull XCompositeNode node)
 	{
 		JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
 		List<? extends JsScope> variableScopes = myCallFrame.getVariableScopes();
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
index 836e6d4d..4714d31a 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
@@ -17,7 +17,7 @@
 package consulo.javascript.run.debug;
 
 import org.chromium.sdk.DebugContext;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.xdebugger.frame.XExecutionStack;
 import com.intellij.xdebugger.frame.XSuspendContext;
 
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
index c082a7a1..bc2ceddf 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
@@ -16,13 +16,15 @@
 
 package consulo.javascript.run.debug;
 
+import javax.annotation.Nonnull;
+
 import org.chromium.sdk.JsDeclarativeVariable;
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsFunction;
 import org.chromium.sdk.JsValue;
 import org.chromium.sdk.JsVariable;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.xdebugger.frame.XValueChildrenList;
 import com.intellij.xdebugger.frame.XValueModifier;
 
@@ -32,7 +34,7 @@
  */
 public class V8VariableValue extends V8BaseVariableValue
 {
-	public static void addValue(@NotNull XValueChildrenList valueChildrenList, @NotNull JsEvaluateContext debugContext, @NotNull JsVariable jsVariable)
+	public static void addValue(@Nonnull XValueChildrenList valueChildrenList, @Nonnull JsEvaluateContext debugContext, @Nonnull JsVariable jsVariable)
 	{
 		JsValue value = jsVariable.getValue();
 		if(value instanceof JsFunction)
@@ -44,7 +46,7 @@ public static void addValue(@NotNull XValueChildrenList valueChildrenList, @NotN
 
 	private JsVariable myJsVariable;
 
-	public V8VariableValue(@NotNull JsEvaluateContext evaluateContext, @NotNull JsVariable jsVariable)
+	public V8VariableValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull JsVariable jsVariable)
 	{
 		super(evaluateContext, jsVariable.getName());
 		myJsVariable = jsVariable;
@@ -74,7 +76,7 @@ public XValueModifier getModifier()
 				return new XValueModifier()
 				{
 					@Override
-					public void setValue(@NotNull String expression, @NotNull final XModificationCallback callback)
+					public void setValue(@Nonnull String expression, @Nonnull final XModificationCallback callback)
 					{
 						JsEvaluateContext.PrimitiveValueFactory valueFactory = myEvaluateContext.getValueFactory();
 						JsValue value = null;
@@ -149,7 +151,7 @@ public void calculateInitialValueEditorText(XInitialValueCallback callback)
 		}
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	protected JsValue getValue()
 	{
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
index b02a16d2..fa88056e 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
@@ -16,11 +16,11 @@
 
 package consulo.javascript.run.debug;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsValue;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.icons.AllIcons;
 
 /**
@@ -31,20 +31,20 @@ public class V8WatchValue extends V8BaseVariableValue
 {
 	private JsValue myValue;
 
-	public V8WatchValue(@NotNull JsEvaluateContext evaluateContext, @NotNull String text, @NotNull JsValue value)
+	public V8WatchValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull String text, @Nonnull JsValue value)
 	{
 		super(evaluateContext, text);
 		myValue = value;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	protected Icon getIconForValue(JsValue value, JsValue.Type valueType)
 	{
 		return AllIcons.Debugger.Watch;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	protected JsValue getValue()
 	{
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
index 6700a7ae..bb1cc1ae 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
@@ -2,9 +2,10 @@
 
 import java.lang.reflect.Method;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.codeInspection.CustomSuppressableInspectionTool;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemsHolder;
@@ -23,7 +24,7 @@ public abstract class BaseInspection extends LocalInspectionTool implements Cust
 	private final String m_shortName = null;
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getShortName()
 	{
 		if(m_shortName == null)
@@ -37,8 +38,8 @@ public String getShortName()
 	}
 
 	@Override
-	@NotNull
-	public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder problemsHolder, boolean onTheFly)
+	@Nonnull
+	public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder problemsHolder, boolean onTheFly)
 	{
 		if(!canBuildVisitor(problemsHolder.getFile()))
 		{
@@ -53,7 +54,7 @@ public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder problemsHolder, bo
 		return visitor;
 	}
 
-	public boolean canBuildVisitor(@NotNull PsiFile psiFile)
+	public boolean canBuildVisitor(@Nonnull PsiFile psiFile)
 	{
 		return true;
 	}
@@ -118,7 +119,7 @@ public SuppressIntentionAction[] getSuppressActions(@Nullable final PsiElement e
 	}
 
 	@Override
-	public boolean isSuppressedFor(@NotNull final PsiElement element)
+	public boolean isSuppressedFor(@Nonnull final PsiElement element)
 	{
 		return SuppressionUtil.isSuppressedInStatement(element, getID(), JSSuppressionHolder.class);
 	}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
index ce01df78..2f049b1a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.codeInspection.ProblemHighlightType;
@@ -92,7 +92,7 @@ protected ProblemHighlightType getProblemHighlightType(PsiElement location) {
         return ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
     }
 
-    protected PsiElement getEditorErrorLocation(final @NotNull PsiElement location) {
+    protected PsiElement getEditorErrorLocation(final @Nonnull PsiElement location) {
         return location;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
index 8d8703c5..95496c33 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
@@ -1,7 +1,8 @@
 package com.sixrr.inspectjs;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.ASTNode;
@@ -20,14 +21,14 @@
 public abstract class InspectionJSFix implements LocalQuickFix {
     //to appear in "Apply Fix" statement when multiple Quick Fixes exist
     @Override
-	@NotNull
+	@Nonnull
     public String getFamilyName() {
         return "";
     }
 
     @Override
-	public void applyFix(@NotNull Project project,
-                         @NotNull ProblemDescriptor descriptor) {
+	public void applyFix(@Nonnull Project project,
+                         @Nonnull ProblemDescriptor descriptor) {
         final PsiElement problemElement = descriptor.getPsiElement();
         if (problemElement == null || !problemElement.isValid()) {
             return;
@@ -48,7 +49,7 @@ public void applyFix(@NotNull Project project,
     protected abstract void doFix(Project project, ProblemDescriptor descriptor)
             throws IncorrectOperationException;
 
-    protected static void deleteElement(@NotNull PsiElement element)
+    protected static void deleteElement(@Nonnull PsiElement element)
             throws IncorrectOperationException {
         final ASTNode node = element.getNode();
         final ASTNode parent = element.getParent().getNode();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
index 9897a670..12e6766d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
@@ -12,8 +12,9 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInspection.InspectionToolProvider;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.openapi.application.Application;
@@ -335,7 +336,7 @@ private static int countQuickFixes(Class<? extends LocalInspectionTool>[] classe
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getComponentName() {
         return "InspectionJS";
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
index 5f89e914..d675ab55 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
@@ -1,24 +1,26 @@
 package com.sixrr.inspectjs.assignment;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class AssignmentResultUsedJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("result.of.assignment.used.displayName");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
index 966c0db3..685cbfe6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.assignment;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
@@ -9,18 +11,17 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
 
 public class AssignmentToForLoopParameterJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("assignment.to.for.loop.parameter.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
@@ -37,7 +38,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSAssignmentExpression(@NotNull JSAssignmentExpression expression) {
+        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
             final JSExpression rhs = expression.getROperand();
             if (rhs == null) {
@@ -48,7 +49,7 @@ private static class Visitor extends BaseInspectionVisitor {
             checkForForeachLoopParam(lhs);
         }
 
-        @Override public void visitJSPrefixExpression(@NotNull JSPrefixExpression expression) {
+        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             final IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
@@ -63,7 +64,7 @@ private static class Visitor extends BaseInspectionVisitor {
             checkForForeachLoopParam(operand);
         }
 
-        @Override public void visitJSPostfixExpression(@NotNull JSPostfixExpression expression) {
+        @Override public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
             super.visitJSPostfixExpression(expression);
             final IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
index a92c7e5f..6df31b8d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
@@ -9,19 +9,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class AssignmentToFunctionParameterJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("assignment.to.function.parameter.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
index afe7523e..a4a49a76 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
@@ -1,29 +1,30 @@
 package com.sixrr.inspectjs.assignment;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
 
 public class NestedAssignmentJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("nested.assignment.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         return InspectionJSBundle.message("nested.assignment.error.string");
     }
@@ -36,7 +37,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class NestedAssignmentVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSAssignmentExpression(
-                @NotNull JSAssignmentExpression expression) {
+                @Nonnull JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
             final PsiElement parent = expression.getParent();
             if (parent == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
index 7947f437..e76ad6d9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.assignment;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
@@ -14,24 +16,23 @@
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import com.sixrr.inspectjs.utils.SideEffectChecker;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 public class ReplaceAssignmentWithOperatorAssignmentJSInspection
         extends JavaScriptInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "AssignmentReplaceableWithOperatorAssignmentJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("assignment.replaceable.with.operator.assignment.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
@@ -83,7 +84,7 @@ private ReplaceAssignmentWithOperatorAssignmentFix(
         }
 
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return m_name;
         }
@@ -102,7 +103,7 @@ public void doFix(Project project, ProblemDescriptor descriptor)
     private static class ReplaceAssignmentWithOperatorAssignmentVisitor
             extends BaseInspectionVisitor {
 
-        @Override public void visitJSAssignmentExpression(@NotNull JSAssignmentExpression assignment) {
+        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
 
             final IElementType sign = assignment.getOperationSign();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
index 102f8a60..91c613a9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.assignment;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
@@ -12,20 +14,19 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
-import org.jetbrains.annotations.NotNull;
 
 public class SillyAssignmentJSInspection
         extends JavaScriptInspection {
 
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("silly.assignment.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
@@ -48,7 +49,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor
             extends BaseInspectionVisitor {
 
-        @Override public void visitJSAssignmentExpression(@NotNull JSAssignmentExpression assignment) {
+        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
 
             final IElementType sign = assignment.getOperationSign();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
index 2b6faad5..15389be5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.bitwise;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -11,31 +13,30 @@
 import com.sixrr.inspectjs.utils.ComparisonUtils;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class IncompatibleMaskJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "IncompatibleBitwiseMaskOperation";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "incompatible.mask.operation.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         final JSBinaryExpression binaryExpression =
                 (JSBinaryExpression) args[0];
@@ -63,7 +64,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class IncompatibleMaskVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSBinaryExpression(
-                @NotNull JSBinaryExpression expression) {
+                @Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final JSExpression rhs = expression.getROperand();
             if (!ComparisonUtils.isEqualityComparison(expression)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index db4b5207..79dd9975 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -12,7 +12,7 @@
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import javax.swing.*;
 import java.util.HashSet;
@@ -38,20 +38,20 @@ public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "pointless.bitwise.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         final String replacementExpression =
                 calculateReplacementExpression((JSExpression) args[0]);
@@ -123,7 +123,7 @@ public InspectionJSFix buildFix(PsiElement location) {
     private class PointlessBitwiseFix extends InspectionJSFix {
 
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message(
                     "pointless.bitwise.expression.simplify.quickfix");
@@ -143,7 +143,7 @@ public void doFix(Project project, ProblemDescriptor descriptor)
     private class PointlessBitwiseVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSBinaryExpression(
-                @NotNull JSBinaryExpression expression) {
+                @Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final IElementType sign = expression.getOperationSign();
             if (!bitwiseTokens.contains(sign)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index 1fd25e9a..e5fca4f3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -9,25 +9,25 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class ShiftOutOfRangeJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "shift.operation.by.inappropriate.constant.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         final Integer value = (Integer) args[0];
         if (value > 0) {
@@ -52,7 +52,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class ShiftOutOfRange extends BaseInspectionVisitor {
 
         @Override public void visitJSBinaryExpression(
-                @NotNull JSBinaryExpression expression) {
+                @Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final IElementType tokenType = expression.getOperationSign();
             if (tokenType == null ||
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index 0defcdce..d34613db 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.bugs;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
@@ -10,30 +12,29 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 public class DivideByZeroJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "DivideByZeroJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("divide.by.zero.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message("division.by.zero.error.string");
     }
@@ -46,7 +47,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class DivisionByZeroVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSBinaryExpression(
-                @NotNull JSBinaryExpression expression) {
+                @Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final JSExpression rhs = expression.getROperand();
             if (rhs == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index 3ccd8a13..da155089 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.bugs;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -10,30 +12,29 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 public class EqualityComparisonWithCoercionJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "EqualityComparisonWithCoercionJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("equality.comparison.with.coercion.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message("equality.comparison.with.coercion.error.string");
     }
@@ -59,7 +60,7 @@ public EqualityComparisonWithCoercionFix(String sign) {
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName() {
 			return InspectionJSBundle.message("equality.comparison.with.coercion.fix", sign);
 		}
@@ -82,7 +83,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class EqualityComparisonWithCoercionVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSBinaryExpression(
-                @NotNull JSBinaryExpression expression) {
+                @Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final JSExpression lhs = expression.getLOperand();
             if (lhs == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
index 23592f60..2ae57b2c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.bugs;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSDoWhileStatement;
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
@@ -8,18 +10,17 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class InfiniteLoopJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("infinite.loop.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
@@ -42,7 +43,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor extends BaseInspectionVisitor {
 
 
-        @Override public void visitJSForStatement(@NotNull JSForStatement statement) {
+        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
             if (ControlFlowUtils.statementMayCompleteNormally(statement)) {
                 return;
@@ -53,7 +54,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSWhileStatement(@NotNull JSWhileStatement statement) {
+        @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
 
             super.visitJSWhileStatement(statement);
             if (ControlFlowUtils.statementMayCompleteNormally(statement)) {
@@ -65,7 +66,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSDoWhileStatement(@NotNull JSDoWhileStatement statement) {
+        @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
             if (ControlFlowUtils.statementMayCompleteNormally(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
index b18a6055..c5643e28 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
@@ -1,31 +1,32 @@
 package com.sixrr.inspectjs.bugs;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
 
 public class InfiniteRecursionJSInspection extends JavaScriptInspection {
     private static Logger logger = Logger.getInstance("ULVJS");
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "infinite.recursion.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "infinite.recursion.problem.descriptor");
@@ -44,7 +45,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class InfiniteRecursionVisitor
             extends BaseInspectionVisitor {
 
-        @Override public void visitJSFunctionDeclaration(@NotNull JSFunction function) {
+        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             super.visitJSFunctionDeclaration(function);
 
             if (!RecursionUtils.functionMayRecurse(function)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index d5b9259f..ce49c983 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.bugs;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
@@ -9,19 +11,19 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class NonShortCircuitBooleanExpressionJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("non.short.circuit.boolean.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
@@ -41,7 +43,7 @@ private static class NonShortCircuitBooleanFix
             extends InspectionJSFix {
 
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("replace.with.short.circuit.expression.fix.string");
         }
@@ -79,7 +81,7 @@ private static class NonShortCircuitBooleanVisitor
             extends BaseInspectionVisitor {
 
         @Override public void visitJSBinaryExpression(
-                @NotNull JSBinaryExpression expression) {
+                @Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
index f2853598..0e149000 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.bugs;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSNewExpression;
@@ -7,30 +9,29 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
 
 public class ObjectAllocationIgnoredJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "ObjectAllocationIgnored";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("result.of.object.allocation.ignored.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message("result.of.object.allocation.ignored.error.string");
     }
@@ -43,7 +44,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class ObjectAllocationIgnoredVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSExpressionStatement(
-                @NotNull JSExpressionStatement statement) {
+                @Nonnull JSExpressionStatement statement) {
             super.visitJSExpressionStatement(statement);
             if (!(statement.getExpression()instanceof JSNewExpression)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
index 272b7348..2db122bc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
@@ -1,11 +1,12 @@
 package com.sixrr.inspectjs.bugs;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.sixrr.inspectjs.utils.BoolUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class RecursionUtils {
 
@@ -190,7 +191,7 @@ private static boolean codeBlockMayReturnBeforeRecursing(
         return endsInImplicitReturn;
     }
 
-    public static boolean functionMayRecurse(@NotNull JSFunction function) {
+    public static boolean functionMayRecurse(@Nonnull JSFunction function) {
         final RecursionVisitor recursionVisitor = new RecursionVisitor(function);
         function.accept(recursionVisitor);
         return recursionVisitor.isRecursive();
@@ -522,7 +523,7 @@ private static boolean labeledStatementDefinitelyRecurses(
     }
 
     public static boolean functionDefinitelyRecurses(
-            @NotNull JSFunction function) {
+            @Nonnull JSFunction function) {
         final JSSourceElement[] body = function.getBody();
         if (body == null) {
             return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
index d02efa3d..a1ed5977 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
@@ -3,7 +3,7 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class RecursionVisitor extends JSRecursiveElementVisitor {
 
@@ -11,20 +11,20 @@ public class RecursionVisitor extends JSRecursiveElementVisitor {
     private final JSFunction function;
     private String functionName;
 
-    public RecursionVisitor(@NotNull JSFunction function) {
+    public RecursionVisitor(@Nonnull JSFunction function) {
         super();
         this.function = function;
         functionName = function.getName();
     }
 
-    @Override public void visitElement(@NotNull PsiElement element) {
+    @Override public void visitElement(@Nonnull PsiElement element) {
         if (!recursive) {
             super.visitElement(element);
         }
     }
 
     @Override public void visitJSCallExpression(
-            @NotNull JSCallExpression call) {
+            @Nonnull JSCallExpression call) {
         if (recursive) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index f7d55573..953b0227 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -9,24 +9,24 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class TextLabelInSwitchStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("text.label.in.switch.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         return InspectionJSBundle.message("text.label.in.switch.statement.error.string");
     }
@@ -40,7 +40,7 @@ private static class TextLabelInSwitchStatementVisitor
             extends BaseInspectionVisitor {
 
         @Override public void visitJSSwitchStatement(
-                @NotNull JSSwitchStatement statement) {
+                @Nonnull JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
             final JSCaseClause[] caseClauses = statement.getCaseClauses();
             for (JSCaseClause caseClause : caseClauses) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index c3803dba..6c8cf3a3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -1,7 +1,7 @@
 package com.sixrr.inspectjs.confusing;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import com.intellij.psi.PsiElement;
@@ -14,13 +14,13 @@
 public class AnonymousFunctionJSInspection extends JavaScriptInspection{
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName(){
         return InspectionJSBundle.message("anonymous.function.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName(){
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index 18632de2..0a9d9498 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -1,24 +1,26 @@
 package com.sixrr.inspectjs.confusing;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class BlockStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("unnecessary.block.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
index c022b188..b98ed797 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
@@ -5,19 +5,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class CallerJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("caller.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
index 594569f5..a37fcfbc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
@@ -1,24 +1,26 @@
 package com.sixrr.inspectjs.confusing;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSCommaExpression;
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class CommaExpressionJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("comma.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index eb1c8d9c..87acccde 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -5,19 +5,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class ConditionalExpressionJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("conditional.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index d7c4ca20..c87419d8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -9,7 +9,7 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -20,20 +20,20 @@ public class ConfusingFloatingPointLiteralJSInspection extends JavaScriptInspect
             Pattern.compile("[0-9]+\\.[0-9]+((e|E)(-)?[0-9]+)?(f|F|d|D)?");
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "confusing.floating.point.literal.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "confusing.floating.point.literal.problem.descriptor");
@@ -48,7 +48,7 @@ private static class ConfusingFloatingPointLiteralFix
             extends InspectionJSFix {
 
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message(
                     "confusing.floating.point.literal.change.quickfix");
@@ -116,7 +116,7 @@ private static class ConfusingFloatingPointLiteralVisitor
             extends BaseInspectionVisitor {
 
         @Override public void visitJSLiteralExpression(
-                @NotNull JSSimpleLiteralExpression literal) {
+                @Nonnull JSSimpleLiteralExpression literal) {
             super.visitJSLiteralExpression(literal);
             final String text = literal.getText();
             if (text == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index 71408d36..4c2d456e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -10,19 +10,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class ConfusingPlusesOrMinusesJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("confusing.pluses.or.minuses.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 9c53ac70..75961655 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.confusing;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSNewExpression;
@@ -9,19 +11,19 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class DynamicallyGeneratedCodeJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("dynamically.generated.code.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index 00b218a1..ca86f27e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -6,7 +6,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import javax.swing.*;
 
@@ -17,19 +17,19 @@ public class EmptyStatementBodyJSInspection extends JavaScriptInspection {
     public boolean m_reportEmptyBlocks = false;
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "StatementWithEmptyBodyJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("statement.with.empty.body.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
@@ -61,7 +61,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class EmptyStatementVisitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSDoWhileStatement(@NotNull JSDoWhileStatement statement) {
+        @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -74,7 +74,7 @@ private class EmptyStatementVisitor extends BaseInspectionVisitor {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSWhileStatement(@NotNull JSWhileStatement statement) {
+        @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -87,7 +87,7 @@ private class EmptyStatementVisitor extends BaseInspectionVisitor {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSForStatement(@NotNull JSForStatement statement) {
+        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -101,7 +101,7 @@ private class EmptyStatementVisitor extends BaseInspectionVisitor {
         }
 
         @Override
-		public void visitJSForInStatement(@NotNull JSForInStatement statement) {
+		public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
             super.visitJSForInStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -114,7 +114,7 @@ public void visitJSForInStatement(@NotNull JSForInStatement statement) {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSIfStatement(@NotNull JSIfStatement statement) {
+        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
 
             final JSStatement thenBranch = statement.getThen();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index ed5da713..60153b5f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -8,19 +8,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class IncrementDecrementResultUsedJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("result.of.increment.or.decrement.used.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index 6b0f5cf8..4c14af1f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -9,7 +9,7 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -38,19 +38,19 @@ public class MagicNumberJSInspection extends JavaScriptInspection {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("magic.number.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "magic.number.problem.descriptor");
@@ -68,7 +68,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class MagicNumberVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSLiteralExpression(
-                @NotNull JSSimpleLiteralExpression expression) {
+                @Nonnull JSSimpleLiteralExpression expression) {
             super.visitJSLiteralExpression(expression);
 
             final String text = expression.getText();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index b5c5b9fa..e5fcbd27 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -1,5 +1,8 @@
 package com.sixrr.inspectjs.confusing;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
@@ -12,20 +15,18 @@
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class NegatedConditionalExpressionJSInspection extends JavaScriptInspection {
     private final NegatedConditionalFix fix = new NegatedConditionalFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("negated.conditional.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
@@ -43,7 +44,7 @@ protected InspectionJSFix buildFix(PsiElement location) {
 
     private static class NegatedConditionalFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("invert.condition.fix");
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index 8b93ad92..0a42ca70 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -1,5 +1,8 @@
 package com.sixrr.inspectjs.confusing;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
@@ -15,20 +18,18 @@
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class NegatedIfStatementJSInspection extends JavaScriptInspection {
     private final NegatedIfElseFix fix = new NegatedIfElseFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("negated.if.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
@@ -52,7 +53,7 @@ protected InspectionJSFix buildFix(PsiElement location) {
     private static class NegatedIfElseFix extends InspectionJSFix {
 
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("invert.if.condition.fix");
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
index 521de47c..fd93a4da 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
@@ -1,24 +1,25 @@
 package com.sixrr.inspectjs.confusing;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class NestedConditionalExpressionJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("nested.conditional.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index 644b5a8f..5be925f1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -9,9 +9,9 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
 
+import javax.annotation.Nullable;
 import javax.swing.*;
 
 public class NestedFunctionJSInspection extends JavaScriptInspection {
@@ -20,13 +20,13 @@ public class NestedFunctionJSInspection extends JavaScriptInspection {
     public boolean m_includeAnonymousFunctions = false;
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("nested.function.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index 86b218a3..e7fff2b1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -6,19 +6,19 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class OctalIntegerJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("octal.integer.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
index 33e2bc89..d52dd10d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
@@ -9,7 +9,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleIntegerFieldOptionsPanel;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import javax.swing.*;
 import java.util.HashSet;
@@ -22,13 +22,13 @@ public class OverlyComplexArithmeticExpressionJSInspection extends JavaScriptIns
     public int m_limit = TERM_LIMIT;
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("overly.complex.arithmetic.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
@@ -64,12 +64,12 @@ private class Visitor extends BaseInspectionVisitor {
             arithmeticTokens.add(JSTokenTypes.PERC);
         }
 
-        @Override public void visitJSBinaryExpression(@NotNull JSBinaryExpression expression) {
+        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             checkExpression(expression);
         }
 
-        @Override public void visitJSPrefixExpression(@NotNull JSPrefixExpression expression) {
+        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             checkExpression(expression);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
index 0f394f92..5ce6b95a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
@@ -12,7 +12,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleIntegerFieldOptionsPanel;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import javax.swing.*;
 
@@ -25,13 +25,13 @@ public class OverlyComplexBooleanExpressionJSInspection extends JavaScriptInspec
     public int m_limit = TERM_LIMIT;
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("overly.complex.boolean.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
@@ -63,12 +63,12 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSBinaryExpression(@NotNull JSBinaryExpression expression) {
+        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             checkExpression(expression);
         }
 
-        @Override public void visitJSPrefixExpression(@NotNull JSPrefixExpression expression) {
+        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             checkExpression(expression);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
index 4bc4af77..73e57b4f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
@@ -11,7 +11,7 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -23,13 +23,13 @@ public class PointlessArithmeticExpressionJSInspection
     private final PointlessArithmeticFix fix = new PointlessArithmeticFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("pointless.arithmetic.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
@@ -86,7 +86,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private class PointlessArithmeticFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("simplify.fix");
         }
@@ -114,7 +114,7 @@ private class PointlessArithmeticVisitor extends BaseInspectionVisitor {
         }
 
         @Override public void visitJSBinaryExpression(
-                @NotNull JSBinaryExpression expression) {
+                @Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
index 182c4af8..a96bdfa3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
@@ -14,8 +14,8 @@
 import com.sixrr.inspectjs.utils.ComparisonUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -26,13 +26,13 @@ public class PointlessBooleanExpressionJSInspection extends JavaScriptInspection
             new BooleanLiteralComparisonFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("pointless.boolean.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -148,7 +148,7 @@ public InspectionJSFix buildFix(PsiElement location) {
     private class BooleanLiteralComparisonFix
             extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("simplify.fix");
         }
@@ -190,7 +190,7 @@ private class PointlessBooleanExpressionVisitor
             //booleanTokens.add(JSTokenTypes.NEQEQ); // !== has strict semantic so do not report it
         }
 
-        @Override public void visitJSBinaryExpression(@NotNull JSBinaryExpression expression) {
+        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
@@ -224,7 +224,7 @@ private class PointlessBooleanExpressionVisitor
             registerError(expression);
         }
 
-        @Override public void visitJSPrefixExpression(@NotNull JSPrefixExpression expression) {
+        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             final IElementType sign = expression.getOperationSign();
             if (sign == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
index b550a4cd..dc6469c0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
@@ -1,5 +1,8 @@
 package com.sixrr.inspectjs.confusing;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -7,19 +10,17 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class VoidExpressionJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("void.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
index 2412132b..363413a4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
@@ -5,19 +5,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class WithStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("with.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
@@ -35,7 +35,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSWithStatement(@NotNull JSWithStatement statement) {
+        @Override public void visitJSWithStatement(@Nonnull JSWithStatement statement) {
             super.visitJSWithStatement(statement);
             registerStatementError(statement);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
index f1eb83a1..39306c75 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
@@ -1,24 +1,26 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class BreakStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("break.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -36,7 +38,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSBreakStatement(@NotNull JSBreakStatement statement) {
+        @Override public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (statement.getParent() instanceof JSCaseClause) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
index ff31e584..e763c556 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
@@ -1,23 +1,24 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class BreakStatementWithLabelJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("break.statement.with.label.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -35,7 +36,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSBreakStatement(@NotNull JSBreakStatement statement) {
+        @Override public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (statement.getLabel() == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
index 8a01d874..e725abe0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -8,19 +10,18 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
-import org.jetbrains.annotations.NotNull;
 
 public class ConditionalExpressionWithIdenticalBranchesJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new CollapseConditional();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("conditional.expression.with.identical.branches.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -37,7 +38,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class CollapseConditional extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("collapse.conditional.expression.fix");
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
index 69c21eda..3175db5e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
@@ -8,19 +8,19 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class ConstantConditionalExpressionJSInspection
         extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("constant.conditional.expression.display.name");
     }
@@ -36,7 +36,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         return InspectionJSBundle.message("constant.conditional.expression.error.string");
     }
@@ -63,7 +63,7 @@ public InspectionJSFix buildFix(PsiElement location) {
     private static class ConstantConditionalFix extends InspectionJSFix {
 
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("simplify.fix");
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
index b4e4c6ee..09c7a612 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
@@ -9,19 +11,18 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class ConstantIfStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "constant.if.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -32,7 +33,7 @@ public boolean isEnabledByDefault() {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "constant.if.statement.problem.descriptor");
@@ -51,7 +52,7 @@ public InspectionJSFix buildFix(PsiElement location) {
     private static class ConstantIfStatementFix extends InspectionJSFix {
 
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message(
                     "constant.conditional.expression.simplify.quickfix");
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
index 87847db2..786569fd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
@@ -1,23 +1,25 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class ContinueStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("continue.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -35,7 +37,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSContinueStatement(@NotNull JSContinueStatement statement) {
+        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             registerStatementError(statement);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
index 73bd2cd1..c95dad7f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
@@ -1,23 +1,24 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class ContinueStatementWithLabelJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("continue.statement.with.label.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -35,7 +36,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSContinueStatement(@NotNull JSContinueStatement statement) {
+        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             if (statement.getLabel() == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index ad2fa35e..188e6bbe 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -1,29 +1,30 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
 
 public class DefaultNotLastCaseInSwitchJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("default.not.last.case.in.switch.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message("default.branch.not.last.case.in.switch.error.string");
     }
@@ -37,7 +38,7 @@ private static class DefaultNotLastCaseInSwitchVisitor
             extends BaseInspectionVisitor {
 
         @Override public void visitJSSwitchStatement(
-                @NotNull JSSwitchStatement statement) {
+                @Nonnull JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
             final JSCaseClause[] caseClauses = statement.getCaseClauses();
             if (caseClauses == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
index ac5d6fcb..14af19d9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
@@ -9,7 +9,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -17,13 +17,13 @@
 
 public class DuplicateConditionJSInspection extends JavaScriptInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("duplicate.condition.in.if.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -41,7 +41,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class DuplicateConditionVisitor
             extends BaseInspectionVisitor {
 
-        @Override public void visitJSIfStatement(@NotNull JSIfStatement statement) {
+        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
             final PsiElement parent = statement.getParent();
             if (parent instanceof JSIfStatement) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
index c0bf41b0..a97e3303 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
@@ -9,19 +9,19 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class FallthroughInSwitchStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("fall.through.in.switch.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
index 3dbe03c4..a47a422b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
@@ -11,7 +11,7 @@
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import javax.swing.*;
 
@@ -23,25 +23,25 @@ public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection
     public boolean m_ignoreLoopsWithoutConditions = false;
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("for.loop.replaceable.by.while.display.name");
 
     }
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "ForLoopReplaceableByWhile";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "for.loop.replaceable.by.while.problem.descriptor");
@@ -62,7 +62,7 @@ public InspectionJSFix buildFix(PsiElement location) {
     private static class ReplaceForByWhileFix extends InspectionJSFix {
 
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message(
                     "for.loop.replaceable.by.while.replace.quickfix");
@@ -103,7 +103,7 @@ public BaseInspectionVisitor buildVisitor() {
     private class ForLoopReplaceableByWhileVisitor
             extends BaseInspectionVisitor {
 
-        @Override public void visitJSForStatement(@NotNull JSForStatement statement) {
+        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
             final JSVarStatement varStatement = statement.getVarDeclaration();
             if(varStatement!=null)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
index e3e16293..48128b3b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
@@ -1,28 +1,29 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.*;
-import org.jetbrains.annotations.NotNull;
 
 public class ForLoopThatDoesntUseLoopVariableJSInspection
         extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "for.loop.not.use.loop.variable.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         final boolean condition = (Boolean) args[0];
         final boolean update = (Boolean) args[1];
@@ -48,7 +49,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class ForLoopThatDoesntUseLoopVariableVisitor
             extends BaseInspectionVisitor {
 
-        @Override public void visitJSForStatement(@NotNull JSForStatement statement) {
+        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
             if (conditionUsesInitializer(statement)) {
                 if (!updateUsesInitializer(statement)) {
@@ -118,14 +119,14 @@ private UseVisitor(JSVariable var) {
             variable = var;
         }
 
-        @Override public void visitElement(@NotNull PsiElement element) {
+        @Override public void visitElement(@Nonnull PsiElement element) {
             if (!used) {
                 super.visitElement(element);
             }
         }
 
         @Override public void visitJSReferenceExpression(
-                @NotNull JSReferenceExpression ref) {
+                @Nonnull JSReferenceExpression ref) {
             if (used) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
index 2f99c930..7f2e8c21 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
@@ -8,19 +10,18 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
-import org.jetbrains.annotations.NotNull;
 
 public class IfStatementWithIdenticalBranchesJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new CollapseIfFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("if.statement.with.identical.branches.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -37,7 +38,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class CollapseIfFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("collapse.if.statement.fix");
         }
@@ -62,7 +63,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class IfStatementWithIdenticalBranchesVisitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSIfStatement(@NotNull JSIfStatement statement) {
+        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
             final JSStatement thenBranch = statement.getThen();
             final JSStatement elseBranch = statement.getElse();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
index 66bd29c3..7c9b5013 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
@@ -8,7 +8,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleIntegerFieldOptionsPanel;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import javax.swing.*;
 
@@ -21,13 +21,13 @@ public class IfStatementWithTooManyBranchesJSInspection extends JavaScriptInspec
     public int m_limit = DEFAULT_BRANCH_LIMIT;  //this is public for the DefaultJDOMExternalizer thingy
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("if.statement.with.too.many.branches.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -67,7 +67,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSIfStatement(@NotNull JSIfStatement statement) {
+        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
             final PsiElement parent = statement.getParent();
             if (parent instanceof JSIfStatement) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
index bd9c13b3..77fcb934 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
@@ -6,19 +6,19 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class LabeledStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("labeled.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -36,7 +36,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSLabeledStatement(@NotNull JSLabeledStatement statement) {
+        @Override public void visitJSLabeledStatement(@Nonnull JSLabeledStatement statement) {
             super.visitJSLabeledStatement(statement);
             @NonNls final String label = statement.getLabel();
             if("javascript".equals(label))
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
index 9f50992e..5458397b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
@@ -1,24 +1,25 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class LoopStatementThatDoesntLoopJSInspection extends JavaScriptInspection {
 
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("loop.statement.that.doesn.t.loop.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -40,7 +41,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSForStatement(@NotNull JSForStatement statement) {
+        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
             final JSStatement body = statement.getBody();
             if (body == null) {
@@ -55,7 +56,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSForInStatement(@NotNull JSForInStatement statement) {
+        @Override public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
             super.visitJSForInStatement(statement);
             final JSStatement body = statement.getBody();
             if (body == null) {
@@ -70,7 +71,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSWhileStatement(@NotNull JSWhileStatement statement) {
+        @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
             final JSStatement body = statement.getBody();
             if (body == null) {
@@ -85,7 +86,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSDoWhileStatement(@NotNull JSDoWhileStatement statement) {
+        @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
             final JSStatement body = statement.getBody();
             if (body == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
index df1c7952..356f9cf5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
@@ -1,24 +1,25 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class NestedSwitchStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("nested.switch.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
index d19bf19c..ac01562b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
@@ -6,19 +6,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class SwitchStatementWithNoDefaultBranchJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("switch.statement.with.no.default.branch.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
index e80badd2..df74544a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -7,25 +9,24 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
 
 public class TailRecursionJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "tail.recursion.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "tail.recursion.problem.descriptor");
@@ -177,7 +178,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class TailRecursionVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSReturnStatement(
-                @NotNull JSReturnStatement statement) {
+                @Nonnull JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
             final JSExpression returnValue = statement.getExpression();
             if (!(returnValue instanceof JSCallExpression)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
index d7805b05..b402d25a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -10,26 +12,25 @@
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 public class TrivialConditionalJSInspection
         extends JavaScriptInspection {
     private final TrivialConditionalFix fix = new TrivialConditionalFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "RedundantConditionalExpressionJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("redundant.conditional.expression.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -70,7 +71,7 @@ public InspectionJSFix buildFix(PsiElement location) {
     private static class
             TrivialConditionalFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("simplify.fix");
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
index 90b55453..d77b8297 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
@@ -14,26 +16,25 @@
 import com.sixrr.inspectjs.utils.ConditionalUtils;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 
 public class TrivialIfJSInspection extends JavaScriptInspection {
     private final TrivialIfFix fix = new TrivialIfFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "RedundantIfStatementJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("redundant.if.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -60,7 +61,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class TrivialIfFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("simplify.fix");
         }
@@ -231,7 +232,7 @@ private void replaceSimplifiableAssignmentNegated(JSIfStatement statement)
 
     private static class TrivialIfVisitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSIfStatement(@NotNull JSIfStatement ifStatement) {
+        @Override public void visitJSIfStatement(@Nonnull JSIfStatement ifStatement) {
             super.visitJSIfStatement(ifStatement);
             final JSExpression condition = ifStatement.getCondition();
             if (condition == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
index 792efc41..e61a67e3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.openapi.project.Project;
@@ -7,19 +9,18 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class UnnecessaryContinueJSInspection extends JavaScriptInspection {
     private final UnnecessaryContinueFix fix = new UnnecessaryContinueFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("unnecessary.continue.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -46,7 +47,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class UnnecessaryContinueFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("remove.unnecessary.continue.fix");
         }
@@ -65,7 +66,7 @@ public void doFix(Project project, ProblemDescriptor descriptor)
     private static class Visitor
             extends BaseInspectionVisitor {
 
-        @Override public void visitJSContinueStatement(@NotNull JSContinueStatement statement) {
+        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
 
             JSStatement continuedStatement =
                     statement.getStatementToContinue();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
index ec43cca1..7f058f8d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
@@ -9,18 +9,18 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class UnnecessaryLabelJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("unnecessary.label.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -36,7 +36,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message("unnecessary.label.error.string");
 
@@ -50,7 +50,7 @@ public InspectionJSFix buildFix(PsiElement location) {
     private static class UnusedLabelFix extends InspectionJSFix {
 
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("remove.label.fix");
         }
@@ -101,14 +101,14 @@ private LabelFinder(JSLabeledStatement target) {
             label = labelIdentifier.getText();
         }
 
-        @Override public void visitElement(@NotNull PsiElement element) {
+        @Override public void visitElement(@Nonnull PsiElement element) {
             if (!found) {
                 super.visitElement(element);
             }
         }
 
         @Override public void visitJSContinueStatement(
-                @NotNull JSContinueStatement continueStatement) {
+                @Nonnull JSContinueStatement continueStatement) {
             if (found) {
                 return;
             }
@@ -120,7 +120,7 @@ private LabelFinder(JSLabeledStatement target) {
         }
 
         @Override public void visitJSBreakStatement(
-                @NotNull JSBreakStatement breakStatement) {
+                @Nonnull JSBreakStatement breakStatement) {
             if (found) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
index 13a36dc2..350d60a0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
@@ -1,5 +1,8 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSLoopStatement;
@@ -10,21 +13,19 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class UnnecessaryLabelOnBreakStatementJSInspection extends JavaScriptInspection {
     private final UnnecessaryLabelOnBreakStatementFix fix =
             new UnnecessaryLabelOnBreakStatementFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("unnecessary.label.on.break.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -41,7 +42,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class UnnecessaryLabelOnBreakStatementFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("remove.label.fix");
         }
@@ -67,7 +68,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSBreakStatement(@NotNull JSBreakStatement statement) {
+        @Override public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (statement.getLabel() == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
index c37a564b..77864a4b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.intellij.lang.javascript.psi.JSLoopStatement;
@@ -9,21 +11,21 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class UnnecessaryLabelOnContinueStatementJSInspection extends JavaScriptInspection {
     private final UnnecessaryLabelOnContinueStatementFix fix =
             new UnnecessaryLabelOnContinueStatementFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("unnecessary.label.on.continue.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -51,7 +53,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class UnnecessaryLabelOnContinueStatementFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("remove.label.fix");
         }
@@ -67,7 +69,7 @@ public void doFix(Project project, ProblemDescriptor descriptor)
     }
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSContinueStatement(@NotNull JSContinueStatement statement) {
+        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             if (statement.getLabel() == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
index 4c7e94d9..f549796e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.control;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.openapi.project.Project;
@@ -8,25 +10,24 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class  UnnecessaryReturnJSInspection extends JavaScriptInspection {
     private final UnnecessaryReturnFix fix = new UnnecessaryReturnFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "UnnecessaryReturnStatementJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("unnecessary.return.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
@@ -53,7 +54,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class UnnecessaryReturnFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("remove.unnecessary.return.fix");
         }
@@ -70,7 +71,7 @@ public void doFix(Project project, ProblemDescriptor descriptor)
 
     private static class UnnecessaryReturnVisitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSReturnStatement(@NotNull JSReturnStatement statement) {
+        @Override public void visitJSReturnStatement(@Nonnull JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
 
             final JSExpression returnValue = statement.getExpression();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index b3d8681c..2b6e783e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.dataflow;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
@@ -10,27 +12,27 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class ReuseOfLocalVariableJSInspection
         extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "reuse.of.local.variable.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.DATA_FLOW_ISSUES;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "reuse.of.local.variable.problem.descriptor");
@@ -46,7 +48,7 @@ private static class ReuseOfLocalVariableVisitor
             extends BaseInspectionVisitor {
 
         @Override public void visitJSAssignmentExpression(
-                @NotNull JSAssignmentExpression assignment) {
+                @Nonnull JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
             if (assignment.getROperand()==null) {
                 return;
@@ -162,8 +164,8 @@ private static boolean tryExistsBetween(
          */
         @Nullable
         public static PsiElement getChildWhichContainsElement(
-                @NotNull JSBlockStatement ancestor,
-                @NotNull PsiElement descendant) {
+                @Nonnull JSBlockStatement ancestor,
+                @Nonnull PsiElement descendant) {
             PsiElement element = descendant;
             while (!element.equals(ancestor)) {
                 descendant = element;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index 33807e67..136a337a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -9,7 +9,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import javax.swing.*;
 
@@ -26,14 +26,14 @@ public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection {
     public boolean m_ignoreAnnotatedVariables = false;
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "redundant.local.variable.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.DATA_FLOW_ISSUES;
     }
@@ -51,7 +51,7 @@ public boolean isEnabledByDefault() {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "unnecessary.local.variable.problem.descriptor");
@@ -70,7 +70,7 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
     private class UnnecessaryLocalVariableVisitor
             extends BaseInspectionVisitor {
 
-        @Override public void visitJSVarStatement(@NotNull JSVarStatement varStatement) {
+        @Override public void visitJSVarStatement(@Nonnull JSVarStatement varStatement) {
              super.visitJSVarStatement(varStatement);
             final JSVariable[] variables = varStatement.getVariables();
             for (JSVariable variable : variables) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
index 784790f1..62ff681d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
@@ -5,26 +5,27 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class VariableAssignedVisitor extends JSRecursiveElementVisitor {
 
     private boolean assigned = false;
-    @NotNull private final JSVariable variable;
+    @Nonnull
+	private final JSVariable variable;
 
-    public VariableAssignedVisitor(@NotNull JSVariable variable) {
+    public VariableAssignedVisitor(@Nonnull JSVariable variable) {
         super();
         this.variable = variable;
     }
 
-    @Override public void visitElement(@NotNull PsiElement element) {
+    @Override public void visitElement(@Nonnull PsiElement element) {
         if (!assigned) {
             super.visitElement(element);
         }
     }
 
     @Override public void visitJSAssignmentExpression(
-            @NotNull JSAssignmentExpression assignment) {
+            @Nonnull JSAssignmentExpression assignment) {
         if (assigned) {
             return;
         }
@@ -36,7 +37,7 @@ public VariableAssignedVisitor(@NotNull JSVariable variable) {
     }
 
     @Override public void visitJSPrefixExpression(
-            @NotNull JSPrefixExpression expression) {
+            @Nonnull JSPrefixExpression expression) {
         if (assigned) {
             return;
         }
@@ -53,7 +54,7 @@ public VariableAssignedVisitor(@NotNull JSVariable variable) {
     }
 
     @Override public void visitJSPostfixExpression(
-            @NotNull JSPostfixExpression postfixExpression) {
+            @Nonnull JSPostfixExpression postfixExpression) {
         if (assigned) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
index 9b9ae8ff..dc574f29 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
@@ -1,11 +1,12 @@
 package com.sixrr.inspectjs.dataflow;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
 
 public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisitor
 {
@@ -19,7 +20,7 @@ public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisito
         this.variable = variable;
     }
 
-    @Override public void visitElement(@NotNull PsiElement element)
+    @Override public void visitElement(@Nonnull PsiElement element)
     {
         if (usedInInnerFunction)
         {
@@ -29,7 +30,7 @@ public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisito
     }
 
     @Override public void visitJSFunctionExpression(
-            @NotNull JSFunctionExpression funcExpr)
+            @Nonnull JSFunctionExpression funcExpr)
     {
         if(usedInInnerFunction)
         {
@@ -42,7 +43,7 @@ public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisito
     }
 
     @Override public void visitJSReferenceExpression(
-            @NotNull JSReferenceExpression reference)
+            @Nonnull JSReferenceExpression reference)
     {
         if(usedInInnerFunction)
         {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
index 3e0dd2cc..7a475a55 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
@@ -1,29 +1,31 @@
 package com.sixrr.inspectjs.dataflow;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
 
 public class VariableUsedVisitor extends JSRecursiveElementVisitor {
 
     private boolean used = false;
-    @NotNull private final JSVariable variable;
+    @Nonnull
+	private final JSVariable variable;
 
-    public VariableUsedVisitor(@NotNull JSVariable variable) {
+    public VariableUsedVisitor(@Nonnull JSVariable variable) {
         super();
         this.variable = variable;
     }
 
-    @Override public void visitElement(@NotNull PsiElement element) {
+    @Override public void visitElement(@Nonnull PsiElement element) {
         if (!used) {
             super.visitElement(element);
         }
     }
 
-    @Override public void visitJSReferenceExpression(@NotNull JSReferenceExpression ref) {
+    @Override public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
         if (used) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index eb31afd7..7109c747 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.dom;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -8,19 +10,19 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class DocumentWriteJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("call.to.document.write.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index d648971d..09b66426 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -1,23 +1,24 @@
 package com.sixrr.inspectjs.dom;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class InnerHTMLJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("use.of.innerhtml.property.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index 474d2e82..6ecbbf3a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -1,24 +1,26 @@
 package com.sixrr.inspectjs.dom;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class PlatformDetectionJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("platform.detection.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
index 68cb164e..6fbaa6b9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
@@ -1,24 +1,25 @@
 package com.sixrr.inspectjs.dom;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class XHTMLIncompatabilitiesJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("xhtml.incompatibilities.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
index 4bed110c..2dbdf691 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
@@ -4,7 +4,7 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 class CatchParameterUsedVisitor extends JSRecursiveElementVisitor {
     private final JSParameter parameter;
@@ -15,13 +15,13 @@ class CatchParameterUsedVisitor extends JSRecursiveElementVisitor {
         parameter = variable;
     }
 
-    @Override public void visitElement(@NotNull PsiElement element) {
+    @Override public void visitElement(@Nonnull PsiElement element) {
         if (!used) {
             super.visitElement(element);
         }
     }
 
-    @Override public void visitJSReferenceExpression(@NotNull JSReferenceExpression reference) {
+    @Override public void visitJSReferenceExpression(@Nonnull JSReferenceExpression reference) {
         if (used) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
index 5bdd296f..31082fd4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.exception;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
@@ -8,18 +10,17 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class ContinueOrBreakFromFinallyBlockJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("continue.or.break.inside.finally.block.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
@@ -41,7 +42,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSContinueStatement(@NotNull JSContinueStatement statement) {
+        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
@@ -56,7 +57,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSBreakStatement(@NotNull JSBreakStatement statement) {
+        @Override public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index 9e73aee6..dc400fdb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.exception;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSCatchBlock;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
@@ -9,19 +11,19 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.StatementUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class EmptyCatchBlockJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("empty.catch.block.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
index d055fbdb..4df5230e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
@@ -1,5 +1,8 @@
 package com.sixrr.inspectjs.exception;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -7,19 +10,17 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.StatementUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class EmptyFinallyBlockJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("empty.finally.block.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index 2a454962..029598be 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.exception;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -7,19 +9,19 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.StatementUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class EmptyTryBlockJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("empty.try.block.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index 34cba7e2..a74ecf13 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.exception;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSThrowStatement;
@@ -9,18 +11,17 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
 
 public class ExceptionCaughtLocallyJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("exception.used.for.local.control.flow.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
@@ -42,7 +43,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSThrowStatement(@NotNull JSThrowStatement statement) {
+        @Override public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
             super.visitJSThrowStatement(statement);
             if (!isCaughtLocally(statement)) {
                 return;
@@ -51,7 +52,7 @@ private static class Visitor extends BaseInspectionVisitor {
         }
     }
 
-    public static boolean isCaughtLocally(@NotNull JSThrowStatement throwStatement) {
+    public static boolean isCaughtLocally(@Nonnull JSThrowStatement throwStatement) {
         JSElement currentElement = throwStatement;
         while (true) {
             final JSTryStatement tryStatement =
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
index c14bfec7..2edbe18d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
@@ -1,28 +1,29 @@
 package com.sixrr.inspectjs.exception;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSReturnStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class ReturnFromFinallyBlockJSInspection extends JavaScriptInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "ReturnInsideFinallyBlockJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("return.inside.finally.block.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
@@ -44,7 +45,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSReturnStatement(@NotNull JSReturnStatement statement) {
+        @Override public void visitJSReturnStatement(@Nonnull JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
index 2468b758..dc4a79a9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
@@ -1,28 +1,29 @@
 package com.sixrr.inspectjs.exception;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSThrowStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class ThrowFromFinallyBlockJSInspection extends JavaScriptInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "ThrowInsideFinallyBlockJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("throw.inside.finally.block.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
@@ -44,7 +45,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSThrowStatement(@NotNull JSThrowStatement statement) {
+        @Override public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
             super.visitJSThrowStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
index d88a5035..f155c8e9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
@@ -12,7 +12,7 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import javax.swing.*;
 
@@ -24,14 +24,14 @@ public class UnusedCatchParameterJSInspection extends JavaScriptInspection {
     public boolean m_ignoreCatchBlocksWithComments = false;
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "unused.catch.parameter.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
@@ -45,7 +45,7 @@ public JComponent createOptionsPanel() {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "unused.catch.parameter.problem.descriptor");
@@ -58,7 +58,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class EmptyCatchBlockVisitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSTryStatement(@NotNull JSTryStatement statement) {
+        @Override public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
             super.visitJSTryStatement(statement);
             final JSCatchBlock jsCatchBlock = statement.getCatchBlock();
             if(jsCatchBlock == null)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
index 4e97a6b9..5c5d3715 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
@@ -10,7 +10,7 @@
 import com.intellij.ide.DataManager;
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.InspectionJSBundle;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class RenameFix extends InspectionJSFix {
     private final String m_targetName;
@@ -26,7 +26,7 @@ public RenameFix(String targetName) {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getName() {
         if (m_targetName == null) {
             return InspectionJSBundle.message("rename.fix");
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index 3dc81c7d..04e60b51 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -1,29 +1,30 @@
 package com.sixrr.inspectjs.functionmetrics;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
-import org.jetbrains.annotations.NotNull;
 
 public class CyclomaticComplexityJSInspection
         extends FunctionMetricsInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "OverlyComplexFunctionJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("overly.complex.function.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
@@ -61,7 +62,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSFunctionDeclaration(@NotNull JSFunction function) {
+        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             final PsiElement lastChild = function.getLastChild();
             if(!(lastChild instanceof JSBlockStatement))
             {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
index d9925fd2..32a022f0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
@@ -1,8 +1,9 @@
 package com.sixrr.inspectjs.functionmetrics;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
 
 class CyclomaticComplexityVisitor extends JSRecursiveElementVisitor {
     private int complexity = 1;
@@ -20,23 +21,23 @@ class CyclomaticComplexityVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSForStatement(@NotNull JSForStatement statement) {
+    @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
         super.visitJSForStatement(statement);
         complexity++;
     }
 
     @Override
-	public void visitJSForInStatement(@NotNull JSForInStatement statement) {
+	public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
         super.visitJSForInStatement(statement);
         complexity++;
     }
 
-    @Override public void visitJSIfStatement(@NotNull JSIfStatement statement) {
+    @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
         super.visitJSIfStatement(statement);
         complexity++;
     }
 
-    @Override public void visitJSDoWhileStatement(@NotNull JSDoWhileStatement statement) {
+    @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
         super.visitJSDoWhileStatement(statement);
         complexity++;
     }
@@ -46,7 +47,7 @@ public void visitJSForInStatement(@NotNull JSForInStatement statement) {
         complexity++;
     }
 
-    @Override public void visitJSSwitchStatement(@NotNull JSSwitchStatement statement) {
+    @Override public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
         super.visitJSSwitchStatement(statement);
         final JSCaseClause[] caseClauses = statement.getCaseClauses();
         for (JSCaseClause clause : caseClauses) {
@@ -58,7 +59,7 @@ public void visitJSForInStatement(@NotNull JSForInStatement statement) {
         }
     }
 
-    @Override public void visitJSWhileStatement(@NotNull JSWhileStatement statement) {
+    @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
         super.visitJSWhileStatement(statement);
         complexity++;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index fc15b731..25f1e7b5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -7,18 +7,18 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class FunctionWithMultipleLoopsJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("function.with.multiple.loops.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
@@ -47,7 +47,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSFunctionDeclaration(@NotNull JSFunction function) {
+        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             // note: no call to super
             final PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index fc038ba9..ba593a69 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -4,18 +4,18 @@
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class FunctionWithMultipleReturnPointsJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("function.with.multiple.return.points.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
@@ -59,7 +59,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSFunctionDeclaration(@NotNull JSFunction function) {
+        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             final int returnPointCount = countReturnPoints(function);
             if (returnPointCount <= 1) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
index 55b6af1e..e67204d0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
@@ -2,7 +2,7 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 class LoopCountVisitor extends JSRecursiveElementVisitor {
     private int loopCount = 0;
@@ -19,22 +19,22 @@ class LoopCountVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSForStatement(@NotNull JSForStatement jsForStatement) {
+    @Override public void visitJSForStatement(@Nonnull JSForStatement jsForStatement) {
         super.visitJSForStatement(jsForStatement);
         loopCount++;
     }
 
-    @Override public void visitJSForInStatement(@NotNull JSForInStatement jsForStatement) {
+    @Override public void visitJSForInStatement(@Nonnull JSForInStatement jsForStatement) {
         super.visitJSForInStatement(jsForStatement);
         loopCount++;
     }
 
-    @Override public void visitJSWhileStatement(@NotNull JSWhileStatement jsWhileStatement) {
+    @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement jsWhileStatement) {
         super.visitJSWhileStatement(jsWhileStatement);
         loopCount++;
     }
 
-    @Override public void visitJSDoWhileStatement(@NotNull JSDoWhileStatement jsDoWhileStatement) {
+    @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement jsDoWhileStatement) {
         super.visitJSDoWhileStatement(jsDoWhileStatement);
         loopCount++;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
index 0103815a..04e69b02 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
@@ -7,7 +7,7 @@
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.intellij.psi.tree.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 class NegationCountVisitor extends JSRecursiveElementVisitor {
     private int negationCount = 0;
@@ -24,7 +24,7 @@ class NegationCountVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSBinaryExpression(@NotNull JSBinaryExpression expression) {
+    @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
         super.visitJSBinaryExpression(expression);
         final IElementType sign = expression.getOperationSign();
         if (JSTokenTypes.NE.equals(sign) || JSTokenTypes.NEQEQ.equals(sign)) {
@@ -32,7 +32,7 @@ class NegationCountVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSPrefixExpression(@NotNull JSPrefixExpression expression) {
+    @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
         super.visitJSPrefixExpression(expression);
         final IElementType sign = expression.getOperationSign();
         if (JSTokenTypes.EXCL.equals(sign)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index 439c5c36..4e310a87 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -5,23 +5,23 @@
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class NestingDepthJSInspection extends FunctionMetricsInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "OverlyNestedFunctionJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("overly.nested.function.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
@@ -58,7 +58,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSFunctionDeclaration(@NotNull JSFunction function) {
+        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             final NestingDepthVisitor visitor = new NestingDepthVisitor();
             function.accept(visitor);
             final int count = visitor.getMaximumDepth();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
index bbd9a2a3..11a666e0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
@@ -2,7 +2,7 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 class NestingDepthVisitor extends JSRecursiveElementVisitor {
     private int m_maximumDepth = 0;
@@ -25,19 +25,19 @@ class NestingDepthVisitor extends JSRecursiveElementVisitor {
     //    }
     //}
 
-    @Override public void visitJSDoWhileStatement(@NotNull JSDoWhileStatement statement) {
+    @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
         enterScope();
         super.visitJSDoWhileStatement(statement);
         exitScope();
     }
 
-    @Override public void visitJSForStatement(@NotNull JSForStatement statement) {
+    @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
         enterScope();
         super.visitJSForStatement(statement);
         exitScope();
     }
 
-    @Override public void visitJSIfStatement(@NotNull JSIfStatement statement) {
+    @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
         boolean isAlreadyCounted = false;
         if (statement.getParent() instanceof JSIfStatement) {
             final JSIfStatement parent = (JSIfStatement) statement.getParent();
@@ -56,19 +56,19 @@ class NestingDepthVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSTryStatement(@NotNull JSTryStatement statement) {
+    @Override public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
         enterScope();
         super.visitJSTryStatement(statement);
         exitScope();
     }
 
-    @Override public void visitJSSwitchStatement(@NotNull JSSwitchStatement statement) {
+    @Override public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
         enterScope();
         super.visitJSSwitchStatement(statement);
         exitScope();
     }
 
-    @Override public void visitJSWhileStatement(@NotNull JSWhileStatement statement) {
+    @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
         enterScope();
         super.visitJSWhileStatement(statement);
         exitScope();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index 0ca18606..9630348e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -7,24 +7,24 @@
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class ParametersPerFunctionJSInspection
         extends FunctionMetricsInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "OverlyComplexFunctionJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("function.with.too.many.parameters.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
@@ -60,7 +60,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSFunctionDeclaration(@NotNull JSFunction function) {
+        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             final JSParameterList parameterList = function.getParameterList();
             if (parameterList == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
index 24c265b3..f1894a98 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
@@ -1,8 +1,9 @@
 package com.sixrr.inspectjs.functionmetrics;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
 
 class StatementCountVisitor extends JSRecursiveElementVisitor {
     private int statementCount = 0;
@@ -19,7 +20,7 @@ class StatementCountVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSStatement(@NotNull JSStatement statement) {
+    @Override public void visitJSStatement(@Nonnull JSStatement statement) {
         super.visitJSStatement(statement);
         if(statement instanceof JSEmptyStatement ||
                 statement instanceof JSBlockStatement)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index 17a4a18e..f797e755 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -1,29 +1,30 @@
 package com.sixrr.inspectjs.functionmetrics;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
-import org.jetbrains.annotations.NotNull;
 
 public class StatementsPerFunctionJSInspection
         extends FunctionMetricsInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "FunctionTooLongJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("overly.long.function.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
@@ -61,7 +62,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSFunctionDeclaration(@NotNull JSFunction function) {
+        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
 
             final PsiElement lastChild = function.getLastChild();
             if(!(lastChild instanceof JSBlockStatement))
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index 9b98967e..864f361e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.functionmetrics;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.psi.PsiElement;
@@ -7,24 +9,23 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
 
 public class ThreeNegationsPerFunctionJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "FunctionWithMoreThanThreeNegationsJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("function.with.more.than.three.negations.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
@@ -52,7 +53,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSFunctionDeclaration(@NotNull JSFunction function) {
+        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             final NegationCountVisitor visitor = new NegationCountVisitor();
             final PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index c180ed20..7dbc2885 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -1,7 +1,7 @@
 package com.sixrr.inspectjs.naming;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -17,13 +17,13 @@ public class FunctionNamingConventionJSInspection extends ConventionInspection {
     private final RenameFix fix = new RenameFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("function.naming.convention.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index 05c4cbae..9df1ba72 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.naming;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.psi.PsiElement;
@@ -9,7 +11,6 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 public class LocalVariableNamingConventionJSInspection extends ConventionInspection {
     private static final int DEFAULT_MIN_LENGTH = 1;
@@ -17,13 +18,13 @@ public class LocalVariableNamingConventionJSInspection extends ConventionInspect
     private final RenameFix fix = new RenameFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("local.variable.naming.convention.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index 22c20c46..eb890216 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.naming;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSParameterList;
@@ -11,7 +13,6 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 public class ParameterNamingConventionJSInspection extends ConventionInspection {
     private static final int DEFAULT_MIN_LENGTH = 1;
@@ -19,13 +20,13 @@ public class ParameterNamingConventionJSInspection extends ConventionInspection
     private final RenameFix fix = new RenameFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("function.parameter.naming.convention.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index 7292e01a..e9cf6a04 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.style;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -8,30 +10,29 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
 
 public class ChainedEqualityJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "ChainedEqualityComparisonsJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("chained.equality.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String buildErrorString(Object... args) {
         return InspectionJSBundle.message("chained.equality.error.string");
     }
@@ -44,7 +45,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class ChainedEqualityVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSBinaryExpression(
-                @NotNull JSBinaryExpression expression) {
+                @Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
@@ -63,7 +64,7 @@ private static class ChainedEqualityVisitor extends BaseInspectionVisitor {
         }
 
         private static boolean isEqualityComparison(
-                @NotNull JSBinaryExpression expression) {
+                @Nonnull JSBinaryExpression expression) {
             final IElementType tokenType = expression.getOperationSign();
             return JSTokenTypes.EQEQ.equals(tokenType) ||
                     JSTokenTypes.NE.equals(tokenType);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index ea49a2ea..ab121644 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -8,27 +8,27 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class ChainedFunctionCallJSInspection extends JavaScriptInspection {
 
 
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "chained.function.call.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "chained.function.call.problem.descriptor");
@@ -43,7 +43,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class NestedMethodCallVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSCallExpression(
-                @NotNull JSCallExpression expression) {
+                @Nonnull JSCallExpression expression) {
             super.visitJSCallExpression(expression);
             final JSExpression reference =
                     expression.getMethodExpression();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index 05f3dec3..050d9183 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.style;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -10,25 +12,24 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class ConstantOnLHSOfComparisonJSInspection extends JavaScriptInspection {
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "ConstantOnLefSideOfComparisonJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("constant.on.left.side.of.comparison.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
@@ -50,7 +51,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class SwapComparisonFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("flip.comparison.fix");
         }
@@ -73,7 +74,7 @@ public void doFix(Project project, ProblemDescriptor descriptor)
 
     private static class ConstantOnRHSOfComparisonVisitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSBinaryExpression(@NotNull JSBinaryExpression expression) {
+        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index 3afce398..a1de31c0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -1,5 +1,7 @@
 package com.sixrr.inspectjs.style;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -10,25 +12,24 @@
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
-import org.jetbrains.annotations.NotNull;
 
 public class ConstantOnRHSOfComparisonJSInspection extends JavaScriptInspection {
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getID() {
         return "ConstantOnRightSideOfComparisonJS";
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("constant.on.right.side.of.comparison.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
@@ -50,7 +51,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class SwapComparisonFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("flip.comparison.fix");
         }
@@ -73,7 +74,7 @@ public void doFix(Project project, ProblemDescriptor descriptor)
 
     private static class ConstantOnRHSOfComparisonVisitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSBinaryExpression(@NotNull JSBinaryExpression expression) {
+        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index 373102d5..8cd4a9f6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -8,7 +8,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 
 
@@ -17,20 +17,20 @@ public class NestedFunctionCallJSInspection extends JavaScriptInspection {
 
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message(
                 "nested.function.call.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     protected String buildErrorString(Object... args) {
         return InspectionJSBundle.message(
                 "nested.function.call.problem.descriptor");
@@ -44,7 +44,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class NestedMethodCallVisitor extends BaseInspectionVisitor {
 
         @Override public void visitJSCallExpression(
-                @NotNull JSCallExpression expression) {
+                @Nonnull JSCallExpression expression) {
             super.visitJSCallExpression(expression);
             JSExpression outerExpression = expression;
             while (outerExpression != null &&
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
index 58796002..150e72ba 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
@@ -1,24 +1,25 @@
 package com.sixrr.inspectjs.style;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
-import org.jetbrains.annotations.NotNull;
 
 public class NonBlockStatementBodyJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new WrapBodyFix();
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("non.block.statement.body.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
@@ -44,7 +45,7 @@ public InspectionJSFix buildFix(PsiElement location) {
 
     private static class WrapBodyFix extends InspectionJSFix {
         @Override
-		@NotNull
+		@Nonnull
         public String getName() {
             return InspectionJSBundle.message("wrap.statement.body.fix");
         }
@@ -83,7 +84,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSDoWhileStatement(@NotNull JSDoWhileStatement statement) {
+        @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -97,7 +98,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSWhileStatement(@NotNull JSWhileStatement statement) {
+        @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -111,7 +112,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSForStatement(@NotNull JSForStatement statement) {
+        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -125,7 +126,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSForInStatement(@NotNull JSForInStatement statement) {
+        @Override public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
             super.visitJSForInStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -139,7 +140,7 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSIfStatement(@NotNull JSIfStatement statement) {
+        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
 
             final JSStatement thenBranch = statement.getThen();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index edb577f9..8fb8267d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -1,7 +1,8 @@
 package com.sixrr.inspectjs.style;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.openapi.project.Project;
@@ -28,14 +29,14 @@ public boolean isEnabledByDefault()
 	private final TerminateStatementFix fix = new TerminateStatementFix();
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return InspectionJSBundle.message("unterminated.statement.display.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getGroupDisplayName()
 	{
 		return JSGroupNames.STYLE_GROUP_NAME;
@@ -63,7 +64,7 @@ public InspectionJSFix buildFix(PsiElement location)
 	private static class TerminateStatementFix extends InspectionJSFix
 	{
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return InspectionJSBundle.message("terminate.statement.fix");
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
index 4dc610a5..ae0aad97 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
@@ -1,13 +1,15 @@
 package com.sixrr.inspectjs.utils;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
 public class BoolUtils {
@@ -15,7 +17,7 @@ private BoolUtils() {
         super();
     }
 
-    public static boolean isNegation(@NotNull JSExpression exp) {
+    public static boolean isNegation(@Nonnull JSExpression exp) {
         if (!(exp instanceof JSPrefixExpression)) {
             return false;
         }
@@ -41,7 +43,7 @@ public static boolean isFalse(@Nullable JSExpression test) {
         return "false".equals(text);
     }
 
-    public static String getNegatedExpressionText(@NotNull JSExpression condition) {
+    public static String getNegatedExpressionText(@Nonnull JSExpression condition) {
         if (condition instanceof JSParenthesizedExpression) {
             final JSExpression contentExpression = ((JSParenthesizedExpression) condition).getInnerExpression();
             return '(' + getNegatedExpressionText(contentExpression) + ')';
@@ -64,7 +66,7 @@ public static String getNegatedExpressionText(@NotNull JSExpression condition) {
         }
     }
 
-    private static JSExpression getNegated(@NotNull JSExpression exp) {
+    private static JSExpression getNegated(@Nonnull JSExpression exp) {
         final JSPrefixExpression prefixExp = (JSPrefixExpression) exp;
         final JSExpression operand = prefixExp.getExpression();
         return ParenthesesUtils.stripParentheses(operand);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
index ab202173..3aeb2bfb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
@@ -4,8 +4,8 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,16 +59,16 @@ public static boolean isComparison(@Nullable JSExpression exp) {
         return s_comparisonStrings.contains(sign);
     }
 
-    public static String getFlippedComparison(@NotNull IElementType str) {
+    public static String getFlippedComparison(@Nonnull IElementType str) {
         return s_swappedComparisons.get(str);
     }
 
-    public static boolean isEqualityComparison(@NotNull JSBinaryExpression operator) {
+    public static boolean isEqualityComparison(@Nonnull JSBinaryExpression operator) {
         final IElementType sign = operator.getOperationSign();
         return JSTokenTypes.EQEQ.equals(sign) || JSTokenTypes.NE.equals(sign);
     }
 
-    public static String getNegatedComparison(@NotNull IElementType str) {
+    public static String getNegatedComparison(@Nonnull IElementType str) {
         return s_invertedComparisons.get(str);
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
index 09227b03..29c7a1ef 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
@@ -1,10 +1,12 @@
 package com.sixrr.inspectjs.utils;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public class ControlFlowUtils {
     private ControlFlowUtils() {
@@ -63,7 +65,7 @@ private static boolean withStatementMayReturnNormally(JSWithStatement jsWithStat
     }
 
     private static boolean doWhileStatementMayReturnNormally(
-            @NotNull JSDoWhileStatement loopStatement) {
+            @Nonnull JSDoWhileStatement loopStatement) {
         final JSExpression test = loopStatement.getCondition();
         final JSStatement body = loopStatement.getBody();
         return statementMayCompleteNormally(body) && !BoolUtils.isTrue(test)
@@ -71,14 +73,14 @@ private static boolean doWhileStatementMayReturnNormally(
     }
 
     private static boolean whileStatementMayReturnNormally(
-            @NotNull JSWhileStatement loopStatement) {
+            @Nonnull JSWhileStatement loopStatement) {
         final JSExpression test = loopStatement.getCondition();
         return !BoolUtils.isTrue(test)
                 || statementIsBreakTarget(loopStatement);
     }
 
     private static boolean forStatementMayReturnNormally(
-            @NotNull JSForStatement loopStatement) {
+            @Nonnull JSForStatement loopStatement) {
         final JSExpression test = loopStatement.getCondition();
         if (statementIsBreakTarget(loopStatement)) {
             return true;
@@ -90,12 +92,12 @@ private static boolean forStatementMayReturnNormally(
     }
 
     private static boolean foreachStatementMayReturnNormally(
-            @NotNull JSForInStatement loopStatement) {
+            @Nonnull JSForInStatement loopStatement) {
         return true;
     }
 
     private static boolean switchStatementMayReturnNormally(
-            @NotNull JSSwitchStatement switchStatement) {
+            @Nonnull JSSwitchStatement switchStatement) {
         if (statementIsBreakTarget(switchStatement)) {
             return true;
         }
@@ -125,7 +127,7 @@ private static boolean switchStatementMayReturnNormally(
     }
 
     private static boolean tryStatementMayReturnNormally(
-            @NotNull JSTryStatement tryStatement) {
+            @Nonnull JSTryStatement tryStatement) {
         final JSStatement finallyBlock = tryStatement.getFinallyStatement();
         if (finallyBlock != null) {
             if (!statementMayCompleteNormally(finallyBlock)) {
@@ -146,7 +148,7 @@ private static boolean tryStatementMayReturnNormally(
     }
 
     private static boolean ifStatementMayReturnNormally(
-            @NotNull JSIfStatement ifStatement) {
+            @Nonnull JSIfStatement ifStatement) {
         final JSStatement thenBranch = ifStatement.getThen();
         if (statementMayCompleteNormally(thenBranch)) {
             return true;
@@ -157,7 +159,7 @@ private static boolean ifStatementMayReturnNormally(
     }
 
     private static boolean labeledStatementMayCompleteNormally(
-            @NotNull JSLabeledStatement labeledStatement) {
+            @Nonnull JSLabeledStatement labeledStatement) {
         final JSStatement statement = labeledStatement.getStatement();
         return statementMayCompleteNormally(statement) ||
                 statementIsBreakTarget(statement);
@@ -178,34 +180,34 @@ public static boolean blockMayCompleteNormally(
     }
 
     private static boolean statementIsBreakTarget(
-            @NotNull JSStatement statement) {
+            @Nonnull JSStatement statement) {
         final BreakFinder breakFinder = new BreakFinder(statement);
         statement.accept(breakFinder);
         return breakFinder.breakFound();
     }
 
     public static boolean statementContainsReturn(
-            @NotNull JSStatement statement) {
+            @Nonnull JSStatement statement) {
         final ReturnFinder returnFinder = new ReturnFinder();
         statement.accept(returnFinder);
         return returnFinder.returnFound();
     }
 
     public static boolean statementIsContinueTarget(
-            @NotNull JSStatement statement) {
+            @Nonnull JSStatement statement) {
         final ContinueFinder continueFinder = new ContinueFinder(statement);
         statement.accept(continueFinder);
         return continueFinder.continueFound();
     }
 
-    public static boolean isInLoop(@NotNull JSElement element) {
+    public static boolean isInLoop(@Nonnull JSElement element) {
         return isInForStatementBody(element) ||
                 isInForeachStatementBody(element) ||
                 isInWhileStatementBody(element) ||
                 isInDoWhileStatementBody(element);
     }
 
-    public static boolean isInFinallyBlock(@NotNull JSElement element) {
+    public static boolean isInFinallyBlock(@Nonnull JSElement element) {
         JSElement currentElement = element;
         while (true) {
             final JSTryStatement tryStatement =
@@ -224,7 +226,7 @@ public static boolean isInFinallyBlock(@NotNull JSElement element) {
         }
     }
 
-    public static boolean isInCatchBlock(@NotNull JSElement element) {
+    public static boolean isInCatchBlock(@Nonnull JSElement element) {
         JSElement currentElement = element;
         while (true) {
             final JSTryStatement tryStatement =
@@ -244,7 +246,7 @@ public static boolean isInCatchBlock(@NotNull JSElement element) {
         }
     }
 
-    private static boolean isInWhileStatementBody(@NotNull JSElement element) {
+    private static boolean isInWhileStatementBody(@Nonnull JSElement element) {
         final JSWhileStatement whileStatement =
                 PsiTreeUtil.getParentOfType(element,
                         JSWhileStatement.class);
@@ -256,7 +258,7 @@ private static boolean isInWhileStatementBody(@NotNull JSElement element) {
     }
 
     private static boolean isInDoWhileStatementBody(
-            @NotNull JSElement element) {
+            @Nonnull JSElement element) {
         final JSDoWhileStatement doWhileStatement =
                 PsiTreeUtil.getParentOfType(element,
                         JSDoWhileStatement.class);
@@ -267,7 +269,7 @@ private static boolean isInDoWhileStatementBody(
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
-    private static boolean isInForStatementBody(@NotNull JSElement element) {
+    private static boolean isInForStatementBody(@Nonnull JSElement element) {
         final JSForStatement forStatement =
                 PsiTreeUtil.getParentOfType(element, JSForStatement.class);
         if (forStatement == null) {
@@ -278,7 +280,7 @@ private static boolean isInForStatementBody(@NotNull JSElement element) {
     }
 
     private static boolean isInForeachStatementBody(
-            @NotNull JSElement element) {
+            @Nonnull JSElement element) {
         final JSForInStatement foreachStatement =
                 PsiTreeUtil.getParentOfType(element,
                         JSForInStatement.class);
@@ -289,7 +291,7 @@ private static boolean isInForeachStatementBody(
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
-    public static JSStatement stripBraces(@NotNull JSStatement branch) {
+    public static JSStatement stripBraces(@Nonnull JSStatement branch) {
         if (branch instanceof JSBlockStatement) {
             final JSBlockStatement block = (JSBlockStatement) branch;
             final JSStatement[] statements = block.getStatements();
@@ -304,8 +306,8 @@ public static JSStatement stripBraces(@NotNull JSStatement branch) {
     }
 
     public static boolean statementCompletesWithStatement(
-            @NotNull JSStatement containingStatement,
-            @NotNull JSStatement statement) {
+            @Nonnull JSStatement containingStatement,
+            @Nonnull JSStatement statement) {
         JSElement statementToCheck = statement;
         while (true) {
             if (statementToCheck.equals(containingStatement)) {
@@ -333,8 +335,8 @@ public static boolean statementCompletesWithStatement(
     }
 
     public static boolean blockCompletesWithStatement(
-            @NotNull JSBlockStatement body,
-            @NotNull JSStatement statement) {
+            @Nonnull JSBlockStatement body,
+            @Nonnull JSStatement statement) {
         JSElement statementToCheck = statement;
         while (true) {
             if (statementToCheck == null) {
@@ -365,19 +367,19 @@ public static boolean blockCompletesWithStatement(
         }
     }
 
-    private static boolean isLoop(@NotNull JSElement element) {
+    private static boolean isLoop(@Nonnull JSElement element) {
         return element instanceof JSLoopStatement;
     }
 
     @Nullable
     private static JSElement getContainingStatement(
-            @NotNull JSElement statement) {
+            @Nonnull JSElement statement) {
         return PsiTreeUtil
                 .getParentOfType(statement, JSStatement.class);
     }
 
-    private static boolean statementIsLastInBlock(@NotNull JSBlockStatement block,
-                                                  @NotNull JSStatement statement) {
+    private static boolean statementIsLastInBlock(@Nonnull JSBlockStatement block,
+                                                  @Nonnull JSStatement statement) {
         final JSStatement[] statements = block.getStatements();
         for (int i = statements.length - 1; i >= 0; i--) {
             final JSStatement childStatement = statements[i];
@@ -399,7 +401,7 @@ public boolean returnFound() {
         }
 
         @Override public void visitJSReturnStatement(
-                @NotNull JSReturnStatement returnStatement) {
+                @Nonnull JSReturnStatement returnStatement) {
             if (m_found) {
                 return;
             }
@@ -412,7 +414,7 @@ private static class BreakFinder extends JSRecursiveElementVisitor {
         private boolean m_found = false;
         private final JSStatement m_target;
 
-        private BreakFinder(@NotNull JSStatement target) {
+        private BreakFinder(@Nonnull JSStatement target) {
             super();
             m_target = target;
         }
@@ -422,7 +424,7 @@ public boolean breakFound() {
         }
 
         @Override public void visitJSBreakStatement(
-                @NotNull JSBreakStatement breakStatement) {
+                @Nonnull JSBreakStatement breakStatement) {
             if (m_found) {
                 return;
             }
@@ -442,7 +444,7 @@ private static class ContinueFinder extends JSRecursiveElementVisitor {
         private boolean m_found = false;
         private final JSStatement m_target;
 
-        private ContinueFinder(@NotNull JSStatement target) {
+        private ContinueFinder(@Nonnull JSStatement target) {
             super();
             m_target = target;
         }
@@ -452,7 +454,7 @@ public boolean continueFound() {
         }
 
         @Override public void visitJSContinueStatement(
-                @NotNull JSContinueStatement continueStatement) {
+                @Nonnull JSContinueStatement continueStatement) {
             if (m_found) {
                 return;
             }
@@ -468,13 +470,13 @@ public boolean continueFound() {
         }
     }
 
-    public static boolean isInExitStatement(@NotNull JSExpression expression) {
+    public static boolean isInExitStatement(@Nonnull JSExpression expression) {
         return isInReturnStatementArgument(expression) ||
                 isInThrowStatementArgument(expression);
     }
 
     private static boolean isInReturnStatementArgument(
-            @NotNull JSExpression expression) {
+            @Nonnull JSExpression expression) {
         final JSReturnStatement returnStatement =
                 PsiTreeUtil
                         .getParentOfType(expression, JSReturnStatement.class);
@@ -482,7 +484,7 @@ private static boolean isInReturnStatementArgument(
     }
 
     private static boolean isInThrowStatementArgument(
-            @NotNull JSExpression expression) {
+            @Nonnull JSExpression expression) {
         final JSThrowStatement throwStatement =
                 PsiTreeUtil
                         .getParentOfType(expression, JSThrowStatement.class);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
index 72fd85c6..a65de8c4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
@@ -1,7 +1,7 @@
 package com.sixrr.inspectjs.utils;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
@@ -137,8 +137,8 @@ private static boolean withStatementsAreEquivalent(JSWithStatement statement1, J
         return statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean varStatementsAreEquivalent(@NotNull JSVarStatement statement1,
-                                                      @NotNull JSVarStatement statement2) {
+    private static boolean varStatementsAreEquivalent(@Nonnull JSVarStatement statement1,
+                                                      @Nonnull JSVarStatement statement2) {
         final JSVariable[] variables1 = statement1.getVariables();
         final JSVariable[] variables2 = statement2.getVariables();
         if(variables1.length!=variables2.length)
@@ -154,8 +154,8 @@ private static boolean varStatementsAreEquivalent(@NotNull JSVarStatement statem
         return true;
     }
 
-    private static boolean variablesAreEquivalent(@NotNull JSVariable var1,
-                                                  @NotNull JSVariable var2) {
+    private static boolean variablesAreEquivalent(@Nonnull JSVariable var1,
+                                                  @Nonnull JSVariable var2) {
         final JSExpression initializer1 = var1.getInitializer();
         final JSExpression initializer2 = var2.getInitializer();
         if (!expressionsAreEquivalent(initializer1, initializer2)) {
@@ -174,8 +174,8 @@ private static boolean variablesAreEquivalent(@NotNull JSVariable var1,
         return name1.equals(name2);
     }
 
-    private static boolean tryStatementsAreEquivalent(@NotNull JSTryStatement statement1,
-                                                      @NotNull JSTryStatement statement2) {
+    private static boolean tryStatementsAreEquivalent(@Nonnull JSTryStatement statement1,
+                                                      @Nonnull JSTryStatement statement2) {
         final JSStatement tryBlock1 = statement1.getStatement();
         final JSStatement tryBlock2 = statement2.getStatement();
         if (!statementsAreEquivalent(tryBlock1, tryBlock2)) {
@@ -207,8 +207,8 @@ private static boolean tryStatementsAreEquivalent(@NotNull JSTryStatement statem
         return statementsAreEquivalent(catchStatement1, catchStatement2);
     }
 
-    private static boolean parametersAreEquivalent(@NotNull JSParameter parameter1,
-                                                   @NotNull JSParameter parameter2) {
+    private static boolean parametersAreEquivalent(@Nonnull JSParameter parameter1,
+                                                   @Nonnull JSParameter parameter2) {
         final JavaScriptType type1 = parameter1.getType();
         final JavaScriptType type2 = parameter2.getType();
         if (!typesAreEquivalent(type1, type2)) {
@@ -232,8 +232,8 @@ private static boolean typesAreEquivalent(@Nullable JavaScriptType type1, @Nulla
         return type1.equals(type2);
     }
 
-    private static boolean whileStatementsAreEquivalent(@NotNull JSWhileStatement statement1,
-                                                        @NotNull JSWhileStatement statement2) {
+    private static boolean whileStatementsAreEquivalent(@Nonnull JSWhileStatement statement1,
+                                                        @Nonnull JSWhileStatement statement2) {
         final JSExpression condition1 = statement1.getCondition();
         final JSExpression condition2 = statement2.getCondition();
         final JSStatement body1 = statement1.getBody();
@@ -242,8 +242,8 @@ private static boolean whileStatementsAreEquivalent(@NotNull JSWhileStatement st
                 statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean forStatementsAreEquivalent(@NotNull JSForStatement statement1,
-                                                      @NotNull JSForStatement statement2) {
+    private static boolean forStatementsAreEquivalent(@Nonnull JSForStatement statement1,
+                                                      @Nonnull JSForStatement statement2) {
         final JSExpression condition1 = statement1.getCondition();
         final JSExpression condition2 = statement2.getCondition();
         if (!expressionsAreEquivalent(condition1, condition2)) {
@@ -264,8 +264,8 @@ private static boolean forStatementsAreEquivalent(@NotNull JSForStatement statem
         return statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean forInStatementsAreEquivalent(@NotNull JSForInStatement statement1,
-                                                        @NotNull JSForInStatement statement2) {
+    private static boolean forInStatementsAreEquivalent(@Nonnull JSForInStatement statement1,
+                                                        @Nonnull JSForInStatement statement2) {
         final JSExpression value1 = statement1.getCollectionExpression();
         final JSExpression value2 = statement2.getCollectionExpression();
         if (!expressionsAreEquivalent(value1, value2)) {
@@ -281,8 +281,8 @@ private static boolean forInStatementsAreEquivalent(@NotNull JSForInStatement st
         return statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean switchStatementsAreEquivalent(@NotNull JSSwitchStatement statement1,
-                                                         @NotNull JSSwitchStatement statement2) {
+    private static boolean switchStatementsAreEquivalent(@Nonnull JSSwitchStatement statement1,
+                                                         @Nonnull JSSwitchStatement statement2) {
         final JSExpression switchExpression1 = statement1.getSwitchExpression();
         final JSExpression swithcExpression2 = statement2.getSwitchExpression();
         if (!expressionsAreEquivalent(switchExpression1, swithcExpression2)) {
@@ -329,8 +329,8 @@ private static boolean caseClausesAreEquivalent(JSCaseClause clause1, JSCaseClau
         return false;
     }
 
-    private static boolean doWhileStatementsAreEquivalent(@NotNull JSDoWhileStatement statement1,
-                                                          @NotNull JSDoWhileStatement statement2) {
+    private static boolean doWhileStatementsAreEquivalent(@Nonnull JSDoWhileStatement statement1,
+                                                          @Nonnull JSDoWhileStatement statement2) {
         final JSExpression condition1 = statement1.getCondition();
         final JSExpression condition2 = statement2.getCondition();
         final JSStatement body1 = statement1.getBody();
@@ -339,8 +339,8 @@ private static boolean doWhileStatementsAreEquivalent(@NotNull JSDoWhileStatemen
                 statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean blockStatementsAreEquivalent(@NotNull JSBlockStatement statement1,
-                                                        @NotNull JSBlockStatement statement2) {
+    private static boolean blockStatementsAreEquivalent(@Nonnull JSBlockStatement statement1,
+                                                        @Nonnull JSBlockStatement statement2) {
         final JSStatement[] statements1 = statement1.getStatements();
         final JSStatement[] statements2 = statement2.getStatements();
         if(statements1.length !=statements2.length)
@@ -356,8 +356,8 @@ private static boolean blockStatementsAreEquivalent(@NotNull JSBlockStatement st
         return true;
     }
 
-    private static boolean breakStatementsAreEquivalent(@NotNull JSBreakStatement statement1,
-                                                        @NotNull JSBreakStatement statement2) {
+    private static boolean breakStatementsAreEquivalent(@Nonnull JSBreakStatement statement1,
+                                                        @Nonnull JSBreakStatement statement2) {
         final String identifier1 = statement1.getLabel();
         final String identifier2 = statement2.getLabel();
         if (identifier1 == null) {
@@ -369,8 +369,8 @@ private static boolean breakStatementsAreEquivalent(@NotNull JSBreakStatement st
         return identifier1.equals(identifier2);
     }
 
-    private static boolean continueStatementsAreEquivalent(@NotNull JSContinueStatement statement1,
-                                                           @NotNull JSContinueStatement statement2) {
+    private static boolean continueStatementsAreEquivalent(@Nonnull JSContinueStatement statement1,
+                                                           @Nonnull JSContinueStatement statement2) {
         final String identifier1 = statement1.getLabel();
         final String identifier2 = statement2.getLabel();
         if (identifier1 == null) {
@@ -383,8 +383,8 @@ private static boolean continueStatementsAreEquivalent(@NotNull JSContinueStatem
     }
 
 
-    private static boolean labeledStatementsAreEquivalent(@NotNull JSLabeledStatement statement1,
-                                                          @NotNull JSLabeledStatement statement2) {
+    private static boolean labeledStatementsAreEquivalent(@Nonnull JSLabeledStatement statement1,
+                                                          @Nonnull JSLabeledStatement statement2) {
 
         final PsiElement identifier1 = statement1.getLabelIdentifier();
         final PsiElement identifier2 = statement2.getLabelIdentifier();
@@ -400,8 +400,8 @@ private static boolean labeledStatementsAreEquivalent(@NotNull JSLabeledStatemen
     }
 
 
-    private static boolean ifStatementsAreEquivalent(@NotNull JSIfStatement statement1,
-                                                     @NotNull JSIfStatement statement2) {
+    private static boolean ifStatementsAreEquivalent(@Nonnull JSIfStatement statement1,
+                                                     @Nonnull JSIfStatement statement2) {
         final JSExpression condition1 = statement1.getCondition();
         final JSExpression condition2 = statement2.getCondition();
         final JSStatement thenBranch1 = statement1.getThen();
@@ -413,22 +413,22 @@ private static boolean ifStatementsAreEquivalent(@NotNull JSIfStatement statemen
                 statementsAreEquivalent(elseBranch1, elseBranch2);
     }
 
-    private static boolean expressionStatementsAreEquivalent(@NotNull JSExpressionStatement statement1,
-                                                             @NotNull JSExpressionStatement statement2) {
+    private static boolean expressionStatementsAreEquivalent(@Nonnull JSExpressionStatement statement1,
+                                                             @Nonnull JSExpressionStatement statement2) {
         final JSExpression expression1 = statement1.getExpression();
         final JSExpression expression2 = statement2.getExpression();
         return expressionsAreEquivalent(expression1, expression2);
     }
 
-    private static boolean returnStatementsAreEquivalent(@NotNull JSReturnStatement statement1,
-                                                         @NotNull JSReturnStatement statement2) {
+    private static boolean returnStatementsAreEquivalent(@Nonnull JSReturnStatement statement1,
+                                                         @Nonnull JSReturnStatement statement2) {
         final JSExpression returnValue1 = statement1.getExpression();
         final JSExpression returnValue2 = statement2.getExpression();
         return expressionsAreEquivalent(returnValue1, returnValue2);
     }
 
-    private static boolean throwStatementsAreEquivalent(@NotNull JSThrowStatement statement1,
-                                                        @NotNull JSThrowStatement statement2) {
+    private static boolean throwStatementsAreEquivalent(@Nonnull JSThrowStatement statement1,
+                                                        @Nonnull JSThrowStatement statement2) {
         final JSExpression exception1 = statement1.getExpression();
         final JSExpression exception2 = statement2.getExpression();
         return expressionsAreEquivalent(exception1, exception2);
@@ -552,8 +552,8 @@ private static boolean indexedAccessExpressionsAreEquivalent(JSIndexedPropertyAc
         return expressionsAreEquivalent(qualifier1, qualifier2);
     }
 
-    private static boolean methodCallExpressionsAreEquivalent(@NotNull JSCallExpression methodExp1,
-                                                              @NotNull JSCallExpression methodExp2) {
+    private static boolean methodCallExpressionsAreEquivalent(@Nonnull JSCallExpression methodExp1,
+                                                              @Nonnull JSCallExpression methodExp2) {
         final JSExpression methodExpression1;
         final JSExpression methodExpression2;
         try {
@@ -578,8 +578,8 @@ private static boolean methodCallExpressionsAreEquivalent(@NotNull JSCallExpress
         return expressionListsAreEquivalent(args1, args2);
     }
 
-    private static boolean newExpressionsAreEquivalent(@NotNull JSNewExpression newExp1,
-                                                       @NotNull JSNewExpression newExp2) {
+    private static boolean newExpressionsAreEquivalent(@Nonnull JSNewExpression newExp1,
+                                                       @Nonnull JSNewExpression newExp2) {
         final JSExpression methodExpression1 =
                 newExp1.getMethodExpression();
         final JSExpression methodExpression2 =
@@ -600,16 +600,16 @@ private static boolean newExpressionsAreEquivalent(@NotNull JSNewExpression newE
         return expressionListsAreEquivalent(args1, args2);
     }
 
-    private static boolean arrayInitializerExpressionsAreEquivalent(@NotNull JSArrayLiteralExpression arrInitExp1,
-                                                                    @NotNull JSArrayLiteralExpression arrInitExp2) {
+    private static boolean arrayInitializerExpressionsAreEquivalent(@Nonnull JSArrayLiteralExpression arrInitExp1,
+                                                                    @Nonnull JSArrayLiteralExpression arrInitExp2) {
         final JSExpression[] initializers1 = arrInitExp1.getExpressions();
         final JSExpression[] initializers2 = arrInitExp2.getExpressions();
         return expressionListsAreEquivalent(initializers1, initializers2);
     }
 
 
-    private static boolean prefixExpressionsAreEquivalent(@NotNull JSPrefixExpression prefixExp1,
-                                                          @NotNull JSPrefixExpression prefixExp2) {
+    private static boolean prefixExpressionsAreEquivalent(@Nonnull JSPrefixExpression prefixExp1,
+                                                          @Nonnull JSPrefixExpression prefixExp2) {
         final IElementType sign1 = prefixExp1.getOperationSign();
         final IElementType sign2 = prefixExp2.getOperationSign();
         if (sign1 == null) return sign1 == sign2;
@@ -621,8 +621,8 @@ private static boolean prefixExpressionsAreEquivalent(@NotNull JSPrefixExpressio
         return expressionsAreEquivalent(operand1, operand2);
     }
 
-    private static boolean postfixExpressionsAreEquivalent(@NotNull JSPostfixExpression postfixExp1,
-                                                           @NotNull JSPostfixExpression postfixExp2) {
+    private static boolean postfixExpressionsAreEquivalent(@Nonnull JSPostfixExpression postfixExp1,
+                                                           @Nonnull JSPostfixExpression postfixExp2) {
         final IElementType sign1 = postfixExp1.getOperationSign();
         final IElementType sign2 = postfixExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
@@ -633,8 +633,8 @@ private static boolean postfixExpressionsAreEquivalent(@NotNull JSPostfixExpress
         return expressionsAreEquivalent(operand1, operand2);
     }
 
-    private static boolean binaryExpressionsAreEquivalent(@NotNull JSBinaryExpression binaryExp1,
-                                                          @NotNull JSBinaryExpression binaryExp2) {
+    private static boolean binaryExpressionsAreEquivalent(@Nonnull JSBinaryExpression binaryExp1,
+                                                          @Nonnull JSBinaryExpression binaryExp2) {
         final IElementType sign1 = binaryExp1.getOperationSign();
         final IElementType sign2 = binaryExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
@@ -648,8 +648,8 @@ private static boolean binaryExpressionsAreEquivalent(@NotNull JSBinaryExpressio
                 && expressionsAreEquivalent(rhs1, rhs2);
     }
 
-    private static boolean assignmentExpressionsAreEquivalent(@NotNull JSAssignmentExpression assignExp1,
-                                                              @NotNull JSAssignmentExpression assignExp2) {
+    private static boolean assignmentExpressionsAreEquivalent(@Nonnull JSAssignmentExpression assignExp1,
+                                                              @Nonnull JSAssignmentExpression assignExp2) {
         final IElementType sign1 = assignExp1.getOperationSign();
         final IElementType sign2 = assignExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
@@ -663,8 +663,8 @@ private static boolean assignmentExpressionsAreEquivalent(@NotNull JSAssignmentE
                 && expressionsAreEquivalent(rhs1, rhs2);
     }
 
-    private static boolean conditionalExpressionsAreEquivalent(@NotNull JSConditionalExpression condExp1,
-                                                               @NotNull JSConditionalExpression condExp2) {
+    private static boolean conditionalExpressionsAreEquivalent(@Nonnull JSConditionalExpression condExp1,
+                                                               @Nonnull JSConditionalExpression condExp2) {
         final JSExpression condition1 = condExp1.getCondition();
         final JSExpression condition2 = condExp2.getCondition();
         final JSExpression thenExpression1 = condExp1.getThen();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
index 7a7aede9..ec9002d9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
@@ -4,11 +4,12 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.tree.IElementType;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 public class ExpressionUtil {
     private ExpressionUtil() {
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
index 3a10a96a..feb27e36 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
@@ -1,17 +1,18 @@
 package com.sixrr.inspectjs.utils;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.tree.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import org.jetbrains.annotations.NotNull;
 
 public class SideEffectChecker {
     private SideEffectChecker() {
         super();
     }
 
-    public static boolean mayHaveSideEffects(@NotNull JSExpression exp) {
+    public static boolean mayHaveSideEffects(@Nonnull JSExpression exp) {
         final SideEffectsVisitor visitJSor = new SideEffectsVisitor();
         exp.accept(visitJSor);
         return visitJSor.mayHaveSideEffects();
@@ -20,13 +21,13 @@ public static boolean mayHaveSideEffects(@NotNull JSExpression exp) {
     private static class SideEffectsVisitor extends JSRecursiveElementVisitor {
         private boolean mayHaveSideEffects = false;
 
-        @Override public void visitJSElement(@NotNull JSElement element) {
+        @Override public void visitJSElement(@Nonnull JSElement element) {
             if (!mayHaveSideEffects) {
                 super.visitJSElement(element);
             }
         }
 
-        @Override public void visitJSAssignmentExpression(@NotNull JSAssignmentExpression expression) {
+        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -35,7 +36,7 @@ private static class SideEffectsVisitor extends JSRecursiveElementVisitor {
         }
       
         @Override
-		public void visitJSCallExpression(@NotNull JSCallExpression expression) {
+		public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -43,7 +44,7 @@ public void visitJSCallExpression(@NotNull JSCallExpression expression) {
             mayHaveSideEffects = true;
         }
 
-        @Override public void visitJSNewExpression(@NotNull JSNewExpression expression) {
+        @Override public void visitJSNewExpression(@Nonnull JSNewExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -51,7 +52,7 @@ public void visitJSCallExpression(@NotNull JSCallExpression expression) {
             mayHaveSideEffects = true;
         }
 
-        @Override public void visitJSPostfixExpression(@NotNull JSPostfixExpression expression) {
+        @Override public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -63,7 +64,7 @@ public void visitJSCallExpression(@NotNull JSCallExpression expression) {
             }
         }
 
-        @Override public void visitJSPrefixExpression(@NotNull JSPrefixExpression expression) {
+        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index c3fd8c72..baf7dae7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -1,8 +1,8 @@
 package com.sixrr.inspectjs.validity;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
@@ -20,14 +20,14 @@ public class BadExpressionStatementJSInspection extends JavaScriptInspection
 {
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return InspectionJSBundle.message("expression.statement.which.is.not.assignment.or.call.display.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getGroupDisplayName()
 	{
 		return JSGroupNames.VALIDITY_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
index 5a6c03b3..6515e5a3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
@@ -1,5 +1,8 @@
 package com.sixrr.inspectjs.validity;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -8,19 +11,17 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class DebuggerStatementJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("debugger.statement.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index 2bd8deaf..651fa438 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -8,7 +8,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -16,13 +16,13 @@
 
 public class DuplicateCaseLabelJSInspection extends JavaScriptInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("duplicate.case.label.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
@@ -45,7 +45,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor
             extends BaseInspectionVisitor {
 
-        @Override public void visitJSSwitchStatement(@NotNull JSSwitchStatement statement) {
+        @Override public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
 
             final Set<JSExpression> conditions = new HashSet<JSExpression>();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index 1deb6f5d..c641055f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -6,19 +6,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.Arrays;
 
 public class DuplicatePropertyOnObjectJSInspection extends JavaScriptInspection {
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("duplicate.property.on.object.literal.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index 566771db..b2088d4d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -1,5 +1,8 @@
 package com.sixrr.inspectjs.validity;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
@@ -7,19 +10,17 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("function.with.inconsistent.returns.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index 2ac5801c..2587ab43 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -5,19 +5,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class StringLiteralBreaksHTMLJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("string.literal.breaks.html.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index 27bf07b1..1033b7e0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -11,19 +11,19 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class ThisExpressionReferencesGlobalObjectJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("this.expression.which.references.the.global.object.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
index 580860a9..8a992510 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
@@ -1,5 +1,8 @@
 package com.sixrr.inspectjs.validity;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -7,19 +10,17 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class UnreachableCodeJSInspection extends JavaScriptInspection {
 
     @Override
-	@NotNull
+	@Nonnull
     public String getDisplayName() {
         return InspectionJSBundle.message("unreachable.code.display.name");
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
index c199014c..2427e85c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
@@ -15,10 +15,10 @@
  */
 package org.intellij.idea.lang.javascript.intention;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import com.intellij.psi.PsiElement;
 
 public interface JSElementPredicate {
-    boolean satisfiedBy(@NotNull PsiElement element);
+    boolean satisfiedBy(@Nonnull PsiElement element);
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index 10f69a56..db07f2be 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -16,8 +16,8 @@
 package org.intellij.idea.lang.javascript.intention;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
 import com.intellij.lang.Language;
 import com.intellij.openapi.editor.Editor;
@@ -46,7 +46,7 @@ protected JSIntention()
 	}
 
 	@Override
-	public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException
+	public void invoke(@Nonnull Project project, Editor editor, @Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		PsiElement matchingElement = findMatchingElement(element);
 		if(matchingElement == null)
@@ -56,9 +56,9 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
 		processIntention(matchingElement);
 	}
 
-	protected abstract void processIntention(@NotNull PsiElement element) throws IncorrectOperationException;
+	protected abstract void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException;
 
-	@NotNull
+	@Nonnull
 	protected abstract JSElementPredicate getElementPredicate();
 
 	@Nullable
@@ -92,7 +92,7 @@ protected PsiElement findMatchingElement(@Nullable PsiElement element)
 
 
 	@Override
-	public boolean isAvailable(@NotNull Project project, Editor editor, @Nullable PsiElement element)
+	public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement element)
 	{
 		return element != null && findMatchingElement(element) != null;
 	}
@@ -110,7 +110,7 @@ protected String getTextKey(@NonNls Object... suffixes)
 
 	@Override
 	@SuppressWarnings({"UnresolvedPropertyKey"})
-	@NotNull
+	@Nonnull
 	public String getText()
 	{
 		return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME));
@@ -130,7 +130,7 @@ protected String getSuffixedDisplayName(@NonNls String suffix, @NonNls Object...
 
 	@Override
 	@SuppressWarnings({"UnresolvedPropertyKey"})
-	@NotNull
+	@Nonnull
 	public String getFamilyName()
 	{
 		return JSIntentionBundle.message(this.getTextKey(FAMILY_NAME));
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 90ddfbdf..41d38a0f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -15,12 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 public abstract class JSMutablyNamedIntention extends JSIntention {
     private String text;
@@ -28,12 +30,13 @@ public abstract class JSMutablyNamedIntention extends JSIntention {
     @NonNls protected abstract String getTextForElement(PsiElement element);
 
     @Override
-	@NotNull public String getText() {
+	@Nonnull
+	public String getText() {
       return text;
     }
 
     @Override
-	public boolean isAvailable(@NotNull Project project, Editor editor, @Nullable PsiElement node) {
+	public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node) {
       final PsiElement element = findMatchingElement(node);
       if (element != null) {
         text = getTextForElement(element);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
index 8e6a1e00..40cfd7ed 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
@@ -18,7 +18,7 @@
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -26,7 +26,7 @@
 
 class ComparisonPredicate implements JSElementPredicate {
     @Override
-	public boolean satisfiedBy(@NotNull PsiElement element) {
+	public boolean satisfiedBy(@Nonnull PsiElement element) {
         if (!(element instanceof JSBinaryExpression)) {
             return false;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
index 90b603a2..be9463c0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
@@ -15,9 +15,10 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
@@ -26,7 +27,7 @@
 
 class ConjunctionPredicate implements JSElementPredicate {
     @Override
-	public boolean satisfiedBy(@NotNull PsiElement element) {
+	public boolean satisfiedBy(@Nonnull PsiElement element) {
         if (!(element instanceof JSBinaryExpression)) {
             return false;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 21deda27..806d3dc7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -15,12 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
@@ -44,12 +45,13 @@ protected String getTextForElement(PsiElement element) {
     }
 
     @Override
-	@NotNull public JSElementPredicate getElementPredicate() {
+	@Nonnull
+	public JSElementPredicate getElementPredicate() {
         return new ConjunctionPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         JSBinaryExpression  exp       = (JSBinaryExpression) element;
         final IElementType  tokenType = exp.getOperationSign();
         JSElement           parent    = (JSElement) exp.getParent();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index bf960611..fe5f6419 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -15,11 +15,12 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -49,12 +50,13 @@ public String getTextForElement(PsiElement element) {
     }
 
     @Override
-	@NotNull public JSElementPredicate getElementPredicate() {
+	@Nonnull
+	public JSElementPredicate getElementPredicate() {
         return new ComparisonPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSBinaryExpression exp  = (JSBinaryExpression) element;
         final JSExpression       lhs  = exp.getLOperand();
         final JSExpression       rhs  = exp.getROperand();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 65c5f13b..5c63fb1c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -15,11 +15,12 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSElement;
@@ -38,12 +39,13 @@ protected String getTextForElement(PsiElement element) {
     }
 
     @Override
-	@NotNull public JSElementPredicate getElementPredicate() {
+	@Nonnull
+	public JSElementPredicate getElementPredicate() {
         return new ConjunctionPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
         JSExpression             exp              = binaryExpression;
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index b985c81f..62df39f9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -15,11 +15,12 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -49,13 +50,13 @@ public String getTextForElement(PsiElement element) {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ComparisonPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSBinaryExpression exp             = (JSBinaryExpression) element;
         final JSExpression       lhs             = exp.getLOperand();
         final JSExpression       rhs             = exp.getROperand();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index 72f90c0c..fa11b3cb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -21,7 +21,7 @@
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
@@ -39,13 +39,13 @@ protected String getTextForElement(PsiElement element) {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new BooleanLiteralEqualityPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element)
+	public void processIntention(@Nonnull PsiElement element)
             throws IncorrectOperationException {
         final JSBinaryExpression exp      = (JSBinaryExpression) element;
         final boolean            isEquals = exp.getOperationSign().equals(JSTokenTypes.EQEQ);
@@ -87,7 +87,7 @@ public void processIntention(@NotNull PsiElement element)
 
     private static class BooleanLiteralEqualityPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSBinaryExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index 97a30e55..63f14d41 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -23,7 +23,7 @@
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class JSAddBracesIntention extends JSMutablyNamedIntention {
 
@@ -31,7 +31,7 @@ public class JSAddBracesIntention extends JSMutablyNamedIntention {
     @NonNls private static final String ELSE_KEYWORD = "else";
 
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new AddBracesPredicate();
     }
@@ -59,7 +59,7 @@ protected String getTextForElement(PsiElement element) {
     }
 
     @Override
-	protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         if (!(element instanceof JSStatement)) { return; }
         final JSStatement  statement = (JSStatement) element;
         final JSElement    parent    = (JSElement) element.getParent();
@@ -76,7 +76,7 @@ protected void processIntention(@NotNull PsiElement element) throws IncorrectOpe
 
     private static class AddBracesPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSStatement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index 12b627ab..a6649363 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -15,10 +15,11 @@
  */
 package org.intellij.idea.lang.javascript.intention.braces;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.psi.JSBlockStatement;
@@ -39,7 +40,7 @@ public class JSRemoveBracesIntention extends JSMutablyNamedIntention {
     @NonNls private static final String ELSE_KEYWORD = "else";
 
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new RemoveBracesPredicate();
     }
@@ -67,7 +68,7 @@ protected String getTextForElement(PsiElement element) {
     }
 
     @Override
-	protected void processIntention(@NotNull PsiElement element)
+	protected void processIntention(@Nonnull PsiElement element)
         throws IncorrectOperationException {
         final JSBlockStatement blockStatement = (JSBlockStatement) element;
         final JSStatement[]    statements     = blockStatement.getStatements();
@@ -108,7 +109,7 @@ protected void processIntention(@NotNull PsiElement element)
 
     public static class RemoveBracesPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSBlockStatement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index 6a70940f..5b52aba2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -24,7 +24,7 @@
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,13 +32,13 @@
 public class JSChangeToCStyleCommentIntention extends JSIntention {
 
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new EndOfLineCommentPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         PsiComment firstComment = (PsiComment) element;
 
         while (true) {
@@ -106,7 +106,7 @@ private static String getCommentContents(PsiComment comment) {
     private static class EndOfLineCommentPredicate implements JSElementPredicate {
 
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof PsiComment)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 3578b5eb..78ed34ed 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -15,6 +15,8 @@
  */
 package org.intellij.idea.lang.javascript.intention.comment;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
@@ -25,17 +27,16 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
-import org.jetbrains.annotations.NotNull;
 
 public class JSChangeToEndOfLineCommentIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new CStyleCommentPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final PsiElement parent  = element.getParent();
 
         assert (parent != null);
@@ -98,7 +99,7 @@ private static String[] buildCommentStrings(String[] lines) {
     private static class CStyleCommentPredicate implements JSElementPredicate {
 
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof PsiComment)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index 6635717d..4ae80506 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -15,6 +15,8 @@
  */
 package org.intellij.idea.lang.javascript.intention.comment;
 
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
@@ -25,17 +27,16 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
-import org.jetbrains.annotations.NotNull;
 
 public class JSMoveCommentToSeparateLineIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new CommentOnLineWithSourcePredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final PsiComment    selectedComment = (PsiComment) element;
         PsiElement          elementToCheck  = selectedComment;
         final PsiWhiteSpace whiteSpace;
@@ -70,7 +71,7 @@ private static boolean containsLineBreak(String text) {
     private static class CommentOnLineWithSourcePredicate implements JSElementPredicate {
 
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof PsiComment)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 9332b1e0..a36c16a2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -16,12 +16,13 @@
 package org.intellij.idea.lang.javascript.intention.conditional;
 
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -30,13 +31,13 @@
 
 public class JSFlipConditionalIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new FlipConditionalPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSConditionalExpression exp            = (JSConditionalExpression) element;
         final JSExpression            condition      = exp.getCondition();
         final JSExpression            elseExpression = exp.getElse();
@@ -53,7 +54,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class FlipConditionalPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSConditionalExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index 27c4f5bc..29f51e4c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -15,12 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention.conditional;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -36,13 +37,13 @@ public class JSFlipIfIntention extends JSIntention {
     @NonNls private static final String ELSE_KEYWORD = "else ";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new FlipIfPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSIfStatement exp             = (JSIfStatement) element;
         final JSExpression  condition       = exp.getCondition();
         final JSStatement   thenBranch      = exp.getThen();
@@ -61,7 +62,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class FlipIfPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSIfStatement) ||
                 ErrorUtil.containsError(element)) {
                 return false;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 5d0391a2..edbca0e2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -15,13 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention.conditional;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -30,13 +31,13 @@
 
 public class JSRemoveConditionalIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new RemoveConditionalPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSConditionalExpression exp            = (JSConditionalExpression) element;
         final JSExpression            condition      = exp.getCondition();
         final JSExpression            thenExpression = exp.getThen();
@@ -54,7 +55,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class RemoveConditionalPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSConditionalExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index e42a10b1..21934c6d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -15,10 +15,11 @@
  */
 package org.intellij.idea.lang.javascript.intention.conditional;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.psi.PsiElement;
@@ -26,20 +27,20 @@
 
 public class JSReplaceConditionalWithIfIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ReplaceConditionalWithIfPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSConditionalExpression);
         ConditionalUtils.replaceConditionalWithIf((JSConditionalExpression) element);
     }
 
     private static class ReplaceConditionalWithIfPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             return (element instanceof JSConditionalExpression);
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 1c4c6349..43eba805 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -15,12 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention.constant;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
@@ -32,13 +33,13 @@
 
 public class JSConstantExpressionIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new ConstantExpressionPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSExpression  expression = (JSExpression) element;
         final Object        value      = ExpressionUtil.computeConstantExpression(expression);
         final String        newExpression;
@@ -53,7 +54,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class ConstantExpressionPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index e43936dd..e69650de 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -15,14 +15,16 @@
  */
 package org.intellij.idea.lang.javascript.intention.constant;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -34,7 +36,7 @@
 
 public class JSConstantSubexpressionIntention extends JSMutablyNamedIntention {
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new ConstantSubexpressionPredicate();
     }
@@ -61,7 +63,7 @@ protected String getTextForElement(PsiElement element) {
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final PsiElement   parent        = element.getParent();
         final JSExpression expression    = (JSExpression) (parent instanceof JSBinaryExpression ? parent : element);
         String             newExpression = "";
@@ -146,7 +148,7 @@ private static JSBinaryExpression getSubexpression(JSBinaryExpression expression
 
     private static class ConstantSubexpressionPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSElement ||
                   element.getPrevSibling() instanceof JSElement)) {
                 return false;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index daf40937..f7e806c3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -15,6 +15,8 @@
  */
 package org.intellij.idea.lang.javascript.intention.increment;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -22,7 +24,6 @@
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
@@ -42,13 +43,13 @@ public String getTextForElement(PsiElement element) {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ExtractIncrementPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final boolean      isPostfix = (element instanceof JSPostfixExpression);
         final JSExpression operand   = (isPostfix ? ((JSPostfixExpression) element).getExpression()
                                                   : ((JSPrefixExpression)  element).getExpression());
@@ -72,7 +73,7 @@ private static IElementType getOperationSign(PsiElement element) {
 
     private static class ExtractIncrementPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!ExpressionUtil.isIncrementDecrementExpression(element)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 6cabbb78..812ddc28 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -24,7 +24,7 @@
 import org.intellij.idea.lang.javascript.psiutil.FindReferenceUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.Iterator;
 
@@ -32,13 +32,13 @@ public class JSMergeDeclarationAndInitializationIntention extends JSIntention {
     @NonNls private static final String JS_VAR_PREFIX = "var ";
 
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new Predicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSVarStatement);
 
         final JSVarStatement varStatement      = (JSVarStatement) element;
@@ -79,7 +79,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class Predicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSVarStatement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index 17192c1f..d70bdfaa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -27,7 +27,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,13 +36,13 @@ public class JSSplitDeclarationAndInitializationIntention extends JSIntention {
     @NonNls private static final String VAR_KEYWORD = "var ";
 
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new Predicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSVarStatement);
 
         final JSVarStatement varStatement      = (JSVarStatement) element;
@@ -79,7 +79,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class Predicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             PsiElement elementParent;
 
             if (!(element instanceof JSVarStatement) ||
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index c85cc50e..7f7e9c3a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -15,13 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention.loop;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -40,13 +41,13 @@ public class JSMergeParallelForInLoopsIntention extends JSIntention {
     @NonNls private static final String FOR_IN_COLLECTION_PREFIX = " in ";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeParallelForInLoopsPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final PsiElement  nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
@@ -79,7 +80,7 @@ private void mergeForInStatements(StringBuilder  statementBuffer,
 
     private static class MergeParallelForInLoopsPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSForInStatement) || ErrorUtil.containsError(element)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 8cb35c1c..07dc3a28 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -15,13 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention.loop;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -35,13 +36,13 @@ public class JSMergeParallelForLoopsIntention extends JSIntention {
     @NonNls private static final String FOR_STATEMENT_PREFIX = "for (";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeParallelForLoopsPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final PsiElement  nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
@@ -77,7 +78,7 @@ private void mergeForStatements(StringBuilder  statementBuffer,
 
     private static class MergeParallelForLoopsPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSForStatement) || ErrorUtil.containsError(element)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index b156fc43..d0e338e8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -15,11 +15,12 @@
  */
 package org.intellij.idea.lang.javascript.intention.number;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.psi.PsiElement;
@@ -28,13 +29,13 @@
 
 public class JSConvertIntegerToDecimalIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ConvertIntegerToDecimalPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSLiteralExpression exp = (JSLiteralExpression) element;
 
         JSElementFactory.replaceExpression(exp, NumberUtil.getLiteralNumber(exp).toString());
@@ -42,7 +43,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class ConvertIntegerToDecimalPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSLiteralExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index d16041a4..ca0cb824 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -15,11 +15,12 @@
  */
 package org.intellij.idea.lang.javascript.intention.number;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.psi.PsiElement;
@@ -27,13 +28,13 @@
 
 public class JSConvertIntegerToHexIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ConvertIntegerToHexPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSLiteralExpression exp = (JSLiteralExpression) element;
 
         JSElementFactory.replaceExpression(exp, "0x" + NumberUtil.getLiteralNumber(exp).toString(16));
@@ -41,7 +42,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class ConvertIntegerToHexPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSLiteralExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index b6f6a066..9a83716d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -19,7 +19,7 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.psi.PsiElement;
@@ -27,13 +27,13 @@
 
 public class JSConvertIntegerToOctalIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ConvertIntegerToOctalPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSLiteralExpression exp = (JSLiteralExpression) element;
 
         JSElementFactory.replaceExpression(exp, '0' + NumberUtil.getLiteralNumber(exp).toString(8));
@@ -41,7 +41,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class ConvertIntegerToOctalPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSLiteralExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index b3dec1b6..d3e56ee4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -15,12 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention.number;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
@@ -48,13 +49,13 @@ protected String getTextForElement(PsiElement element) {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MultiplyByPowerOfTwoPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element)
+	public void processIntention(@Nonnull PsiElement element)
             throws IncorrectOperationException {
         if (element instanceof JSAssignmentExpression) {
             this.replaceMultiplyOrDivideAssignWithShiftAssign((JSAssignmentExpression) element);
@@ -104,7 +105,7 @@ private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp)
 
     private static class MultiplyByPowerOfTwoPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (element instanceof JSAssignmentExpression) {
                 return isMultiplyByPowerOfTwo((JSAssignmentExpression) element);
             } else if (element instanceof JSBinaryExpression) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index ec277d3b..aa90f4af 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -15,12 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention.number;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
@@ -48,13 +49,13 @@ protected String getTextForElement(PsiElement element) {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ShiftByLiteralPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         if (element instanceof JSAssignmentExpression) {
             this.replaceShiftAssignWithMultiplyOrDivideAssign((JSAssignmentExpression) element);
         } else {
@@ -96,7 +97,7 @@ private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp)
 
     private static class ShiftByLiteralPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (element instanceof JSAssignmentExpression) {
                 return this.isAssignmentShiftByLiteral((JSAssignmentExpression) element);
             } else if (element instanceof JSBinaryExpression) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index 3d16d3ec..c7372c61 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -15,6 +15,8 @@
  */
 package org.intellij.idea.lang.javascript.intention.opassign;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -22,7 +24,6 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.SideEffectChecker;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
@@ -45,13 +46,13 @@ public String getTextForElement(PsiElement element) {
     }
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new Predicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSAssignmentExpression exp = (JSAssignmentExpression) element;
         final JSBinaryExpression     rhs = (JSBinaryExpression) exp.getROperand();
         final JSExpression           lhs = exp.getLOperand();
@@ -69,7 +70,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class Predicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSAssignmentExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 4306a26f..224fae3f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -15,12 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention.parenthesis;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
@@ -29,13 +30,13 @@
 
 public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new UnnecessaryParenthesesPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         JSExpression exp = (JSExpression) element;
 
         while (exp.getParent() instanceof JSExpression) {
@@ -50,7 +51,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class UnnecessaryParenthesesPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSParenthesizedExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index 9badb1bb..e37193a3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -15,10 +15,11 @@
  */
 package org.intellij.idea.lang.javascript.intention.string;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.psi.PsiElement;
@@ -26,13 +27,13 @@
 
 public class JSDoubleToSingleQuotedStringIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new DoubleToSingleQuotedStringPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSLiteralExpression stringLiteral = (JSLiteralExpression) element;
 
         JSElementFactory.replaceExpression(stringLiteral, changeQuotes(stringLiteral.getText()));
@@ -65,7 +66,7 @@ static String changeQuotes(String stringLiteral) {
     private static class DoubleToSingleQuotedStringPredicate implements JSElementPredicate {
 
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSLiteralExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 805a2309..afe4f5a1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -15,10 +15,11 @@
  */
 package org.intellij.idea.lang.javascript.intention.string;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -32,13 +33,13 @@
 
 public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new StringConcatPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element)
+	public void processIntention(@Nonnull PsiElement element)
             throws IncorrectOperationException {
         final JSBinaryExpression expression = (JSBinaryExpression) element;
         final JSExpression       lhs        = expression.getLOperand();
@@ -66,7 +67,7 @@ public void processIntention(@NotNull PsiElement element)
 
     private static class StringConcatPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSBinaryExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index 6f43fbc9..f652f17a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -15,10 +15,11 @@
  */
 package org.intellij.idea.lang.javascript.intention.string;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.psi.PsiElement;
@@ -26,13 +27,13 @@
 
 public class JSSingleToDoubleQuotedStringIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new SingleToDoubleQuotedStringPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSLiteralExpression charLiteral = (JSLiteralExpression) element;
 
         JSElementFactory.replaceExpression(charLiteral, changeQuotes(charLiteral.getText()));
@@ -64,7 +65,7 @@ static String changeQuotes(String charLiteral) {
 
     private static class SingleToDoubleQuotedStringPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSLiteralExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 73df89be..0b32bd76 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -29,7 +31,6 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
@@ -46,13 +47,13 @@ public class JSReplaceIfWithSwitchIntention extends JSIntention {
     @NonNls private static final String BREAK_STATEMENT                = "\nbreak;";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new IfToSwitchPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element)
+	public void processIntention(@Nonnull PsiElement element)
             throws IncorrectOperationException {
         JSIfStatement ifStatement = (JSIfStatement) element.getParent();
 
@@ -322,7 +323,7 @@ private static void appendElement(StringBuilder switchStatementString,
     private static class IfToSwitchPredicate implements JSElementPredicate {
 
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             final PsiElement parent = element.getParent();
             if (!(parent instanceof JSIfStatement)) {
                 return false;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index 1ece2404..1a939bea 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -29,7 +29,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.SideEffectChecker;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.psi.PsiElement;
@@ -49,13 +49,13 @@ public class JSReplaceSwitchWithIfIntention extends JSIntention {
     @NonNls private static final String DEFAULT_LABEL_NAME = "Label";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SwitchPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSSwitchStatement switchStatement = (JSSwitchStatement) element.getParent();
 
         assert (switchStatement != null);
@@ -333,7 +333,7 @@ private static void appendElement(StringBuilder ifStatementString,
 
     private static class SwitchPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             final PsiElement parent = element.getParent();
 
             if (!(parent instanceof JSSwitchStatement)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index 2fbf22e7..7cf282d9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -19,7 +19,7 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSElement;
@@ -30,13 +30,13 @@
 
 public class JSMergeElseIfIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeElseIfPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSIfStatement parentStatement = (JSIfStatement) element.getParent();
 
         assert (parentStatement != null);
@@ -49,7 +49,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class MergeElseIfPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSElement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index 74591694..320fb54c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -21,7 +21,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.psi.JSElement;
@@ -35,13 +35,13 @@ public class JSMergeIfAndIntention extends JSIntention {
     @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeIfAndPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         assert (element.getParent() != null);
         assert (element.getParent() instanceof JSIfStatement || element instanceof JSIfStatement);
 
@@ -61,7 +61,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
     private static class MergeIfAndPredicate implements JSElementPredicate {
 
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSElement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index 84238b2e..69a3205d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -15,6 +15,8 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -22,7 +24,6 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.psi.JSElement;
@@ -37,13 +38,13 @@ public class JSMergeIfOrIntention extends JSIntention {
     @NonNls private static final String ELSE_KEYWORD        = "else ";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeIfOrPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSElement);
         JSElement jsElement = (JSElement) element;
         if (MergeIfOrPredicate.isMergableExplicitIf(jsElement)) {
@@ -114,7 +115,7 @@ private static void replaceMergeableImplicitIf(JSElement token) throws Incorrect
 
     private static class MergeIfOrPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSElement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index 13495315..76c55a7a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -15,13 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -35,13 +36,13 @@ public class JSMergeParallelIfsIntention extends JSIntention {
     @NonNls private static final String ELSE_KEYWORD        = "else ";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeParallelIfsPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final PsiElement  nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
@@ -86,7 +87,7 @@ private void mergeIfStatements(StringBuilder statementBuffer,
 
     private static class MergeParallelIfsPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSIfStatement) || ErrorUtil.containsError(element)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index 419e45eb..5987ff47 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -19,7 +19,7 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.psi.JSBlockStatement;
@@ -33,13 +33,13 @@ public class JSRemoveRedundantElseIntention extends JSIntention {
     @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new RemoveRedundantElsePredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSIfStatement ifStatement = (JSIfStatement) element;
         final JSStatement   thenBranch  = ifStatement.getThen();
         final JSStatement   elseBranch  = ifStatement.getElse();
@@ -59,7 +59,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class RemoveRedundantElsePredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSIfStatement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index f0e080a8..8c529d86 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -15,6 +15,8 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -23,7 +25,6 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
@@ -44,13 +45,13 @@ public class JSReplaceIfWithConditionalIntention extends JSIntention {
     @NonNls private static final String RETURN_KEYWORD    = "return ";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ReplaceIfWithConditionalPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSIfStatement ifStatement = (JSIfStatement) (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         assert (ifStatement != null);
@@ -150,7 +151,7 @@ private static String getImplicitReturnReplacement(JSExpression condition, JSRet
 
     private static class ReplaceIfWithConditionalPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSElement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index ea4efa88..14c2090b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -15,11 +15,12 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -29,13 +30,13 @@
 
 public class JSSimplifyIfElseIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SimplifyIfElsePredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final PsiElement statement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         ConditionalUtils.replaceAssignmentOrReturnIfSimplifiable((JSIfStatement) statement);
@@ -43,7 +44,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class SimplifyIfElsePredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSElement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index a18df0e6..5e6eaab9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -15,11 +15,12 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NotNull;
 
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
@@ -28,13 +29,13 @@
 
 public class JSSplitElseIfIntention extends JSIntention {
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SplitElseIfPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final JSIfStatement parentStatement = (JSIfStatement) element.getParent();
 
         assert (parentStatement != null);
@@ -47,7 +48,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class SplitElseIfPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             final PsiElement parent = element.getParent();
 
             if (!(parent instanceof JSIfStatement)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index c7b3443b..deb78849 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -15,12 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.psi.PsiElement;
@@ -37,13 +38,13 @@ public class JSSplitIfAndIntention extends JSIntention {
     @NonNls private static final String ELSE_KEYWORD              = "else ";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SplitIfAndPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         assert (jsElement != null);
@@ -87,7 +88,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class SplitIfAndPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             PsiElement parent = element.getParent();
 
             if (!(parent instanceof JSIfStatement)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index d497b24b..1443e2cc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -15,12 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import javax.annotation.Nonnull;
+
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -37,13 +38,13 @@ public class JSSplitIfOrIntention extends JSIntention {
     @NonNls private static final String ELSE_KEYWORD             = "else ";
 
     @Override
-	@NotNull
+	@Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SplitIfOrPredicate();
     }
 
     @Override
-	public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         assert (jsElement != null);
@@ -82,7 +83,7 @@ public void processIntention(@NotNull PsiElement element) throws IncorrectOperat
 
     private static class SplitIfOrPredicate implements JSElementPredicate {
         @Override
-		public boolean satisfiedBy(@NotNull PsiElement element) {
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
             PsiElement parent = element.getParent();
 
             if (!(parent instanceof JSIfStatement)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
index 3d09a13e..ff2b0aed 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
@@ -15,8 +15,9 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
+import javax.annotation.Nullable;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
index 61d25da3..40c76aa2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
@@ -19,8 +19,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -174,8 +174,8 @@ public static boolean statementContainsReturn(@Nullable JSStatement statement) {
     }
 
     public static boolean statementCompletesWithStatement(
-            @NotNull JSStatement containingStatement,
-            @NotNull JSStatement statement) {
+            @Nonnull JSStatement containingStatement,
+            @Nonnull JSStatement statement) {
         JSElement statementToCheck = statement;
 
         while (true) {
@@ -202,8 +202,8 @@ public static boolean statementCompletesWithStatement(
     }
 
     private static boolean elementCompletesWithStatement(
-            @NotNull JSElement   element,
-            @NotNull JSStatement statement) {
+            @Nonnull JSElement   element,
+            @Nonnull JSStatement statement) {
         PsiElement statementToCheck = statement;
 
         while (true) {
@@ -236,19 +236,19 @@ private static boolean elementCompletesWithStatement(
     }
 
     public static boolean functionCompletesWithStatement(
-            @NotNull JSFunction  function,
-            @NotNull JSStatement statement) {
+            @Nonnull JSFunction  function,
+            @Nonnull JSStatement statement) {
         return elementCompletesWithStatement(function, statement);
     }
 
     public static boolean blockCompletesWithStatement(
-            @NotNull JSBlockStatement block,
-            @NotNull JSStatement      statement) {
+            @Nonnull JSBlockStatement block,
+            @Nonnull JSStatement      statement) {
         return elementCompletesWithStatement(block, statement);
     }
 
     private static boolean statementIsLastInBlock(
-            @NotNull JSBlockStatement block, @NotNull JSStatement statement) {
+            @Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
         final JSStatement[] statements = block.getStatements();
 
         //noinspection ForLoopWithMissingComponent
@@ -307,7 +307,7 @@ public static boolean canBeMerged(JSStatement statement1,
         return (!containsConflictingDeclarations(statement2Declarations, statement1));
     }
 
-    public static boolean isInLoopStatementBody(@NotNull PsiElement element) {
+    public static boolean isInLoopStatementBody(@Nonnull PsiElement element) {
         final JSLoopStatement forStatement = PsiTreeUtil.getParentOfType(element, JSLoopStatement.class);
 
         if (forStatement == null) {
@@ -319,7 +319,8 @@ public static boolean isInLoopStatementBody(@NotNull PsiElement element) {
         return (body != null && PsiTreeUtil.isAncestor(body, element, true));
     }
 
-    @NotNull public static List<JSCallExpression> getRecursiveCalls(@NotNull JSFunction function) {
+    @Nonnull
+	public static List<JSCallExpression> getRecursiveCalls(@Nonnull JSFunction function) {
         final RecursiveCallVisitor recursiveCallVisitor = new RecursiveCallVisitor(function);
 
         function.accept(recursiveCallVisitor);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
index 02695536..f552d3fa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
@@ -19,14 +19,14 @@
 import com.intellij.psi.PsiErrorElement;
 import com.intellij.psi.PsiRecursiveElementVisitor;
 import com.intellij.psi.util.PsiUtilBase;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 public class ErrorUtil {
     private ErrorUtil() {}
 
     private static final boolean fullTraversal = false;
 
-    public static boolean containsError(@NotNull PsiElement element) {
+    public static boolean containsError(@Nonnull PsiElement element) {
         // check only immediate children, full tree traversal is too expensive
         if (fullTraversal) {
             final ErrorElementVisitor visitor = new ErrorElementVisitor();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
index 286f0d8e..25598478 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
@@ -18,8 +18,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
@@ -39,7 +39,7 @@ public static boolean isConstantExpression(JSExpression expression) {
         return visitor.isConstant;
     }
 
-    public static boolean isIncrementDecrementExpression(@NotNull PsiElement expression) {
+    public static boolean isIncrementDecrementExpression(@Nonnull PsiElement expression) {
         if (expression instanceof JSPostfixExpression) {
             final IElementType operator = ((JSPostfixExpression) expression).getOperationSign();
             return (JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator));
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
index bde56a20..02e8280a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
@@ -24,8 +24,8 @@
 import com.intellij.psi.xml.XmlFile;
 import org.intellij.idea.lang.javascript.intention.JSElementIterator;
 import org.intellij.idea.lang.javascript.intention.JSFunctionVisitor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -34,7 +34,7 @@
 public class FindReferenceUtil {
     private FindReferenceUtil() {}
 
-    public static JSReferenceExpression[] findReferences(@NotNull JSVariable variable) {
+    public static JSReferenceExpression[] findReferences(@Nonnull JSVariable variable) {
         final JSReferenceVisitor visitor = new JSReferenceVisitor(variable, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
         JSElement                scope   = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
 
@@ -46,7 +46,7 @@ public static JSReferenceExpression[] findReferences(@NotNull JSVariable variabl
         return visitor.getReferences();
     }
 
-    public static <T extends PsiElement> T getFarthestAncestor(@NotNull PsiElement element, @NotNull Class<T> aClass) {
+    public static <T extends PsiElement> T getFarthestAncestor(@Nonnull PsiElement element, @Nonnull Class<T> aClass) {
         PsiElement previousElement = element;
         PsiElement currentElement;
 
@@ -70,7 +70,7 @@ private static final class JSReferenceVisitor extends JSFunctionVisitor {
         private final int                   maxTextOffset;
         private List<JSReferenceExpression> references;
 
-        public JSReferenceVisitor(@NotNull JSVariable variable, int maxCount, int minTextOffset, int maxTextOffset) {
+        public JSReferenceVisitor(@Nonnull JSVariable variable, int maxCount, int minTextOffset, int maxTextOffset) {
             this.variable      = variable;
             this.variableName  = variable.getName();
             this.maxCount      = maxCount;
@@ -114,24 +114,24 @@ public JSReferenceExpression getReference(int index) {
     }
 
 
-    public static Iterable<PsiElement> getReferences(@NotNull JSVariable variable) {
+    public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable) {
         return getReferences(variable, null, 0, Integer.MAX_VALUE);
     }
 
-    public static Iterable<PsiElement> getReferences(@NotNull JSVariable variable,
+    public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable,
                                                      @Nullable PsiElement scope) {
         return getReferences(variable, scope, 0, Integer.MAX_VALUE);
     }
 
-    public static Iterable<PsiElement> getReferencesBefore(@NotNull JSVariable variable, int textOffset) {
+    public static Iterable<PsiElement> getReferencesBefore(@Nonnull JSVariable variable, int textOffset) {
         return getReferences(variable, null, 0, textOffset);
     }
 
-    public static Iterable<PsiElement> getReferencesAfter(@NotNull JSVariable variable, int textOffset) {
+    public static Iterable<PsiElement> getReferencesAfter(@Nonnull JSVariable variable, int textOffset) {
         return getReferences(variable, null, textOffset, Integer.MAX_VALUE);
     }
 
-    private static Iterable<PsiElement> getReferences(@NotNull  final JSVariable variable,
+    private static Iterable<PsiElement> getReferences(@Nonnull  final JSVariable variable,
                                                       @Nullable final PsiElement scope,
                                                       final int minTextOffset, final int maxTextOffset) {
         final PsiElement iteratedScope;
@@ -156,9 +156,9 @@ public static final class JSReferenceIterator extends JSElementIterator {
         private final JSVariable            variable;
         private final String                variableName;
 
-        public JSReferenceIterator(@NotNull JSVariable variable,
+        public JSReferenceIterator(@Nonnull JSVariable variable,
                                    int minTextOffset, int maxTextOffset,
-                                   @NotNull PsiElement element) {
+                                   @Nonnull PsiElement element) {
             super(element, false, minTextOffset, maxTextOffset);
             this.variable     = variable;
             this.variableName = variable.getName();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
index bbed8911..ca6ee016 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
@@ -15,8 +15,9 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageParserDefinitions;
 import com.intellij.lang.ParserDefinition;
@@ -47,8 +48,8 @@ public class JSElementFactory {
 
     private JSElementFactory() {}
 
-    public static PsiElement addElementBefore(@NotNull PsiElement element,
-                                              @NotNull PsiElement newElement) {
+    public static PsiElement addElementBefore(@Nonnull PsiElement element,
+                                              @Nonnull PsiElement newElement) {
         final ASTNode     oldElementParentNode = element.getNode();
         final PsiElement  parentNode           = element.getParent();
         final ASTNode     newElementParentNode = parentNode.getNode();
@@ -61,8 +62,8 @@ public static PsiElement addElementBefore(@NotNull PsiElement element,
         return newElement;
     }
 
-    public static PsiElement addElementAfter(@NotNull PsiElement element,
-                                             @NotNull PsiElement newElement) {
+    public static PsiElement addElementAfter(@Nonnull PsiElement element,
+                                             @Nonnull PsiElement newElement) {
         final ASTNode     elementNode          = element.getNode();
         final ASTNode     oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
         final PsiElement  parentNode           = element.getParent();
@@ -77,16 +78,16 @@ public static PsiElement addElementAfter(@NotNull PsiElement element,
         return newElement;
     }
 
-    public static PsiElement addElementBefore(@NotNull PsiElement element,
-                                              @NonNls @NotNull String     elementText) {
+    public static PsiElement addElementBefore(@Nonnull PsiElement element,
+                                              @NonNls @Nonnull String     elementText) {
         final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
 
         assert (newElement != null);
         return addElementBefore(element, newElement);
     }
 
-    public static PsiElement addElementAfter(@NotNull PsiElement element,
-                                             @NotNull String     elementText) {
+    public static PsiElement addElementAfter(@Nonnull PsiElement element,
+                                             @Nonnull String     elementText) {
         final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
 
         assert (newElement != null);
@@ -100,7 +101,8 @@ public static ASTNode createElementFromText(Project project, String text) {
         return element.getNode();
     }
 
-    @NotNull private static PsiFile createDummyFile(Project project, String text) {
+    @Nonnull
+	private static PsiFile createDummyFile(Project project, String text) {
       final ParserDefinition  def            =
         LanguageParserDefinitions.INSTANCE.forLanguage(JavaScriptLanguage.INSTANCE);
 
@@ -109,8 +111,8 @@ public static ASTNode createElementFromText(Project project, String text) {
         .createFileFromText("dummy.js", text);
     }
 
-    public static JSStatement replaceElementWithStatement(@NotNull JSElement      element,
-                                                          @NonNls @NotNull String statementText)
+    public static JSStatement replaceElementWithStatement(@Nonnull JSElement      element,
+                                                          @NonNls @Nonnull String statementText)
         throws IncorrectOperationException {
         final ASTNode    newStatementNode       = JSChangeUtil.createStatementFromText(
           element.getProject(),
@@ -129,8 +131,8 @@ public static JSStatement replaceElementWithStatement(@NotNull JSElement      el
         return (JSStatement) newStatementNode.getPsi();
     }
 
-    public static JSExpression replaceExpression(@NotNull JSExpression   expression,
-                                                 @NonNls @NotNull String text)
+    public static JSExpression replaceExpression(@Nonnull JSExpression   expression,
+                                                 @NonNls @Nonnull String text)
             throws IncorrectOperationException {
         final JSExpression newExpressionNode = JSChangeUtil.createExpressionFromText(
           expression.getProject(),
@@ -139,8 +141,8 @@ public static JSExpression replaceExpression(@NotNull JSExpression   expression,
         return replaceExpression(expression, newExpressionNode);
     }
 
-    public static JSExpression replaceExpression(@NotNull JSExpression expression,
-                                                 @NotNull JSExpression newExpression)
+    public static JSExpression replaceExpression(@Nonnull JSExpression expression,
+                                                 @Nonnull JSExpression newExpression)
         throws IncorrectOperationException {
         final ASTNode    newExpressionNode = newExpression.getNode();
         final ASTNode    oldExpressionNode = expression.getNode();
@@ -157,8 +159,8 @@ public static JSExpression replaceExpression(@NotNull JSExpression expression,
         return (JSExpression) newExpressionNode.getPsi();
     }
 
-    public static JSStatement replaceStatement(@NotNull JSStatement    statement,
-                                               @NonNls @NotNull String text)
+    public static JSStatement replaceStatement(@Nonnull JSStatement    statement,
+                                               @NonNls @Nonnull String text)
         throws IncorrectOperationException {
         final ASTNode    newStatementNode       = JSChangeUtil.createStatementFromText(
           statement.getProject(),
@@ -178,8 +180,8 @@ public static JSStatement replaceStatement(@NotNull JSStatement    statement,
         return (JSStatement) newStatementNode.getPsi();
     }
 
-    public static JSStatement addStatementBefore(@NotNull JSStatement    statement,
-                                                 @NonNls @NotNull String previousStatementText)
+    public static JSStatement addStatementBefore(@Nonnull JSStatement    statement,
+                                                 @NonNls @Nonnull String previousStatementText)
         throws IncorrectOperationException {
         final ASTNode    newStatementNode       = JSChangeUtil.createStatementFromText(
           statement.getProject(),
@@ -198,8 +200,8 @@ public static JSStatement addStatementBefore(@NotNull JSStatement    statement,
         return (JSStatement) newStatementNode.getPsi();
     }
 
-    public static JSStatement addStatementAfter(@NotNull JSStatement    statement,
-                                                @NonNls @NotNull String nextStatementText)
+    public static JSStatement addStatementAfter(@Nonnull JSStatement    statement,
+                                                @NonNls @Nonnull String nextStatementText)
             throws IncorrectOperationException {
         final ASTNode     newStatementNode       = JSChangeUtil.createStatementFromText(
           statement.getProject(),
@@ -244,8 +246,8 @@ public static void addRangeAfter(JSStatement[] statements, int start, int length
         }
     }
 
-    public static void replaceExpressionWithNegatedExpression(@NotNull JSExpression newExpression,
-                                                              @NotNull JSExpression exp)
+    public static void replaceExpressionWithNegatedExpression(@Nonnull JSExpression newExpression,
+                                                              @Nonnull JSExpression exp)
         throws IncorrectOperationException {
         JSExpression expressionToReplace = BoolUtils.findNegation(exp);
         final String replacementString;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
index 5560794f..f9769563 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
@@ -15,7 +15,7 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSArgumentList;
@@ -239,7 +239,7 @@ private static boolean blockStatementMayReturnBeforeRecursing(
         return endsInImplicitReturn;
     }
 
-    public static boolean functionMayRecurse(@NotNull JSFunction function) {
+    public static boolean functionMayRecurse(@Nonnull JSFunction function) {
         final JSRecursionVisitor recursionVisitor = new JSRecursionVisitor(function);
 
         if (recursionVisitor.isFunctionNamed()) {
@@ -596,7 +596,7 @@ private static boolean labeledStatementDefinitelyRecurses(
     }
 
     public static boolean functionDefinitelyRecurses(
-            @NotNull JSFunction method) {
+            @Nonnull JSFunction method) {
         final JSSourceElement[] body = method.getBody();
 
         if (body != null) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
index 5d175d69..02cfacd5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
@@ -15,8 +15,8 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.psi.PsiElement;
@@ -66,7 +66,7 @@ private static PsiElement getLastLeaf(PsiElement element) {
 
     @Nullable
     public static <ParentType extends PsiElement> ParentType getParentOfType(@Nullable PsiElement        element,
-                                                                             @NotNull  Class<ParentType> aClass) {
+                                                                             @Nonnull Class<ParentType> aClass) {
         return getParentOfType(element, aClass, true);
     }
 
@@ -89,7 +89,7 @@ public static <ParentType extends PsiElement> ParentType getParentOfType(PsiElem
 
     @Nullable
     public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(@Nullable PsiElement         element,
-                                                                               @NotNull  Class<ParentType> aClass) {
+                                                                               @Nonnull Class<ParentType> aClass) {
         return getPrevLeafOfType(element, aClass, true);
     }
 
@@ -112,7 +112,7 @@ public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(PsiEl
 
     @Nullable
     public static <ParentType extends PsiElement> ParentType getNextLeafOfType(@Nullable PsiElement         element,
-                                                                               @NotNull  Class<ParentType> aClass) {
+                                                                               @Nonnull Class<ParentType> aClass) {
         return getNextLeafOfType(element, aClass, true);
     }
 
@@ -133,8 +133,8 @@ public static <ParentType extends PsiElement> ParentType getNextLeafOfType(PsiEl
         return (ParentType) element;
     }
 
-    public static boolean isAncestor(@NotNull JSElement ancestor,
-                                     @NotNull JSElement element,
+    public static boolean isAncestor(@Nonnull JSElement ancestor,
+                                     @Nonnull JSElement element,
                                      boolean            strict) {
         PsiElement parent = (strict ? element.getParent() : element);
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
index 0ac11955..19afb4d4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
@@ -20,7 +20,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.containers.ArrayListSet;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -151,9 +151,9 @@ private static class VariableAssignedVisitor extends JSRecursiveElementVisitor {
         private final Set<JSVariable> candidateSymbols;
         private       boolean         assigned;
 
-        public VariableAssignedVisitor(@NotNull JSVariable      variable,
-                                       @NotNull JSElement       context,
-                                       @NotNull Set<JSVariable> notUpdatedSymbols) {
+        public VariableAssignedVisitor(@Nonnull JSVariable      variable,
+                                       @Nonnull JSElement       context,
+                                       @Nonnull Set<JSVariable> notUpdatedSymbols) {
             this.variable          = variable;
             this.context           = context;
             this.notUpdatedSymbols = notUpdatedSymbols;
@@ -162,10 +162,10 @@ public VariableAssignedVisitor(@NotNull JSVariable      variable,
             this.candidateSymbols.add(variable);
         }
 
-        private VariableAssignedVisitor(@NotNull JSVariable      variable,
-                                        @NotNull JSElement       context,
-                                        @NotNull Set<JSVariable> notUpdatedSymbols,
-                                        @NotNull Set<JSVariable> candidateSymbols) {
+        private VariableAssignedVisitor(@Nonnull JSVariable      variable,
+                                        @Nonnull JSElement       context,
+                                        @Nonnull Set<JSVariable> notUpdatedSymbols,
+                                        @Nonnull Set<JSVariable> candidateSymbols) {
             this.variable          = variable;
             this.context           = context;
             this.notUpdatedSymbols = notUpdatedSymbols;
@@ -252,17 +252,17 @@ private static class VariableAssignedFromVisitor extends JSRecursiveElementVisit
         private final JSVariable variable;
         private       boolean    assignedFrom;
 
-        public VariableAssignedFromVisitor(@NotNull JSVariable variable) {
+        public VariableAssignedFromVisitor(@Nonnull JSVariable variable) {
             this.variable = variable;
         }
 
-        @Override public void visitJSElement(@NotNull JSElement element) {
+        @Override public void visitJSElement(@Nonnull JSElement element) {
             if (!this.assignedFrom) {
                 super.visitJSElement(element);
             }
         }
 
-        @Override public void visitJSAssignmentExpression(@NotNull JSAssignmentExpression assignment) {
+        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
             if (!this.assignedFrom) {
                 super.visitJSAssignmentExpression(assignment);
 
@@ -270,7 +270,7 @@ public VariableAssignedFromVisitor(@NotNull JSVariable variable) {
             }
         }
 
-        @Override public void visitJSVarStatement(@NotNull JSVarStatement statement) {
+        @Override public void visitJSVarStatement(@Nonnull JSVarStatement statement) {
             if (!this.assignedFrom) {
                 super.visitJSVarStatement(statement);
 
@@ -297,14 +297,15 @@ public boolean isAssignedFrom() {
     }
 
     private static class VariableReturnedVisitor extends JSRecursiveElementVisitor {
-        @NotNull private final JSVariable variable;
+        @Nonnull
+		private final JSVariable variable;
         private                boolean    returned;
 
-        public VariableReturnedVisitor(@NotNull JSVariable variable) {
+        public VariableReturnedVisitor(@Nonnull JSVariable variable) {
             this.variable = variable;
         }
 
-        @Override public void visitJSReturnStatement(@NotNull JSReturnStatement returnStatement){
+        @Override public void visitJSReturnStatement(@Nonnull JSReturnStatement returnStatement){
             if (!this.returned) {
                 super.visitJSReturnStatement(returnStatement);
                 this.returned = VariableAccessUtil.mayEvaluateToVariable(returnStatement.getExpression(), this.variable);
@@ -320,18 +321,18 @@ private static class ArrayContentsAccessedVisitor extends JSRecursiveElementVisi
         private final JSVariable variable;
         private       boolean    accessed;
 
-        public ArrayContentsAccessedVisitor(@NotNull JSVariable variable) {
+        public ArrayContentsAccessedVisitor(@Nonnull JSVariable variable) {
             this.variable = variable;
         }
 
-        @Override public void visitJSForInStatement(@NotNull JSForInStatement statement) {
+        @Override public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
             if (!this.accessed) {
                 super.visitJSForInStatement(statement);
                 this.checkQualifier(statement.getCollectionExpression());
             }
         }
 
-        @Override public void visitJSIndexedPropertyAccessExpression(@NotNull JSIndexedPropertyAccessExpression accessExpression) {
+        @Override public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAccessExpression accessExpression) {
             if (!this.accessed) {
                 super.visitJSIndexedPropertyAccessExpression(accessExpression);
 
@@ -361,25 +362,25 @@ private static class ArrayContentsAssignedVisitor extends JSRecursiveElementVisi
         private final JSVariable  variable;
         private       boolean     assigned;
 
-        public ArrayContentsAssignedVisitor(@NotNull JSVariable variable) {
+        public ArrayContentsAssignedVisitor(@Nonnull JSVariable variable) {
             this.variable = variable;
         }
 
-        @Override public void visitJSAssignmentExpression(@NotNull JSAssignmentExpression assignment) {
+        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
             if (!this.assigned) {
                 super.visitJSAssignmentExpression(assignment);
                 this.checkExpression(null, assignment.getLOperand());
             }
         }
 
-        @Override public void visitJSPrefixExpression(@NotNull JSPrefixExpression expression) {
+        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             if (!this.assigned) {
                 super.visitJSPrefixExpression(expression);
                 this.checkExpression(expression.getOperationSign(), expression.getExpression());
             }
         }
 
-        @Override public void visitJSPostfixExpression(@NotNull JSPostfixExpression expression) {
+        @Override public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
             if (!this.assigned) {
                 super.visitJSPostfixExpression(expression);
                 this.checkExpression(expression.getOperationSign(), expression.getExpression());
@@ -420,13 +421,14 @@ public boolean isAssigned() {
 
     private static class UsedVariableVisitor extends JSRecursiveElementVisitor {
 
-        @NotNull private final Set<JSVariable> variables;
+        @Nonnull
+		private final Set<JSVariable> variables;
 
         public UsedVariableVisitor() {
             this.variables = new HashSet<JSVariable>();
         }
 
-        @Override public void visitJSReferenceExpression(@NotNull JSReferenceExpression ref) {
+        @Override public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
             super.visitJSReferenceExpression(ref);
 
             final PsiElement referent = ref.resolve();
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
index 6a861f59..d8939cbd 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
@@ -16,10 +16,10 @@
 
 package consulo.actionscript;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import consulo.actionscript.lang.ActionScriptLanguageVersion;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
@@ -42,21 +42,21 @@ private ActionScriptFileType()
 		super(JavaScriptLanguage.INSTANCE);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getName()
 	{
 		return "ACTIONSCRIPT";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getDescription()
 	{
 		return "ActionScript files";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getDefaultExtension()
 	{
@@ -70,7 +70,7 @@ public Icon getIcon()
 		return JavaScriptIcons.As;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
index 1575d177..7e34b0da 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
@@ -1,6 +1,7 @@
 package consulo.actionscript;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
 
@@ -11,7 +12,7 @@
 public class ActionScriptFileTypeFactory extends FileTypeFactory
 {
 	@Override
-	public void createFileTypes(@NotNull FileTypeConsumer consumer)
+	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
 	{
 		consumer.consume(ActionScriptFileType.INSTANCE);
 	}
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
index 35445a90..fbe6ee82 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
@@ -1,6 +1,7 @@
 package consulo.actionscript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
@@ -16,7 +17,7 @@
  */
 public class ActionScriptLanguageVersion extends BaseJavaScriptLanguageVersion
 {
-	@NotNull
+	@Nonnull
 	public static ActionScriptLanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(ActionScriptLanguageVersion.class);
@@ -29,28 +30,28 @@ public ActionScriptLanguageVersion()
 		super("ACTIONSCRIPT");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableName()
 	{
 		return "ActionScript";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public PsiParser createParser()
 	{
 		return new EcmaScript4Parser();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public JSHighlighter getSyntaxHighlighter()
 	{
 		return new JSHighlighter(myDialectOptionHolder);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer createLexer()
 	{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
index bc192b8c..11c43581 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
@@ -1,6 +1,7 @@
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.javascript.lang.parsing.EcmaScript4Parser;
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.DialectOptionHolder;
@@ -25,21 +26,21 @@ public EcmaScript4JavaScriptVersion()
 		addFeature(JavaScriptFeature.CLASS);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public PsiParser createParser()
 	{
 		return new EcmaScript4Parser();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public JSHighlighter getSyntaxHighlighter()
 	{
 		return new JSHighlighter(myDialectOptionHolder);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer createLexer()
 	{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4Parser.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4Parser.java
index df21281f..1d004320 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4Parser.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4Parser.java
@@ -1,6 +1,6 @@
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -8,7 +8,7 @@
  */
 public class EcmaScript4Parser extends JavaScriptParser
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptParsingContext createParsingContext()
 	{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
index c1919002..c80388a7 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
@@ -1,6 +1,6 @@
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -8,21 +8,21 @@
  */
 public class EcmaScript4ParsingContext extends JavaScriptParsingContext
 {
-	@NotNull
+	@Nonnull
 	@Override
 	protected StatementParsing createStatementParsing()
 	{
 		return new EcmaScript4StatementParsing(this);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	protected FunctionParsing createFunctionParsing()
 	{
 		return new EcmaScript4FunctionParsing(this);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	protected ExpressionParsing createExpressionParsing()
 	{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
index 5b234861..ce986354 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
@@ -1,6 +1,6 @@
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -390,7 +390,7 @@ private void parseImportStatement(final PsiBuilder builder)
 		}
 	}
 
-	private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @NotNull PsiBuilder.Marker useNSStatement)
+	private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker useNSStatement)
 	{
 		EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NAMESPACE_KEYWORD);
 
@@ -452,7 +452,7 @@ private void parseClass(final PsiBuilder builder)
 		parseClassNoMarker(builder, builder.mark());
 	}
 
-	private void parseClassNoMarker(final PsiBuilder builder, final @NotNull PsiBuilder.Marker clazz)
+	private void parseClassNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz)
 	{
 		final IElementType tokenType = builder.getTokenType();
 		EcmaScript4StatementParsing.LOGGER.assertTrue(JSTokenTypes.CLASS_KEYWORD == tokenType || JSTokenTypes.INTERFACE_KEYWORD == tokenType);
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 917a407c..8ad9902d 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.PsiParser;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
@@ -40,7 +41,7 @@ public Lexer create()
 		}
 	};
 
-	@NotNull
+	@Nonnull
 	public static EcmaScript6JavaScriptVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript6JavaScriptVersion.class);
@@ -58,27 +59,27 @@ public EcmaScript6JavaScriptVersion()
 		addFeature(JavaScriptFeature.SPREAD_OPERATOR);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableName()
 	{
 		return "ECMAScript 6";
 	}
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter()
 	{
 		return new JavaScriptHighlighter(ourLexerFactory);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public PsiParser createParser()
 	{
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
index 746af855..d414455c 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
@@ -18,8 +18,8 @@
 
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.lang.LanguageVersion;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
@@ -39,21 +39,21 @@ private EcmaScriptFileType()
 		super(JavaScriptLanguage.INSTANCE);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getName()
 	{
 		return "ECMASCRIPT";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getDescription()
 	{
 		return "ECMAScript files";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getDefaultExtension()
 	{
@@ -67,7 +67,7 @@ public Icon getIcon()
 		return JavaScriptIcons.EcmaScript;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
index 1eea5a23..de37debd 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
@@ -1,6 +1,6 @@
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
 
@@ -11,7 +11,7 @@
 public class EcmaScriptFileTypeFactory extends FileTypeFactory
 {
 	@Override
-	public void createFileTypes(@NotNull FileTypeConsumer consumer)
+	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
 	{
 		consumer.consume(EcmaScriptFileType.INSTANCE, "es;js2");
 	}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
index d73134ce..99f1cbf2 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.PsiBuilder;
 
 /**
@@ -25,14 +26,14 @@
  */
 public class EcmaScript6Parser extends JavaScriptParser
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptParsingContext createParsingContext()
 	{
 		return new EcmaScript6ParsingContext();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public JavaScriptParserBuilder createBuilder(PsiBuilder builder)
 	{
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
index 59a9174b..a43049bb 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -24,14 +24,14 @@
  */
 public class EcmaScript6ParsingContext extends JavaScriptParsingContext
 {
-	@NotNull
+	@Nonnull
 	@Override
 	protected StatementParsing createStatementParsing()
 	{
 		return new EcmaScript6StatementParsing(this);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	protected ExpressionParsing createExpressionParsing()
 	{
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index 20661142..f0ea32ed 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.lang.parsing;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -95,7 +96,7 @@ private void parseClass(final PsiBuilder builder)
 		parseClassNoMarker(builder, builder.mark());
 	}
 
-	private void parseClassNoMarker(final PsiBuilder builder, final @NotNull PsiBuilder.Marker clazz)
+	private void parseClassNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz)
 	{
 		builder.advanceLexer();
 		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java
index e2fb58fc..b3f42cf7 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
@@ -38,7 +39,7 @@ public Lexer create()
 		}
 	};
 
-	@NotNull
+	@Nonnull
 	public static JavaScript16LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript16LanguageVersion.class);
@@ -49,21 +50,21 @@ public JavaScript16LanguageVersion()
 		super("JAVASCRIPT_1_6");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableName()
 	{
 		return "JavaScript 1.6";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter()
 	{
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/JavaScript17LanguageVersion.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/JavaScript17LanguageVersion.java
index b2b1098c..7ae05c65 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/JavaScript17LanguageVersion.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/JavaScript17LanguageVersion.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
@@ -38,7 +38,7 @@ public Lexer create()
 		}
 	};
 
-	@NotNull
+	@Nonnull
 	public static JavaScript17LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript17LanguageVersion.class);
@@ -49,21 +49,21 @@ public JavaScript17LanguageVersion()
 		super("JAVASCRIPT_1_7");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableName()
 	{
 		return "JavaScript 1.7";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter()
 	{
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript185LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript185LanguageVersion.java
index 8648bcfe..6640b24d 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript185LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript185LanguageVersion.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
@@ -38,7 +39,7 @@ public Lexer create()
 		}
 	};
 
-	@NotNull
+	@Nonnull
 	public static JavaScript185LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript185LanguageVersion.class);
@@ -49,21 +50,21 @@ public JavaScript185LanguageVersion()
 		super("JAVASCRIPT_1_8_5");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableName()
 	{
 		return "JavaScript 1.8.5";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter()
 	{
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript18LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript18LanguageVersion.java
index 84cabaa7..ad4ec0fc 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript18LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript18LanguageVersion.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
@@ -38,7 +39,7 @@ public Lexer create()
 		}
 	};
 
-	@NotNull
+	@Nonnull
 	public static JavaScript18LanguageVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript18LanguageVersion.class);
@@ -49,21 +50,21 @@ public JavaScript18LanguageVersion()
 		super("JAVASCRIPT_1_8");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableName()
 	{
 		return "JavaScript 1.8";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter()
 	{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
index 2a7c47dc..c78fbb35 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
@@ -16,10 +16,10 @@
 
 package consulo.json;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
@@ -41,21 +41,21 @@ private JsonFileType()
 		super(JavaScriptLanguage.INSTANCE);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getName()
 	{
 		return "JSON";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getDescription()
 	{
 		return "Json files";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getDefaultExtension()
 	{
@@ -69,7 +69,7 @@ public Icon getIcon()
 		return JavaScriptIcons.Json;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public JsonJavaScriptVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
index d6f51c66..a4ef24d9 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
@@ -1,6 +1,6 @@
 package consulo.json;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
 
@@ -11,7 +11,7 @@
 public class JsonFileTypeFactory extends FileTypeFactory
 {
 	@Override
-	public void createFileTypes(@NotNull FileTypeConsumer consumer)
+	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
 	{
 		consumer.consume(JsonFileType.INSTANCE);
 	}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
index 9d989239..31b963cb 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
@@ -16,9 +16,9 @@
 
 package consulo.json.jom;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.PsiFile;
 
@@ -32,19 +32,19 @@ public abstract class JomFileDescriptor<T extends JomElement>
 
 	private Class<T> myDefinitionClass;
 
-	public JomFileDescriptor(@NotNull Class<T> definitionClass)
+	public JomFileDescriptor(@Nonnull Class<T> definitionClass)
 	{
 		myDefinitionClass = definitionClass;
 	}
 
-	@NotNull
+	@Nonnull
 	public Class<T> getDefinitionClass()
 	{
 		return myDefinitionClass;
 	}
 
-	@NotNull
+	@Nonnull
 	public abstract Icon getIcon();
 
-	public abstract boolean isMyFile(@NotNull PsiFile psiFile);
+	public abstract boolean isMyFile(@Nonnull PsiFile psiFile);
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
index 80e59d47..bf4b07bb 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
@@ -16,7 +16,7 @@
 
 package consulo.json.jom;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import consulo.json.jom.proxy.JomProxyInvocationHandler;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
@@ -33,7 +33,7 @@ public class JomFileElement<T extends JomElement>
 	private final JSFile myPsiFile;
 	private final NotNullLazyValue<T> myRootValue = new NotNullLazyValue<T>()
 	{
-		@NotNull
+		@Nonnull
 		@Override
 		protected T compute()
 		{
@@ -48,19 +48,19 @@ public JomFileElement(JSFile psiFile, JomFileDescriptor<T> fileDescriptor)
 		myFileDescriptor = fileDescriptor;
 	}
 
-	@NotNull
+	@Nonnull
 	public T getRootElement()
 	{
 		return myRootValue.getValue();
 	}
 
-	@NotNull
+	@Nonnull
 	public JomFileDescriptor<T> getFileDescriptor()
 	{
 		return myFileDescriptor;
 	}
 
-	@NotNull
+	@Nonnull
 	public JSFile getFile()
 	{
 		return myPsiFile;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
index 46ed8225..4583b759 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -16,7 +16,7 @@
 
 package consulo.json.jom;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import consulo.annotations.RequiredReadAction;
@@ -31,7 +31,7 @@ public class JomIconDescriptorUpdater implements IconDescriptorUpdater
 {
 	@RequiredReadAction
 	@Override
-	public void updateIcon(@NotNull IconDescriptor iconDescriptor, @NotNull PsiElement element, int flags)
+	public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiElement element, int flags)
 	{
 		if(element instanceof PsiFile)
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index 76299c2a..b48f2fa3 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -16,8 +16,8 @@
 
 package consulo.json.jom;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.fileTypes.FileType;
@@ -37,8 +37,8 @@
  */
 public class JomManager
 {
-	@NotNull
-	public static JomManager getInstance(@NotNull Project project)
+	@Nonnull
+	public static JomManager getInstance(@Nonnull Project project)
 	{
 		return ServiceManager.getService(project, JomManager.class);
 	}
@@ -55,7 +55,7 @@ public JomManager(Project project)
 	@Nullable
 	@RequiredReadAction
 	@SuppressWarnings("unchecked")
-	public <T extends JomElement> JomFileElement<T> getFileElement(@NotNull final PsiFile psiFile)
+	public <T extends JomElement> JomFileElement<T> getFileElement(@Nonnull final PsiFile psiFile)
 	{
 		FileType fileType = psiFile.getFileType();
 		if(fileType != JsonFileType.INSTANCE)
@@ -89,7 +89,7 @@ public Result<JomFileElement<?>> compute()
 	}
 
 	@Nullable
-	private static JomFileDescriptor findFileDescriptor(@NotNull PsiFile psiFile)
+	private static JomFileDescriptor findFileDescriptor(@Nonnull PsiFile psiFile)
 	{
 		JomFileDescriptor jomFileDescriptor = null;
 		for(JomFileDescriptor temp : JomFileDescriptor.EP_NAME.getExtensions())
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
index 2a4e4c77..c53999df 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
@@ -26,8 +26,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.json.validation.JsonFileDescriptorProvider;
 import consulo.json.validation.NativeArray;
@@ -44,14 +45,14 @@ public class JomModeAsJsonFileDescriptorProvider implements JsonFileDescriptorPr
 {
 	@RequiredReadAction
 	@Override
-	public boolean isMyFile(@NotNull PsiFile file)
+	public boolean isMyFile(@Nonnull PsiFile file)
 	{
 		return JomManager.getInstance(file.getProject()).getFileElement(file) != null;
 	}
 
 	@RequiredReadAction
 	@Override
-	public void fillRootObject(@NotNull JsonObjectDescriptor root, @NotNull PsiFile file)
+	public void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file)
 	{
 		JomFileElement<JomElement> fileElement = JomManager.getInstance(file.getProject()).getFileElement(file);
 		if(fileElement == null)
@@ -84,8 +85,8 @@ private static void fillDescriptor(JsonObjectDescriptor objectDescriptor, Class<
 		}
 	}
 
-	@NotNull
-	private static JsonPropertyDescriptor fillObjectDescriptor(JsonObjectDescriptor objectDescriptor, @NotNull Class<?> classType, @NotNull Type genericType, @Nullable String propertyName)
+	@Nonnull
+	private static JsonPropertyDescriptor fillObjectDescriptor(JsonObjectDescriptor objectDescriptor, @Nonnull Class<?> classType, @Nonnull Type genericType, @Nullable String propertyName)
 	{
 		if(classType.isArray())
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
index d50b97b5..0bfffa1b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
@@ -2,8 +2,9 @@
 
 import java.lang.reflect.Method;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ObjectUtil;
 
@@ -14,7 +15,7 @@
 public class JomUtil
 {
 	@Nullable
-	public static String getJsonGetPropertyName(@NotNull Method method)
+	public static String getJsonGetPropertyName(@Nonnull Method method)
 	{
 		JomPropertyGetter annotation = method.getAnnotation(JomPropertyGetter.class);
 		if(annotation == null)
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
index 553e7d3f..e274ff81 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
@@ -4,8 +4,8 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import consulo.json.jom.JomElement;
 import consulo.json.jom.JomUtil;
@@ -19,8 +19,8 @@
  */
 public class JomProxyInvocationHandler implements InvocationHandler
 {
-	@NotNull
-	public static JomElement createProxy(@NotNull Class<?> interfaceClass, @Nullable final JSObjectLiteralExpression objectLiteralExpression)
+	@Nonnull
+	public static JomElement createProxy(@Nonnull Class<?> interfaceClass, @Nullable final JSObjectLiteralExpression objectLiteralExpression)
 	{
 		return (JomElement) Proxy.newProxyInstance(interfaceClass.getClassLoader(), new Class[]{interfaceClass}, new JomProxyInvocationHandler(objectLiteralExpression));
 	}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
index 07d8b5e2..ec709061 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
@@ -9,8 +9,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.json.jom.JomElement;
 import consulo.json.jom.proxy.impl.JomBooleanValue;
@@ -36,7 +37,7 @@ public interface Converter<T>
 		T getDefaultValue();
 
 		@RequiredReadAction
-		T parseValue(@NotNull Class type, @NotNull Type genericType, @NotNull PsiElement value) throws JomBadValueExpressionException;
+		T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException;
 	}
 
 	private static Map<Class, Converter> ourDefaultConverters = new HashMap<Class, Converter>();
@@ -72,7 +73,7 @@ public interface Converter<T>
 
 	@RequiredReadAction
 	@SuppressWarnings("unchecked")
-	public static Object convertToObject(@NotNull Class type, @NotNull Type genericType, @Nullable JSExpression value) throws JomBadValueExpressionException
+	public static Object convertToObject(@Nonnull Class type, @Nonnull Type genericType, @Nullable JSExpression value) throws JomBadValueExpressionException
 	{
 		if(value == null)
 		{
@@ -120,7 +121,7 @@ public static Object convertToObject(@NotNull Class type, @NotNull Type genericT
 	}
 
 	@Nullable
-	public static Object getDefaultValueForType(@NotNull Class type)
+	public static Object getDefaultValueForType(@Nonnull Class type)
 	{
 		JomValueConverter.Converter converter = JomValueConverter.ourDefaultConverters.get(type);
 		if(converter != null)
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
index 44b4b9cc..45f8fa90 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
@@ -2,8 +2,8 @@
 
 import java.lang.reflect.Type;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
@@ -34,7 +34,7 @@ public Boolean getDefaultValue()
 
 	@RequiredReadAction
 	@Override
-	public Boolean parseValue(@NotNull Class type, @NotNull Type genericType, @NotNull PsiElement value) throws JomBadValueExpressionException
+	public Boolean parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
 	{
 		if(value instanceof JSLiteralExpression)
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
index 1c994cfd..45839e14 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
@@ -4,7 +4,8 @@
 import java.lang.reflect.Type;
 import java.util.Collection;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
@@ -36,7 +37,7 @@ public T getDefaultValue()
 	@RequiredReadAction
 	@Override
 	@SuppressWarnings("unchecked")
-	public T parseValue(@NotNull Class type, @NotNull Type genericType, @NotNull PsiElement value) throws JomBadValueExpressionException
+	public T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
 	{
 		if(value instanceof JSArrayLiteralExpression)
 		{
@@ -63,7 +64,7 @@ public T parseValue(@NotNull Class type, @NotNull Type genericType, @NotNull Psi
 	}
 
 
-	public static Pair<Class, Type> findValueTypeInsideGeneric(@NotNull Type genericType, int index)
+	public static Pair<Class, Type> findValueTypeInsideGeneric(@Nonnull Type genericType, int index)
 	{
 		if(!(genericType instanceof ParameterizedType))
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
index 8f598199..4d3ea50e 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
@@ -5,7 +5,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import consulo.annotations.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
@@ -29,7 +29,7 @@ public Map getDefaultValue()
 	@RequiredReadAction
 	@Override
 	@SuppressWarnings("unchecked")
-	public Map parseValue(@NotNull Class type, @NotNull Type genericType, @NotNull PsiElement value) throws JomBadValueExpressionException
+	public Map parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
 	{
 		if(!(value instanceof JSObjectLiteralExpression))
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
index 0406df8a..18f097a9 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
@@ -3,7 +3,8 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
@@ -26,7 +27,7 @@ public class JomNullableNumberValue<T> implements JomValueConverter.Converter<T>
 
 	protected NotNullLazyValue<Method> myParseMethodValue = new NotNullLazyValue<Method>()
 	{
-		@NotNull
+		@Nonnull
 		@Override
 		@SuppressWarnings("unchecked")
 		protected Method compute()
@@ -53,7 +54,7 @@ public T getDefaultValue()
 	@RequiredReadAction
 	@Override
 	@SuppressWarnings("unchecked")
-	public T parseValue(@NotNull Class type, @NotNull Type genericType, @NotNull PsiElement value) throws JomBadValueExpressionException
+	public T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
 	{
 		if(value instanceof JSLiteralExpression)
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
index 020295c0..1c53bc75 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
@@ -2,7 +2,8 @@
 
 import java.lang.reflect.Type;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
@@ -26,7 +27,7 @@ public String getDefaultValue()
 
 	@RequiredReadAction
 	@Override
-	public String parseValue(@NotNull Class type, @NotNull Type genericType, @NotNull PsiElement value) throws JomBadValueExpressionException
+	public String parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
 	{
 		if(value instanceof JSSimpleLiteralExpression)
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index 84f4a4ac..b9ebe611 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -1,6 +1,6 @@
 package consulo.json.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiParser;
@@ -24,9 +24,9 @@ public class JsonJavaScriptParser implements PsiParser
 
 	private int myPropertyDepth;
 
-	@NotNull
+	@Nonnull
 	@Override
-	public ASTNode parse(@NotNull IElementType root, @NotNull PsiBuilder builder, @NotNull LanguageVersion languageVersion)
+	public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder builder, @Nonnull LanguageVersion languageVersion)
 	{
 		final PsiBuilder.Marker rootMarker = builder.mark();
 		parseRoot(builder);
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
index a72eb5b3..4a0061f3 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
@@ -1,7 +1,7 @@
 package consulo.json.lang;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.PsiParser;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.FileType;
@@ -21,7 +21,7 @@ public class JsonJavaScriptVersion extends BaseJavaScriptLanguageVersion
 {
 	private static final Factory<Lexer> ourLexerFactory = JsonLexer::new;
 
-	@NotNull
+	@Nonnull
 	public static JsonJavaScriptVersion getInstance()
 	{
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(JsonJavaScriptVersion.class);
@@ -39,21 +39,21 @@ public FileType getAssociatedFileType()
 		return JsonFileType.INSTANCE;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter()
 	{
 		return new JavaScriptHighlighter(ourLexerFactory);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Lexer createLexer()
 	{
 		return ourLexerFactory.create();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public PsiParser createParser()
 	{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
index afb39668..00efe8ce 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
@@ -16,7 +16,8 @@
 
 package consulo.json.validation;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.extensions.ExtensionPointName;
@@ -31,8 +32,8 @@ public interface JsonFileDescriptorProvider
 	ExtensionPointName<JsonFileDescriptorProvider> EP_NAME = ExtensionPointName.create("consulo.javascript.jsonFileDescriptorProvider");
 
 	@RequiredReadAction
-	boolean isMyFile(@NotNull PsiFile file);
+	boolean isMyFile(@Nonnull PsiFile file);
 
 	@RequiredReadAction
-	void fillRootObject(@NotNull JsonObjectDescriptor root, @NotNull PsiFile file);
+	void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file);
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
index 7045fa8c..24e8af2f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
@@ -16,7 +16,8 @@
 
 package consulo.json.validation;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.json.JsonFileType;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
index 346a2260..de902df7 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
@@ -16,7 +16,7 @@
 
 package consulo.json.validation;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -26,12 +26,12 @@ public class NativeArray
 {
 	private final Object myComponentType;
 
-	public NativeArray(@NotNull Object componentType)
+	public NativeArray(@Nonnull Object componentType)
 	{
 		myComponentType = componentType;
 	}
 
-	@NotNull
+	@Nonnull
 	public Object getComponentType()
 	{
 		return myComponentType;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
index 47c94815..3d923b9d 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -22,7 +22,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInsight.completion.CompletionContributor;
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionResultSet;
@@ -62,7 +63,7 @@ public JsonCompletionContributor()
 		{
 			@RequiredReadAction
 			@Override
-			public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
+			public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
 			{
 				addVariants(parameters, result, true);
 			}
@@ -72,7 +73,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
 		{
 			@RequiredReadAction
 			@Override
-			public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
+			public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
 			{
 				PsiElement originalPosition = parameters.getOriginalPosition();
 				if(originalPosition == null)
@@ -91,7 +92,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
 		{
 			@RequiredReadAction
 			@Override
-			public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
+			public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
 			{
 				PsiElement originalPosition = parameters.getOriginalPosition();
 				if(originalPosition == null)
@@ -108,7 +109,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
 	}
 
 	@RequiredReadAction
-	private static void addVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result, boolean quotes)
+	private static void addVariants(@Nonnull CompletionParameters parameters, @Nonnull CompletionResultSet result, boolean quotes)
 	{
 		final PsiFile originalFile = parameters.getOriginalFile();
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index aca5098b..6838de6a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -16,8 +16,9 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.project.Project;
@@ -48,7 +49,7 @@ public class DescriptionByAnotherPsiElementEditorNotification<T extends PsiEleme
 	private Project myProject;
 	private DescriptionByAnotherPsiElementProvider<T> myProvider;
 
-	public DescriptionByAnotherPsiElementEditorNotification(@NotNull Project project, @NotNull DescriptionByAnotherPsiElementProvider<T> provider)
+	public DescriptionByAnotherPsiElementEditorNotification(@Nonnull Project project, @Nonnull DescriptionByAnotherPsiElementProvider<T> provider)
 	{
 		myProject = project;
 		myProvider = provider;
@@ -56,7 +57,7 @@ public DescriptionByAnotherPsiElementEditorNotification(@NotNull Project project
 		myPanelKey = Key.create("DescriptionByAnotherPsiElementEditorNotification." + provider.getId());
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Key<EditorNotificationPanel> getKey()
 	{
@@ -66,7 +67,7 @@ public Key<EditorNotificationPanel> getKey()
 	@Nullable
 	@Override
 	@RequiredDispatchThread
-	public EditorNotificationPanel createNotificationPanel(@NotNull final VirtualFile file, @NotNull FileEditor fileEditor)
+	public EditorNotificationPanel createNotificationPanel(@Nonnull final VirtualFile file, @Nonnull FileEditor fileEditor)
 	{
 		if(file.getFileType() != JsonFileType.INSTANCE)
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
index db5fac1a..504ccfe4 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
@@ -16,7 +16,7 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import consulo.annotations.RequiredReadAction;
 import consulo.json.validation.JsonFileDescriptorProvider;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
@@ -34,7 +34,7 @@ public class DescriptionByAnotherPsiElementJsonDescriptionProvider implements Js
 {
 	@RequiredReadAction
 	@Override
-	public boolean isMyFile(@NotNull PsiFile file)
+	public boolean isMyFile(@Nonnull PsiFile file)
 	{
 		VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
 		if(virtualFile == null)
@@ -46,7 +46,7 @@ public boolean isMyFile(@NotNull PsiFile file)
 
 	@RequiredReadAction
 	@Override
-	public void fillRootObject(@NotNull JsonObjectDescriptor root, @NotNull PsiFile file)
+	public void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file)
 	{
 		VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
 		if(virtualFile == null)
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
index ac0ed879..d806bb88 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
@@ -16,8 +16,8 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredDispatchThread;
 import consulo.annotations.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
@@ -33,26 +33,26 @@ public interface DescriptionByAnotherPsiElementProvider<T extends PsiElement>
 {
 	ExtensionPointName<DescriptionByAnotherPsiElementProvider<?>> EP_NAME = ExtensionPointName.create("consulo.javascript.jsonDescriptionByAnotherPsiElementProvider");
 
-	@NotNull
+	@Nonnull
 	String getId();
 
-	@NotNull
+	@Nonnull
 	String getPsiElementName();
 
-	@NotNull
+	@Nonnull
 	@RequiredReadAction
-	String getIdFromPsiElement(@NotNull T element);
+	String getIdFromPsiElement(@Nonnull T element);
 
 	@Nullable
 	@RequiredReadAction
-	T getPsiElementById(@NotNull String id, @NotNull Project project);
+	T getPsiElementById(@Nonnull String id, @Nonnull Project project);
 
 	@RequiredDispatchThread
 	@Nullable
-	T chooseElement(@NotNull Project project);
+	T chooseElement(@Nonnull Project project);
 
 	@RequiredReadAction
-	boolean isAvailable(@NotNull Project project);
+	boolean isAvailable(@Nonnull Project project);
 
-	void fillRootObject(@NotNull T psiElement, @NotNull JsonObjectDescriptor root);
+	void fillRootObject(@Nonnull T psiElement, @Nonnull JsonObjectDescriptor root);
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
index f69ad7b0..1c8954a2 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
@@ -16,7 +16,7 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.NotNullFunction;
@@ -36,7 +36,7 @@ public void initComponent()
 		{
 			EditorNotificationProviders.registerProvider(new NotNullFunction<Project, EditorNotificationProvider<?>>()
 			{
-				@NotNull
+				@Nonnull
 				@Override
 				public EditorNotificationProvider<?> fun(Project project)
 				{
@@ -53,7 +53,7 @@ public void disposeComponent()
 
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getComponentName()
 	{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index 7f1e5441..a2b77d1f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -20,9 +20,11 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.jdom.Element;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
@@ -66,7 +68,7 @@ private static class Info implements Disposable
 		private String myPsiElementId;
 		private Project myProject;
 
-		public Info(@NotNull Project project, @NotNull VirtualFile virtualFile, @NotNull PsiElement element, @NotNull DescriptionByAnotherPsiElementProvider<?> provider)
+		public Info(@Nonnull Project project, @Nonnull VirtualFile virtualFile, @Nonnull PsiElement element, @Nonnull DescriptionByAnotherPsiElementProvider<?> provider)
 		{
 			myProject = project;
 			myId = provider.getId();
@@ -75,7 +77,7 @@ public Info(@NotNull Project project, @NotNull VirtualFile virtualFile, @NotNull
 			myElementPointer = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
 		}
 
-		public Info(@NotNull Project project, @NotNull String url, @NotNull final String providerId, @NotNull String psiElementId)
+		public Info(@Nonnull Project project, @Nonnull String url, @Nonnull final String providerId, @Nonnull String psiElementId)
 		{
 			myProject = project;
 			myVirtualFilePointer = VirtualFilePointerManager.getInstance().create(url, this, null);
@@ -115,7 +117,7 @@ public void run()
 			});
 		}
 
-		@NotNull
+		@Nonnull
 		public String getId()
 		{
 			if(myId != null)
@@ -125,7 +127,7 @@ public String getId()
 			return myProvider.getId();
 		}
 
-		@NotNull
+		@Nonnull
 		public String getUrl()
 		{
 			return myVirtualFilePointer.getUrl();
@@ -190,8 +192,8 @@ public void dispose()
 		}
 	}
 
-	@NotNull
-	public static DescriptionByAnotherPsiElementService getInstance(@NotNull Project project)
+	@Nonnull
+	public static DescriptionByAnotherPsiElementService getInstance(@Nonnull Project project)
 	{
 		return ServiceManager.getService(project, DescriptionByAnotherPsiElementService.class);
 	}
@@ -204,7 +206,7 @@ public DescriptionByAnotherPsiElementService(Project project)
 		myProject = project;
 	}
 
-	public <T extends PsiElement> void registerFile(@NotNull VirtualFile virtualFile, @NotNull T element, @NotNull DescriptionByAnotherPsiElementProvider<?> provider)
+	public <T extends PsiElement> void registerFile(@Nonnull VirtualFile virtualFile, @Nonnull T element, @Nonnull DescriptionByAnotherPsiElementProvider<?> provider)
 	{
 		Info info = new Info(myProject, virtualFile, element, provider);
 		Disposer.register(this, info);
@@ -212,7 +214,7 @@ public <T extends PsiElement> void registerFile(@NotNull VirtualFile virtualFile
 	}
 
 
-	public boolean removeFile(@NotNull VirtualFile file)
+	public boolean removeFile(@Nonnull VirtualFile file)
 	{
 		Iterator<Info> iterator = myRegisteredFiles.iterator();
 		while(iterator.hasNext())
@@ -229,7 +231,7 @@ public boolean removeFile(@NotNull VirtualFile file)
 	}
 
 	@Nullable
-	public String getRegisteredPsiElementId(@NotNull VirtualFile virtualFile)
+	public String getRegisteredPsiElementId(@Nonnull VirtualFile virtualFile)
 	{
 		for(Info registeredFile : myRegisteredFiles)
 		{
@@ -242,9 +244,9 @@ public String getRegisteredPsiElementId(@NotNull VirtualFile virtualFile)
 		return null;
 	}
 
-	@NotNull
+	@Nonnull
 	@SuppressWarnings("unchecked")
-	public <T extends PsiElement> Pair<DescriptionByAnotherPsiElementProvider<T>, T> getRegisteredPsiElementInfo(@NotNull VirtualFile virtualFile)
+	public <T extends PsiElement> Pair<DescriptionByAnotherPsiElementProvider<T>, T> getRegisteredPsiElementInfo(@Nonnull VirtualFile virtualFile)
 	{
 		for(Info info : myRegisteredFiles)
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
index f32f454d..4d01d50b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
@@ -19,8 +19,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import consulo.json.validation.NativeArray;
 import com.intellij.openapi.util.Factory;
 import com.intellij.util.containers.ContainerUtil;
@@ -33,8 +34,8 @@ public class JsonObjectDescriptor
 {
 	private Map<String, JsonPropertyDescriptor> myProperties = new HashMap<String, JsonPropertyDescriptor>();
 
-	@NotNull
-	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @NotNull final Class<?> value)
+	@Nonnull
+	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final Class<?> value)
 	{
 		if(value == Object.class)
 		{
@@ -51,8 +52,8 @@ public JsonPropertyDescriptor create()
 		});
 	}
 
-	@NotNull
-	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @NotNull final JsonObjectDescriptor value)
+	@Nonnull
+	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final JsonObjectDescriptor value)
 	{
 		return ContainerUtil.getOrCreate(myProperties, propertyName, new Factory<JsonPropertyDescriptor>()
 		{
@@ -64,8 +65,8 @@ public JsonPropertyDescriptor create()
 		});
 	}
 
-	@NotNull
-	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @NotNull final NativeArray value)
+	@Nonnull
+	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final NativeArray value)
 	{
 		return ContainerUtil.getOrCreate(myProperties, propertyName, new Factory<JsonPropertyDescriptor>()
 		{
@@ -78,7 +79,7 @@ public JsonPropertyDescriptor create()
 	}
 
 	@Nullable
-	public JsonPropertyDescriptor getProperty(@NotNull final String propertyName)
+	public JsonPropertyDescriptor getProperty(@Nonnull final String propertyName)
 	{
 		JsonPropertyDescriptor propertyDescriptor = myProperties.get(propertyName);
 		if(propertyDescriptor != null)
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
index d2748f67..3b728fe4 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
@@ -16,8 +16,8 @@
 
 package consulo.json.validation.descriptor;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
@@ -36,7 +36,7 @@ public class JsonPropertyDescriptor
 	private boolean myDeprecated;
 	private boolean myNullable = true;
 
-	public JsonPropertyDescriptor(@Nullable String name, @NotNull Object value)
+	public JsonPropertyDescriptor(@Nullable String name, @Nonnull Object value)
 	{
 		myName = name;
 		myValue = value;
@@ -52,21 +52,21 @@ public boolean isDeprecated()
 		return myDeprecated;
 	}
 
-	@NotNull
+	@Nonnull
 	public JsonPropertyDescriptor deprecated()
 	{
 		myDeprecated = true;
 		return this;
 	}
 
-	@NotNull
+	@Nonnull
 	public JsonPropertyDescriptor notNull()
 	{
 		myNullable = false;
 		return this;
 	}
 
-	@NotNull
+	@Nonnull
 	public Object getValue()
 	{
 		return myValue;
@@ -79,7 +79,7 @@ public String getName()
 	}
 
 	@Exported
-	public void setNavigationElement(@NotNull PsiElement element)
+	public void setNavigationElement(@Nonnull PsiElement element)
 	{
 		myNavigationElement = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
 	}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index 7a323773..32626c57 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -24,8 +24,8 @@
 import java.util.Deque;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
@@ -62,9 +62,9 @@
  */
 public class PropertyValidationInspection extends LocalInspectionTool
 {
-	@NotNull
+	@Nonnull
 	@Override
-	public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly)
+	public PsiElementVisitor buildVisitor(@Nonnull final ProblemsHolder holder, boolean isOnTheFly)
 	{
 		return new JSElementVisitor()
 		{
@@ -173,7 +173,7 @@ public boolean process(PsiElement element, PsiElement element2)
 
 	@Nullable
 	@RequiredReadAction
-	private static Object getTypeOfExpression(@NotNull PsiElement node)
+	private static Object getTypeOfExpression(@Nonnull PsiElement node)
 	{
 		if(node instanceof JSLiteralExpression)
 		{
@@ -249,7 +249,7 @@ else if(node instanceof JSArrayLiteralExpression)
 
 	@Nullable
 	@RequiredReadAction
-	public static JsonPropertyDescriptor findPropertyDescriptor(@NotNull final JSProperty jsProperty)
+	public static JsonPropertyDescriptor findPropertyDescriptor(@Nonnull final JSProperty jsProperty)
 	{
 		return CachedValuesManager.getManager(jsProperty.getProject()).createCachedValue(new CachedValueProvider<JsonPropertyDescriptor>()
 		{
@@ -265,7 +265,7 @@ public Result<JsonPropertyDescriptor> compute()
 
 	@Nullable
 	@RequiredReadAction
-	private static JsonPropertyDescriptor findPropertyDescriptorImpl(@NotNull JSProperty jsProperty)
+	private static JsonPropertyDescriptor findPropertyDescriptorImpl(@Nonnull JSProperty jsProperty)
 	{
 		JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(jsProperty.getContainingFile());
 		if(rootDescriptor == null)
@@ -318,7 +318,7 @@ else if(value instanceof NativeArray)
 	}
 
 	@RequiredReadAction
-	private static void validateValue(@NotNull PsiElement value, @NotNull ProblemsHolder holder)
+	private static void validateValue(@Nonnull PsiElement value, @Nonnull ProblemsHolder holder)
 	{
 		Object actualType = getTypeOfExpression(value);
 		if(actualType == null)
@@ -376,7 +376,7 @@ public static boolean isInheritable(JsonPropertyDescriptor currentProperty, Obje
 		return false;
 	}
 
-	@NotNull
+	@Nonnull
 	private static String getSimpleName(Object o)
 	{
 		if(o instanceof Class)
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
index 694603f7..0292fe4c 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
@@ -16,7 +16,8 @@
 
 package consulo.json.validation.psi.reference;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
+
 import consulo.annotations.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.json.validation.inspections.PropertyValidationInspection;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
index c21f5530..3cbf9ca8 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
@@ -16,8 +16,8 @@
 
 package consulo.json.validation.psi.reference;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import consulo.annotations.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.json.validation.inspections.PropertyValidationInspection;
@@ -35,7 +35,7 @@ public class JsonPropertyNameReferenceProvider implements JSPropertyNameReferenc
 	@RequiredReadAction
 	@Nullable
 	@Override
-	public PsiReference getReference(@NotNull JSProperty property)
+	public PsiReference getReference(@Nonnull JSProperty property)
 	{
 		JsonPropertyDescriptor propertyDescriptor = PropertyValidationInspection.findPropertyDescriptor(property);
 		if(propertyDescriptor == null)
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index 2f7cadee..99c4a8f7 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -16,10 +16,10 @@
 
 package consulo.typescript;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
@@ -38,21 +38,21 @@ private TypeScriptFileType()
 		super(JavaScriptLanguage.INSTANCE);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getName()
 	{
 		return "TypeScript";
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getDescription()
 	{
 		return JavaScriptBundle.message("typescript.filetype.description");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getDefaultExtension()
 	{
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
index 4172ac35..57dfaf81 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
@@ -16,7 +16,7 @@
 
 package consulo.typescript;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
 
@@ -27,7 +27,7 @@
 public class TypeScriptFileTypeFactory extends FileTypeFactory
 {
 	@Override
-	public void createFileTypes(@NotNull FileTypeConsumer consumer)
+	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
 	{
 		consumer.consume(TypeScriptFileType.INSTANCE);
 	}
diff --git a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
index ee7d9ff8..ac6ed56c 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
@@ -16,8 +16,9 @@
 
 package com.intellij.javascript;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.template.Expression;
 import com.intellij.codeInsight.template.ExpressionContext;
@@ -56,7 +57,7 @@ public String getDefaultValue()
 	}
 
 	@Override
-	public Result calculateResult(@NotNull final Expression[] params, final ExpressionContext context)
+	public Result calculateResult(@Nonnull final Expression[] params, final ExpressionContext context)
 	{
 		final PsiElement elementAtCaret = findElementAtCaret(context);
 		final JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(elementAtCaret);
@@ -93,13 +94,13 @@ public static PsiElement findElementAtCaret(final ExpressionContext context)
 	}
 
 	@Override
-	public Result calculateQuickResult(@NotNull final Expression[] params, final ExpressionContext context)
+	public Result calculateQuickResult(@Nonnull final Expression[] params, final ExpressionContext context)
 	{
 		return null;
 	}
 
 	@Override
-	public LookupElement[] calculateLookupItems(@NotNull final Expression[] params, final ExpressionContext context)
+	public LookupElement[] calculateLookupItems(@Nonnull final Expression[] params, final ExpressionContext context)
 	{
 		return null;
 	}
diff --git a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
index e3cb304f..23408e4d 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
@@ -20,7 +20,8 @@
  */
 package com.intellij.javascript;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInsight.hint.ImplementationTextSelectioner;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
@@ -30,13 +31,13 @@
 public class JSImplementationTextSelectioner implements ImplementationTextSelectioner
 {
 	@Override
-	public int getTextStartOffset(@NotNull PsiElement element)
+	public int getTextStartOffset(@Nonnull PsiElement element)
 	{
 		return element.getTextOffset();
 	}
 
 	@Override
-	public int getTextEndOffset(@NotNull PsiElement element)
+	public int getTextEndOffset(@Nonnull PsiElement element)
 	{
 		if(element instanceof JSDefinitionExpression)
 		{
diff --git a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
index fc0c8eb4..39994e25 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
@@ -16,8 +16,9 @@
 
 package com.intellij.javascript;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.template.Expression;
 import com.intellij.codeInsight.template.ExpressionContext;
@@ -55,7 +56,7 @@ public String getDefaultValue()
 	}
 
 	@Override
-	public Result calculateResult(@NotNull Expression[] params, ExpressionContext context)
+	public Result calculateResult(@Nonnull Expression[] params, ExpressionContext context)
 	{
 		final PsiElement elementAtCaret = JSClassNameMacro.findElementAtCaret(context);
 		if(elementAtCaret != null)
@@ -79,13 +80,13 @@ public Result calculateResult(@NotNull Expression[] params, ExpressionContext co
 	}
 
 	@Override
-	public Result calculateQuickResult(@NotNull Expression[] params, ExpressionContext context)
+	public Result calculateQuickResult(@Nonnull Expression[] params, ExpressionContext context)
 	{
 		return null;
 	}
 
 	@Override
-	public LookupElement[] calculateLookupItems(@NotNull Expression[] params, ExpressionContext context)
+	public LookupElement[] calculateLookupItems(@Nonnull Expression[] params, ExpressionContext context)
 	{
 		return null;
 	}
diff --git a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
index fcbefd2d..c032a3e1 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.MutableLookupElement;
@@ -157,7 +157,7 @@ public static JSArgumentList findArgumentList(final PsiFile file, final int offs
 	}
 
 	@Nullable
-	private static JSArgumentList fillSignaturesForArgumentList(final CreateParameterInfoContext context, final @NotNull JSArgumentList argList)
+	private static JSArgumentList fillSignaturesForArgumentList(final CreateParameterInfoContext context, final @Nonnull JSArgumentList argList)
 	{
 		final PsiElement psiElement = argList.getParent();
 		if(!(psiElement instanceof JSCallExpression))
@@ -205,7 +205,7 @@ else if(methodExpression instanceof JSSuperExpression)
 	}
 
 	@Override
-	public void showParameterInfo(@NotNull final JSArgumentList element, final CreateParameterInfoContext context)
+	public void showParameterInfo(@Nonnull final JSArgumentList element, final CreateParameterInfoContext context)
 	{
 		context.showHint(element, element.getTextOffset(), this);
 	}
@@ -217,7 +217,7 @@ public JSArgumentList findElementForUpdatingParameterInfo(final UpdateParameterI
 	}
 
 	@Override
-	public void updateParameterInfo(@NotNull final JSArgumentList o, final UpdateParameterInfoContext context)
+	public void updateParameterInfo(@Nonnull final JSArgumentList o, final UpdateParameterInfoContext context)
 	{
 		if(context.getParameterOwner() != o)
 		{
@@ -229,7 +229,7 @@ public void updateParameterInfo(@NotNull final JSArgumentList o, final UpdatePar
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getParameterCloseChars()
 	{
 		return ",){";
@@ -265,7 +265,7 @@ private static class SignatureInfo
 	}
 
 	private static
-	@NotNull
+	@Nonnull
 	SignatureInfo buildSignature(final JSParameter[] params, final boolean skipType, int selectedParameterIndex)
 	{
 		SignatureInfo info = new SignatureInfo();
@@ -329,34 +329,34 @@ public static String getSignatureForParameter(final JSParameter p, boolean skipT
 	}
 
 	@Override
-	@NotNull
-	public JSExpression[] getActualParameters(@NotNull final JSArgumentList jsArgumentList)
+	@Nonnull
+	public JSExpression[] getActualParameters(@Nonnull final JSArgumentList jsArgumentList)
 	{
 		return jsArgumentList.getArguments();
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public IElementType getActualParameterDelimiterType()
 	{
 		return JSTokenTypes.COMMA;
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public IElementType getActualParametersRBraceType()
 	{
 		return JSTokenTypes.RBRACE;
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Set<Class> getArgumentListAllowedParentClasses()
 	{
 		return ourArgumentListAllowedParentClassesSet;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Set<? extends Class> getArgListStopSearchClasses()
 	{
@@ -364,7 +364,7 @@ public Set<? extends Class> getArgListStopSearchClasses()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Class<JSArgumentList> getArgumentListClass()
 	{
 		return JSArgumentList.class;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
index 3f60e2ee..762842c2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.codeInsight.editorActions.smartEnter.SmartEnterProcessor;
 import com.intellij.idea.LoggerFactory;
@@ -50,7 +51,7 @@ public class JSSmartEnterProcessor extends SmartEnterProcessor
 {
 	@Override
 	@RequiredReadAction
-	public boolean process(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile psiFile)
+	public boolean process(@Nonnull final Project project, @Nonnull final Editor editor, @Nonnull final PsiFile psiFile)
 	{
 		int offset = editor.getCaretModel().getOffset();
 		PsiElement at = psiFile.findElementAt(offset);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
index fd5b2a75..818858bb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.codeInsight.template.TemplateContextType;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.psi.JSFile;
@@ -48,7 +48,7 @@ public JavaScriptCodeContextType()
 	}
 
 	@Override
-	public boolean isInContext(@NotNull final PsiFile file, final int offset)
+	public boolean isInContext(@Nonnull final PsiFile file, final int offset)
 	{
 		PsiElement at = file.findElementAt(offset);
 		if(at == null && offset == file.getTextLength())
@@ -83,7 +83,7 @@ protected void process(final JSFile file)
 		return language != null && language.isKindOf(JavaScriptLanguage.INSTANCE);
 	}
 
-	public boolean isInContext(@NotNull final FileType fileType)
+	public boolean isInContext(@Nonnull final FileType fileType)
 	{
 		return fileType instanceof JavaScriptFileType;
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
index be56fb7b..cef24453 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -33,7 +33,7 @@ public class JavaScriptTargetElementUtilEx extends TargetElementUtilEx.Adapter
 {
 	@Override
 	@CompositeExtensionPointName.BooleanBreakResult(breakValue = false)
-	public boolean includeSelfInGotoImplementation(@NotNull final PsiElement element)
+	public boolean includeSelfInGotoImplementation(@Nonnull final PsiElement element)
 	{
 		if(element instanceof JSFunction)
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java b/plugin/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
index aedfce4a..2ef30cc2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.CodeDocumentationAwareCommenter;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.tree.IElementType;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
index e2f5716a..ccf53359 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.findUsages;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSNamedElement;
@@ -48,7 +49,7 @@ protected boolean isAcceptableElement(JSNamedElement element)
 
 	private static class ClassUsageGroup extends JavaScriptGroupRuleProviderBase.PsiNamedElementUsageGroupBase<JSClass>
 	{
-		public ClassUsageGroup(@NotNull JSClass clazz)
+		public ClassUsageGroup(@Nonnull JSClass clazz)
 		{
 			super(clazz, AllIcons.Nodes.Class);
 		}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
index 4cc09854..ad0c1d7b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.findUsages;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.cacheBuilder.WordsScanner;
 import com.intellij.lang.findUsages.FindUsagesProvider;
 import com.intellij.lang.javascript.JavaScriptBundle;
@@ -44,20 +45,20 @@
 public class JavaScriptFindUsagesProvider implements FindUsagesProvider
 {
 	@Override
-	public boolean canFindUsagesFor(@NotNull PsiElement psiElement)
+	public boolean canFindUsagesFor(@Nonnull PsiElement psiElement)
 	{
 		return psiElement instanceof PsiNamedElement;
 	}
 
 	@Override
-	public String getHelpId(@NotNull PsiElement psiElement)
+	public String getHelpId(@Nonnull PsiElement psiElement)
 	{
 		return null;
 	}
 
 	@Override
-	@NotNull
-	public String getType(@NotNull PsiElement element)
+	@Nonnull
+	public String getType(@Nonnull PsiElement element)
 	{
 		if(element instanceof JSFunction)
 		{
@@ -107,16 +108,16 @@ public String getType(@NotNull PsiElement element)
 	}
 
 	@Override
-	@NotNull
-	public String getDescriptiveName(@NotNull PsiElement element)
+	@Nonnull
+	public String getDescriptiveName(@Nonnull PsiElement element)
 	{
 		String name = ((PsiNamedElement) element).getName();
 		return name != null ? name : "";
 	}
 
 	@Override
-	@NotNull
-	public String getNodeText(@NotNull PsiElement element, boolean useFullName)
+	@Nonnull
+	public String getNodeText(@Nonnull PsiElement element, boolean useFullName)
 	{
 		return getDescriptiveName(element);
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
index 39a2e23f..d60ebe47 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.findUsages;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSNamedElement;
@@ -41,7 +42,7 @@ protected UsageGroup createUsageGroup(final JSFunction jsFunction)
 
 	private static class FunctionUsageGroup extends JavaScriptGroupRuleProviderBase.PsiNamedElementUsageGroupBase<JSFunction>
 	{
-		public FunctionUsageGroup(@NotNull JSFunction function)
+		public FunctionUsageGroup(@Nonnull JSFunction function)
 		{
 			super(function, AllIcons.Nodes.Function);
 		}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
index 43b82c6b..5fc56c7e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -16,10 +16,10 @@
 
 package com.intellij.lang.javascript.findUsages;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.actionSystem.DataSink;
@@ -97,7 +97,7 @@ abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement &
 		private String myName;
 		private Icon myIcon;
 
-		PsiNamedElementUsageGroupBase(@NotNull T element, Icon icon)
+		PsiNamedElementUsageGroupBase(@Nonnull T element, Icon icon)
 		{
 			myIcon = icon;
 
@@ -121,7 +121,7 @@ public T getElement()
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getText(UsageView view)
 		{
 			return myName;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
index 59eca1b6..4a06a330 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -22,8 +22,9 @@
 import java.util.Collections;
 import java.util.Iterator;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.codeInsight.hint.QuestionAction;
 import com.intellij.codeInsight.navigation.NavigationUtil;
@@ -87,34 +88,34 @@ public boolean showHint(final Editor editor)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getText()
 	{
 		return JavaScriptBundle.message(isFunction ? "flex.import.function" : "flex.import.class", calculatedClass);
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getName()
 	{
 		return getText();
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getFamilyName()
 	{
 		return getText();
 	}
 
 	@Override
-	public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor)
+	public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
 	{
 		invoke(project, myEditor, descriptor.getPsiElement().getContainingFile());
 	}
 
 	@Override
-	public boolean isAvailable(@NotNull final Project project, final Editor editor, final PsiFile file)
+	public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
 	{
 		if(!myReference.getElement().isValid())
 		{
@@ -218,7 +219,7 @@ public static Collection<JSQualifiedNamedElement> getCandidates(final Editor edi
 	}
 
 	@Override
-	public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file)
+	public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
 	{
 		final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
index b7f063df..8915515b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.idea.LoggerFactory;
 import com.intellij.lang.ImportOptimizer;
@@ -70,7 +70,7 @@ public boolean supports(PsiFile file)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Runnable processFile(final PsiFile file)
 	{
 		if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
index f572e7fc..98d09b12 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
@@ -25,8 +25,8 @@
 import java.util.List;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.idea.LoggerFactory;
 import com.intellij.lang.injection.InjectedLanguageManager;
@@ -106,7 +106,7 @@ else if(earlyImport.getNextSibling() instanceof PsiWhiteSpace && earlyImport.get
 		return earlyImport;
 	}
 
-	public static void doImport(@NotNull PsiElement subject, final @NotNull String fqn)
+	public static void doImport(@Nonnull PsiElement subject, final @Nonnull String fqn)
 	{
 		assert fqn.contains(".") : "Qualified name belongs to default package: " + fqn;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
index c8727d36..a3140c6d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
@@ -21,9 +21,11 @@
 import java.util.Arrays;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
@@ -36,23 +38,23 @@ class AS3InterfaceDumper extends AbstractDumpProcessor
 	private boolean isInterface;
 
 	@Override
-	public void dumpStat(@NotNull final String stat)
+	public void dumpStat(@Nonnull final String stat)
 	{
 	}
 
 	@Override
-	public void dumpToplevelAnonymousMethod(final @NotNull Abc abc, final @NotNull MethodInfo m)
+	public void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m)
 	{
 	}
 
 	@Override
-	public void dumpTopLevelTraits(final Abc abc, final @NotNull Traits t, final String indent)
+	public void dumpTopLevelTraits(final Abc abc, final @Nonnull Traits t, final String indent)
 	{
 		t.dump(abc, indent, "", this);
 	}
 
 	@Override
-	public boolean doDumpMember(final @NotNull MemberInfo memberInfo)
+	public boolean doDumpMember(final @Nonnull MemberInfo memberInfo)
 	{
 		if(memberInfo.name == null)
 		{
@@ -145,13 +147,13 @@ private static boolean needsQuoting(final String value)
 	}
 
 	@Override
-	public boolean doDumpMetaData(final @NotNull MetaData md)
+	public boolean doDumpMetaData(final @Nonnull MetaData md)
 	{
 		return md.name.indexOf("__") == -1;
 	}
 
 	@Override
-	public void processParameter(@NotNull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest)
+	public void processParameter(@Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest)
 	{
 		if(rest)
 		{
@@ -189,7 +191,7 @@ public void setProcessingInterface(final boolean anInterface)
 	}
 
 	@Override
-	public void hasError(@NotNull final String error)
+	public void hasError(@Nonnull final String error)
 	{
 		sb.append("/*" + error + "*/");
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
index d2287a0b..9322fb3c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
@@ -19,8 +19,8 @@
 import java.util.LinkedList;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.stubs.impl.JSAttributeNameValuePairStubImpl;
 import com.intellij.lang.javascript.psi.stubs.impl.JSReferenceListStubImpl;
@@ -67,7 +67,7 @@ protected void processArgumentList(MethodInfo methodInfo, String parentName)
 	}
 
 	@Override
-	public void processParameter(@NotNull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest)
+	public void processParameter(@Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest)
 	{
 		/*new JSParameterStubImpl(name, rest ? JSParameterStubImpl.REST_MASK : 0, getMultinameAsPackageName(type, parentName, true),
 			getValueRepr(value),
@@ -75,7 +75,7 @@ public void processParameter(@NotNull String name, @Nullable Multiname type, Str
 	}
 
 	@Override
-	public void append(@NotNull @NonNls String str)
+	public void append(@Nonnull @NonNls String str)
 	{
 	}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
index d61ef715..3f638dcc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
@@ -20,7 +20,7 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
 
@@ -560,7 +560,7 @@ class Abc
 	int totalSize;
 	final int opSizes[] = new int[256];
 
-	public Abc(final @NotNull ByteBuffer _data, @NotNull FlexByteCodeInformationProcessor _processor)
+	public Abc(final @Nonnull ByteBuffer _data, @Nonnull FlexByteCodeInformationProcessor _processor)
 	{
 		data = _data;
 		processor = _processor;
@@ -1179,7 +1179,7 @@ void parseMethodBodies()
 		reportAboutPercentage("MethodBodies size ", data, start, processor);
 	}
 
-	private static void reportAboutPercentage(String s, ByteBuffer data, int start, @NotNull FlexByteCodeInformationProcessor processor)
+	private static void reportAboutPercentage(String s, ByteBuffer data, int start, @Nonnull FlexByteCodeInformationProcessor processor)
 	{
 		processor.dumpStat(s + (data.getPosition() - start) + " " + (int) 100f * (data.getPosition() - start) / data.bytesSize() + " %\n");
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
index 1bb8e1a4..b64938ec 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.flex.importer;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
@@ -34,13 +34,13 @@ public AbcDumper(final boolean _dumpCode)
 	}
 
 	@Override
-	public void dumpStat(@NotNull final String stat)
+	public void dumpStat(@Nonnull final String stat)
 	{
 		sb.append(stat);
 	}
 
 	@Override
-	public void hasError(@NotNull final String error)
+	public void hasError(@Nonnull final String error)
 	{
 		sb.append(error);
 	}
@@ -53,19 +53,19 @@ protected String appendModifiers(MemberInfo member, String attr)
 	}
 
 	@Override
-	public void processMultinameAsPackageName(@NotNull final Multiname name, @Nullable final String parentName, final boolean referenceNameRequested)
+	public void processMultinameAsPackageName(@Nonnull final Multiname name, @Nullable final String parentName, final boolean referenceNameRequested)
 	{
 		append(name.toString());
 	}
 
 	@Override
-	public void dumpToplevelAnonymousMethod(final @NotNull Abc abc, final @NotNull MethodInfo m)
+	public void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m)
 	{
 		m.dump(abc, "", "", this);
 	}
 
 	@Override
-	public void dumpTopLevelTraits(final Abc abc, final @NotNull Traits t, final String indent)
+	public void dumpTopLevelTraits(final Abc abc, final @Nonnull Traits t, final String indent)
 	{
 		sb.append(indent + t.name + "\n");
 		t.dump(abc, indent, "", this);
@@ -73,7 +73,7 @@ public void dumpTopLevelTraits(final Abc abc, final @NotNull Traits t, final Str
 	}
 
 	@Override
-	public boolean doDumpMember(final @NotNull MemberInfo memberInfo)
+	public boolean doDumpMember(final @Nonnull MemberInfo memberInfo)
 	{
 		return true;
 	}
@@ -103,13 +103,13 @@ public void processValue(final Multiname type, final Object value)
 	}
 
 	@Override
-	public boolean doDumpMetaData(final @NotNull MetaData md)
+	public boolean doDumpMetaData(final @Nonnull MetaData md)
 	{
 		return true;
 	}
 
 	@Override
-	public void processParameter(@NotNull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest)
+	public void processParameter(@Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest)
 	{
 		processMultinameAsPackageName(type, parentName, true);
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
index f6d937d2..0047217a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.flex.importer;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Maxim.Mossienko
@@ -37,7 +38,7 @@ String getResult()
 	}
 
 	@Override
-	public void append(@NotNull @NonNls String str)
+	public void append(@Nonnull @NonNls String str)
 	{
 		sb.append(str);
 	}
@@ -116,7 +117,7 @@ public void processFunction(MethodInfo methodInfo, boolean referenceNameRequeste
 		processMultinameAsPackageName(methodInfo.returnType, parentName, referenceNameRequested);
 	}
 
-	protected void processMemberKindAndName(@NotNull final MemberInfo member)
+	protected void processMemberKindAndName(@Nonnull final MemberInfo member)
 	{
 		append(Abc.traitKinds[member.kind]);
 		append(" ");
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
index 458cbc5c..9a51f8e6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
@@ -22,7 +22,7 @@
 import java.io.UnsupportedEncodingException;
 import java.util.zip.InflaterInputStream;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -35,7 +35,7 @@ class ByteBuffer
 	private int position;
 	private boolean littleEndian;
 
-	void read(@NotNull InputStream inputStream) throws IOException
+	void read(@Nonnull InputStream inputStream) throws IOException
 	{
 		try
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
index 5f82d10b..93d77b61 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
@@ -17,8 +17,8 @@
 package com.intellij.lang.javascript.flex.importer;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
@@ -27,19 +27,19 @@
  */
 interface FlexByteCodeInformationProcessor
 {
-	void dumpStat(@NotNull @NonNls String stat);
+	void dumpStat(@Nonnull @NonNls String stat);
 
-	void hasError(@NotNull String error);
+	void hasError(@Nonnull String error);
 
-	void append(@NotNull @NonNls String str);
+	void append(@Nonnull @NonNls String str);
 
-	void processMultinameAsPackageName(@NotNull Multiname name, @Nullable String parentName, boolean referenceNameRequested);
+	void processMultinameAsPackageName(@Nonnull Multiname name, @Nullable String parentName, boolean referenceNameRequested);
 
-	void dumpToplevelAnonymousMethod(final @NotNull Abc abc, final @NotNull MethodInfo m);
+	void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m);
 
-	void dumpTopLevelTraits(final @NotNull Abc abc, final @NotNull Traits t, final String indent);
+	void dumpTopLevelTraits(final @Nonnull Abc abc, final @Nonnull Traits t, final String indent);
 
-	boolean doDumpMember(final @NotNull MemberInfo memberInfo);
+	boolean doDumpMember(final @Nonnull MemberInfo memberInfo);
 
 	void appendMethodSeparator();
 
@@ -47,11 +47,11 @@ interface FlexByteCodeInformationProcessor
 
 	String getAbcInSwfIndent();
 
-	boolean doDumpMetaData(final @NotNull MetaData md);
+	boolean doDumpMetaData(final @Nonnull MetaData md);
 
 	String REST_PARAMETER_TYPE = "...";
 
-	void processParameter(final @NotNull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest);
+	void processParameter(final @Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest);
 
 	boolean doStarTypeDumpInExtends();
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
index ddd025bd..a825f8ce 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
@@ -22,8 +22,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.stubs.StubElement;
 
 /**
@@ -105,7 +106,7 @@ public static void buildStubsInterfaceFromStream(final InputStream in, final Stu
 		processFlexByteCode(in, new AS3InterfaceStubDumper(parent));
 	}
 
-	private static void processFlexByteCode(@NotNull final InputStream in, @NotNull FlexByteCodeInformationProcessor processor) throws IOException
+	private static void processFlexByteCode(@Nonnull final InputStream in, @Nonnull FlexByteCodeInformationProcessor processor) throws IOException
 	{
 		ByteBuffer data = new ByteBuffer();
 		data.read(in);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
index f79a2e33..b88a224e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.flex.importer;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -34,9 +34,9 @@ abstract class MemberInfo
 	boolean isPublic;
 	boolean isFinal;
 
-	abstract void dump(Abc abc, String indent, String attr, final @NotNull FlexByteCodeInformationProcessor processor);
+	abstract void dump(Abc abc, String indent, String attr, final @Nonnull FlexByteCodeInformationProcessor processor);
 
-	protected void dumpMetaData(String indent, final @NotNull FlexByteCodeInformationProcessor processor)
+	protected void dumpMetaData(String indent, final @Nonnull FlexByteCodeInformationProcessor processor)
 	{
 		if(metadata != null)
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
index ab8cbca9..a09c73af 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
@@ -26,7 +26,7 @@
 import javax.swing.event.DocumentEvent;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.application.options.CodeStyleAbstractPanel;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
@@ -108,7 +108,7 @@ protected void prepareForReformat(final PsiFile psiFile)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	protected FileType getFileType()
 	{
 		return JavaScriptFileType.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
index 99e7abfa..668e8b53 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.formatter;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.Language;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
@@ -47,7 +47,7 @@ public Language getLanguage()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Configurable createSettingsPage(final CodeStyleSettings settings, final CodeStyleSettings originalSettings)
 	{
 		return new JavaScriptCodeStyleConfigurable(settings, originalSettings);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
index 8d868318..4f11ab44 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.formatter;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.formatting.Block;
 import com.intellij.formatting.FormattingDocumentModel;
 import com.intellij.formatting.FormattingModel;
@@ -39,14 +40,14 @@ public JSFormattingModel(final PsiFile file, CodeStyleSettings settings, final B
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Block getRootBlock()
 	{
 		return myModel.getRootBlock();
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public FormattingDocumentModel getDocumentModel()
 	{
 		return myModel.getDocumentModel();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
index 79faf4af..1b5d9a22 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
@@ -19,7 +19,8 @@
  */
 package com.intellij.lang.javascript.formatter;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.formatting.FormattingModel;
 import com.intellij.formatting.FormattingModelBuilder;
 import com.intellij.lang.ASTNode;
@@ -33,7 +34,7 @@
 public class JavascriptFormattingModelBuilder implements FormattingModelBuilder
 {
 	@Override
-	@NotNull
+	@Nonnull
 	public FormattingModel createModel(final PsiElement element, final CodeStyleSettings settings)
 	{
 		final PsiFile psiFile = element.getContainingFile();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
index f49b07cf..02492b8b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
@@ -18,8 +18,8 @@
 
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.formatting.Alignment;
 import com.intellij.formatting.Block;
 import com.intellij.formatting.ChildAttributes;
@@ -68,14 +68,14 @@ public ASTNode getNode()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public TextRange getTextRange()
 	{
 		return myNode.getTextRange();
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public List<Block> getSubBlocks()
 	{
 		if(mySubBlocks == null)
@@ -120,7 +120,7 @@ public Spacing getSpacing(Block child1, Block child2)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public ChildAttributes getChildAttributes(final int newChildIndex)
 	{
 		Indent indent = null;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
index ca667ef9..eb6b519a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
@@ -19,8 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.formatting.Alignment;
 import com.intellij.formatting.Block;
 import com.intellij.formatting.ChildAttributes;
@@ -50,14 +50,14 @@ public JSDocCommentBlock(final ASTNode node, final int startOffset, final int en
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public TextRange getTextRange()
 	{
 		return new TextRange(myNode.getStartOffset() + myStartOffset, myNode.getStartOffset() + myEndOffset);
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public List<Block> getSubBlocks()
 	{
 		return EMPTY_BLOCK_LIST;
@@ -92,7 +92,7 @@ public Spacing getSpacing(Block child1, Block child2)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public ChildAttributes getChildAttributes(final int newChildIndex)
 	{
 		return null;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
index 05659375..b77ba82d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.formatting.Alignment;
 import com.intellij.formatting.Block;
 import com.intellij.formatting.Indent;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
index 07f324cc..d7200f96 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.generation;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInsight.actions.BaseCodeInsightAction;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
@@ -55,7 +56,7 @@ public void actionPerformed(final AnActionEvent e)
 	}
 
 	protected abstract
-	@NotNull
+	@Nonnull
 	JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode();
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
index d2867d28..90b4fa42 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
@@ -24,11 +24,11 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
 import com.intellij.lang.javascript.psi.JSAttributeList;
@@ -108,7 +108,7 @@ protected BaseCreateMethodsFix createFix(final JSClass jsClass)
 				final MyBaseCreateMethodsFix generateSetterFix = new MyBaseCreateMethodsFix(GenerationMode.SETTERS, jsClass, toCreateBindableProperties);
 
 				@Override
-				public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
+				public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
 				{
 					evalAnchor(editor, file);
 
@@ -125,7 +125,7 @@ else if(mode == GenerationMode.CONSTRUCTOR)
 			return new BaseCreateMethodsFix<JSVariable>(jsClass)
 			{
 				@Override
-				public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
+				public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
 				{
 					final JSCodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(project).getCustomSettings(JSCodeStyleSettings.class);
 					evalAnchor(editor, file);
@@ -208,7 +208,7 @@ else if(mode == GenerationMode.TOSTRING)
 			return new BaseCreateMethodsFix<JSVariable>(jsClass)
 			{
 				@Override
-				public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
+				public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
 				{
 					evalAnchor(editor, file);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
index a28f5908..e7373551 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.highlighting;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.BracePair;
 import com.intellij.lang.PairedBraceMatcher;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -46,7 +47,7 @@ public BracePair[] getPairs()
 	}
 
 	@Override
-	public boolean isPairedBracesAllowedBeforeType(@NotNull final IElementType lbraceType, @Nullable final IElementType tokenType)
+	public boolean isPairedBracesAllowedBeforeType(@Nonnull final IElementType lbraceType, @Nullable final IElementType tokenType)
 	{
 		return JSTokenTypes.WHITE_SPACE == tokenType || JSTokenTypes.COMMENTS.contains(tokenType) || tokenType == JSTokenTypes.SEMICOLON || tokenType ==
 				JSTokenTypes.COMMA || tokenType == JSTokenTypes.RPAR || tokenType == JSTokenTypes.RBRACKET || tokenType == JSTokenTypes.RBRACE || null ==
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
index fcc8cd1e..35d841ee 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
@@ -19,10 +19,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
@@ -88,7 +88,7 @@ public class JavaScriptColorsAndFontsPage implements ColorSettingsPage
 
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return "JavaScript";
@@ -101,28 +101,28 @@ public Icon getIcon()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public AttributesDescriptor[] getAttributeDescriptors()
 	{
 		return ATTRS;
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public ColorDescriptor[] getColorDescriptors()
 	{
 		return ColorDescriptor.EMPTY_ARRAY;
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public SyntaxHighlighter getHighlighter()
 	{
 		return JavaScript15LanguageVersion.getInstance().getSyntaxHighlighter();
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDemoText()
 	{
 		return "var <global_variable>globalVar</global_variable>;\n" +
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index ab259a27..b2455b33 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.highlighting;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
 import com.intellij.codeInsight.daemon.impl.HighlightVisitor;
@@ -47,7 +47,7 @@ public class JavaScriptHighlightVisitor extends JSElementVisitor implements High
 	private HighlightInfoHolder myHighlightInfoHolder;
 
 	@Override
-	public boolean suitableForFile(@NotNull PsiFile psiFile)
+	public boolean suitableForFile(@Nonnull PsiFile psiFile)
 	{
 		return psiFile instanceof JSFile;
 	}
@@ -95,7 +95,7 @@ else if(StringUtil.startsWithIgnoreCase(text, "0b"))
 	}
 
 	@RequiredReadAction
-	private void highlightPropertyName(@NotNull JSProperty property, @NotNull PsiElement nameIdentifier)
+	private void highlightPropertyName(@Nonnull JSProperty property, @Nonnull PsiElement nameIdentifier)
 	{
 		final JSExpression expression = property.getValue();
 		TextAttributesKey type;
@@ -192,7 +192,7 @@ public void visitJSPrefixExpression(JSPrefixExpression expression)
 	}
 
 	@RequiredReadAction
-	private void addElementHighlight(@NotNull PsiElement resolvedElement, @NotNull PsiElement targetForHighlight)
+	private void addElementHighlight(@Nonnull PsiElement resolvedElement, @Nonnull PsiElement targetForHighlight)
 	{
 		boolean isStatic = false;
 		boolean isMethod = false;
@@ -287,7 +287,7 @@ else if(isField)
 
 	@Nullable
 	@RequiredReadAction
-	private static HighlightInfo buildHighlightForVariable(@NotNull final PsiElement element, @NotNull final PsiElement markerAddTo)
+	private static HighlightInfo buildHighlightForVariable(@Nonnull final PsiElement element, @Nonnull final PsiElement markerAddTo)
 	{
 		TextAttributesKey type;
 
@@ -324,7 +324,7 @@ private static HighlightInfo buildHighlightForVariable(@NotNull final PsiElement
 		return HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(markerAddTo).textAttributes(type).create();
 	}
 
-	private void reportFeatureUsage(@NotNull PsiElement element, @NotNull JavaScriptFeature javaScriptFeature)
+	private void reportFeatureUsage(@Nonnull PsiElement element, @Nonnull JavaScriptFeature javaScriptFeature)
 	{
 		if(JavaScriptVersionUtil.containsFeature(element, javaScriptFeature))
 		{
@@ -337,20 +337,20 @@ private void reportFeatureUsage(@NotNull PsiElement element, @NotNull JavaScript
 	}
 
 	@Override
-	public void visit(@NotNull PsiElement element)
+	public void visit(@Nonnull PsiElement element)
 	{
 		element.acceptChildren(this);
 	}
 
 	@Override
-	public boolean analyze(@NotNull PsiFile psiFile, boolean b, @NotNull HighlightInfoHolder highlightInfoHolder, @NotNull Runnable runnable)
+	public boolean analyze(@Nonnull PsiFile psiFile, boolean b, @Nonnull HighlightInfoHolder highlightInfoHolder, @Nonnull Runnable runnable)
 	{
 		myHighlightInfoHolder = highlightInfoHolder;
 		runnable.run();
 		return true;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public HighlightVisitor clone()
 	{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
index 319a7089..46303ba0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
@@ -28,11 +28,12 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.codeHighlighting.Pass;
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
@@ -199,7 +200,7 @@ protected Query<JSFunction> search(final JSFunction elt)
 	public static Key<Boolean> ourParticipatesInHierarchyKey = Key.create("js.named.item.participates.in.hierarchy");
 
 	@Override
-	public LineMarkerInfo getLineMarkerInfo(@NotNull final PsiElement element)
+	public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element)
 	{
 		if(element instanceof JSFunction)
 		{
@@ -284,7 +285,7 @@ else if(results.size() > 1)
 	}
 
 	@Override
-	public void collectSlowLineMarkers(@NotNull final List<PsiElement> elements, @NotNull final Collection<LineMarkerInfo> result)
+	public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @Nonnull final Collection<LineMarkerInfo> result)
 	{
 		final Map<String, Set<JSFunction>> jsFunctionsToProcess = new THashMap<String, Set<JSFunction>>();
 		final Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new THashMap<JSClass, Set<JSFunction>>();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
index 7de53189..8cf8bfb8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
@@ -18,8 +18,9 @@
 
 import java.util.Properties;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.ide.fileTemplates.FileTemplate;
@@ -67,7 +68,7 @@ public CreateClassOrInterfaceAction(JSReferenceExpression context, boolean isInt
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getName()
 	{
 		final String key = myIsInterface ? "javascript.create.interface.intention.name" : "javascript.create.class.intention.name";
@@ -75,14 +76,14 @@ public String getName()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getFamilyName()
 	{
 		return getName();
 	}
 
 	@Override
-	public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor)
+	public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
 	{
 		PsiFile contextFile = myContext.getContainingFile();
 		final PsiElement context = contextFile.getContext();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
index 9d10880a..d4e29fd3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.inspections;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
@@ -38,21 +39,21 @@ public class JSDeprecatedSymbolsInspection extends JSInspection
 	private static final String SHORT_NAME = "JSDeprecatedSymbols";
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getGroupDisplayName()
 	{
 		return JavaScriptBundle.message("js.inspection.group.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return JavaScriptBundle.message("js.deprecated.symbols.inspection.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	@NonNls
 	public String getShortName()
 	{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
index 74007216..d01ef6b3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.inspections;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
@@ -44,21 +45,21 @@ public class JSDuplicatedDeclarationInspection extends JSInspection
 	private static final String SHORT_NAME = "JSDuplicatedDeclaration";
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getGroupDisplayName()
 	{
 		return JavaScriptBundle.message("js.inspection.group.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return JavaScriptBundle.message("js.duplicated.declaration.inspection.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	@NonNls
 	public String getShortName()
 	{
@@ -227,7 +228,7 @@ public void visitJSVariable(final JSVariable var)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public HighlightDisplayLevel getDefaultLevel()
 	{
 		return HighlightDisplayLevel.WARNING;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
index 6e9343fc..f3f7552a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.inspections;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
 import com.intellij.codeInspection.CustomSuppressableInspectionTool;
 import com.intellij.codeInspection.LocalInspectionTool;
@@ -46,8 +46,8 @@ public abstract class JSInspection extends LocalInspectionTool implements Custom
 	protected abstract JSElementVisitor createVisitor(final ProblemsHolder holder);
 
 	@Override
-	@NotNull
-	public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly)
+	@Nonnull
+	public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder holder, boolean isOnTheFly)
 	{
 		myOnTheFly = isOnTheFly;
 		return createVisitor(holder);
@@ -60,7 +60,7 @@ public boolean isEnabledByDefault()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public HighlightDisplayLevel getDefaultLevel()
 	{
 		return HighlightDisplayLevel.WEAK_WARNING;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
index f5822b7e..9c398367 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
@@ -19,8 +19,9 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
@@ -50,21 +51,21 @@ public class JSUndeclaredVariableInspection extends JSInspection
 	public static final String SHORT_NAME = "JSUndeclaredVariable";
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getGroupDisplayName()
 	{
 		return JavaScriptBundle.message("js.inspection.group.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return JavaScriptBundle.message("js.undeclared.variable.inspection.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	@NonNls
 	public String getShortName()
 	{
@@ -157,21 +158,21 @@ private static class DeclareJSVariableIntentionAction implements LocalQuickFix
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return JavaScriptBundle.message("javascript.declare.variable.intention.name", myReferenceExpression.getReferencedName());
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getFamilyName()
 		{
 			return JavaScriptBundle.message("javascript.create.variable.intention.family");
 		}
 
 		@Override
-		public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor)
+		public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor)
 		{
 			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(myFile))
 			{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
index 1cd58f23..fab25c9f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
@@ -19,9 +19,11 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import org.jetbrains.annotations.PropertyKey;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.codeInsight.template.TemplateManager;
@@ -61,21 +63,21 @@ public class JSUnresolvedFunctionInspection extends JSInspection
 	private static final String SHORT_NAME = "JSUnresolvedFunction";
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getGroupDisplayName()
 	{
 		return JavaScriptBundle.message("js.inspection.group.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return JavaScriptBundle.message("js.unresolved.function.inspection.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	@NonNls
 	public String getShortName()
 	{
@@ -409,7 +411,7 @@ private static void checkTypeIs(JSExpression rOperand, PsiElement node, Problems
 		}
 	}
 
-	static ProblemHighlightType getUnresolveReferenceHighlightType(final @Nullable JSExpression qualifier, @NotNull JSExpression node)
+	static ProblemHighlightType getUnresolveReferenceHighlightType(final @Nullable JSExpression qualifier, @Nonnull JSExpression node)
 	{
 		JSClass jsClass;
 
@@ -585,7 +587,7 @@ private static void checkExpressionIsAssignableToType(final JSExpression expr, f
 		}
 	}
 
-	private static ProblemHighlightType getHighlightTypeForTypeOrSignatureProblem(@NotNull PsiElement node)
+	private static ProblemHighlightType getHighlightTypeForTypeOrSignatureProblem(@Nonnull PsiElement node)
 	{
 		if(node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4)
 		{
@@ -604,21 +606,21 @@ public JSInsertCastFix(final String type)
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return JavaScriptBundle.message("javascript.insert.cast.fix");
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getFamilyName()
 		{
 			return getName();
 		}
 
 		@Override
-		public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor)
+		public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
 		{
 			final PsiElement element = descriptor.getPsiElement();
 			final Editor editor = BaseCreateFix.getEditor(project, element.getContainingFile());
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
index c3495584..858a03e6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
@@ -20,8 +20,9 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemsHolder;
@@ -60,21 +61,21 @@ public class JSUnresolvedVariableInspection extends JSInspection
 	private static final String SHORT_NAME = "JSUnresolvedVariable";
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getGroupDisplayName()
 	{
 		return JavaScriptBundle.message("js.inspection.group.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return JavaScriptBundle.message("js.unresolved.variable.inspection.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	@NonNls
 	public String getShortName()
 	{
@@ -273,7 +274,7 @@ private abstract static class BaseCreateJSVariableIntentionAction extends BaseCr
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getFamilyName()
 		{
 			return JavaScriptBundle.message("javascript.create.variable.intention.family");
@@ -288,7 +289,7 @@ private static class CreateJSNamespaceIntentionAction extends BaseCreateJSVariab
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return JavaScriptBundle.message("javascript.create.namespace.intention.name", myReferencedName);
@@ -322,7 +323,7 @@ private static class CreateJSVariableIntentionAction extends BaseCreateJSVariabl
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return JavaScriptBundle.message(isField ? isConstant ? "javascript.create.constant.field.intention.name" : "javascript.create.property.intention.name" :
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
index 7f664c7c..7a23e846 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
@@ -18,8 +18,9 @@
 
 import java.util.Collections;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.template.Template;
@@ -59,20 +60,20 @@ public class JSUntypedDeclarationInspection extends JSInspection
 	public static final String SHORT_NAME = "JSUntypedDeclaration";
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getGroupDisplayName()
 	{
 		return JavaScriptBundle.message("js.inspection.group.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return JavaScriptBundle.message("js.untyped.declaration.inspection.name");
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public HighlightDisplayLevel getDefaultLevel()
 	{
@@ -80,7 +81,7 @@ public HighlightDisplayLevel getDefaultLevel()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	@NonNls
 	public String getShortName()
 	{
@@ -137,21 +138,21 @@ private static class AddTypeToDclFix implements LocalQuickFix
 	{
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return JavaScriptBundle.message("js.untyped.declaration.problem.addtype.fix");
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getFamilyName()
 		{
 			return getName();
 		}
 
 		@Override
-		public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor)
+		public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
 		{
 			PsiElement anchor = descriptor.getPsiElement();
 			PsiFile containingFile = anchor.getContainingFile();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
index 266b888a..4808f00a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
@@ -24,7 +24,7 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import org.jetbrains.annotations.PropertyKey;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
 import com.intellij.codeInspection.LocalQuickFix;
@@ -59,21 +59,21 @@ public class JSUnusedLocalSymbolsInspection extends JSInspection
 	public static final String SHORT_NAME = "JSUnusedLocalSymbols";
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getGroupDisplayName()
 	{
 		return JavaScriptBundle.message("js.inspection.group.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getDisplayName()
 	{
 		return JavaScriptBundle.message("js.unused.local.symbol.inspection.name");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	@NonNls
 	public String getShortName()
 	{
@@ -269,7 +269,7 @@ private static void processDeclarationHost(final PsiElement node, final Problems
 					continue;
 				}
 				final @NonNls @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String messageId;
-				final @NotNull PsiElement highlightedElement;
+				final @Nonnull PsiElement highlightedElement;
 
 				if(p instanceof JSParameter)
 				{
@@ -428,7 +428,7 @@ private static void handleLocalDeclaration(final JSNamedElement node)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public HighlightDisplayLevel getDefaultLevel()
 	{
 		return HighlightDisplayLevel.WARNING;
@@ -437,21 +437,21 @@ public HighlightDisplayLevel getDefaultLevel()
 	private static class RemoveElementLocalQuickFix implements LocalQuickFix
 	{
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return JavaScriptBundle.message("js.unused.symbol.remove");
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getFamilyName()
 		{
 			return getName();
 		}
 
 		@Override
-		public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor)
+		public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
 		{
 			try
 			{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java b/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
index 80b8eb77..9ea1f062 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
@@ -20,7 +20,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -41,7 +42,7 @@
  */
 public class JavaScriptSymbolContributor implements ChooseByNameContributor
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public String[] getNames(Project project, boolean includeNonProjectItems)
 	{
@@ -64,7 +65,7 @@ public boolean process(String s)
 		return result.toArray(new String[result.size()]);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public NavigationItem[] getItemsByName(String name, final String pattern, Project project, boolean includeNonProjectItems)
 	{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
index bb264ebb..7b2265bd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
@@ -19,9 +19,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.codeInsight.PsiEquivalenceUtil;
 import com.intellij.codeInsight.highlighting.HighlightManager;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -139,7 +141,7 @@ protected static void addExpressionOccurrences(JSExpression expr, List<JSExpress
 	}
 
 	@Override
-	public void invoke(@NotNull final Project project, final Editor editor, PsiFile file, DataContext dataContext)
+	public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file, DataContext dataContext)
 	{
 		if(!editor.getSelectionModel().hasSelection())
 		{
@@ -479,7 +481,7 @@ protected static JSElement addToClassAnchor(final JSElement anchorStatement, fin
 	}
 
 	@Override
-	public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, DataContext dataContext)
+	public void invoke(@Nonnull Project project, @Nonnull PsiElement[] elements, DataContext dataContext)
 	{
 		throw new RuntimeException("Not implemented");
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
index 0e428e54..e0fb9f7d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
@@ -19,7 +19,7 @@
  */
 package com.intellij.lang.javascript.refactoring;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSFunction;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
index 0acb26eb..ca4114bd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.refactoring.extractMethod;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.ApplicationManager;
@@ -37,7 +38,7 @@
 public class JSExtractFunctionHandler implements RefactoringActionHandler
 {
 	@Override
-	public void invoke(@NotNull final Project project, final Editor editor, PsiFile file, DataContext dataContext)
+	public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file, DataContext dataContext)
 	{
 		if(!editor.getSelectionModel().hasSelection())
 		{
@@ -90,7 +91,7 @@ private void doRefactoring(final Project project, final Editor editor, final JSE
 	}
 
 	@Override
-	public void invoke(@NotNull final Project project, @NotNull final PsiElement[] elements, final DataContext dataContext)
+	public void invoke(@Nonnull final Project project, @Nonnull final PsiElement[] elements, final DataContext dataContext)
 	{
 		throw new UnsupportedOperationException();
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
index 17fbd69f..d2a956f8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.search;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.codeInsight.hint.DeclarationRangeHandler;
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.openapi.util.TextRange;
@@ -30,8 +31,8 @@
 public class JSDeclarationRangeHandler implements DeclarationRangeHandler
 {
 	@Override
-	@NotNull
-	public TextRange getDeclarationRange(@NotNull PsiElement container)
+	@Nonnull
+	public TextRange getDeclarationRange(@Nonnull PsiElement container)
 	{
 		JSNamedElement namedElement = (JSNamedElement) container;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
index 23786f56..e8515450 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.search;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.index.JavaScriptIndex;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
@@ -41,7 +42,7 @@
 class JSDefinitionsSearchExecutor implements QueryExecutor<PsiElement, DefinitionsScopedSearch.SearchParameters>
 {
 	@Override
-	public boolean execute(@NotNull final DefinitionsScopedSearch.SearchParameters parameters, @NotNull final Processor<PsiElement> consumer)
+	public boolean execute(@Nonnull final DefinitionsScopedSearch.SearchParameters parameters, @Nonnull final Processor<PsiElement> consumer)
 	{
 		final PsiElement sourceElement = parameters.getElement();
 		if(sourceElement instanceof PsiNamedElement && sourceElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE))
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
index d81c1def..875844a5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.search;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.codeInsight.navigation.GotoTargetHandler;
 import com.intellij.codeInsight.navigation.GotoTargetRendererProvider;
 import com.intellij.ide.util.PsiElementListCellRenderer;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
index 5735a3ee..6e1d49c6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
@@ -19,7 +19,7 @@
  */
 package com.intellij.lang.javascript.structureView;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.ide.structureView.StructureViewModel;
 import com.intellij.ide.structureView.TreeBasedStructureViewBuilder;
@@ -35,7 +35,7 @@ public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile)
 		return new TreeBasedStructureViewBuilder()
 		{
 			@Override
-			@NotNull
+			@Nonnull
 			public StructureViewModel createStructureViewModel(Editor editor)
 			{
 				return new JSStructureViewModel(psiFile);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
index 43db3b8b..39e8cc58 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
@@ -29,7 +29,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
+
 import com.intellij.ide.structureView.StructureViewTreeElement;
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.javascript.index.JSSymbolUtil;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
index 7b7e68f9..40136140 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
@@ -19,8 +19,9 @@
 import java.util.Comparator;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.structureView.StructureViewTreeElement;
@@ -106,14 +107,14 @@ public boolean isVisible()
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public ActionPresentation getPresentation()
 		{
 			return null; // will not be shown
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return ID;
@@ -156,14 +157,14 @@ public boolean isReverted()
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public ActionPresentation getPresentation()
 		{
 			return new ActionPresentationData(IdeBundle.message("action.structureview.show.fields"), null, AllIcons.Nodes.Variable);
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return ID;
@@ -189,7 +190,7 @@ public boolean isVisible(TreeElement treeNode)
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public ActionPresentation getPresentation()
 		{
 			return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), null, IconLoader.getIcon("/hierarchy/supertypes" +
@@ -197,7 +198,7 @@ public ActionPresentation getPresentation()
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return ID;
@@ -248,28 +249,28 @@ public JSStructureViewModel(PsiElement root, final Editor editor)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public StructureViewTreeElement getRoot()
 	{
 		return new JSStructureViewElement(myRoot);
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Grouper[] getGroupers()
 	{
 		return myGroupers;
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Sorter[] getSorters()
 	{
 		return mySorters;
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Filter[] getFilters()
 	{
 		return myFilters;
@@ -299,7 +300,7 @@ public Object getCurrentEditorElement()
 				InjectedLanguageUtil.enumerate(injectionHost, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
-					public void visit(@NotNull final PsiFile injectedPsi, @NotNull final List<PsiLanguageInjectionHost.Shred> places)
+					public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
 					{
 						final PsiLanguageInjectionHost.Shred shred = places.get(0);
 						final int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
@@ -363,7 +364,7 @@ protected PsiFile getPsiFile()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	protected Class[] getSuitableClasses()
 	{
 		return myClasses;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
index 81873f62..7442a195 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
@@ -20,9 +20,9 @@
 import java.util.Collection;
 import java.util.List;
 
+import javax.annotation.Nullable;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.Nullable;
 import com.intellij.ide.util.treeView.smartTree.Group;
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.navigation.ItemPresentation;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
index 6b281750..21900635 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
@@ -22,8 +22,9 @@
 import java.util.Collections;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.smartTree.ActionPresentation;
@@ -48,7 +49,7 @@ class JSSuperGrouper implements Grouper
 	private static final String SHOW_CLASSES = "SHOW_CLASSES";
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Collection<Group> group(final AbstractTreeNode parent, final Collection<TreeElement> children)
 	{
 		if(isParentGrouped(parent))
@@ -116,7 +117,7 @@ private static void addGroup(final Map<String, Group> groups, final TreeElement
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public ActionPresentation getPresentation()
 	{
 		return new ActionPresentationData(IdeBundle.message("action.structureview.group.methods.by.defining.type"), null,
@@ -124,7 +125,7 @@ public ActionPresentation getPresentation()
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getName()
 	{
 		return SHOW_CLASSES;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
index fb8bc35b..fad07339 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
@@ -16,7 +16,8 @@
 
 package com.intellij.lang.javascript.surroundWith;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -41,7 +42,7 @@ public class JSExpressionSurroundDescriptor implements SurroundDescriptor
 	};
 
 	@Override
-	@NotNull
+	@Nonnull
 	public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset)
 	{
 		final JSExpression expr = findExpressionInRange(file, startOffset, endOffset);
@@ -53,7 +54,7 @@ public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int end
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Surrounder[] getSurrounders()
 	{
 		return SURROUNDERS;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
index d3fb8ade..d80f105a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
@@ -16,9 +16,11 @@
 
 package com.intellij.lang.javascript.surroundWith;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.surroundWith.Surrounder;
@@ -39,14 +41,14 @@
 public abstract class JSStatementSurrounder implements Surrounder
 {
 	@Override
-	public boolean isApplicable(@NotNull PsiElement[] elements)
+	public boolean isApplicable(@Nonnull PsiElement[] elements)
 	{
 		return true;
 	}
 
 	@Override
 	@Nullable
-	public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, @NotNull PsiElement[] elements) throws
+	public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements) throws
 			IncorrectOperationException
 	{
 		ASTNode node = JSChangeUtil.createStatementFromText(project, getStatementTemplate(project, elements[0]));
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
index 13fb7818..1208c8c8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
@@ -19,7 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFile;
@@ -57,7 +58,7 @@ public class JSStatementsSurroundDescriptor implements SurroundDescriptor
 	};
 
 	@Override
-	@NotNull
+	@Nonnull
 	public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset)
 	{
 		final PsiElement[] statements = findStatementsInRange(file, startOffset, endOffset);
@@ -69,7 +70,7 @@ public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int end
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public Surrounder[] getSurrounders()
 	{
 		return SURROUNDERS;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
index 3c571ba0..073bbc60 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.surroundWith;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -45,14 +46,14 @@ public String getTemplateDescription()
 	}
 
 	@Override
-	public boolean isApplicable(@NotNull PsiElement[] elements)
+	public boolean isApplicable(@Nonnull PsiElement[] elements)
 	{
 		return true;
 	}
 
 	@Override
 	@Nullable
-	public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, @NotNull PsiElement[] elements) throws
+	public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements) throws
 			IncorrectOperationException
 	{
 		JSExpression expr = (JSExpression) elements[0];
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
index 52170649..2697302f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.surroundWith;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
@@ -50,7 +51,7 @@ protected String getStatementTemplate(final Project project, PsiElement context)
 		return "try { } catch(e" + getExceptionVarTypeBasedOnContext(context) + ") { } finally { }";
 	}
 
-	protected static String getExceptionVarTypeBasedOnContext(@NotNull PsiElement context)
+	protected static String getExceptionVarTypeBasedOnContext(@Nonnull PsiElement context)
 	{
 		if(context.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4)
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
index 5831f95f..a0ae7b20 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
@@ -25,7 +25,7 @@
 import java.util.Set;
 
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.flex.ImportUtils;
@@ -64,7 +64,7 @@ public BaseCreateMethodsFix(final JSClass jsClass)
 		myJsClass = jsClass;
 	}
 
-	public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
+	public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
 	{
 		evalAnchor(editor, file);
 		for(T e : getElementsToProcess())
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
index 040a9855..be2eafdd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.validation;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAttributeList;
@@ -42,21 +43,21 @@ public ImplementMethodsFix(final JSClass jsClass)
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getText()
 	{
 		return JavaScriptBundle.message("javascript.fix.implement.methods");
 	}
 
 	@Override
-	@NotNull
+	@Nonnull
 	public String getFamilyName()
 	{
 		return getText();
 	}
 
 	@Override
-	public boolean isAvailable(@NotNull final Project project, final Editor editor, final PsiFile file)
+	public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
 	{
 		return myJsClass.isValid();
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
index f970a0b6..f6133d92 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
@@ -19,7 +19,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
index a6794422..84676df9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
@@ -25,8 +25,9 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
@@ -317,7 +318,7 @@ else if(incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS)
 		JSResolveUtil.processInterfaceMethods(jsClass, implementedMethodProcessor);
 	}
 
-	private static ASTNode findElementForAccessModifierError(final @NotNull JSFunction o, final JSAttributeList attributeList)
+	private static ASTNode findElementForAccessModifierError(final @Nonnull JSFunction o, final JSAttributeList attributeList)
 	{
 		if(attributeList != null)
 		{
@@ -1173,27 +1174,27 @@ private void checkPackageStatement(final JSPackageStatement packageStatement)
 			annotation.registerFix(new IntentionAction()
 			{
 				@Override
-				@NotNull
+				@Nonnull
 				public String getText()
 				{
 					return JavaScriptBundle.message("javascript.fix.package.name", expected);
 				}
 
 				@Override
-				@NotNull
+				@Nonnull
 				public String getFamilyName()
 				{
 					return getText();
 				}
 
 				@Override
-				public boolean isAvailable(@NotNull final Project project, final Editor editor, final PsiFile file)
+				public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
 				{
 					return packageStatement.isValid();
 				}
 
 				@Override
-				public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
+				public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
 				{
 					JSPackageStatementImpl.doChangeName(project, packageStatement, expected);
 				}
@@ -1247,34 +1248,34 @@ public RemoveASTNodeFix(@PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) S
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getText()
 		{
 			return JavaScriptBundle.message(myPropKey);
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getName()
 		{
 			return getText();
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getFamilyName()
 		{
 			return getText();
 		}
 
 		@Override
-		public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor)
+		public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor)
 		{
 			invoke(project, null, descriptor.getPsiElement().getContainingFile());
 		}
 
 		@Override
-		public boolean isAvailable(@NotNull final Project project, final Editor editor, final PsiFile file)
+		public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
 		{
 			for(ASTNode astNode : myAstNodes)
 			{
@@ -1288,7 +1289,7 @@ public boolean isAvailable(@NotNull final Project project, final Editor editor,
 		}
 
 		@Override
-		public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
+		public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
 		{
 			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
 			{
@@ -1320,27 +1321,27 @@ public AddOverrideIntentionAction(final JSFunction node)
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getText()
 		{
 			return JavaScriptBundle.message("javascript.fix.add.override.modifier");
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getFamilyName()
 		{
 			return getText();
 		}
 
 		@Override
-		public boolean isAvailable(@NotNull final Project project, final Editor editor, final PsiFile file)
+		public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
 		{
 			return myNode.isValid();
 		}
 
 		@Override
-		public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
+		public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
 		{
 			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
 			{
@@ -1404,27 +1405,27 @@ public AddSuperInvokationFix(JSReferenceExpression node, JSFunction superConstru
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getText()
 		{
 			return JavaScriptBundle.message("javascript.fix.create.invoke.super");
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getFamilyName()
 		{
 			return getText();
 		}
 
 		@Override
-		public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file)
+		public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file)
 		{
 			return superConstructor.isValid() && node.isValid();
 		}
 
 		@Override
-		public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException
+		public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException
 		{
 			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
 			{
@@ -1486,27 +1487,27 @@ private static class AddConstructorAndSuperInvokationFix implements IntentionAct
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getText()
 		{
 			return JavaScriptBundle.message("javascript.fix.create.constructor.invoke.super");
 		}
 
 		@Override
-		@NotNull
+		@Nonnull
 		public String getFamilyName()
 		{
 			return getText();
 		}
 
 		@Override
-		public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file)
+		public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file)
 		{
 			return node.isValid() && superConstructor.isValid();
 		}
 
 		@Override
-		public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException
+		public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException
 		{
 			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
 			{
diff --git a/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java b/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
index 17247992..0cc154a2 100644
--- a/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
+++ b/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.copyright;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -27,7 +28,7 @@
 
 public class UpdateJavaScriptFileCopyright extends UpdatePsiFileCopyright<CopyrightFileConfig>
 {
-	public UpdateJavaScriptFileCopyright(@NotNull PsiFile psiFile, @NotNull CopyrightProfile copyrightProfile)
+	public UpdateJavaScriptFileCopyright(@Nonnull PsiFile psiFile, @Nonnull CopyrightProfile copyrightProfile)
 	{
 		super(psiFile, copyrightProfile);
 	}
diff --git a/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java b/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
index f50c7613..f78ff700 100644
--- a/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
+++ b/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
@@ -1,6 +1,7 @@
 package consulo.javascript.copyright;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
@@ -16,23 +17,23 @@
  */
 public class UpdateJavaScriptFileCopyrightProvider extends UpdateCopyrightsProvider<CopyrightFileConfig>
 {
-	@NotNull
+	@Nonnull
 	@Override
-	public UpdatePsiFileCopyright<CopyrightFileConfig> createInstance(@NotNull PsiFile file, @NotNull CopyrightProfile copyrightProfile)
+	public UpdatePsiFileCopyright<CopyrightFileConfig> createInstance(@Nonnull PsiFile file, @Nonnull CopyrightProfile copyrightProfile)
 	{
 		return new UpdateJavaScriptFileCopyright(file, copyrightProfile);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public CopyrightFileConfig createDefaultOptions()
 	{
 		return new CopyrightFileConfig();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public TemplateCommentPanel createConfigurable(@NotNull Project project, @NotNull TemplateCommentPanel parentPane, @NotNull FileType fileType)
+	public TemplateCommentPanel createConfigurable(@Nonnull Project project, @Nonnull TemplateCommentPanel parentPane, @Nonnull FileType fileType)
 	{
 		return new TemplateCommentPanel(fileType, parentPane, project);
 	}
diff --git a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java b/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
index 14176a70..04d0c1e9 100644
--- a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
+++ b/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
@@ -1,6 +1,7 @@
 package consulo.javascript.formatter;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.application.options.CodeStyleAbstractConfigurable;
 import com.intellij.application.options.CodeStyleAbstractPanel;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
@@ -11,7 +12,7 @@
  */
 public class JavaScriptCodeStyleConfigurable extends CodeStyleAbstractConfigurable
 {
-	public JavaScriptCodeStyleConfigurable(@NotNull CodeStyleSettings settings, CodeStyleSettings cloneSettings)
+	public JavaScriptCodeStyleConfigurable(@Nonnull CodeStyleSettings settings, CodeStyleSettings cloneSettings)
 	{
 		super(settings, cloneSettings, "JavaScript");
 	}
diff --git a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index bb242ba5..0d769dd7 100644
--- a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -2,7 +2,8 @@
 
 import java.io.IOException;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.application.options.IndentOptionsEditor;
 import com.intellij.application.options.SmartIndentOptionsEditor;
 import com.intellij.lang.Language;
@@ -38,7 +39,7 @@ public CommonCodeStyleSettings getDefaultCommonSettings()
 		return defaultSettings;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Language getLanguage()
 	{
@@ -46,7 +47,7 @@ public Language getLanguage()
 	}
 
 	@Override
-	public void customizeSettings(@NotNull CodeStyleSettingsCustomizable consumer, @NotNull SettingsType settingsType)
+	public void customizeSettings(@Nonnull CodeStyleSettingsCustomizable consumer, @Nonnull SettingsType settingsType)
 	{
 		if(settingsType == SettingsType.SPACING_SETTINGS)
 		{
@@ -79,7 +80,7 @@ else if(settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS)
 	}
 
 	@Override
-	public String getCodeSample(@NotNull SettingsType settingsType)
+	public String getCodeSample(@Nonnull SettingsType settingsType)
 	{
 		if(settingsType == SettingsType.SPACING_SETTINGS)
 		{
diff --git a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
index e5909ed5..a42dc3e6 100644
--- a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
+++ b/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
@@ -16,10 +16,10 @@
 
 package consulo.javascript.ide;
 
+import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -38,7 +38,7 @@ public class JavaScriptIconDescriptorUpdater implements IconDescriptorUpdater
 {
 	@RequiredReadAction
 	@Override
-	public void updateIcon(@NotNull IconDescriptor iconDescriptor, @NotNull PsiElement element, int flags)
+	public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiElement element, int flags)
 	{
 		if(element instanceof JSProperty)
 		{
diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index f3a06e9f..4bb47b0b 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -1,6 +1,6 @@
 package consulo.javascript.ide.actions;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import com.intellij.ide.IdeView;
 import com.intellij.ide.actions.CreateFileFromTemplateAction;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
diff --git a/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
index 33a269ae..0afde87d 100644
--- a/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.ide.completion;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.codeInsight.completion.CompletionContributor;
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionResultSet;
@@ -43,7 +43,7 @@ public JavaScriptKeywordCompletionContributor()
 		{
 			@RequiredReadAction
 			@Override
-			public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result)
+			public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
 			{
 				PsiElement position = parameters.getPosition();
 				JSReferenceExpression parent = (JSReferenceExpression) position.getParent();
diff --git a/plugin/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/plugin/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
index 6810f606..a0548493 100644
--- a/plugin/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
+++ b/plugin/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
@@ -1,6 +1,7 @@
 package consulo.javascript.ide.hightlight;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import consulo.fileTypes.LanguageVersionableSyntaxHighlighterFactory;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
@@ -18,9 +19,9 @@ public JavaScriptSyntaxHighlightFactory()
 		super(JavaScriptLanguage.INSTANCE);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
-	public SyntaxHighlighter getSyntaxHighlighter(@NotNull LanguageVersion languageVersion)
+	public SyntaxHighlighter getSyntaxHighlighter(@Nonnull LanguageVersion languageVersion)
 	{
 		if(languageVersion instanceof BaseJavaScriptLanguageVersion)
 		{
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
index 54e4fb58..39b98150 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
@@ -28,7 +28,7 @@
 public class JavaScriptFileTypeFactory extends FileTypeFactory
 {
 	@Override
-	public void createFileTypes(@NotNull FileTypeConsumer consumer)
+	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
 	{
 		consumer.consume(JavaScriptFileType.INSTANCE);
 	}
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index a98c70eb..3cfdd76b 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -16,8 +16,9 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
@@ -35,9 +36,9 @@
 public class JavaScriptLanguageVersionResolver implements LanguageVersionResolver
 {
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
-	public LanguageVersion getLanguageVersion(@NotNull Language language, @Nullable PsiElement element)
+	public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable PsiElement element)
 	{
 		PsiFile containingFile = element == null ? null : element.getContainingFile();
 		if(containingFile == null)
@@ -53,10 +54,10 @@ public LanguageVersion getLanguageVersion(@NotNull Language language, @Nullable
 		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 	}
 
-	@NotNull
+	@Nonnull
 	@RequiredReadAction
 	@Override
-	public LanguageVersion getLanguageVersion(@NotNull Language language, @Nullable Project project, @Nullable VirtualFile virtualFile)
+	public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable Project project, @Nullable VirtualFile virtualFile)
 	{
 		if(project == null || virtualFile == null)
 		{
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
index e749d004..a7dd6515 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
@@ -16,7 +16,8 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageUtil;
@@ -39,14 +40,14 @@
  */
 public class JavaScriptParsingDefinition extends LanguageVersionableParserDefinition
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public IFileElementType getFileNodeType()
 	{
 		return JSElementTypes.FILE;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public PsiElement createElement(ASTNode node)
 	{
@@ -74,7 +75,7 @@ public PsiFile createFile(FileViewProvider fileViewProvider)
 		return new JSFileImpl(fileViewProvider);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right)
 	{
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
index 5488fa76..c2ed08c0 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.lang;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.codeInsight.editorActions.JavaLikeQuoteHandler;
 import com.intellij.codeInsight.editorActions.SimpleTokenSetQuoteHandler;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -54,7 +54,7 @@ public TokenSet getStringTokenTypes()
 	}
 
 	@Override
-	public boolean isAppropriateElementTypeForLiteral(@NotNull IElementType tokenType)
+	public boolean isAppropriateElementTypeForLiteral(@Nonnull IElementType tokenType)
 	{
 		return JavaScriptTokenSets.COMMENTS.contains(tokenType) ||
 				tokenType == JSTokenTypes.WHITE_SPACE ||
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
index 4a563f32..80c93152 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
@@ -17,7 +17,7 @@
 package consulo.javascript.lang;
 
 import org.intellij.lang.regexp.RegExpLanguage;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
@@ -36,7 +36,7 @@ public class JavaScriptRegexpMultiHostInjector implements MultiHostInjector
 {
 	@Override
 	@RequiredReadAction
-	public void injectLanguages(@NotNull MultiHostRegistrar registrar, @NotNull PsiElement context)
+	public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement context)
 	{
 		if(context instanceof JSSimpleLiteralExpression)
 		{
diff --git a/plugin/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java b/plugin/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
index 12d9cec1..9a22f05f 100644
--- a/plugin/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
+++ b/plugin/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
@@ -20,7 +20,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
+
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.navigation.ChooseByNameContributor;
 import com.intellij.navigation.NavigationItem;
@@ -36,7 +37,7 @@
  */
 public class JavaScriptClassContributor implements ChooseByNameContributor
 {
-	@NotNull
+	@Nonnull
 	@Override
 	public String[] getNames(Project project, boolean includeNonProjectItems)
 	{
@@ -47,7 +48,7 @@ public String[] getNames(Project project, boolean includeNonProjectItems)
 		return ArrayUtil.toStringArray(result);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public NavigationItem[] getItemsByName(String name, final String pattern, Project project, boolean includeNonProjectItems)
 	{
diff --git a/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java b/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
index cc465d76..5834bbb9 100644
--- a/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
+++ b/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
@@ -16,8 +16,9 @@
 
 package consulo.javascript.lang.psi;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import consulo.annotations.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
@@ -30,14 +31,14 @@ public class JavaScriptSimpleType implements JavaScriptType
 	private String myReferenceName;
 	private PsiElement myElement;
 
-	public JavaScriptSimpleType(@NotNull String referenceName, @Nullable PsiElement element)
+	public JavaScriptSimpleType(@Nonnull String referenceName, @Nullable PsiElement element)
 	{
 		myReferenceName = referenceName;
 		myElement = element;
 	}
 
 	@RequiredReadAction
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableText()
 	{
diff --git a/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
index e055e222..4140703e 100644
--- a/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
+++ b/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
@@ -17,8 +17,8 @@
 
 package consulo.javascript.psi.impl.reference;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReference;
 import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSProperty;
@@ -34,7 +34,7 @@ public class DefaultJSPropertyNameReferenceProvider implements JSPropertyNameRef
 	@RequiredReadAction
 	@Nullable
 	@Override
-	public PsiReference getReference(@NotNull JSProperty property)
+	public PsiReference getReference(@Nonnull JSProperty property)
 	{
 		PsiElement nameIdentifier = property.getNameIdentifier();
 		assert nameIdentifier != null;
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index 27e29d85..cccd38e0 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -1,8 +1,10 @@
 package consulo.javascript.client.module.extension;
 
+import javax.annotation.Nonnull;
+
 import org.jdom.Element;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
+import javax.annotation.Nullable;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.projectRoots.Sdk;
@@ -30,14 +32,14 @@ public class ClientJavaScriptModuleExtension extends ModuleExtensionImpl<ClientJ
 
 	protected LanguageVersion myLanguageVersion = StandardJavaScriptVersions.getInstance().getDefaultVersion();
 
-	public ClientJavaScriptModuleExtension(@NotNull String id, @NotNull ModuleRootLayer rootLayer)
+	public ClientJavaScriptModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootLayer)
 	{
 		super(id, rootLayer);
 		myPointer = new ModuleInheritableNamedPointerImpl<Sdk>(rootLayer, id)
 		{
 			@Nullable
 			@Override
-			public String getItemNameFromModule(@NotNull Module module)
+			public String getItemNameFromModule(@Nonnull Module module)
 			{
 				ClientJavaScriptModuleExtension extension = ModuleUtilCore.getExtension(module, ClientJavaScriptModuleExtension.class);
 				if(extension == null)
@@ -49,7 +51,7 @@ public String getItemNameFromModule(@NotNull Module module)
 
 			@Nullable
 			@Override
-			public Sdk getItemFromModule(@NotNull Module module)
+			public Sdk getItemFromModule(@Nonnull Module module)
 			{
 				ClientJavaScriptModuleExtension extension = ModuleUtilCore.getExtension(module, ClientJavaScriptModuleExtension.class);
 				if(extension == null)
@@ -59,9 +61,9 @@ public Sdk getItemFromModule(@NotNull Module module)
 				return extension.getSdk();
 			}
 
-			@NotNull
+			@Nonnull
 			@Override
-			public NamedPointer<Sdk> getPointer(@NotNull ModuleRootLayer moduleRootLayer, @NotNull String name)
+			public NamedPointer<Sdk> getPointer(@Nonnull ModuleRootLayer moduleRootLayer, @Nonnull String name)
 			{
 				return ((ModuleRootLayerImpl)moduleRootLayer).getRootModel().getConfigurationAccessor().getSdkPointer(name);
 			}
@@ -73,14 +75,14 @@ public NamedPointer<Sdk> getPointer(@NotNull ModuleRootLayer moduleRootLayer, @N
 
 	@RequiredReadAction
 	@Override
-	protected void loadStateImpl(@NotNull Element element)
+	protected void loadStateImpl(@Nonnull Element element)
 	{
 		super.loadStateImpl(element);
 		myLanguageVersion = StandardJavaScriptVersions.getInstance().findVersionById(element.getAttributeValue("language-version"));
 	}
 
 	@Override
-	protected void getStateImpl(@NotNull Element element)
+	protected void getStateImpl(@Nonnull Element element)
 	{
 		super.getStateImpl(element);
 		if(myLanguageVersion != StandardJavaScriptVersions.getInstance().getDefaultVersion())
@@ -89,7 +91,7 @@ protected void getStateImpl(@NotNull Element element)
 		}
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public ModuleInheritableNamedPointer<Sdk> getInheritableSdk()
 	{
@@ -110,14 +112,14 @@ public String getSdkName()
 		return myPointer.getName();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public Class<? extends SdkType> getSdkTypeClass()
 	{
 		throw new IllegalArgumentException();
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public LanguageVersion getLanguageVersion()
 	{
@@ -126,7 +128,7 @@ public LanguageVersion getLanguageVersion()
 
 	@RequiredReadAction
 	@Override
-	public void commit(@NotNull ClientJavaScriptModuleExtension mutableModuleExtension)
+	public void commit(@Nonnull ClientJavaScriptModuleExtension mutableModuleExtension)
 	{
 		super.commit(mutableModuleExtension);
 		myLanguageVersion = mutableModuleExtension.getLanguageVersion();
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index c50a9718..8cfa7e39 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -23,7 +23,7 @@
 import javax.swing.JList;
 import javax.swing.JPanel;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.ui.VerticalFlowLayout;
@@ -63,7 +63,7 @@ public void itemStateChanged(ItemEvent e)
 		languageVersionComboBox.setRenderer(new ColoredListCellRenderer<BaseJavaScriptLanguageVersion>()
 		{
 			@Override
-			protected void customizeCellRenderer(@NotNull JList list, BaseJavaScriptLanguageVersion value, int index, boolean selected, boolean hasFocus)
+			protected void customizeCellRenderer(@Nonnull JList list, BaseJavaScriptLanguageVersion value, int index, boolean selected, boolean hasFocus)
 			{
 				append(value.getPresentableName());
 			}
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index 853b103e..0a1b4efe 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -1,9 +1,9 @@
 package consulo.javascript.client.module.extension;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.swing.JComponent;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.openapi.projectRoots.Sdk;
 import consulo.annotations.RequiredDispatchThread;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
@@ -17,12 +17,12 @@
  */
 public class ClientJavaScriptMutableModuleExtension extends ClientJavaScriptModuleExtension implements JavaScriptMutableModuleExtension<ClientJavaScriptModuleExtension>
 {
-	public ClientJavaScriptMutableModuleExtension(@NotNull String id, @NotNull ModuleRootLayer rootModel)
+	public ClientJavaScriptMutableModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootModel)
 	{
 		super(id, rootModel);
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public MutableModuleInheritableNamedPointer<Sdk> getInheritableSdk()
 	{
@@ -32,7 +32,7 @@ public MutableModuleInheritableNamedPointer<Sdk> getInheritableSdk()
 	@RequiredDispatchThread
 	@Nullable
 	@Override
-	public JComponent createConfigurablePanel(@NotNull Runnable updateOnCheck)
+	public JComponent createConfigurablePanel(@Nonnull Runnable updateOnCheck)
 	{
 		return new ClientJavaScriptModuleExtensionPanel(this);
 	}
@@ -44,13 +44,13 @@ public void setEnabled(boolean val)
 	}
 
 	@Override
-	public boolean isModified(@NotNull ClientJavaScriptModuleExtension originalExtension)
+	public boolean isModified(@Nonnull ClientJavaScriptModuleExtension originalExtension)
 	{
 		return myIsEnabled != originalExtension.isEnabled() || myLanguageVersion != originalExtension.getLanguageVersion();
 	}
 
 	@Override
-	public void setLanguageVersion(@NotNull LanguageVersion languageVersion)
+	public void setLanguageVersion(@Nonnull LanguageVersion languageVersion)
 	{
 		myLanguageVersion = languageVersion;
 	}
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index 4513f0d0..b07af43f 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -4,7 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManager;
 import com.intellij.ide.plugins.cl.PluginClassLoader;
@@ -33,7 +33,7 @@ public class ClientJavaScriptPredefinedBundlesProvider extends PredefinedBundles
 	};
 
 	@Override
-	public void createBundles(@NotNull Consumer<SdkImpl> consumer)
+	public void createBundles(@Nonnull Consumer<SdkImpl> consumer)
 	{
 		PluginClassLoader classLoader = (PluginClassLoader) getClass().getClassLoader();
 		IdeaPluginDescriptor plugin = PluginManager.getPlugin(classLoader.getPluginId());
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index 2922e101..47e22f1a 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -1,9 +1,9 @@
 package consulo.javascript.client.module.sdk;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.swing.Icon;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.projectRoots.SdkType;
 import com.intellij.openapi.roots.OrderRootType;
@@ -16,7 +16,7 @@
  */
 public class ClientJavaScriptSdkType extends SdkType
 {
-	@NotNull
+	@Nonnull
 	public static ClientJavaScriptSdkType getInstance()
 	{
 		return EP_NAME.findExtension(ClientJavaScriptSdkType.class);
@@ -65,7 +65,7 @@ public String suggestSdkName(String currentSdkName, String sdkHome)
 		return currentSdkName;
 	}
 
-	@NotNull
+	@Nonnull
 	@Override
 	public String getPresentableName()
 	{

From b63d533d953a1c58f254207d8901c9f11f5e9ae8 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 6 May 2018 22:19:44 +0300
Subject: [PATCH 039/340] migrated to ui image

---
 .../lang/javascript/JavaScriptFileType.java       |  3 ++-
 .../intellij/lang/javascript/JavaScriptIcons.java | 15 +++++++--------
 .../javascript/debugger/JavaScriptListPanel.java  |  3 ++-
 .../javascript/run/debug/V8DebugProcess.java      |  3 ++-
 .../actionscript/ActionScriptFileType.java        | 10 +++++-----
 .../javascript/lang/EcmaScriptFileType.java       |  8 ++++----
 .../src/main/java/consulo/json/JsonFileType.java  |  8 ++++----
 .../consulo/typescript/TypeScriptFileType.java    |  6 +++---
 .../ide/actions/JavaScriptCreateFileAction.java   |  5 +++--
 .../module/sdk/ClientJavaScriptSdkType.java       |  4 ++--
 10 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
index 68fe9613..564b7bf1 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -30,6 +30,7 @@
 import consulo.javascript.lang.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.lang.LanguageVersion;
+import consulo.ui.image.Image;
 
 /**
  * User: max
@@ -67,7 +68,7 @@ public String getDefaultExtension()
 	}
 
 	@Override
-	public Icon getIcon()
+	public Image getIcon()
 	{
 		return JavaScriptIcons.JavaScript;
 	}
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
index 5a961d71..119512af 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
@@ -16,17 +16,16 @@
 
 package com.intellij.lang.javascript;
 
-import javax.swing.Icon;
-
 import com.intellij.openapi.util.IconLoader;
+import consulo.ui.image.Image;
 
 // Generated Consulo DevKit plugin 
 public interface JavaScriptIcons
 {
-	Icon As = IconLoader.getIcon("/icons/as.png");  // 16x16
-	Icon EcmaScript = IconLoader.getIcon("/icons/ecmaScript.png");  // 16x16
-	Icon JavaScript = IconLoader.getIcon("/icons/javaScript.png");  // 16x16
-	Icon Json = IconLoader.getIcon("/icons/json.png");  // 16x16
-	Icon Jsx = IconLoader.getIcon("/icons/jsx.png");  // 16x16
-	Icon TypeScript = IconLoader.getIcon("/icons/typeScript.png");  // 16x16
+	Image As = IconLoader.getIcon("/icons/as.png");  // 16x16
+	Image EcmaScript = IconLoader.getIcon("/icons/ecmaScript.png");  // 16x16
+	Image JavaScript = IconLoader.getIcon("/icons/javaScript.png");  // 16x16
+	Image Json = IconLoader.getIcon("/icons/json.png");  // 16x16
+	Image Jsx = IconLoader.getIcon("/icons/jsx.png");  // 16x16
+	Image TypeScript = IconLoader.getIcon("/icons/typeScript.png");  // 16x16
 }
\ No newline at end of file
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
index 3cedcb01..3797890d 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
@@ -35,6 +35,7 @@
 import com.intellij.ui.SortedListModel;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.JBScrollPane;
+import consulo.awt.TargetAWT;
 
 /**
  * @author VISTALL
@@ -83,7 +84,7 @@ public void customize(JList list, T value, int index, boolean selected, boolean
 				{
 					setBackground(FileColorManager.getInstance(myProject).getFileColor(virtualFile));
 					setText(virtualFile.getPath());
-					setIcon(virtualFile.getFileType().getIcon());
+					setIcon(TargetAWT.to(virtualFile.getFileType().getIcon()));
 				}
 			}
 		});
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
index 15aa193e..bae427da 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
@@ -54,6 +54,7 @@
 import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 import com.intellij.xdebugger.ui.XDebugTabLayouter;
 import consulo.annotations.Exported;
+import consulo.awt.TargetAWT;
 import consulo.javascript.debugger.JavaScriptEditorsProvider;
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
 import consulo.javascript.debugger.JavaScriptListPanel;
@@ -263,7 +264,7 @@ public XDebugTabLayouter createTabLayouter()
 			@Override
 			public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui)
 			{
-				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIcons.JavaScript, null);
+				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", TargetAWT.to(JavaScriptIcons.JavaScript), null);
 				content.setCloseable(false);
 
 				ui.addContent(content);
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
index d8939cbd..eae0b299 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
@@ -17,17 +17,17 @@
 package consulo.actionscript;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
-
 import javax.annotation.Nullable;
-import consulo.actionscript.lang.ActionScriptLanguageVersion;
+
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import consulo.actionscript.lang.ActionScriptLanguageVersion;
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -44,7 +44,7 @@ private ActionScriptFileType()
 
 	@Nonnull
 	@Override
-	public String getName()
+	public String getId()
 	{
 		return "ACTIONSCRIPT";
 	}
@@ -65,7 +65,7 @@ public String getDefaultExtension()
 
 	@Nullable
 	@Override
-	public Icon getIcon()
+	public Image getIcon()
 	{
 		return JavaScriptIcons.As;
 	}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
index d414455c..24e82d31 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
@@ -16,15 +16,15 @@
 
 package consulo.javascript.lang;
 
-import javax.swing.Icon;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.lang.LanguageVersion;
+
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import consulo.lang.LanguageVersion;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -62,7 +62,7 @@ public String getDefaultExtension()
 
 	@Nullable
 	@Override
-	public Icon getIcon()
+	public Image getIcon()
 	{
 		return JavaScriptIcons.EcmaScript;
 	}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
index c78fbb35..b5e38622 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
@@ -17,9 +17,8 @@
 package consulo.json;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
-
 import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
@@ -27,6 +26,7 @@
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.json.lang.JsonJavaScriptVersion;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -43,7 +43,7 @@ private JsonFileType()
 
 	@Nonnull
 	@Override
-	public String getName()
+	public String getId()
 	{
 		return "JSON";
 	}
@@ -64,7 +64,7 @@ public String getDefaultExtension()
 
 	@Nullable
 	@Override
-	public Icon getIcon()
+	public Image getIcon()
 	{
 		return JavaScriptIcons.Json;
 	}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index 99c4a8f7..b9fe5e4c 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -18,12 +18,12 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.swing.Icon;
 
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -40,7 +40,7 @@ private TypeScriptFileType()
 
 	@Nonnull
 	@Override
-	public String getName()
+	public String getId()
 	{
 		return "TypeScript";
 	}
@@ -61,7 +61,7 @@ public String getDefaultExtension()
 
 	@Nullable
 	@Override
-	public Icon getIcon()
+	public Image getIcon()
 	{
 		return JavaScriptIcons.TypeScript;
 	}
diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index 4bb47b0b..973f631a 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -15,6 +15,7 @@
 import com.intellij.psi.PsiDirectory;
 import consulo.annotations.RequiredDispatchThread;
 import consulo.annotations.RequiredReadAction;
+import consulo.awt.TargetAWT;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 
 /**
@@ -25,7 +26,7 @@ public class JavaScriptCreateFileAction extends CreateFileFromTemplateAction
 {
 	public JavaScriptCreateFileAction()
 	{
-		super(null, null, JavaScriptFileType.INSTANCE.getIcon());
+		super(null, null, TargetAWT.to(JavaScriptFileType.INSTANCE.getIcon()));
 	}
 
 	@Override
@@ -77,7 +78,7 @@ protected void buildDialog(Project project, PsiDirectory directory, CreateFileFr
 	{
 		builder.setTitle("Create JavaScript File");
 
-		builder.addKind("Empty File", JavaScriptFileType.INSTANCE.getIcon(), "JavaScriptFile");
+		builder.addKind("Empty File", TargetAWT.to(JavaScriptFileType.INSTANCE.getIcon()), "JavaScriptFile");
 	}
 
 	@Override
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index 47e22f1a..7a56b90d 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -2,13 +2,13 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.swing.Icon;
 
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.projectRoots.SdkType;
 import com.intellij.openapi.roots.OrderRootType;
 import consulo.roots.types.BinariesOrderRootType;
 import consulo.roots.types.SourcesOrderRootType;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -41,7 +41,7 @@ public boolean isRootTypeApplicable(OrderRootType type)
 
 	@Nullable
 	@Override
-	public Icon getIcon()
+	public Image getIcon()
 	{
 		return JavaScriptIcons.JavaScript;
 	}

From 6fe0285e28af8cdda6e4c357119b7538e918a624 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 7 May 2018 15:07:44 +0300
Subject: [PATCH 040/340] use image

---
 .../src/main/java/consulo/json/jom/JomFileDescriptor.java     | 4 ++--
 .../main/java/consulo/json/jom/JomIconDescriptorUpdater.java  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
index 31b963cb..b9be82fa 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
@@ -17,10 +17,10 @@
 package consulo.json.jom;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
 
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.PsiFile;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -44,7 +44,7 @@ public Class<T> getDefinitionClass()
 	}
 
 	@Nonnull
-	public abstract Icon getIcon();
+	public abstract Image getIcon();
 
 	public abstract boolean isMyFile(@Nonnull PsiFile psiFile);
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
index 4583b759..7ad459d5 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -20,6 +20,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import consulo.annotations.RequiredReadAction;
+import consulo.awt.TargetAWT;
 import consulo.ide.IconDescriptor;
 import consulo.ide.IconDescriptorUpdater;
 
@@ -38,7 +39,7 @@ public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiEleme
 			JomFileElement<JomElement> fileElement = JomManager.getInstance(element.getProject()).getFileElement((PsiFile) element);
 			if(fileElement != null)
 			{
-				iconDescriptor.setMainIcon(fileElement.getFileDescriptor().getIcon());
+				iconDescriptor.setMainIcon(TargetAWT.to(fileElement.getFileDescriptor().getIcon()));
 			}
 		}
 	}

From 120f8ac4fa962b27c059c4c8e6c411aec6d6aa1d Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 7 May 2018 18:41:22 +0300
Subject: [PATCH 041/340] compilation

---
 .../intellij/lang/javascript/index/JSItemPresentation.java  | 3 ++-
 .../lang/javascript/psi/impl/JSExpressionStatementImpl.java | 3 ++-
 .../java/consulo/json/jom/JomIconDescriptorUpdater.java     | 4 ++--
 .../validation/completion/JsonCompletionContributor.java    | 3 ++-
 .../lang/javascript/generation/JSNamedElementNode.java      | 3 ++-
 .../structureView/JSStructureItemPresentation.java          | 3 ++-
 .../javascript/ide/JavaScriptIconDescriptorUpdater.java     | 6 +++---
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index fc5e1bc1..4beb6b2a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -20,6 +20,7 @@
 
 import javax.annotation.Nullable;
 import consulo.annotations.RequiredDispatchThread;
+import consulo.awt.TargetAWT;
 import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
@@ -100,6 +101,6 @@ private static String getFileName(final PsiFile psiFile)
 	@RequiredDispatchThread
 	public Icon getIcon(boolean open)
 	{
-		return IconDescriptorUpdaters.getIcon(myElement, Iconable.ICON_FLAG_VISIBILITY);
+		return TargetAWT.to(IconDescriptorUpdaters.getIcon(myElement, Iconable.ICON_FLAG_VISIBILITY));
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index 15a86497..15cced87 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -19,6 +19,7 @@
 import javax.annotation.Nonnull;
 import javax.swing.Icon;
 
+import consulo.awt.TargetAWT;
 import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -107,7 +108,7 @@ public TextAttributesKey getTextAttributesKey()
 			@Override
 			public Icon getIcon(boolean open)
 			{
-				return IconDescriptorUpdaters.getIcon(JSExpressionStatementImpl.this, 0);
+				return TargetAWT.to(IconDescriptorUpdaters.getIcon(JSExpressionStatementImpl.this, 0));
 			}
 		};
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
index 7ad459d5..09eb8e08 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -17,10 +17,10 @@
 package consulo.json.jom;
 
 import javax.annotation.Nonnull;
+
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import consulo.annotations.RequiredReadAction;
-import consulo.awt.TargetAWT;
 import consulo.ide.IconDescriptor;
 import consulo.ide.IconDescriptorUpdater;
 
@@ -39,7 +39,7 @@ public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiEleme
 			JomFileElement<JomElement> fileElement = JomManager.getInstance(element.getProject()).getFileElement((PsiFile) element);
 			if(fileElement != null)
 			{
-				iconDescriptor.setMainIcon(TargetAWT.to(fileElement.getFileDescriptor().getIcon()));
+				iconDescriptor.setMainIcon(fileElement.getFileDescriptor().getIcon());
 			}
 		}
 	}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
index 3d923b9d..629b56df 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -50,6 +50,7 @@
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.json.validation.inspections.PropertyValidationInspection;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -206,7 +207,7 @@ else if(currentProperty.getValue() instanceof NativeArray)
 			}
 			LookupElementBuilder builder = LookupElementBuilder.create(quotes ? StringUtil.QUOTER.fun(key) : key);
 			builder = builder.withPresentableText(quotes ? StringUtil.QUOTER.fun(key) : key);
-			builder = builder.withIcon(AllIcons.Nodes.Property);
+			builder = builder.withIcon((Image) AllIcons.Nodes.Property);
 			final JsonPropertyDescriptor value = entry.getValue();
 			if(value.isDeprecated())
 			{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
index 77e98b66..eedfe82f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
@@ -22,6 +22,7 @@
 import com.intellij.codeInsight.generation.MemberChooserObject;
 import com.intellij.codeInsight.generation.PsiElementMemberChooserObject;
 import com.intellij.icons.AllIcons;
+import consulo.awt.TargetAWT;
 import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.javascript.JSParameterInfoHandler;
 import com.intellij.lang.javascript.psi.JSFunction;
@@ -48,7 +49,7 @@ public JSNamedElementNode(JSNamedElement node)
 
 	private static Icon buildIcon(final JSNamedElement node)
 	{
-		Icon icon = IconDescriptorUpdaters.getIcon(node, 0);
+		Icon icon = TargetAWT.to(IconDescriptorUpdaters.getIcon(node, 0));
 
 		if(node instanceof JSFunction)
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
index 71c5c81d..853e59a3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
@@ -19,6 +19,7 @@
 import javax.swing.Icon;
 
 import consulo.annotations.RequiredReadAction;
+import consulo.awt.TargetAWT;
 import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
@@ -158,6 +159,6 @@ public Icon getIcon(boolean open)
 		{
 			return null;
 		}
-		return IconDescriptorUpdaters.getIcon(psiElement, 0);
+		return TargetAWT.to(IconDescriptorUpdaters.getIcon(psiElement, 0));
 	}
 }
diff --git a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
index a42dc3e6..0bd186db 100644
--- a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
+++ b/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
@@ -17,9 +17,8 @@
 package consulo.javascript.ide;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
-
 import javax.annotation.Nullable;
+
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -29,6 +28,7 @@
 import consulo.annotations.RequiredReadAction;
 import consulo.ide.IconDescriptor;
 import consulo.ide.IconDescriptorUpdater;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -162,7 +162,7 @@ else if(parent instanceof JSClass)
 	}
 
 	@Nullable
-	public Icon getAccessIcon(JSAttributeList.AccessType accessType)
+	public Image getAccessIcon(JSAttributeList.AccessType accessType)
 	{
 		switch(accessType)
 		{

From 718f15dd555c3c9a21449045aff08729d1633675 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 22 Jun 2018 02:00:52 +0300
Subject: [PATCH 042/340] compilation

---
 ...ntJavaScriptPredefinedBundlesProvider.java | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index b07af43f..613a0082 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -5,14 +5,14 @@
 import java.util.Map;
 
 import javax.annotation.Nonnull;
+
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManager;
 import com.intellij.ide.plugins.cl.PluginClassLoader;
+import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkModificator;
-import com.intellij.openapi.projectRoots.impl.SdkImpl;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Consumer;
 import consulo.bundle.PredefinedBundlesProvider;
 import consulo.roots.types.BinariesOrderRootType;
 import consulo.roots.types.SourcesOrderRootType;
@@ -33,7 +33,7 @@ public class ClientJavaScriptPredefinedBundlesProvider extends PredefinedBundles
 	};
 
 	@Override
-	public void createBundles(@Nonnull Consumer<SdkImpl> consumer)
+	public void createBundles(@Nonnull Context context)
 	{
 		PluginClassLoader classLoader = (PluginClassLoader) getClass().getClassLoader();
 		IdeaPluginDescriptor plugin = PluginManager.getPlugin(classLoader.getPluginId());
@@ -59,18 +59,17 @@ public void createBundles(@Nonnull Consumer<SdkImpl> consumer)
 			{
 				continue;
 			}
-			SdkImpl sdk = createSdkWithName(ClientJavaScriptSdkType.getInstance(), name);
-			sdk.setHomePath(fileByIoFile.getPath());
-			sdk.setVersionString("1");
+			Sdk sdk = context.createSdkWithName(ClientJavaScriptSdkType.getInstance(), name);
 
-			SdkModificator sdkModificator = sdk.getSdkModificator();
+			SdkModificator modificator = sdk.getSdkModificator();
+			modificator.setHomePath(fileByIoFile.getPath());
+			modificator.setVersionString("1");
 			for(VirtualFile child : fileByIoFile.getChildren())
 			{
-				sdkModificator.addRoot(child, BinariesOrderRootType.getInstance());
-				sdkModificator.addRoot(child, SourcesOrderRootType.getInstance());
+				modificator.addRoot(child, BinariesOrderRootType.getInstance());
+				modificator.addRoot(child, SourcesOrderRootType.getInstance());
 			}
-			sdkModificator.commitChanges();
-			consumer.consume(sdk);
+			modificator.commitChanges();
 		}
 	}
 }

From 1124f8a12920c1a53a3b1640653f6c35350b2683 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 22 Jun 2018 23:29:14 +0300
Subject: [PATCH 043/340] compilation

---
 .../main/java/consulo/javascript/run/debug/V8DebugProcess.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
index bae427da..15aa193e 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
@@ -54,7 +54,6 @@
 import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 import com.intellij.xdebugger.ui.XDebugTabLayouter;
 import consulo.annotations.Exported;
-import consulo.awt.TargetAWT;
 import consulo.javascript.debugger.JavaScriptEditorsProvider;
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
 import consulo.javascript.debugger.JavaScriptListPanel;
@@ -264,7 +263,7 @@ public XDebugTabLayouter createTabLayouter()
 			@Override
 			public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui)
 			{
-				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", TargetAWT.to(JavaScriptIcons.JavaScript), null);
+				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIcons.JavaScript, null);
 				content.setCloseable(false);
 
 				ui.addContent(content);

From ea699d003a0bf4c20976046ff4503221425d9c22 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 5 Jul 2018 22:41:56 +0300
Subject: [PATCH 044/340] compilation

---
 .../JavaScriptLineMarkerProvider.java         | 44 ++++++++-----------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
index 46303ba0..74e55a16 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
@@ -29,17 +29,16 @@
 import java.util.Set;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
+import javax.annotation.Nullable;
 
 import org.jetbrains.annotations.NonNls;
-
-import javax.annotation.Nullable;
 import com.intellij.codeHighlighting.Pass;
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
 import com.intellij.codeInsight.daemon.LineMarkerProvider;
 import com.intellij.codeInsight.daemon.impl.PsiElementListNavigator;
 import com.intellij.codeInsight.navigation.NavigationUtil;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.DefaultPsiElementCellRenderer;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSClass;
@@ -53,7 +52,6 @@
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.progress.ProgressManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.NavigatablePsiElement;
@@ -73,10 +71,6 @@ public class JavaScriptLineMarkerProvider implements LineMarkerProvider
 {
 	@NonNls
 	private static final String OVERRIDES_METHOD_IN = "overrides method in ";
-	private static final Icon OVERRIDING_METHOD_ICON = IconLoader.getIcon("/gutter/overridingMethod.png");
-	private static final Icon OVERRIDDEN_ICON = IconLoader.getIcon("/gutter/overridenMethod.png");
-	private static final Icon IMPLEMENTED_ICON = IconLoader.getIcon("/gutter/implementedMethod.png");
-	private static final Icon IMPLEMENTING_ICON = IconLoader.getIcon("/gutter/implementingMethod.png");
 
 	private static final Function<JSClass, String> ourClassInheritorsTooltipProvider = new Function<JSClass, String>()
 	{
@@ -173,12 +167,12 @@ public static Query<JSFunction> doFindOverridenFunctionStatic(final JSFunction e
 		final String qName = JSResolveUtil.getQNameToStartHierarchySearch(elt);
 		if(qName != null)
 		{
-			final ArrayList<JSFunction> result = new ArrayList<JSFunction>();
+			final ArrayList<JSFunction> result = new ArrayList<>();
 
-			return new CollectionQuery<JSFunction>(result);
+			return new CollectionQuery<>(result);
 		}
 
-		return new CollectionQuery<JSFunction>(Collections.<JSFunction>emptyList());
+		return new CollectionQuery<>(Collections.<JSFunction>emptyList());
 	}
 
 	private static final BasicGutterIconNavigationHandler<JSFunction> ourImplementingFunctionsNavHandler = new
@@ -238,7 +232,7 @@ public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element)
 					final PsiElement parentNode1 = parentNode;
 					function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
 
-					return new LineMarkerInfo<JSFunction>(function, function.getNameIdentifier().getTextRange().getStartOffset(), OVERRIDING_METHOD_ICON,
+					return new LineMarkerInfo<>(function, function.getNameIdentifier().getTextRange().getStartOffset(), AllIcons.Gutter.OverridingMethod,
 							Pass.UPDATE_ALL, new Function<JSFunction, String>()
 					{
 						@Override
@@ -251,7 +245,7 @@ public String fun(final JSFunction psiElement)
 						@Override
 						public void navigate(final MouseEvent e, final JSFunction elt)
 						{
-							final Set<NavigationItem> results = new THashSet<NavigationItem>();
+							final Set<NavigationItem> results = new THashSet<>();
 							JSResolveUtil.iterateType(function, parentNode1, typeName, new JSResolveUtil.OverrideHandler()
 							{
 								@Override
@@ -287,8 +281,8 @@ else if(results.size() > 1)
 	@Override
 	public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @Nonnull final Collection<LineMarkerInfo> result)
 	{
-		final Map<String, Set<JSFunction>> jsFunctionsToProcess = new THashMap<String, Set<JSFunction>>();
-		final Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new THashMap<JSClass, Set<JSFunction>>();
+		final Map<String, Set<JSFunction>> jsFunctionsToProcess = new THashMap<>();
+		final Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new THashMap<>();
 
 		for(final PsiElement el : elements)
 		{
@@ -315,7 +309,7 @@ public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @No
 					Set<JSFunction> functions = jsMethodsToProcess.get(clazz);
 					if(functions == null)
 					{
-						functions = new THashSet<JSFunction>();
+						functions = new THashSet<>();
 						jsMethodsToProcess.put(clazz, functions);
 					}
 
@@ -330,7 +324,7 @@ else if(parent instanceof JSFile || function instanceof JSFunctionExpression)
 
 						if(functions == null)
 						{
-							functions = new THashSet<JSFunction>();
+							functions = new THashSet<>();
 							jsFunctionsToProcess.put(qName, functions);
 						}
 
@@ -359,14 +353,14 @@ else if(el instanceof JSClass)
 			classQuery.forEach(new Processor<JSClass>()
 			{
 				boolean addedClassMarker;
-				final Set<JSFunction> methodsClone = methods == null || clazz.isInterface() ? null : new THashSet<JSFunction>(methods);
+				final Set<JSFunction> methodsClone = methods == null || clazz.isInterface() ? null : new THashSet<>(methods);
 
 				@Override
 				public boolean process(final JSClass jsClass)
 				{
 					if(!addedClassMarker)
 					{
-						result.add(new LineMarkerInfo<JSClass>(clazz, clazz.getTextOffset(), OVERRIDDEN_ICON, Pass.LINE_MARKERS,
+						result.add(new LineMarkerInfo<>(clazz, clazz.getTextOffset(), AllIcons.Gutter.OverridenMethod, Pass.LINE_MARKERS,
 								ourClassInheritorsTooltipProvider, ourClassInheritorsNavHandler));
 						addedClassMarker = true;
 					}
@@ -382,7 +376,7 @@ public boolean process(final JSClass jsClass)
 							{
 								// TODO: more correct check for override
 								function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
-								result.add(new LineMarkerInfo<JSFunction>(function, function.getTextOffset(), OVERRIDDEN_ICON, Pass.LINE_MARKERS,
+								result.add(new LineMarkerInfo<>(function, function.getTextOffset(), AllIcons.Gutter.OverridenMethod, Pass.LINE_MARKERS,
 										ourOverriddenFunctionsTooltipProvider, ourOverriddenFunctionsNavHandler));
 								functionIterator.remove();
 							}
@@ -399,7 +393,7 @@ public boolean process(final JSClass jsClass)
 
 				if(classQuery.findFirst() != null)
 				{
-					result.add(new LineMarkerInfo<JSClass>(clazz, clazz.getTextOffset(), IMPLEMENTED_ICON, Pass.LINE_MARKERS,
+					result.add(new LineMarkerInfo<>(clazz, clazz.getTextOffset(), AllIcons.Gutter.ImplementedMethod, Pass.LINE_MARKERS,
 							ourImplementedInterfacesTooltipProvider, ourInterfaceImplementationsNavHandler));
 				}
 			}
@@ -418,7 +412,7 @@ public boolean process(final JSClass jsClass)
 					if(query.findFirst() != null)
 					{
 						function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
-						result.add(new LineMarkerInfo<JSFunction>(function, function.getTextOffset(), IMPLEMENTED_ICON, Pass.LINE_MARKERS,
+						result.add(new LineMarkerInfo<>(function, function.getTextOffset(), AllIcons.Gutter.ImplementedMethod, Pass.LINE_MARKERS,
 								ourImplementingFunctionsTooltipProvider, ourImplementingFunctionsNavHandler));
 					}
 				}
@@ -435,7 +429,7 @@ public boolean process(final JSClass jsClass)
 					{
 						function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
 
-						result.add(new LineMarkerInfo<JSFunction>(function, function.getTextOffset(), IMPLEMENTING_ICON, Pass.LINE_MARKERS,
+						result.add(new LineMarkerInfo<>(function, function.getTextOffset(), AllIcons.Gutter.ImplementingMethod, Pass.LINE_MARKERS,
 								new Function<JSFunction, String>()
 						{
 							@Override
@@ -487,7 +481,7 @@ private static JSFunction findImplementedFunction(JSFunction implementingFunctio
 		{
 			return null;
 		}
-		final Ref<JSFunction> result = new Ref<JSFunction>();
+		final Ref<JSFunction> result = new Ref<>();
 		JSResolveUtil.processInterfaceMethods((JSClass) clazz, new JSResolveUtil.CollectMethodsToImplementProcessor(implementingFunction.getName(),
 				implementingFunction)
 		{
@@ -527,7 +521,7 @@ private abstract static class BasicGutterIconNavigationHandler<T extends PsiElem
 		@Override
 		public void navigate(final MouseEvent e, final T elt)
 		{
-			final List<NavigatablePsiElement> navElements = new ArrayList<NavigatablePsiElement>();
+			final List<NavigatablePsiElement> navElements = new ArrayList<>();
 			Query<T> elementQuery = search(elt);
 			if(elementQuery == null)
 			{

From 0fd1df2588543c44082b495ee590b200b016f00f Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 15 Aug 2018 01:32:28 +0300
Subject: [PATCH 045/340] logger factory now removed

---
 .../javascript/JSSmartEnterProcessor.java     |  17 +-
 .../flex/ECMAScriptImportOptimizer.java       | 274 +++++++++---------
 .../lang/javascript/flex/ImportUtils.java     | 123 ++++----
 3 files changed, 195 insertions(+), 219 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
index 762842c2..34605fee 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
@@ -18,9 +18,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
 import com.intellij.codeInsight.editorActions.smartEnter.SmartEnterProcessor;
-import com.intellij.idea.LoggerFactory;
 import com.intellij.lang.javascript.psi.JSArgumentList;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSElement;
@@ -40,7 +38,7 @@
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.annotations.RequiredReadAction;
 
 /**
  * @author Maxim.Mossienko
@@ -152,17 +150,10 @@ private void insertCommitReformat(final Project project, final Editor editor, fi
 		PsiElement at = psiFile.findElementAt(offset + shiftOffset - 1);
 		final PsiElement parentOfType = PsiTreeUtil.getParentOfType(at, JSStatement.class, JSFunction.class, JSClass.class, JSFile.class);
 
-		try
-		{
-			reformat(parentOfType);
-			if(adjustLineIndent)
-			{
-				CodeStyleManager.getInstance(project).adjustLineIndent(psiFile, editor.getCaretModel().getOffset());
-			}
-		}
-		catch(IncorrectOperationException ex)
+		reformat(parentOfType);
+		if(adjustLineIndent)
 		{
-			LoggerFactory.getInstance().getLoggerInstance(getClass().getName()).error(ex);
+			CodeStyleManager.getInstance(project).adjustLineIndent(psiFile, editor.getCaretModel().getOffset());
 		}
 	}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
index 8915515b..cce975ad 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
@@ -23,8 +23,8 @@
 import java.util.Map;
 
 import javax.annotation.Nonnull;
+
 import com.intellij.codeInsight.CodeInsightUtilBase;
-import com.intellij.idea.LoggerFactory;
 import com.intellij.lang.ImportOptimizer;
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -50,7 +50,6 @@
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
 import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.containers.MultiMap;
 import consulo.javascript.lang.JavaScriptLanguage;
@@ -85,181 +84,174 @@ public void run()
 			{
 				final JSUnusedImportsHelper.Results unusedImportsResults = JSUnusedImportsHelper.getUnusedImports(file);
 
-				try
+				MultiMap<JSElement, String> importsByHolder = new MultiMap<JSElement, String>()
 				{
-					MultiMap<JSElement, String> importsByHolder = new MultiMap<JSElement, String>()
+					@Override
+					protected Collection<String> createCollection()
 					{
-						@Override
-						protected Collection<String> createCollection()
-						{
-							return new HashSet<String>();
-						}
-					};
+						return new HashSet<String>();
+					}
+				};
 
-					Project project = file.getProject();
-					final SmartPointerManager pointerManager = SmartPointerManager.getInstance(project);
-					final List<SmartPsiElementPointer> oldImportsPointers = new ArrayList<SmartPsiElementPointer>(unusedImportsResults.allImports.size());
-					for(JSImportStatement anImport : unusedImportsResults.allImports)
+				Project project = file.getProject();
+				final SmartPointerManager pointerManager = SmartPointerManager.getInstance(project);
+				final List<SmartPsiElementPointer> oldImportsPointers = new ArrayList<SmartPsiElementPointer>(unusedImportsResults.allImports.size());
+				for(JSImportStatement anImport : unusedImportsResults.allImports)
+				{
+					oldImportsPointers.add(pointerManager.createSmartPsiElementPointer(anImport));
+					if(unusedImportsResults.unusedImports.contains(anImport))
 					{
-						oldImportsPointers.add(pointerManager.createSmartPsiElementPointer(anImport));
-						if(unusedImportsResults.unusedImports.contains(anImport))
-						{
-							continue;
-						}
-
-						JSElement importHolder = ImportUtils.getImportHolder(anImport, JSFunction.class, JSPackageStatement.class, JSFile.class);
-						assert importHolder != null : "Import holder not found for " + anImport.getText();
-						importsByHolder.putValue(importHolder, anImport.getImportText());
+						continue;
 					}
 
-					final List<SmartPsiElementPointer> replaceWithShortName = new ArrayList<SmartPsiElementPointer>();
-					for(Map.Entry<JSReferenceExpression, String> e : unusedImportsResults.fqnsToReplaceWithImport.entrySet())
-					{
-						final Collection<String> importsInScope;
-						final Collection<String> importsInEnclosingScope;
-						final JSElement importHolder;
+					JSElement importHolder = ImportUtils.getImportHolder(anImport, JSFunction.class, JSPackageStatement.class, JSFile.class);
+					assert importHolder != null : "Import holder not found for " + anImport.getText();
+					importsByHolder.putValue(importHolder, anImport.getImportText());
+				}
 
-						JSElement enclosingFunction = ImportUtils.getImportHolder(e.getKey(), JSFunction.class);
-						JSElement enclosingPackage = ImportUtils.getImportHolder(e.getKey(), JSPackageStatement.class);
+				final List<SmartPsiElementPointer> replaceWithShortName = new ArrayList<SmartPsiElementPointer>();
+				for(Map.Entry<JSReferenceExpression, String> e : unusedImportsResults.fqnsToReplaceWithImport.entrySet())
+				{
+					final Collection<String> importsInScope;
+					final Collection<String> importsInEnclosingScope;
+					final JSElement importHolder;
 
-						if(enclosingFunction != null && !importsByHolder.get(enclosingFunction).isEmpty())
-						{
-							importHolder = enclosingFunction;
-							importsInScope = importsByHolder.get(enclosingFunction);
-							importsInEnclosingScope = importsByHolder.get(enclosingPackage);
-						}
-						else if(enclosingPackage != null)
-						{
-							importHolder = enclosingPackage;
-							importsInScope = importsByHolder.get(enclosingPackage);
-							importsInEnclosingScope = Collections.emptyList();
-						}
-						else
-						{
-							importHolder = ImportUtils.getImportHolder(e.getKey(), JSFile.class);
-							importsInScope = importsByHolder.get(importHolder);
-							importsInEnclosingScope = Collections.emptyList();
-						}
+					JSElement enclosingFunction = ImportUtils.getImportHolder(e.getKey(), JSFunction.class);
+					JSElement enclosingPackage = ImportUtils.getImportHolder(e.getKey(), JSPackageStatement.class);
 
-						String fqn = e.getValue();
+					if(enclosingFunction != null && !importsByHolder.get(enclosingFunction).isEmpty())
+					{
+						importHolder = enclosingFunction;
+						importsInScope = importsByHolder.get(enclosingFunction);
+						importsInEnclosingScope = importsByHolder.get(enclosingPackage);
+					}
+					else if(enclosingPackage != null)
+					{
+						importHolder = enclosingPackage;
+						importsInScope = importsByHolder.get(enclosingPackage);
+						importsInEnclosingScope = Collections.emptyList();
+					}
+					else
+					{
+						importHolder = ImportUtils.getImportHolder(e.getKey(), JSFile.class);
+						importsInScope = importsByHolder.get(importHolder);
+						importsInEnclosingScope = Collections.emptyList();
+					}
 
-						ResolveResult resolve = resolveUsingImports(importsInScope, fqn, file);
-						ResolveResult implicitResolve = resolveUsingImports(importsInEnclosingScope, fqn, file);
+					String fqn = e.getValue();
 
-						if(resolve == ResolveResult.None && implicitResolve == ResolveResult.None)
-						{
-							importsByHolder.putValue(importHolder, fqn);
-							replaceWithShortName.add(pointerManager.createSmartPsiElementPointer(e.getKey()));
-						}
-						else if((resolve == ResolveResult.ThisOne || resolve == ResolveResult.None) && (implicitResolve == ResolveResult.ThisOne || implicitResolve ==
-								ResolveResult.None))
-						{
-							replaceWithShortName.add(pointerManager.createSmartPsiElementPointer(e.getKey()));
-						}
-					}
+					ResolveResult resolve = resolveUsingImports(importsInScope, fqn, file);
+					ResolveResult implicitResolve = resolveUsingImports(importsInEnclosingScope, fqn, file);
 
-					final Collection<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>> importsByHolderPointer = new
-							ArrayList<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>>(importsByHolder.size());
-					for(JSElement holder : importsByHolder.keySet())
+					if(resolve == ResolveResult.None && implicitResolve == ResolveResult.None)
 					{
-						importsByHolderPointer.add(Pair.create(pointerManager.createSmartPsiElementPointer(holder), importsByHolder.get(holder)));
+						importsByHolder.putValue(importHolder, fqn);
+						replaceWithShortName.add(pointerManager.createSmartPsiElementPointer(e.getKey()));
 					}
-
-					for(Pair<SmartPsiElementPointer<JSElement>, Collection<String>> entry : importsByHolderPointer)
+					else if((resolve == ResolveResult.ThisOne || resolve == ResolveResult.None) && (implicitResolve == ResolveResult.ThisOne || implicitResolve ==
+							ResolveResult.None))
 					{
-						JSElement holder = entry.getFirst().getElement();
-						assert holder != null && holder.isValid();
+						replaceWithShortName.add(pointerManager.createSmartPsiElementPointer(e.getKey()));
+					}
+				}
 
-						Pair<PsiElement, Boolean> defaultInsertionPlace = ImportUtils.getImportInsertionPlace(holder);
-						boolean before = defaultInsertionPlace.second;
-						PsiElement insertionPlace = defaultInsertionPlace.first;
+				final Collection<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>> importsByHolderPointer = new
+						ArrayList<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>>(importsByHolder.size());
+				for(JSElement holder : importsByHolder.keySet())
+				{
+					importsByHolderPointer.add(Pair.create(pointerManager.createSmartPsiElementPointer(holder), importsByHolder.get(holder)));
+				}
 
-						PsiElement earlyImport = ImportUtils.findEarlyImport(before ? insertionPlace : insertionPlace.getNextSibling());
-						Pair<PsiElement, PsiElement> elementToDelete = null;
-						if(earlyImport != null)
+				for(Pair<SmartPsiElementPointer<JSElement>, Collection<String>> entry : importsByHolderPointer)
+				{
+					JSElement holder = entry.getFirst().getElement();
+					assert holder != null && holder.isValid();
+
+					Pair<PsiElement, Boolean> defaultInsertionPlace = ImportUtils.getImportInsertionPlace(holder);
+					boolean before = defaultInsertionPlace.second;
+					PsiElement insertionPlace = defaultInsertionPlace.first;
+
+					PsiElement earlyImport = ImportUtils.findEarlyImport(before ? insertionPlace : insertionPlace.getNextSibling());
+					Pair<PsiElement, PsiElement> elementToDelete = null;
+					if(earlyImport != null)
+					{
+						for(PsiElement e = (before ? insertionPlace : insertionPlace.getNextSibling()); e != earlyImport; e = e.getNextSibling())
 						{
-							for(PsiElement e = (before ? insertionPlace : insertionPlace.getNextSibling()); e != earlyImport; e = e.getNextSibling())
+							if(!(e instanceof PsiWhiteSpace))
 							{
-								if(!(e instanceof PsiWhiteSpace))
-								{
-									break;
-								}
+								break;
 							}
-							insertionPlace = earlyImport;
-							before = true;
-							PsiElement deleteTo = earlyImport;
-							while(deleteTo.getNextSibling() instanceof PsiWhiteSpace || deleteTo.getNextSibling() instanceof JSImportStatement)
-							{
-								deleteTo = deleteTo.getNextSibling();
-							}
-							elementToDelete = Pair.create(insertionPlace, deleteTo);
 						}
-						else if(before && insertionPlace instanceof PsiWhiteSpace)
+						insertionPlace = earlyImport;
+						before = true;
+						PsiElement deleteTo = earlyImport;
+						while(deleteTo.getNextSibling() instanceof PsiWhiteSpace || deleteTo.getNextSibling() instanceof JSImportStatement)
 						{
-							insertionPlace = insertionPlace.replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
-						}
-						else if(insertionPlace.getNextSibling() instanceof PsiWhiteSpace)
-						{
-							insertionPlace.getNextSibling().replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
+							deleteTo = deleteTo.getNextSibling();
 						}
+						elementToDelete = Pair.create(insertionPlace, deleteTo);
+					}
+					else if(before && insertionPlace instanceof PsiWhiteSpace)
+					{
+						insertionPlace = insertionPlace.replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
+					}
+					else if(insertionPlace.getNextSibling() instanceof PsiWhiteSpace)
+					{
+						insertionPlace.getNextSibling().replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
+					}
 
-						String importBlock = ImportUtils.createImportBlock(project, entry.getSecond());
-						PsiElement newImports = PsiFileFactory.getInstance(project).createFileFromText("dummy.js", JavaScriptLanguage.INSTANCE, importBlock);
+					String importBlock = ImportUtils.createImportBlock(project, entry.getSecond());
+					PsiElement newImports = PsiFileFactory.getInstance(project).createFileFromText("dummy.js", JavaScriptLanguage.INSTANCE, importBlock);
 
-						PsiElement firstAdded;
-						if(before)
-						{
-							firstAdded = insertionPlace.getParent().addRangeBefore(newImports.getFirstChild(), newImports.getLastChild(), insertionPlace);
-						}
-						else
-						{
-							firstAdded = insertionPlace.getParent().addRangeAfter(newImports.getFirstChild(), newImports.getLastChild(), insertionPlace);
-						}
+					PsiElement firstAdded;
+					if(before)
+					{
+						firstAdded = insertionPlace.getParent().addRangeBefore(newImports.getFirstChild(), newImports.getLastChild(), insertionPlace);
+					}
+					else
+					{
+						firstAdded = insertionPlace.getParent().addRangeAfter(newImports.getFirstChild(), newImports.getLastChild(), insertionPlace);
+					}
 
-						if(elementToDelete != null)
-						{
-							deleteRange(elementToDelete.first, elementToDelete.second);
-						}
+					if(elementToDelete != null)
+					{
+						deleteRange(elementToDelete.first, elementToDelete.second);
+					}
 
-						PsiElement lastAdded = firstAdded;
-						final String lastImportText = newImports.getLastChild().getText();
-						while(!lastImportText.equals(lastAdded.getText()))
-						{
-							lastAdded = lastAdded.getNextSibling();
-						}
+					PsiElement lastAdded = firstAdded;
+					final String lastImportText = newImports.getLastChild().getText();
+					while(!lastImportText.equals(lastAdded.getText()))
+					{
+						lastAdded = lastAdded.getNextSibling();
+					}
 
-						PsiElement formatFrom = firstAdded.getPrevSibling() instanceof PsiWhiteSpace ? firstAdded.getPrevSibling() : firstAdded;
-						PsiElement formatTo = lastAdded.getNextSibling() instanceof PsiWhiteSpace ? lastAdded.getNextSibling() : lastAdded;
+					PsiElement formatFrom = firstAdded.getPrevSibling() instanceof PsiWhiteSpace ? firstAdded.getPrevSibling() : firstAdded;
+					PsiElement formatTo = lastAdded.getNextSibling() instanceof PsiWhiteSpace ? lastAdded.getNextSibling() : lastAdded;
 
-						PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
+					PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
 
-						TextRange textRange = InjectedLanguageManager.getInstance(file.getProject()).injectedToHost(firstAdded, firstAdded.getTextRange());
-						CodeStyleManager.getInstance(project).reformatText(realFile, textRange.getStartOffset(), textRange.getEndOffset());
-					}
+					TextRange textRange = InjectedLanguageManager.getInstance(file.getProject()).injectedToHost(firstAdded, firstAdded.getTextRange());
+					CodeStyleManager.getInstance(project).reformatText(realFile, textRange.getStartOffset(), textRange.getEndOffset());
+				}
 
-					for(SmartPsiElementPointer pointer : oldImportsPointers)
+				for(SmartPsiElementPointer pointer : oldImportsPointers)
+				{
+					final JSImportStatement statement = (JSImportStatement) pointer.getElement();
+					if(statement != null)
 					{
-						final JSImportStatement statement = (JSImportStatement) pointer.getElement();
-						if(statement != null)
-						{
-							deleteImport(statement);
-						}
+						deleteImport(statement);
 					}
+				}
 
-					for(SmartPsiElementPointer pointer : replaceWithShortName)
+				for(SmartPsiElementPointer pointer : replaceWithShortName)
+				{
+					final JSReferenceExpression fqn = (JSReferenceExpression) pointer.getElement();
+					if(fqn == null || !fqn.isValid())
 					{
-						final JSReferenceExpression fqn = (JSReferenceExpression) pointer.getElement();
-						if(fqn == null || !fqn.isValid())
-						{
-							continue;
-						}
-						String name = fqn.getReferencedName().substring(fqn.getReferencedName().lastIndexOf('.') + 1);
-						fqn.replace(JSChangeUtil.createExpressionFromText(project, name));
+						continue;
 					}
-				}
-				catch(IncorrectOperationException ex)
-				{
-					LoggerFactory.getInstance().getLoggerInstance(getClass().getName()).error(ex);
+					String name = fqn.getReferencedName().substring(fqn.getReferencedName().lastIndexOf('.') + 1);
+					fqn.replace(JSChangeUtil.createExpressionFromText(project, name));
 				}
 			}
 		};
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
index 98d09b12..56b00a3f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
@@ -24,11 +24,11 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+
+import org.jetbrains.annotations.NonNls;
 import com.intellij.codeInsight.CodeInsightUtilBase;
-import com.intellij.idea.LoggerFactory;
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
@@ -116,83 +116,76 @@ public static void doImport(@Nonnull PsiElement subject, final @Nonnull String f
 		}
 		Project project = subject.getProject();
 
-		try
+		final JSReferenceExpression refExpr = PsiTreeUtil.getNonStrictParentOfType(subject, JSReferenceExpression.class);
+		if(refExpr != null && JSResolveUtil.referenceExpressionShouldBeQualified(refExpr))
 		{
-			final JSReferenceExpression refExpr = PsiTreeUtil.getNonStrictParentOfType(subject, JSReferenceExpression.class);
-			if(refExpr != null && JSResolveUtil.referenceExpressionShouldBeQualified(refExpr))
-			{
-				refExpr.replace(JSChangeUtil.createExpressionFromText(project, fqn)); // TODO should commit corresponding document before?
-				return;
-			}
+			refExpr.replace(JSChangeUtil.createExpressionFromText(project, fqn)); // TODO should commit corresponding document before?
+			return;
+		}
 
-			JSElement importHolder = getImportHolder(subject, JSPackageStatement.class, JSFile.class);
-			if(importHolder == null)
-			{ // importHolder is null when completing js2 class name from js code
-				return;
-			}
+		JSElement importHolder = getImportHolder(subject, JSPackageStatement.class, JSFile.class);
+		if(importHolder == null)
+		{ // importHolder is null when completing js2 class name from js code
+			return;
+		}
 
-			PsiFile file = importHolder.getContainingFile();
-			Document document = PsiDocumentManager.getInstance(project).getDocument(file);
-			PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document);
+		PsiFile file = importHolder.getContainingFile();
+		Document document = PsiDocumentManager.getInstance(project).getDocument(file);
+		PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document);
 
-			String textToInsert = createImportBlock(project, Collections.singletonList(fqn));
+		String textToInsert = createImportBlock(project, Collections.singletonList(fqn));
 
-			Pair<PsiElement, Boolean/*before*/> insertionPlace = getImportInsertionPlace(importHolder);
-			if(!insertionPlace.second && insertionPlace.first.getNextSibling() != null)
-			{
-				insertionPlace = Pair.create(insertionPlace.first.getNextSibling(), true);
-			}
+		Pair<PsiElement, Boolean/*before*/> insertionPlace = getImportInsertionPlace(importHolder);
+		if(!insertionPlace.second && insertionPlace.first.getNextSibling() != null)
+		{
+			insertionPlace = Pair.create(insertionPlace.first.getNextSibling(), true);
+		}
 
-			final int offset;
-			final String prefix;
-			final String suffix;
-			if(insertionPlace.second)
-			{
-				PsiElement insertBefore = specifyInsertionPlace(insertionPlace.first, fqn);
-				offset = insertBefore.getTextRange().getStartOffset();
-				prefix = (insertBefore.getPrevSibling() == null && file.getContext() == null) || insertBefore.getPrevSibling() instanceof PsiWhiteSpace ? "" :
-						"\n";
-				suffix = insertBefore instanceof PsiWhiteSpace ? "" : " ";
-			}
-			else
-			{
-				offset = insertionPlace.first.getTextRange().getEndOffset();
-				prefix = insertionPlace.first instanceof PsiWhiteSpace ? "" : "\n";
-				suffix = "";
-			}
+		final int offset;
+		final String prefix;
+		final String suffix;
+		if(insertionPlace.second)
+		{
+			PsiElement insertBefore = specifyInsertionPlace(insertionPlace.first, fqn);
+			offset = insertBefore.getTextRange().getStartOffset();
+			prefix = (insertBefore.getPrevSibling() == null && file.getContext() == null) || insertBefore.getPrevSibling() instanceof PsiWhiteSpace ? "" :
+					"\n";
+			suffix = insertBefore instanceof PsiWhiteSpace ? "" : " ";
+		}
+		else
+		{
+			offset = insertionPlace.first.getTextRange().getEndOffset();
+			prefix = insertionPlace.first instanceof PsiWhiteSpace ? "" : "\n";
+			suffix = "";
+		}
 
-			document.insertString(offset, prefix + textToInsert + suffix);
-			PsiDocumentManager.getInstance(project).commitDocument(document);
+		document.insertString(offset, prefix + textToInsert + suffix);
+		PsiDocumentManager.getInstance(project).commitDocument(document);
 
-			PsiElement inserted = file.findElementAt(offset);
-			if(prefix.length() > 0)
+		PsiElement inserted = file.findElementAt(offset);
+		if(prefix.length() > 0)
+		{
+			if(inserted.getNextSibling() instanceof JSImportStatement)
 			{
-				if(inserted.getNextSibling() instanceof JSImportStatement)
-				{
-					inserted = inserted.getNextSibling();
-				}
+				inserted = inserted.getNextSibling();
 			}
-			else
+		}
+		else
+		{
+			JSImportStatement importStatement = PsiTreeUtil.getParentOfType(inserted, JSImportStatement.class);
+			if(importStatement != null)
 			{
-				JSImportStatement importStatement = PsiTreeUtil.getParentOfType(inserted, JSImportStatement.class);
-				if(importStatement != null)
-				{
-					inserted = importStatement;
-				}
+				inserted = importStatement;
 			}
-			PsiElement formatFrom = inserted.getPrevSibling() instanceof PsiWhiteSpace ? inserted.getPrevSibling() : inserted;
-			PsiElement formatTo = inserted.getNextSibling() instanceof PsiWhiteSpace ? inserted.getNextSibling() : inserted;
+		}
+		PsiElement formatFrom = inserted.getPrevSibling() instanceof PsiWhiteSpace ? inserted.getPrevSibling() : inserted;
+		PsiElement formatTo = inserted.getNextSibling() instanceof PsiWhiteSpace ? inserted.getNextSibling() : inserted;
 
-			PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
-			final TextRange injectionOffset = InjectedLanguageManager.getInstance(project).injectedToHost(inserted, inserted.getTextRange());
+		PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
+		final TextRange injectionOffset = InjectedLanguageManager.getInstance(project).injectedToHost(inserted, inserted.getTextRange());
 
-			CodeStyleManager.getInstance(project).reformatText(realFile, injectionOffset.getStartOffset() + formatFrom.getTextRange().getStartOffset(),
-					injectionOffset.getEndOffset() + formatTo.getTextRange().getEndOffset());
-		}
-		catch(IncorrectOperationException ex)
-		{
-			LoggerFactory.getInstance().getLoggerInstance(ImportUtils.class.getName()).error(ex);
-		}
+		CodeStyleManager.getInstance(project).reformatText(realFile, injectionOffset.getStartOffset() + formatFrom.getTextRange().getStartOffset(),
+				injectionOffset.getEndOffset() + formatTo.getTextRange().getEndOffset());
 	}
 
 	private static JSElement getAnonymousEventHandlerBody(JSFile injectedFile)

From a02789c04f68fd33c0d41ccc40dd6b14b7971139 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 23 Aug 2018 00:31:10 +0300
Subject: [PATCH 046/340] app components removed

---
 .../sixrr/inspectjs/InspectionJSPlugin.java   | 621 +++++-------------
 ...scriptionByAnotherPsiElementRegistrar.java |  22 +-
 .../main/resources/META-INF/Inspections.xml   |  23 -
 plugin/src/main/resources/META-INF/json.xml   |  10 +-
 plugin/src/main/resources/META-INF/plugin.xml |   3 +-
 5 files changed, 187 insertions(+), 492 deletions(-)
 delete mode 100644 plugin/src/main/resources/META-INF/Inspections.xml

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
index 12e6766d..21cf7118 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
@@ -1,25 +1,10 @@
 package com.sixrr.inspectjs;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.codeInspection.InspectionToolProvider;
 import com.intellij.codeInspection.LocalInspectionTool;
-import com.intellij.openapi.application.Application;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.ApplicationComponent;
 import com.sixrr.inspectjs.assignment.AssignmentResultUsedJSInspection;
 import com.sixrr.inspectjs.assignment.AssignmentToForLoopParameterJSInspection;
 import com.sixrr.inspectjs.assignment.AssignmentToFunctionParameterJSInspection;
@@ -78,433 +63,181 @@
 import com.sixrr.inspectjs.validity.ThisExpressionReferencesGlobalObjectJSInspection;
 import com.sixrr.inspectjs.validity.UnreachableCodeJSInspection;
 
-@SuppressWarnings({"OverlyCoupledClass",
-        "OverlyCoupledMethod",
-        "OverlyLongMethod",
-        "ClassWithTooManyMethods"})
-public class InspectionJSPlugin implements ApplicationComponent,
-        InspectionToolProvider {
-
-    private static final int NUM_INSPECTIONS = 100;
-    private final List<Class<? extends LocalInspectionTool>> m_inspectionClasses =
-            new ArrayList<Class<? extends LocalInspectionTool>>(NUM_INSPECTIONS);
-    @NonNls
-    private static final String DESCRIPTION_DIRECTORY_NAME =
-            "src/inspectionDescriptions/";
-
-    public static InspectionJSPlugin getInstance() {
-        final Application application = ApplicationManager.getApplication();
-        return application.getComponent(InspectionJSPlugin.class);
-    }
-
-    public static void main(String[] args) {
-        final PrintStream out;
-        if (args.length == 0) {
-            out = System.out;
-        } else {
-            final OutputStream stream;
-            try {
-                stream = new FileOutputStream(args[0]);
-            } catch (final FileNotFoundException e) {
-                return;
-            }
-            out = new PrintStream(stream);
-        }
-        final InspectionJSPlugin plugin = new InspectionJSPlugin();
-        plugin.createDocumentation(out);
-       // plugin.createTestScaffolding(out);
-    }
-
-    private void createTestScaffolding(PrintStream out) {
-        final Class<? extends LocalInspectionTool>[] classes = getInspectionClasses();
-        for (Class<? extends LocalInspectionTool> aClass : classes) {
-            final LocalInspectionTool inspection;
-            try {
-                inspection = aClass.newInstance();
-            } catch (InstantiationException e) {
-                e.printStackTrace();
-                continue;
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-                continue;
-            }
-            final Package aPackage = aClass.getPackage();
-            final String packageName = aPackage.getName();
-            final String className = aClass.getName();
-            final String shortName =
-                    className.substring(packageName.length() + 1, className.length() - "JSInspection".length());
-            out.println(shortName);
-            out.println(packageName);
-            final String testDataDir = "testdata" + File.separatorChar + shortName;
-            final String testDataSrcDir = testDataDir + File.separatorChar + "src";
-            new File(testDataSrcDir).mkdirs();
-            makeResults(testDataDir, inspection.getDisplayName());
-            makeTestJS(testDataSrcDir, shortName);
-            final String testSrcDir = "testsrc" + File.separatorChar + packageName.replaceAll("\\.", File.separator);
-            new File(testSrcDir).mkdirs();
-            out.println(testSrcDir);
-            makeTestCase(testSrcDir, packageName, shortName);
-        }
-    }
-
-    private void makeTestCase(String testSrcDir, String packageName, String testName) {
-        PrintWriter printWriter = null;
-        try {
-            printWriter = new PrintWriter(testSrcDir + File.separatorChar + testName + "Test.java");
-            printWriter.println("package " + packageName +";\n" +
-                    "\n" +
-                    "import com.intellij.testFramework.*;\n" +
-                    "import " + packageName + "."+ testName + "JSInspection;\n" +
-                    "\n" +
-                    "public class " + testName +"Test extends InspectionTestCase {\n" +
-                    "\n" +
-                    "  public void test() throws Exception {\n" +
-                    "    doTest(\""+ testName +"/\", new "+ testName+ "JSInspection());\n" +
-                    "  }\n" +
-                    "}");
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } finally {
-            if (printWriter != null) {
-                printWriter.close();
-            }
-        }
-    }
-    private void makeResults(String testDataDir, String testName) {
-        PrintWriter printWriter = null;
-        try {
-            printWriter = new PrintWriter(testDataDir + File.separatorChar + "expected.xml");
-            printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                    "<problems>\n" +
-                    "  <problem>\n" +
-                    "    <file>test.js</file>\n" +
-                    "    <line>2</line>\n" +
-                    "    <problem_class>" + testName+ "</problem_class>\n" +
-                    "    <description>invertion</description>\n" +
-                    "  </problem>\n" +
-                    "</problems>");
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } finally {
-            if (printWriter != null) {
-                printWriter.close();
-            }
-        }
-    }
-
-    private void makeTestJS(String testDataSrcDir, String inspectionName) {
-        PrintWriter printWriter = null;
-        try {
-            printWriter = new PrintWriter(testDataSrcDir + File.separatorChar + "test.js");
-            printWriter.println("//test for inspection " + inspectionName);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } finally {
-            if (printWriter != null) {
-                printWriter.close();
-            }
-        }
-    }
-
-    @SuppressWarnings({"HardCodedStringLiteral"})
-    @NonNls
-    private void createDocumentation(PrintStream out) {
-        final Class<? extends LocalInspectionTool>[] classes = getInspectionClasses();
-        Arrays.sort(classes, new InspectionComparator());
-
-        final int numQuickFixes = countQuickFixes(classes, out);
-        out.println(classes.length + " Inspections");
-        out.println(numQuickFixes + " Quick Fixes");
-        String currentGroupName = "";
-
-        for (final Class<? extends LocalInspectionTool> aClass : classes) {
-            final String className = aClass.getName();
-            try {
-                final LocalInspectionTool inspection =
-                        aClass.newInstance();
-                final String groupDisplayName =
-                        inspection.getGroupDisplayName();
-                if (!groupDisplayName.equals(currentGroupName)) {
-                    currentGroupName = groupDisplayName;
-                    out.println();
-                    out.print("   * ");
-                    out.println(currentGroupName);
-                }
-                printInspectionDescription(inspection, out);
-            } catch (InstantiationException ignore) {
-                out.print("Couldn't instantiate ");
-                out.println(className);
-            } catch (IllegalAccessException ignore) {
-                out.print("Couldn't access ");
-                out.println(className);
-            } catch (ClassCastException ignore) {
-                out.print("Couldn't cast ");
-                out.println(className);
-            }
-        }
-
-        out.println();
-        out.println("Inspections enabled by default:");
-        for (final Class<? extends LocalInspectionTool> aClass : classes) {
-            final String className = aClass.getName();
-            try {
-                final LocalInspectionTool inspection =
-                        aClass.newInstance();
-                if (inspection.isEnabledByDefault()) {
-                    out.println('\t' + inspection.getDisplayName());
-                }
-            } catch (InstantiationException ignore) {
-                out.print("Couldn't instantiate ");
-                out.println(className);
-            } catch (IllegalAccessException ignore) {
-                out.print("Couldn't access ");
-                out.println(className);
-            } catch (ClassCastException ignore) {
-                out.print("Couldn't cast ");
-                out.println(className);
-            }
-        }
-        final File descriptionDirectory = new File(DESCRIPTION_DIRECTORY_NAME);
-        final File[] descriptionFiles = descriptionDirectory.listFiles();
-        final Set<File> descriptionFilesSet = new HashSet<File>(descriptionFiles.length);
-        for (File descriptionFile1 : descriptionFiles) {
-            if (!descriptionFile1.getName().startsWith(".")) {
-                descriptionFilesSet.add(descriptionFile1);
-            }
-        }
-        for (final Class<? extends LocalInspectionTool> aClass : classes) {
-            final String className = aClass.getName();
-            final String simpleClassName =
-                    className.substring(className.lastIndexOf('.') + 1,
-                            className.length() -
-                                    "Inspection".length());
-            final String fileName =
-                    DESCRIPTION_DIRECTORY_NAME + simpleClassName + ".html";
-            final File descriptionFile = new File(fileName);
-            if (descriptionFile.exists()) {
-                descriptionFilesSet.remove(descriptionFile);
-            } else {
-                out.println("Couldn't find documentation file: " + fileName);
-            }
-        }
-        for (final File file : descriptionFilesSet) {
-            out.println("Unused documentation file: " + file.getAbsolutePath());
-        }
-    }
-
-    @SuppressWarnings({"HardCodedStringLiteral"})
-    private static void printInspectionDescription(LocalInspectionTool inspection,
-                                                   PrintStream out) {
-        final boolean hasQuickFix = ((BaseInspection) inspection).hasQuickFix();
-
-        final String displayName = inspection.getDisplayName();
-        out.print("      * ");
-        out.print(displayName);
-        if (hasQuickFix) {
-            if (((BaseInspection) inspection).buildQuickFixesOnlyForOnTheFlyErrors()) {
-                out.print("(r)");
-            } else {
-                out.print("(*)");
-            }
-        }
-        out.println();
-    }
-
-    @SuppressWarnings({"HardCodedStringLiteral"})
-    private static int countQuickFixes(Class<? extends LocalInspectionTool>[] classes, PrintStream out) {
-        int numQuickFixes = 0;
-        for (final Class<? extends LocalInspectionTool> aClass : classes) {
-            final String className = aClass.getName();
-            try {
-                final LocalInspectionTool inspection =
-                        aClass.newInstance();
-                if (((BaseInspection) inspection).hasQuickFix()) {
-                    numQuickFixes++;
-                }
-            } catch (InstantiationException ignore) {
-                out.print("Couldn't instantiate ");
-                out.println(className);
-            } catch (IllegalAccessException ignore) {
-                out.print("Couldn't access ");
-                out.println(className);
-            } catch (ClassCastException ignore) {
-                out.print("Couldn't cast ");
-                out.println(className);
-            }
-        }
-        return numQuickFixes;
-    }
-
-    @Override
-	@Nonnull
-    public String getComponentName() {
-        return "InspectionJS";
-    }
-
-    @Override
-	public Class<? extends LocalInspectionTool>[] getInspectionClasses() {
-        if (m_inspectionClasses.isEmpty()) {
-            registerDOMInspections();
-            registerControlFlowInspections();
-            registerAssignmentInspections();
-            registerBugInspections();
-            registerValidityInspections();
-            registerNamingInspections();
-            registerConfusingInspections();
-            registerExceptionInspections();
-            registerStyleInspections();
-            registerFunctionMetricsInspections();
-            registerDataflowInspections();
-            registerBitwiseInspections();
-        }
-        final int numInspections = m_inspectionClasses.size();
-        return m_inspectionClasses.toArray(new Class[numInspections]);
-    }
-
-    @Override
-	public void initComponent() {
-    }
-
-    private void registerAssignmentInspections() {
-        m_inspectionClasses.add(AssignmentResultUsedJSInspection.class);
-        m_inspectionClasses.add(NestedAssignmentJSInspection.class);
-        m_inspectionClasses.add(AssignmentToFunctionParameterJSInspection.class);
-        m_inspectionClasses.add(AssignmentToForLoopParameterJSInspection.class);
-        m_inspectionClasses.add(ReplaceAssignmentWithOperatorAssignmentJSInspection.class);
-        m_inspectionClasses.add(SillyAssignmentJSInspection.class);
-    }
-
-    private void registerBugInspections() {
-        m_inspectionClasses.add(TextLabelInSwitchStatementJSInspection.class);
-        m_inspectionClasses.add(NonShortCircuitBooleanExpressionJSInspection.class);
-        m_inspectionClasses.add(ObjectAllocationIgnoredJSInspection.class);
-        m_inspectionClasses.add(DivideByZeroJSInspection.class);
-        m_inspectionClasses.add(EqualityComparisonWithCoercionJSInspection.class);
-    }
-
-    private void registerBitwiseInspections() {
-        m_inspectionClasses.add(PointlessBitwiseExpressionJSInspection.class);
-        m_inspectionClasses.add(ShiftOutOfRangeJSInspection.class);
-        m_inspectionClasses.add(IncompatibleMaskJSInspection.class);
-    }
-
-    private void registerControlFlowInspections() {
-        m_inspectionClasses.add(LoopStatementThatDoesntLoopJSInspection.class);
-        m_inspectionClasses.add(InfiniteLoopJSInspection.class);
-        m_inspectionClasses.add(InfiniteRecursionJSInspection.class);
-        m_inspectionClasses.add(PointlessBooleanExpressionJSInspection.class);
-        m_inspectionClasses.add(PointlessArithmeticExpressionJSInspection.class);
-        m_inspectionClasses.add(NegatedIfStatementJSInspection.class);
-        m_inspectionClasses.add(NegatedConditionalExpressionJSInspection.class);
-        m_inspectionClasses.add(BreakStatementJSInspection.class);
-        m_inspectionClasses.add(BreakStatementWithLabelJSInspection.class);
-        m_inspectionClasses.add(ContinueStatementJSInspection.class);
-        m_inspectionClasses.add(ContinueStatementWithLabelJSInspection.class);
-        m_inspectionClasses.add(DefaultNotLastCaseInSwitchJSInspection.class);
-        m_inspectionClasses.add(UnnecessaryContinueJSInspection.class);
-        m_inspectionClasses.add(UnnecessaryReturnJSInspection.class);
-        m_inspectionClasses.add(UnnecessaryLabelOnBreakStatementJSInspection.class);
-        m_inspectionClasses.add(UnnecessaryLabelOnContinueStatementJSInspection.class);
-        m_inspectionClasses.add(LabeledStatementJSInspection.class);
-        m_inspectionClasses.add(SwitchStatementWithNoDefaultBranchJSInspection.class);
-        m_inspectionClasses.add(FallthroughInSwitchStatementJSInspection.class);
-        m_inspectionClasses.add(NestedSwitchStatementJSInspection.class);
-        m_inspectionClasses.add(DuplicateConditionJSInspection.class);
-        m_inspectionClasses.add(ConstantConditionalExpressionJSInspection.class);
-        m_inspectionClasses.add(ConstantIfStatementJSInspection.class);
-        m_inspectionClasses.add(ConditionalExpressionWithIdenticalBranchesJSInspection.class);
-        m_inspectionClasses.add(IfStatementWithIdenticalBranchesJSInspection.class);
-        m_inspectionClasses.add(IfStatementWithTooManyBranchesJSInspection.class);
-        m_inspectionClasses.add(TrivialIfJSInspection.class);
-        m_inspectionClasses.add(TrivialConditionalJSInspection.class);
-        m_inspectionClasses.add(UnnecessaryLabelJSInspection.class);
-        m_inspectionClasses.add(ForLoopThatDoesntUseLoopVariableJSInspection.class);
-        m_inspectionClasses.add(TailRecursionJSInspection.class);
-        m_inspectionClasses.add(ForLoopReplaceableByWhileJSInspection.class);
-    }
-
-    private void registerValidityInspections() {
-        m_inspectionClasses.add(DebuggerStatementJSInspection.class);
-        m_inspectionClasses.add(BadExpressionStatementJSInspection.class);
-        m_inspectionClasses.add(DuplicateCaseLabelJSInspection.class);
-        m_inspectionClasses.add(DuplicatePropertyOnObjectJSInspection.class);
-        m_inspectionClasses.add(UnreachableCodeJSInspection.class);
-        m_inspectionClasses.add(FunctionWithInconsistentReturnsJSInspection.class);
-        m_inspectionClasses.add(ThisExpressionReferencesGlobalObjectJSInspection.class);
-        m_inspectionClasses.add(StringLiteralBreaksHTMLJSInspection.class);
-    }
-
-    private void registerNamingInspections() {
-        m_inspectionClasses.add(FunctionNamingConventionJSInspection.class);
-        m_inspectionClasses.add(LocalVariableNamingConventionJSInspection.class);
-        m_inspectionClasses.add(ParameterNamingConventionJSInspection.class);
-    }
-
-    private void registerConfusingInspections() {
-        m_inspectionClasses.add(CallerJSInspection.class);
-        m_inspectionClasses.add(BlockStatementJSInspection.class);
-        m_inspectionClasses.add(ConditionalExpressionJSInspection.class);
-        m_inspectionClasses.add(CommaExpressionJSInspection.class);
-        m_inspectionClasses.add(NestedConditionalExpressionJSInspection.class);
-        m_inspectionClasses.add(IncrementDecrementResultUsedJSInspection.class);
-        m_inspectionClasses.add(WithStatementJSInspection.class);
-        m_inspectionClasses.add(VoidExpressionJSInspection.class);
-        m_inspectionClasses.add(OverlyComplexArithmeticExpressionJSInspection.class);
-        m_inspectionClasses.add(OverlyComplexBooleanExpressionJSInspection.class);
-        m_inspectionClasses.add(NestedFunctionJSInspection.class);
-        m_inspectionClasses.add(AnonymousFunctionJSInspection.class);
-        m_inspectionClasses.add(EmptyStatementBodyJSInspection.class);
-        m_inspectionClasses.add(OctalIntegerJSInspection.class);
-        m_inspectionClasses.add(ConfusingFloatingPointLiteralJSInspection.class);
-        m_inspectionClasses.add(ConfusingPlusesOrMinusesJSInspection.class);
-        m_inspectionClasses.add(DynamicallyGeneratedCodeJSInspection.class);
-        m_inspectionClasses.add(MagicNumberJSInspection.class);
-    }
-
-    private void registerStyleInspections() {
-        m_inspectionClasses.add(ConstantOnLHSOfComparisonJSInspection.class);
-        m_inspectionClasses.add(ChainedEqualityJSInspection.class);
-        m_inspectionClasses.add(ChainedFunctionCallJSInspection.class);
-        m_inspectionClasses.add(NestedFunctionCallJSInspection.class);
-        m_inspectionClasses.add(ConstantOnRHSOfComparisonJSInspection.class);
-        m_inspectionClasses.add(UnterminatedStatementJSInspection.class);
-        m_inspectionClasses.add(NonBlockStatementBodyJSInspection.class);
-    }
-
-    private void registerExceptionInspections() {
-        m_inspectionClasses.add(EmptyCatchBlockJSInspection.class);
-        m_inspectionClasses.add(EmptyTryBlockJSInspection.class);
-        m_inspectionClasses.add(EmptyFinallyBlockJSInspection.class);
-        m_inspectionClasses.add(ReturnFromFinallyBlockJSInspection.class);
-        m_inspectionClasses.add(ThrowFromFinallyBlockJSInspection.class);
-        m_inspectionClasses.add(ContinueOrBreakFromFinallyBlockJSInspection.class);
-        m_inspectionClasses.add(ExceptionCaughtLocallyJSInspection.class);
-        m_inspectionClasses.add(UnusedCatchParameterJSInspection.class);
-    }
-
-    private void registerFunctionMetricsInspections() {
-        m_inspectionClasses.add(NestingDepthJSInspection.class);
-        m_inspectionClasses.add(ThreeNegationsPerFunctionJSInspection.class);
-        m_inspectionClasses.add(FunctionWithMultipleLoopsJSInspection.class);
-        m_inspectionClasses.add(FunctionWithMultipleReturnPointsJSInspection.class);
-        m_inspectionClasses.add(CyclomaticComplexityJSInspection.class);
-        m_inspectionClasses.add(ParametersPerFunctionJSInspection.class);
-        m_inspectionClasses.add(StatementsPerFunctionJSInspection.class);
-    }
-
-    private void registerDOMInspections() {
-        m_inspectionClasses.add(DocumentWriteJSInspection.class);
-        m_inspectionClasses.add(InnerHTMLJSInspection.class);
-        m_inspectionClasses.add(PlatformDetectionJSInspection.class);
-        m_inspectionClasses.add(XHTMLIncompatabilitiesJSInspection.class);
-    }
-
-    private void registerDataflowInspections() {
-        m_inspectionClasses.add(UnnecessaryLocalVariableJSInspection.class);
-        m_inspectionClasses.add(ReuseOfLocalVariableJSInspection.class);
-    }
-
-    @Override
-	public void disposeComponent() {
-    }
+public class InspectionJSPlugin implements InspectionToolProvider
+{
+	private static final int NUM_INSPECTIONS = 100;
+	private final List<Class<? extends LocalInspectionTool>> m_inspectionClasses = new ArrayList<Class<? extends LocalInspectionTool>>(NUM_INSPECTIONS);
+
+	@Override
+	public Class<? extends LocalInspectionTool>[] getInspectionClasses()
+	{
+		if(m_inspectionClasses.isEmpty())
+		{
+			registerDOMInspections();
+			registerControlFlowInspections();
+			registerAssignmentInspections();
+			registerBugInspections();
+			registerValidityInspections();
+			registerNamingInspections();
+			registerConfusingInspections();
+			registerExceptionInspections();
+			registerStyleInspections();
+			registerFunctionMetricsInspections();
+			registerDataflowInspections();
+			registerBitwiseInspections();
+		}
+		final int numInspections = m_inspectionClasses.size();
+		return m_inspectionClasses.toArray(new Class[numInspections]);
+	}
+
+	private void registerAssignmentInspections()
+	{
+		m_inspectionClasses.add(AssignmentResultUsedJSInspection.class);
+		m_inspectionClasses.add(NestedAssignmentJSInspection.class);
+		m_inspectionClasses.add(AssignmentToFunctionParameterJSInspection.class);
+		m_inspectionClasses.add(AssignmentToForLoopParameterJSInspection.class);
+		m_inspectionClasses.add(ReplaceAssignmentWithOperatorAssignmentJSInspection.class);
+		m_inspectionClasses.add(SillyAssignmentJSInspection.class);
+	}
+
+	private void registerBugInspections()
+	{
+		m_inspectionClasses.add(TextLabelInSwitchStatementJSInspection.class);
+		m_inspectionClasses.add(NonShortCircuitBooleanExpressionJSInspection.class);
+		m_inspectionClasses.add(ObjectAllocationIgnoredJSInspection.class);
+		m_inspectionClasses.add(DivideByZeroJSInspection.class);
+		m_inspectionClasses.add(EqualityComparisonWithCoercionJSInspection.class);
+	}
+
+	private void registerBitwiseInspections()
+	{
+		m_inspectionClasses.add(PointlessBitwiseExpressionJSInspection.class);
+		m_inspectionClasses.add(ShiftOutOfRangeJSInspection.class);
+		m_inspectionClasses.add(IncompatibleMaskJSInspection.class);
+	}
+
+	private void registerControlFlowInspections()
+	{
+		m_inspectionClasses.add(LoopStatementThatDoesntLoopJSInspection.class);
+		m_inspectionClasses.add(InfiniteLoopJSInspection.class);
+		m_inspectionClasses.add(InfiniteRecursionJSInspection.class);
+		m_inspectionClasses.add(PointlessBooleanExpressionJSInspection.class);
+		m_inspectionClasses.add(PointlessArithmeticExpressionJSInspection.class);
+		m_inspectionClasses.add(NegatedIfStatementJSInspection.class);
+		m_inspectionClasses.add(NegatedConditionalExpressionJSInspection.class);
+		m_inspectionClasses.add(BreakStatementJSInspection.class);
+		m_inspectionClasses.add(BreakStatementWithLabelJSInspection.class);
+		m_inspectionClasses.add(ContinueStatementJSInspection.class);
+		m_inspectionClasses.add(ContinueStatementWithLabelJSInspection.class);
+		m_inspectionClasses.add(DefaultNotLastCaseInSwitchJSInspection.class);
+		m_inspectionClasses.add(UnnecessaryContinueJSInspection.class);
+		m_inspectionClasses.add(UnnecessaryReturnJSInspection.class);
+		m_inspectionClasses.add(UnnecessaryLabelOnBreakStatementJSInspection.class);
+		m_inspectionClasses.add(UnnecessaryLabelOnContinueStatementJSInspection.class);
+		m_inspectionClasses.add(LabeledStatementJSInspection.class);
+		m_inspectionClasses.add(SwitchStatementWithNoDefaultBranchJSInspection.class);
+		m_inspectionClasses.add(FallthroughInSwitchStatementJSInspection.class);
+		m_inspectionClasses.add(NestedSwitchStatementJSInspection.class);
+		m_inspectionClasses.add(DuplicateConditionJSInspection.class);
+		m_inspectionClasses.add(ConstantConditionalExpressionJSInspection.class);
+		m_inspectionClasses.add(ConstantIfStatementJSInspection.class);
+		m_inspectionClasses.add(ConditionalExpressionWithIdenticalBranchesJSInspection.class);
+		m_inspectionClasses.add(IfStatementWithIdenticalBranchesJSInspection.class);
+		m_inspectionClasses.add(IfStatementWithTooManyBranchesJSInspection.class);
+		m_inspectionClasses.add(TrivialIfJSInspection.class);
+		m_inspectionClasses.add(TrivialConditionalJSInspection.class);
+		m_inspectionClasses.add(UnnecessaryLabelJSInspection.class);
+		m_inspectionClasses.add(ForLoopThatDoesntUseLoopVariableJSInspection.class);
+		m_inspectionClasses.add(TailRecursionJSInspection.class);
+		m_inspectionClasses.add(ForLoopReplaceableByWhileJSInspection.class);
+	}
+
+	private void registerValidityInspections()
+	{
+		m_inspectionClasses.add(DebuggerStatementJSInspection.class);
+		m_inspectionClasses.add(BadExpressionStatementJSInspection.class);
+		m_inspectionClasses.add(DuplicateCaseLabelJSInspection.class);
+		m_inspectionClasses.add(DuplicatePropertyOnObjectJSInspection.class);
+		m_inspectionClasses.add(UnreachableCodeJSInspection.class);
+		m_inspectionClasses.add(FunctionWithInconsistentReturnsJSInspection.class);
+		m_inspectionClasses.add(ThisExpressionReferencesGlobalObjectJSInspection.class);
+		m_inspectionClasses.add(StringLiteralBreaksHTMLJSInspection.class);
+	}
+
+	private void registerNamingInspections()
+	{
+		m_inspectionClasses.add(FunctionNamingConventionJSInspection.class);
+		m_inspectionClasses.add(LocalVariableNamingConventionJSInspection.class);
+		m_inspectionClasses.add(ParameterNamingConventionJSInspection.class);
+	}
+
+	private void registerConfusingInspections()
+	{
+		m_inspectionClasses.add(CallerJSInspection.class);
+		m_inspectionClasses.add(BlockStatementJSInspection.class);
+		m_inspectionClasses.add(ConditionalExpressionJSInspection.class);
+		m_inspectionClasses.add(CommaExpressionJSInspection.class);
+		m_inspectionClasses.add(NestedConditionalExpressionJSInspection.class);
+		m_inspectionClasses.add(IncrementDecrementResultUsedJSInspection.class);
+		m_inspectionClasses.add(WithStatementJSInspection.class);
+		m_inspectionClasses.add(VoidExpressionJSInspection.class);
+		m_inspectionClasses.add(OverlyComplexArithmeticExpressionJSInspection.class);
+		m_inspectionClasses.add(OverlyComplexBooleanExpressionJSInspection.class);
+		m_inspectionClasses.add(NestedFunctionJSInspection.class);
+		m_inspectionClasses.add(AnonymousFunctionJSInspection.class);
+		m_inspectionClasses.add(EmptyStatementBodyJSInspection.class);
+		m_inspectionClasses.add(OctalIntegerJSInspection.class);
+		m_inspectionClasses.add(ConfusingFloatingPointLiteralJSInspection.class);
+		m_inspectionClasses.add(ConfusingPlusesOrMinusesJSInspection.class);
+		m_inspectionClasses.add(DynamicallyGeneratedCodeJSInspection.class);
+		m_inspectionClasses.add(MagicNumberJSInspection.class);
+	}
+
+	private void registerStyleInspections()
+	{
+		m_inspectionClasses.add(ConstantOnLHSOfComparisonJSInspection.class);
+		m_inspectionClasses.add(ChainedEqualityJSInspection.class);
+		m_inspectionClasses.add(ChainedFunctionCallJSInspection.class);
+		m_inspectionClasses.add(NestedFunctionCallJSInspection.class);
+		m_inspectionClasses.add(ConstantOnRHSOfComparisonJSInspection.class);
+		m_inspectionClasses.add(UnterminatedStatementJSInspection.class);
+		m_inspectionClasses.add(NonBlockStatementBodyJSInspection.class);
+	}
+
+	private void registerExceptionInspections()
+	{
+		m_inspectionClasses.add(EmptyCatchBlockJSInspection.class);
+		m_inspectionClasses.add(EmptyTryBlockJSInspection.class);
+		m_inspectionClasses.add(EmptyFinallyBlockJSInspection.class);
+		m_inspectionClasses.add(ReturnFromFinallyBlockJSInspection.class);
+		m_inspectionClasses.add(ThrowFromFinallyBlockJSInspection.class);
+		m_inspectionClasses.add(ContinueOrBreakFromFinallyBlockJSInspection.class);
+		m_inspectionClasses.add(ExceptionCaughtLocallyJSInspection.class);
+		m_inspectionClasses.add(UnusedCatchParameterJSInspection.class);
+	}
+
+	private void registerFunctionMetricsInspections()
+	{
+		m_inspectionClasses.add(NestingDepthJSInspection.class);
+		m_inspectionClasses.add(ThreeNegationsPerFunctionJSInspection.class);
+		m_inspectionClasses.add(FunctionWithMultipleLoopsJSInspection.class);
+		m_inspectionClasses.add(FunctionWithMultipleReturnPointsJSInspection.class);
+		m_inspectionClasses.add(CyclomaticComplexityJSInspection.class);
+		m_inspectionClasses.add(ParametersPerFunctionJSInspection.class);
+		m_inspectionClasses.add(StatementsPerFunctionJSInspection.class);
+	}
+
+	private void registerDOMInspections()
+	{
+		m_inspectionClasses.add(DocumentWriteJSInspection.class);
+		m_inspectionClasses.add(InnerHTMLJSInspection.class);
+		m_inspectionClasses.add(PlatformDetectionJSInspection.class);
+		m_inspectionClasses.add(XHTMLIncompatabilitiesJSInspection.class);
+	}
+
+	private void registerDataflowInspections()
+	{
+		m_inspectionClasses.add(UnnecessaryLocalVariableJSInspection.class);
+		m_inspectionClasses.add(ReuseOfLocalVariableJSInspection.class);
+	}
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
index 1c8954a2..e01a45e7 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
@@ -17,7 +17,8 @@
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
 import javax.annotation.Nonnull;
-import com.intellij.openapi.components.ApplicationComponent;
+import javax.inject.Singleton;
+
 import com.intellij.openapi.project.Project;
 import com.intellij.util.NotNullFunction;
 import consulo.editor.notifications.EditorNotificationProvider;
@@ -27,10 +28,10 @@
  * @author VISTALL
  * @since 12.11.2015
  */
-public class DescriptionByAnotherPsiElementRegistrar implements ApplicationComponent
+@Singleton
+public class DescriptionByAnotherPsiElementRegistrar
 {
-	@Override
-	public void initComponent()
+	DescriptionByAnotherPsiElementRegistrar()
 	{
 		for(final DescriptionByAnotherPsiElementProvider<?> provider : DescriptionByAnotherPsiElementProvider.EP_NAME.getExtensions())
 		{
@@ -46,17 +47,4 @@ public EditorNotificationProvider<?> fun(Project project)
 			});
 		}
 	}
-
-	@Override
-	public void disposeComponent()
-	{
-
-	}
-
-	@Nonnull
-	@Override
-	public String getComponentName()
-	{
-		return "DescriptionByAnotherPsiElementRegistrar";
-	}
 }
diff --git a/plugin/src/main/resources/META-INF/Inspections.xml b/plugin/src/main/resources/META-INF/Inspections.xml
deleted file mode 100644
index c36bdb48..00000000
--- a/plugin/src/main/resources/META-INF/Inspections.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  - Copyright 2013-2015 must-be.org
-  -
-  - 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.
-  -->
-
-<idea-plugin version="2">
-	<application-components>
-		<component>
-			<implementation-class>com.sixrr.inspectjs.InspectionJSPlugin</implementation-class>
-		</component>
-	</application-components>
-</idea-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/json.xml b/plugin/src/main/resources/META-INF/json.xml
index 6170666c..963b0fc2 100644
--- a/plugin/src/main/resources/META-INF/json.xml
+++ b/plugin/src/main/resources/META-INF/json.xml
@@ -15,12 +15,6 @@
   -->
 
 <idea-plugin>
-	<application-components>
-		<component>
-			<implementation-class>consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementRegistrar</implementation-class>
-		</component>
-	</application-components>
-
 	<extensionPoints>
 		<extensionPoint name="jomFileDescriptor" interface="consulo.json.jom.JomFileDescriptor"/>
 		<extensionPoint name="jsonFileDescriptorProvider" interface="consulo.json.validation.JsonFileDescriptorProvider"/>
@@ -39,13 +33,15 @@
 
 		<completion.contributor language="JavaScript" implementationClass="consulo.json.validation.completion.JsonCompletionContributor"/>
 
-		<quoteHandler fileType="JSON" className="onsulo.javascript.lang.JavaScriptQuoteHandler" />
+		<quoteHandler fileType="JSON" className="onsulo.javascript.lang.JavaScriptQuoteHandler"/>
 
 		<localInspection language="JavaScript"
 						 displayName="Property validation"
 						 groupName="JSON"
 						 enabledByDefault="true"
 						 implementationClass="consulo.json.validation.inspections.PropertyValidationInspection"/>
+
+		<applicationService serviceImplementation="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementRegistrar" lazy="false"/>
 	</extensions>
 
 	<extensions defaultExtensionNs="consulo.javascript">
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 30cb0d43..3fc6bdf9 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -24,7 +24,6 @@
 	<depends>com.intellij.xml</depends>
 	<depends config-file="regexp.xml" optional="true">com.intellij.regexp</depends>
 
-	<xi:include href="/META-INF/Inspections.xml" xpointer="xpointer(/idea-plugin/*)"/>
 	<xi:include href="/META-INF/Intentions.xml" xpointer="xpointer(/idea-plugin/*)"/>
 	<xi:include href="/META-INF/json.xml" xpointer="xpointer(/idea-plugin/*)"/>
 	<xi:include href="/META-INF/ecma4.xml" xpointer="xpointer(/idea-plugin/*)"/>
@@ -145,6 +144,8 @@
 		<liveTemplateMacro implementation="com.intellij.javascript.JSMethodNameMacro"/>
 
 		<inspectionToolProvider implementation="com.intellij.lang.javascript.inspections.JSInspectionToolProvider"/>
+		<inspectionToolProvider implementation="com.sixrr.inspectjs.InspectionJSPlugin" />
+
 		<targetElementUtilEx implementation="com.intellij.lang.javascript.JavaScriptTargetElementUtilEx"/>
 
 		<sdkType implementation="consulo.javascript.client.module.sdk.ClientJavaScriptSdkType"/>

From 7396373d5028eab0171e3f5c42a58f89102412ce Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 22 Sep 2018 10:33:39 +0300
Subject: [PATCH 047/340] inject annotations

---
 .../lang/StandardJavaScriptVersionsImpl.java      |  2 ++
 .../main/java/consulo/json/jom/JomManager.java    |  5 +++++
 .../DescriptionByAnotherPsiElementService.java    | 15 ++++++---------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index 2ab8e9fb..76311784 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -5,6 +5,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.inject.Singleton;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.ContainerUtil;
@@ -14,6 +15,7 @@
  * @author VISTALL
  * @since 23-Dec-17
  */
+@Singleton
 public class StandardJavaScriptVersionsImpl extends StandardJavaScriptVersions
 {
 	@Nonnull
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index b48f2fa3..0c714ab6 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -18,6 +18,9 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.fileTypes.FileType;
@@ -35,6 +38,7 @@
  * @author VISTALL
  * @since 10.11.2015
  */
+@Singleton
 public class JomManager
 {
 	@Nonnull
@@ -47,6 +51,7 @@ public static JomManager getInstance(@Nonnull Project project)
 
 	private final Project myProject;
 
+	@Inject
 	public JomManager(Project project)
 	{
 		myProject = project;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index a2b77d1f..b2725092 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -21,10 +21,11 @@
 import java.util.List;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import org.jdom.Element;
-
-import javax.annotation.Nullable;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
@@ -49,13 +50,8 @@
  * @author VISTALL
  * @since 12.11.2015
  */
-@State(
-		name = "JSONDescriptionByAnotherPsiElementService",
-		storages = {
-				@Storage(
-						file = StoragePathMacros.WORKSPACE_FILE
-				)}
-)
+@Singleton
+@State(name = "JSONDescriptionByAnotherPsiElementService",storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
 public class DescriptionByAnotherPsiElementService implements PersistentStateComponent<Element>, Disposable
 {
 	private static class Info implements Disposable
@@ -201,6 +197,7 @@ public static DescriptionByAnotherPsiElementService getInstance(@Nonnull Project
 	private final Project myProject;
 	private final List<Info> myRegisteredFiles = new ArrayList<Info>();
 
+	@Inject
 	public DescriptionByAnotherPsiElementService(Project project)
 	{
 		myProject = project;

From 1138113ad730d45742a7c22e67ab034a82c4087c Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 17 Nov 2018 18:46:09 +0300
Subject: [PATCH 048/340] make public - injection fix

---
 .../lang/javascript/search/JSReferencesSearchExecutor.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
index 9ed4e92a..7586a0de 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
@@ -35,7 +35,7 @@
  *         Date: Apr 28, 2008
  *         Time: 8:34:20 PM
  */
-class JSReferencesSearchExecutor implements QueryExecutor<PsiReference, ReferencesSearch.SearchParameters>
+public class JSReferencesSearchExecutor implements QueryExecutor<PsiReference, ReferencesSearch.SearchParameters>
 {
 	@Override
 	public boolean execute(final ReferencesSearch.SearchParameters queryParameters, final Processor<PsiReference> consumer)

From ac2c2e863091a4eaffaffac3e135479b1f9ff97e Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 9 Feb 2019 23:36:34 +0300
Subject: [PATCH 049/340] migrate to new annotation

---
 .../intellij/lang/javascript/index/JSItemPresentation.java  | 4 ++--
 .../DescriptionByAnotherPsiElementEditorNotification.java   | 6 +++---
 .../DescriptionByAnotherPsiElementProvider.java             | 4 ++--
 .../javascript/ide/actions/JavaScriptCreateFileAction.java  | 4 ++--
 .../extension/ClientJavaScriptMutableModuleExtension.java   | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index 4beb6b2a..fbe0d95c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -19,7 +19,7 @@
 import javax.swing.Icon;
 
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredDispatchThread;
+import consulo.ui.RequiredUIAccess;
 import consulo.awt.TargetAWT;
 import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.javascript.psi.JSClass;
@@ -98,7 +98,7 @@ private static String getFileName(final PsiFile psiFile)
 
 	@Override
 	@Nullable
-	@RequiredDispatchThread
+	@RequiredUIAccess
 	public Icon getIcon(boolean open)
 	{
 		return TargetAWT.to(IconDescriptorUpdaters.getIcon(myElement, Iconable.ICON_FLAG_VISIBILITY));
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index 6838de6a..5b00a409 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -32,7 +32,7 @@
 import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.ui.EditorNotificationPanel;
 import com.intellij.ui.EditorNotifications;
-import consulo.annotations.RequiredDispatchThread;
+import consulo.ui.RequiredUIAccess;
 import consulo.editor.notifications.EditorNotificationProvider;
 import consulo.json.JsonFileType;
 import consulo.json.jom.JomElement;
@@ -66,7 +66,7 @@ public Key<EditorNotificationPanel> getKey()
 
 	@Nullable
 	@Override
-	@RequiredDispatchThread
+	@RequiredUIAccess
 	public EditorNotificationPanel createNotificationPanel(@Nonnull final VirtualFile file, @Nonnull FileEditor fileEditor)
 	{
 		if(file.getFileType() != JsonFileType.INSTANCE)
@@ -99,7 +99,7 @@ public EditorNotificationPanel createNotificationPanel(@Nonnull final VirtualFil
 			panel.createActionLabel("Choose " + myProvider.getPsiElementName(), new Runnable()
 			{
 				@Override
-				@RequiredDispatchThread
+				@RequiredUIAccess
 				public void run()
 				{
 					T chooseElement = myProvider.chooseElement(myProject);
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
index d806bb88..f5ec07cf 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredDispatchThread;
+import consulo.ui.RequiredUIAccess;
 import consulo.annotations.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.extensions.ExtensionPointName;
@@ -47,7 +47,7 @@ public interface DescriptionByAnotherPsiElementProvider<T extends PsiElement>
 	@RequiredReadAction
 	T getPsiElementById(@Nonnull String id, @Nonnull Project project);
 
-	@RequiredDispatchThread
+	@RequiredUIAccess
 	@Nullable
 	T chooseElement(@Nonnull Project project);
 
diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index 973f631a..a76027a3 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -13,7 +13,7 @@
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
-import consulo.annotations.RequiredDispatchThread;
+import consulo.ui.RequiredUIAccess;
 import consulo.annotations.RequiredReadAction;
 import consulo.awt.TargetAWT;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
@@ -30,7 +30,7 @@ public JavaScriptCreateFileAction()
 	}
 
 	@Override
-	@RequiredDispatchThread
+	@RequiredUIAccess
 	protected boolean isAvailable(DataContext dataContext)
 	{
 		if(!super.isAvailable(dataContext))
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index 0a1b4efe..8e30e36e 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -5,7 +5,7 @@
 import javax.swing.JComponent;
 
 import com.intellij.openapi.projectRoots.Sdk;
-import consulo.annotations.RequiredDispatchThread;
+import consulo.ui.RequiredUIAccess;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.MutableModuleInheritableNamedPointer;
@@ -29,7 +29,7 @@ public MutableModuleInheritableNamedPointer<Sdk> getInheritableSdk()
 		return (MutableModuleInheritableNamedPointer<Sdk>) super.getInheritableSdk();
 	}
 
-	@RequiredDispatchThread
+	@RequiredUIAccess
 	@Nullable
 	@Override
 	public JComponent createConfigurablePanel(@Nonnull Runnable updateOnCheck)

From 220dec0d518f0bc7f61e057dd4c048aab2cd8c88 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 9 Feb 2019 23:42:18 +0300
Subject: [PATCH 050/340] compilation

---
 .../lang/javascript/index/JSItemPresentation.java | 13 ++++++-------
 .../psi/impl/JSExpressionStatementImpl.java       | 15 ++++-----------
 .../JSStructureItemPresentation.java              | 12 +++++-------
 .../javascript/structureView/JSSuperGroup.java    |  7 ++++---
 4 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index fbe0d95c..f71d5d6e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -16,12 +16,8 @@
 
 package com.intellij.lang.javascript.index;
 
-import javax.swing.Icon;
-
 import javax.annotation.Nullable;
-import consulo.ui.RequiredUIAccess;
-import consulo.awt.TargetAWT;
-import consulo.ide.IconDescriptorUpdaters;
+
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSNamedElement;
@@ -31,6 +27,9 @@
 import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import consulo.ide.IconDescriptorUpdaters;
+import consulo.ui.RequiredUIAccess;
+import consulo.ui.image.Image;
 
 /**
  * @author Maxim.Mossienko
@@ -99,8 +98,8 @@ private static String getFileName(final PsiFile psiFile)
 	@Override
 	@Nullable
 	@RequiredUIAccess
-	public Icon getIcon(boolean open)
+	public Image getIcon()
 	{
-		return TargetAWT.to(IconDescriptorUpdaters.getIcon(myElement, Iconable.ICON_FLAG_VISIBILITY));
+		return IconDescriptorUpdaters.getIcon(myElement, Iconable.ICON_FLAG_VISIBILITY);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index 15cced87..cbdf27c6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -17,21 +17,19 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
 
-import consulo.awt.TargetAWT;
-import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.navigation.ItemPresentation;
-import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.ide.IconDescriptorUpdaters;
+import consulo.ui.image.Image;
 
 /**
  * Created by IntelliJ IDEA.
@@ -100,15 +98,10 @@ public String getLocationString()
 				return "";
 			}
 
-			public TextAttributesKey getTextAttributesKey()
-			{
-				return null;
-			}
-
 			@Override
-			public Icon getIcon(boolean open)
+			public Image getIcon()
 			{
-				return TargetAWT.to(IconDescriptorUpdaters.getIcon(JSExpressionStatementImpl.this, 0));
+				return IconDescriptorUpdaters.getIcon(JSExpressionStatementImpl.this, 0);
 			}
 		};
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
index 853e59a3..200519f4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
@@ -16,11 +16,6 @@
 
 package com.intellij.lang.javascript.structureView;
 
-import javax.swing.Icon;
-
-import consulo.annotations.RequiredReadAction;
-import consulo.awt.TargetAWT;
-import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
@@ -34,6 +29,9 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
+import consulo.annotations.RequiredReadAction;
+import consulo.ide.IconDescriptorUpdaters;
+import consulo.ui.image.Image;
 
 /**
  * @author Maxim.Mossienko
@@ -152,13 +150,13 @@ public String getPresentableText()
 
 	@Override
 	@RequiredReadAction
-	public Icon getIcon(boolean open)
+	public Image getIcon()
 	{
 		final PsiElement psiElement = this.element.getRealElement();
 		if(!psiElement.isValid())
 		{
 			return null;
 		}
-		return TargetAWT.to(IconDescriptorUpdaters.getIcon(psiElement, 0));
+		return IconDescriptorUpdaters.getIcon(psiElement, 0);
 	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
index 7442a195..cc7fc070 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
@@ -23,11 +23,13 @@
 import javax.annotation.Nullable;
 import javax.swing.Icon;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.treeView.smartTree.Group;
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.util.IconLoader;
+import consulo.ui.image.Image;
 
 /**
  * @author Maxim.Mossienko
@@ -36,7 +38,6 @@ public class JSSuperGroup implements Group, ItemPresentation
 {
 	private final String myName;
 	private final List<TreeElement> myChildren;
-	private static final Icon myIcon = IconLoader.getIcon("/general/inheritedMethod.png");
 
 	public JSSuperGroup(final String name)
 	{
@@ -71,9 +72,9 @@ public String getLocationString()
 
 	@Override
 	@Nullable
-	public Icon getIcon(final boolean open)
+	public Image getIcon()
 	{
-		return myIcon;
+		return AllIcons.General.InheritedMethod;
 	}
 
 	@Nullable

From c5d56adfa08e21c9a7b31ad2526eb4bad39155e7 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 12 Feb 2019 08:46:03 +0300
Subject: [PATCH 051/340] migrate to ui image

---
 .../lang/javascript/JavaScriptFileType.java   |  1 -
 .../psi/impl/JSDefinitionExpressionImpl.java  |  4 +--
 .../impl/JSObjectLiteralExpressionImpl.java   |  4 +--
 .../debugger/JavaScriptListPanel.java         | 21 +++++++-------
 .../run/debug/V8BaseVariableValue.java        |  7 ++---
 .../javascript/run/debug/V8WatchValue.java    |  4 +--
 .../JavaScriptGroupRuleProviderBase.java      | 10 +++----
 .../generation/JSNamedElementNode.java        | 29 +++++++------------
 .../JavaScriptColorsAndFontsPage.java         |  7 -----
 .../structureView/JSSuperGroup.java           |  9 ------
 .../actions/JavaScriptCreateFileAction.java   |  2 +-
 11 files changed, 36 insertions(+), 62 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
index 564b7bf1..3a322752 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -18,7 +18,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.swing.Icon;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
index f67a1621..efaf91ff 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.ASTNode;
@@ -35,6 +34,7 @@
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
+import consulo.ui.image.Image;
 
 /**
  * Created by IntelliJ IDEA.
@@ -92,7 +92,7 @@ public void accept(@Nonnull PsiElementVisitor visitor)
 		}
 	}
 
-	public Icon getIcon(int flags)
+	public Image getIcon(int flags)
 	{
 		return AllIcons.Nodes.Variable;
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
index 7664eb94..f81c2ce0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.ASTNode;
@@ -30,6 +29,7 @@
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.tree.TokenSet;
+import consulo.ui.image.Image;
 
 /**
  * Created by IntelliJ IDEA.
@@ -72,7 +72,7 @@ public void accept(@Nonnull PsiElementVisitor visitor)
 		}
 	}
 
-	public Icon getIcon(int flags)
+	public Image getIcon(int flags)
 	{
 		return AllIcons.Nodes.Class;
 	}
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
index 3797890d..9def9c2f 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
@@ -22,20 +22,19 @@
 import java.util.Comparator;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.swing.JList;
 import javax.swing.JPanel;
 
-import javax.annotation.Nullable;
 import com.intellij.ide.actions.OpenFileAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.FileColorManager;
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.SortedListModel;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.JBScrollPane;
-import consulo.awt.TargetAWT;
 
 /**
  * @author VISTALL
@@ -69,22 +68,22 @@ public JavaScriptListPanel(@Nonnull Project project)
 
 	private void init()
 	{
-		final JBList jbList = new JBList(myModel);
-		jbList.setCellRenderer(new ListCellRendererWrapper<T>()
+		final JBList<T> jbList = new JBList<>(myModel);
+		jbList.setCellRenderer(new ColoredListCellRenderer<T>()
 		{
 			@Override
-			public void customize(JList list, T value, int index, boolean selected, boolean hasFocus)
+			protected void customizeCellRenderer(@Nonnull JList<? extends T> jList, T t, int i, boolean b, boolean b1)
 			{
-				VirtualFile virtualFile = toVirtualFile(value, false);
+				VirtualFile virtualFile = toVirtualFile(t, false);
 				if(virtualFile == null)
 				{
-					setText("<invalid>");
+					append("<invalid>");
 				}
 				else
 				{
 					setBackground(FileColorManager.getInstance(myProject).getFileColor(virtualFile));
-					setText(virtualFile.getPath());
-					setIcon(TargetAWT.to(virtualFile.getFileType().getIcon()));
+					append(virtualFile.getPath());
+					setIcon(virtualFile.getFileType().getIcon());
 				}
 			}
 		});
@@ -95,7 +94,7 @@ public void mouseClicked(MouseEvent e)
 			{
 				if(e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1)
 				{
-					T selectedValue = (T) jbList.getSelectedValue();
+					T selectedValue = jbList.getSelectedValue();
 					if(selectedValue == null)
 					{
 						return;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
index 864d1214..77a04349 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
@@ -19,15 +19,13 @@
 import java.util.Collection;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
+import javax.annotation.Nullable;
 
 import org.chromium.sdk.JsArray;
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsObject;
 import org.chromium.sdk.JsValue;
 import org.chromium.sdk.JsVariable;
-
-import javax.annotation.Nullable;
 import com.intellij.icons.AllIcons;
 import com.intellij.xdebugger.frame.XCompositeNode;
 import com.intellij.xdebugger.frame.XNamedValue;
@@ -35,6 +33,7 @@
 import com.intellij.xdebugger.frame.XValueNode;
 import com.intellij.xdebugger.frame.XValuePlace;
 import com.intellij.xdebugger.frame.presentation.XValuePresentation;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -80,7 +79,7 @@ else if(value instanceof JsObject)
 	}
 
 	@Nonnull
-	protected Icon getIconForValue(JsValue value, JsValue.Type valueType)
+	protected Image getIconForValue(JsValue value, JsValue.Type valueType)
 	{
 		if(value instanceof JsArray)
 		{
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
index fa88056e..70aeb328 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
@@ -17,11 +17,11 @@
 package consulo.javascript.run.debug;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
 
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsValue;
 import com.intellij.icons.AllIcons;
+import consulo.ui.image.Image;
 
 /**
  * @author VISTALL
@@ -39,7 +39,7 @@ public V8WatchValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull String
 
 	@Nonnull
 	@Override
-	protected Icon getIconForValue(JsValue value, JsValue.Type valueType)
+	protected Image getIconForValue(JsValue value, JsValue.Type valueType)
 	{
 		return AllIcons.Debugger.Watch;
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
index 5fc56c7e..3c47b1f4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -17,9 +17,8 @@
 package com.intellij.lang.javascript.findUsages;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
-
 import javax.annotation.Nullable;
+
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.actionSystem.DataSink;
@@ -43,6 +42,7 @@
 import com.intellij.usages.rules.PsiElementUsage;
 import com.intellij.usages.rules.UsageGroupingRule;
 import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.ui.image.Image;
 
 /**
  * @author Maxim.Mossienko
@@ -95,9 +95,9 @@ abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement &
 	{
 		private SmartPsiElementPointer myElementPointer;
 		private String myName;
-		private Icon myIcon;
+		private Image myIcon;
 
-		PsiNamedElementUsageGroupBase(@Nonnull T element, Icon icon)
+		PsiNamedElementUsageGroupBase(@Nonnull T element, Image icon)
 		{
 			myIcon = icon;
 
@@ -110,7 +110,7 @@ abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement &
 		}
 
 		@Override
-		public Icon getIcon(boolean isOpen)
+		public Image getIcon()
 		{
 			return myIcon;
 		}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
index eedfe82f..10b0eccd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
@@ -16,14 +16,10 @@
 
 package com.intellij.lang.javascript.generation;
 
-import javax.swing.Icon;
-
 import com.intellij.codeInsight.generation.ClassMember;
 import com.intellij.codeInsight.generation.MemberChooserObject;
 import com.intellij.codeInsight.generation.PsiElementMemberChooserObject;
 import com.intellij.icons.AllIcons;
-import consulo.awt.TargetAWT;
-import consulo.ide.IconDescriptorUpdaters;
 import com.intellij.javascript.JSParameterInfoHandler;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSNamedElement;
@@ -32,29 +28,31 @@
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.psi.PsiElement;
-import com.intellij.ui.LayeredIcon;
-import com.intellij.ui.RowIcon;
+import consulo.awt.TargetAWT;
+import consulo.ide.IconDescriptorUpdaters;
+import consulo.ui.image.Image;
+import consulo.ui.image.ImageEffects;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 17, 2008
- *         Time: 8:55:57 PM
+ * Date: Jul 17, 2008
+ * Time: 8:55:57 PM
  */
 public class JSNamedElementNode extends PsiElementMemberChooserObject implements ClassMember
 {
 	public JSNamedElementNode(JSNamedElement node)
 	{
-		super(node, buildTextFor(node), buildIcon(node));
+		super(node, buildTextFor(node), TargetAWT.to(buildIcon(node)));
 	}
 
-	private static Icon buildIcon(final JSNamedElement node)
+	private static Image buildIcon(final JSNamedElement node)
 	{
-		Icon icon = TargetAWT.to(IconDescriptorUpdaters.getIcon(node, 0));
+		Image icon = IconDescriptorUpdaters.getIcon(node, 0);
 
 		if(node instanceof JSFunction)
 		{
 			final JSFunction function = (JSFunction) node;
-			final Icon accessIcon;
+			final Image accessIcon;
 
 			if(function.isGetProperty())
 			{
@@ -71,12 +69,7 @@ else if(function.isSetProperty())
 
 			if(accessIcon != null)
 			{
-				final LayeredIcon layeredIcon = new LayeredIcon(1);
-				layeredIcon.setIcon(accessIcon, 0, 1, 3);
-				RowIcon rowIcon = new RowIcon(2);
-				rowIcon.setIcon(layeredIcon, 1);
-				rowIcon.setIcon(icon, 0);
-				icon = rowIcon;
+				icon = ImageEffects.appendRight(icon, accessIcon);
 			}
 		}
 		return icon;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
index 35d841ee..5c32775e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import javax.annotation.Nonnull;
-import javax.swing.Icon;
 
 import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.JavaScriptBundle;
@@ -94,12 +93,6 @@ public String getDisplayName()
 		return "JavaScript";
 	}
 
-	@Override
-	public Icon getIcon()
-	{
-		return null;
-	}
-
 	@Override
 	@Nonnull
 	public AttributesDescriptor[] getAttributeDescriptors()
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
index cc7fc070..35f20138 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
@@ -21,14 +21,11 @@
 import java.util.List;
 
 import javax.annotation.Nullable;
-import javax.swing.Icon;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.treeView.smartTree.Group;
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.navigation.ItemPresentation;
-import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.util.IconLoader;
 import consulo.ui.image.Image;
 
 /**
@@ -77,12 +74,6 @@ public Image getIcon()
 		return AllIcons.General.InheritedMethod;
 	}
 
-	@Nullable
-	public TextAttributesKey getTextAttributesKey()
-	{
-		return null;
-	}
-
 	void addChild(TreeElement element)
 	{
 		myChildren.add(element);
diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index a76027a3..d127932e 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -26,7 +26,7 @@ public class JavaScriptCreateFileAction extends CreateFileFromTemplateAction
 {
 	public JavaScriptCreateFileAction()
 	{
-		super(null, null, TargetAWT.to(JavaScriptFileType.INSTANCE.getIcon()));
+		super(null, null, JavaScriptFileType.INSTANCE.getIcon());
 	}
 
 	@Override

From 1e0428d166a3bdc82bb020496f2f73b6ba322d7b Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 25 Feb 2019 22:34:11 +0300
Subject: [PATCH 052/340] compilation

---
 ...scriptionByAnotherPsiElementRegistrar.java | 27 +++++++------------
 plugin/src/main/resources/META-INF/json.xml   |  2 +-
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
index e01a45e7..aff3d06c 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
@@ -16,35 +16,28 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
+import java.util.function.Consumer;
+
 import javax.annotation.Nonnull;
-import javax.inject.Singleton;
 
+import com.intellij.openapi.components.ComponentManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.util.NotNullFunction;
 import consulo.editor.notifications.EditorNotificationProvider;
-import consulo.editor.notifications.EditorNotificationProviders;
+import consulo.extensions.ExtensionExtender;
 
 /**
  * @author VISTALL
  * @since 12.11.2015
  */
-@Singleton
-public class DescriptionByAnotherPsiElementRegistrar
+@SuppressWarnings("unchecked")
+public class DescriptionByAnotherPsiElementRegistrar implements ExtensionExtender<EditorNotificationProvider>
 {
-	DescriptionByAnotherPsiElementRegistrar()
+	@Override
+	public void extend(@Nonnull ComponentManager componentManager, @Nonnull Consumer<EditorNotificationProvider> consumer)
 	{
-		for(final DescriptionByAnotherPsiElementProvider<?> provider : DescriptionByAnotherPsiElementProvider.EP_NAME.getExtensions())
+		for(final DescriptionByAnotherPsiElementProvider<?> provider : DescriptionByAnotherPsiElementProvider.EP_NAME.getExtensionList())
 		{
-			EditorNotificationProviders.registerProvider(new NotNullFunction<Project, EditorNotificationProvider<?>>()
-			{
-				@Nonnull
-				@Override
-				public EditorNotificationProvider<?> fun(Project project)
-				{
-					//noinspection unchecked
-					return new DescriptionByAnotherPsiElementEditorNotification(project, provider);
-				}
-			});
+			consumer.accept(new DescriptionByAnotherPsiElementEditorNotification((Project) componentManager, provider));
 		}
 	}
 }
diff --git a/plugin/src/main/resources/META-INF/json.xml b/plugin/src/main/resources/META-INF/json.xml
index 963b0fc2..550e4df8 100644
--- a/plugin/src/main/resources/META-INF/json.xml
+++ b/plugin/src/main/resources/META-INF/json.xml
@@ -41,7 +41,7 @@
 						 enabledByDefault="true"
 						 implementationClass="consulo.json.validation.inspections.PropertyValidationInspection"/>
 
-		<applicationService serviceImplementation="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementRegistrar" lazy="false"/>
+		<extensionExtender key="com.intellij.editorNotificationProvider" implementationClass="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementRegistrar" />
 	</extensions>
 
 	<extensions defaultExtensionNs="consulo.javascript">

From f4838c3907a789576e060c1e50cabd84b6c3c9b0 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 19 Mar 2019 13:08:57 +0300
Subject: [PATCH 053/340] do not use plugin class loader

---
 ...ntJavaScriptPredefinedBundlesProvider.java | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index 613a0082..82e57793 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -1,14 +1,6 @@
 package consulo.javascript.client.module.sdk;
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManager;
-import com.intellij.ide.plugins.cl.PluginClassLoader;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkModificator;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -17,6 +9,11 @@
 import consulo.roots.types.BinariesOrderRootType;
 import consulo.roots.types.SourcesOrderRootType;
 
+import javax.annotation.Nonnull;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author VISTALL
  * @since 29.06.14
@@ -35,12 +32,7 @@ public class ClientJavaScriptPredefinedBundlesProvider extends PredefinedBundles
 	@Override
 	public void createBundles(@Nonnull Context context)
 	{
-		PluginClassLoader classLoader = (PluginClassLoader) getClass().getClassLoader();
-		IdeaPluginDescriptor plugin = PluginManager.getPlugin(classLoader.getPluginId());
-		assert plugin != null;
-		File path = plugin.getPath();
-
-		File sdkDir = new File(path, "sdk");
+		File sdkDir = new File(PluginManager.getPluginPath(ClientJavaScriptPredefinedBundlesProvider.class), "sdk");
 		if(!sdkDir.exists())
 		{
 			return;

From 61027176f47c01b7a953688dd2c886c66fe448f4 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 24 Apr 2019 21:05:45 +0300
Subject: [PATCH 054/340] cleanup

---
 .../ide/hightlight/JavaScriptSyntaxHighlightKeys.java        | 5 ++---
 .../java/consulo/javascript/lang/EcmaScriptFileType.java     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
index 5d6ee0e5..cc5d2f72 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
@@ -43,7 +43,7 @@ public interface JavaScriptSyntaxHighlightKeys
 
 	TextAttributesKey JS_DOC_COMMENT = TextAttributesKey.createTextAttributesKey("JS.DOC_COMMENT", DefaultLanguageHighlighterColors.DOC_COMMENT);
 
-	public TextAttributesKey JS_OPERATION_SIGN = TextAttributesKey.createTextAttributesKey("JS.OPERATION_SIGN", DefaultLanguageHighlighterColors.OPERATION_SIGN);
+	TextAttributesKey JS_OPERATION_SIGN = TextAttributesKey.createTextAttributesKey("JS.OPERATION_SIGN", DefaultLanguageHighlighterColors.OPERATION_SIGN);
 
 	TextAttributesKey JS_PARENTHS = TextAttributesKey.createTextAttributesKey("JS.PARENTHS", DefaultLanguageHighlighterColors.PARENTHESES);
 
@@ -69,8 +69,7 @@ public interface JavaScriptSyntaxHighlightKeys
 	TextAttributesKey JS_GLOBAL_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.GLOBAL_VARIABLE", DefaultLanguageHighlighterColors.STATIC_FIELD);
 	TextAttributesKey JS_GLOBAL_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.GLOBAL_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
 	TextAttributesKey JS_STATIC_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.STATIC_MEMBER_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
-	TextAttributesKey JS_INSTANCE_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.INSTANCE_MEMBER_FUNCTION", new TextAttributes(new Color(0x7a, 0x7a, 43), Color.white, null, null,
-			0));
+	TextAttributesKey JS_INSTANCE_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.INSTANCE_MEMBER_FUNCTION", new TextAttributes(new Color(0x7a, 0x7a, 43), Color.white, null, null,0));
 
 	TextAttributesKey JS_METADATA = TextAttributesKey.createTextAttributesKey("JS.ATTRIBUTE", new TextAttributes(null, new Color(0xf7, 0xe9, 0xe9), null, null, 0));
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
index 24e82d31..7d13e596 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
@@ -41,7 +41,7 @@ private EcmaScriptFileType()
 
 	@Nonnull
 	@Override
-	public String getName()
+	public String getId()
 	{
 		return "ECMASCRIPT";
 	}

From cc05d6b63703fa69266720461b6a590a55c57df3 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 24 Oct 2019 23:07:00 +0300
Subject: [PATCH 055/340] compilation

---
 .../lang/javascript/search/JSClassSearch.java | 28 ++++++++-----------
 .../search/JSDefinitionsSearchExecutor.java   |  6 ++--
 .../javascript/search/JSFunctionsSearch.java  |  2 +-
 .../search/JSReferencesSearchExecutor.java    |  2 +-
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index be6cc77b..3033d363 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -16,12 +16,6 @@
 
 package com.intellij.lang.javascript.search;
 
-import gnu.trove.THashSet;
-
-import java.util.Collection;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSReferenceList;
 import com.intellij.openapi.extensions.Extensions;
@@ -30,12 +24,13 @@
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.psi.stubs.StubIndexKey;
-import com.intellij.util.CommonProcessors;
-import com.intellij.util.Processor;
-import com.intellij.util.Query;
-import com.intellij.util.QueryExecutor;
-import com.intellij.util.QueryFactory;
+import com.intellij.util.*;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import gnu.trove.THashSet;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+import java.util.Set;
 
 public abstract class JSClassSearch implements QueryExecutor<JSClass, JSClassSearch.SearchParameters>
 {
@@ -109,13 +104,13 @@ protected JSClass[] getSupers(final JSClass candidate)
 			}
 
 			@Override
-			public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull Processor<JSClass> consumer)
+			public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull Processor<? super JSClass> consumer)
 			{
 				final THashSet<JSClass> visited = new THashSet<JSClass>();         // no abstract classes in ActionScript !
 
 				if(queryParameters.isCheckDeepInheritance())
 				{
-					final Processor<JSClass> consumerCopy = consumer;
+					final Processor<? super JSClass> consumerCopy = consumer;
 					consumer = new Processor<JSClass>()
 					{
 						@Override
@@ -127,7 +122,7 @@ public boolean process(JSClass jsClass)
 					};
 				}
 
-				final Processor<JSClass> consumerToUse = consumer;
+				final Processor<? super JSClass> consumerToUse = consumer;
 				final boolean b = processDirectInheritors(queryParameters.getTargetClass(), consumerToUse, queryParameters.isCheckDeepInheritance(), visited,
 						queryParameters.getScope());
 				if(b)
@@ -175,14 +170,13 @@ protected Collection<JSClass> getInheritors(JSClassInheritorsProvider provider,
 	}
 
 	@Override
-	public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull final Processor<JSClass> consumer)
+	public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull final Processor<? super JSClass> consumer)
 	{
 		return processDirectInheritors(queryParameters.getTargetClass(), consumer, queryParameters.isCheckDeepInheritance(), null,
 				queryParameters.getScope());
 	}
 
-	protected boolean processDirectInheritors(final JSClass superClass, final Processor<JSClass> consumer, final boolean checkDeep,
-			Set<JSClass> processed, final GlobalSearchScope scope)
+	protected boolean processDirectInheritors(final JSClass superClass, final Processor<? super JSClass> consumer, final boolean checkDeep, Set<JSClass> processed, final GlobalSearchScope scope)
 	{
 		if(processed != null)
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
index e8515450..fb9fa1f4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.search;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.index.JavaScriptIndex;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
@@ -34,6 +32,8 @@
 import com.intellij.util.QueryExecutor;
 import consulo.javascript.lang.JavaScriptLanguage;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author Maxim.Mossienko
  *         Date: Apr 28, 2008
@@ -42,7 +42,7 @@
 class JSDefinitionsSearchExecutor implements QueryExecutor<PsiElement, DefinitionsScopedSearch.SearchParameters>
 {
 	@Override
-	public boolean execute(@Nonnull final DefinitionsScopedSearch.SearchParameters parameters, @Nonnull final Processor<PsiElement> consumer)
+	public boolean execute(@Nonnull final DefinitionsScopedSearch.SearchParameters parameters, @Nonnull final Processor<? super PsiElement> consumer)
 	{
 		final PsiElement sourceElement = parameters.getElement();
 		if(sourceElement instanceof PsiNamedElement && sourceElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE))
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
index 6dedeab7..b7162521 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
@@ -79,7 +79,7 @@ protected Query<JSClass> makeQuery(final SearchParameters queryParameters, final
 	}
 
 	@Override
-	public boolean execute(final SearchParameters queryParameters, final Processor<JSFunction> consumer)
+	public boolean execute(final SearchParameters queryParameters, final Processor<? super JSFunction> consumer)
 	{
 		final JSFunction baseFunction = queryParameters.getBaseFunction();
 		PsiElement clazz = JSResolveUtil.findParent(baseFunction);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
index 7586a0de..c71b0ff9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
@@ -38,7 +38,7 @@
 public class JSReferencesSearchExecutor implements QueryExecutor<PsiReference, ReferencesSearch.SearchParameters>
 {
 	@Override
-	public boolean execute(final ReferencesSearch.SearchParameters queryParameters, final Processor<PsiReference> consumer)
+	public boolean execute(final ReferencesSearch.SearchParameters queryParameters, final Processor<? super PsiReference> consumer)
 	{
 		final PsiElement sourceElement = queryParameters.getElementToSearch();
 

From bdc461b95d7f4ad0d39f901cb655584b40c16786 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 26 Oct 2019 03:13:44 +0300
Subject: [PATCH 056/340] compilation

---
 .../formatter/blocks/SubBlockVisitor.java     | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
index b77ba82d..b1b0cdaf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
@@ -16,15 +16,7 @@
 
 package com.intellij.lang.javascript.formatter.blocks;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import com.intellij.formatting.Alignment;
-import com.intellij.formatting.Block;
-import com.intellij.formatting.Indent;
-import com.intellij.formatting.Wrap;
-import com.intellij.formatting.WrapType;
+import com.intellij.formatting.*;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSNodeVisitor;
@@ -42,6 +34,10 @@
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.tree.IElementType;
 
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author ven
  */
@@ -369,22 +365,22 @@ else if(node.getElementType() == JSElementTypes.PARENTHESIZED_EXPRESSION)
 		{
 			if(child == node.findChildByType(JSTokenTypes.LPAR) && mySettings.PARENTHESES_EXPRESSION_LPAREN_WRAP)
 			{
-				wrapType = Wrap.NORMAL;
+				wrapType = WrapType.NORMAL;
 			}
 			else if(child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.PARENTHESES_EXPRESSION_RPAREN_WRAP)
 			{
-				wrapType = Wrap.ALWAYS;
+				wrapType = WrapType.ALWAYS;
 			}
 		}
 		else if(node.getElementType() == JSElementTypes.ARRAY_LITERAL_EXPRESSION)
 		{
 			if(child == node.findChildByType(JSTokenTypes.LBRACE) && mySettings.ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE)
 			{
-				wrapType = Wrap.NORMAL;
+				wrapType = WrapType.NORMAL;
 			}
 			else if(child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE)
 			{
-				wrapType = Wrap.ALWAYS;
+				wrapType = WrapType.ALWAYS;
 			}
 		}
 		else if(node.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION)
@@ -400,11 +396,11 @@ else if(node.getElementType() == JSElementTypes.CALL_EXPRESSION)
 		{
 			if(child == node.findChildByType(JSTokenTypes.LPAR) && mySettings.CALL_PARAMETERS_LPAREN_ON_NEXT_LINE)
 			{
-				wrapType = Wrap.NORMAL;
+				wrapType = WrapType.NORMAL;
 			}
 			else if(child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.CALL_PARAMETERS_RPAREN_ON_NEXT_LINE)
 			{
-				wrapType = Wrap.ALWAYS;
+				wrapType = WrapType.ALWAYS;
 			}
 		}
 		else if(node.getElementType() == JSElementTypes.PARAMETER_LIST)

From e3339ef7a5afb7bb4e2ef27f1f4d40f8076c5501 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 8 Nov 2019 22:55:48 +0300
Subject: [PATCH 057/340] eat jsx file type too

---
 .../consulo/javascript/lang/JavaScriptFileTypeFactory.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
index 39b98150..bf3204e9 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
@@ -16,11 +16,12 @@
 
 package consulo.javascript.lang;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 11.12.2015
@@ -31,5 +32,6 @@ public class JavaScriptFileTypeFactory extends FileTypeFactory
 	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
 	{
 		consumer.consume(JavaScriptFileType.INSTANCE);
+		consumer.consume(JavaScriptFileType.INSTANCE, "jsx");
 	}
 }

From 559332317fe120b08f6f8be4475b319fe877d6dc Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 28 Nov 2019 22:41:28 +0300
Subject: [PATCH 058/340] compilation

---
 .../lang/javascript/psi/JSExpression.java     |  2 +-
 .../lang/javascript/psi/JSFunction.java       |  2 +-
 .../javascript/psi/JSLabeledStatement.java    |  2 +-
 .../lang/javascript/psi/JSParameter.java      |  2 +-
 .../javascript/psi/JSPrefixExpression.java    |  2 +-
 .../lang/javascript/psi/JSProperty.java       |  2 +-
 .../lang/javascript/psi/JSReferenceList.java  |  2 +-
 .../lang/javascript/psi/JSVariable.java       |  2 +-
 .../javascript/lang/psi/JavaScriptType.java   |  2 +-
 .../psi/JSSimpleLiteralExpression.java        |  2 +-
 .../psi/JavaScriptLambdaExpression.java       |  2 +-
 .../JSPropertyNameReferenceProvider.java      |  2 +-
 .../JSDocumentationProvider.java              |  2 +-
 .../lang/javascript/JSTokenTypes.java         |  2 +-
 .../javascript/index/JSItemPresentation.java  |  6 ++--
 .../inspections/qucikFixes/BaseCreateFix.java |  2 +-
 .../CreateJSFunctionOrMethodFix.java          |  2 +-
 .../lang/javascript/psi/impl/JSClassImpl.java |  2 +-
 .../javascript/psi/impl/JSExpressionImpl.java |  2 +-
 .../psi/impl/JSFunctionBaseImpl.java          |  2 +-
 .../psi/impl/JSFunctionExpressionImpl.java    |  2 +-
 .../javascript/psi/impl/JSFunctionImpl.java   |  2 +-
 .../psi/impl/JSLiteralExpressionImpl.java     |  2 +-
 .../psi/impl/JSNewExpressionImpl.java         |  2 +-
 .../javascript/psi/impl/JSParameterImpl.java  |  7 ++--
 .../psi/impl/JSPostfixExpressionImpl.java     |  2 +-
 .../psi/impl/JSPrefixExpressionImpl.java      |  2 +-
 .../javascript/psi/impl/JSPropertyImpl.java   |  2 +-
 .../javascript/psi/impl/JSPsiImplUtils.java   |  2 +-
 .../psi/impl/JSReferenceExpressionImpl.java   |  2 +-
 .../psi/impl/JSReferenceListImpl.java         |  2 +-
 .../javascript/psi/impl/JSReferenceSet.java   |  2 +-
 .../psi/impl/JSVariableBaseImpl.java          |  2 +-
 .../reference/JSPropertyNameReference.java    |  7 ++--
 .../psi/resolve/JSImportHandlingUtil.java     | 17 +++++-----
 .../javascript/psi/resolve/JSResolveUtil.java |  2 +-
 .../psi/resolve/ResolveProcessor.java         |  2 +-
 .../psi/resolve/VariantsProcessor.java        |  2 +-
 .../javascript/psi/util/JSLookupUtil.java     |  2 +-
 .../types/JSAttributeElementType.java         |  2 +-
 .../types/JSAttributeListElementType.java     |  2 +-
 .../types/JSAttributeNameValuePairType.java   |  2 +-
 .../javascript/types/JSClassElementType.java  |  2 +-
 .../types/JSFunctionElementType.java          |  2 +-
 .../types/JSImportStatementElementType.java   |  2 +-
 .../types/JSIncludeDirectiveElementType.java  |  2 +-
 .../JSNamespaceDeclarationElementType.java    |  2 +-
 .../types/JSPackageStatementElementType.java  |  2 +-
 .../types/JSParameterElementType.java         |  2 +-
 .../types/JSParameterListElementType.java     |  2 +-
 .../types/JSReferenceListElementType.java     |  2 +-
 .../types/JSUseNamespaceDirectiveType.java    |  2 +-
 .../types/JSVarStatementElementType.java      |  2 +-
 .../types/JSVariableElementType.java          |  2 +-
 .../qucikFixes/CreateJSFunctionFixBase.java   |  2 +-
 .../lang/psi/JavaScriptPrimitiveType.java     |  2 +-
 .../lang/psi/impl/JavaScriptClassType.java    |  2 +-
 .../impl/JavaScriptLambdaExpressionImpl.java  |  2 +-
 .../JavaScriptLineBreakpointTypeResolver.java |  2 +-
 .../javascript/run/debug/V8DebugProcess.java  | 33 +++++++------------
 ...inConcatenatedStringLiteralsIntention.java |  2 +-
 .../json/jom/JomIconDescriptorUpdater.java    |  2 +-
 .../java/consulo/json/jom/JomManager.java     |  2 +-
 .../JomModeAsJsonFileDescriptorProvider.java  |  2 +-
 .../jom/proxy/JomProxyInvocationHandler.java  |  2 +-
 .../json/jom/proxy/JomValueConverter.java     |  2 +-
 .../json/jom/proxy/impl/JomBooleanValue.java  |  2 +-
 .../jom/proxy/impl/JomCollectionValue.java    |  2 +-
 .../json/jom/proxy/impl/JomMapConverter.java  |  2 +-
 .../proxy/impl/JomNullableNumberValue.java    |  2 +-
 .../jom/proxy/impl/JomStringConverter.java    |  2 +-
 .../JsonFileDescriptorProvider.java           |  2 +-
 .../JsonFileDescriptorProviders.java          |  2 +-
 .../completion/JsonCompletionContributor.java |  2 +-
 ...ByAnotherPsiElementEditorNotification.java |  8 ++---
 ...therPsiElementJsonDescriptionProvider.java |  2 +-
 ...escriptionByAnotherPsiElementProvider.java | 11 ++++---
 .../descriptor/JsonPropertyDescriptor.java    |  9 ++---
 .../PropertyValidationInspection.java         |  2 +-
 .../reference/JsonPropertyNameReference.java  |  2 +-
 .../JsonPropertyNameReferenceProvider.java    |  2 +-
 .../javascript/JSSmartEnterProcessor.java     |  2 +-
 .../JavaScriptHighlightVisitor.java           |  2 +-
 .../JSUnresolvedVariableInspection.java       |  2 +-
 .../JSStructureItemPresentation.java          |  2 +-
 .../ide/JavaScriptIconDescriptorUpdater.java  |  2 +-
 .../actions/JavaScriptCreateFileAction.java   |  7 ++--
 ...avaScriptKeywordCompletionContributor.java |  2 +-
 .../JavaScriptLanguageVersionResolver.java    |  2 +-
 .../JavaScriptRegexpMultiHostInjector.java    |  2 +-
 .../lang/psi/JavaScriptSimpleType.java        |  2 +-
 ...efaultJSPropertyNameReferenceProvider.java |  2 +-
 .../main/resources/META-INF/Intentions.xml    |  4 +--
 .../main/resources/META-INF/actionscript.xml  |  4 +--
 plugin/src/main/resources/META-INF/ecma4.xml  |  4 +--
 plugin/src/main/resources/META-INF/ecma6.xml  |  4 +--
 plugin/src/main/resources/META-INF/json.xml   |  4 +--
 plugin/src/main/resources/META-INF/plugin.xml | 16 ++++-----
 plugin/src/main/resources/META-INF/regexp.xml |  4 +--
 .../main/resources/META-INF/typescript.xml    |  4 +--
 .../ClientJavaScriptModuleExtension.java      |  2 +-
 ...lientJavaScriptMutableModuleExtension.java | 10 +++---
 102 files changed, 160 insertions(+), 167 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
index a70cee6b..2f623ab2 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
@@ -19,7 +19,7 @@
 import javax.annotation.Nonnull;
 
 import com.intellij.util.ArrayFactory;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 
 /**
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index 761216fd..9789d166 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -22,7 +22,7 @@
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.util.ArrayFactory;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
index 50dab333..43efe620 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
@@ -18,7 +18,7 @@
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import consulo.annotations.DeprecationInfo;
+import consulo.annotation.DeprecationInfo;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
index 0240e5c0..701b1d77 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
@@ -20,7 +20,7 @@
 import javax.annotation.Nullable;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ArrayFactory;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 
 /**
  * User: max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
index 3df962c3..4b0ffce8 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
index 6d56558c..00305cfd 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
@@ -20,7 +20,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import com.intellij.psi.PsiElement;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.psi.JSComputedName;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
index 8278a5e8..a90b5400 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
 import com.intellij.psi.StubBasedPsiElement;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index dbe37f48..b84eebf7 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -21,7 +21,7 @@
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
 import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.util.IncorrectOperationException;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
diff --git a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java b/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
index bff6470b..f3d667fd 100644
--- a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
+++ b/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
 /**
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
index 35b52077..2f629ccc 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
@@ -20,7 +20,7 @@
 import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.psi.tree.IElementType;
 
 /**
diff --git a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
index 02e3f5b7..b1b1356a 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParameterList;
 
diff --git a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index 27303b86..d7d70bc3 100644
--- a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -22,7 +22,7 @@
 
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.PsiReference;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.extensions.CompositeExtensionPointName;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 1c75abbd..05f925b9 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -27,7 +27,7 @@
 import javax.annotation.Nullable;
 
 import org.jetbrains.annotations.NonNls;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.documentation.CodeDocumentationProvider;
 import com.intellij.lang.documentation.DocumentationProvider;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index a34bd129..8322da71 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -35,7 +35,7 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.TokenSet;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.parsing.JavaScriptParser;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index f71d5d6e..c84512b7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.index;
 
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSNamedElement;
@@ -28,9 +26,11 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import consulo.ide.IconDescriptorUpdaters;
-import consulo.ui.RequiredUIAccess;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nullable;
+
 /**
  * @author Maxim.Mossienko
  * @since 9:55:49 PM Apr 7, 2006
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index e14e78d4..1c2d1532 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -57,7 +57,7 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptVersionUtil;
 import consulo.javascript.lang.psi.JavaScriptType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index 6b253f3c..c9ea70d4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -27,7 +27,7 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.inspections.qucikFixes.CreateJSFunctionFixBase;
 import consulo.javascript.lang.JavaScriptFeature;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
index 65845273..fcd1874a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
@@ -39,7 +39,7 @@
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
index 1e4d0762..c7104129 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import javax.annotation.Nonnull;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSExpression;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index 9e68bee4..99eeee6e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -38,7 +38,7 @@
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.util.IncorrectOperationException;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.psi.JavaScriptType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index ba683862..f99c6d97 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
index d729e9cc..4f9ca0ad 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index 031af263..83a605c7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -29,7 +29,7 @@
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.tree.IElementType;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.psi.JavaScriptPrimitiveType;
 import consulo.javascript.lang.psi.JavaScriptType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index 005a7670..193e231f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -27,7 +27,7 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.impl.JavaScriptClassType;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index 29f263d4..06248ccc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -16,9 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -31,6 +28,10 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index 6b919e98..3115f615 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index c58683a9..7dc84293 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index 324d03f4..c8dc699b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -33,7 +33,7 @@
 import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.util.IncorrectOperationException;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.psi.JSComputedName;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 2c91901b..96f9a25b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -58,7 +58,7 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.util.Consumer;
 import com.intellij.util.IncorrectOperationException;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
 import consulo.javascript.lang.psi.impl.elementType.BaseJavaScriptElementType;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 5de24d69..fb56c7ad 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -50,7 +50,7 @@
 import com.intellij.refactoring.rename.BindablePsiReference;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.JavaScriptVersionUtil;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index d07c0e57..a04d470b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -35,7 +35,7 @@
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.util.ArrayUtil;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index e23bd48c..f50b2388 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -23,7 +23,7 @@
 import javax.annotation.Nullable;
 
 import org.jetbrains.annotations.NonNls;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JavaScriptBundle;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index 8b0d4eb8..dd7a523a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -40,7 +40,7 @@
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
index 98b6436e..27fa9414 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
@@ -17,9 +17,6 @@
 
 package com.intellij.lang.javascript.psi.impl.reference;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -32,6 +29,10 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class JSPropertyNameReference implements PsiReference
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index ee18f088..5a106b92 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -16,14 +16,6 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.flex.FlexImportSupport;
 import com.intellij.lang.javascript.flex.JSResolveHelper;
@@ -47,8 +39,15 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.Processor;
-import com.intellij.util.containers.ConcurrentHashMap;
 import com.intellij.xml.XmlElementDescriptor;
+import gnu.trove.THashMap;
+import gnu.trove.THashSet;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index c38d85fd..ac2e1ea2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -99,7 +99,7 @@
 import com.intellij.util.indexing.FileBasedIndex;
 import com.intellij.util.text.StringTokenizer;
 import com.intellij.xml.XmlElementDescriptor;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptVersionUtil;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 423b56bd..71d2bf18 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -24,7 +24,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index 6b6951fe..567f3003 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -35,7 +35,7 @@
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ArrayUtil;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFeature;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
index bf145728..473edfff 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
@@ -19,7 +19,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.codeInsight.completion.PrioritizedLookupElement;
 import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
index 53fde8aa..2bdbe471 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttribute;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
index 275cefff..76fe0570 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
index 4f5977f8..20d0e878 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
index 46c23096..2f055343 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
@@ -32,7 +32,7 @@
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.util.io.StringRef;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import consulo.javascript.types.JSQualifiedStubElementType;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
index 730c64e4..08ce9a85 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSFunctionStubImpl;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
index 4991a5b4..88c1fbf5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
index c2f976de..f7a5a6b2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSIncludeDirective;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
index 2bd99e40..82115176 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
 import com.intellij.lang.javascript.psi.impl.JSNamespaceDeclarationImpl;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
index d3e95edc..09681200 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
index 2a97bdb8..21935479 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import javax.annotation.Nonnull;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
index 4448817e..aba46952 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.JSStubElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
index 27bd6522..1a940ada 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
@@ -38,7 +38,7 @@
 import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.io.StringRef;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
index 0cc691ce..c8f239da 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.JSUseNamespaceDirective;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
index d29360fc..34a1dd52 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFile;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
index f392b449..35d71ea8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
@@ -21,7 +21,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSVariable;
diff --git a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index 2bcb0c6a..26484691 100644
--- a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -28,7 +28,7 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFeature;
 
 /**
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
index f7832449..9604556a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
 /**
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
index cde4385b..f38b077b 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
@@ -19,7 +19,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.psi.PsiElement;
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
index e667426b..db6e8829 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
@@ -28,7 +28,7 @@
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
 
 /**
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
index 857da33d..a55c6f31 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
@@ -22,7 +22,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.xdebugger.breakpoints.XLineBreakpointType;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.xdebugger.breakpoints.XLineBreakpointTypeResolver;
 
 /**
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
index 15aa193e..50533df9 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
@@ -16,20 +16,6 @@
 
 package consulo.javascript.run.debug;
 
-import java.net.InetSocketAddress;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.chromium.sdk.Breakpoint;
-import org.chromium.sdk.DebugContext;
-import org.chromium.sdk.JavascriptVm;
-import org.chromium.sdk.JavascriptVmFactory;
-import org.chromium.sdk.Script;
-import org.chromium.sdk.StandaloneVm;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.process.ProcessHandler;
@@ -41,22 +27,25 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.content.Content;
 import com.intellij.util.ui.UIUtil;
-import com.intellij.xdebugger.XDebugProcess;
-import com.intellij.xdebugger.XDebugSession;
-import com.intellij.xdebugger.XDebuggerBundle;
-import com.intellij.xdebugger.XDebuggerManager;
-import com.intellij.xdebugger.XExpression;
-import com.intellij.xdebugger.XSourcePosition;
+import com.intellij.xdebugger.*;
 import com.intellij.xdebugger.breakpoints.XBreakpointHandler;
 import com.intellij.xdebugger.breakpoints.XBreakpointManager;
 import com.intellij.xdebugger.breakpoints.XBreakpointProperties;
 import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
 import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 import com.intellij.xdebugger.ui.XDebugTabLayouter;
-import consulo.annotations.Exported;
+import consulo.annotation.UsedInPlugin;
 import consulo.javascript.debugger.JavaScriptEditorsProvider;
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
 import consulo.javascript.debugger.JavaScriptListPanel;
+import org.chromium.sdk.*;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author VISTALL
@@ -91,7 +80,7 @@ public VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen)
 		myVm = JavascriptVmFactory.getInstance().createStandalone(new InetSocketAddress("localhost", port), null);
 	}
 
-	@Exported
+	@UsedInPlugin
 	public void attach() throws Exception
 	{
 		myVm.attach(new V8DebugEventListener(this));
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index afe4f5a1..ec61301c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -28,7 +28,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 
 public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention {
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
index 09eb8e08..1fef49de 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -20,7 +20,7 @@
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.ide.IconDescriptor;
 import consulo.ide.IconDescriptorUpdater;
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index 0c714ab6..c04006eb 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -31,7 +31,7 @@
 import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.psi.util.PsiModificationTracker;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.JsonFileType;
 
 /**
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
index c53999df..b9d1a1cc 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
@@ -29,7 +29,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.validation.JsonFileDescriptorProvider;
 import consulo.json.validation.NativeArray;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
index e274ff81..e1b9de0f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
@@ -6,7 +6,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.JomElement;
 import consulo.json.jom.JomUtil;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
index ec709061..d098b1cc 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
@@ -12,7 +12,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.JomElement;
 import consulo.json.jom.proxy.impl.JomBooleanValue;
 import consulo.json.jom.proxy.impl.JomCollectionValue;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
index 45f8fa90..6931d40a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
@@ -4,7 +4,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
index 45839e14..704d8706 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
@@ -6,7 +6,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
index 4d3ea50e..45b1094c 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
@@ -6,7 +6,7 @@
 import java.util.Map;
 
 import javax.annotation.Nonnull;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
index 18f097a9..1d60dcaa 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
@@ -5,7 +5,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
index 1c53bc75..18edc476 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
@@ -8,7 +8,7 @@
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
index 00efe8ce..f2d74f97 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.PsiFile;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
index 24e8af2f..82ec0df3 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nullable;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.JsonFileType;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.psi.PsiFile;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
index 629b56df..3a94cfe5 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -43,7 +43,7 @@
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.containers.ContainerUtil;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.codeInsight.completion.CompletionProvider;
 import consulo.json.validation.JsonFileDescriptorProviders;
 import consulo.json.validation.NativeArray;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index 5b00a409..7d91fbda 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -16,9 +16,6 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.project.Project;
@@ -32,12 +29,15 @@
 import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.ui.EditorNotificationPanel;
 import com.intellij.ui.EditorNotifications;
-import consulo.ui.RequiredUIAccess;
 import consulo.editor.notifications.EditorNotificationProvider;
 import consulo.json.JsonFileType;
 import consulo.json.jom.JomElement;
 import consulo.json.jom.JomFileElement;
 import consulo.json.jom.JomManager;
+import consulo.ui.annotation.RequiredUIAccess;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
index 504ccfe4..54bc91d5 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
@@ -17,7 +17,7 @@
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
 import javax.annotation.Nonnull;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.validation.JsonFileDescriptorProvider;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.util.Pair;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
index f5ec07cf..e884d6a7 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
@@ -16,14 +16,15 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import consulo.ui.RequiredUIAccess;
-import consulo.annotations.RequiredReadAction;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.ui.annotation.RequiredUIAccess;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
index 3b728fe4..dcefc592 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
@@ -16,12 +16,13 @@
 
 package consulo.json.validation.descriptor;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
-import consulo.annotations.Exported;
+import consulo.annotation.UsedInPlugin;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
@@ -78,7 +79,7 @@ public String getName()
 		return myName;
 	}
 
-	@Exported
+	@UsedInPlugin
 	public void setNavigationElement(@Nonnull PsiElement element)
 	{
 		myNavigationElement = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index 32626c57..3b28ab77 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -49,7 +49,7 @@
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.PairProcessor;
 import com.intellij.util.containers.ContainerUtil;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.json.validation.JsonFileDescriptorProviders;
 import consulo.json.validation.NativeArray;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
index 0292fe4c..ab3f31b7 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nullable;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
index 3cbf9ca8..eadea6be 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
index 34605fee..bd27603d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
@@ -38,7 +38,7 @@
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.util.PsiTreeUtil;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index b2455b33..30d95f05 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -35,7 +35,7 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilCore;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import consulo.javascript.lang.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptTokenSets;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
index 858a03e6..49066397 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
@@ -49,7 +49,7 @@
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.util.PsiTreeUtil;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFeature;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
index 200519f4..d42a0071 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
@@ -29,7 +29,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.ide.IconDescriptorUpdaters;
 import consulo.ui.image.Image;
 
diff --git a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
index 0bd186db..5d375fed 100644
--- a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
+++ b/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
@@ -25,7 +25,7 @@
 import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.BitUtil;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.ide.IconDescriptor;
 import consulo.ide.IconDescriptorUpdater;
 import consulo.ui.image.Image;
diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index d127932e..49bc5776 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -1,6 +1,5 @@
 package consulo.javascript.ide.actions;
 
-import javax.annotation.Nullable;
 import com.intellij.ide.IdeView;
 import com.intellij.ide.actions.CreateFileFromTemplateAction;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
@@ -13,10 +12,12 @@
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
-import consulo.ui.RequiredUIAccess;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.awt.TargetAWT;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.ui.annotation.RequiredUIAccess;
+
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
index 0afde87d..f93eb7d1 100644
--- a/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -28,7 +28,7 @@
 import com.intellij.patterns.StandardPatterns;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ProcessingContext;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.codeInsight.completion.CompletionProvider;
 
 /**
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index 3cfdd76b..ca277023 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -25,7 +25,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.lang.LanguageVersion;
 import consulo.lang.LanguageVersionResolver;
 
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
index 80c93152..47e3667c 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
@@ -18,7 +18,7 @@
 
 import org.intellij.lang.regexp.RegExpLanguage;
 import javax.annotation.Nonnull;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java b/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
index 5834bbb9..a74ffce6 100644
--- a/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
+++ b/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
@@ -19,7 +19,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.psi.PsiElement;
 
 /**
diff --git a/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
index 4140703e..fca7bfd2 100644
--- a/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
+++ b/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
@@ -20,7 +20,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReference;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
diff --git a/plugin/src/main/resources/META-INF/Intentions.xml b/plugin/src/main/resources/META-INF/Intentions.xml
index da0328b5..a36a9d89 100644
--- a/plugin/src/main/resources/META-INF/Intentions.xml
+++ b/plugin/src/main/resources/META-INF/Intentions.xml
@@ -14,7 +14,7 @@
   - limitations under the License.
   -->
 
-<idea-plugin>
+<consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
 		<!-- Numbers -->
 		<intentionAction>
@@ -206,4 +206,4 @@
 		</intentionAction>
 
 	</extensions>
-</idea-plugin>
\ No newline at end of file
+</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/actionscript.xml b/plugin/src/main/resources/META-INF/actionscript.xml
index a27549f1..11c20126 100644
--- a/plugin/src/main/resources/META-INF/actionscript.xml
+++ b/plugin/src/main/resources/META-INF/actionscript.xml
@@ -14,9 +14,9 @@
   - limitations under the License.
   -->
 
-<idea-plugin>
+<consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
 		<fileTypeFactory implementation="consulo.actionscript.ActionScriptFileTypeFactory" />
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.actionscript.lang.ActionScriptLanguageVersion" />
 	</extensions>
-</idea-plugin>
\ No newline at end of file
+</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/ecma4.xml b/plugin/src/main/resources/META-INF/ecma4.xml
index 093403f5..5b5c439a 100644
--- a/plugin/src/main/resources/META-INF/ecma4.xml
+++ b/plugin/src/main/resources/META-INF/ecma4.xml
@@ -14,8 +14,8 @@
   - limitations under the License.
   -->
 
-<idea-plugin>
+<consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript4JavaScriptVersion" />
 	</extensions>
-</idea-plugin>
\ No newline at end of file
+</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/ecma6.xml b/plugin/src/main/resources/META-INF/ecma6.xml
index e9641f79..df035100 100644
--- a/plugin/src/main/resources/META-INF/ecma6.xml
+++ b/plugin/src/main/resources/META-INF/ecma6.xml
@@ -14,7 +14,7 @@
   - limitations under the License.
   -->
 
-<idea-plugin>
+<consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
 		<fileTypeFactory implementation="consulo.javascript.lang.EcmaScriptFileTypeFactory" />
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript6JavaScriptVersion" />
@@ -23,4 +23,4 @@
 	<extensions defaultExtensionNs="consulo.javascript">
 		<quickFixFactory key="ECMASCRIPT_6" implementationClass="consulo.javascript.ide.codeInsight.EcmaScript6QuickFixFactory" />
 	</extensions>
-</idea-plugin>
\ No newline at end of file
+</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/json.xml b/plugin/src/main/resources/META-INF/json.xml
index 550e4df8..fa16abfd 100644
--- a/plugin/src/main/resources/META-INF/json.xml
+++ b/plugin/src/main/resources/META-INF/json.xml
@@ -14,7 +14,7 @@
   - limitations under the License.
   -->
 
-<idea-plugin>
+<consulo-plugin>
 	<extensionPoints>
 		<extensionPoint name="jomFileDescriptor" interface="consulo.json.jom.JomFileDescriptor"/>
 		<extensionPoint name="jsonFileDescriptorProvider" interface="consulo.json.validation.JsonFileDescriptorProvider"/>
@@ -51,4 +51,4 @@
 
 		<jsonFileDescriptorProvider implementation="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementJsonDescriptionProvider"/>
 	</extensions>
-</idea-plugin>
\ No newline at end of file
+</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 3fc6bdf9..61dc4fa2 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -14,7 +14,7 @@
   - limitations under the License.
   -->
 
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+<consulo-plugin>
 	<id>consulo.javascript</id>
 	<name>JavaScript</name>
 	<version>SNAPSHOT</version>
@@ -24,12 +24,12 @@
 	<depends>com.intellij.xml</depends>
 	<depends config-file="regexp.xml" optional="true">com.intellij.regexp</depends>
 
-	<xi:include href="/META-INF/Intentions.xml" xpointer="xpointer(/idea-plugin/*)"/>
-	<xi:include href="/META-INF/json.xml" xpointer="xpointer(/idea-plugin/*)"/>
-	<xi:include href="/META-INF/ecma4.xml" xpointer="xpointer(/idea-plugin/*)"/>
-	<xi:include href="/META-INF/ecma6.xml" xpointer="xpointer(/idea-plugin/*)"/>
-	<xi:include href="/META-INF/actionscript.xml" xpointer="xpointer(/idea-plugin/*)"/>
-	<xi:include href="/META-INF/typescript.xml" xpointer="xpointer(/idea-plugin/*)"/>
+	<import path="/META-INF/Intentions.xml"/>
+	<import path="/META-INF/json.xml"/>
+	<import path="/META-INF/ecma4.xml"/>
+	<import path="/META-INF/ecma6.xml"/>
+	<import path="/META-INF/actionscript.xml"/>
+	<import path="/META-INF/typescript.xml"/>
 
 	<actions>
 		<action id="JavaScript.File" class="consulo.javascript.ide.actions.JavaScriptCreateFileAction">
@@ -200,4 +200,4 @@
 			<add-to-group anchor="last" group-id="GenerateGroup"/>
 		</action>
 	</actions>
-</idea-plugin>
+</consulo-plugin>
diff --git a/plugin/src/main/resources/META-INF/regexp.xml b/plugin/src/main/resources/META-INF/regexp.xml
index 13ec5992..7512795a 100644
--- a/plugin/src/main/resources/META-INF/regexp.xml
+++ b/plugin/src/main/resources/META-INF/regexp.xml
@@ -14,8 +14,8 @@
   - limitations under the License.
   -->
 
-<idea-plugin>
+<consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
 		<multiHostInjector forClass="com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl" implementationClass="consulo.javascript.lang.JavaScriptRegexpMultiHostInjector"/>
 	</extensions>
-</idea-plugin>
\ No newline at end of file
+</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/typescript.xml b/plugin/src/main/resources/META-INF/typescript.xml
index f6b7ea71..aa028a6f 100644
--- a/plugin/src/main/resources/META-INF/typescript.xml
+++ b/plugin/src/main/resources/META-INF/typescript.xml
@@ -14,8 +14,8 @@
   - limitations under the License.
   -->
 
-<idea-plugin>
+<consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
 		<fileTypeFactory implementation="consulo.typescript.TypeScriptFileTypeFactory" />
 	</extensions>
-</idea-plugin>
\ No newline at end of file
+</consulo-plugin>
\ No newline at end of file
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index cccd38e0..2f20409b 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -10,7 +10,7 @@
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkTable;
 import com.intellij.openapi.projectRoots.SdkType;
-import consulo.annotations.RequiredReadAction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.client.module.sdk.ClientJavaScriptSdkType;
 import consulo.javascript.lang.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index 8e30e36e..a5435c31 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -1,15 +1,15 @@
 package consulo.javascript.client.module.extension;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.swing.JComponent;
-
 import com.intellij.openapi.projectRoots.Sdk;
-import consulo.ui.RequiredUIAccess;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.MutableModuleInheritableNamedPointer;
 import consulo.roots.ModuleRootLayer;
+import consulo.ui.annotation.RequiredUIAccess;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.swing.*;
 
 /**
  * @author VISTALL

From ab1c870a648872be977d6d359a00666b7cfa8ad8 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 30 Nov 2019 19:18:10 +0300
Subject: [PATCH 059/340] compilation

---
 .../javascript/lang/EcmaScript4JavaScriptVersion.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
index 11c43581..02b83e3f 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
@@ -1,14 +1,14 @@
 package consulo.javascript.lang;
 
-import javax.annotation.Nonnull;
-
-import consulo.javascript.lang.parsing.EcmaScript4Parser;
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
 import com.intellij.lang.javascript.highlighting.JSHighlighter;
 import com.intellij.lexer.Lexer;
-import consulo.annotations.DeprecationInfo;
+import consulo.annotation.DeprecationInfo;
+import consulo.javascript.lang.parsing.EcmaScript4Parser;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL

From 33ac4c7b529ad6a2c4459a3de0e2c36fe1ad9881 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 5 Dec 2019 16:27:29 +0300
Subject: [PATCH 060/340] compilation

---
 .../javascript/flex/XmlBackedJSClassImpl.java | 52 ++++---------------
 .../lang/javascript/psi/impl/JSClassBase.java | 37 ++++---------
 .../psi/impl/JSStubElementImpl.java           |  8 +--
 .../psi/resolve/BaseJSSymbolProcessor.java    | 24 ++++-----
 .../psi/resolve/JSImportHandlingUtil.java     |  2 +-
 .../javascript/psi/resolve/JSResolveUtil.java | 42 ++++-----------
 .../psi/resolve/ResolveProcessor.java         | 21 ++++----
 .../validation/JSUnusedImportsHelper.java     | 21 +++-----
 .../lang/parsing/ExpressionParsing.java       |  6 +--
 .../javascript/run/debug/V8ScriptUtil.java    | 10 ++--
 .../java/consulo/json/jom/JomManager.java     | 12 ++---
 ...ByAnotherPsiElementEditorNotification.java |  2 +-
 .../JavaScriptGroupRuleProviderBase.java      |  8 +--
 .../JavaScriptLineMarkerProvider.java         | 32 ++++--------
 .../JSUnusedLocalSymbolsInspection.java       | 21 ++++----
 15 files changed, 100 insertions(+), 198 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index 31868e35..a8efc655 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -16,64 +16,34 @@
 
 package com.intellij.lang.javascript.flex;
 
-import gnu.trove.THashMap;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-
-import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSLanguageInjector;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.lang.javascript.psi.JSVarStatement;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.impl.JSClassBase;
 import com.intellij.lang.javascript.psi.impl.JSPsiImplUtils;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataCache;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.XmlRecursiveElementVisitor;
+import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.search.PsiElementProcessor;
-import com.intellij.psi.util.CachedValue;
-import com.intellij.psi.util.CachedValueProvider;
-import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.ParameterizedCachedValue;
-import com.intellij.psi.util.ParameterizedCachedValueProvider;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttribute;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlDocument;
-import com.intellij.psi.xml.XmlElement;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlText;
+import com.intellij.psi.util.*;
+import com.intellij.psi.xml.*;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.xml.XmlElementDescriptor;
+import consulo.util.dataholder.Key;
+import gnu.trove.THashMap;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.*;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index a6e601c5..271f7bcb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -16,35 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSIncludeDirective;
-import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.lang.javascript.psi.JSStubElementType;
-import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.lang.javascript.psi.JSVariable;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataCache;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
@@ -53,13 +31,16 @@
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.CachedValueProvider;
-import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.ParameterizedCachedValue;
-import com.intellij.psi.util.ParameterizedCachedValueProvider;
-import com.intellij.psi.util.PsiModificationTracker;
+import com.intellij.psi.util.*;
 import com.intellij.util.ArrayFactory;
 import com.intellij.util.ArrayUtil;
+import consulo.util.dataholder.Key;
+import gnu.trove.THashMap;
+import gnu.trove.THashSet;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.*;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
index 7d04ab4f..5389b81f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
@@ -16,9 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.extapi.psi.StubBasedPsiElementBase;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.index.JSItemPresentation;
@@ -27,13 +24,16 @@
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.IncorrectOperationException;
+import consulo.util.dataholder.Key;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * User: max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index 6ea0fb1d..a8f3f5e7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -16,15 +16,6 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import gnu.trove.THashSet;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.injection.InjectedLanguageManager;
@@ -32,15 +23,10 @@
 import com.intellij.lang.javascript.index.JSSymbolUtil;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.ResolveState;
+import com.intellij.psi.*;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -51,6 +37,14 @@
 import consulo.javascript.lang.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.JavaScriptVersionUtil;
+import consulo.util.dataholder.Key;
+import gnu.trove.THashSet;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index 5a106b92..04475ea0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -24,7 +24,6 @@
 import com.intellij.lang.javascript.psi.impl.JSClassBase;
 import com.intellij.lang.javascript.psi.impl.JSStubElementImpl;
 import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.UserDataCache;
 import com.intellij.psi.PsiElement;
@@ -40,6 +39,7 @@
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.Processor;
 import com.intellij.xml.XmlElementDescriptor;
+import consulo.util.dataholder.Key;
 import gnu.trove.THashMap;
 import gnu.trove.THashSet;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index ac2e1ea2..97a0d697 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -16,21 +16,6 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import gnu.trove.THashSet;
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TIntObjectIterator;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.ide.highlighter.XmlFileType;
 import com.intellij.injected.editor.VirtualFileWindow;
 import com.intellij.javascript.documentation.JSDocumentationProvider;
@@ -58,7 +43,6 @@
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.UserDataCache;
 import com.intellij.openapi.util.text.StringUtil;
@@ -76,21 +60,8 @@
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.CachedValue;
-import com.intellij.psi.util.CachedValueProvider;
-import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.ParameterizedCachedValue;
-import com.intellij.psi.util.ParameterizedCachedValueProvider;
-import com.intellij.psi.util.PsiModificationTracker;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtilBase;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlDocument;
-import com.intellij.psi.xml.XmlElement;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlTagChild;
-import com.intellij.psi.xml.XmlText;
+import com.intellij.psi.util.*;
+import com.intellij.psi.xml.*;
 import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
@@ -106,6 +77,15 @@
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.roots.types.BinariesOrderRootType;
+import consulo.util.dataholder.Key;
+import gnu.trove.THashSet;
+import gnu.trove.TIntObjectHashMap;
+import gnu.trove.TIntObjectIterator;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.*;
 
 /**
  * @author max, maxim.mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 71d2bf18..5926d60e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -16,15 +16,6 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import gnu.trove.THashSet;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -33,8 +24,6 @@
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
 import com.intellij.lang.javascript.psi.util.JSLookupUtil;
 import com.intellij.lang.javascript.validation.JSUnusedImportsHelper;
-import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.ResolveResult;
@@ -44,6 +33,16 @@
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.SmartList;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.util.dataholder.Key;
+import consulo.util.dataholder.UserDataHolderBase;
+import gnu.trove.THashSet;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index 42eac636..a60ae07e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -16,36 +16,27 @@
 
 package com.intellij.lang.javascript.validation;
 
-import gnu.trove.THashSet;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.search.PsiElementProcessor;
-import com.intellij.psi.util.CachedValue;
-import com.intellij.psi.util.CachedValueProvider;
-import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.PsiModificationTracker;
-import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.*;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
+import consulo.util.dataholder.Key;
+import gnu.trove.THashSet;
+
+import javax.annotation.Nullable;
+import java.util.*;
 
 public class JSUnusedImportsHelper
 {
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 2d5ae52f..eca788a5 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -16,17 +16,17 @@
 
 package consulo.javascript.lang.parsing;
 
-import javax.annotation.Nullable;
-
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.Key;
 import com.intellij.psi.tree.IElementType;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.util.dataholder.Key;
+
+import javax.annotation.Nullable;
 
 
 /**
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
index 8808c649..d1bde44e 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
@@ -16,16 +16,16 @@
 
 package consulo.javascript.run.debug;
 
-import java.io.File;
-
-import org.chromium.sdk.Script;
-import javax.annotation.Nonnull;
 import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.LightVirtualFile;
+import consulo.util.dataholder.Key;
+import org.chromium.sdk.Script;
+
+import javax.annotation.Nonnull;
+import java.io.File;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index c04006eb..322a2609 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -16,16 +16,10 @@
 
 package consulo.json.jom;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.CachedValue;
 import com.intellij.psi.util.CachedValueProvider;
@@ -33,6 +27,12 @@
 import com.intellij.psi.util.PsiModificationTracker;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.JsonFileType;
+import consulo.util.dataholder.Key;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index 7d91fbda..f64e3b2e 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -19,7 +19,6 @@
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -35,6 +34,7 @@
 import consulo.json.jom.JomFileElement;
 import consulo.json.jom.JomManager;
 import consulo.ui.annotation.RequiredUIAccess;
+import consulo.util.dataholder.Key;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
index 3c47b1f4..83d92c54 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -16,9 +16,6 @@
 
 package com.intellij.lang.javascript.findUsages;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.actionSystem.DataSink;
@@ -26,7 +23,6 @@
 import com.intellij.openapi.actionSystem.TypeSafeDataProvider;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vcs.FileStatus;
 import com.intellij.openapi.vcs.FileStatusManager;
 import com.intellij.psi.PsiElement;
@@ -43,6 +39,10 @@
 import com.intellij.usages.rules.UsageGroupingRule;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.ui.image.Image;
+import consulo.util.dataholder.Key;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
index 74e55a16..b0b397f0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
@@ -16,22 +16,6 @@
 
 package com.intellij.lang.javascript.highlighting;
 
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
-
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.codeHighlighting.Pass;
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
@@ -40,11 +24,7 @@
 import com.intellij.codeInsight.navigation.NavigationUtil;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.DefaultPsiElementCellRenderer;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSFunctionExpression;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.search.JSClassSearch;
@@ -52,7 +32,6 @@
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.progress.ProgressManager;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiElement;
@@ -61,6 +40,15 @@
 import com.intellij.util.Function;
 import com.intellij.util.Processor;
 import com.intellij.util.Query;
+import consulo.util.dataholder.Key;
+import gnu.trove.THashMap;
+import gnu.trove.THashSet;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.awt.event.MouseEvent;
+import java.util.*;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
index 4808f00a..b4918956 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
@@ -16,16 +16,6 @@
 
 package com.intellij.lang.javascript.inspections;
 
-import gnu.trove.THashSet;
-import gnu.trove.TObjectIntHashMap;
-
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.Set;
-
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import org.jetbrains.annotations.PropertyKey;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
@@ -41,13 +31,22 @@
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
+import consulo.util.dataholder.Key;
+import gnu.trove.THashSet;
+import gnu.trove.TObjectIntHashMap;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.PropertyKey;
+
+import javax.annotation.Nonnull;
+import java.util.BitSet;
+import java.util.Collections;
+import java.util.Set;
 
 /**
  * @author Maxim.Mossienko

From b2542bc06bd931271d8790e2c14760977bdc31ec Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 12:10:26 +0300
Subject: [PATCH 061/340] corrected resolving element lang version, since
 completion element can return null virtual file

---
 .../lang/javascript/JavaScriptFileType.java   | 21 ++++++++-----------
 .../lang/JavaScriptFileTypeWithVersion.java   | 11 ++++++----
 .../actionscript/ActionScriptFileType.java    | 12 ++++++-----
 lang-version-impl/ecmascript6-impl/pom.xml    | 19 +++++++++++++++++
 .../lang/EcmaScript6JavaScriptVersion.java    | 18 ++++++----------
 .../javascript/lang/EcmaScriptFileType.java   | 12 ++++++-----
 .../main/java/consulo/json/JsonFileType.java  | 12 ++++++-----
 .../JavaScriptLanguageVersionResolver.java    | 14 ++++++++-----
 8 files changed, 71 insertions(+), 48 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
index 3a322752..baa5b090 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -16,14 +16,11 @@
 
 package com.intellij.lang.javascript;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.StandardJavaScriptVersions;
@@ -31,6 +28,9 @@
 import consulo.lang.LanguageVersion;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * User: max
  * Date: Jan 27, 2005
@@ -72,20 +72,17 @@ public Image getIcon()
 		return JavaScriptIcons.JavaScript;
 	}
 
+	@RequiredReadAction
 	@Nonnull
 	@Override
-	public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
+	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
 	{
-		if(virtualFile == null || project == null)
+		if(module == null)
 		{
 			return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 		}
-		Module moduleForFile = ModuleUtilCore.findModuleForFile(virtualFile, project);
-		if(moduleForFile == null)
-		{
-			return StandardJavaScriptVersions.getInstance().getDefaultVersion();
-		}
-		JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(moduleForFile, JavaScriptModuleExtension.class);
+
+		JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
 		if(extension != null)
 		{
 			return extension.getLanguageVersion();
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
index 9382f919..7c179932 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
@@ -16,11 +16,13 @@
 
 package consulo.javascript.lang;
 
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.vfs.VirtualFile;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.lang.LanguageVersion;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.lang.LanguageVersion;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
 
 /**
  * @author VISTALL
@@ -29,5 +31,6 @@
 public interface JavaScriptFileTypeWithVersion
 {
 	@Nonnull
-	LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile);
+	@RequiredReadAction
+	LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile);
 }
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
index eae0b299..b6377b5d 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
@@ -16,19 +16,20 @@
 
 package consulo.actionscript;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.project.Project;
+import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
 import consulo.actionscript.lang.ActionScriptLanguageVersion;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 02.12.13.
@@ -70,9 +71,10 @@ public Image getIcon()
 		return JavaScriptIcons.As;
 	}
 
+	@RequiredReadAction
 	@Nonnull
 	@Override
-	public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
+	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
 	{
 		return ActionScriptLanguageVersion.getInstance();
 	}
diff --git a/lang-version-impl/ecmascript6-impl/pom.xml b/lang-version-impl/ecmascript6-impl/pom.xml
index 883983a3..203b73cd 100644
--- a/lang-version-impl/ecmascript6-impl/pom.xml
+++ b/lang-version-impl/ecmascript6-impl/pom.xml
@@ -40,6 +40,25 @@
 		</repository>
 	</repositories>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>consulo.maven</groupId>
+				<artifactId>consulo-maven-plugin</artifactId>
+				<version>2-SNAPSHOT</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-lexers</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 8ad9902d..12f18bce 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -16,30 +16,24 @@
 
 package consulo.javascript.lang;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.PsiParser;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import consulo.javascript.lang.lexer.EcmaScript6Lexer;
+import consulo.javascript.lang.lexer.JavaScriptFlexAdapter;
+import consulo.javascript.lang.lexer._EcmaScript6Lexer;
 import consulo.javascript.lang.parsing.EcmaScript6Parser;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 12.12.2015
  */
 public class EcmaScript6JavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
-	private static final Factory<Lexer> ourLexerFactory = new Factory<Lexer>()
-	{
-		@Override
-		public Lexer create()
-		{
-			return new EcmaScript6Lexer();
-		}
-	};
+	private static final Factory<Lexer> ourLexerFactory = () -> new JavaScriptFlexAdapter(new _EcmaScript6Lexer(false));
 
 	@Nonnull
 	public static EcmaScript6JavaScriptVersion getInstance()
@@ -76,7 +70,7 @@ public Lexer createLexer()
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter()
 	{
-		return new JavaScriptHighlighter(ourLexerFactory);
+		return new JavaScriptHighlighter(() -> new JavaScriptFlexAdapter(new _EcmaScript6Lexer(true)));
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
index 7d13e596..86fea1cc 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
@@ -16,16 +16,17 @@
 
 package consulo.javascript.lang;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.project.Project;
+import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.lang.LanguageVersion;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 23.12.13.
@@ -67,9 +68,10 @@ public Image getIcon()
 		return JavaScriptIcons.EcmaScript;
 	}
 
+	@RequiredReadAction
 	@Nonnull
 	@Override
-	public LanguageVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
+	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
 	{
 		return EcmaScript6JavaScriptVersion.getInstance();
 	}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
index b5e38622..ef6bd619 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
@@ -16,18 +16,19 @@
 
 package consulo.json;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.project.Project;
+import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.json.lang.JsonJavaScriptVersion;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 02.12.13.
@@ -69,9 +70,10 @@ public Image getIcon()
 		return JavaScriptIcons.Json;
 	}
 
+	@RequiredReadAction
 	@Nonnull
 	@Override
-	public JsonJavaScriptVersion getLanguageVersion(@Nullable Project project, @Nullable VirtualFile virtualFile)
+	public JsonJavaScriptVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
 	{
 		return JsonJavaScriptVersion.getInstance();
 	}
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index ca277023..4b85dd2c 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -16,11 +16,10 @@
 
 package consulo.javascript.lang;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -29,6 +28,9 @@
 import consulo.lang.LanguageVersion;
 import consulo.lang.LanguageVersionResolver;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 11.12.2015
@@ -48,7 +50,8 @@ public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable
 		FileType fileType = containingFile.getFileType();
 		if(fileType instanceof JavaScriptFileTypeWithVersion)
 		{
-			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(element.getProject(), element.getContainingFile().getVirtualFile());
+			Module module = ModuleUtilCore.findModuleForPsiElement(element);
+			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(module, element.getContainingFile().getVirtualFile());
 		}
 
 		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
@@ -67,7 +70,8 @@ public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable
 		FileType fileType = virtualFile.getFileType();
 		if(fileType instanceof JavaScriptFileTypeWithVersion)
 		{
-			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(project, virtualFile);
+			Module module = ModuleUtilCore.findModuleForFile(virtualFile, project);
+			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(module, virtualFile);
 		}
 
 		return StandardJavaScriptVersions.getInstance().getDefaultVersion();

From 9de2e489c751aaeb5d440ff8e14e1d7ccd506824 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 12:27:05 +0300
Subject: [PATCH 062/340] jsx. return old js lexer which have almost correct
 jsx lexing.

add es 6 stub parsing initial
---
 base-impl/pom.xml                             |   19 +
 .../intellij/lang/javascript/JSDoc.flex.idea  |    0
 .../lang/javascript/JSTokenTypes.java         |   27 +-
 .../lang/javascript/JavaScript.flex.idea      |    0
 .../intellij/lang/javascript/_JSDocLexer.java |  713 -----
 .../lang/javascript/_JavaScriptLexer.java     | 2601 -----------------
 .../JavaScriptHighlightingLexer.java          |    6 +-
 .../lang/JavaScript15LanguageVersion.java     |    4 +-
 .../JavaScriptContextKeywordElementType.java  |   37 +
 .../lang/lexer/JavaScript15Lexer.java         | 1193 --------
 .../lang/lexer/JavaScriptFlexAdapter.java     |   52 +
 .../lang/lexer/JavaScriptFlexLexer.java       |   14 +
 .../lang/parsing/ContextKeywordCache.java     |   30 -
 .../javascript/lang/parsing/Parsing.java      |   38 +-
 .../lang/lexer/EcmaScript6Lexer.java          | 1370 ---------
 .../javascript/lang/lexer/ecmascript6.flex    |  234 +-
 .../lang/lexer/ecmascript6.flex.idea          |    0
 .../parsing/EcmaScript6StatementParsing.java  |  123 +-
 .../JavaScriptHighlightVisitor.java           |    8 +-
 .../JavaScriptRegexpMultiHostInjector.java    |   15 +-
 20 files changed, 492 insertions(+), 5992 deletions(-)
 create mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex.idea
 create mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex.idea
 delete mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java
 delete mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
 delete mode 100644 base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java
 delete mode 100644 base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
 delete mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea

diff --git a/base-impl/pom.xml b/base-impl/pom.xml
index 02ac1661..6b4a7768 100644
--- a/base-impl/pom.xml
+++ b/base-impl/pom.xml
@@ -29,6 +29,25 @@
 	<version>2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>consulo.maven</groupId>
+				<artifactId>consulo-maven-plugin</artifactId>
+				<version>2-SNAPSHOT</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-lexers</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<repositories>
 		<repository>
 			<id>consulo</id>
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex.idea b/base-impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex.idea
new file mode 100644
index 00000000..e69de29b
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 8322da71..31fd4931 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -16,14 +16,7 @@
 
 package com.intellij.lang.javascript;
 
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.Language;
-import com.intellij.lang.LanguageParserDefinitions;
-import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.PsiBuilderFactory;
+import com.intellij.lang.*;
 import com.intellij.lang.javascript.highlighting.JavaScriptHighlightingLexer;
 import com.intellij.lang.javascript.parsing.JSDocParsing;
 import com.intellij.lexer.FlexAdapter;
@@ -36,11 +29,16 @@
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.TokenSet;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptContextKeywordElementType;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.parsing.JavaScriptParser;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 import consulo.javascript.lang.parsing.Parsing;
 import consulo.lang.LanguageVersion;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author max, maxim.mossienko
@@ -49,6 +47,8 @@ public interface JSTokenTypes
 {
 	IElementType IDENTIFIER = new JSElementType("IDENTIFIER");
 	IElementType ANY_IDENTIFIER = new JSElementType("ANY_IDENTIFIER");
+	IElementType ASTERISK = ANY_IDENTIFIER;
+
 	IElementType WHITE_SPACE = TokenType.WHITE_SPACE;
 	IElementType BAD_CHARACTER = TokenType.BAD_CHARACTER;
 
@@ -106,8 +106,9 @@ protected Lexer createLexer()
 	IElementType IMPORT_KEYWORD = new JSElementType("IMPORT_KEYWORD"); // import
 	IElementType CLASS_KEYWORD = new JSElementType("CLASS_KEYWORD"); // class
 	IElementType INTERFACE_KEYWORD = new JSElementType("INTERFACE_KEYWORD"); // interface
+	IElementType FROM_KEYWORD = new JavaScriptContextKeywordElementType("FROM_KEYWORD", "from");
 	IElementType PUBLIC_KEYWORD = new JSElementType("PUBLIC_KEYWORD"); // public
-	IElementType STATIC_KEYWORD = new JSElementType("STATIC_KEYWORD"); // static
+	IElementType STATIC_KEYWORD = new JavaScriptContextKeywordElementType("STATIC_KEYWORD", "static"); // static
 	IElementType INTERNAL_KEYWORD = new JSElementType("INTERNAL_KEYWORD"); // internal
 	IElementType FINAL_KEYWORD = new JSElementType("FINAL_KEYWORD"); // final
 	IElementType DYNAMIC_KEYWORD = new JSElementType("DYNAMIC_KEYWORD"); // dynamic
@@ -128,8 +129,8 @@ protected Lexer createLexer()
 	IElementType INCLUDE_KEYWORD = new JSElementType("INCLUDE_KEYWORD"); // include
 	IElementType IS_KEYWORD = new JSElementType("IS_KEYWORD"); // is
 	IElementType AS_KEYWORD = new JSElementType("AS_KEYWORD"); // as
-	IElementType GET_KEYWORD = new JSElementType("GET_KEYWORD"); // GET
-	IElementType SET_KEYWORD = new JSElementType("SET_KEYWORD"); // SET
+	IElementType GET_KEYWORD = new JavaScriptContextKeywordElementType("GET_KEYWORD", "get"); // GET
+	IElementType SET_KEYWORD = new JavaScriptContextKeywordElementType("SET_KEYWORD", "set"); // SET
 	IElementType EACH_KEYWORD = new JSElementType("EACH_KEYWORD");
 	IElementType INT_KEYWORD = new JSElementType("INT_KEYWORD");
 	IElementType UINT_KEYWORD = new JSElementType("UINT_KEYWORD");
@@ -196,14 +197,12 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 			CLASS_KEYWORD, EXTENDS_KEYWORD, IMPORT_KEYWORD, USE_KEYWORD, NAMESPACE_KEYWORD, OVERRIDE_KEYWORD, INCLUDE_KEYWORD,
 			SUPER_KEYWORD, IS_KEYWORD, AS_KEYWORD, GET_KEYWORD, SET_KEYWORD, EACH_KEYWORD, INT_KEYWORD, UINT_KEYWORD);
 
-	TokenSet ECMASCRIPT6_KEYWORDS = TokenSet.create(EXPORT_KEYWORD, ENUM_KEYWORD);
+	TokenSet ECMASCRIPT6_KEYWORDS = TokenSet.create(EXPORT_KEYWORD, ENUM_KEYWORD, FROM_KEYWORD);
 
 	TokenSet ECMASCRIPT6_STRICT_KEYWORDS = TokenSet.create(PUBLIC_KEYWORD, PRIVATE_KEYWORD, PROTECTED_KEYWORD, PACKAGE_KEYWORD, IMPLEMENTS_KEYWORD, INTERFACE_KEYWORD, STATIC_KEYWORD);
 
 	TokenSet KEYWORDS = TokenSet.orSet(JS_KEYWORDS, JS2_KEYWORDS, ECMASCRIPT6_KEYWORDS);
 
-	TokenSet CONTEXT_KEYWORDS = TokenSet.orSet(ECMASCRIPT6_STRICT_KEYWORDS, TokenSet.create(GET_KEYWORD, SET_KEYWORD));
-
 	// Literals
 	IElementType NUMERIC_LITERAL = new JSElementType("NUMERIC_LITERAL");
 	IElementType STRING_LITERAL = new JSElementType("STRING_LITERAL");
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex.idea b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex.idea
new file mode 100644
index 00000000..e69de29b
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java
deleted file mode 100644
index eeeaa417..00000000
--- a/base-impl/src/main/java/com/intellij/lang/javascript/_JSDocLexer.java
+++ /dev/null
@@ -1,713 +0,0 @@
-/*
- * Copyright 2000-2005 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.
- */
-
-/* The following code was generated by JFlex 1.4.1 on 8/5/08 7:33 PM */
-
-package com.intellij.lang.javascript;
-
-import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.tree.IElementType;
-
-
-/**
- * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.4.1
- * on 8/5/08 7:33 PM from the specification file
- * <tt>C:/Trunk/tools/lexer/../../plugins/JavaScriptLanguage/src/com/intellij/lang/javascript/JSDoc.flex</tt>
- */
-public class _JSDocLexer implements FlexLexer
-{
-	/**
-	 * initial size of the lookahead buffer
-	 */
-	private static final int ZZ_BUFFERSIZE = 16384;
-
-	/**
-	 * lexical states
-	 */
-	public static final int FOUND_ASTERISK = 2;
-	public static final int YYINITIAL = 0;
-	public static final int COMMENT_DATA_START = 1;
-
-	/**
-	 * Translates characters to character classes
-	 */
-	private static final String ZZ_CMAP_PACKED = "\11\0\1\2\1\1\1\0\1\2\1\1\22\0\1\2\3\0\1\4" +
-			"\5\0\1\6\2\0\2\3\1\5\12\3\1\3\5\0\1\7\32\4" +
-			"\4\0\1\4\1\0\32\4\47\0\4\4\4\0\1\4\12\0\1\4" +
-			"\4\0\1\4\5\0\27\4\1\0\37\4\1\0\u013f\4\31\0\162\4" +
-			"\4\0\14\4\16\0\5\4\11\0\1\4\213\0\1\4\13\0\1\4" +
-			"\1\0\3\4\1\0\1\4\1\0\24\4\1\0\54\4\1\0\46\4" +
-			"\1\0\5\4\4\0\202\4\10\0\105\4\1\0\46\4\2\0\2\4" +
-			"\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4\110\0\33\4" +
-			"\5\0\3\4\56\0\32\4\5\0\13\4\43\0\2\4\1\0\143\4" +
-			"\1\0\1\4\17\0\2\4\7\0\2\4\12\0\3\4\2\0\1\4" +
-			"\20\0\1\4\1\0\36\4\35\0\3\4\60\0\46\4\13\0\1\4" +
-			"\u0152\0\66\4\3\0\1\4\22\0\1\4\7\0\12\4\43\0\10\4" +
-			"\2\0\2\4\2\0\26\4\1\0\7\4\1\0\1\4\3\0\4\4" +
-			"\3\0\1\4\36\0\2\4\1\0\3\4\16\0\4\4\21\0\6\4" +
-			"\4\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\2\4" +
-			"\1\0\2\4\37\0\4\4\1\0\1\4\23\0\3\4\20\0\11\4" +
-			"\1\0\3\4\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4" +
-			"\3\0\1\4\22\0\1\4\17\0\2\4\17\0\1\4\23\0\10\4" +
-			"\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4" +
-			"\3\0\1\4\36\0\2\4\1\0\3\4\17\0\1\4\21\0\1\4" +
-			"\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4" +
-			"\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4\1\0\3\4" +
-			"\77\0\1\4\13\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4" +
-			"\1\0\5\4\46\0\2\4\43\0\10\4\1\0\3\4\1\0\27\4" +
-			"\1\0\12\4\1\0\5\4\3\0\1\4\40\0\1\4\1\0\2\4" +
-			"\43\0\10\4\1\0\3\4\1\0\27\4\1\0\20\4\46\0\2\4" +
-			"\43\0\22\4\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4" +
-			"\72\0\60\4\1\0\2\4\13\0\10\4\72\0\2\4\1\0\1\4" +
-			"\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4\1\0\7\4" +
-			"\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4\1\0\4\4" +
-			"\1\0\2\4\11\0\1\4\2\0\5\4\1\0\1\4\25\0\2\4" +
-			"\42\0\1\4\77\0\10\4\1\0\42\4\35\0\4\4\164\0\42\4" +
-			"\1\0\5\4\1\0\2\4\45\0\6\4\112\0\46\4\12\0\51\4" +
-			"\7\0\132\4\5\0\104\4\5\0\122\4\6\0\7\4\1\0\77\4" +
-			"\1\0\1\4\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4" +
-			"\2\0\47\4\1\0\1\4\1\0\4\4\2\0\37\4\1\0\1\4" +
-			"\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0\7\4" +
-			"\1\0\7\4\1\0\27\4\1\0\37\4\1\0\1\4\1\0\4\4" +
-			"\2\0\7\4\1\0\47\4\1\0\23\4\105\0\125\4\14\0\u026c\4" +
-			"\2\0\10\4\12\0\32\4\5\0\113\4\3\0\3\4\17\0\15\4" +
-			"\1\0\4\4\16\0\22\4\16\0\22\4\16\0\15\4\1\0\3\4" +
-			"\17\0\64\4\43\0\1\4\3\0\2\4\103\0\130\4\10\0\51\4" +
-			"\127\0\35\4\63\0\36\4\2\0\5\4\u038b\0\154\4\224\0\234\4" +
-			"\4\0\132\4\6\0\26\4\2\0\6\4\2\0\46\4\2\0\6\4" +
-			"\2\0\10\4\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4" +
-			"\2\0\65\4\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4" +
-			"\3\0\4\4\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4" +
-			"\102\0\2\4\23\0\1\4\34\0\1\4\15\0\1\4\40\0\22\4" +
-			"\120\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4" +
-			"\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4\1\0\3\4" +
-			"\1\0\7\4\3\0\3\4\5\0\5\4\26\0\44\4\u0e81\0\3\4" +
-			"\31\0\11\4\7\0\5\4\2\0\5\4\4\0\126\4\6\0\3\4" +
-			"\1\0\137\4\5\0\50\4\4\0\136\4\21\0\30\4\70\0\20\4" +
-			"\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0\u2ba4\4\u215c\0\u012e\4" +
-			"\2\0\73\4\225\0\7\4\14\0\5\4\5\0\1\4\1\0\12\4" +
-			"\1\0\15\4\1\0\5\4\1\0\1\4\1\0\2\4\1\0\2\4" +
-			"\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0\66\4\50\0\15\4" +
-			"\66\0\2\4\30\0\3\4\31\0\1\4\6\0\5\4\1\0\207\4" +
-			"\7\0\1\4\34\0\32\4\4\0\1\4\1\0\32\4\12\0\132\4" +
-			"\3\0\6\4\2\0\6\4\2\0\6\4\2\0\3\4\3\0\2\4" +
-			"\3\0\2\4\31\0";
-
-	/**
-	 * Translates characters to character classes
-	 */
-	private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-	/**
-	 * Translates DFA states to action switch labels.
-	 */
-	private static final int[] ZZ_ACTION = zzUnpackAction();
-
-	private static final String ZZ_ACTION_PACKED_0 = "\3\0\3\1\1\2\2\3\2\2\1\4\1\0\1\5" + "\1\0\1\3\1\6\1\5\1\7\1\10";
-
-	private static int[] zzUnpackAction()
-	{
-		int[] result = new int[20];
-		int offset = 0;
-		offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackAction(String packed, int offset, int[] result)
-	{
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while(i < l)
-		{
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			do
-			{
-				result[j++] = value;
-			}
-			while(--count > 0);
-		}
-		return j;
-	}
-
-
-	/**
-	 * Translates a state to a row index in the transition table
-	 */
-	private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
-
-	private static final String ZZ_ROWMAP_PACKED_0 = "\0\0\0\10\0\20\0\30\0\40\0\50\0\60\0\70" +
-			"\0\100\0\110\0\120\0\50\0\130\0\30\0\50\0\140" +
-			"\0\30\0\60\0\150\0\160";
-
-	private static int[] zzUnpackRowMap()
-	{
-		int[] result = new int[20];
-		int offset = 0;
-		offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackRowMap(String packed, int offset, int[] result)
-	{
-		int i = 0;  /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while(i < l)
-		{
-			int high = packed.charAt(i++) << 16;
-			result[j++] = high | packed.charAt(i++);
-		}
-		return j;
-	}
-
-	/**
-	 * The transition table of the DFA
-	 */
-	private static final int[] ZZ_TRANS = zzUnpackTrans();
-
-	private static final String ZZ_TRANS_PACKED_0 = "\5\4\1\5\1\6\1\4\1\7\1\10\1\11\3\7" +
-			"\1\12\1\13\1\4\2\11\3\4\1\14\1\4\16\0" +
-			"\1\15\6\0\1\16\1\17\1\0\1\7\2\0\5\7" +
-			"\1\0\1\10\1\20\3\0\1\21\2\0\2\11\5\0" +
-			"\1\7\2\0\2\7\1\22\3\7\2\0\1\7\1\23" +
-			"\3\7\6\0\1\24\2\0\1\11\1\20\3\0\1\21" +
-			"\1\0\1\7\2\0\2\23\3\7\5\0\1\16\2\0";
-
-	private static int[] zzUnpackTrans()
-	{
-		int[] result = new int[120];
-		int offset = 0;
-		offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackTrans(String packed, int offset, int[] result)
-	{
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while(i < l)
-		{
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			value--;
-			do
-			{
-				result[j++] = value;
-			}
-			while(--count > 0);
-		}
-		return j;
-	}
-
-
-	/* error codes */
-	private static final int ZZ_UNKNOWN_ERROR = 0;
-	private static final int ZZ_NO_MATCH = 1;
-	private static final int ZZ_PUSHBACK_2BIG = 2;
-	private static final char[] EMPTY_BUFFER = new char[0];
-	private static final int YYEOF = -1;
-	private static java.io.Reader zzReader = null; // Fake
-
-	/* error messages for the codes above */
-	private static final String ZZ_ERROR_MSG[] = {
-			"Unkown internal scanner error",
-			"Error: could not match input",
-			"Error: pushback value was too large"
-	};
-
-	/**
-	 * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-	 */
-	private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-	private static final String ZZ_ATTRIBUTE_PACKED_0 = "\3\0\1\11\10\1\1\0\1\11\1\0\1\1\1\11" + "\3\1";
-
-	private static int[] zzUnpackAttribute()
-	{
-		int[] result = new int[20];
-		int offset = 0;
-		offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackAttribute(String packed, int offset, int[] result)
-	{
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while(i < l)
-		{
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			do
-			{
-				result[j++] = value;
-			}
-			while(--count > 0);
-		}
-		return j;
-	}
-
-	/**
-	 * the current state of the DFA
-	 */
-	private int zzState;
-
-	/**
-	 * the current lexical state
-	 */
-	private int zzLexicalState = YYINITIAL;
-
-	/**
-	 * this buffer contains the current text to be matched and is
-	 * the source of the yytext() string
-	 */
-	private CharSequence zzBuffer = "";
-
-	/**
-	 * this buffer may contains the current text array to be matched when it is cheap to acquire it
-	 */
-	private char[] zzBufferArray;
-
-	/**
-	 * the textposition at the last accepting state
-	 */
-	private int zzMarkedPos;
-
-	/**
-	 * the textposition at the last state to be included in yytext
-	 */
-	private int zzPushbackPos;
-
-	/**
-	 * the current text position in the buffer
-	 */
-	private int zzCurrentPos;
-
-	/**
-	 * startRead marks the beginning of the yytext() string in the buffer
-	 */
-	private int zzStartRead;
-
-	/**
-	 * endRead marks the last character in the buffer, that has been read
-	 * from input
-	 */
-	private int zzEndRead;
-
-	/**
-	 * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-	 */
-	private boolean zzAtBOL = true;
-
-	/**
-	 * zzAtEOF == true <=> the scanner is at the EOF
-	 */
-	private boolean zzAtEOF;
-
-	/**
-	 * denotes if the user-EOF-code has already been executed
-	 */
-	private boolean zzEOFDone;
-
-	/* user code: */
-	private boolean highlightMode;
-
-	public _JSDocLexer(boolean _highlightMode)
-	{
-		this((java.io.Reader) null);
-		highlightMode = _highlightMode;
-	}
-
-
-	_JSDocLexer(java.io.Reader in)
-	{
-		this.zzReader = in;
-	}
-
-	/**
-	 * Creates a new scanner.
-	 * There is also java.io.Reader version of this constructor.
-	 *
-	 * @param in the java.io.Inputstream to read input from.
-	 */
-	_JSDocLexer(java.io.InputStream in)
-	{
-		this(new java.io.InputStreamReader(in));
-	}
-
-	/**
-	 * Unpacks the compressed character translation table.
-	 *
-	 * @param packed the packed character translation table
-	 * @return the unpacked character translation table
-	 */
-	private static char[] zzUnpackCMap(String packed)
-	{
-		char[] map = new char[0x10000];
-		int i = 0;  /* index in packed string  */
-		int j = 0;  /* index in unpacked array */
-		while(i < 1206)
-		{
-			int count = packed.charAt(i++);
-			char value = packed.charAt(i++);
-			do
-			{
-				map[j++] = value;
-			}
-			while(--count > 0);
-		}
-		return map;
-	}
-
-	@Override
-	public final int getTokenStart()
-	{
-		return zzStartRead;
-	}
-
-	@Override
-	public final int getTokenEnd()
-	{
-		return getTokenStart() + yylength();
-	}
-
-	@Override
-	public void reset(CharSequence buffer, int start, int end, int initialState)
-	{
-		zzBuffer = buffer;
-		zzBufferArray = com.intellij.util.text.CharArrayUtil.fromSequenceWithoutCopying(buffer);
-		zzCurrentPos = zzMarkedPos = zzStartRead = start;
-		zzPushbackPos = 0;
-		zzAtEOF = false;
-		zzAtBOL = true;
-		zzEndRead = end;
-		yybegin(initialState);
-	}
-
-	// For Demetra compatibility
-	public void reset(CharSequence buffer, int initialState)
-	{
-		zzBuffer = buffer;
-		zzBufferArray = null;
-		zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-		zzPushbackPos = 0;
-		zzAtEOF = false;
-		zzAtBOL = true;
-		zzEndRead = buffer.length();
-		yybegin(initialState);
-	}
-
-	/**
-	 * Refills the input buffer.
-	 *
-	 * @return <code>false</code>, iff there was new input.
-	 * @throws java.io.IOException if any I/O-Error occurs
-	 */
-	private boolean zzRefill() throws java.io.IOException
-	{
-		return true;
-	}
-
-
-	/**
-	 * Returns the current lexical state.
-	 */
-	@Override
-	public final int yystate()
-	{
-		return zzLexicalState;
-	}
-
-
-	/**
-	 * Enters a new lexical state
-	 *
-	 * @param newState the new lexical state
-	 */
-	@Override
-	public final void yybegin(int newState)
-	{
-		zzLexicalState = newState;
-	}
-
-
-	/**
-	 * Returns the text matched by the current regular expression.
-	 */
-	public final CharSequence yytext()
-	{
-		return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-	}
-
-
-	/**
-	 * Returns the character at position <tt>pos</tt> from the
-	 * matched text.
-	 * <p/>
-	 * It is equivalent to yytext().charAt(pos), but faster
-	 *
-	 * @param pos the position of the character to fetch.
-	 *            A value from 0 to yylength()-1.
-	 * @return the character at position pos
-	 */
-	public final char yycharat(int pos)
-	{
-		return zzBufferArray != null ? zzBufferArray[zzStartRead + pos] : zzBuffer.charAt(zzStartRead + pos);
-	}
-
-
-	/**
-	 * Returns the length of the matched text region.
-	 */
-	public final int yylength()
-	{
-		return zzMarkedPos - zzStartRead;
-	}
-
-
-	/**
-	 * Reports an error that occured while scanning.
-	 * <p/>
-	 * In a wellformed scanner (no or only correct usage of
-	 * yypushback(int) and a match-all fallback rule) this method
-	 * will only be called with things that "Can't Possibly Happen".
-	 * If this method is called, something is seriously wrong
-	 * (e.g. a JFlex bug producing a faulty scanner etc.).
-	 * <p/>
-	 * Usual syntax/scanner level error handling should be done
-	 * in error fallback rules.
-	 *
-	 * @param errorCode the code of the errormessage to display
-	 */
-	private void zzScanError(int errorCode)
-	{
-		String message;
-		try
-		{
-			message = ZZ_ERROR_MSG[errorCode];
-		}
-		catch(ArrayIndexOutOfBoundsException e)
-		{
-			message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-		}
-
-		throw new Error(message);
-	}
-
-
-	/**
-	 * Pushes the specified amount of characters back into the input stream.
-	 * <p/>
-	 * They will be read again by then next call of the scanning method
-	 *
-	 * @param number the number of characters to be read again.
-	 *               This number must not be greater than yylength()!
-	 */
-	public void yypushback(int number)
-	{
-		if(number > yylength())
-		{
-			zzScanError(ZZ_PUSHBACK_2BIG);
-		}
-
-		zzMarkedPos -= number;
-	}
-
-
-	/**
-	 * Contains user EOF-code, which will be executed exactly once,
-	 * when the end of file is reached
-	 */
-	private void zzDoEOF()
-	{
-		if(!zzEOFDone)
-		{
-			zzEOFDone = true;
-
-		}
-	}
-
-
-	/**
-	 * Resumes scanning until the next regular expression is matched,
-	 * the end of input is encountered or an I/O-Error occurs.
-	 *
-	 * @return the next token
-	 * @throws java.io.IOException if any I/O-Error occurs
-	 */
-	@Override
-	public IElementType advance() throws java.io.IOException
-	{
-		int zzInput;
-		int zzAction;
-
-		// cached fields:
-		int zzCurrentPosL;
-		int zzMarkedPosL;
-		int zzEndReadL = zzEndRead;
-		CharSequence zzBufferL = zzBuffer;
-		char[] zzBufferArrayL = zzBufferArray;
-		char[] zzCMapL = ZZ_CMAP;
-
-		int[] zzTransL = ZZ_TRANS;
-		int[] zzRowMapL = ZZ_ROWMAP;
-		int[] zzAttrL = ZZ_ATTRIBUTE;
-
-		while(true)
-		{
-			zzMarkedPosL = zzMarkedPos;
-
-			zzAction = -1;
-
-			zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-
-			zzState = zzLexicalState;
-
-
-			zzForAction:
-			{
-				while(true)
-				{
-
-					if(zzCurrentPosL < zzEndReadL)
-					{
-						zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++);
-					}
-					else if(zzAtEOF)
-					{
-						zzInput = YYEOF;
-						break zzForAction;
-					}
-					else
-					{
-						// store back cached positions
-						zzCurrentPos = zzCurrentPosL;
-						zzMarkedPos = zzMarkedPosL;
-						boolean eof = zzRefill();
-						// get translated positions and possibly new buffer
-						zzCurrentPosL = zzCurrentPos;
-						zzMarkedPosL = zzMarkedPos;
-						zzBufferL = zzBuffer;
-						zzEndReadL = zzEndRead;
-						if(eof)
-						{
-							zzInput = YYEOF;
-							break zzForAction;
-						}
-						else
-						{
-							zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++);
-						}
-					}
-					int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]];
-					if(zzNext == -1)
-					{
-						break zzForAction;
-					}
-					zzState = zzNext;
-
-					int zzAttributes = zzAttrL[zzState];
-					if((zzAttributes & 1) == 1)
-					{
-						zzAction = zzState;
-						zzMarkedPosL = zzCurrentPosL;
-						if((zzAttributes & 8) == 8)
-						{
-							break zzForAction;
-						}
-					}
-
-				}
-			}
-
-			// store back cached position
-			zzMarkedPos = zzMarkedPosL;
-
-			switch(zzAction < 0 ? zzAction : ZZ_ACTION[zzAction])
-			{
-				case 3:
-				{
-					return highlightMode ? JSDocTokenTypes.DOC_SPACE : JSDocTokenTypes.DOC_REAL_WHITESPACE;
-				}
-				case 9:
-					break;
-				case 8:
-				{
-					yybegin(COMMENT_DATA_START);
-					return JSDocTokenTypes.DOC_COMMENT_START;
-				}
-				case 10:
-					break;
-				case 2:
-				{
-					return JSDocTokenTypes.DOC_COMMENT_DATA;
-				}
-				case 11:
-					break;
-				case 1:
-				{
-					return JSDocTokenTypes.DOC_BAD_CHARACTER;
-				}
-				case 12:
-					break;
-				case 7:
-				{
-					return JSDocTokenTypes.DOC_TAG_NAME;
-				}
-				case 13:
-					break;
-				case 6:
-				{
-					yybegin(FOUND_ASTERISK);
-					yypushback(yylength());
-				}
-				case 14:
-					break;
-				case 5:
-				{
-					return JSDocTokenTypes.DOC_COMMENT_END;
-				}
-				case 15:
-					break;
-				case 4:
-				{
-					yybegin(COMMENT_DATA_START);
-					return JSDocTokenTypes.DOC_COMMENT_LEADING_ASTERISK;
-				}
-				case 16:
-					break;
-				default:
-					if(zzInput == YYEOF && zzStartRead == zzCurrentPos)
-					{
-						zzAtEOF = true;
-						zzDoEOF();
-						return null;
-					}
-					else
-					{
-						zzScanError(ZZ_NO_MATCH);
-					}
-			}
-		}
-	}
-
-
-}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
deleted file mode 100644
index 1b2ec6be..00000000
--- a/base-impl/src/main/java/com/intellij/lang/javascript/_JavaScriptLexer.java
+++ /dev/null
@@ -1,2601 +0,0 @@
-/*
- * Copyright 2000-2005 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.
- */
-
-/* The following code was generated by JFlex 1.4.1 on 10.07.09 18:12 */
-
-package com.intellij.lang.javascript;
-
-import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.tree.IElementType;
-
-
-/**
- * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.4.1
- * on 10.07.09 18:12 from the specification file
- * <tt>C:/Branches/Diana81/tools/lexer/../../plugins/JavaScriptLanguage/src/com/intellij/lang/javascript/JavaScript.flex</tt>
- */
-class _JavaScriptLexer implements FlexLexer
-{
-	/**
-	 * initial size of the lookahead buffer
-	 */
-	private static final int ZZ_BUFFERSIZE = 16384;
-
-	/**
-	 * lexical states
-	 */
-	public static final int TAG_ATTR_SQ = 8;
-	public static final int GENERIC_SIGNATURE = 2;
-	public static final int DIV_OR_GT = 1;
-	public static final int TAG_ATTR_DQ = 9;
-	public static final int TAG_CONTENT = 6;
-	public static final int TAG_END = 7;
-	public static final int GWT_FIELD_OR_METHOD = 11;
-	public static final int TAG = 4;
-	public static final int YYINITIAL = 0;
-	public static final int LAST_STATE = 12;
-	public static final int TAG_ATTRIBUTES = 5;
-	public static final int COMMENT = 10;
-	public static final int MAY_BE_GENERIC_SIGNATURE = 3;
-
-	/**
-	 * Translates characters to character classes
-	 */
-	private static final String ZZ_CMAP_PACKED = "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\36\1\32" +
-			"\1\21\1\41\1\46\1\77\1\43\1\17\1\34\1\35\1\7\1\15" +
-			"\1\100\1\27\1\13\1\6\1\11\7\1\2\1\1\30\1\44\1\31" +
-			"\1\45\1\33\1\42\1\74\1\104\1\2\1\102\1\103\1\14\1\2" +
-			"\15\26\1\105\3\26\1\12\2\26\1\22\1\20\1\23\1\76\1\26" +
-			"\1\0\1\54\1\62\1\64\1\60\1\52\1\53\1\24\1\65\1\61" +
-			"\1\26\1\63\1\55\1\73\1\57\1\66\1\71\1\26\1\50\1\56" +
-			"\1\47\1\51\1\72\1\70\1\25\1\67\1\26\1\37\1\75\1\40" +
-			"\1\101\41\5\2\0\4\4\4\0\1\26\2\0\1\5\7\0\1\26" +
-			"\4\0\1\26\5\0\27\26\1\0\37\26\1\0\u013f\26\31\0\162\26" +
-			"\4\0\14\26\16\0\5\26\11\0\1\26\21\0\130\5\5\0\23\5" +
-			"\12\0\1\26\13\0\1\26\1\0\3\26\1\0\1\26\1\0\24\26" +
-			"\1\0\54\26\1\0\46\26\1\0\5\26\4\0\202\26\1\0\4\5" +
-			"\3\0\105\26\1\0\46\26\2\0\2\26\6\0\20\26\41\0\46\26" +
-			"\2\0\1\26\7\0\47\26\11\0\21\5\1\0\27\5\1\0\3\5" +
-			"\1\0\1\5\1\0\2\5\1\0\1\5\13\0\33\26\5\0\3\26" +
-			"\15\0\4\5\14\0\6\5\13\0\32\26\5\0\13\26\16\5\7\0" +
-			"\12\5\4\0\2\26\1\5\143\26\1\0\1\26\10\5\1\0\6\5" +
-			"\2\26\2\5\1\0\4\5\2\26\12\5\3\26\2\0\1\26\17\0" +
-			"\1\5\1\26\1\5\36\26\33\5\2\0\3\26\60\0\46\26\13\5" +
-			"\1\26\u014f\0\3\5\66\26\2\0\1\5\1\26\20\5\2\0\1\26" +
-			"\4\5\3\0\12\26\2\5\2\0\12\5\21\0\3\5\1\0\10\26" +
-			"\2\0\2\26\2\0\26\26\1\0\7\26\1\0\1\26\3\0\4\26" +
-			"\2\0\1\5\1\26\7\5\2\0\2\5\2\0\3\5\11\0\1\5" +
-			"\4\0\2\26\1\0\3\26\2\5\2\0\12\5\2\26\2\4\15\0" +
-			"\3\5\1\0\6\26\4\0\2\26\2\0\26\26\1\0\7\26\1\0" +
-			"\2\26\1\0\2\26\1\0\2\26\2\0\1\5\1\0\5\5\4\0" +
-			"\2\5\2\0\3\5\13\0\4\26\1\0\1\26\7\0\14\5\3\26" +
-			"\14\0\3\5\1\0\11\26\1\0\3\26\1\0\26\26\1\0\7\26" +
-			"\1\0\2\26\1\0\5\26\2\0\1\5\1\26\10\5\1\0\3\5" +
-			"\1\0\3\5\2\0\1\26\17\0\2\26\2\5\2\0\12\5\1\0" +
-			"\1\4\17\0\3\5\1\0\10\26\2\0\2\26\2\0\26\26\1\0" +
-			"\7\26\1\0\2\26\1\0\5\26\2\0\1\5\1\26\6\5\3\0" +
-			"\2\5\2\0\3\5\10\0\2\5\4\0\2\26\1\0\3\26\4\0" +
-			"\12\5\1\0\1\26\20\0\1\5\1\26\1\0\6\26\3\0\3\26" +
-			"\1\0\4\26\3\0\2\26\1\0\1\26\1\0\2\26\3\0\2\26" +
-			"\3\0\3\26\3\0\10\26\1\0\3\26\4\0\5\5\3\0\3\5" +
-			"\1\0\4\5\11\0\1\5\17\0\11\5\11\0\1\4\7\0\3\5" +
-			"\1\0\10\26\1\0\3\26\1\0\27\26\1\0\12\26\1\0\5\26" +
-			"\4\0\7\5\1\0\3\5\1\0\4\5\7\0\2\5\11\0\2\26" +
-			"\4\0\12\5\22\0\2\5\1\0\10\26\1\0\3\26\1\0\27\26" +
-			"\1\0\12\26\1\0\5\26\2\0\1\5\1\26\7\5\1\0\3\5" +
-			"\1\0\4\5\7\0\2\5\7\0\1\26\1\0\2\26\4\0\12\5" +
-			"\22\0\2\5\1\0\10\26\1\0\3\26\1\0\27\26\1\0\20\26" +
-			"\4\0\6\5\2\0\3\5\1\0\4\5\11\0\1\5\10\0\2\26" +
-			"\4\0\12\5\22\0\2\5\1\0\22\26\3\0\30\26\1\0\11\26" +
-			"\1\0\1\26\2\0\7\26\3\0\1\5\4\0\6\5\1\0\1\5" +
-			"\1\0\10\5\22\0\2\5\15\0\60\26\1\5\2\26\7\5\4\0" +
-			"\1\4\7\26\10\5\1\0\12\5\47\0\2\26\1\0\1\26\2\0" +
-			"\2\26\1\0\1\26\2\0\1\26\6\0\4\26\1\0\7\26\1\0" +
-			"\3\26\1\0\1\26\1\0\1\26\2\0\2\26\1\0\4\26\1\5" +
-			"\2\26\6\5\1\0\2\5\1\26\2\0\5\26\1\0\1\26\1\0" +
-			"\6\5\2\0\12\5\2\0\2\26\42\0\1\26\27\0\2\5\6\0" +
-			"\12\5\13\0\1\5\1\0\1\5\1\0\1\5\4\0\2\5\10\26" +
-			"\1\0\42\26\6\0\24\5\1\0\2\5\4\26\4\0\10\5\1\0" +
-			"\44\5\11\0\1\5\71\0\42\26\1\0\5\26\1\0\2\26\1\0" +
-			"\7\5\3\0\4\5\6\0\12\5\6\0\6\26\4\5\106\0\46\26" +
-			"\12\0\51\26\7\0\132\26\5\0\104\26\5\0\122\26\6\0\7\26" +
-			"\1\0\77\26\1\0\1\26\1\0\4\26\2\0\7\26\1\0\1\26" +
-			"\1\0\4\26\2\0\47\26\1\0\1\26\1\0\4\26\2\0\37\26" +
-			"\1\0\1\26\1\0\4\26\2\0\7\26\1\0\1\26\1\0\4\26" +
-			"\2\0\7\26\1\0\7\26\1\0\27\26\1\0\37\26\1\0\1\26" +
-			"\1\0\4\26\2\0\7\26\1\0\47\26\1\0\23\26\16\0\11\5" +
-			"\56\0\125\26\14\0\u026c\26\2\0\10\26\12\0\32\26\5\0\113\26" +
-			"\3\0\3\4\17\0\15\26\1\0\4\26\3\5\13\0\22\26\3\5" +
-			"\13\0\22\26\2\5\14\0\15\26\1\0\3\26\1\0\2\5\14\0" +
-			"\64\26\40\5\3\0\1\26\3\0\1\4\1\26\1\5\2\0\12\5" +
-			"\41\0\3\5\2\0\12\5\6\0\130\26\10\0\51\26\1\5\126\0" +
-			"\35\26\3\0\14\5\4\0\14\5\12\0\12\5\36\26\2\0\5\26" +
-			"\u038b\0\154\26\224\0\234\26\4\0\132\26\6\0\26\26\2\0\6\26" +
-			"\2\0\46\26\2\0\6\26\2\0\10\26\1\0\1\26\1\0\1\26" +
-			"\1\0\1\26\1\0\37\26\2\0\65\26\1\0\7\26\1\0\1\26" +
-			"\3\0\3\26\1\0\7\26\3\0\4\26\2\0\6\26\4\0\15\26" +
-			"\5\0\3\26\1\0\7\26\17\0\4\5\32\0\5\5\20\0\2\4" +
-			"\23\0\1\4\13\0\4\5\6\0\6\5\1\0\1\26\15\0\1\26" +
-			"\40\0\22\4\36\0\15\5\4\0\1\5\3\0\6\5\27\0\1\26" +
-			"\4\0\1\26\2\0\12\26\1\0\1\26\3\0\5\26\6\0\1\26" +
-			"\1\0\1\26\1\0\1\26\1\0\4\26\1\0\3\26\1\0\7\26" +
-			"\3\0\3\26\5\0\5\26\26\0\44\4\u0e81\0\2\26\1\4\31\0" +
-			"\11\4\6\5\1\0\5\26\2\0\3\4\2\26\4\0\126\26\2\0" +
-			"\2\5\2\0\3\26\1\0\132\26\1\4\4\26\5\0\50\26\4\0" +
-			"\136\26\21\0\30\26\70\0\20\26\u0200\0\u19b6\26\112\0\u51a6\26\132\0" +
-			"\u048d\26\u0773\0\u2ba4\26\u215c\0\u012e\26\2\0\73\26\225\0\7\26\14\0" +
-			"\5\26\5\0\1\26\1\5\12\26\1\0\15\26\1\0\5\26\1\0" +
-			"\1\26\1\0\2\26\1\0\2\26\1\0\154\26\41\0\u016b\26\22\0" +
-			"\100\26\2\0\66\26\50\0\14\26\1\4\3\0\20\5\20\0\4\5" +
-			"\17\0\2\4\30\0\3\4\31\0\1\4\6\0\5\26\1\0\207\26" +
-			"\2\0\1\5\4\0\1\4\13\0\12\5\7\0\32\26\4\0\1\4" +
-			"\1\0\32\26\12\0\1\4\131\26\3\0\6\26\2\0\6\26\2\0" +
-			"\6\26\2\0\3\26\3\0\2\4\3\0\2\4\22\0\3\5\4\0";
-
-	/**
-	 * Translates characters to character classes
-	 */
-	private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-	/**
-	 * Translates DFA states to action switch labels.
-	 */
-	private static final int[] ZZ_ACTION = zzUnpackAction();
-
-	private static final String ZZ_ACTION_PACKED_0 = "\6\0\1\1\1\0\2\2\3\0\1\3\1\4\1\5" +
-			"\1\6\1\3\1\7\1\4\1\10\1\11\1\12\1\3" +
-			"\1\13\1\14\1\15\1\5\1\16\1\17\1\20\1\21" +
-			"\1\22\1\23\1\24\1\25\1\26\1\3\1\27\1\30" +
-			"\1\31\1\32\23\5\1\33\1\34\1\35\1\36\1\37" +
-			"\1\40\1\41\1\42\1\43\1\44\1\45\1\46\1\47" +
-			"\1\50\1\44\2\45\1\51\1\52\1\51\1\53\1\54" +
-			"\1\53\1\55\2\53\1\56\1\57\1\60\1\61\1\62" +
-			"\1\63\2\56\1\64\1\1\1\55\2\53\1\65\1\66" +
-			"\1\2\1\67\3\2\3\70\1\71\1\72\2\71\1\3" +
-			"\2\4\1\73\1\74\1\75\1\0\1\73\1\4\1\76" +
-			"\1\77\1\100\2\12\1\0\2\13\1\0\1\5\1\101" +
-			"\1\102\1\103\1\0\1\104\1\105\1\106\3\0\1\107" +
-			"\1\110\2\0\1\111\1\0\16\5\1\112\11\5\1\113" +
-			"\1\5\1\114\1\115\1\116\17\5\1\117\1\120\1\121" +
-			"\1\122\1\123\1\124\1\125\1\0\1\126\2\45\1\54" +
-			"\1\127\1\0\1\130\1\0\1\131\1\57\1\0\1\132" +
-			"\1\133\3\0\1\65\4\2\1\0\1\72\1\134\1\4" +
-			"\1\73\1\75\1\135\1\73\2\0\1\136\2\12\2\13" +
-			"\1\137\1\140\2\0\1\141\1\142\1\143\6\0\1\144" +
-			"\1\145\1\5\1\146\4\5\1\147\10\5\1\150\1\151" +
-			"\2\5\1\152\2\5\1\153\5\5\1\154\20\5\1\155" +
-			"\2\5\1\156\1\45\1\157\1\160\3\0\1\161\1\2" +
-			"\1\161\3\2\1\161\2\2\1\0\1\72\1\0\2\135" +
-			"\2\0\1\162\1\0\1\22\2\0\1\43\1\163\1\5" +
-			"\1\164\3\5\1\165\1\5\1\166\1\167\6\5\1\170" +
-			"\14\5\1\171\5\5\1\172\6\5\1\173\1\174\1\0" +
-			"\1\1\2\2\1\175\1\75\7\0\1\30\1\0\1\176" +
-			"\5\5\1\177\1\200\1\5\1\201\13\5\1\202\1\203" +
-			"\1\204\1\5\1\205\1\5\1\206\1\207\5\5\14\0" +
-			"\1\210\1\211\4\5\1\212\1\213\1\214\2\5\1\215" +
-			"\6\5\1\216\4\5\1\217\2\5\4\0\1\220\4\0" +
-			"\1\5\1\221\1\5\1\222\1\5\1\223\1\224\3\5" +
-			"\1\225\3\5\1\226\1\5\1\227\1\230\1\231\2\0" +
-			"\1\232\1\105\1\0\1\5\1\233\2\5\1\234\2\5" +
-			"\1\235\1\236\1\5\1\237\1\240\2\0\1\241\1\242" +
-			"\1\243\2\5\1\244\1\0\1\245\1\246\1\0";
-
-	private static int[] zzUnpackAction()
-	{
-		int[] result = new int[517];
-		int offset = 0;
-		offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackAction(String packed, int offset, int[] result)
-	{
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while(i < l)
-		{
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			do
-			{
-				result[j++] = value;
-			}
-			while(--count > 0);
-		}
-		return j;
-	}
-
-
-	/**
-	 * Translates a state to a row index in the transition table
-	 */
-	private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
-
-	private static final String ZZ_ROWMAP_PACKED_0 = "\0\0\0\106\0\214\0\322\0\u0118\0\u015e\0\u01a4\0\u01ea" +
-			"\0\u0230\0\u0276\0\u02bc\0\u0302\0\u0348\0\u038e\0\u03d4\0\u041a" +
-			"\0\u0460\0\u04a6\0\u038e\0\u04ec\0\u0532\0\u0578\0\u05be\0\u0604" +
-			"\0\u064a\0\u038e\0\u0690\0\u06d6\0\u071c\0\u0762\0\u07a8\0\u07ee" +
-			"\0\u0834\0\u038e\0\u038e\0\u038e\0\u038e\0\u087a\0\u038e\0\u08c0" +
-			"\0\u038e\0\u0906\0\u094c\0\u0992\0\u09d8\0\u0a1e\0\u0a64\0\u0aaa" +
-			"\0\u0af0\0\u0b36\0\u0b7c\0\u0bc2\0\u0c08\0\u0c4e\0\u0c94\0\u0cda" +
-			"\0\u0d20\0\u0d66\0\u0dac\0\u0df2\0\u0e38\0\u038e\0\u0e7e\0\u0ec4" +
-			"\0\u0f0a\0\u038e\0\u038e\0\u0f50\0\u0f96\0\u0fdc\0\u038e\0\u1022" +
-			"\0\u038e\0\u038e\0\u038e\0\u1068\0\u10ae\0\u10f4\0\u038e\0\u038e" +
-			"\0\u1068\0\u038e\0\u113a\0\u1180\0\u11c6\0\u120c\0\u1068\0\u038e" +
-			"\0\u1252\0\u1298\0\u038e\0\u038e\0\u038e\0\u12de\0\u1068\0\u038e" +
-			"\0\u1324\0\u136a\0\u12de\0\u13b0\0\u13f6\0\u038e\0\u143c\0\u038e" +
-			"\0\u1482\0\u14c8\0\u150e\0\u038e\0\u1554\0\u1068\0\u038e\0\u159a" +
-			"\0\u15e0\0\u1068\0\u1068\0\u1626\0\u166c\0\u16b2\0\u16f8\0\u173e" +
-			"\0\u1784\0\u17ca\0\u1810\0\u1856\0\u038e\0\u038e\0\u038e\0\u189c" +
-			"\0\u18e2\0\u1928\0\u038e\0\u196e\0\u19b4\0\u038e\0\u038e\0\u038e" +
-			"\0\u19fa\0\u1a40\0\u1a86\0\u038e\0\u1acc\0\u1b12\0\u1b58\0\u038e" +
-			"\0\u038e\0\u1b9e\0\u1be4\0\u1c2a\0\u1c70\0\u1cb6\0\u1cfc\0\u1d42" +
-			"\0\u1d88\0\u1dce\0\u1e14\0\u1e5a\0\u1ea0\0\u1ee6\0\u1f2c\0\u1f72" +
-			"\0\u1fb8\0\u1ffe\0\u2044\0\u041a\0\u208a\0\u20d0\0\u2116\0\u215c" +
-			"\0\u21a2\0\u21e8\0\u222e\0\u2274\0\u22ba\0\u041a\0\u2300\0\u041a" +
-			"\0\u041a\0\u2346\0\u238c\0\u23d2\0\u2418\0\u245e\0\u24a4\0\u24ea" +
-			"\0\u2530\0\u2576\0\u25bc\0\u2602\0\u2648\0\u268e\0\u26d4\0\u271a" +
-			"\0\u2760\0\u038e\0\u038e\0\u038e\0\u038e\0\u038e\0\u038e\0\u27a6" +
-			"\0\u27ec\0\u038e\0\u2832\0\u2878\0\u28be\0\u038e\0\u2904\0\u038e" +
-			"\0\u120c\0\u038e\0\u294a\0\u12de\0\u038e\0\u038e\0\u2990\0\u29d6" +
-			"\0\u2a1c\0\u2a62\0\u2aa8\0\u2aee\0\u2b34\0\u2b7a\0\u2bc0\0\u2c06" +
-			"\0\u038e\0\u2c4c\0\u2c92\0\u2cd8\0\u2d1e\0\u2d64\0\u2daa\0\u2df0" +
-			"\0\u038e\0\u2e36\0\u2e7c\0\u2ec2\0\u2f08\0\u038e\0\u041a\0\u2f4e" +
-			"\0\u2f94\0\u038e\0\u2fda\0\u038e\0\u3020\0\u3066\0\u30ac\0\u30f2" +
-			"\0\u3138\0\u317e\0\u038e\0\u038e\0\u31c4\0\u041a\0\u320a\0\u3250" +
-			"\0\u3296\0\u32dc\0\u041a\0\u3322\0\u3368\0\u33ae\0\u33f4\0\u343a" +
-			"\0\u3480\0\u34c6\0\u350c\0\u041a\0\u041a\0\u3552\0\u3598\0\u041a" +
-			"\0\u35de\0\u3624\0\u041a\0\u366a\0\u36b0\0\u36f6\0\u373c\0\u3782" +
-			"\0\u37c8\0\u380e\0\u3854\0\u389a\0\u38e0\0\u3926\0\u396c\0\u39b2" +
-			"\0\u39f8\0\u3a3e\0\u3a84\0\u3aca\0\u3b10\0\u3b56\0\u3b9c\0\u3be2" +
-			"\0\u3c28\0\u041a\0\u3c6e\0\u3cb4\0\u038e\0\u3cfa\0\u1022\0\u038e" +
-			"\0\u3d40\0\u3d86\0\u3dcc\0\u038e\0\u3e12\0\u143c\0\u3e58\0\u3e9e" +
-			"\0\u3ee4\0\u14c8\0\u3f2a\0\u3f70\0\u3fb6\0\u038e\0\u3ffc\0\u4042" +
-			"\0\u038e\0\u4088\0\u40ce\0\u038e\0\u4114\0\u415a\0\u41a0\0\u41e6" +
-			"\0\u422c\0\u041a\0\u4272\0\u041a\0\u42b8\0\u42fe\0\u4344\0\u041a" +
-			"\0\u438a\0\u041a\0\u041a\0\u43d0\0\u4416\0\u445c\0\u44a2\0\u44e8" +
-			"\0\u452e\0\u041a\0\u4574\0\u45ba\0\u4600\0\u4646\0\u468c\0\u46d2" +
-			"\0\u4718\0\u475e\0\u47a4\0\u47ea\0\u4830\0\u4876\0\u041a\0\u48bc" +
-			"\0\u4902\0\u4948\0\u498e\0\u49d4\0\u041a\0\u4a1a\0\u4a60\0\u4aa6" +
-			"\0\u4aec\0\u4b32\0\u4b78\0\u041a\0\u1022\0\u4bbe\0\u038e\0\u4c04" +
-			"\0\u4c4a\0\u038e\0\u038e\0\u4c90\0\u4cd6\0\u4d1c\0\u4d62\0\u4da8" +
-			"\0\u4dee\0\u4e34\0\u4e7a\0\u4ec0\0\u041a\0\u4f06\0\u4f4c\0\u4f92" +
-			"\0\u4fd8\0\u501e\0\u041a\0\u5064\0\u50aa\0\u041a\0\u50f0\0\u5136" +
-			"\0\u517c\0\u51c2\0\u5208\0\u524e\0\u5294\0\u52da\0\u5320\0\u5366" +
-			"\0\u53ac\0\u041a\0\u041a\0\u041a\0\u53f2\0\u041a\0\u5438\0\u041a" +
-			"\0\u041a\0\u547e\0\u54c4\0\u550a\0\u5550\0\u5596\0\u55dc\0\u5622" +
-			"\0\u5668\0\u56ae\0\u56f4\0\u573a\0\u5780\0\u57c6\0\u580c\0\u5852" +
-			"\0\u5898\0\u58de\0\u041a\0\u041a\0\u5924\0\u596a\0\u59b0\0\u59f6" +
-			"\0\u041a\0\u041a\0\u041a\0\u5a3c\0\u5a82\0\u041a\0\u5ac8\0\u5b0e" +
-			"\0\u5b54\0\u5b9a\0\u5be0\0\u5c26\0\u041a\0\u5c6c\0\u5cb2\0\u5cf8" +
-			"\0\u5d3e\0\u041a\0\u5d84\0\u5dca\0\u5e10\0\u5e56\0\u5e9c\0\u5ee2" +
-			"\0\u573a\0\u5f28\0\u5f6e\0\u5fb4\0\u5ffa\0\u6040\0\u041a\0\u6086" +
-			"\0\u041a\0\u60cc\0\u041a\0\u041a\0\u6112\0\u6158\0\u619e\0\u041a" +
-			"\0\u61e4\0\u622a\0\u6270\0\u041a\0\u62b6\0\u041a\0\u041a\0\u038e" +
-			"\0\u62fc\0\u6342\0\u038e\0\u6388\0\u63ce\0\u6414\0\u041a\0\u645a" +
-			"\0\u64a0\0\u041a\0\u64e6\0\u652c\0\u041a\0\u041a\0\u6572\0\u038e" +
-			"\0\u573a\0\u65b8\0\u65fe\0\u041a\0\u041a\0\u041a\0\u6644\0\u668a" +
-			"\0\u041a\0\u66d0\0\u041a\0\u041a\0\u6716";
-
-	private static int[] zzUnpackRowMap()
-	{
-		int[] result = new int[517];
-		int offset = 0;
-		offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackRowMap(String packed, int offset, int[] result)
-	{
-		int i = 0;  /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while(i < l)
-		{
-			int high = packed.charAt(i++) << 16;
-			result[j++] = high | packed.charAt(i++);
-		}
-		return j;
-	}
-
-	/**
-	 * The transition table of the DFA
-	 */
-	private static final int[] ZZ_TRANS = zzUnpackTrans();
-
-	private static final String ZZ_TRANS_PACKED_0 = "\1\16\1\17\1\20\1\21\1\20\1\16\1\22\1\23" +
-			"\1\21\1\24\1\20\1\25\1\20\1\26\1\21\1\27" +
-			"\1\30\1\31\1\32\1\33\1\34\2\20\1\35\1\36" +
-			"\1\37\1\40\1\41\1\42\1\43\1\21\1\44\1\45" +
-			"\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55" +
-			"\1\56\1\57\1\60\1\61\1\62\1\63\1\64\1\65" +
-			"\1\66\1\67\1\20\1\70\1\20\1\71\1\72\1\73" +
-			"\1\74\1\75\1\20\1\76\1\77\1\100\1\101\1\102" +
-			"\1\103\4\20\1\16\1\17\1\20\1\21\1\20\1\16" +
-			"\1\104\1\105\1\21\1\24\1\20\1\25\1\20\1\26" +
-			"\1\21\1\27\1\30\1\31\1\32\1\33\1\34\2\20" +
-			"\1\35\1\36\1\106\1\40\1\41\1\42\1\43\1\21" +
-			"\1\44\1\45\1\46\1\47\1\50\1\51\1\52\1\53" +
-			"\1\54\1\55\1\56\1\57\1\60\1\61\1\62\1\63" +
-			"\1\64\1\65\1\66\1\67\1\20\1\70\1\20\1\71" +
-			"\1\72\1\73\1\74\1\75\1\20\1\76\1\77\1\100" +
-			"\1\101\1\102\1\103\4\20\2\107\1\110\1\21\1\110" +
-			"\3\107\1\21\1\107\1\110\1\111\1\110\1\107\1\21" +
-			"\5\107\3\110\2\107\1\112\1\107\1\113\2\107\1\21" +
-			"\4\107\1\114\2\107\3\110\1\115\7\110\1\116\12\110" +
-			"\6\107\4\110\3\117\1\21\4\117\1\21\5\117\1\21" +
-			"\12\117\1\120\4\117\1\21\4\117\1\121\42\117\2\122" +
-			"\1\123\1\21\2\122\1\124\1\122\1\21\1\122\1\123" +
-			"\1\122\1\123\1\122\1\21\5\122\3\123\2\122\1\125" +
-			"\4\122\1\21\1\126\3\122\1\127\3\122\25\123\6\122" +
-			"\4\123\2\130\1\131\1\132\4\130\1\132\1\130\1\131" +
-			"\1\130\1\131\1\130\1\132\1\133\1\130\1\134\2\130" +
-			"\3\131\4\130\1\135\2\130\1\132\1\136\3\130\1\137" +
-			"\1\130\1\140\1\130\25\131\6\130\4\131\3\141\1\21" +
-			"\4\141\1\21\5\141\1\21\12\141\1\142\4\141\1\21" +
-			"\1\143\1\141\2\122\1\144\42\141\2\122\1\145\1\21" +
-			"\4\122\1\21\1\122\1\145\1\122\1\145\1\122\1\21" +
-			"\5\122\3\145\4\122\1\146\2\122\1\21\1\143\3\122" +
-			"\1\127\3\122\25\145\6\122\4\145\17\147\1\150\23\147" +
-			"\1\151\42\147\21\152\1\150\21\152\1\153\42\152\3\154" +
-			"\1\21\4\154\1\21\5\154\1\21\12\154\1\155\4\154" +
-			"\1\21\4\154\1\156\42\154\2\157\1\160\1\157\1\160" +
-			"\5\157\1\160\1\157\1\160\7\157\3\160\1\157\1\161" +
-			"\12\157\1\162\2\157\26\160\6\157\4\160\16\16\1\0" +
-			"\24\16\1\163\42\16\107\0\1\17\7\0\1\17\1\0" +
-			"\1\164\1\165\35\0\1\165\34\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\26\20" +
-			"\6\0\4\20\3\0\1\21\4\0\1\21\5\0\1\21" +
-			"\17\0\1\21\47\0\6\166\1\167\1\170\1\0\5\166" +
-			"\1\0\1\166\1\171\1\166\1\172\63\166\1\0\1\17" +
-			"\7\0\1\17\1\173\1\164\1\165\10\0\1\173\24\0" +
-			"\1\165\34\0\1\164\7\0\1\164\1\0\1\174\107\0" +
-			"\1\175\27\0\1\176\40\0\10\27\1\0\5\27\1\0" +
-			"\1\177\1\200\65\27\46\0\1\201\37\0\10\31\1\0" +
-			"\5\31\1\0\1\31\1\202\1\203\64\31\23\0\1\204" +
-			"\63\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\205\21\20\6\0\4\20" +
-			"\27\0\1\206\15\0\1\207\70\0\1\210\107\0\1\211" +
-			"\120\0\1\212\73\0\1\213\11\0\1\214\121\0\1\215" +
-			"\50\0\1\216\14\0\1\217\1\0\1\220\1\0\1\221" +
-			"\6\0\1\222\1\223\75\0\1\224\41\0\2\20\1\0" +
-			"\2\20\3\0\2\20\1\0\1\20\7\0\3\20\10\0" +
-			"\1\225\6\0\26\20\6\0\4\20\1\0\2\20\1\0" +
-			"\2\20\3\0\2\20\1\0\1\20\7\0\3\20\17\0" +
-			"\2\20\1\226\14\20\1\227\1\20\1\230\4\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\4\20\1\231\21\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\10\20\1\232\1\233\1\20" +
-			"\1\234\12\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\1\20\1\235\1\20" +
-			"\17\0\6\20\1\236\1\237\16\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\3\20\1\240\2\20\1\241\4\20\1\242" +
-			"\4\20\1\243\5\20\6\0\4\20\1\0\2\20\1\0" +
-			"\2\20\3\0\2\20\1\0\1\20\7\0\3\20\17\0" +
-			"\10\20\1\244\15\20\6\0\4\20\1\0\2\20\1\0" +
-			"\2\20\3\0\2\20\1\0\1\20\7\0\3\20\17\0" +
-			"\4\20\1\245\21\20\6\0\4\20\1\0\2\20\1\0" +
-			"\2\20\3\0\2\20\1\0\1\20\7\0\3\20\17\0" +
-			"\1\20\1\246\1\20\1\247\1\250\15\20\1\251\3\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\3\20\1\252\1\253" +
-			"\1\20\1\254\17\20\6\0\4\20\1\0\2\20\1\0" +
-			"\2\20\3\0\2\20\1\0\1\20\7\0\3\20\17\0" +
-			"\4\20\1\255\13\20\1\256\1\257\4\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\5\20\1\260\2\20\1\261\1\262" +
-			"\13\20\1\263\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\2\20" +
-			"\1\264\23\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\6\20" +
-			"\1\265\1\266\10\20\1\267\5\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\24\20\1\270\1\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\13\20\1\271\12\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\13\20\1\272\3\20\1\273\6\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\2\20\1\274\1\275\2\20" +
-			"\1\276\17\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\6\20" +
-			"\1\277\4\20\1\300\4\20\1\301\5\20\6\0\4\20" +
-			"\45\0\1\302\27\0\1\303\55\0\1\304\105\0\1\305" +
-			"\46\0\1\167\1\170\35\0\1\306\105\0\1\307\71\0" +
-			"\1\310\1\311\12\0\1\312\41\0\2\110\1\0\2\110" +
-			"\3\0\2\110\1\0\1\110\7\0\3\110\17\0\26\110" +
-			"\6\0\4\110\41\0\1\217\45\0\2\110\1\0\2\110" +
-			"\3\0\2\110\1\0\1\110\7\0\3\110\17\0\13\110" +
-			"\1\313\12\110\6\0\4\110\1\0\2\110\1\0\2\110" +
-			"\3\0\2\110\1\0\1\110\7\0\3\110\17\0\11\110" +
-			"\1\314\14\110\6\0\4\110\1\0\2\123\6\0\4\123" +
-			"\7\0\4\123\1\315\16\0\25\123\6\0\4\123\33\0" +
-			"\1\316\60\0\1\317\24\0\1\320\52\0\40\321\1\322" +
-			"\45\321\1\0\2\131\6\0\4\131\7\0\4\131\1\323" +
-			"\16\0\25\131\6\0\4\131\3\0\1\132\4\0\1\132" +
-			"\5\0\1\132\17\0\1\132\47\0\40\324\1\325\45\324" +
-			"\3\141\1\0\4\141\1\0\5\141\1\0\12\141\1\0" +
-			"\4\141\2\0\1\141\3\0\42\141\6\0\1\326\23\0" +
-			"\1\327\7\0\1\330\45\0\1\331\7\0\1\331\1\0" +
-			"\1\331\7\0\3\331\12\0\1\217\5\0\25\331\6\0" +
-			"\4\331\1\0\2\145\6\0\4\145\7\0\4\145\1\332" +
-			"\16\0\25\145\6\0\4\145\17\147\1\0\70\147\1\333" +
-			"\7\147\1\333\1\147\1\333\2\147\1\0\4\147\3\333" +
-			"\12\147\1\334\5\147\25\333\6\147\4\333\21\152\1\0" +
-			"\66\152\1\335\7\152\1\335\1\152\1\335\4\152\1\0" +
-			"\2\152\3\335\12\152\1\336\5\152\25\335\6\152\4\335" +
-			"\32\0\1\337\54\0\2\160\1\0\2\160\3\0\2\160" +
-			"\1\0\1\160\7\0\3\160\5\0\1\340\11\0\26\160" +
-			"\6\0\4\160\30\0\1\341\56\0\1\164\7\0\1\164" +
-			"\2\0\1\165\35\0\1\165\34\0\1\342\7\0\1\342" +
-			"\3\0\1\342\11\0\1\342\56\0\6\166\1\343\1\166" +
-			"\1\0\5\166\1\0\1\166\1\171\1\166\1\172\63\166" +
-			"\10\167\1\0\5\167\1\0\67\167\7\344\1\345\76\344" +
-			"\10\166\1\0\5\166\1\0\67\166\6\172\1\346\1\172" +
-			"\1\347\5\172\1\347\1\172\1\350\2\172\1\166\62\172" +
-			"\1\0\2\173\6\0\1\173\2\0\1\173\35\0\3\173" +
-			"\3\0\1\173\1\0\1\173\1\0\1\173\15\0\3\173" +
-			"\14\0\1\351\72\0\3\27\1\352\4\27\1\353\25\27" +
-			"\1\352\47\27\37\0\1\225\46\0\3\31\1\354\4\31" +
-			"\1\355\25\31\1\354\47\31\33\0\1\356\53\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\1\20\1\357\24\20\6\0\4\20\22\0\1\360" +
-			"\4\0\1\361\123\0\1\362\73\0\1\363\11\0\1\364" +
-			"\117\0\1\365\75\0\1\366\37\0\1\367\7\0\1\367" +
-			"\13\0\1\370\153\0\1\371\61\0\1\372\103\0\1\373" +
-			"\40\0\40\225\1\374\45\225\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\3\20" +
-			"\1\375\15\20\1\376\4\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\2\20\1\377\10\20\1\u0100\12\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\23\20\1\u0101\2\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\1\20\1\u0102\24\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u0103\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\12\20\1\u0104\13\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\11\20\1\u0105\14\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\1\20\1\u0106\24\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\16\20\1\u0107\7\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\10\20\1\u0108\15\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\11\20\1\u0109\14\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\7\20\1\u010a\16\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\11\20\1\u010b\14\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\2\20\1\u010c\23\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\1\20\1\u010d\24\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\6\20\1\u010e\17\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\23\20\1\u010f\2\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\1\20\1\u0110\24\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\13\20\1\u0111\12\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\7\20\1\u0112\16\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\22\20\1\u0113\3\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\1\20\1\u0114\23\20\1\u0115\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\5\20\1\u0116\1\20\1\u0117" +
-			"\16\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\11\20\1\u0118" +
-			"\14\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\1\20\1\u0119" +
-			"\6\20\1\u011a\5\20\1\u011b\7\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\23\20\1\u011c\2\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\4\20\1\u011d\21\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\1\20\1\u011e\6\20\1\u011f\15\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\6\20\1\u0120\17\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\11\20\1\u0121\14\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\4\20\1\u0122\21\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\4\20\1\u0123\21\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\1\20\1\u0124\24\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\13\20\1\u0125\12\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\13\20\1\u0126\4\20\1\u0127" +
-			"\5\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\14\20\1\u0128" +
-			"\11\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\16\20\1\u0129" +
-			"\7\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\2\20\1\u012a" +
-			"\23\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\2\20\1\u012b" +
-			"\23\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\13\20\1\u012c" +
-			"\12\20\6\0\4\20\45\0\1\u012d\62\0\1\360\64\0" +
-			"\2\110\1\0\2\110\3\0\2\110\1\0\1\110\7\0" +
-			"\3\110\17\0\11\110\1\u012e\14\110\6\0\4\110\1\0" +
-			"\2\110\1\0\2\110\3\0\2\110\1\0\1\110\7\0" +
-			"\3\110\17\0\1\110\1\u012f\24\110\6\0\4\110\1\0" +
-			"\2\315\6\0\4\315\7\0\4\315\17\0\25\315\6\0" +
-			"\4\315\33\0\1\u0130\53\0\2\323\6\0\4\323\7\0" +
-			"\4\323\17\0\25\323\6\0\4\323\27\0\1\u0131\56\0" +
-			"\42\330\1\u0132\43\330\1\0\2\331\6\0\4\331\7\0" +
-			"\4\331\1\u0133\13\0\1\u0134\2\0\25\331\6\0\4\331" +
-			"\1\0\2\332\6\0\4\332\7\0\4\332\17\0\25\332" +
-			"\6\0\4\332\1\147\2\333\6\147\4\333\2\147\1\0" +
-			"\4\147\4\333\1\u0135\13\147\1\u0136\2\147\25\333\6\147" +
-			"\4\333\1\147\1\u0137\7\147\1\u0137\5\147\1\0\5\147" +
-			"\1\u0138\60\147\1\152\2\335\6\152\4\335\4\152\1\0" +
-			"\2\152\4\335\1\u0139\13\152\1\u013a\2\152\25\335\6\152" +
-			"\4\335\1\152\1\u013b\7\152\1\u013b\7\152\1\0\3\152" +
-			"\1\u013c\60\152\27\0\1\u013d\56\0\20\340\1\0\14\340" +
-			"\1\u013e\1\0\47\340\1\0\1\342\7\0\1\342\120\0" +
-			"\2\343\33\0\1\343\11\0\1\343\12\0\7\344\1\u013f" +
-			"\76\344\6\u0140\1\u0141\1\345\76\u0140\23\347\1\166\2\346" +
-			"\33\347\1\346\11\347\1\346\35\347\1\166\62\347\10\172" +
-			"\1\347\5\172\1\347\4\172\1\166\62\172\3\27\1\352" +
-			"\4\27\1\353\6\27\1\177\1\200\15\27\1\352\57\27" +
-			"\1\0\6\27\1\177\1\200\65\27\3\31\1\354\4\31" +
-			"\1\355\7\31\1\202\1\203\14\31\1\354\57\31\1\0" +
-			"\7\31\1\202\1\203\64\31\102\0\1\u0142\32\0\1\u0143" +
-			"\123\0\1\u0144\124\0\1\u0145\65\0\1\u0146\42\0\1\367" +
-			"\7\0\1\367\32\0\1\u0134\42\0\2\u0147\6\0\1\u0147" +
-			"\2\0\1\u0147\35\0\3\u0147\3\0\1\u0147\1\0\1\u0147" +
-			"\1\0\1\u0147\15\0\3\u0147\72\0\1\u0148\60\0\1\u0149" +
-			"\42\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u014a\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\20\20\1\u014b\5\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\10\20\1\u014c\15\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u014d\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\3\20\1\u014e\22\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u014f\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\1\20\1\u0150\24\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u0151\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\17\20\1\u0152\6\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u0153\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\16\20\1\u0154\7\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\10\20\1\u0155\15\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\6\20\1\u0156\17\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\1\20\1\u0157\24\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u0158\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\1\20\1\u0159\24\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\7\20\1\u015a\16\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\13\20\1\u015b\12\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u015c\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\6\20\1\u015d\17\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u015e\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\6\20\1\u015f\17\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\4\20\1\u0160\21\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\1\20\1\u0161\24\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\7\20\1\u0162\16\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\7\20\1\u0163\10\20\1\u0164\5\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\6\20\1\u0165\17\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\16\20\1\u0166\7\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\4\20\1\u0167\21\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\10\20\1\u0168\15\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\1\20\1\u0169\6\20" +
-			"\1\u016a\15\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\2\20" +
-			"\1\u016b\23\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\7\20" +
-			"\1\u016c\16\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\17\20" +
-			"\1\u016d\6\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\7\20" +
-			"\1\u016e\16\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\24\20" +
-			"\1\u016f\1\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\1\20" +
-			"\1\u0170\24\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\7\20" +
-			"\1\u0171\16\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\15\20" +
-			"\1\u0172\10\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\1\20" +
-			"\1\u0173\24\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\12\20" +
-			"\1\u0174\13\20\6\0\4\20\1\0\2\110\1\0\2\110" +
-			"\3\0\2\110\1\0\1\110\7\0\3\110\17\0\1\110" +
-			"\1\u0175\24\110\6\0\4\110\27\0\1\u0176\56\0\33\330" +
-			"\1\u0177\52\330\1\0\2\u0133\6\0\4\u0133\7\0\4\u0133" +
-			"\14\0\1\u0134\2\0\25\u0133\6\0\4\u0133\1\147\2\u0135" +
-			"\6\147\4\u0135\2\147\1\0\4\147\4\u0135\14\147\1\u0136" +
-			"\2\147\25\u0135\6\147\4\u0135\1\147\1\u0137\7\147\1\u0137" +
-			"\5\147\1\0\24\147\1\u0136\42\147\2\u0178\6\147\1\u0178" +
-			"\2\147\1\u0178\2\147\1\0\32\147\3\u0178\3\147\1\u0178" +
-			"\1\147\1\u0178\1\147\1\u0178\15\147\3\u0178\1\147\1\152" +
-			"\2\u0139\6\152\4\u0139\4\152\1\0\2\152\4\u0139\14\152" +
-			"\1\u013a\2\152\25\u0139\6\152\4\u0139\1\152\1\u013b\7\152" +
-			"\1\u013b\7\152\1\0\22\152\1\u013a\42\152\2\u0179\6\152" +
-			"\1\u0179\2\152\1\u0179\4\152\1\0\30\152\3\u0179\3\152" +
-			"\1\u0179\1\152\1\u0179\1\152\1\u0179\15\152\3\u0179\1\152" +
-			"\27\0\1\u017a\56\0\6\344\1\u017b\1\u013f\76\344\7\u0140" +
-			"\1\u017c\76\u0140\103\0\1\u017d\2\0\6\u0143\1\u017e\20\u0143" +
-			"\1\u017f\1\u0143\1\u0180\54\u0143\55\0\1\u0181\73\0\1\u0182" +
-			"\1\0\1\214\41\0\2\u0147\6\0\1\u0147\2\0\1\u0147" +
-			"\27\0\1\u0134\5\0\3\u0147\3\0\1\u0147\1\0\1\u0147" +
-			"\1\0\1\u0147\15\0\3\u0147\45\0\1\u0183\104\0\1\u0184" +
-			"\1\0\1\312\41\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\22\20\1\u0185\3\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\20\20\1\u0186\5\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\2\20\1\u0187\23\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\5\20\1\u0188\20\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\11\20\1\u0189\14\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\1\20\1\u018a\24\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\4\20\1\u018b\21\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\7\20\1\u018c\16\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\13\20\1\u018d\12\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\2\20\1\u018e\23\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\16\20\1\u018f\7\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\24\20\1\u0190\1\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\10\20\1\u0191\15\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\3\20\1\u0192\22\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\1\20\1\u0193\24\20" +
-			"\6\0\4\20\1\0\2\20\1\0\2\20\3\0\2\20" +
-			"\1\0\1\20\7\0\3\20\17\0\25\20\1\u0194\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\2\20\1\u0195\23\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\6\20\1\u0196\17\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\3\20\1\u0197\22\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\4\20\1\u0198\21\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\2\20\1\u0199\23\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\15\20\1\u019a\10\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\17\20\1\u019b\6\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\10\20\1\u019c\15\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\13\20\1\u019d\12\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\1\20\1\u019e\24\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\2\20\1\u019f\23\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\12\20\1\u01a0\13\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\4\20\1\u01a1\21\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\6\20\1\u01a2\17\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\4\20\1\u01a3\21\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\13\20\1\u01a4\12\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\6\20\1\u01a5\17\20\6\0" +
-			"\4\20\1\0\2\20\1\0\2\20\3\0\2\20\1\0" +
-			"\1\20\7\0\3\20\17\0\3\20\1\u01a6\22\20\6\0" +
-			"\4\20\6\u0176\1\u01a7\20\u0176\1\u01a8\1\u0176\1\u01a9\54\u0176" +
-			"\1\147\2\u0178\6\147\1\u0178\2\147\1\u0178\2\147\1\0" +
-			"\24\147\1\u0136\5\147\3\u0178\3\147\1\u0178\1\147\1\u0178" +
-			"\1\147\1\u0178\15\147\3\u0178\1\147\1\152\2\u0179\6\152" +
-			"\1\u0179\2\152\1\u0179\4\152\1\0\22\152\1\u013a\5\152" +
-			"\3\u0179\3\152\1\u0179\1\152\1\u0179\1\152\1\u0179\15\152" +
-			"\3\u0179\1\152\6\u0140\1\u0141\1\u017c\76\u0140\104\0\1\u01aa" +
-			"\1\0\6\u0143\1\u01ab\20\u0143\1\u01ac\1\u0143\1\u01ac\62\u0143" +
-			"\1\u01ad\20\u0143\1\u01ae\1\u0143\1\u01ac\62\u0143\1\u01ad\20\u0143" +
-			"\1\u01ac\2\u0143\1\u01ac\53\u0143\51\0\1\u01af\60\0\1\u01b0" +
-			"\124\0\1\u01b1\1\0\1\221\115\0\1\u01b2\31\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\5\20\1\u01b3\20\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\11\20\1\u01b4\14\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\13\20\1\u01b5\12\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\12\20\1\u01b6\13\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\13\20\1\u01b7\12\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\7\20\1\u01b8\16\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\16\20\1\u01b9\7\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\17\20\1\u01ba\6\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\4\20\1\u01bb\21\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\23\20\1\u01bc\2\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\7\20\1\u01bd\16\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\4\20\1\u01be\21\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\13\20\1\u01bf\12\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\5\20\1\u01c0\3\20\1\u01c1\14\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\11\20\1\u01c2\14\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\12\20\1\u01c3\13\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\25\20\1\u01c4\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\1\20\1\u01c5\24\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\11\20\1\u01c6\14\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\13\20\1\u01c7\12\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\1\20\1\u01c8\24\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\16\20\1\u01c9\7\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\3\20\17\0\16\20\1\u01ca\7\20\6\0\4\20\1\0" +
-			"\2\20\1\0\2\20\3\0\2\20\1\0\1\20\7\0" +
-			"\1\u01cb\2\20\17\0\26\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\6\20\1\u01cc\17\20\6\0\4\20\6\u0176\1\0" +
-			"\20\u0176\1\0\1\u0176\1\0\62\u0176\1\0\20\u0176\1\u01cd" +
-			"\1\u0176\1\0\62\u0176\1\0\20\u0176\1\0\2\u0176\1\0" +
-			"\53\u0176\105\0\1\u01ce\3\u01ac\1\u01cf\2\u01ac\1\u01ab\1\u01ac" +
-			"\1\u01cf\5\u01ac\1\u01cf\10\u01ac\1\u01d0\6\u01ac\1\u01cf\55\u01ac" +
-			"\1\u01ad\105\u01ac\1\u01ab\77\u01ac\6\u0143\1\u01ad\22\u0143\1\u01ac" +
-			"\1\u0143\1\u01d1\52\u0143\60\0\1\u01d2\74\0\1\u01d3\112\0" +
-			"\1\u01d4\100\0\1\u01d5\37\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\11\20\1\u01d6" +
-			"\14\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\10\20\1\u01d7" +
-			"\15\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\20\20\1\u01d8" +
-			"\5\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\21\20\1\u01d9" +
-			"\4\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\6\20\1\u01da" +
-			"\17\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\1\20\1\u01db" +
-			"\24\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\16\20\1\u01dc" +
-			"\7\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\6\20\1\u01dd" +
-			"\17\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\6\20\1\u01de" +
-			"\17\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\16\20\1\u01df" +
-			"\7\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\4\20\1\u01e0" +
-			"\21\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\4\20\1\u01e1" +
-			"\21\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\3\20\1\u01e2" +
-			"\22\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\12\20\1\u01e3" +
-			"\13\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\4\20\1\u01e4" +
-			"\21\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\1\20\1\u01e5" +
-			"\24\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\4\20\1\u01e6" +
-			"\21\20\6\0\4\20\1\0\2\20\1\0\2\20\3\0" +
-			"\2\20\1\0\1\20\7\0\3\20\17\0\7\20\1\u01e7" +
-			"\16\20\6\0\4\20\6\u0176\1\0\22\u0176\1\0\1\u0176" +
-			"\1\u01e8\52\u0176\104\0\1\u01e9\1\0\3\u01ac\1\u01cf\2\u01ac" +
-			"\1\u01ad\1\u01ac\1\u01cf\5\u01ac\1\u01cf\10\u01ac\1\u01d0\6\u01ac" +
-			"\1\u01cf\55\u01ac\1\u01ad\20\u01ac\1\u01ea\56\u01ac\52\0\1\u01eb" +
-			"\77\0\1\u01ec\134\0\1\u01ed\56\0\1\310\42\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\4\20\1\u01ee\21\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\11\20\1\u01ef\14\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\16\20\1\u01f0\7\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\16\20\1\u01f1\7\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\7\20\1\u01f2\16\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\4\20\1\u01f3\21\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\11\20\1\u01f4\14\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\4\20\1\u01f5\21\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\4\20\1\u01f6\21\20\6\0\4\20\1\0\2\20" +
-			"\1\0\2\20\3\0\2\20\1\0\1\20\7\0\3\20" +
-			"\17\0\4\20\1\u01f7\21\20\6\0\4\20\22\0\1\u01f8" +
-			"\63\0\6\u01ac\1\u01ad\24\u01ac\1\u01f9\52\u01ac\43\0\1\u01fa" +
-			"\1\0\1\364\131\0\1\u01fb\15\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\12\20" +
-			"\1\u01fc\13\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\4\20" +
-			"\1\u01fd\21\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\4\20" +
-			"\1\u01fe\21\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\20\20" +
-			"\1\u01ff\5\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\1\20" +
-			"\1\u0200\24\20\6\0\4\20\1\0\2\20\1\0\2\20" +
-			"\3\0\2\20\1\0\1\20\7\0\3\20\17\0\12\20" +
-			"\1\u0201\13\20\6\0\4\20\24\0\1\u0202\125\0\1\220" +
-			"\42\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\5\20\1\u0203\20\20\6\0\4\20" +
-			"\1\0\2\20\1\0\2\20\3\0\2\20\1\0\1\20" +
-			"\7\0\3\20\17\0\10\20\1\u0204\15\20\6\0\4\20" +
-			"\47\0\1\u0205\102\0\1\363\41\0";
-
-	private static int[] zzUnpackTrans()
-	{
-		int[] result = new int[26460];
-		int offset = 0;
-		offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackTrans(String packed, int offset, int[] result)
-	{
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while(i < l)
-		{
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			value--;
-			do
-			{
-				result[j++] = value;
-			}
-			while(--count > 0);
-		}
-		return j;
-	}
-
-
-	/* error codes */
-	private static final int ZZ_UNKNOWN_ERROR = 0;
-	private static final int ZZ_NO_MATCH = 1;
-	private static final int ZZ_PUSHBACK_2BIG = 2;
-	private static final char[] EMPTY_BUFFER = new char[0];
-	private static final int YYEOF = -1;
-	private static java.io.Reader zzReader = null; // Fake
-
-	/* error messages for the codes above */
-	private static final String ZZ_ERROR_MSG[] = {
-			"Unkown internal scanner error",
-			"Error: could not match input",
-			"Error: pushback value was too large"
-	};
-
-	/**
-	 * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-	 */
-	private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-	private static final String ZZ_ATTRIBUTE_PACKED_0 = "\6\0\1\1\1\0\2\1\3\0\1\11\4\1\1\11" +
-			"\6\1\1\11\7\1\4\11\1\1\1\11\1\1\1\11" +
-			"\24\1\1\11\3\1\2\11\3\1\1\11\1\1\3\11" +
-			"\3\1\2\11\1\1\1\11\5\1\1\11\2\1\3\11" +
-			"\2\1\1\11\5\1\1\11\1\1\1\11\3\1\1\11" +
-			"\2\1\1\11\11\1\1\0\3\1\3\11\1\1\1\0" +
-			"\1\1\1\11\1\0\1\1\3\11\1\0\2\1\1\11" +
-			"\3\0\2\11\2\0\1\1\1\0\54\1\6\11\1\1" +
-			"\1\0\1\11\3\1\1\11\1\0\1\11\1\0\1\11" +
-			"\1\1\1\0\2\11\3\0\5\1\1\0\1\1\1\11" +
-			"\5\1\2\0\1\11\4\1\1\11\1\1\2\0\1\11" +
-			"\1\1\1\11\6\0\2\11\60\1\1\11\2\1\1\11" +
-			"\3\0\1\11\10\1\1\0\1\11\1\0\1\1\1\11" +
-			"\2\0\1\11\1\0\1\1\2\0\55\1\1\0\1\11" +
-			"\2\1\2\11\7\0\1\1\1\0\42\1\14\0\32\1" +
-			"\4\0\1\1\4\0\22\1\1\11\2\0\1\11\1\1" +
-			"\1\0\12\1\1\11\1\1\2\0\6\1\1\0\2\1" +
-			"\1\0";
-
-	private static int[] zzUnpackAttribute()
-	{
-		int[] result = new int[517];
-		int offset = 0;
-		offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-		return result;
-	}
-
-	private static int zzUnpackAttribute(String packed, int offset, int[] result)
-	{
-		int i = 0;       /* index in packed string  */
-		int j = offset;  /* index in unpacked array */
-		int l = packed.length();
-		while(i < l)
-		{
-			int count = packed.charAt(i++);
-			int value = packed.charAt(i++);
-			do
-			{
-				result[j++] = value;
-			}
-			while(--count > 0);
-		}
-		return j;
-	}
-
-	/**
-	 * the current state of the DFA
-	 */
-	private int zzState;
-
-	/**
-	 * the current lexical state
-	 */
-	private int zzLexicalState = YYINITIAL;
-
-	/**
-	 * this buffer contains the current text to be matched and is
-	 * the source of the yytext() string
-	 */
-	private CharSequence zzBuffer = "";
-
-	/**
-	 * this buffer may contains the current text array to be matched when it is cheap to acquire it
-	 */
-	private char[] zzBufferArray;
-
-	/**
-	 * the textposition at the last accepting state
-	 */
-	private int zzMarkedPos;
-
-	/**
-	 * the textposition at the last state to be included in yytext
-	 */
-	private int zzPushbackPos;
-
-	/**
-	 * the current text position in the buffer
-	 */
-	private int zzCurrentPos;
-
-	/**
-	 * startRead marks the beginning of the yytext() string in the buffer
-	 */
-	private int zzStartRead;
-
-	/**
-	 * endRead marks the last character in the buffer, that has been read
-	 * from input
-	 */
-	private int zzEndRead;
-
-	/**
-	 * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-	 */
-	private boolean zzAtBOL = true;
-
-	/**
-	 * zzAtEOF == true <=> the scanner is at the EOF
-	 */
-	private boolean zzAtEOF;
-
-	/**
-	 * denotes if the user-EOF-code has already been executed
-	 */
-	private boolean zzEOFDone;
-
-	/* user code: */
-	public _JavaScriptLexer(boolean highlightMode, DialectOptionHolder _optionsHolder)
-	{
-		this((java.io.Reader) null);
-		isHighlightModeOn = highlightMode;
-		optionsHolder = _optionsHolder;
-	}
-
-	private boolean isHighlightModeOn = false;
-	private DialectOptionHolder optionsHolder;
-	private int tagCount = 0;
-
-	public final int getTagCount()
-	{
-		return tagCount;
-	}
-
-	public final void setTagCount(int _tagCount)
-	{
-		tagCount = _tagCount;
-	}
-
-
-	_JavaScriptLexer(java.io.Reader in)
-	{
-		this.zzReader = in;
-	}
-
-	/**
-	 * Creates a new scanner.
-	 * There is also java.io.Reader version of this constructor.
-	 *
-	 * @param in the java.io.Inputstream to read input from.
-	 */
-	_JavaScriptLexer(java.io.InputStream in)
-	{
-		this(new java.io.InputStreamReader(in));
-	}
-
-	/**
-	 * Unpacks the compressed character translation table.
-	 *
-	 * @param packed the packed character translation table
-	 * @return the unpacked character translation table
-	 */
-	private static char[] zzUnpackCMap(String packed)
-	{
-		char[] map = new char[0x10000];
-		int i = 0;  /* index in packed string  */
-		int j = 0;  /* index in unpacked array */
-		while(i < 1800)
-		{
-			int count = packed.charAt(i++);
-			char value = packed.charAt(i++);
-			do
-			{
-				map[j++] = value;
-			}
-			while(--count > 0);
-		}
-		return map;
-	}
-
-	@Override
-	public final int getTokenStart()
-	{
-		return zzStartRead;
-	}
-
-	@Override
-	public final int getTokenEnd()
-	{
-		return getTokenStart() + yylength();
-	}
-
-	@Override
-	public void reset(CharSequence buffer, int start, int end, int initialState)
-	{
-		zzBuffer = buffer;
-		zzBufferArray = com.intellij.util.text.CharArrayUtil.fromSequenceWithoutCopying(buffer);
-		zzCurrentPos = zzMarkedPos = zzStartRead = start;
-		zzPushbackPos = 0;
-		zzAtEOF = false;
-		zzAtBOL = true;
-		zzEndRead = end;
-		yybegin(initialState);
-	}
-
-	// For Demetra compatibility
-	public void reset(CharSequence buffer, int initialState)
-	{
-		zzBuffer = buffer;
-		zzBufferArray = null;
-		zzCurrentPos = zzMarkedPos = zzStartRead = 0;
-		zzPushbackPos = 0;
-		zzAtEOF = false;
-		zzAtBOL = true;
-		zzEndRead = buffer.length();
-		yybegin(initialState);
-	}
-
-	/**
-	 * Refills the input buffer.
-	 *
-	 * @return <code>false</code>, iff there was new input.
-	 * @throws java.io.IOException if any I/O-Error occurs
-	 */
-	private boolean zzRefill() throws java.io.IOException
-	{
-		return true;
-	}
-
-
-	/**
-	 * Returns the current lexical state.
-	 */
-	@Override
-	public final int yystate()
-	{
-		return zzLexicalState;
-	}
-
-
-	/**
-	 * Enters a new lexical state
-	 *
-	 * @param newState the new lexical state
-	 */
-	@Override
-	public final void yybegin(int newState)
-	{
-		zzLexicalState = newState;
-	}
-
-
-	/**
-	 * Returns the text matched by the current regular expression.
-	 */
-	public final CharSequence yytext()
-	{
-		return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-	}
-
-
-	/**
-	 * Returns the character at position <tt>pos</tt> from the
-	 * matched text.
-	 * <p/>
-	 * It is equivalent to yytext().charAt(pos), but faster
-	 *
-	 * @param pos the position of the character to fetch.
-	 *            A value from 0 to yylength()-1.
-	 * @return the character at position pos
-	 */
-	public final char yycharat(int pos)
-	{
-		return zzBufferArray != null ? zzBufferArray[zzStartRead + pos] : zzBuffer.charAt(zzStartRead + pos);
-	}
-
-
-	/**
-	 * Returns the length of the matched text region.
-	 */
-	public final int yylength()
-	{
-		return zzMarkedPos - zzStartRead;
-	}
-
-
-	/**
-	 * Reports an error that occured while scanning.
-	 * <p/>
-	 * In a wellformed scanner (no or only correct usage of
-	 * yypushback(int) and a match-all fallback rule) this method
-	 * will only be called with things that "Can't Possibly Happen".
-	 * If this method is called, something is seriously wrong
-	 * (e.g. a JFlex bug producing a faulty scanner etc.).
-	 * <p/>
-	 * Usual syntax/scanner level error handling should be done
-	 * in error fallback rules.
-	 *
-	 * @param errorCode the code of the errormessage to display
-	 */
-	private void zzScanError(int errorCode)
-	{
-		String message;
-		try
-		{
-			message = ZZ_ERROR_MSG[errorCode];
-		}
-		catch(ArrayIndexOutOfBoundsException e)
-		{
-			message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-		}
-
-		throw new Error(message);
-	}
-
-
-	/**
-	 * Pushes the specified amount of characters back into the input stream.
-	 * <p/>
-	 * They will be read again by then next call of the scanning method
-	 *
-	 * @param number the number of characters to be read again.
-	 *               This number must not be greater than yylength()!
-	 */
-	public void yypushback(int number)
-	{
-		if(number > yylength())
-		{
-			zzScanError(ZZ_PUSHBACK_2BIG);
-		}
-
-		zzMarkedPos -= number;
-	}
-
-
-	/**
-	 * Contains user EOF-code, which will be executed exactly once,
-	 * when the end of file is reached
-	 */
-	private void zzDoEOF()
-	{
-		if(!zzEOFDone)
-		{
-			zzEOFDone = true;
-
-		}
-	}
-
-
-	/**
-	 * Resumes scanning until the next regular expression is matched,
-	 * the end of input is encountered or an I/O-Error occurs.
-	 *
-	 * @return the next token
-	 * @throws java.io.IOException if any I/O-Error occurs
-	 */
-	@Override
-	public IElementType advance() throws java.io.IOException
-	{
-		int zzInput;
-		int zzAction;
-
-		// cached fields:
-		int zzCurrentPosL;
-		int zzMarkedPosL;
-		int zzEndReadL = zzEndRead;
-		CharSequence zzBufferL = zzBuffer;
-		char[] zzBufferArrayL = zzBufferArray;
-		char[] zzCMapL = ZZ_CMAP;
-
-		int[] zzTransL = ZZ_TRANS;
-		int[] zzRowMapL = ZZ_ROWMAP;
-		int[] zzAttrL = ZZ_ATTRIBUTE;
-
-		while(true)
-		{
-			zzMarkedPosL = zzMarkedPos;
-
-			zzAction = -1;
-
-			zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-
-			zzState = zzLexicalState;
-
-
-			zzForAction:
-			{
-				while(true)
-				{
-
-					if(zzCurrentPosL < zzEndReadL)
-					{
-						zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++);
-					}
-					else if(zzAtEOF)
-					{
-						zzInput = YYEOF;
-						break zzForAction;
-					}
-					else
-					{
-						// store back cached positions
-						zzCurrentPos = zzCurrentPosL;
-						zzMarkedPos = zzMarkedPosL;
-						boolean eof = zzRefill();
-						// get translated positions and possibly new buffer
-						zzCurrentPosL = zzCurrentPos;
-						zzMarkedPosL = zzMarkedPos;
-						zzBufferL = zzBuffer;
-						zzEndReadL = zzEndRead;
-						if(eof)
-						{
-							zzInput = YYEOF;
-							break zzForAction;
-						}
-						else
-						{
-							zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++);
-						}
-					}
-					int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]];
-					if(zzNext == -1)
-					{
-						break zzForAction;
-					}
-					zzState = zzNext;
-
-					int zzAttributes = zzAttrL[zzState];
-					if((zzAttributes & 1) == 1)
-					{
-						zzAction = zzState;
-						zzMarkedPosL = zzCurrentPosL;
-						if((zzAttributes & 8) == 8)
-						{
-							break zzForAction;
-						}
-					}
-
-				}
-			}
-
-			// store back cached position
-			zzMarkedPos = zzMarkedPosL;
-
-			switch(zzAction < 0 ? zzAction : ZZ_ACTION[zzAction])
-			{
-				case 127:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.FALSE_KEYWORD;
-				}
-				case 167:
-					break;
-				case 103:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.USE_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 168:
-					break;
-				case 73:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.EQEQ;
-				}
-				case 169:
-					break;
-				case 124:
-				{
-					return JSTokenTypes.UINT_KEYWORD;
-				}
-				case 170:
-					break;
-				case 33:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.DIV;
-				}
-				case 171:
-					break;
-				case 7:
-				{
-					if(optionsHolder.hasE4X)
-					{
-						yybegin(DIV_OR_GT);
-						return JSTokenTypes.ANY_IDENTIFIER;
-					}
-					else
-					{
-						return JSTokenTypes.MULT;
-					}
-				}
-				case 172:
-					break;
-				case 18:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.GT;
-				}
-				case 173:
-					break;
-				case 102:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.TRY_KEYWORD;
-				}
-				case 174:
-					break;
-				case 140:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.NATIVE_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 175:
-					break;
-				case 96:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isJavaScript1_6_OrBetter ? JSTokenTypes.GET_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 176:
-					break;
-				case 2:
-				{
-					return JSTokenTypes.XML_ATTR_VALUE;
-				}
-				case 177:
-					break;
-				case 28:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.OR;
-				}
-				case 178:
-					break;
-				case 47:
-				{
-					return JSTokenTypes.XML_NAME;
-				}
-				case 179:
-					break;
-				case 117:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.UINT_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 180:
-					break;
-				case 98:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.GTGTGT;
-				}
-				case 181:
-					break;
-				case 55:
-				{
-					yybegin(TAG_ATTRIBUTES);
-					return JSTokenTypes.XML_ATTR_VALUE_END;
-				}
-				case 182:
-					break;
-				case 137:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.RETURN_KEYWORD;
-				}
-				case 183:
-					break;
-				case 90:
-				{
-					return JSTokenTypes.XML_JS_SCRIPT;
-				}
-				case 184:
-					break;
-				case 123:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.VOID_KEYWORD;
-				}
-				case 185:
-					break;
-				case 72:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.ANDEQ;
-				}
-				case 186:
-					break;
-				case 84:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.MULTEQ;
-				}
-				case 187:
-					break;
-				case 116:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.THIS_KEYWORD;
-				}
-				case 188:
-					break;
-				case 23:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.QUEST;
-				}
-				case 189:
-					break;
-				case 129:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.SUPER_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 190:
-					break;
-				case 92:
-				{
-					return JSTokenTypes.COLON_COLON;
-				}
-				case 191:
-					break;
-				case 108:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.INT_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 192:
-					break;
-				case 16:
-				{
-					if(optionsHolder.hasE4X)
-					{
-						tagCount = 0;
-						yybegin(TAG);
-						yypushback(yylength());
-					}
-					else
-					{
-						return JSTokenTypes.LT;
-					}
-				}
-				case 193:
-					break;
-				case 161:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.UNDEFINED_KEYWORD;
-				}
-				case 194:
-					break;
-				case 60:
-				{
-					return JSTokenTypes.END_OF_LINE_COMMENT;
-				}
-				case 195:
-					break;
-				case 54:
-				{
-					yybegin(tagCount == 0 ? YYINITIAL : TAG_CONTENT);
-					return JSTokenTypes.XML_TAG_END;
-				}
-				case 196:
-					break;
-				case 71:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.ANDAND;
-				}
-				case 197:
-					break;
-				case 62:
-				{
-					if(optionsHolder.hasE4X)
-					{
-						yybegin(YYINITIAL);
-						return JSTokenTypes.DOT_DOT;
-					}
-					else
-					{
-						yypushback(yylength() - 1);
-						return JSTokenTypes.DOT;
-					}
-				}
-				case 198:
-					break;
-				case 83:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.DIVEQ;
-				}
-				case 199:
-					break;
-				case 143:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.PUBLIC_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 200:
-					break;
-				case 89:
-				{
-					yybegin(TAG_ATTRIBUTES);
-					return JSTokenTypes.XML_JS_SCRIPT;
-				}
-				case 201:
-					break;
-				case 138:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.STATIC_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 202:
-					break;
-				case 153:
-				{
-					return JSTokenTypes.XML_STYLE_COMMENT;
-				}
-				case 203:
-					break;
-				case 70:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.GE;
-				}
-				case 204:
-					break;
-				case 80:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.OROR;
-				}
-				case 205:
-					break;
-				case 135:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.WHILE_KEYWORD;
-				}
-				case 206:
-					break;
-				case 15:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.COLON;
-				}
-				case 207:
-					break;
-				case 44:
-				{
-					yybegin(TAG_ATTRIBUTES);
-					return JSTokenTypes.XML_TAG_NAME;
-				}
-				case 208:
-					break;
-				case 48:
-				{
-					return isHighlightModeOn ? JSTokenTypes.XML_TAG_WHITE_SPACE : JSTokenTypes.WHITE_SPACE;
-				}
-				case 209:
-					break;
-				case 65:
-				{
-					return JSTokenTypes.MINUSMINUS;
-				}
-				case 210:
-					break;
-				case 118:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.hasE4X ? JSTokenTypes.EACH_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 211:
-					break;
-				case 24:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.AND;
-				}
-				case 212:
-					break;
-				case 26:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.EQ;
-				}
-				case 213:
-					break;
-				case 53:
-				{
-					return JSTokenTypes.XML_TAG_NAME;
-				}
-				case 214:
-					break;
-				case 94:
-				{
-					if(optionsHolder.isECMAL4Level)
-					{
-						yybegin(YYINITIAL);
-						return JSTokenTypes.DOT_DOT_DOT;
-					}
-					else
-					{
-						yypushback(yylength() - 1);
-						return JSTokenTypes.DOT;
-					}
-				}
-				case 215:
-					break;
-				case 122:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.WITH_KEYWORD;
-				}
-				case 216:
-					break;
-				case 22:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.RBRACE;
-				}
-				case 217:
-					break;
-				case 87:
-				{
-					yybegin(--tagCount == 0 ? YYINITIAL : TAG_CONTENT);
-					return JSTokenTypes.XML_EMPTY_TAG_END;
-				}
-				case 218:
-					break;
-				case 1:
-				{
-					return JSTokenTypes.XML_TAG_CONTENT;
-				}
-				case 219:
-					break;
-				case 142:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.IMPORT_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 220:
-					break;
-				case 146:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.FINALLY_KEYWORD;
-				}
-				case 221:
-					break;
-				case 58:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.GWT_FIELD_OR_METHOD;
-				}
-				case 222:
-					break;
-				case 166:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.IMPLEMENTS_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 223:
-					break;
-				case 37:
-				{
-					return JSTokenTypes.IDENTIFIER;
-				}
-				case 224:
-					break;
-				case 164:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.PROTECTED_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 225:
-					break;
-				case 43:
-				{
-					return JSTokenTypes.BAD_CHARACTER;
-				}
-				case 226:
-					break;
-				case 145:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.EXTENDS_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 227:
-					break;
-				case 99:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.GTGTEQ;
-				}
-				case 228:
-					break;
-				case 21:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.LBRACE;
-				}
-				case 229:
-					break;
-				case 38:
-				{
-					return JSTokenTypes.DOT;
-				}
-				case 230:
-					break;
-				case 162:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.NAMESPACE_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 231:
-					break;
-				case 130:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.BREAK_KEYWORD;
-				}
-				case 232:
-					break;
-				case 36:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.BAD_CHARACTER;
-				}
-				case 233:
-					break;
-				case 79:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.OREQ;
-				}
-				case 234:
-					break;
-				case 105:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isJavaScript1_7_OrBetter ? JSTokenTypes.LET_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 235:
-					break;
-				case 75:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.DO_KEYWORD;
-				}
-				case 236:
-					break;
-				case 107:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.NEW_KEYWORD;
-				}
-				case 237:
-					break;
-				case 39:
-				{
-					++tagCount;
-					return JSTokenTypes.LT;
-				}
-				case 238:
-					break;
-				case 10:
-				{
-					yybegin(DIV_OR_GT);
-					return isHighlightModeOn ? JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL : JSTokenTypes.STRING_LITERAL;
-				}
-				case 239:
-					break;
-				case 132:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.CLASS_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 240:
-					break;
-				case 134:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isJavaScript1_7_OrBetter ? JSTokenTypes.YIELD_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 241:
-					break;
-				case 35:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.LT;
-				}
-				case 242:
-					break;
-				case 6:
-				{
-					return JSTokenTypes.WHITE_SPACE;
-				}
-				case 243:
-					break;
-				case 61:
-				{
-					return JSTokenTypes.C_STYLE_COMMENT;
-				}
-				case 244:
-					break;
-				case 160:
-				{
-					yybegin(COMMENT);
-					yypushback(yylength());
-				}
-				case 245:
-					break;
-				case 14:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.MINUS;
-				}
-				case 246:
-					break;
-				case 111:
-				{
-					return JSTokenTypes.INT_KEYWORD;
-				}
-				case 247:
-					break;
-				case 9:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.PLUS;
-				}
-				case 248:
-					break;
-				case 27:
-				{
-					if(optionsHolder.hasE4X || optionsHolder.isGwt)
-					{
-						return JSTokenTypes.AT;
-					}
-					else
-					{
-						return JSTokenTypes.BAD_CHARACTER;
-					}
-				}
-				case 249:
-					break;
-				case 131:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.CATCH_KEYWORD;
-				}
-				case 250:
-					break;
-				case 5:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.IDENTIFIER;
-				}
-				case 251:
-					break;
-				case 8:
-				{
-					yybegin(optionsHolder.isECMAL4Level ? MAY_BE_GENERIC_SIGNATURE : YYINITIAL);
-					return JSTokenTypes.DOT;
-				}
-				case 252:
-					break;
-				case 67:
-				{
-					if(optionsHolder.isGwt)
-					{
-						yypushback(yylength());
-						yybegin(GWT_FIELD_OR_METHOD);
-					}
-					else if(optionsHolder.hasE4X)
-					{
-						yybegin(YYINITIAL);
-						return JSTokenTypes.COLON_COLON;
-					}
-					else
-					{
-						yypushback(yylength() - 1);
-						return JSTokenTypes.COLON;
-					}
-				}
-				case 253:
-					break;
-				case 31:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.COMMA;
-				}
-				case 254:
-					break;
-				case 158:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.OVERRIDE_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 255:
-					break;
-				case 126:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.THROW_KEYWORD;
-				}
-				case 256:
-					break;
-				case 57:
-				{
-					yypushback(yylength());
-					yybegin(YYINITIAL);
-				}
-				case 257:
-					break;
-				case 63:
-				{
-					return JSTokenTypes.PLUSPLUS;
-				}
-				case 258:
-					break;
-				case 104:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.FOR_KEYWORD;
-				}
-				case 259:
-					break;
-				case 93:
-				{
-					return JSTokenTypes.DOC_COMMENT;
-				}
-				case 260:
-					break;
-				case 82:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.PERCEQ;
-				}
-				case 261:
-					break;
-				case 100:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.EQEQEQ;
-				}
-				case 262:
-					break;
-				case 159:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.CDATA_START;
-				}
-				case 263:
-					break;
-				case 128:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.FINAL_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 264:
-					break;
-				case 91:
-				{
-					tagCount--;
-					yybegin(TAG_END);
-					return JSTokenTypes.XML_END_TAG_START;
-				}
-				case 265:
-					break;
-				case 3:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.BAD_CHARACTER;
-				}
-				case 266:
-					break;
-				case 29:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.XOR;
-				}
-				case 267:
-					break;
-				case 88:
-				{
-					tagCount++;
-					yybegin(TAG_CONTENT);
-					return JSTokenTypes.XML_START_TAG_LIST;
-				}
-				case 268:
-					break;
-				case 115:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.TRUE_KEYWORD;
-				}
-				case 269:
-					break;
-				case 154:
-				{
-					if(optionsHolder.isECMAL4Level)
-					{
-						yybegin(YYINITIAL);
-						return JSTokenTypes.INCLUDE_KEYWORD;
-					}
-					else
-					{
-						yypushback(yylength() - 1);
-						return JSTokenTypes.BAD_CHARACTER;
-					}
-				}
-				case 270:
-					break;
-				case 101:
-				{
-					return JSTokenTypes.JSP_TEXT;
-				}
-				case 271:
-					break;
-				case 42:
-				{
-					yybegin(GENERIC_SIGNATURE);
-					tagCount = 1;
-					return JSTokenTypes.LT;
-				}
-				case 272:
-					break;
-				case 155:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.FUNCTION_KEYWORD;
-				}
-				case 273:
-					break;
-				case 68:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.NE;
-				}
-				case 274:
-					break;
-				case 32:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.TILDE;
-				}
-				case 275:
-					break;
-				case 66:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.MINUSEQ;
-				}
-				case 276:
-					break;
-				case 148:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.DYNAMIC_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 277:
-					break;
-				case 86:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.LE;
-				}
-				case 278:
-					break;
-				case 121:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.CASE_KEYWORD;
-				}
-				case 279:
-					break;
-				case 78:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.IN_KEYWORD;
-				}
-				case 280:
-					break;
-				case 4:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.NUMERIC_LITERAL;
-				}
-				case 281:
-					break;
-				case 119:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.ELSE_KEYWORD;
-				}
-				case 282:
-					break;
-				case 59:
-				{
-					return JSTokenTypes.REGEXP_LITERAL;
-				}
-				case 283:
-					break;
-				case 46:
-				{
-					yybegin(TAG);
-					yypushback(yylength());
-				}
-				case 284:
-					break;
-				case 150:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.PRIVATE_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 285:
-					break;
-				case 139:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.SWITCH_KEYWORD;
-				}
-				case 286:
-					break;
-				case 151:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.PACKAGE_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 287:
-					break;
-				case 56:
-				{
-					yybegin(YYINITIAL);
-					yypushback(1);
-				}
-				case 288:
-					break;
-				case 147:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.DEFAULT_KEYWORD;
-				}
-				case 289:
-					break;
-				case 157:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.CONTINUE_KEYWORD;
-				}
-				case 290:
-					break;
-				case 152:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.VIRTUAL_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 291:
-					break;
-				case 52:
-				{
-					return JSTokenTypes.XML_ATTR_EQUAL;
-				}
-				case 292:
-					break;
-				case 19:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.LPAR;
-				}
-				case 293:
-					break;
-				case 41:
-				{
-					yypushback(yylength());
-					yybegin(YYINITIAL);
-				}
-				case 294:
-					break;
-				case 109:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.VAR_KEYWORD;
-				}
-				case 295:
-					break;
-				case 34:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.MULT;
-				}
-				case 296:
-					break;
-				case 30:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.PERC;
-				}
-				case 297:
-					break;
-				case 40:
-				{
-					--tagCount;
-					if(tagCount == 0)
-					{
-						yybegin(YYINITIAL);
-					}
-					return JSTokenTypes.GT;
-				}
-				case 298:
-					break;
-				case 81:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.XOREQ;
-				}
-				case 299:
-					break;
-				case 13:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.RBRACKET;
-				}
-				case 300:
-					break;
-				case 69:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.GTGT;
-				}
-				case 301:
-					break;
-				case 97:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.NEQEQ;
-				}
-				case 302:
-					break;
-				case 133:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.CONST_KEYWORD;
-				}
-				case 303:
-					break;
-				case 136:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.TYPEOF_KEYWORD;
-				}
-				case 304:
-					break;
-				case 51:
-				{
-					yybegin(TAG_CONTENT);
-					return JSTokenTypes.XML_TAG_END;
-				}
-				case 305:
-					break;
-				case 50:
-				{
-					yybegin(TAG_ATTR_DQ);
-					return JSTokenTypes.XML_ATTR_VALUE_START;
-				}
-				case 306:
-					break;
-				case 110:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.LTLTEQ;
-				}
-				case 307:
-					break;
-				case 85:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.LTLT;
-				}
-				case 308:
-					break;
-				case 149:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.INCLUDE_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 309:
-					break;
-				case 163:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.INTERFACE_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 310:
-					break;
-				case 20:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.RPAR;
-				}
-				case 311:
-					break;
-				case 74:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.AS_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 312:
-					break;
-				case 25:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.SEMICOLON;
-				}
-				case 313:
-					break;
-				case 156:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.INTERNAL_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 314:
-					break;
-				case 95:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.CDATA_END;
-				}
-				case 315:
-					break;
-				case 64:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.PLUSEQ;
-				}
-				case 316:
-					break;
-				case 106:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isJavaScript1_6_OrBetter ? JSTokenTypes.SET_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 317:
-					break;
-				case 125:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.XML_STYLE_COMMENT_START;
-				}
-				case 318:
-					break;
-				case 141:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.DELETE_KEYWORD;
-				}
-				case 319:
-					break;
-				case 112:
-				{
-					tagCount--;
-					yybegin(YYINITIAL);
-					return JSTokenTypes.XML_END_TAG_LIST;
-				}
-				case 320:
-					break;
-				case 45:
-				{
-					tagCount++;
-					yybegin(TAG);
-					return JSTokenTypes.XML_START_TAG_START;
-				}
-				case 321:
-					break;
-				case 12:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.LBRACKET;
-				}
-				case 322:
-					break;
-				case 17:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.EXCL;
-				}
-				case 323:
-					break;
-				case 49:
-				{
-					yybegin(TAG_ATTR_SQ);
-					return JSTokenTypes.XML_ATTR_VALUE_START;
-				}
-				case 324:
-					break;
-				case 11:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.STRING_LITERAL;
-				}
-				case 325:
-					break;
-				case 77:
-				{
-					yybegin(YYINITIAL);
-					return optionsHolder.isECMAL4Level ? JSTokenTypes.IS_KEYWORD : JSTokenTypes.IDENTIFIER;
-				}
-				case 326:
-					break;
-				case 165:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.INSTANCEOF_KEYWORD;
-				}
-				case 327:
-					break;
-				case 76:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.IF_KEYWORD;
-				}
-				case 328:
-					break;
-				case 113:
-				{
-					return JSTokenTypes.XML_ENTITY_REF;
-				}
-				case 329:
-					break;
-				case 114:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.GTGTGTEQ;
-				}
-				case 330:
-					break;
-				case 120:
-				{
-					yybegin(DIV_OR_GT);
-					return JSTokenTypes.NULL_KEYWORD;
-				}
-				case 331:
-					break;
-				case 144:
-				{
-					yybegin(YYINITIAL);
-					return JSTokenTypes.XML_STYLE_COMMENT;
-				}
-				case 332:
-					break;
-				default:
-					if(zzInput == YYEOF && zzStartRead == zzCurrentPos)
-					{
-						zzAtEOF = true;
-						zzDoEOF();
-						return null;
-					}
-					else
-					{
-						zzScanError(ZZ_NO_MATCH);
-					}
-			}
-		}
-	}
-
-
-}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
index 8f078bdb..81fd408c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
@@ -21,11 +21,7 @@
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript._JSDocLexer;
-import com.intellij.lexer.FlexAdapter;
-import com.intellij.lexer.LayeredLexer;
-import com.intellij.lexer.Lexer;
-import com.intellij.lexer.LexerBase;
-import com.intellij.lexer.StringLiteralLexer;
+import com.intellij.lexer.*;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
 import com.intellij.openapi.util.Factory;
 import com.intellij.psi.tree.IElementType;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
index 223ca200..b81c3552 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -1,13 +1,13 @@
 package consulo.javascript.lang;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScript15Lexer;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 05.03.2015
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
new file mode 100644
index 00000000..424ffcf7
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
@@ -0,0 +1,37 @@
+package consulo.javascript.lang;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.intellij.lang.javascript.JSElementType;
+import com.intellij.psi.tree.IElementType;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public class JavaScriptContextKeywordElementType extends JSElementType
+{
+	private static final BiMap<String, IElementType> ourCache = HashBiMap.create();
+
+	@Nullable
+	public static IElementType getKeywordByText(String text)
+	{
+		return ourCache.get(text);
+	}
+
+	public static boolean containsKeyword(@Nonnull IElementType e)
+	{
+		return ourCache.inverse().containsKey(e);
+	}
+
+	public JavaScriptContextKeywordElementType(@NonNls @Nonnull String id, @Nonnull String keyword)
+	{
+		super(id);
+
+		ourCache.put(keyword, this);
+	}
+}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java
deleted file mode 100644
index 348f90af..00000000
--- a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript15Lexer.java
+++ /dev/null
@@ -1,1193 +0,0 @@
-/* The following code was generated by JFlex 1.4.4 on 9/3/16 9:50 PM */
-
-package consulo.javascript.lang.lexer;
-
-import com.intellij.lexer.LexerBase;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.lang.javascript.JSTokenTypes;
-
-
-/**
- * This class is a scanner generated by 
- * <a href="http://www.jflex.de/">JFlex</a> 1.4.4
- * on 9/3/16 9:50 PM from the specification file
- * <tt>R:/_github.com/consulo/consulo-javascript/src/consulo/javascript/lang/lexer/javascript15.flex</tt>
- */
-public class JavaScript15Lexer extends LexerBase {
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 16384;
-
-  /** lexical states */
-  public static final int DIV_OR_GT = 2;
-  public static final int YYINITIAL = 0;
-
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = { 
-     0,  0,  1, 1
-  };
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final String ZZ_CMAP_PACKED = 
-    "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\53"+
-    "\1\21\1\0\1\4\1\62\1\57\1\17\1\63\1\64\1\7\1\54"+
-    "\1\70\1\15\1\13\1\6\1\11\7\1\2\1\1\73\1\67\1\55"+
-    "\1\52\1\56\1\72\1\0\4\2\1\14\1\2\21\4\1\12\2\4"+
-    "\1\22\1\20\1\23\1\61\1\4\1\0\1\33\1\41\1\43\1\37"+
-    "\1\31\1\32\1\24\1\44\1\40\1\4\1\42\1\34\1\24\1\36"+
-    "\1\45\1\50\1\4\1\27\1\35\1\26\1\30\1\51\1\47\1\25"+
-    "\1\46\1\4\1\65\1\60\1\66\1\71\41\5\2\0\4\4\4\0"+
-    "\1\4\2\0\1\5\7\0\1\4\4\0\1\4\5\0\27\4\1\0"+
-    "\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4\16\0\5\4\11\0"+
-    "\1\4\21\0\130\5\5\0\23\5\12\0\1\4\13\0\1\4\1\0"+
-    "\3\4\1\0\1\4\1\0\24\4\1\0\54\4\1\0\46\4\1\0"+
-    "\5\4\4\0\202\4\1\0\4\5\3\0\105\4\1\0\46\4\2\0"+
-    "\2\4\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4\11\0"+
-    "\21\5\1\0\27\5\1\0\3\5\1\0\1\5\1\0\2\5\1\0"+
-    "\1\5\13\0\33\4\5\0\3\4\15\0\4\5\14\0\6\5\13\0"+
-    "\32\4\5\0\13\4\16\5\7\0\12\5\4\0\2\4\1\5\143\4"+
-    "\1\0\1\4\10\5\1\0\6\5\2\4\2\5\1\0\4\5\2\4"+
-    "\12\5\3\4\2\0\1\4\17\0\1\5\1\4\1\5\36\4\33\5"+
-    "\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0\3\5\66\4\2\0"+
-    "\1\5\1\4\20\5\2\0\1\4\4\5\3\0\12\4\2\5\2\0"+
-    "\12\5\21\0\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0"+
-    "\7\4\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0"+
-    "\2\5\2\0\3\5\11\0\1\5\4\0\2\4\1\0\3\4\2\5"+
-    "\2\0\12\5\4\4\15\0\3\5\1\0\6\4\4\0\2\4\2\0"+
-    "\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0\2\4\2\0"+
-    "\1\5\1\0\5\5\4\0\2\5\2\0\3\5\13\0\4\4\1\0"+
-    "\1\4\7\0\14\5\3\4\14\0\3\5\1\0\11\4\1\0\3\4"+
-    "\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5"+
-    "\1\4\10\5\1\0\3\5\1\0\3\5\2\0\1\4\17\0\2\4"+
-    "\2\5\2\0\12\5\1\0\1\4\17\0\3\5\1\0\10\4\2\0"+
-    "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0"+
-    "\1\5\1\4\6\5\3\0\2\5\2\0\3\5\10\0\2\5\4\0"+
-    "\2\4\1\0\3\4\4\0\12\5\1\0\1\4\20\0\1\5\1\4"+
-    "\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4"+
-    "\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4\1\0\3\4"+
-    "\4\0\5\5\3\0\3\5\1\0\4\5\11\0\1\5\17\0\11\5"+
-    "\11\0\1\4\7\0\3\5\1\0\10\4\1\0\3\4\1\0\27\4"+
-    "\1\0\12\4\1\0\5\4\4\0\7\5\1\0\3\5\1\0\4\5"+
-    "\7\0\2\5\11\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4"+
-    "\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4\2\0\1\5"+
-    "\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5\7\0\1\4"+
-    "\1\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4\1\0\3\4"+
-    "\1\0\27\4\1\0\20\4\4\0\6\5\2\0\3\5\1\0\4\5"+
-    "\11\0\1\5\10\0\2\4\4\0\12\5\22\0\2\5\1\0\22\4"+
-    "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5"+
-    "\4\0\6\5\1\0\1\5\1\0\10\5\22\0\2\5\15\0\60\4"+
-    "\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5\47\0\2\4"+
-    "\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4"+
-    "\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4"+
-    "\1\0\4\4\1\5\2\4\6\5\1\0\2\5\1\4\2\0\5\4"+
-    "\1\0\1\4\1\0\6\5\2\0\12\5\2\0\2\4\42\0\1\4"+
-    "\27\0\2\5\6\0\12\5\13\0\1\5\1\0\1\5\1\0\1\5"+
-    "\4\0\2\5\10\4\1\0\42\4\6\0\24\5\1\0\2\5\4\4"+
-    "\4\0\10\5\1\0\44\5\11\0\1\5\71\0\42\4\1\0\5\4"+
-    "\1\0\2\4\1\0\7\5\3\0\4\5\6\0\12\5\6\0\6\4"+
-    "\4\5\106\0\46\4\12\0\51\4\7\0\132\4\5\0\104\4\5\0"+
-    "\122\4\6\0\7\4\1\0\77\4\1\0\1\4\1\0\4\4\2\0"+
-    "\7\4\1\0\1\4\1\0\4\4\2\0\47\4\1\0\1\4\1\0"+
-    "\4\4\2\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0"+
-    "\1\4\1\0\4\4\2\0\7\4\1\0\7\4\1\0\27\4\1\0"+
-    "\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\47\4\1\0"+
-    "\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4\2\0\10\4\12\0"+
-    "\32\4\5\0\113\4\3\0\3\4\17\0\15\4\1\0\4\4\3\5"+
-    "\13\0\22\4\3\5\13\0\22\4\2\5\14\0\15\4\1\0\3\4"+
-    "\1\0\2\5\14\0\64\4\40\5\3\0\1\4\3\0\2\4\1\5"+
-    "\2\0\12\5\41\0\3\5\2\0\12\5\6\0\130\4\10\0\51\4"+
-    "\1\5\126\0\35\4\3\0\14\5\4\0\14\5\12\0\12\5\36\4"+
-    "\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0\132\4\6\0\26\4"+
-    "\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4\1\0\1\4"+
-    "\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4\1\0\7\4"+
-    "\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4\2\0\6\4"+
-    "\4\0\15\4\5\0\3\4\1\0\7\4\17\0\4\5\32\0\5\5"+
-    "\20\0\2\4\23\0\1\4\13\0\4\5\6\0\6\5\1\0\1\4"+
-    "\15\0\1\4\40\0\22\4\36\0\15\5\4\0\1\5\3\0\6\5"+
-    "\27\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4"+
-    "\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4\1\0\3\4"+
-    "\1\0\7\4\3\0\3\4\5\0\5\4\26\0\44\4\u0e81\0\3\4"+
-    "\31\0\11\4\6\5\1\0\5\4\2\0\5\4\4\0\126\4\2\0"+
-    "\2\5\2\0\3\4\1\0\137\4\5\0\50\4\4\0\136\4\21\0"+
-    "\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0"+
-    "\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4\5\0"+
-    "\1\4\1\5\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0"+
-    "\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0"+
-    "\66\4\50\0\15\4\3\0\20\5\20\0\4\5\17\0\2\4\30\0"+
-    "\3\4\31\0\1\4\6\0\5\4\1\0\207\4\2\0\1\5\4\0"+
-    "\1\4\13\0\12\5\7\0\32\4\4\0\1\4\1\0\32\4\12\0"+
-    "\132\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0\3\4\3\0"+
-    "\2\4\3\0\2\4\22\0\3\5\4\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\2\0\1\1\1\2\1\3\1\4\1\5\1\6\1\2"+
-    "\1\7\1\10\1\11\1\12\1\13\1\14\15\3\1\15"+
-    "\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25"+
-    "\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35"+
-    "\1\36\1\6\1\37\2\2\1\40\1\41\1\42\1\0"+
-    "\1\40\1\2\1\43\1\44\2\11\2\12\16\3\1\45"+
-    "\1\46\1\47\7\3\1\50\1\51\1\52\1\53\1\54"+
-    "\1\55\1\56\1\57\1\60\1\61\1\62\1\63\1\64"+
-    "\1\65\1\66\1\67\1\2\1\40\1\42\1\70\1\40"+
-    "\2\0\2\11\2\12\1\3\1\71\11\3\1\72\2\3"+
-    "\1\73\11\3\1\74\1\3\1\75\1\76\1\77\1\100"+
-    "\1\101\1\0\2\70\1\102\1\3\1\103\3\3\1\104"+
-    "\4\3\1\105\5\3\1\106\2\3\1\107\1\3\1\110"+
-    "\1\111\1\42\1\0\1\112\4\3\1\113\5\3\1\114"+
-    "\1\115\1\3\1\116\1\117\1\120\1\121\3\3\1\122"+
-    "\1\3\1\123\4\3\1\124\1\125\3\3\1\126\1\3"+
-    "\1\127\1\130\1\3\1\131";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[212];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\74\0\170\0\264\0\360\0\u012c\0\u0168\0\170"+
-    "\0\u01a4\0\u01e0\0\u021c\0\u0258\0\u0294\0\170\0\170\0\u02d0"+
-    "\0\u030c\0\u0348\0\u0384\0\u03c0\0\u03fc\0\u0438\0\u0474\0\u04b0"+
-    "\0\u04ec\0\u0528\0\u0564\0\u05a0\0\u05dc\0\u0618\0\u0654\0\u0690"+
-    "\0\u06cc\0\u0708\0\u0744\0\u0780\0\170\0\170\0\170\0\170"+
-    "\0\170\0\170\0\170\0\170\0\170\0\u07bc\0\u07f8\0\u0834"+
-    "\0\u0870\0\u08ac\0\u08e8\0\u0924\0\u0960\0\u099c\0\u09d8\0\u0a14"+
-    "\0\170\0\170\0\170\0\u0a50\0\u0a8c\0\170\0\u0ac8\0\u0b04"+
-    "\0\u0b40\0\u0b7c\0\u0bb8\0\u0bf4\0\u0c30\0\u0c6c\0\u0ca8\0\u0ce4"+
-    "\0\u0d20\0\u0d5c\0\u0d98\0\u0dd4\0\360\0\360\0\u0e10\0\u0e4c"+
-    "\0\u0e88\0\u0ec4\0\u0f00\0\u0f3c\0\u0f78\0\u0fb4\0\u0ff0\0\u102c"+
-    "\0\170\0\170\0\170\0\u1068\0\170\0\170\0\170\0\170"+
-    "\0\170\0\170\0\170\0\170\0\170\0\u10a4\0\u10e0\0\u111c"+
-    "\0\u1158\0\u1194\0\u11d0\0\u120c\0\u1248\0\u1284\0\u12c0\0\u12fc"+
-    "\0\u1338\0\u1374\0\360\0\u13b0\0\u13ec\0\u1428\0\u1464\0\u14a0"+
-    "\0\u14dc\0\u1518\0\u1554\0\u1590\0\360\0\u15cc\0\u1608\0\360"+
-    "\0\u1644\0\u1680\0\u16bc\0\u16f8\0\u1734\0\u1770\0\u17ac\0\u17e8"+
-    "\0\u1824\0\360\0\u1860\0\170\0\170\0\170\0\u189c\0\170"+
-    "\0\u18d8\0\u1914\0\170\0\360\0\u1950\0\360\0\u198c\0\u19c8"+
-    "\0\u1a04\0\360\0\u1a40\0\u1a7c\0\u1ab8\0\u1af4\0\360\0\u1b30"+
-    "\0\u1b6c\0\u1ba8\0\u1be4\0\u1c20\0\360\0\u1c5c\0\u1c98\0\360"+
-    "\0\u1cd4\0\360\0\170\0\170\0\u1d10\0\360\0\u1d4c\0\u1d88"+
-    "\0\u1dc4\0\u1e00\0\360\0\u1e3c\0\u1e78\0\u1eb4\0\u1ef0\0\u1f2c"+
-    "\0\360\0\360\0\u1f68\0\360\0\360\0\360\0\360\0\u1fa4"+
-    "\0\u1fe0\0\u201c\0\360\0\u2058\0\360\0\u2094\0\u20d0\0\u210c"+
-    "\0\u2148\0\360\0\360\0\u2184\0\u21c0\0\u21fc\0\360\0\u2238"+
-    "\0\360\0\360\0\u2274\0\360";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[212];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
-    }
-    return j;
-  }
-
-  /** 
-   * The transition table of the DFA
-   */
-  private static final int [] ZZ_TRANS = zzUnpackTrans();
-
-  private static final String ZZ_TRANS_PACKED_0 =
-    "\1\3\1\4\1\5\1\6\1\5\1\3\1\7\1\10"+
-    "\1\6\1\11\1\5\1\12\1\5\1\13\1\6\1\14"+
-    "\1\3\1\15\1\16\1\17\2\5\1\20\1\21\1\22"+
-    "\1\23\1\24\2\5\1\25\1\26\1\27\1\30\1\31"+
-    "\1\5\1\32\3\5\1\33\1\5\1\34\1\35\1\36"+
-    "\1\37\1\3\1\40\1\41\1\42\1\43\1\44\1\45"+
-    "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55"+
-    "\1\3\1\4\1\5\1\6\1\5\1\3\1\56\1\57"+
-    "\1\6\1\11\1\5\1\12\1\5\1\13\1\6\1\14"+
-    "\1\3\1\15\1\16\1\17\2\5\1\20\1\21\1\22"+
-    "\1\23\1\24\2\5\1\25\1\26\1\27\1\30\1\31"+
-    "\1\5\1\32\3\5\1\33\1\5\1\34\1\35\1\36"+
-    "\1\37\1\60\1\40\1\41\1\42\1\43\1\44\1\45"+
-    "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55"+
-    "\75\0\1\4\7\0\1\4\1\0\1\61\1\62\14\0"+
-    "\1\62\43\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\26\5\25\0\1\6\4\0\1\6\5\0"+
-    "\1\6\55\0\6\63\1\64\1\65\1\0\5\63\1\0"+
-    "\1\63\1\66\1\63\1\67\51\63\1\0\1\4\7\0"+
-    "\1\4\1\70\1\61\1\62\10\0\1\70\3\0\1\62"+
-    "\43\0\1\61\7\0\1\61\77\0\1\71\34\0\1\72"+
-    "\21\0\10\14\1\0\5\14\1\0\1\73\1\74\53\14"+
-    "\10\15\1\0\5\15\1\0\1\15\1\75\1\76\52\15"+
-    "\1\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\3\5\1\77\14\5\1\100\1\5\1\101\3\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\102\20\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\12\5\1\103\13\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\10\5\1\104\15\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\4\5\1\105\2\5"+
-    "\1\106\4\5\1\107\4\5\1\110\4\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\23\5"+
-    "\1\111\2\5\23\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\4\5\1\112\1\113\20\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\5\5\1\114\13\5\1\115\4\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\6\5\1\116"+
-    "\3\5\1\117\13\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\3\5\1\120\22\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\7\5\1\121\11\5\1\122\4\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\14\5\1\123"+
-    "\3\5\1\124\5\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\7\5\1\125\11\5\1\126"+
-    "\4\5\74\0\1\127\73\0\1\130\73\0\1\131\1\0"+
-    "\1\132\71\0\1\133\3\0\1\134\67\0\1\135\4\0"+
-    "\1\136\66\0\1\137\5\0\1\140\65\0\1\141\73\0"+
-    "\1\142\27\0\1\64\1\65\42\0\1\143\73\0\1\144"+
-    "\73\0\1\145\2\0\1\146\17\0\1\61\7\0\1\61"+
-    "\2\0\1\62\14\0\1\62\43\0\1\147\7\0\1\147"+
-    "\3\0\1\147\36\0\1\147\17\0\6\63\1\150\1\63"+
-    "\1\0\5\63\1\0\1\63\1\66\1\63\1\67\51\63"+
-    "\10\64\1\0\5\64\1\0\55\64\7\151\1\152\64\151"+
-    "\10\63\1\0\5\63\1\0\55\63\6\67\1\153\1\67"+
-    "\1\154\5\67\1\154\1\67\1\155\2\67\1\63\50\67"+
-    "\1\0\2\70\6\0\1\70\2\0\1\70\14\0\3\70"+
-    "\3\0\1\70\1\0\1\70\1\0\1\70\30\0\3\14"+
-    "\1\156\4\14\1\157\63\14\3\15\1\160\4\15\1\161"+
-    "\63\15\1\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\4\5\1\162\15\5\1\163\3\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\3\5\1\164\10\5\1\165\11\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\24\5\1\166"+
-    "\1\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\2\5\1\167\23\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\13\5\1\170"+
-    "\12\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\11\5\1\171\14\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\172"+
-    "\13\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\10\5\1\173\15\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\174"+
-    "\13\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\3\5\1\175\22\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\14\5\1\176"+
-    "\11\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\10\5\1\177\15\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\23\5\1\200"+
-    "\2\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\6\5\1\201\1\5\1\202\15\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\11\5\1\203\14\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\5\5\1\204\20\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\2\5\1\205\6\5\1\206\14\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\207"+
-    "\13\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\2\5\1\210\23\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\14\5\1\211"+
-    "\11\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\3\5\1\212\22\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\14\5\1\213"+
-    "\11\5\74\0\1\214\73\0\1\215\73\0\1\216\3\0"+
-    "\1\217\67\0\1\220\22\0\1\147\7\0\1\147\106\0"+
-    "\2\150\12\0\1\150\33\0\7\151\1\221\64\151\6\222"+
-    "\1\223\1\152\64\222\23\154\1\63\2\153\12\154\1\153"+
-    "\56\154\1\63\50\154\10\67\1\154\5\67\1\154\4\67"+
-    "\1\63\50\67\3\14\1\156\4\14\1\157\6\14\1\73"+
-    "\1\74\63\14\1\0\6\14\1\73\1\74\53\14\3\15"+
-    "\1\160\4\15\1\161\7\15\1\75\1\76\62\15\1\0"+
-    "\7\15\1\75\1\76\52\15\1\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\224\20\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\21\5\1\225\4\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\11\5\1\226\14\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\227\20\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\4\5\1\230\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\231\20\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\232\20\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\17\5\1\233\6\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\11\5\1\234\14\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\7\5\1\235\16\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\2\5\1\236\23\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\10\5\1\237\15\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\7\5\1\240\16\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\241\20\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\2\5\1\242\23\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\7\5\1\243\16\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\17\5\1\244\6\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\245\20\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\2\5\1\246\6\5"+
-    "\1\247\14\5\23\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\20\5\1\250\5\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\10\5"+
-    "\1\251\15\5\23\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\13\5\1\252\12\5\74\0\1\253"+
-    "\21\0\6\151\1\254\1\221\64\151\7\222\1\255\64\222"+
-    "\1\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\23\5\1\256\2\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\21\5\1\257\4\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\3\5\1\260\22\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\6\5\1\261\17\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\262\23\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\263\20\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\10\5\1\264\15\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\17\5\1\265\6\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\4\5\1\266\21\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\2\5\1\267\23\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\7\5\1\270\16\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\16\5\1\271\7\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\20\5\1\272\5\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\14\5\1\273\11\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\274\23\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\275\20\5"+
-    "\22\0\6\222\1\223\1\255\64\222\1\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\6\5\1\276"+
-    "\17\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\12\5\1\277\13\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\14\5\1\300"+
-    "\11\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\301\11\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\10\5\1\302"+
-    "\15\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\20\5\1\303\5\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\10\5\1\304"+
-    "\15\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\5\5\1\305\20\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\306"+
-    "\13\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\12\5\1\307\13\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\310"+
-    "\13\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\21\5\1\311\4\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\22\5\1\312"+
-    "\3\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\2\5\1\313\23\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\17\5\1\314"+
-    "\6\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\4\5\1\315\21\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\316"+
-    "\20\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\12\5\1\317\13\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\320"+
-    "\20\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\5\5\1\321\20\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\13\5\1\322"+
-    "\12\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\21\5\1\323\4\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\6\5\1\324"+
-    "\17\5\22\0";
-
-  private static int [] zzUnpackTrans() {
-    int [] result = new int[8880];
-    int offset = 0;
-    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackTrans(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-  private static final char[] EMPTY_BUFFER = new char[0];
-  private static final int YYEOF = -1;
-
-  /* error messages for the codes above */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\2\0\1\11\4\1\1\11\5\1\2\11\25\1\11\11"+
-    "\10\1\1\0\2\1\3\11\2\1\1\11\32\1\3\11"+
-    "\1\1\11\11\6\1\2\0\36\1\3\11\1\1\1\11"+
-    "\1\0\1\1\1\11\27\1\2\11\1\0\47\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[212];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-  /** the current state of the DFA */
-  private int zzState;
-
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
-
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private CharSequence zzBuffer = "";
-
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
-
-  /** the textposition at the last state to be included in yytext */
-  private int zzPushbackPos;
-
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
-
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
-
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
-
-  /**
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
-
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
-
-  private IElementType myTokenType;
-  private int myState;
-
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
-
-
-
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 1772) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
-    }
-    return map;
-  }
-
-  @Override
-  public IElementType getTokenType() {
-    if (myTokenType == null) locateToken();
-    return myTokenType;
-  }
-
-  @Override
-  public final int getTokenStart(){
-    if (myTokenType == null) locateToken();
-    return zzStartRead;
-  }
-
-  @Override
-  public final int getTokenEnd(){
-    if (myTokenType == null) locateToken();
-    return getTokenStart() + yylength();
-  }
-
-  @Override
-  public void advance() {
-    if (myTokenType == null) locateToken();
-    myTokenType = null;
-  }
-
-  @Override
-  public int getState() {
-    if (myTokenType == null) locateToken();
-    return myState;
-  }
-
-  @Override
-  public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
-    reset(buffer, startOffset, endOffset, initialState);
-    myTokenType = null;
-  }
-
-   @Override
-   public CharSequence getBufferSequence() {
-     return zzBuffer;
-   }
-
-   @Override
-   public int getBufferEnd() {
-     return zzEndRead;
-   }
-
-  public void reset(CharSequence buffer, int start, int end,int initialState){
-    zzBuffer = buffer;
-    zzCurrentPos = zzMarkedPos = zzStartRead = start;
-    zzPushbackPos = 0;
-    zzAtEOF  = false;
-    zzAtBOL = true;
-    zzEndRead = end;
-    yybegin(initialState);
-    myTokenType = null;
-  }
-
-   private void locateToken() {
-     if (myTokenType != null) return;
-     try {
-       myState = yystate();
-       myTokenType = advanceImpl();
-     }
-     catch (java.io.IOException e) { /*Can't happen*/ }
-     catch (Error e) {
-       // add lexer class name to the error
-       final Error error = new Error(getClass().getName() + ": " + e.getMessage());
-       error.setStackTrace(e.getStackTrace());
-       throw error;
-     }
-   }
-
-   /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   *
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-    return true;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  public final CharSequence yytext() {
-    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the
-   * matched text.
-   *
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch.
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  public final char yycharat(int pos) {
-    return zzBuffer.charAt(zzStartRead+pos);
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of
-   * yypushback(int) and a match-all fallback rule) this method
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-    }
-
-    throw new Error(message);
-  }
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-  /**
-   * Contains user EOF-code, which will be executed exactly once,
-   * when the end of file is reached
-   */
-  private void zzDoEOF() {
-    if (!zzEOFDone) {
-      zzEOFDone = true;
-    
-    }
-  }
-
-
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public IElementType advanceImpl() throws java.io.IOException {
-    int zzInput;
-    int zzAction;
-
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    CharSequence zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
-
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
-
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
-
-      zzAction = -1;
-
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-
-      zzState = ZZ_LEXSTATE[zzLexicalState];
-
-
-      zzForAction: {
-        while (true) {
-
-          if (zzCurrentPosL < zzEndReadL)
-            zzInput = zzBufferL.charAt(zzCurrentPosL++);
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = zzBufferL.charAt(zzCurrentPosL++);
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
-
-          int zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
-
-        }
-      }
-
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 86: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD;
-          }
-        case 90: break;
-        case 29: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COLON;
-          }
-        case 91: break;
-        case 4: 
-          { return JSTokenTypes.WHITE_SPACE;
-          }
-        case 92: break;
-        case 32: 
-          { return JSTokenTypes.REGEXP_LITERAL;
-          }
-        case 93: break;
-        case 79: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD;
-          }
-        case 94: break;
-        case 21: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LPAR;
-          }
-        case 95: break;
-        case 66: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD;
-          }
-        case 96: break;
-        case 44: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GE;
-          }
-        case 97: break;
-        case 82: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD;
-          }
-        case 98: break;
-        case 34: 
-          { return JSTokenTypes.C_STYLE_COMMENT;
-          }
-        case 99: break;
-        case 49: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OROR;
-          }
-        case 100: break;
-        case 56: 
-          { return JSTokenTypes.DOC_COMMENT;
-          }
-        case 101: break;
-        case 58: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD;
-          }
-        case 102: break;
-        case 63: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ;
-          }
-        case 103: break;
-        case 26: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COMMA;
-          }
-        case 104: break;
-        case 13: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQ;
-          }
-        case 105: break;
-        case 37: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD;
-          }
-        case 106: break;
-        case 47: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDAND;
-          }
-        case 107: break;
-        case 43: 
-          { return JSTokenTypes.PLUSPLUS;
-          }
-        case 108: break;
-        case 10: 
-          { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL;
-          }
-        case 109: break;
-        case 3: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER;
-          }
-        case 110: break;
-        case 5: 
-          { return JSTokenTypes.DIV;
-          }
-        case 111: break;
-        case 25: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON;
-          }
-        case 112: break;
-        case 50: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOREQ;
-          }
-        case 113: break;
-        case 80: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD;
-          }
-        case 114: break;
-        case 68: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD;
-          }
-        case 115: break;
-        case 65: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ;
-          }
-        case 116: break;
-        case 57: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD;
-          }
-        case 117: break;
-        case 6: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULT;
-          }
-        case 118: break;
-        case 53: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ;
-          }
-        case 119: break;
-        case 17: 
-          { yybegin(YYINITIAL); return JSTokenTypes.AND;
-          }
-        case 120: break;
-        case 61: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ;
-          }
-        case 121: break;
-        case 67: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD;
-          }
-        case 122: break;
-        case 36: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ;
-          }
-        case 123: break;
-        case 52: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ;
-          }
-        case 124: break;
-        case 60: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD;
-          }
-        case 125: break;
-        case 15: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUS;
-          }
-        case 126: break;
-        case 33: 
-          { return JSTokenTypes.END_OF_LINE_COMMENT;
-          }
-        case 127: break;
-        case 69: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD;
-          }
-        case 128: break;
-        case 77: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD;
-          }
-        case 129: break;
-        case 40: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQ;
-          }
-        case 130: break;
-        case 1: 
-          { return JSTokenTypes.BAD_CHARACTER;
-          }
-        case 131: break;
-        case 84: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD;
-          }
-        case 132: break;
-        case 83: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD;
-          }
-        case 133: break;
-        case 74: 
-          { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD;
-          }
-        case 134: break;
-        case 78: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD;
-          }
-        case 135: break;
-        case 46: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ;
-          }
-        case 136: break;
-        case 55: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLT;
-          }
-        case 137: break;
-        case 31: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LT;
-          }
-        case 138: break;
-        case 72: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD;
-          }
-        case 139: break;
-        case 14: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EXCL;
-          }
-        case 140: break;
-        case 38: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD;
-          }
-        case 141: break;
-        case 62: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ;
-          }
-        case 142: break;
-        case 42: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ;
-          }
-        case 143: break;
-        case 48: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OREQ;
-          }
-        case 144: break;
-        case 87: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD;
-          }
-        case 145: break;
-        case 64: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT;
-          }
-        case 146: break;
-        case 45: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGT;
-          }
-        case 147: break;
-        case 27: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TILDE;
-          }
-        case 148: break;
-        case 85: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD;
-          }
-        case 149: break;
-        case 2: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL;
-          }
-        case 150: break;
-        case 19: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOR;
-          }
-        case 151: break;
-        case 30: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIV;
-          }
-        case 152: break;
-        case 16: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GT;
-          }
-        case 153: break;
-        case 39: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD;
-          }
-        case 154: break;
-        case 81: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD;
-          }
-        case 155: break;
-        case 59: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD;
-          }
-        case 156: break;
-        case 75: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD;
-          }
-        case 157: break;
-        case 9: 
-          { return  JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
-          }
-        case 158: break;
-        case 18: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OR;
-          }
-        case 159: break;
-        case 51: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ;
-          }
-        case 160: break;
-        case 8: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUS;
-          }
-        case 161: break;
-        case 35: 
-          { return JSTokenTypes.MINUSMINUS;
-          }
-        case 162: break;
-        case 28: 
-          { yybegin(YYINITIAL); return JSTokenTypes.QUEST;
-          }
-        case 163: break;
-        case 76: 
-          { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD;
-          }
-        case 164: break;
-        case 7: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DOT;
-          }
-        case 165: break;
-        case 70: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD;
-          }
-        case 166: break;
-        case 12: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RBRACKET;
-          }
-        case 167: break;
-        case 24: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RBRACE;
-          }
-        case 168: break;
-        case 89: 
-          { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD;
-          }
-        case 169: break;
-        case 41: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NE;
-          }
-        case 170: break;
-        case 23: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACE;
-          }
-        case 171: break;
-        case 22: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RPAR;
-          }
-        case 172: break;
-        case 20: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERC;
-          }
-        case 173: break;
-        case 71: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD;
-          }
-        case 174: break;
-        case 54: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LE;
-          }
-        case 175: break;
-        case 11: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET;
-          }
-        case 176: break;
-        case 73: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ;
-          }
-        case 177: break;
-        case 88: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.UNDEFINED_KEYWORD;
-          }
-        case 178: break;
-        default:
-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-            zzAtEOF = true;
-            zzDoEOF();
-            return null;
-          }
-          else {
-            zzScanError(ZZ_NO_MATCH);
-          }
-      }
-    }
-  }
-
-
-}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
new file mode 100644
index 00000000..28d08ca1
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2005 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.
+ */
+
+package consulo.javascript.lang.lexer;
+
+import com.intellij.lexer.FlexAdapter;
+import com.intellij.lexer.FlexLexer;
+
+/**
+ * @author Maxim.Mossienko
+ */
+public class JavaScriptFlexAdapter extends FlexAdapter
+{
+	private static final int BASE_STATE_MASK = 0xF;
+	private static final int TAG_COUNT_SHIFT = 4;
+
+	public JavaScriptFlexAdapter(FlexLexer lexer)
+	{
+		super(lexer);
+	}
+
+	@Override
+	public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState)
+	{
+		super.start(buffer, startOffset, endOffset, initialState & BASE_STATE_MASK);
+		((JavaScriptFlexLexer) getFlex()).setTagCount(initialState >> TAG_COUNT_SHIFT);
+	}
+
+	@Override
+	public int getState()
+	{
+		return getStateInternal() + (((JavaScriptFlexLexer) getFlex()).getTagCount() << TAG_COUNT_SHIFT);
+	}
+
+	protected int getStateInternal()
+	{
+		return super.getState();
+	}
+}
\ No newline at end of file
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java
new file mode 100644
index 00000000..69fe574f
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java
@@ -0,0 +1,14 @@
+package consulo.javascript.lang.lexer;
+
+import com.intellij.lexer.FlexLexer;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-05
+ */
+public interface JavaScriptFlexLexer extends FlexLexer
+{
+	void setTagCount(int count);
+
+	int getTagCount();
+}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
deleted file mode 100644
index 40a76161..00000000
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ContextKeywordCache.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package consulo.javascript.lang.parsing;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.tree.IElementType;
-
-/**
- * @author VISTALL
- * @since 15.02.2016
- */
-public class ContextKeywordCache
-{
-	private static Map<String, IElementType> ourCache = new HashMap<String, IElementType>();
-
-	static
-	{
-		ourCache.put("get", JSTokenTypes.GET_KEYWORD);
-		ourCache.put("set", JSTokenTypes.SET_KEYWORD);
-		ourCache.put("static", JSTokenTypes.STATIC_KEYWORD);
-	}
-
-	@Nullable
-	public static IElementType getContextKeywordElementType(String text)
-	{
-		return ourCache.get(text);
-	}
-}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index 2a93df13..ba0ad8b5 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -16,14 +16,16 @@
 
 package consulo.javascript.lang.parsing;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.lang.JavaScriptContextKeywordElementType;
 import consulo.javascript.lang.parsing.impl.JavaScriptStrictParserBuilder;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * User: max
  * Date: Jan 28, 2005
@@ -38,12 +40,29 @@ public Parsing(JavaScriptParsingContext context)
 		myContext = context;
 	}
 
+	public boolean expectContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType)
+	{
+		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
+		{
+			IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
+			if(contextKeywordElementType == null)
+			{
+				return false;
+			}
+			if(elementType == contextKeywordElementType)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
 	@Nullable
 	public IElementType expectContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
 	{
 		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 		{
-			IElementType contextKeywordElementType = ContextKeywordCache.getContextKeywordElementType(builder.getTokenText());
+			IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
 			if(contextKeywordElementType == null)
 			{
 				return null;
@@ -56,6 +75,19 @@ public IElementType expectContextKeyword(@Nonnull PsiBuilder builder, @Nonnull T
 		return null;
 	}
 
+	public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType)
+	{
+		if(expectContextKeyword(builder, elementType))
+		{
+			if(builder instanceof JavaScriptStrictParserBuilder)
+			{
+				((JavaScriptStrictParserBuilder) builder).disableNonStrictRemap(builder.getCurrentOffset());
+			}
+			builder.remapCurrentToken(elementType);
+			builder.advanceLexer();
+		}
+	}
+
 	public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
 	{
 		IElementType elementType = expectContextKeyword(builder, tokenSet);
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/EcmaScript6Lexer.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
deleted file mode 100644
index 41ab54f0..00000000
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/EcmaScript6Lexer.java
+++ /dev/null
@@ -1,1370 +0,0 @@
-/* The following code was generated by JFlex 1.4.4 on 03.03.16 6:57 */
-
-package consulo.javascript.lang.lexer;
-
-import com.intellij.lexer.LexerBase;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.lang.javascript.JSTokenTypes;
-
-
-/**
- * This class is a scanner generated by 
- * <a href="http://www.jflex.de/">JFlex</a> 1.4.4
- * on 03.03.16 6:57 from the specification file
- * <tt>R:/_github.com/consulo/consulo-javascript/ecmascript6-impl/src/org/mustbe/consulo/javascript/lang/lexer/ecmascript6.flex</tt>
- */
-public class EcmaScript6Lexer extends LexerBase {
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 16384;
-
-  /** lexical states */
-  public static final int DIV_OR_GT = 2;
-  public static final int YYINITIAL = 0;
-
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = { 
-     0,  0,  1, 1
-  };
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final String ZZ_CMAP_PACKED = 
-    "\11\5\1\3\1\20\1\0\1\3\1\10\16\5\4\0\1\3\1\57"+
-    "\1\23\1\0\1\4\1\66\1\63\1\21\1\67\1\70\1\7\1\60"+
-    "\1\74\1\17\1\15\1\6\1\11\11\1\1\77\1\73\1\62\1\56"+
-    "\1\61\1\76\1\0\1\2\1\12\2\2\1\16\1\2\10\4\1\13"+
-    "\10\4\1\14\2\4\1\25\1\22\1\26\1\65\1\4\1\24\1\36"+
-    "\1\44\1\46\1\42\1\34\1\35\1\27\1\47\1\43\1\4\1\45"+
-    "\1\37\1\55\1\41\1\50\1\53\1\4\1\32\1\40\1\31\1\33"+
-    "\1\54\1\52\1\30\1\51\1\4\1\71\1\64\1\72\1\75\41\5"+
-    "\2\0\4\4\4\0\1\4\2\0\1\5\7\0\1\4\4\0\1\4"+
-    "\5\0\27\4\1\0\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4"+
-    "\16\0\5\4\11\0\1\4\21\0\130\5\5\0\23\5\12\0\1\4"+
-    "\13\0\1\4\1\0\3\4\1\0\1\4\1\0\24\4\1\0\54\4"+
-    "\1\0\46\4\1\0\5\4\4\0\202\4\1\0\4\5\3\0\105\4"+
-    "\1\0\46\4\2\0\2\4\6\0\20\4\41\0\46\4\2\0\1\4"+
-    "\7\0\47\4\11\0\21\5\1\0\27\5\1\0\3\5\1\0\1\5"+
-    "\1\0\2\5\1\0\1\5\13\0\33\4\5\0\3\4\15\0\4\5"+
-    "\14\0\6\5\13\0\32\4\5\0\13\4\16\5\7\0\12\5\4\0"+
-    "\2\4\1\5\143\4\1\0\1\4\10\5\1\0\6\5\2\4\2\5"+
-    "\1\0\4\5\2\4\12\5\3\4\2\0\1\4\17\0\1\5\1\4"+
-    "\1\5\36\4\33\5\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0"+
-    "\3\5\66\4\2\0\1\5\1\4\20\5\2\0\1\4\4\5\3\0"+
-    "\12\4\2\5\2\0\12\5\21\0\3\5\1\0\10\4\2\0\2\4"+
-    "\2\0\26\4\1\0\7\4\1\0\1\4\3\0\4\4\2\0\1\5"+
-    "\1\4\7\5\2\0\2\5\2\0\3\5\11\0\1\5\4\0\2\4"+
-    "\1\0\3\4\2\5\2\0\12\5\4\4\15\0\3\5\1\0\6\4"+
-    "\4\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\2\4"+
-    "\1\0\2\4\2\0\1\5\1\0\5\5\4\0\2\5\2\0\3\5"+
-    "\13\0\4\4\1\0\1\4\7\0\14\5\3\4\14\0\3\5\1\0"+
-    "\11\4\1\0\3\4\1\0\26\4\1\0\7\4\1\0\2\4\1\0"+
-    "\5\4\2\0\1\5\1\4\10\5\1\0\3\5\1\0\3\5\2\0"+
-    "\1\4\17\0\2\4\2\5\2\0\12\5\1\0\1\4\17\0\3\5"+
-    "\1\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4"+
-    "\1\0\5\4\2\0\1\5\1\4\6\5\3\0\2\5\2\0\3\5"+
-    "\10\0\2\5\4\0\2\4\1\0\3\4\4\0\12\5\1\0\1\4"+
-    "\20\0\1\5\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0"+
-    "\2\4\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0"+
-    "\10\4\1\0\3\4\4\0\5\5\3\0\3\5\1\0\4\5\11\0"+
-    "\1\5\17\0\11\5\11\0\1\4\7\0\3\5\1\0\10\4\1\0"+
-    "\3\4\1\0\27\4\1\0\12\4\1\0\5\4\4\0\7\5\1\0"+
-    "\3\5\1\0\4\5\7\0\2\5\11\0\2\4\4\0\12\5\22\0"+
-    "\2\5\1\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4\1\0"+
-    "\5\4\2\0\1\5\1\4\7\5\1\0\3\5\1\0\4\5\7\0"+
-    "\2\5\7\0\1\4\1\0\2\4\4\0\12\5\22\0\2\5\1\0"+
-    "\10\4\1\0\3\4\1\0\27\4\1\0\20\4\4\0\6\5\2\0"+
-    "\3\5\1\0\4\5\11\0\1\5\10\0\2\4\4\0\12\5\22\0"+
-    "\2\5\1\0\22\4\3\0\30\4\1\0\11\4\1\0\1\4\2\0"+
-    "\7\4\3\0\1\5\4\0\6\5\1\0\1\5\1\0\10\5\22\0"+
-    "\2\5\15\0\60\4\1\5\2\4\7\5\4\0\10\4\10\5\1\0"+
-    "\12\5\47\0\2\4\1\0\1\4\2\0\2\4\1\0\1\4\2\0"+
-    "\1\4\6\0\4\4\1\0\7\4\1\0\3\4\1\0\1\4\1\0"+
-    "\1\4\2\0\2\4\1\0\4\4\1\5\2\4\6\5\1\0\2\5"+
-    "\1\4\2\0\5\4\1\0\1\4\1\0\6\5\2\0\12\5\2\0"+
-    "\2\4\42\0\1\4\27\0\2\5\6\0\12\5\13\0\1\5\1\0"+
-    "\1\5\1\0\1\5\4\0\2\5\10\4\1\0\42\4\6\0\24\5"+
-    "\1\0\2\5\4\4\4\0\10\5\1\0\44\5\11\0\1\5\71\0"+
-    "\42\4\1\0\5\4\1\0\2\4\1\0\7\5\3\0\4\5\6\0"+
-    "\12\5\6\0\6\4\4\5\106\0\46\4\12\0\51\4\7\0\132\4"+
-    "\5\0\104\4\5\0\122\4\6\0\7\4\1\0\77\4\1\0\1\4"+
-    "\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0\47\4"+
-    "\1\0\1\4\1\0\4\4\2\0\37\4\1\0\1\4\1\0\4\4"+
-    "\2\0\7\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\7\4"+
-    "\1\0\27\4\1\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4"+
-    "\1\0\47\4\1\0\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4"+
-    "\2\0\10\4\12\0\32\4\5\0\113\4\3\0\3\4\17\0\15\4"+
-    "\1\0\4\4\3\5\13\0\22\4\3\5\13\0\22\4\2\5\14\0"+
-    "\15\4\1\0\3\4\1\0\2\5\14\0\64\4\40\5\3\0\1\4"+
-    "\3\0\2\4\1\5\2\0\12\5\41\0\3\5\2\0\12\5\6\0"+
-    "\130\4\10\0\51\4\1\5\126\0\35\4\3\0\14\5\4\0\14\5"+
-    "\12\0\12\5\36\4\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0"+
-    "\132\4\6\0\26\4\2\0\6\4\2\0\46\4\2\0\6\4\2\0"+
-    "\10\4\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4\2\0"+
-    "\65\4\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4\3\0"+
-    "\4\4\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4\17\0"+
-    "\4\5\32\0\5\5\20\0\2\4\23\0\1\4\13\0\4\5\6\0"+
-    "\6\5\1\0\1\4\15\0\1\4\40\0\22\4\36\0\15\5\4\0"+
-    "\1\5\3\0\6\5\27\0\1\4\4\0\1\4\2\0\12\4\1\0"+
-    "\1\4\3\0\5\4\6\0\1\4\1\0\1\4\1\0\1\4\1\0"+
-    "\4\4\1\0\3\4\1\0\7\4\3\0\3\4\5\0\5\4\26\0"+
-    "\44\4\u0e81\0\3\4\31\0\11\4\6\5\1\0\5\4\2\0\5\4"+
-    "\4\0\126\4\2\0\2\5\2\0\3\4\1\0\137\4\5\0\50\4"+
-    "\4\0\136\4\21\0\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4"+
-    "\132\0\u048d\4\u0773\0\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4"+
-    "\14\0\5\4\5\0\1\4\1\5\12\4\1\0\15\4\1\0\5\4"+
-    "\1\0\1\4\1\0\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4"+
-    "\22\0\100\4\2\0\66\4\50\0\15\4\3\0\20\5\20\0\4\5"+
-    "\17\0\2\4\30\0\3\4\31\0\1\4\6\0\5\4\1\0\207\4"+
-    "\2\0\1\5\4\0\1\4\13\0\12\5\7\0\32\4\4\0\1\4"+
-    "\1\0\32\4\12\0\132\4\3\0\6\4\2\0\6\4\2\0\6\4"+
-    "\2\0\3\4\3\0\2\4\3\0\2\4\22\0\3\5\4\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\2\0\1\1\1\2\1\3\1\4\1\5\1\6\1\2"+
-    "\1\7\1\10\1\11\1\12\1\1\1\13\1\14\20\3"+
-    "\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24"+
-    "\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34"+
-    "\1\35\1\36\1\6\1\37\2\2\1\40\1\41\1\42"+
-    "\1\0\1\40\2\2\1\0\1\43\1\44\2\11\2\12"+
-    "\1\0\1\45\22\3\1\46\1\47\1\50\15\3\1\51"+
-    "\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61"+
-    "\1\62\1\63\1\64\1\65\1\66\1\67\1\70\1\71"+
-    "\1\40\1\42\1\72\1\40\2\0\1\73\2\11\2\12"+
-    "\1\3\1\74\14\3\1\75\1\76\3\3\1\77\21\3"+
-    "\1\100\1\3\1\101\1\102\1\103\1\104\1\105\1\0"+
-    "\2\72\1\106\1\3\1\107\5\3\1\110\1\111\5\3"+
-    "\1\112\10\3\1\113\4\3\1\114\5\3\1\115\1\116"+
-    "\1\42\1\0\1\117\6\3\1\120\11\3\1\121\1\122"+
-    "\1\123\1\3\1\124\1\125\1\126\4\3\1\127\1\130"+
-    "\2\3\1\131\2\3\1\132\1\133\1\3\1\134\3\3"+
-    "\1\135\3\3\1\136\2\3\1\137\1\3\1\140\1\141"+
-    "\4\3\1\142\1\3\1\143\1\3\1\144\3\3\1\145"+
-    "\1\3\1\146\1\147\2\3\1\150\1\151\1\152";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[292];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\100\0\200\0\300\0\u0100\0\u0140\0\u0180\0\200"+
-    "\0\u01c0\0\u0200\0\u0240\0\u0280\0\u02c0\0\u0300\0\200\0\200"+
-    "\0\u0340\0\u0380\0\u03c0\0\u0400\0\u0440\0\u0480\0\u04c0\0\u0500"+
-    "\0\u0540\0\u0580\0\u05c0\0\u0600\0\u0640\0\u0680\0\u06c0\0\u0700"+
-    "\0\u0740\0\u0780\0\u07c0\0\u0800\0\u0840\0\u0880\0\u08c0\0\u0900"+
-    "\0\200\0\200\0\200\0\200\0\200\0\200\0\200\0\200"+
-    "\0\200\0\u0940\0\u0980\0\u09c0\0\u0a00\0\u0a40\0\u0a80\0\u0ac0"+
-    "\0\u0b00\0\u0b40\0\u0b80\0\u0bc0\0\u0c00\0\u0c40\0\200\0\200"+
-    "\0\200\0\u0c80\0\u0cc0\0\200\0\u0300\0\u0300\0\u0d00\0\u0d40"+
-    "\0\u0d80\0\u0dc0\0\u0e00\0\u0e40\0\u0e80\0\u0ec0\0\u0f00\0\u0f40"+
-    "\0\u0f80\0\u0fc0\0\u1000\0\u1040\0\u1080\0\u10c0\0\u1100\0\u1140"+
-    "\0\u0100\0\u0100\0\u1180\0\u11c0\0\u1200\0\u1240\0\u1280\0\u12c0"+
-    "\0\u1300\0\u1340\0\u1380\0\u13c0\0\u1400\0\u1440\0\u1480\0\u14c0"+
-    "\0\u1500\0\200\0\u1540\0\200\0\200\0\200\0\u1580\0\200"+
-    "\0\200\0\200\0\200\0\200\0\200\0\200\0\200\0\200"+
-    "\0\u15c0\0\u1600\0\u1640\0\u1680\0\u16c0\0\u1700\0\u1740\0\200"+
-    "\0\u1780\0\u17c0\0\u1800\0\u1840\0\u1880\0\u0100\0\u18c0\0\u1900"+
-    "\0\u1940\0\u1980\0\u19c0\0\u1a00\0\u1a40\0\u1a80\0\u1ac0\0\u1b00"+
-    "\0\u1b40\0\u1b80\0\u0100\0\u0100\0\u1bc0\0\u1c00\0\u1c40\0\u0100"+
-    "\0\u1c80\0\u1cc0\0\u1d00\0\u1d40\0\u1d80\0\u1dc0\0\u1e00\0\u1e40"+
-    "\0\u1e80\0\u1ec0\0\u1f00\0\u1f40\0\u1f80\0\u1fc0\0\u2000\0\u2040"+
-    "\0\u2080\0\u0100\0\u20c0\0\200\0\200\0\200\0\u2100\0\200"+
-    "\0\u2140\0\u2180\0\200\0\u0100\0\u21c0\0\u0100\0\u2200\0\u2240"+
-    "\0\u2280\0\u22c0\0\u2300\0\u0100\0\u0100\0\u2340\0\u2380\0\u23c0"+
-    "\0\u2400\0\u2440\0\u0100\0\u2480\0\u24c0\0\u2500\0\u2540\0\u2580"+
-    "\0\u25c0\0\u2600\0\u2640\0\u0100\0\u2680\0\u26c0\0\u2700\0\u2740"+
-    "\0\u0100\0\u2780\0\u27c0\0\u2800\0\u2840\0\u2880\0\u0100\0\200"+
-    "\0\200\0\u28c0\0\u0100\0\u2900\0\u2940\0\u2980\0\u29c0\0\u2a00"+
-    "\0\u2a40\0\u0100\0\u2a80\0\u2ac0\0\u2b00\0\u2b40\0\u2b80\0\u2bc0"+
-    "\0\u2c00\0\u2c40\0\u2c80\0\u0100\0\u0100\0\u0100\0\u2cc0\0\u0100"+
-    "\0\u0100\0\u0100\0\u2d00\0\u2d40\0\u2d80\0\u2dc0\0\u0100\0\u0100"+
-    "\0\u2e00\0\u2e40\0\u0100\0\u2e80\0\u2ec0\0\u0100\0\u0100\0\u2f00"+
-    "\0\u0100\0\u2f40\0\u2f80\0\u2fc0\0\u0100\0\u3000\0\u3040\0\u3080"+
-    "\0\u0100\0\u30c0\0\u3100\0\u0100\0\u3140\0\u0100\0\u0100\0\u3180"+
-    "\0\u31c0\0\u3200\0\u3240\0\u0100\0\u3280\0\u0100\0\u32c0\0\u0100"+
-    "\0\u3300\0\u3340\0\u3380\0\u0100\0\u33c0\0\u0100\0\u0100\0\u3400"+
-    "\0\u3440\0\u0100\0\u0100\0\u0100";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[292];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
-    }
-    return j;
-  }
-
-  /** 
-   * The transition table of the DFA
-   */
-  private static final int [] ZZ_TRANS = zzUnpackTrans();
-
-  private static final String ZZ_TRANS_PACKED_0 =
-    "\1\3\1\4\1\5\1\6\1\5\1\3\1\7\1\10"+
-    "\1\6\1\11\3\5\1\12\1\5\1\13\1\6\1\14"+
-    "\1\3\1\15\1\16\1\17\1\20\2\5\1\21\1\22"+
-    "\1\23\1\24\1\25\1\5\1\26\1\27\1\30\1\31"+
-    "\1\32\1\33\1\5\1\34\2\5\1\35\1\36\1\37"+
-    "\1\40\1\5\1\41\1\42\1\43\1\44\1\3\1\45"+
-    "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55"+
-    "\1\56\1\57\1\60\1\61\1\3\1\4\1\5\1\6"+
-    "\1\5\1\3\1\62\1\63\1\6\1\11\3\5\1\12"+
-    "\1\5\1\13\1\6\1\14\1\3\1\15\1\16\1\17"+
-    "\1\20\2\5\1\21\1\22\1\23\1\24\1\25\1\5"+
-    "\1\26\1\27\1\30\1\31\1\32\1\33\1\5\1\34"+
-    "\2\5\1\35\1\36\1\37\1\40\1\5\1\41\1\42"+
-    "\1\43\1\44\1\64\1\45\1\46\1\47\1\50\1\51"+
-    "\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61"+
-    "\101\0\1\4\7\0\1\4\3\0\1\65\1\66\15\0"+
-    "\1\66\44\0\2\5\1\0\2\5\3\0\4\5\1\0"+
-    "\1\5\10\0\27\5\25\0\1\6\4\0\1\6\7\0"+
-    "\1\6\57\0\6\67\1\70\1\71\1\0\7\67\1\0"+
-    "\1\67\1\72\2\67\1\73\52\67\1\0\1\4\7\0"+
-    "\1\4\2\74\1\75\1\65\1\66\11\0\1\75\3\0"+
-    "\1\66\7\0\1\74\3\0\1\74\30\0\1\65\7\0"+
-    "\1\65\3\0\1\76\101\0\1\77\36\0\1\100\21\0"+
-    "\10\14\1\0\7\14\1\0\1\101\1\102\55\14\10\15"+
-    "\1\0\7\15\1\0\1\15\1\103\1\104\54\15\24\105"+
-    "\1\106\53\105\1\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\3\5\1\107\14\5\1\110\1\5"+
-    "\1\111\4\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\5\5\1\112\21\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\12\5"+
-    "\1\113\14\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\1\5\1\114\6\5\1\115\1\5"+
-    "\1\116\14\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\4\5\1\117\2\5\1\120\4\5"+
-    "\1\121\4\5\1\122\5\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\5\5\1\123\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\2\5\1\124\20\5\1\125\3\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\4\5"+
-    "\1\126\1\127\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\5\5\1\130\13\5\1\131"+
-    "\5\5\23\0\2\5\1\0\2\5\3\0\4\5\1\0"+
-    "\1\5\10\0\6\5\1\132\3\5\1\133\13\5\1\134"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\3\5\1\135\23\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\7\5\1\136\1\137"+
-    "\10\5\1\140\5\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\14\5\1\141\12\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\14\5\1\142\3\5\1\143\6\5\23\0\2\5\1\0"+
-    "\2\5\3\0\4\5\1\0\1\5\10\0\3\5\1\144"+
-    "\1\145\2\5\1\146\17\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\7\5\1\147\11\5"+
-    "\1\150\5\5\100\0\1\151\2\0\1\152\74\0\1\153"+
-    "\77\0\1\154\1\0\1\155\75\0\1\156\2\0\1\157"+
-    "\74\0\1\160\4\0\1\161\72\0\1\162\5\0\1\163"+
-    "\71\0\1\164\77\0\1\165\27\0\1\70\1\71\46\0"+
-    "\1\166\77\0\1\167\77\0\1\170\3\0\1\171\16\0"+
-    "\1\65\7\0\1\65\4\0\1\66\15\0\1\66\44\0"+
-    "\1\74\7\0\1\74\5\0\1\74\40\0\1\74\17\0"+
-    "\6\67\1\172\1\67\1\0\7\67\1\0\1\67\1\72"+
-    "\2\67\1\73\52\67\10\70\1\0\7\70\1\0\57\70"+
-    "\7\173\1\174\70\173\10\67\1\0\7\67\1\0\57\67"+
-    "\6\73\1\175\1\73\1\176\7\73\1\176\1\73\1\177"+
-    "\3\73\1\67\51\73\1\0\1\74\7\0\1\74\67\0"+
-    "\2\75\6\0\2\75\3\0\1\75\15\0\3\75\3\0"+
-    "\1\75\1\0\1\75\1\0\1\75\46\0\1\200\62\0"+
-    "\3\14\1\201\4\14\1\202\67\14\3\15\1\203\4\15"+
-    "\1\204\67\15\1\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\4\5\1\205\15\5\1\206\4\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\3\5\1\207\10\5\1\210\12\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\24\5"+
-    "\1\211\2\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\2\5\1\212\24\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\13\5"+
-    "\1\213\13\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\2\5\1\214\21\5\1\215\2\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\11\5\1\216\15\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\4\5\1\217\22\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\12\5\1\220\14\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\10\5\1\221\16\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\12\5\1\222\14\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\3\5\1\223\23\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\2\5\1\224\24\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\7\5\1\225\17\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\14\5\1\226\12\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\10\5\1\227\16\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\23\5\1\230\3\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\6\5\1\231\1\5"+
-    "\1\232\16\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\2\5\1\233\6\5\1\234\15\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\24\5\1\235\2\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\5\5\1\236\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\2\5\1\237\6\5\1\240\15\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\7\5"+
-    "\1\241\17\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\12\5\1\242\14\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\5\5"+
-    "\1\243\21\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\2\5\1\244\24\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\14\5"+
-    "\1\245\12\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\14\5\1\246\4\5\1\247\5\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\15\5\1\250\11\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\17\5\1\251\7\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\3\5\1\252\23\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\14\5\1\253\12\5"+
-    "\100\0\1\254\77\0\1\255\77\0\1\256\2\0\1\257"+
-    "\74\0\1\260\50\0\2\172\12\0\1\172\11\0\1\172"+
-    "\22\0\7\173\1\261\70\173\6\262\1\263\1\174\70\262"+
-    "\26\176\1\67\2\175\12\176\1\175\11\176\1\175\50\176"+
-    "\1\67\51\176\10\73\1\176\7\73\1\176\5\73\1\67"+
-    "\51\73\3\14\1\201\4\14\1\202\10\14\1\101\1\102"+
-    "\65\14\1\0\10\14\1\101\1\102\55\14\3\15\1\203"+
-    "\4\15\1\204\11\15\1\103\1\104\64\15\1\0\11\15"+
-    "\1\103\1\104\54\15\1\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\5\5\1\264\21\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\21\5\1\265\5\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\11\5\1\266\15\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\5\5\1\267\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\4\5\1\270\22\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\5\5\1\271\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\5\5\1\272\21\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\21\5\1\273\5\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\5\5\1\274\21\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\26\5\1\275\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\17\5\1\276\7\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\11\5"+
-    "\1\277\15\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\7\5\1\300\17\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\2\5"+
-    "\1\301\24\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\2\5\1\302\24\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\10\5"+
-    "\1\303\16\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\7\5\1\304\17\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\5\5"+
-    "\1\305\21\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\5\5\1\306\21\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\2\5"+
-    "\1\307\24\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\10\5\1\310\10\5\1\311\5\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\7\5\1\312\17\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\17\5\1\313\7\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\5\5\1\314\21\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\11\5\1\315\15\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\2\5\1\316\6\5\1\317\15\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\10\5"+
-    "\1\320\16\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\20\5\1\321\6\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\10\5"+
-    "\1\322\16\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\25\5\1\323\1\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\2\5"+
-    "\1\324\24\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\10\5\1\325\16\5\23\0\2\5"+
-    "\1\0\2\5\3\0\4\5\1\0\1\5\10\0\16\5"+
-    "\1\326\10\5\23\0\2\5\1\0\2\5\3\0\4\5"+
-    "\1\0\1\5\10\0\13\5\1\327\13\5\100\0\1\330"+
-    "\21\0\6\173\1\331\1\261\70\173\7\262\1\332\70\262"+
-    "\1\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\23\5\1\333\3\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\21\5\1\334\5\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\3\5\1\335\23\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\6\5\1\336\20\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\12\5\1\337\14\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\3\5\1\340\23\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\2\5\1\341\24\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\5\5\1\342\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\10\5\1\343\16\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\14\5\1\344\12\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\17\5\1\345\7\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\4\5\1\346\22\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\2\5\1\347\24\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\3\5\1\350\23\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\7\5\1\351\17\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\5\5\1\352\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\3\5\1\353\23\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\16\5\1\354\10\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\20\5\1\355\6\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\11\5\1\356\15\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\14\5\1\357\12\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\2\5\1\360\24\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\13\5\1\361\13\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\5\5\1\362\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\7\5\1\363\17\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\5\5\1\364\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\14\5\1\365\12\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\7\5\1\366\17\5"+
-    "\22\0\6\262\1\263\1\332\70\262\1\0\2\5\1\0"+
-    "\2\5\3\0\4\5\1\0\1\5\10\0\6\5\1\367"+
-    "\20\5\23\0\2\5\1\0\2\5\3\0\4\5\1\0"+
-    "\1\5\10\0\12\5\1\370\14\5\23\0\2\5\1\0"+
-    "\2\5\3\0\4\5\1\0\1\5\10\0\14\5\1\371"+
-    "\12\5\23\0\2\5\1\0\2\5\3\0\4\5\1\0"+
-    "\1\5\10\0\13\5\1\372\13\5\23\0\2\5\1\0"+
-    "\2\5\3\0\4\5\1\0\1\5\10\0\2\5\1\373"+
-    "\24\5\23\0\2\5\1\0\2\5\3\0\4\5\1\0"+
-    "\1\5\10\0\14\5\1\374\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\4\5\1\0\1\5\10\0\10\5\1\375"+
-    "\16\5\23\0\2\5\1\0\2\5\3\0\4\5\1\0"+
-    "\1\5\10\0\17\5\1\376\7\5\23\0\2\5\1\0"+
-    "\2\5\3\0\4\5\1\0\1\5\10\0\20\5\1\377"+
-    "\6\5\23\0\2\5\1\0\2\5\3\0\4\5\1\0"+
-    "\1\5\10\0\10\5\1\u0100\16\5\23\0\2\5\1\0"+
-    "\2\5\3\0\4\5\1\0\1\5\10\0\5\5\1\u0101"+
-    "\21\5\23\0\2\5\1\0\2\5\3\0\4\5\1\0"+
-    "\1\5\10\0\6\5\1\u0102\20\5\23\0\2\5\1\0"+
-    "\2\5\3\0\4\5\1\0\1\5\10\0\12\5\1\u0103"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\4\5\1\0"+
-    "\1\5\10\0\26\5\1\u0104\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\2\5\1\u0105\24\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\12\5\1\u0106\14\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\2\5\1\u0107\24\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\17\5\1\u0108\7\5\23\0\2\5\1\0\2\5"+
-    "\3\0\4\5\1\0\1\5\10\0\17\5\1\u0109\7\5"+
-    "\23\0\2\5\1\0\2\5\3\0\4\5\1\0\1\5"+
-    "\10\0\1\u010a\26\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\12\5\1\u010b\14\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\11\5\1\u010c\15\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\21\5\1\u010d\5\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\22\5\1\u010e\4\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\2\5\1\u010f\24\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\7\5\1\u0110\17\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\17\5\1\u0111\7\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\5\5\1\u0112\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\4\5\1\u0113\22\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\5\5\1\u0114\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\2\5\1\u0115\24\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\5\5\1\u0116\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\5\5\1\u0117\21\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\12\5\1\u0118\14\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\17\5\1\u0119\7\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\5\5\1\u011a\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\12\5\1\u011b\14\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\5\5\1\u011c\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\5\5\1\u011d\21\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\13\5\1\u011e\13\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\5\5\1\u011f\21\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\21\5\1\u0120\5\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\2\5\1\u0121\24\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\13\5\1\u0122\13\5\23\0\2\5\1\0\2\5\3\0"+
-    "\4\5\1\0\1\5\10\0\6\5\1\u0123\20\5\23\0"+
-    "\2\5\1\0\2\5\3\0\4\5\1\0\1\5\10\0"+
-    "\11\5\1\u0124\15\5\22\0";
-
-  private static int [] zzUnpackTrans() {
-    int [] result = new int[13440];
-    int offset = 0;
-    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackTrans(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-  private static final char[] EMPTY_BUFFER = new char[0];
-  private static final int YYEOF = -1;
-
-  /* error messages for the codes above */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\2\0\1\11\4\1\1\11\6\1\2\11\30\1\11\11"+
-    "\10\1\1\0\3\1\1\0\3\11\2\1\1\11\1\0"+
-    "\44\1\1\11\1\1\3\11\1\1\11\11\5\1\2\0"+
-    "\1\11\53\1\3\11\1\1\1\11\1\0\1\1\1\11"+
-    "\44\1\2\11\1\0\112\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[292];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-  /** the current state of the DFA */
-  private int zzState;
-
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
-
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private CharSequence zzBuffer = "";
-
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
-
-  /** the textposition at the last state to be included in yytext */
-  private int zzPushbackPos;
-
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
-
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
-
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
-
-  /**
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
-
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
-
-  private IElementType myTokenType;
-  private int myState;
-
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
-
-
-
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 1778) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
-    }
-    return map;
-  }
-
-  @Override
-  public IElementType getTokenType() {
-    if (myTokenType == null) locateToken();
-    return myTokenType;
-  }
-
-  @Override
-  public final int getTokenStart(){
-    if (myTokenType == null) locateToken();
-    return zzStartRead;
-  }
-
-  @Override
-  public final int getTokenEnd(){
-    if (myTokenType == null) locateToken();
-    return getTokenStart() + yylength();
-  }
-
-  @Override
-  public void advance() {
-    if (myTokenType == null) locateToken();
-    myTokenType = null;
-  }
-
-  @Override
-  public int getState() {
-    if (myTokenType == null) locateToken();
-    return myState;
-  }
-
-  @Override
-  public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
-    reset(buffer, startOffset, endOffset, initialState);
-    myTokenType = null;
-  }
-
-   @Override
-   public CharSequence getBufferSequence() {
-     return zzBuffer;
-   }
-
-   @Override
-   public int getBufferEnd() {
-     return zzEndRead;
-   }
-
-  public void reset(CharSequence buffer, int start, int end,int initialState){
-    zzBuffer = buffer;
-    zzCurrentPos = zzMarkedPos = zzStartRead = start;
-    zzPushbackPos = 0;
-    zzAtEOF  = false;
-    zzAtBOL = true;
-    zzEndRead = end;
-    yybegin(initialState);
-    myTokenType = null;
-  }
-
-   private void locateToken() {
-     if (myTokenType != null) return;
-     try {
-       myState = yystate();
-       myTokenType = advanceImpl();
-     }
-     catch (java.io.IOException e) { /*Can't happen*/ }
-     catch (Error e) {
-       // add lexer class name to the error
-       final Error error = new Error(getClass().getName() + ": " + e.getMessage());
-       error.setStackTrace(e.getStackTrace());
-       throw error;
-     }
-   }
-
-   /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   *
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-    return true;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  public final CharSequence yytext() {
-    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the
-   * matched text.
-   *
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch.
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  public final char yycharat(int pos) {
-    return zzBuffer.charAt(zzStartRead+pos);
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of
-   * yypushback(int) and a match-all fallback rule) this method
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-    }
-
-    throw new Error(message);
-  }
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-  /**
-   * Contains user EOF-code, which will be executed exactly once,
-   * when the end of file is reached
-   */
-  private void zzDoEOF() {
-    if (!zzEOFDone) {
-      zzEOFDone = true;
-    
-    }
-  }
-
-
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public IElementType advanceImpl() throws java.io.IOException {
-    int zzInput;
-    int zzAction;
-
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    CharSequence zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
-
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
-
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
-
-      zzAction = -1;
-
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-
-      zzState = ZZ_LEXSTATE[zzLexicalState];
-
-
-      zzForAction: {
-        while (true) {
-
-          if (zzCurrentPosL < zzEndReadL)
-            zzInput = zzBufferL.charAt(zzCurrentPosL++);
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = zzBufferL.charAt(zzCurrentPosL++);
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
-
-          int zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
-
-        }
-      }
-
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 100: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD;
-          }
-        case 107: break;
-        case 29: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COLON;
-          }
-        case 108: break;
-        case 4: 
-          { return JSTokenTypes.WHITE_SPACE;
-          }
-        case 109: break;
-        case 32: 
-          { return JSTokenTypes.REGEXP_LITERAL;
-          }
-        case 110: break;
-        case 86: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD;
-          }
-        case 111: break;
-        case 21: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LPAR;
-          }
-        case 112: break;
-        case 70: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD;
-          }
-        case 113: break;
-        case 90: 
-          { yybegin(YYINITIAL); return JSTokenTypes.STATIC_KEYWORD;
-          }
-        case 114: break;
-        case 46: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GE;
-          }
-        case 115: break;
-        case 91: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD;
-          }
-        case 116: break;
-        case 34: 
-          { return JSTokenTypes.C_STYLE_COMMENT;
-          }
-        case 117: break;
-        case 51: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OROR;
-          }
-        case 118: break;
-        case 58: 
-          { return JSTokenTypes.DOC_COMMENT;
-          }
-        case 119: break;
-        case 61: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD;
-          }
-        case 120: break;
-        case 67: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ;
-          }
-        case 121: break;
-        case 26: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COMMA;
-          }
-        case 122: break;
-        case 13: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQ;
-          }
-        case 123: break;
-        case 38: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD;
-          }
-        case 124: break;
-        case 49: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDAND;
-          }
-        case 125: break;
-        case 45: 
-          { return JSTokenTypes.PLUSPLUS;
-          }
-        case 126: break;
-        case 10: 
-          { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL;
-          }
-        case 127: break;
-        case 3: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER;
-          }
-        case 128: break;
-        case 5: 
-          { return JSTokenTypes.DIV;
-          }
-        case 129: break;
-        case 25: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON;
-          }
-        case 130: break;
-        case 52: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOREQ;
-          }
-        case 131: break;
-        case 87: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD;
-          }
-        case 132: break;
-        case 72: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD;
-          }
-        case 133: break;
-        case 69: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ;
-          }
-        case 134: break;
-        case 60: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD;
-          }
-        case 135: break;
-        case 6: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULT;
-          }
-        case 136: break;
-        case 55: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ;
-          }
-        case 137: break;
-        case 17: 
-          { yybegin(YYINITIAL); return JSTokenTypes.AND;
-          }
-        case 138: break;
-        case 65: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ;
-          }
-        case 139: break;
-        case 71: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD;
-          }
-        case 140: break;
-        case 36: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ;
-          }
-        case 141: break;
-        case 42: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DARROW;
-          }
-        case 142: break;
-        case 37: 
-          { yybegin(YYINITIAL); return JSTokenTypes.INTERPOLATION_STRING_LITERAL;
-          }
-        case 143: break;
-        case 54: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ;
-          }
-        case 144: break;
-        case 64: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD;
-          }
-        case 145: break;
-        case 9: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
-          }
-        case 146: break;
-        case 104: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PROTECTED_KEYWORD;
-          }
-        case 147: break;
-        case 15: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUS;
-          }
-        case 148: break;
-        case 33: 
-          { return JSTokenTypes.END_OF_LINE_COMMENT;
-          }
-        case 149: break;
-        case 74: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD;
-          }
-        case 150: break;
-        case 82: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD;
-          }
-        case 151: break;
-        case 41: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQ;
-          }
-        case 152: break;
-        case 1: 
-          { return JSTokenTypes.BAD_CHARACTER;
-          }
-        case 153: break;
-        case 96: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD;
-          }
-        case 154: break;
-        case 92: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD;
-          }
-        case 155: break;
-        case 79: 
-          { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD;
-          }
-        case 156: break;
-        case 59: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DOT_DOT_DOT;
-          }
-        case 157: break;
-        case 84: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD;
-          }
-        case 158: break;
-        case 48: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ;
-          }
-        case 159: break;
-        case 106: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IMPLEMENTS_KEYWORD;
-          }
-        case 160: break;
-        case 57: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLT;
-          }
-        case 161: break;
-        case 31: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LT;
-          }
-        case 162: break;
-        case 77: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD;
-          }
-        case 163: break;
-        case 14: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EXCL;
-          }
-        case 164: break;
-        case 39: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD;
-          }
-        case 165: break;
-        case 99: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PACKAGE_KEYWORD;
-          }
-        case 166: break;
-        case 66: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ;
-          }
-        case 167: break;
-        case 83: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CLASS_KEYWORD;
-          }
-        case 168: break;
-        case 44: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ;
-          }
-        case 169: break;
-        case 50: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OREQ;
-          }
-        case 170: break;
-        case 101: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD;
-          }
-        case 171: break;
-        case 68: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT;
-          }
-        case 172: break;
-        case 47: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGT;
-          }
-        case 173: break;
-        case 103: 
-          { yybegin(YYINITIAL); return JSTokenTypes.INTERFACE_KEYWORD;
-          }
-        case 174: break;
-        case 27: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TILDE;
-          }
-        case 175: break;
-        case 97: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD;
-          }
-        case 176: break;
-        case 62: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LET_KEYWORD;
-          }
-        case 177: break;
-        case 2: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL;
-          }
-        case 178: break;
-        case 19: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOR;
-          }
-        case 179: break;
-        case 30: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIV;
-          }
-        case 180: break;
-        case 16: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GT;
-          }
-        case 181: break;
-        case 40: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD;
-          }
-        case 182: break;
-        case 88: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD;
-          }
-        case 183: break;
-        case 85: 
-          { yybegin(YYINITIAL); return JSTokenTypes.YIELD_KEYWORD;
-          }
-        case 184: break;
-        case 63: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD;
-          }
-        case 185: break;
-        case 80: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD;
-          }
-        case 186: break;
-        case 18: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OR;
-          }
-        case 187: break;
-        case 53: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ;
-          }
-        case 188: break;
-        case 89: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EXPORT_KEYWORD;
-          }
-        case 189: break;
-        case 8: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUS;
-          }
-        case 190: break;
-        case 73: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ENUM_KEYWORD;
-          }
-        case 191: break;
-        case 35: 
-          { return JSTokenTypes.MINUSMINUS;
-          }
-        case 192: break;
-        case 93: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IMPORT_KEYWORD;
-          }
-        case 193: break;
-        case 28: 
-          { yybegin(YYINITIAL); return JSTokenTypes.QUEST;
-          }
-        case 194: break;
-        case 81: 
-          { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD;
-          }
-        case 195: break;
-        case 7: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DOT;
-          }
-        case 196: break;
-        case 75: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD;
-          }
-        case 197: break;
-        case 12: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RBRACKET;
-          }
-        case 198: break;
-        case 24: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RBRACE;
-          }
-        case 199: break;
-        case 105: 
-          { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD;
-          }
-        case 200: break;
-        case 43: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NE;
-          }
-        case 201: break;
-        case 23: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACE;
-          }
-        case 202: break;
-        case 98: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PRIVATE_KEYWORD;
-          }
-        case 203: break;
-        case 94: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PUBLIC_KEYWORD;
-          }
-        case 204: break;
-        case 22: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RPAR;
-          }
-        case 205: break;
-        case 95: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EXTENDS_KEYWORD;
-          }
-        case 206: break;
-        case 20: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERC;
-          }
-        case 207: break;
-        case 76: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD;
-          }
-        case 208: break;
-        case 56: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LE;
-          }
-        case 209: break;
-        case 11: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET;
-          }
-        case 210: break;
-        case 78: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ;
-          }
-        case 211: break;
-        case 102: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.UNDEFINED_KEYWORD;
-          }
-        case 212: break;
-        default:
-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-            zzAtEOF = true;
-            zzDoEOF();
-            return null;
-          }
-          else {
-            zzScanError(ZZ_NO_MATCH);
-          }
-      }
-    }
-  }
-
-
-}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index c1f28e98..ca3b792b 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -1,23 +1,44 @@
 package consulo.javascript.lang.lexer;
 
-import com.intellij.lexer.LexerBase;
+import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.javascript.lang.lexer.JavaScriptFlexLexer;
 
 %%
 
+%{
+    public _EcmaScript6Lexer(boolean highlightMode) {
+      this((java.io.Reader)null);
+      isHighlightModeOn = highlightMode;
+    }
+
+    private boolean isHighlightModeOn = false;
+    private int tagCount = 0;
+
+    public final int getTagCount() {
+      return tagCount;
+    }
+
+    public final void setTagCount(int _tagCount) {
+      tagCount = _tagCount;
+    }
+%}
+
 %public
-%class EcmaScript6Lexer
-%extends LexerBase
+%class _EcmaScript6Lexer
+%implements FlexLexer
+%implements JavaScriptFlexLexer
 %unicode
-%function advanceImpl
+%function advance
 %type IElementType
 %eof{  return;
 %eof}
 
 DIGIT=[0-9]
+OCTAL_DIGIT=[0-7]
 HEX_DIGIT=[0-9A-Fa-f]
-WHITE_SPACE_CHAR=[\ \n\r\t\f]+
+WHITE_SPACE_CHAR=[\ \n\r\t\f]
 
 IDENTIFIER=[:jletter:] [:jletterdigit:]*
 
@@ -26,11 +47,7 @@ DOC_COMMENT="/*""*"+("/"|([^"/""*"]{COMMENT_TAIL}))?
 COMMENT_TAIL=([^"*"]*("*"+[^"*""/"])?)*("*"+"/")?
 END_OF_LINE_COMMENT="/""/"[^\r\n]*
 
-
-BIN_INTEGER_LITERAL = 0 [Bb] {DIGIT}*
-OCTAL_INTEGER_LITERAL = 0 [Oo] {DIGIT}*
-
-INTEGER_LITERAL={DECIMAL_INTEGER_LITERAL}|{HEX_INTEGER_LITERAL}|{BIN_INTEGER_LITERAL}|{OCTAL_INTEGER_LITERAL}
+INTEGER_LITERAL={DECIMAL_INTEGER_LITERAL}|{HEX_INTEGER_LITERAL}
 DECIMAL_INTEGER_LITERAL=(0|([1-9]({DIGIT})*))
 HEX_INTEGER_LITERAL=0[Xx]({HEX_DIGIT})*
 
@@ -44,19 +61,97 @@ EXPONENT_PART=[Ee]["+""-"]?({DIGIT})*
 CRLF= [\ \t \f]* (\n | \r | \r\n)
 QUOTED_LITERAL="'"([^\\\'\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*("'"|\\)?
 DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
-SINGLE_INTERPOLATION_CHAR=[^]
-INTERPOLATION_STRING_LITERAL=\`{SINGLE_INTERPOLATION_CHAR}*\`
 ESCAPE_SEQUENCE=\\[^\r\n]
 GROUP = "[" [^\]]* "]"
 
 REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimx]*)?
+ALPHA=[:letter:]
 DIGIT=[0-9]
+XML_NAME=({ALPHA}|"_")({ALPHA}|{DIGIT}|"_"|"."|"-")*(":"({ALPHA}|"_")?({ALPHA}|{DIGIT}|"_"|"."|"-")*)?
+XML_COMMENT="<!--" ([^\-<\/] | (\-[^\-<\/])| (<[^!\-\/]) | (\-\-[^<>\/] | (\/[^<\/\-]) ))* "-->"
+
+FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 
 %state DIV_OR_GT
+%state TAG
+%state TAG_ATTRIBUTES
+%state TAG_CONTENT
+%state TAG_END
+%state TAG_ATTR_SQ
+%state TAG_ATTR_DQ
+%state COMMENT
+%state LAST_STATE
 
 %%
 
-<YYINITIAL, DIV_OR_GT> {WHITE_SPACE_CHAR}   { return JSTokenTypes.WHITE_SPACE; }
+<YYINITIAL,TAG,TAG_END,DIV_OR_GT,COMMENT,TAG_CONTENT> {WHITE_SPACE_CHAR}+   { return JSTokenTypes.WHITE_SPACE; }
+<TAG_ATTRIBUTES> {WHITE_SPACE_CHAR}+   { return isHighlightModeOn ? JSTokenTypes.XML_TAG_WHITE_SPACE:JSTokenTypes.WHITE_SPACE; }
+
+<YYINITIAL> "<" {
+    tagCount = 0;
+    yybegin(TAG); yypushback(yylength());
+}
+
+<TAG> "<>" { tagCount++; yybegin(TAG_CONTENT); return JSTokenTypes.XML_START_TAG_LIST; }
+<TAG> "</>" { tagCount--; yybegin(YYINITIAL); return JSTokenTypes.XML_END_TAG_LIST; }
+
+<TAG,TAG_CONTENT> "<" { tagCount++; yybegin(TAG); return JSTokenTypes.XML_START_TAG_START; }
+<TAG_CONTENT> "</" { tagCount--; yybegin(TAG_END); return JSTokenTypes.XML_END_TAG_START; }
+
+<TAG> {
+  {XML_NAME} { yybegin(TAG_ATTRIBUTES); return JSTokenTypes.XML_TAG_NAME; }
+  "{" [^}]* "}" { yybegin(TAG_ATTRIBUTES); return JSTokenTypes.XML_JS_SCRIPT; }
+}
+
+<TAG_END> {
+  {XML_NAME} { return JSTokenTypes.XML_TAG_NAME; }
+  "{" [^}]* "}" { return JSTokenTypes.XML_JS_SCRIPT; }
+}
+
+<TAG_ATTRIBUTES> {
+  {XML_NAME} { return JSTokenTypes.XML_NAME; }
+  "{" [^}]* "}" { return JSTokenTypes.XML_JS_SCRIPT; }
+}
+
+<TAG_CONTENT> "{" [^}]* "}" { return JSTokenTypes.XML_JS_SCRIPT; }
+<TAG_CONTENT> ([^\?<&\{# \n\r\t\f])* { return JSTokenTypes.XML_TAG_CONTENT; }
+<TAG_CONTENT> "<?" ([^\?]|(\?[^\>]))* "?>" { return JSTokenTypes.XML_TAG_CONTENT; }
+<TAG_CONTENT> {XML_COMMENT} { return JSTokenTypes.XML_STYLE_COMMENT; }
+
+<TAG_CONTENT,TAG_ATTR_SQ, TAG_ATTR_DQ>
+  "&" {XML_NAME} ";" |
+  "&#" {DIGIT}+ ";" |
+  "&#x" ({DIGIT}|[a-fA-F])+ ";"
+{
+  return JSTokenTypes.XML_ENTITY_REF;
+}
+
+<TAG> "/>" { yybegin(--tagCount == 0 ? YYINITIAL:TAG_CONTENT); return JSTokenTypes.XML_EMPTY_TAG_END; }
+
+<TAG_END> ">" { yybegin(tagCount == 0 ? YYINITIAL:TAG_CONTENT); return JSTokenTypes.XML_TAG_END; }
+<TAG_ATTRIBUTES> "=" { return JSTokenTypes.XML_ATTR_EQUAL; }
+<TAG_ATTRIBUTES> "\'" { yybegin(TAG_ATTR_SQ); return JSTokenTypes.XML_ATTR_VALUE_START; }
+<TAG_ATTRIBUTES> "\"" { yybegin(TAG_ATTR_DQ); return JSTokenTypes.XML_ATTR_VALUE_START; }
+<TAG_ATTRIBUTES> ">" { yybegin(TAG_CONTENT); return JSTokenTypes.XML_TAG_END; }
+<TAG_ATTRIBUTES> [^] { yybegin(TAG); yypushback(yylength()); }
+
+<TAG_ATTR_SQ> "\'" { yybegin(TAG_ATTRIBUTES); return JSTokenTypes.XML_ATTR_VALUE_END; }
+<TAG_ATTR_SQ> [^\']* { return JSTokenTypes.XML_ATTR_VALUE; }
+<TAG_ATTR_DQ> "\"" { yybegin(TAG_ATTRIBUTES); return JSTokenTypes.XML_ATTR_VALUE_END; }
+<TAG_ATTR_DQ> [^\"]* { return JSTokenTypes.XML_ATTR_VALUE; }
+
+<TAG,TAG_END, TAG_CONTENT> [^] { return JSTokenTypes.BAD_CHARACTER; }
+
+<YYINITIAL> "<!--" (.|{CRLF}+)* "//" {WHITE_SPACE_CHAR}* "-->" {
+  yybegin(COMMENT); yypushback(yylength());
+}
+
+<YYINITIAL> {XML_COMMENT} {
+  yybegin(YYINITIAL); return JSTokenTypes.XML_STYLE_COMMENT;
+}
+
+<COMMENT> "<!--" { yybegin(YYINITIAL); return JSTokenTypes.XML_STYLE_COMMENT_START; }
+<COMMENT> [^] { yybegin(YYINITIAL); yypushback(1); }
 
 <YYINITIAL,DIV_OR_GT> {C_STYLE_COMMENT}     { return JSTokenTypes.C_STYLE_COMMENT; }
 <YYINITIAL,DIV_OR_GT> {END_OF_LINE_COMMENT} { return JSTokenTypes.END_OF_LINE_COMMENT; }
@@ -65,11 +160,16 @@ DIGIT=[0-9]
 <YYINITIAL,DIV_OR_GT> {INTEGER_LITERAL}     { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
 <YYINITIAL,DIV_OR_GT> {FLOAT_LITERAL}       { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
 
-<YYINITIAL,DIV_OR_GT> {QUOTED_LITERAL}      { yybegin(YYINITIAL); return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;}
-
-<YYINITIAL,DIV_OR_GT> {INTERPOLATION_STRING_LITERAL}  { yybegin(YYINITIAL); return JSTokenTypes.INTERPOLATION_STRING_LITERAL;}
+<YYINITIAL,DIV_OR_GT> {QUOTED_LITERAL}      {
+                        yybegin(DIV_OR_GT);
+                        return isHighlightModeOn ?
+                          JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL:
+                          JSTokenTypes.STRING_LITERAL;
+                      }
 
-<YYINITIAL,DIV_OR_GT> {DOUBLE_QUOTED_LITERAL}      { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL; }
+<YYINITIAL,DIV_OR_GT>  "\\${" [^\}]* "}" { return JSTokenTypes.JSP_TEXT; }
+<YYINITIAL,DIV_OR_GT>  "${" [^\}]* "}" { return JSTokenTypes.JSP_TEXT; }
+<YYINITIAL,DIV_OR_GT> {DOUBLE_QUOTED_LITERAL}      { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
 
 <YYINITIAL,DIV_OR_GT> "true"                { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD; }
 <YYINITIAL,DIV_OR_GT> "false"               { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD; }
@@ -102,27 +202,50 @@ DIGIT=[0-9]
 <YYINITIAL,DIV_OR_GT> "void"                { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD; }
 <YYINITIAL,DIV_OR_GT> "while"               { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD; }
 <YYINITIAL,DIV_OR_GT> "with"                { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "yield"               { yybegin(YYINITIAL); return JSTokenTypes.YIELD_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "let"                 { yybegin(YYINITIAL); return JSTokenTypes.LET_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "class"               { yybegin(YYINITIAL); return JSTokenTypes.CLASS_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "export"              { yybegin(YYINITIAL); return JSTokenTypes.EXPORT_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "extends"             { yybegin(YYINITIAL); return JSTokenTypes.EXTENDS_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "static"              { yybegin(YYINITIAL); return JSTokenTypes.STATIC_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "enum"                { yybegin(YYINITIAL); return JSTokenTypes.ENUM_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "import"              { yybegin(YYINITIAL); return JSTokenTypes.IMPORT_KEYWORD; }
-
-<YYINITIAL,DIV_OR_GT> "public"              { yybegin(YYINITIAL); return JSTokenTypes.PUBLIC_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "private"             { yybegin(YYINITIAL); return JSTokenTypes.PRIVATE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "protected"           { yybegin(YYINITIAL); return JSTokenTypes.PROTECTED_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "package"             { yybegin(YYINITIAL); return JSTokenTypes.PACKAGE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "interface"           { yybegin(YYINITIAL); return JSTokenTypes.INTERFACE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT> "implements"          { yybegin(YYINITIAL); return JSTokenTypes.IMPLEMENTS_KEYWORD; }
 
-<YYINITIAL, DIV_OR_GT> {IDENTIFIER}         { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER; }
-
-
-<YYINITIAL, DIV_OR_GT> "."                   { yybegin(YYINITIAL); return JSTokenTypes.DOT; }
-<YYINITIAL, DIV_OR_GT> "..."                 { yybegin(YYINITIAL); return JSTokenTypes.DOT_DOT_DOT; }
+<YYINITIAL,DIV_OR_GT> "::"                  {
+                          yybegin(YYINITIAL);
+                          return JSTokenTypes.COLON_COLON;
+                       }
+
+<YYINITIAL,DIV_OR_GT> "..."                  {
+                            yybegin(YYINITIAL);
+                            return JSTokenTypes.DOT_DOT_DOT;
+                      }
+
+<YYINITIAL,DIV_OR_GT> ".."                  {
+                                        yybegin(YYINITIAL);
+                                                      return JSTokenTypes.DOT_DOT;
+                      }
+<YYINITIAL,DIV_OR_GT> "class"               { yybegin(YYINITIAL); return JSTokenTypes.CLASS_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "export"              { yybegin(YYINITIAL); return JSTokenTypes.EXPORT_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "interface"           { yybegin(YYINITIAL); return JSTokenTypes.INTERFACE_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "extends"             { yybegin(YYINITIAL); return JSTokenTypes.EXTENDS_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "implements"          { yybegin(YYINITIAL); return JSTokenTypes.IMPLEMENTS_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "public"              { yybegin(YYINITIAL); return JSTokenTypes.PUBLIC_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "static"              { yybegin(YYINITIAL); return JSTokenTypes.STATIC_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "internal"            { yybegin(YYINITIAL); return JSTokenTypes.INTERNAL_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "final"               { yybegin(YYINITIAL); return JSTokenTypes.FINAL_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "dynamic"             { yybegin(YYINITIAL); return JSTokenTypes.DYNAMIC_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "import"              { yybegin(YYINITIAL); return JSTokenTypes.IMPORT_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "use"                 { yybegin(YYINITIAL); return JSTokenTypes.USE_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "super"               { yybegin(YYINITIAL); return JSTokenTypes.SUPER_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "include"             { yybegin(YYINITIAL); return JSTokenTypes.INCLUDE_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "as"                  { yybegin(YYINITIAL); return JSTokenTypes.AS_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "yield"               { yybegin(YYINITIAL); return JSTokenTypes.YIELD_KEYWORD ; }
+<YYINITIAL,DIV_OR_GT> "let"                 { yybegin(YYINITIAL); return JSTokenTypes.LET_KEYWORD ; }
+
+<YYINITIAL,DIV_OR_GT> "@"                   {
+    return JSTokenTypes.AT;
+}
+
+<YYINITIAL,DIV_OR_GT> {IDENTIFIER}          { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER; }
+
+<YYINITIAL> "*"       {                           yybegin(DIV_OR_GT);
+                                                  return JSTokenTypes.ANY_IDENTIFIER;
+                      }
+
+<YYINITIAL,DIV_OR_GT> "."                   { return JSTokenTypes.DOT; }
 
 
 <YYINITIAL,DIV_OR_GT> "==="                 { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ; }
@@ -134,30 +257,43 @@ DIGIT=[0-9]
 <YYINITIAL,DIV_OR_GT> "=>"                  { yybegin(YYINITIAL); return JSTokenTypes.DARROW; }
 <YYINITIAL,DIV_OR_GT> "=="                  { yybegin(YYINITIAL); return JSTokenTypes.EQEQ; }
 <YYINITIAL,DIV_OR_GT> "!="                  { yybegin(YYINITIAL); return JSTokenTypes.NE; }
-<DIV_OR_GT> "<"                             { yybegin(YYINITIAL); return JSTokenTypes.LT; }
+<DIV_OR_GT> "<"       { yybegin(YYINITIAL); return JSTokenTypes.LT; }
+<YYINITIAL,DIV_OR_GT> "&lt;"                { yybegin(YYINITIAL); return JSTokenTypes.LT; }
 <YYINITIAL,DIV_OR_GT> ">"                   { yybegin(YYINITIAL); return JSTokenTypes.GT; }
-<DIV_OR_GT> "<="                            { yybegin(YYINITIAL); return JSTokenTypes.LE; }
+<YYINITIAL,DIV_OR_GT> "&gt;"                { yybegin(YYINITIAL); return JSTokenTypes.GT; }
+<DIV_OR_GT> "<="      { yybegin(YYINITIAL); return JSTokenTypes.LE; }
+<YYINITIAL,DIV_OR_GT> "&lt;="               { yybegin(YYINITIAL); return JSTokenTypes.LE; }
 <YYINITIAL,DIV_OR_GT> ">="                  { yybegin(YYINITIAL); return JSTokenTypes.GE; }
-<DIV_OR_GT> "<<"                            { yybegin(YYINITIAL); return JSTokenTypes.LTLT; }
+<YYINITIAL,DIV_OR_GT> "&gt;="               { yybegin(YYINITIAL); return JSTokenTypes.GE; }
+<DIV_OR_GT> "<<"      { yybegin(YYINITIAL); return JSTokenTypes.LTLT; }
+<YYINITIAL,DIV_OR_GT> "&lt;&lt;"            { yybegin(YYINITIAL); return JSTokenTypes.LTLT; }
 <YYINITIAL,DIV_OR_GT> ">>"                  { yybegin(YYINITIAL); return JSTokenTypes.GTGT; }
+<YYINITIAL,DIV_OR_GT> "&gt;&gt;"            { yybegin(YYINITIAL); return JSTokenTypes.GTGT; }
 <YYINITIAL,DIV_OR_GT> ">>>"                 { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT; }
+<YYINITIAL,DIV_OR_GT> "&gt;&gt;&gt;"        { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT; }
 
 <YYINITIAL,DIV_OR_GT> "&"                   { yybegin(YYINITIAL); return JSTokenTypes.AND; }
+<YYINITIAL,DIV_OR_GT> "&amp;"               { yybegin(YYINITIAL); return JSTokenTypes.AND; }
 <YYINITIAL,DIV_OR_GT> "&&"                  { yybegin(YYINITIAL); return JSTokenTypes.ANDAND; }
+<YYINITIAL,DIV_OR_GT> "&amp;&amp;"          { yybegin(YYINITIAL); return JSTokenTypes.ANDAND; }
 <YYINITIAL,DIV_OR_GT> "|"                   { yybegin(YYINITIAL); return JSTokenTypes.OR; }
 <YYINITIAL,DIV_OR_GT> "||"                  { yybegin(YYINITIAL); return JSTokenTypes.OROR; }
 
 <YYINITIAL,DIV_OR_GT> "+="                  { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ; }
 <YYINITIAL,DIV_OR_GT> "-="                  { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ; }
-<DIV_OR_GT> "*="                            { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ; }
-<DIV_OR_GT> "/="                            { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ; }
+<DIV_OR_GT> "*="      { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ; }
+<DIV_OR_GT> "/="      { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ; }
 <YYINITIAL,DIV_OR_GT> "&="                  { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ; }
+<YYINITIAL,DIV_OR_GT> "&amp;="              { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ; }
 <YYINITIAL,DIV_OR_GT> "|="                  { yybegin(YYINITIAL); return JSTokenTypes.OREQ; }
 <YYINITIAL,DIV_OR_GT> "^="                  { yybegin(YYINITIAL); return JSTokenTypes.XOREQ; }
 <YYINITIAL,DIV_OR_GT> "%="                  { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ; }
-<DIV_OR_GT> "<<="                           { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
+<DIV_OR_GT> "<<="     { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
+<YYINITIAL,DIV_OR_GT> "&lt;&lt;="           { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
 <YYINITIAL,DIV_OR_GT> ">>="                 { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ; }
+<YYINITIAL,DIV_OR_GT> "&gt;&gt;="           { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ; }
 <YYINITIAL,DIV_OR_GT> ">>>="                { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ; }
+<YYINITIAL,DIV_OR_GT> "&gt;&gt;&gt;="       { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ; }
 
 <YYINITIAL,DIV_OR_GT> "("                   { yybegin(YYINITIAL); return JSTokenTypes.LPAR; }
 <YYINITIAL,DIV_OR_GT> ")"                   { yybegin(DIV_OR_GT);       return JSTokenTypes.RPAR; }
@@ -175,13 +311,13 @@ DIGIT=[0-9]
 <YYINITIAL,DIV_OR_GT> ":"                   { yybegin(YYINITIAL); return JSTokenTypes.COLON; }
 <YYINITIAL,DIV_OR_GT> "+"                   { yybegin(YYINITIAL); return JSTokenTypes.PLUS; }
 <YYINITIAL,DIV_OR_GT> "-"                   { yybegin(YYINITIAL); return JSTokenTypes.MINUS; }
-<YYINITIAL,DIV_OR_GT> "*"                             { yybegin(YYINITIAL); return JSTokenTypes.MULT; }
-<DIV_OR_GT> "/"                             { yybegin(YYINITIAL); return JSTokenTypes.DIV; }
+<DIV_OR_GT> "*"       { yybegin(YYINITIAL); return JSTokenTypes.MULT; }
+<DIV_OR_GT> "/"       { yybegin(YYINITIAL); return JSTokenTypes.DIV; }
 <YYINITIAL,DIV_OR_GT> "^"                   { yybegin(YYINITIAL); return JSTokenTypes.XOR; }
 <YYINITIAL,DIV_OR_GT> "%"                   { yybegin(YYINITIAL); return JSTokenTypes.PERC; }
 
-<YYINITIAL> {REGEXP_LITERAL}                { return JSTokenTypes.REGEXP_LITERAL; }
-
-<YYINITIAL> "/"                             { return JSTokenTypes.DIV; }
+<YYINITIAL> {REGEXP_LITERAL} { return JSTokenTypes.REGEXP_LITERAL; }
 
-<YYINITIAL,DIV_OR_GT> [^]                   { return JSTokenTypes.BAD_CHARACTER; }
\ No newline at end of file
+<YYINITIAL,DIV_OR_GT> "]]>" { yybegin(YYINITIAL); return JSTokenTypes.CDATA_END; }
+<YYINITIAL,DIV_OR_GT> "<![CDATA[" { yybegin(YYINITIAL); return JSTokenTypes.CDATA_START; }
+.                     { yybegin(YYINITIAL); return JSTokenTypes.BAD_CHARACTER; }
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea
new file mode 100644
index 00000000..e69de29b
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index f0ea32ed..55fdc7f8 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -16,15 +16,16 @@
 
 package consulo.javascript.lang.parsing;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.logging.Logger;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -32,7 +33,7 @@
  */
 public class EcmaScript6StatementParsing extends StatementParsing
 {
-	public static final Logger LOGGER = Logger.getInstance(EcmaScript6StatementParsing.class);
+	private static final Logger LOGGER = Logger.getInstance(EcmaScript6StatementParsing.class);
 
 	public EcmaScript6StatementParsing(EcmaScript6ParsingContext context)
 	{
@@ -76,6 +77,118 @@ else if(nextType == JSTokenTypes.VAR_KEYWORD ||
 		}
 	}
 
+	@Override
+	protected void doParseStatement(PsiBuilder builder, boolean canHaveClasses)
+	{
+		if(canHaveClasses)
+		{
+			if(builder.getTokenType() == JSTokenTypes.IMPORT_KEYWORD)
+			{
+				parseImportStatement(builder);
+				return;
+			}
+		}
+		super.doParseStatement(builder, canHaveClasses);
+	}
+
+	private void parseImportStatement(final PsiBuilder builder)
+	{
+		final PsiBuilder.Marker importStatement = builder.mark();
+		try
+		{
+			builder.advanceLexer();
+
+			// TODO [VISTALL] specific element
+			if(builder.getTokenType() == JSTokenTypes.LBRACE)
+			{
+				builder.advanceLexer();
+
+				boolean first = true;
+				while(!builder.eof())
+				{
+					if(builder.getTokenType() == JSTokenTypes.RBRACE)
+					{
+						break;
+					}
+
+					if(!first)
+					{
+						if(builder.getTokenType() == JSTokenTypes.COMMA)
+						{
+							builder.advanceLexer();
+						}
+						else
+						{
+							builder.error("Comma expected");
+						}
+					}
+
+					first = false;
+
+					if(!getExpressionParsing().parseQualifiedTypeName(builder, false))
+					{
+						builder.error("Reference expected");
+					}
+				}
+
+				if(builder.getTokenType() != JSTokenTypes.RBRACE)
+				{
+					builder.error("'}' expected");
+				}
+				else
+				{
+					builder.advanceLexer();
+				}
+			}
+			else if(builder.getTokenType() == JSTokenTypes.ASTERISK)
+			{
+				builder.advanceLexer();
+			}
+			else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
+			{
+				getExpressionParsing().parseQualifiedTypeName(builder, false);
+			}
+			else
+			{
+				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+			}
+
+			if(builder.getTokenType() == JSTokenTypes.AS_KEYWORD)
+			{
+				builder.advanceLexer();
+
+				if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
+				{
+					builder.advanceLexer();
+				}
+				else
+				{
+					builder.error("Expected identifier");
+				}
+			}
+
+			if(expectContextKeyword(builder, JSTokenTypes.FROM_KEYWORD))
+			{
+				advanceContextKeyword(builder, JSTokenTypes.FROM_KEYWORD);
+
+				if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
+				{
+					builder.advanceLexer();
+				}
+				else
+				{
+					builder.error("Expecte from target");
+				}
+			}
+
+			checkForSemicolon(builder);
+		}
+		finally
+		{
+			importStatement.done(JSElementTypes.IMPORT_STATEMENT);
+		}
+	}
+
 	@Override
 	protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses)
 	{
@@ -234,7 +347,7 @@ else if(expectContextKeyword(builder, TokenSet.create(JSTokenTypes.STATIC_KEYWOR
 	private void parseReferenceList(final PsiBuilder builder)
 	{
 		final IElementType tokenType = builder.getTokenType();
-		EcmaScript6StatementParsing.LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
+		LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
 		final PsiBuilder.Marker referenceList = builder.mark();
 		builder.advanceLexer();
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index 30d95f05..7ca559ef 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.highlighting;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
 import com.intellij.codeInsight.daemon.impl.HighlightVisitor;
@@ -37,11 +35,15 @@
 import com.intellij.psi.util.PsiUtilCore;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
+import consulo.javascript.lang.JavaScriptContextKeywordElementType;
 import consulo.javascript.lang.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.JavaScriptVersionUtil;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public class JavaScriptHighlightVisitor extends JSElementVisitor implements HighlightVisitor
 {
 	private HighlightInfoHolder myHighlightInfoHolder;
@@ -69,7 +71,7 @@ else if(elementType == JSTokenTypes.IDENTIFIER)
 		{
 			addElementHighlight(parent, element);
 		}
-		else if(JSTokenTypes.CONTEXT_KEYWORDS.contains(elementType))
+		else if(JavaScriptContextKeywordElementType.containsKeyword(elementType))
 		{
 			myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).textAttributes(JavaScriptSyntaxHighlightKeys.JS_KEYWORD).range(element).create());
 		}
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
index 47e3667c..3d11eb7f 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
@@ -16,17 +16,18 @@
 
 package consulo.javascript.lang;
 
-import org.intellij.lang.regexp.RegExpLanguage;
-import javax.annotation.Nonnull;
-import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.tree.IElementType;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
+import org.intellij.lang.regexp.RegExpLanguage;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -50,6 +51,12 @@ public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiE
 				{
 					textLength --;
 				}
+
+				if(textLength <= 1)
+				{
+					return;
+				}
+
 				registrar.startInjecting(RegExpLanguage.INSTANCE).addPlace(null, null, (PsiLanguageInjectionHost) context, new TextRange(1, textLength)).doneInjecting();
 			}
 		}

From e9e52b5f0aa5540b1b3f47d8acdee6fc5516ec8c Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 12:54:30 +0300
Subject: [PATCH 063/340] try fix problem with wrong lexing attr like att={{}}

---
 .../lang/javascript/JSTokenTypes.java         |  2 +-
 .../lang/EcmaScript6JavaScriptVersion.java    | 15 +++--
 .../javascript/lang/lexer/ecmascript6.flex    | 62 +++++++++++++++++--
 .../parsing/EcmaScript6StatementParsing.java  |  9 ++-
 4 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 31fd4931..9a549a20 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -296,7 +296,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 			JavaScriptHighlightingLexer.getTagContentTokenType(), XML_TAG_WHITE_SPACE, JSP_TEXT, JSDOC_TAG_DATA);
 
 	TokenSet MODIFIERS = TokenSet.create(PUBLIC_KEYWORD, STATIC_KEYWORD, OVERRIDE_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD, DYNAMIC_KEYWORD, FINAL_KEYWORD, NATIVE_KEYWORD,
-			VIRTUAL_KEYWORD);
+			VIRTUAL_KEYWORD, EXPORT_KEYWORD);
 
 	TokenSet ACCESS_MODIFIERS = TokenSet.create(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD);
 
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 12f18bce..38cc4ac6 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -17,9 +17,11 @@
 package consulo.javascript.lang;
 
 import com.intellij.lang.PsiParser;
+import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lexer.Lexer;
+import com.intellij.lexer.MergingLexerAdapter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.util.Factory;
+import com.intellij.psi.tree.TokenSet;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScriptFlexAdapter;
 import consulo.javascript.lang.lexer._EcmaScript6Lexer;
@@ -33,8 +35,6 @@
  */
 public class EcmaScript6JavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
-	private static final Factory<Lexer> ourLexerFactory = () -> new JavaScriptFlexAdapter(new _EcmaScript6Lexer(false));
-
 	@Nonnull
 	public static EcmaScript6JavaScriptVersion getInstance()
 	{
@@ -63,14 +63,19 @@ public String getPresentableName()
 	@Override
 	public Lexer createLexer()
 	{
-		return ourLexerFactory.create();
+		return createLexer(false);
 	}
 
 	@Nonnull
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter()
 	{
-		return new JavaScriptHighlighter(() -> new JavaScriptFlexAdapter(new _EcmaScript6Lexer(true)));
+		return new JavaScriptHighlighter(() -> createLexer(true));
+	}
+
+	private Lexer createLexer(boolean hightlight)
+	{
+		return new MergingLexerAdapter(new JavaScriptFlexAdapter(new _EcmaScript6Lexer(hightlight)), TokenSet.create(JSTokenTypes.XML_JS_SCRIPT));
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index ca3b792b..b50d1ef1 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -16,6 +16,9 @@ import consulo.javascript.lang.lexer.JavaScriptFlexLexer;
     private boolean isHighlightModeOn = false;
     private int tagCount = 0;
 
+    private int braceCount;
+    private com.intellij.util.containers.IntStack jsExits = new com.intellij.util.containers.IntStack();
+
     public final int getTagCount() {
       return tagCount;
     }
@@ -32,8 +35,6 @@ import consulo.javascript.lang.lexer.JavaScriptFlexLexer;
 %unicode
 %function advance
 %type IElementType
-%eof{  return;
-%eof}
 
 DIGIT=[0-9]
 OCTAL_DIGIT=[0-7]
@@ -79,6 +80,7 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 %state TAG_END
 %state TAG_ATTR_SQ
 %state TAG_ATTR_DQ
+%state TAG_JS_SCRIPT
 %state COMMENT
 %state LAST_STATE
 
@@ -100,20 +102,44 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 
 <TAG> {
   {XML_NAME} { yybegin(TAG_ATTRIBUTES); return JSTokenTypes.XML_TAG_NAME; }
-  "{" [^}]* "}" { yybegin(TAG_ATTRIBUTES); return JSTokenTypes.XML_JS_SCRIPT; }
+  "{"
+  {
+  	jsExits.push(TAG);
+  	yypushback(1);
+  	yybegin(TAG_JS_SCRIPT);
+  }
 }
 
 <TAG_END> {
   {XML_NAME} { return JSTokenTypes.XML_TAG_NAME; }
-  "{" [^}]* "}" { return JSTokenTypes.XML_JS_SCRIPT; }
+  "{"
+  {
+  	jsExits.push(TAG_END);
+  	yypushback(1);
+  	yybegin(TAG_JS_SCRIPT);
+  }
 }
 
 <TAG_ATTRIBUTES> {
   {XML_NAME} { return JSTokenTypes.XML_NAME; }
-  "{" [^}]* "}" { return JSTokenTypes.XML_JS_SCRIPT; }
+  "{"
+  {
+  	jsExits.push(TAG_ATTRIBUTES);
+  	yypushback(1);
+  	yybegin(TAG_JS_SCRIPT);
+  }
+}
+
+<TAG_CONTENT>
+{
+	"{"
+	{
+		jsExits.push(TAG_CONTENT);
+		yypushback(1);
+		yybegin(TAG_JS_SCRIPT);
+	}
 }
 
-<TAG_CONTENT> "{" [^}]* "}" { return JSTokenTypes.XML_JS_SCRIPT; }
 <TAG_CONTENT> ([^\?<&\{# \n\r\t\f])* { return JSTokenTypes.XML_TAG_CONTENT; }
 <TAG_CONTENT> "<?" ([^\?]|(\?[^\>]))* "?>" { return JSTokenTypes.XML_TAG_CONTENT; }
 <TAG_CONTENT> {XML_COMMENT} { return JSTokenTypes.XML_STYLE_COMMENT; }
@@ -142,6 +168,30 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 
 <TAG,TAG_END, TAG_CONTENT> [^] { return JSTokenTypes.BAD_CHARACTER; }
 
+<TAG_JS_SCRIPT>
+{
+	"{"
+	{
+		braceCount ++;
+		return JSTokenTypes.XML_JS_SCRIPT;
+	}
+
+	"}"
+	{
+		braceCount --;
+		if(braceCount <= 0)
+		{
+			yybegin(jsExits.peek());
+			return JSTokenTypes.XML_JS_SCRIPT;
+		}
+	}
+
+	[^]
+	{
+		return JSTokenTypes.XML_JS_SCRIPT;
+	}
+}
+
 <YYINITIAL> "<!--" (.|{CRLF}+)* "//" {WHITE_SPACE_CHAR}* "-->" {
   yybegin(COMMENT); yypushback(yylength());
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index 55fdc7f8..9512a978 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -98,6 +98,8 @@ private void parseImportStatement(final PsiBuilder builder)
 		{
 			builder.advanceLexer();
 
+			boolean wantFrom = true;
+
 			// TODO [VISTALL] specific element
 			if(builder.getTokenType() == JSTokenTypes.LBRACE)
 			{
@@ -148,6 +150,11 @@ else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 			{
 				getExpressionParsing().parseQualifiedTypeName(builder, false);
 			}
+			else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
+			{
+				builder.advanceLexer();
+				wantFrom = false;
+			}
 			else
 			{
 				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
@@ -167,7 +174,7 @@ else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 				}
 			}
 
-			if(expectContextKeyword(builder, JSTokenTypes.FROM_KEYWORD))
+			if(wantFrom && expectContextKeyword(builder, JSTokenTypes.FROM_KEYWORD))
 			{
 				advanceContextKeyword(builder, JSTokenTypes.FROM_KEYWORD);
 

From 7c108912131d16a045c789420b5f668ec65223e5 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 13:45:31 +0300
Subject: [PATCH 064/340] deconstruction var initial parsing

---
 .../psi/JSDestructuringElement.java           |   9 ++
 .../javascript/psi/JSDestructuringObject.java |   9 ++
 .../JSDestructuringShorthandedProperty.java   |   9 ++
 .../lang/javascript/JSElementTypes.java       |  10 +-
 .../javascript/lang/parsing/Parsing.java      |   5 +
 .../lang/parsing/StatementParsing.java        | 131 +++++++++++++-----
 .../JavaSciptDestructuringElementImpl.java    |  26 ++++
 .../JavaSciptDestructuringObjectImpl.java     |  26 ++++
 ...tDestructuringShorthandedPropertyImpl.java |  26 ++++
 9 files changed, 213 insertions(+), 38 deletions(-)
 create mode 100644 base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
 create mode 100644 base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
 create mode 100644 base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
new file mode 100644
index 00000000..71199b2d
--- /dev/null
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
@@ -0,0 +1,9 @@
+package com.intellij.lang.javascript.psi;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public interface JSDestructuringElement extends JSElement
+{
+}
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
new file mode 100644
index 00000000..6d75ccf5
--- /dev/null
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
@@ -0,0 +1,9 @@
+package com.intellij.lang.javascript.psi;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public interface JSDestructuringObject extends JSElement
+{
+}
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
new file mode 100644
index 00000000..feed691b
--- /dev/null
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
@@ -0,0 +1,9 @@
+package com.intellij.lang.javascript.psi;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public interface JSDestructuringShorthandedProperty extends JSElement
+{
+}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 498e3a83..f3757ee2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.psi.*;
@@ -30,11 +28,16 @@
 import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.psi.tree.TokenSet;
 import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringElementImpl;
+import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringObjectImpl;
+import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringShorthandedPropertyImpl;
 import consulo.javascript.psi.impl.JSComputedNameImpl;
 import consulo.javascript.psi.impl.JavaScriptLambdaExpressionImpl;
 import consulo.javascript.psi.stubs.JSFileStub;
 import consulo.psi.tree.ElementTypeAsPsiFactory;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -103,6 +106,9 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	IElementType IF_STATEMENT = new ElementTypeAsPsiFactory("IF_STATEMENT", JavaScriptLanguage.INSTANCE, JSIfStatementImpl.class);
 	IElementType CONTINUE_STATEMENT = new ElementTypeAsPsiFactory("CONTINUE_STATEMENT", JavaScriptLanguage.INSTANCE, JSContinueStatementImpl.class);
 	IElementType BREAK_STATEMENT = new ElementTypeAsPsiFactory("BREAK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBreakStatementImpl.class);
+	IElementType DESTRUCTURING_ELEMENT = new ElementTypeAsPsiFactory("DESTRUCTURING_ELEMENT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringElementImpl.class);
+	IElementType DESTRUCTURING_OBJECT = new ElementTypeAsPsiFactory("DESTRUCTURING_OBJECT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringObjectImpl.class);
+	IElementType DESTRUCTURING_SHORTHANDED_PROPERTY = new ElementTypeAsPsiFactory("DESTRUCTURING_SHORTHANDED_PROPERTY", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringShorthandedPropertyImpl.class);
 	IElementType WITH_STATEMENT = new ElementTypeAsPsiFactory("WITH_STATEMENT", JavaScriptLanguage.INSTANCE, JSWithStatementImpl.class);
 	IElementType RETURN_STATEMENT = new ElementTypeAsPsiFactory("RETURN_STATEMENT", JavaScriptLanguage.INSTANCE, JSReturnStatementImpl.class);
 	IElementType THROW_STATEMENT = new ElementTypeAsPsiFactory("THROW_STATEMENT", JavaScriptLanguage.INSTANCE, JSThrowStatementImpl.class);
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index ba0ad8b5..cc80443a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -143,6 +143,11 @@ public boolean isIdentifierToken(PsiBuilder builder, IElementType tokenType)
 		return myContext.isIdentifierToken(builder, tokenType);
 	}
 
+	public boolean isIdentifierToken(PsiBuilder builder)
+	{
+		return myContext.isIdentifierName(builder, builder.getTokenType());
+	}
+
 	public boolean isIdentifierName(PsiBuilder builder, IElementType tokenType)
 	{
 		return myContext.isIdentifierName(builder, tokenType);
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 6f2a4fd8..277ac749 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -16,21 +16,21 @@
 
 package consulo.javascript.lang.parsing;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.tree.IElementType;
+import consulo.logging.Logger;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author max
  */
 public class StatementParsing extends Parsing
 {
-	private static final Logger LOGGER = Logger.getInstance(StatementParsing.class);
+	private static final Logger LOG = Logger.getInstance(StatementParsing.class);
 
 	public StatementParsing(JavaScriptParsingContext context)
 	{
@@ -223,7 +223,7 @@ protected boolean parseExpressionStatement(PsiBuilder builder)
 
 	protected void parseYieldStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.YIELD_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.YIELD_KEYWORD);
 		final PsiBuilder.Marker marker = builder.mark();
 		builder.advanceLexer();
 
@@ -242,7 +242,7 @@ protected void parseLetStatement(final PsiBuilder builder)
 
 	PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LET_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LET_KEYWORD);
 		final PsiBuilder.Marker marker = builder.mark();
 		builder.advanceLexer();
 
@@ -269,7 +269,7 @@ PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder)
 
 	void parseIncludeDirective(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
 		final PsiBuilder.Marker useNSStatement = builder.mark();
 		builder.advanceLexer();
 		Parsing.checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptBundle.message("javascript.parser.message.expected.string.literal"));
@@ -280,7 +280,7 @@ void parseIncludeDirective(final PsiBuilder builder)
 
 	protected void parseTryStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.TRY_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.TRY_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 		parseBlock(builder);
@@ -301,7 +301,7 @@ protected void parseTryStatement(final PsiBuilder builder)
 
 	private void parseCatchBlock(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
 		final PsiBuilder.Marker block = builder.mark();
 		builder.advanceLexer();
 		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
@@ -339,7 +339,7 @@ private void parseCatchBlock(final PsiBuilder builder)
 
 	protected void parseThrowStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.THROW_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.THROW_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -351,7 +351,7 @@ protected void parseThrowStatement(final PsiBuilder builder)
 
 	protected void parseSwitchStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.SWITCH_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.SWITCH_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -403,7 +403,7 @@ private void parseCaseOrDefaultClause(final PsiBuilder builder)
 
 	protected void parseWithStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.WITH_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.WITH_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -418,7 +418,7 @@ protected void parseWithStatement(final PsiBuilder builder)
 
 	protected void parseReturnStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.RETURN_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.RETURN_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		boolean hasNewLine = hasSemanticLineBeforeNextToken(builder);
 		builder.advanceLexer();
@@ -433,7 +433,7 @@ protected void parseReturnStatement(final PsiBuilder builder)
 
 	protected void parseBreakStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.BREAK_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.BREAK_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 
 		boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
@@ -454,7 +454,7 @@ protected void parseBreakStatement(final PsiBuilder builder)
 
 	protected void parseContinueStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.CONTINUE_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CONTINUE_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
 		builder.advanceLexer();
@@ -527,13 +527,13 @@ else if(tokenType == JSTokenTypes.FOR_KEYWORD)
 		}
 		else
 		{
-			StatementParsing.LOGGER.error("Unknown iteration statement");
+			StatementParsing.LOG.error("Unknown iteration statement");
 		}
 	}
 
 	private void parseForStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.FOR_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.FOR_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		final boolean forin = parseForLoopHeader(builder);
 
@@ -598,7 +598,7 @@ else if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
 
 	private void parseWhileStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.WHILE_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.WHILE_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -612,7 +612,7 @@ private void parseWhileStatement(final PsiBuilder builder)
 
 	private void parseDoWhileStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.DO_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.DO_KEYWORD);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
@@ -628,7 +628,7 @@ private void parseDoWhileStatement(final PsiBuilder builder)
 
 	protected void parseIfStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.IF_KEYWORD);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.IF_KEYWORD);
 		final PsiBuilder.Marker ifStatement = builder.mark();
 		builder.advanceLexer();
 
@@ -656,7 +656,7 @@ protected void parseIfStatement(final PsiBuilder builder)
 
 	protected void parseEmptyStatement(final PsiBuilder builder)
 	{
-		StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.SEMICOLON);
+		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.SEMICOLON);
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 		statement.done(JSElementTypes.EMPTY_STATEMENT);
@@ -670,28 +670,36 @@ protected void parseVarStatement(final PsiBuilder builder, final boolean inForIn
 	protected void parseVarStatementNoMarker(final PsiBuilder builder, final boolean inForInitializationContext, final @Nonnull PsiBuilder.Marker var)
 	{
 		final IElementType declType = builder.getTokenType();
-		StatementParsing.LOGGER.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
+		LOG.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
 				declType == JSTokenTypes.CONST_KEYWORD ||
 				declType == JSTokenTypes.LET_KEYWORD);
 
 		builder.advanceLexer();
-		boolean first = true;
-		while(true)
+
+		if(builder.getTokenType() == JSTokenTypes.LBRACE)
 		{
-			if(first)
-			{
-				first = false;
-			}
-			else
+			parseDeconstructionElement(builder);
+		}
+		else
+		{
+			boolean first = true;
+			while(true)
 			{
-				Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptBundle.message("javascript.parser.message.expected.comma"));
-			}
+				if(first)
+				{
+					first = false;
+				}
+				else
+				{
+					Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptBundle.message("javascript.parser.message.expected.comma"));
+				}
 
-			parseVarDeclaration(builder, !inForInitializationContext);
+				parseVarDeclaration(builder, !inForInitializationContext);
 
-			if(builder.getTokenType() != JSTokenTypes.COMMA)
-			{
-				break;
+				if(builder.getTokenType() != JSTokenTypes.COMMA)
+				{
+					break;
+				}
 			}
 		}
 
@@ -703,6 +711,51 @@ protected void parseVarStatementNoMarker(final PsiBuilder builder, final boolean
 		var.done(JSElementTypes.VAR_STATEMENT);
 	}
 
+	protected void parseDeconstructionElement(PsiBuilder builder)
+	{
+		PsiBuilder.Marker mark = builder.mark();
+
+		PsiBuilder.Marker desctructionObjectMarker = builder.mark();
+		builder.advanceLexer();
+
+		boolean first = true;
+		while(!builder.eof())
+		{
+			if(builder.getTokenType() == JSTokenTypes.RBRACE)
+			{
+				break;
+			}
+
+			if(!first)
+			{
+				Parsing.checkMatches(builder, JSTokenTypes.COMMA, "Comma expected");
+			}
+
+			first = false;
+
+			if(isIdentifierToken(builder))
+			{
+				PsiBuilder.Marker propertyMarker = builder.mark();
+				builder.advanceLexer();
+				propertyMarker.done(JSElementTypes.DESTRUCTURING_SHORTHANDED_PROPERTY);
+			}
+			else
+			{
+				PsiBuilder.Marker err = builder.mark();
+				builder.advanceLexer();
+				err.error("Expected identifier");
+			}
+		}
+
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, "'}' expected");
+
+		desctructionObjectMarker.done(JSElementTypes.DESTRUCTURING_OBJECT);
+
+		parseVarInitializer(builder, false);
+
+		mark.done(JSElementTypes.DESTRUCTURING_ELEMENT);
+	}
+
 	protected void checkForSemicolon(final PsiBuilder builder)
 	{
 		if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
@@ -726,6 +779,13 @@ protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
 
 		getExpressionParsing().tryParseType(builder);
 
+		parseVarInitializer(builder, allowIn);
+
+		var.done(JSElementTypes.VARIABLE);
+	}
+
+	protected void parseVarInitializer(PsiBuilder builder, boolean allowIn)
+	{
 		if(builder.getTokenType() == JSTokenTypes.EQ)
 		{
 			builder.advanceLexer();
@@ -744,7 +804,6 @@ protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
 				}
 			}
 		}
-		var.done(JSElementTypes.VARIABLE);
 	}
 
 	public void parseBlock(final PsiBuilder builder)
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
new file mode 100644
index 00000000..d51b138a
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
@@ -0,0 +1,26 @@
+package consulo.javascript.lang.parsing.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSDestructuringElement;
+import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public class JavaSciptDestructuringElementImpl extends JSElementImpl implements JSDestructuringElement
+{
+	public JavaSciptDestructuringElementImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@Override
+	public void accept(@Nonnull PsiElementVisitor visitor)
+	{
+
+	}
+}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
new file mode 100644
index 00000000..d7ca782f
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
@@ -0,0 +1,26 @@
+package consulo.javascript.lang.parsing.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSDestructuringObject;
+import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public class JavaSciptDestructuringObjectImpl extends JSElementImpl implements JSDestructuringObject
+{
+	public JavaSciptDestructuringObjectImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@Override
+	public void accept(@Nonnull PsiElementVisitor visitor)
+	{
+
+	}
+}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
new file mode 100644
index 00000000..7a770a40
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
@@ -0,0 +1,26 @@
+package consulo.javascript.lang.parsing.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSDestructuringShorthandedProperty;
+import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public class JavaScriptDestructuringShorthandedPropertyImpl extends JSElementImpl implements JSDestructuringShorthandedProperty
+{
+	public JavaScriptDestructuringShorthandedPropertyImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@Override
+	public void accept(@Nonnull PsiElementVisitor visitor)
+	{
+
+	}
+}

From c379ecd89496bb0d3a5fdace38f96fd274e93c99 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 14:02:59 +0300
Subject: [PATCH 065/340] better initializer check

---
 .../psi/impl/JSVariableBaseImpl.java          | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index dd7a523a..15b3a12d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -16,19 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSStubElementType;
-import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.lang.javascript.psi.JSVariable;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
 import com.intellij.openapi.util.Computable;
@@ -45,6 +37,8 @@
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -70,12 +64,24 @@ public boolean hasInitializer()
 		return getInitializerText() != null;
 	}
 
+	@RequiredReadAction
 	@Override
 	public JSExpression getInitializer()
 	{
-		final ASTNode eqNode = getNode().findChildByType(JSTokenTypes.EQ);
-		final ASTNode node = eqNode != null ? getNode().findChildByType(JSElementTypes.EXPRESSIONS, eqNode) : null;
-		return node != null ? (JSExpression) node.getPsi() : null;
+		PsiElement element = findChildByType(JSTokenTypes.EQ);
+		if(element == null)
+		{
+			return null;
+		}
+
+		while((element = element.getNextSibling()) != null)
+		{
+			if(element instanceof JSExpression)
+			{
+				return (JSExpression) element;
+			}
+		}
+		return null;
 	}
 
 	@Override

From 58ab39a208a689209287f137b8d759730cc29f26 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 14:09:09 +0300
Subject: [PATCH 066/340] dont show error with trailing comma

---
 .../java/consulo/json/lang/JsonJavaScriptParser.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index b9ebe611..771bbd74 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -1,6 +1,5 @@
 package consulo.json.lang;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiParser;
@@ -14,6 +13,8 @@
 import consulo.javascript.lang.parsing.Parsing;
 import consulo.lang.LanguageVersion;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 05.03.2015
@@ -99,8 +100,6 @@ else if(tokenType == JSTokenTypes.RBRACKET)
 				}
 				builder.advanceLexer();
 			}
-
-			return;
 		}
 
 		final IElementType nameToken = builder.getTokenType();
@@ -143,6 +142,11 @@ public void parseObjectLiteralExpression(final PsiBuilder builder)
 			else if(elementType == JSTokenTypes.COMMA)
 			{
 				builder.advanceLexer();
+
+				if(builder.getTokenType() == JSTokenTypes.RBRACE)
+				{
+					break;
+				}
 			}
 			else
 			{
@@ -152,7 +156,7 @@ else if(elementType == JSTokenTypes.COMMA)
 			elementType = builder.getTokenType();
 			if(elementType == JSTokenTypes.RBRACE)
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.property.expected"));
+				break;
 			}
 			else if(isNotPropertyStart(elementType))
 			{

From 6d40d9d490b831740d3252b3ac8c737af53034f7 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 14:09:41 +0300
Subject: [PATCH 067/340] string interpolation lexing

typo
---
 .../java/com/intellij/lang/javascript/psi/JSVariable.java | 7 +++++--
 .../javascript/lang/StandardJavaScriptVersions.java       | 5 +++--
 .../java/com/intellij/lang/javascript/JSTokenTypes.java   | 2 ++
 .../java/consulo/javascript/lang/lexer/ecmascript6.flex   | 8 +++++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index b84eebf7..d4efaeae 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
 import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.util.IncorrectOperationException;
@@ -25,6 +23,9 @@
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author max
  *         Date: Jan 30, 2005
@@ -36,6 +37,8 @@ public interface JSVariable extends JSQualifiedNamedElement, JSAttributeListOwne
 
 	boolean hasInitializer();
 
+	@RequiredReadAction
+	@Nullable
 	JSExpression getInitializer();
 
 	String getInitializerText();
diff --git a/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
index ffc74eee..f5416b86 100644
--- a/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
@@ -16,11 +16,11 @@
 
 package consulo.javascript.lang;
 
-import java.util.List;
+import com.intellij.openapi.components.ServiceManager;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.openapi.components.ServiceManager;
+import java.util.List;
 
 /**
  * @author VISTALL
@@ -41,6 +41,7 @@ public static StandardJavaScriptVersions getInstance()
 
 	@Nonnull
 	public abstract JavaScriptLanguageVersion getDefaultVersion();
+
 	@Nonnull
 	public abstract List<JavaScriptLanguageVersion> getValidLanguageVersions();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 9a549a20..90e7b131 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -179,6 +179,8 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	TokenSet XML_TOKENS = TokenSet.create(XML_START_TAG_START, XML_START_TAG_LIST, XML_END_TAG_LIST, XML_END_TAG_START, XML_EMPTY_TAG_END, XML_NAME, XML_TAG_NAME, XML_ATTR_EQUAL, XML_ATTR_VALUE,
 			XML_ATTR_VALUE_START, XML_ATTR_VALUE_END, XML_TAG_END, XML_JS_SCRIPT, XML_TAG_CONTENT, XML_STYLE_COMMENT, XML_ENTITY_REF, XML_TAG_WHITE_SPACE);
 
+	@Deprecated
+	// FIXME [VISTALL] what the heck? maybe old jsp inject support
 	IElementType JSP_TEXT = new JSElementType("JSP_TEXT");
 	IElementType YIELD_KEYWORD = new JSElementType("YIELD_KEYWORD");
 	IElementType LET_KEYWORD = new JSElementType("LET_KEYWORD");
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index b50d1ef1..f3db110b 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -66,6 +66,8 @@ ESCAPE_SEQUENCE=\\[^\r\n]
 GROUP = "[" [^\]]* "]"
 
 REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimx]*)?
+INTERPOLATION_STRING_LITERAL="`" [^"`"]* "`"
+
 ALPHA=[:letter:]
 DIGIT=[0-9]
 XML_NAME=({ALPHA}|"_")({ALPHA}|{DIGIT}|"_"|"."|"-")*(":"({ALPHA}|"_")?({ALPHA}|{DIGIT}|"_"|"."|"-")*)?
@@ -217,9 +219,8 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
                           JSTokenTypes.STRING_LITERAL;
                       }
 
-<YYINITIAL,DIV_OR_GT>  "\\${" [^\}]* "}" { return JSTokenTypes.JSP_TEXT; }
-<YYINITIAL,DIV_OR_GT>  "${" [^\}]* "}" { return JSTokenTypes.JSP_TEXT; }
 <YYINITIAL,DIV_OR_GT> {DOUBLE_QUOTED_LITERAL}      { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
+<YYINITIAL,DIV_OR_GT> {INTERPOLATION_STRING_LITERAL}      { yybegin(DIV_OR_GT); return JSTokenTypes.INTERPOLATION_STRING_LITERAL; }
 
 <YYINITIAL,DIV_OR_GT> "true"                { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD; }
 <YYINITIAL,DIV_OR_GT> "false"               { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD; }
@@ -370,4 +371,5 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 
 <YYINITIAL,DIV_OR_GT> "]]>" { yybegin(YYINITIAL); return JSTokenTypes.CDATA_END; }
 <YYINITIAL,DIV_OR_GT> "<![CDATA[" { yybegin(YYINITIAL); return JSTokenTypes.CDATA_START; }
-.                     { yybegin(YYINITIAL); return JSTokenTypes.BAD_CHARACTER; }
\ No newline at end of file
+
+[^] { yybegin(YYINITIAL); return JSTokenTypes.BAD_CHARACTER; }
\ No newline at end of file

From 16dcd6b1fbc20d18210d962a97f79731edf6fa28 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 14:11:06 +0300
Subject: [PATCH 068/340] cleanup

---
 .../src/main/java/consulo/json/lang/JsonJavaScriptParser.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index 771bbd74..96acce5a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -6,12 +6,12 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.tree.IElementType;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.parsing.ExpressionParsing;
 import consulo.javascript.lang.parsing.Parsing;
 import consulo.lang.LanguageVersion;
+import consulo.logging.Logger;
 
 import javax.annotation.Nonnull;
 

From c9cee9464d2061a181f5f1b559bb5704368798e0 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 14:11:28 +0300
Subject: [PATCH 069/340] private impl

---
 .../main/java/consulo/json/lang/JsonJavaScriptParser.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index 96acce5a..6e32cf2c 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -21,7 +21,7 @@
  */
 public class JsonJavaScriptParser implements PsiParser
 {
-	public static final Logger LOGGER = Logger.getInstance(JsonJavaScriptParser.class);
+	private static final Logger LOG = Logger.getInstance(JsonJavaScriptParser.class);
 
 	private int myPropertyDepth;
 
@@ -124,7 +124,7 @@ else if(tokenType == JSTokenTypes.RBRACKET)
 
 	public void parseObjectLiteralExpression(final PsiBuilder builder)
 	{
-		LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
+		LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 
@@ -175,7 +175,7 @@ public static boolean isNotPropertyStart(final IElementType elementType)
 
 	public void parseArrayLiteralExpression(final PsiBuilder builder)
 	{
-		JsonJavaScriptParser.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
+		JsonJavaScriptParser.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 		boolean commaExpected = false;

From bfee6c970ac8e7e5f581be0d2c0e3a41896772f5 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 14:29:08 +0300
Subject: [PATCH 070/340] intro export default assingnement

---
 .../lang/parsing/StatementParsing.java        |  4 +-
 .../JavaSciptDestructuringElementImpl.java    |  2 +-
 .../JavaSciptDestructuringObjectImpl.java     |  2 +-
 ...tDestructuringShorthandedPropertyImpl.java |  2 +-
 inspections/pom.xml                           |  6 +++
 .../BadExpressionStatementJSInspection.java   | 10 +++--
 .../parsing/EcmaScript4StatementParsing.java  |  2 +-
 .../psi/ES6ExportDefaultAssignment.java       | 11 ++++++
 .../impl/ES6ExportDefaultAssignmentImpl.java  | 17 +++++++++
 .../psi/impl/EcmaScript6ElementTypes.java     | 14 +++++++
 .../parsing/EcmaScript6StatementParsing.java  | 23 ++++++++++--
 .../validation/JSAnnotatingVisitor.java       | 37 ++++++++-----------
 12 files changed, 95 insertions(+), 35 deletions(-)
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java

diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 277ac749..6ce48119 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -664,10 +664,10 @@ protected void parseEmptyStatement(final PsiBuilder builder)
 
 	protected void parseVarStatement(final PsiBuilder builder, final boolean inForInitializationContext)
 	{
-		parseVarStatementNoMarker(builder, inForInitializationContext, builder.mark());
+		parseVarStatementWithMarker(builder, inForInitializationContext, builder.mark());
 	}
 
-	protected void parseVarStatementNoMarker(final PsiBuilder builder, final boolean inForInitializationContext, final @Nonnull PsiBuilder.Marker var)
+	protected void parseVarStatementWithMarker(final PsiBuilder builder, final boolean inForInitializationContext, final @Nonnull PsiBuilder.Marker var)
 	{
 		final IElementType declType = builder.getTokenType();
 		LOG.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
index d51b138a..b2039f85 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
@@ -21,6 +21,6 @@ public JavaSciptDestructuringElementImpl(ASTNode node)
 	@Override
 	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
-
+		visitor.visitElement(this);
 	}
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
index d7ca782f..b87b7b7b 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
@@ -21,6 +21,6 @@ public JavaSciptDestructuringObjectImpl(ASTNode node)
 	@Override
 	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
-
+		visitor.visitElement(this);
 	}
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
index 7a770a40..c1b759d5 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
@@ -21,6 +21,6 @@ public JavaScriptDestructuringShorthandedPropertyImpl(ASTNode node)
 	@Override
 	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
-
+		visitor.visitElement(this);
 	}
 }
diff --git a/inspections/pom.xml b/inspections/pom.xml
index 8d9000a6..0498b7df 100644
--- a/inspections/pom.xml
+++ b/inspections/pom.xml
@@ -47,6 +47,12 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-ecmascript6.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>com.intellij.xml</artifactId>
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index baf7dae7..9c83d545 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -1,8 +1,5 @@
 package com.sixrr.inspectjs.validity;
 
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
@@ -15,6 +12,11 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.javascript.ecmascript6.psi.ES6ExportDefaultAssignment;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class BadExpressionStatementJSInspection extends JavaScriptInspection
 {
@@ -88,7 +90,7 @@ private boolean isNotPointless(final JSExpression expression)
 			{
 				return true;
 			}
-			if(expression instanceof JSAssignmentExpression)
+			if(expression instanceof JSAssignmentExpression || expression instanceof ES6ExportDefaultAssignment)
 			{
 				return true;
 			}
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
index ce986354..2b1cb401 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
@@ -253,7 +253,7 @@ protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses
 				}
 				else if(tokenType == JSTokenTypes.VAR_KEYWORD || tokenType == JSTokenTypes.CONST_KEYWORD)
 				{
-					parseVarStatementNoMarker(builder, false, marker);
+					parseVarStatementWithMarker(builder, false, marker);
 					return;
 				}
 				else if(tokenType == JSTokenTypes.NAMESPACE_KEYWORD)
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java
new file mode 100644
index 00000000..76fe4dca
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java
@@ -0,0 +1,11 @@
+package consulo.javascript.ecmascript6.psi;
+
+import com.intellij.lang.javascript.psi.JSStatement;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public interface ES6ExportDefaultAssignment extends JSStatement
+{
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
new file mode 100644
index 00000000..c58772bc
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
@@ -0,0 +1,17 @@
+package consulo.javascript.ecmascript6.psi.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.impl.JSStatementImpl;
+import consulo.javascript.ecmascript6.psi.ES6ExportDefaultAssignment;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public class ES6ExportDefaultAssignmentImpl extends JSStatementImpl implements ES6ExportDefaultAssignment
+{
+	public ES6ExportDefaultAssignmentImpl(ASTNode node)
+	{
+		super(node);
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
new file mode 100644
index 00000000..f0af07cd
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
@@ -0,0 +1,14 @@
+package consulo.javascript.ecmascript6.psi.impl;
+
+import com.intellij.psi.tree.IElementType;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.psi.tree.ElementTypeAsPsiFactory;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public interface EcmaScript6ElementTypes
+{
+	IElementType EXPORT_DEFAULT_ASSIGMENT = new ElementTypeAsPsiFactory("EXPORT_DEFAULT_ASSIGMENT", JavaScriptLanguage.INSTANCE, ES6ExportDefaultAssignmentImpl.class);
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index 9512a978..212fa790 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.ecmascript6.psi.impl.EcmaScript6ElementTypes;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.logging.Logger;
 
@@ -48,6 +49,16 @@ public void parseSourceElement(PsiBuilder builder)
 		{
 			getFunctionParsing().parseFunctionDeclaration(builder);
 		}
+		else if(tokenType == JSTokenTypes.EXPORT_KEYWORD && builder.lookAhead(1) == JSTokenTypes.DEFAULT_KEYWORD)
+		{
+			PsiBuilder.Marker mark = builder.mark();
+			builder.advanceLexer();
+			builder.advanceLexer();
+
+			parseSourceElement(builder);
+
+			mark.done(EcmaScript6ElementTypes.EXPORT_DEFAULT_ASSIGMENT);
+		}
 		else if(tokenType == JSTokenTypes.EXPORT_KEYWORD)
 		{
 			PsiBuilder.Marker mark = builder.mark();
@@ -60,11 +71,15 @@ else if(tokenType == JSTokenTypes.EXPORT_KEYWORD)
 			{
 				getFunctionParsing().parseFunctionNoMarker(builder, false, mark);
 			}
+			else if(nextType == JSTokenTypes.CLASS_KEYWORD)
+			{
+				parseClassWithMarker(builder, mark);
+			}
 			else if(nextType == JSTokenTypes.VAR_KEYWORD ||
 					nextType == JSTokenTypes.CONST_KEYWORD ||
 					nextType == JSTokenTypes.LET_KEYWORD)
 			{
-				parseVarStatementNoMarker(builder, false, mark);
+				parseVarStatementWithMarker(builder, false, mark);
 			}
 			else
 			{
@@ -213,10 +228,10 @@ protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses
 
 	private void parseClass(final PsiBuilder builder)
 	{
-		parseClassNoMarker(builder, builder.mark());
+		parseClassWithMarker(builder, builder.mark());
 	}
 
-	private void parseClassNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz)
+	private void parseClassWithMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz)
 	{
 		builder.advanceLexer();
 		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
@@ -325,6 +340,8 @@ protected void parseClassBody(final PsiBuilder builder, BlockType type)
 				getFunctionParsing().parseParameterList(builder);
 				getStatementParsing().parseFunctionBody(builder);
 
+				checkForSemicolon(builder);
+
 				mark.done(JSElementTypes.FUNCTION_DECLARATION);
 			}
 		}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
index 84676df9..20eb8afa 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
@@ -16,19 +16,6 @@
 
 package com.intellij.lang.javascript.validation;
 
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.PropertyKey;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
 import com.intellij.codeInsight.daemon.impl.quickfix.RenameFileFix;
@@ -44,8 +31,8 @@
 import com.intellij.lang.annotation.Annotation;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
-import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
@@ -60,19 +47,25 @@
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.PsiPolyVariantReference;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.PsiWhiteSpace;
+import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlTagChild;
 import com.intellij.util.IncorrectOperationException;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.psi.JavaScriptLambdaExpression;
+import gnu.trove.THashMap;
+import gnu.trove.THashSet;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.PropertyKey;
+
+import javax.annotation.Nonnull;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @by max, maxim.mossienko
@@ -1035,7 +1028,7 @@ else if(overrideParameterType == null && parameterType != null && !"*".equals(pa
 	@Override
 	public void visitJSReturnStatement(final JSReturnStatement node)
 	{
-		final PsiElement element = PsiTreeUtil.getParentOfType(node, JSFunction.class, XmlTagChild.class, XmlAttributeValue.class, JSFile.class);
+		final PsiElement element = PsiTreeUtil.getParentOfType(node, JSFunction.class, XmlTagChild.class, XmlAttributeValue.class, JSFile.class, JavaScriptLambdaExpression.class);
 		if((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost)) || (element instanceof XmlTagChild && !(element
 				.getParent() instanceof XmlAttributeValue)))
 		{

From a26a28e731b38a4c5f7d2ad422b8444d5515ce35 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 14:30:48 +0300
Subject: [PATCH 071/340] allow trailing comma in js

---
 .../consulo/javascript/lang/parsing/ExpressionParsing.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index eca788a5..78e78f54 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -262,6 +262,11 @@ public void parseObjectLiteralExpression(final PsiBuilder builder)
 			else if(elementType == JSTokenTypes.COMMA)
 			{
 				builder.advanceLexer();
+
+				if(builder.getTokenType() == JSTokenTypes.RBRACE)
+				{
+					break;
+				}
 			}
 			else
 			{

From 65dc34cafb74f77be53d98422e20c457d12a0af3 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 14:38:10 +0300
Subject: [PATCH 072/340] correct search expression in statement, and fix bad
 statement inspection

---
 .../lang/javascript/psi/JSExpressionStatement.java     |  8 ++++++--
 .../javascript/psi/impl/JSExpressionStatementImpl.java | 10 +++++-----
 .../validity/BadExpressionStatementJSInspection.java   |  7 ++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
index 0f773894..742869aa 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
@@ -16,14 +16,18 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nullable;
+
 /**
- * Created by IntelliJ IDEA.
  * User: max
  * Date: Jan 30, 2005
  * Time: 9:27:17 PM
- * To change this template use File | Settings | File Templates.
  */
 public interface JSExpressionStatement extends JSStatement
 {
+	@Nullable
+	@RequiredReadAction
 	JSExpression getExpression();
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index cbdf27c6..2f0a5640 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -16,10 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
@@ -28,9 +25,12 @@
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.ide.IconDescriptorUpdaters;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -45,11 +45,11 @@ public JSExpressionStatementImpl(final ASTNode node)
 		super(node);
 	}
 
+	@RequiredReadAction
 	@Override
 	public JSExpression getExpression()
 	{
-		final ASTNode expressionNode = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return expressionNode != null ? (JSExpression) expressionNode.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index 9c83d545..86e81f92 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -12,6 +12,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.ecmascript6.psi.ES6ExportDefaultAssignment;
 import org.jetbrains.annotations.NonNls;
 
@@ -56,13 +57,13 @@ public BaseInspectionVisitor buildVisitor()
 
 	private static class Visitor extends BaseInspectionVisitor
 	{
-
 		@Override
+		@RequiredReadAction
 		public void visitJSExpressionStatement(JSExpressionStatement jsExpressionStatement)
 		{
 			super.visitJSExpressionStatement(jsExpressionStatement);
 			final JSExpression expression = jsExpressionStatement.getExpression();
-			if(isNotPointless(expression))
+			if(isNotPointless(expression) || jsExpressionStatement.getParent() instanceof ES6ExportDefaultAssignment)
 			{
 				return;
 			}
@@ -90,7 +91,7 @@ private boolean isNotPointless(final JSExpression expression)
 			{
 				return true;
 			}
-			if(expression instanceof JSAssignmentExpression || expression instanceof ES6ExportDefaultAssignment)
+			if(expression instanceof JSAssignmentExpression)
 			{
 				return true;
 			}

From a3c1f443a009ffb5a9a3675df3d1f465281cfccf Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 14:53:43 +0300
Subject: [PATCH 073/340] resolving variables from deconstruction objects

---
 .../psi/JSDestructuringElement.java           | 16 +++++++++++
 .../javascript/psi/JSDestructuringObject.java |  9 ++++++
 .../JSDestructuringShorthandedProperty.java   |  7 +++++
 .../lang/javascript/psi/JSVarStatement.java   |  7 +++++
 .../psi/impl/JSVarStatementImpl.java          | 28 +++++++++++++------
 .../psi/impl/JSVariableBaseImpl.java          |  5 ++++
 .../lang/parsing/StatementParsing.java        |  2 ++
 .../JavaSciptDestructuringElementImpl.java    | 11 ++++++++
 .../JavaSciptDestructuringObjectImpl.java     | 23 +++++++++++++++
 ...tDestructuringShorthandedPropertyImpl.java | 10 +++++++
 10 files changed, 109 insertions(+), 9 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
index 71199b2d..21d7556e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
@@ -1,9 +1,25 @@
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 2019-12-14
  */
 public interface JSDestructuringElement extends JSElement
 {
+	@Nonnull
+	@RequiredReadAction
+	default JSVariable[] getVariables()
+	{
+		JSDestructuringObject object = getDestructuringObject();
+		return object == null ? JSVariable.EMPTY_ARRAY : object.getVariables();
+	}
+
+	@Nullable
+	@RequiredReadAction
+	JSDestructuringObject getDestructuringObject();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
index 6d75ccf5..de354952 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
@@ -1,9 +1,18 @@
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 2019-12-14
  */
 public interface JSDestructuringObject extends JSElement
 {
+	@Nonnull
+	@RequiredReadAction
+	JSVariable[] getVariables();
+
+	JSDestructuringShorthandedProperty[] getProperties();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
index feed691b..4af569e5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
@@ -1,9 +1,16 @@
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 2019-12-14
  */
 public interface JSDestructuringShorthandedProperty extends JSElement
 {
+	@RequiredReadAction
+	@Nonnull
+	JSVariable getVarialbe();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
index 5f963d40..2d2b79a8 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
@@ -18,6 +18,9 @@
 
 import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
 import com.intellij.psi.StubBasedPsiElement;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -30,5 +33,9 @@ public interface JSVarStatement extends JSStatement, StubBasedPsiElement<JSVarSt
 {
 	JSVariable[] getVariables();
 
+	@Nullable
+	@RequiredReadAction
+	JSDestructuringElement getDestructuringElement();
+
 	void declareVariable(String name, JSExpression initializer);
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
index a1edf190..44a354d8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
@@ -16,19 +16,18 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.lang.javascript.psi.JSVariable;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -39,8 +38,6 @@
  */
 public class JSVarStatementImpl extends JSStubbedStatementImpl<JSVarStatementStub> implements JSVarStatement
 {
-
-
 	public JSVarStatementImpl(final ASTNode node)
 	{
 		super(node);
@@ -54,9 +51,22 @@ public JSVarStatementImpl(final JSVarStatementStub node)
 	@Override
 	public JSVariable[] getVariables()
 	{
+		JSDestructuringElement destructuringElement = getDestructuringElement();
+		if(destructuringElement != null)
+		{
+			return destructuringElement.getVariables();
+		}
 		return getStubOrPsiChildren(JSElementTypes.VARIABLE, JSVariable.EMPTY_ARRAY);
 	}
 
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public JSDestructuringElement getDestructuringElement()
+	{
+		return findChildByClass(JSDestructuringElement.class);
+	}
+
 	@Override
 	public void declareVariable(String name, JSExpression initializer)
 	{
@@ -88,13 +98,13 @@ public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnul
 			{
 				break;
 			}
+
 			if(!processor.execute(var, state))
 			{
 				return false;
 			}
 		}
 
-
 		return true;
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index 15b3a12d..fbdd00b8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -127,6 +127,11 @@ public String getName()
 	@Override
 	public JSAttributeList getAttributeList()
 	{
+		PsiElement parent = getParent();
+		if(!(parent instanceof JSVarStatement))
+		{
+			return null;
+		}
 		return ((JSVarStatementImpl) getParent()).getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
 	}
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 6ce48119..16dacfac 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -736,7 +736,9 @@ protected void parseDeconstructionElement(PsiBuilder builder)
 			if(isIdentifierToken(builder))
 			{
 				PsiBuilder.Marker propertyMarker = builder.mark();
+				PsiBuilder.Marker varMarker = builder.mark();
 				builder.advanceLexer();
+				varMarker.done(JSElementTypes.VARIABLE);
 				propertyMarker.done(JSElementTypes.DESTRUCTURING_SHORTHANDED_PROPERTY);
 			}
 			else
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
index b2039f85..39db6fb6 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
@@ -2,10 +2,13 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDestructuringElement;
+import com.intellij.lang.javascript.psi.JSDestructuringObject;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.psi.PsiElementVisitor;
+import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
@@ -23,4 +26,12 @@ public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		visitor.visitElement(this);
 	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public JSDestructuringObject getDestructuringObject()
+	{
+		return findChildByClass(JSDestructuringObject.class);
+	}
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
index b87b7b7b..b8742213 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
@@ -2,10 +2,14 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDestructuringObject;
+import com.intellij.lang.javascript.psi.JSDestructuringShorthandedProperty;
+import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.psi.PsiElementVisitor;
+import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
+import java.util.Arrays;
 
 /**
  * @author VISTALL
@@ -23,4 +27,23 @@ public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		visitor.visitElement(this);
 	}
+
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public JSVariable[] getVariables()
+	{
+		JSDestructuringShorthandedProperty[] properties = getProperties();
+		if(properties.length == 0)
+		{
+			return JSVariable.EMPTY_ARRAY;
+		}
+		return Arrays.stream(properties).map(JSDestructuringShorthandedProperty::getVarialbe).toArray(JSVariable[]::new);
+	}
+
+	@Override
+	public JSDestructuringShorthandedProperty[] getProperties()
+	{
+		return findChildrenByClass(JSDestructuringShorthandedProperty.class);
+	}
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
index c1b759d5..26ad0883 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
@@ -2,8 +2,10 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDestructuringShorthandedProperty;
+import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.psi.PsiElementVisitor;
+import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
 
@@ -23,4 +25,12 @@ public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		visitor.visitElement(this);
 	}
+
+	@Nonnull
+	@RequiredReadAction
+	@Override
+	public JSVariable getVarialbe()
+	{
+		return findNotNullChildByClass(JSVariable.class);
+	}
 }

From 5d92d628164ce8732113e0af75df067bc560a9d0 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 15:07:31 +0300
Subject: [PATCH 074/340] split es4 and es6 imports

---
 .../javascript/psi/JSImportStatement.java     |  5 ++-
 .../psi/JavaScriptImportStatementBase.java    | 13 ++++++++
 .../lang/javascript/JSElementTypes.java       |  8 +++--
 .../psi/impl/JSImportStatementImpl.java       |  6 ++--
 .../psi/impl/EcmaScript4ElementTypes.java     | 15 +++++++++
 .../parsing/EcmaScript4StatementParsing.java  |  2 +-
 .../ecmascript6/psi/ES6ImportDeclaration.java | 13 ++++++++
 .../ecmascript6/psi/ES6ImportSpecifier.java   | 13 ++++++++
 .../ecmascript6/psi/ES6ImportedBinding.java   | 17 ++++++++++
 .../ecmascript6/psi/ES6NamedImports.java      | 14 +++++++++
 .../psi/impl/ES6ImportDeclarationImpl.java    | 17 ++++++++++
 .../psi/impl/EcmaScript6ElementTypes.java     |  2 ++
 .../parsing/EcmaScript6StatementParsing.java  |  2 +-
 .../folding/JavaScriptFoldingBuilder.java     | 31 ++++++++++++-------
 .../formatter/JSSpacingProcessor.java         | 16 +++++-----
 15 files changed, 147 insertions(+), 27 deletions(-)
 create mode 100644 base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
index 35b5dd20..bcc88450 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
@@ -18,11 +18,14 @@
 
 import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
 import com.intellij.psi.StubBasedPsiElement;
+import consulo.javascript.psi.JavaScriptImportStatementBase;
 
 /**
  * @by Maxim.Mossienko
+ *
+ * EcmaScript 4 implementation
  */
-public interface JSImportStatement extends JSStatement, StubBasedPsiElement<JSImportStatementStub>
+public interface JSImportStatement extends JSStatement, StubBasedPsiElement<JSImportStatementStub>, JavaScriptImportStatementBase
 {
 	String getImportText();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java b/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java
new file mode 100644
index 00000000..c777a749
--- /dev/null
+++ b/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java
@@ -0,0 +1,13 @@
+package consulo.javascript.psi;
+
+import com.intellij.lang.javascript.psi.JSStatement;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ *
+ * Base interface for all imports in at js implementation. Affect folding
+ */
+public interface JavaScriptImportStatementBase extends JSStatement
+{
+}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index f3757ee2..005a00bb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -27,6 +27,7 @@
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.ecmascript4.psi.impl.EcmaScript4ElementTypes;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringElementImpl;
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringObjectImpl;
@@ -84,7 +85,10 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> ATTRIBUTE_NAME_VALUE_PAIR = new JSAttributeNameValuePairType();
 	JSStubElementType<JSAttributeListStub, JSAttributeList> ATTRIBUTE_LIST = new JSAttributeListElementType();
 	JSStubElementType<JSPackageStatementStub, JSPackageStatement> PACKAGE_STATEMENT = new JSPackageStatementElementType();
-	JSStubElementType<JSImportStatementStub, JSImportStatement> IMPORT_STATEMENT = new JSImportStatementElementType();
+
+	@Deprecated
+	JSStubElementType<JSImportStatementStub, JSImportStatement> ES4_IMPORT_STATEMENT = EcmaScript4ElementTypes.IMPORT_STATEMENT;
+
 	JSStubElementType<JSClassStub, JSClass> CLASS = new JSClassElementType();
 	JSStubElementType<JSReferenceListStub, JSReferenceList> EXTENDS_LIST = new JSReferenceListElementType("EXTENDS_LIST");
 	JSStubElementType<JSReferenceListStub, JSReferenceList> IMPLEMENTS_LIST = new JSReferenceListElementType("IMPLEMENTS_LIST");
@@ -123,7 +127,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 
 	TokenSet STATEMENTS = TokenSet.create(BLOCK_STATEMENT, LABELED_STATEMENT, VAR_STATEMENT, EMPTY_STATEMENT, IF_STATEMENT, CONTINUE_STATEMENT,
 			BREAK_STATEMENT, WITH_STATEMENT, RETURN_STATEMENT, THROW_STATEMENT, TRY_STATEMENT, SWITCH_STATEMENT, FOR_IN_STATEMENT, FOR_STATEMENT,
-			WHILE_STATEMENT, DOWHILE_STATEMENT, EXPRESSION_STATEMENT, YIELD_STATEMENT, LET_STATEMENT, IMPORT_STATEMENT, PACKAGE_STATEMENT,
+			WHILE_STATEMENT, DOWHILE_STATEMENT, EXPRESSION_STATEMENT, YIELD_STATEMENT, LET_STATEMENT, ES4_IMPORT_STATEMENT, PACKAGE_STATEMENT,
 			USE_NAMESPACE_DIRECTIVE);
 
 	TokenSet SOURCE_ELEMENTS = TokenSet.orSet(STATEMENTS, TokenSet.create(FUNCTION_DECLARATION, CLASS, NAMESPACE_DECLARATION, INCLUDE_DIRECTIVE,
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
index 493440f6..77ee283f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -28,6 +26,8 @@
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 
+import javax.annotation.Nonnull;
+
 /**
  * @by Maxim.Mossienko
  */
@@ -40,7 +40,7 @@ public JSImportStatementImpl(final ASTNode node)
 
 	public JSImportStatementImpl(final JSImportStatementStub stub)
 	{
-		super(stub, JSElementTypes.IMPORT_STATEMENT);
+		super(stub, JSElementTypes.ES4_IMPORT_STATEMENT);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java b/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java
new file mode 100644
index 00000000..2452e3c7
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java
@@ -0,0 +1,15 @@
+package consulo.javascript.ecmascript4.psi.impl;
+
+import com.intellij.lang.javascript.psi.JSImportStatement;
+import com.intellij.lang.javascript.psi.JSStubElementType;
+import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
+import com.intellij.lang.javascript.types.JSImportStatementElementType;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public interface EcmaScript4ElementTypes
+{
+	JSStubElementType<JSImportStatementStub, JSImportStatement> IMPORT_STATEMENT = new JSImportStatementElementType();
+}
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
index 2b1cb401..f24898f0 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
@@ -386,7 +386,7 @@ private void parseImportStatement(final PsiBuilder builder)
 		}
 		finally
 		{
-			importStatement.done(JSElementTypes.IMPORT_STATEMENT);
+			importStatement.done(JSElementTypes.ES4_IMPORT_STATEMENT);
 		}
 	}
 
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java
new file mode 100644
index 00000000..f7e846a4
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java
@@ -0,0 +1,13 @@
+package consulo.javascript.ecmascript6.psi;
+
+import consulo.javascript.psi.JavaScriptImportStatementBase;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ *
+ * import ...
+ */
+public interface ES6ImportDeclaration extends JavaScriptImportStatementBase
+{
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
new file mode 100644
index 00000000..fcf0a076
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
@@ -0,0 +1,13 @@
+package consulo.javascript.ecmascript6.psi;
+
+import com.intellij.lang.javascript.psi.JSElement;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ *
+ * import {importScpecifier} ...
+ */
+public interface ES6ImportSpecifier extends JSElement
+{
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
new file mode 100644
index 00000000..520fabe7
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
@@ -0,0 +1,17 @@
+package consulo.javascript.ecmascript6.psi;
+
+import com.intellij.lang.javascript.psi.JSElement;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ * <p>
+ * import ImportedBinding ....
+ * <p>
+ * asterisk import also imported binding
+ * <p>
+ * import [* as util] ...
+ */
+public interface ES6ImportedBinding extends JSElement
+{
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
new file mode 100644
index 00000000..4eaf9237
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
@@ -0,0 +1,14 @@
+package consulo.javascript.ecmascript6.psi;
+
+import com.intellij.lang.javascript.psi.JSElement;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ *
+ * import ({test}) ...
+ * .........^ named imports
+ */
+public interface ES6NamedImports extends JSElement
+{
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
new file mode 100644
index 00000000..005d26ee
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
@@ -0,0 +1,17 @@
+package consulo.javascript.ecmascript6.psi.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.impl.JSStatementImpl;
+import consulo.javascript.ecmascript6.psi.ES6ImportDeclaration;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public class ES6ImportDeclarationImpl extends JSStatementImpl implements ES6ImportDeclaration
+{
+	public ES6ImportDeclarationImpl(ASTNode node)
+	{
+		super(node);
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
index f0af07cd..564199c9 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
@@ -11,4 +11,6 @@
 public interface EcmaScript6ElementTypes
 {
 	IElementType EXPORT_DEFAULT_ASSIGMENT = new ElementTypeAsPsiFactory("EXPORT_DEFAULT_ASSIGMENT", JavaScriptLanguage.INSTANCE, ES6ExportDefaultAssignmentImpl.class);
+
+	IElementType IMPORT_DECLARATION = new ElementTypeAsPsiFactory("IMPORT_DECLARATION", JavaScriptLanguage.INSTANCE, ES6ImportDeclarationImpl.class);
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index 212fa790..d5fcd280 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -207,7 +207,7 @@ else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
 		}
 		finally
 		{
-			importStatement.done(JSElementTypes.IMPORT_STATEMENT);
+			importStatement.done(EcmaScript6ElementTypes.IMPORT_DECLARATION);
 		}
 	}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
index 9952585c..da26777f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
@@ -16,9 +16,6 @@
 
 package com.intellij.lang.javascript.folding;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.intellij.codeInsight.folding.CodeFoldingSettings;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.folding.FoldingBuilder;
@@ -32,20 +29,30 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.util.PsiUtilCore;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.psi.JavaScriptImportStatementBase;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author max
  */
 public class JavaScriptFoldingBuilder implements FoldingBuilder
 {
+	@RequiredReadAction
+	@Nonnull
 	@Override
-	public FoldingDescriptor[] buildFoldRegions(ASTNode node, Document document)
+	public FoldingDescriptor[] buildFoldRegions(@Nonnull ASTNode node, @Nonnull Document document)
 	{
-		List<FoldingDescriptor> descriptors = new ArrayList<FoldingDescriptor>();
+		List<FoldingDescriptor> descriptors = new ArrayList<>();
 		appendDescriptors(node, document, descriptors);
 		return descriptors.toArray(new FoldingDescriptor[descriptors.size()]);
 	}
 
+	@RequiredReadAction
 	private static ASTNode appendDescriptors(final ASTNode node, final Document document, final List<FoldingDescriptor> descriptors)
 	{
 		final IElementType type = node.getElementType();
@@ -73,9 +80,9 @@ else if(type == JSTokenTypes.END_OF_LINE_COMMENT)
 		{
 			return collapseConsequentNodesOfSpecifiedType(node, descriptors, JSTokenTypes.END_OF_LINE_COMMENT);
 		}
-		else if(type == JSElementTypes.IMPORT_STATEMENT)
+		else if(node.getPsi() instanceof JavaScriptImportStatementBase)
 		{
-			return collapseConsequentNodesOfSpecifiedType(node, descriptors, JSElementTypes.IMPORT_STATEMENT);
+			return collapseConsequentNodesOfSpecifiedType(node, descriptors, PsiUtilCore.getElementType(node));
 		}
 		else if(type == JSElementTypes.CLASS || type == JSElementTypes.PACKAGE_STATEMENT)
 		{
@@ -116,8 +123,8 @@ private static void addDescriptorForNode(ASTNode node, List<FoldingDescriptor> d
 		addDescriptorForRange(node, descriptors, range);
 	}
 
-	private static ASTNode collapseConsequentNodesOfSpecifiedType(final ASTNode node, final List<FoldingDescriptor> descriptors,
-			final IElementType endOfLineComment)
+	@RequiredReadAction
+	private static ASTNode collapseConsequentNodesOfSpecifiedType(final ASTNode node, final List<FoldingDescriptor> descriptors, final IElementType endOfLineComment)
 	{
 		PsiElement lastEoLComment = node.getPsi();
 		PsiElement current = lastEoLComment.getNextSibling();
@@ -147,6 +154,7 @@ private static ASTNode collapseConsequentNodesOfSpecifiedType(final ASTNode node
 		}
 	}
 
+	@RequiredReadAction
 	@Override
 	public String getPlaceholderText(ASTNode node)
 	{
@@ -163,7 +171,7 @@ else if(type == JSTokenTypes.END_OF_LINE_COMMENT)
 		{
 			return "//...";
 		}
-		else if(type == JSElementTypes.IMPORT_STATEMENT)
+		else if(node.getPsi() instanceof JavaScriptImportStatementBase)
 		{
 			return "import ...";
 		}
@@ -185,6 +193,7 @@ else if(type == JSElementTypes.XML_LITERAL_EXPRESSION)
 		return null;
 	}
 
+	@RequiredReadAction
 	@Override
 	public boolean isCollapsedByDefault(ASTNode node)
 	{
@@ -193,7 +202,7 @@ public boolean isCollapsedByDefault(ASTNode node)
 		{
 			return CodeFoldingSettings.getInstance().COLLAPSE_FILE_HEADER;
 		}
-		if(node.getElementType() == JSElementTypes.IMPORT_STATEMENT)
+		if(node.getPsi() instanceof JavaScriptImportStatementBase)
 		{
 			return CodeFoldingSettings.getInstance().COLLAPSE_IMPORTS;
 		}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
index 8a3aae75..58cdb5aa 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
@@ -208,7 +208,7 @@ private void processBlock(final ASTNode node)
 		{
 			if(isInjectedJSHack(type1, type2) ||
 					isInjectedJSHack(type2, type1) ||
-					(type2 == JSTokenTypes.END_OF_LINE_COMMENT && isInlineEndOfLineCommentOnLeft() && type1 != JSElementTypes.IMPORT_STATEMENT))
+					(type2 == JSTokenTypes.END_OF_LINE_COMMENT && isInlineEndOfLineCommentOnLeft() && type1 != JSElementTypes.ES4_IMPORT_STATEMENT))
 			{
 				myResult = Spacing.getReadOnlySpacing();
 			}
@@ -223,12 +223,12 @@ private void processBlock(final ASTNode node)
 				}
 				else
 				{
-					if((JSElementTypes.IMPORT_STATEMENT == type1 && JSElementTypes.IMPORT_STATEMENT != type2 && JSTokenTypes.RBRACE != type2) || (JSElementTypes
-							.IMPORT_STATEMENT != type1 && JSTokenTypes.LBRACE != type1 && JSElementTypes.IMPORT_STATEMENT == type2))
+					if((JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT != type2 && JSTokenTypes.RBRACE != type2) || (JSElementTypes
+							.ES4_IMPORT_STATEMENT != type1 && JSTokenTypes.LBRACE != type1 && JSElementTypes.ES4_IMPORT_STATEMENT == type2))
 					{
 						myResult = Spacing.createSpacing(0, 0, 2, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
 					}
-					else if(JSElementTypes.IMPORT_STATEMENT == type1 && JSElementTypes.IMPORT_STATEMENT == type2)
+					else if(JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT == type2)
 					{
 						myResult = getSpacingBetweenImports();
 					}
@@ -276,18 +276,18 @@ public void visitFile(final ASTNode node)
 	{
 		if(JSElementTypes.SOURCE_ELEMENTS.contains(type1) || JSElementTypes.SOURCE_ELEMENTS.contains(type2))
 		{
-			if(type2 == JSTokenTypes.END_OF_LINE_COMMENT && isInlineEndOfLineCommentOnLeft() && type1 != JSElementTypes.IMPORT_STATEMENT)
+			if(type2 == JSTokenTypes.END_OF_LINE_COMMENT && isInlineEndOfLineCommentOnLeft() && type1 != JSElementTypes.ES4_IMPORT_STATEMENT)
 			{
 				myResult = Spacing.getReadOnlySpacing();
 			}
 			else
 			{
-				if((JSElementTypes.IMPORT_STATEMENT == type1 && JSElementTypes.IMPORT_STATEMENT != type2) || (JSElementTypes.IMPORT_STATEMENT != type1 &&
-						JSElementTypes.IMPORT_STATEMENT == type2))
+				if((JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT != type2) || (JSElementTypes.ES4_IMPORT_STATEMENT != type1 &&
+						JSElementTypes.ES4_IMPORT_STATEMENT == type2))
 				{
 					myResult = Spacing.createSpacing(0, 0, 2, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
 				}
-				else if(JSElementTypes.IMPORT_STATEMENT == type1 && JSElementTypes.IMPORT_STATEMENT == type2)
+				else if(JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT == type2)
 				{
 					myResult = getSpacingBetweenImports();
 				}

From 7a34481fc94d8658bb5569bb1b791a1c3fa16e5b Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 15:33:54 +0300
Subject: [PATCH 075/340] rewrite ES6 import parsing

---
 .../lang/javascript/JSTokenTypes.java         |   2 +-
 .../javascript/lang/parsing/Parsing.java      |   8 +-
 .../ecmascript6/psi/ES6ImportedBinding.java   |   2 +-
 .../ecmascript6/psi/ES6NamedImports.java      |   4 +-
 .../psi/impl/ES6ImportedBindingImpl.java      |  26 ++++
 .../psi/impl/ES6NamedImportsImpl.java         |  26 ++++
 .../psi/impl/EcmaScript6ElementTypes.java     |   4 +
 .../javascript/lang/lexer/ecmascript6.flex    |   1 -
 .../parsing/EcmaScript6StatementParsing.java  | 139 +++++++++++-------
 9 files changed, 150 insertions(+), 62 deletions(-)
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 90e7b131..72cff6e7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -128,7 +128,7 @@ protected Lexer createLexer()
 	IElementType SUPER_KEYWORD = new JSElementType("SUPER_KEYWORD"); // super
 	IElementType INCLUDE_KEYWORD = new JSElementType("INCLUDE_KEYWORD"); // include
 	IElementType IS_KEYWORD = new JSElementType("IS_KEYWORD"); // is
-	IElementType AS_KEYWORD = new JSElementType("AS_KEYWORD"); // as
+	IElementType AS_KEYWORD = new JavaScriptContextKeywordElementType("AS_KEYWORD", "as"); // as
 	IElementType GET_KEYWORD = new JavaScriptContextKeywordElementType("GET_KEYWORD", "get"); // GET
 	IElementType SET_KEYWORD = new JavaScriptContextKeywordElementType("SET_KEYWORD", "set"); // SET
 	IElementType EACH_KEYWORD = new JSElementType("EACH_KEYWORD");
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index cc80443a..0189e5d6 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -40,7 +40,7 @@ public Parsing(JavaScriptParsingContext context)
 		myContext = context;
 	}
 
-	public boolean expectContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType)
+	public boolean isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType)
 	{
 		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 		{
@@ -58,7 +58,7 @@ public boolean expectContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IEleme
 	}
 
 	@Nullable
-	public IElementType expectContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
+	public IElementType isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
 	{
 		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 		{
@@ -77,7 +77,7 @@ public IElementType expectContextKeyword(@Nonnull PsiBuilder builder, @Nonnull T
 
 	public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType)
 	{
-		if(expectContextKeyword(builder, elementType))
+		if(isContextKeyword(builder, elementType))
 		{
 			if(builder instanceof JavaScriptStrictParserBuilder)
 			{
@@ -90,7 +90,7 @@ public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElement
 
 	public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
 	{
-		IElementType elementType = expectContextKeyword(builder, tokenSet);
+		IElementType elementType = isContextKeyword(builder, tokenSet);
 		if(elementType != null)
 		{
 			if(builder instanceof JavaScriptStrictParserBuilder)
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
index 520fabe7..ca254dd3 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
@@ -10,7 +10,7 @@
  * <p>
  * asterisk import also imported binding
  * <p>
- * import [* as util] ...
+ * import * as util ...
  */
 public interface ES6ImportedBinding extends JSElement
 {
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
index 4eaf9237..a3526904 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
@@ -6,8 +6,8 @@
  * @author VISTALL
  * @since 2019-12-14
  *
- * import ({test}) ...
- * .........^ named imports
+ * import { test } ...
+ * .......^^^^^^^ named imports group
  */
 public interface ES6NamedImports extends JSElement
 {
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
new file mode 100644
index 00000000..46f76f31
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
@@ -0,0 +1,26 @@
+package consulo.javascript.ecmascript6.psi.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.psi.PsiElementVisitor;
+import consulo.javascript.ecmascript6.psi.ES6ImportedBinding;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public class ES6ImportedBindingImpl extends JSElementImpl implements ES6ImportedBinding
+{
+	public ES6ImportedBindingImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@Override
+	public void accept(@Nonnull PsiElementVisitor visitor)
+	{
+		visitor.visitElement(this);
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
new file mode 100644
index 00000000..b38c67b8
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
@@ -0,0 +1,26 @@
+package consulo.javascript.ecmascript6.psi.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.psi.PsiElementVisitor;
+import consulo.javascript.ecmascript6.psi.ES6NamedImports;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public class ES6NamedImportsImpl extends JSElementImpl implements ES6NamedImports
+{
+	public ES6NamedImportsImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@Override
+	public void accept(@Nonnull PsiElementVisitor visitor)
+	{
+		visitor.visitElement(this);
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
index 564199c9..f49bdd10 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
@@ -13,4 +13,8 @@ public interface EcmaScript6ElementTypes
 	IElementType EXPORT_DEFAULT_ASSIGMENT = new ElementTypeAsPsiFactory("EXPORT_DEFAULT_ASSIGMENT", JavaScriptLanguage.INSTANCE, ES6ExportDefaultAssignmentImpl.class);
 
 	IElementType IMPORT_DECLARATION = new ElementTypeAsPsiFactory("IMPORT_DECLARATION", JavaScriptLanguage.INSTANCE, ES6ImportDeclarationImpl.class);
+
+	IElementType IMPORTED_BINDING = new ElementTypeAsPsiFactory("IMPORTED_BINDING", JavaScriptLanguage.INSTANCE, ES6ImportedBindingImpl.class);
+
+	IElementType NAMED_IMPORTS = new ElementTypeAsPsiFactory("NAMED_IMPORTS", JavaScriptLanguage.INSTANCE, ES6NamedImportsImpl.class);
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index f3db110b..3c145ba2 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -282,7 +282,6 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 <YYINITIAL,DIV_OR_GT> "use"                 { yybegin(YYINITIAL); return JSTokenTypes.USE_KEYWORD ; }
 <YYINITIAL,DIV_OR_GT> "super"               { yybegin(YYINITIAL); return JSTokenTypes.SUPER_KEYWORD ; }
 <YYINITIAL,DIV_OR_GT> "include"             { yybegin(YYINITIAL); return JSTokenTypes.INCLUDE_KEYWORD ; }
-<YYINITIAL,DIV_OR_GT> "as"                  { yybegin(YYINITIAL); return JSTokenTypes.AS_KEYWORD ; }
 <YYINITIAL,DIV_OR_GT> "yield"               { yybegin(YYINITIAL); return JSTokenTypes.YIELD_KEYWORD ; }
 <YYINITIAL,DIV_OR_GT> "let"                 { yybegin(YYINITIAL); return JSTokenTypes.LET_KEYWORD ; }
 
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index d5fcd280..8ea0930e 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -115,55 +115,27 @@ private void parseImportStatement(final PsiBuilder builder)
 
 			boolean wantFrom = true;
 
-			// TODO [VISTALL] specific element
-			if(builder.getTokenType() == JSTokenTypes.LBRACE)
+			if(builder.getTokenType() == JSTokenTypes.ASTERISK)
 			{
+				PsiBuilder.Marker bindingMark = builder.mark();
+
 				builder.advanceLexer();
 
-				boolean first = true;
-				while(!builder.eof())
+				if(isContextKeyword(builder, JSTokenTypes.AS_KEYWORD))
 				{
-					if(builder.getTokenType() == JSTokenTypes.RBRACE)
-					{
-						break;
-					}
+					advanceContextKeyword(builder, JSTokenTypes.AS_KEYWORD);
 
-					if(!first)
+					if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 					{
-						if(builder.getTokenType() == JSTokenTypes.COMMA)
-						{
-							builder.advanceLexer();
-						}
-						else
-						{
-							builder.error("Comma expected");
-						}
+						builder.advanceLexer();
 					}
-
-					first = false;
-
-					if(!getExpressionParsing().parseQualifiedTypeName(builder, false))
+					else
 					{
-						builder.error("Reference expected");
+						builder.error("Expected identifier");
 					}
 				}
 
-				if(builder.getTokenType() != JSTokenTypes.RBRACE)
-				{
-					builder.error("'}' expected");
-				}
-				else
-				{
-					builder.advanceLexer();
-				}
-			}
-			else if(builder.getTokenType() == JSTokenTypes.ASTERISK)
-			{
-				builder.advanceLexer();
-			}
-			else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-			{
-				getExpressionParsing().parseQualifiedTypeName(builder, false);
+				bindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
 			}
 			else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
 			{
@@ -172,24 +144,85 @@ else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
 			}
 			else
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
-			}
+				boolean firstBinding = true;
 
-			if(builder.getTokenType() == JSTokenTypes.AS_KEYWORD)
-			{
-				builder.advanceLexer();
-
-				if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-				{
-					builder.advanceLexer();
-				}
-				else
+				while(!builder.eof())
 				{
-					builder.error("Expected identifier");
+					if(builder.getTokenType() != JSTokenTypes.COMMA && !isIdentifierToken(builder) && builder.getTokenType() != JSTokenTypes.LBRACE)
+					{
+						break;
+					}
+
+					if(isContextKeyword(builder, JSTokenTypes.FROM_KEYWORD))
+					{
+						break;
+					}
+
+					if(!firstBinding)
+					{
+						Parsing.checkMatches(builder, JSTokenTypes.COMMA, "Comma expected");
+					}
+
+					if(builder.getTokenType() == JSTokenTypes.LBRACE)
+					{
+						PsiBuilder.Marker namedImportsMark = builder.mark();
+						builder.advanceLexer();
+
+						boolean first = true;
+						while(!builder.eof())
+						{
+							if(builder.getTokenType() == JSTokenTypes.RBRACE)
+							{
+								break;
+							}
+
+							if(!first)
+							{
+								if(builder.getTokenType() == JSTokenTypes.COMMA)
+								{
+									builder.advanceLexer();
+								}
+								else
+								{
+									builder.error("Comma expected");
+								}
+							}
+
+							first = false;
+
+							if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
+							{
+								PsiBuilder.Marker importBindingMark = builder.mark();
+								builder.advanceLexer();
+								importBindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
+							}
+							else if(builder.getTokenType() != JSTokenTypes.RBRACE)
+							{
+								builder.error("Expected identifier");
+							}
+						}
+
+						Parsing.checkMatches(builder, JSTokenTypes.RBRACE, "'}' expected");
+
+						namedImportsMark.done(EcmaScript6ElementTypes.NAMED_IMPORTS);
+					}
+					else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
+					{
+						PsiBuilder.Marker importBindingMark = builder.mark();
+						builder.advanceLexer();
+						importBindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
+					}
+					else
+					{
+						builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+						break;
+					}
+
+					firstBinding = false;
 				}
 			}
 
-			if(wantFrom && expectContextKeyword(builder, JSTokenTypes.FROM_KEYWORD))
+			if(wantFrom && isContextKeyword(builder, JSTokenTypes.FROM_KEYWORD))
 			{
 				advanceContextKeyword(builder, JSTokenTypes.FROM_KEYWORD);
 
@@ -322,7 +355,7 @@ protected void parseClassBody(final PsiBuilder builder, BlockType type)
 				}
 				else
 				{
-					if(expectContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET) != null && builder.lookAhead(1) == JSTokenTypes.IDENTIFIER)
+					if(isContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET) != null && builder.lookAhead(1) == JSTokenTypes.IDENTIFIER)
 					{
 						advanceContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET);
 					}
@@ -357,7 +390,7 @@ private boolean expectStaticKeywordExpected(PsiBuilder builder)
 			builder.advanceLexer();
 			return true;
 		}
-		else if(expectContextKeyword(builder, TokenSet.create(JSTokenTypes.STATIC_KEYWORD)) != null)
+		else if(isContextKeyword(builder, TokenSet.create(JSTokenTypes.STATIC_KEYWORD)) != null)
 		{
 			if(builder.lookAhead(1) == JSTokenTypes.IDENTIFIER)
 			{

From 2c7936b19c013c401b4147e2c3fa665e190fac2a Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 15:37:26 +0300
Subject: [PATCH 076/340] fix not eating sharp

---
 .../main/java/consulo/javascript/lang/lexer/ecmascript6.flex    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index 3c145ba2..5363e464 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -142,7 +142,7 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 	}
 }
 
-<TAG_CONTENT> ([^\?<&\{# \n\r\t\f])* { return JSTokenTypes.XML_TAG_CONTENT; }
+<TAG_CONTENT> ([^\?<&\{ \n\r\t\f])* { return JSTokenTypes.XML_TAG_CONTENT; }
 <TAG_CONTENT> "<?" ([^\?]|(\?[^\>]))* "?>" { return JSTokenTypes.XML_TAG_CONTENT; }
 <TAG_CONTENT> {XML_COMMENT} { return JSTokenTypes.XML_STYLE_COMMENT; }
 

From 07b7d3fe28c28213fb87f3be90fa40048a68b9e7 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 14 Dec 2019 15:44:58 +0300
Subject: [PATCH 077/340] allow empty body

---
 .../java/com/intellij/lang/javascript/JSTokenTypes.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 72cff6e7..2162e4bb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -160,7 +160,10 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 		{
 			PsiBuilder.Marker root = builder.mark();
 			Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptBundle.message("javascript.parser.message.expected.lbrace"));
-			context.getExpressionParsing().parseExpression(builder);
+			if(builder.getTokenType() != JSTokenTypes.RBRACE)
+			{
+				context.getExpressionParsing().parseExpression(builder);
+			}
 			Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptBundle.message("javascript.parser.message.expected.rbrace"));
 
 			while(!builder.eof())
@@ -181,7 +184,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 
 	@Deprecated
 	// FIXME [VISTALL] what the heck? maybe old jsp inject support
-	IElementType JSP_TEXT = new JSElementType("JSP_TEXT");
+			IElementType JSP_TEXT = new JSElementType("JSP_TEXT");
 	IElementType YIELD_KEYWORD = new JSElementType("YIELD_KEYWORD");
 	IElementType LET_KEYWORD = new JSElementType("LET_KEYWORD");
 

From a0ada3378447bb568f67947cdc4e422c82a72ae4 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Dec 2019 12:09:52 +0300
Subject: [PATCH 078/340] es6 import resolver stub

---
 .../javascript/psi/JSImportStatement.java     |  3 +
 .../lang/javascript/flex/JSResolveHelper.java |  7 +-
 .../javascript/psi/impl/JSPsiImplUtils.java   | 32 +++---
 .../psi/impl/JSReferenceExpressionImpl.java   | 30 +++---
 .../psi/resolve/JSImportHandlingUtil.java     | 15 +++
 .../JSImportedElementResolveResult.java       |  6 +-
 .../javascript/psi/resolve/JSResolveUtil.java | 10 +-
 .../psi/resolve/ResolveProcessor.java         | 37 +++++--
 .../psi/resolve/VariantsProcessor.java        | 16 ++-
 .../validation/JSUnusedImportsHelper.java     | 11 ++-
 .../resolve/JavaScriptVersionWithHelper.java  | 13 +++
 .../lang/psi/impl/resolve/ResolveHelper.java  | 52 ++++++++++
 .../ecmascript6/psi/ES6ImportedBinding.java   |  3 +-
 .../ecmascript6/psi/ES6NamedImports.java      |  6 ++
 .../psi/impl/ES6ImportDeclarationImpl.java    | 18 ++++
 .../psi/impl/ES6ImportedBindingImpl.java      | 38 +++++++
 .../psi/impl/ES6NamedImportsImpl.java         | 26 +++++
 .../resolve/EcmaScript6ResolveHelper.java     | 99 +++++++++++++++++++
 .../lang/EcmaScript6JavaScriptVersion.java    | 12 ++-
 .../structureView/JSStructureViewElement.java | 25 ++---
 20 files changed, 372 insertions(+), 87 deletions(-)
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
index bcc88450..3b2f395c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
@@ -18,6 +18,7 @@
 
 import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
 import com.intellij.psi.StubBasedPsiElement;
+import consulo.annotation.DeprecationInfo;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
 
 /**
@@ -25,6 +26,8 @@
  *
  * EcmaScript 4 implementation
  */
+@Deprecated
+@DeprecationInfo("We need rename it")
 public interface JSImportStatement extends JSStatement, StubBasedPsiElement<JSImportStatementStub>, JavaScriptImportStatementBase
 {
 	String getImportText();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
index 022e5cf7..bb05fc7b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.flex;
 
-import javax.annotation.Nullable;
-
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -26,10 +24,15 @@
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.Processor;
+import consulo.annotation.DeprecationInfo;
+
+import javax.annotation.Nullable;
 
 /**
  * @author yole
  */
+@Deprecated
+@DeprecationInfo("We need this?")
 public interface JSResolveHelper
 {
 	ExtensionPointName<JSResolveHelper> EP_NAME = ExtensionPointName.create("consulo.javascript.resolveHelper");
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 96f9a25b..8784ce7b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -16,18 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import gnu.trove.TObjectHashingStrategy;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-
-import javax.annotation.Nullable;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -43,13 +31,7 @@
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiDirectoryContainer;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.StubBasedPsiElement;
+import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubElement;
@@ -62,6 +44,16 @@
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
 import consulo.javascript.lang.psi.impl.elementType.BaseJavaScriptElementType;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.psi.JavaScriptImportStatementBase;
+import gnu.trove.TObjectHashingStrategy;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author Maxim.Mossienko
@@ -476,7 +468,7 @@ String getQNameForMove(@Nonnull PsiElement targetElement, PsiElement elementToBi
 				}
 				if(qualifier == null)
 				{
-					if(!(targetElement.getParent() instanceof JSImportStatement))
+					if(!(targetElement.getParent() instanceof JavaScriptImportStatementBase))
 					{
 						return null;
 					}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index fb56c7ad..20ce4875 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -16,30 +16,15 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageNamesValidation;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.lang.javascript.psi.resolve.BaseJSSymbolProcessor;
-import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.lang.javascript.psi.resolve.VariantsProcessor;
-import com.intellij.lang.javascript.psi.resolve.WalkUpResolveProcessor;
+import com.intellij.lang.javascript.psi.resolve.*;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.ResolveState;
+import com.intellij.psi.*;
 import com.intellij.psi.impl.source.resolve.ResolveCache;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -55,6 +40,11 @@
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.JavaScriptVersionUtil;
 import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Set;
 
 public class JSReferenceExpressionImpl extends JSExpressionImpl implements JSReferenceExpression, BindablePsiReference
 {
@@ -232,6 +222,12 @@ public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOpe
 	@Override
 	public boolean isReferenceTo(PsiElement element)
 	{
+		ResolveHelper helper = ResolveHelper.find(this);
+		if(helper.isResolveTo(this, element))
+		{
+			return true;
+		}
+
 		if(element instanceof PsiNamedElement || element instanceof XmlAttributeValue)
 		{
 			final String referencedName = getReferencedName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index 04475ea0..d1093fb8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -39,6 +39,9 @@
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.Processor;
 import com.intellij.xml.XmlElementDescriptor;
+import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
+import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
+import consulo.lang.LanguageVersion;
 import consulo.util.dataholder.Key;
 import gnu.trove.THashMap;
 import gnu.trove.THashSet;
@@ -261,6 +264,18 @@ JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull final JSRefe
 	@Nullable
 	JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String referencedName, PsiNamedElement parent)
 	{
+		LanguageVersion languageVersion = parent.getLanguageVersion();
+		if(languageVersion instanceof JavaScriptVersionWithHelper)
+		{
+			ResolveHelper helper = ((JavaScriptVersionWithHelper) languageVersion).getHelper();
+
+			JSImportedElementResolveResult result = helper.resolveTypeNameUsingImports(referencedName, parent);
+			if(result != null)
+			{
+				return result;
+			}
+		}
+
 		final Map<String, JSImportedElementResolveResult> map = myImportResolveCache.get(ourImportResolveCache, parent, null).getValue();
 		JSImportedElementResolveResult result = map.get(referencedName);
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
index 7f66c05c..85190dda 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.psi.PsiElement;
+import consulo.javascript.psi.JavaScriptImportStatementBase;
 
 /**
  * @author Maxim.Mossienko
@@ -28,7 +28,7 @@ public class JSImportedElementResolveResult
 {
 	public final String qualifiedName;
 	public final PsiElement resolvedElement;
-	public final JSImportStatement importStatement;
+	public final JavaScriptImportStatementBase importStatement;
 	public static final JSImportedElementResolveResult EMPTY_RESULT = new JSImportedElementResolveResult(null);
 
 	public JSImportedElementResolveResult(String _qualifiedName)
@@ -36,7 +36,7 @@ public JSImportedElementResolveResult(String _qualifiedName)
 		this(_qualifiedName, null, null);
 	}
 
-	public JSImportedElementResolveResult(String _qualifiedName, PsiElement _resolvedElement, JSImportStatement _importString)
+	public JSImportedElementResolveResult(String _qualifiedName, PsiElement _resolvedElement, JavaScriptImportStatementBase _importString)
 	{
 		qualifiedName = _qualifiedName;
 		resolvedElement = _resolvedElement;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 97a0d697..2085c5fc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -76,6 +76,7 @@
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.javascript.psi.JavaScriptImportStatementBase;
 import consulo.roots.types.BinariesOrderRootType;
 import consulo.util.dataholder.Key;
 import gnu.trove.THashSet;
@@ -90,6 +91,9 @@
 /**
  * @author max, maxim.mossienko
  */
+@SuppressWarnings({
+		"ALL"
+})
 public class JSResolveUtil
 {
 	private static final Key<CachedValue<TIntObjectHashMap<Object>>> MY_CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
@@ -2177,7 +2181,7 @@ public static PsiElement getLocalVariableRef(JSFunction function, final JSRefere
 	public static class MyResolveResult implements ResolveResult
 	{
 		private final PsiElement myFunction;
-		private final JSImportStatement myImportUsed;
+		private final JavaScriptImportStatementBase myImportUsed;
 		private boolean myValidResult;
 
 		public MyResolveResult(final PsiElement function)
@@ -2195,7 +2199,7 @@ public MyResolveResult(final PsiElement function, boolean validResult)
 			this(function, null, validResult);
 		}
 
-		public MyResolveResult(final PsiElement function, JSImportStatement importUsed, boolean validResult)
+		public MyResolveResult(final PsiElement function, JavaScriptImportStatementBase importUsed, boolean validResult)
 		{
 			myFunction = function;
 			myValidResult = validResult;
@@ -2219,7 +2223,7 @@ public void setValid(final boolean b)
 			myValidResult = b;
 		}
 
-		public JSImportStatement getImportUsed()
+		public JavaScriptImportStatementBase getImportUsed()
 		{
 			return myImportUsed;
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 5926d60e..c668e624 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -34,6 +34,8 @@
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.SmartList;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
+import consulo.javascript.psi.JavaScriptImportStatementBase;
 import consulo.util.dataholder.Key;
 import consulo.util.dataholder.UserDataHolderBase;
 import gnu.trove.THashSet;
@@ -59,7 +61,7 @@ public class ResolveProcessor extends UserDataHolderBase implements PsiScopeProc
 	private PsiElement myResult;
 	private PsiElement myCandidateResult;
 	private List<PsiElement> myResults;
-	private List<JSImportStatement> myImportsUsed;
+	private List<JavaScriptImportStatementBase> myImportsUsed;
 	private List<Boolean> myResolveStatus;
 
 	private boolean toProcessHierarchy;
@@ -87,12 +89,14 @@ public class ResolveProcessor extends UserDataHolderBase implements PsiScopeProc
 	private boolean myAcceptOnlyClasses;
 	private boolean myAcceptOnlyInterfaces;
 
-	public static final Key<JSImportStatement> IMPORT_KEY = Key.create("import.key");
+	public static final Key<JavaScriptImportStatementBase> IMPORT_KEY = Key.create("import.key");
 	private boolean myClassDeclarationStarted;
 	private PsiElement placeTopParent;
 	protected boolean ecma;
 	public static final String AS3_NAMESPACE = "AS3";
 
+	private ResolveHelper myResolveHelper;
+
 	public ResolveProcessor(final String name)
 	{
 		this(name, false);
@@ -191,7 +195,7 @@ public PsiElement getResult()
 		return myResult;
 	}
 
-	public JSImportStatement getImportUsed()
+	public JavaScriptImportStatementBase getImportUsed()
 	{
 		return myImportsUsed != null ? myImportsUsed.get(0) : null;
 	}
@@ -200,13 +204,14 @@ public List<PsiElement> getResults()
 	{
 		if(myResults == null && myResult == null && myCandidateResult != null)
 		{
-			myResults = new ArrayList<PsiElement>(1);
+			myResults = new ArrayList<>(1);
 			myResults.add(myCandidateResult);
 		}
 		return myResults;
 	}
 
 	@Override
+	@RequiredReadAction
 	public boolean execute(@Nonnull PsiElement element, ResolveState state)
 	{
 		if((element instanceof JSVariable && !(element instanceof JSParameter)) || element instanceof JSFunction)
@@ -284,6 +289,20 @@ else if(!allowUnqualifiedStaticsFromInstance)
 			}
 		}
 
+		if(place != null)
+		{
+			if(myResolveHelper == null)
+			{
+				myResolveHelper = ResolveHelper.find(place);
+			}
+
+			if(myResolveHelper.execute(this, element, state))
+			{
+				myCandidateResult = element;
+				return true;
+			}
+		}
+
 		if(place != null && element instanceof JSFunction && !(element instanceof JSFunctionExpression))
 		{
 			final JSFunction function = (JSFunction) element;
@@ -391,7 +410,7 @@ else if(element instanceof JSFunction && ((JSFunction) element).isConstructor()
 				{
 					if(myName != null)
 					{
-						JSImportStatement s = state != null ? state.get(IMPORT_KEY) : null;
+						JavaScriptImportStatementBase s = state != null ? state.get(IMPORT_KEY) : null;
 						int previousResultsSize = myResults != null ? myResults.size() : 0;
 
 						s = checkQualifiedNameHasNecessaryImport(element, s, previousResultsSize);
@@ -400,7 +419,7 @@ else if(element instanceof JSFunction && ((JSFunction) element).isConstructor()
 						{
 							if(myImportsUsed == null)
 							{
-								myImportsUsed = new SmartList<JSImportStatement>();
+								myImportsUsed = new SmartList<>();
 								for(int i = 0; i < previousResultsSize; ++i)
 								{
 									myImportsUsed.add(null);
@@ -412,7 +431,7 @@ else if(element instanceof JSFunction && ((JSFunction) element).isConstructor()
 					}
 					if(myResults == null)
 					{
-						myResults = new ArrayList<PsiElement>(1);
+						myResults = new ArrayList<>(1);
 					}
 					myResults.add(element);
 					myResult = element;
@@ -424,13 +443,13 @@ else if(element instanceof JSFunction && ((JSFunction) element).isConstructor()
 		return true;
 	}
 
-	private JSImportStatement checkQualifiedNameHasNecessaryImport(PsiElement element, JSImportStatement s, int previousResultsSize)
+	private JavaScriptImportStatementBase checkQualifiedNameHasNecessaryImport(PsiElement element, JavaScriptImportStatementBase s, int previousResultsSize)
 	{
 		if(s == null && (element instanceof JSClass || element instanceof JSFunction || element instanceof JSVariable ||
 				element instanceof JSNamespaceDeclaration))
 		{
 
-			if(placeTopParent instanceof JSReferenceExpression && !(placeTopParent.getParent() instanceof JSImportStatement))
+			if(placeTopParent instanceof JSReferenceExpression && !(placeTopParent.getParent() instanceof JavaScriptImportStatementBase))
 			{
 				final String qName = ((JSQualifiedNamedElement) element).getQualifiedName();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index 567f3003..433ea4ff 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -16,15 +16,6 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import gnu.trove.THashSet;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
 import com.intellij.lang.javascript.psi.*;
@@ -37,6 +28,11 @@
 import com.intellij.util.ArrayUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.psi.JavaScriptImportStatementBase;
+import gnu.trove.THashSet;
+import org.jetbrains.annotations.NonNls;
+
+import java.util.*;
 
 /**
  * @author Maxim.Mossienko
@@ -102,7 +98,7 @@ else if(JSResolveUtil.getTypeFromTagNameInMxml(myCurrentFile.getContext()) != nu
 			{
 				final PsiElement parent = refExpr.getParent();
 
-				if(parent instanceof JSImportStatement)
+				if(parent instanceof JavaScriptImportStatementBase)
 				{
 					myProcessOnlyTypes = true;
 				}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index a60ae07e..894340cf 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -32,6 +32,7 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
+import consulo.javascript.psi.JavaScriptImportStatementBase;
 import consulo.util.dataholder.Key;
 import gnu.trove.THashSet;
 
@@ -138,15 +139,15 @@ private void registerUsedImportsFromResolveResults(JSReferenceExpression node, S
 			// TODO can we get different import statements here?
 			if(r instanceof JSResolveUtil.MyResolveResult)
 			{
-				JSImportStatement importStatement = ((JSResolveUtil.MyResolveResult) r).getImportUsed();
+				JavaScriptImportStatementBase importStatement = ((JSResolveUtil.MyResolveResult) r).getImportUsed();
 
-				if(importStatement != null && isInstance(r.getElement(), REFERENCED_ELEMENTS_CLASSES))
+				if(importStatement instanceof JSImportStatement && isInstance(r.getElement(), REFERENCED_ELEMENTS_CLASSES))
 				{
-					String importString = importStatement.getImportText();
+					String importString = ((JSImportStatement) importStatement).getImportText();
 					String importedPackage = importString.substring(0, importString.lastIndexOf('.'));
 					if(thisPackage == null || !thisPackage.equals(importedPackage))
 					{
-						registerUsed(importStatement);
+						registerUsed((JSImportStatement) importStatement);
 					}
 				}
 			}
@@ -179,7 +180,7 @@ private static Pair<Boolean, Boolean> getReplaceStatus(JSReferenceExpression nod
 			resolve = JSResolveUtil.findClassByQName(node.getText(), node);
 		}
 		PsiElement parent = node.getParent();
-		if(parent instanceof JSImportStatement)
+		if(parent instanceof JavaScriptImportStatementBase)
 		{
 			return Pair.create(false, false);
 		}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
new file mode 100644
index 00000000..5df55969
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
@@ -0,0 +1,13 @@
+package consulo.javascript.lang.psi.impl.resolve;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public interface JavaScriptVersionWithHelper
+{
+	@Nonnull
+	ResolveHelper getHelper();
+}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
new file mode 100644
index 00000000..e64ff972
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
@@ -0,0 +1,52 @@
+package consulo.javascript.lang.psi.impl.resolve;
+
+import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
+import com.intellij.lang.javascript.psi.resolve.JSImportedElementResolveResult;
+import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiNamedElement;
+import com.intellij.psi.ResolveState;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.lang.LanguageVersion;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public abstract class ResolveHelper
+{
+	private static final ResolveHelper DEFAULT = new ResolveHelper()
+	{
+	};
+
+	public static ResolveHelper find(PsiElement element)
+	{
+		LanguageVersion languageVersion = element.getLanguageVersion();
+		if(languageVersion instanceof JavaScriptVersionWithHelper)
+		{
+			return ((JavaScriptVersionWithHelper) languageVersion).getHelper();
+		}
+
+		return DEFAULT;
+	}
+
+	@Nullable
+	public JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String referencedName, PsiNamedElement parent)
+	{
+		return null;
+	}
+
+	public boolean execute(ResolveProcessor resolveProcessor, PsiElement element, ResolveState state)
+	{
+		return false;
+	}
+
+	@RequiredReadAction
+	public boolean isResolveTo(JSReferenceExpressionImpl expression, PsiElement element)
+	{
+		return false;
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
index ca254dd3..47646077 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
@@ -1,6 +1,7 @@
 package consulo.javascript.ecmascript6.psi;
 
 import com.intellij.lang.javascript.psi.JSElement;
+import com.intellij.psi.PsiNameIdentifierOwner;
 
 /**
  * @author VISTALL
@@ -12,6 +13,6 @@
  * <p>
  * import * as util ...
  */
-public interface ES6ImportedBinding extends JSElement
+public interface ES6ImportedBinding extends JSElement, PsiNameIdentifierOwner
 {
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
index a3526904..c2d7e962 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
@@ -1,6 +1,9 @@
 package consulo.javascript.ecmascript6.psi;
 
 import com.intellij.lang.javascript.psi.JSElement;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -11,4 +14,7 @@
  */
 public interface ES6NamedImports extends JSElement
 {
+	@Nonnull
+	@RequiredReadAction
+	ES6ImportedBinding[] getBindings();
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
index 005d26ee..5be80166 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
@@ -2,8 +2,13 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.impl.JSStatementImpl;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.ResolveState;
+import com.intellij.psi.scope.PsiScopeProcessor;
 import consulo.javascript.ecmascript6.psi.ES6ImportDeclaration;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 2019-12-14
@@ -14,4 +19,17 @@ public ES6ImportDeclarationImpl(ASTNode node)
 	{
 		super(node);
 	}
+
+	@Override
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
+	{
+		for(PsiElement child : getChildren())
+		{
+			if(!child.processDeclarations(processor, state, lastParent, place))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
index 46f76f31..b528719d 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
@@ -1,11 +1,20 @@
 package consulo.javascript.ecmascript6.psi.impl;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.ResolveState;
+import com.intellij.psi.scope.PsiScopeProcessor;
+import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.javascript.ecmascript6.psi.ES6ImportedBinding;
+import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
@@ -23,4 +32,33 @@ public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		visitor.visitElement(this);
 	}
+
+	@RequiredReadAction
+	@Override
+	public String getName()
+	{
+		PsiElement nameIdentifier = getNameIdentifier();
+		return nameIdentifier == null ? null : nameIdentifier.getText();
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public PsiElement getNameIdentifier()
+	{
+		return findChildByType(JSTokenTypes.IDENTIFIER);
+	}
+
+	@RequiredWriteAction
+	@Override
+	public PsiElement setName(@Nonnull @NonNls String s) throws IncorrectOperationException
+	{
+		return null;
+	}
+
+	@Override
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
+	{
+		return processor.execute(this, state);
+	}
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
index b38c67b8..fc2b5939 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
@@ -2,7 +2,12 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.ResolveState;
+import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.ecmascript6.psi.ES6ImportedBinding;
 import consulo.javascript.ecmascript6.psi.ES6NamedImports;
 
 import javax.annotation.Nonnull;
@@ -23,4 +28,25 @@ public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		visitor.visitElement(this);
 	}
+
+	@Override
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
+	{
+		for(PsiElement child : getChildren())
+		{
+			if(!child.processDeclarations(processor, state, lastParent, place))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public ES6ImportedBinding[] getBindings()
+	{
+		return findChildrenByClass(ES6ImportedBinding.class);
+	}
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java
new file mode 100644
index 00000000..fd1341f3
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java
@@ -0,0 +1,99 @@
+package consulo.javascript.ecmascript6.psi.impl.resolve;
+
+import com.intellij.lang.javascript.psi.JSFile;
+import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
+import com.intellij.lang.javascript.psi.resolve.JSImportedElementResolveResult;
+import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiNamedElement;
+import com.intellij.psi.ResolveState;
+import com.intellij.psi.scope.BaseScopeProcessor;
+import com.intellij.psi.util.PsiTreeUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.ecmascript6.psi.ES6ImportDeclaration;
+import consulo.javascript.ecmascript6.psi.ES6ImportedBinding;
+import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
+import consulo.util.lang.Comparing;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-14
+ */
+public class EcmaScript6ResolveHelper extends ResolveHelper
+{
+	public static final ResolveHelper INSTANCE = new EcmaScript6ResolveHelper();
+
+	private static class ImportProcessor extends BaseScopeProcessor
+	{
+		private final String myReferencedName;
+		private JSImportedElementResolveResult myResult;
+
+		public ImportProcessor(String referencedName)
+		{
+			myReferencedName = referencedName;
+		}
+
+		@Override
+		public boolean execute(@Nonnull PsiElement psiElement, ResolveState resolveState)
+		{
+			if(psiElement instanceof ES6ImportedBinding && myReferencedName.equals(((ES6ImportedBinding) psiElement).getName()))
+			{
+				myResult = new JSImportedElementResolveResult(myReferencedName, psiElement, PsiTreeUtil.getParentOfType(psiElement, ES6ImportDeclaration.class));
+				return false;
+			}
+			return true;
+		}
+	}
+
+	@Nullable
+	@Override
+	public JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull String referencedName, PsiNamedElement parent)
+	{
+		ImportProcessor processor = new ImportProcessor(referencedName);
+
+		PsiFile containingFile = parent.getContainingFile();
+		if(containingFile instanceof JSFile)
+		{
+			ES6ImportDeclaration[] childrenOfType = PsiTreeUtil.getChildrenOfType(containingFile, ES6ImportDeclaration.class);
+			if(childrenOfType == null)
+			{
+				return null;
+			}
+
+			for(ES6ImportDeclaration declaration : childrenOfType)
+			{
+				if(!declaration.processDeclarations(processor, ResolveState.initial(), declaration, parent))
+				{
+					break;
+				}
+			}
+		}
+
+		return processor.myResult;
+	}
+
+	@Override
+	public boolean execute(ResolveProcessor resolveProcessor, PsiElement element, ResolveState state)
+	{
+		if(element instanceof ES6ImportedBinding && Comparing.equal(((ES6ImportedBinding) element).getName(), resolveProcessor.getName()))
+		{
+			return true;
+		}
+		return false;
+	}
+
+	@RequiredReadAction
+	@Override
+	public boolean isResolveTo(JSReferenceExpressionImpl expression, PsiElement element)
+	{
+		if(element instanceof ES6ImportedBinding && Comparing.equal(expression.getReferencedName(), ((ES6ImportedBinding) element).getName()))
+		{
+			return true;
+		}
+		return super.isResolveTo(expression, element);
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 38cc4ac6..994fa301 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -22,10 +22,13 @@
 import com.intellij.lexer.MergingLexerAdapter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.ecmascript6.psi.impl.resolve.EcmaScript6ResolveHelper;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScriptFlexAdapter;
 import consulo.javascript.lang.lexer._EcmaScript6Lexer;
 import consulo.javascript.lang.parsing.EcmaScript6Parser;
+import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
+import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
 
 import javax.annotation.Nonnull;
 
@@ -33,7 +36,7 @@
  * @author VISTALL
  * @since 12.12.2015
  */
-public class EcmaScript6JavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
+public class EcmaScript6JavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker, JavaScriptVersionWithHelper
 {
 	@Nonnull
 	public static EcmaScript6JavaScriptVersion getInstance()
@@ -90,4 +93,11 @@ public int getWeight()
 	{
 		return 50;
 	}
+
+	@Nonnull
+	@Override
+	public ResolveHelper getHelper()
+	{
+		return EcmaScript6ResolveHelper.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
index 39e8cc58..1b126d67 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
@@ -16,21 +16,6 @@
 
 package com.intellij.lang.javascript.structureView;
 
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TIntObjectProcedure;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
 import com.intellij.ide.structureView.StructureViewTreeElement;
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.javascript.index.JSSymbolUtil;
@@ -42,6 +27,14 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
+import consulo.javascript.psi.JavaScriptImportStatementBase;
+import gnu.trove.THashMap;
+import gnu.trove.THashSet;
+import gnu.trove.TIntObjectHashMap;
+import gnu.trove.TIntObjectProcedure;
+
+import javax.annotation.Nullable;
+import java.util.*;
 
 /**
  * @author max
@@ -279,7 +272,7 @@ public void visitElement(PsiElement element)
 						!(element instanceof JSDefinitionExpression) &&
 						!(element instanceof JSLabeledStatement) &&
 						!(element instanceof JSPackageStatement) &&
-						!(element instanceof JSImportStatement))
+						!(element instanceof JavaScriptImportStatementBase))
 				{
 					if(!(element instanceof JSFunction) || !(element.getParent() instanceof JSProperty))
 					{

From bd3cd85c24a4004e280ee746d8f7b9ad76b6b4bd Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Dec 2019 12:16:29 +0300
Subject: [PATCH 079/340] don't eat question mark

---
 .../main/java/consulo/javascript/lang/lexer/ecmascript6.flex    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index 5363e464..856b766f 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -142,7 +142,7 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 	}
 }
 
-<TAG_CONTENT> ([^\?<&\{ \n\r\t\f])* { return JSTokenTypes.XML_TAG_CONTENT; }
+<TAG_CONTENT> ([^<&\{ \n\r\t\f])* { return JSTokenTypes.XML_TAG_CONTENT; }
 <TAG_CONTENT> "<?" ([^\?]|(\?[^\>]))* "?>" { return JSTokenTypes.XML_TAG_CONTENT; }
 <TAG_CONTENT> {XML_COMMENT} { return JSTokenTypes.XML_STYLE_COMMENT; }
 

From f603d46a89026b5d8c6bdd1f9ed206c2e1140f5f Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Dec 2019 12:18:41 +0300
Subject: [PATCH 080/340] drop wrong sdk classes since it will provide parsing
 errors

---
 plugin/src/main/dist/sdk/clientAny/E4X.js2    | 646 ------------------
 .../main/dist/sdk/clientAny/ECMAScript.js2    | 244 -------
 .../sdk/clientAny/ECMAScript_Additional.js2   |   2 -
 3 files changed, 892 deletions(-)
 delete mode 100644 plugin/src/main/dist/sdk/clientAny/E4X.js2
 delete mode 100644 plugin/src/main/dist/sdk/clientAny/ECMAScript.js2
 delete mode 100644 plugin/src/main/dist/sdk/clientAny/ECMAScript_Additional.js2

diff --git a/plugin/src/main/dist/sdk/clientAny/E4X.js2 b/plugin/src/main/dist/sdk/clientAny/E4X.js2
deleted file mode 100644
index 5f446c39..00000000
--- a/plugin/src/main/dist/sdk/clientAny/E4X.js2
+++ /dev/null
@@ -1,646 +0,0 @@
-/**
- * Determines whether the specified string is a valid name for an XML element or attribute.
- * @param str - A string to evaluate.
- * @return Returns true if the str argument is a valid XML name; false otherwise.
- */
-public native function isXMLName(str:String):Boolean
-
-/**
- * An XMLList object is an ordered collection of properties. An XMLList object represents an XML document, an XML fragment,
- * or an arbitrary collection of XML objects.
- * An XMLList object with one XML element is treated the same as an XML object. When there is one XML element, all methods
- * that are available for the XML object are also available for the XMLList object.
- */
-public final dynamic class XMLList extends XML {
-  /**
-   * Creates a new XMLList object.
-   * @param value - Any object that can be converted to an XMLList object by using the top-level XMLList() function.
-   * @constructor
-   */
-  public native function XMLList(value:Object = null):XMLList
-
-  /**
-   * Calls the attribute() method of each XML object and returns an XMLList object of the results. The results match
-   * the given attributeName parameter. If there is no match, the attribute() method returns an empty XMLList object.
-   * @param attributeName The name of the attribute that you want to include in an XMLList object.
-   * @return
-   */
-  public native function attribute(attributeName:*):XMLList
-
-  /**
-   * Calls the attributes() method of each XML object and returns an XMLList object of attributes for each XML object.
-   * @return An XMLList object of attributes for each XML object.
-   */
-  public native function attributes():XMLList
-
-  /**
-   * Calls the child() method of each XML object and returns an XMLList object that contains the results in order.
-   * @param propertyName - The element name or integer of the XML child.
-   * @return An XMLList object of child nodes that match the input parameter.
-   */
-  public native function child(propertyName:Object):XMLList
-
-  /**
-   * Calls the children() method of each XML object and returns an XMLList object that contains the results.
-   * @return An XMLList object of the children in the XML objects.
-   */
-  public native function children():XMLList
-
-  /**
-   * Calls the comments() method of each XML object and returns an XMLList of comments.
-   * @return An XMLList of the comments in the XML objects.
-   */
-  public native function comments():XMLList
-
-  /**
-   * Checks whether the XMLList object contains an XML object that is equal to the given value parameter.
-   * @param value - An XML object to compare against the current XMLList object.
-   * @return If the XMLList contains the XML object declared in the value parameter, then true; otherwise false.
-   */
-  public native function contains(value:XML):Boolean
-
-  /**
-   * Returns a copy of the given XMLList object. The copy is a duplicate of the entire tree of nodes. The copied XML object has no parent
-   * and returns null if you attempt to call the parent() method.
-   * @return The copy of the XMLList object.
-   */
-  public native function copy():XMLList
-
-  /**
-   *  Returns all descendants (children, grandchildren, great-grandchildren, and so on) of the XML object that have the given name parameter.
-   * The name parameter can be a QName object, a String data type, or any other data type that is then converted to a String data type.
-   * To return all descendants, use the asterisk (*) parameter. If no parameter is passed, the string "*" is passed and returns all
-   * descendants of the XML object.
-   * @param name - The name of the element to match, defaults to *.
-   */
-  public native function descendants(name:Object = *):XMLList
-
- /**
-  * Calls the elements() method of each XML object. The name parameter is passed to the descendants() method. If no parameter is passed,
-  * the string "*" is passed to the descendants() method.
-  * @param name - the name of the elements to match, defaulting to *.
-  * @return An XMLList object of the matching child elements of the XML objects
-  */
-  public native function elements(name:Object = *):XMLList
-
-  /**
-   *  Checks whether the XMLList object contains complex content. An XMLList object is considered to contain complex content if it is not
-   * empty and either of the following conditions is true:
-   * The XMLList object contains a single XML item with complex content.
-   * The XMLList object contains elements.
-   * @return  - If the XMLList object contains complex content, then true; otherwise false.
-   */
-  public native function hasComplexContent():Boolean
-
-  /**
-   * Checks for the property specified by p.
-   * @param p The property to match.
-   * @return  - If the parameter exists, then true; otherwise false.
-   */
-  public native function hasOwnProperty	(p:String):Boolean
-  
-  /**
-   *  Checks whether the XMLList object contains simple content. An XMLList object is considered to contain simple content if one or more
-   * of the following conditions is true:
-   * The XMLList object is empty
-   * The XMLList object contains a single XML item with simple content
-   * The XMLList object contains no elements
-   * @return  - If the XMLList contains simple content, then true; otherwise false.
-   */
-  public native function hasSimpleContent():Boolean
-
-  /**
-   * Returns the number of properties in the XMLList object.
-   * @return  - If the parameter exists, then true; otherwise false.
-   */
-  public native function length	():int
-
-  /**
-   * Merges adjacent text nodes and eliminates empty text nodes for each of the following: all text nodes in the XMLList, all the XML
-   * objects contained in the XMLList, and the descendants of all the XML objects in the XMLList.
-   * @return  - The normalized XMLList object.
-   */
-  public native function normalize():Boolean
-
-  /**
-   * Returns the parent of the XMLList object if all items in the XMLList object have the same parent. If the XMLList object has no parent
-   * or different parents, the method returns undefined.
-   * @return  - Returns the parent XML object.
-   */
-  public native function parent():Object
-
-  /**
-   * If a name parameter is provided, lists all the children of the XMLList object that contain processing instructions with that name.
-   * With no parameters, the method lists all the children of the XMLList object that contain any processing instructions.
-   * @param name The name of the processing instructions to match.
-   * @return  - An XMLList object that contains the processing instructions for each XML object.
-   */
-  public native function processingInstructions(name:String = "*"):XMLList
-
-  /**
-   * Calls the text() method of each XML object and returns an XMLList object that contains the results.
-   * @param name The name of the processing instructions to match.
-   * @return  - An XMLList object of all XML properties of the XMLList object that represent XML text nodes.
-   */
-  public native function text():XMLList
-
-  /**
-   * Returns a string representation of all the XML objects in an XMLList object. The rules for this conversion depend on whether the XML
-   * object has simple content or complex content:
-   * If the XML object has simple content, toString() returns the string contents of the XML object with the following stripped out: the
-   * start tag, attributes, namespace declarations, and end tag.
-   * If the XML object has complex content, toString() returns an XML encoded string representing the entire XML object, including the start
-   *  tag, attributes, namespace declarations, and end tag.
-   * To return the entire XML object every time, use the toXMLString() method.
-   * @return  - The string representation of the XML object.
-   */
-  public native function toString():String
-
-  /**
-   * Returns a string representation of all the XML objects in an XMLList object. Unlike the toString() method, the toXMLString()
-   * method always returns the start tag, attributes, and end tag of the XML object, regardless of whether the XML object has simple content
-   *  or complex content. (The toString() method strips out these items for XML objects that contain simple content.)
-   * @return  - The string representation of the XML object.
-   */
-  public native function toXMLString():String
-}
-
-/**
- * The XML class contains methods and properties for working with XML objects. The XML class (along with the XMLList, Namespace, and
- * QName classes) implements the powerful XML-handling standards defined in ECMAScript for XML (E4X) specification (ECMA-357 edition 2).
- * Use the toXMLString() method to return a string representation of the XML object regardless of whether the XML object has simple content
- * or complex content.
- */
-public dynamic class XML {
-/**
- *  Determines whether XML comments are ignored when XML objects parse the source XML data. By default, the comments are ignored (true).
- * To include XML comments, set this property to false. The ignoreComments property is used only during the XML parsing, not during the call
- * to any method such as myXMLObject.child(*).toXMLString(). If the source XML includes comment nodes, they are kept or discarded during the
- * XML parsing.
- */
-  public static native function get ignoreComments():Boolean
-  public static native function set ignoreComments(value:Boolean):void
-
-  /**
-   * Determines whether XML processing instructions are ignored when XML objects parse the source XML data. By default, the processing
-   * instructions are ignored (true). To include XML processing instructions, set this property to false. The ignoreProcessingInstructions
-   * property is used only during the XML parsing, not during the call to any method such as myXMLObject.child(*).toXMLString(). If the
-   * source XML includes processing instructions nodes, they are kept or discarded during the XML parsing.
-   */
-  public static native function get ignoreProcessingInstructions():Boolean
-  public static native function set ignoreProcessingInstructions(value:Boolean):void
-
-  /**
-   * Determines whether white space characters at the beginning and end of text nodes are ignored during parsing. By default, white space
-   * is ignored (true). If a text node is 100% white space and the ignoreWhitespace property is set to true, then the node is not created.
-   * To show white space in a text node, set the ignoreWhitespace property to false.
-   */
-  public static native function get ignoreWhitespace():Boolean
-  public native function set ignoreWhitespace(value:Boolean):void
-
-  /**
-   * Determines the amount of indentation applied by the toString() and toXMLString() methods when the XML.prettyPrinting property is set
-   * to true. Indentation is applied with the space character, not the tab character. The default value is 2.
-   */
-  public static native function get prettyIndent():int
-  public native function set prettyIndent(value:int):void
-
-  /**
-   * Determines whether the toString() and toXMLString() methods normalize white space characters between some tags. The default value is true.
-   */
-  public static native function get prettyPrinting():Boolean
-  public native function set prettyPrinting(value:Boolean):void
-
-  /**
-   * Creates a new XML object. You must use the constructor to create an XML object before you call any of the methods of the XML class.
-   * Use the toXMLString() method to return a string representation of the XML object regardless of whether the XML object has simple
-   * content or complex content.
-   * @param value
-   * @constructor
-   */
-  public native function XML(value:Object = null):XML;
-
-  /**
-   * Adds a namespace to the set of in-scope namespaces for the XML object. If the namespace already exists in the in-scope namespaces
-   * for the XML object (with a prefix matching that of the given parameter), then the prefix of the existing namespace is set to undefined.
-   * If the input parameter is a Namespace object, it's used directly. If it's a QName object, the input parameter's URI is used to create
-   * a new namespace; otherwise, it's converted to a String and a namespace is created from the String.
-   * @param The namespace to add to the XML object.
-   * @return The new XML object, with the namespace added.
-   */
-  public native function addNamespace(ns:Object):XML
-
-  /**
-   * Appends the given child to the end of the XML object's properties. The appendChild() method takes an XML object, an XMLList object,
-   * or any other data type that is then converted to a String.
-   * Use the delete (XML) operator to remove XML nodes.
-   * @param The XML object to append.
-   * @return The resulting XML object.
-   */
-  public native function appendChild(ns:Object):XML
-
-  /**
-   * Returns the XML value of the attribute that has the name matching the attributeName  parameter. Attributes are found within XML 
-   * elements. In the following example, the element has an attribute named "gender" with the value "boy": <first gender="boy">John</first>.
-   * The attributeName parameter can be any data type; however, String is the most common data type to use. When passing any object other
-   * than a QName object, the attributeName parameter uses the toString() method to convert the parameter to a string.
-   * If you need a qualified name reference, you can pass in a QName object. A QName object defines a namespace and the local name, which
-   * you can use to define the qualified name of an attribute. Therefore calling attribute(qname) is not the same as calling
-   * attribute(qname.toString()).
-   * @param attributeName The name of the attribute.
-   * @return An XMLList object or an empty XMLList object. Returns an empty XMLList object when an attribute value has not been defined.
-   */
-  public native function attribute(attributeName:*):XMLList
-
-  /**
-   * Returns a list of attribute values for the given XML object. Use the name() method with the attributes() method to return the name
-   * of an attribute. Use @* to return the names of all attributes.
-   * @return The list of attribute values.
-   */
-  public native function attributes():XMLList
-
-  /**
-   *  Lists the children of an XML object. An XML child is an XML element, text node, comment, or processing instruction.
-   * Use the propertyName parameter to list the contents of a specific XML child. For example, to return the contents of a child named
-   * <first>, use child.name("first"). You can generate the same result by using the child's index number. The index number identifies
-   * the child's position in the list of other XML children. For example, name.child(0) returns the first child in a list.
-   * Use an asterisk (*) to output all the children in an XML document. For example, doc.child("*").
-   * Use the length() method with the asterisk (*) parameter of the child() method to output the total number of children. For example,
-   * numChildren = doc.child("*").length().
-   * @param propertyName - The element name or integer of the XML child.
-   * @return An XMLList object of child nodes that match the input parameter.
-   */
-  public native function child(propertyName:Object):XMLList
-
-  /**
-   * Identifies the zero-indexed position of this XML object within the context of its parent.
-   * @return The position of the object. Returns -1 as well as positive integers.
-   */
-  public native function childIndex():int
-
-  /**
-   * Lists the children of the XML object in the sequence in which they appear. An XML child is an XML element, text node, comment,
-   * or processing instruction.
-   * @return An XMLList object of the XML object's children.
-   */
-
-  public native function children():XMLList
-
-  /**
-   * Lists the properties of the XML object that contain XML comments.
-   * @return An XMLList object of the properties that contain comments.
-   */
-  public native function comments():XMLList
-
-  /**
-   * Compares the XML object against the given value parameter.
-   * @param value - A value to compare against the current XML object.
-   * @return If the XML object matches the value parameter, then true; otherwise false.
-   */
-  public native function contains(value:XML):Boolean
-
-  /**
-   * Returns a copy of the given XML object. The copy is a duplicate of the entire tree of nodes. The copied XML object has no parent and
-   * returns null if you attempt to call the parent() method.
-   * @return The copy of the object.
-   */
-  public native function copy():XML
-
-  /**
-   * Returns an object with the following properties set to the default values: ignoreComments, ignoreProcessingInstructions,
-   * ignoreWhitespace, prettyIndent, and prettyPrinting.
-   */
-  public native static function defaultSettings():Object
-
-  /**
-   * Returns all descendants (children, grandchildren, great-grandchildren, and so on) of the XML object that have the given name
-   * parameter. The name parameter is optional. The name parameter can be a QName object, a String data type or any other data type that is
-   * then converted to a String data type. To return all descendants, use the "*" parameter. If no parameter is passed, the string "*" is
-   * passed and returns all descendants of the XML object.
-   * @param name The name of the element to match.
-   * @return An XMLList object of matching descendants. If there are no descendants, returns an empty XMLList object.
-   */
-  public native function descendants(name:Object = *):XMLList
-
-  /**
-   *  Lists the elements of an XML object. An element consists of a start and an end tag; for example <first></first>. The name parameter
-   * is optional. The name parameter can be a QName object, a String data type, or any other data type that is then converted to a String
-   * data type. Use the name parameter to list a specific element. For example, the element "first" returns "John" in this example:
-   * <first>John</first>.
-   * To list all elements, use the asterisk (*) as the parameter. The asterisk is also the default parameter. Use the length() method with
-   * the asterisk parameter to output the total number of elements. For example, numElement = addressbook.elements("*").length().
-   * @param name - The name of the element. An element's name is surrounded by angle brackets. For example, "first" is the name
-   * in this example: <first></first>.
-   * @return An XMLList object of the element's content. The element's content falls between the start and end tags. If you use the
-   * asterisk (*) to call all elements, both the element's tags and content are returned.
-   */
-  public native function elements(name:Object = *):XMLList
-
-  /**
-   * Checks to see whether the XML object contains complex content. An XML object contains complex content if it has child elements. XML
-   * objects that representing attributes, comments, processing instructions, and text nodes do not have complex content. However, an object
-   * that contains these can still be considered to contain complex content (if the object has child elements).
-   * @return If the XML object contains complex content, true; otherwise false.
-   */
-  public native function hasComplexContent():Boolean
-
-/**
- * Checks to see whether the XML object contains simple content. An XML object contains simple content if it represents a text node, an
- * attribute node, or an XML element that has no child elements. XML objects that represent comments and processing instructions do not
- * contain simple content.
- * @return If the XML object contains simple content, true; otherwise false.
- */ 
-  public native function hasSimpleContent():Boolean
-
-  /**
-   * Lists the namespaces for the XML object, based on the object's parent.
-   * @return An array of Namespace objects
-   */
-  [ArrayElementType("Namespace")]
-  public native function inScopeNamespaces():Array
-
-  /**
-   *  Inserts the given child2 parameter after the child1 parameter in this XML object and returns the resulting object. If the child1
-   * parameter is null, the method inserts the contents of child2 before all children of the XML object (in other words, after none).
-   * If child1 is provided, but it does not exist in the XML object, the XML object is not modified and undefined is returned.
-   * If you call this method on an XML child that is not an element (text, attributes, comments, pi, and so on) undefined is returned.
-   * Use the delete (XML) operator to remove XML nodes.
-   * @param child1 - The object in the source object that you insert before child2.
-   * @param child2 - The object to insert.
-   * @return The resulting XML object or undefined.
-   */
-  public native function insertChildAfter(child1:Object, child2:Object):*
-
-  /**
-   *  Inserts the given child2 parameter before the child1 parameter in this XML object and returns the resulting object. If the child1
-   * parameter is null, the method inserts the contents of child2 after all children of the XML object (in other words, before none).
-   * If child1 is provided, but it does not exist in the XML object, the XML object is not modified and undefined is returned.
-   * If you call this method on an XML child that is not an element (text, attributes, comments, pi, and so on) undefined is returned.
-   * Use the delete (XML) operator to remove XML nodes.
-   * @param child1 - The object in the source object that you insert after child2.
-   * @param child2 - The object to insert.
-   * @return The resulting XML object or undefined.
-   */
-  public native function insertChildBefore(child1:Object, child2:Object):*
-
-  /**
-   * For XML objects, this method always returns the integer 1. The length() method of the XMLList class returns a value of 1 for an
-   * XMLList object that contains only one value.
-   * @return Always returns 1 for any XML object.
-   */
-  public native function length():int
-
-  /**
-   * Gives the local name portion of the qualified name of the XML object.
-   * @return The local name as either a String or null.
-   */
-  public native function localName():Object
-
-  /**
-   * Gives the qualified name for the XML object.
-   * @return The qualified name is either a QName or null.
-   */
-  public native function name():Object
-
-  /**
-   * If no parameter is provided, gives the namespace associated with the qualified name of this XML object. If a prefix parameter is
-   * specified, the method returns the namespace that matches the prefix parameter and that is in scope for the XML object.
-   * If there is no such namespace, the method returns undefined.
-   * @param prefix The prefix you want to match, defaults to null.
-   * @return The qualified name is either a QName or null.
-   */
-  public native function namespace(prefix:String = null):Object
-
-/**
- * Lists namespace declarations associated with the XML object in the context of its parent.
- * @return An array of Namespace objects.
- */
-  public native function namespaceDeclarations():/*Namespace*/ Array
-
-/**
- * Specifies the type of node: text, comment, processing-instruction, attribute, or element.
- * @return The node type used.
- */ 
-  public native function nodeKind():String
-
-  /**
-   * For the XML object and all descendant XML objects, merges adjacent text nodes and eliminates empty text nodes.
-   * @return The resulting normalized XML object.
-   */
-  public native function normalize():XML
-
-  /**
-   * Returns the parent of the XML object. If the XML object has no parent, the method returns undefined.
-   * @return The parent XML object. Returns either a String or undefined.
-   */
-  public native function parent():*
-
-  /**
-   *  Inserts a copy of the provided child object into the XML element before any existing XML properties for that element. Use the
-   * delete (XML) operator to remove XML nodes.
-   * @param value - The object to insert.
-   * @return The resulting XML object.
-   */
-  public native function prependChild(value:Object):XML
-
-  /**
-   * If a name parameter is provided, lists all the children of the XML object that contain processing instructions with that name.
-   * With no parameters, the method lists all the children of the XML object that contain any processing instructions.
-   * @param The name of the processing instructions to match, defaulting to "*".
-   * @return A list of matching child objects.
-   */
-  public native function processingInstructions(name:String = "*"):XMLList
-
-  /**
-   * Removes the given namespace for this object and all descendants. The removeNamespaces() method does not remove a namespace if it is
-   * referenced by the object's qualified name or the qualified name of the object's attributes.
-   * @param ns - The namespace to remove.
-   * @return A copy of the resulting XML object.
-   */
-  public native function removeNamespace(ns:Namespace):XML
-
-  /**
-   * Replaces the properties specified by the propertyName parameter with the given value parameter. If no properties match propertyName,
-   * the XML object is left unmodified.
-   * @param propertyName - Can be a numeric value, an unqualified name for a set of XML elements, a qualified name for a set of XML elements,
-   * or the asterisk wildcard ("*"). Use an unqualified name to identify XML elements in the default namespace.
-   * @param value - The replacement value. This can be an XML object, an XMLList object, or any value that can be converted with toString().
-   * @return The resulting XML object, with the matching properties replaced.
-   */
-  public native function replace(propertyName:Object, value:XML):XML
-
-  /**
-   * Replaces the child properties of the XML object with the specified set of XML properties, provided in the value parameter.
-   * @param value - The replacement XML properties. Can be a single XML object or an XMLList object.
-   * @return The resulting XML object.
-   */
-  public native function setChildren(value:Object):XML
-
-  /**
-   * Changes the local name of the XML object to the given name parameter.
-   * @param name - The replacement name for the local name.
-   */
-  public native function setLocalName(name:String):void
-
-  /**
-   * Sets the name of the XML object to the given qualified name or attribute name.
-   * @param name - The new name for the object.
-   */
-  public native function setName(name:String):void
-
-  /**
-   * Sets the namespace associated with the XML object.
-   * @param ns - The new namespace.
-   */
-  public native function setNamespace(name:String):void
-
-  /**
-   * Sets values for the following XML properties: ignoreComments, ignoreProcessingInstructions, ignoreWhitespace, prettyIndent, and prettyPrinting.
-   * @param rest An object with each of the following properties:
-    * ignoreComments
-    * ignoreProcessingInstructions
-    * ignoreWhitespace
-    * prettyIndent
-    * prettyPrinting
-   */
-  public native static function setSettings(... rest):void
-
-  /**
-   * Retrieves the following properties: ignoreComments, ignoreProcessingInstructions, ignoreWhitespace, prettyIndent, and prettyPrinting.
-   * @return An object with the following XML properties:
-   * ignoreComments
-   * ignoreProcessingInstructions
-   * ignoreWhitespace
-   * prettyIndent
-   * prettyPrinting
-   */
-  public native static function settings():Object
-
-  /**
-   * Returns an XMLList object of all XML properties of the XML object that represent XML text nodes.
-   * @return The list of properties.
-   */
-  public native function text():XMLList
-
-  /**
-   *  Returns a string representation of the XML object. The rules for this conversion depend on whether the XML object has simple content
-   * or complex content:
-    * If the XML object has simple content, toString() returns the String contents of the XML object with the following stripped out:
-    the start tag, attributes, namespace declarations, and end tag.
-    * If the XML object has complex content, toString() returns an XML encoded String representing the entire XML object, including
-    the start tag, attributes, namespace declarations, and end tag.
-   * To return the entire XML object every time, use toXMLString().
-   * @return The string representation of the XML object.
-   */
-  public native function toString():String
-
-  /**
-   *  Returns a string representation of the XML object. Unlike the toString() method, the toXMLString() method always returns the start
-   * tag, attributes, and end tag of the XML object, regardless of whether the XML object has simple content or complex content.
-   * (The toString() method strips out these items for XML objects that contain simple content.)
-   * @return The string representation of the XML object.
-   */
-
-  public native function toXMLString():String
-}
-
-/**
- * The Namespace class contains methods and properties for defining and working with namespaces. There are three scenarios for using namespaces:<ul>
- * <li>Namespaces of XML objects Namespaces associate a namespace prefix with a Uniform Resource Identifier (URI) that identifies the namespace.
- * The prefix is a string used to reference the namespace within an XML object. If the prefix is undefined, when the XML is converted to a
- * string, a prefix is automatically generated.</li>
- * <li> Namespace to differentiate methods Namespaces can differentiate methods with the same name to perform different tasks. If two methods
- * have the same name but separate namespaces, they can perform different tasks.</li>
- * <li>Namespaces for access control Namespaces can be used to control access to a group of properties and methods in a class. If you place
- * the properties and methods into a private namespace, they are inaccessible to any code that does not have access to that namespace.
- * You can grant access to the group of properties and methods by passing the namespace to other classes, methods or functions.</li>
- *</ul>
- * This class shows two forms of the constructor method because each form accepts different parameters.
- */
-public final class Namespace {
-
-/**
- * The prefix of the namespace.
- */
-  public native function get prefix():String
-  public native function set prefix(value:String):void
-
-  /**
-   * The Uniform Resource Identifier (URI) of the namespace.
-   */
-  public native function get uri():String
-  public native function set uri(value:String):void
-
-  /**
-   * Creates a Namespace object according to the values of the prefixValue and uriValue parameters. This constructor requires both parameters.
-   * The value of the prefixValue parameter is assigned to the prefix property as follows:<ul>
-   * <li>If undefined is passed, prefix is set to undefined.</li>
-   * <li>If the value is a valid XML name, as determined by the isXMLName() function, it is converted to a string and assigned to the prefix property.</li>
-   * <li>If the value is not a valid XML name, the prefix property is set to undefined.</li>
-   * </ul>
-   * The value of the uriValue parameter is assigned to the uri property as follows:
-   * If a QName object is passed, the uri property is set to the value of the QName object's uri property.
-   * If the value is a Namespace object (and first parameter is not specified), a copy of the object is created.
-   * Otherwise, the uriValue parameter is converted to a string and assigned to the uri property.
-   * If no values is passed, the prefix and uri properties are set to an empty string.
-   * @param prefixValue - The prefix to use for the namespace.
-   * @param uriValue - The Uniform Resource Identifier (URI) of the namespace.
-   * @constructor
-   */
-  public native function Namespace(prefixValue:* = undefined, uriValue:* = undefined);
-
-  /**
-   * Equivalent to the Namespace.uri property.
-   * @return The Uniform Resource Identifier (URI) of the namespace, as a string.
-   */
-  public native function toString():String
-}
-
-/**
- * QName objects represent qualified names of XML elements and attributes. Each QName object has a local name and a namespace
- * Uniform Resource Identifier (URI). When the value of the namespace URI is null, the QName object matches any namespace. Use the QName
- * constructor to create a new QName object that is either a copy of another QName object or a new QName object with a uri from a Namespace
- * object and a localName from a QName object.
- */
-public final dynamic class QName {
-/**
- * The local name of the QName object.
- */
-  public native function get localName():String
-
-  /**
-   * The Uniform Resource Identifier (URI) of the QName object.
-   */
-  public native function get uri():String
-
-
-  /**
-   * Creates a QName object with a URI object from a Namespace object and a localName from a QName object. If either parameter is not the
-   * expected data type, the parameter is converted to a string and assigned to the corresponding property of the new QName object.
-   * For example, if both parameters are strings, a new QName object is returned with a uri property set to the first parameter and a
-   * localName property set to the second parameter. In other words, the following permutations, along with many others, are valid forms of
-   * the constructor:
-   * QName (uri:Namespace, localName:String);
-   * QName (uri:String, localName: QName);
-   * QName (uri:String, localName: String);
-   * If you pass null for the uri parameter, the uri property of the new QName object is set to null.
-   * When uri is not passed then creates a QName object that is a copy of another QName object. If the parameter passed to the constructor
-   * is a QName object, a copy of the QName object is created. If the parameter is not a QName object, the parameter is converted to a
-   * string and assigned to the localName property of the new QName instance. If the parameter is undefined or unspecified, a new QName
-   * object is created with the localName property set to the empty string.
-   * @param uri A Namespace object from which to copy the uri value. A parameter of any other type is converted to a string.
-   * @param localName The QName object to be copied (when uri is not passed). Objects of any other type are converted to a string that is 
-   * assigned to the localName property of the new QName object.
-   * When uri passed - A QName object from which to copy the localName value. A parameter of any other type is converted to a string.
-   */
-  public native function QName(uri:* = null, localName:* = null);
-
-  public native function toString():String
-}
-
-/**
- * A Class object is created for each class definition in a program. Every Class object is an instance of the Class class. The Class object
- * contains the static properties and methods of the class. The class object creates instances of the class when invoked using the new
- * operator.
- */
-public dynamic class Class extends Object {}
\ No newline at end of file
diff --git a/plugin/src/main/dist/sdk/clientAny/ECMAScript.js2 b/plugin/src/main/dist/sdk/clientAny/ECMAScript.js2
deleted file mode 100644
index 3b0027ba..00000000
--- a/plugin/src/main/dist/sdk/clientAny/ECMAScript.js2
+++ /dev/null
@@ -1,244 +0,0 @@
-native function eval(x:Object):Object;
-native function parseInt(string:String, radix:int = 10):Number;
-native function parseFloat(string:String):Number;
-native function isNaN(number:Number):Boolean;
-native function get NaN():Number;
-native function isFinite(number:Number):Boolean;
-native function decodeURI(encodedURI:String):String;
-native function decodeURIComponent(encodedURIComponent:String):String;
-native function get Infinity():Number;
-native function encodeURI(uri:String):Number;
-native function encodeURIComponent(uriComponent:String):Number;
-native var undefined:*;
-
-public dynamic class Object {
-  public native function get constructor():Object;
-  public native function get length():Number;
-  public native function get prototype():Object;
-  public native function set prototype(o:Object):void;
-
-  public native function toLocaleString():Object;
-
-  public native function toSource():Object;
-  public native function unwatch(prop:String):void;
-  public native function watch(prop:String, handler:Object):void;
-  public native function valueOf(o:Object):String;
-
-  public native function hasOwnProperty(propertyName:String):Boolean;
-  public native function isPrototypeOf(o:Object):Boolean;
-  public native function propertyIsEnumerable(propertyName:String):Boolean;
-
-  public native function toString():String;
-}
-
-public class Array extends Object {
-  public native function get index():Number;
-  public native function get input():Number;
-  public native function concat(... items):Array;
-  public native function join(separator:String):String;
-  public native function pop():Object;
-  public native function push(... items):void;
-  public native function reverse():Array;
-  public native function shift():*;
-
-  public native function slice(start:Number, end:Number = Number.MAX_VALUE):Array;
-  public native function sort(comparefn:Function = null):void;
-  public native function splice(start:Number,deleteCount:Number, ... items):*;
-  public native function unshift(... items):uint;
-  public native function get length():uint;
-}
-
-public class Boolean extends Object {}
-
-public class Date extends Object {
-  public native function Date(... rest);
-  public native function getDate():Number;
-  public native function getDay():Number;
-  public native function getMonth():Number;
-  public native function getFullYear():Number;
-  public native function getHours():Number;
-
-  public native function getMilliseconds():Number;
-  public native function getMinutes():Number;
-  public native function getSeconds():Number;
-  public native function getTime():Number;
-  public native function getTimezoneOffset():Number;
-
-  public native function getUTCDate():Number;
-  public native function getUTCDay():Number;
-  public native function getUTCFullYear():Number;
-  public native function getUTCHours():Number;
-  public native function getUTCMilliseconds():Number;
-  public native function getUTCMinutes():Number;
-
-  public native function getUTCMonth():Number;
-  public native function getUTCSeconds():Number;
-  public native function getYear():Number;
-  public static native function parse(s:*):Date;
-  public native function setDate(date:*):void;
-
-  public native function setFullYear(year:Number, month: Number = 1, date: Number = 1):void;
-  public native function setHours(hour:Number, min: Number = 1, sec: Number = 1, ms:Number = 1):void;
-  public native function setMilliseconds(ms: Number):void;
-
-  public native function setMinutes(min: Number, sec: Number = 1, ms:Number = 1):void;
-  public native function setMonth(month: Number, date: Number = 1):void;
-  public native function setSeconds(sec: Number, ms:Number = 1):void;
-
-  public native function setTime(time: Number):void;
-  public native function setUTCDate(date: Number):void;
-  public native function setUTCFullYear(year:Number, month: Number = 1, date: Number = 1):void;
-  public native function setUTCHours(hour:Number, min: Number = 1, sec: Number = 1, ms:Number = 1):void;
-
-  public native function setUTCMilliseconds(ms: Number):void;
-  public native function setUTCMinutes(min: Number, sec: Number = 1, ms:Number = 1):void;
-  public native function setUTCMonth(month: Number, date: Number = 1):void;
-  public native function setUTCSeconds(sec: Number, ms:Number = 1):void;
-
-  public native function setYear(year: Number):void;
-  public native function toGMTString():String;
-  public native function toLocaleDateString():String;
-  public native function toLocaleTimeString():String;
-  public native function toDateString():String;
-
-  public native function toTimeString():String;
-  public native function toUTCString():String;
-  public native static function UTC(year:Number, month:Number, date:Number = 1, hours:Number = 1, seconds:Number = 1, ms:Number = 1):String;
-}
-
-class Arguments extends Array {
-  public native function get callee():Function;
-  public native function get caller():Function;
-}
-
-public class Function extends Object {
-  public native function get arguments():Arguments;
-  public native function get arity():Number;
-  public native function apply(thisArg:Object, argArray:Arguments = null):Object;
-  public native function call(thisArg:Object, ...args):Object;
-}
-
-public class Math extends Object {
-  public native static const E:Number;
-  public native static const LN10:Number;
-  public native static const LN2:Number;
-  public native static const LOG10E:Number;
-  public native static const LOG2E:Number;
-
-  public native static const PI:Number;
-  public native static const SQRT1_2:Number;
-  public native static const SQRT2:Number;
-
-  public native static function abs(x:Number):Number;
-  public native static function acos(x:Number):Number;
-  public native static function asin(x:Number):Number;
-  public native static function atan(x:Number):Number;
-  public native static function atan2(y:Number, x:Number):Number;
-
-  public native static function ceil(y:Number, x:Number):Number;
-  public native static function cos(x:Number):Number;
-  public native static function exp(x:Number):Number;
-  public native static function floor(x:Number):Number;
-  public native static function log(x:Number):Number;
-  public native static function max(... x:Number):Number;
-  public native static function min(... x:Number):Number;
-
-  public native static function pow(x:Number, y:Number):Number;
-  public native static function random():Number;
-  public native static function round(x:Number):Number;
-  public native static function sin(x:Number):Number;
-  public native static function sqrt(x:Number):Number;
-  public native static function tan(x:Number):Number;
-}
-        
-public class Number extends Object {
-  public static native function get MAX_VALUE():Number
-  public static native function get MIN_VALUE():Number
-  public static native function get NaN():Number
-  public static native function get Infinity():Number
-  public static native function get NEGATIVE_INFINITY():Number
-  public static native function get POSITIVE_INFINITY():Number
-
-  public native function toExponential(fractionalDigits:Number):String;
-  public native function toFixed(fractionalDigits:Number):String;
-  public native function toPrecision(precision:Number):String;
-  public native function toString(radix:Number = 10):String;
-}
-
-public dynamic class RegExp extends Object {
-  public native function RegExp(pattern:String = null, options:String = null);
-  public native function get global():Boolean;
-  public native function get ignoreCase():Boolean;
-  public native function get lastIndex():Number;
-
-  public native static function get leftContext():String;
-  public native static function get input():String;
-  public native static function get lastParen():String;
-  public native static function get lastMatch():String;
-  public native static function get rightContext():String;
-
-  public native function get multiline():Boolean;
-  public native function get source():String;
-
-  public native function get $1():String;
-  public native function get $2():String;
-  public native function get $3():String;
-  public native function get $4():String;
-  public native function get $5():String;
-
-  public native function exec(string:String):*;
-  public native function test(string:String):Boolean;
-}
-
-public class String extends Object {
-  public native function anchor(nameAttribute:String):String;
-  public native function big():String;
-  public native function blink():String;
-  public native function bold():String;
-  public native function charAt(pos:Number):String;
-  public native function charCodeAt(pos:Number):Number;
-
-  public native function concat(...strings):String;
-  public native function fixed():String;
-  public native function fontcolor(color:String):String;
-  public native function fontsize(size:Number):String;
-  public native function fromCharCode(... chars):String;
-  public native function indexOf(searchString:String, position:Number = -1):Number;
-
-  public native function italics():String;
-  public native function lastIndexOf(searchString:String, position:Number = -1):Number;
-  native public function get length():int;
-  public native function link(href:String):String;
-  public native function localeCompare(that:String):Boolean;
-  public native function match(regexp:RegExp):Boolean;
-  public native function replace(searchValue:*, replaceValue:*):String;
-
-  public native function search(regexp:*):int;
-  public native function slice(start:Number, end:Number = Number.MAX_VALUE):String;
-  public native function small():String;
-  public native function split(separator:String, limit:Number = -1):Array;
-  public native function strike():String;
-  public native function sub():String;
-
-  public native function substr(start:Number, length:Number = -1):String;
-  public native function substring(start:Number, end:Number = -1):String;
-  public native function sup():String;
-  public native function toLowerCase():String;
-  public native function toLocaleLowerCase():String;
-  public native function toLocaleUpperCase():String;
-  public native function toUpperCase():String;
-}
-
-public dynamic class Error extends Object {
-  public native function Error(msg:*="", id:*=0);
-  public native function get name():String;
-  public native function get message():String;
-  native AS3 function getStackTrace():String;
-}
-
-public class EvalError extends Error {}
-public class RangeError extends Error {}
-public class ReferenceError extends Error {}
-public class SyntaxError extends Error {}
-public class TypeError extends Error {}
-public class URIError extends Error {}
diff --git a/plugin/src/main/dist/sdk/clientAny/ECMAScript_Additional.js2 b/plugin/src/main/dist/sdk/clientAny/ECMAScript_Additional.js2
deleted file mode 100644
index c821b75d..00000000
--- a/plugin/src/main/dist/sdk/clientAny/ECMAScript_Additional.js2
+++ /dev/null
@@ -1,2 +0,0 @@
-class int {}
-class uint {}
\ No newline at end of file

From cef75f7e5d66fccf4846eb9e41aaebf5c0274edd Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Dec 2019 12:34:38 +0300
Subject: [PATCH 081/340] fix infinity loop

---
 .../javascript/lang/parsing/EcmaScript6StatementParsing.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index 8ea0930e..8b29fd76 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -99,6 +99,7 @@ protected void doParseStatement(PsiBuilder builder, boolean canHaveClasses)
 		{
 			if(builder.getTokenType() == JSTokenTypes.IMPORT_KEYWORD)
 			{
+				System.out.println(builder.getTokenType());
 				parseImportStatement(builder);
 				return;
 			}
@@ -199,6 +200,7 @@ else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
 							else if(builder.getTokenType() != JSTokenTypes.RBRACE)
 							{
 								builder.error("Expected identifier");
+								break;
 							}
 						}
 

From 470e1522c50fcde3c5e0d1468efa273dfa0d12f7 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Dec 2019 12:39:08 +0300
Subject: [PATCH 082/340] drop sout

---
 .../javascript/lang/parsing/EcmaScript6StatementParsing.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index 8b29fd76..33d0bac4 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -99,7 +99,6 @@ protected void doParseStatement(PsiBuilder builder, boolean canHaveClasses)
 		{
 			if(builder.getTokenType() == JSTokenTypes.IMPORT_KEYWORD)
 			{
-				System.out.println(builder.getTokenType());
 				parseImportStatement(builder);
 				return;
 			}

From 582e5955be342b4248f1d62d41b51c1368da896b Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Dec 2019 16:09:26 +0300
Subject: [PATCH 083/340] disable jsx comment since it's not part jsx

---
 .../main/java/com/intellij/lang/javascript/JSTokenTypes.java | 5 +++++
 .../main/java/consulo/javascript/lang/lexer/ecmascript6.flex | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 2162e4bb..6d19234e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -28,6 +28,7 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.annotation.DeprecationInfo;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptContextKeywordElementType;
 import consulo.javascript.lang.JavaScriptLanguage;
@@ -54,7 +55,11 @@ public interface JSTokenTypes
 
 	IElementType END_OF_LINE_COMMENT = new JSElementType("END_OF_LINE_COMMENT");
 	IElementType C_STYLE_COMMENT = new JSElementType("C_STYLE_COMMENT");
+	@Deprecated
+	@DeprecationInfo("old xml parsing, es4")
 	IElementType XML_STYLE_COMMENT = new JSElementType("XML_STYLE_COMMENT");
+	@Deprecated
+	@DeprecationInfo("old xml parsing, es4")
 	IElementType XML_STYLE_COMMENT_START = new JSElementType("XML_STYLE_COMMENT_START");
 
 	IElementType DOC_COMMENT = new JSChameleonElementType("DOC_COMMENT")
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index 856b766f..b52b6c85 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -144,7 +144,6 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 
 <TAG_CONTENT> ([^<&\{ \n\r\t\f])* { return JSTokenTypes.XML_TAG_CONTENT; }
 <TAG_CONTENT> "<?" ([^\?]|(\?[^\>]))* "?>" { return JSTokenTypes.XML_TAG_CONTENT; }
-<TAG_CONTENT> {XML_COMMENT} { return JSTokenTypes.XML_STYLE_COMMENT; }
 
 <TAG_CONTENT,TAG_ATTR_SQ, TAG_ATTR_DQ>
   "&" {XML_NAME} ";" |
@@ -198,10 +197,6 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
   yybegin(COMMENT); yypushback(yylength());
 }
 
-<YYINITIAL> {XML_COMMENT} {
-  yybegin(YYINITIAL); return JSTokenTypes.XML_STYLE_COMMENT;
-}
-
 <COMMENT> "<!--" { yybegin(YYINITIAL); return JSTokenTypes.XML_STYLE_COMMENT_START; }
 <COMMENT> [^] { yybegin(YYINITIAL); yypushback(1); }
 

From ccfeddf2a85e23e3b0399232dd65b6b33f9cfa02 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Dec 2019 16:58:56 +0300
Subject: [PATCH 084/340] enable tree highlighting from xml plugin

---
 .../lang/javascript/JSTokenTypes.java         |  23 +-
 .../psi/impl/JSXmlLiteralExpressionImpl.java  | 252 +++++++++++++++++-
 lang-version-impl/ecmascript6-impl/pom.xml    |   7 +
 .../JSXLanguageBreadcrumbsInfoProvider.java   |  21 ++
 .../JSXTagTreeHighlightingPassFactory.java    |  43 +++
 .../javascript/lang/lexer/ecmascript6.flex    |  21 +-
 plugin/src/main/resources/META-INF/ecma6.xml  |   4 +
 7 files changed, 343 insertions(+), 28 deletions(-)
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/breadcrumbs/JSXLanguageBreadcrumbsInfoProvider.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 6d19234e..103910ef 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -28,6 +28,7 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.TokenSet;
+import com.intellij.psi.xml.XmlTokenType;
 import consulo.annotation.DeprecationInfo;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptContextKeywordElementType;
@@ -141,18 +142,18 @@ protected Lexer createLexer()
 	IElementType UINT_KEYWORD = new JSElementType("UINT_KEYWORD");
 	IElementType AT = new JSElementType("AT");
 
-	IElementType XML_START_TAG_START = new JSElementType("XML_TAG_START");
+	IElementType XML_START_TAG_START = XmlTokenType.XML_START_TAG_START;
 	IElementType XML_START_TAG_LIST = new JSElementType("XML_TAG__LIST_START");
 	IElementType XML_END_TAG_LIST = new JSElementType("XML_TAG__LIST_END");
-	IElementType XML_END_TAG_START = new JSElementType("XML_TAG_END_START");
-	IElementType XML_EMPTY_TAG_END = new JSElementType("XML_EMPTY_END_START");
-	IElementType XML_NAME = new JSElementType("XML_NAME");
-	IElementType XML_TAG_NAME = new JSElementType("XML_TAG_NAME");
-	IElementType XML_ATTR_EQUAL = new JSElementType("XML_ATTR_EQUAL");
-	IElementType XML_TAG_END = new JSElementType("XML_TAG_END");
-	IElementType XML_ATTR_VALUE = new JSElementType("XML_ATTR_VALUE");
-	IElementType XML_ATTR_VALUE_START = new JSElementType("XML_ATTR_VALUE_START");
-	IElementType XML_ATTR_VALUE_END = new JSElementType("XML_ATTR_VALUE_END");
+	IElementType XML_END_TAG_START = XmlTokenType.XML_END_TAG_START;
+	IElementType XML_EMPTY_TAG_END = XmlTokenType.XML_EMPTY_ELEMENT_END;
+	IElementType XML_NAME = XmlTokenType.XML_NAME;
+	IElementType XML_TAG_NAME = XmlTokenType.XML_TAG_NAME;
+	IElementType XML_ATTR_EQUAL = XmlTokenType.XML_EQ;
+	IElementType XML_TAG_END = XmlTokenType.XML_TAG_END;
+	IElementType XML_ATTR_VALUE = XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN;
+	IElementType XML_ATTR_VALUE_START = XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
+	IElementType XML_ATTR_VALUE_END = XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER;
 	IElementType XML_JS_SCRIPT = new JSChameleonElementType("XML_JS_SCRIPT")
 	{
 		@Override
@@ -189,7 +190,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 
 	@Deprecated
 	// FIXME [VISTALL] what the heck? maybe old jsp inject support
-			IElementType JSP_TEXT = new JSElementType("JSP_TEXT");
+	IElementType JSP_TEXT = new JSElementType("JSP_TEXT");
 	IElementType YIELD_KEYWORD = new JSElementType("YIELD_KEYWORD");
 	IElementType LET_KEYWORD = new JSElementType("LET_KEYWORD");
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 7180b4c6..d3a1aa40 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -16,16 +16,33 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.meta.PsiMetaData;
+import com.intellij.psi.search.PsiElementProcessor;
+import com.intellij.psi.xml.XmlAttribute;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.psi.xml.XmlTagChild;
+import com.intellij.psi.xml.XmlTagValue;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.xml.XmlElementDescriptor;
+import com.intellij.xml.XmlNSDescriptor;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.Map;
 
 /**
  * @since Maxim.Mossienko
  */
-public class JSXmlLiteralExpressionImpl extends JSExpressionImpl implements JSLiteralExpression
+public class JSXmlLiteralExpressionImpl extends JSExpressionImpl implements JSLiteralExpression, XmlTag
 {
 	public JSXmlLiteralExpressionImpl(final ASTNode node)
 	{
@@ -37,4 +54,233 @@ public void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		visitor.visitElement(this);
 	}
+
+	@Override
+	@RequiredReadAction
+	public String getName()
+	{
+		PsiElement childByType = findChildByType(JSTokenTypes.XML_NAME);
+		return childByType != null ? childByType.getText() : null;
+	}
+
+	@RequiredWriteAction
+	@Override
+	public PsiElement setName(@Nonnull @NonNls String s) throws IncorrectOperationException
+	{
+		return null;
+	}
+
+	@Nonnull
+	@Override
+	public String getNamespace()
+	{
+		return "";
+	}
+
+	@Nonnull
+	@Override
+	public String getLocalName()
+	{
+		return getName();
+	}
+
+	@Nullable
+	@Override
+	public XmlElementDescriptor getDescriptor()
+	{
+		return null;
+	}
+
+	@Nonnull
+	@Override
+	public XmlAttribute[] getAttributes()
+	{
+		return new XmlAttribute[0];
+	}
+
+	@Nullable
+	@Override
+	public XmlAttribute getAttribute(@NonNls String name, @NonNls String namespace)
+	{
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public XmlAttribute getAttribute(@NonNls String qname)
+	{
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public String getAttributeValue(@NonNls String name, @NonNls String namespace)
+	{
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public String getAttributeValue(@NonNls String qname)
+	{
+		return null;
+	}
+
+	@Override
+	public XmlAttribute setAttribute(@NonNls String name, @NonNls String namespace, @NonNls String value) throws IncorrectOperationException
+	{
+		return null;
+	}
+
+	@Override
+	public XmlAttribute setAttribute(@NonNls String qname, @NonNls String value) throws IncorrectOperationException
+	{
+		return null;
+	}
+
+	@Override
+	public XmlTag createChildTag(@NonNls String localName, @NonNls String namespace, @Nullable @NonNls String bodyText, boolean enforceNamespacesDeep)
+	{
+		return null;
+	}
+
+	@Override
+	public XmlTag addSubTag(XmlTag subTag, boolean first)
+	{
+		return null;
+	}
+
+	@Nonnull
+	@Override
+	public XmlTag[] getSubTags()
+	{
+		return new XmlTag[0];
+	}
+
+	@Nonnull
+	@Override
+	public XmlTag[] findSubTags(@NonNls String qname)
+	{
+		return new XmlTag[0];
+	}
+
+	@Nonnull
+	@Override
+	public XmlTag[] findSubTags(@NonNls String localName, @Nullable String namespace)
+	{
+		return new XmlTag[0];
+	}
+
+	@Nullable
+	@Override
+	public XmlTag findFirstSubTag(@NonNls String qname)
+	{
+		return null;
+	}
+
+	@Nonnull
+	@Override
+	public String getNamespacePrefix()
+	{
+		return "";
+	}
+
+	@Nonnull
+	@Override
+	public String getNamespaceByPrefix(@NonNls String prefix)
+	{
+		return "";
+	}
+
+	@Nullable
+	@Override
+	public String getPrefixByNamespace(@NonNls String namespace)
+	{
+		return null;
+	}
+
+	@Override
+	public String[] knownNamespaces()
+	{
+		return new String[0];
+	}
+
+	@Override
+	public boolean hasNamespaceDeclarations()
+	{
+		return false;
+	}
+
+	@Nonnull
+	@Override
+	public Map<String, String> getLocalNamespaceDeclarations()
+	{
+		return Collections.emptyMap();
+	}
+
+	@Nonnull
+	@Override
+	public XmlTagValue getValue()
+	{
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public XmlNSDescriptor getNSDescriptor(@NonNls String namespace, boolean strict)
+	{
+		return null;
+	}
+
+	@Override
+	public boolean isEmpty()
+	{
+		return false;
+	}
+
+	@Override
+	public void collapseIfEmpty()
+	{
+
+	}
+
+	@Nullable
+	@Override
+	public String getSubTagText(@NonNls String qname)
+	{
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public PsiMetaData getMetaData()
+	{
+		return null;
+	}
+
+	@Override
+	public XmlTag getParentTag()
+	{
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public XmlTagChild getNextSiblingInTag()
+	{
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public XmlTagChild getPrevSiblingInTag()
+	{
+		return null;
+	}
+
+	@Override
+	public boolean processElements(PsiElementProcessor processor, PsiElement place)
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript6-impl/pom.xml b/lang-version-impl/ecmascript6-impl/pom.xml
index 203b73cd..8085f472 100644
--- a/lang-version-impl/ecmascript6-impl/pom.xml
+++ b/lang-version-impl/ecmascript6-impl/pom.xml
@@ -66,6 +66,13 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>consulo-lang-impl-testing</artifactId>
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/breadcrumbs/JSXLanguageBreadcrumbsInfoProvider.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/breadcrumbs/JSXLanguageBreadcrumbsInfoProvider.java
new file mode 100644
index 00000000..0b57f2d7
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/breadcrumbs/JSXLanguageBreadcrumbsInfoProvider.java
@@ -0,0 +1,21 @@
+package consulo.javascript.jsx.codeInsight.breadcrumbs;
+
+import com.intellij.lang.Language;
+import com.intellij.xml.breadcrumbs.XmlLanguageBreadcrumbsInfoProvider;
+import consulo.javascript.lang.JavaScriptLanguage;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-15
+ */
+public class JSXLanguageBreadcrumbsInfoProvider extends XmlLanguageBreadcrumbsInfoProvider
+{
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java
new file mode 100644
index 00000000..a4ee773a
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java
@@ -0,0 +1,43 @@
+package consulo.javascript.jsx.codeInsight.daemon.impl.tagTreeHighlighting;
+
+import com.intellij.codeHighlighting.Pass;
+import com.intellij.codeHighlighting.TextEditorHighlightingPass;
+import com.intellij.codeHighlighting.TextEditorHighlightingPassFactory;
+import com.intellij.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeHighlightingPass;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.ex.EditorEx;
+import com.intellij.psi.PsiFile;
+import consulo.javascript.lang.EcmaScript6JavaScriptVersion;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-15
+ */
+public class JSXTagTreeHighlightingPassFactory implements TextEditorHighlightingPassFactory
+{
+	@Override
+	public void register(@Nonnull Registrar registrar)
+	{
+		registrar.registerTextEditorHighlightingPass(this, new int[]{Pass.UPDATE_ALL}, null, false, -1);
+	}
+
+	@Override
+	public TextEditorHighlightingPass createHighlightingPass(@Nonnull final PsiFile file, @Nonnull final Editor editor)
+	{
+		if(editor.isOneLineMode())
+		{
+			return null;
+		}
+
+		if(!(editor instanceof EditorEx) || !(file.getLanguageVersion() instanceof EcmaScript6JavaScriptVersion))
+		{
+			return null;
+		}
+
+		return new XmlTagTreeHighlightingPass(file, (EditorEx) editor);
+	}
+}
+
+
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index b52b6c85..c4dd08e4 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -71,7 +71,6 @@ INTERPOLATION_STRING_LITERAL="`" [^"`"]* "`"
 ALPHA=[:letter:]
 DIGIT=[0-9]
 XML_NAME=({ALPHA}|"_")({ALPHA}|{DIGIT}|"_"|"."|"-")*(":"({ALPHA}|"_")?({ALPHA}|{DIGIT}|"_"|"."|"-")*)?
-XML_COMMENT="<!--" ([^\-<\/] | (\-[^\-<\/])| (<[^!\-\/]) | (\-\-[^<>\/] | (\/[^<\/\-]) ))* "-->"
 
 FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 
@@ -83,17 +82,18 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 %state TAG_ATTR_SQ
 %state TAG_ATTR_DQ
 %state TAG_JS_SCRIPT
-%state COMMENT
 %state LAST_STATE
 
 %%
 
-<YYINITIAL,TAG,TAG_END,DIV_OR_GT,COMMENT,TAG_CONTENT> {WHITE_SPACE_CHAR}+   { return JSTokenTypes.WHITE_SPACE; }
+<YYINITIAL,TAG,TAG_END,DIV_OR_GT,TAG_CONTENT> {WHITE_SPACE_CHAR}+   { return JSTokenTypes.WHITE_SPACE; }
 <TAG_ATTRIBUTES> {WHITE_SPACE_CHAR}+   { return isHighlightModeOn ? JSTokenTypes.XML_TAG_WHITE_SPACE:JSTokenTypes.WHITE_SPACE; }
 
-<YYINITIAL> "<" {
+<YYINITIAL> "<"
+{
     tagCount = 0;
-    yybegin(TAG); yypushback(yylength());
+    yybegin(TAG);
+    yypushback(yylength());
 }
 
 <TAG> "<>" { tagCount++; yybegin(TAG_CONTENT); return JSTokenTypes.XML_START_TAG_LIST; }
@@ -103,7 +103,7 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 <TAG_CONTENT> "</" { tagCount--; yybegin(TAG_END); return JSTokenTypes.XML_END_TAG_START; }
 
 <TAG> {
-  {XML_NAME} { yybegin(TAG_ATTRIBUTES); return JSTokenTypes.XML_TAG_NAME; }
+  {XML_NAME} { yybegin(TAG_ATTRIBUTES); return isHighlightModeOn ? JSTokenTypes.XML_TAG_NAME : JSTokenTypes.XML_NAME; }
   "{"
   {
   	jsExits.push(TAG);
@@ -113,7 +113,7 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 }
 
 <TAG_END> {
-  {XML_NAME} { return JSTokenTypes.XML_TAG_NAME; }
+  {XML_NAME} { return isHighlightModeOn ? JSTokenTypes.XML_TAG_NAME : JSTokenTypes.XML_NAME; }
   "{"
   {
   	jsExits.push(TAG_END);
@@ -193,13 +193,6 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 	}
 }
 
-<YYINITIAL> "<!--" (.|{CRLF}+)* "//" {WHITE_SPACE_CHAR}* "-->" {
-  yybegin(COMMENT); yypushback(yylength());
-}
-
-<COMMENT> "<!--" { yybegin(YYINITIAL); return JSTokenTypes.XML_STYLE_COMMENT_START; }
-<COMMENT> [^] { yybegin(YYINITIAL); yypushback(1); }
-
 <YYINITIAL,DIV_OR_GT> {C_STYLE_COMMENT}     { return JSTokenTypes.C_STYLE_COMMENT; }
 <YYINITIAL,DIV_OR_GT> {END_OF_LINE_COMMENT} { return JSTokenTypes.END_OF_LINE_COMMENT; }
 <YYINITIAL,DIV_OR_GT> {DOC_COMMENT}         { return JSTokenTypes.DOC_COMMENT; }
diff --git a/plugin/src/main/resources/META-INF/ecma6.xml b/plugin/src/main/resources/META-INF/ecma6.xml
index df035100..15fbe7d7 100644
--- a/plugin/src/main/resources/META-INF/ecma6.xml
+++ b/plugin/src/main/resources/META-INF/ecma6.xml
@@ -18,6 +18,10 @@
 	<extensions defaultExtensionNs="com.intellij">
 		<fileTypeFactory implementation="consulo.javascript.lang.EcmaScriptFileTypeFactory" />
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript6JavaScriptVersion" />
+
+		<breadcrumbsInfoProvider implementation="consulo.javascript.jsx.codeInsight.breadcrumbs.JSXLanguageBreadcrumbsInfoProvider" />
+
+		<textEditorHighlightingPassFactory implementation="consulo.javascript.jsx.codeInsight.daemon.impl.tagTreeHighlighting.JSXTagTreeHighlightingPassFactory" />
 	</extensions>
 
 	<extensions defaultExtensionNs="consulo.javascript">

From 710908d7414e6236182755a9b32d4e3823fb779f Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Dec 2019 16:59:48 +0300
Subject: [PATCH 085/340] do not allow null

---
 .../lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index d3a1aa40..29a5189a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -60,7 +60,7 @@ public void accept(@Nonnull PsiElementVisitor visitor)
 	public String getName()
 	{
 		PsiElement childByType = findChildByType(JSTokenTypes.XML_NAME);
-		return childByType != null ? childByType.getText() : null;
+		return childByType != null ? childByType.getText() : "";
 	}
 
 	@RequiredWriteAction

From a484e7470711d40bc52c2e76ea0b197eb55d6e7a Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Dec 2019 17:03:18 +0300
Subject: [PATCH 086/340] up ver

---
 .../javascript/types/JSFileElementType.java   | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index 539b422d..1f993722 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -16,24 +16,19 @@
  */
 package com.intellij.lang.javascript.types;
 
-import java.io.IOException;
-
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.Language;
-import consulo.javascript.index.JavaScriptIndexer;
 import com.intellij.lang.javascript.psi.JSFile;
-import consulo.javascript.psi.stubs.JSFileStub;
-import consulo.javascript.psi.stubs.impl.JSFileStubImpl;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.StubBuilder;
-import com.intellij.psi.stubs.DefaultStubBuilder;
-import com.intellij.psi.stubs.IndexSink;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
+import com.intellij.psi.stubs.*;
 import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.util.io.StringRef;
+import consulo.javascript.index.JavaScriptIndexer;
+import consulo.javascript.psi.stubs.JSFileStub;
+import consulo.javascript.psi.stubs.impl.JSFileStubImpl;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
 
 /**
  * @author peter
@@ -96,8 +91,8 @@ public String getExternalId()
 	@Override
 	public int getStubVersion()
 	{
-		int version = 41;
-		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensions())
+		int version = 42;
+		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList())
 		{
 			version += javaScriptIndexer.getVersion();
 		}

From 95d96aa7d915ba54b03b732e1ed62fb4bb1cd15c Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 16 Dec 2019 22:35:37 +0300
Subject: [PATCH 087/340] fix parsing error with simple expressions

---
 .../lang/parsing/EcmaScript6ExpressionParsing.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
index 6bc4b895..5eae5c11 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
@@ -63,6 +63,11 @@ private boolean parseLambdaExpression(PsiBuilder builder)
 		{
 			builder.advanceLexer();
 		}
+		else
+		{
+			mark.rollbackTo();
+			return false;
+		}
 
 		if(builder.getTokenType() == JSTokenTypes.LBRACE)
 		{
@@ -70,7 +75,7 @@ private boolean parseLambdaExpression(PsiBuilder builder)
 		}
 		else
 		{
-			parseExpression(builder);
+			parseAssignmentExpression(builder);
 		}
 
 		mark.done(JSElementTypes.LAMBDA_EXPRESSION);

From a677720e05e02679ef037600bda6a2b127870294 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 16 Dec 2019 22:48:34 +0300
Subject: [PATCH 088/340] add jsx file type which always have active jsx
 version

---
 .../javascript/jsx/language/JSXFileType.java  | 64 +++++++++++++++++++
 .../jsx/language/JSXFileTypeFactory.java      | 19 ++++++
 .../jsx/language/JSXJavaScriptVersion.java    | 37 +++++++++++
 .../lang/EcmaScript6JavaScriptVersion.java    |  7 ++
 plugin/src/main/resources/META-INF/ecma6.xml  | 10 +--
 plugin/src/main/resources/META-INF/jsx.xml    | 11 ++++
 plugin/src/main/resources/META-INF/plugin.xml |  1 +
 .../ClientJavaScriptModuleExtensionPanel.java | 16 ++---
 8 files changed, 149 insertions(+), 16 deletions(-)
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
 create mode 100644 plugin/src/main/resources/META-INF/jsx.xml

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
new file mode 100644
index 00000000..a8043a62
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
@@ -0,0 +1,64 @@
+package consulo.javascript.jsx.language;
+
+import com.intellij.lang.javascript.JavaScriptIcons;
+import com.intellij.openapi.fileTypes.LanguageFileType;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.vfs.VirtualFile;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
+import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.lang.LanguageVersion;
+import consulo.ui.image.Image;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-16
+ */
+public class JSXFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion
+{
+	public static final JSXFileType INSTANCE = new JSXFileType();
+
+	private JSXFileType()
+	{
+		super(JavaScriptLanguage.INSTANCE);
+	}
+
+	@Nonnull
+	@Override
+	public String getId()
+	{
+		return "JSX";
+	}
+
+	@Nonnull
+	@Override
+	public String getDescription()
+	{
+		return "JSX files";
+	}
+
+	@Nonnull
+	@Override
+	public String getDefaultExtension()
+	{
+		return "jsx";
+	}
+
+	@Nullable
+	@Override
+	public Image getIcon()
+	{
+		return JavaScriptIcons.Jsx;
+	}
+
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
+	{
+		return JSXJavaScriptVersion.getInstance();
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
new file mode 100644
index 00000000..d2a984c3
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
@@ -0,0 +1,19 @@
+package consulo.javascript.jsx.language;
+
+import com.intellij.openapi.fileTypes.FileTypeConsumer;
+import com.intellij.openapi.fileTypes.FileTypeFactory;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-16
+ */
+public class JSXFileTypeFactory extends FileTypeFactory
+{
+	@Override
+	public void createFileTypes(@Nonnull FileTypeConsumer fileTypeConsumer)
+	{
+		fileTypeConsumer.consume(JSXFileType.INSTANCE);
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
new file mode 100644
index 00000000..23678399
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
@@ -0,0 +1,37 @@
+package consulo.javascript.jsx.language;
+
+import consulo.javascript.lang.EcmaScript6JavaScriptVersion;
+import consulo.javascript.lang.JavaScriptLanguage;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-16
+ */
+public class JSXJavaScriptVersion extends EcmaScript6JavaScriptVersion
+{
+	@Nonnull
+	public static EcmaScript6JavaScriptVersion getInstance()
+	{
+		return JavaScriptLanguage.INSTANCE.findVersionByClass(JSXJavaScriptVersion.class);
+	}
+
+	public JSXJavaScriptVersion()
+	{
+		super("JSX");
+	}
+
+	@Override
+	public int getWeight()
+	{
+		return 60;
+	}
+
+	@Nonnull
+	@Override
+	public String getPresentableName()
+	{
+		return "JSX";
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 994fa301..43270012 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -31,6 +31,7 @@
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
 
 import javax.annotation.Nonnull;
+import javax.inject.Inject;
 
 /**
  * @author VISTALL
@@ -44,7 +45,13 @@ public static EcmaScript6JavaScriptVersion getInstance()
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript6JavaScriptVersion.class);
 	}
 
+	@Inject
 	public EcmaScript6JavaScriptVersion()
+	{
+		this("ECMASCRIPT_6");
+	}
+
+	protected EcmaScript6JavaScriptVersion(@Nonnull String id)
 	{
 		super("ECMASCRIPT_6");
 
diff --git a/plugin/src/main/resources/META-INF/ecma6.xml b/plugin/src/main/resources/META-INF/ecma6.xml
index 15fbe7d7..80f375f3 100644
--- a/plugin/src/main/resources/META-INF/ecma6.xml
+++ b/plugin/src/main/resources/META-INF/ecma6.xml
@@ -16,15 +16,11 @@
 
 <consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="consulo.javascript.lang.EcmaScriptFileTypeFactory" />
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript6JavaScriptVersion" />
-
-		<breadcrumbsInfoProvider implementation="consulo.javascript.jsx.codeInsight.breadcrumbs.JSXLanguageBreadcrumbsInfoProvider" />
-
-		<textEditorHighlightingPassFactory implementation="consulo.javascript.jsx.codeInsight.daemon.impl.tagTreeHighlighting.JSXTagTreeHighlightingPassFactory" />
+		<fileTypeFactory implementation="consulo.javascript.lang.EcmaScriptFileTypeFactory"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript6JavaScriptVersion"/>
 	</extensions>
 
 	<extensions defaultExtensionNs="consulo.javascript">
-		<quickFixFactory key="ECMASCRIPT_6" implementationClass="consulo.javascript.ide.codeInsight.EcmaScript6QuickFixFactory" />
+		<quickFixFactory key="ECMASCRIPT_6" implementationClass="consulo.javascript.ide.codeInsight.EcmaScript6QuickFixFactory"/>
 	</extensions>
 </consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/jsx.xml b/plugin/src/main/resources/META-INF/jsx.xml
new file mode 100644
index 00000000..c9cad380
--- /dev/null
+++ b/plugin/src/main/resources/META-INF/jsx.xml
@@ -0,0 +1,11 @@
+<consulo-plugin>
+	<extensions defaultExtensionNs="com.intellij">
+		<fileTypeFactory implementation="consulo.javascript.jsx.language.JSXFileTypeFactory" />
+
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.jsx.language.JSXJavaScriptVersion"/>
+
+		<breadcrumbsInfoProvider implementation="consulo.javascript.jsx.codeInsight.breadcrumbs.JSXLanguageBreadcrumbsInfoProvider"/>
+
+		<textEditorHighlightingPassFactory implementation="consulo.javascript.jsx.codeInsight.daemon.impl.tagTreeHighlighting.JSXTagTreeHighlightingPassFactory"/>
+	</extensions>
+</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 61dc4fa2..17e89a4d 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -30,6 +30,7 @@
 	<import path="/META-INF/ecma6.xml"/>
 	<import path="/META-INF/actionscript.xml"/>
 	<import path="/META-INF/typescript.xml"/>
+	<import path="/META-INF/jsx.xml"/>
 
 	<actions>
 		<action id="JavaScript.File" class="consulo.javascript.ide.actions.JavaScriptCreateFileAction">
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index 8cfa7e39..5001b46d 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -16,14 +16,6 @@
 
 package consulo.javascript.client.module.extension;
 
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.List;
-
-import javax.swing.JList;
-import javax.swing.JPanel;
-
-import javax.annotation.Nonnull;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.ui.VerticalFlowLayout;
@@ -35,6 +27,12 @@
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.lang.LanguageVersion;
 
+import javax.annotation.Nonnull;
+import javax.swing.*;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.List;
+
 /**
  * @author VISTALL
  * @since 12.12.2015
@@ -69,6 +67,6 @@ protected void customizeCellRenderer(@Nonnull JList list, BaseJavaScriptLanguage
 			}
 		});
 
-		add(LabeledComponent.left(languageVersionComboBox, "Language Version"));
+		add(LabeledComponent.create(languageVersionComboBox, "Default Version"));
 	}
 }

From 1c4a410e17036a35fd62220a33a6ae0f8db0a27d Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 16 Dec 2019 23:35:21 +0300
Subject: [PATCH 089/340] add custom find usage stub

corrected ref selection
---
 .../psi/impl/JSReferenceExpressionImpl.java   | 22 ++++++-------
 .../JavaScriptFindUsagesHandlerFactory.java   | 32 +++++++++++++++++++
 plugin/src/main/resources/META-INF/plugin.xml |  2 ++
 3 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 plugin/src/main/java/consulo/javascript/findUsages/JavaScriptFindUsagesHandlerFactory.java

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 20ce4875..13881027 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -18,7 +18,6 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageNamesValidation;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
 import com.intellij.lang.javascript.psi.*;
@@ -77,8 +76,8 @@ else if(resolvedElement instanceof JSFunction)
 	@RequiredReadAction
 	public JSExpression getQualifier()
 	{
-		final PsiElement psiElement = findChildByType(JSElementTypes.EXPRESSIONS);
-		return psiElement != null ? (JSExpression) psiElement : null;
+		PsiElement firstChild = getFirstChild();
+		return firstChild instanceof JSExpression ? (JSExpression) firstChild : null;
 	}
 
 	@Override
@@ -99,10 +98,12 @@ public PsiElement getReferenceNameElement()
 		return element != null ? element : null;
 	}
 
+	@RequiredReadAction
 	@Override
 	public PsiElement getElement()
 	{
-		return this;
+		PsiElement nameElement = getNameElement();
+		return nameElement == null ? this : nameElement;
 	}
 
 	@Override
@@ -111,13 +112,14 @@ public PsiReference getReference()
 		return this;
 	}
 
+	@Nonnull
 	@Override
 	@RequiredReadAction
 	public TextRange getRangeInElement()
 	{
-		final PsiElement nameElement = getNameElement();
-		final int startOffset = nameElement != null ? nameElement.getNode().getStartOffset() : getNode().getTextRange().getEndOffset();
-		return new TextRange(startOffset - getNode().getStartOffset(), getTextLength());
+		PsiElement nameElement = getNameElement();
+		int l = nameElement != null ? nameElement.getTextLength(): getTextLength();
+		return new TextRange(0, l);
 	}
 
 	@Nullable
@@ -441,12 +443,6 @@ public Object[] getVariants()
 		}
 	}
 
-	@Override
-	public boolean isSoft()
-	{
-		return false;
-	}
-
 	@Override
 	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
diff --git a/plugin/src/main/java/consulo/javascript/findUsages/JavaScriptFindUsagesHandlerFactory.java b/plugin/src/main/java/consulo/javascript/findUsages/JavaScriptFindUsagesHandlerFactory.java
new file mode 100644
index 00000000..a10c825b
--- /dev/null
+++ b/plugin/src/main/java/consulo/javascript/findUsages/JavaScriptFindUsagesHandlerFactory.java
@@ -0,0 +1,32 @@
+package consulo.javascript.findUsages;
+
+import com.intellij.find.findUsages.FindUsagesHandler;
+import com.intellij.find.findUsages.FindUsagesHandlerFactory;
+import com.intellij.lang.javascript.psi.JSDefinitionExpression;
+import com.intellij.psi.PsiElement;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-16
+ */
+public class JavaScriptFindUsagesHandlerFactory extends FindUsagesHandlerFactory
+{
+	@Override
+	public boolean canFindUsages(@Nonnull PsiElement element)
+	{
+		return element instanceof JSDefinitionExpression;
+	}
+
+	@Nullable
+	@Override
+	public FindUsagesHandler createFindUsagesHandler(@Nonnull PsiElement element, boolean forHighlightUsages)
+	{
+		return new FindUsagesHandler(element)
+		{
+
+		};
+	}
+}
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 17e89a4d..e8b23f1c 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -149,6 +149,8 @@
 
 		<targetElementUtilEx implementation="com.intellij.lang.javascript.JavaScriptTargetElementUtilEx"/>
 
+		<findUsagesHandlerFactory implementation="consulo.javascript.findUsages.JavaScriptFindUsagesHandlerFactory"/>
+
 		<sdkType implementation="consulo.javascript.client.module.sdk.ClientJavaScriptSdkType"/>
 		<predefinedBundlesProvider implementation="consulo.javascript.client.module.sdk.ClientJavaScriptPredefinedBundlesProvider"/>
 		<moduleExtensionProvider key="client-javascript"

From 1665eafd40bb2a2cf92716b4f8eb2ba5e9ffdcba Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 16 Dec 2019 23:41:11 +0300
Subject: [PATCH 090/340] fix infinity loop

---
 .../consulo/javascript/lang/parsing/StatementParsing.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 16dacfac..5300ada2 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -475,6 +475,10 @@ protected void parseContinueStatement(final PsiBuilder builder)
 	protected boolean hasSemanticLineBeforeNextToken(final PsiBuilder builder)
 	{
 		IElementType tokenType = builder.getTokenType();
+		if(tokenType == null)
+		{
+			return true;
+		}
 		// force end
 		if(tokenType == JSTokenTypes.RBRACE)
 		{
@@ -500,6 +504,10 @@ else if(!Character.isWhitespace(c))
 					{
 						return false;
 					}
+					else
+					{
+						step ++;
+					}
 				}
 			}
 			else

From 6c837f3b8ba7c9a9e16b097ad0e29641fdfbfe24 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 17 Dec 2019 07:28:04 +0300
Subject: [PATCH 091/340] add view provider for correct xml tag closing

---
 .../psi/impl/JSXmlLiteralExpressionImpl.java  | 24 +++++++++++
 .../JSFileViewProviderFactory.java            | 42 +++++++++++++++++++
 plugin/src/main/resources/META-INF/plugin.xml |  2 +
 3 files changed, 68 insertions(+)
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 29a5189a..9f8c5ba9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -23,6 +23,7 @@
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.meta.PsiMetaData;
 import com.intellij.psi.search.PsiElementProcessor;
+import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlTagChild;
@@ -36,7 +37,9 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,6 +52,27 @@ public JSXmlLiteralExpressionImpl(final ASTNode node)
 		super(node);
 	}
 
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public PsiElement[] getChildren()
+	{
+		PsiElement psiChild = getFirstChild();
+		if(psiChild == null)
+		{
+			return PsiElement.EMPTY_ARRAY;
+		}
+
+		List<PsiElement> result = new ArrayList<>();
+		while(psiChild != null)
+		{
+			result.add(psiChild);
+
+			psiChild = psiChild.getNextSibling();
+		}
+		return PsiUtilCore.toPsiElementArray(result);
+	}
+
 	@Override
 	public void accept(@Nonnull PsiElementVisitor visitor)
 	{
diff --git a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
new file mode 100644
index 00000000..10c4afb1
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
@@ -0,0 +1,42 @@
+package consulo.javascript.lang.viewProvider;
+
+import com.intellij.lang.Language;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.util.lang.reflect.ReflectionUtil;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-17
+ */
+public class JSFileViewProviderFactory implements FileViewProviderFactory
+{
+	private static class JSFileViewProvider extends SingleRootFileViewProvider
+	{
+		private JSFileViewProvider(@Nonnull PsiManager manager, @Nonnull VirtualFile virtualFile, boolean eventSystemEnabled, @Nonnull Language language)
+		{
+			super(manager, virtualFile, eventSystemEnabled, language);
+		}
+
+		@Override
+		@RequiredReadAction
+		public PsiElement findElementAt(int offset, @Nonnull Class<? extends Language> lang)
+		{
+			PsiElement elementAt = findElementAt(offset);
+			if(elementAt != null && ReflectionUtil.isAssignable(lang, elementAt.getLanguage().getClass()))
+			{
+				return elementAt;
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public FileViewProvider createFileViewProvider(@Nonnull VirtualFile virtualFile, Language language, @Nonnull PsiManager psiManager, boolean eventSystemEnabled)
+	{
+		return new JSFileViewProvider(psiManager, virtualFile, eventSystemEnabled, language);
+	}
+}
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index e8b23f1c..64c9ecf1 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -135,6 +135,8 @@
 		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.JSDocTag"
 								 implementationClass="com.intellij.javascript.manipulators.JSDocTagManipulator"/>
 
+		<lang.fileViewProviderFactory language="JavaScript" implementationClass="consulo.javascript.lang.viewProvider.JSFileViewProviderFactory" />
+
 		<completion.contributor language="JavaScript" implementationClass="consulo.javascript.ide.completion.JavaScriptKeywordCompletionContributor"/>
 
 		<completion.confidence language="JavaScript" implementationClass="com.intellij.codeInsight.completion.SkipAutopopupInStrings"/>

From 49db32fb24986e0721d976651392db825fb3f335 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 17 Dec 2019 07:58:02 +0300
Subject: [PATCH 092/340] new xml parsing - test

---
 .../lang/parsing/ExpressionParsing.java       |  50 +--
 .../javascript/lang/parsing/JSXParser.java    | 314 ++++++++++++++++++
 2 files changed, 320 insertions(+), 44 deletions(-)
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java

diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 78e78f54..8d3283fc 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -21,9 +21,9 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.tree.IElementType;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.logging.Logger;
 import consulo.util.dataholder.Key;
 
 import javax.annotation.Nullable;
@@ -36,11 +36,13 @@
  */
 public class ExpressionParsing extends Parsing
 {
-	public static final Logger LOGGER = Logger.getInstance(ExpressionParsing.class);
+	private static final Logger LOGGER = Logger.getInstance(ExpressionParsing.class);
 
 	public static final Key<Boolean> WITHIN_ARRAY_LITERAL_EXPRESSION = Key.create("within.array.literal.expression");
 	public static final Key<Boolean> WITHIN_OBJECT_LITERAL_EXPRESSION = Key.create("within.object.literal.expression");
 
+	private final JSXParser myJSXParser = new JSXParser();
+
 	public ExpressionParsing(JavaScriptParsingContext context)
 	{
 		super(context);
@@ -155,49 +157,9 @@ private void parseLetExpression(final PsiBuilder builder)
 
 	private void parseTag(final PsiBuilder builder)
 	{
-		final IElementType tokenType = builder.getTokenType();
-		assert JSTokenTypes.XML_START_TAG_START == tokenType || JSTokenTypes.XML_START_TAG_LIST == tokenType;
-
-		PsiBuilder.Marker marker = builder.mark();
-		builder.advanceLexer();
-		try
-		{
-			boolean endTagStarted = false;
-
-			for(IElementType currentTokenType = builder.getTokenType(); currentTokenType != null; currentTokenType = builder.getTokenType())
-			{
-				if(!JSTokenTypes.XML_TOKENS.contains(currentTokenType))
-				{
-					PsiBuilder.Marker errorMarker = builder.mark();
-					builder.advanceLexer();
-					errorMarker.error(JavaScriptBundle.message("javascript.parser.message.expected.xml.element"));
-					continue;
-				}
+		myJSXParser.setBuilder(builder);
 
-				if(currentTokenType == JSTokenTypes.XML_START_TAG_START)
-				{
-					parseTag(builder);
-					continue;
-				}
-				else if(currentTokenType == JSTokenTypes.XML_EMPTY_TAG_END ||
-						currentTokenType == JSTokenTypes.XML_END_TAG_LIST ||
-						(currentTokenType == JSTokenTypes.XML_TAG_END && endTagStarted))
-				{
-					builder.advanceLexer();
-					return;
-				}
-				else if(currentTokenType == JSTokenTypes.XML_END_TAG_START)
-				{
-					endTagStarted = true;
-				}
-
-				builder.advanceLexer();
-			}
-		}
-		finally
-		{
-			marker.done(JSElementTypes.XML_LITERAL_EXPRESSION);
-		}
+		myJSXParser.parseTag(false);
 	}
 
 	@Nullable
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
new file mode 100644
index 00000000..2ea27611
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -0,0 +1,314 @@
+package consulo.javascript.lang.parsing;
+
+import com.intellij.codeInsight.daemon.XmlErrorMessages;
+import com.intellij.lang.PsiBuilder;
+import com.intellij.lang.javascript.JSElementTypes;
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.psi.TokenType;
+import com.intellij.psi.tree.ICustomParsingType;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.tree.ILazyParseableElementType;
+import com.intellij.psi.xml.XmlElementType;
+import com.intellij.psi.xml.XmlTokenType;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Stack;
+
+/**
+ * @author VISTALL
+ * @see com.intellij.psi.impl.source.parsing.xml.XmlParsing
+ * @see com.intellij.lang.html.HtmlParsing
+ * @since 2019-12-17
+ */
+public class JSXParser
+{
+	private final Stack<String> myTagNamesStack = new Stack<>();
+	private static final int BALANCING_DEPTH_THRESHOLD = 1000;
+
+	private PsiBuilder myBuilder;
+
+	public void setBuilder(PsiBuilder builder)
+	{
+		myBuilder = builder;
+	}
+
+	private PsiBuilder.Marker mark()
+	{
+		return myBuilder.mark();
+	}
+
+	private void advance()
+	{
+		myBuilder.advanceLexer();
+	}
+
+	private IElementType token()
+	{
+		return myBuilder.getTokenType();
+	}
+
+	private void error(String error)
+	{
+		myBuilder.error(error);
+	}
+
+	private boolean eof()
+	{
+		return myBuilder.eof();
+	}
+
+	@Nullable
+	private String parseTagHeader(final boolean multipleRootTagError, final PsiBuilder.Marker tag)
+	{
+		if(multipleRootTagError)
+		{
+			final PsiBuilder.Marker error = mark();
+			advance();
+			error.error(XmlErrorMessages.message("xml.parsing.multiple.root.tags"));
+		}
+		else
+		{
+			advance();
+		}
+
+		final String tagName;
+		if(token() != JSTokenTypes.XML_NAME || myBuilder.rawLookup(-1) == TokenType.WHITE_SPACE)
+		{
+			error(XmlErrorMessages.message("xml.parsing.tag.name.expected"));
+			tagName = "";
+		}
+		else
+		{
+			tagName = myBuilder.getTokenText();
+			assert tagName != null;
+			advance();
+		}
+		myTagNamesStack.push(tagName);
+
+		do
+		{
+			final IElementType tt = token();
+			if(tt == JSTokenTypes.XML_NAME)
+			{
+				parseAttribute();
+			}
+			else
+			{
+				break;
+			}
+		}
+		while(true);
+
+		if(token() == XmlTokenType.XML_EMPTY_ELEMENT_END)
+		{
+			advance();
+			myTagNamesStack.pop();
+			tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
+			return null;
+		}
+
+		if(token() == JSTokenTypes.XML_TAG_END)
+		{
+			advance();
+		}
+		else
+		{
+			error(XmlErrorMessages.message("tag.start.is.not.closed"));
+			myTagNamesStack.pop();
+			tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
+			return null;
+		}
+
+		if(myTagNamesStack.size() > BALANCING_DEPTH_THRESHOLD)
+		{
+			error(XmlErrorMessages.message("way.too.unbalanced"));
+			tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
+			return null;
+		}
+
+		return tagName;
+	}
+
+
+	private void parseAttribute()
+	{
+		assert token() == XmlTokenType.XML_NAME;
+		final PsiBuilder.Marker att = mark();
+		advance();
+		if(token() == XmlTokenType.XML_EQ)
+		{
+			advance();
+			parseAttributeValue();
+		}
+		att.done(XmlElementType.XML_ATTRIBUTE);
+	}
+
+	private void parseAttributeValue()
+	{
+		final PsiBuilder.Marker attValue = mark();
+		if(token() == XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER)
+		{
+			while(true)
+			{
+				final IElementType tt = token();
+				if(tt == null || tt == XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER || tt == XmlTokenType.XML_END_TAG_START || tt == XmlTokenType.XML_EMPTY_ELEMENT_END ||
+						tt == JSTokenTypes.XML_START_TAG_START)
+				{
+					break;
+				}
+
+				if(tt == JSTokenTypes.BAD_CHARACTER)
+				{
+					final PsiBuilder.Marker error = mark();
+					advance();
+					error.error(XmlErrorMessages.message("unescaped.ampersand.or.nonterminated.character.entity.reference"));
+				}
+				else
+				{
+					advance();
+				}
+			}
+
+			if(token() == XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER)
+			{
+				advance();
+			}
+			else
+			{
+				error(XmlErrorMessages.message("xml.parsing.unclosed.attribute.value"));
+			}
+		}
+		else if(token() == JSTokenTypes.XML_JS_SCRIPT)
+		{
+			advance();
+		}
+		else
+		{
+			if(token() != XmlTokenType.XML_TAG_END && token() != XmlTokenType.XML_EMPTY_ELEMENT_END)
+			{
+				advance(); // Single token att value
+			}
+		}
+
+		attValue.done(XmlElementType.XML_ATTRIBUTE_VALUE);
+	}
+
+	public void parseTagContent()
+	{
+		PsiBuilder.Marker xmlText = null;
+		while(true)
+		{
+			final IElementType tt = token();
+			if(tt == null || tt == XmlTokenType.XML_END_TAG_START)
+			{
+				break;
+			}
+
+			if(tt == JSTokenTypes.XML_START_TAG_START)
+			{
+				xmlText = terminateText(xmlText);
+				parseTag(false);
+			}
+			else if(tt == JSTokenTypes.BAD_CHARACTER)
+			{
+				xmlText = startText(xmlText);
+				final PsiBuilder.Marker error = mark();
+				advance();
+				error.error(XmlErrorMessages.message("unescaped.ampersand.or.nonterminated.character.entity.reference"));
+			}
+			else if(tt instanceof ICustomParsingType || tt instanceof ILazyParseableElementType)
+			{
+				xmlText = terminateText(xmlText);
+				advance();
+			}
+			else
+			{
+				xmlText = startText(xmlText);
+				advance();
+			}
+		}
+
+		terminateText(xmlText);
+	}
+
+	@Nullable
+	private static PsiBuilder.Marker terminateText(@Nullable PsiBuilder.Marker xmlText)
+	{
+		if(xmlText != null)
+		{
+			xmlText.done(XmlElementType.XML_TEXT);
+		}
+		return null;
+	}
+
+	@Nonnull
+	private PsiBuilder.Marker startText(@Nullable PsiBuilder.Marker xmlText)
+	{
+		if(xmlText == null)
+		{
+			xmlText = mark();
+		}
+		return xmlText;
+	}
+
+	protected void parseTag(boolean multipleRootTagError)
+	{
+		assert token() == JSTokenTypes.XML_START_TAG_START : "Tag start expected";
+		final PsiBuilder.Marker tag = mark();
+
+		final String tagName = parseTagHeader(multipleRootTagError, tag);
+		if(tagName == null)
+		{
+			return;
+		}
+
+		final PsiBuilder.Marker content = mark();
+		parseTagContent();
+
+		if(token() == JSTokenTypes.XML_END_TAG_START)
+		{
+			final PsiBuilder.Marker footer = mark();
+			advance();
+
+			if(token() == JSTokenTypes.XML_NAME)
+			{
+				String endName = myBuilder.getTokenText();
+				if(!tagName.equals(endName) && myTagNamesStack.contains(endName))
+				{
+					footer.rollbackTo();
+					myTagNamesStack.pop();
+					tag.doneBefore(JSElementTypes.XML_LITERAL_EXPRESSION, content, XmlErrorMessages.message("named.element.is.not.closed", tagName));
+					content.drop();
+					return;
+				}
+
+				advance();
+			}
+			footer.drop();
+
+			while(token() != XmlTokenType.XML_TAG_END && token() != XmlTokenType.XML_START_TAG_START && token() != XmlTokenType.XML_END_TAG_START && !eof())
+			{
+				error(XmlErrorMessages.message("xml.parsing.unexpected.token"));
+				advance();
+			}
+
+			if(token() == JSTokenTypes.XML_TAG_END)
+			{
+				advance();
+			}
+			else
+			{
+				error(XmlErrorMessages.message("xml.parsing.closing.tag.is.not.done"));
+			}
+		}
+		else
+		{
+			error(XmlErrorMessages.message("xml.parsing.unexpected.end.of.file"));
+		}
+
+		content.drop();
+		myTagNamesStack.pop();
+		tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
+	}
+}

From c2ddb1ff118f1e880eda54867324782654391bb6 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 17 Dec 2019 09:45:32 +0300
Subject: [PATCH 093/340] tag ref contributor - stub

---
 .../psi/impl/JSXmlLiteralExpressionImpl.java  | 87 +++++++++++++++++--
 .../psi/impl/JSXXmlTagManipulator.java        | 21 +++++
 .../language/psi/impl/JSXmlTagReference.java  | 36 ++++++++
 .../impl/JSXmlTagReferenceContributor.java    | 36 ++++++++
 plugin/src/main/resources/META-INF/jsx.xml    |  7 +-
 5 files changed, 180 insertions(+), 7 deletions(-)
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 9f8c5ba9..3274c9d3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -17,17 +17,20 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.lang.Language;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.impl.light.LightElement;
+import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import com.intellij.psi.meta.PsiMetaData;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.util.PsiUtilCore;
-import com.intellij.psi.xml.XmlAttribute;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlTagChild;
-import com.intellij.psi.xml.XmlTagValue;
+import com.intellij.psi.xml.*;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.xml.XmlElementDescriptor;
 import com.intellij.xml.XmlNSDescriptor;
@@ -47,11 +50,83 @@
  */
 public class JSXmlLiteralExpressionImpl extends JSExpressionImpl implements JSLiteralExpression, XmlTag
 {
+	private static class LightXmlValue extends LightElement implements XmlTagValue
+	{
+		protected LightXmlValue(PsiManager manager, Language language)
+		{
+			super(manager, language);
+		}
+
+		@Override
+		public TextRange getTextRange()
+		{
+			return TextRange.EMPTY_RANGE;
+		}
+
+		@Nonnull
+		@Override
+		public XmlTagChild[] getChildren()
+		{
+			return XmlTagChild.EMPTY_ARRAY;
+		}
+
+		@Override
+		public String toString()
+		{
+			return null;
+		}
+
+		@Override
+		public int getTextOffset()
+		{
+			return 0;
+		}
+
+		@Nonnull
+		@Override
+		public XmlText[] getTextElements()
+		{
+			return new XmlText[0];
+		}
+
+		@Nonnull
+		@Override
+		public String getTrimmedText()
+		{
+			return "";
+		}
+
+		@Override
+		public void setText(String s)
+		{
+
+		}
+
+		@Override
+		public void setEscapedText(String s)
+		{
+
+		}
+
+		@Override
+		public boolean hasCDATA()
+		{
+			return false;
+		}
+	}
+
 	public JSXmlLiteralExpressionImpl(final ASTNode node)
 	{
 		super(node);
 	}
 
+	@Nonnull
+	@Override
+	public PsiReference[] getReferences()
+	{
+		return ReferenceProvidersRegistry.getReferencesFromProviders(this);
+	}
+
 	@RequiredReadAction
 	@Nonnull
 	@Override
@@ -246,7 +321,7 @@ public Map<String, String> getLocalNamespaceDeclarations()
 	@Override
 	public XmlTagValue getValue()
 	{
-		return null;
+		return new LightXmlValue(getManager(), getLanguage());
 	}
 
 	@Nullable
@@ -259,7 +334,7 @@ public XmlNSDescriptor getNSDescriptor(@NonNls String namespace, boolean strict)
 	@Override
 	public boolean isEmpty()
 	{
-		return false;
+		return true;
 	}
 
 	@Override
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java
new file mode 100644
index 00000000..98942d77
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java
@@ -0,0 +1,21 @@
+package consulo.javascript.jsx.language.psi.impl;
+
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.AbstractElementManipulator;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.util.IncorrectOperationException;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-17
+ */
+public class JSXXmlTagManipulator extends AbstractElementManipulator<XmlTag>
+{
+	@Override
+	public XmlTag handleContentChange(@Nonnull XmlTag tag, @Nonnull TextRange textRange, String s) throws IncorrectOperationException
+	{
+		return null;
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
new file mode 100644
index 00000000..30a9bfe9
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
@@ -0,0 +1,36 @@
+package consulo.javascript.jsx.language.psi.impl;
+
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiReferenceBase;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-17
+ */
+public class JSXmlTagReference extends PsiReferenceBase<PsiElement>
+{
+	public JSXmlTagReference(@Nonnull PsiElement element)
+	{
+		super(element);
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public PsiElement resolve()
+	{
+		return null;
+	}
+
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public Object[] getVariants()
+	{
+		return new Object[0];
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
new file mode 100644
index 00000000..a01210ee
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
@@ -0,0 +1,36 @@
+package consulo.javascript.jsx.language.psi.impl;
+
+import com.intellij.lang.javascript.psi.impl.JSXmlLiteralExpressionImpl;
+import com.intellij.patterns.StandardPatterns;
+import com.intellij.psi.*;
+import com.intellij.util.ProcessingContext;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-17
+ */
+public class JSXmlTagReferenceContributor extends PsiReferenceContributor
+{
+	@Override
+	public void registerReferenceProviders(PsiReferenceRegistrar registrar)
+	{
+		registrar.registerReferenceProvider(StandardPatterns.psiElement(JSXmlLiteralExpressionImpl.class), new PsiReferenceProvider()
+		{
+			@Nonnull
+			@Override
+			public PsiReference[] getReferencesByElement(@Nonnull PsiElement psiElement, @Nonnull ProcessingContext processingContext)
+			{
+				return PsiReference.EMPTY_ARRAY;
+				// TODO 
+//				ASTNode[] children = psiElement.getNode().getChildren(TokenSet.create(JSTokenTypes.XML_NAME));
+//				if(children.length == 0)
+//				{
+//					return PsiReference.EMPTY_ARRAY;
+//				}
+//				return Arrays.stream(children).map(node -> new JSXmlTagReference(node.getPsi())).toArray(PsiReference[]::new);
+			}
+		});
+	}
+}
diff --git a/plugin/src/main/resources/META-INF/jsx.xml b/plugin/src/main/resources/META-INF/jsx.xml
index c9cad380..a0afa04a 100644
--- a/plugin/src/main/resources/META-INF/jsx.xml
+++ b/plugin/src/main/resources/META-INF/jsx.xml
@@ -1,6 +1,11 @@
 <consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="consulo.javascript.jsx.language.JSXFileTypeFactory" />
+		<fileTypeFactory implementation="consulo.javascript.jsx.language.JSXFileTypeFactory"/>
+
+		<psi.referenceContributor language="JavaScript" implementation="consulo.javascript.jsx.language.psi.impl.JSXmlTagReferenceContributor"/>
+
+		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.impl.JSXmlLiteralExpressionImpl" implementationClass="consulo.javascript.jsx.language.psi.impl.JSXXmlTagManipulator"
+								 order="first"/>
 
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.jsx.language.JSXJavaScriptVersion"/>
 

From cb635ef089a4f41ed3e8039ddb7dfbb07a0603b2 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 17 Dec 2019 09:56:23 +0300
Subject: [PATCH 094/340] if in create js file we type file name with .jsx,
 don't add .js suffix

---
 .../JSXCreateFromTemplateHandler.java         | 29 +++++++++++++++++++
 .../actions/JavaScriptCreateFileAction.java   |  3 +-
 plugin/src/main/resources/META-INF/jsx.xml    |  2 ++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
new file mode 100644
index 00000000..fe81d8d6
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
@@ -0,0 +1,29 @@
+package consulo.javascript.jsx.fileTemplate;
+
+import com.intellij.ide.fileTemplates.DefaultCreateFromTemplateHandler;
+import com.intellij.ide.fileTemplates.FileTemplate;
+import com.intellij.lang.javascript.JavaScriptFileType;
+import consulo.javascript.jsx.language.JSXFileType;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-17
+ */
+public class JSXCreateFromTemplateHandler extends DefaultCreateFromTemplateHandler
+{
+	@Override
+	public boolean handlesTemplate(FileTemplate template)
+	{
+		return template.getExtension().equals(JavaScriptFileType.INSTANCE.getDefaultExtension());
+	}
+
+	@Override
+	protected String checkAppendExtension(String fileName, FileTemplate template)
+	{
+		if(fileName.endsWith("." + JSXFileType.INSTANCE.getDefaultExtension()))
+		{
+			return fileName;
+		}
+		return super.checkAppendExtension(fileName, template);
+	}
+}
diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index 49bc5776..6e358ccf 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -13,7 +13,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.awt.TargetAWT;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.ui.annotation.RequiredUIAccess;
 
@@ -79,7 +78,7 @@ protected void buildDialog(Project project, PsiDirectory directory, CreateFileFr
 	{
 		builder.setTitle("Create JavaScript File");
 
-		builder.addKind("Empty File", TargetAWT.to(JavaScriptFileType.INSTANCE.getIcon()), "JavaScriptFile");
+		builder.addKind("Empty File", JavaScriptFileType.INSTANCE.getIcon(), "JavaScriptFile");
 	}
 
 	@Override
diff --git a/plugin/src/main/resources/META-INF/jsx.xml b/plugin/src/main/resources/META-INF/jsx.xml
index a0afa04a..153eec4d 100644
--- a/plugin/src/main/resources/META-INF/jsx.xml
+++ b/plugin/src/main/resources/META-INF/jsx.xml
@@ -7,6 +7,8 @@
 		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.impl.JSXmlLiteralExpressionImpl" implementationClass="consulo.javascript.jsx.language.psi.impl.JSXXmlTagManipulator"
 								 order="first"/>
 
+		<createFromTemplateHandler implementation="consulo.javascript.jsx.fileTemplate.JSXCreateFromTemplateHandler" />
+
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.jsx.language.JSXJavaScriptVersion"/>
 
 		<breadcrumbsInfoProvider implementation="consulo.javascript.jsx.codeInsight.breadcrumbs.JSXLanguageBreadcrumbsInfoProvider"/>

From 4312b58962af5db9ef44d122fb52c1e0b8881906 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 17 Dec 2019 10:07:00 +0300
Subject: [PATCH 095/340] corrected formatting for {} inside xml script

---
 .../javascript/formatter/blocks/SubBlockVisitor.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
index b1b0cdaf..a1dc0e82 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
@@ -304,6 +304,15 @@ else if(node.getPsi() instanceof JSLoopStatement)
 			return Indent.getNormalIndent();
 		}
 
+		if(nodeElementType == JSElementTypes.EMBEDDED_EXPRESSION)
+		{
+			if(childElementType == JSTokenTypes.LBRACE || childElementType == JSTokenTypes.RBRACE)
+			{
+				return Indent.getNoneIndent();
+			}
+			return Indent.getNormalIndent();
+		}
+
 		if(nodeElementType == JSElementTypes.OBJECT_LITERAL_EXPRESSION)
 		{
 			if(childElementType == JSTokenTypes.LBRACE || childElementType == JSTokenTypes.RBRACE)

From 7bb58ba4d2e1b5cc771e1a8930cc71be9e636ba3 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 17 Dec 2019 10:21:58 +0300
Subject: [PATCH 096/340] parameter destruction

---
 .../psi/JSDestructuringParameter.java         |  16 ++
 .../lang/javascript/psi/JSParameter.java      |  18 +-
 .../lang/javascript/JSElementTypes.java       |   6 +
 .../psi/impl/JSFunctionBaseImpl.java          |  15 +-
 .../javascript/psi/impl/JSParameterImpl.java  |   8 +
 .../psi/impl/JSParameterListImpl.java         |   6 +-
 .../lang/parsing/FunctionParsing.java         |  53 ++++-
 .../JavaScriptDestructuringParameterImpl.java | 192 ++++++++++++++++++
 8 files changed, 284 insertions(+), 30 deletions(-)
 create mode 100644 base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
new file mode 100644
index 00000000..078d98d0
--- /dev/null
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
@@ -0,0 +1,16 @@
+package com.intellij.lang.javascript.psi;
+
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-17
+ */
+public interface JSDestructuringParameter extends JSParameter
+{
+	@RequiredReadAction
+	@Nullable
+	JSDestructuringObject getDestructuringObject();
+}
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
index 701b1d77..c19bcdb3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ArrayFactory;
 import consulo.annotation.access.RequiredReadAction;
 
+import javax.annotation.Nullable;
+
 /**
  * User: max
  * Date: Jan 30, 2005
@@ -29,17 +29,9 @@
  */
 public interface JSParameter extends JSVariable
 {
-	public static final JSParameter[] EMPTY_ARRAY = new JSParameter[0];
-
-	public static ArrayFactory<JSParameter> ARRAY_FACTORY = new ArrayFactory<JSParameter>()
-	{
-		@Nonnull
-		@Override
-		public JSParameter[] create(int count)
-		{
-			return count == 0 ? EMPTY_ARRAY : new JSParameter[count];
-		}
-	};
+	JSParameter[] EMPTY_ARRAY = new JSParameter[0];
+
+	ArrayFactory<JSParameter> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSParameter[count];
 
 	JSFunction getDeclaringFunction();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 005a00bb..724b39e8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -31,6 +31,7 @@
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringElementImpl;
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringObjectImpl;
+import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringParameterImpl;
 import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringShorthandedPropertyImpl;
 import consulo.javascript.psi.impl.JSComputedNameImpl;
 import consulo.javascript.psi.impl.JavaScriptLambdaExpressionImpl;
@@ -78,6 +79,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	JSStubElementType<JSParameterListStub, JSParameterList> PARAMETER_LIST = new JSParameterListElementType();
 
 	JSStubElementType<JSParameterStub, JSParameter> FORMAL_PARAMETER = new JSParameterElementType();
+
 	JSStubElementType<JSVariableStub, JSVariable> VARIABLE = new JSVariableElementType();
 	IElementType ARGUMENT_LIST = new ElementTypeAsPsiFactory("ARGUMENT_LIST", JavaScriptLanguage.INSTANCE, JSArgumentListImpl.class);
 
@@ -111,6 +113,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	IElementType CONTINUE_STATEMENT = new ElementTypeAsPsiFactory("CONTINUE_STATEMENT", JavaScriptLanguage.INSTANCE, JSContinueStatementImpl.class);
 	IElementType BREAK_STATEMENT = new ElementTypeAsPsiFactory("BREAK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBreakStatementImpl.class);
 	IElementType DESTRUCTURING_ELEMENT = new ElementTypeAsPsiFactory("DESTRUCTURING_ELEMENT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringElementImpl.class);
+	IElementType DESTRUCTURING_PARAMETER = new ElementTypeAsPsiFactory("DESTRUCTURING_PARAMETER", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringParameterImpl.class);
 	IElementType DESTRUCTURING_OBJECT = new ElementTypeAsPsiFactory("DESTRUCTURING_OBJECT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringObjectImpl.class);
 	IElementType DESTRUCTURING_SHORTHANDED_PROPERTY = new ElementTypeAsPsiFactory("DESTRUCTURING_SHORTHANDED_PROPERTY", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringShorthandedPropertyImpl.class);
 	IElementType WITH_STATEMENT = new ElementTypeAsPsiFactory("WITH_STATEMENT", JavaScriptLanguage.INSTANCE, JSWithStatementImpl.class);
@@ -173,6 +176,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 		}
 	};
 	IElementType NEW_EXPRESSION = new ElementTypeAsPsiFactory("NEW_EXPRESSION", JavaScriptLanguage.INSTANCE, JSNewExpressionImpl.class);
+
 	IElementType INDEXED_PROPERTY_ACCESS_EXPRESSION = new ElementTypeAsPsiFactory("INDEXED_PROPERTY_ACCESS_EXPRESSION", JavaScriptLanguage.INSTANCE,
 			JSIndexedPropertyAccessExpressionImpl.class);
 	IElementType CALL_EXPRESSION = new ElementTypeAsPsiFactory("CALL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCallExpressionImpl.class);
@@ -180,6 +184,8 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 			JSDefinitionExpressionImpl.class);
 	IElementType LET_EXPRESSION = new ElementTypeAsPsiFactory("LET_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLetExpressionImpl.class);
 
+	TokenSet PARAMETERS = TokenSet.create(FORMAL_PARAMETER, DESTRUCTURING_PARAMETER);
+
 	TokenSet EXPRESSIONS = TokenSet.create(THIS_EXPRESSION, REFERENCE_EXPRESSION, LITERAL_EXPRESSION, PARENTHESIZED_EXPRESSION,
 			ARRAY_LITERAL_EXPRESSION, OBJECT_LITERAL_EXPRESSION, ASSIGNMENT_EXPRESSION, CONDITIONAL_EXPRESSION, BINARY_EXPRESSION,
 			PREFIX_EXPRESSION, POSTFIX_EXPRESSION, COMMA_EXPRESSION, FUNCTION_EXPRESSION, NEW_EXPRESSION, INDEXED_PROPERTY_ACCESS_EXPRESSION,
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index 99eeee6e..7aaf5376 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -16,20 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSParameterList;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSSourceElement;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
@@ -44,6 +35,8 @@
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -196,7 +189,7 @@ public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnul
 			final JSParameter[] params = getParameterList().getParameters();
 			for(JSParameter param : params)
 			{
-				if(!processor.execute(param, state))
+				if(!param.processDeclarations(processor, state, lastParent, place))
 				{
 					return false;
 				}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index 06248ccc..a9eea581 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -27,6 +27,8 @@
 import com.intellij.lang.javascript.psi.stubs.JSParameterStub;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.ResolveState;
+import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 
@@ -149,4 +151,10 @@ protected String doGetType()
 		}
 		return s;
 	}
+
+	@Override
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
+	{
+		return processor.execute(this, state);
+	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
index 7dbfe052..4f5bea1a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -26,6 +24,8 @@
 import com.intellij.lang.javascript.psi.stubs.JSParameterListStub;
 import com.intellij.psi.PsiElementVisitor;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -48,7 +48,7 @@ public JSParameterListImpl(final JSParameterListStub stub)
 	@Override
 	public JSParameter[] getParameters()
 	{
-		return getStubOrPsiChildren(JSElementTypes.FORMAL_PARAMETER, JSParameter.EMPTY_ARRAY);
+		return getStubOrPsiChildren(JSElementTypes.PARAMETERS, JSParameter.EMPTY_ARRAY);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index ad0cb078..76ceec30 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -16,15 +16,15 @@
 
 package consulo.javascript.lang.parsing;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.psi.tree.IElementType;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author max
  */
@@ -163,10 +163,57 @@ public void parseParameter(@Nonnull PsiBuilder builder, @Nullable PsiBuilder.Mar
 			}
 			parameterMarker.done(JSElementTypes.FORMAL_PARAMETER);
 		}
+		else if(builder.getTokenType() == JSTokenTypes.LBRACE)
+		{
+			parseDeconstructionParameter(builder, parameterMarker);
+		}
 		else
 		{
 			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.formal.parameter.name"));
 			parameterMarker.drop();
 		}
 	}
+
+	protected void parseDeconstructionParameter(PsiBuilder builder, PsiBuilder.Marker mark)
+	{
+		PsiBuilder.Marker desctructionObjectMarker = builder.mark();
+		builder.advanceLexer();
+
+		boolean first = true;
+		while(!builder.eof())
+		{
+			if(builder.getTokenType() == JSTokenTypes.RBRACE)
+			{
+				break;
+			}
+
+			if(!first)
+			{
+				Parsing.checkMatches(builder, JSTokenTypes.COMMA, "Comma expected");
+			}
+
+			first = false;
+
+			if(isIdentifierToken(builder))
+			{
+				PsiBuilder.Marker propertyMarker = builder.mark();
+				PsiBuilder.Marker varMarker = builder.mark();
+				builder.advanceLexer();
+				varMarker.done(JSElementTypes.FORMAL_PARAMETER);
+				propertyMarker.done(JSElementTypes.DESTRUCTURING_SHORTHANDED_PROPERTY);
+			}
+			else
+			{
+				PsiBuilder.Marker err = builder.mark();
+				builder.advanceLexer();
+				err.error("Expected identifier");
+			}
+		}
+
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, "'}' expected");
+
+		desctructionObjectMarker.done(JSElementTypes.DESTRUCTURING_OBJECT);
+
+		mark.done(JSElementTypes.DESTRUCTURING_PARAMETER);
+	}
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
new file mode 100644
index 00000000..49515eca
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
@@ -0,0 +1,192 @@
+package consulo.javascript.lang.parsing.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.ResolveState;
+import com.intellij.psi.scope.PsiScopeProcessor;
+import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-17
+ */
+public class JavaScriptDestructuringParameterImpl extends JSElementImpl implements JSDestructuringParameter
+{
+	public JavaScriptDestructuringParameterImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@Override
+	@RequiredReadAction
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
+	{
+		JSDestructuringObject destructuringObject = getDestructuringObject();
+		if(destructuringObject == null)
+		{
+			return true;
+		}
+		for(JSVariable variable : destructuringObject.getVariables())
+		{
+			if(!processor.execute(variable, state))
+			{
+				return false;
+			}
+		}
+		return super.processDeclarations(processor, state, lastParent, place);
+	}
+
+	@Nullable
+	@Override
+	public JSVariableStubBase getStub()
+	{
+		return null;
+	}
+
+	@Override
+	public void accept(@Nonnull PsiElementVisitor visitor)
+	{
+		visitor.visitElement(this);
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public JSDestructuringObject getDestructuringObject()
+	{
+		return findChildByClass(JSDestructuringObject.class);
+	}
+
+	@Override
+	public JSFunction getDeclaringFunction()
+	{
+		return getStubOrPsiParentOfType(JSFunction.class);
+	}
+
+	@RequiredReadAction
+	@Override
+	public boolean isRest()
+	{
+		return false;
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public PsiElement getRestElement()
+	{
+		return null;
+	}
+
+	@Override
+	public boolean isOptional()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean hasInitializer()
+	{
+		return false;
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public JSExpression getInitializer()
+	{
+		return null;
+	}
+
+	@Override
+	public String getInitializerText()
+	{
+		return null;
+	}
+
+	@Override
+	public void setInitializer(JSExpression expr) throws IncorrectOperationException
+	{
+
+	}
+
+	@Nonnull
+	@Override
+	public JavaScriptType getType()
+	{
+		return JavaScriptType.UNKNOWN;
+	}
+
+	@Nullable
+	@Override
+	public String getTypeString()
+	{
+		return null;
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public JavaScriptTypeElement getTypeElement()
+	{
+		return null;
+	}
+
+	@Override
+	public boolean isConst()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean isLocal()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean isDeprecated()
+	{
+		return false;
+	}
+
+	@Nullable
+	@Override
+	public JSAttributeList getAttributeList()
+	{
+		return null;
+	}
+
+	@Override
+	public String getQualifiedName()
+	{
+		return null;
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public PsiElement getNameIdentifier()
+	{
+		return null;
+	}
+
+	@RequiredWriteAction
+	@Override
+	public PsiElement setName(@Nonnull @NonNls String name) throws IncorrectOperationException
+	{
+		return null;
+	}
+}

From 145c00550afbd42f2896409ea05a836ad2e7fe14 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 17 Dec 2019 10:28:42 +0300
Subject: [PATCH 097/340] more js keyword completion

---
 .../JavaScriptKeywordCompletionExtender.java  | 19 +++++++++++++++
 .../EcmaScript6KeywordCompletionExtender.java | 23 +++++++++++++++++++
 ...avaScriptKeywordCompletionContributor.java | 13 ++++++++++-
 plugin/src/main/resources/META-INF/ecma6.xml  |  2 ++
 plugin/src/main/resources/META-INF/plugin.xml |  4 +++-
 5 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java

diff --git a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
new file mode 100644
index 00000000..fb4fd8bc
--- /dev/null
+++ b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
@@ -0,0 +1,19 @@
+package consulo.javascript.ide.completion;
+
+import com.intellij.codeInsight.completion.CompletionParameters;
+import com.intellij.codeInsight.completion.CompletionResultSet;
+import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.util.ProcessingContext;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-17
+ */
+public interface JavaScriptKeywordCompletionExtender
+{
+	ExtensionPointName<JavaScriptKeywordCompletionExtender> EP_NAME = ExtensionPointName.create("consulo.javascript.keywordCompletionExtender");
+
+	void fillCompletion(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result);
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java
new file mode 100644
index 00000000..56a42c51
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java
@@ -0,0 +1,23 @@
+package consulo.javascript.ecmascript6.completion;
+
+import com.intellij.codeInsight.completion.AddSpaceInsertHandler;
+import com.intellij.codeInsight.completion.CompletionParameters;
+import com.intellij.codeInsight.completion.CompletionResultSet;
+import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.util.ProcessingContext;
+import consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2019-12-17
+ */
+public class EcmaScript6KeywordCompletionExtender implements JavaScriptKeywordCompletionExtender
+{
+	@Override
+	public void fillCompletion(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
+	{
+		result.addElement(LookupElementBuilder.create("let").withInsertHandler(AddSpaceInsertHandler.INSTANCE).bold());
+	}
+}
diff --git a/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
index f93eb7d1..1b6a98a5 100644
--- a/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -16,7 +16,6 @@
 
 package consulo.javascript.ide.completion;
 
-import javax.annotation.Nonnull;
 import com.intellij.codeInsight.completion.CompletionContributor;
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionResultSet;
@@ -31,6 +30,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.codeInsight.completion.CompletionProvider;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 20.12.2015
@@ -69,6 +70,16 @@ public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingC
 				result.addElement(functionKeyword);
 
 				result.addElement(LookupElementBuilder.create("var").withInsertHandler(SpaceInsertHandler.INSTANCE).bold());
+				result.addElement(LookupElementBuilder.create("const").withInsertHandler(SpaceInsertHandler.INSTANCE).bold());
+
+				result.addElement(LookupElementBuilder.create("if").bold());
+				result.addElement(LookupElementBuilder.create("for").bold());
+				result.addElement(LookupElementBuilder.create("return").bold());
+
+				for(JavaScriptKeywordCompletionExtender extender : JavaScriptKeywordCompletionExtender.EP_NAME.getExtensionList())
+				{
+					extender.fillCompletion(parameters, context, result);
+				}
 			}
 		});
 	}
diff --git a/plugin/src/main/resources/META-INF/ecma6.xml b/plugin/src/main/resources/META-INF/ecma6.xml
index 80f375f3..29ff8144 100644
--- a/plugin/src/main/resources/META-INF/ecma6.xml
+++ b/plugin/src/main/resources/META-INF/ecma6.xml
@@ -22,5 +22,7 @@
 
 	<extensions defaultExtensionNs="consulo.javascript">
 		<quickFixFactory key="ECMASCRIPT_6" implementationClass="consulo.javascript.ide.codeInsight.EcmaScript6QuickFixFactory"/>
+
+		<keywordCompletionExtender implementation="consulo.javascript.ecmascript6.completion.EcmaScript6KeywordCompletionExtender" />
 	</extensions>
 </consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 64c9ecf1..0f8463e4 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -1,5 +1,5 @@
 <!--
-  - Copyright 2013-2015 must-be.org
+  - Copyright 2013-2019 consulo.io
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -169,6 +169,8 @@
 	<extensionPoints>
 		<extensionPoint name="indexer" interface="consulo.javascript.index.JavaScriptIndexer"/>
 
+		<extensionPoint name="keywordCompletionExtender" interface="consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender" />
+
 		<extensionPoint name="resolveHelper" interface="com.intellij.lang.javascript.flex.JSResolveHelper"/>
 		<extensionPoint name="classInheritorsProvider" interface="com.intellij.lang.javascript.search.JSClassInheritorsProvider"/>
 

From d1fff2945f5aab4f987947a2187c60e58e6d2f1e Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 23 Dec 2019 15:19:13 +0300
Subject: [PATCH 098/340] do not blink on typing

---
 .../highlighting/JavaScriptHighlightVisitor.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index 7ca559ef..382dd2f9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -110,7 +110,7 @@ private void highlightPropertyName(@Nonnull JSProperty property, @Nonnull PsiEle
 		{
 			type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
 		}
-		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(nameIdentifier).textAttributes(type).create());
+		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).needsUpdateOnTyping(false).range(nameIdentifier).textAttributes(type).create());
 	}
 
 	@Override
@@ -119,7 +119,7 @@ public void visitJSAttribute(JSAttribute jsAttribute)
 	{
 		super.visitJSAttribute(jsAttribute);
 
-		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(jsAttribute).textAttributes(JavaScriptSyntaxHighlightKeys.JS_METADATA).create());
+		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).needsUpdateOnTyping(false).range(jsAttribute).textAttributes(JavaScriptSyntaxHighlightKeys.JS_METADATA).create());
 	}
 
 	@Override
@@ -284,7 +284,7 @@ else if(isField)
 			return;
 		}
 
-		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(targetForHighlight).textAttributes(type).create());
+		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).needsUpdateOnTyping(false).range(targetForHighlight).textAttributes(type).create());
 	}
 
 	@Nullable
@@ -323,7 +323,7 @@ private static HighlightInfo buildHighlightForVariable(@Nonnull final PsiElement
 			return null;
 		}
 
-		return HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(markerAddTo).textAttributes(type).create();
+		return HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(markerAddTo).needsUpdateOnTyping(false).textAttributes(type).create();
 	}
 
 	private void reportFeatureUsage(@Nonnull PsiElement element, @Nonnull JavaScriptFeature javaScriptFeature)

From 89673623b08d96d8562d867a750f42c84a1884d1 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 1 Jan 2020 18:40:07 +0300
Subject: [PATCH 099/340] rework spread expression parsing

---
 .../javascript/psi/JSSpreadExpression.java    | 10 ++++
 .../lang/javascript/JSElementTypes.java       |  2 +
 .../lang/javascript/JSTokenTypes.java         |  4 +-
 .../psi/impl/JSArgumentListImpl.java          | 10 +---
 .../lang/parsing/ExpressionParsing.java       | 12 ++---
 .../impl/JavaScriptSpreadExpressionImpl.java  | 50 +++++++++++++++++++
 .../parsing/EcmaScript6ExpressionParsing.java | 16 ++++++
 7 files changed, 87 insertions(+), 17 deletions(-)
 create mode 100644 base-api/src/main/java/com/intellij/lang/javascript/psi/JSSpreadExpression.java
 create mode 100644 base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSpreadExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSpreadExpression.java
new file mode 100644
index 00000000..9645b902
--- /dev/null
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSpreadExpression.java
@@ -0,0 +1,10 @@
+package com.intellij.lang.javascript.psi;
+
+/**
+ * @author VISTALL
+ * @since 2020-01-01
+ */
+public interface JSSpreadExpression extends JSExpression
+{
+	JSExpression getInnerExpression();
+}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 724b39e8..8a710a1b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -35,6 +35,7 @@
 import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringShorthandedPropertyImpl;
 import consulo.javascript.psi.impl.JSComputedNameImpl;
 import consulo.javascript.psi.impl.JavaScriptLambdaExpressionImpl;
+import consulo.javascript.psi.impl.JavaScriptSpreadExpressionImpl;
 import consulo.javascript.psi.stubs.JSFileStub;
 import consulo.psi.tree.ElementTypeAsPsiFactory;
 
@@ -159,6 +160,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	IElementType PREFIX_EXPRESSION = new ElementTypeAsPsiFactory("PREFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPrefixExpressionImpl.class);
 	IElementType POSTFIX_EXPRESSION = new ElementTypeAsPsiFactory("POSTFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPostfixExpressionImpl.class);
 	IElementType LAMBDA_EXPRESSION = new ElementTypeAsPsiFactory("LAMBDA_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptLambdaExpressionImpl.class);
+	IElementType SPREAD_EXPRESSION = new ElementTypeAsPsiFactory("SPREAD_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptSpreadExpressionImpl.class);
 	IElementType COMMA_EXPRESSION = new ElementTypeAsPsiFactory("COMMA_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCommaExpressionImpl.class);
 	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_EXPRESSION = new JSFunctionElementType("FUNCTION_EXPRESSION")
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 103910ef..7644a657 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -284,7 +284,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType JSDOC_TAG_DATA = new JSElementType("JSDOC_TAG_DATA");
 
 	TokenSet OPERATIONS = TokenSet.create(LT, GT, LE, GE, EQEQ, NE, EQEQEQ, NEQEQ, PLUS, MINUS, MULT, PERC, PLUSPLUS, MINUSMINUS, LTLT, GTGT, GTGTGT, AND, OR, XOR, EXCL, TILDE, ANDAND, OROR, QUEST,
-			COLON, EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIV, DIVEQ, COMMA, IS_KEYWORD, AS_KEYWORD, DOT_DOT_DOT);
+			COLON, EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIV, DIVEQ, COMMA, IS_KEYWORD, AS_KEYWORD);
 
 	TokenSet ASSOC_OPERATIONS = TokenSet.create(PLUS, MULT, AND, OR, XOR, OROR, ANDAND);
 
@@ -301,7 +301,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 
 	TokenSet SHIFT_OPERATIONS = TokenSet.create(LTLT, GTGT, GTGTGT);
 
-	TokenSet UNARY_OPERATIONS = TokenSet.create(PLUS, MINUS, PLUSPLUS, MINUSMINUS, TILDE, EXCL, TYPEOF_KEYWORD, VOID_KEYWORD, DELETE_KEYWORD, DOT_DOT_DOT);
+	TokenSet UNARY_OPERATIONS = TokenSet.create(PLUS, MINUS, PLUSPLUS, MINUSMINUS, TILDE, EXCL, TYPEOF_KEYWORD, VOID_KEYWORD, DELETE_KEYWORD);
 
 	TokenSet COMMENTS = TokenSet.create(END_OF_LINE_COMMENT, DOC_COMMENT, C_STYLE_COMMENT, XML_STYLE_COMMENT, CDATA_START, CDATA_END, XML_STYLE_COMMENT_START,
 			JavaScriptHighlightingLexer.getTagContentTokenType(), XML_TAG_WHITE_SPACE, JSP_TEXT, JSDOC_TAG_DATA);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
index 51f362ca..689fc07b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
@@ -28,11 +28,9 @@
 import com.intellij.util.IncorrectOperationException;
 
 /**
- * Created by IntelliJ IDEA.
  * User: max
  * Date: Jan 30, 2005
  * Time: 9:15:02 PM
- * To change this template use File | Settings | File Templates.
  */
 public class JSArgumentListImpl extends JSElementImpl implements JSArgumentList
 {
@@ -44,13 +42,7 @@ public JSArgumentListImpl(final ASTNode node)
 	@Override
 	public JSExpression[] getArguments()
 	{
-		final ASTNode[] nodes = getNode().getChildren(JSElementTypes.EXPRESSIONS);
-		final JSExpression[] exprs = new JSExpression[nodes.length];
-		for(int i = 0; i < exprs.length; i++)
-		{
-			exprs[i] = (JSExpression) nodes[i].getPsi();
-		}
-		return exprs;
+		return findChildrenByClass(JSExpression.class);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 8d3283fc..3d05010e 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -36,7 +36,7 @@
  */
 public class ExpressionParsing extends Parsing
 {
-	private static final Logger LOGGER = Logger.getInstance(ExpressionParsing.class);
+	private static final Logger LOG = Logger.getInstance(ExpressionParsing.class);
 
 	public static final Key<Boolean> WITHIN_ARRAY_LITERAL_EXPRESSION = Key.create("within.array.literal.expression");
 	public static final Key<Boolean> WITHIN_OBJECT_LITERAL_EXPRESSION = Key.create("within.object.literal.expression");
@@ -206,7 +206,7 @@ private static boolean lastSymbolEscaped(String text)
 
 	public void parseObjectLiteralExpression(final PsiBuilder builder)
 	{
-		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
+		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 
@@ -280,7 +280,7 @@ protected void parseProperty(final PsiBuilder builder)
 
 	public void parseArrayLiteralExpression(final PsiBuilder builder)
 	{
-		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
+		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 		boolean commaExpected = false;
@@ -333,7 +333,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 
 	private void parseParenthesizedExpression(final PsiBuilder builder)
 	{
-		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
+		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 		parseExpression(builder);
@@ -489,7 +489,7 @@ else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.
 
 	protected boolean parseNewExpression(PsiBuilder builder)
 	{
-		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NEW_KEYWORD);
+		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.NEW_KEYWORD);
 		builder.advanceLexer();
 
 		if(builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD)
@@ -507,7 +507,7 @@ protected boolean parseNewExpression(PsiBuilder builder)
 
 	protected void parseArgumentList(final PsiBuilder builder)
 	{
-		ExpressionParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
+		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
 		final PsiBuilder.Marker arglist = builder.mark();
 		builder.advanceLexer();
 		boolean first = true;
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java
new file mode 100644
index 00000000..1452c4a7
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java
@@ -0,0 +1,50 @@
+package consulo.javascript.psi.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSSpreadExpression;
+import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.psi.PsiElementVisitor;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2020-01-01
+ */
+public class JavaScriptSpreadExpressionImpl extends JSElementImpl implements JSSpreadExpression
+{
+	public JavaScriptSpreadExpressionImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@Override
+	public JSExpression getInnerExpression()
+	{
+		return findNotNullChildByClass(JSExpression.class);
+	}
+
+	@Nonnull
+	@Override
+	public JSExpression replace(JSExpression other)
+	{
+		return this;
+	}
+
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public JavaScriptType getType()
+	{
+		return JavaScriptType.UNKNOWN;
+	}
+
+	@Override
+	public void accept(@Nonnull PsiElementVisitor visitor)
+	{
+		visitor.visitElement(this);
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
index 5eae5c11..f21d9f1a 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
@@ -36,6 +36,22 @@ public EcmaScript6ExpressionParsing(JavaScriptParsingContext context)
 	@Override
 	protected boolean parsePrimaryExpression(PsiBuilder builder)
 	{
+		if(builder.getTokenType() == JSTokenTypes.DOT_DOT_DOT)
+		{
+			PsiBuilder.Marker mark = builder.mark();
+			builder.advanceLexer();
+
+			if(!parseExpressionOptional(builder))
+			{
+				mark.error("Expression expected");
+			}
+			else
+			{
+				mark.done(JSElementTypes.SPREAD_EXPRESSION);
+			}
+
+			return true;
+		}
 		if(canParseLambdaExpression(builder))
 		{
 			return parseLambdaExpression(builder);

From e4366b4ebec13c8304e572dd4e440f97038d7f30 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 1 Jan 2020 18:46:35 +0300
Subject: [PATCH 100/340] fix issue with parsing {} inside attribute list

---
 .../main/java/consulo/javascript/lang/parsing/JSXParser.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index 2ea27611..a71fdb71 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -93,6 +93,10 @@ private String parseTagHeader(final boolean multipleRootTagError, final PsiBuild
 			{
 				parseAttribute();
 			}
+			else if(tt == JSTokenTypes.XML_JS_SCRIPT)
+			{
+				advance();
+			}
 			else
 			{
 				break;

From 7a7d0ce49b4610d8606bef391de32f5f4f7756bc Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Fri, 10 Jan 2020 14:04:37 +0300
Subject: [PATCH 101/340] allow search class from export default

---
 .../impl/ES6ExportDefaultAssignmentImpl.java  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
index c58772bc..cbcc3b62 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
@@ -1,9 +1,17 @@
 package consulo.javascript.ecmascript6.psi.impl;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSClass;
+import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.impl.JSStatementImpl;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.ResolveState;
+import com.intellij.psi.scope.PsiScopeProcessor;
 import consulo.javascript.ecmascript6.psi.ES6ExportDefaultAssignment;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 2019-12-14
@@ -14,4 +22,21 @@ public ES6ExportDefaultAssignmentImpl(ASTNode node)
 	{
 		super(node);
 	}
+
+	@Nullable
+	public JSElement getElement()
+	{
+		return findChildByClass(JSClass.class);
+	}
+
+	@Override
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
+	{
+		JSElement element = getElement();
+		if(element != null && !element.processDeclarations(processor, state, lastParent, place))
+		{
+			return false;
+		}
+		return super.processDeclarations(processor, state, lastParent, place);
+	}
 }

From 56102fc1cf9a8fccf83288a6d5a2b825cc8ff18f Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 12 Jan 2020 21:33:06 +0300
Subject: [PATCH 102/340] always none indent

---
 .../formatter/blocks/SubBlockVisitor.java      | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
index a1dc0e82..442c1f33 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
@@ -32,7 +32,9 @@
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.tree.IElementType;
+import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
@@ -43,10 +45,10 @@
  */
 public class SubBlockVisitor extends JSNodeVisitor
 {
-	List<Block> myBlocks = new ArrayList<Block>();
-	private final CodeStyleSettings mySettings;
+	private final List<Block> myBlocks = new ArrayList<>();
+	private final CommonCodeStyleSettings mySettings;
 
-	public SubBlockVisitor(CodeStyleSettings settings)
+	public SubBlockVisitor(CommonCodeStyleSettings settings)
 	{
 		mySettings = settings;
 	}
@@ -57,6 +59,7 @@ public List<Block> getBlocks()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void visitElement(final ASTNode node)
 	{
 		Alignment alignment = getDefaultAlignment(node);
@@ -221,14 +224,7 @@ private Indent getIndent(final ASTNode node, final ASTNode child)
 
 		if(nodeElementType == JSElementTypes.IF_STATEMENT)
 		{
-			if(childElementType == JSTokenTypes.ELSE_KEYWORD || JSTokenTypes.COMMENTS.contains(childElementType))
-			{
-				return Indent.getNoneIndent();
-			}
-			if(JSElementTypes.SOURCE_ELEMENTS.contains(childElementType))
-			{
-				return Indent.getNormalIndent();
-			}
+			return Indent.getNoneIndent();
 		}
 
 		if(nodeElementType == JSElementTypes.WITH_STATEMENT && JSElementTypes.SOURCE_ELEMENTS.contains(childElementType))

From 94af5b01ed04351bc734fce039e23482bd28cd9a Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 13 Jan 2020 08:09:54 +0300
Subject: [PATCH 103/340] simplified visitors

---
 .../lang/javascript/psi/JSExpression.java     |  16 +--
 .../lang/javascript/psi/JSFunction.java       |  45 ++++----
 .../javascript/psi/JSFunctionExpression.java  |   5 +-
 .../psi/JavaScriptLambdaExpression.java       |  11 +-
 .../lang/javascript/JSElementTypes.java       |   5 +
 .../psi/impl/JSArgumentListImpl.java          |  16 +--
 .../impl/JSArrayLiteralExpressionImpl.java    |  20 ++--
 .../psi/impl/JSAssignmentExpressionImpl.java  |  16 +--
 .../javascript/psi/impl/JSAttributeImpl.java  |  18 +---
 .../psi/impl/JSAttributeListImpl.java         |  23 ++--
 .../impl/JSAttributeNameValuePairImpl.java    |  18 +---
 .../psi/impl/JSBinaryExpressionImpl.java      |  15 +--
 .../psi/impl/JSBlockStatementImpl.java        |  16 +--
 .../psi/impl/JSBreakStatementImpl.java        |  21 +---
 .../psi/impl/JSCallExpressionImpl.java        |  18 +---
 .../javascript/psi/impl/JSCaseClauseImpl.java |  15 +--
 .../javascript/psi/impl/JSCatchBlockImpl.java |  16 +--
 .../lang/javascript/psi/impl/JSClassBase.java |  12 +--
 .../psi/impl/JSCommaExpressionImpl.java       |  15 +--
 .../psi/impl/JSConditionalExpressionImpl.java |  16 +--
 .../psi/impl/JSContinueStatementImpl.java     |  22 +---
 .../psi/impl/JSDefinitionExpressionImpl.java  |  36 ++-----
 .../psi/impl/JSDoWhileStatementImpl.java      |  16 +--
 .../javascript/psi/impl/JSDocCommentImpl.java |  15 +--
 .../javascript/psi/impl/JSDocTagImpl.java     |  27 ++---
 .../psi/impl/JSDocTagValueImpl.java           |  18 +---
 .../javascript/psi/impl/JSElementImpl.java    |   3 -
 .../psi/impl/JSEmbeddedContentImpl.java       |  10 +-
 .../psi/impl/JSEmptyStatementImpl.java        |  16 +--
 .../psi/impl/JSExpressionStatementImpl.java   |  12 +--
 .../psi/impl/JSForInStatementImpl.java        |  22 +---
 .../psi/impl/JSForStatementImpl.java          |  22 +---
 .../psi/impl/JSFunctionBaseImpl.java          |   3 +-
 .../psi/impl/JSFunctionExpressionImpl.java    |  27 ++---
 .../javascript/psi/impl/JSFunctionImpl.java   |  26 ++---
 .../psi/impl/JSGenericSignatureImpl.java      |  16 +--
 .../psi/impl/JSIfStatementImpl.java           |  22 ++--
 .../psi/impl/JSImportStatementImpl.java       |  12 +--
 .../psi/impl/JSIncludeDirectiveImpl.java      |  15 +--
 ...JSIndexedPropertyAccessExpressionImpl.java |  15 +--
 .../psi/impl/JSLabeledStatementImpl.java      |  16 +--
 .../psi/impl/JSLetExpressionImpl.java         |  20 +---
 .../psi/impl/JSLetStatementImpl.java          |  16 +--
 .../psi/impl/JSLiteralExpressionImpl.java     |  18 +---
 .../psi/impl/JSNamespaceDeclarationImpl.java  |  17 +--
 .../psi/impl/JSNewExpressionImpl.java         |  25 ++---
 .../impl/JSObjectLiteralExpressionImpl.java   |  23 +---
 .../psi/impl/JSPackageStatementImpl.java      |  21 ++--
 .../javascript/psi/impl/JSParameterImpl.java  |  12 +--
 .../psi/impl/JSParameterListImpl.java         |  12 +--
 .../impl/JSParenthesizedExpressionImpl.java   |  22 +---
 .../psi/impl/JSPostfixExpressionImpl.java     |  26 ++---
 .../psi/impl/JSPrefixExpressionImpl.java      |  21 ++--
 .../javascript/psi/impl/JSPropertyImpl.java   |  21 ++--
 .../psi/impl/JSReferenceExpressionImpl.java   |  11 +-
 .../psi/impl/JSReferenceListImpl.java         |  28 ++---
 .../psi/impl/JSReturnStatementImpl.java       |  21 +---
 .../javascript/psi/impl/JSStatementImpl.java  |   2 +-
 .../JSStatementWithLabelReferenceImpl.java    |  13 ++-
 .../psi/impl/JSStubElementImpl.java           |   8 +-
 .../psi/impl/JSStubbedStatementImpl.java      |   2 +-
 .../psi/impl/JSSuperExpressionImpl.java       |  40 ++-----
 .../psi/impl/JSSwitchStatementImpl.java       |  16 +--
 .../psi/impl/JSThisExpressionImpl.java        |  15 +--
 .../psi/impl/JSThrowStatementImpl.java        |  16 +--
 .../psi/impl/JSTryStatementImpl.java          |  18 +---
 .../psi/impl/JSUseNamespaceDirectiveImpl.java |  15 +--
 .../psi/impl/JSVarStatementImpl.java          |  12 +--
 .../psi/impl/JSVariableBaseImpl.java          |  12 +--
 .../psi/impl/JSWhileStatementImpl.java        |  25 ++---
 .../psi/impl/JSWithStatementImpl.java         |  23 ++--
 .../psi/impl/JSXmlLiteralExpressionImpl.java  |   6 +-
 .../psi/impl/JSYieldStatementImpl.java        |  16 +--
 .../JavaSciptDestructuringElementImpl.java    |   6 +-
 .../JavaSciptDestructuringObjectImpl.java     |   6 +-
 .../JavaScriptDestructuringParameterImpl.java |   5 +-
 ...tDestructuringShorthandedPropertyImpl.java |   6 +-
 .../psi/impl/JSComputedNameImpl.java          |  11 +-
 .../impl/JavaScriptLambdaExpressionImpl.java  | 101 +++++++++++++++---
 .../impl/JavaScriptSpreadExpressionImpl.java  |   6 +-
 .../inspectjs/JSRecursiveElementVisitor.java  |  16 +--
 .../impl/ES6ExportDefaultAssignmentImpl.java  |   7 ++
 .../psi/impl/ES6ImportDeclarationImpl.java    |   7 ++
 .../psi/impl/ES6ImportedBindingImpl.java      |   6 +-
 .../psi/impl/ES6NamedImportsImpl.java         |   6 +-
 .../JavaScriptTargetElementUtilEx.java        |   3 +-
 86 files changed, 479 insertions(+), 968 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
index 2f623ab2..a778b09a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
@@ -16,29 +16,21 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.util.ArrayFactory;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author max
  * @since  6:46:19 PM Jan 30, 2005
  */
 public interface JSExpression extends JSElement
 {
-	public static final JSExpression[] EMPTY_ARRAY = new JSExpression[0];
+	JSExpression[] EMPTY_ARRAY = new JSExpression[0];
 
-	public static ArrayFactory<JSExpression> ARRAY_FACTORY = new ArrayFactory<JSExpression>()
-	{
-		@Nonnull
-		@Override
-		public JSExpression[] create(int count)
-		{
-			return count == 0 ? EMPTY_ARRAY : new JSExpression[count];
-		}
-	};
+	ArrayFactory<JSExpression> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSExpression[count];
 
 	@Nonnull
 	JSExpression replace(JSExpression other);
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index 9789d166..10b5a9dd 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -16,32 +16,22 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
-import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.util.ArrayFactory;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.JavaScriptTypeElement;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author max
  */
-public interface JSFunction extends JSQualifiedNamedElement, JSSourceElement, JSAttributeListOwner, StubBasedPsiElement<JSFunctionStub>
+public interface JSFunction extends JSQualifiedNamedElement, JSSourceElement, JSAttributeListOwner
 {
 	public static final JSFunction[] EMPTY_ARRAY = new JSFunction[0];
 
-	public static ArrayFactory<JSFunction> ARRAY_FACTORY = new ArrayFactory<JSFunction>()
-	{
-		@Nonnull
-		@Override
-		public JSFunction[] create(int count)
-		{
-			return count == 0 ? EMPTY_ARRAY : new JSFunction[count];
-		}
-	};
+	public static ArrayFactory<JSFunction> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSFunction[count];
 
 	@Nullable
 	@RequiredReadAction
@@ -50,13 +40,22 @@ public JSFunction[] create(int count)
 	JSSourceElement[] getBody();
 
 	@RequiredReadAction
-	boolean isGetProperty();
+	default boolean isGetProperty()
+	{
+		return false;
+	}
 
 	@RequiredReadAction
-	boolean isSetProperty();
+	default boolean isSetProperty()
+	{
+		return false;
+	}
 
 	@RequiredReadAction
-	boolean isConstructor();
+	default boolean isConstructor()
+	{
+		return false;
+	}
 
 	@Nonnull
 	JavaScriptType getReturnType();
@@ -68,12 +67,18 @@ public JSFunction[] create(int count)
 
 	enum FunctionKind
 	{
-		GETTER, SETTER, CONSTRUCTOR, SIMPLE
+		GETTER,
+		SETTER,
+		CONSTRUCTOR,
+		SIMPLE
 	}
 
 	FunctionKind getKind();
 
 	boolean isDeprecated();
 
-	boolean isReferencesArguments();
+	default boolean isReferencesArguments()
+	{
+		return false;
+	}
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
index b0924085..642cb1e6 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
@@ -25,5 +25,8 @@
 public interface JSFunctionExpression extends JSFunction, JSExpression
 {
 	@Nonnull
-	JSFunction getFunction();
+	default JSFunction getFunction()
+	{
+		return this;
+	}
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
index b1b1356a..ba6e1477 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
@@ -16,19 +16,12 @@
 
 package consulo.javascript.psi;
 
-import javax.annotation.Nonnull;
-
-import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSParameterList;
+import com.intellij.lang.javascript.psi.JSFunctionExpression;
 
 /**
  * @author VISTALL
  * @since 03.03.2016
  */
-public interface JavaScriptLambdaExpression extends JSExpression
+public interface JavaScriptLambdaExpression extends JSFunctionExpression
 {
-	@Nonnull
-	@RequiredReadAction
-	JSParameterList getParameterList();
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 8a710a1b..d5848618 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -27,6 +27,7 @@
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.psi.tree.TokenSet;
+import consulo.annotation.DeprecationInfo;
 import consulo.javascript.ecmascript4.psi.impl.EcmaScript4ElementTypes;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringElementImpl;
@@ -129,6 +130,8 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	IElementType WHILE_STATEMENT = new ElementTypeAsPsiFactory("WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSWhileStatementImpl.class);
 	IElementType DOWHILE_STATEMENT = new ElementTypeAsPsiFactory("DO_WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSDoWhileStatementImpl.class);
 
+	@Deprecated
+	@DeprecationInfo("Use search by class")
 	TokenSet STATEMENTS = TokenSet.create(BLOCK_STATEMENT, LABELED_STATEMENT, VAR_STATEMENT, EMPTY_STATEMENT, IF_STATEMENT, CONTINUE_STATEMENT,
 			BREAK_STATEMENT, WITH_STATEMENT, RETURN_STATEMENT, THROW_STATEMENT, TRY_STATEMENT, SWITCH_STATEMENT, FOR_IN_STATEMENT, FOR_STATEMENT,
 			WHILE_STATEMENT, DOWHILE_STATEMENT, EXPRESSION_STATEMENT, YIELD_STATEMENT, LET_STATEMENT, ES4_IMPORT_STATEMENT, PACKAGE_STATEMENT,
@@ -188,6 +191,8 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 
 	TokenSet PARAMETERS = TokenSet.create(FORMAL_PARAMETER, DESTRUCTURING_PARAMETER);
 
+	@Deprecated
+	@DeprecationInfo("Use search by class")
 	TokenSet EXPRESSIONS = TokenSet.create(THIS_EXPRESSION, REFERENCE_EXPRESSION, LITERAL_EXPRESSION, PARENTHESIZED_EXPRESSION,
 			ARRAY_LITERAL_EXPRESSION, OBJECT_LITERAL_EXPRESSION, ASSIGNMENT_EXPRESSION, CONDITIONAL_EXPRESSION, BINARY_EXPRESSION,
 			PREFIX_EXPRESSION, POSTFIX_EXPRESSION, COMMA_EXPRESSION, FUNCTION_EXPRESSION, NEW_EXPRESSION, INDEXED_PROPERTY_ACCESS_EXPRESSION,
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
index 689fc07b..9995095a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
@@ -16,17 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSArgumentList;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.util.IncorrectOperationException;
 
+import javax.annotation.Nonnull;
+
 /**
  * User: max
  * Date: Jan 30, 2005
@@ -46,16 +45,9 @@ public JSExpression[] getArguments()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSArgumentList(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSArgumentList(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
index 6fc5502d..4cb7acff 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
@@ -16,19 +16,18 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.IElementType;
 
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -75,15 +74,8 @@ else if(type == JSTokenTypes.COMMA)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSArrayLiteralExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSArrayLiteralExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
index 462462b4..05355355 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
@@ -16,12 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -38,15 +37,8 @@ public JSAssignmentExpressionImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSAssignmentExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSAssignmentExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index 0aa5d150..71be9346 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -16,9 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -29,10 +26,12 @@
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiReference;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
@@ -76,16 +75,9 @@ public JSAttributeImpl(final JSAttributeStub node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSAttribute(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSAttribute(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
index 12385c6b..ced15107 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
@@ -16,12 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -31,11 +25,15 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.util.IncorrectOperationException;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author  Maxim.Mossienko
  */
@@ -55,16 +53,9 @@ public JSAttributeListImpl(final JSAttributeListStub stub)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSAttributeList(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSAttributeList(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
index f24ebb26..c9917388 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
@@ -16,9 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -29,10 +26,12 @@
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiReference;
 import com.intellij.util.IncorrectOperationException;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
@@ -54,16 +53,9 @@ public JSAttributeNameValuePairImpl(final JSAttributeNameValuePairStub node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSAttributeNameValuePair(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSAttributeNameValuePair(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
index 22ee156f..762fbfe6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -24,12 +23,13 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -75,16 +75,9 @@ public IElementType getOperationSign()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSBinaryExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSBinaryExpression(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
index e1a7d050..46755922 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -26,10 +24,11 @@
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.util.IncorrectOperationException;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -62,16 +61,9 @@ public JSLabeledStatement setLabel(String label)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSBlock(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSBlock(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
index a9149a5c..a570ac31 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
@@ -16,16 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.psi.JSBreakStatement;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSLoopStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.intellij.psi.PsiElementVisitor;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -41,16 +37,9 @@ public JSBreakStatementImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSBreakStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSBreakStatement(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
index 720a79ae..3363229a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
@@ -16,14 +16,14 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSArgumentList;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -42,8 +42,7 @@ public JSCallExpressionImpl(final ASTNode node)
 	@Override
 	public JSExpression getMethodExpression()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
@@ -54,15 +53,8 @@ public JSArgumentList getArgumentList()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSCallExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSCallExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
index bdf83574..cbea337a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -24,7 +23,8 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -70,15 +70,8 @@ public JSStatement[] getStatements()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSCaseClause(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSCaseClause(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
index 0beef76e..40790ec2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSCatchBlock;
@@ -25,11 +23,12 @@
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -59,16 +58,9 @@ public JSStatement getStatement()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSCatchBlock(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSCatchBlock(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index 271f7bcb..23b83dd6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -25,7 +25,6 @@
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
 import com.intellij.openapi.util.UserDataCache;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
@@ -67,16 +66,9 @@ public JSClassBase(final JSClassStub stub, final JSStubElementType<JSClassStub,
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSClass(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSClass(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
index 69c4e8bc..1cb03627 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
@@ -16,11 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSCommaExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -37,15 +37,8 @@ public JSCommaExpressionImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSCommaExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSCommaExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
index c495fa53..885d52b5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
@@ -16,17 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.IElementType;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -115,15 +114,8 @@ public JSExpression getElse()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSConditionalExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSConditionalExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
index 461fa33e..3f11f098 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
@@ -16,17 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.psi.JSContinueStatement;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSLoopStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.intellij.psi.PsiElementVisitor;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -56,15 +51,8 @@ public JSStatement getStatementToContinue()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSContinueStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSContinueStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
index efaf91ff..c09fc89c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
@@ -16,25 +16,14 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.icons.AllIcons;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSDefinitionExpression;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSVariable;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
-import consulo.ui.image.Image;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -53,8 +42,7 @@ public JSDefinitionExpressionImpl(final ASTNode node)
 	@Override
 	public JSExpression getExpression()
 	{
-		final ASTNode expressionNode = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return expressionNode != null ? (JSExpression) expressionNode.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
@@ -80,21 +68,9 @@ public PsiElement setName(@Nonnull String name) throws IncorrectOperationExcepti
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
-	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSDefinitionExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
-	}
-
-	public Image getIcon(int flags)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		return AllIcons.Nodes.Variable;
+		visitor.visitJSDefinitionExpression(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
index ee6bf132..718701c1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
@@ -16,15 +16,14 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSDoWhileStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -55,15 +54,8 @@ public JSStatement getBody()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSDoWhileStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSDoWhileStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
index fbf41733..180fc5a7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
@@ -16,16 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.psi.JSDocComment;
 import com.intellij.lang.javascript.psi.JSDocTag;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.IElementType;
 
+import javax.annotation.Nonnull;
+
 public class JSDocCommentImpl extends JSElementImpl implements JSDocComment
 {
 	public JSDocCommentImpl(final ASTNode node)
@@ -40,16 +40,9 @@ public IElementType getTokenType()
 	}
 
 	@Override
-	public void accept(@Nonnull final PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSDocComment(this);
-		}
-		else
-		{
-			visitor.visitComment(this);
-		}
+		visitor.visitJSDocComment(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index 9834e4e7..ffa32f84 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -16,27 +16,21 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JSDocTokenTypes;
+import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSLookupUtil;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.ElementManipulator;
-import com.intellij.psi.ElementManipulators;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.PsiWhiteSpace;
+import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 public class JSDocTagImpl extends JSElementImpl implements JSDocTag
 {
@@ -62,16 +56,9 @@ public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOp
 	}
 
 	@Override
-	public void accept(@Nonnull final PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSDocTag(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSDocTag(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
index ce4abbe6..782f3c47 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
@@ -16,18 +16,17 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDocTagValue;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.text.StringTokenizer;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 public class JSDocTagValueImpl extends JSElementImpl implements JSDocTagValue
 {
@@ -127,15 +126,8 @@ else if("returns".equals(name))
 	}
 
 	@Override
-	public void accept(@Nonnull final PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSDocTagValue(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSDocTagValue(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
index a8055df5..5f201a8e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
@@ -31,7 +31,4 @@ public JSElementImpl(final ASTNode node)
 	{
 		super(node);
 	}
-
-	@Override
-	public abstract void accept(@Nonnull PsiElementVisitor visitor);
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
index b4353d5e..f4b2aa36 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
@@ -16,13 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.search.PsiElementProcessor;
@@ -31,6 +29,8 @@
 import com.intellij.psi.xml.XmlTagChild;
 import com.intellij.util.IncorrectOperationException;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -46,9 +46,9 @@ public JSEmbeddedContentImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
index dc72a938..75cbc8ca 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
@@ -16,12 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSEmptyStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -38,15 +37,8 @@ public JSEmptyStatementImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSEmptyStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSEmptyStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index 2f0a5640..8f9965a7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -22,7 +22,6 @@
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import consulo.annotation.access.RequiredReadAction;
@@ -53,16 +52,9 @@ public JSExpression getExpression()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSExpressionStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSExpressionStatement(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
index 478e2008..fdb0ae55 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
@@ -16,21 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSForInStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSVarStatement;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -143,15 +138,8 @@ public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnul
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSForInStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSForInStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
index 12d92fbb..9d1d4470 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
@@ -16,21 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSForStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSVarStatement;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author max
  */
@@ -156,15 +151,8 @@ public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnul
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSForStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSForStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index 7aaf5376..a88481b7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -26,6 +26,7 @@
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.ResolveState;
+import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.util.IncorrectOperationException;
@@ -43,7 +44,7 @@
  * Date: Jan 30, 2005
  * Time: 8:25:27 PM
  */
-abstract class JSFunctionBaseImpl<T extends JSFunctionStub, T2 extends JSFunction> extends JSStubElementImpl<T> implements JSFunction
+abstract class JSFunctionBaseImpl<T extends JSFunctionStub, T2 extends JSFunction> extends JSStubElementImpl<T> implements JSFunction, StubBasedPsiElement<JSFunctionStub>
 {
 	private boolean referencesArgumentsCalculated;
 	private boolean referencesArguments;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index f99c6d97..5d2c2709 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -16,18 +16,17 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -48,24 +47,10 @@ public JSFunctionExpressionImpl(final JSFunctionStub stub, IStubElementType type
 		super(stub, type);
 	}
 
-	@Nonnull
-	@Override
-	public JSFunction getFunction()
-	{
-		return this;
-	}
-
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSFunctionExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSFunctionExpression(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
index 4f9ca0ad..0b1a9a71 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
@@ -16,27 +16,20 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSPackageStatement;
-import com.intellij.lang.javascript.psi.JSSuppressionHolder;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -104,16 +97,9 @@ public JSAttributeList getAttributeList()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSFunctionDeclaration(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSFunctionDeclaration(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
index c1307a2a..98ccaf45 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
@@ -16,12 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSGenericSignature;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 public class JSGenericSignatureImpl extends JSElementImpl implements JSGenericSignature
 {
@@ -31,15 +30,8 @@ public JSGenericSignatureImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSGenericSignature(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSGenericSignature(this);
 	}
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
index 94225a82..e306ba03 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -25,7 +23,8 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -44,15 +43,13 @@ public JSIfStatementImpl(final ASTNode node)
 	@Override
 	public JSExpression getCondition()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
 	public JSStatement getThen()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.STATEMENTS);
-		return node != null ? (JSStatement) node.getPsi() : null;
+		return findChildByClass(JSStatement.class);
 	}
 
 	@Override
@@ -83,15 +80,8 @@ public void setCondition(JSExpression expr)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSIfStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSIfStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
index 77ee283f..31379a3c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
@@ -22,7 +22,6 @@
 import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 
@@ -44,16 +43,9 @@ public JSImportStatementImpl(final JSImportStatementStub stub)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSImportStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSImportStatement(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
index d91d20ad..1a55ebec 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -25,13 +24,14 @@
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
 import consulo.javascript.lang.JavaScriptTokenSets;
 
+import javax.annotation.Nonnull;
+
 /**
  * @by Maxim.Mossienko
  */
@@ -48,16 +48,9 @@ public JSIncludeDirectiveImpl(final JSIncludeDirectiveStub stub)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSIncludeDirective(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSIncludeDirective(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
index f83cfa6d..70d0e36e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
@@ -16,16 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIndexedPropertyAccessExpression;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.IElementType;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -82,15 +82,8 @@ public JSExpression getIndexExpression()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSIndexedPropertyAccessExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSIndexedPropertyAccessExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
index 61896790..5f26633a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -26,9 +24,10 @@
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.util.IncorrectOperationException;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -74,16 +73,9 @@ public JSLabeledStatement setLabel(String label)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSLabeledStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSLabeledStatement(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
index 0a7acad9..ffdeadb5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
@@ -16,14 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLetExpression;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -42,20 +40,12 @@ public JSLetExpressionImpl(final ASTNode node)
 	@Override
 	public JSExpression getExpression()
 	{
-		final ASTNode expressionNode = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return expressionNode != null ? (JSExpression) expressionNode.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSLetExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSLetExpression(this);
 	}
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
index e6b115b1..a14e72eb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
@@ -16,15 +16,14 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLetStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author maxim
@@ -37,16 +36,9 @@ public JSLetStatementImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSLetStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSLetStatement(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index 83a605c7..1edb46c9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -16,16 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.intellij.psi.LiteralTextEscaper;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.tree.IElementType;
@@ -33,6 +29,9 @@
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.psi.JavaScriptPrimitiveType;
 import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author max
@@ -127,16 +126,9 @@ public PsiReference[] getReferences()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSLiteralExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSLiteralExpression(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
index 6f06140f..41974cbd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -26,11 +24,13 @@
 import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
 import com.intellij.lang.javascript.psi.stubs.JSNamespaceDeclarationStub;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
@@ -48,16 +48,9 @@ public JSNamespaceDeclarationImpl(final JSNamespaceDeclarationStub node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSNamespaceDeclaration(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSNamespaceDeclaration(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index 193e231f..5092b050 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -16,21 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.javascript.psi.JSArgumentList;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSNewExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.lang.psi.impl.JavaScriptClassType;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -66,8 +61,7 @@ public JavaScriptType getType()
 	@Override
 	public JSExpression getMethodExpression()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
@@ -78,15 +72,8 @@ public JSArgumentList getArgumentList()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSNewExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSNewExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
index f81c2ce0..d646dfec 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
@@ -16,20 +16,17 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.icons.AllIcons;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.tree.TokenSet;
-import consulo.ui.image.Image;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -60,21 +57,9 @@ public JSProperty[] getProperties()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
-	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSObjectLiteralExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
-	}
-
-	public Image getIcon(int flags)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		return AllIcons.Nodes.Class;
+		visitor.visitJSObjectLiteralExpression(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
index 0a3e465d..890e69b5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
@@ -16,11 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import java.io.IOException;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -34,12 +29,15 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
 
 /**
  * @by Maxim.Mossienko
@@ -57,16 +55,9 @@ public JSPackageStatementImpl(final JSPackageStatementStub stub)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSPackageStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSPackageStatement(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index a9eea581..b6fe891f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -26,7 +26,6 @@
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.stubs.JSParameterStub;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
@@ -97,16 +96,9 @@ public boolean isOptional()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSParameter(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSParameter(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
index 4f5bea1a..0c1229e8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
@@ -22,7 +22,6 @@
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.stubs.JSParameterListStub;
-import com.intellij.psi.PsiElementVisitor;
 
 import javax.annotation.Nonnull;
 
@@ -52,15 +51,8 @@ public JSParameter[] getParameters()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSParameterList(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSParameterList(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
index ed8d8a70..76a71ade 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
@@ -16,21 +16,17 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
  * User: max
  * Date: Jan 30, 2005
  * Time: 11:30:44 PM
- * To change this template use File | Settings | File Templates.
  */
 public class JSParenthesizedExpressionImpl extends JSExpressionImpl implements JSParenthesizedExpression
 {
@@ -42,20 +38,12 @@ public JSParenthesizedExpressionImpl(final ASTNode node)
 	@Override
 	public JSExpression getInnerExpression()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSParenthesizedExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSParenthesizedExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index 3115f615..7e0fd3c7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -16,25 +16,21 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSPostfixExpression;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.IElementType;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+
+import javax.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
  * User: max
  * Date: Jan 30, 2005
  * Time: 11:52:13 PM
- * To change this template use File | Settings | File Templates.
  */
 public class JSPostfixExpressionImpl extends JSExpressionImpl implements JSPostfixExpression
 {
@@ -55,8 +51,7 @@ public JavaScriptType getType()
 	@Override
 	public JSExpression getExpression()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
@@ -67,15 +62,8 @@ public IElementType getOperationSign()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSPostfixExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSPostfixExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index 7dc84293..430d308e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -16,10 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -27,8 +23,12 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.IElementType;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -69,16 +69,9 @@ public PsiElement getOperatorElement()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSPrefixExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSPrefixExpression(this);
 	}
 
 	@RequiredReadAction
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index c8dc699b..b9db0b3f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -16,27 +16,27 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.psi.util.PsiModificationTracker;
-import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
+import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.psi.JavaScriptType;
 import consulo.javascript.psi.JSComputedName;
+import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author max
@@ -142,16 +142,9 @@ public JSComputedName getComputedName()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSProperty(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSProperty(this);
 	}
 
 	@RequiredReadAction
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 13881027..1657ae93 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -444,16 +444,9 @@ public Object[] getVariants()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSReferenceExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSReferenceExpression(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index a04d470b..133cba3b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -16,27 +16,22 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSReferenceList;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.util.ArrayUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.Collection;
 
 /**
  * @author Maxim.Mossienko
@@ -54,16 +49,9 @@ public JSReferenceListImpl(final JSReferenceListStub stub, IStubElementType stub
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSReferenceList(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSReferenceList(this);
 	}
 
 	@RequiredReadAction
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
index d1d3b5cc..7d0e8f4a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
@@ -16,20 +16,17 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReturnStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
  * User: max
  * Date: Jan 30, 2005
  * Time: 9:57:08 PM
- * To change this template use File | Settings | File Templates.
  */
 public class JSReturnStatementImpl extends JSStatementImpl implements JSReturnStatement
 {
@@ -41,20 +38,12 @@ public JSReturnStatementImpl(final ASTNode node)
 	@Override
 	public JSExpression getExpression()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSReturnStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSReturnStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
index 4130fd4f..e5bbcd78 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
@@ -21,7 +21,7 @@
 /**
  * @author ven
  */
-public class JSStatementImpl extends JSStubbedStatementImpl
+public abstract class JSStatementImpl extends JSStubbedStatementImpl
 {
 	public JSStatementImpl(final ASTNode node)
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
index 4cef220a..000ab5c3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
@@ -16,12 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSFunction;
@@ -33,6 +27,11 @@
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -40,7 +39,7 @@
  * Time: 9:52:04 PM
  * To change this template use File | Settings | File Templates.
  */
-class JSStatementWithLabelReferenceImpl extends JSStatementImpl
+abstract class JSStatementWithLabelReferenceImpl extends JSStatementImpl
 {
 	private PsiReference[] myReferences;
 	private String myReferencesText;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
index 5389b81f..e69b5afa 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
@@ -40,7 +40,7 @@
  * Date: Jan 30, 2005
  * Time: 8:23:10 PM
  */
-public class JSStubElementImpl<T extends StubElement> extends StubBasedPsiElementBase<T> implements JSElement
+public abstract class JSStubElementImpl<T extends StubElement> extends StubBasedPsiElementBase<T> implements JSElement
 {
 	public static Key<NavigationItem> ORIGINAL_ELEMENT = Key.create("ORIGINAL_NAMED_ELEMENT");
 	@NonNls
@@ -56,12 +56,14 @@ public JSStubElementImpl(final T t, IStubElementType type)
 		super(t, type);
 	}
 
+	protected abstract void accept(@Nonnull JSElementVisitor visitor);
+
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	public final void accept(@Nonnull PsiElementVisitor visitor)
 	{
 		if(visitor instanceof JSElementVisitor)
 		{
-			((JSElementVisitor) visitor).visitJSElement(this);
+			accept((JSElementVisitor)visitor);
 		}
 		else
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
index 2f55c24d..6d445341 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
@@ -29,7 +29,7 @@
 /**
  * @author ven
  */
-class JSStubbedStatementImpl<T extends StubElement> extends JSStubElementImpl<T> implements JSStatement, JSSuppressionHolder
+abstract class JSStubbedStatementImpl<T extends StubElement> extends JSStubElementImpl<T> implements JSStatement, JSSuppressionHolder
 {
 	JSStubbedStatementImpl(final ASTNode node)
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
index 106f3ccb..1b87d390 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
@@ -16,22 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.psi.JSCallExpression;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.lang.javascript.psi.JSSuperExpression;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.ResolveState;
@@ -39,6 +29,9 @@
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -47,40 +40,21 @@
  */
 public class JSSuperExpressionImpl extends JSExpressionImpl implements JSSuperExpression
 {
-	private PsiReference[] references;
-
 	public JSSuperExpressionImpl(final ASTNode node)
 	{
 		super(node);
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
-	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSSuperExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
-	}
-
-	@Override
-	public PsiReference getReference()
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		return getReferences()[0];
+		visitor.visitJSSuperExpression(this);
 	}
 
 	@Override
 	@Nonnull
 	public PsiReference[] getReferences()
 	{
-		if(references != null)
-		{
-			return references;
-		}
 		PsiReference[] refs = {
 				new PsiReference()
 				{
@@ -182,6 +156,6 @@ public boolean isSoft()
 					}
 				}
 		};
-		return references = refs;
+		return refs;
 	}
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
index 023ac2a2..44dbb078 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
@@ -16,17 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.TokenSet;
 
+import javax.annotation.Nonnull;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -63,15 +62,8 @@ public JSCaseClause[] getCaseClauses()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSSwitchStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSSwitchStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
index 5889f14f..54573c08 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
@@ -16,11 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSThisExpression;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -37,15 +37,8 @@ public JSThisExpressionImpl(final ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSThisExpression(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSThisExpression(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
index d073b9dc..76cc595d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
@@ -16,14 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSThrowStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -47,15 +46,8 @@ public JSExpression getExpression()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSThrowStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSThrowStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
index fe4b289a..d75a4d8f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
@@ -16,9 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -26,10 +23,12 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -106,15 +105,8 @@ public JSStatement getFinallyStatement()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSTryStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSTryStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
index 55a4464a..f2b0dba7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -24,10 +23,11 @@
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.psi.stubs.JSUseNamespaceDirectiveStub;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 
+import javax.annotation.Nonnull;
+
 /**
  * @by Maxim.Mossienko
  */
@@ -44,16 +44,9 @@ public JSUseNamespaceDirectiveImpl(final JSUseNamespaceDirectiveStub stub)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSUseNamespaceDirective(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSUseNamespaceDirective(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
index 44a354d8..5b730cfa 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
@@ -21,7 +21,6 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import consulo.annotation.access.RequiredReadAction;
@@ -74,16 +73,9 @@ public void declareVariable(String name, JSExpression initializer)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSVarStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSVarStatement(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index fbdd00b8..e236e716 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -26,7 +26,6 @@
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.RecursionManager;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.search.SearchScope;
@@ -199,16 +198,9 @@ public PsiElement setName(@Nonnull String name) throws IncorrectOperationExcepti
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSVariable(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSVariable(this);
 	}
 
 	@RequiredReadAction
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
index 1ee55f1d..c26cd35f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
@@ -16,22 +16,18 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
  * User: max
  * Date: Jan 30, 2005
  * Time: 10:15:13 PM
- * To change this template use File | Settings | File Templates.
  */
 public class JSWhileStatementImpl extends JSStatementImpl implements JSWhileStatement
 {
@@ -43,27 +39,18 @@ public JSWhileStatementImpl(final ASTNode node)
 	@Override
 	public JSExpression getCondition()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
 	public JSStatement getBody()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.STATEMENTS);
-		return node != null ? (JSStatement) node.getPsi() : null;
+		return findChildByClass(JSStatement.class);
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSWhileStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSWhileStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
index b0f957dd..1fa96c25 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
@@ -16,15 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSWithStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -43,27 +41,18 @@ public JSWithStatementImpl(final ASTNode node)
 	@Override
 	public JSExpression getExpression()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
 	public JSStatement getStatement()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.STATEMENTS);
-		return node != null ? (JSStatement) node.getPsi() : null;
+		return findChildByClass(JSStatement.class);
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSWithStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSWithStatement(this);
 	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 3274c9d3..73c38924 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -19,10 +19,10 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.light.LightElement;
@@ -149,9 +149,9 @@ public PsiElement[] getChildren()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
index cc04b80a..7d16ea44 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
@@ -16,14 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSYieldStatement;
-import com.intellij.psi.PsiElementVisitor;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author maxim
@@ -43,15 +42,8 @@ public JSExpression getExpression()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSYieldStatement(this);
-		}
-		else
-		{
-			visitor.visitElement(this);
-		}
+		visitor.visitJSYieldStatement(this);
 	}
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
index 39db6fb6..fa374650 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
@@ -3,8 +3,8 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDestructuringElement;
 import com.intellij.lang.javascript.psi.JSDestructuringObject;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
-import com.intellij.psi.PsiElementVisitor;
 import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
@@ -22,9 +22,9 @@ public JavaSciptDestructuringElementImpl(ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 
 	@RequiredReadAction
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
index b8742213..a6f971d3 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
@@ -3,9 +3,9 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDestructuringObject;
 import com.intellij.lang.javascript.psi.JSDestructuringShorthandedProperty;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
-import com.intellij.psi.PsiElementVisitor;
 import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
@@ -23,9 +23,9 @@ public JavaSciptDestructuringObjectImpl(ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 
 	@RequiredReadAction
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
index 49515eca..a61c5e97 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
@@ -5,7 +5,6 @@
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
@@ -56,9 +55,9 @@ public JSVariableStubBase getStub()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 
 	@RequiredReadAction
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
index 26ad0883..ef08e36c 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
@@ -2,9 +2,9 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDestructuringShorthandedProperty;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
-import com.intellij.psi.PsiElementVisitor;
 import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
@@ -21,9 +21,9 @@ public JavaScriptDestructuringShorthandedPropertyImpl(ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 
 	@Nonnull
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
index 90958305..ce133bdf 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
@@ -16,14 +16,15 @@
 
 package consulo.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
-import com.intellij.psi.PsiElementVisitor;
 import consulo.javascript.psi.JSComputedName;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 03.03.2016
@@ -36,9 +37,9 @@ public JSComputedNameImpl(ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 
 	@Nullable
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
index db6e8829..891c246c 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
@@ -16,20 +16,24 @@
 
 package consulo.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSParameterList;
+import com.intellij.lang.javascript.JSElementTypes;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSExpressionImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
+import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
@@ -69,23 +73,92 @@ public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnul
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
+	{
+		visitor.visitLambdaExpression(this);
+	}
+
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public JSParameterList getParameterList()
+	{
+		return findNotNullChildByClass(JSParameterList.class);
+	}
+
+	@Override
+	public JSSourceElement[] getBody()
 	{
-		if(visitor instanceof JSElementVisitor)
+		final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
+		if(children.length == 0)
 		{
-			((JSElementVisitor) visitor).visitLambdaExpression(this);
+			return JSSourceElement.EMPTY_ARRAY;
 		}
-		else
+		JSSourceElement[] result = new JSSourceElement[children.length];
+		for(int i = 0; i < children.length; i++)
 		{
-			visitor.visitElement(this);
+			result[i] = (JSSourceElement) children[i].getPsi();
 		}
+		return result;
 	}
 
-	@RequiredReadAction
 	@Nonnull
 	@Override
-	public JSParameterList getParameterList()
+	public JavaScriptType getReturnType()
 	{
-		return findNotNullChildByClass(JSParameterList.class);
+		return JavaScriptType.UNKNOWN;
+	}
+
+	@Override
+	public String getReturnTypeString()
+	{
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public JavaScriptTypeElement getReturnTypeElement()
+	{
+		return null;
+	}
+
+	@Override
+	public FunctionKind getKind()
+	{
+		return FunctionKind.SIMPLE;
+	}
+
+	@Override
+	public boolean isDeprecated()
+	{
+		return false;
+	}
+
+	@Nullable
+	@Override
+	public JSAttributeList getAttributeList()
+	{
+		return null;
+	}
+
+	@Override
+	public String getQualifiedName()
+	{
+		return null;
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public PsiElement getNameIdentifier()
+	{
+		return null;
+	}
+
+	@RequiredWriteAction
+	@Override
+	public PsiElement setName(@Nonnull @NonNls String name) throws IncorrectOperationException
+	{
+		return null;
 	}
 }
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java
index 1452c4a7..6b6c35fe 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java
@@ -1,10 +1,10 @@
 package consulo.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSSpreadExpression;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
-import com.intellij.psi.PsiElementVisitor;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.JavaScriptType;
 
@@ -43,8 +43,8 @@ public JavaScriptType getType()
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
index f7ab9e0e..2b2b2163 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
@@ -2,13 +2,15 @@
 
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiRecursiveVisitor;
 
-public class JSRecursiveElementVisitor extends JSElementVisitor {
-    @Override public void visitElement(PsiElement element) {
+public class JSRecursiveElementVisitor extends JSElementVisitor implements PsiRecursiveVisitor
+{
+	@Override
+	public void visitElement(PsiElement element)
+	{
+		super.visitElement(element);
 
-        super.visitElement(element);
-        for (PsiElement child = element.getFirstChild(); child != null; child = child.getNextSibling()) {
-            child.accept(this);
-        }
-    }
+		element.acceptChildren(this);
+	}
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
index cbcc3b62..fbee180a 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
@@ -3,6 +3,7 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSElement;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSStatementImpl;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.ResolveState;
@@ -23,6 +24,12 @@ public ES6ExportDefaultAssignmentImpl(ASTNode node)
 		super(node);
 	}
 
+	@Override
+	protected void accept(@Nonnull JSElementVisitor visitor)
+	{
+		visitor.visitJSElement(this);
+	}
+
 	@Nullable
 	public JSElement getElement()
 	{
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
index 5be80166..ba9d86c3 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
@@ -1,6 +1,7 @@
 package consulo.javascript.ecmascript6.psi.impl;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSStatementImpl;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.ResolveState;
@@ -20,6 +21,12 @@ public ES6ImportDeclarationImpl(ASTNode node)
 		super(node);
 	}
 
+	@Override
+	protected void accept(@Nonnull JSElementVisitor visitor)
+	{
+		visitor.visitJSElement(this);
+	}
+
 	@Override
 	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
 	{
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
index b528719d..3238c1b3 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
@@ -2,9 +2,9 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
@@ -28,9 +28,9 @@ public ES6ImportedBindingImpl(ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 
 	@RequiredReadAction
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
index fc2b5939..b1865686 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
@@ -1,9 +1,9 @@
 package consulo.javascript.ecmascript6.psi.impl;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import consulo.annotation.access.RequiredReadAction;
@@ -24,9 +24,9 @@ public ES6NamedImportsImpl(ASTNode node)
 	}
 
 	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
+	protected void accept(@Nonnull JSElementVisitor visitor)
 	{
-		visitor.visitElement(this);
+		visitor.visitJSElement(this);
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
index cef24453..0c9ba25f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -24,6 +23,8 @@
 import consulo.codeInsight.TargetElementUtilEx;
 import consulo.extensions.CompositeExtensionPointName;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author Maxim.Mossienko
  *         Date: Oct 13, 2008

From e1816c814b6b10a2fb427f262fc28156353264a9 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 13 Jan 2020 08:10:53 +0300
Subject: [PATCH 104/340] fix bug when codestyle settings is not works(old
 codestyle api)

---
 .../formatter/JSSpacingProcessor.java         |  5 ++--
 .../JavascriptFormattingModelBuilder.java     | 11 +++++----
 .../javascript/formatter/blocks/JSBlock.java  | 23 ++++++++-----------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
index 58cdb5aa..92d47ab6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
@@ -26,6 +26,7 @@
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.xml.XmlText;
@@ -38,12 +39,12 @@ public class JSSpacingProcessor extends JSNodeVisitor
 	private ASTNode myParent;
 	private ASTNode myChild1;
 	private ASTNode myChild2;
-	private final CodeStyleSettings mySettings;
+	private final CommonCodeStyleSettings mySettings;
 	private Spacing myResult;
 	private final IElementType type1;
 	private final IElementType type2;
 
-	public JSSpacingProcessor(final ASTNode parent, final ASTNode child1, final ASTNode child2, final CodeStyleSettings settings)
+	public JSSpacingProcessor(final ASTNode parent, final ASTNode child1, final ASTNode child2, final CommonCodeStyleSettings settings)
 	{
 		myParent = parent;
 		myChild1 = child1;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
index 1b5d9a22..d121e0f8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
@@ -19,8 +19,6 @@
  */
 package com.intellij.lang.javascript.formatter;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.formatting.FormattingModel;
 import com.intellij.formatting.FormattingModelBuilder;
 import com.intellij.lang.ASTNode;
@@ -30,6 +28,10 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
+import consulo.javascript.lang.JavaScriptLanguage;
+
+import javax.annotation.Nonnull;
 
 public class JavascriptFormattingModelBuilder implements FormattingModelBuilder
 {
@@ -39,8 +41,9 @@ public FormattingModel createModel(final PsiElement element, final CodeStyleSett
 	{
 		final PsiFile psiFile = element.getContainingFile();
 
-		return new JSFormattingModel(psiFile, settings, new JSBlock(psiFile instanceof JSFile ? psiFile.getNode() : element.getNode(), null, null, null,
-				settings));
+		CommonCodeStyleSettings commonSettings = settings.getCommonSettings(JavaScriptLanguage.INSTANCE);
+
+		return new JSFormattingModel(psiFile, settings, new JSBlock(psiFile instanceof JSFile ? psiFile.getNode() : element.getNode(), null, null, null, commonSettings));
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
index 02492b8b..f6523ee5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
@@ -16,16 +16,7 @@
 
 package com.intellij.lang.javascript.formatter.blocks;
 
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import com.intellij.formatting.Alignment;
-import com.intellij.formatting.Block;
-import com.intellij.formatting.ChildAttributes;
-import com.intellij.formatting.Indent;
-import com.intellij.formatting.Spacing;
-import com.intellij.formatting.Wrap;
+import com.intellij.formatting.*;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -35,10 +26,14 @@
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiErrorElement;
 import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.tree.IElementType;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+
 /**
  * @author ven
  */
@@ -46,14 +41,14 @@ public class JSBlock implements Block
 {
 	private ASTNode myNode;
 
-	private final CodeStyleSettings mySettings;
+	private final CommonCodeStyleSettings mySettings;
 
 	private Alignment myAlignment;
 	private Indent myIndent;
 	private Wrap myWrap;
 	private List<Block> mySubBlocks = null;
 
-	public JSBlock(final ASTNode node, final Alignment alignment, final Indent indent, final Wrap wrap, final CodeStyleSettings settings)
+	public JSBlock(final ASTNode node, final Alignment alignment, final Indent indent, final Wrap wrap, final CommonCodeStyleSettings settings)
 	{
 		myAlignment = alignment;
 		myIndent = indent;
@@ -218,7 +213,7 @@ private boolean isIncomplete(ASTNode node)
 		return isIncomplete(lastChild);
 	}
 
-	public CodeStyleSettings getSettings()
+	public CommonCodeStyleSettings getSettings()
 	{
 		return mySettings;
 	}

From fb91ee3e058ae374fa91e7b0c6539a3c3415d648 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 13 Jan 2020 08:11:03 +0300
Subject: [PATCH 105/340] format

---
 ...onWithInconsistentReturnsJSInspection.java | 308 ++++++++++--------
 1 file changed, 172 insertions(+), 136 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index b2088d4d..d5e36eec 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -1,151 +1,187 @@
 package com.sixrr.inspectjs.validity;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 
-public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspection {
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
-    @Override
-	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("function.with.inconsistent.returns.display.name");
-    }
+public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspection
+{
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME;
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("function.with.inconsistent.returns.display.name");
+	}
 
-    @Override
-	public boolean isEnabledByDefault() {
-        return true;
-    }
-
-    @Override
+	@Override
+	@Nonnull
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.VALIDITY_GROUP_NAME;
+	}
+
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return true;
+	}
+
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
-        final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-        assert function != null;
-        if (functionHasIdentifier(function)) {
-            return InspectionJSBundle.message("function.has.inconsistent.return.points.error.string");
-        } else {
-            return InspectionJSBundle.message("anonymous.function.has.inconsistent.return.points.error.string");
-        }
-    }
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
-
-    private static class Visitor extends BaseInspectionVisitor {
-        @Override
-		protected ProblemHighlightType getProblemHighlightType(PsiElement location) {
-            return location.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 ?
-                   ProblemHighlightType.GENERIC_ERROR:super.getProblemHighlightType(location);
-        }
-        @Override public void visitJSFunctionDeclaration(JSFunction function) {
-            super.visitJSFunctionDeclaration(function);
-            String typeString = function.getReturnTypeString();
-            if (typeString == null && !functionHasReturnValues(function)) {
-                return;
-            }
-            if ("void".equals(typeString) || !functionHasValuelessReturns(function)) {
-                return;
-            }
-            registerFunctionError(function);
-        }
-
-      @Override
-      public void visitJSFunctionExpression(JSFunctionExpression node) {
-        super.visitJSFunctionExpression(node);
-        JSFunction function = node.getFunction();
-        String typeString = function.getReturnTypeString();
-
-        if (typeString != null && !"void".equals(typeString)) {
-          if (functionHasValuelessReturns(function)) {
-            registerFunctionError(function);
-          }
-        }
-      }
-    }
-
-    private static boolean functionHasReturnValues(JSFunction function) {
-        final ReturnValuesVisitor visitor = new ReturnValuesVisitor(function);
-        function.accept(visitor);
-        return visitor.hasReturnValues();
-    }
-
-    private static boolean functionHasValuelessReturns(JSFunction function) {
-        final PsiElement lastChild = function.getLastChild();
-        if (lastChild instanceof JSBlockStatement) {
-            if (ControlFlowUtils.statementMayCompleteNormally((JSStatement) lastChild)) {
-                return true;
-            }
-        }
-        final ValuelessReturnVisitor visitor = new ValuelessReturnVisitor(function);
-        function.acceptChildren(visitor);
-        return visitor.hasValuelessReturns();
-    }
-
-    private static class ReturnValuesVisitor extends JSRecursiveElementVisitor {
-        private final JSFunction function;
-        private boolean hasReturnValues = false;
-
-        ReturnValuesVisitor(JSFunction function) {
-            this.function = function;
-        }
-
-        @Override public void visitJSReturnStatement(JSReturnStatement statement) {
-            super.visitJSReturnStatement(statement);
-            if (statement.getExpression() != null) {
-                final JSFunction containingFunction =
-                        PsiTreeUtil.getParentOfType(statement, JSFunction.class);
-                if (function.equals(containingFunction)) {
-                    hasReturnValues = true;
-                }
-            }
-        }
-
-        public boolean hasReturnValues() {
-            return hasReturnValues;
-        }
-    }
-
-    private static class ValuelessReturnVisitor extends JSRecursiveElementVisitor {
-        private final JSFunction function;
-        private boolean hasValuelessReturns = false;
-
-        ValuelessReturnVisitor(JSFunction function) {
-            this.function = function;
-        }
-
-        @Override public void visitJSReturnStatement(JSReturnStatement statement) {
-            super.visitJSReturnStatement(statement);
-            if (statement.getExpression() == null) {
-                final JSFunction containingFunction =
-                        PsiTreeUtil.getParentOfType(statement, JSFunction.class);
-                if (function.equals(containingFunction)) {
-                    hasValuelessReturns = true;
-                }
-            }
-        }
-
-        @Override public void visitJSFunctionDeclaration(JSFunction function) {
-            // do nothing, so that it doesn't drill into nested functions
-        }
-
-        public boolean hasValuelessReturns() {
-            return hasValuelessReturns;
-        }
-    }
+	protected String buildErrorString(Object... args)
+	{
+		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
+		assert function != null;
+		if(functionHasIdentifier(function))
+		{
+			return InspectionJSBundle.message("function.has.inconsistent.return.points.error.string");
+		}
+		else
+		{
+			return InspectionJSBundle.message("anonymous.function.has.inconsistent.return.points.error.string");
+		}
+	}
+
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
+
+	private static class Visitor extends BaseInspectionVisitor
+	{
+		@Override
+		protected ProblemHighlightType getProblemHighlightType(PsiElement location)
+		{
+			return location.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 ? ProblemHighlightType.GENERIC_ERROR : super.getProblemHighlightType(location);
+		}
+
+		@Override
+		public void visitJSFunctionDeclaration(JSFunction function)
+		{
+			super.visitJSFunctionDeclaration(function);
+			String typeString = function.getReturnTypeString();
+			if(typeString == null && !functionHasReturnValues(function))
+			{
+				return;
+			}
+			if("void".equals(typeString) || !functionHasValuelessReturns(function))
+			{
+				return;
+			}
+			registerFunctionError(function);
+		}
+
+		@Override
+		public void visitJSFunctionExpression(JSFunctionExpression node)
+		{
+			super.visitJSFunctionExpression(node);
+			JSFunction function = node.getFunction();
+			String typeString = function.getReturnTypeString();
+
+			if(typeString != null && !"void".equals(typeString))
+			{
+				if(functionHasValuelessReturns(function))
+				{
+					registerFunctionError(function);
+				}
+			}
+		}
+	}
+
+	private static boolean functionHasReturnValues(JSFunction function)
+	{
+		final ReturnValuesVisitor visitor = new ReturnValuesVisitor(function);
+		function.accept(visitor);
+		return visitor.hasReturnValues();
+	}
+
+	private static boolean functionHasValuelessReturns(JSFunction function)
+	{
+		final PsiElement lastChild = function.getLastChild();
+		if(lastChild instanceof JSBlockStatement)
+		{
+			if(ControlFlowUtils.statementMayCompleteNormally((JSStatement) lastChild))
+			{
+				return true;
+			}
+		}
+		final ValuelessReturnVisitor visitor = new ValuelessReturnVisitor(function);
+		function.acceptChildren(visitor);
+		return visitor.hasValuelessReturns();
+	}
+
+	private static class ReturnValuesVisitor extends JSRecursiveElementVisitor
+	{
+		private final JSFunction function;
+		private boolean hasReturnValues = false;
+
+		ReturnValuesVisitor(JSFunction function)
+		{
+			this.function = function;
+		}
+
+		@Override
+		public void visitJSReturnStatement(JSReturnStatement statement)
+		{
+			super.visitJSReturnStatement(statement);
+			if(statement.getExpression() != null)
+			{
+				final JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
+				if(function.equals(containingFunction))
+				{
+					hasReturnValues = true;
+				}
+			}
+		}
+
+		public boolean hasReturnValues()
+		{
+			return hasReturnValues;
+		}
+	}
+
+	private static class ValuelessReturnVisitor extends JSRecursiveElementVisitor
+	{
+		private final JSFunction function;
+		private boolean hasValuelessReturns = false;
+
+		ValuelessReturnVisitor(JSFunction function)
+		{
+			this.function = function;
+		}
+
+		@Override
+		public void visitJSReturnStatement(JSReturnStatement statement)
+		{
+			super.visitJSReturnStatement(statement);
+			if(statement.getExpression() == null)
+			{
+				final JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
+				if(function.equals(containingFunction))
+				{
+					hasValuelessReturns = true;
+				}
+			}
+		}
+
+		@Override
+		public void visitJSFunctionDeclaration(JSFunction function)
+		{
+			// do nothing, so that it doesn't drill into nested functions
+		}
+
+		public boolean hasValuelessReturns()
+		{
+			return hasValuelessReturns;
+		}
+	}
 }

From 996c0f67eae8454caff22d836cee96aef6a98d8f Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 13 Jan 2020 08:46:27 +0300
Subject: [PATCH 106/340] revert - npe fix

---
 .../javascript/psi/impl/JSSuperExpressionImpl.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
index 1b87d390..fdf3445f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
@@ -21,10 +21,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.ResolveState;
+import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
@@ -51,6 +48,12 @@ protected void accept(@Nonnull JSElementVisitor visitor)
 		visitor.visitJSSuperExpression(this);
 	}
 
+	@Override
+	public PsiReference getReference()
+	{
+		return getReferences()[0];
+	}
+
 	@Override
 	@Nonnull
 	public PsiReference[] getReferences()

From 3dacbec2abcf3d6146e2e763dd883807d79f5bff Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 3 Jun 2020 13:36:08 +0300
Subject: [PATCH 107/340] new disposable

---
 .../DescriptionByAnotherPsiElementService.java                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index b2725092..6bb50353 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -26,7 +26,6 @@
 import javax.inject.Singleton;
 
 import org.jdom.Element;
-import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;
@@ -36,7 +35,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Condition;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
@@ -45,6 +43,8 @@
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
 import com.intellij.util.containers.ContainerUtil;
+import consulo.disposer.Disposable;
+import consulo.disposer.Disposer;
 
 /**
  * @author VISTALL

From 15f09ff2e7a80f4c79b854d56dcdd5caeaca5da7 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 3 Jun 2020 14:21:28 +0300
Subject: [PATCH 108/340] compilation

---
 ...lientJavaScriptMutableModuleExtension.java | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index a5435c31..1bcbf87e 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -1,21 +1,26 @@
 package consulo.javascript.client.module.extension;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.swing.*;
+
 import com.intellij.openapi.projectRoots.Sdk;
+import consulo.disposer.Disposable;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.lang.LanguageVersion;
 import consulo.module.extension.MutableModuleInheritableNamedPointer;
+import consulo.module.extension.swing.SwingMutableModuleExtension;
 import consulo.roots.ModuleRootLayer;
+import consulo.ui.Component;
+import consulo.ui.Label;
 import consulo.ui.annotation.RequiredUIAccess;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.swing.*;
+import consulo.ui.layout.VerticalLayout;
 
 /**
  * @author VISTALL
  * @since 29.06.14
  */
-public class ClientJavaScriptMutableModuleExtension extends ClientJavaScriptModuleExtension implements JavaScriptMutableModuleExtension<ClientJavaScriptModuleExtension>
+public class ClientJavaScriptMutableModuleExtension extends ClientJavaScriptModuleExtension implements JavaScriptMutableModuleExtension<ClientJavaScriptModuleExtension>, SwingMutableModuleExtension
 {
 	public ClientJavaScriptMutableModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootModel)
 	{
@@ -32,7 +37,15 @@ public MutableModuleInheritableNamedPointer<Sdk> getInheritableSdk()
 	@RequiredUIAccess
 	@Nullable
 	@Override
-	public JComponent createConfigurablePanel(@Nonnull Runnable updateOnCheck)
+	public Component createConfigurationComponent(@Nonnull Disposable disposable, @Nonnull Runnable runnable)
+	{
+		return VerticalLayout.create().add(Label.create("Unsupported UI"));
+	}
+
+	@RequiredUIAccess
+	@Nullable
+	@Override
+	public JComponent createConfigurablePanel(@Nonnull Disposable disposable, @Nonnull Runnable runnable)
 	{
 		return new ClientJavaScriptModuleExtensionPanel(this);
 	}

From 52af08aa9028ec03608da3d4e019fad977cd58c8 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Thu, 4 Jun 2020 20:27:52 +0300
Subject: [PATCH 109/340] fix jsx bug with id

---
 .../javascript/lang/EcmaScript6JavaScriptVersion.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 43270012..706a7d80 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -16,6 +16,9 @@
 
 package consulo.javascript.lang;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lexer.Lexer;
@@ -30,9 +33,6 @@
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-
 /**
  * @author VISTALL
  * @since 12.12.2015
@@ -53,7 +53,7 @@ public EcmaScript6JavaScriptVersion()
 
 	protected EcmaScript6JavaScriptVersion(@Nonnull String id)
 	{
-		super("ECMASCRIPT_6");
+		super(id);
 
 		addFeature(JavaScriptFeature.CLASS);
 		addFeature(JavaScriptFeature.BINARY_LITERAL);

From 526cd4fdf6de430e2e47b68667639c453393cad8 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 10 Jun 2020 22:46:33 +0300
Subject: [PATCH 110/340] fix #21

---
 .../messages/JavaScriptBundle.properties      |  1 +
 .../lang/javascript/JSTokenTypes.java         |  1 +
 .../psi/impl/JSForInStatementImpl.java        | 25 ++++-----
 .../javascript/types/JSFileElementType.java   |  2 +-
 .../lang/parsing/StatementParsing.java        |  2 +-
 .../parsing/EcmaScript6StatementParsing.java  | 54 +++++++++++++++++++
 6 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/base-api/src/main/resources/messages/JavaScriptBundle.properties b/base-api/src/main/resources/messages/JavaScriptBundle.properties
index ce9325c0..fe398811 100644
--- a/base-api/src/main/resources/messages/JavaScriptBundle.properties
+++ b/base-api/src/main/resources/messages/JavaScriptBundle.properties
@@ -34,6 +34,7 @@ javascript.parser.message.expected.parameter.name=parameter name expected
 javascript.parser.message.expected.catch.or.default=catch or default expected
 javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration=left hand side expression or variable declaration expected before 'in'
 javascript.parser.message.expected.forloop.in.or.semicolon='in' or ; expected
+javascript.parser.message.expected.forloop.of.or.semicolon='of' or ; expected
 javascript.parser.message.expected.while.keyword=while expected
 javascript.parser.message.expected.comma=, expected
 javascript.parser.message.expected.variable.name=variable name expected
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 7644a657..24f77e2b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -137,6 +137,7 @@ protected Lexer createLexer()
 	IElementType AS_KEYWORD = new JavaScriptContextKeywordElementType("AS_KEYWORD", "as"); // as
 	IElementType GET_KEYWORD = new JavaScriptContextKeywordElementType("GET_KEYWORD", "get"); // GET
 	IElementType SET_KEYWORD = new JavaScriptContextKeywordElementType("SET_KEYWORD", "set"); // SET
+	IElementType OF_KEYWORD = new JavaScriptContextKeywordElementType("OF_KEYWORD", "of"); // of
 	IElementType EACH_KEYWORD = new JSElementType("EACH_KEYWORD");
 	IElementType INT_KEYWORD = new JSElementType("INT_KEYWORD");
 	IElementType UINT_KEYWORD = new JSElementType("UINT_KEYWORD");
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
index fdb0ae55..48aca953 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
@@ -17,12 +17,13 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
+import com.intellij.psi.tree.TokenSet;
+import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
 
@@ -31,10 +32,11 @@
  * User: max
  * Date: Jan 30, 2005
  * Time: 11:20:30 PM
- * To change this template use File | Settings | File Templates.
  */
 public class JSForInStatementImpl extends JSStatementImpl implements JSForInStatement
 {
+	private static final TokenSet ourSeparatorElementType = TokenSet.create(JSTokenTypes.IN_KEYWORD, JSTokenTypes.OF_KEYWORD);
+
 	public JSForInStatementImpl(final ASTNode node)
 	{
 		super(node);
@@ -43,8 +45,7 @@ public JSForInStatementImpl(final ASTNode node)
 	@Override
 	public JSVarStatement getDeclarationStatement()
 	{
-		final ASTNode childNode = getNode().findChildByType(JSElementTypes.VAR_STATEMENT);
-		return childNode == null ? null : (JSVarStatement) childNode.getPsi();
+		return findChildByClass(JSVarStatement.class);
 	}
 
 	@Override
@@ -53,11 +54,11 @@ public JSExpression getVariableExpression()
 		ASTNode child = getNode().getFirstChildNode();
 		while(child != null)
 		{
-			if(child.getElementType() == JSTokenTypes.IN_KEYWORD)
+			if(ourSeparatorElementType.contains(child.getElementType()))
 			{
 				return null;
 			}
-			if(JSElementTypes.EXPRESSIONS.contains(child.getElementType()))
+			if(child.getPsi() instanceof JSExpression)
 			{
 				return (JSExpression) child.getPsi();
 			}
@@ -73,11 +74,11 @@ public JSExpression getCollectionExpression()
 		boolean inPassed = false;
 		while(child != null)
 		{
-			if(child.getElementType() == JSTokenTypes.IN_KEYWORD)
+			if(ourSeparatorElementType.contains(child.getElementType()))
 			{
 				inPassed = true;
 			}
-			if(inPassed && JSElementTypes.EXPRESSIONS.contains(child.getElementType()))
+			if(inPassed && child.getPsi() instanceof JSExpression)
 			{
 				return (JSExpression) child.getPsi();
 			}
@@ -88,9 +89,10 @@ public JSExpression getCollectionExpression()
 	}
 
 	@Override
+	@RequiredReadAction
 	public boolean isForEach()
 	{
-		return getNode().findChildByType(JSTokenTypes.EACH_KEYWORD) != null;
+		return findChildByType(TokenSet.create(JSTokenTypes.EACH_KEYWORD, JSTokenTypes.OF_KEYWORD)) != null ;
 	}
 
 	@Override
@@ -104,7 +106,7 @@ public JSStatement getBody()
 			{
 				passedRParen = true;
 			}
-			else if(passedRParen && JSElementTypes.STATEMENTS.contains(child.getElementType()))
+			else if(passedRParen && child.getPsi() instanceof JSStatement)
 			{
 				return (JSStatement) child.getPsi();
 			}
@@ -115,8 +117,7 @@ else if(passedRParen && JSElementTypes.STATEMENTS.contains(child.getElementType(
 	}
 
 	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
+	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
 	{
 		if(lastParent != null)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index 1f993722..62cb03b2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -91,7 +91,7 @@ public String getExternalId()
 	@Override
 	public int getStubVersion()
 	{
-		int version = 42;
+		int version = 43;
 		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList())
 		{
 			version += javaScriptIndexer.getVersion();
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 5300ada2..7be7f18b 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -549,7 +549,7 @@ private void parseForStatement(final PsiBuilder builder)
 		statement.done(forin ? JSElementTypes.FOR_IN_STATEMENT : JSElementTypes.FOR_STATEMENT);
 	}
 
-	boolean parseForLoopHeader(final PsiBuilder builder)
+	protected boolean parseForLoopHeader(final PsiBuilder builder)
 	{
 		builder.advanceLexer();
 		if(builder.getTokenType() == JSTokenTypes.EACH_KEYWORD)
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index 33d0bac4..a19f7382 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -92,6 +92,60 @@ else if(nextType == JSTokenTypes.VAR_KEYWORD ||
 		}
 	}
 
+	@Override
+	protected boolean parseForLoopHeader(final PsiBuilder builder)
+	{
+		builder.advanceLexer();
+
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		final boolean empty;
+		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD)
+		{
+			parseVarStatement(builder, true);
+			empty = false;
+		}
+		else
+		{
+			empty = !getExpressionParsing().parseExpressionOptional(builder, false);
+		}
+
+		boolean forin = false;
+		if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
+		{
+			builder.advanceLexer();
+			getExpressionParsing().parseExpressionOptional(builder);
+
+			if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
+			{
+				builder.advanceLexer();
+			}
+			else
+			{
+				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.semicolon"));
+			}
+			getExpressionParsing().parseExpressionOptional(builder);
+		}
+		else if(isContextKeyword(builder, JSTokenTypes.OF_KEYWORD))
+		{
+			forin = true;
+			if(empty)
+			{
+				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration"));
+			}
+			advanceContextKeyword(builder, JSTokenTypes.OF_KEYWORD);
+
+			getExpressionParsing().parseExpression(builder);
+		}
+		else
+		{
+
+			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.of.or.semicolon"));
+		}
+
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		return forin;
+	}
+
 	@Override
 	protected void doParseStatement(PsiBuilder builder, boolean canHaveClasses)
 	{

From aa9fd43e77c0d10c0b4bad608e221028973d7e31 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 14 Jun 2020 13:57:58 +0300
Subject: [PATCH 111/340] add pusher for js version

---
 .../javascript/lang/JavaScriptLanguage.java   |  29 ++-
 .../lang/JavaScriptLanguageVersionPusher.java | 186 ++++++++++++++++++
 plugin/src/main/resources/META-INF/plugin.xml |   2 +
 3 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionPusher.java

diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
index aea26664..e7671c28 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
@@ -16,10 +16,15 @@
 
 package consulo.javascript.lang;
 
-import javax.annotation.Nullable;
 import com.intellij.lang.Language;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.openapi.fileTypes.LanguageFileType;
+import consulo.lang.LanguageVersion;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author VISTALL
@@ -29,11 +34,33 @@ public class JavaScriptLanguage extends Language
 {
 	public static final JavaScriptLanguage INSTANCE = new JavaScriptLanguage();
 
+	private Map<String, LanguageVersion> myVersionsById = new HashMap<>();
+
 	public JavaScriptLanguage()
 	{
 		super("JavaScript", "text/javascript", "application/javascript");
 	}
 
+	@Nullable
+	public LanguageVersion getVersionById(@Nonnull String id)
+	{
+		Map<String, LanguageVersion> oldMap = myVersionsById;
+		if(oldMap == null)
+		{
+			Map<String, LanguageVersion> newMap = new HashMap<>();
+			for(LanguageVersion version : getVersions())
+			{
+				newMap.put(version.getId(), version);
+			}
+
+			myVersionsById = newMap;
+
+			return newMap.get(id);
+		}
+
+		return oldMap.get(id);
+	}
+
 	@Nullable
 	@Override
 	public LanguageFileType getAssociatedFileType()
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionPusher.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionPusher.java
new file mode 100644
index 00000000..7044c188
--- /dev/null
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionPusher.java
@@ -0,0 +1,186 @@
+package consulo.javascript.lang;
+
+import com.intellij.lang.javascript.JavaScriptFileType;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtilCore;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.impl.FilePropertyPusher;
+import com.intellij.openapi.roots.impl.PushedFilePropertiesUpdater;
+import com.intellij.openapi.util.Conditions;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.newvfs.FileAttribute;
+import com.intellij.util.messages.MessageBus;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.lang.LanguageVersion;
+import consulo.module.extension.ModuleExtension;
+import consulo.util.dataholder.Key;
+import consulo.util.lang.ObjectUtil;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author VISTALL
+ * @since 2020-06-14
+ */
+public class JavaScriptLanguageVersionPusher implements FilePropertyPusher<LanguageVersion>
+{
+	private static final FileAttribute ourFileAttribute = new FileAttribute("javascript-version", 2, false);
+
+	private static final Key<Set<String>> ourChangedModulesKey = Key.create("javascript-change-marker");
+
+	@Override
+	public void initExtra(@Nonnull Project project, @Nonnull MessageBus messageBus)
+	{
+		project.getMessageBus().connect().subscribe(ModuleExtension.CHANGE_TOPIC, (oldExtension, newExtension) ->
+		{
+			if(oldExtension instanceof JavaScriptModuleExtension && newExtension instanceof JavaScriptModuleExtension)
+			{
+				if(((JavaScriptModuleExtension) oldExtension).getLanguageVersion() != ((JavaScriptModuleExtension) newExtension).getLanguageVersion())
+				{
+					addChanged(project, newExtension);
+				}
+			}
+		});
+	}
+
+	private void addChanged(Project project, ModuleExtension<?> newExtension)
+	{
+		Set<String> changedModules = project.getUserData(ourChangedModulesKey);
+		if(changedModules == null)
+		{
+			changedModules = new HashSet<>();
+		}
+
+		project.putUserData(ourChangedModulesKey, changedModules);
+
+		changedModules.add(newExtension.getModule().getName());
+	}
+
+	@Nonnull
+	@Override
+	public Key<LanguageVersion> getFileDataKey()
+	{
+		return LanguageVersion.KEY;
+	}
+
+	@Override
+	public boolean pushDirectoriesOnly()
+	{
+		return false;
+	}
+
+	@Nonnull
+	@Override
+	public LanguageVersion getDefaultValue()
+	{
+		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
+	}
+
+	@Nullable
+	@Override
+	@RequiredReadAction
+	public LanguageVersion getImmediateValue(@Nonnull Project project, @Nullable VirtualFile virtualFile)
+	{
+		if(virtualFile == null)
+		{
+			return getDefaultValue();
+		}
+
+		Module moduleForFile = ModuleUtilCore.findModuleForFile(virtualFile, project);
+		return moduleForFile == null ? getDefaultValue() : getImmediateValue(moduleForFile);
+	}
+
+	@Nullable
+	@Override
+	@RequiredReadAction
+	public LanguageVersion getImmediateValue(@Nonnull Module module)
+	{
+		JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
+		if(extension != null)
+		{
+			return extension.getLanguageVersion();
+		}
+		return getDefaultValue();
+	}
+
+	@Override
+	public boolean acceptsFile(@Nonnull VirtualFile virtualFile)
+	{
+		return virtualFile.getFileType() == JavaScriptFileType.INSTANCE;
+	}
+
+	@Override
+	public boolean acceptsDirectory(@Nonnull VirtualFile virtualFile, @Nonnull Project project)
+	{
+		return false;
+	}
+
+	@Override
+	public void persistAttribute(@Nonnull Project project, @Nonnull VirtualFile virtualFile, @Nonnull LanguageVersion newAttribute) throws IOException
+	{
+		DataInputStream inputStream = ourFileAttribute.readAttribute(virtualFile);
+		if(inputStream != null)
+		{
+			try
+			{
+				LanguageVersion oldAttribute = read(inputStream);
+				if(oldAttribute.equals(newAttribute) && oldAttribute != getDefaultValue())
+				{
+					return;
+				}
+			}
+			catch(IOException e)
+			{
+				inputStream.close();
+			}
+		}
+
+		if(newAttribute != getDefaultValue() || inputStream != null)
+		{
+			try (DataOutputStream oStream = ourFileAttribute.writeAttribute(virtualFile))
+			{
+				write(newAttribute, oStream);
+			}
+
+			PushedFilePropertiesUpdater.getInstance(project).filePropertiesChanged(virtualFile, Conditions.alwaysTrue());
+		}
+	}
+
+	@Override
+	public void afterRootsChanged(@Nonnull Project project)
+	{
+		Set<String> changedModules = project.getUserData(ourChangedModulesKey);
+		if(changedModules == null)
+		{
+			return;
+		}
+
+		project.putUserData(ourChangedModulesKey, null);
+
+		if(!changedModules.isEmpty())
+		{
+			PushedFilePropertiesUpdater.getInstance(project).pushAll(this);
+		}
+	}
+
+	@Nonnull
+	private LanguageVersion read(DataInputStream stream) throws IOException
+	{
+		String id = stream.readUTF();
+		LanguageVersion version = JavaScriptLanguage.INSTANCE.getVersionById(id);
+		return ObjectUtil.notNull(version, getDefaultValue());
+
+	}
+
+	private void write(LanguageVersion jsVersion, DataOutputStream stream) throws IOException
+	{
+		stream.writeUTF(jsVersion.getId());
+	}
+}
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 0f8463e4..6d4f3dc9 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -149,6 +149,8 @@
 		<inspectionToolProvider implementation="com.intellij.lang.javascript.inspections.JSInspectionToolProvider"/>
 		<inspectionToolProvider implementation="com.sixrr.inspectjs.InspectionJSPlugin" />
 
+		<filePropertyPusher implementation="consulo.javascript.lang.JavaScriptLanguageVersionPusher" />
+
 		<targetElementUtilEx implementation="com.intellij.lang.javascript.JavaScriptTargetElementUtilEx"/>
 
 		<findUsagesHandlerFactory implementation="consulo.javascript.findUsages.JavaScriptFindUsagesHandlerFactory"/>

From 43065d7e0ea65edec6cc5549c5b37fa57319cdf2 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 14 Jun 2020 15:38:12 +0300
Subject: [PATCH 112/340] move to jsx

---
 .../javascript/jsx/JSXFileTypeFactory.java    | 20 +++++++++++++++++++
 .../lang/JavaScriptFileTypeFactory.java       |  1 -
 plugin/src/main/resources/META-INF/jsx.xml    |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
new file mode 100644
index 00000000..85c80832
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
@@ -0,0 +1,20 @@
+package consulo.javascript.jsx;
+
+import com.intellij.lang.javascript.JavaScriptFileType;
+import com.intellij.openapi.fileTypes.FileTypeConsumer;
+import com.intellij.openapi.fileTypes.FileTypeFactory;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2020-06-14
+ */
+public class JSXFileTypeFactory extends FileTypeFactory
+{
+	@Override
+	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
+	{
+		consumer.consume(JavaScriptFileType.INSTANCE, "jsx");
+	}
+}
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
index bf3204e9..8a462e93 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
@@ -32,6 +32,5 @@ public class JavaScriptFileTypeFactory extends FileTypeFactory
 	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
 	{
 		consumer.consume(JavaScriptFileType.INSTANCE);
-		consumer.consume(JavaScriptFileType.INSTANCE, "jsx");
 	}
 }
diff --git a/plugin/src/main/resources/META-INF/jsx.xml b/plugin/src/main/resources/META-INF/jsx.xml
index 153eec4d..4eb3391a 100644
--- a/plugin/src/main/resources/META-INF/jsx.xml
+++ b/plugin/src/main/resources/META-INF/jsx.xml
@@ -9,6 +9,8 @@
 
 		<createFromTemplateHandler implementation="consulo.javascript.jsx.fileTemplate.JSXCreateFromTemplateHandler" />
 
+		<fileTypeFactory implementation="consulo.javascript.jsx.JSXFileTypeFactory" />
+
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.jsx.language.JSXJavaScriptVersion"/>
 
 		<breadcrumbsInfoProvider implementation="consulo.javascript.jsx.codeInsight.breadcrumbs.JSXLanguageBreadcrumbsInfoProvider"/>

From f68f425a9d3211443271c93b51b82fa3786c2482 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 14 Jun 2020 17:47:40 +0300
Subject: [PATCH 113/340] reduce usage of toketset with searching elements by
 class

---
 .../documentation/JSDocumentationUtils.java   | 28 ++++++++-----------
 .../impl/JSArrayLiteralExpressionImpl.java    |  3 +-
 .../psi/impl/JSBinaryExpressionImpl.java      |  7 +++--
 .../psi/impl/JSBlockStatementImpl.java        |  9 +-----
 .../javascript/psi/impl/JSCaseClauseImpl.java | 12 ++------
 .../javascript/psi/impl/JSCatchBlockImpl.java |  3 +-
 .../psi/impl/JSDoWhileStatementImpl.java      |  7 ++---
 .../psi/impl/JSForStatementImpl.java          |  2 +-
 ...JSIndexedPropertyAccessExpressionImpl.java |  5 ++--
 .../psi/impl/JSLabeledStatementImpl.java      |  4 +--
 .../psi/impl/JSLetStatementImpl.java          | 20 ++-----------
 .../psi/impl/JSPrefixExpressionImpl.java      |  4 +--
 .../psi/impl/JSSwitchStatementImpl.java       | 11 ++------
 .../psi/impl/JSThrowStatementImpl.java        |  4 +--
 .../psi/impl/JSTryStatementImpl.java          |  4 +--
 .../psi/impl/JSYieldStatementImpl.java        |  4 +--
 .../javascript/psi/resolve/JSResolveUtil.java |  3 +-
 .../JSMergeParallelForInLoopsIntention.java   | 24 ++++++++--------
 .../lang/EcmaScript6JavaScriptVersion.java    |  7 +++--
 .../formatter/JSSpacingProcessor.java         |  9 ++++--
 .../formatter/blocks/SubBlockVisitor.java     |  7 ++---
 .../surroundWith/JSWithForSurrounder.java     |  6 ++--
 22 files changed, 63 insertions(+), 120 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
index b453ffb1..f921fd99 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
@@ -22,16 +22,6 @@
  */
 package com.intellij.javascript.documentation;
 
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.codeInsight.documentation.DocumentationManager;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -40,15 +30,21 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.TokenType;
+import com.intellij.psi.*;
 import com.intellij.psi.templateLanguages.OuterLanguageElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class JSDocumentationUtils
 {
@@ -454,7 +450,7 @@ ASTNode findTrailingCommentInFunctionBody(final @Nonnull JSFunction function)
 			{
 				return block.findChildByType(JSTokenTypes.COMMENTS, prev);
 			}
-			else if(JSElementTypes.STATEMENTS.contains(prev.getElementType()))
+			else if(prev.getPsi() instanceof JSStatement)
 			{
 				break;
 			}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
index 4cb7acff..462cbb26 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -51,7 +50,7 @@ public JSExpression[] getExpressions()
 		while(child != null)
 		{
 			final IElementType type = child.getElementType();
-			if(JSElementTypes.EXPRESSIONS.contains(type))
+			if(child.getPsi() instanceof JSExpression)
 			{
 				result.add((JSExpression) child.getPsi());
 				wasExpression = true;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
index 762fbfe6..26f8b536 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
@@ -27,6 +27,7 @@
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import com.intellij.psi.util.PsiTreeUtil;
 
 import javax.annotation.Nonnull;
 
@@ -51,12 +52,12 @@ public JSBinaryExpressionImpl(final ASTNode node)
 	public JSExpression getLOperand()
 	{
 		final ASTNode astNode = getNode();
-		final ASTNode firstExpression = astNode.findChildByType(JSElementTypes.EXPRESSIONS);
-		if(firstExpression != null && astNode.findChildByType(BINARY_OPERATIONS, firstExpression) == null)
+		final JSExpression firstExpression = PsiTreeUtil.findChildOfType(astNode.getPsi(), JSExpression.class);
+		if(firstExpression != null && astNode.findChildByType(BINARY_OPERATIONS, firstExpression.getNode()) == null)
 		{
 			return null; // =a
 		}
-		return firstExpression != null ? (JSExpression) firstExpression.getPsi() : null;
+		return firstExpression != null ? firstExpression : null;
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
index 46755922..c9c22fa6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -46,13 +45,7 @@ public JSBlockStatementImpl(final ASTNode node)
 	@Override
 	public JSStatement[] getStatements()
 	{
-		final ASTNode[] nodes = getNode().getChildren(JSElementTypes.STATEMENTS);
-		final JSStatement[] statements = new JSStatement[nodes.length];
-		for(int i = 0; i < statements.length; i++)
-		{
-			statements[i] = (JSStatement) nodes[i].getPsi();
-		}
-		return statements;
+		return findChildrenByClass(JSStatement.class);
 	}
 
 	public JSLabeledStatement setLabel(String label)
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
index cbea337a..3564ec14 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -53,20 +52,13 @@ public JSExpression getCaseExpression()
 		{
 			return null;
 		}
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
 	public JSStatement[] getStatements()
 	{
-		final ASTNode[] nodes = getNode().getChildren(JSElementTypes.STATEMENTS);
-		final JSStatement[] statements = new JSStatement[nodes.length];
-		for(int i = 0; i < statements.length; i++)
-		{
-			statements[i] = (JSStatement) nodes[i].getPsi();
-		}
-		return statements;
+		return findChildrenByClass(JSStatement.class);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
index 40790ec2..aa9f1b34 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
@@ -53,8 +53,7 @@ public JSParameter getParameter()
 	@Override
 	public JSStatement getStatement()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.STATEMENTS);
-		return node != null ? (JSStatement) node.getPsi() : null;
+		return findChildByClass(JSStatement.class);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
index 718701c1..a38fedd1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSDoWhileStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -42,15 +41,13 @@ public JSDoWhileStatementImpl(final ASTNode node)
 	@Override
 	public JSExpression getCondition()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
 	public JSStatement getBody()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.STATEMENTS);
-		return node != null ? (JSStatement) node.getPsi() : null;
+		return findChildByClass(JSStatement.class);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
index 9d1d4470..339d3a89 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
@@ -117,7 +117,7 @@ public JSStatement getBody()
 			{
 				passedRParen = true;
 			}
-			else if(passedRParen && JSElementTypes.STATEMENTS.contains(child.getElementType()))
+			else if(passedRParen && child.getPsi() instanceof JSStatement)
 			{
 				return (JSStatement) child.getPsi();
 			}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
index 70d0e36e..c6c7eac2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -51,7 +50,7 @@ public JSExpression getQualifier()
 			{
 				return null;
 			}
-			if(JSElementTypes.EXPRESSIONS.contains(type))
+			if(child.getPsi() instanceof JSExpression)
 			{
 				return (JSExpression) child.getPsi();
 			}
@@ -72,7 +71,7 @@ public JSExpression getIndexExpression()
 			{
 				bracketPassed = true;
 			}
-			if(bracketPassed && JSElementTypes.EXPRESSIONS.contains(type))
+			if(bracketPassed && child.getPsi() instanceof JSExpression)
 			{
 				return (JSExpression) child.getPsi();
 			}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
index 5f26633a..aeb13012 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
@@ -57,8 +56,7 @@ public PsiElement getLabelIdentifier()
 	@Override
 	public JSStatement getStatement()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.STATEMENTS);
-		return node != null ? (JSStatement) node.getPsi() : null;
+		return findChildByClass(JSStatement.class);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
index a14e72eb..68ceb2d6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -44,27 +43,12 @@ protected void accept(@Nonnull JSElementVisitor visitor)
 	@Override
 	public JSExpression[] getExpressions()
 	{
-		final ASTNode[] children = getNode().getChildren(JSElementTypes.EXPRESSIONS);
-		if(children.length == 0)
-		{
-			return JSExpression.EMPTY_ARRAY;
-		}
-		JSExpression[] result = new JSExpression[children.length];
-		for(int i = 0; i < children.length; i++)
-		{
-			result[i] = (JSExpression) children[i].getPsi();
-		}
-		return result;
+		return findChildrenByClass(JSExpression.class);
 	}
 
 	@Override
 	public JSBlockStatement getBody()
 	{
-		final ASTNode child = getNode().findChildByType(JSElementTypes.BLOCK_STATEMENT);
-		if(child == null)
-		{
-			return null;
-		}
-		return (JSBlockStatement) child.getPsi();
+		return findChildByClass(JSBlockStatement.class);
 	}
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index 430d308e..9858a877 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -47,8 +46,7 @@ public JSPrefixExpressionImpl(final ASTNode node)
 	@Override
 	public JSExpression getExpression()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Nullable
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
index 44dbb078..1e961a30 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
@@ -45,20 +45,13 @@ public JSSwitchStatementImpl(final ASTNode node)
 	@Override
 	public JSExpression getSwitchExpression()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
 	public JSCaseClause[] getCaseClauses()
 	{
-		final ASTNode[] nodes = getNode().getChildren(CASE_CLAUSE_FILTER);
-		final JSCaseClause[] clauses = new JSCaseClause[nodes.length];
-		for(int i = 0; i < clauses.length; i++)
-		{
-			clauses[i] = (JSCaseClause) nodes[i].getPsi();
-		}
-		return clauses;
+		return findChildrenByClass(JSCaseClause.class);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
index 76cc595d..bda7854d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSThrowStatement;
@@ -41,8 +40,7 @@ public JSThrowStatementImpl(final ASTNode node)
 	@Override
 	public JSExpression getExpression()
 	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return node != null ? (JSExpression) node.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
index d75a4d8f..036aad32 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
@@ -52,7 +52,7 @@ public JSStatement getStatement()
 		while(child != null)
 		{
 			final IElementType type = child.getElementType();
-			if(JSElementTypes.STATEMENTS.contains(type))
+			if(child.getPsi() instanceof JSStatement)
 			{
 				return (JSStatement) child.getPsi();
 			}
@@ -91,7 +91,7 @@ public JSStatement getFinallyStatement()
 		while(child != null)
 		{
 			final IElementType type = child.getElementType();
-			if(foundFinally && JSElementTypes.STATEMENTS.contains(type))
+			if(foundFinally && child.getPsi() instanceof JSStatement)
 			{
 				return (JSStatement) child.getPsi();
 			}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
index 7d16ea44..fbe7adb5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSYieldStatement;
@@ -37,8 +36,7 @@ public JSYieldStatementImpl(final ASTNode node)
 	@Override
 	public JSExpression getExpression()
 	{
-		final ASTNode expressionNode = getNode().findChildByType(JSElementTypes.EXPRESSIONS);
-		return expressionNode != null ? (JSExpression) expressionNode.getPsi() : null;
+		return findChildByClass(JSExpression.class);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 2085c5fc..9493e92b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -2277,8 +2277,7 @@ private void startVisiting(JSElement jsElement)
 					final JSSourceElement[] body = ((JSFunction) jsElement).getBody();
 					if(body.length > 0 && body[0] instanceof JSBlockStatement)
 					{
-						final ASTNode node = body[0].getNode().findChildByType(JSElementTypes.STATEMENTS);
-						first = node != null ? node.getPsi() : null;
+						first = PsiTreeUtil.findChildOfType(body[0], JSStatement.class);
 					}
 				}
 				else if(jsElement instanceof JSFile)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index 7f7e9c3a..f960f980 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -15,8 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention.loop;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSForInStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import com.intellij.lang.javascript.psi.JSVarStatement;
+import com.intellij.psi.PsiElement;
+import com.intellij.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -25,15 +31,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSForInStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.ASTNode;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
 public class JSMergeParallelForInLoopsIntention extends JSIntention {
 
@@ -145,7 +143,7 @@ private static JSExpression getCollectionExpression(JSForInStatement forInStatem
             if (child.getElementType() == JSTokenTypes.IN_KEYWORD) {
                 inPassed = true;
             }
-            if (inPassed && JSElementTypes.EXPRESSIONS.contains(child.getElementType())) {
+            if (inPassed && child.getPsi() instanceof JSExpression) {
                 return (JSExpression) child.getPsi();
             }
             child = child.getTreeNext();
@@ -168,7 +166,7 @@ private static JSExpression getVariableExpression(JSForInStatement forInStatemen
                 return null;
             }
 
-            if (JSElementTypes.EXPRESSIONS.contains(child.getElementType())) {
+            if (child.getPsi() instanceof JSExpression) {
                 return (JSExpression) child.getPsi();
             }
             child = child.getTreeNext();
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 706a7d80..5ec77ce7 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -16,9 +16,6 @@
 
 package consulo.javascript.lang;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lexer.Lexer;
@@ -33,6 +30,9 @@
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+
 /**
  * @author VISTALL
  * @since 12.12.2015
@@ -69,6 +69,7 @@ public String getPresentableName()
 	{
 		return "ECMAScript 6";
 	}
+
 	@Nonnull
 	@Override
 	public Lexer createLexer()
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
index 92d47ab6..08fd8b33 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSNodeVisitor;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.openapi.util.TextRange;
@@ -29,6 +30,8 @@
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.psi.xml.XmlText;
 
 /**
@@ -95,10 +98,10 @@ public void visitArrayLiteralExpression(final ASTNode node)
 
 	private boolean shouldFormatArrayLiteralExpression()
 	{
-		ASTNode node = myParent.findChildByType(JSElementTypes.EXPRESSIONS);
-		if(node != null)
+		JSExpression jsExpression = PsiTreeUtil.findChildOfType(myParent.getPsi(), JSExpression.class);
+		if(jsExpression != null)
 		{
-			IElementType type = node.getElementType();
+			IElementType type = PsiUtilCore.getElementType(jsExpression);
 			return type == JSElementTypes.ARRAY_LITERAL_EXPRESSION || type == JSElementTypes.OBJECT_LITERAL_EXPRESSION;
 		}
 		return false;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
index 442c1f33..6946ac99 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
@@ -23,10 +23,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
 import com.intellij.lang.javascript.formatter.JSSpacingProcessor;
-import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSLoopStatement;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.types.JSFileElementType;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiWhiteSpace;
@@ -210,7 +207,7 @@ private Indent getIndent(final ASTNode node, final ASTNode child)
 
 		if(nodeElementType == JSElementTypes.CASE_CLAUSE)
 		{
-			if(JSElementTypes.STATEMENTS.contains(childElementType) || JSTokenTypes.COMMENTS.contains(childElementType))
+			if(child.getPsi() instanceof JSStatement || JSTokenTypes.COMMENTS.contains(childElementType))
 			{
 				return Indent.getNormalIndent();
 			}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
index 0f892dc7..a28531be 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
@@ -17,9 +17,9 @@
 package com.intellij.lang.javascript.surroundWith;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.JavaScriptBundle;
+import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
@@ -61,7 +61,7 @@ protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
 		{
 			if(childNode.getElementType() == JSTokenTypes.SEMICOLON ||
 					childNode.getPsi() instanceof PsiWhiteSpace ||
-					JSElementTypes.EXPRESSIONS.contains(childNode.getElementType()))
+					childNode.getPsi() instanceof JSExpression)
 			{
 				statementNode.removeChild(childNode);
 			}

From 62d1456d870ba5af91476cbc73b7af955a69b1f8 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 16 Jun 2020 09:15:10 +0300
Subject: [PATCH 114/340] browser debug stub

---
 debugger/browser-debugger-impl/pom.xml        | 57 ++++++++++++
 .../JavaScriptBrowserConfiguration.java       | 88 +++++++++++++++++++
 .../JavaScriptBrowserConfigurationEditor.java | 37 ++++++++
 .../JavaScriptBrowserConfigurationType.java   | 39 ++++++++
 .../browser/JavaScriptBrowserDebugRunner.java | 27 ++++++
 .../transport/ExtensionWebSocketAccepter.java | 25 ++++++
 .../JavaScriptLineBreakpointType.java         |  7 +-
 plugin/pom.xml                                |  6 ++
 plugin/src/main/resources/META-INF/plugin.xml | 12 ++-
 pom.xml                                       |  1 +
 10 files changed, 292 insertions(+), 7 deletions(-)
 create mode 100644 debugger/browser-debugger-impl/pom.xml
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java

diff --git a/debugger/browser-debugger-impl/pom.xml b/debugger/browser-debugger-impl/pom.xml
new file mode 100644
index 00000000..e036b09c
--- /dev/null
+++ b/debugger/browser-debugger-impl/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-provided</artifactId>
+		<version>2-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-browser.debugger.impl</artifactId>
+	<version>2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java
new file mode 100644
index 00000000..d6259d8c
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java
@@ -0,0 +1,88 @@
+package consulo.javascript.debugger.browser;
+
+import com.intellij.compiler.options.CompileStepBeforeRun;
+import com.intellij.execution.DefaultExecutionResult;
+import com.intellij.execution.ExecutionException;
+import com.intellij.execution.ExecutionResult;
+import com.intellij.execution.Executor;
+import com.intellij.execution.configurations.*;
+import com.intellij.execution.filters.TextConsoleBuilder;
+import com.intellij.execution.filters.TextConsoleBuilderFactory;
+import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.execution.runners.ProgramRunner;
+import com.intellij.execution.runners.RunConfigurationWithSuppressedDefaultRunAction;
+import com.intellij.execution.ui.ConsoleView;
+import com.intellij.ide.browsers.BrowserFamily;
+import com.intellij.ide.browsers.BrowserLauncher;
+import com.intellij.ide.browsers.WebBrowser;
+import com.intellij.ide.browsers.WebBrowserManager;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleManager;
+import com.intellij.openapi.options.SettingsEditor;
+import com.intellij.xdebugger.DefaultDebugProcessHandler;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * @author VISTALL
+ * @since 2020-06-15
+ */
+public class JavaScriptBrowserConfiguration extends ModuleBasedConfiguration<RunConfigurationModule> implements RunConfigurationWithSuppressedDefaultRunAction, CompileStepBeforeRun.Suppressor
+{
+	public JavaScriptBrowserConfiguration(String name, RunConfigurationModule configurationModule, ConfigurationFactory factory)
+	{
+		super(name, configurationModule, factory);
+	}
+
+	public JavaScriptBrowserConfiguration(RunConfigurationModule configurationModule, ConfigurationFactory factory)
+	{
+		super(configurationModule, factory);
+	}
+
+	@Override
+	@RequiredReadAction
+	public Collection<Module> getValidModules()
+	{
+		ModuleManager manager = ModuleManager.getInstance(getProject());
+		return Arrays.asList(manager.getModules());
+	}
+
+	@Nonnull
+	@Override
+	public SettingsEditor<? extends RunConfiguration> getConfigurationEditor()
+	{
+		return new JavaScriptBrowserConfigurationEditor();
+	}
+
+	@Nullable
+	@Override
+	public RunProfileState getState(@Nonnull Executor executor, @Nonnull ExecutionEnvironment environment) throws ExecutionException
+	{
+		return new RunProfileState()
+		{
+			@Nullable
+			@Override
+			public ExecutionResult execute(Executor executor, @Nonnull ProgramRunner programRunner) throws ExecutionException
+			{
+				TextConsoleBuilder builder = TextConsoleBuilderFactory.getInstance().createBuilder(environment.getProject());
+
+				ConsoleView console = builder.getConsole();
+
+				WebBrowser browser = WebBrowserManager.getInstance().getFirstBrowserOrNull(BrowserFamily.CHROME);
+
+				if(browser == null)
+				{
+					throw new ExecutionException("Can't find Chrome browser");
+				}
+
+				BrowserLauncher.getInstance().browse("http://localhost", browser, environment.getProject());
+
+				return new DefaultExecutionResult(console, new DefaultDebugProcessHandler());
+			}
+		};
+	}
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java
new file mode 100644
index 00000000..6128fc69
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java
@@ -0,0 +1,37 @@
+package consulo.javascript.debugger.browser;
+
+import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.options.SettingsEditor;
+import consulo.ui.Component;
+import consulo.ui.Label;
+import consulo.ui.annotation.RequiredUIAccess;
+import consulo.ui.layout.VerticalLayout;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2020-06-15
+ */
+public class JavaScriptBrowserConfigurationEditor extends SettingsEditor<JavaScriptBrowserConfiguration>
+{
+	@Nullable
+	@Override
+	@RequiredUIAccess
+	protected Component createUIComponent()
+	{
+		return VerticalLayout.create().add(Label.create("test"));
+	}
+
+	@Override
+	protected void resetEditorFrom(JavaScriptBrowserConfiguration javaScriptBrowserConfiguration)
+	{
+
+	}
+
+	@Override
+	protected void applyEditorTo(JavaScriptBrowserConfiguration javaScriptBrowserConfiguration) throws ConfigurationException
+	{
+
+	}
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java
new file mode 100644
index 00000000..33d66b6b
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java
@@ -0,0 +1,39 @@
+package consulo.javascript.debugger.browser;
+
+import com.intellij.execution.configurations.ConfigurationFactory;
+import com.intellij.execution.configurations.ConfigurationTypeBase;
+import com.intellij.execution.configurations.RunConfiguration;
+import com.intellij.execution.configurations.RunConfigurationModule;
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.project.Project;
+import consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.module.extension.ModuleExtensionHelper;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2020-06-15
+ */
+public class JavaScriptBrowserConfigurationType extends ConfigurationTypeBase
+{
+	public JavaScriptBrowserConfigurationType()
+	{
+		super("JavaScriptBrowserConfigurationType", "JavaScript Debug", "", AllIcons.RunConfigurations.Web_app);
+
+		addFactory(new ConfigurationFactory(this)
+		{
+			@Override
+			public RunConfiguration createTemplateConfiguration(Project project)
+			{
+				return new JavaScriptBrowserConfiguration(new RunConfigurationModule(project), this);
+			}
+
+			@Override
+			public boolean isApplicable(@Nonnull Project project)
+			{
+				return ModuleExtensionHelper.getInstance(project).hasModuleExtension(JavaScriptModuleExtension.class);
+			}
+		});
+	}
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
new file mode 100644
index 00000000..6f51fcfc
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
@@ -0,0 +1,27 @@
+package consulo.javascript.debugger.browser;
+
+import com.intellij.execution.configurations.RunProfile;
+import com.intellij.execution.executors.DefaultDebugExecutor;
+import com.intellij.execution.runners.DefaultProgramRunner;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2020-06-15
+ */
+public class JavaScriptBrowserDebugRunner extends DefaultProgramRunner
+{
+	@Nonnull
+	@Override
+	public String getRunnerId()
+	{
+		return "browser-javascript-debug";
+	}
+
+	@Override
+	public boolean canRun(@Nonnull String executorId, @Nonnull RunProfile runProfile)
+	{
+		return  executorId.equals(DefaultDebugExecutor.EXECUTOR_ID) && runProfile instanceof JavaScriptBrowserConfiguration;
+	}
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
new file mode 100644
index 00000000..efa9b8b7
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
@@ -0,0 +1,25 @@
+package consulo.javascript.debugger.browser.transport;
+
+import consulo.builtInServer.websocket.WebSocketAccepter;
+import consulo.builtInServer.websocket.WebSocketConnection;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2020-06-15
+ */
+public class ExtensionWebSocketAccepter implements WebSocketAccepter
+{
+	@Override
+	public void accept(@Nonnull WebSocketConnection webSocketConnection, @Nonnull byte[] bytes)
+	{
+		System.out.println(bytes.toString());
+	}
+
+	@Override
+	public void accept(@Nonnull WebSocketConnection webSocketConnection, @Nonnull String text)
+	{
+		System.out.println(text);
+	}
+}
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
index 892f32ac..791f3471 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
@@ -16,8 +16,6 @@
 
 package consulo.javascript.debugger;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.javascript.JSDebuggerSupportUtils;
 import com.intellij.lang.javascript.JavaScriptFileType;
 import com.intellij.openapi.editor.Document;
@@ -28,6 +26,9 @@
 import com.intellij.xdebugger.evaluation.EvaluationMode;
 import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 20.03.14
@@ -37,7 +38,7 @@ public class JavaScriptLineBreakpointType extends XLineBreakpointTypeBase
 	@Nonnull
 	public static JavaScriptLineBreakpointType getInstance()
 	{
-		return EXTENSION_POINT_NAME.findExtension(JavaScriptLineBreakpointType.class);
+		return EXTENSION_POINT_NAME.findExtensionOrFail(JavaScriptLineBreakpointType.class);
 	}
 
 	public JavaScriptLineBreakpointType()
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 030f83aa..7d0b6b09 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -167,6 +167,12 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-browser.debugger.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>consulo.internal</groupId>
 			<artifactId>lib.org.chromium.sdk</artifactId>
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 6d4f3dc9..ba6f51c7 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -135,7 +135,7 @@
 		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.JSDocTag"
 								 implementationClass="com.intellij.javascript.manipulators.JSDocTagManipulator"/>
 
-		<lang.fileViewProviderFactory language="JavaScript" implementationClass="consulo.javascript.lang.viewProvider.JSFileViewProviderFactory" />
+		<lang.fileViewProviderFactory language="JavaScript" implementationClass="consulo.javascript.lang.viewProvider.JSFileViewProviderFactory"/>
 
 		<completion.contributor language="JavaScript" implementationClass="consulo.javascript.ide.completion.JavaScriptKeywordCompletionContributor"/>
 
@@ -147,9 +147,9 @@
 		<liveTemplateMacro implementation="com.intellij.javascript.JSMethodNameMacro"/>
 
 		<inspectionToolProvider implementation="com.intellij.lang.javascript.inspections.JSInspectionToolProvider"/>
-		<inspectionToolProvider implementation="com.sixrr.inspectjs.InspectionJSPlugin" />
+		<inspectionToolProvider implementation="com.sixrr.inspectjs.InspectionJSPlugin"/>
 
-		<filePropertyPusher implementation="consulo.javascript.lang.JavaScriptLanguageVersionPusher" />
+		<filePropertyPusher implementation="consulo.javascript.lang.JavaScriptLanguageVersionPusher"/>
 
 		<targetElementUtilEx implementation="com.intellij.lang.javascript.JavaScriptTargetElementUtilEx"/>
 
@@ -166,12 +166,16 @@
 
 		<xdebugger.breakpointType implementation="consulo.javascript.debugger.JavaScriptLineBreakpointType"/>
 		<xdebugger.lineBreakpointTypeResolver filetype="JavaScript" implementationClass="consulo.javascript.debugger.JavaScriptLineBreakpointTypeResolver"/>
+
+		<configurationType implementation="consulo.javascript.debugger.browser.JavaScriptBrowserConfigurationType"/>
+		<webSocketAccepter implementation="consulo.javascript.debugger.browser.transport.ExtensionWebSocketAccepter"/>
+		<programRunner implementation="consulo.javascript.debugger.browser.JavaScriptBrowserDebugRunner" />
 	</extensions>
 
 	<extensionPoints>
 		<extensionPoint name="indexer" interface="consulo.javascript.index.JavaScriptIndexer"/>
 
-		<extensionPoint name="keywordCompletionExtender" interface="consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender" />
+		<extensionPoint name="keywordCompletionExtender" interface="consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender"/>
 
 		<extensionPoint name="resolveHelper" interface="com.intellij.lang.javascript.flex.JSResolveHelper"/>
 		<extensionPoint name="classInheritorsProvider" interface="com.intellij.lang.javascript.search.JSClassInheritorsProvider"/>
diff --git a/pom.xml b/pom.xml
index cdd5757e..0f1d8be8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
 		</module>
 		<module>web-browser-impl</module>
 		<module>debugger/debugger-impl</module>
+		<module>debugger/browser-debugger-impl</module>
 		<module>debugger/v8-debugger-impl</module>
 		<module>lang-version-impl/javascript16-impl</module>
 		<module>lang-version-impl/javascript17-impl</module>

From b81b09e97f593bde1390b0086060f7d31781cdb9 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 16 Jun 2020 09:21:38 +0300
Subject: [PATCH 115/340] fix #23

---
 .../messages/JavaScriptBundle.properties          |  2 +-
 .../lang/javascript/types/JSFileElementType.java  |  2 +-
 .../lang/parsing/EcmaScript6StatementParsing.java | 15 +++++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/base-api/src/main/resources/messages/JavaScriptBundle.properties b/base-api/src/main/resources/messages/JavaScriptBundle.properties
index fe398811..7d5c67d4 100644
--- a/base-api/src/main/resources/messages/JavaScriptBundle.properties
+++ b/base-api/src/main/resources/messages/JavaScriptBundle.properties
@@ -34,7 +34,7 @@ javascript.parser.message.expected.parameter.name=parameter name expected
 javascript.parser.message.expected.catch.or.default=catch or default expected
 javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration=left hand side expression or variable declaration expected before 'in'
 javascript.parser.message.expected.forloop.in.or.semicolon='in' or ; expected
-javascript.parser.message.expected.forloop.of.or.semicolon='of' or ; expected
+javascript.parser.message.expected.forloop.in.of.or.semicolon='in', 'of' or ; expected
 javascript.parser.message.expected.while.keyword=while expected
 javascript.parser.message.expected.comma=, expected
 javascript.parser.message.expected.variable.name=variable name expected
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index 62cb03b2..b945a727 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -91,7 +91,7 @@ public String getExternalId()
 	@Override
 	public int getStubVersion()
 	{
-		int version = 43;
+		int version = 44;
 		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList())
 		{
 			version += javaScriptIndexer.getVersion();
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index a19f7382..fa31c421 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -125,21 +125,28 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 			}
 			getExpressionParsing().parseExpressionOptional(builder);
 		}
-		else if(isContextKeyword(builder, JSTokenTypes.OF_KEYWORD))
+		else if(isContextKeyword(builder, JSTokenTypes.OF_KEYWORD) || builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
 		{
 			forin = true;
 			if(empty)
 			{
 				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration"));
 			}
-			advanceContextKeyword(builder, JSTokenTypes.OF_KEYWORD);
+
+			if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
+			{
+				builder.advanceLexer();
+			}
+			else
+			{
+				advanceContextKeyword(builder, JSTokenTypes.OF_KEYWORD);
+			}
 
 			getExpressionParsing().parseExpression(builder);
 		}
 		else
 		{
-
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.of.or.semicolon"));
+			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.in.of.or.semicolon"));
 		}
 
 		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));

From 72c5fe2849c0812a791f08cd8cc234f63a9b976b Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 16 Jun 2020 10:44:57 +0300
Subject: [PATCH 116/340] extract base vm impl from socket impl

---
 .../run/debug/V8BaseDebugProcess.java         | 294 ++++++++++++++++++
 .../run/debug/V8DebugEventListener.java       |  16 +-
 .../javascript/run/debug/V8DebugProcess.java  | 252 +--------------
 .../javascript/run/debug/V8ScriptUtil.java    |   3 +-
 4 files changed, 309 insertions(+), 256 deletions(-)
 create mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java

diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
new file mode 100644
index 00000000..56ee8397
--- /dev/null
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright 2013-2020 consulo.io
+ *
+ * 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.
+ */
+
+package consulo.javascript.run.debug;
+
+import com.intellij.execution.ExecutionException;
+import com.intellij.execution.ExecutionResult;
+import com.intellij.execution.process.ProcessHandler;
+import com.intellij.execution.ui.ExecutionConsole;
+import com.intellij.execution.ui.RunnerLayoutUi;
+import com.intellij.icons.AllIcons;
+import com.intellij.lang.javascript.JavaScriptIcons;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.ui.content.Content;
+import com.intellij.util.ui.UIUtil;
+import com.intellij.xdebugger.*;
+import com.intellij.xdebugger.breakpoints.XBreakpointHandler;
+import com.intellij.xdebugger.breakpoints.XBreakpointManager;
+import com.intellij.xdebugger.breakpoints.XBreakpointProperties;
+import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
+import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
+import com.intellij.xdebugger.frame.XSuspendContext;
+import com.intellij.xdebugger.ui.XDebugTabLayouter;
+import consulo.javascript.debugger.JavaScriptEditorsProvider;
+import consulo.javascript.debugger.JavaScriptLineBreakpointType;
+import consulo.javascript.debugger.JavaScriptListPanel;
+import org.chromium.sdk.Breakpoint;
+import org.chromium.sdk.DebugContext;
+import org.chromium.sdk.JavascriptVm;
+import org.chromium.sdk.Script;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author VISTALL
+ * @since 2020-06-16
+ */
+public abstract class V8BaseDebugProcess<V extends JavascriptVm> extends XDebugProcess
+{
+	protected V myVm;
+
+	private final ExecutionResult myResult;
+	private DebugContext myCurrentDebugContext;
+	private JavaScriptListPanel<Script> myScriptListPanel;
+
+	private final XBreakpointManager myXBreakpointManager;
+
+	private Map<Breakpoint, XLineBreakpoint> myBreakpoints = new HashMap<>();
+
+	public V8BaseDebugProcess(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException
+	{
+		super(session);
+		myScriptListPanel = new JavaScriptListPanel<Script>(session.getProject())
+		{
+			@Nullable
+			@Override
+			public VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen)
+			{
+				return V8ScriptUtil.toVirtualFile(value, toOpen);
+			}
+		};
+		myResult = result;
+		myXBreakpointManager = XDebuggerManager.getInstance(getSession().getProject()).getBreakpointManager();
+		getSession().setPauseActionSupported(true);
+	}
+
+	@Nullable
+	@Override
+	protected ProcessHandler doGetProcessHandler()
+	{
+		return myResult.getProcessHandler();
+	}
+
+	@Override
+	public boolean checkCanPerformCommands()
+	{
+		return myVm != null && myVm.isAttached();
+	}
+
+	@Nonnull
+	@Override
+	public XDebuggerEditorsProvider getEditorsProvider()
+	{
+		return JavaScriptEditorsProvider.INSTANCE;
+	}
+
+	@Nonnull
+	@Override
+	public ExecutionConsole createConsole()
+	{
+		return myResult.getExecutionConsole();
+	}
+
+	@Override
+	public boolean checkCanInitBreakpoints()
+	{
+		return false;
+	}
+
+	@Nonnull
+	@Override
+	public XBreakpointHandler<?>[] getBreakpointHandlers()
+	{
+		return new XBreakpointHandler[]{
+				new XBreakpointHandler<XLineBreakpoint<XBreakpointProperties>>(JavaScriptLineBreakpointType.class)
+				{
+					@Override
+					public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint)
+					{
+						String presentableFilePath = lineBreakpoint.getPresentableFilePath();
+						int line = lineBreakpoint.getLine();
+						XExpression conditionExpression = lineBreakpoint.getConditionExpression();
+						String expression = conditionExpression == null ? null : conditionExpression.getExpression();
+						myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), line, Breakpoint.EMPTY_VALUE, true, expression, new JavascriptVm.BreakpointCallback()
+						{
+							@Override
+							public void success(Breakpoint breakpoint)
+							{
+								myBreakpoints.put(breakpoint, lineBreakpoint);
+								myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, AllIcons.Debugger.Db_verified_breakpoint, null);
+							}
+
+							@Override
+							public void failure(String s)
+							{
+								myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, AllIcons.Debugger.Db_invalid_breakpoint, s);
+							}
+						}, null);
+					}
+
+					@Override
+					public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint, boolean b)
+					{
+						String presentableFilePath = breakpoint.getPresentableFilePath();
+						myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), breakpoint.getLine(), Breakpoint.EMPTY_VALUE, false, null, null, null);
+					}
+				}
+		};
+	}
+
+	@Override
+	public void startPausing()
+	{
+		myVm.suspend(new JavascriptVm.SuspendCallback()
+		{
+			@Override
+			public void success()
+			{
+				//
+			}
+
+			@Override
+			public void failure(Exception e)
+			{
+
+			}
+		});
+	}
+
+	@Override
+	public void startStepOver(@Nullable XSuspendContext context)
+	{
+		if(myCurrentDebugContext != null)
+		{
+			myCurrentDebugContext.continueVm(DebugContext.StepAction.OVER, 0, null, null);
+		}
+	}
+
+	@Override
+	public void startStepInto(@Nullable XSuspendContext context)
+	{
+		if(myCurrentDebugContext != null)
+		{
+			myCurrentDebugContext.continueVm(DebugContext.StepAction.IN, 0, null, null);
+		}
+	}
+
+	@Override
+	public void startStepOut(@Nullable XSuspendContext context)
+	{
+		if(myCurrentDebugContext != null)
+		{
+			myCurrentDebugContext.continueVm(DebugContext.StepAction.OUT, 0, null, null);
+		}
+	}
+
+	@Override
+	public void stop()
+	{
+		myVm.detach();
+		myBreakpoints.clear();
+
+		Application.get().runReadAction(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				Collection<? extends XLineBreakpoint<XBreakpointProperties>> breakpoints = myXBreakpointManager.getBreakpoints(JavaScriptLineBreakpointType
+						.class);
+				for(XLineBreakpoint<XBreakpointProperties> breakpoint : breakpoints)
+				{
+					myXBreakpointManager.updateBreakpointPresentation(breakpoint, null, null);
+				}
+			}
+		});
+	}
+
+	@Override
+	public void resume(@Nullable XSuspendContext context)
+	{
+		DebugContext currentDebugContext = myCurrentDebugContext;
+		if(currentDebugContext == null)
+		{
+			return;
+		}
+		currentDebugContext.continueVm(DebugContext.StepAction.CONTINUE, 0, null, null);
+	}
+
+	@Override
+	public void runToPosition(@Nonnull XSourcePosition position, @Nullable XSuspendContext context)
+	{
+	}
+
+	@Nonnull
+	@Override
+	public XDebugTabLayouter createTabLayouter()
+	{
+		return new XDebugTabLayouter()
+		{
+			@Override
+			public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui)
+			{
+				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIcons.JavaScript, null);
+				content.setCloseable(false);
+
+				ui.addContent(content);
+			}
+		};
+	}
+
+	@Override
+	public String getCurrentStateMessage()
+	{
+		if(myVm == null)
+		{
+			return XDebuggerBundle.message("debugger.state.message.disconnected");
+		}
+		else
+		{
+			if(myVm.isAttached())
+			{
+				return "Attached";
+			}
+			else
+			{
+				return XDebuggerBundle.message("debugger.state.message.disconnected");
+			}
+		}
+	}
+
+	public void addScript(final Script script)
+	{
+		UIUtil.invokeLaterIfNeeded(() -> myScriptListPanel.add(script));
+	}
+
+	@Nullable
+	public XLineBreakpoint<?> getXBreakpointByVmBreakpoint(Breakpoint breakpoint)
+	{
+		return myBreakpoints.get(breakpoint);
+	}
+
+	public void setCurrentDebugContext(DebugContext debugContext)
+	{
+		myCurrentDebugContext = debugContext;
+	}
+}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
index 442fdeff..b2e23fd9 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
@@ -16,14 +16,6 @@
 
 package consulo.javascript.run.debug;
 
-import java.util.Collection;
-import java.util.List;
-
-import org.chromium.sdk.Breakpoint;
-import org.chromium.sdk.CallFrame;
-import org.chromium.sdk.DebugContext;
-import org.chromium.sdk.DebugEventListener;
-import org.chromium.sdk.Script;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.LightVirtualFile;
@@ -33,6 +25,10 @@
 import com.intellij.xdebugger.breakpoints.XBreakpointProperties;
 import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
+import org.chromium.sdk.*;
+
+import java.util.Collection;
+import java.util.List;
 
 /**
  * @author VISTALL
@@ -40,11 +36,11 @@
  */
 public class V8DebugEventListener implements DebugEventListener
 {
-	private final V8DebugProcess myV8DebugProcess;
+	private final V8BaseDebugProcess myV8DebugProcess;
 
 	private boolean myFirstPausing = true;
 
-	public V8DebugEventListener(V8DebugProcess v8DebugProcess)
+	public V8DebugEventListener(V8BaseDebugProcess v8DebugProcess)
 	{
 		myV8DebugProcess = v8DebugProcess;
 	}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
index 50533df9..b83a9dc0 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
@@ -18,65 +18,26 @@
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
-import com.intellij.execution.process.ProcessHandler;
-import com.intellij.execution.ui.ExecutionConsole;
-import com.intellij.execution.ui.RunnerLayoutUi;
-import com.intellij.icons.AllIcons;
-import com.intellij.lang.javascript.JavaScriptIcons;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.content.Content;
-import com.intellij.util.ui.UIUtil;
-import com.intellij.xdebugger.*;
-import com.intellij.xdebugger.breakpoints.XBreakpointHandler;
-import com.intellij.xdebugger.breakpoints.XBreakpointManager;
-import com.intellij.xdebugger.breakpoints.XBreakpointProperties;
-import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
-import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
-import com.intellij.xdebugger.ui.XDebugTabLayouter;
+import com.intellij.xdebugger.XDebugSession;
+import com.intellij.xdebugger.XDebuggerBundle;
 import consulo.annotation.UsedInPlugin;
-import consulo.javascript.debugger.JavaScriptEditorsProvider;
-import consulo.javascript.debugger.JavaScriptLineBreakpointType;
-import consulo.javascript.debugger.JavaScriptListPanel;
-import org.chromium.sdk.*;
+import org.chromium.sdk.JavascriptVmFactory;
+import org.chromium.sdk.StandaloneVm;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.net.InetSocketAddress;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author VISTALL
  * @since 20.03.14
  */
-public class V8DebugProcess extends XDebugProcess
+@UsedInPlugin
+public class V8DebugProcess extends V8BaseDebugProcess<StandaloneVm>
 {
-	private final ExecutionResult myResult;
-	private final StandaloneVm myVm;
-	private DebugContext myCurrentDebugContext;
-	private JavaScriptListPanel<Script> myScriptListPanel;
-
-	private final XBreakpointManager myXBreakpointManager;
-
-	private Map<Breakpoint, XLineBreakpoint> myBreakpoints = new HashMap<Breakpoint, XLineBreakpoint>();
-
 	public V8DebugProcess(@Nonnull XDebugSession session, ExecutionResult result, int port) throws ExecutionException
 	{
-		super(session);
-		myScriptListPanel = new JavaScriptListPanel<Script>(session.getProject())
-		{
-			@Nullable
-			@Override
-			public VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen)
-			{
-				return V8ScriptUtil.toVirtualFile(value, toOpen);
-			}
-		};
-		myResult = result;
-		myXBreakpointManager = XDebuggerManager.getInstance(getSession().getProject()).getBreakpointManager();
-		getSession().setPauseActionSupported(true);
+		super(session, result);
+
 		myVm = JavascriptVmFactory.getInstance().createStandalone(new InetSocketAddress("localhost", port), null);
 	}
 
@@ -86,180 +47,6 @@ public void attach() throws Exception
 		myVm.attach(new V8DebugEventListener(this));
 	}
 
-	@Nullable
-	@Override
-	protected ProcessHandler doGetProcessHandler()
-	{
-		return myResult.getProcessHandler();
-	}
-
-	@Override
-	public boolean checkCanPerformCommands()
-	{
-		return myVm != null && myVm.isAttached();
-	}
-
-	@Nonnull
-	@Override
-	public XDebuggerEditorsProvider getEditorsProvider()
-	{
-		return JavaScriptEditorsProvider.INSTANCE;
-	}
-
-	@Nonnull
-	@Override
-	public ExecutionConsole createConsole()
-	{
-		return myResult.getExecutionConsole();
-	}
-
-	@Override
-	public boolean checkCanInitBreakpoints()
-	{
-		return false;
-	}
-
-	@Nonnull
-	@Override
-	public XBreakpointHandler<?>[] getBreakpointHandlers()
-	{
-		return new XBreakpointHandler[]{
-				new XBreakpointHandler<XLineBreakpoint<XBreakpointProperties>>(JavaScriptLineBreakpointType.class)
-				{
-					@Override
-					public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint)
-					{
-						String presentableFilePath = lineBreakpoint.getPresentableFilePath();
-						int line = lineBreakpoint.getLine();
-						XExpression conditionExpression = lineBreakpoint.getConditionExpression();
-						String expression = conditionExpression == null ? null : conditionExpression.getExpression();
-						myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), line, Breakpoint.EMPTY_VALUE, true, expression, new JavascriptVm.BreakpointCallback()
-						{
-							@Override
-							public void success(Breakpoint breakpoint)
-							{
-								myBreakpoints.put(breakpoint, lineBreakpoint);
-								myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, AllIcons.Debugger.Db_verified_breakpoint, null);
-							}
-
-							@Override
-							public void failure(String s)
-							{
-								myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, AllIcons.Debugger.Db_invalid_breakpoint, s);
-							}
-						}, null);
-					}
-
-					@Override
-					public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint, boolean b)
-					{
-						String presentableFilePath = breakpoint.getPresentableFilePath();
-						myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), breakpoint.getLine(), Breakpoint.EMPTY_VALUE, false, null, null, null);
-					}
-				}
-		};
-	}
-
-	@Override
-	public void startPausing()
-	{
-		myVm.suspend(new JavascriptVm.SuspendCallback()
-		{
-			@Override
-			public void success()
-			{
-				//
-			}
-
-			@Override
-			public void failure(Exception e)
-			{
-
-			}
-		});
-	}
-
-	@Override
-	public void startStepOver()
-	{
-		if(myCurrentDebugContext != null)
-		{
-			myCurrentDebugContext.continueVm(DebugContext.StepAction.OVER, 0, null, null);
-		}
-	}
-
-	@Override
-	public void startStepInto()
-	{
-		if(myCurrentDebugContext != null)
-		{
-			myCurrentDebugContext.continueVm(DebugContext.StepAction.IN, 0, null, null);
-		}
-	}
-
-	@Override
-	public void startStepOut()
-	{
-		if(myCurrentDebugContext != null)
-		{
-			myCurrentDebugContext.continueVm(DebugContext.StepAction.OUT, 0, null, null);
-		}
-	}
-
-	@Override
-	public void stop()
-	{
-		myVm.detach();
-		myBreakpoints.clear();
-
-		ApplicationManager.getApplication().runReadAction(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				Collection<? extends XLineBreakpoint<XBreakpointProperties>> breakpoints = myXBreakpointManager.getBreakpoints(JavaScriptLineBreakpointType
-						.class);
-				for(XLineBreakpoint<XBreakpointProperties> breakpoint : breakpoints)
-				{
-					myXBreakpointManager.updateBreakpointPresentation(breakpoint, null, null);
-				}
-			}
-		});
-	}
-
-	@Override
-	public void resume()
-	{
-		DebugContext currentDebugContext = myCurrentDebugContext;
-		if(currentDebugContext == null)
-		{
-			return;
-		}
-		currentDebugContext.continueVm(DebugContext.StepAction.CONTINUE, 0, null, null);
-	}
-
-	@Override
-	public void runToPosition(@Nonnull XSourcePosition xSourcePosition)
-	{
-	}
-
-	@Nonnull
-	@Override
-	public XDebugTabLayouter createTabLayouter()
-	{
-		return new XDebugTabLayouter()
-		{
-			@Override
-			public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui)
-			{
-				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIcons.JavaScript, null);
-				content.setCloseable(false);
-
-				ui.addContent(content);
-			}
-		};
-	}
-
 	@Override
 	public String getCurrentStateMessage()
 	{
@@ -284,27 +71,4 @@ public String getCurrentStateMessage()
 			}
 		}
 	}
-
-	public void addScript(final Script script)
-	{
-		UIUtil.invokeLaterIfNeeded(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				myScriptListPanel.add(script);
-			}
-		});
-	}
-
-	@Nullable
-	public XLineBreakpoint<?> getXBreakpointByVmBreakpoint(Breakpoint breakpoint)
-	{
-		return myBreakpoints.get(breakpoint);
-	}
-
-	public void setCurrentDebugContext(DebugContext debugContext)
-	{
-		myCurrentDebugContext = debugContext;
-	}
 }
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
index d1bde44e..dae888af 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
@@ -47,8 +47,7 @@ public static VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen)
 		}
 
 		String name = new File(scriptName).getName();
-		LightVirtualFile virtualFile = new LightVirtualFile(name, FileTypeRegistry.getInstance().getFileTypeByFileName(name),
-				toOpen ? value.getSource() : "")
+		LightVirtualFile virtualFile = new LightVirtualFile(name, FileTypeRegistry.getInstance().getFileTypeByFileName(name), toOpen ? value.getSource() : "")
 		{
 			@Override
 			public boolean equals(Object obj)

From a2ab3b37c09997292c3771371651b4bd5ebeca02 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 16 Jun 2020 12:37:22 +0300
Subject: [PATCH 117/340] corrected getRangeInElement method when have
 qualifier

---
 .../psi/impl/JSReferenceExpressionImpl.java       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 1657ae93..57c0793b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -102,8 +102,7 @@ public PsiElement getReferenceNameElement()
 	@Override
 	public PsiElement getElement()
 	{
-		PsiElement nameElement = getNameElement();
-		return nameElement == null ? this : nameElement;
+		return this;
 	}
 
 	@Override
@@ -118,8 +117,16 @@ public PsiReference getReference()
 	public TextRange getRangeInElement()
 	{
 		PsiElement nameElement = getNameElement();
-		int l = nameElement != null ? nameElement.getTextLength(): getTextLength();
-		return new TextRange(0, l);
+
+		if(nameElement != null)
+		{
+			int offset = nameElement.getStartOffsetInParent();
+			return new TextRange(offset, offset + nameElement.getTextLength());
+		}
+		else
+		{
+			return new TextRange(0, getTextLength());
+		}
 	}
 
 	@Nullable

From a57eb11129bf1bf1392a7c50179ede090812a452 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 17 Jun 2020 12:33:27 +0300
Subject: [PATCH 118/340] make example bigger

fix #25
---
 ...riptLanguageCodeStyleSettingsProvider.java | 21 ++-----
 .../main/resources/codeStyle/blankLines.txt   |  3 -
 .../main/resources/codeStyle/codeStyle.txt    | 56 +++++++++++++++++++
 .../src/main/resources/codeStyle/indent.txt   |  3 -
 .../src/main/resources/codeStyle/spacing.txt  |  3 -
 .../src/main/resources/codeStyle/wrapping.txt |  3 -
 6 files changed, 60 insertions(+), 29 deletions(-)
 delete mode 100644 plugin/src/main/resources/codeStyle/blankLines.txt
 create mode 100644 plugin/src/main/resources/codeStyle/codeStyle.txt
 delete mode 100644 plugin/src/main/resources/codeStyle/indent.txt
 delete mode 100644 plugin/src/main/resources/codeStyle/spacing.txt
 delete mode 100644 plugin/src/main/resources/codeStyle/wrapping.txt

diff --git a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index 0d769dd7..7814e4c4 100644
--- a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -1,9 +1,5 @@
 package consulo.javascript.formatter;
 
-import java.io.IOException;
-
-import javax.annotation.Nonnull;
-
 import com.intellij.application.options.IndentOptionsEditor;
 import com.intellij.application.options.SmartIndentOptionsEditor;
 import com.intellij.lang.Language;
@@ -13,6 +9,9 @@
 import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
 import consulo.javascript.lang.JavaScriptLanguage;
 
+import javax.annotation.Nonnull;
+import java.io.IOException;
+
 /**
  * @author VISTALL
  * @since 16.02.2015
@@ -82,19 +81,7 @@ else if(settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS)
 	@Override
 	public String getCodeSample(@Nonnull SettingsType settingsType)
 	{
-		if(settingsType == SettingsType.SPACING_SETTINGS)
-		{
-			return loadPreview("spacing.txt");
-		}
-		if(settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS)
-		{
-			return loadPreview("wrapping.txt");
-		}
-		if(settingsType == SettingsType.INDENT_SETTINGS)
-		{
-			return loadPreview("indent.txt");
-		}
-		return loadPreview("blankLines.txt");
+		return loadPreview("codeStyle.txt");
 	}
 
 	private static String loadPreview(String file)
diff --git a/plugin/src/main/resources/codeStyle/blankLines.txt b/plugin/src/main/resources/codeStyle/blankLines.txt
deleted file mode 100644
index 9f64fa05..00000000
--- a/plugin/src/main/resources/codeStyle/blankLines.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-function a() {
-    alert("test");
-}
\ No newline at end of file
diff --git a/plugin/src/main/resources/codeStyle/codeStyle.txt b/plugin/src/main/resources/codeStyle/codeStyle.txt
new file mode 100644
index 00000000..561b1e2e
--- /dev/null
+++ b/plugin/src/main/resources/codeStyle/codeStyle.txt
@@ -0,0 +1,56 @@
+function test() {
+    var some = 1;
+
+    if(some == 2) {
+       var array = [1, 2, 3];
+
+       for(var v in array) {
+          console.log(v);
+       }
+    }
+    else if(some == 3) {
+        someFunc(some, "test");
+    }
+    else {
+        switch(some) {
+           case 1:
+              break;
+           default:
+              console.log("test me");
+              break;
+        }
+    }
+}
+
+function someFunc(t, t2) {
+   var t = dom.getElementById("test");
+
+   if(t != undefined) {
+       console.log("exists");
+   }
+
+   t2 = t2 == 3 ? 5 : t2;
+
+   do {
+      t2 ++;
+
+      var value = 1 + 2 - 5 * 10 / 10 - t2;
+
+      if(value == 0) {
+         break;
+      }
+
+      try {
+          alert("call me");
+      }
+      catch(err) {
+          alert(err);
+          break;
+      }
+   }
+   while(t2 != 100);
+
+   while(true) {
+      console.log("endless loop");
+   }
+}
\ No newline at end of file
diff --git a/plugin/src/main/resources/codeStyle/indent.txt b/plugin/src/main/resources/codeStyle/indent.txt
deleted file mode 100644
index 9f64fa05..00000000
--- a/plugin/src/main/resources/codeStyle/indent.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-function a() {
-    alert("test");
-}
\ No newline at end of file
diff --git a/plugin/src/main/resources/codeStyle/spacing.txt b/plugin/src/main/resources/codeStyle/spacing.txt
deleted file mode 100644
index 9f64fa05..00000000
--- a/plugin/src/main/resources/codeStyle/spacing.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-function a() {
-    alert("test");
-}
\ No newline at end of file
diff --git a/plugin/src/main/resources/codeStyle/wrapping.txt b/plugin/src/main/resources/codeStyle/wrapping.txt
deleted file mode 100644
index 9f64fa05..00000000
--- a/plugin/src/main/resources/codeStyle/wrapping.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-function a() {
-    alert("test");
-}
\ No newline at end of file

From de62fa5698b84b2b44509d900bb4bd3bb1c7556e Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 17 Jun 2020 16:53:24 +0300
Subject: [PATCH 119/340] fix #27

---
 .../lang/javascript/formatter/JSSpacingProcessor.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
index 08fd8b33..9c3091b2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
@@ -560,6 +560,12 @@ public void visitCatchBlock(final ASTNode node)
 		{
 			setSingleSpace(mySettings.SPACE_WITHIN_CATCH_PARENTHESES);
 		}
+
+		if(type1 == JSTokenTypes.CATCH_KEYWORD && type2 == JSTokenTypes.LPAR)
+		{
+			setSingleSpace(mySettings.SPACE_BEFORE_CATCH_PARENTHESES);
+		}
+
 		if(type2 == JSElementTypes.BLOCK_STATEMENT)
 		{
 			TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild2.getTextRange().getStartOffset());

From e58b203d9b6778e1eb6d55dfb5b8268473fc3da7 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 17 Jun 2020 16:58:55 +0300
Subject: [PATCH 120/340] fix #26

---
 .../lang/javascript/formatter/blocks/SubBlockVisitor.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
index 6946ac99..b30a2926 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
@@ -214,7 +214,7 @@ private Indent getIndent(final ASTNode node, final ASTNode child)
 			return Indent.getNoneIndent();
 		}
 
-		if(nodeElementType == JSElementTypes.SWITCH_STATEMENT && childElementType == JSTokenTypes.RBRACE)
+		if(nodeElementType == JSElementTypes.SWITCH_STATEMENT && (childElementType == JSTokenTypes.LBRACE || childElementType == JSTokenTypes.RBRACE))
 		{
 			return Indent.getNoneIndent();
 		}

From 6fc6e2df927dfb6648a5abca6b9e3e6a7f5a4860 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 17 Jun 2020 20:59:07 +0300
Subject: [PATCH 121/340] to #26

---
 .../lang/javascript/formatter/JSSpacingProcessor.java        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
index 9c3091b2..6f171114 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
@@ -469,6 +469,11 @@ else if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
 		{
 			setSingleSpace(mySettings.SPACE_WITHIN_WHILE_PARENTHESES);
 		}
+
+		if(type1 == JSTokenTypes.DO_KEYWORD && type2 == JSElementTypes.BLOCK_STATEMENT)
+		{
+			setBraceSpace(true, mySettings.BRACE_STYLE, null);
+		}
 	}
 
 	@Override

From 57b8d4ee9c55df9ebd14506e41d39da54e442012 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Thu, 18 Jun 2020 09:42:32 +0300
Subject: [PATCH 122/340] add long examples

---
 plugin/src/main/resources/codeStyle/codeStyle.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/resources/codeStyle/codeStyle.txt b/plugin/src/main/resources/codeStyle/codeStyle.txt
index 561b1e2e..bfd637bd 100644
--- a/plugin/src/main/resources/codeStyle/codeStyle.txt
+++ b/plugin/src/main/resources/codeStyle/codeStyle.txt
@@ -22,7 +22,7 @@ function test() {
     }
 }
 
-function someFunc(t, t2) {
+function someFunc(someParam, someLongParamName, t2) {
    var t = dom.getElementById("test");
 
    if(t != undefined) {
@@ -52,5 +52,12 @@ function someFunc(t, t2) {
 
    while(true) {
       console.log("endless loop");
+
+      callingLongFunc(
+          1,
+          "some param",
+          "test",
+          5
+      );
    }
 }
\ No newline at end of file

From 517e4844f079fca9cd670d88a3e3821a1d8e8d8b Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Fri, 26 Jun 2020 16:05:38 +0300
Subject: [PATCH 123/340] compilation

---
 .../javascript/JSParameterInfoHandler.java    | 59 +++----------------
 1 file changed, 9 insertions(+), 50 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
index c032a3e1..a67b4647 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
@@ -16,34 +16,13 @@
 
 package com.intellij.javascript;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.MutableLookupElement;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.psi.JSArgumentList;
-import com.intellij.lang.javascript.psi.JSCallExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSParameterList;
-import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSSuperExpression;
-import com.intellij.lang.parameterInfo.CreateParameterInfoContext;
-import com.intellij.lang.parameterInfo.ParameterInfoContext;
-import com.intellij.lang.parameterInfo.ParameterInfoHandlerWithTabActionSupport;
-import com.intellij.lang.parameterInfo.ParameterInfoUIContext;
-import com.intellij.lang.parameterInfo.ParameterInfoUtils;
-import com.intellij.lang.parameterInfo.UpdateParameterInfoContext;
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.parameterInfo.*;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.ResolveResult;
@@ -52,12 +31,16 @@
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.*;
+
 /**
  * @author Maxim.Mossienko
  */
 public class JSParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport<JSArgumentList, JSFunction, JSExpression>
 {
-	private static final Set<Class> ourArgumentListAllowedParentClassesSet = ContainerUtil.<Class>newHashSet(JSCallExpression.class);
+	private static final Set<Class<?>> ourArgumentListAllowedParentClassesSet = ContainerUtil.<Class<?>>newHashSet(JSCallExpression.class);
 
 	@Override
 	public boolean couldShowInLookup()
@@ -118,17 +101,6 @@ private static void doAddSignature(final List<JSFunction> lookupItems, final Set
 		}
 	}
 
-	@Override
-	public Object[] getParametersForDocumentation(final JSFunction p, final ParameterInfoContext context)
-	{
-		final JSParameterList list = p.getParameterList();
-		if(list != null)
-		{
-			return list.getParameters();
-		}
-		return ArrayUtil.EMPTY_OBJECT_ARRAY;
-	}
-
 	@Override
 	public JSArgumentList findElementForParameterInfo(final CreateParameterInfoContext context)
 	{
@@ -228,19 +200,6 @@ public void updateParameterInfo(@Nonnull final JSArgumentList o, final UpdatePar
 		context.setCurrentParameter(currentParameterIndex);
 	}
 
-	@Override
-	@Nonnull
-	public String getParameterCloseChars()
-	{
-		return ",){";
-	}
-
-	@Override
-	public boolean tracksParameterIndex()
-	{
-		return true;
-	}
-
 	@Override
 	public void updateUI(final JSFunction p, final ParameterInfoUIContext context)
 	{
@@ -351,14 +310,14 @@ public IElementType getActualParametersRBraceType()
 
 	@Override
 	@Nonnull
-	public Set<Class> getArgumentListAllowedParentClasses()
+	public Set<Class<?>> getArgumentListAllowedParentClasses()
 	{
 		return ourArgumentListAllowedParentClassesSet;
 	}
 
 	@Nonnull
 	@Override
-	public Set<? extends Class> getArgListStopSearchClasses()
+	public Set<? extends Class<?>> getArgListStopSearchClasses()
 	{
 		return Collections.emptySet();
 	}

From 3fc88132432e96067fa737d8744455f97f7b269d Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 26 Aug 2020 21:16:37 +0300
Subject: [PATCH 124/340] fux #32

---
 .../psi/impl/JSReferenceExpressionImpl.java   | 70 ++++++++++---------
 .../javascript/types/JSFileElementType.java   |  4 +-
 .../ecmascript6/psi/ES6ImportSpecifier.java   |  5 +-
 .../ecmascript6/psi/ES6ImportedBinding.java   |  6 ++
 .../psi/impl/ES6ImportSpecifierImpl.java      | 47 +++++++++++++
 .../psi/impl/ES6ImportedBindingImpl.java      | 25 ++++++-
 .../psi/impl/EcmaScript6ElementTypes.java     |  2 +
 .../parsing/EcmaScript6StatementParsing.java  | 18 +++++
 8 files changed, 139 insertions(+), 38 deletions(-)
 create mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 57c0793b..04c9e03c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -28,7 +28,6 @@
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilBase;
-import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlToken;
 import com.intellij.refactoring.rename.BindablePsiReference;
@@ -228,6 +227,7 @@ public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOpe
 		return this;
 	}
 
+	@RequiredReadAction
 	@Override
 	public boolean isReferenceTo(PsiElement element)
 	{
@@ -237,39 +237,45 @@ public boolean isReferenceTo(PsiElement element)
 			return true;
 		}
 
-		if(element instanceof PsiNamedElement || element instanceof XmlAttributeValue)
+		PsiElement resolvedElement = resolve();
+		if(resolvedElement != null && resolvedElement.isEquivalentTo(element))
 		{
-			final String referencedName = getReferencedName();
-
-			if(referencedName != null)
-			{
-				if(element instanceof JSDefinitionExpression && referencedName.equals(((JSDefinitionExpression) element).getName()))
-				{
-					final JSExpression expression = ((JSDefinitionExpression) element).getExpression();
-					if(expression instanceof JSReferenceExpression)
-					{
-						final JSReferenceExpression jsReferenceExpression = (JSReferenceExpression) expression;
-						final JSExpression qualifier = jsReferenceExpression.getQualifier();
-						final JSExpression myQualifier = getQualifier();
-
-						return (myQualifier != null || (qualifier == myQualifier || "window".equals(qualifier.getText())));
-					}
-					else
-					{
-						return true;
-					}
-				}
-				else if(element instanceof JSProperty && referencedName.equals(((JSProperty) element).getName()))
-				{
-					if(getQualifier() != null)
-					{
-						return true; // TODO: check for type of element to be the same
-					}
-					//return false;
-				}
-			}
-			return JSResolveUtil.isReferenceTo(this, referencedName, element);
+			return true;
 		}
+
+//		if(element instanceof PsiNamedElement || element instanceof XmlAttributeValue)
+//		{
+//			final String referencedName = getReferencedName();
+//
+//			if(referencedName != null)
+//			{
+//				if(element instanceof JSDefinitionExpression && referencedName.equals(((JSDefinitionExpression) element).getName()))
+//				{
+//					final JSExpression expression = ((JSDefinitionExpression) element).getExpression();
+//					if(expression instanceof JSReferenceExpression)
+//					{
+//						final JSReferenceExpression jsReferenceExpression = (JSReferenceExpression) expression;
+//						final JSExpression qualifier = jsReferenceExpression.getQualifier();
+//						final JSExpression myQualifier = getQualifier();
+//
+//						return (myQualifier != null || (qualifier == myQualifier || "window".equals(qualifier.getText())));
+//					}
+//					else
+//					{
+//						return true;
+//					}
+//				}
+//				else if(element instanceof JSProperty && referencedName.equals(((JSProperty) element).getName()))
+//				{
+//					if(getQualifier() != null)
+//					{
+//						return true; // TODO: check for type of element to be the same
+//					}
+//					//return false;
+//				}
+//			}
+//			return JSResolveUtil.isReferenceTo(this, referencedName, element);
+//		}
 		return false;
 	}
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index b945a727..0b8ea720 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -43,7 +43,7 @@ public JSFileElementType(final Language language)
 	@Override
 	public void indexStub(@Nonnull final JSFileStub stub, @Nonnull final IndexSink sink)
 	{
-		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensions())
+		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList())
 		{
 			javaScriptIndexer.indexFile(stub, sink);
 		}
@@ -91,7 +91,7 @@ public String getExternalId()
 	@Override
 	public int getStubVersion()
 	{
-		int version = 44;
+		int version = 45;
 		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList())
 		{
 			version += javaScriptIndexer.getVersion();
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
index fcf0a076..9a26bb73 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
@@ -1,13 +1,14 @@
 package consulo.javascript.ecmascript6.psi;
 
 import com.intellij.lang.javascript.psi.JSElement;
+import com.intellij.psi.PsiNameIdentifierOwner;
 
 /**
  * @author VISTALL
  * @since 2019-12-14
  *
- * import {importScpecifier} ...
+ * import {import as importSpecifier} ...
  */
-public interface ES6ImportSpecifier extends JSElement
+public interface ES6ImportSpecifier extends JSElement, PsiNameIdentifierOwner
 {
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
index 47646077..2e6893e1 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
@@ -2,6 +2,9 @@
 
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
@@ -15,4 +18,7 @@
  */
 public interface ES6ImportedBinding extends JSElement, PsiNameIdentifierOwner
 {
+	@Nullable
+	@RequiredReadAction
+	ES6ImportSpecifier getImportSpecifier();
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java
new file mode 100644
index 00000000..85e04d4c
--- /dev/null
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java
@@ -0,0 +1,47 @@
+package consulo.javascript.ecmascript6.psi.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.impl.JSElementImpl;
+import com.intellij.psi.PsiElement;
+import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.javascript.ecmascript6.psi.ES6ImportSpecifier;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2020-08-26
+ */
+public class ES6ImportSpecifierImpl extends JSElementImpl implements ES6ImportSpecifier
+{
+	public ES6ImportSpecifierImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@Override
+	protected void accept(@Nonnull JSElementVisitor visitor)
+	{
+		visitor.visitJSElement(this);
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public PsiElement getNameIdentifier()
+	{
+		return findChildByType(JSTokenTypes.IDENTIFIER);
+	}
+
+	@RequiredWriteAction
+	@Override
+	public PsiElement setName(@Nonnull String s) throws IncorrectOperationException
+	{
+		return null;
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
index 3238c1b3..68b5fa75 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
@@ -10,8 +10,8 @@
 import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.access.RequiredWriteAction;
+import consulo.javascript.ecmascript6.psi.ES6ImportSpecifier;
 import consulo.javascript.ecmascript6.psi.ES6ImportedBinding;
-import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -46,12 +46,25 @@ public String getName()
 	@Override
 	public PsiElement getNameIdentifier()
 	{
+		ES6ImportSpecifier importSpecifier = getImportSpecifier();
+		if(importSpecifier != null)
+		{
+			return importSpecifier.getNameIdentifier();
+		}
 		return findChildByType(JSTokenTypes.IDENTIFIER);
 	}
 
+	@RequiredReadAction
+	@Override
+	public int getTextOffset()
+	{
+		PsiElement nameIdentifier = getNameIdentifier();
+		return nameIdentifier == null ? super.getTextOffset() : nameIdentifier.getTextOffset();
+	}
+
 	@RequiredWriteAction
 	@Override
-	public PsiElement setName(@Nonnull @NonNls String s) throws IncorrectOperationException
+	public PsiElement setName(@Nonnull String s) throws IncorrectOperationException
 	{
 		return null;
 	}
@@ -61,4 +74,12 @@ public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnul
 	{
 		return processor.execute(this, state);
 	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public ES6ImportSpecifier getImportSpecifier()
+	{
+		return findChildByClass(ES6ImportSpecifier.class);
+	}
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
index f49bdd10..558f7a58 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
@@ -17,4 +17,6 @@ public interface EcmaScript6ElementTypes
 	IElementType IMPORTED_BINDING = new ElementTypeAsPsiFactory("IMPORTED_BINDING", JavaScriptLanguage.INSTANCE, ES6ImportedBindingImpl.class);
 
 	IElementType NAMED_IMPORTS = new ElementTypeAsPsiFactory("NAMED_IMPORTS", JavaScriptLanguage.INSTANCE, ES6NamedImportsImpl.class);
+
+	IElementType IMPORT_SPECIFIER = new ElementTypeAsPsiFactory("IMPORT_SPECIFIER", JavaScriptLanguage.INSTANCE, ES6ImportSpecifierImpl.class);
 }
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index fa31c421..23baf9da 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -255,6 +255,24 @@ else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
 							{
 								PsiBuilder.Marker importBindingMark = builder.mark();
 								builder.advanceLexer();
+
+								if(isContextKeyword(builder, JSTokenTypes.AS_KEYWORD))
+								{
+									PsiBuilder.Marker importSpecificMark = builder.mark();
+									advanceContextKeyword(builder, JSTokenTypes.AS_KEYWORD);
+
+									if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
+									{
+										builder.advanceLexer();
+
+										importSpecificMark.done(EcmaScript6ElementTypes.IMPORT_SPECIFIER);
+									}
+									else
+									{
+										importSpecificMark.error("Expected identifier");
+									}
+								}
+
 								importBindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
 							}
 							else if(builder.getTokenType() != JSTokenTypes.RBRACE)

From bf57ea17ac8d416f1c461146d66fd17f211b1428 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 26 Aug 2020 21:28:34 +0300
Subject: [PATCH 125/340] fix #31

---
 .../javascript/lang/parsing/EcmaScript4StatementParsing.java | 5 +++--
 .../javascript/lang/parsing/EcmaScript6StatementParsing.java | 2 +-
 .../lang/javascript/validation/JSAnnotatingVisitor.java      | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
index f24898f0..cc646a1e 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
@@ -1,12 +1,13 @@
 package consulo.javascript.lang.parsing;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.tree.IElementType;
+import consulo.logging.Logger;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
index 23baf9da..a22a04df 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
@@ -99,7 +99,7 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 
 		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
 		final boolean empty;
-		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD)
+		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD || builder.getTokenType() == JSTokenTypes.CONST_KEYWORD)
 		{
 			parseVarStatement(builder, true);
 			empty = false;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
index 20eb8afa..a809f4ee 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
@@ -762,6 +762,11 @@ public void visitJSVariable(final JSVariable var)
 	{
 		if(var.isConst() && var.getInitializer() == null)
 		{
+			if(var.getParent() instanceof JSVarStatement && var.getParent().getParent() instanceof JSForInStatement)
+			{
+				return;
+			}
+
 			JSAttributeList attributeList = var.getAttributeList();
 			if(attributeList == null || attributeList.getAttributesByName("Embed").length == 0)
 			{

From acf19b4ac2ff945be2cea9dc74da84221fd27abb Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 2 Sep 2020 11:34:31 +0300
Subject: [PATCH 126/340] compilation

---
 .../javascript/ide/actions/JavaScriptCreateFileAction.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
index 6e358ccf..527686de 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
@@ -14,6 +14,7 @@
 import com.intellij.psi.PsiDirectory;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.localize.LocalizeValue;
 import consulo.ui.annotation.RequiredUIAccess;
 
 import javax.annotation.Nullable;
@@ -26,7 +27,7 @@ public class JavaScriptCreateFileAction extends CreateFileFromTemplateAction
 {
 	public JavaScriptCreateFileAction()
 	{
-		super(null, null, JavaScriptFileType.INSTANCE.getIcon());
+		super(LocalizeValue.empty(), LocalizeValue.empty(), JavaScriptFileType.INSTANCE.getIcon());
 	}
 
 	@Override

From 35916ff2730cc95495a50e74f2651d016d3ed488 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 11 Oct 2020 02:07:43 +0300
Subject: [PATCH 127/340] migrated to icon group, remove usage of icon loader

---
 base-api/pom.xml                              |  20 +++++++++++
 .../lang/javascript/JavaScriptFileType.java   |   3 +-
 .../lang/javascript/JavaScriptIcons.java      |  31 ------------------
 .../as.png                                    | Bin
 .../as@2x.png                                 | Bin
 .../ecmaScript.png                            | Bin
 .../ecmaScript@2x.png                         | Bin
 .../javaScript.png                            | Bin
 .../javaScript@2x.png                         | Bin
 .../json.png                                  | Bin
 .../json@2x.png                               | Bin
 .../jsx.png                                   | Bin
 .../jsx@2x.png                                | Bin
 .../typeScript.png                            | Bin
 .../typeScript@2x.png                         | Bin
 base-api/src/main/resources/icon/marker.txt   |   0
 .../run/debug/V8BaseDebugProcess.java         |   4 +--
 .../actionscript/ActionScriptFileType.java    |   4 +--
 .../javascript/jsx/language/JSXFileType.java  |   4 +--
 .../javascript/lang/EcmaScriptFileType.java   |   4 +--
 .../main/java/consulo/json/JsonFileType.java  |   4 +--
 .../typescript/TypeScriptFileType.java        |   4 +--
 .../generation/JSNamedElementNode.java        |   2 +-
 .../structureView/JSStructureViewModel.java   |   5 ++-
 .../structureView/JSSuperGrouper.java         |   5 ++-
 plugin/src/main/resources/META-INF/plugin.xml |   2 +-
 .../module/sdk/ClientJavaScriptSdkType.java   |   4 +--
 27 files changed, 42 insertions(+), 54 deletions(-)
 delete mode 100644 base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/as.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/as@2x.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/ecmaScript.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/ecmaScript@2x.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/javaScript.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/javaScript@2x.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/json.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/json@2x.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/jsx.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/jsx@2x.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/typeScript.png (100%)
 rename base-api/src/main/resources/{icons => icon/_light/consulo.javascript.JavaScriptIconGroup}/typeScript@2x.png (100%)
 create mode 100644 base-api/src/main/resources/icon/marker.txt

diff --git a/base-api/pom.xml b/base-api/pom.xml
index 82de0105..9ffd1f2d 100644
--- a/base-api/pom.xml
+++ b/base-api/pom.xml
@@ -40,6 +40,26 @@
 		</repository>
 	</repositories>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>consulo.maven</groupId>
+				<artifactId>consulo-maven-plugin</artifactId>
+				<version>2-SNAPSHOT</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<id>gen</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-icon</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
index baa5b090..b1c454c5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -21,6 +21,7 @@
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.StandardJavaScriptVersions;
@@ -69,7 +70,7 @@ public String getDefaultExtension()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIcons.JavaScript;
+		return JavaScriptIconGroup.javaScript();
 	}
 
 	@RequiredReadAction
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
deleted file mode 100644
index 119512af..00000000
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptIcons.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2013-2014 must-be.org
- *
- * 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.
- */
-
-package com.intellij.lang.javascript;
-
-import com.intellij.openapi.util.IconLoader;
-import consulo.ui.image.Image;
-
-// Generated Consulo DevKit plugin 
-public interface JavaScriptIcons
-{
-	Image As = IconLoader.getIcon("/icons/as.png");  // 16x16
-	Image EcmaScript = IconLoader.getIcon("/icons/ecmaScript.png");  // 16x16
-	Image JavaScript = IconLoader.getIcon("/icons/javaScript.png");  // 16x16
-	Image Json = IconLoader.getIcon("/icons/json.png");  // 16x16
-	Image Jsx = IconLoader.getIcon("/icons/jsx.png");  // 16x16
-	Image TypeScript = IconLoader.getIcon("/icons/typeScript.png");  // 16x16
-}
\ No newline at end of file
diff --git a/base-api/src/main/resources/icons/as.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.png
similarity index 100%
rename from base-api/src/main/resources/icons/as.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.png
diff --git a/base-api/src/main/resources/icons/as@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as@2x.png
similarity index 100%
rename from base-api/src/main/resources/icons/as@2x.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as@2x.png
diff --git a/base-api/src/main/resources/icons/ecmaScript.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.png
similarity index 100%
rename from base-api/src/main/resources/icons/ecmaScript.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.png
diff --git a/base-api/src/main/resources/icons/ecmaScript@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript@2x.png
similarity index 100%
rename from base-api/src/main/resources/icons/ecmaScript@2x.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript@2x.png
diff --git a/base-api/src/main/resources/icons/javaScript.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.png
similarity index 100%
rename from base-api/src/main/resources/icons/javaScript.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.png
diff --git a/base-api/src/main/resources/icons/javaScript@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript@2x.png
similarity index 100%
rename from base-api/src/main/resources/icons/javaScript@2x.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript@2x.png
diff --git a/base-api/src/main/resources/icons/json.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.png
similarity index 100%
rename from base-api/src/main/resources/icons/json.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.png
diff --git a/base-api/src/main/resources/icons/json@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json@2x.png
similarity index 100%
rename from base-api/src/main/resources/icons/json@2x.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json@2x.png
diff --git a/base-api/src/main/resources/icons/jsx.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.png
similarity index 100%
rename from base-api/src/main/resources/icons/jsx.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.png
diff --git a/base-api/src/main/resources/icons/jsx@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx@2x.png
similarity index 100%
rename from base-api/src/main/resources/icons/jsx@2x.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx@2x.png
diff --git a/base-api/src/main/resources/icons/typeScript.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.png
similarity index 100%
rename from base-api/src/main/resources/icons/typeScript.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.png
diff --git a/base-api/src/main/resources/icons/typeScript@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript@2x.png
similarity index 100%
rename from base-api/src/main/resources/icons/typeScript@2x.png
rename to base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript@2x.png
diff --git a/base-api/src/main/resources/icon/marker.txt b/base-api/src/main/resources/icon/marker.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
index 56ee8397..99d0f993 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
@@ -22,7 +22,6 @@
 import com.intellij.execution.ui.ExecutionConsole;
 import com.intellij.execution.ui.RunnerLayoutUi;
 import com.intellij.icons.AllIcons;
-import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.content.Content;
@@ -38,6 +37,7 @@
 import consulo.javascript.debugger.JavaScriptEditorsProvider;
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
 import consulo.javascript.debugger.JavaScriptListPanel;
+import consulo.javascript.icon.JavaScriptIconGroup;
 import org.chromium.sdk.Breakpoint;
 import org.chromium.sdk.DebugContext;
 import org.chromium.sdk.JavascriptVm;
@@ -248,7 +248,7 @@ public XDebugTabLayouter createTabLayouter()
 			@Override
 			public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui)
 			{
-				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIcons.JavaScript, null);
+				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIconGroup.javaScript(), null);
 				content.setCloseable(false);
 
 				ui.addContent(content);
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
index b6377b5d..e5123298 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
@@ -16,12 +16,12 @@
 
 package consulo.actionscript;
 
-import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
 import consulo.actionscript.lang.ActionScriptLanguageVersion;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
@@ -68,7 +68,7 @@ public String getDefaultExtension()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIcons.As;
+		return JavaScriptIconGroup.as();
 	}
 
 	@RequiredReadAction
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
index a8043a62..39ed4a16 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
@@ -1,10 +1,10 @@
 package consulo.javascript.jsx.language;
 
-import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
@@ -51,7 +51,7 @@ public String getDefaultExtension()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIcons.Jsx;
+		return JavaScriptIconGroup.jsx();
 	}
 
 	@RequiredReadAction
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
index 86fea1cc..44a6da84 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
@@ -16,11 +16,11 @@
 
 package consulo.javascript.lang;
 
-import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.lang.LanguageVersion;
 import consulo.ui.image.Image;
 
@@ -65,7 +65,7 @@ public String getDefaultExtension()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIcons.EcmaScript;
+		return JavaScriptIconGroup.ecmaScript();
 	}
 
 	@RequiredReadAction
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
index ef6bd619..e49db3d4 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
@@ -16,11 +16,11 @@
 
 package consulo.json;
 
-import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.json.lang.JsonJavaScriptVersion;
@@ -67,7 +67,7 @@ public String getDefaultExtension()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIcons.Json;
+		return JavaScriptIconGroup.json();
 	}
 
 	@RequiredReadAction
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index b9fe5e4c..cbff3a99 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -20,8 +20,8 @@
 import javax.annotation.Nullable;
 
 import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
+import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.ui.image.Image;
 
@@ -63,6 +63,6 @@ public String getDefaultExtension()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIcons.TypeScript;
+		return JavaScriptIconGroup.typeScript();
 	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java b/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
index 10b0eccd..161d9ff4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
@@ -42,7 +42,7 @@ public class JSNamedElementNode extends PsiElementMemberChooserObject implements
 {
 	public JSNamedElementNode(JSNamedElement node)
 	{
-		super(node, buildTextFor(node), TargetAWT.to(buildIcon(node)));
+		super(node, buildTextFor(node), buildIcon(node));
 	}
 
 	private static Image buildIcon(final JSNamedElement node)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
index 40136140..ff2212ca 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
@@ -21,6 +21,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.platform.base.icon.PlatformIconGroup;
 import org.jetbrains.annotations.NonNls;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
@@ -38,7 +39,6 @@
 import com.intellij.openapi.actionSystem.Shortcut;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.keymap.KeymapManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -193,8 +193,7 @@ public boolean isVisible(TreeElement treeNode)
 		@Nonnull
 		public ActionPresentation getPresentation()
 		{
-			return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), null, IconLoader.getIcon("/hierarchy/supertypes" +
-					".png"));
+			return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), null, PlatformIconGroup.hierarchySupertypes());
 		}
 
 		@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
index 21900635..a8e2ba19 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.structureView;
 
+import consulo.platform.base.icon.PlatformIconGroup;
 import gnu.trove.THashMap;
 
 import java.util.Collection;
@@ -37,7 +38,6 @@
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiElement;
 
 /**
@@ -120,8 +120,7 @@ private static void addGroup(final Map<String, Group> groups, final TreeElement
 	@Nonnull
 	public ActionPresentation getPresentation()
 	{
-		return new ActionPresentationData(IdeBundle.message("action.structureview.group.methods.by.defining.type"), null,
-				IconLoader.getIcon("/general/implementingMethod.png"));
+		return new ActionPresentationData(IdeBundle.message("action.structureview.group.methods.by.defining.type"), null, PlatformIconGroup.generalImplementingMethod());
 	}
 
 	@Override
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 6d4f3dc9..97614d4e 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -158,7 +158,7 @@
 		<sdkType implementation="consulo.javascript.client.module.sdk.ClientJavaScriptSdkType"/>
 		<predefinedBundlesProvider implementation="consulo.javascript.client.module.sdk.ClientJavaScriptPredefinedBundlesProvider"/>
 		<moduleExtensionProvider key="client-javascript"
-								 icon="/icons/javaScript.png"
+								 icon="consulo.javascript.JavaScriptIconGroup@javascript"
 								 name="JavaScript (Client)"
 								 allowMixin="true"
 								 immutableClass="consulo.javascript.client.module.extension.ClientJavaScriptModuleExtension"
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index 7a56b90d..64b49c43 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -3,9 +3,9 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.intellij.lang.javascript.JavaScriptIcons;
 import com.intellij.openapi.projectRoots.SdkType;
 import com.intellij.openapi.roots.OrderRootType;
+import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.roots.types.BinariesOrderRootType;
 import consulo.roots.types.SourcesOrderRootType;
 import consulo.ui.image.Image;
@@ -43,7 +43,7 @@ public boolean isRootTypeApplicable(OrderRootType type)
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIcons.JavaScript;
+		return JavaScriptIconGroup.javaScript();
 	}
 
 	@Override

From c2c14aaf33826dafe364279033e2e69fc88b6547 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Fri, 16 Oct 2020 22:04:33 +0300
Subject: [PATCH 128/340] drop explicit implementation of stub psi element

---
 .../intellij/lang/javascript/psi/JSVariable.java |  2 +-
 .../javascript/psi/impl/JSFunctionBaseImpl.java  |  2 +-
 .../javascript/psi/impl/JSStubElementImpl.java   | 16 ----------------
 .../javascript/psi/resolve/JSResolveUtil.java    | 15 ---------------
 4 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index d4efaeae..cfca1a58 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -31,7 +31,7 @@
  *         Date: Jan 30, 2005
  *         Time: 6:43:42 PM
  */
-public interface JSVariable extends JSQualifiedNamedElement, JSAttributeListOwner, StubBasedPsiElement<JSVariableStubBase>
+public interface JSVariable extends JSQualifiedNamedElement, JSAttributeListOwner
 {
 	JSVariable[] EMPTY_ARRAY = new JSVariable[0];
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index a88481b7..b195280f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -44,7 +44,7 @@
  * Date: Jan 30, 2005
  * Time: 8:25:27 PM
  */
-abstract class JSFunctionBaseImpl<T extends JSFunctionStub, T2 extends JSFunction> extends JSStubElementImpl<T> implements JSFunction, StubBasedPsiElement<JSFunctionStub>
+abstract class JSFunctionBaseImpl<T extends JSFunctionStub, T2 extends JSFunction> extends JSStubElementImpl<T> implements JSFunction
 {
 	private boolean referencesArgumentsCalculated;
 	private boolean referencesArguments;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
index e69b5afa..ee6d79a8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
@@ -31,7 +31,6 @@
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.IncorrectOperationException;
 import consulo.util.dataholder.Key;
-import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 
@@ -43,8 +42,6 @@
 public abstract class JSStubElementImpl<T extends StubElement> extends StubBasedPsiElementBase<T> implements JSElement
 {
 	public static Key<NavigationItem> ORIGINAL_ELEMENT = Key.create("ORIGINAL_NAMED_ELEMENT");
-	@NonNls
-	private static final String IMPL = "Impl";
 
 	public JSStubElementImpl(final ASTNode node)
 	{
@@ -76,19 +73,6 @@ public SearchScope getDefaultUseScope()
 		return super.getUseScope();
 	}
 
-	@Override
-	public String toString()
-	{
-		String classname = getClass().getName();
-		if(classname.endsWith(IMPL))
-		{
-			classname = classname.substring(0, classname.length() - IMPL.length());
-		}
-
-		classname = classname.substring(classname.lastIndexOf(".") + 1);
-		return classname;
-	}
-
 	@Override
 	public ItemPresentation getPresentation()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 9493e92b..8d39e90d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -91,9 +91,6 @@
 /**
  * @author max, maxim.mossienko
  */
-@SuppressWarnings({
-		"ALL"
-})
 public class JSResolveUtil
 {
 	private static final Key<CachedValue<TIntObjectHashMap<Object>>> MY_CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
@@ -2969,18 +2966,6 @@ public ASTNode getNode()
 			return null;
 		}
 
-		@Override
-		public IStubElementType getElementType()
-		{
-			return JSElementTypes.VARIABLE;
-		}
-
-		@Override
-		public JSVariableStubBase getStub()
-		{
-			return null;
-		}
-
 		@Override
 		public boolean hasInitializer()
 		{

From 99743caa11cd23a4e0b2f3d7c1770e91f82c830b Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 20 Oct 2020 16:56:21 +0300
Subject: [PATCH 129/340] jakarta

---
 .../intellij/lang/javascript/psi/resolve/JSResolveUtil.java  | 2 --
 .../javascript/lang/StandardJavaScriptVersionsImpl.java      | 2 +-
 .../javascript/lang/EcmaScript6JavaScriptVersion.java        | 2 +-
 .../src/main/java/consulo/json/jom/JomManager.java           | 5 +++--
 .../DescriptionByAnotherPsiElementService.java               | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 8d39e90d..404dcf18 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -34,7 +34,6 @@
 import com.intellij.lang.javascript.psi.impl.JSFileImpl;
 import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
 import com.intellij.lang.javascript.psi.impl.JSStubElementImpl;
-import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
@@ -56,7 +55,6 @@
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.SearchScope;
-import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.psi.tree.TokenSet;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index 76311784..a56e312e 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -5,7 +5,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.ContainerUtil;
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 5ec77ce7..30d5d71e 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -29,9 +29,9 @@
 import consulo.javascript.lang.parsing.EcmaScript6Parser;
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
+import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
-import javax.inject.Inject;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index 322a2609..1c45975c 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -28,11 +28,12 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.JsonFileType;
 import consulo.util.dataholder.Key;
+import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+
+import jakarta.inject.Singleton;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index 6bb50353..27223c78 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -22,8 +22,8 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.jdom.Element;
 import com.intellij.openapi.application.ApplicationManager;

From 655caaa1aad516d89ee60798254884720a9e1fb4 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 30 Nov 2020 23:07:51 +0300
Subject: [PATCH 130/340] compilation

---
 .../ide/hightlight/JavaScriptSyntaxHighlightKeys.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
index cc5d2f72..7f59afb7 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
@@ -16,12 +16,12 @@
 
 package consulo.javascript.ide.hightlight;
 
-import java.awt.Color;
-
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.editor.markup.TextAttributes;
+import consulo.ui.color.RGBColor;
+import consulo.ui.style.StandardColors;
 
 /**
  * @author VISTALL
@@ -69,7 +69,7 @@ public interface JavaScriptSyntaxHighlightKeys
 	TextAttributesKey JS_GLOBAL_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.GLOBAL_VARIABLE", DefaultLanguageHighlighterColors.STATIC_FIELD);
 	TextAttributesKey JS_GLOBAL_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.GLOBAL_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
 	TextAttributesKey JS_STATIC_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.STATIC_MEMBER_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
-	TextAttributesKey JS_INSTANCE_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.INSTANCE_MEMBER_FUNCTION", new TextAttributes(new Color(0x7a, 0x7a, 43), Color.white, null, null,0));
+	TextAttributesKey JS_INSTANCE_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.INSTANCE_MEMBER_FUNCTION", new TextAttributes(new RGBColor(0x7a, 0x7a, 43), StandardColors.WHITE, null, null,0));
 
-	TextAttributesKey JS_METADATA = TextAttributesKey.createTextAttributesKey("JS.ATTRIBUTE", new TextAttributes(null, new Color(0xf7, 0xe9, 0xe9), null, null, 0));
+	TextAttributesKey JS_METADATA = TextAttributesKey.createTextAttributesKey("JS.ATTRIBUTE", new TextAttributes(null, new RGBColor(0xf7, 0xe9, 0xe9), null, null, 0));
 }

From c4b3490effc477a9a48d8a8e28f056c30c8fdb1b Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 17 Jan 2021 21:47:58 +0300
Subject: [PATCH 131/340] replace by nav extension

---
 .../JSXLanguageBreadcrumbsInfoProvider.java   | 21 ------------
 .../JSStructureItemPresentation.java          | 10 +++++-
 .../JavaScriptNavBarModelExtension.java       | 33 +++++++++++++++++++
 plugin/src/main/resources/META-INF/jsx.xml    |  2 --
 plugin/src/main/resources/META-INF/plugin.xml |  4 ++-
 5 files changed, 45 insertions(+), 25 deletions(-)
 delete mode 100644 lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/breadcrumbs/JSXLanguageBreadcrumbsInfoProvider.java
 create mode 100644 plugin/src/main/java/consulo/javascript/ide/navigationToolbar/JavaScriptNavBarModelExtension.java

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/breadcrumbs/JSXLanguageBreadcrumbsInfoProvider.java b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/breadcrumbs/JSXLanguageBreadcrumbsInfoProvider.java
deleted file mode 100644
index 0b57f2d7..00000000
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/breadcrumbs/JSXLanguageBreadcrumbsInfoProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package consulo.javascript.jsx.codeInsight.breadcrumbs;
-
-import com.intellij.lang.Language;
-import com.intellij.xml.breadcrumbs.XmlLanguageBreadcrumbsInfoProvider;
-import consulo.javascript.lang.JavaScriptLanguage;
-
-import javax.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 2019-12-15
- */
-public class JSXLanguageBreadcrumbsInfoProvider extends XmlLanguageBreadcrumbsInfoProvider
-{
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
-}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
index d42a0071..436979ff 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
@@ -33,12 +33,14 @@
 import consulo.ide.IconDescriptorUpdaters;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author Maxim.Mossienko
  *         Date: Jul 23, 2008
  *         Time: 6:54:27 PM
  */
-class JSStructureItemPresentation extends JSStructureViewElement.JSStructureItemPresentationBase
+public class JSStructureItemPresentation extends JSStructureViewElement.JSStructureItemPresentationBase
 {
 	public JSStructureItemPresentation(final JSStructureViewElement jsStructureViewElement)
 	{
@@ -55,6 +57,12 @@ public String getPresentableText()
 			return "*invalid*";
 		}
 
+		return getName(psiElement);
+	}
+
+	@RequiredReadAction
+	public static String getName(@Nonnull PsiElement psiElement)
+	{
 		if(psiElement instanceof JSObjectLiteralExpression)
 		{
 			if(psiElement.getParent() instanceof JSAssignmentExpression)
diff --git a/plugin/src/main/java/consulo/javascript/ide/navigationToolbar/JavaScriptNavBarModelExtension.java b/plugin/src/main/java/consulo/javascript/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
new file mode 100644
index 00000000..b2b95ab1
--- /dev/null
+++ b/plugin/src/main/java/consulo/javascript/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
@@ -0,0 +1,33 @@
+package consulo.javascript.ide.navigationToolbar;
+
+import com.intellij.ide.navigationToolbar.StructureAwareNavBarModelExtension;
+import com.intellij.lang.Language;
+import com.intellij.lang.javascript.structureView.JSStructureItemPresentation;
+import com.intellij.psi.PsiElement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.JavaScriptLanguage;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 17/01/2021
+ */
+public class JavaScriptNavBarModelExtension extends StructureAwareNavBarModelExtension
+{
+	@Nonnull
+	@Override
+	protected Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+
+	@Nullable
+	@Override
+	@RequiredReadAction
+	public String getPresentableText(Object object)
+	{
+		return object instanceof PsiElement ? JSStructureItemPresentation.getName((PsiElement) object) : null;
+	}
+}
diff --git a/plugin/src/main/resources/META-INF/jsx.xml b/plugin/src/main/resources/META-INF/jsx.xml
index 4eb3391a..13a01cf5 100644
--- a/plugin/src/main/resources/META-INF/jsx.xml
+++ b/plugin/src/main/resources/META-INF/jsx.xml
@@ -13,8 +13,6 @@
 
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.jsx.language.JSXJavaScriptVersion"/>
 
-		<breadcrumbsInfoProvider implementation="consulo.javascript.jsx.codeInsight.breadcrumbs.JSXLanguageBreadcrumbsInfoProvider"/>
-
 		<textEditorHighlightingPassFactory implementation="consulo.javascript.jsx.codeInsight.daemon.impl.tagTreeHighlighting.JSXTagTreeHighlightingPassFactory"/>
 	</extensions>
 </consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 97614d4e..24fe1902 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -88,7 +88,7 @@
 
 		<lang.findUsagesProvider language="JavaScript" implementationClass="com.intellij.lang.javascript.findUsages.JavaScriptFindUsagesProvider"/>
 
-		<lang.syntaxHighlighterFactory key="JavaScript"
+		<lang.syntaxHighlighterFactory language="JavaScript"
 									   implementationClass="consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightFactory"/>
 		<lang.commenter language="JavaScript" implementationClass="com.intellij.lang.javascript.JavascriptCommenter"/>
 
@@ -155,6 +155,8 @@
 
 		<findUsagesHandlerFactory implementation="consulo.javascript.findUsages.JavaScriptFindUsagesHandlerFactory"/>
 
+		<navbar implementation="consulo.javascript.ide.navigationToolbar.JavaScriptNavBarModelExtension" />
+
 		<sdkType implementation="consulo.javascript.client.module.sdk.ClientJavaScriptSdkType"/>
 		<predefinedBundlesProvider implementation="consulo.javascript.client.module.sdk.ClientJavaScriptPredefinedBundlesProvider"/>
 		<moduleExtensionProvider key="client-javascript"

From 63a189f1230bcaf083fb273e9f31fca5fe8c891d Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 8 Mar 2021 19:11:42 +0300
Subject: [PATCH 132/340] drop usage deprecated class

---
 .../flex/ECMAScriptImportOptimizer.java       | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
index cce975ad..47a5e765 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
@@ -16,26 +16,12 @@
 
 package com.intellij.lang.javascript.flex;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.lang.ImportOptimizer;
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.psi.JSBlockStatement;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSImportStatement;
-import com.intellij.lang.javascript.psi.JSPackageStatement;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.validation.JSUnusedImportsHelper;
@@ -43,17 +29,14 @@
 import com.intellij.openapi.util.EmptyRunnable;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiFileFactory;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.SmartPointerManager;
-import com.intellij.psi.SmartPsiElementPointer;
+import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.util.containers.HashSet;
 import com.intellij.util.containers.MultiMap;
 import consulo.javascript.lang.JavaScriptLanguage;
 
+import javax.annotation.Nonnull;
+import java.util.*;
+
 /**
  * @author Maxim.Mossienko
  *         Date: Jul 23, 2008
@@ -61,7 +44,6 @@
  */
 public class ECMAScriptImportOptimizer implements ImportOptimizer
 {
-
 	@Override
 	public boolean supports(PsiFile file)
 	{

From 2d52883d158d6c1b727b1b23778596d54d453e7a Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 6 Jun 2021 21:41:42 +0300
Subject: [PATCH 133/340] remove gnu trove usage

---
 .../javascript/flex/FlexImportSupport.java    | 15 +++----
 .../javascript/flex/XmlBackedJSClassImpl.java |  3 +-
 .../lang/javascript/index/JSSymbolUtil.java   | 17 ++++---
 .../lang/javascript/psi/impl/JSClassBase.java |  8 ++--
 .../javascript/psi/impl/JSPsiImplUtils.java   |  6 +--
 .../JSSmartCompletionVariantsHandler.java     | 18 ++++----
 .../psi/resolve/BaseJSSymbolProcessor.java    |  6 +--
 .../psi/resolve/JSImportHandlingUtil.java     |  8 ++--
 .../javascript/psi/resolve/JSResolveUtil.java | 45 +++++++++----------
 .../psi/resolve/ResolveProcessor.java         |  8 ++--
 .../psi/resolve/VariantsProcessor.java        |  3 +-
 .../lang/javascript/search/JSClassSearch.java |  6 +--
 .../validation/JSUnusedImportsHelper.java     |  9 ++--
 .../PropertyValidationInspection.java         | 32 ++++---------
 ...ImportECMAScriptClassOrFunctionAction.java | 18 ++++----
 .../flex/importer/AS3InterfaceDumper.java     | 11 ++---
 .../JavaScriptLineMarkerProvider.java         | 14 +++---
 .../JSUnusedLocalSymbolsInspection.java       | 23 +++++-----
 .../structureView/JSStructureViewElement.java | 25 +++--------
 .../structureView/JSSuperGrouper.java         | 26 +++++------
 .../validation/JSAnnotatingVisitor.java       | 13 ++----
 21 files changed, 128 insertions(+), 186 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
index bc050ee2..196a083c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
@@ -16,12 +16,6 @@
 
 package com.intellij.lang.javascript.flex;
 
-import gnu.trove.THashMap;
-
-import java.util.Map;
-
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.lang.javascript.psi.resolve.JSImportedElementResolveResult;
@@ -29,6 +23,11 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.util.ArrayUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Maxim.Mossienko
@@ -82,8 +81,8 @@ public class FlexImportSupport
 			"flash.xml.*"
 	};
 
-	private static final Map<String, Object> implicitImportListMap = new THashMap<String, Object>();
-	private static final Map<String, Object> mxmlImportListMap = new THashMap<String, Object>();
+	private static final Map<String, Object> implicitImportListMap = new HashMap<String, Object>();
+	private static final Map<String, Object> mxmlImportListMap = new HashMap<String, Object>();
 
 	static
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index a8efc655..231ec30b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -38,7 +38,6 @@
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.xml.XmlElementDescriptor;
 import consulo.util.dataholder.Key;
-import gnu.trove.THashMap;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -358,7 +357,7 @@ protected CachedValue<Map<String, String>> compute(final XmlFile file, final Obj
 				@Override
 				public Result<Map<String, String>> compute()
 				{
-					final Map<String, String> cachedComponentImports = new THashMap<String, String>();
+					final Map<String, String> cachedComponentImports = new HashMap<String, String>();
 					final List<PsiFile> dependencies = new ArrayList<PsiFile>();
 					dependencies.add(file);
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
index 08f535b3..b961bedb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
@@ -16,19 +16,18 @@
 
 package com.intellij.lang.javascript.index;
 
-import gnu.trove.THashSet;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @by maxim.mossienko, yole
@@ -334,7 +333,7 @@ else if(expr != expression)
 				{
 					if(visited == null)
 					{
-						visited = new THashSet<String>();
+						visited = new HashSet<String>();
 					}
 					final String replaced = expr.getText();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index 23b83dd6..05bf8be4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -34,8 +34,6 @@
 import com.intellij.util.ArrayFactory;
 import com.intellij.util.ArrayUtil;
 import consulo.util.dataholder.Key;
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -223,7 +221,7 @@ Map<String, JSVariable> initFields()
 
 				if(name2FieldsMap == null)
 				{
-					name2FieldsMap = new THashMap<String, JSVariable>();
+					name2FieldsMap = new HashMap<String, JSVariable>();
 
 					for(JSVariable variable : getFields())
 					{
@@ -255,7 +253,7 @@ Map<String, Object> initFunctions()
 
 				if(name2FunctionMap == null)
 				{
-					name2FunctionMap = new THashMap<String, Object>();
+					name2FunctionMap = new HashMap<String, Object>();
 
 					for(JSFunction function : getFunctions())
 					{
@@ -500,7 +498,7 @@ public JSIncludeDirective[] create(final int count)
 				return new JSIncludeDirective[count];
 			}
 		});
-		Collection<JSFile> visited = new THashSet<JSFile>();
+		Collection<JSFile> visited = new HashSet<JSFile>();
 		TokenSet filter = TokenSet.create(JSElementTypes.INCLUDE_DIRECTIVE, elementType);
 		for(JSIncludeDirective include : includes)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 8784ce7b..1fc9dc33 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -45,7 +45,7 @@
 import consulo.javascript.lang.psi.impl.elementType.BaseJavaScriptElementType;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
-import gnu.trove.TObjectHashingStrategy;
+import consulo.util.collection.HashingStrategy;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -414,10 +414,10 @@ static boolean isTheSameClass(final PsiElement typeSource, final JSClass jsClass
 		return false;
 	}
 
-	public static final TObjectHashingStrategy<JSQualifiedNamedElement> QUALIFIED_NAME_HASHING_STRATEGY = new TObjectHashingStrategy<JSQualifiedNamedElement>()
+	public static final HashingStrategy<JSQualifiedNamedElement> QUALIFIED_NAME_HASHING_STRATEGY = new HashingStrategy<>()
 	{
 		@Override
-		public int computeHashCode(final JSQualifiedNamedElement object)
+		public int hashCode(final JSQualifiedNamedElement object)
 		{
 			return object == null || object.getQualifiedName() == null ? 0 : object.getQualifiedName().hashCode();
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
index d60d2814..b91b228c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
@@ -16,15 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import gnu.trove.THashMap;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -41,6 +32,13 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.Query;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author Maxim.Mossienko
@@ -86,7 +84,7 @@ private static class MyEventSubclassesProcessor extends ResolveProcessor impleme
 		private final PsiElement myExpr;
 		private final List<Object> myVariants;
 		private final ResolveState state = new ResolveState();
-		private final Map<String, JSVariable> myCandidatesMap = new THashMap<String, JSVariable>();
+		private final Map<String, JSVariable> myCandidatesMap = new HashMap<String, JSVariable>();
 		private boolean findAcceptableEvents;
 
 		public MyEventSubclassesProcessor(final PsiElement expr, final List<Object> variants)
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index a8f3f5e7..212fda56 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -38,11 +38,11 @@
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.JavaScriptVersionUtil;
 import consulo.util.dataholder.Key;
-import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -1090,7 +1090,7 @@ public boolean execute(final PsiElement element, final ResolveState state)
 	public static class EvaluateContext
 	{
 		public final PsiFile targetFile;
-		public final Set<String> visitedTypes = new THashSet<String>();
+		public final Set<String> visitedTypes = new HashSet<String>();
 		private Set<JSExpression> processingItems;
 		private PsiElement source;
 
@@ -1112,7 +1112,7 @@ public void addProcessingItem(final JSExpression rawqualifier)
 		{
 			if(processingItems == null)
 			{
-				processingItems = new THashSet<JSExpression>();
+				processingItems = new HashSet<JSExpression>();
 			}
 			processingItems.add(rawqualifier);
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index d1093fb8..dc468674 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -43,11 +43,11 @@
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
 import consulo.lang.LanguageVersion;
 import consulo.util.dataholder.Key;
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -542,7 +542,7 @@ protected final CachedValue<Map<String, Object>> compute(final PsiElement owner,
 				@Override
 				public Result<Map<String, Object>> compute()
 				{
-					final Map<String, Object> result = new THashMap<String, Object>();
+					final Map<String, Object> result = new HashMap<String, Object>();
 					collect(result, owner, null);
 					return new Result<Map<String, Object>>(result, owner);
 				}
@@ -560,7 +560,7 @@ private static void collect(final Map<String, Object> result, final PsiElement o
 				{
 					if(visitedIncludes == null)
 					{
-						visitedIncludes = new THashSet<PsiFile>();
+						visitedIncludes = new HashSet<PsiFile>();
 					}
 					visitedIncludes.add(file);
 					children = JSResolveUtil.getSourceElements(file);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 404dcf18..bae8080c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -76,10 +76,9 @@
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
 import consulo.roots.types.BinariesOrderRootType;
+import consulo.util.collection.primitive.ints.IntMaps;
+import consulo.util.collection.primitive.ints.IntObjectMap;
 import consulo.util.dataholder.Key;
-import gnu.trove.THashSet;
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TIntObjectIterator;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -91,8 +90,8 @@
  */
 public class JSResolveUtil
 {
-	private static final Key<CachedValue<TIntObjectHashMap<Object>>> MY_CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
-	private static UserDataCache<CachedValue<TIntObjectHashMap<Object>>, JSElement, Object> ourCachedDefsCache = new RelevantDefsUserDataCache();
+	private static final Key<CachedValue<IntObjectMap<Object>>> MY_CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
+	private static UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> ourCachedDefsCache = new RelevantDefsUserDataCache();
 	@NonNls
 	public static final String PROTOTYPE_FIELD_NAME = "prototype";
 
@@ -813,7 +812,7 @@ public boolean execute(PsiElement element, ResolveState state)
 							}
 							if(openedNses == null)
 							{
-								openedNses = new THashSet<String>();
+								openedNses = new HashSet<String>();
 							}
 							openedNses.add(((JSUseNamespaceDirective) element).getNamespaceToBeUsed());
 							return true;
@@ -1234,7 +1233,7 @@ public boolean process(JSClass jsClass)
 		}, true);
 
 
-		Collection<JSClass> visited = new THashSet<JSClass>();
+		Collection<JSClass> visited = new HashSet<JSClass>();
 		visitAllImplementedInterfaces(lastVisitedClass.get(), visited, new Processor<JSClass>()
 		{
 			@Override
@@ -1418,7 +1417,7 @@ else if(element instanceof JSFunction)
 						{
 							final JSClass anotherClass = (JSClass) elementParent;
 
-							final Collection<JSClass> visitedInterfaces = new THashSet<JSClass>();
+							final Collection<JSClass> visitedInterfaces = new HashSet<JSClass>();
 							return iterateOverridenMethodsUp((JSFunction) resolvedElement, new Processor<JSClass>()
 							{
 								@Override
@@ -1551,7 +1550,7 @@ public static boolean checkClassHasParentOfAnotherOne(final JSClass aClass, fina
 			}
 			if(visited == null)
 			{
-				visited = new THashSet<JSClass>();
+				visited = new HashSet<JSClass>();
 			}
 			visited.add(aClass);
 			return checkClassHasParentOfAnotherOne(superClazz, parent, visited);
@@ -1667,7 +1666,7 @@ private static PsiElement findClassByQName(final String link, final Project proj
 				{
 					if("Object".equals(link) && !JavaScriptIndex.ECMASCRIPT_JS2.equals(clazz.getContainingFile().getVirtualFile().getName()) // object from swf do
 						// not contain necessary members!
-							)
+					)
 					{
 						continue;
 					}
@@ -2113,15 +2112,13 @@ public static boolean processDeclarationsInScope(final JSElement _scope, final P
 		}
 
 		boolean result = true;
-		final TIntObjectHashMap<Object> defsMap = ourCachedDefsCache.get(MY_CACHED_STATEMENTS, scope, null).getValue();
+		final IntObjectMap<Object> defsMap = ourCachedDefsCache.get(MY_CACHED_STATEMENTS, scope, null).getValue();
 
 		if(requiredName == null)
 		{
-			TIntObjectIterator<Object> iterator = defsMap.iterator();
-			while(iterator.hasNext())
+			for(Object value : defsMap.values())
 			{
-				iterator.advance();
-				result = dispatchResolve(processor, state, place, result, iterator.value());
+				result = dispatchResolve(processor, state, place, result, value);
 			}
 		}
 		else
@@ -2226,22 +2223,22 @@ public JavaScriptImportStatementBase getImportUsed()
 
 	public static Key<PsiElement> contextKey = Key.create("context.key"); // JSElement or XmlElement
 
-	public static class RelevantDefsUserDataCache extends UserDataCache<CachedValue<TIntObjectHashMap<Object>>, JSElement, Object>
+	public static class RelevantDefsUserDataCache extends UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object>
 	{
 
 		@Override
-		protected CachedValue<TIntObjectHashMap<Object>> compute(final JSElement jsElement, final Object o)
+		protected CachedValue<IntObjectMap<Object>> compute(final JSElement jsElement, final Object o)
 		{
-			return CachedValuesManager.getManager(jsElement.getProject()).createCachedValue(new CachedValueProvider<TIntObjectHashMap<Object>>()
+			return CachedValuesManager.getManager(jsElement.getProject()).createCachedValue(new CachedValueProvider<IntObjectMap<Object>>()
 			{
 				@Override
-				public Result<TIntObjectHashMap<Object>> compute()
+				public Result<IntObjectMap<Object>> compute()
 				{
-					final TIntObjectHashMap<Object> relevantDefs = new TIntObjectHashMap<Object>();
+					final IntObjectMap<Object> relevantDefs = IntMaps.newIntObjectHashMap();
 					final MyJSElementVisitor elementVisitor = new MyJSElementVisitor(jsElement, relevantDefs);
 					elementVisitor.startVisiting(jsElement);
 
-					return new Result<TIntObjectHashMap<Object>>(relevantDefs, jsElement);
+					return new Result<IntObjectMap<Object>>(relevantDefs, jsElement);
 				}
 			}, false);
 		}
@@ -2250,11 +2247,11 @@ private static class MyJSElementVisitor extends JSElementVisitor
 		{
 			private HashMap<String, Boolean> checkedVarsToOurStatus;
 			private Set<JSFile> visitedIncludes;
-			private final TIntObjectHashMap<Object> myRelevantDefs;
+			private final IntObjectMap<Object> myRelevantDefs;
 			private final JSElement myBase;
 			private JSElement context;
 
-			public MyJSElementVisitor(JSElement base, final TIntObjectHashMap<Object> relevantDefs)
+			public MyJSElementVisitor(JSElement base, final IntObjectMap<Object> relevantDefs)
 			{
 				myRelevantDefs = relevantDefs;
 				myBase = base;
@@ -2373,7 +2370,7 @@ public void visitJSIncludeDirective(final JSIncludeDirective includeDirective)
 				}
 				if(visitedIncludes == null)
 				{
-					visitedIncludes = new THashSet<JSFile>();
+					visitedIncludes = new HashSet<JSFile>();
 				}
 				visitedIncludes.add(file);
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index c668e624..b61d4639 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -38,11 +38,11 @@
 import consulo.javascript.psi.JavaScriptImportStatementBase;
 import consulo.util.dataholder.Key;
 import consulo.util.dataholder.UserDataHolderBase;
-import gnu.trove.THashSet;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -54,7 +54,7 @@ public class ResolveProcessor extends UserDataHolderBase implements PsiScopeProc
 	private static final Key<String> ASKING_FOR_QUALIFIED_IMPORT = Key.create("asking.for.import.of.qname");
 	protected static final Key<Boolean> LOOKING_FOR_USE_NAMESPACES = Key.create("looking.for.use.directive");
 
-	private final Set<String> visitedClasses = new THashSet<String>();
+	private final Set<String> visitedClasses = new HashSet<String>();
 
 	private boolean myToStopOnAssignment;
 	protected final String myName;
@@ -145,7 +145,7 @@ public ResolveProcessor(final String name, PsiElement _place)
 
 			if(explicitNs != null && !anyNsAllowed)
 			{
-				openedNses = new THashSet<String>();
+				openedNses = new HashSet<String>();
 				openedNses.add(explicitNs);
 				defaultNsIsNotAllowed = true;
 			}
@@ -729,7 +729,7 @@ public Object[] getResultsAsObjects(String qualifiedNameToSkip)
 		}
 		final int numberOfVariants = processorResults.size();
 		final List<Object> objects = new ArrayList<Object>(numberOfVariants);
-		final Set<String> processedCandidateNames = new THashSet<String>(numberOfVariants);
+		final Set<String> processedCandidateNames = new HashSet<String>(numberOfVariants);
 
 		for(int i = 0; i < numberOfVariants; ++i)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index 433ea4ff..9fcd87a9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -29,7 +29,6 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptFeature;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
-import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
 
 import java.util.*;
@@ -209,7 +208,7 @@ public void addLocalResults(final List<PsiElement> results)
 			return;
 		}
 
-		final Set<String> processedCandidateNames = new THashSet<String>(results.size());
+		final Set<String> processedCandidateNames = new HashSet<String>(results.size());
 
 		for(PsiElement e : results)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index 3033d363..ae2c888d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -26,10 +26,10 @@
 import com.intellij.psi.stubs.StubIndexKey;
 import com.intellij.util.*;
 import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
-import gnu.trove.THashSet;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Set;
 
 public abstract class JSClassSearch implements QueryExecutor<JSClass, JSClassSearch.SearchParameters>
@@ -106,7 +106,7 @@ protected JSClass[] getSupers(final JSClass candidate)
 			@Override
 			public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull Processor<? super JSClass> consumer)
 			{
-				final THashSet<JSClass> visited = new THashSet<JSClass>();         // no abstract classes in ActionScript !
+				final Set<JSClass> visited = new HashSet<JSClass>();         // no abstract classes in ActionScript !
 
 				if(queryParameters.isCheckDeepInheritance())
 				{
@@ -187,7 +187,7 @@ protected boolean processDirectInheritors(final JSClass superClass, final Proces
 		}
 		else
 		{
-			processed = new THashSet<JSClass>();
+			processed = new HashSet<JSClass>();
 		}
 
 		processed.add(superClass);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index 894340cf..1d80528e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -34,7 +34,6 @@
 import com.intellij.psi.xml.XmlText;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
 import consulo.util.dataholder.Key;
-import gnu.trove.THashSet;
 
 import javax.annotation.Nullable;
 import java.util.*;
@@ -67,9 +66,9 @@ public Results(Map<JSReferenceExpression, String> fqnsToReplaceWithImport, Colle
 
 	private static final Key<CachedValue<Results>> ourUnusedImportsKey = Key.create("js.unused.imports");
 
-	private final THashSet<JSImportStatement> unusedImports = new THashSet<JSImportStatement>();
-	private final Collection<JSImportStatement> allImports = new THashSet<JSImportStatement>();
-	private final THashSet<JSImportStatement> importsUsedAheadOfDefinition = new THashSet<JSImportStatement>();
+	private final Set<JSImportStatement> unusedImports = new HashSet<JSImportStatement>();
+	private final Collection<JSImportStatement> allImports = new HashSet<JSImportStatement>();
+	private final Set<JSImportStatement> importsUsedAheadOfDefinition = new HashSet<JSImportStatement>();
 	private final Map<JSReferenceExpression, String> fqnsToReplaceWithImport = new HashMap<JSReferenceExpression, String>();
 	private final PsiFile myContainingFile;
 
@@ -275,7 +274,7 @@ public static Results getUnusedImports(PsiFile file)
 				public Result<Results> compute()
 				{
 					final Map<XmlTag, Collection<PsiElement>> allElements = new HashMap<XmlTag, Collection<PsiElement>>();
-					Collection<JSFile> processedFiles = new THashSet<JSFile>();
+					Collection<JSFile> processedFiles = new HashSet<JSFile>();
 					collectElements(null, containingFile1, allElements, processedFiles);
 
 					Results allResults = new Results(new HashMap<JSReferenceExpression, String>(), new ArrayList<JSImportStatement>(),
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index 3b28ab77..eb005fcb 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -16,46 +16,30 @@
 
 package consulo.json.validation.inspections;
 
-import gnu.trove.THashSet;
-
-import java.util.ArrayDeque;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.lang.javascript.psi.JSProperty;
-import consulo.javascript.psi.JSSimpleLiteralExpression;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.CachedValueProvider;
-import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.PsiModificationTracker;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtilCore;
+import com.intellij.psi.util.*;
 import com.intellij.util.PairProcessor;
 import com.intellij.util.containers.ContainerUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.json.validation.JsonFileDescriptorProviders;
 import consulo.json.validation.NativeArray;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.*;
+
 /**
  * @author VISTALL
  * @since 10.11.2015
@@ -218,7 +202,7 @@ else if(node instanceof JSObjectLiteralExpression)
 		}
 		else if(node instanceof JSArrayLiteralExpression)
 		{
-			Set<Object> types = new THashSet<>();
+			Set<Object> types = new HashSet<>();
 			JSExpression[] expressions = ((JSArrayLiteralExpression) node).getExpressions();
 			for(JSExpression expression : expressions)
 			{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
index 4a06a330..930e567d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -16,15 +16,6 @@
 
 package com.intellij.lang.javascript.flex;
 
-import gnu.trove.THashSet;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.codeInsight.hint.QuestionAction;
 import com.intellij.codeInsight.navigation.NavigationUtil;
@@ -53,6 +44,13 @@
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.util.SmartList;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
 
 /**
  * @author Maxim.Mossienko
@@ -178,7 +176,7 @@ private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile
 		{
 			Collection<JSQualifiedNamedElement> c = getCandidates(editor, file, myReference.getCanonicalText());
 			filterDefaultPackage(c);
-			candidates = new THashSet<JSQualifiedNamedElement>(c, JSPsiImplUtils.QUALIFIED_NAME_HASHING_STRATEGY);
+			candidates = new HashSet<JSQualifiedNamedElement>(c, JSPsiImplUtils.QUALIFIED_NAME_HASHING_STRATEGY);
 		}
 		else
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
index a3140c6d..4ba39903 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
@@ -16,16 +16,11 @@
 
 package com.intellij.lang.javascript.flex.importer;
 
-import gnu.trove.THashSet;
-
-import java.util.Arrays;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Set;
 
 /**
  * @author Maxim.Mossienko
@@ -139,7 +134,7 @@ else if(value.length() > 0 && (Character.isDigit(ch = value.charAt(0)) || (ch ==
 
 	private static
 	@NonNls
-	Set<String> doNotNeedQoting = new THashSet<String>(Arrays.asList("null", "NaN", "undefined", "true", "false", "Infinity", "-Infinity"));
+	Set<String> doNotNeedQoting = Set.of("null", "NaN", "undefined", "true", "false", "Infinity", "-Infinity");
 
 	private static boolean needsQuoting(final String value)
 	{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
index b0b397f0..b01e2a19 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
@@ -41,8 +41,6 @@
 import com.intellij.util.Processor;
 import com.intellij.util.Query;
 import consulo.util.dataholder.Key;
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -233,7 +231,7 @@ public String fun(final JSFunction psiElement)
 						@Override
 						public void navigate(final MouseEvent e, final JSFunction elt)
 						{
-							final Set<NavigationItem> results = new THashSet<>();
+							final Set<NavigationItem> results = new HashSet<>();
 							JSResolveUtil.iterateType(function, parentNode1, typeName, new JSResolveUtil.OverrideHandler()
 							{
 								@Override
@@ -269,8 +267,8 @@ else if(results.size() > 1)
 	@Override
 	public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @Nonnull final Collection<LineMarkerInfo> result)
 	{
-		final Map<String, Set<JSFunction>> jsFunctionsToProcess = new THashMap<>();
-		final Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new THashMap<>();
+		final Map<String, Set<JSFunction>> jsFunctionsToProcess = new HashMap<>();
+		final Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new HashMap<>();
 
 		for(final PsiElement el : elements)
 		{
@@ -297,7 +295,7 @@ public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @No
 					Set<JSFunction> functions = jsMethodsToProcess.get(clazz);
 					if(functions == null)
 					{
-						functions = new THashSet<>();
+						functions = new HashSet<>();
 						jsMethodsToProcess.put(clazz, functions);
 					}
 
@@ -312,7 +310,7 @@ else if(parent instanceof JSFile || function instanceof JSFunctionExpression)
 
 						if(functions == null)
 						{
-							functions = new THashSet<>();
+							functions = new HashSet<>();
 							jsFunctionsToProcess.put(qName, functions);
 						}
 
@@ -341,7 +339,7 @@ else if(el instanceof JSClass)
 			classQuery.forEach(new Processor<JSClass>()
 			{
 				boolean addedClassMarker;
-				final Set<JSFunction> methodsClone = methods == null || clazz.isInterface() ? null : new THashSet<>(methods);
+				final Set<JSFunction> methodsClone = methods == null || clazz.isInterface() ? null : new HashSet<>(methods);
 
 				@Override
 				public boolean process(final JSClass jsClass)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
index b4918956..41e4d423 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
@@ -37,15 +37,16 @@
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
+import consulo.util.collection.primitive.objects.ObjectIntMap;
+import consulo.util.collection.primitive.objects.ObjectMaps;
 import consulo.util.dataholder.Key;
-import gnu.trove.THashSet;
-import gnu.trove.TObjectIntHashMap;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.PropertyKey;
 
 import javax.annotation.Nonnull;
 import java.util.BitSet;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -101,7 +102,7 @@ public void visitJSParameterList(final JSParameterList node)
 
 				if(set == null)
 				{
-					parent.putUserData(ourUnusedLocalDeclarationsSetKey, Collections.synchronizedSet(new THashSet<PsiElement>(3)));
+					parent.putUserData(ourUnusedLocalDeclarationsSetKey, Collections.synchronizedSet(new HashSet<PsiElement>(3)));
 				}
 				else if(node.getParameters().length == 0)
 				{
@@ -147,7 +148,7 @@ public void visitJSParameter(final JSParameter node)
 
 				if(parameterList.getNode().findChildByType(JSElementTypes.FORMAL_PARAMETER) == node.getNode())
 				{
-					unusedParametersSet = Collections.synchronizedSet(new THashSet<PsiElement>(3));
+					unusedParametersSet = Collections.synchronizedSet(new HashSet<PsiElement>(3));
 					scopeNode.putUserData(ourUnusedLocalDeclarationsSetKey, unusedParametersSet);
 				}
 				else
@@ -213,7 +214,7 @@ public void visitJSReferenceExpression(final JSReferenceExpression node)
 										Set<PsiElement> set = scopeHandler.getUserData(ourUsedLocalDeclarationsSetKey);
 										if(set == null)
 										{
-											set = new THashSet<PsiElement>(3);
+											set = new HashSet<PsiElement>(3);
 											scopeHandler.putUserData(ourUsedLocalDeclarationsSetKey, set);
 										}
 										set.add(element);
@@ -255,11 +256,11 @@ private static void processDeclarationHost(final PsiElement node, final Problems
 
 		try
 		{
-			unusedDeclarationsSet = new THashSet<PsiElement>(unusedDeclarationsSet);
+			unusedDeclarationsSet = new HashSet<PsiElement>(unusedDeclarationsSet);
 
 			final int nonCounted = -2;
 			int lastUsedParameterIndex = nonCounted;
-			TObjectIntHashMap<JSParameter> parameterIndexMap = null;
+			ObjectIntMap<JSParameter> parameterIndexMap = null;
 
 			for(final PsiElement p : unusedDeclarationsSet)
 			{
@@ -335,10 +336,10 @@ public boolean execute(final PsiElement element, final ResolveState state)
 					if(lastUsedParameterIndex == nonCounted)
 					{
 						BitSet unusedSet = new BitSet(params.length);
-						parameterIndexMap = new TObjectIntHashMap<JSParameter>();
+						parameterIndexMap = ObjectMaps.newObjectIntHashMap();
 						for(int i = 0; i < params.length; ++i)
 						{
-							parameterIndexMap.put(params[i], i);
+							parameterIndexMap.putInt(params[i], i);
 						}
 
 						for(PsiElement param : unusedDeclarationsSet)
@@ -347,7 +348,7 @@ public boolean execute(final PsiElement element, final ResolveState state)
 							{
 								continue;
 							}
-							unusedSet.set(parameterIndexMap.get((JSParameter) param));
+							unusedSet.set(parameterIndexMap.getInt((JSParameter) param));
 						}
 
 						lastUsedParameterIndex = -1;
@@ -362,7 +363,7 @@ public boolean execute(final PsiElement element, final ResolveState state)
 						}
 					}
 
-					if(parameterIndexMap.get((JSParameter) p) < lastUsedParameterIndex)
+					if(parameterIndexMap.getInt((JSParameter) p) < lastUsedParameterIndex)
 					{
 						continue; // no sense to report unused symbol before used since it will change signature
 					}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
index 1b126d67..d3373128 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
@@ -28,10 +28,8 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
-import gnu.trove.TIntObjectHashMap;
-import gnu.trove.TIntObjectProcedure;
+import consulo.util.collection.primitive.ints.IntMaps;
+import consulo.util.collection.primitive.ints.IntObjectMap;
 
 import javax.annotation.Nullable;
 import java.util.*;
@@ -148,7 +146,7 @@ public int compare(final StructureViewTreeElement _o1, final StructureViewTreeEl
 
 		if(elementsFromSupers != null)
 		{
-			Map<String, JSFunction> functionsByNames = new THashMap<String, JSFunction>();
+			Map<String, JSFunction> functionsByNames = new HashMap<String, JSFunction>();
 			for(StructureViewTreeElement child : children)
 			{
 				PsiElement el = getPsiElementResolveProxy(child);
@@ -211,21 +209,12 @@ public static PsiElement getPsiElementResolveProxy(StructureViewTreeElement elem
 
 	protected List<StructureViewTreeElement> collectMyElements(final Set<String> referencedNamedIds)
 	{
-		final TIntObjectHashMap<PsiElement> offset2Element = new TIntObjectHashMap<PsiElement>();
+		final IntObjectMap<PsiElement> offset2Element = IntMaps.newIntObjectHashMap();
 
 		collectChildrenFromElement(myElement, referencedNamedIds, offset2Element);
 
-
 		final List<StructureViewTreeElement> children = new ArrayList<StructureViewTreeElement>(offset2Element.size());
-		offset2Element.forEachEntry(new TIntObjectProcedure<PsiElement>()
-		{
-			@Override
-			public boolean execute(int textOffset, PsiElement element)
-			{
-				children.add(createStructureViewElement(element));
-				return true;
-			}
-		});
+		offset2Element.forEach((textOffset, element) -> children.add(createStructureViewElement(element)));
 		return children;
 	}
 
@@ -257,7 +246,7 @@ private static boolean isVisible(PsiElement namedElement, final PsiElement eleme
 		return true;
 	}
 
-	private static void collectChildrenFromElement(final PsiElement element, final Set<String> referencedNamedIds, final TIntObjectHashMap<PsiElement> offset2Element)
+	private static void collectChildrenFromElement(final PsiElement element, final Set<String> referencedNamedIds, final IntObjectMap<PsiElement> offset2Element)
 	{
 		element.acceptChildren(new JSElementVisitor()
 		{
@@ -307,7 +296,7 @@ public void visitJSIncludeDirective(final JSIncludeDirective includeDirective)
 					}
 					if(visited == null)
 					{
-						visited = new THashSet<PsiFile>();
+						visited = new HashSet<PsiFile>();
 					}
 					visited.add(file);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
index a8e2ba19..a5e1c135 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
@@ -16,29 +16,23 @@
 
 package com.intellij.lang.javascript.structureView;
 
-import consulo.platform.base.icon.PlatformIconGroup;
-import gnu.trove.THashMap;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
-import com.intellij.ide.util.treeView.smartTree.ActionPresentation;
-import com.intellij.ide.util.treeView.smartTree.ActionPresentationData;
-import com.intellij.ide.util.treeView.smartTree.Group;
-import com.intellij.ide.util.treeView.smartTree.Grouper;
-import com.intellij.ide.util.treeView.smartTree.TreeElement;
+import com.intellij.ide.util.treeView.smartTree.*;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.psi.PsiElement;
+import consulo.platform.base.icon.PlatformIconGroup;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Maxim.Mossienko
@@ -56,7 +50,7 @@ public Collection<Group> group(final AbstractTreeNode parent, final Collection<T
 		{
 			return Collections.emptyList();
 		}
-		final Map<String, Group> groups = new THashMap<String, Group>();
+		final Map<String, Group> groups = new HashMap<String, Group>();
 
 		for(TreeElement _child : children)
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
index a809f4ee..be04d7ac 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
@@ -55,17 +55,12 @@
 import com.intellij.util.IncorrectOperationException;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
-import gnu.trove.THashMap;
-import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.PropertyKey;
 
 import javax.annotation.Nonnull;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @by max, maxim.mossienko
@@ -184,7 +179,7 @@ public void visitJSReferenceList(final JSReferenceList referenceList)
 			return;
 		}
 
-		final Map<String, JSReferenceExpression> nameToExprMap = new THashMap<String, JSReferenceExpression>();
+		final Map<String, JSReferenceExpression> nameToExprMap = new HashMap<String, JSReferenceExpression>();
 
 		final JSReferenceExpression[] referenceExpressions = referenceList.getExpressions();
 		if(referenceExpressions != null)
@@ -728,7 +723,7 @@ public void visitJSTryStatement(final JSTryStatement node)
 
 		if(blocks.length > 1)
 		{
-			final Set<String> typeToCatch = new THashSet<String>();
+			final Set<String> typeToCatch = new HashSet<String>();
 
 			for(JSCatchBlock block : blocks)
 			{
@@ -1205,7 +1200,7 @@ public boolean startInWriteAction()
 			});
 		}
 
-		final Set<JSNamedElement> elements = new THashSet<JSNamedElement>();
+		final Set<JSNamedElement> elements = new HashSet<JSNamedElement>();
 
 		for(JSSourceElement statement : packageStatement.getStatements())
 		{

From 868643d7c8910e3479e31c3276c2426b74bf16ff Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 6 Jun 2021 21:46:33 +0300
Subject: [PATCH 134/340] fix compilation

---
 .../main/java/consulo/javascript/lang/lexer/ecmascript6.flex  | 2 +-
 .../flex/AddImportECMAScriptClassOrFunctionAction.java        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index c4dd08e4..45c852ed 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -17,7 +17,7 @@ import consulo.javascript.lang.lexer.JavaScriptFlexLexer;
     private int tagCount = 0;
 
     private int braceCount;
-    private com.intellij.util.containers.IntStack jsExits = new com.intellij.util.containers.IntStack();
+    private consulo.util.collection.primitive.ints.IntStack jsExits = new consulo.util.collection.primitive.ints.IntStack();
 
     public final int getTagCount() {
       return tagCount;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
index 930e567d..2b4f94e7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -44,12 +44,12 @@
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.util.SmartList;
+import consulo.util.collection.Sets;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
 
 /**
@@ -176,7 +176,7 @@ private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile
 		{
 			Collection<JSQualifiedNamedElement> c = getCandidates(editor, file, myReference.getCanonicalText());
 			filterDefaultPackage(c);
-			candidates = new HashSet<JSQualifiedNamedElement>(c, JSPsiImplUtils.QUALIFIED_NAME_HASHING_STRATEGY);
+			candidates = Sets.newHashSet(c, JSPsiImplUtils.QUALIFIED_NAME_HASHING_STRATEGY);
 		}
 		else
 		{

From 6303f168a6f575fc2d5b4deb6809fdf7963e3167 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 3 Nov 2021 14:40:26 +0300
Subject: [PATCH 135/340] fix #33

---
 plugin/src/main/resources/META-INF/plugin.xml     | 3 +++
 plugin/src/main/resources/META-INF/pluginIcon.svg | 4 ++++
 2 files changed, 7 insertions(+)
 create mode 100644 plugin/src/main/resources/META-INF/pluginIcon.svg

diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 24fe1902..65f80ad9 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -23,6 +23,9 @@
 	<resource-bundle>messages.JavaScriptBundle</resource-bundle>
 	<depends>com.intellij.xml</depends>
 	<depends config-file="regexp.xml" optional="true">com.intellij.regexp</depends>
+	<tags>
+		<tag>custom.language</tag>
+	</tags>
 
 	<import path="/META-INF/Intentions.xml"/>
 	<import path="/META-INF/json.xml"/>
diff --git a/plugin/src/main/resources/META-INF/pluginIcon.svg b/plugin/src/main/resources/META-INF/pluginIcon.svg
new file mode 100644
index 00000000..9650ca78
--- /dev/null
+++ b/plugin/src/main/resources/META-INF/pluginIcon.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 630 630">
+<rect width="630" height="630" fill="#f7df1e"/>
+<path d="m423.2 492.19c12.69 20.72 29.2 35.95 58.4 35.95 24.53 0 40.2-12.26 40.2-29.2 0-20.3-16.1-27.49-43.1-39.3l-14.8-6.35c-42.72-18.2-71.1-41-71.1-89.2 0-44.4 33.83-78.2 86.7-78.2 37.64 0 64.7 13.1 84.2 47.4l-46.1 29.6c-10.15-18.2-21.1-25.37-38.1-25.37-17.34 0-28.33 11-28.33 25.37 0 17.76 11 24.95 36.4 35.95l14.8 6.34c50.3 21.57 78.7 43.56 78.7 93 0 53.3-41.87 82.5-98.1 82.5-54.98 0-90.5-26.2-107.88-60.54zm-209.13 5.13c9.3 16.5 17.76 30.45 38.1 30.45 19.45 0 31.72-7.61 31.72-37.2v-201.3h59.2v202.1c0 61.3-35.94 89.2-88.4 89.2-47.4 0-74.85-24.53-88.81-54.075z"/>
+</svg>
\ No newline at end of file

From 2788cfe9a7f179a6cf0cbd645a3fcbe971f75d44 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Fri, 3 Dec 2021 12:29:16 +0300
Subject: [PATCH 136/340] update file type icons

---
 .../json.svg                                   |   9 +++++++++
 .../as.png                                     | Bin 324 -> 0 bytes
 .../as.svg                                     |  10 ++++++++++
 .../as@2x.png                                  | Bin 733 -> 0 bytes
 .../ecmaScript.png                             | Bin 14776 -> 0 bytes
 .../ecmaScript.svg                             |  15 +++++++++++++++
 .../ecmaScript@2x.png                          | Bin 15092 -> 0 bytes
 .../javaScript.png                             | Bin 309 -> 0 bytes
 .../javaScript.svg                             |  10 ++++++++++
 .../javaScript@2x.png                          | Bin 627 -> 0 bytes
 .../json.png                                   | Bin 340 -> 0 bytes
 .../json.svg                                   |   9 +++++++++
 .../json@2x.png                                | Bin 879 -> 0 bytes
 .../jsx.png                                    | Bin 14798 -> 0 bytes
 .../jsx.svg                                    |  17 +++++++++++++++++
 .../jsx@2x.png                                 | Bin 15255 -> 0 bytes
 .../typeScript.png                             | Bin 307 -> 0 bytes
 .../typeScript.svg                             |  15 +++++++++++++++
 .../typeScript@2x.png                          | Bin 583 -> 0 bytes
 19 files changed, 85 insertions(+)
 create mode 100644 base-api/src/main/resources/icon/_dark/consulo.javascript.JavaScriptIconGroup/json.svg
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.png
 create mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.svg
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as@2x.png
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.png
 create mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.svg
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript@2x.png
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.png
 create mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.svg
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript@2x.png
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.png
 create mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.svg
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json@2x.png
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.png
 create mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.svg
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx@2x.png
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.png
 create mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.svg
 delete mode 100644 base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript@2x.png

diff --git a/base-api/src/main/resources/icon/_dark/consulo.javascript.JavaScriptIconGroup/json.svg b/base-api/src/main/resources/icon/_dark/consulo.javascript.JavaScriptIconGroup/json.svg
new file mode 100644
index 00000000..48be129a
--- /dev/null
+++ b/base-api/src/main/resources/icon/_dark/consulo.javascript.JavaScriptIconGroup/json.svg
@@ -0,0 +1,9 @@
+<!-- Copyright 2000-2021 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. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#9AA7B0" d="M8.416 13.8965C8.416 13.7395 8.437 13.3185 8.437 13.1395 8.437 12.3195 8.127 11.9835 7.269 11.9835L7 11.9835 7 11.0155 7.269 11.0155C8.127 11.0155 8.437 10.6685 8.437 9.8485 8.437 9.6695 8.416 9.2505 8.416 9.0915 8.416 8.0195 8.882 7.3465 10.765 7.0005L10.981 7.8405C9.74 8.1885 9.575 8.5135 9.575 9.2815 9.575 9.4925 9.596 9.8385 9.596 10.0595 9.596 10.8795 9.203 11.2785 8.52 11.5005 9.213 11.7305 9.596 12.1205 9.596 12.9405 9.596 13.1615 9.575 13.5075 9.575 13.7185 9.575 14.4855 9.74 14.8115 10.981 15.1585L10.765 16.0005C8.882 15.6525 8.416 14.9795 8.416 13.8965M12.0186 15.1582C13.2596 14.8112 13.4246 14.4852 13.4246 13.7192 13.4246 13.5082 13.4046 13.1612 13.4046 12.9402 13.4046 12.1202 13.7966 11.7202 14.4796 11.5002 13.7876 11.2682 13.4046 10.8802 13.4046 10.0592 13.4046 9.8392 13.4246 9.4922 13.4246 9.2812 13.4246 8.5132 13.2596 8.1882 12.0186 7.8412L12.2356 7.0002C14.1186 7.3462 14.5836 8.0192 14.5836 9.0922 14.5836 9.2502 14.5626 9.6702 14.5626 9.8482 14.5626 10.6692 14.8726 11.0152 15.7316 11.0152L15.9996 11.0152 15.9996 11.9832 15.7316 11.9832C14.8726 11.9832 14.5626 12.3192 14.5626 13.1392 14.5626 13.3182 14.5836 13.7392 14.5836 13.8962 14.5836 14.9792 14.1186 15.6522 12.2356 16.0002L12.0186 15.1582z"/>
+    <polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
+    <path fill="#9AA7B0" fill-opacity=".8" d="M10.5957,12.9404 C10.5957,13.0624 10.5847,13.9504 10.5907,13.9754 C10.5907,13.9744 10.5927,13.9734 10.5927,13.9734 C10.6227,13.9734 11.4997,14.2654 11.4997,14.2654 C11.4997,14.2654 12.3717,13.9764 12.4247,13.9404 C12.4177,13.9274 12.4047,13.0624 12.4047,12.9404 C12.4047,12.4914 12.4937,11.9654 12.8087,11.5034 C12.5397,11.1134 12.4047,10.6304 12.4047,10.0594 C12.4047,9.9374 12.4147,9.0494 12.4087,9.0244 C12.4087,9.0254 12.4077,9.0254 12.4077,9.0254 C12.3767,9.0254 11.4997,8.7344 11.4997,8.7344 C11.4997,8.7344 10.6277,9.0234 10.5747,9.0584 C10.5817,9.0724 10.5957,9.9374 10.5957,10.0594 C10.5957,10.5084 10.5057,11.0334 10.1917,11.4964 C10.4597,11.8854 10.5957,12.3684 10.5957,12.9404"/>
+    <path fill="#9AA7B0" fill-opacity=".8" d="M7.416,13.8965 C7.416,13.8125 7.435,13.0285 7.432,12.9905 C7.392,12.9865 6,12.9835 6,12.9835 L6,10.0155 C6,10.0155 7.391,10.0125 7.431,10.0075 C7.435,9.9685 7.416,9.1765 7.416,9.0915 C7.416,6.8825 9.108,6.2885 10.584,6.0165 L11.5,5.8475 L12.416,6.0165 C12.608,6.0515 12.805,6.0935 13,6.1425 L13,1.0005 L8,1.0005 L8,6.0005 L3,6.0005 L3,15.0005 L7.609,15.0005 C7.496,14.6815 7.416,14.3285 7.416,13.8965"/>
+  </g>
+</svg>
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.png
deleted file mode 100644
index 8a7fb92769dc7bf42eff90dbd5b96beedc9e3f45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5Xo_V@BhE&{2`t$$4Ju}Cdxz^%`4)97f><~QW>F39G*@x#y
zvxdStckz^iizWzmOPna}bJ!z(s(p8h;9c&A`}GqfHcYz8aJ1UM)JAgh#$62utDl;h
zOw3N;Ei?=~Xz+9G!zhcr43mz?E!eN`5W{el=M&>OhnTXjrZ?0Cde69*%la`-i>u@<
zQ|n-BJiGnAVTpz2fw_Jc7)k<Cbx&U?`(k+b>Gk^^<_tG??phR6;M`#bWGNih`evK(
zAy80h#)JTq#g~sPahZ^NBS_gsRwrsxj_w%;Hz6ZouOfAI<3w}LXG}$m4h@V9roIWy
Uo2+Lt0)5Qj>FVdQ&MBb@0R6Ch6951J

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.svg b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.svg
new file mode 100644
index 00000000..a4afa938
--- /dev/null
+++ b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.svg
@@ -0,0 +1,10 @@
+<!-- Copyright 2000-2021 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. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
+    <polygon fill="#9AA7B0" fill-opacity=".8" points="8 1 8 6 3 6 3 8 13 8 13 1"/>
+    <polygon fill="#F26522" fill-opacity=".7" points="1 16 16 16 16 9 1 9"/>
+    <path fill="#231F20" fill-opacity=".7" d="M3.15,3 L2.49612121,1.4 L1.85,3 L3.15,3 Z M2.109,0 L2.89,0 L5,5 L3.9,5 L3.4,4 L1.6,4 L1.1,5 L0,5 L2.109,0 Z" transform="translate(2 10)"/>
+    <path fill="#231F20" fill-opacity=".7" d="M0.972767969,1.50152588 C0.972767969,1.13305664 1.284,1 1.845,1 C1.85033333,1 2.23533333,1 3,1 L3,0 C2.26266667,0 1.88266667,0 1.86,0 C0.778,0 0,0.45916748 0,1.45 C0,2.31452637 0.419555664,2.69049072 1.47125244,2.91607666 C2.24158869,3.08131157 2.496155,3.22862939 2.496155,3.548 C2.496155,3.86737061 2.13842773,4 1.47125244,4 C1.46058577,4 1.07016829,4 0.3,4 L0.3,5 C1.07550163,5 1.46591911,5 1.47125244,5 C3.5,5 3.5,4 3.5,3.548 C3.5,2.91607666 3.02026367,2.42071533 2.15869141,2.14685059 C1.29711914,1.87298584 0.972767969,1.86999512 0.972767969,1.50152588 Z" transform="translate(8 10)"/>
+  </g>
+</svg>
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as@2x.png
deleted file mode 100644
index e69eb873fc88090cdf1545f302a09264701840fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 733
zcmV<30wVp1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!e@R3^RCwBA{Qv(y12UL9cP^>`>7W6K
z8?i|wCnsZwF)>gdfE-XytYTU?;6EvjpoIf+NO1%U5e71n;Byd|2E>1XcskS(47kz+
ztwI0<W&&{<5dR|-60}MKAUqq%{04f50MUS88VLV=fmpLp(#lF!ga7E}e3_98=ksJt
zCOQ$43)-m?0$5TxQ2<NGRbmUV!Jh_jf%_kSG0eO49?Xu_7GO{lVu#D!e*cqU<&BRF
zFTVU?5aMKJFqh<F@K)xfZZ5d^>IcKSAAcA=|N6^t?&Wv5_>VvT8K#|o%kccmZw4g+
zHin;n{xLlN`kVS8aOL$61}Pp^1`ZZRhRZ;9geFA%(WhTvM_5R4F~sW#GW-LkoG-us
zQMWF5_v0_aQ=ku31=$(Yfk6-Bg8(-h#K;H0DEjp49|IFGsqwKfQP%+=--CdLFgt^W
z5C@8wG%!^3L^&8<eEq}Fbo3>|iD%!aUmIS21F?*qnUR4RXaWn+n=l7}K#IN)gR24$
z!*^i(FTC=eVc)|q)Jp@ufsuOi?N2a!!kIU4@q54^{|bz2ZdN7+R-l7|)c6?;#5fuH
zfoith`^?}Z&qEytfGh_&0+j6(_}Rc>Pe1==xC#uFYd{PV1BDD9J2QhKFc<Iw<Nx!o
zf7A;BSnzu*@xt@|qfZbATz&%ynT1zAFv#<>GW`DgpW!_)f$E5GP|pFN#3jzn0?y+w
zAj`|jAPvN?fO3++xCdDd3KdY<4T^>cO@8V*pwL7Fvl;|uwHiw?IKR|PlxXvYR9(PG
ziowA4KpR@^ScTP4B046FWO@$69BdsE7BUQ?Dj4uIFzNt|L^$F?03g5s5-;W5V0m$!
P00000NkvXXu0mjfxZFB3

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.png
deleted file mode 100644
index d1760e93aeee44149b2ba6b600f148d749da47b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14776
zcmeI3e{54#6vyvSVN6B{C?XPhlwssY`}+E0Tc5ARu}-#V$J|Ef5DjmyciVIAd!_G{
zc1utraYD!v0)H405@OH@2}F&;ltiME@P}Yx)Q|{&3`q!x#6*l>K=8h{YtOot3x+>$
zv$kjVe$P4gea^YJ@1M7|t#xH})!ZtCP<2alu$_F*u-=uE$>;p5w`KA*HQwB1AoTDo
z>s^6%?Vf{BeT~`~Hp8J8L`9D|<cQvl9qCw{s1cHur{l8Hk4>%{_o|xT_Q%m<HcpNB
zZEL(CXDHr?`_$&a1nwAY?NkQ)6<@@*JWwU2MG_!}O_@u_qM9M5{kBY8k=WKSZ{so&
zv)^xPuo80NP#f2%Cot!Ac<qYQC2(~<hv4<r)wz~&E~nt(odPeo?SfDActod@%e`!Y
zDq=~ANRQYad@h%c{O7mznPyz%`BW<9NVy$)qL&wZJ|FLN@h+F0DD1|7X3A;1W-QDG
z8H*FdhLTX@rmAb46<6-olcwKhvl8WBx$BC>^NBPg$Bt0s({h{_98SKJQ$)%8#FL3=
zW@!<H$59-^nrRR}p`>5DPd9a=PcM@)KV3F4sYxi5&s}o8u~^B}hS{`{Ajlyt>1lKh
z#4+EF4LzAqaMMO|DGN(oy{YyTiZd>fHB)x&IIWg(vu3hxnO4YFNFvuNHYTua>WNNW
zj|Q?`);5NaYi!JP75DTSRg35;W3j{+yA<kOh=zl*i36k`y>`Jx{yK$v(d8E1o~2GV
z=}HhJt1OBU(j#imK&cpB(JjCjKv^7v?4O8i%6An7YC)WcBKGKsm}~~rnB0r`xYjH2
zg+ZXqca_+vNA(0*77n;2zSJ=A%5<98q8X;FDYzvVAOj9njfk>GuB)rXKD*D|?XfHM
z9@*}z_0`(FUd1K5+)hER_hcZ3LePCe=%B77t=*Cf9l6KQz<omKRSA`xbaE7EtkvIZ
ziV|Taq-s_T(w_sMZ%OxN&aw`?Vf^UWL{!b3NpU%0U~9+uZDU(5e~9JJD9b0ab46LP
zPP2ewZ3rBZ_;I6!W#v6{ZtDLnU^YH*FP|gThqXIxsBEZ=s(cVb?=e$y0yp%Mp17O6
zo{c)*tvI~ITc>|i9bbs-==l1Kb?n4?O4gw!l3pO|k~1|BB!0qJA#+wAwrUzpX7qI~
zCwcLL^_g>p)5We`cXox-#jXX<)tYJsT)AvT!@$crd9%kt2f0bWfm*NE?UnfA;bM<A
zHI1X;pi1_yVRfZYoAW82DCyW$&Jj%H9J8eYKj)cBW=F}*0=ZA&^EWEvi=5vG_t_|1
z(R~gK!?7fg2GwS`sED9|;es@%Hp4|l1O*Hiq(QYAE-E4@V7MR+s?Bgw5kUdN1!+)i
zhKq^_3K%X(gK9HeR76m~a6uYWo8h7&f&zvM(xBQ57Zni{FkFxZ)n>S;h@gPsf;6Z$
z!$m~|1q>IYLA4n!Dk3OgxF8Lx&2Ui>K>@=BX;5v3i;4&e7%oVIYBO9^L{PwRK^jz>
z;i4jf0)`9HpxO)<6%iCLT#yFUX1J(`pn&0mG^jSiMMVS!3>Tz9wHYodA}C<EAPuU0
zM_g5fNB^)!p7%?U2m5T#G_;b30y(9*J%rHUB81-9jL<)~$@fKs+AC4TqhW-^cMy6^
zKfQMTc7!UXw*(tH)4%NAxj>)PFypObi`G|8ofDb0?7i)yFFv$27+taU<h!?qb{!rX
zU2<U6>OIdM>c^+{Kfh}oZkjc1=);!kUzd!WiKmYK^-YI+=Mi4-=?(6vLD#=}z4GkH
zlqWwuepN!RcAl6wvUK+4+3$b+)6CJC>5y?g_{d9bH$JMF;TihkZ&&N(3;TaxKlk|T
z2R=dJb*FkCU%B*BwBq2tO?z)#9OX7m+wx_9_lefec1S}{yb?$~wcLCB?6=d-U3mNF
zkrR8*oZQg*+Ii2Gfm_!nk8U)-{`1PVYghDS#lf1>|JI_-+K*dq9+~oiuWwOEx|BRH
zb>21oyFHT@|8RKt!QpeuUf%b4$KH|T^aUHf7rJEa+`609=(n@0Jx7L>Ve8q-mZsL=
Jp%v@j{0}3&9XkL3

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.svg b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.svg
new file mode 100644
index 00000000..f95fd45e
--- /dev/null
+++ b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#F4AF3D" fill-opacity="0.7" points="1,16 16,16 16,9 1,9 	"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="7,1 3,5 7,5 	"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="8,1 8,6 3,6 3,8 13,8 13,1 	"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" points="5.4,15 2,15 2,10 5.4,10 5.4,10.8 
+		2.9,10.8 2.9,11.7 5,11.7 5,12.5 2.9,12.5 2.9,14.2 5.4,14.2 	"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" d="M7,11.5C7,11.1,7.3,11,7.8,11c0,0,0.4,0,1.2,0
+		v-1c-0.7,0-1.1,0-1.1,0C6.8,10,6,10.5,6,11.4c0,0.9,0.4,1.2,1.5,1.5c0.8,0.2,1,0.3,1,0.6c0,0.3-0.4,0.5-1,0.5c0,0-0.4,0-1.2,0v1
+		c0.8,0,1.2,0,1.2,0c2,0,2-1,2-1.5c0-0.6-0.5-1.1-1.3-1.4S7,11.9,7,11.5z"/>
+</g>
+</svg>
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript@2x.png
deleted file mode 100644
index b173e36eaa8e97881c2d6b9eb304da32c956f068..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15092
zcmeI3e{d7W701tx?FI*@4hEY78C1nKPFm@7`hl!NmTfFkn?%IOrZ!Dma@MWv8=vlk
z?u3Ns4{$RfCNoJG0yKf4Gz^&#CKNL51QQ4Z7upO-I{ZjWC~Zvew73ajN(jymGIURp
zrL`=xNhg1<MwXs-zwf=h&wIPRf3B}((GQ9WXB1KtRn*+%_QG$S_IG;${8VDGYw&AQ
zuxY76QFoMRe>v2%Tc=Z0b-B>ip>}v4V107H$nkO~Fh&DGsHP}qZ8XUFdVs3y1YLqu
zqrdX%VZBb^YxM0lkI55k0Np}UECgC(i`sm#9-o8P*SZRwQ5FUW0F~241EQp`(Hea`
zE(>jKnAYp!61AsBU#}(9b$D8I4RQ$RY(|^GXEHN7yTi!XY<9c(`#Q6UvC<}nW-JEA
z!CI}X$)roZ^sYi^IYYdk^|}`%)4^Xg`fgPXvNRouM2r!OQ4V#{jKkreO=j9`Hb8|z
zSt+Sp)F3JMB!Y~_aRbE{5`wBAOFAts*C~h98ogdilzJtvD-cX2l9VJnNRf_mL7Fj|
z=xk2BFXa;qhs5~OcpnW!5CD>@KtCp{U$9$NWu;r5AZ2QL!o;v99#1NF*7XJgSyL-&
z;|ho%i8QOH(zY@PXfIIYaL5N5SHMfTC)?Glf<IlHF_E;H3D*vy!US&GOu{YR3W*9i
z;kB|2A;76}s7;ndSE9>WMiJ^78sc50t7;b{UXCdDI_XT8biLEjfSXf+3-+VUz?k8?
zjj3kM7S>|@p2-5c5($z}X2kHwyx?D%Ed~tZKw}`v%ouS0@SMthr6{NtiNpI?zZ?p1
zs!IrPU4RZsT~0bZh$vHC#Wu*I9D>UNE{l`SHjH@1JB@9Y6qS>FpxNz$14cpMS-|rS
zJLfPNtoBZ`fv>hY4DffS0q~69YO<T=R$Dsb5Ir8$eOzd_><eqVB^jFknxPT*aiJd!
z3Gk%jL`0*l{_Cd55@uYgCP9Jyxf1DH*uC+ytQ9ODJ32Zc3h^^3$b}T3?YJ8K=$1<z
zVyQDq^NH_Vmh)++naihb2*5k(F{9~ar96{v!v9;qM0~`3;vA7~Al+(1B|^nj69-Xb
zzZ&5}puP+C#8=ttiKt`UGQ&G*?erIgv4u#Cj;+sV$BwV3Q#;gH*b8u7T)YO1lO8vg
z&YaM9Xf+kXalPGaf-joUK9jEKbf)XlTf3sunXYNiC6b`J%*kvS!-$u5@+OXjR(O*D
zTyt$Ui_J-A4rh9_2vHz*xCOX>6|E~RFjL$ob0Vwb(uo|AiKJtqRLH;ccqJ2~@MZzt
zr_iYzm9a%mZG>;wNMF%692gBplAtuOHo=8OgbD~Qlm^x&xUh&&0l|gRz}f^C77;2S
zxKJ8co8ZDCLIngDN&{;XTv$Y?fZ#%DU~Pg6iwG4ETqq5!O>kimp#p*nrGd2xE-WHc
zKyaZnur|SkMT80nE|dn=Cb+POPyxY((!kmT7ZwpJAh=K(SexL&B0>cO7fJ(b6I@tC
zsDR)?X<%)F3yTO95L_q?tW9uX5upNt3#Eaz2`(%mR6uZ{G_W?og++u42riTc)+V^H
zh)@B+h0?&<1Q!+&Dj>K}8d&?5xC+yc{s9R-?-zj&_Pu^?O*MQdQ0Hs%dMGMZK~bxJ
zMNyyKgx{Aa%6mJNGp&Q7*v%AGCjae6v!9}<+=b2V`nKq~4>zCaDOo)I*e^Fc^F}%Q
zmbD^(<M!dBQ^O~X>!kC2tM015G<UmkYTj?R&%AiNcksp6D)t*csVyGqty-8n<%O0V
z-VX<?o;Q0cm7n~+sF~flf!(!k+dJni0~gK@^nbj(;=6e-HSP3Xc8@gWzOwbF<x~1R
zTfco}eV%mS%l%~qZhK{n8w}Yir<V14%jSJ6N?BL0{h;#fizSB^QiDt|XYVWbKi7VD
z@sZP|Uk*ug250<z#o)ou-hSza54Au4&f=51T4U<Y{=d?me&dBj%y4t=orXyM+Mzx3
zDz5)Ka%583vY#zb^R5nEtEc`|81}!MAKG16-`E+gyC|O5&3fvPMOR$4ZoXJ2U-Uc_
zym{GNak|p~=`Ndi>hUGVpS-?m3so0=aCP7MmYE}e==Pcek4~;FnNyJS=k}R-)86~&
z&D?(+F8z4^yYJtB^2e3~jn@u~5AXE)?rY`Y+rOuvuDnVyAJ{zm`L~94=Wpw}<IIfb
z>;(^;F0c8`9Qgj?(5az6J$X%$&em=C`N11)@Bed4g}7$q?&;Rg_pi8d<nuM9b>YiP
zdt2A4$FJx2e-Z0@cOyG{)9zW1=N+`IE}q;X?09XXfp6ANd7804)6oR>iHr9=GBRoC
z#FCE=E(`3Lvta&EVR#$3>JCryZ2Gk0g&l89`S0HMR^7G<Ft6@Cb@Y+PuJ8Kez>NMS
zB_~QJf9Dr(&${!jQ@mUx-uQ&wx2(ONEgfF?!S9~U_u7x1{?Db$PYg!~7N0qG%zbXy
zF??qEfnQh6E517Q@S)po7K!&=sNH<zFF6#q<@NQ!D`#hF&!sjuE^_ag|8VdB0I%k@
A+yDRo

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.png
deleted file mode 100644
index 09d6a9264b0e0ab15af743c0ede3879e37daba1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 309
zcmV-50m}Y~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy*GWV{RCwBA{Qv(y0|?BWI~T&h4H|&B
z5ynYQP6pFV48(&dAg)IjWWl145sMheb&f#17s`jbgc02f;lD3n7_gGn0L6PSH9Q%U
zF<s!j@){NgTmx%}i-`(`so5H?h0_ZlN$dgo`vSxTP|YA85DY|^i~3JJ1GCXx$U<xs
zoO<?|p~FdmL06OuMV#nptg@D6Xgm6t;qvQm<QV|68D<DkUV!=4SwR3RpP&I-5h0D0
zkJA9CLTsrKl%Rs4327}(1JF|)4ucrU$xK)QJTH(700ImE=pakhbsVBE00000NkvXX
Hu0mjf;oWqu

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.svg b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.svg
new file mode 100644
index 00000000..0d8fa6fb
--- /dev/null
+++ b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.svg
@@ -0,0 +1,10 @@
+<!-- Copyright 2000-2021 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. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <polygon fill="#F4AF3D" fill-opacity=".7" points="1 16 16 16 16 9 1 9"/>
+    <polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
+    <polygon fill="#9AA7B0" fill-opacity=".8" points="8 1 8 6 3 6 3 8 13 8 13 1"/>
+    <path fill="#231F20" fill-opacity=".7" d="M1.39509277,3.58770752 C1.62440186,3.83789062 1.83782861,4 2.28682861,4 C2.81318359,4 3,3.58770752 3,3.29760742 L3,0 L4,0 L4,3.58770752 C4,4.31964111 3.32670898,5 2.45,5 C1.629,5 1.15,4.76264111 0.8,4.31964111 L1.39509277,3.58770752 Z" transform="translate(1 10)"/>
+    <path fill="#231F20" fill-opacity=".7" d="M0.972767969,1.50152588 C0.972767969,1.13305664 1.284,1 1.845,1 C1.85033333,1 2.23533333,1 3,1 L3,0 C2.26266667,0 1.88266667,0 1.86,0 C0.778,0 0,0.45916748 0,1.45 C0,2.31452637 0.419555664,2.69049072 1.47125244,2.91607666 C2.24158869,3.08131157 2.496155,3.22862939 2.496155,3.548 C2.496155,3.86737061 2.13842773,4 1.47125244,4 C1.46058577,4 1.07016829,4 0.3,4 L0.3,5 C1.07550163,5 1.46591911,5 1.47125244,5 C3.5,5 3.5,4 3.5,3.548 C3.5,2.91607666 3.02026367,2.42071533 2.15869141,2.14685059 C1.29711914,1.87298584 0.972767969,1.86999512 0.972767969,1.50152588 Z" transform="translate(6 10)"/>
+  </g>
+</svg>
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript@2x.png
deleted file mode 100644
index 5598a39e5d99e0a9c39599ab8a01cab4a0a0934d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 627
zcmV-(0*w8MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!6-h)vRCwBA{Qv(y12UL9cP^>`>7W6K
z8?i|wCnsZwF)>gdfE-XytYTU?;6EvjpoIf+NO1%U5e71n;Byd|2E>1XcskS(47kz+
ztwI0<W&&{<5dR|-60}MKAUqq%{04f50MUS88VLV=fmpLp(#lF!ga7E}e3_98=ksJt
zCOQ$43)-m?0$5TxQ2<NGRbmUV!Jh{3fz!{wG0eOCo<T)`jiJ~~6fE}O<1dEQH$O5w
z`t+NDlZBB%U5K3_NR6LCkb{}_x#0J|{|r;ly=A!f;TMApFDnBN8xzCj*FP9ISQu#&
z0_foB=idxpe*a@o<Y!|jGlzu8`yYRSA;CnSx`2lb63nl@{b6_lbPNdK3VND2K!lT-
z!A6Fg;VUo{+E2V<SOZK8KmY!xZ*3T*DZmh-&d<Qk%*3$w;TMJ}XWuaV`%fbW{KrxT
zG6LDo@;nUn)?y5zTr3QCfC=*Y+aI)X04TMC06#k<o?imv{>}Hla4`iwRxtbfpa0a&
z1@%W>f;|ng5ClvmxWM!yU>Pv~%6kSG9#&u!Ff!Z)@<FtkARBcZ@C}&AK#5BlnAh!P
zxf%4uIKbkdyssw64lacL03#lh9RpPP82H$ksq27lM@g*Wl0csqn23;M){v?T7)dc0
z*dAy@s~xMb8cIaRgptx*3Nr^=$ApCpgQyAyJPnLG03#8OxDWscFaX!*qZeTFn(Y7p
N002ovPDHLkV1i?+2nPTF

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.png
deleted file mode 100644
index 5b1e2ea685d62f85daf827f7b2d34180f987a465..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy_DMuRRCwBAoHJ(*0~Gvczz-ULxDm!l
zPEH2XObo<>C?Kv!7i7VrkP(X*$aRiDycf!cyM(dx>>n^g`1}H}7v35sU>E?Cg8^hU
zEL)4+z>K(<s1Ohh<70CbP)#tp8juVAGf)8Ffe178_O8WXHaZ_f!_<9w`4BFT5epBF
zY+|s;>S6Hi-38{~+PN6a2GKC^?7|^T7r=l~d@aMdh0P3a?_R>`>@P1K;5I;5Sr2Xq
zF2F0PfSL|K{!w*{MF|TSA4DU|gMg&I9o$P4#{#3BgA)UC94}h3Y%MOu*wiqRkeN^{
mCMPptH|hU>ih_UvAiw~?n`P_w6Bs@K0000<MNUMnLSTYGriB^+

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.svg b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.svg
new file mode 100644
index 00000000..9898855a
--- /dev/null
+++ b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.svg
@@ -0,0 +1,9 @@
+<!-- Copyright 2000-2021 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. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#231F20" fill-opacity=".7" d="M8.416 13.8965C8.416 13.7395 8.437 13.3185 8.437 13.1395 8.437 12.3195 8.127 11.9835 7.269 11.9835L7 11.9835 7 11.0155 7.269 11.0155C8.127 11.0155 8.437 10.6685 8.437 9.8485 8.437 9.6695 8.416 9.2505 8.416 9.0915 8.416 8.0195 8.882 7.3465 10.765 7.0005L10.981 7.8405C9.74 8.1885 9.575 8.5135 9.575 9.2815 9.575 9.4925 9.596 9.8385 9.596 10.0595 9.596 10.8795 9.203 11.2785 8.52 11.5005 9.213 11.7305 9.596 12.1205 9.596 12.9405 9.596 13.1615 9.575 13.5075 9.575 13.7185 9.575 14.4855 9.74 14.8115 10.981 15.1585L10.765 16.0005C8.882 15.6525 8.416 14.9795 8.416 13.8965M12.0186 15.1582C13.2596 14.8112 13.4246 14.4852 13.4246 13.7192 13.4246 13.5082 13.4046 13.1612 13.4046 12.9402 13.4046 12.1202 13.7966 11.7202 14.4796 11.5002 13.7876 11.2682 13.4046 10.8802 13.4046 10.0592 13.4046 9.8392 13.4246 9.4922 13.4246 9.2812 13.4246 8.5132 13.2596 8.1882 12.0186 7.8412L12.2356 7.0002C14.1186 7.3462 14.5836 8.0192 14.5836 9.0922 14.5836 9.2502 14.5626 9.6702 14.5626 9.8482 14.5626 10.6692 14.8726 11.0152 15.7316 11.0152L15.9996 11.0152 15.9996 11.9832 15.7316 11.9832C14.8726 11.9832 14.5626 12.3192 14.5626 13.1392 14.5626 13.3182 14.5836 13.7392 14.5836 13.8962 14.5836 14.9792 14.1186 15.6522 12.2356 16.0002L12.0186 15.1582z"/>
+    <polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
+    <path fill="#9AA7B0" fill-opacity=".8" d="M10.5957,12.9404 C10.5957,13.0624 10.5847,13.9504 10.5907,13.9754 C10.5907,13.9744 10.5927,13.9734 10.5927,13.9734 C10.6227,13.9734 11.4997,14.2654 11.4997,14.2654 C11.4997,14.2654 12.3717,13.9764 12.4247,13.9404 C12.4177,13.9274 12.4047,13.0624 12.4047,12.9404 C12.4047,12.4914 12.4937,11.9654 12.8087,11.5034 C12.5397,11.1134 12.4047,10.6304 12.4047,10.0594 C12.4047,9.9374 12.4147,9.0494 12.4087,9.0244 C12.4087,9.0254 12.4077,9.0254 12.4077,9.0254 C12.3767,9.0254 11.4997,8.7344 11.4997,8.7344 C11.4997,8.7344 10.6277,9.0234 10.5747,9.0584 C10.5817,9.0724 10.5957,9.9374 10.5957,10.0594 C10.5957,10.5084 10.5057,11.0334 10.1917,11.4964 C10.4597,11.8854 10.5957,12.3684 10.5957,12.9404"/>
+    <path fill="#9AA7B0" fill-opacity=".8" d="M7.416,13.8965 C7.416,13.8125 7.435,13.0285 7.432,12.9905 C7.392,12.9865 6,12.9835 6,12.9835 L6,10.0155 C6,10.0155 7.391,10.0125 7.431,10.0075 C7.435,9.9685 7.416,9.1765 7.416,9.0915 C7.416,6.8825 9.108,6.2885 10.584,6.0165 L11.5,5.8475 L12.416,6.0165 C12.608,6.0515 12.805,6.0935 13,6.1425 L13,1.0005 L8,1.0005 L8,6.0005 L3,6.0005 L3,15.0005 L7.609,15.0005 C7.496,14.6815 7.416,14.3285 7.416,13.8965"/>
+  </g>
+</svg>
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json@2x.png
deleted file mode 100644
index da735f731291996d10710b0dcc516583c3e7c4fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#5lKWrRCwC#S6xUHQ561WXI9r;S8e@E
z&E3kMNHJVfp&|-1l?Wn;AnKu5h=Lw^5QSc{0)-&Lmm*?ABI&8<AqYt%sUVU3BMH>h
z6w@r-)m?Snzv<4Mb<k9tom>s-gTv0;d*|#q-}&yjGYrr35MZ@h5de=rLlv<bD@|A|
zmStlqtUrVRuFG8<iU9avf(S(bSAq$Gli`pFB69)vi1~=!4+MeLG!ZHW1Uw*ik(hri
zCPJkF!5%L1U$xN;$Of~}2X43d=x=O$-I6{qVLs0&alDqFiad5z5!S3zay7v+z;7h=
zgaPKS(7>vFpwC(feOfLO51)avzYC*{kKwkBAv`VxTZ_&iaz_rlvkr_lJc4te3k=I5
zI_m(LJ4>!P3_h*K>_`txrz@Z{W)UBq7<zseS><)|cEQ|eKiu|l@Vp<xFKXePu_I>B
zA@E)=7?t?g(6c+RcfW_ul#TFsBYw8Lq=5?XyXW9@&0w<awYWF^K6)Q?C-gd}NT$<>
zD?Emzk_%G9bA2Dg%-8Nk<G?`uO-!~oQWgY+#Ux<ra|@D79m>xFE;1Twy#cn)H^kY8
zKxbwsLjv^adD2>anwc=<!TgV5dLNZpKucrmYE~Wq!>EvY@+x&CP%e~%(&={5c{U<a
zTFYv5^w;N_6`$qQL>K!>85#+3yz)+{Gww#lrCO3vKJ1^~!Pe0PHcTV_*_=~aw@_nN
zqm{-C=3>lGj1WQgDi6T#nFpuUBjxyIvHs&jh)CK=uN{5u(mHWBsEHs`r7>+v1~dsq
z68Kxi$1xGtE#f2<p6N+?uSql!+YarvOiZ-Cq9PTtcYNs}86Sa49lqpwgZU`FHCW{{
z!23L64OL>l)+VPD5jImA<M*AwmfRvbZaP(ts9lAa?rEiSvH7Laj#!MCoP$ttVe(q>
zSW`V*M8%HYk7WB;5L-|d(pJ2z1Ola$w!I}V<P~pxE6%QbvT0`l6FA4Ke>=yoDSRK0
z<%f~+VZta(ZkeBzK1?_Tj@A{M{yy+O07-=ZECas;7yuIACMR~kR`mb?002ovPDHLk
FV1jnnjD!FH

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.png
deleted file mode 100644
index 2afc1aa26d206114e86aa097a87d35dd68441bbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14798
zcmeI3e{2(F7{}iU0XAezQ4v&jDL)iOdw1=+uIH^-+ChhO%rQbiNVr|!ZRgs%u6J9z
zB?JUbAjCifgCQ7yME*dOh(bh-KltGS7z~j_iGmt`M2U%*5Kv4EzIW}~cU{X1hCknC
zZJ)jG_j#W8KF{;My?<_VOY_1B6;mq!027)*!B+HLWxmIaL7&x^uS@8wJP}%<12BG)
z`7Q&ycHa*`{S2ioVno7=1zC$bq^Q;o9qD)isR0n@r4y3e4GpFpb}DLv?b3&z*cc_+
zU|a4EbKyh)b}6BOBwRYs+$Iln%igGMp07eo3n)Mw8WNL^$5dTNH`uJW0<z6v*2Y*8
zqr1W8Hxn|Ea0?UAl8|vb+;*9B@{Gsp;N5PI$2pgAa(pez@htDM^IoC0R^T`$`?C2e
zkR>Lg9YSkxK{g%wuff)37zu%8Q>m0A<#K4rPL}t2y)5TsolZMa*!6zZkkWQlpPmUa
z6ekFEIjJNJMN=6wuGFse8Vxp^nJD+lUROMkOQh;qc8DUImJ%%Q;MihLQ90+6=uO6~
zrA1{H#$X((hK~IBqJD`k&Cv8NtwhS)bjif1CgE@{chU96<3&^JMq?jBkVRV5Q*Y}}
zK(-a?T5nQ@jeY1+rWd<<L+QvDXILb2rsUdTS}EaX&Sc!IR>)LHMAs?=l29_VWSgeN
ze3>q58A8Ye0#;Wsk1SWzsFu=ai)^7wzTWw0Fen+&hx*ZN=bh-UjjtEDTEWTHa4yu9
zSdfgeAVye=DjoerV(?DE#p5wBWnm1of1;8h-Bc7@i^Yk`LWh=&ONLL0OP!ESsGTC4
zAH<Zot`Y)TOiQ9=L7z)xiw$F5R;LL~s%}WC44Z;JG~iH_s37rN2k&-z(LOdeb6stn
zy`7h%cFDulbFi-7<?+^85W`{IeMIP>Cij}VB^x?=i=i?15uukP6?D=`F-&8w{#H{I
z2{R&9NYPP$_G5jEy4O0(mcpLlqeBxh#X6G`Qc{QJj%%<DZMobbmOG<NA8Y3dl5C!4
zKH1z5Fe<XcM)S+cd1l>||69OJe9XOcj#L*^Z?vH@p)6JDAiCCJq@*PDccPxSnZ2Hg
zI^3-=yvUlTe@q!(h|K8l`V4jK$a;$Ap(dbSK<kpM8t@`JVl1CIqmP(1jrCf3kCQ_$
zmN!4MuK0AJ>xvt@;?sq$dCz64V)&fdYz4!ZmwEDLj)kS@CIR~D+-{d!WDAE2JzA7B
zj75S9+P}Kll|0(<mQUeCQO6af9I=V4W2RKt&$(5}%qY59K=&zZ?nY&Jk#ig2HXHdX
zy3K*{a5M={gJ@G+L`1lN;=*YVZHkMC2p3RXI1QpraS;*W0*VW#L9{6@A|hNsap5$G
zHpN9mgbOGxoCeXRxQK{w0mX&WAleic5fLt+xNsUoo8lrO!UYr;PJ?JuTtq~;fa1bw
z5N(Q!hzJ)@TsRG)O>q$s;R1>ar$MwSE+QgaKyl$Th&IJVM1%_{E}RC@rnrcRZ~?`I
z(;(Uu7ZDLIptx`vM4RFwBEkg}7fyp{Q(QzuxPaoqX%KCSi--spP+T|-qD^rT5#a)g
z3#UP}Z-}cR|L7l7(er*O^kCnsPhUKP9tvdSP-_@~ftdiT-w439>*)J809wa^vU?){
z2s;6otbM(*dK&;`Gn#__w)8h|ZvW`<QU0pW*46BsHM)KKqGw)N%~YNF;?%@g<-U8y
z`eXY;Qx7ef6hFS`NUiOB_1hcZsU7!?8SOu}GIV%wR@H$6k@4EZOXs)nfA6|5<-3p9
zzU!(v_!SuK|MSqv!ScjYcYOa>S!7LL?fPcnVr0|N=g)pR>&(_4&utFv{9&#5Z`HQ<
zSH315n|<(u^08sCe9o4#nV|CO1HH#C_P_A@#`k^?oUVSNtM}O}cRjb|bN{BAWe;Au
zFy~9hON!^tqvgLo3E$Wwf=6o_SM5Ew+CI2@Z#<^W)%)iCeC^6Z>wmhk=lDPS9y_#S
zYa?(>n-BI+TX^;E#qn={Y3x3~Zpzuqa}Kxm92~rE9Jy9E_jFfCeW&uos<)=~{Na4K
nXThd^-}cof>tCGw@+h#avO92MTws~`#AQ=sb8!FsH5>i|Nme0;

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.svg b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.svg
new file mode 100644
index 00000000..81e10aad
--- /dev/null
+++ b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#F4AF3D" fill-opacity="0.7" points="1,16 16,16 16,9 1,9 	"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="7,1 3,5 7,5 	"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="8,1 8,6 3,6 3,8 13,8 13,1 	"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" d="M2.4,13.6C2.6,13.8,2.8,14,3.3,14
+		C3.8,14,4,13.6,4,13.3V10h1v3.6C5,14.3,4.3,15,3.5,15c-0.8,0-1.3-0.2-1.7-0.7L2.4,13.6z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" d="M7,11.5C7,11.1,7.3,11,7.8,11c0,0,0.4,0,1.2,0
+		v-1c-0.7,0-1.1,0-1.1,0C6.8,10,6,10.5,6,11.4c0,0.9,0.4,1.2,1.5,1.5c0.8,0.2,1,0.3,1,0.6c0,0.3-0.4,0.5-1,0.5c0,0-0.4,0-1.2,0v1
+		c0.8,0,1.2,0,1.2,0c2,0,2-1,2-1.5c0-0.6-0.5-1.1-1.3-1.4S7,11.9,7,11.5z"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" points="14.5,10 12.9,12.4 14.5,15 13.3,15 
+		12.3,13.1 11.2,15 10,15 11.6,12.4 10,10 11.2,10 12.3,11.8 13.3,10 	"/>
+</g>
+</svg>
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx@2x.png
deleted file mode 100644
index 523ea60f4029c29cb285699cd66f989cc42e5d4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15255
zcmeI3dsGv57RLuvM0~Abtx799#zz4OlP82}!ZRow35yWQs}G0C0J9{SF*BIJS&QPj
zr@QrFTM7tA*Z1Re*LtWPT=lqG6?CgB+A7w1s;+g#Ev;0v?%`BqXOa+pgy3xV^v}s5
z$>sO^-g|%Zx%c<W{4;;Z&RRM(BrF7ips5+@h8*r2=HJ0V+$U3A{h0fjM5h-r5HvZI
ze+NJ<n`c9iHk>pSum#3U6sN2)n3*aeVw_f*Q$vt0(Me-?1;N54L>Xz*OM8!<kiw){
zFU{8&<wiP{C@0ga?L=;MmI<$}z~jx*#Dox?6XgO}2^NE$R*Q{6oqDM&F3Q>bFd~Ir
z61GAwP39BA1;%VRm9i7CCPpK}<w^w{7ayb0XyW3O(XdjkP$O~$qEN{c@u*sj%H^=<
zB~1w7ES=q4isl%Wc+zqI>80f?OQQ(la5!Qdsu;>%hA86W;}N+MQ7UDeLdI0tSj;K2
zG4tI)hT<3q2Dg(mOHwwNkBgO1m8@PW<r8^dp6jyG-b6OW!;YhfI58Sg#K;kUPG;Qe
zLs!}@uBDlAgs>1+!p1V3pTe&nT~4tSQ%;SM(mOq7Vy-4eqc^wT^;)fdQ!{MZDh`1M
zsb5dVR7Dd=4#7~BcAQ9C#a+sLe^<|vrNhM;5s9A}bM1ta9K(&Dal5%%!CfI8cdclu
zoxoViZlWklg1gJIhY-T4sjjYqBl1a`nQ}0ZI>gsyxZcCj2m{6v30yyFWC|tsXHsZU
zxf)f<7t2*#R{}xYN}m`;%1oA4`H7)af&l=TZvbxdm@yU;4gm^*AZ8pbrR-LWO(3mU
z8G+EYG95BJ2q?Y%gr-s!%FeBcNKokzf5U*6tH;m`8^dBYoX9XFa04+UX-4C4l~x@`
z5Hd`yij~E2woHp-W|^A1o;ZcNB-X4UT=<Me(0x>B1BF-e`@|F4{1Zb1?xRBg+D>w3
z9A*JD{OW&d3O`{+rAj9mt~0BEj^+B+b&BN@D@TqFO;||RX+&dohT!*_UOKedyvLXK
zbmDzndltoT{v1od`K>^hb;yX(;bnO}J#OUxTR?Ywz<ul-j&j2GyshL8<x-6ugrQ1V
z2WBUd%ebESUv{}W>PR==@H&J)_bueeLbyjq)@P_=N7qxwA7?1n3*5ReR}B<8WYpMj
zX1Bh8uc@WdrH@m}xfi0~KRvGCw6AO7^IgGdU)N#JJR8X-C_UMHh5;}B%yl0Nx!mmm
zkr1oVs5Cmnci7h>n{*PE0t3nIUxx2W6_?57<2&Kkv2ZL$V8Y|*E*0=Y?y97Fl)Fvf
z?obf#Ey~CudpE+*Yz$w~&m0&GCnf=D2-+epK}4WH#0An2v_)Kkh(Lje3#1`vi?{?4
zfdUa1NJG#TaS0*<1tKnxhM+Ct5<~<FL|h;ZL0iNnhzJyjxIh|$wunm*5hxIGfiwhd
z5tkq$P$1$0X$aaPE<r?~K*R;o5VS>Hf`~wYhzq14Xp6W65rF~`7f3_U7I6t80tF&2
zkcOZw;u1sz3PfBW4MAJPC5Q+Vh`2x+g0_fD5D_R4ae*`hZ4s9sB2XaW0%-`^A}&Eh
zpg_b0(h#&oT!M%|frtyFA!v)Z1QCG(5f?~9(0(qikl}~^2pjjLpM!g(FL7pj8}~RM
zjHl-qA*gyG1g%*ILH&c=_k9S;35Eh@7C;c%1VOW?Yem0$7lHyGWf+o8&M&`hT9$5F
zKKpD<_s!-bkHTede$Y@9(f0Si&%+O`%>DEIv`bOHNQuZ#&VI47{#fi2`KcXg?=47s
zr}6TlD9O%<b4!th=MOVmdbBrtE?5;g-(+f47fso>`Zk{*e0pMVpyrmNPHwDUf4Qrx
z%{i~Xe0<9t>y@sqj=yB=N(@{3dqd*I@d2til4h8Wnj>i(52Z<($GsMG>SRNe<msoO
z%{kERC_3=%=)HzLx)p)fUbr3i%r-$%N9gG*&W4CC>48JVi!bcf7FFn>2S*!sWp4V7
zdhf2J%^PyR*|3tn*pb`Q`yVK&`!Ia%R_4c%=R5xW-4W=wuU0;IvTsV}9Bp*%$9W+W
zm#x+f?C85)-|<j6{grEF<LK?o+izUm)*96mxN-Hr@>Uo!V~)Snz4Ohzm+*FLy;Bu-
z$~NPr=v7$L!tiMqU|cz4)1Dg#a<@<$<8?&nw4f>K`6;cP9nBx^lh$vSPkZM~bjXig
zuN)c7*tyg3{+jS5lG>K3Hy{5HaM&2MVuAK-)0%*!w%4Dv)@(bo{<QRAwWYBvb>6DG
zHwwG+K3fW(op<oqrS?NJw)gi3&(%jA{O8to$@{;2@)6Tl`Q^#+bryDaO<4Hi&O3DT
z^t49jl>;kVD>j^~t)091PvhW{mJ7ej*Vg?*dps+6-}T#ju>9~NS(AGQ(B6(zXkXF0
zv*yohyBBdTg+5sP`kb{J-<k_;l?-&A{v^KR-sgRh%Ct8YLn>zZhmM;S=_%R84~WjN
ziC?|7uJh})cYjPeU5}l4x)y4fkOc*qw!BEa9LW|hH-9oQZ|Qpzc3+QO6qtN;Nvf&)
zM(g#t-y+H?-R!%sZe5aFH~Fg%B>8Z;VN>w>!k$*Ug?XX4Z%5^8_giyX_RC{K_tbp4
z?TfOn@3via&TPK1`f}#<hQ9{T=oZtxsK*nhJoup>fBB2gid(yisM4bYM|+B%-6_0e
z+h2fQHAJ2KuIrDFmeCj6j~f<zFP{;)Xx6&WUaTY|AY%W+v-<D1CT*BB7(d}})1kd5
WLRyeXRd)W-*^IO-!$&DAYX1v7-3O}x

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.png
deleted file mode 100644
index 8e452804b4dd22eaea6596b0b66b7a015bde7533..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy)k#D_RCwBA{Qv(y0|?BWI~T&h4H|&B
z5ynYQP6pFV48(&dAg)IjWWl145sMheb&f#17s`jbgc02f&y>S343N6J3dMUcHMI`B
zSY5!dr!fGltKwp!oM7@U^&4<{0VIhvK%c?o!{7$9;0iHhSAcB0cW?#6y#p)Yd>FtP
z3ou16`thl448{qqD4I!%M!m3dhD)nD8Qwp<N}d6N^4f4i2&DtOVWMOoLA(LT{zdmY
zAp@|bMo@xsf+nPWI1NBgbvO)SBquXrcPcC|kP83;3;=gZO+Q|gjl2K=002ovPDHLk
FV1mZzbP)gm

diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.svg b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.svg
new file mode 100644
index 00000000..05c1e277
--- /dev/null
+++ b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#F4AF3D" fill-opacity="0.7" points="1,16 16,16 16,9 1,9 	"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="7,1 3,5 7,5 	"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="8,1 8,6 3,6 3,8 13,8 13,1 	"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" points="3,11 1.5,11 1.5,10 5.5,10 5.5,11 
+		4,11 4,15 3,15 	"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" d="M7,11.5C7,11.1,7.3,11,7.8,11c0,0,0.4,0,1.2,0
+		v-1c-0.7,0-1.1,0-1.1,0C6.8,10,6,10.5,6,11.4c0,0.9,0.4,1.2,1.5,1.5c0.8,0.2,1,0.3,1,0.6c0,0.3-0.4,0.5-1,0.5c0,0-0.4,0-1.2,0v1
+		c0.8,0,1.2,0,1.2,0c2,0,2-1,2-1.5c0-0.6-0.5-1.1-1.3-1.4S7,11.9,7,11.5z"/>
+</g>
+</svg>
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript@2x.png b/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript@2x.png
deleted file mode 100644
index e1caa6403fe6c69f402cf7056c2d1794f406fed3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 583
zcmV-N0=WH&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz=}AOERCwBA{Qv(y12UL9cP^>`>7X8n
zo3KeFCnsZwF)>gdGy-uQv5INofd8a8f))<QA;l3aL>S0Og3m!<8W8^l;^|OFFyKlP
zv<d+bm<hyb#DoN`(f|n0Mhd+~dWQhffQ5=?G2%!Qlsn*=au~_3k-EET61o}92R_63
zwGO-_hX6?>Bo;^KVGFULnFel6ipMFZmbZ}M|DRtBuaB-|_<ZXm!@pnO8Q26Q7<e_T
z7=(<ysp9}HS#2==`{PT7-=E$vu=0s8u=0z;<zF9O&hX*#J_cq^J_b%n6^0+L9y0uT
z|D1XuAQM;yrr#V}&G7Eb76x853kDIZP`Lcp$5$Z<(I*e+09A(ne}98Rf^OviGY1ct
z{&MFG!~cJO85o&a!J$Dn2MC)70xe}>cz=Ee!^35@4Bwz3LN^C+%j+`8h1N1~0OSAH
zyQd6K)^{^}x_+3xMKQaW0@x8E)?wfx<jt`)^m70t$RXtxubMfS{`>PA&Fca<c(T5W
zfrUqqflWx7;rII&U@;ygL;8gPzm5a2pk)Mx#5IP0zkh)F;!cUw4*^i#N6!B+fXlKW
z-yUEj#b97{+=Es-me4H`LP0SapKJ&G2l|F$*MQ8RSI>wfFzNtC^xpA^3ju%t0|3##
VlU63WFQ)(i002ovPDHLkV1nMc`p*CW


From 30a71a32f8b48542d8292864d0d000244008fcb4 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 6 Dec 2021 20:46:40 +0300
Subject: [PATCH 137/340] initial es versions

---
 .../pom.xml                                   |  2 +-
 .../EcmaScript6KeywordCompletionExtender.java |  0
 .../psi/ES6ExportDefaultAssignment.java       |  0
 .../ecmascript6/psi/ES6ImportDeclaration.java |  0
 .../ecmascript6/psi/ES6ImportSpecifier.java   |  0
 .../ecmascript6/psi/ES6ImportedBinding.java   |  0
 .../ecmascript6/psi/ES6NamedImports.java      |  0
 .../impl/ES6ExportDefaultAssignmentImpl.java  |  0
 .../psi/impl/ES6ImportDeclarationImpl.java    |  0
 .../psi/impl/ES6ImportSpecifierImpl.java      |  0
 .../psi/impl/ES6ImportedBindingImpl.java      |  0
 .../psi/impl/ES6NamedImportsImpl.java         |  0
 .../psi/impl/EcmaScript6ElementTypes.java     |  0
 .../resolve/EcmaScript6ResolveHelper.java     |  0
 .../EcmaScript6QuickFixFactory.java           |  0
 ...cmaScript6CreateJSFunctionOrMethodFix.java |  0
 .../javascript/jsx/JSXFileTypeFactory.java    |  0
 .../JSXTagTreeHighlightingPassFactory.java    |  0
 .../JSXCreateFromTemplateHandler.java         |  0
 .../javascript/jsx/language/JSXFileType.java  |  0
 .../jsx/language/JSXFileTypeFactory.java      |  0
 .../jsx/language/JSXJavaScriptVersion.java    |  0
 .../psi/impl/JSXXmlTagManipulator.java        |  0
 .../language/psi/impl/JSXmlTagReference.java  |  0
 .../impl/JSXmlTagReferenceContributor.java    |  0
 .../BaseEcmaScriptJavaScriptVersion.java}     | 43 ++------------
 .../lang/EcmaScript10JavaScriptVersion.java   | 31 ++++++++++
 .../lang/EcmaScript11JavaScriptVersion.java   | 31 ++++++++++
 .../lang/EcmaScript12JavaScriptVersion.java   | 31 ++++++++++
 .../lang/EcmaScript6JavaScriptVersion.java    | 59 +++++++++++++++++++
 .../lang/EcmaScript7JavaScriptVersion.java    | 31 ++++++++++
 .../lang/EcmaScript8JavaScriptVersion.java    | 31 ++++++++++
 .../lang/EcmaScript9JavaScriptVersion.java    | 31 ++++++++++
 .../javascript/lang/EcmaScriptFileType.java   |  0
 .../lang/EcmaScriptFileTypeFactory.java       |  0
 .../javascript/lang/lexer/ecmascript6.flex    |  0
 .../lang/lexer/ecmascript6.flex.idea          |  0
 .../parsing/EcmaScript6ExpressionParsing.java |  0
 .../lang/parsing/EcmaScript6Parser.java       |  0
 .../parsing/EcmaScript6ParsingContext.java    |  0
 .../parsing/EcmaScript6StatementParsing.java  |  0
 .../EcmaScript6StrictParserBuilder.java       |  0
 plugin/pom.xml                                |  2 +-
 plugin/src/main/resources/META-INF/ecma6.xml  |  6 ++
 pom.xml                                       |  2 +-
 45 files changed, 258 insertions(+), 42 deletions(-)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/pom.xml (97%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/jsx/language/JSXFileType.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java (100%)
 rename lang-version-impl/{ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java => ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java} (63%)
 create mode 100644 lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript10JavaScriptVersion.java
 create mode 100644 lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java
 create mode 100644 lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java
 create mode 100644 lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
 create mode 100644 lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java
 create mode 100644 lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript8JavaScriptVersion.java
 create mode 100644 lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java (100%)
 rename lang-version-impl/{ecmascript6-impl => ecmascript-impl}/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java (100%)

diff --git a/lang-version-impl/ecmascript6-impl/pom.xml b/lang-version-impl/ecmascript-impl/pom.xml
similarity index 97%
rename from lang-version-impl/ecmascript6-impl/pom.xml
rename to lang-version-impl/ecmascript-impl/pom.xml
index 8085f472..0aed2ced 100644
--- a/lang-version-impl/ecmascript6-impl/pom.xml
+++ b/lang-version-impl/ecmascript-impl/pom.xml
@@ -25,7 +25,7 @@
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-ecmascript6.impl</artifactId>
+	<artifactId>consulo.javascript-ecmascript.impl</artifactId>
 	<version>2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
similarity index 63%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
index 30d5d71e..30b93ccd 100644
--- a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -1,19 +1,3 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
 package consulo.javascript.lang;
 
 import com.intellij.lang.PsiParser;
@@ -29,15 +13,14 @@
 import consulo.javascript.lang.parsing.EcmaScript6Parser;
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
-import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
- * @since 12.12.2015
+ * @since 06/12/2021
  */
-public class EcmaScript6JavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker, JavaScriptVersionWithHelper
+public abstract class BaseEcmaScriptJavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker, JavaScriptVersionWithHelper
 {
 	@Nonnull
 	public static EcmaScript6JavaScriptVersion getInstance()
@@ -45,13 +28,7 @@ public static EcmaScript6JavaScriptVersion getInstance()
 		return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript6JavaScriptVersion.class);
 	}
 
-	@Inject
-	public EcmaScript6JavaScriptVersion()
-	{
-		this("ECMASCRIPT_6");
-	}
-
-	protected EcmaScript6JavaScriptVersion(@Nonnull String id)
+	protected BaseEcmaScriptJavaScriptVersion(@Nonnull String id)
 	{
 		super(id);
 
@@ -63,12 +40,6 @@ protected EcmaScript6JavaScriptVersion(@Nonnull String id)
 		addFeature(JavaScriptFeature.SPREAD_OPERATOR);
 	}
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "ECMAScript 6";
-	}
 
 	@Nonnull
 	@Override
@@ -96,16 +67,10 @@ public PsiParser createParser()
 		return new EcmaScript6Parser();
 	}
 
-	@Override
-	public int getWeight()
-	{
-		return 50;
-	}
-
 	@Nonnull
 	@Override
 	public ResolveHelper getHelper()
 	{
 		return EcmaScript6ResolveHelper.INSTANCE;
 	}
-}
+}
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript10JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript10JavaScriptVersion.java
new file mode 100644
index 00000000..bf40f3ad
--- /dev/null
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript10JavaScriptVersion.java
@@ -0,0 +1,31 @@
+package consulo.javascript.lang;
+
+import jakarta.inject.Inject;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 06/12/2021
+ */
+public class EcmaScript10JavaScriptVersion extends EcmaScript6JavaScriptVersion
+{
+	@Inject
+	public EcmaScript10JavaScriptVersion()
+	{
+		super("ECMASCRIPT_10");
+	}
+
+	@Nonnull
+	@Override
+	public String getPresentableName()
+	{
+		return "ECMAScript 10";
+	}
+
+	@Override
+	public int getWeight()
+	{
+		return 1000;
+	}
+}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java
new file mode 100644
index 00000000..1820adc1
--- /dev/null
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java
@@ -0,0 +1,31 @@
+package consulo.javascript.lang;
+
+import jakarta.inject.Inject;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 06/12/2021
+ */
+public class EcmaScript11JavaScriptVersion extends EcmaScript6JavaScriptVersion
+{
+	@Inject
+	public EcmaScript11JavaScriptVersion()
+	{
+		super("ECMASCRIPT_11");
+	}
+
+	@Nonnull
+	@Override
+	public String getPresentableName()
+	{
+		return "ECMAScript 11";
+	}
+
+	@Override
+	public int getWeight()
+	{
+		return 1100;
+	}
+}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java
new file mode 100644
index 00000000..c17fffb9
--- /dev/null
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java
@@ -0,0 +1,31 @@
+package consulo.javascript.lang;
+
+import jakarta.inject.Inject;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 06/12/2021
+ */
+public class EcmaScript12JavaScriptVersion extends EcmaScript6JavaScriptVersion
+{
+	@Inject
+	public EcmaScript12JavaScriptVersion()
+	{
+		super("ECMASCRIPT_12");
+	}
+
+	@Nonnull
+	@Override
+	public String getPresentableName()
+	{
+		return "ECMAScript 12";
+	}
+
+	@Override
+	public int getWeight()
+	{
+		return 1200;
+	}
+}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
new file mode 100644
index 00000000..e66041c2
--- /dev/null
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013-2015 must-be.org
+ *
+ * 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.
+ */
+
+package consulo.javascript.lang;
+
+import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
+import jakarta.inject.Inject;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 12.12.2015
+ */
+public class EcmaScript6JavaScriptVersion extends BaseEcmaScriptJavaScriptVersion implements StandardJavaScriptVersions.Marker, JavaScriptVersionWithHelper
+{
+	@Nonnull
+	public static EcmaScript6JavaScriptVersion getInstance()
+	{
+		return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript6JavaScriptVersion.class);
+	}
+
+	@Inject
+	public EcmaScript6JavaScriptVersion()
+	{
+		super("ECMASCRIPT_6");
+	}
+
+	public EcmaScript6JavaScriptVersion(@Nonnull String id)
+	{
+		super(id);
+	}
+
+	@Nonnull
+	@Override
+	public String getPresentableName()
+	{
+		return "ECMAScript 6";
+	}
+
+	@Override
+	public int getWeight()
+	{
+		return 600;
+	}
+}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java
new file mode 100644
index 00000000..9fd519a4
--- /dev/null
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java
@@ -0,0 +1,31 @@
+package consulo.javascript.lang;
+
+import jakarta.inject.Inject;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 06/12/2021
+ */
+public class EcmaScript7JavaScriptVersion extends EcmaScript6JavaScriptVersion
+{
+	@Inject
+	public EcmaScript7JavaScriptVersion()
+	{
+		super("ECMASCRIPT_7");
+	}
+
+	@Nonnull
+	@Override
+	public String getPresentableName()
+	{
+		return "ECMAScript 7";
+	}
+
+	@Override
+	public int getWeight()
+	{
+		return 700;
+	}
+}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript8JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript8JavaScriptVersion.java
new file mode 100644
index 00000000..ad66e1c1
--- /dev/null
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript8JavaScriptVersion.java
@@ -0,0 +1,31 @@
+package consulo.javascript.lang;
+
+import jakarta.inject.Inject;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 06/12/2021
+ */
+public class EcmaScript8JavaScriptVersion extends EcmaScript6JavaScriptVersion
+{
+	@Inject
+	public EcmaScript8JavaScriptVersion()
+	{
+		super("ECMASCRIPT_8");
+	}
+
+	@Nonnull
+	@Override
+	public String getPresentableName()
+	{
+		return "ECMAScript 8";
+	}
+
+	@Override
+	public int getWeight()
+	{
+		return 800;
+	}
+}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java
new file mode 100644
index 00000000..6898c6b6
--- /dev/null
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java
@@ -0,0 +1,31 @@
+package consulo.javascript.lang;
+
+import jakarta.inject.Inject;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 06/12/2021
+ */
+public class EcmaScript9JavaScriptVersion extends EcmaScript6JavaScriptVersion
+{
+	@Inject
+	public EcmaScript9JavaScriptVersion()
+	{
+		super("ECMASCRIPT_9");
+	}
+
+	@Nonnull
+	@Override
+	public String getPresentableName()
+	{
+		return "ECMAScript 9";
+	}
+
+	@Override
+	public int getWeight()
+	{
+		return 900;
+	}
+}
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
diff --git a/lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
similarity index 100%
rename from lang-version-impl/ecmascript6-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 030f83aa..8d6ee62b 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -103,7 +103,7 @@
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-ecmascript6.impl</artifactId>
+			<artifactId>consulo.javascript-ecmascript.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/plugin/src/main/resources/META-INF/ecma6.xml b/plugin/src/main/resources/META-INF/ecma6.xml
index 29ff8144..ac25ac91 100644
--- a/plugin/src/main/resources/META-INF/ecma6.xml
+++ b/plugin/src/main/resources/META-INF/ecma6.xml
@@ -18,6 +18,12 @@
 	<extensions defaultExtensionNs="com.intellij">
 		<fileTypeFactory implementation="consulo.javascript.lang.EcmaScriptFileTypeFactory"/>
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript6JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript7JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript8JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript9JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript10JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript11JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript12JavaScriptVersion"/>
 	</extensions>
 
 	<extensions defaultExtensionNs="consulo.javascript">
diff --git a/pom.xml b/pom.xml
index cdd5757e..827a3611 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 		<module>lang-version-impl/typescript-impl</module>
 		<module>lang-version-impl/actionscript-impl</module>
 		<module>lang-version-impl/ecmascript4-impl</module>
-		<module>lang-version-impl/ecmascript6-impl</module>
+		<module>lang-version-impl/ecmascript-impl</module>
 		<module>lang-version-impl/json-javascript-impl</module>
 		<module>plugin</module>
 	</modules>

From feda320d8d16dc8d8b825b6406b22134c74f1e3d Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 6 Dec 2021 21:09:19 +0300
Subject: [PATCH 138/340] add initial support for exponential operator ** ES7

---
 .../lang/javascript/psi/JSBinaryExpression.java  | 16 +++++++++++++++-
 .../javascript/lang/JavaScriptFeature.java       |  3 ++-
 .../intellij/lang/javascript/JSTokenTypes.java   |  3 ++-
 .../psi/impl/JSBinaryExpressionImpl.java         |  8 ++++++--
 .../lang/parsing/ExpressionParsing.java          | 10 ++++++++--
 .../lang/BaseEcmaScriptJavaScriptVersion.java    |  4 ++--
 .../lang/EcmaScript7JavaScriptVersion.java       |  2 ++
 .../javascript/lang/lexer/ecmascript6.flex       |  3 ++-
 ...ing.java => EcmaScriptExpressionParsing.java} | 13 +++++++++++--
 ...aScript6Parser.java => EcmaScriptParser.java} | 10 +++++-----
 ...ontext.java => EcmaScriptParsingContext.java} |  6 +++---
 ...sing.java => EcmaScriptStatementParsing.java} |  6 +++---
 ...r.java => EcmaScriptStrictParserBuilder.java} |  4 ++--
 .../highlighting/JavaScriptHighlightVisitor.java | 16 +++++++++++++++-
 14 files changed, 78 insertions(+), 26 deletions(-)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/{EcmaScript6ExpressionParsing.java => EcmaScriptExpressionParsing.java} (90%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/{EcmaScript6Parser.java => EcmaScriptParser.java} (86%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/{EcmaScript6ParsingContext.java => EcmaScriptParsingContext.java} (84%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/{EcmaScript6StatementParsing.java => EcmaScriptStatementParsing.java} (98%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/{EcmaScript6StrictParserBuilder.java => EcmaScriptStrictParserBuilder.java} (81%)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
index 366a9c7e..580dbe04 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
@@ -16,7 +16,11 @@
 
 package com.intellij.lang.javascript.psi;
 
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -31,5 +35,15 @@ public interface JSBinaryExpression extends JSExpression
 
 	JSExpression getROperand();
 
-	IElementType getOperationSign();
+	@Nullable
+	@RequiredReadAction
+	default IElementType getOperationSign()
+	{
+		PsiElement element = getOperationElement();
+		return element != null ? element.getNode().getElementType() : null;
+	}
+
+	@Nullable
+	@RequiredReadAction
+	PsiElement getOperationElement();
 }
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
index bc767370..cf4aac7f 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
@@ -29,7 +29,8 @@ public enum JavaScriptFeature
 	BINARY_LITERAL("Binary literals"),
 	PARAMETER_DEFAULT_VALUE("Default parameter values"),
 	REST_PARAMETER("Rest parameters"),
-	SPREAD_OPERATOR("Spread operator");
+	SPREAD_OPERATOR("Spread operator"),
+	EXPONENTIATION_OPERATOR("exponentiation operator");
 
 	private String myName;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 24f77e2b..f7e66fa8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -244,6 +244,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType PLUS = new JSElementType("PLUS");// +
 	IElementType MINUS = new JSElementType("MINUS");// -
 	IElementType MULT = new JSElementType("MULT");// *
+	IElementType MULTMULT = new JSElementType("MULTMULT");// *
 	IElementType PERC = new JSElementType("PERC");// %
 	IElementType PLUSPLUS = new JSElementType("PLUSPLUS");// ++
 	IElementType MINUSMINUS = new JSElementType("MINUSMINUS");// --
@@ -285,7 +286,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType JSDOC_TAG_DATA = new JSElementType("JSDOC_TAG_DATA");
 
 	TokenSet OPERATIONS = TokenSet.create(LT, GT, LE, GE, EQEQ, NE, EQEQEQ, NEQEQ, PLUS, MINUS, MULT, PERC, PLUSPLUS, MINUSMINUS, LTLT, GTGT, GTGTGT, AND, OR, XOR, EXCL, TILDE, ANDAND, OROR, QUEST,
-			COLON, EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIV, DIVEQ, COMMA, IS_KEYWORD, AS_KEYWORD);
+			COLON, EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIV, DIVEQ, MULTMULT, COMMA, IS_KEYWORD, AS_KEYWORD);
 
 	TokenSet ASSOC_OPERATIONS = TokenSet.create(PLUS, MULT, AND, OR, XOR, OROR, ANDAND);
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
index 26f8b536..ed2039a3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
@@ -28,8 +28,10 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiTreeUtil;
+import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -68,11 +70,13 @@ public JSExpression getROperand()
 		return secondExpression != null ? (JSExpression) secondExpression.getPsi() : null;
 	}
 
+	@RequiredReadAction
+	@Nullable
 	@Override
-	public IElementType getOperationSign()
+	public PsiElement getOperationElement()
 	{
 		final ASTNode operationASTNode = getNode().findChildByType(BINARY_OPERATIONS);
-		return operationASTNode != null ? operationASTNode.getElementType() : null;
+		return operationASTNode != null ? operationASTNode.getPsi() : null;
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 3d05010e..e5277e1d 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.tree.TokenSet;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.logging.Logger;
 import consulo.util.dataholder.Key;
@@ -873,7 +874,12 @@ private boolean parseIsAsExpression(final PsiBuilder builder)
 		return true;
 	}
 
-	private boolean parseMultiplicativeExpression(final PsiBuilder builder)
+	protected boolean parseMultiplicativeExpression(final PsiBuilder builder)
+	{
+		return parseMultiplicativeExpression(builder, JSTokenTypes.MULTIPLICATIVE_OPERATIONS);
+	}
+
+	protected boolean parseMultiplicativeExpression(final PsiBuilder builder, TokenSet operatorSet)
 	{
 		PsiBuilder.Marker expr = builder.mark();
 		if(!parseIsAsExpression(builder))
@@ -882,7 +888,7 @@ private boolean parseMultiplicativeExpression(final PsiBuilder builder)
 			return false;
 		}
 
-		while(JSTokenTypes.MULTIPLICATIVE_OPERATIONS.contains(builder.getTokenType()))
+		while(operatorSet.contains(builder.getTokenType()))
 		{
 			builder.advanceLexer();
 			if(!parseUnaryExpression(builder))
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
index 30b93ccd..5c432170 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -10,7 +10,7 @@
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScriptFlexAdapter;
 import consulo.javascript.lang.lexer._EcmaScript6Lexer;
-import consulo.javascript.lang.parsing.EcmaScript6Parser;
+import consulo.javascript.lang.parsing.EcmaScriptParser;
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
 
@@ -64,7 +64,7 @@ private Lexer createLexer(boolean hightlight)
 	@Override
 	public PsiParser createParser()
 	{
-		return new EcmaScript6Parser();
+		return new EcmaScriptParser();
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java
index 9fd519a4..b62d30c2 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java
@@ -14,6 +14,8 @@ public class EcmaScript7JavaScriptVersion extends EcmaScript6JavaScriptVersion
 	public EcmaScript7JavaScriptVersion()
 	{
 		super("ECMASCRIPT_7");
+
+		addFeature(JavaScriptFeature.EXPONENTIATION_OPERATOR);
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index 45c852ed..e72ea33a 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -349,7 +349,8 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 <YYINITIAL,DIV_OR_GT> ":"                   { yybegin(YYINITIAL); return JSTokenTypes.COLON; }
 <YYINITIAL,DIV_OR_GT> "+"                   { yybegin(YYINITIAL); return JSTokenTypes.PLUS; }
 <YYINITIAL,DIV_OR_GT> "-"                   { yybegin(YYINITIAL); return JSTokenTypes.MINUS; }
-<DIV_OR_GT> "*"       { yybegin(YYINITIAL); return JSTokenTypes.MULT; }
+<DIV_OR_GT> "*"       { yybegin(YYINITIAL);  return JSTokenTypes.MULT; }
+<DIV_OR_GT> "**"       { yybegin(YYINITIAL); return JSTokenTypes.MULTMULT; }
 <DIV_OR_GT> "/"       { yybegin(YYINITIAL); return JSTokenTypes.DIV; }
 <YYINITIAL,DIV_OR_GT> "^"                   { yybegin(YYINITIAL); return JSTokenTypes.XOR; }
 <YYINITIAL,DIV_OR_GT> "%"                   { yybegin(YYINITIAL); return JSTokenTypes.PERC; }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
similarity index 90%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
index f21d9f1a..ec7b9514 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -21,18 +21,27 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.tree.TokenSet;
 
 /**
  * @author VISTALL
  * @since 03.03.2016
  */
-public class EcmaScript6ExpressionParsing extends ExpressionParsing
+public class EcmaScriptExpressionParsing extends ExpressionParsing
 {
-	public EcmaScript6ExpressionParsing(JavaScriptParsingContext context)
+	private static final TokenSet ES_MULTIPLICATIVE_OPERATIONS = TokenSet.orSet(JSTokenTypes.MULTIPLICATIVE_OPERATIONS, TokenSet.create(JSTokenTypes.MULTMULT));
+
+	public EcmaScriptExpressionParsing(JavaScriptParsingContext context)
 	{
 		super(context);
 	}
 
+	@Override
+	protected boolean parseMultiplicativeExpression(PsiBuilder builder)
+	{
+		return parseMultiplicativeExpression(builder, ES_MULTIPLICATIVE_OPERATIONS);
+	}
+
 	@Override
 	protected boolean parsePrimaryExpression(PsiBuilder builder)
 	{
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParser.java
similarity index 86%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParser.java
index 99f1cbf2..229ad941 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6Parser.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParser.java
@@ -16,27 +16,27 @@
 
 package consulo.javascript.lang.parsing;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.PsiBuilder;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 15.02.2016
  */
-public class EcmaScript6Parser extends JavaScriptParser
+public class EcmaScriptParser extends JavaScriptParser
 {
 	@Nonnull
 	@Override
 	public JavaScriptParsingContext createParsingContext()
 	{
-		return new EcmaScript6ParsingContext();
+		return new EcmaScriptParsingContext();
 	}
 
 	@Nonnull
 	@Override
 	public JavaScriptParserBuilder createBuilder(PsiBuilder builder)
 	{
-		return new EcmaScript6StrictParserBuilder(builder);
+		return new EcmaScriptStrictParserBuilder(builder);
 	}
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParsingContext.java
similarity index 84%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParsingContext.java
index a43049bb..7110fc8f 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6ParsingContext.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParsingContext.java
@@ -22,19 +22,19 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public class EcmaScript6ParsingContext extends JavaScriptParsingContext
+public class EcmaScriptParsingContext extends JavaScriptParsingContext
 {
 	@Nonnull
 	@Override
 	protected StatementParsing createStatementParsing()
 	{
-		return new EcmaScript6StatementParsing(this);
+		return new EcmaScriptStatementParsing(this);
 	}
 
 	@Nonnull
 	@Override
 	protected ExpressionParsing createExpressionParsing()
 	{
-		return new EcmaScript6ExpressionParsing(this);
+		return new EcmaScriptExpressionParsing(this);
 	}
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
similarity index 98%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
index a22a04df..94ab05bf 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -32,11 +32,11 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public class EcmaScript6StatementParsing extends StatementParsing
+public class EcmaScriptStatementParsing extends StatementParsing
 {
-	private static final Logger LOGGER = Logger.getInstance(EcmaScript6StatementParsing.class);
+	private static final Logger LOGGER = Logger.getInstance(EcmaScriptStatementParsing.class);
 
-	public EcmaScript6StatementParsing(EcmaScript6ParsingContext context)
+	public EcmaScriptStatementParsing(EcmaScriptParsingContext context)
 	{
 		super(context);
 	}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStrictParserBuilder.java
similarity index 81%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStrictParserBuilder.java
index 694233f5..84238167 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript6StrictParserBuilder.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStrictParserBuilder.java
@@ -8,9 +8,9 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public class EcmaScript6StrictParserBuilder extends JavaScriptStrictParserBuilder
+public class EcmaScriptStrictParserBuilder extends JavaScriptStrictParserBuilder
 {
-	public EcmaScript6StrictParserBuilder(PsiBuilder delegate)
+	public EcmaScriptStrictParserBuilder(PsiBuilder delegate)
 	{
 		super(delegate);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index 382dd2f9..0c629b7e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -54,6 +54,19 @@ public boolean suitableForFile(@Nonnull PsiFile psiFile)
 		return psiFile instanceof JSFile;
 	}
 
+	@Override
+	@RequiredReadAction
+	public void visitJSBinaryExpression(JSBinaryExpression node)
+	{
+		super.visitJSBinaryExpression(node);
+
+		IElementType operationSign = node.getOperationSign();
+		if(operationSign == JSTokenTypes.MULTMULT)
+		{
+			reportFeatureUsage(node.getOperationElement(), JavaScriptFeature.EXPONENTIATION_OPERATOR);
+		}
+	}
+
 	@Override
 	@RequiredReadAction
 	public void visitElement(PsiElement element)
@@ -119,7 +132,8 @@ public void visitJSAttribute(JSAttribute jsAttribute)
 	{
 		super.visitJSAttribute(jsAttribute);
 
-		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).needsUpdateOnTyping(false).range(jsAttribute).textAttributes(JavaScriptSyntaxHighlightKeys.JS_METADATA).create());
+		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).needsUpdateOnTyping(false).range(jsAttribute).textAttributes(JavaScriptSyntaxHighlightKeys
+				.JS_METADATA).create());
 	}
 
 	@Override

From af1f2aff4bd91c10faa32cf036fd85a03ddd2a08 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 6 Dec 2021 21:14:53 +0300
Subject: [PATCH 139/340] fix ecma default version for es files

---
 .../lang/EcmaScript12JavaScriptVersion.java        |  6 ++++++
 .../javascript/lang/EcmaScriptFileType.java        | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java
index c17fffb9..0b3525a6 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java
@@ -10,6 +10,12 @@
  */
 public class EcmaScript12JavaScriptVersion extends EcmaScript6JavaScriptVersion
 {
+	@Nonnull
+	public static EcmaScript12JavaScriptVersion getInstance()
+	{
+		return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript12JavaScriptVersion.class);
+	}
+
 	@Inject
 	public EcmaScript12JavaScriptVersion()
 	{
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
index 44a6da84..cf8418ad 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
@@ -18,9 +18,11 @@
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.icon.JavaScriptIconGroup;
+import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.lang.LanguageVersion;
 import consulo.ui.image.Image;
 
@@ -73,6 +75,16 @@ public Image getIcon()
 	@Override
 	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
 	{
-		return EcmaScript6JavaScriptVersion.getInstance();
+		if(module == null)
+		{
+			return EcmaScript12JavaScriptVersion.getInstance();
+		}
+
+		JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
+		if(extension != null)
+		{
+			return extension.getLanguageVersion();
+		}
+		return EcmaScript12JavaScriptVersion.getInstance();
 	}
 }

From 311be218a00f4a5178f15a9d2616735b90fb19f2 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 6 Dec 2021 21:17:37 +0300
Subject: [PATCH 140/340] move spead operator to es9

---
 .../javascript/lang/BaseEcmaScriptJavaScriptVersion.java        | 1 -
 .../consulo/javascript/lang/EcmaScript9JavaScriptVersion.java   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
index 5c432170..526445fe 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -37,7 +37,6 @@ protected BaseEcmaScriptJavaScriptVersion(@Nonnull String id)
 		addFeature(JavaScriptFeature.OCTAL_LITERAL);
 		addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
 		addFeature(JavaScriptFeature.REST_PARAMETER);
-		addFeature(JavaScriptFeature.SPREAD_OPERATOR);
 	}
 
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java
index 6898c6b6..100008c8 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java
@@ -14,6 +14,8 @@ public class EcmaScript9JavaScriptVersion extends EcmaScript6JavaScriptVersion
 	public EcmaScript9JavaScriptVersion()
 	{
 		super("ECMASCRIPT_9");
+
+		addFeature(JavaScriptFeature.SPREAD_OPERATOR);
 	}
 
 	@Nonnull

From 8965afb5147f5abf71ea7f886979908b354885f2 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 6 Dec 2021 21:48:26 +0300
Subject: [PATCH 141/340] add plugin url

---
 plugin/src/main/resources/META-INF/plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 65f80ad9..e417e6fa 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -14,7 +14,7 @@
   - limitations under the License.
   -->
 
-<consulo-plugin>
+<consulo-plugin url="https://github.com/consulo/consulo-javascript">
 	<id>consulo.javascript</id>
 	<name>JavaScript</name>
 	<version>SNAPSHOT</version>

From 6491864c1d0586129be9c8e95318ddcf0cc07503 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 7 Dec 2021 11:32:59 +0300
Subject: [PATCH 142/340] "i have idea :)" - just return null

---
 .../javascript/documentation/JSDocumentationProvider.java  | 2 +-
 .../javascript/lang/EcmaScript11JavaScriptVersion.java     | 2 ++
 .../java/consulo/javascript/lang/lexer/ecmascript6.flex    | 1 +
 .../lang/parsing/EcmaScriptExpressionParsing.java          | 7 +++++++
 .../lang/parsing/EcmaScript4ExpressionParsing.java         | 5 +++--
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 05f925b9..0aa05a73 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -500,7 +500,7 @@ public String generateDoc(PsiElement _element, PsiElement originalElement)
 						presentation.getLocationString());
 				buffer.append("<br/>\n");
 			}
-			return buffer != null ? buffer.toString() : "have no idea :)";
+			return buffer != null ? buffer.toString() : null;
 		}
 
 		_element = _element.getNavigationElement();
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java
index 1820adc1..8159854a 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java
@@ -14,6 +14,8 @@ public class EcmaScript11JavaScriptVersion extends EcmaScript6JavaScriptVersion
 	public EcmaScript11JavaScriptVersion()
 	{
 		super("ECMASCRIPT_11");
+
+		addFeature(JavaScriptFeature.OPTIONAL_CHAINING_OPERATOR);
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index e72ea33a..ce9420ba 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -346,6 +346,7 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 <YYINITIAL,DIV_OR_GT> "!"                   { yybegin(YYINITIAL); return JSTokenTypes.EXCL; }
 <YYINITIAL,DIV_OR_GT> "~"                   { yybegin(YYINITIAL); return JSTokenTypes.TILDE; }
 <YYINITIAL,DIV_OR_GT> "?"                   { yybegin(YYINITIAL); return JSTokenTypes.QUEST; }
+<YYINITIAL,DIV_OR_GT> "?."                  { yybegin(YYINITIAL); return JSTokenTypes.QUEST_DOT; }
 <YYINITIAL,DIV_OR_GT> ":"                   { yybegin(YYINITIAL); return JSTokenTypes.COLON; }
 <YYINITIAL,DIV_OR_GT> "+"                   { yybegin(YYINITIAL); return JSTokenTypes.PLUS; }
 <YYINITIAL,DIV_OR_GT> "-"                   { yybegin(YYINITIAL); return JSTokenTypes.MINUS; }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
index ec7b9514..b86f828c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -30,12 +30,19 @@
 public class EcmaScriptExpressionParsing extends ExpressionParsing
 {
 	private static final TokenSet ES_MULTIPLICATIVE_OPERATIONS = TokenSet.orSet(JSTokenTypes.MULTIPLICATIVE_OPERATIONS, TokenSet.create(JSTokenTypes.MULTMULT));
+	private static final TokenSet ES_MEMBER_TOKENS = TokenSet.create(JSTokenTypes.DOT, JSTokenTypes.DOT_DOT, JSTokenTypes.QUEST_DOT);
 
 	public EcmaScriptExpressionParsing(JavaScriptParsingContext context)
 	{
 		super(context);
 	}
 
+	@Override
+	protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax)
+	{
+		return parseMemberExpression(builder, allowCallSyntax, ES_MEMBER_TOKENS);
+	}
+
 	@Override
 	protected boolean parseMultiplicativeExpression(PsiBuilder builder)
 	{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
index 3214151a..b9145edb 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
@@ -5,6 +5,7 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.tree.TokenSet;
 
 /**
  * @author VISTALL
@@ -126,7 +127,7 @@ else if(currentlyAllowCallSyntax && tokenType == JSTokenTypes.LPAR)
 	}
 
 	@Override
-	public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar)
+	public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, TokenSet separatorsSet)
 	{
 		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
 		{
@@ -136,7 +137,7 @@ public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar)
 		buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
 		boolean hasGenerics = false;
 
-		while(builder.getTokenType() == JSTokenTypes.DOT)
+		while(separatorsSet.contains(builder.getTokenType()))
 		{
 			boolean stop = false;
 			builder.advanceLexer();

From 5f2076622b6dcccc8424d4e476a2a90909a1702e Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 7 Dec 2021 11:41:46 +0300
Subject: [PATCH 143/340] to #34

---
 .../javascript/lang/JavaScriptFeature.java      |  3 ++-
 .../intellij/lang/javascript/JSTokenTypes.java  |  1 +
 .../lang/parsing/ExpressionParsing.java         | 17 +++++++++++++++--
 .../lang/JavaScriptLanguageVersionResolver.java |  1 +
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
index cf4aac7f..77c36bd6 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
@@ -30,7 +30,8 @@ public enum JavaScriptFeature
 	PARAMETER_DEFAULT_VALUE("Default parameter values"),
 	REST_PARAMETER("Rest parameters"),
 	SPREAD_OPERATOR("Spread operator"),
-	EXPONENTIATION_OPERATOR("exponentiation operator");
+	OPTIONAL_CHAINING_OPERATOR("Optional chaining operator"),
+	EXPONENTIATION_OPERATOR("Exponentiation operator");
 
 	private String myName;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index f7e66fa8..602fb5f6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -259,6 +259,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType ANDAND = new JSElementType("ANDAND");// &&
 	IElementType OROR = new JSElementType("OROR");// ||
 	IElementType QUEST = new JSElementType("QUEST");// ?
+	IElementType QUEST_DOT = new JSElementType("QUEST_DOT");// ?
 	IElementType COLON = new JSElementType("COLON");// :
 	IElementType EQ = new JSElementType("EQ");// =
 	IElementType PLUSEQ = new JSElementType("PLUSEQ");// +=
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index e5277e1d..481ea33e 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -42,6 +42,9 @@ public class ExpressionParsing extends Parsing
 	public static final Key<Boolean> WITHIN_ARRAY_LITERAL_EXPRESSION = Key.create("within.array.literal.expression");
 	public static final Key<Boolean> WITHIN_OBJECT_LITERAL_EXPRESSION = Key.create("within.object.literal.expression");
 
+	private static final TokenSet DOT_SET = TokenSet.create(JSTokenTypes.DOT);
+	private static final TokenSet MEMBER_OPERATOR_SET = TokenSet.create(JSTokenTypes.DOT, JSTokenTypes.COLON_COLON, JSTokenTypes.DOT_DOT);
+
 	private final JSXParser myJSXParser = new JSXParser();
 
 	public ExpressionParsing(JavaScriptParsingContext context)
@@ -343,6 +346,11 @@ private void parseParenthesizedExpression(final PsiBuilder builder)
 	}
 
 	protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax)
+	{
+		return parseMemberExpression(builder, allowCallSyntax, MEMBER_OPERATOR_SET);
+	}
+
+	protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax, TokenSet membersOperatorSet)
 	{
 		PsiBuilder.Marker expr = builder.mark();
 		boolean isNew;
@@ -380,7 +388,7 @@ protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyn
 		while(true)
 		{
 			IElementType tokenType = builder.getTokenType();
-			if(tokenType == JSTokenTypes.DOT || (tokenType == JSTokenTypes.COLON_COLON || tokenType == JSTokenTypes.DOT_DOT))
+			if(membersOperatorSet.contains(tokenType))
 			{
 				currentlyAllowCallSyntax = allowCallSyntax;
 				builder.advanceLexer();
@@ -447,6 +455,11 @@ public boolean parseQualifiedTypeName(PsiBuilder builder)
 	}
 
 	public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar)
+	{
+		return parseQualifiedTypeName(builder, allowStar, DOT_SET);
+	}
+
+	public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, TokenSet separatorsSet)
 	{
 		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
 		{
@@ -455,7 +468,7 @@ public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar)
 		PsiBuilder.Marker expr = builder.mark();
 		Parsing.buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
 
-		while(builder.getTokenType() == JSTokenTypes.DOT)
+		while(separatorsSet.contains(builder.getTokenType()))
 		{
 			boolean stop = false;
 			builder.advanceLexer();
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index 4b85dd2c..e9c933b7 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -71,6 +71,7 @@ public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable
 		if(fileType instanceof JavaScriptFileTypeWithVersion)
 		{
 			Module module = ModuleUtilCore.findModuleForFile(virtualFile, project);
+			module = ModuleUtilCore.findModuleForFile(virtualFile, project);
 			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(module, virtualFile);
 		}
 

From 0e94469265451d954498369297ec94cfff410195 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 7 Dec 2021 21:42:34 +0300
Subject: [PATCH 144/340] fix #40

---
 .../intellij/lang/javascript/JSTokenTypes.java    |  8 +++++---
 .../lang/parsing/ExpressionParsing.java           |  2 +-
 .../javascript/lang/lexer/ecmascript6.flex        |  3 +++
 .../lang/parsing/EcmaScriptExpressionParsing.java | 15 ---------------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 602fb5f6..d587881f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -274,6 +274,9 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType XOREQ = new JSElementType("XOREQ");// ^=
 	IElementType DIV = new JSElementType("DIV"); // /
 	IElementType DIVEQ = new JSElementType("DIVEQ"); // /=
+	IElementType OR_OR_EQ = new JSElementType("OR_OR_EQ"); // ||=
+	IElementType AND_AND_EQ = new JSElementType("AND_AND_EQ"); // &&=
+	IElementType QUEST_QUEST_EQ = new JSElementType("QUEST_QUEST_EQ"); // ??=
 	IElementType DARROW = new JSElementType("DARROW"); // =>
 
 	IElementType COLON_COLON = new JSElementType("COLON_COLON"); // ::
@@ -291,8 +294,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 
 	TokenSet ASSOC_OPERATIONS = TokenSet.create(PLUS, MULT, AND, OR, XOR, OROR, ANDAND);
 
-	TokenSet ASSIGNMENT_OPERATIONS = TokenSet.create(EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIVEQ);
-
+	TokenSet ASSIGNMENT_OPERATIONS = TokenSet.create(EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIVEQ, OR_OR_EQ, AND_AND_EQ, QUEST_QUEST_EQ);
 
 	TokenSet EQUALITY_OPERATIONS = TokenSet.create(EQEQ, NE, EQEQEQ, NEQEQ);
 
@@ -300,7 +302,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 
 	TokenSet ADDITIVE_OPERATIONS = TokenSet.create(PLUS, MINUS);
 
-	TokenSet MULTIPLICATIVE_OPERATIONS = TokenSet.create(MULT, DIV, PERC);
+	TokenSet MULTIPLICATIVE_OPERATIONS = TokenSet.create(MULT, DIV, PERC, MULTMULT);
 
 	TokenSet SHIFT_OPERATIONS = TokenSet.create(LTLT, GTGT, GTGTGT);
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 481ea33e..150fdc12 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -43,7 +43,7 @@ public class ExpressionParsing extends Parsing
 	public static final Key<Boolean> WITHIN_OBJECT_LITERAL_EXPRESSION = Key.create("within.object.literal.expression");
 
 	private static final TokenSet DOT_SET = TokenSet.create(JSTokenTypes.DOT);
-	private static final TokenSet MEMBER_OPERATOR_SET = TokenSet.create(JSTokenTypes.DOT, JSTokenTypes.COLON_COLON, JSTokenTypes.DOT_DOT);
+	private static final TokenSet MEMBER_OPERATOR_SET = TokenSet.create(JSTokenTypes.DOT, JSTokenTypes.COLON_COLON, JSTokenTypes.DOT_DOT, JSTokenTypes.QUEST_DOT);
 
 	private final JSXParser myJSXParser = new JSXParser();
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index ce9420ba..ca4ad067 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -325,6 +325,9 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 <YYINITIAL,DIV_OR_GT> "&amp;="              { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ; }
 <YYINITIAL,DIV_OR_GT> "|="                  { yybegin(YYINITIAL); return JSTokenTypes.OREQ; }
 <YYINITIAL,DIV_OR_GT> "^="                  { yybegin(YYINITIAL); return JSTokenTypes.XOREQ; }
+<YYINITIAL,DIV_OR_GT> "||="                  { yybegin(YYINITIAL); return JSTokenTypes.OR_OR_EQ; }
+<YYINITIAL,DIV_OR_GT> "??="                  { yybegin(YYINITIAL); return JSTokenTypes.QUEST_QUEST_EQ; }
+<YYINITIAL,DIV_OR_GT> "&&="                  { yybegin(YYINITIAL); return JSTokenTypes.AND_AND_EQ; }
 <YYINITIAL,DIV_OR_GT> "%="                  { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ; }
 <DIV_OR_GT> "<<="     { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
 <YYINITIAL,DIV_OR_GT> "&lt;&lt;="           { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
index b86f828c..ad254b7d 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -21,7 +21,6 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
 
 /**
  * @author VISTALL
@@ -29,25 +28,11 @@
  */
 public class EcmaScriptExpressionParsing extends ExpressionParsing
 {
-	private static final TokenSet ES_MULTIPLICATIVE_OPERATIONS = TokenSet.orSet(JSTokenTypes.MULTIPLICATIVE_OPERATIONS, TokenSet.create(JSTokenTypes.MULTMULT));
-	private static final TokenSet ES_MEMBER_TOKENS = TokenSet.create(JSTokenTypes.DOT, JSTokenTypes.DOT_DOT, JSTokenTypes.QUEST_DOT);
-
 	public EcmaScriptExpressionParsing(JavaScriptParsingContext context)
 	{
 		super(context);
 	}
 
-	@Override
-	protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax)
-	{
-		return parseMemberExpression(builder, allowCallSyntax, ES_MEMBER_TOKENS);
-	}
-
-	@Override
-	protected boolean parseMultiplicativeExpression(PsiBuilder builder)
-	{
-		return parseMultiplicativeExpression(builder, ES_MULTIPLICATIVE_OPERATIONS);
-	}
 
 	@Override
 	protected boolean parsePrimaryExpression(PsiBuilder builder)

From a1ae1f73c9d618921a3674d626c471079a3a504b Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 7 Dec 2021 21:49:37 +0300
Subject: [PATCH 145/340] fix #36

---
 .../com/intellij/lang/javascript/JSTokenTypes.java  |  6 ++++--
 .../consulo/javascript/lang/lexer/ecmascript6.flex  |  1 +
 .../highlighting/JavaScriptHighlightVisitor.java    | 13 +++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index d587881f..c886c4f3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -265,6 +265,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType PLUSEQ = new JSElementType("PLUSEQ");// +=
 	IElementType MINUSEQ = new JSElementType("MINUSEQ");// -=
 	IElementType MULTEQ = new JSElementType("MULTEQ");// *=
+	IElementType MULT_MULT_EQ = new JSElementType("MULT_MULT_EQ");// **=
 	IElementType PERCEQ = new JSElementType("PERCEQ");// %=
 	IElementType LTLTEQ = new JSElementType("LTLTEQ");// <<=
 	IElementType GTGTEQ = new JSElementType("GTGTEQ");// >>=
@@ -290,11 +291,12 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType JSDOC_TAG_DATA = new JSElementType("JSDOC_TAG_DATA");
 
 	TokenSet OPERATIONS = TokenSet.create(LT, GT, LE, GE, EQEQ, NE, EQEQEQ, NEQEQ, PLUS, MINUS, MULT, PERC, PLUSPLUS, MINUSMINUS, LTLT, GTGT, GTGTGT, AND, OR, XOR, EXCL, TILDE, ANDAND, OROR, QUEST,
-			COLON, EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIV, DIVEQ, MULTMULT, COMMA, IS_KEYWORD, AS_KEYWORD);
+			COLON, EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIV, DIVEQ, MULTMULT, COMMA, IS_KEYWORD, AS_KEYWORD, OR_OR_EQ, AND_AND_EQ, QUEST_QUEST_EQ,
+			MULT_MULT_EQ);
 
 	TokenSet ASSOC_OPERATIONS = TokenSet.create(PLUS, MULT, AND, OR, XOR, OROR, ANDAND);
 
-	TokenSet ASSIGNMENT_OPERATIONS = TokenSet.create(EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIVEQ, OR_OR_EQ, AND_AND_EQ, QUEST_QUEST_EQ);
+	TokenSet ASSIGNMENT_OPERATIONS = TokenSet.create(EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIVEQ, OR_OR_EQ, AND_AND_EQ, QUEST_QUEST_EQ, MULT_MULT_EQ);
 
 	TokenSet EQUALITY_OPERATIONS = TokenSet.create(EQEQ, NE, EQEQEQ, NEQEQ);
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index ca4ad067..b2b6792b 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -326,6 +326,7 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 <YYINITIAL,DIV_OR_GT> "|="                  { yybegin(YYINITIAL); return JSTokenTypes.OREQ; }
 <YYINITIAL,DIV_OR_GT> "^="                  { yybegin(YYINITIAL); return JSTokenTypes.XOREQ; }
 <YYINITIAL,DIV_OR_GT> "||="                  { yybegin(YYINITIAL); return JSTokenTypes.OR_OR_EQ; }
+<YYINITIAL,DIV_OR_GT> "**="                  { yybegin(YYINITIAL); return JSTokenTypes.MULT_MULT_EQ; }
 <YYINITIAL,DIV_OR_GT> "??="                  { yybegin(YYINITIAL); return JSTokenTypes.QUEST_QUEST_EQ; }
 <YYINITIAL,DIV_OR_GT> "&&="                  { yybegin(YYINITIAL); return JSTokenTypes.AND_AND_EQ; }
 <YYINITIAL,DIV_OR_GT> "%="                  { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ; }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index 0c629b7e..862f8a42 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -67,6 +67,19 @@ public void visitJSBinaryExpression(JSBinaryExpression node)
 		}
 	}
 
+	@Override
+	@RequiredReadAction
+	public void visitJSAssignmentExpression(JSAssignmentExpression node)
+	{
+		super.visitJSAssignmentExpression(node);
+
+		IElementType operationSign = node.getOperationSign();
+		if(operationSign == JSTokenTypes.MULT_MULT_EQ)
+		{
+			reportFeatureUsage(node.getOperationElement(), JavaScriptFeature.EXPONENTIATION_OPERATOR);
+		}
+	}
+
 	@Override
 	@RequiredReadAction
 	public void visitElement(PsiElement element)

From 6f9553780c76ee9d78e0e04b25e2d232ddbf32c6 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 7 Dec 2021 21:50:59 +0300
Subject: [PATCH 146/340] move to es 6

---
 .../javascript/lang/BaseEcmaScriptJavaScriptVersion.java    | 6 ------
 .../javascript/lang/EcmaScript6JavaScriptVersion.java       | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
index 526445fe..7a2c4c48 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -31,12 +31,6 @@ public static EcmaScript6JavaScriptVersion getInstance()
 	protected BaseEcmaScriptJavaScriptVersion(@Nonnull String id)
 	{
 		super(id);
-
-		addFeature(JavaScriptFeature.CLASS);
-		addFeature(JavaScriptFeature.BINARY_LITERAL);
-		addFeature(JavaScriptFeature.OCTAL_LITERAL);
-		addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
-		addFeature(JavaScriptFeature.REST_PARAMETER);
 	}
 
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index e66041c2..3f7d1ec5 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -42,6 +42,12 @@ public EcmaScript6JavaScriptVersion()
 	public EcmaScript6JavaScriptVersion(@Nonnull String id)
 	{
 		super(id);
+
+		addFeature(JavaScriptFeature.CLASS);
+		addFeature(JavaScriptFeature.BINARY_LITERAL);
+		addFeature(JavaScriptFeature.OCTAL_LITERAL);
+		addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
+		addFeature(JavaScriptFeature.REST_PARAMETER);
 	}
 
 	@Nonnull

From 7eb501b355c7c21abe33f0767a336fabec56cdaa Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 7 Dec 2021 21:55:28 +0300
Subject: [PATCH 147/340] use natural sorter

---
 .../lang/StandardJavaScriptVersions.java           |  6 +++++-
 .../lang/StandardJavaScriptVersionsImpl.java       | 14 ++++++--------
 .../ClientJavaScriptModuleExtensionPanel.java      |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
index f5416b86..4f696aea 100644
--- a/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
@@ -30,7 +30,11 @@ public abstract class StandardJavaScriptVersions
 {
 	public static interface Marker
 	{
-		int getWeight();
+		@Deprecated
+		default int getWeight()
+		{
+			return 0;
+		}
 	}
 
 	@Nonnull
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index a56e312e..2417b1d0 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -1,15 +1,13 @@
 package consulo.javascript.lang;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.intellij.openapi.util.text.StringUtil;
+import consulo.lang.LanguageVersion;
+import jakarta.inject.Singleton;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import jakarta.inject.Singleton;
-
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.containers.ContainerUtil;
-import consulo.lang.LanguageVersion;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author VISTALL
@@ -37,7 +35,7 @@ public List<JavaScriptLanguageVersion> getValidLanguageVersions()
 			}
 		}
 
-		ContainerUtil.sort(list, (o1, o2) -> ((Marker) o1).getWeight() - ((Marker) o2).getWeight());
+		list.sort((o1, o2) -> StringUtil.naturalCompare(o1.getPresentableName(), o2.getPresentableName()));
 		return list;
 	}
 
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index 5001b46d..bbedf25a 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -45,7 +45,7 @@ public ClientJavaScriptModuleExtensionPanel(final JavaScriptMutableModuleExtensi
 
 		List<JavaScriptLanguageVersion> validLanguageVersions = StandardJavaScriptVersions.getInstance().getValidLanguageVersions();
 
-		ComboBox languageVersionComboBox = new ComboBox(new CollectionComboBoxModel(validLanguageVersions, extension.getLanguageVersion()));
+		ComboBox<JavaScriptLanguageVersion> languageVersionComboBox = new ComboBox(new CollectionComboBoxModel(validLanguageVersions, extension.getLanguageVersion()));
 		languageVersionComboBox.addItemListener(new ItemListener()
 		{
 			@Override

From 594836bee5b7c3d7a257677fc38418536713bad8 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Fri, 10 Dec 2021 22:14:07 +0300
Subject: [PATCH 148/340] migrate to localize at FileType#getDescription

---
 base-api/pom.xml                              |   1 +
 .../lang/javascript/JavaScriptFileType.java   |   6 +-
 .../javascript/JavaScriptLocalize.yaml        | 538 ++++++++++++++++++
 base-api/src/main/resources/localize/id.txt   |   1 +
 .../actionscript/ActionScriptFileType.java    |   5 +-
 .../javascript/jsx/language/JSXFileType.java  |   5 +-
 .../javascript/lang/EcmaScriptFileType.java   |   5 +-
 .../main/java/consulo/json/JsonFileType.java  |   5 +-
 .../typescript/TypeScriptFileType.java        |   6 +-
 9 files changed, 560 insertions(+), 12 deletions(-)
 create mode 100644 base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml
 create mode 100644 base-api/src/main/resources/localize/id.txt

diff --git a/base-api/pom.xml b/base-api/pom.xml
index 9ffd1f2d..b03cb3da 100644
--- a/base-api/pom.xml
+++ b/base-api/pom.xml
@@ -53,6 +53,7 @@
 						<phase>generate-sources</phase>
 						<goals>
 							<goal>generate-icon</goal>
+							<goal>generate-localize</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
index b1c454c5..500fc5a4 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
@@ -25,8 +25,10 @@
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.lang.StandardJavaScriptVersions;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.lang.LanguageVersion;
+import consulo.localize.LocalizeValue;
 import consulo.ui.image.Image;
 
 import javax.annotation.Nonnull;
@@ -55,9 +57,9 @@ public String getId()
 
 	@Override
 	@Nonnull
-	public String getDescription()
+	public LocalizeValue getDescription()
 	{
-		return JavaScriptBundle.message("javascript.filetype.description");
+		return JavaScriptLocalize.javascriptFiletypeDescription();
 	}
 
 	@Override
diff --git a/base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml b/base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml
new file mode 100644
index 00000000..9280f063
--- /dev/null
+++ b/base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml
@@ -0,0 +1,538 @@
+javascript.filetype.description:
+  text: JavaScript files
+typescript.filetype.description:
+  text: TypeScript files
+javascript.language.term.function:
+  text: function
+javascript.language.term.class:
+  text: class
+javascript.language.term.namespace:
+  text: namespace
+javascript.language.term.parameter:
+  text: parameter
+javascript.language.term.property:
+  text: property
+javascript.language.term.variable:
+  text: variable
+javascript.language.term.value:
+  text: value
+javascript.language.term.tag:
+  text: tag
+javascript.language.term.label:
+  text: label
+javascript.language.term.prototype:
+  text: prototype
+javascript.parser.message.expected.expression:
+  text: expression expected
+javascript.parser.message.expected.xml.element:
+  text: xml element expected
+javascript.parser.property.expected:
+  text: property expected
+javascript.parser.message.expected.lbrace:
+  text: '{ expected'
+javascript.parser.message.expected.rbrace:
+  text: '} expected'
+javascript.parser.message.expected.identifier.string.literal.or.numeric.literal:
+  text: identifier or string literal or numeric literal expected
+javascript.parser.message.expected.colon:
+  text: ': expected'
+javascript.parser.message.expected.semicolon:
+  text: ; expected
+javascript.parser.message.expected.rbracket:
+  text: '] expected'
+javascript.parser.message.expected.lparen:
+  text: ( expected
+javascript.parser.message.expected.rparen:
+  text: ) expected
+javascript.parser.message.expected.name:
+  text: name expected
+javascript.parser.message.expected.comma.or.rparen:
+  text: ', or ) expected'
+javascript.parser.message.expected.function.name:
+  text: function name expected
+javascript.parser.message.expected.formal.parameter.name:
+  text: formal parameter name expected
+javascript.parser.message.expected.statement:
+  text: statement expected
+javascript.parser.message.expected.parameter.name:
+  text: parameter name expected
+javascript.parser.message.expected.catch.or.default:
+  text: catch or default expected
+javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration:
+  text: left hand side expression or variable declaration expected before 'in'
+javascript.parser.message.expected.forloop.in.or.semicolon:
+  text: '''in'' or ; expected'
+javascript.parser.message.expected.forloop.in.of.or.semicolon:
+  text: '''in'', ''of'' or ; expected'
+javascript.parser.message.expected.while.keyword:
+  text: while expected
+javascript.parser.message.expected.comma:
+  text: ', expected'
+javascript.parser.message.expected.variable.name:
+  text: variable name expected
+javascript.parser.message.missing.rbrace:
+  text: missing }
+javascript.parser.message.unexpected.end.of.file:
+  text: unexpected end of file
+javascript.parser.message.unclosed.string.literal:
+  text: Unclosed string literal
+javascript.validation.message.duplicate.declaration:
+  text: Duplicate declaration
+javascript.validation.message.assignment.to.const:
+  text: Attempt to assign to const variable
+javascript.validation.message.arguments.out.of.function:
+  text: Using function arguments object outside function
+javascript.validation.message.must.be.lvalue:
+  text: Must be lvalue
+javascript.validation.message.const.variable.without.initializer.:
+  text: const variable without initializer. It won't be possible to assign meaningful value later.
+javascript.validation.message.continue.without.target:
+  text: Cannot determine target for 'continue'
+javascript.validation.message.break.without.target:
+  text: Cannot determine target for 'break'
+javascript.validation.message.return.outside.function.definition:
+  text: '''return'' outside function definition'
+javascript.validation.message.duplicate.label:
+  text: Duplicate label
+javascript.surround.with.do.while:
+  text: do / while
+javascript.surround.with.for:
+  text: for
+javascript.surround.with.if:
+  text: if
+javascript.surround.with.if.else:
+  text: if / else
+javascript.surround.with.parenthesis:
+  text: (expr)
+javascript.surround.with.try.catch:
+  text: try / catch
+javascript.surround.with.try.finally:
+  text: try / finally
+javascript.surround.with.try.catch.finally:
+  text: try / catch / finally
+javascript.surround.with.while:
+  text: while
+javascript.surround.with.with:
+  text: with
+javascript.surround.with.function:
+  text: function
+javascript.surround.with.function.expression:
+  text: function expression
+javascript.introduce.variable.title:
+  text: Introduce Variable
+javascript.introduce.variable.error.no.expression.selected:
+  text: |-
+    Cannot introduce variable.
+    Selection does not form an expression.
+javascript.introduce.variable.name.prompt:
+  text: '&Name:'
+javascript.introduce.variable.replace.all.occurrences:
+  text: Replace &all occurrences ({0} occurrences found)
+javascript.introduce.variable.invalid.name:
+  text: Please enter a valid name.
+javascript.introduce.variable.variable.already.exists:
+  text: Variable with name {0} already exists in the scope.
+javascript.introduce.variable.function.already.exists:
+  text: Function with name {0} already exists in the scope.
+javascript.introduce.field.title:
+  text: Introduce Field
+javascript.introduce.field.error.no.expression.selected:
+  text: |-
+    Cannot introduce field.
+    Selection does not form an expression.
+javascript.introduce.constant.title:
+  text: Introduce Constant
+javascript.introduce.constant.error.no.expression.selected:
+  text: |-
+    Cannot introduce constant.
+    Selection does not form an expression.
+javascript.introduce.constant.error.not.constant.expression.selected:
+  text: |-
+    Cannot introduce constant.
+    Selection is not constant expression.
+javascript.keyword:
+  text: Keyword
+javascript.string:
+  text: String
+javascript.number:
+  text: Number
+javascript.linecomment:
+  text: Line comment
+javascript.doccomment:
+  text: Doc comment
+javascript.blockcomment:
+  text: Block comment
+javascript.regexp:
+  text: Regular expression
+javascript.operation:
+  text: Operation
+javascript.parens:
+  text: Parenthesis
+javascript.brackets:
+  text: Brackets
+javascript.braces:
+  text: Braces
+javascript.semicolon:
+  text: Semicolon
+javascript.badcharacter:
+  text: Bad character
+javascript.docmarkup:
+  text: Documentation markup
+javascript.doctag:
+  text: Documentation tag
+javascript.valid.string.escape:
+  text: Valid string escape
+javascript.invalid.string.escape:
+  text: Invalid string escape
+javascript.comma:
+  text: Comma
+javascript.dot:
+  text: Dot
+building.index.message:
+  text: Building JavaScript indices
+loading.index.message:
+  text: Loading JavaScript indices
+javascript.unresolved.function.name.message:
+  text: 'Unresolved function or method {0}() #loc'
+javascript.unresolved.variable.name.message:
+  text: 'Unresolved variable {0} #loc'
+javascript.unresolved.type.name.message:
+  text: 'Unresolved type {0} #loc'
+javascript.unresolved.variable.or.type.name.message:
+  text: 'Unresolved variable or type {0} #loc'
+javascript.unresolved.variable.or.type.name.message2:
+  text: Unresolved variable or type {0}
+javascript.undeclared.variable.name.message:
+  text: 'Variable {0} implicitly declared #loc'
+javascript.create.function.intention.name:
+  text: Create Function {0}
+javascript.create.variable.intention.name:
+  text: Create Variable {0}
+javascript.create.constant.intention.name:
+  text: Create Constant {0}
+javascript.declare.variable.intention.name:
+  text: Insert Var Declaration for {0}
+javascript.create.namespace.intention.name:
+  text: Create Namespace {0}
+javascript.create.property.intention.name:
+  text: Create Field {0}
+javascript.create.constant.field.intention.name:
+  text: Create Constant Field {0}
+javascript.create.method.intention.name:
+  text: Create Method {0}
+javascript.create.get.property.intention.name:
+  text: Create Get Property {0}
+javascript.create.set.property.intention.name:
+  text: Create Set Property {0}
+javascript.create.function.intention.family:
+  text: Create JavaScript Function or Method
+javascript.create.variable.intention.family:
+  text: Create JavaScript Variable Or Property
+js.inspection.group.name:
+  text: JavaScript
+js.unresolved.variable.inspection.name:
+  text: Unresolved JavaScript variable
+js.undeclared.variable.inspection.name:
+  text: Implicitly declared JavaScript variable
+js.duplicated.declaration.inspection.name:
+  text: Duplicated JavaScript declaration
+js.unused.local.symbol.inspection.name:
+  text: Unused JavaScript local symbol
+js.unresolved.function.inspection.name:
+  text: Unresolved JavaScript function
+js.deprecated.symbols.inspection.name:
+  text: Deprecated JavaScript symbol
+javascript.parser.message.expected.typename:
+  text: '* or type name expected'
+javascript.parser.message.expected.name.or.lbrace:
+  text: Expected package name or {
+javascript.parser.message.expected.function.var.class.interface.namespace:
+  text: Expected function, variable, class, interface or namespace declaration
+interface.function.declaration.should.have.no.body:
+  text: Interface functions declaration should have no body
+javascript.parser.message.expected.namespace:
+  text: Namespace keyword expected
+javascript.parser.message.expected.string.literal:
+  text: String literal expected
+javascript.parser.message.expected.xml:
+  text: xml context keyword expected
+javascript.parser.message.expected.equal:
+  text: expected =
+javascript.parser.message.expected.lbrace.or.lbracket:
+  text: '{ or [ expected'
+javascript.parser.message.expected.eof:
+  text: End of file expected
+javascript.deprecated.symbol.used.name.message:
+  text: 'Deprecated symbol used, consult docs for better alternative #loc'
+js.classname.macro.description:
+  text: jsClassName()
+js.methodname.macro.description:
+  text: jsMethodName()
+js.unused.parameter:
+  text: Unused parameter
+js.unused.function.declaration:
+  text: Unused function declaration
+js.unused.local.variable:
+  text: Unused local variable declaration
+js.unused.symbol.remove:
+  text: Remove unused symbol
+javascript.parser.message.expected.identifier:
+  text: Expected identifier
+javascript.parser.message.expected.instanceof:
+  text: Expected instanceof
+javascript.parser.message.expected.value:
+  text: value expected
+javascript.parser.message.expected.identifer.or.value:
+  text: Identifier or value expected
+js.show.overriding.markers.inspection.name:
+  text: Shows function overriding markers in JavaScript
+js.untyped.declaration.inspection.name:
+  text: Declaration with no type
+js.untyped.variable.problem:
+  text: Variable {0} has no type
+js.untyped.function.problem:
+  text: Function {0} has no return type
+js.untyped.declaration.problem.addtype.fix:
+  text: Add Type to Declaration
+invalid.identifier.value:
+  text: invalid identifier value
+javascript.validation.message.this.referenced.from.static.context:
+  text: '''this'' referenced in static context'
+javascript.validation.message.super.referenced.without.class.instance.context:
+  text: '''super'' referenced without class instance context'
+javascript.validation.message.super.referenced.from.static.context:
+  text: '''super'' referenced in static context'
+javascript.validation.message.function.override.without.override.modifier:
+  text: Method overrides method in superclass {0} without override keyword
+javascript.language.term.attribute.value:
+  text: Attribute value
+javascript.validation.message.class.should.be.in.file:
+  text: Class ''{0}'' should be defined in file ''{1}''
+javascript.validation.message.function.should.be.in.file:
+  text: Function ''{0}'' should be defined in file ''{1}''
+javascript.validation.message.namespace.should.be.in.file:
+  text: Namespace ''{0}'' should be defined in file ''{1}''
+javascript.validation.message.variable.should.be.in.file:
+  text: Variable ''{0}'' should be defined in file ''{1}''
+javascript.validation.message.incorrect.package.name:
+  text: Package name ''{0}'' does not correspond to file path ''{1}''
+javascript.fix.package.name:
+  text: Set package name to ''{0}''
+javascript.fix.add.override.modifier:
+  text: Add override modifier
+js.code.style.tab.name:
+  text: JavaScript / ECMAScript / ActionScript
+to.indent.package.statement.children:
+  text: '&Indent package statement children'
+javascript.formatting.options.panel.title:
+  text: Formatting options
+preview.panel.title:
+  text: Preview
+javascript.validation.message.interface.members.cannot.have.access.modifiers:
+  text: Interface members cannot have access modifiers
+javascript.template.context.type:
+  text: Java Sc&ript
+flex.import.class:
+  text: Import Class {0}
+flex.import.function:
+  text: Import Function {0}
+interface.should.have.no.variable.declarations:
+  text: Interface should have no variable declarations
+javascript.validation.message.implements.for.interface.not.allowed:
+  text: Implements list is not allowed for interface
+javascript.validation.message.interface.name.expected.here:
+  text: Interface name expected here
+javascript.validation.message.class.name.expected.here:
+  text: Class name expected here
+javascript.validation.message.circular.dependency:
+  text: Circular dependency
+javascript.fix.remove.circular.dependency:
+  text: Remove circular dependency
+javascript.validation.message.more.than.one.externally.visible.symbol:
+  text: More than one externally visible symbol defined in file
+javascript.validation.message.interface.method.not.implemented:
+  text: Method {0} from interface {1} is not implemented
+javascript.fix.remove.externally.visible.symbol:
+  text: Remove externally visible symbol
+javascript.fix.implement.methods:
+  text: Implement Methods
+javascript.parameter:
+  text: Parameter
+javascript.local.variable:
+  text: Local variable
+javascript.global.variable:
+  text: Global variable
+javascript.global.function:
+  text: Global function
+javascript.static.member.function:
+  text: Static member function
+javascript.static.member.variable:
+  text: Static member variable
+javascript.instance.member.variable:
+  text: Instance member variable
+javascript.instance.member.function:
+  text: Instance member function
+javascript.create.class.intention.name:
+  text: Create Class {0}
+javascript.create.interface.intention.name:
+  text: Create Interface {0}
+create.class.dialog.title:
+  text: Create Class
+create.interface.dialog.title:
+  text: Create Interface
+choose.class.title:
+  text: Choose Class
+javascript.fix.remove.override.modifier:
+  text: Remove override modifier
+javascript.validation.message.function.override.for.object.method:
+  text: Method inherited from Object does not need override
+javascript.validation.message.function.override.without.parent.method:
+  text: Method does not override method from super class
+javascript.parser.message.expected.lt:
+  text: Expected >
+generate.constructor.fields.chooser.title:
+  text: Choose Fields to Initialize by Constructor
+generate.getter.setter.chooser.title:
+  text: Select Fields to Generate Getters and Setters
+generate.to.string.chooser.title:
+  text: Select Fields to Use in toString function
+generate.getter.fields.chooser.title:
+  text: Select Fields to Generate Getters
+generate.setter.fields.chooser.title:
+  text: Select Fields to Generate Setters
+methods.to.implement.chooser.title:
+  text: Select Methods to Implement
+methods.to.override.chooser.title:
+  text: Select Methods to Override
+use.semicolon.to.terminate.statement:
+  text: Use &semicolon to terminate statements
+javascript.validation.unused.import:
+  text: Unused import
+javascript.fix.optimize.imports:
+  text: Optimize imports
+javascript.parser.message.expected.doc.tag.value:
+  text: Expected doc tag value
+javascript.validation.message.incorrect.tag.value:
+  text: Incorrect Tag Value
+javascript.validation.message.incorrect.parameter.name:
+  text: Incorrect parameter name
+javascript.parser.message.expected.doc.tag.name:
+  text: Expected doc tag name
+javascript.invalid.number.of.parameters:
+  text: Invalid number of parameters, expected {0}
+javascript.argument.type.mismatch:
+  text: Argument type {1} is not assignable to parameter type {0}
+javascript.initializer.type.mismatch:
+  text: Initializer type {1} is not assignable to variable type {0}
+javascript.binary.operand.type.mismatch:
+  text: Binary operation argument type {1} is not assignable to type {0}
+javascript.incorrect.variable.type.mismatch:
+  text: Variable type {1} is not assignable to type {0}
+javascript.term.does.not.evaluate.to.function:
+  text: Method expression is not of Function type
+javascript.term.does.not.evaluate.to.function2:
+  text: Property can not be invoked as function
+javascript.term.does.not.evaluate.to.function2.fix:
+  text: Remove argument list
+javascript.assigned.expression.type.mismatch:
+  text: Assigned expression type {1} is not assignable to type {0}
+javascript.returned.expression.type.mismatch:
+  text: Returned expression type {1} is not assignable to type {0}
+javascript.insert.cast.fix:
+  text: Insert cast
+javascript.introduce.constant.error.not.available.in.javascript.code:
+  text: Introduce Constant is not available in JavaScript code
+javascript.introduce.field.error.not.available.in.javascript.code:
+  text: Introduce Field is not available in JavaScript code
+javascript.extract.method.title:
+  text: Extract Function
+javascript.validation.message.function.override.incompatible.access.modifier:
+  text: Incompatible override, should have ''{0}'' access modifier
+javascript.validation.message.function.override.incompatible.signature:
+  text: Incompatible override, should have signature ''{0}''
+javascript.validation.message.function.override.incompatible.signature2:
+  text: Incompatible override, should have return type ''{0}''
+javascript.validation.message.interface.method.invalid.access.modifier:
+  text: Incompatible implementation, should have 'public' access modifier
+javascript.validation.message.interface.method.invalid.signature:
+  text: Incompatible implementation, should have signature ''{0}''
+javascript.validation.message.interface.method.invalid.signature2:
+  text: Incompatible implementation, should have return type ''{0}''
+javascript.validation.message.duplicated.catch.block:
+  text: 'Duplicated catch block #loc'
+javascript.validation.message.duplicated.catch.block.fix:
+  text: Remove duplicated catch block
+javascript.validation.message.return.value.of.type.is.required:
+  text: Return value of type {0} is required
+javascript.validation.message.constructor.in.mxml.is.not.allowed:
+  text: Constructor is not allowed for MXML class
+javascript.fix.remove.constructor:
+  text: Remove constructor
+javascript.validation.message.package.shouldbe.first.statement:
+  text: Package should be first statement in file
+javascript.metadata:
+  text: Metadata
+javascript.validation.message.file.should.be.under.source.root:
+  text: Object is located in file out of source root, certain functionality will not be available
+javascript.validation.message.unneeded.comma:
+  text: Unneeded comma
+javascript.validation.message.remove.unneeded.comma.fix:
+  text: Remove unneeded comma
+javascript.create.event.handler.intention.name:
+  text: Create Event Handler {0}
+javascript.validation.message.missed.super.constructor.call:
+  text: Missed superclass's constructor invokation
+javascript.fix.create.constructor.invoke.super:
+  text: Create constructor matching super
+javascript.fix.create.invoke.super:
+  text: Insert super class constructor invokation
+javascript.interface.can.not.be.instantiated.message:
+  text: Interface can not be instantiated
+javascript.validation.message.set.method.should.be.void.or.without.type:
+  text: Return type of a setter definition must be unspecified or void
+javascript.validation.message.set.method.should.have.one.parameter:
+  text: A setter definition must have exactly one parameter
+javascript.validation.message.get.method.should.have.no.parameter:
+  text: A getter definition must have no parameters
+javascript.validation.message.get.method.should.be.valid.type:
+  text: Return type of a getter definition should not be {0}
+javascript.validation.message.access.modifier.allowed.only.for.class.members:
+  text: Access modifier allowed for class members only
+javascript.validation.message.namespace.allowed.only.for.class.members:
+  text: Namespace allowed for class members only
+javascript.validation.message.access.modifier.allowed.only.for.package.members:
+  text: Only public / internal modifiers allowed for package members
+javascript.validation.message.use.namespace.reference.or.access.modifier:
+  text: Use namespace OR access modifier
+javascript.fix.remove.access.modifier:
+  text: Remove access modifier
+javascript.fix.remove.namespace.reference:
+  text: Remove namespace reference
+javascript.incorrect.array.type.in.for-in:
+  text: Array key type should be String
+javascript.validation.message.unexpected.type.for.rest.parameter:
+  text: Rest parameter should have no type
+javascript.fix.remove.type.reference:
+  text: Remove type reference
+javascript.validation.message.parameter.is.not.allowed.after.rest.parameter:
+  text: No parameter is allowed after rest parameter
+javascript.fix.remove.parameter:
+  text: Remove parameter
+javascript.fix.remove.initializer:
+  text: Remove initializer
+javascript.validation.message.parameter.should.be.initialized:
+  text: Parameter should be initialized
+javascript.validation.message.rest.parameter.should.not.be.initialized:
+  text: Rest parameter should not be initialized
+javascript.validation.message.nested.classes.are.not.allowed:
+  text: Nested classes are not allowed
+generate.getter.fields.bindable.properties:
+  text: '&Bindable properties'
+javascript.language.term.package:
+  text: package
+javascript.validation.message.arguments.with.rest.parameter:
+  text: '''arguments'' object is not available when using rest parameter'
+action.JavaScript.File.text:
+  text: JavaScript File
+this.feature.is.not.supported.by.current.language:
+  text: '''''{0}'''' is not supported by current language version'
diff --git a/base-api/src/main/resources/localize/id.txt b/base-api/src/main/resources/localize/id.txt
new file mode 100644
index 00000000..2c4c454f
--- /dev/null
+++ b/base-api/src/main/resources/localize/id.txt
@@ -0,0 +1 @@
+en
\ No newline at end of file
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
index e5123298..cb493a19 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
@@ -25,6 +25,7 @@
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
+import consulo.localize.LocalizeValue;
 import consulo.ui.image.Image;
 
 import javax.annotation.Nonnull;
@@ -52,9 +53,9 @@ public String getId()
 
 	@Nonnull
 	@Override
-	public String getDescription()
+	public LocalizeValue getDescription()
 	{
-		return "ActionScript files";
+		return LocalizeValue.localizeTODO("ActionScript files");
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
index 39ed4a16..94e0c0d5 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
@@ -8,6 +8,7 @@
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.lang.LanguageVersion;
+import consulo.localize.LocalizeValue;
 import consulo.ui.image.Image;
 
 import javax.annotation.Nonnull;
@@ -35,9 +36,9 @@ public String getId()
 
 	@Nonnull
 	@Override
-	public String getDescription()
+	public LocalizeValue getDescription()
 	{
-		return "JSX files";
+		return LocalizeValue.localizeTODO("JSX files");
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
index cf8418ad..c42cc5d0 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
@@ -24,6 +24,7 @@
 import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.lang.LanguageVersion;
+import consulo.localize.LocalizeValue;
 import consulo.ui.image.Image;
 
 import javax.annotation.Nonnull;
@@ -51,9 +52,9 @@ public String getId()
 
 	@Nonnull
 	@Override
-	public String getDescription()
+	public LocalizeValue getDescription()
 	{
-		return "ECMAScript files";
+		return LocalizeValue.localizeTODO("ECMAScript files");
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
index e49db3d4..0bbd85a9 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
@@ -24,6 +24,7 @@
 import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.json.lang.JsonJavaScriptVersion;
+import consulo.localize.LocalizeValue;
 import consulo.ui.image.Image;
 
 import javax.annotation.Nonnull;
@@ -51,9 +52,9 @@ public String getId()
 
 	@Nonnull
 	@Override
-	public String getDescription()
+	public LocalizeValue getDescription()
 	{
-		return "Json files";
+		return LocalizeValue.localizeTODO("Json files");
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index cbff3a99..457c329b 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -23,6 +23,8 @@
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.localize.LocalizeValue;
 import consulo.ui.image.Image;
 
 /**
@@ -47,9 +49,9 @@ public String getId()
 
 	@Nonnull
 	@Override
-	public String getDescription()
+	public LocalizeValue getDescription()
 	{
-		return JavaScriptBundle.message("typescript.filetype.description");
+		return JavaScriptLocalize.typescriptFiletypeDescription();
 	}
 
 	@Nonnull

From 4e7cbb03eb0fbf1bdb310a221a787ce9c59066bf Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 11 Dec 2021 20:29:52 +0300
Subject: [PATCH 149/340] fix #35

---
 .../javascript/psi/JSClassExpression.java     | 16 +++++++
 .../lang/javascript/psi/JSElementVisitor.java |  5 +++
 .../javascript/JavaScriptLocalize.yaml        | 10 ++---
 .../lang/javascript/JSElementTypes.java       |  1 +
 .../psi/impl/JSClassExpressionImpl.java       | 45 +++++++++++++++++++
 .../lang/parsing/ExpressionParsing.java       |  4 +-
 .../javascript/lang/parsing/Parsing.java      |  6 +--
 .../lang/psi/impl/JavaScriptClassType.java    | 17 ++++---
 .../parsing/EcmaScriptExpressionParsing.java  | 17 ++++++-
 .../parsing/EcmaScriptStatementParsing.java   | 29 +++++++-----
 10 files changed, 120 insertions(+), 30 deletions(-)
 create mode 100644 base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
 create mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
new file mode 100644
index 00000000..edde7c95
--- /dev/null
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
@@ -0,0 +1,16 @@
+package com.intellij.lang.javascript.psi;
+
+import consulo.annotation.access.RequiredReadAction;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 11/12/2021
+ */
+public interface JSClassExpression extends JSExpression
+{
+	@Nonnull
+	@RequiredReadAction
+	JSClass getClassElement();
+}
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
index a991cf2f..e06c5a30 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
@@ -289,6 +289,11 @@ public void visitJSClass(final JSClass aClass)
 		visitJSElement(aClass);
 	}
 
+	public void visitJSClassExpression(final JSClassExpression expression)
+	{
+		visitJSExpression(expression);
+	}
+
 	public void visitJSReferenceList(final JSReferenceList referenceList)
 	{
 		visitJSElement(referenceList);
diff --git a/base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml b/base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml
index 9280f063..5fb96c45 100644
--- a/base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml
+++ b/base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml
@@ -29,9 +29,9 @@ javascript.parser.message.expected.xml.element:
 javascript.parser.property.expected:
   text: property expected
 javascript.parser.message.expected.lbrace:
-  text: '{ expected'
+  text: "'{' expected"
 javascript.parser.message.expected.rbrace:
-  text: '} expected'
+  text: "'}' expected"
 javascript.parser.message.expected.identifier.string.literal.or.numeric.literal:
   text: identifier or string literal or numeric literal expected
 javascript.parser.message.expected.colon:
@@ -245,7 +245,7 @@ js.deprecated.symbols.inspection.name:
 javascript.parser.message.expected.typename:
   text: '* or type name expected'
 javascript.parser.message.expected.name.or.lbrace:
-  text: Expected package name or {
+  text: "Expected package name or '{'"
 javascript.parser.message.expected.function.var.class.interface.namespace:
   text: Expected function, variable, class, interface or namespace declaration
 interface.function.declaration.should.have.no.body:
@@ -259,7 +259,7 @@ javascript.parser.message.expected.xml:
 javascript.parser.message.expected.equal:
   text: expected =
 javascript.parser.message.expected.lbrace.or.lbracket:
-  text: '{ or [ expected'
+  text: "'{' or '[' expected"
 javascript.parser.message.expected.eof:
   text: End of file expected
 javascript.deprecated.symbol.used.name.message:
@@ -508,7 +508,7 @@ javascript.fix.remove.access.modifier:
   text: Remove access modifier
 javascript.fix.remove.namespace.reference:
   text: Remove namespace reference
-javascript.incorrect.array.type.in.for-in:
+javascript.incorrect.array.type.in.for.in:
   text: Array key type should be String
 javascript.validation.message.unexpected.type.for.rest.parameter:
   text: Rest parameter should have no type
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index d5848618..7b845f68 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -159,6 +159,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 			JSAssignmentExpressionImpl.class);
 	IElementType CONDITIONAL_EXPRESSION = new ElementTypeAsPsiFactory("CONDITIONAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
 			JSConditionalExpressionImpl.class);
+	IElementType CLASS_EXPRESSION = new ElementTypeAsPsiFactory("CLASS_EXPRESSION", JavaScriptLanguage.INSTANCE, JSClassExpressionImpl.class);
 	IElementType BINARY_EXPRESSION = new ElementTypeAsPsiFactory("BINARY_EXPRESSION", JavaScriptLanguage.INSTANCE, JSBinaryExpressionImpl.class);
 	IElementType PREFIX_EXPRESSION = new ElementTypeAsPsiFactory("PREFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPrefixExpressionImpl.class);
 	IElementType POSTFIX_EXPRESSION = new ElementTypeAsPsiFactory("POSTFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPostfixExpressionImpl.class);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
new file mode 100644
index 00000000..e36d88e1
--- /dev/null
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
@@ -0,0 +1,45 @@
+package com.intellij.lang.javascript.psi.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.JSClass;
+import com.intellij.lang.javascript.psi.JSClassExpression;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.impl.JavaScriptClassType;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 11/12/2021
+ */
+public class JSClassExpressionImpl extends JSExpressionImpl implements JSClassExpression
+{
+	public JSClassExpressionImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@Override
+	protected void accept(@Nonnull JSElementVisitor visitor)
+	{
+		visitor.visitJSExpression(this);
+	}
+
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public JSClass getClassElement()
+	{
+		return findNotNullChildByClass(JSClass.class);
+	}
+
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public JavaScriptType getType()
+	{
+		return new JavaScriptClassType(getClassElement());
+	}
+}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 150fdc12..4eb2886d 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -35,7 +35,7 @@
  * Date: Jan 28, 2005
  * Time: 1:18:22 PM
  */
-public class ExpressionParsing extends Parsing
+public class ExpressionParsing<C extends JavaScriptParsingContext> extends Parsing<C>
 {
 	private static final Logger LOG = Logger.getInstance(ExpressionParsing.class);
 
@@ -47,7 +47,7 @@ public class ExpressionParsing extends Parsing
 
 	private final JSXParser myJSXParser = new JSXParser();
 
-	public ExpressionParsing(JavaScriptParsingContext context)
+	public ExpressionParsing(C context)
 	{
 		super(context);
 	}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index 0189e5d6..430e7a9a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -31,11 +31,11 @@
  * Date: Jan 28, 2005
  * Time: 7:03:42 PM
  */
-public class Parsing
+public class Parsing<C extends JavaScriptParsingContext>
 {
-	private JavaScriptParsingContext myContext;
+	private C myContext;
 
-	public Parsing(JavaScriptParsingContext context)
+	public Parsing(C context)
 	{
 		myContext = context;
 	}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
index f38b077b..e3fe45c4 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
@@ -16,13 +16,13 @@
 
 package consulo.javascript.lang.psi.impl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.psi.PsiElement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
@@ -42,7 +42,12 @@ public JavaScriptClassType(JSClass aClass)
 	@Override
 	public String getPresentableText()
 	{
-		return myClass.getName();
+		String name = myClass.getName();
+		if(name == null)
+		{
+			return "<anonymous class>";
+		}
+		return name;
 	}
 
 	@Nullable
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
index ad254b7d..a118e6ab 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -26,13 +26,18 @@
  * @author VISTALL
  * @since 03.03.2016
  */
-public class EcmaScriptExpressionParsing extends ExpressionParsing
+public class EcmaScriptExpressionParsing extends ExpressionParsing<EcmaScriptParsingContext>
 {
-	public EcmaScriptExpressionParsing(JavaScriptParsingContext context)
+	public EcmaScriptExpressionParsing(EcmaScriptParsingContext context)
 	{
 		super(context);
 	}
 
+	@Override
+	public EcmaScriptStatementParsing getStatementParsing()
+	{
+		return (EcmaScriptStatementParsing) super.getStatementParsing();
+	}
 
 	@Override
 	protected boolean parsePrimaryExpression(PsiBuilder builder)
@@ -53,6 +58,14 @@ protected boolean parsePrimaryExpression(PsiBuilder builder)
 
 			return true;
 		}
+		else if(builder.getTokenType() == JSTokenTypes.CLASS_KEYWORD)
+		{
+			PsiBuilder.Marker mark = builder.mark();
+			getStatementParsing().parseClassWithMarker(builder, builder.mark(), true);
+			mark.done(JSElementTypes.CLASS_EXPRESSION);
+			return true;
+		}
+
 		if(canParseLambdaExpression(builder))
 		{
 			return parseLambdaExpression(builder);
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
index 94ab05bf..2ada3598 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -24,6 +24,7 @@
 import com.intellij.psi.tree.TokenSet;
 import consulo.javascript.ecmascript6.psi.impl.EcmaScript6ElementTypes;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.logging.Logger;
 
 import javax.annotation.Nonnull;
@@ -73,7 +74,7 @@ else if(tokenType == JSTokenTypes.EXPORT_KEYWORD)
 			}
 			else if(nextType == JSTokenTypes.CLASS_KEYWORD)
 			{
-				parseClassWithMarker(builder, mark);
+				parseClassWithMarker(builder, mark, false);
 			}
 			else if(nextType == JSTokenTypes.VAR_KEYWORD ||
 					nextType == JSTokenTypes.CONST_KEYWORD ||
@@ -192,7 +193,7 @@ private void parseImportStatement(final PsiBuilder builder)
 					}
 					else
 					{
-						builder.error("Expected identifier");
+						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
 					}
 				}
 
@@ -332,28 +333,32 @@ protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses
 		{
 			if(tokenType == JSTokenTypes.CLASS_KEYWORD)
 			{
-				parseClass(builder);
+				parseClass(builder, false);
 				return true;
 			}
 		}
 		return false;
 	}
 
-	private void parseClass(final PsiBuilder builder)
+	private void parseClass(final PsiBuilder builder, boolean anonymous)
 	{
-		parseClassWithMarker(builder, builder.mark());
+		parseClassWithMarker(builder, builder.mark(), anonymous);
 	}
 
-	private void parseClassWithMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz)
+	public void parseClassWithMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz, boolean anonymous)
 	{
 		builder.advanceLexer();
-		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
-		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.identifier"));
-		}
-		else
+
+		if(!anonymous)
 		{
-			builder.advanceLexer();
+			if(builder.getTokenType() != JSTokenTypes.IDENTIFIER)
+			{
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+			}
+			else
+			{
+				builder.advanceLexer();
+			}
 		}
 
 		if(builder.getTokenType() == JSTokenTypes.EXTENDS_KEYWORD)

From 3b9dcbdb58e6bce0599e7dd27ff57afd845cda37 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 12 Dec 2021 11:24:48 +0300
Subject: [PATCH 150/340] fix classname require check for expression

cleanup
---
 .../javascript/lang/parsing/Parsing.java      | 16 +++++++++++++++
 .../parsing/EcmaScriptExpressionParsing.java  |  3 ++-
 .../parsing/EcmaScriptStatementParsing.java   | 20 +++++++++----------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index 430e7a9a..848bcc4e 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -22,6 +22,7 @@
 import com.intellij.psi.tree.TokenSet;
 import consulo.javascript.lang.JavaScriptContextKeywordElementType;
 import consulo.javascript.lang.parsing.impl.JavaScriptStrictParserBuilder;
+import consulo.localize.LocalizeValue;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -124,6 +125,7 @@ public static void buildTokenElement(IElementType type, PsiBuilder builder)
 		marker.done(type);
 	}
 
+	@Deprecated
 	public static boolean checkMatches(final PsiBuilder builder, final IElementType token, final String message)
 	{
 		if(builder.getTokenType() == token)
@@ -138,6 +140,20 @@ public static boolean checkMatches(final PsiBuilder builder, final IElementType
 		}
 	}
 
+	public static boolean checkMatches(final PsiBuilder builder, final IElementType token, final LocalizeValue message)
+	{
+		if(builder.getTokenType() == token)
+		{
+			builder.advanceLexer();
+			return true;
+		}
+		else
+		{
+			builder.error(message);
+			return false;
+		}
+	}
+
 	public boolean isIdentifierToken(PsiBuilder builder, IElementType tokenType)
 	{
 		return myContext.isIdentifierToken(builder, tokenType);
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
index a118e6ab..654d81da 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.psi.tree.IElementType;
+import consulo.javascript.localize.JavaScriptLocalize;
 
 /**
  * @author VISTALL
@@ -49,7 +50,7 @@ protected boolean parsePrimaryExpression(PsiBuilder builder)
 
 			if(!parseExpressionOptional(builder))
 			{
-				mark.error("Expression expected");
+				mark.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			else
 			{
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
index 2ada3598..c9b0b4b4 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -340,25 +340,25 @@ protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses
 		return false;
 	}
 
-	private void parseClass(final PsiBuilder builder, boolean anonymous)
+	private void parseClass(final PsiBuilder builder, boolean nameRequired)
 	{
-		parseClassWithMarker(builder, builder.mark(), anonymous);
+		parseClassWithMarker(builder, builder.mark(), nameRequired);
 	}
 
-	public void parseClassWithMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz, boolean anonymous)
+	public void parseClassWithMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz, boolean nameRequired)
 	{
 		builder.advanceLexer();
 
-		if(!anonymous)
+		if(builder.getTokenType() != JSTokenTypes.IDENTIFIER)
 		{
-			if(builder.getTokenType() != JSTokenTypes.IDENTIFIER)
+			if(nameRequired)
 			{
 				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
 			}
-			else
-			{
-				builder.advanceLexer();
-			}
+		}
+		else
+		{
+			builder.advanceLexer();
 		}
 
 		if(builder.getTokenType() == JSTokenTypes.EXTENDS_KEYWORD)
@@ -383,7 +383,7 @@ protected void parseClassBody(final PsiBuilder builder, BlockType type)
 		{
 			if(builder.eof())
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.missing.rbrace"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageMissingRbrace());
 				return;
 			}
 

From 4e8828f3b69806f8a07507adc01d2c6f78e0d951 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 12 Dec 2021 15:03:21 +0300
Subject: [PATCH 151/340] revert usage of nameRequired parameter

---
 .../javascript/lang/parsing/EcmaScriptExpressionParsing.java    | 2 +-
 .../javascript/lang/parsing/EcmaScriptStatementParsing.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
index 654d81da..2186f931 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -62,7 +62,7 @@ protected boolean parsePrimaryExpression(PsiBuilder builder)
 		else if(builder.getTokenType() == JSTokenTypes.CLASS_KEYWORD)
 		{
 			PsiBuilder.Marker mark = builder.mark();
-			getStatementParsing().parseClassWithMarker(builder, builder.mark(), true);
+			getStatementParsing().parseClassWithMarker(builder, builder.mark(), false);
 			mark.done(JSElementTypes.CLASS_EXPRESSION);
 			return true;
 		}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
index c9b0b4b4..24cdc504 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -333,7 +333,7 @@ protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses
 		{
 			if(tokenType == JSTokenTypes.CLASS_KEYWORD)
 			{
-				parseClass(builder, false);
+				parseClass(builder, true);
 				return true;
 			}
 		}

From 804807b0d556c23fe90a2aa95646c787fa749fbd Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sat, 18 Dec 2021 14:27:28 +0300
Subject: [PATCH 152/340] fix #42

---
 .../main/java/consulo/javascript/lang/lexer/ecmascript6.flex  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index b2b6792b..3e874320 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -48,7 +48,9 @@ DOC_COMMENT="/*""*"+("/"|([^"/""*"]{COMMENT_TAIL}))?
 COMMENT_TAIL=([^"*"]*("*"+[^"*""/"])?)*("*"+"/")?
 END_OF_LINE_COMMENT="/""/"[^\r\n]*
 
-INTEGER_LITERAL={DECIMAL_INTEGER_LITERAL}|{HEX_INTEGER_LITERAL}
+INTEGER_LITERAL={DECIMAL_INTEGER_LITERAL}|{HEX_INTEGER_LITERAL}|{BIN_INTEGER_LITERAL}|{OCTAL_INTEGER_LITERAL}
+BIN_INTEGER_LITERAL = 0 [Bb] {DIGIT}*
+OCTAL_INTEGER_LITERAL = 0 [oO] {DIGIT}*
 DECIMAL_INTEGER_LITERAL=(0|([1-9]({DIGIT})*))
 HEX_INTEGER_LITERAL=0[Xx]({HEX_DIGIT})*
 

From ba2c168ef4fe4a3a24c2653f1329f570c6d57859 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 19 Dec 2021 15:37:48 +0300
Subject: [PATCH 153/340] fix #43

---
 .../lang/javascript/psi/JSFunction.java       |   2 +
 .../javascript/psi/JSFunctionProperty.java    |   9 ++
 .../javascript/lang/JavaScriptFeature.java    |   1 +
 .../lang/javascript/JSElementTypes.java       | 103 +++++++++---------
 .../psi/impl/JSFunctionPropertyImpl.java      |  96 ++++++++++++++++
 .../lang/EcmaScript6JavaScriptVersion.java    |   1 +
 .../parsing/EcmaScriptExpressionParsing.java  |  12 +-
 .../JavaScriptHighlightVisitor.java           |  11 ++
 8 files changed, 183 insertions(+), 52 deletions(-)
 create mode 100644 base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java
 create mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index 10b5a9dd..d618060e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -73,6 +73,8 @@ enum FunctionKind
 		SIMPLE
 	}
 
+	@Nonnull
+	@RequiredReadAction
 	FunctionKind getKind();
 
 	boolean isDeprecated();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java
new file mode 100644
index 00000000..b5dee996
--- /dev/null
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java
@@ -0,0 +1,9 @@
+package com.intellij.lang.javascript.psi;
+
+/**
+ * @author VISTALL
+ * @since 19/12/2021
+ */
+public interface JSFunctionProperty extends JSProperty, JSFunction
+{
+}
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
index 77c36bd6..42ef2c19 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
+++ b/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
@@ -31,6 +31,7 @@ public enum JavaScriptFeature
 	REST_PARAMETER("Rest parameters"),
 	SPREAD_OPERATOR("Spread operator"),
 	OPTIONAL_CHAINING_OPERATOR("Optional chaining operator"),
+	FUNCTION_PROPERTY("Function property"),
 	EXPONENTIATION_OPERATOR("Exponentiation operator");
 
 	private String myName;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 7b845f68..80f5f9a1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -62,7 +62,7 @@ public Language getLanguage()
 			return JavaScriptLanguage.INSTANCE;
 		}
 	};
-	IElementType EMBEDDED_EXPRESSION = new ElementTypeAsPsiFactory("EMBEDDED_EXPRESSION", JavaScriptLanguage.INSTANCE, JSEmbeddedContentImpl.class);
+	IElementType EMBEDDED_EXPRESSION = new ElementTypeAsPsiFactory("EMBEDDED_EXPRESSION", JavaScriptLanguage.INSTANCE, JSEmbeddedContentImpl::new);
 	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = new JSFunctionElementType("FUNCTION_DECLARATION")
 	{
 		@Override
@@ -83,7 +83,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	JSStubElementType<JSParameterStub, JSParameter> FORMAL_PARAMETER = new JSParameterElementType();
 
 	JSStubElementType<JSVariableStub, JSVariable> VARIABLE = new JSVariableElementType();
-	IElementType ARGUMENT_LIST = new ElementTypeAsPsiFactory("ARGUMENT_LIST", JavaScriptLanguage.INSTANCE, JSArgumentListImpl.class);
+	IElementType ARGUMENT_LIST = new ElementTypeAsPsiFactory("ARGUMENT_LIST", JavaScriptLanguage.INSTANCE, JSArgumentListImpl::new);
 
 	JSStubElementType<JSAttributeStub, JSAttribute> ATTRIBUTE = new JSAttributeElementType();
 	JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> ATTRIBUTE_NAME_VALUE_PAIR = new JSAttributeNameValuePairType();
@@ -99,36 +99,36 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective> USE_NAMESPACE_DIRECTIVE = new JSUseNamespaceDirectiveType();
 	JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> INCLUDE_DIRECTIVE = new JSIncludeDirectiveElementType();
 	JSStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration> NAMESPACE_DECLARATION = new JSNamespaceDeclarationElementType();
-	IElementType SUPER_EXPRESSION = new ElementTypeAsPsiFactory("SUPER_EXPRESSION", JavaScriptLanguage.INSTANCE, JSSuperExpressionImpl.class);
-	IElementType GENERIC_SIGNATURE = new ElementTypeAsPsiFactory("GENERIC_SIGNATURE", JavaScriptLanguage.INSTANCE, JSGenericSignatureImpl.class);
+	IElementType SUPER_EXPRESSION = new ElementTypeAsPsiFactory("SUPER_EXPRESSION", JavaScriptLanguage.INSTANCE, JSSuperExpressionImpl::new);
+	IElementType GENERIC_SIGNATURE = new ElementTypeAsPsiFactory("GENERIC_SIGNATURE", JavaScriptLanguage.INSTANCE, JSGenericSignatureImpl::new);
 
 	// Statements
-	IElementType BLOCK_STATEMENT = new ElementTypeAsPsiFactory("BLOCK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBlockStatementImpl.class);
-	IElementType LABELED_STATEMENT = new ElementTypeAsPsiFactory("LABELED_STATEMENT", JavaScriptLanguage.INSTANCE, JSLabeledStatementImpl.class);
+	IElementType BLOCK_STATEMENT = new ElementTypeAsPsiFactory("BLOCK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBlockStatementImpl::new);
+	IElementType LABELED_STATEMENT = new ElementTypeAsPsiFactory("LABELED_STATEMENT", JavaScriptLanguage.INSTANCE, JSLabeledStatementImpl::new);
 	IElementType EXPRESSION_STATEMENT = new ElementTypeAsPsiFactory("EXPRESSION_STATEMENT", JavaScriptLanguage.INSTANCE,
-			JSExpressionStatementImpl.class);
-	IElementType YIELD_STATEMENT = new ElementTypeAsPsiFactory("YIELD_STATEMENT", JavaScriptLanguage.INSTANCE, JSYieldStatementImpl.class);
-	IElementType LET_STATEMENT = new ElementTypeAsPsiFactory("LET_STATEMENT", JavaScriptLanguage.INSTANCE, JSLetStatementImpl.class);
+			JSExpressionStatementImpl::new);
+	IElementType YIELD_STATEMENT = new ElementTypeAsPsiFactory("YIELD_STATEMENT", JavaScriptLanguage.INSTANCE, JSYieldStatementImpl::new);
+	IElementType LET_STATEMENT = new ElementTypeAsPsiFactory("LET_STATEMENT", JavaScriptLanguage.INSTANCE, JSLetStatementImpl::new);
 	JSStubElementType<JSVarStatementStub, JSVarStatement> VAR_STATEMENT = new JSVarStatementElementType();
-	IElementType EMPTY_STATEMENT = new ElementTypeAsPsiFactory("EMPTY_STATEMENT", JavaScriptLanguage.INSTANCE, JSEmptyStatementImpl.class);
-	IElementType IF_STATEMENT = new ElementTypeAsPsiFactory("IF_STATEMENT", JavaScriptLanguage.INSTANCE, JSIfStatementImpl.class);
-	IElementType CONTINUE_STATEMENT = new ElementTypeAsPsiFactory("CONTINUE_STATEMENT", JavaScriptLanguage.INSTANCE, JSContinueStatementImpl.class);
-	IElementType BREAK_STATEMENT = new ElementTypeAsPsiFactory("BREAK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBreakStatementImpl.class);
-	IElementType DESTRUCTURING_ELEMENT = new ElementTypeAsPsiFactory("DESTRUCTURING_ELEMENT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringElementImpl.class);
-	IElementType DESTRUCTURING_PARAMETER = new ElementTypeAsPsiFactory("DESTRUCTURING_PARAMETER", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringParameterImpl.class);
-	IElementType DESTRUCTURING_OBJECT = new ElementTypeAsPsiFactory("DESTRUCTURING_OBJECT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringObjectImpl.class);
-	IElementType DESTRUCTURING_SHORTHANDED_PROPERTY = new ElementTypeAsPsiFactory("DESTRUCTURING_SHORTHANDED_PROPERTY", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringShorthandedPropertyImpl.class);
-	IElementType WITH_STATEMENT = new ElementTypeAsPsiFactory("WITH_STATEMENT", JavaScriptLanguage.INSTANCE, JSWithStatementImpl.class);
-	IElementType RETURN_STATEMENT = new ElementTypeAsPsiFactory("RETURN_STATEMENT", JavaScriptLanguage.INSTANCE, JSReturnStatementImpl.class);
-	IElementType THROW_STATEMENT = new ElementTypeAsPsiFactory("THROW_STATEMENT", JavaScriptLanguage.INSTANCE, JSThrowStatementImpl.class);
-	IElementType TRY_STATEMENT = new ElementTypeAsPsiFactory("TRY_STATEMENT", JavaScriptLanguage.INSTANCE, JSTryStatementImpl.class);
-	IElementType CATCH_BLOCK = new ElementTypeAsPsiFactory("CATCH_BLOCK", JavaScriptLanguage.INSTANCE, JSCatchBlockImpl.class);
-	IElementType CASE_CLAUSE = new ElementTypeAsPsiFactory("CASE_CLAUSE", JavaScriptLanguage.INSTANCE, JSCaseClauseImpl.class);
-	IElementType SWITCH_STATEMENT = new ElementTypeAsPsiFactory("SWITCH_STATEMENT", JavaScriptLanguage.INSTANCE, JSSwitchStatementImpl.class);
-	IElementType FOR_STATEMENT = new ElementTypeAsPsiFactory("FOR_STATEMENT", JavaScriptLanguage.INSTANCE, JSForStatementImpl.class);
-	IElementType FOR_IN_STATEMENT = new ElementTypeAsPsiFactory("FOR_IN_STATEMENT", JavaScriptLanguage.INSTANCE, JSForInStatementImpl.class);
-	IElementType WHILE_STATEMENT = new ElementTypeAsPsiFactory("WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSWhileStatementImpl.class);
-	IElementType DOWHILE_STATEMENT = new ElementTypeAsPsiFactory("DO_WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSDoWhileStatementImpl.class);
+	IElementType EMPTY_STATEMENT = new ElementTypeAsPsiFactory("EMPTY_STATEMENT", JavaScriptLanguage.INSTANCE, JSEmptyStatementImpl::new);
+	IElementType IF_STATEMENT = new ElementTypeAsPsiFactory("IF_STATEMENT", JavaScriptLanguage.INSTANCE, JSIfStatementImpl::new);
+	IElementType CONTINUE_STATEMENT = new ElementTypeAsPsiFactory("CONTINUE_STATEMENT", JavaScriptLanguage.INSTANCE, JSContinueStatementImpl::new);
+	IElementType BREAK_STATEMENT = new ElementTypeAsPsiFactory("BREAK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBreakStatementImpl::new);
+	IElementType DESTRUCTURING_ELEMENT = new ElementTypeAsPsiFactory("DESTRUCTURING_ELEMENT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringElementImpl::new);
+	IElementType DESTRUCTURING_PARAMETER = new ElementTypeAsPsiFactory("DESTRUCTURING_PARAMETER", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringParameterImpl::new);
+	IElementType DESTRUCTURING_OBJECT = new ElementTypeAsPsiFactory("DESTRUCTURING_OBJECT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringObjectImpl::new);
+	IElementType DESTRUCTURING_SHORTHANDED_PROPERTY = new ElementTypeAsPsiFactory("DESTRUCTURING_SHORTHANDED_PROPERTY", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringShorthandedPropertyImpl::new);
+	IElementType WITH_STATEMENT = new ElementTypeAsPsiFactory("WITH_STATEMENT", JavaScriptLanguage.INSTANCE, JSWithStatementImpl::new);
+	IElementType RETURN_STATEMENT = new ElementTypeAsPsiFactory("RETURN_STATEMENT", JavaScriptLanguage.INSTANCE, JSReturnStatementImpl::new);
+	IElementType THROW_STATEMENT = new ElementTypeAsPsiFactory("THROW_STATEMENT", JavaScriptLanguage.INSTANCE, JSThrowStatementImpl::new);
+	IElementType TRY_STATEMENT = new ElementTypeAsPsiFactory("TRY_STATEMENT", JavaScriptLanguage.INSTANCE, JSTryStatementImpl::new);
+	IElementType CATCH_BLOCK = new ElementTypeAsPsiFactory("CATCH_BLOCK", JavaScriptLanguage.INSTANCE, JSCatchBlockImpl::new);
+	IElementType CASE_CLAUSE = new ElementTypeAsPsiFactory("CASE_CLAUSE", JavaScriptLanguage.INSTANCE, JSCaseClauseImpl::new);
+	IElementType SWITCH_STATEMENT = new ElementTypeAsPsiFactory("SWITCH_STATEMENT", JavaScriptLanguage.INSTANCE, JSSwitchStatementImpl::new);
+	IElementType FOR_STATEMENT = new ElementTypeAsPsiFactory("FOR_STATEMENT", JavaScriptLanguage.INSTANCE, JSForStatementImpl::new);
+	IElementType FOR_IN_STATEMENT = new ElementTypeAsPsiFactory("FOR_IN_STATEMENT", JavaScriptLanguage.INSTANCE, JSForInStatementImpl::new);
+	IElementType WHILE_STATEMENT = new ElementTypeAsPsiFactory("WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSWhileStatementImpl::new);
+	IElementType DOWHILE_STATEMENT = new ElementTypeAsPsiFactory("DO_WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSDoWhileStatementImpl::new);
 
 	@Deprecated
 	@DeprecationInfo("Use search by class")
@@ -141,31 +141,32 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 			USE_NAMESPACE_DIRECTIVE));
 
 	// Expressions
-	IElementType THIS_EXPRESSION = new ElementTypeAsPsiFactory("THIS_EXPRESSION", JavaScriptLanguage.INSTANCE, JSThisExpressionImpl.class);
+	IElementType THIS_EXPRESSION = new ElementTypeAsPsiFactory("THIS_EXPRESSION", JavaScriptLanguage.INSTANCE, JSThisExpressionImpl::new);
 	IElementType REFERENCE_EXPRESSION = new ElementTypeAsPsiFactory("REFERENCE_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSReferenceExpressionImpl.class);
-	IElementType LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLiteralExpressionImpl.class);
+			JSReferenceExpressionImpl::new);
+	IElementType LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLiteralExpressionImpl::new);
 	IElementType XML_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("XML_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSXmlLiteralExpressionImpl.class);
+			JSXmlLiteralExpressionImpl::new);
 	IElementType PARENTHESIZED_EXPRESSION = new ElementTypeAsPsiFactory("PARENTHESIZED_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSParenthesizedExpressionImpl.class);
+			JSParenthesizedExpressionImpl::new);
 	IElementType ARRAY_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("ARRAY_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSArrayLiteralExpressionImpl.class);
-	IElementType PROPERTY = new ElementTypeAsPsiFactory("PROPERTY", JavaScriptLanguage.INSTANCE, JSPropertyImpl.class);
-	IElementType COMPUTED_NAME = new ElementTypeAsPsiFactory("COMPUTED_NAME", JavaScriptLanguage.INSTANCE, JSComputedNameImpl.class);
+			JSArrayLiteralExpressionImpl::new);
+	IElementType PROPERTY = new ElementTypeAsPsiFactory("PROPERTY", JavaScriptLanguage.INSTANCE, JSPropertyImpl::new);
+	IElementType FUNCTION_PROPERTY = new ElementTypeAsPsiFactory("FUNCTION_PROPERTY", JavaScriptLanguage.INSTANCE, JSPropertyImpl::new);
+	IElementType COMPUTED_NAME = new ElementTypeAsPsiFactory("COMPUTED_NAME", JavaScriptLanguage.INSTANCE, JSComputedNameImpl::new);
 	IElementType OBJECT_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("OBJECT_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSObjectLiteralExpressionImpl.class);
+			JSObjectLiteralExpressionImpl::new);
 	IElementType ASSIGNMENT_EXPRESSION = new ElementTypeAsPsiFactory("ASSIGNMENT_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSAssignmentExpressionImpl.class);
+			JSAssignmentExpressionImpl::new);
 	IElementType CONDITIONAL_EXPRESSION = new ElementTypeAsPsiFactory("CONDITIONAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSConditionalExpressionImpl.class);
-	IElementType CLASS_EXPRESSION = new ElementTypeAsPsiFactory("CLASS_EXPRESSION", JavaScriptLanguage.INSTANCE, JSClassExpressionImpl.class);
-	IElementType BINARY_EXPRESSION = new ElementTypeAsPsiFactory("BINARY_EXPRESSION", JavaScriptLanguage.INSTANCE, JSBinaryExpressionImpl.class);
-	IElementType PREFIX_EXPRESSION = new ElementTypeAsPsiFactory("PREFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPrefixExpressionImpl.class);
-	IElementType POSTFIX_EXPRESSION = new ElementTypeAsPsiFactory("POSTFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPostfixExpressionImpl.class);
-	IElementType LAMBDA_EXPRESSION = new ElementTypeAsPsiFactory("LAMBDA_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptLambdaExpressionImpl.class);
-	IElementType SPREAD_EXPRESSION = new ElementTypeAsPsiFactory("SPREAD_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptSpreadExpressionImpl.class);
-	IElementType COMMA_EXPRESSION = new ElementTypeAsPsiFactory("COMMA_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCommaExpressionImpl.class);
+			JSConditionalExpressionImpl::new);
+	IElementType CLASS_EXPRESSION = new ElementTypeAsPsiFactory("CLASS_EXPRESSION", JavaScriptLanguage.INSTANCE, JSClassExpressionImpl::new);
+	IElementType BINARY_EXPRESSION = new ElementTypeAsPsiFactory("BINARY_EXPRESSION", JavaScriptLanguage.INSTANCE, JSBinaryExpressionImpl::new);
+	IElementType PREFIX_EXPRESSION = new ElementTypeAsPsiFactory("PREFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPrefixExpressionImpl::new);
+	IElementType POSTFIX_EXPRESSION = new ElementTypeAsPsiFactory("POSTFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPostfixExpressionImpl::new);
+	IElementType LAMBDA_EXPRESSION = new ElementTypeAsPsiFactory("LAMBDA_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptLambdaExpressionImpl::new);
+	IElementType SPREAD_EXPRESSION = new ElementTypeAsPsiFactory("SPREAD_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptSpreadExpressionImpl::new);
+	IElementType COMMA_EXPRESSION = new ElementTypeAsPsiFactory("COMMA_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCommaExpressionImpl::new);
 	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_EXPRESSION = new JSFunctionElementType("FUNCTION_EXPRESSION")
 	{
 		@Override
@@ -181,14 +182,14 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 			return new JSFunctionExpressionImpl(astNode);
 		}
 	};
-	IElementType NEW_EXPRESSION = new ElementTypeAsPsiFactory("NEW_EXPRESSION", JavaScriptLanguage.INSTANCE, JSNewExpressionImpl.class);
+	IElementType NEW_EXPRESSION = new ElementTypeAsPsiFactory("NEW_EXPRESSION", JavaScriptLanguage.INSTANCE, JSNewExpressionImpl::new);
 
 	IElementType INDEXED_PROPERTY_ACCESS_EXPRESSION = new ElementTypeAsPsiFactory("INDEXED_PROPERTY_ACCESS_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSIndexedPropertyAccessExpressionImpl.class);
-	IElementType CALL_EXPRESSION = new ElementTypeAsPsiFactory("CALL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCallExpressionImpl.class);
+			JSIndexedPropertyAccessExpressionImpl::new);
+	IElementType CALL_EXPRESSION = new ElementTypeAsPsiFactory("CALL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCallExpressionImpl::new);
 	IElementType DEFINITION_EXPRESSION = new ElementTypeAsPsiFactory("DEFINITION_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSDefinitionExpressionImpl.class);
-	IElementType LET_EXPRESSION = new ElementTypeAsPsiFactory("LET_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLetExpressionImpl.class);
+			JSDefinitionExpressionImpl::new);
+	IElementType LET_EXPRESSION = new ElementTypeAsPsiFactory("LET_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLetExpressionImpl::new);
 
 	TokenSet PARAMETERS = TokenSet.create(FORMAL_PARAMETER, DESTRUCTURING_PARAMETER);
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
new file mode 100644
index 00000000..f5a3bf97
--- /dev/null
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
@@ -0,0 +1,96 @@
+package com.intellij.lang.javascript.psi.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.JSElementTypes;
+import com.intellij.lang.javascript.psi.JSAttributeList;
+import com.intellij.lang.javascript.psi.JSFunctionProperty;
+import com.intellij.lang.javascript.psi.JSParameterList;
+import com.intellij.lang.javascript.psi.JSSourceElement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.lang.psi.JavaScriptTypeElement;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 19/12/2021
+ */
+public class JSFunctionPropertyImpl extends JSPropertyImpl implements JSFunctionProperty
+{
+	public JSFunctionPropertyImpl(ASTNode node)
+	{
+		super(node);
+	}
+
+	@RequiredReadAction
+	@Nullable
+	@Override
+	public JSParameterList getParameterList()
+	{
+		return (JSParameterList) findChildByType(JSElementTypes.PARAMETER_LIST);
+	}
+
+	@Override
+	public JSSourceElement[] getBody()
+	{
+		final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
+		if(children.length == 0)
+		{
+			return JSSourceElement.EMPTY_ARRAY;
+		}
+		JSSourceElement[] result = new JSSourceElement[children.length];
+		for(int i = 0; i < children.length; i++)
+		{
+			result[i] = (JSSourceElement) children[i].getPsi();
+		}
+		return result;
+	}
+
+	@Nonnull
+	@Override
+	public JavaScriptType getReturnType()
+	{
+		return JavaScriptType.UNKNOWN;
+	}
+
+	@Override
+	public String getReturnTypeString()
+	{
+		return null;
+	}
+
+	@Nullable
+	@Override
+	public JavaScriptTypeElement getReturnTypeElement()
+	{
+		return null;
+	}
+
+	@Nonnull
+	@Override
+	public FunctionKind getKind()
+	{
+		return FunctionKind.SIMPLE;
+	}
+
+	@Override
+	public boolean isDeprecated()
+	{
+		return false;
+	}
+
+	@Nullable
+	@Override
+	public JSAttributeList getAttributeList()
+	{
+		return null;
+	}
+
+	@Override
+	public String getQualifiedName()
+	{
+		return null;
+	}
+}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
index 3f7d1ec5..3f5e3748 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
@@ -48,6 +48,7 @@ public EcmaScript6JavaScriptVersion(@Nonnull String id)
 		addFeature(JavaScriptFeature.OCTAL_LITERAL);
 		addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
 		addFeature(JavaScriptFeature.REST_PARAMETER);
+		addFeature(JavaScriptFeature.FUNCTION_PROPERTY);
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
index 2186f931..097927e6 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -167,6 +167,8 @@ protected void parseProperty(PsiBuilder builder)
 			builder.advanceLexer();
 		}
 
+		IElementType doneElement = JSElementTypes.PROPERTY;
+
 		IElementType nextTokenType = builder.getTokenType();
 		// we finished property
 		if((nextTokenType == JSTokenTypes.COMMA || nextTokenType == JSTokenTypes.RBRACE) && nameTokenType == JSTokenTypes.IDENTIFIER)
@@ -179,6 +181,14 @@ protected void parseProperty(PsiBuilder builder)
 			builder.advanceLexer();
 			referenceMark.done(JSElementTypes.REFERENCE_EXPRESSION);
 		}
+		else if(nextTokenType == JSTokenTypes.LPAR)
+		{
+			getFunctionParsing().parseParameterList(builder);
+
+			getStatementParsing().parseFunctionBody(builder);
+
+			doneElement = JSElementTypes.FUNCTION_PROPERTY;
+		}
 		else
 		{
 			checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
@@ -191,7 +201,7 @@ protected void parseProperty(PsiBuilder builder)
 			builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
 		}
 
-		propertyMark.done(JSElementTypes.PROPERTY);
+		propertyMark.done(doneElement);
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
index 862f8a42..b4e2584a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
@@ -103,6 +103,17 @@ else if(JavaScriptContextKeywordElementType.containsKeyword(elementType))
 		}
 	}
 
+	@Override
+	public void visitJSProperty(JSProperty node)
+	{
+		super.visitJSProperty(node);
+
+		if(node instanceof JSFunction)
+		{
+			reportFeatureUsage(node.getNameIdentifier(), JavaScriptFeature.FUNCTION_PROPERTY);
+		}
+	}
+
 	@Override
 	@RequiredReadAction
 	public void visitJSLiteralExpression(JSSimpleLiteralExpression node)

From abaac13a302d8b3bd0a58ceb3bab2589c70416ba Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 20 Dec 2021 21:09:02 +0300
Subject: [PATCH 154/340] fix #44

---
 .../lang/javascript/psi/JSFunction.java       | 18 ++++-
 .../lang/javascript/JSElementTypes.java       |  2 +-
 .../intellij/lang/javascript/JavaScript.flex  |  2 -
 .../psi/impl/JSFunctionBaseImpl.java          | 18 -----
 .../psi/impl/JSFunctionPropertyImpl.java      | 22 +++++--
 .../impl/JSObjectLiteralExpressionImpl.java   | 13 +---
 .../javascript/psi/util/JSLookupUtil.java     | 35 ++++------
 .../JavaScriptContextKeywordElementType.java  |  3 +-
 .../lang/parsing/FunctionParsing.java         | 16 +++--
 .../impl/JavaScriptLambdaExpressionImpl.java  |  6 --
 .../parsing/EcmaScriptExpressionParsing.java  | 65 ++++++++++++++-----
 .../ide/JavaScriptIconDescriptorUpdater.java  | 21 ++++--
 12 files changed, 122 insertions(+), 99 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index d618060e..6a1da9e4 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -75,7 +75,23 @@ enum FunctionKind
 
 	@Nonnull
 	@RequiredReadAction
-	FunctionKind getKind();
+	default FunctionKind getKind()
+	{
+		if(isGetProperty())
+		{
+			return FunctionKind.GETTER;
+		}
+		if(isSetProperty())
+		{
+			return FunctionKind.SETTER;
+		}
+		if(isConstructor())
+		{
+			return FunctionKind.CONSTRUCTOR;
+		}
+		return FunctionKind.SIMPLE;
+	}
+
 
 	boolean isDeprecated();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 80f5f9a1..bb2f73c4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -152,7 +152,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	IElementType ARRAY_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("ARRAY_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
 			JSArrayLiteralExpressionImpl::new);
 	IElementType PROPERTY = new ElementTypeAsPsiFactory("PROPERTY", JavaScriptLanguage.INSTANCE, JSPropertyImpl::new);
-	IElementType FUNCTION_PROPERTY = new ElementTypeAsPsiFactory("FUNCTION_PROPERTY", JavaScriptLanguage.INSTANCE, JSPropertyImpl::new);
+	IElementType FUNCTION_PROPERTY = new ElementTypeAsPsiFactory("FUNCTION_PROPERTY", JavaScriptLanguage.INSTANCE, JSFunctionPropertyImpl::new);
 	IElementType COMPUTED_NAME = new ElementTypeAsPsiFactory("COMPUTED_NAME", JavaScriptLanguage.INSTANCE, JSComputedNameImpl::new);
 	IElementType OBJECT_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("OBJECT_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
 			JSObjectLiteralExpressionImpl::new);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
index 766d689b..cd8a0150 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
@@ -276,8 +276,6 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 <YYINITIAL,DIV_OR_GT> "super"               { yybegin(YYINITIAL); return optionsHolder.isECMAL4Level ? JSTokenTypes.SUPER_KEYWORD:JSTokenTypes.IDENTIFIER; }
 <YYINITIAL,DIV_OR_GT> "include"             { yybegin(YYINITIAL); return optionsHolder.isECMAL4Level ? JSTokenTypes.INCLUDE_KEYWORD:JSTokenTypes.IDENTIFIER; }
 <YYINITIAL,DIV_OR_GT> "is"                  { yybegin(YYINITIAL); return optionsHolder.isECMAL4Level ? JSTokenTypes.IS_KEYWORD:JSTokenTypes.IDENTIFIER; }
-<YYINITIAL,DIV_OR_GT> "get"                 { yybegin(YYINITIAL); return optionsHolder.isJavaScript1_6_OrBetter ? JSTokenTypes.GET_KEYWORD:JSTokenTypes.IDENTIFIER; }
-<YYINITIAL,DIV_OR_GT> "set"                 { yybegin(YYINITIAL); return optionsHolder.isJavaScript1_6_OrBetter ? JSTokenTypes.SET_KEYWORD:JSTokenTypes.IDENTIFIER; }
 <YYINITIAL,DIV_OR_GT> "as"                  { yybegin(YYINITIAL); return optionsHolder.isECMAL4Level ? JSTokenTypes.AS_KEYWORD:JSTokenTypes.IDENTIFIER; }
 <YYINITIAL,DIV_OR_GT> "each"                { yybegin(YYINITIAL); return optionsHolder.hasE4X ? JSTokenTypes.EACH_KEYWORD:JSTokenTypes.IDENTIFIER; }
 <YYINITIAL,DIV_OR_GT> "uint"                { yybegin(YYINITIAL); return optionsHolder.isECMAL4Level ? JSTokenTypes.UINT_KEYWORD:JSTokenTypes.IDENTIFIER; }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index b195280f..f69b17a4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -217,24 +217,6 @@ public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement
 		return super.addBefore(element, anchor);
 	}
 
-	@Override
-	public FunctionKind getKind()
-	{
-		if(isGetProperty())
-		{
-			return FunctionKind.GETTER;
-		}
-		if(isSetProperty())
-		{
-			return FunctionKind.SETTER;
-		}
-		if(isConstructor())
-		{
-			return FunctionKind.CONSTRUCTOR;
-		}
-		return FunctionKind.SIMPLE;
-	}
-
 	@Override
 	public boolean isDeprecated()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
index f5a3bf97..383d25d1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
+import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSFunctionProperty;
 import com.intellij.lang.javascript.psi.JSParameterList;
@@ -24,6 +25,20 @@ public JSFunctionPropertyImpl(ASTNode node)
 		super(node);
 	}
 
+	@RequiredReadAction
+	@Override
+	public boolean isGetProperty()
+	{
+		return findChildByType(JSTokenTypes.GET_KEYWORD) != null;
+	}
+
+	@RequiredReadAction
+	@Override
+	public boolean isSetProperty()
+	{
+		return findChildByType(JSTokenTypes.SET_KEYWORD) != null;
+	}
+
 	@RequiredReadAction
 	@Nullable
 	@Override
@@ -68,13 +83,6 @@ public JavaScriptTypeElement getReturnTypeElement()
 		return null;
 	}
 
-	@Nonnull
-	@Override
-	public FunctionKind getKind()
-	{
-		return FunctionKind.SIMPLE;
-	}
-
 	@Override
 	public boolean isDeprecated()
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
index d646dfec..1e448337 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
@@ -17,14 +17,12 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.tree.TokenSet;
 
 import javax.annotation.Nonnull;
 
@@ -33,12 +31,9 @@
  * User: max
  * Date: Jan 30, 2005
  * Time: 11:36:30 PM
- * To change this template use File | Settings | File Templates.
  */
 public class JSObjectLiteralExpressionImpl extends JSExpressionImpl implements JSObjectLiteralExpression
 {
-	private static final TokenSet PROPERTIES_FILTER = TokenSet.create(JSElementTypes.PROPERTY);
-
 	public JSObjectLiteralExpressionImpl(final ASTNode node)
 	{
 		super(node);
@@ -47,13 +42,7 @@ public JSObjectLiteralExpressionImpl(final ASTNode node)
 	@Override
 	public JSProperty[] getProperties()
 	{
-		final ASTNode[] nodes = getNode().getChildren(PROPERTIES_FILTER);
-		final JSProperty[] properties = new JSProperty[nodes.length];
-		for(int i = 0; i < properties.length; i++)
-		{
-			properties[i] = (JSProperty) nodes[i].getPsi();
-		}
-		return properties;
+		return findChildrenByClass(JSProperty.class);
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
index 473edfff..3cb80ef3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
@@ -16,27 +16,20 @@
 
 package com.intellij.lang.javascript.psi.util;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
 import com.intellij.codeInsight.completion.PrioritizedLookupElement;
 import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import consulo.ide.IconDescriptorUpdaters;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSFunctionExpression;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSParameterList;
-import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.lang.javascript.psi.JSVariable;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.Function;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.ide.IconDescriptorUpdaters;
+import consulo.javascript.lang.psi.JavaScriptType;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class JSLookupUtil
 {
@@ -66,18 +59,14 @@ public static LookupElement createLookupItem(@Nonnull PsiElement value, @Nonnull
 		{
 			JSParameterList parameterList = function.getParameterList();
 			JSParameter[] jsParameters = parameterList == null ? JSParameter.EMPTY_ARRAY : parameterList.getParameters();
-			builder = builder.withPresentableText(name + "(" + StringUtil.join(jsParameters, new Function<JSParameter, String>()
+			builder = builder.withPresentableText(name + "(" + StringUtil.join(jsParameters, jsParameter ->
 			{
-				@Override
-				public String fun(JSParameter jsParameter)
+				JavaScriptType type = jsParameter.getType();
+				if(type != JavaScriptType.UNKNOWN)
 				{
-					JavaScriptType type = jsParameter.getType();
-					if(type != JavaScriptType.UNKNOWN)
-					{
-						return type.getPresentableText() + " " + jsParameter.getName();
-					}
-					return jsParameter.getName();
+					return type.getPresentableText() + " " + jsParameter.getName();
 				}
+				return jsParameter.getName();
 			}, ", ") + ")");
 			builder = builder.withInsertHandler(ParenthesesInsertHandler.getInstance(jsParameters.length > 0));
 		}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
index 424ffcf7..b3983c2f 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
@@ -4,7 +4,6 @@
 import com.google.common.collect.HashBiMap;
 import com.intellij.lang.javascript.JSElementType;
 import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -28,7 +27,7 @@ public static boolean containsKeyword(@Nonnull IElementType e)
 		return ourCache.inverse().containsKey(e);
 	}
 
-	public JavaScriptContextKeywordElementType(@NonNls @Nonnull String id, @Nonnull String keyword)
+	public JavaScriptContextKeywordElementType(@Nonnull String id, @Nonnull String keyword)
 	{
 		super(id);
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index 76ceec30..cd901fd2 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -20,7 +20,6 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.psi.tree.IElementType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -53,16 +52,23 @@ private void parseFunction(PsiBuilder builder, boolean expressionContext)
 	public void parseFunctionNoMarker(final PsiBuilder builder, final boolean expressionContext, final @Nonnull PsiBuilder.Marker functionMarker)
 	{
 		if(builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD)
-		{ // function keyword may be ommited in context of get/set property definition
+		{
+			// function keyword may be ommited in context of get/set property definition
 			builder.advanceLexer();
 		}
 
 		// Function name
 
-		final IElementType tokenType = builder.getTokenType();
-		if(!expressionContext && (tokenType == JSTokenTypes.GET_KEYWORD || tokenType == JSTokenTypes.SET_KEYWORD))
+		if(!expressionContext)
 		{
-			builder.advanceLexer();
+			if(isContextKeyword(builder, JSTokenTypes.GET_KEYWORD))
+			{
+				advanceContextKeyword(builder, JSTokenTypes.GET_KEYWORD);
+			}
+			else if(isContextKeyword(builder, JSTokenTypes.SET_KEYWORD))
+			{
+				advanceContextKeyword(builder, JSTokenTypes.SET_KEYWORD);
+			}
 		}
 
 		if(isIdentifierName(builder, builder.getTokenType()))
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
index 891c246c..271f6ca5 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
@@ -122,12 +122,6 @@ public JavaScriptTypeElement getReturnTypeElement()
 		return null;
 	}
 
-	@Override
-	public FunctionKind getKind()
-	{
-		return FunctionKind.SIMPLE;
-	}
-
 	@Override
 	public boolean isDeprecated()
 	{
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
index 097927e6..5ab7f31d 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -150,6 +150,8 @@ protected void parseProperty(PsiBuilder builder)
 		final IElementType nameTokenType = builder.getTokenType();
 		PsiBuilder.Marker propertyMark = builder.mark();
 
+		IElementType isSetterOrGetterType = null;
+
 		if(nameTokenType == JSTokenTypes.LBRACKET)
 		{
 			PsiBuilder.Marker mark = builder.mark();
@@ -164,25 +166,29 @@ protected void parseProperty(PsiBuilder builder)
 			{
 				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.identifier.string.literal.or.numeric.literal"));
 			}
-			builder.advanceLexer();
+
+			IElementType setOrGetToken = isContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET);
+
+			if(setOrGetToken != null && builder.lookAhead(1) == JSTokenTypes.IDENTIFIER)
+			{
+				isSetterOrGetterType = setOrGetToken;
+
+				advanceContextKeyword(builder, isSetterOrGetterType);
+			}
+			else
+			{
+				// just advance identifier
+				builder.advanceLexer();
+			}
 		}
 
 		IElementType doneElement = JSElementTypes.PROPERTY;
 
-		IElementType nextTokenType = builder.getTokenType();
-		// we finished property
-		if((nextTokenType == JSTokenTypes.COMMA || nextTokenType == JSTokenTypes.RBRACE) && nameTokenType == JSTokenTypes.IDENTIFIER)
+		if(isSetterOrGetterType != null)
 		{
-			propertyMark.rollbackTo(); // rollback it
-
-			propertyMark = builder.mark();
-
-			PsiBuilder.Marker referenceMark = builder.mark();
+			// advance name - see isSetterOrGetterType set
 			builder.advanceLexer();
-			referenceMark.done(JSElementTypes.REFERENCE_EXPRESSION);
-		}
-		else if(nextTokenType == JSTokenTypes.LPAR)
-		{
+
 			getFunctionParsing().parseParameterList(builder);
 
 			getStatementParsing().parseFunctionBody(builder);
@@ -191,14 +197,37 @@ else if(nextTokenType == JSTokenTypes.LPAR)
 		}
 		else
 		{
-			checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+			IElementType nextTokenType = builder.getTokenType();
+			// we finished property
+			if((nextTokenType == JSTokenTypes.COMMA || nextTokenType == JSTokenTypes.RBRACE) && nameTokenType == JSTokenTypes.IDENTIFIER)
+			{
+				propertyMark.rollbackTo(); // rollback it
+
+				propertyMark = builder.mark();
+
+				PsiBuilder.Marker referenceMark = builder.mark();
+				builder.advanceLexer();
+				referenceMark.done(JSElementTypes.REFERENCE_EXPRESSION);
+			}
+			else if(nextTokenType == JSTokenTypes.LPAR)
+			{
+				getFunctionParsing().parseParameterList(builder);
+
+				getStatementParsing().parseFunctionBody(builder);
 
-			builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
-			if(!parseAssignmentExpression(builder))
+				doneElement = JSElementTypes.FUNCTION_PROPERTY;
+			}
+			else
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+
+				builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
+				if(!parseAssignmentExpression(builder))
+				{
+					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				}
+				builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
 			}
-			builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
 		}
 
 		propertyMark.done(doneElement);
diff --git a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
index 5d375fed..8034494f 100644
--- a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
+++ b/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
@@ -16,9 +16,6 @@
 
 package consulo.javascript.ide;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
@@ -28,8 +25,12 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.ide.IconDescriptor;
 import consulo.ide.IconDescriptorUpdater;
+import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 05.12.2015
@@ -42,7 +43,19 @@ public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiEleme
 	{
 		if(element instanceof JSProperty)
 		{
-			iconDescriptor.setMainIcon(AllIcons.Nodes.Property);
+			if(element instanceof JSFunction && ((JSFunction) element).isGetProperty())
+			{
+				iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertyRead());
+			}
+			else if(element instanceof JSFunction && ((JSFunction) element).isSetProperty())
+			{
+				iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertyWrite());
+			}
+			else
+			{
+				iconDescriptor.setMainIcon(AllIcons.Nodes.Property);
+			}
+
 			JSExpression value = ((JSProperty) element).getValue();
 			if(value instanceof JSFunctionExpression)
 			{

From f662063347edac1954eb3c939613e407f9135000 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 21 Dec 2021 17:16:44 +0300
Subject: [PATCH 155/340] extract js regexp literal to own psi, and add regexp
 options for it

fix #30
---
 .../lang/javascript/JSElementTypes.java       |  4 +-
 .../lang/parsing/ExpressionParsing.java       | 11 ++-
 .../impl/JSRegExpLiteralExpressionImpl.java   | 20 +++++
 .../lang/javascript/JSNodeVisitor.java        |  4 +
 .../JavaScriptRegExpLiteralLanguageHost.java  | 89 +++++++++++++++++++
 .../JavaScriptRegexpMultiHostInjector.java    | 34 +++----
 plugin/src/main/resources/META-INF/regexp.xml |  6 +-
 7 files changed, 145 insertions(+), 23 deletions(-)
 create mode 100644 base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java
 create mode 100644 plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
 rename plugin/src/main/java/consulo/javascript/lang/{ => regexp/impl}/JavaScriptRegexpMultiHostInjector.java (62%)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index bb2f73c4..ba36bdea 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -34,6 +34,7 @@
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringObjectImpl;
 import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringParameterImpl;
 import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringShorthandedPropertyImpl;
+import consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl;
 import consulo.javascript.psi.impl.JSComputedNameImpl;
 import consulo.javascript.psi.impl.JavaScriptLambdaExpressionImpl;
 import consulo.javascript.psi.impl.JavaScriptSpreadExpressionImpl;
@@ -145,6 +146,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 	IElementType REFERENCE_EXPRESSION = new ElementTypeAsPsiFactory("REFERENCE_EXPRESSION", JavaScriptLanguage.INSTANCE,
 			JSReferenceExpressionImpl::new);
 	IElementType LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLiteralExpressionImpl::new);
+	IElementType REGEXP_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("REGEXP_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSRegExpLiteralExpressionImpl::new);
 	IElementType XML_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("XML_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
 			JSXmlLiteralExpressionImpl::new);
 	IElementType PARENTHESIZED_EXPRESSION = new ElementTypeAsPsiFactory("PARENTHESIZED_EXPRESSION", JavaScriptLanguage.INSTANCE,
@@ -195,7 +197,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 
 	@Deprecated
 	@DeprecationInfo("Use search by class")
-	TokenSet EXPRESSIONS = TokenSet.create(THIS_EXPRESSION, REFERENCE_EXPRESSION, LITERAL_EXPRESSION, PARENTHESIZED_EXPRESSION,
+	TokenSet EXPRESSIONS = TokenSet.create(THIS_EXPRESSION, REFERENCE_EXPRESSION, LITERAL_EXPRESSION, REGEXP_LITERAL_EXPRESSION, PARENTHESIZED_EXPRESSION,
 			ARRAY_LITERAL_EXPRESSION, OBJECT_LITERAL_EXPRESSION, ASSIGNMENT_EXPRESSION, CONDITIONAL_EXPRESSION, BINARY_EXPRESSION,
 			PREFIX_EXPRESSION, POSTFIX_EXPRESSION, COMMA_EXPRESSION, FUNCTION_EXPRESSION, NEW_EXPRESSION, INDEXED_PROPERTY_ACCESS_EXPRESSION,
 			CALL_EXPRESSION, DEFINITION_EXPRESSION, XML_LITERAL_EXPRESSION, SUPER_EXPRESSION, LET_EXPRESSION);
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 4eb2886d..950513fa 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -70,11 +70,20 @@ else if(isIdentifierName(builder, firstToken) || firstToken == JSTokenTypes.ANY_
 			Parsing.buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
 			return true;
 		}
+		else if(firstToken == JSTokenTypes.REGEXP_LITERAL)
+		{
+			String errorMessage = validateLiteral(builder);
+			Parsing.buildTokenElement(JSElementTypes.REGEXP_LITERAL_EXPRESSION, builder);
+			if(errorMessage != null)
+			{
+				builder.error(errorMessage);
+			}
+			return true;
+		}
 		else if(firstToken == JSTokenTypes.NUMERIC_LITERAL ||
 				firstToken == JSTokenTypes.STRING_LITERAL ||
 				firstToken == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL ||
 				firstToken == JSTokenTypes.INTERPOLATION_STRING_LITERAL ||
-				firstToken == JSTokenTypes.REGEXP_LITERAL ||
 				firstToken == JSTokenTypes.NULL_KEYWORD ||
 				firstToken == JSTokenTypes.UNDEFINED_KEYWORD ||
 				firstToken == JSTokenTypes.FALSE_KEYWORD ||
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java
new file mode 100644
index 00000000..c937aa80
--- /dev/null
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java
@@ -0,0 +1,20 @@
+package consulo.javascript.lang.psi.impl;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl;
+
+/**
+ * Own implementation for RegExp literal for correct registration RegExpLanguageHost.
+ *
+ * String literal with regexp will have own RegExp host
+ *
+ * @author VISTALL
+ * @since 21/12/2021
+ */
+public class JSRegExpLiteralExpressionImpl extends JSLiteralExpressionImpl
+{
+	public JSRegExpLiteralExpressionImpl(ASTNode node)
+	{
+		super(node);
+	}
+}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
index bebceda6..6eebadbc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
@@ -140,6 +140,10 @@ else if(type == JSElementTypes.LITERAL_EXPRESSION)
 		{
 			visitLiteralExpression(node);
 		}
+		else if(type == JSElementTypes.REGEXP_LITERAL_EXPRESSION)
+		{
+			visitLiteralExpression(node);
+		}
 		else if(type == JSElementTypes.REFERENCE_EXPRESSION)
 		{
 			visitReferenceExpression(node);
diff --git a/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java b/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
new file mode 100644
index 00000000..5db7e065
--- /dev/null
+++ b/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
@@ -0,0 +1,89 @@
+package consulo.javascript.lang.regexp.impl;
+
+import org.intellij.lang.regexp.RegExpLanguageHost;
+import org.intellij.lang.regexp.psi.RegExpChar;
+import org.intellij.lang.regexp.psi.RegExpGroup;
+import org.intellij.lang.regexp.psi.RegExpNamedGroupRef;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 21/12/2021
+ */
+public class JavaScriptRegExpLiteralLanguageHost implements RegExpLanguageHost
+{
+	@Override
+	public boolean characterNeedsEscaping(char c)
+	{
+		if(c == '/')
+		{
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean supportsPerl5EmbeddedComments()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean supportsPossessiveQuantifiers()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean supportsPythonConditionalRefs()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean supportsNamedGroupSyntax(RegExpGroup group)
+	{
+		return false;
+	}
+
+	@Override
+	public boolean supportsNamedGroupRefSyntax(RegExpNamedGroupRef ref)
+	{
+		return false;
+	}
+
+	@Override
+	public boolean supportsExtendedHexCharacter(RegExpChar regExpChar)
+	{
+		return false;
+	}
+
+	@Override
+	public boolean isValidCategory(@Nonnull String category)
+	{
+		return false;
+	}
+
+	@Nonnull
+	@Override
+	public String[][] getAllKnownProperties()
+	{
+		return new String[0][];
+	}
+
+	@Nullable
+	@Override
+	public String getPropertyDescription(@Nullable String name)
+	{
+		return null;
+	}
+
+	@Nonnull
+	@Override
+	public String[][] getKnownCharacterClasses()
+	{
+		return new String[0][];
+	}
+}
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java b/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
similarity index 62%
rename from plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
rename to plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
index 3d11eb7f..295a74d7 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptRegexpMultiHostInjector.java
+++ b/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.lang.regexp.impl;
 
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
-import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.tree.IElementType;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl;
 import org.intellij.lang.regexp.RegExpLanguage;
 
 import javax.annotation.Nonnull;
@@ -39,26 +37,22 @@ public class JavaScriptRegexpMultiHostInjector implements MultiHostInjector
 	@RequiredReadAction
 	public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement context)
 	{
-		if(context instanceof JSSimpleLiteralExpression)
+		if(context instanceof JSRegExpLiteralExpressionImpl)
 		{
-			IElementType literalElementType = ((JSSimpleLiteralExpression) context).getLiteralElementType();
-			if(literalElementType == JSTokenTypes.REGEXP_LITERAL)
-			{
-				int textLength = context.getTextLength() - 1;
-				String text = context.getText();
-
-				if(text.charAt(textLength) != '/')
-				{
-					textLength --;
-				}
+			int textLength = context.getTextLength() - 1;
+			String text = context.getText();
 
-				if(textLength <= 1)
-				{
-					return;
-				}
+			if(text.charAt(textLength) != '/')
+			{
+				textLength--;
+			}
 
-				registrar.startInjecting(RegExpLanguage.INSTANCE).addPlace(null, null, (PsiLanguageInjectionHost) context, new TextRange(1, textLength)).doneInjecting();
+			if(textLength <= 1)
+			{
+				return;
 			}
+
+			registrar.startInjecting(RegExpLanguage.INSTANCE).addPlace(null, null, (PsiLanguageInjectionHost) context, new TextRange(1, textLength)).doneInjecting();
 		}
 	}
 }
diff --git a/plugin/src/main/resources/META-INF/regexp.xml b/plugin/src/main/resources/META-INF/regexp.xml
index 7512795a..4cd18c5e 100644
--- a/plugin/src/main/resources/META-INF/regexp.xml
+++ b/plugin/src/main/resources/META-INF/regexp.xml
@@ -16,6 +16,10 @@
 
 <consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<multiHostInjector forClass="com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl" implementationClass="consulo.javascript.lang.JavaScriptRegexpMultiHostInjector"/>
+		<multiHostInjector forClass="com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl" implementationClass="consulo.javascript.lang.regexp.impl.JavaScriptRegexpMultiHostInjector"/>
+	</extensions>
+
+	<extensions defaultExtensionNs="com.intellij.regexp">
+		<languageHost forClass="consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl" implementationClass="consulo.javascript.lang.regexp.impl.JavaScriptRegExpLiteralLanguageHost"/>
 	</extensions>
 </consulo-plugin>
\ No newline at end of file

From c8dd79cea25fa19c38cff22d2e149957a6823bee Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Thu, 23 Dec 2021 21:38:51 +0300
Subject: [PATCH 156/340] fix plugin artifact ids

---
 base-api/pom.xml                          | 2 +-
 base-impl/pom.xml                         | 2 +-
 lang-version-impl/ecmascript-impl/pom.xml | 2 +-
 plugin/pom.xml                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base-api/pom.xml b/base-api/pom.xml
index b03cb3da..372b3ee1 100644
--- a/base-api/pom.xml
+++ b/base-api/pom.xml
@@ -44,7 +44,7 @@
 		<plugins>
 			<plugin>
 				<groupId>consulo.maven</groupId>
-				<artifactId>consulo-maven-plugin</artifactId>
+				<artifactId>maven-consulo-plugin</artifactId>
 				<version>2-SNAPSHOT</version>
 				<extensions>true</extensions>
 				<executions>
diff --git a/base-impl/pom.xml b/base-impl/pom.xml
index 6b4a7768..d758f6b6 100644
--- a/base-impl/pom.xml
+++ b/base-impl/pom.xml
@@ -33,7 +33,7 @@
 		<plugins>
 			<plugin>
 				<groupId>consulo.maven</groupId>
-				<artifactId>consulo-maven-plugin</artifactId>
+				<artifactId>maven-consulo-plugin</artifactId>
 				<version>2-SNAPSHOT</version>
 				<extensions>true</extensions>
 				<executions>
diff --git a/lang-version-impl/ecmascript-impl/pom.xml b/lang-version-impl/ecmascript-impl/pom.xml
index 0aed2ced..59bd3aef 100644
--- a/lang-version-impl/ecmascript-impl/pom.xml
+++ b/lang-version-impl/ecmascript-impl/pom.xml
@@ -44,7 +44,7 @@
 		<plugins>
 			<plugin>
 				<groupId>consulo.maven</groupId>
-				<artifactId>consulo-maven-plugin</artifactId>
+				<artifactId>maven-consulo-plugin</artifactId>
 				<version>2-SNAPSHOT</version>
 				<extensions>true</extensions>
 				<executions>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 8d6ee62b..49c3e5d6 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -44,7 +44,7 @@
 		<plugins>
 			<plugin>
 				<groupId>consulo.maven</groupId>
-				<artifactId>consulo-maven-plugin</artifactId>
+				<artifactId>maven-consulo-plugin</artifactId>
 				<version>2-SNAPSHOT</version>
 				<extensions>true</extensions>
 				<configuration>

From 9b9eb3ae61af6ae77e5cf004363d3ab0be9a52cd Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 11 Jan 2022 18:20:10 +0300
Subject: [PATCH 157/340] fix #46

---
 .../java/com/intellij/lang/javascript/JavaScript.flex    | 2 +-
 .../java/consulo/javascript/lang/lexer/javascript15.flex | 2 +-
 .../java/consulo/javascript/lang/lexer/ecmascript6.flex  | 2 +-
 .../regexp/impl/JavaScriptRegExpLiteralLanguageHost.java | 9 +++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
index cd8a0150..02ae594f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
@@ -62,7 +62,7 @@ DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
 ESCAPE_SEQUENCE=\\[^\r\n]
 GROUP = "[" [^\]]* "]"
 
-REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimx]*)?
+REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimx\u]*)?
 ALPHA=[:letter:]
 DIGIT=[0-9]
 XML_NAME=({ALPHA}|"_")({ALPHA}|{DIGIT}|"_"|"."|"-")*(":"({ALPHA}|"_")?({ALPHA}|{DIGIT}|"_"|"."|"-")*)?
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex b/base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
index eff60b17..3dc80180 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
+++ b/base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
@@ -44,7 +44,7 @@ DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
 ESCAPE_SEQUENCE=\\[^\r\n]
 GROUP = "[" [^\]]* "]"
 
-REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimx]*)?
+REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimxu]*)?
 DIGIT=[0-9]
 
 %state DIV_OR_GT
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
index 3e874320..fb373d1a 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
@@ -67,7 +67,7 @@ DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
 ESCAPE_SEQUENCE=\\[^\r\n]
 GROUP = "[" [^\]]* "]"
 
-REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimx]*)?
+REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimxu]*)?
 INTERPOLATION_STRING_LITERAL="`" [^"`"]* "`"
 
 ALPHA=[:letter:]
diff --git a/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java b/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
index 5db7e065..4719eb4a 100644
--- a/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
+++ b/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
@@ -1,5 +1,6 @@
 package consulo.javascript.lang.regexp.impl;
 
+import org.intellij.lang.regexp.DefaultRegExpPropertiesProvider;
 import org.intellij.lang.regexp.RegExpLanguageHost;
 import org.intellij.lang.regexp.psi.RegExpChar;
 import org.intellij.lang.regexp.psi.RegExpGroup;
@@ -63,27 +64,27 @@ public boolean supportsExtendedHexCharacter(RegExpChar regExpChar)
 	@Override
 	public boolean isValidCategory(@Nonnull String category)
 	{
-		return false;
+		return DefaultRegExpPropertiesProvider.getInstance().isValidCategory(category);
 	}
 
 	@Nonnull
 	@Override
 	public String[][] getAllKnownProperties()
 	{
-		return new String[0][];
+		return DefaultRegExpPropertiesProvider.getInstance().getAllKnownProperties();
 	}
 
 	@Nullable
 	@Override
 	public String getPropertyDescription(@Nullable String name)
 	{
-		return null;
+		return DefaultRegExpPropertiesProvider.getInstance().getPropertyDescription(name);
 	}
 
 	@Nonnull
 	@Override
 	public String[][] getKnownCharacterClasses()
 	{
-		return new String[0][];
+		return DefaultRegExpPropertiesProvider.getInstance().getKnownCharacterClasses();
 	}
 }

From c69adaa441f4391c443d1aaf096ad719213bad3f Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 12 Jan 2022 11:53:40 +0300
Subject: [PATCH 158/340] fix wrong regexp textrange injection

---
 .../impl/JavaScriptRegexpMultiHostInjector.java     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java b/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
index 295a74d7..4e12f79d 100644
--- a/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
+++ b/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
@@ -39,20 +39,17 @@ public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiE
 	{
 		if(context instanceof JSRegExpLiteralExpressionImpl)
 		{
-			int textLength = context.getTextLength() - 1;
 			String text = context.getText();
 
-			if(text.charAt(textLength) != '/')
-			{
-				textLength--;
-			}
-
-			if(textLength <= 1)
+			// ignore flags for regexp
+			int lastIndex = text.lastIndexOf('/');
+			// empty regexp
+			if(lastIndex == 0)
 			{
 				return;
 			}
 
-			registrar.startInjecting(RegExpLanguage.INSTANCE).addPlace(null, null, (PsiLanguageInjectionHost) context, new TextRange(1, textLength)).doneInjecting();
+			registrar.startInjecting(RegExpLanguage.INSTANCE).addPlace(null, null, (PsiLanguageInjectionHost) context, new TextRange(1, lastIndex)).doneInjecting();
 		}
 	}
 }

From f8b13a0ebaaefba697709d1afba92a4b7e24fb2f Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Wed, 20 Jul 2022 11:03:44 +0300
Subject: [PATCH 159/340] add some typescript version resolving

---
 .../lang/BaseJavaScriptLanguageVersion.java   |  7 ++--
 .../lang/BaseEcmaScriptJavaScriptVersion.java | 10 ++---
 lang-version-impl/typescript-impl/pom.xml     |  6 +++
 .../typescript/TypeScriptFileType.java        | 23 ++++++++---
 .../version/TypeScriptLanguageVersion.java    | 38 +++++++++++++++++++
 .../JavaScriptLanguageVersionResolver.java    |  1 -
 .../main/resources/META-INF/typescript.xml    |  2 +
 7 files changed, 71 insertions(+), 16 deletions(-)
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java

diff --git a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index 869996fc..e16e347e 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -1,9 +1,5 @@
 package consulo.javascript.lang;
 
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
@@ -11,6 +7,9 @@
 import com.intellij.util.containers.ArrayListSet;
 import consulo.javascript.lang.parsing.JavaScriptParser;
 
+import javax.annotation.Nonnull;
+import java.util.Set;
+
 /**
  * @author VISTALL
  * @since 24.08.14
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
index 7a2c4c48..fd5491b4 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -22,17 +22,15 @@
  */
 public abstract class BaseEcmaScriptJavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker, JavaScriptVersionWithHelper
 {
-	@Nonnull
-	public static EcmaScript6JavaScriptVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript6JavaScriptVersion.class);
-	}
-
 	protected BaseEcmaScriptJavaScriptVersion(@Nonnull String id)
 	{
 		super(id);
 	}
 
+	protected BaseEcmaScriptJavaScriptVersion(String name, String... mimeTypes)
+	{
+		super(name, mimeTypes);
+	}
 
 	@Nonnull
 	@Override
diff --git a/lang-version-impl/typescript-impl/pom.xml b/lang-version-impl/typescript-impl/pom.xml
index ff75e464..ff60e7fc 100644
--- a/lang-version-impl/typescript-impl/pom.xml
+++ b/lang-version-impl/typescript-impl/pom.xml
@@ -53,6 +53,12 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-ecmascript.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>consulo-lang-impl-testing</artifactId>
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index 457c329b..aea0c2ff 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -16,22 +16,27 @@
 
 package consulo.typescript;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.openapi.fileTypes.LanguageFileType;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.vfs.VirtualFile;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.icon.JavaScriptIconGroup;
+import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
 import consulo.javascript.lang.JavaScriptLanguage;
 import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.lang.LanguageVersion;
 import consulo.localize.LocalizeValue;
+import consulo.typescript.version.TypeScriptLanguageVersion;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 03.03.2016
  */
-public class TypeScriptFileType extends LanguageFileType
+public class TypeScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion
 {
 	public static final TypeScriptFileType INSTANCE = new TypeScriptFileType();
 
@@ -67,4 +72,12 @@ public Image getIcon()
 	{
 		return JavaScriptIconGroup.typeScript();
 	}
+
+	@RequiredReadAction
+	@Nonnull
+	@Override
+	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
+	{
+		return TypeScriptLanguageVersion.getInstance();
+	}
 }
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
new file mode 100644
index 00000000..d813ad35
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
@@ -0,0 +1,38 @@
+package consulo.typescript.version;
+
+import consulo.javascript.lang.BaseEcmaScriptJavaScriptVersion;
+import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.lang.JavaScriptLanguage;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 20-Jul-22
+ */
+public class TypeScriptLanguageVersion extends BaseEcmaScriptJavaScriptVersion
+{
+	@Nonnull
+	public static TypeScriptLanguageVersion getInstance()
+	{
+		return JavaScriptLanguage.INSTANCE.findVersionByClass(TypeScriptLanguageVersion.class);
+	}
+
+	public TypeScriptLanguageVersion()
+	{
+		super("TYPESCRIPT", "application/typescript");
+		addFeature(JavaScriptFeature.CLASS);
+		addFeature(JavaScriptFeature.BINARY_LITERAL);
+		addFeature(JavaScriptFeature.OCTAL_LITERAL);
+		addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
+		addFeature(JavaScriptFeature.REST_PARAMETER);
+		addFeature(JavaScriptFeature.FUNCTION_PROPERTY);
+	}
+
+	@Nonnull
+	@Override
+	public String getPresentableName()
+	{
+		return "TypeScript";
+	}
+}
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
index e9c933b7..4b85dd2c 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
@@ -71,7 +71,6 @@ public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable
 		if(fileType instanceof JavaScriptFileTypeWithVersion)
 		{
 			Module module = ModuleUtilCore.findModuleForFile(virtualFile, project);
-			module = ModuleUtilCore.findModuleForFile(virtualFile, project);
 			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(module, virtualFile);
 		}
 
diff --git a/plugin/src/main/resources/META-INF/typescript.xml b/plugin/src/main/resources/META-INF/typescript.xml
index aa028a6f..dcf25278 100644
--- a/plugin/src/main/resources/META-INF/typescript.xml
+++ b/plugin/src/main/resources/META-INF/typescript.xml
@@ -17,5 +17,7 @@
 <consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
 		<fileTypeFactory implementation="consulo.typescript.TypeScriptFileTypeFactory" />
+
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.typescript.version.TypeScriptLanguageVersion"/>
 	</extensions>
 </consulo-plugin>
\ No newline at end of file

From 1f556a4145856efbdfbc7ec193ddd5e8129177f6 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 28 Aug 2022 23:28:25 +0300
Subject: [PATCH 160/340] migrate to consulo 3 api next

---
 base-api/pom.xml                              |  11 +-
 .../formatter/JSCodeStyleSettings.java        |   6 +-
 .../lang/javascript/psi/JSAttribute.java      |   6 +-
 .../lang/javascript/psi/JSAttributeList.java  |   4 +-
 .../javascript/psi/JSAttributeListOwner.java  |   3 +-
 .../psi/JSAttributeNameValuePair.java         |   4 +-
 .../javascript/psi/JSBinaryExpression.java    |   4 +-
 .../intellij/lang/javascript/psi/JSClass.java |   4 +-
 .../lang/javascript/psi/JSDocComment.java     |   2 +-
 .../lang/javascript/psi/JSDocTag.java         |   2 +-
 .../lang/javascript/psi/JSElement.java        |   2 +-
 .../lang/javascript/psi/JSElementVisitor.java |   2 +-
 .../lang/javascript/psi/JSExpression.java     |   4 +-
 .../intellij/lang/javascript/psi/JSFile.java  |   4 +-
 .../lang/javascript/psi/JSFunction.java       |   6 +-
 .../javascript/psi/JSImportStatement.java     |   2 +-
 .../javascript/psi/JSIncludeDirective.java    |   4 +-
 .../javascript/psi/JSLabeledStatement.java    |   4 +-
 .../lang/javascript/psi/JSNamedElement.java   |   6 +-
 .../psi/JSNamespaceDeclaration.java           |   2 +-
 .../javascript/psi/JSPackageStatement.java    |   2 +-
 .../lang/javascript/psi/JSParameter.java      |   4 +-
 .../lang/javascript/psi/JSParameterList.java  |   2 +-
 .../javascript/psi/JSPostfixExpression.java   |   2 +-
 .../javascript/psi/JSPrefixExpression.java    |   4 +-
 .../lang/javascript/psi/JSProperty.java       |   5 +-
 .../javascript/psi/JSReferenceExpression.java |   5 +-
 .../lang/javascript/psi/JSReferenceList.java  |   2 +-
 .../lang/javascript/psi/JSStatement.java      |   2 +-
 .../javascript/psi/JSSuppressionHolder.java   |   2 +-
 .../psi/JSUseNamespaceDirective.java          |   2 +-
 .../lang/javascript/psi/JSVarStatement.java   |   2 +-
 .../lang/javascript/psi/JSVariable.java       |   8 +-
 .../psi/stubs/JSAttributeListStub.java        |   2 +-
 .../stubs/JSAttributeNameValuePairStub.java   |   2 +-
 .../javascript/psi/stubs/JSAttributeStub.java |   2 +-
 .../psi/stubs/JSImportStatementStub.java      |   2 +-
 .../psi/stubs/JSIncludeDirectiveStub.java     |   2 +-
 .../javascript/psi/stubs/JSQualifiedStub.java |   2 +-
 .../psi/stubs/JSReferenceListStub.java        |   2 +-
 .../javascript/psi/stubs/JSStubElement.java   |   2 +-
 .../stubs/JSUseNamespaceDirectiveStub.java    |   2 +-
 .../JavaScriptKeywordCompletionExtender.java  |   8 +-
 .../javascript/index/JavaScriptIndexer.java   |   7 +-
 .../language}/JavaScriptBundle.java           |   4 +-
 .../JavaScriptConstants.java                  |   2 +-
 .../{lang => language}/JavaScriptFeature.java |   2 +-
 .../language}/JavaScriptFileType.java         |  17 +-
 .../JavaScriptFileTypeWithVersion.java        |   8 +-
 .../JavaScriptLanguage.java                   |   9 +-
 .../JavaScriptLanguageVersion.java            |  12 +-
 .../JavaScriptVersionUtil.java                |  11 +-
 .../StandardJavaScriptVersions.java           |   4 +-
 .../psi/JavaScriptPrimitiveType.java          |   7 +-
 .../psi/JavaScriptType.java                   |   7 +-
 .../psi/JavaScriptTypeElement.java            |   3 +-
 .../stub}/JSImplementedInterfacesIndex.java   |  10 +-
 .../language/psi/stub}/JSNameIndex.java       |   8 +-
 .../psi/stub}/JSQualifiedElementIndex.java    |   8 +-
 .../language/psi/stub}/JSSuperClassIndex.java |   8 +-
 .../psi/stub}/JavaScriptIndexKeys.java        |   4 +-
 .../extension/JavaScriptModuleExtension.java  |   6 +-
 .../JavaScriptMutableModuleExtension.java     |   5 +-
 .../psi/JSSimpleLiteralExpression.java        |   6 +-
 .../JSPropertyNameReferenceProvider.java      |  16 +-
 .../javascript/psi/stubs/JSFileStub.java      |   5 +-
 base-api/src/main/java/module-info.java       |  24 ++
 .../json.svg                                  |   0
 .../as.svg                                    |   0
 .../ecmaScript.svg                            |   0
 .../javaScript.svg                            |   0
 .../json.svg                                  |   0
 .../jsx.svg                                   |   0
 .../typeScript.svg                            |   0
 ...onsulo.javascript.JavaScriptLocalize.yaml} |   0
 base-api/src/main/resources/icon/marker.txt   |   0
 base-api/src/main/resources/localize/id.txt   |   1 -
 base-impl/pom.xml                             |  24 +-
 .../documentation/JSDocumentationBuilder.java |  24 +-
 .../JSDocumentationProvider.java              |  53 ++-
 .../documentation/JSDocumentationUtils.java   |  20 +-
 .../com/intellij/lang/javascript/JSDoc.flex   |   5 +-
 .../lang/javascript/JSDocTokenTypes.java      |   6 +-
 .../lang/javascript/JSElementType.java        |   5 +-
 .../lang/javascript/JSElementTypes.java       |  21 +-
 .../lang/javascript/JSFlexAdapter.java        |   2 +-
 .../lang/javascript/JSLanguageInjector.java   |  46 +--
 .../lang/javascript/JSTokenTypes.java         |  29 +-
 .../intellij/lang/javascript/JavaScript.flex  |   4 +-
 .../JavaScriptHighlightingLexer.java          |  12 +-
 .../javascript/JavaScriptSupportLoader.java   |  18 +-
 .../javascript/flex/FlexImportSupport.java    |   8 +-
 .../lang/javascript/flex/JSResolveHelper.java |  16 +-
 .../javascript/flex/XmlBackedJSClassImpl.java |  29 +-
 .../highlighting/JSHighlighter.java           |  27 +-
 .../JavaScriptHighlightingLexer.java          |  17 +-
 .../javascript/index/JSItemPresentation.java  |  10 +-
 .../lang/javascript/index/JSSymbolUtil.java   |   4 +-
 .../javascript/index/JavaScriptIndex.java     |   4 +-
 .../inspections/qucikFixes/BaseCreateFix.java |  85 ++---
 .../CreateJSFunctionOrMethodFix.java          |  14 +-
 .../lang/javascript/parsing/JSDocParsing.java |   6 +-
 .../psi/impl/JSArgumentListImpl.java          |   6 +-
 .../impl/JSArrayLiteralExpressionImpl.java    |   4 +-
 .../psi/impl/JSAssignmentExpressionImpl.java  |   2 +-
 .../javascript/psi/impl/JSAttributeImpl.java  |  14 +-
 .../psi/impl/JSAttributeListImpl.java         |  10 +-
 .../impl/JSAttributeNameValuePairImpl.java    |  10 +-
 .../psi/impl/JSBinaryExpressionImpl.java      |  16 +-
 .../psi/impl/JSBlockStatementImpl.java        |   8 +-
 .../psi/impl/JSBreakStatementImpl.java        |   4 +-
 .../psi/impl/JSCallExpressionImpl.java        |   2 +-
 .../javascript/psi/impl/JSCaseClauseImpl.java |   2 +-
 .../javascript/psi/impl/JSCatchBlockImpl.java |  12 +-
 .../javascript/psi/impl/JSChangeUtil.java     |  39 +-
 .../lang/javascript/psi/impl/JSClassBase.java |  23 +-
 .../psi/impl/JSClassExpressionImpl.java       |   4 +-
 .../lang/javascript/psi/impl/JSClassImpl.java |  14 +-
 .../psi/impl/JSCommaExpressionImpl.java       |   2 +-
 .../psi/impl/JSConditionalExpressionImpl.java |   4 +-
 .../psi/impl/JSContinueStatementImpl.java     |   4 +-
 .../psi/impl/JSDefinitionExpressionImpl.java  |  10 +-
 .../psi/impl/JSDoWhileStatementImpl.java      |   2 +-
 .../javascript/psi/impl/JSDocCommentImpl.java |   6 +-
 .../javascript/psi/impl/JSDocTagImpl.java     |  17 +-
 .../psi/impl/JSDocTagValueImpl.java           |  10 +-
 .../javascript/psi/impl/JSElementImpl.java    |   6 +-
 .../psi/impl/JSEmbeddedContentImpl.java       |  18 +-
 .../psi/impl/JSEmptyStatementImpl.java        |   2 +-
 .../impl/JSExpressionCodeFragmentImpl.java    |  31 +-
 .../javascript/psi/impl/JSExpressionImpl.java |   9 +-
 .../psi/impl/JSExpressionStatementImpl.java   |  14 +-
 .../lang/javascript/psi/impl/JSFileImpl.java  |  20 +-
 .../psi/impl/JSForInStatementImpl.java        |  10 +-
 .../psi/impl/JSForStatementImpl.java          |   8 +-
 .../psi/impl/JSFunctionBaseImpl.java          |  19 +-
 .../psi/impl/JSFunctionExpressionImpl.java    |  10 +-
 .../javascript/psi/impl/JSFunctionImpl.java   |  12 +-
 .../psi/impl/JSFunctionPropertyImpl.java      |   6 +-
 .../psi/impl/JSGenericSignatureImpl.java      |   2 +-
 .../psi/impl/JSIfStatementImpl.java           |   2 +-
 .../psi/impl/JSImportStatementImpl.java       |  10 +-
 .../psi/impl/JSIncludeDirectiveImpl.java      |  16 +-
 ...JSIndexedPropertyAccessExpressionImpl.java |   4 +-
 .../psi/impl/JSLabeledStatementImpl.java      |   6 +-
 .../psi/impl/JSLetExpressionImpl.java         |   2 +-
 .../psi/impl/JSLetStatementImpl.java          |   2 +-
 .../psi/impl/JSLiteralExpressionImpl.java     |  16 +-
 .../psi/impl/JSNamespaceDeclarationImpl.java  |  12 +-
 .../psi/impl/JSNewExpressionImpl.java         |   6 +-
 .../impl/JSObjectLiteralExpressionImpl.java   |  10 +-
 .../psi/impl/JSPackageStatementImpl.java      |  18 +-
 .../javascript/psi/impl/JSParameterImpl.java  |  10 +-
 .../psi/impl/JSParameterListImpl.java         |   2 +-
 .../impl/JSParenthesizedExpressionImpl.java   |   2 +-
 .../psi/impl/JSPostfixExpressionImpl.java     |   6 +-
 .../psi/impl/JSPrefixExpressionImpl.java      |   8 +-
 .../javascript/psi/impl/JSPropertyImpl.java   |  24 +-
 .../javascript/psi/impl/JSPsiImplUtils.java   |  48 +--
 .../psi/impl/JSReferenceExpressionImpl.java   |  36 +-
 .../psi/impl/JSReferenceListImpl.java         |  14 +-
 .../javascript/psi/impl/JSReferenceSet.java   |  55 +--
 .../psi/impl/JSReturnStatementImpl.java       |   2 +-
 .../JSSmartCompletionVariantsHandler.java     |  20 +-
 .../javascript/psi/impl/JSStatementImpl.java  |   2 +-
 .../JSStatementWithLabelReferenceImpl.java    |  14 +-
 .../psi/impl/JSStubElementImpl.java           |  20 +-
 .../psi/impl/JSStubbedStatementImpl.java      |  10 +-
 .../psi/impl/JSSuperExpressionImpl.java       |  15 +-
 .../psi/impl/JSSwitchStatementImpl.java       |   4 +-
 .../psi/impl/JSThisExpressionImpl.java        |   2 +-
 .../psi/impl/JSThrowStatementImpl.java        |   2 +-
 .../psi/impl/JSTryStatementImpl.java          |   6 +-
 .../psi/impl/JSUseNamespaceDirectiveImpl.java |  10 +-
 .../psi/impl/JSVarStatementImpl.java          |   8 +-
 .../psi/impl/JSVariableBaseImpl.java          |  25 +-
 .../javascript/psi/impl/JSVariableImpl.java   |   7 +-
 .../psi/impl/JSWhileStatementImpl.java        |   2 +-
 .../psi/impl/JSWithStatementImpl.java         |   2 +-
 .../psi/impl/JSXmlLiteralExpressionImpl.java  |  22 +-
 .../psi/impl/JSYieldStatementImpl.java        |   2 +-
 .../javascript/psi/impl/ReferenceSupport.java |  49 +--
 .../reference/JSPropertyNameReference.java    |  10 +-
 .../psi/resolve/BaseJSSymbolProcessor.java    |  34 +-
 .../psi/resolve/JSImportHandlingUtil.java     |  32 +-
 .../JSImportedElementResolveResult.java       |   2 +-
 .../javascript/psi/resolve/JSResolveUtil.java |  88 ++---
 .../psi/resolve/ResolveProcessor.java         |  20 +-
 .../psi/resolve/VariantsProcessor.java        |  16 +-
 .../psi/resolve/WalkUpResolveProcessor.java   |  27 +-
 .../stubs/impl/JSAttributeListStubImpl.java   |   6 +-
 .../JSAttributeNameValuePairStubImpl.java     |   2 +-
 .../psi/stubs/impl/JSAttributeStubImpl.java   |   2 +-
 .../psi/stubs/impl/JSClassStubImpl.java       |   4 +-
 .../psi/stubs/impl/JSFunctionStubImpl.java    |   4 +-
 .../stubs/impl/JSImportStatementStubImpl.java |   6 +-
 .../impl/JSIncludeDirectiveStubImpl.java      |   6 +-
 .../psi/stubs/impl/JSNamedObjectStubBase.java |   8 +-
 .../impl/JSNamespaceDeclarationStubImpl.java  |   4 +-
 .../impl/JSPackageStatementStubImpl.java      |   4 +-
 .../stubs/impl/JSParameterListStubImpl.java   |   6 +-
 .../psi/stubs/impl/JSParameterStubImpl.java   |   4 +-
 .../stubs/impl/JSQualifiedObjectStubBase.java |   4 +-
 .../stubs/impl/JSReferenceListStubImpl.java   |   6 +-
 .../impl/JSUseNamespaceDirectiveStubImpl.java |   6 +-
 .../stubs/impl/JSVarStatementStubImpl.java    |   6 +-
 .../stubs/impl/JSVariableStubBaseImpl.java    |   4 +-
 .../psi/stubs/impl/JSVariableStubImpl.java    |   4 +-
 .../javascript/psi/util/JSLookupUtil.java     |  18 +-
 .../lang/javascript/psi/util/JSUtils.java     |  36 +-
 .../search/JSClassInheritorsProvider.java     |   6 +-
 .../lang/javascript/search/JSClassSearch.java |  20 +-
 .../types/JSAttributeElementType.java         |  14 +-
 .../types/JSAttributeListElementType.java     |  23 +-
 .../types/JSAttributeNameValuePairType.java   |  14 +-
 .../javascript/types/JSClassElementType.java  |  24 +-
 .../javascript/types/JSFileElementType.java   |  12 +-
 .../types/JSFunctionElementType.java          |  10 +-
 .../types/JSImportStatementElementType.java   |  14 +-
 .../types/JSIncludeDirectiveElementType.java  |  14 +-
 .../JSNamespaceDeclarationElementType.java    |  12 +-
 .../types/JSPackageStatementElementType.java  |  14 +-
 .../types/JSParameterElementType.java         |  14 +-
 .../types/JSParameterListElementType.java     |  21 +-
 .../types/JSReferenceListElementType.java     |  20 +-
 .../types/JSUseNamespaceDirectiveType.java    |  14 +-
 .../types/JSVarStatementElementType.java      |  12 +-
 .../types/JSVariableElementType.java          |  16 +-
 .../validation/JSUnusedImportsHelper.java     |  26 +-
 .../psi/impl/EcmaScript4ElementTypes.java     |   2 +-
 .../JavaScriptQuickFixFactory.java            |  34 +-
 .../ide/hightlight/JavaScriptHighlighter.java |  32 +-
 .../JavaScriptSyntaxHighlightFactory.java     |  14 +-
 .../JavaScriptSyntaxHighlightKeys.java        |  12 +-
 .../language/psi}/JSComputedNameImpl.java     |   4 +-
 .../impl/language}/psi/JSElementFactory.java  |  10 +-
 .../impl/language}/psi/JSStubElementType.java |  23 +-
 .../psi}/JavaScriptLambdaExpressionImpl.java  |  16 +-
 .../psi}/JavaScriptSpreadExpressionImpl.java  |   6 +-
 .../language/psi/stub}/JSFileStubImpl.java    |  13 +-
 .../psi/stub}/JavaScriptClassNameIndex.java   |  12 +-
 .../qucikFixes/CreateJSFunctionFixBase.java   |  20 +-
 .../lang/BaseJavaScriptLanguageVersion.java   |  13 +-
 .../lang/JavaScript15LanguageVersion.java     |  12 +-
 .../JavaScriptContextKeywordElementType.java  |   2 +-
 .../javascript/lang/JavaScriptTokenSets.java  |   2 +-
 .../lang/StandardJavaScriptVersionsImpl.java  |   7 +-
 .../lang/lexer/JavaScriptFlexAdapter.java     |   4 +-
 .../lang/lexer/JavaScriptFlexLexer.java       |   2 +-
 .../javascript/lang/lexer/javascript15.flex   |   4 +-
 .../lang/parsing/ExpressionParsing.java       |  10 +-
 .../lang/parsing/FunctionParsing.java         |   4 +-
 .../javascript/lang/parsing/JSXParser.java    |  20 +-
 .../lang/parsing/JavaScriptParser.java        |  11 +-
 .../lang/parsing/JavaScriptParserBuilder.java |   4 +-
 .../parsing/JavaScriptParsingContext.java     |   8 +-
 .../javascript/lang/parsing/Parsing.java      |   6 +-
 .../lang/parsing/StatementParsing.java        |  10 +-
 .../JavaSciptDestructuringElementImpl.java    |   2 +-
 .../JavaSciptDestructuringObjectImpl.java     |   2 +-
 .../JavaScriptDestructuringParameterImpl.java |  14 +-
 ...tDestructuringShorthandedPropertyImpl.java |   2 +-
 .../impl/JavaScriptStrictParserBuilder.java   |  20 +-
 .../impl/JSRegExpLiteralExpressionImpl.java   |   2 +-
 .../lang/psi/impl/JavaScriptClassType.java    |   4 +-
 .../BaseJavaScriptElementType.java            |   4 +-
 .../lang/psi/impl/resolve/ResolveHelper.java  |   8 +-
 .../JSFileViewProviderFactory.java            |  10 +-
 .../types/JSQualifiedStubElementType.java     |  12 +-
 base-impl/src/main/java/module-info.java      |  42 ++
 debugger/debugger-impl/pom.xml                |   4 +-
 .../javascript/JSDebuggerSupportUtils.java    |  41 +-
 .../debugger/JavaScriptEditorsProvider.java   |  14 +-
 .../JavaScriptLineBreakpointType.java         |  23 +-
 .../JavaScriptLineBreakpointTypeResolver.java |  23 +-
 .../debugger/JavaScriptListPanel.java         |  32 +-
 debugger/v8-debugger-impl/pom.xml             |   4 +-
 .../run/debug/V8BaseDebugProcess.java         |  38 +-
 .../run/debug/V8BaseVariableValue.java        |  14 +-
 .../run/debug/V8DebugEventListener.java       |  16 +-
 .../javascript/run/debug/V8DebugProcess.java  |   8 +-
 .../run/debug/V8ExecutionStack.java           |   4 +-
 .../javascript/run/debug/V8ScriptUtil.java    |  10 +-
 .../javascript/run/debug/V8StackFrame.java    |  18 +-
 .../run/debug/V8SuspendContext.java           |   5 +-
 .../javascript/run/debug/V8VariableValue.java |   4 +-
 .../javascript/run/debug/V8WatchValue.java    |   2 +-
 inspections/pom.xml                           |   6 +-
 .../com/sixrr/inspectjs/BaseInspection.java   |  62 +--
 .../inspectjs/BaseInspectionVisitor.java      |  14 +-
 .../sixrr/inspectjs/InspectionComparator.java |   2 +-
 .../sixrr/inspectjs/InspectionJSBundle.java   |   2 +-
 .../com/sixrr/inspectjs/InspectionJSFix.java  |  29 +-
 .../sixrr/inspectjs/InspectionJSPlugin.java   | 243 ------------
 .../inspectjs/JSRecursiveElementVisitor.java  |   4 +-
 .../AssignmentResultUsedJSInspection.java     |   7 +-
 ...ignmentToForLoopParameterJSInspection.java |  12 +-
 ...gnmentToFunctionParameterJSInspection.java |   9 +-
 .../NestedAssignmentJSInspection.java         |   8 +-
 ...entWithOperatorAssignmentJSInspection.java |  16 +-
 .../SillyAssignmentJSInspection.java          |  10 +-
 .../bitwise/IncompatibleMaskJSInspection.java |   8 +-
 ...ointlessBitwiseExpressionJSInspection.java |  13 +-
 .../bitwise/ShiftOutOfRangeJSInspection.java  |   4 +-
 .../bugs/DivideByZeroJSInspection.java        |   8 +-
 ...ityComparisonWithCoercionJSInspection.java |  16 +-
 .../bugs/InfiniteLoopJSInspection.java        |   6 +-
 .../bugs/InfiniteRecursionJSInspection.java   |   8 +-
 ...tCircuitBooleanExpressionJSInspection.java |  15 +-
 .../ObjectAllocationIgnoredJSInspection.java  |   6 +-
 .../sixrr/inspectjs/bugs/RecursionUtils.java  |   4 +-
 .../inspectjs/bugs/RecursionVisitor.java      |   2 +-
 ...extLabelInSwitchStatementJSInspection.java |   4 +-
 .../AnonymousFunctionJSInspection.java        |  11 +-
 .../confusing/BlockStatementJSInspection.java |   7 +-
 .../confusing/CallerJSInspection.java         |   3 +
 .../CommaExpressionJSInspection.java          |   5 +-
 .../ConditionalExpressionJSInspection.java    |   3 +
 ...usingFloatingPointLiteralJSInspection.java |  10 +-
 .../ConfusingPlusesOrMinusesJSInspection.java |   4 +-
 .../DynamicallyGeneratedCodeJSInspection.java |   5 +-
 .../EmptyStatementBodyJSInspection.java       |   3 +
 ...rementDecrementResultUsedJSInspection.java |   6 +-
 .../confusing/MagicNumberJSInspection.java    |   6 +-
 ...atedConditionalExpressionJSInspection.java |  18 +-
 .../NegatedIfStatementJSInspection.java       |  20 +-
 ...stedConditionalExpressionJSInspection.java |  10 +-
 .../confusing/NestedFunctionJSInspection.java |   7 +-
 .../confusing/OctalIntegerJSInspection.java   |   2 +
 ...mplexArithmeticExpressionJSInspection.java |   7 +-
 ...yComplexBooleanExpressionJSInspection.java |   6 +-
 ...tlessArithmeticExpressionJSInspection.java |  12 +-
 ...ointlessBooleanExpressionJSInspection.java |  12 +-
 .../confusing/VoidExpressionJSInspection.java |  10 +-
 .../confusing/WithStatementJSInspection.java  |   3 +
 .../control/BreakStatementJSInspection.java   |   5 +-
 .../BreakStatementWithLabelJSInspection.java  |   8 +-
 ...sionWithIdenticalBranchesJSInspection.java |  14 +-
 ...tantConditionalExpressionJSInspection.java |  11 +-
 .../ConstantIfStatementJSInspection.java      |  14 +-
 .../ContinueStatementJSInspection.java        |   5 +-
 ...ontinueStatementWithLabelJSInspection.java |   8 +-
 ...efaultNotLastCaseInSwitchJSInspection.java |   6 +-
 .../DuplicateConditionJSInspection.java       |   7 +-
 ...lthroughInSwitchStatementJSInspection.java |   5 +-
 ...ForLoopReplaceableByWhileJSInspection.java |  10 +-
 ...ThatDoesntUseLoopVariableJSInspection.java |   8 +-
 ...mentWithIdenticalBranchesJSInspection.java |  14 +-
 ...tementWithTooManyBranchesJSInspection.java |   4 +-
 .../control/LabeledStatementJSInspection.java |   2 +
 ...opStatementThatDoesntLoopJSInspection.java |   6 +-
 .../NestedSwitchStatementJSInspection.java    |  10 +-
 ...tementWithNoDefaultBranchJSInspection.java |   3 +
 .../control/TailRecursionJSInspection.java    |  10 +-
 .../TrivialConditionalJSInspection.java       |  14 +-
 .../control/TrivialIfJSInspection.java        |  20 +-
 .../UnnecessaryContinueJSInspection.java      |  14 +-
 .../control/UnnecessaryLabelJSInspection.java |  11 +-
 ...saryLabelOnBreakStatementJSInspection.java |  18 +-
 ...yLabelOnContinueStatementJSInspection.java |  15 +-
 .../UnnecessaryReturnJSInspection.java        |  16 +-
 .../ReuseOfLocalVariableJSInspection.java     | 360 ++++++++++--------
 .../UnnecessaryLocalVariableJSInspection.java |   9 +-
 .../dataflow/VariableAccessUtils.java         |   3 +-
 .../dataflow/VariableAssignedVisitor.java     |   4 +-
 .../VariableUsedInInnerFunctionVisitor.java   |   2 +-
 .../dataflow/VariableUsedVisitor.java         |   2 +-
 .../dom/DocumentWriteJSInspection.java        |   5 +-
 .../inspectjs/dom/InnerHTMLJSInspection.java  |   8 +-
 .../dom/PlatformDetectionJSInspection.java    |   5 +-
 .../XHTMLIncompatabilitiesJSInspection.java   |   8 +-
 .../exception/CatchParameterUsedVisitor.java  |   3 +-
 ...ueOrBreakFromFinallyBlockJSInspection.java |   6 +-
 .../EmptyCatchBlockJSInspection.java          |   7 +-
 .../EmptyFinallyBlockJSInspection.java        |   8 +-
 .../exception/EmptyTryBlockJSInspection.java  |   5 +-
 .../ExceptionCaughtLocallyJSInspection.java   |   8 +-
 .../ReturnFromFinallyBlockJSInspection.java   |   6 +-
 .../ThrowFromFinallyBlockJSInspection.java    |   2 +
 .../UnusedCatchParameterJSInspection.java     |   6 +-
 .../com/sixrr/inspectjs/fix/RenameFix.java    |  16 +-
 .../CyclomaticComplexityJSInspection.java     | 136 ++++---
 ...FunctionWithMultipleLoopsJSInspection.java |   4 +-
 ...nWithMultipleReturnPointsJSInspection.java |   5 +-
 .../functionmetrics/NegationCountVisitor.java |   2 +-
 .../NestingDepthJSInspection.java             |   4 +-
 .../ParametersPerFunctionJSInspection.java    |   8 +-
 .../StatementsPerFunctionJSInspection.java    |  11 +-
 ...ThreeNegationsPerFunctionJSInspection.java |   8 +-
 .../naming/ConventionInspection.java          |   5 +-
 .../FunctionNamingConventionJSInspection.java |  11 +-
 ...lVariableNamingConventionJSInspection.java |   8 +-
 ...ParameterNamingConventionJSInspection.java |   8 +-
 .../style/ChainedEqualityJSInspection.java    |   8 +-
 .../ChainedFunctionCallJSInspection.java      |   3 +
 ...ConstantOnLHSOfComparisonJSInspection.java |  16 +-
 ...ConstantOnRHSOfComparisonJSInspection.java |  16 +-
 .../style/NestedFunctionCallJSInspection.java |   5 +-
 .../NonBlockStatementBodyJSInspection.java    |  14 +-
 .../UnterminatedStatementJSInspection.java    |  28 +-
 .../inspectjs/ui/RegExInputVerifier.java      |   2 +-
 .../com/sixrr/inspectjs/utils/BoolUtils.java  |   2 +-
 .../inspectjs/utils/ComparisonUtils.java      |   2 +-
 .../inspectjs/utils/ControlFlowUtils.java     |   2 +-
 .../inspectjs/utils/EquivalenceChecker.java   |   6 +-
 .../sixrr/inspectjs/utils/ExpressionUtil.java |   2 +-
 .../inspectjs/utils/ParenthesesUtils.java     |   2 +-
 .../inspectjs/utils/SideEffectChecker.java    |   2 +-
 .../BadExpressionStatementJSInspection.java   |  16 +-
 .../DebuggerStatementJSInspection.java        |   8 +-
 .../DuplicateCaseLabelJSInspection.java       |   3 +
 ...DuplicatePropertyOnObjectJSInspection.java |   3 +
 ...onWithInconsistentReturnsJSInspection.java |   8 +-
 .../StringLiteralBreaksHTMLJSInspection.java  |   2 +
 ...ionReferencesGlobalObjectJSInspection.java |  11 +-
 .../validity/UnreachableCodeJSInspection.java |   8 +-
 intentions/pom.xml                            |   4 +-
 .../intention/JSElementIterator.java          |  13 +-
 .../intention/JSElementPredicate.java         |   4 +-
 .../intention/JSFunctionVisitor.java          |  10 +-
 .../javascript/intention/JSIntention.java     |  19 +-
 .../intention/JSIntentionBundle.java          |   3 +-
 .../intention/JSMutablyNamedIntention.java    |   6 +-
 .../intention/bool/ComparisonPredicate.java   |   2 +-
 .../intention/bool/ConjunctionPredicate.java  |   4 +-
 .../bool/JSDeMorgansLawIntention.java         |   8 +-
 .../bool/JSFlipComparisonIntention.java       |   6 +-
 .../bool/JSFlipConjunctionIntention.java      |   8 +-
 .../bool/JSNegateComparisonIntention.java     |   8 +-
 .../JSRemoveBooleanEqualityIntention.java     |   6 +-
 .../braces/JSAddBracesIntention.java          |   6 +-
 .../braces/JSRemoveBracesIntention.java       |   8 +-
 .../JSChangeToCStyleCommentIntention.java     |  12 +-
 .../JSChangeToEndOfLineCommentIntention.java  |  10 +-
 .../JSMoveCommentToSeparateLineIntention.java |  18 +-
 .../JSFlipConditionalIntention.java           |   4 +-
 .../conditional/JSFlipIfIntention.java        |   4 +-
 .../JSRemoveConditionalIntention.java         |   4 +-
 .../JSReplaceConditionalWithIfIntention.java  |   4 +-
 .../JSConstantExpressionIntention.java        |   6 +-
 .../JSConstantSubexpressionIntention.java     |  14 +-
 .../JSExtractIncrementIntention.java          |   6 +-
 ...DeclarationAndInitializationIntention.java |   4 +-
 ...DeclarationAndInitializationIntention.java |   6 +-
 .../JSMergeParallelForInLoopsIntention.java   |   6 +-
 .../JSMergeParallelForLoopsIntention.java     |   6 +-
 .../JSConvertIntegerToDecimalIntention.java   |   4 +-
 .../JSConvertIntegerToHexIntention.java       |   4 +-
 .../JSConvertIntegerToOctalIntention.java     |   4 +-
 .../JSReplaceMultiplyWithShiftIntention.java  |   8 +-
 .../JSReplaceShiftWithMultiplyIntention.java  |   6 +-
 ...eplaceWithOperatorAssignmentIntention.java |  10 +-
 ...RemoveUnnecessaryParenthesesIntention.java |  10 +-
 ...JSDoubleToSingleQuotedStringIntention.java |   4 +-
 ...inConcatenatedStringLiteralsIntention.java |   8 +-
 ...JSSingleToDoubleQuotedStringIntention.java |   4 +-
 .../intention/switchtoif/CaseUtil.java        |   8 +-
 .../JSReplaceIfWithSwitchIntention.java       |   8 +-
 .../JSReplaceSwitchWithIfIntention.java       |  12 +-
 .../trivialif/JSMergeElseIfIntention.java     |   4 +-
 .../trivialif/JSMergeIfAndIntention.java      |   4 +-
 .../trivialif/JSMergeIfOrIntention.java       |   4 +-
 .../JSMergeParallelIfsIntention.java          |   4 +-
 .../JSRemoveRedundantElseIntention.java       |   4 +-
 .../JSReplaceIfWithConditionalIntention.java  |   8 +-
 .../trivialif/JSSimplifyIfElseIntention.java  |   4 +-
 .../trivialif/JSSplitElseIfIntention.java     |   4 +-
 .../trivialif/JSSplitIfAndIntention.java      |   4 +-
 .../trivialif/JSSplitIfOrIntention.java       |   4 +-
 .../psiutil/BinaryOperatorUtils.java          |   2 +-
 .../lang/javascript/psiutil/BoolUtils.java    |   4 +-
 .../javascript/psiutil/ComparisonUtils.java   |   2 +-
 .../javascript/psiutil/ConditionalUtils.java  |  20 +-
 .../javascript/psiutil/ControlFlowUtils.java  |   9 +-
 .../psiutil/EquivalenceChecker.java           |   6 +-
 .../lang/javascript/psiutil/ErrorUtil.java    |   9 +-
 .../javascript/psiutil/ExpressionUtil.java    |   4 +-
 .../javascript/psiutil/FindReferenceUtil.java |  14 +-
 .../javascript/psiutil/JSElementFactory.java  | 101 +++--
 .../psiutil/JSRecursionVisitor.java           |   6 +-
 .../javascript/psiutil/ParenthesesUtils.java  |   6 +-
 .../javascript/psiutil/RecursionUtil.java     |   2 +-
 .../javascript/psiutil/SideEffectChecker.java |   2 +-
 .../lang/javascript/psiutil/TreeUtil.java     |   8 +-
 .../psiutil/VariableAccessUtil.java           |  13 +-
 lang-version-impl/actionscript-impl/pom.xml   |  25 +-
 .../actionscript/ActionScriptFileType.java    |  12 +-
 .../ActionScriptFileTypeFactory.java          |   4 +-
 .../lang/ActionScriptLanguageVersion.java     |   8 +-
 .../src/main/java/module-info.java            |  11 +
 lang-version-impl/ecmascript-impl/pom.xml     |  30 +-
 .../EcmaScript6QuickFixFactory.java           |  15 +-
 ...cmaScript6CreateJSFunctionOrMethodFix.java |   2 +-
 .../EcmaScript6KeywordCompletionExtender.java |  12 +-
 .../lang/BaseEcmaScriptJavaScriptVersion.java |  20 +-
 .../lang/EcmaScript10JavaScriptVersion.java   |   2 +-
 .../lang/EcmaScript11JavaScriptVersion.java   |   3 +-
 .../lang/EcmaScript12JavaScriptVersion.java   |   3 +-
 .../lang/EcmaScript6JavaScriptVersion.java    |   5 +-
 .../lang/EcmaScript7JavaScriptVersion.java    |   3 +-
 .../lang/EcmaScript8JavaScriptVersion.java    |   2 +-
 .../lang/EcmaScript9JavaScriptVersion.java    |   3 +-
 .../lang/EcmaScriptFileType.java              |  16 +-
 .../lang/EcmaScriptFileTypeFactory.java       |   7 +-
 .../lang/lexer/ecmascript6.flex               |   6 +-
 .../lang/lexer/ecmascript6.flex.idea          |   0
 .../parsing/EcmaScriptExpressionParsing.java  |   9 +-
 .../lang/parsing/EcmaScriptParser.java        |   7 +-
 .../parsing/EcmaScriptParsingContext.java     |   6 +-
 .../parsing/EcmaScriptStatementParsing.java   |  14 +-
 .../EcmaScriptStrictParserBuilder.java        |   4 +-
 .../psi/ES6ExportDefaultAssignment.java       |   2 +-
 .../psi/ES6ImportDeclaration.java             |   2 +-
 .../psi/ES6ImportSpecifier.java               |   4 +-
 .../psi/ES6ImportedBinding.java               |   4 +-
 .../psi/ES6NamedImports.java                  |   2 +-
 .../impl/ES6ExportDefaultAssignmentImpl.java  |  12 +-
 .../psi/impl/ES6ImportDeclarationImpl.java    |  12 +-
 .../psi/impl/ES6ImportSpecifierImpl.java      |  10 +-
 .../psi/impl/ES6ImportedBindingImpl.java      |  16 +-
 .../psi/impl/ES6NamedImportsImpl.java         |  14 +-
 .../psi/impl/EcmaScript6ElementTypes.java     |  18 +-
 .../resolve/EcmaScript6ResolveHelper.java     |  18 +-
 .../javascript/jsx/JSXFileTypeFactory.java    |   8 +-
 .../JSXTagTreeHighlightingPassFactory.java    |  22 +-
 .../JSXCreateFromTemplateHandler.java         |  17 +-
 .../javascript/jsx/language/JSXFileType.java  |  12 +-
 .../jsx/language/JSXFileTypeFactory.java      |   6 +-
 .../jsx/language/JSXJavaScriptVersion.java    |   6 +-
 .../psi/impl/JSXXmlTagManipulator.java        |  21 -
 .../language/psi/impl/JSXmlTagReference.java  |   4 +-
 .../impl/JSXmlTagReferenceContributor.java    |  17 +-
 .../src/main/java/module-info.java            |  23 ++
 lang-version-impl/ecmascript4-impl/pom.xml    |  25 +-
 .../lang/EcmaScript4JavaScriptVersion.java    |  12 +-
 .../parsing/EcmaScript4ExpressionParsing.java |  14 +-
 .../parsing/EcmaScript4FunctionParsing.java   |  10 +-
 .../lang/parsing/EcmaScript4Parser.java       |   5 +-
 .../parsing/EcmaScript4ParsingContext.java    |   7 +-
 .../parsing/EcmaScript4StatementParsing.java  |   9 +-
 .../src/main/java/module-info.java            |  11 +
 lang-version-impl/javascript16-impl/pom.xml   |  11 +-
 .../lang/JavaScript16LanguageVersion.java     |  28 +-
 .../lang/lexer/JavaScript16Lexer.java         |   6 +-
 .../lang/lexer/javascript16.flex              |   2 +-
 .../src/main/java/module-info.java            |  11 +
 lang-version-impl/javascript17-impl/pom.xml   |  11 +-
 .../lang/JavaScript17LanguageVersion.java     |  27 +-
 .../lang/lexer/JavaScript17Lexer.java         |   6 +-
 .../lang/lexer/javascript17.flex              |   2 +-
 .../src/main/java/module-info.java            |  11 +
 lang-version-impl/javascript18-impl/pom.xml   |  11 +-
 .../lang/JavaScript185LanguageVersion.java    |  28 +-
 .../lang/JavaScript18LanguageVersion.java     |  28 +-
 .../src/main/java/module-info.java            |  12 +
 .../json-javascript-impl/pom.xml              |  11 +-
 .../main/java/consulo/json/JsonFileType.java  |  10 +-
 .../consulo/json/JsonFileTypeFactory.java     |   4 +-
 .../consulo/json/jom/JomFileDescriptor.java   |   4 +-
 .../java/consulo/json/jom/JomFileElement.java |  24 +-
 .../json/jom/JomIconDescriptorUpdater.java    |   8 +-
 .../java/consulo/json/jom/JomManager.java     |  16 +-
 .../JomModeAsJsonFileDescriptorProvider.java  |   4 +-
 .../main/java/consulo/json/jom/JomUtil.java   |   7 +-
 .../jom/proxy/JomProxyInvocationHandler.java  |   2 +-
 .../json/jom/proxy/JomValueConverter.java     |  34 +-
 .../json/jom/proxy/impl/JomBooleanValue.java  |   6 +-
 .../jom/proxy/impl/JomCollectionValue.java    |   6 +-
 .../json/jom/proxy/impl/JomMapConverter.java  |   4 +-
 .../proxy/impl/JomNullableNumberValue.java    |  45 +--
 .../json/jom/proxy/impl/JomNumberValue.java   |   2 +-
 .../jom/proxy/impl/JomStringConverter.java    |   6 +-
 .../json/lang/JsonJavaScriptParser.java       |  12 +-
 .../json/lang/JsonJavaScriptVersion.java      |  21 +-
 .../consulo/json/lang/lexer/JsonLexer.java    |   7 +-
 .../JsonFileDescriptorProvider.java           |   4 +-
 .../JsonFileDescriptorProviders.java          |   8 +-
 .../completion/JsonCompletionContributor.java |  56 +--
 ...ByAnotherPsiElementEditorNotification.java |  59 ++-
 ...therPsiElementJsonDescriptionProvider.java |  10 +-
 ...escriptionByAnotherPsiElementProvider.java |   6 +-
 ...scriptionByAnotherPsiElementRegistrar.java |  28 +-
 ...DescriptionByAnotherPsiElementService.java |  51 ++-
 .../descriptor/JsonObjectDescriptor.java      |  32 +-
 .../descriptor/JsonPropertyDescriptor.java    |   6 +-
 .../PropertyValidationInspection.java         |  26 +-
 .../reference/JsonPropertyNameReference.java  |   2 +-
 .../JsonPropertyNameReferenceProvider.java    |   4 +-
 lang-version-impl/typescript-impl/pom.xml     |  11 +-
 .../typescript/TypeScriptFileType.java        |  14 +-
 .../typescript/TypeScriptFileTypeFactory.java |   4 +-
 .../version/TypeScriptLanguageVersion.java    |   6 +-
 plugin/pom.xml                                |  14 +-
 .../intellij/javascript/JSClassNameMacro.java |  24 +-
 .../JSImplementationTextSelectioner.java      |  24 +-
 .../javascript/JSMethodNameMacro.java         |  24 +-
 .../javascript/JSParameterInfoHandler.java    |  25 +-
 .../JSAbstractElementManipulator.java         |  12 +-
 .../JSAttributeNameValuePairManipulator.java  |   6 +-
 .../manipulators/JSDocTagManipulator.java     |  18 +-
 .../JSIncludeDirectiveManipulator.java        |   4 +-
 .../javascript/{ => impl}/JSNodeVisitor.java  |   8 +-
 .../{ => impl}/JSSmartEnterProcessor.java     |  47 +--
 .../{ => impl}/JavaScriptCodeContextType.java |  36 +-
 .../JavaScriptTargetElementUtilEx.java        |  12 +-
 .../{ => impl}/JavascriptCommenter.java       |  28 +-
 .../findUsages/JSReadWriteAccessDetector.java |  10 +-
 .../{ => impl}/findUsages/JSWordsScanner.java |   4 +-
 .../JavaScriptClassGroupRuleProvider.java     |   6 +-
 .../JavaScriptFindUsagesProvider.java         |  30 +-
 .../JavaScriptFunctionGroupRuleProvider.java  |   6 +-
 .../JavaScriptGroupRuleProviderBase.java      |  43 +--
 ...ImportECMAScriptClassOrFunctionAction.java |  64 ++--
 .../flex/ECMAScriptImportOptimizer.java       |  38 +-
 .../{ => impl}/flex/ImportUtils.java          |  60 ++-
 .../flex/importer/AS3InterfaceDumper.java     |   2 +-
 .../flex/importer/AS3InterfaceStubDumper.java |   6 +-
 .../{ => impl}/flex/importer/Abc.java         |   6 +-
 .../{ => impl}/flex/importer/AbcDumper.java   |   2 +-
 .../flex/importer/AbstractDumpProcessor.java  |   2 +-
 .../{ => impl}/flex/importer/ByteBuffer.java  |   2 +-
 .../FlexByteCodeInformationProcessor.java     |   2 +-
 .../flex/importer/FlexImporter.java           |   4 +-
 .../{ => impl}/flex/importer/LabelInfo.java   |   2 +-
 .../{ => impl}/flex/importer/MemberInfo.java  |   2 +-
 .../{ => impl}/flex/importer/MetaData.java    |   2 +-
 .../{ => impl}/flex/importer/MethodInfo.java  |   4 +-
 .../{ => impl}/flex/importer/Multiname.java   |   2 +-
 .../{ => impl}/flex/importer/SlotInfo.java    |   2 +-
 .../{ => impl}/flex/importer/Swf.java         |   2 +-
 .../{ => impl}/flex/importer/Traits.java      |   2 +-
 .../folding/JavaScriptFoldingBuilder.java     |  26 +-
 .../formatter/JSCodeStylePanel.form           |   2 +-
 .../formatter/JSCodeStylePanel.java           |  37 +-
 .../JSCodeStyleSettingsProvider.java          |  18 +-
 .../formatter/JSFormattingModel.java          |  18 +-
 .../formatter/JSSpacingProcessor.java         |  26 +-
 .../JavaScriptIndentOptionsProvider.java      |  16 +-
 .../JavascriptFormattingModelBuilder.java     |  33 +-
 .../{ => impl}/formatter/blocks/JSBlock.java  |  18 +-
 .../formatter/blocks/JSDocCommentBlock.java   |  18 +-
 .../formatter/blocks/SubBlockVisitor.java     |  19 +-
 .../generation/BaseJSGenerateAction.java      |  28 +-
 .../generation/BaseJSGenerateHandler.java     | 115 +++---
 .../generation/JSNamedElementNode.java        |  21 +-
 .../JavaScriptGenerateAccessorHandler.java    |  63 ++-
 .../JavaScriptGenerateConstructorAction.java  |   2 +-
 .../JavaScriptGenerateGetAccessorAction.java  |   2 +-
 ...avaScriptGenerateGetSetAccessorAction.java |   2 +-
 .../JavaScriptGenerateSetAccessorAction.java  |   2 +-
 .../JavaScriptGenerateToStringAction.java     |   2 +-
 .../JavaScriptImplementMethodsHandler.java    |  14 +-
 .../JavaScriptOverrideMethodsHandler.java     |  22 +-
 .../generation/OverrideMethodsFix.java        |   6 +-
 .../highlighting/JSBraceMatcher.java          |  18 +-
 .../JavaScriptColorsAndFontsPage.java         |  29 +-
 .../JavaScriptHighlightVisitor.java           |  42 +-
 .../JavaScriptLineMarkerProvider.java         | 179 ++++-----
 .../{ => impl}/index/predefined/Marker.java   |   2 +-
 .../inspections/CreateClassDialog.form        |   2 +-
 .../inspections/CreateClassDialog.java        |  14 +-
 .../CreateClassOrInterfaceAction.java         |  57 ++-
 .../JSDeprecatedSymbolsInspection.java        |  22 +-
 .../JSDuplicatedDeclarationInspection.java    |  35 +-
 .../{ => impl}/inspections/JSInspection.java  |  38 +-
 .../JSUndeclaredVariableInspection.java       |  51 +--
 .../JSUnresolvedFunctionInspection.java       |  60 +--
 .../JSUnresolvedVariableInspection.java       |  56 ++-
 .../JSUntypedDeclarationInspection.java       |  66 ++--
 .../JSUnusedLocalSymbolsInspection.java       |  38 +-
 .../JavaScriptGotoSuperHandler.java           |  34 +-
 .../JavaScriptSymbolContributor.java          |  36 +-
 .../refactoring/BaseIntroduceSettings.java    |   2 +-
 .../BasicJavascriptNamesValidator.java        |   4 +-
 .../JSBaseClassBasedIntroduceDialog.java      |   4 +-
 .../refactoring/JSBaseIntroduceDialog.java    |  57 ++-
 .../refactoring/JSBaseIntroduceHandler.java   |  53 +--
 .../refactoring/JSNamesValidator.java         |  10 +-
 .../JavascriptRefactoringSupportProvider.java |  32 +-
 .../JSExtractFunctionDialog.form              |   2 +-
 .../JSExtractFunctionDialog.java              |   6 +-
 .../JSExtractFunctionHandler.java             |  24 +-
 .../JSExtractFunctionSettings.java            |   2 +-
 .../JSIntroduceConstant.form                  |   2 +-
 .../JSIntroduceConstantDialog.java            |   6 +-
 .../JSIntroduceConstantHandler.java           |  31 +-
 .../JSIntroduceConstantSettings.java          |   4 +-
 .../introduceField/JSIntroduceField.form      |   2 +-
 .../JSIntroduceFieldDialog.java               |  31 +-
 .../JSIntroduceFieldHandler.java              |  34 +-
 .../JSIntroduceFieldSettings.java             |   4 +-
 .../JSIntroduceVariable.form                  |   2 +-
 .../JSIntroduceVariableDialog.java            |   8 +-
 .../JSIntroduceVariableHandler.java           |   8 +-
 .../introduceVariable/Settings.java           |   4 +-
 .../search/JSDeclarationRangeHandler.java     |  14 +-
 .../search/JSDefinitionsSearchExecutor.java   |  23 +-
 .../{ => impl}/search/JSFunctionsSearch.java  |  13 +-
 .../search/JSGotoTargetRendererProvider.java  |  20 +-
 .../search/JSReferencesSearchExecutor.java    |  28 +-
 .../JSStructureItemPresentation.java          |  10 +-
 .../JSStructureViewBuilderFactory.java        |  17 +-
 .../structureView/JSStructureViewElement.java |  18 +-
 .../structureView/JSStructureViewModel.java   |  51 ++-
 .../structureView/JSSuperGroup.java           |  10 +-
 .../structureView/JSSuperGrouper.java         |  20 +-
 .../JSExpressionSurroundDescriptor.java       |  20 +-
 .../surroundWith/JSStatementSurrounder.java   |  18 +-
 .../JSStatementsSurroundDescriptor.java       |  29 +-
 .../surroundWith/JSWithBlockSurrounder.java   |  10 +-
 .../surroundWith/JSWithDoWhileSurrounder.java |  12 +-
 .../surroundWith/JSWithForSurrounder.java     |  14 +-
 .../JSWithFunctionExpressionSurrounder.java   |  12 +-
 .../JSWithFunctionSurrounder.java             |  12 +-
 .../surroundWith/JSWithIfElseSurrounder.java  |   8 +-
 .../surroundWith/JSWithIfSurrounder.java      |  12 +-
 .../JSWithParenthesesSurrounder.java          |  18 +-
 .../JSWithTryCatchFinallySurrounder.java      |  12 +-
 .../JSWithTryCatchSurrounder.java             |   8 +-
 .../JSWithTryFinallySurrounder.java           |   8 +-
 .../surroundWith/JSWithWhileSurrounder.java   |  12 +-
 .../surroundWith/JSWithWithSurrounder.java    |  12 +-
 .../validation/BaseCreateMethodsFix.java      |  21 +-
 .../validation/ImplementMethodsFix.java       |  12 +-
 .../ImplementedMethodProcessor.java           |  20 +-
 .../validation/JSAnnotatingVisitor.java       |  67 ++--
 .../inspections/JSInspectionToolProvider.java |  39 --
 .../JavaScriptIconDescriptorUpdater.java      |  20 +-
 .../UpdateJavaScriptFileCopyright.java        |  18 +-
 ...UpdateJavaScriptFileCopyrightProvider.java |  30 +-
 .../JavaScriptFindUsagesHandlerFactory.java   |  10 +-
 .../JavaScriptCodeStyleConfigurable.java      |   8 +-
 .../formatter/JavaScriptCodeStylePanel.java   |  10 +-
 ...riptLanguageCodeStyleSettingsProvider.java |  20 +-
 .../actions/JavaScriptCreateFileAction.java   |  32 +-
 ...avaScriptKeywordCompletionContributor.java |  21 +-
 .../ide/completion/SpaceInsertHandler.java    |  10 +-
 .../JavaScriptNavBarModelExtension.java       |  14 +-
 .../lang/JavaScriptFileTypeFactory.java       |  10 +-
 .../lang/JavaScriptLanguageVersionPusher.java |  34 +-
 .../JavaScriptLanguageVersionResolver.java    |  34 +-
 .../lang/JavaScriptParsingDefinition.java     |  37 +-
 .../lang/JavaScriptQuoteHandler.java          |  16 +-
 .../JavaScriptClassContributor.java           |  18 +-
 .../lang/psi/JavaScriptSimpleType.java        |   5 +-
 .../JavaScriptRegExpLiteralLanguageHost.java  |   4 +-
 .../JavaScriptRegexpMultiHostInjector.java    |  14 +-
 ...efaultJSPropertyNameReferenceProvider.java |  14 +-
 plugin/src/main/java/module-info.java         |  53 +++
 plugin/src/main/resources/META-INF/ecma4.xml  |   2 +-
 plugin/src/main/resources/META-INF/ecma6.xml  |  20 +-
 plugin/src/main/resources/META-INF/json.xml   |   1 -
 plugin/src/main/resources/META-INF/jsx.xml    |  16 -
 plugin/src/main/resources/META-INF/plugin.xml | 130 +++----
 plugin/src/main/resources/META-INF/regexp.xml |   4 +-
 pom.xml                                       |  16 +-
 web-browser-impl/pom.xml                      |  11 +-
 .../ClientJavaScriptModuleExtension.java      |  44 +--
 .../ClientJavaScriptModuleExtensionPanel.java |  15 +-
 ...lientJavaScriptMutableModuleExtension.java |  14 +-
 ...ntJavaScriptPredefinedBundlesProvider.java |  26 +-
 .../module/sdk/ClientJavaScriptSdkType.java   |  20 +-
 762 files changed, 5193 insertions(+), 5177 deletions(-)
 rename base-api/src/main/java/{com/intellij/lang/javascript => consulo/javascript/language}/JavaScriptBundle.java (93%)
 rename base-api/src/main/java/consulo/javascript/{lang => language}/JavaScriptConstants.java (77%)
 rename base-api/src/main/java/consulo/javascript/{lang => language}/JavaScriptFeature.java (97%)
 rename base-api/src/main/java/{com/intellij/lang/javascript => consulo/javascript/language}/JavaScriptFileType.java (81%)
 rename base-api/src/main/java/consulo/javascript/{lang => language}/JavaScriptFileTypeWithVersion.java (85%)
 rename base-api/src/main/java/consulo/javascript/{lang => language}/JavaScriptLanguage.java (88%)
 rename base-api/src/main/java/consulo/javascript/{lang => language}/JavaScriptLanguageVersion.java (69%)
 rename base-api/src/main/java/consulo/javascript/{lang => language}/JavaScriptVersionUtil.java (90%)
 rename base-api/src/main/java/consulo/javascript/{lang => language}/StandardJavaScriptVersions.java (93%)
 rename {base-impl/src/main/java/consulo/javascript/lang => base-api/src/main/java/consulo/javascript/language}/psi/JavaScriptPrimitiveType.java (95%)
 rename base-api/src/main/java/consulo/javascript/{lang => language}/psi/JavaScriptType.java (93%)
 rename base-api/src/main/java/consulo/javascript/{lang => language}/psi/JavaScriptTypeElement.java (89%)
 rename {base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs => base-api/src/main/java/consulo/javascript/language/psi/stub}/JSImplementedInterfacesIndex.java (81%)
 rename {base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs => base-api/src/main/java/consulo/javascript/language/psi/stub}/JSNameIndex.java (81%)
 rename {base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs => base-api/src/main/java/consulo/javascript/language/psi/stub}/JSQualifiedElementIndex.java (81%)
 rename {base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs => base-api/src/main/java/consulo/javascript/language/psi/stub}/JSSuperClassIndex.java (80%)
 rename {base-impl/src/main/java/consulo/javascript/lang/psi/stubs => base-api/src/main/java/consulo/javascript/language/psi/stub}/JavaScriptIndexKeys.java (93%)
 create mode 100644 base-api/src/main/java/module-info.java
 rename base-api/src/main/resources/{icon/_dark => ICON-LIB/dark}/consulo.javascript.JavaScriptIconGroup/json.svg (100%)
 rename base-api/src/main/resources/{icon/_light => ICON-LIB/light}/consulo.javascript.JavaScriptIconGroup/as.svg (100%)
 rename base-api/src/main/resources/{icon/_light => ICON-LIB/light}/consulo.javascript.JavaScriptIconGroup/ecmaScript.svg (100%)
 rename base-api/src/main/resources/{icon/_light => ICON-LIB/light}/consulo.javascript.JavaScriptIconGroup/javaScript.svg (100%)
 rename base-api/src/main/resources/{icon/_light => ICON-LIB/light}/consulo.javascript.JavaScriptIconGroup/json.svg (100%)
 rename base-api/src/main/resources/{icon/_light => ICON-LIB/light}/consulo.javascript.JavaScriptIconGroup/jsx.svg (100%)
 rename base-api/src/main/resources/{icon/_light => ICON-LIB/light}/consulo.javascript.JavaScriptIconGroup/typeScript.svg (100%)
 rename base-api/src/main/resources/{localize/consulo/javascript/JavaScriptLocalize.yaml => LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml} (100%)
 delete mode 100644 base-api/src/main/resources/icon/marker.txt
 delete mode 100644 base-api/src/main/resources/localize/id.txt
 rename {plugin => base-impl}/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java (62%)
 rename base-impl/src/main/java/consulo/javascript/{psi/impl => impl/language/psi}/JSComputedNameImpl.java (93%)
 rename base-impl/src/main/java/{com/intellij/lang/javascript => consulo/javascript/impl/language}/psi/JSElementFactory.java (87%)
 rename base-impl/src/main/java/{com/intellij/lang/javascript => consulo/javascript/impl/language}/psi/JSStubElementType.java (72%)
 rename base-impl/src/main/java/consulo/javascript/{psi/impl => impl/language/psi}/JavaScriptLambdaExpressionImpl.java (89%)
 rename base-impl/src/main/java/consulo/javascript/{psi/impl => impl/language/psi}/JavaScriptSpreadExpressionImpl.java (87%)
 rename base-impl/src/main/java/consulo/javascript/{psi/stubs/impl => impl/language/psi/stub}/JSFileStubImpl.java (80%)
 rename base-impl/src/main/java/consulo/javascript/{psi/stubs/index => impl/language/psi/stub}/JavaScriptClassNameIndex.java (80%)
 create mode 100644 base-impl/src/main/java/module-info.java
 delete mode 100644 inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
 create mode 100644 lang-version-impl/actionscript-impl/src/main/java/module-info.java
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ide => ecmascript}/codeInsight/EcmaScript6QuickFixFactory.java (65%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ide => ecmascript}/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java (93%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/completion/EcmaScript6KeywordCompletionExtender.java (58%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/BaseEcmaScriptJavaScriptVersion.java (69%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/EcmaScript10JavaScriptVersion.java (90%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/EcmaScript11JavaScriptVersion.java (83%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/EcmaScript12JavaScriptVersion.java (85%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/EcmaScript6JavaScriptVersion.java (88%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/EcmaScript7JavaScriptVersion.java (83%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/EcmaScript8JavaScriptVersion.java (90%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/EcmaScript9JavaScriptVersion.java (82%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/EcmaScriptFileType.java (82%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/EcmaScriptFileTypeFactory.java (63%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/lexer/ecmascript6.flex (99%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/lexer/ecmascript6.flex.idea (100%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/parsing/EcmaScriptExpressionParsing.java (96%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/parsing/EcmaScriptParser.java (78%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/parsing/EcmaScriptParsingContext.java (81%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/parsing/EcmaScriptStatementParsing.java (96%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ => ecmascript}/lang/parsing/EcmaScriptStrictParserBuilder.java (88%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/ES6ExportDefaultAssignment.java (79%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/ES6ImportDeclaration.java (82%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/ES6ImportSpecifier.java (70%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/ES6ImportedBinding.java (82%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/ES6NamedImports.java (89%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/impl/ES6ExportDefaultAssignmentImpl.java (78%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/impl/ES6ImportDeclarationImpl.java (73%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/impl/ES6ImportSpecifierImpl.java (79%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/impl/ES6ImportedBindingImpl.java (81%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/impl/ES6NamedImportsImpl.java (73%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/impl/EcmaScript6ElementTypes.java (66%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/{ecmascript6 => ecmascript}/psi/impl/resolve/EcmaScript6ResolveHelper.java (85%)
 rename lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/{daemon/impl/tagTreeHighlighting => }/JSXTagTreeHighlightingPassFactory.java (56%)
 delete mode 100644 lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java
 create mode 100644 lang-version-impl/ecmascript-impl/src/main/java/module-info.java
 rename lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/{ => ecmascript4}/lang/EcmaScript4JavaScriptVersion.java (69%)
 rename lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/{ => ecmascript4}/lang/parsing/EcmaScript4ExpressionParsing.java (92%)
 rename lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/{ => ecmascript4}/lang/parsing/EcmaScript4FunctionParsing.java (93%)
 rename lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/{ => ecmascript4}/lang/parsing/EcmaScript4Parser.java (60%)
 rename lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/{ => ecmascript4}/lang/parsing/EcmaScript4ParsingContext.java (65%)
 rename lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/{ => ecmascript4}/lang/parsing/EcmaScript4StatementParsing.java (98%)
 create mode 100644 lang-version-impl/ecmascript4-impl/src/main/java/module-info.java
 rename lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/{ => javascript16}/lang/JavaScript16LanguageVersion.java (72%)
 rename lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/{ => javascript16}/lang/lexer/JavaScript16Lexer.java (99%)
 rename lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/{ => javascript16}/lang/lexer/javascript16.flex (99%)
 create mode 100644 lang-version-impl/javascript16-impl/src/main/java/module-info.java
 rename lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/{ => javascript17}/lang/JavaScript17LanguageVersion.java (72%)
 rename lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/{ => javascript17}/lang/lexer/JavaScript17Lexer.java (99%)
 rename lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/{ => javascript17}/lang/lexer/javascript17.flex (99%)
 create mode 100644 lang-version-impl/javascript17-impl/src/main/java/module-info.java
 rename lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/{ => javascript18}/lang/JavaScript185LanguageVersion.java (72%)
 rename lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/{ => javascript18}/lang/JavaScript18LanguageVersion.java (72%)
 create mode 100644 lang-version-impl/javascript18-impl/src/main/java/module-info.java
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/JSNodeVisitor.java (97%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/JSSmartEnterProcessor.java (83%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/JavaScriptCodeContextType.java (69%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/JavaScriptTargetElementUtilEx.java (79%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/JavascriptCommenter.java (78%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/findUsages/JSReadWriteAccessDetector.java (92%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/findUsages/JSWordsScanner.java (91%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/findUsages/JavaScriptClassGroupRuleProvider.java (92%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/findUsages/JavaScriptFindUsagesProvider.java (75%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/findUsages/JavaScriptFunctionGroupRuleProvider.java (91%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/findUsages/JavaScriptGroupRuleProviderBase.java (81%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/AddImportECMAScriptClassOrFunctionAction.java (83%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/ECMAScriptImportOptimizer.java (92%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/ImportUtils.java (90%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/AS3InterfaceDumper.java (99%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/AS3InterfaceStubDumper.java (97%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/Abc.java (99%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/AbcDumper.java (98%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/AbstractDumpProcessor.java (99%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/ByteBuffer.java (98%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/FlexByteCodeInformationProcessor.java (97%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/FlexImporter.java (97%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/LabelInfo.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/MemberInfo.java (96%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/MetaData.java (93%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/MethodInfo.java (98%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/Multiname.java (97%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/SlotInfo.java (96%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/Swf.java (99%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/flex/importer/Traits.java (96%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/folding/JavaScriptFoldingBuilder.java (90%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/JSCodeStylePanel.form (98%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/JSCodeStylePanel.java (87%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/JSCodeStyleSettingsProvider.java (72%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/JSFormattingModel.java (78%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/JSSpacingProcessor.java (97%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/JavaScriptIndentOptionsProvider.java (72%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/JavascriptFormattingModelBuilder.java (60%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/blocks/JSBlock.java (91%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/blocks/JSDocCommentBlock.java (83%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/formatter/blocks/SubBlockVisitor.java (96%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/BaseJSGenerateAction.java (78%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/BaseJSGenerateHandler.java (58%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/JSNamedElementNode.java (80%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/JavaScriptGenerateAccessorHandler.java (90%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/JavaScriptGenerateConstructorAction.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/JavaScriptGenerateGetAccessorAction.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/JavaScriptGenerateGetSetAccessorAction.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/JavaScriptGenerateSetAccessorAction.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/JavaScriptGenerateToStringAction.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/JavaScriptImplementMethodsHandler.java (79%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/JavaScriptOverrideMethodsHandler.java (88%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/generation/OverrideMethodsFix.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/highlighting/JSBraceMatcher.java (82%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/highlighting/JavaScriptColorsAndFontsPage.java (93%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/highlighting/JavaScriptHighlightVisitor.java (91%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/highlighting/JavaScriptLineMarkerProvider.java (79%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/index/predefined/Marker.java (92%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/CreateClassDialog.form (96%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/CreateClassDialog.java (89%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/CreateClassOrInterfaceAction.java (78%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/JSDeprecatedSymbolsInspection.java (84%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/JSDuplicatedDeclarationInspection.java (90%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/JSInspection.java (72%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/JSUndeclaredVariableInspection.java (88%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/JSUnresolvedFunctionInspection.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/JSUnresolvedVariableInspection.java (92%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/JSUntypedDeclarationInspection.java (72%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/inspections/JSUnusedLocalSymbolsInspection.java (93%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/navigation/JavaScriptGotoSuperHandler.java (75%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/navigation/JavaScriptSymbolContributor.java (73%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/BaseIntroduceSettings.java (93%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/BasicJavascriptNamesValidator.java (85%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/JSBaseClassBasedIntroduceDialog.java (96%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/JSBaseIntroduceDialog.java (86%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/JSBaseIntroduceHandler.java (91%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/JSNamesValidator.java (87%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/JavascriptRefactoringSupportProvider.java (61%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/extractMethod/JSExtractFunctionDialog.form (93%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/extractMethod/JSExtractFunctionDialog.java (88%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/extractMethod/JSExtractFunctionHandler.java (79%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/extractMethod/JSExtractFunctionSettings.java (90%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceConstant/JSIntroduceConstant.form (97%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceConstant/JSIntroduceConstantDialog.java (92%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceConstant/JSIntroduceConstantHandler.java (80%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceConstant/JSIntroduceConstantSettings.java (84%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceField/JSIntroduceField.form (98%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceField/JSIntroduceFieldDialog.java (83%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceField/JSIntroduceFieldHandler.java (83%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceField/JSIntroduceFieldSettings.java (86%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceVariable/JSIntroduceVariable.form (97%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceVariable/JSIntroduceVariableDialog.java (92%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceVariable/JSIntroduceVariableHandler.java (86%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/refactoring/introduceVariable/Settings.java (83%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/search/JSDeclarationRangeHandler.java (84%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/search/JSDefinitionsSearchExecutor.java (87%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/search/JSFunctionsSearch.java (91%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/search/JSGotoTargetRendererProvider.java (75%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/search/JSReferencesSearchExecutor.java (74%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/structureView/JSStructureItemPresentation.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/structureView/JSStructureViewBuilderFactory.java (68%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/structureView/JSStructureViewElement.java (96%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/structureView/JSStructureViewModel.java (87%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/structureView/JSSuperGroup.java (85%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/structureView/JSSuperGrouper.java (85%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSExpressionSurroundDescriptor.java (84%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSStatementSurrounder.java (84%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSStatementsSurroundDescriptor.java (89%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithBlockSurrounder.java (86%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithDoWhileSurrounder.java (85%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithForSurrounder.java (86%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithFunctionExpressionSurrounder.java (88%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithFunctionSurrounder.java (85%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithIfElseSurrounder.java (85%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithIfSurrounder.java (86%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithParenthesesSurrounder.java (81%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithTryCatchFinallySurrounder.java (90%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithTryCatchSurrounder.java (86%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithTryFinallySurrounder.java (85%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithWhileSurrounder.java (85%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/surroundWith/JSWithWithSurrounder.java (86%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/validation/BaseCreateMethodsFix.java (94%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/validation/ImplementMethodsFix.java (90%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/validation/ImplementedMethodProcessor.java (93%)
 rename plugin/src/main/java/com/intellij/lang/javascript/{ => impl}/validation/JSAnnotatingVisitor.java (96%)
 delete mode 100644 plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java
 rename plugin/src/main/java/consulo/javascript/{ide => impl}/JavaScriptIconDescriptorUpdater.java (92%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/copyright/UpdateJavaScriptFileCopyright.java (79%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/copyright/UpdateJavaScriptFileCopyrightProvider.java (53%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/findUsages/JavaScriptFindUsagesHandlerFactory.java (71%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/formatter/JavaScriptCodeStyleConfigurable.java (71%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/formatter/JavaScriptCodeStylePanel.java (60%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java (86%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/ide/actions/JavaScriptCreateFileAction.java (66%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/ide/completion/JavaScriptKeywordCompletionContributor.java (79%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/ide/completion/SpaceInsertHandler.java (78%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/ide/navigationToolbar/JavaScriptNavBarModelExtension.java (58%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/lang/JavaScriptFileTypeFactory.java (75%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/lang/JavaScriptLanguageVersionPusher.java (82%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/lang/JavaScriptLanguageVersionResolver.java (73%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/lang/JavaScriptParsingDefinition.java (73%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/lang/JavaScriptQuoteHandler.java (84%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/lang/navigation/JavaScriptClassContributor.java (79%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/lang/psi/JavaScriptSimpleType.java (90%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java (92%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java (78%)
 rename plugin/src/main/java/consulo/javascript/{ => impl}/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java (85%)
 create mode 100644 plugin/src/main/java/module-info.java

diff --git a/base-api/pom.xml b/base-api/pom.xml
index 372b3ee1..475c94c3 100644
--- a/base-api/pom.xml
+++ b/base-api/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-base.api</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -45,7 +45,6 @@
 			<plugin>
 				<groupId>consulo.maven</groupId>
 				<artifactId>maven-consulo-plugin</artifactId>
-				<version>2-SNAPSHOT</version>
 				<extensions>true</extensions>
 				<executions>
 					<execution>
@@ -62,11 +61,5 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java b/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
index a742a459..bc71236b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.formatter;
 
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
+import consulo.language.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.CustomCodeStyleSettings;
 
 /**
  * @author Maxim.Mossienko
@@ -34,7 +34,7 @@ public class JSCodeStyleSettings extends CustomCodeStyleSettings
 	public static final int DO_NOT_INDENT = 0;
 	public static final int INDENT = 1;
 
-	protected JSCodeStyleSettings(CodeStyleSettings container)
+	public JSCodeStyleSettings(CodeStyleSettings container)
 	{
 		super("JSCodeStyleSettings", container);
 	}
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
index beb3cb24..9d3baef7 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
@@ -19,9 +19,9 @@
 import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.StubBasedPsiElement;
-import com.intellij.util.ArrayFactory;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.StubBasedPsiElement;
+import consulo.util.collection.ArrayFactory;
 
 /**
  * @author  Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
index b0c46774..acfcd11e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
@@ -20,8 +20,8 @@
 import javax.annotation.Nullable;
 
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
index eb6ba92e..f20c33d5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
@@ -16,8 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nullable;
-import com.intellij.psi.PsiElement;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
index e2c2f4bc..426f6c43 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
@@ -18,8 +18,8 @@
 
 import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
index 580dbe04..b88ac07b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nullable;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
index 78944358..65524958 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
@@ -18,8 +18,8 @@
 
 import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
-import com.intellij.pom.Navigatable;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.StubBasedPsiElement;
+import consulo.navigation.Navigatable;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
index 0baeecbf..7647a5ad 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.psi.PsiComment;
+import consulo.language.psi.PsiComment;
 
 public interface JSDocComment extends PsiComment, JSElement
 {
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
index 8454225c..49983e35 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import javax.annotation.Nullable;
-import com.intellij.psi.PsiNamedElement;
+import consulo.language.psi.PsiNamedElement;
 
 public interface JSDocTag extends PsiNamedElement, JSElement
 {
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
index fe3cb1b3..0057fb5a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.psi.NavigatablePsiElement;
+import consulo.language.psi.NavigatablePsiElement;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
index e06c5a30..431c5a53 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.psi.PsiElementVisitor;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
+import consulo.language.psi.PsiElementVisitor;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
index a778b09a..b327d842 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.util.ArrayFactory;
+import consulo.util.collection.ArrayFactory;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
index 51c22d52..90322d0f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @author nik
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index 6a1da9e4..efc6ae17 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -16,10 +16,10 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.util.ArrayFactory;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.util.collection.ArrayFactory;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
index 3b2f395c..c72e83f5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
@@ -17,9 +17,9 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
-import com.intellij.psi.StubBasedPsiElement;
 import consulo.annotation.DeprecationInfo;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
index 5970cf14..ac89c7b5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
@@ -17,8 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSIncludeDirectiveStub;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
index 43efe620..366347cf 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiNameIdentifierOwner;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiNameIdentifierOwner;
 import consulo.annotation.DeprecationInfo;
 
 /**
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
index 99f2fd52..177b4a7f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.navigation.NavigationItem;
-import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiNamedElement;
+import consulo.language.psi.PsiNameIdentifierOwner;
+import consulo.language.psi.PsiNamedElement;
+import consulo.navigation.NavigationItem;
 
 /**
  * @author ven
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
index 59e0cf1b..febe96ef 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSNamespaceDeclarationStub;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
index 139ab84a..67915d20 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSPackageStatementStub;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
index c19bcdb3..867f248f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.util.ArrayFactory;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.PsiElement;
+import consulo.util.collection.ArrayFactory;
 
 import javax.annotation.Nullable;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
index 2eaa847b..25b316af 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSParameterListStub;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
index 7ce81739..7ca495e2 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import javax.annotation.Nullable;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
index 4b0ffce8..16449e30 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
@@ -18,8 +18,8 @@
 
 import javax.annotation.Nullable;
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
index 00305cfd..0081bfe1 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
@@ -19,10 +19,11 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.psi.PsiElement;
+
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.psi.JSComputedName;
+import consulo.language.psi.PsiElement;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
index 0e565e0c..8915e3ba 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
@@ -16,9 +16,10 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiPolyVariantReference;
+
 import javax.annotation.Nullable;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiPolyVariantReference;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
index a90b5400..9a904362 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
@@ -20,7 +20,7 @@
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
index 5cd24c8e..032ba45c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
index e37ef31c..1ea1c297 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
 
 /**
  * Marker interface for elements which can hold suppression comments.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
index 0b29d209..e8b4d3fe 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSUseNamespaceDirectiveStub;
-import com.intellij.psi.StubBasedPsiElement;
+import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
index 2d2b79a8..9959741c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
@@ -17,8 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
-import com.intellij.psi.StubBasedPsiElement;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.StubBasedPsiElement;
 
 import javax.annotation.Nullable;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index cfca1a58..6f26c7ec 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -16,12 +16,10 @@
 
 package com.intellij.lang.javascript.psi;
 
-import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
-import com.intellij.psi.StubBasedPsiElement;
-import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.language.util.IncorrectOperationException;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
index 8375dd88..4ce4f77c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
index 9edba051..ac09849b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
@@ -18,7 +18,7 @@
 
 import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
index ef007a19..75ec2498 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import com.intellij.lang.javascript.psi.JSAttribute;
-import com.intellij.psi.stubs.NamedStub;
+import consulo.language.psi.stub.NamedStub;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
index a264f59d..0d2b74bf 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import com.intellij.lang.javascript.psi.JSImportStatement;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
index a22be001..ec6f07e3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import com.intellij.lang.javascript.psi.JSIncludeDirective;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
index 42946602..7dcc5be5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
-import com.intellij.psi.stubs.NamedStub;
+import consulo.language.psi.stub.NamedStub;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
index 6a178ef9..a281cc83 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
index 302dfb99..6ca330de 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
index ea725c34..99714fcb 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.stubs;
 
 import com.intellij.lang.javascript.psi.JSUseNamespaceDirective;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
index fb4fd8bc..ff6eeb5b 100644
--- a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
+++ b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
@@ -1,9 +1,9 @@
 package consulo.javascript.ide.completion;
 
-import com.intellij.codeInsight.completion.CompletionParameters;
-import com.intellij.codeInsight.completion.CompletionResultSet;
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.util.ProcessingContext;
+import consulo.component.extension.ExtensionPointName;
+import consulo.language.editor.completion.CompletionParameters;
+import consulo.language.editor.completion.CompletionResultSet;
+import consulo.language.util.ProcessingContext;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
index 0047f001..a203956a 100644
--- a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
+++ b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
@@ -1,11 +1,10 @@
 package consulo.javascript.index;
 
-import javax.annotation.Nonnull;
-
+import consulo.component.extension.ExtensionPointName;
 import consulo.javascript.psi.stubs.JSFileStub;
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.psi.stubs.IndexSink;
+import consulo.language.psi.stub.IndexSink;
 
+import javax.annotation.Nonnull;
 /**
  * @author VISTALL
  * @since 19.07.2015
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java
similarity index 93%
rename from base-api/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java
rename to base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java
index 99a1b6e6..f2196d68 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptBundle.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript;
+package consulo.javascript.language;
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.PropertyKey;
-import com.intellij.AbstractBundle;
+import consulo.component.util.localize.AbstractBundle;
 
 public class JavaScriptBundle extends AbstractBundle
 {
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptConstants.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java
similarity index 77%
rename from base-api/src/main/java/consulo/javascript/lang/JavaScriptConstants.java
rename to base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java
index 02eef68c..2362dcdb 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptConstants.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java
@@ -1,4 +1,4 @@
-package consulo.javascript.lang;
+package consulo.javascript.language;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
similarity index 97%
rename from base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
rename to base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
index 42ef2c19..d731ae7e 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFeature.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.language;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
similarity index 81%
rename from base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
rename to base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
index 500fc5a4..af2fa996 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/JavaScriptFileType.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
@@ -14,22 +14,19 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript;
+package consulo.javascript.language;
 
-import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.vfs.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.icon.JavaScriptIconGroup;
-import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.javascript.lang.StandardJavaScriptVersions;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
-import consulo.lang.LanguageVersion;
+import consulo.language.file.LanguageFileType;
+import consulo.language.util.ModuleUtilCore;
+import consulo.language.version.LanguageVersion;
 import consulo.localize.LocalizeValue;
+import consulo.module.Module;
 import consulo.ui.image.Image;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -72,7 +69,7 @@ public String getDefaultExtension()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIconGroup.javaScript();
+		return JavaScriptIconGroup.javascript();
 	}
 
 	@RequiredReadAction
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
similarity index 85%
rename from base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
rename to base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
index 7c179932..69966243 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptFileTypeWithVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.language;
 
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.vfs.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.lang.LanguageVersion;
+import consulo.language.version.LanguageVersion;
+import consulo.module.Module;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
similarity index 88%
rename from base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
rename to base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
index e7671c28..361f758b 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguage.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.language;
 
-import com.intellij.lang.Language;
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.openapi.fileTypes.LanguageFileType;
-import consulo.lang.LanguageVersion;
+import consulo.language.Language;
+import consulo.language.file.LanguageFileType;
+import consulo.language.version.LanguageVersion;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
similarity index 69%
rename from base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java
rename to base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
index daefc66b..2306826a 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
@@ -1,12 +1,12 @@
-package consulo.javascript.lang;
+package consulo.javascript.language;
 
-import java.util.Set;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.language.Language;
+import consulo.language.version.LanguageVersion;
+import consulo.language.version.LanguageVersionWithParsing;
 
 import javax.annotation.Nonnull;
-
-import com.intellij.lang.Language;
-import consulo.lang.LanguageVersion;
-import consulo.lang.LanguageVersionWithParsing;
+import java.util.Set;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
similarity index 90%
rename from base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
rename to base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
index 007d2d92..737c24a0 100644
--- a/base-api/src/main/java/consulo/javascript/lang/JavaScriptVersionUtil.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.language;
 
-import java.util.Collections;
-import java.util.Set;
+import consulo.language.psi.PsiElement;
+import consulo.language.version.LanguageVersion;
 
 import javax.annotation.Nonnull;
-
-import consulo.lang.LanguageVersion;
-import com.intellij.psi.PsiElement;
+import java.util.Collections;
+import java.util.Set;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
similarity index 93%
rename from base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
rename to base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
index 4f696aea..cda3d985 100644
--- a/base-api/src/main/java/consulo/javascript/lang/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.language;
 
-import com.intellij.openapi.components.ServiceManager;
+import consulo.ide.ServiceManager;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
similarity index 95%
rename from base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
rename to base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
index 9604556a..001cf1d8 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/JavaScriptPrimitiveType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.psi;
+package consulo.javascript.language.psi;
+
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotation.access.RequiredReadAction;
-import com.intellij.psi.PsiElement;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
similarity index 93%
rename from base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
rename to base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
index f3d667fd..874d4897 100644
--- a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.psi;
+package consulo.javascript.language.psi;
+
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.annotation.access.RequiredReadAction;
-import com.intellij.psi.PsiElement;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
similarity index 89%
rename from base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
rename to base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
index 454d0b0e..4a14b3e1 100644
--- a/base-api/src/main/java/consulo/javascript/lang/psi/JavaScriptTypeElement.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.psi;
+package consulo.javascript.language.psi;
 
 import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSElement;
+import consulo.javascript.language.psi.JavaScriptType;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
similarity index 81%
rename from base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
rename to base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
index 48cf6ca2..74766743 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImplementedInterfacesIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.psi.stubs;
+package consulo.javascript.language.psi.stub;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.psi.stubs.StringStubIndexExtension;
-import com.intellij.psi.stubs.StubIndexKey;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.language.psi.stub.StringStubIndexExtension;
+import consulo.language.psi.stub.StubIndexKey;
+
+import javax.annotation.Nonnull;
 
 public class JSImplementedInterfacesIndex extends StringStubIndexExtension<JSReferenceList>
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
similarity index 81%
rename from base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
rename to base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
index 2985b164..ef4d434f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNameIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
@@ -17,13 +17,13 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.psi.stubs;
+package consulo.javascript.language.psi.stub;
 
 import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
-import com.intellij.psi.stubs.StringStubIndexExtension;
-import com.intellij.psi.stubs.StubIndexKey;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.language.psi.stub.StringStubIndexExtension;
+import consulo.language.psi.stub.StubIndexKey;
 
 public class JSNameIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
similarity index 81%
rename from base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
rename to base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
index f0ea3d69..9f5b525e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedElementIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
@@ -17,14 +17,14 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.psi.stubs;
+package consulo.javascript.language.psi.stub;
 
 import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
-import com.intellij.psi.stubs.StringStubIndexExtension;
-import com.intellij.psi.stubs.StubIndexKey;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.language.psi.stub.StringStubIndexExtension;
+import consulo.language.psi.stub.StubIndexKey;
 
 public class JSQualifiedElementIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
similarity index 80%
rename from base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
rename to base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
index 28da1f31..3b5e21b1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/JSSuperClassIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.psi.stubs;
+package consulo.javascript.language.psi.stub;
 
 import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.psi.stubs.StringStubIndexExtension;
-import com.intellij.psi.stubs.StubIndexKey;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.language.psi.stub.StringStubIndexExtension;
+import consulo.language.psi.stub.StubIndexKey;
 
 public class JSSuperClassIndex extends StringStubIndexExtension<JSReferenceList>
 {
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java
similarity index 93%
rename from base-impl/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
rename to base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java
index af555a05..6e77c901 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/stubs/JavaScriptIndexKeys.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.psi.stubs;
+package consulo.javascript.language.psi.stub;
 
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.psi.stubs.StubIndexKey;
+import consulo.language.psi.stub.StubIndexKey;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
index 112d5c1f..c4a9e02c 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
@@ -1,10 +1,10 @@
 package consulo.javascript.module.extension;
 
-import javax.annotation.Nonnull;
-
-import consulo.lang.LanguageVersion;
+import consulo.language.version.LanguageVersion;
 import consulo.module.extension.ModuleExtensionWithSdk;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 29.06.14
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
index 34dcf6de..1043a134 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
@@ -16,10 +16,11 @@
 
 package consulo.javascript.module.extension;
 
-import javax.annotation.Nonnull;
-import consulo.lang.LanguageVersion;
+import consulo.language.version.LanguageVersion;
 import consulo.module.extension.MutableModuleExtensionWithSdk;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 12.12.2015
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
index 2f629ccc..6027465a 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
@@ -17,11 +17,11 @@
 
 package consulo.javascript.psi;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index d7d70bc3..2342e6c3 100644
--- a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -17,22 +17,24 @@
 
 package consulo.javascript.psi.impl.reference;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.psi.PsiReference;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.extensions.CompositeExtensionPointName;
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ExtensionAPI;
+import consulo.component.extension.ExtensionPointName;
+import consulo.language.psi.PsiReference;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
  * @since 02.12.2015
  */
+@ExtensionAPI(ComponentScope.APPLICATION)
 public interface JSPropertyNameReferenceProvider
 {
-	CompositeExtensionPointName<JSPropertyNameReferenceProvider> EP_NAME = CompositeExtensionPointName.applicationPoint("consulo.javascript.propertyNameReferenceProvider",
-			JSPropertyNameReferenceProvider.class);
+	ExtensionPointName<JSPropertyNameReferenceProvider> EP_NAME = ExtensionPointName.create(JSPropertyNameReferenceProvider.class);
 
 	@Nullable
 	@RequiredReadAction
diff --git a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
index 09f9c26d..cb89a010 100644
--- a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
+++ b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
@@ -1,8 +1,9 @@
 package consulo.javascript.psi.stubs;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.psi.stubs.PsiFileStub;
+import consulo.language.psi.stub.PsiFileStub;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/module-info.java b/base-api/src/main/java/module-info.java
new file mode 100644
index 00000000..8b6845e9
--- /dev/null
+++ b/base-api/src/main/java/module-info.java
@@ -0,0 +1,24 @@
+/**
+ * @author VISTALL
+ * @since 23-Aug-22
+ */
+open module consulo.javascript.base.api
+{
+	requires transitive consulo.ide.api;
+
+	exports com.intellij.lang.javascript.formatter;
+	exports com.intellij.lang.javascript.psi;
+	exports com.intellij.lang.javascript.psi.stubs;
+
+	exports consulo.javascript.icon;
+	exports consulo.javascript.ide.completion;
+	exports consulo.javascript.index;
+	exports consulo.javascript.language;
+	exports consulo.javascript.language.psi;
+	exports consulo.javascript.localize;
+	exports consulo.javascript.module.extension;
+	exports consulo.javascript.psi;
+	exports consulo.javascript.psi.impl.reference;
+	exports consulo.javascript.language.psi.stub;
+	exports consulo.javascript.psi.stubs;
+}
\ No newline at end of file
diff --git a/base-api/src/main/resources/icon/_dark/consulo.javascript.JavaScriptIconGroup/json.svg b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/json.svg
similarity index 100%
rename from base-api/src/main/resources/icon/_dark/consulo.javascript.JavaScriptIconGroup/json.svg
rename to base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/json.svg
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/as.svg
similarity index 100%
rename from base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/as.svg
rename to base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/as.svg
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/ecmaScript.svg
similarity index 100%
rename from base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/ecmaScript.svg
rename to base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/ecmaScript.svg
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScript.svg
similarity index 100%
rename from base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/javaScript.svg
rename to base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScript.svg
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/json.svg
similarity index 100%
rename from base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/json.svg
rename to base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/json.svg
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/jsx.svg
similarity index 100%
rename from base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/jsx.svg
rename to base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/jsx.svg
diff --git a/base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/typeScript.svg
similarity index 100%
rename from base-api/src/main/resources/icon/_light/consulo.javascript.JavaScriptIconGroup/typeScript.svg
rename to base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/typeScript.svg
diff --git a/base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml b/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
similarity index 100%
rename from base-api/src/main/resources/localize/consulo/javascript/JavaScriptLocalize.yaml
rename to base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
diff --git a/base-api/src/main/resources/icon/marker.txt b/base-api/src/main/resources/icon/marker.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/base-api/src/main/resources/localize/id.txt b/base-api/src/main/resources/localize/id.txt
deleted file mode 100644
index 2c4c454f..00000000
--- a/base-api/src/main/resources/localize/id.txt
+++ /dev/null
@@ -1 +0,0 @@
-en
\ No newline at end of file
diff --git a/base-impl/pom.xml b/base-impl/pom.xml
index d758f6b6..effccd2d 100644
--- a/base-impl/pom.xml
+++ b/base-impl/pom.xml
@@ -19,14 +19,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<artifactId>arch.ide-api-provided</artifactId>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-base.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<build>
@@ -34,7 +34,6 @@
 			<plugin>
 				<groupId>consulo.maven</groupId>
 				<artifactId>maven-consulo-plugin</artifactId>
-				<version>2-SNAPSHOT</version>
 				<extensions>true</extensions>
 				<executions>
 					<execution>
@@ -45,6 +44,14 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>16</source>
+					<target>16</target>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -54,7 +61,7 @@
 			<url>https://maven.consulo.io/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
+				<updatePolicy>always</updatePolicy>
 			</snapshots>
 		</repository>
 	</repositories>
@@ -74,10 +81,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
index d22a00c1..c20f888c 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
@@ -22,21 +22,21 @@
  */
 package com.intellij.javascript.documentation;
 
+import com.intellij.lang.javascript.index.JSSymbolUtil;
+import com.intellij.lang.javascript.psi.*;
+import consulo.language.editor.CodeInsightBundle;
+import consulo.language.psi.PsiElement;
+import consulo.util.io.URLUtil;
+import consulo.util.lang.StringUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.ide.BrowserUtil;
-import com.intellij.lang.javascript.index.JSSymbolUtil;
-import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-
 class JSDocumentationBuilder implements JSDocumentationProcessor
 {
 	private static class SymbolInfo
@@ -259,7 +259,7 @@ public boolean onPatternMatch(@Nonnull MetaDocType metaDocType, @Nullable String
 			{
 				result.append("</DD><DD>");
 			}
-			if(BrowserUtil.isAbsoluteURL(remainingLineContent))
+			if(URLUtil.isAbsoluteURL(remainingLineContent))
 			{
 				result.append("<a href=\"").append(remainingLineContent).append("\">").append(remainingLineContent).append("</a>");
 			}
@@ -459,7 +459,7 @@ else if(metaDocType == MetaDocType.RETURN)
 
 	private String getSeeAlsoLink(String remainingLineContent)
 	{
-		if(BrowserUtil.isAbsoluteURL(remainingLineContent))
+		if(URLUtil.isAbsoluteURL(remainingLineContent))
 		{
 			return remainingLineContent;
 		}
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 0aa05a73..6e09d445 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -16,21 +16,6 @@
 
 package com.intellij.javascript.documentation;
 
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.jetbrains.annotations.NonNls;
-import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.documentation.CodeDocumentationProvider;
-import com.intellij.lang.documentation.DocumentationProvider;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.index.JavaScriptIndex;
@@ -39,21 +24,29 @@
 import com.intellij.lang.javascript.psi.resolve.BaseJSSymbolProcessor;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.navigation.ItemPresentation;
-import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlToken;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.editor.documentation.CodeDocumentationProvider;
+import consulo.language.editor.documentation.DocumentationProvider;
+import consulo.language.psi.*;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.navigation.ItemPresentation;
+import consulo.navigation.NavigationItem;
+import consulo.project.Project;
+import consulo.util.lang.Pair;
+import consulo.util.lang.StringUtil;
+import consulo.util.lang.ref.Ref;
+import consulo.xml.psi.xml.XmlToken;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
index f921fd99..7501dd11 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
@@ -22,19 +22,19 @@
  */
 package com.intellij.javascript.documentation;
 
-import com.intellij.codeInsight.documentation.DocumentationManager;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.*;
-import com.intellij.psi.templateLanguages.OuterLanguageElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.ast.TokenType;
+import consulo.language.editor.documentation.DocumentationManagerUtil;
+import consulo.language.psi.*;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.util.lang.StringUtil;
+import consulo.util.lang.ref.Ref;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -814,7 +814,7 @@ public static void appendHyperLinkToElement(@Nullable PsiElement element, String
 		String fileName = containingFile == null ? null : !JSResolveUtil.isPredefinedFile(containingFile) ? containingFile.getVirtualFile()
 				.getPresentableUrl() : containingFile.getViewProvider().getVirtualFile().getName();
 
-		DocumentationManager.createHyperlink(buffer, (fileName != null ? fileName + ":" : "") + elementName + (element != null ? ":" + element
+		DocumentationManagerUtil.createHyperlink(buffer, (fileName != null ? fileName + ":" : "") + elementName + (element != null ? ":" + element
 				.getTextOffset() : ""), presentableName + (presentableFileName != null ? " in " + presentableFileName : ""), true);
 	}
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex b/base-impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex
index b5bd3193..619c8689 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSDoc.flex
@@ -1,6 +1,7 @@
 package com.intellij.lang.javascript;
-import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.tree.IElementType;
+
+import consulo.language.lexer.FlexLexer;
+import consulo.language.ast.IElementType;
 
 %%
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
index ed73be2c..c21ed65c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript;
 
-import com.intellij.psi.TokenType;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.ast.TokenType;
 
 /**
  * @by maxim.mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
index c2511649..ea634c51 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
@@ -16,10 +16,11 @@
 
 package com.intellij.lang.javascript;
 
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.ast.IElementType;
 import org.jetbrains.annotations.NonNls;
+
 import javax.annotation.Nonnull;
-import com.intellij.psi.tree.IElementType;
-import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index ba36bdea..118888b4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -16,30 +16,27 @@
 
 package com.intellij.lang.javascript;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.Language;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.*;
 import com.intellij.lang.javascript.psi.stubs.*;
 import com.intellij.lang.javascript.types.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.ILazyParseableElementType;
-import com.intellij.psi.tree.IStubFileElementType;
-import com.intellij.psi.tree.TokenSet;
 import consulo.annotation.DeprecationInfo;
 import consulo.javascript.ecmascript4.psi.impl.EcmaScript4ElementTypes;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.impl.language.psi.JSStubElementType;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringElementImpl;
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringObjectImpl;
 import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringParameterImpl;
 import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringShorthandedPropertyImpl;
 import consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl;
-import consulo.javascript.psi.impl.JSComputedNameImpl;
-import consulo.javascript.psi.impl.JavaScriptLambdaExpressionImpl;
-import consulo.javascript.psi.impl.JavaScriptSpreadExpressionImpl;
+import consulo.javascript.impl.language.psi.JSComputedNameImpl;
+import consulo.javascript.impl.language.psi.JavaScriptLambdaExpressionImpl;
+import consulo.javascript.impl.language.psi.JavaScriptSpreadExpressionImpl;
 import consulo.javascript.psi.stubs.JSFileStub;
-import consulo.psi.tree.ElementTypeAsPsiFactory;
+import consulo.language.Language;
+import consulo.language.ast.*;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.IStubFileElementType;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
index a89ea70e..a2db5938 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript;
 
-import com.intellij.lexer.FlexAdapter;
+import consulo.language.lexer.FlexAdapter;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index 69f414fe..d7d3d56c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -16,41 +16,33 @@
 
 package com.intellij.lang.javascript;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.Language;
-import com.intellij.lang.injection.MultiHostInjector;
-import com.intellij.lang.injection.MultiHostRegistrar;
 import com.intellij.lang.javascript.flex.AnnotationBackedDescriptor;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.html.HtmlTag;
-import com.intellij.psi.meta.PsiMetaData;
-import com.intellij.psi.templateLanguages.OuterLanguageElement;
-import com.intellij.psi.xml.XmlAttribute;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlElementType;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlTagChild;
-import com.intellij.psi.xml.XmlTagValue;
-import com.intellij.psi.xml.XmlText;
-import com.intellij.psi.xml.XmlToken;
-import com.intellij.psi.xml.XmlTokenType;
 import com.intellij.xml.XmlElementDescriptorWithCDataContent;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.lang.LanguagePointerUtil;
-import consulo.util.pointers.NamedPointer;
+import consulo.component.util.pointer.NamedPointer;
+import consulo.document.util.TextRange;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.LanguagePointerUtil;
+import consulo.language.inject.MultiHostInjector;
+import consulo.language.inject.MultiHostRegistrar;
+import consulo.language.psi.OuterLanguageElement;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiLanguageInjectionHost;
+import consulo.language.psi.meta.PsiMetaData;
+import consulo.util.lang.StringUtil;
+import consulo.xml.psi.html.HtmlTag;
+import consulo.xml.psi.xml.*;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  *         Date: Apr 28, 2008
  *         Time: 8:40:38 PM
  */
-public class JSLanguageInjector implements MultiHostInjector
+public abstract class JSLanguageInjector implements MultiHostInjector
 {
 	@NonNls
 	private static final String JAVASCRIPT_PREFIX = "javascript:";
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index c886c4f3..afe4b19a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -16,27 +16,28 @@
 
 package com.intellij.lang.javascript;
 
-import com.intellij.lang.*;
 import com.intellij.lang.javascript.highlighting.JavaScriptHighlightingLexer;
 import com.intellij.lang.javascript.parsing.JSDocParsing;
-import com.intellij.lexer.FlexAdapter;
-import com.intellij.lexer.Lexer;
-import com.intellij.lexer.MergingLexerAdapter;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.TokenType;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.ILazyParseableElementType;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.xml.XmlTokenType;
 import consulo.annotation.DeprecationInfo;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptContextKeywordElementType;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.lang.parsing.JavaScriptParser;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 import consulo.javascript.lang.parsing.Parsing;
-import consulo.lang.LanguageVersion;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.Language;
+import consulo.language.ast.*;
+import consulo.language.lexer.FlexAdapter;
+import consulo.language.lexer.Lexer;
+import consulo.language.lexer.MergingLexerAdapter;
+import consulo.language.parser.ParserDefinition;
+import consulo.language.parser.PsiBuilder;
+import consulo.language.parser.PsiBuilderFactory;
+import consulo.language.psi.PsiElement;
+import consulo.language.version.LanguageVersion;
+import consulo.project.Project;
+import consulo.xml.psi.xml.XmlTokenType;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -341,7 +342,7 @@ protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElemen
 			final LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
 			final LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
 			final PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, createLexer(), languageForParser, languageVersion, chameleon.getChars());
-			final JavaScriptParser parser = (JavaScriptParser) LanguageParserDefinitions.INSTANCE.forLanguage(languageForParser).createParser(languageVersion);
+			final JavaScriptParser parser = (JavaScriptParser) ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
 
 			JavaScriptParsingContext parsingContext = parser.createParsingContext();
 			doParse(parsingContext, builder);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
index 02ae594f..a2725d27 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
@@ -1,7 +1,7 @@
 package com.intellij.lang.javascript;
 
-import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.lexer.FlexLexer;
+import consulo.language.ast.IElementType;
 
 %%
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
index 20297e9e..6f283da5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
@@ -16,14 +16,10 @@
 
 package com.intellij.lang.javascript;
 
-import com.intellij.lang.html.HTMLLanguage;
-import com.intellij.lexer.FlexAdapter;
-import com.intellij.lexer.LayeredLexer;
-import com.intellij.lexer.Lexer;
-import com.intellij.lexer.LexerBase;
-import com.intellij.lexer.StringLiteralLexer;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.highlight.SyntaxHighlighterFactory;
+import consulo.language.lexer.*;
+import consulo.xml.lang.html.HTMLLanguage;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
index 0c70aa48..1a63ce68 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
@@ -16,16 +16,16 @@
 
 package com.intellij.lang.javascript;
 
+import consulo.language.Language;
+import consulo.language.file.FileTypeManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.util.collection.ArrayUtil;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.xml.ide.highlighter.XmlFileType;
+import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.psi.xml.XmlTag;
 import org.jetbrains.annotations.NonNls;
-import com.intellij.ide.highlighter.XmlFileType;
-import com.intellij.lang.Language;
-import com.intellij.openapi.fileTypes.FileTypeManager;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.util.ArrayUtil;
 
 /**
  * @by max, maxim.mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
index 196a083c..46c5fb29 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
@@ -20,9 +20,9 @@
 import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.lang.javascript.psi.resolve.JSImportedElementResolveResult;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.util.ArrayUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiNamedElement;
+import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -154,7 +154,7 @@ public static JSImportedElementResolveResult resolveTypeNameUsingImplicitImports
 
 
 	public static JSImportedElementResolveResult tryFindInMap(final String referenceName, final PsiNamedElement file, final Map<String, Object> map,
-			String qName)
+															  String qName)
 	{
 		JSImportedElementResolveResult resolveResult = tryEntry(map.get(referenceName), referenceName, file, qName);
 		if(resolveResult == null)
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
index bb05fc7b..5c82f428 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
@@ -16,15 +16,15 @@
 
 package com.intellij.lang.javascript.flex;
 
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.util.Processor;
+import consulo.application.util.function.Processor;
+import consulo.component.extension.ExtensionPointName;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.annotation.DeprecationInfo;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.project.Project;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nullable;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index 231ec30b..7cb917c0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.flex;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSLanguageInjector;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
@@ -26,18 +25,21 @@
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.openapi.util.UserDataCache;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.search.PsiElementProcessor;
-import com.intellij.psi.util.*;
-import com.intellij.psi.xml.*;
-import com.intellij.util.IncorrectOperationException;
 import com.intellij.xml.XmlElementDescriptor;
+import consulo.application.util.*;
+import consulo.language.ast.ASTNode;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.inject.InjectedLanguageManager;
+import consulo.language.psi.*;
+import consulo.language.psi.resolve.PsiElementProcessor;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
 import consulo.util.dataholder.Key;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.xml.psi.XmlRecursiveElementVisitor;
+import consulo.xml.psi.xml.*;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -49,7 +51,6 @@
  */
 public class XmlBackedJSClassImpl extends JSClassBase implements JSClass
 {
-
 	@NonNls
 	public static final String COMPONENT_TAG_NAME = "Component";
 	@NonNls
@@ -197,7 +198,7 @@ public JSAttributeList getAttributeList()
 
 	@Override
 	protected boolean processMembers(final PsiScopeProcessor processor, final ResolveState substitutor, final PsiElement lastParent,
-			final PsiElement place)
+									 final PsiElement place)
 	{
 		for(JSFile file : ourCachedScripts.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue())
 		{
@@ -729,7 +730,7 @@ protected void process(final JSFile file)
 				XmlAttributeValue value = ((XmlAttribute) element).getValueElement();
 				if(value != null)
 				{
-					InjectedLanguageUtil.enumerate(value, new PsiLanguageInjectionHost.InjectedPsiVisitor()
+					InjectedLanguageManager.getInstance(element.getProject()).enumerate(value, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 					{
 						@Override
 						public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places)
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
index 0be300c7..6e4a3863 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
@@ -16,23 +16,20 @@
 
 package com.intellij.lang.javascript.highlighting;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import com.intellij.lang.javascript.DialectOptionHolder;
-import com.intellij.lang.javascript.JSDocElementType;
-import com.intellij.lang.javascript.JSDocTokenTypes;
-import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptHighlightingLexer;
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.editor.XmlHighlighterColors;
-import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
-import com.intellij.psi.StringEscapesTokenTypes;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.Processor;
+import com.intellij.lang.javascript.*;
+import consulo.application.util.function.Processor;
+import consulo.colorScheme.TextAttributesKey;
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.StringEscapesTokenTypes;
+import consulo.language.editor.highlight.SyntaxHighlighterBase;
+import consulo.language.lexer.Lexer;
+import consulo.xml.editor.XmlHighlighterColors;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
index 81fd408c..847b64cc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
@@ -17,14 +17,15 @@
 
 package com.intellij.lang.javascript.highlighting;
 
-import com.intellij.lang.html.HTMLLanguage;
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript._JSDocLexer;
-import com.intellij.lexer.*;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
-import com.intellij.openapi.util.Factory;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.highlight.SyntaxHighlighterFactory;
+import consulo.language.lexer.*;
+import consulo.xml.lang.html.HTMLLanguage;
+
+import java.util.function.Supplier;
 
 /**
  * @author max
@@ -32,14 +33,14 @@
  */
 public class JavaScriptHighlightingLexer extends LayeredLexer
 {
-	public JavaScriptHighlightingLexer(Factory<Lexer> baseLexerFactory)
+	public JavaScriptHighlightingLexer(Supplier<Lexer> baseLexerFactory)
 	{
 		this(baseLexerFactory, true);
 	}
 
-	private JavaScriptHighlightingLexer(Factory<Lexer> baseLexerFactory, boolean withEmbeddments)
+	private JavaScriptHighlightingLexer(Supplier<Lexer> baseLexerFactory, boolean withEmbeddments)
 	{
-		super(baseLexerFactory.create());
+		super(baseLexerFactory.get());
 
 		if(withEmbeddments)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index c84512b7..06530b6a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -21,11 +21,11 @@
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.navigation.ItemPresentation;
-import com.intellij.openapi.util.Iconable;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import consulo.ide.IconDescriptorUpdaters;
+import consulo.component.util.Iconable;
+import consulo.language.icon.IconDescriptorUpdaters;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.navigation.ItemPresentation;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.image.Image;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
index b961bedb..3bfdd25c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
@@ -19,8 +19,8 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
index 5ad0cc82..7f76b24b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.index;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
 
 /**
  * @author maxim, yole
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index 1c2d1532..47e03606 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -16,51 +16,41 @@
 
 package com.intellij.lang.javascript.inspections.qucikFixes;
 
-import java.util.Collections;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import com.intellij.codeInsight.CodeInsightUtilBase;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.lookup.LookupItem;
-import com.intellij.codeInsight.template.Expression;
-import com.intellij.codeInsight.template.ExpressionContext;
-import com.intellij.codeInsight.template.Result;
-import com.intellij.codeInsight.template.Template;
-import com.intellij.codeInsight.template.TemplateManager;
-import com.intellij.codeInsight.template.TextResult;
-import com.intellij.codeInsight.template.impl.MacroCallNode;
-import com.intellij.codeInsight.template.macro.MacroFactory;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.util.JSUtils;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.fileEditor.FileEditorManager;
-import com.intellij.openapi.fileEditor.OpenFileDescriptor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlText;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptFeature;
-import consulo.javascript.lang.JavaScriptVersionUtil;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.application.ApplicationManager;
+import consulo.codeEditor.Editor;
+import consulo.document.Document;
+import consulo.document.util.TextRange;
+import consulo.fileEditor.FileEditorManager;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptVersionUtil;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.editor.FileModificationService;
+import consulo.language.editor.completion.lookup.LookupElement;
+import consulo.language.editor.completion.lookup.LookupItem;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.editor.template.*;
+import consulo.language.editor.template.macro.MacroCallNode;
+import consulo.language.editor.template.macro.MacroFactory;
+import consulo.language.psi.*;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.navigation.OpenFileDescriptorFactory;
+import consulo.project.Project;
+import consulo.xml.psi.xml.XmlAttributeValue;
+import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.psi.xml.XmlText;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.Set;
 
 /**
  * @author Maxim.Mossienko
@@ -288,25 +278,24 @@ else if(realFile instanceof XmlFile)
 		}
 	}
 
-	public static
 	@Nullable
-	Editor getEditor(final Project project, final PsiFile realFile)
+	public static Editor getEditor(final Project project, final PsiFile realFile)
 	{
-		if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(realFile))
+		if(!FileModificationService.getInstance().prepareFileForWrite(realFile))
 		{
 			return null;
 		}
 
-		return FileEditorManager.getInstance(project).openTextEditor(new OpenFileDescriptor(project, realFile.getVirtualFile(), 0), true);
+		return FileEditorManager.getInstance(project).openTextEditor(OpenFileDescriptorFactory.getInstance(project).builder(realFile.getVirtualFile()).build(), true);
 	}
 
 	@RequiredReadAction
 	protected abstract void buildTemplate(final Template template,
-			JSReferenceExpression referenceExpression,
-			Set<JavaScriptFeature> features,
-			boolean staticContext,
-			PsiFile file,
-			PsiElement anchorParent);
+										  JSReferenceExpression referenceExpression,
+										  Set<JavaScriptFeature> features,
+										  boolean staticContext,
+										  PsiFile file,
+										  PsiElement anchorParent);
 
 	private static String getTypeOfValue(final JSExpression passedParameterValue, final PsiFile file, Set<JavaScriptFeature> features)
 	{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index c9ea70d4..4a307112 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -17,19 +17,19 @@
 
 package com.intellij.lang.javascript.inspections.qucikFixes;
 
-import java.util.Set;
-
-import com.intellij.codeInsight.template.Expression;
-import com.intellij.codeInsight.template.Template;
 import com.intellij.lang.javascript.psi.JSArgumentList;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.inspections.qucikFixes.CreateJSFunctionFixBase;
-import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.language.editor.template.Expression;
+import consulo.language.editor.template.Template;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+
+import java.util.Set;
 
 public class CreateJSFunctionOrMethodFix extends CreateJSFunctionFixBase
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
index c2ee8157..6d661592 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
@@ -17,11 +17,11 @@
 package com.intellij.lang.javascript.parsing;
 
 import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.language.parser.PsiBuilder;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
index 9995095a..ee186ac3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSArgumentList;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
index 462cbb26..a9e5b482 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
index 05355355..5e48bb64 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index 71be9346..963792a6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -16,19 +16,19 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttribute;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.psi.EmptyResolveMessageProvider;
+import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
index ced15107..707b5e24 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttribute;
@@ -24,10 +24,10 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.TokenSet;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
index c9917388..f4f9cdb9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttribute;
@@ -24,11 +24,11 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiReference;
+import consulo.language.util.IncorrectOperationException;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.language.psi.PsiElement;
+import consulo.util.lang.StringUtil;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
index ed2039a3..bda9362f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
@@ -16,19 +16,19 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.ast.TokenSet;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.util.PsiTreeUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -87,7 +87,7 @@ protected void accept(@Nonnull JSElementVisitor visitor)
 
 	@Override
 	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
+									   @Nonnull PsiElement place)
 	{
 		final IElementType operationType = getOperationSign();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
index c9c22fa6..49230730 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
@@ -16,15 +16,15 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
index a570ac31..0569134b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.psi.util.PsiTreeUtil;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
index 3363229a..75b731c8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSArgumentList;
 import com.intellij.lang.javascript.psi.JSCallExpression;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
index 3564ec14..2e4c8869 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
index aa9f1b34..159fc8ed 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
@@ -16,16 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSCatchBlock;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
 
 import javax.annotation.Nonnull;
 
@@ -64,7 +64,7 @@ protected void accept(@Nonnull JSElementVisitor visitor)
 
 	@Override
 	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
+									   @Nonnull PsiElement place)
 	{
 		if(lastParent != null)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
index a8114af3..7f0e72f6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
@@ -16,33 +16,26 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-
-import javax.annotation.Nullable;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.LanguageParserDefinitions;
-import com.intellij.lang.ParserDefinition;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSUtils;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiFileFactory;
-import com.intellij.psi.PsiParserFacade;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.util.IncorrectOperationException;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.codeStyle.CodeStyleSettingsManager;
+import consulo.language.parser.ParserDefinition;
+import consulo.language.psi.*;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.util.lang.StringUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -187,7 +180,7 @@ public static PsiElement doDoAddBefore(final PsiElement jsElement, final PsiElem
 	private static ASTNode insertWhitespaceIfNeeded(ASTNode anchorNode, final ASTNode elementNode, final ASTNode parentNode,
 			final ASTNode insertionPlaceNode) throws IncorrectOperationException
 	{
-		ParserDefinition parserDef = LanguageParserDefinitions.INSTANCE.forLanguage(parentNode.getPsi().getLanguage());
+		ParserDefinition parserDef = ParserDefinition.forLanguage(parentNode.getPsi().getLanguage());
 		final TokenSet comments = parserDef.getCommentTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
 		final TokenSet whitespaces = parserDef.getWhitespaceTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index 05bf8be4..a0e53a6b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -16,23 +16,24 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
-import com.intellij.openapi.util.UserDataCache;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.*;
-import com.intellij.util.ArrayFactory;
-import com.intellij.util.ArrayUtil;
+import consulo.application.util.*;
+import consulo.javascript.impl.language.psi.JSStubElementType;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiModificationTracker;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.util.collection.ArrayFactory;
+import consulo.util.collection.ArrayUtil;
 import consulo.util.dataholder.Key;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
index e36d88e1..fe01504a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
@@ -1,11 +1,11 @@
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSClassExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.lang.psi.impl.JavaScriptClassType;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
index fcd1874a..b8cc7fc2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
@@ -18,9 +18,10 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttributeList;
@@ -29,16 +30,15 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.JSSuppressionHolder;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
index 1cb03627..e076e84e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSCommaExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
index 885d52b5..4adc3fcc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
index 3f11f098..625689eb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.util.PsiTreeUtil;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
index c09fc89c..13cdf87c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
index a38fedd1..50064f10 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
@@ -16,11 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDoWhileStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
index 180fc5a7..80c15906 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.psi.JSDocComment;
 import com.intellij.lang.javascript.psi.JSDocTag;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index ffa32f84..9315b9a8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -16,18 +16,17 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSDocTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSLookupUtil;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.*;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtilBase;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.document.util.TextRange;
+import consulo.language.editor.util.PsiUtilBase;
+import consulo.language.psi.*;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
index 782f3c47..8ac7cde1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
@@ -16,14 +16,14 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDocTagValue;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.text.StringTokenizer;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.PsiReference;
+import consulo.util.collection.ArrayUtil;
+import consulo.util.lang.text.StringTokenizer;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
index 5f201a8e..57527f84 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
@@ -16,10 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-import com.intellij.lang.ASTNode;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
index f4b2aa36..2550ba3a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
@@ -16,18 +16,18 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.search.PsiElementProcessor;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlTagChild;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiElementProcessor;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
+import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.psi.xml.XmlTagChild;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
index 75cbc8ca..6d2142c1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSEmptyStatement;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
index 76d9f225..9faa5146 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
@@ -16,20 +16,18 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.psi.JSExpressionCodeFragment;
-import com.intellij.openapi.fileTypes.FileTypeManager;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.FileViewProvider;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.SingleRootFileViewProvider;
-import com.intellij.psi.impl.PsiManagerEx;
-import com.intellij.psi.impl.file.impl.FileManager;
-import com.intellij.psi.impl.source.tree.FileElement;
-import com.intellij.testFramework.LightVirtualFile;
+import consulo.language.file.FileTypeManager;
+import consulo.language.file.FileViewProvider;
+import consulo.language.file.light.LightVirtualFile;
+import consulo.language.impl.ast.FileElement;
+import consulo.language.impl.file.SingleRootFileViewProvider;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiManager;
+import consulo.project.Project;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author nik
@@ -42,8 +40,7 @@ public class JSExpressionCodeFragmentImpl extends JSFileImpl implements JSExpres
 
 	public JSExpressionCodeFragmentImpl(Project project, @NonNls String name, CharSequence text, boolean isPhysical)
 	{
-		super(((PsiManagerEx) PsiManager.getInstance(project)).getFileManager().createFileViewProvider(new LightVirtualFile(name,
-				FileTypeManager.getInstance().getFileTypeByFileName(name), text), isPhysical));
+		super(new SingleRootFileViewProvider(PsiManager.getInstance(project), new LightVirtualFile(name, FileTypeManager.getInstance().getFileTypeByFileName(name), text), isPhysical));
 		myPhysical = isPhysical;
 		((SingleRootFileViewProvider) getViewProvider()).forceCachedPsi(this);
 	}
@@ -55,9 +52,7 @@ protected JSExpressionCodeFragmentImpl clone()
 		final JSExpressionCodeFragmentImpl clone = (JSExpressionCodeFragmentImpl) cloneImpl((FileElement) calcTreeElement().clone());
 		clone.myPhysical = false;
 		clone.myOriginalFile = this;
-		FileManager fileManager = ((PsiManagerEx) getManager()).getFileManager();
-		SingleRootFileViewProvider cloneViewProvider = (SingleRootFileViewProvider) fileManager.createFileViewProvider(new LightVirtualFile(getName(),
-				getLanguage(), getText()), false);
+		SingleRootFileViewProvider cloneViewProvider = new SingleRootFileViewProvider(getManager(), new LightVirtualFile(getName(), getLanguage(), getText()), false);
 		cloneViewProvider.forceCachedPsi(clone);
 		clone.myViewProvider = cloneViewProvider;
 		return clone;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
index c7104129..2a126e88 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
@@ -16,11 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.ast.ASTNode;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author ven
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index 8f9965a7..a6ea348e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -16,16 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
-import com.intellij.navigation.ItemPresentation;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.ide.IconDescriptorUpdaters;
+import consulo.language.ast.ASTNode;
+import consulo.language.icon.IconDescriptorUpdaters;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.navigation.ItemPresentation;
 import consulo.ui.image.Image;
 
 import javax.annotation.Nonnull;
@@ -59,7 +59,7 @@ protected void accept(@Nonnull JSElementVisitor visitor)
 
 	@Override
 	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
+									   @Nonnull PsiElement place)
 	{
 		if(lastParent == null)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
index 1c68994a..3884d3ca 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
@@ -21,7 +21,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.intellij.extapi.psi.PsiFileBase;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSFile;
@@ -29,15 +28,16 @@
 import com.intellij.lang.javascript.psi.JSSourceElement;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.FileViewProvider;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.StubBasedPsiElement;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.util.IncorrectOperationException;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.StubBasedPsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.file.FileViewProvider;
+import consulo.language.impl.psi.PsiFileBase;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
index 48aca953..eda1a5e5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.tree.TokenSet;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.ast.TokenSet;
 import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
index 339d3a89..7dec90dd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.resolve.PsiScopeProcessor;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index f69b17a4..151b7ea2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -17,24 +17,23 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.StubBasedPsiElement;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.lang.psi.JavaScriptType;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index 5d2c2709..b50ae806 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -16,15 +16,15 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
index 0b1a9a71..dc03f7c4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
@@ -16,18 +16,18 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.content.scope.SearchScope;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.search.SearchScope;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.PsiElement;
+import consulo.util.lang.Comparing;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
index 383d25d1..2cc98bc6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
@@ -1,6 +1,6 @@
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttributeList;
@@ -8,8 +8,8 @@
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.JSSourceElement;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
index 98ccaf45..5d93fd7a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSGenericSignature;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
index e306ba03..2a5a963d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
index 31379a3c..e03ebe1d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
@@ -16,14 +16,14 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
 
 import javax.annotation.Nonnull;
 
@@ -50,7 +50,7 @@ protected void accept(@Nonnull JSElementVisitor visitor)
 
 	@Override
 	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
-			@Nonnull final PsiElement place)
+									   @Nonnull final PsiElement place)
 	{
 		return true;
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
index 1a55ebec..43e34497 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
@@ -16,18 +16,18 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSIncludeDirective;
 import com.intellij.lang.javascript.psi.stubs.JSIncludeDirectiveStub;
-import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference;
-import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
+import consulo.application.util.SystemInfo;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.path.FileReference;
+import consulo.util.lang.StringUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.path.FileReferenceSet;
 import consulo.javascript.lang.JavaScriptTokenSets;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
index c6c7eac2..6662f52f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIndexedPropertyAccessExpression;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
index aeb13012..f836ce54 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
@@ -16,14 +16,14 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
index ffdeadb5..6a815796 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
@@ -16,10 +16,10 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLetExpression;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
index 68ceb2d6..7cd6d4ba 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
@@ -16,11 +16,11 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLetStatement;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index 1edb46c9..e3402c2f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -16,20 +16,20 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.LiteralTextEscaper;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.tree.IElementType;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.lang.psi.JavaScriptPrimitiveType;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptPrimitiveType;
+import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.LiteralTextEscaper;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiLanguageInjectionHost;
+import consulo.language.psi.PsiReference;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
index 41974cbd..6bc53b76 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
@@ -16,17 +16,17 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
 import com.intellij.lang.javascript.psi.stubs.JSNamespaceDeclarationStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import org.jetbrains.annotations.NonNls;
 
@@ -145,7 +145,7 @@ public boolean isDeprecated()
 
 	@Override
 	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
-			@Nonnull final PsiElement place)
+									   @Nonnull final PsiElement place)
 	{
 		return processor.execute(lastParent, state);
 	}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index 5092b050..a30eaada 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.lang.psi.impl.JavaScriptClassType;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
index 1e448337..48f685b1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.ResolveState;
 
 import javax.annotation.Nonnull;
 
@@ -53,7 +53,7 @@ protected void accept(@Nonnull JSElementVisitor visitor)
 
 	@Override
 	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
-			@Nonnull final PsiElement place)
+									   @Nonnull final PsiElement place)
 	{
 		if(lastParent == null || !(place instanceof JSProperty))
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
index 890e69b5..6aec140c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -26,14 +25,15 @@
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSPackageStatementStub;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.project.Project;
+import consulo.virtualFileSystem.VirtualFile;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index b6fe891f..ef89f26d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttributeList;
@@ -25,11 +25,11 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.stubs.JSParameterStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
index 0c1229e8..3a5f9264 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.stubs.JSParameterListStub;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
index 76a71ade..e6e3d2bc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
@@ -16,10 +16,10 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index 7e0fd3c7..3c6debaa 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -16,14 +16,14 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSPostfixExpression;
-import com.intellij.psi.tree.IElementType;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index 9858a877..d82216bc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -16,15 +16,15 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index b9db0b3f..26aa824b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -16,24 +16,24 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.CachedValueProvider;
-import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.PsiModificationTracker;
-import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.application.util.CachedValueProvider;
 import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.psi.JSComputedName;
 import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.TokenSet;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiModificationTracker;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.util.LanguageCachedValueUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -54,7 +54,7 @@ public JSPropertyImpl(final ASTNode node)
 	@Nonnull
 	public PsiReference[] getReferences()
 	{
-		return CachedValuesManager.getCachedValue(this, new CachedValueProvider<PsiReference[]>()
+		return LanguageCachedValueUtil.getCachedValue(this, new CachedValueProvider<PsiReference[]>()
 		{
 			@Nullable
 			@Override
@@ -75,7 +75,7 @@ private PsiReference[] buildReferences()
 		{
 			return PsiReference.EMPTY_ARRAY;
 		}
-		PsiReference reference = JSPropertyNameReferenceProvider.EP_NAME.composite().getReference(this);
+		PsiReference reference = JSPropertyNameReferenceProvider.EP_NAME.computeSafeIfAny(it -> it.getReference(this));
 		if(reference != null)
 		{
 			return new PsiReference[]{reference};
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 1fc9dc33..5701df90 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -17,35 +17,34 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.project.DumbService;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.OrderEntry;
-import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.roots.ProjectFileIndex;
-import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubIndex;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.util.Consumer;
-import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.content.base.SourcesOrderRootType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.javascript.lang.psi.impl.elementType.BaseJavaScriptElementType;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.*;
+import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubIndex;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.module.content.ProjectFileIndex;
+import consulo.module.content.ProjectRootManager;
+import consulo.module.content.layer.orderEntry.OrderEntry;
+import consulo.project.DumbService;
+import consulo.project.Project;
 import consulo.util.collection.HashingStrategy;
+import consulo.util.lang.Comparing;
+import consulo.util.lang.StringUtil;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.xml.psi.xml.XmlFile;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -54,6 +53,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * @author Maxim.Mossienko
@@ -238,7 +238,7 @@ public static PsiElement findTopLevelNavigatableElementWithSource(@Nonnull JSQua
 	{
 		if(candidatesConsumer != null)
 		{
-			candidatesConsumer.consume(jsClass);
+			candidatesConsumer.accept(jsClass);
 		}
 
 		PsiElement sourceElement = findSourceElement(jsClass);
@@ -272,7 +272,7 @@ public static PsiElement findTopLevelNavigatableElementWithSource(@Nonnull JSQua
 
 			if(candidatesConsumer != null)
 			{
-				candidatesConsumer.consume(candidate);
+				candidatesConsumer.accept(candidate);
 			}
 
 			PsiElement candidateSourceElement = findSourceElement(candidate);
@@ -313,7 +313,7 @@ private static PsiElement findSourceElement(JSQualifiedNamedElement jsClass)
 
 		for(OrderEntry orderEntry : orderEntries)
 		{
-			VirtualFile[] files = orderEntry.getFiles(OrderRootType.SOURCES);
+			VirtualFile[] files = orderEntry.getFiles(SourcesOrderRootType.getInstance());
 
 			for(VirtualFile file : files)
 			{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 04c9e03c..6fe0349b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -16,29 +16,29 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.LanguageNamesValidation;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.*;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.*;
-import com.intellij.psi.impl.source.resolve.ResolveCache;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtilBase;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlToken;
-import com.intellij.refactoring.rename.BindablePsiReference;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptFeature;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.javascript.lang.JavaScriptVersionUtil;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.document.util.TextRange;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptVersionUtil;
+import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.TokenSet;
+import consulo.language.editor.refactoring.NamesValidator;
+import consulo.language.editor.util.PsiUtilBase;
+import consulo.language.psi.*;
+import consulo.language.psi.resolve.ResolveCache;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.util.collection.ArrayUtil;
+import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.psi.xml.XmlToken;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -165,7 +165,7 @@ PsiElement handleElementRenameInternal(String newElementName) throws IncorrectOp
 		{
 			newElementName = newElementName.substring(0, i);
 		}
-		if(!LanguageNamesValidation.INSTANCE.forLanguage(JavaScriptLanguage.INSTANCE).isIdentifier(newElementName, null))
+		if(!NamesValidator.forLanguage(JavaScriptLanguage.INSTANCE).isIdentifier(newElementName, null))
 		{
 			throw new IncorrectOperationException("Invalid javascript element name:" + newElementName);
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index 133cba3b..eda7fbb4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -16,17 +16,17 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubIndex;
-import com.intellij.util.ArrayUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubIndex;
+import consulo.util.collection.ArrayUtil;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.language.ast.ASTNode;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index f50b2388..96541daa 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -16,45 +16,28 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.jetbrains.annotations.NonNls;
-import consulo.annotation.access.RequiredReadAction;
-import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.lang.javascript.psi.resolve.BaseJSSymbolProcessor;
-import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.lang.javascript.psi.resolve.VariantsProcessor;
-import com.intellij.lang.javascript.psi.resolve.WalkUpResolveProcessor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.ElementManipulators;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiPolyVariantReference;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.impl.source.resolve.ResolveCache;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlTagChild;
-import com.intellij.psi.xml.XmlToken;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.IncorrectOperationException;
+import com.intellij.lang.javascript.psi.resolve.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.*;
+import consulo.language.psi.resolve.ResolveCache;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.util.collection.ArrayUtil;
+import consulo.util.lang.StringUtil;
+import consulo.xml.psi.xml.*;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
index 7d0e8f4a..fbc084e7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
@@ -16,10 +16,10 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReturnStatement;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
index b91b228c..991084da 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
@@ -22,16 +22,16 @@
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.psi.util.JSLookupUtil;
 import com.intellij.lang.javascript.search.JSClassSearch;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.util.Query;
+import consulo.application.util.query.Query;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.project.Project;
+import consulo.util.lang.StringUtil;
+import consulo.util.lang.ref.Ref;
+import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.psi.xml.XmlTag;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
index e5bbcd78..c1d21650 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 
 /**
  * @author ven
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
index 000ab5c3..02a90e8c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
@@ -16,16 +16,16 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.search.PsiElementProcessor;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.resolve.PsiElementProcessor;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
+import consulo.util.collection.ArrayUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
index ee6d79a8..9554378c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
@@ -16,20 +16,20 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.extapi.psi.StubBasedPsiElementBase;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.index.JSItemPresentation;
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.navigation.ItemPresentation;
-import com.intellij.navigation.NavigationItem;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.search.SearchScope;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.content.scope.SearchScope;
+import consulo.language.ast.ASTNode;
+import consulo.language.impl.psi.stub.StubBasedPsiElementBase;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.navigation.ItemPresentation;
+import consulo.navigation.NavigationItem;
 import consulo.util.dataholder.Key;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
index 6d445341..feb03299 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
@@ -16,15 +16,15 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSuppressionHolder;
 import com.intellij.lang.javascript.types.JSFileElementType;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.util.IncorrectOperationException;
 
 /**
  * @author ven
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
index fdf3445f..6e175373 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
@@ -16,15 +16,18 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.*;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.util.collection.ArrayUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
index 1e961a30..f4895467 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.intellij.psi.tree.TokenSet;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.TokenSet;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
index 54573c08..fe59da9b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSThisExpression;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
index bda7854d..5bf27e86 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSThrowStatement;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
index 036aad32..1eb555f0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
@@ -16,15 +16,15 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSCatchBlock;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
index f2b0dba7..0e3747e7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
@@ -16,15 +16,15 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSUseNamespaceDirective;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.psi.stubs.JSUseNamespaceDirectiveStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
 
 import javax.annotation.Nonnull;
 
@@ -63,7 +63,7 @@ public String getNamespaceToBeUsed()
 
 	@Override
 	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
+									   @Nonnull PsiElement place)
 	{
 		if(processor instanceof ResolveProcessor && ((ResolveProcessor) processor).lookingForUseNamespaces())
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
index 5b730cfa..261d59e1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.annotation.access.RequiredReadAction;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index e236e716..4fa7d7e7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -17,24 +17,25 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import com.intellij.lang.ASTNode;
+import consulo.application.util.RecursionManager;
+import consulo.application.util.function.Computable;
+import consulo.content.scope.SearchScope;
+import consulo.javascript.impl.language.psi.JSStubElementType;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
-import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.RecursionManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.search.SearchScope;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.lang.psi.JavaScriptType;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
 
 import javax.annotation.Nonnull;
 
@@ -290,7 +291,7 @@ public void delete() throws IncorrectOperationException
 
 	@Override
 	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
-			@Nonnull final PsiElement place)
+									   @Nonnull final PsiElement place)
 	{
 		if(lastParent != null && lastParent.getParent() == this)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
index e19ec24c..de9d3f11 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
@@ -17,14 +17,15 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import javax.annotation.Nonnull;
-import com.intellij.lang.ASTNode;
+
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStub;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.ASTNode;
+import consulo.language.util.IncorrectOperationException;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
index c26cd35f..320bc5aa 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
index 1fa96c25..e59f792e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 73c38924..6bb28569 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -16,26 +16,22 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.Language;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.impl.light.LightElement;
-import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
-import com.intellij.psi.meta.PsiMetaData;
-import com.intellij.psi.search.PsiElementProcessor;
-import com.intellij.psi.util.PsiUtilCore;
-import com.intellij.psi.xml.*;
-import com.intellij.util.IncorrectOperationException;
 import com.intellij.xml.XmlElementDescriptor;
 import com.intellij.xml.XmlNSDescriptor;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.access.RequiredWriteAction;
+import consulo.document.util.TextRange;
+import consulo.language.Language;
+import consulo.language.ast.ASTNode;
+import consulo.language.impl.psi.LightElement;
+import consulo.language.psi.*;
+import consulo.language.psi.meta.PsiMetaData;
+import consulo.language.psi.resolve.PsiElementProcessor;
+import consulo.language.util.IncorrectOperationException;
+import consulo.xml.psi.xml.*;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
index fbe7adb5..9dc2d9c9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSYieldStatement;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
index 4e02158c..a5726e1f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
@@ -16,35 +16,29 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.application.util.SystemInfo;
+import consulo.content.base.BinariesOrderRootType;
+import consulo.language.psi.*;
+import consulo.language.psi.path.FileReferenceSet;
+import consulo.language.util.ModuleUtilCore;
+import consulo.module.Module;
+import consulo.module.content.ModuleRootManager;
+import consulo.module.content.ProjectFileIndex;
+import consulo.module.content.ProjectRootManager;
+import consulo.module.content.layer.orderEntry.OrderEntry;
+import consulo.module.content.layer.orderEntry.OrderEntryWithTracking;
+import consulo.project.Project;
+import consulo.util.lang.StringUtil;
+import consulo.virtualFileSystem.LocalFileSystem;
+import consulo.virtualFileSystem.ManagingFS;
+import consulo.virtualFileSystem.VirtualFile;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.roots.OrderEntry;
-import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.roots.ProjectFileIndex;
-import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.newvfs.ManagingFS;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiFileSystemItem;
-import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
-import com.intellij.util.Function;
-import consulo.roots.OrderEntryWithTracking;
+import java.util.function.Function;
 
 /**
  * Created by IntelliJ IDEA.
@@ -82,7 +76,7 @@ public static PsiReference[] getFileRefs(final PsiElement elt, final int offset,
 		base.addCustomization(FileReferenceSet.DEFAULT_PATH_EVALUATOR_OPTION, new Function<PsiFile, Collection<PsiFileSystemItem>>()
 		{
 			@Override
-			public Collection<PsiFileSystemItem> fun(PsiFile psiFile)
+			public Collection<PsiFileSystemItem> apply(PsiFile psiFile)
 			{
 				final PsiElement context = psiFile.getContext();
 				if(context instanceof PsiLanguageInjectionHost)
@@ -184,7 +178,7 @@ private static void appendFileSystemRoot(final Collection<VirtualFile> dirs, fin
 
 	private static void appendSdkAndLibraryClassRoots(List<VirtualFile> dirs, PsiFile psiFile)
 	{
-		final Module module = ModuleUtil.findModuleForPsiElement(psiFile);
+		final Module module = ModuleUtilCore.findModuleForPsiElement(psiFile);
 		if(module != null)
 		{
 			final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
@@ -192,7 +186,7 @@ private static void appendSdkAndLibraryClassRoots(List<VirtualFile> dirs, PsiFil
 			{
 				if(orderEntry instanceof OrderEntryWithTracking)
 				{
-					dirs.addAll(Arrays.asList(orderEntry.getFiles(OrderRootType.CLASSES)));
+					dirs.addAll(Arrays.asList(orderEntry.getFiles(BinariesOrderRootType.getInstance())));
 				}
 			}
 		}
@@ -200,7 +194,6 @@ private static void appendSdkAndLibraryClassRoots(List<VirtualFile> dirs, PsiFil
 
 	public static class LookupOptions
 	{
-
 		// default is absolute or relative to current file
 		public static final LookupOptions DEFAULT = new LookupOptions(false, true, true, false, false, false, false);
 		public static final LookupOptions MX_STYLE_SOURCE = new LookupOptions(false, true, true, true, true, false, true);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
index 27fa9414..aba9d663 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
@@ -24,12 +24,12 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.VariantsProcessor;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
+import consulo.language.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index 212fda56..f83d484a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -17,27 +17,31 @@
 package com.intellij.lang.javascript.psi.resolve;
 
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.index.JSSymbolUtil;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.*;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlToken;
-import com.intellij.util.ArrayUtil;
-import consulo.javascript.lang.JavaScriptFeature;
+import consulo.document.util.TextRange;
+import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.lang.JavaScriptVersionUtil;
+import consulo.javascript.language.JavaScriptVersionUtil;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.inject.InjectedLanguageManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiLanguageInjectionHost;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.util.collection.ArrayUtil;
 import consulo.util.dataholder.Key;
+import consulo.util.lang.Pair;
+import consulo.util.lang.StringUtil;
+import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.psi.xml.XmlToken;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index dc468674..84b61da6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -23,26 +23,26 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSClassBase;
 import com.intellij.lang.javascript.psi.impl.JSStubElementImpl;
-import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.UserDataCache;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.util.CachedValue;
-import com.intellij.psi.util.CachedValueProvider;
-import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.PsiModificationTracker;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.util.Processor;
 import com.intellij.xml.XmlElementDescriptor;
+import consulo.application.util.CachedValue;
+import consulo.application.util.CachedValueProvider;
+import consulo.application.util.CachedValuesManager;
+import consulo.application.util.UserDataCache;
+import consulo.application.util.function.Processor;
+import consulo.component.extension.Extensions;
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
-import consulo.lang.LanguageVersion;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiModificationTracker;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.version.LanguageVersion;
 import consulo.util.dataholder.Key;
+import consulo.util.lang.ref.Ref;
+import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.psi.xml.XmlTag;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
index 85190dda..8cce5e44 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import com.intellij.psi.PsiElement;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
+import consulo.language.psi.PsiElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index bae8080c..dcfedb92 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -16,11 +16,8 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import com.intellij.ide.highlighter.XmlFileType;
-import com.intellij.injected.editor.VirtualFileWindow;
 import com.intellij.javascript.documentation.JSDocumentationProvider;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
@@ -34,51 +31,55 @@
 import com.intellij.lang.javascript.psi.impl.JSFileImpl;
 import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
 import com.intellij.lang.javascript.psi.impl.JSStubElementImpl;
-import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.roots.ProjectFileIndex;
-import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.UserDataCache;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.VfsUtil;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
-import com.intellij.psi.impl.light.LightElement;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.search.FilenameIndex;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.LocalSearchScope;
-import com.intellij.psi.search.SearchScope;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubIndex;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.*;
-import com.intellij.psi.xml.*;
-import com.intellij.testFramework.LightVirtualFile;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.IncorrectOperationException;
-import com.intellij.util.Processor;
-import com.intellij.util.SmartList;
-import com.intellij.util.indexing.FileBasedIndex;
-import com.intellij.util.text.StringTokenizer;
 import com.intellij.xml.XmlElementDescriptor;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptVersionUtil;
-import consulo.javascript.lang.psi.JavaScriptType;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.application.util.*;
+import consulo.application.util.function.Processor;
+import consulo.component.extension.Extensions;
+import consulo.content.base.BinariesOrderRootType;
+import consulo.content.bundle.Sdk;
+import consulo.content.scope.SearchScope;
+import consulo.javascript.language.JavaScriptVersionUtil;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
-import consulo.roots.types.BinariesOrderRootType;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.TokenSet;
+import consulo.language.editor.util.PsiUtilBase;
+import consulo.language.file.inject.VirtualFileWindow;
+import consulo.language.file.light.LightVirtualFile;
+import consulo.language.impl.psi.LightElement;
+import consulo.language.inject.InjectedLanguageManager;
+import consulo.language.psi.*;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.language.psi.scope.LocalSearchScope;
+import consulo.language.psi.search.FilenameIndex;
+import consulo.language.psi.stub.FileBasedIndex;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubIndex;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.util.ModuleUtilCore;
+import consulo.module.Module;
+import consulo.module.content.ProjectFileIndex;
+import consulo.module.content.ProjectRootManager;
+import consulo.project.Project;
+import consulo.util.collection.ArrayUtil;
+import consulo.util.collection.SmartList;
 import consulo.util.collection.primitive.ints.IntMaps;
 import consulo.util.collection.primitive.ints.IntObjectMap;
 import consulo.util.dataholder.Key;
+import consulo.util.lang.Comparing;
+import consulo.util.lang.StringUtil;
+import consulo.util.lang.ref.Ref;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
+import consulo.xml.ide.highlighter.XmlFileType;
+import consulo.xml.psi.xml.*;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -104,12 +105,13 @@ public class JSResolveUtil
 
 	public static void processInjectedFileForTag(final @Nonnull XmlTag tag, @Nonnull JSInjectedFilesVisitor visitor)
 	{
+		InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(tag.getProject());
 
 		for(XmlTagChild child : tag.getValue().getChildren())
 		{
 			if(child instanceof XmlText)
 			{
-				InjectedLanguageUtil.enumerate(child, visitor);
+				injectedLanguageManager.enumerate(child, visitor);
 			}
 		}
 	}
@@ -152,7 +154,7 @@ public static String getExpectedPackageNameFromFile(VirtualFile file, Project pr
 
 			if(rootForFile != null)
 			{
-				return VfsUtil.getRelativePath(file.isDirectory() ? file : file.getParent(), rootForFile, '.');
+				return VirtualFileUtil.getRelativePath(file.isDirectory() ? file : file.getParent(), rootForFile, '.');
 			}
 		}
 		return null;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index b61d4639..c4d9fc04 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
@@ -24,20 +23,21 @@
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
 import com.intellij.lang.javascript.psi.util.JSLookupUtil;
 import com.intellij.lang.javascript.validation.JSUnusedImportsHelper;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.SmartList;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.util.collection.ArrayUtil;
+import consulo.util.collection.SmartList;
 import consulo.util.dataholder.Key;
 import consulo.util.dataholder.UserDataHolderBase;
+import consulo.xml.psi.xml.XmlAttributeValue;
+import consulo.xml.psi.xml.XmlTag;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index 9fcd87a9..6c8a0a12 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -16,19 +16,19 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSLookupUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.ArrayUtil;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
+import consulo.language.editor.completion.lookup.LookupElement;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 
 import java.util.*;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
index d080e643..3c0e4adf 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
@@ -16,25 +16,24 @@
 
 package com.intellij.lang.javascript.psi.resolve;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.index.JSSymbolUtil;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.util.ArrayUtil;
-import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.util.collection.ArrayUtil;
+import consulo.xml.psi.xml.XmlAttributeValue;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
index 9f4ef770..e4f2e7d9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
@@ -19,9 +19,9 @@
 
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubBase;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubBase;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
index 6d671be6..329afba5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
@@ -20,7 +20,7 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
index a5192162..3763b7bb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
@@ -20,7 +20,7 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSAttribute;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
index 5f1acefb..61adbf5a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
@@ -19,8 +19,8 @@
 
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.IStubElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
index 8c847594..e96a1eee 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
@@ -18,9 +18,9 @@
 package com.intellij.lang.javascript.psi.stubs.impl;
 
 import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
index 0cb9dc22..3f699af4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
@@ -18,10 +18,10 @@
 package com.intellij.lang.javascript.psi.stubs.impl;
 
 import com.intellij.lang.javascript.psi.JSImportStatement;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
-import com.intellij.psi.stubs.StubBase;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubBase;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
index 5583c3a7..d4d8f403 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
@@ -18,10 +18,10 @@
 package com.intellij.lang.javascript.psi.stubs.impl;
 
 import com.intellij.lang.javascript.psi.JSIncludeDirective;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSIncludeDirectiveStub;
-import com.intellij.psi.stubs.StubBase;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubBase;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
index f3209ada..4678ca8d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
@@ -17,10 +17,10 @@
 
 package com.intellij.lang.javascript.psi.stubs.impl;
 
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubBase;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.stub.StubBase;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
index 2560d64c..a8ca1e75 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
@@ -19,8 +19,8 @@
 
 import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
 import com.intellij.lang.javascript.psi.stubs.JSNamespaceDeclarationStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.IStubElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
index a16cfe9f..053c358b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
@@ -19,8 +19,8 @@
 
 import com.intellij.lang.javascript.psi.JSPackageStatement;
 import com.intellij.lang.javascript.psi.stubs.JSPackageStatementStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
index 43fabe19..a9b32d7c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
@@ -19,9 +19,9 @@
 
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.stubs.JSParameterListStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubBase;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubBase;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.IStubElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
index b39908ea..45a00d67 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
@@ -19,8 +19,8 @@
 
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.stubs.JSParameterStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
index 8a7c6273..39aaeb61 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
@@ -19,8 +19,8 @@
 
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.stubs.JSQualifiedStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.IStubElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
index 069f2840..4ba9b59c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
@@ -18,10 +18,10 @@
 package com.intellij.lang.javascript.psi.stubs.impl;
 
 import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
-import com.intellij.psi.stubs.StubBase;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubBase;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
index a02679b1..69afd05d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
@@ -19,9 +19,9 @@
 
 import com.intellij.lang.javascript.psi.JSUseNamespaceDirective;
 import com.intellij.lang.javascript.psi.stubs.JSUseNamespaceDirectiveStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubBase;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubBase;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
index a4d9c04e..9fb1f69b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
@@ -19,9 +19,9 @@
 
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubBase;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubBase;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
index 83a694db..898ade13 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
@@ -19,8 +19,8 @@
 
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
index e37ac459..a3745f3f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
@@ -19,8 +19,8 @@
 
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStub;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.IStubElementType;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
index 3cb80ef3..df2a4e13 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
@@ -16,17 +16,17 @@
 
 package com.intellij.lang.javascript.psi.util;
 
-import com.intellij.codeInsight.completion.PrioritizedLookupElement;
-import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import consulo.component.util.Iconable;
+import consulo.language.editor.completion.lookup.LookupElement;
+import consulo.language.editor.completion.lookup.PrioritizedLookupElement;
+import consulo.language.editor.completion.lookup.ParenthesesInsertHandler;
+import consulo.language.editor.completion.lookup.LookupElementBuilder;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.util.Iconable;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
+import consulo.util.lang.StringUtil;
+import consulo.language.psi.PsiElement;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.ide.IconDescriptorUpdaters;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.language.icon.IconDescriptorUpdaters;
+import consulo.javascript.language.psi.JavaScriptType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
index 0cdb9d5b..b1e52c19 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
@@ -16,32 +16,20 @@
 
 package com.intellij.lang.javascript.psi.util;
 
-import static com.intellij.lang.javascript.JSElementTypes.ASSIGNMENT_EXPRESSION;
-import static com.intellij.lang.javascript.JSElementTypes.BINARY_EXPRESSION;
-import static com.intellij.lang.javascript.JSElementTypes.CONDITIONAL_EXPRESSION;
-import static com.intellij.lang.javascript.JSElementTypes.POSTFIX_EXPRESSION;
-import static com.intellij.lang.javascript.JSElementTypes.PREFIX_EXPRESSION;
+import com.intellij.lang.javascript.psi.*;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.template.TemplateLanguageFileViewProvider;
+import consulo.xml.psi.xml.XmlAttributeValue;
+import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.psi.xml.XmlTagChild;
+
+import static com.intellij.lang.javascript.JSElementTypes.*;
 import static com.intellij.lang.javascript.JSTokenTypes.*;
 
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSCallExpression;
-import com.intellij.lang.javascript.psi.JSDefinitionExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSIndexedPropertyAccessExpression;
-import com.intellij.lang.javascript.psi.JSNewExpression;
-import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlTagChild;
-
 /**
  * @author max
  */
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
index c8622abb..577d649e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
@@ -19,9 +19,9 @@
 import java.util.Collection;
 
 import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.search.GlobalSearchScope;
+import consulo.component.extension.ExtensionPointName;
+import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.project.Project;
 
 public interface JSClassInheritorsProvider
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index ae2c888d..9554517d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -18,14 +18,18 @@
 
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.SearchScope;
-import com.intellij.psi.stubs.StubIndex;
-import com.intellij.psi.stubs.StubIndexKey;
-import com.intellij.util.*;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.application.util.function.CommonProcessors;
+import consulo.application.util.function.Processor;
+import consulo.application.util.query.Query;
+import consulo.application.util.query.QueryExecutor;
+import consulo.application.util.query.QueryFactory;
+import consulo.component.extension.Extensions;
+import consulo.content.scope.SearchScope;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.language.psi.stub.StubIndex;
+import consulo.language.psi.stub.StubIndexKey;
+import consulo.project.Project;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
index 2bdbe471..5cac7445 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
@@ -22,17 +22,17 @@
 import javax.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttribute;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.impl.JSAttributeImpl;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSAttributeStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubOutputStream;
+import consulo.index.io.StringRef;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubInputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
index 76fe0570..72535cd1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
@@ -17,22 +17,21 @@
 
 package com.intellij.lang.javascript.types;
 
-import java.io.IOException;
-
-import javax.annotation.Nonnull;
-
-import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.impl.JSAttributeListImpl;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSAttributeListStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.index.io.StringRef;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
index 20d0e878..683be6c4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
@@ -22,17 +22,17 @@
 import javax.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.impl.JSAttributeNameValuePairImpl;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSAttributeNameValuePairStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.index.io.StringRef;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
index 2f055343..78a1b51f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
@@ -17,24 +17,24 @@
 
 package com.intellij.lang.javascript.types;
 
-import java.io.IOException;
-
-import javax.annotation.Nonnull;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import com.intellij.lang.javascript.psi.stubs.impl.JSClassStubImpl;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.IndexSink;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.index.io.StringRef;
 import consulo.javascript.types.JSQualifiedStubElementType;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.IndexSink;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
+import consulo.util.lang.StringUtil;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index 0b8ea720..a213b251 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -16,16 +16,14 @@
  */
 package com.intellij.lang.javascript.types;
 
-import com.intellij.lang.Language;
 import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.StubBuilder;
-import com.intellij.psi.stubs.*;
-import com.intellij.psi.tree.IStubFileElementType;
-import com.intellij.util.io.StringRef;
+import consulo.index.io.StringRef;
+import consulo.language.psi.stub.*;
 import consulo.javascript.index.JavaScriptIndexer;
 import consulo.javascript.psi.stubs.JSFileStub;
-import consulo.javascript.psi.stubs.impl.JSFileStubImpl;
+import consulo.javascript.impl.language.psi.stub.JSFileStubImpl;
+import consulo.language.Language;
+import consulo.language.psi.PsiFile;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
index 08ce9a85..b39d92e0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
@@ -25,11 +25,11 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSFunctionStubImpl;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
+import consulo.index.io.StringRef;
 import consulo.javascript.types.JSQualifiedStubElementType;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
index 88c1fbf5..56af7669 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
@@ -22,17 +22,17 @@
 import javax.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSImportStatement;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.impl.JSImportStatementImpl;
 import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSImportStatementStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.index.io.StringRef;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubOutputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
index f7a5a6b2..25e9bd7f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
@@ -22,17 +22,17 @@
 import javax.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
+import consulo.index.io.StringRef;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSIncludeDirective;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.impl.JSIncludeDirectiveImpl;
 import com.intellij.lang.javascript.psi.stubs.JSIncludeDirectiveStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSIncludeDirectiveStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
index 82115176..50208692 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
@@ -22,17 +22,17 @@
 import javax.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
 import com.intellij.lang.javascript.psi.impl.JSNamespaceDeclarationImpl;
 import com.intellij.lang.javascript.psi.stubs.JSNamespaceDeclarationStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSNamespaceDeclarationStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.language.psi.PsiElement;
+import consulo.index.io.StringRef;
 import consulo.javascript.types.JSQualifiedStubElementType;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
index 09681200..63a378c1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
@@ -22,17 +22,17 @@
 import javax.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.impl.JSPackageStatementImpl;
 import com.intellij.lang.javascript.psi.stubs.JSPackageStatementStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSPackageStatementStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.index.io.StringRef;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
index 21935479..d9289741 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
@@ -21,17 +21,17 @@
 
 import javax.annotation.Nonnull;
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.impl.JSParameterImpl;
 import com.intellij.lang.javascript.psi.stubs.JSParameterStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSParameterStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubOutputStream;
+import consulo.index.io.StringRef;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubInputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
index aba46952..81e178ca 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
@@ -17,21 +17,20 @@
 
 package com.intellij.lang.javascript.types;
 
-import java.io.IOException;
-
-import javax.annotation.Nonnull;
-
-import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSParameterList;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.impl.JSParameterListImpl;
 import com.intellij.lang.javascript.psi.stubs.JSParameterListStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSParameterListStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
index 1a940ada..9987de92 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
@@ -21,25 +21,21 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.*;
 import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSReferenceList;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.impl.JSReferenceListImpl;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSReferenceListStubImpl;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.IndexSink;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubIndexKey;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.io.StringRef;
+import consulo.util.lang.StringUtil;
+import consulo.util.collection.ArrayUtil;
+import consulo.index.io.StringRef;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
index c8f239da..be953d24 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
@@ -22,17 +22,17 @@
 import javax.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.index.io.StringRef;
+import consulo.language.ast.ASTNode;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.JSUseNamespaceDirective;
 import com.intellij.lang.javascript.psi.impl.JSUseNamespaceDirectiveImpl;
 import com.intellij.lang.javascript.psi.stubs.JSUseNamespaceDirectiveStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSUseNamespaceDirectiveStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubOutputStream;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubInputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
index 34a1dd52..13d7987e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
@@ -22,19 +22,19 @@
 import javax.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.impl.JSVarStatementImpl;
 import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSVarStatementStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.StubElement;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
index 35d71ea8..f9fc22c5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
@@ -22,20 +22,20 @@
 import javax.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.impl.JSVariableImpl;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStub;
 import com.intellij.lang.javascript.psi.stubs.impl.JSVariableStubImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.stubs.StubInputStream;
-import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.io.StringRef;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.stub.StubElement;
+import consulo.index.io.StringRef;
 import consulo.javascript.types.JSQualifiedStubElementType;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubInputStream;
+import consulo.language.psi.stub.StubOutputStream;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index 1d80528e..90b1edb1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -21,19 +21,23 @@
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.search.PsiElementProcessor;
-import com.intellij.psi.util.*;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlText;
+import consulo.application.util.CachedValue;
+import consulo.application.util.CachedValueProvider;
+import consulo.application.util.CachedValuesManager;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiModificationTracker;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.resolve.PsiElementProcessor;
+import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.dataholder.Key;
+import consulo.util.lang.Pair;
+import consulo.util.lang.StringUtil;
+import consulo.xml.psi.xml.XmlAttributeValue;
+import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.psi.xml.XmlText;
 
 import javax.annotation.Nullable;
 import java.util.*;
diff --git a/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java b/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java
index 2452e3c7..36c939fd 100644
--- a/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java
+++ b/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java
@@ -1,7 +1,7 @@
 package consulo.javascript.ecmascript4.psi.impl;
 
 import com.intellij.lang.javascript.psi.JSImportStatement;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
 import com.intellij.lang.javascript.types.JSImportStatementElementType;
 
diff --git a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
index e2d8509d..f2c1df68 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
@@ -16,40 +16,50 @@
 
 package consulo.javascript.ide.codeInsight;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
-import com.intellij.openapi.util.KeyedExtensionCollector;
-import com.intellij.psi.PsiElement;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import consulo.lang.LanguageVersion;
+import consulo.javascript.language.JavaScriptLanguageVersion;
+import consulo.language.psi.PsiElement;
+import consulo.language.version.LanguageVersion;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 23.02.2016
  */
-public class JavaScriptQuickFixFactory
+public abstract class JavaScriptQuickFixFactory
 {
-	private static final JavaScriptQuickFixFactory ourDefaultImpl = new JavaScriptQuickFixFactory();
+	private static final JavaScriptQuickFixFactory ourDefaultImpl = new JavaScriptQuickFixFactory()
+	{
+		@Override
+		public boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version)
+		{
+			return true;
+		}
+	};
 
 	@Nonnull
 	public static JavaScriptQuickFixFactory byElement(PsiElement element)
 	{
 		LanguageVersion languageVersion = element.getLanguageVersion();
-		if(languageVersion instanceof BaseJavaScriptLanguageVersion)
+		if(languageVersion instanceof BaseJavaScriptLanguageVersion jsVersion)
 		{
-			JavaScriptQuickFixFactory quickFixFactory = EP.findSingle(languageVersion.getName());
-			if(quickFixFactory != null)
+			for(JavaScriptQuickFixFactory factory : element.getProject().getApplication().getExtensionList(JavaScriptQuickFixFactory.class))
 			{
-				return quickFixFactory;
+				if(factory.isMyVersion(jsVersion))
+				{
+					return factory;
+				}
 			}
 		}
 		return ourDefaultImpl;
 	}
 
-	public static final KeyedExtensionCollector<JavaScriptQuickFixFactory, String> EP = new KeyedExtensionCollector<>("consulo.javascript.quickFixFactory");
-
 	public CreateJSFunctionOrMethodFix createFunctionOrMethodFix(String referenceName, boolean isMethod)
 	{
 		return new CreateJSFunctionOrMethodFix(referenceName, isMethod);
 	}
+
+	public abstract boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version);
 }
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
index 512a3f45..5670f88c 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
@@ -16,24 +16,24 @@
 
 package consulo.javascript.ide.hightlight;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSDocElementType;
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.highlighting.JavaScriptHighlightingLexer;
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.editor.XmlHighlighterColors;
-import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
-import com.intellij.openapi.util.Factory;
-import com.intellij.psi.StringEscapesTokenTypes;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.util.Processor;
+import consulo.application.util.function.Processor;
+import consulo.colorScheme.TextAttributesKey;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.StringEscapesTokenTypes;
+import consulo.language.ast.TokenSet;
+import consulo.language.editor.highlight.SyntaxHighlighterBase;
+import consulo.language.impl.ast.Factory;
+import consulo.language.lexer.Lexer;
+import consulo.xml.editor.XmlHighlighterColors;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
@@ -120,9 +120,9 @@ public boolean process(IElementType type)
 		keys1.put(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
 	}
 
-	private Factory<Lexer> myFactory;
+	private Supplier<Lexer> myFactory;
 
-	public JavaScriptHighlighter(@Nonnull Factory<Lexer> factory)
+	public JavaScriptHighlighter(@Nonnull Supplier<Lexer> factory)
 	{
 		myFactory = factory;
 	}
diff --git a/plugin/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
similarity index 62%
rename from plugin/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
rename to base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
index a0548493..badb2bb9 100644
--- a/plugin/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
@@ -1,22 +1,20 @@
 package consulo.javascript.ide.hightlight;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import consulo.fileTypes.LanguageVersionableSyntaxHighlighterFactory;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.lang.LanguageVersion;
+import consulo.language.editor.highlight.LanguageVersionableSyntaxHighlighterFactory;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.version.LanguageVersion;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 05.03.2015
  */
-public class JavaScriptSyntaxHighlightFactory extends LanguageVersionableSyntaxHighlighterFactory
+public abstract class JavaScriptSyntaxHighlightFactory extends LanguageVersionableSyntaxHighlighterFactory
 {
 	public JavaScriptSyntaxHighlightFactory()
 	{
-		super(JavaScriptLanguage.INSTANCE);
 	}
 
 	@Nonnull
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
index 7f59afb7..7a70f997 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
@@ -16,10 +16,10 @@
 
 package consulo.javascript.ide.hightlight;
 
-import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
-import com.intellij.openapi.editor.HighlighterColors;
-import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.editor.markup.TextAttributes;
+import consulo.codeEditor.DefaultLanguageHighlighterColors;
+import consulo.colorScheme.TextAttributes;
+import consulo.colorScheme.TextAttributesKey;
+import consulo.codeEditor.HighlighterColors;
 import consulo.ui.color.RGBColor;
 import consulo.ui.style.StandardColors;
 
@@ -60,12 +60,12 @@ public interface JavaScriptSyntaxHighlightKeys
 	TextAttributesKey JS_BAD_CHARACTER = TextAttributesKey.createTextAttributesKey("JS.BADCHARACTER", HighlighterColors.BAD_CHARACTER);
 	TextAttributesKey JS_DOC_TAG = TextAttributesKey.createTextAttributesKey("JS.DOC_TAG", DefaultLanguageHighlighterColors.DOC_COMMENT_TAG);
 	TextAttributesKey JS_DOC_MARKUP = TextAttributesKey.createTextAttributesKey("JS.DOC_MARKUP", DefaultLanguageHighlighterColors.DOC_COMMENT_MARKUP);
-	TextAttributesKey JS_VALID_STRING_ESCAPE = TextAttributesKey.createTextAttributesKey("JS.VALID_STRING_ESCAPE", DefaultLanguageHighlighterColors.VALID_STRING_ESCAPE);
+	TextAttributesKey JS_VALID_STRING_ESCAPE = TextAttributesKey.createTextAttributesKey("JS.VALID_STRING_ESCAPE",DefaultLanguageHighlighterColors.VALID_STRING_ESCAPE);
 	TextAttributesKey JS_INVALID_STRING_ESCAPE = TextAttributesKey.createTextAttributesKey("JS.INVALID_STRING_ESCAPE", DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE);
 	TextAttributesKey JS_LOCAL_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.LOCAL_VARIABLE", DefaultLanguageHighlighterColors.LOCAL_VARIABLE);
 	TextAttributesKey JS_PARAMETER = TextAttributesKey.createTextAttributesKey("JS.PARAMETER", DefaultLanguageHighlighterColors.PARAMETER);
 	TextAttributesKey JS_INSTANCE_MEMBER_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.INSTANCE_MEMBER_VARIABLE", DefaultLanguageHighlighterColors.INSTANCE_FIELD);
-	TextAttributesKey JS_STATIC_MEMBER_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.STATIC_MEMBER_VARIABLE", DefaultLanguageHighlighterColors.STATIC_FIELD);
+	TextAttributesKey JS_STATIC_MEMBER_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.STATIC_MEMBER_VARIABLE",DefaultLanguageHighlighterColors.STATIC_FIELD);
 	TextAttributesKey JS_GLOBAL_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.GLOBAL_VARIABLE", DefaultLanguageHighlighterColors.STATIC_FIELD);
 	TextAttributesKey JS_GLOBAL_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.GLOBAL_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
 	TextAttributesKey JS_STATIC_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.STATIC_MEMBER_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
similarity index 93%
rename from base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
rename to base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
index ce133bdf..2ab51448 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JSComputedNameImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package consulo.javascript.psi.impl;
+package consulo.javascript.impl.language.psi;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import consulo.javascript.psi.JSComputedName;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
similarity index 87%
rename from base-impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
rename to base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
index d8e30133..f2aaa804 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSElementFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.psi;
+package consulo.javascript.impl.language.psi;
 
-import javax.annotation.Nonnull;
+import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.impl.JSExpressionCodeFragmentImpl;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author nik
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
similarity index 72%
rename from base-impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
rename to base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
index 657ad9a0..70ce3c05 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/JSStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
@@ -17,21 +17,20 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.psi;
+package consulo.javascript.impl.language.psi;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
+import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.stubs.JSStubElement;
-import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.psi.stubs.IndexSink;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.psi.tree.IElementTypeAsPsiFactory;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.ast.IElementTypeAsPsiFactory;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.IndexSink;
+
+import javax.annotation.Nonnull;
 
-public abstract class JSStubElementType<StubT extends JSStubElement<PsiT>, PsiT extends JSElement> extends IStubElementType<StubT,
-		PsiT> implements IElementTypeAsPsiFactory
+public abstract class JSStubElementType<StubT extends JSStubElement<PsiT>, PsiT extends JSElement> extends IStubElementType<StubT, PsiT> implements IElementTypeAsPsiFactory
 {
-	public JSStubElementType(@NonNls String debugName)
+	public JSStubElementType(String debugName)
 	{
 		super(debugName, JavaScriptLanguage.INSTANCE);
 	}
@@ -39,7 +38,7 @@ public JSStubElementType(@NonNls String debugName)
 	@Override
 	public String toString()
 	{
-		return "JS:" + super.toString();
+		return "js." + super.toString();
 	}
 
 	@Override
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
similarity index 89%
rename from base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
rename to base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
index 271f6ca5..bb0a63b1 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptLambdaExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package consulo.javascript.psi.impl;
+package consulo.javascript.impl.language.psi;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSExpressionImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.access.RequiredWriteAction;
-import consulo.javascript.lang.psi.JavaScriptType;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
similarity index 87%
rename from base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java
rename to base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
index 6b6c35fe..4001d56f 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/impl/JavaScriptSpreadExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
@@ -1,12 +1,12 @@
-package consulo.javascript.psi.impl;
+package consulo.javascript.impl.language.psi;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSSpreadExpression;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
similarity index 80%
rename from base-impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
rename to base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
index 9497d7bc..7100e0eb 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/stubs/impl/JSFileStubImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
@@ -1,13 +1,14 @@
-package consulo.javascript.psi.stubs.impl;
+package consulo.javascript.impl.language.psi.stub;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSFile;
+import consulo.index.io.StringRef;
 import consulo.javascript.psi.stubs.JSFileStub;
-import com.intellij.psi.stubs.PsiFileStubImpl;
-import com.intellij.psi.tree.IStubFileElementType;
-import com.intellij.util.io.StringRef;
+import consulo.language.psi.stub.IStubFileElementType;
+import consulo.language.psi.stub.PsiFileStubImpl;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
similarity index 80%
rename from base-impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
rename to base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
index d5af6b3d..0ad1f4bd 100644
--- a/base-impl/src/main/java/consulo/javascript/psi/stubs/index/JavaScriptClassNameIndex.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
@@ -17,14 +17,14 @@
 /*
  * @author max
  */
-package consulo.javascript.psi.stubs.index;
-
-import javax.annotation.Nonnull;
+package consulo.javascript.impl.language.psi.stub;
 
 import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.psi.stubs.StringStubIndexExtension;
-import com.intellij.psi.stubs.StubIndexKey;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.language.psi.stub.StringStubIndexExtension;
+import consulo.language.psi.stub.StubIndexKey;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index 26484691..30741b9d 100644
--- a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -17,19 +17,19 @@
 
 package consulo.javascript.inspections.qucikFixes;
 
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import org.jetbrains.annotations.PropertyKey;
-import com.intellij.codeInsight.template.Template;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.language.editor.template.Template;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import org.jetbrains.annotations.PropertyKey;
+
+import javax.annotation.Nonnull;
+import java.util.Set;
 
 /**
 * @author VISTALL
@@ -63,7 +63,7 @@ public String getFamilyName()
 	@RequiredReadAction
 	@Override
 	protected void buildTemplate(Template template, JSReferenceExpression referenceExpression, Set<JavaScriptFeature> features, boolean staticContext, PsiFile file,
-			PsiElement anchorParent)
+								 PsiElement anchorParent)
 	{
 		boolean classFeature = features.contains(JavaScriptFeature.CLASS);
 		String referencedName = classFeature ? referenceExpression.getReferencedName() : referenceExpression.getText();
diff --git a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index e16e347e..fb890b73 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -1,13 +1,16 @@
 package consulo.javascript.lang;
 
-import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.util.containers.ArrayListSet;
 import consulo.javascript.lang.parsing.JavaScriptParser;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguageVersion;
+import consulo.language.ast.TokenSet;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.parser.PsiParser;
 
 import javax.annotation.Nonnull;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 /**
@@ -18,7 +21,7 @@ public abstract class BaseJavaScriptLanguageVersion extends JavaScriptLanguageVe
 {
 	private static TokenSet ourLiterals = TokenSet.orSet(JavaScriptTokenSets.STRING_LITERALS, TokenSet.create(JSTokenTypes.NUMERIC_LITERAL));
 
-	private Set<JavaScriptFeature> myFeatures = new ArrayListSet<>();
+	private Set<JavaScriptFeature> myFeatures = new LinkedHashSet<>();
 
 	public BaseJavaScriptLanguageVersion(String name, String... mimeTypes)
 	{
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
index b81c3552..9757da90 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -1,12 +1,14 @@
 package consulo.javascript.lang;
 
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScript15Lexer;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.lexer.Lexer;
 
 import javax.annotation.Nonnull;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
@@ -14,7 +16,7 @@
  */
 public class JavaScript15LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
-	private static final Factory<Lexer> ourLexerFactory = () -> new JavaScript15Lexer();
+	private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript15Lexer();
 
 	@Nonnull
 	public static JavaScript15LanguageVersion getInstance()
@@ -37,7 +39,7 @@ public String getPresentableName()
 	@Override
 	public Lexer createLexer()
 	{
-		return ourLexerFactory.create();
+		return ourLexerFactory.get();
 	}
 
 	@Nonnull
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
index b3983c2f..77510a67 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
@@ -3,7 +3,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.intellij.lang.javascript.JSElementType;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
index b443b225..295c376b 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
@@ -18,7 +18,7 @@
 
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.tree.TokenSet;
+import consulo.language.ast.TokenSet;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index 2417b1d0..d3ce9d5d 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -1,7 +1,10 @@
 package consulo.javascript.lang;
 
-import com.intellij.openapi.util.text.StringUtil;
-import consulo.lang.LanguageVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguageVersion;
+import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.language.version.LanguageVersion;
+import consulo.util.lang.StringUtil;
 import jakarta.inject.Singleton;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
index 28d08ca1..8aa2278a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
@@ -16,8 +16,8 @@
 
 package consulo.javascript.lang.lexer;
 
-import com.intellij.lexer.FlexAdapter;
-import com.intellij.lexer.FlexLexer;
+import consulo.language.lexer.FlexAdapter;
+import consulo.language.lexer.FlexLexer;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java
index 69fe574f..3539ceff 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java
@@ -1,6 +1,6 @@
 package consulo.javascript.lang.lexer;
 
-import com.intellij.lexer.FlexLexer;
+import consulo.language.lexer.FlexLexer;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex b/base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
index 3dc80180..3be3d709 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
+++ b/base-impl/src/main/java/consulo/javascript/lang/lexer/javascript15.flex
@@ -1,7 +1,7 @@
 package consulo.javascript.lang.lexer;
 
-import com.intellij.lexer.LexerBase;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.lexer.LexerBase;
+import consulo.language.ast.IElementType;
 import com.intellij.lang.javascript.JSTokenTypes;
 
 %%
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 950513fa..b7a18f0b 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -17,13 +17,13 @@
 package consulo.javascript.lang.parsing;
 
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 import consulo.util.dataholder.Key;
 
@@ -1009,7 +1009,7 @@ public boolean parseExpressionOptional(final PsiBuilder builder, final boolean a
 		return true;
 	}
 
-	protected boolean tryParseType(final PsiBuilder builder)
+	public boolean tryParseType(final PsiBuilder builder)
 	{
 		return false;
 	}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index cd901fd2..9e111f13 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -16,10 +16,10 @@
 
 package consulo.javascript.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.parser.PsiBuilder;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index a71fdb71..a504887a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -1,15 +1,15 @@
 package consulo.javascript.lang.parsing;
 
-import com.intellij.codeInsight.daemon.XmlErrorMessages;
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.TokenType;
-import com.intellij.psi.tree.ICustomParsingType;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.ILazyParseableElementType;
-import com.intellij.psi.xml.XmlElementType;
-import com.intellij.psi.xml.XmlTokenType;
+import consulo.language.ast.ICustomParsingType;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.ILazyParseableElementType;
+import consulo.language.ast.TokenType;
+import consulo.language.parser.PsiBuilder;
+import consulo.xml.codeInsight.daemon.XmlErrorMessages;
+import consulo.xml.psi.xml.XmlElementType;
+import consulo.xml.psi.xml.XmlTokenType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -17,8 +17,8 @@
 
 /**
  * @author VISTALL
- * @see com.intellij.psi.impl.source.parsing.xml.XmlParsing
- * @see com.intellij.lang.html.HtmlParsing
+ * @see XmlParsing
+ * @see HtmlParsing
  * @since 2019-12-17
  */
 public class JSXParser
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
index 1a28a77c..c2f3d4d5 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
@@ -1,11 +1,12 @@
 package consulo.javascript.lang.parsing;
 
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.parser.PsiBuilder;
+import consulo.language.parser.PsiParser;
+import consulo.language.version.LanguageVersion;
+
 import javax.annotation.Nonnull;
-import com.intellij.lang.ASTNode;
-import consulo.lang.LanguageVersion;
-import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.PsiParser;
-import com.intellij.psi.tree.IElementType;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
index 797237ca..9dce2832 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
@@ -1,7 +1,7 @@
 package consulo.javascript.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.impl.PsiBuilderAdapter;
+import consulo.language.parser.PsiBuilder;
+import consulo.language.parser.PsiBuilderAdapter;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
index fc009333..ff4fd901 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
@@ -1,10 +1,10 @@
 package consulo.javascript.lang.parsing;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
+import consulo.language.parser.PsiBuilder;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index 848bcc4e..378d513a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -16,12 +16,12 @@
 
 package consulo.javascript.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
 import consulo.javascript.lang.JavaScriptContextKeywordElementType;
 import consulo.javascript.lang.parsing.impl.JavaScriptStrictParserBuilder;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.parser.PsiBuilder;
 import consulo.localize.LocalizeValue;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 7be7f18b..28b1bdb5 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -16,11 +16,11 @@
 
 package consulo.javascript.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.psi.tree.IElementType;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.ast.IElementType;
+import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 
 import javax.annotation.Nonnull;
@@ -267,7 +267,7 @@ PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder)
 	}
 
 
-	void parseIncludeDirective(final PsiBuilder builder)
+	public void parseIncludeDirective(final PsiBuilder builder)
 	{
 		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
 		final PsiBuilder.Marker useNSStatement = builder.mark();
@@ -826,7 +826,7 @@ public void parseFunctionBody(final PsiBuilder builder)
 		parseBlockOrFunctionBody(builder, BlockType.FUNCTION_BODY);
 	}
 
-	enum BlockType
+	public enum BlockType
 	{
 		FUNCTION_BODY, BLOCK, PACKAGE_OR_CLASS_BODY
 	}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
index fa374650..c510669f 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
@@ -1,6 +1,6 @@
 package consulo.javascript.lang.parsing.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSDestructuringElement;
 import com.intellij.lang.javascript.psi.JSDestructuringObject;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
index a6f971d3..7230a7cb 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
@@ -1,12 +1,12 @@
 package consulo.javascript.lang.parsing.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSDestructuringObject;
 import com.intellij.lang.javascript.psi.JSDestructuringShorthandedProperty;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
index a61c5e97..fd91cdb8 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
@@ -1,17 +1,17 @@
 package consulo.javascript.lang.parsing.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.access.RequiredWriteAction;
-import consulo.javascript.lang.psi.JavaScriptType;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
index ef08e36c..c5d358b6 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
@@ -1,6 +1,6 @@
 package consulo.javascript.lang.parsing.impl;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSDestructuringShorthandedProperty;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSVariable;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
index dacd60b9..8f4f0021 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
@@ -1,18 +1,18 @@
 package consulo.javascript.lang.parsing.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.ThreeState;
-import consulo.javascript.lang.JavaScriptConstants;
+import consulo.javascript.language.JavaScriptConstants;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.parsing.JavaScriptParserBuilder;
+import consulo.language.ast.IElementType;
+import consulo.language.parser.PsiBuilder;
+import consulo.util.collection.ArrayUtil;
+import consulo.util.lang.StringUtil;
+import consulo.util.lang.ThreeState;
+
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java
index c937aa80..f31d1b72 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java
@@ -1,7 +1,7 @@
 package consulo.javascript.lang.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl;
+import consulo.language.ast.ASTNode;
 
 /**
  * Own implementation for RegExp literal for correct registration RegExpLanguageHost.
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
index e3fe45c4..4506aa5c 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
@@ -17,9 +17,9 @@
 package consulo.javascript.lang.psi.impl;
 
 import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.psi.PsiElement;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
index 4d59b8bc..f6129e71 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
@@ -17,9 +17,9 @@
 package consulo.javascript.lang.psi.impl.elementType;
 
 import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSStubElement;
-import consulo.javascript.lang.psi.JavaScriptTypeElement;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
index e64ff972..9b9a2296 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
@@ -3,11 +3,11 @@
 import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
 import com.intellij.lang.javascript.psi.resolve.JSImportedElementResolveResult;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.ResolveState;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.lang.LanguageVersion;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.version.LanguageVersion;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
index 10c4afb1..ddc2d655 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
@@ -1,10 +1,14 @@
 package consulo.javascript.lang.viewProvider;
 
-import com.intellij.lang.Language;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.Language;
+import consulo.language.file.FileViewProvider;
+import consulo.language.file.FileViewProviderFactory;
+import consulo.language.impl.file.SingleRootFileViewProvider;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiManager;
 import consulo.util.lang.reflect.ReflectionUtil;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 
diff --git a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
index 5af5199d..732e831e 100644
--- a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
@@ -17,14 +17,14 @@
 
 package consulo.javascript.types;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
-import com.intellij.lang.javascript.psi.JSStubElementType;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSQualifiedStub;
-import com.intellij.psi.stubs.IndexSink;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.language.psi.stub.IndexSink;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/module-info.java b/base-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..c4375519
--- /dev/null
+++ b/base-impl/src/main/java/module-info.java
@@ -0,0 +1,42 @@
+/**
+ * @author VISTALL
+ * @since 23-Aug-22
+ */
+open module consulo.javascript.base.impl
+{
+	requires transitive consulo.javascript.base.api;
+
+	requires com.google.common;
+	requires com.intellij.xml;
+
+	exports com.intellij.javascript.documentation;
+	exports com.intellij.lang.javascript;
+	exports com.intellij.lang.javascript.flex;
+	exports com.intellij.lang.javascript.highlighting;
+	exports com.intellij.lang.javascript.index;
+	exports com.intellij.lang.javascript.inspections.qucikFixes;
+	exports com.intellij.lang.javascript.parsing;
+	exports com.intellij.lang.javascript.psi.impl;
+	exports com.intellij.lang.javascript.psi.impl.reference;
+	exports com.intellij.lang.javascript.psi.resolve;
+	exports com.intellij.lang.javascript.psi.stubs.impl;
+	exports com.intellij.lang.javascript.psi.util;
+	exports com.intellij.lang.javascript.search;
+	exports com.intellij.lang.javascript.types;
+	exports com.intellij.lang.javascript.validation;
+	exports consulo.javascript.ecmascript4.psi.impl;
+	exports consulo.javascript.ide.codeInsight;
+	exports consulo.javascript.ide.hightlight;
+	exports consulo.javascript.inspections.qucikFixes;
+	exports consulo.javascript.lang;
+	exports consulo.javascript.lang.lexer;
+	exports consulo.javascript.lang.parsing;
+	exports consulo.javascript.lang.parsing.impl;
+	exports consulo.javascript.lang.psi.impl;
+	exports consulo.javascript.lang.psi.impl.elementType;
+	exports consulo.javascript.lang.psi.impl.resolve;
+	exports consulo.javascript.lang.viewProvider;
+	exports consulo.javascript.impl.language.psi;
+	exports consulo.javascript.impl.language.psi.stub;
+	exports consulo.javascript.types;
+}
\ No newline at end of file
diff --git a/debugger/debugger-impl/pom.xml b/debugger/debugger-impl/pom.xml
index 7a7929b3..66d58b72 100644
--- a/debugger/debugger-impl/pom.xml
+++ b/debugger/debugger-impl/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-debugger.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
diff --git a/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java b/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
index ba085b7f..a01cd311 100644
--- a/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
+++ b/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
@@ -16,31 +16,24 @@
 
 package com.intellij.javascript;
 
-import java.util.List;
+import consulo.javascript.impl.language.psi.JSElementFactory;
+import com.intellij.lang.javascript.psi.JSFile;
+import com.intellij.lang.javascript.psi.JSNamedElement;
+import consulo.document.Document;
+import consulo.document.FileDocumentManager;
+import consulo.document.util.TextRange;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.inject.InjectedLanguageManager;
+import consulo.language.psi.*;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.project.Project;
+import consulo.util.lang.ref.Ref;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.xml.lang.xml.XMLLanguage;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.lang.javascript.psi.JSElementFactory;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.lang.xml.XMLLanguage;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.fileEditor.FileDocumentManager;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
-import com.intellij.psi.util.PsiTreeUtil;
-import consulo.javascript.lang.JavaScriptLanguage;
+import java.util.List;
 
 /**
  * Created by IntelliJ IDEA.
@@ -81,7 +74,7 @@ public static TextRange getExpressionAtOffset(@Nonnull Project project, @Nonnull
 				final Ref<PsiElement> eltInInjected = new Ref<PsiElement>();
 				final int[] injectedOffset = new int[1];
 
-				InjectedLanguageUtil.enumerate(psiLanguageInjectionHost, new PsiLanguageInjectionHost.InjectedPsiVisitor()
+				InjectedLanguageManager.getInstance(project).enumerate(psiLanguageInjectionHost, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
 					public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
@@ -203,7 +196,7 @@ public static PsiElement getContextElement(VirtualFile virtualFile, int offset,
 				final int finalOffset = offset;
 				final Ref<PsiElement> resultInInjected = new Ref<PsiElement>();
 
-				InjectedLanguageUtil.enumerate(parent, new PsiLanguageInjectionHost.InjectedPsiVisitor()
+				InjectedLanguageManager.getInstance(project).enumerate(parent, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
 					public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
index de0b57eb..30deec9e 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
@@ -18,13 +18,13 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.lang.javascript.psi.JSElementFactory;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.xdebugger.evaluation.XDebuggerEditorsProviderBase;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.javascript.impl.language.psi.JSElementFactory;
+import consulo.execution.debug.evaluation.XDebuggerEditorsProviderBase;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
+import consulo.language.psi.PsiFile;
+import consulo.virtualFileSystem.fileType.FileType;
 
 /**
  * @author VISTALL
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
index 892f32ac..383fb6ee 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
@@ -16,28 +16,31 @@
 
 package consulo.javascript.debugger;
 
+import com.intellij.javascript.JSDebuggerSupportUtils;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.document.Document;
+import consulo.execution.debug.XSourcePosition;
+import consulo.execution.debug.breakpoint.XLineBreakpointTypeBase;
+import consulo.execution.debug.evaluation.EvaluationMode;
+import consulo.execution.debug.evaluation.XDebuggerEditorsProvider;
+import consulo.project.Project;
+import consulo.virtualFileSystem.fileType.FileType;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.javascript.JSDebuggerSupportUtils;
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.project.Project;
-import com.intellij.xdebugger.XSourcePosition;
-import com.intellij.xdebugger.breakpoints.XLineBreakpointTypeBase;
-import com.intellij.xdebugger.evaluation.EvaluationMode;
-import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 
 /**
  * @author VISTALL
  * @since 20.03.14
  */
+@ExtensionImpl
 public class JavaScriptLineBreakpointType extends XLineBreakpointTypeBase
 {
 	@Nonnull
 	public static JavaScriptLineBreakpointType getInstance()
 	{
-		return EXTENSION_POINT_NAME.findExtension(JavaScriptLineBreakpointType.class);
+		return EXTENSION_POINT_NAME.findExtensionOrFail(JavaScriptLineBreakpointType.class);
 	}
 
 	public JavaScriptLineBreakpointType()
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
index a55c6f31..fb78b35a 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
@@ -16,19 +16,23 @@
 
 package consulo.javascript.debugger;
 
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.execution.debug.breakpoint.XLineBreakpointType;
+import consulo.execution.debug.breakpoint.XLineBreakpointTypeResolver;
+import consulo.project.Project;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.virtualFileSystem.fileType.FileType;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.xdebugger.breakpoints.XLineBreakpointType;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.xdebugger.breakpoints.XLineBreakpointTypeResolver;
-
 /**
  * @author VISTALL
  * @since 5/7/2016
  */
+@ExtensionImpl
 public class JavaScriptLineBreakpointTypeResolver implements XLineBreakpointTypeResolver
 {
 	@RequiredReadAction
@@ -38,4 +42,11 @@ public XLineBreakpointType<?> resolveBreakpointType(@Nonnull Project project, @N
 	{
 		return JavaScriptLineBreakpointType.getInstance();
 	}
+
+	@Nonnull
+	@Override
+	public FileType getFileType()
+	{
+		return JavaScriptFileType.INSTANCE;
+	}
 }
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
index 9def9c2f..f5fa3627 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
@@ -16,25 +16,23 @@
 
 package consulo.javascript.debugger;
 
-import java.awt.BorderLayout;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.Comparator;
+import consulo.language.editor.FileColorManager;
+import consulo.navigation.OpenFileDescriptorFactory;
+import consulo.project.Project;
+import consulo.ui.ex.awt.ColoredListCellRenderer;
+import consulo.ui.ex.awt.JBList;
+import consulo.ui.ex.awt.JBScrollPane;
+import consulo.ui.ex.awt.SortedListModel;
+import consulo.util.io.FileUtil;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.swing.JList;
-import javax.swing.JPanel;
-
-import com.intellij.ide.actions.OpenFileAction;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.ColoredListCellRenderer;
-import com.intellij.ui.FileColorManager;
-import com.intellij.ui.SortedListModel;
-import com.intellij.ui.components.JBList;
-import com.intellij.ui.components.JBScrollPane;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Comparator;
 
 /**
  * @author VISTALL
@@ -104,7 +102,7 @@ public void mouseClicked(MouseEvent e)
 
 					if(virtualFile != null)
 					{
-						OpenFileAction.openFile(virtualFile, myProject);
+						OpenFileDescriptorFactory.getInstance(myProject).builder(virtualFile).build().navigate(true);
 					}
 				}
 			}
diff --git a/debugger/v8-debugger-impl/pom.xml b/debugger/v8-debugger-impl/pom.xml
index db490cf5..76640963 100644
--- a/debugger/v8-debugger-impl/pom.xml
+++ b/debugger/v8-debugger-impl/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-v8.debugger.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
index 99d0f993..a324132c 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
@@ -16,28 +16,28 @@
 
 package consulo.javascript.run.debug;
 
-import com.intellij.execution.ExecutionException;
-import com.intellij.execution.ExecutionResult;
-import com.intellij.execution.process.ProcessHandler;
-import com.intellij.execution.ui.ExecutionConsole;
-import com.intellij.execution.ui.RunnerLayoutUi;
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.application.Application;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.content.Content;
-import com.intellij.util.ui.UIUtil;
-import com.intellij.xdebugger.*;
-import com.intellij.xdebugger.breakpoints.XBreakpointHandler;
-import com.intellij.xdebugger.breakpoints.XBreakpointManager;
-import com.intellij.xdebugger.breakpoints.XBreakpointProperties;
-import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
-import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
-import com.intellij.xdebugger.frame.XSuspendContext;
-import com.intellij.xdebugger.ui.XDebugTabLayouter;
+import consulo.application.AllIcons;
+import consulo.application.Application;
+import consulo.execution.ExecutionResult;
+import consulo.execution.debug.*;
+import consulo.execution.debug.breakpoint.XBreakpointHandler;
+import consulo.execution.debug.breakpoint.XBreakpointProperties;
+import consulo.execution.debug.breakpoint.XExpression;
+import consulo.execution.debug.breakpoint.XLineBreakpoint;
+import consulo.execution.debug.evaluation.XDebuggerEditorsProvider;
+import consulo.execution.debug.frame.XSuspendContext;
+import consulo.execution.debug.ui.XDebugTabLayouter;
+import consulo.execution.ui.ExecutionConsole;
+import consulo.execution.ui.layout.RunnerLayoutUi;
 import consulo.javascript.debugger.JavaScriptEditorsProvider;
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
 import consulo.javascript.debugger.JavaScriptListPanel;
 import consulo.javascript.icon.JavaScriptIconGroup;
+import consulo.process.ExecutionException;
+import consulo.process.ProcessHandler;
+import consulo.ui.ex.awt.UIUtil;
+import consulo.ui.ex.content.Content;
+import consulo.virtualFileSystem.VirtualFile;
 import org.chromium.sdk.Breakpoint;
 import org.chromium.sdk.DebugContext;
 import org.chromium.sdk.JavascriptVm;
@@ -248,7 +248,7 @@ public XDebugTabLayouter createTabLayouter()
 			@Override
 			public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui)
 			{
-				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIconGroup.javaScript(), null);
+				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIconGroup.javascript(), null);
 				content.setCloseable(false);
 
 				ui.addContent(content);
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
index 77a04349..207db310 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
@@ -21,18 +21,18 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import consulo.execution.debug.frame.XNamedValue;
 import org.chromium.sdk.JsArray;
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsObject;
 import org.chromium.sdk.JsValue;
 import org.chromium.sdk.JsVariable;
-import com.intellij.icons.AllIcons;
-import com.intellij.xdebugger.frame.XCompositeNode;
-import com.intellij.xdebugger.frame.XNamedValue;
-import com.intellij.xdebugger.frame.XValueChildrenList;
-import com.intellij.xdebugger.frame.XValueNode;
-import com.intellij.xdebugger.frame.XValuePlace;
-import com.intellij.xdebugger.frame.presentation.XValuePresentation;
+import consulo.application.AllIcons;
+import consulo.execution.debug.frame.XCompositeNode;
+import consulo.execution.debug.frame.XValueChildrenList;
+import consulo.execution.debug.frame.XValueNode;
+import consulo.execution.debug.frame.XValuePlace;
+import consulo.execution.debug.frame.presentation.XValuePresentation;
 import consulo.ui.image.Image;
 
 /**
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
index b2e23fd9..4085d166 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
@@ -16,15 +16,15 @@
 
 package consulo.javascript.run.debug;
 
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.LightVirtualFile;
-import com.intellij.util.containers.ContainerUtil;
-import com.intellij.xdebugger.XDebuggerManager;
-import com.intellij.xdebugger.breakpoints.XBreakpointManager;
-import com.intellij.xdebugger.breakpoints.XBreakpointProperties;
-import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
+import consulo.execution.debug.XBreakpointManager;
+import consulo.execution.debug.XDebuggerManager;
+import consulo.execution.debug.breakpoint.XBreakpointProperties;
+import consulo.execution.debug.breakpoint.XLineBreakpoint;
+import consulo.application.ApplicationManager;
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
+import consulo.language.file.light.LightVirtualFile;
+import consulo.util.collection.ContainerUtil;
+import consulo.virtualFileSystem.VirtualFile;
 import org.chromium.sdk.*;
 
 import java.util.Collection;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
index b83a9dc0..a342c56e 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
@@ -16,10 +16,10 @@
 
 package consulo.javascript.run.debug;
 
-import com.intellij.execution.ExecutionException;
-import com.intellij.execution.ExecutionResult;
-import com.intellij.xdebugger.XDebugSession;
-import com.intellij.xdebugger.XDebuggerBundle;
+import consulo.execution.ExecutionResult;
+import consulo.process.ExecutionException;
+import consulo.execution.debug.XDebugSession;
+import consulo.execution.debug.XDebuggerBundle;
 import consulo.annotation.UsedInPlugin;
 import org.chromium.sdk.JavascriptVmFactory;
 import org.chromium.sdk.StandaloneVm;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
index 040cf68e..b766eeab 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
@@ -21,10 +21,10 @@
 
 import javax.annotation.Nullable;
 
+import consulo.execution.debug.frame.XExecutionStack;
+import consulo.execution.debug.frame.XStackFrame;
 import org.chromium.sdk.CallFrame;
 import org.chromium.sdk.DebugContext;
-import com.intellij.xdebugger.frame.XExecutionStack;
-import com.intellij.xdebugger.frame.XStackFrame;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
index dae888af..598c18be 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
@@ -16,11 +16,11 @@
 
 package consulo.javascript.run.debug;
 
-import com.intellij.openapi.fileTypes.FileTypeRegistry;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.LightVirtualFile;
+import consulo.util.lang.Comparing;
+import consulo.virtualFileSystem.LocalFileSystem;
+import consulo.virtualFileSystem.fileType.FileTypeRegistry;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.language.file.light.LightVirtualFile;
 import consulo.util.dataholder.Key;
 import org.chromium.sdk.Script;
 
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
index ae6ff4a9..99fd9fbd 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
@@ -19,6 +19,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import consulo.execution.debug.XDebuggerUtil;
+import consulo.execution.debug.XSourcePosition;
+import consulo.execution.debug.evaluation.XDebuggerEvaluator;
 import org.chromium.sdk.CallFrame;
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsScope;
@@ -27,15 +30,12 @@
 import org.chromium.sdk.TextStreamPosition;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.icons.AllIcons;
-import com.intellij.ui.ColoredTextContainer;
-import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.xdebugger.XDebuggerUtil;
-import com.intellij.xdebugger.XSourcePosition;
-import com.intellij.xdebugger.evaluation.XDebuggerEvaluator;
-import com.intellij.xdebugger.frame.XCompositeNode;
-import com.intellij.xdebugger.frame.XStackFrame;
-import com.intellij.xdebugger.frame.XValueChildrenList;
+import consulo.application.AllIcons;
+import consulo.ui.ex.ColoredTextContainer;
+import consulo.ui.ex.SimpleTextAttributes;
+import consulo.execution.debug.frame.XCompositeNode;
+import consulo.execution.debug.frame.XStackFrame;
+import consulo.execution.debug.frame.XValueChildrenList;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
index 4714d31a..a6866998 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
@@ -16,10 +16,11 @@
 
 package consulo.javascript.run.debug;
 
+import consulo.execution.debug.frame.XExecutionStack;
 import org.chromium.sdk.DebugContext;
 import javax.annotation.Nullable;
-import com.intellij.xdebugger.frame.XExecutionStack;
-import com.intellij.xdebugger.frame.XSuspendContext;
+
+import consulo.execution.debug.frame.XSuspendContext;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
index bc2ceddf..943af1f1 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
@@ -18,6 +18,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.execution.debug.frame.XValueModifier;
 import org.chromium.sdk.JsDeclarativeVariable;
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsFunction;
@@ -25,8 +26,7 @@
 import org.chromium.sdk.JsVariable;
 
 import javax.annotation.Nullable;
-import com.intellij.xdebugger.frame.XValueChildrenList;
-import com.intellij.xdebugger.frame.XValueModifier;
+import consulo.execution.debug.frame.XValueChildrenList;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
index 70aeb328..b9480371 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
@@ -20,7 +20,7 @@
 
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsValue;
-import com.intellij.icons.AllIcons;
+import consulo.application.AllIcons;
 import consulo.ui.image.Image;
 
 /**
diff --git a/inspections/pom.xml b/inspections/pom.xml
index 0498b7df..5cf50c15 100644
--- a/inspections/pom.xml
+++ b/inspections/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-inspections</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -49,7 +49,7 @@
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-ecmascript6.impl</artifactId>
+			<artifactId>consulo.javascript-ecmascript.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
index bb1cc1ae..9aa9c82a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
@@ -1,42 +1,28 @@
 package com.sixrr.inspectjs;
 
-import java.lang.reflect.Method;
+import com.intellij.lang.javascript.psi.JSFunction;
+import com.intellij.lang.javascript.psi.JSSuppressionHolder;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.editor.inspection.CustomSuppressableInspectionTool;
+import consulo.language.editor.inspection.LocalInspectionTool;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.inspection.SuppressionUtil;
+import consulo.language.editor.intention.SuppressIntentionAction;
+import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInspection.CustomSuppressableInspectionTool;
-import com.intellij.codeInspection.LocalInspectionTool;
-import com.intellij.codeInspection.ProblemsHolder;
-import com.intellij.codeInspection.SuppressIntentionAction;
-import com.intellij.codeInspection.SuppressionUtil;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSSuppressionHolder;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.util.PsiTreeUtil;
+import java.lang.reflect.Method;
 
 public abstract class BaseInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool
 {
-	private final String m_shortName = null;
-
-	@Override
-	@Nonnull
-	public String getShortName()
-	{
-		if(m_shortName == null)
-		{
-			final Class<? extends BaseInspection> aClass = getClass();
-			@NonNls final String name = aClass.getName();
-			assert name.endsWith("Inspection") : "class name must end with the 'Inspection' to correctly calculate the short name: " + name;
-			return name.substring(name.lastIndexOf((int) '.') + 1, name.length() - "Inspection".length());
-		}
-		return m_shortName;
-	}
-
 	@Override
 	@Nonnull
 	public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder problemsHolder, boolean onTheFly)
@@ -54,6 +40,20 @@ public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder problemsHolder, bo
 		return visitor;
 	}
 
+	@Nullable
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+
+	@Nonnull
+	@Override
+	public HighlightDisplayLevel getDefaultLevel()
+	{
+		return HighlightDisplayLevel.WARNING;
+	}
+
 	public boolean canBuildVisitor(@Nonnull PsiFile psiFile)
 	{
 		return true;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
index 2f049b1a..a0b60a2b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
@@ -4,10 +4,8 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.codeInspection.ProblemsHolder;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -15,9 +13,11 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.editor.inspection.ProblemHighlightType;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.psi.PsiWhiteSpace;
 
 public abstract class BaseInspectionVisitor extends JSElementVisitor{
     private BaseInspection inspection = null;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
index 3376507a..4221ac76 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs;
 
-import com.intellij.codeInspection.LocalInspectionTool;
+import consulo.language.editor.inspection.LocalInspectionTool;
 
 import java.util.Comparator;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java
index 0b3cb586..911db83c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs;
 
-import com.intellij.CommonBundle;
+import consulo.application.CommonBundle;
 import org.jetbrains.annotations.PropertyKey;
 
 import java.util.ResourceBundle;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
index 95496c33..963f4a1d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
@@ -1,24 +1,25 @@
 package com.sixrr.inspectjs;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.ReadonlyStatusHandler;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.ASTNode;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.util.IncorrectOperationException;
+import consulo.logging.Logger;
+import consulo.project.Project;
+import consulo.virtualFileSystem.ReadonlyStatusHandler;
+import consulo.virtualFileSystem.VirtualFile;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
-public abstract class InspectionJSFix implements LocalQuickFix {
+public abstract class InspectionJSFix implements LocalQuickFix
+{
     //to appear in "Apply Fix" statement when multiple Quick Fixes exist
     @Override
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
deleted file mode 100644
index 21cf7118..00000000
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSPlugin.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package com.sixrr.inspectjs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.intellij.codeInspection.InspectionToolProvider;
-import com.intellij.codeInspection.LocalInspectionTool;
-import com.sixrr.inspectjs.assignment.AssignmentResultUsedJSInspection;
-import com.sixrr.inspectjs.assignment.AssignmentToForLoopParameterJSInspection;
-import com.sixrr.inspectjs.assignment.AssignmentToFunctionParameterJSInspection;
-import com.sixrr.inspectjs.assignment.NestedAssignmentJSInspection;
-import com.sixrr.inspectjs.assignment.ReplaceAssignmentWithOperatorAssignmentJSInspection;
-import com.sixrr.inspectjs.assignment.SillyAssignmentJSInspection;
-import com.sixrr.inspectjs.bitwise.IncompatibleMaskJSInspection;
-import com.sixrr.inspectjs.bitwise.PointlessBitwiseExpressionJSInspection;
-import com.sixrr.inspectjs.bitwise.ShiftOutOfRangeJSInspection;
-import com.sixrr.inspectjs.bugs.DivideByZeroJSInspection;
-import com.sixrr.inspectjs.bugs.EqualityComparisonWithCoercionJSInspection;
-import com.sixrr.inspectjs.bugs.InfiniteLoopJSInspection;
-import com.sixrr.inspectjs.bugs.InfiniteRecursionJSInspection;
-import com.sixrr.inspectjs.bugs.NonShortCircuitBooleanExpressionJSInspection;
-import com.sixrr.inspectjs.bugs.ObjectAllocationIgnoredJSInspection;
-import com.sixrr.inspectjs.bugs.TextLabelInSwitchStatementJSInspection;
-import com.sixrr.inspectjs.confusing.*;
-import com.sixrr.inspectjs.control.*;
-import com.sixrr.inspectjs.dataflow.ReuseOfLocalVariableJSInspection;
-import com.sixrr.inspectjs.dataflow.UnnecessaryLocalVariableJSInspection;
-import com.sixrr.inspectjs.dom.DocumentWriteJSInspection;
-import com.sixrr.inspectjs.dom.InnerHTMLJSInspection;
-import com.sixrr.inspectjs.dom.PlatformDetectionJSInspection;
-import com.sixrr.inspectjs.dom.XHTMLIncompatabilitiesJSInspection;
-import com.sixrr.inspectjs.exception.ContinueOrBreakFromFinallyBlockJSInspection;
-import com.sixrr.inspectjs.exception.EmptyCatchBlockJSInspection;
-import com.sixrr.inspectjs.exception.EmptyFinallyBlockJSInspection;
-import com.sixrr.inspectjs.exception.EmptyTryBlockJSInspection;
-import com.sixrr.inspectjs.exception.ExceptionCaughtLocallyJSInspection;
-import com.sixrr.inspectjs.exception.ReturnFromFinallyBlockJSInspection;
-import com.sixrr.inspectjs.exception.ThrowFromFinallyBlockJSInspection;
-import com.sixrr.inspectjs.exception.UnusedCatchParameterJSInspection;
-import com.sixrr.inspectjs.functionmetrics.CyclomaticComplexityJSInspection;
-import com.sixrr.inspectjs.functionmetrics.FunctionWithMultipleLoopsJSInspection;
-import com.sixrr.inspectjs.functionmetrics.FunctionWithMultipleReturnPointsJSInspection;
-import com.sixrr.inspectjs.functionmetrics.NestingDepthJSInspection;
-import com.sixrr.inspectjs.functionmetrics.ParametersPerFunctionJSInspection;
-import com.sixrr.inspectjs.functionmetrics.StatementsPerFunctionJSInspection;
-import com.sixrr.inspectjs.functionmetrics.ThreeNegationsPerFunctionJSInspection;
-import com.sixrr.inspectjs.naming.FunctionNamingConventionJSInspection;
-import com.sixrr.inspectjs.naming.LocalVariableNamingConventionJSInspection;
-import com.sixrr.inspectjs.naming.ParameterNamingConventionJSInspection;
-import com.sixrr.inspectjs.style.ChainedEqualityJSInspection;
-import com.sixrr.inspectjs.style.ChainedFunctionCallJSInspection;
-import com.sixrr.inspectjs.style.ConstantOnLHSOfComparisonJSInspection;
-import com.sixrr.inspectjs.style.ConstantOnRHSOfComparisonJSInspection;
-import com.sixrr.inspectjs.style.NestedFunctionCallJSInspection;
-import com.sixrr.inspectjs.style.NonBlockStatementBodyJSInspection;
-import com.sixrr.inspectjs.style.UnterminatedStatementJSInspection;
-import com.sixrr.inspectjs.validity.BadExpressionStatementJSInspection;
-import com.sixrr.inspectjs.validity.DebuggerStatementJSInspection;
-import com.sixrr.inspectjs.validity.DuplicateCaseLabelJSInspection;
-import com.sixrr.inspectjs.validity.DuplicatePropertyOnObjectJSInspection;
-import com.sixrr.inspectjs.validity.FunctionWithInconsistentReturnsJSInspection;
-import com.sixrr.inspectjs.validity.StringLiteralBreaksHTMLJSInspection;
-import com.sixrr.inspectjs.validity.ThisExpressionReferencesGlobalObjectJSInspection;
-import com.sixrr.inspectjs.validity.UnreachableCodeJSInspection;
-
-public class InspectionJSPlugin implements InspectionToolProvider
-{
-	private static final int NUM_INSPECTIONS = 100;
-	private final List<Class<? extends LocalInspectionTool>> m_inspectionClasses = new ArrayList<Class<? extends LocalInspectionTool>>(NUM_INSPECTIONS);
-
-	@Override
-	public Class<? extends LocalInspectionTool>[] getInspectionClasses()
-	{
-		if(m_inspectionClasses.isEmpty())
-		{
-			registerDOMInspections();
-			registerControlFlowInspections();
-			registerAssignmentInspections();
-			registerBugInspections();
-			registerValidityInspections();
-			registerNamingInspections();
-			registerConfusingInspections();
-			registerExceptionInspections();
-			registerStyleInspections();
-			registerFunctionMetricsInspections();
-			registerDataflowInspections();
-			registerBitwiseInspections();
-		}
-		final int numInspections = m_inspectionClasses.size();
-		return m_inspectionClasses.toArray(new Class[numInspections]);
-	}
-
-	private void registerAssignmentInspections()
-	{
-		m_inspectionClasses.add(AssignmentResultUsedJSInspection.class);
-		m_inspectionClasses.add(NestedAssignmentJSInspection.class);
-		m_inspectionClasses.add(AssignmentToFunctionParameterJSInspection.class);
-		m_inspectionClasses.add(AssignmentToForLoopParameterJSInspection.class);
-		m_inspectionClasses.add(ReplaceAssignmentWithOperatorAssignmentJSInspection.class);
-		m_inspectionClasses.add(SillyAssignmentJSInspection.class);
-	}
-
-	private void registerBugInspections()
-	{
-		m_inspectionClasses.add(TextLabelInSwitchStatementJSInspection.class);
-		m_inspectionClasses.add(NonShortCircuitBooleanExpressionJSInspection.class);
-		m_inspectionClasses.add(ObjectAllocationIgnoredJSInspection.class);
-		m_inspectionClasses.add(DivideByZeroJSInspection.class);
-		m_inspectionClasses.add(EqualityComparisonWithCoercionJSInspection.class);
-	}
-
-	private void registerBitwiseInspections()
-	{
-		m_inspectionClasses.add(PointlessBitwiseExpressionJSInspection.class);
-		m_inspectionClasses.add(ShiftOutOfRangeJSInspection.class);
-		m_inspectionClasses.add(IncompatibleMaskJSInspection.class);
-	}
-
-	private void registerControlFlowInspections()
-	{
-		m_inspectionClasses.add(LoopStatementThatDoesntLoopJSInspection.class);
-		m_inspectionClasses.add(InfiniteLoopJSInspection.class);
-		m_inspectionClasses.add(InfiniteRecursionJSInspection.class);
-		m_inspectionClasses.add(PointlessBooleanExpressionJSInspection.class);
-		m_inspectionClasses.add(PointlessArithmeticExpressionJSInspection.class);
-		m_inspectionClasses.add(NegatedIfStatementJSInspection.class);
-		m_inspectionClasses.add(NegatedConditionalExpressionJSInspection.class);
-		m_inspectionClasses.add(BreakStatementJSInspection.class);
-		m_inspectionClasses.add(BreakStatementWithLabelJSInspection.class);
-		m_inspectionClasses.add(ContinueStatementJSInspection.class);
-		m_inspectionClasses.add(ContinueStatementWithLabelJSInspection.class);
-		m_inspectionClasses.add(DefaultNotLastCaseInSwitchJSInspection.class);
-		m_inspectionClasses.add(UnnecessaryContinueJSInspection.class);
-		m_inspectionClasses.add(UnnecessaryReturnJSInspection.class);
-		m_inspectionClasses.add(UnnecessaryLabelOnBreakStatementJSInspection.class);
-		m_inspectionClasses.add(UnnecessaryLabelOnContinueStatementJSInspection.class);
-		m_inspectionClasses.add(LabeledStatementJSInspection.class);
-		m_inspectionClasses.add(SwitchStatementWithNoDefaultBranchJSInspection.class);
-		m_inspectionClasses.add(FallthroughInSwitchStatementJSInspection.class);
-		m_inspectionClasses.add(NestedSwitchStatementJSInspection.class);
-		m_inspectionClasses.add(DuplicateConditionJSInspection.class);
-		m_inspectionClasses.add(ConstantConditionalExpressionJSInspection.class);
-		m_inspectionClasses.add(ConstantIfStatementJSInspection.class);
-		m_inspectionClasses.add(ConditionalExpressionWithIdenticalBranchesJSInspection.class);
-		m_inspectionClasses.add(IfStatementWithIdenticalBranchesJSInspection.class);
-		m_inspectionClasses.add(IfStatementWithTooManyBranchesJSInspection.class);
-		m_inspectionClasses.add(TrivialIfJSInspection.class);
-		m_inspectionClasses.add(TrivialConditionalJSInspection.class);
-		m_inspectionClasses.add(UnnecessaryLabelJSInspection.class);
-		m_inspectionClasses.add(ForLoopThatDoesntUseLoopVariableJSInspection.class);
-		m_inspectionClasses.add(TailRecursionJSInspection.class);
-		m_inspectionClasses.add(ForLoopReplaceableByWhileJSInspection.class);
-	}
-
-	private void registerValidityInspections()
-	{
-		m_inspectionClasses.add(DebuggerStatementJSInspection.class);
-		m_inspectionClasses.add(BadExpressionStatementJSInspection.class);
-		m_inspectionClasses.add(DuplicateCaseLabelJSInspection.class);
-		m_inspectionClasses.add(DuplicatePropertyOnObjectJSInspection.class);
-		m_inspectionClasses.add(UnreachableCodeJSInspection.class);
-		m_inspectionClasses.add(FunctionWithInconsistentReturnsJSInspection.class);
-		m_inspectionClasses.add(ThisExpressionReferencesGlobalObjectJSInspection.class);
-		m_inspectionClasses.add(StringLiteralBreaksHTMLJSInspection.class);
-	}
-
-	private void registerNamingInspections()
-	{
-		m_inspectionClasses.add(FunctionNamingConventionJSInspection.class);
-		m_inspectionClasses.add(LocalVariableNamingConventionJSInspection.class);
-		m_inspectionClasses.add(ParameterNamingConventionJSInspection.class);
-	}
-
-	private void registerConfusingInspections()
-	{
-		m_inspectionClasses.add(CallerJSInspection.class);
-		m_inspectionClasses.add(BlockStatementJSInspection.class);
-		m_inspectionClasses.add(ConditionalExpressionJSInspection.class);
-		m_inspectionClasses.add(CommaExpressionJSInspection.class);
-		m_inspectionClasses.add(NestedConditionalExpressionJSInspection.class);
-		m_inspectionClasses.add(IncrementDecrementResultUsedJSInspection.class);
-		m_inspectionClasses.add(WithStatementJSInspection.class);
-		m_inspectionClasses.add(VoidExpressionJSInspection.class);
-		m_inspectionClasses.add(OverlyComplexArithmeticExpressionJSInspection.class);
-		m_inspectionClasses.add(OverlyComplexBooleanExpressionJSInspection.class);
-		m_inspectionClasses.add(NestedFunctionJSInspection.class);
-		m_inspectionClasses.add(AnonymousFunctionJSInspection.class);
-		m_inspectionClasses.add(EmptyStatementBodyJSInspection.class);
-		m_inspectionClasses.add(OctalIntegerJSInspection.class);
-		m_inspectionClasses.add(ConfusingFloatingPointLiteralJSInspection.class);
-		m_inspectionClasses.add(ConfusingPlusesOrMinusesJSInspection.class);
-		m_inspectionClasses.add(DynamicallyGeneratedCodeJSInspection.class);
-		m_inspectionClasses.add(MagicNumberJSInspection.class);
-	}
-
-	private void registerStyleInspections()
-	{
-		m_inspectionClasses.add(ConstantOnLHSOfComparisonJSInspection.class);
-		m_inspectionClasses.add(ChainedEqualityJSInspection.class);
-		m_inspectionClasses.add(ChainedFunctionCallJSInspection.class);
-		m_inspectionClasses.add(NestedFunctionCallJSInspection.class);
-		m_inspectionClasses.add(ConstantOnRHSOfComparisonJSInspection.class);
-		m_inspectionClasses.add(UnterminatedStatementJSInspection.class);
-		m_inspectionClasses.add(NonBlockStatementBodyJSInspection.class);
-	}
-
-	private void registerExceptionInspections()
-	{
-		m_inspectionClasses.add(EmptyCatchBlockJSInspection.class);
-		m_inspectionClasses.add(EmptyTryBlockJSInspection.class);
-		m_inspectionClasses.add(EmptyFinallyBlockJSInspection.class);
-		m_inspectionClasses.add(ReturnFromFinallyBlockJSInspection.class);
-		m_inspectionClasses.add(ThrowFromFinallyBlockJSInspection.class);
-		m_inspectionClasses.add(ContinueOrBreakFromFinallyBlockJSInspection.class);
-		m_inspectionClasses.add(ExceptionCaughtLocallyJSInspection.class);
-		m_inspectionClasses.add(UnusedCatchParameterJSInspection.class);
-	}
-
-	private void registerFunctionMetricsInspections()
-	{
-		m_inspectionClasses.add(NestingDepthJSInspection.class);
-		m_inspectionClasses.add(ThreeNegationsPerFunctionJSInspection.class);
-		m_inspectionClasses.add(FunctionWithMultipleLoopsJSInspection.class);
-		m_inspectionClasses.add(FunctionWithMultipleReturnPointsJSInspection.class);
-		m_inspectionClasses.add(CyclomaticComplexityJSInspection.class);
-		m_inspectionClasses.add(ParametersPerFunctionJSInspection.class);
-		m_inspectionClasses.add(StatementsPerFunctionJSInspection.class);
-	}
-
-	private void registerDOMInspections()
-	{
-		m_inspectionClasses.add(DocumentWriteJSInspection.class);
-		m_inspectionClasses.add(InnerHTMLJSInspection.class);
-		m_inspectionClasses.add(PlatformDetectionJSInspection.class);
-		m_inspectionClasses.add(XHTMLIncompatabilitiesJSInspection.class);
-	}
-
-	private void registerDataflowInspections()
-	{
-		m_inspectionClasses.add(UnnecessaryLocalVariableJSInspection.class);
-		m_inspectionClasses.add(ReuseOfLocalVariableJSInspection.class);
-	}
-}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
index 2b2b2163..639fcdea 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
@@ -1,8 +1,8 @@
 package com.sixrr.inspectjs;
 
 import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiRecursiveVisitor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiRecursiveVisitor;
 
 public class JSRecursiveElementVisitor extends JSElementVisitor implements PsiRecursiveVisitor
 {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
index d675ab55..92e645bc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
@@ -1,16 +1,17 @@
 package com.sixrr.inspectjs.assignment;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class AssignmentResultUsedJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
index 685cbfe6..6670f10e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
@@ -1,17 +1,19 @@
 package com.sixrr.inspectjs.assignment;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class AssignmentToForLoopParameterJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
index 6df31b8d..fe7fffd3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
@@ -2,16 +2,19 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.tree.IElementType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.language.psi.PsiReference;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class AssignmentToFunctionParameterJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
index a4a49a76..99831821 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
@@ -1,14 +1,16 @@
 package com.sixrr.inspectjs.assignment;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class NestedAssignmentJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
index e76ad6d9..0dd30118 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
@@ -1,22 +1,24 @@
 package com.sixrr.inspectjs.assignment;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import com.sixrr.inspectjs.utils.SideEffectChecker;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class ReplaceAssignmentWithOperatorAssignmentJSInspection
         extends JavaScriptInspection {
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
index 91c613a9..74ab8c09 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
@@ -1,20 +1,22 @@
 package com.sixrr.inspectjs.assignment;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class SillyAssignmentJSInspection
         extends JavaScriptInspection {
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
index 15389be5..2934146c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
@@ -1,11 +1,8 @@
 package com.sixrr.inspectjs.bitwise;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.tree.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
@@ -13,7 +10,12 @@
 import com.sixrr.inspectjs.utils.ComparisonUtils;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class IncompatibleMaskJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index 79dd9975..265112ac 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -1,23 +1,26 @@
 package com.sixrr.inspectjs.bitwise;
 
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
+
 import javax.annotation.Nonnull;
 
 import javax.swing.*;
 import java.util.HashSet;
 import java.util.Set;
 
+@ExtensionImpl
 public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection {
 
     /**
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index e5fca4f3..f1e130df 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -3,7 +3,8 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.tree.IElementType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
@@ -11,6 +12,7 @@
 import com.sixrr.inspectjs.utils.ExpressionUtil;
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ShiftOutOfRangeJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index d34613db..70db974e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -1,18 +1,20 @@
 package com.sixrr.inspectjs.bugs;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.tree.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class DivideByZeroJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index da155089..2a5c3574 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -1,18 +1,20 @@
 package com.sixrr.inspectjs.bugs;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.PsiElement;
-import com.intellij.openapi.project.Project;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class EqualityComparisonWithCoercionJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
index 2ae57b2c..02e26b78 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
@@ -1,7 +1,5 @@
 package com.sixrr.inspectjs.bugs;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSDoWhileStatement;
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
@@ -10,7 +8,11 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class InfiniteLoopJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
index c5643e28..bed744a7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
@@ -1,14 +1,16 @@
 package com.sixrr.inspectjs.bugs;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.openapi.diagnostic.Logger;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.logging.Logger;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class InfiniteRecursionJSInspection extends JavaScriptInspection {
     private static Logger logger = Logger.getInstance("ULVJS");
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index ce49c983..34174019 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -1,19 +1,20 @@
 package com.sixrr.inspectjs.bugs;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class NonShortCircuitBooleanExpressionJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
index 0e149000..035d6f86 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
@@ -1,7 +1,5 @@
 package com.sixrr.inspectjs.bugs;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSNewExpression;
@@ -9,7 +7,11 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ObjectAllocationIgnoredJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
index 2db122bc..8b814bfa 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
@@ -2,11 +2,11 @@
 
 import javax.annotation.Nonnull;
 
-import com.intellij.psi.*;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.sixrr.inspectjs.utils.BoolUtils;
+import consulo.language.psi.PsiElement;
 
 public class RecursionUtils {
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
index a1ed5977..4f7325b4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
@@ -1,7 +1,7 @@
 package com.sixrr.inspectjs.bugs;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 import javax.annotation.Nonnull;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index 953b0227..b0fe3527 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -4,13 +4,15 @@
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.intellij.psi.PsiElement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class TextLabelInSwitchStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index 6c8cf3a3..f6cb132f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -1,16 +1,19 @@
 package com.sixrr.inspectjs.confusing;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class AnonymousFunctionJSInspection extends JavaScriptInspection{
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index 0a9d9498..c1a407ae 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -1,16 +1,17 @@
 package com.sixrr.inspectjs.confusing;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class BlockStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
index b98ed797..e1301ea8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
@@ -5,9 +5,12 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class CallerJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
index a37fcfbc..9acaff54 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
@@ -1,16 +1,17 @@
 package com.sixrr.inspectjs.confusing;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSCommaExpression;
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class CommaExpressionJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index 87acccde..2fbc1c81 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -5,9 +5,12 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class ConditionalExpressionJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index c87419d8..6a95751e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -1,19 +1,21 @@
 package com.sixrr.inspectjs.confusing;
 
-import com.intellij.codeInspection.ProblemDescriptor;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@ExtensionImpl
 public class ConfusingFloatingPointLiteralJSInspection extends JavaScriptInspection {
     @NonNls
     private static final Pattern pickyFloatingPointPattern =
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index 4c2d456e..f9e62e3d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -5,7 +5,8 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSPostfixExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.psi.tree.IElementType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
@@ -13,6 +14,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class ConfusingPlusesOrMinusesJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 75961655..9d61212f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -1,7 +1,5 @@
 package com.sixrr.inspectjs.confusing;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSNewExpression;
@@ -10,10 +8,13 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class DynamicallyGeneratedCodeJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index ca86f27e..6599f5bb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -6,10 +6,13 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
+import consulo.annotation.component.ExtensionImpl;
+
 import javax.annotation.Nonnull;
 
 import javax.swing.*;
 
+@ExtensionImpl
 public class EmptyStatementBodyJSInspection extends JavaScriptInspection {
     /**
      * @noinspection PublicField
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index 60153b5f..ed8f0f78 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -2,8 +2,9 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
@@ -11,6 +12,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class IncrementDecrementResultUsedJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index 4c14af1f..3e48bed7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -1,19 +1,21 @@
 package com.sixrr.inspectjs.confusing;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
 
 import java.util.HashSet;
 import java.util.Set;
 
+@ExtensionImpl
 public class MagicNumberJSInspection extends JavaScriptInspection {
 
     @NonNls private static final String[] s_specialCaseLiteralArray =
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index e5fcbd27..5c10e649 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -1,21 +1,23 @@
 package com.sixrr.inspectjs.confusing;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class NegatedConditionalExpressionJSInspection extends JavaScriptInspection {
     private final NegatedConditionalFix fix = new NegatedConditionalFix();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index 0a42ca70..6deefe4c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -1,24 +1,26 @@
 package com.sixrr.inspectjs.confusing;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+@ExtensionImpl
 public class NegatedIfStatementJSInspection extends JavaScriptInspection {
     private final NegatedIfElseFix fix = new NegatedIfElseFix();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
index fd93a4da..0f42abfa 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
@@ -1,15 +1,17 @@
 package com.sixrr.inspectjs.confusing;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class NestedConditionalExpressionJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index 5be925f1..91c19ee7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -2,18 +2,21 @@
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
+import consulo.language.psi.util.PsiTreeUtil;
+
 import javax.annotation.Nonnull;
 
 import javax.annotation.Nullable;
 import javax.swing.*;
 
+@ExtensionImpl
 public class NestedFunctionJSInspection extends JavaScriptInspection {
 
     @SuppressWarnings({"PublicField"})
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index e7fff2b1..e835a1be 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -1,5 +1,6 @@
 package com.sixrr.inspectjs.confusing;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
@@ -9,6 +10,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class OctalIntegerJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
index d52dd10d..45dca314 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
@@ -2,19 +2,22 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleIntegerFieldOptionsPanel;
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nonnull;
 
 import javax.swing.*;
 import java.util.HashSet;
 import java.util.Set;
 
+@ExtensionImpl
 public class OverlyComplexArithmeticExpressionJSInspection extends JavaScriptInspection {
     private static final int TERM_LIMIT = 6;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
index 5ce6b95a..3ab9f7ac 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
@@ -5,8 +5,9 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
@@ -16,6 +17,7 @@
 
 import javax.swing.*;
 
+@ExtensionImpl
 public class OverlyComplexBooleanExpressionJSInspection extends JavaScriptInspection {
     private static final int TERM_LIMIT = 3;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
index 73e57b4f..d2034aed 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
@@ -1,21 +1,23 @@
 package com.sixrr.inspectjs.confusing;
 
-import com.intellij.codeInspection.ProblemDescriptor;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
 
 import java.util.HashSet;
 import java.util.Set;
 
+@ExtensionImpl
 public class PointlessArithmeticExpressionJSInspection
         extends JavaScriptInspection {
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
index a96bdfa3..ad5077f8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
@@ -1,18 +1,19 @@
 package com.sixrr.inspectjs.confusing;
 
-import com.intellij.codeInspection.ProblemDescriptor;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -20,6 +21,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+@ExtensionImpl
 public class PointlessBooleanExpressionJSInspection extends JavaScriptInspection {
 
     private final BooleanLiteralComparisonFix fix =
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
index dc6469c0..1e068049 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
@@ -1,16 +1,18 @@
 package com.sixrr.inspectjs.confusing;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+@ExtensionImpl
 public class VoidExpressionJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
index 363413a4..231db01f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
@@ -5,9 +5,12 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class WithStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
index 39306c75..009b0e4b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
@@ -1,16 +1,17 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class BreakStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
index e763c556..3eceb281 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
@@ -1,14 +1,16 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class BreakStatementWithLabelJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
index e725abe0..c1ef37d5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
@@ -1,16 +1,18 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ConditionalExpressionWithIdenticalBranchesJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new CollapseConditional();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
index 3175db5e..c65e021b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
@@ -1,15 +1,18 @@
 package com.sixrr.inspectjs.control;
 
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.project.Project;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
+import consulo.language.editor.inspection.ProblemDescriptor;
+
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ConstantConditionalExpressionJSInspection
         extends JavaScriptInspection {
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
index 09c7a612..3a36452c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
@@ -1,17 +1,19 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ConstantIfStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
index 786569fd..a1c81f27 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
@@ -1,15 +1,16 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class ContinueStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
index c95dad7f..042d1af0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
@@ -1,14 +1,16 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class ContinueStatementWithLabelJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index 188e6bbe..eb14af76 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -1,14 +1,16 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class DefaultNotLastCaseInSwitchJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
index 14af19d9..075a8cb3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
@@ -2,19 +2,22 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+@ExtensionImpl
 public class DuplicateConditionJSInspection extends JavaScriptInspection {
     @Override
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
index a97e3303..9948f154 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
@@ -3,15 +3,18 @@
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class FallthroughInSwitchStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
index a47a422b..a2c9c624 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
@@ -1,13 +1,14 @@
 package com.sixrr.inspectjs.control;
 
-import com.intellij.codeInspection.ProblemDescriptor;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
 import org.jetbrains.annotations.NonNls;
@@ -15,6 +16,7 @@
 
 import javax.swing.*;
 
+@ExtensionImpl
 public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection {
 
     /**
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
index 48128b3b..968c3c55 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
@@ -1,11 +1,13 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ForLoopThatDoesntUseLoopVariableJSInspection
         extends JavaScriptInspection {
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
index 7f2e8c21..0cd4b55d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
@@ -1,16 +1,18 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class IfStatementWithIdenticalBranchesJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new CollapseIfFix();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
index 7c9b5013..4d909806 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
@@ -2,7 +2,8 @@
 
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
@@ -12,6 +13,7 @@
 
 import javax.swing.*;
 
+@ExtensionImpl
 public class IfStatementWithTooManyBranchesJSInspection extends JavaScriptInspection {
     private static final int DEFAULT_BRANCH_LIMIT = 3;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
index 77fcb934..b90f18a0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
@@ -5,10 +5,12 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class LabeledStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
index 5458397b..a7196334 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
@@ -1,14 +1,16 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class LoopStatementThatDoesntLoopJSInspection extends JavaScriptInspection {
 
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
index 356f9cf5..57f0d47d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
@@ -1,15 +1,17 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class NestedSwitchStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
index ac01562b..20383a89 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
@@ -6,9 +6,12 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class SwitchStatementWithNoDefaultBranchJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
index df74544a..aa902a93 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
@@ -1,15 +1,17 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class TailRecursionJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
index b402d25a..8a572a5f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
@@ -1,18 +1,20 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class TrivialConditionalJSInspection
         extends JavaScriptInspection {
     private final TrivialConditionalFix fix = new TrivialConditionalFix();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
index d77b8297..e55ce9e5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
@@ -1,23 +1,25 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ConditionalUtils;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+
 
+@ExtensionImpl
 public class TrivialIfJSInspection extends JavaScriptInspection {
     private final TrivialIfFix fix = new TrivialIfFix();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
index e61a67e3..b8c385c0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
@@ -1,15 +1,17 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class UnnecessaryContinueJSInspection extends JavaScriptInspection {
     private final UnnecessaryContinueFix fix = new UnnecessaryContinueFix();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
index 7f058f8d..fe4e5de4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
@@ -1,16 +1,19 @@
 package com.sixrr.inspectjs.control;
 
-import com.intellij.codeInspection.ProblemDescriptor;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
+import consulo.project.Project;
+
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class UnnecessaryLabelJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
index 350d60a0..e8aa60c4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
@@ -1,19 +1,21 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSLoopStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class UnnecessaryLabelOnBreakStatementJSInspection extends JavaScriptInspection {
     private final UnnecessaryLabelOnBreakStatementFix fix =
             new UnnecessaryLabelOnBreakStatementFix();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
index 77864a4b..f00bc386 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
@@ -1,19 +1,20 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.intellij.lang.javascript.psi.JSLoopStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class UnnecessaryLabelOnContinueStatementJSInspection extends JavaScriptInspection {
     private final UnnecessaryLabelOnContinueStatementFix fix =
             new UnnecessaryLabelOnContinueStatementFix();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
index f549796e..8e9fc6bb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
@@ -1,16 +1,18 @@
 package com.sixrr.inspectjs.control;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class  UnnecessaryReturnJSInspection extends JavaScriptInspection {
     private final UnnecessaryReturnFix fix = new UnnecessaryReturnFix();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index 2b6e783e..cc5f069b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -1,180 +1,216 @@
 package com.sixrr.inspectjs.dataflow;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.util.PsiTreeUtil;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class ReuseOfLocalVariableJSInspection
-        extends JavaScriptInspection {
+@ExtensionImpl
+public class ReuseOfLocalVariableJSInspection extends JavaScriptInspection
+{
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "reuse.of.local.variable.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message(
+				"reuse.of.local.variable.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.DATA_FLOW_ISSUES;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.DATA_FLOW_ISSUES;
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
-        return InspectionJSBundle.message(
-                "reuse.of.local.variable.problem.descriptor");
-    }
-
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new ReuseOfLocalVariableVisitor();
-    }
-
-    private static class ReuseOfLocalVariableVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSAssignmentExpression(
-                @Nonnull JSAssignmentExpression assignment) {
-            super.visitJSAssignmentExpression(assignment);
-            if (assignment.getROperand()==null) {
-                return;
-            }
-            final PsiElement assignmentParent = assignment.getParent();
-            if (!(assignmentParent instanceof JSExpressionStatement)) {
-                return;
-            }
-            final JSExpression lhs = assignment.getLOperand();
-            if (!(lhs instanceof JSDefinitionExpression)) {
-                return;
-            }
-            final JSDefinitionExpression def = (JSDefinitionExpression) lhs;
-            final JSExpression defExpression = def.getExpression();
-            if(!(defExpression instanceof JSReferenceExpression))
-            {
-                return;
-            }
-            final PsiElement referent = ((PsiReference) defExpression).resolve();
-            if (!(referent instanceof JSVariable)) {
-                return;
-            }
-            final JSVariable variable = (JSVariable) referent;
-
-            if (variable.getInitializer() == null) {
-                return;
-            }
-            final IElementType tokenType = assignment.getOperationSign();
-
-            if (!JSTokenTypes.EQ.equals(tokenType)) {
-                return;
-            }
-            final JSExpression rhs =  assignment.getROperand();
-            if (VariableAccessUtils.variableIsUsed(variable, rhs)) {
-                return;
-            }
-            final JSBlockStatement variableBlock =
-                    PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-            if (variableBlock == null) {
-                return;
-            }
-
-            if (loopExistsBetween(assignment, variableBlock)) {
-                return;
-            }
-            if (tryExistsBetween(assignment, variableBlock)) {
-                // this could be weakened, slightly, if it could be verified
-                // that a variable is used in only one branch of a try statement
-                return;
-            }
-            final PsiElement assignmentBlock =
-                    assignmentParent.getParent();
-            if (assignmentBlock == null) {
-                return;
-            }
-            if (variableBlock.equals(assignmentBlock)) {
-                registerError(lhs);
-                return;
-            }
-            final JSStatement[] statements = variableBlock.getStatements();
-            final PsiElement containingStatement =
-                    getChildWhichContainsElement(variableBlock, assignment);
-            int statementPosition = -1;
-            for (int i = 0; i < statements.length; i++) {
-                if (statements[i].equals(containingStatement)) {
-                    statementPosition = i;
-                    break;
-                }
-            }
-            if (statementPosition == -1) {
-                return;
-            }
-            for (int i = statementPosition + 1; i < statements.length; i++) {
-                if (VariableAccessUtils.variableIsUsed(variable, statements[i])) {
-                    return;
-                }
-            }
-            registerError(lhs);
-        }
-
-        private static boolean loopExistsBetween(
-                JSAssignmentExpression assignment, JSBlockStatement block) {
-            PsiElement elementToTest = assignment;
-            while (elementToTest != null) {
-                if (elementToTest.equals(block)) {
-                    return false;
-                }
-                if (elementToTest instanceof JSLoopStatement) {
-                    return true;
-                }
-                elementToTest = elementToTest.getParent();
-            }
-            return false;
-        }
-
-        private static boolean tryExistsBetween(
-                JSAssignmentExpression assignment, JSBlockStatement block) {
-            PsiElement elementToTest = assignment;
-            while (elementToTest != null) {
-                if (elementToTest.equals(block)) {
-                    return false;
-                }
-                if (elementToTest instanceof JSTryStatement) {
-                    return true;
-                }
-                elementToTest = elementToTest.getParent();
-            }
-            return false;
-        }
-
-        /**
-         * @noinspection AssignmentToMethodParameter
-         */
-        @Nullable
-        public static PsiElement getChildWhichContainsElement(
-                @Nonnull JSBlockStatement ancestor,
-                @Nonnull PsiElement descendant) {
-            PsiElement element = descendant;
-            while (!element.equals(ancestor)) {
-                descendant = element;
-                element = descendant.getParent();
-                if (element == null) {
-                    return null;
-                }
-            }
-            return descendant;
-        }
-    }
+	public String buildErrorString(Object... args)
+	{
+		return InspectionJSBundle.message(
+				"reuse.of.local.variable.problem.descriptor");
+	}
+
+
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new ReuseOfLocalVariableVisitor();
+	}
+
+	private static class ReuseOfLocalVariableVisitor
+			extends BaseInspectionVisitor
+	{
+
+		@Override
+		public void visitJSAssignmentExpression(
+				@Nonnull JSAssignmentExpression assignment)
+		{
+			super.visitJSAssignmentExpression(assignment);
+			if(assignment.getROperand() == null)
+			{
+				return;
+			}
+			final PsiElement assignmentParent = assignment.getParent();
+			if(!(assignmentParent instanceof JSExpressionStatement))
+			{
+				return;
+			}
+			final JSExpression lhs = assignment.getLOperand();
+			if(!(lhs instanceof JSDefinitionExpression))
+			{
+				return;
+			}
+			final JSDefinitionExpression def = (JSDefinitionExpression) lhs;
+			final JSExpression defExpression = def.getExpression();
+			if(!(defExpression instanceof JSReferenceExpression))
+			{
+				return;
+			}
+			final PsiElement referent = ((PsiReference) defExpression).resolve();
+			if(!(referent instanceof JSVariable))
+			{
+				return;
+			}
+			final JSVariable variable = (JSVariable) referent;
+
+			if(variable.getInitializer() == null)
+			{
+				return;
+			}
+			final IElementType tokenType = assignment.getOperationSign();
+
+			if(!JSTokenTypes.EQ.equals(tokenType))
+			{
+				return;
+			}
+			final JSExpression rhs = assignment.getROperand();
+			if(VariableAccessUtils.variableIsUsed(variable, rhs))
+			{
+				return;
+			}
+			final JSBlockStatement variableBlock =
+					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			if(variableBlock == null)
+			{
+				return;
+			}
+
+			if(loopExistsBetween(assignment, variableBlock))
+			{
+				return;
+			}
+			if(tryExistsBetween(assignment, variableBlock))
+			{
+				// this could be weakened, slightly, if it could be verified
+				// that a variable is used in only one branch of a try statement
+				return;
+			}
+			final PsiElement assignmentBlock =
+					assignmentParent.getParent();
+			if(assignmentBlock == null)
+			{
+				return;
+			}
+			if(variableBlock.equals(assignmentBlock))
+			{
+				registerError(lhs);
+				return;
+			}
+			final JSStatement[] statements = variableBlock.getStatements();
+			final PsiElement containingStatement =
+					getChildWhichContainsElement(variableBlock, assignment);
+			int statementPosition = -1;
+			for(int i = 0; i < statements.length; i++)
+			{
+				if(statements[i].equals(containingStatement))
+				{
+					statementPosition = i;
+					break;
+				}
+			}
+			if(statementPosition == -1)
+			{
+				return;
+			}
+			for(int i = statementPosition + 1; i < statements.length; i++)
+			{
+				if(VariableAccessUtils.variableIsUsed(variable, statements[i]))
+				{
+					return;
+				}
+			}
+			registerError(lhs);
+		}
+
+		private static boolean loopExistsBetween(
+				JSAssignmentExpression assignment, JSBlockStatement block)
+		{
+			PsiElement elementToTest = assignment;
+			while(elementToTest != null)
+			{
+				if(elementToTest.equals(block))
+				{
+					return false;
+				}
+				if(elementToTest instanceof JSLoopStatement)
+				{
+					return true;
+				}
+				elementToTest = elementToTest.getParent();
+			}
+			return false;
+		}
+
+		private static boolean tryExistsBetween(
+				JSAssignmentExpression assignment, JSBlockStatement block)
+		{
+			PsiElement elementToTest = assignment;
+			while(elementToTest != null)
+			{
+				if(elementToTest.equals(block))
+				{
+					return false;
+				}
+				if(elementToTest instanceof JSTryStatement)
+				{
+					return true;
+				}
+				elementToTest = elementToTest.getParent();
+			}
+			return false;
+		}
+
+		/**
+		 * @noinspection AssignmentToMethodParameter
+		 */
+		@Nullable
+		public static PsiElement getChildWhichContainsElement(
+				@Nonnull JSBlockStatement ancestor,
+				@Nonnull PsiElement descendant)
+		{
+			PsiElement element = descendant;
+			while(!element.equals(ancestor))
+			{
+				descendant = element;
+				element = descendant.getParent();
+				if(element == null)
+				{
+					return null;
+				}
+			}
+			return descendant;
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index 136a337a..54129c1c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -1,18 +1,21 @@
 package com.sixrr.inspectjs.dataflow;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
+import consulo.language.psi.util.PsiTreeUtil;
+
 import javax.annotation.Nonnull;
 
 import javax.swing.*;
 
+@ExtensionImpl
 public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection {
 
     /**
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
index d992142e..1f3f9031 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
@@ -1,7 +1,8 @@
 package com.sixrr.inspectjs.dataflow;
 
-import com.intellij.psi.*;
 import com.intellij.lang.javascript.psi.*;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
 
 public class VariableAccessUtils {
     public static boolean mayEvaluateToVariable(JSExpression expression,
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
index 62ff681d..24048c18 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
@@ -2,8 +2,8 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 import javax.annotation.Nonnull;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
index dc574f29..9c8f5e7e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
@@ -5,8 +5,8 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
+import consulo.language.psi.PsiElement;
 
 public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisitor
 {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
index 7a475a55..2ca6d417 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
@@ -5,7 +5,7 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 
 public class VariableUsedVisitor extends JSRecursiveElementVisitor {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index 7109c747..02797f91 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -1,7 +1,5 @@
 package com.sixrr.inspectjs.dom;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -9,10 +7,13 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class DocumentWriteJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index 09b66426..93a8791f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -1,14 +1,16 @@
 package com.sixrr.inspectjs.dom;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class InnerHTMLJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index 6ecbbf3a..46208253 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -1,16 +1,17 @@
 package com.sixrr.inspectjs.dom;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class PlatformDetectionJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
index 6fbaa6b9..e12dcd88 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
@@ -1,15 +1,17 @@
 package com.sixrr.inspectjs.dom;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class XHTMLIncompatabilitiesJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
index 2dbdf691..945edbe5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
@@ -2,8 +2,9 @@
 
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nonnull;
 
 class CatchParameterUsedVisitor extends JSRecursiveElementVisitor {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
index 31082fd4..c6343b00 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
@@ -1,7 +1,5 @@
 package com.sixrr.inspectjs.exception;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
@@ -10,7 +8,11 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ContinueOrBreakFromFinallyBlockJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index dc400fdb..17899e4a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -1,19 +1,20 @@
 package com.sixrr.inspectjs.exception;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSCatchBlock;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.StatementUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class EmptyCatchBlockJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
index 4df5230e..4c58779b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
@@ -1,8 +1,5 @@
 package com.sixrr.inspectjs.exception;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -10,7 +7,12 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.StatementUtils;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class EmptyFinallyBlockJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index 029598be..d26741bd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -1,7 +1,5 @@
 package com.sixrr.inspectjs.exception;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -9,9 +7,12 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.StatementUtils;
+import consulo.annotation.component.ExtensionImpl;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class EmptyTryBlockJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index a74ecf13..af089953 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -1,17 +1,19 @@
 package com.sixrr.inspectjs.exception;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSThrowStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ExceptionCaughtLocallyJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
index 2edbe18d..691aa522 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
@@ -1,14 +1,16 @@
 package com.sixrr.inspectjs.exception;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSReturnStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ReturnFromFinallyBlockJSInspection extends JavaScriptInspection {
     @Override
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
index dc4a79a9..6480ad37 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
@@ -8,7 +8,9 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
 
+@ExtensionImpl
 public class ThrowFromFinallyBlockJSInspection extends JavaScriptInspection {
     @Override
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
index f155c8e9..2a905bc5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
@@ -4,18 +4,20 @@
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiComment;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
+import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
 
 import javax.swing.*;
 
+@ExtensionImpl
 public class UnusedCatchParameterJSInspection extends JavaScriptInspection {
 
     /**
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
index 5c5d3715..901593f4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
@@ -1,13 +1,13 @@
 package com.sixrr.inspectjs.fix;
 
-import com.intellij.openapi.project.Project;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.psi.PsiElement;
-import com.intellij.refactoring.RefactoringActionHandlerFactory;
-import com.intellij.refactoring.RefactoringActionHandler;
-import com.intellij.refactoring.RefactoringFactory;
-import com.intellij.refactoring.RenameRefactoring;
-import com.intellij.ide.DataManager;
+import consulo.language.editor.refactoring.RefactoringFactory;
+import consulo.project.Project;
+import consulo.dataContext.DataManager;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.editor.refactoring.action.RefactoringActionHandlerFactory;
+import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.language.editor.refactoring.RenameRefactoring;
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import javax.annotation.Nonnull;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index 04e60b51..42696b8f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -1,82 +1,98 @@
 package com.sixrr.inspectjs.functionmetrics;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
 
-public class CyclomaticComplexityJSInspection
-        extends FunctionMetricsInspection {
-    @Override
+@ExtensionImpl
+public class CyclomaticComplexityJSInspection extends FunctionMetricsInspection
+{
+	@Override
 	@Nonnull
-    public String getID() {
-        return "OverlyComplexFunctionJS";
-    }
+	public String getID()
+	{
+		return "OverlyComplexFunctionJS";
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("overly.complex.function.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("overly.complex.function.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+	}
 
-    @Override
-	protected int getDefaultLimit() {
-        return 10;
-    }
+	@Override
+	protected int getDefaultLimit()
+	{
+		return 10;
+	}
 
-    @Override
-	protected String getConfigurationLabel() {
-        return InspectionJSBundle.message("function.complexity.limit.parameter");
-    }
+	@Override
+	protected String getConfigurationLabel()
+	{
+		return InspectionJSBundle.message("function.complexity.limit.parameter");
+	}
 
-    @Override
-	public String buildErrorString(Object... args) {
-        final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-        assert function != null;
-        final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
-        final PsiElement lastChild = function.getLastChild();
-        assert lastChild != null;
-        lastChild.accept(visitor);
-        final int coupling = visitor.getComplexity();
-        if (functionHasIdentifier(function)) {
-            return InspectionJSBundle.message("function.ref.is.overly.complex.cyclomatic.complexity.error.string", coupling);
-        } else {
-            return InspectionJSBundle.message("anonymous.function.is.overly.complex.cyclomatic.complexity.error.string", coupling);
-        }
-    }
+	@Override
+	public String buildErrorString(Object... args)
+	{
+		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
+		assert function != null;
+		final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
+		final PsiElement lastChild = function.getLastChild();
+		assert lastChild != null;
+		lastChild.accept(visitor);
+		final int coupling = visitor.getComplexity();
+		if(functionHasIdentifier(function))
+		{
+			return InspectionJSBundle.message("function.ref.is.overly.complex.cyclomatic.complexity.error.string", coupling);
+		}
+		else
+		{
+			return InspectionJSBundle.message("anonymous.function.is.overly.complex.cyclomatic.complexity.error.string", coupling);
+		}
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
 
-    private class Visitor extends BaseInspectionVisitor {
+	private class Visitor extends BaseInspectionVisitor
+	{
 
-        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
-            final PsiElement lastChild = function.getLastChild();
-            if(!(lastChild instanceof JSBlockStatement))
-            {
-                return;
-            }
-            final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
-            lastChild.accept(visitor);
-            final int complexity = visitor.getComplexity();
+		@Override
+		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
+		{
+			final PsiElement lastChild = function.getLastChild();
+			if(!(lastChild instanceof JSBlockStatement))
+			{
+				return;
+			}
+			final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
+			lastChild.accept(visitor);
+			final int complexity = visitor.getComplexity();
 
-            if (complexity <= getLimit()) {
-                return;
-            }
-            registerFunctionError(function);
-        }
-    }
+			if(complexity <= getLimit())
+			{
+				return;
+			}
+			registerFunctionError(function);
+		}
+	}
 }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index 25f1e7b5..ecebfcac 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -2,13 +2,15 @@
 
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.psi.PsiElement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class FunctionWithMultipleLoopsJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index ba593a69..0e2766b3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -1,11 +1,14 @@
 package com.sixrr.inspectjs.functionmetrics;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class FunctionWithMultipleReturnPointsJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
index 04e69b02..9e91ea7c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
@@ -5,7 +5,7 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 import javax.annotation.Nonnull;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index 4e310a87..858b12f8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -1,12 +1,14 @@
 package com.sixrr.inspectjs.functionmetrics;
 
 import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.psi.PsiElement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class NestingDepthJSInspection extends FunctionMetricsInspection {
     @Override
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index 9630348e..910ed6c2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -3,14 +3,16 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSParameterList;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nonnull;
 
-public class ParametersPerFunctionJSInspection
-        extends FunctionMetricsInspection {
+@ExtensionImpl
+public class ParametersPerFunctionJSInspection extends FunctionMetricsInspection {
     @Override
 	@Nonnull
     public String getID() {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index f797e755..31a3a98e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -1,16 +1,17 @@
 package com.sixrr.inspectjs.functionmetrics;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
 
-public class StatementsPerFunctionJSInspection
-        extends FunctionMetricsInspection {
+@ExtensionImpl
+public class StatementsPerFunctionJSInspection extends FunctionMetricsInspection {
     @Override
 	@Nonnull
     public String getID() {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index 864f361e..0997029f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -1,15 +1,17 @@
 package com.sixrr.inspectjs.functionmetrics;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ThreeNegationsPerFunctionJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
index 5f5e2433..56dc5a25 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
@@ -1,11 +1,11 @@
 package com.sixrr.inspectjs.naming;
 
-import com.intellij.openapi.util.InvalidDataException;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.ui.FormattedTextFieldMacFix;
 import com.sixrr.inspectjs.ui.RegExFormatter;
 import com.sixrr.inspectjs.ui.RegExInputVerifier;
+import consulo.util.xml.serializer.InvalidDataException;
 import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
 
@@ -68,7 +68,8 @@ boolean isValid(@NonNls String name) {
     }
 
     @Override
-	public void readSettings(Element element) throws InvalidDataException {
+	public void readSettings(Element element) throws InvalidDataException
+	{
         super.readSettings(element);
         m_regexPattern = Pattern.compile(m_regex);
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index 7dbc2885..ecb88486 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -1,16 +1,19 @@
 package com.sixrr.inspectjs.naming;
 
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class FunctionNamingConventionJSInspection extends ConventionInspection {
     private static final int DEFAULT_MIN_LENGTH = 4;
     private static final int DEFAULT_MAX_LENGTH = 32;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index 9df1ba72..69e4e774 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -1,17 +1,19 @@
 package com.sixrr.inspectjs.naming;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class LocalVariableNamingConventionJSInspection extends ConventionInspection {
     private static final int DEFAULT_MIN_LENGTH = 1;
     private static final int DEFAULT_MAX_LENGTH = 32;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index eb890216..43e8f075 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -1,19 +1,21 @@
 package com.sixrr.inspectjs.naming;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class ParameterNamingConventionJSInspection extends ConventionInspection {
     private static final int DEFAULT_MIN_LENGTH = 1;
     private static final int DEFAULT_MAX_LENGTH = 32;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index e9cf6a04..158514b3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -1,16 +1,18 @@
 package com.sixrr.inspectjs.style;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.tree.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ChainedEqualityJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index ab121644..1fb37eaa 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -8,8 +8,11 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ChainedFunctionCallJSInspection extends JavaScriptInspection {
 
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index 050d9183..2d9cbda9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -1,18 +1,20 @@
 package com.sixrr.inspectjs.style;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ConstantOnLHSOfComparisonJSInspection extends JavaScriptInspection {
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index a1de31c0..cf075a8c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -1,18 +1,20 @@
 package com.sixrr.inspectjs.style;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class ConstantOnRHSOfComparisonJSInspection extends JavaScriptInspection {
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index 8cd4a9f6..95083709 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -3,15 +3,18 @@
 import com.intellij.lang.javascript.psi.JSArgumentList;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nonnull;
 
 
 
+@ExtensionImpl
 public class NestedFunctionCallJSInspection extends JavaScriptInspection {
 
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
index 150e72ba..a1bf8b65 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
@@ -1,14 +1,16 @@
 package com.sixrr.inspectjs.style;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class NonBlockStatementBodyJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new WrapBodyFix();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index 8fb8267d..4c74a87a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -1,23 +1,21 @@
 package com.sixrr.inspectjs.style;
 
+import com.intellij.lang.javascript.psi.*;
+import com.sixrr.inspectjs.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiErrorElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.xml.psi.xml.XmlAttributeValue;
+import consulo.xml.psi.xml.XmlTagChild;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiErrorElement;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlTagChild;
-import com.intellij.util.IncorrectOperationException;
-import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
-import com.sixrr.inspectjs.InspectionJSFix;
-import com.sixrr.inspectjs.JSGroupNames;
-import com.sixrr.inspectjs.JavaScriptInspection;
-
+@ExtensionImpl
 public class UnterminatedStatementJSInspection extends JavaScriptInspection
 {
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
index 34423b95..9cf1b118 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs.ui;
 
-import com.intellij.openapi.ui.Messages;
+import consulo.ui.ex.awt.Messages;
 import com.sixrr.inspectjs.InspectionJSBundle;
 
 import javax.swing.*;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
index ae0aad97..b6d195d5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
@@ -7,7 +7,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 import javax.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
index 3aeb2bfb..c1cb31cd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
@@ -3,7 +3,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
index 29c7a1ef..2673d61c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
@@ -3,7 +3,7 @@
 import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 
 import javax.annotation.Nullable;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
index a65de8c4..0471daac 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
@@ -2,10 +2,10 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
 
 @SuppressWarnings({"OverlyComplexMethod",
         "MethodWithMultipleLoops",
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
index ec9002d9..8e048a64 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
@@ -2,7 +2,7 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 
 import java.util.HashMap;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
index 1c9f2045..7c04d932 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
@@ -2,7 +2,7 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
index feb27e36..6efbab3f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
@@ -4,7 +4,7 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 
 public class SideEffectChecker {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index 86e81f92..0413f83c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -1,24 +1,26 @@
 package com.sixrr.inspectjs.validity;
 
-import com.intellij.lang.ASTNode;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.ResolveResult;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.ecmascript6.psi.ES6ExportDefaultAssignment;
+import consulo.javascript.ecmascript.psi.ES6ExportDefaultAssignment;
+import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class BadExpressionStatementJSInspection extends JavaScriptInspection
 {
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
index 6515e5a3..4f8a32a8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
@@ -1,8 +1,5 @@
 package com.sixrr.inspectjs.validity;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -10,8 +7,13 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+@ExtensionImpl
 public class DebuggerStatementJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index 651fa438..ec62aa00 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -8,12 +8,15 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.component.ExtensionImpl;
+
 import javax.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+@ExtensionImpl
 public class DuplicateCaseLabelJSInspection extends JavaScriptInspection {
     @Override
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index c641055f..916f5904 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -6,10 +6,13 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+
 import javax.annotation.Nonnull;
 
 import java.util.Arrays;
 
+@ExtensionImpl
 public class DuplicatePropertyOnObjectJSInspection extends JavaScriptInspection {
     @Override
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index d5e36eec..05c56fad 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -1,16 +1,18 @@
 package com.sixrr.inspectjs.validity;
 
-import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.language.editor.inspection.ProblemHighlightType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspection
 {
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index 2587ab43..b5ad0083 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -1,5 +1,6 @@
 package com.sixrr.inspectjs.validity;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
@@ -8,6 +9,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class StringLiteralBreaksHTMLJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index 1033b7e0..b9c00b07 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -1,19 +1,22 @@
 package com.sixrr.inspectjs.validity;
 
+import com.intellij.lang.javascript.psi.JSExpressionCodeFragment;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSThisExpression;
-import com.intellij.lang.javascript.psi.JSExpressionCodeFragment;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.PsiFile;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.xml.psi.xml.XmlAttributeValue;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class ThisExpressionReferencesGlobalObjectJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
index 8a992510..6559c907 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
@@ -1,8 +1,5 @@
 package com.sixrr.inspectjs.validity;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -10,7 +7,12 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.component.ExtensionImpl;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class UnreachableCodeJSInspection extends JavaScriptInspection {
 
     @Override
diff --git a/intentions/pom.xml b/intentions/pom.xml
index 99aa9e7c..bfe3dd59 100644
--- a/intentions/pom.xml
+++ b/intentions/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-intentions</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
index b396c005..60b16a46 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
@@ -15,14 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
+import com.intellij.lang.javascript.psi.JSElement;
+import consulo.language.psi.PsiElement;
+import consulo.xml.psi.xml.XmlFile;
 import org.intellij.idea.lang.javascript.psiutil.ArrayStack;
 
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.xml.XmlFile;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 public abstract class JSElementIterator implements Iterator<PsiElement> {
 
@@ -30,7 +29,7 @@ public abstract class JSElementIterator implements Iterator<PsiElement> {
     private final int              minTextOffset;
     private final int              maxTextOffset;
     private ArrayStack<PsiElement> elementStack;
-    private PsiElement             next;
+    private PsiElement next;
     private boolean                retrieveNext;
 
     public JSElementIterator(PsiElement element) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
index 2427e85c..d92c216b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
@@ -15,9 +15,9 @@
  */
 package org.intellij.idea.lang.javascript.intention;
 
-import javax.annotation.Nonnull;
+import consulo.language.psi.PsiElement;
 
-import com.intellij.psi.PsiElement;
+import javax.annotation.Nonnull;
 
 public interface JSElementPredicate {
     boolean satisfiedBy(@Nonnull PsiElement element);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
index 70a8920b..93f43678 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
@@ -19,11 +19,11 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.impl.JSNewExpressionImpl;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlFile;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.logging.Logger;
+import consulo.xml.psi.xml.XmlFile;
 import org.intellij.idea.lang.javascript.psiutil.FindReferenceUtil;
 import org.jetbrains.annotations.NonNls;
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index db07f2be..05365069 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -15,18 +15,19 @@
  */
 package org.intellij.idea.lang.javascript.intention;
 
+import consulo.codeEditor.Editor;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.editor.intention.PsiElementBaseIntentionAction;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.xml.psi.xml.XmlElement;
 import org.jetbrains.annotations.NonNls;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
-import com.intellij.lang.Language;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.xml.XmlElement;
-import com.intellij.util.IncorrectOperationException;
-import consulo.javascript.lang.JavaScriptLanguage;
 
 public abstract class JSIntention extends PsiElementBaseIntentionAction
 {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
index 2fd6fecf..4964b8a1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
@@ -17,12 +17,11 @@
 
 import java.util.ResourceBundle;
 
+import consulo.application.CommonBundle;
 import org.jetbrains.annotations.PropertyKey;
 import org.jetbrains.annotations.NonNls;
 import org.intellij.idea.lang.javascript.JSAbstractBundle;
 
-import com.intellij.CommonBundle;
-
 public class JSIntentionBundle extends JSAbstractBundle {
 
     @NonNls
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 41d38a0f..4f25052c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -17,9 +17,9 @@
 
 import javax.annotation.Nonnull;
 
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
+import consulo.codeEditor.Editor;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nullable;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
index 40cfd7ed..74ed71d3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
@@ -22,7 +22,7 @@
 
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
 
 class ComparisonPredicate implements JSElementPredicate {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
index be9463c0..4ee039fb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
@@ -22,8 +22,8 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 
 class ConjunctionPredicate implements JSElementPredicate {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 806d3dc7..3689c3e6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -27,9 +27,9 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSDeMorgansLawIntention extends JSMutablyNamedIntention {
     @NonNls private static final String AND_OPERATOR = "&&";
@@ -53,7 +53,7 @@ public JSElementPredicate getElementPredicate() {
     @Override
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         JSBinaryExpression  exp       = (JSBinaryExpression) element;
-        final IElementType  tokenType = exp.getOperationSign();
+        final IElementType tokenType = exp.getOperationSign();
         JSElement           parent    = (JSElement) exp.getParent();
 
         while (isConjunctionExpression(parent, tokenType)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index fe5f6419..a81ade67 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -24,9 +24,9 @@
 
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSFlipComparisonIntention extends JSMutablyNamedIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 5c63fb1c..9f5e758a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -17,6 +17,8 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -25,15 +27,13 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSFlipConjunctionIntention extends JSMutablyNamedIntention {
     @Override
 	protected String getTextForElement(PsiElement element) {
         final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
-        final IElementType       sign             = binaryExpression.getOperationSign();
+        final IElementType sign             = binaryExpression.getOperationSign();
 
         return this.getText(BinaryOperatorUtils.getOperatorText(sign));
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index 62df39f9..aeecaedc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.ast.IElementType;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
@@ -24,9 +25,8 @@
 
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSNegateComparisonIntention extends JSMutablyNamedIntention {
     @Override
@@ -60,7 +60,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
         final JSBinaryExpression exp             = (JSBinaryExpression) element;
         final JSExpression       lhs             = exp.getLOperand();
         final JSExpression       rhs             = exp.getROperand();
-        final IElementType       sign            = exp.getOperationSign();
+        final IElementType sign            = exp.getOperationSign();
         final String             negatedOperator = ComparisonUtils.getNegatedOperatorText(sign);
         final String             lhsText         = lhs.getText();
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index fa11b3cb..c5675452 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -15,6 +15,7 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -26,9 +27,8 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index 63f14d41..0c66628f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -16,9 +16,9 @@
 package org.intellij.idea.lang.javascript.intention.braces;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index a6649363..0c6e6194 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -17,6 +17,8 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -31,9 +33,7 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSRemoveBracesIntention extends JSMutablyNamedIntention {
     @NonNls private static final String IF_KEYWORD   = "if";
@@ -115,7 +115,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             }
 
             final JSBlockStatement blockStatement = (JSBlockStatement) element;
-            final PsiElement        parent         = blockStatement.getParent();
+            final PsiElement parent         = blockStatement.getParent();
 
             if (!(parent instanceof JSIfStatement      ||
                   parent instanceof JSWhileStatement   ||
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index 5b52aba2..7606dbe7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -16,11 +16,11 @@
 package org.intellij.idea.lang.javascript.intention.comment;
 
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -53,7 +53,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
         final StringBuilder     buffer           = new StringBuilder(getCommentContents(firstComment));
         final List<PsiElement>  elementsToDelete = new ArrayList<PsiElement>();
-        PsiElement              nextComment      = firstComment;
+        PsiElement nextComment      = firstComment;
 
         while (true) {
             elementsToDelete.add(nextComment);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 78ed34ed..d0a8b925 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -18,11 +18,11 @@
 import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index 4ae80506..695854bc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -18,11 +18,11 @@
 import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -37,8 +37,8 @@ protected JSElementPredicate getElementPredicate() {
 
     @Override
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiComment    selectedComment = (PsiComment) element;
-        PsiElement          elementToCheck  = selectedComment;
+        final PsiComment selectedComment = (PsiComment) element;
+        PsiElement elementToCheck  = selectedComment;
         final PsiWhiteSpace whiteSpace;
 
         while (true) {
@@ -52,7 +52,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
             }
         }
 
-        PsiElement  commentElement = JSElementFactory.addElementBefore(whiteSpace, selectedComment.getText());
+        PsiElement commentElement = JSElementFactory.addElementBefore(whiteSpace, selectedComment.getText());
         JSElementFactory.addElementBefore(commentElement, "\n");
 
         JSElementFactory.removeElement(selectedComment);
@@ -75,7 +75,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof PsiComment)) {
                 return false;
             }
-            final PsiComment   comment = (PsiComment) element;
+            final PsiComment comment = (PsiComment) element;
             final IElementType type    = comment.getTokenType();
 
             if (!(JSTokenTypes.C_STYLE_COMMENT    .equals(type) ||
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index a36c16a2..4f96675f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -26,8 +26,8 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSFlipConditionalIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index 29f51e4c..cb9d3a88 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -28,8 +28,8 @@
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSBlockStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSFlipIfIntention extends JSIntention {
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index edbca0e2..554b2521 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -26,8 +26,8 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSRemoveConditionalIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 21934c6d..37b092ff 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -22,8 +22,8 @@
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSReplaceConditionalWithIfIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 43eba805..38203e96 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -27,9 +27,9 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.JSCallExpression;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSConstantExpressionIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index e69650de..deab81e9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -29,10 +30,9 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSConstantSubexpressionIntention extends JSMutablyNamedIntention {
     @Override
@@ -43,7 +43,7 @@ protected JSElementPredicate getElementPredicate() {
 
     @Override
 	protected String getTextForElement(PsiElement element) {
-        final PsiElement         parent           = element.getParent();
+        final PsiElement parent           = element.getParent();
         final JSBinaryExpression binaryExpression = (JSBinaryExpression) (parent instanceof JSBinaryExpression ? parent : element);
         final JSExpression       lhs              = binaryExpression.getLOperand();
         final JSExpression       leftSide;
@@ -64,7 +64,7 @@ protected String getTextForElement(PsiElement element) {
 
     @Override
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement   parent        = element.getParent();
+        final PsiElement parent        = element.getParent();
         final JSExpression expression    = (JSExpression) (parent instanceof JSBinaryExpression ? parent : element);
         String             newExpression = "";
         final Object       constantValue;
@@ -109,7 +109,7 @@ private static String getLeftSideText(JSBinaryExpression binaryExpression) {
     @Nullable
     private static JSBinaryExpression getSubexpression(JSBinaryExpression expression) {
         final JSExpression       rhs               = expression.getROperand();
-        final IElementType       sign              = expression.getOperationSign();
+        final IElementType sign              = expression.getOperationSign();
         final int                parentPrecendence = ParenthesesUtils.getPrecendence(expression);
 
         if (rhs == null) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index f7e806c3..45c2a647 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -32,9 +33,8 @@
 import com.intellij.lang.javascript.psi.JSReturnStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSThrowStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSExtractIncrementIntention extends JSMutablyNamedIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 812ddc28..78510f66 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -16,8 +16,8 @@
 package org.intellij.idea.lang.javascript.intention.initialization;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index d70bdfaa..c67fc0c9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -19,9 +19,9 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSPsiImplUtils;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.language.psi.PsiFile;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index f960f980..8f8a8b02 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -15,14 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention.loop;
 
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSForInStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 07dc3a28..a5b75365 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -29,8 +30,7 @@
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSMergeParallelForLoopsIntention extends JSIntention {
     @NonNls private static final String FOR_STATEMENT_PREFIX = "for (";
@@ -43,7 +43,7 @@ public JSElementPredicate getElementPredicate() {
 
     @Override
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement  nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+        final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index d0e338e8..221a9089 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -23,8 +23,8 @@
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 
 public class JSConvertIntegerToDecimalIntention extends JSIntention {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index ca0cb824..ee2d08ea 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -17,14 +17,14 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSConvertIntegerToHexIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 9a83716d..24c25141 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -22,8 +22,8 @@
 import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSConvertIntegerToOctalIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index d3e56ee4..34aada82 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -29,14 +30,13 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention {
     @Override
 	protected String getTextForElement(PsiElement element) {
-        final IElementType  tokenType = ((JSBinaryExpression) element).getOperationSign();
+        final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
         final String        operatorString;
 
         if (element instanceof JSAssignmentExpression) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index aa90f4af..ead81792 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -29,9 +29,9 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index c7372c61..cab614b9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -30,9 +31,8 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.IElementType;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedIntention {
     @Override
@@ -40,7 +40,7 @@ public String getTextForElement(PsiElement element) {
         final JSAssignmentExpression exp = (JSAssignmentExpression) element;
         final JSBinaryExpression     rhs = (JSBinaryExpression) exp.getROperand();
         assert (rhs != null);
-        final IElementType           sign = rhs.getOperationSign();
+        final IElementType sign = rhs.getOperationSign();
 
         return this.getText(BinaryOperatorUtils.getOperatorText(sign));
     }
@@ -59,7 +59,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
         assert (rhs != null);
 
-        final IElementType  sign    = rhs.getOperationSign();
+        final IElementType sign    = rhs.getOperationSign();
         final String        operand = BinaryOperatorUtils.getOperatorText(sign);
         final JSExpression  rhsrhs  = rhs.getROperand();
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 224fae3f..05d3934b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -17,6 +17,8 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -24,9 +26,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention {
     @Override
@@ -81,8 +81,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             } else if (parentPrecendence == childPrecendence) {
                 if (parent instanceof JSBinaryExpression &&
                     body   instanceof JSBinaryExpression) {
-                    final IElementType       parentOperator   = ((JSBinaryExpression) parent).getOperationSign();
-                    final IElementType       childOperator    = ((JSBinaryExpression) body)  .getOperationSign();
+                    final IElementType parentOperator   = ((JSBinaryExpression) parent).getOperationSign();
+                    final IElementType childOperator    = ((JSBinaryExpression) body)  .getOperationSign();
                     final JSBinaryExpression binaryExpression = (JSBinaryExpression) parent;
                     final JSExpression       lhs              = binaryExpression.getLOperand();
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index e37193a3..8cf5a0d3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -17,13 +17,13 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSDoubleToSingleQuotedStringIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index ec61301c..24018990 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.ast.IElementType;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -25,9 +26,8 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 
@@ -73,7 +73,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             }
 
             final JSBinaryExpression expression = (JSBinaryExpression) element;
-            final IElementType       sign       = expression.getOperationSign();
+            final IElementType sign       = expression.getOperationSign();
 
             if (!sign.equals(JSTokenTypes.PLUS)) {
                 return false;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index f652f17a..742bb9fe 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -17,13 +17,13 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSSingleToDoubleQuotedStringIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
index 80e878c3..dd7bc9cb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
@@ -17,9 +17,9 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
@@ -169,7 +169,7 @@ private static List<JSExpression> determinePossibleCaseExpressions(JSExpression
 
         if (expToCheck instanceof JSBinaryExpression) {
             final JSBinaryExpression binaryExp = (JSBinaryExpression) expToCheck;
-            final IElementType       operation = binaryExp.getOperationSign();
+            final IElementType operation = binaryExp.getOperationSign();
             final JSExpression       lhs       = binaryExp.getLOperand();
             final JSExpression       rhs       = binaryExp.getROperand();
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 0b32bd76..63474ab9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -23,6 +23,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.ast.IElementType;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -33,9 +34,8 @@
 import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSReplaceIfWithSwitchIntention extends JSIntention {
     @NonNls private static final String IF_KEYWORD                     = "if";
@@ -212,7 +212,7 @@ private static void getValuesFromExpression(JSExpression       expression,
                     (JSBinaryExpression) expression;
             final JSExpression       lhs              = binaryExpression.getLOperand();
             final JSExpression       rhs              = binaryExpression.getROperand();
-            final IElementType       tokenType        = binaryExpression.getOperationSign();
+            final IElementType tokenType        = binaryExpression.getOperationSign();
 
             if (JSTokenTypes.OROR.equals(tokenType)) {
                 getValuesFromExpression(lhs, caseExpression, values);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index 1a939bea..bf4bfdd7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Set;
 
+import consulo.language.psi.PsiManager;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -32,11 +33,10 @@
 import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSReplaceSwitchWithIfIntention extends JSIntention {
 
@@ -60,7 +60,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
         assert (switchStatement != null);
 
-        final PsiManager       mgr              = switchStatement.getManager();
+        final PsiManager mgr              = switchStatement.getManager();
         final JSExpression     switchExpression = switchStatement.getSwitchExpression();
         final CodeStyleManager codeStyleMgr     = CodeStyleManager.getInstance(element.getProject());
         final boolean          hadSideEffects   = SideEffectChecker.mayHaveSideEffects(switchExpression);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index 7cf282d9..b97bad90 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -25,8 +25,8 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSMergeElseIfIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index 320fb54c..de1ba2d1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -15,6 +15,7 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
@@ -28,8 +29,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSMergeIfAndIntention extends JSIntention {
     @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index 69a3205d..43101efa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -30,8 +30,8 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSMergeIfOrIntention extends JSIntention {
     @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index 76c55a7a..956b23bf 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -28,8 +28,8 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSMergeParallelIfsIntention extends JSIntention {
     @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index 5987ff47..dff9ba33 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -15,6 +15,7 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -26,8 +27,7 @@
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSReturnStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSRemoveRedundantElseIntention extends JSIntention {
     @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index 8c529d86..afac7e8f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -34,10 +34,10 @@
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSReturnStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSReplaceIfWithConditionalIntention extends JSIntention {
     private         static final char   TERNARY_QUESTION  = '?';
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 14c2090b..2dda8189 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -25,8 +25,8 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSSimplifyIfElseIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index 5e6eaab9..e7f55477 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -24,8 +24,8 @@
 
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSSplitElseIfIntention extends JSIntention {
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index deb78849..e4f83310 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -24,8 +24,8 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index 1443e2cc..2c82b3ba 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -17,6 +17,7 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -29,8 +30,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.util.IncorrectOperationException;
 
 public class JSSplitIfOrIntention extends JSIntention {
     @NonNls private static final String IF_STATEMENT_PREFIX      = "if (";
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
index d480f77c..74426cd1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
@@ -18,7 +18,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 import org.jetbrains.annotations.NonNls;
 
 import java.util.HashMap;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
index ff2b0aed..13526fcb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
@@ -25,7 +25,7 @@
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 public class BoolUtils {
 
@@ -63,7 +63,7 @@ public static boolean isNegation(JSExpression condition) {
     public static boolean isNegation(JSExpression condition, boolean ignoreNegatedNullComparison) {
             if (condition instanceof JSPrefixExpression) {
                 final JSPrefixExpression prefixExpression = (JSPrefixExpression) condition;
-                final IElementType       sign             = prefixExpression.getOperationSign();
+                final IElementType sign             = prefixExpression.getOperationSign();
 
                 return sign.equals(JSTokenTypes.EXCL);
             } else if (condition instanceof JSBinaryExpression) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
index a82acfdb..70a92913 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.HashMap;
 
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.JSTokenTypes;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
index f6a26d9d..480a3803 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
@@ -15,6 +15,7 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
+import consulo.language.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NonNls;
 
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -28,10 +29,9 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 public class ConditionalUtils {
     private ConditionalUtils() {}
@@ -103,7 +103,7 @@ public static boolean isConditional(JSExpression expression) {
 
         if (expression instanceof JSBinaryExpression) {
             final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-            final IElementType       sign             = binaryExpression.getOperationSign();
+            final IElementType sign             = binaryExpression.getOperationSign();
 
             if (JSTokenTypes.XOR.equals(sign)) {
                 return (isConditional(binaryExpression.getLOperand()) &&
@@ -168,8 +168,8 @@ public static boolean isSimplifiableAssignment(JSIfStatement ifStatement, boolea
         if (isAssignment) {
             final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
             final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-            final IElementType           thenSign       = thenExpression.getOperationSign();
-            final IElementType           elseSign       = elseExpression.getOperationSign();
+            final IElementType thenSign       = thenExpression.getOperationSign();
+            final IElementType elseSign       = elseExpression.getOperationSign();
 
             if (!thenSign.equals(elseSign)) {
                 return false;
@@ -210,7 +210,7 @@ public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement
         if (isAssignment) {
             final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
             final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-            final IElementType           thenSign       = thenExpression.getOperationSign();
+            final IElementType thenSign       = thenExpression.getOperationSign();
             final IElementType           elseSign       = elseExpression.getOperationSign();
 
             if (!thenSign.equals(elseSign)) {
@@ -253,7 +253,7 @@ public static void replaceSimplifiableAssignment(JSIfStatement statement, boolea
         final String                 conditionText        = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
         final JSExpressionStatement  assignmentStatement  = (JSExpressionStatement) ConditionalUtils.stripBraces(statement.getThen());
         final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-        final IElementType           operator             = assignmentExpression.getOperationSign();
+        final IElementType operator             = assignmentExpression.getOperationSign();
         final String                 operand              = BinaryOperatorUtils.getOperatorText(operator);
         final JSExpression           lhs                  = assignmentExpression.getLOperand();
         final String                 lhsText              = lhs.getText();
@@ -268,7 +268,7 @@ public static void replaceSimplifiableImplicitAssignment(JSIfStatement statement
         final String                 conditionText        = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
         final JSExpressionStatement  assignmentStatement  = (JSExpressionStatement) ConditionalUtils.stripBraces(statement.getThen());
         final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-        final IElementType           operator             = assignmentExpression.getOperationSign();
+        final IElementType operator             = assignmentExpression.getOperationSign();
         final String                 operand              = BinaryOperatorUtils.getOperatorText(operator);
         final JSExpression           lhs                  = assignmentExpression.getLOperand();
         final String                 lhsText              = lhs.getText();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
index 40c76aa2..67a5aeff 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
@@ -16,9 +16,10 @@
 package org.intellij.idea.lang.javascript.psiutil;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.psi.PsiReference;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -275,7 +276,7 @@ private static boolean statementIsLastInBlock(
         } else if (expression instanceof JSDefinitionExpression) {
             final JSExpression referentExpression = ((JSDefinitionExpression) expression).getExpression();
             final PsiReference reference          = (referentExpression == null) ? null : referentExpression.getReference();
-            final PsiElement   variable           = (reference == null)          ? null : reference.resolve();
+            final PsiElement variable           = (reference == null)          ? null : reference.resolve();
 
             return ((variable != null && variable instanceof JSVariable) ? (JSVariable) variable : null);
         } else {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
index 94884207..049e3fd3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
@@ -15,10 +15,10 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import consulo.javascript.lang.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
 
 public class EquivalenceChecker {
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
index f552d3fa..ced099c5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
@@ -15,10 +15,11 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiErrorElement;
-import com.intellij.psi.PsiRecursiveElementVisitor;
-import com.intellij.psi.util.PsiUtilBase;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiRecursiveElementVisitor;
+import consulo.language.editor.util.PsiUtilBase;
+import consulo.language.psi.PsiErrorElement;
+
 import javax.annotation.Nonnull;
 
 public class ErrorUtil {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
index 25598478..089f8b83 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
@@ -22,9 +22,9 @@
 import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.language.psi.PsiElement;
 
 public class ExpressionUtil {
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
index 02e8280a..7e9fb3aa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
@@ -19,14 +19,14 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlFile;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.xml.psi.xml.XmlFile;
 import org.intellij.idea.lang.javascript.intention.JSElementIterator;
 import org.intellij.idea.lang.javascript.intention.JSFunctionVisitor;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -119,7 +119,7 @@ public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable) {
     }
 
     public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable,
-                                                     @Nullable PsiElement scope) {
+																		  @Nullable PsiElement scope) {
         return getReferences(variable, scope, 0, Integer.MAX_VALUE);
     }
 
@@ -132,8 +132,8 @@ public static Iterable<PsiElement> getReferencesAfter(@Nonnull JSVariable variab
     }
 
     private static Iterable<PsiElement> getReferences(@Nonnull  final JSVariable variable,
-                                                      @Nullable final PsiElement scope,
-                                                      final int minTextOffset, final int maxTextOffset) {
+																		   @Nullable final PsiElement scope,
+																		   final int minTextOffset, final int maxTextOffset) {
         final PsiElement iteratedScope;
 
         if (scope == null) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
index ca6ee016..640b575f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
@@ -15,31 +15,25 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.LanguageParserDefinitions;
-import com.intellij.lang.ParserDefinition;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSBlockStatement;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSStatement;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.ReadonlyStatusHandler;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiFileFactory;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.parser.ParserDefinition;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiFileFactory;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.virtualFileSystem.ReadonlyStatusHandler;
+import consulo.virtualFileSystem.VirtualFile;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  */
@@ -50,10 +44,10 @@ private JSElementFactory() {}
 
     public static PsiElement addElementBefore(@Nonnull PsiElement element,
                                               @Nonnull PsiElement newElement) {
-        final ASTNode     oldElementParentNode = element.getNode();
-        final PsiElement  parentNode           = element.getParent();
-        final ASTNode     newElementParentNode = parentNode.getNode();
-        final ASTNode     newElementNode       = newElement.getNode();
+        final ASTNode oldElementParentNode = element.getNode();
+        final PsiElement parentNode           = element.getParent();
+        final ASTNode newElementParentNode = parentNode.getNode();
+        final ASTNode newElementNode       = newElement.getNode();
 
         if (newElementParentNode == null || newElementNode == null) {
             return null;
@@ -63,12 +57,12 @@ public static PsiElement addElementBefore(@Nonnull PsiElement element,
     }
 
     public static PsiElement addElementAfter(@Nonnull PsiElement element,
-                                             @Nonnull PsiElement newElement) {
-        final ASTNode     elementNode          = element.getNode();
-        final ASTNode     oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
-        final PsiElement  parentNode           = element.getParent();
-        final ASTNode     newElementParentNode = parentNode.getNode();
-        final ASTNode     newElementNode       = newElement.getNode();
+																  @Nonnull PsiElement newElement) {
+        final ASTNode elementNode          = element.getNode();
+        final ASTNode oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
+        final PsiElement parentNode           = element.getParent();
+        final ASTNode newElementParentNode = parentNode.getNode();
+        final ASTNode newElementNode       = newElement.getNode();
 
         if (newElementParentNode == null || newElementNode == null) {
             return null;
@@ -79,7 +73,7 @@ public static PsiElement addElementAfter(@Nonnull PsiElement element,
     }
 
     public static PsiElement addElementBefore(@Nonnull PsiElement element,
-                                              @NonNls @Nonnull String     elementText) {
+																   @NonNls @Nonnull String     elementText) {
         final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
 
         assert (newElement != null);
@@ -87,7 +81,7 @@ public static PsiElement addElementBefore(@Nonnull PsiElement element,
     }
 
     public static PsiElement addElementAfter(@Nonnull PsiElement element,
-                                             @Nonnull String     elementText) {
+																  @Nonnull String     elementText) {
         final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
 
         assert (newElement != null);
@@ -103,8 +97,7 @@ public static ASTNode createElementFromText(Project project, String text) {
 
     @Nonnull
 	private static PsiFile createDummyFile(Project project, String text) {
-      final ParserDefinition  def            =
-        LanguageParserDefinitions.INSTANCE.forLanguage(JavaScriptLanguage.INSTANCE);
+      final ParserDefinition def = ParserDefinition.forLanguage(JavaScriptLanguage.INSTANCE);
 
         assert (def != null);
       return PsiFileFactory.getInstance(project)
@@ -114,13 +107,13 @@ private static PsiFile createDummyFile(Project project, String text) {
     public static JSStatement replaceElementWithStatement(@Nonnull JSElement      element,
                                                           @NonNls @Nonnull String statementText)
         throws IncorrectOperationException {
-        final ASTNode    newStatementNode       = JSChangeUtil.createStatementFromText(
+        final ASTNode newStatementNode       = JSChangeUtil.createStatementFromText(
           element.getProject(),
           statementText);
 
-        final ASTNode    oldStatementParentNode = element.getNode();
+        final ASTNode oldStatementParentNode = element.getNode();
         final PsiElement parentNode             = element.getParent();
-        final ASTNode    newStatementParentNode = parentNode.getNode();
+        final ASTNode newStatementParentNode = parentNode.getNode();
 
         if (newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null) {
             return null;
@@ -145,9 +138,9 @@ public static JSExpression replaceExpression(@Nonnull JSExpression expression,
                                                  @Nonnull JSExpression newExpression)
         throws IncorrectOperationException {
         final ASTNode    newExpressionNode = newExpression.getNode();
-        final ASTNode    oldExpressionNode = expression.getNode();
+        final ASTNode oldExpressionNode = expression.getNode();
         final PsiElement parentNode        = expression.getParent();
-        final ASTNode    grandParentNode   = parentNode.getNode();
+        final ASTNode grandParentNode   = parentNode.getNode();
 
         if (grandParentNode == null || oldExpressionNode == null || newExpressionNode == null) {
             return null;
@@ -162,13 +155,13 @@ public static JSExpression replaceExpression(@Nonnull JSExpression expression,
     public static JSStatement replaceStatement(@Nonnull JSStatement    statement,
                                                @NonNls @Nonnull String text)
         throws IncorrectOperationException {
-        final ASTNode    newStatementNode       = JSChangeUtil.createStatementFromText(
+        final ASTNode newStatementNode       = JSChangeUtil.createStatementFromText(
           statement.getProject(),
           text);
 
-        final ASTNode    oldStatementParentNode = statement.getNode();
+        final ASTNode oldStatementParentNode = statement.getNode();
         final PsiElement parentNode             = statement.getParent();
-        final ASTNode    newStatementParentNode = parentNode.getNode();
+        final ASTNode newStatementParentNode = parentNode.getNode();
 
         if (newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null) {
             return null;
@@ -183,12 +176,12 @@ public static JSStatement replaceStatement(@Nonnull JSStatement    statement,
     public static JSStatement addStatementBefore(@Nonnull JSStatement    statement,
                                                  @NonNls @Nonnull String previousStatementText)
         throws IncorrectOperationException {
-        final ASTNode    newStatementNode       = JSChangeUtil.createStatementFromText(
+        final ASTNode newStatementNode       = JSChangeUtil.createStatementFromText(
           statement.getProject(),
           previousStatementText);
-        final ASTNode    oldStatementParentNode = statement.getNode();
+        final ASTNode oldStatementParentNode = statement.getNode();
         final PsiElement parentNode             = statement.getParent();
-        final ASTNode    newStatementParentNode = parentNode.getNode();
+        final ASTNode newStatementParentNode = parentNode.getNode();
 
         if (newStatementParentNode == null || newStatementNode == null) {
             return null;
@@ -206,10 +199,10 @@ public static JSStatement addStatementAfter(@Nonnull JSStatement    statement,
         final ASTNode     newStatementNode       = JSChangeUtil.createStatementFromText(
           statement.getProject(),
           nextStatementText);
-        final ASTNode     statementNode          = statement.getNode();
-        final ASTNode     oldStatementParentNode = ((statementNode == null) ? null : statementNode.getTreeNext());
-        final PsiElement  parentNode             = statement.getParent();
-        final ASTNode     newStatementParentNode = parentNode.getNode();
+        final ASTNode statementNode          = statement.getNode();
+        final ASTNode oldStatementParentNode = ((statementNode == null) ? null : statementNode.getTreeNext());
+        final PsiElement parentNode             = statement.getParent();
+        final ASTNode newStatementParentNode = parentNode.getNode();
 
         if (newStatementParentNode == null || newStatementNode == null) {
             return null;
@@ -257,7 +250,7 @@ public static void replaceExpressionWithNegatedExpression(@Nonnull JSExpression
 
             if (ComparisonUtils.isComparisonOperator(newExpression)) {
                 final JSBinaryExpression  binaryExpression  = (JSBinaryExpression) newExpression;
-                final IElementType        operationSign     = binaryExpression.getOperationSign();
+                final IElementType operationSign     = binaryExpression.getOperationSign();
                 final String              negatedComparison = ComparisonUtils.getNegatedOperatorText(operationSign);
                 final JSExpression        leftOperand       = binaryExpression.getLOperand();
                 final JSExpression        rightOperand      = binaryExpression.getROperand();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
index ddf7f3d6..6fe9dafa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
@@ -16,8 +16,8 @@
 package org.intellij.idea.lang.javascript.psiutil;
 
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
 
 public class JSRecursionVisitor extends JSRecursiveElementVisitor {
 
@@ -46,7 +46,7 @@ public JSRecursionVisitor(JSFunction function) {
 
             if (methodText.equals(this.functionName)) {
                 final PsiReference methodReference  = methodExpression.getReference();
-                final PsiElement   referent         = ((methodReference == null) ? null : methodReference.resolve());
+                final PsiElement referent         = ((methodReference == null) ? null : methodReference.resolve());
 
                 if (referent != null) {
                     if (referent instanceof JSFunction) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
index 5df550c3..4930ced5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
@@ -17,9 +17,9 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.lang.ASTNode;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.ASTNode;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
index f9769563..d6820f94 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
@@ -55,7 +55,7 @@
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 public class RecursionUtil {
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
index ce2bf662..84b41e54 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
@@ -17,7 +17,7 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 public class SideEffectChecker {
     private SideEffectChecker() {}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
index 02cfacd5..d55ab271 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
@@ -19,7 +19,7 @@
 import javax.annotation.Nullable;
 
 import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
 
 public class TreeUtil {
     private TreeUtil() {}
@@ -89,13 +89,13 @@ public static <ParentType extends PsiElement> ParentType getParentOfType(PsiElem
 
     @Nullable
     public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(@Nullable PsiElement         element,
-                                                                               @Nonnull Class<ParentType> aClass) {
+																									@Nonnull Class<ParentType> aClass) {
         return getPrevLeafOfType(element, aClass, true);
     }
 
     public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(PsiElement        element,
-                                                                               Class<ParentType> aClass,
-                                                                               boolean           strict) {
+																									Class<ParentType> aClass,
+																									boolean           strict) {
         if (element == null) {
             return null;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
index 19afb4d4..652bcd42 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
@@ -17,13 +17,14 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.containers.ArrayListSet;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nonnull;
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 public class VariableAccessUtil {
@@ -157,7 +158,7 @@ public VariableAssignedVisitor(@Nonnull JSVariable      variable,
             this.variable          = variable;
             this.context           = context;
             this.notUpdatedSymbols = notUpdatedSymbols;
-            this.candidateSymbols  = new ArrayListSet<JSVariable>();
+            this.candidateSymbols  = new LinkedHashSet<>();
 
             this.candidateSymbols.add(variable);
         }
@@ -186,7 +187,7 @@ private VariableAssignedVisitor(@Nonnull JSVariable      variable,
 
                 if (VariableAccessUtil.mayEvaluateToVariable(arg, this.variable)) {
                     final Set<JSVariable> usedVariables   = getUsedVariables(assignment.getROperand());
-                    final Set<JSVariable> newCandidateSet = new ArrayListSet<JSVariable>();
+                    final Set<JSVariable> newCandidateSet = new LinkedHashSet<>();
                     boolean               assigned        = false;
 
                     newCandidateSet.addAll(this.candidateSymbols);
@@ -197,7 +198,7 @@ private VariableAssignedVisitor(@Nonnull JSVariable      variable,
                             assigned = true;
                         } else {
                             if (this.notUpdatedSymbols.isEmpty()) {
-                                this.notUpdatedSymbols = new ArrayListSet<JSVariable>();
+                                this.notUpdatedSymbols = new LinkedHashSet<>();
                             }
                             this.notUpdatedSymbols.add(variable);
                         }
diff --git a/lang-version-impl/actionscript-impl/pom.xml b/lang-version-impl/actionscript-impl/pom.xml
index 3273dbaf..8c8f040f 100644
--- a/lang-version-impl/actionscript-impl/pom.xml
+++ b/lang-version-impl/actionscript-impl/pom.xml
@@ -17,16 +17,28 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>16</source>
+					<target>16</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<artifactId>arch.ide-api-provided</artifactId>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-actionscript.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -52,12 +64,5 @@
 			<artifactId>consulo.javascript-ecmascript4.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
index cb493a19..2c46e82a 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
@@ -16,17 +16,17 @@
 
 package consulo.actionscript;
 
-import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.vfs.VirtualFile;
+import consulo.language.version.LanguageVersion;
+import consulo.module.Module;
 import consulo.actionscript.lang.ActionScriptLanguageVersion;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.icon.JavaScriptIconGroup;
-import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.lang.LanguageVersion;
+import consulo.javascript.language.JavaScriptFileTypeWithVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.file.LanguageFileType;
 import consulo.localize.LocalizeValue;
 import consulo.ui.image.Image;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
index 7e34b0da..99307aed 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
@@ -2,8 +2,8 @@
 
 import javax.annotation.Nonnull;
 
-import com.intellij.openapi.fileTypes.FileTypeConsumer;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
+import consulo.virtualFileSystem.fileType.FileTypeConsumer;
+import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
index fbe6ee82..c1892d52 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
@@ -2,14 +2,14 @@
 
 import javax.annotation.Nonnull;
 
-import com.intellij.lang.PsiParser;
+import consulo.language.parser.PsiParser;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
 import com.intellij.lang.javascript.highlighting.JSHighlighter;
-import com.intellij.lexer.Lexer;
+import consulo.language.lexer.Lexer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.javascript.lang.parsing.EcmaScript4Parser;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.ecmascript4.lang.parsing.EcmaScript4Parser;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/actionscript-impl/src/main/java/module-info.java b/lang-version-impl/actionscript-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..e17104fe
--- /dev/null
+++ b/lang-version-impl/actionscript-impl/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+/**
+ * @author VISTALL
+ * @since 23-Aug-22
+ */
+module consulo.javascript.actionscript.impl
+{
+	requires transitive consulo.javascript.ecmascript4.impl;
+
+	exports consulo.actionscript;
+	exports consulo.actionscript.lang;
+}
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript-impl/pom.xml b/lang-version-impl/ecmascript-impl/pom.xml
index 59bd3aef..d5be10dc 100644
--- a/lang-version-impl/ecmascript-impl/pom.xml
+++ b/lang-version-impl/ecmascript-impl/pom.xml
@@ -19,14 +19,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<artifactId>arch.ide-api-provided</artifactId>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-ecmascript.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -35,7 +35,7 @@
 			<url>https://maven.consulo.io/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
+				<updatePolicy>always</updatePolicy>
 			</snapshots>
 		</repository>
 	</repositories>
@@ -45,7 +45,6 @@
 			<plugin>
 				<groupId>consulo.maven</groupId>
 				<artifactId>maven-consulo-plugin</artifactId>
-				<version>2-SNAPSHOT</version>
 				<extensions>true</extensions>
 				<executions>
 					<execution>
@@ -56,6 +55,14 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>16</source>
+					<target>16</target>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -67,17 +74,16 @@
 		</dependency>
 
 		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
+			<groupId>consulo</groupId>
+			<artifactId>consulo-language-editor-impl</artifactId>
 			<version>${project.version}</version>
-			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
similarity index 65%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
index f7fd28ae..4409c2e1 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/EcmaScript6QuickFixFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
@@ -14,10 +14,15 @@
  * limitations under the License.
  */
 
-package consulo.javascript.ide.codeInsight;
+package consulo.javascript.ecmascript.codeInsight;
 
-import consulo.javascript.ide.codeInsight.quickFixes.EcmaScript6CreateJSFunctionOrMethodFix;
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
+import consulo.javascript.ecmascript.codeInsight.quickFixes.EcmaScript6CreateJSFunctionOrMethodFix;
+import consulo.javascript.ecmascript.lang.BaseEcmaScriptJavaScriptVersion;
+import consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory;
+import consulo.javascript.language.JavaScriptLanguageVersion;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -30,4 +35,10 @@ public CreateJSFunctionOrMethodFix createFunctionOrMethodFix(String referenceNam
 	{
 		return new EcmaScript6CreateJSFunctionOrMethodFix(referenceName, isMethod);
 	}
+
+	@Override
+	public boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version)
+	{
+		return version instanceof BaseEcmaScriptJavaScriptVersion;
+	}
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
similarity index 93%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
index 5693e825..745518ff 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ide/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package consulo.javascript.ide.codeInsight.quickFixes;
+package consulo.javascript.ecmascript.codeInsight.quickFixes;
 
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
similarity index 58%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
index 56a42c51..4752bbf5 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/completion/EcmaScript6KeywordCompletionExtender.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
@@ -1,10 +1,10 @@
-package consulo.javascript.ecmascript6.completion;
+package consulo.javascript.ecmascript.completion;
 
-import com.intellij.codeInsight.completion.AddSpaceInsertHandler;
-import com.intellij.codeInsight.completion.CompletionParameters;
-import com.intellij.codeInsight.completion.CompletionResultSet;
-import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.intellij.util.ProcessingContext;
+import consulo.language.editor.completion.CompletionResultSet;
+import consulo.language.editor.completion.lookup.AddSpaceInsertHandler;
+import consulo.language.editor.completion.CompletionParameters;
+import consulo.language.editor.completion.lookup.LookupElementBuilder;
+import consulo.language.util.ProcessingContext;
 import consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
similarity index 69%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
index fd5491b4..7cb98e99 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -1,18 +1,20 @@
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
 
-import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lexer.Lexer;
-import com.intellij.lexer.MergingLexerAdapter;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.psi.tree.TokenSet;
-import consulo.javascript.ecmascript6.psi.impl.resolve.EcmaScript6ResolveHelper;
+import consulo.javascript.ecmascript.lang.lexer._EcmaScript6Lexer;
+import consulo.javascript.ecmascript.lang.parsing.EcmaScriptParser;
+import consulo.javascript.ecmascript.psi.impl.resolve.EcmaScript6ResolveHelper;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.lang.lexer.JavaScriptFlexAdapter;
-import consulo.javascript.lang.lexer._EcmaScript6Lexer;
-import consulo.javascript.lang.parsing.EcmaScriptParser;
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
+import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.language.ast.TokenSet;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.lexer.Lexer;
+import consulo.language.lexer.MergingLexerAdapter;
+import consulo.language.parser.PsiParser;
 
 import javax.annotation.Nonnull;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript10JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
similarity index 90%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript10JavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
index bf40f3ad..0ea7879b 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript10JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
@@ -1,4 +1,4 @@
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
 
 import jakarta.inject.Inject;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
similarity index 83%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
index 8159854a..b58ae102 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript11JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
@@ -1,5 +1,6 @@
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
 
+import consulo.javascript.language.JavaScriptFeature;
 import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
similarity index 85%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
index 0b3525a6..fb0b994c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript12JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
@@ -1,5 +1,6 @@
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
 
+import consulo.javascript.language.JavaScriptLanguage;
 import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
similarity index 88%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
index 3f5e3748..40397cf0 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
 
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.StandardJavaScriptVersions;
 import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
similarity index 83%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
index b62d30c2..4b20885b 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript7JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
@@ -1,5 +1,6 @@
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
 
+import consulo.javascript.language.JavaScriptFeature;
 import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript8JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
similarity index 90%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript8JavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
index ad66e1c1..8dc7c2a4 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript8JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
@@ -1,4 +1,4 @@
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
 
 import jakarta.inject.Inject;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
similarity index 82%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
index 100008c8..90d5f01c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScript9JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
@@ -1,5 +1,6 @@
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
 
+import consulo.javascript.language.JavaScriptFeature;
 import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
similarity index 82%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
index c42cc5d0..364781fc 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
@@ -14,18 +14,20 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
 
-import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.vfs.VirtualFile;
+import consulo.javascript.language.JavaScriptFileTypeWithVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.util.ModuleUtilCore;
+import consulo.language.version.LanguageVersion;
+import consulo.module.Module;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
-import consulo.lang.LanguageVersion;
+import consulo.language.file.LanguageFileType;
 import consulo.localize.LocalizeValue;
 import consulo.ui.image.Image;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -68,7 +70,7 @@ public String getDefaultExtension()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIconGroup.ecmaScript();
+		return JavaScriptIconGroup.ecmascript();
 	}
 
 	@RequiredReadAction
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
similarity index 63%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
index de37debd..641b7f69 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/EcmaScriptFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
@@ -1,8 +1,9 @@
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript.lang;
+
+import consulo.virtualFileSystem.fileType.FileTypeConsumer;
+import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
 import javax.annotation.Nonnull;
-import com.intellij.openapi.fileTypes.FileTypeConsumer;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex
similarity index 99%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex
index fb373d1a..8631686d 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex
@@ -1,7 +1,7 @@
-package consulo.javascript.lang.lexer;
+package consulo.javascript.ecmascript.lang.lexer;
 
-import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.lexer.FlexLexer;
+import consulo.language.ast.IElementType;
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.javascript.lang.lexer.JavaScriptFlexLexer;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex.idea
similarity index 100%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/lexer/ecmascript6.flex.idea
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex.idea
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
similarity index 96%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
index 5ab7f31d..c8de1739 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.psi.tree.IElementType;
+import consulo.javascript.lang.parsing.ExpressionParsing;
+import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.IElementType;
+import consulo.language.parser.PsiBuilder;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParser.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
similarity index 78%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParser.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
index 229ad941..7a9a5529 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParser.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
+import consulo.javascript.lang.parsing.JavaScriptParser;
+import consulo.javascript.lang.parsing.JavaScriptParserBuilder;
+import consulo.javascript.lang.parsing.JavaScriptParsingContext;
+import consulo.language.parser.PsiBuilder;
 
 import javax.annotation.Nonnull;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParsingContext.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
similarity index 81%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParsingContext.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
index 7110fc8f..adc740ae 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptParsingContext.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript.lang.parsing;
+
+import consulo.javascript.lang.parsing.ExpressionParsing;
+import consulo.javascript.lang.parsing.JavaScriptParsingContext;
+import consulo.javascript.lang.parsing.StatementParsing;
 
 import javax.annotation.Nonnull;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
similarity index 96%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index 24cdc504..7c2c3f32 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -14,17 +14,19 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
-import consulo.javascript.ecmascript6.psi.impl.EcmaScript6ElementTypes;
+import consulo.javascript.ecmascript.psi.impl.EcmaScript6ElementTypes;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.lang.parsing.Parsing;
+import consulo.javascript.lang.parsing.StatementParsing;
+import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStrictParserBuilder.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStrictParserBuilder.java
similarity index 88%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStrictParserBuilder.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStrictParserBuilder.java
index 84238167..fd05746a 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScriptStrictParserBuilder.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStrictParserBuilder.java
@@ -1,8 +1,8 @@
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.javascript.lang.parsing.impl.JavaScriptStrictParserBuilder;
+import consulo.language.parser.PsiBuilder;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ExportDefaultAssignment.java
similarity index 79%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ExportDefaultAssignment.java
index 76fe4dca..3fd3ff17 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ExportDefaultAssignment.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ExportDefaultAssignment.java
@@ -1,4 +1,4 @@
-package consulo.javascript.ecmascript6.psi;
+package consulo.javascript.ecmascript.psi;
 
 import com.intellij.lang.javascript.psi.JSStatement;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportDeclaration.java
similarity index 82%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportDeclaration.java
index f7e846a4..45afdd32 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportDeclaration.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportDeclaration.java
@@ -1,4 +1,4 @@
-package consulo.javascript.ecmascript6.psi;
+package consulo.javascript.ecmascript.psi;
 
 import consulo.javascript.psi.JavaScriptImportStatementBase;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportSpecifier.java
similarity index 70%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportSpecifier.java
index 9a26bb73..658ea9c5 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportSpecifier.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportSpecifier.java
@@ -1,7 +1,7 @@
-package consulo.javascript.ecmascript6.psi;
+package consulo.javascript.ecmascript.psi;
 
 import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.psi.PsiNameIdentifierOwner;
+import consulo.language.psi.PsiNameIdentifierOwner;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
similarity index 82%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
index 2e6893e1..b2718d8c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6ImportedBinding.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
@@ -1,8 +1,8 @@
-package consulo.javascript.ecmascript6.psi;
+package consulo.javascript.ecmascript.psi;
 
 import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.psi.PsiNameIdentifierOwner;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.PsiNameIdentifierOwner;
 
 import javax.annotation.Nullable;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
similarity index 89%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
index c2d7e962..8b268040 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/ES6NamedImports.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
@@ -1,4 +1,4 @@
-package consulo.javascript.ecmascript6.psi;
+package consulo.javascript.ecmascript.psi;
 
 import com.intellij.lang.javascript.psi.JSElement;
 import consulo.annotation.access.RequiredReadAction;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
similarity index 78%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
index fbee180a..8bd18081 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ExportDefaultAssignmentImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
@@ -1,14 +1,14 @@
-package consulo.javascript.ecmascript6.psi.impl;
+package consulo.javascript.ecmascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSStatementImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import consulo.javascript.ecmascript6.psi.ES6ExportDefaultAssignment;
+import consulo.javascript.ecmascript.psi.ES6ExportDefaultAssignment;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
similarity index 73%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
index ba9d86c3..975ea395 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportDeclarationImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
@@ -1,12 +1,12 @@
-package consulo.javascript.ecmascript6.psi.impl;
+package consulo.javascript.ecmascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSStatementImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import consulo.javascript.ecmascript6.psi.ES6ImportDeclaration;
+import consulo.javascript.ecmascript.psi.ES6ImportDeclaration;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
 
 import javax.annotation.Nonnull;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
similarity index 79%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
index 85e04d4c..cae389d9 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportSpecifierImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
@@ -1,14 +1,14 @@
-package consulo.javascript.ecmascript6.psi.impl;
+package consulo.javascript.ecmascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.access.RequiredWriteAction;
-import consulo.javascript.ecmascript6.psi.ES6ImportSpecifier;
+import consulo.javascript.ecmascript.psi.ES6ImportSpecifier;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
similarity index 81%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
index 68b5fa75..0a879af6 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6ImportedBindingImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
@@ -1,17 +1,17 @@
-package consulo.javascript.ecmascript6.psi.impl;
+package consulo.javascript.ecmascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.access.RequiredWriteAction;
-import consulo.javascript.ecmascript6.psi.ES6ImportSpecifier;
-import consulo.javascript.ecmascript6.psi.ES6ImportedBinding;
+import consulo.javascript.ecmascript.psi.ES6ImportSpecifier;
+import consulo.javascript.ecmascript.psi.ES6ImportedBinding;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
similarity index 73%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
index b1865686..2c21b944 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/ES6NamedImportsImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
@@ -1,14 +1,14 @@
-package consulo.javascript.ecmascript6.psi.impl;
+package consulo.javascript.ecmascript.psi.impl;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.PsiScopeProcessor;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.ecmascript6.psi.ES6ImportedBinding;
-import consulo.javascript.ecmascript6.psi.ES6NamedImports;
+import consulo.javascript.ecmascript.psi.ES6ImportedBinding;
+import consulo.javascript.ecmascript.psi.ES6NamedImports;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
 
 import javax.annotation.Nonnull;
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/EcmaScript6ElementTypes.java
similarity index 66%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/EcmaScript6ElementTypes.java
index 558f7a58..c2ca4834 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/EcmaScript6ElementTypes.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/EcmaScript6ElementTypes.java
@@ -1,8 +1,8 @@
-package consulo.javascript.ecmascript6.psi.impl;
+package consulo.javascript.ecmascript.psi.impl;
 
-import com.intellij.psi.tree.IElementType;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.psi.tree.ElementTypeAsPsiFactory;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.ast.ElementTypeAsPsiFactory;
+import consulo.language.ast.IElementType;
 
 /**
  * @author VISTALL
@@ -10,13 +10,13 @@
  */
 public interface EcmaScript6ElementTypes
 {
-	IElementType EXPORT_DEFAULT_ASSIGMENT = new ElementTypeAsPsiFactory("EXPORT_DEFAULT_ASSIGMENT", JavaScriptLanguage.INSTANCE, ES6ExportDefaultAssignmentImpl.class);
+	IElementType EXPORT_DEFAULT_ASSIGMENT = new ElementTypeAsPsiFactory("EXPORT_DEFAULT_ASSIGMENT", JavaScriptLanguage.INSTANCE, ES6ExportDefaultAssignmentImpl::new);
 
-	IElementType IMPORT_DECLARATION = new ElementTypeAsPsiFactory("IMPORT_DECLARATION", JavaScriptLanguage.INSTANCE, ES6ImportDeclarationImpl.class);
+	IElementType IMPORT_DECLARATION = new ElementTypeAsPsiFactory("IMPORT_DECLARATION", JavaScriptLanguage.INSTANCE, ES6ImportDeclarationImpl::new);
 
-	IElementType IMPORTED_BINDING = new ElementTypeAsPsiFactory("IMPORTED_BINDING", JavaScriptLanguage.INSTANCE, ES6ImportedBindingImpl.class);
+	IElementType IMPORTED_BINDING = new ElementTypeAsPsiFactory("IMPORTED_BINDING", JavaScriptLanguage.INSTANCE, ES6ImportedBindingImpl::new);
 
-	IElementType NAMED_IMPORTS = new ElementTypeAsPsiFactory("NAMED_IMPORTS", JavaScriptLanguage.INSTANCE, ES6NamedImportsImpl.class);
+	IElementType NAMED_IMPORTS = new ElementTypeAsPsiFactory("NAMED_IMPORTS", JavaScriptLanguage.INSTANCE, ES6NamedImportsImpl::new);
 
-	IElementType IMPORT_SPECIFIER = new ElementTypeAsPsiFactory("IMPORT_SPECIFIER", JavaScriptLanguage.INSTANCE, ES6ImportSpecifierImpl.class);
+	IElementType IMPORT_SPECIFIER = new ElementTypeAsPsiFactory("IMPORT_SPECIFIER", JavaScriptLanguage.INSTANCE, ES6ImportSpecifierImpl::new);
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
similarity index 85%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
index fd1341f3..e3a22089 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript6/psi/impl/resolve/EcmaScript6ResolveHelper.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
@@ -1,19 +1,19 @@
-package consulo.javascript.ecmascript6.psi.impl.resolve;
+package consulo.javascript.ecmascript.psi.impl.resolve;
 
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
 import com.intellij.lang.javascript.psi.resolve.JSImportedElementResolveResult;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.scope.BaseScopeProcessor;
-import com.intellij.psi.util.PsiTreeUtil;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.ecmascript6.psi.ES6ImportDeclaration;
-import consulo.javascript.ecmascript6.psi.ES6ImportedBinding;
+import consulo.javascript.ecmascript.psi.ES6ImportDeclaration;
+import consulo.javascript.ecmascript.psi.ES6ImportedBinding;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.resolve.BaseScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.Comparing;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
index 85c80832..d6216f2e 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
@@ -1,8 +1,9 @@
 package consulo.javascript.jsx;
 
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.openapi.fileTypes.FileTypeConsumer;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.virtualFileSystem.fileType.FileTypeConsumer;
+import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
 import javax.annotation.Nonnull;
 
@@ -10,6 +11,7 @@
  * @author VISTALL
  * @since 2020-06-14
  */
+@ExtensionImpl
 public class JSXFileTypeFactory extends FileTypeFactory
 {
 	@Override
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
similarity index 56%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java
rename to lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
index a4ee773a..607d2bdd 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/daemon/impl/tagTreeHighlighting/JSXTagTreeHighlightingPassFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
@@ -1,13 +1,14 @@
-package consulo.javascript.jsx.codeInsight.daemon.impl.tagTreeHighlighting;
-
-import com.intellij.codeHighlighting.Pass;
-import com.intellij.codeHighlighting.TextEditorHighlightingPass;
-import com.intellij.codeHighlighting.TextEditorHighlightingPassFactory;
-import com.intellij.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeHighlightingPass;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.ex.EditorEx;
-import com.intellij.psi.PsiFile;
-import consulo.javascript.lang.EcmaScript6JavaScriptVersion;
+package consulo.javascript.jsx.codeInsight;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.codeEditor.Editor;
+import consulo.codeEditor.EditorEx;
+import consulo.javascript.ecmascript.lang.EcmaScript6JavaScriptVersion;
+import consulo.language.editor.Pass;
+import consulo.language.editor.impl.highlight.TextEditorHighlightingPass;
+import consulo.language.editor.impl.highlight.TextEditorHighlightingPassFactory;
+import consulo.language.psi.PsiFile;
+import consulo.xml.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeHighlightingPass;
 
 import javax.annotation.Nonnull;
 
@@ -15,6 +16,7 @@
  * @author VISTALL
  * @since 2019-12-15
  */
+@ExtensionImpl
 public class JSXTagTreeHighlightingPassFactory implements TextEditorHighlightingPassFactory
 {
 	@Override
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
index fe81d8d6..ddbde5cb 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
@@ -1,15 +1,19 @@
 package consulo.javascript.jsx.fileTemplate;
 
-import com.intellij.ide.fileTemplates.DefaultCreateFromTemplateHandler;
-import com.intellij.ide.fileTemplates.FileTemplate;
-import com.intellij.lang.javascript.JavaScriptFileType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.fileTemplate.CreateFromTemplateHandler;
+import consulo.fileTemplate.FileTemplate;
 import consulo.javascript.jsx.language.JSXFileType;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 2019-12-17
  */
-public class JSXCreateFromTemplateHandler extends DefaultCreateFromTemplateHandler
+@ExtensionImpl
+public class JSXCreateFromTemplateHandler implements CreateFromTemplateHandler
 {
 	@Override
 	public boolean handlesTemplate(FileTemplate template)
@@ -17,13 +21,14 @@ public boolean handlesTemplate(FileTemplate template)
 		return template.getExtension().equals(JavaScriptFileType.INSTANCE.getDefaultExtension());
 	}
 
+	@Nonnull
 	@Override
-	protected String checkAppendExtension(String fileName, FileTemplate template)
+	public String checkAppendExtension(String fileName, FileTemplate template)
 	{
 		if(fileName.endsWith("." + JSXFileType.INSTANCE.getDefaultExtension()))
 		{
 			return fileName;
 		}
-		return super.checkAppendExtension(fileName, template);
+		return CreateFromTemplateHandler.super.checkAppendExtension(fileName, template);
 	}
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
index 94e0c0d5..8215ed78 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
@@ -1,15 +1,15 @@
 package consulo.javascript.jsx.language;
 
-import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.vfs.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.icon.JavaScriptIconGroup;
-import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
-import consulo.lang.LanguageVersion;
+import consulo.javascript.language.JavaScriptFileTypeWithVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.file.LanguageFileType;
+import consulo.language.version.LanguageVersion;
 import consulo.localize.LocalizeValue;
+import consulo.module.Module;
 import consulo.ui.image.Image;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
index d2a984c3..68170888 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
@@ -1,7 +1,8 @@
 package consulo.javascript.jsx.language;
 
-import com.intellij.openapi.fileTypes.FileTypeConsumer;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.virtualFileSystem.fileType.FileTypeConsumer;
+import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
 import javax.annotation.Nonnull;
 
@@ -9,6 +10,7 @@
  * @author VISTALL
  * @since 2019-12-16
  */
+@ExtensionImpl
 public class JSXFileTypeFactory extends FileTypeFactory
 {
 	@Override
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
index 23678399..3db5f974 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
@@ -1,7 +1,8 @@
 package consulo.javascript.jsx.language;
 
-import consulo.javascript.lang.EcmaScript6JavaScriptVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.ecmascript.lang.EcmaScript6JavaScriptVersion;
+import consulo.javascript.language.JavaScriptLanguage;
 
 import javax.annotation.Nonnull;
 
@@ -9,6 +10,7 @@
  * @author VISTALL
  * @since 2019-12-16
  */
+@ExtensionImpl
 public class JSXJavaScriptVersion extends EcmaScript6JavaScriptVersion
 {
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java
deleted file mode 100644
index 98942d77..00000000
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXXmlTagManipulator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package consulo.javascript.jsx.language.psi.impl;
-
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.AbstractElementManipulator;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.util.IncorrectOperationException;
-
-import javax.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 2019-12-17
- */
-public class JSXXmlTagManipulator extends AbstractElementManipulator<XmlTag>
-{
-	@Override
-	public XmlTag handleContentChange(@Nonnull XmlTag tag, @Nonnull TextRange textRange, String s) throws IncorrectOperationException
-	{
-		return null;
-	}
-}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
index 30a9bfe9..b95b6769 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
@@ -1,8 +1,8 @@
 package consulo.javascript.jsx.language.psi.impl;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReferenceBase;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReferenceBase;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
index a01210ee..ce6fabb9 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
@@ -1,9 +1,12 @@
 package consulo.javascript.jsx.language.psi.impl;
 
 import com.intellij.lang.javascript.psi.impl.JSXmlLiteralExpressionImpl;
-import com.intellij.patterns.StandardPatterns;
-import com.intellij.psi.*;
-import com.intellij.util.ProcessingContext;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.pattern.StandardPatterns;
+import consulo.language.psi.*;
+import consulo.language.util.ProcessingContext;
 
 import javax.annotation.Nonnull;
 
@@ -11,6 +14,7 @@
  * @author VISTALL
  * @since 2019-12-17
  */
+@ExtensionImpl
 public class JSXmlTagReferenceContributor extends PsiReferenceContributor
 {
 	@Override
@@ -33,4 +37,11 @@ public PsiReference[] getReferencesByElement(@Nonnull PsiElement psiElement, @No
 			}
 		});
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/module-info.java b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..b38add68
--- /dev/null
+++ b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+/**
+ * @author VISTALL
+ * @since 23-Aug-22
+ */
+module consulo.javascript.ecmascript.impl
+{
+	requires transitive consulo.javascript.base.impl;
+	requires com.intellij.xml;
+	requires consulo.language.editor.impl;
+
+	exports consulo.javascript.ecmascript.codeInsight;
+	exports consulo.javascript.ecmascript.codeInsight.quickFixes;
+	exports consulo.javascript.ecmascript.completion;
+	exports consulo.javascript.ecmascript.lang;
+	exports consulo.javascript.ecmascript.lang.parsing;
+	exports consulo.javascript.ecmascript.psi;
+	exports consulo.javascript.ecmascript.psi.impl;
+	exports consulo.javascript.ecmascript.psi.impl.resolve;
+	exports consulo.javascript.jsx;
+	exports consulo.javascript.jsx.fileTemplate;
+	exports consulo.javascript.jsx.language;
+	exports consulo.javascript.jsx.language.psi.impl;
+}
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript4-impl/pom.xml b/lang-version-impl/ecmascript4-impl/pom.xml
index 24b7a6c9..a98ef99b 100644
--- a/lang-version-impl/ecmascript4-impl/pom.xml
+++ b/lang-version-impl/ecmascript4-impl/pom.xml
@@ -17,16 +17,28 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>16</source>
+					<target>16</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<artifactId>arch.ide-api-provided</artifactId>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-ecmascript4.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -46,12 +58,5 @@
 			<artifactId>consulo.javascript-base.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
similarity index 69%
rename from lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
index 02b83e3f..368bdab1 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/EcmaScript4JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
@@ -1,12 +1,14 @@
-package consulo.javascript.lang;
+package consulo.javascript.ecmascript4.lang;
 
-import com.intellij.lang.PsiParser;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
 import com.intellij.lang.javascript.highlighting.JSHighlighter;
-import com.intellij.lexer.Lexer;
 import consulo.annotation.DeprecationInfo;
-import consulo.javascript.lang.parsing.EcmaScript4Parser;
+import consulo.javascript.ecmascript4.lang.parsing.EcmaScript4Parser;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.language.lexer.Lexer;
+import consulo.language.parser.PsiParser;
 
 import javax.annotation.Nonnull;
 
@@ -15,7 +17,7 @@
  * @since 05.03.2015
  */
 @Deprecated
-@DeprecationInfo("This language vesion was dropped. We keep it only for history, many options may not supported")
+@DeprecationInfo("This language version was dropped. We keep it only for history, many options may not supported")
 public class EcmaScript4JavaScriptVersion extends BaseJavaScriptLanguageVersion
 {
 	private final DialectOptionHolder myDialectOptionHolder = new DialectOptionHolder(true, false);
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
similarity index 92%
rename from lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
index b9145edb..3c39debb 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ExpressionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
@@ -1,11 +1,13 @@
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript4.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.lang.parsing.ExpressionParsing;
+import consulo.javascript.lang.parsing.JavaScriptParsingContext;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.parser.PsiBuilder;
 
 /**
  * @author VISTALL
@@ -185,7 +187,7 @@ else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.
 	}
 
 	@Override
-	protected boolean tryParseType(final PsiBuilder builder)
+	public boolean tryParseType(final PsiBuilder builder)
 	{
 		if(builder.getTokenType() == JSTokenTypes.COLON)
 		{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
similarity index 93%
rename from lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
index 57bc7e2c..623801eb 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4FunctionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
@@ -1,10 +1,12 @@
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript4.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.tree.IElementType;
+import consulo.javascript.lang.parsing.FunctionParsing;
+import consulo.javascript.lang.parsing.JavaScriptParsingContext;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.ast.IElementType;
+import consulo.language.parser.PsiBuilder;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4Parser.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
similarity index 60%
rename from lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4Parser.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
index 1d004320..8aaaad41 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4Parser.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
@@ -1,4 +1,7 @@
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript4.lang.parsing;
+
+import consulo.javascript.lang.parsing.JavaScriptParser;
+import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 
 import javax.annotation.Nonnull;
 
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
similarity index 65%
rename from lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
index c80388a7..d3a2da3a 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4ParsingContext.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
@@ -1,4 +1,9 @@
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript4.lang.parsing;
+
+import consulo.javascript.lang.parsing.ExpressionParsing;
+import consulo.javascript.lang.parsing.FunctionParsing;
+import consulo.javascript.lang.parsing.JavaScriptParsingContext;
+import consulo.javascript.lang.parsing.StatementParsing;
 
 import javax.annotation.Nonnull;
 
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
similarity index 98%
rename from lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
rename to lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
index cc646a1e..8c0f5bea 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
@@ -1,10 +1,11 @@
-package consulo.javascript.lang.parsing;
+package consulo.javascript.ecmascript4.lang.parsing;
 
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.psi.tree.IElementType;
+import consulo.javascript.lang.parsing.StatementParsing;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.ast.IElementType;
+import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java b/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..2e12821c
--- /dev/null
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+/**
+ * @author VISTALL
+ * @since 23-Aug-22
+ */
+module consulo.javascript.ecmascript4.impl
+{
+	requires transitive consulo.javascript.base.impl;
+
+	exports consulo.javascript.ecmascript4.lang;
+	exports consulo.javascript.ecmascript4.lang.parsing;
+}
\ No newline at end of file
diff --git a/lang-version-impl/javascript16-impl/pom.xml b/lang-version-impl/javascript16-impl/pom.xml
index 117008af..101d8fbf 100644
--- a/lang-version-impl/javascript16-impl/pom.xml
+++ b/lang-version-impl/javascript16-impl/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-javascript16.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -46,12 +46,5 @@
 			<artifactId>consulo.javascript-base.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
similarity index 72%
rename from lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java
rename to lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
index b3f42cf7..31292d25 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/JavaScript16LanguageVersion.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.javascript16.lang;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import consulo.javascript.lang.lexer.JavaScript16Lexer;
+import consulo.javascript.javascript16.lang.lexer.JavaScript16Lexer;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.lexer.Lexer;
+
+import javax.annotation.Nonnull;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
@@ -30,14 +33,7 @@
  */
 public class JavaScript16LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
-	private static final Factory<Lexer> ourLexerFactory = new Factory<Lexer>()
-	{
-		@Override
-		public Lexer create()
-		{
-			return new JavaScript16Lexer();
-		}
-	};
+	private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript16Lexer();
 
 	@Nonnull
 	public static JavaScript16LanguageVersion getInstance()
@@ -61,7 +57,7 @@ public String getPresentableName()
 	@Override
 	public Lexer createLexer()
 	{
-		return ourLexerFactory.create();
+		return ourLexerFactory.get();
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript16Lexer.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java
similarity index 99%
rename from lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript16Lexer.java
rename to lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java
index f480e6ac..a700f38a 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript16Lexer.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java
@@ -1,9 +1,9 @@
 /* The following code was generated by JFlex 1.4.4 on 15.02.16 12:38 */
 
-package consulo.javascript.lang.lexer;
+package consulo.javascript.javascript16.lang.lexer;
 
-import com.intellij.lexer.LexerBase;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.lexer.LexerBase;
+import consulo.language.ast.IElementType;
 import com.intellij.lang.javascript.JSTokenTypes;
 
 
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/javascript16.flex b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/javascript16.flex
similarity index 99%
rename from lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/javascript16.flex
rename to lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/javascript16.flex
index f9d98089..215c0403 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/lang/lexer/javascript16.flex
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/javascript16.flex
@@ -1,4 +1,4 @@
-package consulo.javascript.lang.lexer;
+package consulo.javascript.javascript16.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/lang-version-impl/javascript16-impl/src/main/java/module-info.java b/lang-version-impl/javascript16-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..76447d51
--- /dev/null
+++ b/lang-version-impl/javascript16-impl/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+/**
+ * @author VISTALL
+ * @since 23-Aug-22
+ */
+module consulo.javascript.javascript16.impl
+{
+	requires transitive consulo.javascript.base.impl;
+
+	exports consulo.javascript.javascript16.lang;
+	exports consulo.javascript.javascript16.lang.lexer;
+}
\ No newline at end of file
diff --git a/lang-version-impl/javascript17-impl/pom.xml b/lang-version-impl/javascript17-impl/pom.xml
index 754e1e72..7578d0aa 100644
--- a/lang-version-impl/javascript17-impl/pom.xml
+++ b/lang-version-impl/javascript17-impl/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-javascript17.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -46,12 +46,5 @@
 			<artifactId>consulo.javascript-base.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/JavaScript17LanguageVersion.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
similarity index 72%
rename from lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/JavaScript17LanguageVersion.java
rename to lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
index 7ae05c65..db8e57a8 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/JavaScript17LanguageVersion.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
@@ -14,14 +14,18 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.javascript17.lang;
 
-import javax.annotation.Nonnull;
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import consulo.javascript.lang.lexer.JavaScript17Lexer;
+import consulo.javascript.javascript17.lang.lexer.JavaScript17Lexer;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.lexer.Lexer;
+
+import javax.annotation.Nonnull;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
@@ -29,14 +33,7 @@
  */
 public class JavaScript17LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
-	private static final Factory<Lexer> ourLexerFactory = new Factory<Lexer>()
-	{
-		@Override
-		public Lexer create()
-		{
-			return new JavaScript17Lexer();
-		}
-	};
+	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
 	@Nonnull
 	public static JavaScript17LanguageVersion getInstance()
@@ -60,7 +57,7 @@ public String getPresentableName()
 	@Override
 	public Lexer createLexer()
 	{
-		return ourLexerFactory.create();
+		return ourLexerFactory.get();
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript17Lexer.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java
similarity index 99%
rename from lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript17Lexer.java
rename to lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java
index 442e4372..072f173c 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/JavaScript17Lexer.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java
@@ -1,9 +1,9 @@
 /* The following code was generated by JFlex 1.4.4 on 12.02.16 16:59 */
 
-package consulo.javascript.lang.lexer;
+package consulo.javascript.javascript17.lang.lexer;
 
-import com.intellij.lexer.LexerBase;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.lexer.LexerBase;
+import consulo.language.ast.IElementType;
 import com.intellij.lang.javascript.JSTokenTypes;
 
 
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/javascript17.flex b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/javascript17.flex
similarity index 99%
rename from lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/javascript17.flex
rename to lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/javascript17.flex
index e3cae27d..f957f7da 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/lang/lexer/javascript17.flex
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/javascript17.flex
@@ -1,4 +1,4 @@
-package consulo.javascript.lang.lexer;
+package consulo.javascript.javascript17.lang.lexer;
 
 import com.intellij.lexer.LexerBase;
 import com.intellij.psi.tree.IElementType;
diff --git a/lang-version-impl/javascript17-impl/src/main/java/module-info.java b/lang-version-impl/javascript17-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..bdde4e91
--- /dev/null
+++ b/lang-version-impl/javascript17-impl/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+/**
+ * @author VISTALL
+ * @since 23-Aug-22
+ */
+module consulo.javascript.javascript17.impl
+{
+	requires transitive consulo.javascript.base.impl;
+
+	exports consulo.javascript.javascript17.lang;
+	exports consulo.javascript.javascript17.lang.lexer;
+}
\ No newline at end of file
diff --git a/lang-version-impl/javascript18-impl/pom.xml b/lang-version-impl/javascript18-impl/pom.xml
index e84f2f69..43e9f756 100644
--- a/lang-version-impl/javascript18-impl/pom.xml
+++ b/lang-version-impl/javascript18-impl/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-javascript18.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -52,12 +52,5 @@
 			<artifactId>consulo.javascript-javascript17.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript185LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
similarity index 72%
rename from lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript185LanguageVersion.java
rename to lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
index 6640b24d..b4a3619e 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript185LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.javascript18.lang;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import consulo.javascript.lang.lexer.JavaScript17Lexer;
+import consulo.javascript.javascript17.lang.lexer.JavaScript17Lexer;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.lexer.Lexer;
+
+import javax.annotation.Nonnull;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
@@ -30,14 +33,7 @@
  */
 public class JavaScript185LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
-	private static final Factory<Lexer> ourLexerFactory = new Factory<Lexer>()
-	{
-		@Override
-		public Lexer create()
-		{
-			return new JavaScript17Lexer();
-		}
-	};
+	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
 	@Nonnull
 	public static JavaScript185LanguageVersion getInstance()
@@ -61,7 +57,7 @@ public String getPresentableName()
 	@Override
 	public Lexer createLexer()
 	{
-		return ourLexerFactory.create();
+		return ourLexerFactory.get();
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript18LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
similarity index 72%
rename from lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript18LanguageVersion.java
rename to lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
index ad4ec0fc..e7b2622d 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/lang/JavaScript18LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.javascript18.lang;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import consulo.javascript.lang.lexer.JavaScript17Lexer;
+import consulo.javascript.javascript17.lang.lexer.JavaScript17Lexer;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.lexer.Lexer;
+
+import javax.annotation.Nonnull;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
@@ -30,14 +33,7 @@
  */
 public class JavaScript18LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
-	private static final Factory<Lexer> ourLexerFactory = new Factory<Lexer>()
-	{
-		@Override
-		public Lexer create()
-		{
-			return new JavaScript17Lexer();
-		}
-	};
+	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
 	@Nonnull
 	public static JavaScript18LanguageVersion getInstance()
@@ -61,7 +57,7 @@ public String getPresentableName()
 	@Override
 	public Lexer createLexer()
 	{
-		return ourLexerFactory.create();
+		return ourLexerFactory.get();
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/javascript18-impl/src/main/java/module-info.java b/lang-version-impl/javascript18-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..f169dd24
--- /dev/null
+++ b/lang-version-impl/javascript18-impl/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/**
+ * @author VISTALL
+ * @since 23-Aug-22
+ */
+module consulo.javascript.javascript18.impl
+{
+	requires transitive consulo.javascript.base.impl;
+
+	requires consulo.javascript.javascript17.impl;
+
+	exports consulo.javascript.javascript18.lang;
+}
\ No newline at end of file
diff --git a/lang-version-impl/json-javascript-impl/pom.xml b/lang-version-impl/json-javascript-impl/pom.xml
index a67d9a0f..d09f7c0a 100644
--- a/lang-version-impl/json-javascript-impl/pom.xml
+++ b/lang-version-impl/json-javascript-impl/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-json.javascript.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -46,12 +46,5 @@
 			<artifactId>consulo.javascript-base.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
index 0bbd85a9..455c3d39 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
@@ -16,16 +16,16 @@
 
 package consulo.json;
 
-import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.vfs.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.icon.JavaScriptIconGroup;
-import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptFileTypeWithVersion;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.json.lang.JsonJavaScriptVersion;
+import consulo.language.file.LanguageFileType;
 import consulo.localize.LocalizeValue;
+import consulo.module.Module;
 import consulo.ui.image.Image;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
index a4ef24d9..b293edbb 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
@@ -1,8 +1,8 @@
 package consulo.json;
 
 import javax.annotation.Nonnull;
-import com.intellij.openapi.fileTypes.FileTypeConsumer;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
+import consulo.virtualFileSystem.fileType.FileTypeConsumer;
+import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
index b9be82fa..1104a629 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
@@ -18,8 +18,8 @@
 
 import javax.annotation.Nonnull;
 
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.psi.PsiFile;
+import consulo.language.psi.PsiFile;
+import consulo.component.extension.ExtensionPointName;
 import consulo.ui.image.Image;
 
 /**
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
index bf4b07bb..f6ed4647 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
@@ -16,12 +16,14 @@
 
 package consulo.json.jom;
 
-import javax.annotation.Nonnull;
-import consulo.json.jom.proxy.JomProxyInvocationHandler;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import com.intellij.openapi.util.NotNullLazyValue;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.json.jom.proxy.JomProxyInvocationHandler;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.util.lang.lazy.LazyValue;
+
+import javax.annotation.Nonnull;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
@@ -31,27 +33,19 @@ public class JomFileElement<T extends JomElement>
 {
 	private final JomFileDescriptor<T> myFileDescriptor;
 	private final JSFile myPsiFile;
-	private final NotNullLazyValue<T> myRootValue = new NotNullLazyValue<T>()
-	{
-		@Nonnull
-		@Override
-		protected T compute()
-		{
-			//noinspection unchecked
-			return (T) JomProxyInvocationHandler.createProxy(myFileDescriptor.getDefinitionClass(), PsiTreeUtil.findChildOfType(myPsiFile, JSObjectLiteralExpression.class));
-		}
-	};
+	private final Supplier<T> myRootValue;
 
 	public JomFileElement(JSFile psiFile, JomFileDescriptor<T> fileDescriptor)
 	{
 		myPsiFile = psiFile;
 		myFileDescriptor = fileDescriptor;
+		myRootValue = LazyValue.notNull(() -> (T) JomProxyInvocationHandler.createProxy(myFileDescriptor.getDefinitionClass(), PsiTreeUtil.findChildOfType(myPsiFile, JSObjectLiteralExpression.class)));
 	}
 
 	@Nonnull
 	public T getRootElement()
 	{
-		return myRootValue.getValue();
+		return myRootValue.get();
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
index 1fef49de..b2b07b7b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -18,11 +18,11 @@
 
 import javax.annotation.Nonnull;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.ide.IconDescriptor;
-import consulo.ide.IconDescriptorUpdater;
+import consulo.language.icon.IconDescriptor;
+import consulo.language.icon.IconDescriptorUpdater;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index 1c45975c..8190a35d 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -17,17 +17,17 @@
 package consulo.json.jom;
 
 import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.CachedValue;
-import com.intellij.psi.util.CachedValueProvider;
-import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.PsiModificationTracker;
+import consulo.language.psi.PsiModificationTracker;
+import consulo.project.Project;
+import consulo.language.psi.PsiFile;
+import consulo.application.util.CachedValue;
+import consulo.application.util.CachedValueProvider;
+import consulo.application.util.CachedValuesManager;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.ide.ServiceManager;
 import consulo.json.JsonFileType;
 import consulo.util.dataholder.Key;
+import consulo.virtualFileSystem.fileType.FileType;
 import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
index b9d1a1cc..8fee5a2e 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
@@ -34,8 +34,8 @@
 import consulo.json.validation.NativeArray;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import com.intellij.psi.PsiFile;
-import com.intellij.util.containers.ContainerUtil;
+import consulo.language.psi.PsiFile;
+import consulo.util.collection.ContainerUtil;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
index 0bfffa1b..65a8652b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
@@ -1,12 +1,11 @@
 package consulo.json.jom;
 
-import java.lang.reflect.Method;
+import consulo.util.lang.ObjectUtil;
+import consulo.util.lang.StringUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.ObjectUtil;
+import java.lang.reflect.Method;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
index e1b9de0f..21b70e4a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
@@ -11,7 +11,7 @@
 import consulo.json.jom.JomUtil;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.openapi.util.Comparing;
+import consulo.util.lang.Comparing;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
index d098b1cc..302abecd 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
@@ -1,30 +1,18 @@
 package consulo.json.jom.proxy;
 
-import java.lang.reflect.Array;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.json.jom.JomElement;
-import consulo.json.jom.proxy.impl.JomBooleanValue;
-import consulo.json.jom.proxy.impl.JomCollectionValue;
-import consulo.json.jom.proxy.impl.JomMapConverter;
-import consulo.json.jom.proxy.impl.JomNullableNumberValue;
-import consulo.json.jom.proxy.impl.JomNumberValue;
-import consulo.json.jom.proxy.impl.JomStringConverter;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.containers.ArrayListSet;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.json.jom.JomElement;
+import consulo.json.jom.proxy.impl.*;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.lang.reflect.Array;
+import java.lang.reflect.Type;
+import java.util.*;
 
 /**
  * @author VISTALL
@@ -68,7 +56,7 @@ public interface Converter<T>
 		ourDefaultConverters.put(Map.class, new JomMapConverter());
 		ourDefaultConverters.put(Collection.class, new JomCollectionValue<Collection>(ArrayList.class));
 		ourDefaultConverters.put(List.class, new JomCollectionValue<List>(ArrayList.class));
-		ourDefaultConverters.put(Set.class, new JomCollectionValue<Set>(ArrayListSet.class));
+		ourDefaultConverters.put(Set.class, new JomCollectionValue<Set>(LinkedHashSet.class));
 	}
 
 	@RequiredReadAction
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
index 6931d40a..d5d37e31 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
@@ -9,9 +9,9 @@
 import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiUtilCore;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiUtilCore;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
index 704d8706..bcfc0889 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
@@ -11,9 +11,9 @@
 import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.openapi.util.Pair;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.ReflectionUtil;
+import consulo.language.psi.PsiElement;
+import consulo.util.lang.Pair;
+import consulo.util.lang.reflect.ReflectionUtil;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
index 45b1094c..ae1cfabf 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
@@ -11,8 +11,8 @@
 import consulo.json.jom.proxy.JomValueConverter;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.openapi.util.Pair;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
+import consulo.util.lang.Pair;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
index 1d60dcaa..9c4dbe50 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
@@ -1,21 +1,21 @@
 package consulo.json.jom.proxy.impl;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.openapi.util.NotNullLazyValue;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiUtilCore;
-import com.intellij.util.ReflectionUtil;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiUtilCore;
+import consulo.util.lang.StringUtil;
+import consulo.util.lang.lazy.LazyValue;
+import consulo.util.lang.reflect.ReflectionUtil;
+
+import javax.annotation.Nonnull;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
@@ -25,24 +25,19 @@ public class JomNullableNumberValue<T> implements JomValueConverter.Converter<T>
 {
 	protected Class<T> myClass;
 
-	protected NotNullLazyValue<Method> myParseMethodValue = new NotNullLazyValue<Method>()
+	protected Supplier<Method> myParseMethodValue;
+
+	public JomNullableNumberValue(Class<T> aClass)
 	{
-		@Nonnull
-		@Override
-		@SuppressWarnings("unchecked")
-		protected Method compute()
+		myClass = aClass;
+		myParseMethodValue = LazyValue.notNull(() ->
 		{
 			Class primitiveType = ReflectionUtil.getStaticFieldValue(myClass, Class.class, "TYPE");
 
 			Method method = ReflectionUtil.getMethod(myClass, "parse" + StringUtil.capitalize(primitiveType.getSimpleName()), String.class);
 			assert method != null;
 			return method;
-		}
-	};
-
-	public JomNullableNumberValue(Class<T> aClass)
-	{
-		myClass = aClass;
+		});
 	}
 
 	@Override
@@ -63,7 +58,7 @@ public T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull Psi
 			{
 				try
 				{
-					return (T) myParseMethodValue.getValue().invoke(null, value.getText());
+					return (T) myParseMethodValue.get().invoke(null, value.getText());
 				}
 				catch(Exception e)
 				{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
index 5752d0d7..161e9d8d 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
@@ -19,7 +19,7 @@ public T getDefaultValue()
 	{
 		try
 		{
-			return (T) myParseMethodValue.getValue().invoke(null, "0");
+			return (T) myParseMethodValue.get().invoke(null, "0");
 		}
 		catch(Exception e)
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
index 18edc476..c71c9198 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
@@ -5,13 +5,13 @@
 import javax.annotation.Nonnull;
 
 import consulo.javascript.psi.JSSimpleLiteralExpression;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
+import consulo.util.lang.StringUtil;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index 6e32cf2c..1c9c7be9 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -1,16 +1,16 @@
 package consulo.json.lang;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.PsiParser;
+import consulo.language.ast.ASTNode;
+import consulo.language.parser.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.psi.tree.IElementType;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.ast.IElementType;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.parsing.ExpressionParsing;
 import consulo.javascript.lang.parsing.Parsing;
-import consulo.lang.LanguageVersion;
+import consulo.language.parser.PsiParser;
+import consulo.language.version.LanguageVersion;
 import consulo.logging.Logger;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
index 4a0061f3..94daad7e 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
@@ -1,17 +1,18 @@
 package consulo.json.lang;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import com.intellij.lang.PsiParser;
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.util.Factory;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.json.JsonFileType;
 import consulo.json.lang.lexer.JsonLexer;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.lexer.Lexer;
+import consulo.language.parser.PsiParser;
+import consulo.virtualFileSystem.fileType.FileType;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
@@ -19,7 +20,7 @@
  */
 public class JsonJavaScriptVersion extends BaseJavaScriptLanguageVersion
 {
-	private static final Factory<Lexer> ourLexerFactory = JsonLexer::new;
+	private static final Supplier<Lexer> ourLexerFactory = JsonLexer::new;
 
 	@Nonnull
 	public static JsonJavaScriptVersion getInstance()
@@ -50,7 +51,7 @@ public SyntaxHighlighter getSyntaxHighlighter()
 	@Override
 	public Lexer createLexer()
 	{
-		return ourLexerFactory.create();
+		return ourLexerFactory.get();
 	}
 
 	@Nonnull
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
index 9ee56765..1d8eb18d 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
@@ -2,9 +2,9 @@
 
 package consulo.json.lang.lexer;
 
-import com.intellij.lexer.LexerBase;
-import com.intellij.psi.tree.IElementType;
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.language.ast.IElementType;
+import consulo.language.lexer.LexerBase;
 
 
 /**
@@ -13,7 +13,8 @@
  * on 15.02.16 12:22 from the specification file
  * <tt>R:/_github.com/consulo/consulo-javascript/json-javascript-impl/src/org/mustbe/consulo/json/lang/lexer/json.flex</tt>
  */
-public class JsonLexer extends LexerBase {
+public class JsonLexer extends LexerBase
+{
   /** initial size of the lookahead buffer */
   private static final int ZZ_BUFFERSIZE = 16384;
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
index f2d74f97..380e8f73 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
@@ -20,8 +20,8 @@
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.psi.PsiFile;
+import consulo.component.extension.ExtensionPointName;
+import consulo.language.psi.PsiFile;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
index 82ec0df3..73acb67a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
@@ -19,12 +19,12 @@
 import javax.annotation.Nullable;
 
 import consulo.annotation.access.RequiredReadAction;
+import consulo.application.util.CachedValuesManager;
 import consulo.json.JsonFileType;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.CachedValueProvider;
-import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.PsiModificationTracker;
+import consulo.language.psi.PsiFile;
+import consulo.application.util.CachedValueProvider;
+import consulo.language.psi.PsiModificationTracker;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
index 3a94cfe5..cb6ea592 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -16,46 +16,41 @@
 
 package consulo.json.validation.completion;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInsight.completion.CompletionContributor;
-import com.intellij.codeInsight.completion.CompletionParameters;
-import com.intellij.codeInsight.completion.CompletionResultSet;
-import com.intellij.codeInsight.completion.CompletionType;
-import com.intellij.codeInsight.completion.InsertHandler;
-import com.intellij.codeInsight.completion.InsertionContext;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.intellij.icons.AllIcons;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.patterns.StandardPatterns;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.util.ProcessingContext;
-import com.intellij.util.containers.ContainerUtil;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.codeInsight.completion.CompletionProvider;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.application.AllIcons;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.json.validation.JsonFileDescriptorProviders;
 import consulo.json.validation.NativeArray;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.json.validation.inspections.PropertyValidationInspection;
+import consulo.language.Language;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.editor.completion.*;
+import consulo.language.editor.completion.lookup.InsertHandler;
+import consulo.language.editor.completion.lookup.InsertionContext;
+import consulo.language.editor.completion.lookup.LookupElement;
+import consulo.language.editor.completion.lookup.LookupElementBuilder;
+import consulo.language.pattern.StandardPatterns;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.util.ProcessingContext;
 import consulo.ui.image.Image;
+import consulo.util.collection.ContainerUtil;
+import consulo.util.lang.StringUtil;
+
+import javax.annotation.Nonnull;
+import java.util.*;
 
 /**
  * @author VISTALL
  * @since 10.11.2015
  */
+@ExtensionImpl
 public class JsonCompletionContributor extends CompletionContributor
 {
 	public JsonCompletionContributor()
@@ -205,8 +200,8 @@ else if(currentProperty.getValue() instanceof NativeArray)
 			{
 				continue;
 			}
-			LookupElementBuilder builder = LookupElementBuilder.create(quotes ? StringUtil.QUOTER.fun(key) : key);
-			builder = builder.withPresentableText(quotes ? StringUtil.QUOTER.fun(key) : key);
+			LookupElementBuilder builder = LookupElementBuilder.create(quotes ? StringUtil.QUOTER.apply(key) : key);
+			builder = builder.withPresentableText(quotes ? StringUtil.QUOTER.apply(key) : key);
 			builder = builder.withIcon((Image) AllIcons.Nodes.Property);
 			final JsonPropertyDescriptor value = entry.getValue();
 			if(value.isDeprecated())
@@ -276,4 +271,11 @@ else if(value instanceof NativeArray)
 		// JsonObjectDescriptor
 		return "object";
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index f64e3b2e..b2e8f7f4 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -16,36 +16,36 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
-import com.intellij.openapi.fileEditor.FileEditor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.impl.PsiModificationTrackerImpl;
-import com.intellij.psi.util.PsiModificationTracker;
-import com.intellij.ui.EditorNotificationPanel;
-import com.intellij.ui.EditorNotifications;
-import consulo.editor.notifications.EditorNotificationProvider;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.fileEditor.EditorNotificationBuilder;
+import consulo.fileEditor.EditorNotificationProvider;
+import consulo.fileEditor.EditorNotifications;
+import consulo.fileEditor.FileEditor;
 import consulo.json.JsonFileType;
 import consulo.json.jom.JomElement;
 import consulo.json.jom.JomFileElement;
 import consulo.json.jom.JomManager;
+import consulo.language.editor.DaemonCodeAnalyzer;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiManager;
+import consulo.language.psi.PsiModificationTracker;
+import consulo.localize.LocalizeValue;
+import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
-import consulo.util.dataholder.Key;
+import consulo.util.lang.StringUtil;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.function.Supplier;
 
 /**
  * @author VISTALL
  * @since 12.11.2015
  */
-public class DescriptionByAnotherPsiElementEditorNotification<T extends PsiElement> implements EditorNotificationProvider<EditorNotificationPanel>
+public class DescriptionByAnotherPsiElementEditorNotification<T extends PsiElement> implements EditorNotificationProvider
 {
-	private Key<EditorNotificationPanel> myPanelKey;
 	private Project myProject;
 	private DescriptionByAnotherPsiElementProvider<T> myProvider;
 
@@ -53,21 +53,19 @@ public DescriptionByAnotherPsiElementEditorNotification(@Nonnull Project project
 	{
 		myProject = project;
 		myProvider = provider;
-
-		myPanelKey = Key.create("DescriptionByAnotherPsiElementEditorNotification." + provider.getId());
 	}
 
 	@Nonnull
 	@Override
-	public Key<EditorNotificationPanel> getKey()
+	public String getId()
 	{
-		return myPanelKey;
+		return myProvider.getId();
 	}
 
-	@Nullable
 	@Override
-	@RequiredUIAccess
-	public EditorNotificationPanel createNotificationPanel(@Nonnull final VirtualFile file, @Nonnull FileEditor fileEditor)
+	@Nullable
+	@RequiredReadAction
+	public EditorNotificationBuilder buildNotification(@Nonnull VirtualFile file, @Nonnull FileEditor fileEditor, @Nonnull Supplier<EditorNotificationBuilder> supplier)
 	{
 		if(file.getFileType() != JsonFileType.INSTANCE)
 		{
@@ -94,9 +92,9 @@ public EditorNotificationPanel createNotificationPanel(@Nonnull final VirtualFil
 		String registeredPsiElementId = DescriptionByAnotherPsiElementService.getInstance(myProject).getRegisteredPsiElementId(file);
 		if(registeredPsiElementId == null)
 		{
-			EditorNotificationPanel panel = new EditorNotificationPanel();
-			panel.text(StringUtil.SINGLE_QUOTER.fun(myProvider.getId()) + " model description is available for this file");
-			panel.createActionLabel("Choose " + myProvider.getPsiElementName(), new Runnable()
+			EditorNotificationBuilder panel = supplier.get();
+			panel.withText(LocalizeValue.localizeTODO(StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) + " model description is available for this file"));
+			panel.withAction(LocalizeValue.localizeTODO("Choose " + myProvider.getPsiElementName()), new Runnable()
 			{
 				@Override
 				@RequiredUIAccess
@@ -117,9 +115,10 @@ public void run()
 		}
 		else
 		{
-			EditorNotificationPanel panel = new EditorNotificationPanel();
-			panel.text(StringUtil.SINGLE_QUOTER.fun(myProvider.getId()) + " model description is registered for this file. " + myProvider.getPsiElementName() + ": " + registeredPsiElementId);
-			panel.createActionLabel("Cancel", new Runnable()
+			EditorNotificationBuilder panel = supplier.get();
+			panel.withText(LocalizeValue.localizeTODO(StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) + " model description is registered for this file. " + myProvider.getPsiElementName() + ": "
+					+ registeredPsiElementId));
+			panel.withAction(LocalizeValue.localizeTODO("Cancel"), new Runnable()
 			{
 				@Override
 				public void run()
@@ -136,7 +135,7 @@ public void run()
 
 	private void wantUpdate(PsiFile psiFile)
 	{
-		((PsiModificationTrackerImpl) PsiModificationTracker.SERVICE.getInstance(myProject)).incCounter();
+		PsiModificationTracker.getInstance(myProject).incCounter();
 
 		DaemonCodeAnalyzer.getInstance(myProject).restart(psiFile);
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
index 54bc91d5..f48c8612 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
@@ -20,11 +20,11 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.validation.JsonFileDescriptorProvider;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.PsiUtilCore;
+import consulo.language.psi.PsiUtilCore;
+import consulo.util.lang.Pair;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
index e884d6a7..afdefa61 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
@@ -16,11 +16,11 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
+import consulo.component.extension.ExtensionPointName;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
 
 import javax.annotation.Nonnull;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
index aff3d06c..c40377d2 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
@@ -16,28 +16,42 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import java.util.function.Consumer;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.component.ComponentManager;
+import consulo.component.extension.ExtensionExtender;
+import consulo.fileEditor.EditorNotificationProvider;
+import consulo.project.Project;
 
 import javax.annotation.Nonnull;
-
-import com.intellij.openapi.components.ComponentManager;
-import com.intellij.openapi.project.Project;
-import consulo.editor.notifications.EditorNotificationProvider;
-import consulo.extensions.ExtensionExtender;
+import java.util.function.Consumer;
 
 /**
  * @author VISTALL
  * @since 12.11.2015
  */
+@ExtensionImpl
 @SuppressWarnings("unchecked")
 public class DescriptionByAnotherPsiElementRegistrar implements ExtensionExtender<EditorNotificationProvider>
 {
 	@Override
 	public void extend(@Nonnull ComponentManager componentManager, @Nonnull Consumer<EditorNotificationProvider> consumer)
 	{
-		for(final DescriptionByAnotherPsiElementProvider<?> provider : DescriptionByAnotherPsiElementProvider.EP_NAME.getExtensionList())
+		for(final DescriptionByAnotherPsiElementProvider<?> provider : componentManager.getExtensionPoint(DescriptionByAnotherPsiElementProvider.class))
 		{
 			consumer.accept(new DescriptionByAnotherPsiElementEditorNotification((Project) componentManager, provider));
 		}
 	}
+
+	@Nonnull
+	@Override
+	public Class<EditorNotificationProvider> getExtensionClass()
+	{
+		return EditorNotificationProvider.class;
+	}
+
+	@Override
+	public boolean hasAnyExtensions(ComponentManager componentManager)
+	{
+		return componentManager.getExtensionPoint(DescriptionByAnotherPsiElementProvider.class).hasAnyExtensions();
+	}
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index 27223c78..7624b3b5 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -16,35 +16,34 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import consulo.application.ApplicationManager;
+import consulo.application.util.function.Computable;
+import consulo.component.persist.PersistentStateComponent;
+import consulo.component.persist.State;
+import consulo.component.persist.Storage;
+import consulo.component.persist.StoragePathMacros;
+import consulo.disposer.Disposable;
+import consulo.disposer.Disposer;
+import consulo.ide.ServiceManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.SmartPointerManager;
+import consulo.language.psi.SmartPsiElementPointer;
+import consulo.project.Project;
+import consulo.util.collection.ContainerUtil;
+import consulo.util.lang.Pair;
+import consulo.util.lang.function.Condition;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.virtualFileSystem.pointer.VirtualFilePointer;
+import consulo.virtualFileSystem.pointer.VirtualFilePointerManager;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
-
 import org.jdom.Element;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.components.State;
-import com.intellij.openapi.components.Storage;
-import com.intellij.openapi.components.StoragePathMacros;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.Condition;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
-import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.SmartPointerManager;
-import com.intellij.psi.SmartPsiElementPointer;
-import com.intellij.util.containers.ContainerUtil;
-import consulo.disposer.Disposable;
-import consulo.disposer.Disposer;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
index 4d01d50b..edca4c39 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
@@ -23,8 +23,9 @@
 import javax.annotation.Nullable;
 
 import consulo.json.validation.NativeArray;
-import com.intellij.openapi.util.Factory;
-import com.intellij.util.containers.ContainerUtil;
+import consulo.util.collection.ContainerUtil;
+import consulo.language.impl.ast.Factory;
+import consulo.util.collection.Maps;
 
 /**
  * @author VISTALL
@@ -42,40 +43,19 @@ public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @
 			throw new IllegalArgumentException("We cant add object type, use JsonObjectDescriptor as parameter");
 		}
 
-		return ContainerUtil.getOrCreate(myProperties, propertyName, new Factory<JsonPropertyDescriptor>()
-		{
-			@Override
-			public JsonPropertyDescriptor create()
-			{
-				return new JsonPropertyDescriptor(propertyName, value);
-			}
-		});
+		return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
 	}
 
 	@Nonnull
 	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final JsonObjectDescriptor value)
 	{
-		return ContainerUtil.getOrCreate(myProperties, propertyName, new Factory<JsonPropertyDescriptor>()
-		{
-			@Override
-			public JsonPropertyDescriptor create()
-			{
-				return new JsonPropertyDescriptor(propertyName, value);
-			}
-		});
+		return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
 	}
 
 	@Nonnull
 	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final NativeArray value)
 	{
-		return ContainerUtil.getOrCreate(myProperties, propertyName, new Factory<JsonPropertyDescriptor>()
-		{
-			@Override
-			public JsonPropertyDescriptor create()
-			{
-				return new JsonPropertyDescriptor(propertyName, value);
-			}
-		});
+		return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
 	}
 
 	@Nullable
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
index dcefc592..c1278419 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
@@ -16,10 +16,10 @@
 
 package consulo.json.validation.descriptor;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.SmartPointerManager;
-import com.intellij.psi.SmartPsiElementPointer;
+import consulo.language.psi.SmartPointerManager;
 import consulo.annotation.UsedInPlugin;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.SmartPsiElementPointer;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index eb005fcb..35ee83e4 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -16,18 +16,21 @@
 
 package consulo.json.validation.inspections;
 
-import com.intellij.codeInspection.LocalInspectionTool;
-import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.codeInspection.ProblemsHolder;
+import consulo.application.util.CachedValueProvider;
+import consulo.application.util.CachedValuesManager;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.LocalInspectionTool;
+import consulo.language.editor.inspection.ProblemHighlightType;
+import consulo.language.editor.inspection.ProblemsHolder;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.*;
-import com.intellij.util.PairProcessor;
-import com.intellij.util.containers.ContainerUtil;
+import consulo.language.psi.PsiModificationTracker;
+import consulo.language.psi.PsiUtilCore;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.util.lang.StringUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.util.collection.ContainerUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
@@ -35,6 +38,7 @@
 import consulo.json.validation.NativeArray;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
+import consulo.util.lang.function.PairProcessor;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -44,7 +48,7 @@
  * @author VISTALL
  * @since 10.11.2015
  */
-public class PropertyValidationInspection extends LocalInspectionTool
+public abstract class PropertyValidationInspection extends LocalInspectionTool
 {
 	@Nonnull
 	@Override
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
index ab3f31b7..0df3f52a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
@@ -23,7 +23,7 @@
 import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReference;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
index eadea6be..2683cb74 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
@@ -23,8 +23,8 @@
 import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
 import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.PsiElement;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/typescript-impl/pom.xml b/lang-version-impl/typescript-impl/pom.xml
index ff60e7fc..93a0f19a 100644
--- a/lang-version-impl/typescript-impl/pom.xml
+++ b/lang-version-impl/typescript-impl/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-typescript.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -58,12 +58,5 @@
 			<artifactId>consulo.javascript-ecmascript.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index aea0c2ff..5be239f6 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -16,15 +16,15 @@
 
 package consulo.typescript;
 
-import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.vfs.VirtualFile;
+import consulo.module.Module;
+import consulo.virtualFileSystem.VirtualFile;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.icon.JavaScriptIconGroup;
-import consulo.javascript.lang.JavaScriptFileTypeWithVersion;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptFileTypeWithVersion;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.localize.JavaScriptLocalize;
-import consulo.lang.LanguageVersion;
+import consulo.language.version.LanguageVersion;
+import consulo.language.file.LanguageFileType;
 import consulo.localize.LocalizeValue;
 import consulo.typescript.version.TypeScriptLanguageVersion;
 import consulo.ui.image.Image;
@@ -70,7 +70,7 @@ public String getDefaultExtension()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIconGroup.typeScript();
+		return JavaScriptIconGroup.typescript();
 	}
 
 	@RequiredReadAction
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
index 57dfaf81..73533e51 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
@@ -17,8 +17,8 @@
 package consulo.typescript;
 
 import javax.annotation.Nonnull;
-import com.intellij.openapi.fileTypes.FileTypeConsumer;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
+import consulo.virtualFileSystem.fileType.FileTypeConsumer;
+import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
index d813ad35..e2fb9287 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
@@ -1,8 +1,8 @@
 package consulo.typescript.version;
 
-import consulo.javascript.lang.BaseEcmaScriptJavaScriptVersion;
-import consulo.javascript.lang.JavaScriptFeature;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.ecmascript.lang.BaseEcmaScriptJavaScriptVersion;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptLanguage;
 
 import javax.annotation.Nonnull;
 
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 49c3e5d6..3ca3609d 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>consulo-plugin</packaging>
 
 	<repositories>
@@ -45,10 +45,9 @@
 			<plugin>
 				<groupId>consulo.maven</groupId>
 				<artifactId>maven-consulo-plugin</artifactId>
-				<version>2-SNAPSHOT</version>
 				<extensions>true</extensions>
 				<configuration>
-					<repositoryChannel>nightly</repositoryChannel>
+					<repositoryChannel>valhalla</repositoryChannel>
 					<dependencies>
 						<dependency>com.intellij.xml</dependency>
 						<dependency>com.intellij.regexp</dependency>
@@ -187,12 +186,5 @@
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
index ac6ed56c..b68a7038 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
@@ -18,21 +18,21 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.editor.completion.lookup.LookupElement;
+import consulo.language.editor.template.Result;
+import consulo.language.editor.template.TextResult;
 import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.template.Expression;
-import com.intellij.codeInsight.template.ExpressionContext;
-import com.intellij.codeInsight.template.Macro;
-import com.intellij.codeInsight.template.Result;
-import com.intellij.codeInsight.template.TextResult;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.language.editor.template.Expression;
+import consulo.language.editor.template.ExpressionContext;
+import consulo.language.editor.template.macro.Macro;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.project.Project;
+import consulo.language.psi.PsiDocumentManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.util.PsiTreeUtil;
 
 public class JSClassNameMacro extends Macro
 {
diff --git a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
index 23408e4d..1ddba26c 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
@@ -20,22 +20,29 @@
  */
 package com.intellij.javascript;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInsight.hint.ImplementationTextSelectioner;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.editor.ImplementationTextSelectioner;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class JSImplementationTextSelectioner implements ImplementationTextSelectioner
 {
+	@RequiredReadAction
 	@Override
 	public int getTextStartOffset(@Nonnull PsiElement element)
 	{
 		return element.getTextOffset();
 	}
 
+	@RequiredReadAction
 	@Override
 	public int getTextEndOffset(@Nonnull PsiElement element)
 	{
@@ -45,4 +52,11 @@ public int getTextEndOffset(@Nonnull PsiElement element)
 		}
 		return element.getTextRange().getEndOffset();
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
index 39994e25..8f5e2c19 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
@@ -16,20 +16,20 @@
 
 package com.intellij.javascript;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.template.Expression;
-import com.intellij.codeInsight.template.ExpressionContext;
-import com.intellij.codeInsight.template.Macro;
-import com.intellij.codeInsight.template.Result;
-import com.intellij.codeInsight.template.TextResult;
-import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.editor.completion.lookup.LookupElement;
+import consulo.language.editor.template.Expression;
+import consulo.language.editor.template.ExpressionContext;
+import consulo.language.editor.template.Result;
+import consulo.language.editor.template.TextResult;
+import consulo.language.editor.template.macro.Macro;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 public class JSMethodNameMacro extends Macro
 {
diff --git a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
index a67b4647..262a72d3 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
@@ -16,20 +16,19 @@
 
 package com.intellij.javascript;
 
-import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.lookup.MutableLookupElement;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.lang.parameterInfo.*;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.search.searches.DefinitionsScopedSearch;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.containers.ContainerUtil;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.CodeInsightBundle;
+import consulo.language.editor.completion.lookup.LookupElement;
+import consulo.language.editor.completion.lookup.MutableLookupElement;
+import consulo.language.editor.parameterInfo.*;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.search.DefinitionsScopedSearch;
+import consulo.util.collection.ArrayUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -38,9 +37,9 @@
 /**
  * @author Maxim.Mossienko
  */
-public class JSParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport<JSArgumentList, JSFunction, JSExpression>
+public abstract class JSParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport<JSArgumentList, JSFunction, JSExpression>
 {
-	private static final Set<Class<?>> ourArgumentListAllowedParentClassesSet = ContainerUtil.<Class<?>>newHashSet(JSCallExpression.class);
+	private static final Set<Class<?>> ourArgumentListAllowedParentClassesSet = Set.of(JSCallExpression.class);
 
 	@Override
 	public boolean couldShowInLookup()
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
index b53f095f..b3b21f06 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
@@ -15,12 +15,12 @@
  */
 package com.intellij.javascript.manipulators;
 
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.AbstractElementManipulator;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
+import consulo.language.psi.AbstractElementManipulator;
+import consulo.language.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
 
 /**
  * @author peter
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
index 37731daa..bc7bbb03 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
@@ -15,17 +15,17 @@
  */
 package com.intellij.javascript.manipulators;
 
+import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
+import consulo.project.Project;
 
 /**
  * @author peter
  */
-public class JSAttributeNameValuePairManipulator extends JSAbstractElementManipulator<JSAttributeNameValuePair>
+public abstract class JSAttributeNameValuePairManipulator extends JSAbstractElementManipulator<JSAttributeNameValuePair>
 {
 	@Override
 	protected JSAttributeNameValuePair createTree(final String newText, final Project project)
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
index bdbdc159..8bf64619 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
@@ -15,20 +15,30 @@
  */
 package com.intellij.javascript.manipulators;
 
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.psi.JSDocComment;
 import com.intellij.lang.javascript.psi.JSDocTag;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class JSDocTagManipulator extends JSAbstractElementManipulator<JSDocTag>
 {
 	@Override
 	protected JSDocTag createTree(final String newText, final Project project)
 	{
-		@NonNls String ToCreate = "/** " + newText + " */";
+		String ToCreate = "/** " + newText + " */";
 		final PsiElement element = JSChangeUtil.createJSTreeFromText(project, ToCreate).getPsi();
 		return ((JSDocComment) element).getTags()[0];
 	}
+
+	@Nonnull
+	@Override
+	public Class<JSDocTag> getElementClass()
+	{
+		return JSDocTag.class;
+	}
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
index 48bd395b..5d1e3e84 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
@@ -17,12 +17,12 @@
 
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.impl.JSIncludeDirectiveImpl;
-import com.intellij.openapi.project.Project;
+import consulo.project.Project;
 
 /**
  * @author peter
  */
-public class JSIncludeDirectiveManipulator extends JSAbstractElementManipulator<JSIncludeDirectiveImpl>
+public abstract class JSIncludeDirectiveManipulator extends JSAbstractElementManipulator<JSIncludeDirectiveImpl>
 {
 	@Override
 	protected JSIncludeDirectiveImpl createTree(final String newText, final Project project)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java
similarity index 97%
rename from plugin/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java
index 6eebadbc..b9c93c9d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JSNodeVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript;
+package com.intellij.lang.javascript.impl;
 
-import com.intellij.lang.ASTNode;
+import com.intellij.lang.javascript.JSElementTypes;
+import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.types.JSFileElementType;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
similarity index 83%
rename from plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
index bd27603d..af445809 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JSSmartEnterProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
@@ -14,37 +14,31 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript;
+package com.intellij.lang.javascript.impl;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInsight.editorActions.smartEnter.SmartEnterProcessor;
-import com.intellij.lang.javascript.psi.JSArgumentList;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSFunctionExpression;
-import com.intellij.lang.javascript.psi.JSIndexedPropertyAccessExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSStatement;
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiErrorElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.util.PsiTreeUtil;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.codeEditor.Editor;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.Language;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.editor.action.SmartEnterProcessor;
+import consulo.language.psi.*;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  *         Date: Jul 25, 2008
  *         Time: 11:38:15 PM
  */
+@ExtensionImpl
 public class JSSmartEnterProcessor extends SmartEnterProcessor
 {
 	@Override
@@ -141,7 +135,7 @@ else if(JavaScriptBundle.message("javascript.parser.message.expected.lparen").eq
 
 	@RequiredReadAction
 	private void insertCommitReformat(final Project project, final Editor editor, final PsiFile psiFile, final int offset, final String str,
-			final int shiftOffset, boolean adjustLineIndent)
+									  final int shiftOffset, boolean adjustLineIndent)
 	{
 		editor.getDocument().insertString(offset, str);
 		editor.getCaretModel().moveToOffset(offset + shiftOffset);
@@ -174,4 +168,11 @@ private static PsiElement evalMeaningfulElement(final PsiElement element, boolea
 		}
 		return prev;
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
similarity index 69%
rename from plugin/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
index 818858bb..37645420 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptCodeContextType.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
@@ -14,24 +14,28 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript;
+package com.intellij.lang.javascript.impl;
 
-import javax.annotation.Nonnull;
-import com.intellij.codeInsight.template.TemplateContextType;
-import com.intellij.lang.Language;
+import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.xml.XMLLanguage;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
-import com.intellij.openapi.util.Ref;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
-import com.intellij.psi.util.PsiTreeUtil;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.language.Language;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.editor.highlight.SyntaxHighlighterFactory;
+import consulo.language.editor.template.context.TemplateContextType;
+import consulo.language.inject.InjectedLanguageManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiLanguageInjectionHost;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.util.lang.ref.Ref;
+import consulo.virtualFileSystem.fileType.FileType;
+import consulo.xml.lang.xml.XMLLanguage;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -65,7 +69,7 @@ public boolean isInContext(@Nonnull final PsiFile file, final int offset)
 			{
 				final Ref<Boolean> hasJsInjection = new Ref<Boolean>(Boolean.FALSE);
 
-				InjectedLanguageUtil.enumerate(host, new JSResolveUtil.JSInjectedFilesVisitor()
+				InjectedLanguageManager.getInstance(at.getProject()).enumerate(host, new JSResolveUtil.JSInjectedFilesVisitor()
 				{
 					@Override
 					protected void process(final JSFile file)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
similarity index 79%
rename from plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
index 0c9ba25f..634bf0f8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JavaScriptTargetElementUtilEx.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript;
+package com.intellij.lang.javascript.impl;
 
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElement;
-import consulo.codeInsight.TargetElementUtilEx;
-import consulo.extensions.CompositeExtensionPointName;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.TargetElementUtilExtender;
+import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 
@@ -30,10 +30,10 @@
  *         Date: Oct 13, 2008
  *         Time: 3:53:42 PM
  */
-public class JavaScriptTargetElementUtilEx extends TargetElementUtilEx.Adapter
+@ExtensionImpl
+public class JavaScriptTargetElementUtilEx implements TargetElementUtilExtender
 {
 	@Override
-	@CompositeExtensionPointName.BooleanBreakResult(breakValue = false)
 	public boolean includeSelfInGotoImplementation(@Nonnull final PsiElement element)
 	{
 		if(element instanceof JSFunction)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
similarity index 78%
rename from plugin/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
index 2ef30cc2..6800da67 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/JavascriptCommenter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
@@ -14,30 +14,31 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript;
+package com.intellij.lang.javascript.impl;
 
+import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.CodeDocumentationAwareCommenter;
+import consulo.language.Language;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiComment;
+
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.lang.CodeDocumentationAwareCommenter;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.tree.IElementType;
 
 /**
  * @author max
  */
+@ExtensionImpl
 public class JavascriptCommenter implements CodeDocumentationAwareCommenter
 {
-
 	@Override
 	public String getLineCommentPrefix()
 	{
 		return "//";
 	}
 
-	public boolean isLineCommentPrefixOnZeroColumn()
-	{
-		return false;
-	}
-
 	@Override
 	public String getBlockCommentPrefix()
 	{
@@ -108,4 +109,11 @@ public IElementType getDocumentationCommentTokenType()
 	{
 		return JSTokenTypes.DOC_COMMENT;
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
similarity index 92%
rename from plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
index c52fd7f9..7ba21351 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSReadWriteAccessDetector.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.findUsages;
+package com.intellij.lang.javascript.impl.findUsages;
 
-import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
@@ -24,9 +23,10 @@
 import com.intellij.lang.javascript.psi.JSPostfixExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.highlight.ReadWriteAccessDetector;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java
similarity index 91%
rename from plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java
index 2e83c988..acc35dbc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JSWordsScanner.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.findUsages;
+package com.intellij.lang.javascript.impl.findUsages;
 
-import com.intellij.lang.cacheBuilder.DefaultWordsScanner;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JSFlexAdapter;
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.language.cacheBuilder.DefaultWordsScanner;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
similarity index 92%
rename from plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
index ccf53359..e81b9087 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptClassGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.findUsages;
+package com.intellij.lang.javascript.impl.findUsages;
 
 import javax.annotation.Nonnull;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.usages.UsageGroup;
+import consulo.usage.UsageGroup;
+import consulo.application.AllIcons;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
similarity index 75%
rename from plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
index ad0c1d7b..49f1c2d8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFindUsagesProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
@@ -14,26 +14,18 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.findUsages;
+package com.intellij.lang.javascript.impl.findUsages;
 
-import javax.annotation.Nonnull;
+import consulo.javascript.language.JavaScriptBundle;
+import com.intellij.lang.javascript.psi.*;
+import consulo.language.cacheBuilder.WordsScanner;
+import consulo.language.findUsage.FindUsagesProvider;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiNamedElement;
+import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.psi.xml.XmlToken;
 
-import com.intellij.lang.cacheBuilder.WordsScanner;
-import com.intellij.lang.findUsages.FindUsagesProvider;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSDefinitionExpression;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSLabeledStatement;
-import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
-import com.intellij.lang.javascript.psi.JSPackageStatement;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlToken;
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -42,7 +34,7 @@
  * Time: 6:44:02 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JavaScriptFindUsagesProvider implements FindUsagesProvider
+public abstract class JavaScriptFindUsagesProvider implements FindUsagesProvider
 {
 	@Override
 	public boolean canFindUsagesFor(@Nonnull PsiElement psiElement)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
similarity index 91%
rename from plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
index d60ebe47..a90e3857 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptFunctionGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.findUsages;
+package com.intellij.lang.javascript.impl.findUsages;
 
 import javax.annotation.Nonnull;
 
-import com.intellij.icons.AllIcons;
+import consulo.application.AllIcons;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.usages.UsageGroup;
+import consulo.usage.UsageGroup;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
similarity index 81%
rename from plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
index 83d92c54..b2b33dcb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -14,32 +14,31 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.findUsages;
+package com.intellij.lang.javascript.impl.findUsages;
 
 import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.actionSystem.DataSink;
-import com.intellij.openapi.actionSystem.LangDataKeys;
-import com.intellij.openapi.actionSystem.TypeSafeDataProvider;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.vcs.FileStatus;
-import com.intellij.openapi.vcs.FileStatusManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.SmartPointerManager;
-import com.intellij.psi.SmartPsiElementPointer;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.usageView.UsageInfo;
-import com.intellij.usages.Usage;
-import com.intellij.usages.UsageGroup;
-import com.intellij.usages.UsageView;
-import com.intellij.usages.impl.FileStructureGroupRuleProvider;
-import com.intellij.usages.rules.PsiElementUsage;
-import com.intellij.usages.rules.UsageGroupingRule;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.dataContext.DataSink;
+import consulo.dataContext.TypeSafeDataProvider;
+import consulo.language.editor.LangDataKeys;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.SmartPointerManager;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.project.Project;
+import consulo.usage.*;
+import consulo.usage.rule.PsiElementUsage;
+import consulo.usage.rule.UsageGroupingRule;
+import consulo.virtualFileSystem.status.FileStatusManager;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.SmartPsiElementPointer;
+import consulo.usage.UsageGroup;
+import consulo.usage.UsageView;
+import consulo.usage.rule.FileStructureGroupRuleProvider;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.navigation.NavigationItem;
 import consulo.ui.image.Image;
 import consulo.util.dataholder.Key;
+import consulo.util.lang.Comparing;
+import consulo.virtualFileSystem.status.FileStatus;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
similarity index 83%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
index 2b4f94e7..1528eb69 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -14,37 +14,39 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex;
-
-import com.intellij.codeInsight.hint.HintManager;
-import com.intellij.codeInsight.hint.QuestionAction;
-import com.intellij.codeInsight.navigation.NavigationUtil;
-import com.intellij.codeInspection.HintAction;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.ide.util.PsiElementListCellRenderer;
-import com.intellij.lang.injection.InjectedLanguageManager;
-import com.intellij.lang.javascript.JavaScriptBundle;
+package com.intellij.lang.javascript.impl.flex;
+
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.impl.JSPsiImplUtils;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.command.CommandProcessor;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiPolyVariantReference;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.PsiElementProcessor;
-import com.intellij.util.SmartList;
+import consulo.application.ApplicationManager;
+import consulo.codeEditor.Editor;
+import consulo.codeEditor.EditorPopupHelper;
+import consulo.document.util.TextRange;
+import consulo.language.editor.hint.HintManager;
+import consulo.language.editor.hint.QuestionAction;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.editor.intention.HintAction;
+import consulo.language.editor.ui.PopupNavigationUtil;
+import consulo.language.editor.ui.PsiElementListCellRenderer;
+import consulo.language.inject.InjectedLanguageManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiPolyVariantReference;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.resolve.PsiElementProcessor;
+import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.language.util.ModuleUtilCore;
+import consulo.module.Module;
+import consulo.project.Project;
+import consulo.ui.ex.popup.JBPopup;
+import consulo.undoRedo.CommandProcessor;
 import consulo.util.collection.Sets;
+import consulo.util.collection.SmartList;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
@@ -54,8 +56,8 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Apr 25, 2008
- *         Time: 8:36:38 PM
+ * Date: Apr 25, 2008
+ * Time: 8:36:38 PM
  */
 public class AddImportECMAScriptClassOrFunctionAction implements HintAction, QuestionAction, LocalQuickFix
 {
@@ -205,7 +207,7 @@ private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile
 
 	public static Collection<JSQualifiedNamedElement> getCandidates(final Editor editor, final PsiFile file, final String name)
 	{
-		final Module element = ModuleUtil.findModuleForPsiElement(file);
+		final Module element = ModuleUtilCore.findModuleForPsiElement(file);
 		if(element != null)
 		{
 			return JSResolveUtil.findElementsByName(name, editor.getProject(), GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(element, false));
@@ -225,7 +227,7 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
 		{
 			if(candidates.size() > 1)
 			{
-				NavigationUtil.getPsiElementPopup(candidates.toArray(new JSQualifiedNamedElement[candidates.size()]),
+				JBPopup popup = PopupNavigationUtil.getPsiElementPopup(candidates.toArray(new JSQualifiedNamedElement[candidates.size()]),
 						new PsiElementListCellRenderer<JSQualifiedNamedElement>()
 						{
 							@Override
@@ -269,7 +271,9 @@ public void run()
 								return false;
 							}
 						}
-				).showInBestPositionFor(editor);
+				);
+
+				EditorPopupHelper.getInstance().showPopupInBestPositionFor(editor, popup);
 			}
 			else
 			{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
similarity index 92%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
index 47a5e765..bfec99bb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/ECMAScriptImportOptimizer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
@@ -14,25 +14,28 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex;
+package com.intellij.lang.javascript.impl.flex;
 
-import com.intellij.codeInsight.CodeInsightUtilBase;
-import com.intellij.lang.ImportOptimizer;
-import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.validation.JSUnusedImportsHelper;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.EmptyRunnable;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.util.containers.MultiMap;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.document.util.TextRange;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.editor.FileModificationService;
+import consulo.language.editor.refactoring.ImportOptimizer;
+import consulo.language.inject.InjectedLanguageManager;
+import consulo.language.psi.*;
+import consulo.project.Project;
+import consulo.util.collection.MultiMap;
+import consulo.util.lang.EmptyRunnable;
+import consulo.util.lang.Pair;
 
 import javax.annotation.Nonnull;
 import java.util.*;
@@ -42,6 +45,7 @@
  *         Date: Jul 23, 2008
  *         Time: 12:10:44 AM
  */
+@ExtensionImpl
 public class ECMAScriptImportOptimizer implements ImportOptimizer
 {
 	@Override
@@ -54,7 +58,7 @@ public boolean supports(PsiFile file)
 	@Nonnull
 	public Runnable processFile(final PsiFile file)
 	{
-		if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
+		if(!FileModificationService.getInstance().prepareFileForWrite(file))
 		{
 			return EmptyRunnable.INSTANCE;
 		}
@@ -62,6 +66,7 @@ public Runnable processFile(final PsiFile file)
 		return new Runnable()
 		{
 			@Override
+			@RequiredReadAction
 			public void run()
 			{
 				final JSUnusedImportsHelper.Results unusedImportsResults = JSUnusedImportsHelper.getUnusedImports(file);
@@ -239,6 +244,13 @@ else if(insertionPlace.getNextSibling() instanceof PsiWhiteSpace)
 		};
 	}
 
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+
 	private enum ResolveResult
 	{
 		None, ThisOne, OtherOne
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
similarity index 90%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
index 56b00a3f..4c8cc091 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/ImportUtils.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
@@ -14,43 +14,37 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex;
+package com.intellij.lang.javascript.impl.flex;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInsight.CodeInsightUtilBase;
-import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlText;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.document.Document;
+import consulo.document.util.TextRange;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.editor.FileModificationService;
+import consulo.language.inject.InjectedLanguageManager;
+import consulo.language.psi.PsiDocumentManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.logging.Logger;
+import consulo.project.Project;
+import consulo.util.collection.ArrayUtil;
+import consulo.util.lang.Comparing;
+import consulo.util.lang.Pair;
+import consulo.xml.psi.xml.XmlAttributeValue;
+import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.psi.xml.XmlText;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.*;
 
 /**
  * @author Maxim.Mossienko
@@ -110,7 +104,7 @@ public static void doImport(@Nonnull PsiElement subject, final @Nonnull String f
 	{
 		assert fqn.contains(".") : "Qualified name belongs to default package: " + fqn;
 
-		if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(subject.getContainingFile()))
+		if(!FileModificationService.getInstance().prepareFileForWrite(subject.getContainingFile()))
 		{
 			return;
 		}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
similarity index 99%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
index 4ba39903..5297d6a7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import org.jetbrains.annotations.NonNls;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
similarity index 97%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
index 9322fb3c..4ce5b526 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AS3InterfaceStubDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import java.util.LinkedList;
 
@@ -24,8 +24,8 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.stubs.impl.JSAttributeNameValuePairStubImpl;
 import com.intellij.lang.javascript.psi.stubs.impl.JSReferenceListStubImpl;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.stubs.StubElement;
+import consulo.util.lang.StringUtil;
+import consulo.language.psi.stub.StubElement;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
similarity index 99%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
index 3f638dcc..38f3c2d6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Abc.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.ArrayUtil;
+import consulo.util.lang.StringUtil;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
similarity index 98%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
index b64938ec..c23677c8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbcDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
similarity index 99%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
index 0047217a..e49008ed 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/AbstractDumpProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import javax.annotation.Nonnull;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
similarity index 98%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
index 9a51f8e6..888d0417 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/ByteBuffer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
similarity index 97%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
index 93d77b61..0e768417 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexByteCodeInformationProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
similarity index 97%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
index a825f8ce..b9e9a12a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/FlexImporter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -24,8 +24,8 @@
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.stub.StubElement;
 import org.jetbrains.annotations.NonNls;
-import com.intellij.psi.stubs.StubElement;
 
 /**
  * Produced from abcdump.as
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java
index 8efe17f8..06e3c7fb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/LabelInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import java.util.LinkedHashMap;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
similarity index 96%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
index b88a224e..c9763a86 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MemberInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import javax.annotation.Nonnull;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java
similarity index 93%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java
index c48b5360..13edac7a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MetaData.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import java.util.LinkedHashMap;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java
similarity index 98%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java
index 6d5bd0ae..cfe00ebb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/MethodInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
-import static com.intellij.lang.javascript.flex.importer.Abc.*;
+import static com.intellij.lang.javascript.impl.flex.importer.Abc.*;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java
similarity index 97%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java
index c3b3014d..ce9577d1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Multiname.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java
similarity index 96%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java
index 9df8e55f..b99711fa 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/SlotInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java
similarity index 99%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java
index 72db0fb4..ce407aa2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Swf.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import org.jetbrains.annotations.NonNls;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java
similarity index 96%
rename from plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java
index 2ead1f13..ca4f3dff 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/flex/importer/Traits.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.flex.importer;
+package com.intellij.lang.javascript.impl.flex.importer;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
similarity index 90%
rename from plugin/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
index da26777f..b82d9674 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/folding/JavaScriptFoldingBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.folding;
+package com.intellij.lang.javascript.impl.folding;
 
-import com.intellij.codeInsight.folding.CodeFoldingSettings;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.folding.FoldingBuilder;
-import com.intellij.lang.folding.FoldingDescriptor;
+import consulo.language.editor.folding.CodeFoldingSettings;
+import consulo.language.ast.ASTNode;
+import consulo.language.editor.folding.FoldingDescriptor;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.types.JSFileElementType;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiUtilCore;
+import consulo.document.Document;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiUtilCore;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
+import consulo.language.editor.folding.FoldingBuilder;
+import consulo.language.psi.PsiWhiteSpace;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
@@ -40,7 +40,7 @@
 /**
  * @author max
  */
-public class JavaScriptFoldingBuilder implements FoldingBuilder
+public abstract class JavaScriptFoldingBuilder implements FoldingBuilder
 {
 	@RequiredReadAction
 	@Nonnull
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.form
similarity index 98%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.form
index 4294e9f6..a0967b44 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.formatter.JSCodeStylePanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.impl.formatter.JSCodeStylePanel">
   <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
similarity index 87%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
index a09c73af..389b6515 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStylePanel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
@@ -14,30 +14,27 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.formatter;
+package com.intellij.lang.javascript.impl.formatter;
+
+import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
+import consulo.codeEditor.EditorHighlighter;
+import consulo.colorScheme.EditorColorsScheme;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.language.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.ui.setting.CodeStyleAbstractPanel;
+import consulo.language.editor.highlight.EditorHighlighterFactory;
+import consulo.language.file.light.LightVirtualFile;
+import consulo.language.psi.PsiFile;
+import consulo.ui.ex.awt.event.DocumentAdapter;
+import consulo.virtualFileSystem.fileType.FileType;
+import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import com.intellij.application.options.CodeStyleAbstractPanel;
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.openapi.editor.colors.EditorColorsScheme;
-import com.intellij.openapi.editor.highlighter.EditorHighlighter;
-import com.intellij.openapi.editor.highlighter.EditorHighlighterFactory;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.testFramework.LightVirtualFile;
-import com.intellij.ui.DocumentAdapter;
-
 /**
  * @author Maxim.Mossienko
  *         Date: Mar 12, 2008
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
similarity index 72%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
index 668e8b53..409fb722 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
@@ -14,17 +14,19 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.formatter;
+package com.intellij.lang.javascript.impl.formatter;
+
+import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
+import consulo.configurable.Configurable;
+import consulo.javascript.impl.formatter.JavaScriptCodeStyleConfigurable;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.CustomCodeStyleSettings;
+import consulo.language.codeStyle.setting.CodeStyleSettingsProvider;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.lang.Language;
-import com.intellij.openapi.options.Configurable;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
-import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
-import consulo.javascript.formatter.JavaScriptCodeStyleConfigurable;
-import consulo.javascript.lang.JavaScriptLanguage;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
similarity index 78%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
index 4f11ab44..373b3e13 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSFormattingModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.formatter;
+package com.intellij.lang.javascript.impl.formatter;
 
 import javax.annotation.Nonnull;
 
-import com.intellij.formatting.Block;
-import com.intellij.formatting.FormattingDocumentModel;
-import com.intellij.formatting.FormattingModel;
-import com.intellij.formatting.FormattingModelProvider;
-import com.intellij.lang.ASTNode;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.FormattingModel;
+import consulo.language.codeStyle.FormattingModelProvider;
+import consulo.language.ast.ASTNode;
+import consulo.document.util.TextRange;
+import consulo.language.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.Block;
+import consulo.language.codeStyle.FormattingDocumentModel;
+import consulo.language.psi.PsiFile;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
similarity index 97%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
index 6f171114..39a4c720 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.formatter;
+package com.intellij.lang.javascript.impl.formatter;
 
-import com.intellij.formatting.Spacing;
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.javascript.JSNodeVisitor;
+import com.intellij.lang.javascript.impl.JSNodeVisitor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSImportStatement;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtilCore;
-import com.intellij.psi.xml.XmlText;
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.CommonCodeStyleSettings;
+import consulo.language.codeStyle.Spacing;
+import consulo.language.psi.PsiUtilCore;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.xml.psi.xml.XmlText;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
similarity index 72%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
index 270055c5..b0057855 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavaScriptIndentOptionsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.formatter;
+package com.intellij.lang.javascript.impl.formatter;
 
-import com.intellij.application.options.IndentOptionsEditor;
-import com.intellij.application.options.SmartIndentOptionsEditor;
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.FileTypeIndentOptionsProvider;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.language.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.setting.FileTypeIndentOptionsProvider;
+import consulo.language.codeStyle.setting.IndentOptionsEditor;
+import consulo.language.codeStyle.ui.setting.SmartIndentOptionsEditor;
+import consulo.language.psi.PsiFile;
+import consulo.virtualFileSystem.fileType.FileType;
 
 /**
  * @author yole
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
similarity index 60%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
index d121e0f8..cb573b42 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/JavascriptFormattingModelBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
@@ -17,38 +17,41 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.formatter;
+package com.intellij.lang.javascript.impl.formatter;
 
-import com.intellij.formatting.FormattingModel;
-import com.intellij.formatting.FormattingModelBuilder;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.formatter.blocks.JSBlock;
+import com.intellij.lang.javascript.impl.formatter.blocks.JSBlock;
 import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.codeStyle.*;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
 
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class JavascriptFormattingModelBuilder implements FormattingModelBuilder
 {
-	@Override
 	@Nonnull
-	public FormattingModel createModel(final PsiElement element, final CodeStyleSettings settings)
+	public FormattingModel createModel(@Nonnull FormattingContext formattingContext)
 	{
+		PsiElement element = formattingContext.getPsiElement();
+
+		CodeStyleSettings settings = formattingContext.getCodeStyleSettings();
+
 		final PsiFile psiFile = element.getContainingFile();
 
 		CommonCodeStyleSettings commonSettings = settings.getCommonSettings(JavaScriptLanguage.INSTANCE);
 
 		return new JSFormattingModel(psiFile, settings, new JSBlock(psiFile instanceof JSFile ? psiFile.getNode() : element.getNode(), null, null, null, commonSettings));
+
 	}
 
+	@Nonnull
 	@Override
-	public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset)
+	public Language getLanguage()
 	{
-		return null;
+		return JavaScriptLanguage.INSTANCE;
 	}
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
similarity index 91%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
index f6523ee5..c2b7a9d6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
@@ -14,21 +14,19 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.formatter.blocks;
+package com.intellij.lang.javascript.impl.formatter.blocks;
 
-import com.intellij.formatting.*;
-import com.intellij.lang.ASTNode;
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
-import com.intellij.lang.javascript.formatter.JSSpacingProcessor;
+import com.intellij.lang.javascript.impl.formatter.JSSpacingProcessor;
 import com.intellij.lang.javascript.types.JSFileElementType;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiErrorElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.ast.IElementType;
+import consulo.language.codeStyle.*;
+import consulo.language.psi.PsiErrorElement;
+import consulo.language.psi.PsiWhiteSpace;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
similarity index 83%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
index eb6b519a..33247c74 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/JSDocCommentBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.formatter.blocks;
+package com.intellij.lang.javascript.impl.formatter.blocks;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.formatting.Alignment;
-import com.intellij.formatting.Block;
-import com.intellij.formatting.ChildAttributes;
-import com.intellij.formatting.Indent;
-import com.intellij.formatting.Spacing;
-import com.intellij.formatting.Wrap;
-import com.intellij.lang.ASTNode;
-import com.intellij.openapi.util.TextRange;
+import consulo.language.codeStyle.Alignment;
+import consulo.language.codeStyle.Block;
+import consulo.language.codeStyle.Indent;
+import consulo.language.codeStyle.Spacing;
+import consulo.language.codeStyle.Wrap;
+import consulo.language.ast.ASTNode;
+import consulo.document.util.TextRange;
+import consulo.language.codeStyle.ChildAttributes;
 
 /**
  * @author yole
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
similarity index 96%
rename from plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
index b30a2926..16835acb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
@@ -14,24 +14,21 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.formatter.blocks;
+package com.intellij.lang.javascript.impl.formatter.blocks;
 
-import com.intellij.formatting.*;
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.javascript.JSNodeVisitor;
+import com.intellij.lang.javascript.impl.JSNodeVisitor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
-import com.intellij.lang.javascript.formatter.JSSpacingProcessor;
+import com.intellij.lang.javascript.impl.formatter.JSSpacingProcessor;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.types.JSFileElementType;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
-import com.intellij.psi.tree.IElementType;
+import consulo.language.codeStyle.*;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.ast.IElementType;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
similarity index 78%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
index d7200f96..b77000dd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInsight.actions.BaseCodeInsightAction;
-import com.intellij.lang.javascript.JavaScriptFileType;
+import consulo.javascript.language.JavaScriptFileType;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.LangDataKeys;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.PsiUtilBase;
+import consulo.codeEditor.Editor;
+import consulo.language.editor.LangDataKeys;
+import consulo.language.editor.PlatformDataKeys;
+import consulo.language.editor.impl.action.BaseCodeInsightAction;
+import consulo.language.editor.util.PsiUtilBase;
+import consulo.language.psi.PsiFile;
+import consulo.project.Project;
+import consulo.ui.ex.action.AnAction;
+import consulo.ui.ex.action.AnActionEvent;
+import consulo.virtualFileSystem.VirtualFile;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
similarity index 58%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
index 6d66e973..7d6f52d2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/BaseJSGenerateHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
@@ -17,35 +17,43 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
+import consulo.javascript.language.JavaScriptBundle;
+import com.intellij.lang.javascript.psi.JSClass;
+import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
+import consulo.application.ApplicationManager;
+import consulo.codeEditor.Editor;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.editor.action.LanguageCodeInsightActionHandler;
+import consulo.language.editor.generation.ClassMember;
+import consulo.language.editor.generation.MemberChooserBuilder;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
+import consulo.logging.Logger;
+import consulo.project.Project;
+import consulo.undoRedo.CommandProcessor;
+
+import javax.annotation.Nonnull;
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
-import javax.swing.JComponent;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.ide.util.MemberChooser;
-import com.intellij.lang.LanguageCodeInsightActionHandler;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.javascript.validation.BaseCreateMethodsFix;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.command.CommandProcessor;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
-
 abstract class BaseJSGenerateHandler implements LanguageCodeInsightActionHandler
 {
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+
 	@Override
 	public void invoke(final Project project, final Editor editor, final PsiFile file)
 	{
@@ -59,53 +67,23 @@ public void invoke(final Project project, final Editor editor, final PsiFile fil
 		final Collection<JSNamedElementNode> candidates = new ArrayList<JSNamedElementNode>();
 		collectCandidates(clazz, candidates);
 
-		final Collection<JSNamedElementNode> selectedElements;
-
-		if(ApplicationManager.getApplication().isUnitTestMode())
+		MemberChooserBuilder<JSNamedElementNode> builder = MemberChooserBuilder.create(candidates.toArray(new JSNamedElementNode[candidates.size()]));
+		if(canHaveEmptySelectedElements())
 		{
-			selectedElements = candidates;
-		}
-		else
-		{
-			if(candidates.size() == 0)
-			{
-				if(!canHaveEmptySelectedElements())
-				{
-					return;
-				}
-				selectedElements = Collections.emptyList();
-			}
-			else
-			{
-				final MemberChooser<JSNamedElementNode> chooser = new MemberChooser<JSNamedElementNode>(candidates.toArray(new JSNamedElementNode[candidates
-						.size()]), false, true, project, false)
-				{
-		  /*@Override
-          protected void customizeOptionsPanel() {
-
-			super.customizeOptionsPanel();
-
-            appendOwnOptions(jComponentList);
-            return jComponentList;
-          } */
-				};
-
-				chooser.setTitle(JavaScriptBundle.message(getTitleKey()));
-				chooser.setCopyJavadocVisible(false);
-				chooser.show();
-				if(chooser.getExitCode() != DialogWrapper.OK_EXIT_CODE)
-				{
-					return;
-				}
-				selectedElements = chooser.getSelectedElements();
-			}
+			builder.withEmptySelection();
 		}
 
-		if(selectedElements == null)
+		builder.withTitle(LocalizeValue.localizeTODO(JavaScriptBundle.message(getTitleKey())));
+		builder.showAsync(project, dataHolder ->
 		{
-			return;
-		}
+			List data = dataHolder.getUserData(ClassMember.KEY_OF_LIST);
 
+			run(clazz, data, project, editor, file);
+		});
+	}
+
+	private void run(JSClass clazz, Collection<JSNamedElementNode> selectedElements, Project project, Editor editor, PsiFile file)
+	{
 		final JSClass jsClass = clazz;
 		final Collection<JSNamedElementNode> selectedElements1 = selectedElements;
 		Runnable runnable = new Runnable()
@@ -133,9 +111,10 @@ public void run()
 			}
 		};
 
-		if(CommandProcessor.getInstance().getCurrentCommand() == null)
+		CommandProcessor processor = CommandProcessor.getInstance();
+		if(processor.hasCurrentCommand())
 		{
-			CommandProcessor.getInstance().executeCommand(project, runnable, getClass().getName(), null);
+			processor.executeCommand(project, runnable, getClass().getName(), null);
 		}
 		else
 		{
@@ -178,9 +157,7 @@ else if(JSResolveUtil.isArtificialClassUsedForReferenceList(clazz))
 		return clazz;
 	}
 
-	protected abstract /*@PropertyKey(resourceBundle = JSBundle.BUNDLE)*/
-	@NonNls
-	String getTitleKey();
+	protected abstract String getTitleKey();
 
 	protected abstract BaseCreateMethodsFix createFix(JSClass clazz);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
similarity index 80%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
index 161d9ff4..8c498b1a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JSNamedElementNode.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
@@ -14,22 +14,17 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
-import com.intellij.codeInsight.generation.ClassMember;
-import com.intellij.codeInsight.generation.MemberChooserObject;
-import com.intellij.codeInsight.generation.PsiElementMemberChooserObject;
-import com.intellij.icons.AllIcons;
 import com.intellij.javascript.JSParameterInfoHandler;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSParameterList;
-import com.intellij.lang.javascript.psi.JSVariable;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElement;
-import consulo.awt.TargetAWT;
-import consulo.ide.IconDescriptorUpdaters;
+import consulo.application.AllIcons;
+import consulo.language.editor.generation.ClassMember;
+import consulo.language.editor.generation.MemberChooserObject;
+import consulo.language.editor.generation.PsiElementMemberChooserObject;
+import consulo.language.icon.IconDescriptorUpdaters;
+import consulo.language.psi.PsiElement;
 import consulo.ui.image.Image;
 import consulo.ui.image.ImageEffects;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
similarity index 90%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
index 90b4fa42..b874f9f9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateAccessorHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
@@ -14,49 +14,36 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.lang.javascript.psi.JSParameterList;
-import com.intellij.lang.javascript.psi.JSVariable;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.lang.javascript.validation.BaseCreateMethodsFix;
-import com.intellij.lang.javascript.validation.JSAnnotatingVisitor;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.ui.NonFocusableCheckBox;
-import com.intellij.util.IncorrectOperationException;
+import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
+import com.intellij.lang.javascript.impl.validation.JSAnnotatingVisitor;
+import consulo.application.ApplicationManager;
+import consulo.codeEditor.Editor;
+import consulo.language.codeStyle.CodeStyleSettingsManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.ui.ex.awt.NonFocusableCheckBox;
+import consulo.util.lang.StringUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import javax.swing.*;
+import java.util.*;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 19, 2008
- *         Time: 1:11:10 AM
+ * Date: Jul 19, 2008
+ * Time: 1:11:10 AM
  */
 class JavaScriptGenerateAccessorHandler extends BaseJSGenerateHandler
 {
@@ -65,7 +52,11 @@ class JavaScriptGenerateAccessorHandler extends BaseJSGenerateHandler
 
 	static enum GenerationMode
 	{
-		GETTERS, SETTERS, GETTERS_AND_SETTERS, CONSTRUCTOR, TOSTRING
+		GETTERS,
+		SETTERS,
+		GETTERS_AND_SETTERS,
+		CONSTRUCTOR,
+		TOSTRING
 	}
 
 	JavaScriptGenerateAccessorHandler(GenerationMode _mode)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
index e0132d4c..b785ad13 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateConstructorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
index 36ae52f4..a8f9a99c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
index e8e69476..7f5a2ad9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateGetSetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
index d4602441..84270251 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateSetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
index 00ea7582..e2647571 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptGenerateToStringAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
similarity index 79%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
index 23bdf033..58fa4a6f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptImplementMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
@@ -17,18 +17,18 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.generation;
-
-import java.util.Collection;
+package com.intellij.lang.javascript.impl.generation;
 
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.javascript.validation.BaseCreateMethodsFix;
-import com.intellij.lang.javascript.validation.ImplementMethodsFix;
-import com.intellij.lang.javascript.validation.ImplementedMethodProcessor;
+import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
+import com.intellij.lang.javascript.impl.validation.ImplementMethodsFix;
+import com.intellij.lang.javascript.impl.validation.ImplementedMethodProcessor;
+
+import java.util.Collection;
 
-public class JavaScriptImplementMethodsHandler extends BaseJSGenerateHandler
+public abstract class JavaScriptImplementMethodsHandler extends BaseJSGenerateHandler
 {
 	@Override
 	protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
similarity index 88%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
index 0903af80..0dc50306 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/JavaScriptOverrideMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
@@ -17,22 +17,22 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.generation;
-
-import java.util.Collection;
-import java.util.Map;
+package com.intellij.lang.javascript.impl.generation;
 
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.lang.javascript.validation.BaseCreateMethodsFix;
-import com.intellij.lang.javascript.validation.ImplementedMethodProcessor;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.util.Function;
+import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
+import com.intellij.lang.javascript.impl.validation.ImplementedMethodProcessor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.ResolveState;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Function;
 
-public class JavaScriptOverrideMethodsHandler extends BaseJSGenerateHandler
+public abstract class JavaScriptOverrideMethodsHandler extends BaseJSGenerateHandler
 {
 	@Override
 	protected String getTitleKey()
@@ -53,7 +53,7 @@ protected void collectCandidates(final JSClass clazz, final Collection<JSNamedEl
 		final Function<JSFunction, Boolean> functionFilter = new Function<JSFunction, Boolean>()
 		{
 			@Override
-			public Boolean fun(final JSFunction function)
+			public Boolean apply(final JSFunction function)
 			{
 				final JSAttributeList attributeList = function.getAttributeList();
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
index d33beb8d..a7b8bee4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/generation/OverrideMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.generation;
+package com.intellij.lang.javascript.impl.generation;
 
 import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.psi.JSAttributeList;
@@ -24,8 +24,8 @@
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.javascript.validation.BaseCreateMethodsFix;
-import com.intellij.psi.PsiElement;
+import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
+import consulo.language.psi.PsiElement;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
similarity index 82%
rename from plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
index e7373551..a6cba674 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JSBraceMatcher.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
@@ -14,25 +14,23 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.highlighting;
+package com.intellij.lang.javascript.impl.highlighting;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.language.BracePair;
+import consulo.language.PairedBraceMatcher;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.intellij.lang.BracePair;
-import com.intellij.lang.PairedBraceMatcher;
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.tree.IElementType;
-
 /**
- * Created by IntelliJ IDEA.
  * User: max
  * Date: Feb 2, 2005
  * Time: 12:10:44 PM
- * To change this template use File | Settings | File Templates.
  */
-public class JSBraceMatcher implements PairedBraceMatcher
+public abstract class JSBraceMatcher implements PairedBraceMatcher
 {
 	private static final BracePair[] PAIRS = new BracePair[]{
 			new BracePair(JSTokenTypes.LPAR, JSTokenTypes.RPAR, false),
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
similarity index 93%
rename from plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
index 5c32775e..3e54999a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
@@ -14,30 +14,29 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.highlighting;
+package com.intellij.lang.javascript.impl.highlighting;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.options.colors.AttributesDescriptor;
-import com.intellij.openapi.options.colors.ColorDescriptor;
-import com.intellij.openapi.options.colors.ColorSettingsPage;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.colorScheme.TextAttributesKey;
+import consulo.colorScheme.setting.AttributesDescriptor;
+import consulo.colorScheme.setting.ColorDescriptor;
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import consulo.javascript.lang.JavaScript15LanguageVersion;
+import consulo.language.editor.colorScheme.setting.ColorSettingsPage;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * Created by IntelliJ IDEA.
  * User: Maxim.Mossienko
  * Date: Nov 2, 2005
  * Time: 10:12:13 PM
- * To change this template use File | Settings | File Templates.
  */
+@ExtensionImpl
 public class JavaScriptColorsAndFontsPage implements ColorSettingsPage
 {
 	private static final AttributesDescriptor[] ATTRS;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
similarity index 91%
rename from plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
index b4e2584a..5f633b66 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
@@ -14,36 +14,34 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.highlighting;
-
-import com.intellij.codeInsight.daemon.impl.HighlightInfo;
-import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
-import com.intellij.codeInsight.daemon.impl.HighlightVisitor;
-import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder;
+package com.intellij.lang.javascript.impl.highlighting;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.codeEditor.DefaultLanguageHighlighterColors;
+import consulo.language.editor.rawHighlight.HighlightInfo;
+import consulo.language.editor.rawHighlight.HighlightInfoType;
+import consulo.language.editor.rawHighlight.HighlightVisitor;
+import consulo.language.editor.rawHighlight.HighlightInfoHolder;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
-import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtilCore;
+import consulo.colorScheme.TextAttributesKey;
+import consulo.language.psi.*;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.util.PsiTreeUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import consulo.javascript.lang.JavaScriptContextKeywordElementType;
-import consulo.javascript.lang.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.lang.JavaScriptVersionUtil;
+import consulo.javascript.language.JavaScriptVersionUtil;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.util.lang.StringUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+@ExtensionImpl
 public class JavaScriptHighlightVisitor extends JSElementVisitor implements HighlightVisitor
 {
 	private HighlightInfoHolder myHighlightInfoHolder;
@@ -397,12 +395,6 @@ public HighlightVisitor clone()
 		return new JavaScriptHighlightVisitor();
 	}
 
-	@Override
-	public int order()
-	{
-		return 0;
-	}
-
 	private static boolean isClass(final PsiElement element)
 	{
 		return element instanceof JSClass || element instanceof JSFile && element.getContext() != null;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
similarity index 79%
rename from plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
index b01e2a19..c168c2a0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
@@ -14,85 +14,57 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.highlighting;
-
-import com.intellij.codeHighlighting.Pass;
-import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
-import com.intellij.codeInsight.daemon.LineMarkerInfo;
-import com.intellij.codeInsight.daemon.LineMarkerProvider;
-import com.intellij.codeInsight.daemon.impl.PsiElementListNavigator;
-import com.intellij.codeInsight.navigation.NavigationUtil;
-import com.intellij.icons.AllIcons;
-import com.intellij.ide.util.DefaultPsiElementCellRenderer;
+package com.intellij.lang.javascript.impl.highlighting;
+
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.search.JSClassSearch;
-import com.intellij.lang.javascript.search.JSFunctionsSearch;
-import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.progress.ProgressManager;
-import com.intellij.openapi.util.Ref;
-import com.intellij.psi.NavigatablePsiElement;
-import com.intellij.psi.PsiElement;
-import com.intellij.ui.awt.RelativePoint;
-import com.intellij.util.CollectionQuery;
-import com.intellij.util.Function;
-import com.intellij.util.Processor;
-import com.intellij.util.Query;
+import com.intellij.lang.javascript.impl.search.JSFunctionsSearch;
+import consulo.application.AllIcons;
+import consulo.application.ApplicationManager;
+import consulo.application.progress.ProgressManager;
+import consulo.application.util.function.Processor;
+import consulo.application.util.query.CollectionQuery;
+import consulo.application.util.query.Query;
+import consulo.language.editor.Pass;
+import consulo.language.editor.gutter.GutterIconNavigationHandler;
+import consulo.language.editor.gutter.LineMarkerInfo;
+import consulo.language.editor.gutter.LineMarkerProvider;
+import consulo.language.editor.ui.DefaultPsiElementCellRenderer;
+import consulo.language.editor.ui.PopupNavigationUtil;
+import consulo.language.editor.ui.PsiElementListNavigator;
+import consulo.language.psi.NavigatablePsiElement;
+import consulo.language.psi.PsiElement;
+import consulo.navigation.NavigationItem;
+import consulo.ui.ex.RelativePoint;
 import consulo.util.dataholder.Key;
+import consulo.util.lang.ref.Ref;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.awt.event.MouseEvent;
 import java.util.*;
+import java.util.function.Function;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Apr 14, 2008
- *         Time: 11:43:47 PM
+ * Date: Apr 14, 2008
+ * Time: 11:43:47 PM
  */
-public class JavaScriptLineMarkerProvider implements LineMarkerProvider
+public abstract class JavaScriptLineMarkerProvider implements LineMarkerProvider
 {
 	@NonNls
 	private static final String OVERRIDES_METHOD_IN = "overrides method in ";
 
-	private static final Function<JSClass, String> ourClassInheritorsTooltipProvider = new Function<JSClass, String>()
-	{
-		@Override
-		public String fun(final JSClass clazz)
-		{
-			return "Has subclasses";
-		}
-	};
+	private static final Function<JSClass, String> ourClassInheritorsTooltipProvider = clazz -> "Has subclasses";
 
-	private static final Function<JSClass, String> ourImplementedInterfacesTooltipProvider = new Function<JSClass, String>()
-	{
-		@Override
-		public String fun(final JSClass clazz)
-		{
-			return "Has implementations";
-		}
-	};
+	private static final Function<JSClass, String> ourImplementedInterfacesTooltipProvider = clazz -> "Has implementations";
 
-	private static final Function<JSFunction, String> ourOverriddenFunctionsTooltipProvider = new Function<JSFunction, String>()
-	{
-		@Override
-		public String fun(final JSFunction psiElement)
-		{
-			return "Is overridden";
-		}
-	};
+	private static final Function<JSFunction, String> ourOverriddenFunctionsTooltipProvider = psiElement -> "Is overridden";
 
-	private static final Function<JSFunction, String> ourImplementingFunctionsTooltipProvider = new Function<JSFunction, String>()
-	{
-		@Override
-		public String fun(final JSFunction psiElement)
-		{
-			return "Is implemented";
-		}
-	};
+	private static final Function<JSFunction, String> ourImplementingFunctionsTooltipProvider = psiElement -> "Is implemented";
 
 	private static final BasicGutterIconNavigationHandler<JSClass> ourClassInheritorsNavHandler = new BasicGutterIconNavigationHandler<JSClass>()
 	{
@@ -111,35 +83,35 @@ protected Query<JSClass> search(final JSClass elt)
 
 	private static final BasicGutterIconNavigationHandler<JSClass> ourInterfaceImplementationsNavHandler = new
 			BasicGutterIconNavigationHandler<JSClass>()
-	{
-		@Override
-		protected String getTitle(final JSClass elt)
-		{
-			return "Choose Implementation of " + elt.getName();
-		}
+			{
+				@Override
+				protected String getTitle(final JSClass elt)
+				{
+					return "Choose Implementation of " + elt.getName();
+				}
 
-		@Override
-		protected Query<JSClass> search(final JSClass elt)
-		{
-			return JSClassSearch.searchInterfaceImplementations(elt, true);
-		}
-	};
+				@Override
+				protected Query<JSClass> search(final JSClass elt)
+				{
+					return JSClassSearch.searchInterfaceImplementations(elt, true);
+				}
+			};
 
 	private static final BasicGutterIconNavigationHandler<JSFunction> ourOverriddenFunctionsNavHandler = new
 			BasicGutterIconNavigationHandler<JSFunction>()
-	{
-		@Override
-		protected String getTitle(final JSFunction elt)
-		{
-			return "Choose Overriden Function of " + elt.getName();
-		}
+			{
+				@Override
+				protected String getTitle(final JSFunction elt)
+				{
+					return "Choose Overriden Function of " + elt.getName();
+				}
 
-		@Override
-		protected Query<JSFunction> search(final JSFunction elt)
-		{
-			return doFindOverridenFunctionStatic(elt);
-		}
-	};
+				@Override
+				protected Query<JSFunction> search(final JSFunction elt)
+				{
+					return doFindOverridenFunctionStatic(elt);
+				}
+			};
 	private final boolean myUnitTestMode = ApplicationManager.getApplication().isUnitTestMode();
 
 
@@ -163,19 +135,19 @@ public static Query<JSFunction> doFindOverridenFunctionStatic(final JSFunction e
 
 	private static final BasicGutterIconNavigationHandler<JSFunction> ourImplementingFunctionsNavHandler = new
 			BasicGutterIconNavigationHandler<JSFunction>()
-	{
-		@Override
-		protected String getTitle(final JSFunction elt)
-		{
-			return "Choose Implementation of " + elt.getName();
-		}
+			{
+				@Override
+				protected String getTitle(final JSFunction elt)
+				{
+					return "Choose Implementation of " + elt.getName();
+				}
 
-		@Override
-		protected Query<JSFunction> search(final JSFunction elt)
-		{
-			return JSFunctionsSearch.searchImplementingFunctions(elt, true);
-		}
-	};
+				@Override
+				protected Query<JSFunction> search(final JSFunction elt)
+				{
+					return JSFunctionsSearch.searchImplementingFunctions(elt, true);
+				}
+			};
 
 	public static Key<Boolean> ourParticipatesInHierarchyKey = Key.create("js.named.item.participates.in.hierarchy");
 
@@ -219,14 +191,7 @@ public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element)
 					function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
 
 					return new LineMarkerInfo<>(function, function.getNameIdentifier().getTextRange().getStartOffset(), AllIcons.Gutter.OverridingMethod,
-							Pass.UPDATE_ALL, new Function<JSFunction, String>()
-					{
-						@Override
-						public String fun(final JSFunction psiElement)
-						{
-							return OVERRIDES_METHOD_IN + overrideHandler.className;
-						}
-					}, new GutterIconNavigationHandler<JSFunction>()
+							Pass.UPDATE_ALL, psiElement -> OVERRIDES_METHOD_IN + overrideHandler.className, new GutterIconNavigationHandler<JSFunction>()
 					{
 						@Override
 						public void navigate(final MouseEvent e, final JSFunction elt)
@@ -251,7 +216,7 @@ public boolean process(final ResolveProcessor processor, final PsiElement scope,
 							}
 							else if(results.size() > 1)
 							{
-								NavigationUtil.getPsiElementPopup(results.toArray(new PsiElement[results.size()]), "Choose super class or interface").show(new RelativePoint
+								PopupNavigationUtil.getPsiElementPopup(results.toArray(new PsiElement[results.size()]), "Choose super class or interface").show(new RelativePoint
 										(e));
 							}
 						}
@@ -416,14 +381,8 @@ public boolean process(final JSClass jsClass)
 						function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
 
 						result.add(new LineMarkerInfo<>(function, function.getTextOffset(), AllIcons.Gutter.ImplementingMethod, Pass.LINE_MARKERS,
-								new Function<JSFunction, String>()
-						{
-							@Override
-							public String fun(final JSFunction jsFunction)
-							{
-								return "Implementation of " + jsFunction.getName() + " in " + ((NavigationItem) implementedFunction.getParent()).getName();
-							}
-						}, new GutterIconNavigationHandler<JSFunction>()
+								jsFunction -> "Implementation of " + jsFunction.getName() + " in " + ((NavigationItem) implementedFunction.getParent()).getName(), new
+								GutterIconNavigationHandler<JSFunction>()
 						{
 							@Override
 							public void navigate(final MouseEvent e, final JSFunction elt)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java
similarity index 92%
rename from plugin/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java
index cbc66dd0..188d0423 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/index/predefined/Marker.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.index.predefined;
+package com.intellij.lang.javascript.impl.index.predefined;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.form
similarity index 96%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.form
index 1a850a45..21809b50 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.inspections.CreateClassDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.impl.inspections.CreateClassDialog">
   <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
similarity index 89%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
index 6ec92d0d..393556ef 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
+package com.intellij.lang.javascript.impl.inspections;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -22,15 +22,15 @@
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.psi.PsiElement;
-import com.intellij.ui.DocumentAdapter;
+import consulo.ui.ex.awt.DialogWrapper;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.ASTNode;
+import consulo.project.Project;
+import consulo.ui.ex.awt.event.DocumentAdapter;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
similarity index 78%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
index 8cf8bfb8..f0a60809 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/CreateClassOrInterfaceAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
@@ -14,37 +14,36 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
+package com.intellij.lang.javascript.impl.inspections;
 
-import java.util.Properties;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.ide.fileTemplates.FileTemplate;
-import com.intellij.ide.fileTemplates.FileTemplateManager;
-import com.intellij.ide.fileTemplates.FileTemplateUtil;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.flex.ImportUtils;
+import com.intellij.lang.javascript.impl.flex.ImportUtils;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.vfs.VfsUtil;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiManager;
-import com.intellij.util.text.StringTokenizer;
+import consulo.application.ApplicationManager;
+import consulo.fileTemplate.FileTemplate;
+import consulo.fileTemplate.FileTemplateManager;
+import consulo.fileTemplate.FileTemplateUtil;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiDirectory;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiManager;
+import consulo.language.util.ModuleUtilCore;
+import consulo.logging.Logger;
+import consulo.module.Module;
+import consulo.module.content.ModuleRootManager;
+import consulo.project.Project;
+import consulo.ui.ex.awt.DialogWrapper;
+import consulo.util.lang.text.StringTokenizer;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.Properties;
 
 /**
  * Created by IntelliJ IDEA.
@@ -122,9 +121,9 @@ public void run()
 					@NonNls final String fileName = classNameToCreate + ".as";
 					final Properties props = new Properties();
 					props.setProperty(FileTemplate.ATTRIBUTE_NAME, classNameToCreate);
-					final Module element = ModuleUtil.findModuleForPsiElement(contextFile1);
+					final Module element = ModuleUtilCore.findModuleForPsiElement(contextFile1);
 					VirtualFile base = ModuleRootManager.getInstance(element).getSourceRoots()[0];
-					VirtualFile relativeFile = VfsUtil.findRelativeFile(packageName, base);
+					VirtualFile relativeFile = VirtualFileUtil.findRelativeFile(packageName, base);
 
 					if(relativeFile == null)
 					{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
similarity index 84%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
index d4e29fd3..ccb426c0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDeprecatedSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
@@ -14,25 +14,27 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
+package com.intellij.lang.javascript.impl.inspections;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveResult;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemHighlightType;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.ResolveResult;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
  */
+@ExtensionImpl
 public class JSDeprecatedSymbolsInspection extends JSInspection
 {
 	@NonNls
@@ -42,7 +44,7 @@ public class JSDeprecatedSymbolsInspection extends JSInspection
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JavaScriptBundle.message("js.inspection.group.name");
+		return "General";
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
similarity index 90%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
index d01ef6b3..958a0ad4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSDuplicatedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
@@ -14,31 +14,33 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
+package com.intellij.lang.javascript.impl.inspections;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeHighlighting.HighlightDisplayLevel;
-import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.JSElementType;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtilCore;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemHighlightType;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiUtilCore;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  */
+@ExtensionImpl
 public class JSDuplicatedDeclarationInspection extends JSInspection
 {
 	@NonNls
@@ -48,7 +50,7 @@ public class JSDuplicatedDeclarationInspection extends JSInspection
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JavaScriptBundle.message("js.inspection.group.name");
+		return "General";
 	}
 
 	@Override
@@ -192,7 +194,8 @@ else if((attrList != null && attrList.getNamespace() != null) || (attrList2 != n
 				if(processor.getResult() != null && processor.getResult() != scope)
 				{
 					holder.registerProblem(nameIdentifier, JavaScriptBundle.message("javascript.validation.message.duplicate.declaration"),
-							originalScope.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 ? ProblemHighlightType.ERROR : ProblemHighlightType
+							originalScope.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 ? ProblemHighlightType.ERROR :
+									ProblemHighlightType
 									.GENERIC_ERROR_OR_WARNING);
 				}
 			}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
similarity index 72%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
index f3f7552a..8f100336 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
@@ -14,30 +14,31 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
+package com.intellij.lang.javascript.impl.inspections;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import com.intellij.codeHighlighting.HighlightDisplayLevel;
-import com.intellij.codeInspection.CustomSuppressableInspectionTool;
-import com.intellij.codeInspection.LocalInspectionTool;
-import com.intellij.codeInspection.ProblemsHolder;
-import com.intellij.codeInspection.SuppressIntentionAction;
-import com.intellij.codeInspection.SuppressionUtil;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.lang.javascript.psi.JSSuppressionHolder;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.editor.inspection.CustomSuppressableInspectionTool;
+import consulo.language.editor.inspection.LocalInspectionTool;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.inspection.SuppressionUtil;
+import consulo.language.editor.intention.SuppressIntentionAction;
+import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
  * User: Maxim.Mossienko
  * Date: Apr 18, 2006
  * Time: 7:34:46 PM
- * To change this template use File | Settings | File Templates.
  */
 public abstract class JSInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool
 {
@@ -59,6 +60,13 @@ public boolean isEnabledByDefault()
 		return true;
 	}
 
+	@Nullable
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+
 	@Override
 	@Nonnull
 	public HighlightDisplayLevel getDefaultLevel()
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
similarity index 88%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
index 9c398367..eb5a836a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUndeclaredVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
@@ -14,37 +14,38 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
+package com.intellij.lang.javascript.impl.inspections;
 
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInsight.CodeInsightUtilBase;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSUtils;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.document.Document;
+import consulo.document.util.TextRange;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.editor.FileModificationService;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.editor.inspection.ProblemHighlightType;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.psi.PsiDocumentManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * @author Maxim.Mossienko
  */
+@ExtensionImpl
 public class JSUndeclaredVariableInspection extends JSInspection
 {
 	@NonNls
@@ -54,7 +55,7 @@ public class JSUndeclaredVariableInspection extends JSInspection
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JavaScriptBundle.message("js.inspection.group.name");
+		return "General";
 	}
 
 	@Override
@@ -174,7 +175,7 @@ public String getFamilyName()
 		@Override
 		public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor)
 		{
-			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(myFile))
+			if(!FileModificationService.getInstance().prepareFileForWrite(myFile))
 			{
 				return;
 			}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
index fab25c9f..13edeb48 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
@@ -14,49 +14,49 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
+package com.intellij.lang.javascript.impl.inspections;
 
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-
-import javax.annotation.Nullable;
-import org.jetbrains.annotations.PropertyKey;
-import com.intellij.codeInsight.template.Template;
-import com.intellij.codeInsight.template.TemplateManager;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.codeInspection.ProblemsHolder;
-import com.intellij.ide.highlighter.XmlFileType;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.flex.AddImportECMAScriptClassOrFunctionAction;
+import com.intellij.lang.javascript.impl.flex.AddImportECMAScriptClassOrFunctionAction;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.util.JSUtils;
-import com.intellij.lang.javascript.validation.JSAnnotatingVisitor;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.lang.javascript.impl.validation.JSAnnotatingVisitor;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.codeEditor.Editor;
 import consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory;
-import consulo.javascript.lang.JavaScriptFeature;
-import consulo.javascript.lang.JavaScriptVersionUtil;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.language.JavaScriptVersionUtil;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.editor.inspection.ProblemHighlightType;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.template.Template;
+import consulo.language.editor.template.TemplateManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.project.Project;
+import consulo.xml.ide.highlighter.XmlFileType;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.PropertyKey;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * @author Maxim.Mossienko
  */
+@ExtensionImpl
 public class JSUnresolvedFunctionInspection extends JSInspection
 {
 	@NonNls
@@ -66,7 +66,7 @@ public class JSUnresolvedFunctionInspection extends JSInspection
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JavaScriptBundle.message("js.inspection.group.name");
+		return "General";
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
similarity index 92%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
index 49066397..978f1afc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
@@ -14,47 +14,41 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
+package com.intellij.lang.javascript.impl.inspections;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInsight.template.Template;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemsHolder;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.flex.AddImportECMAScriptClassOrFunctionAction;
+import com.intellij.lang.javascript.impl.flex.AddImportECMAScriptClassOrFunctionAction;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
-import consulo.javascript.inspections.qucikFixes.CreateJSFunctionFixBase;
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
-import com.intellij.lang.javascript.psi.JSArgumentList;
-import com.intellij.lang.javascript.psi.JSCallExpression;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSDefinitionExpression;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSThisExpression;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.util.JSUtils;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.psi.util.PsiTreeUtil;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptFeature;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.inspections.qucikFixes.CreateJSFunctionFixBase;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.language.codeStyle.CodeStyleSettingsManager;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.template.Template;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.util.lang.StringUtil;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author Maxim.Mossienko
  */
+@ExtensionImpl
 public class JSUnresolvedVariableInspection extends JSInspection
 {
 	@NonNls
@@ -64,7 +58,7 @@ public class JSUnresolvedVariableInspection extends JSInspection
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JavaScriptBundle.message("js.inspection.group.name");
+		return "General";
 	}
 
 	@Override
@@ -298,7 +292,7 @@ public String getName()
 		@RequiredReadAction
 		@Override
 		protected void buildTemplate(final Template template, final JSReferenceExpression referenceExpression, final Set<JavaScriptFeature> features, boolean staticContext,
-				final PsiFile file, final PsiElement anchorParent)
+									 final PsiFile file, final PsiElement anchorParent)
 		{
 			template.addTextSegment("/** @namespace ");
 			template.addTextSegment(referenceExpression.getText() + " */");
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
similarity index 72%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
index 7a23e846..880e2acf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUntypedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
@@ -14,46 +14,42 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
+package com.intellij.lang.javascript.impl.inspections;
 
-import java.util.Collections;
-
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NonNls;
-import com.intellij.codeHighlighting.HighlightDisplayLevel;
-import com.intellij.codeInsight.CodeInsightUtilBase;
-import com.intellij.codeInsight.template.Template;
-import com.intellij.codeInsight.template.TemplateManager;
-import com.intellij.codeInsight.template.impl.MacroCallNode;
-import com.intellij.codeInsight.template.macro.MacroFactory;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.codeInspection.ProblemsHolder;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSFunctionExpression;
-import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSVariable;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSPsiImplUtils;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.fileEditor.FileEditorManager;
-import com.intellij.openapi.fileEditor.OpenFileDescriptor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import consulo.javascript.lang.JavaScriptFeature;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.application.ApplicationManager;
+import consulo.codeEditor.Editor;
+import consulo.fileEditor.FileEditorManager;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.language.editor.FileModificationService;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.editor.inspection.ProblemHighlightType;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
+import consulo.language.editor.template.Template;
+import consulo.language.editor.template.TemplateManager;
+import consulo.language.editor.template.macro.MacroCallNode;
+import consulo.language.editor.template.macro.MacroFactory;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.navigation.OpenFileDescriptor;
+import consulo.navigation.OpenFileDescriptorFactory;
+import consulo.project.Project;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.Collections;
 
 /**
  * @author Maxim.Mossienko
  */
+@ExtensionImpl
 public class JSUntypedDeclarationInspection extends JSInspection
 {
 	@NonNls
@@ -63,7 +59,7 @@ public class JSUntypedDeclarationInspection extends JSInspection
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JavaScriptBundle.message("js.inspection.group.name");
+		return "General";
 	}
 
 	@Override
@@ -156,7 +152,7 @@ public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescr
 		{
 			PsiElement anchor = descriptor.getPsiElement();
 			PsiFile containingFile = anchor.getContainingFile();
-			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(containingFile))
+			if(!FileModificationService.getInstance().prepareFileForWrite(containingFile))
 			{
 				return;
 			}
@@ -166,7 +162,7 @@ public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescr
 				anchor = ((JSFunction) anchor.getParent()).getParameterList();
 			}
 
-			OpenFileDescriptor openDescriptor = new OpenFileDescriptor(project, containingFile.getVirtualFile(), anchor.getTextRange().getEndOffset());
+			OpenFileDescriptor openDescriptor = OpenFileDescriptorFactory.getInstance(project).builder(containingFile.getVirtualFile()).offset(anchor.getTextRange().getEndOffset()).build();
 			openDescriptor.navigate(true);
 			Editor textEditor = FileEditorManager.getInstance(project).getSelectedTextEditor();
 			TemplateManager templateManager = TemplateManager.getInstance(project);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
similarity index 93%
rename from plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
index 41e4d423..12491d71 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
@@ -14,29 +14,30 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.inspections;
-
-import com.intellij.codeHighlighting.HighlightDisplayLevel;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.codeInspection.ProblemsHolder;
+package com.intellij.lang.javascript.impl.inspections;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.editor.inspection.ProblemHighlightType;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
+import consulo.language.editor.inspection.LocalQuickFix;
 import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.highlighting.JavaScriptLineMarkerProvider;
+import com.intellij.lang.javascript.impl.highlighting.JavaScriptLineMarkerProvider;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.ResolveState;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.logging.Logger;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.resolve.ResolveState;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
 import consulo.util.collection.primitive.objects.ObjectIntMap;
 import consulo.util.collection.primitive.objects.ObjectMaps;
 import consulo.util.dataholder.Key;
@@ -52,6 +53,7 @@
 /**
  * @author Maxim.Mossienko
  */
+@ExtensionImpl
 public class JSUnusedLocalSymbolsInspection extends JSInspection
 {
 	private static final Logger LOG = Logger.getInstance("JSUnusedLocalSymbols");
@@ -62,7 +64,7 @@ public class JSUnusedLocalSymbolsInspection extends JSInspection
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JavaScriptBundle.message("js.inspection.group.name");
+		return "General";
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
similarity index 75%
rename from plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
index fc998683..9db4c443 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptGotoSuperHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
@@ -17,27 +17,23 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.navigation;
+package com.intellij.lang.javascript.impl.navigation;
 
-import com.intellij.codeInsight.navigation.NavigationUtil;
-import com.intellij.lang.LanguageCodeInsightActionHandler;
-import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSDefinitionExpression;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSFunctionExpression;
-import com.intellij.lang.javascript.psi.JSNamedElement;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.codeEditor.Editor;
+import consulo.codeEditor.EditorPopupHelper;
+import consulo.language.editor.action.LanguageCodeInsightActionHandler;
+import consulo.language.editor.ui.PopupNavigationUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.navigation.NavigationItem;
+import consulo.project.Project;
+import consulo.ui.ex.popup.JBPopup;
 
-public class JavaScriptGotoSuperHandler implements LanguageCodeInsightActionHandler
+public abstract class JavaScriptGotoSuperHandler implements LanguageCodeInsightActionHandler
 {
 	@Override
 	public void invoke(final Project project, final Editor editor, final PsiFile file)
@@ -122,7 +118,9 @@ else if(namedElement instanceof JSClass)
 			}
 			else
 			{
-				NavigationUtil.getPsiElementPopup(classes, "Choose super class or interface").showInBestPositionFor(editor);
+				JBPopup psiElementPopup = PopupNavigationUtil.getPsiElementPopup(classes, "Choose super class or interface");
+
+				EditorPopupHelper.getInstance().showPopupInBestPositionFor(editor, psiElementPopup);
 			}
 		}
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
similarity index 73%
rename from plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
index 9ea1f062..fdedd57a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/navigation/JavaScriptSymbolContributor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
@@ -14,28 +14,26 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.navigation;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
+package com.intellij.lang.javascript.impl.navigation;
 
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.navigation.ChooseByNameContributor;
-import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.psi.search.FilenameIndex;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.ProjectScope;
-import com.intellij.psi.stubs.StubIndex;
-import com.intellij.util.Processor;
-import com.intellij.util.indexing.FileBasedIndex;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.application.util.function.Processor;
+import consulo.ide.navigation.ChooseByNameContributor;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.language.psi.search.FilenameIndex;
+import consulo.language.psi.stub.FileBasedIndex;
+import consulo.language.psi.stub.StubIndex;
+import consulo.navigation.NavigationItem;
+import consulo.project.Project;
+import consulo.util.io.FileUtil;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author maxim
@@ -69,7 +67,7 @@ public boolean process(String s)
 	@Override
 	public NavigationItem[] getItemsByName(String name, final String pattern, Project project, boolean includeNonProjectItems)
 	{
-		GlobalSearchScope scope = includeNonProjectItems ? ProjectScope.getAllScope(project) : ProjectScope.getProjectScope(project);
+		GlobalSearchScope scope = includeNonProjectItems ? GlobalSearchScope.allScope(project) : GlobalSearchScope.projectScope(project);
 		Collection<JSQualifiedNamedElement> result = JSResolveUtil.findElementsByName(name, project, scope);
 		return result.toArray(new NavigationItem[result.size()]);
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BaseIntroduceSettings.java
similarity index 93%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BaseIntroduceSettings.java
index 66939d0c..383007dd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/BaseIntroduceSettings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BaseIntroduceSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring;
+package com.intellij.lang.javascript.impl.refactoring;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
similarity index 85%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
index 2bc76973..d332c0fa 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/BasicJavascriptNamesValidator.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
@@ -17,11 +17,11 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.refactoring;
+package com.intellij.lang.javascript.impl.refactoring;
 
 import com.intellij.lang.javascript.DialectOptionHolder;
 
-public class BasicJavascriptNamesValidator extends JSNamesValidator
+public abstract class BasicJavascriptNamesValidator extends JSNamesValidator
 {
 	public BasicJavascriptNamesValidator()
 	{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
similarity index 96%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
index 99845f2f..da1820f5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseClassBasedIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring;
+package com.intellij.lang.javascript.impl.refactoring;
 
 import javax.swing.ButtonGroup;
 import javax.swing.JRadioButton;
 
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.openapi.project.Project;
+import consulo.project.Project;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
similarity index 86%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
index bb94467a..9faec08e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
@@ -14,40 +14,33 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring;
+package com.intellij.lang.javascript.impl.refactoring;
 
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-
-import com.intellij.lang.Language;
-import com.intellij.lang.LanguageNamesValidation;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.openapi.application.ModalityState;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.Ref;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.refactoring.ui.ConflictsDialog;
-import com.intellij.refactoring.util.CommonRefactoringUtil;
-import com.intellij.util.Alarm;
+import consulo.application.Application;
+import consulo.language.Language;
+import consulo.language.editor.refactoring.NamesValidator;
+import consulo.language.editor.refactoring.ui.ConflictsDialog;
+import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.project.Project;
+import consulo.ui.ex.awt.DialogWrapper;
+import consulo.ui.ex.awt.Messages;
+import consulo.ui.ex.awt.util.Alarm;
+import consulo.util.lang.ref.Ref;
+
+import javax.swing.*;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author ven
@@ -179,7 +172,7 @@ private static boolean isValidIdentifier(String typeString, PsiElement context)
 			return false;
 		}
 		Language language = context.getContainingFile().getLanguage();
-		return LanguageNamesValidation.INSTANCE.forLanguage(language).isIdentifier(typeString, context.getProject());
+		return NamesValidator.forLanguage(language).isIdentifier(typeString, context.getProject());
 	}
 
 	protected abstract JTextField getNameField();
@@ -199,7 +192,7 @@ public void run()
 				final String nameCandidate = getNameField().getText();
 				setOKActionEnabled(nameCandidate.length() != 0 && isValidName(nameCandidate));
 			}
-		}, 100, ModalityState.current());
+		}, 100, Application.get().getCurrentModalityState());
 	}
 
 	@Override
@@ -324,7 +317,7 @@ public String getVariableType()
 	private boolean isValidName(final String name)
 	{
 		final PsiFile containingFile = myMainOccurence.getContainingFile();
-		return LanguageNamesValidation.INSTANCE.forLanguage(containingFile.getLanguage()).isIdentifier(name, myProject);
+		return NamesValidator.forLanguage(containingFile.getLanguage()).isIdentifier(name, myProject);
 	}
 
 	public abstract JComboBox getVarTypeField();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
similarity index 91%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
index 7b2265bd..07165223 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
@@ -14,46 +14,47 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring;
+package com.intellij.lang.javascript.impl.refactoring;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Nonnull;
 
+import consulo.application.ApplicationManager;
+import consulo.codeEditor.Editor;
+import consulo.colorScheme.TextAttributes;
+import consulo.dataContext.DataContext;
+import consulo.document.RangeMarker;
+import consulo.language.editor.PsiEquivalenceUtil;
+import consulo.language.editor.highlight.HighlightManager;
+import consulo.language.editor.refactoring.RefactoringBundle;
+import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.project.ui.wm.WindowManager;
+import consulo.ui.ex.awt.DialogWrapper;
+import consulo.undoRedo.CommandProcessor;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nullable;
-import com.intellij.codeInsight.PsiEquivalenceUtil;
-import com.intellij.codeInsight.highlighting.HighlightManager;
+
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.command.CommandProcessor;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.RangeMarker;
-import com.intellij.openapi.editor.colors.EditorColors;
-import com.intellij.openapi.editor.colors.EditorColorsManager;
-import com.intellij.openapi.editor.markup.RangeHighlighter;
-import com.intellij.openapi.editor.markup.TextAttributes;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.wm.WindowManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.refactoring.RefactoringActionHandler;
-import com.intellij.refactoring.RefactoringBundle;
-import com.intellij.refactoring.util.CommonRefactoringUtil;
-import com.intellij.util.IncorrectOperationException;
+import consulo.logging.Logger;
+import consulo.codeEditor.EditorColors;
+import consulo.colorScheme.EditorColorsManager;
+import consulo.codeEditor.markup.RangeHighlighter;
+import consulo.project.Project;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
+import consulo.language.util.IncorrectOperationException;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java
similarity index 87%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java
index 0f0bba2f..c11d846e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JSNamesValidator.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring;
+package com.intellij.lang.javascript.impl.refactoring;
 
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JSFlexAdapter;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.refactoring.NamesValidator;
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.project.Project;
+import consulo.language.lexer.Lexer;
+import consulo.project.Project;
+import consulo.language.editor.refactoring.NamesValidator;
 
 /**
  * Created by IntelliJ IDEA.
@@ -30,7 +30,7 @@
  * Time: 8:28:35 PM
  * To change this template use File | Settings | File Templates.
  */
-class JSNamesValidator implements NamesValidator
+abstract class JSNamesValidator implements NamesValidator
 {
 	protected final Lexer myLexer;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
similarity index 61%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
index e0fb9f7d..76491c7d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/JavascriptRefactoringSupportProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
@@ -17,26 +17,22 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.refactoring;
+package com.intellij.lang.javascript.impl.refactoring;
+
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.impl.refactoring.extractMethod.JSExtractFunctionHandler;
+import com.intellij.lang.javascript.impl.refactoring.introduceConstant.JSIntroduceConstantHandler;
+import com.intellij.lang.javascript.impl.refactoring.introduceField.JSIntroduceFieldHandler;
+import com.intellij.lang.javascript.impl.refactoring.introduceVariable.JSIntroduceVariableHandler;
+import consulo.application.ApplicationManager;
+import consulo.language.editor.refactoring.RefactoringSupportProvider;
+import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.scope.LocalSearchScope;
 
 import javax.annotation.Nullable;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSDefinitionExpression;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.lang.javascript.refactoring.extractMethod.JSExtractFunctionHandler;
-import com.intellij.lang.javascript.refactoring.introduceConstant.JSIntroduceConstantHandler;
-import com.intellij.lang.javascript.refactoring.introduceField.JSIntroduceFieldHandler;
-import com.intellij.lang.javascript.refactoring.introduceVariable.JSIntroduceVariableHandler;
-import com.intellij.lang.refactoring.RefactoringSupportProvider;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.search.LocalSearchScope;
-import com.intellij.refactoring.RefactoringActionHandler;
 
-public class JavascriptRefactoringSupportProvider extends RefactoringSupportProvider
+public abstract class JavascriptRefactoringSupportProvider extends RefactoringSupportProvider
 {
 	@Override
 	public boolean isSafeDeleteAvailable(PsiElement element)
@@ -54,7 +50,7 @@ public RefactoringActionHandler getIntroduceVariableHandler()
 		return new JSIntroduceVariableHandler();
 	}
 
-	@Override
+	@Override                                                                                
 	@Nullable
 	public RefactoringActionHandler getExtractMethodHandler()
 	{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.form
similarity index 93%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.form
index 3945aa41..79cb19fc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.refactoring.extractMethod.JSExtractFunctionDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.impl.refactoring.extractMethod.JSExtractFunctionDialog">
   <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
similarity index 88%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
index 5c3f1082..79cb490a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.extractMethod;
+package com.intellij.lang.javascript.impl.refactoring.extractMethod;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.ui.DialogWrapper;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.ui.ex.awt.DialogWrapper;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
similarity index 79%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
index ca4114bd..27a896ea 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.extractMethod;
+package com.intellij.lang.javascript.impl.refactoring.extractMethod;
 
 import javax.annotation.Nonnull;
 
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.command.CommandProcessor;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.refactoring.RefactoringActionHandler;
-import com.intellij.refactoring.util.CommonRefactoringUtil;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.language.psi.PsiFile;
+import consulo.undoRedo.CommandProcessor;
+import consulo.codeEditor.Editor;
+import consulo.project.Project;
+import consulo.ui.ex.awt.DialogWrapper;
+import consulo.language.psi.PsiElement;
+import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
+import consulo.application.ApplicationManager;
+import consulo.dataContext.DataContext;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionSettings.java
similarity index 90%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionSettings.java
index ad48cdcd..510cc659 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/extractMethod/JSExtractFunctionSettings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.extractMethod;
+package com.intellij.lang.javascript.impl.refactoring.extractMethod;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstant.form
similarity index 97%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstant.form
index 3e526b3d..163b8f68 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstant.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstant.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.refactoring.introduceConstant.JSIntroduceConstantDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.impl.refactoring.introduceConstant.JSIntroduceConstantDialog">
   <grid id="ea5f6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
similarity index 92%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
index 6888b859..0925a1d5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.introduceConstant;
+package com.intellij.lang.javascript.impl.refactoring.introduceConstant;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
@@ -23,8 +23,8 @@
 import javax.swing.JTextField;
 
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.refactoring.JSBaseClassBasedIntroduceDialog;
-import com.intellij.openapi.project.Project;
+import com.intellij.lang.javascript.impl.refactoring.JSBaseClassBasedIntroduceDialog;
+import consulo.project.Project;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
similarity index 80%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
index 1d9830a0..04074409 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
@@ -14,27 +14,20 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.introduceConstant;
+package com.intellij.lang.javascript.impl.refactoring.introduceConstant;
 
-import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSAttributeListOwner;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.lang.javascript.refactoring.JSBaseIntroduceHandler;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Ref;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.refactoring.util.CommonRefactoringUtil;
-import com.intellij.util.IncorrectOperationException;
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
+import consulo.codeEditor.Editor;
+import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.util.lang.ref.Ref;
+import org.jetbrains.annotations.NonNls;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantSettings.java
similarity index 84%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantSettings.java
index b09f6074..90e29353 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceConstant/JSIntroduceConstantSettings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantSettings.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.introduceConstant;
+package com.intellij.lang.javascript.impl.refactoring.introduceConstant;
 
 import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.refactoring.BaseIntroduceSettings;
+import com.intellij.lang.javascript.impl.refactoring.BaseIntroduceSettings;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceField.form
similarity index 98%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceField.form
index ff9391e9..8f07f9cb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceField.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceField.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.refactoring.introduceField.JSIntroduceFieldDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.impl.refactoring.introduceField.JSIntroduceFieldDialog">
   <grid id="ea5f6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
similarity index 83%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
index 0e901249..60b3aa22 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
@@ -14,28 +14,19 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.introduceField;
-
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
+package com.intellij.lang.javascript.impl.refactoring.introduceField;
 
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.lang.javascript.refactoring.JSBaseClassBasedIntroduceDialog;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.impl.refactoring.JSBaseClassBasedIntroduceDialog;
+import consulo.language.codeStyle.CodeStyleSettingsManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.ResolveResult;
+import consulo.project.Project;
+import consulo.util.lang.StringUtil;
+import consulo.util.lang.ref.Ref;
+
+import javax.swing.*;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
similarity index 83%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
index 07f7d146..d1816c94 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
@@ -14,30 +14,24 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.introduceField;
+package com.intellij.lang.javascript.impl.refactoring.introduceField;
 
-import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSVarStatement;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.lang.javascript.refactoring.JSBaseIntroduceHandler;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlFile;
-import com.intellij.refactoring.util.CommonRefactoringUtil;
-import com.intellij.util.IncorrectOperationException;
+import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
+import consulo.codeEditor.Editor;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.xml.psi.xml.XmlFile;
+import org.jetbrains.annotations.NonNls;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldSettings.java
similarity index 86%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldSettings.java
index fb58a306..f86bd5e6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceField/JSIntroduceFieldSettings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldSettings.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.introduceField;
+package com.intellij.lang.javascript.impl.refactoring.introduceField;
 
 import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.refactoring.BaseIntroduceSettings;
+import com.intellij.lang.javascript.impl.refactoring.BaseIntroduceSettings;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariable.form
similarity index 97%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariable.form
index b35dbd3e..8d2b3c62 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariable.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariable.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.refactoring.introduceVariable.JSIntroduceVariableDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.lang.javascript.impl.refactoring.introduceVariable.JSIntroduceVariableDialog">
   <grid id="ea5f6" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
similarity index 92%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
index 15374149..a84a9c0e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.introduceVariable;
+package com.intellij.lang.javascript.impl.refactoring.introduceVariable;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
@@ -24,9 +24,9 @@
 import javax.swing.JTextField;
 
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.refactoring.JSBaseIntroduceDialog;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceDialog;
+import consulo.project.Project;
+import consulo.util.lang.StringUtil;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
similarity index 86%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
index 7c655e0c..76a27574 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/JSIntroduceVariableHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.introduceVariable;
+package com.intellij.lang.javascript.impl.refactoring.introduceVariable;
 
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.refactoring.JSBaseIntroduceHandler;
-import com.intellij.openapi.project.Project;
+import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
+import consulo.project.Project;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/Settings.java
similarity index 83%
rename from plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/Settings.java
index 8d45cfe3..6da63a20 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/refactoring/introduceVariable/Settings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/Settings.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.refactoring.introduceVariable;
+package com.intellij.lang.javascript.impl.refactoring.introduceVariable;
 
-import com.intellij.lang.javascript.refactoring.BaseIntroduceSettings;
+import com.intellij.lang.javascript.impl.refactoring.BaseIntroduceSettings;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
similarity index 84%
rename from plugin/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
index d2a956f8..e728f405 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDeclarationRangeHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.search;
+package com.intellij.lang.javascript.impl.search;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.codeInsight.hint.DeclarationRangeHandler;
 import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
+import consulo.document.util.TextRange;
+import consulo.language.editor.hint.DeclarationRangeHandler;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  *         Date: Apr 28, 2008
  *         Time: 8:36:19 PM
  */
-public class JSDeclarationRangeHandler implements DeclarationRangeHandler
+public abstract class JSDeclarationRangeHandler implements DeclarationRangeHandler
 {
 	@Override
 	@Nonnull
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
similarity index 87%
rename from plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
index fb9fa1f4..c7e840fe 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
@@ -14,23 +14,24 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.search;
+package com.intellij.lang.javascript.impl.search;
 
 import com.intellij.lang.javascript.index.JavaScriptIndex;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.ResolveResult;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.searches.DefinitionsScopedSearch;
-import com.intellij.psi.search.searches.ReferencesSearch;
-import com.intellij.util.Processor;
-import com.intellij.util.QueryExecutor;
-import consulo.javascript.lang.JavaScriptLanguage;
+import com.intellij.lang.javascript.search.JSClassSearch;
+import consulo.application.util.function.Processor;
+import consulo.application.util.query.QueryExecutor;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.language.psi.search.DefinitionsScopedSearch;
+import consulo.language.psi.search.ReferencesSearch;
 
 import javax.annotation.Nonnull;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
similarity index 91%
rename from plugin/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
index b7162521..3d02c5ec 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSFunctionsSearch.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.search;
+package com.intellij.lang.javascript.impl.search;
 
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.Processor;
-import com.intellij.util.Query;
-import com.intellij.util.QueryExecutor;
-import com.intellij.util.QueryFactory;
+import com.intellij.lang.javascript.search.JSClassSearch;
+import consulo.application.util.function.Processor;
+import consulo.application.util.query.Query;
+import consulo.application.util.query.QueryExecutor;
+import consulo.application.util.query.QueryFactory;
+import consulo.language.psi.PsiElement;
 
 public abstract class JSFunctionsSearch implements QueryExecutor<JSFunction, JSFunctionsSearch.SearchParameters>
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
similarity index 75%
rename from plugin/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
index 875844a5..c9bf6775 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSGotoTargetRendererProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.search;
+package com.intellij.lang.javascript.impl.search;
 
-import javax.annotation.Nullable;
-import com.intellij.codeInsight.navigation.GotoTargetHandler;
-import com.intellij.codeInsight.navigation.GotoTargetRendererProvider;
-import com.intellij.ide.util.PsiElementListCellRenderer;
 import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.navigation.ItemPresentation;
-import com.intellij.navigation.NavigationItem;
-import com.intellij.psi.PsiElement;
+import consulo.ide.navigation.GotoTargetRendererProvider;
+import consulo.language.editor.ui.PsiElementListCellRenderer;
+import consulo.language.psi.PsiElement;
+import consulo.navigation.ItemPresentation;
+import consulo.navigation.NavigationItem;
+
+import javax.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
  *         Date: Apr 28, 2008
  *         Time: 8:14:14 PM
  */
-public class JSGotoTargetRendererProvider implements GotoTargetRendererProvider
+public abstract class JSGotoTargetRendererProvider implements GotoTargetRendererProvider
 {
 	static class JSClassListCellRenderer extends PsiElementListCellRenderer<JSNamedElement>
 	{
@@ -56,7 +56,7 @@ protected int getIconFlags()
 
 	@Nullable
 	@Override
-	public PsiElementListCellRenderer getRenderer(PsiElement element, GotoTargetHandler.GotoData gotoData)
+	public PsiElementListCellRenderer getRenderer(PsiElement element)
 	{
 		if(!(element instanceof JSNamedElement))
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java
similarity index 74%
rename from plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java
index c71b0ff9..68de894c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/search/JSReferencesSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.search;
+package com.intellij.lang.javascript.impl.search;
 
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.openapi.application.ReadAction;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.LocalSearchScope;
-import com.intellij.psi.search.PsiSearchHelper;
-import com.intellij.psi.search.searches.ReferencesSearch;
-import com.intellij.util.Processor;
-import com.intellij.util.QueryExecutor;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.application.util.query.QueryExecutor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.language.psi.scope.LocalSearchScope;
+import consulo.language.psi.search.ReferencesSearch;
+import consulo.application.util.function.Processor;
+import consulo.application.ReadAction;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.search.PsiSearchHelper;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
index 436979ff..004fd2ee 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.structureView;
+package com.intellij.lang.javascript.impl.structureView;
 
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -27,10 +27,10 @@
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiNamedElement;
+import consulo.language.icon.IconDescriptorUpdaters;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiNamedElement;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.ide.IconDescriptorUpdaters;
 import consulo.ui.image.Image;
 
 import javax.annotation.Nonnull;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
similarity index 68%
rename from plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
index 6e1d49c6..b8d18c4c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewBuilderFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
@@ -17,17 +17,18 @@
 /*
  * @author max
  */
-package com.intellij.lang.javascript.structureView;
+package com.intellij.lang.javascript.impl.structureView;
+
+import consulo.codeEditor.Editor;
+import consulo.fileEditor.structureView.StructureViewBuilder;
+import consulo.fileEditor.structureView.StructureViewModel;
+import consulo.fileEditor.structureView.TreeBasedStructureViewBuilder;
+import consulo.language.editor.structureView.PsiStructureViewFactory;
+import consulo.language.psi.PsiFile;
 
 import javax.annotation.Nonnull;
-import com.intellij.ide.structureView.StructureViewBuilder;
-import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.ide.structureView.TreeBasedStructureViewBuilder;
-import com.intellij.lang.PsiStructureViewFactory;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.psi.PsiFile;
 
-public class JSStructureViewBuilderFactory implements PsiStructureViewFactory
+public abstract class JSStructureViewBuilderFactory implements PsiStructureViewFactory
 {
 	@Override
 	public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
similarity index 96%
rename from plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
index d3373128..7b664476 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewElement.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.structureView;
+package com.intellij.lang.javascript.impl.structureView;
 
-import com.intellij.ide.structureView.StructureViewTreeElement;
-import com.intellij.lang.injection.InjectedLanguageManager;
+import consulo.document.util.TextRange;
+import consulo.fileEditor.structureView.StructureViewTreeElement;
+import consulo.language.inject.InjectedLanguageManager;
 import com.intellij.lang.javascript.index.JSSymbolUtil;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.navigation.ItemPresentation;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.pom.Navigatable;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.navigation.Navigatable;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.util.PsiTreeUtil;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
+import consulo.navigation.ItemPresentation;
 import consulo.util.collection.primitive.ints.IntMaps;
 import consulo.util.collection.primitive.ints.IntObjectMap;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
similarity index 87%
rename from plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
index ff2212ca..bee312ad 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
@@ -14,37 +14,30 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.structureView;
+package com.intellij.lang.javascript.impl.structureView;
 
-import java.util.Comparator;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import consulo.platform.base.icon.PlatformIconGroup;
-import org.jetbrains.annotations.NonNls;
-import com.intellij.icons.AllIcons;
-import com.intellij.ide.IdeBundle;
-import com.intellij.ide.structureView.StructureViewTreeElement;
-import com.intellij.ide.structureView.TextEditorBasedStructureViewModel;
-import com.intellij.ide.util.FileStructureFilter;
-import com.intellij.ide.util.treeView.smartTree.ActionPresentation;
-import com.intellij.ide.util.treeView.smartTree.ActionPresentationData;
-import com.intellij.ide.util.treeView.smartTree.Filter;
-import com.intellij.ide.util.treeView.smartTree.Grouper;
-import com.intellij.ide.util.treeView.smartTree.Sorter;
-import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.lang.javascript.index.JavaScriptIndex;
 import com.intellij.lang.javascript.psi.*;
-import com.intellij.openapi.actionSystem.Shortcut;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.keymap.KeymapManager;
-import com.intellij.openapi.util.Ref;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiLanguageInjectionHost;
-import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.application.AllIcons;
+import consulo.codeEditor.Editor;
+import consulo.fileEditor.structureView.StructureViewTreeElement;
+import consulo.fileEditor.structureView.tree.*;
+import consulo.ide.IdeBundle;
+import consulo.language.editor.structureView.TextEditorBasedStructureViewModel;
+import consulo.language.inject.InjectedLanguageManager;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiLanguageInjectionHost;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.platform.base.icon.PlatformIconGroup;
+import consulo.ui.ex.action.Shortcut;
+import consulo.ui.ex.keymap.KeymapManager;
+import consulo.util.lang.ref.Ref;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * @by max, maxim
@@ -296,7 +289,7 @@ public Object getCurrentEditorElement()
 			if(injectionHost != null)
 			{
 				final Ref<PsiElement> ref = new Ref<PsiElement>();
-				InjectedLanguageUtil.enumerate(injectionHost, new PsiLanguageInjectionHost.InjectedPsiVisitor()
+				InjectedLanguageManager.getInstance(file.getProject()).enumerate(injectionHost, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
 					public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
similarity index 85%
rename from plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
index 35f20138..910aa90d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGroup.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.structureView;
+package com.intellij.lang.javascript.impl.structureView;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,10 +22,10 @@
 
 import javax.annotation.Nullable;
 
-import com.intellij.icons.AllIcons;
-import com.intellij.ide.util.treeView.smartTree.Group;
-import com.intellij.ide.util.treeView.smartTree.TreeElement;
-import com.intellij.navigation.ItemPresentation;
+import consulo.application.AllIcons;
+import consulo.fileEditor.structureView.tree.Group;
+import consulo.navigation.ItemPresentation;
+import consulo.fileEditor.structureView.tree.TreeElement;
 import consulo.ui.image.Image;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
similarity index 85%
rename from plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
index a5e1c135..5570172a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.structureView;
+package com.intellij.lang.javascript.impl.structureView;
 
-import com.intellij.ide.IdeBundle;
-import com.intellij.ide.util.treeView.AbstractTreeNode;
-import com.intellij.ide.util.treeView.smartTree.*;
+import consulo.fileEditor.structureView.tree.*;
+import consulo.project.ui.view.tree.AbstractTreeNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
+import consulo.ide.IdeBundle;
 import consulo.platform.base.icon.PlatformIconGroup;
 import org.jetbrains.annotations.NonNls;
 
@@ -44,9 +44,9 @@ class JSSuperGrouper implements Grouper
 
 	@Override
 	@Nonnull
-	public Collection<Group> group(final AbstractTreeNode parent, final Collection<TreeElement> children)
+	public Collection<Group> group(final Object parent, final Collection<TreeElement> children)
 	{
-		if(isParentGrouped(parent))
+		if(isParentGrouped((AbstractTreeNode) parent))
 		{
 			return Collections.emptyList();
 		}
@@ -79,7 +79,7 @@ public Collection<Group> group(final AbstractTreeNode parent, final Collection<T
 			}
 			else if(value instanceof JSFunction)
 			{
-				processFunction((JSStructureViewElement) parent.getValue(), groups, _child, value);
+				processFunction((JSStructureViewElement) ((AbstractTreeNode) parent).getValue(), groups, _child, value);
 			}
 		}
 		return groups.values();
@@ -114,7 +114,7 @@ private static void addGroup(final Map<String, Group> groups, final TreeElement
 	@Nonnull
 	public ActionPresentation getPresentation()
 	{
-		return new ActionPresentationData(IdeBundle.message("action.structureview.group.methods.by.defining.type"), null, PlatformIconGroup.generalImplementingMethod());
+		return new ActionPresentationData(IdeBundle.message("action.structureview.group.methods.by.defining.type"), null, PlatformIconGroup.generalImplementingmethod());
 	}
 
 	@Override
@@ -132,7 +132,7 @@ private static boolean isParentGrouped(AbstractTreeNode parent)
 			{
 				return true;
 			}
-			parent = parent.getParent();
+			parent = (AbstractTreeNode) parent.getParent();
 		}
 		return false;
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
similarity index 84%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
index fad07339..12c3e685 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSExpressionSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
-
-import javax.annotation.Nonnull;
+package com.intellij.lang.javascript.impl.surroundWith;
 
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.surroundWith.SurroundDescriptor;
-import com.intellij.lang.surroundWith.Surrounder;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.editor.surroundWith.SurroundDescriptor;
+import consulo.language.editor.surroundWith.Surrounder;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -35,7 +35,7 @@
  * Time: 12:46:24
  * To change this template use File | Settings | File Templates.
  */
-public class JSExpressionSurroundDescriptor implements SurroundDescriptor
+public abstract class JSExpressionSurroundDescriptor implements SurroundDescriptor
 {
 	private static final Surrounder[] SURROUNDERS = {
 			new JSWithParenthesesSurrounder()
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
similarity index 84%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
index d80f105a..f98ff314 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
 import javax.annotation.Nonnull;
 
+import consulo.codeEditor.Editor;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.editor.surroundWith.Surrounder;
+import consulo.project.Project;
+import consulo.language.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nullable;
-import com.intellij.lang.ASTNode;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.lang.surroundWith.Surrounder;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.util.IncorrectOperationException;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
similarity index 89%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
index 1208c8c8..dea1fbb9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSStatementsSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
@@ -14,25 +14,24 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
-import com.intellij.lang.surroundWith.SurroundDescriptor;
-import com.intellij.lang.surroundWith.Surrounder;
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.util.PsiTreeUtil;
+import consulo.language.ast.ASTNode;
+import consulo.language.editor.surroundWith.SurroundDescriptor;
+import consulo.language.editor.surroundWith.Surrounder;
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by IntelliJ IDEA.
@@ -40,7 +39,7 @@
  * Date: 12.07.2005
  * Time: 14:14:55
  */
-public class JSStatementsSurroundDescriptor implements SurroundDescriptor
+public abstract class JSStatementsSurroundDescriptor implements SurroundDescriptor
 {
 	private static final Surrounder[] SURROUNDERS = {
 			new JSWithBlockSurrounder(),
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
similarity index 86%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
index 6fe9b4e2..43a566f0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithBlockSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
+import consulo.project.Project;
+import consulo.language.psi.PsiElement;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
similarity index 85%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
index 5de27863..d8423c32 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithDoWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSDoWhileStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
+import consulo.language.ast.ASTNode;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
similarity index 86%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
index a28531be..393892bf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithForSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.ASTNode;
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSForStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiWhiteSpace;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
+import consulo.language.psi.PsiWhiteSpace;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
similarity index 88%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
index 4592f46e..048a8872 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionExpressionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.language.ast.ASTNode;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 
 public class JSWithFunctionExpressionSurrounder extends JSStatementSurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
similarity index 85%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
index de0b0b5f..1d7ce44f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithFunctionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.language.ast.ASTNode;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
+import consulo.project.Project;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
 
 public class JSWithFunctionSurrounder extends JSStatementSurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
similarity index 85%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
index a17607f3..218eaf53 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfElseSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
similarity index 86%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
index 67eb2289..e05490d2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithIfSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
 import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
+import consulo.project.Project;
+import consulo.language.psi.PsiElement;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
similarity index 81%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
index 073bbc60..8cc6270e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithParenthesesSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.language.ast.ASTNode;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.lang.surroundWith.Surrounder;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import consulo.codeEditor.Editor;
+import consulo.project.Project;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
+import consulo.language.editor.surroundWith.Surrounder;
+import consulo.language.util.IncorrectOperationException;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
similarity index 90%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
index 2697302f..f3a08dd8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
 import javax.annotation.Nonnull;
 
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.language.ast.ASTNode;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.JSCatchBlock;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
similarity index 86%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
index 968e5c67..6305a51f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryCatchSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
similarity index 85%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
index 7d582c93..b288ae48 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithTryFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.javascript.JavaScriptBundle;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
similarity index 85%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
index b50025ca..f9965a96 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
similarity index 86%
rename from plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
index 6b79bbfc..40290958 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/surroundWith/JSWithWithSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.surroundWith;
+package com.intellij.lang.javascript.impl.surroundWith;
 
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSWithStatement;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
+import consulo.project.Project;
+import consulo.document.util.TextRange;
+import consulo.language.psi.PsiElement;
+import consulo.language.ast.ASTNode;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
similarity index 94%
rename from plugin/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
index a0ae7b20..8a406ee5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/BaseCreateMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.validation;
+package com.intellij.lang.javascript.impl.validation;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,12 +24,14 @@
 import java.util.List;
 import java.util.Set;
 
+import consulo.language.ast.ASTNode;
+import consulo.language.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
-import com.intellij.lang.ASTNode;
+
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.flex.ImportUtils;
-import com.intellij.lang.javascript.generation.JSNamedElementNode;
+import com.intellij.lang.javascript.impl.flex.ImportUtils;
+import com.intellij.lang.javascript.impl.generation.JSNamedElementNode;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSAttributeListOwner;
 import com.intellij.lang.javascript.psi.JSClass;
@@ -41,12 +43,11 @@
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.util.IncorrectOperationException;
+import consulo.codeEditor.Editor;
+import consulo.project.Project;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiWhiteSpace;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
similarity index 90%
rename from plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
index be2eafdd..9a1159ae 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.validation;
+package com.intellij.lang.javascript.impl.validation;
 
 import javax.annotation.Nonnull;
 
+import consulo.language.psi.PsiFile;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
-import com.intellij.codeInsight.intention.IntentionAction;
-import com.intellij.lang.javascript.JavaScriptBundle;
+import consulo.language.editor.intention.IntentionAction;
+import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiFile;
+import consulo.codeEditor.Editor;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
similarity index 93%
rename from plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
index f6133d92..6a0d4d84 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/ImplementedMethodProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.validation;
+package com.intellij.lang.javascript.impl.validation;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.ResolveState;
-import com.intellij.util.Function;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.resolve.ResolveState;
+
+import javax.annotation.Nullable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Function;
 
 /**
  * @author Maxim.Mossienko
@@ -64,7 +64,7 @@ protected boolean process(final ResolveProcessor processor)
 				functions = collectAllVisibleClassFunctions(myJsClass, null, new Function<JSFunction, Boolean>()
 				{
 					@Override
-					public Boolean fun(final JSFunction jsFunction)
+					public Boolean apply(final JSFunction jsFunction)
 					{
 						final JSAttributeList attributeList = jsFunction.getAttributeList();
 						PsiElement parentClass = JSResolveUtil.findParent(jsFunction);
@@ -159,7 +159,7 @@ public boolean execute(final PsiElement element, final ResolveState state)
 					}
 
 					Boolean filterValue;
-					if(filter != null && (filterValue = filter.fun(function)) != null && !filterValue.booleanValue())
+					if(filter != null && (filterValue = filter.apply(function)) != null && !filterValue.booleanValue())
 					{
 						return true;
 					}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
similarity index 96%
rename from plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
rename to plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index be04d7ac..58cf75f6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -14,25 +14,9 @@
  * limitations under the License.
  */
 
-package com.intellij.lang.javascript.validation;
-
-import com.intellij.codeInsight.CodeInsightUtilBase;
-import com.intellij.codeInsight.daemon.EmptyResolveMessageProvider;
-import com.intellij.codeInsight.daemon.impl.quickfix.RenameFileFix;
-import com.intellij.codeInsight.intention.IntentionAction;
-import com.intellij.codeInsight.template.Template;
-import com.intellij.codeInsight.template.TemplateManager;
-import com.intellij.codeInsight.template.impl.MacroCallNode;
-import com.intellij.codeInsight.template.macro.CompleteMacro;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.LocalQuickFixProvider;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.annotation.Annotation;
-import com.intellij.lang.annotation.AnnotationHolder;
-import com.intellij.lang.annotation.Annotator;
+package com.intellij.lang.javascript.impl.validation;
+
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
@@ -41,20 +25,35 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.psi.util.JSUtils;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlTagChild;
-import com.intellij.util.IncorrectOperationException;
+import consulo.codeEditor.Editor;
+import consulo.document.util.TextRange;
+import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.FileModificationService;
+import consulo.language.editor.annotation.Annotation;
+import consulo.language.editor.annotation.AnnotationHolder;
+import consulo.language.editor.annotation.Annotator;
+import consulo.language.editor.impl.intention.RenameFileFix;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.LocalQuickFixProvider;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.editor.intention.IntentionAction;
+import consulo.language.editor.template.Template;
+import consulo.language.editor.template.TemplateManager;
+import consulo.language.editor.template.macro.CompleteMacro;
+import consulo.language.editor.template.macro.MacroCallNode;
+import consulo.language.psi.*;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.module.content.ProjectRootManager;
+import consulo.project.Project;
+import consulo.util.lang.ref.Ref;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.xml.psi.xml.XmlAttributeValue;
+import consulo.xml.psi.xml.XmlTagChild;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.PropertyKey;
 
@@ -1284,7 +1283,7 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
 		@Override
 		public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
 		{
-			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
+			if(!FileModificationService.getInstance().prepareFileForWrite(file))
 			{
 				return;
 			}
@@ -1336,7 +1335,7 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
 		@Override
 		public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
 		{
-			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
+			if(!FileModificationService.getInstance().prepareFileForWrite(file))
 			{
 				return;
 			}
@@ -1420,7 +1419,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
 		@Override
 		public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException
 		{
-			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
+			if(!FileModificationService.getInstance().prepareFileForWrite(file))
 			{
 				return;
 			}
@@ -1502,7 +1501,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
 		@Override
 		public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException
 		{
-			if(!CodeInsightUtilBase.getInstance().prepareFileForWrite(file))
+			if(!FileModificationService.getInstance().prepareFileForWrite(file))
 			{
 				return;
 			}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java
deleted file mode 100644
index 4a8c8412..00000000
--- a/plugin/src/main/java/com/intellij/lang/javascript/inspections/JSInspectionToolProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2000-2005 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.
- */
-
-package com.intellij.lang.javascript.inspections;
-
-import com.intellij.codeInspection.InspectionToolProvider;
-
-/**
- * @author yole
- */
-public class JSInspectionToolProvider implements InspectionToolProvider
-{
-	@Override
-	public Class[] getInspectionClasses()
-	{
-		return new Class[]{
-				JSUnresolvedVariableInspection.class,
-				JSUndeclaredVariableInspection.class,
-				JSUntypedDeclarationInspection.class,
-				JSUnresolvedFunctionInspection.class,
-				JSDuplicatedDeclarationInspection.class,
-				JSDeprecatedSymbolsInspection.class,
-				JSUnusedLocalSymbolsInspection.class
-		};
-	}
-}
diff --git a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
similarity index 92%
rename from plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
rename to plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
index 8034494f..67506cea 100644
--- a/plugin/src/main/java/consulo/javascript/ide/JavaScriptIconDescriptorUpdater.java
+++ b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package consulo.javascript.ide;
+package consulo.javascript.impl;
 
-import com.intellij.icons.AllIcons;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.application.AllIcons;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.openapi.util.Iconable;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.BitUtil;
+import consulo.component.util.Iconable;
+import consulo.language.icon.IconDescriptorUpdater;
+import consulo.language.psi.PsiElement;
+import consulo.util.lang.BitUtil;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.ide.IconDescriptor;
-import consulo.ide.IconDescriptorUpdater;
+import consulo.language.icon.IconDescriptor;
 import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.image.Image;
 
@@ -35,6 +36,7 @@
  * @author VISTALL
  * @since 05.12.2015
  */
+@ExtensionImpl
 public class JavaScriptIconDescriptorUpdater implements IconDescriptorUpdater
 {
 	@RequiredReadAction
@@ -45,11 +47,11 @@ public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiEleme
 		{
 			if(element instanceof JSFunction && ((JSFunction) element).isGetProperty())
 			{
-				iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertyRead());
+				iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertyread());
 			}
 			else if(element instanceof JSFunction && ((JSFunction) element).isSetProperty())
 			{
-				iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertyWrite());
+				iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertywrite());
 			}
 			else
 			{
diff --git a/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
similarity index 79%
rename from plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
rename to plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
index 0cc154a2..164ae2b7 100644
--- a/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyright.java
+++ b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package consulo.javascript.copyright;
+package consulo.javascript.impl.copyright;
 
-import javax.annotation.Nonnull;
+import consulo.language.copyright.UpdatePsiFileCopyright;
+import consulo.language.copyright.config.CopyrightFileConfig;
+import consulo.language.copyright.config.CopyrightProfile;
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiWhiteSpace;
 
-import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiWhiteSpace;
-import com.maddyhome.idea.copyright.CopyrightProfile;
-import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright;
-import consulo.copyright.config.CopyrightFileConfig;
+import javax.annotation.Nonnull;
 
 public class UpdateJavaScriptFileCopyright extends UpdatePsiFileCopyright<CopyrightFileConfig>
 {
diff --git a/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
similarity index 53%
rename from plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
rename to plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
index f78ff700..c832e012 100644
--- a/plugin/src/main/java/consulo/javascript/copyright/UpdateJavaScriptFileCopyrightProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
@@ -1,22 +1,32 @@
-package consulo.javascript.copyright;
+package consulo.javascript.impl.copyright;
 
-import javax.annotation.Nonnull;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.copyright.UpdateCopyrightsProvider;
+import consulo.language.copyright.UpdatePsiFileCopyright;
+import consulo.language.copyright.config.CopyrightFileConfig;
+import consulo.language.copyright.config.CopyrightProfile;
+import consulo.language.copyright.ui.TemplateCommentPanel;
+import consulo.language.psi.PsiFile;
+import consulo.project.Project;
+import consulo.virtualFileSystem.fileType.FileType;
 
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiFile;
-import com.maddyhome.idea.copyright.CopyrightProfile;
-import com.maddyhome.idea.copyright.psi.UpdateCopyrightsProvider;
-import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright;
-import com.maddyhome.idea.copyright.ui.TemplateCommentPanel;
-import consulo.copyright.config.CopyrightFileConfig;
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 16.02.2015
  */
+@ExtensionImpl
 public class UpdateJavaScriptFileCopyrightProvider extends UpdateCopyrightsProvider<CopyrightFileConfig>
 {
+	@Nonnull
+	@Override
+	public FileType getFileType()
+	{
+		return JavaScriptFileType.INSTANCE;
+	}
+
 	@Nonnull
 	@Override
 	public UpdatePsiFileCopyright<CopyrightFileConfig> createInstance(@Nonnull PsiFile file, @Nonnull CopyrightProfile copyrightProfile)
diff --git a/plugin/src/main/java/consulo/javascript/findUsages/JavaScriptFindUsagesHandlerFactory.java b/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
similarity index 71%
rename from plugin/src/main/java/consulo/javascript/findUsages/JavaScriptFindUsagesHandlerFactory.java
rename to plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
index a10c825b..edceabde 100644
--- a/plugin/src/main/java/consulo/javascript/findUsages/JavaScriptFindUsagesHandlerFactory.java
+++ b/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
@@ -1,9 +1,10 @@
-package consulo.javascript.findUsages;
+package consulo.javascript.impl.findUsages;
 
-import com.intellij.find.findUsages.FindUsagesHandler;
-import com.intellij.find.findUsages.FindUsagesHandlerFactory;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.find.FindUsagesHandler;
+import consulo.find.FindUsagesHandlerFactory;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
-import com.intellij.psi.PsiElement;
+import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -12,6 +13,7 @@
  * @author VISTALL
  * @since 2019-12-16
  */
+@ExtensionImpl
 public class JavaScriptFindUsagesHandlerFactory extends FindUsagesHandlerFactory
 {
 	@Override
diff --git a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
similarity index 71%
rename from plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
rename to plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
index 04d0c1e9..108e3799 100644
--- a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStyleConfigurable.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
@@ -1,10 +1,10 @@
-package consulo.javascript.formatter;
+package consulo.javascript.impl.formatter;
 
 import javax.annotation.Nonnull;
 
-import com.intellij.application.options.CodeStyleAbstractConfigurable;
-import com.intellij.application.options.CodeStyleAbstractPanel;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.ui.setting.CodeStyleAbstractConfigurable;
+import consulo.language.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.ui.setting.CodeStyleAbstractPanel;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStylePanel.java
similarity index 60%
rename from plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
rename to plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStylePanel.java
index 144d42ea..1ef0d456 100644
--- a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptCodeStylePanel.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStylePanel.java
@@ -1,9 +1,9 @@
-package consulo.javascript.formatter;
+package consulo.javascript.impl.formatter;
 
-import com.intellij.application.options.TabbedLanguageCodeStylePanel;
-import com.intellij.lang.javascript.formatter.JSCodeStylePanel;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.language.codeStyle.CodeStyleSettings;
+import consulo.language.codeStyle.ui.setting.TabbedLanguageCodeStylePanel;
+import com.intellij.lang.javascript.impl.formatter.JSCodeStylePanel;
+import consulo.javascript.language.JavaScriptLanguage;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
similarity index 86%
rename from plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
rename to plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index 7814e4c4..6eb7fc4d 100644
--- a/plugin/src/main/java/consulo/javascript/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -1,13 +1,13 @@
-package consulo.javascript.formatter;
+package consulo.javascript.impl.formatter;
 
-import com.intellij.application.options.IndentOptionsEditor;
-import com.intellij.application.options.SmartIndentOptionsEditor;
-import com.intellij.lang.Language;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable;
-import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
-import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.codeStyle.CommonCodeStyleSettings;
+import consulo.language.codeStyle.setting.CodeStyleSettingsCustomizable;
+import consulo.language.codeStyle.setting.IndentOptionsEditor;
+import consulo.language.codeStyle.setting.LanguageCodeStyleSettingsProvider;
+import consulo.language.codeStyle.ui.setting.SmartIndentOptionsEditor;
+import consulo.util.io.FileUtil;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
@@ -88,7 +88,7 @@ private static String loadPreview(String file)
 	{
 		try
 		{
-			return FileUtil.loadTextAndClose(JavaScriptLanguageCodeStyleSettingsProvider.class.getResourceAsStream("/codeStyle/" + file));
+			return FileUtil.loadTextAndClose(JavaScriptLanguageCodeStyleSettingsProvider.class.getResourceAsStream("/codeStyle" + file));
 		}
 		catch(IOException e)
 		{
diff --git a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
similarity index 66%
rename from plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
rename to plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
index 527686de..b36a182e 100644
--- a/plugin/src/main/java/consulo/javascript/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
@@ -1,21 +1,21 @@
-package consulo.javascript.ide.actions;
+package consulo.javascript.impl.ide.actions;
 
-import com.intellij.ide.IdeView;
-import com.intellij.ide.actions.CreateFileFromTemplateAction;
-import com.intellij.ide.actions.CreateFileFromTemplateDialog;
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.LangDataKeys;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
+import consulo.javascript.language.JavaScriptFileType;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.dataContext.DataContext;
+import consulo.ide.IdeView;
+import consulo.ide.action.CreateFileFromTemplateAction;
+import consulo.ide.action.CreateFileFromTemplateDialog;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.language.editor.CommonDataKeys;
+import consulo.language.psi.PsiDirectory;
+import consulo.language.util.ModuleUtilCore;
 import consulo.localize.LocalizeValue;
+import consulo.module.Module;
+import consulo.module.content.NewFileModuleResolver;
+import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
+import consulo.virtualFileSystem.fileType.FileType;
 
 import javax.annotation.Nullable;
 
@@ -54,7 +54,7 @@ private static Module findModule(DataContext dataContext)
 	{
 		Project project = dataContext.getData(CommonDataKeys.PROJECT);
 		assert project != null;
-		final IdeView view = dataContext.getData(LangDataKeys.IDE_VIEW);
+		final IdeView view = dataContext.getData(IdeView.KEY);
 		if(view == null)
 		{
 			return null;
@@ -66,12 +66,12 @@ private static Module findModule(DataContext dataContext)
 			return null;
 		}
 
-		Module resolvedModule = ModuleResolver.EP_NAME.composite().resolveModule(directory, JavaScriptFileType.INSTANCE);
+		Module resolvedModule = NewFileModuleResolver.resolveModule(directory.getProject(), directory.getVirtualFile(), JavaScriptFileType.INSTANCE);
 		if(resolvedModule != null)
 		{
 			return resolvedModule;
 		}
-		return dataContext.getData(LangDataKeys.MODULE);
+		return dataContext.getData(Module.KEY);
 	}
 
 	@Override
diff --git a/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
similarity index 79%
rename from plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
rename to plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
index 1b6a98a5..9984c2f6 100644
--- a/plugin/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -14,21 +14,18 @@
  * limitations under the License.
  */
 
-package consulo.javascript.ide.completion;
+package consulo.javascript.impl.ide.completion;
 
-import com.intellij.codeInsight.completion.CompletionContributor;
-import com.intellij.codeInsight.completion.CompletionParameters;
-import com.intellij.codeInsight.completion.CompletionResultSet;
-import com.intellij.codeInsight.completion.CompletionType;
-import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
-import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.patterns.StandardPatterns;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.ProcessingContext;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.codeInsight.completion.CompletionProvider;
+import consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender;
+import consulo.language.editor.completion.*;
+import consulo.language.editor.completion.lookup.LookupElementBuilder;
+import consulo.language.editor.completion.lookup.ParenthesesInsertHandler;
+import consulo.language.pattern.StandardPatterns;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.ProcessingContext;
 
 import javax.annotation.Nonnull;
 
@@ -36,7 +33,7 @@
  * @author VISTALL
  * @since 20.12.2015
  */
-public class JavaScriptKeywordCompletionContributor extends CompletionContributor
+public abstract class JavaScriptKeywordCompletionContributor extends CompletionContributor
 {
 	public JavaScriptKeywordCompletionContributor()
 	{
diff --git a/plugin/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/SpaceInsertHandler.java
similarity index 78%
rename from plugin/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java
rename to plugin/src/main/java/consulo/javascript/impl/ide/completion/SpaceInsertHandler.java
index cc9a5be9..cbea4f2f 100644
--- a/plugin/src/main/java/consulo/javascript/ide/completion/SpaceInsertHandler.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/SpaceInsertHandler.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package consulo.javascript.ide.completion;
+package consulo.javascript.impl.ide.completion;
 
-import com.intellij.codeInsight.TailType;
-import com.intellij.codeInsight.completion.InsertHandler;
-import com.intellij.codeInsight.completion.InsertionContext;
-import com.intellij.codeInsight.lookup.LookupElement;
+import consulo.language.editor.completion.lookup.InsertHandler;
+import consulo.language.editor.completion.lookup.InsertionContext;
+import consulo.language.editor.completion.lookup.LookupElement;
+import consulo.language.editor.completion.lookup.TailType;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/ide/navigationToolbar/JavaScriptNavBarModelExtension.java b/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
similarity index 58%
rename from plugin/src/main/java/consulo/javascript/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
rename to plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
index b2b95ab1..ac0ae4ce 100644
--- a/plugin/src/main/java/consulo/javascript/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
@@ -1,11 +1,12 @@
-package consulo.javascript.ide.navigationToolbar;
+package consulo.javascript.impl.ide.navigationToolbar;
 
-import com.intellij.ide.navigationToolbar.StructureAwareNavBarModelExtension;
-import com.intellij.lang.Language;
-import com.intellij.lang.javascript.structureView.JSStructureItemPresentation;
-import com.intellij.psi.PsiElement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.ide.navigationToolbar.StructureAwareNavBarModelExtension;
+import consulo.language.Language;
+import com.intellij.lang.javascript.impl.structureView.JSStructureItemPresentation;
+import consulo.language.psi.PsiElement;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptLanguage;
+import consulo.javascript.language.JavaScriptLanguage;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -14,6 +15,7 @@
  * @author VISTALL
  * @since 17/01/2021
  */
+@ExtensionImpl
 public class JavaScriptNavBarModelExtension extends StructureAwareNavBarModelExtension
 {
 	@Nonnull
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
similarity index 75%
rename from plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
rename to plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
index 8a462e93..09529cfb 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptFileTypeFactory.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.impl.lang;
 
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.openapi.fileTypes.FileTypeConsumer;
-import com.intellij.openapi.fileTypes.FileTypeFactory;
+import consulo.javascript.language.JavaScriptFileType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.virtualFileSystem.fileType.FileTypeConsumer;
+import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
 import javax.annotation.Nonnull;
 
@@ -26,6 +27,7 @@
  * @author VISTALL
  * @since 11.12.2015
  */
+@ExtensionImpl
 public class JavaScriptFileTypeFactory extends FileTypeFactory
 {
 	@Override
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionPusher.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
similarity index 82%
rename from plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionPusher.java
rename to plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
index 7044c188..661a185e 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionPusher.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
@@ -1,21 +1,24 @@
-package consulo.javascript.lang;
-
-import com.intellij.lang.javascript.JavaScriptFileType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.impl.FilePropertyPusher;
-import com.intellij.openapi.roots.impl.PushedFilePropertiesUpdater;
-import com.intellij.openapi.util.Conditions;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.newvfs.FileAttribute;
-import com.intellij.util.messages.MessageBus;
+package consulo.javascript.impl.lang;
+
+import consulo.javascript.language.JavaScriptFileType;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.component.messagebus.MessageBus;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
-import consulo.lang.LanguageVersion;
+import consulo.language.util.ModuleUtilCore;
+import consulo.language.version.LanguageVersion;
+import consulo.module.Module;
+import consulo.module.content.FilePropertyPusher;
+import consulo.module.content.PushedFilePropertiesUpdater;
 import consulo.module.extension.ModuleExtension;
+import consulo.module.extension.event.ModuleExtensionChangeListener;
+import consulo.project.Project;
 import consulo.util.dataholder.Key;
 import consulo.util.lang.ObjectUtil;
+import consulo.virtualFileSystem.FileAttribute;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -29,6 +32,7 @@
  * @author VISTALL
  * @since 2020-06-14
  */
+@ExtensionImpl
 public class JavaScriptLanguageVersionPusher implements FilePropertyPusher<LanguageVersion>
 {
 	private static final FileAttribute ourFileAttribute = new FileAttribute("javascript-version", 2, false);
@@ -38,7 +42,7 @@ public class JavaScriptLanguageVersionPusher implements FilePropertyPusher<Langu
 	@Override
 	public void initExtra(@Nonnull Project project, @Nonnull MessageBus messageBus)
 	{
-		project.getMessageBus().connect().subscribe(ModuleExtension.CHANGE_TOPIC, (oldExtension, newExtension) ->
+		project.getMessageBus().connect().subscribe(ModuleExtensionChangeListener.class, (oldExtension, newExtension) ->
 		{
 			if(oldExtension instanceof JavaScriptModuleExtension && newExtension instanceof JavaScriptModuleExtension)
 			{
@@ -149,7 +153,7 @@ public void persistAttribute(@Nonnull Project project, @Nonnull VirtualFile virt
 				write(newAttribute, oStream);
 			}
 
-			PushedFilePropertiesUpdater.getInstance(project).filePropertiesChanged(virtualFile, Conditions.alwaysTrue());
+			PushedFilePropertiesUpdater.getInstance(project).filePropertiesChanged(virtualFile, file -> true);
 		}
 	}
 
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
similarity index 73%
rename from plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
rename to plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
index 4b85dd2c..664aaa9c 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
@@ -14,19 +14,23 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.impl.lang;
 
-import com.intellij.lang.Language;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptFileTypeWithVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.language.psi.PsiFile;
+import consulo.language.util.ModuleUtilCore;
+import consulo.module.Module;
+import consulo.project.Project;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.virtualFileSystem.fileType.FileType;
+import consulo.language.psi.PsiElement;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.lang.LanguageVersion;
-import consulo.lang.LanguageVersionResolver;
+import consulo.language.version.LanguageVersion;
+import consulo.language.version.LanguageVersionResolver;
+import consulo.language.Language;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -35,6 +39,7 @@
  * @author VISTALL
  * @since 11.12.2015
  */
+@ExtensionImpl
 public class JavaScriptLanguageVersionResolver implements LanguageVersionResolver
 {
 	@RequiredReadAction
@@ -76,4 +81,11 @@ public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable
 
 		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
similarity index 73%
rename from plugin/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
rename to plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
index a7dd6515..dd3720e7 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptParsingDefinition.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
@@ -14,32 +14,43 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.impl.lang;
 
-import javax.annotation.Nonnull;
-
-import com.intellij.extapi.psi.ASTWrapperPsiElement;
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.LanguageUtil;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.impl.JSDocCommentImpl;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.impl.JSFileImpl;
-import com.intellij.lexer.Lexer;
-import com.intellij.psi.FileViewProvider;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.IFileElementType;
-import consulo.lang.LanguageVersionableParserDefinition;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.IFileElementType;
+import consulo.language.file.FileViewProvider;
+import consulo.language.impl.psi.ASTWrapperPsiElement;
+import consulo.language.lexer.Lexer;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.util.LanguageUtil;
+import consulo.language.version.LanguageVersionableParserDefinition;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 24.08.14
  */
+@ExtensionImpl
 public class JavaScriptParsingDefinition extends LanguageVersionableParserDefinition
 {
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+
 	@Nonnull
 	@Override
 	public IFileElementType getFileNodeType()
diff --git a/plugin/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptQuoteHandler.java
similarity index 84%
rename from plugin/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
rename to plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptQuoteHandler.java
index c2ed08c0..d25e39f4 100644
--- a/plugin/src/main/java/consulo/javascript/lang/JavaScriptQuoteHandler.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptQuoteHandler.java
@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang;
+package consulo.javascript.impl.lang;
 
-import javax.annotation.Nonnull;
-import com.intellij.codeInsight.editorActions.JavaLikeQuoteHandler;
-import com.intellij.codeInsight.editorActions.SimpleTokenSetQuoteHandler;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.editor.action.JavaLikeQuoteHandler;
+import consulo.language.editor.action.SimpleTokenSetQuoteHandler;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
similarity index 79%
rename from plugin/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
rename to plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
index 9a22f05f..785efbb5 100644
--- a/plugin/src/main/java/consulo/javascript/lang/navigation/JavaScriptClassContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.navigation;
+package consulo.javascript.impl.lang.navigation;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -23,14 +23,14 @@
 import javax.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.navigation.ChooseByNameContributor;
-import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.stubs.StubIndex;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.indexing.IdFilter;
-import consulo.javascript.lang.psi.stubs.JavaScriptIndexKeys;
+import consulo.ide.navigation.ChooseByNameContributor;
+import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.language.psi.stub.IdFilter;
+import consulo.language.psi.stub.StubIndex;
+import consulo.util.collection.ArrayUtil;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.navigation.NavigationItem;
+import consulo.project.Project;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java b/plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java
similarity index 90%
rename from plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
rename to plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java
index a74ffce6..0b7f5ec3 100644
--- a/plugin/src/main/java/consulo/javascript/lang/psi/JavaScriptSimpleType.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.psi;
+package consulo.javascript.impl.lang.psi;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.psi.PsiElement;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.psi.PsiElement;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java b/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
similarity index 92%
rename from plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
rename to plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
index 4719eb4a..0886a9f5 100644
--- a/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
@@ -1,4 +1,4 @@
-package consulo.javascript.lang.regexp.impl;
+package consulo.javascript.impl.lang.regexp.impl;
 
 import org.intellij.lang.regexp.DefaultRegExpPropertiesProvider;
 import org.intellij.lang.regexp.RegExpLanguageHost;
@@ -13,7 +13,7 @@
  * @author VISTALL
  * @since 21/12/2021
  */
-public class JavaScriptRegExpLiteralLanguageHost implements RegExpLanguageHost
+public abstract class JavaScriptRegExpLiteralLanguageHost implements RegExpLanguageHost
 {
 	@Override
 	public boolean characterNeedsEscaping(char c)
diff --git a/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java b/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
similarity index 78%
rename from plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
rename to plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
index 4e12f79d..3459a89f 100644
--- a/plugin/src/main/java/consulo/javascript/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package consulo.javascript.lang.regexp.impl;
+package consulo.javascript.impl.lang.regexp.impl;
 
-import com.intellij.lang.injection.MultiHostInjector;
-import com.intellij.lang.injection.MultiHostRegistrar;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiLanguageInjectionHost;
+import consulo.document.util.TextRange;
+import consulo.language.inject.MultiHostRegistrar;
+import consulo.language.psi.PsiElement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl;
+import consulo.language.inject.MultiHostInjector;
+import consulo.language.psi.PsiLanguageInjectionHost;
 import org.intellij.lang.regexp.RegExpLanguage;
 
 import javax.annotation.Nonnull;
@@ -31,7 +31,7 @@
  * @author VISTALL
  * @since 11.12.2015
  */
-public class JavaScriptRegexpMultiHostInjector implements MultiHostInjector
+public abstract class JavaScriptRegexpMultiHostInjector implements MultiHostInjector
 {
 	@Override
 	@RequiredReadAction
diff --git a/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
similarity index 85%
rename from plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
rename to plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
index fca7bfd2..f0b7aea0 100644
--- a/plugin/src/main/java/consulo/javascript/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
@@ -15,15 +15,17 @@
  * limitations under the License.
  */
 
-package consulo.javascript.psi.impl.reference;
+package consulo.javascript.impl.psi.impl.reference;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReference;
 import consulo.annotation.access.RequiredReadAction;
-import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
+import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/module-info.java b/plugin/src/main/java/module-info.java
new file mode 100644
index 00000000..12daf867
--- /dev/null
+++ b/plugin/src/main/java/module-info.java
@@ -0,0 +1,53 @@
+/**
+ * @author VISTALL
+ * @since 23-Aug-22
+ */
+open module consulo.javascript
+{
+	requires transitive consulo.javascript.base.api;
+	requires transitive consulo.javascript.base.impl;
+
+	requires consulo.language.editor.impl;
+
+	requires com.intellij.xml;
+	requires static com.intellij.regexp;
+
+	// TODO remove in future
+	requires java.desktop;
+
+	exports com.intellij.javascript;
+	exports com.intellij.javascript.manipulators;
+	exports com.intellij.lang.javascript.impl;
+	exports com.intellij.lang.javascript.impl.findUsages;
+	exports com.intellij.lang.javascript.impl.flex;
+	exports com.intellij.lang.javascript.impl.flex.importer;
+	exports com.intellij.lang.javascript.impl.folding;
+	exports com.intellij.lang.javascript.impl.formatter;
+	exports com.intellij.lang.javascript.impl.formatter.blocks;
+	exports com.intellij.lang.javascript.impl.generation;
+	exports com.intellij.lang.javascript.impl.highlighting;
+	exports com.intellij.lang.javascript.impl.index.predefined;
+	exports com.intellij.lang.javascript.impl.inspections;
+	exports com.intellij.lang.javascript.impl.navigation;
+	exports com.intellij.lang.javascript.impl.refactoring;
+	exports com.intellij.lang.javascript.impl.refactoring.extractMethod;
+	exports com.intellij.lang.javascript.impl.refactoring.introduceConstant;
+	exports com.intellij.lang.javascript.impl.refactoring.introduceField;
+	exports com.intellij.lang.javascript.impl.refactoring.introduceVariable;
+	exports com.intellij.lang.javascript.impl.search;
+	exports com.intellij.lang.javascript.impl.structureView;
+	exports com.intellij.lang.javascript.impl.surroundWith;
+	exports consulo.javascript.impl;
+	exports consulo.javascript.impl.copyright;
+	exports consulo.javascript.impl.findUsages;
+	exports consulo.javascript.impl.formatter;
+	exports consulo.javascript.impl.ide.actions;
+	exports consulo.javascript.impl.ide.completion;
+	exports consulo.javascript.impl.ide.navigationToolbar;
+	exports consulo.javascript.impl.lang;
+	exports consulo.javascript.impl.lang.navigation;
+	exports consulo.javascript.impl.lang.psi;
+	exports consulo.javascript.impl.lang.regexp.impl;
+	exports consulo.javascript.impl.psi.impl.reference;
+	exports com.intellij.lang.javascript.impl.validation;
+}
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/ecma4.xml b/plugin/src/main/resources/META-INF/ecma4.xml
index 5b5c439a..3a2830bd 100644
--- a/plugin/src/main/resources/META-INF/ecma4.xml
+++ b/plugin/src/main/resources/META-INF/ecma4.xml
@@ -16,6 +16,6 @@
 
 <consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript4JavaScriptVersion" />
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript4.lang.EcmaScript4JavaScriptVersion" />
 	</extensions>
 </consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/ecma6.xml b/plugin/src/main/resources/META-INF/ecma6.xml
index ac25ac91..f8b07f3f 100644
--- a/plugin/src/main/resources/META-INF/ecma6.xml
+++ b/plugin/src/main/resources/META-INF/ecma6.xml
@@ -16,19 +16,19 @@
 
 <consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="consulo.javascript.lang.EcmaScriptFileTypeFactory"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript6JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript7JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript8JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript9JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript10JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript11JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.EcmaScript12JavaScriptVersion"/>
+		<fileTypeFactory implementation="consulo.javascript.ecmascript.lang.EcmaScriptFileTypeFactory"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript6JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript7JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript8JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript9JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript10JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript11JavaScriptVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript12JavaScriptVersion"/>
 	</extensions>
 
 	<extensions defaultExtensionNs="consulo.javascript">
-		<quickFixFactory key="ECMASCRIPT_6" implementationClass="consulo.javascript.ide.codeInsight.EcmaScript6QuickFixFactory"/>
+		<quickFixFactory key="ECMASCRIPT_6" implementationClass="consulo.javascript.ecmascript.codeInsight.EcmaScript6QuickFixFactory"/>
 
-		<keywordCompletionExtender implementation="consulo.javascript.ecmascript6.completion.EcmaScript6KeywordCompletionExtender" />
+		<keywordCompletionExtender implementation="consulo.javascript.ecmascript.completion.EcmaScript6KeywordCompletionExtender" />
 	</extensions>
 </consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/json.xml b/plugin/src/main/resources/META-INF/json.xml
index fa16abfd..8b205d59 100644
--- a/plugin/src/main/resources/META-INF/json.xml
+++ b/plugin/src/main/resources/META-INF/json.xml
@@ -31,7 +31,6 @@
 		<projectService serviceImplementation="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementService"/>
 		<projectService serviceImplementation="consulo.json.jom.JomManager"/>
 
-		<completion.contributor language="JavaScript" implementationClass="consulo.json.validation.completion.JsonCompletionContributor"/>
 
 		<quoteHandler fileType="JSON" className="onsulo.javascript.lang.JavaScriptQuoteHandler"/>
 
diff --git a/plugin/src/main/resources/META-INF/jsx.xml b/plugin/src/main/resources/META-INF/jsx.xml
index 13a01cf5..7c6ea70e 100644
--- a/plugin/src/main/resources/META-INF/jsx.xml
+++ b/plugin/src/main/resources/META-INF/jsx.xml
@@ -1,18 +1,2 @@
 <consulo-plugin>
-	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="consulo.javascript.jsx.language.JSXFileTypeFactory"/>
-
-		<psi.referenceContributor language="JavaScript" implementation="consulo.javascript.jsx.language.psi.impl.JSXmlTagReferenceContributor"/>
-
-		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.impl.JSXmlLiteralExpressionImpl" implementationClass="consulo.javascript.jsx.language.psi.impl.JSXXmlTagManipulator"
-								 order="first"/>
-
-		<createFromTemplateHandler implementation="consulo.javascript.jsx.fileTemplate.JSXCreateFromTemplateHandler" />
-
-		<fileTypeFactory implementation="consulo.javascript.jsx.JSXFileTypeFactory" />
-
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.jsx.language.JSXJavaScriptVersion"/>
-
-		<textEditorHighlightingPassFactory implementation="consulo.javascript.jsx.codeInsight.daemon.impl.tagTreeHighlighting.JSXTagTreeHighlightingPassFactory"/>
-	</extensions>
 </consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index e417e6fa..91a61623 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -22,7 +22,7 @@
 	<vendor>JetBrains &amp; consulo.io</vendor>
 	<resource-bundle>messages.JavaScriptBundle</resource-bundle>
 	<depends>com.intellij.xml</depends>
-	<depends config-file="regexp.xml" optional="true">com.intellij.regexp</depends>
+	<depends optional="true">com.intellij.regexp</depends>
 	<tags>
 		<tag>custom.language</tag>
 	</tags>
@@ -36,7 +36,7 @@
 	<import path="/META-INF/jsx.xml"/>
 
 	<actions>
-		<action id="JavaScript.File" class="consulo.javascript.ide.actions.JavaScriptCreateFileAction">
+		<action id="JavaScript.File" class="consulo.javascript.impl.ide.actions.JavaScriptCreateFileAction">
 			<add-to-group group-id="NewGroup1" anchor="after" relative-to-action="NewClass"/>
 		</action>
 	</actions>
@@ -44,124 +44,96 @@
 	<extensions defaultExtensionNs="com.intellij">
 		<internalFileTemplate name="JavaScriptFile"/>
 
-		<applicationService serviceInterface="consulo.javascript.lang.StandardJavaScriptVersions" serviceImplementation="consulo.javascript.lang.StandardJavaScriptVersionsImpl"/>
+		<applicationService serviceInterface="consulo.javascript.language.StandardJavaScriptVersions" serviceImplementation="consulo.javascript.lang.StandardJavaScriptVersionsImpl"/>
 
-		<lang.versionResolver language="JavaScript" implementationClass="consulo.javascript.lang.JavaScriptLanguageVersionResolver"/>
 
 		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript15LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript16LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript17LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript18LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript185LanguageVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.javascript16.lang.JavaScript16LanguageVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.javascript17.lang.JavaScript17LanguageVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.javascript18.lang.JavaScript18LanguageVersion"/>
+		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.javascript18.lang.JavaScript185LanguageVersion"/>
 
-		<copyright.updater filetype="JavaScript" implementationClass="consulo.javascript.copyright.UpdateJavaScriptFileCopyrightProvider"/>
 
-		<colorSettingsPage implementation="com.intellij.lang.javascript.highlighting.JavaScriptColorsAndFontsPage"/>
+		<gotoClassContributor implementation="consulo.javascript.impl.lang.navigation.JavaScriptClassContributor"/>
+		<gotoSymbolContributor implementation="com.intellij.lang.javascript.impl.navigation.JavaScriptSymbolContributor"/>
 
-		<gotoClassContributor implementation="consulo.javascript.lang.navigation.JavaScriptClassContributor"/>
-		<gotoSymbolContributor implementation="com.intellij.lang.javascript.navigation.JavaScriptSymbolContributor"/>
 
-		<iconDescriptorUpdater implementation="consulo.javascript.ide.JavaScriptIconDescriptorUpdater"/>
-
-		<fileTypeFactory implementation="consulo.javascript.lang.JavaScriptFileTypeFactory"/>
-
-		<highlightVisitor implementation="com.intellij.lang.javascript.highlighting.JavaScriptHighlightVisitor"/>
-
-		<lang.parserDefinition language="JavaScript" implementationClass="consulo.javascript.lang.JavaScriptParsingDefinition"/>
-
-		<annotator language="JavaScript" implementationClass="com.intellij.lang.javascript.validation.JSAnnotatingVisitor"/>
-		<readWriteAccessDetector implementation="com.intellij.lang.javascript.findUsages.JSReadWriteAccessDetector"/>
+		<annotator language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.validation.JSAnnotatingVisitor"/>
+		<readWriteAccessDetector implementation="com.intellij.lang.javascript.impl.findUsages.JSReadWriteAccessDetector"/>
 		<lang.refactoringSupport language="JavaScript"
-								 implementationClass="com.intellij.lang.javascript.refactoring.JavascriptRefactoringSupportProvider"/>
-		<lang.formatter language="JavaScript" implementationClass="com.intellij.lang.javascript.formatter.JavascriptFormattingModelBuilder"/>
+								 implementationClass="com.intellij.lang.javascript.impl.refactoring.JavascriptRefactoringSupportProvider"/>
 		<lang.documentationProvider language="JavaScript" implementationClass="com.intellij.javascript.documentation.JSDocumentationProvider"/>
 
-		<lang.namesValidator language="JavaScript" implementationClass="com.intellij.lang.javascript.refactoring.BasicJavascriptNamesValidator"/>
+		<lang.namesValidator language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.refactoring.BasicJavascriptNamesValidator"/>
 
 		<lang.surroundDescriptor language="JavaScript"
-								 implementationClass="com.intellij.lang.javascript.surroundWith.JSExpressionSurroundDescriptor"/>
+								 implementationClass="com.intellij.lang.javascript.impl.surroundWith.JSExpressionSurroundDescriptor"/>
 		<lang.surroundDescriptor language="JavaScript"
-								 implementationClass="com.intellij.lang.javascript.surroundWith.JSStatementsSurroundDescriptor"/>
+								 implementationClass="com.intellij.lang.javascript.impl.surroundWith.JSStatementsSurroundDescriptor"/>
 
-		<codeInsight.gotoSuper language="JavaScript" implementationClass="com.intellij.lang.javascript.navigation.JavaScriptGotoSuperHandler"/>
+		<codeInsight.gotoSuper language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.navigation.JavaScriptGotoSuperHandler"/>
 		<codeInsight.overrideMethod language="JavaScript"
-									implementationClass="com.intellij.lang.javascript.generation.JavaScriptOverrideMethodsHandler"/>
+									implementationClass="com.intellij.lang.javascript.impl.generation.JavaScriptOverrideMethodsHandler"/>
 		<codeInsight.implementMethod language="JavaScript"
-									 implementationClass="com.intellij.lang.javascript.generation.JavaScriptImplementMethodsHandler"/>
+									 implementationClass="com.intellij.lang.javascript.impl.generation.JavaScriptImplementMethodsHandler"/>
 
-		<lang.findUsagesProvider language="JavaScript" implementationClass="com.intellij.lang.javascript.findUsages.JavaScriptFindUsagesProvider"/>
+		<lang.findUsagesProvider language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.findUsages.JavaScriptFindUsagesProvider"/>
 
 		<lang.syntaxHighlighterFactory language="JavaScript"
 									   implementationClass="consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightFactory"/>
-		<lang.commenter language="JavaScript" implementationClass="com.intellij.lang.javascript.JavascriptCommenter"/>
+		<lang.commenter language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.JavascriptCommenter"/>
 
-		<lang.braceMatcher language="JavaScript" implementationClass="com.intellij.lang.javascript.highlighting.JSBraceMatcher"/>
+		<lang.braceMatcher language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.highlighting.JSBraceMatcher"/>
 
-		<lang.foldingBuilder language="JavaScript" implementationClass="com.intellij.lang.javascript.folding.JavaScriptFoldingBuilder"/>
+		<lang.foldingBuilder language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.folding.JavaScriptFoldingBuilder"/>
 		<lang.psiStructureViewFactory language="JavaScript"
-									  implementationClass="com.intellij.lang.javascript.structureView.JSStructureViewBuilderFactory"/>
+									  implementationClass="com.intellij.lang.javascript.impl.structureView.JSStructureViewBuilderFactory"/>
 
 		<codeInsight.parameterInfo language="JavaScript" implementationClass="com.intellij.javascript.JSParameterInfoHandler"/>
-		<fileStructureGroupRuleProvider implementation="com.intellij.lang.javascript.findUsages.JavaScriptClassGroupRuleProvider"/>
-		<fileStructureGroupRuleProvider implementation="com.intellij.lang.javascript.findUsages.JavaScriptFunctionGroupRuleProvider"/>
+		<fileStructureGroupRuleProvider implementation="com.intellij.lang.javascript.impl.findUsages.JavaScriptClassGroupRuleProvider"/>
+		<fileStructureGroupRuleProvider implementation="com.intellij.lang.javascript.impl.findUsages.JavaScriptFunctionGroupRuleProvider"/>
 
-		<stubIndex implementation="com.intellij.lang.javascript.psi.stubs.JSNameIndex"/>
-		<stubIndex implementation="consulo.javascript.psi.stubs.index.JavaScriptClassNameIndex"/>
-		<stubIndex implementation="com.intellij.lang.javascript.psi.stubs.JSQualifiedElementIndex"/>
-		<stubIndex implementation="com.intellij.lang.javascript.psi.stubs.JSSuperClassIndex"/>
-		<stubIndex implementation="com.intellij.lang.javascript.psi.stubs.JSImplementedInterfacesIndex"/>
+		<stubIndex implementation="consulo.javascript.language.psi.stub.JSNameIndex"/>
+		<stubIndex implementation="consulo.javascript.impl.language.psi.stub.JavaScriptClassNameIndex"/>
+		<stubIndex implementation="consulo.javascript.language.psi.stub.JSQualifiedElementIndex"/>
+		<stubIndex implementation="consulo.javascript.language.psi.stub.JSSuperClassIndex"/>
+		<stubIndex implementation="consulo.javascript.language.psi.stub.JSImplementedInterfacesIndex"/>
 
-		<fileTypeIndentOptionsProvider implementation="com.intellij.lang.javascript.formatter.JavaScriptIndentOptionsProvider"/>
-		<codeStyleSettingsProvider implementation="com.intellij.lang.javascript.formatter.JSCodeStyleSettingsProvider"/>
-		<langCodeStyleSettingsProvider implementation="consulo.javascript.formatter.JavaScriptLanguageCodeStyleSettingsProvider"/>
-		<liveTemplateContext implementation="com.intellij.lang.javascript.JavaScriptCodeContextType"/>
+		<fileTypeIndentOptionsProvider implementation="com.intellij.lang.javascript.impl.formatter.JavaScriptIndentOptionsProvider"/>
+		<codeStyleSettingsProvider implementation="com.intellij.lang.javascript.impl.formatter.JSCodeStyleSettingsProvider"/>
+		<langCodeStyleSettingsProvider implementation="consulo.javascript.impl.formatter.JavaScriptLanguageCodeStyleSettingsProvider"/>
+		<liveTemplateContext implementation="com.intellij.lang.javascript.impl.JavaScriptCodeContextType"/>
 
 		<codeInsight.lineMarkerProvider language="JavaScript"
-										implementationClass="com.intellij.lang.javascript.highlighting.JavaScriptLineMarkerProvider"/>
-		<gotoTargetRendererProvider implementation="com.intellij.lang.javascript.search.JSGotoTargetRendererProvider"/>
+										implementationClass="com.intellij.lang.javascript.impl.highlighting.JavaScriptLineMarkerProvider"/>
+		<gotoTargetRendererProvider implementation="com.intellij.lang.javascript.impl.search.JSGotoTargetRendererProvider"/>
 		<definitionsScopedSearch implementation="com.intellij.lang.javascript.search.JSDefinitionsSearchExecutor"/>
-		<referencesSearch implementation="com.intellij.lang.javascript.search.JSReferencesSearchExecutor"/>
+		<referencesSearch implementation="com.intellij.lang.javascript.impl.search.JSReferencesSearchExecutor"/>
 		<declarationRangeHandler key="com.intellij.lang.javascript.psi.JSNamedElement"
-								 implementationClass="com.intellij.lang.javascript.search.JSDeclarationRangeHandler"/>
+								 implementationClass="com.intellij.lang.javascript.impl.search.JSDeclarationRangeHandler"/>
 		<multiHostInjector forClass="com.intellij.psi.xml.XmlText" implementationClass="com.intellij.lang.javascript.JSLanguageInjector"/>
 		<multiHostInjector forClass="com.intellij.psi.xml.XmlAttributeValue" implementationClass="com.intellij.lang.javascript.JSLanguageInjector"/>
 		<stubElementTypeHolder class="com.intellij.lang.javascript.JSElementTypes"/>
 
-		<lang.importOptimizer language="XML" implementationClass="com.intellij.lang.javascript.flex.ECMAScriptImportOptimizer"/>
-		<lang.smartEnterProcessor language="JavaScript" implementationClass="com.intellij.lang.javascript.JSSmartEnterProcessor"/>
 
-		<lang.implementationTextSelectioner language="JavaScript" implementationClass="com.intellij.javascript.JSImplementationTextSelectioner"/>
 		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.impl.JSIncludeDirectiveImpl"
 								 implementationClass="com.intellij.javascript.manipulators.JSIncludeDirectiveManipulator"/>
 		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.JSAttributeNameValuePair"
 								 implementationClass="com.intellij.javascript.manipulators.JSAttributeNameValuePairManipulator"/>
-		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.JSDocTag"
-								 implementationClass="com.intellij.javascript.manipulators.JSDocTagManipulator"/>
 
-		<lang.fileViewProviderFactory language="JavaScript" implementationClass="consulo.javascript.lang.viewProvider.JSFileViewProviderFactory" />
 
-		<completion.contributor language="JavaScript" implementationClass="consulo.javascript.ide.completion.JavaScriptKeywordCompletionContributor"/>
+		<lang.fileViewProviderFactory language="JavaScript" implementationClass="consulo.javascript.lang.viewProvider.JSFileViewProviderFactory"/>
+
+		<completion.contributor language="JavaScript" implementationClass="consulo.javascript.impl.ide.completion.JavaScriptKeywordCompletionContributor"/>
 
-		<completion.confidence language="JavaScript" implementationClass="com.intellij.codeInsight.completion.SkipAutopopupInStrings"/>
+		<completion.confidence language="JavaScript" implementationClass="consulo.language.editor.completion.SkipAutopopupInStrings"/>
 
-		<quoteHandler fileType="JavaScript" className="consulo.javascript.lang.JavaScriptQuoteHandler"/>
+		<quoteHandler fileType="JavaScript" className="consulo.javascript.impl.lang.JavaScriptQuoteHandler"/>
 
 		<liveTemplateMacro implementation="com.intellij.javascript.JSClassNameMacro"/>
 		<liveTemplateMacro implementation="com.intellij.javascript.JSMethodNameMacro"/>
 
-		<inspectionToolProvider implementation="com.intellij.lang.javascript.inspections.JSInspectionToolProvider"/>
-		<inspectionToolProvider implementation="com.sixrr.inspectjs.InspectionJSPlugin" />
-
-		<filePropertyPusher implementation="consulo.javascript.lang.JavaScriptLanguageVersionPusher" />
-
-		<targetElementUtilEx implementation="com.intellij.lang.javascript.JavaScriptTargetElementUtilEx"/>
-
-		<findUsagesHandlerFactory implementation="consulo.javascript.findUsages.JavaScriptFindUsagesHandlerFactory"/>
-
-		<navbar implementation="consulo.javascript.ide.navigationToolbar.JavaScriptNavBarModelExtension" />
 
-		<sdkType implementation="consulo.javascript.client.module.sdk.ClientJavaScriptSdkType"/>
-		<predefinedBundlesProvider implementation="consulo.javascript.client.module.sdk.ClientJavaScriptPredefinedBundlesProvider"/>
 		<moduleExtensionProvider key="client-javascript"
 								 icon="consulo.javascript.JavaScriptIconGroup@javascript"
 								 name="JavaScript (Client)"
@@ -169,14 +141,12 @@
 								 immutableClass="consulo.javascript.client.module.extension.ClientJavaScriptModuleExtension"
 								 mutableClass="consulo.javascript.client.module.extension.ClientJavaScriptMutableModuleExtension"/>
 
-		<xdebugger.breakpointType implementation="consulo.javascript.debugger.JavaScriptLineBreakpointType"/>
-		<xdebugger.lineBreakpointTypeResolver filetype="JavaScript" implementationClass="consulo.javascript.debugger.JavaScriptLineBreakpointTypeResolver"/>
 	</extensions>
 
 	<extensionPoints>
 		<extensionPoint name="indexer" interface="consulo.javascript.index.JavaScriptIndexer"/>
 
-		<extensionPoint name="keywordCompletionExtender" interface="consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender" />
+		<extensionPoint name="keywordCompletionExtender" interface="consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender"/>
 
 		<extensionPoint name="resolveHelper" interface="com.intellij.lang.javascript.flex.JSResolveHelper"/>
 		<extensionPoint name="classInheritorsProvider" interface="com.intellij.lang.javascript.search.JSClassInheritorsProvider"/>
@@ -189,27 +159,27 @@
 	</extensionPoints>
 
 	<extensions defaultExtensionNs="consulo.javascript">
-		<propertyNameReferenceProvider implementation="consulo.javascript.psi.impl.reference.DefaultJSPropertyNameReferenceProvider" id="default"/>
+		<propertyNameReferenceProvider implementation="consulo.javascript.impl.psi.impl.reference.DefaultJSPropertyNameReferenceProvider" id="default"/>
 	</extensions>
 
 	<actions>
-		<action id="Generate.GetAccessor.Actionscript" class="com.intellij.lang.javascript.generation.JavaScriptGenerateGetAccessorAction"
+		<action id="Generate.GetAccessor.Actionscript" class="com.intellij.lang.javascript.impl.generation.JavaScriptGenerateGetAccessorAction"
 				text="Getter">
 			<add-to-group anchor="last" group-id="GenerateGroup"/>
 		</action>
-		<action id="Generate.SetAccessor.Actionscript" class="com.intellij.lang.javascript.generation.JavaScriptGenerateSetAccessorAction"
+		<action id="Generate.SetAccessor.Actionscript" class="com.intellij.lang.javascript.impl.generation.JavaScriptGenerateSetAccessorAction"
 				text="Setter">
 			<add-to-group anchor="last" group-id="GenerateGroup"/>
 		</action>
-		<action id="Generate.GetSetAccessor.Actionscript" class="com.intellij.lang.javascript.generation.JavaScriptGenerateGetSetAccessorAction"
+		<action id="Generate.GetSetAccessor.Actionscript" class="com.intellij.lang.javascript.impl.generation.JavaScriptGenerateGetSetAccessorAction"
 				text="Getter and Setter">
 			<add-to-group anchor="last" group-id="GenerateGroup"/>
 		</action>
-		<action id="Generate.Constructor.Actionscript" class="com.intellij.lang.javascript.generation.JavaScriptGenerateConstructorAction"
+		<action id="Generate.Constructor.Actionscript" class="com.intellij.lang.javascript.impl.generation.JavaScriptGenerateConstructorAction"
 				text="Constructor">
 			<add-to-group anchor="last" group-id="GenerateGroup"/>
 		</action>
-		<action id="Generate.ToString.Actionscript" class="com.intellij.lang.javascript.generation.JavaScriptGenerateToStringAction"
+		<action id="Generate.ToString.Actionscript" class="com.intellij.lang.javascript.impl.generation.JavaScriptGenerateToStringAction"
 				text="toString() member function">
 			<add-to-group anchor="last" group-id="GenerateGroup"/>
 		</action>
diff --git a/plugin/src/main/resources/META-INF/regexp.xml b/plugin/src/main/resources/META-INF/regexp.xml
index 4cd18c5e..3bbaa614 100644
--- a/plugin/src/main/resources/META-INF/regexp.xml
+++ b/plugin/src/main/resources/META-INF/regexp.xml
@@ -16,10 +16,10 @@
 
 <consulo-plugin>
 	<extensions defaultExtensionNs="com.intellij">
-		<multiHostInjector forClass="com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl" implementationClass="consulo.javascript.lang.regexp.impl.JavaScriptRegexpMultiHostInjector"/>
+		<multiHostInjector forClass="com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl" implementationClass="consulo.javascript.impl.lang.regexp.impl.JavaScriptRegexpMultiHostInjector"/>
 	</extensions>
 
 	<extensions defaultExtensionNs="com.intellij.regexp">
-		<languageHost forClass="consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl" implementationClass="consulo.javascript.lang.regexp.impl.JavaScriptRegExpLiteralLanguageHost"/>
+		<languageHost forClass="consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl" implementationClass="consulo.javascript.impl.lang.regexp.impl.JavaScriptRegExpLiteralLanguageHost"/>
 	</extensions>
 </consulo-plugin>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 827a3611..8f1e47d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,11 +17,23 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>16</source>
+					<target>16</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.managment</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -38,7 +50,7 @@
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript.parent</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/web-browser-impl/pom.xml b/web-browser-impl/pom.xml
index 0e00cb41..76e3376e 100644
--- a/web-browser-impl/pom.xml
+++ b/web-browser-impl/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>consulo.plugin</groupId>
 	<artifactId>consulo.javascript-web.browser.impl</artifactId>
-	<version>2-SNAPSHOT</version>
+	<version>3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<repositories>
@@ -46,12 +46,5 @@
 			<artifactId>consulo.javascript-base.impl</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>consulo-lang-impl-testing</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index 2f20409b..c957f371 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -1,41 +1,38 @@
 package consulo.javascript.client.module.extension;
 
-import javax.annotation.Nonnull;
-
-import org.jdom.Element;
-
-import javax.annotation.Nullable;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.projectRoots.SdkTable;
-import com.intellij.openapi.projectRoots.SdkType;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.content.bundle.Sdk;
+import consulo.content.bundle.SdkTable;
+import consulo.content.bundle.SdkType;
 import consulo.javascript.client.module.sdk.ClientJavaScriptSdkType;
-import consulo.javascript.lang.StandardJavaScriptVersions;
+import consulo.javascript.language.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
-import consulo.lang.LanguageVersion;
+import consulo.language.util.ModuleUtilCore;
+import consulo.language.version.LanguageVersion;
+import consulo.module.Module;
+import consulo.module.content.layer.ModuleRootLayer;
+import consulo.module.content.layer.extension.ModuleExtensionBase;
+import consulo.module.content.layer.extension.SdkModuleInheritableNamedPointerImpl;
 import consulo.module.extension.ModuleInheritableNamedPointer;
-import consulo.module.extension.impl.ModuleExtensionImpl;
-import consulo.module.extension.impl.ModuleInheritableNamedPointerImpl;
-import consulo.roots.ModuleRootLayer;
-import consulo.roots.impl.ModuleRootLayerImpl;
-import consulo.util.pointers.NamedPointer;
+import org.jdom.Element;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
  * @since 29.06.14
  */
-public class ClientJavaScriptModuleExtension extends ModuleExtensionImpl<ClientJavaScriptModuleExtension> implements JavaScriptModuleExtension<ClientJavaScriptModuleExtension>
+public class ClientJavaScriptModuleExtension extends ModuleExtensionBase<ClientJavaScriptModuleExtension> implements JavaScriptModuleExtension<ClientJavaScriptModuleExtension>
 {
-	private ModuleInheritableNamedPointerImpl<Sdk> myPointer;
+	private SdkModuleInheritableNamedPointerImpl myPointer;
 
 	protected LanguageVersion myLanguageVersion = StandardJavaScriptVersions.getInstance().getDefaultVersion();
 
 	public ClientJavaScriptModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootLayer)
 	{
 		super(id, rootLayer);
-		myPointer = new ModuleInheritableNamedPointerImpl<Sdk>(rootLayer, id)
+		myPointer = new SdkModuleInheritableNamedPointerImpl(rootLayer, id)
 		{
 			@Nullable
 			@Override
@@ -60,13 +57,6 @@ public Sdk getItemFromModule(@Nonnull Module module)
 				}
 				return extension.getSdk();
 			}
-
-			@Nonnull
-			@Override
-			public NamedPointer<Sdk> getPointer(@Nonnull ModuleRootLayer moduleRootLayer, @Nonnull String name)
-			{
-				return ((ModuleRootLayerImpl)moduleRootLayer).getRootModel().getConfigurationAccessor().getSdkPointer(name);
-			}
 		};
 
 		Sdk sdkByType = SdkTable.getInstance().findPredefinedSdkByType(ClientJavaScriptSdkType.getInstance());
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index bbedf25a..b06b1750 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -16,16 +16,15 @@
 
 package consulo.javascript.client.module.extension;
 
-import com.intellij.openapi.ui.ComboBox;
-import com.intellij.openapi.ui.LabeledComponent;
-import com.intellij.openapi.ui.VerticalFlowLayout;
-import com.intellij.ui.CollectionComboBoxModel;
-import com.intellij.ui.ColoredListCellRenderer;
+import consulo.language.version.LanguageVersion;
+import consulo.ui.ex.awt.*;
+import consulo.ui.ex.awt.CollectionComboBoxModel;
+import consulo.ui.ex.awt.ColoredListCellRenderer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import consulo.javascript.lang.JavaScriptLanguageVersion;
-import consulo.javascript.lang.StandardJavaScriptVersions;
+import consulo.javascript.language.JavaScriptLanguageVersion;
+import consulo.javascript.language.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
-import consulo.lang.LanguageVersion;
+import consulo.ui.ex.awt.LabeledComponent;
 
 import javax.annotation.Nonnull;
 import javax.swing.*;
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index 1bcbf87e..88eca5df 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -1,21 +1,21 @@
 package consulo.javascript.client.module.extension;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.swing.*;
-
-import com.intellij.openapi.projectRoots.Sdk;
+import consulo.content.bundle.Sdk;
 import consulo.disposer.Disposable;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
-import consulo.lang.LanguageVersion;
+import consulo.language.version.LanguageVersion;
+import consulo.module.content.layer.ModuleRootLayer;
 import consulo.module.extension.MutableModuleInheritableNamedPointer;
 import consulo.module.extension.swing.SwingMutableModuleExtension;
-import consulo.roots.ModuleRootLayer;
 import consulo.ui.Component;
 import consulo.ui.Label;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.layout.VerticalLayout;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.swing.*;
+
 /**
  * @author VISTALL
  * @since 29.06.14
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index 82e57793..b1627237 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -1,33 +1,29 @@
 package consulo.javascript.client.module.sdk;
 
-import com.intellij.ide.plugins.PluginManager;
-import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.projectRoots.SdkModificator;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VirtualFile;
-import consulo.bundle.PredefinedBundlesProvider;
-import consulo.roots.types.BinariesOrderRootType;
-import consulo.roots.types.SourcesOrderRootType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.container.plugin.PluginManager;
+import consulo.content.base.BinariesOrderRootType;
+import consulo.content.base.SourcesOrderRootType;
+import consulo.content.bundle.PredefinedBundlesProvider;
+import consulo.content.bundle.Sdk;
+import consulo.content.bundle.SdkModificator;
+import consulo.virtualFileSystem.LocalFileSystem;
+import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
  * @author VISTALL
  * @since 29.06.14
  */
+@ExtensionImpl
 public class ClientJavaScriptPredefinedBundlesProvider extends PredefinedBundlesProvider
 {
 	public static final String ANY_JAVASCRIPT_SDK = "JavaScript SDK (Any Browser)";
 
-	private Map<String, String> ourMapping = new HashMap<String, String>()
-	{
-		{
-			put("clientAny", ANY_JAVASCRIPT_SDK);
-		}
-	};
+	private Map<String, String> ourMapping = Map.of("clientAny", ANY_JAVASCRIPT_SDK);
 
 	@Override
 	public void createBundles(@Nonnull Context context)
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index 64b49c43..96a286b9 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -1,25 +1,27 @@
 package consulo.javascript.client.module.sdk;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.intellij.openapi.projectRoots.SdkType;
-import com.intellij.openapi.roots.OrderRootType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.content.OrderRootType;
+import consulo.content.base.BinariesOrderRootType;
+import consulo.content.base.SourcesOrderRootType;
+import consulo.content.bundle.SdkType;
 import consulo.javascript.icon.JavaScriptIconGroup;
-import consulo.roots.types.BinariesOrderRootType;
-import consulo.roots.types.SourcesOrderRootType;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author VISTALL
  * @since 29.06.14
  */
+@ExtensionImpl
 public class ClientJavaScriptSdkType extends SdkType
 {
 	@Nonnull
 	public static ClientJavaScriptSdkType getInstance()
 	{
-		return EP_NAME.findExtension(ClientJavaScriptSdkType.class);
+		return EP_NAME.findExtensionOrFail(ClientJavaScriptSdkType.class);
 	}
 
 	public ClientJavaScriptSdkType()
@@ -43,7 +45,7 @@ public boolean isRootTypeApplicable(OrderRootType type)
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIconGroup.javaScript();
+		return JavaScriptIconGroup.javascript();
 	}
 
 	@Override

From 33508a3eb64434bb62233627dfacd1d3e7a38abb Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 29 Aug 2022 16:10:02 +0300
Subject: [PATCH 161/340] more migration to Consulo 3 API

---
 base-api/pom.xml                              |   2 +-
 .../JavaScriptKeywordCompletionExtender.java  |   5 +-
 .../javascript/index/JavaScriptIndexer.java   |   5 +-
 .../language/StandardJavaScriptVersions.java  |   3 +
 .../stub/JSImplementedInterfacesIndex.java    |   2 +
 .../language/psi/stub/JSNameIndex.java        |   6 +-
 .../psi/stub/JSQualifiedElementIndex.java     |   7 +-
 .../language/psi/stub/JSSuperClassIndex.java  |   7 +-
 .../flex.png                                  | Bin
 base-impl/pom.xml                             |   8 --
 .../JSDocumentationProvider.java              |  14 +-
 .../lang/javascript/JSElementTypes.java       |  46 +++---
 .../lang/javascript/JSLanguageInjector.java   |   1 -
 .../lang/javascript/JSStubElementTypes.java   |  53 +++++++
 .../JavaScriptStubElementHolder.java          |  32 +++++
 .../XmlAttributeValueJSInjector.java          |  22 +++
 .../lang/javascript/XmlTextJSInjector.java    |  22 +++
 .../lang/javascript/flex/JSResolveHelper.java |   7 +-
 .../search/JSClassInheritorsProvider.java     |   9 +-
 .../JavaScriptQuickFixFactory.java            |   3 +
 .../JavaScriptSyntaxHighlightFactory.java     |  13 +-
 .../language}/JavaScriptQuoteHandler.java     |  16 ++-
 .../psi/stub/JavaScriptClassNameIndex.java    |   2 +
 .../lang/JavaScript15LanguageVersion.java     |   2 +
 .../lang/StandardJavaScriptVersionsImpl.java  |   2 +
 .../JSFileViewProviderFactory.java            |  14 +-
 base-impl/src/main/java/module-info.java      |   1 +
 debugger/debugger-impl/pom.xml                |   2 +-
 .../debugger}/JSDebuggerSupportUtils.java     |   4 +-
 .../JavaScriptLineBreakpointType.java         |   1 -
 .../src/main/java/module-info.java            |  19 +++
 debugger/v8-debugger-impl/pom.xml             |   2 +-
 .../debug/{ => v8}/V8BaseDebugProcess.java    |   2 +-
 .../debug/{ => v8}/V8BaseVariableValue.java   |  23 +--
 .../debug/{ => v8}/V8DebugEventListener.java  |   2 +-
 .../run/debug/{ => v8}/V8DebugProcess.java    |   2 +-
 .../run/debug/{ => v8}/V8ExecutionStack.java  |  11 +-
 .../run/debug/{ => v8}/V8ScriptUtil.java      |   2 +-
 .../run/debug/{ => v8}/V8StackFrame.java      |  25 ++--
 .../run/debug/{ => v8}/V8SuspendContext.java  |   6 +-
 .../run/debug/{ => v8}/V8VariableValue.java   |  13 +-
 .../run/debug/{ => v8}/V8WatchValue.java      |  10 +-
 .../src/main/java/module-info.java            |  12 ++
 inspections/pom.xml                           |   2 +-
 inspections/src/main/java/module-info.java    |  15 ++
 intentions/pom.xml                            |   2 +-
 intentions/src/main/java/module-info.java     |  13 ++
 .../JavaScriptIntentionBundle_fr.properties   |  52 -------
 lang-version-impl/actionscript-impl/pom.xml   |  12 --
 .../ActionScriptFileTypeFactory.java          |   6 +-
 .../lang/ActionScriptLanguageVersion.java     |  12 +-
 lang-version-impl/ecmascript-impl/pom.xml     |  16 +--
 .../EcmaScript6QuickFixFactory.java           |   2 +
 .../EcmaScript6KeywordCompletionExtender.java |   2 +
 .../lang/EcmaScript10JavaScriptVersion.java   |   2 +
 .../lang/EcmaScript11JavaScriptVersion.java   |   2 +
 .../lang/EcmaScript12JavaScriptVersion.java   |   2 +
 .../lang/EcmaScript6JavaScriptVersion.java    |   2 +
 .../lang/EcmaScript7JavaScriptVersion.java    |   2 +
 .../lang/EcmaScript8JavaScriptVersion.java    |   2 +
 .../lang/EcmaScript9JavaScriptVersion.java    |   2 +
 .../lang/EcmaScriptFileTypeFactory.java       |   2 +
 .../javascript/jsx/JSXFileTypeFactory.java    |  22 ---
 .../JSXTagTreeHighlightingPassFactory.java    |   4 +-
 .../src/main/java/module-info.java            |   5 +-
 lang-version-impl/ecmascript4-impl/pom.xml    |  13 +-
 .../lang/EcmaScript4JavaScriptVersion.java    |   2 +
 lang-version-impl/javascript16-impl/pom.xml   |   2 +-
 .../lang/JavaScript16LanguageVersion.java     |   2 +
 lang-version-impl/javascript17-impl/pom.xml   |   2 +-
 .../lang/JavaScript17LanguageVersion.java     |   2 +
 lang-version-impl/javascript18-impl/pom.xml   |   2 +-
 .../lang/JavaScript185LanguageVersion.java    |   2 +
 .../lang/JavaScript18LanguageVersion.java     |   2 +
 .../json-javascript-impl/pom.xml              |   2 +-
 .../consulo/json/JsonFileTypeFactory.java     |   5 +-
 .../consulo/json/jom/JomFileDescriptor.java   |  11 +-
 .../json/jom/JomIconDescriptorUpdater.java    |   6 +-
 .../java/consulo/json/jom/JomManager.java     |  16 ++-
 .../JomModeAsJsonFileDescriptorProvider.java  |  23 ++-
 .../json/lang/JsonJavaScriptVersion.java      |   2 +
 .../consulo/json/lang/JsonQuoteHandler.java   |  23 +++
 .../JsonFileDescriptorProvider.java           |  11 +-
 ...therPsiElementJsonDescriptionProvider.java |   9 +-
 ...escriptionByAnotherPsiElementProvider.java |   6 +-
 ...DescriptionByAnotherPsiElementService.java |  17 +--
 .../PropertyValidationInspection.java         |  24 +++-
 .../JsonPropertyNameReferenceProvider.java    |  13 +-
 .../src/main/java/module-info.java            |  24 ++++
 lang-version-impl/typescript-impl/pom.xml     |   8 +-
 .../typescript/TypeScriptFileTypeFactory.java |   5 +-
 .../version/TypeScriptLanguageVersion.java    |   2 +
 .../src/main/java/module-info.java            |  12 ++
 plugin/pom.xml                                |   2 +-
 .../intellij/javascript/JSClassNameMacro.java |  20 +--
 .../javascript/JSMethodNameMacro.java         |   7 +-
 .../javascript/JSParameterInfoHandler.java    |  13 +-
 .../JSAttributeNameValuePairManipulator.java  |  13 +-
 .../JSIncludeDirectiveManipulator.java        |  13 +-
 .../impl/JavaScriptCodeContextType.java       |   2 +
 .../findUsages/JSReadWriteAccessDetector.java |   4 +-
 .../JavaScriptClassGroupRuleProvider.java     |   8 +-
 .../JavaScriptFindUsagesProvider.java         |  21 +--
 .../JavaScriptFunctionGroupRuleProvider.java  |   8 +-
 .../folding/JavaScriptFoldingBuilder.java     |  13 +-
 .../JSCodeStyleSettingsProvider.java          |   2 +
 .../JavaScriptIndentOptionsProvider.java      |   2 +
 .../JavaScriptImplementMethodsHandler.java    |   5 +-
 .../JavaScriptOverrideMethodsHandler.java     |   5 +-
 .../impl/highlighting/JSBraceMatcher.java     |  12 +-
 .../JavaScriptLineMarkerProvider.java         |  17 ++-
 .../JavaScriptGotoSuperHandler.java           |  17 ++-
 .../JavaScriptSymbolContributor.java          |  41 +++---
 .../BasicJavascriptNamesValidator.java        |  15 +-
 .../JavascriptRefactoringSupportProvider.java |  22 ++-
 .../search/JSDeclarationRangeHandler.java     |  19 ++-
 .../search/JSDefinitionsSearchExecutor.java   |   6 +-
 .../search/JSGotoTargetRendererProvider.java  |   4 +-
 .../search/JSReferencesSearchExecutor.java    |  16 ++-
 .../JSStructureViewBuilderFactory.java        |  13 +-
 .../JSExpressionSurroundDescriptor.java       |  15 +-
 .../JSStatementsSurroundDescriptor.java       |  14 +-
 .../impl/validation/JSAnnotatorFactory.java   |  32 +++++
 ...riptLanguageCodeStyleSettingsProvider.java |   2 +
 .../JavaScriptFileTemplateContributor.java    |  19 +++
 ...avaScriptKeywordCompletionContributor.java |  13 +-
 .../JavaScriptSkipAutopopupInStrings.java     |  23 +++
 .../JavaScriptClassContributor.java           |  48 ++++---
 .../JavaScriptRegExpLiteralLanguageHost.java  |  12 +-
 .../JavaScriptRegexpMultiHostInjector.java    |  11 +-
 ...efaultJSPropertyNameReferenceProvider.java |   2 +
 .../main/resources/META-INF/actionscript.xml  |  22 ---
 plugin/src/main/resources/META-INF/ecma4.xml  |  21 ---
 plugin/src/main/resources/META-INF/ecma6.xml  |  34 -----
 plugin/src/main/resources/META-INF/json.xml   |  53 -------
 plugin/src/main/resources/META-INF/jsx.xml    |   2 -
 plugin/src/main/resources/META-INF/plugin.xml | 131 ------------------
 plugin/src/main/resources/META-INF/regexp.xml |  25 ----
 .../main/resources/META-INF/typescript.xml    |  23 ---
 .../AnonymousFunctionJS.html                  |   0
 .../AssignmentResultUsedJS.html               |   0
 .../AssignmentToForLoopParameterJS.html       |   0
 .../AssignmentToFunctionParameterJS.html      |   0
 .../BadExpressionStatementJS.html             |   0
 .../BlockStatementJS.html                     |   0
 .../BreakStatementJS.html                     |   0
 .../BreakStatementWithLabelJS.html            |   0
 .../inspectionDescriptions/CallerJS.html      |   0
 .../ChainedEqualityJS.html                    |   0
 .../ChainedFunctionCallJS.html                |   0
 .../CommaExpressionJS.html                    |   0
 .../ConditionalExpressionJS.html              |   0
 ...onalExpressionWithIdenticalBranchesJS.html |   0
 .../ConfusingFloatingPointLiteralJS.html      |   0
 .../ConfusingPlusesOrMinusesJS.html           |   0
 .../ConstantConditionalExpressionJS.html      |   0
 .../ConstantIfStatementJS.html                |   0
 .../ConstantOnLHSOfComparisonJS.html          |   0
 .../ConstantOnRHSOfComparisonJS.html          |   0
 .../ContinueOrBreakFromFinallyBlockJS.html    |   0
 .../ContinueStatementJS.html                  |   0
 .../ContinueStatementWithLabelJS.html         |   0
 .../CyclomaticComplexityJS.html               |   0
 .../DebuggerStatementJS.html                  |   0
 .../DefaultNotLastCaseInSwitchJS.html         |   0
 .../DivideByZeroJS.html                       |   0
 .../DocumentWriteJS.html                      |   0
 .../DuplicateCaseLabelJS.html                 |   0
 .../DuplicateConditionJS.html                 |   0
 .../DuplicatePropertyOnObjectJS.html          |   0
 .../DynamicallyGeneratedCodeJS.html           |   0
 .../EmptyCatchBlockJS.html                    |   0
 .../EmptyFinallyBlockJS.html                  |   0
 .../EmptyStatementBodyJS.html                 |   0
 .../EmptyTryBlockJS.html                      |   0
 .../EqualityComparisonWithCoercionJS.html     |   0
 .../ExceptionCaughtLocallyJS.html             |   0
 .../FallthroughInSwitchStatementJS.html       |   0
 .../ForLoopReplaceableByWhileJS.html          |   0
 .../ForLoopThatDoesntUseLoopVariableJS.html   |   0
 .../FunctionNamingConventionJS.html           |   0
 .../FunctionWithInconsistentReturnsJS.html    |   0
 .../FunctionWithMultipleLoopsJS.html          |   0
 .../FunctionWithMultipleReturnPointsJS.html   |   0
 .../IfStatementWithIdenticalBranchesJS.html   |   0
 .../IfStatementWithTooManyBranchesJS.html     |   0
 .../IncompatibleMaskJS.html                   |   0
 .../IncrementDecrementResultUsedJS.html       |   0
 .../InfiniteLoopJS.html                       |   0
 .../InfiniteRecursionJS.html                  |   0
 .../inspectionDescriptions/InnerHTMLJS.html   |   0
 .../LabeledStatementJS.html                   |   0
 .../LocalVariableNamingConventionJS.html      |   0
 .../LoopStatementThatDoesntLoopJS.html        |   0
 .../inspectionDescriptions/MagicNumberJS.html |   0
 .../NegatedConditionalExpressionJS.html       |   0
 .../NegatedIfStatementJS.html                 |   0
 .../NestedAssignmentJS.html                   |   0
 .../NestedConditionalExpressionJS.html        |   0
 .../NestedFunctionCallJS.html                 |   0
 .../NestedFunctionJS.html                     |   0
 .../NestedSwitchStatementJS.html              |   0
 .../NestingDepthJS.html                       |   0
 .../NonBlockStatementBodyJS.html              |   0
 .../NonShortCircuitBooleanExpressionJS.html   |   0
 .../ObjectAllocationIgnoredJS.html            |   0
 .../OctalIntegerJS.html                       |   0
 .../OverlyComplexArithmeticExpressionJS.html  |   0
 .../OverlyComplexBooleanExpressionJS.html     |   0
 .../ParameterNamingConventionJS.html          |   0
 .../ParametersPerFunctionJS.html              |   0
 .../PlatformDetectionJS.html                  |   0
 .../PointlessArithmeticExpressionJS.html      |   0
 .../PointlessBitwiseExpressionJS.html         |   0
 .../PointlessBooleanExpressionJS.html         |   0
 ...aceAssignmentWithOperatorAssignmentJS.html |   0
 .../ReservedWordUsedAsNameJS.html             |   0
 .../ReturnFromFinallyBlockJS.html             |   0
 .../ReuseOfLocalVariableJS.html               |   0
 .../ShiftOutOfRangeJS.html                    |   0
 .../SillyAssignmentJS.html                    |   0
 .../StatementsPerFunctionJS.html              |   0
 .../StringLiteralBreaksHTMLJS.html            |   0
 .../SwitchStatementWithNoDefaultBranchJS.html |   0
 .../TailRecursionJS.html                      |   0
 .../TextLabelInSwitchStatementJS.html         |   0
 ...hisExpressionReferencesGlobalObjectJS.html |   0
 .../ThreeNegationsPerFunctionJS.html          |   0
 .../ThrowFromFinallyBlockJS.html              |   0
 .../TrivialConditionalJS.html                 |   0
 .../inspectionDescriptions/TrivialIfJS.html   |   0
 .../UnnecessaryContinueJS.html                |   0
 .../UnnecessaryLabelJS.html                   |   0
 .../UnnecessaryLabelOnBreakStatementJS.html   |   0
 ...UnnecessaryLabelOnContinueStatementJS.html |   0
 .../UnnecessaryLocalVariableJS.html           |   0
 .../UnnecessaryReturnJS.html                  |   0
 .../UnreachableCodeJS.html                    |   0
 .../UnterminatedStatementJS.html              |   0
 .../UnusedCatchParameterJS.html               |   0
 .../VoidExpressionJS.html                     |   0
 .../WithStatementJS.html                      |   0
 .../XHTMLIncompatabilitiesJS.html             |   0
 pom.xml                                       |  12 --
 web-browser-impl/pom.xml                      |   2 +-
 ...ientJavaScriptModuleExtensionProvider.java |  61 ++++++++
 .../src/main/java/module-info.java            |  11 ++
 247 files changed, 1027 insertions(+), 750 deletions(-)
 rename {plugin/src/main/resources/com/intellij/lang/javascript/flex => base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup}/flex.png (100%)
 create mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
 create mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
 create mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
 create mode 100644 base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
 rename {plugin/src/main/java/consulo/javascript/impl/lang => base-impl/src/main/java/consulo/javascript/impl/language}/JavaScriptQuoteHandler.java (83%)
 rename debugger/debugger-impl/src/main/java/{com/intellij/javascript => consulo/javascript/debugger}/JSDebuggerSupportUtils.java (98%)
 create mode 100644 debugger/debugger-impl/src/main/java/module-info.java
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8BaseDebugProcess.java (99%)
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8BaseVariableValue.java (90%)
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8DebugEventListener.java (98%)
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8DebugProcess.java (97%)
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8ExecutionStack.java (97%)
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8ScriptUtil.java (98%)
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8StackFrame.java (94%)
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8SuspendContext.java (96%)
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8VariableValue.java (94%)
 rename debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/{ => v8}/V8WatchValue.java (96%)
 create mode 100644 debugger/v8-debugger-impl/src/main/java/module-info.java
 create mode 100644 inspections/src/main/java/module-info.java
 create mode 100644 intentions/src/main/java/module-info.java
 delete mode 100644 intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle_fr.properties
 delete mode 100644 lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
 create mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
 create mode 100644 lang-version-impl/json-javascript-impl/src/main/java/module-info.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/module-info.java
 create mode 100644 plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
 create mode 100644 plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
 create mode 100644 plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
 delete mode 100644 plugin/src/main/resources/META-INF/actionscript.xml
 delete mode 100644 plugin/src/main/resources/META-INF/ecma4.xml
 delete mode 100644 plugin/src/main/resources/META-INF/ecma6.xml
 delete mode 100644 plugin/src/main/resources/META-INF/json.xml
 delete mode 100644 plugin/src/main/resources/META-INF/jsx.xml
 delete mode 100644 plugin/src/main/resources/META-INF/regexp.xml
 delete mode 100644 plugin/src/main/resources/META-INF/typescript.xml
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/AnonymousFunctionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/AssignmentResultUsedJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/BadExpressionStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/BlockStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/BreakStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/BreakStatementWithLabelJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/CallerJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ChainedEqualityJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ChainedFunctionCallJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/CommaExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ConditionalExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ConstantIfStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ContinueStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/CyclomaticComplexityJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/DebuggerStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/DivideByZeroJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/DocumentWriteJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/DuplicateCaseLabelJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/DuplicateConditionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/EmptyCatchBlockJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/EmptyFinallyBlockJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/EmptyStatementBodyJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/EmptyTryBlockJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/FunctionNamingConventionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/IncompatibleMaskJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/InfiniteLoopJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/InfiniteRecursionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/InnerHTMLJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/LabeledStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/MagicNumberJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NegatedIfStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NestedAssignmentJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NestedConditionalExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NestedFunctionCallJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NestedFunctionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NestedSwitchStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NestingDepthJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NonBlockStatementBodyJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/OctalIntegerJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ParameterNamingConventionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ParametersPerFunctionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/PlatformDetectionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ShiftOutOfRangeJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/SillyAssignmentJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/StatementsPerFunctionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/TailRecursionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/TrivialConditionalJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/TrivialIfJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/UnnecessaryContinueJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/UnnecessaryLabelJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/UnnecessaryReturnJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/UnreachableCodeJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/UnterminatedStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/UnusedCatchParameterJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/VoidExpressionJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/WithStatementJS.html (100%)
 rename {inspections => plugin}/src/main/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html (100%)
 create mode 100644 web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
 create mode 100644 web-browser-impl/src/main/java/module-info.java

diff --git a/base-api/pom.xml b/base-api/pom.xml
index 475c94c3..24095d66 100644
--- a/base-api/pom.xml
+++ b/base-api/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
index ff6eeb5b..550f83a7 100644
--- a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
+++ b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
@@ -1,5 +1,7 @@
 package consulo.javascript.ide.completion;
 
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ExtensionAPI;
 import consulo.component.extension.ExtensionPointName;
 import consulo.language.editor.completion.CompletionParameters;
 import consulo.language.editor.completion.CompletionResultSet;
@@ -11,9 +13,10 @@
  * @author VISTALL
  * @since 2019-12-17
  */
+@ExtensionAPI(ComponentScope.APPLICATION)
 public interface JavaScriptKeywordCompletionExtender
 {
-	ExtensionPointName<JavaScriptKeywordCompletionExtender> EP_NAME = ExtensionPointName.create("consulo.javascript.keywordCompletionExtender");
+	ExtensionPointName<JavaScriptKeywordCompletionExtender> EP_NAME = ExtensionPointName.create(JavaScriptKeywordCompletionExtender.class);
 
 	void fillCompletion(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result);
 }
diff --git a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
index a203956a..cd99bccb 100644
--- a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
+++ b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
@@ -1,5 +1,7 @@
 package consulo.javascript.index;
 
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ExtensionAPI;
 import consulo.component.extension.ExtensionPointName;
 import consulo.javascript.psi.stubs.JSFileStub;
 import consulo.language.psi.stub.IndexSink;
@@ -9,9 +11,10 @@
  * @author VISTALL
  * @since 19.07.2015
  */
+@ExtensionAPI(ComponentScope.APPLICATION)
 public abstract class JavaScriptIndexer
 {
-	public static final ExtensionPointName<JavaScriptIndexer> EP_NAME = ExtensionPointName.create("consulo.javascript.indexer");
+	public static final ExtensionPointName<JavaScriptIndexer> EP_NAME = ExtensionPointName.create(JavaScriptIndexer.class);
 
 	public void indexFile(@Nonnull JSFileStub fileStub, @Nonnull final IndexSink sink)
 	{
diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
index cda3d985..14efc045 100644
--- a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
@@ -16,6 +16,8 @@
 
 package consulo.javascript.language;
 
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ServiceAPI;
 import consulo.ide.ServiceManager;
 
 import javax.annotation.Nonnull;
@@ -26,6 +28,7 @@
  * @author VISTALL
  * @since 11.12.2015
  */
+@ServiceAPI(ComponentScope.APPLICATION)
 public abstract class StandardJavaScriptVersions
 {
 	public static interface Marker
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
index 74766743..e28eee01 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
@@ -17,11 +17,13 @@
 package consulo.javascript.language.psi.stub;
 
 import com.intellij.lang.javascript.psi.JSReferenceList;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class JSImplementedInterfacesIndex extends StringStubIndexExtension<JSReferenceList>
 {
 	@Nonnull
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
index ef4d434f..bc1fe0b8 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
@@ -19,12 +19,14 @@
  */
 package consulo.javascript.language.psi.stub;
 
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
-import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class JSNameIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
 {
 	@Nonnull
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
index 9f5b525e..8e5b39c3 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
@@ -19,13 +19,14 @@
  */
 package consulo.javascript.language.psi.stub;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
-import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class JSQualifiedElementIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
 {
 	@Nonnull
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
index 3b5e21b1..560068e4 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
@@ -16,13 +16,14 @@
 
 package consulo.javascript.language.psi.stub;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSReferenceList;
-import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
 public class JSSuperClassIndex extends StringStubIndexExtension<JSReferenceList>
 {
 	@Nonnull
diff --git a/plugin/src/main/resources/com/intellij/lang/javascript/flex/flex.png b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/flex.png
similarity index 100%
rename from plugin/src/main/resources/com/intellij/lang/javascript/flex/flex.png
rename to base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/flex.png
diff --git a/base-impl/pom.xml b/base-impl/pom.xml
index effccd2d..1aad098f 100644
--- a/base-impl/pom.xml
+++ b/base-impl/pom.xml
@@ -44,14 +44,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>16</source>
-					<target>16</target>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 6e09d445..93502b77 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -25,9 +25,13 @@
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.ast.ASTNode;
 import consulo.language.editor.documentation.CodeDocumentationProvider;
 import consulo.language.editor.documentation.DocumentationProvider;
+import consulo.language.editor.documentation.LanguageDocumentationProvider;
 import consulo.language.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.navigation.ItemPresentation;
@@ -49,12 +53,12 @@
 import java.util.Map;
 
 /**
- * Created by IntelliJ IDEA.
  * User: Maxim.Mossienko
  * Date: Nov 4, 2005
  * Time: 5:04:28 PM
  */
-public class JSDocumentationProvider implements CodeDocumentationProvider
+@ExtensionImpl
+public class JSDocumentationProvider implements CodeDocumentationProvider, LanguageDocumentationProvider
 {
 	private DocumentationProvider cssProvider;
 	@NonNls
@@ -1148,4 +1152,10 @@ else if(element instanceof JSAttributeNameValuePair)
 	}
 
 
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 118888b4..5878b135 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -41,11 +41,9 @@
 import javax.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
  * User: max
  * Date: Jan 28, 2005
  * Time: 12:27:21 AM
- * To change this template use File | Settings | File Templates.
  */
 public interface JSElementTypes
 {
@@ -61,42 +59,30 @@ public Language getLanguage()
 		}
 	};
 	IElementType EMBEDDED_EXPRESSION = new ElementTypeAsPsiFactory("EMBEDDED_EXPRESSION", JavaScriptLanguage.INSTANCE, JSEmbeddedContentImpl::new);
-	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = new JSFunctionElementType("FUNCTION_DECLARATION")
-	{
-		@Override
-		public JSFunction createPsi(@Nonnull JSFunctionStub stub)
-		{
-			return new JSFunctionImpl(stub, this);
-		}
 
-		@Nonnull
-		@Override
-		public PsiElement createElement(@Nonnull ASTNode astNode)
-		{
-			return new JSFunctionImpl(astNode);
-		}
-	};
-	JSStubElementType<JSParameterListStub, JSParameterList> PARAMETER_LIST = new JSParameterListElementType();
+	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = JSStubElementTypes.FUNCTION_DECLARATION;
+
+	JSStubElementType<JSParameterListStub, JSParameterList> PARAMETER_LIST = JSStubElementTypes.PARAMETER_LIST;
 
-	JSStubElementType<JSParameterStub, JSParameter> FORMAL_PARAMETER = new JSParameterElementType();
+	JSStubElementType<JSParameterStub, JSParameter> FORMAL_PARAMETER = JSStubElementTypes.FORMAL_PARAMETER;
 
-	JSStubElementType<JSVariableStub, JSVariable> VARIABLE = new JSVariableElementType();
+	JSStubElementType<JSVariableStub, JSVariable> VARIABLE = JSStubElementTypes.VARIABLE;
 	IElementType ARGUMENT_LIST = new ElementTypeAsPsiFactory("ARGUMENT_LIST", JavaScriptLanguage.INSTANCE, JSArgumentListImpl::new);
 
-	JSStubElementType<JSAttributeStub, JSAttribute> ATTRIBUTE = new JSAttributeElementType();
-	JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> ATTRIBUTE_NAME_VALUE_PAIR = new JSAttributeNameValuePairType();
-	JSStubElementType<JSAttributeListStub, JSAttributeList> ATTRIBUTE_LIST = new JSAttributeListElementType();
-	JSStubElementType<JSPackageStatementStub, JSPackageStatement> PACKAGE_STATEMENT = new JSPackageStatementElementType();
+	JSStubElementType<JSAttributeStub, JSAttribute> ATTRIBUTE = JSStubElementTypes.ATTRIBUTE;
+	JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> ATTRIBUTE_NAME_VALUE_PAIR = JSStubElementTypes.ATTRIBUTE_NAME_VALUE_PAIR;
+	JSStubElementType<JSAttributeListStub, JSAttributeList> ATTRIBUTE_LIST = JSStubElementTypes.ATTRIBUTE_LIST;
+	JSStubElementType<JSPackageStatementStub, JSPackageStatement> PACKAGE_STATEMENT = JSStubElementTypes.PACKAGE_STATEMENT;
 
 	@Deprecated
 	JSStubElementType<JSImportStatementStub, JSImportStatement> ES4_IMPORT_STATEMENT = EcmaScript4ElementTypes.IMPORT_STATEMENT;
 
-	JSStubElementType<JSClassStub, JSClass> CLASS = new JSClassElementType();
-	JSStubElementType<JSReferenceListStub, JSReferenceList> EXTENDS_LIST = new JSReferenceListElementType("EXTENDS_LIST");
-	JSStubElementType<JSReferenceListStub, JSReferenceList> IMPLEMENTS_LIST = new JSReferenceListElementType("IMPLEMENTS_LIST");
-	JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective> USE_NAMESPACE_DIRECTIVE = new JSUseNamespaceDirectiveType();
-	JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> INCLUDE_DIRECTIVE = new JSIncludeDirectiveElementType();
-	JSStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration> NAMESPACE_DECLARATION = new JSNamespaceDeclarationElementType();
+	JSStubElementType<JSClassStub, JSClass> CLASS = JSStubElementTypes.CLASS;
+	JSStubElementType<JSReferenceListStub, JSReferenceList> EXTENDS_LIST = JSStubElementTypes.EXTENDS_LIST;
+	JSStubElementType<JSReferenceListStub, JSReferenceList> IMPLEMENTS_LIST = JSStubElementTypes.IMPLEMENTS_LIST;
+	JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective> USE_NAMESPACE_DIRECTIVE = JSStubElementTypes.USE_NAMESPACE_DIRECTIVE;
+	JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> INCLUDE_DIRECTIVE = JSStubElementTypes.INCLUDE_DIRECTIVE;
+	JSStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration> NAMESPACE_DECLARATION = JSStubElementTypes.NAMESPACE_DECLARATION;
 	IElementType SUPER_EXPRESSION = new ElementTypeAsPsiFactory("SUPER_EXPRESSION", JavaScriptLanguage.INSTANCE, JSSuperExpressionImpl::new);
 	IElementType GENERIC_SIGNATURE = new ElementTypeAsPsiFactory("GENERIC_SIGNATURE", JavaScriptLanguage.INSTANCE, JSGenericSignatureImpl::new);
 
@@ -107,7 +93,7 @@ public PsiElement createElement(@Nonnull ASTNode astNode)
 			JSExpressionStatementImpl::new);
 	IElementType YIELD_STATEMENT = new ElementTypeAsPsiFactory("YIELD_STATEMENT", JavaScriptLanguage.INSTANCE, JSYieldStatementImpl::new);
 	IElementType LET_STATEMENT = new ElementTypeAsPsiFactory("LET_STATEMENT", JavaScriptLanguage.INSTANCE, JSLetStatementImpl::new);
-	JSStubElementType<JSVarStatementStub, JSVarStatement> VAR_STATEMENT = new JSVarStatementElementType();
+	JSStubElementType<JSVarStatementStub, JSVarStatement> VAR_STATEMENT = JSStubElementTypes.VAR_STATEMENT;
 	IElementType EMPTY_STATEMENT = new ElementTypeAsPsiFactory("EMPTY_STATEMENT", JavaScriptLanguage.INSTANCE, JSEmptyStatementImpl::new);
 	IElementType IF_STATEMENT = new ElementTypeAsPsiFactory("IF_STATEMENT", JavaScriptLanguage.INSTANCE, JSIfStatementImpl::new);
 	IElementType CONTINUE_STATEMENT = new ElementTypeAsPsiFactory("CONTINUE_STATEMENT", JavaScriptLanguage.INSTANCE, JSContinueStatementImpl::new);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index d7d3d56c..e5380a33 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -54,7 +54,6 @@ public abstract class JSLanguageInjector implements MultiHostInjector
 	@Override
 	public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement host)
 	{
-
 		if(host instanceof XmlAttributeValue)
 		{
 			final PsiElement attribute = host.getParent();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
new file mode 100644
index 00000000..f0a5c917
--- /dev/null
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
@@ -0,0 +1,53 @@
+package com.intellij.lang.javascript;
+
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.psi.impl.JSFunctionImpl;
+import com.intellij.lang.javascript.psi.stubs.*;
+import com.intellij.lang.javascript.types.*;
+import consulo.javascript.impl.language.psi.JSStubElementType;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+public interface JSStubElementTypes
+{
+	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = new JSFunctionElementType("FUNCTION_DECLARATION")
+	{
+		@Override
+		public JSFunction createPsi(@Nonnull JSFunctionStub stub)
+		{
+			return new JSFunctionImpl(stub, this);
+		}
+
+		@Nonnull
+		@Override
+		public PsiElement createElement(@Nonnull ASTNode astNode)
+		{
+			return new JSFunctionImpl(astNode);
+		}
+	};
+	JSStubElementType<JSParameterListStub, JSParameterList> PARAMETER_LIST = new JSParameterListElementType();
+
+	JSStubElementType<JSParameterStub, JSParameter> FORMAL_PARAMETER = new JSParameterElementType();
+
+	JSStubElementType<JSVariableStub, JSVariable> VARIABLE = new JSVariableElementType();
+
+	JSStubElementType<JSAttributeStub, JSAttribute> ATTRIBUTE = new JSAttributeElementType();
+	JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> ATTRIBUTE_NAME_VALUE_PAIR = new JSAttributeNameValuePairType();
+	JSStubElementType<JSAttributeListStub, JSAttributeList> ATTRIBUTE_LIST = new JSAttributeListElementType();
+	JSStubElementType<JSPackageStatementStub, JSPackageStatement> PACKAGE_STATEMENT = new JSPackageStatementElementType();
+
+	JSStubElementType<JSClassStub, JSClass> CLASS = new JSClassElementType();
+	JSStubElementType<JSReferenceListStub, JSReferenceList> EXTENDS_LIST = new JSReferenceListElementType("EXTENDS_LIST");
+	JSStubElementType<JSReferenceListStub, JSReferenceList> IMPLEMENTS_LIST = new JSReferenceListElementType("IMPLEMENTS_LIST");
+	JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective> USE_NAMESPACE_DIRECTIVE = new JSUseNamespaceDirectiveType();
+	JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> INCLUDE_DIRECTIVE = new JSIncludeDirectiveElementType();
+	JSStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration> NAMESPACE_DECLARATION = new JSNamespaceDeclarationElementType();
+
+	JSStubElementType<JSVarStatementStub, JSVarStatement> VAR_STATEMENT = new JSVarStatementElementType();
+}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
new file mode 100644
index 00000000..abd0989b
--- /dev/null
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
@@ -0,0 +1,32 @@
+package com.intellij.lang.javascript;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.stub.ObjectStubSerializerProvider;
+import consulo.language.psi.stub.StubElementTypeHolder;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.lang.reflect.Field;
+import java.util.List;
+
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+@ExtensionImpl
+public class JavaScriptStubElementHolder extends StubElementTypeHolder<JSStubElementTypes>
+{
+	@Nullable
+	@Override
+	public String getExternalIdPrefix()
+	{
+		return "js.";
+	}
+
+	@Nonnull
+	@Override
+	public List<ObjectStubSerializerProvider> loadSerializers()
+	{
+		return allFromStaticFields(JSStubElementTypes.class, Field::get);
+	}
+}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
new file mode 100644
index 00000000..5a7d36a2
--- /dev/null
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
@@ -0,0 +1,22 @@
+package com.intellij.lang.javascript;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.xml.psi.xml.XmlAttributeValue;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+@ExtensionImpl
+public class XmlAttributeValueJSInjector extends JSLanguageInjector
+{
+	@Nonnull
+	@Override
+	public Class<? extends PsiElement> getElementClass()
+	{
+		return XmlAttributeValue.class;
+	}
+}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
new file mode 100644
index 00000000..af4f89e7
--- /dev/null
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
@@ -0,0 +1,22 @@
+package com.intellij.lang.javascript;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
+import consulo.xml.psi.xml.XmlText;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+@ExtensionImpl
+public class XmlTextJSInjector extends JSLanguageInjector
+{
+	@Nonnull
+	@Override
+	public Class<? extends PsiElement> getElementClass()
+	{
+		return XmlText.class;
+	}
+}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
index 5c82f428..359d427e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
@@ -16,6 +16,8 @@
 
 package com.intellij.lang.javascript.flex;
 
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ExtensionAPI;
 import consulo.application.util.function.Processor;
 import consulo.component.extension.ExtensionPointName;
 import consulo.language.psi.PsiElement;
@@ -33,9 +35,10 @@
  */
 @Deprecated
 @DeprecationInfo("We need this?")
+@ExtensionAPI(ComponentScope.APPLICATION)
 public interface JSResolveHelper
 {
-	ExtensionPointName<JSResolveHelper> EP_NAME = ExtensionPointName.create("consulo.javascript.resolveHelper");
+	ExtensionPointName<JSResolveHelper> EP_NAME = ExtensionPointName.create(JSResolveHelper.class);
 
 	// TODO: drop module
 	@Nullable
@@ -44,5 +47,5 @@ public interface JSResolveHelper
 	void importClass(final PsiScopeProcessor processor, final PsiNamedElement file, final String packageQualifierText);
 
 	boolean processPackage(final String packageQualifierText, String resolvedName, final Processor<VirtualFile> processor,
-			GlobalSearchScope globalSearchScope, Project project);
+						   GlobalSearchScope globalSearchScope, Project project);
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
index 577d649e..1f7cd240 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
@@ -16,16 +16,19 @@
 
 package com.intellij.lang.javascript.search;
 
-import java.util.Collection;
-
 import com.intellij.lang.javascript.psi.JSClass;
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ExtensionAPI;
 import consulo.component.extension.ExtensionPointName;
 import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.project.Project;
 
+import java.util.Collection;
+
+@ExtensionAPI(ComponentScope.APPLICATION)
 public interface JSClassInheritorsProvider
 {
-	ExtensionPointName<JSClassInheritorsProvider> EP_NAME = ExtensionPointName.create("consulo.javascript.classInheritorsProvider");
+	ExtensionPointName<JSClassInheritorsProvider> EP_NAME = ExtensionPointName.create(JSClassInheritorsProvider.class);
 
 	Collection<JSClass> getImplementingClasses(String parentName, Project project, GlobalSearchScope scope);
 
diff --git a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
index f2c1df68..b1cb00cb 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
@@ -17,6 +17,8 @@
 package consulo.javascript.ide.codeInsight;
 
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ExtensionAPI;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptLanguageVersion;
 import consulo.language.psi.PsiElement;
@@ -28,6 +30,7 @@
  * @author VISTALL
  * @since 23.02.2016
  */
+@ExtensionAPI(ComponentScope.APPLICATION)
 public abstract class JavaScriptQuickFixFactory
 {
 	private static final JavaScriptQuickFixFactory ourDefaultImpl = new JavaScriptQuickFixFactory()
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
index badb2bb9..7f49d869 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
@@ -1,6 +1,9 @@
 package consulo.javascript.ide.hightlight;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.editor.highlight.LanguageVersionableSyntaxHighlighterFactory;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.version.LanguageVersion;
@@ -11,12 +14,20 @@
  * @author VISTALL
  * @since 05.03.2015
  */
-public abstract class JavaScriptSyntaxHighlightFactory extends LanguageVersionableSyntaxHighlighterFactory
+@ExtensionImpl
+public class JavaScriptSyntaxHighlightFactory extends LanguageVersionableSyntaxHighlighterFactory
 {
 	public JavaScriptSyntaxHighlightFactory()
 	{
 	}
 
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+
 	@Nonnull
 	@Override
 	public SyntaxHighlighter getSyntaxHighlighter(@Nonnull LanguageVersion languageVersion)
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptQuoteHandler.java b/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
similarity index 83%
rename from plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptQuoteHandler.java
rename to base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
index d25e39f4..0a049df1 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptQuoteHandler.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
@@ -14,15 +14,19 @@
  * limitations under the License.
  */
 
-package consulo.javascript.impl.lang;
+package consulo.javascript.impl.language;
 
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.language.JavaScriptFileType;
 import consulo.language.ast.IElementType;
 import consulo.language.ast.TokenSet;
+import consulo.language.editor.action.FileQuoteHandler;
 import consulo.language.editor.action.JavaLikeQuoteHandler;
 import consulo.language.editor.action.SimpleTokenSetQuoteHandler;
 import consulo.language.psi.PsiElement;
+import consulo.virtualFileSystem.fileType.FileType;
 
 import javax.annotation.Nonnull;
 
@@ -30,7 +34,8 @@
  * @author VISTALL
  * @since 09.12.2015
  */
-public class JavaScriptQuoteHandler extends SimpleTokenSetQuoteHandler implements JavaLikeQuoteHandler
+@ExtensionImpl
+public class JavaScriptQuoteHandler extends SimpleTokenSetQuoteHandler implements JavaLikeQuoteHandler, FileQuoteHandler
 {
 	public JavaScriptQuoteHandler()
 	{
@@ -74,4 +79,11 @@ public boolean needParenthesesAroundConcatenation(PsiElement element)
 	{
 		return false;
 	}
+
+	@Nonnull
+	@Override
+	public FileType getFileType()
+	{
+		return JavaScriptFileType.INSTANCE;
+	}
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
index 0ad1f4bd..241ee73e 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
@@ -20,6 +20,7 @@
 package consulo.javascript.impl.language.psi.stub;
 
 import com.intellij.lang.javascript.psi.JSClass;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
@@ -29,6 +30,7 @@
 /**
  * @author VISTALL
  */
+@ExtensionImpl
 public class JavaScriptClassNameIndex extends StringStubIndexExtension<JSClass>
 {
 	@Nonnull
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
index 9757da90..a525c6f5 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -1,5 +1,6 @@
 package consulo.javascript.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScript15Lexer;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -14,6 +15,7 @@
  * @author VISTALL
  * @since 05.03.2015
  */
+@ExtensionImpl
 public class JavaScript15LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
 	private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript15Lexer();
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index d3ce9d5d..124aaa3a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -1,5 +1,6 @@
 package consulo.javascript.lang;
 
+import consulo.annotation.component.ServiceImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.language.JavaScriptLanguageVersion;
 import consulo.javascript.language.StandardJavaScriptVersions;
@@ -17,6 +18,7 @@
  * @since 23-Dec-17
  */
 @Singleton
+@ServiceImpl
 public class StandardJavaScriptVersionsImpl extends StandardJavaScriptVersions
 {
 	@Nonnull
diff --git a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
index ddc2d655..2a6b3d23 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
@@ -1,9 +1,11 @@
 package consulo.javascript.lang.viewProvider;
 
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
 import consulo.language.file.FileViewProvider;
-import consulo.language.file.FileViewProviderFactory;
+import consulo.language.file.LanguageFileViewProviderFactory;
 import consulo.language.impl.file.SingleRootFileViewProvider;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiManager;
@@ -16,7 +18,8 @@
  * @author VISTALL
  * @since 2019-12-17
  */
-public class JSFileViewProviderFactory implements FileViewProviderFactory
+@ExtensionImpl
+public class JSFileViewProviderFactory implements LanguageFileViewProviderFactory
 {
 	private static class JSFileViewProvider extends SingleRootFileViewProvider
 	{
@@ -43,4 +46,11 @@ public FileViewProvider createFileViewProvider(@Nonnull VirtualFile virtualFile,
 	{
 		return new JSFileViewProvider(psiManager, virtualFile, eventSystemEnabled, language);
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/base-impl/src/main/java/module-info.java b/base-impl/src/main/java/module-info.java
index c4375519..4d9ef8fc 100644
--- a/base-impl/src/main/java/module-info.java
+++ b/base-impl/src/main/java/module-info.java
@@ -38,5 +38,6 @@
 	exports consulo.javascript.lang.viewProvider;
 	exports consulo.javascript.impl.language.psi;
 	exports consulo.javascript.impl.language.psi.stub;
+	exports consulo.javascript.impl.language;
 	exports consulo.javascript.types;
 }
\ No newline at end of file
diff --git a/debugger/debugger-impl/pom.xml b/debugger/debugger-impl/pom.xml
index 66d58b72..d61b7628 100644
--- a/debugger/debugger-impl/pom.xml
+++ b/debugger/debugger-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
similarity index 98%
rename from debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
rename to debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
index a01cd311..c4a87c6f 100644
--- a/debugger/debugger-impl/src/main/java/com/intellij/javascript/JSDebuggerSupportUtils.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.javascript;
+package consulo.javascript.debugger;
 
 import consulo.javascript.impl.language.psi.JSElementFactory;
 import com.intellij.lang.javascript.psi.JSFile;
@@ -36,11 +36,9 @@
 import java.util.List;
 
 /**
- * Created by IntelliJ IDEA.
  * User: Maxim.Mossienko
  * Date: Feb 27, 2008
  * Time: 7:45:08 PM
- * To change this template use File | Settings | File Templates.
  */
 public class JSDebuggerSupportUtils
 {
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
index 383fb6ee..315e4ec2 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
@@ -16,7 +16,6 @@
 
 package consulo.javascript.debugger;
 
-import com.intellij.javascript.JSDebuggerSupportUtils;
 import consulo.javascript.language.JavaScriptFileType;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.document.Document;
diff --git a/debugger/debugger-impl/src/main/java/module-info.java b/debugger/debugger-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..0f05d371
--- /dev/null
+++ b/debugger/debugger-impl/src/main/java/module-info.java
@@ -0,0 +1,19 @@
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+module consulo.javascript.debugger.impl
+{
+	// TODO temp dep
+	requires java.desktop;
+
+	requires transitive consulo.javascript.base.api;
+
+	requires transitive consulo.javascript.base.impl;
+
+	requires transitive consulo.execution.debug.api;
+
+	requires com.intellij.xml;
+
+	exports consulo.javascript.debugger;
+}
\ No newline at end of file
diff --git a/debugger/v8-debugger-impl/pom.xml b/debugger/v8-debugger-impl/pom.xml
index 76640963..219d1689 100644
--- a/debugger/v8-debugger-impl/pom.xml
+++ b/debugger/v8-debugger-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
similarity index 99%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
index a324132c..99054a12 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseDebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
+package consulo.javascript.run.debug.v8;
 
 import consulo.application.AllIcons;
 import consulo.application.Application;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
similarity index 90%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
index 207db310..e6f63763 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8BaseVariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
@@ -14,26 +14,17 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
+package consulo.javascript.run.debug.v8;
 
-import java.util.Collection;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import consulo.execution.debug.frame.XNamedValue;
-import org.chromium.sdk.JsArray;
-import org.chromium.sdk.JsEvaluateContext;
-import org.chromium.sdk.JsObject;
-import org.chromium.sdk.JsValue;
-import org.chromium.sdk.JsVariable;
 import consulo.application.AllIcons;
-import consulo.execution.debug.frame.XCompositeNode;
-import consulo.execution.debug.frame.XValueChildrenList;
-import consulo.execution.debug.frame.XValueNode;
-import consulo.execution.debug.frame.XValuePlace;
+import consulo.execution.debug.frame.*;
 import consulo.execution.debug.frame.presentation.XValuePresentation;
 import consulo.ui.image.Image;
+import org.chromium.sdk.*;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Collection;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugEventListener.java
similarity index 98%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugEventListener.java
index 4085d166..139328e7 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugEventListener.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugEventListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
+package consulo.javascript.run.debug.v8;
 
 import consulo.execution.debug.XBreakpointManager;
 import consulo.execution.debug.XDebuggerManager;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
similarity index 97%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
index a342c56e..da20fe73 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
+package consulo.javascript.run.debug.v8;
 
 import consulo.execution.ExecutionResult;
 import consulo.process.ExecutionException;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
similarity index 97%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
index b766eeab..42918a8a 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ExecutionStack.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
@@ -14,18 +14,17 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
+package consulo.javascript.run.debug.v8;
 
 import consulo.execution.debug.frame.XExecutionStack;
 import consulo.execution.debug.frame.XStackFrame;
 import org.chromium.sdk.CallFrame;
 import org.chromium.sdk.DebugContext;
 
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author VISTALL
  * @since 20.03.14
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
similarity index 98%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
index 598c18be..c1efd9c4 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8ScriptUtil.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
+package consulo.javascript.run.debug.v8;
 
 import consulo.util.lang.Comparing;
 import consulo.virtualFileSystem.LocalFileSystem;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
similarity index 94%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
index 99fd9fbd..22ef8552 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8StackFrame.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
@@ -14,28 +14,23 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
-
-import java.util.Collections;
-import java.util.List;
+package consulo.javascript.run.debug.v8;
 
+import consulo.application.AllIcons;
 import consulo.execution.debug.XDebuggerUtil;
 import consulo.execution.debug.XSourcePosition;
 import consulo.execution.debug.evaluation.XDebuggerEvaluator;
-import org.chromium.sdk.CallFrame;
-import org.chromium.sdk.JsEvaluateContext;
-import org.chromium.sdk.JsScope;
-import org.chromium.sdk.JsValue;
-import org.chromium.sdk.JsVariable;
-import org.chromium.sdk.TextStreamPosition;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import consulo.application.AllIcons;
-import consulo.ui.ex.ColoredTextContainer;
-import consulo.ui.ex.SimpleTextAttributes;
 import consulo.execution.debug.frame.XCompositeNode;
 import consulo.execution.debug.frame.XStackFrame;
 import consulo.execution.debug.frame.XValueChildrenList;
+import consulo.ui.ex.ColoredTextContainer;
+import consulo.ui.ex.SimpleTextAttributes;
+import org.chromium.sdk.*;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
similarity index 96%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
index a6866998..0495ac67 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8SuspendContext.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
+package consulo.javascript.run.debug.v8;
 
 import consulo.execution.debug.frame.XExecutionStack;
+import consulo.execution.debug.frame.XSuspendContext;
 import org.chromium.sdk.DebugContext;
-import javax.annotation.Nullable;
 
-import consulo.execution.debug.frame.XSuspendContext;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
similarity index 94%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
index 943af1f1..9d7af7ce 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8VariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
@@ -14,19 +14,14 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
-
-import javax.annotation.Nonnull;
+package consulo.javascript.run.debug.v8;
 
+import consulo.execution.debug.frame.XValueChildrenList;
 import consulo.execution.debug.frame.XValueModifier;
-import org.chromium.sdk.JsDeclarativeVariable;
-import org.chromium.sdk.JsEvaluateContext;
-import org.chromium.sdk.JsFunction;
-import org.chromium.sdk.JsValue;
-import org.chromium.sdk.JsVariable;
+import org.chromium.sdk.*;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.execution.debug.frame.XValueChildrenList;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
similarity index 96%
rename from debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
rename to debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
index b9480371..55a32d83 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/V8WatchValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package consulo.javascript.run.debug;
+package consulo.javascript.run.debug.v8;
 
-import javax.annotation.Nonnull;
-
-import org.chromium.sdk.JsEvaluateContext;
-import org.chromium.sdk.JsValue;
 import consulo.application.AllIcons;
 import consulo.ui.image.Image;
+import org.chromium.sdk.JsEvaluateContext;
+import org.chromium.sdk.JsValue;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/module-info.java b/debugger/v8-debugger-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..e9316074
--- /dev/null
+++ b/debugger/v8-debugger-impl/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+module consulo.javascript.v8.debugger.impl
+{
+	requires consulo.javascript.debugger.impl;
+
+	requires lib.org.chromium.sdk;
+
+	exports consulo.javascript.run.debug.v8;
+}
\ No newline at end of file
diff --git a/inspections/pom.xml b/inspections/pom.xml
index 5cf50c15..1942ec4b 100644
--- a/inspections/pom.xml
+++ b/inspections/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/inspections/src/main/java/module-info.java b/inspections/src/main/java/module-info.java
new file mode 100644
index 00000000..9bc114c3
--- /dev/null
+++ b/inspections/src/main/java/module-info.java
@@ -0,0 +1,15 @@
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+module consulo.javascript.inspections
+{
+	// TODO remove in future
+	requires java.desktop;
+
+	requires consulo.javascript.base.impl;
+
+	requires consulo.javascript.ecmascript.impl;
+
+	requires com.intellij.xml;
+}
\ No newline at end of file
diff --git a/intentions/pom.xml b/intentions/pom.xml
index bfe3dd59..3f3bf736 100644
--- a/intentions/pom.xml
+++ b/intentions/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/intentions/src/main/java/module-info.java b/intentions/src/main/java/module-info.java
new file mode 100644
index 00000000..b5485cce
--- /dev/null
+++ b/intentions/src/main/java/module-info.java
@@ -0,0 +1,13 @@
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+module consulo.javascript.intentions
+{
+	// TODO remove in future
+	requires java.desktop;
+
+	requires consulo.javascript.base.impl;
+
+	requires com.intellij.xml;
+}
\ No newline at end of file
diff --git a/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle_fr.properties b/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle_fr.properties
deleted file mode 100644
index 63dfec0d..00000000
--- a/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle_fr.properties
+++ /dev/null
@@ -1,52 +0,0 @@
-siplugin.JSIntentionPowerPack.description = D\u00e9finit plus de 40 nouvelles actions de type Intention JavaScript pour IntelliJ IDEA.
-plugin.test.summary                     = {0} effectu\u00e9s, {1} \u00e9chou\u00e9s ({2} d\u00fbs \u00e0 la d\u00e9tection, {3} d\u00fbs \u00e0 la correction)
-plugin.intention.untested               = Intention {0} non test\u00e9e.
-
-bool.de-morgans-law.display-name.ANDAND                          = Remplacer && par ||
-bool.de-morgans-law.display-name.OROR                            = Remplacer || par &&
-bool.flip-comparison.display-name.equals                         = Retourner {0}
-bool.flip-comparison.display-name.not-equals                     = Transformer {0} en {1}
-bool.flip-comparison.display-name.unknown                        = Retourner la comparaison
-bool.flip-conjunction.display-name                               = Echanger les termes du signe {0}
-bool.negate-comparison.display-name.equals                       = Inverser {0}
-bool.negate-comparison.display-name.not-equals                   = Inverser {0} en {1}
-bool.remove-boolean-equality.display-name                        = Simplifier {0}
-braces.add-braces.display-name                                   = Ajouter des accolades \u00e0 l''instruction ''{0}''
-braces.remove-braces.display-name                                = Supprimer les accolades de l''instruction ''{0}''
-comment.change-to-cstyle-comment.display-name                    = Remplacer par des commentaires de style C
-comment.change-to-end-of-line-comment.display-name               = Remplacer par des commentaires de fin de ligne
-comment.move-comment-to-separate-line.display-name               = D\u00e9placer le commentaire vers une ligne s\u00e9par\u00e9e
-conditional.flip-conditional.display-name                        = Inverser ?:
-conditional.flip-if.display-name                                 = Inverser le if-else
-conditional.remove-conditional.display-name                      = Simplifier ?:
-conditional.replace-conditional-with-if.display-name             = Remplacer ?: par un if-else
-constant.constant-expression.display-name                        = Calculer la valeur constante
-constant.constant-subexpression.display-name                     = Calculer la valeur constante de ''{0} {1} {2}''
-increment.extract-increment.display-name                         = Extraire ''{0}''
-initialization.merge-declaration-and-initialization.display-name = Fusionner la d\u00e9claration et l'initialisation
-initialization.split-declaration-and-initialization.display-name = S\u00e9parer la d\u00e9claration et l'initialisation
-loop.merge-parallel-for-loops.display-name                       = Fusionner les boucles 'for'
-loop.merge-parallel-for-in-loops.display-name                    = Fusionner les boucles 'for-in'
-number.convert-integer-to-decimal.display-name                   = Convertir en d\u00e9cimal
-number.convert-integer-to-hex.display-name                       = Convertir en hexa
-number.convert-integer-to-octal.display-name                     = Convertir en octal
-number.replace-multiply-with-shift.display-name                  = Remplacer ''{0}'' par ''{1}''
-number.replace-shift-with-multiply.display-name                  = Remplacer ''{0}'' par ''{1}''
-opassign.replace-with-operator-assignment.display-name           = Remplacer = par {0}=
-parenthesis.remove-unnecessary-parentheses.display-name          = Supprimer les parenth\u00e8ses inutiles
-string.double-to-single-quoted-string.display-name               = Remplacer la cha\u00eene entre guillemets par une cha\u00eene entre apostrophes
-string.join-concatenated-string-literals.display-name            = Fusionner les lit\u00e9raux cha\u00eenes de caract\u00e8res concat\u00e9n\u00e9s
-string.single-to-double-quoted-string.display-name               = Remplacer la cha\u00eene entre apostrophes par une cha\u00eene entre guillemets
-switchtoif.replace-if-with-switch.display-name                   = Remplacer le 'if' par un 'switch'
-switchtoif.replace-switch-with-if.display-name                   = Remplacer le 'switch' par un 'if'
-trivialif.merge-else-if.display-name                             = Fusionner le 'else-if'
-trivialif.merge-if-and.display-name                              = Fusionner les 'if'
-trivialif.merge-if-or.display-name                               = Fusionner les 'if'
-trivialif.merge-parallel-ifs.display-name                        = Fusionner les 'if'
-trivialif.remove-redundant-else.display-name                     = Supprimer le 'else' redondant
-trivialif.replace-if-with-conditional.display-name               = Remplacer le 'if-else' par ?:
-trivialif.simplify-if-else.display-name                          = Simplifier le 'if-else'
-trivialif.split-else-if.display-name                             = S\u00e9parer le 'else' du 'if'
-trivialif.split-if-and.display-name                              = S\u00e9parer les branches du 'if' combin\u00e9es par un AND
-trivialif.split-if-or.display-name                               = S\u00e9parer les branches du 'if' combin\u00e9es par un OR
-
diff --git a/lang-version-impl/actionscript-impl/pom.xml b/lang-version-impl/actionscript-impl/pom.xml
index 8c8f040f..92eca256 100644
--- a/lang-version-impl/actionscript-impl/pom.xml
+++ b/lang-version-impl/actionscript-impl/pom.xml
@@ -17,18 +17,6 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>16</source>
-					<target>16</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-api-provided</artifactId>
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
index 99307aed..068e7de0 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
@@ -1,14 +1,16 @@
 package consulo.actionscript;
 
-import javax.annotation.Nonnull;
-
+import consulo.annotation.component.ExtensionImpl;
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 06.04.2015
  */
+@ExtensionImpl
 public class ActionScriptFileTypeFactory extends FileTypeFactory
 {
 	@Override
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
index c1892d52..744e4aa7 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
@@ -1,20 +1,22 @@
 package consulo.actionscript.lang;
 
-import javax.annotation.Nonnull;
-
-import consulo.language.parser.PsiParser;
 import com.intellij.lang.javascript.DialectOptionHolder;
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
 import com.intellij.lang.javascript.highlighting.JSHighlighter;
-import consulo.language.lexer.Lexer;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.ecmascript4.lang.parsing.EcmaScript4Parser;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptLanguage;
-import consulo.javascript.ecmascript4.lang.parsing.EcmaScript4Parser;
+import consulo.language.lexer.Lexer;
+import consulo.language.parser.PsiParser;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 06.04.2015
  */
+@ExtensionImpl
 public class ActionScriptLanguageVersion extends BaseJavaScriptLanguageVersion
 {
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/pom.xml b/lang-version-impl/ecmascript-impl/pom.xml
index d5be10dc..10bd6993 100644
--- a/lang-version-impl/ecmascript-impl/pom.xml
+++ b/lang-version-impl/ecmascript-impl/pom.xml
@@ -55,14 +55,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>16</source>
-					<target>16</target>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -85,5 +77,13 @@
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<!--This dependency fix problem with compilation JSXTagTreeHighlightingPassFactory, due dep from XML plugin-->
+		<dependency>
+			<groupId>consulo</groupId>
+			<artifactId>consulo-ide-impl</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
index 4409c2e1..79cd0c9f 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
@@ -17,6 +17,7 @@
 package consulo.javascript.ecmascript.codeInsight;
 
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ecmascript.codeInsight.quickFixes.EcmaScript6CreateJSFunctionOrMethodFix;
 import consulo.javascript.ecmascript.lang.BaseEcmaScriptJavaScriptVersion;
 import consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory;
@@ -28,6 +29,7 @@
  * @author VISTALL
  * @since 24.02.2016
  */
+@ExtensionImpl
 public class EcmaScript6QuickFixFactory extends JavaScriptQuickFixFactory
 {
 	@Override
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
index 4752bbf5..c6b42d32 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
@@ -1,5 +1,6 @@
 package consulo.javascript.ecmascript.completion;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.completion.CompletionResultSet;
 import consulo.language.editor.completion.lookup.AddSpaceInsertHandler;
 import consulo.language.editor.completion.CompletionParameters;
@@ -13,6 +14,7 @@
  * @author VISTALL
  * @since 2019-12-17
  */
+@ExtensionImpl
 public class EcmaScript6KeywordCompletionExtender implements JavaScriptKeywordCompletionExtender
 {
 	@Override
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
index 0ea7879b..b35eff5f 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
@@ -1,5 +1,6 @@
 package consulo.javascript.ecmascript.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
@@ -8,6 +9,7 @@
  * @author VISTALL
  * @since 06/12/2021
  */
+@ExtensionImpl
 public class EcmaScript10JavaScriptVersion extends EcmaScript6JavaScriptVersion
 {
 	@Inject
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
index b58ae102..74207140 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
@@ -1,5 +1,6 @@
 package consulo.javascript.ecmascript.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptFeature;
 import jakarta.inject.Inject;
 
@@ -9,6 +10,7 @@
  * @author VISTALL
  * @since 06/12/2021
  */
+@ExtensionImpl
 public class EcmaScript11JavaScriptVersion extends EcmaScript6JavaScriptVersion
 {
 	@Inject
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
index fb0b994c..76cdf9bc 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
@@ -1,5 +1,6 @@
 package consulo.javascript.ecmascript.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import jakarta.inject.Inject;
 
@@ -9,6 +10,7 @@
  * @author VISTALL
  * @since 06/12/2021
  */
+@ExtensionImpl
 public class EcmaScript12JavaScriptVersion extends EcmaScript6JavaScriptVersion
 {
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
index 40397cf0..844dc01b 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
@@ -16,6 +16,7 @@
 
 package consulo.javascript.ecmascript.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -28,6 +29,7 @@
  * @author VISTALL
  * @since 12.12.2015
  */
+@ExtensionImpl
 public class EcmaScript6JavaScriptVersion extends BaseEcmaScriptJavaScriptVersion implements StandardJavaScriptVersions.Marker, JavaScriptVersionWithHelper
 {
 	@Nonnull
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
index 4b20885b..cd75a50f 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
@@ -1,5 +1,6 @@
 package consulo.javascript.ecmascript.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptFeature;
 import jakarta.inject.Inject;
 
@@ -9,6 +10,7 @@
  * @author VISTALL
  * @since 06/12/2021
  */
+@ExtensionImpl
 public class EcmaScript7JavaScriptVersion extends EcmaScript6JavaScriptVersion
 {
 	@Inject
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
index 8dc7c2a4..864433dd 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
@@ -1,5 +1,6 @@
 package consulo.javascript.ecmascript.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
@@ -8,6 +9,7 @@
  * @author VISTALL
  * @since 06/12/2021
  */
+@ExtensionImpl
 public class EcmaScript8JavaScriptVersion extends EcmaScript6JavaScriptVersion
 {
 	@Inject
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
index 90d5f01c..c8a80313 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
@@ -1,5 +1,6 @@
 package consulo.javascript.ecmascript.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptFeature;
 import jakarta.inject.Inject;
 
@@ -9,6 +10,7 @@
  * @author VISTALL
  * @since 06/12/2021
  */
+@ExtensionImpl
 public class EcmaScript9JavaScriptVersion extends EcmaScript6JavaScriptVersion
 {
 	@Inject
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
index 641b7f69..9e18e457 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
@@ -1,5 +1,6 @@
 package consulo.javascript.ecmascript.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
@@ -9,6 +10,7 @@
  * @author VISTALL
  * @since 05.03.2015
  */
+@ExtensionImpl
 public class EcmaScriptFileTypeFactory extends FileTypeFactory
 {
 	@Override
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
deleted file mode 100644
index d6216f2e..00000000
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/JSXFileTypeFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package consulo.javascript.jsx;
-
-import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.language.JavaScriptFileType;
-import consulo.virtualFileSystem.fileType.FileTypeConsumer;
-import consulo.virtualFileSystem.fileType.FileTypeFactory;
-
-import javax.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 2020-06-14
- */
-@ExtensionImpl
-public class JSXFileTypeFactory extends FileTypeFactory
-{
-	@Override
-	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
-	{
-		consumer.consume(JavaScriptFileType.INSTANCE, "jsx");
-	}
-}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
index 607d2bdd..0e32bf7e 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
@@ -3,7 +3,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.codeEditor.Editor;
 import consulo.codeEditor.EditorEx;
-import consulo.javascript.ecmascript.lang.EcmaScript6JavaScriptVersion;
+import consulo.javascript.jsx.language.JSXJavaScriptVersion;
 import consulo.language.editor.Pass;
 import consulo.language.editor.impl.highlight.TextEditorHighlightingPass;
 import consulo.language.editor.impl.highlight.TextEditorHighlightingPassFactory;
@@ -33,7 +33,7 @@ public TextEditorHighlightingPass createHighlightingPass(@Nonnull final PsiFile
 			return null;
 		}
 
-		if(!(editor instanceof EditorEx) || !(file.getLanguageVersion() instanceof EcmaScript6JavaScriptVersion))
+		if(!(editor instanceof EditorEx) || !(file.getLanguageVersion() instanceof JSXJavaScriptVersion))
 		{
 			return null;
 		}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/module-info.java b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
index b38add68..938bdbfb 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
@@ -5,9 +5,11 @@
 module consulo.javascript.ecmascript.impl
 {
 	requires transitive consulo.javascript.base.impl;
-	requires com.intellij.xml;
+
 	requires consulo.language.editor.impl;
 
+	requires com.intellij.xml;
+
 	exports consulo.javascript.ecmascript.codeInsight;
 	exports consulo.javascript.ecmascript.codeInsight.quickFixes;
 	exports consulo.javascript.ecmascript.completion;
@@ -16,7 +18,6 @@
 	exports consulo.javascript.ecmascript.psi;
 	exports consulo.javascript.ecmascript.psi.impl;
 	exports consulo.javascript.ecmascript.psi.impl.resolve;
-	exports consulo.javascript.jsx;
 	exports consulo.javascript.jsx.fileTemplate;
 	exports consulo.javascript.jsx.language;
 	exports consulo.javascript.jsx.language.psi.impl;
diff --git a/lang-version-impl/ecmascript4-impl/pom.xml b/lang-version-impl/ecmascript4-impl/pom.xml
index a98ef99b..85c15b93 100644
--- a/lang-version-impl/ecmascript4-impl/pom.xml
+++ b/lang-version-impl/ecmascript4-impl/pom.xml
@@ -17,18 +17,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>16</source>
-					<target>16</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+
 	<parent>
 		<groupId>consulo</groupId>
 		<artifactId>arch.ide-api-provided</artifactId>
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
index 368bdab1..169b05df 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.JavaScriptParsingFlexLexer;
 import com.intellij.lang.javascript.highlighting.JSHighlighter;
 import consulo.annotation.DeprecationInfo;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ecmascript4.lang.parsing.EcmaScript4Parser;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptFeature;
@@ -18,6 +19,7 @@
  */
 @Deprecated
 @DeprecationInfo("This language version was dropped. We keep it only for history, many options may not supported")
+@ExtensionImpl
 public class EcmaScript4JavaScriptVersion extends BaseJavaScriptLanguageVersion
 {
 	private final DialectOptionHolder myDialectOptionHolder = new DialectOptionHolder(true, false);
diff --git a/lang-version-impl/javascript16-impl/pom.xml b/lang-version-impl/javascript16-impl/pom.xml
index 101d8fbf..aa705801 100644
--- a/lang-version-impl/javascript16-impl/pom.xml
+++ b/lang-version-impl/javascript16-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
index 31292d25..a73956c6 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
@@ -16,6 +16,7 @@
 
 package consulo.javascript.javascript16.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.javascript16.lang.lexer.JavaScript16Lexer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
@@ -31,6 +32,7 @@
  * @author VISTALL
  * @since 11.12.2015
  */
+@ExtensionImpl
 public class JavaScript16LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
 	private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript16Lexer();
diff --git a/lang-version-impl/javascript17-impl/pom.xml b/lang-version-impl/javascript17-impl/pom.xml
index 7578d0aa..07a4cd2b 100644
--- a/lang-version-impl/javascript17-impl/pom.xml
+++ b/lang-version-impl/javascript17-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
index db8e57a8..349dbc1e 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
@@ -16,6 +16,7 @@
 
 package consulo.javascript.javascript17.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.javascript17.lang.lexer.JavaScript17Lexer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
@@ -31,6 +32,7 @@
  * @author VISTALL
  * @since 11.12.2015
  */
+@ExtensionImpl
 public class JavaScript17LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
 	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
diff --git a/lang-version-impl/javascript18-impl/pom.xml b/lang-version-impl/javascript18-impl/pom.xml
index 43e9f756..a56a5593 100644
--- a/lang-version-impl/javascript18-impl/pom.xml
+++ b/lang-version-impl/javascript18-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
index b4a3619e..dd9a0fba 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
@@ -16,6 +16,7 @@
 
 package consulo.javascript.javascript18.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.javascript17.lang.lexer.JavaScript17Lexer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
@@ -31,6 +32,7 @@
  * @author VISTALL
  * @since 11.12.2015
  */
+@ExtensionImpl
 public class JavaScript185LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
 	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
index e7b2622d..d43a56e2 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
@@ -16,6 +16,7 @@
 
 package consulo.javascript.javascript18.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.javascript17.lang.lexer.JavaScript17Lexer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
@@ -31,6 +32,7 @@
  * @author VISTALL
  * @since 11.12.2015
  */
+@ExtensionImpl
 public class JavaScript18LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
 {
 	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
diff --git a/lang-version-impl/json-javascript-impl/pom.xml b/lang-version-impl/json-javascript-impl/pom.xml
index d09f7c0a..02047047 100644
--- a/lang-version-impl/json-javascript-impl/pom.xml
+++ b/lang-version-impl/json-javascript-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
index b293edbb..ea9f6a79 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
@@ -1,13 +1,16 @@
 package consulo.json;
 
-import javax.annotation.Nonnull;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 05.03.2015
  */
+@ExtensionImpl
 public class JsonFileTypeFactory extends FileTypeFactory
 {
 	@Override
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
index 1104a629..ea17af09 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
@@ -16,19 +16,22 @@
 
 package consulo.json.jom;
 
-import javax.annotation.Nonnull;
-
-import consulo.language.psi.PsiFile;
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ExtensionAPI;
 import consulo.component.extension.ExtensionPointName;
+import consulo.language.psi.PsiFile;
 import consulo.ui.image.Image;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 10.11.2015
  */
+@ExtensionAPI(ComponentScope.APPLICATION)
 public abstract class JomFileDescriptor<T extends JomElement>
 {
-	public static ExtensionPointName<JomFileDescriptor> EP_NAME = new ExtensionPointName<JomFileDescriptor>("consulo.javascript.jomFileDescriptor");
+	public static ExtensionPointName<JomFileDescriptor> EP_NAME = ExtensionPointName.create(JomFileDescriptor.class);
 
 	private Class<T> myDefinitionClass;
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
index b2b07b7b..a2dbd22b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -16,18 +16,20 @@
 
 package consulo.json.jom;
 
-import javax.annotation.Nonnull;
-
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.icon.IconDescriptor;
 import consulo.language.icon.IconDescriptorUpdater;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 10.11.2015
  */
+@ExtensionImpl
 public class JomIconDescriptorUpdater implements IconDescriptorUpdater
 {
 	@RequiredReadAction
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index 8190a35d..ada3199f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -17,29 +17,33 @@
 package consulo.json.jom;
 
 import com.intellij.lang.javascript.psi.JSFile;
-import consulo.language.psi.PsiModificationTracker;
-import consulo.project.Project;
-import consulo.language.psi.PsiFile;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ServiceAPI;
+import consulo.annotation.component.ServiceImpl;
 import consulo.application.util.CachedValue;
 import consulo.application.util.CachedValueProvider;
 import consulo.application.util.CachedValuesManager;
-import consulo.annotation.access.RequiredReadAction;
 import consulo.ide.ServiceManager;
 import consulo.json.JsonFileType;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiModificationTracker;
+import consulo.project.Project;
 import consulo.util.dataholder.Key;
 import consulo.virtualFileSystem.fileType.FileType;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import jakarta.inject.Singleton;
-
 /**
  * @author VISTALL
  * @since 10.11.2015
  */
 @Singleton
+@ServiceAPI(ComponentScope.PROJECT)
+@ServiceImpl
 public class JomManager
 {
 	@Nonnull
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
index 8fee5a2e..15b30c1f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
@@ -16,20 +16,8 @@
 
 package consulo.json.jom;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.json.validation.JsonFileDescriptorProvider;
 import consulo.json.validation.NativeArray;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
@@ -37,10 +25,19 @@
 import consulo.language.psi.PsiFile;
 import consulo.util.collection.ContainerUtil;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.math.BigInteger;
+import java.util.*;
+
 /**
  * @author VISTALL
  * @since 10.11.2015
  */
+@ExtensionImpl
 public class JomModeAsJsonFileDescriptorProvider implements JsonFileDescriptorProvider
 {
 	@RequiredReadAction
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
index 94daad7e..d7a88824 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
@@ -1,5 +1,6 @@
 package consulo.json.lang;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -18,6 +19,7 @@
  * @author VISTALL
  * @since 05.03.2015
  */
+@ExtensionImpl
 public class JsonJavaScriptVersion extends BaseJavaScriptLanguageVersion
 {
 	private static final Supplier<Lexer> ourLexerFactory = JsonLexer::new;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
new file mode 100644
index 00000000..3f9a44e5
--- /dev/null
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
@@ -0,0 +1,23 @@
+package consulo.json.lang;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.impl.language.JavaScriptQuoteHandler;
+import consulo.json.JsonFileType;
+import consulo.virtualFileSystem.fileType.FileType;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+@ExtensionImpl
+public class JsonQuoteHandler extends JavaScriptQuoteHandler
+{
+	@Nonnull
+	@Override
+	public FileType getFileType()
+	{
+		return JsonFileType.INSTANCE;
+	}
+}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
index 380e8f73..73e65058 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
@@ -16,20 +16,23 @@
 
 package consulo.json.validation;
 
-import javax.annotation.Nonnull;
-
 import consulo.annotation.access.RequiredReadAction;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ExtensionAPI;
 import consulo.component.extension.ExtensionPointName;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import consulo.language.psi.PsiFile;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 10.11.2015
  */
+@ExtensionAPI(ComponentScope.APPLICATION)
 public interface JsonFileDescriptorProvider
 {
-	ExtensionPointName<JsonFileDescriptorProvider> EP_NAME = ExtensionPointName.create("consulo.javascript.jsonFileDescriptorProvider");
+	ExtensionPointName<JsonFileDescriptorProvider> EP_NAME = ExtensionPointName.create(JsonFileDescriptorProvider.class);
 
 	@RequiredReadAction
 	boolean isMyFile(@Nonnull PsiFile file);
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
index f48c8612..792e0dcf 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
@@ -16,20 +16,23 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import javax.annotation.Nonnull;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.json.validation.JsonFileDescriptorProvider;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiUtilCore;
 import consulo.util.lang.Pair;
 import consulo.virtualFileSystem.VirtualFile;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiFile;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 12.11.2015
  */
+@ExtensionImpl
 public class DescriptionByAnotherPsiElementJsonDescriptionProvider implements JsonFileDescriptorProvider
 {
 	@RequiredReadAction
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
index afdefa61..317daf99 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
@@ -16,8 +16,9 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
-import consulo.component.extension.ExtensionPointName;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ExtensionAPI;
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
@@ -30,10 +31,9 @@
  * @author VISTALL
  * @since 12.11.2015
  */
+@ExtensionAPI(ComponentScope.APPLICATION)
 public interface DescriptionByAnotherPsiElementProvider<T extends PsiElement>
 {
-	ExtensionPointName<DescriptionByAnotherPsiElementProvider<?>> EP_NAME = ExtensionPointName.create("consulo.javascript.jsonDescriptionByAnotherPsiElementProvider");
-
 	@Nonnull
 	String getId();
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index 7624b3b5..4e31d177 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -16,6 +16,9 @@
 
 package consulo.json.validation.descriptionByAnotherPsiElement;
 
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ServiceAPI;
+import consulo.annotation.component.ServiceImpl;
 import consulo.application.ApplicationManager;
 import consulo.application.util.function.Computable;
 import consulo.component.persist.PersistentStateComponent;
@@ -31,7 +34,6 @@
 import consulo.project.Project;
 import consulo.util.collection.ContainerUtil;
 import consulo.util.lang.Pair;
-import consulo.util.lang.function.Condition;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.pointer.VirtualFilePointer;
 import consulo.virtualFileSystem.pointer.VirtualFilePointerManager;
@@ -50,7 +52,9 @@
  * @since 12.11.2015
  */
 @Singleton
-@State(name = "JSONDescriptionByAnotherPsiElementService",storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
+@State(name = "JSONDescriptionByAnotherPsiElementService", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
+@ServiceAPI(ComponentScope.PROJECT)
+@ServiceImpl
 public class DescriptionByAnotherPsiElementService implements PersistentStateComponent<Element>, Disposable
 {
 	private static class Info implements Disposable
@@ -77,14 +81,7 @@ public Info(@Nonnull Project project, @Nonnull String url, @Nonnull final String
 			myProject = project;
 			myVirtualFilePointer = VirtualFilePointerManager.getInstance().create(url, this, null);
 
-			myProvider = ContainerUtil.find(DescriptionByAnotherPsiElementProvider.EP_NAME.getExtensions(), new Condition<DescriptionByAnotherPsiElementProvider<?>>()
-			{
-				@Override
-				public boolean value(DescriptionByAnotherPsiElementProvider<?> psiElementProvider)
-				{
-					return psiElementProvider.getId().equals(providerId);
-				}
-			});
+			myProvider = ContainerUtil.find(ApplicationManager.getApplication().getExtensionList(DescriptionByAnotherPsiElementProvider.class), it -> it.getId().equals(providerId));
 
 			myId = providerId;
 			myPsiElementId = psiElementId;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index 35ee83e4..3819e319 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -24,6 +24,7 @@
 import consulo.language.editor.inspection.ProblemsHolder;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
+import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
 import consulo.language.psi.PsiModificationTracker;
 import consulo.language.psi.PsiUtilCore;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -48,7 +49,7 @@
  * @author VISTALL
  * @since 10.11.2015
  */
-public abstract class PropertyValidationInspection extends LocalInspectionTool
+public class PropertyValidationInspection extends LocalInspectionTool
 {
 	@Nonnull
 	@Override
@@ -385,4 +386,25 @@ else if(o instanceof NativeArray)
 		}
 		return "null";
 	}
+
+	@Nonnull
+	@Override
+	public String getGroupDisplayName()
+	{
+		return "JSON";
+	}
+
+	@Nonnull
+	@Override
+	public String getDisplayName()
+	{
+		return "Property validation";
+	}
+
+	@Nonnull
+	@Override
+	public HighlightDisplayLevel getDefaultLevel()
+	{
+		return HighlightDisplayLevel.ERROR;
+	}
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
index 2683cb74..96b280f7 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
@@ -16,20 +16,23 @@
 
 package consulo.json.validation.psi.reference;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import com.intellij.lang.javascript.psi.JSProperty;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.json.validation.inspections.PropertyValidationInspection;
-import com.intellij.lang.javascript.psi.JSProperty;
-import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
-import consulo.language.psi.PsiReference;
 import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * @author VISTALL
  * @since 02.12.2015
  */
+@ExtensionImpl(order = "before default")
 public class JsonPropertyNameReferenceProvider implements JSPropertyNameReferenceProvider
 {
 	@RequiredReadAction
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/module-info.java b/lang-version-impl/json-javascript-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..7efd96d2
--- /dev/null
+++ b/lang-version-impl/json-javascript-impl/src/main/java/module-info.java
@@ -0,0 +1,24 @@
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+module consulo.javascript.json.javascript.impl
+{
+	// TODO remove in future
+	requires java.desktop;
+
+	requires consulo.javascript.base.impl;
+
+	exports consulo.json;
+	exports consulo.json.jom;
+	exports consulo.json.jom.proxy;
+	exports consulo.json.jom.proxy.impl;
+	exports consulo.json.lang;
+	exports consulo.json.lang.lexer;
+	exports consulo.json.validation;
+	exports consulo.json.validation.completion;
+	exports consulo.json.validation.descriptionByAnotherPsiElement;
+	exports consulo.json.validation.descriptor;
+	exports consulo.json.validation.inspections;
+	exports consulo.json.validation.psi.reference;
+}
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/pom.xml b/lang-version-impl/typescript-impl/pom.xml
index 93a0f19a..680b80d6 100644
--- a/lang-version-impl/typescript-impl/pom.xml
+++ b/lang-version-impl/typescript-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
@@ -47,12 +47,6 @@
 			<version>${project.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-javascript17.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>consulo.javascript-ecmascript.impl</artifactId>
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
index 73533e51..b529295c 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
@@ -16,14 +16,17 @@
 
 package consulo.typescript;
 
-import javax.annotation.Nonnull;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author VISTALL
  * @since 03.03.2016
  */
+@ExtensionImpl
 public class TypeScriptFileTypeFactory extends FileTypeFactory
 {
 	@Override
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
index e2fb9287..c16c9fdb 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
@@ -1,5 +1,6 @@
 package consulo.typescript.version;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ecmascript.lang.BaseEcmaScriptJavaScriptVersion;
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -10,6 +11,7 @@
  * @author VISTALL
  * @since 20-Jul-22
  */
+@ExtensionImpl
 public class TypeScriptLanguageVersion extends BaseEcmaScriptJavaScriptVersion
 {
 	@Nonnull
diff --git a/lang-version-impl/typescript-impl/src/main/java/module-info.java b/lang-version-impl/typescript-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..f74cc481
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+module consulo.javascript.typescript.impl
+{
+	requires consulo.javascript.base.impl;
+	requires consulo.javascript.ecmascript.impl;
+
+	exports consulo.typescript;
+	exports consulo.typescript.version;
+}
\ No newline at end of file
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 3ca3609d..f0e1c5c1 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
index b68a7038..7921b5fe 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
@@ -16,24 +16,26 @@
 
 package com.intellij.javascript;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSFunction;
+import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptBundle;
 import consulo.language.editor.completion.lookup.LookupElement;
-import consulo.language.editor.template.Result;
-import consulo.language.editor.template.TextResult;
-import org.jetbrains.annotations.NonNls;
 import consulo.language.editor.template.Expression;
 import consulo.language.editor.template.ExpressionContext;
+import consulo.language.editor.template.Result;
+import consulo.language.editor.template.TextResult;
 import consulo.language.editor.template.macro.Macro;
-import consulo.javascript.language.JavaScriptBundle;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import consulo.project.Project;
 import consulo.language.psi.PsiDocumentManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.project.Project;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class JSClassNameMacro extends Macro
 {
 	@Override
diff --git a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
index 8f5e2c19..9cf4300b 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
@@ -18,6 +18,7 @@
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptBundle;
 import consulo.language.editor.completion.lookup.LookupElement;
 import consulo.language.editor.template.Expression;
@@ -27,15 +28,13 @@
 import consulo.language.editor.template.macro.Macro;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 
+@ExtensionImpl
 public class JSMethodNameMacro extends Macro
 {
-
 	@Override
-	@NonNls
 	public String getName()
 	{
 		return "jsMethodName";
@@ -47,9 +46,7 @@ public String getPresentableName()
 		return JavaScriptBundle.message("js.methodname.macro.description");
 	}
 
-
 	@Override
-	@NonNls
 	public String getDefaultValue()
 	{
 		return "";
diff --git a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
index 262a72d3..b6eaf6fd 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
@@ -19,6 +19,9 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.CodeInsightBundle;
 import consulo.language.editor.completion.lookup.LookupElement;
@@ -37,7 +40,8 @@
 /**
  * @author Maxim.Mossienko
  */
-public abstract class JSParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport<JSArgumentList, JSFunction, JSExpression>
+@ExtensionImpl
+public class JSParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport<JSArgumentList, JSFunction, JSExpression>
 {
 	private static final Set<Class<?>> ourArgumentListAllowedParentClassesSet = Set.of(JSCallExpression.class);
 
@@ -327,4 +331,11 @@ public Class<JSArgumentList> getArgumentListClass()
 	{
 		return JSArgumentList.class;
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
index bc7bbb03..5ec6c534 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.javascript.manipulators;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
@@ -22,10 +23,13 @@
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.project.Project;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author peter
  */
-public abstract class JSAttributeNameValuePairManipulator extends JSAbstractElementManipulator<JSAttributeNameValuePair>
+@ExtensionImpl
+public class JSAttributeNameValuePairManipulator extends JSAbstractElementManipulator<JSAttributeNameValuePair>
 {
 	@Override
 	protected JSAttributeNameValuePair createTree(final String newText, final Project project)
@@ -34,4 +38,11 @@ protected JSAttributeNameValuePair createTree(final String newText, final Projec
 		final PsiElement element = JSChangeUtil.createStatementFromText(project, ToCreate).getPsi();
 		return ((JSClass) element).getAttributeList().getAttributes()[0].getValues()[0];
 	}
+
+	@Nonnull
+	@Override
+	public Class<JSAttributeNameValuePair> getElementClass()
+	{
+		return JSAttributeNameValuePair.class;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
index 5d1e3e84..f9a9f2da 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
@@ -17,16 +17,27 @@
 
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.impl.JSIncludeDirectiveImpl;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.project.Project;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author peter
  */
-public abstract class JSIncludeDirectiveManipulator extends JSAbstractElementManipulator<JSIncludeDirectiveImpl>
+@ExtensionImpl
+public class JSIncludeDirectiveManipulator extends JSAbstractElementManipulator<JSIncludeDirectiveImpl>
 {
 	@Override
 	protected JSIncludeDirectiveImpl createTree(final String newText, final Project project)
 	{
 		return (JSIncludeDirectiveImpl) JSChangeUtil.createStatementFromText(project, newText).getPsi();
 	}
+
+	@Nonnull
+	@Override
+	public Class<JSIncludeDirectiveImpl> getElementClass()
+	{
+		return JSIncludeDirectiveImpl.class;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
index 37645420..5f1aecc6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.language.JavaScriptFileType;
@@ -42,6 +43,7 @@
  *         Date: Apr 14, 2008
  *         Time: 6:01:09 PM
  */
+@ExtensionImpl
 public class JavaScriptCodeContextType extends TemplateContextType
 {
 	private static final String JAVA_SCRIPT = "JAVA_SCRIPT";
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
index 7ba21351..7777138a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
@@ -23,18 +23,18 @@
 import com.intellij.lang.javascript.psi.JSPostfixExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.intellij.lang.javascript.psi.JSVariable;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.highlight.ReadWriteAccessDetector;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 
 /**
- * Created by IntelliJ IDEA.
  * User: Maxim.Mossienko
  * Date: 15.04.2009
  * Time: 21:51:25
- * To change this template use File | Settings | File Templates.
  */
+@ExtensionImpl
 public class JSReadWriteAccessDetector extends ReadWriteAccessDetector
 {
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
index e81b9087..219047d9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
@@ -16,17 +16,19 @@
 
 package com.intellij.lang.javascript.impl.findUsages;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import consulo.usage.UsageGroup;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.application.AllIcons;
+import consulo.usage.UsageGroup;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  */
+@ExtensionImpl
 public class JavaScriptClassGroupRuleProvider extends JavaScriptGroupRuleProviderBase<JSClass>
 {
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
index 49f1c2d8..4b0b1ff3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
@@ -16,8 +16,11 @@
 
 package com.intellij.lang.javascript.impl.findUsages;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.cacheBuilder.WordsScanner;
 import consulo.language.findUsage.FindUsagesProvider;
 import consulo.language.psi.PsiElement;
@@ -28,13 +31,12 @@
 import javax.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
  * User: max
  * Date: Feb 14, 2005
  * Time: 6:44:02 PM
- * To change this template use File | Settings | File Templates.
  */
-public abstract class JavaScriptFindUsagesProvider implements FindUsagesProvider
+@ExtensionImpl
+public class JavaScriptFindUsagesProvider implements FindUsagesProvider
 {
 	@Override
 	public boolean canFindUsagesFor(@Nonnull PsiElement psiElement)
@@ -42,12 +44,6 @@ public boolean canFindUsagesFor(@Nonnull PsiElement psiElement)
 		return psiElement instanceof PsiNamedElement;
 	}
 
-	@Override
-	public String getHelpId(@Nonnull PsiElement psiElement)
-	{
-		return null;
-	}
-
 	@Override
 	@Nonnull
 	public String getType(@Nonnull PsiElement element)
@@ -119,4 +115,11 @@ public WordsScanner getWordsScanner()
 	{
 		return new JSWordsScanner();
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
index a90e3857..c2bfac95 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
@@ -16,16 +16,18 @@
 
 package com.intellij.lang.javascript.impl.findUsages;
 
-import javax.annotation.Nonnull;
-
-import consulo.application.AllIcons;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSNamedElement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.application.AllIcons;
 import consulo.usage.UsageGroup;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author Maxim.Mossienko
  */
+@ExtensionImpl
 public class JavaScriptFunctionGroupRuleProvider extends JavaScriptGroupRuleProviderBase<JSFunction>
 {
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
index b82d9674..8a5040d7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
@@ -16,6 +16,9 @@
 
 package com.intellij.lang.javascript.impl.folding;
 
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.editor.folding.CodeFoldingSettings;
 import consulo.language.ast.ASTNode;
 import consulo.language.editor.folding.FoldingDescriptor;
@@ -40,7 +43,8 @@
 /**
  * @author max
  */
-public abstract class JavaScriptFoldingBuilder implements FoldingBuilder
+@ExtensionImpl
+public class JavaScriptFoldingBuilder implements FoldingBuilder
 {
 	@RequiredReadAction
 	@Nonnull
@@ -208,4 +212,11 @@ public boolean isCollapsedByDefault(ASTNode node)
 		}
 		return CodeFoldingSettings.getInstance().COLLAPSE_DOC_COMMENTS && node.getElementType() == JSTokenTypes.DOC_COMMENT;
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
index 409fb722..24abcc8d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.formatter;
 
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.configurable.Configurable;
 import consulo.javascript.impl.formatter.JavaScriptCodeStyleConfigurable;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -33,6 +34,7 @@
  *         Date: Mar 12, 2008
  *         Time: 10:32:33 PM
  */
+@ExtensionImpl
 public class JSCodeStyleSettingsProvider extends CodeStyleSettingsProvider
 {
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
index b0057855..de4f6919 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.impl.formatter;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptFileType;
 import consulo.language.codeStyle.CodeStyleSettings;
 import consulo.language.codeStyle.setting.FileTypeIndentOptionsProvider;
@@ -27,6 +28,7 @@
 /**
  * @author yole
  */
+@ExtensionImpl
 public class JavaScriptIndentOptionsProvider implements FileTypeIndentOptionsProvider
 {
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
index 58fa4a6f..d4c5c491 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
@@ -25,10 +25,13 @@
 import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
 import com.intellij.lang.javascript.impl.validation.ImplementMethodsFix;
 import com.intellij.lang.javascript.impl.validation.ImplementedMethodProcessor;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.generation.ImplementMethodHandler;
 
 import java.util.Collection;
 
-public abstract class JavaScriptImplementMethodsHandler extends BaseJSGenerateHandler
+@ExtensionImpl
+public class JavaScriptImplementMethodsHandler extends BaseJSGenerateHandler implements ImplementMethodHandler
 {
 	@Override
 	protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
index 0dc50306..94919eee 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
@@ -25,6 +25,8 @@
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
 import com.intellij.lang.javascript.impl.validation.ImplementedMethodProcessor;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.generation.OverrideMethodHandler;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
 
@@ -32,7 +34,8 @@
 import java.util.Map;
 import java.util.function.Function;
 
-public abstract class JavaScriptOverrideMethodsHandler extends BaseJSGenerateHandler
+@ExtensionImpl
+public class JavaScriptOverrideMethodsHandler extends BaseJSGenerateHandler implements OverrideMethodHandler
 {
 	@Override
 	protected String getTitleKey()
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
index a6cba674..e57866ee 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
@@ -17,10 +17,12 @@
 package com.intellij.lang.javascript.impl.highlighting;
 
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.BracePair;
+import consulo.language.Language;
 import consulo.language.PairedBraceMatcher;
 import consulo.language.ast.IElementType;
-import consulo.language.psi.PsiFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -30,7 +32,8 @@
  * Date: Feb 2, 2005
  * Time: 12:10:44 PM
  */
-public abstract class JSBraceMatcher implements PairedBraceMatcher
+@ExtensionImpl
+public class JSBraceMatcher implements PairedBraceMatcher
 {
 	private static final BracePair[] PAIRS = new BracePair[]{
 			new BracePair(JSTokenTypes.LPAR, JSTokenTypes.RPAR, false),
@@ -52,9 +55,10 @@ public boolean isPairedBracesAllowedBeforeType(@Nonnull final IElementType lbrac
 				tokenType;
 	}
 
+	@Nonnull
 	@Override
-	public int getCodeConstructStart(final PsiFile file, int openingBraceOffset)
+	public Language getLanguage()
 	{
-		return openingBraceOffset;
+		return JavaScriptLanguage.INSTANCE;
 	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
index c168c2a0..9d37386a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
@@ -16,17 +16,20 @@
 
 package com.intellij.lang.javascript.impl.highlighting;
 
+import com.intellij.lang.javascript.impl.search.JSFunctionsSearch;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.search.JSClassSearch;
-import com.intellij.lang.javascript.impl.search.JSFunctionsSearch;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.application.AllIcons;
 import consulo.application.ApplicationManager;
 import consulo.application.progress.ProgressManager;
 import consulo.application.util.function.Processor;
 import consulo.application.util.query.CollectionQuery;
 import consulo.application.util.query.Query;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.editor.Pass;
 import consulo.language.editor.gutter.GutterIconNavigationHandler;
 import consulo.language.editor.gutter.LineMarkerInfo;
@@ -40,7 +43,6 @@
 import consulo.ui.ex.RelativePoint;
 import consulo.util.dataholder.Key;
 import consulo.util.lang.ref.Ref;
-import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -53,9 +55,9 @@
  * Date: Apr 14, 2008
  * Time: 11:43:47 PM
  */
-public abstract class JavaScriptLineMarkerProvider implements LineMarkerProvider
+@ExtensionImpl
+public class JavaScriptLineMarkerProvider implements LineMarkerProvider
 {
-	@NonNls
 	private static final String OVERRIDES_METHOD_IN = "overrides method in ";
 
 	private static final Function<JSClass, String> ourClassInheritorsTooltipProvider = clazz -> "Has subclasses";
@@ -493,4 +495,11 @@ public boolean process(final T psiElement)
 		@Nullable
 		protected abstract Query<T> search(T elt);
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
index 9db4c443..d57a64e9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
@@ -22,9 +22,12 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.codeEditor.Editor;
 import consulo.codeEditor.EditorPopupHelper;
-import consulo.language.editor.action.LanguageCodeInsightActionHandler;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.editor.action.GotoSuperActionHander;
 import consulo.language.editor.ui.PopupNavigationUtil;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -33,7 +36,10 @@
 import consulo.project.Project;
 import consulo.ui.ex.popup.JBPopup;
 
-public abstract class JavaScriptGotoSuperHandler implements LanguageCodeInsightActionHandler
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
+public class JavaScriptGotoSuperHandler implements GotoSuperActionHander
 {
 	@Override
 	public void invoke(final Project project, final Editor editor, final PsiFile file)
@@ -136,4 +142,11 @@ public boolean isValidFor(final Editor editor, final PsiFile file)
 	{
 		return true;
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
index fdedd57a..5529826c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
@@ -19,34 +19,35 @@
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.application.util.function.Processor;
-import consulo.ide.navigation.ChooseByNameContributor;
+import consulo.content.scope.SearchScope;
+import consulo.ide.navigation.GotoSymbolContributor;
 import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.language.psi.search.FilenameIndex;
+import consulo.language.psi.search.FindSymbolParameters;
 import consulo.language.psi.stub.FileBasedIndex;
+import consulo.language.psi.stub.IdFilter;
 import consulo.language.psi.stub.StubIndex;
 import consulo.navigation.NavigationItem;
 import consulo.project.Project;
 import consulo.util.io.FileUtil;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * @author maxim
  */
-public class JavaScriptSymbolContributor implements ChooseByNameContributor
+@ExtensionImpl
+public class JavaScriptSymbolContributor implements GotoSymbolContributor
 {
-	@Nonnull
 	@Override
-	public String[] getNames(Project project, boolean includeNonProjectItems)
+	public void processNames(@Nonnull Processor<String> processor, @Nonnull SearchScope searchScope, @Nullable IdFilter idFilter)
 	{
-		final Set<String> result = new HashSet<String>();
-
-		result.addAll(StubIndex.getInstance().getAllKeys(JavaScriptIndexKeys.ELEMENTS_BY_NAME, project));
+		StubIndex.getInstance().processAllKeys(JavaScriptIndexKeys.ELEMENTS_BY_NAME, processor, (GlobalSearchScope) searchScope, idFilter);
 
 		FileBasedIndex.getInstance().processAllKeys(FilenameIndex.NAME, new Processor<String>()
 		{
@@ -55,20 +56,28 @@ public boolean process(String s)
 			{
 				if(JavaScriptSupportLoader.isFlexMxmFile(s))
 				{
-					result.add(FileUtil.getNameWithoutExtension(s));
+					return processor.process(FileUtil.getNameWithoutExtension(s));
 				}
 				return true;
 			}
-		}, project);
-		return result.toArray(new String[result.size()]);
+		}, searchScope, idFilter);
 	}
 
-	@Nonnull
 	@Override
-	public NavigationItem[] getItemsByName(String name, final String pattern, Project project, boolean includeNonProjectItems)
+	public void processElementsWithName(@Nonnull String name, @Nonnull Processor<NavigationItem> processor, @Nonnull FindSymbolParameters findSymbolParameters)
 	{
-		GlobalSearchScope scope = includeNonProjectItems ? GlobalSearchScope.allScope(project) : GlobalSearchScope.projectScope(project);
+		Project project = findSymbolParameters.getProject();
+
+		GlobalSearchScope scope = (GlobalSearchScope) findSymbolParameters.getSearchScope();
+
 		Collection<JSQualifiedNamedElement> result = JSResolveUtil.findElementsByName(name, project, scope);
-		return result.toArray(new NavigationItem[result.size()]);
+
+		for(JSQualifiedNamedElement element : result)
+		{
+			if(!processor.process(element))
+			{
+				break;
+			}
+		}
 	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
index d332c0fa..eae7a968 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
@@ -20,11 +20,24 @@
 package com.intellij.lang.javascript.impl.refactoring;
 
 import com.intellij.lang.javascript.DialectOptionHolder;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 
-public abstract class BasicJavascriptNamesValidator extends JSNamesValidator
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
+public class BasicJavascriptNamesValidator extends JSNamesValidator
 {
 	public BasicJavascriptNamesValidator()
 	{
 		super(DialectOptionHolder.dummy());
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
index 76491c7d..71eca1dd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
@@ -19,20 +19,24 @@
  */
 package com.intellij.lang.javascript.impl.refactoring;
 
-import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.impl.refactoring.extractMethod.JSExtractFunctionHandler;
 import com.intellij.lang.javascript.impl.refactoring.introduceConstant.JSIntroduceConstantHandler;
 import com.intellij.lang.javascript.impl.refactoring.introduceField.JSIntroduceFieldHandler;
 import com.intellij.lang.javascript.impl.refactoring.introduceVariable.JSIntroduceVariableHandler;
-import consulo.application.ApplicationManager;
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.editor.refactoring.RefactoringSupportProvider;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.scope.LocalSearchScope;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public abstract class JavascriptRefactoringSupportProvider extends RefactoringSupportProvider
+@ExtensionImpl
+public class JavascriptRefactoringSupportProvider extends RefactoringSupportProvider
 {
 	@Override
 	public boolean isSafeDeleteAvailable(PsiElement element)
@@ -54,7 +58,7 @@ public RefactoringActionHandler getIntroduceVariableHandler()
 	@Nullable
 	public RefactoringActionHandler getExtractMethodHandler()
 	{
-		return ApplicationManager.getApplication().isUnitTestMode() ? new JSExtractFunctionHandler() : null;
+		return new JSExtractFunctionHandler();
 	}
 
 	@Override
@@ -69,8 +73,16 @@ public RefactoringActionHandler getIntroduceFieldHandler()
 		return new JSIntroduceFieldHandler();
 	}
 
-	public boolean doInplaceRenameFor(final PsiElement element, final PsiElement context)
+	@Override
+	public boolean isInplaceRenameAvailable(PsiElement element, PsiElement context)
 	{
 		return element instanceof JSNamedElement && element.getUseScope() instanceof LocalSearchScope;
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
index e728f405..47cd35ee 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.search;
 
 import com.intellij.lang.javascript.psi.JSNamedElement;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.document.util.TextRange;
 import consulo.language.editor.hint.DeclarationRangeHandler;
 import consulo.language.psi.PsiElement;
@@ -25,17 +26,23 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Apr 28, 2008
- *         Time: 8:36:19 PM
+ * Date: Apr 28, 2008
+ * Time: 8:36:19 PM
  */
-public abstract class JSDeclarationRangeHandler implements DeclarationRangeHandler
+@ExtensionImpl
+public class JSDeclarationRangeHandler implements DeclarationRangeHandler<JSNamedElement>
 {
-	@Override
 	@Nonnull
-	public TextRange getDeclarationRange(@Nonnull PsiElement container)
+	@Override
+	public Class<JSNamedElement> getElementClass()
 	{
-		JSNamedElement namedElement = (JSNamedElement) container;
+		return JSNamedElement.class;
+	}
 
+	@Override
+	@Nonnull
+	public TextRange getDeclarationRange(@Nonnull JSNamedElement namedElement)
+	{
 		final TextRange textRange = namedElement.getTextRange();
 		final PsiElement nameIdentifier = namedElement.getNameIdentifier();
 		final TextRange nameIdentifierRange = nameIdentifier != null ? nameIdentifier.getTextRange() : null;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
index c7e840fe..2f1a8211 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
@@ -22,8 +22,8 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.search.JSClassSearch;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.application.util.function.Processor;
-import consulo.application.util.query.QueryExecutor;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiNamedElement;
@@ -31,6 +31,7 @@
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.language.psi.search.DefinitionsScopedSearch;
+import consulo.language.psi.search.DefinitionsScopedSearchExecutor;
 import consulo.language.psi.search.ReferencesSearch;
 
 import javax.annotation.Nonnull;
@@ -40,7 +41,8 @@
  *         Date: Apr 28, 2008
  *         Time: 8:34:30 PM
  */
-class JSDefinitionsSearchExecutor implements QueryExecutor<PsiElement, DefinitionsScopedSearch.SearchParameters>
+@ExtensionImpl
+public class JSDefinitionsSearchExecutor implements DefinitionsScopedSearchExecutor
 {
 	@Override
 	public boolean execute(@Nonnull final DefinitionsScopedSearch.SearchParameters parameters, @Nonnull final Processor<? super PsiElement> consumer)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
index c9bf6775..c8f84bcc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.search;
 
 import com.intellij.lang.javascript.psi.JSNamedElement;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.ide.navigation.GotoTargetRendererProvider;
 import consulo.language.editor.ui.PsiElementListCellRenderer;
 import consulo.language.psi.PsiElement;
@@ -30,7 +31,8 @@
  *         Date: Apr 28, 2008
  *         Time: 8:14:14 PM
  */
-public abstract class JSGotoTargetRendererProvider implements GotoTargetRendererProvider
+@ExtensionImpl
+public class JSGotoTargetRendererProvider implements GotoTargetRendererProvider
 {
 	static class JSClassListCellRenderer extends PsiElementListCellRenderer<JSNamedElement>
 	{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java
index 68de894c..b1f96176 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java
@@ -16,26 +16,28 @@
 
 package com.intellij.lang.javascript.impl.search;
 
+import consulo.annotation.component.ExtensionImpl;
+import consulo.application.ReadAction;
+import consulo.application.util.function.Processor;
 import consulo.javascript.language.JavaScriptFileType;
-import consulo.application.util.query.QueryExecutor;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiNamedElement;
+import consulo.language.psi.PsiReference;
 import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.language.psi.scope.LocalSearchScope;
-import consulo.language.psi.search.ReferencesSearch;
-import consulo.application.util.function.Processor;
-import consulo.application.ReadAction;
-import consulo.javascript.language.JavaScriptLanguage;
-import consulo.language.psi.PsiReference;
 import consulo.language.psi.search.PsiSearchHelper;
+import consulo.language.psi.search.ReferencesSearch;
+import consulo.language.psi.search.ReferencesSearchQueryExecutor;
 
 /**
  * @author Maxim.Mossienko
  *         Date: Apr 28, 2008
  *         Time: 8:34:20 PM
  */
-public class JSReferencesSearchExecutor implements QueryExecutor<PsiReference, ReferencesSearch.SearchParameters>
+@ExtensionImpl
+public class JSReferencesSearchExecutor implements ReferencesSearchQueryExecutor
 {
 	@Override
 	public boolean execute(final ReferencesSearch.SearchParameters queryParameters, final Processor<? super PsiReference> consumer)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
index b8d18c4c..e13ce8df 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
@@ -19,16 +19,20 @@
  */
 package com.intellij.lang.javascript.impl.structureView;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.codeEditor.Editor;
 import consulo.fileEditor.structureView.StructureViewBuilder;
 import consulo.fileEditor.structureView.StructureViewModel;
 import consulo.fileEditor.structureView.TreeBasedStructureViewBuilder;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.editor.structureView.PsiStructureViewFactory;
 import consulo.language.psi.PsiFile;
 
 import javax.annotation.Nonnull;
 
-public abstract class JSStructureViewBuilderFactory implements PsiStructureViewFactory
+@ExtensionImpl
+public class JSStructureViewBuilderFactory implements PsiStructureViewFactory
 {
 	@Override
 	public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile)
@@ -49,4 +53,11 @@ public boolean isRootNodeShown()
 			}
 		};
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
index 12c3e685..9a7cb915 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
@@ -19,6 +19,9 @@
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.editor.surroundWith.SurroundDescriptor;
 import consulo.language.editor.surroundWith.Surrounder;
 import consulo.language.psi.PsiElement;
@@ -29,13 +32,12 @@
 import javax.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
  * User: yole
  * Date: 12.07.2005
  * Time: 12:46:24
- * To change this template use File | Settings | File Templates.
  */
-public abstract class JSExpressionSurroundDescriptor implements SurroundDescriptor
+@ExtensionImpl
+public class JSExpressionSurroundDescriptor implements SurroundDescriptor
 {
 	private static final Surrounder[] SURROUNDERS = {
 			new JSWithParenthesesSurrounder()
@@ -89,4 +91,11 @@ private static JSExpression findExpressionInRange(PsiFile file, int startOffset,
 		}
 		return expression;
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
index dea1fbb9..8f651c80 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
@@ -20,6 +20,9 @@
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.ast.ASTNode;
 import consulo.language.editor.surroundWith.SurroundDescriptor;
 import consulo.language.editor.surroundWith.Surrounder;
@@ -34,12 +37,12 @@
 import java.util.List;
 
 /**
- * Created by IntelliJ IDEA.
  * User: yole
  * Date: 12.07.2005
  * Time: 14:14:55
  */
-public abstract class JSStatementsSurroundDescriptor implements SurroundDescriptor
+@ExtensionImpl
+public class JSStatementsSurroundDescriptor implements SurroundDescriptor
 {
 	private static final Surrounder[] SURROUNDERS = {
 			new JSWithBlockSurrounder(),
@@ -177,4 +180,11 @@ private PsiElement[] findStatementsInRange(PsiFile file, int startOffset, int en
 
 		return array.toArray(new PsiElement[array.size()]);
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
new file mode 100644
index 00000000..d371e790
--- /dev/null
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
@@ -0,0 +1,32 @@
+package com.intellij.lang.javascript.impl.validation;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.editor.annotation.Annotator;
+import consulo.language.editor.annotation.AnnotatorFactory;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+@ExtensionImpl
+public class JSAnnotatorFactory implements AnnotatorFactory
+{
+	@Nullable
+	@Override
+	public Annotator createAnnotator()
+	{
+		return new JSAnnotatingVisitor();
+	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+}
diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index 6eb7fc4d..b404c3b1 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -1,5 +1,6 @@
 package consulo.javascript.impl.formatter;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
 import consulo.language.codeStyle.CommonCodeStyleSettings;
@@ -16,6 +17,7 @@
  * @author VISTALL
  * @since 16.02.2015
  */
+@ExtensionImpl
 public class JavaScriptLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider
 {
 	@Override
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
new file mode 100644
index 00000000..1b4b3970
--- /dev/null
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
@@ -0,0 +1,19 @@
+package consulo.javascript.impl.ide.actions;
+
+import consulo.fileTemplate.FileTemplateContributor;
+import consulo.fileTemplate.FileTemplateRegistrator;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+public class JavaScriptFileTemplateContributor implements FileTemplateContributor
+{
+	@Override
+	public void register(@Nonnull FileTemplateRegistrator fileTemplateRegistrator)
+	{
+		fileTemplateRegistrator.registerInternalTemplate("JavaScriptFile");
+	}
+}
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
index 9984c2f6..08601a22 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -19,7 +19,10 @@
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
 import consulo.language.editor.completion.*;
 import consulo.language.editor.completion.lookup.LookupElementBuilder;
 import consulo.language.editor.completion.lookup.ParenthesesInsertHandler;
@@ -33,7 +36,8 @@
  * @author VISTALL
  * @since 20.12.2015
  */
-public abstract class JavaScriptKeywordCompletionContributor extends CompletionContributor
+@ExtensionImpl
+public class JavaScriptKeywordCompletionContributor extends CompletionContributor
 {
 	public JavaScriptKeywordCompletionContributor()
 	{
@@ -80,4 +84,11 @@ public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingC
 			}
 		});
 	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
new file mode 100644
index 00000000..07e554ac
--- /dev/null
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
@@ -0,0 +1,23 @@
+package consulo.javascript.impl.ide.completion;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.editor.completion.SkipAutopopupInStrings;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+@ExtensionImpl
+public class JavaScriptSkipAutopopupInStrings extends SkipAutopopupInStrings
+{
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+}
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
index 785efbb5..c4212f48 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
@@ -16,44 +16,48 @@
 
 package consulo.javascript.impl.lang.navigation;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSClass;
-import consulo.ide.navigation.ChooseByNameContributor;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.application.util.function.Processor;
+import consulo.content.scope.SearchScope;
+import consulo.ide.navigation.GotoClassOrTypeContributor;
+import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.language.psi.scope.GlobalSearchScope;
+import consulo.language.psi.search.FindSymbolParameters;
 import consulo.language.psi.stub.IdFilter;
 import consulo.language.psi.stub.StubIndex;
-import consulo.util.collection.ArrayUtil;
-import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.navigation.NavigationItem;
 import consulo.project.Project;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Collection;
+
 /**
  * @author VISTALL
  */
-public class JavaScriptClassContributor implements ChooseByNameContributor
+@ExtensionImpl
+public class JavaScriptClassContributor implements GotoClassOrTypeContributor
 {
-	@Nonnull
 	@Override
-	public String[] getNames(Project project, boolean includeNonProjectItems)
+	public void processNames(@Nonnull Processor<String> processor, @Nonnull SearchScope searchScope, @Nullable IdFilter idFilter)
 	{
-		final Set<String> result = new HashSet<String>();
-
-		result.addAll(StubIndex.getInstance().getAllKeys(JavaScriptIndexKeys.CLASSES_BY_NAME, project));
-
-		return ArrayUtil.toStringArray(result);
+		StubIndex.getInstance().processAllKeys(JavaScriptIndexKeys.CLASSES_BY_NAME, processor, (GlobalSearchScope) searchScope, idFilter);
 	}
 
-	@Nonnull
 	@Override
-	public NavigationItem[] getItemsByName(String name, final String pattern, Project project, boolean includeNonProjectItems)
+	public void processElementsWithName(@Nonnull String name, @Nonnull Processor<NavigationItem> processor, @Nonnull FindSymbolParameters findSymbolParameters)
 	{
-		Collection<JSClass> elements = StubIndex.getElements(JavaScriptIndexKeys.CLASSES_BY_NAME, name, project, GlobalSearchScope.allScope(project), IdFilter.getProjectIdFilter(project,
-				includeNonProjectItems), JSClass.class);
-		return elements.toArray(new NavigationItem[elements.size()]);
+		Project project = findSymbolParameters.getProject();
+		Collection<JSClass> elements = StubIndex.getElements(JavaScriptIndexKeys.CLASSES_BY_NAME, name, project, GlobalSearchScope.allScope(project), findSymbolParameters.getIdFilter(), JSClass
+				.class);
+
+		for(JSClass element : elements)
+		{
+			if(!processor.process(element))
+			{
+				break;
+			}
+		}
 	}
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java b/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
index 0886a9f5..34200890 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
@@ -1,5 +1,7 @@
 package consulo.javascript.impl.lang.regexp.impl;
 
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl;
 import org.intellij.lang.regexp.DefaultRegExpPropertiesProvider;
 import org.intellij.lang.regexp.RegExpLanguageHost;
 import org.intellij.lang.regexp.psi.RegExpChar;
@@ -13,8 +15,16 @@
  * @author VISTALL
  * @since 21/12/2021
  */
-public abstract class JavaScriptRegExpLiteralLanguageHost implements RegExpLanguageHost
+@ExtensionImpl
+public class JavaScriptRegExpLiteralLanguageHost implements RegExpLanguageHost
 {
+	@Nonnull
+	@Override
+	public Class getHostClass()
+	{
+		return JSRegExpLiteralExpressionImpl.class;
+	}
+
 	@Override
 	public boolean characterNeedsEscaping(char c)
 	{
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java b/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
index 3459a89f..14139797 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
@@ -16,6 +16,7 @@
 
 package consulo.javascript.impl.lang.regexp.impl;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.document.util.TextRange;
 import consulo.language.inject.MultiHostRegistrar;
 import consulo.language.psi.PsiElement;
@@ -31,8 +32,16 @@
  * @author VISTALL
  * @since 11.12.2015
  */
-public abstract class JavaScriptRegexpMultiHostInjector implements MultiHostInjector
+@ExtensionImpl
+public class JavaScriptRegexpMultiHostInjector implements MultiHostInjector
 {
+	@Nonnull
+	@Override
+	public Class<? extends PsiElement> getElementClass()
+	{
+		return JSRegExpLiteralExpressionImpl.class;
+	}
+
 	@Override
 	@RequiredReadAction
 	public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement context)
diff --git a/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
index f0b7aea0..11621ffc 100644
--- a/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReference;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
@@ -31,6 +32,7 @@
  * @author VISTALL
  * @since 02.12.2015
  */
+@ExtensionImpl(id = "default", order = "last")
 public class DefaultJSPropertyNameReferenceProvider implements JSPropertyNameReferenceProvider
 {
 	@RequiredReadAction
diff --git a/plugin/src/main/resources/META-INF/actionscript.xml b/plugin/src/main/resources/META-INF/actionscript.xml
deleted file mode 100644
index 11c20126..00000000
--- a/plugin/src/main/resources/META-INF/actionscript.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  - Copyright 2013-2015 must-be.org
-  -
-  - 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.
-  -->
-
-<consulo-plugin>
-	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="consulo.actionscript.ActionScriptFileTypeFactory" />
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.actionscript.lang.ActionScriptLanguageVersion" />
-	</extensions>
-</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/ecma4.xml b/plugin/src/main/resources/META-INF/ecma4.xml
deleted file mode 100644
index 3a2830bd..00000000
--- a/plugin/src/main/resources/META-INF/ecma4.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  - Copyright 2013-2015 must-be.org
-  -
-  - 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.
-  -->
-
-<consulo-plugin>
-	<extensions defaultExtensionNs="com.intellij">
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript4.lang.EcmaScript4JavaScriptVersion" />
-	</extensions>
-</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/ecma6.xml b/plugin/src/main/resources/META-INF/ecma6.xml
deleted file mode 100644
index f8b07f3f..00000000
--- a/plugin/src/main/resources/META-INF/ecma6.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-  - Copyright 2013-2015 must-be.org
-  -
-  - 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.
-  -->
-
-<consulo-plugin>
-	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="consulo.javascript.ecmascript.lang.EcmaScriptFileTypeFactory"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript6JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript7JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript8JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript9JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript10JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript11JavaScriptVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.ecmascript.lang.EcmaScript12JavaScriptVersion"/>
-	</extensions>
-
-	<extensions defaultExtensionNs="consulo.javascript">
-		<quickFixFactory key="ECMASCRIPT_6" implementationClass="consulo.javascript.ecmascript.codeInsight.EcmaScript6QuickFixFactory"/>
-
-		<keywordCompletionExtender implementation="consulo.javascript.ecmascript.completion.EcmaScript6KeywordCompletionExtender" />
-	</extensions>
-</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/json.xml b/plugin/src/main/resources/META-INF/json.xml
deleted file mode 100644
index 8b205d59..00000000
--- a/plugin/src/main/resources/META-INF/json.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-  - Copyright 2013-2015 must-be.org
-  -
-  - 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.
-  -->
-
-<consulo-plugin>
-	<extensionPoints>
-		<extensionPoint name="jomFileDescriptor" interface="consulo.json.jom.JomFileDescriptor"/>
-		<extensionPoint name="jsonFileDescriptorProvider" interface="consulo.json.validation.JsonFileDescriptorProvider"/>
-		<extensionPoint name="jsonDescriptionByAnotherPsiElementProvider"
-						interface="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementProvider"/>
-	</extensionPoints>
-
-	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="consulo.json.JsonFileTypeFactory"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.json.lang.JsonJavaScriptVersion"/>
-
-		<iconDescriptorUpdater implementation="consulo.json.jom.JomIconDescriptorUpdater"/>
-
-		<projectService serviceImplementation="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementService"/>
-		<projectService serviceImplementation="consulo.json.jom.JomManager"/>
-
-
-		<quoteHandler fileType="JSON" className="onsulo.javascript.lang.JavaScriptQuoteHandler"/>
-
-		<localInspection language="JavaScript"
-						 displayName="Property validation"
-						 groupName="JSON"
-						 enabledByDefault="true"
-						 implementationClass="consulo.json.validation.inspections.PropertyValidationInspection"/>
-
-		<extensionExtender key="com.intellij.editorNotificationProvider" implementationClass="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementRegistrar" />
-	</extensions>
-
-	<extensions defaultExtensionNs="consulo.javascript">
-		<propertyNameReferenceProvider implementation="consulo.json.validation.psi.reference.JsonPropertyNameReferenceProvider" order="before default"/>
-
-		<jsonFileDescriptorProvider implementation="consulo.json.jom.JomModeAsJsonFileDescriptorProvider"/>
-
-		<jsonFileDescriptorProvider implementation="consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementJsonDescriptionProvider"/>
-	</extensions>
-</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/jsx.xml b/plugin/src/main/resources/META-INF/jsx.xml
deleted file mode 100644
index 7c6ea70e..00000000
--- a/plugin/src/main/resources/META-INF/jsx.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<consulo-plugin>
-</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 91a61623..de3e1796 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -27,142 +27,11 @@
 		<tag>custom.language</tag>
 	</tags>
 
-	<import path="/META-INF/Intentions.xml"/>
-	<import path="/META-INF/json.xml"/>
-	<import path="/META-INF/ecma4.xml"/>
-	<import path="/META-INF/ecma6.xml"/>
-	<import path="/META-INF/actionscript.xml"/>
-	<import path="/META-INF/typescript.xml"/>
-	<import path="/META-INF/jsx.xml"/>
-
 	<actions>
 		<action id="JavaScript.File" class="consulo.javascript.impl.ide.actions.JavaScriptCreateFileAction">
 			<add-to-group group-id="NewGroup1" anchor="after" relative-to-action="NewClass"/>
 		</action>
-	</actions>
-
-	<extensions defaultExtensionNs="com.intellij">
-		<internalFileTemplate name="JavaScriptFile"/>
-
-		<applicationService serviceInterface="consulo.javascript.language.StandardJavaScriptVersions" serviceImplementation="consulo.javascript.lang.StandardJavaScriptVersionsImpl"/>
-
-
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.lang.JavaScript15LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.javascript16.lang.JavaScript16LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.javascript17.lang.JavaScript17LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.javascript18.lang.JavaScript18LanguageVersion"/>
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.javascript.javascript18.lang.JavaScript185LanguageVersion"/>
-
-
-		<gotoClassContributor implementation="consulo.javascript.impl.lang.navigation.JavaScriptClassContributor"/>
-		<gotoSymbolContributor implementation="com.intellij.lang.javascript.impl.navigation.JavaScriptSymbolContributor"/>
-
-
-		<annotator language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.validation.JSAnnotatingVisitor"/>
-		<readWriteAccessDetector implementation="com.intellij.lang.javascript.impl.findUsages.JSReadWriteAccessDetector"/>
-		<lang.refactoringSupport language="JavaScript"
-								 implementationClass="com.intellij.lang.javascript.impl.refactoring.JavascriptRefactoringSupportProvider"/>
-		<lang.documentationProvider language="JavaScript" implementationClass="com.intellij.javascript.documentation.JSDocumentationProvider"/>
-
-		<lang.namesValidator language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.refactoring.BasicJavascriptNamesValidator"/>
-
-		<lang.surroundDescriptor language="JavaScript"
-								 implementationClass="com.intellij.lang.javascript.impl.surroundWith.JSExpressionSurroundDescriptor"/>
-		<lang.surroundDescriptor language="JavaScript"
-								 implementationClass="com.intellij.lang.javascript.impl.surroundWith.JSStatementsSurroundDescriptor"/>
-
-		<codeInsight.gotoSuper language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.navigation.JavaScriptGotoSuperHandler"/>
-		<codeInsight.overrideMethod language="JavaScript"
-									implementationClass="com.intellij.lang.javascript.impl.generation.JavaScriptOverrideMethodsHandler"/>
-		<codeInsight.implementMethod language="JavaScript"
-									 implementationClass="com.intellij.lang.javascript.impl.generation.JavaScriptImplementMethodsHandler"/>
-
-		<lang.findUsagesProvider language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.findUsages.JavaScriptFindUsagesProvider"/>
-
-		<lang.syntaxHighlighterFactory language="JavaScript"
-									   implementationClass="consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightFactory"/>
-		<lang.commenter language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.JavascriptCommenter"/>
-
-		<lang.braceMatcher language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.highlighting.JSBraceMatcher"/>
-
-		<lang.foldingBuilder language="JavaScript" implementationClass="com.intellij.lang.javascript.impl.folding.JavaScriptFoldingBuilder"/>
-		<lang.psiStructureViewFactory language="JavaScript"
-									  implementationClass="com.intellij.lang.javascript.impl.structureView.JSStructureViewBuilderFactory"/>
-
-		<codeInsight.parameterInfo language="JavaScript" implementationClass="com.intellij.javascript.JSParameterInfoHandler"/>
-		<fileStructureGroupRuleProvider implementation="com.intellij.lang.javascript.impl.findUsages.JavaScriptClassGroupRuleProvider"/>
-		<fileStructureGroupRuleProvider implementation="com.intellij.lang.javascript.impl.findUsages.JavaScriptFunctionGroupRuleProvider"/>
-
-		<stubIndex implementation="consulo.javascript.language.psi.stub.JSNameIndex"/>
-		<stubIndex implementation="consulo.javascript.impl.language.psi.stub.JavaScriptClassNameIndex"/>
-		<stubIndex implementation="consulo.javascript.language.psi.stub.JSQualifiedElementIndex"/>
-		<stubIndex implementation="consulo.javascript.language.psi.stub.JSSuperClassIndex"/>
-		<stubIndex implementation="consulo.javascript.language.psi.stub.JSImplementedInterfacesIndex"/>
-
-		<fileTypeIndentOptionsProvider implementation="com.intellij.lang.javascript.impl.formatter.JavaScriptIndentOptionsProvider"/>
-		<codeStyleSettingsProvider implementation="com.intellij.lang.javascript.impl.formatter.JSCodeStyleSettingsProvider"/>
-		<langCodeStyleSettingsProvider implementation="consulo.javascript.impl.formatter.JavaScriptLanguageCodeStyleSettingsProvider"/>
-		<liveTemplateContext implementation="com.intellij.lang.javascript.impl.JavaScriptCodeContextType"/>
 
-		<codeInsight.lineMarkerProvider language="JavaScript"
-										implementationClass="com.intellij.lang.javascript.impl.highlighting.JavaScriptLineMarkerProvider"/>
-		<gotoTargetRendererProvider implementation="com.intellij.lang.javascript.impl.search.JSGotoTargetRendererProvider"/>
-		<definitionsScopedSearch implementation="com.intellij.lang.javascript.search.JSDefinitionsSearchExecutor"/>
-		<referencesSearch implementation="com.intellij.lang.javascript.impl.search.JSReferencesSearchExecutor"/>
-		<declarationRangeHandler key="com.intellij.lang.javascript.psi.JSNamedElement"
-								 implementationClass="com.intellij.lang.javascript.impl.search.JSDeclarationRangeHandler"/>
-		<multiHostInjector forClass="com.intellij.psi.xml.XmlText" implementationClass="com.intellij.lang.javascript.JSLanguageInjector"/>
-		<multiHostInjector forClass="com.intellij.psi.xml.XmlAttributeValue" implementationClass="com.intellij.lang.javascript.JSLanguageInjector"/>
-		<stubElementTypeHolder class="com.intellij.lang.javascript.JSElementTypes"/>
-
-
-		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.impl.JSIncludeDirectiveImpl"
-								 implementationClass="com.intellij.javascript.manipulators.JSIncludeDirectiveManipulator"/>
-		<lang.elementManipulator forClass="com.intellij.lang.javascript.psi.JSAttributeNameValuePair"
-								 implementationClass="com.intellij.javascript.manipulators.JSAttributeNameValuePairManipulator"/>
-
-
-		<lang.fileViewProviderFactory language="JavaScript" implementationClass="consulo.javascript.lang.viewProvider.JSFileViewProviderFactory"/>
-
-		<completion.contributor language="JavaScript" implementationClass="consulo.javascript.impl.ide.completion.JavaScriptKeywordCompletionContributor"/>
-
-		<completion.confidence language="JavaScript" implementationClass="consulo.language.editor.completion.SkipAutopopupInStrings"/>
-
-		<quoteHandler fileType="JavaScript" className="consulo.javascript.impl.lang.JavaScriptQuoteHandler"/>
-
-		<liveTemplateMacro implementation="com.intellij.javascript.JSClassNameMacro"/>
-		<liveTemplateMacro implementation="com.intellij.javascript.JSMethodNameMacro"/>
-
-
-		<moduleExtensionProvider key="client-javascript"
-								 icon="consulo.javascript.JavaScriptIconGroup@javascript"
-								 name="JavaScript (Client)"
-								 allowMixin="true"
-								 immutableClass="consulo.javascript.client.module.extension.ClientJavaScriptModuleExtension"
-								 mutableClass="consulo.javascript.client.module.extension.ClientJavaScriptMutableModuleExtension"/>
-
-	</extensions>
-
-	<extensionPoints>
-		<extensionPoint name="indexer" interface="consulo.javascript.index.JavaScriptIndexer"/>
-
-		<extensionPoint name="keywordCompletionExtender" interface="consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender"/>
-
-		<extensionPoint name="resolveHelper" interface="com.intellij.lang.javascript.flex.JSResolveHelper"/>
-		<extensionPoint name="classInheritorsProvider" interface="com.intellij.lang.javascript.search.JSClassInheritorsProvider"/>
-
-		<extensionPoint name="propertyNameReferenceProvider" interface="consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider"/>
-
-		<extensionPoint name="quickFixFactory" beanClass="com.intellij.util.KeyedLazyInstanceEP">
-			<with attribute="implementationClass" implements="consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory"/>
-		</extensionPoint>
-	</extensionPoints>
-
-	<extensions defaultExtensionNs="consulo.javascript">
-		<propertyNameReferenceProvider implementation="consulo.javascript.impl.psi.impl.reference.DefaultJSPropertyNameReferenceProvider" id="default"/>
-	</extensions>
-
-	<actions>
 		<action id="Generate.GetAccessor.Actionscript" class="com.intellij.lang.javascript.impl.generation.JavaScriptGenerateGetAccessorAction"
 				text="Getter">
 			<add-to-group anchor="last" group-id="GenerateGroup"/>
diff --git a/plugin/src/main/resources/META-INF/regexp.xml b/plugin/src/main/resources/META-INF/regexp.xml
deleted file mode 100644
index 3bbaa614..00000000
--- a/plugin/src/main/resources/META-INF/regexp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  - Copyright 2013-2015 must-be.org
-  -
-  - 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.
-  -->
-
-<consulo-plugin>
-	<extensions defaultExtensionNs="com.intellij">
-		<multiHostInjector forClass="com.intellij.lang.javascript.psi.impl.JSLiteralExpressionImpl" implementationClass="consulo.javascript.impl.lang.regexp.impl.JavaScriptRegexpMultiHostInjector"/>
-	</extensions>
-
-	<extensions defaultExtensionNs="com.intellij.regexp">
-		<languageHost forClass="consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl" implementationClass="consulo.javascript.impl.lang.regexp.impl.JavaScriptRegExpLiteralLanguageHost"/>
-	</extensions>
-</consulo-plugin>
\ No newline at end of file
diff --git a/plugin/src/main/resources/META-INF/typescript.xml b/plugin/src/main/resources/META-INF/typescript.xml
deleted file mode 100644
index dcf25278..00000000
--- a/plugin/src/main/resources/META-INF/typescript.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  - Copyright 2013-2016 must-be.org
-  -
-  - 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.
-  -->
-
-<consulo-plugin>
-	<extensions defaultExtensionNs="com.intellij">
-		<fileTypeFactory implementation="consulo.typescript.TypeScriptFileTypeFactory" />
-
-		<lang.defineVersion language="JavaScript" implementationClass="consulo.typescript.version.TypeScriptLanguageVersion"/>
-	</extensions>
-</consulo-plugin>
\ No newline at end of file
diff --git a/inspections/src/main/resources/inspectionDescriptions/AnonymousFunctionJS.html b/plugin/src/main/resources/inspectionDescriptions/AnonymousFunctionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/AnonymousFunctionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/AnonymousFunctionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/AssignmentResultUsedJS.html b/plugin/src/main/resources/inspectionDescriptions/AssignmentResultUsedJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/AssignmentResultUsedJS.html
rename to plugin/src/main/resources/inspectionDescriptions/AssignmentResultUsedJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html b/plugin/src/main/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html
rename to plugin/src/main/resources/inspectionDescriptions/AssignmentToForLoopParameterJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html b/plugin/src/main/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html
rename to plugin/src/main/resources/inspectionDescriptions/AssignmentToFunctionParameterJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/BadExpressionStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/BadExpressionStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/BadExpressionStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/BadExpressionStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/BlockStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/BlockStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/BlockStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/BlockStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/BreakStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/BreakStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/BreakStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/BreakStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/BreakStatementWithLabelJS.html b/plugin/src/main/resources/inspectionDescriptions/BreakStatementWithLabelJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/BreakStatementWithLabelJS.html
rename to plugin/src/main/resources/inspectionDescriptions/BreakStatementWithLabelJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/CallerJS.html b/plugin/src/main/resources/inspectionDescriptions/CallerJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/CallerJS.html
rename to plugin/src/main/resources/inspectionDescriptions/CallerJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ChainedEqualityJS.html b/plugin/src/main/resources/inspectionDescriptions/ChainedEqualityJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ChainedEqualityJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ChainedEqualityJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ChainedFunctionCallJS.html b/plugin/src/main/resources/inspectionDescriptions/ChainedFunctionCallJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ChainedFunctionCallJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ChainedFunctionCallJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/CommaExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/CommaExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/CommaExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/CommaExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ConditionalExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/ConditionalExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ConditionalExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ConditionalExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html b/plugin/src/main/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ConditionalExpressionWithIdenticalBranchesJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html b/plugin/src/main/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ConfusingFloatingPointLiteralJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html b/plugin/src/main/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ConfusingPlusesOrMinusesJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ConstantConditionalExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ConstantIfStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/ConstantIfStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ConstantIfStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ConstantIfStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html b/plugin/src/main/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ConstantOnLHSOfComparisonJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html b/plugin/src/main/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ConstantOnRHSOfComparisonJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html b/plugin/src/main/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ContinueOrBreakFromFinallyBlockJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ContinueStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/ContinueStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ContinueStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ContinueStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html b/plugin/src/main/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ContinueStatementWithLabelJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/CyclomaticComplexityJS.html b/plugin/src/main/resources/inspectionDescriptions/CyclomaticComplexityJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/CyclomaticComplexityJS.html
rename to plugin/src/main/resources/inspectionDescriptions/CyclomaticComplexityJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/DebuggerStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/DebuggerStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/DebuggerStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/DebuggerStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html b/plugin/src/main/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html
rename to plugin/src/main/resources/inspectionDescriptions/DefaultNotLastCaseInSwitchJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/DivideByZeroJS.html b/plugin/src/main/resources/inspectionDescriptions/DivideByZeroJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/DivideByZeroJS.html
rename to plugin/src/main/resources/inspectionDescriptions/DivideByZeroJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/DocumentWriteJS.html b/plugin/src/main/resources/inspectionDescriptions/DocumentWriteJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/DocumentWriteJS.html
rename to plugin/src/main/resources/inspectionDescriptions/DocumentWriteJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/DuplicateCaseLabelJS.html b/plugin/src/main/resources/inspectionDescriptions/DuplicateCaseLabelJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/DuplicateCaseLabelJS.html
rename to plugin/src/main/resources/inspectionDescriptions/DuplicateCaseLabelJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/DuplicateConditionJS.html b/plugin/src/main/resources/inspectionDescriptions/DuplicateConditionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/DuplicateConditionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/DuplicateConditionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html b/plugin/src/main/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html
rename to plugin/src/main/resources/inspectionDescriptions/DuplicatePropertyOnObjectJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html b/plugin/src/main/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html
rename to plugin/src/main/resources/inspectionDescriptions/DynamicallyGeneratedCodeJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/EmptyCatchBlockJS.html b/plugin/src/main/resources/inspectionDescriptions/EmptyCatchBlockJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/EmptyCatchBlockJS.html
rename to plugin/src/main/resources/inspectionDescriptions/EmptyCatchBlockJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/EmptyFinallyBlockJS.html b/plugin/src/main/resources/inspectionDescriptions/EmptyFinallyBlockJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/EmptyFinallyBlockJS.html
rename to plugin/src/main/resources/inspectionDescriptions/EmptyFinallyBlockJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/EmptyStatementBodyJS.html b/plugin/src/main/resources/inspectionDescriptions/EmptyStatementBodyJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/EmptyStatementBodyJS.html
rename to plugin/src/main/resources/inspectionDescriptions/EmptyStatementBodyJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/EmptyTryBlockJS.html b/plugin/src/main/resources/inspectionDescriptions/EmptyTryBlockJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/EmptyTryBlockJS.html
rename to plugin/src/main/resources/inspectionDescriptions/EmptyTryBlockJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html b/plugin/src/main/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/EqualityComparisonWithCoercionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html b/plugin/src/main/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ExceptionCaughtLocallyJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/FallthroughInSwitchStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html b/plugin/src/main/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ForLoopReplaceableByWhileJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html b/plugin/src/main/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ForLoopThatDoesntUseLoopVariableJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/FunctionNamingConventionJS.html b/plugin/src/main/resources/inspectionDescriptions/FunctionNamingConventionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/FunctionNamingConventionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/FunctionNamingConventionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html b/plugin/src/main/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html
rename to plugin/src/main/resources/inspectionDescriptions/FunctionWithInconsistentReturnsJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html b/plugin/src/main/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html
rename to plugin/src/main/resources/inspectionDescriptions/FunctionWithMultipleLoopsJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html b/plugin/src/main/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html
rename to plugin/src/main/resources/inspectionDescriptions/FunctionWithMultipleReturnPointsJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html b/plugin/src/main/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html
rename to plugin/src/main/resources/inspectionDescriptions/IfStatementWithIdenticalBranchesJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html b/plugin/src/main/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html
rename to plugin/src/main/resources/inspectionDescriptions/IfStatementWithTooManyBranchesJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/IncompatibleMaskJS.html b/plugin/src/main/resources/inspectionDescriptions/IncompatibleMaskJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/IncompatibleMaskJS.html
rename to plugin/src/main/resources/inspectionDescriptions/IncompatibleMaskJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html b/plugin/src/main/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html
rename to plugin/src/main/resources/inspectionDescriptions/IncrementDecrementResultUsedJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/InfiniteLoopJS.html b/plugin/src/main/resources/inspectionDescriptions/InfiniteLoopJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/InfiniteLoopJS.html
rename to plugin/src/main/resources/inspectionDescriptions/InfiniteLoopJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/InfiniteRecursionJS.html b/plugin/src/main/resources/inspectionDescriptions/InfiniteRecursionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/InfiniteRecursionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/InfiniteRecursionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/InnerHTMLJS.html b/plugin/src/main/resources/inspectionDescriptions/InnerHTMLJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/InnerHTMLJS.html
rename to plugin/src/main/resources/inspectionDescriptions/InnerHTMLJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/LabeledStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/LabeledStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/LabeledStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/LabeledStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html b/plugin/src/main/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/LocalVariableNamingConventionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html b/plugin/src/main/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html
rename to plugin/src/main/resources/inspectionDescriptions/LoopStatementThatDoesntLoopJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/MagicNumberJS.html b/plugin/src/main/resources/inspectionDescriptions/MagicNumberJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/MagicNumberJS.html
rename to plugin/src/main/resources/inspectionDescriptions/MagicNumberJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NegatedConditionalExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NegatedIfStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/NegatedIfStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NegatedIfStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NegatedIfStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NestedAssignmentJS.html b/plugin/src/main/resources/inspectionDescriptions/NestedAssignmentJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NestedAssignmentJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NestedAssignmentJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NestedConditionalExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/NestedConditionalExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NestedConditionalExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NestedConditionalExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NestedFunctionCallJS.html b/plugin/src/main/resources/inspectionDescriptions/NestedFunctionCallJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NestedFunctionCallJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NestedFunctionCallJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NestedFunctionJS.html b/plugin/src/main/resources/inspectionDescriptions/NestedFunctionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NestedFunctionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NestedFunctionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NestedSwitchStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/NestedSwitchStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NestedSwitchStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NestedSwitchStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NestingDepthJS.html b/plugin/src/main/resources/inspectionDescriptions/NestingDepthJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NestingDepthJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NestingDepthJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NonBlockStatementBodyJS.html b/plugin/src/main/resources/inspectionDescriptions/NonBlockStatementBodyJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NonBlockStatementBodyJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NonBlockStatementBodyJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/NonShortCircuitBooleanExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html b/plugin/src/main/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ObjectAllocationIgnoredJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/OctalIntegerJS.html b/plugin/src/main/resources/inspectionDescriptions/OctalIntegerJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/OctalIntegerJS.html
rename to plugin/src/main/resources/inspectionDescriptions/OctalIntegerJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/OverlyComplexArithmeticExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/OverlyComplexBooleanExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ParameterNamingConventionJS.html b/plugin/src/main/resources/inspectionDescriptions/ParameterNamingConventionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ParameterNamingConventionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ParameterNamingConventionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ParametersPerFunctionJS.html b/plugin/src/main/resources/inspectionDescriptions/ParametersPerFunctionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ParametersPerFunctionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ParametersPerFunctionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/PlatformDetectionJS.html b/plugin/src/main/resources/inspectionDescriptions/PlatformDetectionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/PlatformDetectionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/PlatformDetectionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/PointlessArithmeticExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/PointlessBitwiseExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/PointlessBooleanExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html b/plugin/src/main/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ReplaceAssignmentWithOperatorAssignmentJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html b/plugin/src/main/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ReservedWordUsedAsNameJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html b/plugin/src/main/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ReturnFromFinallyBlockJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html b/plugin/src/main/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ReuseOfLocalVariableJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ShiftOutOfRangeJS.html b/plugin/src/main/resources/inspectionDescriptions/ShiftOutOfRangeJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ShiftOutOfRangeJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ShiftOutOfRangeJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/SillyAssignmentJS.html b/plugin/src/main/resources/inspectionDescriptions/SillyAssignmentJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/SillyAssignmentJS.html
rename to plugin/src/main/resources/inspectionDescriptions/SillyAssignmentJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/StatementsPerFunctionJS.html b/plugin/src/main/resources/inspectionDescriptions/StatementsPerFunctionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/StatementsPerFunctionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/StatementsPerFunctionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html b/plugin/src/main/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html
rename to plugin/src/main/resources/inspectionDescriptions/StringLiteralBreaksHTMLJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html b/plugin/src/main/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html
rename to plugin/src/main/resources/inspectionDescriptions/SwitchStatementWithNoDefaultBranchJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/TailRecursionJS.html b/plugin/src/main/resources/inspectionDescriptions/TailRecursionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/TailRecursionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/TailRecursionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/TextLabelInSwitchStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html b/plugin/src/main/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ThisExpressionReferencesGlobalObjectJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html b/plugin/src/main/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ThreeNegationsPerFunctionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html b/plugin/src/main/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html
rename to plugin/src/main/resources/inspectionDescriptions/ThrowFromFinallyBlockJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/TrivialConditionalJS.html b/plugin/src/main/resources/inspectionDescriptions/TrivialConditionalJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/TrivialConditionalJS.html
rename to plugin/src/main/resources/inspectionDescriptions/TrivialConditionalJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/TrivialIfJS.html b/plugin/src/main/resources/inspectionDescriptions/TrivialIfJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/TrivialIfJS.html
rename to plugin/src/main/resources/inspectionDescriptions/TrivialIfJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/UnnecessaryContinueJS.html b/plugin/src/main/resources/inspectionDescriptions/UnnecessaryContinueJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/UnnecessaryContinueJS.html
rename to plugin/src/main/resources/inspectionDescriptions/UnnecessaryContinueJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelJS.html b/plugin/src/main/resources/inspectionDescriptions/UnnecessaryLabelJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelJS.html
rename to plugin/src/main/resources/inspectionDescriptions/UnnecessaryLabelJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnBreakStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/UnnecessaryLabelOnContinueStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html b/plugin/src/main/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html
rename to plugin/src/main/resources/inspectionDescriptions/UnnecessaryLocalVariableJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/UnnecessaryReturnJS.html b/plugin/src/main/resources/inspectionDescriptions/UnnecessaryReturnJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/UnnecessaryReturnJS.html
rename to plugin/src/main/resources/inspectionDescriptions/UnnecessaryReturnJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/UnreachableCodeJS.html b/plugin/src/main/resources/inspectionDescriptions/UnreachableCodeJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/UnreachableCodeJS.html
rename to plugin/src/main/resources/inspectionDescriptions/UnreachableCodeJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/UnterminatedStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/UnterminatedStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/UnterminatedStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/UnterminatedStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/UnusedCatchParameterJS.html b/plugin/src/main/resources/inspectionDescriptions/UnusedCatchParameterJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/UnusedCatchParameterJS.html
rename to plugin/src/main/resources/inspectionDescriptions/UnusedCatchParameterJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/VoidExpressionJS.html b/plugin/src/main/resources/inspectionDescriptions/VoidExpressionJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/VoidExpressionJS.html
rename to plugin/src/main/resources/inspectionDescriptions/VoidExpressionJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/WithStatementJS.html b/plugin/src/main/resources/inspectionDescriptions/WithStatementJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/WithStatementJS.html
rename to plugin/src/main/resources/inspectionDescriptions/WithStatementJS.html
diff --git a/inspections/src/main/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html b/plugin/src/main/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html
similarity index 100%
rename from inspections/src/main/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html
rename to plugin/src/main/resources/inspectionDescriptions/XHTMLIncompatabilitiesJS.html
diff --git a/pom.xml b/pom.xml
index 8f1e47d7..6836dfa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,18 +17,6 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>16</source>
-					<target>16</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 
 	<parent>
 		<groupId>consulo</groupId>
diff --git a/web-browser-impl/pom.xml b/web-browser-impl/pom.xml
index 76e3376e..17aeac49 100644
--- a/web-browser-impl/pom.xml
+++ b/web-browser-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
+		<artifactId>arch.ide-api-provided</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
new file mode 100644
index 00000000..a288b88d
--- /dev/null
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
@@ -0,0 +1,61 @@
+package consulo.javascript.client.module.extension;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.icon.JavaScriptIconGroup;
+import consulo.localize.LocalizeValue;
+import consulo.module.content.layer.ModuleExtensionProvider;
+import consulo.module.content.layer.ModuleRootLayer;
+import consulo.module.extension.ModuleExtension;
+import consulo.module.extension.MutableModuleExtension;
+import consulo.ui.image.Image;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+@ExtensionImpl
+public class ClientJavaScriptModuleExtensionProvider implements ModuleExtensionProvider<ClientJavaScriptModuleExtension>
+{
+	@Nonnull
+	@Override
+	public String getId()
+	{
+		return "client-javascript";
+	}
+
+	@Override
+	public boolean isAllowMixin()
+	{
+		return true;
+	}
+
+	@Nonnull
+	@Override
+	public LocalizeValue getName()
+	{
+		return LocalizeValue.localizeTODO("JavaScript (Client)");
+	}
+
+	@Nonnull
+	@Override
+	public Image getIcon()
+	{
+		return JavaScriptIconGroup.javascript();
+	}
+
+	@Nonnull
+	@Override
+	public ModuleExtension<ClientJavaScriptModuleExtension> createImmutableExtension(@Nonnull ModuleRootLayer moduleRootLayer)
+	{
+		return new ClientJavaScriptModuleExtension(getId(), moduleRootLayer);
+	}
+
+	@Nonnull
+	@Override
+	public MutableModuleExtension<ClientJavaScriptModuleExtension> createMutableExtension(@Nonnull ModuleRootLayer moduleRootLayer)
+	{
+		return new ClientJavaScriptMutableModuleExtension(getId(), moduleRootLayer);
+	}
+}
diff --git a/web-browser-impl/src/main/java/module-info.java b/web-browser-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..84b86bbd
--- /dev/null
+++ b/web-browser-impl/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+/**
+ * @author VISTALL
+ * @since 29-Aug-22
+ */
+module consulo.javascript.web.browser.impl
+{
+	// TODO remove in future
+	requires java.desktop;
+
+	requires consulo.javascript.base.impl;
+}
\ No newline at end of file

From f06d10e78207fd0b512c4465a6609f1e53315b64 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 29 Aug 2022 16:50:09 +0300
Subject: [PATCH 162/340] regexp impl moved to own jar, since it's can not
 loaded while regexp disabled

---
 plugin/pom.xml                                | 13 ++--
 plugin/src/main/java/module-info.java         |  2 -
 pom.xml                                       |  1 +
 regexp-impl/pom.xml                           | 64 +++++++++++++++++++
 .../JavaScriptRegExpLiteralLanguageHost.java  |  2 +-
 .../JavaScriptRegexpMultiHostInjector.java    |  2 +-
 .../resources/META-INF/plugin-requires.xml    |  5 ++
 7 files changed, 78 insertions(+), 11 deletions(-)
 create mode 100644 regexp-impl/pom.xml
 rename {plugin/src/main/java/consulo/javascript/impl/lang => regexp-impl/src/main/java/consulo/javascript}/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java (97%)
 rename {plugin/src/main/java/consulo/javascript/impl/lang => regexp-impl/src/main/java/consulo/javascript}/regexp/impl/JavaScriptRegexpMultiHostInjector.java (97%)
 create mode 100644 regexp-impl/src/main/resources/META-INF/plugin-requires.xml

diff --git a/plugin/pom.xml b/plugin/pom.xml
index f0e1c5c1..49ca2107 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -166,6 +166,12 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-regexp.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>consulo.internal</groupId>
 			<artifactId>lib.org.chromium.sdk</artifactId>
@@ -179,12 +185,5 @@
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.regexp</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/plugin/src/main/java/module-info.java b/plugin/src/main/java/module-info.java
index 12daf867..7fe58218 100644
--- a/plugin/src/main/java/module-info.java
+++ b/plugin/src/main/java/module-info.java
@@ -10,7 +10,6 @@
 	requires consulo.language.editor.impl;
 
 	requires com.intellij.xml;
-	requires static com.intellij.regexp;
 
 	// TODO remove in future
 	requires java.desktop;
@@ -47,7 +46,6 @@
 	exports consulo.javascript.impl.lang;
 	exports consulo.javascript.impl.lang.navigation;
 	exports consulo.javascript.impl.lang.psi;
-	exports consulo.javascript.impl.lang.regexp.impl;
 	exports consulo.javascript.impl.psi.impl.reference;
 	exports com.intellij.lang.javascript.impl.validation;
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6836dfa5..246448a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
 		<module>lang-version-impl/ecmascript4-impl</module>
 		<module>lang-version-impl/ecmascript-impl</module>
 		<module>lang-version-impl/json-javascript-impl</module>
+		<module>regexp-impl</module>
 		<module>plugin</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/regexp-impl/pom.xml b/regexp-impl/pom.xml
new file mode 100644
index 00000000..7e6beacc
--- /dev/null
+++ b/regexp-impl/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2022 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>consulo</groupId>
+		<artifactId>arch.ide-api-provided</artifactId>
+		<version>3-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>consulo.plugin</groupId>
+	<artifactId>consulo.javascript-regexp.impl</artifactId>
+	<version>3-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<repositories>
+		<repository>
+			<id>consulo</id>
+			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>interval:60</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>consulo.javascript-base.impl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.xml</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>com.intellij.regexp</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
similarity index 97%
rename from plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
rename to regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
index 34200890..c79e6a84 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
+++ b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
@@ -1,4 +1,4 @@
-package consulo.javascript.impl.lang.regexp.impl;
+package consulo.javascript.regexp.impl;
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl;
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
similarity index 97%
rename from plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
rename to regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
index 14139797..bd3b6efe 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/regexp/impl/JavaScriptRegexpMultiHostInjector.java
+++ b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package consulo.javascript.impl.lang.regexp.impl;
+package consulo.javascript.regexp.impl;
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.document.util.TextRange;
diff --git a/regexp-impl/src/main/resources/META-INF/plugin-requires.xml b/regexp-impl/src/main/resources/META-INF/plugin-requires.xml
new file mode 100644
index 00000000..5ceefcc4
--- /dev/null
+++ b/regexp-impl/src/main/resources/META-INF/plugin-requires.xml
@@ -0,0 +1,5 @@
+<consulo-plugin-requires>
+	<plugins>
+		<plugin>com.intellij.regexp</plugin>
+	</plugins>
+</consulo-plugin-requires>
\ No newline at end of file

From da08b513be2fed86228c97a13d57a80313ec4b0b Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 29 Aug 2022 17:18:44 +0300
Subject: [PATCH 163/340] added missed @ExtensionImpl

---
 .../inspectjs/InspectionJSBundle.properties   |   20 +-
 .../lang/javascript/JSAbstractBundle.java     |   85 +-
 .../intention/JSElementIterator.java          |  289 ++--
 .../intention/JSElementPredicate.java         |    5 +-
 .../intention/JSFunctionVisitor.java          |  313 ++--
 .../intention/JSIntentionBundle.java          |   30 +-
 .../intention/JSMutablyNamedIntention.java    |   48 +-
 .../intention/bool/ComparisonPredicate.java   |   40 +-
 .../intention/bool/ConjunctionPredicate.java  |   39 +-
 .../bool/JSDeMorgansLawIntention.java         |  157 +-
 .../bool/JSFlipComparisonIntention.java       |   94 +-
 .../bool/JSFlipConjunctionIntention.java      |  115 +-
 .../bool/JSNegateComparisonIntention.java     |   94 +-
 .../JSRemoveBooleanEqualityIntention.java     |  179 ++-
 .../braces/JSAddBracesIntention.java          |  186 ++-
 .../braces/JSRemoveBracesIntention.java       |  224 +--
 .../JSChangeToCStyleCommentIntention.java     |  200 ++-
 .../JSChangeToEndOfLineCommentIntention.java  |  213 +--
 .../JSMoveCommentToSeparateLineIntention.java |  154 +-
 .../JSFlipConditionalIntention.java           |   89 +-
 .../conditional/JSFlipIfIntention.java        |   96 +-
 .../JSRemoveConditionalIntention.java         |  110 +-
 .../JSReplaceConditionalWithIfIntention.java  |   53 +-
 .../JSConstantExpressionIntention.java        |  134 +-
 .../JSConstantSubexpressionIntention.java     |  367 +++--
 .../JSExtractIncrementIntention.java          |  142 +-
 ...DeclarationAndInitializationIntention.java |  160 +-
 ...DeclarationAndInitializationIntention.java |  164 +-
 .../JSMergeParallelForInLoopsIntention.java   |  309 ++--
 .../JSMergeParallelForLoopsIntention.java     |  228 +--
 .../JSConvertIntegerToDecimalIntention.java   |   75 +-
 .../JSConvertIntegerToHexIntention.java       |   58 +-
 .../JSConvertIntegerToOctalIntention.java     |   75 +-
 .../JSReplaceMultiplyWithShiftIntention.java  |  274 ++--
 .../JSReplaceShiftWithMultiplyIntention.java  |  258 +--
 .../intention/number/ShiftUtils.java          |  160 +-
 ...eplaceWithOperatorAssignmentIntention.java |  195 ++-
 ...RemoveUnnecessaryParenthesesIntention.java |  169 +-
 ...JSDoubleToSingleQuotedStringIntention.java |  107 +-
 ...inConcatenatedStringLiteralsIntention.java |  142 +-
 ...JSSingleToDoubleQuotedStringIntention.java |  109 +-
 .../intention/string/StringUtil.java          |   49 +-
 .../intention/switchtoif/CaseUtil.java        |  416 ++---
 .../JSReplaceIfWithSwitchIntention.java       |  857 +++++-----
 .../JSReplaceSwitchWithIfIntention.java       |  877 +++++-----
 .../switchtoif/LabelSearchVisitor.java        |   36 +-
 .../switchtoif/LocalVariableUsageVisitor.java |   38 +-
 .../trivialif/JSMergeElseIfIntention.java     |  147 +-
 .../trivialif/JSMergeIfAndIntention.java      |  165 +-
 .../trivialif/JSMergeIfOrIntention.java       |  371 +++--
 .../JSMergeParallelIfsIntention.java          |  224 +--
 .../JSRemoveRedundantElseIntention.java       |  154 +-
 .../JSReplaceIfWithConditionalIntention.java  |  544 ++++---
 .../trivialif/JSSimplifyIfElseIntention.java  |  116 +-
 .../trivialif/JSSplitElseIfIntention.java     |   85 +-
 .../trivialif/JSSplitIfAndIntention.java      |  199 ++-
 .../trivialif/JSSplitIfOrIntention.java       |  180 ++-
 .../lang/javascript/psiutil/ArrayStack.java   |  194 +--
 .../psiutil/BinaryOperatorUtils.java          |  185 ++-
 .../lang/javascript/psiutil/BoolUtils.java    |  324 ++--
 .../javascript/psiutil/ComparisonUtils.java   |  167 +-
 .../javascript/psiutil/ConditionalUtils.java  |  665 ++++----
 .../javascript/psiutil/ControlFlowUtils.java  | 1319 ++++++++-------
 .../javascript/psiutil/DeclarationUtils.java  |  321 ++--
 .../psiutil/EquivalenceChecker.java           | 1430 +++++++++--------
 .../lang/javascript/psiutil/ErrorUtil.java    |   59 +-
 .../javascript/psiutil/ExpressionUtil.java    |  366 +++--
 .../javascript/psiutil/FindReferenceUtil.java |  325 ++--
 .../javascript/psiutil/JSElementFactory.java  |  653 ++++----
 .../psiutil/JSRecursionVisitor.java           |   91 +-
 .../psiutil/JSRecursiveElementVisitor.java    |   11 +-
 .../lang/javascript/psiutil/NumberUtil.java   |   83 +-
 .../javascript/psiutil/ParenthesesUtils.java  |  669 ++++----
 .../javascript/psiutil/RecursionUtil.java     | 1311 ++++++++-------
 .../javascript/psiutil/SideEffectChecker.java |  111 +-
 .../lang/javascript/psiutil/TreeUtil.java     |  291 ++--
 .../psiutil/VariableAccessUtil.java           |  939 ++++++-----
 .../PropertyValidationInspection.java         |   35 +-
 .../JavaScriptFileTemplateContributor.java    |    2 +
 .../main/resources/META-INF/Intentions.xml    |  209 ---
 80 files changed, 11123 insertions(+), 9054 deletions(-)
 delete mode 100644 plugin/src/main/resources/META-INF/Intentions.xml

diff --git a/inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties b/inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties
index c30aa52c..01076546 100644
--- a/inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties
+++ b/inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties
@@ -213,17 +213,17 @@ pattern.parameter=Pattern:
 min.length.parameter=Min Length:
 max.length.parameter=Max Length:
 wrap.statement.body.fix=Wrap statement body
-error.handling.javascript.group.name=Error handling (JavaScript)
-control.flow.issues.javascript.group.name=Control flow issues (JavaScript)
+error.handling.javascript.group.name=Error handling
+control.flow.issues.javascript.group.name=Control flow issues
 javascript.validity.issues.group.name=JavaScript validity issues
-potentially.confusing.code.constructs.javascript.group.name=Potentially confusing code constructs (JavaScript)
+potentially.confusing.code.constructs.javascript.group.name=Potentially confusing code constructs
 javascript.function.metrics.group.name=JavaScript function metrics
-assignment.issues.javascript.group.name=Assignment issues (JavaScript)
-naming.conventions.javascript.group.name=Naming conventions (JavaScript)
-code.style.issues.javascript.group.name=Code style issues (JavaScript)
+assignment.issues.javascript.group.name=Assignment issues
+naming.conventions.javascript.group.name=Naming conventions
+code.style.issues.javascript.group.name=Code style issues
 javascript.dom.issues.group.name=JavaScript DOM issues
-probable.bugs.javascript.group.name=Probable Bugs (JavaScript)
-code.maturity.javascript.group.name=Code Maturity (JavaScript)
+probable.bugs.javascript.group.name=Probable Bugs
+code.maturity.javascript.group.name=Code Maturity
 confusing.floating.point.literal.display.name=Confusing floating point literal
 confusing.floating.point.literal.problem.descriptor=Confusing floating point literal <code>#ref</code> #loc
 confusing.pluses.or.minuses.display.name=Confusing sequence of '+' or '-'
@@ -241,8 +241,8 @@ unused.catch.parameter.ignore.catch.option=Ignore catch blocks containing commen
 tail.recursion.display.name=Tail recursion
 tail.recursion.problem.descriptor=Tail recursion #loc
 redundant.local.variable.display.name=Redundant local variable
-data.flow.issues.javascript.group.name=Data flow issues (JavaScript)
-bitwise.issues.javascript.group.name=Bitwise operation issues (JavaScript)
+data.flow.issues.javascript.group.name=Data flow issues
+bitwise.issues.javascript.group.name=Bitwise operation issues
 redundant.local.variable.ignore.option=Ignore immediately returned or thrown variables
 unnecessary.local.variable.problem.descriptor=Unnecessary local variable
 reuse.of.local.variable.display.name=Reuse of local variable
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
index e1ff8e47..d6c06a82 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
@@ -18,48 +18,61 @@
 /**
  * Abstract super class for JS inspection and intention bundles
  */
-public abstract class JSAbstractBundle {
-    protected JSAbstractBundle() {}
+public abstract class JSAbstractBundle
+{
+	protected JSAbstractBundle()
+	{
+	}
 
-    public static String getKey(String className, String classNameSuffix,
-                                String alternateClassNameSuffix, Object... suffixes) {
-        String name        = className;
-        int    dollarIndex = name.indexOf((int) '$');
+	public static String getKey(String className, String classNameSuffix,
+								String alternateClassNameSuffix, Object... suffixes)
+	{
+		String name = className;
+		int dollarIndex = name.indexOf((int) '$');
 
-        if (dollarIndex >= 0) {
-            name = name.substring(0, dollarIndex);
-        }
-        if (name.endsWith(classNameSuffix)) {
-            name = name.substring(0, name.length() - classNameSuffix.length());
-        }
-        if (alternateClassNameSuffix != null && name.endsWith(alternateClassNameSuffix)) {
-            name = name.substring(0, name.length() - alternateClassNameSuffix.length());
-        }
+		if(dollarIndex >= 0)
+		{
+			name = name.substring(0, dollarIndex);
+		}
+		if(name.endsWith(classNameSuffix))
+		{
+			name = name.substring(0, name.length() - classNameSuffix.length());
+		}
+		if(alternateClassNameSuffix != null && name.endsWith(alternateClassNameSuffix))
+		{
+			name = name.substring(0, name.length() - alternateClassNameSuffix.length());
+		}
 
-        final int           length           = name.length();
-        final StringBuilder buffer           = new StringBuilder(length + 10);
-        boolean             addWordSeparator = false;
+		final int length = name.length();
+		final StringBuilder buffer = new StringBuilder(length + 10);
+		boolean addWordSeparator = false;
 
-        for (int index = 0; index < length; index++){
-            final char c = name.charAt(index);
+		for(int index = 0; index < length; index++)
+		{
+			final char c = name.charAt(index);
 
-            if (Character.isUpperCase(c)) {
-                if (addWordSeparator) {
-                    buffer.append('-');
-                    addWordSeparator = false;
-                }
-                buffer.append(Character.toLowerCase(c));
-            } else {
-                addWordSeparator = (c != '.');
-                buffer.append(c);
-            }
-        }
+			if(Character.isUpperCase(c))
+			{
+				if(addWordSeparator)
+				{
+					buffer.append('-');
+					addWordSeparator = false;
+				}
+				buffer.append(Character.toLowerCase(c));
+			}
+			else
+			{
+				addWordSeparator = (c != '.');
+				buffer.append(c);
+			}
+		}
 
-        for (final Object suffix : suffixes) {
-            buffer.append(suffix);
-        }
+		for(final Object suffix : suffixes)
+		{
+			buffer.append(suffix);
+		}
 
-        return buffer.toString();
-    }
+		return buffer.toString();
+	}
 
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
index 60b16a46..2d6362c1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
@@ -23,132 +23,165 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-public abstract class JSElementIterator implements Iterator<PsiElement> {
-
-    private boolean                reverse;
-    private final int              minTextOffset;
-    private final int              maxTextOffset;
-    private ArrayStack<PsiElement> elementStack;
-    private PsiElement next;
-    private boolean                retrieveNext;
-
-    public JSElementIterator(PsiElement element) {
-        this(element, false, 0, Integer.MAX_VALUE);
-    }
-
-    public JSElementIterator(PsiElement element, boolean reverse) {
-        this(element, reverse, 0, Integer.MAX_VALUE);
-    }
-
-    public JSElementIterator(PsiElement element, boolean reverse, int minTextOffset, int maxTextOffset) {
-        this.reverse       = reverse;
-        this.minTextOffset = minTextOffset;
-        this.maxTextOffset = maxTextOffset;
-        this.retrieveNext  = true;
-        this.elementStack  = new ArrayStack<PsiElement>();
-
-        if (element instanceof XmlFile) {
-            for (JSElement embeddedElement : JSFunctionVisitor.getEmbeddedJSElements((XmlFile) element)) {
-                if (reverse) {
-                    this.elementStack.add(0, embeddedElement);
-                } else {
-                    this.elementStack.add(embeddedElement);
-                }
-            }
-        } else if (element instanceof JSElement) {
-            this.elementStack.push(element);
-        } else {
-            throw new ClassCastException(element.getClass().getName());
-        }
-    }
-
-    /**
-     * Returns <tt>true</tt> if this element should be part of the iteration,
-     * <tt>false</tt> otherwise.
-     * @param element  this element
-     * @return <tt>true</tt> if this element should be part of the iteration,
-     *         <tt>false</tt> otherwise.
-     */
-    protected abstract boolean visitElement(PsiElement element);
-
-    private void findNext() {
-        PsiElement element = null;
-        boolean    pass    = false;
-
-        if (!this.elementStack.empty()) {
-            do {
-                element = this.elementStack.pop();
-
-                final int elementTextOffset    = element.getTextOffset();
-                final int elementTextEndOffset = elementTextOffset + element.getTextLength();
-
-                if (elementTextEndOffset >= this.minTextOffset &&
-                    elementTextOffset    <= this.maxTextOffset) {
-                    pass = this.visitElement(element);
-                    this.pushChildren(element.getChildren(),
-                                      (this.reverse ? elementTextOffset : elementTextEndOffset));
-                }
-            } while (!(pass || this.elementStack.empty()));
-        }
-
-        this.next         = (pass ? element : null);
-        this.retrieveNext = false;
-    }
-
-    private void pushChildren(PsiElement[] children, int elementTextOffset) {
-        int childTextOffset = elementTextOffset;
-
-        if (this.reverse) {
-            int index = 0;
-
-            while (index < children.length && childTextOffset <= this.maxTextOffset) {
-                final PsiElement child = children[index];
-
-                childTextOffset = child.getTextOffset();
-                if (childTextOffset <= this.maxTextOffset) {
-                    this.elementStack.push(child);
-                }
-                index++;
-            }
-        } else {
-            int index = children.length - 1;
-
-            while (index >= 0 && childTextOffset >= this.minTextOffset) {
-                final PsiElement child = children[index];
-
-                childTextOffset = child.getTextOffset() + child.getTextLength();
-                if (childTextOffset >= this.minTextOffset) {
-                    this.elementStack.push(child);
-                }
-                index--;
-            }
-        }
-    }
-
-    @Override
-	public boolean hasNext() {
-        if (this.retrieveNext) {
-            this.findNext();
-        }
-
-        return (this.next != null);
-    }
-
-    @Override
-	public PsiElement next() {
-        if (this.retrieveNext) {
-            this.findNext();  // hasNext() has not been called
-        }
-        if (this.next == null) {
-            throw new NoSuchElementException();
-        }
-
-        this.retrieveNext = true;
-        return this.next;
-    }
-
-    @Override
-	public void remove() {
-        throw new UnsupportedOperationException();
-    }
+public abstract class JSElementIterator implements Iterator<PsiElement>
+{
+
+	private boolean reverse;
+	private final int minTextOffset;
+	private final int maxTextOffset;
+	private ArrayStack<PsiElement> elementStack;
+	private PsiElement next;
+	private boolean retrieveNext;
+
+	public JSElementIterator(PsiElement element)
+	{
+		this(element, false, 0, Integer.MAX_VALUE);
+	}
+
+	public JSElementIterator(PsiElement element, boolean reverse)
+	{
+		this(element, reverse, 0, Integer.MAX_VALUE);
+	}
+
+	public JSElementIterator(PsiElement element, boolean reverse, int minTextOffset, int maxTextOffset)
+	{
+		this.reverse = reverse;
+		this.minTextOffset = minTextOffset;
+		this.maxTextOffset = maxTextOffset;
+		this.retrieveNext = true;
+		this.elementStack = new ArrayStack<PsiElement>();
+
+		if(element instanceof XmlFile)
+		{
+			for(JSElement embeddedElement : JSFunctionVisitor.getEmbeddedJSElements((XmlFile) element))
+			{
+				if(reverse)
+				{
+					this.elementStack.add(0, embeddedElement);
+				}
+				else
+				{
+					this.elementStack.add(embeddedElement);
+				}
+			}
+		}
+		else if(element instanceof JSElement)
+		{
+			this.elementStack.push(element);
+		}
+		else
+		{
+			throw new ClassCastException(element.getClass().getName());
+		}
+	}
+
+	/**
+	 * Returns <tt>true</tt> if this element should be part of the iteration,
+	 * <tt>false</tt> otherwise.
+	 *
+	 * @param element this element
+	 * @return <tt>true</tt> if this element should be part of the iteration,
+	 * <tt>false</tt> otherwise.
+	 */
+	protected abstract boolean visitElement(PsiElement element);
+
+	private void findNext()
+	{
+		PsiElement element = null;
+		boolean pass = false;
+
+		if(!this.elementStack.empty())
+		{
+			do
+			{
+				element = this.elementStack.pop();
+
+				final int elementTextOffset = element.getTextOffset();
+				final int elementTextEndOffset = elementTextOffset + element.getTextLength();
+
+				if(elementTextEndOffset >= this.minTextOffset &&
+						elementTextOffset <= this.maxTextOffset)
+				{
+					pass = this.visitElement(element);
+					this.pushChildren(element.getChildren(),
+							(this.reverse ? elementTextOffset : elementTextEndOffset));
+				}
+			}
+			while(!(pass || this.elementStack.empty()));
+		}
+
+		this.next = (pass ? element : null);
+		this.retrieveNext = false;
+	}
+
+	private void pushChildren(PsiElement[] children, int elementTextOffset)
+	{
+		int childTextOffset = elementTextOffset;
+
+		if(this.reverse)
+		{
+			int index = 0;
+
+			while(index < children.length && childTextOffset <= this.maxTextOffset)
+			{
+				final PsiElement child = children[index];
+
+				childTextOffset = child.getTextOffset();
+				if(childTextOffset <= this.maxTextOffset)
+				{
+					this.elementStack.push(child);
+				}
+				index++;
+			}
+		}
+		else
+		{
+			int index = children.length - 1;
+
+			while(index >= 0 && childTextOffset >= this.minTextOffset)
+			{
+				final PsiElement child = children[index];
+
+				childTextOffset = child.getTextOffset() + child.getTextLength();
+				if(childTextOffset >= this.minTextOffset)
+				{
+					this.elementStack.push(child);
+				}
+				index--;
+			}
+		}
+	}
+
+	@Override
+	public boolean hasNext()
+	{
+		if(this.retrieveNext)
+		{
+			this.findNext();
+		}
+
+		return (this.next != null);
+	}
+
+	@Override
+	public PsiElement next()
+	{
+		if(this.retrieveNext)
+		{
+			this.findNext();  // hasNext() has not been called
+		}
+		if(this.next == null)
+		{
+			throw new NoSuchElementException();
+		}
+
+		this.retrieveNext = true;
+		return this.next;
+	}
+
+	@Override
+	public void remove()
+	{
+		throw new UnsupportedOperationException();
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
index d92c216b..4e83e920 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
@@ -19,6 +19,7 @@
 
 import javax.annotation.Nonnull;
 
-public interface JSElementPredicate {
-    boolean satisfiedBy(@Nonnull PsiElement element);
+public interface JSElementPredicate
+{
+	boolean satisfiedBy(@Nonnull PsiElement element);
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
index 93f43678..cc0ca1a1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
@@ -30,142 +30,179 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-public class JSFunctionVisitor extends JSElementVisitor {
-
-    @Override public void visitElement(PsiElement element) {
-        if (element instanceof JSFunction) {
-            this.visitJSFunctionDeclaration((JSFunction) element);
-        } else if (element instanceof JSReferenceExpression) {
-            if (element == element.getParent().getChildren()[0]) {
-                final PsiElement firstChild = element.getParent().getFirstChild();
-
-                if (firstChild != null && firstChild.toString().indexOf(JSTokenTypes.NEW_KEYWORD.toString()) >= 0) {
-                    this.visitJSNewExpression(new JSNewExpressionImpl(element.getParent().getNode()));
-                }
-            }
-        }
-        else if (element instanceof XmlFile) {
-            processFile((XmlFile)element);
-        }
-
-        super.visitElement(element);
-
-        for (final PsiElement childElement : element.getChildren()) {
-            childElement.accept(this);
-        }
-    }
-
-    @Override public void visitJSNewExpression(JSNewExpression newExpression) {}
-
-    private static final Logger logger = Logger.getInstance(JSFunctionVisitor.class.getName());
-
-    private void processFile(XmlFile file) {
-      int  count = 0;
-      long start = System.currentTimeMillis();
-
-      for (final JSElement element : getEmbeddedJSElements(file)) {
-          this.visitElement(element);
-          count++;
-      }
-      logger.info("Processed inspection " + this.getClass().getSimpleName() + " on file " + file.getName() +
-                  " (" + count + " blocks) in " + (System.currentTimeMillis() - start) + " ms.");
-    }
-
-    static Iterable<JSElement> getEmbeddedJSElements(final XmlFile file) {
-        return new Iterable<JSElement>() {
-                @Override
-				public Iterator<JSElement> iterator() {
-                    return new EmbeddedJSElementIterator(file);
-                }
-            };
-    }
-
-    /**
-     * This iterator makes a textual search for every SCRIPT sub-text and
-     * tries and finds JSElement instances within this SCRIPT, on which
-     * this.visitElement() can be called.
-     */
-    private static class EmbeddedJSElementIterator implements Iterator<JSElement> {
-        @NonNls private static final String SCRIPT_START = "<SCRIPT";
-        @NonNls private static final String SCRIPT_END   = "</SCRIPT>";
-        @NonNls private static final String HTML_TAG_END = ">";
-
-        final XmlFile file;
-        final String          fileText;
-        int                   scriptStartIndex;
-        int                   scriptEndIndex;
-        JSElement             next;
-
-        public EmbeddedJSElementIterator(XmlFile file) {
-            this.file           = file;
-            this.fileText       = file.getText();
-            this.scriptEndIndex = -SCRIPT_END.length();
-
-            this.findNext();
-        }
-
-        @Override
-		public boolean hasNext() {
-            return (this.next != null);
-        }
-
-        @Override
-		public JSElement next() {
-            if (this.next == null) {
-                throw new NoSuchElementException();
-            }
-
-            JSElement next = this.next;
-
-            this.findNext();
-            return next;
-        }
-
-        private void findNext() {
-            if (!(this.next == null || this.next instanceof JSEmbeddedContentImpl)) {
-                this.next = PsiTreeUtil.getNextSiblingOfType(this.next, JSElement.class);
-
-                if (this.next != null) {
-                    return;
-                }
-            }
-
-            PsiElement psiElement;
-
-            do {
-                if (this.scriptStartIndex >= 0) {
-                    this.scriptStartIndex = this.fileText.indexOf(SCRIPT_START, this.scriptEndIndex + SCRIPT_END.length());
-                }
-
-                if (this.scriptStartIndex < 0) {
-                    this.next = null;
-                    return;
-                }
-
-                int offset = ((this.scriptStartIndex >= 0) ? this.fileText.indexOf(HTML_TAG_END, this.scriptStartIndex + SCRIPT_START.length()) + 1
-                              : 0);
-
-                this.scriptEndIndex = ((offset > 0) ? this.fileText.indexOf(SCRIPT_END, offset) : -1);
-                if (this.scriptEndIndex < 0) {
-                    this.scriptStartIndex = -1;
-                    return;
-                }
-
-                psiElement = this.file.findElementAt(offset);
-
-                if (psiElement instanceof PsiWhiteSpace) {
-                    psiElement = PsiTreeUtil.getNextSiblingOfType(psiElement, JSElement.class);
-                }
-
-                if (psiElement != null && psiElement instanceof JSElement) {
-                    this.next = FindReferenceUtil.getFarthestAncestor(psiElement, JSElement.class);
-                }
-            } while (this.next == null);
-        }
-
-        @Override
-		public void remove() {
-            throw new UnsupportedOperationException();
-        }
-    }
+public class JSFunctionVisitor extends JSElementVisitor
+{
+
+	@Override
+	public void visitElement(PsiElement element)
+	{
+		if(element instanceof JSFunction)
+		{
+			this.visitJSFunctionDeclaration((JSFunction) element);
+		}
+		else if(element instanceof JSReferenceExpression)
+		{
+			if(element == element.getParent().getChildren()[0])
+			{
+				final PsiElement firstChild = element.getParent().getFirstChild();
+
+				if(firstChild != null && firstChild.toString().indexOf(JSTokenTypes.NEW_KEYWORD.toString()) >= 0)
+				{
+					this.visitJSNewExpression(new JSNewExpressionImpl(element.getParent().getNode()));
+				}
+			}
+		}
+		else if(element instanceof XmlFile)
+		{
+			processFile((XmlFile) element);
+		}
+
+		super.visitElement(element);
+
+		for(final PsiElement childElement : element.getChildren())
+		{
+			childElement.accept(this);
+		}
+	}
+
+	@Override
+	public void visitJSNewExpression(JSNewExpression newExpression)
+	{
+	}
+
+	private static final Logger logger = Logger.getInstance(JSFunctionVisitor.class.getName());
+
+	private void processFile(XmlFile file)
+	{
+		int count = 0;
+		long start = System.currentTimeMillis();
+
+		for(final JSElement element : getEmbeddedJSElements(file))
+		{
+			this.visitElement(element);
+			count++;
+		}
+		logger.info("Processed inspection " + this.getClass().getSimpleName() + " on file " + file.getName() +
+				" (" + count + " blocks) in " + (System.currentTimeMillis() - start) + " ms.");
+	}
+
+	static Iterable<JSElement> getEmbeddedJSElements(final XmlFile file)
+	{
+		return new Iterable<JSElement>()
+		{
+			@Override
+			public Iterator<JSElement> iterator()
+			{
+				return new EmbeddedJSElementIterator(file);
+			}
+		};
+	}
+
+	/**
+	 * This iterator makes a textual search for every SCRIPT sub-text and
+	 * tries and finds JSElement instances within this SCRIPT, on which
+	 * this.visitElement() can be called.
+	 */
+	private static class EmbeddedJSElementIterator implements Iterator<JSElement>
+	{
+		@NonNls
+		private static final String SCRIPT_START = "<SCRIPT";
+		@NonNls
+		private static final String SCRIPT_END = "</SCRIPT>";
+		@NonNls
+		private static final String HTML_TAG_END = ">";
+
+		final XmlFile file;
+		final String fileText;
+		int scriptStartIndex;
+		int scriptEndIndex;
+		JSElement next;
+
+		public EmbeddedJSElementIterator(XmlFile file)
+		{
+			this.file = file;
+			this.fileText = file.getText();
+			this.scriptEndIndex = -SCRIPT_END.length();
+
+			this.findNext();
+		}
+
+		@Override
+		public boolean hasNext()
+		{
+			return (this.next != null);
+		}
+
+		@Override
+		public JSElement next()
+		{
+			if(this.next == null)
+			{
+				throw new NoSuchElementException();
+			}
+
+			JSElement next = this.next;
+
+			this.findNext();
+			return next;
+		}
+
+		private void findNext()
+		{
+			if(!(this.next == null || this.next instanceof JSEmbeddedContentImpl))
+			{
+				this.next = PsiTreeUtil.getNextSiblingOfType(this.next, JSElement.class);
+
+				if(this.next != null)
+				{
+					return;
+				}
+			}
+
+			PsiElement psiElement;
+
+			do
+			{
+				if(this.scriptStartIndex >= 0)
+				{
+					this.scriptStartIndex = this.fileText.indexOf(SCRIPT_START, this.scriptEndIndex + SCRIPT_END.length());
+				}
+
+				if(this.scriptStartIndex < 0)
+				{
+					this.next = null;
+					return;
+				}
+
+				int offset = ((this.scriptStartIndex >= 0) ? this.fileText.indexOf(HTML_TAG_END, this.scriptStartIndex + SCRIPT_START.length()) + 1
+						: 0);
+
+				this.scriptEndIndex = ((offset > 0) ? this.fileText.indexOf(SCRIPT_END, offset) : -1);
+				if(this.scriptEndIndex < 0)
+				{
+					this.scriptStartIndex = -1;
+					return;
+				}
+
+				psiElement = this.file.findElementAt(offset);
+
+				if(psiElement instanceof PsiWhiteSpace)
+				{
+					psiElement = PsiTreeUtil.getNextSiblingOfType(psiElement, JSElement.class);
+				}
+
+				if(psiElement != null && psiElement instanceof JSElement)
+				{
+					this.next = FindReferenceUtil.getFarthestAncestor(psiElement, JSElement.class);
+				}
+			}
+			while(this.next == null);
+		}
+
+		@Override
+		public void remove()
+		{
+			throw new UnsupportedOperationException();
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
index 4964b8a1..6cca6e24 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
@@ -15,23 +15,27 @@
  */
 package org.intellij.idea.lang.javascript.intention;
 
-import java.util.ResourceBundle;
-
 import consulo.application.CommonBundle;
-import org.jetbrains.annotations.PropertyKey;
-import org.jetbrains.annotations.NonNls;
 import org.intellij.idea.lang.javascript.JSAbstractBundle;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.PropertyKey;
+
+import java.util.ResourceBundle;
 
-public class JSIntentionBundle extends JSAbstractBundle {
+public class JSIntentionBundle extends JSAbstractBundle
+{
 
-    @NonNls
-    private static final String         bundleClassName = "org.intellij.idea.lang.javascript.intention.JavaScriptIntentionBundle";
-    private static final ResourceBundle ourBundle       = ResourceBundle.getBundle(bundleClassName);
+	@NonNls
+	private static final String bundleClassName = "org.intellij.idea.lang.javascript.intention.JavaScriptIntentionBundle";
+	private static final ResourceBundle ourBundle = ResourceBundle.getBundle(bundleClassName);
 
-    private JSIntentionBundle() {}
+	private JSIntentionBundle()
+	{
+	}
 
-    public static String message(@PropertyKey(resourceBundle = bundleClassName) String key,
-                                 Object... params) {
-        return CommonBundle.message(ourBundle, key, params);
-    }
+	public static String message(@PropertyKey(resourceBundle = bundleClassName) String key,
+								 Object... params)
+	{
+		return CommonBundle.message(ourBundle, key, params);
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 4f25052c..7b9e6c43 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -15,34 +15,42 @@
  */
 package org.intellij.idea.lang.javascript.intention;
 
-import javax.annotation.Nonnull;
-
 import consulo.codeEditor.Editor;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public abstract class JSMutablyNamedIntention extends JSIntention {
-    private String text;
+public abstract class JSMutablyNamedIntention extends JSIntention
+{
+	private String myText;
 
-    @NonNls protected abstract String getTextForElement(PsiElement element);
+	protected abstract String getTextForElement(PsiElement element);
 
-    @Override
+	@Override
 	@Nonnull
-	public String getText() {
-      return text;
-    }
+	public String getText()
+	{
+		if(myText != null)
+		{
+			return myText;
+		}
+		return super.getText();
+	}
 
-    @Override
-	public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node) {
-      final PsiElement element = findMatchingElement(node);
-      if (element != null) {
-        text = getTextForElement(element);
-        return true;
-      } else {
-        return false;
-      }
-    }
+	@Override
+	public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node)
+	{
+		final PsiElement element = findMatchingElement(node);
+		if(element != null)
+		{
+			myText = getTextForElement(element);
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
index 74ed71d3..3257f1dd 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
@@ -15,30 +15,34 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.language.psi.PsiElement;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import javax.annotation.Nonnull;
 
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.language.psi.PsiElement;
+import javax.annotation.Nonnull;
 
-class ComparisonPredicate implements JSElementPredicate {
-    @Override
-	public boolean satisfiedBy(@Nonnull PsiElement element) {
-        if (!(element instanceof JSBinaryExpression)) {
-            return false;
-        }
-        if (ErrorUtil.containsError(element)) {
-            return false;
-        }
+class ComparisonPredicate implements JSElementPredicate
+{
+	@Override
+	public boolean satisfiedBy(@Nonnull PsiElement element)
+	{
+		if(!(element instanceof JSBinaryExpression))
+		{
+			return false;
+		}
+		if(ErrorUtil.containsError(element))
+		{
+			return false;
+		}
 
-        final JSBinaryExpression expression = (JSBinaryExpression) element;
-        final JSExpression       rhs        = expression.getROperand();
+		final JSBinaryExpression expression = (JSBinaryExpression) element;
+		final JSExpression rhs = expression.getROperand();
 
-        return (rhs != null &&
-                ComparisonUtils.isComparisonOperator((JSExpression) element));
+		return (rhs != null &&
+				ComparisonUtils.isComparisonOperator((JSExpression) element));
 
-    }
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
index 4ee039fb..35b3f95c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
@@ -15,29 +15,32 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
-import javax.annotation.Nonnull;
-
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
+
+import javax.annotation.Nonnull;
 
-class ConjunctionPredicate implements JSElementPredicate {
-    @Override
-	public boolean satisfiedBy(@Nonnull PsiElement element) {
-        if (!(element instanceof JSBinaryExpression)) {
-            return false;
-        }
-        if (ErrorUtil.containsError(element)) {
-            return false;
-        }
+class ConjunctionPredicate implements JSElementPredicate
+{
+	@Override
+	public boolean satisfiedBy(@Nonnull PsiElement element)
+	{
+		if(!(element instanceof JSBinaryExpression))
+		{
+			return false;
+		}
+		if(ErrorUtil.containsError(element))
+		{
+			return false;
+		}
 
-        final JSBinaryExpression expression = (JSBinaryExpression) element;
-        final IElementType       sign       = expression.getOperationSign();
+		final JSBinaryExpression expression = (JSBinaryExpression) element;
+		final IElementType sign = expression.getOperationSign();
 
-        return (sign.equals(JSTokenTypes.ANDAND) || sign.equals(JSTokenTypes.OROR));
-    }
+		return (sign.equals(JSTokenTypes.ANDAND) || sign.equals(JSTokenTypes.OROR));
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 3689c3e6..ce99621d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -15,82 +15,101 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
-import javax.annotation.Nonnull;
-
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
-import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.language.psi.PsiElement;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
+import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
+import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
+import org.jetbrains.annotations.NonNls;
 
-public class JSDeMorgansLawIntention extends JSMutablyNamedIntention {
-    @NonNls private static final String AND_OPERATOR = "&&";
-    @NonNls private static final String OR_OPERATOR  = "||";
-    @NonNls private static final String AND_SUFFIX   = "ANDAND";
-    @NonNls private static final String OR_SUFFIX    = "OROR";
-
-    @Override
-	protected String getTextForElement(PsiElement element) {
-        final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
-
-        return this.getSuffixedDisplayName(tokenType.equals(JSTokenTypes.ANDAND) ? AND_SUFFIX : OR_SUFFIX);
-    }
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSDeMorgansLawIntention", categories = {
+		"JavaScript",
+		"Boolean"
+}, fileExtensions = "js")
+public class JSDeMorgansLawIntention extends JSMutablyNamedIntention
+{
+	@NonNls
+	private static final String AND_OPERATOR = "&&";
+	@NonNls
+	private static final String OR_OPERATOR = "||";
+	@NonNls
+	private static final String AND_SUFFIX = "ANDAND";
+	@NonNls
+	private static final String OR_SUFFIX = "OROR";
+
+	@Override
+	protected String getTextForElement(PsiElement element)
+	{
+		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
+
+		return this.getSuffixedDisplayName(tokenType.equals(JSTokenTypes.ANDAND) ? AND_SUFFIX : OR_SUFFIX);
+	}
+
+	@Override
 	@Nonnull
-	public JSElementPredicate getElementPredicate() {
-        return new ConjunctionPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        JSBinaryExpression  exp       = (JSBinaryExpression) element;
-        final IElementType tokenType = exp.getOperationSign();
-        JSElement           parent    = (JSElement) exp.getParent();
-
-        while (isConjunctionExpression(parent, tokenType)) {
-            exp = (JSBinaryExpression) parent;
-            assert (exp != null);
-            parent = (JSElement) exp.getParent();
-        }
-
-        final String newExpression = this.convertConjunctionExpression(exp, tokenType);
-
-        JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, newExpression);
-    }
-
-    private String convertConjunctionExpression(JSBinaryExpression exp,
-                                                IElementType       tokenType) {
-        final String leftText           = this.getOperandText(exp.getLOperand(), tokenType);
-        final String rightText          = this.getOperandText(exp.getROperand(), tokenType);
-        final String flippedConjunction = (tokenType.equals(JSTokenTypes.ANDAND) ? OR_OPERATOR : AND_OPERATOR);
-
-        return leftText + flippedConjunction + rightText;
-    }
-
-    private String getOperandText(JSExpression operand, IElementType tokenType) {
-        return (isConjunctionExpression(operand, tokenType)
-                     ? this.convertConjunctionExpression((JSBinaryExpression) operand, tokenType)
-                     : BoolUtils.getNegatedExpressionText(operand));
-    }
-
-    private static boolean isConjunctionExpression(JSElement exp,
-                                                   IElementType conjunctionType) {
-        if (!(exp instanceof JSBinaryExpression)) {
-            return false;
-        }
-
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression) exp;
-        final IElementType       tokenType        = binaryExpression.getOperationSign();
-
-        return tokenType.equals(conjunctionType);
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ConjunctionPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		JSBinaryExpression exp = (JSBinaryExpression) element;
+		final IElementType tokenType = exp.getOperationSign();
+		JSElement parent = (JSElement) exp.getParent();
+
+		while(isConjunctionExpression(parent, tokenType))
+		{
+			exp = (JSBinaryExpression) parent;
+			assert (exp != null);
+			parent = (JSElement) exp.getParent();
+		}
+
+		final String newExpression = this.convertConjunctionExpression(exp, tokenType);
+
+		JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, newExpression);
+	}
+
+	private String convertConjunctionExpression(JSBinaryExpression exp,
+												IElementType tokenType)
+	{
+		final String leftText = this.getOperandText(exp.getLOperand(), tokenType);
+		final String rightText = this.getOperandText(exp.getROperand(), tokenType);
+		final String flippedConjunction = (tokenType.equals(JSTokenTypes.ANDAND) ? OR_OPERATOR : AND_OPERATOR);
+
+		return leftText + flippedConjunction + rightText;
+	}
+
+	private String getOperandText(JSExpression operand, IElementType tokenType)
+	{
+		return (isConjunctionExpression(operand, tokenType)
+				? this.convertConjunctionExpression((JSBinaryExpression) operand, tokenType)
+				: BoolUtils.getNegatedExpressionText(operand));
+	}
+
+	private static boolean isConjunctionExpression(JSElement exp,
+												   IElementType conjunctionType)
+	{
+		if(!(exp instanceof JSBinaryExpression))
+		{
+			return false;
+		}
+
+		final JSBinaryExpression binaryExpression = (JSBinaryExpression) exp;
+		final IElementType tokenType = binaryExpression.getOperationSign();
+
+		return tokenType.equals(conjunctionType);
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index a81ade67..252ec0e8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -15,56 +15,72 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSFlipComparisonIntention extends JSMutablyNamedIntention {
-    @Override
-	public String getTextForElement(PsiElement element) {
-        final JSBinaryExpression exp                 = (JSBinaryExpression) element;
-        String                   operatorText        = null;
-        String                   flippedOperatorText = null;
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSFlipComparisonIntention", categories = {
+		"JavaScript",
+		"Boolean"
+}, fileExtensions = "js")
+public class JSFlipComparisonIntention extends JSMutablyNamedIntention
+{
+	@Override
+	public String getTextForElement(PsiElement element)
+	{
+		final JSBinaryExpression exp = (JSBinaryExpression) element;
+		String operatorText = null;
+		String flippedOperatorText = null;
 
-        if (exp != null) {
-            operatorText        = ComparisonUtils.getOperatorText       (exp.getOperationSign());
-            flippedOperatorText = ComparisonUtils.getFlippedOperatorText(exp.getOperationSign());
-        }
+		if(exp != null)
+		{
+			operatorText = ComparisonUtils.getOperatorText(exp.getOperationSign());
+			flippedOperatorText = ComparisonUtils.getFlippedOperatorText(exp.getOperationSign());
+		}
 
-        if (exp == null) {
-            return this.getSuffixedDisplayName("unknown");
-        } else if (operatorText.equals(flippedOperatorText)) {
-            return this.getSuffixedDisplayName("equals", operatorText);
-        } else {
-            return this.getSuffixedDisplayName("not-equals", operatorText, flippedOperatorText);
-        }
-    }
+		if(exp == null)
+		{
+			return this.getSuffixedDisplayName("unknown");
+		}
+		else if(operatorText.equals(flippedOperatorText))
+		{
+			return this.getSuffixedDisplayName("equals", operatorText);
+		}
+		else
+		{
+			return this.getSuffixedDisplayName("not-equals", operatorText, flippedOperatorText);
+		}
+	}
 
-    @Override
+	@Override
 	@Nonnull
-	public JSElementPredicate getElementPredicate() {
-        return new ComparisonPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ComparisonPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSBinaryExpression exp  = (JSBinaryExpression) element;
-        final JSExpression       lhs  = exp.getLOperand();
-        final JSExpression       rhs  = exp.getROperand();
-        final IElementType       sign = exp.getOperationSign();
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSBinaryExpression exp = (JSBinaryExpression) element;
+		final JSExpression lhs = exp.getLOperand();
+		final JSExpression rhs = exp.getROperand();
+		final IElementType sign = exp.getOperationSign();
 
-        assert (rhs != null);
+		assert (rhs != null);
 
-        final String expString = rhs.getText() + ComparisonUtils.getFlippedOperatorText(sign) + lhs.getText();
-        JSElementFactory.replaceExpression(exp, expString);
-    }
+		final String expString = rhs.getText() + ComparisonUtils.getFlippedOperatorText(sign) + lhs.getText();
+		JSElementFactory.replaceExpression(exp, expString);
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 9f5e758a..c62a79f9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -15,72 +15,89 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSElement;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSFlipConjunctionIntention extends JSMutablyNamedIntention {
-    @Override
-	protected String getTextForElement(PsiElement element) {
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
-        final IElementType sign             = binaryExpression.getOperationSign();
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSFlipConjunctionIntention", categories = {
+		"JavaScript",
+		"Boolean"
+}, fileExtensions = "js")
+public class JSFlipConjunctionIntention extends JSMutablyNamedIntention
+{
+	@Override
+	protected String getTextForElement(PsiElement element)
+	{
+		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
+		final IElementType sign = binaryExpression.getOperationSign();
 
-        return this.getText(BinaryOperatorUtils.getOperatorText(sign));
-    }
+		return this.getText(BinaryOperatorUtils.getOperatorText(sign));
+	}
 
-    @Override
+	@Override
 	@Nonnull
-	public JSElementPredicate getElementPredicate() {
-        return new ConjunctionPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ConjunctionPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
-        JSExpression             exp              = binaryExpression;
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
+		JSExpression exp = binaryExpression;
 
-        final IElementType sign   = binaryExpression.getOperationSign();
-        JSElement          parent = (JSElement) exp.getParent();
+		final IElementType sign = binaryExpression.getOperationSign();
+		JSElement parent = (JSElement) exp.getParent();
 
-        while (isConjunctionExpression(parent, sign)) {
-            exp = (JSExpression) parent;
-            assert (exp != null);
-            parent = (JSElement) exp.getParent();
-        }
-        JSElementFactory.replaceExpression(exp, this.flipExpression(exp, sign));
-    }
+		while(isConjunctionExpression(parent, sign))
+		{
+			exp = (JSExpression) parent;
+			assert (exp != null);
+			parent = (JSElement) exp.getParent();
+		}
+		JSElementFactory.replaceExpression(exp, this.flipExpression(exp, sign));
+	}
 
-    private String flipExpression(JSExpression exp,
-                                  IElementType conjunctionType) {
-        if (isConjunctionExpression(exp, conjunctionType)) {
-            final JSBinaryExpression andExpression = (JSBinaryExpression) exp;
+	private String flipExpression(JSExpression exp,
+								  IElementType conjunctionType)
+	{
+		if(isConjunctionExpression(exp, conjunctionType))
+		{
+			final JSBinaryExpression andExpression = (JSBinaryExpression) exp;
 
-            return this.flipExpression(andExpression.getROperand(), conjunctionType) + ' ' +
-                   BinaryOperatorUtils.getOperatorText(conjunctionType) + ' ' +
-                   this.flipExpression(andExpression.getLOperand(), conjunctionType);
-        } else{
-            return exp.getText();
-        }
-    }
+			return this.flipExpression(andExpression.getROperand(), conjunctionType) + ' ' +
+					BinaryOperatorUtils.getOperatorText(conjunctionType) + ' ' +
+					this.flipExpression(andExpression.getLOperand(), conjunctionType);
+		}
+		else
+		{
+			return exp.getText();
+		}
+	}
 
-    private static boolean isConjunctionExpression(JSElement    expression,
-                                                   IElementType conjunctionType) {
-        if(!(expression instanceof JSBinaryExpression)) {
-            return false;
-        }
+	private static boolean isConjunctionExpression(JSElement expression,
+												   IElementType conjunctionType)
+	{
+		if(!(expression instanceof JSBinaryExpression))
+		{
+			return false;
+		}
 
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+		final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
 
-        return binaryExpression.getOperationSign().equals(conjunctionType);
-    }
+		return binaryExpression.getOperationSign().equals(conjunctionType);
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index aeecaedc..582ec90a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -15,59 +15,73 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSNegateComparisonIntention extends JSMutablyNamedIntention {
-    @Override
-	public String getTextForElement(PsiElement element) {
-        final JSBinaryExpression expression          = (JSBinaryExpression) element;
-        String                   operatorText        = "";
-        String                   negatedOperatorText = "";
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSNegateComparisonIntention", categories = {
+		"JavaScript",
+		"Boolean"
+}, fileExtensions = "js")
+public class JSNegateComparisonIntention extends JSMutablyNamedIntention
+{
+	@Override
+	public String getTextForElement(PsiElement element)
+	{
+		final JSBinaryExpression expression = (JSBinaryExpression) element;
+		String operatorText = "";
+		String negatedOperatorText = "";
 
-        if (expression != null) {
-            final IElementType sign = expression.getOperationSign();
+		if(expression != null)
+		{
+			final IElementType sign = expression.getOperationSign();
 
-            operatorText        = ComparisonUtils.getOperatorText(sign);
-            negatedOperatorText = ComparisonUtils.getNegatedOperatorText(sign);
-        }
+			operatorText = ComparisonUtils.getOperatorText(sign);
+			negatedOperatorText = ComparisonUtils.getNegatedOperatorText(sign);
+		}
 
-        if (operatorText.equals(negatedOperatorText)) {
-            return this.getSuffixedDisplayName("equals", operatorText);
-        } else {
-            return this.getSuffixedDisplayName("not-equals", operatorText, negatedOperatorText);
-        }
-    }
+		if(operatorText.equals(negatedOperatorText))
+		{
+			return this.getSuffixedDisplayName("equals", operatorText);
+		}
+		else
+		{
+			return this.getSuffixedDisplayName("not-equals", operatorText, negatedOperatorText);
+		}
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new ComparisonPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ComparisonPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSBinaryExpression exp             = (JSBinaryExpression) element;
-        final JSExpression       lhs             = exp.getLOperand();
-        final JSExpression       rhs             = exp.getROperand();
-        final IElementType sign            = exp.getOperationSign();
-        final String             negatedOperator = ComparisonUtils.getNegatedOperatorText(sign);
-        final String             lhsText         = lhs.getText();
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSBinaryExpression exp = (JSBinaryExpression) element;
+		final JSExpression lhs = exp.getLOperand();
+		final JSExpression rhs = exp.getROperand();
+		final IElementType sign = exp.getOperationSign();
+		final String negatedOperator = ComparisonUtils.getNegatedOperatorText(sign);
+		final String lhsText = lhs.getText();
 
-        assert (rhs != null);
+		assert (rhs != null);
 
-        JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, lhsText +
-                                                                           negatedOperator +
-                                                                           rhs.getText());
-    }
+		JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, lhsText +
+				negatedOperator +
+				rhs.getText());
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index c5675452..649f2bfd 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -15,98 +15,133 @@
  */
 package org.intellij.idea.lang.javascript.intention.bool;
 
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import javax.annotation.Nonnull;
 
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.language.ast.IElementType;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention {
-    @Override
-	protected String getTextForElement(PsiElement element) {
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSRemoveBooleanEqualityIntention", categories = {
+		"JavaScript",
+		"Boolean"
+}, fileExtensions = "js")
+public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention
+{
+	@Override
+	protected String getTextForElement(PsiElement element)
+	{
+		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
 
-        return this.getText(BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign()));
-    }
+		return this.getText(BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign()));
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new BooleanLiteralEqualityPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new BooleanLiteralEqualityPredicate();
+	}
 
-    @Override
+	@Override
 	public void processIntention(@Nonnull PsiElement element)
-            throws IncorrectOperationException {
-        final JSBinaryExpression exp      = (JSBinaryExpression) element;
-        final boolean            isEquals = exp.getOperationSign().equals(JSTokenTypes.EQEQ);
-        final JSExpression       lhs      = exp.getLOperand();
-        final JSExpression       rhs      = exp.getROperand();
+			throws IncorrectOperationException
+	{
+		final JSBinaryExpression exp = (JSBinaryExpression) element;
+		final boolean isEquals = exp.getOperationSign().equals(JSTokenTypes.EQEQ);
+		final JSExpression lhs = exp.getLOperand();
+		final JSExpression rhs = exp.getROperand();
 
-        assert (lhs != null);
-        assert (rhs != null);
+		assert (lhs != null);
+		assert (rhs != null);
 
-        final String lhsText = lhs.getText();
-        final String rhsText = rhs.getText();
+		final String lhsText = lhs.getText();
+		final String rhsText = rhs.getText();
 
-        if (BoolUtils.TRUE.equals(lhsText)) {
-            if (isEquals) {
-                JSElementFactory.replaceExpression(exp, rhsText);
-            } else{
-                JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
-            }
-        } else if (BoolUtils.FALSE.equals(lhsText)) {
-            if (isEquals) {
-                JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
-            } else {
-                JSElementFactory.replaceExpression(exp, rhsText);
-            }
-        } else if (BoolUtils.TRUE.equals(rhsText)) {
-            if (isEquals) {
-                JSElementFactory.replaceExpression(exp, lhsText);
-            } else {
-                JSElementFactory.replaceExpressionWithNegatedExpression(lhs, exp);
-            }
-        } else {
-            if (isEquals) {
-                JSElementFactory.replaceExpressionWithNegatedExpression(lhs, exp);
-            } else {
-                JSElementFactory.replaceExpression(exp, lhsText);
-            }
-        }
-    }
+		if(BoolUtils.TRUE.equals(lhsText))
+		{
+			if(isEquals)
+			{
+				JSElementFactory.replaceExpression(exp, rhsText);
+			}
+			else
+			{
+				JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
+			}
+		}
+		else if(BoolUtils.FALSE.equals(lhsText))
+		{
+			if(isEquals)
+			{
+				JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
+			}
+			else
+			{
+				JSElementFactory.replaceExpression(exp, rhsText);
+			}
+		}
+		else if(BoolUtils.TRUE.equals(rhsText))
+		{
+			if(isEquals)
+			{
+				JSElementFactory.replaceExpression(exp, lhsText);
+			}
+			else
+			{
+				JSElementFactory.replaceExpressionWithNegatedExpression(lhs, exp);
+			}
+		}
+		else
+		{
+			if(isEquals)
+			{
+				JSElementFactory.replaceExpressionWithNegatedExpression(lhs, exp);
+			}
+			else
+			{
+				JSElementFactory.replaceExpression(exp, lhsText);
+			}
+		}
+	}
 
-    private static class BooleanLiteralEqualityPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSBinaryExpression)) {
-                return false;
-            }
-            if (ErrorUtil.containsError(element)) {
-                return false;
-            }
+	private static class BooleanLiteralEqualityPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSBinaryExpression))
+			{
+				return false;
+			}
+			if(ErrorUtil.containsError(element))
+			{
+				return false;
+			}
 
-            final JSBinaryExpression expression = (JSBinaryExpression) element;
-            final IElementType       sign       = expression.getOperationSign();
+			final JSBinaryExpression expression = (JSBinaryExpression) element;
+			final IElementType sign = expression.getOperationSign();
 
-            if (!(sign.equals(JSTokenTypes.EQEQ) || sign.equals(JSTokenTypes.NE))) {
-                return false;
-            }
+			if(!(sign.equals(JSTokenTypes.EQEQ) || sign.equals(JSTokenTypes.NE)))
+			{
+				return false;
+			}
 
-            final JSExpression lhs = expression.getLOperand();
-            final JSExpression rhs = expression.getROperand();
+			final JSExpression lhs = expression.getLOperand();
+			final JSExpression rhs = expression.getROperand();
 
-            return (lhs != null && rhs != null &&
-                    (BoolUtils.isBooleanLiteral(lhs) || BoolUtils.isBooleanLiteral(rhs)));
-        }
-    }
+			return (lhs != null && rhs != null &&
+					(BoolUtils.isBooleanLiteral(lhs) || BoolUtils.isBooleanLiteral(rhs)));
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index 0c66628f..8fe6085a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -16,6 +16,8 @@
 package org.intellij.idea.lang.javascript.intention.braces;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
@@ -23,86 +25,116 @@
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
+
 import javax.annotation.Nonnull;
 
-public class JSAddBracesIntention extends JSMutablyNamedIntention {
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSAddBracesIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSAddBracesIntention extends JSMutablyNamedIntention
+{
 
-    @NonNls private static final String IF_KEYWORD   = "if";
-    @NonNls private static final String ELSE_KEYWORD = "else";
+	@NonNls
+	private static final String IF_KEYWORD = "if";
+	@NonNls
+	private static final String ELSE_KEYWORD = "else";
 
-    @Override
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new AddBracesPredicate();
-    }
-
-    @Override
-	protected String getTextForElement(PsiElement element) {
-        final JSElement parent = (JSElement) element.getParent();
-        final String    keyword;
-
-        assert (parent != null);
-
-        if (parent instanceof JSIfStatement) {
-            final JSIfStatement ifStatement = (JSIfStatement)parent;
-            final JSStatement   elseBranch  = ifStatement.getElse();
-
-            keyword = (element.equals(elseBranch) ? ELSE_KEYWORD : IF_KEYWORD);
-        } else {
-            final PsiElement firstChild = parent.getFirstChild();
-
-            assert (firstChild != null);
-            keyword = firstChild.getText();
-        }
-
-        return this.getText(keyword);
-    }
-
-    @Override
-	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        if (!(element instanceof JSStatement)) { return; }
-        final JSStatement  statement = (JSStatement) element;
-        final JSElement    parent    = (JSElement) element.getParent();
-        final String       text      = element.getText();
-        String             newText;
-
-        if (parent.getLastChild() instanceof PsiComment) {
-            newText = '{' + text + "\n}";
-        } else {
-            newText = '{' + text + '}';
-        }
-        JSElementFactory.replaceStatement(statement, newText);
-    }
-
-    private static class AddBracesPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSStatement)) {
-                return false;
-            }
-            if (element instanceof JSBlockStatement) {
-                return false;
-            }
-
-            final PsiElement parentElement = element.getParent();
-            if (!(parentElement instanceof JSElement)) return false;
-            final JSElement parent = (JSElement) parentElement;
-
-            if (parent instanceof JSIfStatement) {
-                final JSIfStatement ifStatement = (JSIfStatement) parent;
-
-                return (!(element instanceof JSIfStatement &&
-                          element.equals(ifStatement.getElse())));
-            }
-
-            if (parent instanceof JSForStatement ||
-                parent instanceof JSForInStatement
-                ) {
-                return element.equals(((JSLoopStatement)parent).getBody());
-            }
-
-            return (parent instanceof JSWhileStatement   ||
-                    parent instanceof JSDoWhileStatement);
-        }
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new AddBracesPredicate();
+	}
+
+	@Override
+	protected String getTextForElement(PsiElement element)
+	{
+		final JSElement parent = (JSElement) element.getParent();
+		final String keyword;
+
+		assert (parent != null);
+
+		if(parent instanceof JSIfStatement)
+		{
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+			final JSStatement elseBranch = ifStatement.getElse();
+
+			keyword = (element.equals(elseBranch) ? ELSE_KEYWORD : IF_KEYWORD);
+		}
+		else
+		{
+			final PsiElement firstChild = parent.getFirstChild();
+
+			assert (firstChild != null);
+			keyword = firstChild.getText();
+		}
+
+		return this.getText(keyword);
+	}
+
+	@Override
+	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		if(!(element instanceof JSStatement))
+		{
+			return;
+		}
+		final JSStatement statement = (JSStatement) element;
+		final JSElement parent = (JSElement) element.getParent();
+		final String text = element.getText();
+		String newText;
+
+		if(parent.getLastChild() instanceof PsiComment)
+		{
+			newText = '{' + text + "\n}";
+		}
+		else
+		{
+			newText = '{' + text + '}';
+		}
+		JSElementFactory.replaceStatement(statement, newText);
+	}
+
+	private static class AddBracesPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSStatement))
+			{
+				return false;
+			}
+			if(element instanceof JSBlockStatement)
+			{
+				return false;
+			}
+
+			final PsiElement parentElement = element.getParent();
+			if(!(parentElement instanceof JSElement))
+			{
+				return false;
+			}
+			final JSElement parent = (JSElement) parentElement;
+
+			if(parent instanceof JSIfStatement)
+			{
+				final JSIfStatement ifStatement = (JSIfStatement) parent;
+
+				return (!(element instanceof JSIfStatement &&
+						element.equals(ifStatement.getElse())));
+			}
+
+			if(parent instanceof JSForStatement ||
+					parent instanceof JSForInStatement
+			)
+			{
+				return element.equals(((JSLoopStatement) parent).getBody());
+			}
+
+			return (parent instanceof JSWhileStatement ||
+					parent instanceof JSDoWhileStatement);
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index 0c6e6194..d4c0ee81 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -15,119 +15,133 @@
  */
 package org.intellij.idea.lang.javascript.intention.braces;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.lang.javascript.psi.JSBlockStatement;
-import com.intellij.lang.javascript.psi.JSDoWhileStatement;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSForInStatement;
-import com.intellij.lang.javascript.psi.JSForStatement;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.lang.javascript.psi.JSWhileStatement;
-import consulo.language.util.IncorrectOperationException;
-
-public class JSRemoveBracesIntention extends JSMutablyNamedIntention {
-    @NonNls private static final String IF_KEYWORD   = "if";
-    @NonNls private static final String ELSE_KEYWORD = "else";
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSRemoveBracesIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSRemoveBracesIntention extends JSMutablyNamedIntention
+{
+	@NonNls
+	private static final String IF_KEYWORD = "if";
+	@NonNls
+	private static final String ELSE_KEYWORD = "else";
+
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new RemoveBracesPredicate();
-    }
-
-    @Override
-	protected String getTextForElement(PsiElement element) {
-        final JSElement parent = (JSElement) element.getParent();
-        final String    keyword;
-
-        assert (parent != null);
-
-        if (parent instanceof JSIfStatement) {
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
-            final JSStatement   elseBranch  = ifStatement.getElse();
-
-            keyword = (element.equals(elseBranch) ? ELSE_KEYWORD : IF_KEYWORD);
-        } else {
-            final PsiElement keywordChild = parent.getFirstChild();
-
-            assert (keywordChild != null);
-            keyword = keywordChild.getText();
-        }
-
-        return this.getText(keyword);
-    }
-
-    @Override
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new RemoveBracesPredicate();
+	}
+
+	@Override
+	protected String getTextForElement(PsiElement element)
+	{
+		final JSElement parent = (JSElement) element.getParent();
+		final String keyword;
+
+		assert (parent != null);
+
+		if(parent instanceof JSIfStatement)
+		{
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+			final JSStatement elseBranch = ifStatement.getElse();
+
+			keyword = (element.equals(elseBranch) ? ELSE_KEYWORD : IF_KEYWORD);
+		}
+		else
+		{
+			final PsiElement keywordChild = parent.getFirstChild();
+
+			assert (keywordChild != null);
+			keyword = keywordChild.getText();
+		}
+
+		return this.getText(keyword);
+	}
+
+	@Override
 	protected void processIntention(@Nonnull PsiElement element)
-        throws IncorrectOperationException {
-        final JSBlockStatement blockStatement = (JSBlockStatement) element;
-        final JSStatement[]    statements     = blockStatement.getStatements();
-        final JSStatement      statement      = statements[0];
-
-        // handle comments
-        final JSElement parent = (JSElement) blockStatement.getParent();
-
-        assert (parent != null);
-
-        final JSElement grandParent = (JSElement) parent.getParent();
-
-        assert (grandParent != null);
-
-        PsiElement sibling = statement.getFirstChild();
-
-        assert (sibling != null);
-
-        sibling = sibling.getNextSibling();
-        while (sibling != null && !sibling.equals(statement)) {
-            if (sibling instanceof PsiComment) {
-                grandParent.addBefore(sibling, parent);
-            }
-            sibling = sibling.getNextSibling();
-        }
-
-        final PsiElement lastChild = blockStatement.getLastChild();
-
-        if (lastChild instanceof PsiComment) {
-            final JSElement nextSibling = (JSElement) parent.getNextSibling();
-
-            grandParent.addAfter(lastChild, nextSibling);
-        }
-
-        String text = statement.getText();
-        JSElementFactory.replaceStatement(blockStatement, text);
-    }
-
-    public static class RemoveBracesPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSBlockStatement)) {
-                return false;
-            }
-
-            final JSBlockStatement blockStatement = (JSBlockStatement) element;
-            final PsiElement parent         = blockStatement.getParent();
-
-            if (!(parent instanceof JSIfStatement      ||
-                  parent instanceof JSWhileStatement   ||
-                  parent instanceof JSDoWhileStatement ||
-                  parent instanceof JSForStatement     ||
-                  parent instanceof JSForInStatement)) {
-                return false;
-            }
-
-            final JSStatement[] statements = blockStatement.getStatements();
-
-            return (statements.length == 1 && !(statements[0] instanceof JSVarStatement));
-        }
-    }
+			throws IncorrectOperationException
+	{
+		final JSBlockStatement blockStatement = (JSBlockStatement) element;
+		final JSStatement[] statements = blockStatement.getStatements();
+		final JSStatement statement = statements[0];
+
+		// handle comments
+		final JSElement parent = (JSElement) blockStatement.getParent();
+
+		assert (parent != null);
+
+		final JSElement grandParent = (JSElement) parent.getParent();
+
+		assert (grandParent != null);
+
+		PsiElement sibling = statement.getFirstChild();
+
+		assert (sibling != null);
+
+		sibling = sibling.getNextSibling();
+		while(sibling != null && !sibling.equals(statement))
+		{
+			if(sibling instanceof PsiComment)
+			{
+				grandParent.addBefore(sibling, parent);
+			}
+			sibling = sibling.getNextSibling();
+		}
+
+		final PsiElement lastChild = blockStatement.getLastChild();
+
+		if(lastChild instanceof PsiComment)
+		{
+			final JSElement nextSibling = (JSElement) parent.getNextSibling();
+
+			grandParent.addAfter(lastChild, nextSibling);
+		}
+
+		String text = statement.getText();
+		JSElementFactory.replaceStatement(blockStatement, text);
+	}
+
+	public static class RemoveBracesPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSBlockStatement))
+			{
+				return false;
+			}
+
+			final JSBlockStatement blockStatement = (JSBlockStatement) element;
+			final PsiElement parent = blockStatement.getParent();
+
+			if(!(parent instanceof JSIfStatement ||
+					parent instanceof JSWhileStatement ||
+					parent instanceof JSDoWhileStatement ||
+					parent instanceof JSForStatement ||
+					parent instanceof JSForInStatement))
+			{
+				return false;
+			}
+
+			final JSStatement[] statements = blockStatement.getStatements();
+
+			return (statements.length == 1 && !(statements[0] instanceof JSVarStatement));
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index 7606dbe7..55ab6d6f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -16,104 +16,128 @@
 package org.intellij.idea.lang.javascript.intention.comment;
 
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.util.lang.StringUtil;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
 import consulo.language.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import javax.annotation.Nonnull;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
-public class JSChangeToCStyleCommentIntention extends JSIntention {
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSChangeToCStyleCommentIntention", categories = {
+		"JavaScript",
+		"Comments"
+}, fileExtensions = "js")
+public class JSChangeToCStyleCommentIntention extends JSIntention
+{
 
-    @Override
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new EndOfLineCommentPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        PsiComment firstComment = (PsiComment) element;
-
-        while (true) {
-            final PsiElement prevComment = JSElementFactory.getNonWhiteSpaceSibling(firstComment, false);
-
-            if (!isEndOfLineComment(prevComment)) {
-                break;
-            }
-            assert (prevComment != null);
-            firstComment = (PsiComment) prevComment;
-        }
-
-        final StringBuilder     buffer           = new StringBuilder(getCommentContents(firstComment));
-        final List<PsiElement>  elementsToDelete = new ArrayList<PsiElement>();
-        PsiElement nextComment      = firstComment;
-
-        while (true) {
-            elementsToDelete.add(nextComment);
-
-            nextComment = JSElementFactory.getNonWhiteSpaceSibling(nextComment, true);
-            if (!isEndOfLineComment(nextComment)) {
-                break;
-            }
-            assert (nextComment != null);
-
-            final PsiElement prevSibling = nextComment.getPrevSibling();
-
-            assert (prevSibling != null);
-            elementsToDelete.add(prevSibling);
-
-            buffer.append(prevSibling.getText())  // White space
-                  .append(getCommentContents((PsiComment) nextComment));
-        }
-
-        final String text = StringUtil.replace(buffer.toString(), "*/", "* /");
-        final String newCommentString;
-
-        if (text.indexOf('\n') >= 0) {
-            newCommentString = "/*\n" + text + "\n*/";
-        } else {
-            newCommentString = "/*" + text + "*/";
-        }
-
-        JSElementFactory.addElementBefore(firstComment, newCommentString);
-        for (final PsiElement elementToDelete : elementsToDelete) {
-            JSElementFactory.removeElement(elementToDelete);
-        }
-    }
-
-    private static boolean isEndOfLineComment(PsiElement element) {
-        if (!(element instanceof PsiComment)) {
-            return false;
-        }
-
-        final PsiComment   comment   = (PsiComment) element;
-        final IElementType tokenType = comment.getTokenType();
-
-        return JSTokenTypes.END_OF_LINE_COMMENT.equals(tokenType);
-    }
-
-    private static String getCommentContents(PsiComment comment) {
-        return comment.getText().substring(2);
-    }
-
-    private static class EndOfLineCommentPredicate implements JSElementPredicate {
-
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof PsiComment)) {
-                return false;
-            }
-
-            final IElementType type = ((PsiComment) element).getTokenType();
-
-            return JSTokenTypes.END_OF_LINE_COMMENT.equals(type);
-        }
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new EndOfLineCommentPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		PsiComment firstComment = (PsiComment) element;
+
+		while(true)
+		{
+			final PsiElement prevComment = JSElementFactory.getNonWhiteSpaceSibling(firstComment, false);
+
+			if(!isEndOfLineComment(prevComment))
+			{
+				break;
+			}
+			assert (prevComment != null);
+			firstComment = (PsiComment) prevComment;
+		}
+
+		final StringBuilder buffer = new StringBuilder(getCommentContents(firstComment));
+		final List<PsiElement> elementsToDelete = new ArrayList<PsiElement>();
+		PsiElement nextComment = firstComment;
+
+		while(true)
+		{
+			elementsToDelete.add(nextComment);
+
+			nextComment = JSElementFactory.getNonWhiteSpaceSibling(nextComment, true);
+			if(!isEndOfLineComment(nextComment))
+			{
+				break;
+			}
+			assert (nextComment != null);
+
+			final PsiElement prevSibling = nextComment.getPrevSibling();
+
+			assert (prevSibling != null);
+			elementsToDelete.add(prevSibling);
+
+			buffer.append(prevSibling.getText())  // White space
+					.append(getCommentContents((PsiComment) nextComment));
+		}
+
+		final String text = StringUtil.replace(buffer.toString(), "*/", "* /");
+		final String newCommentString;
+
+		if(text.indexOf('\n') >= 0)
+		{
+			newCommentString = "/*\n" + text + "\n*/";
+		}
+		else
+		{
+			newCommentString = "/*" + text + "*/";
+		}
+
+		JSElementFactory.addElementBefore(firstComment, newCommentString);
+		for(final PsiElement elementToDelete : elementsToDelete)
+		{
+			JSElementFactory.removeElement(elementToDelete);
+		}
+	}
+
+	private static boolean isEndOfLineComment(PsiElement element)
+	{
+		if(!(element instanceof PsiComment))
+		{
+			return false;
+		}
+
+		final PsiComment comment = (PsiComment) element;
+		final IElementType tokenType = comment.getTokenType();
+
+		return JSTokenTypes.END_OF_LINE_COMMENT.equals(tokenType);
+	}
+
+	private static String getCommentContents(PsiComment comment)
+	{
+		return comment.getText().substring(2);
+	}
+
+	private static class EndOfLineCommentPredicate implements JSElementPredicate
+	{
+
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof PsiComment))
+			{
+				return false;
+			}
+
+			final IElementType type = ((PsiComment) element).getTokenType();
+
+			return JSTokenTypes.END_OF_LINE_COMMENT.equals(type);
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index d0a8b925..74cdce1d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -15,10 +15,10 @@
  */
 package org.intellij.idea.lang.javascript.intention.comment;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiWhiteSpace;
@@ -28,95 +28,124 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
-public class JSChangeToEndOfLineCommentIntention extends JSIntention {
-    @Override
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSChangeToEndOfLineCommentIntention", categories = {
+		"JavaScript",
+		"Comments"
+}, fileExtensions = "js")
+public class JSChangeToEndOfLineCommentIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new CStyleCommentPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement parent  = element.getParent();
-
-        assert (parent != null);
-
-        final String     commentText    = element.getText();
-        final PsiElement whitespace     = element.getNextSibling();
-        final String     text           = commentText.substring(2, commentText.length() - 2);
-        final String[]   lines          = text.split("\n");
-        final String[]   newComments    = buildCommentStrings(lines);
-        PsiElement       currentElement = element;
-
-        for (int index = newComments.length; --index >= 0; ) {
-            if (newComments[index].length() > 0) {
-                currentElement = JSElementFactory.addElementBefore(currentElement, "\n");
-                currentElement = JSElementFactory.addElementBefore(currentElement, newComments[index]);
-            }
-        }
-        if (whitespace != null) {
-            JSElementFactory.removeElement(whitespace);
-        }
-        JSElementFactory.removeElement(element);
-    }
-
-    private static String[] buildCommentStrings(String[] lines) {
-        int lastNonEmtpyLine = -1;
-
-        for (int i = lines.length - 1; i >= 0 && lastNonEmtpyLine == -1; i--) {
-            final String line = lines[i].trim();
-            if (line.length() != 0) {
-                lastNonEmtpyLine = i;
-            }
-        }
-        if (lastNonEmtpyLine == -1) {
-            return new String[] { "//" };
-        }
-
-        final StringBuilder buffer         = new StringBuilder();
-        final String[]      commentStrings = new String[lastNonEmtpyLine + 1];
-
-        for (int i = 0; i <= lastNonEmtpyLine; i++) {
-            final String line = lines[i];
-
-            if (line.trim().length() != 0) {
-                buffer.replace(0, buffer.length(), "//");
-
-                if (line.startsWith(" *")) {
-                    buffer.append(line.substring(2));
-                } else if (line.startsWith("*")) {
-                    buffer.append(line.substring(1));
-                } else {
-                    buffer.append(line);
-                }
-            }
-
-            commentStrings[i] = buffer.toString();
-        }
-        return commentStrings;
-    }
-
-    private static class CStyleCommentPredicate implements JSElementPredicate {
-
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof PsiComment)) {
-                return false;
-            }
-
-            final PsiComment   comment = (PsiComment) element;
-            final IElementType type    = comment.getTokenType();
-
-            if (!(JSTokenTypes.C_STYLE_COMMENT.equals(type) ||  JSTokenTypes.C_STYLE_COMMENT.equals(type))) {
-                return false;
-            }
-            final PsiElement sibling = TreeUtil.getNextLeaf(comment);
-            if (!(sibling instanceof PsiWhiteSpace)) {
-                return false;
-            }
-            final String whitespaceText = sibling.getText();
-            return (whitespaceText.indexOf((int) '\n') >= 0 ||
-                    whitespaceText.indexOf((int) '\r') >= 0);
-        }
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new CStyleCommentPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final PsiElement parent = element.getParent();
+
+		assert (parent != null);
+
+		final String commentText = element.getText();
+		final PsiElement whitespace = element.getNextSibling();
+		final String text = commentText.substring(2, commentText.length() - 2);
+		final String[] lines = text.split("\n");
+		final String[] newComments = buildCommentStrings(lines);
+		PsiElement currentElement = element;
+
+		for(int index = newComments.length; --index >= 0; )
+		{
+			if(newComments[index].length() > 0)
+			{
+				currentElement = JSElementFactory.addElementBefore(currentElement, "\n");
+				currentElement = JSElementFactory.addElementBefore(currentElement, newComments[index]);
+			}
+		}
+		if(whitespace != null)
+		{
+			JSElementFactory.removeElement(whitespace);
+		}
+		JSElementFactory.removeElement(element);
+	}
+
+	private static String[] buildCommentStrings(String[] lines)
+	{
+		int lastNonEmtpyLine = -1;
+
+		for(int i = lines.length - 1; i >= 0 && lastNonEmtpyLine == -1; i--)
+		{
+			final String line = lines[i].trim();
+			if(line.length() != 0)
+			{
+				lastNonEmtpyLine = i;
+			}
+		}
+		if(lastNonEmtpyLine == -1)
+		{
+			return new String[]{"//"};
+		}
+
+		final StringBuilder buffer = new StringBuilder();
+		final String[] commentStrings = new String[lastNonEmtpyLine + 1];
+
+		for(int i = 0; i <= lastNonEmtpyLine; i++)
+		{
+			final String line = lines[i];
+
+			if(line.trim().length() != 0)
+			{
+				buffer.replace(0, buffer.length(), "//");
+
+				if(line.startsWith(" *"))
+				{
+					buffer.append(line.substring(2));
+				}
+				else if(line.startsWith("*"))
+				{
+					buffer.append(line.substring(1));
+				}
+				else
+				{
+					buffer.append(line);
+				}
+			}
+
+			commentStrings[i] = buffer.toString();
+		}
+		return commentStrings;
+	}
+
+	private static class CStyleCommentPredicate implements JSElementPredicate
+	{
+
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof PsiComment))
+			{
+				return false;
+			}
+
+			final PsiComment comment = (PsiComment) element;
+			final IElementType type = comment.getTokenType();
+
+			if(!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.C_STYLE_COMMENT.equals(type)))
+			{
+				return false;
+			}
+			final PsiElement sibling = TreeUtil.getNextLeaf(comment);
+			if(!(sibling instanceof PsiWhiteSpace))
+			{
+				return false;
+			}
+			final String whitespaceText = sibling.getText();
+			return (whitespaceText.indexOf((int) '\n') >= 0 ||
+					whitespaceText.indexOf((int) '\r') >= 0);
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index 695854bc..cf989c13 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -15,90 +15,112 @@
  */
 package org.intellij.idea.lang.javascript.intention.comment;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
-import consulo.language.psi.PsiWhiteSpace;
-import consulo.language.util.IncorrectOperationException;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
-public class JSMoveCommentToSeparateLineIntention extends JSIntention {
-    @Override
+import javax.annotation.Nonnull;
+
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSMoveCommentToSeparateLineIntention", categories = {
+		"JavaScript",
+		"Comments"
+}, fileExtensions = "js")
+public class JSMoveCommentToSeparateLineIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new CommentOnLineWithSourcePredicate();
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new CommentOnLineWithSourcePredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiComment selectedComment = (PsiComment) element;
-        PsiElement elementToCheck  = selectedComment;
-        final PsiWhiteSpace whiteSpace;
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final PsiComment selectedComment = (PsiComment) element;
+		PsiElement elementToCheck = selectedComment;
+		final PsiWhiteSpace whiteSpace;
 
-        while (true) {
-            elementToCheck = TreeUtil.getPrevLeaf(elementToCheck);
-            if (elementToCheck == null) {
-                return ;
-            }
-            if (isLineBreakWhiteSpace(elementToCheck)) {
-                whiteSpace = (PsiWhiteSpace) elementToCheck;
-                break;
-            }
-        }
+		while(true)
+		{
+			elementToCheck = TreeUtil.getPrevLeaf(elementToCheck);
+			if(elementToCheck == null)
+			{
+				return;
+			}
+			if(isLineBreakWhiteSpace(elementToCheck))
+			{
+				whiteSpace = (PsiWhiteSpace) elementToCheck;
+				break;
+			}
+		}
 
-        PsiElement commentElement = JSElementFactory.addElementBefore(whiteSpace, selectedComment.getText());
-        JSElementFactory.addElementBefore(commentElement, "\n");
+		PsiElement commentElement = JSElementFactory.addElementBefore(whiteSpace, selectedComment.getText());
+		JSElementFactory.addElementBefore(commentElement, "\n");
 
-        JSElementFactory.removeElement(selectedComment);
-    }
+		JSElementFactory.removeElement(selectedComment);
+	}
 
-    private static boolean isLineBreakWhiteSpace(PsiElement element) {
-        return (element instanceof PsiWhiteSpace &&
-                containsLineBreak(element.getText()));
-    }
+	private static boolean isLineBreakWhiteSpace(PsiElement element)
+	{
+		return (element instanceof PsiWhiteSpace &&
+				containsLineBreak(element.getText()));
+	}
 
-    private static boolean containsLineBreak(String text) {
-        return (text.indexOf((int) '\n') >= 0 ||
-                text.indexOf((int) '\r') >= 0);
-    }
+	private static boolean containsLineBreak(String text)
+	{
+		return (text.indexOf((int) '\n') >= 0 ||
+				text.indexOf((int) '\r') >= 0);
+	}
 
-    private static class CommentOnLineWithSourcePredicate implements JSElementPredicate {
+	private static class CommentOnLineWithSourcePredicate implements JSElementPredicate
+	{
 
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof PsiComment)) {
-                return false;
-            }
-            final PsiComment comment = (PsiComment) element;
-            final IElementType type    = comment.getTokenType();
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof PsiComment))
+			{
+				return false;
+			}
+			final PsiComment comment = (PsiComment) element;
+			final IElementType type = comment.getTokenType();
 
-            if (!(JSTokenTypes.C_STYLE_COMMENT    .equals(type) ||
-                  JSTokenTypes.END_OF_LINE_COMMENT.equals(type))) {
-                return false; // can't move JSP comments
-            }
+			if(!(JSTokenTypes.C_STYLE_COMMENT.equals(type) ||
+					JSTokenTypes.END_OF_LINE_COMMENT.equals(type)))
+			{
+				return false; // can't move JSP comments
+			}
 
-            final PsiElement prevSibling = TreeUtil.getPrevLeaf(element);
-            if (!(prevSibling instanceof PsiWhiteSpace)) {
-                return true;
-            }
-            final String prevSiblingText = prevSibling.getText();
-            if (prevSiblingText.indexOf('\n') < 0 &&
-                prevSiblingText.indexOf('\r') < 0) {
-                return true;
-            }
-            final PsiElement nextSibling = TreeUtil.getNextLeaf(element);
-            if (!(nextSibling instanceof PsiWhiteSpace)) {
-                return true;
-            }
-            final String nextSiblingText = nextSibling.getText();
-            return (nextSiblingText.indexOf('\n') < 0 &&
-                    nextSiblingText.indexOf('\r') < 0);
-        }
-    }
+			final PsiElement prevSibling = TreeUtil.getPrevLeaf(element);
+			if(!(prevSibling instanceof PsiWhiteSpace))
+			{
+				return true;
+			}
+			final String prevSiblingText = prevSibling.getText();
+			if(prevSiblingText.indexOf('\n') < 0 &&
+					prevSiblingText.indexOf('\r') < 0)
+			{
+				return true;
+			}
+			final PsiElement nextSibling = TreeUtil.getNextLeaf(element);
+			if(!(nextSibling instanceof PsiWhiteSpace))
+			{
+				return true;
+			}
+			final String nextSiblingText = nextSibling.getText();
+			return (nextSiblingText.indexOf('\n') < 0 &&
+					nextSiblingText.indexOf('\r') < 0);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 4f96675f..1f469c50 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -16,57 +16,70 @@
 package org.intellij.idea.lang.javascript.intention.conditional;
 
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSConditionalExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import com.intellij.lang.javascript.psi.JSConditionalExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSFlipConditionalIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSFlipConditionalIntention", categories = {
+		"JavaScript",
+		"Conditional"
+}, fileExtensions = "js")
+public class JSFlipConditionalIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new FlipConditionalPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new FlipConditionalPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSConditionalExpression exp            = (JSConditionalExpression) element;
-        final JSExpression            condition      = exp.getCondition();
-        final JSExpression            elseExpression = exp.getElse();
-        final JSExpression            thenExpression = exp.getThen();
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSConditionalExpression exp = (JSConditionalExpression) element;
+		final JSExpression condition = exp.getCondition();
+		final JSExpression elseExpression = exp.getElse();
+		final JSExpression thenExpression = exp.getThen();
 
-        assert (elseExpression != null);
-        assert (thenExpression != null);
+		assert (elseExpression != null);
+		assert (thenExpression != null);
 
-        final String newExpression = BoolUtils.getNegatedExpressionText(condition) + '?' +
-                                     elseExpression.getText() + ':' + thenExpression.getText();
+		final String newExpression = BoolUtils.getNegatedExpressionText(condition) + '?' +
+				elseExpression.getText() + ':' + thenExpression.getText();
 
-        JSElementFactory.replaceExpression(exp, newExpression);
-    }
+		JSElementFactory.replaceExpression(exp, newExpression);
+	}
 
-    private static class FlipConditionalPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSConditionalExpression)) {
-                return false;
-            }
-            if (ErrorUtil.containsError(element)){
-                return false;
-            }
+	private static class FlipConditionalPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSConditionalExpression))
+			{
+				return false;
+			}
+			if(ErrorUtil.containsError(element))
+			{
+				return false;
+			}
 
-            final JSConditionalExpression condition = (JSConditionalExpression) element;
+			final JSConditionalExpression condition = (JSConditionalExpression) element;
 
-            return (condition.getCondition() != null &&
-                    condition.getThen()      != null &&
-                    condition.getElse()      != null);
-        }
-    }
+			return (condition.getCondition() != null &&
+					condition.getThen() != null &&
+					condition.getElse() != null);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index cb9d3a88..f5328854 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -15,8 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention.conditional;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSBlockStatement;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSIfStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
@@ -24,53 +30,61 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSBlockStatement;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSFlipIfIntention extends JSIntention {
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSFlipIfIntention", categories = {
+		"JavaScript",
+		"Conditional"
+}, fileExtensions = "js")
+public class JSFlipIfIntention extends JSIntention
+{
 
-    @NonNls private static final String IF_PREFIX    = "if (";
-    @NonNls private static final String ELSE_KEYWORD = "else ";
+	@NonNls
+	private static final String IF_PREFIX = "if (";
+	@NonNls
+	private static final String ELSE_KEYWORD = "else ";
 
-    @Override
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new FlipIfPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new FlipIfPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement exp             = (JSIfStatement) element;
-        final JSExpression  condition       = exp.getCondition();
-        final JSStatement   thenBranch      = exp.getThen();
-        final JSStatement   elseBranch      = exp.getElse();
-        final String        negatedText     = BoolUtils.getNegatedExpressionText(condition);
-        final boolean       emptyThenBranch = (thenBranch == null  ||
-                                               (thenBranch instanceof JSBlockStatement &&
-                                                ((JSBlockStatement) thenBranch).getStatements().length == 0));
-        final String        thenText        = (emptyThenBranch      ? ""   : ELSE_KEYWORD + thenBranch.getText());
-        final String        elseText        = ((elseBranch == null) ? "{}" : elseBranch.getText());
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSIfStatement exp = (JSIfStatement) element;
+		final JSExpression condition = exp.getCondition();
+		final JSStatement thenBranch = exp.getThen();
+		final JSStatement elseBranch = exp.getElse();
+		final String negatedText = BoolUtils.getNegatedExpressionText(condition);
+		final boolean emptyThenBranch = (thenBranch == null ||
+				(thenBranch instanceof JSBlockStatement &&
+						((JSBlockStatement) thenBranch).getStatements().length == 0));
+		final String thenText = (emptyThenBranch ? "" : ELSE_KEYWORD + thenBranch.getText());
+		final String elseText = ((elseBranch == null) ? "{}" : elseBranch.getText());
 
-        final String newStatement = IF_PREFIX + negatedText + ')' + elseText + thenText;
+		final String newStatement = IF_PREFIX + negatedText + ')' + elseText + thenText;
 
-        JSElementFactory.replaceStatement(exp, newStatement);
-    }
+		JSElementFactory.replaceStatement(exp, newStatement);
+	}
 
-    private static class FlipIfPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSIfStatement) ||
-                ErrorUtil.containsError(element)) {
-                return false;
-            }
+	private static class FlipIfPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSIfStatement) ||
+					ErrorUtil.containsError(element))
+			{
+				return false;
+			}
 
-            final JSIfStatement condition = (JSIfStatement) element;
+			final JSIfStatement condition = (JSIfStatement) element;
 
-            return (condition.getCondition() != null);
-        }
-    }
+			return (condition.getCondition() != null);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 554b2521..adc1c69d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -15,69 +15,83 @@
  */
 package org.intellij.idea.lang.javascript.intention.conditional;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSConditionalExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
+import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import com.intellij.lang.javascript.psi.JSConditionalExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSRemoveConditionalIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSRemoveConditionalIntention", categories = {
+		"JavaScript",
+		"Conditional"
+}, fileExtensions = "js")
+public class JSRemoveConditionalIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new RemoveConditionalPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new RemoveConditionalPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSConditionalExpression exp            = (JSConditionalExpression) element;
-        final JSExpression            condition      = exp.getCondition();
-        final JSExpression            thenExpression = exp.getThen();
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSConditionalExpression exp = (JSConditionalExpression) element;
+		final JSExpression condition = exp.getCondition();
+		final JSExpression thenExpression = exp.getThen();
 
-        assert (thenExpression != null);
+		assert (thenExpression != null);
 
-        final String thenExpressionText = thenExpression.getText();
-        final String newExpression;
+		final String thenExpressionText = thenExpression.getText();
+		final String newExpression;
 
-        newExpression = (thenExpressionText.equals(BoolUtils.TRUE)
-                              ? condition.getText()
-                              : BoolUtils.getNegatedExpressionText(condition));
-        JSElementFactory.replaceExpression(exp, newExpression);
-    }
+		newExpression = (thenExpressionText.equals(BoolUtils.TRUE)
+				? condition.getText()
+				: BoolUtils.getNegatedExpressionText(condition));
+		JSElementFactory.replaceExpression(exp, newExpression);
+	}
 
-    private static class RemoveConditionalPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSConditionalExpression)) {
-                return false;
-            }
-            if (ErrorUtil.containsError(element)) {
-                return false;
-            }
+	private static class RemoveConditionalPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSConditionalExpression))
+			{
+				return false;
+			}
+			if(ErrorUtil.containsError(element))
+			{
+				return false;
+			}
 
-            final JSConditionalExpression condition      = (JSConditionalExpression) element;
-            final JSExpression            thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
-            final JSExpression            elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
+			final JSConditionalExpression condition = (JSConditionalExpression) element;
+			final JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
+			final JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
 
-            if (condition.getCondition() == null ||
-                thenExpression           == null ||
-                elseExpression           == null) {
-                return false;
-            }
+			if(condition.getCondition() == null ||
+					thenExpression == null ||
+					elseExpression == null)
+			{
+				return false;
+			}
 
-            final String thenText = thenExpression.getText();
-            final String elseText = elseExpression.getText();
+			final String thenText = thenExpression.getText();
+			final String elseText = elseExpression.getText();
 
-            return  ((BoolUtils.TRUE.equals(elseText) && BoolUtils.FALSE.equals(thenText)) ||
-                     (BoolUtils.TRUE.equals(thenText) && BoolUtils.FALSE.equals(elseText)));
-        }
-    }
+			return ((BoolUtils.TRUE.equals(elseText) && BoolUtils.FALSE.equals(thenText)) ||
+					(BoolUtils.TRUE.equals(thenText) && BoolUtils.FALSE.equals(elseText)));
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 37b092ff..791f8e95 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -15,33 +15,44 @@
  */
 package org.intellij.idea.lang.javascript.intention.conditional;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSConditionalExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 
-import com.intellij.lang.javascript.psi.JSConditionalExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSReplaceConditionalWithIfIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSReplaceConditionalWithIfIntention", categories = {
+		"JavaScript",
+		"Conditional"
+}, fileExtensions = "js")
+public class JSReplaceConditionalWithIfIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new ReplaceConditionalWithIfPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ReplaceConditionalWithIfPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        assert (element instanceof JSConditionalExpression);
-        ConditionalUtils.replaceConditionalWithIf((JSConditionalExpression) element);
-    }
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		assert (element instanceof JSConditionalExpression);
+		ConditionalUtils.replaceConditionalWithIf((JSConditionalExpression) element);
+	}
 
-    private static class ReplaceConditionalWithIfPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            return (element instanceof JSConditionalExpression);
-        }
-    }
+	private static class ReplaceConditionalWithIfPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			return (element instanceof JSConditionalExpression);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 38203e96..fd9b4594 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -15,76 +15,96 @@
  */
 package org.intellij.idea.lang.javascript.intention.constant;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSCallExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.lang.javascript.psi.JSReferenceExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSCallExpression;
-import consulo.util.lang.StringUtil;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSConstantExpressionIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSConstantExpressionIntention", categories = {
+		"JavaScript",
+		"Other"
+}, fileExtensions = "js")
+public class JSConstantExpressionIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new ConstantExpressionPredicate();
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new ConstantExpressionPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSExpression  expression = (JSExpression) element;
-        final Object        value      = ExpressionUtil.computeConstantExpression(expression);
-        final String        newExpression;
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSExpression expression = (JSExpression) element;
+		final Object value = ExpressionUtil.computeConstantExpression(expression);
+		final String newExpression;
 
-        if (value instanceof String) {
-            newExpression = '"' + StringUtil.escapeStringCharacters((String) value) + '"';
-        } else {
-            newExpression = String.valueOf(value);
-        }
-        JSElementFactory.replaceExpression(expression, newExpression);
-    }
+		if(value instanceof String)
+		{
+			newExpression = '"' + StringUtil.escapeStringCharacters((String) value) + '"';
+		}
+		else
+		{
+			newExpression = String.valueOf(value);
+		}
+		JSElementFactory.replaceExpression(expression, newExpression);
+	}
 
-    private static class ConstantExpressionPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSExpression)) {
-                return false;
-            }
-            if (ErrorUtil.containsError(element)) {
-                return false;
-            }
-            final JSExpression expression = (JSExpression) element;
+	private static class ConstantExpressionPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSExpression))
+			{
+				return false;
+			}
+			if(ErrorUtil.containsError(element))
+			{
+				return false;
+			}
+			final JSExpression expression = (JSExpression) element;
 
-            if (element instanceof JSLiteralExpression ||
-                ( element instanceof JSReferenceExpression &&
-                  ((JSReferenceExpression)element).getQualifier() != null
-                ) ||
-                expression instanceof JSCallExpression
-               ) {
-                return false;
-            }
-            if (!ExpressionUtil.isConstantExpression(expression)) {
-                return false;
-            }
+			if(element instanceof JSLiteralExpression ||
+					(element instanceof JSReferenceExpression &&
+							((JSReferenceExpression) element).getQualifier() != null
+					) ||
+					expression instanceof JSCallExpression
+			)
+			{
+				return false;
+			}
+			if(!ExpressionUtil.isConstantExpression(expression))
+			{
+				return false;
+			}
 
-            if (ExpressionUtil.computeConstantExpression(expression) == null) {
-                return false;
-            }
+			if(ExpressionUtil.computeConstantExpression(expression) == null)
+			{
+				return false;
+			}
 
-            final PsiElement parent = element.getParent();
+			final PsiElement parent = element.getParent();
 
-            if (!(parent instanceof JSExpression)) {
-                return true;
-            }
-            return (!ExpressionUtil.isConstantExpression((JSExpression) parent));
-        }
-    }
+			if(!(parent instanceof JSExpression))
+			{
+				return true;
+			}
+			return (!ExpressionUtil.isConstantExpression((JSExpression) parent));
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index deab81e9..5ff7d4ea 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -15,9 +15,16 @@
  */
 package org.intellij.idea.lang.javascript.intention.constant;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSElement;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -25,168 +32,202 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import consulo.util.lang.StringUtil;
-import consulo.language.ast.IElementType;
-import consulo.language.util.IncorrectOperationException;
 
-public class JSConstantSubexpressionIntention extends JSMutablyNamedIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSConstantSubexpressionIntention", categories = {
+		"JavaScript",
+		"Other"
+}, fileExtensions = "js")
+public class JSConstantSubexpressionIntention extends JSMutablyNamedIntention
+{
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new ConstantSubexpressionPredicate();
-    }
-
-    @Override
-	protected String getTextForElement(PsiElement element) {
-        final PsiElement parent           = element.getParent();
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression) (parent instanceof JSBinaryExpression ? parent : element);
-        final JSExpression       lhs              = binaryExpression.getLOperand();
-        final JSExpression       leftSide;
-
-        if (lhs instanceof JSBinaryExpression) {
-            leftSide = ((JSBinaryExpression) lhs).getROperand();
-        } else {
-            leftSide = lhs;
-        }
-        final IElementType operationSign = binaryExpression.getOperationSign();
-        final JSExpression rhs           = binaryExpression.getROperand();
-
-        assert (rhs != null);
-        assert (leftSide != null);
-
-        return this.getText(leftSide.getText(), BinaryOperatorUtils.getOperatorText(operationSign), rhs.getText());
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement parent        = element.getParent();
-        final JSExpression expression    = (JSExpression) (parent instanceof JSBinaryExpression ? parent : element);
-        String             newExpression = "";
-        final Object       constantValue;
-
-        if (expression instanceof JSBinaryExpression) {
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-            final JSExpression       lhs              = binaryExpression.getLOperand();
-
-            if (lhs instanceof JSBinaryExpression) {
-                final JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression) lhs;
-                final JSExpression       rightSide           = lhsBinaryExpression.getROperand();
-
-                newExpression += getLeftSideText(lhsBinaryExpression);
-
-                assert (rightSide != null);
-            }
-            constantValue = ExpressionUtil.computeConstantExpression(getSubexpression(binaryExpression));
-        } else {
-            constantValue = ExpressionUtil.computeConstantExpression(expression);
-        }
-
-        if (constantValue instanceof String) {
-            newExpression += '"' + StringUtil.escapeStringCharacters(constantValue.toString()) + '"';
-        } else {
-            newExpression += String.valueOf(constantValue);
-        }
-        JSElementFactory.replaceExpression(expression, newExpression);
-    }
-
-    private static String getLeftSideText(JSBinaryExpression binaryExpression) {
-        return binaryExpression.getLOperand().getText() +
-               BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign());
-    }
-
-    /**
-     * Returns the smallest subexpression (if precendence allows it). For instance:
-     * variable + 2 + 3 normally gets evaluated left to right -> (variable + 2)
-     * + 3 this method returns the right most legal subexpression -> 2 + 3
-     * @param expression the expression to analyse
-     * @return the found common sub-expression if found, or <tt>null</tt> otherwise.
-     */
-    @Nullable
-    private static JSBinaryExpression getSubexpression(JSBinaryExpression expression) {
-        final JSExpression       rhs               = expression.getROperand();
-        final IElementType sign              = expression.getOperationSign();
-        final int                parentPrecendence = ParenthesesUtils.getPrecendence(expression);
-
-        if (rhs == null) {
-            return null;
-        }
-
-        final JSExpression lhs = expression.getLOperand();
-
-        if (!(lhs instanceof JSBinaryExpression)) {
-            return expression;
-        }
-
-        final JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression) lhs;
-        final int                childPrecendence    = ParenthesesUtils.getPrecendence(lhsBinaryExpression);
-        final JSExpression       leftSide            = lhsBinaryExpression.getROperand();
-
-        if (leftSide == null) {
-            return null;
-        }
-
-        if (parentPrecendence > childPrecendence) {
-            return null;
-        }
-
-        try {
-            final String  subExpressionText = leftSide.getText() + BinaryOperatorUtils.getOperatorText(sign) +
-                                              rhs.getText();
-            final JSExpression subExpression     = JSChangeUtil.createExpressionFromText(expression.getProject(),
-                                                                                    subExpressionText);
-
-            return (JSBinaryExpression) subExpression;
-        } catch (Throwable ignore) {
-            return null;
-        }
-    }
-
-    private static class ConstantSubexpressionPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSElement ||
-                  element.getPrevSibling() instanceof JSElement)) {
-                return false;
-            }
-
-            PsiElement parent = element.getParent();
-
-            if (!(parent instanceof JSBinaryExpression)) {
-                if (element instanceof JSBinaryExpression &&
-                    ((JSBinaryExpression) element).getLOperand() instanceof JSBinaryExpression) {
-                    parent = element;
-                } else {
-                    return false;
-                }
-            }
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression) parent;
-
-            final JSBinaryExpression subexpression = getSubexpression(binaryExpression);
-            if (subexpression == null) {
-                return false;
-            }
-            if (binaryExpression.equals(subexpression) &&
-                !isPartOfConstantExpression(binaryExpression)) {
-                // handled by JSConstantExpressionIntention
-                return false;
-            }
-            if (!ExpressionUtil.isConstantExpression(subexpression)) {
-                return false;
-            }
-
-            return (ExpressionUtil.computeConstantExpression(subexpression) != null);
-        }
-
-        private static boolean isPartOfConstantExpression(JSBinaryExpression binaryExpression) {
-            final PsiElement containingElement = binaryExpression.getParent();
-
-            return (containingElement instanceof JSExpression &&
-                    ExpressionUtil.isConstantExpression((JSExpression) containingElement));
-        }
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new ConstantSubexpressionPredicate();
+	}
+
+	@Override
+	protected String getTextForElement(PsiElement element)
+	{
+		final PsiElement parent = element.getParent();
+		final JSBinaryExpression binaryExpression = (JSBinaryExpression) (parent instanceof JSBinaryExpression ? parent : element);
+		final JSExpression lhs = binaryExpression.getLOperand();
+		final JSExpression leftSide;
+
+		if(lhs instanceof JSBinaryExpression)
+		{
+			leftSide = ((JSBinaryExpression) lhs).getROperand();
+		}
+		else
+		{
+			leftSide = lhs;
+		}
+		final IElementType operationSign = binaryExpression.getOperationSign();
+		final JSExpression rhs = binaryExpression.getROperand();
+
+		assert (rhs != null);
+		assert (leftSide != null);
+
+		return this.getText(leftSide.getText(), BinaryOperatorUtils.getOperatorText(operationSign), rhs.getText());
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final PsiElement parent = element.getParent();
+		final JSExpression expression = (JSExpression) (parent instanceof JSBinaryExpression ? parent : element);
+		String newExpression = "";
+		final Object constantValue;
+
+		if(expression instanceof JSBinaryExpression)
+		{
+			final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+			final JSExpression lhs = binaryExpression.getLOperand();
+
+			if(lhs instanceof JSBinaryExpression)
+			{
+				final JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression) lhs;
+				final JSExpression rightSide = lhsBinaryExpression.getROperand();
+
+				newExpression += getLeftSideText(lhsBinaryExpression);
+
+				assert (rightSide != null);
+			}
+			constantValue = ExpressionUtil.computeConstantExpression(getSubexpression(binaryExpression));
+		}
+		else
+		{
+			constantValue = ExpressionUtil.computeConstantExpression(expression);
+		}
+
+		if(constantValue instanceof String)
+		{
+			newExpression += '"' + StringUtil.escapeStringCharacters(constantValue.toString()) + '"';
+		}
+		else
+		{
+			newExpression += String.valueOf(constantValue);
+		}
+		JSElementFactory.replaceExpression(expression, newExpression);
+	}
+
+	private static String getLeftSideText(JSBinaryExpression binaryExpression)
+	{
+		return binaryExpression.getLOperand().getText() +
+				BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign());
+	}
+
+	/**
+	 * Returns the smallest subexpression (if precendence allows it). For instance:
+	 * variable + 2 + 3 normally gets evaluated left to right -> (variable + 2)
+	 * + 3 this method returns the right most legal subexpression -> 2 + 3
+	 *
+	 * @param expression the expression to analyse
+	 * @return the found common sub-expression if found, or <tt>null</tt> otherwise.
+	 */
+	@Nullable
+	private static JSBinaryExpression getSubexpression(JSBinaryExpression expression)
+	{
+		final JSExpression rhs = expression.getROperand();
+		final IElementType sign = expression.getOperationSign();
+		final int parentPrecendence = ParenthesesUtils.getPrecendence(expression);
+
+		if(rhs == null)
+		{
+			return null;
+		}
+
+		final JSExpression lhs = expression.getLOperand();
+
+		if(!(lhs instanceof JSBinaryExpression))
+		{
+			return expression;
+		}
+
+		final JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression) lhs;
+		final int childPrecendence = ParenthesesUtils.getPrecendence(lhsBinaryExpression);
+		final JSExpression leftSide = lhsBinaryExpression.getROperand();
+
+		if(leftSide == null)
+		{
+			return null;
+		}
+
+		if(parentPrecendence > childPrecendence)
+		{
+			return null;
+		}
+
+		try
+		{
+			final String subExpressionText = leftSide.getText() + BinaryOperatorUtils.getOperatorText(sign) +
+					rhs.getText();
+			final JSExpression subExpression = JSChangeUtil.createExpressionFromText(expression.getProject(),
+					subExpressionText);
+
+			return (JSBinaryExpression) subExpression;
+		}
+		catch(Throwable ignore)
+		{
+			return null;
+		}
+	}
+
+	private static class ConstantSubexpressionPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSElement ||
+					element.getPrevSibling() instanceof JSElement))
+			{
+				return false;
+			}
+
+			PsiElement parent = element.getParent();
+
+			if(!(parent instanceof JSBinaryExpression))
+			{
+				if(element instanceof JSBinaryExpression &&
+						((JSBinaryExpression) element).getLOperand() instanceof JSBinaryExpression)
+				{
+					parent = element;
+				}
+				else
+				{
+					return false;
+				}
+			}
+			final JSBinaryExpression binaryExpression = (JSBinaryExpression) parent;
+
+			final JSBinaryExpression subexpression = getSubexpression(binaryExpression);
+			if(subexpression == null)
+			{
+				return false;
+			}
+			if(binaryExpression.equals(subexpression) &&
+					!isPartOfConstantExpression(binaryExpression))
+			{
+				// handled by JSConstantExpressionIntention
+				return false;
+			}
+			if(!ExpressionUtil.isConstantExpression(subexpression))
+			{
+				return false;
+			}
+
+			return (ExpressionUtil.computeConstantExpression(subexpression) != null);
+		}
+
+		private static boolean isPartOfConstantExpression(JSBinaryExpression binaryExpression)
+		{
+			final PsiElement containingElement = binaryExpression.getParent();
+
+			return (containingElement instanceof JSExpression &&
+					ExpressionUtil.isConstantExpression((JSExpression) containingElement));
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index 45c2a647..14ee6f5e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -15,86 +15,96 @@
  */
 package org.intellij.idea.lang.javascript.intention.increment;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
-import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
-import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
+import org.intellij.idea.lang.javascript.psiutil.*;
 
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSExpressionStatement;
-import com.intellij.lang.javascript.psi.JSPostfixExpression;
-import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.lang.javascript.psi.JSReturnStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSThrowStatement;
-import consulo.language.ast.IElementType;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSExtractIncrementIntention extends JSMutablyNamedIntention {
-    @Override
-	public String getTextForElement(PsiElement element) {
-        return this.getText(BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
-    }
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSExtractIncrementIntention", categories = {
+		"JavaScript",
+		"Other"
+}, fileExtensions = "js")
+public class JSExtractIncrementIntention extends JSMutablyNamedIntention
+{
+	@Override
+	public String getTextForElement(PsiElement element)
+	{
+		return this.getText(BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new ExtractIncrementPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ExtractIncrementPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final boolean      isPostfix = (element instanceof JSPostfixExpression);
-        final JSExpression operand   = (isPostfix ? ((JSPostfixExpression) element).getExpression()
-                                                  : ((JSPrefixExpression)  element).getExpression());
-        final JSStatement  statement = TreeUtil.getParentOfType(element, JSStatement.class);
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final boolean isPostfix = (element instanceof JSPostfixExpression);
+		final JSExpression operand = (isPostfix ? ((JSPostfixExpression) element).getExpression()
+				: ((JSPrefixExpression) element).getExpression());
+		final JSStatement statement = TreeUtil.getParentOfType(element, JSStatement.class);
 
-        assert (statement != null);
+		assert (statement != null);
 
-        if (isPostfix) {
-            JSElementFactory.addStatementAfter (statement, element.getText() + ';');
-        } else {
-            JSElementFactory.addStatementBefore(statement, element.getText() + ';');
-        }
-        JSElementFactory.replaceExpression((JSExpression) element, operand.getText());
-    }
+		if(isPostfix)
+		{
+			JSElementFactory.addStatementAfter(statement, element.getText() + ';');
+		}
+		else
+		{
+			JSElementFactory.addStatementBefore(statement, element.getText() + ';');
+		}
+		JSElementFactory.replaceExpression((JSExpression) element, operand.getText());
+	}
 
-    private static IElementType getOperationSign(PsiElement element) {
-        return ((element instanceof JSPostfixExpression)
-                     ? ((JSPostfixExpression) element).getOperationSign()
-                     : ((JSPrefixExpression)  element).getOperationSign());
-    }
+	private static IElementType getOperationSign(PsiElement element)
+	{
+		return ((element instanceof JSPostfixExpression)
+				? ((JSPostfixExpression) element).getOperationSign()
+				: ((JSPrefixExpression) element).getOperationSign());
+	}
 
-    private static class ExtractIncrementPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!ExpressionUtil.isIncrementDecrementExpression(element)) {
-                return false;
-            }
-            if (ErrorUtil.containsError(element)) {
-                return false;
-            }
+	private static class ExtractIncrementPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!ExpressionUtil.isIncrementDecrementExpression(element))
+			{
+				return false;
+			}
+			if(ErrorUtil.containsError(element))
+			{
+				return false;
+			}
 
-            final PsiElement parent = element.getParent();
+			final PsiElement parent = element.getParent();
 
-            if (parent instanceof JSExpressionStatement) {
-                return false;
-            }
+			if(parent instanceof JSExpressionStatement)
+			{
+				return false;
+			}
 
-            final JSStatement containingStatement = TreeUtil.getParentOfType(element, JSStatement.class);
+			final JSStatement containingStatement = TreeUtil.getParentOfType(element, JSStatement.class);
 
-            if (element instanceof JSPostfixExpression &&
-                (containingStatement instanceof JSReturnStatement ||
-                 containingStatement instanceof JSThrowStatement)) {
-                return false;
-            }
-            return (containingStatement != null);
-        }
-    }
+			if(element instanceof JSPostfixExpression &&
+					(containingStatement instanceof JSReturnStatement ||
+							containingStatement instanceof JSThrowStatement))
+			{
+				return false;
+			}
+			return (containingStatement != null);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 78510f66..1fdd0063 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -16,6 +16,8 @@
 package org.intellij.idea.lang.javascript.intention.initialization;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
@@ -24,84 +26,110 @@
 import org.intellij.idea.lang.javascript.psiutil.FindReferenceUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 
+import javax.annotation.Nonnull;
 import java.util.Iterator;
 
-public class JSMergeDeclarationAndInitializationIntention extends JSIntention {
-    @NonNls private static final String JS_VAR_PREFIX = "var ";
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSMergeDeclarationAndInitializationIntention", categories = {
+		"JavaScript",
+		"Declaration"
+}, fileExtensions = "js")
+public class JSMergeDeclarationAndInitializationIntention extends JSIntention
+{
+	@NonNls
+	private static final String JS_VAR_PREFIX = "var ";
 
-    @Override
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new Predicate();
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new Predicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        assert (element instanceof JSVarStatement);
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		assert (element instanceof JSVarStatement);
 
-        final JSVarStatement varStatement      = (JSVarStatement) element;
-        StringBuilder        declarationBuffer = new StringBuilder();
+		final JSVarStatement varStatement = (JSVarStatement) element;
+		StringBuilder declarationBuffer = new StringBuilder();
 
-        for (final JSVariable variable : varStatement.getVariables()) {
-            if (variable.hasInitializer()) {
-                declarationBuffer.append((declarationBuffer.length() == 0) ? JS_VAR_PREFIX : ", ")
-                                 .append(variable.getName())
-                                 .append(" = ")
-                                 .append(variable.getInitializer().getText());
-            } else {
-                final Iterator<PsiElement>  referenceIterator = FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
-                final JSReferenceExpression firstReference    = (JSReferenceExpression) (referenceIterator.hasNext() ? referenceIterator.next() : null);
-//                final JSReferenceExpression firstReference = FindReferenceUtil.findFirstReference(variable);
+		for(final JSVariable variable : varStatement.getVariables())
+		{
+			if(variable.hasInitializer())
+			{
+				declarationBuffer.append((declarationBuffer.length() == 0) ? JS_VAR_PREFIX : ", ")
+						.append(variable.getName())
+						.append(" = ")
+						.append(variable.getInitializer().getText());
+			}
+			else
+			{
+				final Iterator<PsiElement> referenceIterator = FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
+				final JSReferenceExpression firstReference = (JSReferenceExpression) (referenceIterator.hasNext() ? referenceIterator.next() : null);
+				//                final JSReferenceExpression firstReference = FindReferenceUtil.findFirstReference(variable);
 
-                if (firstReference != null &&
-                    firstReference.getParent() instanceof JSDefinitionExpression) {
-                    final JSExpressionStatement assignmentStatement = (JSExpressionStatement) firstReference.getParent().getParent().getParent();
+				if(firstReference != null &&
+						firstReference.getParent() instanceof JSDefinitionExpression)
+				{
+					final JSExpressionStatement assignmentStatement = (JSExpressionStatement) firstReference.getParent().getParent().getParent();
 
-                    // Replace assignment statement by var statement.
-                    JSElementFactory.replaceStatement(assignmentStatement, JS_VAR_PREFIX + assignmentStatement.getText());
-                } else {
-                    declarationBuffer.append((declarationBuffer.length() == 0) ? JS_VAR_PREFIX : ", ")
-                                     .append(variable.getName());
-                }
-            }
-        }
+					// Replace assignment statement by var statement.
+					JSElementFactory.replaceStatement(assignmentStatement, JS_VAR_PREFIX + assignmentStatement.getText());
+				}
+				else
+				{
+					declarationBuffer.append((declarationBuffer.length() == 0) ? JS_VAR_PREFIX : ", ")
+							.append(variable.getName());
+				}
+			}
+		}
 
-        // Do replacement.
-        if (declarationBuffer.length() == 0) {
-            JSElementFactory.removeElement(varStatement);
-        } else {
-            declarationBuffer.append(';');
-            JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
-        }
-    }
+		// Do replacement.
+		if(declarationBuffer.length() == 0)
+		{
+			JSElementFactory.removeElement(varStatement);
+		}
+		else
+		{
+			declarationBuffer.append(';');
+			JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
+		}
+	}
 
-    private static class Predicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSVarStatement)) {
-                return false;
-            }
-            final JSVarStatement varStatement = (JSVarStatement) element;
-            if (ErrorUtil.containsError(varStatement)) {
-                return false;
-            }
+	private static class Predicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSVarStatement))
+			{
+				return false;
+			}
+			final JSVarStatement varStatement = (JSVarStatement) element;
+			if(ErrorUtil.containsError(varStatement))
+			{
+				return false;
+			}
 
-            for (JSVariable variable : varStatement.getVariables()) {
-                if (!variable.hasInitializer()) {
-                    final Iterator<PsiElement>  referenceIterator = FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
-                    final JSReferenceExpression firstReference    = (JSReferenceExpression) (referenceIterator.hasNext() ? referenceIterator.next() : null);
+			for(JSVariable variable : varStatement.getVariables())
+			{
+				if(!variable.hasInitializer())
+				{
+					final Iterator<PsiElement> referenceIterator = FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
+					final JSReferenceExpression firstReference = (JSReferenceExpression) (referenceIterator.hasNext() ? referenceIterator.next() : null);
 
-                    if (firstReference != null &&
-                        firstReference.getParent()                         instanceof JSDefinitionExpression &&
-                        firstReference.getParent().getParent()             instanceof JSAssignmentExpression &&
-                        firstReference.getParent().getParent().getParent() instanceof JSExpressionStatement) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-    }
+					if(firstReference != null &&
+							firstReference.getParent() instanceof JSDefinitionExpression &&
+							firstReference.getParent().getParent() instanceof JSAssignmentExpression &&
+							firstReference.getParent().getParent().getParent() instanceof JSExpressionStatement)
+					{
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index c67fc0c9..69c311cd 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -19,87 +19,109 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSPsiImplUtils;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
 import consulo.language.psi.PsiFile;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
-public class JSSplitDeclarationAndInitializationIntention extends JSIntention {
-    @NonNls private static final String VAR_KEYWORD = "var ";
-
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSSplitDeclarationAndInitializationIntention", categories = {
+		"JavaScript",
+		"Declaration"
+}, fileExtensions = "js")
+public class JSSplitDeclarationAndInitializationIntention extends JSIntention
+{
+	@NonNls
+	private static final String VAR_KEYWORD = "var ";
+
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new Predicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        assert (element instanceof JSVarStatement);
-
-        final JSVarStatement varStatement      = (JSVarStatement) element;
-        StringBuilder        declarationBuffer = new StringBuilder();
-        List<String>         initializations   = new ArrayList<String>();
-
-        for (JSVariable variable : varStatement.getVariables()) {
-            declarationBuffer.append((declarationBuffer.length() == 0) ? VAR_KEYWORD : ",")
-                             .append(variable.getName());
-
-            String s = JSPsiImplUtils.getTypeFromDeclaration(variable);
-            final PsiFile containingFile = element.getContainingFile();
-
-            if (s == null && containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
-                s = JSResolveUtil.getExpressionType(variable.getInitializer(), containingFile);
-            }
-
-            if (s != null) {
-                declarationBuffer.append(":").append(s);
-            }
-            if (variable.hasInitializer()) {
-                initializations.add(variable.getName() + '=' + variable.getInitializer().getText() + ';');
-            }
-        }
-        declarationBuffer.append(';');
-
-        // Do replacement.
-        JSStatement newStatement = JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
-
-        for (final String initialization : initializations) {
-            newStatement = JSElementFactory.addStatementAfter(newStatement, initialization);
-        }
-    }
-
-    private static class Predicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            PsiElement elementParent;
-
-            if (!(element instanceof JSVarStatement) ||
-                (elementParent = element.getParent()) instanceof JSForStatement ||
-                elementParent instanceof JSClass
-               ) {
-                return false;
-            }
-
-            final JSVarStatement varStatement = (JSVarStatement) element;
-            if (ErrorUtil.containsError(varStatement)) {
-                return false;
-            }
-
-            for (JSVariable variable : varStatement.getVariables()) {
-                if (variable.hasInitializer()) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new Predicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		assert (element instanceof JSVarStatement);
+
+		final JSVarStatement varStatement = (JSVarStatement) element;
+		StringBuilder declarationBuffer = new StringBuilder();
+		List<String> initializations = new ArrayList<String>();
+
+		for(JSVariable variable : varStatement.getVariables())
+		{
+			declarationBuffer.append((declarationBuffer.length() == 0) ? VAR_KEYWORD : ",")
+					.append(variable.getName());
+
+			String s = JSPsiImplUtils.getTypeFromDeclaration(variable);
+			final PsiFile containingFile = element.getContainingFile();
+
+			if(s == null && containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4)
+			{
+				s = JSResolveUtil.getExpressionType(variable.getInitializer(), containingFile);
+			}
+
+			if(s != null)
+			{
+				declarationBuffer.append(":").append(s);
+			}
+			if(variable.hasInitializer())
+			{
+				initializations.add(variable.getName() + '=' + variable.getInitializer().getText() + ';');
+			}
+		}
+		declarationBuffer.append(';');
+
+		// Do replacement.
+		JSStatement newStatement = JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
+
+		for(final String initialization : initializations)
+		{
+			newStatement = JSElementFactory.addStatementAfter(newStatement, initialization);
+		}
+	}
+
+	private static class Predicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			PsiElement elementParent;
+
+			if(!(element instanceof JSVarStatement) ||
+					(elementParent = element.getParent()) instanceof JSForStatement ||
+					elementParent instanceof JSClass
+			)
+			{
+				return false;
+			}
+
+			final JSVarStatement varStatement = (JSVarStatement) element;
+			if(ErrorUtil.containsError(varStatement))
+			{
+				return false;
+			}
+
+			for(JSVariable variable : varStatement.getVariables())
+			{
+				if(variable.hasInitializer())
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index 8f8a8b02..4100a103 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -15,12 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention.loop;
 
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSForInStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.ASTNode;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
@@ -33,146 +35,175 @@
 
 import javax.annotation.Nonnull;
 
-public class JSMergeParallelForInLoopsIntention extends JSIntention {
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSMergeParallelForInLoopsIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSMergeParallelForInLoopsIntention extends JSIntention
+{
 
-    @NonNls private static final String FOR_IN_PREFIX            = "for (";
-    @NonNls private static final String FOR_IN_COLLECTION_PREFIX = " in ";
+	@NonNls
+	private static final String FOR_IN_PREFIX = "for (";
+	@NonNls
+	private static final String FOR_IN_COLLECTION_PREFIX = " in ";
 
-    @Override
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new MergeParallelForInLoopsPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement  nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-        assert (nextElement != null);
-
-        final JSForInStatement firstStatement  = (JSForInStatement) element;
-        final JSForInStatement secondStatement = (JSForInStatement) nextElement;
-        final StringBuilder    statementBuffer = new StringBuilder();
-
-        this.mergeForInStatements(statementBuffer, firstStatement, secondStatement);
-        JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
-        JSElementFactory.removeElement(secondStatement);
-    }
-
-    private void mergeForInStatements(StringBuilder  statementBuffer,
-                                      JSForInStatement firstStatement,
-                                      JSForInStatement secondStatement) {
-        final JSExpression   variableExpression   = getVariableExpression(firstStatement);
-        final JSVarStatement declaration          = firstStatement.getDeclarationStatement();
-        final JSExpression   collectionExpression = getCollectionExpression(firstStatement);
-        final JSStatement    firstBody            = firstStatement .getBody();
-        final JSStatement    secondBody           = secondStatement.getBody();
-
-        statementBuffer.append(FOR_IN_PREFIX)
-                       .append((declaration == null) ? variableExpression.getText() : declaration.getText())
-                       .append(FOR_IN_COLLECTION_PREFIX)
-                       .append(collectionExpression.getText())
-                       .append(')');
-        ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
-    }
-
-    private static class MergeParallelForInLoopsPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSForInStatement) || ErrorUtil.containsError(element)) {
-                return false;
-            }
-
-            final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-            if (!(nextStatement instanceof JSForInStatement) ||
-                  ErrorUtil.containsError(nextStatement)) {
-                return false;
-            }
-
-            return forInStatementsCanBeMerged((JSForInStatement) element,
-                                              (JSForInStatement) nextStatement);
-        }
-
-        public static boolean forInStatementsCanBeMerged(JSForInStatement statement1,
-                                                         JSForInStatement statement2) {
-
-//            final JSExpression firstVarExpression  = statement1.getVariableExpression();
-//            final JSExpression secondVarExpression = statement2.getVariableExpression();
-            final JSExpression firstVarExpression  = getVariableExpression(statement1);
-            final JSExpression secondVarExpression = getVariableExpression(statement2);
-            if (!EquivalenceChecker.expressionsAreEquivalent(firstVarExpression,
-                                                             secondVarExpression)) {
-                return false;
-            }
-
-            final JSVarStatement firstDeclaration  = statement1.getDeclarationStatement();
-            final JSVarStatement secondDeclaration = statement2.getDeclarationStatement();
-            if (!EquivalenceChecker.statementsAreEquivalent(firstDeclaration,
-                                                            secondDeclaration)) {
-                return false;
-            }
-
-//            final JSExpression firstCollection  = statement1.getCollectionExpression();
-//            final JSExpression secondCollection = statement2.getCollectionExpression();
-            final JSExpression firstCollection  = getCollectionExpression(statement1);
-            final JSExpression secondCollection = getCollectionExpression(statement2);
-            if (!EquivalenceChecker.expressionsAreEquivalent(firstCollection,
-                                                             secondCollection)) {
-                return false;
-            }
-
-            final JSStatement firstBody  = statement1.getBody();
-            final JSStatement secondBody = statement2.getBody();
-            return (firstBody == null || secondBody == null ||
-                    ControlFlowUtils.canBeMerged(firstBody, secondBody));
-        }
-    }
-
-    /**
-     * Method provided as a workaround of a bug in the JavaScript language IDEA plugin.
-     * @param forInStatement the for-in statement
-     * @return the for-in statement collection expression
-     */
-    private static JSExpression getCollectionExpression(JSForInStatement forInStatement) {
-        final ASTNode statementNode = forInStatement.getNode();
-        ASTNode       child         = ((statementNode == null) ? null : statementNode.getFirstChildNode());
-        boolean       inPassed      = false;
-
-        while (child != null) {
-            if (child.getElementType() == JSTokenTypes.IN_KEYWORD) {
-                inPassed = true;
-            }
-            if (inPassed && child.getPsi() instanceof JSExpression) {
-                return (JSExpression) child.getPsi();
-            }
-            child = child.getTreeNext();
-        }
-
-        return null;
-    }
-
-    /**
-     * Method provided as a workaround of a bug in the JavaScript language IDEA plugin.
-     * @param forInStatement the for-in statement
-     * @return the for-in statement collection expression
-     */
-    private static JSExpression getVariableExpression(JSForInStatement forInStatement) {
-        final ASTNode statementNode = forInStatement.getNode();
-        ASTNode       child         = ((statementNode == null) ? null : statementNode.getFirstChildNode());
-
-        while (child != null) {
-            if (child.getElementType() == JSTokenTypes.IN_KEYWORD) {
-                return null;
-            }
-
-            if (child.getPsi() instanceof JSExpression) {
-                return (JSExpression) child.getPsi();
-            }
-            child = child.getTreeNext();
-        }
-
-        return null;
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new MergeParallelForInLoopsPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+
+		assert (nextElement != null);
+
+		final JSForInStatement firstStatement = (JSForInStatement) element;
+		final JSForInStatement secondStatement = (JSForInStatement) nextElement;
+		final StringBuilder statementBuffer = new StringBuilder();
+
+		this.mergeForInStatements(statementBuffer, firstStatement, secondStatement);
+		JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
+		JSElementFactory.removeElement(secondStatement);
+	}
+
+	private void mergeForInStatements(StringBuilder statementBuffer,
+									  JSForInStatement firstStatement,
+									  JSForInStatement secondStatement)
+	{
+		final JSExpression variableExpression = getVariableExpression(firstStatement);
+		final JSVarStatement declaration = firstStatement.getDeclarationStatement();
+		final JSExpression collectionExpression = getCollectionExpression(firstStatement);
+		final JSStatement firstBody = firstStatement.getBody();
+		final JSStatement secondBody = secondStatement.getBody();
+
+		statementBuffer.append(FOR_IN_PREFIX)
+				.append((declaration == null) ? variableExpression.getText() : declaration.getText())
+				.append(FOR_IN_COLLECTION_PREFIX)
+				.append(collectionExpression.getText())
+				.append(')');
+		ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
+	}
+
+	private static class MergeParallelForInLoopsPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSForInStatement) || ErrorUtil.containsError(element))
+			{
+				return false;
+			}
+
+			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+
+			if(!(nextStatement instanceof JSForInStatement) ||
+					ErrorUtil.containsError(nextStatement))
+			{
+				return false;
+			}
+
+			return forInStatementsCanBeMerged((JSForInStatement) element,
+					(JSForInStatement) nextStatement);
+		}
+
+		public static boolean forInStatementsCanBeMerged(JSForInStatement statement1,
+														 JSForInStatement statement2)
+		{
+
+			//            final JSExpression firstVarExpression  = statement1.getVariableExpression();
+			//            final JSExpression secondVarExpression = statement2.getVariableExpression();
+			final JSExpression firstVarExpression = getVariableExpression(statement1);
+			final JSExpression secondVarExpression = getVariableExpression(statement2);
+			if(!EquivalenceChecker.expressionsAreEquivalent(firstVarExpression,
+					secondVarExpression))
+			{
+				return false;
+			}
+
+			final JSVarStatement firstDeclaration = statement1.getDeclarationStatement();
+			final JSVarStatement secondDeclaration = statement2.getDeclarationStatement();
+			if(!EquivalenceChecker.statementsAreEquivalent(firstDeclaration,
+					secondDeclaration))
+			{
+				return false;
+			}
+
+			//            final JSExpression firstCollection  = statement1.getCollectionExpression();
+			//            final JSExpression secondCollection = statement2.getCollectionExpression();
+			final JSExpression firstCollection = getCollectionExpression(statement1);
+			final JSExpression secondCollection = getCollectionExpression(statement2);
+			if(!EquivalenceChecker.expressionsAreEquivalent(firstCollection,
+					secondCollection))
+			{
+				return false;
+			}
+
+			final JSStatement firstBody = statement1.getBody();
+			final JSStatement secondBody = statement2.getBody();
+			return (firstBody == null || secondBody == null ||
+					ControlFlowUtils.canBeMerged(firstBody, secondBody));
+		}
+	}
+
+	/**
+	 * Method provided as a workaround of a bug in the JavaScript language IDEA plugin.
+	 *
+	 * @param forInStatement the for-in statement
+	 * @return the for-in statement collection expression
+	 */
+	private static JSExpression getCollectionExpression(JSForInStatement forInStatement)
+	{
+		final ASTNode statementNode = forInStatement.getNode();
+		ASTNode child = ((statementNode == null) ? null : statementNode.getFirstChildNode());
+		boolean inPassed = false;
+
+		while(child != null)
+		{
+			if(child.getElementType() == JSTokenTypes.IN_KEYWORD)
+			{
+				inPassed = true;
+			}
+			if(inPassed && child.getPsi() instanceof JSExpression)
+			{
+				return (JSExpression) child.getPsi();
+			}
+			child = child.getTreeNext();
+		}
+
+		return null;
+	}
+
+	/**
+	 * Method provided as a workaround of a bug in the JavaScript language IDEA plugin.
+	 *
+	 * @param forInStatement the for-in statement
+	 * @return the for-in statement collection expression
+	 */
+	private static JSExpression getVariableExpression(JSForInStatement forInStatement)
+	{
+		final ASTNode statementNode = forInStatement.getNode();
+		ASTNode child = ((statementNode == null) ? null : statementNode.getFirstChildNode());
+
+		while(child != null)
+		{
+			if(child.getElementType() == JSTokenTypes.IN_KEYWORD)
+			{
+				return null;
+			}
+
+			if(child.getPsi() instanceof JSExpression)
+			{
+				return (JSExpression) child.getPsi();
+			}
+			child = child.getTreeNext();
+		}
+
+		return null;
+	}
 
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index a5b75365..3c43e8a7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -15,9 +15,14 @@
  */
 package org.intellij.idea.lang.javascript.intention.loop;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSForStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import com.intellij.lang.javascript.psi.JSVarStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -26,107 +31,122 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSForStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSVarStatement;
-import consulo.language.util.IncorrectOperationException;
-
-public class JSMergeParallelForLoopsIntention extends JSIntention {
-    @NonNls private static final String FOR_STATEMENT_PREFIX = "for (";
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSMergeParallelForLoopsIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSMergeParallelForLoopsIntention extends JSIntention
+{
+	@NonNls
+	private static final String FOR_STATEMENT_PREFIX = "for (";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new MergeParallelForLoopsPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-        assert (nextElement != null);
-
-        final JSForStatement firstStatement  = (JSForStatement) element;
-        final JSForStatement secondStatement = (JSForStatement) nextElement;
-        final StringBuilder  statementBuffer = new StringBuilder();
-
-        this.mergeForStatements(statementBuffer, firstStatement, secondStatement);
-        JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
-        JSElementFactory.removeElement(secondStatement);
-    }
-
-    private void mergeForStatements(StringBuilder  statementBuffer,
-                                    JSForStatement firstStatement,
-                                    JSForStatement secondStatement) {
-        final JSExpression   initialization = firstStatement.getInitialization();
-        final JSVarStatement varStatement   = firstStatement.getVarDeclaration();
-        final JSExpression   condition      = firstStatement.getCondition();
-        final JSExpression   update         = firstStatement.getUpdate();
-        final JSStatement    firstBody      = firstStatement .getBody();
-        final JSStatement    secondBody     = secondStatement.getBody();
-
-        statementBuffer.append(FOR_STATEMENT_PREFIX)
-                       .append((initialization == null) ? varStatement.getText() : initialization.getText())
-                       .append(';')
-                       .append(condition.getText())
-                       .append(';')
-                       .append(update.getText())
-                       .append(')');
-        ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
-    }
-
-    private static class MergeParallelForLoopsPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSForStatement) || ErrorUtil.containsError(element)) {
-                return false;
-            }
-
-            final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-            if (!(nextStatement instanceof JSForStatement) ||  ErrorUtil.containsError(nextStatement)) {
-                return false;
-            }
-
-            return forStatementsCanBeMerged((JSForStatement) element,
-                                            (JSForStatement) nextStatement);
-        }
-
-        public static boolean forStatementsCanBeMerged(JSForStatement statement1,
-                                                       JSForStatement statement2) {
-            final JSExpression firstInitialization  = statement1.getInitialization();
-            final JSExpression secondInitialization = statement2.getInitialization();
-            if (!EquivalenceChecker.expressionsAreEquivalent(firstInitialization,
-                                                             secondInitialization)) {
-                return false;
-            }
-
-            final JSVarStatement firstVarStatement  = statement1.getVarDeclaration();
-            final JSVarStatement secondVarStatement = statement2.getVarDeclaration();
-            if (!EquivalenceChecker.statementsAreEquivalent(firstVarStatement,
-                                                            secondVarStatement)) {
-                return false;
-            }
-
-            final JSExpression firstCondition  = statement1.getCondition();
-            final JSExpression secondCondition = statement2.getCondition();
-            if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition,
-                                                             secondCondition)) {
-                return false;
-            }
-
-            final JSExpression firstUpdate  = statement1.getUpdate();
-            final JSExpression secondUpdate = statement2.getUpdate();
-            if (!EquivalenceChecker.expressionsAreEquivalent(firstUpdate,
-                                                             secondUpdate)) {
-                return false;
-            }
-
-            final JSStatement firstBody  = statement1.getBody();
-            final JSStatement secondBody = statement2.getBody();
-            return (firstBody == null || secondBody == null ||
-                    ControlFlowUtils.canBeMerged(firstBody, secondBody));
-        }
-     }
- }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new MergeParallelForLoopsPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+
+		assert (nextElement != null);
+
+		final JSForStatement firstStatement = (JSForStatement) element;
+		final JSForStatement secondStatement = (JSForStatement) nextElement;
+		final StringBuilder statementBuffer = new StringBuilder();
+
+		this.mergeForStatements(statementBuffer, firstStatement, secondStatement);
+		JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
+		JSElementFactory.removeElement(secondStatement);
+	}
+
+	private void mergeForStatements(StringBuilder statementBuffer,
+									JSForStatement firstStatement,
+									JSForStatement secondStatement)
+	{
+		final JSExpression initialization = firstStatement.getInitialization();
+		final JSVarStatement varStatement = firstStatement.getVarDeclaration();
+		final JSExpression condition = firstStatement.getCondition();
+		final JSExpression update = firstStatement.getUpdate();
+		final JSStatement firstBody = firstStatement.getBody();
+		final JSStatement secondBody = secondStatement.getBody();
+
+		statementBuffer.append(FOR_STATEMENT_PREFIX)
+				.append((initialization == null) ? varStatement.getText() : initialization.getText())
+				.append(';')
+				.append(condition.getText())
+				.append(';')
+				.append(update.getText())
+				.append(')');
+		ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
+	}
+
+	private static class MergeParallelForLoopsPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSForStatement) || ErrorUtil.containsError(element))
+			{
+				return false;
+			}
+
+			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+
+			if(!(nextStatement instanceof JSForStatement) || ErrorUtil.containsError(nextStatement))
+			{
+				return false;
+			}
+
+			return forStatementsCanBeMerged((JSForStatement) element,
+					(JSForStatement) nextStatement);
+		}
+
+		public static boolean forStatementsCanBeMerged(JSForStatement statement1,
+													   JSForStatement statement2)
+		{
+			final JSExpression firstInitialization = statement1.getInitialization();
+			final JSExpression secondInitialization = statement2.getInitialization();
+			if(!EquivalenceChecker.expressionsAreEquivalent(firstInitialization,
+					secondInitialization))
+			{
+				return false;
+			}
+
+			final JSVarStatement firstVarStatement = statement1.getVarDeclaration();
+			final JSVarStatement secondVarStatement = statement2.getVarDeclaration();
+			if(!EquivalenceChecker.statementsAreEquivalent(firstVarStatement,
+					secondVarStatement))
+			{
+				return false;
+			}
+
+			final JSExpression firstCondition = statement1.getCondition();
+			final JSExpression secondCondition = statement2.getCondition();
+			if(!EquivalenceChecker.expressionsAreEquivalent(firstCondition,
+					secondCondition))
+			{
+				return false;
+			}
+
+			final JSExpression firstUpdate = statement1.getUpdate();
+			final JSExpression secondUpdate = statement2.getUpdate();
+			if(!EquivalenceChecker.expressionsAreEquivalent(firstUpdate,
+					secondUpdate))
+			{
+				return false;
+			}
+
+			final JSStatement firstBody = statement1.getBody();
+			final JSStatement secondBody = statement2.getBody();
+			return (firstBody == null || secondBody == null ||
+					ControlFlowUtils.canBeMerged(firstBody, secondBody));
+		}
+	}
+}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index 221a9089..ebdcf618 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -15,43 +15,54 @@
  */
 package org.intellij.idea.lang.javascript.intention.number;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
-
+import javax.annotation.Nonnull;
 
-public class JSConvertIntegerToDecimalIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSConvertIntegerToDecimalIntention", categories = {
+		"JavaScript",
+		"Numbers"
+}, fileExtensions = "js")
+public class JSConvertIntegerToDecimalIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new ConvertIntegerToDecimalPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression exp = (JSLiteralExpression) element;
-
-        JSElementFactory.replaceExpression(exp, NumberUtil.getLiteralNumber(exp).toString());
-    }
-
-    private static class ConvertIntegerToDecimalPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSLiteralExpression)) {
-                return false;
-            }
-
-            final String elementText = element.getText();
-
-            return (NumberUtil.isHex  (elementText) ||
-                    NumberUtil.isOctal(elementText));
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ConvertIntegerToDecimalPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSLiteralExpression exp = (JSLiteralExpression) element;
+
+		JSElementFactory.replaceExpression(exp, NumberUtil.getLiteralNumber(exp).toString());
+	}
+
+	private static class ConvertIntegerToDecimalPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSLiteralExpression))
+			{
+				return false;
+			}
+
+			final String elementText = element.getText();
+
+			return (NumberUtil.isHex(elementText) ||
+					NumberUtil.isOctal(elementText));
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index ee2d08ea..6e39e25d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -15,39 +15,51 @@
  */
 package org.intellij.idea.lang.javascript.intention.number;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSConvertIntegerToHexIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSConvertIntegerToHexIntention", categories = {
+		"JavaScript",
+		"Numbers"
+}, fileExtensions = "js")
+public class JSConvertIntegerToHexIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new ConvertIntegerToHexPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ConvertIntegerToHexPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression exp = (JSLiteralExpression) element;
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSLiteralExpression exp = (JSLiteralExpression) element;
 
-        JSElementFactory.replaceExpression(exp, "0x" + NumberUtil.getLiteralNumber(exp).toString(16));
-    }
+		JSElementFactory.replaceExpression(exp, "0x" + NumberUtil.getLiteralNumber(exp).toString(16));
+	}
 
-    private static class ConvertIntegerToHexPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSLiteralExpression)) {
-                return false;
-            }
+	private static class ConvertIntegerToHexPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSLiteralExpression))
+			{
+				return false;
+			}
 
-            return NumberUtil.isDecimal(element.getText());
-        }
-    }
+			return NumberUtil.isDecimal(element.getText());
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 24c25141..3343bbc1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -15,43 +15,56 @@
  */
 package org.intellij.idea.lang.javascript.intention.number;
 
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
-import javax.annotation.Nonnull;
 
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSConvertIntegerToOctalIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSConvertIntegerToOctalIntention", categories = {
+		"JavaScript",
+		"Numbers"
+}, fileExtensions = "js")
+public class JSConvertIntegerToOctalIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new ConvertIntegerToOctalPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression exp = (JSLiteralExpression) element;
-
-        JSElementFactory.replaceExpression(exp, '0' + NumberUtil.getLiteralNumber(exp).toString(8));
-    }
-
-    private static class ConvertIntegerToOctalPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSLiteralExpression)) {
-                return false;
-            }
-
-            final String elementText = element.getText();
-
-            return (NumberUtil.isHex     (elementText) ||
-                    (NumberUtil.isDecimal(elementText) &&
-                     !NumberUtil.isOctal (elementText)));
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ConvertIntegerToOctalPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSLiteralExpression exp = (JSLiteralExpression) element;
+
+		JSElementFactory.replaceExpression(exp, '0' + NumberUtil.getLiteralNumber(exp).toString(8));
+	}
+
+	private static class ConvertIntegerToOctalPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSLiteralExpression))
+			{
+				return false;
+			}
+
+			final String elementText = element.getText();
+
+			return (NumberUtil.isHex(elementText) ||
+					(NumberUtil.isDecimal(elementText) &&
+							!NumberUtil.isOctal(elementText)));
+		}
+	}
 
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index 34aada82..add28157 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -15,136 +15,166 @@
  */
 package org.intellij.idea.lang.javascript.intention.number;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
-import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
+import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
-import consulo.language.ast.IElementType;
-import consulo.language.util.IncorrectOperationException;
-
-public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention {
-    @Override
-	protected String getTextForElement(PsiElement element) {
-        final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
-        final String        operatorString;
-
-        if (element instanceof JSAssignmentExpression) {
-            operatorString = (tokenType.equals(JSTokenTypes.MULTEQ) ? "<<=" : ">>=");
-        } else {
-            operatorString = (tokenType.equals(JSTokenTypes.MULT)   ? "<<"  : ">>");
-        }
-
-        return this.getText(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
-    }
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSReplaceMultiplyWithShiftIntention", categories = {
+		"JavaScript",
+		"Shift"
+}, fileExtensions = "js")
+public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention
+{
+	@Override
+	protected String getTextForElement(PsiElement element)
+	{
+		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
+		final String operatorString;
+
+		if(element instanceof JSAssignmentExpression)
+		{
+			operatorString = (tokenType.equals(JSTokenTypes.MULTEQ) ? "<<=" : ">>=");
+		}
+		else
+		{
+			operatorString = (tokenType.equals(JSTokenTypes.MULT) ? "<<" : ">>");
+		}
+
+		return this.getText(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
+	}
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new MultiplyByPowerOfTwoPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new MultiplyByPowerOfTwoPredicate();
+	}
 
-    @Override
+	@Override
 	public void processIntention(@Nonnull PsiElement element)
-            throws IncorrectOperationException {
-        if (element instanceof JSAssignmentExpression) {
-            this.replaceMultiplyOrDivideAssignWithShiftAssign((JSAssignmentExpression) element);
-        } else {
-            this.replaceMultiplyOrDivideWithShift((JSBinaryExpression) element);
-        }
-    }
-
-    private void replaceMultiplyOrDivideAssignWithShiftAssign(JSAssignmentExpression exp)
-            throws IncorrectOperationException {
-        final JSExpression lhs          = exp.getLOperand();
-        final JSExpression rhs          = exp.getROperand();
-        final IElementType tokenType    = exp.getOperationSign();
-        final String       assignString = (tokenType.equals(JSTokenTypes.MULTEQ) ? "<<=" : ">>=");
-        final String       expString    = lhs.getText() + assignString +
-                                          ShiftUtils.getLogBase2(rhs);
-
-        JSElementFactory.replaceExpression(exp, expString);
-    }
-
-    private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp)
-            throws IncorrectOperationException {
-        JSExpression       lhs            = exp.getLOperand();
-        JSExpression       rhs            = exp.getROperand();
-        final IElementType tokenType      = exp.getOperationSign();
-        final String       operatorString = (tokenType.equals(JSTokenTypes.MULT) ? "<<" : ">>");
-
-        if (ShiftUtils.isPowerOfTwo(lhs) && tokenType.equals(JSTokenTypes.MULT)) {
-            JSExpression  swap = lhs;
-
-            lhs = rhs;
-            rhs = swap;
-        }
-
-        final String     lhsText   = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.SHIFT_PRECENDENCE);
-        String           expString = lhsText + operatorString + ShiftUtils.getLogBase2(rhs);
-        final  JSElement parent    = (JSElement) exp.getParent();
-
-        if (parent != null && parent instanceof JSExpression) {
-            if (!(parent instanceof JSParenthesizedExpression)  &&
-                ParenthesesUtils.getPrecendence((JSExpression) parent) < ParenthesesUtils.SHIFT_PRECENDENCE) {
-                expString = '(' + expString + ')';
-            }
-        }
-        JSElementFactory.replaceExpression(exp, expString);
-    }
-
-    private static class MultiplyByPowerOfTwoPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (element instanceof JSAssignmentExpression) {
-                return isMultiplyByPowerOfTwo((JSAssignmentExpression) element);
-            } else if (element instanceof JSBinaryExpression) {
-                return isMultiplyByPowerOfTwo((JSBinaryExpression) element);
-            } else {
-                return false;
-            }
-        }
-
-        private static boolean isMultiplyByPowerOfTwo(JSAssignmentExpression expression) {
-            final IElementType operator = expression.getOperationSign();
-
-            if (operator == null || !(operator.equals(JSTokenTypes.MULTEQ) || operator.equals(JSTokenTypes.DIVEQ))) {
-                return false;
-            }
-
-            final JSExpression rightExpression = expression.getROperand();
-
-            if (rightExpression == null) {
-                return false;
-            }
-
-            return ShiftUtils.isPowerOfTwo(rightExpression);
-        }
-
-        private static boolean isMultiplyByPowerOfTwo(JSBinaryExpression expression) {
-            final IElementType operator = expression.getOperationSign();
-
-            if (operator == null || !(operator.equals(JSTokenTypes.MULT) || operator.equals(JSTokenTypes.DIV))) {
-                return false;
-            }
-
-            final JSExpression leftOperand  = expression.getLOperand();
-            final JSExpression rightOperand = expression.getROperand();
-
-            if (leftOperand == null || rightOperand == null) {
-                return false;
-            }
-            return (ShiftUtils.isPowerOfTwo(leftOperand) || ShiftUtils.isPowerOfTwo(rightOperand));
-        }
-    }
+			throws IncorrectOperationException
+	{
+		if(element instanceof JSAssignmentExpression)
+		{
+			this.replaceMultiplyOrDivideAssignWithShiftAssign((JSAssignmentExpression) element);
+		}
+		else
+		{
+			this.replaceMultiplyOrDivideWithShift((JSBinaryExpression) element);
+		}
+	}
+
+	private void replaceMultiplyOrDivideAssignWithShiftAssign(JSAssignmentExpression exp)
+			throws IncorrectOperationException
+	{
+		final JSExpression lhs = exp.getLOperand();
+		final JSExpression rhs = exp.getROperand();
+		final IElementType tokenType = exp.getOperationSign();
+		final String assignString = (tokenType.equals(JSTokenTypes.MULTEQ) ? "<<=" : ">>=");
+		final String expString = lhs.getText() + assignString +
+				ShiftUtils.getLogBase2(rhs);
+
+		JSElementFactory.replaceExpression(exp, expString);
+	}
+
+	private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp)
+			throws IncorrectOperationException
+	{
+		JSExpression lhs = exp.getLOperand();
+		JSExpression rhs = exp.getROperand();
+		final IElementType tokenType = exp.getOperationSign();
+		final String operatorString = (tokenType.equals(JSTokenTypes.MULT) ? "<<" : ">>");
+
+		if(ShiftUtils.isPowerOfTwo(lhs) && tokenType.equals(JSTokenTypes.MULT))
+		{
+			JSExpression swap = lhs;
+
+			lhs = rhs;
+			rhs = swap;
+		}
+
+		final String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.SHIFT_PRECENDENCE);
+		String expString = lhsText + operatorString + ShiftUtils.getLogBase2(rhs);
+		final JSElement parent = (JSElement) exp.getParent();
+
+		if(parent != null && parent instanceof JSExpression)
+		{
+			if(!(parent instanceof JSParenthesizedExpression) &&
+					ParenthesesUtils.getPrecendence((JSExpression) parent) < ParenthesesUtils.SHIFT_PRECENDENCE)
+			{
+				expString = '(' + expString + ')';
+			}
+		}
+		JSElementFactory.replaceExpression(exp, expString);
+	}
+
+	private static class MultiplyByPowerOfTwoPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(element instanceof JSAssignmentExpression)
+			{
+				return isMultiplyByPowerOfTwo((JSAssignmentExpression) element);
+			}
+			else if(element instanceof JSBinaryExpression)
+			{
+				return isMultiplyByPowerOfTwo((JSBinaryExpression) element);
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		private static boolean isMultiplyByPowerOfTwo(JSAssignmentExpression expression)
+		{
+			final IElementType operator = expression.getOperationSign();
+
+			if(operator == null || !(operator.equals(JSTokenTypes.MULTEQ) || operator.equals(JSTokenTypes.DIVEQ)))
+			{
+				return false;
+			}
+
+			final JSExpression rightExpression = expression.getROperand();
+
+			if(rightExpression == null)
+			{
+				return false;
+			}
+
+			return ShiftUtils.isPowerOfTwo(rightExpression);
+		}
+
+		private static boolean isMultiplyByPowerOfTwo(JSBinaryExpression expression)
+		{
+			final IElementType operator = expression.getOperationSign();
+
+			if(operator == null || !(operator.equals(JSTokenTypes.MULT) || operator.equals(JSTokenTypes.DIV)))
+			{
+				return false;
+			}
+
+			final JSExpression leftOperand = expression.getLOperand();
+			final JSExpression rightOperand = expression.getROperand();
+
+			if(leftOperand == null || rightOperand == null)
+			{
+				return false;
+			}
+			return (ShiftUtils.isPowerOfTwo(leftOperand) || ShiftUtils.isPowerOfTwo(rightOperand));
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index ead81792..9f2fd03d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -15,126 +15,154 @@
  */
 package org.intellij.idea.lang.javascript.intention.number;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
-import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
+import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
-import consulo.language.util.IncorrectOperationException;
-
-public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention {
-    @Override
-	protected String getTextForElement(PsiElement element) {
-        final IElementType  tokenType = ((JSBinaryExpression) element).getOperationSign();
-        final String        operatorString;
-
-        if (element instanceof JSAssignmentExpression) {
-            operatorString = (tokenType.equals(JSTokenTypes.LTLTEQ) ? "*=" : "/=");
-        } else {
-            operatorString = (tokenType.equals(JSTokenTypes.LTLT)   ? "*"  : "/");
-        }
-
-        return this.getText(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
-    }
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSReplaceShiftWithMultiplyIntention", categories = {
+		"JavaScript",
+		"Shift"
+}, fileExtensions = "js")
+public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention
+{
+	@Override
+	protected String getTextForElement(PsiElement element)
+	{
+		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
+		final String operatorString;
+
+		if(element instanceof JSAssignmentExpression)
+		{
+			operatorString = (tokenType.equals(JSTokenTypes.LTLTEQ) ? "*=" : "/=");
+		}
+		else
+		{
+			operatorString = (tokenType.equals(JSTokenTypes.LTLT) ? "*" : "/");
+		}
+
+		return this.getText(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
+	}
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new ShiftByLiteralPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        if (element instanceof JSAssignmentExpression) {
-            this.replaceShiftAssignWithMultiplyOrDivideAssign((JSAssignmentExpression) element);
-        } else {
-            assert(element instanceof JSBinaryExpression);
-            this.replaceShiftWithMultiplyOrDivide((JSBinaryExpression) element);
-        }
-    }
-
-    private void replaceShiftAssignWithMultiplyOrDivideAssign(JSAssignmentExpression exp)
-            throws IncorrectOperationException {
-        final JSExpression  lhs          = exp.getLOperand();
-        final JSExpression  rhs          = exp.getROperand();
-        final IElementType  tokenType    = exp.getOperationSign();
-        final String        assignString = ((tokenType.equals(JSTokenTypes.LTLTEQ)) ? "*=" : "/=");
-
-        final String expString = lhs.getText() + assignString + ShiftUtils.getExpBase2(rhs);
-
-        JSElementFactory.replaceExpression(exp, expString);
-    }
-
-    private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp)
-            throws IncorrectOperationException {
-        final JSExpression  lhs            = exp.getLOperand();
-        final JSExpression  rhs            = exp.getROperand();
-        final IElementType  tokenType      = exp.getOperationSign();
-        final String        operatorString = ((tokenType.equals(JSTokenTypes.LTLT)) ? "*" : "/");
-        final String        lhsText        = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE);
-        String              expString      = lhsText + operatorString + ShiftUtils.getExpBase2(rhs);
-        final JSElement     parent         = (JSElement) exp.getParent();
-
-        if (parent != null && parent instanceof JSExpression) {
-            if (!(parent instanceof JSParenthesizedExpression)  &&
-                ParenthesesUtils.getPrecendence((JSExpression) parent) < ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE) {
-                expString = '(' + expString + ')';
-            }
-        }
-        JSElementFactory.replaceExpression(exp, expString);
-    }
-
-    private static class ShiftByLiteralPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (element instanceof JSAssignmentExpression) {
-                return this.isAssignmentShiftByLiteral((JSAssignmentExpression) element);
-            } else if (element instanceof JSBinaryExpression) {
-                return this.isBinaryShiftByLiteral((JSBinaryExpression) element);
-            } else {
-                return false;
-            }
-        }
-
-        private boolean isAssignmentShiftByLiteral(JSAssignmentExpression expression) {
-            final IElementType tokenType = expression.getOperationSign();
-
-            if (tokenType == null ||
-                !(tokenType.equals(JSTokenTypes.LTLTEQ) ||
-                  tokenType.equals(JSTokenTypes.GTGTEQ)
-                )
-               ) {
-                return false;
-            }
-
-            final JSExpression rhs = expression.getROperand();
-
-            if (rhs == null) {
-                return false;
-            }
-            return ShiftUtils.isIntLiteral(rhs);
-        }
-
-        private boolean isBinaryShiftByLiteral(JSBinaryExpression expression) {
-            final IElementType tokenType = expression.getOperationSign();
-
-            if (!(tokenType.equals(JSTokenTypes.LTLT) ||
-                  tokenType.equals(JSTokenTypes.GTGT))) {
-                return false;
-            }
-
-            return ShiftUtils.isIntLiteral(expression.getROperand());
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ShiftByLiteralPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		if(element instanceof JSAssignmentExpression)
+		{
+			this.replaceShiftAssignWithMultiplyOrDivideAssign((JSAssignmentExpression) element);
+		}
+		else
+		{
+			assert (element instanceof JSBinaryExpression);
+			this.replaceShiftWithMultiplyOrDivide((JSBinaryExpression) element);
+		}
+	}
+
+	private void replaceShiftAssignWithMultiplyOrDivideAssign(JSAssignmentExpression exp)
+			throws IncorrectOperationException
+	{
+		final JSExpression lhs = exp.getLOperand();
+		final JSExpression rhs = exp.getROperand();
+		final IElementType tokenType = exp.getOperationSign();
+		final String assignString = ((tokenType.equals(JSTokenTypes.LTLTEQ)) ? "*=" : "/=");
+
+		final String expString = lhs.getText() + assignString + ShiftUtils.getExpBase2(rhs);
+
+		JSElementFactory.replaceExpression(exp, expString);
+	}
+
+	private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp)
+			throws IncorrectOperationException
+	{
+		final JSExpression lhs = exp.getLOperand();
+		final JSExpression rhs = exp.getROperand();
+		final IElementType tokenType = exp.getOperationSign();
+		final String operatorString = ((tokenType.equals(JSTokenTypes.LTLT)) ? "*" : "/");
+		final String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE);
+		String expString = lhsText + operatorString + ShiftUtils.getExpBase2(rhs);
+		final JSElement parent = (JSElement) exp.getParent();
+
+		if(parent != null && parent instanceof JSExpression)
+		{
+			if(!(parent instanceof JSParenthesizedExpression) &&
+					ParenthesesUtils.getPrecendence((JSExpression) parent) < ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE)
+			{
+				expString = '(' + expString + ')';
+			}
+		}
+		JSElementFactory.replaceExpression(exp, expString);
+	}
+
+	private static class ShiftByLiteralPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(element instanceof JSAssignmentExpression)
+			{
+				return this.isAssignmentShiftByLiteral((JSAssignmentExpression) element);
+			}
+			else if(element instanceof JSBinaryExpression)
+			{
+				return this.isBinaryShiftByLiteral((JSBinaryExpression) element);
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		private boolean isAssignmentShiftByLiteral(JSAssignmentExpression expression)
+		{
+			final IElementType tokenType = expression.getOperationSign();
+
+			if(tokenType == null ||
+					!(tokenType.equals(JSTokenTypes.LTLTEQ) ||
+							tokenType.equals(JSTokenTypes.GTGTEQ)
+					)
+			)
+			{
+				return false;
+			}
+
+			final JSExpression rhs = expression.getROperand();
+
+			if(rhs == null)
+			{
+				return false;
+			}
+			return ShiftUtils.isIntLiteral(rhs);
+		}
+
+		private boolean isBinaryShiftByLiteral(JSBinaryExpression expression)
+		{
+			final IElementType tokenType = expression.getOperationSign();
+
+			if(!(tokenType.equals(JSTokenTypes.LTLT) ||
+					tokenType.equals(JSTokenTypes.GTGT)))
+			{
+				return false;
+			}
+
+			return ShiftUtils.isIntLiteral(expression.getROperand());
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
index 38a67135..8e979d46 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
@@ -18,83 +18,109 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 
-class ShiftUtils {
-    private ShiftUtils() {}
+class ShiftUtils
+{
+	private ShiftUtils()
+	{
+	}
 
-    public static boolean isPowerOfTwo(JSExpression expression) {
-        if (!(expression instanceof JSLiteralExpression)) {
-            return false;
-        }
-        final String value = expression.getText();
-        long         intValue;
+	public static boolean isPowerOfTwo(JSExpression expression)
+	{
+		if(!(expression instanceof JSLiteralExpression))
+		{
+			return false;
+		}
+		final String value = expression.getText();
+		long intValue;
 
-        try {
-            intValue = Integer.decode(value).longValue();
-        } catch (NumberFormatException e) {
-            return false;
-        }
+		try
+		{
+			intValue = Integer.decode(value).longValue();
+		}
+		catch(NumberFormatException e)
+		{
+			return false;
+		}
 
-        if (intValue <= 0) {
-            return false;
-        }
-        while ((intValue & 1) == 0) {
-            intValue >>= 1;
-        }
-        return (intValue == 1);
-    }
+		if(intValue <= 0)
+		{
+			return false;
+		}
+		while((intValue & 1) == 0)
+		{
+			intValue >>= 1;
+		}
+		return (intValue == 1);
+	}
 
-    public static int getLogBase2(JSExpression rhs) {
-        final String value = rhs.getText();
-        long         intValue;
+	public static int getLogBase2(JSExpression rhs)
+	{
+		final String value = rhs.getText();
+		long intValue;
 
-        try {
-            intValue = Integer.decode(value).longValue();
-        } catch (NumberFormatException e) {
-            assert(false);
-            return 0;
-        }
+		try
+		{
+			intValue = Integer.decode(value).longValue();
+		}
+		catch(NumberFormatException e)
+		{
+			assert (false);
+			return 0;
+		}
 
-        int log      = 0;
-        while ((intValue & 1) == 0) {
-            intValue >>= 1;
-            log++;
-        }
-        return log;
-    }
+		int log = 0;
+		while((intValue & 1) == 0)
+		{
+			intValue >>= 1;
+			log++;
+		}
+		return log;
+	}
 
-    public static int getExpBase2(JSExpression rhs) {
-        final String value = rhs.getText();
-        final long   intValue;
+	public static int getExpBase2(JSExpression rhs)
+	{
+		final String value = rhs.getText();
+		final long intValue;
 
-        try {
-            intValue = Integer.decode(value).longValue();
-        } catch (NumberFormatException e) {
-            assert(false);
-            return 0;
-        }
+		try
+		{
+			intValue = Integer.decode(value).longValue();
+		}
+		catch(NumberFormatException e)
+		{
+			assert (false);
+			return 0;
+		}
 
-        int exp = 1;
-        for (int i = 0; i < intValue; i++) {
-            exp <<= 1;
-        }
-        return exp;
-    }
+		int exp = 1;
+		for(int i = 0; i < intValue; i++)
+		{
+			exp <<= 1;
+		}
+		return exp;
+	}
 
-    public static boolean isIntLiteral(JSExpression expression) {
-        if (!(expression instanceof JSLiteralExpression)) {
-            return false;
-        }
+	public static boolean isIntLiteral(JSExpression expression)
+	{
+		if(!(expression instanceof JSLiteralExpression))
+		{
+			return false;
+		}
 
-        if (!(expression instanceof JSLiteralExpression)) {
-            return false;
-        }
-        final String value = expression.getText();
+		if(!(expression instanceof JSLiteralExpression))
+		{
+			return false;
+		}
+		final String value = expression.getText();
 
-        try {
-            Integer.decode(value);
-            return true;
-        } catch (NumberFormatException e) {
-            return false;
-        }
-    }
+		try
+		{
+			Integer.decode(value);
+			return true;
+		}
+		catch(NumberFormatException e)
+		{
+			return false;
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index cab614b9..4c45d8e7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -15,103 +15,120 @@
  */
 package org.intellij.idea.lang.javascript.intention.opassign;
 
-import javax.annotation.Nonnull;
-
-import consulo.language.psi.PsiElement;
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
-import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
-import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
-import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.SideEffectChecker;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
+import org.intellij.idea.lang.javascript.psiutil.*;
 
-public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedIntention {
-    @Override
-	public String getTextForElement(PsiElement element) {
-        final JSAssignmentExpression exp = (JSAssignmentExpression) element;
-        final JSBinaryExpression     rhs = (JSBinaryExpression) exp.getROperand();
-        assert (rhs != null);
-        final IElementType sign = rhs.getOperationSign();
-
-        return this.getText(BinaryOperatorUtils.getOperatorText(sign));
-    }
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSReplaceWithOperatorAssignmentIntention", categories = {
+		"JavaScript",
+		"Other"
+}, fileExtensions = "js")
+public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedIntention
+{
+	@Override
+	public String getTextForElement(PsiElement element)
+	{
+		final JSAssignmentExpression exp = (JSAssignmentExpression) element;
+		final JSBinaryExpression rhs = (JSBinaryExpression) exp.getROperand();
+		assert (rhs != null);
+		final IElementType sign = rhs.getOperationSign();
+
+		return this.getText(BinaryOperatorUtils.getOperatorText(sign));
+	}
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new Predicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSAssignmentExpression exp = (JSAssignmentExpression) element;
-        final JSBinaryExpression     rhs = (JSBinaryExpression) exp.getROperand();
-        final JSExpression           lhs = exp.getLOperand();
-
-        assert (rhs != null);
-
-        final IElementType sign    = rhs.getOperationSign();
-        final String        operand = BinaryOperatorUtils.getOperatorText(sign);
-        final JSExpression  rhsrhs  = rhs.getROperand();
-
-        assert (rhsrhs != null);
-
-        JSElementFactory.replaceExpression(exp, lhs.getText() + operand + '=' + rhsrhs.getText());
-    }
-
-    private static class Predicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSAssignmentExpression)) {
-                return false;
-            }
-            if (ErrorUtil.containsError(element)) {
-                return false;
-            }
-            final JSAssignmentExpression assignment = (JSAssignmentExpression) element;
-            final IElementType           tokenType  = assignment.getOperationSign();
-            if (!JSTokenTypes.EQ.equals(tokenType)) {
-                return false;
-            }
-            JSExpression       lhs = assignment.getLOperand();
-            final JSExpression rhs = assignment.getROperand();
-
-            if (lhs instanceof JSDefinitionExpression) {
-                lhs = ((JSDefinitionExpression) lhs).getExpression();
-            }
-            if (lhs == null || rhs == null) {
-                return false;
-            }
-            if (!(rhs instanceof JSBinaryExpression)) {
-                return false;
-            }
-            final JSBinaryExpression binaryRhs = (JSBinaryExpression) rhs;
-            final JSExpression       rhsRhs    = binaryRhs.getROperand();
-            final JSExpression       rhsLhs    = binaryRhs.getLOperand();
-
-            if (rhsRhs == null) {
-                return false;
-            }
-
-            final IElementType rhsTokenType = binaryRhs.getOperationSign();
-
-            if (JSTokenTypes.OROR  .equals(rhsTokenType)  ||
-                JSTokenTypes.ANDAND.equals(rhsTokenType)) {
-                return false;
-            }
-            if (SideEffectChecker.mayHaveSideEffects(lhs)) {
-                return false;
-            }
-            return EquivalenceChecker.expressionsAreEquivalent(lhs, rhsLhs);
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new Predicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSAssignmentExpression exp = (JSAssignmentExpression) element;
+		final JSBinaryExpression rhs = (JSBinaryExpression) exp.getROperand();
+		final JSExpression lhs = exp.getLOperand();
+
+		assert (rhs != null);
+
+		final IElementType sign = rhs.getOperationSign();
+		final String operand = BinaryOperatorUtils.getOperatorText(sign);
+		final JSExpression rhsrhs = rhs.getROperand();
+
+		assert (rhsrhs != null);
+
+		JSElementFactory.replaceExpression(exp, lhs.getText() + operand + '=' + rhsrhs.getText());
+	}
+
+	private static class Predicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSAssignmentExpression))
+			{
+				return false;
+			}
+			if(ErrorUtil.containsError(element))
+			{
+				return false;
+			}
+			final JSAssignmentExpression assignment = (JSAssignmentExpression) element;
+			final IElementType tokenType = assignment.getOperationSign();
+			if(!JSTokenTypes.EQ.equals(tokenType))
+			{
+				return false;
+			}
+			JSExpression lhs = assignment.getLOperand();
+			final JSExpression rhs = assignment.getROperand();
+
+			if(lhs instanceof JSDefinitionExpression)
+			{
+				lhs = ((JSDefinitionExpression) lhs).getExpression();
+			}
+			if(lhs == null || rhs == null)
+			{
+				return false;
+			}
+			if(!(rhs instanceof JSBinaryExpression))
+			{
+				return false;
+			}
+			final JSBinaryExpression binaryRhs = (JSBinaryExpression) rhs;
+			final JSExpression rhsRhs = binaryRhs.getROperand();
+			final JSExpression rhsLhs = binaryRhs.getLOperand();
+
+			if(rhsRhs == null)
+			{
+				return false;
+			}
+
+			final IElementType rhsTokenType = binaryRhs.getOperationSign();
+
+			if(JSTokenTypes.OROR.equals(rhsTokenType) ||
+					JSTokenTypes.ANDAND.equals(rhsTokenType))
+			{
+				return false;
+			}
+			if(SideEffectChecker.mayHaveSideEffects(lhs))
+			{
+				return false;
+			}
+			return EquivalenceChecker.expressionsAreEquivalent(lhs, rhsLhs);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 05d3934b..852e4e32 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -15,84 +15,111 @@
  */
 package org.intellij.idea.lang.javascript.intention.parenthesis;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
+import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import com.intellij.lang.javascript.psi.*;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSRemoveUnnecessaryParenthesesIntention", categories = {
+		"JavaScript",
+		"Other"
+}, fileExtensions = "js")
+public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new UnnecessaryParenthesesPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        JSExpression exp = (JSExpression) element;
-
-        while (exp.getParent() instanceof JSExpression) {
-            exp = (JSExpression) exp.getParent();
-            assert exp != null;
-        }
-
-        final String newExpression = ParenthesesUtils.removeParentheses(exp);
-
-        JSElementFactory.replaceExpression(exp, newExpression);
-    }
-
-    private static class UnnecessaryParenthesesPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSParenthesizedExpression)) {
-                return false;
-            }
-            if (ErrorUtil.containsError(element)) {
-                return false;
-            }
-
-            final JSParenthesizedExpression expression = (JSParenthesizedExpression) element;
-            final JSElement                 parent     = (JSElement) expression.getParent();
-
-            if (!(parent instanceof JSExpression)) {
-                return true;
-            }
-
-            final JSExpression body = expression.getInnerExpression();
-
-            if (body instanceof JSParenthesizedExpression) {
-                return true;
-            }
-
-            final int parentPrecendence = ParenthesesUtils.getPrecendence((JSExpression) parent);
-            final int childPrecendence  = ParenthesesUtils.getPrecendence(body);
-
-            if (parentPrecendence > childPrecendence) {
-                if (body instanceof JSFunctionExpression) return false;
-                return true;
-            } else if (parentPrecendence == childPrecendence) {
-                if (parent instanceof JSBinaryExpression &&
-                    body   instanceof JSBinaryExpression) {
-                    final IElementType parentOperator   = ((JSBinaryExpression) parent).getOperationSign();
-                    final IElementType childOperator    = ((JSBinaryExpression) body)  .getOperationSign();
-                    final JSBinaryExpression binaryExpression = (JSBinaryExpression) parent;
-                    final JSExpression       lhs              = binaryExpression.getLOperand();
-
-                    return (lhs.equals(expression) && parentOperator.equals(childOperator));
-                } else {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new UnnecessaryParenthesesPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		JSExpression exp = (JSExpression) element;
+
+		while(exp.getParent() instanceof JSExpression)
+		{
+			exp = (JSExpression) exp.getParent();
+			assert exp != null;
+		}
+
+		final String newExpression = ParenthesesUtils.removeParentheses(exp);
+
+		JSElementFactory.replaceExpression(exp, newExpression);
+	}
+
+	private static class UnnecessaryParenthesesPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSParenthesizedExpression))
+			{
+				return false;
+			}
+			if(ErrorUtil.containsError(element))
+			{
+				return false;
+			}
+
+			final JSParenthesizedExpression expression = (JSParenthesizedExpression) element;
+			final JSElement parent = (JSElement) expression.getParent();
+
+			if(!(parent instanceof JSExpression))
+			{
+				return true;
+			}
+
+			final JSExpression body = expression.getInnerExpression();
+
+			if(body instanceof JSParenthesizedExpression)
+			{
+				return true;
+			}
+
+			final int parentPrecendence = ParenthesesUtils.getPrecendence((JSExpression) parent);
+			final int childPrecendence = ParenthesesUtils.getPrecendence(body);
+
+			if(parentPrecendence > childPrecendence)
+			{
+				if(body instanceof JSFunctionExpression)
+				{
+					return false;
+				}
+				return true;
+			}
+			else if(parentPrecendence == childPrecendence)
+			{
+				if(parent instanceof JSBinaryExpression &&
+						body instanceof JSBinaryExpression)
+				{
+					final IElementType parentOperator = ((JSBinaryExpression) parent).getOperationSign();
+					final IElementType childOperator = ((JSBinaryExpression) body).getOperationSign();
+					final JSBinaryExpression binaryExpression = (JSBinaryExpression) parent;
+					final JSExpression lhs = binaryExpression.getLOperand();
+
+					return (lhs.equals(expression) && parentOperator.equals(childOperator));
+				}
+				else
+				{
+					return false;
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index 8cf5a0d3..d7076630 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -15,62 +15,81 @@
  */
 package org.intellij.idea.lang.javascript.intention.string;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSDoubleToSingleQuotedStringIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSDoubleToSingleQuotedStringIntention", categories = {
+		"JavaScript",
+		"Other"
+}, fileExtensions = "js")
+public class JSDoubleToSingleQuotedStringIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new DoubleToSingleQuotedStringPredicate();
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new DoubleToSingleQuotedStringPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression stringLiteral = (JSLiteralExpression) element;
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSLiteralExpression stringLiteral = (JSLiteralExpression) element;
 
-        JSElementFactory.replaceExpression(stringLiteral, changeQuotes(stringLiteral.getText()));
-    }
+		JSElementFactory.replaceExpression(stringLiteral, changeQuotes(stringLiteral.getText()));
+	}
 
-    static String changeQuotes(String stringLiteral) {
-        StringBuilder buffer      = new StringBuilder(stringLiteral);
-        int           simpleIndex = stringLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE);
-        int           doubleIndex = stringLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, stringLiteral.length() - 2);
+	static String changeQuotes(String stringLiteral)
+	{
+		StringBuilder buffer = new StringBuilder(stringLiteral);
+		int simpleIndex = stringLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE);
+		int doubleIndex = stringLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, stringLiteral.length() - 2);
 
-        while (simpleIndex >= 0 || doubleIndex > 0) {
-            if (simpleIndex > doubleIndex) {
-                if (stringLiteral.charAt(simpleIndex - 1) != StringUtil.BACKSLASH) {
-                  buffer.insert(simpleIndex, StringUtil.BACKSLASH);
-                }
-                simpleIndex = stringLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, simpleIndex - 1);
-            } else {
-                if (stringLiteral.charAt(doubleIndex - 1) == StringUtil.BACKSLASH) {
-                    buffer.deleteCharAt(doubleIndex - 1);
-                }
-                doubleIndex = stringLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, doubleIndex - 2);
-            }
-        }
-        buffer.setCharAt(0,                   StringUtil.SIMPLE_QUOTE);
-        buffer.setCharAt(buffer.length() - 1, StringUtil.SIMPLE_QUOTE);
+		while(simpleIndex >= 0 || doubleIndex > 0)
+		{
+			if(simpleIndex > doubleIndex)
+			{
+				if(stringLiteral.charAt(simpleIndex - 1) != StringUtil.BACKSLASH)
+				{
+					buffer.insert(simpleIndex, StringUtil.BACKSLASH);
+				}
+				simpleIndex = stringLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, simpleIndex - 1);
+			}
+			else
+			{
+				if(stringLiteral.charAt(doubleIndex - 1) == StringUtil.BACKSLASH)
+				{
+					buffer.deleteCharAt(doubleIndex - 1);
+				}
+				doubleIndex = stringLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, doubleIndex - 2);
+			}
+		}
+		buffer.setCharAt(0, StringUtil.SIMPLE_QUOTE);
+		buffer.setCharAt(buffer.length() - 1, StringUtil.SIMPLE_QUOTE);
 
-        return buffer.toString();
-    }
+		return buffer.toString();
+	}
 
-    private static class DoubleToSingleQuotedStringPredicate implements JSElementPredicate {
+	private static class DoubleToSingleQuotedStringPredicate implements JSElementPredicate
+	{
 
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSLiteralExpression)) {
-                return false;
-            }
-            return StringUtil.isDoubleQuoteStringLiteral((JSLiteralExpression) element);
-        }
-    }
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSLiteralExpression))
+			{
+				return false;
+			}
+			return StringUtil.isDoubleQuoteStringLiteral((JSLiteralExpression) element);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 24018990..e2458f2a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -15,87 +15,107 @@
  */
 package org.intellij.idea.lang.javascript.intention.string;
 
-import javax.annotation.Nonnull;
-
-import consulo.language.ast.IElementType;
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptTokenSets;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
+
+import javax.annotation.Nonnull;
 
-public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSJoinConcatenatedStringLiteralsIntention", categories = {
+		"JavaScript",
+		"Other"
+}, fileExtensions = "js")
+public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new StringConcatPredicate();
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new StringConcatPredicate();
+	}
 
-    @Override
+	@Override
 	public void processIntention(@Nonnull PsiElement element)
-            throws IncorrectOperationException {
-        final JSBinaryExpression expression = (JSBinaryExpression) element;
-        final JSExpression       lhs        = expression.getLOperand();
-        final JSExpression       rhs        = expression.getROperand();
+			throws IncorrectOperationException
+	{
+		final JSBinaryExpression expression = (JSBinaryExpression) element;
+		final JSExpression lhs = expression.getLOperand();
+		final JSExpression rhs = expression.getROperand();
 
-        assert (lhs instanceof JSLiteralExpression && rhs instanceof JSLiteralExpression);
+		assert (lhs instanceof JSLiteralExpression && rhs instanceof JSLiteralExpression);
 
-        final JSLiteralExpression  leftLiteral  = (JSLiteralExpression) lhs;
-        final JSLiteralExpression  rightLiteral = (JSLiteralExpression) rhs;
-        String                     lhsText      = lhs.getText();
-        String                     rhsText      = rhs.getText();
-        final String               newExpression;
+		final JSLiteralExpression leftLiteral = (JSLiteralExpression) lhs;
+		final JSLiteralExpression rightLiteral = (JSLiteralExpression) rhs;
+		String lhsText = lhs.getText();
+		String rhsText = rhs.getText();
+		final String newExpression;
 
-        if (StringUtil.isSimpleQuoteStringLiteral(leftLiteral) &&
-            StringUtil.isDoubleQuoteStringLiteral(rightLiteral)) {
-            rhsText = JSDoubleToSingleQuotedStringIntention.changeQuotes(rhsText);
-        } else if (StringUtil.isDoubleQuoteStringLiteral(leftLiteral) &&
-                   StringUtil.isSimpleQuoteStringLiteral(rightLiteral)) {
-            rhsText = JSSingleToDoubleQuotedStringIntention.changeQuotes(rhsText);
-        }
+		if(StringUtil.isSimpleQuoteStringLiteral(leftLiteral) &&
+				StringUtil.isDoubleQuoteStringLiteral(rightLiteral))
+		{
+			rhsText = JSDoubleToSingleQuotedStringIntention.changeQuotes(rhsText);
+		}
+		else if(StringUtil.isDoubleQuoteStringLiteral(leftLiteral) &&
+				StringUtil.isSimpleQuoteStringLiteral(rightLiteral))
+		{
+			rhsText = JSSingleToDoubleQuotedStringIntention.changeQuotes(rhsText);
+		}
 
-        newExpression = lhsText.substring(0, lhsText.length() - 1) + rhsText.substring(1);
-        JSElementFactory.replaceExpression(expression, newExpression);
-    }
+		newExpression = lhsText.substring(0, lhsText.length() - 1) + rhsText.substring(1);
+		JSElementFactory.replaceExpression(expression, newExpression);
+	}
 
-    private static class StringConcatPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSBinaryExpression)) {
-                return false;
-            }
+	private static class StringConcatPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSBinaryExpression))
+			{
+				return false;
+			}
 
-            final JSBinaryExpression expression = (JSBinaryExpression) element;
-            final IElementType sign       = expression.getOperationSign();
+			final JSBinaryExpression expression = (JSBinaryExpression) element;
+			final IElementType sign = expression.getOperationSign();
 
-            if (!sign.equals(JSTokenTypes.PLUS)) {
-                return false;
-            }
-            final JSExpression lhs = expression.getLOperand();
-            final JSExpression rhs = expression.getROperand();
+			if(!sign.equals(JSTokenTypes.PLUS))
+			{
+				return false;
+			}
+			final JSExpression lhs = expression.getLOperand();
+			final JSExpression rhs = expression.getROperand();
 
-            if (!isApplicableLiteral(lhs)) {
-                return false;
-            }
-            if (!isApplicableLiteral(rhs)) {
-                return false;
-            }
+			if(!isApplicableLiteral(lhs))
+			{
+				return false;
+			}
+			if(!isApplicableLiteral(rhs))
+			{
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
 		@RequiredReadAction
-        private static boolean isApplicableLiteral(JSExpression lhs) {
-            return lhs != null &&
-                   lhs instanceof JSSimpleLiteralExpression &&
-                    JavaScriptTokenSets.STRING_LITERALS.contains(((JSSimpleLiteralExpression) lhs).getLiteralElementType());
-        }
-    }
+		private static boolean isApplicableLiteral(JSExpression lhs)
+		{
+			return lhs != null &&
+					lhs instanceof JSSimpleLiteralExpression &&
+					JavaScriptTokenSets.STRING_LITERALS.contains(((JSSimpleLiteralExpression) lhs).getLiteralElementType());
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index 742bb9fe..e3aaba47 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -15,64 +15,83 @@
  */
 package org.intellij.idea.lang.javascript.intention.string;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSSingleToDoubleQuotedStringIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSSingleToDoubleQuotedStringIntention", categories = {
+		"JavaScript",
+		"Other"
+}, fileExtensions = "js")
+public class JSSingleToDoubleQuotedStringIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    protected JSElementPredicate getElementPredicate() {
-        return new SingleToDoubleQuotedStringPredicate();
-    }
+	protected JSElementPredicate getElementPredicate()
+	{
+		return new SingleToDoubleQuotedStringPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression charLiteral = (JSLiteralExpression) element;
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSLiteralExpression charLiteral = (JSLiteralExpression) element;
 
-        JSElementFactory.replaceExpression(charLiteral, changeQuotes(charLiteral.getText()));
-    }
+		JSElementFactory.replaceExpression(charLiteral, changeQuotes(charLiteral.getText()));
+	}
 
-    static String changeQuotes(String charLiteral) {
-        StringBuilder buffer      = new StringBuilder(charLiteral);
-        int           simpleIndex = charLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, charLiteral.length() - 2);
-        int           doubleIndex = charLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE);
+	static String changeQuotes(String charLiteral)
+	{
+		StringBuilder buffer = new StringBuilder(charLiteral);
+		int simpleIndex = charLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, charLiteral.length() - 2);
+		int doubleIndex = charLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE);
 
-        while (simpleIndex > 0 || doubleIndex >= 0) {
-            if (simpleIndex > doubleIndex) {
-                if (charLiteral.charAt(simpleIndex - 1) == StringUtil.BACKSLASH) {
-                    buffer.deleteCharAt(simpleIndex - 1);
-                }
-                simpleIndex = charLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, simpleIndex - 2);
-            } else {
-                if (charLiteral.charAt(doubleIndex - 1) != StringUtil.BACKSLASH) {
-                    buffer.insert(doubleIndex, StringUtil.BACKSLASH);
-                }
-                doubleIndex = charLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, doubleIndex - 1);
-            }
-        }
-        buffer.setCharAt(0,                   StringUtil.DOUBLE_QUOTE);
-        buffer.setCharAt(buffer.length() - 1, StringUtil.DOUBLE_QUOTE);
+		while(simpleIndex > 0 || doubleIndex >= 0)
+		{
+			if(simpleIndex > doubleIndex)
+			{
+				if(charLiteral.charAt(simpleIndex - 1) == StringUtil.BACKSLASH)
+				{
+					buffer.deleteCharAt(simpleIndex - 1);
+				}
+				simpleIndex = charLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, simpleIndex - 2);
+			}
+			else
+			{
+				if(charLiteral.charAt(doubleIndex - 1) != StringUtil.BACKSLASH)
+				{
+					buffer.insert(doubleIndex, StringUtil.BACKSLASH);
+				}
+				doubleIndex = charLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, doubleIndex - 1);
+			}
+		}
+		buffer.setCharAt(0, StringUtil.DOUBLE_QUOTE);
+		buffer.setCharAt(buffer.length() - 1, StringUtil.DOUBLE_QUOTE);
 
-        return buffer.toString();
-    }
+		return buffer.toString();
+	}
 
-    private static class SingleToDoubleQuotedStringPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSLiteralExpression)) {
-                return false;
-            }
+	private static class SingleToDoubleQuotedStringPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSLiteralExpression))
+			{
+				return false;
+			}
 
-            final JSLiteralExpression expression = (JSLiteralExpression) element;
+			final JSLiteralExpression expression = (JSLiteralExpression) element;
 
-            return StringUtil.isSimpleQuoteStringLiteral(expression);
-        }
-    }
+			return StringUtil.isSimpleQuoteStringLiteral(expression);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
index 76483fb9..d014e24a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
@@ -17,27 +17,32 @@
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 
-class StringUtil {
-    public static final char SIMPLE_QUOTE = '\'';
-    public static final char DOUBLE_QUOTE = '"';
-    public static final char BACKSLASH    = '\\';
-
-    private StringUtil() {}
-
-    public static boolean isSimpleQuoteStringLiteral(JSLiteralExpression expression) {
-        final String value = expression.getText();
-
-        return (value != null                                    &&
-                value.charAt(0)                  == SIMPLE_QUOTE &&
-                value.charAt(value.length() - 1) == SIMPLE_QUOTE);
-    }
-
-    public static boolean isDoubleQuoteStringLiteral(JSLiteralExpression expression) {
-        final String value = expression.getText();
-
-        return (value != null                                    &&
-                value.charAt(0)                  == DOUBLE_QUOTE &&
-                value.charAt(value.length() - 1) == DOUBLE_QUOTE);
-    }
+class StringUtil
+{
+	public static final char SIMPLE_QUOTE = '\'';
+	public static final char DOUBLE_QUOTE = '"';
+	public static final char BACKSLASH = '\\';
+
+	private StringUtil()
+	{
+	}
+
+	public static boolean isSimpleQuoteStringLiteral(JSLiteralExpression expression)
+	{
+		final String value = expression.getText();
+
+		return (value != null &&
+				value.charAt(0) == SIMPLE_QUOTE &&
+				value.charAt(value.length() - 1) == SIMPLE_QUOTE);
+	}
+
+	public static boolean isDoubleQuoteStringLiteral(JSLiteralExpression expression)
+	{
+		final String value = expression.getText();
+
+		return (value != null &&
+				value.charAt(0) == DOUBLE_QUOTE &&
+				value.charAt(value.length() - 1) == DOUBLE_QUOTE);
+	}
 
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
index dd7bc9cb..5db0821d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
@@ -28,186 +28,238 @@
 import java.util.ArrayList;
 import java.util.List;
 
-class CaseUtil {
-
-    private CaseUtil() {}
-
-    private static boolean canBeCaseLabel(JSExpression expression) {
-        if (expression == null) {
-            return false;
-        }
-        return ExpressionUtil.isConstantExpression(expression);
-    }
-
-    public static boolean containsHiddenBreak(JSCaseClause caseClause) {
-        for (JSStatement statement : caseClause.getStatements()) {
-            if (CaseUtil.containsHiddenBreak(statement, true)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean containsHiddenBreak(List<PsiElement> elements) {
-        for (final PsiElement element : elements) {
-            if (element instanceof JSStatement &&
-                containsHiddenBreak((JSStatement) element, true)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean containsHiddenBreak(JSStatement statement) {
-        return containsHiddenBreak(statement, true);
-    }
-
-    private static boolean containsHiddenBreak(JSStatement statement,
-                                               boolean     isTopLevel) {
-        if (statement instanceof JSBlockStatement) {
-            final JSStatement[] statements = ((JSBlockStatement) statement).getStatements();
-            for (final JSStatement childStatement : statements) {
-                if (containsHiddenBreak(childStatement, false)) {
-                    return true;
-                }
-            }
-        } else if (statement instanceof JSIfStatement) {
-            final JSIfStatement ifStatement = (JSIfStatement) statement;
-
-            return (containsHiddenBreak(ifStatement.getThen(), false) ||
-                    containsHiddenBreak(ifStatement.getElse(), false));
-        } else if (statement instanceof JSBreakStatement) {
-            if (isTopLevel) {
-                return false;
-            }
-
-            final String identifier = ((JSBreakStatement) statement).getLabel();
-
-            return (identifier == null || identifier.length() == 0);
-        }
-
-        return false;
-    }
-
-    public static boolean isUsedByStatementList(JSVariable      var,
-                                                List<PsiElement> elements) {
-        for (PsiElement element : elements) {
-            if (element instanceof JSElement &&
-                isUsedByStatement(var, (JSElement) element)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean isUsedByStatement(JSVariable var,
-                                             JSElement  statement) {
-        final LocalVariableUsageVisitor visitor = new LocalVariableUsageVisitor(var);
-        statement.accept(visitor);
-        return visitor.isUsed();
-    }
-
-    public static String findUniqueLabel(JSStatement statement,
-                                         String      baseName) {
-        JSElement ancestor = statement;
-
-        while (ancestor.getParent() != null) {
-            if (ancestor instanceof PsiFile) {
-                break;
-            }
-            ancestor = (JSElement) ancestor.getParent();
-        }
-
-        if (!checkForLabel(baseName, ancestor)) {
-            return baseName;
-        }
-
-        int val = 1;
-
-        while (true) {
-            final String name = baseName + val;
-
-            if (!checkForLabel(name, ancestor)) {
-                return name;
-            }
-            val++;
-        }
-    }
-
-    private static boolean checkForLabel(String name, JSElement ancestor) {
-        final LabelSearchVisitor visitor = new LabelSearchVisitor(name);
-        ancestor.accept(visitor);
-        return visitor.isUsed();
-    }
-
-    public static JSExpression getCaseExpression(JSIfStatement statement) {
-        final JSExpression       condition               = statement.getCondition();
-        final List<JSExpression> possibleCaseExpressions = determinePossibleCaseExpressions(condition);
-
-        if (possibleCaseExpressions != null) {
-            for (final JSExpression caseExpression : possibleCaseExpressions) {
-                if (!SideEffectChecker.mayHaveSideEffects(caseExpression)) {
-                    JSIfStatement statementToCheck = statement;
-
-                    while (canBeMadeIntoCase(statementToCheck.getCondition(), caseExpression)) {
-                        final JSStatement elseBranch = statementToCheck.getElse();
-
-                        if (elseBranch == null || !(elseBranch instanceof JSIfStatement)) {
-                            return caseExpression;
-                        }
-                        statementToCheck = (JSIfStatement) elseBranch;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private static List<JSExpression> determinePossibleCaseExpressions(JSExpression exp) {
-        final JSExpression       expToCheck = ParenthesesUtils.stripParentheses(exp);
-        final List<JSExpression> out        = new ArrayList<JSExpression>(10);
-
-        if (expToCheck instanceof JSBinaryExpression) {
-            final JSBinaryExpression binaryExp = (JSBinaryExpression) expToCheck;
-            final IElementType operation = binaryExp.getOperationSign();
-            final JSExpression       lhs       = binaryExp.getLOperand();
-            final JSExpression       rhs       = binaryExp.getROperand();
-
-            if (operation.equals(JSTokenTypes.OROR)) {
-                return determinePossibleCaseExpressions(lhs);
-            } else if (operation.equals(JSTokenTypes.EQEQ)) {
-                if (canBeCaseLabel(lhs) && rhs != null) {
-                    out.add(rhs);
-                }
-                if (canBeCaseLabel(rhs)) {
-                    out.add(lhs);
-                }
-            }
-        }
-        return out;
-    }
-
-    private static boolean canBeMadeIntoCase(JSExpression exp,
-                                             JSExpression caseExpression) {
-        final JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
-
-        if (!(expToCheck instanceof JSBinaryExpression)) {
-            return false;
-        }
-
-        final JSBinaryExpression binaryExp    = (JSBinaryExpression) expToCheck;
-        final IElementType       operation    = binaryExp.getOperationSign();
-        final JSExpression       leftOperand  = binaryExp.getLOperand();
-        final JSExpression       rightOperand = binaryExp.getROperand();
-
-        if (operation.equals(JSTokenTypes.OROR)) {
-            return (canBeMadeIntoCase(leftOperand,  caseExpression) &&
-                    canBeMadeIntoCase(rightOperand, caseExpression));
-        } else if (operation.equals(JSTokenTypes.EQEQ)) {
-            return ((canBeCaseLabel(leftOperand)  && EquivalenceChecker.expressionsAreEquivalent(caseExpression, rightOperand)) ||
-                    (canBeCaseLabel(rightOperand) && EquivalenceChecker.expressionsAreEquivalent(caseExpression, leftOperand)));
-        } else {
-            return false;
-        }
-    }
+class CaseUtil
+{
+
+	private CaseUtil()
+	{
+	}
+
+	private static boolean canBeCaseLabel(JSExpression expression)
+	{
+		if(expression == null)
+		{
+			return false;
+		}
+		return ExpressionUtil.isConstantExpression(expression);
+	}
+
+	public static boolean containsHiddenBreak(JSCaseClause caseClause)
+	{
+		for(JSStatement statement : caseClause.getStatements())
+		{
+			if(CaseUtil.containsHiddenBreak(statement, true))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static boolean containsHiddenBreak(List<PsiElement> elements)
+	{
+		for(final PsiElement element : elements)
+		{
+			if(element instanceof JSStatement &&
+					containsHiddenBreak((JSStatement) element, true))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static boolean containsHiddenBreak(JSStatement statement)
+	{
+		return containsHiddenBreak(statement, true);
+	}
+
+	private static boolean containsHiddenBreak(JSStatement statement,
+											   boolean isTopLevel)
+	{
+		if(statement instanceof JSBlockStatement)
+		{
+			final JSStatement[] statements = ((JSBlockStatement) statement).getStatements();
+			for(final JSStatement childStatement : statements)
+			{
+				if(containsHiddenBreak(childStatement, false))
+				{
+					return true;
+				}
+			}
+		}
+		else if(statement instanceof JSIfStatement)
+		{
+			final JSIfStatement ifStatement = (JSIfStatement) statement;
+
+			return (containsHiddenBreak(ifStatement.getThen(), false) ||
+					containsHiddenBreak(ifStatement.getElse(), false));
+		}
+		else if(statement instanceof JSBreakStatement)
+		{
+			if(isTopLevel)
+			{
+				return false;
+			}
+
+			final String identifier = ((JSBreakStatement) statement).getLabel();
+
+			return (identifier == null || identifier.length() == 0);
+		}
+
+		return false;
+	}
+
+	public static boolean isUsedByStatementList(JSVariable var,
+												List<PsiElement> elements)
+	{
+		for(PsiElement element : elements)
+		{
+			if(element instanceof JSElement &&
+					isUsedByStatement(var, (JSElement) element))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static boolean isUsedByStatement(JSVariable var,
+											 JSElement statement)
+	{
+		final LocalVariableUsageVisitor visitor = new LocalVariableUsageVisitor(var);
+		statement.accept(visitor);
+		return visitor.isUsed();
+	}
+
+	public static String findUniqueLabel(JSStatement statement,
+										 String baseName)
+	{
+		JSElement ancestor = statement;
+
+		while(ancestor.getParent() != null)
+		{
+			if(ancestor instanceof PsiFile)
+			{
+				break;
+			}
+			ancestor = (JSElement) ancestor.getParent();
+		}
+
+		if(!checkForLabel(baseName, ancestor))
+		{
+			return baseName;
+		}
+
+		int val = 1;
+
+		while(true)
+		{
+			final String name = baseName + val;
+
+			if(!checkForLabel(name, ancestor))
+			{
+				return name;
+			}
+			val++;
+		}
+	}
+
+	private static boolean checkForLabel(String name, JSElement ancestor)
+	{
+		final LabelSearchVisitor visitor = new LabelSearchVisitor(name);
+		ancestor.accept(visitor);
+		return visitor.isUsed();
+	}
+
+	public static JSExpression getCaseExpression(JSIfStatement statement)
+	{
+		final JSExpression condition = statement.getCondition();
+		final List<JSExpression> possibleCaseExpressions = determinePossibleCaseExpressions(condition);
+
+		if(possibleCaseExpressions != null)
+		{
+			for(final JSExpression caseExpression : possibleCaseExpressions)
+			{
+				if(!SideEffectChecker.mayHaveSideEffects(caseExpression))
+				{
+					JSIfStatement statementToCheck = statement;
+
+					while(canBeMadeIntoCase(statementToCheck.getCondition(), caseExpression))
+					{
+						final JSStatement elseBranch = statementToCheck.getElse();
+
+						if(elseBranch == null || !(elseBranch instanceof JSIfStatement))
+						{
+							return caseExpression;
+						}
+						statementToCheck = (JSIfStatement) elseBranch;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	private static List<JSExpression> determinePossibleCaseExpressions(JSExpression exp)
+	{
+		final JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
+		final List<JSExpression> out = new ArrayList<JSExpression>(10);
+
+		if(expToCheck instanceof JSBinaryExpression)
+		{
+			final JSBinaryExpression binaryExp = (JSBinaryExpression) expToCheck;
+			final IElementType operation = binaryExp.getOperationSign();
+			final JSExpression lhs = binaryExp.getLOperand();
+			final JSExpression rhs = binaryExp.getROperand();
+
+			if(operation.equals(JSTokenTypes.OROR))
+			{
+				return determinePossibleCaseExpressions(lhs);
+			}
+			else if(operation.equals(JSTokenTypes.EQEQ))
+			{
+				if(canBeCaseLabel(lhs) && rhs != null)
+				{
+					out.add(rhs);
+				}
+				if(canBeCaseLabel(rhs))
+				{
+					out.add(lhs);
+				}
+			}
+		}
+		return out;
+	}
+
+	private static boolean canBeMadeIntoCase(JSExpression exp,
+											 JSExpression caseExpression)
+	{
+		final JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
+
+		if(!(expToCheck instanceof JSBinaryExpression))
+		{
+			return false;
+		}
+
+		final JSBinaryExpression binaryExp = (JSBinaryExpression) expToCheck;
+		final IElementType operation = binaryExp.getOperationSign();
+		final JSExpression leftOperand = binaryExp.getLOperand();
+		final JSExpression rightOperand = binaryExp.getROperand();
+
+		if(operation.equals(JSTokenTypes.OROR))
+		{
+			return (canBeMadeIntoCase(leftOperand, caseExpression) &&
+					canBeMadeIntoCase(rightOperand, caseExpression));
+		}
+		else if(operation.equals(JSTokenTypes.EQEQ))
+		{
+			return ((canBeCaseLabel(leftOperand) && EquivalenceChecker.expressionsAreEquivalent(caseExpression, rightOperand)) ||
+					(canBeCaseLabel(rightOperand) && EquivalenceChecker.expressionsAreEquivalent(caseExpression, leftOperand)));
+		}
+		else
+		{
+			return false;
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 63474ab9..95fa8662 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -15,394 +15,487 @@
  */
 package org.intellij.idea.lang.javascript.intention.switchtoif;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
-import consulo.language.ast.IElementType;
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
-import org.intellij.idea.lang.javascript.psiutil.DeclarationUtils;
-import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
-import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.psiutil.*;
+import org.jetbrains.annotations.NonNls;
 
-public class JSReplaceIfWithSwitchIntention extends JSIntention {
-    @NonNls private static final String IF_KEYWORD                     = "if";
-    @NonNls private static final String DEFAULT_LABEL_NAME             = "Label";
-    @NonNls private static final String SWITCH_STATEMENT_PREFIX        = "switch(";
-    @NonNls private static final String DEFAULT_CASE_CLAUSE_EXPRESSION = "default: ";
-    @NonNls private static final String CASE_EXPRESSION_PREFIX         = "\ncase ";
-    @NonNls private static final String LABELED_BREAK_STATEMENT_PREFIX = "break ";
-    @NonNls private static final String BREAK_STATEMENT                = "\nbreak;";
-
-    @Override
+import javax.annotation.Nonnull;
+import java.util.*;
+
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSReplaceIfWithSwitchIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSReplaceIfWithSwitchIntention extends JSIntention
+{
+	@NonNls
+	private static final String IF_KEYWORD = "if";
+	@NonNls
+	private static final String DEFAULT_LABEL_NAME = "Label";
+	@NonNls
+	private static final String SWITCH_STATEMENT_PREFIX = "switch(";
+	@NonNls
+	private static final String DEFAULT_CASE_CLAUSE_EXPRESSION = "default: ";
+	@NonNls
+	private static final String CASE_EXPRESSION_PREFIX = "\ncase ";
+	@NonNls
+	private static final String LABELED_BREAK_STATEMENT_PREFIX = "break ";
+	@NonNls
+	private static final String BREAK_STATEMENT = "\nbreak;";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new IfToSwitchPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new IfToSwitchPredicate();
+	}
 
-    @Override
+	@Override
 	public void processIntention(@Nonnull PsiElement element)
-            throws IncorrectOperationException {
-        JSIfStatement ifStatement = (JSIfStatement) element.getParent();
-
-        assert (ifStatement != null);
-
-        boolean     breaksNeedRelabeled = false;
-        JSStatement breakTarget         = null;
-        String      labelString         = "";
-
-        if (ControlFlowUtils.statementContainsExitingBreak(ifStatement)) {
-            JSElement ancestor = (JSElement) ifStatement.getParent();
-            while (ancestor != null) {
-                if (ancestor instanceof JSForStatement     ||
-                    ancestor instanceof JSForInStatement   ||
-                    ancestor instanceof JSDoWhileStatement ||
-                    ancestor instanceof JSWhileStatement   ||
-                    ancestor instanceof JSSwitchStatement) {
-                    breakTarget = (JSStatement) ancestor;
-                    break;
-                }
-                ancestor = (JSElement) ancestor.getParent();
-            }
-            if (breakTarget != null) {
-                labelString         = CaseUtil.findUniqueLabel(ifStatement, DEFAULT_LABEL_NAME);
-                breaksNeedRelabeled = true;
-            }
-        }
-        final JSIfStatement statementToReplace = ifStatement;
-        final JSExpression  caseExpression     = CaseUtil.getCaseExpression(ifStatement);
-
-        assert (caseExpression != null);
-
-        final StringBuilder switchStatementBuffer = new StringBuilder(1024);
-
-        switchStatementBuffer.append(SWITCH_STATEMENT_PREFIX)
-                             .append(caseExpression.getText())
-                             .append(')')
-                             .append('{');
-
-        final List<IfStatementBranch> branches = new ArrayList<IfStatementBranch>(20);
-
-        while (true) {
-            final Set<String>    topLevelVariables = new HashSet<String>(5);
-            final Set<String>    innerVariables    = new HashSet<String>(5);
-            final JSExpression   condition         = ifStatement.getCondition();
-            final JSExpression[] labels            = getValuesFromCondition(condition, caseExpression);
-            final JSStatement    thenBranch        = ifStatement.getThen();
-
-            DeclarationUtils.calculateVariablesDeclared(thenBranch,
-                                                        topLevelVariables,
-                                                        innerVariables,
-                                                        true);
-
-            final IfStatementBranch ifBranch = new IfStatementBranch();
-
-            ifBranch.setInnerVariables(innerVariables);
-            ifBranch.setTopLevelVariables(topLevelVariables);
-            ifBranch.setStatement(thenBranch);
-            for (final JSExpression label : labels) {
-                ifBranch.addCondition(label.getText());
-            }
-            branches.add(ifBranch);
-
-            final JSStatement elseBranch = ifStatement.getElse();
-
-            if (elseBranch instanceof JSIfStatement) {
-                ifStatement = (JSIfStatement) elseBranch;
-            } else if (elseBranch == null) {
-                break;
-            } else {
-                final Set<String> elseTopLevelVariables = new HashSet<String>(5);
-                final Set<String> elseInnerVariables    = new HashSet<String>(5);
-
-                DeclarationUtils.calculateVariablesDeclared(elseBranch, elseTopLevelVariables,
-                                                            elseInnerVariables, true);
-
-                final IfStatementBranch elseIfBranch = new IfStatementBranch();
-
-                elseIfBranch.setInnerVariables(elseInnerVariables);
-                elseIfBranch.setTopLevelVariables(elseTopLevelVariables);
-                elseIfBranch.setElse();
-                elseIfBranch.setStatement(elseBranch);
-                branches.add(elseIfBranch);
-                break;
-            }
-        }
-
-        for (IfStatementBranch branch : branches) {
-            boolean hasConflicts = false;
-            for (IfStatementBranch testBranch : branches) {
-                if (branch.topLevelDeclarationsConfictWith(testBranch)) {
-                    hasConflicts = true;
-                }
-            }
-
-            final JSStatement branchStatement = (JSStatement) branch.getStatement();
-
-            if (branch.isElse()) {
-                dumpDefaultBranch(switchStatementBuffer, branchStatement,
-                                  hasConflicts, breaksNeedRelabeled, labelString);
-            } else {
-                final List<String> conditions = branch.getConditions();
-
-                dumpBranch(switchStatementBuffer, conditions, branchStatement,
-                           hasConflicts, breaksNeedRelabeled, labelString);
-            }
-        }
-
-        switchStatementBuffer.append('}');
-
-        final String switchStatementString = switchStatementBuffer.toString();
-
-        if (breaksNeedRelabeled) {
-            final int           length = switchStatementBuffer.length();
-            final StringBuilder out    = new StringBuilder(length);
-
-            out.append(labelString)
-               .append(':');
-            termReplace(out, breakTarget, statementToReplace, switchStatementString);
-            JSElementFactory.replaceStatement(breakTarget, out.toString());
-        } else {
-            JSElementFactory.replaceStatement(statementToReplace, switchStatementString);
-        }
-    }
-
-    private static void termReplace(StringBuilder out,
-                                    JSElement     target,
-                                    JSElement     replace,
-                                    String        stringToReplaceWith) {
-        if (target.equals(replace)) {
-            out.append(stringToReplaceWith);
-        } else if (target.getChildren().length != 0) {
-            final JSElement[] children = (JSElement[]) target.getChildren();
-            for (final JSElement child : children) {
-                termReplace(out, child, replace, stringToReplaceWith);
-            }
-        } else {
-            final String text = target.getText();
-            out.append(text);
-        }
-    }
-
-    private static JSExpression[] getValuesFromCondition(JSExpression condition,
-                                                         JSExpression caseExpression) {
-        final List<JSExpression> values = new ArrayList<JSExpression>(10);
-
-        getValuesFromExpression(condition, caseExpression, values);
-        return values.toArray(new JSExpression[values.size()]);
-    }
-
-    private static void getValuesFromExpression(JSExpression       expression,
-                                                JSExpression       caseExpression,
-                                                List<JSExpression> values) {
-        if (expression instanceof JSBinaryExpression) {
-            final JSBinaryExpression binaryExpression =
-                    (JSBinaryExpression) expression;
-            final JSExpression       lhs              = binaryExpression.getLOperand();
-            final JSExpression       rhs              = binaryExpression.getROperand();
-            final IElementType tokenType        = binaryExpression.getOperationSign();
-
-            if (JSTokenTypes.OROR.equals(tokenType)) {
-                getValuesFromExpression(lhs, caseExpression, values);
-                getValuesFromExpression(rhs, caseExpression, values);
-            } else {
-                if (EquivalenceChecker.expressionsAreEquivalent(caseExpression, rhs)) {
-                    values.add(lhs);
-                } else {
-                    values.add(rhs);
-                }
-            }
-        } else if (expression instanceof JSParenthesizedExpression) {
-            final JSParenthesizedExpression parenExpression = (JSParenthesizedExpression) expression;
-            final JSExpression              contents        = parenExpression.getInnerExpression();
-
-            getValuesFromExpression(contents, caseExpression, values);
-        }
-    }
-
-    private static void dumpBranch(StringBuilder switchStatementString,
-                                   List<String>  labels,
-                                   JSStatement   body,
-                                   boolean       wrap,
-                                   boolean       renameBreaks,
-                                   String        breakLabelName) {
-        dumpLabels(switchStatementString, labels);
-        dumpBody  (switchStatementString, body, wrap, renameBreaks, breakLabelName);
-    }
-
-    private static void dumpDefaultBranch(StringBuilder switchStatementString,
-                                          JSStatement   body,
-                                          boolean       wrap,
-                                          boolean       renameBreaks,
-                                          String        breakLabelName) {
-        switchStatementString.append(DEFAULT_CASE_CLAUSE_EXPRESSION);
-        dumpBody(switchStatementString, body, wrap, renameBreaks, breakLabelName);
-    }
-
-    private static void dumpLabels(StringBuilder switchStatementString,
-                                   List<String>  labels) {
-        for (String label : labels) {
-            switchStatementString.append(CASE_EXPRESSION_PREFIX);
-            switchStatementString.append(label);
-            switchStatementString.append(": ");
-        }
-    }
-
-    private static void dumpBody(StringBuilder switchStatementString,
-                                 JSStatement   bodyStatement,
-                                 boolean       wrap,
-                                 boolean       renameBreaks,
-                                 String        breakLabelName) {
-        if (bodyStatement instanceof JSBlockStatement) {
-            if (wrap) {
-                appendElement(switchStatementString, bodyStatement,
-                              renameBreaks, breakLabelName);
-            } else {
-                // Skip the first and last characters to unwrap the block
-                final String bodyText = bodyStatement.getText();
-                switchStatementString.append(bodyText.substring(1, bodyText.length() - 1));
-            }
-        } else {
-            if (wrap) {
-                switchStatementString.append('{');
-                appendElement(switchStatementString, bodyStatement,
-                              renameBreaks, breakLabelName);
-                switchStatementString.append('}');
-            } else {
-                appendElement(switchStatementString, bodyStatement,
-                              renameBreaks, breakLabelName);
-            }
-        }
-        if (ControlFlowUtils.statementMayCompleteNormally(bodyStatement)) {
-            switchStatementString.append(BREAK_STATEMENT);
-        }
-        switchStatementString.append('\n');
-    }
-
-    private static void appendElement(StringBuilder switchStatementString,
-                                      JSElement     element,
-                                      boolean       renameBreakElements,
-                                      String        breakLabelString) {
-        final String text = element.getText();
-
-        if (!renameBreakElements) {
-            switchStatementString.append(text);
-        } else if (element instanceof JSBreakStatement) {
-            final String identifier = ((JSBreakStatement) element).getLabel();
-            if (identifier == null || identifier.length() == 0) {
-                switchStatementString.append(LABELED_BREAK_STATEMENT_PREFIX);
-                switchStatementString.append(breakLabelString);
-                switchStatementString.append(';');
-            } else {
-                switchStatementString.append(text);
-            }
-        } else if (element instanceof JSBlockStatement ||
-                   element instanceof JSIfStatement) {
-            final JSElement[] children = (JSElement[]) element.getChildren();
-            for (final JSElement child : children) {
-                appendElement(switchStatementString, child, renameBreakElements,
-                              breakLabelString);
-            }
-        } else {
-            switchStatementString.append(text);
-        }
-    }
-
-    private static class IfToSwitchPredicate implements JSElementPredicate {
-
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            final PsiElement parent = element.getParent();
-            if (!(parent instanceof JSIfStatement)) {
-                return false;
-            }
-            final String text = element.getText();
-            if (!IF_KEYWORD.equals(text)) {
-                return false;
-            }
-            final JSIfStatement statement = (JSIfStatement)parent;
-            if (ErrorUtil.containsError(statement)) {
-                return false;
-            }
-            return (CaseUtil.getCaseExpression(statement) != null);
-        }
-    }
-
-    private static class IfStatementBranch {
-        private final List<String> conditions        = new ArrayList<String>(3);
-        private       Set<String>  topLevelVariables = new HashSet<String>(3);
-        private       Set<String>  innerVariables    = new HashSet<String>(3);
-        private       JSStatement statement;
-        private       boolean      isElse;
-
-        public void addCondition(String conditionString) {
-            this.conditions.add(conditionString);
-        }
-
-        public void setStatement(JSStatement statement) {
-            this.statement = statement;
-        }
-
-        public JSStatement getStatement() {
-            return this.statement;
-        }
-
-        public List<String> getConditions() {
-            return Collections.unmodifiableList(this.conditions);
-        }
-
-        public boolean isElse() {
-            return this.isElse;
-        }
-
-        public void setElse() {
-            this.isElse = true;
-        }
-
-        public void setTopLevelVariables(Set<String> topLevelVariables){
-            this.topLevelVariables = new HashSet<String>(topLevelVariables);
-        }
-
-        public void setInnerVariables(Set<String> innerVariables){
-            this.innerVariables = new HashSet<String>(innerVariables);
-        }
-
-        private Set<String> getTopLevelVariables(){
-            return Collections.unmodifiableSet(this.topLevelVariables);
-        }
-
-        private Set<String> getInnerVariables(){
-            return Collections.unmodifiableSet(this.innerVariables);
-        }
-
-        public boolean topLevelDeclarationsConfictWith(IfStatementBranch testBranch){
-            final Set<String> innerVariables = testBranch.getInnerVariables();
-            final Set<String> topLevel       = testBranch.getTopLevelVariables();
-
-            return (hasNonEmptyIntersection(this.topLevelVariables, topLevel) ||
-                    hasNonEmptyIntersection(this.topLevelVariables, innerVariables));
-        }
-
-        private static boolean hasNonEmptyIntersection(Set<String> set1,
-                                                       Set<String> set2) {
-            for (final String set1Element : set1) {
-                if (set2.contains(set1Element)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
+			throws IncorrectOperationException
+	{
+		JSIfStatement ifStatement = (JSIfStatement) element.getParent();
+
+		assert (ifStatement != null);
+
+		boolean breaksNeedRelabeled = false;
+		JSStatement breakTarget = null;
+		String labelString = "";
+
+		if(ControlFlowUtils.statementContainsExitingBreak(ifStatement))
+		{
+			JSElement ancestor = (JSElement) ifStatement.getParent();
+			while(ancestor != null)
+			{
+				if(ancestor instanceof JSForStatement ||
+						ancestor instanceof JSForInStatement ||
+						ancestor instanceof JSDoWhileStatement ||
+						ancestor instanceof JSWhileStatement ||
+						ancestor instanceof JSSwitchStatement)
+				{
+					breakTarget = (JSStatement) ancestor;
+					break;
+				}
+				ancestor = (JSElement) ancestor.getParent();
+			}
+			if(breakTarget != null)
+			{
+				labelString = CaseUtil.findUniqueLabel(ifStatement, DEFAULT_LABEL_NAME);
+				breaksNeedRelabeled = true;
+			}
+		}
+		final JSIfStatement statementToReplace = ifStatement;
+		final JSExpression caseExpression = CaseUtil.getCaseExpression(ifStatement);
+
+		assert (caseExpression != null);
+
+		final StringBuilder switchStatementBuffer = new StringBuilder(1024);
+
+		switchStatementBuffer.append(SWITCH_STATEMENT_PREFIX)
+				.append(caseExpression.getText())
+				.append(')')
+				.append('{');
+
+		final List<IfStatementBranch> branches = new ArrayList<IfStatementBranch>(20);
+
+		while(true)
+		{
+			final Set<String> topLevelVariables = new HashSet<String>(5);
+			final Set<String> innerVariables = new HashSet<String>(5);
+			final JSExpression condition = ifStatement.getCondition();
+			final JSExpression[] labels = getValuesFromCondition(condition, caseExpression);
+			final JSStatement thenBranch = ifStatement.getThen();
+
+			DeclarationUtils.calculateVariablesDeclared(thenBranch,
+					topLevelVariables,
+					innerVariables,
+					true);
+
+			final IfStatementBranch ifBranch = new IfStatementBranch();
+
+			ifBranch.setInnerVariables(innerVariables);
+			ifBranch.setTopLevelVariables(topLevelVariables);
+			ifBranch.setStatement(thenBranch);
+			for(final JSExpression label : labels)
+			{
+				ifBranch.addCondition(label.getText());
+			}
+			branches.add(ifBranch);
+
+			final JSStatement elseBranch = ifStatement.getElse();
+
+			if(elseBranch instanceof JSIfStatement)
+			{
+				ifStatement = (JSIfStatement) elseBranch;
+			}
+			else if(elseBranch == null)
+			{
+				break;
+			}
+			else
+			{
+				final Set<String> elseTopLevelVariables = new HashSet<String>(5);
+				final Set<String> elseInnerVariables = new HashSet<String>(5);
+
+				DeclarationUtils.calculateVariablesDeclared(elseBranch, elseTopLevelVariables,
+						elseInnerVariables, true);
+
+				final IfStatementBranch elseIfBranch = new IfStatementBranch();
+
+				elseIfBranch.setInnerVariables(elseInnerVariables);
+				elseIfBranch.setTopLevelVariables(elseTopLevelVariables);
+				elseIfBranch.setElse();
+				elseIfBranch.setStatement(elseBranch);
+				branches.add(elseIfBranch);
+				break;
+			}
+		}
+
+		for(IfStatementBranch branch : branches)
+		{
+			boolean hasConflicts = false;
+			for(IfStatementBranch testBranch : branches)
+			{
+				if(branch.topLevelDeclarationsConfictWith(testBranch))
+				{
+					hasConflicts = true;
+				}
+			}
+
+			final JSStatement branchStatement = (JSStatement) branch.getStatement();
+
+			if(branch.isElse())
+			{
+				dumpDefaultBranch(switchStatementBuffer, branchStatement,
+						hasConflicts, breaksNeedRelabeled, labelString);
+			}
+			else
+			{
+				final List<String> conditions = branch.getConditions();
+
+				dumpBranch(switchStatementBuffer, conditions, branchStatement,
+						hasConflicts, breaksNeedRelabeled, labelString);
+			}
+		}
+
+		switchStatementBuffer.append('}');
+
+		final String switchStatementString = switchStatementBuffer.toString();
+
+		if(breaksNeedRelabeled)
+		{
+			final int length = switchStatementBuffer.length();
+			final StringBuilder out = new StringBuilder(length);
+
+			out.append(labelString)
+					.append(':');
+			termReplace(out, breakTarget, statementToReplace, switchStatementString);
+			JSElementFactory.replaceStatement(breakTarget, out.toString());
+		}
+		else
+		{
+			JSElementFactory.replaceStatement(statementToReplace, switchStatementString);
+		}
+	}
+
+	private static void termReplace(StringBuilder out,
+									JSElement target,
+									JSElement replace,
+									String stringToReplaceWith)
+	{
+		if(target.equals(replace))
+		{
+			out.append(stringToReplaceWith);
+		}
+		else if(target.getChildren().length != 0)
+		{
+			final JSElement[] children = (JSElement[]) target.getChildren();
+			for(final JSElement child : children)
+			{
+				termReplace(out, child, replace, stringToReplaceWith);
+			}
+		}
+		else
+		{
+			final String text = target.getText();
+			out.append(text);
+		}
+	}
+
+	private static JSExpression[] getValuesFromCondition(JSExpression condition,
+														 JSExpression caseExpression)
+	{
+		final List<JSExpression> values = new ArrayList<JSExpression>(10);
+
+		getValuesFromExpression(condition, caseExpression, values);
+		return values.toArray(new JSExpression[values.size()]);
+	}
+
+	private static void getValuesFromExpression(JSExpression expression,
+												JSExpression caseExpression,
+												List<JSExpression> values)
+	{
+		if(expression instanceof JSBinaryExpression)
+		{
+			final JSBinaryExpression binaryExpression =
+					(JSBinaryExpression) expression;
+			final JSExpression lhs = binaryExpression.getLOperand();
+			final JSExpression rhs = binaryExpression.getROperand();
+			final IElementType tokenType = binaryExpression.getOperationSign();
+
+			if(JSTokenTypes.OROR.equals(tokenType))
+			{
+				getValuesFromExpression(lhs, caseExpression, values);
+				getValuesFromExpression(rhs, caseExpression, values);
+			}
+			else
+			{
+				if(EquivalenceChecker.expressionsAreEquivalent(caseExpression, rhs))
+				{
+					values.add(lhs);
+				}
+				else
+				{
+					values.add(rhs);
+				}
+			}
+		}
+		else if(expression instanceof JSParenthesizedExpression)
+		{
+			final JSParenthesizedExpression parenExpression = (JSParenthesizedExpression) expression;
+			final JSExpression contents = parenExpression.getInnerExpression();
+
+			getValuesFromExpression(contents, caseExpression, values);
+		}
+	}
+
+	private static void dumpBranch(StringBuilder switchStatementString,
+								   List<String> labels,
+								   JSStatement body,
+								   boolean wrap,
+								   boolean renameBreaks,
+								   String breakLabelName)
+	{
+		dumpLabels(switchStatementString, labels);
+		dumpBody(switchStatementString, body, wrap, renameBreaks, breakLabelName);
+	}
+
+	private static void dumpDefaultBranch(StringBuilder switchStatementString,
+										  JSStatement body,
+										  boolean wrap,
+										  boolean renameBreaks,
+										  String breakLabelName)
+	{
+		switchStatementString.append(DEFAULT_CASE_CLAUSE_EXPRESSION);
+		dumpBody(switchStatementString, body, wrap, renameBreaks, breakLabelName);
+	}
+
+	private static void dumpLabels(StringBuilder switchStatementString,
+								   List<String> labels)
+	{
+		for(String label : labels)
+		{
+			switchStatementString.append(CASE_EXPRESSION_PREFIX);
+			switchStatementString.append(label);
+			switchStatementString.append(": ");
+		}
+	}
+
+	private static void dumpBody(StringBuilder switchStatementString,
+								 JSStatement bodyStatement,
+								 boolean wrap,
+								 boolean renameBreaks,
+								 String breakLabelName)
+	{
+		if(bodyStatement instanceof JSBlockStatement)
+		{
+			if(wrap)
+			{
+				appendElement(switchStatementString, bodyStatement,
+						renameBreaks, breakLabelName);
+			}
+			else
+			{
+				// Skip the first and last characters to unwrap the block
+				final String bodyText = bodyStatement.getText();
+				switchStatementString.append(bodyText.substring(1, bodyText.length() - 1));
+			}
+		}
+		else
+		{
+			if(wrap)
+			{
+				switchStatementString.append('{');
+				appendElement(switchStatementString, bodyStatement,
+						renameBreaks, breakLabelName);
+				switchStatementString.append('}');
+			}
+			else
+			{
+				appendElement(switchStatementString, bodyStatement,
+						renameBreaks, breakLabelName);
+			}
+		}
+		if(ControlFlowUtils.statementMayCompleteNormally(bodyStatement))
+		{
+			switchStatementString.append(BREAK_STATEMENT);
+		}
+		switchStatementString.append('\n');
+	}
+
+	private static void appendElement(StringBuilder switchStatementString,
+									  JSElement element,
+									  boolean renameBreakElements,
+									  String breakLabelString)
+	{
+		final String text = element.getText();
+
+		if(!renameBreakElements)
+		{
+			switchStatementString.append(text);
+		}
+		else if(element instanceof JSBreakStatement)
+		{
+			final String identifier = ((JSBreakStatement) element).getLabel();
+			if(identifier == null || identifier.length() == 0)
+			{
+				switchStatementString.append(LABELED_BREAK_STATEMENT_PREFIX);
+				switchStatementString.append(breakLabelString);
+				switchStatementString.append(';');
+			}
+			else
+			{
+				switchStatementString.append(text);
+			}
+		}
+		else if(element instanceof JSBlockStatement ||
+				element instanceof JSIfStatement)
+		{
+			final JSElement[] children = (JSElement[]) element.getChildren();
+			for(final JSElement child : children)
+			{
+				appendElement(switchStatementString, child, renameBreakElements,
+						breakLabelString);
+			}
+		}
+		else
+		{
+			switchStatementString.append(text);
+		}
+	}
+
+	private static class IfToSwitchPredicate implements JSElementPredicate
+	{
+
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			final PsiElement parent = element.getParent();
+			if(!(parent instanceof JSIfStatement))
+			{
+				return false;
+			}
+			final String text = element.getText();
+			if(!IF_KEYWORD.equals(text))
+			{
+				return false;
+			}
+			final JSIfStatement statement = (JSIfStatement) parent;
+			if(ErrorUtil.containsError(statement))
+			{
+				return false;
+			}
+			return (CaseUtil.getCaseExpression(statement) != null);
+		}
+	}
+
+	private static class IfStatementBranch
+	{
+		private final List<String> conditions = new ArrayList<String>(3);
+		private Set<String> topLevelVariables = new HashSet<String>(3);
+		private Set<String> innerVariables = new HashSet<String>(3);
+		private JSStatement statement;
+		private boolean isElse;
+
+		public void addCondition(String conditionString)
+		{
+			this.conditions.add(conditionString);
+		}
+
+		public void setStatement(JSStatement statement)
+		{
+			this.statement = statement;
+		}
+
+		public JSStatement getStatement()
+		{
+			return this.statement;
+		}
+
+		public List<String> getConditions()
+		{
+			return Collections.unmodifiableList(this.conditions);
+		}
+
+		public boolean isElse()
+		{
+			return this.isElse;
+		}
+
+		public void setElse()
+		{
+			this.isElse = true;
+		}
+
+		public void setTopLevelVariables(Set<String> topLevelVariables)
+		{
+			this.topLevelVariables = new HashSet<String>(topLevelVariables);
+		}
+
+		public void setInnerVariables(Set<String> innerVariables)
+		{
+			this.innerVariables = new HashSet<String>(innerVariables);
+		}
+
+		private Set<String> getTopLevelVariables()
+		{
+			return Collections.unmodifiableSet(this.topLevelVariables);
+		}
+
+		private Set<String> getInnerVariables()
+		{
+			return Collections.unmodifiableSet(this.innerVariables);
+		}
+
+		public boolean topLevelDeclarationsConfictWith(IfStatementBranch testBranch)
+		{
+			final Set<String> innerVariables = testBranch.getInnerVariables();
+			final Set<String> topLevel = testBranch.getTopLevelVariables();
+
+			return (hasNonEmptyIntersection(this.topLevelVariables, topLevel) ||
+					hasNonEmptyIntersection(this.topLevelVariables, innerVariables));
+		}
+
+		private static boolean hasNonEmptyIntersection(Set<String> set1,
+													   Set<String> set2)
+		{
+			for(final String set1Element : set1)
+			{
+				if(set2.contains(set1Element))
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index bf4bfdd7..b0b1821d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -15,400 +15,499 @@
  */
 package org.intellij.idea.lang.javascript.intention.switchtoif;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import consulo.language.psi.PsiManager;
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
-import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
-import org.intellij.idea.lang.javascript.psiutil.SideEffectChecker;
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiManager;
 import consulo.language.psi.PsiWhiteSpace;
-import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.util.IncorrectOperationException;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.psiutil.*;
+import org.jetbrains.annotations.NonNls;
 
-public class JSReplaceSwitchWithIfIntention extends JSIntention {
-
-    @NonNls private static final String IF_PREFIX          = "if (";
-    @NonNls private static final String IF_SUFFIX          = ") {";
-    @NonNls private static final String ELSE               = "} else {";
-    @NonNls private static final String ELSE_KEYWORD       = "else ";
-    @NonNls private static final String VAR_PREFIX         = "var ";
-    @NonNls private static final String BREAK_KEYWORD      = "break ";
-    @NonNls private static final String DEFAULT_LABEL_NAME = "Label";
-
-    @Override
+import javax.annotation.Nonnull;
+import java.util.*;
+
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSReplaceSwitchWithIfIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSReplaceSwitchWithIfIntention extends JSIntention
+{
+
+	@NonNls
+	private static final String IF_PREFIX = "if (";
+	@NonNls
+	private static final String IF_SUFFIX = ") {";
+	@NonNls
+	private static final String ELSE = "} else {";
+	@NonNls
+	private static final String ELSE_KEYWORD = "else ";
+	@NonNls
+	private static final String VAR_PREFIX = "var ";
+	@NonNls
+	private static final String BREAK_KEYWORD = "break ";
+	@NonNls
+	private static final String DEFAULT_LABEL_NAME = "Label";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new SwitchPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSSwitchStatement switchStatement = (JSSwitchStatement) element.getParent();
-
-        assert (switchStatement != null);
-
-        final PsiManager mgr              = switchStatement.getManager();
-        final JSExpression     switchExpression = switchStatement.getSwitchExpression();
-        final CodeStyleManager codeStyleMgr     = CodeStyleManager.getInstance(element.getProject());
-        final boolean          hadSideEffects   = SideEffectChecker.mayHaveSideEffects(switchExpression);
-        final String           declarationString;
-        final String           expressionText;
-
-        if (hadSideEffects) {
-            final String variableName = "i"; // TODO JavaCodeStyleManager.getInstance(switchExpression.getProject()).suggestUniqueVariableName("i", switchExpression, true);
-
-            expressionText    = variableName;
-            declarationString = VAR_PREFIX + variableName + " = " + switchExpression.getText() + ';';
-        } else {
-            declarationString = null;
-            expressionText    = switchExpression.getText();
-        }
-
-        boolean renameBreaks = false;
-
-        for (JSCaseClause caseClause : switchStatement.getCaseClauses()) {
-            if (CaseUtil.containsHiddenBreak(caseClause)) {
-                renameBreaks = true;
-                break;
-            }
-        }
-
-        final StringBuilder ifStatementBuffer = new StringBuilder(1024);
-        String              breakLabel        = null;
-
-        if (renameBreaks) {
-            breakLabel = CaseUtil.findUniqueLabel(switchStatement, DEFAULT_LABEL_NAME);
-            ifStatementBuffer.append(breakLabel)
-                             .append(':');
-        }
-
-        final List<SwitchStatementBranch> openBranches  = new ArrayList<SwitchStatementBranch>();
-        final Set<JSVariable>             declaredVars  = new HashSet<JSVariable>(5);
-        final List<SwitchStatementBranch> allBranches   = new ArrayList<SwitchStatementBranch>();
-        SwitchStatementBranch             currentBranch = null;
-
-        for (JSCaseClause caseClause : switchStatement.getCaseClauses()) {
-            final PsiElement[] caseClauseChildren = caseClause.getChildren();
-
-            for (PsiElement child : caseClauseChildren) {
-                if (child == caseClauseChildren[0]) {
-                    if (currentBranch == null) {
-                        openBranches.clear();
-                        currentBranch = new SwitchStatementBranch();
-                        currentBranch.addPendingVariableDeclarations(declaredVars);
-                        allBranches .add(currentBranch);
-                        openBranches.add(currentBranch);
-                    } else if (currentBranch.hasStatements()) {
-                        currentBranch = new SwitchStatementBranch();
-                        allBranches .add(currentBranch);
-                        openBranches.add(currentBranch);
-                    }
-
-                    if (caseClause.isDefault()) {
-                        currentBranch.setDefault();
-                    }
-                }
-
-                if (child instanceof JSExpression) {
-                    // Processes case clause expression
-                    final JSExpression value = ParenthesesUtils.stripParentheses(caseClause.getCaseExpression());
-
-                    assert (currentBranch != null);
-                    currentBranch.addLabel(value.getText());
-                } else if (child instanceof JSStatement) {
-                    // Processes case clause statements
-                    final JSStatement statement = (JSStatement) child;
-
-                    if (statement instanceof JSVarStatement) {
-                        for (JSVariable variable : ((JSVarStatement) statement).getVariables()) {
-                            declaredVars.add(variable);
-                        }
-                    } else if (statement instanceof JSBlockStatement) {
-                        for (PsiElement blockElement : statement.getChildren()) {
-                            final boolean isJsElement  = (blockElement instanceof JSElement);
-                            final boolean isWhiteSpace = (blockElement instanceof PsiWhiteSpace);
-
-                            for (SwitchStatementBranch branch : openBranches) {
-                                if (isJsElement) {
-                                    branch.addStatement((JSElement) blockElement);
-                                } else if (isWhiteSpace) {
-                                    branch.addWhiteSpace(blockElement);
-                                } else {
-                                    branch.addComment(blockElement);
-                                }
-                            }
-                        }
-                    } else {
-                        for (SwitchStatementBranch branch : openBranches) {
-                            branch.addStatement(statement);
-                        }
-                    }
-
-                    if (!ControlFlowUtils.statementMayCompleteNormally(statement)) {
-                        currentBranch = null;
-                    }
-                } else {
-                    final boolean isWhiteSpace = (child instanceof PsiWhiteSpace);
-
-                    for (SwitchStatementBranch openBranch : openBranches) {
-                        if (isWhiteSpace) {
-                            openBranch.addWhiteSpace(child);
-                        } else {
-                            openBranch.addComment(child);
-                        }
-                    }
-                }
-            }
-        }
-
-        boolean               firstBranch   = true;
-        SwitchStatementBranch defaultBranch = null;
-
-        for (SwitchStatementBranch branch : allBranches) {
-            if (branch.isDefault()) {
-                defaultBranch = branch;
-            } else {
-                final List<String>     labels                      = branch.getLabels();
-                final List<PsiElement> bodyElements                = branch.getBodyElements();
-                final Set<JSVariable>  pendingVariableDeclarations = branch.getPendingVariableDeclarations();
-
-                dumpBranch(ifStatementBuffer, expressionText,
-                           labels, bodyElements, firstBranch,
-                           renameBreaks && CaseUtil.containsHiddenBreak(bodyElements), breakLabel,
-                           pendingVariableDeclarations);
-                firstBranch = false;
-            }
-        }
-        if (defaultBranch != null) {
-            final List<PsiElement> bodyElements                = defaultBranch.getBodyElements();
-            final Set<JSVariable>  pendingVariableDeclarations = defaultBranch.getPendingVariableDeclarations();
-
-            dumpDefaultBranch(ifStatementBuffer, bodyElements,
-                              firstBranch, renameBreaks, breakLabel,
-                              pendingVariableDeclarations);
-        }
-
-      if (hadSideEffects) {
-            final String      ifStatementString    = ifStatementBuffer.toString();
-            final JSStatement declarationStatement = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), declarationString).getPsi();
-            final JSStatement ifStatement          = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
-
-            codeStyleMgr.reformat(declarationStatement);
-            codeStyleMgr.reformat(ifStatement);
-            JSElementFactory.replaceStatement(switchStatement, declarationStatement.getText() + '\n' + ifStatement.getText());
-        } else {
-            final String      ifStatementString = ifStatementBuffer.toString();
-            final JSStatement newStatement = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
-
-            codeStyleMgr.reformat(newStatement);
-            JSElementFactory.replaceStatement(switchStatement, newStatement.getText());
-        }
-    }
-
-    private static void dumpBranch(StringBuilder     ifStatementString,
-                                   String            expressionText,
-                                   List<String>      labels,
-                                   List<PsiElement>  bodyStatements,
-                                   boolean           firstBranch,
-                                   boolean           renameBreaks,
-                                   String            breakLabel,
-                                   Set<JSVariable>   variableDecls) {
-        if (!firstBranch) {
-            ifStatementString.append(ELSE_KEYWORD);
-        }
-        dumpLabels(ifStatementString, expressionText, labels);
-        dumpBody  (ifStatementString, bodyStatements, renameBreaks, breakLabel,
-                   variableDecls);
-    }
-
-    private static void dumpDefaultBranch(StringBuilder     ifStatementString,
-                                          List<PsiElement>  bodyStatements,
-                                          boolean           firstBranch,
-                                          boolean           renameBreaks,
-                                          String            breakLabel,
-                                          Set<JSVariable>   variableDecls) {
-        if (!firstBranch) {
-            ifStatementString.append(ELSE_KEYWORD);
-        }
-        dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel,
-                 variableDecls);
-    }
-
-    private static void dumpLabels(StringBuilder ifStatementString,
-                                   String        expressionText,
-                                   List<String>  labels) {
-        boolean firstLabel = true;
-
-        ifStatementString.append(IF_PREFIX);
-        for (String label : labels) {
-            if (!firstLabel) {
-                ifStatementString.append("||");
-            }
-            firstLabel = false;
-
-            ifStatementString.append(expressionText)
-                             .append("==")
-                             .append(label);
-        }
-        ifStatementString.append(')');
-    }
-
-    private static void dumpBody(StringBuilder    ifStatementString,
-                                 List<PsiElement> bodyStatements,
-                                 boolean          renameBreaks,
-                                 String           breakLabel,
-                                 Set<JSVariable>  variableDecls) {
-
-        ifStatementString.append('{');
-        for (final JSVariable var : variableDecls) {
-            if (CaseUtil.isUsedByStatementList(var, bodyStatements)) {
-                ifStatementString.append(VAR_PREFIX)
-                                 .append(var.getName())
-                                 .append(';');
-            }
-        }
-
-        for (final PsiElement bodyStatement : bodyStatements) {
-            if (!(bodyStatement instanceof JSBreakStatement)) {
-                appendElement(ifStatementString, bodyStatement, renameBreaks,
-                              breakLabel);
-            }
-        }
-        ifStatementString.append('}');
-    }
-
-    private static void appendElement(StringBuilder ifStatementString,
-                                      PsiElement    element,
-                                      boolean       renameBreakElements,
-                                      String        breakLabelString) {
-        if (!renameBreakElements) {
-            final String text = element.getText();
-
-            ifStatementString.append(text);
-        } else if (element instanceof JSBreakStatement) {
-            final String identifier = ((JSBreakStatement) element).getLabel();
-
-            if (identifier == null || identifier.length() == 0) {
-                ifStatementString.append(BREAK_KEYWORD)
-                                 .append(breakLabelString)
-                                 .append(';');
-            } else {
-                final String text = element.getText();
-                ifStatementString.append(text);
-            }
-        } else if (element instanceof JSBlockStatement) {
-            for (final PsiElement child : element.getChildren()) {
-                appendElement(ifStatementString, child, renameBreakElements, breakLabelString);
-            }
-        } else if (element instanceof JSIfStatement) {
-            JSIfStatement ifStatement = (JSIfStatement) element;
-            JSStatement   elseBranch  = ifStatement.getElse();
-
-            ifStatementString.append(IF_PREFIX)
-                             .append(ifStatement.getCondition().getText())
-                             .append(IF_SUFFIX);
-            appendElement(ifStatementString, ifStatement.getThen(), renameBreakElements, breakLabelString);
-            if (elseBranch != null) {
-                ifStatementString.append(ELSE);
-                appendElement(ifStatementString, elseBranch, renameBreakElements, breakLabelString);
-            }
-            ifStatementString.append('}');
-        } else {
-            ifStatementString.append(element.getText());
-        }
-    }
-
-    private static class SwitchPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            final PsiElement parent = element.getParent();
-
-            if (!(parent instanceof JSSwitchStatement)) {
-                return false;
-            }
-            final JSSwitchStatement switchStatement = (JSSwitchStatement) parent;
-            if (ErrorUtil.containsError(switchStatement)) {
-                return false;
-            }
-
-            final JSExpression expression = switchStatement.getSwitchExpression();
-
-            return (expression != null && expression.isValid());
-        }
-    }
-
-    private static class SwitchStatementBranch {
-        private final Set<JSVariable>  pendingVariableDeclarations = new HashSet<JSVariable>(5);
-        private final List<String>     labels                      = new ArrayList<String>(2);
-        private final List<PsiElement> bodyElements                = new ArrayList<PsiElement>(5);
-        private final List<PsiElement> pendingWhiteSpace           = new ArrayList<PsiElement>(2);
-        private       boolean          isDefault;
-        private       boolean          hasStatements;
-
-        public void addLabel(String labelString) {
-            this.labels.add(labelString);
-        }
-
-        public void addStatement(JSElement statement) {
-            this.hasStatements = true;
-            this.addElement(statement);
-        }
-
-        public void addComment(PsiElement comment) {
-            this.addElement(comment);
-        }
-
-        private void addElement(PsiElement element) {
-            this.bodyElements.addAll(this.pendingWhiteSpace);
-            this.pendingWhiteSpace.clear();
-            this.bodyElements.add(element);
-        }
-
-        public void addWhiteSpace(PsiElement whiteSpace) {
-            if (this.bodyElements.size() > 0) {
-                this.pendingWhiteSpace.add(whiteSpace);
-            }
-        }
-
-        public List<String> getLabels() {
-            return Collections.unmodifiableList(this.labels);
-        }
-
-        public List<PsiElement> getBodyElements() {
-            return Collections.unmodifiableList(this.bodyElements);
-        }
-
-        public boolean isDefault() {
-            return this.isDefault;
-        }
-
-        public void setDefault() {
-            this.isDefault = true;
-        }
-
-        public boolean hasStatements() {
-            return this.hasStatements;
-        }
-
-        public void addPendingVariableDeclarations(Set<JSVariable> vars) {
-            this.pendingVariableDeclarations.addAll(vars);
-        }
-
-        public Set<JSVariable> getPendingVariableDeclarations() {
-            return Collections.unmodifiableSet(this.pendingVariableDeclarations);
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new SwitchPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSSwitchStatement switchStatement = (JSSwitchStatement) element.getParent();
+
+		assert (switchStatement != null);
+
+		final PsiManager mgr = switchStatement.getManager();
+		final JSExpression switchExpression = switchStatement.getSwitchExpression();
+		final CodeStyleManager codeStyleMgr = CodeStyleManager.getInstance(element.getProject());
+		final boolean hadSideEffects = SideEffectChecker.mayHaveSideEffects(switchExpression);
+		final String declarationString;
+		final String expressionText;
+
+		if(hadSideEffects)
+		{
+			final String variableName = "i"; // TODO JavaCodeStyleManager.getInstance(switchExpression.getProject()).suggestUniqueVariableName("i", switchExpression, true);
+
+			expressionText = variableName;
+			declarationString = VAR_PREFIX + variableName + " = " + switchExpression.getText() + ';';
+		}
+		else
+		{
+			declarationString = null;
+			expressionText = switchExpression.getText();
+		}
+
+		boolean renameBreaks = false;
+
+		for(JSCaseClause caseClause : switchStatement.getCaseClauses())
+		{
+			if(CaseUtil.containsHiddenBreak(caseClause))
+			{
+				renameBreaks = true;
+				break;
+			}
+		}
+
+		final StringBuilder ifStatementBuffer = new StringBuilder(1024);
+		String breakLabel = null;
+
+		if(renameBreaks)
+		{
+			breakLabel = CaseUtil.findUniqueLabel(switchStatement, DEFAULT_LABEL_NAME);
+			ifStatementBuffer.append(breakLabel)
+					.append(':');
+		}
+
+		final List<SwitchStatementBranch> openBranches = new ArrayList<SwitchStatementBranch>();
+		final Set<JSVariable> declaredVars = new HashSet<JSVariable>(5);
+		final List<SwitchStatementBranch> allBranches = new ArrayList<SwitchStatementBranch>();
+		SwitchStatementBranch currentBranch = null;
+
+		for(JSCaseClause caseClause : switchStatement.getCaseClauses())
+		{
+			final PsiElement[] caseClauseChildren = caseClause.getChildren();
+
+			for(PsiElement child : caseClauseChildren)
+			{
+				if(child == caseClauseChildren[0])
+				{
+					if(currentBranch == null)
+					{
+						openBranches.clear();
+						currentBranch = new SwitchStatementBranch();
+						currentBranch.addPendingVariableDeclarations(declaredVars);
+						allBranches.add(currentBranch);
+						openBranches.add(currentBranch);
+					}
+					else if(currentBranch.hasStatements())
+					{
+						currentBranch = new SwitchStatementBranch();
+						allBranches.add(currentBranch);
+						openBranches.add(currentBranch);
+					}
+
+					if(caseClause.isDefault())
+					{
+						currentBranch.setDefault();
+					}
+				}
+
+				if(child instanceof JSExpression)
+				{
+					// Processes case clause expression
+					final JSExpression value = ParenthesesUtils.stripParentheses(caseClause.getCaseExpression());
+
+					assert (currentBranch != null);
+					currentBranch.addLabel(value.getText());
+				}
+				else if(child instanceof JSStatement)
+				{
+					// Processes case clause statements
+					final JSStatement statement = (JSStatement) child;
+
+					if(statement instanceof JSVarStatement)
+					{
+						for(JSVariable variable : ((JSVarStatement) statement).getVariables())
+						{
+							declaredVars.add(variable);
+						}
+					}
+					else if(statement instanceof JSBlockStatement)
+					{
+						for(PsiElement blockElement : statement.getChildren())
+						{
+							final boolean isJsElement = (blockElement instanceof JSElement);
+							final boolean isWhiteSpace = (blockElement instanceof PsiWhiteSpace);
+
+							for(SwitchStatementBranch branch : openBranches)
+							{
+								if(isJsElement)
+								{
+									branch.addStatement((JSElement) blockElement);
+								}
+								else if(isWhiteSpace)
+								{
+									branch.addWhiteSpace(blockElement);
+								}
+								else
+								{
+									branch.addComment(blockElement);
+								}
+							}
+						}
+					}
+					else
+					{
+						for(SwitchStatementBranch branch : openBranches)
+						{
+							branch.addStatement(statement);
+						}
+					}
+
+					if(!ControlFlowUtils.statementMayCompleteNormally(statement))
+					{
+						currentBranch = null;
+					}
+				}
+				else
+				{
+					final boolean isWhiteSpace = (child instanceof PsiWhiteSpace);
+
+					for(SwitchStatementBranch openBranch : openBranches)
+					{
+						if(isWhiteSpace)
+						{
+							openBranch.addWhiteSpace(child);
+						}
+						else
+						{
+							openBranch.addComment(child);
+						}
+					}
+				}
+			}
+		}
+
+		boolean firstBranch = true;
+		SwitchStatementBranch defaultBranch = null;
+
+		for(SwitchStatementBranch branch : allBranches)
+		{
+			if(branch.isDefault())
+			{
+				defaultBranch = branch;
+			}
+			else
+			{
+				final List<String> labels = branch.getLabels();
+				final List<PsiElement> bodyElements = branch.getBodyElements();
+				final Set<JSVariable> pendingVariableDeclarations = branch.getPendingVariableDeclarations();
+
+				dumpBranch(ifStatementBuffer, expressionText,
+						labels, bodyElements, firstBranch,
+						renameBreaks && CaseUtil.containsHiddenBreak(bodyElements), breakLabel,
+						pendingVariableDeclarations);
+				firstBranch = false;
+			}
+		}
+		if(defaultBranch != null)
+		{
+			final List<PsiElement> bodyElements = defaultBranch.getBodyElements();
+			final Set<JSVariable> pendingVariableDeclarations = defaultBranch.getPendingVariableDeclarations();
+
+			dumpDefaultBranch(ifStatementBuffer, bodyElements,
+					firstBranch, renameBreaks, breakLabel,
+					pendingVariableDeclarations);
+		}
+
+		if(hadSideEffects)
+		{
+			final String ifStatementString = ifStatementBuffer.toString();
+			final JSStatement declarationStatement = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), declarationString).getPsi();
+			final JSStatement ifStatement = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
+
+			codeStyleMgr.reformat(declarationStatement);
+			codeStyleMgr.reformat(ifStatement);
+			JSElementFactory.replaceStatement(switchStatement, declarationStatement.getText() + '\n' + ifStatement.getText());
+		}
+		else
+		{
+			final String ifStatementString = ifStatementBuffer.toString();
+			final JSStatement newStatement = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
+
+			codeStyleMgr.reformat(newStatement);
+			JSElementFactory.replaceStatement(switchStatement, newStatement.getText());
+		}
+	}
+
+	private static void dumpBranch(StringBuilder ifStatementString,
+								   String expressionText,
+								   List<String> labels,
+								   List<PsiElement> bodyStatements,
+								   boolean firstBranch,
+								   boolean renameBreaks,
+								   String breakLabel,
+								   Set<JSVariable> variableDecls)
+	{
+		if(!firstBranch)
+		{
+			ifStatementString.append(ELSE_KEYWORD);
+		}
+		dumpLabels(ifStatementString, expressionText, labels);
+		dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel,
+				variableDecls);
+	}
+
+	private static void dumpDefaultBranch(StringBuilder ifStatementString,
+										  List<PsiElement> bodyStatements,
+										  boolean firstBranch,
+										  boolean renameBreaks,
+										  String breakLabel,
+										  Set<JSVariable> variableDecls)
+	{
+		if(!firstBranch)
+		{
+			ifStatementString.append(ELSE_KEYWORD);
+		}
+		dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel,
+				variableDecls);
+	}
+
+	private static void dumpLabels(StringBuilder ifStatementString,
+								   String expressionText,
+								   List<String> labels)
+	{
+		boolean firstLabel = true;
+
+		ifStatementString.append(IF_PREFIX);
+		for(String label : labels)
+		{
+			if(!firstLabel)
+			{
+				ifStatementString.append("||");
+			}
+			firstLabel = false;
+
+			ifStatementString.append(expressionText)
+					.append("==")
+					.append(label);
+		}
+		ifStatementString.append(')');
+	}
+
+	private static void dumpBody(StringBuilder ifStatementString,
+								 List<PsiElement> bodyStatements,
+								 boolean renameBreaks,
+								 String breakLabel,
+								 Set<JSVariable> variableDecls)
+	{
+
+		ifStatementString.append('{');
+		for(final JSVariable var : variableDecls)
+		{
+			if(CaseUtil.isUsedByStatementList(var, bodyStatements))
+			{
+				ifStatementString.append(VAR_PREFIX)
+						.append(var.getName())
+						.append(';');
+			}
+		}
+
+		for(final PsiElement bodyStatement : bodyStatements)
+		{
+			if(!(bodyStatement instanceof JSBreakStatement))
+			{
+				appendElement(ifStatementString, bodyStatement, renameBreaks,
+						breakLabel);
+			}
+		}
+		ifStatementString.append('}');
+	}
+
+	private static void appendElement(StringBuilder ifStatementString,
+									  PsiElement element,
+									  boolean renameBreakElements,
+									  String breakLabelString)
+	{
+		if(!renameBreakElements)
+		{
+			final String text = element.getText();
+
+			ifStatementString.append(text);
+		}
+		else if(element instanceof JSBreakStatement)
+		{
+			final String identifier = ((JSBreakStatement) element).getLabel();
+
+			if(identifier == null || identifier.length() == 0)
+			{
+				ifStatementString.append(BREAK_KEYWORD)
+						.append(breakLabelString)
+						.append(';');
+			}
+			else
+			{
+				final String text = element.getText();
+				ifStatementString.append(text);
+			}
+		}
+		else if(element instanceof JSBlockStatement)
+		{
+			for(final PsiElement child : element.getChildren())
+			{
+				appendElement(ifStatementString, child, renameBreakElements, breakLabelString);
+			}
+		}
+		else if(element instanceof JSIfStatement)
+		{
+			JSIfStatement ifStatement = (JSIfStatement) element;
+			JSStatement elseBranch = ifStatement.getElse();
+
+			ifStatementString.append(IF_PREFIX)
+					.append(ifStatement.getCondition().getText())
+					.append(IF_SUFFIX);
+			appendElement(ifStatementString, ifStatement.getThen(), renameBreakElements, breakLabelString);
+			if(elseBranch != null)
+			{
+				ifStatementString.append(ELSE);
+				appendElement(ifStatementString, elseBranch, renameBreakElements, breakLabelString);
+			}
+			ifStatementString.append('}');
+		}
+		else
+		{
+			ifStatementString.append(element.getText());
+		}
+	}
+
+	private static class SwitchPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			final PsiElement parent = element.getParent();
+
+			if(!(parent instanceof JSSwitchStatement))
+			{
+				return false;
+			}
+			final JSSwitchStatement switchStatement = (JSSwitchStatement) parent;
+			if(ErrorUtil.containsError(switchStatement))
+			{
+				return false;
+			}
+
+			final JSExpression expression = switchStatement.getSwitchExpression();
+
+			return (expression != null && expression.isValid());
+		}
+	}
+
+	private static class SwitchStatementBranch
+	{
+		private final Set<JSVariable> pendingVariableDeclarations = new HashSet<JSVariable>(5);
+		private final List<String> labels = new ArrayList<String>(2);
+		private final List<PsiElement> bodyElements = new ArrayList<PsiElement>(5);
+		private final List<PsiElement> pendingWhiteSpace = new ArrayList<PsiElement>(2);
+		private boolean isDefault;
+		private boolean hasStatements;
+
+		public void addLabel(String labelString)
+		{
+			this.labels.add(labelString);
+		}
+
+		public void addStatement(JSElement statement)
+		{
+			this.hasStatements = true;
+			this.addElement(statement);
+		}
+
+		public void addComment(PsiElement comment)
+		{
+			this.addElement(comment);
+		}
+
+		private void addElement(PsiElement element)
+		{
+			this.bodyElements.addAll(this.pendingWhiteSpace);
+			this.pendingWhiteSpace.clear();
+			this.bodyElements.add(element);
+		}
+
+		public void addWhiteSpace(PsiElement whiteSpace)
+		{
+			if(this.bodyElements.size() > 0)
+			{
+				this.pendingWhiteSpace.add(whiteSpace);
+			}
+		}
+
+		public List<String> getLabels()
+		{
+			return Collections.unmodifiableList(this.labels);
+		}
+
+		public List<PsiElement> getBodyElements()
+		{
+			return Collections.unmodifiableList(this.bodyElements);
+		}
+
+		public boolean isDefault()
+		{
+			return this.isDefault;
+		}
+
+		public void setDefault()
+		{
+			this.isDefault = true;
+		}
+
+		public boolean hasStatements()
+		{
+			return this.hasStatements;
+		}
+
+		public void addPendingVariableDeclarations(Set<JSVariable> vars)
+		{
+			this.pendingVariableDeclarations.addAll(vars);
+		}
+
+		public Set<JSVariable> getPendingVariableDeclarations()
+		{
+			return Collections.unmodifiableSet(this.pendingVariableDeclarations);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
index 9e5df597..4c057810 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
@@ -19,23 +19,31 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import org.intellij.idea.lang.javascript.psiutil.JSRecursiveElementVisitor;
 
-class LabelSearchVisitor extends JSRecursiveElementVisitor {
-    private final String labelName;
-    private boolean      used;
+class LabelSearchVisitor extends JSRecursiveElementVisitor
+{
+	private final String labelName;
+	private boolean used;
 
-    LabelSearchVisitor(String name) {
-        this.labelName = name;
-    }
+	LabelSearchVisitor(String name)
+	{
+		this.labelName = name;
+	}
 
-    @Override public void visitJSReferenceExpression(JSReferenceExpression expression) {}
+	@Override
+	public void visitJSReferenceExpression(JSReferenceExpression expression)
+	{
+	}
 
-    @Override public void visitJSLabeledStatement(JSLabeledStatement statement) {
-        final String labelText = statement.getLabel();
+	@Override
+	public void visitJSLabeledStatement(JSLabeledStatement statement)
+	{
+		final String labelText = statement.getLabel();
 
-        this.used = (labelText != null && labelText.equals(this.labelName));
-    }
+		this.used = (labelText != null && labelText.equals(this.labelName));
+	}
 
-    public boolean isUsed() {
-        return this.used;
-    }
+	public boolean isUsed()
+	{
+		return this.used;
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
index da0a9804..212abb00 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
@@ -21,23 +21,29 @@
 import org.intellij.idea.lang.javascript.psiutil.JSRecursiveElementVisitor;
 
 
-class LocalVariableUsageVisitor extends JSRecursiveElementVisitor {
-    private final JSVariable variable;
-    private       boolean    used;
+class LocalVariableUsageVisitor extends JSRecursiveElementVisitor
+{
+	private final JSVariable variable;
+	private boolean used;
 
-    LocalVariableUsageVisitor(JSVariable name) {
-        this.variable = name;
-    }
+	LocalVariableUsageVisitor(JSVariable name)
+	{
+		this.variable = name;
+	}
 
-    @Override public void visitJSReferenceExpression(JSReferenceExpression expression) {
-        final JSElement reference = (JSElement) expression.resolve();
-        if (this.variable.equals(reference)) {
-            this.used = true;
-        }
-        super.visitJSReferenceExpression(expression);
-    }
+	@Override
+	public void visitJSReferenceExpression(JSReferenceExpression expression)
+	{
+		final JSElement reference = (JSElement) expression.resolve();
+		if(this.variable.equals(reference))
+		{
+			this.used = true;
+		}
+		super.visitJSReferenceExpression(expression);
+	}
 
-    public boolean isUsed() {
-        return this.used;
-    }
+	public boolean isUsed()
+	{
+		return this.used;
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index b97bad90..3e74ca63 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -15,76 +15,95 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
+import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
+
+import javax.annotation.Nonnull;
 
-public class JSMergeElseIfIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSMergeElseIfIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSMergeElseIfIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new MergeElseIfPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement parentStatement = (JSIfStatement) element.getParent();
-
-        assert (parentStatement != null);
-
-        final JSBlockStatement elseBranch         = (JSBlockStatement) parentStatement.getElse();
-        final JSStatement      elseBranchContents = elseBranch.getStatements()[0];
-
-        JSElementFactory.replaceStatement(elseBranch, elseBranchContents.getText());
-    }
-
-    private static class MergeElseIfPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSElement)) {
-                return false;
-            }
-
-            final PsiElement  parent = element.getParent();
-
-            if (!(parent instanceof JSIfStatement)) {
-                return false;
-            }
-
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
-
-            if (ErrorUtil.containsError(ifStatement)) {
-                return false;
-            }
-
-            final JSStatement thenBranch = ifStatement.getThen();
-            final JSStatement elseBranch = ifStatement.getElse();
-
-            if (thenBranch == null) {
-                return false;
-            }
-            if (elseBranch == null) {
-                return false;
-            }
-            if (!(elseBranch instanceof JSBlockStatement)) {
-                return false;
-            }
-
-            final JSStatement[] statements = ((JSBlockStatement) elseBranch).getStatements();
-
-            if (statements.length != 1) {
-                return false;
-            }
-            return (statements[0] != null && statements[0] instanceof JSIfStatement);
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new MergeElseIfPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSIfStatement parentStatement = (JSIfStatement) element.getParent();
+
+		assert (parentStatement != null);
+
+		final JSBlockStatement elseBranch = (JSBlockStatement) parentStatement.getElse();
+		final JSStatement elseBranchContents = elseBranch.getStatements()[0];
+
+		JSElementFactory.replaceStatement(elseBranch, elseBranchContents.getText());
+	}
+
+	private static class MergeElseIfPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSElement))
+			{
+				return false;
+			}
+
+			final PsiElement parent = element.getParent();
+
+			if(!(parent instanceof JSIfStatement))
+			{
+				return false;
+			}
+
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+
+			if(ErrorUtil.containsError(ifStatement))
+			{
+				return false;
+			}
+
+			final JSStatement thenBranch = ifStatement.getThen();
+			final JSStatement elseBranch = ifStatement.getElse();
+
+			if(thenBranch == null)
+			{
+				return false;
+			}
+			if(elseBranch == null)
+			{
+				return false;
+			}
+			if(!(elseBranch instanceof JSBlockStatement))
+			{
+				return false;
+			}
+
+			final JSStatement[] statements = ((JSBlockStatement) elseBranch).getStatements();
+
+			if(statements.length != 1)
+			{
+				return false;
+			}
+			return (statements[0] != null && statements[0] instanceof JSIfStatement);
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index de1ba2d1..f6699073 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -15,86 +15,107 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import com.intellij.lang.javascript.psi.JSElement;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSIfStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import javax.annotation.Nonnull;
+import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import consulo.language.util.IncorrectOperationException;
-
-public class JSMergeIfAndIntention extends JSIntention {
-    @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSMergeIfAndIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSMergeIfAndIntention extends JSIntention
+{
+	@NonNls
+	private static final String IF_STATEMENT_PREFIX = "if (";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new MergeIfAndPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        assert (element.getParent() != null);
-        assert (element.getParent() instanceof JSIfStatement || element instanceof JSIfStatement);
-
-        final JSIfStatement parentStatement     = (JSIfStatement) (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
-        final JSIfStatement childStatement      = (JSIfStatement) ConditionalUtils.stripBraces(parentStatement.getThen());
-        final JSExpression  childCondition      = childStatement.getCondition();
-        final JSExpression  parentCondition     = parentStatement.getCondition();
-        final String        childConditionText  = ParenthesesUtils.getParenthesized(childCondition,  ParenthesesUtils.AND_PRECENDENCE);
-        final String        parentConditionText = ParenthesesUtils.getParenthesized(parentCondition, ParenthesesUtils.AND_PRECENDENCE);
-        final JSStatement   childThenBranch     = childStatement.getThen();
-        final String        statement           = IF_STATEMENT_PREFIX + parentConditionText + " && " + childConditionText + ')' +
-                                                  childThenBranch.getText();
-
-        JSElementFactory.replaceStatement(parentStatement, statement);
-    }
-
-    private static class MergeIfAndPredicate implements JSElementPredicate {
-
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSElement)) {
-                return false;
-            }
-
-            PsiElement parent = element.getParent();
-
-            if (!(parent instanceof JSIfStatement)) {
-                if (element instanceof JSIfStatement) {
-                    parent = element;
-                } else {
-                    return false;
-                }
-            }
-
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
-
-            if (ErrorUtil.containsError(ifStatement)) {
-                return false;
-            }
-
-            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-            final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
-
-            if (thenBranch == null || elseBranch != null) {
-                return false;
-            }
-            if (!(thenBranch instanceof JSIfStatement)) {
-                return false;
-            }
-
-            final JSIfStatement childIfStatement = (JSIfStatement) thenBranch;
-
-            return (childIfStatement.getElse() == null);
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new MergeIfAndPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		assert (element.getParent() != null);
+		assert (element.getParent() instanceof JSIfStatement || element instanceof JSIfStatement);
+
+		final JSIfStatement parentStatement = (JSIfStatement) (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+		final JSIfStatement childStatement = (JSIfStatement) ConditionalUtils.stripBraces(parentStatement.getThen());
+		final JSExpression childCondition = childStatement.getCondition();
+		final JSExpression parentCondition = parentStatement.getCondition();
+		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.AND_PRECENDENCE);
+		final String parentConditionText = ParenthesesUtils.getParenthesized(parentCondition, ParenthesesUtils.AND_PRECENDENCE);
+		final JSStatement childThenBranch = childStatement.getThen();
+		final String statement = IF_STATEMENT_PREFIX + parentConditionText + " && " + childConditionText + ')' +
+				childThenBranch.getText();
+
+		JSElementFactory.replaceStatement(parentStatement, statement);
+	}
+
+	private static class MergeIfAndPredicate implements JSElementPredicate
+	{
+
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSElement))
+			{
+				return false;
+			}
+
+			PsiElement parent = element.getParent();
+
+			if(!(parent instanceof JSIfStatement))
+			{
+				if(element instanceof JSIfStatement)
+				{
+					parent = element;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+
+			if(ErrorUtil.containsError(ifStatement))
+			{
+				return false;
+			}
+
+			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+			final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+
+			if(thenBranch == null || elseBranch != null)
+			{
+				return false;
+			}
+			if(!(thenBranch instanceof JSIfStatement))
+			{
+				return false;
+			}
+
+			final JSIfStatement childIfStatement = (JSIfStatement) thenBranch;
+
+			return (childIfStatement.getElse() == null);
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index 43101efa..8125af55 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -15,182 +15,215 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
-import javax.annotation.Nonnull;
-
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
-import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
-import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
-
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.psiutil.*;
+import org.jetbrains.annotations.NonNls;
 
-public class JSMergeIfOrIntention extends JSIntention {
-    @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
-    @NonNls private static final String ELSE_KEYWORD        = "else ";
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSMergeIfOrIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSMergeIfOrIntention extends JSIntention
+{
+	@NonNls
+	private static final String IF_STATEMENT_PREFIX = "if (";
+	@NonNls
+	private static final String ELSE_KEYWORD = "else ";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new MergeIfOrPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        assert (element instanceof JSElement);
-        JSElement jsElement = (JSElement) element;
-        if (MergeIfOrPredicate.isMergableExplicitIf(jsElement)) {
-            replaceMergeableExplicitIf(jsElement);
-        } else {
-            replaceMergeableImplicitIf(jsElement);
-        }
-    }
-
-    private static void replaceMergeableExplicitIf(JSElement token) throws IncorrectOperationException {
-        final JSIfStatement parentStatement = (JSIfStatement) (token.getParent() instanceof JSIfStatement ? token.getParent() : token);
-
-        assert (parentStatement != null);
-
-        final JSIfStatement childStatement       = (JSIfStatement) parentStatement.getElse();
-        final JSExpression  childCondition       = childStatement.getCondition();
-        final JSExpression  condition            = parentStatement.getCondition();
-        final String        childConditionText   = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
-        final String        parentConditionText  = ParenthesesUtils.getParenthesized(condition,      ParenthesesUtils.OR_PRECENDENCE);
-        final JSStatement   parentThenBranch     = parentStatement.getThen();
-        final String        parentThenBranchText = parentThenBranch.getText();
-        final StringBuilder statement            = new StringBuilder(IF_STATEMENT_PREFIX)
-                                                             .append(parentConditionText)
-                                                             .append(" || ")
-                                                             .append(childConditionText)
-                                                             .append(')')
-                                                             .append(parentThenBranchText);
-        final JSStatement   childElseBranch      = childStatement.getElse();
-
-        if (childElseBranch != null) {
-            final String childElseBranchText = childElseBranch.getText();
-
-            statement.append(ELSE_KEYWORD)
-                     .append(childElseBranchText);
-        }
-
-        JSElementFactory.replaceStatement(parentStatement, statement.toString());
-    }
-
-    private static void replaceMergeableImplicitIf(JSElement token) throws IncorrectOperationException {
-        final JSIfStatement parentStatement = (JSIfStatement) (token.getParent() instanceof JSIfStatement ? token.getParent() : token);
-        final JSIfStatement childStatement  = (JSIfStatement) JSElementFactory.getNonWhiteSpaceSibling(parentStatement, true);
-
-        assert (childStatement  != null);
-        assert (parentStatement != null);
-
-        final JSExpression childCondition      = childStatement.getCondition();
-        final JSExpression condition           = parentStatement.getCondition();
-        final String       childConditionText  = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
-        final String       parentConditionText = ParenthesesUtils.getParenthesized(condition,      ParenthesesUtils.OR_PRECENDENCE);
-        final JSStatement  parentThenBranch    = parentStatement.getThen();
-        final JSStatement  childElseBranch     = childStatement.getElse();
-        StringBuilder      statement           = new StringBuilder(IF_STATEMENT_PREFIX)
-                                                           .append(parentConditionText)
-                                                           .append(" || ")
-                                                           .append(childConditionText)
-                                                           .append(')')
-                                                           .append(parentThenBranch.getText());
-
-        if (childElseBranch != null) {
-            statement.append(ELSE_KEYWORD)
-                     .append(childElseBranch.getText());
-        }
-
-        JSElementFactory.replaceStatement(parentStatement, statement.toString());
-        JSElementFactory.removeElement(childStatement);
-    }
-
-    private static class MergeIfOrPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSElement)) {
-                return false;
-            }
-
-            final JSElement jsElement  = (JSElement) element;
-
-            return (isMergableExplicitIf(jsElement) || isMergableImplicitIf(jsElement));
-        }
-
-        public static boolean isMergableExplicitIf(JSElement element) {
-            PsiElement parent = element.getParent();
-
-            if (!(parent instanceof JSIfStatement)) {
-                if (element instanceof JSIfStatement) {
-                    parent = element;
-                } else {
-                    return false;
-                }
-            }
-
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
-
-            if (ErrorUtil.containsError(ifStatement)) {
-                return false;
-            }
-
-            final JSStatement thenBranch = ifStatement.getThen();
-            final JSStatement elseBranch = ifStatement.getElse();
-
-            if (thenBranch == null || elseBranch == null) {
-                return false;
-            }
-            if (!(elseBranch instanceof JSIfStatement)) {
-                return false;
-            }
-
-            final JSIfStatement childIfStatement = (JSIfStatement) elseBranch;
-            final JSStatement   childThenBranch  = childIfStatement.getThen();
-
-            return EquivalenceChecker.statementsAreEquivalent(thenBranch, childThenBranch);
-        }
-
-        private static boolean isMergableImplicitIf(JSElement element) {
-            PsiElement parent = element.getParent();
-
-            if (!(parent instanceof JSIfStatement)) {
-                if (element instanceof JSIfStatement) {
-                    parent = element;
-                } else {
-                    return false;
-                }
-            }
-
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
-            final JSStatement   thenBranch  = ifStatement.getThen();
-            final JSStatement   elseBranch  = ifStatement.getElse();
-
-            if (thenBranch == null || elseBranch != null) {
-                return false;
-            }
-
-            if (ControlFlowUtils.statementMayCompleteNormally(thenBranch)) {
-                return false;
-            }
-
-            final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
-
-            if (!(nextStatement instanceof JSIfStatement)) {
-                return false;
-            }
-
-            final JSIfStatement childIfStatement = (JSIfStatement) nextStatement;
-            final JSStatement   childThenBranch  = childIfStatement.getThen();
-
-            return EquivalenceChecker.statementsAreEquivalent(thenBranch, childThenBranch);
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new MergeIfOrPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		assert (element instanceof JSElement);
+		JSElement jsElement = (JSElement) element;
+		if(MergeIfOrPredicate.isMergableExplicitIf(jsElement))
+		{
+			replaceMergeableExplicitIf(jsElement);
+		}
+		else
+		{
+			replaceMergeableImplicitIf(jsElement);
+		}
+	}
+
+	private static void replaceMergeableExplicitIf(JSElement token) throws IncorrectOperationException
+	{
+		final JSIfStatement parentStatement = (JSIfStatement) (token.getParent() instanceof JSIfStatement ? token.getParent() : token);
+
+		assert (parentStatement != null);
+
+		final JSIfStatement childStatement = (JSIfStatement) parentStatement.getElse();
+		final JSExpression childCondition = childStatement.getCondition();
+		final JSExpression condition = parentStatement.getCondition();
+		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
+		final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
+		final JSStatement parentThenBranch = parentStatement.getThen();
+		final String parentThenBranchText = parentThenBranch.getText();
+		final StringBuilder statement = new StringBuilder(IF_STATEMENT_PREFIX)
+				.append(parentConditionText)
+				.append(" || ")
+				.append(childConditionText)
+				.append(')')
+				.append(parentThenBranchText);
+		final JSStatement childElseBranch = childStatement.getElse();
+
+		if(childElseBranch != null)
+		{
+			final String childElseBranchText = childElseBranch.getText();
+
+			statement.append(ELSE_KEYWORD)
+					.append(childElseBranchText);
+		}
+
+		JSElementFactory.replaceStatement(parentStatement, statement.toString());
+	}
+
+	private static void replaceMergeableImplicitIf(JSElement token) throws IncorrectOperationException
+	{
+		final JSIfStatement parentStatement = (JSIfStatement) (token.getParent() instanceof JSIfStatement ? token.getParent() : token);
+		final JSIfStatement childStatement = (JSIfStatement) JSElementFactory.getNonWhiteSpaceSibling(parentStatement, true);
+
+		assert (childStatement != null);
+		assert (parentStatement != null);
+
+		final JSExpression childCondition = childStatement.getCondition();
+		final JSExpression condition = parentStatement.getCondition();
+		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
+		final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
+		final JSStatement parentThenBranch = parentStatement.getThen();
+		final JSStatement childElseBranch = childStatement.getElse();
+		StringBuilder statement = new StringBuilder(IF_STATEMENT_PREFIX)
+				.append(parentConditionText)
+				.append(" || ")
+				.append(childConditionText)
+				.append(')')
+				.append(parentThenBranch.getText());
+
+		if(childElseBranch != null)
+		{
+			statement.append(ELSE_KEYWORD)
+					.append(childElseBranch.getText());
+		}
+
+		JSElementFactory.replaceStatement(parentStatement, statement.toString());
+		JSElementFactory.removeElement(childStatement);
+	}
+
+	private static class MergeIfOrPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSElement))
+			{
+				return false;
+			}
+
+			final JSElement jsElement = (JSElement) element;
+
+			return (isMergableExplicitIf(jsElement) || isMergableImplicitIf(jsElement));
+		}
+
+		public static boolean isMergableExplicitIf(JSElement element)
+		{
+			PsiElement parent = element.getParent();
+
+			if(!(parent instanceof JSIfStatement))
+			{
+				if(element instanceof JSIfStatement)
+				{
+					parent = element;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+
+			if(ErrorUtil.containsError(ifStatement))
+			{
+				return false;
+			}
+
+			final JSStatement thenBranch = ifStatement.getThen();
+			final JSStatement elseBranch = ifStatement.getElse();
+
+			if(thenBranch == null || elseBranch == null)
+			{
+				return false;
+			}
+			if(!(elseBranch instanceof JSIfStatement))
+			{
+				return false;
+			}
+
+			final JSIfStatement childIfStatement = (JSIfStatement) elseBranch;
+			final JSStatement childThenBranch = childIfStatement.getThen();
+
+			return EquivalenceChecker.statementsAreEquivalent(thenBranch, childThenBranch);
+		}
+
+		private static boolean isMergableImplicitIf(JSElement element)
+		{
+			PsiElement parent = element.getParent();
+
+			if(!(parent instanceof JSIfStatement))
+			{
+				if(element instanceof JSIfStatement)
+				{
+					parent = element;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+			final JSStatement thenBranch = ifStatement.getThen();
+			final JSStatement elseBranch = ifStatement.getElse();
+
+			if(thenBranch == null || elseBranch != null)
+			{
+				return false;
+			}
+
+			if(ControlFlowUtils.statementMayCompleteNormally(thenBranch))
+			{
+				return false;
+			}
+
+			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
+
+			if(!(nextStatement instanceof JSIfStatement))
+			{
+				return false;
+			}
+
+			final JSIfStatement childIfStatement = (JSIfStatement) nextStatement;
+			final JSStatement childThenBranch = childIfStatement.getThen();
+
+			return EquivalenceChecker.statementsAreEquivalent(thenBranch, childThenBranch);
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index 956b23bf..d5a0e93a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -15,8 +15,13 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSIfStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -25,103 +30,122 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
-
-public class JSMergeParallelIfsIntention extends JSIntention {
-    @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
-    @NonNls private static final String ELSE_KEYWORD        = "else ";
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSMergeParallelIfsIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSMergeParallelIfsIntention extends JSIntention
+{
+	@NonNls
+	private static final String IF_STATEMENT_PREFIX = "if (";
+	@NonNls
+	private static final String ELSE_KEYWORD = "else ";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new MergeParallelIfsPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement  nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-        assert (nextElement != null);
-
-        final JSIfStatement firstStatement  = (JSIfStatement) element;
-        final JSIfStatement secondStatement = (JSIfStatement) nextElement;
-        final StringBuilder statementBuffer = new StringBuilder();
-
-        this.mergeIfStatements(statementBuffer, firstStatement, secondStatement);
-        JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
-        JSElementFactory.removeElement(secondStatement);
-    }
-
-    private void mergeIfStatements(StringBuilder statementBuffer,
-                                   JSIfStatement firstStatement,
-                                   JSIfStatement secondStatement) {
-        final JSExpression  condition        = firstStatement.getCondition();
-        final JSStatement   firstThenBranch  = firstStatement .getThen();
-        final JSStatement   secondThenBranch = secondStatement.getThen();
-        final JSStatement   firstElseBranch  = firstStatement .getElse();
-        final JSStatement   secondElseBranch = secondStatement.getElse();
-
-        statementBuffer.append(IF_STATEMENT_PREFIX)
-                       .append(condition.getText())
-                       .append(')');
-        ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstThenBranch, secondThenBranch);
-
-        if (firstElseBranch != null || secondElseBranch != null) {
-            statementBuffer.append(ELSE_KEYWORD);
-            if (firstElseBranch  instanceof JSIfStatement &&
-                secondElseBranch instanceof JSIfStatement &&
-                MergeParallelIfsPredicate.ifStatementsCanBeMerged((JSIfStatement) firstElseBranch,
-                                                                  (JSIfStatement) secondElseBranch)) {
-                this.mergeIfStatements(statementBuffer,
-                                       (JSIfStatement) firstElseBranch,
-                                       (JSIfStatement) secondElseBranch);
-            } else {
-                ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstElseBranch, secondElseBranch);
-            }
-        }
-    }
-
-    private static class MergeParallelIfsPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSIfStatement) || ErrorUtil.containsError(element)) {
-                return false;
-            }
-
-            final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-            if (!(nextStatement instanceof JSIfStatement) || ErrorUtil.containsError(nextStatement)) {
-                return false;
-            }
-
-            return ifStatementsCanBeMerged((JSIfStatement) element,
-                                           (JSIfStatement) nextStatement);
-        }
-
-        public static boolean ifStatementsCanBeMerged(JSIfStatement statement1,
-                                                      JSIfStatement statement2) {
-            final JSStatement thenBranch = statement1.getThen();
-            final JSStatement elseBranch = statement1.getElse();
-            if (thenBranch == null) {
-                return false;
-            }
-            final JSExpression firstCondition  = statement1.getCondition();
-            final JSExpression secondCondition = statement2.getCondition();
-            if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition,
-                                                             secondCondition)) {
-                return false;
-            }
-            final JSStatement nextThenBranch = statement2.getThen();
-            if (!ControlFlowUtils.canBeMerged(thenBranch, nextThenBranch)) {
-                return false;
-            }
-            final JSStatement nextElseBranch = statement2.getElse();
-            return (elseBranch == null || nextElseBranch == null ||
-                    ControlFlowUtils.canBeMerged(elseBranch, nextElseBranch));
-        }
-     }
- }
\ No newline at end of file
+	public JSElementPredicate getElementPredicate()
+	{
+		return new MergeParallelIfsPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+
+		assert (nextElement != null);
+
+		final JSIfStatement firstStatement = (JSIfStatement) element;
+		final JSIfStatement secondStatement = (JSIfStatement) nextElement;
+		final StringBuilder statementBuffer = new StringBuilder();
+
+		this.mergeIfStatements(statementBuffer, firstStatement, secondStatement);
+		JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
+		JSElementFactory.removeElement(secondStatement);
+	}
+
+	private void mergeIfStatements(StringBuilder statementBuffer,
+								   JSIfStatement firstStatement,
+								   JSIfStatement secondStatement)
+	{
+		final JSExpression condition = firstStatement.getCondition();
+		final JSStatement firstThenBranch = firstStatement.getThen();
+		final JSStatement secondThenBranch = secondStatement.getThen();
+		final JSStatement firstElseBranch = firstStatement.getElse();
+		final JSStatement secondElseBranch = secondStatement.getElse();
+
+		statementBuffer.append(IF_STATEMENT_PREFIX)
+				.append(condition.getText())
+				.append(')');
+		ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstThenBranch, secondThenBranch);
+
+		if(firstElseBranch != null || secondElseBranch != null)
+		{
+			statementBuffer.append(ELSE_KEYWORD);
+			if(firstElseBranch instanceof JSIfStatement &&
+					secondElseBranch instanceof JSIfStatement &&
+					MergeParallelIfsPredicate.ifStatementsCanBeMerged((JSIfStatement) firstElseBranch,
+							(JSIfStatement) secondElseBranch))
+			{
+				this.mergeIfStatements(statementBuffer,
+						(JSIfStatement) firstElseBranch,
+						(JSIfStatement) secondElseBranch);
+			}
+			else
+			{
+				ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstElseBranch, secondElseBranch);
+			}
+		}
+	}
+
+	private static class MergeParallelIfsPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSIfStatement) || ErrorUtil.containsError(element))
+			{
+				return false;
+			}
+
+			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+
+			if(!(nextStatement instanceof JSIfStatement) || ErrorUtil.containsError(nextStatement))
+			{
+				return false;
+			}
+
+			return ifStatementsCanBeMerged((JSIfStatement) element,
+					(JSIfStatement) nextStatement);
+		}
+
+		public static boolean ifStatementsCanBeMerged(JSIfStatement statement1,
+													  JSIfStatement statement2)
+		{
+			final JSStatement thenBranch = statement1.getThen();
+			final JSStatement elseBranch = statement1.getElse();
+			if(thenBranch == null)
+			{
+				return false;
+			}
+			final JSExpression firstCondition = statement1.getCondition();
+			final JSExpression secondCondition = statement2.getCondition();
+			if(!EquivalenceChecker.expressionsAreEquivalent(firstCondition,
+					secondCondition))
+			{
+				return false;
+			}
+			final JSStatement nextThenBranch = statement2.getThen();
+			if(!ControlFlowUtils.canBeMerged(thenBranch, nextThenBranch))
+			{
+				return false;
+			}
+			final JSStatement nextElseBranch = statement2.getElse();
+			return (elseBranch == null || nextElseBranch == null ||
+					ControlFlowUtils.canBeMerged(elseBranch, nextElseBranch));
+		}
+	}
+}
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index dff9ba33..6c01a689 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -15,80 +15,100 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
+import com.intellij.lang.javascript.psi.JSBlockStatement;
+import com.intellij.lang.javascript.psi.JSIfStatement;
+import com.intellij.lang.javascript.psi.JSReturnStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import javax.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.lang.javascript.psi.JSBlockStatement;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSReturnStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import consulo.language.util.IncorrectOperationException;
-
-public class JSRemoveRedundantElseIntention extends JSIntention {
-    @NonNls private static final String IF_STATEMENT_PREFIX = "if (";
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSRemoveRedundantElseIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSRemoveRedundantElseIntention extends JSIntention
+{
+	@NonNls
+	private static final String IF_STATEMENT_PREFIX = "if (";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new RemoveRedundantElsePredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement ifStatement = (JSIfStatement) element;
-        final JSStatement   thenBranch  = ifStatement.getThen();
-        final JSStatement   elseBranch  = ifStatement.getElse();
-
-        assert (thenBranch != null);
-        assert (elseBranch != null);
-
-        final String      newIfText    = IF_STATEMENT_PREFIX + ifStatement.getCondition().getText() + ')' + thenBranch.getText();
-        final String      elseText     = elseBranch.getText();
-        final String      newStatement = (elseBranch instanceof JSBlockStatement
-                                              ? elseText.substring(elseText.indexOf('{') + 1, elseText.lastIndexOf('}') - 1).trim()
-                                              : elseText);
-
-        JSElementFactory.addStatementAfter(ifStatement, newStatement);
-        JSElementFactory.replaceStatement(ifStatement, newIfText);
-    }
-
-    private static class RemoveRedundantElsePredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSIfStatement)) {
-                return false;
-            }
-
-            final JSIfStatement ifStatement = (JSIfStatement) element;
-
-            if (ErrorUtil.containsError(ifStatement)) {
-                return false;
-            }
-
-            final JSStatement  elseBranch = ifStatement.getElse();
-            JSStatement        thenBranch = ifStatement.getThen();
-
-            if (elseBranch == null) {
-                return false;
-            }
-
-            while (thenBranch != null && thenBranch instanceof JSBlockStatement) {
-                JSStatement[] thenStatements = ((JSBlockStatement) thenBranch).getStatements();
-
-                if (thenStatements.length == 0) {
-                    return true;
-                } else if (thenStatements.length > 1) {
-                    return false;
-                }
-                thenBranch = thenStatements[0];
-            }
-
-            return (thenBranch != null && thenBranch instanceof JSReturnStatement);
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new RemoveRedundantElsePredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSIfStatement ifStatement = (JSIfStatement) element;
+		final JSStatement thenBranch = ifStatement.getThen();
+		final JSStatement elseBranch = ifStatement.getElse();
+
+		assert (thenBranch != null);
+		assert (elseBranch != null);
+
+		final String newIfText = IF_STATEMENT_PREFIX + ifStatement.getCondition().getText() + ')' + thenBranch.getText();
+		final String elseText = elseBranch.getText();
+		final String newStatement = (elseBranch instanceof JSBlockStatement
+				? elseText.substring(elseText.indexOf('{') + 1, elseText.lastIndexOf('}') - 1).trim()
+				: elseText);
+
+		JSElementFactory.addStatementAfter(ifStatement, newStatement);
+		JSElementFactory.replaceStatement(ifStatement, newIfText);
+	}
+
+	private static class RemoveRedundantElsePredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSIfStatement))
+			{
+				return false;
+			}
+
+			final JSIfStatement ifStatement = (JSIfStatement) element;
+
+			if(ErrorUtil.containsError(ifStatement))
+			{
+				return false;
+			}
+
+			final JSStatement elseBranch = ifStatement.getElse();
+			JSStatement thenBranch = ifStatement.getThen();
+
+			if(elseBranch == null)
+			{
+				return false;
+			}
+
+			while(thenBranch != null && thenBranch instanceof JSBlockStatement)
+			{
+				JSStatement[] thenStatements = ((JSBlockStatement) thenBranch).getStatements();
+
+				if(thenStatements.length == 0)
+				{
+					return true;
+				}
+				else if(thenStatements.length > 1)
+				{
+					return false;
+				}
+				thenBranch = thenStatements[0];
+			}
+
+			return (thenBranch != null && thenBranch instanceof JSReturnStatement);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index afac7e8f..2b6cfc05 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -15,263 +15,301 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
-import javax.annotation.Nonnull;
-
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
-import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
-import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
-import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
-
-import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.lang.javascript.psi.JSElement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSExpressionStatement;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSReturnStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import consulo.language.psi.PsiElement;
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.psiutil.*;
+import org.jetbrains.annotations.NonNls;
 
-public class JSReplaceIfWithConditionalIntention extends JSIntention {
-    private         static final char   TERNARY_QUESTION  = '?';
-    private         static final char   TERNARY_SEMICOLON = ':';
-    @NonNls private static final String RETURN_KEYWORD    = "return ";
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSReplaceIfWithConditionalIntention", categories = {
+		"JavaScript",
+		"Conditional"
+}, fileExtensions = "js")
+public class JSReplaceIfWithConditionalIntention extends JSIntention
+{
+	private static final char TERNARY_QUESTION = '?';
+	private static final char TERNARY_SEMICOLON = ':';
+	@NonNls
+	private static final String RETURN_KEYWORD = "return ";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new ReplaceIfWithConditionalPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement ifStatement = (JSIfStatement) (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
-
-        assert (ifStatement != null);
-
-        if (ReplaceIfWithConditionalPredicate.isReplaceableAssignment(ifStatement)) {
-            final StringBuilder newStatement = new StringBuilder();
-
-            getAssignmentReplacement(newStatement, ifStatement);
-            newStatement.append(';');
-            JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
-        } else if (ReplaceIfWithConditionalPredicate.isReplaceableReturn(ifStatement)) {
-            final StringBuilder newStatement = new StringBuilder(RETURN_KEYWORD);
-
-            getReturnReplacement(newStatement, ifStatement);
-            newStatement.append(';');
-            JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
-        } else if (ReplaceIfWithConditionalPredicate.isReplaceableImplicitReturn(ifStatement)) {
-            final JSExpression      condition    = ifStatement.getCondition();
-            final JSReturnStatement thenBranch   = (JSReturnStatement) ConditionalUtils.stripBraces(ifStatement.getThen());
-            final JSReturnStatement elseBranch   = PsiTreeUtil.getNextSiblingOfType(ifStatement, JSReturnStatement.class);
-            final String            newStatement = getImplicitReturnReplacement(condition, thenBranch, elseBranch);
-
-            JSElementFactory.replaceStatement(ifStatement, newStatement);
-            if (elseBranch != null) {
-                JSElementFactory.removeElement(elseBranch);
-            }
-        }
-    }
-
-    private static void getAssignmentReplacement(StringBuilder buffer, JSIfStatement ifStatement) {
-        final JSExpression           condition  = ifStatement.getCondition();
-        final JSExpressionStatement  thenBranch = (JSExpressionStatement) ConditionalUtils.stripBraces(ifStatement.getThen());
-        final JSAssignmentExpression thenAssign = (JSAssignmentExpression) thenBranch.getExpression();
-        final JSExpression           thenRhs    = thenAssign.getROperand();
-        final String                 operator   = BinaryOperatorUtils.getOperatorText(thenAssign.getOperationSign());
-        final JSStatement            elseBranch = ifStatement.getElse();
-
-        assert (thenRhs != null);
-
-        buffer.append(thenAssign.getLOperand().getText())
-              .append(operator)
-              .append(ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-              .append(TERNARY_QUESTION)
-              .append(ParenthesesUtils.getParenthesized(thenRhs,   ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-              .append(TERNARY_SEMICOLON);
-
-        if (elseBranch instanceof JSIfStatement) {
-            getAssignmentReplacement(buffer, (JSIfStatement) elseBranch);
-            return;
-        }
-
-        final JSExpressionStatement  strippedElseBranch = (JSExpressionStatement)  ConditionalUtils.stripBraces(elseBranch);
-        final JSAssignmentExpression elseAssign         = (JSAssignmentExpression) strippedElseBranch.getExpression();
-        final JSExpression           elseRhs            = elseAssign.getROperand();
-
-        assert (elseRhs != null);
-
-        buffer.append(ParenthesesUtils.getParenthesized(elseRhs, ParenthesesUtils.CONDITIONAL_PRECENDENCE));
-    }
-
-    private static void getReturnReplacement(StringBuilder buffer, JSIfStatement ifStatement) {
-        final JSStatement       thenBranch = ifStatement.getThen();
-        final JSReturnStatement thenReturn = (JSReturnStatement) ConditionalUtils.stripBraces(thenBranch);
-        final JSStatement       elseBranch = ifStatement.getElse();
-
-        buffer.append(ParenthesesUtils.getParenthesized(ifStatement.getCondition(),
-                                                        ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-              .append(TERNARY_QUESTION)
-              .append(ParenthesesUtils.getParenthesized(thenReturn.getExpression(),
-                                                        ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-              .append(TERNARY_SEMICOLON);
-
-        if (elseBranch instanceof JSIfStatement) {
-            getReturnReplacement(buffer, (JSIfStatement) elseBranch);
-            return;
-        }
-
-        final JSReturnStatement elseReturn = (JSReturnStatement) ConditionalUtils.stripBraces(elseBranch);
-
-        buffer.append(ParenthesesUtils.getParenthesized(elseReturn.getExpression(),
-                                                        ParenthesesUtils.CONDITIONAL_PRECENDENCE));
-    }
-
-    private static String getImplicitReturnReplacement(JSExpression condition, JSReturnStatement thenBranch, JSReturnStatement elseBranch) {
-        assert (thenBranch != null);
-        assert (elseBranch != null);
-
-        final JSExpression thenReturnValue = thenBranch.getExpression();
-        final JSExpression elseReturnValue = elseBranch.getExpression();
-
-        final String thenValue     = ParenthesesUtils.getParenthesized(thenReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
-        final String elseValue     = ParenthesesUtils.getParenthesized(elseReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
-        final String conditionText = ParenthesesUtils.getParenthesized(condition,       ParenthesesUtils.CONDITIONAL_PRECENDENCE);
-
-        return RETURN_KEYWORD + conditionText + TERNARY_QUESTION + thenValue + TERNARY_SEMICOLON + elseValue + ';';
-    }
-
-    private static class ReplaceIfWithConditionalPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSElement)) {
-                return false;
-            }
-
-            PsiElement parent = element.getParent();
-
-            if (!(parent instanceof JSIfStatement)) {
-                if (element instanceof JSIfStatement) {
-                    parent = element;
-                } else {
-                    return false;
-                }
-            }
-
-            if (ErrorUtil.containsError(parent)) {
-                return false;
-            }
-
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
-            final JSExpression  condition   = ifStatement.getCondition();
-
-            if (condition == null || !condition.isValid()) {
-                return false;
-            }
-            if (isReplaceableAssignment(ifStatement)) {
-                return true;
-            }
-            if (isReplaceableReturn(ifStatement)) {
-                return true;
-            }
-            return isReplaceableImplicitReturn(ifStatement);
-        }
-
-        public static boolean isReplaceableImplicitReturn(JSIfStatement ifStatement) {
-            final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
-
-            if (!(nextStatement instanceof JSReturnStatement)) {
-                return false;
-            }
-
-            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-
-            if (!(thenBranch instanceof JSReturnStatement)) {
-                return false;
-            }
-
-            return (((JSReturnStatement) thenBranch)   .getExpression() != null &&
-                    ((JSReturnStatement) nextStatement).getExpression() != null);
-        }
-
-        public static boolean isReplaceableReturn(JSIfStatement ifStatement) {
-            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-            final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
-
-            if (!(thenBranch instanceof JSReturnStatement)) {
-                return false;
-            }
-
-            if (elseBranch instanceof JSIfStatement) {
-                return isReplaceableReturn((JSIfStatement) elseBranch);
-            }
-            if (!(elseBranch instanceof JSReturnStatement)) {
-                return false;
-            }
-
-            return (((JSReturnStatement) thenBranch).getExpression() != null &&
-                    ((JSReturnStatement) elseBranch).getExpression() != null);
-
-        }
-
-        public static boolean isReplaceableAssignment(JSIfStatement ifStatement) {
-            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-            if (thenBranch == null) {
-                return false;
-            }
-
-            if (!ConditionalUtils.isAssignment(thenBranch)) {
-                return false;
-            }
-            final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
-
-            if (elseBranch == null) {
-                return false;
-            }
-            if (elseBranch instanceof JSIfStatement) {
-                return isReplaceableAssignment((JSIfStatement) elseBranch);
-            }
-
-            if (!ConditionalUtils.isAssignment(elseBranch)) {
-                return false;
-            }
-
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-            final IElementType           thenSign       = thenExpression.getOperationSign();
-            final IElementType           elseSign       = elseExpression.getOperationSign();
-
-            if (!thenSign.equals(elseSign)) {
-                return false;
-            }
-
-            final JSExpression thenLhs = thenExpression.getLOperand();
-
-            if (thenExpression.getROperand() == null) {
-                return false;
-            }
-            if (elseExpression.getROperand() == null ||
-                elseExpression.getLOperand() == null) {
-                return false;
-            }
-            final JSExpression thenRhs = thenExpression.getROperand();
-            assert thenRhs != null;
-
-            final JSExpression elseRhs = elseExpression.getROperand();
-            if (elseRhs == null) {
-                return false;
-            }
-
-            final JSExpression elseLhs = elseExpression.getLOperand();
-            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new ReplaceIfWithConditionalPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSIfStatement ifStatement = (JSIfStatement) (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+
+		assert (ifStatement != null);
+
+		if(ReplaceIfWithConditionalPredicate.isReplaceableAssignment(ifStatement))
+		{
+			final StringBuilder newStatement = new StringBuilder();
+
+			getAssignmentReplacement(newStatement, ifStatement);
+			newStatement.append(';');
+			JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
+		}
+		else if(ReplaceIfWithConditionalPredicate.isReplaceableReturn(ifStatement))
+		{
+			final StringBuilder newStatement = new StringBuilder(RETURN_KEYWORD);
+
+			getReturnReplacement(newStatement, ifStatement);
+			newStatement.append(';');
+			JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
+		}
+		else if(ReplaceIfWithConditionalPredicate.isReplaceableImplicitReturn(ifStatement))
+		{
+			final JSExpression condition = ifStatement.getCondition();
+			final JSReturnStatement thenBranch = (JSReturnStatement) ConditionalUtils.stripBraces(ifStatement.getThen());
+			final JSReturnStatement elseBranch = PsiTreeUtil.getNextSiblingOfType(ifStatement, JSReturnStatement.class);
+			final String newStatement = getImplicitReturnReplacement(condition, thenBranch, elseBranch);
+
+			JSElementFactory.replaceStatement(ifStatement, newStatement);
+			if(elseBranch != null)
+			{
+				JSElementFactory.removeElement(elseBranch);
+			}
+		}
+	}
+
+	private static void getAssignmentReplacement(StringBuilder buffer, JSIfStatement ifStatement)
+	{
+		final JSExpression condition = ifStatement.getCondition();
+		final JSExpressionStatement thenBranch = (JSExpressionStatement) ConditionalUtils.stripBraces(ifStatement.getThen());
+		final JSAssignmentExpression thenAssign = (JSAssignmentExpression) thenBranch.getExpression();
+		final JSExpression thenRhs = thenAssign.getROperand();
+		final String operator = BinaryOperatorUtils.getOperatorText(thenAssign.getOperationSign());
+		final JSStatement elseBranch = ifStatement.getElse();
+
+		assert (thenRhs != null);
+
+		buffer.append(thenAssign.getLOperand().getText())
+				.append(operator)
+				.append(ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+				.append(TERNARY_QUESTION)
+				.append(ParenthesesUtils.getParenthesized(thenRhs, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+				.append(TERNARY_SEMICOLON);
+
+		if(elseBranch instanceof JSIfStatement)
+		{
+			getAssignmentReplacement(buffer, (JSIfStatement) elseBranch);
+			return;
+		}
+
+		final JSExpressionStatement strippedElseBranch = (JSExpressionStatement) ConditionalUtils.stripBraces(elseBranch);
+		final JSAssignmentExpression elseAssign = (JSAssignmentExpression) strippedElseBranch.getExpression();
+		final JSExpression elseRhs = elseAssign.getROperand();
+
+		assert (elseRhs != null);
+
+		buffer.append(ParenthesesUtils.getParenthesized(elseRhs, ParenthesesUtils.CONDITIONAL_PRECENDENCE));
+	}
+
+	private static void getReturnReplacement(StringBuilder buffer, JSIfStatement ifStatement)
+	{
+		final JSStatement thenBranch = ifStatement.getThen();
+		final JSReturnStatement thenReturn = (JSReturnStatement) ConditionalUtils.stripBraces(thenBranch);
+		final JSStatement elseBranch = ifStatement.getElse();
+
+		buffer.append(ParenthesesUtils.getParenthesized(ifStatement.getCondition(),
+				ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+				.append(TERNARY_QUESTION)
+				.append(ParenthesesUtils.getParenthesized(thenReturn.getExpression(),
+						ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+				.append(TERNARY_SEMICOLON);
+
+		if(elseBranch instanceof JSIfStatement)
+		{
+			getReturnReplacement(buffer, (JSIfStatement) elseBranch);
+			return;
+		}
+
+		final JSReturnStatement elseReturn = (JSReturnStatement) ConditionalUtils.stripBraces(elseBranch);
+
+		buffer.append(ParenthesesUtils.getParenthesized(elseReturn.getExpression(),
+				ParenthesesUtils.CONDITIONAL_PRECENDENCE));
+	}
+
+	private static String getImplicitReturnReplacement(JSExpression condition, JSReturnStatement thenBranch, JSReturnStatement elseBranch)
+	{
+		assert (thenBranch != null);
+		assert (elseBranch != null);
+
+		final JSExpression thenReturnValue = thenBranch.getExpression();
+		final JSExpression elseReturnValue = elseBranch.getExpression();
+
+		final String thenValue = ParenthesesUtils.getParenthesized(thenReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
+		final String elseValue = ParenthesesUtils.getParenthesized(elseReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
+		final String conditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
+
+		return RETURN_KEYWORD + conditionText + TERNARY_QUESTION + thenValue + TERNARY_SEMICOLON + elseValue + ';';
+	}
+
+	private static class ReplaceIfWithConditionalPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSElement))
+			{
+				return false;
+			}
+
+			PsiElement parent = element.getParent();
+
+			if(!(parent instanceof JSIfStatement))
+			{
+				if(element instanceof JSIfStatement)
+				{
+					parent = element;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			if(ErrorUtil.containsError(parent))
+			{
+				return false;
+			}
+
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+			final JSExpression condition = ifStatement.getCondition();
+
+			if(condition == null || !condition.isValid())
+			{
+				return false;
+			}
+			if(isReplaceableAssignment(ifStatement))
+			{
+				return true;
+			}
+			if(isReplaceableReturn(ifStatement))
+			{
+				return true;
+			}
+			return isReplaceableImplicitReturn(ifStatement);
+		}
+
+		public static boolean isReplaceableImplicitReturn(JSIfStatement ifStatement)
+		{
+			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
+
+			if(!(nextStatement instanceof JSReturnStatement))
+			{
+				return false;
+			}
+
+			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+
+			if(!(thenBranch instanceof JSReturnStatement))
+			{
+				return false;
+			}
+
+			return (((JSReturnStatement) thenBranch).getExpression() != null &&
+					((JSReturnStatement) nextStatement).getExpression() != null);
+		}
+
+		public static boolean isReplaceableReturn(JSIfStatement ifStatement)
+		{
+			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+			final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+
+			if(!(thenBranch instanceof JSReturnStatement))
+			{
+				return false;
+			}
+
+			if(elseBranch instanceof JSIfStatement)
+			{
+				return isReplaceableReturn((JSIfStatement) elseBranch);
+			}
+			if(!(elseBranch instanceof JSReturnStatement))
+			{
+				return false;
+			}
+
+			return (((JSReturnStatement) thenBranch).getExpression() != null &&
+					((JSReturnStatement) elseBranch).getExpression() != null);
+
+		}
+
+		public static boolean isReplaceableAssignment(JSIfStatement ifStatement)
+		{
+			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+			if(thenBranch == null)
+			{
+				return false;
+			}
+
+			if(!ConditionalUtils.isAssignment(thenBranch))
+			{
+				return false;
+			}
+			final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+
+			if(elseBranch == null)
+			{
+				return false;
+			}
+			if(elseBranch instanceof JSIfStatement)
+			{
+				return isReplaceableAssignment((JSIfStatement) elseBranch);
+			}
+
+			if(!ConditionalUtils.isAssignment(elseBranch))
+			{
+				return false;
+			}
+
+			final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+			final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+			final IElementType thenSign = thenExpression.getOperationSign();
+			final IElementType elseSign = elseExpression.getOperationSign();
+
+			if(!thenSign.equals(elseSign))
+			{
+				return false;
+			}
+
+			final JSExpression thenLhs = thenExpression.getLOperand();
+
+			if(thenExpression.getROperand() == null)
+			{
+				return false;
+			}
+			if(elseExpression.getROperand() == null ||
+					elseExpression.getLOperand() == null)
+			{
+				return false;
+			}
+			final JSExpression thenRhs = thenExpression.getROperand();
+			assert thenRhs != null;
+
+			final JSExpression elseRhs = elseExpression.getROperand();
+			if(elseRhs == null)
+			{
+				return false;
+			}
+
+			final JSExpression elseLhs = elseExpression.getLOperand();
+			return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 2dda8189..f516bd8e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -15,69 +15,87 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
-import javax.annotation.Nonnull;
-
-import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
-import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
-
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
+import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
+
+import javax.annotation.Nonnull;
 
-public class JSSimplifyIfElseIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSSimplifyIfElseIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSSimplifyIfElseIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new SimplifyIfElsePredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new SimplifyIfElsePredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement statement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final PsiElement statement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
-        ConditionalUtils.replaceAssignmentOrReturnIfSimplifiable((JSIfStatement) statement);
-    }
+		ConditionalUtils.replaceAssignmentOrReturnIfSimplifiable((JSIfStatement) statement);
+	}
 
-    private static class SimplifyIfElsePredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSElement)) {
-                return false;
-            }
+	private static class SimplifyIfElsePredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			if(!(element instanceof JSElement))
+			{
+				return false;
+			}
 
-            PsiElement parent = element.getParent();
+			PsiElement parent = element.getParent();
 
-            if (!(parent instanceof JSIfStatement)) {
-                if (element instanceof JSIfStatement) {
-                    parent = element;
-                } else {
-                    return false;
-                }
-            }
-            if (ErrorUtil.containsError(parent)) {
-                return false;
-            }
+			if(!(parent instanceof JSIfStatement))
+			{
+				if(element instanceof JSIfStatement)
+				{
+					parent = element;
+				}
+				else
+				{
+					return false;
+				}
+			}
+			if(ErrorUtil.containsError(parent))
+			{
+				return false;
+			}
 
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
-            final JSExpression  condition   = ifStatement.getCondition();
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+			final JSExpression condition = ifStatement.getCondition();
 
-            if (condition == null || !condition.isValid()) {
-                return false;
-            }
+			if(condition == null || !condition.isValid())
+			{
+				return false;
+			}
 
-            return (ConditionalUtils.isSimplifiableAssignment        (ifStatement, false) ||
-                    ConditionalUtils.isSimplifiableAssignment        (ifStatement, true)  ||
-                    ConditionalUtils.isSimplifiableReturn            (ifStatement, false) ||
-                    ConditionalUtils.isSimplifiableReturn            (ifStatement, true)  ||
-                    ConditionalUtils.isSimplifiableImplicitReturn    (ifStatement, false) ||
-                    ConditionalUtils.isSimplifiableImplicitReturn    (ifStatement, true)  ||
-                    ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, false) ||
-                    ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, true));
+			return (ConditionalUtils.isSimplifiableAssignment(ifStatement, false) ||
+					ConditionalUtils.isSimplifiableAssignment(ifStatement, true) ||
+					ConditionalUtils.isSimplifiableReturn(ifStatement, false) ||
+					ConditionalUtils.isSimplifiableReturn(ifStatement, true) ||
+					ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, false) ||
+					ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, true) ||
+					ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, false) ||
+					ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, true));
 
-        }
-    }
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index e7f55477..701c162b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -15,56 +15,69 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSIfStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
+import javax.annotation.Nonnull;
 
-public class JSSplitElseIfIntention extends JSIntention {
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSSplitElseIfIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSSplitElseIfIntention extends JSIntention
+{
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new SplitElseIfPredicate();
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new SplitElseIfPredicate();
+	}
 
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement parentStatement = (JSIfStatement) element.getParent();
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final JSIfStatement parentStatement = (JSIfStatement) element.getParent();
 
-        assert (parentStatement != null);
+		assert (parentStatement != null);
 
-        final JSStatement elseBranch   = parentStatement.getElse();
-        final String      newStatement = '{' + elseBranch.getText() + '}';
+		final JSStatement elseBranch = parentStatement.getElse();
+		final String newStatement = '{' + elseBranch.getText() + '}';
 
-        JSElementFactory.replaceStatement(elseBranch, newStatement);
-    }
+		JSElementFactory.replaceStatement(elseBranch, newStatement);
+	}
 
-    private static class SplitElseIfPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            final PsiElement parent = element.getParent();
+	private static class SplitElseIfPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			final PsiElement parent = element.getParent();
 
-            if (!(parent instanceof JSIfStatement)) {
-                return false;
-            }
+			if(!(parent instanceof JSIfStatement))
+			{
+				return false;
+			}
 
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
 
-            if (ErrorUtil.containsError(ifStatement)) {
-                return false;
-            }
-            final JSStatement thenBranch = ifStatement.getThen();
-            final JSStatement elseBranch = ifStatement.getElse();
+			if(ErrorUtil.containsError(ifStatement))
+			{
+				return false;
+			}
+			final JSStatement thenBranch = ifStatement.getThen();
+			final JSStatement elseBranch = ifStatement.getElse();
 
-            return (thenBranch != null && elseBranch != null &&
-                    elseBranch instanceof JSIfStatement);
-        }
-    }
+			return (thenBranch != null && elseBranch != null &&
+					elseBranch instanceof JSIfStatement);
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index e4f83310..c3bf0f3b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -15,99 +15,120 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
-import javax.annotation.Nonnull;
-
-import org.intellij.idea.lang.javascript.intention.JSIntention;
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSIfStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
-import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
+import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
+import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
+import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.jetbrains.annotations.NonNls;
 
-import consulo.language.psi.PsiElement;
-import consulo.language.util.IncorrectOperationException;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.JSTokenTypes;
-
-public class JSSplitIfAndIntention extends JSIntention {
-    @NonNls private static final String IF_STATEMENT_PREFIX       = "if (";
-    @NonNls private static final String INNER_IF_STATEMENT_PREFIX = ") {\n if (";
-    @NonNls private static final String ELSE_KEYWORD              = "else ";
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSSplitIfAndIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSSplitIfAndIntention extends JSIntention
+{
+	@NonNls
+	private static final String IF_STATEMENT_PREFIX = "if (";
+	@NonNls
+	private static final String INNER_IF_STATEMENT_PREFIX = ") {\n if (";
+	@NonNls
+	private static final String ELSE_KEYWORD = "else ";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new SplitIfAndPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
-
-        assert (jsElement != null);
-        assert (jsElement instanceof JSIfStatement);
-
-        final JSIfStatement ifStatement = (JSIfStatement) jsElement;
-
-        assert (ifStatement.getCondition() instanceof JSBinaryExpression);
-
-        final JSBinaryExpression condition  = (JSBinaryExpression) ifStatement.getCondition();
-        final String             lhsText    = ParenthesesUtils.removeParentheses(condition.getLOperand());
-        final String             rhsText    = ParenthesesUtils.removeParentheses(condition.getROperand());
-        final JSStatement        thenBranch = ifStatement.getThen();
-        final JSStatement        elseBranch = ifStatement.getElse();
-        final String             thenText   = thenBranch.getText();
-        final String             elseText   = ((elseBranch == null) ? null : elseBranch.getText());
-        final int                elseLength = ((elseBranch == null) ? 0    : elseText.length());
-
-        assert (condition.getOperationSign().equals(JSTokenTypes.ANDAND));
-
-        final StringBuilder statement = new StringBuilder(ifStatement.getTextLength() + elseLength + 30);
-
-        statement.append(IF_STATEMENT_PREFIX)
-                 .append(lhsText)
-                 .append(INNER_IF_STATEMENT_PREFIX)
-                 .append(rhsText)
-                 .append(')')
-                 .append(thenText);
-        if (elseBranch != null) {
-            statement.append(ELSE_KEYWORD)
-                     .append(elseText);
-        }
-        statement.append('}');
-        if (elseBranch != null) {
-            statement.append(ELSE_KEYWORD)
-                     .append(elseText);
-        }
-
-        JSElementFactory.replaceStatement(ifStatement, statement.toString());
-    }
-
-    private static class SplitIfAndPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            PsiElement parent = element.getParent();
-
-            if (!(parent instanceof JSIfStatement)) {
-                if (element instanceof JSIfStatement) {
-                    parent = element;
-                } else {
-                    return false;
-                }
-            }
-
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
-            final JSExpression  condition   = ifStatement.getCondition();
-
-            if (condition == null || ErrorUtil.containsError(condition)) {
-                return false;
-            }
-
-            return (condition instanceof JSBinaryExpression &&
-                    ((JSBinaryExpression) condition).getOperationSign().equals(JSTokenTypes.ANDAND));
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new SplitIfAndPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+
+		assert (jsElement != null);
+		assert (jsElement instanceof JSIfStatement);
+
+		final JSIfStatement ifStatement = (JSIfStatement) jsElement;
+
+		assert (ifStatement.getCondition() instanceof JSBinaryExpression);
+
+		final JSBinaryExpression condition = (JSBinaryExpression) ifStatement.getCondition();
+		final String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
+		final String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
+		final JSStatement thenBranch = ifStatement.getThen();
+		final JSStatement elseBranch = ifStatement.getElse();
+		final String thenText = thenBranch.getText();
+		final String elseText = ((elseBranch == null) ? null : elseBranch.getText());
+		final int elseLength = ((elseBranch == null) ? 0 : elseText.length());
+
+		assert (condition.getOperationSign().equals(JSTokenTypes.ANDAND));
+
+		final StringBuilder statement = new StringBuilder(ifStatement.getTextLength() + elseLength + 30);
+
+		statement.append(IF_STATEMENT_PREFIX)
+				.append(lhsText)
+				.append(INNER_IF_STATEMENT_PREFIX)
+				.append(rhsText)
+				.append(')')
+				.append(thenText);
+		if(elseBranch != null)
+		{
+			statement.append(ELSE_KEYWORD)
+					.append(elseText);
+		}
+		statement.append('}');
+		if(elseBranch != null)
+		{
+			statement.append(ELSE_KEYWORD)
+					.append(elseText);
+		}
+
+		JSElementFactory.replaceStatement(ifStatement, statement.toString());
+	}
+
+	private static class SplitIfAndPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			PsiElement parent = element.getParent();
+
+			if(!(parent instanceof JSIfStatement))
+			{
+				if(element instanceof JSIfStatement)
+				{
+					parent = element;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+			final JSExpression condition = ifStatement.getCondition();
+
+			if(condition == null || ErrorUtil.containsError(condition))
+			{
+				return false;
+			}
+
+			return (condition instanceof JSBinaryExpression &&
+					((JSBinaryExpression) condition).getOperationSign().equals(JSTokenTypes.ANDAND));
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index 2c82b3ba..12adcd7f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -15,9 +15,15 @@
  */
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSIfStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -25,84 +31,98 @@
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import consulo.language.util.IncorrectOperationException;
-
-public class JSSplitIfOrIntention extends JSIntention {
-    @NonNls private static final String IF_STATEMENT_PREFIX      = "if (";
-    @NonNls private static final String ELSE_IF_STATEMENT_PREFIX = "else if (";
-    @NonNls private static final String ELSE_KEYWORD             = "else ";
+import javax.annotation.Nonnull;
 
-    @Override
+@ExtensionImpl
+@IntentionMetaData(ignoreId = "JSSplitIfOrIntention", categories = {
+		"JavaScript",
+		"Control Flow"
+}, fileExtensions = "js")
+public class JSSplitIfOrIntention extends JSIntention
+{
+	@NonNls
+	private static final String IF_STATEMENT_PREFIX = "if (";
+	@NonNls
+	private static final String ELSE_IF_STATEMENT_PREFIX = "else if (";
+	@NonNls
+	private static final String ELSE_KEYWORD = "else ";
+
+	@Override
 	@Nonnull
-    public JSElementPredicate getElementPredicate() {
-        return new SplitIfOrPredicate();
-    }
-
-    @Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
-
-        assert (jsElement != null);
-        assert (jsElement instanceof JSIfStatement);
-
-        final JSIfStatement ifStatement = (JSIfStatement) jsElement;
-
-        assert (ifStatement.getCondition() instanceof JSBinaryExpression);
-
-        final JSBinaryExpression condition  = (JSBinaryExpression) ifStatement.getCondition();
-        final String             lhsText    = ParenthesesUtils.removeParentheses(condition.getLOperand());
-        final String             rhsText    = ParenthesesUtils.removeParentheses(condition.getROperand());
-        final JSStatement        thenBranch = ifStatement.getThen();
-        final JSStatement        elseBranch = ifStatement.getElse();
-        final String             thenText   = thenBranch.getText();
-
-        assert (condition.getOperationSign().equals(JSTokenTypes.OROR));
-
-        final StringBuilder statement = new StringBuilder(ifStatement.getTextLength());
-
-        statement.append(IF_STATEMENT_PREFIX)
-                 .append(lhsText)
-                 .append(')')
-                 .append(thenText)
-                 .append(ELSE_IF_STATEMENT_PREFIX)
-                 .append(rhsText)
-                 .append(')')
-                 .append(thenText);
-        if (elseBranch != null) {
-            statement.append(ELSE_KEYWORD)
-                     .append(elseBranch.getText());
-        }
-
-        JSElementFactory.replaceStatement(ifStatement, statement.toString());
-    }
-
-    private static class SplitIfOrPredicate implements JSElementPredicate {
-        @Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-            PsiElement parent = element.getParent();
-
-            if (!(parent instanceof JSIfStatement)) {
-                if (element instanceof JSIfStatement) {
-                    parent = element;
-                } else {
-                    return false;
-                }
-            }
-
-            final JSIfStatement ifStatement = (JSIfStatement) parent;
-            final JSExpression  condition   = ifStatement.getCondition();
-
-            if (condition == null || ErrorUtil.containsError(condition)) {
-                return false;
-            }
-
-            return (condition instanceof JSBinaryExpression &&
-                    ((JSBinaryExpression) condition).getOperationSign().equals(JSTokenTypes.OROR));
-        }
-    }
+	public JSElementPredicate getElementPredicate()
+	{
+		return new SplitIfOrPredicate();
+	}
+
+	@Override
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
+	{
+		final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+
+		assert (jsElement != null);
+		assert (jsElement instanceof JSIfStatement);
+
+		final JSIfStatement ifStatement = (JSIfStatement) jsElement;
+
+		assert (ifStatement.getCondition() instanceof JSBinaryExpression);
+
+		final JSBinaryExpression condition = (JSBinaryExpression) ifStatement.getCondition();
+		final String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
+		final String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
+		final JSStatement thenBranch = ifStatement.getThen();
+		final JSStatement elseBranch = ifStatement.getElse();
+		final String thenText = thenBranch.getText();
+
+		assert (condition.getOperationSign().equals(JSTokenTypes.OROR));
+
+		final StringBuilder statement = new StringBuilder(ifStatement.getTextLength());
+
+		statement.append(IF_STATEMENT_PREFIX)
+				.append(lhsText)
+				.append(')')
+				.append(thenText)
+				.append(ELSE_IF_STATEMENT_PREFIX)
+				.append(rhsText)
+				.append(')')
+				.append(thenText);
+		if(elseBranch != null)
+		{
+			statement.append(ELSE_KEYWORD)
+					.append(elseBranch.getText());
+		}
+
+		JSElementFactory.replaceStatement(ifStatement, statement.toString());
+	}
+
+	private static class SplitIfOrPredicate implements JSElementPredicate
+	{
+		@Override
+		public boolean satisfiedBy(@Nonnull PsiElement element)
+		{
+			PsiElement parent = element.getParent();
+
+			if(!(parent instanceof JSIfStatement))
+			{
+				if(element instanceof JSIfStatement)
+				{
+					parent = element;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			final JSIfStatement ifStatement = (JSIfStatement) parent;
+			final JSExpression condition = ifStatement.getCondition();
+
+			if(condition == null || ErrorUtil.containsError(condition))
+			{
+				return false;
+			}
+
+			return (condition instanceof JSBinaryExpression &&
+					((JSBinaryExpression) condition).getOperationSign().equals(JSTokenTypes.OROR));
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java
index a7caa057..712115cb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java
@@ -34,107 +34,119 @@
  * please use the standard {@link java.util.Stack java.util.Stack} class
  * instead.
  */
-public class ArrayStack<E> extends ArrayList<E> implements Cloneable {
+public class ArrayStack<E> extends ArrayList<E> implements Cloneable
+{
 
-    /**
-     * Creates an empty <tt>ArrayStack</tt>.
-     */
-    public ArrayStack() {
-    }
+	/**
+	 * Creates an empty <tt>ArrayStack</tt>.
+	 */
+	public ArrayStack()
+	{
+	}
 
-    /**
-     * Pushes an item onto the top of this stack. This has exactly
-     * the same effect as:
-     * <blockquote><pre>
-     * add(item)</pre></blockquote>
-     *
-     * @param   item   the item to be pushed onto this stack.
-     * @return  the <tt>item</tt> argument.
-     * @see     ArrayList#add
-     */
-    public E push(E item) {
-        this.add(item);
-        return item;
-    }
+	/**
+	 * Pushes an item onto the top of this stack. This has exactly
+	 * the same effect as:
+	 * <blockquote><pre>
+	 * add(item)</pre></blockquote>
+	 *
+	 * @param item the item to be pushed onto this stack.
+	 * @return the <tt>item</tt> argument.
+	 * @see ArrayList#add
+	 */
+	public E push(E item)
+	{
+		this.add(item);
+		return item;
+	}
 
-    /**
-     * Removes the object at the top of this stack and returns that
-     * object as the value of this function.
-     *
-     * @return  The object at the top of this stack (the last item
-     *          of the <tt>ArrayList</tt> object).
-     * @throws  EmptyStackException  if this stack is empty.
-     */
-    public E pop() {
-        int  len = this.size();
-        E    obj = this.peek();
+	/**
+	 * Removes the object at the top of this stack and returns that
+	 * object as the value of this function.
+	 *
+	 * @return The object at the top of this stack (the last item
+	 * of the <tt>ArrayList</tt> object).
+	 * @throws EmptyStackException if this stack is empty.
+	 */
+	public E pop()
+	{
+		int len = this.size();
+		E obj = this.peek();
 
-        this.remove(len - 1);
-        return obj;
-    }
+		this.remove(len - 1);
+		return obj;
+	}
 
-    /**
-     * Looks at the object at the top of this stack without removing it
-     * from the stack.
-     *
-     * @return  the object at the top of this stack (the last item
-     *          of the <tt>ArrayList</tt> object).
-     * @throws  EmptyStackException  if this stack is empty.
-     */
-    public E peek() {
-        int  len = this.size();
+	/**
+	 * Looks at the object at the top of this stack without removing it
+	 * from the stack.
+	 *
+	 * @return the object at the top of this stack (the last item
+	 * of the <tt>ArrayList</tt> object).
+	 * @throws EmptyStackException if this stack is empty.
+	 */
+	public E peek()
+	{
+		int len = this.size();
 
-        if (len == 0) {
-            throw new EmptyStackException();
-        }
-        return this.get(len - 1);
-    }
+		if(len == 0)
+		{
+			throw new EmptyStackException();
+		}
+		return this.get(len - 1);
+	}
 
-    /**
-     * Tests if this stack is empty.
-     *
-     * @return  <tt>true</tt> if and only if this stack contains
-     *          no items; <tt>false</tt> otherwise.
-     */
-    public boolean empty() {
-        return (this.size() == 0);
-    }
+	/**
+	 * Tests if this stack is empty.
+	 *
+	 * @return <tt>true</tt> if and only if this stack contains
+	 * no items; <tt>false</tt> otherwise.
+	 */
+	public boolean empty()
+	{
+		return (this.size() == 0);
+	}
 
-    /**
-     * Returns the 1-based position where an object is on this stack.
-     * If the object <tt>o</tt> occurs as an item in this stack, this
-     * method returns the distance from the top of the stack of the
-     * occurrence nearest the top of the stack; the topmost item on the
-     * stack is considered to be at distance <tt>1</tt>. The <tt>equals</tt>
-     * method is used to compare <tt>o</tt> to the
-     * items in this stack.
-     *
-     * @param   o   the desired object.
-     * @return  the 1-based position from the top of the stack where
-     *          the object is located; the return value <tt>-1</tt>
-     *          indicates that the object is not on the stack.
-     */
-    public int search(E o) {
-        int  index = this.lastIndexOf(o);
+	/**
+	 * Returns the 1-based position where an object is on this stack.
+	 * If the object <tt>o</tt> occurs as an item in this stack, this
+	 * method returns the distance from the top of the stack of the
+	 * occurrence nearest the top of the stack; the topmost item on the
+	 * stack is considered to be at distance <tt>1</tt>. The <tt>equals</tt>
+	 * method is used to compare <tt>o</tt> to the
+	 * items in this stack.
+	 *
+	 * @param o the desired object.
+	 * @return the 1-based position from the top of the stack where
+	 * the object is located; the return value <tt>-1</tt>
+	 * indicates that the object is not on the stack.
+	 */
+	public int search(E o)
+	{
+		int index = this.lastIndexOf(o);
 
-        if (index >= 0) {
-            return this.size() - index;
-        }
+		if(index >= 0)
+		{
+			return this.size() - index;
+		}
 
-        return -1;
-    }
+		return -1;
+	}
 
-    /**
-     * Returns a shallow copy of this <tt>ArrayList</tt> instance.  (The
-     * elements themselves are not copied.)
-     *
-     * @return  a clone of this <tt>ArrayList</tt> instance.
-     */
-    @Override
-	public Object clone() {
-        return (ArrayStack<E>) super.clone();
-    }
+	/**
+	 * Returns a shallow copy of this <tt>ArrayList</tt> instance.  (The
+	 * elements themselves are not copied.)
+	 *
+	 * @return a clone of this <tt>ArrayList</tt> instance.
+	 */
+	@Override
+	public Object clone()
+	{
+		return (ArrayStack<E>) super.clone();
+	}
 
-    /** use java.util.Stack#serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = 1224463164541339165L;
+	/**
+	 * use java.util.Stack#serialVersionUID from JDK 1.0.2 for interoperability
+	 */
+	private static final long serialVersionUID = 1224463164541339165L;
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
index 74426cd1..e0e421f8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
@@ -24,97 +24,116 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class BinaryOperatorUtils {
-    private static final Map<IElementType, OperatorProperties> operators;
+public class BinaryOperatorUtils
+{
+	private static final Map<IElementType, OperatorProperties> operators;
 
-    private BinaryOperatorUtils() {}
+	private BinaryOperatorUtils()
+	{
+	}
 
-    public static boolean isBinaryOperator(JSExpression expression) {
-        return (expression instanceof JSBinaryExpression &&
-                operators.containsKey(((JSBinaryExpression) expression).getOperationSign()));
-    }
+	public static boolean isBinaryOperator(JSExpression expression)
+	{
+		return (expression instanceof JSBinaryExpression &&
+				operators.containsKey(((JSBinaryExpression) expression).getOperationSign()));
+	}
 
-    public static boolean isShiftOperator(JSExpression expression) {
-        if (expression instanceof JSBinaryExpression) {
-            final IElementType sign = ((JSBinaryExpression) expression).getOperationSign();
+	public static boolean isShiftOperator(JSExpression expression)
+	{
+		if(expression instanceof JSBinaryExpression)
+		{
+			final IElementType sign = ((JSBinaryExpression) expression).getOperationSign();
 
-            return (sign.equals(JSTokenTypes.LTLT) ||
-                    sign.equals(JSTokenTypes.GTGT) ||
-                    sign.equals(JSTokenTypes.GTGTGT));
-        } else {
-            return false;
-        }
-    }
+			return (sign.equals(JSTokenTypes.LTLT) ||
+					sign.equals(JSTokenTypes.GTGT) ||
+					sign.equals(JSTokenTypes.GTGTGT));
+		}
+		else
+		{
+			return false;
+		}
+	}
 
-    public static String getOperatorText(IElementType operator) {
-      if (operator == null) return "";
-      final OperatorProperties operatorProperties = operators.get(operator);
-      assert operatorProperties != null:"Operator properties is null for " + operator;
-      return operatorProperties.text;
-    }
+	public static String getOperatorText(IElementType operator)
+	{
+		if(operator == null)
+		{
+			return "";
+		}
+		final OperatorProperties operatorProperties = operators.get(operator);
+		assert operatorProperties != null : "Operator properties is null for " + operator;
+		return operatorProperties.text;
+	}
 
-    public static boolean isCommutative(IElementType operator) {
-      if (operator == null) return false;
-      final OperatorProperties operatorProperties = operators.get(operator);
-      assert operatorProperties != null:"Operator properties is null for " + operator;
-      return operatorProperties.commutative;
-    }
+	public static boolean isCommutative(IElementType operator)
+	{
+		if(operator == null)
+		{
+			return false;
+		}
+		final OperatorProperties operatorProperties = operators.get(operator);
+		assert operatorProperties != null : "Operator properties is null for " + operator;
+		return operatorProperties.commutative;
+	}
 
-    static {
-        operators = new HashMap<IElementType, OperatorProperties>(39);
+	static
+	{
+		operators = new HashMap<IElementType, OperatorProperties>(39);
 
-        operators.put(JSTokenTypes.LT         , new OperatorProperties("<"   , false));
-        operators.put(JSTokenTypes.GT         , new OperatorProperties(">"   , false));
-        operators.put(JSTokenTypes.LE         , new OperatorProperties("<="  , false));
-        operators.put(JSTokenTypes.GE         , new OperatorProperties(">="  , false));
-        operators.put(JSTokenTypes.EQEQ       , new OperatorProperties("=="  , true));
-        operators.put(JSTokenTypes.NE         , new OperatorProperties("!="  , true));
-        operators.put(JSTokenTypes.EQEQEQ     , new OperatorProperties("===" , true));
-        operators.put(JSTokenTypes.NEQEQ      , new OperatorProperties("!==" , true));
-        operators.put(JSTokenTypes.PLUS       , new OperatorProperties("+"   , true));
-        operators.put(JSTokenTypes.MINUS      , new OperatorProperties("-"   , false));
-        operators.put(JSTokenTypes.MULT       , new OperatorProperties("*"   , true));
-        operators.put(JSTokenTypes.DIV        , new OperatorProperties("/"   , false));
-        operators.put(JSTokenTypes.PERC       , new OperatorProperties("%"   , false));
-        operators.put(JSTokenTypes.PLUSPLUS   , new OperatorProperties("++"  , false));
-        operators.put(JSTokenTypes.MINUSMINUS , new OperatorProperties("--"  , false));
-        operators.put(JSTokenTypes.LTLT       , new OperatorProperties("<<"  , false));
-        operators.put(JSTokenTypes.GTGT       , new OperatorProperties(">>"  , false));
-        operators.put(JSTokenTypes.GTGTGT     , new OperatorProperties(">>>" , false));
-        operators.put(JSTokenTypes.AND        , new OperatorProperties("&"   , true));
-        operators.put(JSTokenTypes.OR         , new OperatorProperties("|"   , true));
-        operators.put(JSTokenTypes.XOR        , new OperatorProperties("^"   , true));
-        operators.put(JSTokenTypes.EXCL       , new OperatorProperties("!"   , false));
-        operators.put(JSTokenTypes.TILDE      , new OperatorProperties("~"   , false));
-        operators.put(JSTokenTypes.ANDAND     , new OperatorProperties("&&"  , true));
-        operators.put(JSTokenTypes.OROR       , new OperatorProperties("||"  , true));
-        operators.put(JSTokenTypes.EQ         , new OperatorProperties("="   , false));
-        operators.put(JSTokenTypes.PLUSEQ     , new OperatorProperties("+="  , false));
-        operators.put(JSTokenTypes.MINUSEQ    , new OperatorProperties("-="  , false));
-        operators.put(JSTokenTypes.MULTEQ     , new OperatorProperties("*="  , false));
-        operators.put(JSTokenTypes.PERCEQ     , new OperatorProperties("%="  , false));
-        operators.put(JSTokenTypes.LTLTEQ     , new OperatorProperties("<<=" , false));
-        operators.put(JSTokenTypes.GTGTEQ     , new OperatorProperties(">>=" , false));
-        operators.put(JSTokenTypes.GTGTGTEQ   , new OperatorProperties(">>>=", false));
-        operators.put(JSTokenTypes.ANDEQ      , new OperatorProperties("&="  , false));
-        operators.put(JSTokenTypes.OREQ       , new OperatorProperties("|="  , false));
-        operators.put(JSTokenTypes.XOREQ      , new OperatorProperties("^="  , false));
-        operators.put(JSTokenTypes.DIVEQ      , new OperatorProperties("/="  , false));
-        operators.put(JSTokenTypes.COMMA      , new OperatorProperties(","  , false));
-        operators.put(JSTokenTypes.IS_KEYWORD, new OperatorProperties("is"  , false));
-        operators.put(JSTokenTypes.AS_KEYWORD, new OperatorProperties("as"  , false));
-        operators.put(JSTokenTypes.DELETE_KEYWORD, new OperatorProperties("delete "  , false));
-        operators.put(JSTokenTypes.VOID_KEYWORD, new OperatorProperties("void "  , false));
-        operators.put(JSTokenTypes.TYPEOF_KEYWORD, new OperatorProperties("typeof "  , false));
-    }
+		operators.put(JSTokenTypes.LT, new OperatorProperties("<", false));
+		operators.put(JSTokenTypes.GT, new OperatorProperties(">", false));
+		operators.put(JSTokenTypes.LE, new OperatorProperties("<=", false));
+		operators.put(JSTokenTypes.GE, new OperatorProperties(">=", false));
+		operators.put(JSTokenTypes.EQEQ, new OperatorProperties("==", true));
+		operators.put(JSTokenTypes.NE, new OperatorProperties("!=", true));
+		operators.put(JSTokenTypes.EQEQEQ, new OperatorProperties("===", true));
+		operators.put(JSTokenTypes.NEQEQ, new OperatorProperties("!==", true));
+		operators.put(JSTokenTypes.PLUS, new OperatorProperties("+", true));
+		operators.put(JSTokenTypes.MINUS, new OperatorProperties("-", false));
+		operators.put(JSTokenTypes.MULT, new OperatorProperties("*", true));
+		operators.put(JSTokenTypes.DIV, new OperatorProperties("/", false));
+		operators.put(JSTokenTypes.PERC, new OperatorProperties("%", false));
+		operators.put(JSTokenTypes.PLUSPLUS, new OperatorProperties("++", false));
+		operators.put(JSTokenTypes.MINUSMINUS, new OperatorProperties("--", false));
+		operators.put(JSTokenTypes.LTLT, new OperatorProperties("<<", false));
+		operators.put(JSTokenTypes.GTGT, new OperatorProperties(">>", false));
+		operators.put(JSTokenTypes.GTGTGT, new OperatorProperties(">>>", false));
+		operators.put(JSTokenTypes.AND, new OperatorProperties("&", true));
+		operators.put(JSTokenTypes.OR, new OperatorProperties("|", true));
+		operators.put(JSTokenTypes.XOR, new OperatorProperties("^", true));
+		operators.put(JSTokenTypes.EXCL, new OperatorProperties("!", false));
+		operators.put(JSTokenTypes.TILDE, new OperatorProperties("~", false));
+		operators.put(JSTokenTypes.ANDAND, new OperatorProperties("&&", true));
+		operators.put(JSTokenTypes.OROR, new OperatorProperties("||", true));
+		operators.put(JSTokenTypes.EQ, new OperatorProperties("=", false));
+		operators.put(JSTokenTypes.PLUSEQ, new OperatorProperties("+=", false));
+		operators.put(JSTokenTypes.MINUSEQ, new OperatorProperties("-=", false));
+		operators.put(JSTokenTypes.MULTEQ, new OperatorProperties("*=", false));
+		operators.put(JSTokenTypes.PERCEQ, new OperatorProperties("%=", false));
+		operators.put(JSTokenTypes.LTLTEQ, new OperatorProperties("<<=", false));
+		operators.put(JSTokenTypes.GTGTEQ, new OperatorProperties(">>=", false));
+		operators.put(JSTokenTypes.GTGTGTEQ, new OperatorProperties(">>>=", false));
+		operators.put(JSTokenTypes.ANDEQ, new OperatorProperties("&=", false));
+		operators.put(JSTokenTypes.OREQ, new OperatorProperties("|=", false));
+		operators.put(JSTokenTypes.XOREQ, new OperatorProperties("^=", false));
+		operators.put(JSTokenTypes.DIVEQ, new OperatorProperties("/=", false));
+		operators.put(JSTokenTypes.COMMA, new OperatorProperties(",", false));
+		operators.put(JSTokenTypes.IS_KEYWORD, new OperatorProperties("is", false));
+		operators.put(JSTokenTypes.AS_KEYWORD, new OperatorProperties("as", false));
+		operators.put(JSTokenTypes.DELETE_KEYWORD, new OperatorProperties("delete ", false));
+		operators.put(JSTokenTypes.VOID_KEYWORD, new OperatorProperties("void ", false));
+		operators.put(JSTokenTypes.TYPEOF_KEYWORD, new OperatorProperties("typeof ", false));
+	}
 
-    private static class OperatorProperties {
-        String  text;
-        boolean commutative;
+	private static class OperatorProperties
+	{
+		String text;
+		boolean commutative;
 
-        public OperatorProperties(@NonNls String text, boolean commutative) {
-            this.text        = text;
-            this.commutative = commutative;
-        }
-    }
+		public OperatorProperties(@NonNls String text, boolean commutative)
+		{
+			this.text = text;
+			this.commutative = commutative;
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
index 13526fcb..e336f3c6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
@@ -15,151 +15,189 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import javax.annotation.Nullable;
-
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
-import com.intellij.lang.javascript.psi.JSPrefixExpression;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.language.ast.IElementType;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nullable;
 
-public class BoolUtils {
-
-    @NonNls public static final String TRUE  = "true";
-    @NonNls public static final String FALSE = "false";
-
-    private BoolUtils() {}
-
-    public static boolean isNegated(JSExpression condition) {
-        return (findNegation(condition) != null);
-    }
-
-    @Nullable
-    public static JSExpression findNegation(JSExpression condition) {
-        JSExpression ancestor = condition;
-
-        while (ancestor.getParent() instanceof JSParenthesizedExpression) {
-            ancestor = (JSExpression) ancestor.getParent();
-        }
-
-        if (ancestor.getParent() instanceof JSPrefixExpression) {
-            final JSPrefixExpression prefixAncestor = (JSPrefixExpression) ancestor.getParent();
-            if (prefixAncestor.getOperationSign().equals(JSTokenTypes.EXCL)) {
-                return prefixAncestor;
-            }
-        }
-
-        return null;
-    }
-
-    public static boolean isNegation(JSExpression condition) {
-        return isNegation(condition, false);
-    }
-
-    public static boolean isNegation(JSExpression condition, boolean ignoreNegatedNullComparison) {
-            if (condition instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) condition;
-                final IElementType sign             = prefixExpression.getOperationSign();
-
-                return sign.equals(JSTokenTypes.EXCL);
-            } else if (condition instanceof JSBinaryExpression) {
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
-                final IElementType sign = binaryExpression.getOperationSign();
-                final JSExpression lhs  = binaryExpression.getLOperand();
-                final JSExpression rhs  = binaryExpression.getROperand();
-
-                if (rhs != null && sign.equals(JSTokenTypes.NE)) {
-                    if (!ignoreNegatedNullComparison) {
-                        return true;
-                    }
-
-                    return !isNullLiteral(lhs) && !isNullLiteral(rhs);
-                } else {
-                    return false;
-                }
-            } else if (condition instanceof JSParenthesizedExpression) {
-                return isNegation(((JSParenthesizedExpression) condition).getInnerExpression());
-            } else {
-                return false;
-            }
-    }
-
-  private static boolean isNullLiteral(final JSExpression lhs) {
-    return lhs.getNode() != null && JSTokenTypes.NULL_KEYWORD.equals(lhs.getNode().getElementType());
-  }
-
-  public static JSExpression getNegated(JSExpression condition) {
-        if (condition instanceof JSPrefixExpression) {
-            final JSPrefixExpression prefixExp = (JSPrefixExpression) condition;
-            final JSExpression       operand   = prefixExp.getExpression();
-
-            return ParenthesesUtils.stripParentheses(operand);
-        } else if (condition instanceof JSBinaryExpression) {
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
-            final IElementType sign        = binaryExpression.getOperationSign();
-            final JSExpression lhs         = binaryExpression.getLOperand();
-            final JSExpression rhs         = binaryExpression.getROperand();
-            final String       negatedSign = ComparisonUtils.getNegatedOperatorText(sign);
-            final String       negatedText = lhs.getText() + negatedSign + rhs.getText();
-
-            return (JSExpression) JSChangeUtil.createExpressionFromText(
-              condition.getProject(),
-              negatedText);
-        } else if (condition instanceof JSParenthesizedExpression) {
-            return getNegated(((JSParenthesizedExpression) condition).getInnerExpression());
-        }
-        return condition;
-    }
-
-    public static boolean isBooleanLiteral(JSExpression condition) {
-        if (!(condition instanceof JSLiteralExpression)) {
-            return false;
-        }
-
-        final String  text = condition.getText();
-
-        return (TRUE.equals(text) || FALSE.equals(text));
-    }
-
-    public static Boolean getBooleanLiteral(JSExpression condition) {
-        if (!(condition instanceof JSLiteralExpression)) {
-            return null;
-        }
-
-        final String text = condition.getText();
-
-        return (TRUE .equals(text) ? Boolean.TRUE :
-                FALSE.equals(text) ? Boolean.FALSE
-                                   : null);
-    }
-
-    public static boolean isTrue(@Nullable JSExpression condition) {
-        return (condition instanceof JSLiteralExpression &&
-                TRUE.equals(condition.getText()));
-    }
-
-    public static boolean isFalse(@Nullable JSExpression condition) {
-        return (condition instanceof JSLiteralExpression &&
-                FALSE.equals(condition.getText()));
-    }
-
-    public static String getNegatedExpressionText(JSExpression condition) {
-        if (BoolUtils.isNegation(condition)) {
-            return ParenthesesUtils.getParenthesized(BoolUtils.getNegated(condition), ParenthesesUtils.OR_PRECENDENCE);
-        } else if(ComparisonUtils.isComparisonOperator(condition)) {
-            final JSBinaryExpression binaryExpression  = (JSBinaryExpression) condition;
-            final IElementType       sign              = binaryExpression.getOperationSign();
-            final String             negatedComparison = ComparisonUtils.getNegatedOperatorText(sign);
-            final JSExpression       leftOperand       = binaryExpression.getLOperand();
-            final JSExpression       rightOperand      = binaryExpression.getROperand();
-
-            return leftOperand.getText() + negatedComparison + (rightOperand != null ? rightOperand.getText():"");
-        } else {
-            return '!' + ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.PREFIX_PRECENDENCE);
-        }
-    }
+public class BoolUtils
+{
+
+	@NonNls
+	public static final String TRUE = "true";
+	@NonNls
+	public static final String FALSE = "false";
+
+	private BoolUtils()
+	{
+	}
+
+	public static boolean isNegated(JSExpression condition)
+	{
+		return (findNegation(condition) != null);
+	}
+
+	@Nullable
+	public static JSExpression findNegation(JSExpression condition)
+	{
+		JSExpression ancestor = condition;
+
+		while(ancestor.getParent() instanceof JSParenthesizedExpression)
+		{
+			ancestor = (JSExpression) ancestor.getParent();
+		}
+
+		if(ancestor.getParent() instanceof JSPrefixExpression)
+		{
+			final JSPrefixExpression prefixAncestor = (JSPrefixExpression) ancestor.getParent();
+			if(prefixAncestor.getOperationSign().equals(JSTokenTypes.EXCL))
+			{
+				return prefixAncestor;
+			}
+		}
+
+		return null;
+	}
+
+	public static boolean isNegation(JSExpression condition)
+	{
+		return isNegation(condition, false);
+	}
+
+	public static boolean isNegation(JSExpression condition, boolean ignoreNegatedNullComparison)
+	{
+		if(condition instanceof JSPrefixExpression)
+		{
+			final JSPrefixExpression prefixExpression = (JSPrefixExpression) condition;
+			final IElementType sign = prefixExpression.getOperationSign();
+
+			return sign.equals(JSTokenTypes.EXCL);
+		}
+		else if(condition instanceof JSBinaryExpression)
+		{
+			final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
+			final IElementType sign = binaryExpression.getOperationSign();
+			final JSExpression lhs = binaryExpression.getLOperand();
+			final JSExpression rhs = binaryExpression.getROperand();
+
+			if(rhs != null && sign.equals(JSTokenTypes.NE))
+			{
+				if(!ignoreNegatedNullComparison)
+				{
+					return true;
+				}
+
+				return !isNullLiteral(lhs) && !isNullLiteral(rhs);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else if(condition instanceof JSParenthesizedExpression)
+		{
+			return isNegation(((JSParenthesizedExpression) condition).getInnerExpression());
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	private static boolean isNullLiteral(final JSExpression lhs)
+	{
+		return lhs.getNode() != null && JSTokenTypes.NULL_KEYWORD.equals(lhs.getNode().getElementType());
+	}
+
+	public static JSExpression getNegated(JSExpression condition)
+	{
+		if(condition instanceof JSPrefixExpression)
+		{
+			final JSPrefixExpression prefixExp = (JSPrefixExpression) condition;
+			final JSExpression operand = prefixExp.getExpression();
+
+			return ParenthesesUtils.stripParentheses(operand);
+		}
+		else if(condition instanceof JSBinaryExpression)
+		{
+			final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
+			final IElementType sign = binaryExpression.getOperationSign();
+			final JSExpression lhs = binaryExpression.getLOperand();
+			final JSExpression rhs = binaryExpression.getROperand();
+			final String negatedSign = ComparisonUtils.getNegatedOperatorText(sign);
+			final String negatedText = lhs.getText() + negatedSign + rhs.getText();
+
+			return (JSExpression) JSChangeUtil.createExpressionFromText(
+					condition.getProject(),
+					negatedText);
+		}
+		else if(condition instanceof JSParenthesizedExpression)
+		{
+			return getNegated(((JSParenthesizedExpression) condition).getInnerExpression());
+		}
+		return condition;
+	}
+
+	public static boolean isBooleanLiteral(JSExpression condition)
+	{
+		if(!(condition instanceof JSLiteralExpression))
+		{
+			return false;
+		}
+
+		final String text = condition.getText();
+
+		return (TRUE.equals(text) || FALSE.equals(text));
+	}
+
+	public static Boolean getBooleanLiteral(JSExpression condition)
+	{
+		if(!(condition instanceof JSLiteralExpression))
+		{
+			return null;
+		}
+
+		final String text = condition.getText();
+
+		return (TRUE.equals(text) ? Boolean.TRUE :
+				FALSE.equals(text) ? Boolean.FALSE
+						: null);
+	}
+
+	public static boolean isTrue(@Nullable JSExpression condition)
+	{
+		return (condition instanceof JSLiteralExpression &&
+				TRUE.equals(condition.getText()));
+	}
+
+	public static boolean isFalse(@Nullable JSExpression condition)
+	{
+		return (condition instanceof JSLiteralExpression &&
+				FALSE.equals(condition.getText()));
+	}
+
+	public static String getNegatedExpressionText(JSExpression condition)
+	{
+		if(BoolUtils.isNegation(condition))
+		{
+			return ParenthesesUtils.getParenthesized(BoolUtils.getNegated(condition), ParenthesesUtils.OR_PRECENDENCE);
+		}
+		else if(ComparisonUtils.isComparisonOperator(condition))
+		{
+			final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
+			final IElementType sign = binaryExpression.getOperationSign();
+			final String negatedComparison = ComparisonUtils.getNegatedOperatorText(sign);
+			final JSExpression leftOperand = binaryExpression.getLOperand();
+			final JSExpression rightOperand = binaryExpression.getROperand();
+
+			return leftOperand.getText() + negatedComparison + (rightOperand != null ? rightOperand.getText() : "");
+		}
+		else
+		{
+			return '!' + ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.PREFIX_PRECENDENCE);
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
index 70a92913..93e92d35 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
@@ -15,83 +15,98 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import java.util.Map;
-import java.util.HashMap;
-
-import consulo.language.ast.IElementType;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.language.ast.IElementType;
+
+import java.util.HashMap;
+import java.util.Map;
 
-public class ComparisonUtils {
-
-    private static final Map<IElementType, OperatorTexts> operators;
-
-    private ComparisonUtils() {}
-
-    public static boolean isComparisonOperator(JSExpression expression) {
-        return (expression instanceof JSBinaryExpression &&
-                operators.containsKey(((JSBinaryExpression) expression).getOperationSign()));
-    }
-
-    public static String getOperatorText(IElementType operator) {
-        return operators.get(operator).getText();
-    }
-
-    public static boolean isEqualityTestExpression(JSBinaryExpression expression) {
-        IElementType operator = expression.getOperationSign();
-        return (operator.equals(JSTokenTypes.EQEQ) || operator.equals(JSTokenTypes.NE));
-    }
-
-    public static boolean mayBeEqualExpression(JSBinaryExpression expression) {
-        IElementType operator = expression.getOperationSign();
-        return (operator.equals(JSTokenTypes.EQEQ) || operator.equals(JSTokenTypes.EQEQEQ) ||
-                operator.equals(JSTokenTypes.LE)   || operator.equals(JSTokenTypes.GE));
-    }
-
-    public static String getNegatedOperatorText(IElementType operator) {
-        return operators.get(operator).getNegatedText();
-    }
-
-    public static String getFlippedOperatorText(IElementType operator) {
-        return operators.get(operator).getFlippedText();
-    }
-
-    static {
-        operators = new HashMap<IElementType, OperatorTexts>(8);
-
-        operators.put(JSTokenTypes.EQEQ,   new OperatorTexts("==",  "!=",  "=="));
-        operators.put(JSTokenTypes.EQEQEQ, new OperatorTexts("===", "!==", "==="));
-        operators.put(JSTokenTypes.NE,     new OperatorTexts("!=",  "==",  "!="));
-        operators.put(JSTokenTypes.NEQEQ,  new OperatorTexts("!==", "===", "!=="));
-        operators.put(JSTokenTypes.GT,     new OperatorTexts(">",   "<=",  "<"));
-        operators.put(JSTokenTypes.LT,     new OperatorTexts("<",   ">=",  ">"));
-        operators.put(JSTokenTypes.GE,     new OperatorTexts(">=",  "<",   "<="));
-        operators.put(JSTokenTypes.LE,     new OperatorTexts("<=",  ">",   ">="));
-    }
-
-    private static class OperatorTexts {
-        private String text;
-        private String negatedText;
-        private String flippedText;
-
-        public OperatorTexts(String text, String negatedText, String flippedText) {
-            this.text        = text;
-            this.negatedText = negatedText;
-            this.flippedText = flippedText;
-        }
-
-        public String getText() {
-            return this.text;
-        }
-
-        public String getNegatedText() {
-            return this.negatedText;
-        }
-
-        public String getFlippedText() {
-            return this.flippedText;
-        }
-    }
+public class ComparisonUtils
+{
+
+	private static final Map<IElementType, OperatorTexts> operators;
+
+	private ComparisonUtils()
+	{
+	}
+
+	public static boolean isComparisonOperator(JSExpression expression)
+	{
+		return (expression instanceof JSBinaryExpression &&
+				operators.containsKey(((JSBinaryExpression) expression).getOperationSign()));
+	}
+
+	public static String getOperatorText(IElementType operator)
+	{
+		return operators.get(operator).getText();
+	}
+
+	public static boolean isEqualityTestExpression(JSBinaryExpression expression)
+	{
+		IElementType operator = expression.getOperationSign();
+		return (operator.equals(JSTokenTypes.EQEQ) || operator.equals(JSTokenTypes.NE));
+	}
+
+	public static boolean mayBeEqualExpression(JSBinaryExpression expression)
+	{
+		IElementType operator = expression.getOperationSign();
+		return (operator.equals(JSTokenTypes.EQEQ) || operator.equals(JSTokenTypes.EQEQEQ) ||
+				operator.equals(JSTokenTypes.LE) || operator.equals(JSTokenTypes.GE));
+	}
+
+	public static String getNegatedOperatorText(IElementType operator)
+	{
+		return operators.get(operator).getNegatedText();
+	}
+
+	public static String getFlippedOperatorText(IElementType operator)
+	{
+		return operators.get(operator).getFlippedText();
+	}
+
+	static
+	{
+		operators = new HashMap<IElementType, OperatorTexts>(8);
+
+		operators.put(JSTokenTypes.EQEQ, new OperatorTexts("==", "!=", "=="));
+		operators.put(JSTokenTypes.EQEQEQ, new OperatorTexts("===", "!==", "==="));
+		operators.put(JSTokenTypes.NE, new OperatorTexts("!=", "==", "!="));
+		operators.put(JSTokenTypes.NEQEQ, new OperatorTexts("!==", "===", "!=="));
+		operators.put(JSTokenTypes.GT, new OperatorTexts(">", "<=", "<"));
+		operators.put(JSTokenTypes.LT, new OperatorTexts("<", ">=", ">"));
+		operators.put(JSTokenTypes.GE, new OperatorTexts(">=", "<", "<="));
+		operators.put(JSTokenTypes.LE, new OperatorTexts("<=", ">", ">="));
+	}
+
+	private static class OperatorTexts
+	{
+		private String text;
+		private String negatedText;
+		private String flippedText;
+
+		public OperatorTexts(String text, String negatedText, String flippedText)
+		{
+			this.text = text;
+			this.negatedText = negatedText;
+			this.flippedText = flippedText;
+		}
+
+		public String getText()
+		{
+			return this.text;
+		}
+
+		public String getNegatedText()
+		{
+			return this.negatedText;
+		}
+
+		public String getFlippedText()
+		{
+			return this.flippedText;
+		}
+	}
 }
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
index 480a3803..c7114316 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
@@ -15,312 +15,371 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import consulo.language.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.NonNls;
-
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSBlockStatement;
-import com.intellij.lang.javascript.psi.JSConditionalExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSExpressionStatement;
-import com.intellij.lang.javascript.psi.JSReturnStatement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSElement;
+import com.intellij.lang.javascript.psi.*;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
+import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import org.jetbrains.annotations.NonNls;
 
-public class ConditionalUtils {
-    private ConditionalUtils() {}
-
-    public static JSStatement stripBraces(JSStatement branch) {
-        if (branch != null && branch instanceof JSBlockStatement) {
-            final JSBlockStatement block      = (JSBlockStatement) branch;
-            final JSStatement[]    statements = block.getStatements();
-
-            if (statements.length == 1) {
-                return statements[0];
-            } else {
-                return block;
-            }
-        }
-
-        return branch;
-    }
-
-    public static boolean isReturn(JSStatement statement, String value) {
-        if (statement == null) {
-            return false;
-        }
-        if (!(statement instanceof JSReturnStatement)) {
-            return false;
-        }
-
-        final JSExpression returnExpression = ((JSReturnStatement) statement).getExpression();
-
-        return (returnExpression != null && value.equals(returnExpression.getText()));
-    }
-
-    public static boolean isAssignment(JSStatement statement, String value) {
-        if (statement == null || !(statement instanceof JSExpressionStatement)) {
-            return false;
-        }
-
-        final JSExpression expression = ((JSExpressionStatement) statement).getExpression();
-
-        if (!(expression instanceof JSAssignmentExpression)) {
-            return false;
-        }
-
-        final JSExpression rhs = ((JSAssignmentExpression) expression).getROperand();
-
-        return (rhs != null && rhs.getText().equals(value));
-    }
-
-    public static boolean isAssignment(JSStatement statement) {
-        if (!(statement instanceof JSExpressionStatement)) {
-            return false;
-        }
-
-        final JSExpressionStatement expressionStatement = (JSExpressionStatement) statement;
-
-        return (expressionStatement.getExpression() instanceof JSAssignmentExpression);
-    }
-
-    public static boolean isConditional(JSExpression expression) {
-        expression = ParenthesesUtils.stripParentheses(expression);
-
-        if (expression == null) {
-            return false;
-        }
-
-        if (expression instanceof JSConditionalExpression) {
-            return true;
-        }
-
-        if (expression instanceof JSBinaryExpression) {
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-            final IElementType sign             = binaryExpression.getOperationSign();
-
-            if (JSTokenTypes.XOR.equals(sign)) {
-                return (isConditional(binaryExpression.getLOperand()) &&
-                        isConditional(binaryExpression.getROperand()));
-            }
-
-            return (JSTokenTypes.ANDAND.equals(sign) || JSTokenTypes.OROR.equals(sign) ||
-                    JSTokenTypes.EQ    .equals(sign) || JSTokenTypes.NE  .equals(sign) ||
-                    JSTokenTypes.LT    .equals(sign) || JSTokenTypes.LE  .equals(sign) ||
-                    JSTokenTypes.GT    .equals(sign) || JSTokenTypes.GE  .equals(sign));
-        }
-
-        return BoolUtils.isBooleanLiteral(expression);
-    }
-
-    public static boolean isSimplifiableImplicitReturn(JSIfStatement ifStatement, boolean negated) {
-        final JSStatement thenBranch    = ConditionalUtils.stripBraces(ifStatement.getThen());
-        final PsiElement  nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
-
-        if (!(nextStatement instanceof JSStatement)) {
-            return false;
-        }
-
-        final JSStatement elseBranch = (JSStatement) nextStatement;
-
-        if (negated) {
-            return (ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE) &&
-                    ConditionalUtils.isReturn(elseBranch, BoolUtils.TRUE));
-        } else {
-            return (ConditionalUtils.isReturn(thenBranch, BoolUtils.TRUE) &&
-                    ConditionalUtils.isReturn(elseBranch, BoolUtils.FALSE));
-        }
-    }
-
-    public static boolean isSimplifiableReturn(JSIfStatement ifStatement, boolean negated) {
-        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-        final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
-
-        if (negated) {
-            return (ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE) &&
-                    ConditionalUtils.isReturn(elseBranch, BoolUtils.TRUE));
-        } else {
-            return (ConditionalUtils.isReturn(thenBranch, BoolUtils.TRUE) &&
-                    ConditionalUtils.isReturn(elseBranch, BoolUtils.FALSE));
-        }
-    }
-
-    public static boolean isSimplifiableAssignment(JSIfStatement ifStatement, boolean negated) {
-        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-        final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
-
-        final boolean isAssignment;
-
-        if (negated) {
-            isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE) &&
-                            ConditionalUtils.isAssignment(elseBranch, BoolUtils.TRUE));
-        } else {
-            isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.TRUE) &&
-                            ConditionalUtils.isAssignment(elseBranch, BoolUtils.FALSE));
-        }
-
-        if (isAssignment) {
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-            final IElementType thenSign       = thenExpression.getOperationSign();
-            final IElementType elseSign       = elseExpression.getOperationSign();
-
-            if (!thenSign.equals(elseSign)) {
-                return false;
-            }
-
-            final JSExpression thenLhs = thenExpression.getLOperand();
-            final JSExpression elseLhs = elseExpression.getLOperand();
-
-            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-        } else {
-            return false;
-        }
-    }
-
-    public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement, boolean negated) {
-        if (ifStatement.getElse() != null) {
-            return false;
-        }
-        final JSStatement  thenBranch    = ConditionalUtils.stripBraces(ifStatement.getThen());
-        final PsiElement   nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, false);
-
-        if (!(nextStatement instanceof JSStatement)) {
-            return false;
-        }
-
-        final JSStatement elseBranch = ConditionalUtils.stripBraces((JSStatement) nextStatement);
-
-        final boolean isAssignment;
-
-        if (negated) {
-            isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE) &&
-                            ConditionalUtils.isAssignment(elseBranch, BoolUtils.TRUE));
-        } else {
-            isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.TRUE) &&
-                            ConditionalUtils.isAssignment(elseBranch, BoolUtils.FALSE));
-        }
-
-        if (isAssignment) {
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-            final IElementType thenSign       = thenExpression.getOperationSign();
-            final IElementType           elseSign       = elseExpression.getOperationSign();
-
-            if (!thenSign.equals(elseSign)) {
-                return false;
-            }
-
-            final JSExpression thenLhs = thenExpression.getLOperand();
-            final JSExpression elseLhs = elseExpression.getLOperand();
-
-            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-        } else {
-            return false;
-        }
-    }
-
-    public static void replaceSimplifiableImplicitReturn(JSIfStatement statement, boolean negated)
-            throws IncorrectOperationException {
-        final JSExpression   condition     = statement.getCondition();
-        final String         conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-        final JSElement      nextStatement = (JSElement) JSElementFactory.getNonWhiteSpaceSibling(statement, true);
-        @NonNls final String newStatement  = "return " + conditionText + ';';
-
-        JSElementFactory.replaceStatement(statement, newStatement);
-        assert (nextStatement != null);
-        JSElementFactory.removeElement(nextStatement);
-    }
-
-    public static void replaceSimplifiableReturn(JSIfStatement statement, boolean negated)
-            throws IncorrectOperationException {
-        final JSExpression   condition     = statement.getCondition();
-        final String         conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-        @NonNls final String newStatement  = "return " + conditionText + ';';
-
-        JSElementFactory.replaceStatement(statement, newStatement);
-    }
-
-    public static void replaceSimplifiableAssignment(JSIfStatement statement, boolean negated)
-            throws IncorrectOperationException {
-        final JSExpression           condition            = statement.getCondition();
-        final String                 conditionText        = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-        final JSExpressionStatement  assignmentStatement  = (JSExpressionStatement) ConditionalUtils.stripBraces(statement.getThen());
-        final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-        final IElementType operator             = assignmentExpression.getOperationSign();
-        final String                 operand              = BinaryOperatorUtils.getOperatorText(operator);
-        final JSExpression           lhs                  = assignmentExpression.getLOperand();
-        final String                 lhsText              = lhs.getText();
-
-        JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
-    }
-
-    public static void replaceSimplifiableImplicitAssignment(JSIfStatement statement, boolean negated)
-            throws IncorrectOperationException {
-        final JSElement              prevStatement        = (JSElement) JSElementFactory.getNonWhiteSpaceSibling(statement, false);
-        final JSExpression           condition            = statement.getCondition();
-        final String                 conditionText        = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-        final JSExpressionStatement  assignmentStatement  = (JSExpressionStatement) ConditionalUtils.stripBraces(statement.getThen());
-        final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-        final IElementType operator             = assignmentExpression.getOperationSign();
-        final String                 operand              = BinaryOperatorUtils.getOperatorText(operator);
-        final JSExpression           lhs                  = assignmentExpression.getLOperand();
-        final String                 lhsText              = lhs.getText();
-
-        JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
-
-        assert (prevStatement != null);
-
-        JSElementFactory.removeElement(prevStatement);
-    }
-
-    public static void replaceAssignmentOrReturnIfSimplifiable(JSIfStatement statement)
-            throws IncorrectOperationException {
-        if (isSimplifiableAssignment(statement, false)) {
-            replaceSimplifiableAssignment(statement, false);
-        } else if (isSimplifiableAssignment(statement, true)) {
-            replaceSimplifiableAssignment(statement, true);
-        } else if (isSimplifiableReturn(statement, false)) {
-            replaceSimplifiableReturn(statement, false);
-        } else if (isSimplifiableReturn(statement, true)) {
-            replaceSimplifiableReturn(statement, true);
-        } else if (isSimplifiableImplicitReturn(statement, false)) {
-            replaceSimplifiableImplicitReturn(statement, false);
-        } else if (isSimplifiableImplicitReturn(statement, true)) {
-            replaceSimplifiableImplicitReturn(statement, true);
-        } else if (isSimplifiableImplicitAssignment(statement, false)) {
-            replaceSimplifiableImplicitAssignment(statement, false);
-        } else if (isSimplifiableImplicitAssignment(statement, true)) {
-            replaceSimplifiableImplicitAssignment(statement, true);
-        }
-    }
-
-    public static void replaceConditionalWithIf(JSConditionalExpression conditional)
-            throws IncorrectOperationException {
-        final JSStatement statement = PsiTreeUtil.getParentOfType(conditional, JSStatement.class);
-
-        assert (statement != null);
-
-        final String       statementText    = statement.getText();
-        final String       conditionalText  = ParenthesesUtils.unstripParentheses(conditional).getText();
-        final int          conditionalIndex = statementText.indexOf(conditionalText);
-        final String       statementStart   = statementText.substring(0, conditionalIndex);
-        final String       statementEnd     = statementText.substring(conditionalIndex + conditionalText.length());
-        final JSExpression condition        = ParenthesesUtils.stripParentheses(conditional.getCondition());
-        final JSExpression thenExpression   = ParenthesesUtils.stripParentheses(conditional.getThen());
-        final JSExpression elseExpression   = ParenthesesUtils.stripParentheses(conditional.getElse());
-
-        @NonNls final String ifStatementText = "if (" + condition.getText() + ") {" +
-                                               statementStart + thenExpression.getText() + statementEnd +
-                                               "} else {" +
-                                               statementStart + elseExpression.getText() + statementEnd +
-                                               '}';
-        JSElementFactory.replaceStatement(statement, ifStatementText);
-    }
+public class ConditionalUtils
+{
+	private ConditionalUtils()
+	{
+	}
+
+	public static JSStatement stripBraces(JSStatement branch)
+	{
+		if(branch != null && branch instanceof JSBlockStatement)
+		{
+			final JSBlockStatement block = (JSBlockStatement) branch;
+			final JSStatement[] statements = block.getStatements();
+
+			if(statements.length == 1)
+			{
+				return statements[0];
+			}
+			else
+			{
+				return block;
+			}
+		}
+
+		return branch;
+	}
+
+	public static boolean isReturn(JSStatement statement, String value)
+	{
+		if(statement == null)
+		{
+			return false;
+		}
+		if(!(statement instanceof JSReturnStatement))
+		{
+			return false;
+		}
+
+		final JSExpression returnExpression = ((JSReturnStatement) statement).getExpression();
+
+		return (returnExpression != null && value.equals(returnExpression.getText()));
+	}
+
+	public static boolean isAssignment(JSStatement statement, String value)
+	{
+		if(statement == null || !(statement instanceof JSExpressionStatement))
+		{
+			return false;
+		}
+
+		final JSExpression expression = ((JSExpressionStatement) statement).getExpression();
+
+		if(!(expression instanceof JSAssignmentExpression))
+		{
+			return false;
+		}
+
+		final JSExpression rhs = ((JSAssignmentExpression) expression).getROperand();
+
+		return (rhs != null && rhs.getText().equals(value));
+	}
+
+	public static boolean isAssignment(JSStatement statement)
+	{
+		if(!(statement instanceof JSExpressionStatement))
+		{
+			return false;
+		}
+
+		final JSExpressionStatement expressionStatement = (JSExpressionStatement) statement;
+
+		return (expressionStatement.getExpression() instanceof JSAssignmentExpression);
+	}
+
+	public static boolean isConditional(JSExpression expression)
+	{
+		expression = ParenthesesUtils.stripParentheses(expression);
+
+		if(expression == null)
+		{
+			return false;
+		}
+
+		if(expression instanceof JSConditionalExpression)
+		{
+			return true;
+		}
+
+		if(expression instanceof JSBinaryExpression)
+		{
+			final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+			final IElementType sign = binaryExpression.getOperationSign();
+
+			if(JSTokenTypes.XOR.equals(sign))
+			{
+				return (isConditional(binaryExpression.getLOperand()) &&
+						isConditional(binaryExpression.getROperand()));
+			}
+
+			return (JSTokenTypes.ANDAND.equals(sign) || JSTokenTypes.OROR.equals(sign) ||
+					JSTokenTypes.EQ.equals(sign) || JSTokenTypes.NE.equals(sign) ||
+					JSTokenTypes.LT.equals(sign) || JSTokenTypes.LE.equals(sign) ||
+					JSTokenTypes.GT.equals(sign) || JSTokenTypes.GE.equals(sign));
+		}
+
+		return BoolUtils.isBooleanLiteral(expression);
+	}
+
+	public static boolean isSimplifiableImplicitReturn(JSIfStatement ifStatement, boolean negated)
+	{
+		final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+		final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
+
+		if(!(nextStatement instanceof JSStatement))
+		{
+			return false;
+		}
+
+		final JSStatement elseBranch = (JSStatement) nextStatement;
+
+		if(negated)
+		{
+			return (ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE) &&
+					ConditionalUtils.isReturn(elseBranch, BoolUtils.TRUE));
+		}
+		else
+		{
+			return (ConditionalUtils.isReturn(thenBranch, BoolUtils.TRUE) &&
+					ConditionalUtils.isReturn(elseBranch, BoolUtils.FALSE));
+		}
+	}
+
+	public static boolean isSimplifiableReturn(JSIfStatement ifStatement, boolean negated)
+	{
+		final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+		final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+
+		if(negated)
+		{
+			return (ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE) &&
+					ConditionalUtils.isReturn(elseBranch, BoolUtils.TRUE));
+		}
+		else
+		{
+			return (ConditionalUtils.isReturn(thenBranch, BoolUtils.TRUE) &&
+					ConditionalUtils.isReturn(elseBranch, BoolUtils.FALSE));
+		}
+	}
+
+	public static boolean isSimplifiableAssignment(JSIfStatement ifStatement, boolean negated)
+	{
+		final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+		final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+
+		final boolean isAssignment;
+
+		if(negated)
+		{
+			isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE) &&
+					ConditionalUtils.isAssignment(elseBranch, BoolUtils.TRUE));
+		}
+		else
+		{
+			isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.TRUE) &&
+					ConditionalUtils.isAssignment(elseBranch, BoolUtils.FALSE));
+		}
+
+		if(isAssignment)
+		{
+			final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+			final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+			final IElementType thenSign = thenExpression.getOperationSign();
+			final IElementType elseSign = elseExpression.getOperationSign();
+
+			if(!thenSign.equals(elseSign))
+			{
+				return false;
+			}
+
+			final JSExpression thenLhs = thenExpression.getLOperand();
+			final JSExpression elseLhs = elseExpression.getLOperand();
+
+			return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement, boolean negated)
+	{
+		if(ifStatement.getElse() != null)
+		{
+			return false;
+		}
+		final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+		final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, false);
+
+		if(!(nextStatement instanceof JSStatement))
+		{
+			return false;
+		}
+
+		final JSStatement elseBranch = ConditionalUtils.stripBraces((JSStatement) nextStatement);
+
+		final boolean isAssignment;
+
+		if(negated)
+		{
+			isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE) &&
+					ConditionalUtils.isAssignment(elseBranch, BoolUtils.TRUE));
+		}
+		else
+		{
+			isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.TRUE) &&
+					ConditionalUtils.isAssignment(elseBranch, BoolUtils.FALSE));
+		}
+
+		if(isAssignment)
+		{
+			final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+			final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+			final IElementType thenSign = thenExpression.getOperationSign();
+			final IElementType elseSign = elseExpression.getOperationSign();
+
+			if(!thenSign.equals(elseSign))
+			{
+				return false;
+			}
+
+			final JSExpression thenLhs = thenExpression.getLOperand();
+			final JSExpression elseLhs = elseExpression.getLOperand();
+
+			return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	public static void replaceSimplifiableImplicitReturn(JSIfStatement statement, boolean negated)
+			throws IncorrectOperationException
+	{
+		final JSExpression condition = statement.getCondition();
+		final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
+		final JSElement nextStatement = (JSElement) JSElementFactory.getNonWhiteSpaceSibling(statement, true);
+		@NonNls final String newStatement = "return " + conditionText + ';';
+
+		JSElementFactory.replaceStatement(statement, newStatement);
+		assert (nextStatement != null);
+		JSElementFactory.removeElement(nextStatement);
+	}
+
+	public static void replaceSimplifiableReturn(JSIfStatement statement, boolean negated)
+			throws IncorrectOperationException
+	{
+		final JSExpression condition = statement.getCondition();
+		final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
+		@NonNls final String newStatement = "return " + conditionText + ';';
+
+		JSElementFactory.replaceStatement(statement, newStatement);
+	}
+
+	public static void replaceSimplifiableAssignment(JSIfStatement statement, boolean negated)
+			throws IncorrectOperationException
+	{
+		final JSExpression condition = statement.getCondition();
+		final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
+		final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(statement.getThen());
+		final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+		final IElementType operator = assignmentExpression.getOperationSign();
+		final String operand = BinaryOperatorUtils.getOperatorText(operator);
+		final JSExpression lhs = assignmentExpression.getLOperand();
+		final String lhsText = lhs.getText();
+
+		JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
+	}
+
+	public static void replaceSimplifiableImplicitAssignment(JSIfStatement statement, boolean negated)
+			throws IncorrectOperationException
+	{
+		final JSElement prevStatement = (JSElement) JSElementFactory.getNonWhiteSpaceSibling(statement, false);
+		final JSExpression condition = statement.getCondition();
+		final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
+		final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(statement.getThen());
+		final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+		final IElementType operator = assignmentExpression.getOperationSign();
+		final String operand = BinaryOperatorUtils.getOperatorText(operator);
+		final JSExpression lhs = assignmentExpression.getLOperand();
+		final String lhsText = lhs.getText();
+
+		JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
+
+		assert (prevStatement != null);
+
+		JSElementFactory.removeElement(prevStatement);
+	}
+
+	public static void replaceAssignmentOrReturnIfSimplifiable(JSIfStatement statement)
+			throws IncorrectOperationException
+	{
+		if(isSimplifiableAssignment(statement, false))
+		{
+			replaceSimplifiableAssignment(statement, false);
+		}
+		else if(isSimplifiableAssignment(statement, true))
+		{
+			replaceSimplifiableAssignment(statement, true);
+		}
+		else if(isSimplifiableReturn(statement, false))
+		{
+			replaceSimplifiableReturn(statement, false);
+		}
+		else if(isSimplifiableReturn(statement, true))
+		{
+			replaceSimplifiableReturn(statement, true);
+		}
+		else if(isSimplifiableImplicitReturn(statement, false))
+		{
+			replaceSimplifiableImplicitReturn(statement, false);
+		}
+		else if(isSimplifiableImplicitReturn(statement, true))
+		{
+			replaceSimplifiableImplicitReturn(statement, true);
+		}
+		else if(isSimplifiableImplicitAssignment(statement, false))
+		{
+			replaceSimplifiableImplicitAssignment(statement, false);
+		}
+		else if(isSimplifiableImplicitAssignment(statement, true))
+		{
+			replaceSimplifiableImplicitAssignment(statement, true);
+		}
+	}
+
+	public static void replaceConditionalWithIf(JSConditionalExpression conditional)
+			throws IncorrectOperationException
+	{
+		final JSStatement statement = PsiTreeUtil.getParentOfType(conditional, JSStatement.class);
+
+		assert (statement != null);
+
+		final String statementText = statement.getText();
+		final String conditionalText = ParenthesesUtils.unstripParentheses(conditional).getText();
+		final int conditionalIndex = statementText.indexOf(conditionalText);
+		final String statementStart = statementText.substring(0, conditionalIndex);
+		final String statementEnd = statementText.substring(conditionalIndex + conditionalText.length());
+		final JSExpression condition = ParenthesesUtils.stripParentheses(conditional.getCondition());
+		final JSExpression thenExpression = ParenthesesUtils.stripParentheses(conditional.getThen());
+		final JSExpression elseExpression = ParenthesesUtils.stripParentheses(conditional.getElse());
+
+		@NonNls final String ifStatementText = "if (" + condition.getText() + ") {" +
+				statementStart + thenExpression.getText() + statementEnd +
+				"} else {" +
+				statementStart + elseExpression.getText() + statementEnd +
+				'}';
+		JSElementFactory.replaceStatement(statement, ifStatementText);
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
index 67a5aeff..d1c34480 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
@@ -17,584 +17,761 @@
 
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.PsiElement;
-import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.psi.PsiReference;
+import consulo.language.psi.util.PsiTreeUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-public class ControlFlowUtils {
-    private ControlFlowUtils() {}
-
-    public static boolean statementMayCompleteNormally(@Nullable JSStatement statement) {
-        if (statement == null                        ||
-            statement instanceof JSBreakStatement    ||
-            statement instanceof JSContinueStatement ||
-            statement instanceof JSReturnStatement   ||
-            statement instanceof JSThrowStatement    ||
-            statement instanceof JSWithStatement) {
-            return false;
-        } else if (statement instanceof JSExpressionStatement ||
-                   statement instanceof JSEmptyStatement      ||
-                   statement instanceof JSVarStatement) {
-            return true;
-        } else if (statement instanceof JSForStatement) {
-            final JSForStatement loopStatement = (JSForStatement) statement;
-            final JSExpression   condition     = loopStatement.getCondition();
-
-            return (condition != null && !isBooleanConstant(condition, false) ||
-                    statementIsBreakTarget(loopStatement));
-        } else if (statement instanceof JSForInStatement) {
-            return (statementIsBreakTarget(statement));
-        } else if (statement instanceof JSWhileStatement) {
-            final JSWhileStatement loopStatement = (JSWhileStatement) statement;
-
-            return (!isBooleanConstant(loopStatement.getCondition(), true) ||
-                    statementIsBreakTarget(loopStatement));
-        } else if (statement instanceof JSDoWhileStatement) {
-            final JSDoWhileStatement loopStatement = (JSDoWhileStatement) statement;
-
-            return (statementMayCompleteNormally(loopStatement.getBody()) &&
-                    (!isBooleanConstant(loopStatement.getCondition(), true) ||
-                     statementIsBreakTarget(loopStatement)));
-        } else if (statement instanceof JSBlockStatement) {
-            return codeBlockMayCompleteNormally(((JSBlockStatement) statement).getStatements());
-        } else if (statement instanceof JSLabeledStatement) {
-            final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
-            final JSStatement body = labeledStatement.getStatement();
-
-            return (statementMayCompleteNormally(body) || statementIsBreakTarget(body));
-        } else if (statement instanceof JSIfStatement) {
-            final JSIfStatement ifStatement = (JSIfStatement) statement;
-            final JSStatement   thenBranch  = ifStatement.getThen();
-            final JSStatement   elseBranch  = ifStatement.getElse();
-
-            return (elseBranch == null ||
-                    statementMayCompleteNormally(thenBranch) ||
-                    statementMayCompleteNormally(elseBranch));
-        } else if (statement instanceof JSTryStatement) {
-            final JSTryStatement tryStatement = (JSTryStatement) statement;
-
-            if (!statementMayCompleteNormally(tryStatement.getFinallyStatement())) {
-                return false;
-            }
-            if (statementMayCompleteNormally(tryStatement.getStatement())) {
-                return true;
-            }
-
-            final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
-
-            return (catchBlock != null && statementMayCompleteNormally(catchBlock.getStatement()));
-        } else if (statement instanceof JSSwitchStatement) {
-            final JSSwitchStatement switchStatement = (JSSwitchStatement) statement;
-
-            if (statementIsBreakTarget(switchStatement)) {
-                return true;
-            }
-
-            for (JSCaseClause caseClause : switchStatement.getCaseClauses()) {
-                if (!codeBlockMayCompleteNormally(caseClause.getStatements())) {
-                    return false;
-                }
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public static boolean codeBlockMayCompleteNormally(@Nullable JSStatement[] statements) {
-        if (statements != null) {
-            for (final JSStatement statement : statements) {
-                if (!statementMayCompleteNormally(statement)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    @SuppressWarnings({"UnnecessaryUnboxing"})
-    private static boolean isBooleanConstant(JSExpression test, boolean val) {
-        if (!ExpressionUtil.isConstantExpression(test)) {
-            return false;
-        }
-        final Object value = ExpressionUtil.computeConstantExpression(test);
-        return (value != null &&
-                value instanceof Boolean &&
-                ((Boolean) value).booleanValue() == val);
-    }
-
-    private static boolean statementIsBreakTarget(@Nullable JSStatement statement) {
-        if (statement == null) {
-            return false;
-        }
-
-        final BreakTargetFinder breakFinder = new BreakTargetFinder(statement);
-
-        statement.accept(breakFinder);
-        return breakFinder.breakFound();
-    }
-
-    public static boolean statementContainsExitingBreak(@Nullable JSStatement statement) {
-        if (statement == null) {
-            return false;
-        }
-
-        final ExitingBreakFinder breakFinder = new ExitingBreakFinder();
-
-        statement.accept(breakFinder);
-        return breakFinder.breakFound();
-    }
-
-    public static boolean statementIsContinueTarget(@Nullable JSStatement statement) {
-        if (statement == null) {
-            return false;
-        }
-
-        final ContinueTargetFinder continueFinder = new ContinueTargetFinder(statement);
-
-        statement.accept(continueFinder);
-        return continueFinder.continueFound();
-    }
-
-    public static boolean statementContainsReturn(@Nullable JSStatement statement) {
-        if (statement == null) {
-            return false;
-        }
-
-        final ReturnFinder returnFinder = new ReturnFinder();
-
-        statement.accept(returnFinder);
-        return returnFinder.returnFound();
-    }
-
-    public static boolean statementCompletesWithStatement(
-            @Nonnull JSStatement containingStatement,
-            @Nonnull JSStatement statement) {
-        JSElement statementToCheck = statement;
-
-        while (true) {
-            if (statementToCheck.equals(containingStatement)) {
-                return true;
-            }
-
-            final JSStatement container = PsiTreeUtil.getParentOfType(statementToCheck, JSStatement.class);
-
-            if (container == null) {
-                return false;
-            }
-            if (container instanceof JSBlockStatement) {
-                if (!statementIsLastInBlock((JSBlockStatement) container,
-                                            (JSStatement) statementToCheck)) {
-                    return false;
-                }
-            }
-            if (container instanceof JSLoopStatement) {
-                return false;
-            }
-            statementToCheck = container;
-        }
-    }
-
-    private static boolean elementCompletesWithStatement(
-            @Nonnull JSElement   element,
-            @Nonnull JSStatement statement) {
-        PsiElement statementToCheck = statement;
-
-        while (true) {
-            if (statementToCheck == null) {
-                return false;
-            }
-            if (statementToCheck.equals(element)) {
-                return true;
-            }
-
-            final JSElement container = PsiTreeUtil.getParentOfType(statementToCheck, JSElement.class);
-
-            if (container == null || container instanceof JSLoopStatement) {
-                return false;
-            }
-
-            if (container instanceof JSBlockStatement) {
-                if (!statementIsLastInBlock((JSBlockStatement) container,
-                                            (JSStatement) statementToCheck)) {
-                    return false;
-                }
-                if (container.equals(element)) {
-                    return true;
-                }
-                statementToCheck = PsiTreeUtil.getParentOfType(container, JSStatement.class, JSFunction.class);
-            } else {
-                statementToCheck = container;
-            }
-        }
-    }
-
-    public static boolean functionCompletesWithStatement(
-            @Nonnull JSFunction  function,
-            @Nonnull JSStatement statement) {
-        return elementCompletesWithStatement(function, statement);
-    }
-
-    public static boolean blockCompletesWithStatement(
-            @Nonnull JSBlockStatement block,
-            @Nonnull JSStatement      statement) {
-        return elementCompletesWithStatement(block, statement);
-    }
-
-    private static boolean statementIsLastInBlock(
-            @Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
-        final JSStatement[] statements = block.getStatements();
-
-        //noinspection ForLoopWithMissingComponent
-        for (int index = statements.length; --index >= 0; ) {
-            final JSStatement childStatement = statements[index];
-
-            if (statement.equals(childStatement)) {
-                return true;
-            }
-            if (!(statement instanceof JSEmptyStatement)) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    @Nullable public static JSVariable resolveVariable(@Nullable JSExpression expression) {
-        if (expression == null) {
-            return null;
-        } else if (expression instanceof JSReferenceExpression) {
-            final PsiElement variable = ((JSReferenceExpression) expression).resolve();
-
-            return ((variable != null && variable instanceof JSVariable) ? (JSVariable) variable : null);
-        } else if (expression instanceof JSDefinitionExpression) {
-            final JSExpression referentExpression = ((JSDefinitionExpression) expression).getExpression();
-            final PsiReference reference          = (referentExpression == null) ? null : referentExpression.getReference();
-            final PsiElement variable           = (reference == null)          ? null : reference.resolve();
-
-            return ((variable != null && variable instanceof JSVariable) ? (JSVariable) variable : null);
-        } else {
-            return null;
-        }
-    }
-
-    @Nullable public static JSFunction resolveMethod(JSCallExpression expression) {
-        final JSExpression methodExpression = (expression == null) ? null : expression.getMethodExpression();
-
-        if (methodExpression != null && methodExpression instanceof JSReferenceExpression) {
-            final PsiElement referent = ((JSReferenceExpression) methodExpression).resolve();
-
-            return ((referent != null && referent instanceof JSFunction) ? (JSFunction) referent : null);
-        }
-        return null;
-    }
-
-    public static boolean canBeMerged(JSStatement statement1,
-                                      JSStatement statement2) {
-        if (!ControlFlowUtils.statementMayCompleteNormally(statement1)) {
-            return false;
-        }
-        final Set<String> statement1Declarations = calculateTopLevelDeclarations(statement1);
-        if (containsConflictingDeclarations(statement1Declarations, statement2)) {
-            return false;
-        }
-        final Set<String> statement2Declarations = calculateTopLevelDeclarations(statement2);
-        return (!containsConflictingDeclarations(statement2Declarations, statement1));
-    }
-
-    public static boolean isInLoopStatementBody(@Nonnull PsiElement element) {
-        final JSLoopStatement forStatement = PsiTreeUtil.getParentOfType(element, JSLoopStatement.class);
-
-        if (forStatement == null) {
-            return false;
-        }
-
-        final JSStatement body = forStatement.getBody();
-
-        return (body != null && PsiTreeUtil.isAncestor(body, element, true));
-    }
-
-    @Nonnull
-	public static List<JSCallExpression> getRecursiveCalls(@Nonnull JSFunction function) {
-        final RecursiveCallVisitor recursiveCallVisitor = new RecursiveCallVisitor(function);
-
-        function.accept(recursiveCallVisitor);
-        return recursiveCallVisitor.getCalls();
-    }
-
-    private static boolean containsConflictingDeclarations(Set<String>  declarations,
-                                                           JSStatement statement) {
-        final DeclarationUtils.DeclarationConflictVisitor visitor =
-                new DeclarationUtils.DeclarationConflictVisitor(declarations);
-        statement.accept(visitor);
-        return visitor.hasConflict();
-    }
-
-    public static boolean containsConflictingDeclarations(
-            JSBlockStatement block, JSBlockStatement parentBlock) {
-        final JSStatement[]   statements   = block.getStatements();
-        final Set<JSVariable> declaredVars = new HashSet<JSVariable>();
-
-        for (final JSStatement statement : statements) {
-            if (statement instanceof JSVarStatement) {
-                final JSVarStatement declaration = (JSVarStatement) statement;
-
-                for (final JSVariable var : declaration.getVariables()) {
-                    declaredVars.add(var);
-                }
-            }
-        }
-
-        for (final JSVariable variable : declaredVars) {
-            if (conflictingDeclarationExists(variable.getName(), parentBlock, block)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private static boolean conflictingDeclarationExists(
-            String           name,
-            JSBlockStatement parentBlock,
-            JSBlockStatement exceptBlock) {
-        final ConflictingDeclarationVisitor visitor = new ConflictingDeclarationVisitor(name, exceptBlock);
-        parentBlock.accept(visitor);
-        return visitor.hasConflictingDeclaration();
-    }
-
-    private static Set<String> calculateTopLevelDeclarations(JSStatement statement) {
-        final Set<String> out = new HashSet<String>();
-
-        if (statement instanceof JSVarStatement) {
-            addDeclarations((JSVarStatement) statement, out);
-        } else if (statement instanceof JSBlockStatement) {
-            for (JSStatement subStatement : ((JSBlockStatement) statement).getStatements()) {
-                if (subStatement instanceof JSVarStatement) {
-                    addDeclarations((JSVarStatement) subStatement, out);
-                }
-            }
-        }
-        return out;
-    }
-
-    private static void addDeclarations(JSVarStatement statement,
-                                        Set<String>    declaredVars) {
-        for (final JSVariable variable : statement.getVariables()) {
-            declaredVars.add(variable.getName());
-        }
-    }
-
-    public static void appendStatementsInSequence(StringBuilder  buffer,
-                                                  JSStatement    statement1,
-                                                  JSStatement    statement2) {
-        if (statement1 == null) {
-            buffer.append(' ')
-                  .append(statement2.getText());
-        } else if (statement2 == null) {
-            buffer.append(' ')
-                  .append(statement1.getText());
-        } else {
-            buffer.append('{');
-            appendStatementStripped(buffer, statement1);
-            appendStatementStripped(buffer, statement2);
-            buffer.append('}');
-        }
-    }
-
-    private static void appendStatementStripped(StringBuilder buffer, JSStatement statement) {
-        if (statement instanceof JSBlockStatement) {
-            for (PsiElement child : statement.getChildren()) {
-                buffer.append(child.getText());
-            }
-        } else {
-            buffer.append(statement.getText());
-        }
-    }
-
-    private static class BreakTargetFinder extends JSRecursiveElementVisitor {
-        private boolean           found;
-        private final JSStatement target;
-
-        private BreakTargetFinder(JSStatement target) {
-            this.target = target;
-        }
-
-        private boolean breakFound() {
-            return this.found;
-        }
-
-        @Override public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpression) {}
-
-        @Override public void visitJSBreakStatement(JSBreakStatement breakStatement) {
-            super.visitJSBreakStatement(breakStatement);
-            final JSStatement exitedStatement = breakStatement.getStatementToBreak();
-            if (exitedStatement == null) {
-                return;
-            }
-            this.found = (exitedStatement.equals(this.target));
-        }
-    }
-
-    private static class ContinueTargetFinder extends JSRecursiveElementVisitor {
-        private boolean           found;
-        private final JSStatement target;
-
-        private ContinueTargetFinder(JSStatement target) {
-            this.target = target;
-        }
-
-        private boolean continueFound() {
-            return this.found;
-        }
-
-        @Override public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpression) {}
-
-        @Override public void visitJSContinueStatement(JSContinueStatement continueStatement) {
-            super.visitJSContinueStatement(continueStatement);
-            final JSStatement statement = continueStatement.getStatementToContinue();
-            if (statement == null) {
-                return;
-            }
-            this.found = (statement.equals(this.target));
-        }
-    }
-
-    private static class ExitingBreakFinder extends JSRecursiveElementVisitor {
-        private boolean found;
-
-        private ExitingBreakFinder() {}
-
-        private boolean breakFound() {
-            return this.found;
-        }
-
-        @Override public void visitJSReferenceExpression(JSReferenceExpression exp) {}
-
-        @Override public void visitJSBreakStatement(JSBreakStatement breakStatement) {
-            if (breakStatement.getLabel() != null) {
-                return;
-            }
-            this.found = true;
-        }
-
-        @Override public void visitJSDoWhileStatement(JSDoWhileStatement statement) {
-            // don't drill down
-        }
-
-        @Override public void visitJSForStatement(JSForStatement statement) {
-            // don't drill down
-        }
-
-        @Override public void visitJSForInStatement(JSForInStatement statement) {
-            // don't drill down
-        }
-
-        @Override public void visitJSWhileStatement(JSWhileStatement statement) {
-            // don't drill down
-        }
-
-        @Override public void visitJSSwitchStatement(JSSwitchStatement statement) {
-            // don't drill down
-        }
-    }
-
-    private static class ReturnFinder extends JSRecursiveElementVisitor {
-        private boolean found;
-
-        private ReturnFinder() {}
-
-        private boolean returnFound() {
-            return this.found;
-        }
-
-        @Override public void visitJSReturnStatement(JSReturnStatement returnStatement) {
-            this.found = true;
-        }
-    }
-
-    private static class ConflictingDeclarationVisitor extends JSRecursiveElementVisitor {
-
-        private final String           variableName;
-        private final JSBlockStatement exceptBlock;
-        private       boolean          hasConflictingDeclaration;
-
-        ConflictingDeclarationVisitor(String           variableName,
-                                      JSBlockStatement exceptBlock) {
-            this.variableName = variableName;
-            this.exceptBlock  = exceptBlock;
-        }
-
-        @Override public void visitJSElement(JSElement element) {
-            if (!this.hasConflictingDeclaration) {
-                super.visitJSElement(element);
-            }
-        }
-
-        @Override public void visitJSBlock(JSBlockStatement block) {
-            if (!(this.hasConflictingDeclaration ||
-                  block.equals(this.exceptBlock))) {
-                super.visitJSBlock(block);
-            }
-        }
-
-        @Override public void visitJSVariable(JSVariable variable) {
-            if (!this.hasConflictingDeclaration) {
-                super.visitJSVariable(variable);
-                final String name = variable.getName();
-                this.hasConflictingDeclaration = (name != null && name.equals(this.variableName));
-            }
-        }
-
-        public boolean hasConflictingDeclaration() {
-            return this.hasConflictingDeclaration;
-        }
-    }
-
-    private static class RecursiveCallVisitor extends JSRecursiveElementVisitor {
-
-        private final JSFunction       function;
-        private List<JSCallExpression> recursionReturns;
-
-        RecursiveCallVisitor(JSFunction function) {
-            this.function         = function;
-            this.recursionReturns = new ArrayList<JSCallExpression>();
-        }
-
-        @Override public void visitJSCallExpression(JSCallExpression callExpression) {
-            super.visitJSCallExpression(callExpression);
-
-            final JSExpression methodExpression = callExpression.getMethodExpression();
-
-            if (methodExpression == null || !(methodExpression instanceof JSReferenceExpression)) {
-                return;
-            }
-
-            final JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(callExpression, JSReturnStatement.class);
-
-            if (returnStatement == null) {
-                return;
-            }
-
-            final PsiElement calledFunction = ((JSReferenceExpression) methodExpression).resolve();
-
-            if (calledFunction == null ||
-                (!(calledFunction instanceof JSFunction) || !calledFunction.equals(this.function))) {
-                return;
-            }
-
-
-            this.recursionReturns.add(callExpression);
-        }
-
-        public List<JSCallExpression> getCalls() {
-            return this.recursionReturns;
-        }
-    }
+public class ControlFlowUtils
+{
+	private ControlFlowUtils()
+	{
+	}
+
+	public static boolean statementMayCompleteNormally(@Nullable JSStatement statement)
+	{
+		if(statement == null ||
+				statement instanceof JSBreakStatement ||
+				statement instanceof JSContinueStatement ||
+				statement instanceof JSReturnStatement ||
+				statement instanceof JSThrowStatement ||
+				statement instanceof JSWithStatement)
+		{
+			return false;
+		}
+		else if(statement instanceof JSExpressionStatement ||
+				statement instanceof JSEmptyStatement ||
+				statement instanceof JSVarStatement)
+		{
+			return true;
+		}
+		else if(statement instanceof JSForStatement)
+		{
+			final JSForStatement loopStatement = (JSForStatement) statement;
+			final JSExpression condition = loopStatement.getCondition();
+
+			return (condition != null && !isBooleanConstant(condition, false) ||
+					statementIsBreakTarget(loopStatement));
+		}
+		else if(statement instanceof JSForInStatement)
+		{
+			return (statementIsBreakTarget(statement));
+		}
+		else if(statement instanceof JSWhileStatement)
+		{
+			final JSWhileStatement loopStatement = (JSWhileStatement) statement;
+
+			return (!isBooleanConstant(loopStatement.getCondition(), true) ||
+					statementIsBreakTarget(loopStatement));
+		}
+		else if(statement instanceof JSDoWhileStatement)
+		{
+			final JSDoWhileStatement loopStatement = (JSDoWhileStatement) statement;
+
+			return (statementMayCompleteNormally(loopStatement.getBody()) &&
+					(!isBooleanConstant(loopStatement.getCondition(), true) ||
+							statementIsBreakTarget(loopStatement)));
+		}
+		else if(statement instanceof JSBlockStatement)
+		{
+			return codeBlockMayCompleteNormally(((JSBlockStatement) statement).getStatements());
+		}
+		else if(statement instanceof JSLabeledStatement)
+		{
+			final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
+			final JSStatement body = labeledStatement.getStatement();
+
+			return (statementMayCompleteNormally(body) || statementIsBreakTarget(body));
+		}
+		else if(statement instanceof JSIfStatement)
+		{
+			final JSIfStatement ifStatement = (JSIfStatement) statement;
+			final JSStatement thenBranch = ifStatement.getThen();
+			final JSStatement elseBranch = ifStatement.getElse();
+
+			return (elseBranch == null ||
+					statementMayCompleteNormally(thenBranch) ||
+					statementMayCompleteNormally(elseBranch));
+		}
+		else if(statement instanceof JSTryStatement)
+		{
+			final JSTryStatement tryStatement = (JSTryStatement) statement;
+
+			if(!statementMayCompleteNormally(tryStatement.getFinallyStatement()))
+			{
+				return false;
+			}
+			if(statementMayCompleteNormally(tryStatement.getStatement()))
+			{
+				return true;
+			}
+
+			final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+
+			return (catchBlock != null && statementMayCompleteNormally(catchBlock.getStatement()));
+		}
+		else if(statement instanceof JSSwitchStatement)
+		{
+			final JSSwitchStatement switchStatement = (JSSwitchStatement) statement;
+
+			if(statementIsBreakTarget(switchStatement))
+			{
+				return true;
+			}
+
+			for(JSCaseClause caseClause : switchStatement.getCaseClauses())
+			{
+				if(!codeBlockMayCompleteNormally(caseClause.getStatements()))
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	public static boolean codeBlockMayCompleteNormally(@Nullable JSStatement[] statements)
+	{
+		if(statements != null)
+		{
+			for(final JSStatement statement : statements)
+			{
+				if(!statementMayCompleteNormally(statement))
+				{
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	@SuppressWarnings({"UnnecessaryUnboxing"})
+	private static boolean isBooleanConstant(JSExpression test, boolean val)
+	{
+		if(!ExpressionUtil.isConstantExpression(test))
+		{
+			return false;
+		}
+		final Object value = ExpressionUtil.computeConstantExpression(test);
+		return (value != null &&
+				value instanceof Boolean &&
+				((Boolean) value).booleanValue() == val);
+	}
+
+	private static boolean statementIsBreakTarget(@Nullable JSStatement statement)
+	{
+		if(statement == null)
+		{
+			return false;
+		}
+
+		final BreakTargetFinder breakFinder = new BreakTargetFinder(statement);
+
+		statement.accept(breakFinder);
+		return breakFinder.breakFound();
+	}
+
+	public static boolean statementContainsExitingBreak(@Nullable JSStatement statement)
+	{
+		if(statement == null)
+		{
+			return false;
+		}
+
+		final ExitingBreakFinder breakFinder = new ExitingBreakFinder();
+
+		statement.accept(breakFinder);
+		return breakFinder.breakFound();
+	}
+
+	public static boolean statementIsContinueTarget(@Nullable JSStatement statement)
+	{
+		if(statement == null)
+		{
+			return false;
+		}
+
+		final ContinueTargetFinder continueFinder = new ContinueTargetFinder(statement);
+
+		statement.accept(continueFinder);
+		return continueFinder.continueFound();
+	}
+
+	public static boolean statementContainsReturn(@Nullable JSStatement statement)
+	{
+		if(statement == null)
+		{
+			return false;
+		}
+
+		final ReturnFinder returnFinder = new ReturnFinder();
+
+		statement.accept(returnFinder);
+		return returnFinder.returnFound();
+	}
+
+	public static boolean statementCompletesWithStatement(
+			@Nonnull JSStatement containingStatement,
+			@Nonnull JSStatement statement)
+	{
+		JSElement statementToCheck = statement;
+
+		while(true)
+		{
+			if(statementToCheck.equals(containingStatement))
+			{
+				return true;
+			}
+
+			final JSStatement container = PsiTreeUtil.getParentOfType(statementToCheck, JSStatement.class);
+
+			if(container == null)
+			{
+				return false;
+			}
+			if(container instanceof JSBlockStatement)
+			{
+				if(!statementIsLastInBlock((JSBlockStatement) container,
+						(JSStatement) statementToCheck))
+				{
+					return false;
+				}
+			}
+			if(container instanceof JSLoopStatement)
+			{
+				return false;
+			}
+			statementToCheck = container;
+		}
+	}
+
+	private static boolean elementCompletesWithStatement(
+			@Nonnull JSElement element,
+			@Nonnull JSStatement statement)
+	{
+		PsiElement statementToCheck = statement;
+
+		while(true)
+		{
+			if(statementToCheck == null)
+			{
+				return false;
+			}
+			if(statementToCheck.equals(element))
+			{
+				return true;
+			}
+
+			final JSElement container = PsiTreeUtil.getParentOfType(statementToCheck, JSElement.class);
+
+			if(container == null || container instanceof JSLoopStatement)
+			{
+				return false;
+			}
+
+			if(container instanceof JSBlockStatement)
+			{
+				if(!statementIsLastInBlock((JSBlockStatement) container,
+						(JSStatement) statementToCheck))
+				{
+					return false;
+				}
+				if(container.equals(element))
+				{
+					return true;
+				}
+				statementToCheck = PsiTreeUtil.getParentOfType(container, JSStatement.class, JSFunction.class);
+			}
+			else
+			{
+				statementToCheck = container;
+			}
+		}
+	}
+
+	public static boolean functionCompletesWithStatement(
+			@Nonnull JSFunction function,
+			@Nonnull JSStatement statement)
+	{
+		return elementCompletesWithStatement(function, statement);
+	}
+
+	public static boolean blockCompletesWithStatement(
+			@Nonnull JSBlockStatement block,
+			@Nonnull JSStatement statement)
+	{
+		return elementCompletesWithStatement(block, statement);
+	}
+
+	private static boolean statementIsLastInBlock(
+			@Nonnull JSBlockStatement block, @Nonnull JSStatement statement)
+	{
+		final JSStatement[] statements = block.getStatements();
+
+		//noinspection ForLoopWithMissingComponent
+		for(int index = statements.length; --index >= 0; )
+		{
+			final JSStatement childStatement = statements[index];
+
+			if(statement.equals(childStatement))
+			{
+				return true;
+			}
+			if(!(statement instanceof JSEmptyStatement))
+			{
+				return false;
+			}
+		}
+		return false;
+	}
+
+	@Nullable
+	public static JSVariable resolveVariable(@Nullable JSExpression expression)
+	{
+		if(expression == null)
+		{
+			return null;
+		}
+		else if(expression instanceof JSReferenceExpression)
+		{
+			final PsiElement variable = ((JSReferenceExpression) expression).resolve();
+
+			return ((variable != null && variable instanceof JSVariable) ? (JSVariable) variable : null);
+		}
+		else if(expression instanceof JSDefinitionExpression)
+		{
+			final JSExpression referentExpression = ((JSDefinitionExpression) expression).getExpression();
+			final PsiReference reference = (referentExpression == null) ? null : referentExpression.getReference();
+			final PsiElement variable = (reference == null) ? null : reference.resolve();
+
+			return ((variable != null && variable instanceof JSVariable) ? (JSVariable) variable : null);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	@Nullable
+	public static JSFunction resolveMethod(JSCallExpression expression)
+	{
+		final JSExpression methodExpression = (expression == null) ? null : expression.getMethodExpression();
+
+		if(methodExpression != null && methodExpression instanceof JSReferenceExpression)
+		{
+			final PsiElement referent = ((JSReferenceExpression) methodExpression).resolve();
+
+			return ((referent != null && referent instanceof JSFunction) ? (JSFunction) referent : null);
+		}
+		return null;
+	}
+
+	public static boolean canBeMerged(JSStatement statement1,
+									  JSStatement statement2)
+	{
+		if(!ControlFlowUtils.statementMayCompleteNormally(statement1))
+		{
+			return false;
+		}
+		final Set<String> statement1Declarations = calculateTopLevelDeclarations(statement1);
+		if(containsConflictingDeclarations(statement1Declarations, statement2))
+		{
+			return false;
+		}
+		final Set<String> statement2Declarations = calculateTopLevelDeclarations(statement2);
+		return (!containsConflictingDeclarations(statement2Declarations, statement1));
+	}
+
+	public static boolean isInLoopStatementBody(@Nonnull PsiElement element)
+	{
+		final JSLoopStatement forStatement = PsiTreeUtil.getParentOfType(element, JSLoopStatement.class);
+
+		if(forStatement == null)
+		{
+			return false;
+		}
+
+		final JSStatement body = forStatement.getBody();
+
+		return (body != null && PsiTreeUtil.isAncestor(body, element, true));
+	}
+
+	@Nonnull
+	public static List<JSCallExpression> getRecursiveCalls(@Nonnull JSFunction function)
+	{
+		final RecursiveCallVisitor recursiveCallVisitor = new RecursiveCallVisitor(function);
+
+		function.accept(recursiveCallVisitor);
+		return recursiveCallVisitor.getCalls();
+	}
+
+	private static boolean containsConflictingDeclarations(Set<String> declarations,
+														   JSStatement statement)
+	{
+		final DeclarationUtils.DeclarationConflictVisitor visitor =
+				new DeclarationUtils.DeclarationConflictVisitor(declarations);
+		statement.accept(visitor);
+		return visitor.hasConflict();
+	}
+
+	public static boolean containsConflictingDeclarations(
+			JSBlockStatement block, JSBlockStatement parentBlock)
+	{
+		final JSStatement[] statements = block.getStatements();
+		final Set<JSVariable> declaredVars = new HashSet<JSVariable>();
+
+		for(final JSStatement statement : statements)
+		{
+			if(statement instanceof JSVarStatement)
+			{
+				final JSVarStatement declaration = (JSVarStatement) statement;
+
+				for(final JSVariable var : declaration.getVariables())
+				{
+					declaredVars.add(var);
+				}
+			}
+		}
+
+		for(final JSVariable variable : declaredVars)
+		{
+			if(conflictingDeclarationExists(variable.getName(), parentBlock, block))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private static boolean conflictingDeclarationExists(
+			String name,
+			JSBlockStatement parentBlock,
+			JSBlockStatement exceptBlock)
+	{
+		final ConflictingDeclarationVisitor visitor = new ConflictingDeclarationVisitor(name, exceptBlock);
+		parentBlock.accept(visitor);
+		return visitor.hasConflictingDeclaration();
+	}
+
+	private static Set<String> calculateTopLevelDeclarations(JSStatement statement)
+	{
+		final Set<String> out = new HashSet<String>();
+
+		if(statement instanceof JSVarStatement)
+		{
+			addDeclarations((JSVarStatement) statement, out);
+		}
+		else if(statement instanceof JSBlockStatement)
+		{
+			for(JSStatement subStatement : ((JSBlockStatement) statement).getStatements())
+			{
+				if(subStatement instanceof JSVarStatement)
+				{
+					addDeclarations((JSVarStatement) subStatement, out);
+				}
+			}
+		}
+		return out;
+	}
+
+	private static void addDeclarations(JSVarStatement statement,
+										Set<String> declaredVars)
+	{
+		for(final JSVariable variable : statement.getVariables())
+		{
+			declaredVars.add(variable.getName());
+		}
+	}
+
+	public static void appendStatementsInSequence(StringBuilder buffer,
+												  JSStatement statement1,
+												  JSStatement statement2)
+	{
+		if(statement1 == null)
+		{
+			buffer.append(' ')
+					.append(statement2.getText());
+		}
+		else if(statement2 == null)
+		{
+			buffer.append(' ')
+					.append(statement1.getText());
+		}
+		else
+		{
+			buffer.append('{');
+			appendStatementStripped(buffer, statement1);
+			appendStatementStripped(buffer, statement2);
+			buffer.append('}');
+		}
+	}
+
+	private static void appendStatementStripped(StringBuilder buffer, JSStatement statement)
+	{
+		if(statement instanceof JSBlockStatement)
+		{
+			for(PsiElement child : statement.getChildren())
+			{
+				buffer.append(child.getText());
+			}
+		}
+		else
+		{
+			buffer.append(statement.getText());
+		}
+	}
+
+	private static class BreakTargetFinder extends JSRecursiveElementVisitor
+	{
+		private boolean found;
+		private final JSStatement target;
+
+		private BreakTargetFinder(JSStatement target)
+		{
+			this.target = target;
+		}
+
+		private boolean breakFound()
+		{
+			return this.found;
+		}
+
+		@Override
+		public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpression)
+		{
+		}
+
+		@Override
+		public void visitJSBreakStatement(JSBreakStatement breakStatement)
+		{
+			super.visitJSBreakStatement(breakStatement);
+			final JSStatement exitedStatement = breakStatement.getStatementToBreak();
+			if(exitedStatement == null)
+			{
+				return;
+			}
+			this.found = (exitedStatement.equals(this.target));
+		}
+	}
+
+	private static class ContinueTargetFinder extends JSRecursiveElementVisitor
+	{
+		private boolean found;
+		private final JSStatement target;
+
+		private ContinueTargetFinder(JSStatement target)
+		{
+			this.target = target;
+		}
+
+		private boolean continueFound()
+		{
+			return this.found;
+		}
+
+		@Override
+		public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpression)
+		{
+		}
+
+		@Override
+		public void visitJSContinueStatement(JSContinueStatement continueStatement)
+		{
+			super.visitJSContinueStatement(continueStatement);
+			final JSStatement statement = continueStatement.getStatementToContinue();
+			if(statement == null)
+			{
+				return;
+			}
+			this.found = (statement.equals(this.target));
+		}
+	}
+
+	private static class ExitingBreakFinder extends JSRecursiveElementVisitor
+	{
+		private boolean found;
+
+		private ExitingBreakFinder()
+		{
+		}
+
+		private boolean breakFound()
+		{
+			return this.found;
+		}
+
+		@Override
+		public void visitJSReferenceExpression(JSReferenceExpression exp)
+		{
+		}
+
+		@Override
+		public void visitJSBreakStatement(JSBreakStatement breakStatement)
+		{
+			if(breakStatement.getLabel() != null)
+			{
+				return;
+			}
+			this.found = true;
+		}
+
+		@Override
+		public void visitJSDoWhileStatement(JSDoWhileStatement statement)
+		{
+			// don't drill down
+		}
+
+		@Override
+		public void visitJSForStatement(JSForStatement statement)
+		{
+			// don't drill down
+		}
+
+		@Override
+		public void visitJSForInStatement(JSForInStatement statement)
+		{
+			// don't drill down
+		}
+
+		@Override
+		public void visitJSWhileStatement(JSWhileStatement statement)
+		{
+			// don't drill down
+		}
+
+		@Override
+		public void visitJSSwitchStatement(JSSwitchStatement statement)
+		{
+			// don't drill down
+		}
+	}
+
+	private static class ReturnFinder extends JSRecursiveElementVisitor
+	{
+		private boolean found;
+
+		private ReturnFinder()
+		{
+		}
+
+		private boolean returnFound()
+		{
+			return this.found;
+		}
+
+		@Override
+		public void visitJSReturnStatement(JSReturnStatement returnStatement)
+		{
+			this.found = true;
+		}
+	}
+
+	private static class ConflictingDeclarationVisitor extends JSRecursiveElementVisitor
+	{
+
+		private final String variableName;
+		private final JSBlockStatement exceptBlock;
+		private boolean hasConflictingDeclaration;
+
+		ConflictingDeclarationVisitor(String variableName,
+									  JSBlockStatement exceptBlock)
+		{
+			this.variableName = variableName;
+			this.exceptBlock = exceptBlock;
+		}
+
+		@Override
+		public void visitJSElement(JSElement element)
+		{
+			if(!this.hasConflictingDeclaration)
+			{
+				super.visitJSElement(element);
+			}
+		}
+
+		@Override
+		public void visitJSBlock(JSBlockStatement block)
+		{
+			if(!(this.hasConflictingDeclaration ||
+					block.equals(this.exceptBlock)))
+			{
+				super.visitJSBlock(block);
+			}
+		}
+
+		@Override
+		public void visitJSVariable(JSVariable variable)
+		{
+			if(!this.hasConflictingDeclaration)
+			{
+				super.visitJSVariable(variable);
+				final String name = variable.getName();
+				this.hasConflictingDeclaration = (name != null && name.equals(this.variableName));
+			}
+		}
+
+		public boolean hasConflictingDeclaration()
+		{
+			return this.hasConflictingDeclaration;
+		}
+	}
+
+	private static class RecursiveCallVisitor extends JSRecursiveElementVisitor
+	{
+
+		private final JSFunction function;
+		private List<JSCallExpression> recursionReturns;
+
+		RecursiveCallVisitor(JSFunction function)
+		{
+			this.function = function;
+			this.recursionReturns = new ArrayList<JSCallExpression>();
+		}
+
+		@Override
+		public void visitJSCallExpression(JSCallExpression callExpression)
+		{
+			super.visitJSCallExpression(callExpression);
+
+			final JSExpression methodExpression = callExpression.getMethodExpression();
+
+			if(methodExpression == null || !(methodExpression instanceof JSReferenceExpression))
+			{
+				return;
+			}
+
+			final JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(callExpression, JSReturnStatement.class);
+
+			if(returnStatement == null)
+			{
+				return;
+			}
+
+			final PsiElement calledFunction = ((JSReferenceExpression) methodExpression).resolve();
+
+			if(calledFunction == null ||
+					(!(calledFunction instanceof JSFunction) || !calledFunction.equals(this.function)))
+			{
+				return;
+			}
+
+
+			this.recursionReturns.add(callExpression);
+		}
+
+		public List<JSCallExpression> getCalls()
+		{
+			return this.recursionReturns;
+		}
+	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
index 38381d61..1d1bcbd7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
@@ -20,144 +20,185 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class DeclarationUtils {
-    private DeclarationUtils() {}
-
-    public static void calculateVariablesDeclared(JSStatement statement,
-                                                  Set<String> variablesDeclaredAtTopLevel,
-                                                  Set<String> variablesDeclaredAtLowerLevels,
-                                                  boolean     isTopLevel) {
-        if (statement == null) {
-            return;
-        }
-
-        if (statement instanceof JSBreakStatement      ||
-            statement instanceof JSExpressionStatement ||
-            statement instanceof JSContinueStatement   ||
-            statement instanceof JSThrowStatement      ||
-            statement instanceof JSReturnStatement) {
-            // Nothing to do.
-        } else if (statement instanceof JSVarStatement) {
-            calculateVariablesDeclared((JSVarStatement) statement, variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels, isTopLevel);
-        } else if (statement instanceof JSForStatement) {
-            final JSForStatement loopStatement = (JSForStatement) statement;
-
-            calculateVariablesDeclared(loopStatement.getVarDeclaration(), variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels, false);
-            calculateVariablesDeclared(loopStatement.getBody(),           variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels, false);
-        } else if (statement instanceof JSWhileStatement) {
-            final JSWhileStatement loopStatement = (JSWhileStatement) statement;
-
-            calculateVariablesDeclared(loopStatement.getBody(), variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels, false);
-        } else if (statement instanceof JSDoWhileStatement) {
-            final JSDoWhileStatement loopStatement = (JSDoWhileStatement) statement;
-
-            calculateVariablesDeclared(loopStatement.getBody(), variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels, false);
-        } else if (statement instanceof JSBlockStatement) {
-            final JSBlockStatement block = (JSBlockStatement) statement;
-
-            calculateVariablesDeclared(block.getStatements(), variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels, false);
-        } else if (statement instanceof JSLabeledStatement) {
-            final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
-
-            calculateVariablesDeclared(labeledStatement.getStatement(), variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels, false);
-        } else if (statement instanceof JSIfStatement) {
-            final JSIfStatement ifStatement = (JSIfStatement) statement;
-            final JSStatement   thenBranch  = ifStatement.getThen();
-            final JSStatement   elseBranch  = ifStatement.getElse();
-
-            calculateVariablesDeclared(thenBranch, variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels, false);
-            calculateVariablesDeclared(elseBranch, variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels, false);
-        } else if (statement instanceof JSTryStatement) {
-            final JSTryStatement tryStatement = (JSTryStatement) statement;
-
-            calculateVariablesDeclared(tryStatement.getStatement(),
-                                       variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels,
-                                       false);
-            calculateVariablesDeclared(tryStatement.getFinallyStatement(),
-                                       variablesDeclaredAtTopLevel,
-                                       variablesDeclaredAtLowerLevels,
-                                       false);
-
-            final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
-
-            if (catchBlock != null) {
-                calculateVariablesDeclared(catchBlock.getStatement(),
-                                           variablesDeclaredAtTopLevel,
-                                           variablesDeclaredAtLowerLevels,
-                                           false);
-            }
-        } else if (statement instanceof JSSwitchStatement) {
-            final JSSwitchStatement switchStatement = (JSSwitchStatement) statement;
-
-            for (JSCaseClause caseClause : switchStatement.getCaseClauses()) {
-                calculateVariablesDeclared(caseClause.getStatements(), variablesDeclaredAtTopLevel,
-                                           variablesDeclaredAtLowerLevels, false);
-            }
-        }
-    }
-
-    private static void calculateVariablesDeclared(JSVarStatement statement,
-                                                   Set<String>    variablesDeclaredAtTopLevel,
-                                                   Set<String>    variablesDeclaredAtLowerLevels,
-                                                   boolean        isTopLevel) {
-        for (JSVariable variable : statement.getVariables()) {
-            final String variableName = variable.getName();
-
-            if (isTopLevel) {
-                variablesDeclaredAtTopLevel.add(variableName);
-            } else {
-                variablesDeclaredAtLowerLevels.add(variableName);
-            }
-        }
-    }
-
-    private static void calculateVariablesDeclared(JSStatement[] statements,
-                                                   Set<String>   variablesDeclaredAtTopLevel,
-                                                   Set<String>   variablesDeclaredAtLowerLevels,
-                                                   boolean       isTopLevel) {
-        if (statements != null) {
-            for (JSStatement statement : statements) {
-                calculateVariablesDeclared(statement,
-                                           variablesDeclaredAtTopLevel,
-                                           variablesDeclaredAtLowerLevels,
-                                           isTopLevel);
-            }
-        }
-    }
-
-    public static class DeclarationConflictVisitor extends JSRecursiveElementVisitor {
-        private final Set<String> declarations;
-        private       boolean     hasConflict;
-
-        public DeclarationConflictVisitor(Set<String> declarations) {
-            this.declarations = new HashSet<String>(declarations);
-        }
-
-        @Override public void visitJSVariable(JSVariable variable) {
-            super.visitJSVariable(variable);
-
-            final String name = variable.getName();
-
-            for (String declaration : this.declarations) {
-                if (declaration.equals(name)) {
-                    this.hasConflict = true;
-                    break;
-                }
-            }
-        }
-
-        public boolean hasConflict() {
-            return this.hasConflict;
-        }
-    }
+public class DeclarationUtils
+{
+	private DeclarationUtils()
+	{
+	}
+
+	public static void calculateVariablesDeclared(JSStatement statement,
+												  Set<String> variablesDeclaredAtTopLevel,
+												  Set<String> variablesDeclaredAtLowerLevels,
+												  boolean isTopLevel)
+	{
+		if(statement == null)
+		{
+			return;
+		}
+
+		if(statement instanceof JSBreakStatement ||
+				statement instanceof JSExpressionStatement ||
+				statement instanceof JSContinueStatement ||
+				statement instanceof JSThrowStatement ||
+				statement instanceof JSReturnStatement)
+		{
+			// Nothing to do.
+		}
+		else if(statement instanceof JSVarStatement)
+		{
+			calculateVariablesDeclared((JSVarStatement) statement, variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels, isTopLevel);
+		}
+		else if(statement instanceof JSForStatement)
+		{
+			final JSForStatement loopStatement = (JSForStatement) statement;
+
+			calculateVariablesDeclared(loopStatement.getVarDeclaration(), variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels, false);
+			calculateVariablesDeclared(loopStatement.getBody(), variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels, false);
+		}
+		else if(statement instanceof JSWhileStatement)
+		{
+			final JSWhileStatement loopStatement = (JSWhileStatement) statement;
+
+			calculateVariablesDeclared(loopStatement.getBody(), variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels, false);
+		}
+		else if(statement instanceof JSDoWhileStatement)
+		{
+			final JSDoWhileStatement loopStatement = (JSDoWhileStatement) statement;
+
+			calculateVariablesDeclared(loopStatement.getBody(), variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels, false);
+		}
+		else if(statement instanceof JSBlockStatement)
+		{
+			final JSBlockStatement block = (JSBlockStatement) statement;
+
+			calculateVariablesDeclared(block.getStatements(), variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels, false);
+		}
+		else if(statement instanceof JSLabeledStatement)
+		{
+			final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
+
+			calculateVariablesDeclared(labeledStatement.getStatement(), variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels, false);
+		}
+		else if(statement instanceof JSIfStatement)
+		{
+			final JSIfStatement ifStatement = (JSIfStatement) statement;
+			final JSStatement thenBranch = ifStatement.getThen();
+			final JSStatement elseBranch = ifStatement.getElse();
+
+			calculateVariablesDeclared(thenBranch, variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels, false);
+			calculateVariablesDeclared(elseBranch, variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels, false);
+		}
+		else if(statement instanceof JSTryStatement)
+		{
+			final JSTryStatement tryStatement = (JSTryStatement) statement;
+
+			calculateVariablesDeclared(tryStatement.getStatement(),
+					variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels,
+					false);
+			calculateVariablesDeclared(tryStatement.getFinallyStatement(),
+					variablesDeclaredAtTopLevel,
+					variablesDeclaredAtLowerLevels,
+					false);
+
+			final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+
+			if(catchBlock != null)
+			{
+				calculateVariablesDeclared(catchBlock.getStatement(),
+						variablesDeclaredAtTopLevel,
+						variablesDeclaredAtLowerLevels,
+						false);
+			}
+		}
+		else if(statement instanceof JSSwitchStatement)
+		{
+			final JSSwitchStatement switchStatement = (JSSwitchStatement) statement;
+
+			for(JSCaseClause caseClause : switchStatement.getCaseClauses())
+			{
+				calculateVariablesDeclared(caseClause.getStatements(), variablesDeclaredAtTopLevel,
+						variablesDeclaredAtLowerLevels, false);
+			}
+		}
+	}
+
+	private static void calculateVariablesDeclared(JSVarStatement statement,
+												   Set<String> variablesDeclaredAtTopLevel,
+												   Set<String> variablesDeclaredAtLowerLevels,
+												   boolean isTopLevel)
+	{
+		for(JSVariable variable : statement.getVariables())
+		{
+			final String variableName = variable.getName();
+
+			if(isTopLevel)
+			{
+				variablesDeclaredAtTopLevel.add(variableName);
+			}
+			else
+			{
+				variablesDeclaredAtLowerLevels.add(variableName);
+			}
+		}
+	}
+
+	private static void calculateVariablesDeclared(JSStatement[] statements,
+												   Set<String> variablesDeclaredAtTopLevel,
+												   Set<String> variablesDeclaredAtLowerLevels,
+												   boolean isTopLevel)
+	{
+		if(statements != null)
+		{
+			for(JSStatement statement : statements)
+			{
+				calculateVariablesDeclared(statement,
+						variablesDeclaredAtTopLevel,
+						variablesDeclaredAtLowerLevels,
+						isTopLevel);
+			}
+		}
+	}
+
+	public static class DeclarationConflictVisitor extends JSRecursiveElementVisitor
+	{
+		private final Set<String> declarations;
+		private boolean hasConflict;
+
+		public DeclarationConflictVisitor(Set<String> declarations)
+		{
+			this.declarations = new HashSet<String>(declarations);
+		}
+
+		@Override
+		public void visitJSVariable(JSVariable variable)
+		{
+			super.visitJSVariable(variable);
+
+			final String name = variable.getName();
+
+			for(String declaration : this.declarations)
+			{
+				if(declaration.equals(name))
+				{
+					this.hasConflict = true;
+					break;
+				}
+			}
+		}
+
+		public boolean hasConflict()
+		{
+			return this.hasConflict;
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
index 049e3fd3..e3ec9489 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
@@ -15,662 +15,782 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import consulo.javascript.language.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.*;
-import consulo.language.psi.PsiElement;
+import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 
-public class EquivalenceChecker {
-
-    private EquivalenceChecker() {}
-
-    private static final int THIS_EXPRESSION                  =  0;
-    private static final int LITERAL_EXPRESSION               =  1;
-    private static final int CLASS_OBJECT_EXPRESSION          =  2;
-    private static final int REFERENCE_EXPRESSION             =  3;
-    private static final int SUPER_EXPRESSION                 =  4;
-    private static final int CALL_EXPRESSION                  =  5;
-    private static final int NEW_EXPRESSION                   =  6;
-    private static final int ARRAY_LITERAL_EXPRESSION         =  7;
-    private static final int PREFIX_EXPRESSION                =  8;
-    private static final int POSTFIX_EXPRESSION               =  9;
-    private static final int ASSIGNMENT_EXPRESSION            = 10;
-    private static final int BINARY_EXPRESSION                = 11;
-    private static final int CONDITIONAL_EXPRESSION           = 12;
-    private static final int INDEX_PROPERTY_ACCESS_EXPRESSION = 13;
-    private static final int OBJECT_LITERAL_EXPRESSION        = 14;
-    private static final int FUNCTION_EXPRESSION              = 15;
-    private static final int DEFINITION_EXPRESSION            = 16;
-
-    private static final int BLOCK_STATEMENT                  =  0;
-    private static final int BREAK_STATEMENT                  =  1;
-    private static final int CONTINUE_STATEMENT               =  2;
-    private static final int VAR_STATEMENT                    =  3;
-    private static final int DO_WHILE_STATEMENT               =  4;
-    private static final int EMPTY_STATEMENT                  =  5;
-    private static final int EXPRESSION_STATEMENT             =  6;
-    private static final int FOR_STATEMENT                    =  7;
-    private static final int FOR_IN_STATEMENT                 =  8;
-    private static final int IF_STATEMENT                     =  9;
-    private static final int LABELED_STATEMENT                = 10;
-    private static final int RETURN_STATEMENT                 = 11;
-    private static final int SWITCH_STATEMENT                 = 12;
-    private static final int THROW_STATEMENT                  = 13;
-    private static final int TRY_STATEMENT                    = 14;
-    private static final int WHILE_STATEMENT                  = 15;
-    private static final int WITH_STATEMENT                   = 16;
-
-    public static boolean statementsAreEquivalent(JSStatement exp1,
-                                                  JSStatement exp2) {
-        if (exp1 == null && exp2 == null) {
-            return true;
-        }
-
-        if (exp1 == null || exp2 == null) {
-            return false;
-        }
-
-        final int type1 = getStatementType(exp1);
-        final int type2 = getStatementType(exp2);
-
-        if (type1 != type2) {
-            return false;
-        }
-
-        switch (type1) {
-            case BLOCK_STATEMENT:
-                return codeBlocksAreEquivalent((JSBlockStatement) exp1,
-                                               (JSBlockStatement) exp2);
-            case BREAK_STATEMENT:
-                return breakStatementsAreEquivalent((JSBreakStatement) exp1,
-                                                    (JSBreakStatement) exp2);
-            case CONTINUE_STATEMENT:
-                return continueStatementsAreEquivalent((JSContinueStatement) exp1,
-                                                       (JSContinueStatement) exp2);
-            case VAR_STATEMENT:
-                return declarationStatementsAreEquivalent((JSVarStatement) exp1,
-                                                          (JSVarStatement) exp2);
-            case DO_WHILE_STATEMENT:
-                return doWhileStatementsAreEquivalent((JSDoWhileStatement) exp1,
-                                                      (JSDoWhileStatement) exp2);
-            case EMPTY_STATEMENT:
-                return true;
-            case EXPRESSION_STATEMENT:
-                return expressionStatementsAreEquivalent((JSExpressionStatement) exp1,
-                                                         (JSExpressionStatement) exp2);
-            case FOR_STATEMENT:
-                return forStatementsAreEquivalent((JSForStatement) exp1,
-                                                  (JSForStatement) exp2);
-            case FOR_IN_STATEMENT:
-                return forInStatementsAreEquivalent((JSForInStatement) exp1,
-                                                    (JSForInStatement) exp2);
-            case IF_STATEMENT:
-                return ifStatementsAreEquivalent((JSIfStatement) exp1,
-                                                 (JSIfStatement) exp2);
-            case LABELED_STATEMENT:
-                return labeledStatementsAreEquivalent((JSLabeledStatement) exp1,
-                                                      (JSLabeledStatement) exp2);
-            case RETURN_STATEMENT:
-                return returnStatementsAreEquivalent((JSReturnStatement) exp1,
-                                                     (JSReturnStatement) exp2);
-            case SWITCH_STATEMENT:
-                return switchStatementsAreEquivalent((JSSwitchStatement) exp1,
-                                                     (JSSwitchStatement) exp2);
-            case THROW_STATEMENT:
-                return throwStatementsAreEquivalent((JSThrowStatement) exp1,
-                                                    (JSThrowStatement) exp2);
-            case TRY_STATEMENT:
-                return tryStatementsAreEquivalent((JSTryStatement) exp1,
-                                                  (JSTryStatement) exp2);
-            case WHILE_STATEMENT:
-                return whileStatementsAreEquivalent((JSWhileStatement) exp1,
-                                                    (JSWhileStatement) exp2);
-            case WITH_STATEMENT:
-                return withStatementsAreEquivalent((JSWithStatement) exp1,
-                                                   (JSWithStatement) exp2);
-            default:
-                return false;
-        }
-    }
-
-    private static boolean declarationStatementsAreEquivalent(JSVarStatement statement1,
-                                                              JSVarStatement statement2) {
-        if (statement1 == null || statement2 == null) return statement1 == statement2;
-        JSVariable[] vars1 = statement1.getVariables();
-        JSVariable[] vars2 = statement2.getVariables();
-
-        if (vars1.length == vars2.length) {
-            for (int index = 0; index < vars2.length; index++) {
-                if (!localVariableAreEquivalent(vars1[index], vars2[index])) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private static boolean tryStatementsAreEquivalent(JSTryStatement statement1,
-                                                      JSTryStatement statement2) {
-        if (!statementsAreEquivalent(statement1.getStatement(),
-                                     statement2.getStatement())) {
-            return false;
-        }
-        if (!statementsAreEquivalent(statement1.getFinallyStatement(),
-                                     statement2.getFinallyStatement())) {
-            return false;
-        }
-        JSCatchBlock catchBlock1 = statement1.getCatchBlock();
-        JSCatchBlock catchBlock2 = statement2.getCatchBlock();
-        if (catchBlock1 == null) {
-            return (catchBlock2 == null);
-        } else if (catchBlock2 == null) {
-            return false;
-        }
-
-        if (!parametersAreEquivalent(catchBlock1.getParameter(),
-                                     catchBlock2.getParameter())) {
-            return false;
-        }
-        return statementsAreEquivalent(catchBlock1.getStatement(),
-                                       catchBlock2.getStatement());
-    }
-
-    private static boolean localVariableAreEquivalent(JSVariable var1,
-                                                      JSVariable var2) {
-        return (expressionsAreEquivalent(var1.getInitializer(), var2.getInitializer()) &&
-                typesAreEquivalent      (var1.getType(),        var2.getType())        &&
-                areEqual                (var1.getName(),        var2.getName()));
-    }
-
-    private static boolean parametersAreEquivalent(JSParameter parameter1,
-                                                   JSParameter parameter2) {
-        return (typesAreEquivalent(parameter1.getType(), parameter2.getType())        &&
-                areEqual          (parameter1.getName(), parameter2.getName()));
-    }
-
-    private static boolean typesAreEquivalent(JavaScriptType type1, JavaScriptType type2) {
-        return areEqual(type1, type2);
-    }
-
-    private static boolean whileStatementsAreEquivalent(JSWhileStatement statement1,
-                                                        JSWhileStatement statement2) {
-        return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
-                statementsAreEquivalent (statement1.getBody(),      statement2.getBody()));
-    }
-
-    private static boolean forStatementsAreEquivalent(JSForStatement statement1,
-                                                      JSForStatement statement2) {
-        return (expressionsAreEquivalent(statement1.getCondition(),      statement2.getCondition())      &&
-                expressionsAreEquivalent(statement1.getInitialization(), statement2.getInitialization()) &&
-                expressionsAreEquivalent(statement1.getUpdate(),         statement2.getUpdate())         &&
-                statementsAreEquivalent (statement1.getBody(),           statement2.getBody()));
-    }
-
-    private static boolean forInStatementsAreEquivalent(JSForInStatement statement1,
-                                                        JSForInStatement statement2) {
-        return (expressionsAreEquivalent          (statement1.getCollectionExpression(), statement2.getCollectionExpression()) &&
-                expressionsAreEquivalent          (statement1.getVariableExpression(), statement2.getVariableExpression()) &&
-                declarationStatementsAreEquivalent(statement1.getDeclarationStatement(), statement2.getDeclarationStatement()) &&
-                statementsAreEquivalent           (statement1.getBody(),                 statement2.getBody()));
-    }
-
-    private static boolean switchStatementsAreEquivalent(JSSwitchStatement statement1,
-                                                         JSSwitchStatement statement2) {
-        if (!expressionsAreEquivalent(statement1.getSwitchExpression(),
-                                      statement2.getSwitchExpression())) {
-            return false;
-        }
-
-        final JSCaseClause[] caseClauses1 = statement1.getCaseClauses();
-        final JSCaseClause[] caseClauses2 = statement2.getCaseClauses();
-
-        if (caseClauses1.length != caseClauses2.length) {
-            return false;
-        }
-
-        for (int index = 0; index < caseClauses1.length; index++) {
-           if (!caseClausesAreEquivalent(caseClauses1[index], caseClauses2[index])) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private static boolean caseClausesAreEquivalent(JSCaseClause caseClause1, JSCaseClause caseClause2) {
-        if (caseClause1.isDefault() != caseClause2.isDefault()) {
-            return false;
-        }
-        if (!expressionsAreEquivalent(caseClause1.getCaseExpression(), caseClause2.getCaseExpression())) {
-            return false;
-        }
-
-        final JSStatement[] statements1 = caseClause1.getStatements();
-        final JSStatement[] statements2 = caseClause2.getStatements();
-
-        if (statements1.length != statements2.length) {
-            return false;
-        }
-
-        for (int index = 0; index < statements1.length; index++) {
-            if (!statementsAreEquivalent(statements1[index], statements2[index])) {
-                return false;
-            }
-        }
-
-        return false;
-    }
-
-    private static boolean doWhileStatementsAreEquivalent(JSDoWhileStatement statement1,
-                                                          JSDoWhileStatement statement2) {
-        return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
-                statementsAreEquivalent (statement1.getBody(),      statement2.getBody()));
-    }
-
-    private static boolean codeBlocksAreEquivalent(JSBlockStatement statement1,
-                                                   JSBlockStatement statement2) {
-        if (statement1 == null && statement2 == null) {
-            return true;
-        }
-        if (statement1 == null || statement2 == null) {
-            return false;
-        }
-        return blockStatementsAreEquivalent(statement1.getStatements(), statement2.getStatements());
-    }
-
-    private static boolean breakStatementsAreEquivalent(JSBreakStatement statement1,
-                                                        JSBreakStatement statement2) {
-        return areEqual(statement1.getLabel(), statement2.getLabel());
-    }
-
-    private static boolean continueStatementsAreEquivalent(JSContinueStatement statement1,
-                                                           JSContinueStatement statement2) {
-        return areEqual(statement1.getLabel(), statement2.getLabel());
-    }
-
-    private static boolean labeledStatementsAreEquivalent(JSLabeledStatement statement1,
-                                                          JSLabeledStatement statement2) {
-        final PsiElement element1 = statement1.getLabelIdentifier();
-        final PsiElement element2 = statement2.getLabelIdentifier();
-
-        return ((element1 == null) ? (element2 == null)
-                                   : (element2 != null && element1.getText().equals(element2.getText())));
-    }
-
-    private static boolean blockStatementsAreEquivalent(JSStatement[] statements1,
-                                                        JSStatement[] statements2) {
-        if (statements1.length != statements2.length) {
-            return false;
-        }
-        for (int index = 0; index < statements1.length; index++) {
-            if (!statementsAreEquivalent(statements1[index], statements2[index])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private static boolean ifStatementsAreEquivalent(JSIfStatement statement1,
-                                                     JSIfStatement statement2) {
-        return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
-                statementsAreEquivalent (statement1.getThen(),      statement2.getThen())      &&
-                statementsAreEquivalent (statement1.getElse(),      statement2.getElse()));
-    }
-
-    private static boolean expressionStatementsAreEquivalent(JSExpressionStatement statement1,
-                                                             JSExpressionStatement statement2) {
-        return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
-    }
-
-    private static boolean returnStatementsAreEquivalent(JSReturnStatement statement1,
-                                                         JSReturnStatement statement2) {
-        return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
-    }
-
-    private static boolean throwStatementsAreEquivalent(JSThrowStatement statement1,
-                                                        JSThrowStatement statement2) {
-        return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
-    }
-
-    private static boolean withStatementsAreEquivalent(JSWithStatement statement1,
-                                                       JSWithStatement statement2) {
-        return (expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression()) &&
-                statementsAreEquivalent (statement1.getStatement(),  statement2.getStatement()));
-    }
-
-    public static boolean expressionsAreEquivalent(JSExpression exp1,
-                                                   JSExpression exp2) {
-        if (exp1 == null && exp2 == null) {
-            return true;
-        }
-        if (exp1 == null || exp2 == null) {
-            return false;
-        }
-
-        final JSExpression expToCompare1 = ParenthesesUtils.stripParentheses(exp1);
-        final JSExpression expToCompare2 = ParenthesesUtils.stripParentheses(exp2);
-        final int          type1         = getExpressionType(expToCompare1);
-        final int          type2         = getExpressionType(expToCompare2);
-
-        if (type1 != type2) {
-            return false;
-        }
-        switch(type1) {
-            case THIS_EXPRESSION:
-            case SUPER_EXPRESSION:
-                return true;
-
-            case LITERAL_EXPRESSION:
-            case CLASS_OBJECT_EXPRESSION:
-            case REFERENCE_EXPRESSION:
-            case DEFINITION_EXPRESSION:
-                return expToCompare1.getText().equals(expToCompare2.getText());
-
-            case CALL_EXPRESSION:
-                return callExpressionsAreEquivalent((JSCallExpression) expToCompare1,
-                                                    (JSCallExpression) expToCompare2);
-
-            case NEW_EXPRESSION:
-                return newExpressionsAreEquivalent((JSNewExpression) expToCompare1,
-                                                   (JSNewExpression) expToCompare2);
-
-            case ARRAY_LITERAL_EXPRESSION:
-                return arrayLiteralExpressionsAreEquivalent((JSArrayLiteralExpression) expToCompare1,
-                                                            (JSArrayLiteralExpression) expToCompare2);
-
-            case PREFIX_EXPRESSION:
-                return prefixExpressionsAreEquivalent((JSPrefixExpression) expToCompare1,
-                                                      (JSPrefixExpression) expToCompare2);
-
-            case POSTFIX_EXPRESSION:
-                return postfixExpressionsAreEquivalent((JSPostfixExpression) expToCompare1,
-                                                       (JSPostfixExpression) expToCompare2);
-
-            case BINARY_EXPRESSION:
-                return binaryExpressionsAreEquivalent((JSBinaryExpression) expToCompare1,
-                                                      (JSBinaryExpression) expToCompare2);
-
-            case ASSIGNMENT_EXPRESSION:
-                return assignmentExpressionsAreEquivalent((JSAssignmentExpression) expToCompare1,
-                                                          (JSAssignmentExpression) expToCompare2);
-
-            case CONDITIONAL_EXPRESSION:
-                return conditionalExpressionsAreEquivalent((JSConditionalExpression) expToCompare1,
-                                                           (JSConditionalExpression) expToCompare2);
-
-            case INDEX_PROPERTY_ACCESS_EXPRESSION:
-                return indexedPropertyAccessExpressionsAreEquivalent((JSIndexedPropertyAccessExpression) expToCompare1,
-                                                                     (JSIndexedPropertyAccessExpression) expToCompare2);
-
-            case OBJECT_LITERAL_EXPRESSION:
-                return objectLiteralExpressionsAreEquivalent((JSObjectLiteralExpression) expToCompare1,
-                                                             (JSObjectLiteralExpression) expToCompare2);
-
-            case FUNCTION_EXPRESSION:
-                return functionExpressionsAreEquivalent((JSFunctionExpression) expToCompare1,
-                                                        (JSFunctionExpression) expToCompare2);
-
-            default:
-                return false;
-        }
-    }
-
-    @SuppressWarnings({"UNUSED_SYMBOL"})
-    private static boolean functionExpressionsAreEquivalent(JSFunctionExpression functionExp1,
-                                                            JSFunctionExpression functionExp2) {
-        return false;
-    }
-
-    private static boolean objectLiteralExpressionsAreEquivalent(JSObjectLiteralExpression objectLiteralExp1,
-                                                                 JSObjectLiteralExpression objectLiteralExp2) {
-        final JSProperty[] properties1 = objectLiteralExp1.getProperties();
-        final JSProperty[] properties2 = objectLiteralExp2.getProperties();
-
-        if (properties1.length != properties2.length) {
-            return false;
-        }
-
-        for (int index = 0; index < properties2.length; index++) {
-            final JSProperty property1     = properties1[index];
-            final JSProperty property2     = properties2[index];
-            final String     propertyName1 = property1.getName();
-            final String     propertyName2 = property2.getName();
-
-            if (!(propertyName1 != null && propertyName2 != null &&
-                  propertyName2.equals(propertyName1) &&
-                  expressionsAreEquivalent(property1.getValue(), property2.getValue()))) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private static boolean indexedPropertyAccessExpressionsAreEquivalent(JSIndexedPropertyAccessExpression exp1,
-                                                                         JSIndexedPropertyAccessExpression exp2) {
-        return (expressionsAreEquivalent(exp1.getIndexExpression(), exp2.getIndexExpression())  &&
-                expressionsAreEquivalent(exp1.getQualifier(),       exp2.getQualifier()));
-    }
-
-    private static boolean callExpressionsAreEquivalent(JSCallExpression methodExp1,
-                                                        JSCallExpression methodExp2) {
-        JSExpression exp1;
-        JSExpression exp2;
-
-        try {
-            exp1 = methodExp1.getMethodExpression();
-            exp2 = methodExp2.getMethodExpression();
-        } catch (Exception exception) {
-            return false;
-        }
-
-        if (!expressionsAreEquivalent(exp1, exp2)) {
-            return false;
-        }
-
-        final JSArgumentList argumentList1 = methodExp1.getArgumentList();
-        final JSArgumentList argumentList2 = methodExp2.getArgumentList();
-
-        return (argumentList1 != null &&
-                argumentList2 != null &&
-                expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments()));
-    }
-
-    private static boolean newExpressionsAreEquivalent(JSNewExpression newExp1,
-                                                       JSNewExpression newExp2) {
-        final JSExpression exp1 = newExp1.getMethodExpression();
-        final JSExpression exp2 = newExp2.getMethodExpression();
-
-        if (!expressionsAreEquivalent(exp1, exp2)) {
-            return false;
-        }
-
-        final JSArgumentList argumentList1 = newExp1.getArgumentList();
-        final JSArgumentList argumentList2 = newExp2.getArgumentList();
-
-        return (argumentList1 != null &&
-                argumentList2 != null &&
-                expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments()));
-    }
-
-    private static boolean arrayLiteralExpressionsAreEquivalent(JSArrayLiteralExpression arrInitExp1,
-                                                                JSArrayLiteralExpression arrInitExp2) {
-        return expressionListsAreEquivalent(arrInitExp1.getExpressions(), arrInitExp2.getExpressions());
-    }
-
-    private static boolean prefixExpressionsAreEquivalent(JSPrefixExpression prefixExp1,
-                                                          JSPrefixExpression prefixExp2) {
-        final IElementType operator1 = prefixExp1.getOperationSign();
-        final IElementType operator2 = prefixExp2.getOperationSign();
-
-        return (operator1 != null && operator2 != null &&
-                operator1.equals(operator2) &&
-                expressionsAreEquivalent(prefixExp1.getExpression(), prefixExp2.getExpression()));
-    }
-
-    private static boolean postfixExpressionsAreEquivalent(JSPostfixExpression postfixExp1,
-                                                           JSPostfixExpression postfixExp2) {
-        final IElementType operator1 = postfixExp1.getOperationSign();
-        final IElementType operator2 = postfixExp2.getOperationSign();
-
-        return (operator1.equals(operator2) &&
-                expressionsAreEquivalent(postfixExp1.getExpression(), postfixExp2.getExpression()));
-    }
-
-    private static boolean binaryExpressionsAreEquivalent(JSBinaryExpression binaryExp1,
-                                                          JSBinaryExpression binaryExp2) {
-        final IElementType operator1 = binaryExp1.getOperationSign();
-        final IElementType operator2 = binaryExp2.getOperationSign();
-
-        return (operator1.equals(operator2)                                                  &&
-                expressionsAreEquivalent(binaryExp1.getLOperand(), binaryExp2.getLOperand()) &&
-                expressionsAreEquivalent(binaryExp1.getROperand(), binaryExp2.getROperand()));
-    }
-
-    private static boolean assignmentExpressionsAreEquivalent(JSAssignmentExpression assignExp1,
-                                                              JSAssignmentExpression assignExp2) {
-        final IElementType operator1 = assignExp1.getOperationSign();
-        final IElementType operator2 = assignExp2.getOperationSign();
-
-        return (operator1.equals(operator2)                                                  &&
-                expressionsAreEquivalent(assignExp1.getLOperand(), assignExp2.getLOperand()) &&
-                expressionsAreEquivalent(assignExp1.getROperand(), assignExp2.getROperand()));
-    }
-
-    private static boolean conditionalExpressionsAreEquivalent(JSConditionalExpression condExp1,
-                                                               JSConditionalExpression condExp2) {
-        return (expressionsAreEquivalent(condExp1.getCondition(), condExp2.getCondition()) &&
-                expressionsAreEquivalent(condExp1.getThen(),      condExp2.getThen())      &&
-                expressionsAreEquivalent(condExp1.getElse(),      condExp2.getElse()));
-    }
-
-    private static boolean expressionListsAreEquivalent(JSExpression[] expressions1,
-                                                        JSExpression[] expressions2) {
-        if (expressions1 == null && expressions2 == null) {
-            return true;
-        }
-
-        if (expressions1 == null || expressions2 == null) {
-            return false;
-        }
-        if (expressions1.length != expressions2.length) {
-            return false;
-        }
-
-        for (int index = 0; index < expressions1.length; index++) {
-            if (!expressionsAreEquivalent(expressions1[index], expressions2[index])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private static boolean areEqual(Object o1, Object o2) {
-        return ((o1 == null) ? (o2 == null) : o1.equals(o2));
-    }
-
-    private static int getExpressionType(JSExpression exp) {
-        if (exp instanceof JSThisExpression) {
-            return THIS_EXPRESSION;
-        }
-        if (exp instanceof JSLiteralExpression) {
-            return LITERAL_EXPRESSION;
-        }
-        if (exp instanceof JSReferenceExpression) {
-            return REFERENCE_EXPRESSION;
-        }
-        if (exp instanceof JSNewExpression) {
-            return NEW_EXPRESSION;
-        }
-        if (exp instanceof JSCallExpression) {
-            return CALL_EXPRESSION;
-        }
-        if (exp instanceof JSArrayLiteralExpression) {
-            return ARRAY_LITERAL_EXPRESSION;
-        }
-        if (exp instanceof JSPrefixExpression) {
-            return PREFIX_EXPRESSION;
-        }
-        if (exp instanceof JSPostfixExpression) {
-            return POSTFIX_EXPRESSION;
-        }
-        if (exp instanceof JSAssignmentExpression) {
-            return ASSIGNMENT_EXPRESSION;
-        }
-        if (exp instanceof JSBinaryExpression) {
-            return BINARY_EXPRESSION;
-        }
-        if (exp instanceof JSConditionalExpression) {
-            return CONDITIONAL_EXPRESSION;
-        }
-        if (exp instanceof JSIndexedPropertyAccessExpression) {
-            return INDEX_PROPERTY_ACCESS_EXPRESSION;
-        }
-        if (exp instanceof JSFunctionExpression) {
-            return FUNCTION_EXPRESSION;
-        }
-        if (exp instanceof JSObjectLiteralExpression) {
-            return OBJECT_LITERAL_EXPRESSION;
-        }
-        if (exp instanceof JSDefinitionExpression) {
-            return DEFINITION_EXPRESSION;
-        }
-        return -1;
-    }
-
-    private static int getStatementType(JSStatement statement) {
-        if (statement instanceof JSBlockStatement) {
-            return BLOCK_STATEMENT;
-        }
-        if (statement instanceof JSBreakStatement) {
-            return BREAK_STATEMENT;
-        }
-        if (statement instanceof JSContinueStatement) {
-            return CONTINUE_STATEMENT;
-        }
-        if (statement instanceof JSVarStatement) {
-            return VAR_STATEMENT;
-        }
-        if (statement instanceof JSDoWhileStatement) {
-            return DO_WHILE_STATEMENT;
-        }
-        if (statement instanceof JSEmptyStatement) {
-            return EMPTY_STATEMENT;
-        }
-        if (statement instanceof JSExpressionStatement) {
-            return EXPRESSION_STATEMENT;
-        }
-        if (statement instanceof JSForStatement) {
-            return FOR_STATEMENT;
-        }
-        if (statement instanceof JSForInStatement) {
-            return FOR_IN_STATEMENT;
-        }
-        if (statement instanceof JSIfStatement) {
-            return IF_STATEMENT;
-        }
-        if (statement instanceof JSLabeledStatement) {
-            return LABELED_STATEMENT;
-        }
-        if (statement instanceof JSReturnStatement) {
-            return RETURN_STATEMENT;
-        }
-        if (statement instanceof JSSwitchStatement) {
-            return SWITCH_STATEMENT;
-        }
-        if (statement instanceof JSThrowStatement) {
-            return THROW_STATEMENT;
-        }
-        if (statement instanceof JSTryStatement) {
-            return TRY_STATEMENT;
-        }
-        if (statement instanceof JSWhileStatement) {
-            return WHILE_STATEMENT;
-        }
-        if (statement instanceof JSWithStatement) {
-            return WITH_STATEMENT;
-        }
-        return -1;
-    }
+public class EquivalenceChecker
+{
+
+	private EquivalenceChecker()
+	{
+	}
+
+	private static final int THIS_EXPRESSION = 0;
+	private static final int LITERAL_EXPRESSION = 1;
+	private static final int CLASS_OBJECT_EXPRESSION = 2;
+	private static final int REFERENCE_EXPRESSION = 3;
+	private static final int SUPER_EXPRESSION = 4;
+	private static final int CALL_EXPRESSION = 5;
+	private static final int NEW_EXPRESSION = 6;
+	private static final int ARRAY_LITERAL_EXPRESSION = 7;
+	private static final int PREFIX_EXPRESSION = 8;
+	private static final int POSTFIX_EXPRESSION = 9;
+	private static final int ASSIGNMENT_EXPRESSION = 10;
+	private static final int BINARY_EXPRESSION = 11;
+	private static final int CONDITIONAL_EXPRESSION = 12;
+	private static final int INDEX_PROPERTY_ACCESS_EXPRESSION = 13;
+	private static final int OBJECT_LITERAL_EXPRESSION = 14;
+	private static final int FUNCTION_EXPRESSION = 15;
+	private static final int DEFINITION_EXPRESSION = 16;
+
+	private static final int BLOCK_STATEMENT = 0;
+	private static final int BREAK_STATEMENT = 1;
+	private static final int CONTINUE_STATEMENT = 2;
+	private static final int VAR_STATEMENT = 3;
+	private static final int DO_WHILE_STATEMENT = 4;
+	private static final int EMPTY_STATEMENT = 5;
+	private static final int EXPRESSION_STATEMENT = 6;
+	private static final int FOR_STATEMENT = 7;
+	private static final int FOR_IN_STATEMENT = 8;
+	private static final int IF_STATEMENT = 9;
+	private static final int LABELED_STATEMENT = 10;
+	private static final int RETURN_STATEMENT = 11;
+	private static final int SWITCH_STATEMENT = 12;
+	private static final int THROW_STATEMENT = 13;
+	private static final int TRY_STATEMENT = 14;
+	private static final int WHILE_STATEMENT = 15;
+	private static final int WITH_STATEMENT = 16;
+
+	public static boolean statementsAreEquivalent(JSStatement exp1,
+												  JSStatement exp2)
+	{
+		if(exp1 == null && exp2 == null)
+		{
+			return true;
+		}
+
+		if(exp1 == null || exp2 == null)
+		{
+			return false;
+		}
+
+		final int type1 = getStatementType(exp1);
+		final int type2 = getStatementType(exp2);
+
+		if(type1 != type2)
+		{
+			return false;
+		}
+
+		switch(type1)
+		{
+			case BLOCK_STATEMENT:
+				return codeBlocksAreEquivalent((JSBlockStatement) exp1,
+						(JSBlockStatement) exp2);
+			case BREAK_STATEMENT:
+				return breakStatementsAreEquivalent((JSBreakStatement) exp1,
+						(JSBreakStatement) exp2);
+			case CONTINUE_STATEMENT:
+				return continueStatementsAreEquivalent((JSContinueStatement) exp1,
+						(JSContinueStatement) exp2);
+			case VAR_STATEMENT:
+				return declarationStatementsAreEquivalent((JSVarStatement) exp1,
+						(JSVarStatement) exp2);
+			case DO_WHILE_STATEMENT:
+				return doWhileStatementsAreEquivalent((JSDoWhileStatement) exp1,
+						(JSDoWhileStatement) exp2);
+			case EMPTY_STATEMENT:
+				return true;
+			case EXPRESSION_STATEMENT:
+				return expressionStatementsAreEquivalent((JSExpressionStatement) exp1,
+						(JSExpressionStatement) exp2);
+			case FOR_STATEMENT:
+				return forStatementsAreEquivalent((JSForStatement) exp1,
+						(JSForStatement) exp2);
+			case FOR_IN_STATEMENT:
+				return forInStatementsAreEquivalent((JSForInStatement) exp1,
+						(JSForInStatement) exp2);
+			case IF_STATEMENT:
+				return ifStatementsAreEquivalent((JSIfStatement) exp1,
+						(JSIfStatement) exp2);
+			case LABELED_STATEMENT:
+				return labeledStatementsAreEquivalent((JSLabeledStatement) exp1,
+						(JSLabeledStatement) exp2);
+			case RETURN_STATEMENT:
+				return returnStatementsAreEquivalent((JSReturnStatement) exp1,
+						(JSReturnStatement) exp2);
+			case SWITCH_STATEMENT:
+				return switchStatementsAreEquivalent((JSSwitchStatement) exp1,
+						(JSSwitchStatement) exp2);
+			case THROW_STATEMENT:
+				return throwStatementsAreEquivalent((JSThrowStatement) exp1,
+						(JSThrowStatement) exp2);
+			case TRY_STATEMENT:
+				return tryStatementsAreEquivalent((JSTryStatement) exp1,
+						(JSTryStatement) exp2);
+			case WHILE_STATEMENT:
+				return whileStatementsAreEquivalent((JSWhileStatement) exp1,
+						(JSWhileStatement) exp2);
+			case WITH_STATEMENT:
+				return withStatementsAreEquivalent((JSWithStatement) exp1,
+						(JSWithStatement) exp2);
+			default:
+				return false;
+		}
+	}
+
+	private static boolean declarationStatementsAreEquivalent(JSVarStatement statement1,
+															  JSVarStatement statement2)
+	{
+		if(statement1 == null || statement2 == null)
+		{
+			return statement1 == statement2;
+		}
+		JSVariable[] vars1 = statement1.getVariables();
+		JSVariable[] vars2 = statement2.getVariables();
+
+		if(vars1.length == vars2.length)
+		{
+			for(int index = 0; index < vars2.length; index++)
+			{
+				if(!localVariableAreEquivalent(vars1[index], vars2[index]))
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	private static boolean tryStatementsAreEquivalent(JSTryStatement statement1,
+													  JSTryStatement statement2)
+	{
+		if(!statementsAreEquivalent(statement1.getStatement(),
+				statement2.getStatement()))
+		{
+			return false;
+		}
+		if(!statementsAreEquivalent(statement1.getFinallyStatement(),
+				statement2.getFinallyStatement()))
+		{
+			return false;
+		}
+		JSCatchBlock catchBlock1 = statement1.getCatchBlock();
+		JSCatchBlock catchBlock2 = statement2.getCatchBlock();
+		if(catchBlock1 == null)
+		{
+			return (catchBlock2 == null);
+		}
+		else if(catchBlock2 == null)
+		{
+			return false;
+		}
+
+		if(!parametersAreEquivalent(catchBlock1.getParameter(),
+				catchBlock2.getParameter()))
+		{
+			return false;
+		}
+		return statementsAreEquivalent(catchBlock1.getStatement(),
+				catchBlock2.getStatement());
+	}
+
+	private static boolean localVariableAreEquivalent(JSVariable var1,
+													  JSVariable var2)
+	{
+		return (expressionsAreEquivalent(var1.getInitializer(), var2.getInitializer()) &&
+				typesAreEquivalent(var1.getType(), var2.getType()) &&
+				areEqual(var1.getName(), var2.getName()));
+	}
+
+	private static boolean parametersAreEquivalent(JSParameter parameter1,
+												   JSParameter parameter2)
+	{
+		return (typesAreEquivalent(parameter1.getType(), parameter2.getType()) &&
+				areEqual(parameter1.getName(), parameter2.getName()));
+	}
+
+	private static boolean typesAreEquivalent(JavaScriptType type1, JavaScriptType type2)
+	{
+		return areEqual(type1, type2);
+	}
+
+	private static boolean whileStatementsAreEquivalent(JSWhileStatement statement1,
+														JSWhileStatement statement2)
+	{
+		return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
+				statementsAreEquivalent(statement1.getBody(), statement2.getBody()));
+	}
+
+	private static boolean forStatementsAreEquivalent(JSForStatement statement1,
+													  JSForStatement statement2)
+	{
+		return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
+				expressionsAreEquivalent(statement1.getInitialization(), statement2.getInitialization()) &&
+				expressionsAreEquivalent(statement1.getUpdate(), statement2.getUpdate()) &&
+				statementsAreEquivalent(statement1.getBody(), statement2.getBody()));
+	}
+
+	private static boolean forInStatementsAreEquivalent(JSForInStatement statement1,
+														JSForInStatement statement2)
+	{
+		return (expressionsAreEquivalent(statement1.getCollectionExpression(), statement2.getCollectionExpression()) &&
+				expressionsAreEquivalent(statement1.getVariableExpression(), statement2.getVariableExpression()) &&
+				declarationStatementsAreEquivalent(statement1.getDeclarationStatement(), statement2.getDeclarationStatement()) &&
+				statementsAreEquivalent(statement1.getBody(), statement2.getBody()));
+	}
+
+	private static boolean switchStatementsAreEquivalent(JSSwitchStatement statement1,
+														 JSSwitchStatement statement2)
+	{
+		if(!expressionsAreEquivalent(statement1.getSwitchExpression(),
+				statement2.getSwitchExpression()))
+		{
+			return false;
+		}
+
+		final JSCaseClause[] caseClauses1 = statement1.getCaseClauses();
+		final JSCaseClause[] caseClauses2 = statement2.getCaseClauses();
+
+		if(caseClauses1.length != caseClauses2.length)
+		{
+			return false;
+		}
+
+		for(int index = 0; index < caseClauses1.length; index++)
+		{
+			if(!caseClausesAreEquivalent(caseClauses1[index], caseClauses2[index]))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private static boolean caseClausesAreEquivalent(JSCaseClause caseClause1, JSCaseClause caseClause2)
+	{
+		if(caseClause1.isDefault() != caseClause2.isDefault())
+		{
+			return false;
+		}
+		if(!expressionsAreEquivalent(caseClause1.getCaseExpression(), caseClause2.getCaseExpression()))
+		{
+			return false;
+		}
+
+		final JSStatement[] statements1 = caseClause1.getStatements();
+		final JSStatement[] statements2 = caseClause2.getStatements();
+
+		if(statements1.length != statements2.length)
+		{
+			return false;
+		}
+
+		for(int index = 0; index < statements1.length; index++)
+		{
+			if(!statementsAreEquivalent(statements1[index], statements2[index]))
+			{
+				return false;
+			}
+		}
+
+		return false;
+	}
+
+	private static boolean doWhileStatementsAreEquivalent(JSDoWhileStatement statement1,
+														  JSDoWhileStatement statement2)
+	{
+		return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
+				statementsAreEquivalent(statement1.getBody(), statement2.getBody()));
+	}
+
+	private static boolean codeBlocksAreEquivalent(JSBlockStatement statement1,
+												   JSBlockStatement statement2)
+	{
+		if(statement1 == null && statement2 == null)
+		{
+			return true;
+		}
+		if(statement1 == null || statement2 == null)
+		{
+			return false;
+		}
+		return blockStatementsAreEquivalent(statement1.getStatements(), statement2.getStatements());
+	}
+
+	private static boolean breakStatementsAreEquivalent(JSBreakStatement statement1,
+														JSBreakStatement statement2)
+	{
+		return areEqual(statement1.getLabel(), statement2.getLabel());
+	}
+
+	private static boolean continueStatementsAreEquivalent(JSContinueStatement statement1,
+														   JSContinueStatement statement2)
+	{
+		return areEqual(statement1.getLabel(), statement2.getLabel());
+	}
+
+	private static boolean labeledStatementsAreEquivalent(JSLabeledStatement statement1,
+														  JSLabeledStatement statement2)
+	{
+		final PsiElement element1 = statement1.getLabelIdentifier();
+		final PsiElement element2 = statement2.getLabelIdentifier();
+
+		return ((element1 == null) ? (element2 == null)
+				: (element2 != null && element1.getText().equals(element2.getText())));
+	}
+
+	private static boolean blockStatementsAreEquivalent(JSStatement[] statements1,
+														JSStatement[] statements2)
+	{
+		if(statements1.length != statements2.length)
+		{
+			return false;
+		}
+		for(int index = 0; index < statements1.length; index++)
+		{
+			if(!statementsAreEquivalent(statements1[index], statements2[index]))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private static boolean ifStatementsAreEquivalent(JSIfStatement statement1,
+													 JSIfStatement statement2)
+	{
+		return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
+				statementsAreEquivalent(statement1.getThen(), statement2.getThen()) &&
+				statementsAreEquivalent(statement1.getElse(), statement2.getElse()));
+	}
+
+	private static boolean expressionStatementsAreEquivalent(JSExpressionStatement statement1,
+															 JSExpressionStatement statement2)
+	{
+		return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
+	}
+
+	private static boolean returnStatementsAreEquivalent(JSReturnStatement statement1,
+														 JSReturnStatement statement2)
+	{
+		return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
+	}
+
+	private static boolean throwStatementsAreEquivalent(JSThrowStatement statement1,
+														JSThrowStatement statement2)
+	{
+		return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
+	}
+
+	private static boolean withStatementsAreEquivalent(JSWithStatement statement1,
+													   JSWithStatement statement2)
+	{
+		return (expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression()) &&
+				statementsAreEquivalent(statement1.getStatement(), statement2.getStatement()));
+	}
+
+	public static boolean expressionsAreEquivalent(JSExpression exp1,
+												   JSExpression exp2)
+	{
+		if(exp1 == null && exp2 == null)
+		{
+			return true;
+		}
+		if(exp1 == null || exp2 == null)
+		{
+			return false;
+		}
+
+		final JSExpression expToCompare1 = ParenthesesUtils.stripParentheses(exp1);
+		final JSExpression expToCompare2 = ParenthesesUtils.stripParentheses(exp2);
+		final int type1 = getExpressionType(expToCompare1);
+		final int type2 = getExpressionType(expToCompare2);
+
+		if(type1 != type2)
+		{
+			return false;
+		}
+		switch(type1)
+		{
+			case THIS_EXPRESSION:
+			case SUPER_EXPRESSION:
+				return true;
+
+			case LITERAL_EXPRESSION:
+			case CLASS_OBJECT_EXPRESSION:
+			case REFERENCE_EXPRESSION:
+			case DEFINITION_EXPRESSION:
+				return expToCompare1.getText().equals(expToCompare2.getText());
+
+			case CALL_EXPRESSION:
+				return callExpressionsAreEquivalent((JSCallExpression) expToCompare1,
+						(JSCallExpression) expToCompare2);
+
+			case NEW_EXPRESSION:
+				return newExpressionsAreEquivalent((JSNewExpression) expToCompare1,
+						(JSNewExpression) expToCompare2);
+
+			case ARRAY_LITERAL_EXPRESSION:
+				return arrayLiteralExpressionsAreEquivalent((JSArrayLiteralExpression) expToCompare1,
+						(JSArrayLiteralExpression) expToCompare2);
+
+			case PREFIX_EXPRESSION:
+				return prefixExpressionsAreEquivalent((JSPrefixExpression) expToCompare1,
+						(JSPrefixExpression) expToCompare2);
+
+			case POSTFIX_EXPRESSION:
+				return postfixExpressionsAreEquivalent((JSPostfixExpression) expToCompare1,
+						(JSPostfixExpression) expToCompare2);
+
+			case BINARY_EXPRESSION:
+				return binaryExpressionsAreEquivalent((JSBinaryExpression) expToCompare1,
+						(JSBinaryExpression) expToCompare2);
+
+			case ASSIGNMENT_EXPRESSION:
+				return assignmentExpressionsAreEquivalent((JSAssignmentExpression) expToCompare1,
+						(JSAssignmentExpression) expToCompare2);
+
+			case CONDITIONAL_EXPRESSION:
+				return conditionalExpressionsAreEquivalent((JSConditionalExpression) expToCompare1,
+						(JSConditionalExpression) expToCompare2);
+
+			case INDEX_PROPERTY_ACCESS_EXPRESSION:
+				return indexedPropertyAccessExpressionsAreEquivalent((JSIndexedPropertyAccessExpression) expToCompare1,
+						(JSIndexedPropertyAccessExpression) expToCompare2);
+
+			case OBJECT_LITERAL_EXPRESSION:
+				return objectLiteralExpressionsAreEquivalent((JSObjectLiteralExpression) expToCompare1,
+						(JSObjectLiteralExpression) expToCompare2);
+
+			case FUNCTION_EXPRESSION:
+				return functionExpressionsAreEquivalent((JSFunctionExpression) expToCompare1,
+						(JSFunctionExpression) expToCompare2);
+
+			default:
+				return false;
+		}
+	}
+
+	@SuppressWarnings({"UNUSED_SYMBOL"})
+	private static boolean functionExpressionsAreEquivalent(JSFunctionExpression functionExp1,
+															JSFunctionExpression functionExp2)
+	{
+		return false;
+	}
+
+	private static boolean objectLiteralExpressionsAreEquivalent(JSObjectLiteralExpression objectLiteralExp1,
+																 JSObjectLiteralExpression objectLiteralExp2)
+	{
+		final JSProperty[] properties1 = objectLiteralExp1.getProperties();
+		final JSProperty[] properties2 = objectLiteralExp2.getProperties();
+
+		if(properties1.length != properties2.length)
+		{
+			return false;
+		}
+
+		for(int index = 0; index < properties2.length; index++)
+		{
+			final JSProperty property1 = properties1[index];
+			final JSProperty property2 = properties2[index];
+			final String propertyName1 = property1.getName();
+			final String propertyName2 = property2.getName();
+
+			if(!(propertyName1 != null && propertyName2 != null &&
+					propertyName2.equals(propertyName1) &&
+					expressionsAreEquivalent(property1.getValue(), property2.getValue())))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private static boolean indexedPropertyAccessExpressionsAreEquivalent(JSIndexedPropertyAccessExpression exp1,
+																		 JSIndexedPropertyAccessExpression exp2)
+	{
+		return (expressionsAreEquivalent(exp1.getIndexExpression(), exp2.getIndexExpression()) &&
+				expressionsAreEquivalent(exp1.getQualifier(), exp2.getQualifier()));
+	}
+
+	private static boolean callExpressionsAreEquivalent(JSCallExpression methodExp1,
+														JSCallExpression methodExp2)
+	{
+		JSExpression exp1;
+		JSExpression exp2;
+
+		try
+		{
+			exp1 = methodExp1.getMethodExpression();
+			exp2 = methodExp2.getMethodExpression();
+		}
+		catch(Exception exception)
+		{
+			return false;
+		}
+
+		if(!expressionsAreEquivalent(exp1, exp2))
+		{
+			return false;
+		}
+
+		final JSArgumentList argumentList1 = methodExp1.getArgumentList();
+		final JSArgumentList argumentList2 = methodExp2.getArgumentList();
+
+		return (argumentList1 != null &&
+				argumentList2 != null &&
+				expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments()));
+	}
+
+	private static boolean newExpressionsAreEquivalent(JSNewExpression newExp1,
+													   JSNewExpression newExp2)
+	{
+		final JSExpression exp1 = newExp1.getMethodExpression();
+		final JSExpression exp2 = newExp2.getMethodExpression();
+
+		if(!expressionsAreEquivalent(exp1, exp2))
+		{
+			return false;
+		}
+
+		final JSArgumentList argumentList1 = newExp1.getArgumentList();
+		final JSArgumentList argumentList2 = newExp2.getArgumentList();
+
+		return (argumentList1 != null &&
+				argumentList2 != null &&
+				expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments()));
+	}
+
+	private static boolean arrayLiteralExpressionsAreEquivalent(JSArrayLiteralExpression arrInitExp1,
+																JSArrayLiteralExpression arrInitExp2)
+	{
+		return expressionListsAreEquivalent(arrInitExp1.getExpressions(), arrInitExp2.getExpressions());
+	}
+
+	private static boolean prefixExpressionsAreEquivalent(JSPrefixExpression prefixExp1,
+														  JSPrefixExpression prefixExp2)
+	{
+		final IElementType operator1 = prefixExp1.getOperationSign();
+		final IElementType operator2 = prefixExp2.getOperationSign();
+
+		return (operator1 != null && operator2 != null &&
+				operator1.equals(operator2) &&
+				expressionsAreEquivalent(prefixExp1.getExpression(), prefixExp2.getExpression()));
+	}
+
+	private static boolean postfixExpressionsAreEquivalent(JSPostfixExpression postfixExp1,
+														   JSPostfixExpression postfixExp2)
+	{
+		final IElementType operator1 = postfixExp1.getOperationSign();
+		final IElementType operator2 = postfixExp2.getOperationSign();
+
+		return (operator1.equals(operator2) &&
+				expressionsAreEquivalent(postfixExp1.getExpression(), postfixExp2.getExpression()));
+	}
+
+	private static boolean binaryExpressionsAreEquivalent(JSBinaryExpression binaryExp1,
+														  JSBinaryExpression binaryExp2)
+	{
+		final IElementType operator1 = binaryExp1.getOperationSign();
+		final IElementType operator2 = binaryExp2.getOperationSign();
+
+		return (operator1.equals(operator2) &&
+				expressionsAreEquivalent(binaryExp1.getLOperand(), binaryExp2.getLOperand()) &&
+				expressionsAreEquivalent(binaryExp1.getROperand(), binaryExp2.getROperand()));
+	}
+
+	private static boolean assignmentExpressionsAreEquivalent(JSAssignmentExpression assignExp1,
+															  JSAssignmentExpression assignExp2)
+	{
+		final IElementType operator1 = assignExp1.getOperationSign();
+		final IElementType operator2 = assignExp2.getOperationSign();
+
+		return (operator1.equals(operator2) &&
+				expressionsAreEquivalent(assignExp1.getLOperand(), assignExp2.getLOperand()) &&
+				expressionsAreEquivalent(assignExp1.getROperand(), assignExp2.getROperand()));
+	}
+
+	private static boolean conditionalExpressionsAreEquivalent(JSConditionalExpression condExp1,
+															   JSConditionalExpression condExp2)
+	{
+		return (expressionsAreEquivalent(condExp1.getCondition(), condExp2.getCondition()) &&
+				expressionsAreEquivalent(condExp1.getThen(), condExp2.getThen()) &&
+				expressionsAreEquivalent(condExp1.getElse(), condExp2.getElse()));
+	}
+
+	private static boolean expressionListsAreEquivalent(JSExpression[] expressions1,
+														JSExpression[] expressions2)
+	{
+		if(expressions1 == null && expressions2 == null)
+		{
+			return true;
+		}
+
+		if(expressions1 == null || expressions2 == null)
+		{
+			return false;
+		}
+		if(expressions1.length != expressions2.length)
+		{
+			return false;
+		}
+
+		for(int index = 0; index < expressions1.length; index++)
+		{
+			if(!expressionsAreEquivalent(expressions1[index], expressions2[index]))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private static boolean areEqual(Object o1, Object o2)
+	{
+		return ((o1 == null) ? (o2 == null) : o1.equals(o2));
+	}
+
+	private static int getExpressionType(JSExpression exp)
+	{
+		if(exp instanceof JSThisExpression)
+		{
+			return THIS_EXPRESSION;
+		}
+		if(exp instanceof JSLiteralExpression)
+		{
+			return LITERAL_EXPRESSION;
+		}
+		if(exp instanceof JSReferenceExpression)
+		{
+			return REFERENCE_EXPRESSION;
+		}
+		if(exp instanceof JSNewExpression)
+		{
+			return NEW_EXPRESSION;
+		}
+		if(exp instanceof JSCallExpression)
+		{
+			return CALL_EXPRESSION;
+		}
+		if(exp instanceof JSArrayLiteralExpression)
+		{
+			return ARRAY_LITERAL_EXPRESSION;
+		}
+		if(exp instanceof JSPrefixExpression)
+		{
+			return PREFIX_EXPRESSION;
+		}
+		if(exp instanceof JSPostfixExpression)
+		{
+			return POSTFIX_EXPRESSION;
+		}
+		if(exp instanceof JSAssignmentExpression)
+		{
+			return ASSIGNMENT_EXPRESSION;
+		}
+		if(exp instanceof JSBinaryExpression)
+		{
+			return BINARY_EXPRESSION;
+		}
+		if(exp instanceof JSConditionalExpression)
+		{
+			return CONDITIONAL_EXPRESSION;
+		}
+		if(exp instanceof JSIndexedPropertyAccessExpression)
+		{
+			return INDEX_PROPERTY_ACCESS_EXPRESSION;
+		}
+		if(exp instanceof JSFunctionExpression)
+		{
+			return FUNCTION_EXPRESSION;
+		}
+		if(exp instanceof JSObjectLiteralExpression)
+		{
+			return OBJECT_LITERAL_EXPRESSION;
+		}
+		if(exp instanceof JSDefinitionExpression)
+		{
+			return DEFINITION_EXPRESSION;
+		}
+		return -1;
+	}
+
+	private static int getStatementType(JSStatement statement)
+	{
+		if(statement instanceof JSBlockStatement)
+		{
+			return BLOCK_STATEMENT;
+		}
+		if(statement instanceof JSBreakStatement)
+		{
+			return BREAK_STATEMENT;
+		}
+		if(statement instanceof JSContinueStatement)
+		{
+			return CONTINUE_STATEMENT;
+		}
+		if(statement instanceof JSVarStatement)
+		{
+			return VAR_STATEMENT;
+		}
+		if(statement instanceof JSDoWhileStatement)
+		{
+			return DO_WHILE_STATEMENT;
+		}
+		if(statement instanceof JSEmptyStatement)
+		{
+			return EMPTY_STATEMENT;
+		}
+		if(statement instanceof JSExpressionStatement)
+		{
+			return EXPRESSION_STATEMENT;
+		}
+		if(statement instanceof JSForStatement)
+		{
+			return FOR_STATEMENT;
+		}
+		if(statement instanceof JSForInStatement)
+		{
+			return FOR_IN_STATEMENT;
+		}
+		if(statement instanceof JSIfStatement)
+		{
+			return IF_STATEMENT;
+		}
+		if(statement instanceof JSLabeledStatement)
+		{
+			return LABELED_STATEMENT;
+		}
+		if(statement instanceof JSReturnStatement)
+		{
+			return RETURN_STATEMENT;
+		}
+		if(statement instanceof JSSwitchStatement)
+		{
+			return SWITCH_STATEMENT;
+		}
+		if(statement instanceof JSThrowStatement)
+		{
+			return THROW_STATEMENT;
+		}
+		if(statement instanceof JSTryStatement)
+		{
+			return TRY_STATEMENT;
+		}
+		if(statement instanceof JSWhileStatement)
+		{
+			return WHILE_STATEMENT;
+		}
+		if(statement instanceof JSWithStatement)
+		{
+			return WITH_STATEMENT;
+		}
+		return -1;
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
index ced099c5..ffa37cf4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
@@ -15,39 +15,50 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiRecursiveElementVisitor;
 import consulo.language.editor.util.PsiUtilBase;
+import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiErrorElement;
+import consulo.language.psi.PsiRecursiveElementVisitor;
 
 import javax.annotation.Nonnull;
 
-public class ErrorUtil {
-    private ErrorUtil() {}
+public class ErrorUtil
+{
+	private ErrorUtil()
+	{
+	}
 
-    private static final boolean fullTraversal = false;
+	private static final boolean fullTraversal = false;
 
-    public static boolean containsError(@Nonnull PsiElement element) {
-        // check only immediate children, full tree traversal is too expensive
-        if (fullTraversal) {
-            final ErrorElementVisitor visitor = new ErrorElementVisitor();
+	public static boolean containsError(@Nonnull PsiElement element)
+	{
+		// check only immediate children, full tree traversal is too expensive
+		if(fullTraversal)
+		{
+			final ErrorElementVisitor visitor = new ErrorElementVisitor();
 
-            element.accept(visitor);
-            return visitor.containsErrorElement();
-        } else {
-            return PsiUtilBase.hasErrorElementChild(element);
-        }
-    }
+			element.accept(visitor);
+			return visitor.containsErrorElement();
+		}
+		else
+		{
+			return PsiUtilBase.hasErrorElementChild(element);
+		}
+	}
 
-    private static class ErrorElementVisitor extends PsiRecursiveElementVisitor {
-        private boolean containsErrorElement;
+	private static class ErrorElementVisitor extends PsiRecursiveElementVisitor
+	{
+		private boolean containsErrorElement;
 
-        @Override public void visitErrorElement(PsiErrorElement element) {
-            this.containsErrorElement = true;
-        }
+		@Override
+		public void visitErrorElement(PsiErrorElement element)
+		{
+			this.containsErrorElement = true;
+		}
 
-        private boolean containsErrorElement(){
-            return this.containsErrorElement;
-        }
-    }
+		private boolean containsErrorElement()
+		{
+			return this.containsErrorElement;
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
index 089f8b83..29ce3d62 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
@@ -15,169 +15,215 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import consulo.language.ast.IElementType;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 
-public class ExpressionUtil {
-
-    private ExpressionUtil() {}
-
-    public static boolean isConstantExpression(JSExpression expression) {
-        if (expression == null) {
-            return false;
-        }
-        IsConstantExpressionVisitor visitor = new IsConstantExpressionVisitor();
-        expression.accept(visitor);
-        return visitor.isConstant;
-    }
-
-    public static boolean isIncrementDecrementExpression(@Nonnull PsiElement expression) {
-        if (expression instanceof JSPostfixExpression) {
-            final IElementType operator = ((JSPostfixExpression) expression).getOperationSign();
-            return (JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator));
-        } else if (expression instanceof JSPrefixExpression) {
-            final IElementType operator = ((JSPrefixExpression) expression).getOperationSign();
-            return (JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator));
-        } else {
-            return false;
-        }
-    }
-
-    public static class IsConstantExpressionVisitor extends JSElementVisitor {
-        protected boolean                        isConstant;
-        private   final Map<JSVariable, Boolean> isVariableConstant = new HashMap<JSVariable, Boolean>();
-
-        public boolean isConstant() {
-            return this.isConstant;
-        }
-
-        @Override public void visitJSExpression(JSExpression expression) {
-            this.isConstant = false;
-        }
-
-        @Override public void visitJSLiteralExpression(JSSimpleLiteralExpression expression) {
-            this.isConstant = true;
-        }
-
-        @Override public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
-            JSExpression expr = expression.getInnerExpression();
-            if (expr != null) {
-                expr.accept(this);
-            }
-        }
-
-        @Override public void visitJSPrefixExpression(JSPrefixExpression expression) {
-            this.visitJSPrefixOrPostfixExpression(expression.getExpression(), expression.getOperationSign());
-        }
-
-        @Override public void visitJSPostfixExpression(JSPostfixExpression expression) {
-            this.visitJSPrefixOrPostfixExpression(expression.getExpression(), expression.getOperationSign());
-        }
-
-        public void visitJSPrefixOrPostfixExpression(JSExpression operand, IElementType sign) {
-            if (operand == null) {
-                this.isConstant = false;
-                return;
-            }
-
-            operand.accept(this);
-            if (!this.isConstant) {
-                return;
-            }
-
-            if (sign == JSTokenTypes.PLUS  ||
-                sign == JSTokenTypes.MINUS ||
-                sign == JSTokenTypes.TILDE ||
-                sign == JSTokenTypes.EXCL) {
-                return;
-            }
-            this.isConstant = false;
-        }
-
-        @Override public void visitJSBinaryExpression(JSBinaryExpression expression) {
-            final JSExpression jsExpression = expression.getLOperand();
-            if (jsExpression == null) return;
-            jsExpression.accept(this);
-            if (!this.isConstant) {
-                return;
-            }
-            JSExpression rOperand = expression.getROperand();
-            if (rOperand != null) {
-                rOperand.accept(this);
-            }
-        }
-
-        @Override public void visitJSConditionalExpression(JSConditionalExpression expression) {
-            JSExpression thenExpr = expression.getThen();
-            JSExpression elseExpr = expression.getElse();
-            if (thenExpr == null || elseExpr == null) {
-                this.isConstant = false;
-                return;
-            }
-
-            expression.getCondition().accept(this);
-            if (!this.isConstant) {
-                return;
-            }
-            thenExpr.accept(this);
-            if (!this.isConstant) {
-                return;
-            }
-            elseExpr.accept(this);
-        }
-
-        @Override public void visitJSReferenceExpression(JSReferenceExpression expression) {
-            JSElement refElement = (JSElement) expression.resolve();
-
-            if (!(refElement instanceof JSVariable)) {
-                this.isConstant = false;
-                return;
-            }
-
-            JSVariable variable = (JSVariable) refElement;
-            Boolean    isConst  = this.isVariableConstant.get(variable);
-
-            if (isConst != null) {
-                this.isConstant &= isConst;
-                return;
-            }
-
-            this.isVariableConstant.put(variable, Boolean.FALSE);
-            this.isConstant = false;
-        }
-    }
-
-    @Nullable
-    public static Object computeConstantExpression(JSExpression expression) {
-        if (expression == null) {
-            return null;
-        }
-
-        //try {
-        //    final PsiManager                  manager  = expression.getManager();
-        //    final PsiElementFactory           factory  = manager.getElementFactory();
-        //    final PsiConstantEvaluationHelper helper   = manager.getConstantEvaluationHelper();
-        //    PsiExpression                     expr     = factory.createExpressionFromText(expression.getText(), expression);
-        //    final PsiType                     exprType = expr.getType();
-        //
-        //    if (exprType != null && exprType.equals(PsiType.INT)) {
-        //        expr = factory.createExpressionFromText("(long)" + expression.getText(), expression);
-        //    }
-        //
-        //    return helper.computeConstantExpression(expr);
-        //} catch (IncorrectOperationException e) {
-        //    return null;
-        //}
-
-      // TODO: constant expressions are not evaluated by PsiManager et al
-      return null;
-    }
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ExpressionUtil
+{
+
+	private ExpressionUtil()
+	{
+	}
+
+	public static boolean isConstantExpression(JSExpression expression)
+	{
+		if(expression == null)
+		{
+			return false;
+		}
+		IsConstantExpressionVisitor visitor = new IsConstantExpressionVisitor();
+		expression.accept(visitor);
+		return visitor.isConstant;
+	}
+
+	public static boolean isIncrementDecrementExpression(@Nonnull PsiElement expression)
+	{
+		if(expression instanceof JSPostfixExpression)
+		{
+			final IElementType operator = ((JSPostfixExpression) expression).getOperationSign();
+			return (JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator));
+		}
+		else if(expression instanceof JSPrefixExpression)
+		{
+			final IElementType operator = ((JSPrefixExpression) expression).getOperationSign();
+			return (JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator));
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	public static class IsConstantExpressionVisitor extends JSElementVisitor
+	{
+		protected boolean isConstant;
+		private final Map<JSVariable, Boolean> isVariableConstant = new HashMap<JSVariable, Boolean>();
+
+		public boolean isConstant()
+		{
+			return this.isConstant;
+		}
+
+		@Override
+		public void visitJSExpression(JSExpression expression)
+		{
+			this.isConstant = false;
+		}
+
+		@Override
+		public void visitJSLiteralExpression(JSSimpleLiteralExpression expression)
+		{
+			this.isConstant = true;
+		}
+
+		@Override
+		public void visitJSParenthesizedExpression(JSParenthesizedExpression expression)
+		{
+			JSExpression expr = expression.getInnerExpression();
+			if(expr != null)
+			{
+				expr.accept(this);
+			}
+		}
+
+		@Override
+		public void visitJSPrefixExpression(JSPrefixExpression expression)
+		{
+			this.visitJSPrefixOrPostfixExpression(expression.getExpression(), expression.getOperationSign());
+		}
+
+		@Override
+		public void visitJSPostfixExpression(JSPostfixExpression expression)
+		{
+			this.visitJSPrefixOrPostfixExpression(expression.getExpression(), expression.getOperationSign());
+		}
+
+		public void visitJSPrefixOrPostfixExpression(JSExpression operand, IElementType sign)
+		{
+			if(operand == null)
+			{
+				this.isConstant = false;
+				return;
+			}
+
+			operand.accept(this);
+			if(!this.isConstant)
+			{
+				return;
+			}
+
+			if(sign == JSTokenTypes.PLUS ||
+					sign == JSTokenTypes.MINUS ||
+					sign == JSTokenTypes.TILDE ||
+					sign == JSTokenTypes.EXCL)
+			{
+				return;
+			}
+			this.isConstant = false;
+		}
+
+		@Override
+		public void visitJSBinaryExpression(JSBinaryExpression expression)
+		{
+			final JSExpression jsExpression = expression.getLOperand();
+			if(jsExpression == null)
+			{
+				return;
+			}
+			jsExpression.accept(this);
+			if(!this.isConstant)
+			{
+				return;
+			}
+			JSExpression rOperand = expression.getROperand();
+			if(rOperand != null)
+			{
+				rOperand.accept(this);
+			}
+		}
+
+		@Override
+		public void visitJSConditionalExpression(JSConditionalExpression expression)
+		{
+			JSExpression thenExpr = expression.getThen();
+			JSExpression elseExpr = expression.getElse();
+			if(thenExpr == null || elseExpr == null)
+			{
+				this.isConstant = false;
+				return;
+			}
+
+			expression.getCondition().accept(this);
+			if(!this.isConstant)
+			{
+				return;
+			}
+			thenExpr.accept(this);
+			if(!this.isConstant)
+			{
+				return;
+			}
+			elseExpr.accept(this);
+		}
+
+		@Override
+		public void visitJSReferenceExpression(JSReferenceExpression expression)
+		{
+			JSElement refElement = (JSElement) expression.resolve();
+
+			if(!(refElement instanceof JSVariable))
+			{
+				this.isConstant = false;
+				return;
+			}
+
+			JSVariable variable = (JSVariable) refElement;
+			Boolean isConst = this.isVariableConstant.get(variable);
+
+			if(isConst != null)
+			{
+				this.isConstant &= isConst;
+				return;
+			}
+
+			this.isVariableConstant.put(variable, Boolean.FALSE);
+			this.isConstant = false;
+		}
+	}
+
+	@Nullable
+	public static Object computeConstantExpression(JSExpression expression)
+	{
+		if(expression == null)
+		{
+			return null;
+		}
+
+		//try {
+		//    final PsiManager                  manager  = expression.getManager();
+		//    final PsiElementFactory           factory  = manager.getElementFactory();
+		//    final PsiConstantEvaluationHelper helper   = manager.getConstantEvaluationHelper();
+		//    PsiExpression                     expr     = factory.createExpressionFromText(expression.getText(), expression);
+		//    final PsiType                     exprType = expr.getType();
+		//
+		//    if (exprType != null && exprType.equals(PsiType.INT)) {
+		//        expr = factory.createExpressionFromText("(long)" + expression.getText(), expression);
+		//    }
+		//
+		//    return helper.computeConstantExpression(expr);
+		//} catch (IncorrectOperationException e) {
+		//    return null;
+		//}
+
+		// TODO: constant expressions are not evaluated by PsiManager et al
+		return null;
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
index 7e9fb3aa..d81294d0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
@@ -31,149 +31,184 @@
 import java.util.Iterator;
 import java.util.List;
 
-public class FindReferenceUtil {
-    private FindReferenceUtil() {}
-
-    public static JSReferenceExpression[] findReferences(@Nonnull JSVariable variable) {
-        final JSReferenceVisitor visitor = new JSReferenceVisitor(variable, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
-        JSElement                scope   = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
-
-        if (scope == null) {
-            scope = getFarthestAncestor(variable, JSElement.class);
-        }
-        visitor.visitJSElement(scope);
-
-        return visitor.getReferences();
-    }
-
-    public static <T extends PsiElement> T getFarthestAncestor(@Nonnull PsiElement element, @Nonnull Class<T> aClass) {
-        PsiElement previousElement = element;
-        PsiElement currentElement;
-
-        do {
-            currentElement = previousElement.getParent();
-            if (!aClass.isInstance(currentElement)) {
-                //noinspection unchecked
-                return (T) previousElement;
-            }
-            previousElement = currentElement;
-        } while (currentElement != null);
-
-        return null;
-    }
-
-    private static final class JSReferenceVisitor extends JSFunctionVisitor {
-        private final JSVariable            variable;
-        private final String                variableName;
-        private final int                   maxCount;
-        private final int                   minTextOffset;
-        private final int                   maxTextOffset;
-        private List<JSReferenceExpression> references;
-
-        public JSReferenceVisitor(@Nonnull JSVariable variable, int maxCount, int minTextOffset, int maxTextOffset) {
-            this.variable      = variable;
-            this.variableName  = variable.getName();
-            this.maxCount      = maxCount;
-            this.minTextOffset = minTextOffset;
-            this.maxTextOffset = maxTextOffset;
-            this.references    = new ArrayList<JSReferenceExpression>();
-        }
-
-        @Override public void visitElement(PsiElement element) {
-            if (this.references.size() < this.maxCount) {
-                final int elementTextOffset = element.getTextOffset();
-
-                if (elementTextOffset + element.getTextLength() >= this.minTextOffset &&
-                    elementTextOffset <= this.maxTextOffset) {
-                    super.visitElement(element);
-                }
-            }
-        }
-
-        @Override public void visitJSReferenceExpression(final JSReferenceExpression expression) {
-            super.visitJSReferenceExpression(expression);
-
-            if (expression.getText().equals(this.variableName)) {
-                final JSVariable referent = ControlFlowUtils.resolveVariable(expression);
-
-                if (referent != null && this.variable.equals(referent)) {
-                    this.references.add(expression);
-                }
-            }
-        }
-
-        public JSReferenceExpression[] getReferences() {
-            return this.references.toArray(new JSReferenceExpression[this.references.size()]);
-        }
-
-        public JSReferenceExpression getReference(int index) {
-            return ((index >= 0 && index < this.references.size())
-                        ? this.references.get(index)
-                        : null);
-        }
-    }
-
-
-    public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable) {
-        return getReferences(variable, null, 0, Integer.MAX_VALUE);
-    }
-
-    public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable,
-																		  @Nullable PsiElement scope) {
-        return getReferences(variable, scope, 0, Integer.MAX_VALUE);
-    }
-
-    public static Iterable<PsiElement> getReferencesBefore(@Nonnull JSVariable variable, int textOffset) {
-        return getReferences(variable, null, 0, textOffset);
-    }
-
-    public static Iterable<PsiElement> getReferencesAfter(@Nonnull JSVariable variable, int textOffset) {
-        return getReferences(variable, null, textOffset, Integer.MAX_VALUE);
-    }
-
-    private static Iterable<PsiElement> getReferences(@Nonnull  final JSVariable variable,
-																		   @Nullable final PsiElement scope,
-																		   final int minTextOffset, final int maxTextOffset) {
-        final PsiElement iteratedScope;
-
-        if (scope == null) {
-            JSElement        function = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
-            iteratedScope = ((function == null) ? FindReferenceUtil.getFarthestAncestor(variable, XmlFile.class)
-                                                : function);
-        } else {
-            iteratedScope = scope;
-        }
-
-        return new Iterable<PsiElement>() {
-                @Override
-				public Iterator<PsiElement> iterator() {
-                    return new JSReferenceIterator(variable, minTextOffset, maxTextOffset, iteratedScope);
-                }
-            };
-    }
-
-    public static final class JSReferenceIterator extends JSElementIterator {
-        private final JSVariable            variable;
-        private final String                variableName;
-
-        public JSReferenceIterator(@Nonnull JSVariable variable,
-                                   int minTextOffset, int maxTextOffset,
-                                   @Nonnull PsiElement element) {
-            super(element, false, minTextOffset, maxTextOffset);
-            this.variable     = variable;
-            this.variableName = variable.getName();
-        }
-
-        @Override
-		public boolean visitElement(PsiElement element) {
-            if (!(element.getText().equals(this.variableName) &&
-                  element instanceof JSReferenceExpression)) {
-                return false;
-            }
-
-            final JSVariable referent = ControlFlowUtils.resolveVariable((JSReferenceExpression) element);
-
-            return (referent != null && this.variable.equals(referent));
-        }
-    }
+public class FindReferenceUtil
+{
+	private FindReferenceUtil()
+	{
+	}
+
+	public static JSReferenceExpression[] findReferences(@Nonnull JSVariable variable)
+	{
+		final JSReferenceVisitor visitor = new JSReferenceVisitor(variable, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
+		JSElement scope = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
+
+		if(scope == null)
+		{
+			scope = getFarthestAncestor(variable, JSElement.class);
+		}
+		visitor.visitJSElement(scope);
+
+		return visitor.getReferences();
+	}
+
+	public static <T extends PsiElement> T getFarthestAncestor(@Nonnull PsiElement element, @Nonnull Class<T> aClass)
+	{
+		PsiElement previousElement = element;
+		PsiElement currentElement;
+
+		do
+		{
+			currentElement = previousElement.getParent();
+			if(!aClass.isInstance(currentElement))
+			{
+				//noinspection unchecked
+				return (T) previousElement;
+			}
+			previousElement = currentElement;
+		}
+		while(currentElement != null);
+
+		return null;
+	}
+
+	private static final class JSReferenceVisitor extends JSFunctionVisitor
+	{
+		private final JSVariable variable;
+		private final String variableName;
+		private final int maxCount;
+		private final int minTextOffset;
+		private final int maxTextOffset;
+		private List<JSReferenceExpression> references;
+
+		public JSReferenceVisitor(@Nonnull JSVariable variable, int maxCount, int minTextOffset, int maxTextOffset)
+		{
+			this.variable = variable;
+			this.variableName = variable.getName();
+			this.maxCount = maxCount;
+			this.minTextOffset = minTextOffset;
+			this.maxTextOffset = maxTextOffset;
+			this.references = new ArrayList<JSReferenceExpression>();
+		}
+
+		@Override
+		public void visitElement(PsiElement element)
+		{
+			if(this.references.size() < this.maxCount)
+			{
+				final int elementTextOffset = element.getTextOffset();
+
+				if(elementTextOffset + element.getTextLength() >= this.minTextOffset &&
+						elementTextOffset <= this.maxTextOffset)
+				{
+					super.visitElement(element);
+				}
+			}
+		}
+
+		@Override
+		public void visitJSReferenceExpression(final JSReferenceExpression expression)
+		{
+			super.visitJSReferenceExpression(expression);
+
+			if(expression.getText().equals(this.variableName))
+			{
+				final JSVariable referent = ControlFlowUtils.resolveVariable(expression);
+
+				if(referent != null && this.variable.equals(referent))
+				{
+					this.references.add(expression);
+				}
+			}
+		}
+
+		public JSReferenceExpression[] getReferences()
+		{
+			return this.references.toArray(new JSReferenceExpression[this.references.size()]);
+		}
+
+		public JSReferenceExpression getReference(int index)
+		{
+			return ((index >= 0 && index < this.references.size())
+					? this.references.get(index)
+					: null);
+		}
+	}
+
+
+	public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable)
+	{
+		return getReferences(variable, null, 0, Integer.MAX_VALUE);
+	}
+
+	public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable,
+													 @Nullable PsiElement scope)
+	{
+		return getReferences(variable, scope, 0, Integer.MAX_VALUE);
+	}
+
+	public static Iterable<PsiElement> getReferencesBefore(@Nonnull JSVariable variable, int textOffset)
+	{
+		return getReferences(variable, null, 0, textOffset);
+	}
+
+	public static Iterable<PsiElement> getReferencesAfter(@Nonnull JSVariable variable, int textOffset)
+	{
+		return getReferences(variable, null, textOffset, Integer.MAX_VALUE);
+	}
+
+	private static Iterable<PsiElement> getReferences(@Nonnull final JSVariable variable,
+													  @Nullable final PsiElement scope,
+													  final int minTextOffset, final int maxTextOffset)
+	{
+		final PsiElement iteratedScope;
+
+		if(scope == null)
+		{
+			JSElement function = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
+			iteratedScope = ((function == null) ? FindReferenceUtil.getFarthestAncestor(variable, XmlFile.class)
+					: function);
+		}
+		else
+		{
+			iteratedScope = scope;
+		}
+
+		return new Iterable<PsiElement>()
+		{
+			@Override
+			public Iterator<PsiElement> iterator()
+			{
+				return new JSReferenceIterator(variable, minTextOffset, maxTextOffset, iteratedScope);
+			}
+		};
+	}
+
+	public static final class JSReferenceIterator extends JSElementIterator
+	{
+		private final JSVariable variable;
+		private final String variableName;
+
+		public JSReferenceIterator(@Nonnull JSVariable variable,
+								   int minTextOffset, int maxTextOffset,
+								   @Nonnull PsiElement element)
+		{
+			super(element, false, minTextOffset, maxTextOffset);
+			this.variable = variable;
+			this.variableName = variable.getName();
+		}
+
+		@Override
+		public boolean visitElement(PsiElement element)
+		{
+			if(!(element.getText().equals(this.variableName) &&
+					element instanceof JSReferenceExpression))
+			{
+				return false;
+			}
+
+			final JSVariable referent = ControlFlowUtils.resolveVariable((JSReferenceExpression) element);
+
+			return (referent != null && this.variable.equals(referent));
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
index 640b575f..c14ce614 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
@@ -36,308 +36,357 @@
 import javax.annotation.Nonnull;
 
 /**
+ *
  */
-public class JSElementFactory {
-    private         static final Class[] WHITESPACE_CLASS       = new Class[] { PsiWhiteSpace.class };
-
-    private JSElementFactory() {}
-
-    public static PsiElement addElementBefore(@Nonnull PsiElement element,
-                                              @Nonnull PsiElement newElement) {
-        final ASTNode oldElementParentNode = element.getNode();
-        final PsiElement parentNode           = element.getParent();
-        final ASTNode newElementParentNode = parentNode.getNode();
-        final ASTNode newElementNode       = newElement.getNode();
-
-        if (newElementParentNode == null || newElementNode == null) {
-            return null;
-        }
-        newElementParentNode.addChild(newElementNode, oldElementParentNode);
-        return newElement;
-    }
-
-    public static PsiElement addElementAfter(@Nonnull PsiElement element,
-																  @Nonnull PsiElement newElement) {
-        final ASTNode elementNode          = element.getNode();
-        final ASTNode oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
-        final PsiElement parentNode           = element.getParent();
-        final ASTNode newElementParentNode = parentNode.getNode();
-        final ASTNode newElementNode       = newElement.getNode();
-
-        if (newElementParentNode == null || newElementNode == null) {
-            return null;
-        }
-        newElementParentNode.addChild(newElementNode, oldElementParentNode);
-
-        return newElement;
-    }
-
-    public static PsiElement addElementBefore(@Nonnull PsiElement element,
-																   @NonNls @Nonnull String     elementText) {
-        final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
-
-        assert (newElement != null);
-        return addElementBefore(element, newElement);
-    }
-
-    public static PsiElement addElementAfter(@Nonnull PsiElement element,
-																  @Nonnull String     elementText) {
-        final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
-
-        assert (newElement != null);
-        return addElementAfter(element, newElement);
-    }
-
-    public static ASTNode createElementFromText(Project project, String text) {
-        final PsiElement element = createDummyFile(project, text).getFirstChild();
-
-        assert (element != null);
-        return element.getNode();
-    }
-
-    @Nonnull
-	private static PsiFile createDummyFile(Project project, String text) {
-      final ParserDefinition def = ParserDefinition.forLanguage(JavaScriptLanguage.INSTANCE);
-
-        assert (def != null);
-      return PsiFileFactory.getInstance(project)
-        .createFileFromText("dummy.js", text);
-    }
-
-    public static JSStatement replaceElementWithStatement(@Nonnull JSElement      element,
-                                                          @NonNls @Nonnull String statementText)
-        throws IncorrectOperationException {
-        final ASTNode newStatementNode       = JSChangeUtil.createStatementFromText(
-          element.getProject(),
-          statementText);
-
-        final ASTNode oldStatementParentNode = element.getNode();
-        final PsiElement parentNode             = element.getParent();
-        final ASTNode newStatementParentNode = parentNode.getNode();
-
-        if (newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null) {
-            return null;
-        }
-        newStatementParentNode.replaceChild(oldStatementParentNode, newStatementNode);
-        reformat(parentNode);
-
-        return (JSStatement) newStatementNode.getPsi();
-    }
-
-    public static JSExpression replaceExpression(@Nonnull JSExpression   expression,
-                                                 @NonNls @Nonnull String text)
-            throws IncorrectOperationException {
-        final JSExpression newExpressionNode = JSChangeUtil.createExpressionFromText(
-          expression.getProject(),
-          text);
-
-        return replaceExpression(expression, newExpressionNode);
-    }
-
-    public static JSExpression replaceExpression(@Nonnull JSExpression expression,
-                                                 @Nonnull JSExpression newExpression)
-        throws IncorrectOperationException {
-        final ASTNode    newExpressionNode = newExpression.getNode();
-        final ASTNode oldExpressionNode = expression.getNode();
-        final PsiElement parentNode        = expression.getParent();
-        final ASTNode grandParentNode   = parentNode.getNode();
-
-        if (grandParentNode == null || oldExpressionNode == null || newExpressionNode == null) {
-            return null;
-        }
-
-        grandParentNode.replaceChild(oldExpressionNode, newExpressionNode);
-        reformat(parentNode);
-
-        return (JSExpression) newExpressionNode.getPsi();
-    }
-
-    public static JSStatement replaceStatement(@Nonnull JSStatement    statement,
-                                               @NonNls @Nonnull String text)
-        throws IncorrectOperationException {
-        final ASTNode newStatementNode       = JSChangeUtil.createStatementFromText(
-          statement.getProject(),
-          text);
-
-        final ASTNode oldStatementParentNode = statement.getNode();
-        final PsiElement parentNode             = statement.getParent();
-        final ASTNode newStatementParentNode = parentNode.getNode();
-
-        if (newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null) {
-            return null;
-        }
-
-        newStatementParentNode.replaceChild(oldStatementParentNode, newStatementNode);
-        reformat(parentNode);
-
-        return (JSStatement) newStatementNode.getPsi();
-    }
-
-    public static JSStatement addStatementBefore(@Nonnull JSStatement    statement,
-                                                 @NonNls @Nonnull String previousStatementText)
-        throws IncorrectOperationException {
-        final ASTNode newStatementNode       = JSChangeUtil.createStatementFromText(
-          statement.getProject(),
-          previousStatementText);
-        final ASTNode oldStatementParentNode = statement.getNode();
-        final PsiElement parentNode             = statement.getParent();
-        final ASTNode newStatementParentNode = parentNode.getNode();
-
-        if (newStatementParentNode == null || newStatementNode == null) {
-            return null;
-        }
-
-        newStatementParentNode.addChild(newStatementNode, oldStatementParentNode);
-        reformat(parentNode);
-
-        return (JSStatement) newStatementNode.getPsi();
-    }
-
-    public static JSStatement addStatementAfter(@Nonnull JSStatement    statement,
-                                                @NonNls @Nonnull String nextStatementText)
-            throws IncorrectOperationException {
-        final ASTNode     newStatementNode       = JSChangeUtil.createStatementFromText(
-          statement.getProject(),
-          nextStatementText);
-        final ASTNode statementNode          = statement.getNode();
-        final ASTNode oldStatementParentNode = ((statementNode == null) ? null : statementNode.getTreeNext());
-        final PsiElement parentNode             = statement.getParent();
-        final ASTNode newStatementParentNode = parentNode.getNode();
-
-        if (newStatementParentNode == null || newStatementNode == null) {
-            return null;
-        }
-
-        newStatementParentNode.addChild(newStatementNode, oldStatementParentNode);
-        reformat(parentNode);
-
-        return (JSStatement) newStatementNode.getPsi();
-    }
-
-    public static void addRangeBefore(JSStatement[] statements, JSStatement statement)
-            throws IncorrectOperationException {
-        addRangeBefore(statements, 0, statements.length, statement);
-    }
-
-    public static void addRangeAfter(JSStatement[] statements, JSStatement statement)
-            throws IncorrectOperationException {
-        addRangeAfter(statements, 0, statements.length, statement);
-    }
-
-    @SuppressWarnings({"ForLoopWithMissingComponent"})
-    public static void addRangeBefore(JSStatement[] statements, int start, int length, JSStatement statement)
-            throws IncorrectOperationException {
-        for (int index = start; index < length; index++) {
-            addStatementBefore(statement, statements[index].getText());
-        }
-    }
-    @SuppressWarnings({"ForLoopWithMissingComponent"})
-    public static void addRangeAfter(JSStatement[] statements, int start, int length, JSStatement statement)
-            throws IncorrectOperationException {
-        for (int index = length; --index >= start; ) {
-            addStatementAfter(statement, statements[index].getText());
-        }
-    }
-
-    public static void replaceExpressionWithNegatedExpression(@Nonnull JSExpression newExpression,
-                                                              @Nonnull JSExpression exp)
-        throws IncorrectOperationException {
-        JSExpression expressionToReplace = BoolUtils.findNegation(exp);
-        final String replacementString;
-
-        if (expressionToReplace == null) {
-            expressionToReplace = exp;
-
-            if (ComparisonUtils.isComparisonOperator(newExpression)) {
-                final JSBinaryExpression  binaryExpression  = (JSBinaryExpression) newExpression;
-                final IElementType operationSign     = binaryExpression.getOperationSign();
-                final String              negatedComparison = ComparisonUtils.getNegatedOperatorText(operationSign);
-                final JSExpression        leftOperand       = binaryExpression.getLOperand();
-                final JSExpression        rightOperand      = binaryExpression.getROperand();
-
-                assert (rightOperand != null);
-
-                replacementString = leftOperand.getText() + negatedComparison + rightOperand.getText();
-            } else {
-                replacementString = '!' + ParenthesesUtils.getParenthesized(newExpression, ParenthesesUtils.PREFIX_PRECENDENCE);
-            }
-        } else {
-            replacementString = newExpression.getText();
-        }
-        replaceExpression(expressionToReplace, replacementString);
-    }
-
-    public static void replaceExpressionWithNegatedExpressionString(JSExpression exp, String newExpression)
-        throws IncorrectOperationException {
-        assert (exp != null);
-
-        JSExpression expressionToReplace = BoolUtils.findNegation(exp);
-        String       replacementString   = newExpression;
-
-        if (expressionToReplace == null) {
-            expressionToReplace = exp;
-            replacementString   = "!(" + newExpression + ')';
-        }
-
-        replaceExpression(expressionToReplace, replacementString);
-    }
-
-
-    public static void replaceStatementWithUnwrapping(JSStatement statement, JSStatement newBranch)
-            throws IncorrectOperationException {
-        if (!(newBranch instanceof JSBlockStatement)) {
-            JSElementFactory.replaceStatement(statement, newBranch.getText());
-            return;
-        }
-
-        final JSBlockStatement parentBlock = PsiTreeUtil.getParentOfType(newBranch, JSBlockStatement.class);
-
-        if (parentBlock == null) {
-            JSElementFactory.replaceStatement(statement, newBranch.getText());
-            return;
-        }
-
-        final JSBlockStatement block = (JSBlockStatement) newBranch;
-
-        if (ControlFlowUtils.containsConflictingDeclarations(block, parentBlock)) {
-            JSElementFactory.replaceStatement(statement, newBranch.getText());
-            return;
-        }
-
-        final PsiElement containingElement = statement.getParent();
-
-        assert (containingElement instanceof JSStatement);
-
-        JSElementFactory.addRangeBefore(block.getStatements(), statement);
-        JSElementFactory.removeElement(statement);
-    }
-
-    public static void removeElement(PsiElement element) {
-        final ASTNode node       = element.getNode();
-        final ASTNode parentNode = element.getParent().getNode();
-
-        if (node != null && parentNode != null) {
-            parentNode.removeChild(node);
-        }
-    }
-
-    public static void reformat(PsiElement statement) throws IncorrectOperationException {
-        // Reformat only in .js files due to a bug in JavaScript reformatting module when doing it in JSP files
-        if (statement.getContainingFile() instanceof JSFile) {
+public class JSElementFactory
+{
+	private static final Class[] WHITESPACE_CLASS = new Class[]{PsiWhiteSpace.class};
+
+	private JSElementFactory()
+	{
+	}
+
+	public static PsiElement addElementBefore(@Nonnull PsiElement element,
+											  @Nonnull PsiElement newElement)
+	{
+		final ASTNode oldElementParentNode = element.getNode();
+		final PsiElement parentNode = element.getParent();
+		final ASTNode newElementParentNode = parentNode.getNode();
+		final ASTNode newElementNode = newElement.getNode();
+
+		if(newElementParentNode == null || newElementNode == null)
+		{
+			return null;
+		}
+		newElementParentNode.addChild(newElementNode, oldElementParentNode);
+		return newElement;
+	}
+
+	public static PsiElement addElementAfter(@Nonnull PsiElement element,
+											 @Nonnull PsiElement newElement)
+	{
+		final ASTNode elementNode = element.getNode();
+		final ASTNode oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
+		final PsiElement parentNode = element.getParent();
+		final ASTNode newElementParentNode = parentNode.getNode();
+		final ASTNode newElementNode = newElement.getNode();
+
+		if(newElementParentNode == null || newElementNode == null)
+		{
+			return null;
+		}
+		newElementParentNode.addChild(newElementNode, oldElementParentNode);
+
+		return newElement;
+	}
+
+	public static PsiElement addElementBefore(@Nonnull PsiElement element,
+											  @NonNls @Nonnull String elementText)
+	{
+		final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
+
+		assert (newElement != null);
+		return addElementBefore(element, newElement);
+	}
+
+	public static PsiElement addElementAfter(@Nonnull PsiElement element,
+											 @Nonnull String elementText)
+	{
+		final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
+
+		assert (newElement != null);
+		return addElementAfter(element, newElement);
+	}
+
+	public static ASTNode createElementFromText(Project project, String text)
+	{
+		final PsiElement element = createDummyFile(project, text).getFirstChild();
+
+		assert (element != null);
+		return element.getNode();
+	}
+
+	@Nonnull
+	private static PsiFile createDummyFile(Project project, String text)
+	{
+		final ParserDefinition def = ParserDefinition.forLanguage(JavaScriptLanguage.INSTANCE);
+
+		assert (def != null);
+		return PsiFileFactory.getInstance(project)
+				.createFileFromText("dummy.js", text);
+	}
+
+	public static JSStatement replaceElementWithStatement(@Nonnull JSElement element,
+														  @NonNls @Nonnull String statementText)
+			throws IncorrectOperationException
+	{
+		final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+				element.getProject(),
+				statementText);
+
+		final ASTNode oldStatementParentNode = element.getNode();
+		final PsiElement parentNode = element.getParent();
+		final ASTNode newStatementParentNode = parentNode.getNode();
+
+		if(newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null)
+		{
+			return null;
+		}
+		newStatementParentNode.replaceChild(oldStatementParentNode, newStatementNode);
+		reformat(parentNode);
+
+		return (JSStatement) newStatementNode.getPsi();
+	}
+
+	public static JSExpression replaceExpression(@Nonnull JSExpression expression,
+												 @NonNls @Nonnull String text)
+			throws IncorrectOperationException
+	{
+		final JSExpression newExpressionNode = JSChangeUtil.createExpressionFromText(
+				expression.getProject(),
+				text);
+
+		return replaceExpression(expression, newExpressionNode);
+	}
+
+	public static JSExpression replaceExpression(@Nonnull JSExpression expression,
+												 @Nonnull JSExpression newExpression)
+			throws IncorrectOperationException
+	{
+		final ASTNode newExpressionNode = newExpression.getNode();
+		final ASTNode oldExpressionNode = expression.getNode();
+		final PsiElement parentNode = expression.getParent();
+		final ASTNode grandParentNode = parentNode.getNode();
+
+		if(grandParentNode == null || oldExpressionNode == null || newExpressionNode == null)
+		{
+			return null;
+		}
+
+		grandParentNode.replaceChild(oldExpressionNode, newExpressionNode);
+		reformat(parentNode);
+
+		return (JSExpression) newExpressionNode.getPsi();
+	}
+
+	public static JSStatement replaceStatement(@Nonnull JSStatement statement,
+											   @NonNls @Nonnull String text)
+			throws IncorrectOperationException
+	{
+		final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+				statement.getProject(),
+				text);
+
+		final ASTNode oldStatementParentNode = statement.getNode();
+		final PsiElement parentNode = statement.getParent();
+		final ASTNode newStatementParentNode = parentNode.getNode();
+
+		if(newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null)
+		{
+			return null;
+		}
+
+		newStatementParentNode.replaceChild(oldStatementParentNode, newStatementNode);
+		reformat(parentNode);
+
+		return (JSStatement) newStatementNode.getPsi();
+	}
+
+	public static JSStatement addStatementBefore(@Nonnull JSStatement statement,
+												 @NonNls @Nonnull String previousStatementText)
+			throws IncorrectOperationException
+	{
+		final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+				statement.getProject(),
+				previousStatementText);
+		final ASTNode oldStatementParentNode = statement.getNode();
+		final PsiElement parentNode = statement.getParent();
+		final ASTNode newStatementParentNode = parentNode.getNode();
+
+		if(newStatementParentNode == null || newStatementNode == null)
+		{
+			return null;
+		}
+
+		newStatementParentNode.addChild(newStatementNode, oldStatementParentNode);
+		reformat(parentNode);
+
+		return (JSStatement) newStatementNode.getPsi();
+	}
+
+	public static JSStatement addStatementAfter(@Nonnull JSStatement statement,
+												@NonNls @Nonnull String nextStatementText)
+			throws IncorrectOperationException
+	{
+		final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+				statement.getProject(),
+				nextStatementText);
+		final ASTNode statementNode = statement.getNode();
+		final ASTNode oldStatementParentNode = ((statementNode == null) ? null : statementNode.getTreeNext());
+		final PsiElement parentNode = statement.getParent();
+		final ASTNode newStatementParentNode = parentNode.getNode();
+
+		if(newStatementParentNode == null || newStatementNode == null)
+		{
+			return null;
+		}
+
+		newStatementParentNode.addChild(newStatementNode, oldStatementParentNode);
+		reformat(parentNode);
+
+		return (JSStatement) newStatementNode.getPsi();
+	}
+
+	public static void addRangeBefore(JSStatement[] statements, JSStatement statement)
+			throws IncorrectOperationException
+	{
+		addRangeBefore(statements, 0, statements.length, statement);
+	}
+
+	public static void addRangeAfter(JSStatement[] statements, JSStatement statement)
+			throws IncorrectOperationException
+	{
+		addRangeAfter(statements, 0, statements.length, statement);
+	}
+
+	@SuppressWarnings({"ForLoopWithMissingComponent"})
+	public static void addRangeBefore(JSStatement[] statements, int start, int length, JSStatement statement)
+			throws IncorrectOperationException
+	{
+		for(int index = start; index < length; index++)
+		{
+			addStatementBefore(statement, statements[index].getText());
+		}
+	}
+
+	@SuppressWarnings({"ForLoopWithMissingComponent"})
+	public static void addRangeAfter(JSStatement[] statements, int start, int length, JSStatement statement)
+			throws IncorrectOperationException
+	{
+		for(int index = length; --index >= start; )
+		{
+			addStatementAfter(statement, statements[index].getText());
+		}
+	}
+
+	public static void replaceExpressionWithNegatedExpression(@Nonnull JSExpression newExpression,
+															  @Nonnull JSExpression exp)
+			throws IncorrectOperationException
+	{
+		JSExpression expressionToReplace = BoolUtils.findNegation(exp);
+		final String replacementString;
+
+		if(expressionToReplace == null)
+		{
+			expressionToReplace = exp;
+
+			if(ComparisonUtils.isComparisonOperator(newExpression))
+			{
+				final JSBinaryExpression binaryExpression = (JSBinaryExpression) newExpression;
+				final IElementType operationSign = binaryExpression.getOperationSign();
+				final String negatedComparison = ComparisonUtils.getNegatedOperatorText(operationSign);
+				final JSExpression leftOperand = binaryExpression.getLOperand();
+				final JSExpression rightOperand = binaryExpression.getROperand();
+
+				assert (rightOperand != null);
+
+				replacementString = leftOperand.getText() + negatedComparison + rightOperand.getText();
+			}
+			else
+			{
+				replacementString = '!' + ParenthesesUtils.getParenthesized(newExpression, ParenthesesUtils.PREFIX_PRECENDENCE);
+			}
+		}
+		else
+		{
+			replacementString = newExpression.getText();
+		}
+		replaceExpression(expressionToReplace, replacementString);
+	}
+
+	public static void replaceExpressionWithNegatedExpressionString(JSExpression exp, String newExpression)
+			throws IncorrectOperationException
+	{
+		assert (exp != null);
+
+		JSExpression expressionToReplace = BoolUtils.findNegation(exp);
+		String replacementString = newExpression;
+
+		if(expressionToReplace == null)
+		{
+			expressionToReplace = exp;
+			replacementString = "!(" + newExpression + ')';
+		}
+
+		replaceExpression(expressionToReplace, replacementString);
+	}
+
+
+	public static void replaceStatementWithUnwrapping(JSStatement statement, JSStatement newBranch)
+			throws IncorrectOperationException
+	{
+		if(!(newBranch instanceof JSBlockStatement))
+		{
+			JSElementFactory.replaceStatement(statement, newBranch.getText());
+			return;
+		}
+
+		final JSBlockStatement parentBlock = PsiTreeUtil.getParentOfType(newBranch, JSBlockStatement.class);
+
+		if(parentBlock == null)
+		{
+			JSElementFactory.replaceStatement(statement, newBranch.getText());
+			return;
+		}
+
+		final JSBlockStatement block = (JSBlockStatement) newBranch;
+
+		if(ControlFlowUtils.containsConflictingDeclarations(block, parentBlock))
+		{
+			JSElementFactory.replaceStatement(statement, newBranch.getText());
+			return;
+		}
+
+		final PsiElement containingElement = statement.getParent();
+
+		assert (containingElement instanceof JSStatement);
+
+		JSElementFactory.addRangeBefore(block.getStatements(), statement);
+		JSElementFactory.removeElement(statement);
+	}
+
+	public static void removeElement(PsiElement element)
+	{
+		final ASTNode node = element.getNode();
+		final ASTNode parentNode = element.getParent().getNode();
+
+		if(node != null && parentNode != null)
+		{
+			parentNode.removeChild(node);
+		}
+	}
+
+	public static void reformat(PsiElement statement) throws IncorrectOperationException
+	{
+		// Reformat only in .js files due to a bug in JavaScript reformatting module when doing it in JSP files
+		if(statement.getContainingFile() instanceof JSFile)
+		{
 			CodeStyleManager.getInstance(statement.getProject()).reformat(statement);
-        }
-    }
-
-    public static PsiElement getNonWhiteSpaceSibling(PsiElement element, boolean forward) {
-        return forward
-               ? PsiTreeUtil.skipSiblingsForward(element, WHITESPACE_CLASS)
-               : PsiTreeUtil.skipSiblingsBackward(element, WHITESPACE_CLASS);
-    }
-
-    public static boolean isFileReadOnly(Project project, PsiFile file) {
-        final ReadonlyStatusHandler instance     = ReadonlyStatusHandler.getInstance(project);
-        final VirtualFile virtualFile = file.getVirtualFile();
-
-        return virtualFile != null && instance.ensureFilesWritable(virtualFile).hasReadonlyFiles();
-    }
+		}
+	}
+
+	public static PsiElement getNonWhiteSpaceSibling(PsiElement element, boolean forward)
+	{
+		return forward
+				? PsiTreeUtil.skipSiblingsForward(element, WHITESPACE_CLASS)
+				: PsiTreeUtil.skipSiblingsBackward(element, WHITESPACE_CLASS);
+	}
+
+	public static boolean isFileReadOnly(Project project, PsiFile file)
+	{
+		final ReadonlyStatusHandler instance = ReadonlyStatusHandler.getInstance(project);
+		final VirtualFile virtualFile = file.getVirtualFile();
+
+		return virtualFile != null && instance.ensureFilesWritable(virtualFile).hasReadonlyFiles();
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
index 6fe9dafa..bddde225 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
@@ -19,51 +19,66 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 
-public class JSRecursionVisitor extends JSRecursiveElementVisitor {
+public class JSRecursionVisitor extends JSRecursiveElementVisitor
+{
 
-    private final JSFunction function;
-    private final String     functionName;
-    private boolean          recursive;
+	private final JSFunction function;
+	private final String functionName;
+	private boolean recursive;
 
-    public JSRecursionVisitor(JSFunction function) {
-        this.function     = function;
-        this.functionName = function.getName();
-    }
+	public JSRecursionVisitor(JSFunction function)
+	{
+		this.function = function;
+		this.functionName = function.getName();
+	}
 
-    @Override public void visitJSElement(JSElement element) {
-        if (!this.recursive) {
-            super.visitJSElement(element);
-        }
-    }
+	@Override
+	public void visitJSElement(JSElement element)
+	{
+		if(!this.recursive)
+		{
+			super.visitJSElement(element);
+		}
+	}
 
-    @Override public void visitJSCallExpression(JSCallExpression call) {
-        if (!this.recursive) {
-            super.visitJSCallExpression(call);
+	@Override
+	public void visitJSCallExpression(JSCallExpression call)
+	{
+		if(!this.recursive)
+		{
+			super.visitJSCallExpression(call);
 
-            final JSExpression methodExpression    = call.getMethodExpression();
-            final String       qualifiedMethodText = methodExpression.getText();
-            final String       methodText          = qualifiedMethodText.substring(qualifiedMethodText.lastIndexOf('.') + 1);
+			final JSExpression methodExpression = call.getMethodExpression();
+			final String qualifiedMethodText = methodExpression.getText();
+			final String methodText = qualifiedMethodText.substring(qualifiedMethodText.lastIndexOf('.') + 1);
 
-            if (methodText.equals(this.functionName)) {
-                final PsiReference methodReference  = methodExpression.getReference();
-                final PsiElement referent         = ((methodReference == null) ? null : methodReference.resolve());
+			if(methodText.equals(this.functionName))
+			{
+				final PsiReference methodReference = methodExpression.getReference();
+				final PsiElement referent = ((methodReference == null) ? null : methodReference.resolve());
 
-                if (referent != null) {
-                    if (referent instanceof JSFunction) {
-                        this.recursive = referent.equals(this.function);
-                    } else if (referent instanceof JSFunctionExpression) {
-                        this.recursive = ((JSFunctionExpression) referent).getFunction().equals(this.function);
-                    }
-                }
-            }
-        }
-    }
+				if(referent != null)
+				{
+					if(referent instanceof JSFunction)
+					{
+						this.recursive = referent.equals(this.function);
+					}
+					else if(referent instanceof JSFunctionExpression)
+					{
+						this.recursive = ((JSFunctionExpression) referent).getFunction().equals(this.function);
+					}
+				}
+			}
+		}
+	}
 
-    public boolean isFunctionNamed() {
-        return (this.functionName != null);
-    }
+	public boolean isFunctionNamed()
+	{
+		return (this.functionName != null);
+	}
 
-    public boolean isRecursive() {
-        return this.recursive;
-    }
+	public boolean isRecursive()
+	{
+		return this.recursive;
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java
index 700fd605..ebfac5ff 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java
@@ -22,9 +22,12 @@
  * Represents a JS element visitor which recursively visits the children of the element
  * on which the visit was started.
  */
-public abstract class JSRecursiveElementVisitor extends JSElementVisitor {
-    @Override public void visitJSElement(JSElement element) {
-        element.acceptChildren(this);
-    }
+public abstract class JSRecursiveElementVisitor extends JSElementVisitor
+{
+	@Override
+	public void visitJSElement(JSElement element)
+	{
+		element.acceptChildren(this);
+	}
 }
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
index 95d8eb7e..f2634cc2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
@@ -15,51 +15,66 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import java.math.BigInteger;
-import java.util.regex.Pattern;
-
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import org.jetbrains.annotations.NonNls;
 
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import java.math.BigInteger;
+import java.util.regex.Pattern;
 
 /**
+ *
  */
-public class NumberUtil {
-    private NumberUtil() {}
+public class NumberUtil
+{
+	private NumberUtil()
+	{
+	}
 
-    @NonNls public static final Pattern decimalPattern = Pattern.compile("[0-9]+");
-    @NonNls public static final Pattern octalPattern   = Pattern.compile("0[0-7]+");
-    @NonNls public static final Pattern hexPattern     = Pattern.compile("0[xX][0-9a-fA-F]+");
+	@NonNls
+	public static final Pattern decimalPattern = Pattern.compile("[0-9]+");
+	@NonNls
+	public static final Pattern octalPattern = Pattern.compile("0[0-7]+");
+	@NonNls
+	public static final Pattern hexPattern = Pattern.compile("0[xX][0-9a-fA-F]+");
 
-    public static BigInteger getLiteralNumber(JSLiteralExpression expression) {
-        String  expressionText = expression.getText();
-        int     radix          = 10;
+	public static BigInteger getLiteralNumber(JSLiteralExpression expression)
+	{
+		String expressionText = expression.getText();
+		int radix = 10;
 
-        if (expressionText == null || expressionText.length() == 0) {
-            return new BigInteger(new byte[] { 0 });
-        }
+		if(expressionText == null || expressionText.length() == 0)
+		{
+			return new BigInteger(new byte[]{0});
+		}
 
-        if (expressionText.charAt(0) == '0') {
-            if (expressionText.length() > 2 && Character.toUpperCase(expressionText.charAt(1)) == 'X') {
-                expressionText = expressionText.substring(2);
-                radix = 16;
-            } else if (octalPattern.matcher(expressionText).matches()) {
-                radix = 8;
-            }
-        }
+		if(expressionText.charAt(0) == '0')
+		{
+			if(expressionText.length() > 2 && Character.toUpperCase(expressionText.charAt(1)) == 'X')
+			{
+				expressionText = expressionText.substring(2);
+				radix = 16;
+			}
+			else if(octalPattern.matcher(expressionText).matches())
+			{
+				radix = 8;
+			}
+		}
 
-        return new BigInteger(expressionText, radix);
-    }
+		return new BigInteger(expressionText, radix);
+	}
 
-    public static boolean isOctal(String number) {
-        return octalPattern.matcher(number).matches();
-    }
+	public static boolean isOctal(String number)
+	{
+		return octalPattern.matcher(number).matches();
+	}
 
-    public static boolean isDecimal(String number) {
-        return decimalPattern.matcher(number).matches();
-    }
+	public static boolean isDecimal(String number)
+	{
+		return decimalPattern.matcher(number).matches();
+	}
 
-    public static boolean isHex(String number) {
-        return hexPattern.matcher(number).matches();
-    }
+	public static boolean isHex(String number)
+	{
+		return hexPattern.matcher(number).matches();
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
index 4930ced5..83cb1f22 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
@@ -17,311 +17,376 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
 import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class ParenthesesUtils {
-    private ParenthesesUtils() {}
-
-    private static final int PARENTHESIZED_PRECENDENCE  =  0;
-    private static final int LITERAL_PRECENDENCE        =  0;
-    public  static final int METHOD_CALL_PRECENDENCE    =  1;
-
-    private static final int POSTFIX_PRECENDENCE        =  2;
-    public  static final int PREFIX_PRECENDENCE         =  3;
-    public  static final int TYPE_CAST_PRECENDENCE      =  4;
-    public  static final int MULTIPLICATIVE_PRECENDENCE =  5;
-    private static final int ADDITIVE_PRECENDENCE       =  6;
-    public  static final int SHIFT_PRECENDENCE          =  7;
-    private static final int RELATIONAL_PRECENDENCE     =  8;
-    public  static final int EQUALITY_PRECENDENCE       =  9;
-
-    private static final int BINARY_AND_PRECENDENCE     = 10;
-    private static final int BINARY_XOR_PRECENDENCE     = 11;
-    private static final int BINARY_OR_PRECENDENCE      = 12;
-    public  static final int AND_PRECENDENCE            = 13;
-    public  static final int OR_PRECENDENCE             = 14;
-    public  static final int CONDITIONAL_PRECENDENCE    = 15;
-    private static final int ASSIGNMENT_PRECENDENCE     = 16;
-
-    private static final int NUM_PRECENDENCES           = 17;
-
-    private static final Map<IElementType, Integer> binaryOperatorPrecendence =
-            new HashMap<IElementType, Integer>(NUM_PRECENDENCES);
-
-    static {
-        binaryOperatorPrecendence.put(JSTokenTypes.PLUS,   ADDITIVE_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.MINUS,  ADDITIVE_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.MULT,   MULTIPLICATIVE_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.DIV,    MULTIPLICATIVE_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.PERC,   MULTIPLICATIVE_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.ANDAND, AND_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.OROR,   OR_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.AND,    BINARY_AND_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.OR,     BINARY_OR_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.XOR,    BINARY_XOR_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.COMMA,  ASSIGNMENT_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.LTLT,   SHIFT_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.GTGT,   SHIFT_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.GTGTGT, SHIFT_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.GT,     RELATIONAL_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.GE,     RELATIONAL_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.LT,     RELATIONAL_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.LE,     RELATIONAL_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.EQEQ,   EQUALITY_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.NE,     EQUALITY_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.EQEQEQ, EQUALITY_PRECENDENCE);
-        binaryOperatorPrecendence.put(JSTokenTypes.NEQEQ,  EQUALITY_PRECENDENCE);
-    }
-
-    public static JSExpression stripParentheses(JSExpression expression) {
-        JSExpression parenthesized = expression;
-
-        if (parenthesized != null) {
-            while (parenthesized instanceof JSParenthesizedExpression) {
-                parenthesized = ((JSParenthesizedExpression) parenthesized).getInnerExpression();
-            }
-        }
-
-        return parenthesized;
-    }
-
-    public static JSExpression unstripParentheses(JSExpression expression) {
-        JSExpression parenthesized = expression;
-
-        if (parenthesized != null) {
-            PsiElement parent = parenthesized.getParent();
-
-            while (parent instanceof JSParenthesizedExpression) {
-                parenthesized = (JSParenthesizedExpression) parent;
-                parent        = parenthesized.getParent();
-            }
-        }
-
-        return parenthesized;
-    }
-
-    public static String getParenthesized(JSExpression expression, int precendence) {
-        return (ParenthesesUtils.getPrecendence(expression) > precendence
-                ? '(' + expression.getText() + ')'
-                : expression.getText());
-    }
-
-    public static int getPrecendence(JSExpression expression) {
-        if (expression instanceof JSThisExpression          ||
-            expression instanceof JSLiteralExpression       ||
-            expression instanceof JSArrayLiteralExpression  ||
-            expression instanceof JSObjectLiteralExpression ||
-            expression instanceof JSIndexedPropertyAccessExpression) {
-            return LITERAL_PRECENDENCE;
-        }
-        if (expression instanceof JSReferenceExpression) {
-            return ((JSReferenceExpression) expression).getQualifier() == null
-                   ? LITERAL_PRECENDENCE
-                   : METHOD_CALL_PRECENDENCE;
-        }
-        if (expression instanceof JSNewExpression) {
-            return TYPE_CAST_PRECENDENCE;
-        }
-        if (expression instanceof JSCallExpression) {
-            return METHOD_CALL_PRECENDENCE;
-        }
-        if (expression instanceof JSPostfixExpression) {
-            return POSTFIX_PRECENDENCE;
-        }
-        if (expression instanceof JSPrefixExpression) {
-            return PREFIX_PRECENDENCE;
-        }
-        if (expression instanceof JSAssignmentExpression) {
-            return ASSIGNMENT_PRECENDENCE;
-        }
-        if (expression instanceof JSBinaryExpression) {
-            return getBinaryOperatorPrecendence(((JSBinaryExpression) expression).getOperationSign());
-        }
-        if(expression instanceof JSConditionalExpression) {
-            return CONDITIONAL_PRECENDENCE;
-        }
-        if (expression instanceof JSParenthesizedExpression) {
-            return PARENTHESIZED_PRECENDENCE;
-        }
-
-        // expression instanceof JSCommaExpression      ||
-        // expression instanceof JSDefinitionExpression ||
-        // expression instanceof JSFunctionExpression
-        return -1;
-    }
-
-    private static int getBinaryOperatorPrecendence(IElementType sign) {
-        if (binaryOperatorPrecendence.containsKey(sign)) return binaryOperatorPrecendence.get(sign);
-        return ASSIGNMENT_PRECENDENCE;
-    }
-
-    public static String removeParentheses(JSExpression expression) {
-        if (expression instanceof JSCallExpression) {
-            return removeParensFromFunctionCallExpression((JSCallExpression) expression);
-        }
-        if (expression instanceof JSReferenceExpression) {
-            return removeParensFromReferenceExpression(
-                    (JSReferenceExpression) expression);
-        }
-        if (expression instanceof JSAssignmentExpression) {
-            return removeParensFromAssignmentExpression(
-                    (JSAssignmentExpression) expression);
-        }
-        if (expression instanceof JSArrayLiteralExpression) {
-            return removeParensFromArrayLiteralExpression((JSArrayLiteralExpression) expression);
-        }
-        if (expression instanceof JSPrefixExpression) {
-            return removeParensFromPrefixExpression((JSPrefixExpression) expression);
-        }
-        if (expression instanceof JSPostfixExpression) {
-            return removeParensFromPostfixExpression((JSPostfixExpression) expression);
-        }
-        if (expression instanceof JSBinaryExpression) {
-            return removeParensFromBinaryExpression((JSBinaryExpression) expression);
-        }
-        if (expression instanceof JSConditionalExpression) {
-            return removeParensFromConditionalExpression((JSConditionalExpression) expression);
-        }
-        if (expression instanceof JSParenthesizedExpression) {
-            return removeParensFromParenthesizedExpression((JSParenthesizedExpression) expression);
-        }
-
-        return expression.getText();
-    }
-
-    private static String removeParensFromReferenceExpression(JSReferenceExpression expression) {
-        final JSExpression qualifier = expression.getQualifier();
-
-        if (qualifier != null) {
-            return removeParentheses(qualifier) + '.' + expression.getReferencedName();
-        } else{
-            return expression.getText();
-        }
-    }
-
-    private static String removeParensFromParenthesizedExpression(JSParenthesizedExpression parenthesizedExp) {
-        final JSExpression body = stripParentheses(parenthesizedExp.getInnerExpression());
-
-        if (!(parenthesizedExp.getParent() instanceof JSExpression)) {
-            return removeParentheses(body);
-        }
-
-        final JSExpression parentExp         = (JSExpression) parenthesizedExp.getParent();
-        final int          parentPrecendence = getPrecendence(parentExp);
-        final int          childPrecendence  = getPrecendence(body);
-
-        if (parentPrecendence < childPrecendence) {
-            return '(' + removeParentheses(body) + ')';
-        } else if (parentPrecendence == childPrecendence) {
-            if (parentExp instanceof JSBinaryExpression && body instanceof JSBinaryExpression) {
-                final IElementType parentOperator = ((JSBinaryExpression) parentExp).getOperationSign();
-                final IElementType bodyOperator   = ((JSBinaryExpression) body)     .getOperationSign();
-                final JSExpression lhs            = ((JSBinaryExpression) parentExp).getLOperand();
-
-                if (lhs.equals(parenthesizedExp) && parentOperator.equals(bodyOperator)) {
-                    return removeParentheses(body);
-                } else {
-                    return '(' + removeParentheses(body) + ')';
-                }
-            } else {
-                return removeParentheses(body);
-            }
-        } else {
-            return removeParentheses(body);
-        }
-    }
-
-    private static String removeParensFromConditionalExpression(JSConditionalExpression conditionalExp) {
-        final JSExpression condition  = conditionalExp.getCondition();
-        final JSExpression thenBranch = conditionalExp.getThen();
-        final JSExpression elseBranch = conditionalExp.getElse();
-
-        return removeParentheses(condition)  + " ? " +
-               removeParentheses(thenBranch) + " : " +
-               removeParentheses(elseBranch);
-    }
-
-    private static String removeParensFromBinaryExpression(JSBinaryExpression binaryExp) {
-        final JSExpression lhs  = binaryExp.getLOperand();
-        final JSExpression rhs  = binaryExp.getROperand();
-        final IElementType sign = binaryExp.getOperationSign();
-
-        return removeParentheses(lhs) + ' ' + BinaryOperatorUtils.getOperatorText(sign) + ' '  + removeParentheses(rhs);
-    }
-
-    private static String removeParensFromPostfixExpression(JSPostfixExpression postfixExp) {
-        final JSExpression body = postfixExp.getExpression();
-        final IElementType sign = postfixExp.getOperationSign();
-
-        return removeParentheses(body) + BinaryOperatorUtils.getOperatorText(sign);
-    }
-
-    private static String removeParensFromPrefixExpression(JSPrefixExpression prefixExp) {
-        final JSExpression body = prefixExp.getExpression();
-        IElementType sign = prefixExp.getOperationSign();
-        if (sign == null) {
-          final ASTNode[] astNodes = prefixExp.getNode().getChildren(JSTokenTypes.UNARY_OPERATIONS); // hack for 8.1
-          sign = astNodes.length == 1 ? astNodes[0].getElementType() : null;
-        }
-
-        return (sign != null ? BinaryOperatorUtils.getOperatorText(sign) : "delete ") + removeParentheses(body);
-    }
-
-    private static String removeParensFromArrayLiteralExpression(JSArrayLiteralExpression init) {
-        final JSExpression[] contents   = init.getExpressions();
-        final String         text       = init.getText();
-        final int            textLength = text.length();
-        final StringBuilder  out        = new StringBuilder(textLength);
-
-        out.append('(');
-        for (int index = 0; index < contents.length; index++) {
-            final JSExpression arg = contents[index];
-
-            if (index != 0) {
-                out.append(',');
-            }
-            out.append(removeParentheses(arg));
-        }
-
-        return out.append(')').toString();
-    }
-
-    private static String removeParensFromAssignmentExpression(JSAssignmentExpression assignment) {
-        final JSExpression lhs  = assignment.getLOperand();
-        final JSExpression rhs  = assignment.getROperand();
-        final IElementType sign = assignment.getOperationSign();
-        return removeParentheses(lhs) + ' ' +
-               BinaryOperatorUtils.getOperatorText(sign) + ' ' +
-               removeParentheses(rhs);
-    }
-
-    private static String removeParensFromFunctionCallExpression(JSCallExpression functionCall) {
-        final JSExpression   target       = functionCall.getMethodExpression();
-        final JSArgumentList argumentList = functionCall.getArgumentList();
-
-        assert (argumentList != null);
-
-        final JSExpression[] args           = argumentList.getArguments();
-        final String         methodCallText = functionCall.getText();
-        final int            length         = methodCallText.length();
-        final StringBuilder  out            = new StringBuilder(length);
-        final String         strippedTarget = removeParentheses(target);
-
-        out.append(strippedTarget);
-        out.append('(');
-        for (int index = 0; index < args.length; index++) {
-            final JSExpression arg = args[index];
-            if (index != 0) {
-                out.append(',');
-            }
-            out.append(removeParentheses(arg));
-        }
-        out.append(')');
-        return out.toString();
-    }
+public class ParenthesesUtils
+{
+	private ParenthesesUtils()
+	{
+	}
+
+	private static final int PARENTHESIZED_PRECENDENCE = 0;
+	private static final int LITERAL_PRECENDENCE = 0;
+	public static final int METHOD_CALL_PRECENDENCE = 1;
+
+	private static final int POSTFIX_PRECENDENCE = 2;
+	public static final int PREFIX_PRECENDENCE = 3;
+	public static final int TYPE_CAST_PRECENDENCE = 4;
+	public static final int MULTIPLICATIVE_PRECENDENCE = 5;
+	private static final int ADDITIVE_PRECENDENCE = 6;
+	public static final int SHIFT_PRECENDENCE = 7;
+	private static final int RELATIONAL_PRECENDENCE = 8;
+	public static final int EQUALITY_PRECENDENCE = 9;
+
+	private static final int BINARY_AND_PRECENDENCE = 10;
+	private static final int BINARY_XOR_PRECENDENCE = 11;
+	private static final int BINARY_OR_PRECENDENCE = 12;
+	public static final int AND_PRECENDENCE = 13;
+	public static final int OR_PRECENDENCE = 14;
+	public static final int CONDITIONAL_PRECENDENCE = 15;
+	private static final int ASSIGNMENT_PRECENDENCE = 16;
+
+	private static final int NUM_PRECENDENCES = 17;
+
+	private static final Map<IElementType, Integer> binaryOperatorPrecendence =
+			new HashMap<IElementType, Integer>(NUM_PRECENDENCES);
+
+	static
+	{
+		binaryOperatorPrecendence.put(JSTokenTypes.PLUS, ADDITIVE_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.MINUS, ADDITIVE_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.MULT, MULTIPLICATIVE_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.DIV, MULTIPLICATIVE_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.PERC, MULTIPLICATIVE_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.ANDAND, AND_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.OROR, OR_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.AND, BINARY_AND_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.OR, BINARY_OR_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.XOR, BINARY_XOR_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.COMMA, ASSIGNMENT_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.LTLT, SHIFT_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.GTGT, SHIFT_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.GTGTGT, SHIFT_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.GT, RELATIONAL_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.GE, RELATIONAL_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.LT, RELATIONAL_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.LE, RELATIONAL_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.EQEQ, EQUALITY_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.NE, EQUALITY_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.EQEQEQ, EQUALITY_PRECENDENCE);
+		binaryOperatorPrecendence.put(JSTokenTypes.NEQEQ, EQUALITY_PRECENDENCE);
+	}
+
+	public static JSExpression stripParentheses(JSExpression expression)
+	{
+		JSExpression parenthesized = expression;
+
+		if(parenthesized != null)
+		{
+			while(parenthesized instanceof JSParenthesizedExpression)
+			{
+				parenthesized = ((JSParenthesizedExpression) parenthesized).getInnerExpression();
+			}
+		}
+
+		return parenthesized;
+	}
+
+	public static JSExpression unstripParentheses(JSExpression expression)
+	{
+		JSExpression parenthesized = expression;
+
+		if(parenthesized != null)
+		{
+			PsiElement parent = parenthesized.getParent();
+
+			while(parent instanceof JSParenthesizedExpression)
+			{
+				parenthesized = (JSParenthesizedExpression) parent;
+				parent = parenthesized.getParent();
+			}
+		}
+
+		return parenthesized;
+	}
+
+	public static String getParenthesized(JSExpression expression, int precendence)
+	{
+		return (ParenthesesUtils.getPrecendence(expression) > precendence
+				? '(' + expression.getText() + ')'
+				: expression.getText());
+	}
+
+	public static int getPrecendence(JSExpression expression)
+	{
+		if(expression instanceof JSThisExpression ||
+				expression instanceof JSLiteralExpression ||
+				expression instanceof JSArrayLiteralExpression ||
+				expression instanceof JSObjectLiteralExpression ||
+				expression instanceof JSIndexedPropertyAccessExpression)
+		{
+			return LITERAL_PRECENDENCE;
+		}
+		if(expression instanceof JSReferenceExpression)
+		{
+			return ((JSReferenceExpression) expression).getQualifier() == null
+					? LITERAL_PRECENDENCE
+					: METHOD_CALL_PRECENDENCE;
+		}
+		if(expression instanceof JSNewExpression)
+		{
+			return TYPE_CAST_PRECENDENCE;
+		}
+		if(expression instanceof JSCallExpression)
+		{
+			return METHOD_CALL_PRECENDENCE;
+		}
+		if(expression instanceof JSPostfixExpression)
+		{
+			return POSTFIX_PRECENDENCE;
+		}
+		if(expression instanceof JSPrefixExpression)
+		{
+			return PREFIX_PRECENDENCE;
+		}
+		if(expression instanceof JSAssignmentExpression)
+		{
+			return ASSIGNMENT_PRECENDENCE;
+		}
+		if(expression instanceof JSBinaryExpression)
+		{
+			return getBinaryOperatorPrecendence(((JSBinaryExpression) expression).getOperationSign());
+		}
+		if(expression instanceof JSConditionalExpression)
+		{
+			return CONDITIONAL_PRECENDENCE;
+		}
+		if(expression instanceof JSParenthesizedExpression)
+		{
+			return PARENTHESIZED_PRECENDENCE;
+		}
+
+		// expression instanceof JSCommaExpression      ||
+		// expression instanceof JSDefinitionExpression ||
+		// expression instanceof JSFunctionExpression
+		return -1;
+	}
+
+	private static int getBinaryOperatorPrecendence(IElementType sign)
+	{
+		if(binaryOperatorPrecendence.containsKey(sign))
+		{
+			return binaryOperatorPrecendence.get(sign);
+		}
+		return ASSIGNMENT_PRECENDENCE;
+	}
+
+	public static String removeParentheses(JSExpression expression)
+	{
+		if(expression instanceof JSCallExpression)
+		{
+			return removeParensFromFunctionCallExpression((JSCallExpression) expression);
+		}
+		if(expression instanceof JSReferenceExpression)
+		{
+			return removeParensFromReferenceExpression(
+					(JSReferenceExpression) expression);
+		}
+		if(expression instanceof JSAssignmentExpression)
+		{
+			return removeParensFromAssignmentExpression(
+					(JSAssignmentExpression) expression);
+		}
+		if(expression instanceof JSArrayLiteralExpression)
+		{
+			return removeParensFromArrayLiteralExpression((JSArrayLiteralExpression) expression);
+		}
+		if(expression instanceof JSPrefixExpression)
+		{
+			return removeParensFromPrefixExpression((JSPrefixExpression) expression);
+		}
+		if(expression instanceof JSPostfixExpression)
+		{
+			return removeParensFromPostfixExpression((JSPostfixExpression) expression);
+		}
+		if(expression instanceof JSBinaryExpression)
+		{
+			return removeParensFromBinaryExpression((JSBinaryExpression) expression);
+		}
+		if(expression instanceof JSConditionalExpression)
+		{
+			return removeParensFromConditionalExpression((JSConditionalExpression) expression);
+		}
+		if(expression instanceof JSParenthesizedExpression)
+		{
+			return removeParensFromParenthesizedExpression((JSParenthesizedExpression) expression);
+		}
+
+		return expression.getText();
+	}
+
+	private static String removeParensFromReferenceExpression(JSReferenceExpression expression)
+	{
+		final JSExpression qualifier = expression.getQualifier();
+
+		if(qualifier != null)
+		{
+			return removeParentheses(qualifier) + '.' + expression.getReferencedName();
+		}
+		else
+		{
+			return expression.getText();
+		}
+	}
+
+	private static String removeParensFromParenthesizedExpression(JSParenthesizedExpression parenthesizedExp)
+	{
+		final JSExpression body = stripParentheses(parenthesizedExp.getInnerExpression());
+
+		if(!(parenthesizedExp.getParent() instanceof JSExpression))
+		{
+			return removeParentheses(body);
+		}
+
+		final JSExpression parentExp = (JSExpression) parenthesizedExp.getParent();
+		final int parentPrecendence = getPrecendence(parentExp);
+		final int childPrecendence = getPrecendence(body);
+
+		if(parentPrecendence < childPrecendence)
+		{
+			return '(' + removeParentheses(body) + ')';
+		}
+		else if(parentPrecendence == childPrecendence)
+		{
+			if(parentExp instanceof JSBinaryExpression && body instanceof JSBinaryExpression)
+			{
+				final IElementType parentOperator = ((JSBinaryExpression) parentExp).getOperationSign();
+				final IElementType bodyOperator = ((JSBinaryExpression) body).getOperationSign();
+				final JSExpression lhs = ((JSBinaryExpression) parentExp).getLOperand();
+
+				if(lhs.equals(parenthesizedExp) && parentOperator.equals(bodyOperator))
+				{
+					return removeParentheses(body);
+				}
+				else
+				{
+					return '(' + removeParentheses(body) + ')';
+				}
+			}
+			else
+			{
+				return removeParentheses(body);
+			}
+		}
+		else
+		{
+			return removeParentheses(body);
+		}
+	}
+
+	private static String removeParensFromConditionalExpression(JSConditionalExpression conditionalExp)
+	{
+		final JSExpression condition = conditionalExp.getCondition();
+		final JSExpression thenBranch = conditionalExp.getThen();
+		final JSExpression elseBranch = conditionalExp.getElse();
+
+		return removeParentheses(condition) + " ? " +
+				removeParentheses(thenBranch) + " : " +
+				removeParentheses(elseBranch);
+	}
+
+	private static String removeParensFromBinaryExpression(JSBinaryExpression binaryExp)
+	{
+		final JSExpression lhs = binaryExp.getLOperand();
+		final JSExpression rhs = binaryExp.getROperand();
+		final IElementType sign = binaryExp.getOperationSign();
+
+		return removeParentheses(lhs) + ' ' + BinaryOperatorUtils.getOperatorText(sign) + ' ' + removeParentheses(rhs);
+	}
+
+	private static String removeParensFromPostfixExpression(JSPostfixExpression postfixExp)
+	{
+		final JSExpression body = postfixExp.getExpression();
+		final IElementType sign = postfixExp.getOperationSign();
+
+		return removeParentheses(body) + BinaryOperatorUtils.getOperatorText(sign);
+	}
+
+	private static String removeParensFromPrefixExpression(JSPrefixExpression prefixExp)
+	{
+		final JSExpression body = prefixExp.getExpression();
+		IElementType sign = prefixExp.getOperationSign();
+		if(sign == null)
+		{
+			final ASTNode[] astNodes = prefixExp.getNode().getChildren(JSTokenTypes.UNARY_OPERATIONS); // hack for 8.1
+			sign = astNodes.length == 1 ? astNodes[0].getElementType() : null;
+		}
+
+		return (sign != null ? BinaryOperatorUtils.getOperatorText(sign) : "delete ") + removeParentheses(body);
+	}
+
+	private static String removeParensFromArrayLiteralExpression(JSArrayLiteralExpression init)
+	{
+		final JSExpression[] contents = init.getExpressions();
+		final String text = init.getText();
+		final int textLength = text.length();
+		final StringBuilder out = new StringBuilder(textLength);
+
+		out.append('(');
+		for(int index = 0; index < contents.length; index++)
+		{
+			final JSExpression arg = contents[index];
+
+			if(index != 0)
+			{
+				out.append(',');
+			}
+			out.append(removeParentheses(arg));
+		}
+
+		return out.append(')').toString();
+	}
+
+	private static String removeParensFromAssignmentExpression(JSAssignmentExpression assignment)
+	{
+		final JSExpression lhs = assignment.getLOperand();
+		final JSExpression rhs = assignment.getROperand();
+		final IElementType sign = assignment.getOperationSign();
+		return removeParentheses(lhs) + ' ' +
+				BinaryOperatorUtils.getOperatorText(sign) + ' ' +
+				removeParentheses(rhs);
+	}
+
+	private static String removeParensFromFunctionCallExpression(JSCallExpression functionCall)
+	{
+		final JSExpression target = functionCall.getMethodExpression();
+		final JSArgumentList argumentList = functionCall.getArgumentList();
+
+		assert (argumentList != null);
+
+		final JSExpression[] args = argumentList.getArguments();
+		final String methodCallText = functionCall.getText();
+		final int length = methodCallText.length();
+		final StringBuilder out = new StringBuilder(length);
+		final String strippedTarget = removeParentheses(target);
+
+		out.append(strippedTarget);
+		out.append('(');
+		for(int index = 0; index < args.length; index++)
+		{
+			final JSExpression arg = args[index];
+			if(index != 0)
+			{
+				out.append(',');
+			}
+			out.append(removeParentheses(arg));
+		}
+		out.append(')');
+		return out.toString();
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
index d6820f94..4c9cca65 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
@@ -15,601 +15,724 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSArgumentList;
-import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
-import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.lang.javascript.psi.JSBinaryExpression;
-import com.intellij.lang.javascript.psi.JSBlockStatement;
-import com.intellij.lang.javascript.psi.JSBreakStatement;
-import com.intellij.lang.javascript.psi.JSCallExpression;
-import com.intellij.lang.javascript.psi.JSCaseClause;
-import com.intellij.lang.javascript.psi.JSCatchBlock;
-import com.intellij.lang.javascript.psi.JSConditionalExpression;
-import com.intellij.lang.javascript.psi.JSContinueStatement;
-import com.intellij.lang.javascript.psi.JSDoWhileStatement;
-import com.intellij.lang.javascript.psi.JSEmptyStatement;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSExpressionStatement;
-import com.intellij.lang.javascript.psi.JSForInStatement;
-import com.intellij.lang.javascript.psi.JSForStatement;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import com.intellij.lang.javascript.psi.JSIndexedPropertyAccessExpression;
-import com.intellij.lang.javascript.psi.JSLabeledStatement;
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.lang.javascript.psi.JSNewExpression;
-import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
-import com.intellij.lang.javascript.psi.JSPostfixExpression;
-import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSReturnStatement;
-import com.intellij.lang.javascript.psi.JSSourceElement;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.intellij.lang.javascript.psi.JSThisExpression;
-import com.intellij.lang.javascript.psi.JSThrowStatement;
-import com.intellij.lang.javascript.psi.JSTryStatement;
-import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.intellij.lang.javascript.psi.JSVariable;
-import com.intellij.lang.javascript.psi.JSWhileStatement;
+import com.intellij.lang.javascript.psi.*;
 import consulo.language.ast.IElementType;
 
-public class RecursionUtil {
-
-    private RecursionUtil() {}
-
-    public static boolean statementMayReturnBeforeRecursing(
-            JSStatement statement, JSFunction method) {
-        if (statement == null) {
-            return true;
-        }
-
-        if (statement instanceof JSBreakStatement      ||
-            statement instanceof JSContinueStatement   ||
-            statement instanceof JSThrowStatement      ||
-            statement instanceof JSExpressionStatement ||
-            statement instanceof JSEmptyStatement      ||
-            statement instanceof JSVarStatement) {
-            return false;
-        } else if (statement instanceof JSReturnStatement) {
-            final JSReturnStatement returnStatement =
-                    (JSReturnStatement) statement;
-            final JSExpression returnValue = returnStatement.getExpression();
-            return (returnValue == null ||
-                    !RecursionUtil.expressionDefinitelyRecurses(returnValue, method));
-        } else if (statement instanceof JSForStatement) {
-            return RecursionUtil.forStatementMayReturnBeforeRecursing(
-                    (JSForStatement) statement, method);
-        } else if (statement instanceof JSForInStatement) {
-            return RecursionUtil.forInStatementMayReturnBeforeRecursing(
-                    (JSForInStatement) statement, method);
-        } else if (statement instanceof JSWhileStatement) {
-            return RecursionUtil.whileStatementMayReturnBeforeRecursing(
-                    (JSWhileStatement) statement, method);
-        } else if (statement instanceof JSDoWhileStatement) {
-            return RecursionUtil.doWhileStatementMayReturnBeforeRecursing(
-                    (JSDoWhileStatement) statement, method);
-        } else if (statement instanceof JSBlockStatement) {
-            final JSBlockStatement blockStatement =
-                    (JSBlockStatement)statement;
-            return RecursionUtil.blockStatementMayReturnBeforeRecursing(blockStatement, method, false);
-        } else if (statement instanceof JSLabeledStatement) {
-            return RecursionUtil.labeledStatementMayReturnBeforeRecursing(
-                    (JSLabeledStatement) statement, method);
-        } else if (statement instanceof JSIfStatement) {
-            return RecursionUtil.ifStatementMayReturnBeforeRecursing(
-                    (JSIfStatement) statement, method);
-        } else if (statement instanceof JSTryStatement) {
-            return RecursionUtil.tryStatementMayReturnBeforeRecursing(
-                    (JSTryStatement) statement, method);
-        } else if (statement instanceof JSSwitchStatement) {
-            return RecursionUtil.switchStatementMayReturnBeforeRecursing(
-                    (JSSwitchStatement) statement, method);
-        } else {
-            // unknown statement type
-            return true;
-        }
-    }
-
-    private static boolean doWhileStatementMayReturnBeforeRecursing(
-            JSDoWhileStatement loopStatement, JSFunction method) {
-        final JSStatement body = loopStatement.getBody();
-        return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
-    }
-
-    private static boolean whileStatementMayReturnBeforeRecursing(
-            JSWhileStatement loopStatement, JSFunction method) {
-        final JSExpression test = loopStatement.getCondition();
-        if (RecursionUtil.expressionDefinitelyRecurses(test, method)) {
-            return false;
-        }
-        final JSStatement body = loopStatement.getBody();
-        return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
-    }
-
-    private static boolean forStatementMayReturnBeforeRecursing(
-            JSForStatement loopStatement, JSFunction method) {
-
-        if (RecursionUtil.statementMayReturnBeforeRecursing(loopStatement.getVarDeclaration(), method)) {
-            return true;
-        }
-        if (RecursionUtil.expressionDefinitelyRecurses(loopStatement.getInitialization(), method)) {
-            return false;
-        }
-        if (RecursionUtil.expressionDefinitelyRecurses(loopStatement.getCondition(), method)) {
-            return false;
-        }
-        return RecursionUtil.statementMayReturnBeforeRecursing(loopStatement.getBody(), method);
-    }
-
-    private static boolean forInStatementMayReturnBeforeRecursing(
-            JSForInStatement loopStatement, JSFunction method) {
-        final JSExpression collection = loopStatement.getCollectionExpression();
-        if (RecursionUtil.expressionDefinitelyRecurses(collection, method)) {
-            return false;
-        }
-        final JSStatement body = loopStatement.getBody();
-        return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
-    }
-
-    private static boolean switchStatementMayReturnBeforeRecursing(
-            JSSwitchStatement switchStatement, JSFunction method) {
-
-        for (final JSCaseClause clause : switchStatement.getCaseClauses()) {
-            for (final JSStatement statement : clause.getStatements()) {
-                if (RecursionUtil.statementMayReturnBeforeRecursing(statement, method)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private static boolean tryStatementMayReturnBeforeRecursing(
-            JSTryStatement tryStatement, JSFunction method) {
-        final JSStatement finallyStatement = tryStatement.getFinallyStatement();
-
-        if (finallyStatement != null) {
-            if (RecursionUtil.statementMayReturnBeforeRecursing(finallyStatement, method)) {
-                return true;
-            }
-            if (RecursionUtil.statementDefinitelyRecurses(finallyStatement, method)) {
-                return false;
-            }
-        }
-
-        final JSStatement statement = tryStatement.getStatement();
-
-        if (RecursionUtil.statementMayReturnBeforeRecursing(statement, method)) {
-            return true;
-        }
-
-        final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
-
-        if (catchBlock != null) {
-            final JSStatement catchStatement = catchBlock.getStatement();
-
-            if (RecursionUtil.statementMayReturnBeforeRecursing(catchStatement, method)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean ifStatementMayReturnBeforeRecursing(
-            JSIfStatement ifStatement, JSFunction method) {
-        final JSExpression test = ifStatement.getCondition();
-        if (RecursionUtil.expressionDefinitelyRecurses(test, method)) {
-            return false;
-        }
-        final JSStatement thenBranch = ifStatement.getThen();
-        if (RecursionUtil.statementMayReturnBeforeRecursing(thenBranch, method)) {
-            return true;
-        }
-        final JSStatement elseBranch = ifStatement.getElse();
-        return elseBranch != null &&
-               RecursionUtil.statementMayReturnBeforeRecursing(elseBranch, method);
-    }
-
-    private static boolean labeledStatementMayReturnBeforeRecursing(
-            JSLabeledStatement labeledStatement, JSFunction method) {
-        final JSStatement statement = labeledStatement.getStatement();
-        return RecursionUtil.statementMayReturnBeforeRecursing(statement, method);
-    }
-
-    private static boolean blockStatementMayReturnBeforeRecursing(
-            JSBlockStatement block, JSFunction method, boolean endsInImplicitReturn) {
-        if (block == null) {
-            return true;
-        }
-
-        final JSStatement[] statements = block.getStatements();
-
-        for (final JSStatement statement : statements) {
-            if (RecursionUtil.statementMayReturnBeforeRecursing(statement, method)) {
-                return true;
-            }
-            if (RecursionUtil.statementDefinitelyRecurses(statement, method)) {
-                return false;
-            }
-        }
-        return endsInImplicitReturn;
-    }
-
-    public static boolean functionMayRecurse(@Nonnull JSFunction function) {
-        final JSRecursionVisitor recursionVisitor = new JSRecursionVisitor(function);
-
-        if (recursionVisitor.isFunctionNamed()) {
-            function.accept(recursionVisitor);
-        }
-        return recursionVisitor.isRecursive();
-    }
-
-    private static boolean expressionDefinitelyRecurses(JSExpression exp,
-                                                        JSFunction method) {
-        if (exp == null) {
-            return false;
-        }
-        if (exp instanceof JSNewExpression) {
-            return RecursionUtil.newExpressionDefinitelyRecurses(
-                    (JSNewExpression) exp, method);
-        }
-        if (exp instanceof JSCallExpression) {
-            return RecursionUtil.callExpressionDefinitelyRecurses(
-                    (JSCallExpression) exp, method);
-        }
-        if (exp instanceof JSAssignmentExpression) {
-            return RecursionUtil.assignmentExpressionDefinitelyRecurses(
-                    (JSAssignmentExpression) exp, method);
-        }
-        if (exp instanceof JSArrayLiteralExpression) {
-            return RecursionUtil.arrayLiteralExpressionDefinitelyRecurses(
-                    (JSArrayLiteralExpression) exp, method);
-        }
-        if (exp instanceof JSIndexedPropertyAccessExpression) {
-            return RecursionUtil.indexedPropertyAccessExpressionDefinitelyRecurses(
-                    (JSIndexedPropertyAccessExpression) exp, method);
-        }
-        if (exp instanceof JSPrefixExpression) {
-            return RecursionUtil.prefixExpressionDefinitelyRecurses(
-                    (JSPrefixExpression) exp, method);
-        }
-        if (exp instanceof JSPostfixExpression) {
-            return RecursionUtil.postfixExpressionDefinitelyRecurses(
-                    (JSPostfixExpression) exp, method);
-        }
-        if (exp instanceof JSBinaryExpression) {
-            return RecursionUtil.binaryExpressionDefinitelyRecurses(
-                    (JSBinaryExpression) exp, method);
-        }
-        if (exp instanceof JSConditionalExpression) {
-            return RecursionUtil.conditionalExpressionDefinitelyRecurses(
-                    (JSConditionalExpression) exp, method);
-        }
-        if (exp instanceof JSParenthesizedExpression) {
-            return RecursionUtil.parenthesizedExpressionDefinitelyRecurses(
-                    (JSParenthesizedExpression) exp, method);
-        }
-        if (exp instanceof JSReferenceExpression) {
-            return RecursionUtil.referenceExpressionDefinitelyRecurses(
-                    (JSReferenceExpression) exp, method);
-        }
-        if (exp instanceof JSLiteralExpression ||
-            exp instanceof JSThisExpression) {
-            return false;
-        }
-        return false;
-    }
-
-    private static boolean conditionalExpressionDefinitelyRecurses(
-            JSConditionalExpression expression, JSFunction method) {
-        final JSExpression condExpression = expression.getCondition();
-
-        return RecursionUtil.expressionDefinitelyRecurses(condExpression, method) ||
-               (RecursionUtil.expressionDefinitelyRecurses(expression.getThen(), method) &&
-                RecursionUtil.expressionDefinitelyRecurses(expression.getElse(), method));
-
-    }
-
-    private static boolean binaryExpressionDefinitelyRecurses(
-            JSBinaryExpression expression, JSFunction method) {
-        final JSExpression lhs = expression.getLOperand();
-
-        if (RecursionUtil.expressionDefinitelyRecurses(lhs, method)) {
-            return true;
-        }
-
-        final IElementType tokenType = expression.getOperationSign();
-
-        if (tokenType.equals(JSTokenTypes.ANDAND) ||
-            tokenType.equals(JSTokenTypes.OROR)) {
-            return false;
-        }
-
-        return RecursionUtil.expressionDefinitelyRecurses(expression.getROperand(), method);
-    }
-
-    private static boolean indexedPropertyAccessExpressionDefinitelyRecurses(
-            JSIndexedPropertyAccessExpression expression, JSFunction method) {
-        final JSExpression arrayExp = expression.getQualifier();
-        final JSExpression indexExp = expression.getIndexExpression();
-        return (RecursionUtil.expressionDefinitelyRecurses(arrayExp, method) ||
-                RecursionUtil.expressionDefinitelyRecurses(indexExp, method));
-    }
-
-    private static boolean arrayLiteralExpressionDefinitelyRecurses(
-            JSArrayLiteralExpression expression, JSFunction method) {
-        for (final JSExpression initializer : expression.getExpressions()) {
-            if (RecursionUtil.expressionDefinitelyRecurses(initializer, method)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean prefixExpressionDefinitelyRecurses(
-            JSPrefixExpression expression, JSFunction method) {
-        final JSExpression operand = expression.getExpression();
-        return RecursionUtil.expressionDefinitelyRecurses(operand, method);
-    }
-
-    private static boolean postfixExpressionDefinitelyRecurses(
-            JSPostfixExpression expression, JSFunction method) {
-        final JSExpression operand = expression.getExpression();
-        return RecursionUtil.expressionDefinitelyRecurses(operand, method);
-    }
-
-    private static boolean parenthesizedExpressionDefinitelyRecurses(
-            JSParenthesizedExpression expression, JSFunction method) {
-        final JSExpression innerExpression = expression.getInnerExpression();
-        return RecursionUtil.expressionDefinitelyRecurses(innerExpression, method);
-    }
-
-    private static boolean referenceExpressionDefinitelyRecurses(
-            JSReferenceExpression expression, JSFunction method) {
-        final JSExpression qualifierExpression = expression.getQualifier();
-        return (qualifierExpression != null &&
-                RecursionUtil.expressionDefinitelyRecurses(qualifierExpression, method));
-    }
-
-    private static boolean assignmentExpressionDefinitelyRecurses(
-            JSAssignmentExpression assignmentExpression, JSFunction method) {
-        final JSExpression lhs = assignmentExpression.getLOperand();
-        final JSExpression rhs = assignmentExpression.getROperand();
-        return (RecursionUtil.expressionDefinitelyRecurses(rhs, method) ||
-                RecursionUtil.expressionDefinitelyRecurses(lhs, method));
-    }
-
-    private static boolean newExpressionDefinitelyRecurses(JSNewExpression exp,
-                                                           JSFunction method) {
-        final JSArgumentList argumentList = exp.getArgumentList();
-        if (argumentList != null) {
-            final JSExpression[] args = argumentList.getArguments();
-            for (final JSExpression arg : args) {
-                if (RecursionUtil.expressionDefinitelyRecurses(arg, method)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private static boolean callExpressionDefinitelyRecurses(
-            JSCallExpression exp, JSFunction method) {
-        final JSFunction calledMethod = ControlFlowUtils.resolveMethod(exp);
-
-        if (calledMethod != null && calledMethod.equals(method)) {
-            return true;
-        }
-
-        final JSExpression methodExpression = exp.getMethodExpression();
-
-        if (methodExpression == null) {
-            return false;
-        } else if (RecursionUtil.expressionDefinitelyRecurses(methodExpression, method)) {
-            return true;
-        }
-
-        for (final JSExpression arg : exp.getArgumentList().getArguments()) {
-            if (RecursionUtil.expressionDefinitelyRecurses(arg, method)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean statementDefinitelyRecurses(JSStatement statement,
-                                                       JSFunction method) {
-        if (statement == null) {
-            return false;
-        }
-        if (statement instanceof JSBreakStatement    ||
-            statement instanceof JSContinueStatement ||
-            statement instanceof JSThrowStatement    ||
-            statement instanceof JSEmptyStatement) {
-            return false;
-        } else if (statement instanceof JSExpressionStatement) {
-            final JSExpressionStatement expressionStatement =
-                    (JSExpressionStatement)statement;
-            final JSExpression expression =
-                    expressionStatement.getExpression();
-            return RecursionUtil.expressionDefinitelyRecurses(expression, method);
-        } else if (statement instanceof JSVarStatement) {
-            final JSVarStatement varStatement =
-                    (JSVarStatement) statement;
-            for(final JSVariable variable : varStatement.getVariables()) {
-                final JSExpression initializer = variable.getInitializer();
-                if (RecursionUtil.expressionDefinitelyRecurses(initializer, method)) {
-                    return true;
-                }
-            }
-            return false;
-        } else if (statement instanceof JSReturnStatement) {
-            final JSReturnStatement returnStatement =
-                    (JSReturnStatement) statement;
-            final JSExpression returnValue = returnStatement.getExpression();
-            if (returnValue != null) {
-                if (RecursionUtil.expressionDefinitelyRecurses(returnValue, method)) {
-                    return true;
-                }
-            }
-            return false;
-        } else if (statement instanceof JSForStatement) {
-            return RecursionUtil.forStatementDefinitelyRecurses((JSForStatement)
-                    statement, method);
-        } else if (statement instanceof JSForInStatement) {
-            return RecursionUtil.forInStatementDefinitelyRecurses(
-                    (JSForInStatement) statement, method);
-        } else if (statement instanceof JSWhileStatement) {
-            return RecursionUtil.whileStatementDefinitelyRecurses(
-                    (JSWhileStatement) statement, method);
-        } else if (statement instanceof JSDoWhileStatement) {
-            return RecursionUtil.doWhileStatementDefinitelyRecurses(
-                    (JSDoWhileStatement) statement, method);
-        } else if (statement instanceof JSBlockStatement) {
-            return RecursionUtil.blockStatementDefinitelyRecurses(
-                    (JSBlockStatement) statement, method);
-        } else if (statement instanceof JSLabeledStatement) {
-            return RecursionUtil.labeledStatementDefinitelyRecurses(
-                    (JSLabeledStatement) statement, method);
-        } else if (statement instanceof JSIfStatement) {
-            return RecursionUtil.ifStatementDefinitelyRecurses(
-                    (JSIfStatement) statement, method);
-        } else if (statement instanceof JSTryStatement) {
-            return RecursionUtil.tryStatementDefinitelyRecurses(
-                    (JSTryStatement) statement, method);
-        } else if (statement instanceof JSSwitchStatement) {
-            return RecursionUtil.switchStatementDefinitelyRecurses(
-                    (JSSwitchStatement) statement, method);
-        } else {
-            // unknown statement type
-            return false;
-        }
-    }
-
-    private static boolean switchStatementDefinitelyRecurses(
-            JSSwitchStatement switchStatement, JSFunction method) {
-        final JSExpression switchExpression = switchStatement.getSwitchExpression();
-        return RecursionUtil.expressionDefinitelyRecurses(switchExpression, method);
-    }
-
-    private static boolean tryStatementDefinitelyRecurses(
-            JSTryStatement tryStatement, JSFunction method) {
-        final JSStatement statement = tryStatement.getStatement();
-        if (RecursionUtil.statementDefinitelyRecurses(statement, method)) {
-            return true;
-        }
-        final JSStatement finallyStatement = tryStatement.getFinallyStatement();
-        return RecursionUtil.statementDefinitelyRecurses(finallyStatement, method);
-    }
-
-    private static boolean blockStatementDefinitelyRecurses(JSBlockStatement block,
-                                                            JSFunction method) {
-        if (block != null) {
-            for (final JSStatement statement : block.getStatements()) {
-                if (RecursionUtil.statementDefinitelyRecurses(statement, method)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private static boolean ifStatementDefinitelyRecurses(
-            JSIfStatement ifStatement, JSFunction method) {
-        final JSExpression condition = ifStatement.getCondition();
-        if (RecursionUtil.expressionDefinitelyRecurses(condition, method)) {
-            return true;
-        }
-        final JSStatement thenBranch = ifStatement.getThen();
-        final JSStatement elseBranch = ifStatement.getElse();
-        if (thenBranch == null || elseBranch == null) {
-            return false;
-        }
-        return RecursionUtil.statementDefinitelyRecurses(thenBranch, method) &&
-               RecursionUtil.statementDefinitelyRecurses(elseBranch, method);
-    }
-
-    private static boolean forStatementDefinitelyRecurses(
-            JSForStatement forStatement, JSFunction method) {
-        final JSStatement  declaration    = forStatement.getVarDeclaration();
-        final JSExpression initialization = forStatement.getInitialization();
-
-        if (declaration != null &&
-            RecursionUtil.statementDefinitelyRecurses(declaration, method)) {
-            return true;
-        } else if (initialization != null &&
-                   RecursionUtil.expressionDefinitelyRecurses(initialization, method)) {
-            return true;
-        }
-
-        final JSExpression condition = forStatement.getCondition();
-
-        if (RecursionUtil.expressionDefinitelyRecurses(condition, method)) {
-            return true;
-        }
-        if (BoolUtils.isTrue(condition)) {
-            final JSStatement body = forStatement.getBody();
-            return RecursionUtil.statementDefinitelyRecurses(body, method);
-        }
-        return false;
-    }
-
-    private static boolean forInStatementDefinitelyRecurses(
-            JSForInStatement foreachStatement, JSFunction method) {
-        final JSExpression collection = foreachStatement.getCollectionExpression();
-        return RecursionUtil.expressionDefinitelyRecurses(collection, method);
-    }
-
-    private static boolean whileStatementDefinitelyRecurses(
-            JSWhileStatement whileStatement, JSFunction method) {
-
-        final JSExpression condition = whileStatement.getCondition();
-        if (RecursionUtil.expressionDefinitelyRecurses(condition, method)) {
-            return true;
-        }
-        if (BoolUtils.isTrue(condition)) {
-            final JSStatement body = whileStatement.getBody();
-            return RecursionUtil.statementDefinitelyRecurses(body, method);
-        }
-        return false;
-    }
-
-    private static boolean doWhileStatementDefinitelyRecurses(
-            JSDoWhileStatement doWhileStatement, JSFunction method) {
-
-        final JSStatement body = doWhileStatement.getBody();
-        if (RecursionUtil.statementDefinitelyRecurses(body, method)) {
-            return true;
-        }
-        final JSExpression condition = doWhileStatement.getCondition();
-        return RecursionUtil.expressionDefinitelyRecurses(condition, method);
-    }
-
-    private static boolean labeledStatementDefinitelyRecurses(
-            JSLabeledStatement labeledStatement, JSFunction method) {
-        final JSStatement body = labeledStatement.getStatement();
-        return RecursionUtil.statementDefinitelyRecurses(body, method);
-    }
-
-    public static boolean functionDefinitelyRecurses(
-            @Nonnull JSFunction method) {
-        final JSSourceElement[] body = method.getBody();
-
-        if (body != null) {
-            for (final JSSourceElement element : body) {
-                if (element instanceof JSStatement &&
-                    RecursionUtil.statementDefinitelyRecurses((JSStatement) element, method)) {
-                    return true;
-                } else if (element instanceof JSExpression &&
-                           RecursionUtil.expressionDefinitelyRecurses((JSExpression) element, method)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
+import javax.annotation.Nonnull;
+
+public class RecursionUtil
+{
+
+	private RecursionUtil()
+	{
+	}
+
+	public static boolean statementMayReturnBeforeRecursing(
+			JSStatement statement, JSFunction method)
+	{
+		if(statement == null)
+		{
+			return true;
+		}
+
+		if(statement instanceof JSBreakStatement ||
+				statement instanceof JSContinueStatement ||
+				statement instanceof JSThrowStatement ||
+				statement instanceof JSExpressionStatement ||
+				statement instanceof JSEmptyStatement ||
+				statement instanceof JSVarStatement)
+		{
+			return false;
+		}
+		else if(statement instanceof JSReturnStatement)
+		{
+			final JSReturnStatement returnStatement =
+					(JSReturnStatement) statement;
+			final JSExpression returnValue = returnStatement.getExpression();
+			return (returnValue == null ||
+					!RecursionUtil.expressionDefinitelyRecurses(returnValue, method));
+		}
+		else if(statement instanceof JSForStatement)
+		{
+			return RecursionUtil.forStatementMayReturnBeforeRecursing(
+					(JSForStatement) statement, method);
+		}
+		else if(statement instanceof JSForInStatement)
+		{
+			return RecursionUtil.forInStatementMayReturnBeforeRecursing(
+					(JSForInStatement) statement, method);
+		}
+		else if(statement instanceof JSWhileStatement)
+		{
+			return RecursionUtil.whileStatementMayReturnBeforeRecursing(
+					(JSWhileStatement) statement, method);
+		}
+		else if(statement instanceof JSDoWhileStatement)
+		{
+			return RecursionUtil.doWhileStatementMayReturnBeforeRecursing(
+					(JSDoWhileStatement) statement, method);
+		}
+		else if(statement instanceof JSBlockStatement)
+		{
+			final JSBlockStatement blockStatement =
+					(JSBlockStatement) statement;
+			return RecursionUtil.blockStatementMayReturnBeforeRecursing(blockStatement, method, false);
+		}
+		else if(statement instanceof JSLabeledStatement)
+		{
+			return RecursionUtil.labeledStatementMayReturnBeforeRecursing(
+					(JSLabeledStatement) statement, method);
+		}
+		else if(statement instanceof JSIfStatement)
+		{
+			return RecursionUtil.ifStatementMayReturnBeforeRecursing(
+					(JSIfStatement) statement, method);
+		}
+		else if(statement instanceof JSTryStatement)
+		{
+			return RecursionUtil.tryStatementMayReturnBeforeRecursing(
+					(JSTryStatement) statement, method);
+		}
+		else if(statement instanceof JSSwitchStatement)
+		{
+			return RecursionUtil.switchStatementMayReturnBeforeRecursing(
+					(JSSwitchStatement) statement, method);
+		}
+		else
+		{
+			// unknown statement type
+			return true;
+		}
+	}
+
+	private static boolean doWhileStatementMayReturnBeforeRecursing(
+			JSDoWhileStatement loopStatement, JSFunction method)
+	{
+		final JSStatement body = loopStatement.getBody();
+		return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
+	}
+
+	private static boolean whileStatementMayReturnBeforeRecursing(
+			JSWhileStatement loopStatement, JSFunction method)
+	{
+		final JSExpression test = loopStatement.getCondition();
+		if(RecursionUtil.expressionDefinitelyRecurses(test, method))
+		{
+			return false;
+		}
+		final JSStatement body = loopStatement.getBody();
+		return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
+	}
+
+	private static boolean forStatementMayReturnBeforeRecursing(
+			JSForStatement loopStatement, JSFunction method)
+	{
+
+		if(RecursionUtil.statementMayReturnBeforeRecursing(loopStatement.getVarDeclaration(), method))
+		{
+			return true;
+		}
+		if(RecursionUtil.expressionDefinitelyRecurses(loopStatement.getInitialization(), method))
+		{
+			return false;
+		}
+		if(RecursionUtil.expressionDefinitelyRecurses(loopStatement.getCondition(), method))
+		{
+			return false;
+		}
+		return RecursionUtil.statementMayReturnBeforeRecursing(loopStatement.getBody(), method);
+	}
+
+	private static boolean forInStatementMayReturnBeforeRecursing(
+			JSForInStatement loopStatement, JSFunction method)
+	{
+		final JSExpression collection = loopStatement.getCollectionExpression();
+		if(RecursionUtil.expressionDefinitelyRecurses(collection, method))
+		{
+			return false;
+		}
+		final JSStatement body = loopStatement.getBody();
+		return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
+	}
+
+	private static boolean switchStatementMayReturnBeforeRecursing(
+			JSSwitchStatement switchStatement, JSFunction method)
+	{
+
+		for(final JSCaseClause clause : switchStatement.getCaseClauses())
+		{
+			for(final JSStatement statement : clause.getStatements())
+			{
+				if(RecursionUtil.statementMayReturnBeforeRecursing(statement, method))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	private static boolean tryStatementMayReturnBeforeRecursing(
+			JSTryStatement tryStatement, JSFunction method)
+	{
+		final JSStatement finallyStatement = tryStatement.getFinallyStatement();
+
+		if(finallyStatement != null)
+		{
+			if(RecursionUtil.statementMayReturnBeforeRecursing(finallyStatement, method))
+			{
+				return true;
+			}
+			if(RecursionUtil.statementDefinitelyRecurses(finallyStatement, method))
+			{
+				return false;
+			}
+		}
+
+		final JSStatement statement = tryStatement.getStatement();
+
+		if(RecursionUtil.statementMayReturnBeforeRecursing(statement, method))
+		{
+			return true;
+		}
+
+		final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+
+		if(catchBlock != null)
+		{
+			final JSStatement catchStatement = catchBlock.getStatement();
+
+			if(RecursionUtil.statementMayReturnBeforeRecursing(catchStatement, method))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static boolean ifStatementMayReturnBeforeRecursing(
+			JSIfStatement ifStatement, JSFunction method)
+	{
+		final JSExpression test = ifStatement.getCondition();
+		if(RecursionUtil.expressionDefinitelyRecurses(test, method))
+		{
+			return false;
+		}
+		final JSStatement thenBranch = ifStatement.getThen();
+		if(RecursionUtil.statementMayReturnBeforeRecursing(thenBranch, method))
+		{
+			return true;
+		}
+		final JSStatement elseBranch = ifStatement.getElse();
+		return elseBranch != null &&
+				RecursionUtil.statementMayReturnBeforeRecursing(elseBranch, method);
+	}
+
+	private static boolean labeledStatementMayReturnBeforeRecursing(
+			JSLabeledStatement labeledStatement, JSFunction method)
+	{
+		final JSStatement statement = labeledStatement.getStatement();
+		return RecursionUtil.statementMayReturnBeforeRecursing(statement, method);
+	}
+
+	private static boolean blockStatementMayReturnBeforeRecursing(
+			JSBlockStatement block, JSFunction method, boolean endsInImplicitReturn)
+	{
+		if(block == null)
+		{
+			return true;
+		}
+
+		final JSStatement[] statements = block.getStatements();
+
+		for(final JSStatement statement : statements)
+		{
+			if(RecursionUtil.statementMayReturnBeforeRecursing(statement, method))
+			{
+				return true;
+			}
+			if(RecursionUtil.statementDefinitelyRecurses(statement, method))
+			{
+				return false;
+			}
+		}
+		return endsInImplicitReturn;
+	}
+
+	public static boolean functionMayRecurse(@Nonnull JSFunction function)
+	{
+		final JSRecursionVisitor recursionVisitor = new JSRecursionVisitor(function);
+
+		if(recursionVisitor.isFunctionNamed())
+		{
+			function.accept(recursionVisitor);
+		}
+		return recursionVisitor.isRecursive();
+	}
+
+	private static boolean expressionDefinitelyRecurses(JSExpression exp,
+														JSFunction method)
+	{
+		if(exp == null)
+		{
+			return false;
+		}
+		if(exp instanceof JSNewExpression)
+		{
+			return RecursionUtil.newExpressionDefinitelyRecurses(
+					(JSNewExpression) exp, method);
+		}
+		if(exp instanceof JSCallExpression)
+		{
+			return RecursionUtil.callExpressionDefinitelyRecurses(
+					(JSCallExpression) exp, method);
+		}
+		if(exp instanceof JSAssignmentExpression)
+		{
+			return RecursionUtil.assignmentExpressionDefinitelyRecurses(
+					(JSAssignmentExpression) exp, method);
+		}
+		if(exp instanceof JSArrayLiteralExpression)
+		{
+			return RecursionUtil.arrayLiteralExpressionDefinitelyRecurses(
+					(JSArrayLiteralExpression) exp, method);
+		}
+		if(exp instanceof JSIndexedPropertyAccessExpression)
+		{
+			return RecursionUtil.indexedPropertyAccessExpressionDefinitelyRecurses(
+					(JSIndexedPropertyAccessExpression) exp, method);
+		}
+		if(exp instanceof JSPrefixExpression)
+		{
+			return RecursionUtil.prefixExpressionDefinitelyRecurses(
+					(JSPrefixExpression) exp, method);
+		}
+		if(exp instanceof JSPostfixExpression)
+		{
+			return RecursionUtil.postfixExpressionDefinitelyRecurses(
+					(JSPostfixExpression) exp, method);
+		}
+		if(exp instanceof JSBinaryExpression)
+		{
+			return RecursionUtil.binaryExpressionDefinitelyRecurses(
+					(JSBinaryExpression) exp, method);
+		}
+		if(exp instanceof JSConditionalExpression)
+		{
+			return RecursionUtil.conditionalExpressionDefinitelyRecurses(
+					(JSConditionalExpression) exp, method);
+		}
+		if(exp instanceof JSParenthesizedExpression)
+		{
+			return RecursionUtil.parenthesizedExpressionDefinitelyRecurses(
+					(JSParenthesizedExpression) exp, method);
+		}
+		if(exp instanceof JSReferenceExpression)
+		{
+			return RecursionUtil.referenceExpressionDefinitelyRecurses(
+					(JSReferenceExpression) exp, method);
+		}
+		if(exp instanceof JSLiteralExpression ||
+				exp instanceof JSThisExpression)
+		{
+			return false;
+		}
+		return false;
+	}
+
+	private static boolean conditionalExpressionDefinitelyRecurses(
+			JSConditionalExpression expression, JSFunction method)
+	{
+		final JSExpression condExpression = expression.getCondition();
+
+		return RecursionUtil.expressionDefinitelyRecurses(condExpression, method) ||
+				(RecursionUtil.expressionDefinitelyRecurses(expression.getThen(), method) &&
+						RecursionUtil.expressionDefinitelyRecurses(expression.getElse(), method));
+
+	}
+
+	private static boolean binaryExpressionDefinitelyRecurses(
+			JSBinaryExpression expression, JSFunction method)
+	{
+		final JSExpression lhs = expression.getLOperand();
+
+		if(RecursionUtil.expressionDefinitelyRecurses(lhs, method))
+		{
+			return true;
+		}
+
+		final IElementType tokenType = expression.getOperationSign();
+
+		if(tokenType.equals(JSTokenTypes.ANDAND) ||
+				tokenType.equals(JSTokenTypes.OROR))
+		{
+			return false;
+		}
+
+		return RecursionUtil.expressionDefinitelyRecurses(expression.getROperand(), method);
+	}
+
+	private static boolean indexedPropertyAccessExpressionDefinitelyRecurses(
+			JSIndexedPropertyAccessExpression expression, JSFunction method)
+	{
+		final JSExpression arrayExp = expression.getQualifier();
+		final JSExpression indexExp = expression.getIndexExpression();
+		return (RecursionUtil.expressionDefinitelyRecurses(arrayExp, method) ||
+				RecursionUtil.expressionDefinitelyRecurses(indexExp, method));
+	}
+
+	private static boolean arrayLiteralExpressionDefinitelyRecurses(
+			JSArrayLiteralExpression expression, JSFunction method)
+	{
+		for(final JSExpression initializer : expression.getExpressions())
+		{
+			if(RecursionUtil.expressionDefinitelyRecurses(initializer, method))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static boolean prefixExpressionDefinitelyRecurses(
+			JSPrefixExpression expression, JSFunction method)
+	{
+		final JSExpression operand = expression.getExpression();
+		return RecursionUtil.expressionDefinitelyRecurses(operand, method);
+	}
+
+	private static boolean postfixExpressionDefinitelyRecurses(
+			JSPostfixExpression expression, JSFunction method)
+	{
+		final JSExpression operand = expression.getExpression();
+		return RecursionUtil.expressionDefinitelyRecurses(operand, method);
+	}
+
+	private static boolean parenthesizedExpressionDefinitelyRecurses(
+			JSParenthesizedExpression expression, JSFunction method)
+	{
+		final JSExpression innerExpression = expression.getInnerExpression();
+		return RecursionUtil.expressionDefinitelyRecurses(innerExpression, method);
+	}
+
+	private static boolean referenceExpressionDefinitelyRecurses(
+			JSReferenceExpression expression, JSFunction method)
+	{
+		final JSExpression qualifierExpression = expression.getQualifier();
+		return (qualifierExpression != null &&
+				RecursionUtil.expressionDefinitelyRecurses(qualifierExpression, method));
+	}
+
+	private static boolean assignmentExpressionDefinitelyRecurses(
+			JSAssignmentExpression assignmentExpression, JSFunction method)
+	{
+		final JSExpression lhs = assignmentExpression.getLOperand();
+		final JSExpression rhs = assignmentExpression.getROperand();
+		return (RecursionUtil.expressionDefinitelyRecurses(rhs, method) ||
+				RecursionUtil.expressionDefinitelyRecurses(lhs, method));
+	}
+
+	private static boolean newExpressionDefinitelyRecurses(JSNewExpression exp,
+														   JSFunction method)
+	{
+		final JSArgumentList argumentList = exp.getArgumentList();
+		if(argumentList != null)
+		{
+			final JSExpression[] args = argumentList.getArguments();
+			for(final JSExpression arg : args)
+			{
+				if(RecursionUtil.expressionDefinitelyRecurses(arg, method))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	private static boolean callExpressionDefinitelyRecurses(
+			JSCallExpression exp, JSFunction method)
+	{
+		final JSFunction calledMethod = ControlFlowUtils.resolveMethod(exp);
+
+		if(calledMethod != null && calledMethod.equals(method))
+		{
+			return true;
+		}
+
+		final JSExpression methodExpression = exp.getMethodExpression();
+
+		if(methodExpression == null)
+		{
+			return false;
+		}
+		else if(RecursionUtil.expressionDefinitelyRecurses(methodExpression, method))
+		{
+			return true;
+		}
+
+		for(final JSExpression arg : exp.getArgumentList().getArguments())
+		{
+			if(RecursionUtil.expressionDefinitelyRecurses(arg, method))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static boolean statementDefinitelyRecurses(JSStatement statement,
+													   JSFunction method)
+	{
+		if(statement == null)
+		{
+			return false;
+		}
+		if(statement instanceof JSBreakStatement ||
+				statement instanceof JSContinueStatement ||
+				statement instanceof JSThrowStatement ||
+				statement instanceof JSEmptyStatement)
+		{
+			return false;
+		}
+		else if(statement instanceof JSExpressionStatement)
+		{
+			final JSExpressionStatement expressionStatement =
+					(JSExpressionStatement) statement;
+			final JSExpression expression =
+					expressionStatement.getExpression();
+			return RecursionUtil.expressionDefinitelyRecurses(expression, method);
+		}
+		else if(statement instanceof JSVarStatement)
+		{
+			final JSVarStatement varStatement =
+					(JSVarStatement) statement;
+			for(final JSVariable variable : varStatement.getVariables())
+			{
+				final JSExpression initializer = variable.getInitializer();
+				if(RecursionUtil.expressionDefinitelyRecurses(initializer, method))
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+		else if(statement instanceof JSReturnStatement)
+		{
+			final JSReturnStatement returnStatement =
+					(JSReturnStatement) statement;
+			final JSExpression returnValue = returnStatement.getExpression();
+			if(returnValue != null)
+			{
+				if(RecursionUtil.expressionDefinitelyRecurses(returnValue, method))
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+		else if(statement instanceof JSForStatement)
+		{
+			return RecursionUtil.forStatementDefinitelyRecurses((JSForStatement)
+					statement, method);
+		}
+		else if(statement instanceof JSForInStatement)
+		{
+			return RecursionUtil.forInStatementDefinitelyRecurses(
+					(JSForInStatement) statement, method);
+		}
+		else if(statement instanceof JSWhileStatement)
+		{
+			return RecursionUtil.whileStatementDefinitelyRecurses(
+					(JSWhileStatement) statement, method);
+		}
+		else if(statement instanceof JSDoWhileStatement)
+		{
+			return RecursionUtil.doWhileStatementDefinitelyRecurses(
+					(JSDoWhileStatement) statement, method);
+		}
+		else if(statement instanceof JSBlockStatement)
+		{
+			return RecursionUtil.blockStatementDefinitelyRecurses(
+					(JSBlockStatement) statement, method);
+		}
+		else if(statement instanceof JSLabeledStatement)
+		{
+			return RecursionUtil.labeledStatementDefinitelyRecurses(
+					(JSLabeledStatement) statement, method);
+		}
+		else if(statement instanceof JSIfStatement)
+		{
+			return RecursionUtil.ifStatementDefinitelyRecurses(
+					(JSIfStatement) statement, method);
+		}
+		else if(statement instanceof JSTryStatement)
+		{
+			return RecursionUtil.tryStatementDefinitelyRecurses(
+					(JSTryStatement) statement, method);
+		}
+		else if(statement instanceof JSSwitchStatement)
+		{
+			return RecursionUtil.switchStatementDefinitelyRecurses(
+					(JSSwitchStatement) statement, method);
+		}
+		else
+		{
+			// unknown statement type
+			return false;
+		}
+	}
+
+	private static boolean switchStatementDefinitelyRecurses(
+			JSSwitchStatement switchStatement, JSFunction method)
+	{
+		final JSExpression switchExpression = switchStatement.getSwitchExpression();
+		return RecursionUtil.expressionDefinitelyRecurses(switchExpression, method);
+	}
+
+	private static boolean tryStatementDefinitelyRecurses(
+			JSTryStatement tryStatement, JSFunction method)
+	{
+		final JSStatement statement = tryStatement.getStatement();
+		if(RecursionUtil.statementDefinitelyRecurses(statement, method))
+		{
+			return true;
+		}
+		final JSStatement finallyStatement = tryStatement.getFinallyStatement();
+		return RecursionUtil.statementDefinitelyRecurses(finallyStatement, method);
+	}
+
+	private static boolean blockStatementDefinitelyRecurses(JSBlockStatement block,
+															JSFunction method)
+	{
+		if(block != null)
+		{
+			for(final JSStatement statement : block.getStatements())
+			{
+				if(RecursionUtil.statementDefinitelyRecurses(statement, method))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	private static boolean ifStatementDefinitelyRecurses(
+			JSIfStatement ifStatement, JSFunction method)
+	{
+		final JSExpression condition = ifStatement.getCondition();
+		if(RecursionUtil.expressionDefinitelyRecurses(condition, method))
+		{
+			return true;
+		}
+		final JSStatement thenBranch = ifStatement.getThen();
+		final JSStatement elseBranch = ifStatement.getElse();
+		if(thenBranch == null || elseBranch == null)
+		{
+			return false;
+		}
+		return RecursionUtil.statementDefinitelyRecurses(thenBranch, method) &&
+				RecursionUtil.statementDefinitelyRecurses(elseBranch, method);
+	}
+
+	private static boolean forStatementDefinitelyRecurses(
+			JSForStatement forStatement, JSFunction method)
+	{
+		final JSStatement declaration = forStatement.getVarDeclaration();
+		final JSExpression initialization = forStatement.getInitialization();
+
+		if(declaration != null &&
+				RecursionUtil.statementDefinitelyRecurses(declaration, method))
+		{
+			return true;
+		}
+		else if(initialization != null &&
+				RecursionUtil.expressionDefinitelyRecurses(initialization, method))
+		{
+			return true;
+		}
+
+		final JSExpression condition = forStatement.getCondition();
+
+		if(RecursionUtil.expressionDefinitelyRecurses(condition, method))
+		{
+			return true;
+		}
+		if(BoolUtils.isTrue(condition))
+		{
+			final JSStatement body = forStatement.getBody();
+			return RecursionUtil.statementDefinitelyRecurses(body, method);
+		}
+		return false;
+	}
+
+	private static boolean forInStatementDefinitelyRecurses(
+			JSForInStatement foreachStatement, JSFunction method)
+	{
+		final JSExpression collection = foreachStatement.getCollectionExpression();
+		return RecursionUtil.expressionDefinitelyRecurses(collection, method);
+	}
+
+	private static boolean whileStatementDefinitelyRecurses(
+			JSWhileStatement whileStatement, JSFunction method)
+	{
+
+		final JSExpression condition = whileStatement.getCondition();
+		if(RecursionUtil.expressionDefinitelyRecurses(condition, method))
+		{
+			return true;
+		}
+		if(BoolUtils.isTrue(condition))
+		{
+			final JSStatement body = whileStatement.getBody();
+			return RecursionUtil.statementDefinitelyRecurses(body, method);
+		}
+		return false;
+	}
+
+	private static boolean doWhileStatementDefinitelyRecurses(
+			JSDoWhileStatement doWhileStatement, JSFunction method)
+	{
+
+		final JSStatement body = doWhileStatement.getBody();
+		if(RecursionUtil.statementDefinitelyRecurses(body, method))
+		{
+			return true;
+		}
+		final JSExpression condition = doWhileStatement.getCondition();
+		return RecursionUtil.expressionDefinitelyRecurses(condition, method);
+	}
+
+	private static boolean labeledStatementDefinitelyRecurses(
+			JSLabeledStatement labeledStatement, JSFunction method)
+	{
+		final JSStatement body = labeledStatement.getStatement();
+		return RecursionUtil.statementDefinitelyRecurses(body, method);
+	}
+
+	public static boolean functionDefinitelyRecurses(
+			@Nonnull JSFunction method)
+	{
+		final JSSourceElement[] body = method.getBody();
+
+		if(body != null)
+		{
+			for(final JSSourceElement element : body)
+			{
+				if(element instanceof JSStatement &&
+						RecursionUtil.statementDefinitelyRecurses((JSStatement) element, method))
+				{
+					return true;
+				}
+				else if(element instanceof JSExpression &&
+						RecursionUtil.expressionDefinitelyRecurses((JSExpression) element, method))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
index 84b41e54..0393c7b8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
@@ -19,60 +19,81 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.ast.IElementType;
 
-public class SideEffectChecker {
-    private SideEffectChecker() {}
+public class SideEffectChecker
+{
+	private SideEffectChecker()
+	{
+	}
 
-    public static boolean mayHaveSideEffects(JSExpression exp) {
-        final SideEffectsVisitor visitor = new SideEffectsVisitor();
-        exp.accept(visitor);
-        return visitor.mayHaveSideEffects();
-    }
+	public static boolean mayHaveSideEffects(JSExpression exp)
+	{
+		final SideEffectsVisitor visitor = new SideEffectsVisitor();
+		exp.accept(visitor);
+		return visitor.mayHaveSideEffects();
+	}
 
-    private static class SideEffectsVisitor extends JSRecursiveElementVisitor {
-        private boolean mayHaveSideEffects;
+	private static class SideEffectsVisitor extends JSRecursiveElementVisitor
+	{
+		private boolean mayHaveSideEffects;
 
-        @Override public void visitJSElement(JSElement element) {
-            if (!this.mayHaveSideEffects) {
-                super.visitJSElement(element);
-            }
-        }
+		@Override
+		public void visitJSElement(JSElement element)
+		{
+			if(!this.mayHaveSideEffects)
+			{
+				super.visitJSElement(element);
+			}
+		}
 
-        @Override public void visitJSCallExpression(JSCallExpression expression) {
-            this.mayHaveSideEffects = true;
-        }
+		@Override
+		public void visitJSCallExpression(JSCallExpression expression)
+		{
+			this.mayHaveSideEffects = true;
+		}
 
-        @Override public void visitJSNewExpression(JSNewExpression expression) {
-            this.mayHaveSideEffects = true;
-        }
+		@Override
+		public void visitJSNewExpression(JSNewExpression expression)
+		{
+			this.mayHaveSideEffects = true;
+		}
 
-        @Override public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
-            this.mayHaveSideEffects = true;
-        }
+		@Override
+		public void visitJSAssignmentExpression(JSAssignmentExpression expression)
+		{
+			this.mayHaveSideEffects = true;
+		}
 
-        @Override public void visitJSPrefixExpression(JSPrefixExpression expression) {
-            super.visitJSPrefixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+		@Override
+		public void visitJSPrefixExpression(JSPrefixExpression expression)
+		{
+			super.visitJSPrefixExpression(expression);
+			final IElementType sign = expression.getOperationSign();
 
-            if (sign != null &&
-                (sign.equals(JSTokenTypes.PLUSPLUS)   ||
-                 sign.equals(JSTokenTypes.MINUSMINUS))) {
-                this.mayHaveSideEffects = true;
-            }
-        }
+			if(sign != null &&
+					(sign.equals(JSTokenTypes.PLUSPLUS) ||
+							sign.equals(JSTokenTypes.MINUSMINUS)))
+			{
+				this.mayHaveSideEffects = true;
+			}
+		}
 
-        @Override public void visitJSPostfixExpression(JSPostfixExpression expression) {
-            super.visitJSPostfixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+		@Override
+		public void visitJSPostfixExpression(JSPostfixExpression expression)
+		{
+			super.visitJSPostfixExpression(expression);
+			final IElementType sign = expression.getOperationSign();
 
-            if (sign != null &&
-                (sign.equals(JSTokenTypes.PLUSPLUS)   ||
-                 sign.equals(JSTokenTypes.MINUSMINUS))) {
-                this.mayHaveSideEffects = true;
-            }
-        }
+			if(sign != null &&
+					(sign.equals(JSTokenTypes.PLUSPLUS) ||
+							sign.equals(JSTokenTypes.MINUSMINUS)))
+			{
+				this.mayHaveSideEffects = true;
+			}
+		}
 
-        public boolean mayHaveSideEffects() {
-            return this.mayHaveSideEffects;
-        }
-    }
+		public boolean mayHaveSideEffects()
+		{
+			return this.mayHaveSideEffects;
+		}
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
index d55ab271..3f694678 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
@@ -15,137 +15,168 @@
  */
 package org.intellij.idea.lang.javascript.psiutil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.intellij.lang.javascript.psi.JSElement;
 import consulo.language.psi.PsiElement;
 
-public class TreeUtil {
-    private TreeUtil() {}
-
-    public static PsiElement getNextLeaf(PsiElement element) {
-        if (element == null) {
-            return null;
-        }
-        final PsiElement sibling = element.getNextSibling();
-        if (sibling == null) {
-            final PsiElement parent = element.getParent();
-            return getNextLeaf(parent);
-        }
-        return getFirstLeaf(sibling);
-    }
-
-    private static PsiElement getFirstLeaf(PsiElement element) {
-        final PsiElement[] children = element.getChildren();
-        if (children.length == 0) {
-            return element;
-        }
-        return getFirstLeaf(children[0]);
-    }
-
-    public static PsiElement getPrevLeaf(PsiElement element) {
-        if (element == null) {
-            return null;
-        }
-        final PsiElement sibling = element.getPrevSibling();
-        if (sibling == null) {
-            final PsiElement parent = element.getParent();
-            return getPrevLeaf(parent);
-        }
-        return getLastLeaf(sibling);
-    }
-
-    private static PsiElement getLastLeaf(PsiElement element) {
-        final PsiElement[] children = element.getChildren();
-        if (children.length == 0) {
-            return element;
-        }
-        return getLastLeaf(children[children.length-1]);
-    }
-
-    @Nullable
-    public static <ParentType extends PsiElement> ParentType getParentOfType(@Nullable PsiElement        element,
-                                                                             @Nonnull Class<ParentType> aClass) {
-        return getParentOfType(element, aClass, true);
-    }
-
-    public static <ParentType extends PsiElement> ParentType getParentOfType(PsiElement        element,
-                                                                             Class<ParentType> aClass,
-                                                                             boolean           strict) {
-        if (element == null) {
-            return null;
-        }
-        if (strict) {
-            element = element.getParent();
-        }
-
-        while (element != null && !aClass.isInstance(element)) {
-            element = element.getParent();
-        }
-
-        return (ParentType) element;
-    }
-
-    @Nullable
-    public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(@Nullable PsiElement         element,
-																									@Nonnull Class<ParentType> aClass) {
-        return getPrevLeafOfType(element, aClass, true);
-    }
-
-    public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(PsiElement        element,
-																									Class<ParentType> aClass,
-																									boolean           strict) {
-        if (element == null) {
-            return null;
-        }
-        if (strict) {
-            element = getPrevLeaf(element);
-        }
-
-        while (element != null && !aClass.isInstance(element)) {
-            element = getPrevLeaf(element);
-        }
-
-        return (ParentType) element;
-    }
-
-    @Nullable
-    public static <ParentType extends PsiElement> ParentType getNextLeafOfType(@Nullable PsiElement         element,
-                                                                               @Nonnull Class<ParentType> aClass) {
-        return getNextLeafOfType(element, aClass, true);
-    }
-
-    public static <ParentType extends PsiElement> ParentType getNextLeafOfType(PsiElement        element,
-                                                                               Class<ParentType> aClass,
-                                                                               boolean           strict) {
-        if (element == null) {
-            return null;
-        }
-        if (strict) {
-            element = getNextLeaf(element);
-        }
-
-        while (element != null && !aClass.isInstance(element)) {
-            element = getNextLeaf(element);
-        }
-
-        return (ParentType) element;
-    }
-
-    public static boolean isAncestor(@Nonnull JSElement ancestor,
-                                     @Nonnull JSElement element,
-                                     boolean            strict) {
-        PsiElement parent = (strict ? element.getParent() : element);
-
-        while (parent != null && parent instanceof JSElement) {
-            if (parent.equals(ancestor)) {
-                return true;
-            }
-
-            parent = parent.getParent();
-        }
-
-        return false;
-    }
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class TreeUtil
+{
+	private TreeUtil()
+	{
+	}
+
+	public static PsiElement getNextLeaf(PsiElement element)
+	{
+		if(element == null)
+		{
+			return null;
+		}
+		final PsiElement sibling = element.getNextSibling();
+		if(sibling == null)
+		{
+			final PsiElement parent = element.getParent();
+			return getNextLeaf(parent);
+		}
+		return getFirstLeaf(sibling);
+	}
+
+	private static PsiElement getFirstLeaf(PsiElement element)
+	{
+		final PsiElement[] children = element.getChildren();
+		if(children.length == 0)
+		{
+			return element;
+		}
+		return getFirstLeaf(children[0]);
+	}
+
+	public static PsiElement getPrevLeaf(PsiElement element)
+	{
+		if(element == null)
+		{
+			return null;
+		}
+		final PsiElement sibling = element.getPrevSibling();
+		if(sibling == null)
+		{
+			final PsiElement parent = element.getParent();
+			return getPrevLeaf(parent);
+		}
+		return getLastLeaf(sibling);
+	}
+
+	private static PsiElement getLastLeaf(PsiElement element)
+	{
+		final PsiElement[] children = element.getChildren();
+		if(children.length == 0)
+		{
+			return element;
+		}
+		return getLastLeaf(children[children.length - 1]);
+	}
+
+	@Nullable
+	public static <ParentType extends PsiElement> ParentType getParentOfType(@Nullable PsiElement element,
+																			 @Nonnull Class<ParentType> aClass)
+	{
+		return getParentOfType(element, aClass, true);
+	}
+
+	public static <ParentType extends PsiElement> ParentType getParentOfType(PsiElement element,
+																			 Class<ParentType> aClass,
+																			 boolean strict)
+	{
+		if(element == null)
+		{
+			return null;
+		}
+		if(strict)
+		{
+			element = element.getParent();
+		}
+
+		while(element != null && !aClass.isInstance(element))
+		{
+			element = element.getParent();
+		}
+
+		return (ParentType) element;
+	}
+
+	@Nullable
+	public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(@Nullable PsiElement element,
+																			   @Nonnull Class<ParentType> aClass)
+	{
+		return getPrevLeafOfType(element, aClass, true);
+	}
+
+	public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(PsiElement element,
+																			   Class<ParentType> aClass,
+																			   boolean strict)
+	{
+		if(element == null)
+		{
+			return null;
+		}
+		if(strict)
+		{
+			element = getPrevLeaf(element);
+		}
+
+		while(element != null && !aClass.isInstance(element))
+		{
+			element = getPrevLeaf(element);
+		}
+
+		return (ParentType) element;
+	}
+
+	@Nullable
+	public static <ParentType extends PsiElement> ParentType getNextLeafOfType(@Nullable PsiElement element,
+																			   @Nonnull Class<ParentType> aClass)
+	{
+		return getNextLeafOfType(element, aClass, true);
+	}
+
+	public static <ParentType extends PsiElement> ParentType getNextLeafOfType(PsiElement element,
+																			   Class<ParentType> aClass,
+																			   boolean strict)
+	{
+		if(element == null)
+		{
+			return null;
+		}
+		if(strict)
+		{
+			element = getNextLeaf(element);
+		}
+
+		while(element != null && !aClass.isInstance(element))
+		{
+			element = getNextLeaf(element);
+		}
+
+		return (ParentType) element;
+	}
+
+	public static boolean isAncestor(@Nonnull JSElement ancestor,
+									 @Nonnull JSElement element,
+									 boolean strict)
+	{
+		PsiElement parent = (strict ? element.getParent() : element);
+
+		while(parent != null && parent instanceof JSElement)
+		{
+			if(parent.equals(ancestor))
+			{
+				return true;
+			}
+
+			parent = parent.getParent();
+		}
+
+		return false;
+	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
index 652bcd42..7122df6a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
@@ -21,426 +21,537 @@
 import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-public class VariableAccessUtil {
-
-    private VariableAccessUtil() {}
-
-    public static boolean variableIsAssignedFrom(JSVariable variable,
-                                                 JSElement  context) {
-        final VariableAssignedFromVisitor visitor = new VariableAssignedFromVisitor(variable);
-        context.accept(visitor);
-        return visitor.isAssignedFrom();
-    }
-
-//    public static boolean variableIsPassedAsMethodArgument(
-//            JSVariable variable, JSElement context) {
-//        final VariablePassedAsArgumentVisitor visitor =
-//                new VariablePassedAsArgumentVisitor(variable);
-//        context.accept(visitor);
-//        return visitor.isPassed();
-//    }
-
-//    public static boolean variableIsUsedInArrayInitializer(
-//            JSVariable variable, JSElement context) {
-//        final VariableUsedInArrayInitializerVisitor visitor =
-//                new VariableUsedInArrayInitializerVisitor(variable);
-//        context.accept(visitor);
-//        return visitor.isPassed();
-//    }
-
-    public static boolean variableIsAssigned(
-            JSVariable variable, JSElement context) {
-        //noinspection unchecked
-        return variableIsAssigned(variable, context, Collections.EMPTY_SET, Collections.EMPTY_SET);
-    }
-
-    public static boolean variableIsAssigned(
-            JSVariable      variable,
-            JSElement       context,
-            Set<JSVariable> notUpdatedSymbols) {
-        //noinspection unchecked
-        return variableIsAssigned(variable, context, notUpdatedSymbols, Collections.EMPTY_SET);
-    }
-
-    private static boolean variableIsAssigned(
-            JSVariable      variable,
-            JSElement       context,
-            Set<JSVariable> notUpdatedSymbols,
-            Set<JSVariable> candidateSymbols) {
-        final VariableAssignedVisitor visitor = new VariableAssignedVisitor(variable, context, notUpdatedSymbols,
-                                                                            candidateSymbols);
-        context.accept(visitor);
-        return visitor.isAssigned();
-    }
-
-    public static boolean variableIsReturned(
-            JSVariable variable, JSElement context) {
-        final VariableReturnedVisitor visitor = new VariableReturnedVisitor(variable);
-        context.accept(visitor);
-        return visitor.isReturned();
-    }
-
-    public static boolean arrayContentsAreAccessed(
-            JSVariable variable, JSElement context) {
-        final ArrayContentsAccessedVisitor visitor = new ArrayContentsAccessedVisitor(variable);
-        context.accept(visitor);
-        return visitor.isAccessed();
-    }
-
-    public static boolean arrayContentsAreAssigned(
-            JSVariable variable, JSElement context) {
-        final ArrayContentsAssignedVisitor visitor = new ArrayContentsAssignedVisitor(variable);
-        context.accept(visitor);
-        return visitor.isAssigned();
-    }
-
-    public static boolean mayEvaluateToVariable(JSExpression expression,
-                                                JSVariable variable) {
-        final String variableName = variable.getName();
-        JSExpression expr         = expression;
-
-        if (variableName == null) {
-            return false;
-        }
-
-        while (true) {
-            if (expr == null) {
-                return false;
-            } else if (expr instanceof JSParenthesizedExpression) {
-                expr = ((JSParenthesizedExpression) expr).getInnerExpression();
-            } else if (expr instanceof JSConditionalExpression) {
-                final JSConditionalExpression conditional = (JSConditionalExpression) expr;
-
-                return (mayEvaluateToVariable(conditional.getThen(), variable) ||
-                        mayEvaluateToVariable(conditional.getElse(), variable));
-            } else if (expr instanceof JSIndexedPropertyAccessExpression) {
-                expr = ((JSIndexedPropertyAccessExpression) expr).getQualifier();
-            } else if (expr instanceof JSDefinitionExpression) {
-                expr = ((JSDefinitionExpression) expr).getExpression();
-            } else if (expr instanceof JSReferenceExpression) {
-                final PsiElement referent = ((JSReferenceExpression) expr).resolve();
-
-                return (referent != null && referent.equals(variable));
-            } else {
-                return false;
-            }
-        }
-    }
-
-    public static boolean variableIsUsed(JSVariable variable,
-                                         PsiElement context) {
-        return (variable.getName() != null &&
-                FindReferenceUtil.getReferences(variable, context).iterator().hasNext());
-    }
-
-    public static Set<JSVariable> getUsedVariables(PsiElement context) {
-        final UsedVariableVisitor visitor = new UsedVariableVisitor();
-        context.accept(visitor);
-        return visitor.getVariables();
-    }
-
-    private static class VariableAssignedVisitor extends JSRecursiveElementVisitor {
-        private final JSVariable      variable;
-        private final JSElement       context;
-        private       Set<JSVariable> notUpdatedSymbols;
-        private final Set<JSVariable> candidateSymbols;
-        private       boolean         assigned;
-
-        public VariableAssignedVisitor(@Nonnull JSVariable      variable,
-                                       @Nonnull JSElement       context,
-                                       @Nonnull Set<JSVariable> notUpdatedSymbols) {
-            this.variable          = variable;
-            this.context           = context;
-            this.notUpdatedSymbols = notUpdatedSymbols;
-            this.candidateSymbols  = new LinkedHashSet<>();
-
-            this.candidateSymbols.add(variable);
-        }
-
-        private VariableAssignedVisitor(@Nonnull JSVariable      variable,
-                                        @Nonnull JSElement       context,
-                                        @Nonnull Set<JSVariable> notUpdatedSymbols,
-                                        @Nonnull Set<JSVariable> candidateSymbols) {
-            this.variable          = variable;
-            this.context           = context;
-            this.notUpdatedSymbols = notUpdatedSymbols;
-            this.candidateSymbols  = candidateSymbols;
-        }
-
-        @Override public void visitJSElement(JSElement element) {
-            if (!this.assigned) {
-                super.visitJSElement(element);
-            }
-        }
-
-        @Override public void visitJSAssignmentExpression(JSAssignmentExpression assignment) {
-            if (!this.assigned) {
-                super.visitJSAssignmentExpression(assignment);
-
-                final JSExpression arg = assignment.getLOperand();
-
-                if (VariableAccessUtil.mayEvaluateToVariable(arg, this.variable)) {
-                    final Set<JSVariable> usedVariables   = getUsedVariables(assignment.getROperand());
-                    final Set<JSVariable> newCandidateSet = new LinkedHashSet<>();
-                    boolean               assigned        = false;
-
-                    newCandidateSet.addAll(this.candidateSymbols);
-                    newCandidateSet.add(this.variable);
-                    for (JSVariable variable : usedVariables) {
-                        if (newCandidateSet.contains(variable) ||
-                            variableIsAssigned(variable, this.context, this.notUpdatedSymbols, newCandidateSet)) {
-                            assigned = true;
-                        } else {
-                            if (this.notUpdatedSymbols.isEmpty()) {
-                                this.notUpdatedSymbols = new LinkedHashSet<>();
-                            }
-                            this.notUpdatedSymbols.add(variable);
-                        }
-                    }
-                    this.assigned = assigned;
-                } else {
-                    this.assigned = false;
-                }
-            }
-        }
-
-        @Override public void visitJSPrefixExpression(JSPrefixExpression expression) {
-            if (!this.assigned) {
-                super.visitJSPrefixExpression(expression);
-
-                final IElementType tokenType = expression.getOperationSign();
-
-                if (!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
-                      tokenType.equals(JSTokenTypes.MINUSMINUS))) {
-                    return;
-                }
-
-                final JSExpression operand = expression.getExpression();
-
-                this.assigned = (VariableAccessUtil.mayEvaluateToVariable(operand, this.variable));
-            }
-        }
-
-        @Override public void visitJSPostfixExpression(JSPostfixExpression postfixExpression) {
-            if (!this.assigned) {
-                super.visitJSPostfixExpression(postfixExpression);
-
-                final IElementType tokenType = postfixExpression.getOperationSign();
-
-                if (!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
-                      tokenType.equals(JSTokenTypes.MINUSMINUS))) {
-                    return;
-                }
-
-                final JSExpression operand = postfixExpression.getExpression();
-
-                this.assigned = VariableAccessUtil.mayEvaluateToVariable(operand, this.variable);
-            }
-        }
-
-        public boolean isAssigned() {
-            return this.assigned;
-        }
-    }
-
-    private static class VariableAssignedFromVisitor extends JSRecursiveElementVisitor {
-        private final JSVariable variable;
-        private       boolean    assignedFrom;
-
-        public VariableAssignedFromVisitor(@Nonnull JSVariable variable) {
-            this.variable = variable;
-        }
-
-        @Override public void visitJSElement(@Nonnull JSElement element) {
-            if (!this.assignedFrom) {
-                super.visitJSElement(element);
-            }
-        }
-
-        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
-            if (!this.assignedFrom) {
-                super.visitJSAssignmentExpression(assignment);
-
-                this.assignedFrom = VariableAccessUtil.mayEvaluateToVariable(assignment.getROperand(), this.variable);
-            }
-        }
-
-        @Override public void visitJSVarStatement(@Nonnull JSVarStatement statement) {
-            if (!this.assignedFrom) {
-                super.visitJSVarStatement(statement);
-
-                for (JSVariable declaredVariable : statement.getVariables()) {
-                    final JSExpression initializer = declaredVariable.getInitializer();
-
-                    if (initializer != null) {
-                        this.assignedFrom = VariableAccessUtil.mayEvaluateToVariable(initializer, this.variable);
-                    }
-                }
-            }
-        }
-
-        @Override public void visitJSVariable(JSVariable var) {
-            if (!this.assignedFrom) {
-                super.visitJSVariable(var);
-                this.assignedFrom = (VariableAccessUtil.mayEvaluateToVariable(var.getInitializer(), this.variable));
-            }
-        }
-
-        public boolean isAssignedFrom() {
-            return this.assignedFrom;
-        }
-    }
-
-    private static class VariableReturnedVisitor extends JSRecursiveElementVisitor {
-        @Nonnull
+public class VariableAccessUtil
+{
+
+	private VariableAccessUtil()
+	{
+	}
+
+	public static boolean variableIsAssignedFrom(JSVariable variable,
+												 JSElement context)
+	{
+		final VariableAssignedFromVisitor visitor = new VariableAssignedFromVisitor(variable);
+		context.accept(visitor);
+		return visitor.isAssignedFrom();
+	}
+
+	//    public static boolean variableIsPassedAsMethodArgument(
+	//            JSVariable variable, JSElement context) {
+	//        final VariablePassedAsArgumentVisitor visitor =
+	//                new VariablePassedAsArgumentVisitor(variable);
+	//        context.accept(visitor);
+	//        return visitor.isPassed();
+	//    }
+
+	//    public static boolean variableIsUsedInArrayInitializer(
+	//            JSVariable variable, JSElement context) {
+	//        final VariableUsedInArrayInitializerVisitor visitor =
+	//                new VariableUsedInArrayInitializerVisitor(variable);
+	//        context.accept(visitor);
+	//        return visitor.isPassed();
+	//    }
+
+	public static boolean variableIsAssigned(
+			JSVariable variable, JSElement context)
+	{
+		//noinspection unchecked
+		return variableIsAssigned(variable, context, Collections.EMPTY_SET, Collections.EMPTY_SET);
+	}
+
+	public static boolean variableIsAssigned(
+			JSVariable variable,
+			JSElement context,
+			Set<JSVariable> notUpdatedSymbols)
+	{
+		//noinspection unchecked
+		return variableIsAssigned(variable, context, notUpdatedSymbols, Collections.EMPTY_SET);
+	}
+
+	private static boolean variableIsAssigned(
+			JSVariable variable,
+			JSElement context,
+			Set<JSVariable> notUpdatedSymbols,
+			Set<JSVariable> candidateSymbols)
+	{
+		final VariableAssignedVisitor visitor = new VariableAssignedVisitor(variable, context, notUpdatedSymbols,
+				candidateSymbols);
+		context.accept(visitor);
+		return visitor.isAssigned();
+	}
+
+	public static boolean variableIsReturned(
+			JSVariable variable, JSElement context)
+	{
+		final VariableReturnedVisitor visitor = new VariableReturnedVisitor(variable);
+		context.accept(visitor);
+		return visitor.isReturned();
+	}
+
+	public static boolean arrayContentsAreAccessed(
+			JSVariable variable, JSElement context)
+	{
+		final ArrayContentsAccessedVisitor visitor = new ArrayContentsAccessedVisitor(variable);
+		context.accept(visitor);
+		return visitor.isAccessed();
+	}
+
+	public static boolean arrayContentsAreAssigned(
+			JSVariable variable, JSElement context)
+	{
+		final ArrayContentsAssignedVisitor visitor = new ArrayContentsAssignedVisitor(variable);
+		context.accept(visitor);
+		return visitor.isAssigned();
+	}
+
+	public static boolean mayEvaluateToVariable(JSExpression expression,
+												JSVariable variable)
+	{
+		final String variableName = variable.getName();
+		JSExpression expr = expression;
+
+		if(variableName == null)
+		{
+			return false;
+		}
+
+		while(true)
+		{
+			if(expr == null)
+			{
+				return false;
+			}
+			else if(expr instanceof JSParenthesizedExpression)
+			{
+				expr = ((JSParenthesizedExpression) expr).getInnerExpression();
+			}
+			else if(expr instanceof JSConditionalExpression)
+			{
+				final JSConditionalExpression conditional = (JSConditionalExpression) expr;
+
+				return (mayEvaluateToVariable(conditional.getThen(), variable) ||
+						mayEvaluateToVariable(conditional.getElse(), variable));
+			}
+			else if(expr instanceof JSIndexedPropertyAccessExpression)
+			{
+				expr = ((JSIndexedPropertyAccessExpression) expr).getQualifier();
+			}
+			else if(expr instanceof JSDefinitionExpression)
+			{
+				expr = ((JSDefinitionExpression) expr).getExpression();
+			}
+			else if(expr instanceof JSReferenceExpression)
+			{
+				final PsiElement referent = ((JSReferenceExpression) expr).resolve();
+
+				return (referent != null && referent.equals(variable));
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+
+	public static boolean variableIsUsed(JSVariable variable,
+										 PsiElement context)
+	{
+		return (variable.getName() != null &&
+				FindReferenceUtil.getReferences(variable, context).iterator().hasNext());
+	}
+
+	public static Set<JSVariable> getUsedVariables(PsiElement context)
+	{
+		final UsedVariableVisitor visitor = new UsedVariableVisitor();
+		context.accept(visitor);
+		return visitor.getVariables();
+	}
+
+	private static class VariableAssignedVisitor extends JSRecursiveElementVisitor
+	{
+		private final JSVariable variable;
+		private final JSElement context;
+		private Set<JSVariable> notUpdatedSymbols;
+		private final Set<JSVariable> candidateSymbols;
+		private boolean assigned;
+
+		public VariableAssignedVisitor(@Nonnull JSVariable variable,
+									   @Nonnull JSElement context,
+									   @Nonnull Set<JSVariable> notUpdatedSymbols)
+		{
+			this.variable = variable;
+			this.context = context;
+			this.notUpdatedSymbols = notUpdatedSymbols;
+			this.candidateSymbols = new LinkedHashSet<>();
+
+			this.candidateSymbols.add(variable);
+		}
+
+		private VariableAssignedVisitor(@Nonnull JSVariable variable,
+										@Nonnull JSElement context,
+										@Nonnull Set<JSVariable> notUpdatedSymbols,
+										@Nonnull Set<JSVariable> candidateSymbols)
+		{
+			this.variable = variable;
+			this.context = context;
+			this.notUpdatedSymbols = notUpdatedSymbols;
+			this.candidateSymbols = candidateSymbols;
+		}
+
+		@Override
+		public void visitJSElement(JSElement element)
+		{
+			if(!this.assigned)
+			{
+				super.visitJSElement(element);
+			}
+		}
+
+		@Override
+		public void visitJSAssignmentExpression(JSAssignmentExpression assignment)
+		{
+			if(!this.assigned)
+			{
+				super.visitJSAssignmentExpression(assignment);
+
+				final JSExpression arg = assignment.getLOperand();
+
+				if(VariableAccessUtil.mayEvaluateToVariable(arg, this.variable))
+				{
+					final Set<JSVariable> usedVariables = getUsedVariables(assignment.getROperand());
+					final Set<JSVariable> newCandidateSet = new LinkedHashSet<>();
+					boolean assigned = false;
+
+					newCandidateSet.addAll(this.candidateSymbols);
+					newCandidateSet.add(this.variable);
+					for(JSVariable variable : usedVariables)
+					{
+						if(newCandidateSet.contains(variable) ||
+								variableIsAssigned(variable, this.context, this.notUpdatedSymbols, newCandidateSet))
+						{
+							assigned = true;
+						}
+						else
+						{
+							if(this.notUpdatedSymbols.isEmpty())
+							{
+								this.notUpdatedSymbols = new LinkedHashSet<>();
+							}
+							this.notUpdatedSymbols.add(variable);
+						}
+					}
+					this.assigned = assigned;
+				}
+				else
+				{
+					this.assigned = false;
+				}
+			}
+		}
+
+		@Override
+		public void visitJSPrefixExpression(JSPrefixExpression expression)
+		{
+			if(!this.assigned)
+			{
+				super.visitJSPrefixExpression(expression);
+
+				final IElementType tokenType = expression.getOperationSign();
+
+				if(!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
+						tokenType.equals(JSTokenTypes.MINUSMINUS)))
+				{
+					return;
+				}
+
+				final JSExpression operand = expression.getExpression();
+
+				this.assigned = (VariableAccessUtil.mayEvaluateToVariable(operand, this.variable));
+			}
+		}
+
+		@Override
+		public void visitJSPostfixExpression(JSPostfixExpression postfixExpression)
+		{
+			if(!this.assigned)
+			{
+				super.visitJSPostfixExpression(postfixExpression);
+
+				final IElementType tokenType = postfixExpression.getOperationSign();
+
+				if(!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
+						tokenType.equals(JSTokenTypes.MINUSMINUS)))
+				{
+					return;
+				}
+
+				final JSExpression operand = postfixExpression.getExpression();
+
+				this.assigned = VariableAccessUtil.mayEvaluateToVariable(operand, this.variable);
+			}
+		}
+
+		public boolean isAssigned()
+		{
+			return this.assigned;
+		}
+	}
+
+	private static class VariableAssignedFromVisitor extends JSRecursiveElementVisitor
+	{
+		private final JSVariable variable;
+		private boolean assignedFrom;
+
+		public VariableAssignedFromVisitor(@Nonnull JSVariable variable)
+		{
+			this.variable = variable;
+		}
+
+		@Override
+		public void visitJSElement(@Nonnull JSElement element)
+		{
+			if(!this.assignedFrom)
+			{
+				super.visitJSElement(element);
+			}
+		}
+
+		@Override
+		public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment)
+		{
+			if(!this.assignedFrom)
+			{
+				super.visitJSAssignmentExpression(assignment);
+
+				this.assignedFrom = VariableAccessUtil.mayEvaluateToVariable(assignment.getROperand(), this.variable);
+			}
+		}
+
+		@Override
+		public void visitJSVarStatement(@Nonnull JSVarStatement statement)
+		{
+			if(!this.assignedFrom)
+			{
+				super.visitJSVarStatement(statement);
+
+				for(JSVariable declaredVariable : statement.getVariables())
+				{
+					final JSExpression initializer = declaredVariable.getInitializer();
+
+					if(initializer != null)
+					{
+						this.assignedFrom = VariableAccessUtil.mayEvaluateToVariable(initializer, this.variable);
+					}
+				}
+			}
+		}
+
+		@Override
+		public void visitJSVariable(JSVariable var)
+		{
+			if(!this.assignedFrom)
+			{
+				super.visitJSVariable(var);
+				this.assignedFrom = (VariableAccessUtil.mayEvaluateToVariable(var.getInitializer(), this.variable));
+			}
+		}
+
+		public boolean isAssignedFrom()
+		{
+			return this.assignedFrom;
+		}
+	}
+
+	private static class VariableReturnedVisitor extends JSRecursiveElementVisitor
+	{
+		@Nonnull
+		private final JSVariable variable;
+		private boolean returned;
+
+		public VariableReturnedVisitor(@Nonnull JSVariable variable)
+		{
+			this.variable = variable;
+		}
+
+		@Override
+		public void visitJSReturnStatement(@Nonnull JSReturnStatement returnStatement)
+		{
+			if(!this.returned)
+			{
+				super.visitJSReturnStatement(returnStatement);
+				this.returned = VariableAccessUtil.mayEvaluateToVariable(returnStatement.getExpression(), this.variable);
+			}
+		}
+
+		public boolean isReturned()
+		{
+			return this.returned;
+		}
+	}
+
+	private static class ArrayContentsAccessedVisitor extends JSRecursiveElementVisitor
+	{
+		private final JSVariable variable;
+		private boolean accessed;
+
+		public ArrayContentsAccessedVisitor(@Nonnull JSVariable variable)
+		{
+			this.variable = variable;
+		}
+
+		@Override
+		public void visitJSForInStatement(@Nonnull JSForInStatement statement)
+		{
+			if(!this.accessed)
+			{
+				super.visitJSForInStatement(statement);
+				this.checkQualifier(statement.getCollectionExpression());
+			}
+		}
+
+		@Override
+		public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAccessExpression accessExpression)
+		{
+			if(!this.accessed)
+			{
+				super.visitJSIndexedPropertyAccessExpression(accessExpression);
+
+				final PsiElement parent = accessExpression.getParent();
+
+				if(!(parent instanceof JSAssignmentExpression ||
+						((JSAssignmentExpression) parent).getLOperand().equals(accessExpression)))
+				{
+					this.checkQualifier(accessExpression.getQualifier());
+				}
+			}
+		}
+
+		private void checkQualifier(JSExpression qualifier)
+		{
+			if(qualifier instanceof JSReferenceExpression)
+			{
+				final PsiElement referent = ((JSReferenceExpression) qualifier).resolve();
+
+				this.accessed = (referent != null && referent.equals(this.variable));
+			}
+		}
+
+		public boolean isAccessed()
+		{
+			return this.accessed;
+		}
+	}
+
+	private static class ArrayContentsAssignedVisitor extends JSRecursiveElementVisitor
+	{
 		private final JSVariable variable;
-        private                boolean    returned;
-
-        public VariableReturnedVisitor(@Nonnull JSVariable variable) {
-            this.variable = variable;
-        }
-
-        @Override public void visitJSReturnStatement(@Nonnull JSReturnStatement returnStatement){
-            if (!this.returned) {
-                super.visitJSReturnStatement(returnStatement);
-                this.returned = VariableAccessUtil.mayEvaluateToVariable(returnStatement.getExpression(), this.variable);
-            }
-        }
-
-        public boolean isReturned() {
-            return this.returned;
-        }
-    }
-
-    private static class ArrayContentsAccessedVisitor extends JSRecursiveElementVisitor {
-        private final JSVariable variable;
-        private       boolean    accessed;
-
-        public ArrayContentsAccessedVisitor(@Nonnull JSVariable variable) {
-            this.variable = variable;
-        }
-
-        @Override public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
-            if (!this.accessed) {
-                super.visitJSForInStatement(statement);
-                this.checkQualifier(statement.getCollectionExpression());
-            }
-        }
-
-        @Override public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAccessExpression accessExpression) {
-            if (!this.accessed) {
-                super.visitJSIndexedPropertyAccessExpression(accessExpression);
-
-                final PsiElement parent = accessExpression.getParent();
-
-                if (!(parent instanceof JSAssignmentExpression ||
-                      ((JSAssignmentExpression) parent).getLOperand().equals(accessExpression))) {
-                    this.checkQualifier(accessExpression.getQualifier());
-                }
-            }
-        }
-
-        private void checkQualifier(JSExpression qualifier) {
-            if (qualifier instanceof JSReferenceExpression) {
-                final PsiElement referent = ((JSReferenceExpression) qualifier).resolve();
-
-                this.accessed = (referent != null && referent.equals(this.variable));
-            }
-        }
-
-        public boolean isAccessed() {
-            return this.accessed;
-        }
-    }
-
-    private static class ArrayContentsAssignedVisitor extends JSRecursiveElementVisitor {
-        private final JSVariable  variable;
-        private       boolean     assigned;
-
-        public ArrayContentsAssignedVisitor(@Nonnull JSVariable variable) {
-            this.variable = variable;
-        }
-
-        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
-            if (!this.assigned) {
-                super.visitJSAssignmentExpression(assignment);
-                this.checkExpression(null, assignment.getLOperand());
-            }
-        }
-
-        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
-            if (!this.assigned) {
-                super.visitJSPrefixExpression(expression);
-                this.checkExpression(expression.getOperationSign(), expression.getExpression());
-            }
-        }
-
-        @Override public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
-            if (!this.assigned) {
-                super.visitJSPostfixExpression(expression);
-                this.checkExpression(expression.getOperationSign(), expression.getExpression());
-            }
-        }
-
-        private void checkExpression(IElementType tokenType, JSExpression expression) {
-            if (!(tokenType == null ||
-                  tokenType.equals(JSTokenTypes.PLUSPLUS)   ||
-                  tokenType.equals(JSTokenTypes.MINUSMINUS))) {
-                return;
-            }
-            if (!(expression instanceof JSIndexedPropertyAccessExpression)) {
-                return;
-            }
-
-            JSExpression arrayExpression = ((JSIndexedPropertyAccessExpression) expression).getQualifier();
-
-            while (arrayExpression instanceof JSIndexedPropertyAccessExpression) {
-                final JSIndexedPropertyAccessExpression accessExpression = (JSIndexedPropertyAccessExpression) arrayExpression;
-
-                arrayExpression = accessExpression.getQualifier();
-            }
-
-            if (arrayExpression instanceof JSReferenceExpression) {
-                final String referencedName = ((JSReferenceExpression) arrayExpression).getReferencedName();
-              
-
-              // TODO maybe it's better to check ((JSReferenceExpression) arrayExpression).isReferenceTo(variable) ?
-              this.assigned = referencedName != null && referencedName.equals(this.variable.getName());
-            }
-        }
-
-        public boolean isAssigned() {
-            return this.assigned;
-        }
-    }
-
-    private static class UsedVariableVisitor extends JSRecursiveElementVisitor {
-
-        @Nonnull
+		private boolean assigned;
+
+		public ArrayContentsAssignedVisitor(@Nonnull JSVariable variable)
+		{
+			this.variable = variable;
+		}
+
+		@Override
+		public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment)
+		{
+			if(!this.assigned)
+			{
+				super.visitJSAssignmentExpression(assignment);
+				this.checkExpression(null, assignment.getLOperand());
+			}
+		}
+
+		@Override
+		public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression)
+		{
+			if(!this.assigned)
+			{
+				super.visitJSPrefixExpression(expression);
+				this.checkExpression(expression.getOperationSign(), expression.getExpression());
+			}
+		}
+
+		@Override
+		public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression)
+		{
+			if(!this.assigned)
+			{
+				super.visitJSPostfixExpression(expression);
+				this.checkExpression(expression.getOperationSign(), expression.getExpression());
+			}
+		}
+
+		private void checkExpression(IElementType tokenType, JSExpression expression)
+		{
+			if(!(tokenType == null ||
+					tokenType.equals(JSTokenTypes.PLUSPLUS) ||
+					tokenType.equals(JSTokenTypes.MINUSMINUS)))
+			{
+				return;
+			}
+			if(!(expression instanceof JSIndexedPropertyAccessExpression))
+			{
+				return;
+			}
+
+			JSExpression arrayExpression = ((JSIndexedPropertyAccessExpression) expression).getQualifier();
+
+			while(arrayExpression instanceof JSIndexedPropertyAccessExpression)
+			{
+				final JSIndexedPropertyAccessExpression accessExpression = (JSIndexedPropertyAccessExpression) arrayExpression;
+
+				arrayExpression = accessExpression.getQualifier();
+			}
+
+			if(arrayExpression instanceof JSReferenceExpression)
+			{
+				final String referencedName = ((JSReferenceExpression) arrayExpression).getReferencedName();
+
+
+				// TODO maybe it's better to check ((JSReferenceExpression) arrayExpression).isReferenceTo(variable) ?
+				this.assigned = referencedName != null && referencedName.equals(this.variable.getName());
+			}
+		}
+
+		public boolean isAssigned()
+		{
+			return this.assigned;
+		}
+	}
+
+	private static class UsedVariableVisitor extends JSRecursiveElementVisitor
+	{
+
+		@Nonnull
 		private final Set<JSVariable> variables;
 
-        public UsedVariableVisitor() {
-            this.variables = new HashSet<JSVariable>();
-        }
-
-        @Override public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
-            super.visitJSReferenceExpression(ref);
-
-            final PsiElement referent = ref.resolve();
-
-            if (referent != null && referent instanceof JSVariable) {
-                this.variables.add((JSVariable) referent);
-            }
-        }
-
-        public Set<JSVariable> getVariables() {
-            return this.variables;
-        }
-    }
+		public UsedVariableVisitor()
+		{
+			this.variables = new HashSet<JSVariable>();
+		}
+
+		@Override
+		public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref)
+		{
+			super.visitJSReferenceExpression(ref);
+
+			final PsiElement referent = ref.resolve();
+
+			if(referent != null && referent instanceof JSVariable)
+			{
+				this.variables.add((JSVariable) referent);
+			}
+		}
+
+		public Set<JSVariable> getVariables()
+		{
+			return this.variables;
+		}
+	}
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index 3819e319..7653958b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -16,29 +16,30 @@
 
 package consulo.json.validation.inspections;
 
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.application.util.CachedValueProvider;
 import consulo.application.util.CachedValuesManager;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.json.validation.JsonFileDescriptorProviders;
+import consulo.json.validation.NativeArray;
+import consulo.json.validation.descriptor.JsonObjectDescriptor;
+import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.LocalInspectionTool;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.editor.inspection.ProblemsHolder;
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.*;
 import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
 import consulo.language.psi.PsiModificationTracker;
 import consulo.language.psi.PsiUtilCore;
 import consulo.language.psi.util.PsiTreeUtil;
-import consulo.util.lang.StringUtil;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiElementVisitor;
 import consulo.util.collection.ContainerUtil;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.psi.JSSimpleLiteralExpression;
-import consulo.json.validation.JsonFileDescriptorProviders;
-import consulo.json.validation.NativeArray;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.json.validation.descriptor.JsonPropertyDescriptor;
+import consulo.util.lang.StringUtil;
 import consulo.util.lang.function.PairProcessor;
 
 import javax.annotation.Nonnull;
@@ -49,6 +50,7 @@
  * @author VISTALL
  * @since 10.11.2015
  */
+@ExtensionImpl
 public class PropertyValidationInspection extends LocalInspectionTool
 {
 	@Nonnull
@@ -387,11 +389,18 @@ else if(o instanceof NativeArray)
 		return "null";
 	}
 
+	@Nonnull
+	@Override
+	public String[] getGroupPath()
+	{
+		return new String[]{"JSON"};
+	}
+
 	@Nonnull
 	@Override
 	public String getGroupDisplayName()
 	{
-		return "JSON";
+		throw new UnsupportedOperationException();
 	}
 
 	@Nonnull
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
index 1b4b3970..66a4c5d7 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
@@ -1,5 +1,6 @@
 package consulo.javascript.impl.ide.actions;
 
+import consulo.annotation.component.ExtensionImpl;
 import consulo.fileTemplate.FileTemplateContributor;
 import consulo.fileTemplate.FileTemplateRegistrator;
 
@@ -9,6 +10,7 @@
  * @author VISTALL
  * @since 29-Aug-22
  */
+@ExtensionImpl
 public class JavaScriptFileTemplateContributor implements FileTemplateContributor
 {
 	@Override
diff --git a/plugin/src/main/resources/META-INF/Intentions.xml b/plugin/src/main/resources/META-INF/Intentions.xml
deleted file mode 100644
index a36a9d89..00000000
--- a/plugin/src/main/resources/META-INF/Intentions.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<!--
-  - Copyright 2013-2015 must-be.org
-  -
-  - 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.
-  -->
-
-<consulo-plugin>
-	<extensions defaultExtensionNs="com.intellij">
-		<!-- Numbers -->
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.number.JSConvertIntegerToDecimalIntention</className>
-			<categoryKey>plugin.category.numbers</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.number.JSConvertIntegerToHexIntention</className>
-			<categoryKey>plugin.category.numbers</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.number.JSConvertIntegerToOctalIntention</className>
-			<categoryKey>plugin.category.numbers</categoryKey>
-		</intentionAction>
-
-		<!-- Boolean -->
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.bool.JSDeMorgansLawIntention</className>
-			<categoryKey>plugin.category.boolean</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.bool.JSRemoveBooleanEqualityIntention</className>
-			<categoryKey>plugin.category.boolean</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.bool.JSNegateComparisonIntention</className>
-			<categoryKey>plugin.category.boolean</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.bool.JSFlipComparisonIntention</className>
-			<categoryKey>plugin.category.boolean</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.bool.JSFlipConjunctionIntention</className>
-			<categoryKey>plugin.category.boolean</categoryKey>
-		</intentionAction>
-
-		<!-- Conditional -->
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.conditional.JSFlipConditionalIntention</className>
-			<categoryKey>plugin.category.conditional</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.conditional.JSFlipIfIntention</className>
-			<categoryKey>plugin.category.conditional</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.conditional.JSReplaceConditionalWithIfIntention</className>
-			<categoryKey>plugin.category.conditional</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSReplaceIfWithConditionalIntention</className>
-			<categoryKey>plugin.category.conditional</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.conditional.JSRemoveConditionalIntention</className>
-			<categoryKey>plugin.category.conditional</categoryKey>
-		</intentionAction>
-
-		<!-- Shift -->
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.number.JSReplaceMultiplyWithShiftIntention</className>
-			<categoryKey>plugin.category.shift</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.number.JSReplaceShiftWithMultiplyIntention</className>
-			<categoryKey>plugin.category.shift</categoryKey>
-		</intentionAction>
-
-
-		<!-- Declaration -->
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.initialization.JSMergeDeclarationAndInitializationIntention</className>
-			<categoryKey>plugin.category.declaration</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.initialization.JSSplitDeclarationAndInitializationIntention</className>
-			<categoryKey>plugin.category.declaration</categoryKey>
-		</intentionAction>
-
-		<!-- Comments -->
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.comment.JSChangeToCStyleCommentIntention</className>
-			<categoryKey>plugin.category.comments</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.comment.JSChangeToEndOfLineCommentIntention</className>
-			<categoryKey>plugin.category.comments</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.comment.JSMoveCommentToSeparateLineIntention</className>
-			<categoryKey>plugin.category.comments</categoryKey>
-		</intentionAction>
-
-		<!-- Control Flow -->
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSSplitElseIfIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSMergeElseIfIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSMergeIfAndIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSMergeIfOrIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSMergeParallelIfsIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSSplitIfAndIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSSplitIfOrIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.switchtoif.JSReplaceSwitchWithIfIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.switchtoif.JSReplaceIfWithSwitchIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSSimplifyIfElseIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.trivialif.JSRemoveRedundantElseIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.loop.JSMergeParallelForLoopsIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.loop.JSMergeParallelForInLoopsIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.braces.JSAddBracesIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.braces.JSRemoveBracesIntention</className>
-			<categoryKey>plugin.category.control-flow</categoryKey>
-		</intentionAction>
-
-		<!-- Other -->
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.parenthesis.JSRemoveUnnecessaryParenthesesIntention</className>
-			<categoryKey>plugin.category.other</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.string.JSJoinConcatenatedStringLiteralsIntention</className>
-			<categoryKey>plugin.category.other</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.opassign.JSReplaceWithOperatorAssignmentIntention</className>
-			<categoryKey>plugin.category.other</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.string.JSSingleToDoubleQuotedStringIntention</className>
-			<categoryKey>plugin.category.other</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.string.JSDoubleToSingleQuotedStringIntention</className>
-			<categoryKey>plugin.category.other</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.constant.JSConstantExpressionIntention</className>
-			<categoryKey>plugin.category.other</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.constant.JSConstantSubexpressionIntention</className>
-			<categoryKey>plugin.category.other</categoryKey>
-		</intentionAction>
-		<intentionAction>
-			<className>org.intellij.idea.lang.javascript.intention.increment.JSExtractIncrementIntention</className>
-			<categoryKey>plugin.category.other</categoryKey>
-		</intentionAction>
-
-	</extensions>
-</consulo-plugin>
\ No newline at end of file

From fc04a8248c353f262dc66a55af9eb00d092d12ff Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Tue, 30 Aug 2022 11:36:00 +0300
Subject: [PATCH 164/340] open module die serialize

---
 inspections/src/main/java/module-info.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inspections/src/main/java/module-info.java b/inspections/src/main/java/module-info.java
index 9bc114c3..4e5439d1 100644
--- a/inspections/src/main/java/module-info.java
+++ b/inspections/src/main/java/module-info.java
@@ -2,7 +2,7 @@
  * @author VISTALL
  * @since 29-Aug-22
  */
-module consulo.javascript.inspections
+open module consulo.javascript.inspections
 {
 	// TODO remove in future
 	requires java.desktop;

From 25b0644ab00c18d5b54f389b47d074894ca1aaf4 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Sun, 18 Sep 2022 19:22:03 +0300
Subject: [PATCH 165/340] missed module info

---
 regexp-impl/src/main/java/module-info.java | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 regexp-impl/src/main/java/module-info.java

diff --git a/regexp-impl/src/main/java/module-info.java b/regexp-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..27b41292
--- /dev/null
+++ b/regexp-impl/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+/**
+ * @author VISTALL
+ * @since 18-Sep-22
+ */
+module consulo.javascript.regexp.impl
+{
+	requires com.intellij.regexp;
+	requires consulo.javascript.base.impl;
+}
\ No newline at end of file

From 353f471823dc936297d0296fb6fc2434a540dc66 Mon Sep 17 00:00:00 2001
From: VISTALL <vistall.valeriy@gmail.com>
Date: Mon, 7 Nov 2022 11:35:11 +0300
Subject: [PATCH 166/340] compilation

---
 ...riptionByAnotherPsiElementEditorNotification.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index b2e8f7f4..378c37eb 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -32,12 +32,15 @@
 import consulo.language.psi.PsiModificationTracker;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
+import consulo.ui.Component;
 import consulo.ui.annotation.RequiredUIAccess;
+import consulo.ui.event.UIEvent;
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.VirtualFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
@@ -94,11 +97,11 @@ public EditorNotificationBuilder buildNotification(@Nonnull VirtualFile file, @N
 		{
 			EditorNotificationBuilder panel = supplier.get();
 			panel.withText(LocalizeValue.localizeTODO(StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) + " model description is available for this file"));
-			panel.withAction(LocalizeValue.localizeTODO("Choose " + myProvider.getPsiElementName()), new Runnable()
+			panel.withAction(LocalizeValue.localizeTODO("Choose " + myProvider.getPsiElementName()), new Consumer<UIEvent<Component>>()
 			{
 				@Override
 				@RequiredUIAccess
-				public void run()
+				public void accept(UIEvent<Component> uiEvent)
 				{
 					T chooseElement = myProvider.chooseElement(myProject);
 					if(chooseElement == null)
@@ -118,10 +121,11 @@ public void run()
 			EditorNotificationBuilder panel = supplier.get();
 			panel.withText(LocalizeValue.localizeTODO(StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) + " model description is registered for this file. " + myProvider.getPsiElementName() + ": "
 					+ registeredPsiElementId));
-			panel.withAction(LocalizeValue.localizeTODO("Cancel"), new Runnable()
+			panel.withAction(LocalizeValue.localizeTODO("Cancel"), new Consumer<UIEvent<Component>>()
 			{
 				@Override
-				public void run()
+				@RequiredUIAccess
+				public void accept(UIEvent<Component> uiEvent)
 				{
 					if(DescriptionByAnotherPsiElementService.getInstance(myProject).removeFile(file))
 					{

From 1872073d6075004fe604659ada2424f363b8bdf0 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 21 Dec 2022 16:00:55 +0400
Subject: [PATCH 167/340] drop #getFamilyName

---
 .../javascript/intention/JSIntention.java     |  189 +-
 .../impl/validation/ImplementMethodsFix.java  |  131 +-
 .../impl/validation/JSAnnotatingVisitor.java  | 2733 ++++++++---------
 3 files changed, 1409 insertions(+), 1644 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index 05365069..4acc999a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -29,111 +29,86 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public abstract class JSIntention extends PsiElementBaseIntentionAction
-{
-	@NonNls
-	private static final String INTENTION_SUFFIX = "Intention";
-	@NonNls
-	private static final String DISPLAY_NAME = ".display-name";
-	@NonNls
-	private static final String FAMILY_NAME = ".family-name";
-	private static final String PACKAGE_NAME = JSIntention.class.getPackage().getName();
-
-	private final JSElementPredicate predicate;
-
-	protected JSIntention()
-	{
-		this.predicate = this.getElementPredicate();
-	}
-
-	@Override
-	public void invoke(@Nonnull Project project, Editor editor, @Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		PsiElement matchingElement = findMatchingElement(element);
-		if(matchingElement == null)
-		{
-			return;
-		}
-		processIntention(matchingElement);
-	}
-
-	protected abstract void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException;
-
-	@Nonnull
-	protected abstract JSElementPredicate getElementPredicate();
-
-	@Nullable
-	protected PsiElement findMatchingElement(@Nullable PsiElement element)
-	{
-		if(element == null || element instanceof PsiFile)
-		{
-			return null;
-		}
-
-		final Language language = element.getLanguage();
-		if(language != Language.ANY && language != JavaScriptLanguage.INSTANCE)
-		{
-			return null;
-		}
-
-		while(element != null)
-		{
-			if(this.predicate.satisfiedBy(element))
-			{
-				return element;
-			}
-			element = element.getParent();
-			if(element instanceof PsiFile || element instanceof XmlElement)
-			{
-				break;
-			}
-		}
-		return null;
-	}
-
-
-	@Override
-	public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement element)
-	{
-		return element != null && findMatchingElement(element) != null;
-	}
-
-	@Override
-	public boolean startInWriteAction()
-	{
-		return true;
-	}
-
-	protected String getTextKey(@NonNls Object... suffixes)
-	{
-		return JSIntentionBundle.getKey(this.getClass().getName().substring(PACKAGE_NAME.length() + 1).replace("JS", ""), INTENTION_SUFFIX, null, suffixes);
-	}
-
-	@Override
-	@SuppressWarnings({"UnresolvedPropertyKey"})
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME));
-	}
-
-	@SuppressWarnings({"UnresolvedPropertyKey"})
-	public String getText(@NonNls Object... arguments)
-	{
-		return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME), arguments);
-	}
-
-	@SuppressWarnings({"UnresolvedPropertyKey"})
-	protected String getSuffixedDisplayName(@NonNls String suffix, @NonNls Object... arguments)
-	{
-		return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME, '.', suffix), arguments);
-	}
-
-	@Override
-	@SuppressWarnings({"UnresolvedPropertyKey"})
-	@Nonnull
-	public String getFamilyName()
-	{
-		return JSIntentionBundle.message(this.getTextKey(FAMILY_NAME));
-	}
+public abstract class JSIntention extends PsiElementBaseIntentionAction {
+  private static final String INTENTION_SUFFIX = "Intention";
+  private static final String DISPLAY_NAME = ".display-name";
+  private static final String PACKAGE_NAME = JSIntention.class.getPackage().getName();
+
+  private final JSElementPredicate predicate;
+
+  protected JSIntention() {
+    this.predicate = this.getElementPredicate();
+  }
+
+  @Override
+  public void invoke(@Nonnull Project project, Editor editor, @Nonnull PsiElement element) throws IncorrectOperationException {
+    PsiElement matchingElement = findMatchingElement(element);
+    if (matchingElement == null) {
+      return;
+    }
+    processIntention(matchingElement);
+  }
+
+  protected abstract void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException;
+
+  @Nonnull
+  protected abstract JSElementPredicate getElementPredicate();
+
+  @Nullable
+  protected PsiElement findMatchingElement(@Nullable PsiElement element) {
+    if (element == null || element instanceof PsiFile) {
+      return null;
+    }
+
+    final Language language = element.getLanguage();
+    if (language != Language.ANY && language != JavaScriptLanguage.INSTANCE) {
+      return null;
+    }
+
+    while (element != null) {
+      if (this.predicate.satisfiedBy(element)) {
+        return element;
+      }
+      element = element.getParent();
+      if (element instanceof PsiFile || element instanceof XmlElement) {
+        break;
+      }
+    }
+    return null;
+  }
+
+
+  @Override
+  public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement element) {
+    return element != null && findMatchingElement(element) != null;
+  }
+
+  @Override
+  public boolean startInWriteAction() {
+    return true;
+  }
+
+  protected String getTextKey(@NonNls Object... suffixes) {
+    return JSIntentionBundle.getKey(this.getClass().getName().substring(PACKAGE_NAME.length() + 1).replace("JS", ""),
+                                    INTENTION_SUFFIX,
+                                    null,
+                                    suffixes);
+  }
+
+  @Override
+  @SuppressWarnings({"UnresolvedPropertyKey"})
+  @Nonnull
+  public String getText() {
+    return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME));
+  }
+
+  @SuppressWarnings({"UnresolvedPropertyKey"})
+  public String getText(@NonNls Object... arguments) {
+    return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME), arguments);
+  }
+
+  @SuppressWarnings({"UnresolvedPropertyKey"})
+  protected String getSuffixedDisplayName(@NonNls String suffix, @NonNls Object... arguments) {
+    return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME, '.', suffix), arguments);
+  }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
index 9a1159ae..dfbebfc6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
@@ -16,95 +16,76 @@
 
 package com.intellij.lang.javascript.impl.validation;
 
-import javax.annotation.Nonnull;
-
-import consulo.language.psi.PsiFile;
-import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
-import consulo.language.editor.intention.IntentionAction;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.codeEditor.Editor;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.language.editor.intention.SyntheticIntentionAction;
+import consulo.language.psi.PsiFile;
+import consulo.project.Project;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 17, 2008
- *         Time: 9:39:02 PM
+ * Date: Jul 17, 2008
+ * Time: 9:39:02 PM
  */
-public class ImplementMethodsFix extends BaseCreateMethodsFix<JSFunction> implements IntentionAction
-{
-	public ImplementMethodsFix(final JSClass jsClass)
-	{
-		super(jsClass);
-	}
-
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JavaScriptBundle.message("javascript.fix.implement.methods");
-	}
+public class ImplementMethodsFix extends BaseCreateMethodsFix<JSFunction> implements SyntheticIntentionAction {
+  public ImplementMethodsFix(final JSClass jsClass) {
+    super(jsClass);
+  }
 
-	@Override
-	@Nonnull
-	public String getFamilyName()
-	{
-		return getText();
-	}
+  @Override
+  @Nonnull
+  public String getText() {
+    return JavaScriptBundle.message("javascript.fix.implement.methods");
+  }
 
-	@Override
-	public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
-	{
-		return myJsClass.isValid();
-	}
+  @Override
+  public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+    return myJsClass.isValid();
+  }
 
-	@Override
-	protected
-	@NonNls
-	String buildFunctionAttrText(@NonNls String attrText, final JSAttributeList attributeList, final JSFunction function)
-	{
-		attrText = super.buildFunctionAttrText(attrText, attributeList, function);
-		if(attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC)
-		{
-			attrText = "public";
-		}
-		return attrText;
-	}
+  @Override
+  protected
+  @NonNls
+  String buildFunctionAttrText(@NonNls String attrText, final JSAttributeList attributeList, final JSFunction function) {
+    attrText = super.buildFunctionAttrText(attrText, attributeList, function);
+    if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
+      attrText = "public";
+    }
+    return attrText;
+  }
 
-	@Override
-	protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func)
-	{
-		@NonNls String s = "{\n";
-		if(retType != null && !"void".equals(retType))
-		{
-			s += "return " + defaultValueOfType(retType) + JSChangeUtil.getSemicolon(func.getProject()) + "\n";
-		}
-		s += "}";
-		return s;
-	}
+  @Override
+  protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func) {
+    @NonNls String s = "{\n";
+    if (retType != null && !"void".equals(retType)) {
+      s += "return " + defaultValueOfType(retType) + JSChangeUtil.getSemicolon(func.getProject()) + "\n";
+    }
+    s += "}";
+    return s;
+  }
 
-	private static
-	@NonNls
-	String defaultValueOfType(final @NonNls String retType)
-	{
-		if("int".equals(retType) || "uint".equals(retType) || "Number".equals(retType))
-		{
-			return "0";
-		}
-		if("Boolean".equals(retType))
-		{
-			return "false";
-		}
-		return "null";
-	}
+  private static
+  @NonNls
+  String defaultValueOfType(final @NonNls String retType) {
+    if ("int".equals(retType) || "uint".equals(retType) || "Number".equals(retType)) {
+      return "0";
+    }
+    if ("Boolean".equals(retType)) {
+      return "false";
+    }
+    return "null";
+  }
 
-	@Override
-	public boolean startInWriteAction()
-	{
-		return true;
-	}
+  @Override
+  public boolean startInWriteAction() {
+    return true;
+  }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index 58cf75f6..e4315a64 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -41,6 +41,7 @@
 import consulo.language.editor.inspection.LocalQuickFixProvider;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.editor.intention.IntentionAction;
+import consulo.language.editor.intention.SyntheticIntentionAction;
 import consulo.language.editor.template.Template;
 import consulo.language.editor.template.TemplateManager;
 import consulo.language.editor.template.macro.CompleteMacro;
@@ -64,1038 +65,933 @@
 /**
  * @by max, maxim.mossienko
  */
-public class JSAnnotatingVisitor extends JSElementVisitor implements Annotator
-{
-	private AnnotationHolder myHolder;
-
-	@Override
-	public synchronized void annotate(PsiElement psiElement, AnnotationHolder holder)
-	{
-		myHolder = holder;
-		psiElement.accept(this);
-		myHolder = null;
-	}
-
-	@Override
-	public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair)
-	{
-		checkReferences(attributeNameValuePair, ProblemKind.ERROR);
-	}
-
-	@Override
-	public void visitJSIncludeDirective(final JSIncludeDirective includeDirective)
-	{
-		checkReferences(includeDirective, ProblemKind.ERROR);
-	}
-
-	@Override
-	public void visitJSLiteralExpression(JSSimpleLiteralExpression node)
-	{
-		checkReferences(node, ProblemKind.ERROR);
-	}
-
-	static enum ProblemKind
-	{
-		ERROR, WARNING, INFO
-	}
-
-	private void checkReferences(final PsiElement includeDirective, ProblemKind kind)
-	{
-		for(PsiReference ref : includeDirective.getReferences())
-		{
-			if(!ref.isSoft() && hasBadResolve(ref))
-			{
-				final TextRange elementRange = ref.getElement().getTextRange();
-				final TextRange textRange = ref.getRangeInElement();
-
-				final TextRange range = new TextRange(elementRange.getStartOffset() + textRange.getStartOffset(), elementRange.getStartOffset() + textRange
-						.getEndOffset());
-				final String message = MessageFormat.format(((EmptyResolveMessageProvider) ref).getUnresolvedMessagePattern(), ref.getCanonicalText());
-				Annotation annotation = kind == ProblemKind.ERROR ? myHolder.createErrorAnnotation(range, message) : kind == ProblemKind.WARNING ? myHolder
-						.createWarningAnnotation(range, message) : myHolder.createInfoAnnotation(range, message);
-
-				if(ref instanceof LocalQuickFixProvider)
-				{
-					for(LocalQuickFix fix : ((LocalQuickFixProvider) ref).getQuickFixes())
-					{
-						if(fix instanceof IntentionAction)
-						{
-							annotation.registerFix((IntentionAction) fix, new TextRange(annotation.getStartOffset(), annotation.getEndOffset()));
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private boolean hasBadResolve(final PsiReference ref)
-	{
-		if(ref instanceof PsiPolyVariantReference)
-		{
-			return ((PsiPolyVariantReference) ref).multiResolve(false).length == 0;
-		}
-		return ref.resolve() == null;
-	}
-
-	@Override
-	public void visitJSCallExpression(final JSCallExpression node)
-	{
-		final JSExpression methodExpression = node.getMethodExpression();
-
-		if(methodExpression instanceof JSLiteralExpression)
-		{
-			myHolder.createErrorAnnotation(methodExpression, JavaScriptBundle.message("javascript.parser.message.expected.function.name"));
-		}
-	}
-
-	@Override
-	public void visitJSDocTagValue(final JSDocTagValue tagValue)
-	{
-		checkReferences(tagValue, ProblemKind.WARNING);
-	}
-
-	@Override
-	public void visitJSDocTag(final JSDocTag tagValue)
-	{
-		checkReferences(tagValue, ProblemKind.WARNING);
-	}
-
-	@Override
-	public void visitJSReferenceList(final JSReferenceList referenceList)
-	{
-		final JSClass jsClass = (JSClass) referenceList.getParent();
-		if(JSResolveUtil.isArtificialClassUsedForReferenceList(jsClass))
-		{
-			return; // implements="MyInterface" in mxml has artificial class created
-		}
-
-		final boolean withinExtends = jsClass.getExtendsList() == referenceList;
-		final boolean withinImplements = jsClass.getImplementsList() == referenceList;
-
-		if(withinImplements && jsClass.isInterface())
-		{
-			myHolder.createErrorAnnotation(referenceList, JavaScriptBundle.message("javascript.validation.message.implements.for.interface.not.allowed"));
-			return;
-		}
-
-		final Map<String, JSReferenceExpression> nameToExprMap = new HashMap<String, JSReferenceExpression>();
-
-		final JSReferenceExpression[] referenceExpressions = referenceList.getExpressions();
-		if(referenceExpressions != null)
-		{
-			for(JSReferenceExpression expr : referenceExpressions)
-			{
-				final String s = expr.getReferencedName();
-				if(s != null)
-				{
-					nameToExprMap.put(s, expr);
-				}
-			}
-		}
-
-		for(JSClass clazz : referenceList.getReferencedClasses())
-		{
-			final boolean b = clazz.isInterface();
-			final JSReferenceExpression expr = nameToExprMap.get(clazz.getName());
-
-			if(!b && withinImplements)
-			{
-				myHolder.createErrorAnnotation(expr, JavaScriptBundle.message("javascript.validation.message.interface.name.expected.here"));
-			}
-			else if(withinExtends && b != jsClass.isInterface())
-			{
-				myHolder.createErrorAnnotation(expr, JavaScriptBundle.message(!b ? "javascript.validation.message.interface.name.expected.here" : "javascript.validation" +
-						".message.class.name.expected.here"));
-			}
-			if(clazz == jsClass)
-			{
-				myHolder.createErrorAnnotation(expr, JavaScriptBundle.message("javascript.validation.message.circular.dependency")).registerFix(new RemoveASTNodeFix
-						(referenceList.getNode(), "javascript.fix.remove.circular.dependency"));
-			}
-		}
-
-		if(withinImplements)
-		{
-			checkImplementedMethods(jsClass, new SimpleErrorReportingClient());
-		}
-	}
-
-	public interface ErrorReportingClient
-	{
-		enum ProblemKind
-		{
-			ERROR, WARNING
-		}
-
-		void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
-
-		void reportError(final PsiElement nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
-	}
-
-	public static void checkImplementedMethods(final JSClass jsClass, final ErrorReportingClient reportingClient)
-	{
-		final JSResolveUtil.CollectMethodsToImplementProcessor implementedMethodProcessor = new ImplementedMethodProcessor(jsClass)
-		{
-			ImplementMethodsFix implementMethodsFix = null;
-
-			@Override
-			protected void addNonimplementedFunction(final JSFunction function)
-			{
-				final PsiElement node = myJsClass.getNameIdentifier();
-				if(node == null)
-				{
-					return;
-				}
-				if(implementMethodsFix == null)
-				{
-					implementMethodsFix = new ImplementMethodsFix(myJsClass);
-				}
-				implementMethodsFix.addElementToProcess(function);
-				reportingClient.reportError(node, JavaScriptBundle.message("javascript.validation.message.interface.method.not.implemented", function.getName(),
-						((JSClass) JSResolveUtil.findParent(function)).getQualifiedName()), ErrorReportingClient.ProblemKind.ERROR, implementMethodsFix);
-			}
-
-			@Override
-			protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction)
-			{
-				final JSAttributeList attributeList = implementationFunction.getAttributeList();
-				if(attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC)
-				{
-					final ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
-					reportingClient.reportError(node, JavaScriptBundle.message("javascript.validation.message.interface.method.invalid.access.modifier"),
-							ErrorReportingClient.ProblemKind.ERROR, null   // TODO: quickfix
-					);
-				}
-
-				final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(implementationFunction, interfaceFunction);
-
-				if(incompatibleSignature != SignatureMatchResult.COMPATIBLE_SIGNATURE)
-				{
-					PsiElement parent = JSResolveUtil.findParent(implementationFunction);
-					if(parent instanceof JSFile)
-					{
-						parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
-					}
-
-					if(parent != myJsClass)
-					{
-						// some parent incorrectly implements method from our interface
-						addNonimplementedFunction(interfaceFunction);
-						return;
-					}
-
-					if(incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS)
-					{
-						final JSParameterList parameterList = implementationFunction.getParameterList();
-						final JSParameterList expectedParameterList = interfaceFunction.getParameterList();
-						reportingClient.reportError(parameterList.getNode(), JavaScriptBundle.message("javascript.validation.message.interface.method.invalid.signature",
-								expectedParameterList != null ? expectedParameterList.getText() : "()"), ErrorReportingClient.ProblemKind.ERROR, null);  // TODO: quickfix
-					}
-					else if(incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS)
-					{
-						PsiElement implementationReturnTypeExpr = implementationFunction.getReturnTypeElement();
-						PsiElement interfaceReturnTypeExpr = interfaceFunction.getReturnTypeElement();
-						reportingClient.reportError(implementationReturnTypeExpr != null ? implementationReturnTypeExpr : implementationFunction
-								.getNameIdentifier(), JavaScriptBundle.message("javascript.validation.message.interface.method.invalid.signature2",
-								interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"), ErrorReportingClient.ProblemKind.ERROR, null);  // TODO: quickfix
-					}
-				}
-			}
-		};
-		JSResolveUtil.processInterfaceMethods(jsClass, implementedMethodProcessor);
-	}
-
-	private static ASTNode findElementForAccessModifierError(final @Nonnull JSFunction o, final JSAttributeList attributeList)
-	{
-		if(attributeList != null)
-		{
-			final PsiElement accessTypeElement = attributeList.findAccessTypeElement();
-			if(accessTypeElement != null)
-			{
-				return accessTypeElement.getNode();
-			}
-		}
-		PsiElement nameIdentifier = o.getNameIdentifier();
-		return nameIdentifier == null ? null : nameIdentifier.getNode();
-	}
-
-	@Override
-	public void visitJSAttributeList(JSAttributeList attributeList)
-	{
-		PsiElement parentForCheckingNsOrAccessModifier = null;
-
-		PsiElement namespaceElement = attributeList.getNamespaceElement();
-		PsiElement accessTypeElement = attributeList.findAccessTypeElement();
-		PsiElement namespaceOrAccessModifierElement = namespaceElement;
-
-		if(namespaceOrAccessModifierElement == null)
-		{
-			namespaceOrAccessModifierElement = accessTypeElement;
-		}
-		else if(accessTypeElement != null)
-		{
-			myHolder.createErrorAnnotation(namespaceOrAccessModifierElement, JavaScriptBundle.message("javascript.validation.message.use.namespace.reference.or" +
-					".access.modifier")).registerFix(new RemoveASTNodeFix(namespaceOrAccessModifierElement.getNode(), "javascript.fix.remove.namespace.reference"));
-
-			myHolder.createErrorAnnotation(accessTypeElement, JavaScriptBundle.message("javascript.validation.message.use.namespace.reference.or.access.modifier"))
-					.registerFix(new RemoveASTNodeFix(accessTypeElement.getNode(), "javascript.fix.remove.namespace.reference"));
-		}
-
-		if(namespaceOrAccessModifierElement != null)
-		{
-			parentForCheckingNsOrAccessModifier = JSResolveUtil.findParent(attributeList.getParent());
-			if(!(parentForCheckingNsOrAccessModifier instanceof JSClass))
-			{
-				String typeElementText;
-				boolean nodeUnderPackage;
-
-				if(((!(nodeUnderPackage = (parentForCheckingNsOrAccessModifier instanceof JSPackageStatement)) && (!(parentForCheckingNsOrAccessModifier
-						instanceof JSFile) || attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL)) || (!"public".equals(typeElementText =
-						namespaceOrAccessModifierElement.getText())) && !"internal".equals(typeElementText)))
-				{
-					boolean nsRef = namespaceOrAccessModifierElement instanceof JSReferenceExpression;
-					myHolder.createErrorAnnotation(namespaceOrAccessModifierElement, JavaScriptBundle.message(nodeUnderPackage ? "javascript.validation.message.access" +
-							".modifier.allowed.only.for.package.members" : nsRef ? "javascript.validation.message.namespace.allowed.only.for.class.members" : "javascript" +
-							".validation.message.access.modifier.allowed.only.for.class.members")).registerFix(new RemoveASTNodeFix(namespaceOrAccessModifierElement
-							.getNode(), nsRef ? "javascript.fix.remove.namespace.reference" : "javascript.fix.remove.access.modifier"));
-				}
-			}
-			else if(((JSClass) parentForCheckingNsOrAccessModifier).isInterface())
-			{
-
-				if(attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL || attributeList.getNode().findChildByType(JSTokenTypes
-						.INTERNAL_KEYWORD) != null
-
-						)
-				{
-					final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.ACCESS_MODIFIERS);
-					final Annotation annotation = myHolder.createErrorAnnotation(astNode, JavaScriptBundle.message("javascript.validation.message.interface.members.cannot" +
-							".have.access.modifiers"));
-
-					annotation.registerFix(new RemoveASTNodeFix(astNode, "javascript.fix.remove.access.modifier"));
-				}
-			}
-		}
-	}
-
-	@Override
-	public void visitJSReferenceExpression(final JSReferenceExpression node)
-	{
-		final PsiElement parent = node.getParent();
-
-		if(parent instanceof JSNamedElement)
-		{
-			JSNamedElement namedElement = (JSNamedElement) parent;
-			final PsiElement nameIdentifier = namedElement.getNameIdentifier();
-
-			if(nameIdentifier != null && nameIdentifier == node)
-			{
-				if(parent instanceof JSPackageStatement)
-				{
-					checkPackageStatement((JSPackageStatement) parent);
-				}
-				else if(!(parent instanceof JSImportStatement) && parent.getParent() instanceof JSPackageStatement)
-				{
-					checkNamedObjectIsInCorrespondingFile(namedElement);
-				}
-				else if(parent instanceof JSFunction)
-				{
-					JSFunction function = (JSFunction) parent;
-
-					if(function.isConstructor())
-					{
-						final JSClass clazz;
-						if(parent.getParent() instanceof JSClass)
-						{
-							clazz = (JSClass) parent.getParent();
-						}
-						else
-						{
-							assert parent.getParent() instanceof JSFile;
-							clazz = JSResolveUtil.getXmlBackedClass((JSFile) parent.getParent());
-							assert clazz != null;
-						}
-
-						checkMissedSuperCall(node, function, clazz);
-					}
-					else if(function.isSetProperty())
-					{
-						String typeString = function.getReturnTypeString();
-
-						if(typeString != null && !"void".equals(typeString))
-						{
-							// TODO: fix!
-							myHolder.createErrorAnnotation(function.getReturnTypeElement(), JavaScriptBundle.message("javascript.validation.message.set.method.should.be.void.or" +
-									".without.type"));
-						}
-
-						JSParameterList parameterList = function.getParameterList();
-						if(parameterList != null && parameterList.getParameters().length != 1)
-						{
-							// TODO: fix!
-							myHolder.createErrorAnnotation(parameterList, JavaScriptBundle.message("javascript.validation.message.set.method.should.have.one.parameter"));
-						}
-					}
-					else if(function.isGetProperty())
-					{
-						String typeString = function.getReturnTypeString();
-
-						if(typeString == null || "void".equals(typeString))
-						{
-							// TODO: fix!
-							myHolder.createErrorAnnotation(typeString != null ? function.getReturnTypeElement() : nameIdentifier,
-									JavaScriptBundle.message("javascript.validation.message.get.method.should.be.valid.type", typeString != null ? typeString : "empty"));
-						}
-
-						JSParameterList parameterList = function.getParameterList();
-						if(parameterList != null && parameterList.getParameters().length != 0)
-						{
-							// TODO: fix!
-							myHolder.createErrorAnnotation(parameterList, JavaScriptBundle.message("javascript.validation.message.get.method.should.have.no.parameter"));
-						}
-					}
-				}
-
-				if(parent instanceof JSClass)
-				{
-					final JSClass jsClass = (JSClass) parent;
-					final JSFunction constructor = jsClass.findFunctionByName(jsClass.getName());
-					if(constructor == null)
-					{
-						checkMissedSuperCall(node, constructor, jsClass);
-					}
-
-					PsiElement clazzParent = jsClass.getParent();
-					if(!(clazzParent instanceof JSPackageStatement) && !(clazzParent instanceof JSFile))
-					{
-						myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.nested.classes.are.not.allowed"));
-					}
-				}
-			}
-		}
-
-		if(node.getQualifier() == null)
-		{
-			if(!(parent instanceof JSCallExpression))
-			{
-				if("arguments".equals(node.getText()))
-				{
-					JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
-					if(fun == null)
-					{
-						myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.arguments.out.of.function"));
-					}
-					else
-					{
-						JSParameterList parameterList = fun.getParameterList();
-						if(parameterList != null)
-						{
-							for(JSParameter p : parameterList.getParameters())
-							{
-								if(p.isRest())
-								{
-									myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.arguments.with.rest.parameter"));
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private void checkMissedSuperCall(JSReferenceExpression node, JSFunction constructor, JSClass jsClass)
-	{
-		if(jsClass.isInterface())
-		{
-			return;
-		}
-		JSFunction nontrivialSuperClassConstructor = getNontrivialSuperClassConstructor(jsClass);
-
-		if(nontrivialSuperClassConstructor != null)
-		{
-			Annotation annotation = null;
-
-			if(!hasSuperConstructorCall(constructor))
-			{
-				annotation = myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.missed.super.constructor.call"));
-			}
-
-			if(annotation != null)
-			{
-				if(constructor == null)
-				{
-					annotation.registerFix(new AddConstructorAndSuperInvokationFix(node, nontrivialSuperClassConstructor));
-				}
-				else
-				{
-					annotation.registerFix(new AddSuperInvokationFix(node, nontrivialSuperClassConstructor));
-				}
-			}
-		}
-	}
-
-	private boolean hasSuperConstructorCall(JSFunction jsFunction)
-	{
-		if(jsFunction == null)
-		{
-			return false;
-		}
-		final JSSourceElement[] body = (jsFunction).getBody();
-		final JSStatement[] statements = body.length > 0 ? ((JSBlockStatement) body[0]).getStatements() : JSStatement.EMPTY;
-		JSExpression expr;
-
-		for(JSStatement st : statements)
-		{
-			if(st instanceof JSExpressionStatement &&
-					(expr = ((JSExpressionStatement) st).getExpression()) instanceof JSCallExpression &&
-					(((JSCallExpression) expr).getMethodExpression()) instanceof JSSuperExpression)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public static JSFunction getNontrivialSuperClassConstructor(JSClass clazz)
-	{
-		final JSClass[] classes = clazz.getSuperClasses();
-
-		if(classes.length > 0)
-		{
-			final JSFunction constructor = classes[0].findFunctionByName(classes[0].getName());
-
-			if(constructor != null)
-			{
-				final JSParameter[] jsParameters = constructor.getParameterList().getParameters();
-				boolean hasRequiredParameters = false;
-				for(JSParameter p : jsParameters)
-				{
-					if(!p.isRest() && !p.hasInitializer())
-					{
-						hasRequiredParameters = true;
-						break;
-					}
-				}
-				return hasRequiredParameters ? constructor : null;
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	public void visitJSParameterList(JSParameterList node)
-	{
-		boolean foundRest = false;
-		boolean initializerPresent = false;
-
-		for(JSParameter parameter : node.getParameters())
-		{
-			JSExpression initializer = parameter.getInitializer();
-			boolean hasInitializer = initializer != null;
-
-			if(hasInitializer && !initializerPresent)
-			{
-				initializerPresent = true;
-			}
-			else if(!hasInitializer && initializerPresent && !parameter.isRest())
-			{
-				myHolder.createErrorAnnotation(parameter, JavaScriptBundle.message("javascript.validation.message.parameter.should.be.initialized")).registerFix(new
-						RemoveASTNodeFix(parameter.getNode(), "javascript.fix.remove.parameter"));
-			}
-			else if(hasInitializer && parameter.isRest())
-			{
-				myHolder.createErrorAnnotation(parameter, JavaScriptBundle.message("javascript.validation.message.rest.parameter.should.not.be.initialized"))
-						.registerFix(new RemoveASTNodeFix("javascript.fix.remove.initializer", getNodesBefore(initializer, JSTokenTypes.EQ)));
-			}
-
-			if(parameter.isRest() && !foundRest)
-			{
-				foundRest = true;
-				PsiElement typeElement = parameter.getTypeElement();
-				if(typeElement != null && !"Array".equals(typeElement.getText()))
-				{
-					myHolder.createErrorAnnotation(typeElement, JavaScriptBundle.message("javascript.validation.message.unexpected.type.for.rest.parameter")).registerFix
-							(new RemoveASTNodeFix("javascript.fix.remove.type.reference", getNodesBefore(typeElement, JSTokenTypes.COLON)));
-				}
-			}
-			else if(foundRest)
-			{
-				myHolder.createErrorAnnotation(parameter, JavaScriptBundle.message("javascript.validation.message.parameter.is.not.allowed.after.rest.parameter"))
-						.registerFix(new RemoveASTNodeFix(parameter.getNode(), "javascript.fix.remove.parameter"));
-			}
-		}
-	}
-
-	private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq)
-	{
-		List<ASTNode> nodes = new ArrayList<ASTNode>();
-		PsiElement element = initializer.getPrevSibling();
-		PsiElement lastElement = element;
-
-		if(element instanceof PsiWhiteSpace)
-		{
-			nodes.add(element.getNode());
-			lastElement = element.getPrevSibling();
-		}
-
-		if(lastElement != null && lastElement.getNode().getElementType() == eq)
-		{
-			nodes.add(lastElement.getNode());
-		}
-
-		nodes.add(initializer.getNode());
-		return nodes.toArray(new ASTNode[nodes.size()]);
-	}
-
-	@Override
-	public void visitJSPackageStatement(final JSPackageStatement packageStatement)
-	{
-		for(PsiElement el = packageStatement.getPrevSibling(); el != null; el = el.getPrevSibling())
-		{
-			if(!(el instanceof PsiWhiteSpace) && !(el instanceof PsiComment))
-			{
-				myHolder.createErrorAnnotation(packageStatement.getFirstChild().getNode(), JavaScriptBundle.message("javascript.validation.message.package.shouldbe" +
-						".first.statement"));
-				break;
-			}
-		}
-		final PsiElement node = packageStatement.getNameIdentifier();
-		if(node == null)
-		{
-			checkPackageStatement(packageStatement);
-		}
-	}
-
-	@Override
-	public void visitJSAssignmentExpression(final JSAssignmentExpression expression)
-	{
-		JSExpression lExpr = expression.getLOperand();
-		if(lExpr == null)
-		{
-			return;
-		}
-		if(lExpr instanceof JSDefinitionExpression)
-		{
-			lExpr = ((JSDefinitionExpression) lExpr).getExpression();
-		}
-
-		if(lExpr instanceof JSReferenceExpression)
-		{
-			PsiElement resolved = ((JSReferenceExpression) lExpr).resolve();
-			if(resolved instanceof JSVariable && ((JSVariable) resolved).isConst())
-			{
-				myHolder.createErrorAnnotation(lExpr, JavaScriptBundle.message("javascript.validation.message.assignment.to.const"));
-			}
-		}
-
-		if(!JSUtils.isLHSExpression(lExpr))
-		{
-			myHolder.createErrorAnnotation(lExpr, JavaScriptBundle.message("javascript.validation.message.must.be.lvalue"));
-		}
-	}
-
-	@Override
-	public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node)
-	{
-		final PsiElement lastChild = node.getLastChild();
-		PsiElement child = lastChild != null ? lastChild.getPrevSibling() : null;
-		if(child instanceof PsiWhiteSpace)
-		{
-			child = child.getPrevSibling();
-		}
-		ASTNode childNode;
-
-		if(child != null && (childNode = child.getNode()) != null && childNode.getElementType() == JSTokenTypes.COMMA)
-		{
-			final Annotation annotation = myHolder.createWarningAnnotation(child, JavaScriptBundle.message("javascript.validation.message.unneeded.comma"));
-			annotation.registerFix(new RemoveASTNodeFix(childNode, "javascript.validation.message.remove.unneeded.comma.fix"));
-		}
-	}
-
-	@Override
-	public void visitJSTryStatement(final JSTryStatement node)
-	{
-		final JSCatchBlock[] blocks = node.getAllCatchBlocks();
-
-		if(blocks.length > 1)
-		{
-			final Set<String> typeToCatch = new HashSet<String>();
-
-			for(JSCatchBlock block : blocks)
-			{
-				final JSParameter p = block.getParameter();
-				if(p == null)
-				{
-					continue;
-				}
-
-				String s = p.getTypeString();
-				if(s == null)
-				{
-					s = "";
-				}
-
-				if(typeToCatch.contains(s))
-				{
-					final Annotation annotation = myHolder.createErrorAnnotation(block, JavaScriptBundle.message("javascript.validation.message.duplicated.catch.block"));
-					annotation.registerFix(new RemoveASTNodeFix(block.getNode(), "javascript.validation.message.duplicated.catch.block.fix"));
-				}
-				else
-				{
-					typeToCatch.add(s);
-				}
-			}
-		}
-	}
-
-	@Override
-	public void visitJSVariable(final JSVariable var)
-	{
-		if(var.isConst() && var.getInitializer() == null)
-		{
-			if(var.getParent() instanceof JSVarStatement && var.getParent().getParent() instanceof JSForInStatement)
-			{
-				return;
-			}
-
-			JSAttributeList attributeList = var.getAttributeList();
-			if(attributeList == null || attributeList.getAttributesByName("Embed").length == 0)
-			{
-				myHolder.createWarningAnnotation(var, JavaScriptBundle.message("javascript.validation.message.const.variable.without.initializer."));
-			}
-		}
-
-		if(var.getParent().getParent() instanceof JSPackageStatement)
-		{
-			checkNamedObjectIsInCorrespondingFile(var);
-		}
-	}
-
-	@Override
-	public void visitJSContinueStatement(final JSContinueStatement node)
-	{
-		if(node.getStatementToContinue() == null)
-		{
-			myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.continue.without.target"));
-		}
-	}
-
-	@Override
-	public void visitJSBreakStatement(final JSBreakStatement node)
-	{
-		if(node.getStatementToBreak() == null)
-		{
-			myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.break.without.target"));
-		}
-	}
-
-	@Override
-	public void visitJSThisExpression(final JSThisExpression node)
-	{
-		checkClassReferenceInStaticContext(node, "javascript.validation.message.this.referenced.from.static.context");
-	}
-
-	private void checkClassReferenceInStaticContext(final JSExpression node, @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String key)
-	{
-		PsiElement element = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSFile.class, JSClass.class, JSObjectLiteralExpression.class,
-				XmlTagChild.class);
-
-		if(element instanceof JSFunction)
-		{
-			final JSFunction function = (JSFunction) element;
-
-			final JSAttributeList attributeList = function.getAttributeList();
-			if(attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC))
-			{
-				myHolder.createErrorAnnotation(node, JavaScriptBundle.message(key));
-				return;
-			}
-		}
-
-		PsiElement elementParent;
-		if(node instanceof JSSuperExpression && (element == null || (!((elementParent = element.getParent()) instanceof JSClass) && (!(elementParent
-				instanceof JSFile) || elementParent.getContext() == null))))
-		{
-			myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.super.referenced.without.class.instance.context"));
-		}
-	}
-
-	@Override
-	public void visitJSSuperExpression(final JSSuperExpression node)
-	{
-		checkClassReferenceInStaticContext(node, "javascript.validation.message.super.referenced.from.static.context");
-	}
-
-	@Override
-	public void visitJSFunctionDeclaration(final JSFunction node)
-	{
-		final PsiElement nameIdentifier = node.getNameIdentifier();
-		if(nameIdentifier == null)
-		{
-			return;
-		}
-		PsiElement parent = node.getParent();
-
-		if(parent instanceof JSFile)
-		{
-			parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
-
-			if(parent instanceof JSClass && node.getName().equals(((JSClass) parent).getName()) && JavaScriptSupportLoader.isFlexMxmFile(parent
-					.getContainingFile()))
-			{
-				final Annotation annotation = myHolder.createErrorAnnotation(nameIdentifier, JavaScriptBundle.message("javascript.validation.message.constructor.in.mxml" +
-						".is.not.allowed"));
-
-				annotation.registerFix(new RemoveASTNodeFix(node.getNode(), "javascript.fix.remove.constructor"));
-			}
-		}
-
-		if(parent instanceof JSPackageStatement)
-		{
-			checkNamedObjectIsInCorrespondingFile(node);
-		}
-
-		if(parent instanceof JSClass && !node.isConstructor())
-		{
-			final JSAttributeList attributeList = node.getAttributeList();
-			final JSClass clazz = (JSClass) parent;
-
-			if(attributeList == null || (!attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) && (attributeList.getAccessType() != JSAttributeList
-					.AccessType.PRIVATE || attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE))))
-			{
-				final String qName = clazz.getQualifiedName();
-				final boolean hasOverride = attributeList != null ? attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE) : false;
-
-				final Ref<JSFunction> set = new Ref<JSFunction>();
-				boolean b = JSResolveUtil.iterateType(node, parent, qName, new JSResolveUtil.OverrideHandler()
-				{
-					@Override
-					public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className)
-					{
-						if(qName == className || (qName != null && qName.equals(className)))
-						{
-							return true;
-						}
-						set.set((JSFunction) processor.getResult());
-						if("Object".equals(className))
-						{
-							if(hasOverride && !attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE))
-							{ /*native modifier is written always*/
-								final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
-								final Annotation annotation = myHolder.createErrorAnnotation(astNode, JavaScriptBundle.message("javascript.validation.message.function.override.for" +
-										".object.method"));
-
-								annotation.registerFix(new RemoveASTNodeFix(astNode, "javascript.fix.remove.override.modifier"));
-							}
-							return false;
-						}
-						else if(!hasOverride)
-						{
-							final Annotation annotation = myHolder.createErrorAnnotation(nameIdentifier, JavaScriptBundle.message("javascript.validation.message.function" +
-									".override.without.override.modifier", className));
-
-							annotation.registerFix(new AddOverrideIntentionAction(node));
-						}
-						return false;
-					}
-				});
-
-				if(b && hasOverride)
-				{
-					final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
-					final Annotation annotation = myHolder.createErrorAnnotation(astNode, JavaScriptBundle.message("javascript.validation.message.function.override.without" +
-							".parent.method"));
-
-					annotation.registerFix(new RemoveASTNodeFix(astNode, "javascript.fix.remove.override.modifier"));
-				}
-
-				if(!b && hasOverride)
-				{
-					final JSFunction override = set.get();
-					final JSAttributeList overrideAttrList = override.getAttributeList();
-					String overrideNs = null;
-
-					if((overrideAttrList == null && (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL)) ||
-							(overrideAttrList != null && attributeList.getAccessType() != overrideAttrList.getAccessType()) ||
-							overrideAttrList != null && (overrideNs = overrideAttrList.getNamespace()) != null && !overrideNs.equals(attributeList.getNamespace()))
-					{
-						final Annotation annotation1 = myHolder.createErrorAnnotation(findElementForAccessModifierError(node, attributeList),
-								JavaScriptBundle.message("javascript.validation.message.function.override.incompatible.access.modifier",
-										overrideNs != null ? overrideNs : (overrideAttrList != null ? overrideAttrList.getAccessType().toString() : JSAttributeList.AccessType
-												.PACKAGE_LOCAL.toString()).toLowerCase()));
-
-						// TODO: quickfix
-						//annotation.registerFix(
-						//    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
-						//);
-					}
-
-					final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(node, override);
-
-					if(incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS)
-					{
-						final JSParameterList nodeParameterList = node.getParameterList();
-						final JSParameterList overrideParameterList = override.getParameterList();
-
-						final Annotation annotation = myHolder.createErrorAnnotation(nodeParameterList != null ? nodeParameterList : node.getNameIdentifier(), JavaScriptBundle.message("javascript.validation.message.function.override.incompatible.signature",
-								overrideParameterList != null ? overrideParameterList.getText() : "()"));
-
-						// TODO: quickfix
-						//annotation.registerFix(
-						//    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
-						//);
-					}
-					else if(incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS)
-					{
-						PsiElement returnTypeExpr = node.getReturnTypeElement();
-						PsiElement overrideReturnTypeExpr = override.getReturnTypeElement();
-						final Annotation annotation = myHolder.createErrorAnnotation(returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier(),
-								JavaScriptBundle.message("javascript.validation.message.function.override.incompatible.signature2",
-										overrideReturnTypeExpr != null ? overrideReturnTypeExpr.getText() : "*"));
-
-						// TODO: quickfix
-						//annotation.registerFix(
-						//    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
-						//);
-					}
-				}
-			}
-		}
-	}
-
-	enum SignatureMatchResult
-	{
-		PARAMETERS_DIFFERS,
-		RETURN_TYPE_DIFFERS,
-		COMPATIBLE_SIGNATURE
-	}
-
-	private static SignatureMatchResult checkCompatibleSignature(final JSFunction fun, final JSFunction override)
-	{
-		JSParameterList nodeParameterList = fun.getParameterList();
-		JSParameterList overrideParameterList = override.getParameterList();
-		final JSParameter[] parameters = nodeParameterList != null ? nodeParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
-		final JSParameter[] overrideParameters = overrideParameterList != null ? overrideParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
-
-		SignatureMatchResult result = parameters.length != overrideParameters.length ? SignatureMatchResult.PARAMETERS_DIFFERS : SignatureMatchResult
-				.COMPATIBLE_SIGNATURE;
-
-		if(result == SignatureMatchResult.COMPATIBLE_SIGNATURE)
-		{
-			for(int i = 0; i < parameters.length; ++i)
-			{
-				if(!compatibleType(overrideParameters[i].getTypeString(), parameters[i].getTypeString(), overrideParameterList,
-						nodeParameterList) || overrideParameters[i].hasInitializer() != parameters[i].hasInitializer())
-				{
-					result = SignatureMatchResult.PARAMETERS_DIFFERS;
-					break;
-				}
-			}
-		}
-
-		if(result == SignatureMatchResult.COMPATIBLE_SIGNATURE)
-		{
-			if(!compatibleType(override.getReturnTypeString(), fun.getReturnTypeString(), override, fun))
-			{
-				result = SignatureMatchResult.RETURN_TYPE_DIFFERS;
-			}
-		}
-		return result;
-	}
-
-	private static boolean compatibleType(String overrideParameterType, String parameterType, PsiElement overrideContext, PsiElement funContext)
-	{
-		// TODO: This should be more accurate
-		if(overrideParameterType != null && !overrideParameterType.equals(parameterType))
-		{
-			parameterType = JSImportHandlingUtil.resolveTypeName(parameterType, funContext);
-			overrideParameterType = JSImportHandlingUtil.resolveTypeName(overrideParameterType, overrideContext);
-
-			return overrideParameterType.equals(parameterType);
-		}
-		else if(overrideParameterType == null && parameterType != null && !"*".equals(parameterType))
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	@Override
-	public void visitJSReturnStatement(final JSReturnStatement node)
-	{
-		final PsiElement element = PsiTreeUtil.getParentOfType(node, JSFunction.class, XmlTagChild.class, XmlAttributeValue.class, JSFile.class, JavaScriptLambdaExpression.class);
-		if((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost)) || (element instanceof XmlTagChild && !(element
-				.getParent() instanceof XmlAttributeValue)))
-		{
-			myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.return.outside.function.definition"));
-		}
-
-		if(element instanceof JSFunction)
-		{
-			final @NonNls String typeString = ((JSFunction) element).getReturnTypeString();
-			if(typeString != null && !"void".equals(typeString) && node.getExpression() == null)
-			{
-				myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.return.value.of.type.is.required", typeString));
-			}
-		}
-	}
-
-	@Override
-	public void visitJSLabeledStatement(final JSLabeledStatement node)
-	{
-		final String label = node.getLabel();
-		if(label != null)
-		{
-			PsiElement run = node.getParent();
-			while(run != null)
-			{
-				if(run instanceof JSLabeledStatement)
-				{
-					if(label.equals(((JSLabeledStatement) run).getLabel()))
-					{
-						myHolder.createErrorAnnotation(node.getLabelIdentifier(), JavaScriptBundle.message("javascript.validation.message.duplicate.label"));
-						break;
-					}
-				}
-
-				if(run instanceof JSFunction)
-				{
-					break;
-				}
-				run = run.getParent();
-			}
-		}
-	}
-
-	private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass)
-	{
-		final PsiFile containingFile = aClass.getContainingFile();
-
-		if(containingFile.getContext() != null)
-		{
-			return;
-		}
-		final VirtualFile file = containingFile.getVirtualFile();
-
-		if(file != null && !file.getNameWithoutExtension().equals(aClass.getName()))
-		{
-			final PsiElement node = aClass.getNameIdentifier();
-
-			if(node != null)
-			{
-				final String name = aClass.getName();
-				String nameWithExtension = name + "." + file.getExtension();
-				final String message = JavaScriptBundle.message(aClass instanceof JSClass ? "javascript.validation.message.class.should.be.in.file" : aClass instanceof
-						JSNamespaceDeclaration ? "javascript.validation.message.namespace.should.be.in.file" : aClass instanceof JSVariable ? "javascript.validation" +
-						".message.variable.should.be.in.file" : "javascript.validation.message.function.should.be.in.file", name, nameWithExtension);
-				final Annotation annotation = myHolder.createErrorAnnotation(node, message);
-
-				annotation.registerFix(new RenameFileFix(nameWithExtension));
-		/*annotation.registerFix(new RenamePublicClassFix(aClass) {
+public class JSAnnotatingVisitor extends JSElementVisitor implements Annotator {
+  private AnnotationHolder myHolder;
+
+  @Override
+  public synchronized void annotate(PsiElement psiElement, AnnotationHolder holder) {
+    myHolder = holder;
+    psiElement.accept(this);
+    myHolder = null;
+  }
+
+  @Override
+  public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair) {
+    checkReferences(attributeNameValuePair, ProblemKind.ERROR);
+  }
+
+  @Override
+  public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
+    checkReferences(includeDirective, ProblemKind.ERROR);
+  }
+
+  @Override
+  public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
+    checkReferences(node, ProblemKind.ERROR);
+  }
+
+  static enum ProblemKind {
+    ERROR,
+    WARNING,
+    INFO
+  }
+
+  private void checkReferences(final PsiElement includeDirective, ProblemKind kind) {
+    for (PsiReference ref : includeDirective.getReferences()) {
+      if (!ref.isSoft() && hasBadResolve(ref)) {
+        final TextRange elementRange = ref.getElement().getTextRange();
+        final TextRange textRange = ref.getRangeInElement();
+
+        final TextRange range =
+          new TextRange(elementRange.getStartOffset() + textRange.getStartOffset(), elementRange.getStartOffset() + textRange
+            .getEndOffset());
+        final String message =
+          MessageFormat.format(((EmptyResolveMessageProvider)ref).getUnresolvedMessagePattern(), ref.getCanonicalText());
+        Annotation annotation =
+          kind == ProblemKind.ERROR ? myHolder.createErrorAnnotation(range, message) : kind == ProblemKind.WARNING ? myHolder
+            .createWarningAnnotation(range, message) : myHolder.createInfoAnnotation(range, message);
+
+        if (ref instanceof LocalQuickFixProvider) {
+          for (LocalQuickFix fix : ((LocalQuickFixProvider)ref).getQuickFixes()) {
+            if (fix instanceof IntentionAction) {
+              annotation.registerFix((IntentionAction)fix, new TextRange(annotation.getStartOffset(), annotation.getEndOffset()));
+            }
+          }
+        }
+      }
+    }
+  }
+
+  private boolean hasBadResolve(final PsiReference ref) {
+    if (ref instanceof PsiPolyVariantReference) {
+      return ((PsiPolyVariantReference)ref).multiResolve(false).length == 0;
+    }
+    return ref.resolve() == null;
+  }
+
+  @Override
+  public void visitJSCallExpression(final JSCallExpression node) {
+    final JSExpression methodExpression = node.getMethodExpression();
+
+    if (methodExpression instanceof JSLiteralExpression) {
+      myHolder.createErrorAnnotation(methodExpression, JavaScriptBundle.message("javascript.parser.message.expected.function.name"));
+    }
+  }
+
+  @Override
+  public void visitJSDocTagValue(final JSDocTagValue tagValue) {
+    checkReferences(tagValue, ProblemKind.WARNING);
+  }
+
+  @Override
+  public void visitJSDocTag(final JSDocTag tagValue) {
+    checkReferences(tagValue, ProblemKind.WARNING);
+  }
+
+  @Override
+  public void visitJSReferenceList(final JSReferenceList referenceList) {
+    final JSClass jsClass = (JSClass)referenceList.getParent();
+    if (JSResolveUtil.isArtificialClassUsedForReferenceList(jsClass)) {
+      return; // implements="MyInterface" in mxml has artificial class created
+    }
+
+    final boolean withinExtends = jsClass.getExtendsList() == referenceList;
+    final boolean withinImplements = jsClass.getImplementsList() == referenceList;
+
+    if (withinImplements && jsClass.isInterface()) {
+      myHolder.createErrorAnnotation(referenceList,
+                                     JavaScriptBundle.message("javascript.validation.message.implements.for.interface.not.allowed"));
+      return;
+    }
+
+    final Map<String, JSReferenceExpression> nameToExprMap = new HashMap<String, JSReferenceExpression>();
+
+    final JSReferenceExpression[] referenceExpressions = referenceList.getExpressions();
+    if (referenceExpressions != null) {
+      for (JSReferenceExpression expr : referenceExpressions) {
+        final String s = expr.getReferencedName();
+        if (s != null) {
+          nameToExprMap.put(s, expr);
+        }
+      }
+    }
+
+    for (JSClass clazz : referenceList.getReferencedClasses()) {
+      final boolean b = clazz.isInterface();
+      final JSReferenceExpression expr = nameToExprMap.get(clazz.getName());
+
+      if (!b && withinImplements) {
+        myHolder.createErrorAnnotation(expr, JavaScriptBundle.message("javascript.validation.message.interface.name.expected.here"));
+      }
+      else if (withinExtends && b != jsClass.isInterface()) {
+        myHolder.createErrorAnnotation(expr,
+                                       JavaScriptBundle.message(!b ? "javascript.validation.message.interface.name.expected.here" : "javascript.validation" +
+                                         ".message.class.name.expected.here"));
+      }
+      if (clazz == jsClass) {
+        myHolder.createErrorAnnotation(expr, JavaScriptBundle.message("javascript.validation.message.circular.dependency"))
+                .registerFix(new RemoveASTNodeFix
+                               (referenceList.getNode(), "javascript.fix.remove.circular.dependency"));
+      }
+    }
+
+    if (withinImplements) {
+      checkImplementedMethods(jsClass, new SimpleErrorReportingClient());
+    }
+  }
+
+  public interface ErrorReportingClient {
+    enum ProblemKind {
+      ERROR,
+      WARNING
+    }
+
+    void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
+
+    void reportError(final PsiElement nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
+  }
+
+  public static void checkImplementedMethods(final JSClass jsClass, final ErrorReportingClient reportingClient) {
+    final JSResolveUtil.CollectMethodsToImplementProcessor implementedMethodProcessor = new ImplementedMethodProcessor(jsClass) {
+      ImplementMethodsFix implementMethodsFix = null;
+
+      @Override
+      protected void addNonimplementedFunction(final JSFunction function) {
+        final PsiElement node = myJsClass.getNameIdentifier();
+        if (node == null) {
+          return;
+        }
+        if (implementMethodsFix == null) {
+          implementMethodsFix = new ImplementMethodsFix(myJsClass);
+        }
+        implementMethodsFix.addElementToProcess(function);
+        reportingClient.reportError(node,
+                                    JavaScriptBundle.message("javascript.validation.message.interface.method.not.implemented",
+                                                             function.getName(),
+                                                             ((JSClass)JSResolveUtil.findParent(function)).getQualifiedName()),
+                                    ErrorReportingClient.ProblemKind.ERROR,
+                                    implementMethodsFix);
+      }
+
+      @Override
+      protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction) {
+        final JSAttributeList attributeList = implementationFunction.getAttributeList();
+        if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
+          final ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
+          reportingClient.reportError(node,
+                                      JavaScriptBundle.message("javascript.validation.message.interface.method.invalid.access.modifier"),
+                                      ErrorReportingClient.ProblemKind.ERROR,
+                                      null
+                                      // TODO: quickfix
+          );
+        }
+
+        final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(implementationFunction, interfaceFunction);
+
+        if (incompatibleSignature != SignatureMatchResult.COMPATIBLE_SIGNATURE) {
+          PsiElement parent = JSResolveUtil.findParent(implementationFunction);
+          if (parent instanceof JSFile) {
+            parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+          }
+
+          if (parent != myJsClass) {
+            // some parent incorrectly implements method from our interface
+            addNonimplementedFunction(interfaceFunction);
+            return;
+          }
+
+          if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
+            final JSParameterList parameterList = implementationFunction.getParameterList();
+            final JSParameterList expectedParameterList = interfaceFunction.getParameterList();
+            reportingClient.reportError(parameterList.getNode(),
+                                        JavaScriptBundle.message("javascript.validation.message.interface.method.invalid.signature",
+                                                                 expectedParameterList != null ? expectedParameterList.getText() : "()"),
+                                        ErrorReportingClient.ProblemKind.ERROR,
+                                        null);  // TODO: quickfix
+          }
+          else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
+            PsiElement implementationReturnTypeExpr = implementationFunction.getReturnTypeElement();
+            PsiElement interfaceReturnTypeExpr = interfaceFunction.getReturnTypeElement();
+            reportingClient.reportError(implementationReturnTypeExpr != null ? implementationReturnTypeExpr : implementationFunction
+                                          .getNameIdentifier(),
+                                        JavaScriptBundle.message("javascript.validation.message.interface.method.invalid.signature2",
+                                                                 interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"),
+                                        ErrorReportingClient.ProblemKind.ERROR,
+                                        null);  // TODO: quickfix
+          }
+        }
+      }
+    };
+    JSResolveUtil.processInterfaceMethods(jsClass, implementedMethodProcessor);
+  }
+
+  private static ASTNode findElementForAccessModifierError(final @Nonnull JSFunction o, final JSAttributeList attributeList) {
+    if (attributeList != null) {
+      final PsiElement accessTypeElement = attributeList.findAccessTypeElement();
+      if (accessTypeElement != null) {
+        return accessTypeElement.getNode();
+      }
+    }
+    PsiElement nameIdentifier = o.getNameIdentifier();
+    return nameIdentifier == null ? null : nameIdentifier.getNode();
+  }
+
+  @Override
+  public void visitJSAttributeList(JSAttributeList attributeList) {
+    PsiElement parentForCheckingNsOrAccessModifier = null;
+
+    PsiElement namespaceElement = attributeList.getNamespaceElement();
+    PsiElement accessTypeElement = attributeList.findAccessTypeElement();
+    PsiElement namespaceOrAccessModifierElement = namespaceElement;
+
+    if (namespaceOrAccessModifierElement == null) {
+      namespaceOrAccessModifierElement = accessTypeElement;
+    }
+    else if (accessTypeElement != null) {
+      myHolder.createErrorAnnotation(namespaceOrAccessModifierElement,
+                                     JavaScriptBundle.message("javascript.validation.message.use.namespace.reference.or" +
+                                                                ".access.modifier"))
+              .registerFix(new RemoveASTNodeFix(namespaceOrAccessModifierElement.getNode(), "javascript.fix.remove.namespace.reference"));
+
+      myHolder.createErrorAnnotation(accessTypeElement,
+                                     JavaScriptBundle.message("javascript.validation.message.use.namespace.reference.or.access.modifier"))
+              .registerFix(new RemoveASTNodeFix(accessTypeElement.getNode(), "javascript.fix.remove.namespace.reference"));
+    }
+
+    if (namespaceOrAccessModifierElement != null) {
+      parentForCheckingNsOrAccessModifier = JSResolveUtil.findParent(attributeList.getParent());
+      if (!(parentForCheckingNsOrAccessModifier instanceof JSClass)) {
+        String typeElementText;
+        boolean nodeUnderPackage;
+
+        if (((!(nodeUnderPackage =
+          (parentForCheckingNsOrAccessModifier instanceof JSPackageStatement)) && (!(parentForCheckingNsOrAccessModifier
+          instanceof JSFile) || attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL)) || (!"public".equals(
+          typeElementText =
+            namespaceOrAccessModifierElement.getText())) && !"internal".equals(typeElementText))) {
+          boolean nsRef = namespaceOrAccessModifierElement instanceof JSReferenceExpression;
+          myHolder.createErrorAnnotation(namespaceOrAccessModifierElement,
+                                         JavaScriptBundle.message(nodeUnderPackage ? "javascript.validation.message.access" +
+                                           ".modifier.allowed.only.for.package.members" : nsRef ? "javascript.validation.message.namespace.allowed.only.for.class.members" : "javascript" +
+                                           ".validation.message.access.modifier.allowed.only.for.class.members"))
+                  .registerFix(new RemoveASTNodeFix(namespaceOrAccessModifierElement
+                                                      .getNode(),
+                                                    nsRef ? "javascript.fix.remove.namespace.reference" : "javascript.fix.remove.access.modifier"));
+        }
+      }
+      else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
+
+        if (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL || attributeList.getNode()
+                                                                                                      .findChildByType(JSTokenTypes
+                                                                                                                         .INTERNAL_KEYWORD) != null
+
+        ) {
+          final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.ACCESS_MODIFIERS);
+          final Annotation annotation =
+            myHolder.createErrorAnnotation(astNode, JavaScriptBundle.message("javascript.validation.message.interface.members.cannot" +
+                                                                               ".have.access.modifiers"));
+
+          annotation.registerFix(new RemoveASTNodeFix(astNode, "javascript.fix.remove.access.modifier"));
+        }
+      }
+    }
+  }
+
+  @Override
+  public void visitJSReferenceExpression(final JSReferenceExpression node) {
+    final PsiElement parent = node.getParent();
+
+    if (parent instanceof JSNamedElement) {
+      JSNamedElement namedElement = (JSNamedElement)parent;
+      final PsiElement nameIdentifier = namedElement.getNameIdentifier();
+
+      if (nameIdentifier != null && nameIdentifier == node) {
+        if (parent instanceof JSPackageStatement) {
+          checkPackageStatement((JSPackageStatement)parent);
+        }
+        else if (!(parent instanceof JSImportStatement) && parent.getParent() instanceof JSPackageStatement) {
+          checkNamedObjectIsInCorrespondingFile(namedElement);
+        }
+        else if (parent instanceof JSFunction) {
+          JSFunction function = (JSFunction)parent;
+
+          if (function.isConstructor()) {
+            final JSClass clazz;
+            if (parent.getParent() instanceof JSClass) {
+              clazz = (JSClass)parent.getParent();
+            }
+            else {
+              assert parent.getParent() instanceof JSFile;
+              clazz = JSResolveUtil.getXmlBackedClass((JSFile)parent.getParent());
+              assert clazz != null;
+            }
+
+            checkMissedSuperCall(node, function, clazz);
+          }
+          else if (function.isSetProperty()) {
+            String typeString = function.getReturnTypeString();
+
+            if (typeString != null && !"void".equals(typeString)) {
+              // TODO: fix!
+              myHolder.createErrorAnnotation(function.getReturnTypeElement(),
+                                             JavaScriptBundle.message("javascript.validation.message.set.method.should.be.void.or" +
+                                                                        ".without.type"));
+            }
+
+            JSParameterList parameterList = function.getParameterList();
+            if (parameterList != null && parameterList.getParameters().length != 1) {
+              // TODO: fix!
+              myHolder.createErrorAnnotation(parameterList,
+                                             JavaScriptBundle.message("javascript.validation.message.set.method.should.have.one.parameter"));
+            }
+          }
+          else if (function.isGetProperty()) {
+            String typeString = function.getReturnTypeString();
+
+            if (typeString == null || "void".equals(typeString)) {
+              // TODO: fix!
+              myHolder.createErrorAnnotation(typeString != null ? function.getReturnTypeElement() : nameIdentifier,
+                                             JavaScriptBundle.message("javascript.validation.message.get.method.should.be.valid.type",
+                                                                      typeString != null ? typeString : "empty"));
+            }
+
+            JSParameterList parameterList = function.getParameterList();
+            if (parameterList != null && parameterList.getParameters().length != 0) {
+              // TODO: fix!
+              myHolder.createErrorAnnotation(parameterList,
+                                             JavaScriptBundle.message("javascript.validation.message.get.method.should.have.no.parameter"));
+            }
+          }
+        }
+
+        if (parent instanceof JSClass) {
+          final JSClass jsClass = (JSClass)parent;
+          final JSFunction constructor = jsClass.findFunctionByName(jsClass.getName());
+          if (constructor == null) {
+            checkMissedSuperCall(node, constructor, jsClass);
+          }
+
+          PsiElement clazzParent = jsClass.getParent();
+          if (!(clazzParent instanceof JSPackageStatement) && !(clazzParent instanceof JSFile)) {
+            myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.nested.classes.are.not.allowed"));
+          }
+        }
+      }
+    }
+
+    if (node.getQualifier() == null) {
+      if (!(parent instanceof JSCallExpression)) {
+        if ("arguments".equals(node.getText())) {
+          JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
+          if (fun == null) {
+            myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.arguments.out.of.function"));
+          }
+          else {
+            JSParameterList parameterList = fun.getParameterList();
+            if (parameterList != null) {
+              for (JSParameter p : parameterList.getParameters()) {
+                if (p.isRest()) {
+                  myHolder.createErrorAnnotation(node,
+                                                 JavaScriptBundle.message("javascript.validation.message.arguments.with.rest.parameter"));
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  private void checkMissedSuperCall(JSReferenceExpression node, JSFunction constructor, JSClass jsClass) {
+    if (jsClass.isInterface()) {
+      return;
+    }
+    JSFunction nontrivialSuperClassConstructor = getNontrivialSuperClassConstructor(jsClass);
+
+    if (nontrivialSuperClassConstructor != null) {
+      Annotation annotation = null;
+
+      if (!hasSuperConstructorCall(constructor)) {
+        annotation =
+          myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.missed.super.constructor.call"));
+      }
+
+      if (annotation != null) {
+        if (constructor == null) {
+          annotation.registerFix(new AddConstructorAndSuperInvokationFix(node, nontrivialSuperClassConstructor));
+        }
+        else {
+          annotation.registerFix(new AddSuperInvokationFix(node, nontrivialSuperClassConstructor));
+        }
+      }
+    }
+  }
+
+  private boolean hasSuperConstructorCall(JSFunction jsFunction) {
+    if (jsFunction == null) {
+      return false;
+    }
+    final JSSourceElement[] body = (jsFunction).getBody();
+    final JSStatement[] statements = body.length > 0 ? ((JSBlockStatement)body[0]).getStatements() : JSStatement.EMPTY;
+    JSExpression expr;
+
+    for (JSStatement st : statements) {
+      if (st instanceof JSExpressionStatement &&
+        (expr = ((JSExpressionStatement)st).getExpression()) instanceof JSCallExpression &&
+        (((JSCallExpression)expr).getMethodExpression()) instanceof JSSuperExpression) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  public static JSFunction getNontrivialSuperClassConstructor(JSClass clazz) {
+    final JSClass[] classes = clazz.getSuperClasses();
+
+    if (classes.length > 0) {
+      final JSFunction constructor = classes[0].findFunctionByName(classes[0].getName());
+
+      if (constructor != null) {
+        final JSParameter[] jsParameters = constructor.getParameterList().getParameters();
+        boolean hasRequiredParameters = false;
+        for (JSParameter p : jsParameters) {
+          if (!p.isRest() && !p.hasInitializer()) {
+            hasRequiredParameters = true;
+            break;
+          }
+        }
+        return hasRequiredParameters ? constructor : null;
+      }
+    }
+
+    return null;
+  }
+
+  @Override
+  public void visitJSParameterList(JSParameterList node) {
+    boolean foundRest = false;
+    boolean initializerPresent = false;
+
+    for (JSParameter parameter : node.getParameters()) {
+      JSExpression initializer = parameter.getInitializer();
+      boolean hasInitializer = initializer != null;
+
+      if (hasInitializer && !initializerPresent) {
+        initializerPresent = true;
+      }
+      else if (!hasInitializer && initializerPresent && !parameter.isRest()) {
+        myHolder.createErrorAnnotation(parameter, JavaScriptBundle.message("javascript.validation.message.parameter.should.be.initialized"))
+                .registerFix(new
+                               RemoveASTNodeFix(parameter.getNode(), "javascript.fix.remove.parameter"));
+      }
+      else if (hasInitializer && parameter.isRest()) {
+        myHolder.createErrorAnnotation(parameter,
+                                       JavaScriptBundle.message("javascript.validation.message.rest.parameter.should.not.be.initialized"))
+                .registerFix(new RemoveASTNodeFix("javascript.fix.remove.initializer", getNodesBefore(initializer, JSTokenTypes.EQ)));
+      }
+
+      if (parameter.isRest() && !foundRest) {
+        foundRest = true;
+        PsiElement typeElement = parameter.getTypeElement();
+        if (typeElement != null && !"Array".equals(typeElement.getText())) {
+          myHolder.createErrorAnnotation(typeElement,
+                                         JavaScriptBundle.message("javascript.validation.message.unexpected.type.for.rest.parameter"))
+                  .registerFix
+                    (new RemoveASTNodeFix("javascript.fix.remove.type.reference", getNodesBefore(typeElement, JSTokenTypes.COLON)));
+        }
+      }
+      else if (foundRest) {
+        myHolder.createErrorAnnotation(parameter,
+                                       JavaScriptBundle.message(
+                                         "javascript.validation.message.parameter.is.not.allowed.after.rest.parameter"))
+                .registerFix(new RemoveASTNodeFix(parameter.getNode(), "javascript.fix.remove.parameter"));
+      }
+    }
+  }
+
+  private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq) {
+    List<ASTNode> nodes = new ArrayList<ASTNode>();
+    PsiElement element = initializer.getPrevSibling();
+    PsiElement lastElement = element;
+
+    if (element instanceof PsiWhiteSpace) {
+      nodes.add(element.getNode());
+      lastElement = element.getPrevSibling();
+    }
+
+    if (lastElement != null && lastElement.getNode().getElementType() == eq) {
+      nodes.add(lastElement.getNode());
+    }
+
+    nodes.add(initializer.getNode());
+    return nodes.toArray(new ASTNode[nodes.size()]);
+  }
+
+  @Override
+  public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
+    for (PsiElement el = packageStatement.getPrevSibling(); el != null; el = el.getPrevSibling()) {
+      if (!(el instanceof PsiWhiteSpace) && !(el instanceof PsiComment)) {
+        myHolder.createErrorAnnotation(packageStatement.getFirstChild().getNode(),
+                                       JavaScriptBundle.message("javascript.validation.message.package.shouldbe" +
+                                                                  ".first.statement"));
+        break;
+      }
+    }
+    final PsiElement node = packageStatement.getNameIdentifier();
+    if (node == null) {
+      checkPackageStatement(packageStatement);
+    }
+  }
+
+  @Override
+  public void visitJSAssignmentExpression(final JSAssignmentExpression expression) {
+    JSExpression lExpr = expression.getLOperand();
+    if (lExpr == null) {
+      return;
+    }
+    if (lExpr instanceof JSDefinitionExpression) {
+      lExpr = ((JSDefinitionExpression)lExpr).getExpression();
+    }
+
+    if (lExpr instanceof JSReferenceExpression) {
+      PsiElement resolved = ((JSReferenceExpression)lExpr).resolve();
+      if (resolved instanceof JSVariable && ((JSVariable)resolved).isConst()) {
+        myHolder.createErrorAnnotation(lExpr, JavaScriptBundle.message("javascript.validation.message.assignment.to.const"));
+      }
+    }
+
+    if (!JSUtils.isLHSExpression(lExpr)) {
+      myHolder.createErrorAnnotation(lExpr, JavaScriptBundle.message("javascript.validation.message.must.be.lvalue"));
+    }
+  }
+
+  @Override
+  public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
+    final PsiElement lastChild = node.getLastChild();
+    PsiElement child = lastChild != null ? lastChild.getPrevSibling() : null;
+    if (child instanceof PsiWhiteSpace) {
+      child = child.getPrevSibling();
+    }
+    ASTNode childNode;
+
+    if (child != null && (childNode = child.getNode()) != null && childNode.getElementType() == JSTokenTypes.COMMA) {
+      final Annotation annotation =
+        myHolder.createWarningAnnotation(child, JavaScriptBundle.message("javascript.validation.message.unneeded.comma"));
+      annotation.registerFix(new RemoveASTNodeFix(childNode, "javascript.validation.message.remove.unneeded.comma.fix"));
+    }
+  }
+
+  @Override
+  public void visitJSTryStatement(final JSTryStatement node) {
+    final JSCatchBlock[] blocks = node.getAllCatchBlocks();
+
+    if (blocks.length > 1) {
+      final Set<String> typeToCatch = new HashSet<String>();
+
+      for (JSCatchBlock block : blocks) {
+        final JSParameter p = block.getParameter();
+        if (p == null) {
+          continue;
+        }
+
+        String s = p.getTypeString();
+        if (s == null) {
+          s = "";
+        }
+
+        if (typeToCatch.contains(s)) {
+          final Annotation annotation =
+            myHolder.createErrorAnnotation(block, JavaScriptBundle.message("javascript.validation.message.duplicated.catch.block"));
+          annotation.registerFix(new RemoveASTNodeFix(block.getNode(), "javascript.validation.message.duplicated.catch.block.fix"));
+        }
+        else {
+          typeToCatch.add(s);
+        }
+      }
+    }
+  }
+
+  @Override
+  public void visitJSVariable(final JSVariable var) {
+    if (var.isConst() && var.getInitializer() == null) {
+      if (var.getParent() instanceof JSVarStatement && var.getParent().getParent() instanceof JSForInStatement) {
+        return;
+      }
+
+      JSAttributeList attributeList = var.getAttributeList();
+      if (attributeList == null || attributeList.getAttributesByName("Embed").length == 0) {
+        myHolder.createWarningAnnotation(var,
+                                         JavaScriptBundle.message("javascript.validation.message.const.variable.without.initializer."));
+      }
+    }
+
+    if (var.getParent().getParent() instanceof JSPackageStatement) {
+      checkNamedObjectIsInCorrespondingFile(var);
+    }
+  }
+
+  @Override
+  public void visitJSContinueStatement(final JSContinueStatement node) {
+    if (node.getStatementToContinue() == null) {
+      myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.continue.without.target"));
+    }
+  }
+
+  @Override
+  public void visitJSBreakStatement(final JSBreakStatement node) {
+    if (node.getStatementToBreak() == null) {
+      myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.break.without.target"));
+    }
+  }
+
+  @Override
+  public void visitJSThisExpression(final JSThisExpression node) {
+    checkClassReferenceInStaticContext(node, "javascript.validation.message.this.referenced.from.static.context");
+  }
+
+  private void checkClassReferenceInStaticContext(final JSExpression node,
+                                                  @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String key) {
+    PsiElement element = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSFile.class, JSClass.class, JSObjectLiteralExpression.class,
+                                                     XmlTagChild.class);
+
+    if (element instanceof JSFunction) {
+      final JSFunction function = (JSFunction)element;
+
+      final JSAttributeList attributeList = function.getAttributeList();
+      if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
+        myHolder.createErrorAnnotation(node, JavaScriptBundle.message(key));
+        return;
+      }
+    }
+
+    PsiElement elementParent;
+    if (node instanceof JSSuperExpression && (element == null || (!((elementParent =
+      element.getParent()) instanceof JSClass) && (!(elementParent
+      instanceof JSFile) || elementParent.getContext() == null)))) {
+      myHolder.createErrorAnnotation(node,
+                                     JavaScriptBundle.message(
+                                       "javascript.validation.message.super.referenced.without.class.instance.context"));
+    }
+  }
+
+  @Override
+  public void visitJSSuperExpression(final JSSuperExpression node) {
+    checkClassReferenceInStaticContext(node, "javascript.validation.message.super.referenced.from.static.context");
+  }
+
+  @Override
+  public void visitJSFunctionDeclaration(final JSFunction node) {
+    final PsiElement nameIdentifier = node.getNameIdentifier();
+    if (nameIdentifier == null) {
+      return;
+    }
+    PsiElement parent = node.getParent();
+
+    if (parent instanceof JSFile) {
+      parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+
+      if (parent instanceof JSClass && node.getName().equals(((JSClass)parent).getName()) && JavaScriptSupportLoader.isFlexMxmFile(parent
+                                                                                                                                     .getContainingFile())) {
+        final Annotation annotation =
+          myHolder.createErrorAnnotation(nameIdentifier, JavaScriptBundle.message("javascript.validation.message.constructor.in.mxml" +
+                                                                                    ".is.not.allowed"));
+
+        annotation.registerFix(new RemoveASTNodeFix(node.getNode(), "javascript.fix.remove.constructor"));
+      }
+    }
+
+    if (parent instanceof JSPackageStatement) {
+      checkNamedObjectIsInCorrespondingFile(node);
+    }
+
+    if (parent instanceof JSClass && !node.isConstructor()) {
+      final JSAttributeList attributeList = node.getAttributeList();
+      final JSClass clazz = (JSClass)parent;
+
+      if (attributeList == null || (!attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) && (attributeList.getAccessType() != JSAttributeList
+        .AccessType.PRIVATE || attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)))) {
+        final String qName = clazz.getQualifiedName();
+        final boolean hasOverride = attributeList != null ? attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE) : false;
+
+        final Ref<JSFunction> set = new Ref<JSFunction>();
+        boolean b = JSResolveUtil.iterateType(node, parent, qName, new JSResolveUtil.OverrideHandler() {
+          @Override
+          public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className) {
+            if (qName == className || (qName != null && qName.equals(className))) {
+              return true;
+            }
+            set.set((JSFunction)processor.getResult());
+            if ("Object".equals(className)) {
+              if (hasOverride && !attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)) { /*native modifier is written always*/
+                final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
+                final Annotation annotation =
+                  myHolder.createErrorAnnotation(astNode, JavaScriptBundle.message("javascript.validation.message.function.override.for" +
+                                                                                     ".object.method"));
+
+                annotation.registerFix(new RemoveASTNodeFix(astNode, "javascript.fix.remove.override.modifier"));
+              }
+              return false;
+            }
+            else if (!hasOverride) {
+              final Annotation annotation =
+                myHolder.createErrorAnnotation(nameIdentifier, JavaScriptBundle.message("javascript.validation.message.function" +
+                                                                                          ".override.without.override.modifier",
+                                                                                        className));
+
+              annotation.registerFix(new AddOverrideIntentionAction(node));
+            }
+            return false;
+          }
+        });
+
+        if (b && hasOverride) {
+          final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
+          final Annotation annotation =
+            myHolder.createErrorAnnotation(astNode, JavaScriptBundle.message("javascript.validation.message.function.override.without" +
+                                                                               ".parent.method"));
+
+          annotation.registerFix(new RemoveASTNodeFix(astNode, "javascript.fix.remove.override.modifier"));
+        }
+
+        if (!b && hasOverride) {
+          final JSFunction override = set.get();
+          final JSAttributeList overrideAttrList = override.getAttributeList();
+          String overrideNs = null;
+
+          if ((overrideAttrList == null && (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL)) ||
+            (overrideAttrList != null && attributeList.getAccessType() != overrideAttrList.getAccessType()) ||
+            overrideAttrList != null && (overrideNs =
+              overrideAttrList.getNamespace()) != null && !overrideNs.equals(attributeList.getNamespace())) {
+            final Annotation annotation1 = myHolder.createErrorAnnotation(findElementForAccessModifierError(node, attributeList),
+                                                                          JavaScriptBundle.message(
+                                                                            "javascript.validation.message.function.override.incompatible.access.modifier",
+                                                                            overrideNs != null ? overrideNs : (overrideAttrList != null ? overrideAttrList
+                                                                              .getAccessType()
+                                                                              .toString() : JSAttributeList.AccessType
+                                                                              .PACKAGE_LOCAL.toString()).toLowerCase()));
+
+            // TODO: quickfix
+            //annotation.registerFix(
+            //    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
+            //);
+          }
+
+          final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(node, override);
+
+          if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
+            final JSParameterList nodeParameterList = node.getParameterList();
+            final JSParameterList overrideParameterList = override.getParameterList();
+
+            final Annotation annotation =
+              myHolder.createErrorAnnotation(nodeParameterList != null ? nodeParameterList : node.getNameIdentifier(),
+                                             JavaScriptBundle.message(
+                                               "javascript.validation.message.function.override.incompatible.signature",
+                                               overrideParameterList != null ? overrideParameterList.getText() : "()"));
+
+            // TODO: quickfix
+            //annotation.registerFix(
+            //    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
+            //);
+          }
+          else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
+            PsiElement returnTypeExpr = node.getReturnTypeElement();
+            PsiElement overrideReturnTypeExpr = override.getReturnTypeElement();
+            final Annotation annotation = myHolder.createErrorAnnotation(returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier(),
+                                                                         JavaScriptBundle.message(
+                                                                           "javascript.validation.message.function.override.incompatible.signature2",
+                                                                           overrideReturnTypeExpr != null ? overrideReturnTypeExpr.getText() : "*"));
+
+            // TODO: quickfix
+            //annotation.registerFix(
+            //    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
+            //);
+          }
+        }
+      }
+    }
+  }
+
+  enum SignatureMatchResult {
+    PARAMETERS_DIFFERS,
+    RETURN_TYPE_DIFFERS,
+    COMPATIBLE_SIGNATURE
+  }
+
+  private static SignatureMatchResult checkCompatibleSignature(final JSFunction fun, final JSFunction override) {
+    JSParameterList nodeParameterList = fun.getParameterList();
+    JSParameterList overrideParameterList = override.getParameterList();
+    final JSParameter[] parameters = nodeParameterList != null ? nodeParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
+    final JSParameter[] overrideParameters =
+      overrideParameterList != null ? overrideParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
+
+    SignatureMatchResult result =
+      parameters.length != overrideParameters.length ? SignatureMatchResult.PARAMETERS_DIFFERS : SignatureMatchResult
+        .COMPATIBLE_SIGNATURE;
+
+    if (result == SignatureMatchResult.COMPATIBLE_SIGNATURE) {
+      for (int i = 0; i < parameters.length; ++i) {
+        if (!compatibleType(overrideParameters[i].getTypeString(), parameters[i].getTypeString(), overrideParameterList,
+                            nodeParameterList) || overrideParameters[i].hasInitializer() != parameters[i].hasInitializer()) {
+          result = SignatureMatchResult.PARAMETERS_DIFFERS;
+          break;
+        }
+      }
+    }
+
+    if (result == SignatureMatchResult.COMPATIBLE_SIGNATURE) {
+      if (!compatibleType(override.getReturnTypeString(), fun.getReturnTypeString(), override, fun)) {
+        result = SignatureMatchResult.RETURN_TYPE_DIFFERS;
+      }
+    }
+    return result;
+  }
+
+  private static boolean compatibleType(String overrideParameterType,
+                                        String parameterType,
+                                        PsiElement overrideContext,
+                                        PsiElement funContext) {
+    // TODO: This should be more accurate
+    if (overrideParameterType != null && !overrideParameterType.equals(parameterType)) {
+      parameterType = JSImportHandlingUtil.resolveTypeName(parameterType, funContext);
+      overrideParameterType = JSImportHandlingUtil.resolveTypeName(overrideParameterType, overrideContext);
+
+      return overrideParameterType.equals(parameterType);
+    }
+    else if (overrideParameterType == null && parameterType != null && !"*".equals(parameterType)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public void visitJSReturnStatement(final JSReturnStatement node) {
+    final PsiElement element = PsiTreeUtil.getParentOfType(node,
+                                                           JSFunction.class,
+                                                           XmlTagChild.class,
+                                                           XmlAttributeValue.class,
+                                                           JSFile.class,
+                                                           JavaScriptLambdaExpression.class);
+    if ((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost)) || (element instanceof XmlTagChild && !(element
+      .getParent() instanceof XmlAttributeValue))) {
+      myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.return.outside.function.definition"));
+    }
+
+    if (element instanceof JSFunction) {
+      final @NonNls String typeString = ((JSFunction)element).getReturnTypeString();
+      if (typeString != null && !"void".equals(typeString) && node.getExpression() == null) {
+        myHolder.createErrorAnnotation(node,
+                                       JavaScriptBundle.message("javascript.validation.message.return.value.of.type.is.required",
+                                                                typeString));
+      }
+    }
+  }
+
+  @Override
+  public void visitJSLabeledStatement(final JSLabeledStatement node) {
+    final String label = node.getLabel();
+    if (label != null) {
+      PsiElement run = node.getParent();
+      while (run != null) {
+        if (run instanceof JSLabeledStatement) {
+          if (label.equals(((JSLabeledStatement)run).getLabel())) {
+            myHolder.createErrorAnnotation(node.getLabelIdentifier(),
+                                           JavaScriptBundle.message("javascript.validation.message.duplicate.label"));
+            break;
+          }
+        }
+
+        if (run instanceof JSFunction) {
+          break;
+        }
+        run = run.getParent();
+      }
+    }
+  }
+
+  private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass) {
+    final PsiFile containingFile = aClass.getContainingFile();
+
+    if (containingFile.getContext() != null) {
+      return;
+    }
+    final VirtualFile file = containingFile.getVirtualFile();
+
+    if (file != null && !file.getNameWithoutExtension().equals(aClass.getName())) {
+      final PsiElement node = aClass.getNameIdentifier();
+
+      if (node != null) {
+        final String name = aClass.getName();
+        String nameWithExtension = name + "." + file.getExtension();
+        final String message =
+          JavaScriptBundle.message(aClass instanceof JSClass ? "javascript.validation.message.class.should.be.in.file" : aClass instanceof
+            JSNamespaceDeclaration ? "javascript.validation.message.namespace.should.be.in.file" : aClass instanceof JSVariable ? "javascript.validation" +
+            ".message.variable.should.be.in.file" : "javascript.validation.message.function.should.be.in.file", name, nameWithExtension);
+        final Annotation annotation = myHolder.createErrorAnnotation(node, message);
+
+        annotation.registerFix(new RenameFileFix(nameWithExtension));
+    /*annotation.registerFix(new RenamePublicClassFix(aClass) {
           final String text;
           final String familyName;
 
@@ -1116,434 +1012,347 @@ public String getFamilyName() {
             return familyName;
           }
         }); */
-			}
-		}
-
-		checkFileUnderSourceRoot(aClass, new SimpleErrorReportingClient());
-	}
-
-	private String getTerm(String message)
-	{
-		String term = message.substring(0, message.indexOf(' '));
-		return term;
-	}
-
-	public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorReportingClient client)
-	{
-		PsiElement nameIdentifier = aClass.getNameIdentifier();
-		if(nameIdentifier == null)
-		{
-			nameIdentifier = aClass.getFirstChild();
-		}
-
-		final PsiFile containingFile = aClass.getContainingFile();
-		final VirtualFile file = containingFile.getVirtualFile();
-		if(file == null)
-		{
-			return;
-		}
-		final VirtualFile rootForFile = ProjectRootManager.getInstance(containingFile.getProject()).getFileIndex().getSourceRootForFile(file);
-
-		if(rootForFile == null)
-		{
-			client.reportError(nameIdentifier.getNode(), JavaScriptBundle.message("javascript.validation.message.file.should.be.under.source.root"),
-					ErrorReportingClient.ProblemKind.WARNING, null);
-		}
-	}
-
-	private void checkPackageStatement(final JSPackageStatement packageStatement)
-	{
-		final String s = packageStatement.getQualifiedName();
-
-		final PsiFile containingFile = packageStatement.getContainingFile();
-		final String expected = JSResolveUtil.getExpectedPackageNameFromFile(containingFile.getVirtualFile(), containingFile.getProject(), true);
-
-		if(expected != null && ((s == null && expected.length() != 0) || (s != null && !expected.equals(s))))
-		{
-			final PsiElement nameIdentifier = packageStatement.getNameIdentifier();
-			final Annotation annotation = myHolder.createErrorAnnotation(nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild()
-					, JavaScriptBundle.message("javascript.validation.message.incorrect.package.name", s, expected));
-			annotation.registerFix(new IntentionAction()
-			{
-				@Override
-				@Nonnull
-				public String getText()
-				{
-					return JavaScriptBundle.message("javascript.fix.package.name", expected);
-				}
-
-				@Override
-				@Nonnull
-				public String getFamilyName()
-				{
-					return getText();
-				}
-
-				@Override
-				public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
-				{
-					return packageStatement.isValid();
-				}
-
-				@Override
-				public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
-				{
-					JSPackageStatementImpl.doChangeName(project, packageStatement, expected);
-				}
-
-				@Override
-				public boolean startInWriteAction()
-				{
-					return true;
-				}
-			});
-		}
-
-		final Set<JSNamedElement> elements = new HashSet<JSNamedElement>();
-
-		for(JSSourceElement statement : packageStatement.getStatements())
-		{
-			if(statement instanceof JSNamedElement && !(statement instanceof JSImportStatement))
-			{
-				elements.add((JSNamedElement) statement);
-			}
-		}
-
-		if(elements.size() > 1)
-		{
-			for(JSNamedElement el : elements)
-			{
-				final PsiElement nameIdentifier = el.getNameIdentifier();
-				myHolder.createErrorAnnotation(nameIdentifier != null ? nameIdentifier : el.getFirstChild(),
-						JavaScriptBundle.message("javascript.validation.message.more.than.one.externally.visible.symbol")).registerFix(new RemoveASTNodeFix(el.getNode(),
-						"javascript.fix.remove.externally.visible.symbol"));
-			}
-		}
-
-		checkFileUnderSourceRoot(packageStatement, new SimpleErrorReportingClient());
-	}
-
-	public static class RemoveASTNodeFix implements IntentionAction, LocalQuickFix
-	{
-		private final ASTNode[] myAstNodes;
-		private final String myPropKey;
-
-		public RemoveASTNodeFix(final ASTNode astNode, @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String propKey)
-		{
-			this(propKey, astNode);
-		}
-
-		public RemoveASTNodeFix(@PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String propKey, final ASTNode... astNodes)
-		{
-			myPropKey = propKey;
-			myAstNodes = astNodes;
-		}
-
-		@Override
-		@Nonnull
-		public String getText()
-		{
-			return JavaScriptBundle.message(myPropKey);
-		}
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return getText();
-		}
-
-		@Override
-		@Nonnull
-		public String getFamilyName()
-		{
-			return getText();
-		}
-
-		@Override
-		public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor)
-		{
-			invoke(project, null, descriptor.getPsiElement().getContainingFile());
-		}
-
-		@Override
-		public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
-		{
-			for(ASTNode astNode : myAstNodes)
-			{
-				if(!astNode.getPsi().isValid())
-				{
-					return false;
-				}
-			}
-
-			return true;
-		}
-
-		@Override
-		public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
-		{
-			if(!FileModificationService.getInstance().prepareFileForWrite(file))
-			{
-				return;
-			}
-			for(ASTNode astNode : myAstNodes)
-			{
-				if(astNode.getPsi().isValid())
-				{
-					astNode.getPsi().delete();
-				}
-			}
-		}
-
-		@Override
-		public boolean startInWriteAction()
-		{
-			return true;
-		}
-	}
-
-	private static class AddOverrideIntentionAction implements IntentionAction
-	{
-		private final JSFunction myNode;
-
-		public AddOverrideIntentionAction(final JSFunction node)
-		{
-			myNode = node;
-		}
-
-		@Override
-		@Nonnull
-		public String getText()
-		{
-			return JavaScriptBundle.message("javascript.fix.add.override.modifier");
-		}
-
-		@Override
-		@Nonnull
-		public String getFamilyName()
-		{
-			return getText();
-		}
-
-		@Override
-		public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
-		{
-			return myNode.isValid();
-		}
-
-		@Override
-		public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
-		{
-			if(!FileModificationService.getInstance().prepareFileForWrite(file))
-			{
-				return;
-			}
-			final ASTNode fromText = JSChangeUtil.createJSTreeFromText(project, "override class A {}");
-			final JSAttributeList jsAttributeList = myNode.getAttributeList();
-			final JSAttributeList createdAttrList = ((JSClass) fromText.getPsi()).getAttributeList();
-
-			if(jsAttributeList != null)
-			{
-				jsAttributeList.add(createdAttrList.getFirstChild());
-			}
-			else
-			{
-				myNode.addBefore(createdAttrList, myNode.getFirstChild());
-			}
-		}
-
-		@Override
-		public boolean startInWriteAction()
-		{
-			return true;
-		}
-	}
-
-	private class SimpleErrorReportingClient implements ErrorReportingClient
-	{
-		@Override
-		public void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix)
-		{
-			final Annotation annotation = kind == ProblemKind.ERROR ? myHolder.createErrorAnnotation(nameIdentifier,
-					s) : myHolder.createWarningAnnotation(nameIdentifier, s);
-			if(implementMethodsFix != null)
-			{
-				annotation.registerFix(implementMethodsFix);
-			}
-		}
-
-		@Override
-		public void reportError(PsiElement nameIdentifier, String s, ProblemKind kind, IntentionAction implementMethodsFix)
-		{
-			final Annotation annotation = kind == ProblemKind.ERROR ? myHolder.createErrorAnnotation(nameIdentifier,
-					s) : myHolder.createWarningAnnotation(nameIdentifier, s);
-			if(implementMethodsFix != null)
-			{
-				annotation.registerFix(implementMethodsFix);
-			}
-		}
-	}
-
-	private static class AddSuperInvokationFix implements IntentionAction
-	{
-		private final JSReferenceExpression node;
-		private final JSFunction superConstructor;
-
-		public AddSuperInvokationFix(JSReferenceExpression node, JSFunction superConstructor)
-		{
-			this.node = node;
-			this.superConstructor = superConstructor;
-		}
-
-		@Override
-		@Nonnull
-		public String getText()
-		{
-			return JavaScriptBundle.message("javascript.fix.create.invoke.super");
-		}
-
-		@Override
-		@Nonnull
-		public String getFamilyName()
-		{
-			return getText();
-		}
-
-		@Override
-		public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file)
-		{
-			return superConstructor.isValid() && node.isValid();
-		}
-
-		@Override
-		public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException
-		{
-			if(!FileModificationService.getInstance().prepareFileForWrite(file))
-			{
-				return;
-			}
-			Template t = TemplateManager.getInstance(project).createTemplate("", "");
-			t.setToReformat(true);
-
-			t.addTextSegment("super(");
-			boolean first = true;
-			for(JSParameter p : superConstructor.getParameterList().getParameters())
-			{
-				if(p.isRest())
-				{
-					break;
-				}
-				if(!first)
-				{
-					t.addTextSegment(", ");
-				}
-				first = false;
-				MacroCallNode node = new MacroCallNode(new CompleteMacro());
-				t.addVariable(p.getName(), node, node, true);
-			}
-			t.addTextSegment(")");
-			String s = JSChangeUtil.getSemicolon(project);
-			if(s.length() > 0)
-			{
-				t.addTextSegment(s);
-			}
-
-			JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
-			JSSourceElement[] body = fun != null ? fun.getBody() : JSSourceElement.EMPTY_ARRAY;
-
-			if(body.length > 0 && body[0] instanceof JSBlockStatement)
-			{
-				PsiElement firstChild = body[0].getFirstChild();
-				editor.getCaretModel().moveToOffset(firstChild.getTextRange().getEndOffset());
-				TemplateManager.getInstance(project).startTemplate(editor, t);
-			}
-		}
-
-		@Override
-		public boolean startInWriteAction()
-		{
-			return false;
-		}
-	}
-
-	private static class AddConstructorAndSuperInvokationFix implements IntentionAction
-	{
-		private final JSReferenceExpression node;
-		private final JSFunction superConstructor;
-
-		AddConstructorAndSuperInvokationFix(JSReferenceExpression _node, JSFunction _superCall)
-		{
-			node = _node;
-			superConstructor = _superCall;
-		}
-
-		@Override
-		@Nonnull
-		public String getText()
-		{
-			return JavaScriptBundle.message("javascript.fix.create.constructor.invoke.super");
-		}
-
-		@Override
-		@Nonnull
-		public String getFamilyName()
-		{
-			return getText();
-		}
-
-		@Override
-		public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file)
-		{
-			return node.isValid() && superConstructor.isValid();
-		}
-
-		@Override
-		public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException
-		{
-			if(!FileModificationService.getInstance().prepareFileForWrite(file))
-			{
-				return;
-			}
-			final JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
-			if(jsClass == null)
-			{
-				return;
-			}
-			final JSAttributeList attributeList = jsClass.getAttributeList();
-			String fun = "";
-
-			if(attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC)
-			{
-				fun += "public ";
-			}
-
-			fun += "function ";
-
-			final JSParameterList parameterList = superConstructor.getParameterList();
-			fun += jsClass.getName() + parameterList.getText() + "{\n";
-			fun += "super(";
-			int i = 0;
-
-			for(JSParameter p : parameterList.getParameters())
-			{
-				if(i != 0)
-				{
-					fun += ",";
-				}
-				++i;
-				fun += p.getName();
-			}
-			fun += ")" + JSChangeUtil.getSemicolon(project);
-			fun += "\n}";
-
-			jsClass.add(JSChangeUtil.createJSTreeFromText(project, fun).getPsi());
-		}
-
-		@Override
-		public boolean startInWriteAction()
-		{
-			return true;
-		}
-	}
+      }
+    }
+
+    checkFileUnderSourceRoot(aClass, new SimpleErrorReportingClient());
+  }
+
+  private String getTerm(String message) {
+    String term = message.substring(0, message.indexOf(' '));
+    return term;
+  }
+
+  public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorReportingClient client) {
+    PsiElement nameIdentifier = aClass.getNameIdentifier();
+    if (nameIdentifier == null) {
+      nameIdentifier = aClass.getFirstChild();
+    }
+
+    final PsiFile containingFile = aClass.getContainingFile();
+    final VirtualFile file = containingFile.getVirtualFile();
+    if (file == null) {
+      return;
+    }
+    final VirtualFile rootForFile = ProjectRootManager.getInstance(containingFile.getProject()).getFileIndex().getSourceRootForFile(file);
+
+    if (rootForFile == null) {
+      client.reportError(nameIdentifier.getNode(),
+                         JavaScriptBundle.message("javascript.validation.message.file.should.be.under.source.root"),
+                         ErrorReportingClient.ProblemKind.WARNING,
+                         null);
+    }
+  }
+
+  private void checkPackageStatement(final JSPackageStatement packageStatement) {
+    final String s = packageStatement.getQualifiedName();
+
+    final PsiFile containingFile = packageStatement.getContainingFile();
+    final String expected =
+      JSResolveUtil.getExpectedPackageNameFromFile(containingFile.getVirtualFile(), containingFile.getProject(), true);
+
+    if (expected != null && ((s == null && expected.length() != 0) || (s != null && !expected.equals(s)))) {
+      final PsiElement nameIdentifier = packageStatement.getNameIdentifier();
+      final Annotation annotation =
+        myHolder.createErrorAnnotation(nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild()
+          , JavaScriptBundle.message("javascript.validation.message.incorrect.package.name", s, expected));
+      annotation.registerFix(new SyntheticIntentionAction() {
+        @Override
+        @Nonnull
+        public String getText() {
+          return JavaScriptBundle.message("javascript.fix.package.name", expected);
+        }
+
+        @Override
+        public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+          return packageStatement.isValid();
+        }
+
+        @Override
+        public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
+          JSPackageStatementImpl.doChangeName(project, packageStatement, expected);
+        }
+
+        @Override
+        public boolean startInWriteAction() {
+          return true;
+        }
+      });
+    }
+
+    final Set<JSNamedElement> elements = new HashSet<JSNamedElement>();
+
+    for (JSSourceElement statement : packageStatement.getStatements()) {
+      if (statement instanceof JSNamedElement && !(statement instanceof JSImportStatement)) {
+        elements.add((JSNamedElement)statement);
+      }
+    }
+
+    if (elements.size() > 1) {
+      for (JSNamedElement el : elements) {
+        final PsiElement nameIdentifier = el.getNameIdentifier();
+        myHolder.createErrorAnnotation(nameIdentifier != null ? nameIdentifier : el.getFirstChild(),
+                                       JavaScriptBundle.message("javascript.validation.message.more.than.one.externally.visible.symbol"))
+                .registerFix(new RemoveASTNodeFix(el.getNode(),
+                                                  "javascript.fix.remove.externally.visible.symbol"));
+      }
+    }
+
+    checkFileUnderSourceRoot(packageStatement, new SimpleErrorReportingClient());
+  }
+
+  public static class RemoveASTNodeFix implements IntentionAction, LocalQuickFix {
+    private final ASTNode[] myAstNodes;
+    private final String myPropKey;
+
+    public RemoveASTNodeFix(final ASTNode astNode, @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String propKey) {
+      this(propKey, astNode);
+    }
+
+    public RemoveASTNodeFix(@PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String propKey, final ASTNode... astNodes) {
+      myPropKey = propKey;
+      myAstNodes = astNodes;
+    }
+
+    @Override
+    @Nonnull
+    public String getText() {
+      return JavaScriptBundle.message(myPropKey);
+    }
+
+    @Override
+    @Nonnull
+    public String getName() {
+      return getText();
+    }
+
+    @Override
+    @Nonnull
+    public String getFamilyName() {
+      return getText();
+    }
+
+    @Override
+    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+      invoke(project, null, descriptor.getPsiElement().getContainingFile());
+    }
+
+    @Override
+    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+      for (ASTNode astNode : myAstNodes) {
+        if (!astNode.getPsi().isValid()) {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    @Override
+    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
+      if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+        return;
+      }
+      for (ASTNode astNode : myAstNodes) {
+        if (astNode.getPsi().isValid()) {
+          astNode.getPsi().delete();
+        }
+      }
+    }
+
+    @Override
+    public boolean startInWriteAction() {
+      return true;
+    }
+  }
+
+  private static class AddOverrideIntentionAction implements SyntheticIntentionAction {
+    private final JSFunction myNode;
+
+    public AddOverrideIntentionAction(final JSFunction node) {
+      myNode = node;
+    }
+
+    @Override
+    @Nonnull
+    public String getText() {
+      return JavaScriptBundle.message("javascript.fix.add.override.modifier");
+    }
+
+    @Override
+    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+      return myNode.isValid();
+    }
+
+    @Override
+    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
+      if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+        return;
+      }
+      final ASTNode fromText = JSChangeUtil.createJSTreeFromText(project, "override class A {}");
+      final JSAttributeList jsAttributeList = myNode.getAttributeList();
+      final JSAttributeList createdAttrList = ((JSClass)fromText.getPsi()).getAttributeList();
+
+      if (jsAttributeList != null) {
+        jsAttributeList.add(createdAttrList.getFirstChild());
+      }
+      else {
+        myNode.addBefore(createdAttrList, myNode.getFirstChild());
+      }
+    }
+
+    @Override
+    public boolean startInWriteAction() {
+      return true;
+    }
+  }
+
+  private class SimpleErrorReportingClient implements ErrorReportingClient {
+    @Override
+    public void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix) {
+      final Annotation annotation = kind == ProblemKind.ERROR ? myHolder.createErrorAnnotation(nameIdentifier,
+                                                                                               s) : myHolder.createWarningAnnotation(
+        nameIdentifier,
+        s);
+      if (implementMethodsFix != null) {
+        annotation.registerFix(implementMethodsFix);
+      }
+    }
+
+    @Override
+    public void reportError(PsiElement nameIdentifier, String s, ProblemKind kind, IntentionAction implementMethodsFix) {
+      final Annotation annotation = kind == ProblemKind.ERROR ? myHolder.createErrorAnnotation(nameIdentifier,
+                                                                                               s) : myHolder.createWarningAnnotation(
+        nameIdentifier,
+        s);
+      if (implementMethodsFix != null) {
+        annotation.registerFix(implementMethodsFix);
+      }
+    }
+  }
+
+  private static class AddSuperInvokationFix implements SyntheticIntentionAction {
+    private final JSReferenceExpression node;
+    private final JSFunction superConstructor;
+
+    public AddSuperInvokationFix(JSReferenceExpression node, JSFunction superConstructor) {
+      this.node = node;
+      this.superConstructor = superConstructor;
+    }
+
+    @Override
+    @Nonnull
+    public String getText() {
+      return JavaScriptBundle.message("javascript.fix.create.invoke.super");
+    }
+
+    @Override
+    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+      return superConstructor.isValid() && node.isValid();
+    }
+
+    @Override
+    public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+      if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+        return;
+      }
+      Template t = TemplateManager.getInstance(project).createTemplate("", "");
+      t.setToReformat(true);
+
+      t.addTextSegment("super(");
+      boolean first = true;
+      for (JSParameter p : superConstructor.getParameterList().getParameters()) {
+        if (p.isRest()) {
+          break;
+        }
+        if (!first) {
+          t.addTextSegment(", ");
+        }
+        first = false;
+        MacroCallNode node = new MacroCallNode(new CompleteMacro());
+        t.addVariable(p.getName(), node, node, true);
+      }
+      t.addTextSegment(")");
+      String s = JSChangeUtil.getSemicolon(project);
+      if (s.length() > 0) {
+        t.addTextSegment(s);
+      }
+
+      JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
+      JSSourceElement[] body = fun != null ? fun.getBody() : JSSourceElement.EMPTY_ARRAY;
+
+      if (body.length > 0 && body[0] instanceof JSBlockStatement) {
+        PsiElement firstChild = body[0].getFirstChild();
+        editor.getCaretModel().moveToOffset(firstChild.getTextRange().getEndOffset());
+        TemplateManager.getInstance(project).startTemplate(editor, t);
+      }
+    }
+
+    @Override
+    public boolean startInWriteAction() {
+      return false;
+    }
+  }
+
+  private static class AddConstructorAndSuperInvokationFix implements SyntheticIntentionAction {
+    private final JSReferenceExpression node;
+    private final JSFunction superConstructor;
+
+    AddConstructorAndSuperInvokationFix(JSReferenceExpression _node, JSFunction _superCall) {
+      node = _node;
+      superConstructor = _superCall;
+    }
+
+    @Override
+    @Nonnull
+    public String getText() {
+      return JavaScriptBundle.message("javascript.fix.create.constructor.invoke.super");
+    }
+
+    @Override
+    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+      return node.isValid() && superConstructor.isValid();
+    }
+
+    @Override
+    public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+      if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+        return;
+      }
+      final JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
+      if (jsClass == null) {
+        return;
+      }
+      final JSAttributeList attributeList = jsClass.getAttributeList();
+      String fun = "";
+
+      if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC) {
+        fun += "public ";
+      }
+
+      fun += "function ";
+
+      final JSParameterList parameterList = superConstructor.getParameterList();
+      fun += jsClass.getName() + parameterList.getText() + "{\n";
+      fun += "super(";
+      int i = 0;
+
+      for (JSParameter p : parameterList.getParameters()) {
+        if (i != 0) {
+          fun += ",";
+        }
+        ++i;
+        fun += p.getName();
+      }
+      fun += ")" + JSChangeUtil.getSemicolon(project);
+      fun += "\n}";
+
+      jsClass.add(JSChangeUtil.createJSTreeFromText(project, fun).getPsi());
+    }
+
+    @Override
+    public boolean startInWriteAction() {
+      return true;
+    }
+  }
 }

From 4f2fa8301dffbee5a2fed217ca750bd3df40e9bd Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 27 Feb 2023 21:59:04 +0400
Subject: [PATCH 168/340] add forms rt dependency

---
 plugin/pom.xml                        | 6 ++++++
 plugin/src/main/java/module-info.java | 1 +
 2 files changed, 7 insertions(+)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 49ca2107..47b49906 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -178,6 +178,12 @@
 			<version>1.0-SNAPSHOT</version>
 		</dependency>
 
+		<dependency>
+			<groupId>consulo.internal</groupId>
+			<artifactId>forms_rt</artifactId>
+			<optional>true</optional>
+		</dependency>
+		
 		<!--provided-->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/plugin/src/main/java/module-info.java b/plugin/src/main/java/module-info.java
index 7fe58218..1c88e8d9 100644
--- a/plugin/src/main/java/module-info.java
+++ b/plugin/src/main/java/module-info.java
@@ -13,6 +13,7 @@
 
 	// TODO remove in future
 	requires java.desktop;
+	requires forms.rt;
 
 	exports com.intellij.javascript;
 	exports com.intellij.javascript.manipulators;

From 67d3ed612710c0d194012e4239883be715115479 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 19 Mar 2023 14:49:15 +0400
Subject: [PATCH 169/340] inspections state moved to new api

---
 inspections/pom.xml                           |  18 +
 .../com/sixrr/inspectjs/BaseInspection.java   |  36 +-
 .../inspectjs/BaseInspectionVisitor.java      | 292 ++++----
 .../sixrr/inspectjs/JavaScriptInspection.java |  14 -
 .../AssignmentResultUsedJSInspection.java     |   6 +-
 ...ignmentToForLoopParameterJSInspection.java |   6 +-
 ...gnmentToFunctionParameterJSInspection.java |   6 +-
 .../NestedAssignmentJSInspection.java         |   6 +-
 ...entWithOperatorAssignmentJSInspection.java |   8 +-
 .../SillyAssignmentJSInspection.java          |   6 +-
 .../bitwise/IncompatibleMaskJSInspection.java |   6 +-
 ...ointlessBitwiseExpressionJSInspection.java | 450 ++++++------
 ...essBitwiseExpressionJSInspectionState.java |  41 ++
 .../bitwise/ShiftOutOfRangeJSInspection.java  |   6 +-
 .../bugs/DivideByZeroJSInspection.java        |   6 +-
 ...ityComparisonWithCoercionJSInspection.java |   8 +-
 .../bugs/InfiniteLoopJSInspection.java        |   6 +-
 .../bugs/InfiniteRecursionJSInspection.java   |   6 +-
 ...tCircuitBooleanExpressionJSInspection.java |   8 +-
 .../ObjectAllocationIgnoredJSInspection.java  |   6 +-
 ...extLabelInSwitchStatementJSInspection.java |   6 +-
 .../AnonymousFunctionJSInspection.java        |   6 +-
 .../confusing/BlockStatementJSInspection.java |   6 +-
 .../confusing/CallerJSInspection.java         |   6 +-
 .../CommaExpressionJSInspection.java          |   6 +-
 .../ConditionalExpressionJSInspection.java    |   6 +-
 ...usingFloatingPointLiteralJSInspection.java |   8 +-
 .../ConfusingPlusesOrMinusesJSInspection.java |   6 +-
 .../DynamicallyGeneratedCodeJSInspection.java |   6 +-
 .../EmptyStatementBodyJSInspection.java       | 294 ++++----
 .../EmptyStatementBodyJSInspectionState.java  |  41 ++
 ...rementDecrementResultUsedJSInspection.java |   6 +-
 .../confusing/MagicNumberJSInspection.java    |   6 +-
 ...atedConditionalExpressionJSInspection.java |   8 +-
 .../NegatedIfStatementJSInspection.java       |   8 +-
 ...stedConditionalExpressionJSInspection.java |   6 +-
 .../confusing/NestedFunctionJSInspection.java | 116 +--
 .../NestedFunctionJSInspectionState.java      |  41 ++
 .../confusing/OctalIntegerJSInspection.java   |   6 +-
 ...mplexArithmeticExpressionJSInspection.java | 402 ++++++-----
 ...ArithmeticExpressionJSInspectionState.java |  43 ++
 ...yComplexBooleanExpressionJSInspection.java | 280 ++++----
 ...lexBooleanExpressionJSInspectionState.java |  43 ++
 ...tlessArithmeticExpressionJSInspection.java |   8 +-
 ...ointlessBooleanExpressionJSInspection.java |   8 +-
 .../confusing/VoidExpressionJSInspection.java |   6 +-
 .../confusing/WithStatementJSInspection.java  |   6 +-
 .../control/BreakStatementJSInspection.java   |   6 +-
 .../BreakStatementWithLabelJSInspection.java  |   6 +-
 ...sionWithIdenticalBranchesJSInspection.java |   8 +-
 ...tantConditionalExpressionJSInspection.java |   8 +-
 .../ConstantIfStatementJSInspection.java      |   8 +-
 .../ContinueStatementJSInspection.java        |   6 +-
 ...ontinueStatementWithLabelJSInspection.java |   6 +-
 ...efaultNotLastCaseInSwitchJSInspection.java |   6 +-
 .../DuplicateConditionJSInspection.java       |   6 +-
 ...lthroughInSwitchStatementJSInspection.java |   6 +-
 ...ForLoopReplaceableByWhileJSInspection.java | 244 ++++---
 ...opReplaceableByWhileJSInspectionState.java |  41 ++
 ...ThatDoesntUseLoopVariableJSInspection.java |   6 +-
 ...mentWithIdenticalBranchesJSInspection.java |   8 +-
 ...tementWithTooManyBranchesJSInspection.java | 141 ++--
 ...tWithTooManyBranchesJSInspectionState.java |  44 ++
 .../control/LabeledStatementJSInspection.java |   6 +-
 ...opStatementThatDoesntLoopJSInspection.java |   6 +-
 .../NestedSwitchStatementJSInspection.java    |   6 +-
 ...tementWithNoDefaultBranchJSInspection.java |   6 +-
 .../control/TailRecursionJSInspection.java    |   6 +-
 .../TrivialConditionalJSInspection.java       |   8 +-
 .../control/TrivialIfJSInspection.java        |   8 +-
 .../UnnecessaryContinueJSInspection.java      |   8 +-
 .../control/UnnecessaryLabelJSInspection.java |   8 +-
 ...saryLabelOnBreakStatementJSInspection.java |   8 +-
 ...yLabelOnContinueStatementJSInspection.java |   8 +-
 .../UnnecessaryReturnJSInspection.java        |   8 +-
 .../ReuseOfLocalVariableJSInspection.java     |   4 +-
 .../UnnecessaryLocalVariableJSInspection.java | 676 ++++++++++--------
 ...cessaryLocalVariableJSInspectionState.java |  41 ++
 .../dom/DocumentWriteJSInspection.java        |   6 +-
 .../inspectjs/dom/InnerHTMLJSInspection.java  |   6 +-
 .../dom/PlatformDetectionJSInspection.java    |   6 +-
 .../XHTMLIncompatabilitiesJSInspection.java   |   6 +-
 ...ueOrBreakFromFinallyBlockJSInspection.java |   6 +-
 .../EmptyCatchBlockJSInspection.java          |   6 +-
 .../EmptyFinallyBlockJSInspection.java        |   6 +-
 .../exception/EmptyTryBlockJSInspection.java  |   6 +-
 .../ExceptionCaughtLocallyJSInspection.java   |   6 +-
 .../ReturnFromFinallyBlockJSInspection.java   |   6 +-
 .../ThrowFromFinallyBlockJSInspection.java    |   6 +-
 .../UnusedCatchParameterJSInspection.java     | 156 ++--
 ...UnusedCatchParameterJSInspectionState.java |  41 ++
 .../CyclomaticComplexityJSInspection.java     |  23 +-
 ...CyclomaticComplexityJSInspectionState.java |  16 +
 .../FunctionMetricsInspection.java            |  25 -
 .../FunctionMetricsInspectionState.java       |  52 ++
 ...FunctionWithMultipleLoopsJSInspection.java |   6 +-
 ...nWithMultipleReturnPointsJSInspection.java |   6 +-
 .../NestingDepthJSInspection.java             | 120 ++--
 .../NestingDepthJSInspectionState.java        |  16 +
 .../ParametersPerFunctionJSInspection.java    | 128 ++--
 ...arametersPerFunctionJSInspectionState.java |  16 +
 .../StatementsPerFunctionJSInspection.java    | 128 ++--
 ...tatementsPerFunctionJSInspectionState.java |  17 +
 ...ThreeNegationsPerFunctionJSInspection.java |   6 +-
 .../naming/ConventionInspection.java          | 313 ++++----
 .../naming/ConventionInspectionState.java     | 104 +++
 .../FunctionNamingConventionJSInspection.java | 146 ++--
 ...tionNamingConventionJSInspectionState.java |  18 +
 ...lVariableNamingConventionJSInspection.java | 143 ++--
 ...ableNamingConventionJSInspectionState.java |  15 +
 ...ParameterNamingConventionJSInspection.java | 152 ++--
 ...eterNamingConventionJSInspectionState.java |  15 +
 .../style/ChainedEqualityJSInspection.java    |   6 +-
 .../ChainedFunctionCallJSInspection.java      |   6 +-
 ...ConstantOnLHSOfComparisonJSInspection.java |   8 +-
 ...ConstantOnRHSOfComparisonJSInspection.java |   8 +-
 .../style/NestedFunctionCallJSInspection.java |   6 +-
 .../NonBlockStatementBodyJSInspection.java    |   8 +-
 .../UnterminatedStatementJSInspection.java    |   6 +-
 .../BadExpressionStatementJSInspection.java   |   3 +-
 .../DebuggerStatementJSInspection.java        |   6 +-
 .../DuplicateCaseLabelJSInspection.java       |   6 +-
 ...DuplicatePropertyOnObjectJSInspection.java |   6 +-
 ...onWithInconsistentReturnsJSInspection.java |   4 +-
 .../StringLiteralBreaksHTMLJSInspection.java  |   6 +-
 ...ionReferencesGlobalObjectJSInspection.java |   6 +-
 .../validity/UnreachableCodeJSInspection.java |   6 +-
 ....sixrr.inspectjs.InspectionJSLocalize.yaml | 556 ++++++++++++++
 plugin/pom.xml                                |   3 +-
 129 files changed, 3851 insertions(+), 2209 deletions(-)
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspectionState.java
 delete mode 100644 inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspection.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspectionState.java
 create mode 100644 inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspectionState.java
 create mode 100644 inspections/src/main/resources/LOCALIZE-LIB/en_US/com.sixrr.inspectjs.InspectionJSLocalize.yaml

diff --git a/inspections/pom.xml b/inspections/pom.xml
index 1942ec4b..69216c1d 100644
--- a/inspections/pom.xml
+++ b/inspections/pom.xml
@@ -40,6 +40,24 @@
 		</repository>
 	</repositories>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>consulo.maven</groupId>
+				<artifactId>maven-consulo-plugin</artifactId>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-localize</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
index 9aa9c82a..3ffed716 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
@@ -2,12 +2,10 @@
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSSuppressionHolder;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
-import consulo.language.editor.inspection.CustomSuppressableInspectionTool;
-import consulo.language.editor.inspection.LocalInspectionTool;
-import consulo.language.editor.inspection.ProblemsHolder;
-import consulo.language.editor.inspection.SuppressionUtil;
+import consulo.language.editor.inspection.*;
 import consulo.language.editor.intention.SuppressIntentionAction;
 import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
 import consulo.language.psi.PsiElement;
@@ -15,28 +13,27 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.lang.reflect.Method;
 
 public abstract class BaseInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool
 {
 	@Override
 	@Nonnull
-	public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder problemsHolder, boolean onTheFly)
+	@SuppressWarnings("unchecked")
+	public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder problemsHolder, boolean onTheFly, LocalInspectionToolSession session, Object state)
 	{
 		if(!canBuildVisitor(problemsHolder.getFile()))
 		{
-			return new PsiElementVisitor()
-			{
-			};
+			return PsiElementVisitor.EMPTY_VISITOR;
 		}
+
 		final BaseInspectionVisitor visitor = buildVisitor();
 		visitor.setProblemsHolder(problemsHolder);
 		visitor.setOnTheFly(onTheFly);
 		visitor.setInspection(this);
+		visitor.setState(state);
 		return visitor;
 	}
 
@@ -60,7 +57,8 @@ public boolean canBuildVisitor(@Nonnull PsiFile psiFile)
 	}
 
 	@Nullable
-	protected String buildErrorString(Object... args)
+	@RequiredReadAction
+	protected String buildErrorString(Object state, Object... args)
 	{
 		return null;
 	}
@@ -71,7 +69,7 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
 	}
 
 	@Nullable
-	protected InspectionJSFix buildFix(PsiElement location)
+	protected InspectionJSFix buildFix(PsiElement location, Object state)
 	{
 		return null;
 	}
@@ -82,20 +80,6 @@ protected InspectionJSFix[] buildFixes(PsiElement location)
 		return null;
 	}
 
-	public boolean hasQuickFix()
-	{
-		final Method[] methods = getClass().getDeclaredMethods();
-		for(final Method method : methods)
-		{
-			@NonNls final String methodName = method.getName();
-			if("buildFix".equals(methodName))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
 	public abstract BaseInspectionVisitor buildVisitor();
 
 	protected boolean functionHasIdentifier(JSFunction function)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
index a0b60a2b..c51f127d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
@@ -1,136 +1,170 @@
 package com.sixrr.inspectjs;
 
-import java.util.List;
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.editor.inspection.*;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import consulo.language.editor.inspection.LocalQuickFix;
-import consulo.language.editor.inspection.ProblemDescriptor;
-import com.intellij.lang.javascript.psi.JSCallExpression;
-import com.intellij.lang.javascript.psi.JSElementVisitor;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.psi.JSVariable;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.util.PsiTreeUtil;
-import consulo.language.editor.inspection.ProblemHighlightType;
-import consulo.language.editor.inspection.ProblemsHolder;
-import consulo.language.psi.PsiWhiteSpace;
+import java.util.List;
 
-public abstract class BaseInspectionVisitor extends JSElementVisitor{
-    private BaseInspection inspection = null;
-    private ProblemsHolder problemsHolder = null;
-    private boolean onTheFly = false;
-    private List<ProblemDescriptor> errors = null;
-
-    public void setInspection(BaseInspection inspection){
-        this.inspection = inspection;
-    }
-
-    public void setProblemsHolder(ProblemsHolder problemsHolder){
-        this.problemsHolder = problemsHolder;
-    }
-
-    public void setOnTheFly(boolean onTheFly){
-        this.onTheFly = onTheFly;
-    }
-
-    protected void registerFunctionCallError(JSCallExpression expression){
-        final JSExpression methodExpression = expression.getMethodExpression();
-        PsiElement errorLocation = null;
-
-        if (methodExpression instanceof JSReferenceExpression) {
-          errorLocation = ((JSReferenceExpression)methodExpression).getReferenceNameElement();
-        } else if (methodExpression instanceof JSFunction) {
-          final PsiElement node = ((JSFunction)methodExpression).getNameIdentifier();
-          if (node != null) errorLocation = node;
-          else errorLocation = methodExpression;
-        }
-
-        registerError(errorLocation);
-    }
-
-    protected void registerStatementError(JSStatement statement, Object... args){
-        final PsiElement statementToken = statement.getFirstChild();
-        registerError(statementToken, args);
-    }
-
-    protected void registerFunctionError(JSFunction function){
-        final PsiElement identifier = function.getNameIdentifier();
-        if(identifier == null ||
-                !PsiTreeUtil.isAncestor(function, identifier, true)){
-            registerError(function.getFirstChild());
-        } else{
-            registerError(identifier);
-        }
-    }
-
-    protected void registerVariableError(JSVariable variable){
-        final PsiElement nameIdentifier = variable.getFirstChild();
-        registerError(nameIdentifier);
-    }
-
-  protected void registerError(PsiElement location){
-        if(location == null){
-            return;
-        }
-        final LocalQuickFix[] fix = createFixes(location);
-        final String description = inspection.buildErrorString(location);
-        registerError(location, description, fix);
-    }
-
-    private void registerError(PsiElement location, String description,
-                               LocalQuickFix[] fixes){
-        problemsHolder.registerProblem(getEditorErrorLocation(location),
-                description,
-                getProblemHighlightType(location), fixes);
-    }
-
-    protected ProblemHighlightType getProblemHighlightType(PsiElement location) {
-        return ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-    }
-
-    protected PsiElement getEditorErrorLocation(final @Nonnull PsiElement location) {
-        return location;
-    }
-
-    protected void registerError(PsiElement location, Object... args){
-        final LocalQuickFix[] fix = createFixes(location);
-        final String description = inspection.buildErrorString(args);
-        registerError(location, description, fix);
-    }
-
-    @Nullable
-    private LocalQuickFix[] createFixes(PsiElement location){
-        if(!onTheFly &&
-                inspection.buildQuickFixesOnlyForOnTheFlyErrors()){
-            return null;
-        }
-        final InspectionJSFix[] fixes = inspection.buildFixes(location);
-        if(fixes != null){
-            return fixes;
-        }
-        final InspectionJSFix fix = inspection.buildFix(location);
-        if(fix == null){
-            return null;
-        }
-        return new InspectionJSFix[]{fix};
-    }
-
-    @Nullable
-    public ProblemDescriptor[] getErrors(){
-        if(errors == null){
-            return null;
-        } else{
-            final int numErrors = errors.size();
-            return errors.toArray(new ProblemDescriptor[numErrors]);
-        }
-    }
-
-    @Override public void visitWhiteSpace(PsiWhiteSpace space){
-        // none of our inspections need to do anything with white space,
-        // so this is a performance optimization
-    }
+public abstract class BaseInspectionVisitor<T> extends JSElementVisitor
+{
+	private BaseInspection inspection = null;
+	private ProblemsHolder problemsHolder = null;
+	private boolean onTheFly = false;
+	private List<ProblemDescriptor> errors = null;
+	protected T myState;
+
+	public void setState(T state)
+	{
+		myState = state;
+	}
+
+	public void setInspection(BaseInspection inspection)
+	{
+		this.inspection = inspection;
+	}
+
+	public void setProblemsHolder(ProblemsHolder problemsHolder)
+	{
+		this.problemsHolder = problemsHolder;
+	}
+
+	public void setOnTheFly(boolean onTheFly)
+	{
+		this.onTheFly = onTheFly;
+	}
+
+	@RequiredReadAction
+	protected void registerFunctionCallError(JSCallExpression expression)
+	{
+		final JSExpression methodExpression = expression.getMethodExpression();
+		PsiElement errorLocation = null;
+
+		if(methodExpression instanceof JSReferenceExpression)
+		{
+			errorLocation = ((JSReferenceExpression) methodExpression).getReferenceNameElement();
+		}
+		else if(methodExpression instanceof JSFunction)
+		{
+			final PsiElement node = ((JSFunction) methodExpression).getNameIdentifier();
+			if(node != null)
+			{
+				errorLocation = node;
+			}
+			else
+			{
+				errorLocation = methodExpression;
+			}
+		}
+
+		registerError(errorLocation);
+	}
+
+	protected void registerStatementError(JSStatement statement, Object... args)
+	{
+		final PsiElement statementToken = statement.getFirstChild();
+		registerError(statementToken, args);
+	}
+
+	protected void registerFunctionError(JSFunction function)
+	{
+		final PsiElement identifier = function.getNameIdentifier();
+		if(identifier == null ||
+				!PsiTreeUtil.isAncestor(function, identifier, true))
+		{
+			registerError(function.getFirstChild());
+		}
+		else
+		{
+			registerError(identifier);
+		}
+	}
+
+	protected void registerVariableError(JSVariable variable)
+	{
+		final PsiElement nameIdentifier = variable.getFirstChild();
+		registerError(nameIdentifier);
+	}
+
+	protected void registerError(PsiElement location)
+	{
+		if(location == null)
+		{
+			return;
+		}
+		final LocalQuickFix[] fix = createFixes(location, myState);
+		final String description = inspection.buildErrorString(myState, location);
+		registerError(location, description, fix);
+	}
+
+	private void registerError(PsiElement location, String description,
+							   LocalQuickFix[] fixes)
+	{
+		problemsHolder.registerProblem(getEditorErrorLocation(location),
+				description,
+				getProblemHighlightType(location), fixes);
+	}
+
+	protected ProblemHighlightType getProblemHighlightType(PsiElement location)
+	{
+		return ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
+	}
+
+	protected PsiElement getEditorErrorLocation(final @Nonnull PsiElement location)
+	{
+		return location;
+	}
+
+	protected void registerError(PsiElement location, Object... args)
+	{
+		final LocalQuickFix[] fix = createFixes(location, myState);
+		final String description = inspection.buildErrorString(myState, args);
+		registerError(location, description, fix);
+	}
+
+	@Nullable
+	private LocalQuickFix[] createFixes(PsiElement location, Object state)
+	{
+		if(!onTheFly && inspection.buildQuickFixesOnlyForOnTheFlyErrors())
+		{
+			return null;
+		}
+		final InspectionJSFix[] fixes = inspection.buildFixes(location);
+		if(fixes != null)
+		{
+			return fixes;
+		}
+		final InspectionJSFix fix = inspection.buildFix(location, state);
+		if(fix == null)
+		{
+			return null;
+		}
+		return new InspectionJSFix[]{fix};
+	}
+
+	@Nullable
+	public ProblemDescriptor[] getErrors()
+	{
+		if(errors == null)
+		{
+			return null;
+		}
+		else
+		{
+			final int numErrors = errors.size();
+			return errors.toArray(new ProblemDescriptor[numErrors]);
+		}
+	}
+
+	@Override
+	public void visitWhiteSpace(PsiWhiteSpace space)
+	{
+		// none of our inspections need to do anything with white space,
+		// so this is a performance optimization
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java
index 0e07aec1..12654d84 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java
@@ -1,19 +1,5 @@
 package com.sixrr.inspectjs;
 
 public abstract class JavaScriptInspection extends BaseInspection {
-   /*
-    public ProblemDescriptor[] checkFile(PsiFile file, InspectionManager manager, boolean isOnTheFly) {
-      if (!file.isPhysical()) {
-            return super.checkFile(file, manager, isOnTheFly);
-        }
-        if(file instanceof PsiJavaFile)
-        {
-            return super.checkFile(file, manager, isOnTheFly);
-        }
-        final BaseInspectionVisitor visitor = (BaseInspectionVisitor) buildVisitor(manager, isOnTheFly);
-        file.accept(visitor);
-        return visitor.getErrors();
-    }
-                             */
 }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
index 92e645bc..f5b1db7d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
@@ -26,9 +27,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("result.of.assignment.expression.used.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
index 6670f10e..be0a5787 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
@@ -28,8 +29,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("assignment.to.for.loop.parameter.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
index fe7fffd3..111b413e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
@@ -29,9 +30,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("assignment.to.function.parameter.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
index 99831821..3043ab6b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
+    public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("nested.assignment.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
index 0dd30118..792d2e8a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import com.sixrr.inspectjs.utils.SideEffectChecker;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -39,8 +40,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message(
                 "assignment.replaceable.with.operator.assignment.error.string",
                 calculateReplacementExpression((JSAssignmentExpression) args[0]));
@@ -65,7 +67,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new ReplaceAssignmentWithOperatorAssignmentFix(
                 (JSAssignmentExpression) location);
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
index 74ab8c09..a14d8221 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
@@ -10,6 +10,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
@@ -33,8 +34,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("silly.assignment.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
index 2934146c..2683b65f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
@@ -10,6 +10,7 @@
 import com.sixrr.inspectjs.utils.ComparisonUtils;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 
@@ -37,9 +38,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
+    public String buildErrorString(Object state, Object... args) {
         final JSBinaryExpression binaryExpression =
                 (JSBinaryExpression) args[0];
         final IElementType tokenType =
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index 265112ac..ace5540c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -4,222 +4,272 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.util.IncorrectOperationException;
 import com.sixrr.inspectjs.*;
-import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
 import javax.annotation.Nonnull;
-
-import javax.swing.*;
 import java.util.HashSet;
 import java.util.Set;
 
 @ExtensionImpl
-public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection {
-
-    /**
-     * @noinspection PublicField
-     */
-    public boolean m_ignoreExpressionsContainingConstants = false;
-
-    static final Set<IElementType> bitwiseTokens =
-            new HashSet<IElementType>(6);
-
-    static {
-        bitwiseTokens.add(JSTokenTypes.AND);
-        bitwiseTokens.add(JSTokenTypes.OR);
-        bitwiseTokens.add(JSTokenTypes.XOR);
-        bitwiseTokens.add(JSTokenTypes.LTLT);
-        bitwiseTokens.add(JSTokenTypes.GTGT);
-        bitwiseTokens.add(JSTokenTypes.GTGTGT);
-    }
-
-    @Override
+public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection
+{
+	static final Set<IElementType> bitwiseTokens = new HashSet<IElementType>(6);
+
+	static
+	{
+		bitwiseTokens.add(JSTokenTypes.AND);
+		bitwiseTokens.add(JSTokenTypes.OR);
+		bitwiseTokens.add(JSTokenTypes.XOR);
+		bitwiseTokens.add(JSTokenTypes.LTLT);
+		bitwiseTokens.add(JSTokenTypes.GTGT);
+		bitwiseTokens.add(JSTokenTypes.GTGTGT);
+	}
+
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "pointless.bitwise.expression.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message(
+				"pointless.bitwise.expression.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BITWISE_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.BITWISE_GROUP_NAME;
+	}
 
-    @Override
+	@RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
-        final String replacementExpression =
-                calculateReplacementExpression((JSExpression) args[0]);
-        return InspectionJSBundle.message(
-                "pointless.bitwise.expression.problem.descriptor",
-                replacementExpression);
-    }
-
-    @Override
-	public boolean isEnabledByDefault() {
-        return true;
-    }
-
-    @Override
-	public JComponent createOptionsPanel() {
-        return new SingleCheckboxOptionsPanel(
-                InspectionJSBundle.message(
-                        "pointless.bitwise.expression.ignore.option"),
-                this, "m_ignoreExpressionsContainingConstants");
-    }
-
-    String calculateReplacementExpression(JSExpression expression) {
-        final JSBinaryExpression exp = (JSBinaryExpression) expression;
-        final JSExpression lhs = exp.getLOperand();
-        final JSExpression rhs = exp.getROperand();
-        final IElementType tokenType = exp.getOperationSign();
-        assert rhs != null;
-        if (tokenType.equals(JSTokenTypes.AND)) {
-            if (isZero(lhs) || isAllOnes(rhs)) {
-                return lhs.getText();
-            } else {
-                return rhs.getText();
-            }
-        } else if (tokenType.equals(JSTokenTypes.OR)) {
-            if (isZero(lhs) || isAllOnes(rhs)) {
-                return rhs.getText();
-            } else {
-                return lhs.getText();
-            }
-        } else if (tokenType.equals(JSTokenTypes.XOR)) {
-            if (isAllOnes(lhs)) {
-                return '~' + rhs.getText();
-            } else if (isAllOnes(rhs)) {
-                return '~' + lhs.getText();
-            } else if (isZero(rhs)) {
-                return lhs.getText();
-            } else {
-                return rhs.getText();
-            }
-        } else if (tokenType.equals(JSTokenTypes.LTLT) ||
-                tokenType.equals(JSTokenTypes.GTGT) ||
-                tokenType.equals(JSTokenTypes.GTGTGT)) {
-            return lhs.getText();
-        } else {
-            return "";
-        }
-    }
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new PointlessBitwiseVisitor();
-    }
-
-    @Override
-	public InspectionJSFix buildFix(PsiElement location) {
-        return new PointlessBitwiseFix();
-    }
-
-    private class PointlessBitwiseFix extends InspectionJSFix {
-
-        @Override
+	public String buildErrorString(Object state, Object... args)
+	{
+		final String replacementExpression = calculateReplacementExpression((JSExpression) args[0], (PointlessBitwiseExpressionJSInspectionState) state);
+		return InspectionJSBundle.message(
+				"pointless.bitwise.expression.problem.descriptor",
+				replacementExpression);
+	}
+
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return true;
+	}
+
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new PointlessBitwiseExpressionJSInspectionState();
+	}
+
+	@RequiredReadAction
+	String calculateReplacementExpression(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state)
+	{
+		final JSBinaryExpression exp = (JSBinaryExpression) expression;
+		final JSExpression lhs = exp.getLOperand();
+		final JSExpression rhs = exp.getROperand();
+		final IElementType tokenType = exp.getOperationSign();
+		assert rhs != null;
+		if(tokenType.equals(JSTokenTypes.AND))
+		{
+			if(isZero(lhs, state) || isAllOnes(rhs, state))
+			{
+				return lhs.getText();
+			}
+			else
+			{
+				return rhs.getText();
+			}
+		}
+		else if(tokenType.equals(JSTokenTypes.OR))
+		{
+			if(isZero(lhs, state) || isAllOnes(rhs, state))
+			{
+				return rhs.getText();
+			}
+			else
+			{
+				return lhs.getText();
+			}
+		}
+		else if(tokenType.equals(JSTokenTypes.XOR))
+		{
+			if(isAllOnes(lhs, state))
+			{
+				return '~' + rhs.getText();
+			}
+			else if(isAllOnes(rhs, state))
+			{
+				return '~' + lhs.getText();
+			}
+			else if(isZero(rhs, state))
+			{
+				return lhs.getText();
+			}
+			else
+			{
+				return rhs.getText();
+			}
+		}
+		else if(tokenType.equals(JSTokenTypes.LTLT) ||
+				tokenType.equals(JSTokenTypes.GTGT) ||
+				tokenType.equals(JSTokenTypes.GTGTGT))
+		{
+			return lhs.getText();
+		}
+		else
+		{
+			return "";
+		}
+	}
+
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new PointlessBitwiseVisitor();
+	}
+
+	@Override
+	public InspectionJSFix buildFix(PsiElement location, Object state)
+	{
+		return new PointlessBitwiseFix(state);
+	}
+
+	private class PointlessBitwiseFix extends InspectionJSFix
+	{
+		private final PointlessBitwiseExpressionJSInspectionState myState;
+
+		public PointlessBitwiseFix(Object state)
+		{
+			myState = (PointlessBitwiseExpressionJSInspectionState) state;
+		}
+
+		@Override
 		@Nonnull
-        public String getName() {
-            return InspectionJSBundle.message(
-                    "pointless.bitwise.expression.simplify.quickfix");
-        }
-
-        @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
-            final JSExpression expression = (JSExpression) descriptor
-                    .getPsiElement();
-            final String newExpression =
-                    calculateReplacementExpression(expression);
-            replaceExpression(expression, newExpression);
-        }
-    }
-
-    private class PointlessBitwiseVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(
-                @Nonnull JSBinaryExpression expression) {
-            super.visitJSBinaryExpression(expression);
-            final IElementType sign = expression.getOperationSign();
-            if (!bitwiseTokens.contains(sign)) {
-                return;
-            }
-
-            final JSExpression rhs = expression.getROperand();
-            if (rhs == null) {
-                return;
-            }
-
-            final JSExpression lhs = expression.getLOperand();
-
-            final boolean isPointless;
-            if (JSTokenTypes.AND.equals(sign)) {
-                isPointless = andExpressionIsPointless(lhs, rhs);
-            } else if (JSTokenTypes.OR.equals(sign)) {
-                isPointless = orExpressionIsPointless(lhs, rhs);
-            } else if (JSTokenTypes.XOR.equals(sign)) {
-                isPointless = xorExpressionIsPointless(lhs, rhs );
-            } else if (JSTokenTypes.LTLT.equals(sign) ||
-                    JSTokenTypes.GTGT.equals(sign) ||
-                    JSTokenTypes.GTGTGT.equals(sign)) {
-                isPointless = shiftExpressionIsPointless(rhs);
-            } else {
-                isPointless = false;
-            }
-            if (isPointless) {
-                registerError(expression, expression);
-            }
-        }
-
-        private boolean andExpressionIsPointless(JSExpression lhs,
-                                                 JSExpression rhs) {
-            return isZero(lhs) || isZero(rhs)
-                    || isAllOnes(lhs) || isAllOnes(rhs);
-        }
-
-        private boolean orExpressionIsPointless(JSExpression lhs,
-                                                JSExpression rhs  ) {
-            return isZero(lhs) || isZero(rhs)
-                    || isAllOnes(lhs) || isAllOnes(rhs    );
-        }
-
-        private boolean xorExpressionIsPointless(JSExpression lhs,
-                                                 JSExpression rhs ) {
-            return isZero(lhs) || isZero(rhs)
-                    || isAllOnes(lhs) || isAllOnes(rhs);
-        }
-
-        private boolean shiftExpressionIsPointless(JSExpression rhs
-        ) {
-            return isZero(rhs);
-        }
-    }
-
-    private boolean isZero(JSExpression expression) {
-        if (m_ignoreExpressionsContainingConstants
-                && !(expression instanceof JSLiteralExpression)) {
-            return false;
-        }
-        final Object value =
-                ExpressionUtil.computeConstantExpression(expression);
-        return value instanceof Integer && (Integer) value == 0;
-    }
-
-    private boolean isAllOnes(JSExpression expression) {
-        if (m_ignoreExpressionsContainingConstants
-                && !(expression instanceof JSLiteralExpression)) {
-            return false;
-        }
-        final Object value =
-                ExpressionUtil.computeConstantExpression(expression);
-        return value != null && value instanceof Integer && (Integer) value == 0xffffffff;
-    }
+		public String getName()
+		{
+			return InspectionJSBundle.message(
+					"pointless.bitwise.expression.simplify.quickfix");
+		}
+
+		@Override
+		@RequiredReadAction
+		public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException
+		{
+			final JSExpression expression = (JSExpression) descriptor.getPsiElement();
+			final String newExpression = calculateReplacementExpression(expression, myState);
+			replaceExpression(expression, newExpression);
+		}
+	}
+
+	private class PointlessBitwiseVisitor extends BaseInspectionVisitor<PointlessBitwiseExpressionJSInspectionState>
+	{
+		@Override
+		@RequiredReadAction
+		public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression)
+		{
+			super.visitJSBinaryExpression(expression);
+			final IElementType sign = expression.getOperationSign();
+			if(!bitwiseTokens.contains(sign))
+			{
+				return;
+			}
+
+			final JSExpression rhs = expression.getROperand();
+			if(rhs == null)
+			{
+				return;
+			}
+
+			final JSExpression lhs = expression.getLOperand();
+
+			final boolean isPointless;
+			if(JSTokenTypes.AND.equals(sign))
+			{
+				isPointless = andExpressionIsPointless(lhs, rhs);
+			}
+			else if(JSTokenTypes.OR.equals(sign))
+			{
+				isPointless = orExpressionIsPointless(lhs, rhs);
+			}
+			else if(JSTokenTypes.XOR.equals(sign))
+			{
+				isPointless = xorExpressionIsPointless(lhs, rhs);
+			}
+			else if(JSTokenTypes.LTLT.equals(sign) ||
+					JSTokenTypes.GTGT.equals(sign) ||
+					JSTokenTypes.GTGTGT.equals(sign))
+			{
+				isPointless = shiftExpressionIsPointless(rhs);
+			}
+			else
+			{
+				isPointless = false;
+			}
+			if(isPointless)
+			{
+				registerError(expression, expression);
+			}
+		}
+
+		private boolean andExpressionIsPointless(JSExpression lhs,
+												 JSExpression rhs)
+		{
+			return isZero(lhs, myState) || isZero(rhs, myState)
+					|| isAllOnes(lhs, myState) || isAllOnes(rhs, myState);
+		}
+
+		private boolean orExpressionIsPointless(JSExpression lhs,
+												JSExpression rhs)
+		{
+			return isZero(lhs, myState) || isZero(rhs, myState)
+					|| isAllOnes(lhs, myState) || isAllOnes(rhs, myState);
+		}
+
+		private boolean xorExpressionIsPointless(JSExpression lhs,
+												 JSExpression rhs)
+		{
+			return isZero(lhs, myState) || isZero(rhs, myState)
+					|| isAllOnes(lhs, myState) || isAllOnes(rhs, myState);
+		}
+
+		private boolean shiftExpressionIsPointless(JSExpression rhs
+		)
+		{
+			return isZero(rhs, myState);
+		}
+	}
+
+	private boolean isZero(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state)
+	{
+		if(state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression))
+		{
+			return false;
+		}
+		final Object value =
+				ExpressionUtil.computeConstantExpression(expression);
+		return value instanceof Integer && (Integer) value == 0;
+	}
+
+	private boolean isAllOnes(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state)
+	{
+		if(state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression))
+		{
+			return false;
+		}
+		final Object value =
+				ExpressionUtil.computeConstantExpression(expression);
+		return value != null && value instanceof Integer && (Integer) value == 0xffffffff;
+	}
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
new file mode 100644
index 00000000..9947a019
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
@@ -0,0 +1,41 @@
+package com.sixrr.inspectjs.bitwise;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class PointlessBitwiseExpressionJSInspectionState implements InspectionToolState<PointlessBitwiseExpressionJSInspectionState>
+{
+	public boolean m_ignoreExpressionsContainingConstants = false;
+
+	@Nullable
+	@Override
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.checkBox(InspectionJSLocalize.pointlessBitwiseExpressionIgnoreOption(), () -> m_ignoreExpressionsContainingConstants, b -> m_ignoreExpressionsContainingConstants = b);
+		return builder.buildUnnamed();
+	}
+
+	@Nullable
+	@Override
+	public PointlessBitwiseExpressionJSInspectionState getState()
+	{
+		return this;
+	}
+
+	@Override
+	public void loadState(PointlessBitwiseExpressionJSInspectionState state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index f1e130df..d90feebd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -3,6 +3,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -28,9 +29,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
+    public String buildErrorString(Object state, Object... args) {
         final Integer value = (Integer) args[0];
         if (value > 0) {
             return InspectionJSBundle.message(
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index 70db974e..6a46cb73 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import org.jetbrains.annotations.NonNls;
@@ -35,9 +36,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("division.by.zero.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index 2a5c3574..a0062a6c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -35,14 +36,15 @@ public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("equality.comparison.with.coercion.error.string");
     }
 
 	@Override
-	protected InspectionJSFix buildFix(PsiElement location) {
+	protected InspectionJSFix buildFix(PsiElement location, Object state) {
 		final JSBinaryExpression expression = (JSBinaryExpression) location;
 		final IElementType sign = expression.getOperationSign();
 		if (JSTokenTypes.EQEQ == sign) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
index 02e26b78..edbb9a0f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -32,8 +33,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("infinite.loop.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
index bed744a7..adfe9cb2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.logging.Logger;
 
@@ -27,9 +28,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
+    public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message(
                 "infinite.recursion.problem.descriptor");
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index 34174019..bc45fc73 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -29,14 +30,15 @@ public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("non.short.circuit.boolean.expression.error.string");
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new NonShortCircuitBooleanFix();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
index 035d6f86..f04231a4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -32,9 +33,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("result.of.object.allocation.ignored.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index b0fe3527..a2e9eef2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -27,9 +28,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
+    public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("text.label.in.switch.statement.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index f6cb132f..7a08f741 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -28,9 +29,10 @@ public String getGroupDisplayName(){
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args){
+    protected String buildErrorString(Object state, Object... args){
         return InspectionJSBundle.message("anonymous.function.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index c1a407ae..89433927 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
@@ -26,9 +27,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("unnecessary.block.statement.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
index e1301ea8..3217ac6c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("caller.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
index 9acaff54..c71bfaf5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -26,9 +27,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("comma.expression.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index 2fbc1c81..e3d9faf9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("conditional.expression.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index 6a95751e..36fad493 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -1,5 +1,6 @@
 package com.sixrr.inspectjs.confusing;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -34,15 +35,16 @@ public String getDisplayName() {
                 "confusing.floating.point.literal.display.name");
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message(
                 "confusing.floating.point.literal.problem.descriptor");
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new ConfusingFloatingPointLiteralFix();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index f9e62e3d..2456a559 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -5,6 +5,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSPostfixExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -29,9 +30,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("confusing.pluses.or.minuses.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 9d61212f..29f3dc31 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import org.jetbrains.annotations.NonNls;
 
@@ -29,9 +30,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("dynamically.generated.code.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index 6599f5bb..0f4c56c6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -5,147 +5,179 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
 
 import javax.annotation.Nonnull;
 
-import javax.swing.*;
-
 @ExtensionImpl
-public class EmptyStatementBodyJSInspection extends JavaScriptInspection {
-    /**
-     * @noinspection PublicField
-     */
-    public boolean m_reportEmptyBlocks = false;
+public class EmptyStatementBodyJSInspection extends JavaScriptInspection
+{
+	@Override
+	@Nonnull
+	public String getID()
+	{
+		return "StatementWithEmptyBodyJS";
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getID() {
-        return "StatementWithEmptyBodyJS";
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("statement.with.empty.body.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("statement.with.empty.body.display.name");
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.CONFUSING_GROUP_NAME;
+	}
+
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return true;
+	}
+
+	@RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args)
+	{
+		if(args[0] instanceof JSIfStatement)
+		{
+			return InspectionJSBundle.message("statement.has.empty.branch.error.string");
+		}
+		else
+		{
+			return InspectionJSBundle.message("statement.has.empty.body.error.string");
+		}
+	}
 
-    @Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
-    }
-
-    @Override
-	public boolean isEnabledByDefault() {
-        return true;
-    }
-
-    @Override
-	public String buildErrorString(Object... args) {
-        if (args[0] instanceof JSIfStatement) {
-            return InspectionJSBundle.message("statement.has.empty.branch.error.string");
-        } else {
-            return InspectionJSBundle.message("statement.has.empty.body.error.string");
-        }
-    }
-
-    @Override
-	public JComponent createOptionsPanel() {
-        return new SingleCheckboxOptionsPanel(InspectionJSBundle.message("include.statement.bodies.that.are.empty.code.blocks.parameter"),
-                this, "m_reportEmptyBlocks");
-    }
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new EmptyStatementVisitor();
-    }
-
-    private class EmptyStatementVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
-            super.visitJSDoWhileStatement(statement);
-
-            final JSStatement body = statement.getBody();
-            if (body == null) {
-                return;
-            }
-            if (!isEmpty(body)) {
-                return;
-            }
-            registerStatementError(statement, statement);
-        }
-
-        @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
-            super.visitJSWhileStatement(statement);
-
-            final JSStatement body = statement.getBody();
-            if (body == null) {
-                return;
-            }
-            if (!isEmpty(body)) {
-                return;
-            }
-            registerStatementError(statement, statement);
-        }
-
-        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
-            super.visitJSForStatement(statement);
-
-            final JSStatement body = statement.getBody();
-            if (body == null) {
-                return;
-            }
-            if (!isEmpty(body)) {
-                return;
-            }
-            registerStatementError(statement, statement);
-        }
-
-        @Override
-		public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
-            super.visitJSForInStatement(statement);
-
-            final JSStatement body = statement.getBody();
-            if (body == null) {
-                return;
-            }
-            if (!isEmpty(body)) {
-                return;
-            }
-            registerStatementError(statement, statement);
-        }
-
-        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
-            super.visitJSIfStatement(statement);
-
-            final JSStatement thenBranch = statement.getThen();
-            if (thenBranch != null) {
-                if (isEmpty(thenBranch)) {
-                    registerStatementError(statement, statement);
-                    return;
-                }
-            }
-            final JSStatement elseBranch = statement.getElse();
-
-            if (elseBranch != null) {
-                if (isEmpty(elseBranch)) {
-                    registerStatementError(statement, statement);
-                }
-            }
-        }
-
-        private boolean isEmpty(JSElement body) {
-            if (body instanceof JSEmptyStatement) {
-                return true;
-            } else if (m_reportEmptyBlocks && body instanceof JSBlockStatement) {
-                final JSBlockStatement block = (JSBlockStatement) body;
-                final JSStatement[] statements = block.getStatements();
-                return statements.length == 0;
-            }
-            return false;
-        }
-    }
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new EmptyStatementBodyJSInspectionState();
+	}
+
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new EmptyStatementVisitor();
+	}
+
+	private class EmptyStatementVisitor extends BaseInspectionVisitor<EmptyStatementBodyJSInspectionState>
+	{
+
+		@Override
+		public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement)
+		{
+			super.visitJSDoWhileStatement(statement);
+
+			final JSStatement body = statement.getBody();
+			if(body == null)
+			{
+				return;
+			}
+			if(!isEmpty(body))
+			{
+				return;
+			}
+			registerStatementError(statement, statement);
+		}
+
+		@Override
+		public void visitJSWhileStatement(@Nonnull JSWhileStatement statement)
+		{
+			super.visitJSWhileStatement(statement);
+
+			final JSStatement body = statement.getBody();
+			if(body == null)
+			{
+				return;
+			}
+			if(!isEmpty(body))
+			{
+				return;
+			}
+			registerStatementError(statement, statement);
+		}
+
+		@Override
+		public void visitJSForStatement(@Nonnull JSForStatement statement)
+		{
+			super.visitJSForStatement(statement);
+
+			final JSStatement body = statement.getBody();
+			if(body == null)
+			{
+				return;
+			}
+			if(!isEmpty(body))
+			{
+				return;
+			}
+			registerStatementError(statement, statement);
+		}
+
+		@Override
+		public void visitJSForInStatement(@Nonnull JSForInStatement statement)
+		{
+			super.visitJSForInStatement(statement);
+
+			final JSStatement body = statement.getBody();
+			if(body == null)
+			{
+				return;
+			}
+			if(!isEmpty(body))
+			{
+				return;
+			}
+			registerStatementError(statement, statement);
+		}
+
+		@Override
+		public void visitJSIfStatement(@Nonnull JSIfStatement statement)
+		{
+			super.visitJSIfStatement(statement);
+
+			final JSStatement thenBranch = statement.getThen();
+			if(thenBranch != null)
+			{
+				if(isEmpty(thenBranch))
+				{
+					registerStatementError(statement, statement);
+					return;
+				}
+			}
+			final JSStatement elseBranch = statement.getElse();
+
+			if(elseBranch != null)
+			{
+				if(isEmpty(elseBranch))
+				{
+					registerStatementError(statement, statement);
+				}
+			}
+		}
+
+		private boolean isEmpty(JSElement body)
+		{
+			if(body instanceof JSEmptyStatement)
+			{
+				return true;
+			}
+			else if(myState.m_reportEmptyBlocks && body instanceof JSBlockStatement)
+			{
+				final JSBlockStatement block = (JSBlockStatement) body;
+				final JSStatement[] statements = block.getStatements();
+				return statements.length == 0;
+			}
+			return false;
+		}
+	}
 }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
new file mode 100644
index 00000000..fb4e601a
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
@@ -0,0 +1,41 @@
+package com.sixrr.inspectjs.confusing;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class EmptyStatementBodyJSInspectionState implements InspectionToolState<EmptyStatementBodyJSInspectionState>
+{
+	public boolean m_reportEmptyBlocks = false;
+
+	@Nullable
+	@Override
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.checkBox(InspectionJSLocalize.includeStatementBodiesThatAreEmptyCodeBlocksParameter(), () -> m_reportEmptyBlocks, b -> m_reportEmptyBlocks = b);
+		return builder.buildUnnamed();
+	}
+
+	@Nullable
+	@Override
+	public EmptyStatementBodyJSInspectionState getState()
+	{
+		return this;
+	}
+
+	@Override
+	public void loadState(EmptyStatementBodyJSInspectionState state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index ed8f0f78..eca9abd9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.language.ast.IElementType;
@@ -27,9 +28,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("result.of.increment.or.decrement.expression.used.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index 3e48bed7..2a3221fe 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -1,6 +1,7 @@
 package com.sixrr.inspectjs.confusing;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -51,9 +52,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
+    public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message(
                 "magic.number.problem.descriptor");
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index 5c10e649..d77a5509 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -33,14 +34,15 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("negated.conditional.expression.error.string");
     }
 
     @Override
-	protected InspectionJSFix buildFix(PsiElement location) {
+	protected InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index 6deefe4c..ecd1afcb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -36,9 +37,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("negated.ref.statement.error.string");
     }
 
@@ -48,7 +50,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	protected InspectionJSFix buildFix(PsiElement location) {
+	protected InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
index 0f42abfa..f65d4630 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
 
@@ -26,9 +27,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("nested.conditional.expression.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index 91c19ee7..8daba3f8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -2,79 +2,85 @@
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
 import javax.annotation.Nonnull;
-
 import javax.annotation.Nullable;
-import javax.swing.*;
 
 @ExtensionImpl
-public class NestedFunctionJSInspection extends JavaScriptInspection {
-
-    @SuppressWarnings({"PublicField"})
-    public boolean m_includeAnonymousFunctions = false;
-
-    @Override
+public class NestedFunctionJSInspection extends JavaScriptInspection
+{
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("nested.function.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("nested.function.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.CONFUSING_GROUP_NAME;
+	}
 
-    @Override
+	@RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
-        final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-        if(functionHasIdentifier(function))
-        {
-            return InspectionJSBundle.message("nested.function.error.string");
-        }
-        return InspectionJSBundle.message("nested.anonymous.function.error.string");
-    }
+	protected String buildErrorString(Object state, Object... args)
+	{
+		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
+		if(functionHasIdentifier(function))
+		{
+			return InspectionJSBundle.message("nested.function.error.string");
+		}
+		return InspectionJSBundle.message("nested.anonymous.function.error.string");
+	}
 
 
-    @Override
-	public JComponent createOptionsPanel() {
-        return new SingleCheckboxOptionsPanel(InspectionJSBundle.message("include.anonymous.functions.parameter"),
-                this, "m_includeAnonymousFunctions");
-    }
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new NestedFunctionJSInspectionState();
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
 
-    private class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSFunctionDeclaration(JSFunction function) {
-            super.visitJSFunctionDeclaration(function);
-            if(!m_includeAnonymousFunctions &&function.getName() == null )
-            {
-                return;
-            }
-            final JSFunction containingFunction = PsiTreeUtil.getParentOfType(function, JSFunction.class, true);
-            if(containingFunction == null)
-            {
-                return;
-            }
-            registerFunctionError(function);
-        }
+	private class Visitor extends BaseInspectionVisitor<NestedFunctionJSInspectionState>
+	{
+		@Override
+		public void visitJSFunctionDeclaration(JSFunction function)
+		{
+			super.visitJSFunctionDeclaration(function);
+			if(!myState.m_includeAnonymousFunctions && function.getName() == null)
+			{
+				return;
+			}
+			final JSFunction containingFunction = PsiTreeUtil.getParentOfType(function, JSFunction.class, true);
+			if(containingFunction == null)
+			{
+				return;
+			}
+			registerFunctionError(function);
+		}
 
-        @Override
-		public void visitJSFunctionExpression(final JSFunctionExpression node) {
-            visitJSFunctionDeclaration(node.getFunction()); 
-        }
-    }
+		@Override
+		public void visitJSFunctionExpression(final JSFunctionExpression node)
+		{
+			visitJSFunctionDeclaration(node.getFunction());
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
new file mode 100644
index 00000000..84f1ab28
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
@@ -0,0 +1,41 @@
+package com.sixrr.inspectjs.confusing;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class NestedFunctionJSInspectionState implements InspectionToolState<NestedFunctionJSInspectionState>
+{
+	public boolean m_includeAnonymousFunctions = false;
+
+	@Nullable
+	@Override
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.checkBox(InspectionJSLocalize.includeAnonymousFunctionsParameter(), () -> m_includeAnonymousFunctions, b -> m_includeAnonymousFunctions = b);
+		return builder.buildUnnamed();
+	}
+
+	@Nullable
+	@Override
+	public NestedFunctionJSInspectionState getState()
+	{
+		return this;
+	}
+
+	@Override
+	public void loadState(NestedFunctionJSInspectionState state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index e835a1be..633cafea 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -1,5 +1,6 @@
 package com.sixrr.inspectjs.confusing;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("octal.integer.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
index 45dca314..576eaf48 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
@@ -2,200 +2,240 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import com.sixrr.inspectjs.ui.SingleIntegerFieldOptionsPanel;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
-
-import javax.swing.*;
 import java.util.HashSet;
 import java.util.Set;
 
 @ExtensionImpl
-public class OverlyComplexArithmeticExpressionJSInspection extends JavaScriptInspection {
-    private static final int TERM_LIMIT = 6;
-
-    @SuppressWarnings({"PublicField"})
-    public int m_limit = TERM_LIMIT;
+public class OverlyComplexArithmeticExpressionJSInspection extends JavaScriptInspection
+{
+	@Override
+	@Nonnull
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("overly.complex.arithmetic.expression.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("overly.complex.arithmetic.expression.display.name");
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.CONFUSING_GROUP_NAME;
+	}
 
-    @Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
-    }
-
-    private int getLimit() {
-        return m_limit;
-    }
-
-    @Override
-	public JComponent createOptionsPanel() {
-        return new SingleIntegerFieldOptionsPanel(InspectionJSBundle.message("maximum.number.of.terms.parameter"),
-                this, "m_limit");
-    }
-
-    @Override
-	protected String buildErrorString(Object... args) {
-        return InspectionJSBundle.message("overly.complex.arithmetic.expression.error.string");
-    }
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
-
-    private class Visitor extends BaseInspectionVisitor {
-        private final Set<IElementType> arithmeticTokens = new HashSet<IElementType>(5);
-
-        {
-            arithmeticTokens.add(JSTokenTypes.PLUS);
-            arithmeticTokens.add(JSTokenTypes.MINUS);
-            arithmeticTokens.add(JSTokenTypes.MULT);
-            arithmeticTokens.add(JSTokenTypes.DIV);
-            arithmeticTokens.add(JSTokenTypes.PERC);
-        }
-
-        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
-            super.visitJSBinaryExpression(expression);
-            checkExpression(expression);
-        }
-
-        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
-            super.visitJSPrefixExpression(expression);
-            checkExpression(expression);
-        }
-
-        @Override public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
-            super.visitJSParenthesizedExpression(expression);
-            checkExpression(expression);
-        }
-
-        private void checkExpression(JSExpression expression) {
-            if (isParentArithmetic(expression)) {
-                return;
-            }
-            if (!isArithmetic(expression)) {
-                return;
-            }
-            if (containsStringConcatenation(expression)) {
-                return;
-            }
-            final int numTerms = countTerms(expression);
-            if (numTerms <= getLimit()) {
-                return;
-            }
-            registerError(expression);
-        }
-
-        private int countTerms(JSExpression expression) {
-            if (expression == null) {
-                return 0;
-            }
-            if (!isArithmetic(expression)) {
-                return 1;
-            }
-            if (expression instanceof JSBinaryExpression) {
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final JSExpression lhs = binaryExpression.getLOperand();
-                final JSExpression rhs = binaryExpression.getROperand();
-                return countTerms(lhs) + countTerms(rhs);
-            } else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final JSExpression operand = prefixExpression.getExpression();
-                return countTerms(operand);
-            } else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
-                return countTerms(contents);
-            }
-            return 1;
-        }
-
-        private boolean isParentArithmetic(JSExpression expression) {
-            final PsiElement parent = expression.getParent();
-            if (!(parent instanceof JSExpression)) {
-                return false;
-            }
-            return isArithmetic((JSExpression) parent);
-        }
-
-        private boolean isArithmetic(JSExpression expression) {
-            if (expression instanceof JSBinaryExpression) {
-
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final IElementType sign = binaryExpression.getOperationSign();
-                return arithmeticTokens.contains(sign);
-            } else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final IElementType sign = prefixExpression.getOperationSign();
-                return arithmeticTokens.contains(sign);
-            } else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
-                return isArithmetic(contents);
-            }
-            return false;
-        }
-
-        private boolean containsStringConcatenation(JSExpression expression) {
-            if (isStringLiteral(expression)) {
-                return true;
-            }
-            if (expression instanceof JSBinaryExpression) {
-
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final JSExpression lhs = binaryExpression.getLOperand();
-
-                if (containsStringConcatenation(lhs)) {
-                    return true;
-                }
-                final JSExpression rhs = binaryExpression.getROperand();
-                return containsStringConcatenation(rhs);
-            } else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final IElementType sign = prefixExpression.getOperationSign();
-                return arithmeticTokens.contains(sign);
-            } else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
-                return containsStringConcatenation(contents);
-            }
-            return false;
-        }
-
-        private boolean isStringLiteral(JSExpression expression) {
-            if (expression instanceof JSLiteralExpression) {
-                final JSLiteralExpression literal = (JSLiteralExpression) expression;
-                final String text = literal.getText();
-                return text.startsWith("'") || text.startsWith("\"");
-            }
-            if (expression instanceof JSReferenceExpression) {
-                final JSReferenceExpression reference = (JSReferenceExpression) expression;
-                final PsiElement referent = reference.resolve();
-                if (referent instanceof JSVariable) {
-                    final JSVariable variable = (JSVariable) referent;
-                    if (variable.isConst()) {
-                        final JSExpression initializer = variable.getInitializer();
-                        if (initializer != null) {
-                            final String text = initializer.getText();
-                            return text.startsWith("'") || text.startsWith("\"");
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-    }
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new OverlyComplexArithmeticExpressionJSInspectionState();
+	}
+
+	@RequiredReadAction
+	@Override
+	protected String buildErrorString(Object state, Object... args)
+	{
+		return InspectionJSBundle.message("overly.complex.arithmetic.expression.error.string");
+	}
+
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
+
+	private class Visitor extends BaseInspectionVisitor<OverlyComplexArithmeticExpressionJSInspectionState>
+	{
+		private final Set<IElementType> arithmeticTokens = new HashSet<>(5);
+
+		public Visitor()
+		{
+			arithmeticTokens.add(JSTokenTypes.PLUS);
+			arithmeticTokens.add(JSTokenTypes.MINUS);
+			arithmeticTokens.add(JSTokenTypes.MULT);
+			arithmeticTokens.add(JSTokenTypes.DIV);
+			arithmeticTokens.add(JSTokenTypes.PERC);
+		}
+
+		@Override
+		public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression)
+		{
+			super.visitJSBinaryExpression(expression);
+			checkExpression(expression);
+		}
+
+		@Override
+		public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression)
+		{
+			super.visitJSPrefixExpression(expression);
+			checkExpression(expression);
+		}
+
+		@Override
+		public void visitJSParenthesizedExpression(JSParenthesizedExpression expression)
+		{
+			super.visitJSParenthesizedExpression(expression);
+			checkExpression(expression);
+		}
+
+		private void checkExpression(JSExpression expression)
+		{
+			if(isParentArithmetic(expression))
+			{
+				return;
+			}
+			if(!isArithmetic(expression))
+			{
+				return;
+			}
+			if(containsStringConcatenation(expression))
+			{
+				return;
+			}
+			final int numTerms = countTerms(expression);
+			if(numTerms <= myState.m_limit)
+			{
+				return;
+			}
+			registerError(expression);
+		}
+
+		private int countTerms(JSExpression expression)
+		{
+			if(expression == null)
+			{
+				return 0;
+			}
+			if(!isArithmetic(expression))
+			{
+				return 1;
+			}
+			if(expression instanceof JSBinaryExpression)
+			{
+				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+				final JSExpression lhs = binaryExpression.getLOperand();
+				final JSExpression rhs = binaryExpression.getROperand();
+				return countTerms(lhs) + countTerms(rhs);
+			}
+			else if(expression instanceof JSPrefixExpression)
+			{
+				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+				final JSExpression operand = prefixExpression.getExpression();
+				return countTerms(operand);
+			}
+			else if(expression instanceof JSParenthesizedExpression)
+			{
+				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+				final JSExpression contents = parenthesizedExpression.getInnerExpression();
+				return countTerms(contents);
+			}
+			return 1;
+		}
+
+		private boolean isParentArithmetic(JSExpression expression)
+		{
+			final PsiElement parent = expression.getParent();
+			if(!(parent instanceof JSExpression))
+			{
+				return false;
+			}
+			return isArithmetic((JSExpression) parent);
+		}
+
+		private boolean isArithmetic(JSExpression expression)
+		{
+			if(expression instanceof JSBinaryExpression)
+			{
+
+				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+				final IElementType sign = binaryExpression.getOperationSign();
+				return arithmeticTokens.contains(sign);
+			}
+			else if(expression instanceof JSPrefixExpression)
+			{
+				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+				final IElementType sign = prefixExpression.getOperationSign();
+				return arithmeticTokens.contains(sign);
+			}
+			else if(expression instanceof JSParenthesizedExpression)
+			{
+				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+				final JSExpression contents = parenthesizedExpression.getInnerExpression();
+				return isArithmetic(contents);
+			}
+			return false;
+		}
+
+		private boolean containsStringConcatenation(JSExpression expression)
+		{
+			if(isStringLiteral(expression))
+			{
+				return true;
+			}
+			if(expression instanceof JSBinaryExpression)
+			{
+
+				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+				final JSExpression lhs = binaryExpression.getLOperand();
+
+				if(containsStringConcatenation(lhs))
+				{
+					return true;
+				}
+				final JSExpression rhs = binaryExpression.getROperand();
+				return containsStringConcatenation(rhs);
+			}
+			else if(expression instanceof JSPrefixExpression)
+			{
+				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+				final IElementType sign = prefixExpression.getOperationSign();
+				return arithmeticTokens.contains(sign);
+			}
+			else if(expression instanceof JSParenthesizedExpression)
+			{
+				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+				final JSExpression contents = parenthesizedExpression.getInnerExpression();
+				return containsStringConcatenation(contents);
+			}
+			return false;
+		}
+
+		private boolean isStringLiteral(JSExpression expression)
+		{
+			if(expression instanceof JSLiteralExpression)
+			{
+				final JSLiteralExpression literal = (JSLiteralExpression) expression;
+				final String text = literal.getText();
+				return text.startsWith("'") || text.startsWith("\"");
+			}
+			if(expression instanceof JSReferenceExpression)
+			{
+				final JSReferenceExpression reference = (JSReferenceExpression) expression;
+				final PsiElement referent = reference.resolve();
+				if(referent instanceof JSVariable)
+				{
+					final JSVariable variable = (JSVariable) referent;
+					if(variable.isConst())
+					{
+						final JSExpression initializer = variable.getInitializer();
+						if(initializer != null)
+						{
+							final String text = initializer.getText();
+							return text.startsWith("'") || text.startsWith("\"");
+						}
+					}
+				}
+			}
+			return false;
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
new file mode 100644
index 00000000..f7ed289d
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
@@ -0,0 +1,43 @@
+package com.sixrr.inspectjs.confusing;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.ui.Label;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 18/03/2023
+ */
+public class OverlyComplexArithmeticExpressionJSInspectionState implements InspectionToolState<OverlyComplexArithmeticExpressionJSInspectionState>
+{
+	public int m_limit = 6;
+
+	@Nullable
+	@Override
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.component(() -> Label.create(InspectionJSLocalize.maximumNumberOfTermsParameter()));
+		builder.intBox(() -> m_limit, value -> m_limit = value);
+		return builder.buildUnnamed();
+	}
+
+	@Nullable
+	@Override
+	public OverlyComplexArithmeticExpressionJSInspectionState getState()
+	{
+		return this;
+	}
+
+	@Override
+	public void loadState(OverlyComplexArithmeticExpressionJSInspectionState state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
index 3ab9f7ac..83ceeec9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
@@ -5,143 +5,167 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import com.sixrr.inspectjs.ui.SingleIntegerFieldOptionsPanel;
-import javax.annotation.Nonnull;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.language.psi.PsiElement;
 
-import javax.swing.*;
+import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class OverlyComplexBooleanExpressionJSInspection extends JavaScriptInspection {
-    private static final int TERM_LIMIT = 3;
-
-    /**
-     * @noinspection PublicField
-     */
-    public int m_limit = TERM_LIMIT;
+public class OverlyComplexBooleanExpressionJSInspection extends JavaScriptInspection
+{
+	@Override
+	@Nonnull
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("overly.complex.boolean.expression.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("overly.complex.boolean.expression.display.name");
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.CONFUSING_GROUP_NAME;
+	}
 
-    @Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
-    }
-
-    private int getLimit() {
-        return m_limit;
-    }
-
-    @Override
-	public JComponent createOptionsPanel() {
-        return new SingleIntegerFieldOptionsPanel(InspectionJSBundle.message("maximum.number.of.terms.parameter"),
-                this, "m_limit");
-    }
-
-    @Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
-        return true;
-    }
-
-    @Override
-	protected String buildErrorString(Object... args) {
-        return InspectionJSBundle.message("overly.complex.boolean.expression.error.string");
-    }
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
-
-    private class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
-            super.visitJSBinaryExpression(expression);
-            checkExpression(expression);
-        }
-
-        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
-            super.visitJSPrefixExpression(expression);
-            checkExpression(expression);
-        }
-
-        @Override public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
-            super.visitJSParenthesizedExpression(expression);
-            checkExpression(expression);
-        }
-
-        private void checkExpression(JSExpression expression) {
-            if (!isBoolean(expression)) {
-                return;
-            }
-            if (isParentBoolean(expression)) {
-                return;
-            }
-            final int numTerms = countTerms(expression);
-            if (numTerms <= getLimit()) {
-                return;
-            }
-            registerError(expression);
-        }
-
-        private int countTerms(JSExpression expression) {
-            if (expression == null) {
-                return 0;
-            }
-            if (!isBoolean(expression)) {
-                return 1;
-            }
-            if (expression instanceof JSBinaryExpression) {
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final JSExpression lhs = binaryExpression.getLOperand();
-                final JSExpression rhs = binaryExpression.getROperand();
-                return countTerms(lhs) + countTerms(rhs);
-            } else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final JSExpression operand = prefixExpression.getExpression();
-                return countTerms(operand);
-            } else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
-                return countTerms(contents);
-            }
-            return 1;
-        }
-
-        private boolean isParentBoolean(JSExpression expression) {
-            final PsiElement parent = expression.getParent();
-            if (!(parent instanceof JSExpression)) {
-                return false;
-            }
-            return isBoolean((JSExpression) parent);
-        }
-
-        private boolean isBoolean(JSExpression expression) {
-            if (expression instanceof JSBinaryExpression) {
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final IElementType sign = binaryExpression.getOperationSign();
-                return JSTokenTypes.ANDAND.equals(sign) ||
-                        JSTokenTypes.OROR.equals(sign);
-            } else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final IElementType sign = prefixExpression.getOperationSign();
-                return JSTokenTypes.EXCL.equals(sign);
-            } else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
-                return isBoolean(contents);
-            }
-            return false;
-        }
-    }
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new OverlyComplexBooleanExpressionJSInspectionState();
+	}
+
+	@Override
+	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
+	{
+		return true;
+	}
+
+	@RequiredReadAction
+	@Override
+	protected String buildErrorString(Object state, Object... args)
+	{
+		return InspectionJSBundle.message("overly.complex.boolean.expression.error.string");
+	}
+
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
+
+	private class Visitor extends BaseInspectionVisitor<OverlyComplexBooleanExpressionJSInspectionState>
+	{
+
+		@Override
+		public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression)
+		{
+			super.visitJSBinaryExpression(expression);
+			checkExpression(expression);
+		}
+
+		@Override
+		public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression)
+		{
+			super.visitJSPrefixExpression(expression);
+			checkExpression(expression);
+		}
+
+		@Override
+		public void visitJSParenthesizedExpression(JSParenthesizedExpression expression)
+		{
+			super.visitJSParenthesizedExpression(expression);
+			checkExpression(expression);
+		}
+
+		private void checkExpression(JSExpression expression)
+		{
+			if(!isBoolean(expression))
+			{
+				return;
+			}
+			if(isParentBoolean(expression))
+			{
+				return;
+			}
+			final int numTerms = countTerms(expression);
+			if(numTerms <= myState.m_limit)
+			{
+				return;
+			}
+			registerError(expression);
+		}
+
+		private int countTerms(JSExpression expression)
+		{
+			if(expression == null)
+			{
+				return 0;
+			}
+			if(!isBoolean(expression))
+			{
+				return 1;
+			}
+			if(expression instanceof JSBinaryExpression)
+			{
+				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+				final JSExpression lhs = binaryExpression.getLOperand();
+				final JSExpression rhs = binaryExpression.getROperand();
+				return countTerms(lhs) + countTerms(rhs);
+			}
+			else if(expression instanceof JSPrefixExpression)
+			{
+				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+				final JSExpression operand = prefixExpression.getExpression();
+				return countTerms(operand);
+			}
+			else if(expression instanceof JSParenthesizedExpression)
+			{
+				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+				final JSExpression contents = parenthesizedExpression.getInnerExpression();
+				return countTerms(contents);
+			}
+			return 1;
+		}
+
+		private boolean isParentBoolean(JSExpression expression)
+		{
+			final PsiElement parent = expression.getParent();
+			if(!(parent instanceof JSExpression))
+			{
+				return false;
+			}
+			return isBoolean((JSExpression) parent);
+		}
+
+		private boolean isBoolean(JSExpression expression)
+		{
+			if(expression instanceof JSBinaryExpression)
+			{
+				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+				final IElementType sign = binaryExpression.getOperationSign();
+				return JSTokenTypes.ANDAND.equals(sign) ||
+						JSTokenTypes.OROR.equals(sign);
+			}
+			else if(expression instanceof JSPrefixExpression)
+			{
+				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+				final IElementType sign = prefixExpression.getOperationSign();
+				return JSTokenTypes.EXCL.equals(sign);
+			}
+			else if(expression instanceof JSParenthesizedExpression)
+			{
+				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+				final JSExpression contents = parenthesizedExpression.getInnerExpression();
+				return isBoolean(contents);
+			}
+			return false;
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java
new file mode 100644
index 00000000..ab2a197e
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java
@@ -0,0 +1,43 @@
+package com.sixrr.inspectjs.confusing;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.ui.Label;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 18/03/2023
+ */
+public class OverlyComplexBooleanExpressionJSInspectionState implements InspectionToolState<OverlyComplexBooleanExpressionJSInspectionState>
+{
+	public int m_limit = 3;
+
+	@Nullable
+	@Override
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.component(() -> Label.create(InspectionJSLocalize.maximumNumberOfTermsParameter()));
+		builder.intBox(() -> m_limit, value -> m_limit = value);
+		return builder.buildUnnamed();
+	}
+
+	@Nullable
+	@Override
+	public OverlyComplexBooleanExpressionJSInspectionState getState()
+	{
+		return this;
+	}
+
+	@Override
+	public void loadState(OverlyComplexBooleanExpressionJSInspectionState state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
index d2034aed..17e964b9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
@@ -1,5 +1,6 @@
 package com.sixrr.inspectjs.confusing;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -41,8 +42,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("pointless.arithmetic.error.message", calculateReplacementExpression((JSExpression)args[0]));
     }
 
@@ -82,7 +84,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
index ad5077f8..0f42899d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
@@ -1,5 +1,6 @@
 package com.sixrr.inspectjs.confusing;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -49,8 +50,9 @@ public BaseInspectionVisitor buildVisitor() {
         return new PointlessBooleanExpressionVisitor();
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         if ( args[0]instanceof JSBinaryExpression) {
             return InspectionJSBundle.message("pointless.boolean.error.string", calculateSimplifiedBinaryExpression((JSBinaryExpression) args[0]));
         } else {
@@ -143,7 +145,7 @@ private static String calculateSimplifiedPrefixExpression(JSPrefixExpression exp
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
index 1e068049..e3e20e0d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
@@ -27,9 +28,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("void.expression.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
index 231db01f..82c1fb3a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("with.expression.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
index 009b0e4b..f204aa0b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -26,9 +27,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("break.statement.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
index 3eceb281..2372b456 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("break.statement.with.label.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
index c1ef37d5..c282ed2f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -28,13 +29,14 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("conditional.expression.with.identical.branches.error.string");
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
index c65e021b..a5e039f8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.project.Project;
 import consulo.language.psi.PsiElement;
@@ -38,9 +39,10 @@ public BaseInspectionVisitor buildVisitor() {
         return new ConstantConditionalExpressionVisitor();
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
+    public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("constant.conditional.expression.error.string");
     }
 
@@ -59,7 +61,7 @@ static String calculateReplacementExpression(
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new ConstantConditionalFix();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
index 3a36452c..8ebd7a76 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
@@ -5,6 +5,7 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -34,9 +35,10 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message(
                 "constant.if.statement.problem.descriptor");
     }
@@ -47,7 +49,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new ConstantIfStatementFix();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
index a1c81f27..af7fa0b3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("continue.statement.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
index 042d1af0..2d464232 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("continue.statement.with.label.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index eb14af76..58786983 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -25,9 +26,10 @@ public String getDisplayName() {
         return InspectionJSBundle.message("default.not.last.case.in.switch.display.name");
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("default.branch.not.last.case.in.switch.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
index 075a8cb3..fd4bced6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
@@ -31,8 +32,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("duplicate.condition.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
index 9948f154..eb486af4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
@@ -34,9 +35,10 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("fall.through.in.switch.statement.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
index a2c9c624..8b3eaf5f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
@@ -1,136 +1,152 @@
 package com.sixrr.inspectjs.control;
 
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
-import consulo.project.Project;
+import com.sixrr.inspectjs.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-import com.sixrr.inspectjs.*;
-import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
+import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 
-import javax.swing.*;
+import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection {
-
-    /**
-     * @noinspection PublicField
-     */
-    public boolean m_ignoreLoopsWithoutConditions = false;
-
-    @Override
+public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection
+{
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("for.loop.replaceable.by.while.display.name");
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("for.loop.replaceable.by.while.display.name");
+	}
 
-    }
-    @Override
+	@Override
 	@Nonnull
-    public String getID() {
-        return "ForLoopReplaceableByWhile";
-    }
+	public String getID()
+	{
+		return "ForLoopReplaceableByWhile";
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+	}
 
-    @Override
+	@RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
-        return InspectionJSBundle.message(
-                "for.loop.replaceable.by.while.problem.descriptor");
-    }
-
-    @Override
-	public JComponent createOptionsPanel() {
-        return new SingleCheckboxOptionsPanel(InspectionJSBundle.message(
-                "for.loop.replaceable.by.while.ignore.option"),
-                this, "m_ignoreLoopsWithoutConditions");
-    }
-
-    @Override
-	public InspectionJSFix buildFix(PsiElement location) {
-        return new ReplaceForByWhileFix();
-    }
-
-    private static class ReplaceForByWhileFix extends InspectionJSFix {
+	protected String buildErrorString(Object state, Object... args)
+	{
+		return InspectionJSBundle.message(
+				"for.loop.replaceable.by.while.problem.descriptor");
+	}
 
-        @Override
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new ForLoopReplaceableByWhileJSInspectionState();
+	}
+
+	@Override
+	public InspectionJSFix buildFix(PsiElement location, Object state)
+	{
+		return new ReplaceForByWhileFix();
+	}
+
+	private static class ReplaceForByWhileFix extends InspectionJSFix
+	{
+
+		@Override
 		@Nonnull
-        public String getName() {
-            return InspectionJSBundle.message(
-                    "for.loop.replaceable.by.while.replace.quickfix");
-        }
-
-        @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
-            final PsiElement forKeywordElement = descriptor.getPsiElement();
-            final JSForStatement forStatement =
-                    (JSForStatement)forKeywordElement.getParent();
-            assert forStatement != null;
-            final JSExpression condition = forStatement.getCondition();
-            final JSStatement body = forStatement.getBody();
-            final String bodyText;
-            if (body == null) {
-                bodyText = "";
-            } else {
-                bodyText = body.getText();
-            }
-            @NonNls final String whileStatement;
-            if (condition == null) {
-                whileStatement = "while(true)" + bodyText;
-            }
-            else {
-                whileStatement = "while(" + condition.getText() + ')' +
-                        bodyText;
-            }
-            replaceStatement(forStatement, whileStatement);
-        }
-    }
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new ForLoopReplaceableByWhileVisitor();
-    }
-
-    private class ForLoopReplaceableByWhileVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
-            super.visitJSForStatement(statement);
-            final JSVarStatement varStatement = statement.getVarDeclaration();
-            if(varStatement!=null)
-            {
-                return;
-            }
-            final JSExpression initialization = statement.getInitialization();
-            if (initialization != null ) {
-                return;
-            }
-            final JSExpression update = statement.getUpdate();
-            if (update != null ) {
-                return;
-            }
-            if (m_ignoreLoopsWithoutConditions) {
-                final JSExpression condition = statement.getCondition();
-                if (condition == null) {
-                    return;
-                }
-                final String conditionText = condition.getText();
-                if ("true".equals(conditionText)) {
-                    return;
-                }
-            }
-            registerStatementError(statement);
-        }
-    }
+		public String getName()
+		{
+			return InspectionJSBundle.message(
+					"for.loop.replaceable.by.while.replace.quickfix");
+		}
+
+		@Override
+		public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException
+		{
+			final PsiElement forKeywordElement = descriptor.getPsiElement();
+			final JSForStatement forStatement =
+					(JSForStatement) forKeywordElement.getParent();
+			assert forStatement != null;
+			final JSExpression condition = forStatement.getCondition();
+			final JSStatement body = forStatement.getBody();
+			final String bodyText;
+			if(body == null)
+			{
+				bodyText = "";
+			}
+			else
+			{
+				bodyText = body.getText();
+			}
+			@NonNls final String whileStatement;
+			if(condition == null)
+			{
+				whileStatement = "while(true)" + bodyText;
+			}
+			else
+			{
+				whileStatement = "while(" + condition.getText() + ')' +
+						bodyText;
+			}
+			replaceStatement(forStatement, whileStatement);
+		}
+	}
+
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new ForLoopReplaceableByWhileVisitor();
+	}
+
+	private class ForLoopReplaceableByWhileVisitor extends BaseInspectionVisitor<ForLoopReplaceableByWhileJSInspectionState>
+	{
+
+		@Override
+		public void visitJSForStatement(@Nonnull JSForStatement statement)
+		{
+			super.visitJSForStatement(statement);
+			final JSVarStatement varStatement = statement.getVarDeclaration();
+			if(varStatement != null)
+			{
+				return;
+			}
+			final JSExpression initialization = statement.getInitialization();
+			if(initialization != null)
+			{
+				return;
+			}
+			final JSExpression update = statement.getUpdate();
+			if(update != null)
+			{
+				return;
+			}
+			if(myState.m_ignoreLoopsWithoutConditions)
+			{
+				final JSExpression condition = statement.getCondition();
+				if(condition == null)
+				{
+					return;
+				}
+				final String conditionText = condition.getText();
+				if("true".equals(conditionText))
+				{
+					return;
+				}
+			}
+			registerStatementError(statement);
+		}
+	}
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java
new file mode 100644
index 00000000..97b399c2
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java
@@ -0,0 +1,41 @@
+package com.sixrr.inspectjs.control;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class ForLoopReplaceableByWhileJSInspectionState implements InspectionToolState<ForLoopReplaceableByWhileJSInspectionState>
+{
+	public boolean m_ignoreLoopsWithoutConditions = false;
+
+	@Nullable
+	@Override
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.checkBox(InspectionJSLocalize.forLoopReplaceableByWhileIgnoreOption(), () -> m_ignoreLoopsWithoutConditions, b -> m_ignoreLoopsWithoutConditions = b);
+		return builder.buildUnnamed();
+	}
+
+	@Nullable
+	@Override
+	public ForLoopReplaceableByWhileJSInspectionState getState()
+	{
+		return this;
+	}
+
+	@Override
+	public void loadState(ForLoopReplaceableByWhileJSInspectionState state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
index 968c3c55..da35a04f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
@@ -24,9 +25,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
+    public String buildErrorString(Object state, Object... args) {
         final boolean condition = (Boolean) args[0];
         final boolean update = (Boolean) args[1];
         if (condition && update) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
index 0cd4b55d..367f8e91 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -28,13 +29,14 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("ref.statement.with.identical.branches.error.string");
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
index 4d909806..9fded7b8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
@@ -2,88 +2,93 @@
 
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import com.sixrr.inspectjs.ui.SingleIntegerFieldOptionsPanel;
-import javax.annotation.Nonnull;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.language.psi.PsiElement;
 
-import javax.swing.*;
+import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class IfStatementWithTooManyBranchesJSInspection extends JavaScriptInspection {
-    private static final int DEFAULT_BRANCH_LIMIT = 3;
-
-    /**
-     * @noinspection PublicField
-     */
-    public int m_limit = DEFAULT_BRANCH_LIMIT;  //this is public for the DefaultJDOMExternalizer thingy
-
-    @Override
+public class IfStatementWithTooManyBranchesJSInspection extends JavaScriptInspection
+{
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("if.statement.with.too.many.branches.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("if.statement.with.too.many.branches.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+	}
 
-    private int getLimit() {
-        return m_limit;
-    }
-
-    @Override
-	public JComponent createOptionsPanel() {
-        return new SingleIntegerFieldOptionsPanel(InspectionJSBundle.message("maximum.number.of.branches.parameter"),
-                this, "m_limit");
-    }
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new IfStatementWithTooManyBranchesJSInspectionState();
+	}
 
-    @Override
-	protected String buildErrorString(Object... args) {
-        final JSIfStatement statement = (JSIfStatement) args[0];
-        final int branches = calculateNumBranches(statement);
-        return InspectionJSBundle.message("if.statement.with.too.many.branches.error.string", branches);
-    }
+	@RequiredReadAction
+	@Override
+	protected String buildErrorString(Object state, Object... args)
+	{
+		final JSIfStatement statement = (JSIfStatement) args[0];
+		final int branches = calculateNumBranches(statement);
+		return InspectionJSBundle.message("if.statement.with.too.many.branches.error.string", branches);
+	}
 
-    private static int calculateNumBranches(JSIfStatement statement) {
-        final JSStatement branch = statement.getElse();
-        if (branch == null) {
-            return 1;
-        }
-        if (!(branch instanceof JSIfStatement)) {
-            return 2;
-        }
-        return 1 + calculateNumBranches((JSIfStatement) branch);
-    }
+	private static int calculateNumBranches(JSIfStatement statement)
+	{
+		final JSStatement branch = statement.getElse();
+		if(branch == null)
+		{
+			return 1;
+		}
+		if(!(branch instanceof JSIfStatement))
+		{
+			return 2;
+		}
+		return 1 + calculateNumBranches((JSIfStatement) branch);
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
 
-    private class Visitor extends BaseInspectionVisitor {
+	private class Visitor extends BaseInspectionVisitor<IfStatementWithTooManyBranchesJSInspectionState>
+	{
 
-        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
-            super.visitJSIfStatement(statement);
-            final PsiElement parent = statement.getParent();
-            if (parent instanceof JSIfStatement) {
-                final JSIfStatement parentStatement = (JSIfStatement) parent;
-                final JSStatement elseBranch = parentStatement.getElse();
-                if (statement.equals(elseBranch)) {
-                    return;
-                }
-            }
-            final int branches = calculateNumBranches(statement);
-            if (branches <= getLimit()) {
-                return;
-            }
-            registerStatementError(statement, statement);
-        }
-    }
+		@Override
+		public void visitJSIfStatement(@Nonnull JSIfStatement statement)
+		{
+			super.visitJSIfStatement(statement);
+			final PsiElement parent = statement.getParent();
+			if(parent instanceof JSIfStatement)
+			{
+				final JSIfStatement parentStatement = (JSIfStatement) parent;
+				final JSStatement elseBranch = parentStatement.getElse();
+				if(statement.equals(elseBranch))
+				{
+					return;
+				}
+			}
+			final int branches = calculateNumBranches(statement);
+			if(branches <= myState.m_limit)
+			{
+				return;
+			}
+			registerStatementError(statement, statement);
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java
new file mode 100644
index 00000000..fa1a5c11
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java
@@ -0,0 +1,44 @@
+package com.sixrr.inspectjs.control;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.ui.IntBox;
+import consulo.ui.Label;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class IfStatementWithTooManyBranchesJSInspectionState implements InspectionToolState<IfStatementWithTooManyBranchesJSInspectionState>
+{
+	public int m_limit = 3;
+
+	@Nullable
+	@Override
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.component(() -> Label.create(InspectionJSLocalize.maximumNumberOfBranchesParameter()));
+		builder.valueComponent(IntBox::create, () -> m_limit, it -> m_limit = it);
+		return builder.buildUnnamed();
+	}
+
+	@Nullable
+	@Override
+	public IfStatementWithTooManyBranchesJSInspectionState getState()
+	{
+		return this;
+	}
+
+	@Override
+	public void loadState(IfStatementWithTooManyBranchesJSInspectionState state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
index b90f18a0..daffe18e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import org.jetbrains.annotations.NonNls;
 import javax.annotation.Nonnull;
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("statement.label.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
index a7196334..5f3f4aad 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -31,8 +32,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("loop.statement.that.doesnt.loop.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
index 57f0d47d..e5987017 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
 
@@ -26,9 +27,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("nested.switch.statement.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
index 20383a89..f6adddc7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -26,9 +27,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("switch.statement.with.no.default.branch.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
index aa902a93..453fd25a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -27,9 +28,10 @@ public String getDisplayName() {
                 "tail.recursion.display.name");
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message(
                 "tail.recursion.problem.descriptor");
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
index 8a572a5f..048a447e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
@@ -5,6 +5,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -47,8 +48,9 @@ public BaseInspectionVisitor buildVisitor() {
         return new UnnecessaryConditionalExpressionVisitor();
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         final JSConditionalExpression exp = (JSConditionalExpression) args[0];
         return InspectionJSBundle.message("trivial.conditional.error.string", exp.getText(), calculateReplacementExpression(exp));
     }
@@ -66,7 +68,7 @@ private static String calculateReplacementExpression(JSConditionalExpression exp
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
index e55ce9e5..b22e97bf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ConditionalUtils;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -51,13 +52,14 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("trivial.if.error.string");
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
index b8c385c0..9596cd6b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
@@ -3,6 +3,7 @@
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -32,8 +33,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("unnecessary.continue.error.string");
     }
 
@@ -43,7 +45,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
index fe4e5de4..b378d41d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
@@ -1,5 +1,6 @@
 package com.sixrr.inspectjs.control;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSBreakStatement;
@@ -38,15 +39,16 @@ public BaseInspectionVisitor buildVisitor() {
         return new UnusedLabelVisitor();
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("unnecessary.label.error.string");
 
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new UnusedLabelFix();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
index e8aa60c4..78d60c38 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
@@ -5,6 +5,7 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -38,7 +39,7 @@ public boolean isEnabledByDefault() {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
@@ -58,9 +59,10 @@ public void doFix(Project project, ProblemDescriptor descriptor)
             replaceStatement(breakStatement, "break;");
         }
     }
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("unnecessary.label.on.break.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
index f00bc386..1f4e8db8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSLoopStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -36,9 +37,10 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("unnecessary.label.on.continue.error.string");
     }
 
@@ -48,7 +50,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
index 8e9fc6bb..e2587272 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
@@ -3,6 +3,7 @@
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -39,8 +40,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("unnecessary.return.error.string");
     }
 
@@ -50,7 +52,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index cc5f069b..5fe42579 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
@@ -34,9 +35,10 @@ public String getGroupDisplayName()
 		return JSGroupNames.DATA_FLOW_ISSUES;
 	}
 
+	@RequiredReadAction
 	@Override
 	@Nonnull
-	public String buildErrorString(Object... args)
+	public String buildErrorString(Object state, Object... args)
 	{
 		return InspectionJSBundle.message(
 				"reuse.of.local.variable.problem.descriptor");
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index 54129c1c..daae2e19 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -1,339 +1,401 @@
 package com.sixrr.inspectjs.dataflow;
 
 import com.intellij.lang.javascript.psi.*;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiReference;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
 
 import javax.annotation.Nonnull;
 
-import javax.swing.*;
-
 @ExtensionImpl
-public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection {
-
-    /**
-     * @noinspection PublicField
-     */
-    public boolean m_ignoreImmediatelyReturnedVariables = false;
-
-    /**
-     * @noinspection PublicField
-     */
-    public boolean m_ignoreAnnotatedVariables = false;
-
-    @Override
+public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection
+{
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "redundant.local.variable.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message(
+				"redundant.local.variable.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.DATA_FLOW_ISSUES;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.DATA_FLOW_ISSUES;
+	}
 
-    @Override
-	public JComponent createOptionsPanel() {
-
-        return new SingleCheckboxOptionsPanel(InspectionJSBundle.message(
-                "redundant.local.variable.ignore.option"), this, "m_ignoreImmediatelyReturnedVariables");
-    }
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new UnnecessaryLocalVariableJSInspectionState();
+	}
 
-    @Override
-	public boolean isEnabledByDefault() {
-        return true;
-    }
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return true;
+	}
 
-    @Override
+	@RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
-        return InspectionJSBundle.message(
-                "unnecessary.local.variable.problem.descriptor");
-    }
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new UnnecessaryLocalVariableVisitor();
-    }
+	public String buildErrorString(Object state, Object... args)
+	{
+		return InspectionJSBundle.message(
+				"unnecessary.local.variable.problem.descriptor");
+	}
 
-    @Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
-        return true;
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new UnnecessaryLocalVariableVisitor();
+	}
 
-    private class UnnecessaryLocalVariableVisitor
-            extends BaseInspectionVisitor {
+	@Override
+	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
+	{
+		return true;
+	}
 
-        @Override public void visitJSVarStatement(@Nonnull JSVarStatement varStatement) {
-             super.visitJSVarStatement(varStatement);
-            final JSVariable[] variables = varStatement.getVariables();
-            for (JSVariable variable : variables) {
+	private class UnnecessaryLocalVariableVisitor extends BaseInspectionVisitor<UnnecessaryLocalVariableJSInspectionState>
+	{
+		@Override
+		public void visitJSVarStatement(@Nonnull JSVarStatement varStatement)
+		{
+			super.visitJSVarStatement(varStatement);
+			final JSVariable[] variables = varStatement.getVariables();
+			for(JSVariable variable : variables)
+			{
 
-                if (isCopyVariable(variable)) {
-                    registerVariableError(variable);
-                } else if (!m_ignoreImmediatelyReturnedVariables &&
-                        isImmediatelyReturned(variable)) {
-                    registerVariableError(variable);
-                } else if (!m_ignoreImmediatelyReturnedVariables &&
-                        isImmediatelyThrown(variable)) {
-                    registerVariableError(variable);
-                } else if (isImmediatelyAssigned(variable)) {
-                    registerVariableError(variable);
-                } else if (isImmediatelyAssignedAsDeclaration(variable)) {
-                    registerVariableError(variable);
-                }
-            }
-        }
+				if(isCopyVariable(variable))
+				{
+					registerVariableError(variable);
+				}
+				else if(!myState.m_ignoreImmediatelyReturnedVariables && isImmediatelyReturned(variable))
+				{
+					registerVariableError(variable);
+				}
+				else if(!myState.m_ignoreImmediatelyReturnedVariables && isImmediatelyThrown(variable))
+				{
+					registerVariableError(variable);
+				}
+				else if(isImmediatelyAssigned(variable))
+				{
+					registerVariableError(variable);
+				}
+				else if(isImmediatelyAssignedAsDeclaration(variable))
+				{
+					registerVariableError(variable);
+				}
+			}
+		}
 
-        private boolean isCopyVariable(JSVariable variable) {
-            final JSExpression initializer = variable.getInitializer();
-            if (initializer == null) {
-                return false;
-            }
-            if (!(initializer instanceof JSReferenceExpression)) {
-                return false;
-            }
-            final JSReferenceExpression reference =
-                    (JSReferenceExpression) initializer;
-            final PsiElement referent = reference.resolve();
-            if (referent == null) {
-                return false;
-            }
-            if (!(referent instanceof JSVariable)) {
-                return false;
-            }
-            final JSBlockStatement containingScope =
-                    PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-            if (containingScope == null || isClassMember(referent)) {
-                return false;
-            }
-            final VariableAssignedVisitor visitor =
-                    new VariableAssignedVisitor(variable);
-            containingScope.accept(visitor);
-            if (visitor.isAssigned()) {
-                return false;
-            }
-            final JSVariable initialization = (JSVariable) referent;
-            final VariableAssignedVisitor visitor2 =
-                    new VariableAssignedVisitor(initialization);
-            containingScope.accept(visitor2);
-            if (visitor2.isAssigned()) return false;
+		private boolean isCopyVariable(JSVariable variable)
+		{
+			final JSExpression initializer = variable.getInitializer();
+			if(initializer == null)
+			{
+				return false;
+			}
+			if(!(initializer instanceof JSReferenceExpression))
+			{
+				return false;
+			}
+			final JSReferenceExpression reference =
+					(JSReferenceExpression) initializer;
+			final PsiElement referent = reference.resolve();
+			if(referent == null)
+			{
+				return false;
+			}
+			if(!(referent instanceof JSVariable))
+			{
+				return false;
+			}
+			final JSBlockStatement containingScope =
+					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			if(containingScope == null || isClassMember(referent))
+			{
+				return false;
+			}
+			final VariableAssignedVisitor visitor =
+					new VariableAssignedVisitor(variable);
+			containingScope.accept(visitor);
+			if(visitor.isAssigned())
+			{
+				return false;
+			}
+			final JSVariable initialization = (JSVariable) referent;
+			final VariableAssignedVisitor visitor2 =
+					new VariableAssignedVisitor(initialization);
+			containingScope.accept(visitor2);
+			if(visitor2.isAssigned())
+			{
+				return false;
+			}
 
-            return !variableIsUsedInInnerFunction(containingScope, variable);
-        }
+			return !variableIsUsedInInnerFunction(containingScope, variable);
+		}
 
-      private boolean isClassMember(final PsiElement referent) {
-        final PsiElement grandParent = referent.getParent().getParent();
-        return grandParent instanceof JSClass || (grandParent instanceof JSFile && grandParent.getContext() != null);
-      }
+		private boolean isClassMember(final PsiElement referent)
+		{
+			final PsiElement grandParent = referent.getParent().getParent();
+			return grandParent instanceof JSClass || (grandParent instanceof JSFile && grandParent.getContext() != null);
+		}
 
-      private boolean isImmediatelyReturned(JSVariable variable) {
-            final JSBlockStatement containingScope =
-                    PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-            if (containingScope == null) {
-                return false;
-            }
-            final JSVarStatement declarationStatement =
-                    PsiTreeUtil.getParentOfType(variable,
-                            JSVarStatement.class);
-            if (declarationStatement == null) {
-                return false;
-            }
-            JSStatement nextStatement = null;
-            final JSStatement[] statements = containingScope.getStatements();
-            for (int i = 0; i < statements.length - 1; i++) {
-                if (statements[i].equals(declarationStatement)) {
-                    nextStatement = statements[i + 1];
-                }
-            }
-            if (nextStatement == null) {
-                return false;
-            }
-            if (!(nextStatement instanceof JSReturnStatement)) {
-                return false;
-            }
-            final JSReturnStatement returnStatement =
-                    (JSReturnStatement) nextStatement;
-            final JSExpression returnValue = returnStatement.getExpression();
-            if (returnValue == null) {
-                return false;
-            }
-            if (!(returnValue instanceof JSReferenceExpression)) {
-                return false;
-            }
-            final PsiElement referent = ((PsiReference) returnValue).resolve();
-            return !(referent == null || !referent.equals(variable));
-        }
+		private boolean isImmediatelyReturned(JSVariable variable)
+		{
+			final JSBlockStatement containingScope =
+					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			if(containingScope == null)
+			{
+				return false;
+			}
+			final JSVarStatement declarationStatement =
+					PsiTreeUtil.getParentOfType(variable,
+							JSVarStatement.class);
+			if(declarationStatement == null)
+			{
+				return false;
+			}
+			JSStatement nextStatement = null;
+			final JSStatement[] statements = containingScope.getStatements();
+			for(int i = 0; i < statements.length - 1; i++)
+			{
+				if(statements[i].equals(declarationStatement))
+				{
+					nextStatement = statements[i + 1];
+				}
+			}
+			if(nextStatement == null)
+			{
+				return false;
+			}
+			if(!(nextStatement instanceof JSReturnStatement))
+			{
+				return false;
+			}
+			final JSReturnStatement returnStatement =
+					(JSReturnStatement) nextStatement;
+			final JSExpression returnValue = returnStatement.getExpression();
+			if(returnValue == null)
+			{
+				return false;
+			}
+			if(!(returnValue instanceof JSReferenceExpression))
+			{
+				return false;
+			}
+			final PsiElement referent = ((PsiReference) returnValue).resolve();
+			return !(referent == null || !referent.equals(variable));
+		}
 
-        private boolean isImmediatelyThrown(JSVariable variable) {
-            final JSBlockStatement containingScope =
-                    PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-            if (containingScope == null) {
-                return false;
-            }
-            final JSVarStatement declarationStatement =
-                    PsiTreeUtil.getParentOfType(variable,
-                            JSVarStatement.class);
-            if (declarationStatement == null) {
-                return false;
-            }
-            JSStatement nextStatement = null;
-            final JSStatement[] statements = containingScope.getStatements();
-            for (int i = 0; i < statements.length - 1; i++) {
-                if (statements[i].equals(declarationStatement)) {
-                    nextStatement = statements[i + 1];
-                }
-            }
-            if (nextStatement == null) {
-                return false;
-            }
-            if (!(nextStatement instanceof JSThrowStatement)) {
-                return false;
-            }
-            final JSThrowStatement throwStatement =
-                    (JSThrowStatement) nextStatement;
-            final JSExpression returnValue = throwStatement.getExpression();
-            if (returnValue == null) {
-                return false;
-            }
-            if (!(returnValue instanceof JSReferenceExpression)) {
-                return false;
-            }
-            final PsiElement referent = ((PsiReference) returnValue).resolve();
-            return !(referent == null || !referent.equals(variable));
-        }
+		private boolean isImmediatelyThrown(JSVariable variable)
+		{
+			final JSBlockStatement containingScope =
+					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			if(containingScope == null)
+			{
+				return false;
+			}
+			final JSVarStatement declarationStatement =
+					PsiTreeUtil.getParentOfType(variable,
+							JSVarStatement.class);
+			if(declarationStatement == null)
+			{
+				return false;
+			}
+			JSStatement nextStatement = null;
+			final JSStatement[] statements = containingScope.getStatements();
+			for(int i = 0; i < statements.length - 1; i++)
+			{
+				if(statements[i].equals(declarationStatement))
+				{
+					nextStatement = statements[i + 1];
+				}
+			}
+			if(nextStatement == null)
+			{
+				return false;
+			}
+			if(!(nextStatement instanceof JSThrowStatement))
+			{
+				return false;
+			}
+			final JSThrowStatement throwStatement =
+					(JSThrowStatement) nextStatement;
+			final JSExpression returnValue = throwStatement.getExpression();
+			if(returnValue == null)
+			{
+				return false;
+			}
+			if(!(returnValue instanceof JSReferenceExpression))
+			{
+				return false;
+			}
+			final PsiElement referent = ((PsiReference) returnValue).resolve();
+			return !(referent == null || !referent.equals(variable));
+		}
 
-        private boolean isImmediatelyAssigned(JSVariable variable) {
-            final JSBlockStatement containingScope =
-                    PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-            if (containingScope == null) {
-                return false;
-            }
-            final JSVarStatement declarationStatement =
-                    PsiTreeUtil.getParentOfType(variable,
-                            JSVarStatement.class);
-            if (declarationStatement == null) {
-                return false;
-            }
-            JSStatement nextStatement = null;
-            int followingStatementNumber = 0;
-            final JSStatement[] statements = containingScope.getStatements();
-            for (int i = 0; i < statements.length - 1; i++) {
-                if (statements[i].equals(declarationStatement)) {
-                    nextStatement = statements[i + 1];
-                    followingStatementNumber = i + 2;
-                }
-            }
-            if (nextStatement == null) {
-                return false;
-            }
-            if (!(nextStatement instanceof JSExpressionStatement)) {
-                return false;
-            }
-            final JSExpressionStatement expressionStatement =
-                    (JSExpressionStatement) nextStatement;
-            final JSExpression expression =
-                    expressionStatement.getExpression();
-            if (!(expression instanceof JSAssignmentExpression)) {
-                return false;
-            }
-            final JSAssignmentExpression assignmentExpression =
-                    (JSAssignmentExpression) expression;
-            final JSExpression rhs = assignmentExpression.getROperand();
-            if (rhs == null) {
-                return false;
-            }
-            if (!(rhs instanceof JSReferenceExpression)) {
-                return false;
-            }
-            final JSReferenceExpression reference =
-                    (JSReferenceExpression) rhs;
-            final PsiElement referent = reference.resolve();
-            if (referent == null || !referent.equals(variable)) {
-                return false;
-            }
-            final JSExpression lhs = assignmentExpression.getLOperand();
-            if (VariableAccessUtils.variableIsUsed(variable, lhs)) {
-                return false;
-            }
-            for (int i = followingStatementNumber; i < statements.length; i++) {
-                if (VariableAccessUtils.variableIsUsed(variable,
-                        statements[i])) {
-                    return false;
-                }
-            }
-            return true;
-        }
+		private boolean isImmediatelyAssigned(JSVariable variable)
+		{
+			final JSBlockStatement containingScope =
+					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			if(containingScope == null)
+			{
+				return false;
+			}
+			final JSVarStatement declarationStatement =
+					PsiTreeUtil.getParentOfType(variable,
+							JSVarStatement.class);
+			if(declarationStatement == null)
+			{
+				return false;
+			}
+			JSStatement nextStatement = null;
+			int followingStatementNumber = 0;
+			final JSStatement[] statements = containingScope.getStatements();
+			for(int i = 0; i < statements.length - 1; i++)
+			{
+				if(statements[i].equals(declarationStatement))
+				{
+					nextStatement = statements[i + 1];
+					followingStatementNumber = i + 2;
+				}
+			}
+			if(nextStatement == null)
+			{
+				return false;
+			}
+			if(!(nextStatement instanceof JSExpressionStatement))
+			{
+				return false;
+			}
+			final JSExpressionStatement expressionStatement =
+					(JSExpressionStatement) nextStatement;
+			final JSExpression expression =
+					expressionStatement.getExpression();
+			if(!(expression instanceof JSAssignmentExpression))
+			{
+				return false;
+			}
+			final JSAssignmentExpression assignmentExpression =
+					(JSAssignmentExpression) expression;
+			final JSExpression rhs = assignmentExpression.getROperand();
+			if(rhs == null)
+			{
+				return false;
+			}
+			if(!(rhs instanceof JSReferenceExpression))
+			{
+				return false;
+			}
+			final JSReferenceExpression reference =
+					(JSReferenceExpression) rhs;
+			final PsiElement referent = reference.resolve();
+			if(referent == null || !referent.equals(variable))
+			{
+				return false;
+			}
+			final JSExpression lhs = assignmentExpression.getLOperand();
+			if(VariableAccessUtils.variableIsUsed(variable, lhs))
+			{
+				return false;
+			}
+			for(int i = followingStatementNumber; i < statements.length; i++)
+			{
+				if(VariableAccessUtils.variableIsUsed(variable,
+						statements[i]))
+				{
+					return false;
+				}
+			}
+			return true;
+		}
 
-        private boolean isImmediatelyAssignedAsDeclaration(
-                JSVariable variable) {
-            final JSBlockStatement containingScope =
-                    PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-            if (containingScope == null) {
-                return false;
-            }
-            final JSVarStatement declarationStatement =
-                    PsiTreeUtil.getParentOfType(variable,
-                            JSVarStatement.class);
-            if (declarationStatement == null) {
-                return false;
-            }
-            JSStatement nextStatement = null;
-            int followingStatementNumber = 0;
-            final JSStatement[] statements = containingScope.getStatements();
-            for (int i = 0; i < statements.length - 1; i++) {
-                if (statements[i].equals(declarationStatement)) {
-                    nextStatement = statements[i + 1];
-                    followingStatementNumber = i + 2;
-                }
-            }
-            if (nextStatement == null) {
-                return false;
-            }
-            if (!(nextStatement instanceof JSVarStatement)) {
-                return false;
-            }
-            final JSVarStatement declaration =
-                    (JSVarStatement) nextStatement;
-            final JSVariable[] declarations = declaration.getVariables();
-            if (declarations.length != 1) {
-                return false;
-            }
-            final JSExpression rhs =
-                    declarations[0].getInitializer();
-            if (rhs == null) {
-                return false;
-            }
-            if (!(rhs instanceof JSReferenceExpression)) {
-                return false;
-            }
-            final PsiElement referent = ((PsiReference) rhs).resolve();
-            if (referent == null || !referent.equals(variable)) {
-                return false;
-            }
-            for (int i = followingStatementNumber; i < statements.length; i++) {
-                if (VariableAccessUtils.variableIsUsed(variable,
-                        statements[i])) {
-                    return false;
-                }
-            }
-            return true;
-        }
+		private boolean isImmediatelyAssignedAsDeclaration(
+				JSVariable variable)
+		{
+			final JSBlockStatement containingScope =
+					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			if(containingScope == null)
+			{
+				return false;
+			}
+			final JSVarStatement declarationStatement =
+					PsiTreeUtil.getParentOfType(variable,
+							JSVarStatement.class);
+			if(declarationStatement == null)
+			{
+				return false;
+			}
+			JSStatement nextStatement = null;
+			int followingStatementNumber = 0;
+			final JSStatement[] statements = containingScope.getStatements();
+			for(int i = 0; i < statements.length - 1; i++)
+			{
+				if(statements[i].equals(declarationStatement))
+				{
+					nextStatement = statements[i + 1];
+					followingStatementNumber = i + 2;
+				}
+			}
+			if(nextStatement == null)
+			{
+				return false;
+			}
+			if(!(nextStatement instanceof JSVarStatement))
+			{
+				return false;
+			}
+			final JSVarStatement declaration =
+					(JSVarStatement) nextStatement;
+			final JSVariable[] declarations = declaration.getVariables();
+			if(declarations.length != 1)
+			{
+				return false;
+			}
+			final JSExpression rhs =
+					declarations[0].getInitializer();
+			if(rhs == null)
+			{
+				return false;
+			}
+			if(!(rhs instanceof JSReferenceExpression))
+			{
+				return false;
+			}
+			final PsiElement referent = ((PsiReference) rhs).resolve();
+			if(referent == null || !referent.equals(variable))
+			{
+				return false;
+			}
+			for(int i = followingStatementNumber; i < statements.length; i++)
+			{
+				if(VariableAccessUtils.variableIsUsed(variable,
+						statements[i]))
+				{
+					return false;
+				}
+			}
+			return true;
+		}
 
-        private boolean variableIsUsedInInnerFunction(JSBlockStatement block,
-                                                   JSVariable variable) {
-            final VariableUsedInInnerFunctionVisitor visitor = new VariableUsedInInnerFunctionVisitor(variable);
-            block.accept(visitor);
-            return visitor.isUsedInInnerFunction();
-        }
-    }
+		private boolean variableIsUsedInInnerFunction(JSBlockStatement block,
+													  JSVariable variable)
+		{
+			final VariableUsedInInnerFunctionVisitor visitor = new VariableUsedInInnerFunctionVisitor(variable);
+			block.accept(visitor);
+			return visitor.isUsedInInnerFunction();
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
new file mode 100644
index 00000000..4cae1dac
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
@@ -0,0 +1,41 @@
+package com.sixrr.inspectjs.dataflow;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class UnnecessaryLocalVariableJSInspectionState implements InspectionToolState<UnnecessaryLocalVariableJSInspectionState>
+{
+	public boolean m_ignoreImmediatelyReturnedVariables = false;
+
+	@Nullable
+	@Override
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.checkBox(InspectionJSLocalize.redundantLocalVariableIgnoreOption(), () -> m_ignoreImmediatelyReturnedVariables, b -> m_ignoreImmediatelyReturnedVariables = b);
+		return builder.buildUnnamed();
+	}
+
+	@Nullable
+	@Override
+	public UnnecessaryLocalVariableJSInspectionState getState()
+	{
+		return this;
+	}
+
+	@Override
+	public void loadState(UnnecessaryLocalVariableJSInspectionState state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index 02797f91..cc8d1b8b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import org.jetbrains.annotations.NonNls;
 
@@ -28,9 +29,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("document.write.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index 93a8791f..48c91a4f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -25,9 +26,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("inner.html.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index 46208253..51426728 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -26,9 +27,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("platform.detection.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
index e12dcd88..9edfe6cf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -26,9 +27,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("xhtml.incompatabilities.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
index c6343b00..44e07ffe 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -32,8 +33,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("continue.or.break.inside.finally.block.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index 17899e4a..bd1c0d37 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.StatementUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
@@ -29,9 +30,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("empty.catch.block.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
index 4c58779b..51817209 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.StatementUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -27,9 +28,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("empty.finally.block.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index d26741bd..fb93f69f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.StatementUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -27,9 +28,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("empty.try.block.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index af089953..e8ea66a2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
 
@@ -33,8 +34,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("exception.caught.locally.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
index 691aa522..a04ca1f1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -35,8 +36,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("return.inside.finally.block.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
index 6480ad37..ebcadcd2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 @ExtensionImpl
@@ -35,8 +36,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("throw.inside.finally.block.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
index 2a905bc5..c57f938c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
@@ -4,96 +4,104 @@
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.PsiComment;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import com.sixrr.inspectjs.ui.SingleCheckboxOptionsPanel;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
-import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 
-import javax.swing.*;
+import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class UnusedCatchParameterJSInspection extends JavaScriptInspection {
-
-    /**
-     * @noinspection PublicField
-     */
-    public boolean m_ignoreCatchBlocksWithComments = false;
-
-    @Override
+public class UnusedCatchParameterJSInspection extends JavaScriptInspection
+{
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "unused.catch.parameter.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message(
+				"unused.catch.parameter.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.ERRORHANDLING_GROUP_NAME;
+	}
 
-    @Override
-	public JComponent createOptionsPanel() {
-
-        return new SingleCheckboxOptionsPanel(InspectionJSBundle.message(
-                "unused.catch.parameter.ignore.catch.option"), this,
-                "m_ignoreCatchBlocksWithComments");
-    }
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new UnusedCatchParameterJSInspectionState();
+	}
 
-    @Override
+	@RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
-        return InspectionJSBundle.message(
-                "unused.catch.parameter.problem.descriptor");
-    }
+	protected String buildErrorString(Object state, Object... args)
+	{
+		return InspectionJSBundle.message(
+				"unused.catch.parameter.problem.descriptor");
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new EmptyCatchBlockVisitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new EmptyCatchBlockVisitor();
+	}
 
-    private class EmptyCatchBlockVisitor extends BaseInspectionVisitor {
+	private class EmptyCatchBlockVisitor extends BaseInspectionVisitor<UnusedCatchParameterJSInspectionState>
+	{
 
-        @Override public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
-            super.visitJSTryStatement(statement);
-            final JSCatchBlock jsCatchBlock = statement.getCatchBlock();
-            if(jsCatchBlock == null)
-            {
-                return;
-            }
-            checkCatchSection(jsCatchBlock);
-        }
+		@Override
+		public void visitJSTryStatement(@Nonnull JSTryStatement statement)
+		{
+			super.visitJSTryStatement(statement);
+			final JSCatchBlock jsCatchBlock = statement.getCatchBlock();
+			if(jsCatchBlock == null)
+			{
+				return;
+			}
+			checkCatchSection(jsCatchBlock);
+		}
 
-        private void checkCatchSection(JSCatchBlock section) {
-            final JSParameter param = section.getParameter();
-            final JSStatement block = section.getStatement();
-            if (param == null || block == null) {
-                return;
-            }
-            @NonNls final String paramName = param.getName();
-            if ("ignore".equals(paramName) || "ignored".equals(paramName)) {
-                return;
-            }
-            if (m_ignoreCatchBlocksWithComments) {
-                final PsiElement[] children = block.getChildren();
-                for (final PsiElement child : children) {
-                    if (child instanceof PsiComment) {
-                        return;
-                    }
-                }
-            }
-            final CatchParameterUsedVisitor visitor =
-                    new CatchParameterUsedVisitor(param);
-            block.accept(visitor);
-            if (!visitor.isUsed()) {
-                registerVariableError(param);
-            }
-        }
-    }
+		private void checkCatchSection(JSCatchBlock section)
+		{
+			final JSParameter param = section.getParameter();
+			final JSStatement block = section.getStatement();
+			if(param == null || block == null)
+			{
+				return;
+			}
+			final String paramName = param.getName();
+			if("ignore".equals(paramName) || "ignored".equals(paramName))
+			{
+				return;
+			}
+			if(myState.m_ignoreCatchBlocksWithComments)
+			{
+				final PsiElement[] children = block.getChildren();
+				for(final PsiElement child : children)
+				{
+					if(child instanceof PsiComment)
+					{
+						return;
+					}
+				}
+			}
+			final CatchParameterUsedVisitor visitor =
+					new CatchParameterUsedVisitor(param);
+			block.accept(visitor);
+			if(!visitor.isUsed())
+			{
+				registerVariableError(param);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
new file mode 100644
index 00000000..45c18657
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
@@ -0,0 +1,41 @@
+package com.sixrr.inspectjs.exception;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class UnusedCatchParameterJSInspectionState implements InspectionToolState<UnusedCatchParameterJSInspectionState>
+{
+	public boolean m_ignoreCatchBlocksWithComments = false;
+
+	@Nullable
+	@Override
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.checkBox(InspectionJSLocalize.unusedCatchParameterIgnoreCatchOption(), () -> m_ignoreCatchBlocksWithComments, b -> m_ignoreCatchBlocksWithComments = b);
+		return builder.buildUnnamed();
+	}
+
+	@Nullable
+	@Override
+	public UnusedCatchParameterJSInspectionState getState()
+	{
+		return this;
+	}
+
+	@Override
+	public void loadState(UnusedCatchParameterJSInspectionState state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index 42696b8f..edd04b06 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -5,13 +5,16 @@
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class CyclomaticComplexityJSInspection extends FunctionMetricsInspection
+public class CyclomaticComplexityJSInspection extends JavaScriptInspection
 {
 	@Override
 	@Nonnull
@@ -34,20 +37,16 @@ public String getGroupDisplayName()
 		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
 	}
 
+	@Nonnull
 	@Override
-	protected int getDefaultLimit()
-	{
-		return 10;
-	}
-
-	@Override
-	protected String getConfigurationLabel()
+	public InspectionToolState<?> createStateProvider()
 	{
-		return InspectionJSBundle.message("function.complexity.limit.parameter");
+		return new CyclomaticComplexityJSInspectionState();
 	}
 
+	@RequiredReadAction
 	@Override
-	public String buildErrorString(Object... args)
+	public String buildErrorString(Object state, Object... args)
 	{
 		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
 		assert function != null;
@@ -72,7 +71,7 @@ public BaseInspectionVisitor buildVisitor()
 		return new Visitor();
 	}
 
-	private class Visitor extends BaseInspectionVisitor
+	private class Visitor extends BaseInspectionVisitor<CyclomaticComplexityJSInspectionState>
 	{
 
 		@Override
@@ -87,7 +86,7 @@ public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
 			lastChild.accept(visitor);
 			final int complexity = visitor.getComplexity();
 
-			if(complexity <= getLimit())
+			if(complexity <= myState.getLimit())
 			{
 				return;
 			}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspectionState.java
new file mode 100644
index 00000000..285b0b20
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspectionState.java
@@ -0,0 +1,16 @@
+package com.sixrr.inspectjs.functionmetrics;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.language.editor.inspection.InspectionToolState;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class CyclomaticComplexityJSInspectionState extends FunctionMetricsInspectionState<CyclomaticComplexityJSInspectionState> implements InspectionToolState<CyclomaticComplexityJSInspectionState>
+{
+	public CyclomaticComplexityJSInspectionState()
+	{
+		super(10, InspectionJSLocalize.overlyComplexFunctionDisplayName());
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspection.java
deleted file mode 100644
index 64e7c827..00000000
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspection.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.sixrr.inspectjs.functionmetrics;
-
-import com.sixrr.inspectjs.JavaScriptInspection;
-import com.sixrr.inspectjs.ui.SingleIntegerFieldOptionsPanel;
-
-import javax.swing.*;
-
-public abstract class FunctionMetricsInspection extends JavaScriptInspection {
-    @SuppressWarnings({"PublicField"})
-    public int m_limit = getDefaultLimit();
-
-    protected abstract int getDefaultLimit();
-
-    protected abstract String getConfigurationLabel();
-
-    protected int getLimit() {
-        return m_limit;
-    }
-
-    @Override
-	public JComponent createOptionsPanel() {
-        final String configurationLabel = getConfigurationLabel();
-        return new SingleIntegerFieldOptionsPanel(configurationLabel, this, "m_limit");
-    }
-}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspectionState.java
new file mode 100644
index 00000000..9863a898
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspectionState.java
@@ -0,0 +1,52 @@
+package com.sixrr.inspectjs.functionmetrics;
+
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.localize.LocalizeValue;
+import consulo.ui.IntBox;
+import consulo.ui.Label;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+import consulo.util.xml.serializer.annotation.Transient;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class FunctionMetricsInspectionState<T extends FunctionMetricsInspectionState<T>>
+{
+	@Transient
+	private final LocalizeValue myLabelText;
+
+	public int m_limit;
+
+	public FunctionMetricsInspectionState(int m_limit, LocalizeValue labelText)
+	{
+		this.m_limit = m_limit;
+		myLabelText = labelText;
+	}
+
+	public int getLimit()
+	{
+		return m_limit;
+	}
+
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.component(() -> Label.create(myLabelText));
+		builder.valueComponent(IntBox::create, () -> m_limit, it -> m_limit = it);
+		return builder.buildUnnamed();
+	}
+
+	@SuppressWarnings("unchecked")
+	public T getState()
+	{
+		return (T) this;
+	}
+
+	public void loadState(T state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index ecebfcac..bbc1870d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -25,8 +26,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
         assert function != null;
         final LoopCountVisitor visitor = new LoopCountVisitor();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index 0e2766b3..ba86e358 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -3,6 +3,7 @@
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
@@ -23,8 +24,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
         assert function != null;
         final int returnPointCount = countReturnPoints(function);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index 858b12f8..4487fa90 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -1,74 +1,88 @@
 package com.sixrr.inspectjs.functionmetrics;
 
 import com.intellij.lang.javascript.psi.JSFunction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.language.psi.PsiElement;
+
 import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class NestingDepthJSInspection extends FunctionMetricsInspection {
-    @Override
+public class NestingDepthJSInspection extends JavaScriptInspection
+{
+	@Override
 	@Nonnull
-    public String getID() {
-        return "OverlyNestedFunctionJS";
-    }
+	public String getID()
+	{
+		return "OverlyNestedFunctionJS";
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("overly.nested.function.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("overly.nested.function.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
-    }
-
-    @Override
-	protected int getDefaultLimit() {
-        return 5;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+	}
 
-    @Override
-	protected String getConfigurationLabel() {
-        return InspectionJSBundle.message("nesting.depth.limit");
-    }
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new NestingDepthJSInspectionState();
+	}
 
-    @Override
-	public String buildErrorString(Object... args) {
-        final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-        assert function != null;
-        final NestingDepthVisitor visitor = new NestingDepthVisitor();
-        function.accept(visitor);
-        final int nestingDepth = visitor.getMaximumDepth();
-        if (functionHasIdentifier(function)) {
-            return InspectionJSBundle.message("function.is.overly.nested.error.string", nestingDepth);
-        }
-        else {
-            return InspectionJSBundle.message("anonymous.function.is.overly.nested.error.string", nestingDepth);
-        }
-    }
+	@RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args)
+	{
+		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
+		assert function != null;
+		final NestingDepthVisitor visitor = new NestingDepthVisitor();
+		function.accept(visitor);
+		final int nestingDepth = visitor.getMaximumDepth();
+		if(functionHasIdentifier(function))
+		{
+			return InspectionJSBundle.message("function.is.overly.nested.error.string", nestingDepth);
+		}
+		else
+		{
+			return InspectionJSBundle.message("anonymous.function.is.overly.nested.error.string", nestingDepth);
+		}
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
 
-    private class Visitor extends BaseInspectionVisitor {
+	private class Visitor extends BaseInspectionVisitor<NestingDepthJSInspectionState>
+	{
 
-        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
-            final NestingDepthVisitor visitor = new NestingDepthVisitor();
-            function.accept(visitor);
-            final int count = visitor.getMaximumDepth();
+		@Override
+		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
+		{
+			final NestingDepthVisitor visitor = new NestingDepthVisitor();
+			function.accept(visitor);
+			final int count = visitor.getMaximumDepth();
 
-            if (count <= getLimit()) {
-                return;
-            }
-            registerFunctionError(function);
-        }
-    }
+			if(count <= myState.getLimit())
+			{
+				return;
+			}
+			registerFunctionError(function);
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspectionState.java
new file mode 100644
index 00000000..d181bc3f
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspectionState.java
@@ -0,0 +1,16 @@
+package com.sixrr.inspectjs.functionmetrics;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.language.editor.inspection.InspectionToolState;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class NestingDepthJSInspectionState extends FunctionMetricsInspectionState<NestingDepthJSInspectionState> implements InspectionToolState<NestingDepthJSInspectionState>
+{
+	public NestingDepthJSInspectionState()
+	{
+		super(5, InspectionJSLocalize.nestingDepthLimit());
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index 910ed6c2..8e3c2b11 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -6,77 +6,93 @@
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class ParametersPerFunctionJSInspection extends FunctionMetricsInspection {
-    @Override
+public class ParametersPerFunctionJSInspection extends JavaScriptInspection
+{
+	@Override
 	@Nonnull
-    public String getID() {
-        return "OverlyComplexFunctionJS";
-    }
+	public String getID()
+	{
+		return "OverlyComplexFunctionJS";
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("function.with.too.many.parameters.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("function.with.too.many.parameters.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+	}
 
-    @Override
-	protected int getDefaultLimit() {
-        return 5;
-    }
-
-    @Override
-	protected String getConfigurationLabel() {
-        return InspectionJSBundle.message("function.parameter.limit");
-    }
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new ParametersPerFunctionJSInspectionState();
+	}
 
-    @Override
-	public String buildErrorString(Object... args) {
-        final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-        assert function != null;
-        final JSParameterList parameterList = function.getParameterList();
-        final JSParameter[] parameters = parameterList.getParameters();
-        final int numParameters = parameters.length;
-        if (functionHasIdentifier(function)) {
-            return InspectionJSBundle.message("function.has.too.many.parameters.error.string", numParameters);
-        } else {
-            return InspectionJSBundle.message("anonymous.function.has.too.many.parameters.error.string", numParameters);
-        }
-    }
+	@RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args)
+	{
+		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
+		assert function != null;
+		final JSParameterList parameterList = function.getParameterList();
+		final JSParameter[] parameters = parameterList.getParameters();
+		final int numParameters = parameters.length;
+		if(functionHasIdentifier(function))
+		{
+			return InspectionJSBundle.message("function.has.too.many.parameters.error.string", numParameters);
+		}
+		else
+		{
+			return InspectionJSBundle.message("anonymous.function.has.too.many.parameters.error.string", numParameters);
+		}
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
 
-    private class Visitor extends BaseInspectionVisitor {
+	private class Visitor extends BaseInspectionVisitor<ParametersPerFunctionJSInspectionState>
+	{
 
-        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
-            final JSParameterList parameterList = function.getParameterList();
-            if (parameterList == null) {
-                return;
-            }
-            final JSParameter[] parameters = parameterList.getParameters();
-            if (parameters == null) {
-                return;
-            }
-            final int numParameters = parameters.length;
-            if (numParameters <= getLimit()) {
-                return;
-            }
-            registerFunctionError(function);
-        }
-    }
+		@Override
+		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
+		{
+			final JSParameterList parameterList = function.getParameterList();
+			if(parameterList == null)
+			{
+				return;
+			}
+			final JSParameter[] parameters = parameterList.getParameters();
+			if(parameters == null)
+			{
+				return;
+			}
+			final int numParameters = parameters.length;
+			if(numParameters <= myState.getLimit())
+			{
+				return;
+			}
+			registerFunctionError(function);
+		}
+	}
 }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspectionState.java
new file mode 100644
index 00000000..461520e1
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspectionState.java
@@ -0,0 +1,16 @@
+package com.sixrr.inspectjs.functionmetrics;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.language.editor.inspection.InspectionToolState;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class ParametersPerFunctionJSInspectionState extends FunctionMetricsInspectionState<ParametersPerFunctionJSInspectionState> implements InspectionToolState<ParametersPerFunctionJSInspectionState>
+{
+	public ParametersPerFunctionJSInspectionState()
+	{
+		super(5, InspectionJSLocalize.functionParameterLimit());
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index 31a3a98e..b8092e85 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -5,80 +5,94 @@
 import com.sixrr.inspectjs.BaseInspectionVisitor;
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
 import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class StatementsPerFunctionJSInspection extends FunctionMetricsInspection {
-    @Override
+public class StatementsPerFunctionJSInspection extends JavaScriptInspection
+{
+	@Override
 	@Nonnull
-    public String getID() {
-        return "FunctionTooLongJS";
-    }
+	public String getID()
+	{
+		return "FunctionTooLongJS";
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("overly.long.function.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("overly.long.function.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+	}
 
-    @Override
-	protected int getDefaultLimit() {
-        return 30;
-    }
-
-    @Override
-	protected String getConfigurationLabel() {
-        return InspectionJSBundle.message("maximum.statements.per.function");
-    }
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new StatementsPerFunctionJSInspectionState();
+	}
 
-    @Override
-	public String buildErrorString(Object... args) {
-        final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-        assert function != null;
-        final PsiElement lastChild = function.getLastChild();
-        final StatementCountVisitor visitor = new StatementCountVisitor();
-        assert lastChild != null;
-        lastChild.accept(visitor);
-        final int coupling = visitor.getStatementCount();
-        if (functionHasIdentifier(function)) {
-            return InspectionJSBundle.message("function.is.overly.long.statement.error.string", coupling);
-        } else {
-            return InspectionJSBundle.message("anonymous.function.is.overly.long.statement.error.string", coupling);
-        }
-    }
+	@RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args)
+	{
+		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
+		assert function != null;
+		final PsiElement lastChild = function.getLastChild();
+		final StatementCountVisitor visitor = new StatementCountVisitor();
+		assert lastChild != null;
+		lastChild.accept(visitor);
+		final int coupling = visitor.getStatementCount();
+		if(functionHasIdentifier(function))
+		{
+			return InspectionJSBundle.message("function.is.overly.long.statement.error.string", coupling);
+		}
+		else
+		{
+			return InspectionJSBundle.message("anonymous.function.is.overly.long.statement.error.string", coupling);
+		}
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
 
-    private class Visitor extends BaseInspectionVisitor {
+	private class Visitor extends BaseInspectionVisitor<StatementsPerFunctionJSInspectionState>
+	{
 
-        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+		@Override
+		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
+		{
 
-            final PsiElement lastChild = function.getLastChild();
-            if(!(lastChild instanceof JSBlockStatement))
-            {
-                return;
-            }
-            final StatementCountVisitor visitor = new StatementCountVisitor();
-            lastChild.accept(visitor);
-            final int statementCount = visitor.getStatementCount();
+			final PsiElement lastChild = function.getLastChild();
+			if(!(lastChild instanceof JSBlockStatement))
+			{
+				return;
+			}
+			final StatementCountVisitor visitor = new StatementCountVisitor();
+			lastChild.accept(visitor);
+			final int statementCount = visitor.getStatementCount();
 
-            if (statementCount <= getLimit()) {
-                return;
-            }
-            registerFunctionError(function);
-        }
-    }
+			if(statementCount <= myState.getLimit())
+			{
+				return;
+			}
+			registerFunctionError(function);
+		}
+	}
 }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspectionState.java
new file mode 100644
index 00000000..fe0130ee
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspectionState.java
@@ -0,0 +1,17 @@
+package com.sixrr.inspectjs.functionmetrics;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.language.editor.inspection.InspectionToolState;
+import consulo.localize.LocalizeValue;
+
+/**
+ * @author VISTALL
+ * @since 13/03/2023
+ */
+public class StatementsPerFunctionJSInspectionState extends FunctionMetricsInspectionState<StatementsPerFunctionJSInspectionState> implements InspectionToolState<StatementsPerFunctionJSInspectionState>
+{
+	public StatementsPerFunctionJSInspectionState()
+	{
+		super(30, InspectionJSLocalize.maximumStatementsPerFunction());
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index 0997029f..7886e5e2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
@@ -32,8 +33,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
         assert function != null;
         final PsiElement lastChild = function.getLastChild();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
index 56dc5a25..dc7eb94d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
@@ -1,186 +1,143 @@
 package com.sixrr.inspectjs.naming;
 
 import com.sixrr.inspectjs.JavaScriptInspection;
-import com.sixrr.inspectjs.InspectionJSBundle;
-import com.sixrr.inspectjs.ui.FormattedTextFieldMacFix;
-import com.sixrr.inspectjs.ui.RegExFormatter;
-import com.sixrr.inspectjs.ui.RegExInputVerifier;
-import consulo.util.xml.serializer.InvalidDataException;
-import org.jdom.Element;
-import org.jetbrains.annotations.NonNls;
 
-import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.text.Document;
-import javax.swing.text.InternationalFormatter;
-import java.awt.*;
-import java.text.NumberFormat;
 import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-public abstract class ConventionInspection extends JavaScriptInspection {
-    /**
-     * @noinspection PublicField
-     */
-    public String m_regex = getDefaultRegex();      // this is public for the DefaultJDomExternalizer
-    /**
-     * @noinspection PublicField
-     */
-    public int m_minLength = getDefaultMinLength();  // this is public for the DefaultJDomExternalizer
-    /**
-     * @noinspection PublicField
-     */
-    public int m_maxLength = getDefaultMaxLength();    // this is public for the DefaultJDomExternalizer
-    protected Pattern m_regexPattern = Pattern.compile(m_regex);
-
-    protected abstract String getDefaultRegex();
-
-    protected abstract int getDefaultMinLength();
-
-    protected abstract int getDefaultMaxLength();
-
-    String getRegex() {
-        return m_regex;
-    }
-
-    int getMinLength() {
-        return m_minLength;
-    }
-
-    int getMaxLength() {
-        return m_maxLength;
-    }
-
-    boolean isValid(@NonNls String name) {
-        final int length = name.length();
-        if (length < m_minLength) {
-            return false;
-        }
-        if (length > m_maxLength) {
-            return false;
-        }
-        if ("serialVersionUID".equals(name)) {
-            return true;
-        }
-        final Matcher matcher = m_regexPattern.matcher(name);
-        return matcher.matches();
-    }
-
-    @Override
-	public void readSettings(Element element) throws InvalidDataException
+public abstract class ConventionInspection extends JavaScriptInspection
+{
+	boolean isValid(String name, ConventionInspectionState state)
 	{
-        super.readSettings(element);
-        m_regexPattern = Pattern.compile(m_regex);
-    }
-
-    private static final int REGEX_COLUMN_COUNT = 25;
-
-    @Override
-	public JComponent createOptionsPanel() {
-        final GridBagLayout layout = new GridBagLayout();
-        final JPanel panel = new JPanel(layout);
-
-        final JLabel patternLabel = new JLabel(InspectionJSBundle.message("pattern.parameter"));
-        patternLabel.setHorizontalAlignment(SwingConstants.TRAILING);
-        final JLabel minLengthLabel = new JLabel(InspectionJSBundle.message("min.length.parameter"));
-        minLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
-        final JLabel maxLengthLabel = new JLabel(InspectionJSBundle.message("max.length.parameter"));
-        maxLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
-
-        final NumberFormat numberFormat = NumberFormat.getIntegerInstance();
-        numberFormat.setParseIntegerOnly(true);
-        numberFormat.setMinimumIntegerDigits(1);
-        numberFormat.setMaximumIntegerDigits(2);
-        final InternationalFormatter formatter = new InternationalFormatter(numberFormat);
-        formatter.setAllowsInvalid(false);
-        formatter.setCommitsOnValidEdit(true);
-
-        final JFormattedTextField minLengthField = new JFormattedTextField(formatter);
-        final Font panelFont = panel.getFont();
-        minLengthField.setFont(panelFont);
-        minLengthField.setValue(m_minLength);
-        minLengthField.setColumns(2);
-        FormattedTextFieldMacFix.apply(minLengthField);
-
-        final JFormattedTextField maxLengthField = new JFormattedTextField(formatter);
-        maxLengthField.setFont(panelFont);
-        maxLengthField.setValue(m_maxLength);
-        maxLengthField.setColumns(2);
-        FormattedTextFieldMacFix.apply(maxLengthField);
-
-        final JFormattedTextField regexField = new JFormattedTextField(new RegExFormatter());
-        regexField.setFont(panelFont);
-        regexField.setValue(m_regexPattern);
-        regexField.setColumns(REGEX_COLUMN_COUNT);
-        regexField.setInputVerifier(new RegExInputVerifier());
-        regexField.setFocusLostBehavior(JFormattedTextField.COMMIT);
-        FormattedTextFieldMacFix.apply(regexField);
-        final DocumentListener listener = new DocumentListener() {
-            @Override
-			public void changedUpdate(DocumentEvent e) {
-                textChanged();
-            }
-
-            @Override
-			public void insertUpdate(DocumentEvent e) {
-                textChanged();
-            }
-
-            @Override
-			public void removeUpdate(DocumentEvent e) {
-                textChanged();
-            }
-
-            private void textChanged() {
-                m_regexPattern = (Pattern) regexField.getValue();
-                m_regex = m_regexPattern.pattern();
-                m_minLength = ((Number) minLengthField.getValue()).intValue();
-                m_maxLength = ((Number) maxLengthField.getValue()).intValue();
-            }
-        };
-        final Document regexDocument = regexField.getDocument();
-        regexDocument.addDocumentListener(listener);
-        final Document minLengthDocument = minLengthField.getDocument();
-        minLengthDocument.addDocumentListener(listener);
-        final Document maxLengthDocument = maxLengthField.getDocument();
-        maxLengthDocument.addDocumentListener(listener);
-
-        final GridBagConstraints constraints = new GridBagConstraints();
-        constraints.gridx = 0;
-        constraints.gridy = 0;
-        constraints.weightx = 1.0;
-        constraints.anchor = GridBagConstraints.EAST;
-        constraints.fill = GridBagConstraints.HORIZONTAL;
-        panel.add(patternLabel, constraints);
-
-        constraints.gridx = 1;
-        constraints.gridy = 0;
-        constraints.gridwidth = 3;
-        constraints.anchor = GridBagConstraints.WEST;
-        panel.add(regexField, constraints);
-
-        constraints.gridx = 0;
-        constraints.gridy = 1;
-        constraints.gridwidth = 1;
-        constraints.anchor = GridBagConstraints.EAST;
-        panel.add(minLengthLabel, constraints);
-
-        constraints.gridx = 1;
-        constraints.gridy = 1;
-        constraints.anchor = GridBagConstraints.WEST;
-        panel.add(minLengthField, constraints);
-
-        constraints.gridx = 2;
-        constraints.gridy = 1;
-        constraints.anchor = GridBagConstraints.EAST;
-        panel.add(maxLengthLabel, constraints);
-
-        constraints.gridx = 3;
-        constraints.gridy = 1;
-        constraints.anchor = GridBagConstraints.WEST;
-        panel.add(maxLengthField, constraints);
-
-        return panel;
-    }
+		final int length = name.length();
+		if(length < state.m_minLength)
+		{
+			return false;
+		}
+		if(length > state.m_maxLength)
+		{
+			return false;
+		}
+		if("serialVersionUID".equals(name))
+		{
+			return true;
+		}
+		final Matcher matcher = state.getPattern().matcher(name);
+		return matcher.matches();
+	}
+
+	private static final int REGEX_COLUMN_COUNT = 25;
+
+//	@Override
+//	public JComponent createOptionsPanel()
+//	{
+//		final GridBagLayout layout = new GridBagLayout();
+//		final JPanel panel = new JPanel(layout);
+//
+//		final JLabel patternLabel = new JLabel(InspectionJSBundle.message("pattern.parameter"));
+//		patternLabel.setHorizontalAlignment(SwingConstants.TRAILING);
+//		final JLabel minLengthLabel = new JLabel(InspectionJSBundle.message("min.length.parameter"));
+//		minLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
+//		final JLabel maxLengthLabel = new JLabel(InspectionJSBundle.message("max.length.parameter"));
+//		maxLengthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
+//
+//		final NumberFormat numberFormat = NumberFormat.getIntegerInstance();
+//		numberFormat.setParseIntegerOnly(true);
+//		numberFormat.setMinimumIntegerDigits(1);
+//		numberFormat.setMaximumIntegerDigits(2);
+//		final InternationalFormatter formatter = new InternationalFormatter(numberFormat);
+//		formatter.setAllowsInvalid(false);
+//		formatter.setCommitsOnValidEdit(true);
+//
+//		final JFormattedTextField minLengthField = new JFormattedTextField(formatter);
+//		final Font panelFont = panel.getFont();
+//		minLengthField.setFont(panelFont);
+//		minLengthField.setValue(m_minLength);
+//		minLengthField.setColumns(2);
+//		FormattedTextFieldMacFix.apply(minLengthField);
+//
+//		final JFormattedTextField maxLengthField = new JFormattedTextField(formatter);
+//		maxLengthField.setFont(panelFont);
+//		maxLengthField.setValue(m_maxLength);
+//		maxLengthField.setColumns(2);
+//		FormattedTextFieldMacFix.apply(maxLengthField);
+//
+//		final JFormattedTextField regexField = new JFormattedTextField(new RegExFormatter());
+//		regexField.setFont(panelFont);
+//		regexField.setValue(m_regexPattern);
+//		regexField.setColumns(REGEX_COLUMN_COUNT);
+//		regexField.setInputVerifier(new RegExInputVerifier());
+//		regexField.setFocusLostBehavior(JFormattedTextField.COMMIT);
+//		FormattedTextFieldMacFix.apply(regexField);
+//		final DocumentListener listener = new DocumentListener()
+//		{
+//			@Override
+//			public void changedUpdate(DocumentEvent e)
+//			{
+//				textChanged();
+//			}
+//
+//			@Override
+//			public void insertUpdate(DocumentEvent e)
+//			{
+//				textChanged();
+//			}
+//
+//			@Override
+//			public void removeUpdate(DocumentEvent e)
+//			{
+//				textChanged();
+//			}
+//
+//			private void textChanged()
+//			{
+//				m_regexPattern = (Pattern) regexField.getValue();
+//				m_regex = m_regexPattern.pattern();
+//				m_minLength = ((Number) minLengthField.getValue()).intValue();
+//				m_maxLength = ((Number) maxLengthField.getValue()).intValue();
+//			}
+//		};
+//		final Document regexDocument = regexField.getDocument();
+//		regexDocument.addDocumentListener(listener);
+//		final Document minLengthDocument = minLengthField.getDocument();
+//		minLengthDocument.addDocumentListener(listener);
+//		final Document maxLengthDocument = maxLengthField.getDocument();
+//		maxLengthDocument.addDocumentListener(listener);
+//
+//		final GridBagConstraints constraints = new GridBagConstraints();
+//		constraints.gridx = 0;
+//		constraints.gridy = 0;
+//		constraints.weightx = 1.0;
+//		constraints.anchor = GridBagConstraints.EAST;
+//		constraints.fill = GridBagConstraints.HORIZONTAL;
+//		panel.add(patternLabel, constraints);
+//
+//		constraints.gridx = 1;
+//		constraints.gridy = 0;
+//		constraints.gridwidth = 3;
+//		constraints.anchor = GridBagConstraints.WEST;
+//		panel.add(regexField, constraints);
+//
+//		constraints.gridx = 0;
+//		constraints.gridy = 1;
+//		constraints.gridwidth = 1;
+//		constraints.anchor = GridBagConstraints.EAST;
+//		panel.add(minLengthLabel, constraints);
+//
+//		constraints.gridx = 1;
+//		constraints.gridy = 1;
+//		constraints.anchor = GridBagConstraints.WEST;
+//		panel.add(minLengthField, constraints);
+//
+//		constraints.gridx = 2;
+//		constraints.gridy = 1;
+//		constraints.anchor = GridBagConstraints.EAST;
+//		panel.add(maxLengthLabel, constraints);
+//
+//		constraints.gridx = 3;
+//		constraints.gridy = 1;
+//		constraints.anchor = GridBagConstraints.WEST;
+//		panel.add(maxLengthField, constraints);
+//
+//		return panel;
+//	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
new file mode 100644
index 00000000..fb23cc08
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
@@ -0,0 +1,104 @@
+package com.sixrr.inspectjs.naming;
+
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.configurable.ConfigurableBuilder;
+import consulo.configurable.ConfigurableBuilderState;
+import consulo.configurable.UnnamedConfigurable;
+import consulo.ui.Label;
+import consulo.util.xml.serializer.XmlSerializerUtil;
+import consulo.util.xml.serializer.annotation.Transient;
+
+import javax.annotation.Nullable;
+import java.util.regex.Pattern;
+
+/**
+ * @author VISTALL
+ * @since 18/03/2023
+ */
+public class ConventionInspectionState<T extends ConventionInspectionState<T>>
+{
+	public String m_regex;
+
+	public int m_minLength;
+
+	public int m_maxLength;
+
+	@Transient
+	private Pattern m_regexPattern;
+
+	public ConventionInspectionState()
+	{
+	}
+
+	public ConventionInspectionState(String regex, int minLength, int maxLength)
+	{
+		this.m_regex = regex;
+		this.m_minLength = minLength;
+		this.m_maxLength = maxLength;
+	}
+
+	public String getRegex()
+	{
+		return m_regex;
+	}
+
+	public void setRegex(String m_regex)
+	{
+		this.m_regex = m_regex;
+	}
+
+	public int getMinLength()
+	{
+		return m_minLength;
+	}
+
+	public void setMinLength(int m_minLength)
+	{
+		this.m_minLength = m_minLength;
+	}
+
+	public int getMaxLength()
+	{
+		return m_maxLength;
+	}
+
+	public void setMaxLength(int m_maxLength)
+	{
+		this.m_maxLength = m_maxLength;
+	}
+
+	public Pattern getPattern()
+	{
+		if(m_regexPattern == null)
+		{
+			m_regexPattern = Pattern.compile(m_regex);
+		}
+		return m_regexPattern;
+	}
+
+	@SuppressWarnings("unchecked")
+	public T getState()
+	{
+		return (T) this;
+	}
+
+	public void loadState(T state)
+	{
+		XmlSerializerUtil.copyBean(state, this);
+
+		m_regexPattern = null;
+	}
+
+	@Nullable
+	public UnnamedConfigurable createConfigurable()
+	{
+		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+		builder.component(() -> Label.create(InspectionJSLocalize.patternParameter()));
+		builder.textBox(() -> m_regex, s -> m_regex = s);
+		builder.component(() -> Label.create(InspectionJSLocalize.minLengthParameter()));
+		builder.intBox(() -> m_minLength, value -> m_minLength = value);
+		builder.component(() -> Label.create(InspectionJSLocalize.maxLengthParameter()));
+		builder.intBox(() -> m_maxLength, value -> m_maxLength = value);
+		return builder.buildUnnamed();
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index ecb88486..0eb6fa2f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -6,92 +6,100 @@
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class FunctionNamingConventionJSInspection extends ConventionInspection {
-    private static final int DEFAULT_MIN_LENGTH = 4;
-    private static final int DEFAULT_MAX_LENGTH = 32;
-    private final RenameFix fix = new RenameFix();
+public class FunctionNamingConventionJSInspection extends ConventionInspection
+{
+	private final RenameFix fix = new RenameFix();
 
-    @Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("function.naming.convention.display.name");
-    }
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new FunctionNamingConventionJSInspectionState();
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("function.naming.convention.display.name");
+	}
 
-    @Override
-	protected InspectionJSFix buildFix(PsiElement location) {
-        return fix;
-    }
-
-    @Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
-        return true;
-    }
-
-    @Override
-	public String buildErrorString(Object... args) {
-        final String functionName = ((PsiElement) args[0]).getText();
+	@Override
+	@Nonnull
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
+	}
 
-        assert functionName != null;
-        if (functionName.length() < getMinLength()) {
-            return InspectionJSBundle.message("function.name.is.too.short.error.string", functionName);
-        } else if (functionName.length() > getMaxLength()) {
-            return InspectionJSBundle.message("function.name.is.too.long.error.string", functionName);
-        }
-        return InspectionJSBundle.message("function.name.doesnt.match.regex.error.string", functionName, getRegex());
-    }
+	@Override
+	protected InspectionJSFix buildFix(PsiElement location, Object state)
+	{
+		return fix;
+	}
 
-    @Override
-	@NonNls
-    protected String getDefaultRegex() {
-        return "[a-z][A-Za-z]*";
-    }
+	@Override
+	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
+	{
+		return true;
+	}
 
-    @Override
-	protected int getDefaultMinLength() {
-        return DEFAULT_MIN_LENGTH;
-    }
+	@RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args)
+	{
+		ConventionInspectionState inspectionState = (ConventionInspectionState) state;
+		final String functionName = ((PsiElement) args[0]).getText();
 
-    @Override
-	protected int getDefaultMaxLength() {
-        return DEFAULT_MAX_LENGTH;
-    }
+		assert functionName != null;
+		if(functionName.length() < inspectionState.m_minLength)
+		{
+			return InspectionJSBundle.message("function.name.is.too.short.error.string", functionName);
+		}
+		else if(functionName.length() > inspectionState.m_maxLength)
+		{
+			return InspectionJSBundle.message("function.name.is.too.long.error.string", functionName);
+		}
+		return InspectionJSBundle.message("function.name.doesnt.match.regex.error.string", functionName, inspectionState.m_regex);
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
 
-    private class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSFunctionDeclaration(JSFunction function) {
-            super.visitJSFunctionDeclaration(function);
+	private class Visitor extends BaseInspectionVisitor<ConventionInspectionState>
+	{
+		@Override
+		public void visitJSFunctionDeclaration(JSFunction function)
+		{
+			super.visitJSFunctionDeclaration(function);
 
-            final String name = function.getName();
-            if (name == null) {
-                return;
-            }
-            if (isValid(name)) {
-                return;
-            }
-            final PsiElement identifier = function.getNameIdentifier();
-            if (identifier == null ||
-                    !PsiTreeUtil.isAncestor(function, identifier, true)) {
-                return;
-            }
-            registerFunctionError(function);
-        }
-    }
+			final String name = function.getName();
+			if(name == null)
+			{
+				return;
+			}
+			if(isValid(name, myState))
+			{
+				return;
+			}
+			final PsiElement identifier = function.getNameIdentifier();
+			if(identifier == null ||
+					!PsiTreeUtil.isAncestor(function, identifier, true))
+			{
+				return;
+			}
+			registerFunctionError(function);
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java
new file mode 100644
index 00000000..dfd5e765
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java
@@ -0,0 +1,18 @@
+package com.sixrr.inspectjs.naming;
+
+import consulo.configurable.UnnamedConfigurable;
+import consulo.language.editor.inspection.InspectionToolState;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 18/03/2023
+ */
+public class FunctionNamingConventionJSInspectionState extends ConventionInspectionState<FunctionNamingConventionJSInspectionState> implements InspectionToolState<FunctionNamingConventionJSInspectionState>
+{
+	public FunctionNamingConventionJSInspectionState()
+	{
+		super("[a-z][A-Za-z]*", 4, 32);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index 69e4e774..f251b25d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -7,89 +7,98 @@
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class LocalVariableNamingConventionJSInspection extends ConventionInspection {
-    private static final int DEFAULT_MIN_LENGTH = 1;
-    private static final int DEFAULT_MAX_LENGTH = 32;
-    private final RenameFix fix = new RenameFix();
+public class LocalVariableNamingConventionJSInspection extends ConventionInspection
+{
+	private final RenameFix fix = new RenameFix();
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("local.variable.naming.convention.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("local.variable.naming.convention.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
+	}
 
-    @Override
-	protected InspectionJSFix buildFix(PsiElement location) {
-        return fix;
-    }
+	@Override
+	protected InspectionJSFix buildFix(PsiElement location, Object state)
+	{
+		return fix;
+	}
 
-    @Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
-        return true;
-    }
+	@Override
+	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
+	{
+		return true;
+	}
 
-    @Override
-	public String buildErrorString(Object... args) {
-        final JSVariable variable = (JSVariable) ((PsiElement)args[0]).getParent();
-        assert variable != null;
-        final String variableName = variable.getName();
-        if (variableName.length() < getMinLength()) {
-            return InspectionJSBundle.message("variable.name.is.too.short.error.string");
-        } else if (variableName.length() > getMaxLength()) {
-            return InspectionJSBundle.message("variable.name.is.too.long.error.string");
-        }
-        return InspectionJSBundle.message("variable.name.doesnt.match.regex.error.string", getRegex());
-    }
+	@RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args)
+	{
+		LocalVariableNamingConventionJSInspectionState inspectionState = (LocalVariableNamingConventionJSInspectionState) state;
 
-    @Override
-	@NonNls
-    protected String getDefaultRegex() {
-        return "[a-z][A-Za-z]*";
-    }
+		final JSVariable variable = (JSVariable) ((PsiElement) args[0]).getParent();
+		assert variable != null;
+		final String variableName = variable.getName();
+		if(variableName.length() < inspectionState.m_minLength)
+		{
+			return InspectionJSBundle.message("variable.name.is.too.short.error.string");
+		}
+		else if(variableName.length() > inspectionState.m_maxLength)
+		{
+			return InspectionJSBundle.message("variable.name.is.too.long.error.string");
+		}
+		return InspectionJSBundle.message("variable.name.doesnt.match.regex.error.string", inspectionState.m_regex);
+	}
 
-    @Override
-	protected int getDefaultMinLength() {
-        return DEFAULT_MIN_LENGTH;
-    }
-
-    @Override
-	protected int getDefaultMaxLength() {
-        return DEFAULT_MAX_LENGTH;
-    }
+	@Nonnull
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new LocalVariableNamingConventionJSInspectionState();
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
 
-    private class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSVarStatement(JSVarStatement jsVarStatement) {
-            super.visitJSVarStatement(jsVarStatement);
-            final JSVariable[] variables = jsVarStatement.getVariables();
-            for (JSVariable variable : variables) {
-                final String name = variable.getName();
-                if (name == null) {
-                    continue;
-                }
-                if (isValid(name)) {
-                    continue;
-                }
-                registerVariableError(variable);
-            }
-        }
+	private class Visitor extends BaseInspectionVisitor<LocalVariableNamingConventionJSInspectionState>
+	{
+		@Override
+		public void visitJSVarStatement(JSVarStatement jsVarStatement)
+		{
+			super.visitJSVarStatement(jsVarStatement);
+			final JSVariable[] variables = jsVarStatement.getVariables();
+			for(JSVariable variable : variables)
+			{
+				final String name = variable.getName();
+				if(name == null)
+				{
+					continue;
+				}
+				if(isValid(name, myState))
+				{
+					continue;
+				}
+				registerVariableError(variable);
+			}
+		}
 
-    }
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspectionState.java
new file mode 100644
index 00000000..5ecc0c09
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspectionState.java
@@ -0,0 +1,15 @@
+package com.sixrr.inspectjs.naming;
+
+import consulo.language.editor.inspection.InspectionToolState;
+
+/**
+ * @author VISTALL
+ * @since 18/03/2023
+ */
+public class LocalVariableNamingConventionJSInspectionState extends ConventionInspectionState<LocalVariableNamingConventionJSInspectionState> implements InspectionToolState<LocalVariableNamingConventionJSInspectionState>
+{
+	public LocalVariableNamingConventionJSInspectionState()
+	{
+		super("[a-z][A-Za-z]*", 1, 32);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index 43e8f075..b1da91ed 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -9,92 +9,102 @@
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class ParameterNamingConventionJSInspection extends ConventionInspection {
-    private static final int DEFAULT_MIN_LENGTH = 1;
-    private static final int DEFAULT_MAX_LENGTH = 32;
-    private final RenameFix fix = new RenameFix();
+public class ParameterNamingConventionJSInspection extends ConventionInspection
+{
+	private final RenameFix fix = new RenameFix();
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("function.parameter.naming.convention.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("function.parameter.naming.convention.display.name");
+	}
 
-    @Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
-    }
+	@Override
+	public InspectionToolState<?> createStateProvider()
+	{
+		return new ParameterNamingConventionJSInspectionState();
+	}
 
-    @Override
-	protected InspectionJSFix buildFix(PsiElement location) {
-        return fix;
-    }
-
-    @Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
-        return true;
-    }
+	@Override
+	@Nonnull
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
+	}
 
-    @Override
-	public String buildErrorString(Object... args) {
-        final JSParameter parameter = (JSParameter) ((PsiElement) args[0]).getParent();
-        assert parameter != null;
-        final String parameterName = parameter.getName();
-        if (parameterName.length() < getMinLength()) {
-            return InspectionJSBundle.message("parameter.name.is.too.short.error.string");
-        } else if (parameterName.length() > getMaxLength()) {
-            return InspectionJSBundle.message("parameter.name.is.too.long.error.string");
-        }
-        return InspectionJSBundle.message("parameter.name.doesnt.match.regex.error.string", getRegex());
-    }
+	@Override
+	protected InspectionJSFix buildFix(PsiElement location, Object state)
+	{
+		return fix;
+	}
 
-    @Override
-	@NonNls
-    protected String getDefaultRegex() {
-        return "[a-z][A-Za-z]*";
-    }
+	@Override
+	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
+	{
+		return true;
+	}
 
-    @Override
-	protected int getDefaultMinLength() {
-        return DEFAULT_MIN_LENGTH;
-    }
+	@RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args)
+	{
+		ParameterNamingConventionJSInspectionState inspectionState = (ParameterNamingConventionJSInspectionState) state;
 
-    @Override
-	protected int getDefaultMaxLength() {
-        return DEFAULT_MAX_LENGTH;
-    }
+		final JSParameter parameter = (JSParameter) ((PsiElement) args[0]).getParent();
+		assert parameter != null;
+		final String parameterName = parameter.getName();
+		if(parameterName.length() < inspectionState.m_minLength)
+		{
+			return InspectionJSBundle.message("parameter.name.is.too.short.error.string");
+		}
+		else if(parameterName.length() > inspectionState.m_maxLength)
+		{
+			return InspectionJSBundle.message("parameter.name.is.too.long.error.string");
+		}
+		return InspectionJSBundle.message("parameter.name.doesnt.match.regex.error.string", inspectionState.m_regex);
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
 
-    private class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSFunctionDeclaration(JSFunction function) {
-            super.visitJSFunctionDeclaration(function);
-            final JSParameterList parameterList = function.getParameterList();
-            if (parameterList == null) {
-                return;
-            }
-            final JSParameter[] parameters = parameterList.getParameters();
-            for (JSVariable variable : parameters) {
-                final String name = variable.getName();
-                if (name == null) {
-                    continue;
-                }
-                if (isValid(name)) {
-                    continue;
-                }
-                registerVariableError(variable);
-            }
-        }
-    }
+	private class Visitor extends BaseInspectionVisitor<ParameterNamingConventionJSInspectionState>
+	{
+		@Override
+		public void visitJSFunctionDeclaration(JSFunction function)
+		{
+			super.visitJSFunctionDeclaration(function);
+			final JSParameterList parameterList = function.getParameterList();
+			if(parameterList == null)
+			{
+				return;
+			}
+			final JSParameter[] parameters = parameterList.getParameters();
+			for(JSVariable variable : parameters)
+			{
+				final String name = variable.getName();
+				if(name == null)
+				{
+					continue;
+				}
+				if(isValid(name, myState))
+				{
+					continue;
+				}
+				registerVariableError(variable);
+			}
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspectionState.java
new file mode 100644
index 00000000..ae5151c0
--- /dev/null
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspectionState.java
@@ -0,0 +1,15 @@
+package com.sixrr.inspectjs.naming;
+
+import consulo.language.editor.inspection.InspectionToolState;
+
+/**
+ * @author VISTALL
+ * @since 18/03/2023
+ */
+public class ParameterNamingConventionJSInspectionState extends ConventionInspectionState<ParameterNamingConventionJSInspectionState> implements InspectionToolState<ParameterNamingConventionJSInspectionState>
+{
+	public ParameterNamingConventionJSInspectionState()
+	{
+		super("[a-z][A-Za-z]*", 1, 32);
+	}
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index 158514b3..a9a4aeae 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 
@@ -33,9 +34,10 @@ public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    public String buildErrorString(Object... args) {
+    public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("chained.equality.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index 1fb37eaa..00a8f99f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -30,9 +31,10 @@ public String getDisplayName() {
                 "chained.function.call.display.name");
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message(
                 "chained.function.call.problem.descriptor");
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index 2d9cbda9..f656258a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -5,6 +5,7 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -36,8 +37,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("constant.on.left.side.of.comparison.error.string");
     }
 
@@ -47,7 +49,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index cf075a8c..6d4d8da3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -5,6 +5,7 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -36,8 +37,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("constant.on.right.side.of.comparison.error.string");
     }
 
@@ -47,7 +49,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index 95083709..13b8773c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
@@ -32,9 +33,10 @@ public String getDisplayName() {
                 "nested.function.call.display.name");
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nonnull
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message(
                 "nested.function.call.problem.descriptor");
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
index a1bf8b65..1ad6f4d1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -31,8 +32,9 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         if (args[0] instanceof JSIfStatement) {
             return InspectionJSBundle.message("non.block.branch.error.string");
         } else {
@@ -41,7 +43,7 @@ public String buildErrorString(Object... args) {
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location) {
+	public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index 4c74a87a..e85f14ff 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
@@ -40,9 +41,10 @@ public String getGroupDisplayName()
 		return JSGroupNames.STYLE_GROUP_NAME;
 	}
 
+	@RequiredReadAction
 	@Override
 	@Nullable
-	protected String buildErrorString(Object... args)
+	protected String buildErrorString(Object state, Object... args)
 	{
 		return InspectionJSBundle.message("unterminated.statement.error.string");
 	}
@@ -54,7 +56,7 @@ public BaseInspectionVisitor buildVisitor()
 	}
 
 	@Override
-	public InspectionJSFix buildFix(PsiElement location)
+	public InspectionJSFix buildFix(PsiElement location, Object state)
 	{
 		return fix;
 	}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index 0413f83c..c3381bb7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -44,9 +44,10 @@ public boolean isEnabledByDefault()
 		return true;
 	}
 
+	@RequiredReadAction
 	@Override
 	@Nullable
-	protected String buildErrorString(Object... args)
+	protected String buildErrorString(Object state, Object... args)
 	{
 		return InspectionJSBundle.message("expression.statement.is.not.assignment.or.call.error.string");
 	}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
index 4f8a32a8..797eef67 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import org.jetbrains.annotations.NonNls;
 
@@ -33,9 +34,10 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("debugger.statement.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index ec62aa00..b227509b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -30,8 +31,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("duplicate.case.label.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index 916f5904..f8c4fbca 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -6,6 +6,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -26,8 +27,9 @@ public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
-    @Override
-	public String buildErrorString(Object... args) {
+    @RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("duplicate.object.property.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index 05c56fad..93b88e91 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -36,9 +37,10 @@ public boolean isEnabledByDefault()
 		return true;
 	}
 
+	@RequiredReadAction
 	@Override
 	@Nullable
-	protected String buildErrorString(Object... args)
+	protected String buildErrorString(Object state, Object... args)
 	{
 		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
 		assert function != null;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index b5ad0083..d375c9a2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -1,5 +1,6 @@
 package com.sixrr.inspectjs.validity;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
@@ -29,9 +30,10 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("string.literal.breaks.html.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index b9c00b07..1f5d901c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -36,9 +37,10 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("this.expression.references.global.object.error.string");
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
index 6559c907..d019f90c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
 import javax.annotation.Nonnull;
@@ -32,9 +33,10 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Override
+    @RequiredReadAction
+	@Override
 	@Nullable
-    protected String buildErrorString(Object... args) {
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSBundle.message("unreachable.code.error.string");
     }
 
diff --git a/inspections/src/main/resources/LOCALIZE-LIB/en_US/com.sixrr.inspectjs.InspectionJSLocalize.yaml b/inspections/src/main/resources/LOCALIZE-LIB/en_US/com.sixrr.inspectjs.InspectionJSLocalize.yaml
new file mode 100644
index 00000000..83469320
--- /dev/null
+++ b/inspections/src/main/resources/LOCALIZE-LIB/en_US/com.sixrr.inspectjs.InspectionJSLocalize.yaml
@@ -0,0 +1,556 @@
+result.of.assignment.used.displayName:
+  text: Result of assignment used
+result.of.assignment.expression.used.error.string:
+  text: 'Result of assignment expression used #loc'
+assignment.to.for.loop.parameter.display.name:
+  text: Assignment to 'for' loop parameter
+assignment.to.for.loop.parameter.error.string:
+  text: 'Assignment to for-loop parameter #ref #loc'
+assignment.to.function.parameter.display.name:
+  text: Assignment to function parameter
+assignment.to.function.parameter.error.string:
+  text: 'Assignment to function parameter ''#ref'' #loc'
+nested.assignment.display.name:
+  text: Nested assignment
+nested.assignment.error.string:
+  text: 'Nested assignment <code>#ref</code> #loc'
+assignment.replaceable.with.operator.assignment.display.name:
+  text: Assignment replaceable with operator assignment
+assignment.replaceable.with.operator.assignment.error.string:
+  text: '#ref could be simplified to {0} #loc'
+silly.assignment.display.name:
+  text: Variable is assigned to itself
+silly.assignment.error.string:
+  text: 'Variable is assigned to itself #loc'
+divide.by.zero.display.name:
+  text: Divide by zero
+division.by.zero.error.string:
+  text: 'Division by zero #loc'
+equality.comparison.with.coercion.display.name:
+  text: Equality comparison which may cause unexpected coercion
+equality.comparison.with.coercion.error.string:
+  text: 'Comparison #ref may cause unexpected type coercion #loc'
+equality.comparison.with.coercion.fix:
+  text: Replace with ''{0}''
+non.short.circuit.boolean.expression.display.name:
+  text: Non short-circuit boolean expression
+non.short.circuit.boolean.expression.error.string:
+  text: 'Non short-circuit boolean expression #loc'
+replace.with.short.circuit.expression.fix.string:
+  text: Replace with short circuit expression
+result.of.object.allocation.ignored.display.name:
+  text: Result of object allocation ignored
+result.of.object.allocation.ignored.error.string:
+  text: 'Result of <code>new #ref()</code> is ignored #loc'
+text.label.in.switch.statement.display.name:
+  text: Text label in 'switch' statement
+text.label.in.switch.statement.error.string:
+  text: 'Text label <code>#ref:</code> in ''switch'' statement #loc'
+anonymous.function.display.name:
+  text: Anonymous function
+anonymous.function.error.string:
+  text: 'Anonymous #ref #loc'
+unnecessary.block.statement.display.name:
+  text: Unnecessary 'block' statement
+comma.expression.display.name:
+  text: Comma expression
+conditional.expression.display.name:
+  text: Conditional expression
+statement.with.empty.body.display.name:
+  text: Statement with empty body
+result.of.increment.or.decrement.used.display.name:
+  text: Result of increment or decrement used
+negated.conditional.expression.display.name:
+  text: Negated conditional expression
+negated.if.statement.display.name:
+  text: Negated 'if' statement
+nested.conditional.expression.display.name:
+  text: Nested conditional expression
+nested.function.display.name:
+  text: Nested function
+octal.integer.display.name:
+  text: Octal Integer
+overly.complex.arithmetic.expression.display.name:
+  text: Overly complex arithmetic expression
+overly.complex.boolean.expression.display.name:
+  text: Overly complex boolean expression
+pointless.arithmetic.expression.display.name:
+  text: Pointless arithmetic expression
+pointless.boolean.expression.display.name:
+  text: Pointless boolean expression
+void.expression.display.name:
+  text: '''void'' expression'
+with.statement.display.name:
+  text: '''with'' statement'
+break.statement.display.name:
+  text: '''break'' statement'
+break.statement.with.label.display.name:
+  text: '''break'' statement with label'
+conditional.expression.with.identical.branches.display.name:
+  text: Conditional expression with identical branches
+constant.conditional.expression.display.name:
+  text: Constant conditional expression
+continue.statement.display.name:
+  text: '''continue'' statement'
+continue.statement.with.label.display.name:
+  text: '''continue'' statement with label'
+default.not.last.case.in.switch.display.name:
+  text: '''default'' not last case in ''switch'''
+duplicate.condition.in.if.statement.display.name:
+  text: Duplicate condition in 'if' statement
+fall.through.in.switch.statement.display.name:
+  text: Fall-through in 'switch' statement
+if.statement.with.identical.branches.display.name:
+  text: '''if'' statement with identical branches'
+if.statement.with.too.many.branches.display.name:
+  text: '''if'' statement with too many branches'
+infinite.loop.statement.display.name:
+  text: Infinite loop statement
+labeled.statement.display.name:
+  text: Labeled statement
+loop.statement.that.doesn.t.loop.display.name:
+  text: Loop statement that doesn't loop
+nested.switch.statement.display.name:
+  text: Nested 'switch' statement
+switch.statement.with.no.default.branch.display.name:
+  text: '''switch'' statement with no default branch'
+redundant.conditional.expression.display.name:
+  text: Redundant conditional expression
+redundant.if.statement.display.name:
+  text: Redundant 'if' statement
+unnecessary.continue.statement.display.name:
+  text: Unnecessary 'continue' statement
+unnecessary.label.display.name:
+  text: Unnecessary label
+unnecessary.label.on.break.statement.display.name:
+  text: Unnecessary label on 'break' statement
+unnecessary.label.on.continue.statement.display.name:
+  text: Unnecessary label on 'continue' statement
+unnecessary.return.statement.display.name:
+  text: Unnecessary 'return' statement
+call.to.document.write.display.name:
+  text: Call to 'document.write()'
+use.of.innerhtml.property.display.name:
+  text: Use of 'innerHTML' property
+platform.detection.display.name:
+  text: Platform detection
+xhtml.incompatibilities.display.name:
+  text: XHTML incompatibilities
+continue.or.break.inside.finally.block.display.name:
+  text: '''continue'' or ''break'' inside ''finally'' block'
+empty.catch.block.display.name:
+  text: Empty 'catch' block
+empty.finally.block.display.name:
+  text: Empty 'finally' block
+empty.try.block.display.name:
+  text: Empty 'try' block
+exception.used.for.local.control.flow.display.name:
+  text: Exception used for local control-flow
+return.inside.finally.block.display.name:
+  text: '''return'' inside ''finally'' block'
+throw.inside.finally.block.display.name:
+  text: '''throw'' inside ''finally'' block'
+overly.complex.function.display.name:
+  text: Overly complex function
+function.with.multiple.loops.display.name:
+  text: Function with multiple loops
+function.with.multiple.return.points.display.name:
+  text: Function with multiple return points
+overly.nested.function.display.name:
+  text: Overly nested function
+nesting.depth.limit:
+  text: 'Nesting depth limit:'
+function.with.too.many.parameters.display.name:
+  text: Function with too many parameters
+function.parameter.limit:
+  text: 'Function parameter limit:'
+overly.long.function.display.name:
+  text: Overly long function
+maximum.statements.per.function:
+  text: 'Maximum statements per function:'
+function.with.more.than.three.negations.display.name:
+  text: Function with more than three negations
+function.naming.convention.display.name:
+  text: Function naming convention
+local.variable.naming.convention.display.name:
+  text: Local variable naming convention
+function.parameter.naming.convention.display.name:
+  text: Function parameter naming convention
+expression.statement.which.is.not.assignment.or.call.display.name:
+  text: Expression statement which is not assignment or call
+debugger.statement.display.name:
+  text: '''debugger'' statement'
+duplicate.case.label.display.name:
+  text: Duplicate case label
+duplicate.property.on.object.literal.display.name:
+  text: Duplicate property on object literal
+function.with.inconsistent.returns.display.name:
+  text: Function with inconsistent returns
+reserved.word.used.as.name.display.name:
+  text: Reserved word used as name
+this.expression.which.references.the.global.object.display.name:
+  text: '''this'' expression which references the global object'
+unreachable.code.display.name:
+  text: Unreachable code
+chained.equality.display.name:
+  text: Chained equality
+constant.on.right.side.of.comparison.display.name:
+  text: Constant on right side of comparison
+constant.on.left.side.of.comparison.display.name:
+  text: Constant on left side of comparison
+non.block.statement.body.display.name:
+  text: Non-block statement body
+unterminated.statement.display.name:
+  text: Unterminated statement
+terminate.statement.fix:
+  text: Terminate statement
+unnecessary.block.statement.error.string:
+  text: 'Unnecessary block statement #loc'
+comma.expression.error.string:
+  text: 'Comma expression #loc'
+conditional.expression.error.string:
+  text: 'Conditional expression #loc'
+statement.has.empty.branch.error.string:
+  text: '<code>#ref</code> statement has empty branch #loc'
+statement.has.empty.body.error.string:
+  text: '<code>#ref</code> statement has empty body #loc'
+include.statement.bodies.that.are.empty.code.blocks.parameter:
+  text: Include statement bodies that are empty code blocks
+result.of.increment.or.decrement.expression.used.error.string:
+  text: 'Result of increment or decrement expression used #loc'
+negated.conditional.expression.error.string:
+  text: 'Negated conditional expression #loc'
+invert.condition.fix:
+  text: Invert condition
+negated.ref.statement.error.string:
+  text: 'Negated ''#ref'' statement #loc'
+invert.if.condition.fix:
+  text: Invert If Condition
+nested.conditional.expression.error.string:
+  text: 'Nested conditional expression #loc'
+nested.function.error.string:
+  text: 'Nested function ''#ref'' #loc'
+nested.anonymous.function.error.string:
+  text: 'Nested #ref #loc'
+include.anonymous.functions.parameter:
+  text: Include anonymous functions
+octal.integer.error.string:
+  text: 'Octal integer ''#ref'' #loc'
+maximum.number.of.terms.parameter:
+  text: 'Maximum number of terms:'
+overly.complex.arithmetic.expression.error.string:
+  text: 'Overly complex arithmetic expression #loc'
+pointless.arithmetic.error.message:
+  text: '#ref can be replaced with {0} #loc'
+simplify.fix:
+  text: Simplify
+pointless.boolean.error.string:
+  text: '#ref can be simplified to {0} #loc'
+void.expression.error.string:
+  text: '''#ref'' expression #loc'
+with.expression.error.string:
+  text: '''#ref'' statement #loc'
+break.statement.error.string:
+  text: '''#ref'' statement #loc'
+break.statement.with.label.error.string:
+  text: '''#ref'' statement with label #loc'
+conditional.expression.with.identical.branches.error.string:
+  text: 'Conditional expression #ref with identical branches #loc'
+constant.conditional.expression.error.string:
+  text: '#ref can be simplified #loc'
+continue.statement.error.string:
+  text: '''#ref'' statement #loc'
+continue.statement.with.label.error.string:
+  text: '''#ref'' statement with label #loc'
+default.branch.not.last.case.in.switch.error.string:
+  text: '<code>#ref</code> branch not last case in ''switch'' #loc'
+duplicate.condition.error.string:
+  text: 'Duplicate condition #ref #loc'
+fall.through.in.switch.statement.error.string:
+  text: 'Fall-through in ''switch'' statement #loc'
+ref.statement.with.identical.branches.error.string:
+  text: '<code>#ref</code> statement with identical branches #loc'
+collapse.if.statement.fix:
+  text: Collapse 'if' statement
+maximum.number.of.branches.parameter:
+  text: 'Maximum number of branches:'
+if.statement.with.too.many.branches.error.string:
+  text: '''''#ref'''' has too many branches ({0}) #loc'
+infinite.loop.error.string:
+  text: '<code>#ref</code> statement cannot complete without throwing an exception #loc'
+statement.label.error.string:
+  text: 'Statement label ''#ref'' #loc'
+loop.statement.that.doesnt.loop.error.string:
+  text: '<code>#ref</code> statement doesn''t loop #loc'
+nested.switch.statement.error.string:
+  text: 'Nested ''#ref'' statement #loc'
+switch.statement.with.no.default.branch.error.string:
+  text: '''#ref'' statement with no default branch #loc'
+trivial.conditional.error.string:
+  text: '''''{0}'''' can be simplified to ''''{1}'''' #loc'
+trivial.if.error.string:
+  text: '#ref statement can be simplified #loc'
+unnecessary.continue.error.string:
+  text: '#ref is unnecessary as the last statement in a loop #loc'
+unnecessary.label.error.string:
+  text: 'Unnecessary label #ref #loc'
+remove.label.fix:
+  text: Remove label
+unnecessary.label.on.break.error.string:
+  text: '''#ref'' statement with unnecessary label #loc'
+unnecessary.label.on.continue.error.string:
+  text: '''#ref'' statement with unnecessary label #loc'
+unnecessary.return.error.string:
+  text: '#ref is unnecessary as the last statement in a function with no return value #loc'
+document.write.error.string:
+  text: 'Call to ''#ref()'' #loc'
+inner.html.error.string:
+  text: 'use of ''#ref'' property #loc'
+platform.detection.error.string:
+  text: '''#ref'' probably used for platform detection #loc'
+xhtml.incompatabilities.error.string:
+  text: '''#ref'' may produce inconsistent results for XHTML documents #loc'
+continue.or.break.inside.finally.block.error.string:
+  text: '''#ref'' inside ''finally'' block #loc'
+empty.catch.block.error.string:
+  text: 'Empty ''#ref'' block #loc'
+empty.finally.block.error.string:
+  text: 'Empty ''finally'' block #loc'
+empty.try.block.error.string:
+  text: 'Empty ''#ref'' block #loc'
+exception.caught.locally.error.string:
+  text: '''#ref'' of exception caught locally #loc'
+return.inside.finally.block.error.string:
+  text: '''#ref'' inside ''finally'' block #loc'
+throw.inside.finally.block.error.string:
+  text: '''#ref'' inside ''finally'' block #loc'
+rename.fix:
+  text: Rename
+rename.to.fix:
+  text: Rename to ''{0}''
+function.complexity.limit.parameter:
+  text: 'Function complexity limit:'
+function.ref.is.overly.complex.cyclomatic.complexity.error.string:
+  text: 'function ''''#ref'''' is overly complex (cyclomatic complexity = {0}) #loc'
+anonymous.function.is.overly.complex.cyclomatic.complexity.error.string:
+  text: '#ref  is overly complex (cyclomatic complexity = {0}) #loc'
+function.contains.multiple.loops.error.string:
+  text: 'function ''''#ref'''' contains {0} loops #loc'
+anonymous.function.contains.multiple.loops.error.string:
+  text: '#ref contains {0} loops #loc'
+function.contains.multiple.return.points.error.string:
+  text: 'function ''''#ref'''' has {0} return points #loc'
+anonymous.function.contains.multiple.return.points.error.string:
+  text: '#ref has {0} return points #loc'
+function.is.overly.nested.error.string:
+  text: 'function ''''#ref'''' is overly nested (maximum nesting depth = {0}) #loc'
+anonymous.function.is.overly.nested.error.string:
+  text: '#ref is overly nested (maximum nesting depth = {0}) #loc'
+function.has.too.many.parameters.error.string:
+  text: 'function ''''#ref'''' has too many parameters (parameter count = {0}) #loc'
+anonymous.function.has.too.many.parameters.error.string:
+  text: '#ref has too many parameters (parameter count = {0}) #loc'
+function.is.overly.long.statement.error.string:
+  text: 'function ''''#ref'''' is overly long (statement count = {0}) #loc'
+anonymous.function.is.overly.long.statement.error.string:
+  text: '#ref is overly long (statement count = {0}) #loc'
+function.contains.too.many.negation.error.string:
+  text: 'function ''''#ref'''' contains {0} negations #loc'
+anonymous.function.contains.too.many.negation.error.string:
+  text: '#ref contains {0} negations #loc'
+function.name.is.too.short.error.string:
+  text: 'Function name ''''{0}'''' is too short #loc'
+function.name.is.too.long.error.string:
+  text: 'Function name ''''{0}''''is too long #loc'
+function.name.doesnt.match.regex.error.string:
+  text: 'Function name ''''{0}'''' doesn''''t match regex ''''{1}'''' #loc'
+variable.name.is.too.short.error.string:
+  text: 'Variable name ''#ref'' is too short #loc'
+variable.name.is.too.long.error.string:
+  text: 'Variable name ''#ref'' is too long #loc'
+variable.name.doesnt.match.regex.error.string:
+  text: 'Variable name ''''#ref'''' doesn''''t match regex ''''{0}'''' #loc'
+parameter.name.is.too.short.error.string:
+  text: 'Parameter name ''#ref'' is too short #loc'
+parameter.name.is.too.long.error.string:
+  text: 'Parameter name ''#ref'' is too long #loc'
+parameter.name.doesnt.match.regex.error.string:
+  text: 'Parameter name ''''#ref'''' doesn''''t match regex ''''{0}'''' #loc'
+chained.equality.error.string:
+  text: 'Chained equality comparison <code>#ref</code> #loc'
+constant.on.left.side.of.comparison.error.string:
+  text: '#ref: constant on left side of comparison #loc'
+constant.on.right.side.of.comparison.error.string:
+  text: '#ref: constant on right side of comparison #loc'
+flip.comparison.fix:
+  text: Flip comparison
+non.block.branch.error.string:
+  text: '<code>#ref</code> statement has non-block branch #loc'
+non.block.body.error.string:
+  text: '<code>#ref</code> statement has non-block body #loc'
+unterminated.statement.error.string:
+  text: 'Unterminated statement #loc'
+expression.statement.is.not.assignment.or.call.error.string:
+  text: 'Expression statement is not assignment or call #loc'
+debugger.statement.error.string:
+  text: '''#ref'' statement #loc'
+duplicate.case.label.error.string:
+  text: 'Duplicate case label #ref #loc'
+duplicate.object.property.error.string:
+  text: 'Duplicate object property #ref #loc'
+function.has.inconsistent.return.points.error.string:
+  text: 'function ''#ref'' has inconsistent return points #loc'
+anonymous.function.has.inconsistent.return.points.error.string:
+  text: '#ref has inconsistent return points #loc'
+reserved.word.used.as.name.error.string:
+  text: Reserved word '#ref' used as name
+this.expression.references.global.object.error.string:
+  text: 'Top-level ''#ref'' expression #loc'
+unreachable.code.error.string:
+  text: 'Unreachable code #loc'
+malformed.naming.pattern.alert:
+  text: Malformed Naming Pattern
+replace.with.operator.assign.fix:
+  text: Replace = with {0}=
+overly.complex.boolean.expression.error.string:
+  text: 'Overly complex boolean expression #loc'
+collapse.conditional.expression.fix:
+  text: Collapse conditional expression
+remove.unnecessary.continue.fix:
+  text: Remove unnecessary continue
+remove.unnecessary.return.fix:
+  text: Remove unnecessary return
+pattern.parameter:
+  text: 'Pattern:'
+min.length.parameter:
+  text: 'Min Length:'
+max.length.parameter:
+  text: 'Max Length:'
+wrap.statement.body.fix:
+  text: Wrap statement body
+error.handling.javascript.group.name:
+  text: Error handling
+control.flow.issues.javascript.group.name:
+  text: Control flow issues
+javascript.validity.issues.group.name:
+  text: JavaScript validity issues
+potentially.confusing.code.constructs.javascript.group.name:
+  text: Potentially confusing code constructs
+javascript.function.metrics.group.name:
+  text: JavaScript function metrics
+assignment.issues.javascript.group.name:
+  text: Assignment issues
+naming.conventions.javascript.group.name:
+  text: Naming conventions
+code.style.issues.javascript.group.name:
+  text: Code style issues
+javascript.dom.issues.group.name:
+  text: JavaScript DOM issues
+probable.bugs.javascript.group.name:
+  text: Probable Bugs
+code.maturity.javascript.group.name:
+  text: Code Maturity
+confusing.floating.point.literal.display.name:
+  text: Confusing floating point literal
+confusing.floating.point.literal.problem.descriptor:
+  text: 'Confusing floating point literal <code>#ref</code> #loc'
+confusing.pluses.or.minuses.display.name:
+  text: Confusing sequence of '+' or '-'
+confusing.pluses.or.minuses.error.string:
+  text: 'Sequence of ''+'' or ''-'' may change meaning if whitespace removed #loc'
+confusing.floating.point.literal.change.quickfix:
+  text: Change To canonical form
+string.literal.breaks.html.display.name:
+  text: String literal which breaks HTML parsing
+string.literal.breaks.html.error.string:
+  text: 'String literal #ref may break HTML parsers'
+for.loop.not.use.loop.variable.display.name:
+  text: '''for'' loop where update or condition does not use loop variable'
+for.loop.not.use.loop.variable.problem.descriptor.condition:
+  text: '<code>#ref</code> statement has condition which does not use the for loop variable #loc'
+for.loop.not.use.loop.variable.problem.descriptor.update:
+  text: '<code>#ref</code> statement has update which does not use the for loop variable #loc'
+for.loop.not.use.loop.variable.problem.descriptor.both.condition.and.update:
+  text: '<code>#ref</code> statement has condition and update which do not use the for loop variable #loc'
+unused.catch.parameter.display.name:
+  text: Unused 'catch' parameter
+unused.catch.parameter.problem.descriptor:
+  text: 'Unused catch parameter <code>#ref</code> #loc'
+unused.catch.parameter.ignore.catch.option:
+  text: Ignore catch blocks containing comments
+tail.recursion.display.name:
+  text: Tail recursion
+tail.recursion.problem.descriptor:
+  text: 'Tail recursion #loc'
+redundant.local.variable.display.name:
+  text: Redundant local variable
+data.flow.issues.javascript.group.name:
+  text: Data flow issues
+bitwise.issues.javascript.group.name:
+  text: Bitwise operation issues
+redundant.local.variable.ignore.option:
+  text: Ignore immediately returned or thrown variables
+unnecessary.local.variable.problem.descriptor:
+  text: Unnecessary local variable
+reuse.of.local.variable.display.name:
+  text: Reuse of local variable
+reuse.of.local.variable.problem.descriptor:
+  text: 'Reuse of local variable <code>#ref</code> #loc'
+infinite.recursion.display.name:
+  text: Infinite recursion
+infinite.recursion.problem.descriptor:
+  text: 'Function <code>#ref</code> recurses infinitely, and can only end by throwing an exception #loc'
+constant.if.statement.problem.descriptor:
+  text: '<code>#ref</code> statement can be simplified #loc'
+constant.if.statement.display.name:
+  text: Constant if statement
+constant.conditional.expression.simplify.quickfix:
+  text: Simplify
+caller.error.string:
+  text: 'Use of ''#ref'' property #loc'
+caller.display.name:
+  text: Use of 'caller' property
+dynamically.generated.code.error.string:
+  text: 'Function ''#ref'' indicative of dynamically generated code #loc'
+dynamically.generated.code.display.name:
+  text: Execution of dynamically generated JavaScript
+for.loop.replaceable.by.while.problem.descriptor:
+  text: '<code>#ref</code> loop may be replaced by ''while'' loop #loc'
+for.loop.replaceable.by.while.display.name:
+  text: '''for'' loop may be replaced by ''while'' loop'
+for.loop.replaceable.by.while.replace.quickfix:
+  text: Replace with 'while'
+for.loop.replaceable.by.while.ignore.option:
+  text: Ignore 'infinite' for loops without conditions
+nested.function.call.display.name:
+  text: Nested function call
+nested.function.call.problem.descriptor:
+  text: 'Nested call to function ''#ref'' #loc'
+chained.function.call.display.name:
+  text: Chained function call
+chained.function.call.problem.descriptor:
+  text: 'Chained call to function ''#ref'' #loc'
+magic.number.display.name:
+  text: Magic number
+magic.number.problem.descriptor:
+  text: 'Magic number ''#ref'' #loc'
+incompatible.mask.operation.display.name:
+  text: Incompatible bitwise mask operation
+incompatible.mask.operation.problem.descriptor.always.false:
+  text: '<code>#ref</code> is always false #loc'
+incompatible.mask.operation.problem.descriptor.always.true:
+  text: '<code>#ref</code> is always true #loc'
+pointless.bitwise.expression.display.name:
+  text: Pointless bitwise expression
+pointless.bitwise.expression.ignore.option:
+  text: Ignore named constant in determinining pointless expressions
+pointless.bitwise.expression.problem.descriptor:
+  text: '<code>#ref</code> can be replaced with ''''{0}'''' #loc'
+pointless.bitwise.expression.simplify.quickfix:
+  text: Simplify
+shift.operation.by.inappropriate.constant.display.name:
+  text: Shift operation by inappropriate constant
+shift.operation.by.inappropriate.constant.problem.descriptor.too.large:
+  text: 'Shift operation <code>#ref</code> by overly large constant value #loc'
+shift.operation.by.inappropriate.constant.problem.descriptor.negative:
+  text: 'Shift operation <code>#ref</code> by negative constant value #loc'
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 47b49906..d749a997 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -47,7 +47,7 @@
 				<artifactId>maven-consulo-plugin</artifactId>
 				<extensions>true</extensions>
 				<configuration>
-					<repositoryChannel>valhalla</repositoryChannel>
+					<repositoryChannel>nightly</repositoryChannel>
 					<dependencies>
 						<dependency>com.intellij.xml</dependency>
 						<dependency>com.intellij.regexp</dependency>
@@ -181,6 +181,7 @@
 		<dependency>
 			<groupId>consulo.internal</groupId>
 			<artifactId>forms_rt</artifactId>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		

From 01aaec3db725ab91bcb146e65451e825db10ff03 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 25 Mar 2023 23:37:13 +0400
Subject: [PATCH 170/340] migrate to new HighlightVisitor api

---
 .../JavaScriptHighlightVisitor.java           | 37 ++++++-------------
 .../JavaScriptHighlightVisitorFactory.java    | 30 +++++++++++++++
 2 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
index 5f633b66..51dfc950 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
@@ -16,42 +16,34 @@
 
 package com.intellij.lang.javascript.impl.highlighting;
 
-import consulo.annotation.component.ExtensionImpl;
-import consulo.codeEditor.DefaultLanguageHighlighterColors;
-import consulo.language.editor.rawHighlight.HighlightInfo;
-import consulo.language.editor.rawHighlight.HighlightInfoType;
-import consulo.language.editor.rawHighlight.HighlightVisitor;
-import consulo.language.editor.rawHighlight.HighlightInfoHolder;
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
-import consulo.colorScheme.TextAttributesKey;
-import consulo.language.psi.*;
-import consulo.language.ast.IElementType;
-import consulo.language.psi.util.PsiTreeUtil;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.codeEditor.DefaultLanguageHighlighterColors;
+import consulo.colorScheme.TextAttributesKey;
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import consulo.javascript.lang.JavaScriptContextKeywordElementType;
-import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptVersionUtil;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.rawHighlight.HighlightInfo;
+import consulo.language.editor.rawHighlight.HighlightInfoHolder;
+import consulo.language.editor.rawHighlight.HighlightInfoType;
+import consulo.language.editor.rawHighlight.HighlightVisitor;
+import consulo.language.psi.*;
+import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.StringUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-@ExtensionImpl
 public class JavaScriptHighlightVisitor extends JSElementVisitor implements HighlightVisitor
 {
 	private HighlightInfoHolder myHighlightInfoHolder;
 
-	@Override
-	public boolean suitableForFile(@Nonnull PsiFile psiFile)
-	{
-		return psiFile instanceof JSFile;
-	}
-
 	@Override
 	@RequiredReadAction
 	public void visitJSBinaryExpression(JSBinaryExpression node)
@@ -388,13 +380,6 @@ public boolean analyze(@Nonnull PsiFile psiFile, boolean b, @Nonnull HighlightIn
 		return true;
 	}
 
-	@Nonnull
-	@Override
-	public HighlightVisitor clone()
-	{
-		return new JavaScriptHighlightVisitor();
-	}
-
 	private static boolean isClass(final PsiElement element)
 	{
 		return element instanceof JSClass || element instanceof JSFile && element.getContext() != null;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
new file mode 100644
index 00000000..600a9b3f
--- /dev/null
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
@@ -0,0 +1,30 @@
+package com.intellij.lang.javascript.impl.highlighting;
+
+import com.intellij.lang.javascript.psi.JSFile;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.rawHighlight.HighlightVisitor;
+import consulo.language.editor.rawHighlight.HighlightVisitorFactory;
+import consulo.language.psi.PsiFile;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 25/03/2023
+ */
+@ExtensionImpl
+public class JavaScriptHighlightVisitorFactory implements HighlightVisitorFactory
+{
+	@Override
+	public boolean suitableForFile(@Nonnull PsiFile psiFile)
+	{
+		return psiFile instanceof JSFile;
+	}
+
+	@Nonnull
+	@Override
+	public HighlightVisitor createVisitor()
+	{
+		return new JavaScriptHighlightVisitor();
+	}
+}

From 687b91d04d4b16097e703c1760caf6d79648321d Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 18 Jun 2023 14:12:33 +0400
Subject: [PATCH 171/340] fix 53

---
 .../ConditionalExpressionJSInspection.java    |  63 +++---
 ...nWithMultipleReturnPointsJSInspection.java | 193 ++++++++++--------
 .../ChainedFunctionCallJSInspection.java      | 124 ++++++-----
 .../style/NestedFunctionCallJSInspection.java | 104 ++++++----
 4 files changed, 279 insertions(+), 205 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index e3d9faf9..39461311 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -12,36 +12,49 @@
 import javax.annotation.Nullable;
 
 @ExtensionImpl
-public class ConditionalExpressionJSInspection extends JavaScriptInspection {
+public class ConditionalExpressionJSInspection extends JavaScriptInspection
+{
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return false;
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("conditional.expression.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("conditional.expression.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.CONFUSING_GROUP_NAME;
+	}
 
-    @RequiredReadAction
+	@RequiredReadAction
 	@Override
 	@Nullable
-    protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("conditional.expression.error.string");
-    }
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
-
-    private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSConditionalExpression(JSConditionalExpression jsConditionalExpression) {
-            super.visitJSConditionalExpression(jsConditionalExpression);
-            registerError(jsConditionalExpression);
-        }
-    }
+	protected String buildErrorString(Object state, Object... args)
+	{
+		return InspectionJSBundle.message("conditional.expression.error.string");
+	}
+
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
+
+	private static class Visitor extends BaseInspectionVisitor
+	{
+		@Override
+		public void visitJSConditionalExpression(JSConditionalExpression jsConditionalExpression)
+		{
+			super.visitJSConditionalExpression(jsConditionalExpression);
+			registerError(jsConditionalExpression);
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index ba86e358..169304e1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -10,92 +10,123 @@
 import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class FunctionWithMultipleReturnPointsJSInspection extends JavaScriptInspection {
+public class FunctionWithMultipleReturnPointsJSInspection extends JavaScriptInspection
+{
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return false;
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message("function.with.multiple.return.points.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message("function.with.multiple.return.points.display.name");
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+	}
+
+	@RequiredReadAction
+	@Override
+	public String buildErrorString(Object state, Object... args)
+	{
+		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
+		assert function != null;
+		final int returnPointCount = countReturnPoints(function);
+		if(functionHasIdentifier(function))
+		{
+			return InspectionJSBundle.message("function.contains.multiple.return.points.error.string", returnPointCount);
+		}
+		else
+		{
+			return InspectionJSBundle.message("anonymous.function.contains.multiple.return.points.error.string", returnPointCount);
+		}
+	}
+
+	private static int countReturnPoints(JSFunction function)
+	{
+		final PsiElement lastChild = function.getLastChild();
+		if(!(lastChild instanceof JSBlockStatement))
+		{
+			return 0;
+		}
+		boolean hasFallthroughReturn = false;
+		if(ControlFlowUtils.statementMayCompleteNormally((JSStatement) lastChild))
+		{
+			hasFallthroughReturn = true;
+		}
+		final ReturnCountVisitor visitor = new ReturnCountVisitor();
+		lastChild.accept(visitor);
+
+		final int returnCount = visitor.getReturnCount();
+		if(hasFallthroughReturn)
+		{
+			return returnCount + 1;
+		}
+		else
+		{
+			return returnCount;
+		}
+	}
 
-    @RequiredReadAction
 	@Override
-	public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-        assert function != null;
-        final int returnPointCount = countReturnPoints(function);
-        if (functionHasIdentifier(function)) {
-            return InspectionJSBundle.message("function.contains.multiple.return.points.error.string", returnPointCount);
-        } else {
-            return InspectionJSBundle.message("anonymous.function.contains.multiple.return.points.error.string", returnPointCount);
-        }
-    }
-
-    private static int countReturnPoints(JSFunction function) {
-        final PsiElement lastChild = function.getLastChild();
-        if (!(lastChild instanceof JSBlockStatement)) {
-            return 0;
-        }
-        boolean hasFallthroughReturn = false;
-        if (ControlFlowUtils.statementMayCompleteNormally((JSStatement) lastChild)) {
-            hasFallthroughReturn = true;
-        }
-        final ReturnCountVisitor visitor = new ReturnCountVisitor();
-        lastChild.accept(visitor);
-
-        final int returnCount = visitor.getReturnCount();
-        if (hasFallthroughReturn) {
-            return returnCount + 1;
-        } else {
-            return returnCount;
-        }
-    }
-
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new Visitor();
-    }
-
-    private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
-            final int returnPointCount = countReturnPoints(function);
-            if (returnPointCount <= 1) {
-                return;
-            }
-            registerFunctionError(function);
-        }
-    }
-
-    private static class ReturnCountVisitor extends JSRecursiveElementVisitor {
-        private int returnCount = 0;
-
-        @Override public void visitJSElement(JSElement jsElement) {
-            int oldCount = 0;
-            if (jsElement instanceof JSFunction) {
-                oldCount = returnCount;
-            }
-            super.visitJSElement(jsElement);
-
-            if (jsElement instanceof JSFunction) {
-                returnCount = oldCount;
-            }
-        }
-
-        @Override public void visitJSReturnStatement(JSReturnStatement statement) {
-            super.visitJSReturnStatement(statement);
-            returnCount++;
-        }
-
-        public int getReturnCount() {
-            return returnCount;
-        }
-    }
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new Visitor();
+	}
+
+	private static class Visitor extends BaseInspectionVisitor
+	{
+
+		@Override
+		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
+		{
+			final int returnPointCount = countReturnPoints(function);
+			if(returnPointCount <= 1)
+			{
+				return;
+			}
+			registerFunctionError(function);
+		}
+	}
+
+	private static class ReturnCountVisitor extends JSRecursiveElementVisitor
+	{
+		private int returnCount = 0;
+
+		@Override
+		public void visitJSElement(JSElement jsElement)
+		{
+			int oldCount = 0;
+			if(jsElement instanceof JSFunction)
+			{
+				oldCount = returnCount;
+			}
+			super.visitJSElement(jsElement);
+
+			if(jsElement instanceof JSFunction)
+			{
+				returnCount = oldCount;
+			}
+		}
+
+		@Override
+		public void visitJSReturnStatement(JSReturnStatement statement)
+		{
+			super.visitJSReturnStatement(statement);
+			returnCount++;
+		}
+
+		public int getReturnCount()
+		{
+			return returnCount;
+		}
+	}
 }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index 00a8f99f..bf7d95d1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -14,71 +14,87 @@
 import javax.annotation.Nonnull;
 
 @ExtensionImpl
-public class ChainedFunctionCallJSInspection extends JavaScriptInspection {
-
-
+public class ChainedFunctionCallJSInspection extends JavaScriptInspection
+{
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return true;
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.STYLE_GROUP_NAME;
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "chained.function.call.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message(
+				"chained.function.call.display.name");
+	}
 
-    @RequiredReadAction
+	@RequiredReadAction
 	@Override
 	@Nonnull
-    protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message(
-                "chained.function.call.problem.descriptor");
-    }
+	protected String buildErrorString(Object state, Object... args)
+	{
+		return InspectionJSBundle.message(
+				"chained.function.call.problem.descriptor");
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new NestedMethodCallVisitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new NestedMethodCallVisitor();
+	}
 
 
-    private static class NestedMethodCallVisitor extends BaseInspectionVisitor {
+	private static class NestedMethodCallVisitor extends BaseInspectionVisitor
+	{
 
-        @Override public void visitJSCallExpression(
-                @Nonnull JSCallExpression expression) {
-            super.visitJSCallExpression(expression);
-            final JSExpression reference =
-                    expression.getMethodExpression();
-            if(!(reference instanceof JSReferenceExpression))
-            {
-                return;
-            }
-            final JSExpression qualifier = ((JSReferenceExpression)reference).getQualifier();
-            if (qualifier == null) {
-                return;
-            }
-            if (!isCallExpression(qualifier)) {
-                return;
-            }
-            registerFunctionCallError(expression);
-        }
+		@Override
+		public void visitJSCallExpression(
+				@Nonnull JSCallExpression expression)
+		{
+			super.visitJSCallExpression(expression);
+			final JSExpression reference =
+					expression.getMethodExpression();
+			if(!(reference instanceof JSReferenceExpression))
+			{
+				return;
+			}
+			final JSExpression qualifier = ((JSReferenceExpression) reference).getQualifier();
+			if(qualifier == null)
+			{
+				return;
+			}
+			if(!isCallExpression(qualifier))
+			{
+				return;
+			}
+			registerFunctionCallError(expression);
+		}
 
 
-        private static boolean isCallExpression(JSExpression expression) {
-            if (expression instanceof JSCallExpression ) {
-                return true;
-            }
-            if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression =
-                        (JSParenthesizedExpression) expression;
-                final JSExpression containedExpression =
-                        parenthesizedExpression.getInnerExpression();
-                return isCallExpression(containedExpression);
-            }
-            return false;
-        }
-    }
+		private static boolean isCallExpression(JSExpression expression)
+		{
+			if(expression instanceof JSCallExpression)
+			{
+				return true;
+			}
+			if(expression instanceof JSParenthesizedExpression)
+			{
+				final JSParenthesizedExpression parenthesizedExpression =
+						(JSParenthesizedExpression) expression;
+				final JSExpression containedExpression =
+						parenthesizedExpression.getInnerExpression();
+				return isCallExpression(containedExpression);
+			}
+			return false;
+		}
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index 13b8773c..d0473e37 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -14,60 +14,74 @@
 import javax.annotation.Nonnull;
 
 
-
 @ExtensionImpl
-public class NestedFunctionCallJSInspection extends JavaScriptInspection {
-
-
+public class NestedFunctionCallJSInspection extends JavaScriptInspection
+{
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return false;
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME;
-    }
+	public String getGroupDisplayName()
+	{
+		return JSGroupNames.STYLE_GROUP_NAME;
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "nested.function.call.display.name");
-    }
+	public String getDisplayName()
+	{
+		return InspectionJSBundle.message(
+				"nested.function.call.display.name");
+	}
 
-    @RequiredReadAction
+	@RequiredReadAction
 	@Override
 	@Nonnull
-    protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message(
-                "nested.function.call.problem.descriptor");
-    }
+	protected String buildErrorString(Object state, Object... args)
+	{
+		return InspectionJSBundle.message(
+				"nested.function.call.problem.descriptor");
+	}
 
-    @Override
-	public BaseInspectionVisitor buildVisitor() {
-        return new NestedMethodCallVisitor();
-    }
+	@Override
+	public BaseInspectionVisitor buildVisitor()
+	{
+		return new NestedMethodCallVisitor();
+	}
 
-    private static class NestedMethodCallVisitor extends BaseInspectionVisitor {
+	private static class NestedMethodCallVisitor extends BaseInspectionVisitor
+	{
 
-        @Override public void visitJSCallExpression(
-                @Nonnull JSCallExpression expression) {
-            super.visitJSCallExpression(expression);
-            JSExpression outerExpression = expression;
-            while (outerExpression != null &&
-                    outerExpression.getParent()instanceof JSExpression) {
-                outerExpression = (JSExpression) outerExpression.getParent();
-            }
-            if (outerExpression == null) {
-                return;
-            }
-            final PsiElement parent = outerExpression.getParent();
-            if (!(parent instanceof JSArgumentList)) {
-                return;
-            }
-            final PsiElement grandParent = parent.getParent();
-            if (!(grandParent instanceof JSCallExpression)) {
-                return;
-            }
-            registerFunctionCallError(expression);
-        }
-    }
+		@Override
+		public void visitJSCallExpression(
+				@Nonnull JSCallExpression expression)
+		{
+			super.visitJSCallExpression(expression);
+			JSExpression outerExpression = expression;
+			while(outerExpression != null &&
+					outerExpression.getParent() instanceof JSExpression)
+			{
+				outerExpression = (JSExpression) outerExpression.getParent();
+			}
+			if(outerExpression == null)
+			{
+				return;
+			}
+			final PsiElement parent = outerExpression.getParent();
+			if(!(parent instanceof JSArgumentList))
+			{
+				return;
+			}
+			final PsiElement grandParent = parent.getParent();
+			if(!(grandParent instanceof JSCallExpression))
+			{
+				return;
+			}
+			registerFunctionCallError(expression);
+		}
+	}
 }
\ No newline at end of file

From 94654edd6bcfbc1b8113c72cfd46566d6561f4b4 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 18 Jun 2023 14:13:42 +0400
Subject: [PATCH 172/340] disable by default

---
 .../naming/FunctionNamingConventionJSInspection.java        | 6 ++++++
 .../naming/LocalVariableNamingConventionJSInspection.java   | 6 ++++++
 .../naming/ParameterNamingConventionJSInspection.java       | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index 0eb6fa2f..98157ebe 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -19,6 +19,12 @@ public class FunctionNamingConventionJSInspection extends ConventionInspection
 {
 	private final RenameFix fix = new RenameFix();
 
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return false;
+	}
+
 	@Nonnull
 	@Override
 	public InspectionToolState<?> createStateProvider()
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index f251b25d..22966df2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -19,6 +19,12 @@ public class LocalVariableNamingConventionJSInspection extends ConventionInspect
 {
 	private final RenameFix fix = new RenameFix();
 
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return false;
+	}
+
 	@Override
 	@Nonnull
 	public String getDisplayName()
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index b1da91ed..732295b9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -21,6 +21,12 @@ public class ParameterNamingConventionJSInspection extends ConventionInspection
 {
 	private final RenameFix fix = new RenameFix();
 
+	@Override
+	public boolean isEnabledByDefault()
+	{
+		return false;
+	}
+
 	@Override
 	@Nonnull
 	public String getDisplayName()

From eee1a01f7509a16423b278aefdd2a70e377a1b13 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 18 Jun 2023 15:46:11 +0400
Subject: [PATCH 173/340] correct parsing for extends/implements

---
 .../lang/javascript/types/JSFileElementType.java         | 9 +++------
 .../javascript/lang/parsing/ExpressionParsing.java       | 4 +++-
 .../lang/parsing/EcmaScriptStatementParsing.java         | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index a213b251..69e65082 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -89,11 +89,8 @@ public String getExternalId()
 	@Override
 	public int getStubVersion()
 	{
-		int version = 45;
-		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList())
-		{
-			version += javaScriptIndexer.getVersion();
-		}
-		return version;
+		int[] version = new int[]{47};
+		JavaScriptIndexer.EP_NAME.forEachExtensionSafe(javaScriptIndexer -> version[0] ++);
+		return version[0];
 	}
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index b7a18f0b..7962317f 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -1028,11 +1028,13 @@ else if(!parseQualifiedTypeName(builder))
 		return true;
 	}
 
-	public void parseSimpleExpression(final PsiBuilder builder)
+	public boolean parseSimpleExpression(final PsiBuilder builder)
 	{
 		if(!parseUnaryExpression(builder))
 		{
 			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+			return false;
 		}
+		return true;
 	}
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index 7c2c3f32..2af0968a 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -495,12 +495,12 @@ private void parseReferenceList(final PsiBuilder builder)
 		final PsiBuilder.Marker referenceList = builder.mark();
 		builder.advanceLexer();
 
-		if(getExpressionParsing().parseQualifiedTypeName(builder))
+		if(getExpressionParsing().parseSimpleExpression(builder))
 		{
 			while(builder.getTokenType() == JSTokenTypes.COMMA)
 			{
 				builder.advanceLexer();
-				if(!getExpressionParsing().parseQualifiedTypeName(builder))
+				if(!getExpressionParsing().parseSimpleExpression(builder))
 				{
 					break;
 				}

From fe271dc393d16b3f20c269104dddc6c26314aac2 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 8 Aug 2023 22:40:40 +0400
Subject: [PATCH 174/340] fix exception while opening code style settings

---
 .../formatter/JavaScriptLanguageCodeStyleSettingsProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index b404c3b1..220bf5ea 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -90,7 +90,7 @@ private static String loadPreview(String file)
 	{
 		try
 		{
-			return FileUtil.loadTextAndClose(JavaScriptLanguageCodeStyleSettingsProvider.class.getResourceAsStream("/codeStyle" + file));
+			return FileUtil.loadTextAndClose(JavaScriptLanguageCodeStyleSettingsProvider.class.getResourceAsStream("/codeStyle/" + file));
 		}
 		catch(IOException e)
 		{

From 1048fddc5c2b2e52591a88a67ed4530f8943a11a Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 31 Aug 2023 11:46:42 +0400
Subject: [PATCH 175/340] rename marker interface

---
 .../language/StandardJavaScriptVersion.java      | 16 ++++++++++++++++
 .../language/StandardJavaScriptVersions.java     |  8 --------
 .../lang/JavaScript15LanguageVersion.java        |  4 ++--
 .../lang/StandardJavaScriptVersionsImpl.java     |  5 +++--
 .../lang/BaseEcmaScriptJavaScriptVersion.java    |  4 ++--
 .../lang/EcmaScript6JavaScriptVersion.java       |  4 ++--
 .../lang/JavaScript16LanguageVersion.java        |  4 ++--
 .../lang/JavaScript17LanguageVersion.java        |  4 ++--
 .../lang/JavaScript185LanguageVersion.java       |  4 ++--
 .../lang/JavaScript18LanguageVersion.java        |  4 ++--
 10 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java

diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java
new file mode 100644
index 00000000..4ddfe95a
--- /dev/null
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java
@@ -0,0 +1,16 @@
+package consulo.javascript.language;
+
+/**
+ * Marker for javascript version which can be selected inside combobox for module
+ *
+* @author VISTALL
+* @since 31/08/2023
+*/
+public interface StandardJavaScriptVersion
+{
+	@Deprecated
+	default int getWeight()
+	{
+		return 0;
+	}
+}
diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
index 14efc045..1c89344b 100644
--- a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
@@ -31,14 +31,6 @@
 @ServiceAPI(ComponentScope.APPLICATION)
 public abstract class StandardJavaScriptVersions
 {
-	public static interface Marker
-	{
-		@Deprecated
-		default int getWeight()
-		{
-			return 0;
-		}
-	}
 
 	@Nonnull
 	public static StandardJavaScriptVersions getInstance()
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
index a525c6f5..fc5f0901 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -4,7 +4,7 @@
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.lang.lexer.JavaScript15Lexer;
 import consulo.javascript.language.JavaScriptLanguage;
-import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.javascript.language.StandardJavaScriptVersion;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
@@ -16,7 +16,7 @@
  * @since 05.03.2015
  */
 @ExtensionImpl
-public class JavaScript15LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
+public class JavaScript15LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
 {
 	private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript15Lexer();
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index 124aaa3a..1096566c 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -3,6 +3,7 @@
 import consulo.annotation.component.ServiceImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.language.JavaScriptLanguageVersion;
+import consulo.javascript.language.StandardJavaScriptVersion;
 import consulo.javascript.language.StandardJavaScriptVersions;
 import consulo.language.version.LanguageVersion;
 import consulo.util.lang.StringUtil;
@@ -34,7 +35,7 @@ public List<JavaScriptLanguageVersion> getValidLanguageVersions()
 		LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
 		for(LanguageVersion version : versions)
 		{
-			if(version instanceof StandardJavaScriptVersions.Marker)
+			if(version instanceof StandardJavaScriptVersion)
 			{
 				list.add((BaseJavaScriptLanguageVersion) version);
 			}
@@ -55,7 +56,7 @@ public BaseJavaScriptLanguageVersion findVersionById(@Nullable String id)
 		LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
 		for(LanguageVersion version : versions)
 		{
-			if(version instanceof StandardJavaScriptVersions.Marker && id.equals(version.getId()))
+			if(version instanceof StandardJavaScriptVersion && id.equals(version.getId()))
 			{
 				return (BaseJavaScriptLanguageVersion) version;
 			}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
index 7cb98e99..9c765d12 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -9,7 +9,7 @@
 import consulo.javascript.lang.lexer.JavaScriptFlexAdapter;
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
-import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.javascript.language.StandardJavaScriptVersion;
 import consulo.language.ast.TokenSet;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
@@ -22,7 +22,7 @@
  * @author VISTALL
  * @since 06/12/2021
  */
-public abstract class BaseEcmaScriptJavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker, JavaScriptVersionWithHelper
+public abstract class BaseEcmaScriptJavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion, JavaScriptVersionWithHelper
 {
 	protected BaseEcmaScriptJavaScriptVersion(@Nonnull String id)
 	{
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
index 844dc01b..8db98a4f 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
@@ -20,7 +20,7 @@
 import consulo.javascript.lang.psi.impl.resolve.JavaScriptVersionWithHelper;
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptLanguage;
-import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.javascript.language.StandardJavaScriptVersion;
 import jakarta.inject.Inject;
 
 import javax.annotation.Nonnull;
@@ -30,7 +30,7 @@
  * @since 12.12.2015
  */
 @ExtensionImpl
-public class EcmaScript6JavaScriptVersion extends BaseEcmaScriptJavaScriptVersion implements StandardJavaScriptVersions.Marker, JavaScriptVersionWithHelper
+public class EcmaScript6JavaScriptVersion extends BaseEcmaScriptJavaScriptVersion implements StandardJavaScriptVersion, JavaScriptVersionWithHelper
 {
 	@Nonnull
 	public static EcmaScript6JavaScriptVersion getInstance()
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
index a73956c6..9b7a9adb 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
@@ -21,7 +21,7 @@
 import consulo.javascript.javascript16.lang.lexer.JavaScript16Lexer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptLanguage;
-import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.javascript.language.StandardJavaScriptVersion;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
@@ -33,7 +33,7 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScript16LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
+public class JavaScript16LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
 {
 	private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript16Lexer();
 
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
index 349dbc1e..af42dc90 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
@@ -21,7 +21,7 @@
 import consulo.javascript.javascript17.lang.lexer.JavaScript17Lexer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptLanguage;
-import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.javascript.language.StandardJavaScriptVersion;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
@@ -33,7 +33,7 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScript17LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
+public class JavaScript17LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
 {
 	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
index dd9a0fba..db36cd1e 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
@@ -21,7 +21,7 @@
 import consulo.javascript.javascript17.lang.lexer.JavaScript17Lexer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptLanguage;
-import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.javascript.language.StandardJavaScriptVersion;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
@@ -33,7 +33,7 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScript185LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
+public class JavaScript185LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
 {
 	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
index d43a56e2..7e1e3b00 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
@@ -21,7 +21,7 @@
 import consulo.javascript.javascript17.lang.lexer.JavaScript17Lexer;
 import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptLanguage;
-import consulo.javascript.language.StandardJavaScriptVersions;
+import consulo.javascript.language.StandardJavaScriptVersion;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
@@ -33,7 +33,7 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScript18LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersions.Marker
+public class JavaScript18LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
 {
 	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 

From ba80e59413ad9951cfc7ab4ef0b896cc27b93c75 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 31 Aug 2023 12:01:11 +0400
Subject: [PATCH 176/340] use last version for js files without module

---
 .../internal/DefaultJavaScriptVersion.java          | 11 +++++++++++
 base-api/src/main/java/module-info.java             |  2 ++
 .../lang/StandardJavaScriptVersionsImpl.java        | 13 +++++++++++--
 .../lang/EcmaScript12JavaScriptVersion.java         |  3 ++-
 .../lang/JavaScriptLanguageVersionResolver.java     |  2 +-
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java

diff --git a/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java b/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java
new file mode 100644
index 00000000..bcd97441
--- /dev/null
+++ b/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java
@@ -0,0 +1,11 @@
+package consulo.javascript.internal;
+
+/**
+ * Marker for default javascript file version if not selected
+ * 
+ * @author VISTALL
+ * @since 31/08/2023
+ */
+public interface DefaultJavaScriptVersion
+{
+}
diff --git a/base-api/src/main/java/module-info.java b/base-api/src/main/java/module-info.java
index 8b6845e9..824b484d 100644
--- a/base-api/src/main/java/module-info.java
+++ b/base-api/src/main/java/module-info.java
@@ -21,4 +21,6 @@
 	exports consulo.javascript.psi.impl.reference;
 	exports consulo.javascript.language.psi.stub;
 	exports consulo.javascript.psi.stubs;
+
+	exports consulo.javascript.internal to consulo.javascript.ecmascript.impl, consulo.javascript.base.impl;
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index 1096566c..bfe3287d 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -1,6 +1,7 @@
 package consulo.javascript.lang;
 
 import consulo.annotation.component.ServiceImpl;
+import consulo.javascript.internal.DefaultJavaScriptVersion;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.language.JavaScriptLanguageVersion;
 import consulo.javascript.language.StandardJavaScriptVersion;
@@ -23,8 +24,16 @@
 public class StandardJavaScriptVersionsImpl extends StandardJavaScriptVersions
 {
 	@Nonnull
-	public BaseJavaScriptLanguageVersion getDefaultVersion()
+	public JavaScriptLanguageVersion getDefaultVersion()
 	{
+		LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
+		for(LanguageVersion version : versions)
+		{
+			if(version instanceof DefaultJavaScriptVersion)
+			{
+				return (JavaScriptLanguageVersion) version;
+			}
+		}
 		return JavaScript15LanguageVersion.getInstance();
 	}
 
@@ -46,7 +55,7 @@ public List<JavaScriptLanguageVersion> getValidLanguageVersions()
 	}
 
 	@Nonnull
-	public BaseJavaScriptLanguageVersion findVersionById(@Nullable String id)
+	public JavaScriptLanguageVersion findVersionById(@Nullable String id)
 	{
 		if(StringUtil.isEmpty(id))
 		{
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
index 76cdf9bc..a6ca7876 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
@@ -1,6 +1,7 @@
 package consulo.javascript.ecmascript.lang;
 
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.internal.DefaultJavaScriptVersion;
 import consulo.javascript.language.JavaScriptLanguage;
 import jakarta.inject.Inject;
 
@@ -11,7 +12,7 @@
  * @since 06/12/2021
  */
 @ExtensionImpl
-public class EcmaScript12JavaScriptVersion extends EcmaScript6JavaScriptVersion
+public class EcmaScript12JavaScriptVersion extends EcmaScript6JavaScriptVersion implements DefaultJavaScriptVersion
 {
 	@Nonnull
 	public static EcmaScript12JavaScriptVersion getInstance()
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
index 664aaa9c..15a96023 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
@@ -55,7 +55,7 @@ public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable
 		FileType fileType = containingFile.getFileType();
 		if(fileType instanceof JavaScriptFileTypeWithVersion)
 		{
-			Module module = ModuleUtilCore.findModuleForPsiElement(element);
+			Module module = element.getModule();
 			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(module, element.getContainingFile().getVirtualFile());
 		}
 

From 10c5a679ffb3bdc218ca9eb74a85ec3261e87270 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 31 Aug 2023 17:50:40 +0400
Subject: [PATCH 177/340] return textoffset zero - fix error of getting value
 range

---
 .../javascript/psi/impl/JSXmlLiteralExpressionImpl.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 6bb28569..648ad825 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -313,6 +313,13 @@ public Map<String, String> getLocalNamespaceDeclarations()
 		return Collections.emptyMap();
 	}
 
+	@RequiredReadAction
+	@Override
+	public int getTextOffset()
+	{
+		return 0;
+	}
+
 	@Nonnull
 	@Override
 	public XmlTagValue getValue()

From d23b14e889d9ace58bcf4aad50fd3699a3858d37 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 1 Sep 2023 17:45:48 +0400
Subject: [PATCH 178/340] drop method override which is not need

---
 .../lang/javascript/JSElementTypes.java       | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 5878b135..431a2e59 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -19,21 +19,21 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.*;
 import com.intellij.lang.javascript.psi.stubs.*;
-import com.intellij.lang.javascript.types.*;
+import com.intellij.lang.javascript.types.JSFileElementType;
+import com.intellij.lang.javascript.types.JSFunctionElementType;
 import consulo.annotation.DeprecationInfo;
 import consulo.javascript.ecmascript4.psi.impl.EcmaScript4ElementTypes;
+import consulo.javascript.impl.language.psi.JSComputedNameImpl;
 import consulo.javascript.impl.language.psi.JSStubElementType;
-import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.impl.language.psi.JavaScriptLambdaExpressionImpl;
+import consulo.javascript.impl.language.psi.JavaScriptSpreadExpressionImpl;
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringElementImpl;
 import consulo.javascript.lang.parsing.impl.JavaSciptDestructuringObjectImpl;
 import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringParameterImpl;
 import consulo.javascript.lang.parsing.impl.JavaScriptDestructuringShorthandedPropertyImpl;
 import consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl;
-import consulo.javascript.impl.language.psi.JSComputedNameImpl;
-import consulo.javascript.impl.language.psi.JavaScriptLambdaExpressionImpl;
-import consulo.javascript.impl.language.psi.JavaScriptSpreadExpressionImpl;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.psi.stubs.JSFileStub;
-import consulo.language.Language;
 import consulo.language.ast.*;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.stub.IStubFileElementType;
@@ -49,15 +49,7 @@ public interface JSElementTypes
 {
 	IStubFileElementType<JSFileStub> FILE = new JSFileElementType(JavaScriptLanguage.INSTANCE);
 
-	IElementType EMBEDDED_CONTENT = new ILazyParseableElementType("EMBEDDED_CONTENT", JavaScriptLanguage.INSTANCE)
-	{
-		@Nonnull
-		@Override
-		public Language getLanguage()
-		{
-			return JavaScriptLanguage.INSTANCE;
-		}
-	};
+	IElementType EMBEDDED_CONTENT = new ILazyParseableElementType("EMBEDDED_CONTENT", JavaScriptLanguage.INSTANCE);
 	IElementType EMBEDDED_EXPRESSION = new ElementTypeAsPsiFactory("EMBEDDED_EXPRESSION", JavaScriptLanguage.INSTANCE, JSEmbeddedContentImpl::new);
 
 	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = JSStubElementTypes.FUNCTION_DECLARATION;

From 57571f5a8839f4d4cfb0153741a47653b805793a Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 14 Feb 2024 22:16:33 +0400
Subject: [PATCH 179/340] impl SyntheticIntentionAction - fix assertion

---
 .gitignore                                                     | 3 ++-
 .../lang/javascript/impl/validation/JSAnnotatingVisitor.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d26fae78..9cdefba6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 !/.consulo/codeStyleSettings.xml
 /out
 /target
-target/
\ No newline at end of file
+target/
+plugin/sandbox/
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index e4315a64..c89f6362 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -1101,7 +1101,7 @@ public boolean startInWriteAction() {
     checkFileUnderSourceRoot(packageStatement, new SimpleErrorReportingClient());
   }
 
-  public static class RemoveASTNodeFix implements IntentionAction, LocalQuickFix {
+  public static class RemoveASTNodeFix implements SyntheticIntentionAction, LocalQuickFix {
     private final ASTNode[] myAstNodes;
     private final String myPropKey;
 

From beba880170a9a4e5da3d6032c2aec48a2af0793d Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 19 Apr 2024 14:22:41 +0400
Subject: [PATCH 180/340] enable js parsing inside html

---
 .../lang/javascript/JSElementTypes.java       |  28 ++++-
 .../ide/hightlight/JavaScriptHighlighter.java | 111 ++++++++----------
 .../JavaScriptEmbeddedTokenHighlighter.java   |  27 +++++
 .../JavaScriptHtmlScriptContentProvider.java  |  41 +++++++
 4 files changed, 146 insertions(+), 61 deletions(-)
 create mode 100644 plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
 create mode 100644 plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 431a2e59..35f62174 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.javascript.types.JSFileElementType;
 import com.intellij.lang.javascript.types.JSFunctionElementType;
 import consulo.annotation.DeprecationInfo;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.ecmascript4.psi.impl.EcmaScript4ElementTypes;
 import consulo.javascript.impl.language.psi.JSComputedNameImpl;
 import consulo.javascript.impl.language.psi.JSStubElementType;
@@ -34,9 +35,17 @@
 import consulo.javascript.lang.psi.impl.JSRegExpLiteralExpressionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.psi.stubs.JSFileStub;
+import consulo.language.Language;
 import consulo.language.ast.*;
+import consulo.language.parser.ParserDefinition;
+import consulo.language.parser.PsiBuilder;
+import consulo.language.parser.PsiBuilderFactory;
+import consulo.language.parser.PsiParser;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.stub.IStubFileElementType;
+import consulo.language.version.LanguageVersion;
+import consulo.language.version.LanguageVersionUtil;
+import consulo.project.Project;
 
 import javax.annotation.Nonnull;
 
@@ -49,7 +58,21 @@ public interface JSElementTypes
 {
 	IStubFileElementType<JSFileStub> FILE = new JSFileElementType(JavaScriptLanguage.INSTANCE);
 
-	IElementType EMBEDDED_CONTENT = new ILazyParseableElementType("EMBEDDED_CONTENT", JavaScriptLanguage.INSTANCE);
+	IElementType EMBEDDED_CONTENT = new ILazyParseableElementType("EMBEDDED_CONTENT", JavaScriptLanguage.INSTANCE)
+	{
+		@Override
+		@RequiredReadAction
+		protected ASTNode doParseContents(@Nonnull final ASTNode chameleon, @Nonnull final PsiElement psi)
+		{
+			LanguageVersion languageVersion = LanguageVersionUtil.findLanguageVersion(getLanguage(), psi);
+			Project project = psi.getProject();
+			Language languageForParser = getLanguageForParser(psi);
+			PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, languageVersion, chameleon.getChars());
+			PsiParser parser = ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
+			return parser.parse(this, builder, languageVersion).getFirstChildNode();
+		}
+	};
+
 	IElementType EMBEDDED_EXPRESSION = new ElementTypeAsPsiFactory("EMBEDDED_EXPRESSION", JavaScriptLanguage.INSTANCE, JSEmbeddedContentImpl::new);
 
 	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = JSStubElementTypes.FUNCTION_DECLARATION;
@@ -93,7 +116,8 @@ public interface JSElementTypes
 	IElementType DESTRUCTURING_ELEMENT = new ElementTypeAsPsiFactory("DESTRUCTURING_ELEMENT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringElementImpl::new);
 	IElementType DESTRUCTURING_PARAMETER = new ElementTypeAsPsiFactory("DESTRUCTURING_PARAMETER", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringParameterImpl::new);
 	IElementType DESTRUCTURING_OBJECT = new ElementTypeAsPsiFactory("DESTRUCTURING_OBJECT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringObjectImpl::new);
-	IElementType DESTRUCTURING_SHORTHANDED_PROPERTY = new ElementTypeAsPsiFactory("DESTRUCTURING_SHORTHANDED_PROPERTY", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringShorthandedPropertyImpl::new);
+	IElementType DESTRUCTURING_SHORTHANDED_PROPERTY = new ElementTypeAsPsiFactory("DESTRUCTURING_SHORTHANDED_PROPERTY", JavaScriptLanguage.INSTANCE,
+			JavaScriptDestructuringShorthandedPropertyImpl::new);
 	IElementType WITH_STATEMENT = new ElementTypeAsPsiFactory("WITH_STATEMENT", JavaScriptLanguage.INSTANCE, JSWithStatementImpl::new);
 	IElementType RETURN_STATEMENT = new ElementTypeAsPsiFactory("RETURN_STATEMENT", JavaScriptLanguage.INSTANCE, JSReturnStatementImpl::new);
 	IElementType THROW_STATEMENT = new ElementTypeAsPsiFactory("THROW_STATEMENT", JavaScriptLanguage.INSTANCE, JSThrowStatementImpl::new);
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
index 5670f88c..5569c308 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
@@ -20,19 +20,16 @@
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.highlighting.JavaScriptHighlightingLexer;
-import consulo.application.util.function.Processor;
 import consulo.colorScheme.TextAttributesKey;
 import consulo.language.ast.IElementType;
 import consulo.language.ast.StringEscapesTokenTypes;
 import consulo.language.ast.TokenSet;
 import consulo.language.editor.highlight.SyntaxHighlighterBase;
-import consulo.language.impl.ast.Factory;
 import consulo.language.lexer.Lexer;
+import consulo.util.collection.MultiMap;
 import consulo.xml.editor.XmlHighlighterColors;
 
 import javax.annotation.Nonnull;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.function.Supplier;
 
 /**
@@ -41,90 +38,86 @@
  */
 public class JavaScriptHighlighter extends SyntaxHighlighterBase
 {
-	private static Map<IElementType, TextAttributesKey> keys1;
-	private static Map<IElementType, TextAttributesKey> keys2;
-
-	static
+	public static void storeDefaults(MultiMap<IElementType, TextAttributesKey> keys)
 	{
-		keys1 = new HashMap<IElementType, TextAttributesKey>();
-		keys2 = new HashMap<IElementType, TextAttributesKey>();
-
 		TokenSet operations = TokenSet.andNot(JSTokenTypes.OPERATIONS, TokenSet.create(JSTokenTypes.AS_KEYWORD, JSTokenTypes.IS_KEYWORD));
 
-		SyntaxHighlighterBase.safeMap(keys1, operations, JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN);
+		for(IElementType type : operations.getTypes())
+		{
+			keys.putValue(type, JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN);
+		}
 
-		safeMap(keys1, JSTokenTypes.KEYWORDS, JavaScriptSyntaxHighlightKeys.JS_KEYWORD);
+		for(IElementType type : JSTokenTypes.KEYWORDS.getTypes())
+		{
+			keys.putValue(type, JavaScriptSyntaxHighlightKeys.JS_KEYWORD);
+		}
 
-		keys1.put(StringEscapesTokenTypes.VALID_STRING_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_VALID_STRING_ESCAPE);
-		keys1.put(StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE);
-		keys1.put(StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE);
+		keys.putValue(StringEscapesTokenTypes.VALID_STRING_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_VALID_STRING_ESCAPE);
+		keys.putValue(StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE);
+		keys.putValue(StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE);
 
-		keys1.put(JSTokenTypes.NUMERIC_LITERAL, JavaScriptSyntaxHighlightKeys.JS_NUMBER);
-		keys1.put(JSTokenTypes.STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
-		keys1.put(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
-		keys1.put(JSTokenTypes.INTERPOLATION_STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
-		keys1.put(JSTokenTypes.REGEXP_LITERAL, JavaScriptSyntaxHighlightKeys.JS_REGEXP);
+		keys.putValue(JSTokenTypes.NUMERIC_LITERAL, JavaScriptSyntaxHighlightKeys.JS_NUMBER);
+		keys.putValue(JSTokenTypes.STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
+		keys.putValue(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
+		keys.putValue(JSTokenTypes.INTERPOLATION_STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
+		keys.putValue(JSTokenTypes.REGEXP_LITERAL, JavaScriptSyntaxHighlightKeys.JS_REGEXP);
 
-		keys1.put(JSTokenTypes.LPAR, JavaScriptSyntaxHighlightKeys.JS_PARENTHS);
-		keys1.put(JSTokenTypes.RPAR, JavaScriptSyntaxHighlightKeys.JS_PARENTHS);
+		keys.putValue(JSTokenTypes.LPAR, JavaScriptSyntaxHighlightKeys.JS_PARENTHS);
+		keys.putValue(JSTokenTypes.RPAR, JavaScriptSyntaxHighlightKeys.JS_PARENTHS);
 
-		keys1.put(JSTokenTypes.LBRACE, JavaScriptSyntaxHighlightKeys.JS_BRACES);
-		keys1.put(JSTokenTypes.RBRACE, JavaScriptSyntaxHighlightKeys.JS_BRACES);
+		keys.putValue(JSTokenTypes.LBRACE, JavaScriptSyntaxHighlightKeys.JS_BRACES);
+		keys.putValue(JSTokenTypes.RBRACE, JavaScriptSyntaxHighlightKeys.JS_BRACES);
 
-		keys1.put(JSTokenTypes.LBRACKET, JavaScriptSyntaxHighlightKeys.JS_BRACKETS);
-		keys1.put(JSTokenTypes.RBRACKET, JavaScriptSyntaxHighlightKeys.JS_BRACKETS);
+		keys.putValue(JSTokenTypes.LBRACKET, JavaScriptSyntaxHighlightKeys.JS_BRACKETS);
+		keys.putValue(JSTokenTypes.RBRACKET, JavaScriptSyntaxHighlightKeys.JS_BRACKETS);
 
-		keys1.put(JSTokenTypes.COMMA, JavaScriptSyntaxHighlightKeys.JS_COMMA);
-		keys1.put(JSTokenTypes.DOT, JavaScriptSyntaxHighlightKeys.JS_DOT);
-		keys1.put(JSTokenTypes.SEMICOLON, JavaScriptSyntaxHighlightKeys.JS_SEMICOLON);
+		keys.putValue(JSTokenTypes.COMMA, JavaScriptSyntaxHighlightKeys.JS_COMMA);
+		keys.putValue(JSTokenTypes.DOT, JavaScriptSyntaxHighlightKeys.JS_DOT);
+		keys.putValue(JSTokenTypes.SEMICOLON, JavaScriptSyntaxHighlightKeys.JS_SEMICOLON);
 
-		keys1.put(JSTokenTypes.C_STYLE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT);
-		keys1.put(JSTokenTypes.XML_STYLE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT);
-		keys1.put(JSTokenTypes.DOC_COMMENT, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
-		keys1.put(JSTokenTypes.END_OF_LINE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_LINE_COMMENT);
-		keys1.put(JSTokenTypes.BAD_CHARACTER, JavaScriptSyntaxHighlightKeys.JS_BAD_CHARACTER);
+		keys.putValue(JSTokenTypes.C_STYLE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT);
+		keys.putValue(JSTokenTypes.XML_STYLE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT);
+		keys.putValue(JSTokenTypes.DOC_COMMENT, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
+		keys.putValue(JSTokenTypes.END_OF_LINE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_LINE_COMMENT);
+		keys.putValue(JSTokenTypes.BAD_CHARACTER, JavaScriptSyntaxHighlightKeys.JS_BAD_CHARACTER);
 
-		keys1.put(JSDocTokenTypes.DOC_TAG_NAME, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
-		keys2.put(JSDocTokenTypes.DOC_TAG_NAME, JavaScriptSyntaxHighlightKeys.JS_DOC_TAG);
+		keys.putValue(JSDocTokenTypes.DOC_TAG_NAME, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
+		keys.putValue(JSDocTokenTypes.DOC_TAG_NAME, JavaScriptSyntaxHighlightKeys.JS_DOC_TAG);
 
-		IElementType[] javadoc = IElementType.enumerate(new Processor<IElementType>()
-		{
-			@Override
-			public boolean process(IElementType type)
-			{
-				return type instanceof JSDocElementType;
-			}
-		});
+		IElementType[] javadoc = IElementType.enumerate(type -> type instanceof JSDocElementType);
 
 		for(IElementType type : javadoc)
 		{
-			keys1.put(type, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
+			keys.putValue(type, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
 		}
 
-		keys1.put(JSTokenTypes.JSDOC_TAG_DATA, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
+		keys.putValue(JSTokenTypes.JSDOC_TAG_DATA, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
 
 		for(IElementType type : JSTokenTypes.XML_TOKENS.getTypes())
 		{
-			keys1.put(type, XmlHighlighterColors.XML_TAG);
+			keys.putValue(type, XmlHighlighterColors.XML_TAG);
 		}
 
-		keys2.put(JSTokenTypes.XML_TAG_NAME, XmlHighlighterColors.XML_TAG_NAME);
-		keys2.put(JSTokenTypes.XML_NAME, XmlHighlighterColors.XML_ATTRIBUTE_NAME);
-		keys2.put(JSTokenTypes.XML_ATTR_VALUE, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys2.put(JSTokenTypes.XML_ATTR_VALUE_END, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys2.put(JSTokenTypes.XML_ATTR_VALUE_START, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys2.put(JSTokenTypes.XML_ATTR_EQUAL, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys2.put(JSTokenTypes.XML_ENTITY_REF, XmlHighlighterColors.XML_ENTITY_REFERENCE);
+		keys.putValue(JSTokenTypes.XML_TAG_NAME, XmlHighlighterColors.XML_TAG_NAME);
+		keys.putValue(JSTokenTypes.XML_NAME, XmlHighlighterColors.XML_ATTRIBUTE_NAME);
+		keys.putValue(JSTokenTypes.XML_ATTR_VALUE, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+		keys.putValue(JSTokenTypes.XML_ATTR_VALUE_END, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+		keys.putValue(JSTokenTypes.XML_ATTR_VALUE_START, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+		keys.putValue(JSTokenTypes.XML_ATTR_EQUAL, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+		keys.putValue(JSTokenTypes.XML_ENTITY_REF, XmlHighlighterColors.XML_ENTITY_REFERENCE);
 
-		keys1.put(JSTokenTypes.XML_STYLE_COMMENT, XmlHighlighterColors.XML_COMMENT);
-		keys1.put(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
+		keys.putValue(JSTokenTypes.XML_STYLE_COMMENT, XmlHighlighterColors.XML_COMMENT);
+		keys.putValue(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
 	}
 
-	private Supplier<Lexer> myFactory;
+	private final Supplier<Lexer> myFactory;
+	private final MultiMap<IElementType, TextAttributesKey> keys = MultiMap.createLinked();
 
 	public JavaScriptHighlighter(@Nonnull Supplier<Lexer> factory)
 	{
 		myFactory = factory;
+
+		storeDefaults(keys);
 	}
 
 	@Nonnull
@@ -138,6 +131,6 @@ public Lexer getHighlightingLexer()
 	@Nonnull
 	public TextAttributesKey[] getTokenHighlights(IElementType tokenType)
 	{
-		return pack(keys1.get(tokenType), keys2.get(tokenType));
+		return keys.get(tokenType).toArray(new TextAttributesKey[0]);
 	}
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
new file mode 100644
index 00000000..8eea8195
--- /dev/null
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
@@ -0,0 +1,27 @@
+package consulo.javascript.impl.html;
+
+import com.intellij.xml.highlighter.EmbeddedTokenHighlighter;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.colorScheme.TextAttributesKey;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.language.ast.IElementType;
+import consulo.util.collection.MultiMap;
+import consulo.xml.lang.xml.XMLLanguage;
+import jakarta.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2024-04-19
+ */
+@ExtensionImpl
+public class JavaScriptEmbeddedTokenHighlighter implements EmbeddedTokenHighlighter
+{
+	@Nonnull
+	@Override
+	public MultiMap<IElementType, TextAttributesKey> getEmbeddedTokenAttributes(@Nonnull XMLLanguage language)
+	{
+		MultiMap<IElementType, TextAttributesKey> keys = MultiMap.createLinked();
+		JavaScriptHighlighter.storeDefaults(keys);
+		return keys;
+	}
+}
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
new file mode 100644
index 00000000..174a10de
--- /dev/null
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
@@ -0,0 +1,41 @@
+package consulo.javascript.impl.html;
+
+import com.intellij.lang.javascript.JSElementTypes;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.lang.lexer.JavaScript15Lexer;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+import consulo.language.ast.IElementType;
+import consulo.language.lexer.Lexer;
+import consulo.xml.lang.HtmlScriptContentProvider;
+import jakarta.annotation.Nonnull;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2024-04-19
+ */
+@ExtensionImpl
+public class JavaScriptHtmlScriptContentProvider implements HtmlScriptContentProvider
+{
+	@Override
+	public IElementType getScriptElementType()
+	{
+		return JSElementTypes.EMBEDDED_CONTENT;
+	}
+
+	@Nullable
+	@Override
+	public Lexer getHighlightingLexer()
+	{
+		return new JavaScript15Lexer();
+	}
+
+	@Nonnull
+	@Override
+	public Language getLanguage()
+	{
+		return JavaScriptLanguage.INSTANCE;
+	}
+}

From d78f3fc36b9b3934b72a2442675778595c9d8d40 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 19 May 2024 15:57:55 +0400
Subject: [PATCH 181/340] drop usage dead icon

---
 .../java/consulo/javascript/run/debug/v8/V8StackFrame.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
index 22ef8552..0f62be4d 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
@@ -16,13 +16,13 @@
 
 package consulo.javascript.run.debug.v8;
 
-import consulo.application.AllIcons;
 import consulo.execution.debug.XDebuggerUtil;
 import consulo.execution.debug.XSourcePosition;
 import consulo.execution.debug.evaluation.XDebuggerEvaluator;
 import consulo.execution.debug.frame.XCompositeNode;
 import consulo.execution.debug.frame.XStackFrame;
 import consulo.execution.debug.frame.XValueChildrenList;
+import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.ex.ColoredTextContainer;
 import consulo.ui.ex.SimpleTextAttributes;
 import org.chromium.sdk.*;
@@ -131,7 +131,7 @@ public void customizePresentation(ColoredTextContainer component)
 		}
 
 		component.append(":" + (statementStartPosition.getLine() + 1), SimpleTextAttributes.REGULAR_ATTRIBUTES);
-		component.setIcon(AllIcons.Debugger.StackFrame);
+		component.setIcon(PlatformIconGroup.debuggerFrame());
 	}
 
 	@Override

From a55b4b04b6dc1a046c741645edd91e2d0e65da03 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 30 May 2024 14:11:59 +0400
Subject: [PATCH 182/340] drop flex icon and add another javascriptmodule icon

---
 .../flex.png                                      | Bin 677 -> 0 bytes
 .../javaScriptModule.svg                          |   7 +++++++
 .../ClientJavaScriptModuleExtensionProvider.java  |   2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)
 delete mode 100644 base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/flex.png
 create mode 100644 base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg

diff --git a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/flex.png b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/flex.png
deleted file mode 100644
index cf39e7dd234e4c57a6ebe097ae0c6904c213e26d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 677
zcmV;W0$TlvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!H%UZ6RCwBA
z{Qv(y10{e3L@+ZmgE{~H{byieVq#!pV`cdN?;pcIpcoGik8e<5V3Vb#wce{&FBmE-
zE16MD0J#9934|FK7=bi10|y5OSWaF+p=Q(OEx-Rm!Mu6%K@<Zr#xQ`95#$1P1|cC~
z-}M_d{DEnH^7zUBrl#gU=mxN$`|1Dxe+<8V{bY)WNSWa4;{$f?jhi?BPo6aSo`8Vh
zL#$!&_wQez&5UqC0Re&Ru&^)%P}p3(dX1s3zJA-UpTB%=-MWQ65JAAy%zR}?NT~OZ
z@8AAPNJwxQ8yhiAoH&Vro12?~gPq-D-P$!AKqvnITEyY$>9spBFwpedw{NU)zl4Q_
zUjX^_&!0a){1@!+IdkTM>6b5G{*Q`^xd(KSB8Ud@L15Ob*+1Y0I66A-TfctepDkOq
z{{Q&#BUnLFQu2S8Vi4Wd*6|ma4|K_4)F@$KNG&g~{PFwuZ?H>(gG25{N5{N_X@UU|
zKQS@sCQv;GiUA%Tp8Fp?dIDB-?AY=Dva<4pKt<+dW#zw-4FK^$;_!sz=jXqtwYBZt
z<Hr!qz!3i*7Z-mYD6P`g-tiIUf<J$LBfJ9?hr3|r%vmT-oG@|n4;B_yV~`(_{hW}H
z_#A5(EL^w<EcoWl+y8ZS_3s1(g(591tr$R|3{&jj;JAf{hgTLvBgX<G$bgE9s?R{@
z`~>2cKzzHSqb&gBJzzTc%f-d@d;R+Lr?+q4=87#HFjAVG0RjvF{yXBrY*xH300000
LNkvXXu0mjf&(1xy

diff --git a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg
new file mode 100644
index 00000000..fc6ba53d
--- /dev/null
+++ b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="14" height="14" x="1" y="1" fill="#f7df1e" fill-opacity=".6"/>
+    <path fill="#231F20" fill-opacity=".7" d="M2.09263916,5.02279053 C2.43660278,5.37304688 2.75674292,5.6 3.43024292,5.6 C4.21977539,5.6 4.5,5.02279053 4.5,4.61665039 L4.5,0 L6,0 L6,5.02279053 C6,6.04749756 4.99006348,7 3.675,7 C2.4435,7 1.725,6.66769756 1.2,6.04749756 L2.09263916,5.02279053 Z" transform="translate(2 7)"/>
+    <path fill="#231F20" fill-opacity=".7" d="M1.45915195,2.10213623 C1.45915195,1.5862793 1.926,1.4 2.7675,1.4 C2.7755,1.4 3.353,1.4 4.5,1.4 L4.5,0 C3.394,0 2.824,0 2.79,0 C1.167,0 0,0.642834473 0,2.03 C0,3.24033691 0.629333496,3.76668701 2.20687866,4.08250732 C3.36238304,4.3138362 3.7442325,4.52008115 3.7442325,4.9672 C3.7442325,5.41431885 3.2076416,5.6 2.20687866,5.6 C2.19087866,5.6 1.60525244,5.6 0.45,5.6 L0.45,7 C1.61325244,7 2.19887866,7 2.20687866,7 C5.25,7 5.25,5.6 5.25,4.9672 C5.25,4.08250732 4.53039551,3.38900146 3.23803711,3.00559082 C1.94567871,2.62218018 1.45915195,2.61799316 1.45915195,2.10213623 Z" transform="translate(9 7)"/>
+  </g>
+</svg>
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
index a288b88d..b0a3cc4d 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
@@ -42,7 +42,7 @@ public LocalizeValue getName()
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIconGroup.javascript();
+		return JavaScriptIconGroup.javascriptmodule();
 	}
 
 	@Nonnull

From 3d6eefb1f7097b2e5261be01c56613f38c8483f7 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 16 Jun 2024 15:48:02 +0400
Subject: [PATCH 183/340] use JS icon for SDK not js file icon

---
 .../javascript/client/module/sdk/ClientJavaScriptSdkType.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index 96a286b9..c23416e2 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -41,11 +41,11 @@ public boolean isRootTypeApplicable(OrderRootType type)
 		return type == BinariesOrderRootType.getInstance() || type == SourcesOrderRootType.getInstance();
 	}
 
-	@Nullable
+	@Nonnull
 	@Override
 	public Image getIcon()
 	{
-		return JavaScriptIconGroup.javascript();
+		return JavaScriptIconGroup.javascriptmodule();
 	}
 
 	@Override

From 99ec26f419a731e82a257ea649ba39806473713f Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 5 Jul 2024 20:40:52 +0300
Subject: [PATCH 184/340] Run configuration added.

---
 .../consulo_run_desktop_awt.xml               | 45 +++++++++++++++++++
 .gitignore                                    |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 .consulo/runConfigurations/consulo_run_desktop_awt.xml

diff --git a/.consulo/runConfigurations/consulo_run_desktop_awt.xml b/.consulo/runConfigurations/consulo_run_desktop_awt.xml
new file mode 100644
index 00000000..9e5dd1e0
--- /dev/null
+++ b/.consulo/runConfigurations/consulo_run_desktop_awt.xml
@@ -0,0 +1,45 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="consulo:run-desktop-awt" type="MavenRunConfiguration" factoryName="Maven" singleton="true">
+    <MavenSettings>
+      <option name="myGeneralSettings" />
+      <option name="myRunnerSettings">
+        <MavenRunnerSettings>
+          <option name="environmentProperties">
+            <map />
+          </option>
+          <option name="jreName" value="21" />
+          <option name="mavenProperties">
+            <map />
+          </option>
+          <option name="passParentEnv" value="true" />
+          <option name="runMavenInBackground" value="true" />
+          <option name="skipTests" value="false" />
+          <option name="vmOptions" value="--add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED" />
+        </MavenRunnerSettings>
+      </option>
+      <option name="myRunnerParameters">
+        <MavenRunnerParameters>
+          <option name="profiles">
+            <set />
+          </option>
+          <option name="goals">
+            <list>
+              <option value="consulo:run-desktop-awt" />
+              <option value="-pl" />
+              <option value=":consulo.javascript" />
+            </list>
+          </option>
+          <option name="profilesMap">
+            <map />
+          </option>
+          <option name="resolveToWorkspace" value="true" />
+          <option name="workingDirPath" value="$PROJECT_DIR$" />
+        </MavenRunnerParameters>
+      </option>
+    </MavenSettings>
+    <ConfigurationWrapper RunnerId="Debug" />
+    <method>
+      <option name="Maven.BeforeRunTask" enabled="true" file="$PROJECT_DIR$/pom.xml" goal="package" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 9cdefba6..d7c94e2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /.consulo
 !/.consulo/codeStyleSettings.xml
+!/.consulo/runConfigurations
 /out
 /target
 target/

From cc8297daabf6cb1b097c70d2c8d2de5cf6c0dab4 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 5 Jul 2024 21:43:30 +0400
Subject: [PATCH 185/340] Create maven.yml

---
 .github/workflows/maven.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 00000000..b2e62c5b
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,25 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: jdk21
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 21
+      uses: actions/setup-java@v1
+      with:
+        distribution: 'temurin'
+        java-version: 21
+    - name: Build with Maven
+      run: mvn -U -T 1C -Dmaven.javadoc.skip=true -B -V clean package

From 1e2db0af0b77ed2bc1440fca988fd7c0f19b41ac Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 6 Jul 2024 17:15:12 +0300
Subject: [PATCH 186/340] Replacing JavaScriptBundle with JavaScriptLocalize
 refactoring.

---
 .../javascript/language/JavaScriptBundle.java |   6 +
 ...consulo.javascript.JavaScriptLocalize.yaml |   2 +-
 .../messages/JavaScriptBundle.properties      |   2 +-
 .../lang/javascript/JSTokenTypes.java         |   8 +-
 .../CreateJSFunctionOrMethodFix.java          |   7 +-
 .../lang/javascript/parsing/JSDocParsing.java |  10 +-
 .../javascript/psi/impl/JSDocTagImpl.java     |   9 +-
 .../javascript/psi/impl/JSReferenceSet.java   |   4 +-
 .../qucikFixes/CreateJSFunctionFixBase.java   |  26 +-
 .../lang/parsing/ExpressionParsing.java       |  90 +--
 .../lang/parsing/FunctionParsing.java         |  10 +-
 .../lang/parsing/StatementParsing.java        |  78 +--
 .../parsing/EcmaScriptExpressionParsing.java  |   9 +-
 .../parsing/EcmaScriptStatementParsing.java   |  17 +-
 .../parsing/EcmaScript4ExpressionParsing.java |  10 +-
 .../parsing/EcmaScript4FunctionParsing.java   |  26 +-
 .../parsing/EcmaScript4StatementParsing.java  |  38 +-
 .../json/lang/JsonJavaScriptParser.java       |  30 +-
 .../intellij/javascript/JSClassNameMacro.java |   4 +-
 .../javascript/JSMethodNameMacro.java         |   4 +-
 .../impl/JSSmartEnterProcessor.java           |  10 +-
 .../impl/JavaScriptCodeContextType.java       |   6 +-
 .../JavaScriptFindUsagesProvider.java         |  48 +-
 ...ImportECMAScriptClassOrFunctionAction.java | 130 ++--
 .../generation/BaseJSGenerateHandler.java     |   7 +-
 .../JavaScriptGenerateAccessorHandler.java    |  23 +-
 .../JavaScriptImplementMethodsHandler.java    |  16 +-
 .../JavaScriptOverrideMethodsHandler.java     |  14 +-
 .../JavaScriptColorsAndFontsPage.java         |  58 +-
 .../JavaScriptHighlightVisitor.java           |   5 +-
 .../impl/inspections/CreateClassDialog.java   |  17 +-
 .../CreateClassOrInterfaceAction.java         |  30 +-
 .../JSDeprecatedSymbolsInspection.java        |  11 +-
 .../JSDuplicatedDeclarationInspection.java    |  14 +-
 .../JSUndeclaredVariableInspection.java       |  16 +-
 .../JSUnresolvedFunctionInspection.java       | 215 ++++--
 .../JSUnresolvedVariableInspection.java       |  56 +-
 .../JSUntypedDeclarationInspection.java       |  18 +-
 .../JSUnusedLocalSymbolsInspection.java       |  69 +-
 .../JSBaseClassBasedIntroduceDialog.java      |  10 +-
 .../refactoring/JSBaseIntroduceDialog.java    |  29 +-
 .../refactoring/JSBaseIntroduceHandler.java   |  79 ++-
 .../JSExtractFunctionDialog.java              |  10 +-
 .../JSExtractFunctionHandler.java             |  38 +-
 .../JSIntroduceConstantDialog.java            |  13 +-
 .../JSIntroduceConstantHandler.java           |  33 +-
 .../JSIntroduceFieldDialog.java               |   5 +-
 .../JSIntroduceFieldHandler.java              |  21 +-
 .../JSIntroduceVariableDialog.java            |  14 +-
 .../JSIntroduceVariableHandler.java           |  12 +-
 .../search/JSDefinitionsSearchExecutor.java   |  81 +--
 .../JSStructureItemPresentation.java          |  44 +-
 .../structureView/JSStructureViewModel.java   |  12 +-
 .../surroundWith/JSWithDoWhileSurrounder.java |   6 +-
 .../surroundWith/JSWithForSurrounder.java     |  10 +-
 .../JSWithFunctionExpressionSurrounder.java   |   6 +-
 .../JSWithFunctionSurrounder.java             |   8 +-
 .../surroundWith/JSWithIfElseSurrounder.java  |   4 +-
 .../impl/surroundWith/JSWithIfSurrounder.java |  10 +-
 .../JSWithParenthesesSurrounder.java          |  16 +-
 .../JSWithTryCatchFinallySurrounder.java      |  14 +-
 .../JSWithTryCatchSurrounder.java             |   4 +-
 .../JSWithTryFinallySurrounder.java           |   4 +-
 .../surroundWith/JSWithWhileSurrounder.java   |   4 +-
 .../surroundWith/JSWithWithSurrounder.java    |   8 +-
 .../impl/validation/ImplementMethodsFix.java  |   4 +-
 .../impl/validation/JSAnnotatingVisitor.java  | 614 ++++++++++--------
 67 files changed, 1230 insertions(+), 1036 deletions(-)

diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java
index f2196d68..e99945a8 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java
@@ -16,10 +16,16 @@
 
 package consulo.javascript.language;
 
+import consulo.annotation.DeprecationInfo;
+import consulo.annotation.internal.MigratedExtensionsTo;
+import consulo.javascript.localize.JavaScriptLocalize;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.PropertyKey;
 import consulo.component.util.localize.AbstractBundle;
 
+@Deprecated(forRemoval = true)
+@DeprecationInfo("Use JavaScriptLocalize")
+@MigratedExtensionsTo(JavaScriptLocalize.class)
 public class JavaScriptBundle extends AbstractBundle
 {
 	@NonNls
diff --git a/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml b/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
index 5fb96c45..4a232a38 100644
--- a/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
+++ b/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
@@ -508,7 +508,7 @@ javascript.fix.remove.access.modifier:
   text: Remove access modifier
 javascript.fix.remove.namespace.reference:
   text: Remove namespace reference
-javascript.incorrect.array.type.in.for.in:
+javascript.incorrect.array.type.in.forin:
   text: Array key type should be String
 javascript.validation.message.unexpected.type.for.rest.parameter:
   text: Rest parameter should have no type
diff --git a/base-api/src/main/resources/messages/JavaScriptBundle.properties b/base-api/src/main/resources/messages/JavaScriptBundle.properties
index 7d5c67d4..e16ad614 100644
--- a/base-api/src/main/resources/messages/JavaScriptBundle.properties
+++ b/base-api/src/main/resources/messages/JavaScriptBundle.properties
@@ -266,7 +266,7 @@ javascript.validation.message.access.modifier.allowed.only.for.package.members=O
 javascript.validation.message.use.namespace.reference.or.access.modifier=Use namespace OR access modifier
 javascript.fix.remove.access.modifier=Remove access modifier
 javascript.fix.remove.namespace.reference=Remove namespace reference
-javascript.incorrect.array.type.in.for-in=Array key type should be String
+javascript.incorrect.array.type.in.forin=Array key type should be String
 javascript.validation.message.unexpected.type.for.rest.parameter=Rest parameter should have no type
 javascript.fix.remove.type.reference=Remove type reference
 javascript.validation.message.parameter.is.not.allowed.after.rest.parameter=No parameter is allowed after rest parameter
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index afe4b19a..039ad4ea 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -21,11 +21,11 @@
 import consulo.annotation.DeprecationInfo;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptContextKeywordElementType;
-import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.lang.parsing.JavaScriptParser;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 import consulo.javascript.lang.parsing.Parsing;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.Language;
 import consulo.language.ast.*;
 import consulo.language.lexer.FlexAdapter;
@@ -167,12 +167,12 @@ protected void doParse(JavaScriptParsingContext context, PsiBuilder builder)
 		public void parseScriptExpression(JavaScriptParsingContext context, final PsiBuilder builder)
 		{
 			PsiBuilder.Marker root = builder.mark();
-			Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptBundle.message("javascript.parser.message.expected.lbrace"));
+			Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get());
 			if(builder.getTokenType() != JSTokenTypes.RBRACE)
 			{
 				context.getExpressionParsing().parseExpression(builder);
 			}
-			Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptBundle.message("javascript.parser.message.expected.rbrace"));
+			Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace().get());
 
 			while(!builder.eof())
 			{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index 4a307112..3e17cb49 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -24,6 +24,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.inspections.qucikFixes.CreateJSFunctionFixBase;
 import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.template.Expression;
 import consulo.language.editor.template.Template;
 import consulo.language.psi.PsiElement;
@@ -37,7 +38,11 @@ public class CreateJSFunctionOrMethodFix extends CreateJSFunctionFixBase
 
 	public CreateJSFunctionOrMethodFix(String name, boolean isMethod)
 	{
-		super(name, isMethod ? "javascript.create.method.intention.name" : "javascript.create.function.intention.name");
+		super(
+			isMethod 
+				? JavaScriptLocalize.javascriptCreateMethodIntentionName(name) 
+				: JavaScriptLocalize.javascriptCreateFunctionIntentionName(name)
+		);
 		myIsMethod = isMethod;
 	}
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
index 6d661592..04ba5023 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.parsing;
 
-import org.jetbrains.annotations.NonNls;
-import consulo.language.parser.PsiBuilder;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
+import consulo.language.parser.PsiBuilder;
+import org.jetbrains.annotations.NonNls;
 
 /**
  * @author Maxim.Mossienko
@@ -67,7 +67,7 @@ private static boolean parseDocTag(final PsiBuilder builder)
 
 				if(isInvalidTokenType(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.doc.tag.name"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagName().get());
 					return false;
 				}
 
@@ -106,7 +106,7 @@ else if(!currentText.startsWith("{"))
 
 				if(isInvalidTokenType(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.doc.tag.value"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagValue().get());
 					return false;
 				}
 			}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index 9315b9a8..40457c25 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -17,15 +17,15 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.javascript.JSDocTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSLookupUtil;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.ASTNode;
 import consulo.language.editor.util.PsiUtilBase;
 import consulo.language.psi.*;
-import consulo.language.util.IncorrectOperationException;
-import consulo.language.ast.ASTNode;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
 import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 
@@ -334,8 +334,7 @@ public boolean isSoft()
 		@Override
 		public String getUnresolvedMessagePattern()
 		{
-			return JavaScriptBundle.message("javascript.validation.message.incorrect.parameter.name");
+			return JavaScriptLocalize.javascriptValidationMessageIncorrectParameterName().get();
 		}
 	}
-
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index 96541daa..35709537 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.*;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.*;
 import consulo.language.psi.resolve.ResolveCache;
@@ -553,7 +553,7 @@ public String getUnresolvedMessagePattern()
 		{
 			String text = getCanonicalText();
 			text = "'" + text.replace("'", "''") + "'";
-			return JavaScriptBundle.message("javascript.unresolved.variable.or.type.name.message2", text);
+			return JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage2(text).get();
 		}
 	}
 
diff --git a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index 30741b9d..07652605 100644
--- a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -17,16 +17,16 @@
 
 package consulo.javascript.inspections.qucikFixes;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.template.Template;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
-import org.jetbrains.annotations.PropertyKey;
+import consulo.localize.LocalizeValue;
 
 import javax.annotation.Nonnull;
 import java.util.Set;
@@ -37,33 +37,37 @@
 */
 public abstract class CreateJSFunctionFixBase extends BaseCreateFix
 {
-	private final String myName;
-	private final String myIntentionNameKey;
+	private final LocalizeValue myMessage;
 
-	public CreateJSFunctionFixBase(String name, @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String nameKey)
+	public CreateJSFunctionFixBase(LocalizeValue message)
 	{
-		myName = name;
-		myIntentionNameKey = nameKey;
+		myMessage = message;
 	}
 
 	@Override
 	@Nonnull
 	public String getName()
 	{
-		return JavaScriptBundle.message(myIntentionNameKey, myName);
+		return myMessage.get();
 	}
 
 	@Override
 	@Nonnull
 	public String getFamilyName()
 	{
-		return JavaScriptBundle.message("javascript.create.function.intention.family");
+		return JavaScriptLocalize.javascriptCreateFunctionIntentionFamily().get();
 	}
 
 	@RequiredReadAction
 	@Override
-	protected void buildTemplate(Template template, JSReferenceExpression referenceExpression, Set<JavaScriptFeature> features, boolean staticContext, PsiFile file,
-								 PsiElement anchorParent)
+  protected void buildTemplate(
+		Template template,
+		JSReferenceExpression referenceExpression,
+		Set<JavaScriptFeature> features,
+		boolean staticContext,
+		PsiFile file,
+		PsiElement anchorParent
+	)
 	{
 		boolean classFeature = features.contains(JavaScriptFeature.CLASS);
 		String referencedName = classFeature ? referenceExpression.getReferencedName() : referenceExpression.getText();
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 7962317f..bdaf5b00 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -19,8 +19,8 @@
 import com.intellij.javascript.documentation.JSDocumentationUtils;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.ast.TokenSet;
 import consulo.language.parser.PsiBuilder;
@@ -143,11 +143,11 @@ else if(tokenType == JSTokenTypes.LBRACKET)
 				{
 					builder.advanceLexer();
 					parseExpression(builder);
-					Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+					Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
 				}
 				else
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.identifier"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get());
 				}
 			}
 
@@ -188,7 +188,7 @@ public static String validateLiteral(final PsiBuilder builder)
 					ttext.startsWith("\"") && (!ttext.endsWith("\"") || ttext.length() == 1) ||
 					ttext.startsWith("\'") && (!ttext.endsWith("\'") || ttext.length() == 1))
 			{
-				return JavaScriptBundle.message("javascript.parser.message.unclosed.string.literal");
+				return JavaScriptLocalize.javascriptParserMessageUnclosedStringLiteral().get();
 			}
 		}
 
@@ -245,13 +245,13 @@ else if(elementType == JSTokenTypes.COMMA)
 			}
 			else
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.comma"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma().get());
 			}
 
 			elementType = builder.getTokenType();
 			if(elementType == JSTokenTypes.RBRACE)
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.property.expected"));
+				builder.error(JavaScriptLocalize.javascriptParserPropertyExpected().get());
 			}
 			else if(isNotPropertyStart(builder, elementType))
 			{
@@ -259,7 +259,7 @@ else if(isNotPropertyStart(builder, elementType))
 			}
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptBundle.message("javascript.parser.message.expected.rbrace"));
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace().get());
 		expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
 	}
 
@@ -275,16 +275,16 @@ protected void parseProperty(final PsiBuilder builder)
 
 		if(isNotPropertyStart(builder, nameToken))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.identifier.string.literal.or.numeric.literal"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral().get());
 		}
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
 
 		builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
 		if(!parseAssignmentExpression(builder))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 		}
 		builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
 
@@ -309,7 +309,11 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 			{
 				if(commaExpected)
 				{
-					final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptBundle.message("javascript.parser.message.expected.comma"));
+					final boolean b = Parsing.checkMatches(
+						builder,
+						JSTokenTypes.COMMA,
+						JavaScriptLocalize.javascriptParserMessageExpectedComma().get()
+					);
 					if(!b)
 					{
 						break;
@@ -326,7 +330,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 				{
 					if(!parseAssignmentExpression(builder))
 					{
-						builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 						break;
 					}
 					else
@@ -335,7 +339,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 					}
 				}
 			}
-			Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+			Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
 			expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
 		}
 		finally
@@ -350,7 +354,7 @@ private void parseParenthesizedExpression(final PsiBuilder builder)
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 		parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 		expr.done(JSElementTypes.PARENTHESIZED_EXPRESSION);
 	}
 
@@ -420,7 +424,7 @@ protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyn
 				}
 				else
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.name"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName().get());
 				}
 
 				expr.done(JSElementTypes.REFERENCE_EXPRESSION);
@@ -430,7 +434,7 @@ else if(tokenType == JSTokenTypes.LBRACKET)
 			{
 				builder.advanceLexer();
 				parseExpression(builder);
-				Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+				Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
 				expr.done(JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION);
 				expr = expr.precede();
 			}
@@ -495,7 +499,7 @@ else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.
 			}
 			else
 			{
-				Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptBundle.message("javascript.parser.message.expected.name"));
+				Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName().get());
 			}
 			expr.done(JSElementTypes.REFERENCE_EXPRESSION);
 			expr = expr.precede();
@@ -523,7 +527,7 @@ protected boolean parseNewExpression(PsiBuilder builder)
 
 		if(!parseMemberExpression(builder, false))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 		}
 		return false;
 	}
@@ -548,17 +552,17 @@ protected void parseArgumentList(final PsiBuilder builder)
 				}
 				else
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.comma.or.rparen"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen().get());
 					break;
 				}
 			}
 			if(!parseAssignmentExpression(builder))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 		arglist.done(JSElementTypes.ARGUMENT_LIST);
 	}
 
@@ -566,7 +570,7 @@ public void parseExpression(PsiBuilder builder)
 	{
 		if(!parseExpressionOptional(builder))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 		}
 	}
 
@@ -586,11 +590,11 @@ private boolean parseAssignmentExpression(final PsiBuilder builder, boolean allo
 
 		if(JSTokenTypes.ASSIGNMENT_OPERATIONS.contains(builder.getTokenType()) && builder.getUserData(WITHIN_OBJECT_LITERAL_EXPRESSION) == null)
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			builder.advanceLexer();
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
 			return true;
@@ -610,7 +614,7 @@ private boolean parseAssignmentExpression(final PsiBuilder builder, boolean allo
 			builder.advanceLexer();
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
 		}
@@ -638,12 +642,12 @@ private boolean parseConditionalExpression(final PsiBuilder builder, final boole
 			builder.advanceLexer();
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
-			Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+			Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.CONDITIONAL_EXPRESSION);
 		}
@@ -673,7 +677,7 @@ private boolean parseORExpression(final PsiBuilder builder, final boolean allowI
 			builder.advanceLexer();
 			if(!parseANDExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -697,7 +701,7 @@ private boolean parseANDExpression(final PsiBuilder builder, final boolean allow
 			builder.advanceLexer();
 			if(!parseBitwiseORExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -721,7 +725,7 @@ private boolean parseBitwiseORExpression(final PsiBuilder builder, final boolean
 			builder.advanceLexer();
 			if(!parseBitwiseXORExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -745,7 +749,7 @@ private boolean parseBitwiseXORExpression(final PsiBuilder builder, final boolea
 			builder.advanceLexer();
 			if(!parseBitwiseANDExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -769,7 +773,7 @@ private boolean parseBitwiseANDExpression(final PsiBuilder builder, final boolea
 			builder.advanceLexer();
 			if(!parseEqualityExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -793,7 +797,7 @@ private boolean parseEqualityExpression(final PsiBuilder builder, final boolean
 			builder.advanceLexer();
 			if(!parseRelationalExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -816,7 +820,7 @@ private boolean parseRelationalExpression(final PsiBuilder builder, final boolea
 			builder.advanceLexer();
 			if(!parseShiftExpression(builder))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -839,7 +843,7 @@ private boolean parseShiftExpression(final PsiBuilder builder)
 			builder.advanceLexer();
 			if(!parseAdditiveExpression(builder))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -862,7 +866,7 @@ private boolean parseAdditiveExpression(final PsiBuilder builder)
 			builder.advanceLexer();
 			if(!parseMultiplicativeExpression(builder))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -886,7 +890,7 @@ private boolean parseIsAsExpression(final PsiBuilder builder)
 			builder.advanceLexer();
 			if(!parseUnaryExpression(builder))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -915,7 +919,7 @@ protected boolean parseMultiplicativeExpression(final PsiBuilder builder, TokenS
 			builder.advanceLexer();
 			if(!parseUnaryExpression(builder))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -934,7 +938,7 @@ private boolean parseUnaryExpression(final PsiBuilder builder)
 			builder.advanceLexer();
 			if(!parseUnaryExpression(builder))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 			expr.done(JSElementTypes.PREFIX_EXPRESSION);
 			return true;
@@ -997,7 +1001,7 @@ public boolean parseExpressionOptional(final PsiBuilder builder, final boolean a
 			builder.advanceLexer();
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			}
 
 			expr.done(JSElementTypes.COMMA_EXPRESSION);
@@ -1023,7 +1027,7 @@ public boolean parseType(final PsiBuilder builder)
 		}
 		else if(!parseQualifiedTypeName(builder))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
 		}
 		return true;
 	}
@@ -1032,7 +1036,7 @@ public boolean parseSimpleExpression(final PsiBuilder builder)
 	{
 		if(!parseUnaryExpression(builder))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 			return false;
 		}
 		return true;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index 9e111f13..71cbbef4 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -18,7 +18,7 @@
 
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.parser.PsiBuilder;
 
 import javax.annotation.Nonnull;
@@ -79,7 +79,7 @@ else if(isContextKeyword(builder, JSTokenTypes.SET_KEYWORD))
 		{
 			if(!expressionContext && builder.getTokenType() != JSTokenTypes.LPAR /*get/set as name*/)
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.function.name"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionName().get());
 			}
 		}
 
@@ -104,7 +104,7 @@ public void parseParameterList(final PsiBuilder builder)
 		final PsiBuilder.Marker parameterList;
 		if(builder.getTokenType() != JSTokenTypes.LPAR)
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 			parameterList = builder.mark(); // To have non-empty parameters list at all the time.
 			parameterList.done(JSElementTypes.PARAMETER_LIST);
 			return;
@@ -130,7 +130,7 @@ public void parseParameterList(final PsiBuilder builder)
 				}
 				else
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.comma.or.rparen"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen().get());
 					break;
 				}
 			}
@@ -175,7 +175,7 @@ else if(builder.getTokenType() == JSTokenTypes.LBRACE)
 		}
 		else
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.formal.parameter.name"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFormalParameterName().get());
 			parameterMarker.drop();
 		}
 	}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 28b1bdb5..84abac3d 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -18,7 +18,7 @@
 
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
@@ -66,7 +66,7 @@ protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses
 
 		if(firstToken == null)
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.statement"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement().get());
 			return;
 		}
 
@@ -195,7 +195,7 @@ protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses
 			}
 		}
 
-		builder.error(JavaScriptBundle.message("javascript.parser.message.expected.statement"));
+		builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement().get());
 		builder.advanceLexer();
 	}
 
@@ -261,7 +261,7 @@ PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder)
 					}
 				}
 			}
-			Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+			Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 		}
 		return marker;
 	}
@@ -272,7 +272,7 @@ public void parseIncludeDirective(final PsiBuilder builder)
 		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
 		final PsiBuilder.Marker useNSStatement = builder.mark();
 		builder.advanceLexer();
-		Parsing.checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptBundle.message("javascript.parser.message.expected.string.literal"));
+		Parsing.checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral().get());
 		checkForSemicolon(builder);
 
 		useNSStatement.done(JSElementTypes.INCLUDE_DIRECTIVE);
@@ -304,7 +304,7 @@ private void parseCatchBlock(final PsiBuilder builder)
 		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
 		final PsiBuilder.Marker block = builder.mark();
 		builder.advanceLexer();
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 
 		final IElementType identifierType = builder.getTokenType();
 
@@ -318,19 +318,23 @@ private void parseCatchBlock(final PsiBuilder builder)
 				if(builder.getTokenType() == JSTokenTypes.IF_KEYWORD)
 				{
 					builder.advanceLexer();
-					Parsing.checkMatches(builder, identifierType, JavaScriptBundle.message("javascript.parser.message.expected.identifier"));
-					Parsing.checkMatches(builder, JSTokenTypes.INSTANCEOF_KEYWORD, JavaScriptBundle.message("javascript.parser.message.expected.instanceof"));
-					Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptBundle.message("javascript.parser.message.expected.identifier"));
+					Parsing.checkMatches(builder, identifierType, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get());
+					Parsing.checkMatches(
+						builder, 
+						JSTokenTypes.INSTANCEOF_KEYWORD,
+						JavaScriptLocalize.javascriptParserMessageExpectedInstanceof().get()
+					);
+					Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get());
 				}
 			}
 			param.done(JSElementTypes.FORMAL_PARAMETER);
 		}
 		else
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.parameter.name"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedParameterName().get());
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 
 		parseBlock(builder);
 
@@ -355,16 +359,16 @@ protected void parseSwitchStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 
-		Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptBundle.message("javascript.parser.message.expected.lbrace"));
+		Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get());
 		while(builder.getTokenType() != JSTokenTypes.RBRACE)
 		{
 			if(builder.eof())
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.unexpected.end.of.file"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageUnexpectedEndOfFile().get());
 				statement.done(JSElementTypes.SWITCH_STATEMENT);
 				return;
 			}
@@ -381,14 +385,14 @@ private void parseCaseOrDefaultClause(final PsiBuilder builder)
 		final PsiBuilder.Marker clause = builder.mark();
 		if(firstToken != JSTokenTypes.CASE_KEYWORD && firstToken != JSTokenTypes.DEFAULT_KEYWORD)
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.catch.or.default"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCatchOrDefault().get());
 		}
 		builder.advanceLexer();
 		if(firstToken == JSTokenTypes.CASE_KEYWORD)
 		{
 			getExpressionParsing().parseExpression(builder);
 		}
-		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
 		while(true)
 		{
 			IElementType token = builder.getTokenType();
@@ -407,9 +411,9 @@ protected void parseWithStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 
 		parseStatement(builder);
 
@@ -557,7 +561,7 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 			builder.advanceLexer();
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 		final boolean empty;
 		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD)
 		{
@@ -581,7 +585,7 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 			}
 			else
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.semicolon"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon().get());
 			}
 			getExpressionParsing().parseExpressionOptional(builder);
 		}
@@ -590,17 +594,17 @@ else if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
 			forin = true;
 			if(empty)
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration().get());
 			}
 			builder.advanceLexer();
 			getExpressionParsing().parseExpression(builder);
 		}
 		else
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.in.or.semicolon"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOrSemicolon().get());
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 		return forin;
 	}
 
@@ -610,9 +614,9 @@ private void parseWhileStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 
 		parseStatement(builder);
 		statement.done(JSElementTypes.WHILE_STATEMENT);
@@ -625,10 +629,10 @@ private void parseDoWhileStatement(final PsiBuilder builder)
 		builder.advanceLexer();
 
 		parseStatement(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.WHILE_KEYWORD, JavaScriptBundle.message("javascript.parser.message.expected.while.keyword"));
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.WHILE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedWhileKeyword().get());
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 		checkForSemicolon(builder);
 
 		statement.done(JSElementTypes.DOWHILE_STATEMENT);
@@ -640,7 +644,7 @@ protected void parseIfStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker ifStatement = builder.mark();
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 		getExpressionParsing().parseExpression(builder);
 
 		// handle empty expressions inside
@@ -649,7 +653,7 @@ protected void parseIfStatement(final PsiBuilder builder)
 			builder.advanceLexer();
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 
 		parseStatement(builder);
 
@@ -699,7 +703,7 @@ protected void parseVarStatementWithMarker(final PsiBuilder builder, final boole
 				}
 				else
 				{
-					Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptBundle.message("javascript.parser.message.expected.comma"));
+					Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma().get());
 				}
 
 				parseVarDeclaration(builder, !inForInitializationContext);
@@ -778,7 +782,7 @@ protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
 	{
 		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.variable.name"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName().get());
 			builder.advanceLexer();
 			return;
 		}
@@ -803,14 +807,14 @@ protected void parseVarInitializer(PsiBuilder builder, boolean allowIn)
 			{
 				if(!getExpressionParsing().parseAssignmentExpression(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 				}
 			}
 			else
 			{
 				if(!getExpressionParsing().parseAssignmentExpressionNoIn(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 				}
 			}
 		}
@@ -840,7 +844,7 @@ protected void parseBlockOrFunctionBody(final PsiBuilder builder, BlockType type
 			{
 				block.rollbackTo();
 			}
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.lbrace"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get());
 			return;
 		}
 
@@ -849,7 +853,7 @@ protected void parseBlockOrFunctionBody(final PsiBuilder builder, BlockType type
 		{
 			if(builder.eof())
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.missing.rbrace"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageMissingRbrace().get());
 				if(block != null)
 				{
 					block.done(JSElementTypes.BLOCK_STATEMENT);
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
index c8de1739..34946936 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -19,7 +19,6 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.javascript.lang.parsing.ExpressionParsing;
-import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.parser.PsiBuilder;
@@ -158,14 +157,14 @@ protected void parseProperty(PsiBuilder builder)
 			PsiBuilder.Marker mark = builder.mark();
 			builder.advanceLexer();
 			parseExpression(builder);
-			checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+			checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
 			mark.done(JSElementTypes.COMPUTED_NAME);
 		}
 		else
 		{
 			if(isNotPropertyStart(builder, nameTokenType))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.identifier.string.literal.or.numeric.literal"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral().get());
 			}
 
 			IElementType setOrGetToken = isContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET);
@@ -220,12 +219,12 @@ else if(nextTokenType == JSTokenTypes.LPAR)
 			}
 			else
 			{
-				checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+				checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
 
 				builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
 				if(!parseAssignmentExpression(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 				}
 				builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
 			}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index 2af0968a..0182eb37 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -22,7 +22,6 @@
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.parsing.Parsing;
 import consulo.javascript.lang.parsing.StatementParsing;
-import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.ast.TokenSet;
@@ -100,7 +99,7 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 	{
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 		final boolean empty;
 		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD || builder.getTokenType() == JSTokenTypes.CONST_KEYWORD)
 		{
@@ -124,7 +123,7 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 			}
 			else
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.semicolon"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon().get());
 			}
 			getExpressionParsing().parseExpressionOptional(builder);
 		}
@@ -133,7 +132,7 @@ else if(isContextKeyword(builder, JSTokenTypes.OF_KEYWORD) || builder.getTokenTy
 			forin = true;
 			if(empty)
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration().get());
 			}
 
 			if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
@@ -149,10 +148,10 @@ else if(isContextKeyword(builder, JSTokenTypes.OF_KEYWORD) || builder.getTokenTy
 		}
 		else
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.forloop.in.of.or.semicolon"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOfOrSemicolon().get());
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 		return forin;
 	}
 
@@ -297,7 +296,7 @@ else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 					}
 					else
 					{
-						builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
 						break;
 					}
 
@@ -376,7 +375,7 @@ protected void parseClassBody(final PsiBuilder builder, BlockType type)
 	{
 		if(builder.getTokenType() != JSTokenTypes.LBRACE)
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.lbrace"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get());
 			return;
 		}
 
@@ -450,7 +449,7 @@ protected void parseClassBody(final PsiBuilder builder, BlockType type)
 
 				if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.identifier"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get());
 				}
 				else
 				{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
index 3c39debb..e9225bcd 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
@@ -4,7 +4,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.javascript.lang.parsing.ExpressionParsing;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.ast.TokenSet;
 import consulo.language.parser.PsiBuilder;
@@ -90,7 +90,7 @@ protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyn
 				}
 				else
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.name"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName().get());
 				}
 
 				expr.done(JSElementTypes.REFERENCE_EXPRESSION);
@@ -100,7 +100,7 @@ else if(tokenType == JSTokenTypes.LBRACKET)
 			{
 				builder.advanceLexer();
 				parseExpression(builder);
-				checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+				checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
 				expr.done(JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION);
 				expr = expr.precede();
 			}
@@ -163,7 +163,7 @@ else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.
 			}
 			else
 			{
-				checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptBundle.message("javascript.parser.message.expected.name"));
+				checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName().get());
 			}
 			expr.done(JSElementTypes.REFERENCE_EXPRESSION);
 			expr = expr.precede();
@@ -205,7 +205,7 @@ private void parseGenericSignature(final PsiBuilder builder)
 		PsiBuilder.Marker genericTypeSignature = builder.mark();
 		builder.advanceLexer();
 		parseType(builder);
-		checkMatches(builder, JSTokenTypes.GT, JavaScriptBundle.message("javascript.parser.message.expected.lt"));
+		checkMatches(builder, JSTokenTypes.GT, JavaScriptLocalize.javascriptParserMessageExpectedLt().get());
 		genericTypeSignature.done(JSElementTypes.GENERIC_SIGNATURE);
 	}
 }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
index 623801eb..794638c9 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
@@ -4,7 +4,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.javascript.lang.parsing.FunctionParsing;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.parser.PsiBuilder;
 
@@ -22,7 +22,7 @@ public EcmaScript4FunctionParsing(JavaScriptParsingContext context)
 	public void parseAttributeWithoutBrackets(final PsiBuilder builder)
 	{
 		final PsiBuilder.Marker attribute = builder.mark();
-		if(!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptBundle.message("javascript.parser.message.expected.identifier")))
+		if (!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get()))
 		{
 			attribute.drop();
 			return;
@@ -53,8 +53,10 @@ void parseAttributesList(final PsiBuilder builder)
 
 					builder.advanceLexer();
 
-					if(builder.eof() || (!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptBundle.message("javascript.parser.message.expected.identifier")) &&
-							builder.getTokenType() != JSTokenTypes.RBRACKET))
+					if (builder.eof() || (
+						!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get())
+							&& builder.getTokenType() != JSTokenTypes.RBRACKET
+					))
 					{
 						attribute.drop();
 						return;
@@ -67,7 +69,7 @@ void parseAttributesList(final PsiBuilder builder)
 						if(builder.eof())
 						{
 							attribute.done(JSElementTypes.ATTRIBUTE);
-							builder.error(JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+							builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
 							return;
 						}
 					}
@@ -127,7 +129,7 @@ void parseAttributesList(final PsiBuilder builder)
 
 	private void parseAttributeBody(final PsiBuilder builder)
 	{
-		final boolean haveLParen = checkMatches(builder, JSTokenTypes.LPAR, JavaScriptBundle.message("javascript.parser.message.expected.lparen"));
+		final boolean haveLParen = checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
 		boolean hasName;
 
 		while(haveLParen)
@@ -137,7 +139,7 @@ private void parseAttributeBody(final PsiBuilder builder)
 
 			if(builder.getTokenType() == JSTokenTypes.COMMA)
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.identifer.or.value"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentiferOrValue().get());
 				break;
 			}
 			if(builder.getTokenType() == JSTokenTypes.RBRACKET)
@@ -150,7 +152,7 @@ private void parseAttributeBody(final PsiBuilder builder)
 
 			if(hasName && builder.getTokenType() != JSTokenTypes.COMMA && builder.getTokenType() != JSTokenTypes.RPAR)
 			{
-				checkMatches(builder, JSTokenTypes.EQ, JavaScriptBundle.message("javascript.parser.message.expected.equal"));
+				checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual().get());
 
 				if(builder.getTokenType() != JSTokenTypes.COMMA && builder.getTokenType() != JSTokenTypes.RBRACKET && builder.getTokenType() !=
 						JSTokenTypes.RPAR)
@@ -159,7 +161,7 @@ private void parseAttributeBody(final PsiBuilder builder)
 				}
 				else
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.value"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedValue().get());
 				}
 			}
 
@@ -175,14 +177,14 @@ private void parseAttributeBody(final PsiBuilder builder)
 
 			if(builder.eof())
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 				return;
 			}
 		}
 
-		if(haveLParen)
+		if (haveLParen)
 		{
-			checkMatches(builder, JSTokenTypes.RPAR, JavaScriptBundle.message("javascript.parser.message.expected.rparen"));
+			checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
 		}
 		else
 		{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
index 8c0f5bea..21e36393 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
@@ -3,7 +3,7 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.javascript.lang.parsing.StatementParsing;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
@@ -57,7 +57,7 @@ protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
 	{
 		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.variable.name"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName().get());
 			builder.advanceLexer();
 			return;
 		}
@@ -75,14 +75,14 @@ protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
 			{
 				if(!getExpressionParsing().parseAssignmentExpression(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 				}
 			}
 			else
 			{
 				if(!getExpressionParsing().parseAssignmentExpressionNoIn(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 				}
 			}
 		}
@@ -96,7 +96,7 @@ protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses
 
 		if(firstToken == null)
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.statement"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement().get());
 			return;
 		}
 
@@ -291,7 +291,7 @@ else if(JSTokenTypes.COLON_COLON == builder.getTokenType())
 					}
 					else
 					{
-						builder.error(JavaScriptBundle.message("javascript.parser.message.expected.function.var.class.interface.namespace"));
+						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionVarClassInterfaceNamespace().get());
 						marker.drop();
 					}
 				}
@@ -324,7 +324,7 @@ else if(JSTokenTypes.COLON_COLON == builder.getTokenType())
 			}
 		}
 
-		builder.error(JavaScriptBundle.message("javascript.parser.message.expected.statement"));
+		builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement().get());
 		builder.advanceLexer();
 	}
 
@@ -338,9 +338,9 @@ private void parseDefaultNsStatement(final PsiBuilder builder)
 		{
 			builder.advanceLexer();
 
-			if(checkMatches(builder, JSTokenTypes.NAMESPACE_KEYWORD, JavaScriptBundle.message("javascript.parser.message.expected.namespace")))
+			if (checkMatches(builder, JSTokenTypes.NAMESPACE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedNamespace().get()))
 			{
-				if(checkMatches(builder, JSTokenTypes.EQ, JavaScriptBundle.message("javascript.parser.message.expected.equal")))
+				if (checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual().get()))
 				{
 					getExpressionParsing().parseExpression(builder);
 				}
@@ -348,7 +348,7 @@ private void parseDefaultNsStatement(final PsiBuilder builder)
 		}
 		else
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.xml"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedXml().get());
 		}
 		marker.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
 	}
@@ -364,7 +364,7 @@ private void parseImportStatement(final PsiBuilder builder)
 			final PsiBuilder.Marker nsAssignment = builder.mark();
 			if(!getExpressionParsing().parseQualifiedTypeName(builder, true))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
 				nsAssignment.drop();
 				return;
 			}
@@ -374,7 +374,7 @@ private void parseImportStatement(final PsiBuilder builder)
 				builder.advanceLexer();
 				if(!getExpressionParsing().parseQualifiedTypeName(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
 				}
 
 				nsAssignment.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
@@ -405,12 +405,12 @@ private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @Nonnull
 
 		if(!getExpressionParsing().parseQualifiedTypeName(builder))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
 		}
 		if(builder.getTokenType() == JSTokenTypes.EQ)
 		{
 			builder.advanceLexer();
-			checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptBundle.message("javascript.parser.message.expected.string.literal"));
+			checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral().get());
 		}
 		checkForSemicolon(builder);
 		useNSStatement.done(JSElementTypes.NAMESPACE_DECLARATION);
@@ -424,7 +424,7 @@ private void parseUseNamespaceDirective(final PsiBuilder builder)
 
 		if(builder.getTokenType() != JSTokenTypes.NAMESPACE_KEYWORD)
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.namespace"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNamespace().get());
 		}
 		else
 		{
@@ -432,7 +432,7 @@ private void parseUseNamespaceDirective(final PsiBuilder builder)
 
 			if(!getExpressionParsing().parseQualifiedTypeName(builder))
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
 			}
 
 			while(builder.getTokenType() == JSTokenTypes.COMMA)
@@ -440,7 +440,7 @@ private void parseUseNamespaceDirective(final PsiBuilder builder)
 				builder.advanceLexer();
 				if(!getExpressionParsing().parseQualifiedTypeName(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
 					break;
 				}
 			}
@@ -462,7 +462,7 @@ private void parseClassNoMarker(final PsiBuilder builder, final @Nonnull PsiBuil
 		builder.advanceLexer();
 		if(!getExpressionParsing().parseQualifiedTypeName(builder))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.typename"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
 		}
 
 		if(builder.getTokenType() == JSTokenTypes.EXTENDS_KEYWORD)
@@ -511,7 +511,7 @@ private void parsePackage(final PsiBuilder builder)
 
 		if(builder.getTokenType() != JSTokenTypes.LBRACE)
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.name.or.lbrace"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNameOrLbrace().get());
 		}
 		else
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index 1c9c7be9..aa34c377 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -1,14 +1,14 @@
 package consulo.json.lang;
 
-import consulo.language.ast.ASTNode;
-import consulo.language.parser.PsiBuilder;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
-import consulo.language.ast.IElementType;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.lang.parsing.ExpressionParsing;
 import consulo.javascript.lang.parsing.Parsing;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.parser.PsiBuilder;
 import consulo.language.parser.PsiParser;
 import consulo.language.version.LanguageVersion;
 import consulo.logging.Logger;
@@ -42,7 +42,7 @@ private void parseRoot(PsiBuilder builder)
 			parseArrayLiteralExpression(builder);
 			if(builder.getTokenType() != null)
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.eof"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof().get());
 			}
 		}
 		else if(builder.getTokenType() == JSTokenTypes.LBRACE)
@@ -50,12 +50,12 @@ else if(builder.getTokenType() == JSTokenTypes.LBRACE)
 			parseObjectLiteralExpression(builder);
 			if(builder.getTokenType() != null)
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.eof"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof().get());
 			}
 		}
 		else
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.lbrace.or.lbracket"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbraceOrLbracket().get());
 		}
 
 		while(builder.getTokenType() != null)
@@ -108,14 +108,14 @@ else if(tokenType == JSTokenTypes.RBRACKET)
 
 		if(isNotPropertyStart(nameToken))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.identifier.string.literal.or.numeric.literal"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral().get());
 		}
 		builder.advanceLexer();
-		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptBundle.message("javascript.parser.message.expected.colon"));
+		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
 
 		if(!parseValue(builder))
 		{
-			builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 		}
 		myPropertyDepth--;
 
@@ -150,7 +150,7 @@ else if(elementType == JSTokenTypes.COMMA)
 			}
 			else
 			{
-				builder.error(JavaScriptBundle.message("javascript.parser.message.expected.comma"));
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma().get());
 			}
 
 			elementType = builder.getTokenType();
@@ -164,7 +164,7 @@ else if(isNotPropertyStart(elementType))
 			}
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptBundle.message("javascript.parser.message.expected.rbrace"));
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace().get());
 		expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
 	}
 
@@ -184,7 +184,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 		{
 			if(commaExpected)
 			{
-				final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptBundle.message("javascript.parser.message.expected.comma"));
+				final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma().get());
 				if(!b)
 				{
 					break;
@@ -201,7 +201,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 			{
 				if(!parseValue(builder))
 				{
-					builder.error(JavaScriptBundle.message("javascript.parser.message.expected.expression"));
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
 					break;
 				}
 				else
@@ -210,7 +210,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 				}
 			}
 		}
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptBundle.message("javascript.parser.message.expected.rbracket"));
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
 		expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
 	}
 
diff --git a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
index 7921b5fe..fe7af18c 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
@@ -19,7 +19,7 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.completion.lookup.LookupElement;
 import consulo.language.editor.template.Expression;
 import consulo.language.editor.template.ExpressionContext;
@@ -48,7 +48,7 @@ public String getName()
 	@Override
 	public String getPresentableName()
 	{
-		return JavaScriptBundle.message("js.classname.macro.description");
+		return JavaScriptLocalize.jsClassnameMacroDescription().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
index 9cf4300b..056d2dbb 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
@@ -19,7 +19,7 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.completion.lookup.LookupElement;
 import consulo.language.editor.template.Expression;
 import consulo.language.editor.template.ExpressionContext;
@@ -43,7 +43,7 @@ public String getName()
 	@Override
 	public String getPresentableName()
 	{
-		return JavaScriptBundle.message("js.methodname.macro.description");
+		return JavaScriptLocalize.jsMethodnameMacroDescription().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
index af445809..6fff3a61 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
@@ -23,7 +23,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.codeEditor.Editor;
 import consulo.javascript.language.JavaScriptLanguage;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.Language;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.action.SmartEnterProcessor;
@@ -108,8 +108,8 @@ public boolean process(@Nonnull final Project project, @Nonnull final Editor edi
 			element = prevMeaningfulElement;
 		}
 
-		if(element instanceof PsiErrorElement && (JavaScriptBundle.message("javascript.parser.message.expected.lbrace").equals(errorDescription = (
-				(PsiErrorElement) element).getErrorDescription()) || JavaScriptBundle.message("javascript.parser.message.expected.statement").equals(errorDescription)))
+		if (element instanceof PsiErrorElement && (JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get().equals(errorDescription = (
+				(PsiErrorElement) element).getErrorDescription()) || JavaScriptLocalize.javascriptParserMessageExpectedStatement().get().equals(errorDescription)))
 		{
 			String semicolon = "";
 
@@ -124,8 +124,8 @@ public boolean process(@Nonnull final Project project, @Nonnull final Editor edi
 			insertCommitReformat(project, editor, psiFile, offset, "{\n\n}" + semicolon, 2, true);
 			return true;
 		}
-		else if(JavaScriptBundle.message("javascript.parser.message.expected.lparen").equals(errorDescription) || JavaScriptBundle.message("javascript.parser.message" +
-				".expected.function.name").equals(errorDescription))
+		else if (JavaScriptLocalize.javascriptParserMessageExpectedLparen().get().equals(errorDescription) 
+			|| JavaScriptLocalize.javascriptParserMessageExpectedFunctionName().get().equals(errorDescription))
 		{
 			insertCommitReformat(project, editor, psiFile, offset, "()", 1, false);
 			return true;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
index 5f1aecc6..4fd76cc9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
@@ -20,9 +20,9 @@
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.language.JavaScriptLanguage;
-import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.language.JavaScriptFileType;
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.Language;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.editor.highlight.SyntaxHighlighterFactory;
@@ -50,7 +50,7 @@ public class JavaScriptCodeContextType extends TemplateContextType
 
 	public JavaScriptCodeContextType()
 	{
-		super(JAVA_SCRIPT, JavaScriptBundle.message("javascript.template.context.type"));
+		super(JAVA_SCRIPT, JavaScriptLocalize.javascriptTemplateContextType().get());
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
index 4b0b1ff3..09871c2a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
@@ -16,10 +16,10 @@
 
 package com.intellij.lang.javascript.impl.findUsages;
 
-import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.Language;
 import consulo.language.cacheBuilder.WordsScanner;
 import consulo.language.findUsage.FindUsagesProvider;
@@ -48,49 +48,49 @@ public boolean canFindUsagesFor(@Nonnull PsiElement psiElement)
 	@Nonnull
 	public String getType(@Nonnull PsiElement element)
 	{
-		if(element instanceof JSFunction)
+		if (element instanceof JSFunction)
 		{
-			return JavaScriptBundle.message("javascript.language.term.function");
+			return JavaScriptLocalize.javascriptLanguageTermFunction().get();
 		}
-		if(element instanceof JSClass)
+		if (element instanceof JSClass)
 		{
-			return JavaScriptBundle.message("javascript.language.term.class");
+			return JavaScriptLocalize.javascriptLanguageTermClass().get();
 		}
-		if(element instanceof JSNamespaceDeclaration)
+		if (element instanceof JSNamespaceDeclaration)
 		{
-			return JavaScriptBundle.message("javascript.language.term.namespace");
+			return JavaScriptLocalize.javascriptLanguageTermNamespace().get();
 		}
-		if(element instanceof JSParameter)
+		if (element instanceof JSParameter)
 		{
-			return JavaScriptBundle.message("javascript.language.term.parameter");
+			return JavaScriptLocalize.javascriptLanguageTermParameter().get();
 		}
-		if(element instanceof JSProperty)
+		if (element instanceof JSProperty)
 		{
-			return JavaScriptBundle.message("javascript.language.term.property");
+			return JavaScriptLocalize.javascriptLanguageTermProperty().get();
 		}
-		if(element instanceof JSVariable)
+		if (element instanceof JSVariable)
 		{
-			return JavaScriptBundle.message("javascript.language.term.variable");
+			return JavaScriptLocalize.javascriptLanguageTermVariable().get();
 		}
-		if(element instanceof JSLabeledStatement)
+		if (element instanceof JSLabeledStatement)
 		{
-			return JavaScriptBundle.message("javascript.language.term.label");
+			return JavaScriptLocalize.javascriptLanguageTermLabel().get();
 		}
-		if(element instanceof JSDefinitionExpression)
+		if (element instanceof JSDefinitionExpression)
 		{
-			return JavaScriptBundle.message("javascript.language.term.value");
+			return JavaScriptLocalize.javascriptLanguageTermValue().get();
 		}
-		if(element instanceof XmlTag)
+		if (element instanceof XmlTag)
 		{
-			return JavaScriptBundle.message("javascript.language.term.tag");
+			return JavaScriptLocalize.javascriptLanguageTermTag().get();
 		}
-		if(element instanceof XmlToken)
+		if (element instanceof XmlToken)
 		{
-			return JavaScriptBundle.message("javascript.language.term.attribute.value");
+			return JavaScriptLocalize.javascriptLanguageTermAttributeValue().get();
 		}
-		if(element instanceof JSPackageStatement)
+		if (element instanceof JSPackageStatement)
 		{
-			return JavaScriptBundle.message("javascript.language.term.package");
+			return JavaScriptLocalize.javascriptLanguageTermPackage().get();
 		}
 		return "";
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
index 1528eb69..08669f84 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.impl.flex;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSQualifiedNamedElement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -26,6 +25,7 @@
 import consulo.codeEditor.Editor;
 import consulo.codeEditor.EditorPopupHelper;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.hint.HintManager;
 import consulo.language.editor.hint.QuestionAction;
 import consulo.language.editor.inspection.LocalQuickFix;
@@ -91,7 +91,9 @@ public boolean showHint(final Editor editor)
 	@Nonnull
 	public String getText()
 	{
-		return JavaScriptBundle.message(isFunction ? "flex.import.function" : "flex.import.class", calculatedClass);
+		return isFunction 
+			? JavaScriptLocalize.flexImportFunction(calculatedClass).get() 
+			: JavaScriptLocalize.flexImportClass(calculatedClass).get();
 	}
 
 	@Override
@@ -117,38 +119,38 @@ public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescr
 	@Override
 	public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
 	{
-		if(!myReference.getElement().isValid())
+		if (!myReference.getElement().isValid())
 		{
 			return false;
 		}
 		final long modL = myReference.getElement().getManager().getModificationTracker().getModificationCount();
 
-		if(!isAvailableCalculated || modL != modificationCount)
+		if (!isAvailableCalculated || modL != modificationCount)
 		{
 			final ResolveResult[] results = myReference.multiResolve(false);
 			boolean hasValidResult = false;
 
-			for(ResolveResult r : results)
+			for (ResolveResult r : results)
 			{
-				if(r.isValidResult())
+				if (r.isValidResult())
 				{
 					hasValidResult = true;
 					break;
 				}
 			}
 
-			if(!hasValidResult)
+			if (!hasValidResult)
 			{
 				final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
 
 				isAvailableCalculated = true;
 				isAvailable = candidates.size() > 0;
-				if(isAvailable)
+				if (isAvailable)
 				{
 					final JSQualifiedNamedElement element = candidates.iterator().next();
 					calculatedClass = element.getQualifiedName();
 					isFunction = element instanceof JSFunction;
-					if(candidates.size() > 1)
+					if (candidates.size() > 1)
 					{
 						calculatedClass += HAS_MORE_SUFFIX;
 					}
@@ -174,7 +176,7 @@ private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile
 	{
 		final Collection<JSQualifiedNamedElement> candidates;
 
-		if(myReference instanceof JSReferenceExpression && ((JSReferenceExpression) myReference).getQualifier() == null)
+		if (myReference instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() == null)
 		{
 			Collection<JSQualifiedNamedElement> c = getCandidates(editor, file, myReference.getCanonicalText());
 			filterDefaultPackage(c);
@@ -184,15 +186,15 @@ private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile
 		{
 			JSQualifiedNamedElement invalidResult = null;
 
-			for(ResolveResult r : myReference.multiResolve(false))
+			for (ResolveResult r : myReference.multiResolve(false))
 			{
 				PsiElement element = r.getElement();
-				if(element instanceof JSQualifiedNamedElement)
+				if (element instanceof JSQualifiedNamedElement)
 				{
 					invalidResult = (JSQualifiedNamedElement) element;
 				}
 			}
-			if(invalidResult != null)
+			if (invalidResult != null)
 			{
 				candidates = new SmartList<JSQualifiedNamedElement>();
 				candidates.add(invalidResult);
@@ -208,9 +210,13 @@ private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile
 	public static Collection<JSQualifiedNamedElement> getCandidates(final Editor editor, final PsiFile file, final String name)
 	{
 		final Module element = ModuleUtilCore.findModuleForPsiElement(file);
-		if(element != null)
+		if (element != null)
 		{
-			return JSResolveUtil.findElementsByName(name, editor.getProject(), GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(element, false));
+			return JSResolveUtil.findElementsByName(
+				name,
+				editor.getProject(),
+				GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(element, false)
+			);
 		}
 		else
 		{
@@ -223,54 +229,55 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
 	{
 		final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
 
-		if(candidates.size() > 0)
+		if (candidates.size() > 0)
 		{
-			if(candidates.size() > 1)
+			if (candidates.size() > 1)
 			{
-				JBPopup popup = PopupNavigationUtil.getPsiElementPopup(candidates.toArray(new JSQualifiedNamedElement[candidates.size()]),
-						new PsiElementListCellRenderer<JSQualifiedNamedElement>()
+				JBPopup popup = PopupNavigationUtil.getPsiElementPopup(
+					candidates.toArray(new JSQualifiedNamedElement[candidates.size()]),
+					new PsiElementListCellRenderer<>()
+					{
+						@Override
+						public String getElementText(final JSQualifiedNamedElement element)
 						{
-							@Override
-							public String getElementText(final JSQualifiedNamedElement element)
-							{
-								return element.getName();
-							}
+							return element.getName();
+						}
 
-							@Override
-							protected String getContainerText(final JSQualifiedNamedElement element, final String name)
+						@Override
+						protected String getContainerText(final JSQualifiedNamedElement element, final String name)
+						{
+							final String qName = element.getQualifiedName();
+							final String elementName = element.getName();
+							String s = qName.equals(elementName) ? "" : qName.substring(0, qName.length() - elementName.length() - 1);
+							if ("".equals(s))
 							{
-								final String qName = element.getQualifiedName();
-								final String elementName = element.getName();
-								String s = qName.equals(elementName) ? "" : qName.substring(0, qName.length() - elementName.length() - 1);
-								if("".equals(s))
-								{
-									s = element.getContainingFile().getName();
-								}
-								return "( " + s + " )";
+								s = element.getContainingFile().getName();
 							}
+							return "( " + s + " )";
+						}
 
-							@Override
-							protected int getIconFlags()
-							{
-								return 0;
-							}
-						}, JavaScriptBundle.message("choose.class.title"), new PsiElementProcessor<JSQualifiedNamedElement>()
+						@Override
+						protected int getIconFlags()
 						{
-							@Override
-							public boolean execute(final JSQualifiedNamedElement element)
-							{
-								CommandProcessor.getInstance().executeCommand(project, new Runnable()
-								{
-									@Override
-									public void run()
-									{
-										doImport(editor, element.getQualifiedName());
-									}
-								}, getClass().getName(), this);
-
-								return false;
-							}
+							return 0;
+						}
+					},
+					JavaScriptLocalize.chooseClassTitle().get(),
+					new PsiElementProcessor<>()
+					{
+						@Override
+						public boolean execute(final JSQualifiedNamedElement element)
+						{
+							CommandProcessor.getInstance().executeCommand(
+								project,
+								() -> doImport(editor, element.getQualifiedName()),
+								getClass().getName(),
+								this
+							);
+
+							return false;
 						}
+					}
 				);
 
 				EditorPopupHelper.getInstance().showPopupInBestPositionFor(editor, popup);
@@ -284,14 +291,9 @@ public void run()
 
 	private void doImport(final Editor editor, final String qName)
 	{
-		ApplicationManager.getApplication().runWriteAction(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				final PsiElement element = myReference.getElement();
-				ImportUtils.doImport(element, qName);
-			}
+		ApplicationManager.getApplication().runWriteAction(() -> {
+			final PsiElement element = myReference.getElement();
+			ImportUtils.doImport(element, qName);
 		});
 	}
 
@@ -312,9 +314,9 @@ public boolean execute()
 
 	private static void filterDefaultPackage(Collection<JSQualifiedNamedElement> candidates)
 	{
-		for(Iterator<JSQualifiedNamedElement> i = candidates.iterator(); i.hasNext(); )
+		for (Iterator<JSQualifiedNamedElement> i = candidates.iterator(); i.hasNext(); )
 		{
-			if(!i.next().getQualifiedName().contains("."))
+			if (!i.next().getQualifiedName().contains("."))
 			{
 				i.remove();
 			}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
index 7d6f52d2..0c3642d7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
@@ -19,10 +19,9 @@
  */
 package com.intellij.lang.javascript.impl.generation;
 
-import consulo.javascript.language.JavaScriptBundle;
+import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
 import consulo.application.ApplicationManager;
 import consulo.codeEditor.Editor;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -73,7 +72,7 @@ public void invoke(final Project project, final Editor editor, final PsiFile fil
 			builder.withEmptySelection();
 		}
 
-		builder.withTitle(LocalizeValue.localizeTODO(JavaScriptBundle.message(getTitleKey())));
+		builder.withTitle(getTitle());
 		builder.showAsync(project, dataHolder ->
 		{
 			List data = dataHolder.getUserData(ClassMember.KEY_OF_LIST);
@@ -157,7 +156,7 @@ else if(JSResolveUtil.isArtificialClassUsedForReferenceList(clazz))
 		return clazz;
 	}
 
-	protected abstract String getTitleKey();
+	protected abstract LocalizeValue getTitle();
 
 	protected abstract BaseCreateMethodsFix createFix(JSClass clazz);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
index b874f9f9..9cfd208c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
@@ -16,21 +16,22 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
+import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
+import com.intellij.lang.javascript.impl.validation.JSAnnotatingVisitor;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
-import com.intellij.lang.javascript.impl.validation.JSAnnotatingVisitor;
 import consulo.application.ApplicationManager;
 import consulo.codeEditor.Editor;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.codeStyle.CodeStyleSettingsManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.ui.ex.awt.NonFocusableCheckBox;
 import consulo.util.lang.StringUtil;
@@ -65,11 +66,17 @@ static enum GenerationMode
 	}
 
 	@Override
-	protected String getTitleKey()
+	protected LocalizeValue getTitle()
 	{
-		return mode == GenerationMode.GETTERS ? "generate.getter.fields.chooser.title" : mode == GenerationMode.SETTERS ? "generate.setter.fields.chooser" +
-				".title" : mode == GenerationMode.GETTERS_AND_SETTERS ? "generate.getter.setter.chooser.title" : mode == GenerationMode.TOSTRING ? "generate.to" +
-				".string.chooser.title" : "generate.constructor.fields.chooser.title";
+		return mode == GenerationMode.GETTERS
+			? JavaScriptLocalize.generateGetterFieldsChooserTitle()
+			: mode == GenerationMode.SETTERS
+			? JavaScriptLocalize.generateSetterFieldsChooserTitle()
+			: mode == GenerationMode.GETTERS_AND_SETTERS
+			? JavaScriptLocalize.generateGetterSetterChooserTitle()
+			: mode == GenerationMode.TOSTRING
+			? JavaScriptLocalize.generateToStringChooserTitle()
+			: JavaScriptLocalize.generateConstructorFieldsChooserTitle();
 	}
 
 	@Override
@@ -80,7 +87,7 @@ protected void appendOwnOptions(List<JComponent> jComponentList)
 		{
 			if(!ApplicationManager.getApplication().isUnitTestMode())
 			{
-				myCreateBindableProperties = new NonFocusableCheckBox(JavaScriptBundle.message("generate.getter.fields.bindable.properties"));
+				myCreateBindableProperties = new NonFocusableCheckBox(JavaScriptLocalize.generateGetterFieldsBindableProperties().get());
 				jComponentList.add(myCreateBindableProperties);
 			}
 		}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
index d4c5c491..d0152e12 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
@@ -19,14 +19,16 @@
  */
 package com.intellij.lang.javascript.impl.generation;
 
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
 import com.intellij.lang.javascript.impl.validation.ImplementMethodsFix;
 import com.intellij.lang.javascript.impl.validation.ImplementedMethodProcessor;
+import com.intellij.lang.javascript.psi.JSClass;
+import com.intellij.lang.javascript.psi.JSFunction;
+import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.generation.ImplementMethodHandler;
+import consulo.localize.LocalizeValue;
 
 import java.util.Collection;
 
@@ -49,12 +51,12 @@ protected void addNonimplementedFunction(final JSFunction function)
 	}
 
 	@Override
-	protected String getTitleKey()
+  protected LocalizeValue getTitle()
 	{
-		return "methods.to.implement.chooser.title";
-	}
+		return JavaScriptLocalize.methodsToImplementChooserTitle();
+  }
 
-	@Override
+  @Override
 	protected BaseCreateMethodsFix createFix(final JSClass clazz)
 	{
 		return new ImplementMethodsFix(clazz);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
index 94919eee..f73985a8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
@@ -19,16 +19,18 @@
  */
 package com.intellij.lang.javascript.impl.generation;
 
+import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
+import com.intellij.lang.javascript.impl.validation.ImplementedMethodProcessor;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
-import com.intellij.lang.javascript.impl.validation.ImplementedMethodProcessor;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.generation.OverrideMethodHandler;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
+import consulo.localize.LocalizeValue;
 
 import java.util.Collection;
 import java.util.Map;
@@ -38,12 +40,12 @@
 public class JavaScriptOverrideMethodsHandler extends BaseJSGenerateHandler implements OverrideMethodHandler
 {
 	@Override
-	protected String getTitleKey()
+  protected LocalizeValue getTitle()
 	{
-		return "methods.to.override.chooser.title";
-	}
+		return JavaScriptLocalize.methodsToOverrideChooserTitle();
+  }
 
-	@Override
+  @Override
 	protected BaseCreateMethodsFix createFix(final JSClass clazz)
 	{
 		return new OverrideMethodsFix(clazz);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
index 3e54999a..fd1913b0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.impl.highlighting;
 
-import consulo.javascript.language.JavaScriptBundle;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.colorScheme.TextAttributesKey;
 import consulo.colorScheme.setting.AttributesDescriptor;
 import consulo.colorScheme.setting.ColorDescriptor;
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import consulo.javascript.lang.JavaScript15LanguageVersion;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.colorScheme.setting.ColorSettingsPage;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import org.jetbrains.annotations.NonNls;
@@ -47,34 +47,34 @@ public class JavaScriptColorsAndFontsPage implements ColorSettingsPage
 	static
 	{
 		ATTRS = new AttributesDescriptor[]{
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.keyword"), JavaScriptSyntaxHighlightKeys.JS_KEYWORD),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.string"), JavaScriptSyntaxHighlightKeys.JS_STRING),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.valid.string.escape"), JavaScriptSyntaxHighlightKeys.JS_VALID_STRING_ESCAPE),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.invalid.string.escape"), JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.number"), JavaScriptSyntaxHighlightKeys.JS_NUMBER),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.regexp"), JavaScriptSyntaxHighlightKeys.JS_REGEXP),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.linecomment"), JavaScriptSyntaxHighlightKeys.JS_LINE_COMMENT),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.blockcomment"), JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.doccomment"), JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.operation"), JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.parens"), JavaScriptSyntaxHighlightKeys.JS_PARENTHS),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.brackets"), JavaScriptSyntaxHighlightKeys.JS_BRACKETS),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.braces"), JavaScriptSyntaxHighlightKeys.JS_BRACES),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.comma"), JavaScriptSyntaxHighlightKeys.JS_COMMA),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.dot"), JavaScriptSyntaxHighlightKeys.JS_DOT),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.semicolon"), JavaScriptSyntaxHighlightKeys.JS_SEMICOLON),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.badcharacter"), JavaScriptSyntaxHighlightKeys.JS_BAD_CHARACTER),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.docmarkup"), JavaScriptSyntaxHighlightKeys.JS_DOC_MARKUP),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.doctag"), JavaScriptSyntaxHighlightKeys.JS_DOC_TAG),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.parameter"), JavaScriptSyntaxHighlightKeys.JS_PARAMETER),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.local.variable"), JavaScriptSyntaxHighlightKeys.JS_LOCAL_VARIABLE),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.global.variable"), JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.global.function"), JavaScriptSyntaxHighlightKeys.JS_GLOBAL_FUNCTION),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.instance.member.function"), JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.static.member.function"), JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_FUNCTION),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.static.member.variable"), JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_VARIABLE),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.instance.member.variable"), JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE),
-				new AttributesDescriptor(JavaScriptBundle.message("javascript.metadata"), JavaScriptSyntaxHighlightKeys.JS_METADATA),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptKeyword(), JavaScriptSyntaxHighlightKeys.JS_KEYWORD),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptString(), JavaScriptSyntaxHighlightKeys.JS_STRING),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptValidStringEscape(), JavaScriptSyntaxHighlightKeys.JS_VALID_STRING_ESCAPE),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptInvalidStringEscape(), JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptNumber(), JavaScriptSyntaxHighlightKeys.JS_NUMBER),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptRegexp(), JavaScriptSyntaxHighlightKeys.JS_REGEXP),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptLinecomment(), JavaScriptSyntaxHighlightKeys.JS_LINE_COMMENT),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptBlockcomment(), JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptDoccomment(), JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptOperation(), JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptParens(), JavaScriptSyntaxHighlightKeys.JS_PARENTHS),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptBrackets(), JavaScriptSyntaxHighlightKeys.JS_BRACKETS),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptBraces(), JavaScriptSyntaxHighlightKeys.JS_BRACES),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptComma(), JavaScriptSyntaxHighlightKeys.JS_COMMA),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptDot(), JavaScriptSyntaxHighlightKeys.JS_DOT),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptSemicolon(), JavaScriptSyntaxHighlightKeys.JS_SEMICOLON),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptBadcharacter(), JavaScriptSyntaxHighlightKeys.JS_BAD_CHARACTER),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptDocmarkup(), JavaScriptSyntaxHighlightKeys.JS_DOC_MARKUP),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptDoctag(), JavaScriptSyntaxHighlightKeys.JS_DOC_TAG),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptParameter(), JavaScriptSyntaxHighlightKeys.JS_PARAMETER),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptLocalVariable(), JavaScriptSyntaxHighlightKeys.JS_LOCAL_VARIABLE),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptGlobalVariable(), JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptGlobalFunction(), JavaScriptSyntaxHighlightKeys.JS_GLOBAL_FUNCTION),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptInstanceMemberFunction(), JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptStaticMemberFunction(), JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_FUNCTION),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptStaticMemberVariable(), JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_VARIABLE),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptInstanceMemberVariable(), JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE),
+				new AttributesDescriptor(JavaScriptLocalize.javascriptMetadata(), JavaScriptSyntaxHighlightKeys.JS_METADATA),
 		};
 		ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("local_variable", JavaScriptSyntaxHighlightKeys.JS_LOCAL_VARIABLE);
 		ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("global_variable", JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
index 51dfc950..016410bb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
@@ -24,9 +24,9 @@
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import consulo.javascript.lang.JavaScriptContextKeywordElementType;
 import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.language.JavaScriptBundle;
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptVersionUtil;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.rawHighlight.HighlightInfo;
@@ -35,6 +35,7 @@
 import consulo.language.editor.rawHighlight.HighlightVisitor;
 import consulo.language.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
 
 import javax.annotation.Nonnull;
@@ -361,7 +362,7 @@ private void reportFeatureUsage(@Nonnull PsiElement element, @Nonnull JavaScript
 			return;
 		}
 
-		String message = JavaScriptBundle.message("this.feature.is.not.supported.by.current.language", javaScriptFeature.getName());
+		LocalizeValue message = JavaScriptLocalize.thisFeatureIsNotSupportedByCurrentLanguage(javaScriptFeature.getName());
 
 		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(element).descriptionAndTooltip(message).create());
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
index 393556ef..869b4e3c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
@@ -16,22 +16,19 @@
 
 package com.intellij.lang.javascript.impl.inspections;
 
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import consulo.ui.ex.awt.DialogWrapper;
-import consulo.language.psi.PsiElement;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
 import consulo.project.Project;
+import consulo.ui.ex.awt.DialogWrapper;
 import consulo.ui.ex.awt.event.DocumentAdapter;
 
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+
 /**
  * @author Maxim.Mossienko
  *         Date: Jun 9, 2008
@@ -47,7 +44,7 @@ protected CreateClassDialog(final Project project, String className, String pack
 	{
 		super(project, false);
 
-		setTitle(JavaScriptBundle.message(isInterface ? "create.interface.dialog.title" : "create.class.dialog.title"));
+		setTitle(isInterface ? JavaScriptLocalize.createInterfaceDialogTitle() : JavaScriptLocalize.createClassDialogTitle());
 		setModal(true);
 
 		myPackageName.getDocument().addDocumentListener(new DocumentAdapter()
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
index f0a60809..6d7fc913 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.impl.inspections;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.impl.flex.ImportUtils;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -25,6 +24,7 @@
 import consulo.fileTemplate.FileTemplate;
 import consulo.fileTemplate.FileTemplateManager;
 import consulo.fileTemplate.FileTemplateUtil;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiDirectory;
@@ -70,8 +70,9 @@ public CreateClassOrInterfaceAction(JSReferenceExpression context, boolean isInt
 	@Nonnull
 	public String getName()
 	{
-		final String key = myIsInterface ? "javascript.create.interface.intention.name" : "javascript.create.class.intention.name";
-		return JavaScriptBundle.message(key, classNameToCreate);
+		return myIsInterface 
+			? JavaScriptLocalize.javascriptCreateInterfaceIntentionName(classNameToCreate).get() 
+			: JavaScriptLocalize.javascriptCreateClassIntentionName(classNameToCreate).get();
 	}
 
 	@Override
@@ -86,18 +87,18 @@ public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescr
 	{
 		PsiFile contextFile = myContext.getContainingFile();
 		final PsiElement context = contextFile.getContext();
-		if(context != null)
+		if (context != null)
 		{
 			contextFile = context.getContainingFile();
 		}
 
 		packageName = JSResolveUtil.getExpectedPackageNameFromFile(contextFile.getVirtualFile(), project, false);
 
-		if(!ApplicationManager.getApplication().isUnitTestMode())
+		if (!ApplicationManager.getApplication().isUnitTestMode())
 		{
 			final CreateClassDialog dialog = new CreateClassDialog(project, classNameToCreate, packageName, myIsInterface);
 			dialog.show();
-			if(dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE)
+			if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE)
 			{
 				return;
 			}
@@ -116,8 +117,11 @@ public void run()
 			{
 				try
 				{
-					final FileTemplate template = FileTemplateManager.getInstance().getTemplate(myIsInterface ? JavaScriptSupportLoader
-							.ACTION_SCRIPT_INTERFACE_TEMPLATE_NAME : JavaScriptSupportLoader.ACTION_SCRIPT_CLASS_TEMPLATE_NAME);
+					final FileTemplate template = FileTemplateManager.getInstance().getTemplate(
+						myIsInterface
+							? JavaScriptSupportLoader.ACTION_SCRIPT_INTERFACE_TEMPLATE_NAME
+							: JavaScriptSupportLoader.ACTION_SCRIPT_CLASS_TEMPLATE_NAME
+					);
 					@NonNls final String fileName = classNameToCreate + ".as";
 					final Properties props = new Properties();
 					props.setProperty(FileTemplate.ATTRIBUTE_NAME, classNameToCreate);
@@ -125,15 +129,15 @@ public void run()
 					VirtualFile base = ModuleRootManager.getInstance(element).getSourceRoots()[0];
 					VirtualFile relativeFile = VirtualFileUtil.findRelativeFile(packageName, base);
 
-					if(relativeFile == null)
+					if (relativeFile == null)
 					{
 						relativeFile = base;
 						StringTokenizer tokenizer = new StringTokenizer(packageName, ".");
-						while(tokenizer.hasMoreTokens())
+						while (tokenizer.hasMoreTokens())
 						{
 							String nextNameSegment = tokenizer.nextToken();
 							VirtualFile next = relativeFile.findChild(nextNameSegment);
-							if(next == null)
+							if (next == null)
 							{
 								next = relativeFile.createChildDirectory(this, nextNameSegment);
 							}
@@ -148,12 +152,12 @@ public void run()
 					FileTemplateUtil.createFromTemplate(template, fileName, props, psiDirectory);
 
 					String contextPackage = JSResolveUtil.findPackageStatementQualifier(myContext);
-					if(packageName != null && !packageName.equals(contextPackage) && packageName.length() > 0)
+					if (packageName != null && !packageName.equals(contextPackage) && packageName.length() > 0)
 					{
 						ImportUtils.doImport(myContext, packageName + "." + classNameToCreate);
 					}
 				}
-				catch(Exception e)
+				catch (Exception e)
 				{
 					Logger.getInstance(getClass().getName()).error(e);
 				}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
index ccb426c0..540de9a1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
@@ -17,12 +17,12 @@
 package com.intellij.lang.javascript.impl.inspections;
 
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.editor.inspection.ProblemsHolder;
 import consulo.language.psi.PsiElement;
@@ -51,7 +51,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return JavaScriptBundle.message("js.deprecated.symbols.inspection.name");
+		return JavaScriptLocalize.jsDeprecatedSymbolsInspectionName().get();
 	}
 
 	@Override
@@ -79,8 +79,11 @@ public void visitJSReferenceExpression(final JSReferenceExpression node)
 					}
 					if(JSDocumentationUtils.isDeprecated(element))
 					{
-						holder.registerProblem(node.getReferenceNameElement(), JavaScriptBundle.message("javascript.deprecated.symbol.used.name.message"),
-								ProblemHighlightType.LIKE_DEPRECATED);
+						holder.registerProblem(
+							node.getReferenceNameElement(),
+							JavaScriptLocalize.javascriptDeprecatedSymbolUsedNameMessage().get(),
+							ProblemHighlightType.LIKE_DEPRECATED
+						);
 						break;
 					}
 				}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
index 958a0ad4..178b1b31 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
@@ -17,13 +17,13 @@
 package com.intellij.lang.javascript.impl.inspections;
 
 import com.intellij.lang.javascript.JSElementType;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.editor.inspection.ProblemsHolder;
 import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
@@ -57,7 +57,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return JavaScriptBundle.message("js.duplicated.declaration.inspection.name");
+		return JavaScriptLocalize.jsDuplicatedDeclarationInspectionName().get();
 	}
 
 	@Override
@@ -193,10 +193,12 @@ else if((attrList != null && attrList.getNamespace() != null) || (attrList2 != n
 
 				if(processor.getResult() != null && processor.getResult() != scope)
 				{
-					holder.registerProblem(nameIdentifier, JavaScriptBundle.message("javascript.validation.message.duplicate.declaration"),
-							originalScope.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 ? ProblemHighlightType.ERROR :
-									ProblemHighlightType
-									.GENERIC_ERROR_OR_WARNING);
+					holder.registerProblem(
+						nameIdentifier,
+						JavaScriptLocalize.javascriptValidationMessageDuplicateDeclaration().get(),
+						originalScope.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4
+							? ProblemHighlightType.ERROR : ProblemHighlightType.GENERIC_ERROR_OR_WARNING
+					);
 				}
 			}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
index eb5a836a..276a1108 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
@@ -17,12 +17,12 @@
 package com.intellij.lang.javascript.impl.inspections;
 
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSUtils;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.document.Document;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.FileModificationService;
 import consulo.language.editor.inspection.LocalQuickFix;
@@ -62,7 +62,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return JavaScriptBundle.message("js.undeclared.variable.inspection.name");
+		return JavaScriptLocalize.jsUndeclaredVariableInspectionName().get();
 	}
 
 	@Override
@@ -117,8 +117,12 @@ public void visitJSReferenceExpression(final JSReferenceExpression node)
 									fixes.add(new DeclareJSVariableIntentionAction(node));
 								}
 
-								holder.registerProblem(nameIdentifier, JavaScriptBundle.message("javascript.undeclared.variable.name.message", node.getReferencedName()),
-										ProblemHighlightType.GENERIC_ERROR_OR_WARNING, !fixes.isEmpty() ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null);
+								holder.registerProblem(
+									nameIdentifier,
+									JavaScriptLocalize.javascriptUndeclaredVariableNameMessage(node.getReferencedName()).get(),
+									ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+									!fixes.isEmpty() ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null
+								);
 							}
 						}
 					}
@@ -162,14 +166,14 @@ private static class DeclareJSVariableIntentionAction implements LocalQuickFix
 		@Nonnull
 		public String getName()
 		{
-			return JavaScriptBundle.message("javascript.declare.variable.intention.name", myReferenceExpression.getReferencedName());
+			return JavaScriptLocalize.javascriptDeclareVariableIntentionName(myReferenceExpression.getReferencedName()).get();
 		}
 
 		@Override
 		@Nonnull
 		public String getFamilyName()
 		{
-			return JavaScriptBundle.message("javascript.create.variable.intention.family");
+			return JavaScriptLocalize.javascriptCreateVariableIntentionFamily().get();
 		}
 
 		@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
index 13edeb48..c58af7fc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
@@ -17,21 +17,21 @@
 package com.intellij.lang.javascript.impl.inspections;
 
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.impl.flex.AddImportECMAScriptClassOrFunctionAction;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
+import com.intellij.lang.javascript.impl.flex.AddImportECMAScriptClassOrFunctionAction;
+import com.intellij.lang.javascript.impl.validation.JSAnnotatingVisitor;
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.util.JSUtils;
-import com.intellij.lang.javascript.impl.validation.JSAnnotatingVisitor;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.codeEditor.Editor;
 import consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory;
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptVersionUtil;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -43,15 +43,16 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.xml.ide.highlighter.XmlFileType;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.PropertyKey;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.function.BiFunction;
 
 /**
  * @author Maxim.Mossienko
@@ -73,7 +74,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return JavaScriptBundle.message("js.unresolved.function.inspection.name");
+		return JavaScriptLocalize.jsUnresolvedFunctionInspectionName().get();
 	}
 
 	@Override
@@ -94,9 +95,8 @@ public void visitJSCallExpression(final JSCallExpression node)
 			{
 				final JSExpression methodExpression = node.getMethodExpression();
 
-				if(methodExpression instanceof JSReferenceExpression)
+				if (methodExpression instanceof JSReferenceExpression referenceExpression)
 				{
-					final JSReferenceExpression referenceExpression = (JSReferenceExpression) methodExpression;
 					final ResolveResult[] resolveResults = referenceExpression.multiResolve(false);
 
 					boolean noCompleteResolve = true;
@@ -110,22 +110,25 @@ public void visitJSCallExpression(final JSCallExpression node)
 
 							PsiElement element = r.getElement();
 
-							if(element instanceof JSVariable)
+							if (element instanceof JSVariable variable)
 							{
-								String typeText = ((JSVariable) element).getTypeString();
+								String typeText = variable.getTypeString();
 
 								if(typeText != null && !"*".equals(typeText))
 								{
 									if(!allowMemberReference(inNewExpression, typeText))
 									{
-										holder.registerProblem(((JSReferenceExpression) methodExpression).getReferenceNameElement(), JavaScriptBundle.message("javascript.term.does.not" +
-												".evaluate.to.function"), getHighlightTypeForTypeOrSignatureProblem(node));
+										holder.registerProblem(
+											referenceExpression.getReferenceNameElement(),
+											JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction().get(),
+											getHighlightTypeForTypeOrSignatureProblem(node)
+										);
 									}
 								}
 							}
-							else if(element instanceof JSFunction && ((JSFunction) element).isGetProperty())
+							else if (element instanceof JSFunction function && function.isGetProperty())
 							{
-								String typeText = ((JSFunction) element).getReturnTypeString();
+								String typeText = function.getReturnTypeString();
 
 								if(!allowMemberReference(inNewExpression, typeText))
 								{
@@ -135,12 +138,19 @@ else if(element instanceof JSFunction && ((JSFunction) element).isGetProperty())
 									if(argumentList != null)
 									{
 										fixes = new LocalQuickFix[]{
-												new JSAnnotatingVisitor.RemoveASTNodeFix(argumentList.getNode(), "javascript.term.does.not.evaluate.to.function2.fix")
+											new JSAnnotatingVisitor.RemoveASTNodeFix(
+												argumentList.getNode(),
+												JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction2Fix()
+											)
 										};
 									}
 
-									holder.registerProblem(((JSReferenceExpression) methodExpression).getReferenceNameElement(), JavaScriptBundle.message("javascript.term.does.not" +
-											".evaluate.to.function2"), getHighlightTypeForTypeOrSignatureProblem(node), fixes);
+									holder.registerProblem(
+										((JSReferenceExpression) methodExpression).getReferenceNameElement(),
+										JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction2().get(),
+										getHighlightTypeForTypeOrSignatureProblem(node),
+										fixes
+									);
 								}
 							}
 							break;
@@ -187,21 +197,29 @@ else if(element instanceof JSFunction && ((JSFunction) element).isGetProperty())
 
 						if(referenceNameElement != null)
 						{
-							holder.registerProblem(referenceNameElement, JavaScriptBundle.message(inNewExpression ? "javascript.unresolved.type.name.message" : "javascript" +
-									".unresolved.function.name.message", refName), getUnresolveReferenceHighlightType(qualifier, node),
-									quickFixes.size() > 0 ? quickFixes.toArray(new LocalQuickFix[quickFixes.size()]) : null);
+							holder.registerProblem(
+								referenceNameElement,
+								inNewExpression
+									? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(refName).get()
+									: JavaScriptLocalize.javascriptUnresolvedFunctionNameMessage(refName).get(),
+								getUnresolveReferenceHighlightType(qualifier, node),
+									quickFixes.size() > 0 ? quickFixes.toArray(new LocalQuickFix[quickFixes.size()]) : null
+							);
 						}
 					}
 					else
 					{
 						PsiElement element = resolveResults[0].getElement();
 
-						if(inNewExpression && element instanceof JSClass && ((JSClass) element).isInterface())
+						if (inNewExpression && element instanceof JSClass jsClass && jsClass.isInterface())
 						{
 							final PsiElement referenceNameElement = referenceExpression.getReferenceNameElement();
 
-							holder.registerProblem(referenceNameElement, JavaScriptBundle.message("javascript.interface.can.not.be.instantiated.message"),
-									getUnresolveReferenceHighlightType(referenceExpression.getQualifier(), node));
+							holder.registerProblem(
+								referenceNameElement,
+								JavaScriptLocalize.javascriptInterfaceCanNotBeInstantiatedMessage().get(),
+								getUnresolveReferenceHighlightType(referenceExpression.getQualifier(), node)
+							);
 						}
 						else
 						{
@@ -218,20 +236,23 @@ else if(methodExpression instanceof JSSuperExpression)
 						checkFunction(node, element, holder);
 					}
 				}
-				else if(methodExpression instanceof JSNewExpression)
+				else if (methodExpression instanceof JSNewExpression newExpression)
 				{
-					JSExpression methodExpr = ((JSNewExpression) methodExpression).getMethodExpression();
+					JSExpression methodExpr = newExpression.getMethodExpression();
 
-					if(methodExpr instanceof JSReferenceExpression)
+					if (methodExpr instanceof JSReferenceExpression referenceExpression)
 					{
-						ResolveResult[] results = ((JSReferenceExpression) methodExpr).multiResolve(false);
+						ResolveResult[] results = referenceExpression.multiResolve(false);
 						PsiElement elt;
 
 						if(results.length > 0 && ((elt = results[0].getElement()) instanceof JSFunction && ((JSFunction) elt).isConstructor() || elt instanceof
 								JSClass))
 						{
-							holder.registerProblem(methodExpression, JavaScriptBundle.message("javascript.term.does.not.evaluate.to.function"),
-									getUnresolveReferenceHighlightType(null, node));
+							holder.registerProblem(
+								methodExpression,
+								JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction().get(),
+								getUnresolveReferenceHighlightType(null, node)
+							);
 						}
 					}
 				}
@@ -282,7 +303,13 @@ public void visitJSAssignmentExpression(final JSAssignmentExpression node)
 				{
 					expressionType = JSResolveUtil.getQualifiedExpressionType(lOperand, containingFile);
 				}
-				checkExpressionIsAssignableToType(rOperand, expressionType, holder, containingFile, "javascript.assigned.expression.type.mismatch");
+				checkExpressionIsAssignableToType(
+					rOperand,
+					expressionType,
+					holder,
+					containingFile,
+					JavaScriptLocalize::javascriptAssignedExpressionTypeMismatch
+				);
 			}
 
 			@Override
@@ -310,8 +337,13 @@ public void visitJSReturnStatement(final JSReturnStatement node)
 					return;
 				}
 
-				checkExpressionIsAssignableToType(expression, JSImportHandlingUtil.resolveTypeName(typeString, fun), holder, containingFile,
-						"javascript.returned.expression.type.mismatch");
+				checkExpressionIsAssignableToType(
+					expression,
+					JSImportHandlingUtil.resolveTypeName(typeString, fun),
+					holder,
+					containingFile,
+					JavaScriptLocalize::javascriptReturnedExpressionTypeMismatch
+				);
 			}
 
 			@Override
@@ -322,7 +354,13 @@ public void visitJSVariable(final JSVariable node)
 				{
 					return;
 				}
-				checkExpressionIsAssignableToVariable(node, initializer, holder, node.getContainingFile(), "javascript.initializer.type.mismatch");
+				checkExpressionIsAssignableToVariable(
+					node,
+					initializer,
+					holder,
+					node.getContainingFile(),
+					JavaScriptLocalize::javascriptInitializerTypeMismatch
+				);
 			}
 
 			@Override
@@ -340,7 +378,7 @@ public void visitJSBinaryExpression(JSBinaryExpression node)
 
 						if(results.length > 0 && results[0].getElement() instanceof JSVariable)
 						{
-							checkTypeIs(rOperand, rOperand, holder, "Class", "javascript.binary.operand.type.mismatch");
+							checkTypeIs(rOperand, rOperand, holder, "Class");
 						}
 					}
 				}
@@ -367,8 +405,11 @@ public void visitJSForInStatement(JSForInStatement node)
 									"Array".equals(expressionType) &&
 									("Object".equals(typeElementText = typeElement.getText()) || "*".equals(typeElementText)))
 							{
-								holder.registerProblem(typeElement, JavaScriptBundle.message("javascript.incorrect.array.type.in.for-in"),
-										ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
+								holder.registerProblem(
+									typeElement,
+									JavaScriptLocalize.javascriptIncorrectArrayTypeInForin().get(),
+									ProblemHighlightType.GENERIC_ERROR_OR_WARNING
+								);
 								continue;
 							}
 
@@ -376,8 +417,7 @@ public void visitJSForInStatement(JSForInStatement node)
 							{
 								continue;
 							}
-							checkTypeIs(typeElement, typeElement, holder, "XMLList".equals(expressionType) ? "XML" : "String",
-									"javascript.incorrect.variable.type.mismatch");
+							checkTypeIs(typeElement, typeElement, holder, "XMLList".equals(expressionType) ? "XML" : "String");
 						}
 					}
 				}
@@ -390,24 +430,40 @@ private static boolean allowMemberReference(boolean inNewExpression, String type
 		return ("Class".equals(typeText) && inNewExpression) || "Function".equals(typeText);
 	}
 
-	private static void checkTypeIs(PsiElement type, PsiElement node, ProblemsHolder holder, String typeName, String key)
+	private static void checkTypeIs(PsiElement type, PsiElement node, ProblemsHolder holder, String typeName)
 	{
-		if(type instanceof JSReferenceExpression)
+		if (type instanceof JSReferenceExpression referenceExpression)
 		{
-			checkTypeIs((JSExpression) type, node, holder, typeName, key);
+			String expressionType = JSResolveUtil.getQualifiedExpressionType(referenceExpression, referenceExpression.getContainingFile());
+			if (!typeName.equals(expressionType))
+			{
+				holder.registerProblem(
+					node,
+					JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, expressionType).get(),
+					getHighlightTypeForTypeOrSignatureProblem(node)
+				);
+			}
 		}
 		else if(type != null)
 		{
-			holder.registerProblem(node, JavaScriptBundle.message(key, typeName, type.getText()), getHighlightTypeForTypeOrSignatureProblem(node));
+			holder.registerProblem(
+				node,
+				JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, type.getText()).get(),
+				getHighlightTypeForTypeOrSignatureProblem(node)
+			);
 		}
 	}
 
-	private static void checkTypeIs(JSExpression rOperand, PsiElement node, ProblemsHolder holder, String typeName, String key)
+	private static void checkTypeIs(JSExpression rOperand, PsiElement node, ProblemsHolder holder, String typeName)
 	{
 		String expressionType = JSResolveUtil.getQualifiedExpressionType(rOperand, rOperand.getContainingFile());
 		if(!typeName.equals(expressionType))
 		{
-			holder.registerProblem(node, JavaScriptBundle.message(key, typeName, expressionType), getHighlightTypeForTypeOrSignatureProblem(node));
+			holder.registerProblem(
+				node,
+				JavaScriptLocalize.javascriptBinaryOperandTypeMismatch(typeName, expressionType).get(),
+				getHighlightTypeForTypeOrSignatureProblem(node)
+			);
 		}
 	}
 
@@ -420,22 +476,22 @@ static ProblemHighlightType getUnresolveReferenceHighlightType(final @Nullable J
 		{
 			jsClass = JSResolveUtil.findClassOfQualifier(qualifier, containingFile);
 
-			if(jsClass == null && (qualifier instanceof JSReferenceExpression))
+			if (jsClass == null && qualifier instanceof JSReferenceExpression referenceExpression)
 			{
-				ResolveResult[] results = ((JSReferenceExpression) qualifier).multiResolve(false);
+				ResolveResult[] results = referenceExpression.multiResolve(false);
 
 				if(results.length != 0)
 				{
 					PsiElement resultElement = results[0].getElement();
 					String type = null;
 
-					if(resultElement instanceof JSVariable)
+					if (resultElement instanceof JSVariable variable)
 					{
-						type = ((JSVariable) resultElement).getTypeString();
+						type = variable.getTypeString();
 					}
-					else if(resultElement instanceof JSFunction)
+					else if (resultElement instanceof JSFunction function)
 					{
-						type = ((JSFunction) resultElement).getReturnTypeString();
+						type = function.getReturnTypeString();
 					}
 
 					if("*".equals(type))
@@ -472,9 +528,8 @@ else if(resultElement instanceof JSFunction)
 
 	private static void checkFunction(final JSCallExpression node, final PsiElement element, final ProblemsHolder holder)
 	{
-		if(element instanceof JSFunction)
+		if (element instanceof JSFunction function)
 		{
-			final JSFunction function = (JSFunction) element;
 			if(!function.isGetProperty() || !"Function".equals(function.getReturnTypeString()))
 			{
 				final JSParameterList parameterList = function.getParameterList();
@@ -496,8 +551,11 @@ else if(element instanceof JSClass)
 				JSArgumentList argumentList = node.getArgumentList();
 				if(argumentList == null || argumentList.getArguments().length != 1)
 				{
-					holder.registerProblem(argumentList != null ? argumentList : node, JavaScriptBundle.message("javascript.invalid.number.of.parameters", "one"),
-							getHighlightTypeForTypeOrSignatureProblem(node));
+					holder.registerProblem(
+						argumentList != null ? argumentList : node,
+						JavaScriptLocalize.javascriptInvalidNumberOfParameters("one").get(),
+						getHighlightTypeForTypeOrSignatureProblem(node)
+					);
 				}
 			}
 		}
@@ -536,12 +594,15 @@ private static void checkCallParameters(final JSCallExpression node, final JSPar
 			maxParameterLength = Integer.MAX_VALUE;
 		}
 
-		if((expressions.length < minParameterLength || expressions.length > maxParameterLength) && !functionReferencesArguments)
+		if ((expressions.length < minParameterLength || expressions.length > maxParameterLength) && !functionReferencesArguments)
 		{
-			final String s = (lastIsRest ? minParameterLength + " or more " : String.valueOf(minParameterLength) + (minParameterLength != maxParameterLength
-					? ".." + maxParameterLength : ""));
-			holder.registerProblem(argumentList != null ? argumentList : node, JavaScriptBundle.message("javascript.invalid.number.of.parameters", s),
-					getHighlightTypeForTypeOrSignatureProblem(node));
+			final String s = (lastIsRest ? minParameterLength + " or more " : String.valueOf(minParameterLength) +
+				(minParameterLength != maxParameterLength ? ".." + maxParameterLength : ""));
+			holder.registerProblem(
+				argumentList != null ? argumentList : node,
+				JavaScriptLocalize.javascriptInvalidNumberOfParameters(s).get(),
+				getHighlightTypeForTypeOrSignatureProblem(node)
+			);
 		}
 		else
 		{
@@ -558,21 +619,37 @@ private static void checkCallParameters(final JSCallExpression node, final JSPar
 				{
 					break;
 				}
-				checkExpressionIsAssignableToVariable(p, expressions[i], holder, containingFile, "javascript.argument.type.mismatch");
+				checkExpressionIsAssignableToVariable(p, expressions[i], holder, containingFile, JavaScriptLocalize::javascriptArgumentTypeMismatch);
 				++i;
 			}
 		}
 	}
 
-	private static void checkExpressionIsAssignableToVariable(final JSVariable p, JSExpression expr, final ProblemsHolder holder,
-			final PsiFile containingFile, @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String problemKey)
+	private static void checkExpressionIsAssignableToVariable(
+		final JSVariable p,
+		JSExpression expr,
+		final ProblemsHolder holder,
+		final PsiFile containingFile,
+		final BiFunction<Object, Object, LocalizeValue> messageGenerator
+	)
 	{
 		final String parameterTypeResolved = JSImportHandlingUtil.resolveTypeName(p.getTypeString(), p);
-		checkExpressionIsAssignableToType(expr, parameterTypeResolved, holder, containingFile, problemKey);
+		checkExpressionIsAssignableToType(
+			expr,
+			parameterTypeResolved,
+			holder,
+			containingFile,
+			messageGenerator
+		);
 	}
 
-	private static void checkExpressionIsAssignableToType(final JSExpression expr, final String type, final ProblemsHolder holder,
-			final PsiFile containingFile, final String problemKey)
+	private static void checkExpressionIsAssignableToType(
+		final JSExpression expr,
+		final String type,
+		final ProblemsHolder holder,
+		final PsiFile containingFile,
+		final BiFunction<Object, Object, LocalizeValue> messageGenerator
+	)
 	{
 		if("*".equals(type) || type == null)
 		{
@@ -582,8 +659,12 @@ private static void checkExpressionIsAssignableToType(final JSExpression expr, f
 
 		if(!JSResolveUtil.isAssignableType(type, expressionType, containingFile))
 		{
-			holder.registerProblem(expr, JavaScriptBundle.message(problemKey, type, expressionType), getHighlightTypeForTypeOrSignatureProblem(expr),
-					new JSInsertCastFix(type));
+      holder.registerProblem(
+      	expr,
+				messageGenerator.apply(type, expressionType).get(),
+				getHighlightTypeForTypeOrSignatureProblem(expr),
+				new JSInsertCastFix(type)
+			);
 		}
 	}
 
@@ -609,7 +690,7 @@ public JSInsertCastFix(final String type)
 		@Nonnull
 		public String getName()
 		{
-			return JavaScriptBundle.message("javascript.insert.cast.fix");
+			return JavaScriptLocalize.javascriptInsertCastFix().get();
 		}
 
 		@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
index 978f1afc..c0d553bc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
@@ -16,10 +16,9 @@
 
 package com.intellij.lang.javascript.impl.inspections;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.impl.flex.AddImportECMAScriptClassOrFunctionAction;
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
+import com.intellij.lang.javascript.impl.flex.AddImportECMAScriptClassOrFunctionAction;
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
 import com.intellij.lang.javascript.psi.*;
@@ -29,6 +28,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.inspections.qucikFixes.CreateJSFunctionFixBase;
 import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.codeStyle.CodeStyleSettingsManager;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemsHolder;
@@ -37,6 +37,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
 import org.jetbrains.annotations.NonNls;
 
@@ -65,7 +66,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return JavaScriptBundle.message("js.unresolved.variable.inspection.name");
+		return JavaScriptLocalize.jsUnresolvedVariableInspectionName().get();
 	}
 
 	@Override
@@ -244,12 +245,18 @@ protected void addReturnType(Template template, JSReferenceExpression referenceE
 								}
 							}
 
-							final String key = node.getQualifier() == null ? JSResolveUtil.isExprInTypeContext(node) ? "javascript.unresolved.type.name.message" :
-									"javascript.unresolved.variable.or.type.name.message" : "javascript.unresolved.variable.name.message";
-
-							holder.registerProblem(nameIdentifier, JavaScriptBundle.message(key, node.getReferencedName()),
-									JSUnresolvedFunctionInspection.getUnresolveReferenceHighlightType(qualifier, node),
-									fixes.size() > 0 ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null);
+							final LocalizeValue message = node.getQualifier() == null
+								? JSResolveUtil.isExprInTypeContext(node)
+								? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(node.getReferencedName())
+								: JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage(node.getReferencedName())
+								: JavaScriptLocalize.javascriptUnresolvedVariableNameMessage(node.getReferencedName());
+
+							holder.registerProblem(
+								nameIdentifier,
+								message.get(),
+								JSUnresolvedFunctionInspection.getUnresolveReferenceHighlightType(qualifier, node),
+								fixes.size() > 0 ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null
+							);
 						}
 					}
 				}
@@ -271,7 +278,7 @@ private abstract static class BaseCreateJSVariableIntentionAction extends BaseCr
 		@Nonnull
 		public String getFamilyName()
 		{
-			return JavaScriptBundle.message("javascript.create.variable.intention.family");
+			return JavaScriptLocalize.javascriptCreateVariableIntentionFamily().get();
 		}
 	}
 
@@ -286,7 +293,7 @@ private static class CreateJSNamespaceIntentionAction extends BaseCreateJSVariab
 		@Nonnull
 		public String getName()
 		{
-			return JavaScriptBundle.message("javascript.create.namespace.intention.name", myReferencedName);
+			return JavaScriptLocalize.javascriptCreateNamespaceIntentionName(myReferencedName).get();
 		}
 
 		@RequiredReadAction
@@ -320,14 +327,25 @@ private static class CreateJSVariableIntentionAction extends BaseCreateJSVariabl
 		@Nonnull
 		public String getName()
 		{
-			return JavaScriptBundle.message(isField ? isConstant ? "javascript.create.constant.field.intention.name" : "javascript.create.property.intention.name" :
-					isConstant ? "javascript.create.constant.intention.name" : "javascript.create.variable.intention.name", myReferencedName);
+			return isField
+				? isConstant
+				? JavaScriptLocalize.javascriptCreateConstantFieldIntentionName(myReferencedName).get()
+				: JavaScriptLocalize.javascriptCreatePropertyIntentionName(myReferencedName).get()
+				: isConstant
+				? JavaScriptLocalize.javascriptCreateConstantIntentionName(myReferencedName).get()
+				: JavaScriptLocalize.javascriptCreateVariableIntentionName(myReferencedName).get();
 		}
 
 		@RequiredReadAction
 		@Override
-		protected void buildTemplate(final Template template, final JSReferenceExpression referenceExpression, final Set<JavaScriptFeature> features, boolean staticContext,
-				final PsiFile file, final PsiElement anchorParent)
+    protected void buildTemplate(
+			final Template template,
+			final JSReferenceExpression referenceExpression,
+			final Set<JavaScriptFeature> features,
+			boolean staticContext,
+			final PsiFile file,
+			final PsiElement anchorParent
+		)
 		{
 			boolean classFeature = features.contains(JavaScriptFeature.CLASS);
 
@@ -372,7 +390,11 @@ private static class CreateJSPropertyAccessorIntentionAction extends CreateJSFun
 
 		public CreateJSPropertyAccessorIntentionAction(String name, boolean getter)
 		{
-			super(name, getter ? "javascript.create.get.property.intention.name" : "javascript.create.set.property.intention.name");
+			super(
+				getter
+					? JavaScriptLocalize.javascriptCreateGetPropertyIntentionName(name)
+					: JavaScriptLocalize.javascriptCreateSetPropertyIntentionName(name)
+			);
 			myIsGetter = getter;
 		}
 
@@ -451,7 +473,7 @@ private static class CreateJSEventMethod extends CreateJSFunctionFixBase
 
 		public CreateJSEventMethod(String invokedName, JSExpression eventNameQualifier)
 		{
-			super(invokedName, "javascript.create.event.handler.intention.name");
+			super(JavaScriptLocalize.javascriptCreateEventHandlerIntentionName(invokedName));
 			myEventQualifier = eventNameQualifier;
 		}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
index 880e2acf..76086235 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.impl.inspections;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
 import com.intellij.lang.javascript.psi.*;
@@ -26,6 +25,7 @@
 import consulo.codeEditor.Editor;
 import consulo.fileEditor.FileEditorManager;
 import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.FileModificationService;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -38,6 +38,7 @@
 import consulo.language.editor.template.macro.MacroFactory;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
+import consulo.localize.LocalizeValue;
 import consulo.navigation.OpenFileDescriptor;
 import consulo.navigation.OpenFileDescriptorFactory;
 import consulo.project.Project;
@@ -66,7 +67,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return JavaScriptBundle.message("js.untyped.declaration.inspection.name");
+		return JavaScriptLocalize.jsUntypedDeclarationInspectionName().get();
 	}
 
 	@Nonnull
@@ -125,8 +126,15 @@ private static void process(final JSNamedElement node, final ProblemsHolder hold
 				JSPsiImplUtils.getTypeFromDeclaration(node) == null &&
 				(!(node instanceof JSParameter) || !((JSParameter) node).isRest()))
 		{
-			holder.registerProblem(nameIdentifier, JavaScriptBundle.message(node instanceof JSFunction ? "js.untyped.function.problem" : "js.untyped" +
-					".variable.problem", nameIdentifier.getText()), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new AddTypeToDclFix());
+			LocalizeValue description = node instanceof JSFunction
+				? JavaScriptLocalize.jsUntypedFunctionProblem(nameIdentifier.getText())
+				: JavaScriptLocalize.jsUntypedVariableProblem(nameIdentifier.getText());
+			holder.registerProblem(
+				nameIdentifier, 
+				description.get(),
+				ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+				new AddTypeToDclFix()
+			);
 		}
 	}
 
@@ -137,7 +145,7 @@ private static class AddTypeToDclFix implements LocalQuickFix
 		@Nonnull
 		public String getName()
 		{
-			return JavaScriptBundle.message("js.untyped.declaration.problem.addtype.fix");
+			return JavaScriptLocalize.jsUntypedDeclarationProblemAddtypeFix().get();
 		}
 
 		@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
index 12491d71..6285611c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
@@ -16,33 +16,33 @@
 
 package com.intellij.lang.javascript.impl.inspections;
 
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.editor.inspection.ProblemDescriptor;
-import consulo.language.editor.inspection.ProblemHighlightType;
-import consulo.language.editor.inspection.ProblemsHolder;
-import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
-import consulo.language.editor.inspection.LocalQuickFix;
 import com.intellij.lang.javascript.JSElementTypes;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.impl.highlighting.JavaScriptLineMarkerProvider;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import consulo.logging.Logger;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.editor.inspection.LocalQuickFix;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.editor.inspection.ProblemHighlightType;
+import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
+import consulo.logging.Logger;
 import consulo.project.Project;
 import consulo.util.collection.primitive.objects.ObjectIntMap;
 import consulo.util.collection.primitive.objects.ObjectMaps;
 import consulo.util.dataholder.Key;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.PropertyKey;
 
 import javax.annotation.Nonnull;
 import java.util.BitSet;
@@ -71,7 +71,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return JavaScriptBundle.message("js.unused.local.symbol.inspection.name");
+		return JavaScriptLocalize.jsUnusedLocalSymbolInspectionName().get();
 	}
 
 	@Override
@@ -270,10 +270,10 @@ private static void processDeclarationHost(final PsiElement node, final Problems
 				{
 					continue;
 				}
-				final @NonNls @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String messageId;
+				final LocalizeValue message;
 				final @Nonnull PsiElement highlightedElement;
 
-				if(p instanceof JSParameter)
+				if (p instanceof JSParameter parameter)
 				{
 					// There are cases of predefined sinatures for which we are not interested in reported unused parameters
 					final boolean ecma = node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
@@ -281,13 +281,13 @@ private static void processDeclarationHost(final PsiElement node, final Problems
 					{
 						continue; // do not report unused parameters
 					}
-					else if(ecma && node instanceof JSFunction)
+					else if (ecma && node instanceof JSFunction function)
 					{
-						final JSParameter[] params = ((JSFunction) node).getParameterList().getParameters();
+						final JSParameter[] params = function.getParameterList().getParameters();
 
 						if(params.length == 1)
 						{
-							@NonNls String type = ((JSParameter) p).getTypeString();
+							@NonNls String type = parameter.getTypeString();
 							if(type != null)
 							{
 								type = JSImportHandlingUtil.resolveTypeName(type, p);
@@ -315,11 +315,7 @@ else if(ecma && node instanceof JSFunction)
 										@Override
 										public boolean execute(final PsiElement element, final ResolveState state)
 										{
-											if(!(element instanceof JSClass))
-											{
-												return true;
-											}
-											return !myName.equals(((JSClass) element).getQualifiedName());
+											return !(element instanceof JSClass jsClass && myName.equals(jsClass.getQualifiedName()));
 										}
 									};
 									processor.setLocalResolve(true);
@@ -365,37 +361,46 @@ public boolean execute(final PsiElement element, final ResolveState state)
 						}
 					}
 
-					if(parameterIndexMap.getInt((JSParameter) p) < lastUsedParameterIndex)
+					if (parameterIndexMap.getInt(parameter) < lastUsedParameterIndex)
 					{
 						continue; // no sense to report unused symbol before used since it will change signature
 					}
 
-					messageId = "js.unused.parameter";
-					highlightedElement = ((JSParameter) p).getNameIdentifier();
+					message = JavaScriptLocalize.jsUnusedParameter();
+					highlightedElement = parameter.getNameIdentifier();
 				}
-				else if(p instanceof JSFunction)
+				else if (p instanceof JSFunction function)
 				{
-					final PsiElement nameIdentifier = ((JSFunction) p).getNameIdentifier();
-					if(nameIdentifier == null)
+					final PsiElement nameIdentifier = function.getNameIdentifier();
+					if (nameIdentifier == null)
 					{
 						continue;
 					}
 					highlightedElement = nameIdentifier;
-					messageId = "js.unused.function.declaration";
+					message = JavaScriptLocalize.jsUnusedFunctionDeclaration();
 				}
 				else
 				{
 					highlightedElement = ((JSVariable) p).getNameIdentifier();
-					messageId = "js.unused.local.variable";
+					message = JavaScriptLocalize.jsUnusedLocalVariable();
 				}
 
 				if(p.getParent() instanceof JSCatchBlock)
 				{
-					holder.registerProblem(highlightedElement, JavaScriptBundle.message(messageId), ProblemHighlightType.LIKE_UNUSED_SYMBOL);
+					holder.registerProblem(
+						highlightedElement,
+						message.get(),
+						ProblemHighlightType.LIKE_UNUSED_SYMBOL
+					);
 				}
 				else
 				{
-					holder.registerProblem(highlightedElement, JavaScriptBundle.message(messageId), ProblemHighlightType.LIKE_UNUSED_SYMBOL, new RemoveElementLocalQuickFix());
+					holder.registerProblem(
+						highlightedElement,
+						message.get(),
+						ProblemHighlightType.LIKE_UNUSED_SYMBOL,
+						new RemoveElementLocalQuickFix()
+					);
 				}
 			}
 		}
@@ -407,7 +412,7 @@ else if(p instanceof JSFunction)
 
 	private static void handleLocalDeclaration(final JSNamedElement node)
 	{
-		if(node instanceof JSFunction && !isSupportedFunction((JSFunction) node))
+		if (node instanceof JSFunction function && !isSupportedFunction(function))
 		{
 			return;
 		}
@@ -442,7 +447,7 @@ private static class RemoveElementLocalQuickFix implements LocalQuickFix
 		@Nonnull
 		public String getName()
 		{
-			return JavaScriptBundle.message("js.unused.symbol.remove");
+			return JavaScriptLocalize.jsUnusedSymbolRemove().get();
 		}
 
 		@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
index da1820f5..45f7c8d6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
@@ -21,6 +21,7 @@
 
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -30,9 +31,14 @@ public abstract class JSBaseClassBasedIntroduceDialog extends JSBaseIntroduceDia
 {
 	private static JSAttributeList.AccessType lastType;
 
-	protected JSBaseClassBasedIntroduceDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence, String titleKey)
+	protected JSBaseClassBasedIntroduceDialog(
+		final Project project,
+		final JSExpression[] occurences,
+		final JSExpression mainOccurence,
+		LocalizeValue title
+	)
 	{
-		super(project, occurences, mainOccurence, titleKey);
+		super(project, occurences, mainOccurence, title);
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
index 9faec08e..468aab80 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.impl.refactoring;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import consulo.application.Application;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.Language;
 import consulo.language.editor.refactoring.NamesValidator;
 import consulo.language.editor.refactoring.ui.ConflictsDialog;
@@ -30,6 +30,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.ui.ex.awt.Messages;
@@ -53,14 +54,19 @@ public abstract class JSBaseIntroduceDialog extends DialogWrapper implements Bas
 
 	private Alarm myAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
 
-	protected JSBaseIntroduceDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence, String titleKey)
+	protected JSBaseIntroduceDialog(
+		final Project project,
+		final JSExpression[] occurences,
+		final JSExpression mainOccurence,
+		LocalizeValue title
+	)
 	{
 		super(project, false);
 
 		myProject = project;
 		myOccurences = occurences;
 		myMainOccurence = mainOccurence;
-		setTitle(JavaScriptBundle.message(titleKey));
+		setTitle(title);
 	}
 
 	protected void doInit()
@@ -68,7 +74,7 @@ protected void doInit()
 		JCheckBox replaceAllCheckBox = getReplaceAllCheckBox();
 		if(myOccurences.length > 1)
 		{
-			replaceAllCheckBox.setText(JavaScriptBundle.message("javascript.introduce.variable.replace.all.occurrences", myOccurences.length));
+			replaceAllCheckBox.setText(JavaScriptLocalize.javascriptIntroduceVariableReplaceAllOccurrences(myOccurences.length).get());
 		}
 		else
 		{
@@ -213,8 +219,11 @@ protected void doOKAction()
 		final String name = getVariableName();
 		if(name.length() == 0 || !isValidName(name))
 		{
-			Messages.showErrorDialog(myProject, JavaScriptBundle.message("javascript.introduce.variable.invalid.name"),
-					JavaScriptBundle.message("javascript.introduce.variable.title"));
+			Messages.showErrorDialog(
+				myProject,
+				JavaScriptLocalize.javascriptIntroduceVariableInvalidName().get(),
+				JavaScriptLocalize.javascriptIntroduceVariableTitle().get()
+			);
 			getNameField().requestFocus();
 			return;
 		}
@@ -288,10 +297,10 @@ public void visitJSFunctionDeclaration(final JSFunction node)
 
 	private boolean showConflictsDialog(final JSNamedElement existing, final String name)
 	{
-		final String message = existing instanceof JSFunction ? JavaScriptBundle.message("javascript.introduce.variable.function.already.exists",
-				CommonRefactoringUtil.htmlEmphasize(name)) : JavaScriptBundle.message("javascript.introduce.variable.variable.already.exists",
-				CommonRefactoringUtil.htmlEmphasize(name));
-		final ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, message);
+		final LocalizeValue message = existing instanceof JSFunction
+			? JavaScriptLocalize.javascriptIntroduceVariableFunctionAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name))
+			: JavaScriptLocalize.javascriptIntroduceVariableVariableAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name));
+		final ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, message.get());
 		conflictsDialog.show();
 		return conflictsDialog.isOK();
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
index 07165223..8d00e31b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
@@ -16,45 +16,42 @@
 
 package com.intellij.lang.javascript.impl.refactoring;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
+import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import consulo.application.ApplicationManager;
 import consulo.codeEditor.Editor;
+import consulo.codeEditor.EditorColors;
+import consulo.codeEditor.markup.RangeHighlighter;
+import consulo.colorScheme.EditorColorsManager;
 import consulo.colorScheme.TextAttributes;
 import consulo.dataContext.DataContext;
 import consulo.document.RangeMarker;
+import consulo.document.util.TextRange;
 import consulo.language.editor.PsiEquivalenceUtil;
 import consulo.language.editor.highlight.HighlightManager;
 import consulo.language.editor.refactoring.RefactoringBundle;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
+import consulo.logging.Logger;
+import consulo.project.Project;
 import consulo.project.ui.wm.WindowManager;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.undoRedo.CommandProcessor;
 import org.jetbrains.annotations.NonNls;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
-import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
-import com.intellij.lang.javascript.psi.*;
-import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
-import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import consulo.logging.Logger;
-import consulo.codeEditor.EditorColors;
-import consulo.colorScheme.EditorColorsManager;
-import consulo.codeEditor.markup.RangeHighlighter;
-import consulo.project.Project;
-import consulo.document.util.TextRange;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiFile;
-import consulo.language.psi.PsiWhiteSpace;
-import consulo.language.psi.util.PsiTreeUtil;
-import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
-import consulo.language.util.IncorrectOperationException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author ven
@@ -172,21 +169,14 @@ public void invoke(@Nonnull final Project project, final Editor editor, PsiFile
 			return;
 		}
 
-		CommandProcessor.getInstance().executeCommand(project, new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				ApplicationManager.getApplication().runWriteAction(new Runnable()
-				{
-					@Override
-					public void run()
-					{
-						doRefactoring(project, editor, new BaseIntroduceContext<S>(expression, occurrences, settings));
-					}
-				});
-			}
-		}, getRefactoringName(), null);
+		CommandProcessor.getInstance().executeCommand(
+			project,
+			() -> ApplicationManager.getApplication().runWriteAction(
+				() -> doRefactoring(project, editor, new BaseIntroduceContext<>(expression, occurrences, settings))
+			),
+			getRefactoringName(),
+			null
+		);
 	}
 
 	protected static final class BaseIntroduceContext<S>
@@ -210,7 +200,7 @@ protected JSElement findIntroducedScope(final JSExpression expression)
 
 	protected abstract String getRefactoringName();
 
-	protected abstract String getCannotIntroduceMessagePropertyKey();
+	protected abstract LocalizeValue getCannotIntroduceMessage();
 
 	@Nullable
 	protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor)
@@ -218,8 +208,13 @@ protected JSExpression findIntroducedExpression(final PsiFile file, final int st
 		final JSExpression expression = findExpressionInRange(file, start, end);
 		if(expression == null)
 		{
-			CommonRefactoringUtil.showErrorHint(file.getProject(), editor, JavaScriptBundle.message(getCannotIntroduceMessagePropertyKey()), getRefactoringName(),
-					null);
+			CommonRefactoringUtil.showErrorHint(
+				file.getProject(),
+				editor,
+				getCannotIntroduceMessage().get(),
+				getRefactoringName(),
+				null
+			);
 		}
 		return expression;
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
index 79cb490a..0999ea77 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
@@ -16,13 +16,11 @@
 
 package com.intellij.lang.javascript.impl.refactoring.extractMethod;
 
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.ui.ex.awt.DialogWrapper;
 
+import javax.swing.*;
+
 /**
  * @author Maxim.Mossienko
  *         Date: Aug 9, 2008
@@ -37,7 +35,7 @@ public class JSExtractFunctionDialog extends DialogWrapper implements JSExtractF
 	{
 		super(false);
 
-		setTitle(JavaScriptBundle.message("javascript.extract.method.title"));
+		setTitle(JavaScriptLocalize.javascriptExtractMethodTitle());
 		init();
 	}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
index 27a896ea..9217c539 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
@@ -16,19 +16,18 @@
 
 package com.intellij.lang.javascript.impl.refactoring.extractMethod;
 
-import javax.annotation.Nonnull;
-
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.codeEditor.Editor;
+import consulo.dataContext.DataContext;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
+import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
-import consulo.undoRedo.CommandProcessor;
-import consulo.codeEditor.Editor;
 import consulo.project.Project;
 import consulo.ui.ex.awt.DialogWrapper;
-import consulo.language.psi.PsiElement;
-import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
-import consulo.application.ApplicationManager;
-import consulo.dataContext.DataContext;
+import consulo.undoRedo.CommandProcessor;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -58,21 +57,12 @@ public void invoke(@Nonnull final Project project, final Editor editor, PsiFile
 			return;
 		}
 
-		CommandProcessor.getInstance().executeCommand(project, new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				ApplicationManager.getApplication().runWriteAction(new Runnable()
-				{
-					@Override
-					public void run()
-					{
-						doRefactoring(project, editor, settings);
-					}
-				});
-			}
-		}, JavaScriptBundle.message("javascript.extract.method.title"), null);
+		CommandProcessor.getInstance().executeCommand(
+			project,
+			() -> project.getApplication().runWriteAction(() -> doRefactoring(project, editor, settings)),
+			JavaScriptLocalize.javascriptExtractMethodTitle().get(),
+			null
+		);
 	}
 
 	protected JSExtractFunctionSettings getSettings(final Project project, final Editor editor)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
index 0925a1d5..099ebf16 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
@@ -16,16 +16,13 @@
 
 package com.intellij.lang.javascript.impl.refactoring.introduceConstant;
 
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-
-import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.impl.refactoring.JSBaseClassBasedIntroduceDialog;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.project.Project;
 
+import javax.swing.*;
+
 /**
  * @author Maxim.Mossienko
  *         Date: Jul 24, 2008
@@ -44,7 +41,7 @@ class JSIntroduceConstantDialog extends JSBaseClassBasedIntroduceDialog implemen
 
 	protected JSIntroduceConstantDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence)
 	{
-		super(project, occurences, mainOccurence, "javascript.introduce.constant.title");
+		super(project, occurences, mainOccurence, JavaScriptLocalize.javascriptIntroduceConstantTitle());
 
 		doInit();
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
index 04074409..6f88c1a2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
@@ -16,15 +16,16 @@
 
 package com.intellij.lang.javascript.impl.refactoring.introduceConstant;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
-import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
+import com.intellij.lang.javascript.psi.*;
 import consulo.codeEditor.Editor;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.util.lang.ref.Ref;
 import org.jetbrains.annotations.NonNls;
@@ -39,13 +40,13 @@ public class JSIntroduceConstantHandler extends JSBaseIntroduceHandler<JSElement
 	@Override
 	protected String getRefactoringName()
 	{
-		return JavaScriptBundle.message("javascript.introduce.constant.title");
+		return JavaScriptLocalize.javascriptIntroduceConstantTitle().get();
 	}
 
 	@Override
-	protected String getCannotIntroduceMessagePropertyKey()
+	protected LocalizeValue getCannotIntroduceMessage()
 	{
-		return "javascript.introduce.constant.error.no.expression.selected";
+		return JavaScriptLocalize.javascriptIntroduceConstantErrorNoExpressionSelected();
 	}
 
 	@Override
@@ -59,7 +60,7 @@ protected String getDeclText(final JSIntroduceConstantSettings settings)
 	{
 		@NonNls String baseDeclText = "static const " + settings.getVariableName();
 		final JSAttributeList.AccessType type = settings.getAccessType();
-		if(type != JSAttributeList.AccessType.PACKAGE_LOCAL)
+		if (type != JSAttributeList.AccessType.PACKAGE_LOCAL)
 		{
 			baseDeclText = type.toString().toLowerCase() + " " + baseDeclText;
 		}
@@ -82,10 +83,15 @@ protected JSElement addStatementBefore(final JSElement anchorStatement, final JS
 	@Override
 	protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor)
 	{
-		if(file.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
+		if (file.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
 		{
-			CommonRefactoringUtil.showErrorHint(file.getProject(), editor, JavaScriptBundle.message("javascript.introduce.constant.error.not.available.in.javascript" +
-					".code"), getRefactoringName(), null);
+			CommonRefactoringUtil.showErrorHint(
+				file.getProject(),
+				editor,
+				JavaScriptLocalize.javascriptIntroduceConstantErrorNotAvailableInJavascriptCode().get(),
+				getRefactoringName(),
+				null
+			);
 			return null;
 		}
 
@@ -130,8 +136,13 @@ public void visitJSElement(final JSElement node)
 
 		if(Boolean.TRUE.equals(hasAccesibilityProblem.get()))
 		{
-			CommonRefactoringUtil.showErrorHint(file.getProject(), editor, JavaScriptBundle.message("javascript.introduce.constant.error.not.constant.expression" +
-					".selected"), getRefactoringName(), null);
+			CommonRefactoringUtil.showErrorHint(
+				file.getProject(),
+				editor,
+				JavaScriptLocalize.javascriptIntroduceConstantErrorNotConstantExpressionSelected().get(),
+				getRefactoringName(),
+				null
+			);
 			return null;
 		}
 		return expression;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
index 60b3aa22..0c1004f8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
@@ -17,8 +17,9 @@
 package com.intellij.lang.javascript.impl.refactoring.introduceField;
 
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
-import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.impl.refactoring.JSBaseClassBasedIntroduceDialog;
+import com.intellij.lang.javascript.psi.*;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.codeStyle.CodeStyleSettingsManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.ResolveResult;
@@ -52,7 +53,7 @@ class JSIntroduceFieldDialog extends JSBaseClassBasedIntroduceDialog implements
 
 	public JSIntroduceFieldDialog(final Project project, final JSExpression[] occurrences, final JSExpression expression)
 	{
-		super(project, occurrences, expression, "javascript.introduce.field.title");
+		super(project, occurrences, expression, JavaScriptLocalize.javascriptIntroduceFieldTitle());
 		doInit();
 	}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
index d1816c94..466a89c2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
@@ -16,19 +16,20 @@
 
 package com.intellij.lang.javascript.impl.refactoring.introduceField;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.flex.XmlBackedJSClassImpl;
+import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
 import consulo.codeEditor.Editor;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlFile;
 import org.jetbrains.annotations.NonNls;
@@ -43,13 +44,12 @@ public class JSIntroduceFieldHandler extends JSBaseIntroduceHandler<JSElement, J
 	@Override
 	protected String getRefactoringName()
 	{
-		return JavaScriptBundle.message("javascript.introduce.field.title");
+		return JavaScriptLocalize.javascriptIntroduceFieldTitle().get();
 	}
 
 	@Override
-	protected String getCannotIntroduceMessagePropertyKey()
-	{
-		return "javascript.introduce.field.error.no.expression.selected";
+	protected LocalizeValue getCannotIntroduceMessage() {
+		return JavaScriptLocalize.javascriptIntroduceFieldErrorNoExpressionSelected();
 	}
 
 	@Override
@@ -88,8 +88,13 @@ protected JSExpression findIntroducedExpression(final PsiFile file, final int st
 	{
 		if(file.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
 		{
-			CommonRefactoringUtil.showErrorHint(file.getProject(), editor, JavaScriptBundle.message("javascript.introduce.field.error.not.available.in.javascript" +
-					".code"), getRefactoringName(), null);
+			CommonRefactoringUtil.showErrorHint(
+				file.getProject(),
+				editor,
+				JavaScriptLocalize.javascriptIntroduceFieldErrorNotAvailableInJavascriptCode().get(),
+				getRefactoringName(),
+				null
+			);
 			return null;
 		}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
index a84a9c0e..b666c57d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
@@ -16,18 +16,14 @@
 
 package com.intellij.lang.javascript.impl.refactoring.introduceVariable;
 
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-
-import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceDialog;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.project.Project;
 import consulo.util.lang.StringUtil;
 
+import javax.swing.*;
+
 /**
  * @author ven
  */
@@ -48,7 +44,7 @@ public class JSIntroduceVariableDialog extends JSBaseIntroduceDialog implements
 
 	protected JSIntroduceVariableDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence)
 	{
-		super(project, occurences, mainOccurence, "javascript.introduce.variable.title");
+		super(project, occurences, mainOccurence, JavaScriptLocalize.javascriptIntroduceVariableTitle());
 
 		if(ourLastIntroduceType == Settings.IntroducedVarType.CONST)
 		{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
index 76a27574..e7ee417d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
@@ -16,10 +16,11 @@
 
 package com.intellij.lang.javascript.impl.refactoring.introduceVariable;
 
-import consulo.javascript.language.JavaScriptBundle;
+import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -31,13 +32,12 @@ public class JSIntroduceVariableHandler extends JSBaseIntroduceHandler<JSStateme
 	@Override
 	protected String getRefactoringName()
 	{
-		return JavaScriptBundle.message("javascript.introduce.variable.title");
+		return JavaScriptLocalize.javascriptIntroduceVariableTitle().get();
 	}
 
 	@Override
-	protected String getCannotIntroduceMessagePropertyKey()
-	{
-		return "javascript.introduce.variable.error.no.expression.selected";
+	protected LocalizeValue getCannotIntroduceMessage() {
+		return JavaScriptLocalize.javascriptIntroduceVariableErrorNoExpressionSelected();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
index 2f1a8211..b276b37c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
@@ -50,85 +50,60 @@ public boolean execute(@Nonnull final DefinitionsScopedSearch.SearchParameters p
 		final PsiElement sourceElement = parameters.getElement();
 		if(sourceElement instanceof PsiNamedElement && sourceElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE))
 		{
-			ReferencesSearch.search(sourceElement, GlobalSearchScope.projectScope(sourceElement.getProject())).forEach(new Processor<PsiReference>()
-			{
-				@Override
-				public boolean process(final PsiReference t)
+			ReferencesSearch.search(sourceElement, GlobalSearchScope.projectScope(sourceElement.getProject())).forEach(t -> {
+				if (t instanceof JSReferenceExpression referenceExpression)
 				{
-					if(t instanceof JSReferenceExpression)
+					final PsiElement parent = referenceExpression.getParent();
+					final ResolveResult[] resolveResults = referenceExpression.multiResolve(true);
+
+					for (ResolveResult r : resolveResults)
 					{
-						final PsiElement parent = ((JSReferenceExpression) t).getParent();
-						final ResolveResult[] resolveResults = ((JSReferenceExpression) t).multiResolve(true);
+						PsiElement psiElement = r.getElement();
 
-						for(ResolveResult r : resolveResults)
+						if (psiElement != null &&
+								!JavaScriptIndex.isFromPredefinedFile(psiElement.getContainingFile()) &&
+								sourceElement != psiElement)
 						{
-							PsiElement psiElement = r.getElement();
-
-							if(psiElement != null &&
-									!JavaScriptIndex.isFromPredefinedFile(psiElement.getContainingFile()) &&
-									sourceElement != psiElement)
+							if (psiElement instanceof JSFunction fun && sourceElement instanceof JSFunction sourceFun)
 							{
-								if((psiElement instanceof JSFunction) && sourceElement instanceof JSFunction)
+								if ((sourceFun.isGetProperty() && fun.isSetProperty()) || (sourceFun.isSetProperty() && fun.isGetProperty()))
 								{
-									JSFunction fun = (JSFunction) psiElement;
-									JSFunction sourceFun = (JSFunction) sourceElement;
-
-									if((sourceFun.isGetProperty() && fun.isSetProperty()) || (sourceFun.isSetProperty() && fun.isGetProperty()))
-									{
-										return true;
-									}
+									return true;
 								}
+							}
 
-								if((psiElement != sourceElement || !(psiElement instanceof JSClass)) && !consumer.process(psiElement))
-								{
-									return false;
-								}
+							if ((psiElement != sourceElement || !(psiElement instanceof JSClass)) && !consumer.process(psiElement))
+							{
+								return false;
 							}
 						}
+					}
 
-						if(!(parent instanceof JSDefinitionExpression))
-						{
-							return false;
-						}
+					if (!(parent instanceof JSDefinitionExpression))
+					{
+						return false;
 					}
-					return true;
 				}
+				return true;
 			});
 
-			if(sourceElement instanceof JSClass)
+			if (sourceElement instanceof JSClass clazz)
 			{
-				final JSClass clazz = (JSClass) sourceElement;
-
-				final Processor<JSClass> delegatingProcessor = new Processor<JSClass>()
-				{
-					@Override
-					public boolean process(final JSClass jsClass)
-					{
-						return consumer.process(jsClass);
-					}
-				};
+				final Processor<JSClass> delegatingProcessor = jsClass -> consumer.process(jsClass);
 				JSClassSearch.searchClassInheritors(clazz, true).forEach(delegatingProcessor);
 
-				if(clazz.isInterface())
+				if (clazz.isInterface())
 				{
 					JSClassSearch.searchInterfaceImplementations(clazz, true).forEach(delegatingProcessor);
 				}
 			}
-			else if(sourceElement instanceof JSFunction)
+			else if (sourceElement instanceof JSFunction baseFunction)
 			{
-				final JSFunction baseFunction = (JSFunction) sourceElement;
-				final Processor<JSFunction> delegatingProcessor = new Processor<JSFunction>()
-				{
-					@Override
-					public boolean process(final JSFunction jsFunction)
-					{
-						return consumer.process(jsFunction);
-					}
-				};
+				final Processor<JSFunction> delegatingProcessor = jsFunction -> consumer.process(jsFunction);
 				JSFunctionsSearch.searchOverridingFunctions(baseFunction, true).forEach(delegatingProcessor);
 
 				final PsiElement parent = baseFunction.getParent();
-				if(parent instanceof JSClass && ((JSClass) parent).isInterface())
+				if (parent instanceof JSClass jsClass && jsClass.isInterface())
 				{
 					JSFunctionsSearch.searchImplementingFunctions(baseFunction, true).forEach(delegatingProcessor);
 				}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
index 004fd2ee..40983222 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
@@ -16,21 +16,13 @@
 
 package com.intellij.lang.javascript.impl.structureView;
 
-import consulo.javascript.language.JavaScriptBundle;
-import com.intellij.lang.javascript.psi.JSAssignmentExpression;
-import com.intellij.lang.javascript.psi.JSDefinitionExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSParameterList;
-import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.icon.IconDescriptorUpdaters;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiNamedElement;
-import consulo.annotation.access.RequiredReadAction;
 import consulo.ui.image.Image;
 
 import javax.annotation.Nonnull;
@@ -65,34 +57,32 @@ public static String getName(@Nonnull PsiElement psiElement)
 	{
 		if(psiElement instanceof JSObjectLiteralExpression)
 		{
-			if(psiElement.getParent() instanceof JSAssignmentExpression)
+			if (psiElement.getParent() instanceof JSAssignmentExpression assignmentExpression)
 			{
-				final JSExpression expression = ((JSDefinitionExpression) ((JSAssignmentExpression) psiElement.getParent()).getLOperand()).getExpression();
+				final JSExpression expression = ((JSDefinitionExpression) assignmentExpression.getLOperand()).getExpression();
 				return JSResolveUtil.findClassIdentifier(expression).getText();
 			}
 			else
 			{
-				return JavaScriptBundle.message("javascript.language.term.prototype");
+				return JavaScriptLocalize.javascriptLanguageTermPrototype().get();
 			}
 		}
 
-		if(psiElement instanceof JSDefinitionExpression)
+		if (psiElement instanceof JSDefinitionExpression definitionExpression)
 		{
-			psiElement = ((JSDefinitionExpression) psiElement).getExpression();
+			psiElement = definitionExpression.getExpression();
 		}
 
-		if(psiElement instanceof JSReferenceExpression)
+		if (psiElement instanceof JSReferenceExpression expression)
 		{
-			JSReferenceExpression expression = (JSReferenceExpression) psiElement;
-
 			String s = expression.getReferencedName();
 
 			if(JSResolveUtil.PROTOTYPE_FIELD_NAME.equals(s))
 			{
 				final JSExpression jsExpression = expression.getQualifier();
-				if(jsExpression instanceof JSReferenceExpression)
+				if (jsExpression instanceof JSReferenceExpression referenceExpression)
 				{
-					s = ((JSReferenceExpression) jsExpression).getReferencedName();
+					s = referenceExpression.getReferencedName();
 				}
 			}
 			return s;
@@ -105,9 +95,9 @@ public static String getName(@Nonnull PsiElement psiElement)
 
 		String name = ((PsiNamedElement) psiElement).getName();
 
-		if(psiElement instanceof JSProperty)
+		if (psiElement instanceof JSProperty property)
 		{
-			psiElement = ((JSProperty) psiElement).getValue();
+			psiElement = property.getValue();
 		}
 
 		if(psiElement instanceof JSFunction)
@@ -143,13 +133,13 @@ public static String getName(@Nonnull PsiElement psiElement)
 			}
 		}
 
-		if(name == null && psiElement.getParent() instanceof JSAssignmentExpression)
+		if (name == null && psiElement.getParent() instanceof JSAssignmentExpression assignmentExpression)
 		{
-			JSExpression lOperand = ((JSDefinitionExpression) ((JSAssignmentExpression) psiElement.getParent()).getLOperand()).getExpression();
+			JSExpression lOperand = ((JSDefinitionExpression) assignmentExpression.getLOperand()).getExpression();
 			lOperand = JSResolveUtil.findClassIdentifier(lOperand);
-			if(lOperand instanceof JSReferenceExpression)
+			if (lOperand instanceof JSReferenceExpression referenceExpression)
 			{
-				return ((JSReferenceExpression) lOperand).getReferencedName();
+				return referenceExpression.getReferencedName();
 			}
 			return lOperand.getText();
 		}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
index bee312ad..c87b731a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
@@ -22,7 +22,7 @@
 import consulo.codeEditor.Editor;
 import consulo.fileEditor.structureView.StructureViewTreeElement;
 import consulo.fileEditor.structureView.tree.*;
-import consulo.ide.IdeBundle;
+import consulo.ide.localize.IdeLocalize;
 import consulo.language.editor.structureView.TextEditorBasedStructureViewModel;
 import consulo.language.inject.InjectedLanguageManager;
 import consulo.language.psi.PsiElement;
@@ -153,7 +153,7 @@ public boolean isReverted()
 		@Nonnull
 		public ActionPresentation getPresentation()
 		{
-			return new ActionPresentationData(IdeBundle.message("action.structureview.show.fields"), null, AllIcons.Nodes.Variable);
+			return new ActionPresentationData(IdeLocalize.actionStructureviewShowFields().get(), null, AllIcons.Nodes.Variable);
 		}
 
 		@Override
@@ -186,7 +186,11 @@ public boolean isVisible(TreeElement treeNode)
 		@Nonnull
 		public ActionPresentation getPresentation()
 		{
-			return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), null, PlatformIconGroup.hierarchySupertypes());
+      return new ActionPresentationData(
+				IdeLocalize.actionStructureviewShowInherited().get(),
+				null,
+				PlatformIconGroup.hierarchySupertypes()
+			);
 		}
 
 		@Override
@@ -205,7 +209,7 @@ public boolean isReverted()
 		@Override
 		public String getCheckBoxText()
 		{
-			return IdeBundle.message("file.structure.toggle.show.inherited");
+			return IdeLocalize.fileStructureToggleShowInherited().get();
 		}
 
 		@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
index d8423c32..22edc648 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSDoWhileStatement;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
-import consulo.language.ast.ASTNode;
 
 /**
  * Created by IntelliJ IDEA.
@@ -35,7 +35,7 @@ public class JSWithDoWhileSurrounder extends JSStatementSurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.do.while");
+		return JavaScriptLocalize.javascriptSurroundWithDoWhile().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
index 393892bf..d90c76d5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
@@ -16,15 +16,15 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import consulo.document.util.TextRange;
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSForStatement;
+import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
-import consulo.project.Project;
 import consulo.language.psi.PsiWhiteSpace;
+import consulo.project.Project;
 
 /**
  * Created by IntelliJ IDEA.
@@ -38,7 +38,7 @@ public class JSWithForSurrounder extends JSStatementSurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.for");
+		return JavaScriptLocalize.javascriptSurroundWithFor().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
index 048a8872..fd0c4258 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import consulo.language.ast.ASTNode;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 
@@ -31,7 +31,7 @@ public class JSWithFunctionExpressionSurrounder extends JSStatementSurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.function.expression");
+		return JavaScriptLocalize.javascriptSurroundWithFunctionExpression().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
index 1d7ce44f..713c9d12 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
@@ -16,19 +16,19 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import consulo.language.ast.ASTNode;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSFunction;
-import consulo.project.Project;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 
 public class JSWithFunctionSurrounder extends JSStatementSurrounder
 {
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.function");
+		return JavaScriptLocalize.javascriptSurroundWithFunction().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
index 218eaf53..06e4d222 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 
@@ -32,7 +32,7 @@ public class JSWithIfElseSurrounder extends JSWithIfSurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.if.else");
+		return JavaScriptLocalize.javascriptSurroundWithIfElse().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
index e05490d2..194d9007 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
@@ -16,13 +16,13 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
+import com.intellij.lang.javascript.psi.JSIfStatement;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
-import org.jetbrains.annotations.NonNls;
-import consulo.javascript.language.JavaScriptBundle;
-import com.intellij.lang.javascript.psi.JSIfStatement;
-import consulo.project.Project;
 import consulo.language.psi.PsiElement;
+import consulo.project.Project;
+import org.jetbrains.annotations.NonNls;
 
 /**
  * Created by IntelliJ IDEA.
@@ -36,7 +36,7 @@ public class JSWithIfSurrounder extends JSStatementSurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.if");
+		return JavaScriptLocalize.javascriptSurroundWithIf().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
index 8cc6270e..8569622b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
@@ -16,19 +16,19 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import consulo.language.ast.ASTNode;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.codeEditor.Editor;
-import consulo.project.Project;
 import consulo.document.util.TextRange;
-import consulo.language.psi.PsiElement;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.ASTNode;
 import consulo.language.editor.surroundWith.Surrounder;
+import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -42,7 +42,7 @@ public class JSWithParenthesesSurrounder implements Surrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.parenthesis");
+		return JavaScriptLocalize.javascriptSurroundWithParenthesis().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
index f3a08dd8..96ab2803 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -16,18 +16,18 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import javax.annotation.Nonnull;
-
-import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
-import consulo.language.ast.ASTNode;
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.JSCatchBlock;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
+import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.project.Project;
+import org.jetbrains.annotations.NonNls;
+
+import javax.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -41,7 +41,7 @@ public class JSWithTryCatchFinallySurrounder extends JSStatementSurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.try.catch.finally");
+		return JavaScriptLocalize.javascriptSurroundWithTryCatchFinally().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
index 6305a51f..2e9853eb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 
@@ -32,7 +32,7 @@ public class JSWithTryCatchSurrounder extends JSWithTryCatchFinallySurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.try.catch");
+		return JavaScriptLocalize.javascriptSurroundWithTryCatch().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
index b288ae48..f5c5484e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 
@@ -32,7 +32,7 @@ public class JSWithTryFinallySurrounder extends JSWithTryCatchFinallySurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.try.finally");
+		return JavaScriptLocalize.javascriptSurroundWithTryFinally().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
index f9965a96..01aa5755 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
 import consulo.document.util.TextRange;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
@@ -35,7 +35,7 @@ public class JSWithWhileSurrounder extends JSStatementSurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.while");
+		return JavaScriptLocalize.javascriptSurroundWithWhile().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
index 40290958..b0b00fb8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import consulo.javascript.language.JavaScriptBundle;
 import com.intellij.lang.javascript.psi.JSWithStatement;
-import consulo.project.Project;
 import consulo.document.util.TextRange;
-import consulo.language.psi.PsiElement;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 
 /**
  * Created by IntelliJ IDEA.
@@ -35,7 +35,7 @@ public class JSWithWithSurrounder extends JSStatementSurrounder
 	@Override
 	public String getTemplateDescription()
 	{
-		return JavaScriptBundle.message("javascript.surround.with.with");
+		return JavaScriptLocalize.javascriptSurroundWithWith().get();
 	}
 
 	@Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
index dfbebfc6..22951eb8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
@@ -22,7 +22,7 @@
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.codeEditor.Editor;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.intention.SyntheticIntentionAction;
 import consulo.language.psi.PsiFile;
 import consulo.project.Project;
@@ -43,7 +43,7 @@ public ImplementMethodsFix(final JSClass jsClass) {
   @Override
   @Nonnull
   public String getText() {
-    return JavaScriptBundle.message("javascript.fix.implement.methods");
+    return JavaScriptLocalize.javascriptFixImplementMethods().get();
   }
 
   @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index c89f6362..6c53677b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -23,11 +23,10 @@
 import com.intellij.lang.javascript.psi.impl.JSPackageStatementImpl;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.psi.util.JSUtils;
 import consulo.codeEditor.Editor;
 import consulo.document.util.TextRange;
-import consulo.javascript.language.JavaScriptBundle;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
 import consulo.language.ast.ASTNode;
@@ -49,6 +48,7 @@
 import consulo.language.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.module.content.ProjectRootManager;
 import consulo.project.Project;
 import consulo.util.lang.ref.Ref;
@@ -56,7 +56,6 @@
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTagChild;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.PropertyKey;
 
 import javax.annotation.Nonnull;
 import java.text.MessageFormat;
@@ -102,19 +101,22 @@ private void checkReferences(final PsiElement includeDirective, ProblemKind kind
         final TextRange elementRange = ref.getElement().getTextRange();
         final TextRange textRange = ref.getRangeInElement();
 
-        final TextRange range =
-          new TextRange(elementRange.getStartOffset() + textRange.getStartOffset(), elementRange.getStartOffset() + textRange
-            .getEndOffset());
+        final TextRange range = new TextRange(
+          elementRange.getStartOffset() + textRange.getStartOffset(),
+          elementRange.getStartOffset() + textRange.getEndOffset()
+        );
         final String message =
           MessageFormat.format(((EmptyResolveMessageProvider)ref).getUnresolvedMessagePattern(), ref.getCanonicalText());
-        Annotation annotation =
-          kind == ProblemKind.ERROR ? myHolder.createErrorAnnotation(range, message) : kind == ProblemKind.WARNING ? myHolder
-            .createWarningAnnotation(range, message) : myHolder.createInfoAnnotation(range, message);
-
-        if (ref instanceof LocalQuickFixProvider) {
-          for (LocalQuickFix fix : ((LocalQuickFixProvider)ref).getQuickFixes()) {
-            if (fix instanceof IntentionAction) {
-              annotation.registerFix((IntentionAction)fix, new TextRange(annotation.getStartOffset(), annotation.getEndOffset()));
+        Annotation annotation = kind == ProblemKind.ERROR
+          ? myHolder.createErrorAnnotation(range, message)
+          : kind == ProblemKind.WARNING
+          ? myHolder.createWarningAnnotation(range, message)
+          : myHolder.createInfoAnnotation(range, message);
+
+        if (ref instanceof LocalQuickFixProvider localQuickFixProvider) {
+          for (LocalQuickFix fix : localQuickFixProvider.getQuickFixes()) {
+            if (fix instanceof IntentionAction intentionAction) {
+              annotation.registerFix(intentionAction, new TextRange(annotation.getStartOffset(), annotation.getEndOffset()));
             }
           }
         }
@@ -123,8 +125,8 @@ private void checkReferences(final PsiElement includeDirective, ProblemKind kind
   }
 
   private boolean hasBadResolve(final PsiReference ref) {
-    if (ref instanceof PsiPolyVariantReference) {
-      return ((PsiPolyVariantReference)ref).multiResolve(false).length == 0;
+    if (ref instanceof PsiPolyVariantReference psiPolyVariantReference) {
+      return psiPolyVariantReference.multiResolve(false).length == 0;
     }
     return ref.resolve() == null;
   }
@@ -134,7 +136,7 @@ public void visitJSCallExpression(final JSCallExpression node) {
     final JSExpression methodExpression = node.getMethodExpression();
 
     if (methodExpression instanceof JSLiteralExpression) {
-      myHolder.createErrorAnnotation(methodExpression, JavaScriptBundle.message("javascript.parser.message.expected.function.name"));
+      myHolder.createErrorAnnotation(methodExpression, JavaScriptLocalize.javascriptParserMessageExpectedFunctionName().get());
     }
   }
 
@@ -160,7 +162,8 @@ public void visitJSReferenceList(final JSReferenceList referenceList) {
 
     if (withinImplements && jsClass.isInterface()) {
       myHolder.createErrorAnnotation(referenceList,
-                                     JavaScriptBundle.message("javascript.validation.message.implements.for.interface.not.allowed"));
+        JavaScriptLocalize.javascriptValidationMessageImplementsForInterfaceNotAllowed().get()
+      );
       return;
     }
 
@@ -181,17 +184,19 @@ public void visitJSReferenceList(final JSReferenceList referenceList) {
       final JSReferenceExpression expr = nameToExprMap.get(clazz.getName());
 
       if (!b && withinImplements) {
-        myHolder.createErrorAnnotation(expr, JavaScriptBundle.message("javascript.validation.message.interface.name.expected.here"));
+        myHolder.createErrorAnnotation(expr, JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere().get());
       }
       else if (withinExtends && b != jsClass.isInterface()) {
-        myHolder.createErrorAnnotation(expr,
-                                       JavaScriptBundle.message(!b ? "javascript.validation.message.interface.name.expected.here" : "javascript.validation" +
-                                         ".message.class.name.expected.here"));
+        myHolder.createErrorAnnotation(
+          expr,
+          !b
+            ? JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere().get()
+            : JavaScriptLocalize.javascriptValidationMessageClassNameExpectedHere().get()
+        );
       }
       if (clazz == jsClass) {
-        myHolder.createErrorAnnotation(expr, JavaScriptBundle.message("javascript.validation.message.circular.dependency"))
-                .registerFix(new RemoveASTNodeFix
-                               (referenceList.getNode(), "javascript.fix.remove.circular.dependency"));
+        myHolder.createErrorAnnotation(expr, JavaScriptLocalize.javascriptValidationMessageCircularDependency().get())
+          .registerFix(new RemoveASTNodeFix(referenceList.getNode(), JavaScriptLocalize.javascriptFixRemoveCircularDependency()));
       }
     }
 
@@ -225,12 +230,15 @@ protected void addNonimplementedFunction(final JSFunction function) {
           implementMethodsFix = new ImplementMethodsFix(myJsClass);
         }
         implementMethodsFix.addElementToProcess(function);
-        reportingClient.reportError(node,
-                                    JavaScriptBundle.message("javascript.validation.message.interface.method.not.implemented",
-                                                             function.getName(),
-                                                             ((JSClass)JSResolveUtil.findParent(function)).getQualifiedName()),
-                                    ErrorReportingClient.ProblemKind.ERROR,
-                                    implementMethodsFix);
+        reportingClient.reportError(
+          node,
+          JavaScriptLocalize.javascriptValidationMessageInterfaceMethodNotImplemented(
+            function.getName(),
+            ((JSClass)JSResolveUtil.findParent(function)).getQualifiedName()
+          ).get(),
+          ErrorReportingClient.ProblemKind.ERROR,
+          implementMethodsFix
+        );
       }
 
       @Override
@@ -238,11 +246,12 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
         final JSAttributeList attributeList = implementationFunction.getAttributeList();
         if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
           final ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
-          reportingClient.reportError(node,
-                                      JavaScriptBundle.message("javascript.validation.message.interface.method.invalid.access.modifier"),
-                                      ErrorReportingClient.ProblemKind.ERROR,
-                                      null
-                                      // TODO: quickfix
+          reportingClient.reportError(
+            node,
+            JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidAccessModifier().get(),
+            ErrorReportingClient.ProblemKind.ERROR,
+            null
+            // TODO: quickfix
           );
         }
 
@@ -263,21 +272,26 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
           if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
             final JSParameterList parameterList = implementationFunction.getParameterList();
             final JSParameterList expectedParameterList = interfaceFunction.getParameterList();
-            reportingClient.reportError(parameterList.getNode(),
-                                        JavaScriptBundle.message("javascript.validation.message.interface.method.invalid.signature",
-                                                                 expectedParameterList != null ? expectedParameterList.getText() : "()"),
-                                        ErrorReportingClient.ProblemKind.ERROR,
-                                        null);  // TODO: quickfix
+            reportingClient.reportError(
+              parameterList.getNode(),
+              JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature(
+                expectedParameterList != null ? expectedParameterList.getText() : "()"
+              ).get(),
+              ErrorReportingClient.ProblemKind.ERROR,
+              null
+            );  // TODO: quickfix
           }
           else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
             PsiElement implementationReturnTypeExpr = implementationFunction.getReturnTypeElement();
             PsiElement interfaceReturnTypeExpr = interfaceFunction.getReturnTypeElement();
-            reportingClient.reportError(implementationReturnTypeExpr != null ? implementationReturnTypeExpr : implementationFunction
-                                          .getNameIdentifier(),
-                                        JavaScriptBundle.message("javascript.validation.message.interface.method.invalid.signature2",
-                                                                 interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"),
-                                        ErrorReportingClient.ProblemKind.ERROR,
-                                        null);  // TODO: quickfix
+            reportingClient.reportError(
+              implementationReturnTypeExpr != null ? implementationReturnTypeExpr : implementationFunction.getNameIdentifier(),
+              JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature2(
+                interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"
+              ).get(),
+              ErrorReportingClient.ProblemKind.ERROR,
+              null
+            );  // TODO: quickfix
           }
         }
       }
@@ -308,14 +322,20 @@ public void visitJSAttributeList(JSAttributeList attributeList) {
       namespaceOrAccessModifierElement = accessTypeElement;
     }
     else if (accessTypeElement != null) {
-      myHolder.createErrorAnnotation(namespaceOrAccessModifierElement,
-                                     JavaScriptBundle.message("javascript.validation.message.use.namespace.reference.or" +
-                                                                ".access.modifier"))
-              .registerFix(new RemoveASTNodeFix(namespaceOrAccessModifierElement.getNode(), "javascript.fix.remove.namespace.reference"));
-
-      myHolder.createErrorAnnotation(accessTypeElement,
-                                     JavaScriptBundle.message("javascript.validation.message.use.namespace.reference.or.access.modifier"))
-              .registerFix(new RemoveASTNodeFix(accessTypeElement.getNode(), "javascript.fix.remove.namespace.reference"));
+      myHolder.createErrorAnnotation(
+          namespaceOrAccessModifierElement,
+          JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier().get()
+        )
+        .registerFix(new RemoveASTNodeFix(
+          namespaceOrAccessModifierElement.getNode(),
+          JavaScriptLocalize.javascriptFixRemoveNamespaceReference()
+        ));
+
+      myHolder.createErrorAnnotation(
+          accessTypeElement,
+          JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier().get()
+        )
+        .registerFix(new RemoveASTNodeFix(accessTypeElement.getNode(), JavaScriptLocalize.javascriptFixRemoveNamespaceReference()));
     }
 
     if (namespaceOrAccessModifierElement != null) {
@@ -324,34 +344,37 @@ else if (accessTypeElement != null) {
         String typeElementText;
         boolean nodeUnderPackage;
 
-        if (((!(nodeUnderPackage =
-          (parentForCheckingNsOrAccessModifier instanceof JSPackageStatement)) && (!(parentForCheckingNsOrAccessModifier
-          instanceof JSFile) || attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL)) || (!"public".equals(
-          typeElementText =
-            namespaceOrAccessModifierElement.getText())) && !"internal".equals(typeElementText))) {
+        if (((!(nodeUnderPackage = (parentForCheckingNsOrAccessModifier instanceof JSPackageStatement))
+          && (!(parentForCheckingNsOrAccessModifier instanceof JSFile)
+          || attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL))
+          || (!"public".equals(typeElementText = namespaceOrAccessModifierElement.getText()))
+          && !"internal".equals(typeElementText))) {
           boolean nsRef = namespaceOrAccessModifierElement instanceof JSReferenceExpression;
-          myHolder.createErrorAnnotation(namespaceOrAccessModifierElement,
-                                         JavaScriptBundle.message(nodeUnderPackage ? "javascript.validation.message.access" +
-                                           ".modifier.allowed.only.for.package.members" : nsRef ? "javascript.validation.message.namespace.allowed.only.for.class.members" : "javascript" +
-                                           ".validation.message.access.modifier.allowed.only.for.class.members"))
-                  .registerFix(new RemoveASTNodeFix(namespaceOrAccessModifierElement
-                                                      .getNode(),
-                                                    nsRef ? "javascript.fix.remove.namespace.reference" : "javascript.fix.remove.access.modifier"));
+          myHolder.createErrorAnnotation(
+              namespaceOrAccessModifierElement,
+              nodeUnderPackage ?
+                JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForPackageMembers().get()
+                : nsRef
+                ? JavaScriptLocalize.javascriptValidationMessageNamespaceAllowedOnlyForClassMembers().get()
+                : JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForClassMembers().get()
+            )
+            .registerFix(new RemoveASTNodeFix(
+              namespaceOrAccessModifierElement.getNode(),
+              nsRef ? JavaScriptLocalize.javascriptFixRemoveNamespaceReference() : JavaScriptLocalize.javascriptFixRemoveAccessModifier()
+            ));
         }
       }
       else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
-
-        if (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL || attributeList.getNode()
-                                                                                                      .findChildByType(JSTokenTypes
-                                                                                                                         .INTERNAL_KEYWORD) != null
-
+        if (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL
+          || attributeList.getNode().findChildByType(JSTokenTypes.INTERNAL_KEYWORD) != null
         ) {
           final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.ACCESS_MODIFIERS);
-          final Annotation annotation =
-            myHolder.createErrorAnnotation(astNode, JavaScriptBundle.message("javascript.validation.message.interface.members.cannot" +
-                                                                               ".have.access.modifiers"));
+          final Annotation annotation = myHolder.createErrorAnnotation(
+            astNode,
+            JavaScriptLocalize.javascriptValidationMessageInterfaceMembersCannotHaveAccessModifiers().get()
+          );
 
-          annotation.registerFix(new RemoveASTNodeFix(astNode, "javascript.fix.remove.access.modifier"));
+          annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveAccessModifier()));
         }
       }
     }
@@ -361,24 +384,21 @@ else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
   public void visitJSReferenceExpression(final JSReferenceExpression node) {
     final PsiElement parent = node.getParent();
 
-    if (parent instanceof JSNamedElement) {
-      JSNamedElement namedElement = (JSNamedElement)parent;
+    if (parent instanceof JSNamedElement namedElement) {
       final PsiElement nameIdentifier = namedElement.getNameIdentifier();
 
       if (nameIdentifier != null && nameIdentifier == node) {
-        if (parent instanceof JSPackageStatement) {
-          checkPackageStatement((JSPackageStatement)parent);
+        if (parent instanceof JSPackageStatement packageStatement) {
+          checkPackageStatement(packageStatement);
         }
         else if (!(parent instanceof JSImportStatement) && parent.getParent() instanceof JSPackageStatement) {
           checkNamedObjectIsInCorrespondingFile(namedElement);
         }
-        else if (parent instanceof JSFunction) {
-          JSFunction function = (JSFunction)parent;
-
+        else if (parent instanceof JSFunction function) {
           if (function.isConstructor()) {
             final JSClass clazz;
-            if (parent.getParent() instanceof JSClass) {
-              clazz = (JSClass)parent.getParent();
+            if (parent.getParent() instanceof JSClass jsClass) {
+              clazz = jsClass;
             }
             else {
               assert parent.getParent() instanceof JSFile;
@@ -393,16 +413,19 @@ else if (function.isSetProperty()) {
 
             if (typeString != null && !"void".equals(typeString)) {
               // TODO: fix!
-              myHolder.createErrorAnnotation(function.getReturnTypeElement(),
-                                             JavaScriptBundle.message("javascript.validation.message.set.method.should.be.void.or" +
-                                                                        ".without.type"));
+              myHolder.createErrorAnnotation(
+                function.getReturnTypeElement(),
+                JavaScriptLocalize.javascriptValidationMessageSetMethodShouldBeVoidOrWithoutType().get()
+              );
             }
 
             JSParameterList parameterList = function.getParameterList();
             if (parameterList != null && parameterList.getParameters().length != 1) {
               // TODO: fix!
-              myHolder.createErrorAnnotation(parameterList,
-                                             JavaScriptBundle.message("javascript.validation.message.set.method.should.have.one.parameter"));
+              myHolder.createErrorAnnotation(
+                parameterList,
+                JavaScriptLocalize.javascriptValidationMessageSetMethodShouldHaveOneParameter().get()
+              );
             }
           }
           else if (function.isGetProperty()) {
@@ -410,51 +433,51 @@ else if (function.isGetProperty()) {
 
             if (typeString == null || "void".equals(typeString)) {
               // TODO: fix!
-              myHolder.createErrorAnnotation(typeString != null ? function.getReturnTypeElement() : nameIdentifier,
-                                             JavaScriptBundle.message("javascript.validation.message.get.method.should.be.valid.type",
-                                                                      typeString != null ? typeString : "empty"));
+              myHolder.createErrorAnnotation(
+                typeString != null ? function.getReturnTypeElement() : nameIdentifier,
+                JavaScriptLocalize.javascriptValidationMessageGetMethodShouldBeValidType(typeString != null ? typeString : "empty").get()
+              );
             }
 
             JSParameterList parameterList = function.getParameterList();
             if (parameterList != null && parameterList.getParameters().length != 0) {
               // TODO: fix!
-              myHolder.createErrorAnnotation(parameterList,
-                                             JavaScriptBundle.message("javascript.validation.message.get.method.should.have.no.parameter"));
+              myHolder.createErrorAnnotation(
+                parameterList,
+                JavaScriptLocalize.javascriptValidationMessageGetMethodShouldHaveNoParameter().get()
+              );
             }
           }
         }
 
-        if (parent instanceof JSClass) {
-          final JSClass jsClass = (JSClass)parent;
+        if (parent instanceof JSClass jsClass) {
           final JSFunction constructor = jsClass.findFunctionByName(jsClass.getName());
           if (constructor == null) {
             checkMissedSuperCall(node, constructor, jsClass);
           }
 
           PsiElement clazzParent = jsClass.getParent();
-          if (!(clazzParent instanceof JSPackageStatement) && !(clazzParent instanceof JSFile)) {
-            myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.nested.classes.are.not.allowed"));
+          if (!(clazzParent instanceof JSPackageStatement || clazzParent instanceof JSFile)) {
+            myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageNestedClassesAreNotAllowed().get());
           }
         }
       }
     }
 
-    if (node.getQualifier() == null) {
-      if (!(parent instanceof JSCallExpression)) {
-        if ("arguments".equals(node.getText())) {
-          JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
-          if (fun == null) {
-            myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.arguments.out.of.function"));
-          }
-          else {
-            JSParameterList parameterList = fun.getParameterList();
-            if (parameterList != null) {
-              for (JSParameter p : parameterList.getParameters()) {
-                if (p.isRest()) {
-                  myHolder.createErrorAnnotation(node,
-                                                 JavaScriptBundle.message("javascript.validation.message.arguments.with.rest.parameter"));
-                }
-              }
+    if (node.getQualifier() == null && !(parent instanceof JSCallExpression) && "arguments".equals(node.getText())) {
+      JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
+      if (fun == null) {
+        myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageArgumentsOutOfFunction().get());
+      }
+      else {
+        JSParameterList parameterList = fun.getParameterList();
+        if (parameterList != null) {
+          for (JSParameter p : parameterList.getParameters()) {
+            if (p.isRest()) {
+              myHolder.createErrorAnnotation(
+                node,
+                JavaScriptLocalize.javascriptValidationMessageArgumentsWithRestParameter().get()
+              );
             }
           }
         }
@@ -473,7 +496,7 @@ private void checkMissedSuperCall(JSReferenceExpression node, JSFunction constru
 
       if (!hasSuperConstructorCall(constructor)) {
         annotation =
-          myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.missed.super.constructor.call"));
+          myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageMissedSuperConstructorCall().get());
       }
 
       if (annotation != null) {
@@ -493,12 +516,11 @@ private boolean hasSuperConstructorCall(JSFunction jsFunction) {
     }
     final JSSourceElement[] body = (jsFunction).getBody();
     final JSStatement[] statements = body.length > 0 ? ((JSBlockStatement)body[0]).getStatements() : JSStatement.EMPTY;
-    JSExpression expr;
 
     for (JSStatement st : statements) {
-      if (st instanceof JSExpressionStatement &&
-        (expr = ((JSExpressionStatement)st).getExpression()) instanceof JSCallExpression &&
-        (((JSCallExpression)expr).getMethodExpression()) instanceof JSSuperExpression) {
+      if (st instanceof JSExpressionStatement expressionStatement
+        && expressionStatement.getExpression() instanceof JSCallExpression callExpression
+        && callExpression.getMethodExpression() instanceof JSSuperExpression) {
         return true;
       }
     }
@@ -541,37 +563,46 @@ public void visitJSParameterList(JSParameterList node) {
         initializerPresent = true;
       }
       else if (!hasInitializer && initializerPresent && !parameter.isRest()) {
-        myHolder.createErrorAnnotation(parameter, JavaScriptBundle.message("javascript.validation.message.parameter.should.be.initialized"))
-                .registerFix(new
-                               RemoveASTNodeFix(parameter.getNode(), "javascript.fix.remove.parameter"));
+        myHolder.createErrorAnnotation(parameter, JavaScriptLocalize.javascriptValidationMessageParameterShouldBeInitialized().get())
+          .registerFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
       }
       else if (hasInitializer && parameter.isRest()) {
-        myHolder.createErrorAnnotation(parameter,
-                                       JavaScriptBundle.message("javascript.validation.message.rest.parameter.should.not.be.initialized"))
-                .registerFix(new RemoveASTNodeFix("javascript.fix.remove.initializer", getNodesBefore(initializer, JSTokenTypes.EQ)));
+        myHolder.createErrorAnnotation(
+          parameter,
+            JavaScriptLocalize.javascriptValidationMessageRestParameterShouldNotBeInitialized().get()
+          )
+          .registerFix(new RemoveASTNodeFix(
+            JavaScriptLocalize.javascriptFixRemoveInitializer(),
+            getNodesBefore(initializer, JSTokenTypes.EQ)
+          ));
       }
 
       if (parameter.isRest() && !foundRest) {
         foundRest = true;
         PsiElement typeElement = parameter.getTypeElement();
         if (typeElement != null && !"Array".equals(typeElement.getText())) {
-          myHolder.createErrorAnnotation(typeElement,
-                                         JavaScriptBundle.message("javascript.validation.message.unexpected.type.for.rest.parameter"))
-                  .registerFix
-                    (new RemoveASTNodeFix("javascript.fix.remove.type.reference", getNodesBefore(typeElement, JSTokenTypes.COLON)));
+          myHolder.createErrorAnnotation(
+              typeElement,
+              JavaScriptLocalize.javascriptValidationMessageUnexpectedTypeForRestParameter().get()
+            )
+            .registerFix(new RemoveASTNodeFix(
+              JavaScriptLocalize.javascriptFixRemoveTypeReference(),
+              getNodesBefore(typeElement, JSTokenTypes.COLON)
+            ));
         }
       }
       else if (foundRest) {
-        myHolder.createErrorAnnotation(parameter,
-                                       JavaScriptBundle.message(
-                                         "javascript.validation.message.parameter.is.not.allowed.after.rest.parameter"))
-                .registerFix(new RemoveASTNodeFix(parameter.getNode(), "javascript.fix.remove.parameter"));
+        myHolder.createErrorAnnotation(
+            parameter,
+            JavaScriptLocalize.javascriptValidationMessageParameterIsNotAllowedAfterRestParameter().get()
+          )
+          .registerFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
       }
     }
   }
 
   private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq) {
-    List<ASTNode> nodes = new ArrayList<ASTNode>();
+    List<ASTNode> nodes = new ArrayList<>();
     PsiElement element = initializer.getPrevSibling();
     PsiElement lastElement = element;
 
@@ -591,10 +622,11 @@ private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq)
   @Override
   public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
     for (PsiElement el = packageStatement.getPrevSibling(); el != null; el = el.getPrevSibling()) {
-      if (!(el instanceof PsiWhiteSpace) && !(el instanceof PsiComment)) {
-        myHolder.createErrorAnnotation(packageStatement.getFirstChild().getNode(),
-                                       JavaScriptBundle.message("javascript.validation.message.package.shouldbe" +
-                                                                  ".first.statement"));
+      if (!(el instanceof PsiWhiteSpace || el instanceof PsiComment)) {
+        myHolder.createErrorAnnotation(
+          packageStatement.getFirstChild().getNode(),
+          JavaScriptLocalize.javascriptValidationMessagePackageShouldbeFirstStatement().get()
+        );
         break;
       }
     }
@@ -610,19 +642,19 @@ public void visitJSAssignmentExpression(final JSAssignmentExpression expression)
     if (lExpr == null) {
       return;
     }
-    if (lExpr instanceof JSDefinitionExpression) {
-      lExpr = ((JSDefinitionExpression)lExpr).getExpression();
+    if (lExpr instanceof JSDefinitionExpression definitionExpression) {
+      lExpr = definitionExpression.getExpression();
     }
 
-    if (lExpr instanceof JSReferenceExpression) {
-      PsiElement resolved = ((JSReferenceExpression)lExpr).resolve();
-      if (resolved instanceof JSVariable && ((JSVariable)resolved).isConst()) {
-        myHolder.createErrorAnnotation(lExpr, JavaScriptBundle.message("javascript.validation.message.assignment.to.const"));
+    if (lExpr instanceof JSReferenceExpression lRefExpr) {
+      PsiElement resolved = lRefExpr.resolve();
+      if (resolved instanceof JSVariable variable && variable.isConst()) {
+        myHolder.createErrorAnnotation(lExpr, JavaScriptLocalize.javascriptValidationMessageAssignmentToConst().get());
       }
     }
 
     if (!JSUtils.isLHSExpression(lExpr)) {
-      myHolder.createErrorAnnotation(lExpr, JavaScriptBundle.message("javascript.validation.message.must.be.lvalue"));
+      myHolder.createErrorAnnotation(lExpr, JavaScriptLocalize.javascriptValidationMessageMustBeLvalue().get());
     }
   }
 
@@ -637,8 +669,8 @@ public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
 
     if (child != null && (childNode = child.getNode()) != null && childNode.getElementType() == JSTokenTypes.COMMA) {
       final Annotation annotation =
-        myHolder.createWarningAnnotation(child, JavaScriptBundle.message("javascript.validation.message.unneeded.comma"));
-      annotation.registerFix(new RemoveASTNodeFix(childNode, "javascript.validation.message.remove.unneeded.comma.fix"));
+        myHolder.createWarningAnnotation(child, JavaScriptLocalize.javascriptValidationMessageUnneededComma().get());
+      annotation.registerFix(new RemoveASTNodeFix(childNode, JavaScriptLocalize.javascriptValidationMessageRemoveUnneededCommaFix()));
     }
   }
 
@@ -647,7 +679,7 @@ public void visitJSTryStatement(final JSTryStatement node) {
     final JSCatchBlock[] blocks = node.getAllCatchBlocks();
 
     if (blocks.length > 1) {
-      final Set<String> typeToCatch = new HashSet<String>();
+      final Set<String> typeToCatch = new HashSet<>();
 
       for (JSCatchBlock block : blocks) {
         final JSParameter p = block.getParameter();
@@ -662,8 +694,11 @@ public void visitJSTryStatement(final JSTryStatement node) {
 
         if (typeToCatch.contains(s)) {
           final Annotation annotation =
-            myHolder.createErrorAnnotation(block, JavaScriptBundle.message("javascript.validation.message.duplicated.catch.block"));
-          annotation.registerFix(new RemoveASTNodeFix(block.getNode(), "javascript.validation.message.duplicated.catch.block.fix"));
+            myHolder.createErrorAnnotation(block, JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlock().get());
+          annotation.registerFix(new RemoveASTNodeFix(
+            block.getNode(),
+            JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlockFix()
+          ));
         }
         else {
           typeToCatch.add(s);
@@ -675,14 +710,16 @@ public void visitJSTryStatement(final JSTryStatement node) {
   @Override
   public void visitJSVariable(final JSVariable var) {
     if (var.isConst() && var.getInitializer() == null) {
-      if (var.getParent() instanceof JSVarStatement && var.getParent().getParent() instanceof JSForInStatement) {
+      if (var.getParent() instanceof JSVarStatement varStatement && varStatement.getParent() instanceof JSForInStatement) {
         return;
       }
 
       JSAttributeList attributeList = var.getAttributeList();
       if (attributeList == null || attributeList.getAttributesByName("Embed").length == 0) {
-        myHolder.createWarningAnnotation(var,
-                                         JavaScriptBundle.message("javascript.validation.message.const.variable.without.initializer."));
+        myHolder.createWarningAnnotation(
+          var,
+          JavaScriptLocalize.javascriptValidationMessageConstVariableWithoutInitializer().get()
+        );
       }
     }
 
@@ -694,50 +731,56 @@ public void visitJSVariable(final JSVariable var) {
   @Override
   public void visitJSContinueStatement(final JSContinueStatement node) {
     if (node.getStatementToContinue() == null) {
-      myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.continue.without.target"));
+      myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageContinueWithoutTarget().get());
     }
   }
 
   @Override
   public void visitJSBreakStatement(final JSBreakStatement node) {
     if (node.getStatementToBreak() == null) {
-      myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.break.without.target"));
+      myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageBreakWithoutTarget().get());
     }
   }
 
   @Override
   public void visitJSThisExpression(final JSThisExpression node) {
-    checkClassReferenceInStaticContext(node, "javascript.validation.message.this.referenced.from.static.context");
+    checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageThisReferencedFromStaticContext());
   }
 
-  private void checkClassReferenceInStaticContext(final JSExpression node,
-                                                  @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String key) {
-    PsiElement element = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSFile.class, JSClass.class, JSObjectLiteralExpression.class,
-                                                     XmlTagChild.class);
-
-    if (element instanceof JSFunction) {
-      final JSFunction function = (JSFunction)element;
-
+  private void checkClassReferenceInStaticContext(
+    final JSExpression node,
+    LocalizeValue message
+  ) {
+    PsiElement element = PsiTreeUtil.getParentOfType(
+      node,
+      JSFunction.class,
+      JSFile.class,
+      JSClass.class,
+      JSObjectLiteralExpression.class,
+      XmlTagChild.class
+    );
+
+    if (element instanceof JSFunction function) {
       final JSAttributeList attributeList = function.getAttributeList();
       if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
-        myHolder.createErrorAnnotation(node, JavaScriptBundle.message(key));
+        myHolder.createErrorAnnotation(node, message.get());
         return;
       }
     }
 
-    PsiElement elementParent;
-    if (node instanceof JSSuperExpression && (element == null || (!((elementParent =
-      element.getParent()) instanceof JSClass) && (!(elementParent
-      instanceof JSFile) || elementParent.getContext() == null)))) {
-      myHolder.createErrorAnnotation(node,
-                                     JavaScriptBundle.message(
-                                       "javascript.validation.message.super.referenced.without.class.instance.context"));
+    if (!(node instanceof JSSuperExpression)) {
+      return;
+    }
+
+    PsiElement elementParent = element != null ? element.getParent() : null;
+    if (element == null || !(elementParent instanceof JSClass || elementParent instanceof JSFile && elementParent.getContext() != null)) {
+      myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageSuperReferencedWithoutClassInstanceContext().get());
     }
   }
 
   @Override
   public void visitJSSuperExpression(final JSSuperExpression node) {
-    checkClassReferenceInStaticContext(node, "javascript.validation.message.super.referenced.from.static.context");
+    checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageSuperReferencedFromStaticContext());
   }
 
   @Override
@@ -748,16 +791,17 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
     }
     PsiElement parent = node.getParent();
 
-    if (parent instanceof JSFile) {
-      parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+    if (parent instanceof JSFile file) {
+      parent = JSResolveUtil.getClassReferenceForXmlFromContext(file);
 
-      if (parent instanceof JSClass && node.getName().equals(((JSClass)parent).getName()) && JavaScriptSupportLoader.isFlexMxmFile(parent
-                                                                                                                                     .getContainingFile())) {
-        final Annotation annotation =
-          myHolder.createErrorAnnotation(nameIdentifier, JavaScriptBundle.message("javascript.validation.message.constructor.in.mxml" +
-                                                                                    ".is.not.allowed"));
+      if (parent instanceof JSClass jsClass && node.getName().equals(jsClass.getName())
+        && JavaScriptSupportLoader.isFlexMxmFile(parent.getContainingFile())) {
+        final Annotation annotation = myHolder.createErrorAnnotation(
+          nameIdentifier,
+          JavaScriptLocalize.javascriptValidationMessageConstructorInMxmlIsNotAllowed().get()
+        );
 
-        annotation.registerFix(new RemoveASTNodeFix(node.getNode(), "javascript.fix.remove.constructor"));
+        annotation.registerFix(new RemoveASTNodeFix(node.getNode(), JavaScriptLocalize.javascriptFixRemoveConstructor()));
       }
     }
 
@@ -765,19 +809,16 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
       checkNamedObjectIsInCorrespondingFile(node);
     }
 
-    if (parent instanceof JSClass && !node.isConstructor()) {
+    if (parent instanceof JSClass clazz && !node.isConstructor()) {
       final JSAttributeList attributeList = node.getAttributeList();
-      final JSClass clazz = (JSClass)parent;
 
       if (attributeList == null || (!attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) && (attributeList.getAccessType() != JSAttributeList
         .AccessType.PRIVATE || attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)))) {
         final String qName = clazz.getQualifiedName();
         final boolean hasOverride = attributeList != null ? attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE) : false;
 
-        final Ref<JSFunction> set = new Ref<JSFunction>();
-        boolean b = JSResolveUtil.iterateType(node, parent, qName, new JSResolveUtil.OverrideHandler() {
-          @Override
-          public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className) {
+        final Ref<JSFunction> set = new Ref<>();
+        boolean b = JSResolveUtil.iterateType(node, parent, qName, (processor, scope, className) -> {
             if (qName == className || (qName != null && qName.equals(className))) {
               return true;
             }
@@ -785,33 +826,34 @@ public boolean process(final ResolveProcessor processor, final PsiElement scope,
             if ("Object".equals(className)) {
               if (hasOverride && !attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)) { /*native modifier is written always*/
                 final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
-                final Annotation annotation =
-                  myHolder.createErrorAnnotation(astNode, JavaScriptBundle.message("javascript.validation.message.function.override.for" +
-                                                                                     ".object.method"));
+                final Annotation annotation = myHolder.createErrorAnnotation(
+                  astNode,
+                  JavaScriptLocalize.javascriptValidationMessageFunctionOverrideForObjectMethod().get()
+                );
 
-                annotation.registerFix(new RemoveASTNodeFix(astNode, "javascript.fix.remove.override.modifier"));
+                annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
               }
               return false;
             }
             else if (!hasOverride) {
-              final Annotation annotation =
-                myHolder.createErrorAnnotation(nameIdentifier, JavaScriptBundle.message("javascript.validation.message.function" +
-                                                                                          ".override.without.override.modifier",
-                                                                                        className));
+              final Annotation annotation = myHolder.createErrorAnnotation(
+                nameIdentifier,
+                JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutOverrideModifier(className).get()
+              );
 
               annotation.registerFix(new AddOverrideIntentionAction(node));
             }
             return false;
-          }
-        });
+          });
 
         if (b && hasOverride) {
           final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
-          final Annotation annotation =
-            myHolder.createErrorAnnotation(astNode, JavaScriptBundle.message("javascript.validation.message.function.override.without" +
-                                                                               ".parent.method"));
+          final Annotation annotation = myHolder.createErrorAnnotation(
+            astNode,
+            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutParentMethod().get()
+          );
 
-          annotation.registerFix(new RemoveASTNodeFix(astNode, "javascript.fix.remove.override.modifier"));
+          annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
         }
 
         if (!b && hasOverride) {
@@ -823,13 +865,16 @@ else if (!hasOverride) {
             (overrideAttrList != null && attributeList.getAccessType() != overrideAttrList.getAccessType()) ||
             overrideAttrList != null && (overrideNs =
               overrideAttrList.getNamespace()) != null && !overrideNs.equals(attributeList.getNamespace())) {
-            final Annotation annotation1 = myHolder.createErrorAnnotation(findElementForAccessModifierError(node, attributeList),
-                                                                          JavaScriptBundle.message(
-                                                                            "javascript.validation.message.function.override.incompatible.access.modifier",
-                                                                            overrideNs != null ? overrideNs : (overrideAttrList != null ? overrideAttrList
-                                                                              .getAccessType()
-                                                                              .toString() : JSAttributeList.AccessType
-                                                                              .PACKAGE_LOCAL.toString()).toLowerCase()));
+            final Annotation annotation1 = myHolder.createErrorAnnotation(
+              findElementForAccessModifierError(node, attributeList),
+              JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleAccessModifier(
+                overrideNs != null ? overrideNs : (
+                  overrideAttrList != null
+                    ? overrideAttrList.getAccessType().toString()
+                    : JSAttributeList.AccessType.PACKAGE_LOCAL.toString()
+                ).toLowerCase()
+              ).get()
+            );
 
             // TODO: quickfix
             //annotation.registerFix(
@@ -843,11 +888,12 @@ else if (!hasOverride) {
             final JSParameterList nodeParameterList = node.getParameterList();
             final JSParameterList overrideParameterList = override.getParameterList();
 
-            final Annotation annotation =
-              myHolder.createErrorAnnotation(nodeParameterList != null ? nodeParameterList : node.getNameIdentifier(),
-                                             JavaScriptBundle.message(
-                                               "javascript.validation.message.function.override.incompatible.signature",
-                                               overrideParameterList != null ? overrideParameterList.getText() : "()"));
+            final Annotation annotation = myHolder.createErrorAnnotation(
+              nodeParameterList != null ? nodeParameterList : node.getNameIdentifier(),
+              JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature(
+                overrideParameterList != null ? overrideParameterList.getText() : "()"
+              ).get()
+            );
 
             // TODO: quickfix
             //annotation.registerFix(
@@ -857,10 +903,12 @@ else if (!hasOverride) {
           else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
             PsiElement returnTypeExpr = node.getReturnTypeElement();
             PsiElement overrideReturnTypeExpr = override.getReturnTypeElement();
-            final Annotation annotation = myHolder.createErrorAnnotation(returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier(),
-                                                                         JavaScriptBundle.message(
-                                                                           "javascript.validation.message.function.override.incompatible.signature2",
-                                                                           overrideReturnTypeExpr != null ? overrideReturnTypeExpr.getText() : "*"));
+            final Annotation annotation = myHolder.createErrorAnnotation(
+              returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier(),
+              JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature2(
+                overrideReturnTypeExpr != null ? overrideReturnTypeExpr.getText() : "*"
+              ).get()
+            );
 
             // TODO: quickfix
             //annotation.registerFix(
@@ -927,23 +975,23 @@ else if (overrideParameterType == null && parameterType != null && !"*".equals(p
 
   @Override
   public void visitJSReturnStatement(final JSReturnStatement node) {
-    final PsiElement element = PsiTreeUtil.getParentOfType(node,
-                                                           JSFunction.class,
-                                                           XmlTagChild.class,
-                                                           XmlAttributeValue.class,
-                                                           JSFile.class,
-                                                           JavaScriptLambdaExpression.class);
-    if ((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost)) || (element instanceof XmlTagChild && !(element
-      .getParent() instanceof XmlAttributeValue))) {
-      myHolder.createErrorAnnotation(node, JavaScriptBundle.message("javascript.validation.message.return.outside.function.definition"));
-    }
-
-    if (element instanceof JSFunction) {
-      final @NonNls String typeString = ((JSFunction)element).getReturnTypeString();
+    final PsiElement element = PsiTreeUtil.getParentOfType(
+      node,
+      JSFunction.class,
+      XmlTagChild.class,
+      XmlAttributeValue.class,
+      JSFile.class,
+      JavaScriptLambdaExpression.class
+    );
+    if ((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost))
+      || (element instanceof XmlTagChild && !(element.getParent() instanceof XmlAttributeValue))) {
+      myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageReturnOutsideFunctionDefinition().get());
+    }
+
+    if (element instanceof JSFunction function) {
+      final @NonNls String typeString = function.getReturnTypeString();
       if (typeString != null && !"void".equals(typeString) && node.getExpression() == null) {
-        myHolder.createErrorAnnotation(node,
-                                       JavaScriptBundle.message("javascript.validation.message.return.value.of.type.is.required",
-                                                                typeString));
+        myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageReturnValueOfTypeIsRequired(typeString).get());
       }
     }
   }
@@ -954,10 +1002,9 @@ public void visitJSLabeledStatement(final JSLabeledStatement node) {
     if (label != null) {
       PsiElement run = node.getParent();
       while (run != null) {
-        if (run instanceof JSLabeledStatement) {
-          if (label.equals(((JSLabeledStatement)run).getLabel())) {
-            myHolder.createErrorAnnotation(node.getLabelIdentifier(),
-                                           JavaScriptBundle.message("javascript.validation.message.duplicate.label"));
+        if (run instanceof JSLabeledStatement labeledStatement) {
+          if (label.equals(labeledStatement.getLabel())) {
+            myHolder.createErrorAnnotation(node.getLabelIdentifier(), JavaScriptLocalize.javascriptValidationMessageDuplicateLabel().get());
             break;
           }
         }
@@ -984,11 +1031,14 @@ private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass)
       if (node != null) {
         final String name = aClass.getName();
         String nameWithExtension = name + "." + file.getExtension();
-        final String message =
-          JavaScriptBundle.message(aClass instanceof JSClass ? "javascript.validation.message.class.should.be.in.file" : aClass instanceof
-            JSNamespaceDeclaration ? "javascript.validation.message.namespace.should.be.in.file" : aClass instanceof JSVariable ? "javascript.validation" +
-            ".message.variable.should.be.in.file" : "javascript.validation.message.function.should.be.in.file", name, nameWithExtension);
-        final Annotation annotation = myHolder.createErrorAnnotation(node, message);
+        final LocalizeValue message = aClass instanceof JSClass
+          ? JavaScriptLocalize.javascriptValidationMessageClassShouldBeInFile(name, nameWithExtension)
+          : aClass instanceof JSNamespaceDeclaration
+          ? JavaScriptLocalize.javascriptValidationMessageNamespaceShouldBeInFile(name, nameWithExtension)
+          : aClass instanceof JSVariable
+          ? JavaScriptLocalize.javascriptValidationMessageVariableShouldBeInFile(name, nameWithExtension)
+          : JavaScriptLocalize.javascriptValidationMessageFunctionShouldBeInFile(name, nameWithExtension);
+        final Annotation annotation = myHolder.createErrorAnnotation(node, message.get());
 
         annotation.registerFix(new RenameFileFix(nameWithExtension));
     /*annotation.registerFix(new RenamePublicClassFix(aClass) {
@@ -1037,10 +1087,12 @@ public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorRe
     final VirtualFile rootForFile = ProjectRootManager.getInstance(containingFile.getProject()).getFileIndex().getSourceRootForFile(file);
 
     if (rootForFile == null) {
-      client.reportError(nameIdentifier.getNode(),
-                         JavaScriptBundle.message("javascript.validation.message.file.should.be.under.source.root"),
-                         ErrorReportingClient.ProblemKind.WARNING,
-                         null);
+      client.reportError(
+        nameIdentifier.getNode(),
+        JavaScriptLocalize.javascriptValidationMessageFileShouldBeUnderSourceRoot().get(),
+        ErrorReportingClient.ProblemKind.WARNING,
+        null
+      );
     }
   }
 
@@ -1048,19 +1100,23 @@ private void checkPackageStatement(final JSPackageStatement packageStatement) {
     final String s = packageStatement.getQualifiedName();
 
     final PsiFile containingFile = packageStatement.getContainingFile();
-    final String expected =
-      JSResolveUtil.getExpectedPackageNameFromFile(containingFile.getVirtualFile(), containingFile.getProject(), true);
+    final String expected = JSResolveUtil.getExpectedPackageNameFromFile(
+      containingFile.getVirtualFile(),
+      containingFile.getProject(),
+      true
+    );
 
     if (expected != null && ((s == null && expected.length() != 0) || (s != null && !expected.equals(s)))) {
       final PsiElement nameIdentifier = packageStatement.getNameIdentifier();
-      final Annotation annotation =
-        myHolder.createErrorAnnotation(nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild()
-          , JavaScriptBundle.message("javascript.validation.message.incorrect.package.name", s, expected));
+      final Annotation annotation = myHolder.createErrorAnnotation(
+        nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild(),
+        JavaScriptLocalize.javascriptValidationMessageIncorrectPackageName(s, expected).get()
+      );
       annotation.registerFix(new SyntheticIntentionAction() {
         @Override
         @Nonnull
         public String getText() {
-          return JavaScriptBundle.message("javascript.fix.package.name", expected);
+          return JavaScriptLocalize.javascriptFixPackageName(expected).get();
         }
 
         @Override
@@ -1080,21 +1136,22 @@ public boolean startInWriteAction() {
       });
     }
 
-    final Set<JSNamedElement> elements = new HashSet<JSNamedElement>();
+    final Set<JSNamedElement> elements = new HashSet<>();
 
     for (JSSourceElement statement : packageStatement.getStatements()) {
-      if (statement instanceof JSNamedElement && !(statement instanceof JSImportStatement)) {
-        elements.add((JSNamedElement)statement);
+      if (statement instanceof JSNamedElement namedElement && !(statement instanceof JSImportStatement)) {
+        elements.add(namedElement);
       }
     }
 
     if (elements.size() > 1) {
       for (JSNamedElement el : elements) {
         final PsiElement nameIdentifier = el.getNameIdentifier();
-        myHolder.createErrorAnnotation(nameIdentifier != null ? nameIdentifier : el.getFirstChild(),
-                                       JavaScriptBundle.message("javascript.validation.message.more.than.one.externally.visible.symbol"))
-                .registerFix(new RemoveASTNodeFix(el.getNode(),
-                                                  "javascript.fix.remove.externally.visible.symbol"));
+        myHolder.createErrorAnnotation(
+            nameIdentifier != null ? nameIdentifier : el.getFirstChild(),
+            JavaScriptLocalize.javascriptValidationMessageMoreThanOneExternallyVisibleSymbol().get()
+          )
+          .registerFix(new RemoveASTNodeFix(el.getNode(), JavaScriptLocalize.javascriptFixRemoveExternallyVisibleSymbol()));
       }
     }
 
@@ -1103,21 +1160,21 @@ public boolean startInWriteAction() {
 
   public static class RemoveASTNodeFix implements SyntheticIntentionAction, LocalQuickFix {
     private final ASTNode[] myAstNodes;
-    private final String myPropKey;
+    private final LocalizeValue myProp;
 
-    public RemoveASTNodeFix(final ASTNode astNode, @PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String propKey) {
-      this(propKey, astNode);
+    public RemoveASTNodeFix(final ASTNode astNode, LocalizeValue prop) {
+      this(prop, astNode);
     }
 
-    public RemoveASTNodeFix(@PropertyKey(resourceBundle = JavaScriptBundle.BUNDLE) String propKey, final ASTNode... astNodes) {
-      myPropKey = propKey;
+    public RemoveASTNodeFix(LocalizeValue prop, final ASTNode... astNodes) {
+      myProp = prop;
       myAstNodes = astNodes;
     }
 
     @Override
     @Nonnull
     public String getText() {
-      return JavaScriptBundle.message(myPropKey);
+      return myProp.get();
     }
 
     @Override
@@ -1176,7 +1233,7 @@ public AddOverrideIntentionAction(final JSFunction node) {
     @Override
     @Nonnull
     public String getText() {
-      return JavaScriptBundle.message("javascript.fix.add.override.modifier");
+      return JavaScriptLocalize.javascriptFixAddOverrideModifier().get();
     }
 
     @Override
@@ -1210,10 +1267,10 @@ public boolean startInWriteAction() {
   private class SimpleErrorReportingClient implements ErrorReportingClient {
     @Override
     public void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix) {
-      final Annotation annotation = kind == ProblemKind.ERROR ? myHolder.createErrorAnnotation(nameIdentifier,
-                                                                                               s) : myHolder.createWarningAnnotation(
-        nameIdentifier,
-        s);
+      final Annotation annotation = kind == ProblemKind.ERROR
+        ? myHolder.createErrorAnnotation(nameIdentifier, s)
+        : myHolder.createWarningAnnotation(nameIdentifier, s);
+
       if (implementMethodsFix != null) {
         annotation.registerFix(implementMethodsFix);
       }
@@ -1221,10 +1278,9 @@ public void reportError(final ASTNode nameIdentifier, final String s, ProblemKin
 
     @Override
     public void reportError(PsiElement nameIdentifier, String s, ProblemKind kind, IntentionAction implementMethodsFix) {
-      final Annotation annotation = kind == ProblemKind.ERROR ? myHolder.createErrorAnnotation(nameIdentifier,
-                                                                                               s) : myHolder.createWarningAnnotation(
-        nameIdentifier,
-        s);
+      final Annotation annotation = kind == ProblemKind.ERROR
+        ? myHolder.createErrorAnnotation(nameIdentifier, s)
+        : myHolder.createWarningAnnotation(nameIdentifier, s);
       if (implementMethodsFix != null) {
         annotation.registerFix(implementMethodsFix);
       }
@@ -1243,7 +1299,7 @@ public AddSuperInvokationFix(JSReferenceExpression node, JSFunction superConstru
     @Override
     @Nonnull
     public String getText() {
-      return JavaScriptBundle.message("javascript.fix.create.invoke.super");
+      return JavaScriptLocalize.javascriptFixCreateInvokeSuper().get();
     }
 
     @Override
@@ -1281,8 +1337,8 @@ public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws
       JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
       JSSourceElement[] body = fun != null ? fun.getBody() : JSSourceElement.EMPTY_ARRAY;
 
-      if (body.length > 0 && body[0] instanceof JSBlockStatement) {
-        PsiElement firstChild = body[0].getFirstChild();
+      if (body.length > 0 && body[0] instanceof JSBlockStatement blockStatement) {
+        PsiElement firstChild = blockStatement.getFirstChild();
         editor.getCaretModel().moveToOffset(firstChild.getTextRange().getEndOffset());
         TemplateManager.getInstance(project).startTemplate(editor, t);
       }
@@ -1306,7 +1362,7 @@ private static class AddConstructorAndSuperInvokationFix implements SyntheticInt
     @Override
     @Nonnull
     public String getText() {
-      return JavaScriptBundle.message("javascript.fix.create.constructor.invoke.super");
+      return JavaScriptLocalize.javascriptFixCreateConstructorInvokeSuper().get();
     }
 
     @Override

From 1baad0337db4347a869a42d4b62aca09a3b486b3 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 6 Jul 2024 17:43:19 +0300
Subject: [PATCH 187/340] Using LocalizeValue as is in calls of
 Parsing.checkMatches() and builder.error().

---
 .../lang/javascript/JSTokenTypes.java         |  4 +-
 .../lang/javascript/parsing/JSDocParsing.java |  4 +-
 .../lang/parsing/ExpressionParsing.java       | 86 +++++++++----------
 .../lang/parsing/FunctionParsing.java         |  8 +-
 .../lang/parsing/StatementParsing.java        | 76 ++++++++--------
 .../parsing/EcmaScriptExpressionParsing.java  |  4 +-
 .../parsing/EcmaScriptStatementParsing.java   | 22 ++---
 .../parsing/EcmaScript4ExpressionParsing.java |  2 +-
 .../parsing/EcmaScript4FunctionParsing.java   |  8 +-
 .../parsing/EcmaScript4StatementParsing.java  | 28 +++---
 .../json/lang/JsonJavaScriptParser.java       | 22 ++---
 .../impl/structureView/JSSuperGrouper.java    | 40 +++++----
 12 files changed, 150 insertions(+), 154 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 039ad4ea..f5806ac3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -167,12 +167,12 @@ protected void doParse(JavaScriptParsingContext context, PsiBuilder builder)
 		public void parseScriptExpression(JavaScriptParsingContext context, final PsiBuilder builder)
 		{
 			PsiBuilder.Marker root = builder.mark();
-			Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get());
+			Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
 			if(builder.getTokenType() != JSTokenTypes.RBRACE)
 			{
 				context.getExpressionParsing().parseExpression(builder);
 			}
-			Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace().get());
+			Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
 
 			while(!builder.eof())
 			{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
index 04ba5023..edc1699b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
@@ -67,7 +67,7 @@ private static boolean parseDocTag(final PsiBuilder builder)
 
 				if(isInvalidTokenType(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagName().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagName());
 					return false;
 				}
 
@@ -106,7 +106,7 @@ else if(!currentText.startsWith("{"))
 
 				if(isInvalidTokenType(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagValue().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagValue());
 					return false;
 				}
 			}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index bdaf5b00..0cd15ea1 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -143,11 +143,11 @@ else if(tokenType == JSTokenTypes.LBRACKET)
 				{
 					builder.advanceLexer();
 					parseExpression(builder);
-					Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
+					Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
 				}
 				else
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
 				}
 			}
 
@@ -245,13 +245,13 @@ else if(elementType == JSTokenTypes.COMMA)
 			}
 			else
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
 			}
 
 			elementType = builder.getTokenType();
 			if(elementType == JSTokenTypes.RBRACE)
 			{
-				builder.error(JavaScriptLocalize.javascriptParserPropertyExpected().get());
+				builder.error(JavaScriptLocalize.javascriptParserPropertyExpected());
 			}
 			else if(isNotPropertyStart(builder, elementType))
 			{
@@ -259,7 +259,7 @@ else if(isNotPropertyStart(builder, elementType))
 			}
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
 		expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
 	}
 
@@ -275,16 +275,16 @@ protected void parseProperty(final PsiBuilder builder)
 
 		if(isNotPropertyStart(builder, nameToken))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
 		}
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
+		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
 
 		builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
 		if(!parseAssignmentExpression(builder))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 		}
 		builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
 
@@ -309,11 +309,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 			{
 				if(commaExpected)
 				{
-					final boolean b = Parsing.checkMatches(
-						builder,
-						JSTokenTypes.COMMA,
-						JavaScriptLocalize.javascriptParserMessageExpectedComma().get()
-					);
+					final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
 					if(!b)
 					{
 						break;
@@ -330,7 +326,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 				{
 					if(!parseAssignmentExpression(builder))
 					{
-						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 						break;
 					}
 					else
@@ -339,7 +335,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 					}
 				}
 			}
-			Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
+			Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
 			expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
 		}
 		finally
@@ -354,7 +350,7 @@ private void parseParenthesizedExpression(final PsiBuilder builder)
 		final PsiBuilder.Marker expr = builder.mark();
 		builder.advanceLexer();
 		parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 		expr.done(JSElementTypes.PARENTHESIZED_EXPRESSION);
 	}
 
@@ -424,7 +420,7 @@ protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyn
 				}
 				else
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName());
 				}
 
 				expr.done(JSElementTypes.REFERENCE_EXPRESSION);
@@ -434,7 +430,7 @@ else if(tokenType == JSTokenTypes.LBRACKET)
 			{
 				builder.advanceLexer();
 				parseExpression(builder);
-				Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
+				Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
 				expr.done(JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION);
 				expr = expr.precede();
 			}
@@ -499,7 +495,7 @@ else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.
 			}
 			else
 			{
-				Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName().get());
+				Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName());
 			}
 			expr.done(JSElementTypes.REFERENCE_EXPRESSION);
 			expr = expr.precede();
@@ -527,7 +523,7 @@ protected boolean parseNewExpression(PsiBuilder builder)
 
 		if(!parseMemberExpression(builder, false))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 		}
 		return false;
 	}
@@ -552,17 +548,17 @@ protected void parseArgumentList(final PsiBuilder builder)
 				}
 				else
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen());
 					break;
 				}
 			}
 			if(!parseAssignmentExpression(builder))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 		arglist.done(JSElementTypes.ARGUMENT_LIST);
 	}
 
@@ -570,7 +566,7 @@ public void parseExpression(PsiBuilder builder)
 	{
 		if(!parseExpressionOptional(builder))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 		}
 	}
 
@@ -590,11 +586,11 @@ private boolean parseAssignmentExpression(final PsiBuilder builder, boolean allo
 
 		if(JSTokenTypes.ASSIGNMENT_OPERATIONS.contains(builder.getTokenType()) && builder.getUserData(WITHIN_OBJECT_LITERAL_EXPRESSION) == null)
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			builder.advanceLexer();
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
 			return true;
@@ -614,7 +610,7 @@ private boolean parseAssignmentExpression(final PsiBuilder builder, boolean allo
 			builder.advanceLexer();
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
 		}
@@ -642,12 +638,12 @@ private boolean parseConditionalExpression(final PsiBuilder builder, final boole
 			builder.advanceLexer();
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
-			Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
+			Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.CONDITIONAL_EXPRESSION);
 		}
@@ -677,7 +673,7 @@ private boolean parseORExpression(final PsiBuilder builder, final boolean allowI
 			builder.advanceLexer();
 			if(!parseANDExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -701,7 +697,7 @@ private boolean parseANDExpression(final PsiBuilder builder, final boolean allow
 			builder.advanceLexer();
 			if(!parseBitwiseORExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -725,7 +721,7 @@ private boolean parseBitwiseORExpression(final PsiBuilder builder, final boolean
 			builder.advanceLexer();
 			if(!parseBitwiseXORExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -749,7 +745,7 @@ private boolean parseBitwiseXORExpression(final PsiBuilder builder, final boolea
 			builder.advanceLexer();
 			if(!parseBitwiseANDExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -773,7 +769,7 @@ private boolean parseBitwiseANDExpression(final PsiBuilder builder, final boolea
 			builder.advanceLexer();
 			if(!parseEqualityExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -797,7 +793,7 @@ private boolean parseEqualityExpression(final PsiBuilder builder, final boolean
 			builder.advanceLexer();
 			if(!parseRelationalExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -820,7 +816,7 @@ private boolean parseRelationalExpression(final PsiBuilder builder, final boolea
 			builder.advanceLexer();
 			if(!parseShiftExpression(builder))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -843,7 +839,7 @@ private boolean parseShiftExpression(final PsiBuilder builder)
 			builder.advanceLexer();
 			if(!parseAdditiveExpression(builder))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -866,7 +862,7 @@ private boolean parseAdditiveExpression(final PsiBuilder builder)
 			builder.advanceLexer();
 			if(!parseMultiplicativeExpression(builder))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -890,7 +886,7 @@ private boolean parseIsAsExpression(final PsiBuilder builder)
 			builder.advanceLexer();
 			if(!parseUnaryExpression(builder))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -919,7 +915,7 @@ protected boolean parseMultiplicativeExpression(final PsiBuilder builder, TokenS
 			builder.advanceLexer();
 			if(!parseUnaryExpression(builder))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.BINARY_EXPRESSION);
 			expr = expr.precede();
@@ -938,7 +934,7 @@ private boolean parseUnaryExpression(final PsiBuilder builder)
 			builder.advanceLexer();
 			if(!parseUnaryExpression(builder))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 			expr.done(JSElementTypes.PREFIX_EXPRESSION);
 			return true;
@@ -1001,7 +997,7 @@ public boolean parseExpressionOptional(final PsiBuilder builder, final boolean a
 			builder.advanceLexer();
 			if(!parseAssignmentExpression(builder, allowIn))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			}
 
 			expr.done(JSElementTypes.COMMA_EXPRESSION);
@@ -1027,7 +1023,7 @@ public boolean parseType(final PsiBuilder builder)
 		}
 		else if(!parseQualifiedTypeName(builder))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
 		}
 		return true;
 	}
@@ -1036,7 +1032,7 @@ public boolean parseSimpleExpression(final PsiBuilder builder)
 	{
 		if(!parseUnaryExpression(builder))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 			return false;
 		}
 		return true;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index 71cbbef4..0952762a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -79,7 +79,7 @@ else if(isContextKeyword(builder, JSTokenTypes.SET_KEYWORD))
 		{
 			if(!expressionContext && builder.getTokenType() != JSTokenTypes.LPAR /*get/set as name*/)
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionName().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionName());
 			}
 		}
 
@@ -104,7 +104,7 @@ public void parseParameterList(final PsiBuilder builder)
 		final PsiBuilder.Marker parameterList;
 		if(builder.getTokenType() != JSTokenTypes.LPAR)
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 			parameterList = builder.mark(); // To have non-empty parameters list at all the time.
 			parameterList.done(JSElementTypes.PARAMETER_LIST);
 			return;
@@ -130,7 +130,7 @@ public void parseParameterList(final PsiBuilder builder)
 				}
 				else
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen());
 					break;
 				}
 			}
@@ -175,7 +175,7 @@ else if(builder.getTokenType() == JSTokenTypes.LBRACE)
 		}
 		else
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFormalParameterName().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFormalParameterName());
 			parameterMarker.drop();
 		}
 	}
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 84abac3d..9b32a30f 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -66,7 +66,7 @@ protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses
 
 		if(firstToken == null)
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
 			return;
 		}
 
@@ -195,7 +195,7 @@ protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses
 			}
 		}
 
-		builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement().get());
+		builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
 		builder.advanceLexer();
 	}
 
@@ -261,7 +261,7 @@ PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder)
 					}
 				}
 			}
-			Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+			Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 		}
 		return marker;
 	}
@@ -272,7 +272,7 @@ public void parseIncludeDirective(final PsiBuilder builder)
 		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
 		final PsiBuilder.Marker useNSStatement = builder.mark();
 		builder.advanceLexer();
-		Parsing.checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral().get());
+		Parsing.checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral());
 		checkForSemicolon(builder);
 
 		useNSStatement.done(JSElementTypes.INCLUDE_DIRECTIVE);
@@ -304,7 +304,7 @@ private void parseCatchBlock(final PsiBuilder builder)
 		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
 		final PsiBuilder.Marker block = builder.mark();
 		builder.advanceLexer();
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 
 		final IElementType identifierType = builder.getTokenType();
 
@@ -318,23 +318,19 @@ private void parseCatchBlock(final PsiBuilder builder)
 				if(builder.getTokenType() == JSTokenTypes.IF_KEYWORD)
 				{
 					builder.advanceLexer();
-					Parsing.checkMatches(builder, identifierType, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get());
-					Parsing.checkMatches(
-						builder, 
-						JSTokenTypes.INSTANCEOF_KEYWORD,
-						JavaScriptLocalize.javascriptParserMessageExpectedInstanceof().get()
-					);
-					Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get());
+					Parsing.checkMatches(builder, identifierType, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+					Parsing.checkMatches(builder, JSTokenTypes.INSTANCEOF_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedInstanceof());
+					Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
 				}
 			}
 			param.done(JSElementTypes.FORMAL_PARAMETER);
 		}
 		else
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedParameterName().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedParameterName());
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 
 		parseBlock(builder);
 
@@ -359,16 +355,16 @@ protected void parseSwitchStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 
-		Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get());
+		Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
 		while(builder.getTokenType() != JSTokenTypes.RBRACE)
 		{
 			if(builder.eof())
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageUnexpectedEndOfFile().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageUnexpectedEndOfFile());
 				statement.done(JSElementTypes.SWITCH_STATEMENT);
 				return;
 			}
@@ -385,14 +381,14 @@ private void parseCaseOrDefaultClause(final PsiBuilder builder)
 		final PsiBuilder.Marker clause = builder.mark();
 		if(firstToken != JSTokenTypes.CASE_KEYWORD && firstToken != JSTokenTypes.DEFAULT_KEYWORD)
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCatchOrDefault().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCatchOrDefault());
 		}
 		builder.advanceLexer();
 		if(firstToken == JSTokenTypes.CASE_KEYWORD)
 		{
 			getExpressionParsing().parseExpression(builder);
 		}
-		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
+		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
 		while(true)
 		{
 			IElementType token = builder.getTokenType();
@@ -411,9 +407,9 @@ protected void parseWithStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 
 		parseStatement(builder);
 
@@ -561,7 +557,7 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 			builder.advanceLexer();
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 		final boolean empty;
 		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD)
 		{
@@ -585,7 +581,7 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 			}
 			else
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon());
 			}
 			getExpressionParsing().parseExpressionOptional(builder);
 		}
@@ -594,17 +590,17 @@ else if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
 			forin = true;
 			if(empty)
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration());
 			}
 			builder.advanceLexer();
 			getExpressionParsing().parseExpression(builder);
 		}
 		else
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOrSemicolon().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOrSemicolon());
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 		return forin;
 	}
 
@@ -614,9 +610,9 @@ private void parseWhileStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker statement = builder.mark();
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 
 		parseStatement(builder);
 		statement.done(JSElementTypes.WHILE_STATEMENT);
@@ -629,10 +625,10 @@ private void parseDoWhileStatement(final PsiBuilder builder)
 		builder.advanceLexer();
 
 		parseStatement(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.WHILE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedWhileKeyword().get());
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.WHILE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedWhileKeyword());
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 		checkForSemicolon(builder);
 
 		statement.done(JSElementTypes.DOWHILE_STATEMENT);
@@ -644,7 +640,7 @@ protected void parseIfStatement(final PsiBuilder builder)
 		final PsiBuilder.Marker ifStatement = builder.mark();
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 		getExpressionParsing().parseExpression(builder);
 
 		// handle empty expressions inside
@@ -653,7 +649,7 @@ protected void parseIfStatement(final PsiBuilder builder)
 			builder.advanceLexer();
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 
 		parseStatement(builder);
 
@@ -703,7 +699,7 @@ protected void parseVarStatementWithMarker(final PsiBuilder builder, final boole
 				}
 				else
 				{
-					Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma().get());
+					Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
 				}
 
 				parseVarDeclaration(builder, !inForInitializationContext);
@@ -782,7 +778,7 @@ protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
 	{
 		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName());
 			builder.advanceLexer();
 			return;
 		}
@@ -807,14 +803,14 @@ protected void parseVarInitializer(PsiBuilder builder, boolean allowIn)
 			{
 				if(!getExpressionParsing().parseAssignmentExpression(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 				}
 			}
 			else
 			{
 				if(!getExpressionParsing().parseAssignmentExpressionNoIn(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 				}
 			}
 		}
@@ -844,7 +840,7 @@ protected void parseBlockOrFunctionBody(final PsiBuilder builder, BlockType type
 			{
 				block.rollbackTo();
 			}
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
 			return;
 		}
 
@@ -853,7 +849,7 @@ protected void parseBlockOrFunctionBody(final PsiBuilder builder, BlockType type
 		{
 			if(builder.eof())
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageMissingRbrace().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageMissingRbrace());
 				if(block != null)
 				{
 					block.done(JSElementTypes.BLOCK_STATEMENT);
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
index 34946936..53bb09de 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -164,7 +164,7 @@ protected void parseProperty(PsiBuilder builder)
 		{
 			if(isNotPropertyStart(builder, nameTokenType))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
 			}
 
 			IElementType setOrGetToken = isContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET);
@@ -224,7 +224,7 @@ else if(nextTokenType == JSTokenTypes.LPAR)
 				builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
 				if(!parseAssignmentExpression(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 				}
 				builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
 			}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index 0182eb37..48555d56 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -99,7 +99,7 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 	{
 		builder.advanceLexer();
 
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 		final boolean empty;
 		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD || builder.getTokenType() == JSTokenTypes.CONST_KEYWORD)
 		{
@@ -123,7 +123,7 @@ protected boolean parseForLoopHeader(final PsiBuilder builder)
 			}
 			else
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon());
 			}
 			getExpressionParsing().parseExpressionOptional(builder);
 		}
@@ -132,7 +132,7 @@ else if(isContextKeyword(builder, JSTokenTypes.OF_KEYWORD) || builder.getTokenTy
 			forin = true;
 			if(empty)
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration());
 			}
 
 			if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
@@ -148,10 +148,10 @@ else if(isContextKeyword(builder, JSTokenTypes.OF_KEYWORD) || builder.getTokenTy
 		}
 		else
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOfOrSemicolon().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOfOrSemicolon());
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 		return forin;
 	}
 
@@ -247,7 +247,7 @@ else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
 								}
 								else
 								{
-									builder.error("Comma expected");
+									builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
 								}
 							}
 
@@ -279,7 +279,7 @@ else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
 							}
 							else if(builder.getTokenType() != JSTokenTypes.RBRACE)
 							{
-								builder.error("Expected identifier");
+								builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
 								break;
 							}
 						}
@@ -296,7 +296,7 @@ else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 					}
 					else
 					{
-						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
+						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
 						break;
 					}
 
@@ -314,7 +314,7 @@ else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 				}
 				else
 				{
-					builder.error("Expecte from target");
+					builder.error("Expected from target");
 				}
 			}
 
@@ -375,7 +375,7 @@ protected void parseClassBody(final PsiBuilder builder, BlockType type)
 	{
 		if(builder.getTokenType() != JSTokenTypes.LBRACE)
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
 			return;
 		}
 
@@ -449,7 +449,7 @@ protected void parseClassBody(final PsiBuilder builder, BlockType type)
 
 				if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
 				}
 				else
 				{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
index e9225bcd..4bb1c19c 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
@@ -90,7 +90,7 @@ protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyn
 				}
 				else
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName());
 				}
 
 				expr.done(JSElementTypes.REFERENCE_EXPRESSION);
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
index 794638c9..df76c1ca 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
@@ -69,7 +69,7 @@ void parseAttributesList(final PsiBuilder builder)
 						if(builder.eof())
 						{
 							attribute.done(JSElementTypes.ATTRIBUTE);
-							builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
+							builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
 							return;
 						}
 					}
@@ -139,7 +139,7 @@ private void parseAttributeBody(final PsiBuilder builder)
 
 			if(builder.getTokenType() == JSTokenTypes.COMMA)
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentiferOrValue().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentiferOrValue());
 				break;
 			}
 			if(builder.getTokenType() == JSTokenTypes.RBRACKET)
@@ -161,7 +161,7 @@ private void parseAttributeBody(final PsiBuilder builder)
 				}
 				else
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedValue().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedValue());
 				}
 			}
 
@@ -177,7 +177,7 @@ private void parseAttributeBody(final PsiBuilder builder)
 
 			if(builder.eof())
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 				return;
 			}
 		}
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
index 21e36393..6a323fd9 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
@@ -57,7 +57,7 @@ protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
 	{
 		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName());
 			builder.advanceLexer();
 			return;
 		}
@@ -75,14 +75,14 @@ protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
 			{
 				if(!getExpressionParsing().parseAssignmentExpression(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 				}
 			}
 			else
 			{
 				if(!getExpressionParsing().parseAssignmentExpressionNoIn(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 				}
 			}
 		}
@@ -96,7 +96,7 @@ protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses
 
 		if(firstToken == null)
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
 			return;
 		}
 
@@ -291,7 +291,7 @@ else if(JSTokenTypes.COLON_COLON == builder.getTokenType())
 					}
 					else
 					{
-						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionVarClassInterfaceNamespace().get());
+						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionVarClassInterfaceNamespace());
 						marker.drop();
 					}
 				}
@@ -348,7 +348,7 @@ private void parseDefaultNsStatement(final PsiBuilder builder)
 		}
 		else
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedXml().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedXml());
 		}
 		marker.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
 	}
@@ -364,7 +364,7 @@ private void parseImportStatement(final PsiBuilder builder)
 			final PsiBuilder.Marker nsAssignment = builder.mark();
 			if(!getExpressionParsing().parseQualifiedTypeName(builder, true))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
 				nsAssignment.drop();
 				return;
 			}
@@ -374,7 +374,7 @@ private void parseImportStatement(final PsiBuilder builder)
 				builder.advanceLexer();
 				if(!getExpressionParsing().parseQualifiedTypeName(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
 				}
 
 				nsAssignment.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
@@ -405,7 +405,7 @@ private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @Nonnull
 
 		if(!getExpressionParsing().parseQualifiedTypeName(builder))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
 		}
 		if(builder.getTokenType() == JSTokenTypes.EQ)
 		{
@@ -424,7 +424,7 @@ private void parseUseNamespaceDirective(final PsiBuilder builder)
 
 		if(builder.getTokenType() != JSTokenTypes.NAMESPACE_KEYWORD)
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNamespace().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNamespace());
 		}
 		else
 		{
@@ -432,7 +432,7 @@ private void parseUseNamespaceDirective(final PsiBuilder builder)
 
 			if(!getExpressionParsing().parseQualifiedTypeName(builder))
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
 			}
 
 			while(builder.getTokenType() == JSTokenTypes.COMMA)
@@ -440,7 +440,7 @@ private void parseUseNamespaceDirective(final PsiBuilder builder)
 				builder.advanceLexer();
 				if(!getExpressionParsing().parseQualifiedTypeName(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
 					break;
 				}
 			}
@@ -462,7 +462,7 @@ private void parseClassNoMarker(final PsiBuilder builder, final @Nonnull PsiBuil
 		builder.advanceLexer();
 		if(!getExpressionParsing().parseQualifiedTypeName(builder))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
 		}
 
 		if(builder.getTokenType() == JSTokenTypes.EXTENDS_KEYWORD)
@@ -511,7 +511,7 @@ private void parsePackage(final PsiBuilder builder)
 
 		if(builder.getTokenType() != JSTokenTypes.LBRACE)
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNameOrLbrace().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNameOrLbrace());
 		}
 		else
 		{
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index aa34c377..ef466ece 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -42,7 +42,7 @@ private void parseRoot(PsiBuilder builder)
 			parseArrayLiteralExpression(builder);
 			if(builder.getTokenType() != null)
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof());
 			}
 		}
 		else if(builder.getTokenType() == JSTokenTypes.LBRACE)
@@ -50,12 +50,12 @@ else if(builder.getTokenType() == JSTokenTypes.LBRACE)
 			parseObjectLiteralExpression(builder);
 			if(builder.getTokenType() != null)
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof());
 			}
 		}
 		else
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbraceOrLbracket().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbraceOrLbracket());
 		}
 
 		while(builder.getTokenType() != null)
@@ -108,14 +108,14 @@ else if(tokenType == JSTokenTypes.RBRACKET)
 
 		if(isNotPropertyStart(nameToken))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
 		}
 		builder.advanceLexer();
-		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
+		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
 
 		if(!parseValue(builder))
 		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 		}
 		myPropertyDepth--;
 
@@ -150,7 +150,7 @@ else if(elementType == JSTokenTypes.COMMA)
 			}
 			else
 			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma().get());
+				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
 			}
 
 			elementType = builder.getTokenType();
@@ -164,7 +164,7 @@ else if(isNotPropertyStart(elementType))
 			}
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
 		expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
 	}
 
@@ -184,7 +184,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 		{
 			if(commaExpected)
 			{
-				final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma().get());
+				final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
 				if(!b)
 				{
 					break;
@@ -201,7 +201,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 			{
 				if(!parseValue(builder))
 				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression().get());
+					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
 					break;
 				}
 				else
@@ -210,7 +210,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder)
 				}
 			}
 		}
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
 		expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
 	}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
index 5570172a..1dcb6761 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.structureView;
 
 import consulo.fileEditor.structureView.tree.*;
+import consulo.ide.localize.IdeLocalize;
 import consulo.project.ui.view.tree.AbstractTreeNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
@@ -46,38 +47,38 @@ class JSSuperGrouper implements Grouper
 	@Nonnull
 	public Collection<Group> group(final Object parent, final Collection<TreeElement> children)
 	{
-		if(isParentGrouped((AbstractTreeNode) parent))
+		if (isParentGrouped((AbstractTreeNode) parent))
 		{
 			return Collections.emptyList();
 		}
-		final Map<String, Group> groups = new HashMap<String, Group>();
+		final Map<String, Group> groups = new HashMap<>();
 
-		for(TreeElement _child : children)
+		for (TreeElement _child : children)
 		{
-			if(!(_child instanceof JSStructureViewElement))
+			if (!(_child instanceof JSStructureViewElement))
 			{
 				continue;
 			}
 			JSStructureViewElement child = (JSStructureViewElement) _child;
 			final PsiElement value = child.getValue();
 
-			if(value instanceof JSVariable)
+			if (value instanceof JSVariable)
 			{
-				if(!child.isInherited())
+				if (!child.isInherited())
 				{
 					continue;
 				}
 				PsiElement parentElement = value.getParent();
-				if(parentElement instanceof JSVarStatement)
+				if (parentElement instanceof JSVarStatement)
 				{
 					parentElement = parentElement.getParent();
 				}
-				if(parentElement instanceof JSClass)
+				if (parentElement instanceof JSClass jsClass)
 				{
-					addGroup(groups, _child, ((JSClass) parentElement).getQualifiedName());
+					addGroup(groups, _child, jsClass.getQualifiedName());
 				}
 			}
-			else if(value instanceof JSFunction)
+			else if (value instanceof JSFunction)
 			{
 				processFunction((JSStructureViewElement) ((AbstractTreeNode) parent).getValue(), groups, _child, value);
 			}
@@ -88,11 +89,10 @@ else if(value instanceof JSFunction)
 	private static void processFunction(JSStructureViewElement parentElement, Map<String, Group> groups, TreeElement _child, PsiElement value)
 	{
 		final PsiElement element = JSStructureViewElement.getPsiElementResolveProxy(parentElement);
-		if(element instanceof JSClass)
+		if (element instanceof JSClass parentClass)
 		{
-			JSClass parentClass = (JSClass) element;
 			JSClass declaringClass = JSResolveUtil.findDeclaringClass((JSFunction) value);
-			if(parentClass != declaringClass)
+			if (parentClass != declaringClass)
 			{
 				addGroup(groups, _child, declaringClass.getQualifiedName());
 			}
@@ -101,8 +101,8 @@ private static void processFunction(JSStructureViewElement parentElement, Map<St
 
 	private static void addGroup(final Map<String, Group> groups, final TreeElement _child, final String qName)
 	{
-		JSSuperGroup group;
-		if((group = ((JSSuperGroup) groups.get(qName))) == null)
+		JSSuperGroup group = (JSSuperGroup) groups.get(qName);
+		if (group == null)
 		{
 			groups.put(qName, group = new JSSuperGroup(qName));
 		}
@@ -114,7 +114,11 @@ private static void addGroup(final Map<String, Group> groups, final TreeElement
 	@Nonnull
 	public ActionPresentation getPresentation()
 	{
-		return new ActionPresentationData(IdeBundle.message("action.structureview.group.methods.by.defining.type"), null, PlatformIconGroup.generalImplementingmethod());
+    return new ActionPresentationData(
+			IdeLocalize.actionStructureviewGroupMethodsByDefiningType().get(),
+			null,
+			PlatformIconGroup.generalImplementingmethod()
+		);
 	}
 
 	@Override
@@ -126,9 +130,9 @@ public String getName()
 
 	private static boolean isParentGrouped(AbstractTreeNode parent)
 	{
-		while(parent != null)
+		while (parent != null)
 		{
-			if(parent.getValue() instanceof JSSuperGroup)
+			if (parent.getValue() instanceof JSSuperGroup)
 			{
 				return true;
 			}

From 922a9e341684263db47bc5afbb8b33f5162ebedc Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 6 Jul 2024 17:53:13 +0300
Subject: [PATCH 188/340] Using LocalizeValue as is in calls of
 Parsing.checkMatches().

---
 .../javascript/lang/parsing/FunctionParsing.java  |  4 ++--
 .../consulo/javascript/lang/parsing/Parsing.java  | 15 ---------------
 .../javascript/lang/parsing/StatementParsing.java |  4 ++--
 .../lang/parsing/EcmaScriptExpressionParsing.java |  4 ++--
 .../lang/parsing/EcmaScriptStatementParsing.java  |  4 ++--
 .../parsing/EcmaScript4ExpressionParsing.java     |  6 +++---
 .../lang/parsing/EcmaScript4FunctionParsing.java  | 10 +++++-----
 .../lang/parsing/EcmaScript4StatementParsing.java |  6 +++---
 8 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index 0952762a..d2b145ac 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -195,7 +195,7 @@ protected void parseDeconstructionParameter(PsiBuilder builder, PsiBuilder.Marke
 
 			if(!first)
 			{
-				Parsing.checkMatches(builder, JSTokenTypes.COMMA, "Comma expected");
+				Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
 			}
 
 			first = false;
@@ -216,7 +216,7 @@ protected void parseDeconstructionParameter(PsiBuilder builder, PsiBuilder.Marke
 			}
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, "'}' expected");
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
 
 		desctructionObjectMarker.done(JSElementTypes.DESTRUCTURING_OBJECT);
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index 378d513a..b3e5d765 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -125,21 +125,6 @@ public static void buildTokenElement(IElementType type, PsiBuilder builder)
 		marker.done(type);
 	}
 
-	@Deprecated
-	public static boolean checkMatches(final PsiBuilder builder, final IElementType token, final String message)
-	{
-		if(builder.getTokenType() == token)
-		{
-			builder.advanceLexer();
-			return true;
-		}
-		else
-		{
-			builder.error(message);
-			return false;
-		}
-	}
-
 	public static boolean checkMatches(final PsiBuilder builder, final IElementType token, final LocalizeValue message)
 	{
 		if(builder.getTokenType() == token)
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 9b32a30f..6ade6147 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -736,7 +736,7 @@ protected void parseDeconstructionElement(PsiBuilder builder)
 
 			if(!first)
 			{
-				Parsing.checkMatches(builder, JSTokenTypes.COMMA, "Comma expected");
+				Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
 			}
 
 			first = false;
@@ -757,7 +757,7 @@ protected void parseDeconstructionElement(PsiBuilder builder)
 			}
 		}
 
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, "'}' expected");
+		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
 
 		desctructionObjectMarker.done(JSElementTypes.DESTRUCTURING_OBJECT);
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
index 53bb09de..1ab98d6c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -157,7 +157,7 @@ protected void parseProperty(PsiBuilder builder)
 			PsiBuilder.Marker mark = builder.mark();
 			builder.advanceLexer();
 			parseExpression(builder);
-			checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
+			checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
 			mark.done(JSElementTypes.COMPUTED_NAME);
 		}
 		else
@@ -219,7 +219,7 @@ else if(nextTokenType == JSTokenTypes.LPAR)
 			}
 			else
 			{
-				checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon().get());
+				checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
 
 				builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
 				if(!parseAssignmentExpression(builder))
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index 48555d56..e7afa4bc 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -223,7 +223,7 @@ else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
 
 					if(!firstBinding)
 					{
-						Parsing.checkMatches(builder, JSTokenTypes.COMMA, "Comma expected");
+						Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
 					}
 
 					if(builder.getTokenType() == JSTokenTypes.LBRACE)
@@ -284,7 +284,7 @@ else if(builder.getTokenType() != JSTokenTypes.RBRACE)
 							}
 						}
 
-						Parsing.checkMatches(builder, JSTokenTypes.RBRACE, "'}' expected");
+						Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
 
 						namedImportsMark.done(EcmaScript6ElementTypes.NAMED_IMPORTS);
 					}
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
index 4bb1c19c..91610b67 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
@@ -100,7 +100,7 @@ else if(tokenType == JSTokenTypes.LBRACKET)
 			{
 				builder.advanceLexer();
 				parseExpression(builder);
-				checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket().get());
+				checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
 				expr.done(JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION);
 				expr = expr.precede();
 			}
@@ -163,7 +163,7 @@ else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.
 			}
 			else
 			{
-				checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName().get());
+				checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName());
 			}
 			expr.done(JSElementTypes.REFERENCE_EXPRESSION);
 			expr = expr.precede();
@@ -205,7 +205,7 @@ private void parseGenericSignature(final PsiBuilder builder)
 		PsiBuilder.Marker genericTypeSignature = builder.mark();
 		builder.advanceLexer();
 		parseType(builder);
-		checkMatches(builder, JSTokenTypes.GT, JavaScriptLocalize.javascriptParserMessageExpectedLt().get());
+		checkMatches(builder, JSTokenTypes.GT, JavaScriptLocalize.javascriptParserMessageExpectedLt());
 		genericTypeSignature.done(JSElementTypes.GENERIC_SIGNATURE);
 	}
 }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
index df76c1ca..d4abf341 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
@@ -22,7 +22,7 @@ public EcmaScript4FunctionParsing(JavaScriptParsingContext context)
 	public void parseAttributeWithoutBrackets(final PsiBuilder builder)
 	{
 		final PsiBuilder.Marker attribute = builder.mark();
-		if (!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get()))
+		if (!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier()))
 		{
 			attribute.drop();
 			return;
@@ -54,7 +54,7 @@ void parseAttributesList(final PsiBuilder builder)
 					builder.advanceLexer();
 
 					if (builder.eof() || (
-						!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier().get())
+						!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier())
 							&& builder.getTokenType() != JSTokenTypes.RBRACKET
 					))
 					{
@@ -129,7 +129,7 @@ void parseAttributesList(final PsiBuilder builder)
 
 	private void parseAttributeBody(final PsiBuilder builder)
 	{
-		final boolean haveLParen = checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen().get());
+		final boolean haveLParen = checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 		boolean hasName;
 
 		while(haveLParen)
@@ -152,7 +152,7 @@ private void parseAttributeBody(final PsiBuilder builder)
 
 			if(hasName && builder.getTokenType() != JSTokenTypes.COMMA && builder.getTokenType() != JSTokenTypes.RPAR)
 			{
-				checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual().get());
+				checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual());
 
 				if(builder.getTokenType() != JSTokenTypes.COMMA && builder.getTokenType() != JSTokenTypes.RBRACKET && builder.getTokenType() !=
 						JSTokenTypes.RPAR)
@@ -184,7 +184,7 @@ private void parseAttributeBody(final PsiBuilder builder)
 
 		if (haveLParen)
 		{
-			checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen().get());
+			checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
 		}
 		else
 		{
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
index 6a323fd9..9c142476 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
@@ -338,9 +338,9 @@ private void parseDefaultNsStatement(final PsiBuilder builder)
 		{
 			builder.advanceLexer();
 
-			if (checkMatches(builder, JSTokenTypes.NAMESPACE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedNamespace().get()))
+			if (checkMatches(builder, JSTokenTypes.NAMESPACE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedNamespace()))
 			{
-				if (checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual().get()))
+				if (checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual()))
 				{
 					getExpressionParsing().parseExpression(builder);
 				}
@@ -410,7 +410,7 @@ private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @Nonnull
 		if(builder.getTokenType() == JSTokenTypes.EQ)
 		{
 			builder.advanceLexer();
-			checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral().get());
+			checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral());
 		}
 		checkForSemicolon(builder);
 		useNSStatement.done(JSElementTypes.NAMESPACE_DECLARATION);

From 0dc639bcb5c8501100ede34ff596f1cb65bb2af9 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 6 Jul 2024 17:58:21 +0300
Subject: [PATCH 189/340] Code-style fixes.

---
 .../impl/generation/JavaScriptOverrideMethodsHandler.java     | 4 ++--
 .../introduceVariable/JSIntroduceVariableHandler.java         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
index f73985a8..aa889eba 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
@@ -40,10 +40,10 @@
 public class JavaScriptOverrideMethodsHandler extends BaseJSGenerateHandler implements OverrideMethodHandler
 {
 	@Override
-  protected LocalizeValue getTitle()
+	protected LocalizeValue getTitle()
 	{
 		return JavaScriptLocalize.methodsToOverrideChooserTitle();
-  }
+	}
 
   @Override
 	protected BaseCreateMethodsFix createFix(final JSClass clazz)
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
index e7ee417d..7377bd06 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
@@ -28,7 +28,6 @@
  */
 public class JSIntroduceVariableHandler extends JSBaseIntroduceHandler<JSStatement, Settings, JSIntroduceVariableDialog>
 {
-
 	@Override
 	protected String getRefactoringName()
 	{
@@ -36,7 +35,8 @@ protected String getRefactoringName()
 	}
 
 	@Override
-	protected LocalizeValue getCannotIntroduceMessage() {
+	protected LocalizeValue getCannotIntroduceMessage()
+	{
 		return JavaScriptLocalize.javascriptIntroduceVariableErrorNoExpressionSelected();
 	}
 

From c67f064af838651e8dffbe171827423bd6504d02 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 7 Jul 2024 14:31:40 +0400
Subject: [PATCH 190/340] use new api for Unresolved Reference Provider

---
 .../javascript/psi/impl/JSAttributeImpl.java  |  6 ++-
 .../javascript/psi/impl/JSDocTagImpl.java     | 12 ++----
 .../javascript/psi/impl/JSReferenceSet.java   |  7 ++--
 .../impl/validation/JSAnnotatingVisitor.java  | 38 +++++++------------
 4 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index 963792a6..c9c210b9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -28,6 +28,7 @@
 import consulo.language.psi.PsiReference;
 import consulo.language.util.IncorrectOperationException;
 import consulo.language.psi.EmptyResolveMessageProvider;
+import consulo.localize.LocalizeValue;
 import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 
@@ -211,10 +212,11 @@ public boolean isSoft()
 			return true;
 		}
 
+		@Nonnull
 		@Override
-		public String getUnresolvedMessagePattern()
+		public LocalizeValue buildUnresolvedMessaged(@Nonnull String referenceText)
 		{
-			return "Unknown metadata tag";
+			return LocalizeValue.localizeTODO("Unknown metadata tag");
 		}
 	}
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index 40457c25..a1703c2b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -26,6 +26,7 @@
 import consulo.language.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 
@@ -325,16 +326,11 @@ public Object[] getVariants()
 			return ArrayUtil.EMPTY_OBJECT_ARRAY;
 		}
 
+		@Nonnull
 		@Override
-		public boolean isSoft()
+		public LocalizeValue buildUnresolvedMessaged(@Nonnull String referenceText)
 		{
-			return false;
-		}
-
-		@Override
-		public String getUnresolvedMessagePattern()
-		{
-			return JavaScriptLocalize.javascriptValidationMessageIncorrectParameterName().get();
+			return JavaScriptLocalize.javascriptValidationMessageIncorrectParameterName();
 		}
 	}
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index 35709537..13ace481 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -28,6 +28,7 @@
 import consulo.language.psi.resolve.ResolveCache;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.StringUtil;
@@ -548,12 +549,12 @@ private ResolveResult[] doOldResolve(PsiFile psiFile)
 			return processor.getResults();
 		}
 
+		@Nonnull
 		@Override
-		public String getUnresolvedMessagePattern()
+		public LocalizeValue buildUnresolvedMessaged(@Nonnull String text)
 		{
-			String text = getCanonicalText();
 			text = "'" + text.replace("'", "''") + "'";
-			return JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage2(text).get();
+			return JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage2(text);
 		}
 	}
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index 6c53677b..18286eee 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -24,6 +24,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.util.JSUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.codeEditor.Editor;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
@@ -32,9 +33,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.FileModificationService;
-import consulo.language.editor.annotation.Annotation;
-import consulo.language.editor.annotation.AnnotationHolder;
-import consulo.language.editor.annotation.Annotator;
+import consulo.language.editor.annotation.*;
 import consulo.language.editor.impl.intention.RenameFileFix;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.LocalQuickFixProvider;
@@ -58,7 +57,6 @@
 import org.jetbrains.annotations.NonNls;
 
 import javax.annotation.Nonnull;
-import java.text.MessageFormat;
 import java.util.*;
 
 /**
@@ -76,26 +74,21 @@ public synchronized void annotate(PsiElement psiElement, AnnotationHolder holder
 
   @Override
   public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair) {
-    checkReferences(attributeNameValuePair, ProblemKind.ERROR);
+    checkReferences(attributeNameValuePair, HighlightSeverity.ERROR);
   }
 
   @Override
   public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
-    checkReferences(includeDirective, ProblemKind.ERROR);
+    checkReferences(includeDirective, HighlightSeverity.ERROR);
   }
 
   @Override
   public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
-    checkReferences(node, ProblemKind.ERROR);
+    checkReferences(node, HighlightSeverity.ERROR);
   }
 
-  static enum ProblemKind {
-    ERROR,
-    WARNING,
-    INFO
-  }
-
-  private void checkReferences(final PsiElement includeDirective, ProblemKind kind) {
+  @RequiredReadAction
+  private void checkReferences(final PsiElement includeDirective, HighlightSeverity kind) {
     for (PsiReference ref : includeDirective.getReferences()) {
       if (!ref.isSoft() && hasBadResolve(ref)) {
         final TextRange elementRange = ref.getElement().getTextRange();
@@ -105,21 +98,18 @@ private void checkReferences(final PsiElement includeDirective, ProblemKind kind
           elementRange.getStartOffset() + textRange.getStartOffset(),
           elementRange.getStartOffset() + textRange.getEndOffset()
         );
-        final String message =
-          MessageFormat.format(((EmptyResolveMessageProvider)ref).getUnresolvedMessagePattern(), ref.getCanonicalText());
-        Annotation annotation = kind == ProblemKind.ERROR
-          ? myHolder.createErrorAnnotation(range, message)
-          : kind == ProblemKind.WARNING
-          ? myHolder.createWarningAnnotation(range, message)
-          : myHolder.createInfoAnnotation(range, message);
+        final LocalizeValue value = ((EmptyResolveMessageProvider) ref).buildUnresolvedMessaged(ref.getCanonicalText());
+        AnnotationBuilder builder = myHolder.newAnnotation(kind, value);
+        builder = builder.range(range);
 
         if (ref instanceof LocalQuickFixProvider localQuickFixProvider) {
           for (LocalQuickFix fix : localQuickFixProvider.getQuickFixes()) {
             if (fix instanceof IntentionAction intentionAction) {
-              annotation.registerFix(intentionAction, new TextRange(annotation.getStartOffset(), annotation.getEndOffset()));
+               builder = builder.withFix(intentionAction);
             }
           }
         }
+        builder.create();
       }
     }
   }
@@ -142,12 +132,12 @@ public void visitJSCallExpression(final JSCallExpression node) {
 
   @Override
   public void visitJSDocTagValue(final JSDocTagValue tagValue) {
-    checkReferences(tagValue, ProblemKind.WARNING);
+    checkReferences(tagValue, HighlightSeverity.WARNING);
   }
 
   @Override
   public void visitJSDocTag(final JSDocTag tagValue) {
-    checkReferences(tagValue, ProblemKind.WARNING);
+    checkReferences(tagValue, HighlightSeverity.WARNING);
   }
 
   @Override

From 10fd32002675a4615a0a2de8e9449d89e1e0d5eb Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 7 Jul 2024 14:45:21 +0400
Subject: [PATCH 191/340] annotation cleanup

---
 .../java/com/intellij/lang/javascript/psi/JSAttribute.java | 3 +--
 .../com/intellij/lang/javascript/psi/JSAttributeList.java  | 4 ++--
 .../intellij/lang/javascript/psi/JSAttributeListOwner.java | 2 +-
 .../lang/javascript/psi/JSAttributeNameValuePair.java      | 2 +-
 .../intellij/lang/javascript/psi/JSBinaryExpression.java   | 3 +--
 .../java/com/intellij/lang/javascript/psi/JSClass.java     | 2 +-
 .../intellij/lang/javascript/psi/JSClassExpression.java    | 2 +-
 .../lang/javascript/psi/JSDestructuringElement.java        | 4 ++--
 .../lang/javascript/psi/JSDestructuringObject.java         | 2 +-
 .../lang/javascript/psi/JSDestructuringParameter.java      | 3 +--
 .../javascript/psi/JSDestructuringShorthandedProperty.java | 3 +--
 .../java/com/intellij/lang/javascript/psi/JSDocTag.java    | 2 +-
 .../com/intellij/lang/javascript/psi/JSExpression.java     | 2 +-
 .../lang/javascript/psi/JSExpressionStatement.java         | 3 +--
 .../java/com/intellij/lang/javascript/psi/JSFunction.java  | 4 ++--
 .../intellij/lang/javascript/psi/JSFunctionExpression.java | 2 +-
 .../lang/javascript/psi/JSNamespaceDeclaration.java        | 2 +-
 .../java/com/intellij/lang/javascript/psi/JSParameter.java | 3 +--
 .../intellij/lang/javascript/psi/JSPostfixExpression.java  | 2 +-
 .../intellij/lang/javascript/psi/JSPrefixExpression.java   | 2 +-
 .../java/com/intellij/lang/javascript/psi/JSProperty.java  | 4 ++--
 .../lang/javascript/psi/JSReferenceExpression.java         | 2 +-
 .../com/intellij/lang/javascript/psi/JSReferenceList.java  | 2 +-
 .../com/intellij/lang/javascript/psi/JSTryStatement.java   | 4 ++--
 .../com/intellij/lang/javascript/psi/JSVarStatement.java   | 3 +--
 .../java/com/intellij/lang/javascript/psi/JSVariable.java  | 4 ++--
 .../com/intellij/lang/javascript/psi/JSYieldStatement.java | 2 +-
 .../javascript/psi/stubs/JSAttributeNameValuePairStub.java | 2 +-
 .../completion/JavaScriptKeywordCompletionExtender.java    | 2 +-
 .../java/consulo/javascript/index/JavaScriptIndexer.java   | 2 +-
 .../consulo/javascript/language/JavaScriptFeature.java     | 2 +-
 .../consulo/javascript/language/JavaScriptFileType.java    | 4 ++--
 .../javascript/language/JavaScriptFileTypeWithVersion.java | 4 ++--
 .../consulo/javascript/language/JavaScriptLanguage.java    | 4 ++--
 .../javascript/language/JavaScriptLanguageVersion.java     | 3 +--
 .../consulo/javascript/language/JavaScriptVersionUtil.java | 2 +-
 .../javascript/language/StandardJavaScriptVersions.java    | 4 ++--
 .../javascript/language/psi/JavaScriptPrimitiveType.java   | 5 ++---
 .../consulo/javascript/language/psi/JavaScriptType.java    | 4 ++--
 .../javascript/language/psi/JavaScriptTypeElement.java     | 3 +--
 .../language/psi/stub/JSImplementedInterfacesIndex.java    | 2 +-
 .../consulo/javascript/language/psi/stub/JSNameIndex.java  | 2 +-
 .../language/psi/stub/JSQualifiedElementIndex.java         | 3 +--
 .../javascript/language/psi/stub/JSSuperClassIndex.java    | 3 +--
 .../module/extension/JavaScriptModuleExtension.java        | 3 +--
 .../module/extension/JavaScriptMutableModuleExtension.java | 3 +--
 .../main/java/consulo/javascript/psi/JSComputedName.java   | 2 +-
 .../consulo/javascript/psi/JSSimpleLiteralExpression.java  | 3 +--
 .../impl/reference/JSPropertyNameReferenceProvider.java    | 4 ++--
 .../main/java/consulo/javascript/psi/stubs/JSFileStub.java | 2 +-
 .../javascript/documentation/JSDocumentationBuilder.java   | 7 ++++---
 .../javascript/documentation/JSDocumentationProcessor.java | 6 +++---
 .../javascript/documentation/JSDocumentationProvider.java  | 4 ++--
 .../javascript/documentation/JSDocumentationUtils.java     | 6 +++---
 .../com/intellij/lang/javascript/JSDocElementType.java     | 2 +-
 .../java/com/intellij/lang/javascript/JSElementType.java   | 3 +--
 .../java/com/intellij/lang/javascript/JSElementTypes.java  | 2 +-
 .../com/intellij/lang/javascript/JSLanguageInjector.java   | 2 +-
 .../com/intellij/lang/javascript/JSStubElementTypes.java   | 2 +-
 .../java/com/intellij/lang/javascript/JSTokenTypes.java    | 4 ++--
 .../lang/javascript/JavaScriptStubElementHolder.java       | 4 ++--
 .../lang/javascript/XmlAttributeValueJSInjector.java       | 2 +-
 .../com/intellij/lang/javascript/XmlTextJSInjector.java    | 2 +-
 .../intellij/lang/javascript/flex/FlexImportSupport.java   | 2 +-
 .../com/intellij/lang/javascript/flex/JSResolveHelper.java | 2 +-
 .../lang/javascript/flex/XmlBackedJSClassImpl.java         | 5 +++--
 .../lang/javascript/highlighting/JSHighlighter.java        | 2 +-
 .../intellij/lang/javascript/index/JSItemPresentation.java | 3 +--
 .../com/intellij/lang/javascript/index/JSSymbolUtil.java   | 2 +-
 .../javascript/inspections/qucikFixes/BaseCreateFix.java   | 4 ++--
 .../lang/javascript/psi/impl/JSArgumentListImpl.java       | 2 +-
 .../javascript/psi/impl/JSArrayLiteralExpressionImpl.java  | 2 +-
 .../javascript/psi/impl/JSAssignmentExpressionImpl.java    | 2 +-
 .../intellij/lang/javascript/psi/impl/JSAttributeImpl.java | 2 +-
 .../lang/javascript/psi/impl/JSAttributeListImpl.java      | 4 ++--
 .../javascript/psi/impl/JSAttributeNameValuePairImpl.java  | 2 +-
 .../lang/javascript/psi/impl/JSBinaryExpressionImpl.java   | 4 ++--
 .../lang/javascript/psi/impl/JSBlockStatementImpl.java     | 2 +-
 .../lang/javascript/psi/impl/JSBreakStatementImpl.java     | 3 +--
 .../lang/javascript/psi/impl/JSCallExpressionImpl.java     | 2 +-
 .../lang/javascript/psi/impl/JSCaseClauseImpl.java         | 3 +--
 .../lang/javascript/psi/impl/JSCatchBlockImpl.java         | 2 +-
 .../intellij/lang/javascript/psi/impl/JSChangeUtil.java    | 4 ++--
 .../com/intellij/lang/javascript/psi/impl/JSClassBase.java | 6 +++---
 .../lang/javascript/psi/impl/JSClassExpressionImpl.java    | 2 +-
 .../com/intellij/lang/javascript/psi/impl/JSClassImpl.java | 2 +-
 .../lang/javascript/psi/impl/JSCommaExpressionImpl.java    | 3 +--
 .../javascript/psi/impl/JSConditionalExpressionImpl.java   | 2 +-
 .../lang/javascript/psi/impl/JSContinueStatementImpl.java  | 2 +-
 .../javascript/psi/impl/JSDefinitionExpressionImpl.java    | 4 ++--
 .../lang/javascript/psi/impl/JSDoWhileStatementImpl.java   | 3 +--
 .../lang/javascript/psi/impl/JSDocCommentImpl.java         | 3 +--
 .../intellij/lang/javascript/psi/impl/JSDocTagImpl.java    | 3 +--
 .../lang/javascript/psi/impl/JSDocTagValueImpl.java        | 2 +-
 .../lang/javascript/psi/impl/JSEmbeddedContentImpl.java    | 2 +-
 .../lang/javascript/psi/impl/JSEmptyStatementImpl.java     | 3 +--
 .../javascript/psi/impl/JSExpressionCodeFragmentImpl.java  | 2 +-
 .../lang/javascript/psi/impl/JSExpressionImpl.java         | 3 +--
 .../javascript/psi/impl/JSExpressionStatementImpl.java     | 2 +-
 .../com/intellij/lang/javascript/psi/impl/JSFileImpl.java  | 6 +++---
 .../lang/javascript/psi/impl/JSForInStatementImpl.java     | 2 +-
 .../lang/javascript/psi/impl/JSForStatementImpl.java       | 4 ++--
 .../lang/javascript/psi/impl/JSFunctionBaseImpl.java       | 4 ++--
 .../lang/javascript/psi/impl/JSFunctionExpressionImpl.java | 2 +-
 .../intellij/lang/javascript/psi/impl/JSFunctionImpl.java  | 2 +-
 .../lang/javascript/psi/impl/JSFunctionPropertyImpl.java   | 4 ++--
 .../lang/javascript/psi/impl/JSGenericSignatureImpl.java   | 2 +-
 .../lang/javascript/psi/impl/JSIfStatementImpl.java        | 3 +--
 .../lang/javascript/psi/impl/JSImportStatementImpl.java    | 2 +-
 .../lang/javascript/psi/impl/JSIncludeDirectiveImpl.java   | 2 +-
 .../psi/impl/JSIndexedPropertyAccessExpressionImpl.java    | 3 +--
 .../lang/javascript/psi/impl/JSLabeledStatementImpl.java   | 2 +-
 .../lang/javascript/psi/impl/JSLetExpressionImpl.java      | 3 +--
 .../lang/javascript/psi/impl/JSLetStatementImpl.java       | 2 +-
 .../lang/javascript/psi/impl/JSLiteralExpressionImpl.java  | 3 +--
 .../javascript/psi/impl/JSNamespaceDeclarationImpl.java    | 2 +-
 .../lang/javascript/psi/impl/JSNewExpressionImpl.java      | 2 +-
 .../javascript/psi/impl/JSObjectLiteralExpressionImpl.java | 2 +-
 .../lang/javascript/psi/impl/JSPackageStatementImpl.java   | 2 +-
 .../intellij/lang/javascript/psi/impl/JSParameterImpl.java | 4 ++--
 .../lang/javascript/psi/impl/JSParameterListImpl.java      | 2 +-
 .../javascript/psi/impl/JSParenthesizedExpressionImpl.java | 3 +--
 .../lang/javascript/psi/impl/JSPostfixExpressionImpl.java  | 2 +-
 .../lang/javascript/psi/impl/JSPrefixExpressionImpl.java   | 4 ++--
 .../intellij/lang/javascript/psi/impl/JSPropertyImpl.java  | 4 ++--
 .../intellij/lang/javascript/psi/impl/JSPsiImplUtils.java  | 4 ++--
 .../javascript/psi/impl/JSReferenceExpressionImpl.java     | 4 ++--
 .../lang/javascript/psi/impl/JSReferenceListImpl.java      | 2 +-
 .../intellij/lang/javascript/psi/impl/JSReferenceSet.java  | 4 ++--
 .../lang/javascript/psi/impl/JSReturnStatementImpl.java    | 3 +--
 .../psi/impl/JSSmartCompletionVariantsHandler.java         | 2 +-
 .../psi/impl/JSStatementWithLabelReferenceImpl.java        | 5 +++--
 .../lang/javascript/psi/impl/JSStubElementImpl.java        | 3 +--
 .../lang/javascript/psi/impl/JSSuperExpressionImpl.java    | 4 ++--
 .../lang/javascript/psi/impl/JSSwitchStatementImpl.java    | 3 +--
 .../lang/javascript/psi/impl/JSThisExpressionImpl.java     | 2 +-
 .../lang/javascript/psi/impl/JSThrowStatementImpl.java     | 3 +--
 .../lang/javascript/psi/impl/JSTryStatementImpl.java       | 4 ++--
 .../javascript/psi/impl/JSUseNamespaceDirectiveImpl.java   | 2 +-
 .../lang/javascript/psi/impl/JSVarStatementImpl.java       | 6 +++---
 .../lang/javascript/psi/impl/JSVariableBaseImpl.java       | 2 +-
 .../intellij/lang/javascript/psi/impl/JSVariableImpl.java  | 3 +--
 .../lang/javascript/psi/impl/JSWhileStatementImpl.java     | 2 +-
 .../lang/javascript/psi/impl/JSWithStatementImpl.java      | 3 +--
 .../javascript/psi/impl/JSXmlLiteralExpressionImpl.java    | 4 ++--
 .../lang/javascript/psi/impl/JSYieldStatementImpl.java     | 2 +-
 .../psi/impl/reference/JSPropertyNameReference.java        | 4 ++--
 .../lang/javascript/psi/resolve/BaseJSSymbolProcessor.java | 2 +-
 .../lang/javascript/psi/resolve/JSImportHandlingUtil.java  | 4 ++--
 .../lang/javascript/psi/resolve/JSResolveUtil.java         | 4 ++--
 .../lang/javascript/psi/resolve/ResolveProcessor.java      | 5 +++--
 .../javascript/psi/resolve/WalkUpResolveProcessor.java     | 2 +-
 .../intellij/lang/javascript/psi/util/JSLookupUtil.java    | 4 ++--
 .../com/intellij/lang/javascript/search/JSClassSearch.java | 2 +-
 .../lang/javascript/types/JSAttributeElementType.java      | 2 +-
 .../lang/javascript/types/JSAttributeListElementType.java  | 2 +-
 .../javascript/types/JSAttributeNameValuePairType.java     | 2 +-
 .../intellij/lang/javascript/types/JSClassElementType.java | 2 +-
 .../intellij/lang/javascript/types/JSFileElementType.java  | 2 +-
 .../lang/javascript/types/JSFunctionElementType.java       | 2 +-
 .../javascript/types/JSImportStatementElementType.java     | 2 +-
 .../javascript/types/JSIncludeDirectiveElementType.java    | 2 +-
 .../types/JSNamespaceDeclarationElementType.java           | 3 +--
 .../javascript/types/JSPackageStatementElementType.java    | 2 +-
 .../lang/javascript/types/JSParameterElementType.java      | 2 +-
 .../lang/javascript/types/JSParameterListElementType.java  | 2 +-
 .../lang/javascript/types/JSReferenceListElementType.java  | 2 +-
 .../lang/javascript/types/JSUseNamespaceDirectiveType.java | 2 +-
 .../lang/javascript/types/JSVarStatementElementType.java   | 2 +-
 .../lang/javascript/types/JSVariableElementType.java       | 2 +-
 .../lang/javascript/validation/JSUnusedImportsHelper.java  | 4 ++--
 .../ide/codeInsight/JavaScriptQuickFixFactory.java         | 2 +-
 .../javascript/ide/hightlight/JavaScriptHighlighter.java   | 2 +-
 .../ide/hightlight/JavaScriptSyntaxHighlightFactory.java   | 2 +-
 .../javascript/impl/language/JavaScriptQuoteHandler.java   | 3 +--
 .../javascript/impl/language/psi/JSComputedNameImpl.java   | 4 ++--
 .../javascript/impl/language/psi/JSElementFactory.java     | 3 +--
 .../javascript/impl/language/psi/JSStubElementType.java    | 2 +-
 .../impl/language/psi/JavaScriptLambdaExpressionImpl.java  | 5 ++---
 .../impl/language/psi/JavaScriptSpreadExpressionImpl.java  | 2 +-
 .../javascript/impl/language/psi/stub/JSFileStubImpl.java  | 4 ++--
 .../impl/language/psi/stub/JavaScriptClassNameIndex.java   | 2 +-
 .../inspections/qucikFixes/CreateJSFunctionFixBase.java    | 2 +-
 .../javascript/lang/BaseJavaScriptLanguageVersion.java     | 2 +-
 .../javascript/lang/JavaScript15LanguageVersion.java       | 2 +-
 .../lang/JavaScriptContextKeywordElementType.java          | 4 ++--
 .../javascript/lang/StandardJavaScriptVersionsImpl.java    | 4 ++--
 .../consulo/javascript/lang/parsing/ExpressionParsing.java | 2 +-
 .../consulo/javascript/lang/parsing/FunctionParsing.java   | 5 ++---
 .../java/consulo/javascript/lang/parsing/JSXParser.java    | 4 ++--
 .../consulo/javascript/lang/parsing/JavaScriptParser.java  | 2 +-
 .../javascript/lang/parsing/JavaScriptParsingContext.java  | 3 +--
 .../main/java/consulo/javascript/lang/parsing/Parsing.java | 4 ++--
 .../consulo/javascript/lang/parsing/StatementParsing.java  | 2 +-
 .../parsing/impl/JavaSciptDestructuringElementImpl.java    | 4 ++--
 .../parsing/impl/JavaSciptDestructuringObjectImpl.java     | 2 +-
 .../parsing/impl/JavaScriptDestructuringParameterImpl.java | 4 ++--
 .../JavaScriptDestructuringShorthandedPropertyImpl.java    | 2 +-
 .../lang/parsing/impl/JavaScriptStrictParserBuilder.java   | 2 +-
 .../javascript/lang/psi/impl/JavaScriptClassType.java      | 4 ++--
 .../lang/psi/impl/resolve/JavaScriptVersionWithHelper.java | 2 +-
 .../javascript/lang/psi/impl/resolve/ResolveHelper.java    | 4 ++--
 .../lang/viewProvider/JSFileViewProviderFactory.java       | 2 +-
 .../javascript/types/JSQualifiedStubElementType.java       | 3 +--
 .../javascript/debugger/JSDebuggerSupportUtils.java        | 4 ++--
 .../javascript/debugger/JavaScriptEditorsProvider.java     | 4 ++--
 .../javascript/debugger/JavaScriptLineBreakpointType.java  | 4 ++--
 .../debugger/JavaScriptLineBreakpointTypeResolver.java     | 4 ++--
 .../consulo/javascript/debugger/JavaScriptListPanel.java   | 5 +++--
 .../javascript/run/debug/v8/V8BaseDebugProcess.java        | 5 +++--
 .../javascript/run/debug/v8/V8BaseVariableValue.java       | 4 ++--
 .../consulo/javascript/run/debug/v8/V8DebugProcess.java    | 2 +-
 .../consulo/javascript/run/debug/v8/V8ExecutionStack.java  | 2 +-
 .../java/consulo/javascript/run/debug/v8/V8ScriptUtil.java | 2 +-
 .../java/consulo/javascript/run/debug/v8/V8StackFrame.java | 4 ++--
 .../consulo/javascript/run/debug/v8/V8SuspendContext.java  | 2 +-
 .../consulo/javascript/run/debug/v8/V8VariableValue.java   | 4 ++--
 .../java/consulo/javascript/run/debug/v8/V8WatchValue.java | 2 +-
 .../src/main/java/com/sixrr/inspectjs/BaseInspection.java  | 4 ++--
 .../java/com/sixrr/inspectjs/BaseInspectionVisitor.java    | 4 ++--
 .../src/main/java/com/sixrr/inspectjs/InspectionJSFix.java | 2 +-
 .../assignment/AssignmentResultUsedJSInspection.java       | 5 ++---
 .../AssignmentToForLoopParameterJSInspection.java          | 3 +--
 .../AssignmentToFunctionParameterJSInspection.java         | 4 ++--
 .../inspectjs/assignment/NestedAssignmentJSInspection.java | 2 +-
 ...eplaceAssignmentWithOperatorAssignmentJSInspection.java | 3 +--
 .../inspectjs/assignment/SillyAssignmentJSInspection.java  | 2 +-
 .../inspectjs/bitwise/IncompatibleMaskJSInspection.java    | 2 +-
 .../bitwise/PointlessBitwiseExpressionJSInspection.java    | 2 +-
 .../PointlessBitwiseExpressionJSInspectionState.java       | 2 +-
 .../inspectjs/bitwise/ShiftOutOfRangeJSInspection.java     | 2 +-
 .../com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java | 2 +-
 .../bugs/EqualityComparisonWithCoercionJSInspection.java   | 2 +-
 .../com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java | 2 +-
 .../inspectjs/bugs/InfiniteRecursionJSInspection.java      | 2 +-
 .../bugs/NonShortCircuitBooleanExpressionJSInspection.java | 4 ++--
 .../bugs/ObjectAllocationIgnoredJSInspection.java          | 2 +-
 .../main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java | 2 +-
 .../java/com/sixrr/inspectjs/bugs/RecursionVisitor.java    | 2 +-
 .../bugs/TextLabelInSwitchStatementJSInspection.java       | 2 +-
 .../inspectjs/confusing/AnonymousFunctionJSInspection.java | 4 ++--
 .../inspectjs/confusing/BlockStatementJSInspection.java    | 4 ++--
 .../com/sixrr/inspectjs/confusing/CallerJSInspection.java  | 4 ++--
 .../inspectjs/confusing/CommaExpressionJSInspection.java   | 4 ++--
 .../confusing/ConditionalExpressionJSInspection.java       | 4 ++--
 .../ConfusingFloatingPointLiteralJSInspection.java         | 2 +-
 .../confusing/ConfusingPlusesOrMinusesJSInspection.java    | 4 ++--
 .../confusing/DynamicallyGeneratedCodeJSInspection.java    | 4 ++--
 .../confusing/EmptyStatementBodyJSInspection.java          | 2 +-
 .../confusing/EmptyStatementBodyJSInspectionState.java     | 2 +-
 .../IncrementDecrementResultUsedJSInspection.java          | 4 ++--
 .../sixrr/inspectjs/confusing/MagicNumberJSInspection.java | 2 +-
 .../NegatedConditionalExpressionJSInspection.java          | 4 ++--
 .../confusing/NegatedIfStatementJSInspection.java          | 4 ++--
 .../confusing/NestedConditionalExpressionJSInspection.java | 5 ++---
 .../inspectjs/confusing/NestedFunctionJSInspection.java    | 4 ++--
 .../confusing/NestedFunctionJSInspectionState.java         | 3 +--
 .../inspectjs/confusing/OctalIntegerJSInspection.java      | 4 ++--
 .../OverlyComplexArithmeticExpressionJSInspection.java     | 2 +-
 ...OverlyComplexArithmeticExpressionJSInspectionState.java | 2 +-
 .../OverlyComplexBooleanExpressionJSInspection.java        | 2 +-
 .../OverlyComplexBooleanExpressionJSInspectionState.java   | 2 +-
 .../PointlessArithmeticExpressionJSInspection.java         | 2 +-
 .../confusing/PointlessBooleanExpressionJSInspection.java  | 4 ++--
 .../inspectjs/confusing/VoidExpressionJSInspection.java    | 4 ++--
 .../inspectjs/confusing/WithStatementJSInspection.java     | 4 ++--
 .../inspectjs/control/BreakStatementJSInspection.java      | 4 ++--
 .../control/BreakStatementWithLabelJSInspection.java       | 4 ++--
 ...itionalExpressionWithIdenticalBranchesJSInspection.java | 3 +--
 .../control/ConstantConditionalExpressionJSInspection.java | 3 +--
 .../inspectjs/control/ConstantIfStatementJSInspection.java | 2 +-
 .../inspectjs/control/ContinueStatementJSInspection.java   | 4 ++--
 .../control/ContinueStatementWithLabelJSInspection.java    | 4 ++--
 .../control/DefaultNotLastCaseInSwitchJSInspection.java    | 3 +--
 .../inspectjs/control/DuplicateConditionJSInspection.java  | 3 +--
 .../control/FallthroughInSwitchStatementJSInspection.java  | 4 ++--
 .../control/ForLoopReplaceableByWhileJSInspection.java     | 2 +-
 .../ForLoopReplaceableByWhileJSInspectionState.java        | 3 +--
 .../ForLoopThatDoesntUseLoopVariableJSInspection.java      | 2 +-
 .../IfStatementWithIdenticalBranchesJSInspection.java      | 2 +-
 .../IfStatementWithTooManyBranchesJSInspection.java        | 2 +-
 .../IfStatementWithTooManyBranchesJSInspectionState.java   | 3 +--
 .../inspectjs/control/LabeledStatementJSInspection.java    | 4 ++--
 .../control/LoopStatementThatDoesntLoopJSInspection.java   | 2 +-
 .../control/NestedSwitchStatementJSInspection.java         | 5 ++---
 .../SwitchStatementWithNoDefaultBranchJSInspection.java    | 4 ++--
 .../sixrr/inspectjs/control/TailRecursionJSInspection.java | 2 +-
 .../inspectjs/control/TrivialConditionalJSInspection.java  | 3 +--
 .../com/sixrr/inspectjs/control/TrivialIfJSInspection.java | 2 +-
 .../inspectjs/control/UnnecessaryContinueJSInspection.java | 3 +--
 .../inspectjs/control/UnnecessaryLabelJSInspection.java    | 2 +-
 .../UnnecessaryLabelOnBreakStatementJSInspection.java      | 4 ++--
 .../UnnecessaryLabelOnContinueStatementJSInspection.java   | 4 ++--
 .../inspectjs/control/UnnecessaryReturnJSInspection.java   | 3 +--
 .../dataflow/ReuseOfLocalVariableJSInspection.java         | 4 ++--
 .../dataflow/UnnecessaryLocalVariableJSInspection.java     | 2 +-
 .../UnnecessaryLocalVariableJSInspectionState.java         | 2 +-
 .../sixrr/inspectjs/dataflow/VariableAssignedVisitor.java  | 2 +-
 .../dataflow/VariableUsedInInnerFunctionVisitor.java       | 3 +--
 .../com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java  | 2 +-
 .../com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java | 4 ++--
 .../com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java     | 4 ++--
 .../sixrr/inspectjs/dom/PlatformDetectionJSInspection.java | 4 ++--
 .../inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java  | 4 ++--
 .../inspectjs/exception/CatchParameterUsedVisitor.java     | 2 +-
 .../ContinueOrBreakFromFinallyBlockJSInspection.java       | 3 +--
 .../inspectjs/exception/EmptyCatchBlockJSInspection.java   | 5 ++---
 .../inspectjs/exception/EmptyFinallyBlockJSInspection.java | 4 ++--
 .../inspectjs/exception/EmptyTryBlockJSInspection.java     | 4 ++--
 .../exception/ExceptionCaughtLocallyJSInspection.java      | 2 +-
 .../exception/ReturnFromFinallyBlockJSInspection.java      | 2 +-
 .../exception/ThrowFromFinallyBlockJSInspection.java       | 2 +-
 .../exception/UnusedCatchParameterJSInspection.java        | 2 +-
 .../exception/UnusedCatchParameterJSInspectionState.java   | 2 +-
 .../src/main/java/com/sixrr/inspectjs/fix/RenameFix.java   | 2 +-
 .../functionmetrics/CyclomaticComplexityJSInspection.java  | 2 +-
 .../functionmetrics/CyclomaticComplexityVisitor.java       | 3 +--
 .../FunctionWithMultipleLoopsJSInspection.java             | 2 +-
 .../FunctionWithMultipleReturnPointsJSInspection.java      | 2 +-
 .../sixrr/inspectjs/functionmetrics/LoopCountVisitor.java  | 2 +-
 .../inspectjs/functionmetrics/NegationCountVisitor.java    | 2 +-
 .../functionmetrics/NestingDepthJSInspection.java          | 2 +-
 .../inspectjs/functionmetrics/NestingDepthVisitor.java     | 2 +-
 .../functionmetrics/ParametersPerFunctionJSInspection.java | 2 +-
 .../inspectjs/functionmetrics/StatementCountVisitor.java   | 2 +-
 .../functionmetrics/StatementsPerFunctionJSInspection.java | 2 +-
 .../ThreeNegationsPerFunctionJSInspection.java             | 2 +-
 .../sixrr/inspectjs/naming/ConventionInspectionState.java  | 2 +-
 .../naming/FunctionNamingConventionJSInspection.java       | 2 +-
 .../naming/FunctionNamingConventionJSInspectionState.java  | 3 ---
 .../naming/LocalVariableNamingConventionJSInspection.java  | 2 +-
 .../naming/ParameterNamingConventionJSInspection.java      | 2 +-
 .../sixrr/inspectjs/style/ChainedEqualityJSInspection.java | 2 +-
 .../inspectjs/style/ChainedFunctionCallJSInspection.java   | 3 +--
 .../style/ConstantOnLHSOfComparisonJSInspection.java       | 2 +-
 .../style/ConstantOnRHSOfComparisonJSInspection.java       | 2 +-
 .../inspectjs/style/NestedFunctionCallJSInspection.java    | 2 +-
 .../inspectjs/style/NonBlockStatementBodyJSInspection.java | 2 +-
 .../inspectjs/style/UnterminatedStatementJSInspection.java | 4 ++--
 .../src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java | 4 ++--
 .../java/com/sixrr/inspectjs/utils/ComparisonUtils.java    | 4 ++--
 .../java/com/sixrr/inspectjs/utils/ControlFlowUtils.java   | 4 ++--
 .../java/com/sixrr/inspectjs/utils/EquivalenceChecker.java | 4 ++--
 .../java/com/sixrr/inspectjs/utils/ExpressionUtil.java     | 3 +--
 .../java/com/sixrr/inspectjs/utils/SideEffectChecker.java  | 2 +-
 .../validity/BadExpressionStatementJSInspection.java       | 5 ++---
 .../inspectjs/validity/DebuggerStatementJSInspection.java  | 4 ++--
 .../inspectjs/validity/DuplicateCaseLabelJSInspection.java | 2 +-
 .../validity/DuplicatePropertyOnObjectJSInspection.java    | 2 +-
 .../FunctionWithInconsistentReturnsJSInspection.java       | 4 ++--
 .../validity/StringLiteralBreaksHTMLJSInspection.java      | 4 ++--
 .../ThisExpressionReferencesGlobalObjectJSInspection.java  | 4 ++--
 .../inspectjs/validity/UnreachableCodeJSInspection.java    | 4 ++--
 .../idea/lang/javascript/intention/JSElementPredicate.java | 2 +-
 .../idea/lang/javascript/intention/JSIntention.java        | 4 ++--
 .../lang/javascript/intention/JSMutablyNamedIntention.java | 4 ++--
 .../javascript/intention/bool/ComparisonPredicate.java     | 2 +-
 .../javascript/intention/bool/ConjunctionPredicate.java    | 3 +--
 .../javascript/intention/bool/JSDeMorgansLawIntention.java | 2 +-
 .../intention/bool/JSFlipComparisonIntention.java          | 3 +--
 .../intention/bool/JSFlipConjunctionIntention.java         | 3 +--
 .../intention/bool/JSNegateComparisonIntention.java        | 3 +--
 .../intention/bool/JSRemoveBooleanEqualityIntention.java   | 2 +-
 .../javascript/intention/braces/JSAddBracesIntention.java  | 2 +-
 .../intention/braces/JSRemoveBracesIntention.java          | 2 +-
 .../comment/JSChangeToCStyleCommentIntention.java          | 2 +-
 .../comment/JSChangeToEndOfLineCommentIntention.java       | 2 +-
 .../comment/JSMoveCommentToSeparateLineIntention.java      | 3 +--
 .../intention/conditional/JSFlipConditionalIntention.java  | 2 +-
 .../intention/conditional/JSFlipIfIntention.java           | 2 +-
 .../conditional/JSRemoveConditionalIntention.java          | 2 +-
 .../conditional/JSReplaceConditionalWithIfIntention.java   | 2 +-
 .../intention/constant/JSConstantExpressionIntention.java  | 3 +--
 .../constant/JSConstantSubexpressionIntention.java         | 4 ++--
 .../intention/increment/JSExtractIncrementIntention.java   | 2 +-
 .../JSMergeDeclarationAndInitializationIntention.java      | 2 +-
 .../JSSplitDeclarationAndInitializationIntention.java      | 2 +-
 .../intention/loop/JSMergeParallelForInLoopsIntention.java | 2 +-
 .../intention/loop/JSMergeParallelForLoopsIntention.java   | 2 +-
 .../number/JSConvertIntegerToDecimalIntention.java         | 2 +-
 .../intention/number/JSConvertIntegerToHexIntention.java   | 2 +-
 .../intention/number/JSConvertIntegerToOctalIntention.java | 2 +-
 .../number/JSReplaceMultiplyWithShiftIntention.java        | 2 +-
 .../number/JSReplaceShiftWithMultiplyIntention.java        | 3 +--
 .../opassign/JSReplaceWithOperatorAssignmentIntention.java | 3 +--
 .../JSRemoveUnnecessaryParenthesesIntention.java           | 2 +-
 .../string/JSDoubleToSingleQuotedStringIntention.java      | 2 +-
 .../string/JSJoinConcatenatedStringLiteralsIntention.java  | 3 +--
 .../string/JSSingleToDoubleQuotedStringIntention.java      | 2 +-
 .../switchtoif/JSReplaceIfWithSwitchIntention.java         | 2 +-
 .../switchtoif/JSReplaceSwitchWithIfIntention.java         | 2 +-
 .../intention/trivialif/JSMergeElseIfIntention.java        | 2 +-
 .../intention/trivialif/JSMergeIfAndIntention.java         | 2 +-
 .../intention/trivialif/JSMergeIfOrIntention.java          | 2 +-
 .../intention/trivialif/JSMergeParallelIfsIntention.java   | 2 +-
 .../trivialif/JSRemoveRedundantElseIntention.java          | 3 +--
 .../trivialif/JSReplaceIfWithConditionalIntention.java     | 3 +--
 .../intention/trivialif/JSSimplifyIfElseIntention.java     | 2 +-
 .../intention/trivialif/JSSplitElseIfIntention.java        | 2 +-
 .../intention/trivialif/JSSplitIfAndIntention.java         | 3 +--
 .../intention/trivialif/JSSplitIfOrIntention.java          | 2 +-
 .../intellij/idea/lang/javascript/psiutil/BoolUtils.java   | 3 +--
 .../idea/lang/javascript/psiutil/ControlFlowUtils.java     | 4 ++--
 .../intellij/idea/lang/javascript/psiutil/ErrorUtil.java   | 3 +--
 .../idea/lang/javascript/psiutil/ExpressionUtil.java       | 4 ++--
 .../idea/lang/javascript/psiutil/FindReferenceUtil.java    | 4 ++--
 .../idea/lang/javascript/psiutil/JSElementFactory.java     | 2 +-
 .../idea/lang/javascript/psiutil/RecursionUtil.java        | 3 +--
 .../intellij/idea/lang/javascript/psiutil/TreeUtil.java    | 4 ++--
 .../idea/lang/javascript/psiutil/VariableAccessUtil.java   | 2 +-
 .../java/consulo/actionscript/ActionScriptFileType.java    | 4 ++--
 .../consulo/actionscript/ActionScriptFileTypeFactory.java  | 3 +--
 .../actionscript/lang/ActionScriptLanguageVersion.java     | 2 +-
 .../ecmascript/codeInsight/EcmaScript6QuickFixFactory.java | 3 +--
 .../completion/EcmaScript6KeywordCompletionExtender.java   | 3 +--
 .../ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java   | 2 +-
 .../ecmascript/lang/EcmaScript10JavaScriptVersion.java     | 2 +-
 .../ecmascript/lang/EcmaScript11JavaScriptVersion.java     | 3 +--
 .../ecmascript/lang/EcmaScript12JavaScriptVersion.java     | 2 +-
 .../ecmascript/lang/EcmaScript6JavaScriptVersion.java      | 2 +-
 .../ecmascript/lang/EcmaScript7JavaScriptVersion.java      | 2 +-
 .../ecmascript/lang/EcmaScript8JavaScriptVersion.java      | 3 +--
 .../ecmascript/lang/EcmaScript9JavaScriptVersion.java      | 3 +--
 .../javascript/ecmascript/lang/EcmaScriptFileType.java     | 4 ++--
 .../ecmascript/lang/EcmaScriptFileTypeFactory.java         | 2 +-
 .../ecmascript/lang/parsing/EcmaScriptParser.java          | 2 +-
 .../ecmascript/lang/parsing/EcmaScriptParsingContext.java  | 2 +-
 .../lang/parsing/EcmaScriptStatementParsing.java           | 2 +-
 .../javascript/ecmascript/psi/ES6ImportedBinding.java      | 3 +--
 .../consulo/javascript/ecmascript/psi/ES6NamedImports.java | 2 +-
 .../psi/impl/ES6ExportDefaultAssignmentImpl.java           | 4 ++--
 .../ecmascript/psi/impl/ES6ImportDeclarationImpl.java      | 2 +-
 .../ecmascript/psi/impl/ES6ImportSpecifierImpl.java        | 4 ++--
 .../ecmascript/psi/impl/ES6ImportedBindingImpl.java        | 4 ++--
 .../ecmascript/psi/impl/ES6NamedImportsImpl.java           | 2 +-
 .../psi/impl/resolve/EcmaScript6ResolveHelper.java         | 4 ++--
 .../jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java | 2 +-
 .../jsx/fileTemplate/JSXCreateFromTemplateHandler.java     | 3 +--
 .../java/consulo/javascript/jsx/language/JSXFileType.java  | 4 ++--
 .../javascript/jsx/language/JSXFileTypeFactory.java        | 2 +-
 .../javascript/jsx/language/JSXJavaScriptVersion.java      | 3 +--
 .../jsx/language/psi/impl/JSXmlTagReference.java           | 4 ++--
 .../language/psi/impl/JSXmlTagReferenceContributor.java    | 2 +-
 .../ecmascript4/lang/EcmaScript4JavaScriptVersion.java     | 3 +--
 .../ecmascript4/lang/parsing/EcmaScript4Parser.java        | 2 +-
 .../lang/parsing/EcmaScript4ParsingContext.java            | 3 +--
 .../lang/parsing/EcmaScript4StatementParsing.java          | 2 +-
 .../javascript16/lang/JavaScript16LanguageVersion.java     | 2 +-
 .../javascript17/lang/JavaScript17LanguageVersion.java     | 2 +-
 .../javascript18/lang/JavaScript185LanguageVersion.java    | 2 +-
 .../javascript18/lang/JavaScript18LanguageVersion.java     | 2 +-
 .../src/main/java/consulo/json/JsonFileType.java           | 4 ++--
 .../src/main/java/consulo/json/JsonFileTypeFactory.java    | 3 +--
 .../src/main/java/consulo/json/jom/JomFileDescriptor.java  | 2 +-
 .../src/main/java/consulo/json/jom/JomFileElement.java     | 2 +-
 .../java/consulo/json/jom/JomIconDescriptorUpdater.java    | 3 +--
 .../src/main/java/consulo/json/jom/JomManager.java         | 4 ++--
 .../json/jom/JomModeAsJsonFileDescriptorProvider.java      | 4 ++--
 .../src/main/java/consulo/json/jom/JomUtil.java            | 4 ++--
 .../consulo/json/jom/proxy/JomProxyInvocationHandler.java  | 4 ++--
 .../java/consulo/json/jom/proxy/JomValueConverter.java     | 4 ++--
 .../java/consulo/json/jom/proxy/impl/JomBooleanValue.java  | 4 ++--
 .../consulo/json/jom/proxy/impl/JomCollectionValue.java    | 2 +-
 .../java/consulo/json/jom/proxy/impl/JomMapConverter.java  | 2 +-
 .../json/jom/proxy/impl/JomNullableNumberValue.java        | 2 +-
 .../consulo/json/jom/proxy/impl/JomStringConverter.java    | 2 +-
 .../main/java/consulo/json/lang/JsonJavaScriptParser.java  | 2 +-
 .../main/java/consulo/json/lang/JsonJavaScriptVersion.java | 5 +++--
 .../src/main/java/consulo/json/lang/JsonQuoteHandler.java  | 2 +-
 .../json/validation/JsonFileDescriptorProvider.java        | 2 +-
 .../json/validation/JsonFileDescriptorProviders.java       | 3 +--
 .../src/main/java/consulo/json/validation/NativeArray.java | 2 +-
 .../validation/completion/JsonCompletionContributor.java   | 2 +-
 .../DescriptionByAnotherPsiElementEditorNotification.java  | 4 ++--
 ...criptionByAnotherPsiElementJsonDescriptionProvider.java | 2 +-
 .../DescriptionByAnotherPsiElementProvider.java            | 4 ++--
 .../DescriptionByAnotherPsiElementRegistrar.java           | 2 +-
 .../DescriptionByAnotherPsiElementService.java             | 4 ++--
 .../json/validation/descriptor/JsonObjectDescriptor.java   | 7 ++-----
 .../json/validation/descriptor/JsonPropertyDescriptor.java | 4 ++--
 .../inspections/PropertyValidationInspection.java          | 4 ++--
 .../psi/reference/JsonPropertyNameReference.java           | 3 +--
 .../psi/reference/JsonPropertyNameReferenceProvider.java   | 5 ++---
 .../main/java/consulo/typescript/TypeScriptFileType.java   | 4 ++--
 .../java/consulo/typescript/TypeScriptFileTypeFactory.java | 3 +--
 .../typescript/version/TypeScriptLanguageVersion.java      | 2 +-
 .../java/com/intellij/javascript/JSClassNameMacro.java     | 2 +-
 .../javascript/JSImplementationTextSelectioner.java        | 2 +-
 .../java/com/intellij/javascript/JSMethodNameMacro.java    | 2 +-
 .../com/intellij/javascript/JSParameterInfoHandler.java    | 4 ++--
 .../manipulators/JSAttributeNameValuePairManipulator.java  | 2 +-
 .../javascript/manipulators/JSDocTagManipulator.java       | 3 +--
 .../manipulators/JSIncludeDirectiveManipulator.java        | 2 +-
 .../lang/javascript/impl/JSSmartEnterProcessor.java        | 2 +-
 .../lang/javascript/impl/JavaScriptCodeContextType.java    | 3 +--
 .../javascript/impl/JavaScriptTargetElementUtilEx.java     | 3 +--
 .../intellij/lang/javascript/impl/JavascriptCommenter.java | 4 ++--
 .../impl/findUsages/JavaScriptClassGroupRuleProvider.java  | 3 +--
 .../impl/findUsages/JavaScriptFindUsagesProvider.java      | 2 +-
 .../findUsages/JavaScriptFunctionGroupRuleProvider.java    | 3 +--
 .../impl/findUsages/JavaScriptGroupRuleProviderBase.java   | 5 ++---
 .../flex/AddImportECMAScriptClassOrFunctionAction.java     | 2 +-
 .../javascript/impl/flex/ECMAScriptImportOptimizer.java    | 2 +-
 .../intellij/lang/javascript/impl/flex/ImportUtils.java    | 4 ++--
 .../javascript/impl/flex/importer/AS3InterfaceDumper.java  | 4 ++--
 .../impl/flex/importer/AS3InterfaceStubDumper.java         | 4 ++--
 .../intellij/lang/javascript/impl/flex/importer/Abc.java   | 2 +-
 .../lang/javascript/impl/flex/importer/AbcDumper.java      | 4 ++--
 .../impl/flex/importer/AbstractDumpProcessor.java          | 3 +--
 .../lang/javascript/impl/flex/importer/ByteBuffer.java     | 2 +-
 .../flex/importer/FlexByteCodeInformationProcessor.java    | 4 ++--
 .../lang/javascript/impl/flex/importer/FlexImporter.java   | 3 +--
 .../lang/javascript/impl/flex/importer/MemberInfo.java     | 2 +-
 .../javascript/impl/folding/JavaScriptFoldingBuilder.java  | 2 +-
 .../lang/javascript/impl/formatter/JSCodeStylePanel.java   | 2 +-
 .../impl/formatter/JSCodeStyleSettingsProvider.java        | 5 ++---
 .../lang/javascript/impl/formatter/JSFormattingModel.java  | 3 +--
 .../impl/formatter/JavascriptFormattingModelBuilder.java   | 2 +-
 .../lang/javascript/impl/formatter/blocks/JSBlock.java     | 4 ++--
 .../impl/formatter/blocks/JSDocCommentBlock.java           | 4 ++--
 .../javascript/impl/formatter/blocks/SubBlockVisitor.java  | 2 +-
 .../javascript/impl/generation/BaseJSGenerateAction.java   | 3 +--
 .../javascript/impl/generation/BaseJSGenerateHandler.java  | 2 +-
 .../impl/generation/JavaScriptGenerateAccessorHandler.java | 2 +-
 .../lang/javascript/impl/highlighting/JSBraceMatcher.java  | 4 ++--
 .../impl/highlighting/JavaScriptColorsAndFontsPage.java    | 2 +-
 .../impl/highlighting/JavaScriptHighlightVisitor.java      | 4 ++--
 .../highlighting/JavaScriptHighlightVisitorFactory.java    | 2 +-
 .../impl/highlighting/JavaScriptLineMarkerProvider.java    | 4 ++--
 .../impl/inspections/CreateClassOrInterfaceAction.java     | 2 +-
 .../impl/inspections/JSDeprecatedSymbolsInspection.java    | 2 +-
 .../inspections/JSDuplicatedDeclarationInspection.java     | 2 +-
 .../lang/javascript/impl/inspections/JSInspection.java     | 4 ++--
 .../impl/inspections/JSUndeclaredVariableInspection.java   | 2 +-
 .../impl/inspections/JSUnresolvedFunctionInspection.java   | 5 +++--
 .../impl/inspections/JSUnresolvedVariableInspection.java   | 2 +-
 .../impl/inspections/JSUntypedDeclarationInspection.java   | 2 +-
 .../impl/inspections/JSUnusedLocalSymbolsInspection.java   | 2 +-
 .../impl/navigation/JavaScriptGotoSuperHandler.java        | 3 +--
 .../impl/navigation/JavaScriptSymbolContributor.java       | 4 ++--
 .../impl/refactoring/BasicJavascriptNamesValidator.java    | 3 +--
 .../impl/refactoring/JSBaseIntroduceHandler.java           | 5 +++--
 .../refactoring/JavascriptRefactoringSupportProvider.java  | 5 ++---
 .../extractMethod/JSExtractFunctionHandler.java            | 2 +-
 .../javascript/impl/search/JSDeclarationRangeHandler.java  | 2 +-
 .../impl/search/JSDefinitionsSearchExecutor.java           | 3 +--
 .../impl/search/JSGotoTargetRendererProvider.java          | 3 +--
 .../impl/structureView/JSStructureItemPresentation.java    | 3 +--
 .../impl/structureView/JSStructureViewBuilderFactory.java  | 3 +--
 .../impl/structureView/JSStructureViewElement.java         | 2 +-
 .../impl/structureView/JSStructureViewModel.java           | 2 +-
 .../lang/javascript/impl/structureView/JSSuperGroup.java   | 3 +--
 .../lang/javascript/impl/structureView/JSSuperGrouper.java | 3 +--
 .../impl/surroundWith/JSExpressionSurroundDescriptor.java  | 3 +--
 .../impl/surroundWith/JSStatementSurrounder.java           | 4 ++--
 .../impl/surroundWith/JSStatementsSurroundDescriptor.java  | 2 +-
 .../impl/surroundWith/JSWithParenthesesSurrounder.java     | 4 ++--
 .../impl/surroundWith/JSWithTryCatchFinallySurrounder.java | 3 +--
 .../javascript/impl/validation/BaseCreateMethodsFix.java   | 2 +-
 .../javascript/impl/validation/ImplementMethodsFix.java    | 3 +--
 .../impl/validation/ImplementedMethodProcessor.java        | 2 +-
 .../javascript/impl/validation/JSAnnotatingVisitor.java    | 2 +-
 .../javascript/impl/validation/JSAnnotatorFactory.java     | 4 ++--
 .../javascript/impl/JavaScriptIconDescriptorUpdater.java   | 4 ++--
 .../impl/copyright/UpdateJavaScriptFileCopyright.java      | 3 +--
 .../copyright/UpdateJavaScriptFileCopyrightProvider.java   | 2 +-
 .../findUsages/JavaScriptFindUsagesHandlerFactory.java     | 4 ++--
 .../impl/formatter/JavaScriptCodeStyleConfigurable.java    | 2 +-
 .../JavaScriptLanguageCodeStyleSettingsProvider.java       | 2 +-
 .../impl/html/JavaScriptHtmlScriptContentProvider.java     | 2 +-
 .../impl/ide/actions/JavaScriptCreateFileAction.java       | 3 +--
 .../ide/actions/JavaScriptFileTemplateContributor.java     | 3 +--
 .../completion/JavaScriptKeywordCompletionContributor.java | 2 +-
 .../ide/completion/JavaScriptSkipAutopopupInStrings.java   | 2 +-
 .../navigationToolbar/JavaScriptNavBarModelExtension.java  | 4 ++--
 .../javascript/impl/lang/JavaScriptFileTypeFactory.java    | 2 +-
 .../impl/lang/JavaScriptLanguageVersionPusher.java         | 5 +++--
 .../impl/lang/JavaScriptLanguageVersionResolver.java       | 4 ++--
 .../javascript/impl/lang/JavaScriptParsingDefinition.java  | 3 +--
 .../impl/lang/navigation/JavaScriptClassContributor.java   | 5 +++--
 .../javascript/impl/lang/psi/JavaScriptSimpleType.java     | 4 ++--
 .../reference/DefaultJSPropertyNameReferenceProvider.java  | 4 ++--
 .../regexp/impl/JavaScriptRegExpLiteralLanguageHost.java   | 4 ++--
 .../regexp/impl/JavaScriptRegexpMultiHostInjector.java     | 2 +-
 .../module/extension/ClientJavaScriptModuleExtension.java  | 4 ++--
 .../extension/ClientJavaScriptModuleExtensionPanel.java    | 2 +-
 .../extension/ClientJavaScriptModuleExtensionProvider.java | 2 +-
 .../extension/ClientJavaScriptMutableModuleExtension.java  | 4 ++--
 .../sdk/ClientJavaScriptPredefinedBundlesProvider.java     | 2 +-
 .../client/module/sdk/ClientJavaScriptSdkType.java         | 4 ++--
 590 files changed, 789 insertions(+), 908 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
index 9d3baef7..90045a16 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
@@ -16,12 +16,11 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.StubBasedPsiElement;
 import consulo.util.collection.ArrayFactory;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author  Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
index acfcd11e..554757f6 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
@@ -16,12 +16,12 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.StubBasedPsiElement;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
index f20c33d5..297c7fd0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
@@ -18,7 +18,7 @@
 
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
index 426f6c43..a1f0998e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.StubBasedPsiElement;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
index b88ac07b..a4866968 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
@@ -19,8 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
index 65524958..3fc3b0ef 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
 import consulo.language.psi.StubBasedPsiElement;
 import consulo.navigation.Navigatable;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
index edde7c95..85f83eb3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
@@ -2,7 +2,7 @@
 
 import consulo.annotation.access.RequiredReadAction;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
index 21d7556e..b58f43ee 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
@@ -1,9 +1,9 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
index de354952..5eb47f73 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
@@ -2,7 +2,7 @@
 
 import consulo.annotation.access.RequiredReadAction;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
index 078d98d0..966345b4 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
@@ -1,8 +1,7 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
index 4af569e5..60c491f7 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
@@ -1,8 +1,7 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
index 49983e35..d80a0c93 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import consulo.language.psi.PsiNamedElement;
 
 public interface JSDocTag extends PsiNamedElement, JSElement
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
index b327d842..555f08d6 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
@@ -20,7 +20,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
index 742869aa..ed188cac 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
@@ -17,8 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * User: max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index efc6ae17..87a14d0c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -21,8 +21,8 @@
 import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.util.collection.ArrayFactory;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
index 642cb1e6..ddb02c62 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
index febe96ef..21bd6091 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSNamespaceDeclarationStub;
 import consulo.language.psi.StubBasedPsiElement;
+import jakarta.annotation.Nullable;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
index 867f248f..cdb3b272 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
@@ -19,8 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.util.collection.ArrayFactory;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * User: max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
index 7ca495e2..ddc386b6 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import consulo.language.ast.IElementType;
 
 /**
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
index 16449e30..2c3199d2 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
@@ -16,10 +16,10 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nullable;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
index 0081bfe1..071ecb8f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
@@ -17,13 +17,13 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.psi.JSComputedName;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
index 8915e3ba..ecfc17ba 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
@@ -19,7 +19,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiPolyVariantReference;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
index 9a904362..3b9c68b7 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
index cfafa152..0e0300a5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
index 9959741c..a74fc00e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
@@ -19,8 +19,7 @@
 import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.StubBasedPsiElement;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index 6f26c7ec..af6ea26e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -20,9 +20,9 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
index b0f6120b..572f2a7f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * User: max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
index ac09849b..d757cd9e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.stubs;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import consulo.language.psi.stub.StubElement;
 
diff --git a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
index 550f83a7..afb75a91 100644
--- a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
+++ b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
@@ -7,7 +7,7 @@
 import consulo.language.editor.completion.CompletionResultSet;
 import consulo.language.util.ProcessingContext;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
index cd99bccb..cc8cf1ed 100644
--- a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
+++ b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
@@ -5,8 +5,8 @@
 import consulo.component.extension.ExtensionPointName;
 import consulo.javascript.psi.stubs.JSFileStub;
 import consulo.language.psi.stub.IndexSink;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
 /**
  * @author VISTALL
  * @since 19.07.2015
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
index d731ae7e..185ebb03 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.language;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
index af2fa996..18a0eec0 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
@@ -28,8 +28,8 @@
 import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * User: max
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
index 69966243..ad558768 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
@@ -21,8 +21,8 @@
 import consulo.module.Module;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
index 361f758b..e92a7c2b 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
@@ -20,8 +20,8 @@
 import consulo.language.file.LanguageFileType;
 import consulo.language.version.LanguageVersion;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
index 2306826a..bc3308bb 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
@@ -1,11 +1,10 @@
 package consulo.javascript.language;
 
-import consulo.javascript.language.JavaScriptFeature;
 import consulo.language.Language;
 import consulo.language.version.LanguageVersion;
 import consulo.language.version.LanguageVersionWithParsing;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Set;
 
 /**
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
index 737c24a0..c053e592 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
@@ -19,7 +19,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.version.LanguageVersion;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.Set;
 
diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
index 1c89344b..8edd1f39 100644
--- a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
@@ -20,8 +20,8 @@
 import consulo.annotation.component.ServiceAPI;
 import consulo.ide.ServiceManager;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.List;
 
 /**
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
index 001cf1d8..3fed4841 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
@@ -18,9 +18,8 @@
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
index 874d4897..a729fdc2 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
@@ -19,8 +19,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
index 4a14b3e1..bc26717d 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
@@ -16,9 +16,8 @@
 
 package consulo.javascript.language.psi;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSElement;
-import consulo.javascript.language.psi.JavaScriptType;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
index e28eee01..0c17c51d 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
@@ -21,7 +21,7 @@
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSImplementedInterfacesIndex extends StringStubIndexExtension<JSReferenceList>
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
index bc1fe0b8..9facfe99 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
@@ -24,7 +24,7 @@
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSNameIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
index 8e5b39c3..dc609ec2 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
@@ -23,8 +23,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSQualifiedElementIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
index 560068e4..81ef425f 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
@@ -20,8 +20,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSSuperClassIndex extends StringStubIndexExtension<JSReferenceList>
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
index c4a9e02c..472eb47c 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
@@ -2,8 +2,7 @@
 
 import consulo.language.version.LanguageVersion;
 import consulo.module.extension.ModuleExtensionWithSdk;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
index 1043a134..0a1d7ab7 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
@@ -18,8 +18,7 @@
 
 import consulo.language.version.LanguageVersion;
 import consulo.module.extension.MutableModuleExtensionWithSdk;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
index cce7278f..c15004d5 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.psi;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
index 6027465a..886d3030 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
@@ -20,8 +20,7 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.IElementType;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index 2342e6c3..48763677 100644
--- a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -24,8 +24,8 @@
 import consulo.component.extension.ExtensionPointName;
 import consulo.language.psi.PsiReference;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
index cb89a010..a20d02ef 100644
--- a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
+++ b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
@@ -3,7 +3,7 @@
 import com.intellij.lang.javascript.psi.JSFile;
 import consulo.language.psi.stub.PsiFileStub;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
index c20f888c..31d14df2 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
@@ -28,10 +28,11 @@
 import consulo.language.psi.PsiElement;
 import consulo.util.io.URLUtil;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -240,7 +241,7 @@ private void setResult(final StringBuilder builder)
 
 	@Override
 	public boolean onPatternMatch(@Nonnull MetaDocType metaDocType, @Nullable String matchName, @Nullable String matchValue,
-			@Nullable String remainingLineContent, @Nonnull final String line, final String patternMatched)
+								  @Nullable String remainingLineContent, @Nonnull final String line, final String patternMatched)
 	{
 		if(metaDocType == MetaDocType.DEFAULT)
 		{
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
index 31b81845..1754dc4d 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
@@ -22,8 +22,8 @@
  */
 package com.intellij.javascript.documentation;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 public interface JSDocumentationProcessor
 {
@@ -38,5 +38,5 @@ enum MetaDocType
 	boolean onCommentLine(@Nonnull String line);
 
 	boolean onPatternMatch(@Nonnull MetaDocType type, @Nullable String matchName, @Nullable final String matchValue,
-			@Nullable String remainingLineContent, @Nonnull final String line, final String patternMatched);
+						   @Nullable String remainingLineContent, @Nonnull final String line, final String patternMatched);
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 93502b77..e0e326a6 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -43,8 +43,8 @@
 import consulo.xml.psi.xml.XmlToken;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.File;
 import java.lang.reflect.Method;
 import java.util.Collections;
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
index 7501dd11..53aabdd5 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
@@ -37,8 +37,8 @@
 import consulo.util.lang.ref.Ref;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
@@ -808,7 +808,7 @@ public boolean onPatternMatch(@Nonnull final MetaDocType type, @Nullable final S
 	}
 
 	public static void appendHyperLinkToElement(@Nullable PsiElement element, String elementName, final StringBuilder buffer,
-			final String presentableName, final @Nullable String presentableFileName)
+												final String presentableName, final @Nullable String presentableFileName)
 	{
 		final PsiFile containingFile = element != null ? element.getContainingFile() : null;
 		String fileName = containingFile == null ? null : !JSResolveUtil.isPredefinedFile(containingFile) ? containingFile.getVirtualFile()
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
index 8015ee6b..356daab4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript;
 
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
 
 /**
  * @author yole
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
index ea634c51..cd76a525 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
@@ -18,10 +18,9 @@
 
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.ast.IElementType;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 /**
  * Created by IntelliJ IDEA.
  * User: max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 35f62174..abbd0ca3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -47,7 +47,7 @@
 import consulo.language.version.LanguageVersionUtil;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * User: max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index e5380a33..1d3dca07 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -35,7 +35,7 @@
 import consulo.xml.psi.xml.*;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
index f0a5c917..5c388303 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
@@ -8,7 +8,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index f5806ac3..04641b25 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -38,10 +38,10 @@
 import consulo.language.version.LanguageVersion;
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlTokenType;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author max, maxim.mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
index abd0989b..f0be63e1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
@@ -3,9 +3,9 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.ObjectStubSerializerProvider;
 import consulo.language.psi.stub.StubElementTypeHolder;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.util.List;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
index 5a7d36a2..b4497929 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
@@ -4,7 +4,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.xml.psi.xml.XmlAttributeValue;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
index af4f89e7..3fd70f3e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
@@ -4,7 +4,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.xml.psi.xml.XmlText;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
index 46c5fb29..8cd37ad2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
@@ -25,7 +25,7 @@
 import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
index 359d427e..09fb560f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
@@ -28,7 +28,7 @@
 import consulo.project.Project;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author yole
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index 7cb917c0..5ad5266b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -40,10 +40,11 @@
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.XmlRecursiveElementVisitor;
 import consulo.xml.psi.xml.*;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+
 import java.util.*;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
index 6e4a3863..519e5582 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
@@ -26,8 +26,8 @@
 import consulo.language.editor.highlight.SyntaxHighlighterBase;
 import consulo.language.lexer.Lexer;
 import consulo.xml.editor.XmlHighlighterColors;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index 06530b6a..7500e9f5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -28,8 +28,7 @@
 import consulo.navigation.ItemPresentation;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.image.Image;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
index 3bfdd25c..93dc7484 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
@@ -23,7 +23,7 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index 47e03606..bb16d770 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -47,8 +47,8 @@
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlText;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Collections;
 import java.util.Set;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
index ee186ac3..bd7ff9ca 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
@@ -24,7 +24,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * User: max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
index a9e5b482..7112715f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
@@ -23,7 +23,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
index 5e48bb64..ec0a6bd9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
@@ -20,7 +20,7 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index c9c210b9..e3305df3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -32,7 +32,7 @@
 import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
index 707b5e24..b90dfa2c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
@@ -28,9 +28,9 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.ast.IElementType;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
index f4f9cdb9..ebac4856 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
@@ -31,7 +31,7 @@
 import consulo.util.lang.StringUtil;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
index bda9362f..c4afc293 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
@@ -30,8 +30,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
index 49230730..e870c59e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
@@ -26,7 +26,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
index 0569134b..13ac550a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
@@ -19,8 +19,7 @@
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
index 75b731c8..28d67b65 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
@@ -23,7 +23,7 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
index 2e4c8869..6ada727b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
@@ -22,8 +22,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.language.ast.ASTNode;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
index 159fc8ed..26f0e3a5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
@@ -27,7 +27,7 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
index 7f0e72f6..13feaa15 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
@@ -32,10 +32,10 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index a0e53a6b..59187b98 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -36,8 +36,8 @@
 import consulo.util.collection.ArrayUtil;
 import consulo.util.dataholder.Key;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.*;
 
 /**
@@ -339,7 +339,7 @@ private List<JSClass> getClassesFromReferenceList(final @Nullable JSReferenceLis
 
 	@Override
 	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState substitutor,
-			final PsiElement lastParent, @Nonnull final PsiElement place)
+									   final PsiElement lastParent, @Nonnull final PsiElement place)
 	{
 		final ResolveProcessor resolveProcessor = processor instanceof ResolveProcessor ? (ResolveProcessor) processor : null;
 		final boolean toProcessClass = resolveProcessor != null && resolveProcessor.isTypeContext();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
index fe01504a..2545bb72 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
@@ -8,7 +8,7 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.lang.psi.impl.JavaScriptClassType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
index b8cc7fc2..c50a2305 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
index e076e84e..a5b79a76 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
@@ -19,8 +19,7 @@
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSCommaExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
index 4adc3fcc..22e5abdc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
@@ -24,7 +24,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.language.ast.IElementType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
index 625689eb..4c1318d7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
@@ -20,7 +20,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
index 13cdf87c..d19877eb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
@@ -23,7 +23,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -75,7 +75,7 @@ protected void accept(@Nonnull JSElementVisitor visitor)
 
 	@Override
 	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
+									   @Nonnull PsiElement place)
 	{
 		if(lastParent == null)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
index 50064f10..bfcaf37b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
@@ -21,8 +21,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.language.ast.ASTNode;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
index 80c15906..6ec245cf 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
@@ -23,8 +23,7 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 import consulo.language.ast.ASTNode;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class JSDocCommentImpl extends JSElementImpl implements JSDocComment
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index a1703c2b..d6526008 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -28,10 +28,9 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.util.collection.ArrayUtil;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 public class JSDocTagImpl extends JSElementImpl implements JSDocTag
 {
 	private volatile PsiReference[] myRefs;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
index 8ac7cde1..990edd91 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
@@ -26,7 +26,7 @@
 import consulo.util.lang.text.StringTokenizer;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class JSDocTagValueImpl extends JSElementImpl implements JSDocTagValue
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
index 2550ba3a..11966cc2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
@@ -29,7 +29,7 @@
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlTagChild;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
index 6d2142c1..1297ca47 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
@@ -19,8 +19,7 @@
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSEmptyStatement;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
index 9faa5146..4afdab2f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
@@ -27,7 +27,7 @@
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author nik
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
index 2a126e88..83d4f6d2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
@@ -20,8 +20,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.ast.ASTNode;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author ven
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index a6ea348e..b924606a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -28,7 +28,7 @@
 import consulo.navigation.ItemPresentation;
 import consulo.ui.image.Image;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
index 3884d3ca..6185aad1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
@@ -18,8 +18,7 @@
 
 import java.util.List;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -38,6 +37,7 @@
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.file.FileViewProvider;
 import consulo.language.impl.psi.PsiFileBase;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -61,7 +61,7 @@ public String toString()
 
 	@Override
 	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, @Nullable PsiElement lastParent,
-			@Nonnull PsiElement place)
+									   @Nonnull PsiElement place)
 	{
 		boolean result = JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
 		if(lastParent == null)
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
index eda1a5e5..40aee640 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
@@ -25,7 +25,7 @@
 import consulo.language.ast.TokenSet;
 import consulo.annotation.access.RequiredReadAction;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
index 7dec90dd..a3992ac7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
@@ -24,7 +24,7 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.resolve.PsiScopeProcessor;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -129,7 +129,7 @@ else if(passedRParen && child.getPsi() instanceof JSStatement)
 
 	@Override
 	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
+									   @Nonnull PsiElement place)
 	{
 		if(lastParent != null)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index 151b7ea2..1b2afcc8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -35,7 +35,7 @@
 import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -173,7 +173,7 @@ public int getTextOffset()
 
 	@Override
 	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
+									   @Nonnull PsiElement place)
 	{
 		if(lastParent != null && lastParent.getParent() == this)
 		{
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index b50ae806..95ef42df 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -26,7 +26,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
index dc03f7c4..5abf9f69 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
@@ -29,7 +29,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.util.lang.Comparing;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
index 2cc98bc6..b3058da9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
@@ -11,8 +11,8 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.language.psi.JavaScriptTypeElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
index 5d93fd7a..a7c8b7af 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
@@ -20,7 +20,7 @@
 import com.intellij.lang.javascript.psi.JSGenericSignature;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class JSGenericSignatureImpl extends JSElementImpl implements JSGenericSignature
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
index 2a5a963d..d6852643 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
@@ -23,8 +23,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
index e03ebe1d..4c3e2324 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
@@ -25,7 +25,7 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
index 43e34497..e66a2b33 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
@@ -30,7 +30,7 @@
 import consulo.language.psi.path.FileReferenceSet;
 import consulo.javascript.lang.JavaScriptTokenSets;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
index 6662f52f..1ba65315 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
@@ -22,8 +22,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIndexedPropertyAccessExpression;
 import consulo.language.ast.IElementType;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
index f836ce54..8ac840e2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
@@ -25,7 +25,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
index 6a815796..86833093 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
@@ -20,8 +20,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLetExpression;
 import consulo.language.ast.ASTNode;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
index 7cd6d4ba..a8536b14 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
@@ -22,7 +22,7 @@
 import com.intellij.lang.javascript.psi.JSLetStatement;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author maxim
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index e3402c2f..5fbbf184 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -30,8 +30,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiLanguageInjectionHost;
 import consulo.language.psi.PsiReference;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
index 6bc53b76..2d4333d0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
@@ -30,7 +30,7 @@
 import consulo.javascript.lang.JavaScriptTokenSets;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index a30eaada..66f64e5c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -24,7 +24,7 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.lang.psi.impl.JavaScriptClassType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
index 48f685b1..3c242b81 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
@@ -24,7 +24,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
index 6aec140c..6fc625cb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
@@ -36,7 +36,7 @@
 import consulo.virtualFileSystem.VirtualFile;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index ef89f26d..4fd430ee 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -31,8 +31,8 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
index 3a5f9264..0f9f7f03 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
@@ -23,7 +23,7 @@
 import com.intellij.lang.javascript.psi.stubs.JSParameterListStub;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
index e6e3d2bc..b147b83f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
@@ -20,8 +20,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import consulo.language.ast.ASTNode;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * User: max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index 3c6debaa..5f461df6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -25,7 +25,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * User: max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index d82216bc..f5b0e957 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -26,8 +26,8 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index 26aa824b..afe784d6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -35,8 +35,8 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.util.lang.StringUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 5701df90..06fc85a9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -45,10 +45,10 @@
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.xml.XmlFile;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 6fe0349b..c955de91 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -40,8 +40,8 @@
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlToken;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Set;
 
 public class JSReferenceExpressionImpl extends JSExpressionImpl implements JSReferenceExpression, BindablePsiReference
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index eda7fbb4..f643ca22 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -29,7 +29,7 @@
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collection;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index 13ace481..b06483dd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -35,8 +35,8 @@
 import consulo.xml.psi.xml.*;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
index fbc084e7..49eb9514 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
@@ -20,8 +20,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReturnStatement;
 import consulo.language.ast.ASTNode;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * User: max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
index 991084da..c29af19e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
@@ -34,7 +34,7 @@
 import consulo.xml.psi.xml.XmlTag;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
index 02a90e8c..c11b9603 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
@@ -27,8 +27,9 @@
 import consulo.language.ast.ASTNode;
 import consulo.util.collection.ArrayUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
index 9554378c..cf0a52b0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
@@ -31,8 +31,7 @@
 import consulo.navigation.ItemPresentation;
 import consulo.navigation.NavigationItem;
 import consulo.util.dataholder.Key;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * User: max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
index 6e175373..cb5d6b5f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
@@ -29,8 +29,8 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.util.collection.ArrayUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
index f4895467..02feea3c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
@@ -23,8 +23,7 @@
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.TokenSet;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
index fe59da9b..47c797af 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
@@ -20,7 +20,7 @@
 import com.intellij.lang.javascript.psi.JSThisExpression;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
index 5bf27e86..8a04bf20 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
@@ -20,8 +20,7 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSThrowStatement;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
index 1eb555f0..5665675a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
@@ -26,8 +26,8 @@
 import consulo.language.ast.IElementType;
 import consulo.language.ast.TokenSet;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
index 0e3747e7..5db9381e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
@@ -26,7 +26,7 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
index 261d59e1..2954b238 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
@@ -25,8 +25,8 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.annotation.access.RequiredReadAction;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
@@ -80,7 +80,7 @@ protected void accept(@Nonnull JSElementVisitor visitor)
 
 	@Override
 	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
+									   @Nonnull PsiElement place)
 	{
 		final JSVariable[] vars = getVariables();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index 4fa7d7e7..b25cc8d9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -37,7 +37,7 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
index de9d3f11..f4178b12 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
@@ -26,6 +24,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.ast.ASTNode;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
index 320bc5aa..53fe7c50 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
@@ -22,7 +22,7 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * User: max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
index e59f792e..097540df 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
@@ -21,8 +21,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSWithStatement;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 648ad825..4e436105 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -34,8 +34,8 @@
 import consulo.xml.psi.xml.*;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
index 9dc2d9c9..49106e4e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
@@ -21,7 +21,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSYieldStatement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author maxim
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
index aba9d663..4f0136f5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
@@ -31,8 +31,8 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.util.lang.StringUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 public class JSPropertyNameReference implements PsiReference
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index f83d484a..80391404 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -44,7 +44,7 @@
 import consulo.xml.psi.xml.XmlToken;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index 84b61da6..a7652d02 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -44,8 +44,8 @@
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index dcfedb92..5cfe2a68 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -82,8 +82,8 @@
 import consulo.xml.psi.xml.*;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.*;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index c4d9fc04..87e76c17 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -39,8 +39,9 @@
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTag;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
index 3c0e4adf..10663648 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
@@ -30,7 +30,7 @@
 import consulo.util.collection.ArrayUtil;
 import consulo.xml.psi.xml.XmlAttributeValue;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
index df2a4e13..20ace63f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
@@ -28,8 +28,8 @@
 import consulo.language.icon.IconDescriptorUpdaters;
 import consulo.javascript.language.psi.JavaScriptType;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 public class JSLookupUtil
 {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index 9554517d..4668c622 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -31,7 +31,7 @@
 import consulo.language.psi.stub.StubIndexKey;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
index 5cac7445..0a9067b2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
index 72535cd1..2b4e83b9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
@@ -30,7 +30,7 @@
 import consulo.language.psi.stub.StubInputStream;
 import consulo.language.psi.stub.StubOutputStream;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
index 683be6c4..871a711e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
index 78a1b51f..d7cc763f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
@@ -32,8 +32,8 @@
 import consulo.language.psi.stub.StubInputStream;
 import consulo.language.psi.stub.StubOutputStream;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index 69e65082..0d637c25 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -25,7 +25,7 @@
 import consulo.language.Language;
 import consulo.language.psi.PsiFile;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
index b39d92e0..2b057418 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSFunction;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
index 56af7669..16f8ae70 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSImportStatement;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
index 25e9bd7f..ea179899 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.index.io.StringRef;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
index 50208692..83a4d5e3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
@@ -19,8 +19,6 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
-
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
 import com.intellij.lang.javascript.psi.impl.JSNamespaceDeclarationImpl;
@@ -33,6 +31,7 @@
 import consulo.language.psi.stub.StubElement;
 import consulo.language.psi.stub.StubInputStream;
 import consulo.language.psi.stub.StubOutputStream;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
index 63a378c1..26859e24 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
index d9289741..38bab215 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSParameter;
 import consulo.javascript.impl.language.psi.JSStubElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
index 81e178ca..d8484424 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
@@ -29,7 +29,7 @@
 import consulo.language.psi.stub.StubInputStream;
 import consulo.language.psi.stub.StubOutputStream;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 
 /**
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
index 9987de92..58ec6bbe 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.stub.*;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
index be953d24..0993a1fb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.index.io.StringRef;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
index 13d7987e..00359a33 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
index f9fc22c5..fd7564db 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.JSElementTypes;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index 90b1edb1..4ea66c06 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -38,8 +38,8 @@
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlText;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.*;
 
 public class JSUnusedImportsHelper
@@ -324,7 +324,7 @@ else if(e instanceof JSReferenceExpression)
 	}
 
 	private static void collectElements(@Nullable final XmlTag rootTag, final PsiFile file, final Map<XmlTag, Collection<PsiElement>> result,
-			final Collection<JSFile> processedFiles)
+										final Collection<JSFile> processedFiles)
 	{
 		if(processedFiles.contains(file))
 		{
diff --git a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
index b1cb00cb..e33d2bd7 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
@@ -24,7 +24,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.version.LanguageVersion;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
index 5569c308..584128c8 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
@@ -28,8 +28,8 @@
 import consulo.language.lexer.Lexer;
 import consulo.util.collection.MultiMap;
 import consulo.xml.editor.XmlHighlighterColors;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
 import java.util.function.Supplier;
 
 /**
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
index 7f49d869..5908868f 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
@@ -8,7 +8,7 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.version.LanguageVersion;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java b/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
index 0a049df1..62e14714 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
@@ -27,8 +27,7 @@
 import consulo.language.editor.action.SimpleTokenSetQuoteHandler;
 import consulo.language.psi.PsiElement;
 import consulo.virtualFileSystem.fileType.FileType;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
index 2ab51448..95505c0a 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
@@ -22,8 +22,8 @@
 import consulo.javascript.psi.JSComputedName;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
index f2aaa804..ceabf21d 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
@@ -20,8 +20,7 @@
 import com.intellij.lang.javascript.psi.impl.JSExpressionCodeFragmentImpl;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author nik
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
index 70ce3c05..51bac722 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
@@ -26,7 +26,7 @@
 import consulo.language.psi.stub.IStubElementType;
 import consulo.language.psi.stub.IndexSink;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public abstract class JSStubElementType<StubT extends JSStubElement<PsiT>, PsiT extends JSElement> extends IStubElementType<StubT, PsiT> implements IElementTypeAsPsiFactory
 {
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
index bb0a63b1..ec6393a7 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
@@ -30,11 +30,10 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 /**
  * @author VISTALL
  * @since 03.03.2016
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
index 4001d56f..764d3d8a 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
@@ -8,7 +8,7 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
index 7100e0eb..a3bc5ceb 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
@@ -7,8 +7,8 @@
 import consulo.language.psi.stub.IStubFileElementType;
 import consulo.language.psi.stub.PsiFileStubImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
index 241ee73e..d412fabb 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
@@ -25,7 +25,7 @@
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index 07652605..e66668a1 100644
--- a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -28,7 +28,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.localize.LocalizeValue;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Set;
 
 /**
diff --git a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index fb890b73..a1c1435e 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -9,7 +9,7 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.parser.PsiParser;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
index fc5f0901..35860b36 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -8,7 +8,7 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.function.Supplier;
 
 /**
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
index 77510a67..986ce6d4 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
@@ -5,8 +5,8 @@
 import com.intellij.lang.javascript.JSElementType;
 import consulo.language.ast.IElementType;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index bfe3287d..54d16ad7 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -8,10 +8,10 @@
 import consulo.javascript.language.StandardJavaScriptVersions;
 import consulo.language.version.LanguageVersion;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import jakarta.inject.Singleton;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 0cd15ea1..03b011b5 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -27,7 +27,7 @@
 import consulo.logging.Logger;
 import consulo.util.dataholder.Key;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 
 /**
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index d2b145ac..93270a20 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -20,9 +20,8 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.parser.PsiBuilder;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author max
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index a504887a..3d050dd3 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -11,8 +11,8 @@
 import consulo.xml.psi.xml.XmlElementType;
 import consulo.xml.psi.xml.XmlTokenType;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Stack;
 
 /**
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
index c2f3d4d5..4e8008b2 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
@@ -6,7 +6,7 @@
 import consulo.language.parser.PsiParser;
 import consulo.language.version.LanguageVersion;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
index ff4fd901..0a0dd819 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
@@ -3,8 +3,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.language.ast.IElementType;
 import consulo.language.parser.PsiBuilder;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index b3e5d765..ea68756d 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -24,8 +24,8 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.localize.LocalizeValue;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * User: max
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 6ade6147..89ea9545 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -23,7 +23,7 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author max
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
index c510669f..16d2f3bf 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
@@ -6,9 +6,9 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import consulo.annotation.access.RequiredReadAction;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
index 7230a7cb..f0f27403 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
@@ -8,7 +8,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Arrays;
 
 /**
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
index fd91cdb8..1c6c22d3 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
@@ -14,8 +14,8 @@
 import consulo.language.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
index c5d358b6..9e5ee051 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
@@ -7,7 +7,7 @@
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import consulo.annotation.access.RequiredReadAction;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
index 8f4f0021..b689d58f 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
@@ -10,7 +10,7 @@
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ThreeState;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
index 4506aa5c..60d19030 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
@@ -21,8 +21,8 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
index 5df55969..059755f7 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
@@ -1,6 +1,6 @@
 package consulo.javascript.lang.psi.impl.resolve;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
index 9b9a2296..7a3c2fc9 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
@@ -8,9 +8,9 @@
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.version.LanguageVersion;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
index 2a6b3d23..ef37e6e6 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
@@ -12,7 +12,7 @@
 import consulo.util.lang.reflect.ReflectionUtil;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
index 732e831e..c454c269 100644
--- a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
@@ -22,10 +22,9 @@
 import com.intellij.lang.javascript.psi.stubs.JSQualifiedStub;
 import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.language.psi.stub.IndexSink;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 /**
  * @author VISTALL
  * @since 03.05.2015
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
index c4a87c6f..5ee8a267 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
@@ -30,9 +30,9 @@
 import consulo.util.lang.ref.Ref;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.lang.xml.XMLLanguage;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.List;
 
 /**
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
index 30deec9e..174b2797 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
@@ -16,8 +16,7 @@
 
 package consulo.javascript.debugger;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
 import consulo.javascript.language.JavaScriptFileType;
 import consulo.javascript.impl.language.psi.JSElementFactory;
 import consulo.execution.debug.evaluation.XDebuggerEditorsProviderBase;
@@ -25,6 +24,7 @@
 import consulo.project.Project;
 import consulo.language.psi.PsiFile;
 import consulo.virtualFileSystem.fileType.FileType;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
index 315e4ec2..1754d81c 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
@@ -26,8 +26,8 @@
 import consulo.project.Project;
 import consulo.virtualFileSystem.fileType.FileType;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
index fb78b35a..e4911172 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
@@ -24,9 +24,9 @@
 import consulo.project.Project;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.fileType.FileType;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
index f5fa3627..de39449a 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
@@ -26,8 +26,9 @@
 import consulo.util.io.FileUtil;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
index 99054a12..23bfbe0d 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
@@ -38,13 +38,14 @@
 import consulo.ui.ex.awt.UIUtil;
 import consulo.ui.ex.content.Content;
 import consulo.virtualFileSystem.VirtualFile;
+import jakarta.annotation.Nullable;
 import org.chromium.sdk.Breakpoint;
 import org.chromium.sdk.DebugContext;
 import org.chromium.sdk.JavascriptVm;
 import org.chromium.sdk.Script;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
index e6f63763..f2fc8792 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
@@ -22,8 +22,8 @@
 import consulo.ui.image.Image;
 import org.chromium.sdk.*;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Collection;
 
 /**
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
index da20fe73..2c0a2c7f 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
@@ -24,7 +24,7 @@
 import org.chromium.sdk.JavascriptVmFactory;
 import org.chromium.sdk.StandaloneVm;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.net.InetSocketAddress;
 
 /**
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
index 42918a8a..3ee5e58b 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
@@ -18,10 +18,10 @@
 
 import consulo.execution.debug.frame.XExecutionStack;
 import consulo.execution.debug.frame.XStackFrame;
+import jakarta.annotation.Nullable;
 import org.chromium.sdk.CallFrame;
 import org.chromium.sdk.DebugContext;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
index c1efd9c4..99597f63 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
@@ -24,7 +24,7 @@
 import consulo.util.dataholder.Key;
 import org.chromium.sdk.Script;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.File;
 
 /**
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
index 0f62be4d..1ddb7998 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
@@ -25,10 +25,10 @@
 import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.ex.ColoredTextContainer;
 import consulo.ui.ex.SimpleTextAttributes;
+import jakarta.annotation.Nonnull;
 import org.chromium.sdk.*;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
index 0495ac67..67e97114 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
@@ -20,7 +20,7 @@
 import consulo.execution.debug.frame.XSuspendContext;
 import org.chromium.sdk.DebugContext;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
index 9d7af7ce..e8fd3c90 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
@@ -20,8 +20,8 @@
 import consulo.execution.debug.frame.XValueModifier;
 import org.chromium.sdk.*;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
index 55a32d83..fb9b4d1b 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
@@ -21,7 +21,7 @@
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsValue;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
index 3ffed716..e04561dc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
@@ -14,8 +14,8 @@
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 public abstract class BaseInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool
 {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
index c51f127d..c3d7779d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
@@ -6,9 +6,9 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.List;
 
 public abstract class BaseInspectionVisitor<T> extends JSElementVisitor
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
index 963f4a1d..7235e786 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
@@ -16,7 +16,7 @@
 import consulo.virtualFileSystem.VirtualFile;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public abstract class InspectionJSFix implements LocalQuickFix
 {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
index f5b1db7d..0bcf09e0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
@@ -8,9 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class AssignmentResultUsedJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
index be0a5787..9cabb056 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
@@ -11,8 +11,7 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class AssignmentToForLoopParameterJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
index 111b413e..9c3dbbb4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
@@ -12,8 +12,8 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.language.psi.PsiReference;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class AssignmentToFunctionParameterJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
index 3043ab6b..245f3938 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
@@ -9,7 +9,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NestedAssignmentJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
index 792d2e8a..1c89b27d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
@@ -15,10 +15,9 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 public class ReplaceAssignmentWithOperatorAssignmentJSInspection
         extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
index a14d8221..2cf5f9c2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
@@ -15,7 +15,7 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class SillyAssignmentJSInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
index 2683b65f..dab86d16 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
@@ -14,7 +14,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class IncompatibleMaskJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index ace5540c..006e9fd3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -15,7 +15,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
index 9947a019..575e6047 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
@@ -7,7 +7,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index d90feebd..4db0ba49 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -11,7 +11,7 @@
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ShiftOutOfRangeJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index 6a46cb73..635db319 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -13,7 +13,7 @@
 import consulo.language.ast.IElementType;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class DivideByZeroJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index a0062a6c..d28ac7b0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -13,7 +13,7 @@
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class EqualityComparisonWithCoercionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
index edbb9a0f..6e933a9f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class InfiniteLoopJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
index adfe9cb2..6edd655f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
@@ -9,7 +9,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.logging.Logger;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class InfiniteRecursionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index bc45fc73..7ce96288 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -12,8 +12,8 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NonShortCircuitBooleanExpressionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
index f04231a4..db19d923 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
@@ -10,7 +10,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ObjectAllocationIgnoredJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
index 8b814bfa..e9e754fc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs.bugs;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.language.ast.IElementType;
 import com.intellij.lang.javascript.psi.*;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
index 4f7325b4..ed863a03 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
@@ -3,7 +3,7 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class RecursionVisitor extends JSRecursiveElementVisitor {
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index a2e9eef2..80554a31 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -11,7 +11,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class TextLabelInSwitchStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index 7a08f741..a8e939fe 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -11,8 +11,8 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class AnonymousFunctionJSInspection extends JavaScriptInspection{
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index 89433927..de2890e9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -9,8 +9,8 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class BlockStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
index 3217ac6c..e0d424ca 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
@@ -8,8 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class CallerJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
index c71bfaf5..c77502fc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
@@ -9,8 +9,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class CommaExpressionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index 39461311..b4ac6c45 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -8,8 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ConditionalExpressionJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index 36fad493..6b7796e0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index 2456a559..8333b3c8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -12,8 +12,8 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ConfusingPlusesOrMinusesJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 29f3dc31..72996993 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -10,10 +10,10 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class DynamicallyGeneratedCodeJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index 0f4c56c6..ee1f43fc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -9,7 +9,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class EmptyStatementBodyJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
index fb4e601a..fcd796d6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
@@ -7,7 +7,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index eca9abd9..ba584a71 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -10,8 +10,8 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class IncrementDecrementResultUsedJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index 2a3221fe..b3bb4367 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index d77a5509..a3dd49c8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -15,8 +15,8 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NegatedConditionalExpressionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index ecd1afcb..077d2a4c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -18,8 +18,8 @@
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NegatedIfStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
index f65d4630..86370e10 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
@@ -8,9 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NestedConditionalExpressionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index 8daba3f8..cac0c708 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -11,9 +11,9 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NestedFunctionJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
index 84f1ab28..b971f656 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
@@ -6,8 +6,7 @@
 import consulo.configurable.UnnamedConfigurable;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index 633cafea..deae7244 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -7,9 +7,9 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class OctalIntegerJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
index 576eaf48..01fa2167 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
@@ -11,8 +11,8 @@
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
index f7ed289d..da05920e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
@@ -8,7 +8,7 @@
 import consulo.ui.Label;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
index 83ceeec9..a5f4510b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
@@ -15,7 +15,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class OverlyComplexBooleanExpressionJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java
index ab2a197e..5449eaf7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java
@@ -8,7 +8,7 @@
 import consulo.ui.Label;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
index 17e964b9..ac3851b9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
@@ -13,7 +13,7 @@
 import com.sixrr.inspectjs.*;
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
index 0f42899d..a240125f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
@@ -16,8 +16,8 @@
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
index e3e20e0d..2d2579d2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
@@ -10,8 +10,8 @@
 import consulo.language.psi.PsiElement;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class VoidExpressionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
index 82c1fb3a..f1838b75 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
@@ -8,8 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class WithStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
index f204aa0b..b42ff17b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
@@ -9,8 +9,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class BreakStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
index 2372b456..e44c5bd4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
@@ -8,8 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class BreakStatementWithLabelJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
index c282ed2f..bd46b974 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
@@ -10,8 +10,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConditionalExpressionWithIdenticalBranchesJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
index a5e039f8..40a1dbd6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
@@ -10,8 +10,7 @@
 import com.sixrr.inspectjs.*;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import consulo.language.editor.inspection.ProblemDescriptor;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConstantConditionalExpressionJSInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
index 8ebd7a76..0cb6dee6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
@@ -12,7 +12,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConstantIfStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
index af7fa0b3..0a24c71a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
@@ -8,8 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ContinueStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
index 2d464232..78ce535d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
@@ -8,8 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ContinueStatementWithLabelJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index 58786983..744a5af1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -8,8 +8,7 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class DefaultNotLastCaseInSwitchJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
index fd4bced6..bfbf65de 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
@@ -11,8 +11,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
index eb486af4..7b29bdcb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
@@ -12,8 +12,8 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class FallthroughInSwitchStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
index 8b3eaf5f..4fb9e0e6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
@@ -14,7 +14,7 @@
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java
index 97b399c2..af40113c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java
@@ -6,8 +6,7 @@
 import consulo.configurable.UnnamedConfigurable;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
index da35a04f..46f532ad 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
@@ -6,7 +6,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ForLoopThatDoesntUseLoopVariableJSInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
index 367f8e91..834dc95e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class IfStatementWithIdenticalBranchesJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
index 9fded7b8..b892b7e9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class IfStatementWithTooManyBranchesJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java
index fa1a5c11..8900fb5e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java
@@ -8,8 +8,7 @@
 import consulo.ui.IntBox;
 import consulo.ui.Label;
 import consulo.util.xml.serializer.XmlSerializerUtil;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
index daffe18e..40f0f30a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
@@ -7,9 +7,9 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 @ExtensionImpl
 public class LabeledStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
index 5f3f4aad..83ffc86c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
@@ -9,7 +9,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class LoopStatementThatDoesntLoopJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
index e5987017..d09fdc66 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
@@ -8,9 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NestedSwitchStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
index f6adddc7..64882d6f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
@@ -9,8 +9,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class SwitchStatementWithNoDefaultBranchJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
index 453fd25a..980ad6e6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
@@ -10,7 +10,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class TailRecursionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
index 048a447e..121565a7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
@@ -11,10 +11,9 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 public class TrivialConditionalJSInspection
         extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
index b22e97bf..9664939f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
@@ -17,7 +17,7 @@
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 
 @ExtensionImpl
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
index 9596cd6b..9858989a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
@@ -9,8 +9,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnnecessaryContinueJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
index b378d41d..a6a37150 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
@@ -12,7 +12,7 @@
 import com.sixrr.inspectjs.*;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnnecessaryLabelJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
index 78d60c38..b6b66f3a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
@@ -13,8 +13,8 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class UnnecessaryLabelOnBreakStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
index 1f4e8db8..8b3ab4b5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
@@ -12,8 +12,8 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class UnnecessaryLabelOnContinueStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
index e2587272..dc21bac3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
@@ -10,8 +10,7 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class  UnnecessaryReturnJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index 5fe42579..247c00c0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -13,8 +13,8 @@
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ReuseOfLocalVariableJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index daae2e19..cfa3e6d4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -12,7 +12,7 @@
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
index 4cae1dac..6485d7c6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
@@ -7,7 +7,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
index 24048c18..445439f8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
@@ -5,7 +5,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class VariableAssignedVisitor extends JSRecursiveElementVisitor {
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
index 9c8f5e7e..71b5293c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
@@ -1,12 +1,11 @@
 package com.sixrr.inspectjs.dataflow;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nonnull;
 
 public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisitor
 {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
index 2ca6d417..53bef780 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs.dataflow;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index cc8d1b8b..38b6ed0e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -9,10 +9,10 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class DocumentWriteJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index 48c91a4f..3ddbdcd2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -8,8 +8,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class InnerHTMLJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index 51426728..8f3cf5c5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -8,9 +8,9 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class PlatformDetectionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
index 9edfe6cf..a044ec8f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
@@ -9,8 +9,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class XHTMLIncompatabilitiesJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
index 945edbe5..300682d5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
@@ -5,7 +5,7 @@
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 class CatchParameterUsedVisitor extends JSRecursiveElementVisitor {
     private final JSParameter parameter;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
index 44e07ffe..7b61b766 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
@@ -10,8 +10,7 @@
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ContinueOrBreakFromFinallyBlockJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index bd1c0d37..347de179 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -11,9 +11,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class EmptyCatchBlockJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
index 51817209..7888493e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
@@ -10,8 +10,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class EmptyFinallyBlockJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index fb93f69f..397dc04b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -10,8 +10,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class EmptyTryBlockJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index e8ea66a2..047368e9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -12,7 +12,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ExceptionCaughtLocallyJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
index a04ca1f1..a015acc3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
@@ -9,7 +9,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ReturnFromFinallyBlockJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
index ebcadcd2..a58ddf57 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs.exception;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSThrowStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
index c57f938c..8f65e82f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
@@ -14,7 +14,7 @@
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnusedCatchParameterJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
index 45c18657..ba17efdf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
@@ -7,7 +7,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
index 901593f4..7e64ffab 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
@@ -10,7 +10,7 @@
 import consulo.language.editor.refactoring.RenameRefactoring;
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.InspectionJSBundle;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class RenameFix extends InspectionJSFix {
     private final String m_targetName;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index edd04b06..9970d2c7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class CyclomaticComplexityJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
index 32a022f0..517ae42a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
@@ -1,9 +1,8 @@
 package com.sixrr.inspectjs.functionmetrics;
 
-import javax.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
+import jakarta.annotation.Nonnull;
 
 class CyclomaticComplexityVisitor extends JSRecursiveElementVisitor {
     private int complexity = 1;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index bbc1870d..a36c2d9c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -9,7 +9,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class FunctionWithMultipleLoopsJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index 169304e1..c517eadd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -7,7 +7,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class FunctionWithMultipleReturnPointsJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
index e67204d0..a6827dc8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
@@ -2,7 +2,7 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 class LoopCountVisitor extends JSRecursiveElementVisitor {
     private int loopCount = 0;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
index 9e91ea7c..a7b384b5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
@@ -7,7 +7,7 @@
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 class NegationCountVisitor extends JSRecursiveElementVisitor {
     private int negationCount = 0;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index 4487fa90..fc77aa9b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -10,7 +10,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NestingDepthJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
index 11a666e0..bc36e0ef 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
@@ -2,7 +2,7 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 class NestingDepthVisitor extends JSRecursiveElementVisitor {
     private int m_maximumDepth = 0;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index 8e3c2b11..e382b0e0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -12,7 +12,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ParametersPerFunctionJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
index f1894a98..c5038a3a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs.functionmetrics;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index b8092e85..f03377d1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class StatementsPerFunctionJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index 7886e5e2..bf44209b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -10,7 +10,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ThreeNegationsPerFunctionJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
index fb23cc08..b05d51c3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
@@ -8,7 +8,7 @@
 import consulo.util.xml.serializer.XmlSerializerUtil;
 import consulo.util.xml.serializer.annotation.Transient;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.regex.Pattern;
 
 /**
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index 98157ebe..aa335ab6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -12,7 +12,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class FunctionNamingConventionJSInspection extends ConventionInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java
index dfd5e765..c5c77f65 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java
@@ -1,10 +1,7 @@
 package com.sixrr.inspectjs.naming;
 
-import consulo.configurable.UnnamedConfigurable;
 import consulo.language.editor.inspection.InspectionToolState;
 
-import javax.annotation.Nullable;
-
 /**
  * @author VISTALL
  * @since 18/03/2023
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index 22966df2..f1bd22e7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -12,7 +12,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class LocalVariableNamingConventionJSInspection extends ConventionInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index 732295b9..51e6add9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -14,7 +14,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ParameterNamingConventionJSInspection extends ConventionInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index a9a4aeae..e21137a3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ChainedEqualityJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index bf7d95d1..7c0bbfdf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -10,8 +10,7 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ChainedFunctionCallJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index f656258a..26ae5232 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -13,7 +13,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConstantOnLHSOfComparisonJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index 6d4d8da3..6018ff78 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -13,7 +13,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConstantOnRHSOfComparisonJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index d0473e37..f158d5b7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 
 @ExtensionImpl
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
index 1ad6f4d1..75b431ca 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
@@ -9,7 +9,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NonBlockStatementBodyJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index e85f14ff..cb1499f7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -12,9 +12,9 @@
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTagChild;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class UnterminatedStatementJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
index b6d195d5..3aeda2a5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs.utils;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
@@ -9,7 +9,7 @@
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import consulo.language.ast.IElementType;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
 public class BoolUtils {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
index c1cb31cd..a3ebf101 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
@@ -4,8 +4,8 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.language.ast.IElementType;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
index 2673d61c..40b97227 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
@@ -1,12 +1,12 @@
 package com.sixrr.inspectjs.utils;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public class ControlFlowUtils {
     private ControlFlowUtils() {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
index 0471daac..21222477 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
@@ -1,7 +1,7 @@
 package com.sixrr.inspectjs.utils;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import consulo.javascript.language.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.PsiElement;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
index 8e048a64..d76b82a1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
@@ -4,12 +4,11 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.ast.IElementType;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import jakarta.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class ExpressionUtil {
     private ExpressionUtil() {
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
index 6efbab3f..a3fbd60b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
@@ -1,6 +1,6 @@
 package com.sixrr.inspectjs.utils;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index c3381bb7..faaaf425 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -15,11 +15,10 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.ecmascript.psi.ES6ExportDefaultAssignment;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 @ExtensionImpl
 public class BadExpressionStatementJSInspection extends JavaScriptInspection
 {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
index 797eef67..e3f56ac5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
@@ -9,10 +9,10 @@
 import com.sixrr.inspectjs.JavaScriptInspection;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class DebuggerStatementJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index b227509b..fba8afb0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -11,7 +11,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index f8c4fbca..785d884c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -9,7 +9,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index 93b88e91..67d5a840 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -10,8 +10,8 @@
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.language.editor.inspection.ProblemHighlightType;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspection
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index d375c9a2..86fb22fb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -7,8 +7,8 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class StringLiteralBreaksHTMLJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index 1f5d901c..a718ea61 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -14,8 +14,8 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.xml.psi.xml.XmlAttributeValue;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ThisExpressionReferencesGlobalObjectJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
index d019f90c..beff78f7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
@@ -10,8 +10,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class UnreachableCodeJSInspection extends JavaScriptInspection {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
index 4e83e920..15e223eb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
@@ -17,7 +17,7 @@
 
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public interface JSElementPredicate
 {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index 4acc999a..ea2bbc8b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -26,8 +26,8 @@
 import consulo.xml.psi.xml.XmlElement;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 public abstract class JSIntention extends PsiElementBaseIntentionAction {
   private static final String INTENTION_SUFFIX = "Intention";
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 7b9e6c43..37fe5a12 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -19,8 +19,8 @@
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 public abstract class JSMutablyNamedIntention extends JSIntention
 {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
index 3257f1dd..c9420f4a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
@@ -22,7 +22,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 class ComparisonPredicate implements JSElementPredicate
 {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
index 35b3f95c..447c6e63 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
@@ -19,11 +19,10 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 
-import javax.annotation.Nonnull;
-
 class ConjunctionPredicate implements JSElementPredicate
 {
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index ce99621d..67590497 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -30,7 +30,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSDeMorgansLawIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 252ec0e8..94748537 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -22,13 +22,12 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSFlipComparisonIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index c62a79f9..2317d749 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -23,13 +23,12 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSFlipConjunctionIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index 582ec90a..6664739f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -22,13 +22,12 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSNegateComparisonIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index 649f2bfd..b5e54f06 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -30,7 +30,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSRemoveBooleanEqualityIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index 8fe6085a..ea715b5c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -26,7 +26,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSAddBracesIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index d4c0ee81..6bbec666 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -26,7 +26,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSRemoveBracesIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index 55ab6d6f..e4be30c6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -27,7 +27,7 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 74cdce1d..c841acc5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -28,7 +28,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSChangeToEndOfLineCommentIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index cf989c13..0b70d805 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -23,13 +23,12 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSMoveCommentToSeparateLineIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 1f469c50..37cfbed0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -28,7 +28,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSFlipConditionalIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index f5328854..64f9bb2b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -30,7 +30,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSFlipIfIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index adc1c69d..9d97e5f6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -28,7 +28,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSRemoveConditionalIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 791f8e95..2b3c17d3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -24,7 +24,7 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSReplaceConditionalWithIfIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index fd9b4594..66aeda6a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -24,14 +24,13 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSConstantExpressionIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index 5ff7d4ea..01e645da 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nullable;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -32,8 +33,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSConstantSubexpressionIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index 14ee6f5e..d23d2e82 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -25,7 +25,7 @@
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSExtractIncrementIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 1fdd0063..c7f0fc62 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -20,6 +20,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -27,7 +28,6 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
 import java.util.Iterator;
 
 @ExtensionImpl
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index 69c311cd..3b83b734 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -30,7 +30,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index 4100a103..2f6c26a2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -33,7 +33,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSMergeParallelForInLoopsIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 3c43e8a7..d0c6d1b4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -31,7 +31,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSMergeParallelForLoopsIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index ebdcf618..7552dde9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -25,7 +25,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSConvertIntegerToDecimalIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index 6e39e25d..7b42bc59 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -25,7 +25,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSConvertIntegerToHexIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 3343bbc1..bb29594b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -25,7 +25,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSConvertIntegerToOctalIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index add28157..64bb725e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -28,7 +28,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSReplaceMultiplyWithShiftIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index 9f2fd03d..28a236d0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -22,14 +22,13 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSReplaceShiftWithMultiplyIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index 4c45d8e7..77035391 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -25,12 +25,11 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSReplaceWithOperatorAssignmentIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 852e4e32..10107559 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -27,7 +27,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSRemoveUnnecessaryParenthesesIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index d7076630..4db8293e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -24,7 +24,7 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSDoubleToSingleQuotedStringIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index e2458f2a..013a8a9b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -27,12 +27,11 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSJoinConcatenatedStringLiteralsIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index e3aaba47..fade7b3e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -24,7 +24,7 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSSingleToDoubleQuotedStringIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 95fa8662..847c76dc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -22,12 +22,12 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
 import java.util.*;
 
 @ExtensionImpl
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index b0b1821d..43c98e14 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -29,7 +29,7 @@
 import org.intellij.idea.lang.javascript.psiutil.*;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.*;
 
 @ExtensionImpl
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index 3e74ca63..86cd6107 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -28,7 +28,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSMergeElseIfIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index f6699073..40e917ab 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -31,7 +31,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSMergeIfAndIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index 8125af55..06edb2e0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -28,7 +28,7 @@
 import org.intellij.idea.lang.javascript.psiutil.*;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSMergeIfOrIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index d5a0e93a..bd19fb6b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -30,7 +30,7 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSMergeParallelIfsIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index 6c01a689..6afc6e36 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -23,14 +23,13 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSRemoveRedundantElseIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index 2b6cfc05..cb239fde 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -22,13 +22,12 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSReplaceIfWithConditionalIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index f516bd8e..0b9176c3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -27,7 +27,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSSimplifyIfElseIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index 701c162b..e78afee8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -26,7 +26,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSSplitElseIfIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index c3bf0f3b..7dd47c43 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -31,8 +32,6 @@
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSSplitIfAndIntention", categories = {
 		"JavaScript",
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index 12adcd7f..4ba0fa15 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -31,7 +31,7 @@
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSSplitIfOrIntention", categories = {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
index e336f3c6..c04eedb7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
@@ -19,10 +19,9 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.language.ast.IElementType;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nullable;
-
 public class BoolUtils
 {
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
index d1c34480..2772a5b2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
@@ -20,8 +20,8 @@
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
index ffa37cf4..a794d5f9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
@@ -19,8 +19,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiErrorElement;
 import consulo.language.psi.PsiRecursiveElementVisitor;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class ErrorUtil
 {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
index 29ce3d62..061a1cbf 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
@@ -21,8 +21,8 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
index d81294d0..21c2fc31 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
@@ -22,11 +22,11 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.xml.psi.xml.XmlFile;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.intellij.idea.lang.javascript.intention.JSElementIterator;
 import org.intellij.idea.lang.javascript.intention.JSFunctionVisitor;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
index c14ce614..b4980d05 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
@@ -33,7 +33,7 @@
 import consulo.virtualFileSystem.VirtualFile;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  *
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
index 4c9cca65..e8573086 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
@@ -18,8 +18,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.ast.IElementType;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class RecursionUtil
 {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
index 3f694678..488afd66 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
@@ -18,8 +18,8 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 public class TreeUtil
 {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
index 7122df6a..9fac204b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
@@ -20,7 +20,7 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
index 2c46e82a..ede6de31 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
@@ -28,8 +28,8 @@
 import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
index 068e7de0..75a3054e 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
@@ -3,8 +3,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
index 744e4aa7..8c74a0e0 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
@@ -10,7 +10,7 @@
 import consulo.language.lexer.Lexer;
 import consulo.language.parser.PsiParser;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
index 79cd0c9f..a236f186 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
@@ -22,8 +22,7 @@
 import consulo.javascript.ecmascript.lang.BaseEcmaScriptJavaScriptVersion;
 import consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory;
 import consulo.javascript.language.JavaScriptLanguageVersion;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
index c6b42d32..6085f2a1 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
@@ -7,8 +7,7 @@
 import consulo.language.editor.completion.lookup.LookupElementBuilder;
 import consulo.language.util.ProcessingContext;
 import consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
index 9c765d12..5c2883cf 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -16,7 +16,7 @@
 import consulo.language.lexer.MergingLexerAdapter;
 import consulo.language.parser.PsiParser;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
index b35eff5f..a2f42dc0 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
@@ -3,7 +3,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import jakarta.inject.Inject;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
index 74207140..6215b1e0 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
@@ -2,10 +2,9 @@
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptFeature;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 
-import javax.annotation.Nonnull;
-
 /**
  * @author VISTALL
  * @since 06/12/2021
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
index a6ca7876..6931cd51 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
@@ -5,7 +5,7 @@
 import consulo.javascript.language.JavaScriptLanguage;
 import jakarta.inject.Inject;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
index 8db98a4f..fe0fd375 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
@@ -23,7 +23,7 @@
 import consulo.javascript.language.StandardJavaScriptVersion;
 import jakarta.inject.Inject;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
index cd75a50f..8d68b172 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
@@ -4,7 +4,7 @@
 import consulo.javascript.language.JavaScriptFeature;
 import jakarta.inject.Inject;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
index 864433dd..762eb6d9 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
@@ -1,10 +1,9 @@
 package consulo.javascript.ecmascript.lang;
 
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 
-import javax.annotation.Nonnull;
-
 /**
  * @author VISTALL
  * @since 06/12/2021
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
index c8a80313..aa53f532 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
@@ -2,10 +2,9 @@
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptFeature;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 
-import javax.annotation.Nonnull;
-
 /**
  * @author VISTALL
  * @since 06/12/2021
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
index 364781fc..24eb3133 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
@@ -29,8 +29,8 @@
 import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
index 9e18e457..561bdcef 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
@@ -4,7 +4,7 @@
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
index 7a9a5529..1dee3897 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
@@ -21,7 +21,7 @@
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 import consulo.language.parser.PsiBuilder;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
index adc740ae..33bfbd51 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
@@ -20,7 +20,7 @@
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 import consulo.javascript.lang.parsing.StatementParsing;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index e7afa4bc..d27d7a24 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -28,7 +28,7 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
index b2718d8c..6351b677 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
@@ -3,8 +3,7 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiNameIdentifierOwner;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
index 8b268040..5bf95e50 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
@@ -3,7 +3,7 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import consulo.annotation.access.RequiredReadAction;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
index 8bd18081..da3e1c29 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
@@ -10,8 +10,8 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
index 975ea395..ea19c28c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
@@ -8,7 +8,7 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
index cae389d9..d2734fff 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
@@ -10,8 +10,8 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
index 0a879af6..f7d64c3b 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
@@ -13,8 +13,8 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
index 2c21b944..9dc3a191 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
@@ -10,7 +10,7 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
index e3a22089..0dbfa943 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
@@ -15,9 +15,9 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.Comparing;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
index 0e32bf7e..d7e72f19 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
@@ -10,7 +10,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.xml.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeHighlightingPass;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
index ddbde5cb..84b25056 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
@@ -5,8 +5,7 @@
 import consulo.fileTemplate.CreateFromTemplateHandler;
 import consulo.fileTemplate.FileTemplate;
 import consulo.javascript.jsx.language.JSXFileType;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
index 8215ed78..df836de1 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
@@ -11,8 +11,8 @@
 import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
index 68170888..944d87af 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
@@ -4,7 +4,7 @@
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
index 3db5f974..f835371c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
@@ -3,8 +3,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ecmascript.lang.EcmaScript6JavaScriptVersion;
 import consulo.javascript.language.JavaScriptLanguage;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
index b95b6769..15d371f5 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
@@ -3,9 +3,9 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReferenceBase;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
index ce6fabb9..a1de075d 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
@@ -8,7 +8,7 @@
 import consulo.language.psi.*;
 import consulo.language.util.ProcessingContext;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
index 169b05df..f3e084fb 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
@@ -10,8 +10,7 @@
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.language.lexer.Lexer;
 import consulo.language.parser.PsiParser;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
index 8aaaad41..5bd643de 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
@@ -3,7 +3,7 @@
 import consulo.javascript.lang.parsing.JavaScriptParser;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
index d3a2da3a..3533cd4f 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
@@ -4,8 +4,7 @@
 import consulo.javascript.lang.parsing.FunctionParsing;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 import consulo.javascript.lang.parsing.StatementParsing;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
index 9c142476..df29143d 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
@@ -8,7 +8,7 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
index 9b7a9adb..e2bd9187 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
@@ -25,7 +25,7 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.function.Supplier;
 
 /**
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
index af42dc90..13b62614 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
@@ -25,7 +25,7 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.function.Supplier;
 
 /**
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
index db36cd1e..2c8bf63d 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
@@ -25,7 +25,7 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.function.Supplier;
 
 /**
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
index 7e1e3b00..c5eaad98 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
@@ -24,8 +24,8 @@
 import consulo.javascript.language.StandardJavaScriptVersion;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
 import java.util.function.Supplier;
 
 /**
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
index 455c3d39..4311100a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
@@ -26,9 +26,9 @@
 import consulo.module.Module;
 import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
index ea9f6a79..305ec2a9 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
@@ -3,8 +3,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
index ea17af09..8437d4be 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
@@ -22,7 +22,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.ui.image.Image;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
index f6ed4647..3c47c095 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
@@ -22,7 +22,7 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.lazy.LazyValue;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.function.Supplier;
 
 /**
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
index a2dbd22b..1fb03a90 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -22,8 +22,7 @@
 import consulo.language.icon.IconDescriptorUpdater;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index ada3199f..614c0c7f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -34,8 +34,8 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
index 15b30c1f..025fd8b4 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
@@ -25,8 +25,8 @@
 import consulo.language.psi.PsiFile;
 import consulo.util.collection.ContainerUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
index 65a8652b..bc7de45e 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
@@ -2,9 +2,9 @@
 
 import consulo.util.lang.ObjectUtil;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.lang.reflect.Method;
 
 /**
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
index 21b70e4a..f16689ec 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
@@ -4,8 +4,8 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.JomElement;
 import consulo.json.jom.JomUtil;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
index 302abecd..b4556dd2 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
@@ -8,8 +8,8 @@
 import consulo.json.jom.proxy.impl.*;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
 import java.util.*;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
index d5d37e31..ff4f53f5 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
@@ -2,8 +2,8 @@
 
 import java.lang.reflect.Type;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
index bcfc0889..71cc177a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
@@ -4,7 +4,7 @@
 import java.lang.reflect.Type;
 import java.util.Collection;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
index ae1cfabf..42b48943 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
@@ -5,7 +5,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
index 9c4dbe50..48eeba33 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
@@ -12,7 +12,7 @@
 import consulo.util.lang.lazy.LazyValue;
 import consulo.util.lang.reflect.ReflectionUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.function.Supplier;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
index c71c9198..11937677 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
@@ -2,7 +2,7 @@
 
 import java.lang.reflect.Type;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.language.psi.PsiElement;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index ef466ece..59cfaf5d 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -13,7 +13,7 @@
 import consulo.language.version.LanguageVersion;
 import consulo.logging.Logger;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
index d7a88824..e88e67f0 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
@@ -11,8 +11,9 @@
 import consulo.language.parser.PsiParser;
 import consulo.virtualFileSystem.fileType.FileType;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
 import java.util.function.Supplier;
 
 /**
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
index 3f9a44e5..4e50b3ba 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
@@ -5,7 +5,7 @@
 import consulo.json.JsonFileType;
 import consulo.virtualFileSystem.fileType.FileType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
index 73e65058..ea37c99f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
@@ -23,7 +23,7 @@
 import consulo.json.validation.descriptor.JsonObjectDescriptor;
 import consulo.language.psi.PsiFile;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
index 73acb67a..397513a0 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
@@ -16,8 +16,6 @@
 
 package consulo.json.validation;
 
-import javax.annotation.Nullable;
-
 import consulo.annotation.access.RequiredReadAction;
 import consulo.application.util.CachedValuesManager;
 import consulo.json.JsonFileType;
@@ -25,6 +23,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.application.util.CachedValueProvider;
 import consulo.language.psi.PsiModificationTracker;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
index de902df7..2915ad10 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
@@ -16,7 +16,7 @@
 
 package consulo.json.validation;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
index cb6ea592..41b38436 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -43,7 +43,7 @@
 import consulo.util.collection.ContainerUtil;
 import consulo.util.lang.StringUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.*;
 
 /**
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index 378c37eb..f81dc90a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -38,8 +38,8 @@
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
index 792e0dcf..374b9355 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
@@ -26,7 +26,7 @@
 import consulo.util.lang.Pair;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
index 317daf99..2625158b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
@@ -24,8 +24,8 @@
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
index c40377d2..9ca87e37 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
@@ -22,7 +22,7 @@
 import consulo.fileEditor.EditorNotificationProvider;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.function.Consumer;
 
 /**
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index 4e31d177..2e43d504 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -41,8 +41,8 @@
 import jakarta.inject.Singleton;
 import org.jdom.Element;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
index edca4c39..d57b039d 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
@@ -19,13 +19,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import consulo.json.validation.NativeArray;
-import consulo.util.collection.ContainerUtil;
-import consulo.language.impl.ast.Factory;
-import consulo.util.collection.Maps;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
index c1278419..d5d0778c 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
@@ -21,8 +21,8 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.SmartPsiElementPointer;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index 7653958b..7e3ef5ea 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -42,8 +42,8 @@
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.function.PairProcessor;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.*;
 
 /**
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
index 0df3f52a..06225e2e 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
@@ -16,14 +16,13 @@
 
 package consulo.json.validation.psi.reference;
 
-import javax.annotation.Nullable;
-
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.validation.descriptor.JsonPropertyDescriptor;
 import consulo.json.validation.inspections.PropertyValidationInspection;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReference;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
index 96b280f7..35466612 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
@@ -24,9 +24,8 @@
 import consulo.json.validation.inspections.PropertyValidationInspection;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index 5be239f6..ac7b376e 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -29,8 +29,8 @@
 import consulo.typescript.version.TypeScriptLanguageVersion;
 import consulo.ui.image.Image;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
index b529295c..71248ff8 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
@@ -19,8 +19,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
index c16c9fdb..ab50be70 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
@@ -5,7 +5,7 @@
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptLanguage;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
index fe7af18c..affa83ad 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
@@ -33,7 +33,7 @@
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSClassNameMacro extends Macro
diff --git a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
index 1ddba26c..67d427d1 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
@@ -30,7 +30,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSImplementationTextSelectioner implements ImplementationTextSelectioner
diff --git a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
index 056d2dbb..bb7d8e12 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
@@ -29,7 +29,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSMethodNameMacro extends Macro
diff --git a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
index b6eaf6fd..e82ff321 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
@@ -33,8 +33,8 @@
 import consulo.language.psi.search.DefinitionsScopedSearch;
 import consulo.util.collection.ArrayUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.*;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
index 5ec6c534..688c380a 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
@@ -23,7 +23,7 @@
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author peter
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
index 8bf64619..ac65997a 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
@@ -21,8 +21,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSDocTagManipulator extends JSAbstractElementManipulator<JSDocTag>
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
index f9a9f2da..6346874b 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
@@ -20,7 +20,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author peter
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
index 6fff3a61..e029cc97 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
@@ -31,7 +31,7 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
index 4fd76cc9..38f2381c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
@@ -35,8 +35,7 @@
 import consulo.util.lang.ref.Ref;
 import consulo.virtualFileSystem.fileType.FileType;
 import consulo.xml.lang.xml.XMLLanguage;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
index 634bf0f8..d27d081a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
@@ -22,8 +22,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.TargetElementUtilExtender;
 import consulo.language.psi.PsiElement;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
index 6800da67..ea5879ff 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
@@ -24,8 +24,8 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiComment;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author max
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
index 219047d9..dc2a10a5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
@@ -22,8 +22,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.application.AllIcons;
 import consulo.usage.UsageGroup;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
index 09871c2a..4494aa5b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
@@ -28,7 +28,7 @@
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlToken;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * User: max
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
index c2bfac95..51b80a31 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
@@ -21,8 +21,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.application.AllIcons;
 import consulo.usage.UsageGroup;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
index b2b33dcb..20b2dd6f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -39,9 +39,8 @@
 import consulo.util.dataholder.Key;
 import consulo.util.lang.Comparing;
 import consulo.virtualFileSystem.status.FileStatus;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
index 08669f84..b513e007 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -49,7 +49,7 @@
 import consulo.util.collection.SmartList;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
index bfec99bb..4f7a827a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
@@ -37,7 +37,7 @@
 import consulo.util.lang.EmptyRunnable;
 import consulo.util.lang.Pair;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.*;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
index 4c8cc091..204c0203 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
@@ -42,8 +42,8 @@
 import consulo.xml.psi.xml.XmlText;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.*;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
index 5297d6a7..fb424486 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
@@ -18,8 +18,8 @@
 
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Set;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
index 4ce5b526..ae72c5bf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
@@ -19,8 +19,8 @@
 import java.util.LinkedList;
 
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.stubs.impl.JSAttributeNameValuePairStubImpl;
 import com.intellij.lang.javascript.psi.stubs.impl.JSReferenceListStubImpl;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
index 38f3c2d6..23a63665 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
@@ -21,7 +21,7 @@
 
 import consulo.util.collection.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import consulo.util.lang.StringUtil;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
index c23677c8..e684bec6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
@@ -16,8 +16,8 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
index e49008ed..81f9de42 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
@@ -16,8 +16,7 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import javax.annotation.Nonnull;
-
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
index 888d0417..2074e0ca 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
@@ -22,7 +22,7 @@
 import java.io.UnsupportedEncodingException;
 import java.util.zip.InflaterInputStream;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
index 0e768417..2ca09555 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
@@ -17,8 +17,8 @@
 package com.intellij.lang.javascript.impl.flex.importer;
 
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
index b9e9a12a..82574aa3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
@@ -22,9 +22,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.annotation.Nonnull;
-
 import consulo.language.psi.stub.StubElement;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
index c9763a86..8f985a8f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
index 8a5040d7..675d06b9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
@@ -36,7 +36,7 @@
 import consulo.language.editor.folding.FoldingBuilder;
 import consulo.language.psi.PsiWhiteSpace;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
index 389b6515..78b197a6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
@@ -29,7 +29,7 @@
 import consulo.virtualFileSystem.fileType.FileType;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import java.awt.event.ItemEvent;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
index 24abcc8d..fcadded6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
@@ -25,9 +25,8 @@
 import consulo.language.codeStyle.CodeStyleSettings;
 import consulo.language.codeStyle.CustomCodeStyleSettings;
 import consulo.language.codeStyle.setting.CodeStyleSettingsProvider;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
index 373b3e13..9266d98d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.impl.formatter;
 
-import javax.annotation.Nonnull;
-
 import consulo.language.codeStyle.FormattingModel;
 import consulo.language.codeStyle.FormattingModelProvider;
 import consulo.language.ast.ASTNode;
@@ -26,6 +24,7 @@
 import consulo.language.codeStyle.Block;
 import consulo.language.codeStyle.FormattingDocumentModel;
 import consulo.language.psi.PsiFile;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
index cb573b42..a518c1d0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
@@ -28,7 +28,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JavascriptFormattingModelBuilder implements FormattingModelBuilder
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
index c2b7a9d6..0aff8bda 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
@@ -28,8 +28,8 @@
 import consulo.language.psi.PsiErrorElement;
 import consulo.language.psi.PsiWhiteSpace;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.List;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
index 33247c74..237900e2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
@@ -19,8 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
 import consulo.language.codeStyle.Alignment;
 import consulo.language.codeStyle.Block;
 import consulo.language.codeStyle.Indent;
@@ -29,6 +28,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.document.util.TextRange;
 import consulo.language.codeStyle.ChildAttributes;
+import jakarta.annotation.Nullable;
 
 /**
  * @author yole
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
index 16835acb..e00e940f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
@@ -29,8 +29,8 @@
 import consulo.language.ast.IElementType;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
index b77000dd..49571634 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
@@ -28,8 +28,7 @@
 import consulo.ui.ex.action.AnAction;
 import consulo.ui.ex.action.AnActionEvent;
 import consulo.virtualFileSystem.VirtualFile;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
index 0c3642d7..539eca69 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
@@ -38,7 +38,7 @@
 import consulo.project.Project;
 import consulo.undoRedo.CommandProcessor;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
index 9cfd208c..17d30834 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
@@ -37,7 +37,7 @@
 import consulo.util.lang.StringUtil;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import javax.swing.*;
 import java.util.*;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
index e57866ee..3e804004 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
@@ -23,9 +23,9 @@
 import consulo.language.Language;
 import consulo.language.PairedBraceMatcher;
 import consulo.language.ast.IElementType;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * User: max
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
index fd1913b0..05b881d6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
@@ -27,7 +27,7 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
index 016410bb..0f2b72b2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
@@ -38,8 +38,8 @@
 import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 public class JavaScriptHighlightVisitor extends JSElementVisitor implements HighlightVisitor
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
index 600a9b3f..91204479 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
@@ -6,7 +6,7 @@
 import consulo.language.editor.rawHighlight.HighlightVisitorFactory;
 import consulo.language.psi.PsiFile;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
index 9d37386a..3f8f956b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
@@ -44,8 +44,8 @@
 import consulo.util.dataholder.Key;
 import consulo.util.lang.ref.Ref;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.event.MouseEvent;
 import java.util.*;
 import java.util.function.Function;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
index 6d7fc913..643b000f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
@@ -42,7 +42,7 @@
 import consulo.virtualFileSystem.util.VirtualFileUtil;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Properties;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
index 540de9a1..c1136623 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
@@ -29,7 +29,7 @@
 import consulo.language.psi.ResolveResult;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
index 178b1b31..c93b066e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
@@ -35,7 +35,7 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
index 8f100336..3db30641 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
@@ -32,8 +32,8 @@
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * User: Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
index 276a1108..4433cefa 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
@@ -38,7 +38,7 @@
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.LinkedList;
 import java.util.List;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
index c58af7fc..cdff7322 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
@@ -46,10 +46,11 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.xml.ide.highlighter.XmlFileType;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+
 import java.util.LinkedList;
 import java.util.List;
 import java.util.function.BiFunction;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
index c0d553bc..1318b365 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
@@ -39,9 +39,9 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
index 76086235..fd9ad07d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
@@ -44,7 +44,7 @@
 import consulo.project.Project;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
index 6285611c..e02dc46c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
@@ -44,7 +44,7 @@
 import consulo.util.dataholder.Key;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.BitSet;
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
index d57a64e9..90e1d7b8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
@@ -35,8 +35,7 @@
 import consulo.navigation.NavigationItem;
 import consulo.project.Project;
 import consulo.ui.ex.popup.JBPopup;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JavaScriptGotoSuperHandler implements GotoSuperActionHander
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
index 5529826c..3ead17b8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
@@ -34,8 +34,8 @@
 import consulo.project.Project;
 import consulo.util.io.FileUtil;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Collection;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
index eae7a968..1eb1bb04 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
@@ -23,8 +23,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class BasicJavascriptNamesValidator extends JSNamesValidator
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
index 8d00e31b..ee97e355 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
@@ -46,10 +46,11 @@
 import consulo.project.ui.wm.WindowManager;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.undoRedo.CommandProcessor;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
index 71eca1dd..0f153d79 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
@@ -31,9 +31,8 @@
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.scope.LocalSearchScope;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class JavascriptRefactoringSupportProvider extends RefactoringSupportProvider
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
index 9217c539..2bd40121 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
@@ -27,7 +27,7 @@
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.undoRedo.CommandProcessor;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
index 47cd35ee..1e746881 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
@@ -22,7 +22,7 @@
 import consulo.language.editor.hint.DeclarationRangeHandler;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
index b276b37c..2e8e59b3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
@@ -27,14 +27,13 @@
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiNamedElement;
-import consulo.language.psi.PsiReference;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.language.psi.search.DefinitionsScopedSearch;
 import consulo.language.psi.search.DefinitionsScopedSearchExecutor;
 import consulo.language.psi.search.ReferencesSearch;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
index c8f84bcc..9c4e0dbc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
@@ -23,8 +23,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.navigation.ItemPresentation;
 import consulo.navigation.NavigationItem;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
index 40983222..ae9b4c7e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
@@ -24,8 +24,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiNamedElement;
 import consulo.ui.image.Image;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
index e13ce8df..fa676c23 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
@@ -28,8 +28,7 @@
 import consulo.language.Language;
 import consulo.language.editor.structureView.PsiStructureViewFactory;
 import consulo.language.psi.PsiFile;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSStructureViewBuilderFactory implements PsiStructureViewFactory
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
index 7b664476..52fb4034 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
@@ -31,7 +31,7 @@
 import consulo.util.collection.primitive.ints.IntMaps;
 import consulo.util.collection.primitive.ints.IntObjectMap;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.*;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
index c87b731a..8b5a7384 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
@@ -35,7 +35,7 @@
 import consulo.util.lang.ref.Ref;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.Comparator;
 import java.util.List;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
index 910aa90d..05e7b8d8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
@@ -20,13 +20,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import consulo.application.AllIcons;
 import consulo.fileEditor.structureView.tree.Group;
 import consulo.navigation.ItemPresentation;
 import consulo.fileEditor.structureView.tree.TreeElement;
 import consulo.ui.image.Image;
+import jakarta.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
index 1dcb6761..075719f0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
@@ -25,11 +25,10 @@
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import consulo.language.psi.PsiElement;
-import consulo.ide.IdeBundle;
 import consulo.platform.base.icon.PlatformIconGroup;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
index 9a7cb915..75908cbe 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
@@ -28,8 +28,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.util.PsiTreeUtil;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * User: yole
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
index f98ff314..b3944fd6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.codeEditor.Editor;
 import consulo.language.codeStyle.CodeStyleManager;
@@ -25,7 +25,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.document.util.TextRange;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
index 8f651c80..a9023d2a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
@@ -32,7 +32,7 @@
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
index 8569622b..caf7926d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
@@ -27,8 +27,8 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
index 96ab2803..fd8b5bd8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -25,10 +25,9 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 /**
  * Created by IntelliJ IDEA.
  * User: yole
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
index 8a406ee5..85ba6f7c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
@@ -27,7 +27,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.impl.flex.ImportUtils;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
index 22951eb8..ae32dc65 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
@@ -26,10 +26,9 @@
 import consulo.language.editor.intention.SyntheticIntentionAction;
 import consulo.language.psi.PsiFile;
 import consulo.project.Project;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
-
 /**
  * @author Maxim.Mossienko
  * Date: Jul 17, 2008
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
index 6a0d4d84..0ed4ceda 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
@@ -24,8 +24,8 @@
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Function;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index 18286eee..8c325f5b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -56,7 +56,7 @@
 import consulo.xml.psi.xml.XmlTagChild;
 import org.jetbrains.annotations.NonNls;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.*;
 
 /**
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
index d371e790..be889e39 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
@@ -6,8 +6,8 @@
 import consulo.language.editor.annotation.Annotator;
 import consulo.language.editor.annotation.AnnotatorFactory;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
index 67506cea..e121fbd7 100644
--- a/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
+++ b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
@@ -29,8 +29,8 @@
 import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.image.Image;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
index 164ae2b7..752e7313 100644
--- a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
+++ b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
@@ -23,8 +23,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiWhiteSpace;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class UpdateJavaScriptFileCopyright extends UpdatePsiFileCopyright<CopyrightFileConfig>
 {
diff --git a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
index c832e012..2d08111a 100644
--- a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
@@ -11,7 +11,7 @@
 import consulo.project.Project;
 import consulo.virtualFileSystem.fileType.FileType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java b/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
index edceabde..4ce94cc9 100644
--- a/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
+++ b/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
@@ -6,8 +6,8 @@
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import consulo.language.psi.PsiElement;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
index 108e3799..7af99a38 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
@@ -1,6 +1,6 @@
 package consulo.javascript.impl.formatter;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import consulo.language.codeStyle.ui.setting.CodeStyleAbstractConfigurable;
 import consulo.language.codeStyle.CodeStyleSettings;
diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index 220bf5ea..e94004bf 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -10,7 +10,7 @@
 import consulo.language.codeStyle.ui.setting.SmartIndentOptionsEditor;
 import consulo.util.io.FileUtil;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 
 /**
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
index 174a10de..a1b03520 100644
--- a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
@@ -10,7 +10,7 @@
 import consulo.xml.lang.HtmlScriptContentProvider;
 import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
index b36a182e..87957250 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
@@ -16,8 +16,7 @@
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.virtualFileSystem.fileType.FileType;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
index 66a4c5d7..db5ada54 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
@@ -3,8 +3,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.fileTemplate.FileTemplateContributor;
 import consulo.fileTemplate.FileTemplateRegistrator;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
index 08601a22..0d4202db 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -30,7 +30,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.ProcessingContext;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
index 07e554ac..3aa22d1c 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
@@ -5,7 +5,7 @@
 import consulo.language.Language;
 import consulo.language.editor.completion.SkipAutopopupInStrings;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java b/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
index ac0ae4ce..38e217ae 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
@@ -7,9 +7,9 @@
 import consulo.language.psi.PsiElement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.JavaScriptLanguage;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
index 09529cfb..cad8e12c 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
@@ -21,7 +21,7 @@
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
index 661a185e..6984f3b8 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
@@ -20,8 +20,9 @@
 import consulo.virtualFileSystem.FileAttribute;
 import consulo.virtualFileSystem.VirtualFile;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
index 15a96023..0832af44 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
@@ -32,8 +32,8 @@
 import consulo.language.version.LanguageVersionResolver;
 import consulo.language.Language;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
index dd3720e7..3fc68a65 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
@@ -34,8 +34,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.util.LanguageUtil;
 import consulo.language.version.LanguageVersionableParserDefinition;
-
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
index c4212f48..d2eaefee 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
@@ -29,8 +29,9 @@
 import consulo.navigation.NavigationItem;
 import consulo.project.Project;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
 import java.util.Collection;
 
 /**
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java b/plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java
index 0b7f5ec3..bd077848 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java
@@ -16,8 +16,8 @@
 
 package consulo.javascript.impl.lang.psi;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
diff --git a/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
index 11621ffc..61a95b1b 100644
--- a/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
@@ -25,8 +25,8 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
index c79e6a84..ca822653 100644
--- a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
+++ b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
@@ -8,8 +8,8 @@
 import org.intellij.lang.regexp.psi.RegExpGroup;
 import org.intellij.lang.regexp.psi.RegExpNamedGroupRef;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
index bd3b6efe..44606933 100644
--- a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
+++ b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
@@ -26,7 +26,7 @@
 import consulo.language.psi.PsiLanguageInjectionHost;
 import org.intellij.lang.regexp.RegExpLanguage;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index c957f371..c2646b17 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -16,8 +16,8 @@
 import consulo.module.extension.ModuleInheritableNamedPointer;
 import org.jdom.Element;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index b06b1750..5675fdfc 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -26,7 +26,7 @@
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.ui.ex.awt.LabeledComponent;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import javax.swing.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
index b0a3cc4d..c44f06b1 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
@@ -9,7 +9,7 @@
 import consulo.module.extension.MutableModuleExtension;
 import consulo.ui.image.Image;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index 88eca5df..83ee3396 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -12,8 +12,8 @@
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.layout.VerticalLayout;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import javax.swing.*;
 
 /**
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index b1627237..ee53edc7 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -9,8 +9,8 @@
 import consulo.content.bundle.SdkModificator;
 import consulo.virtualFileSystem.LocalFileSystem;
 import consulo.virtualFileSystem.VirtualFile;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
 import java.io.File;
 import java.util.Map;
 
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index c23416e2..1d0f215a 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -8,8 +8,8 @@
 import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.ui.image.Image;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL

From 278a74f40471426f9d33d3dc7544845868546943 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 8 Jul 2024 18:15:26 +0400
Subject: [PATCH 192/340] typo

---
 .../com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java  | 2 +-
 .../com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java     | 2 +-
 .../com/intellij/lang/javascript/psi/impl/JSReferenceSet.java   | 2 +-
 .../lang/javascript/impl/validation/JSAnnotatingVisitor.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index e3305df3..8f40fa38 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -214,7 +214,7 @@ public boolean isSoft()
 
 		@Nonnull
 		@Override
-		public LocalizeValue buildUnresolvedMessaged(@Nonnull String referenceText)
+		public LocalizeValue buildUnresolvedMessage(@Nonnull String referenceText)
 		{
 			return LocalizeValue.localizeTODO("Unknown metadata tag");
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index d6526008..1f090952 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -327,7 +327,7 @@ public Object[] getVariants()
 
 		@Nonnull
 		@Override
-		public LocalizeValue buildUnresolvedMessaged(@Nonnull String referenceText)
+		public LocalizeValue buildUnresolvedMessage(@Nonnull String referenceText)
 		{
 			return JavaScriptLocalize.javascriptValidationMessageIncorrectParameterName();
 		}
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index b06483dd..369e486f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -551,7 +551,7 @@ private ResolveResult[] doOldResolve(PsiFile psiFile)
 
 		@Nonnull
 		@Override
-		public LocalizeValue buildUnresolvedMessaged(@Nonnull String text)
+		public LocalizeValue buildUnresolvedMessage(@Nonnull String text)
 		{
 			text = "'" + text.replace("'", "''") + "'";
 			return JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage2(text);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index 8c325f5b..7e675836 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -98,7 +98,7 @@ private void checkReferences(final PsiElement includeDirective, HighlightSeverit
           elementRange.getStartOffset() + textRange.getStartOffset(),
           elementRange.getStartOffset() + textRange.getEndOffset()
         );
-        final LocalizeValue value = ((EmptyResolveMessageProvider) ref).buildUnresolvedMessaged(ref.getCanonicalText());
+        final LocalizeValue value = ((EmptyResolveMessageProvider) ref).buildUnresolvedMessage(ref.getCanonicalText());
         AnnotationBuilder builder = myHolder.newAnnotation(kind, value);
         builder = builder.range(range);
 

From 8f7475fc2f64df31f57cf132729a3fdd9b34cc4b Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 11 Jul 2024 19:47:01 +0300
Subject: [PATCH 193/340] Localize fixes.

---
 .../lang/parsing/ExpressionParsing.java       |  9 +++---
 .../lang/parsing/FunctionParsing.java         |  2 +-
 .../javascript/lang/parsing/JSXParser.java    | 29 ++++++++++---------
 .../lang/parsing/StatementParsing.java        |  2 +-
 .../run/debug/v8/V8BaseDebugProcess.java      |  9 +++---
 .../parsing/EcmaScriptStatementParsing.java   |  4 +--
 .../json/lang/JsonJavaScriptParser.java       |  3 +-
 7 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 03b011b5..7655cd4a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -24,6 +24,7 @@
 import consulo.language.ast.IElementType;
 import consulo.language.ast.TokenSet;
 import consulo.language.parser.PsiBuilder;
+import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.util.dataholder.Key;
 
@@ -72,7 +73,7 @@ else if(isIdentifierName(builder, firstToken) || firstToken == JSTokenTypes.ANY_
 		}
 		else if(firstToken == JSTokenTypes.REGEXP_LITERAL)
 		{
-			String errorMessage = validateLiteral(builder);
+			LocalizeValue errorMessage = validateLiteral(builder);
 			Parsing.buildTokenElement(JSElementTypes.REGEXP_LITERAL_EXPRESSION, builder);
 			if(errorMessage != null)
 			{
@@ -89,7 +90,7 @@ else if(firstToken == JSTokenTypes.NUMERIC_LITERAL ||
 				firstToken == JSTokenTypes.FALSE_KEYWORD ||
 				firstToken == JSTokenTypes.TRUE_KEYWORD)
 		{
-			String errorMessage = validateLiteral(builder);
+			LocalizeValue errorMessage = validateLiteral(builder);
 			Parsing.buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
 			if(errorMessage != null)
 			{
@@ -176,7 +177,7 @@ private void parseTag(final PsiBuilder builder)
 	}
 
 	@Nullable
-	public static String validateLiteral(final PsiBuilder builder)
+	public static LocalizeValue validateLiteral(final PsiBuilder builder)
 	{
 		final IElementType ttype = builder.getTokenType();
 		if(ttype == JSTokenTypes.STRING_LITERAL || ttype == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL)
@@ -188,7 +189,7 @@ public static String validateLiteral(final PsiBuilder builder)
 					ttext.startsWith("\"") && (!ttext.endsWith("\"") || ttext.length() == 1) ||
 					ttext.startsWith("\'") && (!ttext.endsWith("\'") || ttext.length() == 1))
 			{
-				return JavaScriptLocalize.javascriptParserMessageUnclosedStringLiteral().get();
+				return JavaScriptLocalize.javascriptParserMessageUnclosedStringLiteral();
 			}
 		}
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index 93270a20..ecdc96e8 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -211,7 +211,7 @@ protected void parseDeconstructionParameter(PsiBuilder builder, PsiBuilder.Marke
 			{
 				PsiBuilder.Marker err = builder.mark();
 				builder.advanceLexer();
-				err.error("Expected identifier");
+				err.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
 			}
 		}
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index 3d050dd3..2b20ad3d 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -7,12 +7,13 @@
 import consulo.language.ast.ILazyParseableElementType;
 import consulo.language.ast.TokenType;
 import consulo.language.parser.PsiBuilder;
-import consulo.xml.codeInsight.daemon.XmlErrorMessages;
+import consulo.localize.LocalizeValue;
+import consulo.xml.impl.localize.XmlErrorLocalize;
 import consulo.xml.psi.xml.XmlElementType;
 import consulo.xml.psi.xml.XmlTokenType;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.Stack;
 
 /**
@@ -48,7 +49,7 @@ private IElementType token()
 		return myBuilder.getTokenType();
 	}
 
-	private void error(String error)
+	private void error(LocalizeValue error)
 	{
 		myBuilder.error(error);
 	}
@@ -65,7 +66,7 @@ private String parseTagHeader(final boolean multipleRootTagError, final PsiBuild
 		{
 			final PsiBuilder.Marker error = mark();
 			advance();
-			error.error(XmlErrorMessages.message("xml.parsing.multiple.root.tags"));
+			error.error(XmlErrorLocalize.xmlParsingMultipleRootTags());
 		}
 		else
 		{
@@ -75,7 +76,7 @@ private String parseTagHeader(final boolean multipleRootTagError, final PsiBuild
 		final String tagName;
 		if(token() != JSTokenTypes.XML_NAME || myBuilder.rawLookup(-1) == TokenType.WHITE_SPACE)
 		{
-			error(XmlErrorMessages.message("xml.parsing.tag.name.expected"));
+			error(XmlErrorLocalize.xmlParsingTagNameExpected());
 			tagName = "";
 		}
 		else
@@ -118,7 +119,7 @@ else if(tt == JSTokenTypes.XML_JS_SCRIPT)
 		}
 		else
 		{
-			error(XmlErrorMessages.message("tag.start.is.not.closed"));
+			error(XmlErrorLocalize.tagStartIsNotClosed());
 			myTagNamesStack.pop();
 			tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
 			return null;
@@ -126,7 +127,7 @@ else if(tt == JSTokenTypes.XML_JS_SCRIPT)
 
 		if(myTagNamesStack.size() > BALANCING_DEPTH_THRESHOLD)
 		{
-			error(XmlErrorMessages.message("way.too.unbalanced"));
+			error(XmlErrorLocalize.wayTooUnbalanced());
 			tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
 			return null;
 		}
@@ -166,7 +167,7 @@ private void parseAttributeValue()
 				{
 					final PsiBuilder.Marker error = mark();
 					advance();
-					error.error(XmlErrorMessages.message("unescaped.ampersand.or.nonterminated.character.entity.reference"));
+					error.error(XmlErrorLocalize.unescapedAmpersandOrNonterminatedCharacterEntityReference());
 				}
 				else
 				{
@@ -180,7 +181,7 @@ private void parseAttributeValue()
 			}
 			else
 			{
-				error(XmlErrorMessages.message("xml.parsing.unclosed.attribute.value"));
+				error(XmlErrorLocalize.xmlParsingUnclosedAttributeValue());
 			}
 		}
 		else if(token() == JSTokenTypes.XML_JS_SCRIPT)
@@ -219,7 +220,7 @@ else if(tt == JSTokenTypes.BAD_CHARACTER)
 				xmlText = startText(xmlText);
 				final PsiBuilder.Marker error = mark();
 				advance();
-				error.error(XmlErrorMessages.message("unescaped.ampersand.or.nonterminated.character.entity.reference"));
+				error.error(XmlErrorLocalize.unescapedAmpersandOrNonterminatedCharacterEntityReference());
 			}
 			else if(tt instanceof ICustomParsingType || tt instanceof ILazyParseableElementType)
 			{
@@ -282,7 +283,7 @@ protected void parseTag(boolean multipleRootTagError)
 				{
 					footer.rollbackTo();
 					myTagNamesStack.pop();
-					tag.doneBefore(JSElementTypes.XML_LITERAL_EXPRESSION, content, XmlErrorMessages.message("named.element.is.not.closed", tagName));
+					tag.doneBefore(JSElementTypes.XML_LITERAL_EXPRESSION, content, XmlErrorLocalize.namedElementIsNotClosed(tagName));
 					content.drop();
 					return;
 				}
@@ -293,7 +294,7 @@ protected void parseTag(boolean multipleRootTagError)
 
 			while(token() != XmlTokenType.XML_TAG_END && token() != XmlTokenType.XML_START_TAG_START && token() != XmlTokenType.XML_END_TAG_START && !eof())
 			{
-				error(XmlErrorMessages.message("xml.parsing.unexpected.token"));
+				error(XmlErrorLocalize.xmlParsingUnexpectedToken());
 				advance();
 			}
 
@@ -303,12 +304,12 @@ protected void parseTag(boolean multipleRootTagError)
 			}
 			else
 			{
-				error(XmlErrorMessages.message("xml.parsing.closing.tag.is.not.done"));
+				error(XmlErrorLocalize.xmlParsingClosingTagIsNotDone());
 			}
 		}
 		else
 		{
-			error(XmlErrorMessages.message("xml.parsing.unexpected.end.of.file"));
+			error(XmlErrorLocalize.xmlParsingUnexpectedEndOfFile());
 		}
 
 		content.drop();
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 89ea9545..190a687d 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -753,7 +753,7 @@ protected void parseDeconstructionElement(PsiBuilder builder)
 			{
 				PsiBuilder.Marker err = builder.mark();
 				builder.advanceLexer();
-				err.error("Expected identifier");
+				err.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
 			}
 		}
 
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
index 23bfbe0d..33adb147 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
@@ -26,6 +26,7 @@
 import consulo.execution.debug.breakpoint.XLineBreakpoint;
 import consulo.execution.debug.evaluation.XDebuggerEditorsProvider;
 import consulo.execution.debug.frame.XSuspendContext;
+import consulo.execution.debug.localize.XDebuggerLocalize;
 import consulo.execution.debug.ui.XDebugTabLayouter;
 import consulo.execution.ui.ExecutionConsole;
 import consulo.execution.ui.layout.RunnerLayoutUi;
@@ -260,19 +261,19 @@ public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui)
 	@Override
 	public String getCurrentStateMessage()
 	{
-		if(myVm == null)
+		if (myVm == null)
 		{
-			return XDebuggerBundle.message("debugger.state.message.disconnected");
+			return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
 		}
 		else
 		{
-			if(myVm.isAttached())
+			if (myVm.isAttached())
 			{
 				return "Attached";
 			}
 			else
 			{
-				return XDebuggerBundle.message("debugger.state.message.disconnected");
+				return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
 			}
 		}
 	}
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index d27d7a24..a7f2acc2 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -271,7 +271,7 @@ else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
 									}
 									else
 									{
-										importSpecificMark.error("Expected identifier");
+										importSpecificMark.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
 									}
 								}
 
@@ -314,7 +314,7 @@ else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 				}
 				else
 				{
-					builder.error("Expected from target");
+					builder.error("Expected 'from' target");
 				}
 			}
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index 59cfaf5d..e556faba 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -11,6 +11,7 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.language.parser.PsiParser;
 import consulo.language.version.LanguageVersion;
+import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 
 import jakarta.annotation.Nonnull;
@@ -224,7 +225,7 @@ private boolean parseValue(PsiBuilder builder)
 				firstToken == JSTokenTypes.FALSE_KEYWORD ||
 				firstToken == JSTokenTypes.TRUE_KEYWORD)
 		{
-			String errorMessage = ExpressionParsing.validateLiteral(builder);
+			LocalizeValue errorMessage = ExpressionParsing.validateLiteral(builder);
 			Parsing.buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
 			if(errorMessage != null)
 			{

From 45a4134aba36addc7d4b2714ee677129ddbc3a77 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 13 Jul 2024 11:30:31 +0300
Subject: [PATCH 194/340] Replacing Bundle with Localize. Making same indents
 within file.

---
 .../run/debug/v8/V8DebugProcess.java          | 12 ++--
 .../AssignmentResultUsedJSInspection.java     | 20 +++---
 ...ignmentToForLoopParameterJSInspection.java | 21 +++---
 ...gnmentToFunctionParameterJSInspection.java | 46 ++++++------
 .../bitwise/IncompatibleMaskJSInspection.java | 71 +++++++------------
 .../bugs/DivideByZeroJSInspection.java        | 33 ++++-----
 ...ityComparisonWithCoercionJSInspection.java | 15 ++--
 .../AnonymousFunctionJSInspection.java        | 22 +++---
 .../confusing/BlockStatementJSInspection.java | 23 +++---
 .../confusing/CallerJSInspection.java         | 32 ++++-----
 .../CommaExpressionJSInspection.java          | 29 +++-----
 .../ConditionalExpressionJSInspection.java    |  7 +-
 ...usingFloatingPointLiteralJSInspection.java | 63 ++++++++--------
 .../ConfusingPlusesOrMinusesJSInspection.java | 23 +++---
 .../DynamicallyGeneratedCodeJSInspection.java | 30 ++++----
 .../EmptyStatementBodyJSInspection.java       | 17 ++---
 ...rementDecrementResultUsedJSInspection.java | 23 +++---
 .../control/BreakStatementJSInspection.java   | 22 +++---
 .../BreakStatementWithLabelJSInspection.java  | 18 +++--
 ...sionWithIdenticalBranchesJSInspection.java | 36 +++++-----
 ...tantConditionalExpressionJSInspection.java | 59 +++++++--------
 .../ConstantIfStatementJSInspection.java      | 57 +++++++--------
 .../ContinueStatementJSInspection.java        | 16 ++---
 ...ontinueStatementWithLabelJSInspection.java | 22 +++---
 ...efaultNotLastCaseInSwitchJSInspection.java | 24 +++----
 .../DuplicateConditionJSInspection.java       | 36 +++++-----
 ...lthroughInSwitchStatementJSInspection.java | 23 +++---
 ...ForLoopReplaceableByWhileJSInspection.java | 34 ++++-----
 ...ThatDoesntUseLoopVariableJSInspection.java | 50 +++++--------
 ...mentWithIdenticalBranchesJSInspection.java | 33 ++++-----
 ...tementWithTooManyBranchesJSInspection.java |  8 +--
 .../dom/DocumentWriteJSInspection.java        | 20 +++---
 ...ueOrBreakFromFinallyBlockJSInspection.java | 26 +++----
 .../EmptyCatchBlockJSInspection.java          | 21 +++---
 .../EmptyFinallyBlockJSInspection.java        | 21 +++---
 .../exception/EmptyTryBlockJSInspection.java  | 21 +++---
 .../ExceptionCaughtLocallyJSInspection.java   | 22 +++---
 .../CyclomaticComplexityJSInspection.java     | 10 ++-
 ...FunctionWithMultipleLoopsJSInspection.java | 29 ++++----
 ...nWithMultipleReturnPointsJSInspection.java | 14 ++--
 .../FunctionNamingConventionJSInspection.java | 11 ++-
 .../style/ChainedEqualityJSInspection.java    | 30 ++++----
 .../ChainedFunctionCallJSInspection.java      | 22 ++----
 ...ConstantOnLHSOfComparisonJSInspection.java | 33 ++++-----
 ...ConstantOnRHSOfComparisonJSInspection.java | 39 +++++-----
 .../BadExpressionStatementJSInspection.java   | 18 ++---
 .../DebuggerStatementJSInspection.java        | 26 ++++---
 .../DuplicateCaseLabelJSInspection.java       | 31 ++++----
 ...DuplicatePropertyOnObjectJSInspection.java | 28 ++++----
 ...onWithInconsistentReturnsJSInspection.java | 17 +++--
 50 files changed, 614 insertions(+), 750 deletions(-)

diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
index 2c0a2c7f..32d71423 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
@@ -16,15 +16,15 @@
 
 package consulo.javascript.run.debug.v8;
 
+import consulo.annotation.UsedInPlugin;
 import consulo.execution.ExecutionResult;
-import consulo.process.ExecutionException;
 import consulo.execution.debug.XDebugSession;
-import consulo.execution.debug.XDebuggerBundle;
-import consulo.annotation.UsedInPlugin;
+import consulo.execution.debug.localize.XDebuggerLocalize;
+import consulo.process.ExecutionException;
+import jakarta.annotation.Nonnull;
 import org.chromium.sdk.JavascriptVmFactory;
 import org.chromium.sdk.StandaloneVm;
 
-import jakarta.annotation.Nonnull;
 import java.net.InetSocketAddress;
 
 /**
@@ -52,7 +52,7 @@ public String getCurrentStateMessage()
 	{
 		if(myVm == null)
 		{
-			return XDebuggerBundle.message("debugger.state.message.disconnected");
+			return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
 		}
 		else
 		{
@@ -65,7 +65,7 @@ public String getCurrentStateMessage()
 				String disconnectReason = myVm.getDisconnectReason();
 				if(disconnectReason == null)
 				{
-					return XDebuggerBundle.message("debugger.state.message.disconnected");
+					return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
 				}
 				return "Disconnected: " + disconnectReason;
 			}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
index 0bcf09e0..2f9e9ab3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
@@ -2,9 +2,9 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
@@ -13,33 +13,33 @@
 
 @ExtensionImpl
 public class AssignmentResultUsedJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("result.of.assignment.used.displayName");
+        return InspectionJSLocalize.resultOfAssignmentUsedDisplayname().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("result.of.assignment.expression.used.error.string");
+        return InspectionJSLocalize.resultOfAssignmentExpressionUsedErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpression) {
+        @Override
+        public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpression) {
             super.visitJSAssignmentExpression(jsAssignmentExpression);
             final PsiElement parent = jsAssignmentExpression.getParent();
             if (parent == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
index 9cabb056..bf643ad1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
@@ -3,9 +3,9 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
@@ -15,33 +15,32 @@
 
 @ExtensionImpl
 public class AssignmentToForLoopParameterJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("assignment.to.for.loop.parameter.display.name");
+        return InspectionJSLocalize.assignmentToForLoopParameterDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("assignment.to.for.loop.parameter.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.assignmentToForLoopParameterErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
+        @Override
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
             final JSExpression rhs = expression.getROperand();
             if (rhs == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
index 9c3dbbb4..f869a6b4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
@@ -2,54 +2,53 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
-import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
-import com.sixrr.inspectjs.JSGroupNames;
-import com.sixrr.inspectjs.JavaScriptInspection;
-import consulo.language.psi.PsiReference;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class AssignmentToFunctionParameterJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("assignment.to.function.parameter.display.name");
+        return InspectionJSLocalize.assignmentToFunctionParameterDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("assignment.to.function.parameter.error.string");
+        return InspectionJSLocalize.assignmentToFunctionParameterErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpression) {
+        @Override
+        public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpression) {
             super.visitJSAssignmentExpression(jsAssignmentExpression);
             final JSExpression lhs = jsAssignmentExpression.getLOperand();
             checkOperand(lhs);
         }
 
-        @Override public void visitJSPrefixExpression(JSPrefixExpression expression) {
+        @Override
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             final IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
@@ -60,7 +59,8 @@ private static class Visitor extends BaseInspectionVisitor {
             checkOperand(operand);
         }
 
-        @Override public void visitJSPostfixExpression(JSPostfixExpression jsPostfixExpression) {
+        @Override
+        public void visitJSPostfixExpression(JSPostfixExpression jsPostfixExpression) {
             super.visitJSPostfixExpression(jsPostfixExpression);
             final IElementType sign = jsPostfixExpression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
@@ -75,10 +75,10 @@ private void checkOperand(JSExpression operand) {
             if (operand == null) {
                 return;
             }
-            if (operand instanceof JSDefinitionExpression) {
-                final JSExpression definiend = ((JSDefinitionExpression) operand).getExpression();
-                if (definiend instanceof JSReferenceExpression) {
-                    final PsiElement referent = ((PsiReference) definiend).resolve();
+            if (operand instanceof JSDefinitionExpression definitionExpression) {
+                final JSExpression definiend = definitionExpression.getExpression();
+                if (definiend instanceof JSReferenceExpression referenceExpression) {
+                    final PsiElement referent = referenceExpression.resolve();
                     if (referent == null) {
                         return;
                     }
@@ -88,8 +88,8 @@ private void checkOperand(JSExpression operand) {
                     registerError(operand);
                 }
             }
-            if (operand instanceof JSReferenceExpression) {
-                final PsiElement referent = ((PsiReference) operand).resolve();
+            if (operand instanceof JSReferenceExpression referenceExpression) {
+                final PsiElement referent = referenceExpression.resolve();
                 if (referent == null) {
                     return;
                 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
index dab86d16..885544ea 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
@@ -4,109 +4,92 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class IncompatibleMaskJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "IncompatibleBitwiseMaskOperation";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "incompatible.mask.operation.display.name");
+        return InspectionJSLocalize.incompatibleMaskOperationDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     public String buildErrorString(Object state, Object... args) {
-        final JSBinaryExpression binaryExpression =
-                (JSBinaryExpression) args[0];
-        final IElementType tokenType =
-                binaryExpression.getOperationSign();
+        final JSBinaryExpression binaryExpression = (JSBinaryExpression) args[0];
+        final IElementType tokenType = binaryExpression.getOperationSign();
         if (JSTokenTypes.EQEQ.equals(tokenType)) {
-            return InspectionJSBundle.message(
-                    "incompatible.mask.operation.problem.descriptor.always.false");
+            return InspectionJSLocalize.incompatibleMaskOperationProblemDescriptorAlwaysFalse().get();
         } else {
-            return InspectionJSBundle.message(
-                    "incompatible.mask.operation.problem.descriptor.always.true");
+            return InspectionJSLocalize.incompatibleMaskOperationProblemDescriptorAlwaysTrue().get();
         }
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new IncompatibleMaskVisitor();
     }
 
     private static class IncompatibleMaskVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(
-                @Nonnull JSBinaryExpression expression) {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final JSExpression rhs = expression.getROperand();
             if (!ComparisonUtils.isEqualityComparison(expression)) {
                 return;
             }
-            final JSExpression strippedRhs =
-                    ParenthesesUtils.stripParentheses(rhs);
+            final JSExpression strippedRhs = ParenthesesUtils.stripParentheses(rhs);
             if (strippedRhs == null) {
                 return;
             }
             final JSExpression lhs = expression.getLOperand();
-            final JSExpression strippedLhs =
-                    ParenthesesUtils.stripParentheses(lhs);
+            final JSExpression strippedLhs = ParenthesesUtils.stripParentheses(lhs);
             if (strippedLhs == null) {
                 return;
             }
-            if (isConstantMask(strippedLhs) &&
-                    ExpressionUtil.isConstantExpression(strippedRhs)) {
-                if (isIncompatibleMask((JSBinaryExpression) strippedLhs,
-                        strippedRhs)) {
+            if (isConstantMask(strippedLhs) && ExpressionUtil.isConstantExpression(strippedRhs)) {
+                if (isIncompatibleMask((JSBinaryExpression) strippedLhs, strippedRhs)) {
                     registerError(expression, expression);
                 }
-            } else if (isConstantMask(strippedRhs) &&
-                    ExpressionUtil.isConstantExpression(strippedLhs)) {
-                if (isIncompatibleMask((JSBinaryExpression) strippedRhs,
-                        strippedLhs)) {
+            } else if (isConstantMask(strippedRhs) && ExpressionUtil.isConstantExpression(strippedLhs)) {
+                if (isIncompatibleMask((JSBinaryExpression) strippedRhs, strippedLhs)) {
                     registerError(expression, expression);
                 }
             }
         }
 
-        private static boolean isIncompatibleMask(
-                JSBinaryExpression maskExpression,
-                JSExpression constantExpression) {
+        private static boolean isIncompatibleMask(JSBinaryExpression maskExpression, JSExpression constantExpression) {
             final IElementType tokenType = maskExpression.getOperationSign();
-            final Object constantValue =
-                    ExpressionUtil.computeConstantExpression(constantExpression);
-            if (!(constantValue instanceof Integer) ){
+            final Object constantValue = ExpressionUtil.computeConstantExpression(constantExpression);
+            if (!(constantValue instanceof Integer)){
                 return false;
             }
             final int constantLongValue = (Integer) constantValue;
@@ -150,11 +133,9 @@ private static boolean isConstantMask(JSExpression expression) {
             if (!(expression instanceof JSBinaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryExpression =
-                    (JSBinaryExpression) expression;
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
             final IElementType tokenType = binaryExpression.getOperationSign();
-            if (!JSTokenTypes.OR.equals(tokenType) &&
-                    !JSTokenTypes.AND.equals(tokenType)) {
+            if (!JSTokenTypes.OR.equals(tokenType) && !JSTokenTypes.AND.equals(tokenType)) {
                 return false;
             }
             final JSExpression rhs = binaryExpression.getROperand();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index 635db319..e766a96f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -5,53 +5,50 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
+import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class DivideByZeroJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "DivideByZeroJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("divide.by.zero.display.name");
+        return InspectionJSLocalize.divideByZeroDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("division.by.zero.error.string");
+        return InspectionJSLocalize.divisionByZeroErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new DivisionByZeroVisitor();
     }
 
     private static class DivisionByZeroVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(
-                @Nonnull JSBinaryExpression expression) {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final JSExpression rhs = expression.getROperand();
             if (rhs == null) {
@@ -69,8 +66,8 @@ private static class DivisionByZeroVisitor extends BaseInspectionVisitor {
             registerError(expression);
         }
 
-        @Override public void visitJSAssignmentExpression(
-                JSAssignmentExpression expression) {
+        @Override
+        public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
             final JSExpression rhs = expression.getROperand();
             if (rhs == null) {
@@ -86,7 +83,6 @@ private static class DivisionByZeroVisitor extends BaseInspectionVisitor {
             }
             registerError(expression);
         }
-
     }
 
     private static boolean isZero(JSExpression expression) {
@@ -99,5 +95,4 @@ private static boolean isZero(JSExpression expression) {
                 "0L".equals(text) ||
                 "0l".equals(text);
     }
-
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index d28ac7b0..37ecc722 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -3,7 +3,11 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
@@ -11,9 +15,8 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
+import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class EqualityComparisonWithCoercionJSInspection extends JavaScriptInspection {
@@ -27,7 +30,7 @@ public String getID() {
     @Override
 	@Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("equality.comparison.with.coercion.display.name");
+        return InspectionJSLocalize.equalityComparisonWithCoercionDisplayName().get();
     }
 
     @Override
@@ -40,7 +43,7 @@ public String getGroupDisplayName() {
 	@Override
 	@Nonnull
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("equality.comparison.with.coercion.error.string");
+        return InspectionJSLocalize.equalityComparisonWithCoercionErrorString().get();
     }
 
 	@Override
@@ -66,7 +69,7 @@ public EqualityComparisonWithCoercionFix(String sign) {
 		@Override
 		@Nonnull
 		public String getName() {
-			return InspectionJSBundle.message("equality.comparison.with.coercion.fix", sign);
+			return InspectionJSLocalize.equalityComparisonWithCoercionFix(sign).get();
 		}
 
 		@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index a8e939fe..5e589a5f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -3,47 +3,45 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class AnonymousFunctionJSInspection extends JavaScriptInspection{
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName(){
-        return InspectionJSBundle.message("anonymous.function.display.name");
+        return InspectionJSLocalize.anonymousFunctionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName(){
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args){
-        return InspectionJSBundle.message("anonymous.function.error.string");
+        return InspectionJSLocalize.anonymousFunctionErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor(){
+    public BaseInspectionVisitor buildVisitor(){
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor{
-
-        @Override public void visitJSFunctionExpression(JSFunctionExpression jsFunctionExpression){
+        @Override
+        public void visitJSFunctionExpression(JSFunctionExpression jsFunctionExpression){
             super.visitJSFunctionExpression(jsFunctionExpression);
             final JSFunction function = jsFunctionExpression.getFunction();
             final PsiElement identifier = function.getNameIdentifier();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index de2890e9..76599fe4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -2,46 +2,44 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class BlockStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("unnecessary.block.statement.display.name");
+        return InspectionJSLocalize.unnecessaryBlockStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("unnecessary.block.statement.error.string");
+        return InspectionJSLocalize.unnecessaryBlockStatementErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBlock(JSBlockStatement jsBlockStatement) {
+        @Override
+        public void visitJSBlock(JSBlockStatement jsBlockStatement) {
             super.visitJSBlock(jsBlockStatement);
             final PsiElement parent = jsBlockStatement.getParent();
             if(parent instanceof JSIfStatement||
@@ -56,6 +54,5 @@ private static class Visitor extends BaseInspectionVisitor {
             }
             registerStatementError(jsBlockStatement);
         }
-
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
index e0d424ca..4574b1ec 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
@@ -2,53 +2,47 @@
 
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class CallerJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("caller.display.name");
+        return InspectionJSLocalize.callerDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("caller.error.string");
+        return InspectionJSLocalize.callerErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSReferenceExpression(JSReferenceExpression jsReferenceExpression) {
-            super.visitJSReferenceExpression(
-                    jsReferenceExpression);
-            if(!"caller".equals(jsReferenceExpression.getReferencedName()))
-            {
-                return;
+        @Override
+        public void visitJSReferenceExpression(JSReferenceExpression jsReferenceExpression) {
+            super.visitJSReferenceExpression(jsReferenceExpression);
+            if ("caller".equals(jsReferenceExpression.getReferencedName())) {
+                registerError(jsReferenceExpression.getReferenceNameElement());
             }
-            registerError(jsReferenceExpression.getReferenceNameElement());
         }
-
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
index c77502fc..6ce167b4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
@@ -3,55 +3,48 @@
 import com.intellij.lang.javascript.psi.JSCommaExpression;
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class CommaExpressionJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("comma.expression.display.name");
+        return InspectionJSLocalize.commaExpressionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("comma.expression.error.string");
+        return InspectionJSLocalize.commaExpressionErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSCommaExpression(JSCommaExpression node) {
+        @Override
+        public void visitJSCommaExpression(JSCommaExpression node) {
             super.visitJSCommaExpression(node);
-            if(node.getParent() instanceof JSCommaExpression)
-            {
-                return;
-            }
-            if(node.getParent() instanceof JSForStatement)
-            {
+            if (node.getParent() instanceof JSCommaExpression || node.getParent() instanceof JSForStatement) {
                 return;
             }
             registerError(node);
         }
-
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index b4ac6c45..637dfebc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -2,12 +2,11 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -24,7 +23,7 @@ public boolean isEnabledByDefault()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("conditional.expression.display.name");
+		return InspectionJSLocalize.conditionalExpressionDisplayName().get();
 	}
 
 	@Override
@@ -39,7 +38,7 @@ public String getGroupDisplayName()
 	@Nullable
 	protected String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message("conditional.expression.error.string");
+		return InspectionJSLocalize.conditionalExpressionErrorString().get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index 6b7796e0..28a8a25f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -1,17 +1,21 @@
 package com.sixrr.inspectjs.confusing;
 
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
-import consulo.language.util.IncorrectOperationException;
-import com.sixrr.inspectjs.*;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
 import jakarta.annotation.Nonnull;
+import org.jetbrains.annotations.NonNls;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -19,50 +23,42 @@
 @ExtensionImpl
 public class ConfusingFloatingPointLiteralJSInspection extends JavaScriptInspection {
     @NonNls
-    private static final Pattern pickyFloatingPointPattern =
-            Pattern.compile("[0-9]+\\.[0-9]+((e|E)(-)?[0-9]+)?(f|F|d|D)?");
+    private static final Pattern PICKY_FLOATING_POINT_PATTERN = Pattern.compile("[0-9]+\\.[0-9]+((e|E)(-)?[0-9]+)?(f|F|d|D)?");
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "confusing.floating.point.literal.display.name");
+        return InspectionJSLocalize.confusingFloatingPointLiteralDisplayName().get();
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message(
-                "confusing.floating.point.literal.problem.descriptor");
+        return InspectionJSLocalize.confusingFloatingPointLiteralProblemDescriptor().get();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new ConfusingFloatingPointLiteralFix();
     }
 
-    private static class ConfusingFloatingPointLiteralFix
-            extends InspectionJSFix {
-
+    private static class ConfusingFloatingPointLiteralFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message(
-                    "confusing.floating.point.literal.change.quickfix");
+            return InspectionJSLocalize.confusingFloatingPointLiteralChangeQuickfix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
-            final JSExpression literalExpression =
-                    (JSExpression) descriptor.getPsiElement();
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final JSExpression literalExpression = (JSExpression) descriptor.getPsiElement();
             final String text = literalExpression.getText();
             final String newText = getCanonicalForm(text);
             replaceExpression(literalExpression, newText);
@@ -112,15 +108,13 @@ private static String getCanonicalForm(String text) {
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ConfusingFloatingPointLiteralVisitor();
     }
 
-    private static class ConfusingFloatingPointLiteralVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSLiteralExpression(
-                @Nonnull JSSimpleLiteralExpression literal) {
+    private static class ConfusingFloatingPointLiteralVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression literal) {
             super.visitJSLiteralExpression(literal);
             final String text = literal.getText();
             if (text == null) {
@@ -137,7 +131,7 @@ private static class ConfusingFloatingPointLiteralVisitor
     }
 
     private static boolean isConfusing(String text) {
-        final Matcher matcher = pickyFloatingPointPattern.matcher(text);
+        final Matcher matcher = PICKY_FLOATING_POINT_PATTERN.matcher(text);
         return !matcher.matches();
     }
 
@@ -149,5 +143,4 @@ private static boolean isFloatingPoint(JSLiteralExpression literal) {
         }
         return text.contains(".") || text.contains("e") || text.contains("E");
     }
-
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index 8333b3c8..db9ec79b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -5,40 +5,39 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSPostfixExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ConfusingPlusesOrMinusesJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("confusing.pluses.or.minuses.display.name");
+        return InspectionJSLocalize.confusingPlusesOrMinusesDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("confusing.pluses.or.minuses.error.string");
+        return InspectionJSLocalize.confusingPlusesOrMinusesErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 72996993..044291a9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -5,46 +5,44 @@
 import com.intellij.lang.javascript.psi.JSNewExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 public class DynamicallyGeneratedCodeJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("dynamically.generated.code.display.name");
+        return InspectionJSLocalize.dynamicallyGeneratedCodeDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("dynamically.generated.code.error.string");
+        return InspectionJSLocalize.dynamicallyGeneratedCodeErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSCallExpression(JSCallExpression jsCallExpression) {
+        @Override
+        public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             super.visitJSCallExpression(jsCallExpression);
             final JSExpression methodExpression;
             try {
@@ -65,9 +63,9 @@ private static class Visitor extends BaseInspectionVisitor {
             registerError(methodExpression);
         }
 
-        @Override public void visitJSNewExpression(JSNewExpression jsNewExpression) {
-            super.visitJSNewExpression(
-                    jsNewExpression);
+        @Override
+        public void visitJSNewExpression(JSNewExpression jsNewExpression) {
+            super.visitJSNewExpression(jsNewExpression);
             final JSExpression methodExpression;
             try {
                 methodExpression = jsNewExpression.getMethodExpression();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index ee1f43fc..102e0b2e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -2,13 +2,12 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -25,7 +24,7 @@ public String getID()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("statement.with.empty.body.display.name");
+		return InspectionJSLocalize.statementWithEmptyBodyDisplayName().get();
 	}
 
 	@Override
@@ -45,14 +44,9 @@ public boolean isEnabledByDefault()
 	@Override
 	public String buildErrorString(Object state, Object... args)
 	{
-		if(args[0] instanceof JSIfStatement)
-		{
-			return InspectionJSBundle.message("statement.has.empty.branch.error.string");
-		}
-		else
-		{
-			return InspectionJSBundle.message("statement.has.empty.body.error.string");
-		}
+		return args[0] instanceof JSIfStatement
+			? InspectionJSLocalize.statementHasEmptyBranchErrorString().get()
+			: InspectionJSLocalize.statementHasEmptyBodyErrorString().get();
 	}
 
 	@Nonnull
@@ -70,7 +64,6 @@ public BaseInspectionVisitor buildVisitor()
 
 	private class EmptyStatementVisitor extends BaseInspectionVisitor<EmptyStatementBodyJSInspectionState>
 	{
-
 		@Override
 		public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement)
 		{
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index ba584a71..d10d8254 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -2,37 +2,36 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class IncrementDecrementResultUsedJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("result.of.increment.or.decrement.used.display.name");
+        return InspectionJSLocalize.resultOfIncrementOrDecrementUsedDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("result.of.increment.or.decrement.expression.used.error.string");
+        return InspectionJSLocalize.resultOfIncrementOrDecrementExpressionUsedErrorString().get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
index b42ff17b..349e8917 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
@@ -3,45 +3,43 @@
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class BreakStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("break.statement.display.name");
+        return InspectionJSLocalize.breakStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("break.statement.error.string");
+        return InspectionJSLocalize.breakStatementErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
+        @Override
+        public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (statement.getParent() instanceof JSCaseClause) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
index e44c5bd4..70dd6321 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
@@ -2,39 +2,37 @@
 
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class BreakStatementWithLabelJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("break.statement.with.label.display.name");
+        return InspectionJSLocalize.breakStatementWithLabelDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("break.statement.with.label.error.string");
+        return InspectionJSLocalize.breakStatementWithLabelErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
index bd46b974..e4acf517 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
@@ -2,7 +2,11 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -17,40 +21,38 @@ public class ConditionalExpressionWithIdenticalBranchesJSInspection extends Java
     private InspectionJSFix fix = new CollapseConditional();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("conditional.expression.with.identical.branches.display.name");
+        return InspectionJSLocalize.conditionalExpressionWithIdenticalBranchesDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("conditional.expression.with.identical.branches.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.conditionalExpressionWithIdenticalBranchesErrorString().get();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class CollapseConditional extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("collapse.conditional.expression.fix");
+            return InspectionJSLocalize.collapseConditionalExpressionFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
-            final JSConditionalExpression expression =
-                    (JSConditionalExpression) descriptor.getPsiElement();
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final JSConditionalExpression expression = (JSConditionalExpression) descriptor.getPsiElement();
 
             final JSExpression thenExpression = expression.getThen();
             assert thenExpression != null;
@@ -60,13 +62,13 @@ public void doFix(Project project, ProblemDescriptor descriptor)
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ConditionalExpressionWithIdenticalBranchesVisitor();
     }
 
     private static class ConditionalExpressionWithIdenticalBranchesVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSConditionalExpression(JSConditionalExpression expression) {
+        @Override
+        public void visitJSConditionalExpression(JSConditionalExpression expression) {
             super.visitJSConditionalExpression(expression);
             final JSExpression thenExpression = expression.getThen();
             final JSExpression elseExpression = expression.getElse();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
index 40a1dbd6..e334e535 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
@@ -2,51 +2,52 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import com.sixrr.inspectjs.utils.BoolUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.project.Project;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-import com.sixrr.inspectjs.*;
-import com.sixrr.inspectjs.utils.BoolUtils;
-import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class ConstantConditionalExpressionJSInspection
-        extends JavaScriptInspection {
-
+public class ConstantConditionalExpressionJSInspection extends JavaScriptInspection {
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("constant.conditional.expression.display.name");
+        return InspectionJSLocalize.constantConditionalExpressionDisplayName().get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ConstantConditionalExpressionVisitor();
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("constant.conditional.expression.error.string");
+        return InspectionJSLocalize.constantConditionalExpressionErrorString().get();
     }
 
-    static String calculateReplacementExpression(
-            JSConditionalExpression exp) {
+    static String calculateReplacementExpression(JSConditionalExpression exp) {
         final JSExpression thenExpression = exp.getThen();
         final JSExpression elseExpression = exp.getElse();
         final JSExpression condition = exp.getCondition();
@@ -60,34 +61,28 @@ static String calculateReplacementExpression(
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new ConstantConditionalFix();
     }
 
     private static class ConstantConditionalFix extends InspectionJSFix {
-
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("simplify.fix");
+            return InspectionJSLocalize.simplifyFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
-            final JSConditionalExpression expression =
-                    (JSConditionalExpression) descriptor.getPsiElement();
-            final String newExpression =
-                    calculateReplacementExpression(expression);
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final JSConditionalExpression expression = (JSConditionalExpression) descriptor.getPsiElement();
+            final String newExpression = calculateReplacementExpression(expression);
             replaceExpression(expression, newExpression);
         }
     }
 
-    private static class ConstantConditionalExpressionVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSConditionalExpression(
-                JSConditionalExpression expression) {
+    private static class ConstantConditionalExpressionVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSConditionalExpression(JSConditionalExpression expression) {
             super.visitJSConditionalExpression(expression);
             final JSExpression condition = expression.getCondition();
             final JSExpression thenExpression = expression.getThen();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
index 0cb6dee6..cc02f2a1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
@@ -3,7 +3,11 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -11,63 +15,55 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConstantIfStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "constant.if.statement.display.name");
+        return InspectionJSLocalize.constantIfStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message(
-                "constant.if.statement.problem.descriptor");
+        return InspectionJSLocalize.constantIfStatementProblemDescriptor().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ConstantIfStatementVisitor();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new ConstantIfStatementFix();
     }
 
     private static class ConstantIfStatementFix extends InspectionJSFix {
-
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message(
-                    "constant.conditional.expression.simplify.quickfix");
+            return InspectionJSLocalize.constantConditionalExpressionSimplifyQuickfix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement ifKeyword = descriptor.getPsiElement();
-            final JSIfStatement statement =
-                    (JSIfStatement) ifKeyword.getParent();
+            final JSIfStatement statement = (JSIfStatement) ifKeyword.getParent();
             assert statement != null;
             final JSStatement thenBranch = statement.getThen();
             final JSStatement elseBranch = statement.getElse();
@@ -83,20 +79,15 @@ public void doFix(Project project, ProblemDescriptor descriptor)
             }
         }
 
-        private static void replaceStatementWithUnwrapping(
-                JSStatement branch, JSIfStatement statement)
-                throws IncorrectOperationException {
-            {
-                final String elseText = branch.getText();
-                replaceStatement(statement, elseText);
-            }
+        private static void replaceStatementWithUnwrapping(JSStatement branch, JSIfStatement statement) throws IncorrectOperationException {
+            final String elseText = branch.getText();
+            replaceStatement(statement, elseText);
         }
     }
 
-    private static class ConstantIfStatementVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSIfStatement(JSIfStatement statement) {
+    private static class ConstantIfStatementVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSIfStatement(JSIfStatement statement) {
             super.visitJSIfStatement(statement);
             final JSExpression condition = statement.getCondition();
             if (condition == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
index 0a24c71a..f74f71bc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
@@ -13,28 +14,27 @@
 
 @ExtensionImpl
 public class ContinueStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("continue.statement.display.name");
+        return InspectionJSLocalize.continueStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("continue.statement.error.string");
+        return InspectionJSLocalize.continueStatementErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
index 78ce535d..750d9e81 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
@@ -2,45 +2,43 @@
 
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ContinueStatementWithLabelJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("continue.statement.with.label.display.name");
+        return InspectionJSLocalize.continueStatementWithLabelDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("continue.statement.with.label.error.string");
+        return InspectionJSLocalize.continueStatementWithLabelErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
+        @Override
+        public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             if (statement.getLabel() == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index 744a5af1..1f6ff470 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -6,42 +6,40 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class DefaultNotLastCaseInSwitchJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("default.not.last.case.in.switch.display.name");
+        return InspectionJSLocalize.defaultNotLastCaseInSwitchDisplayName().get();
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("default.branch.not.last.case.in.switch.error.string");
+        return InspectionJSLocalize.defaultBranchNotLastCaseInSwitchErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new DefaultNotLastCaseInSwitchVisitor();
     }
 
-    private static class DefaultNotLastCaseInSwitchVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSSwitchStatement(
-                @Nonnull JSSwitchStatement statement) {
+    private static class DefaultNotLastCaseInSwitchVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
             final JSCaseClause[] caseClauses = statement.getCaseClauses();
             if (caseClauses == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
index bfbf65de..60215888 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
@@ -3,9 +3,9 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -20,32 +20,31 @@
 @ExtensionImpl
 public class DuplicateConditionJSInspection extends JavaScriptInspection {
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("duplicate.condition.in.if.statement.display.name");
+        return InspectionJSLocalize.duplicateConditionInIfStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("duplicate.condition.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.duplicateConditionErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new DuplicateConditionVisitor();
     }
 
-    private static class DuplicateConditionVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+    private static class DuplicateConditionVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
             final PsiElement parent = statement.getParent();
             if (parent instanceof JSIfStatement) {
@@ -61,8 +60,7 @@ private static class DuplicateConditionVisitor
             if (numConditions < 2) {
                 return;
             }
-            final JSExpression[] conditionArray =
-                    conditions.toArray(new JSExpression[numConditions]);
+            final JSExpression[] conditionArray = conditions.toArray(new JSExpression[numConditions]);
             final boolean[] matched = new boolean[conditionArray.length];
             Arrays.fill(matched, false);
             for (int i = 0; i < conditionArray.length; i++) {
@@ -90,8 +88,7 @@ private static class DuplicateConditionVisitor
             }
         }
 
-        private void collectConditionsForIfStatement(JSIfStatement statement,
-                                                     Set<JSExpression> conditions) {
+        private void collectConditionsForIfStatement(JSIfStatement statement, Set<JSExpression> conditions) {
             final JSExpression condition = statement.getCondition();
             collectConditionsForExpression(condition, conditions);
             final JSStatement branch = statement.getElse();
@@ -104,13 +101,12 @@ private void collectConditionsForExpression(JSExpression condition, Set<JSExpres
             if (condition == null) {
                 return;
             }
-            if (condition instanceof JSParenthesizedExpression) {
-                final JSExpression contents = ((JSParenthesizedExpression) condition).getInnerExpression();
+            if (condition instanceof JSParenthesizedExpression parenthesizedExpression) {
+                final JSExpression contents = parenthesizedExpression.getInnerExpression();
                 collectConditionsForExpression(contents, conditions);
                 return;
             }
-            if (condition instanceof JSBinaryExpression) {
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
+            if (condition instanceof JSBinaryExpression binaryExpression) {
                 final IElementType sign = binaryExpression.getOperationSign();
                 if (JSTokenTypes.OROR.equals(sign)) {
                     final JSExpression lhs = binaryExpression.getLOperand();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
index 7b29bdcb..08d4538d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
@@ -4,51 +4,50 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class FallthroughInSwitchStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("fall.through.in.switch.statement.display.name");
+        return InspectionJSLocalize.fallThroughInSwitchStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("fall.through.in.switch.statement.error.string");
+        return InspectionJSLocalize.fallThroughInSwitchStatementErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSSwitchStatement(JSSwitchStatement jsSwitchStatement) {
+        @Override
+        public void visitJSSwitchStatement(JSSwitchStatement jsSwitchStatement) {
             final JSCaseClause[] caseClauses = jsSwitchStatement.getCaseClauses();
             for (int i = 0; i < caseClauses.length-1; i++) {
                 final JSCaseClause clause = caseClauses[i];
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
index 4fb9e0e6..f1309842 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
@@ -4,7 +4,11 @@
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
@@ -12,9 +16,8 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
+import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection
@@ -23,7 +26,7 @@ public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("for.loop.replaceable.by.while.display.name");
+		return InspectionJSLocalize.forLoopReplaceableByWhileDisplayName().get();
 	}
 
 	@Override
@@ -45,8 +48,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	protected String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message(
-				"for.loop.replaceable.by.while.problem.descriptor");
+		return InspectionJSLocalize.forLoopReplaceableByWhileProblemDescriptor().get();
 	}
 
 	@Nonnull
@@ -69,28 +71,18 @@ private static class ReplaceForByWhileFix extends InspectionJSFix
 		@Nonnull
 		public String getName()
 		{
-			return InspectionJSBundle.message(
-					"for.loop.replaceable.by.while.replace.quickfix");
+			return InspectionJSLocalize.forLoopReplaceableByWhileReplaceQuickfix().get();
 		}
 
 		@Override
 		public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException
 		{
 			final PsiElement forKeywordElement = descriptor.getPsiElement();
-			final JSForStatement forStatement =
-					(JSForStatement) forKeywordElement.getParent();
+			final JSForStatement forStatement = (JSForStatement) forKeywordElement.getParent();
 			assert forStatement != null;
 			final JSExpression condition = forStatement.getCondition();
 			final JSStatement body = forStatement.getBody();
-			final String bodyText;
-			if(body == null)
-			{
-				bodyText = "";
-			}
-			else
-			{
-				bodyText = body.getText();
-			}
+			final String bodyText = body == null ? "" : body.getText();
 			@NonNls final String whileStatement;
 			if(condition == null)
 			{
@@ -98,8 +90,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
 			}
 			else
 			{
-				whileStatement = "while(" + condition.getText() + ')' +
-						bodyText;
+				whileStatement = "while(" + condition.getText() + ')' + bodyText;
 			}
 			replaceStatement(forStatement, whileStatement);
 		}
@@ -113,7 +104,6 @@ public BaseInspectionVisitor buildVisitor()
 
 	private class ForLoopReplaceableByWhileVisitor extends BaseInspectionVisitor<ForLoopReplaceableByWhileJSInspectionState>
 	{
-
 		@Override
 		public void visitJSForStatement(@Nonnull JSForStatement statement)
 		{
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
index 46f532ad..46cfa7ac 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
@@ -9,70 +10,59 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class ForLoopThatDoesntUseLoopVariableJSInspection
-        extends JavaScriptInspection {
-
+public class ForLoopThatDoesntUseLoopVariableJSInspection extends JavaScriptInspection {
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "for.loop.not.use.loop.variable.display.name");
+        return InspectionJSLocalize.forLoopNotUseLoopVariableDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     public String buildErrorString(Object state, Object... args) {
         final boolean condition = (Boolean) args[0];
         final boolean update = (Boolean) args[1];
         if (condition && update) {
-            return InspectionJSBundle.message(
-                    "for.loop.not.use.loop.variable.problem.descriptor.both.condition.and.update");
+            return InspectionJSLocalize.forLoopNotUseLoopVariableProblemDescriptorBothConditionAndUpdate().get();
         }
         if (condition) {
-            return InspectionJSBundle.message(
-                    "for.loop.not.use.loop.variable.problem.descriptor.condition");
+            return InspectionJSLocalize.forLoopNotUseLoopVariableProblemDescriptorCondition().get();
         }
-        return InspectionJSBundle.message(
-                "for.loop.not.use.loop.variable.problem.descriptor.update");
+        return InspectionJSLocalize.forLoopNotUseLoopVariableProblemDescriptorUpdate().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ForLoopThatDoesntUseLoopVariableVisitor();
     }
 
     //TODO: right now this only works with a variable declared in the for loop
     //TODO: make it work with an implicit declaration as well
-    private static class ForLoopThatDoesntUseLoopVariableVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
+    private static class ForLoopThatDoesntUseLoopVariableVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
             if (conditionUsesInitializer(statement)) {
                 if (!updateUsesInitializer(statement)) {
-                    registerStatementError(statement,
-                            Boolean.FALSE, Boolean.TRUE);
+                    registerStatementError(statement, Boolean.FALSE, Boolean.TRUE);
                 }
             } else {
                 if (updateUsesInitializer(statement)) {
-                    registerStatementError(statement,
-                            Boolean.TRUE, Boolean.FALSE);
+                    registerStatementError(statement, Boolean.TRUE, Boolean.FALSE);
                 } else {
-                    registerStatementError(statement,
-                            Boolean.TRUE, Boolean.TRUE);
+                    registerStatementError(statement, Boolean.TRUE, Boolean.TRUE);
                 }
             }
         }
 
-        private static boolean conditionUsesInitializer(
-                JSForStatement statement) {
+        private static boolean conditionUsesInitializer(JSForStatement statement) {
             final JSExpression condition = statement.getCondition();
             if (condition == null) {
                 return true;
@@ -105,8 +95,7 @@ private static boolean updateUsesInitializer(JSForStatement statement) {
             return expressionUsesVariable(update, variables[0]);
         }
 
-        private static boolean expressionUsesVariable(JSExpression expression,
-                                                      JSVariable localVar) {
+        private static boolean expressionUsesVariable(JSExpression expression, JSVariable localVar) {
             final UseVisitor useVisitor = new UseVisitor(localVar);
             expression.accept(useVisitor);
             return useVisitor.isUsed();
@@ -114,7 +103,6 @@ private static boolean expressionUsesVariable(JSExpression expression,
     }
 
     private static class UseVisitor extends JSRecursiveElementVisitor {
-
         private final JSVariable variable;
         private boolean used = false;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
index 834dc95e..990e32f4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
@@ -2,7 +2,11 @@
 
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -10,7 +14,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -18,41 +21,39 @@ public class IfStatementWithIdenticalBranchesJSInspection extends JavaScriptInsp
     private InspectionJSFix fix = new CollapseIfFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("if.statement.with.identical.branches.display.name");
+        return InspectionJSLocalize.ifStatementWithIdenticalBranchesDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("ref.statement.with.identical.branches.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.refStatementWithIdenticalBranchesErrorString().get();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class CollapseIfFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("collapse.if.statement.fix");
+            return InspectionJSLocalize.collapseIfStatementFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement identifier = descriptor.getPsiElement();
-            final JSIfStatement statement =
-                    (JSIfStatement) identifier.getParent();
+            final JSIfStatement statement = (JSIfStatement) identifier.getParent();
             assert statement != null;
             final JSStatement thenBranch = statement.getThen();
             final String bodyText = thenBranch.getText();
@@ -61,7 +62,7 @@ public void doFix(Project project, ProblemDescriptor descriptor)
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new IfStatementWithIdenticalBranchesVisitor();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
index b892b7e9..87a8942d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
@@ -3,14 +3,13 @@
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -20,7 +19,7 @@ public class IfStatementWithTooManyBranchesJSInspection extends JavaScriptInspec
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("if.statement.with.too.many.branches.display.name");
+		return InspectionJSLocalize.ifStatementWithTooManyBranchesDisplayName().get();
 	}
 
 	@Override
@@ -43,7 +42,7 @@ protected String buildErrorString(Object state, Object... args)
 	{
 		final JSIfStatement statement = (JSIfStatement) args[0];
 		final int branches = calculateNumBranches(statement);
-		return InspectionJSBundle.message("if.statement.with.too.many.branches.error.string", branches);
+		return InspectionJSLocalize.ifStatementWithTooManyBranchesErrorString(branches).get();
 	}
 
 	private static int calculateNumBranches(JSIfStatement statement)
@@ -68,7 +67,6 @@ public BaseInspectionVisitor buildVisitor()
 
 	private class Visitor extends BaseInspectionVisitor<IfStatementWithTooManyBranchesJSInspectionState>
 	{
-
 		@Override
 		public void visitJSIfStatement(@Nonnull JSIfStatement statement)
 		{
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index 38b6ed0e..ea123f44 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import jakarta.annotation.Nullable;
@@ -16,34 +17,33 @@
 
 @ExtensionImpl
 public class DocumentWriteJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("call.to.document.write.display.name");
+        return InspectionJSLocalize.callToDocumentWriteDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("document.write.error.string");
+        return InspectionJSLocalize.documentWriteErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSCallExpression(JSCallExpression jsCallExpression) {
+        @Override
+        public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             super.visitJSCallExpression(jsCallExpression);
             final JSExpression methodExpression;
             try {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
index 7b61b766..5857e0b2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
@@ -4,9 +4,9 @@
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -14,38 +14,37 @@
 
 @ExtensionImpl
 public class ContinueOrBreakFromFinallyBlockJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("continue.or.break.inside.finally.block.display.name");
+        return InspectionJSLocalize.continueOrBreakInsideFinallyBlockDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("continue.or.break.inside.finally.block.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.continueOrBreakInsideFinallyBlockErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
+        @Override
+        public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
@@ -60,7 +59,8 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
+        @Override
+        public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index 347de179..cf575d27 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -4,9 +4,9 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.StatementUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -16,33 +16,32 @@
 
 @ExtensionImpl
 public class EmptyCatchBlockJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("empty.catch.block.display.name");
+        return InspectionJSLocalize.emptyCatchBlockDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("empty.catch.block.error.string");
+        return InspectionJSLocalize.emptyCatchBlockErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
-
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSTryStatement(JSTryStatement jsTryStatement) {
+        @Override
+        public void visitJSTryStatement(JSTryStatement jsTryStatement) {
             super.visitJSTryStatement(jsTryStatement);
             final JSCatchBlock catchBlock = jsTryStatement.getCatchBlock();
             if (catchBlock == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
index 7888493e..593bacb1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
@@ -3,45 +3,44 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.StatementUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class EmptyFinallyBlockJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("empty.finally.block.display.name");
+        return InspectionJSLocalize.emptyFinallyBlockDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("empty.finally.block.error.string");
+        return InspectionJSLocalize.emptyFinallyBlockErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSTryStatement(JSTryStatement jsTryStatement) {
+        @Override
+        public void visitJSTryStatement(JSTryStatement jsTryStatement) {
             super.visitJSTryStatement(jsTryStatement);
             final JSStatement finallyStatement = jsTryStatement.getFinallyStatement();
             if (finallyStatement == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index 397dc04b..2855d572 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -3,45 +3,44 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.StatementUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class EmptyTryBlockJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("empty.try.block.display.name");
+        return InspectionJSLocalize.emptyTryBlockDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("empty.try.block.error.string");
+        return InspectionJSLocalize.emptyTryBlockErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSTryStatement(JSTryStatement jsTryStatement) {
+        @Override
+        public void visitJSTryStatement(JSTryStatement jsTryStatement) {
             super.visitJSTryStatement(jsTryStatement);
             final JSStatement statement = jsTryStatement.getStatement();
             if (statement == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index 047368e9..8faa83a5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -8,6 +8,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -16,38 +17,37 @@
 
 @ExtensionImpl
 public class ExceptionCaughtLocallyJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("exception.used.for.local.control.flow.display.name");
+        return InspectionJSLocalize.exceptionUsedForLocalControlFlowDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("exception.caught.locally.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.exceptionCaughtLocallyErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
+        @Override
+        public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
             super.visitJSThrowStatement(statement);
             if (!isCaughtLocally(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index 9970d2c7..d8b043f1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -3,14 +3,13 @@
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -27,7 +26,7 @@ public String getID()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("overly.complex.function.display.name");
+		return InspectionJSLocalize.overlyComplexFunctionDisplayName().get();
 	}
 
 	@Override
@@ -57,11 +56,11 @@ public String buildErrorString(Object state, Object... args)
 		final int coupling = visitor.getComplexity();
 		if(functionHasIdentifier(function))
 		{
-			return InspectionJSBundle.message("function.ref.is.overly.complex.cyclomatic.complexity.error.string", coupling);
+			return InspectionJSLocalize.functionRefIsOverlyComplexCyclomaticComplexityErrorString(coupling).get();
 		}
 		else
 		{
-			return InspectionJSBundle.message("anonymous.function.is.overly.complex.cyclomatic.complexity.error.string", coupling);
+			return InspectionJSLocalize.anonymousFunctionIsOverlyComplexCyclomaticComplexityErrorString(coupling).get();
 		}
 	}
 
@@ -94,4 +93,3 @@ public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
 		}
 	}
 }
-
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index a36c2d9c..51821b91 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -2,33 +2,32 @@
 
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class FunctionWithMultipleLoopsJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("function.with.multiple.loops.display.name");
+        return InspectionJSLocalize.functionWithMultipleLoopsDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
+    @Override
+    public String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
         assert function != null;
         final LoopCountVisitor visitor = new LoopCountVisitor();
@@ -37,10 +36,10 @@ public String buildErrorString(Object state, Object... args) {
         lastChild.accept(visitor);
         final int loopCount = visitor.getCount();
         if (functionHasIdentifier(function)) {
-            return InspectionJSBundle.message("function.contains.multiple.loops.error.string", loopCount);
+            return InspectionJSLocalize.functionContainsMultipleLoopsErrorString(loopCount).get();
         }
         else {
-            return InspectionJSBundle.message("anonymous.function.contains.multiple.loops.error.string", loopCount);
+            return InspectionJSLocalize.anonymousFunctionContainsMultipleLoopsErrorString(loopCount).get();
         }
     }
 
@@ -48,10 +47,9 @@ public String buildErrorString(Object state, Object... args) {
 	public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
-
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        @Override
+        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             // note: no call to super
             final PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
@@ -67,4 +65,3 @@ private static class Visitor extends BaseInspectionVisitor {
         }
     }
 }
-
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index c517eadd..a04d5687 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -1,12 +1,15 @@
 package com.sixrr.inspectjs.functionmetrics;
 
 import com.intellij.lang.javascript.psi.*;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JSRecursiveElementVisitor;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -22,7 +25,7 @@ public boolean isEnabledByDefault()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("function.with.multiple.return.points.display.name");
+		return InspectionJSLocalize.functionWithMultipleReturnPointsDisplayName().get();
 	}
 
 	@Override
@@ -41,11 +44,11 @@ public String buildErrorString(Object state, Object... args)
 		final int returnPointCount = countReturnPoints(function);
 		if(functionHasIdentifier(function))
 		{
-			return InspectionJSBundle.message("function.contains.multiple.return.points.error.string", returnPointCount);
+			return InspectionJSLocalize.functionContainsMultipleReturnPointsErrorString(returnPointCount).get();
 		}
 		else
 		{
-			return InspectionJSBundle.message("anonymous.function.contains.multiple.return.points.error.string", returnPointCount);
+			return InspectionJSLocalize.anonymousFunctionContainsMultipleReturnPointsErrorString(returnPointCount).get();
 		}
 	}
 
@@ -129,4 +132,3 @@ public int getReturnCount()
 		}
 	}
 }
-
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index aa335ab6..70516e96 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -2,16 +2,15 @@
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -36,7 +35,7 @@ public InspectionToolState<?> createStateProvider()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("function.naming.convention.display.name");
+		return InspectionJSLocalize.functionNamingConventionDisplayName().get();
 	}
 
 	@Override
@@ -68,13 +67,13 @@ public String buildErrorString(Object state, Object... args)
 		assert functionName != null;
 		if(functionName.length() < inspectionState.m_minLength)
 		{
-			return InspectionJSBundle.message("function.name.is.too.short.error.string", functionName);
+			return InspectionJSLocalize.functionNameIsTooShortErrorString(functionName).get();
 		}
 		else if(functionName.length() > inspectionState.m_maxLength)
 		{
-			return InspectionJSBundle.message("function.name.is.too.long.error.string", functionName);
+			return InspectionJSLocalize.functionNameIsTooLongErrorString(functionName).get();
 		}
-		return InspectionJSBundle.message("function.name.doesnt.match.regex.error.string", functionName, inspectionState.m_regex);
+		return InspectionJSLocalize.functionNameDoesntMatchRegexErrorString(functionName, inspectionState.m_regex).get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index e21137a3..376cc56d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -4,52 +4,48 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ChainedEqualityJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
     public String getID() {
         return "ChainedEqualityComparisonsJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("chained.equality.display.name");
+        return InspectionJSLocalize.chainedEqualityDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("chained.equality.error.string");
+        return InspectionJSLocalize.chainedEqualityErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ChainedEqualityVisitor();
     }
 
     private static class ChainedEqualityVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(
-                @Nonnull JSBinaryExpression expression) {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
@@ -67,11 +63,9 @@ private static class ChainedEqualityVisitor extends BaseInspectionVisitor {
             registerError(expression);
         }
 
-        private static boolean isEqualityComparison(
-                @Nonnull JSBinaryExpression expression) {
+        private static boolean isEqualityComparison(@Nonnull JSBinaryExpression expression) {
             final IElementType tokenType = expression.getOperationSign();
-            return JSTokenTypes.EQEQ.equals(tokenType) ||
-                    JSTokenTypes.NE.equals(tokenType);
+            return JSTokenTypes.EQEQ.equals(tokenType) || JSTokenTypes.NE.equals(tokenType);
         }
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index 7c0bbfdf..677f419f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -5,9 +5,9 @@
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import jakarta.annotation.Nonnull;
@@ -32,8 +32,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message(
-				"chained.function.call.display.name");
+		return InspectionJSLocalize.chainedFunctionCallDisplayName().get();
 	}
 
 	@RequiredReadAction
@@ -41,8 +40,7 @@ public String getDisplayName()
 	@Nonnull
 	protected String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message(
-				"chained.function.call.problem.descriptor");
+		return InspectionJSLocalize.chainedFunctionCallProblemDescriptor().get();
 	}
 
 	@Override
@@ -51,17 +49,13 @@ public BaseInspectionVisitor buildVisitor()
 		return new NestedMethodCallVisitor();
 	}
 
-
 	private static class NestedMethodCallVisitor extends BaseInspectionVisitor
 	{
-
 		@Override
-		public void visitJSCallExpression(
-				@Nonnull JSCallExpression expression)
+		public void visitJSCallExpression(@Nonnull JSCallExpression expression)
 		{
 			super.visitJSCallExpression(expression);
-			final JSExpression reference =
-					expression.getMethodExpression();
+			final JSExpression reference = expression.getMethodExpression();
 			if(!(reference instanceof JSReferenceExpression))
 			{
 				return;
@@ -87,10 +81,8 @@ private static boolean isCallExpression(JSExpression expression)
 			}
 			if(expression instanceof JSParenthesizedExpression)
 			{
-				final JSParenthesizedExpression parenthesizedExpression =
-						(JSParenthesizedExpression) expression;
-				final JSExpression containedExpression =
-						parenthesizedExpression.getInnerExpression();
+				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+				final JSExpression containedExpression = parenthesizedExpression.getInnerExpression();
 				return isCallExpression(containedExpression);
 			}
 			return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index 26ae5232..fcaa58f8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -20,49 +21,48 @@ public class ConstantOnLHSOfComparisonJSInspection extends JavaScriptInspection
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "ConstantOnLefSideOfComparisonJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("constant.on.left.side.of.comparison.display.name");
+        return InspectionJSLocalize.constantOnLeftSideOfComparisonDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("constant.on.left.side.of.comparison.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.constantOnLeftSideOfComparisonErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ConstantOnRHSOfComparisonVisitor();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class SwapComparisonFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("flip.comparison.fix");
+            return InspectionJSLocalize.flipComparisonFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
             final JSExpression rhs = expression.getROperand();
             final JSExpression lhs = expression.getLOperand();
@@ -71,13 +71,11 @@ public void doFix(Project project, ProblemDescriptor descriptor)
             final String rhsText = rhs.getText();
             final String flippedComparison = ComparisonUtils.getFlippedComparison(sign);
             final String lhsText = lhs.getText();
-            replaceExpression(expression,
-                    rhsText + ' ' + flippedComparison + ' ' + lhsText);
+            replaceExpression(expression, rhsText + ' ' + flippedComparison + ' ' + lhsText);
         }
     }
 
     private static class ConstantOnRHSOfComparisonVisitor extends BaseInspectionVisitor {
-
         @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
@@ -88,8 +86,7 @@ private static class ConstantOnRHSOfComparisonVisitor extends BaseInspectionVisi
             }
             final JSExpression lhs = expression.getLOperand();
             final JSExpression rhs = expression.getROperand();
-            if (!(lhs instanceof JSLiteralExpression) ||
-                    rhs instanceof JSLiteralExpression) {
+            if (!(lhs instanceof JSLiteralExpression) || rhs instanceof JSLiteralExpression) {
                 return;
             }
             registerError(expression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index 6018ff78..43ca4ecf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -3,7 +3,11 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -12,7 +16,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -20,49 +23,48 @@ public class ConstantOnRHSOfComparisonJSInspection extends JavaScriptInspection
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "ConstantOnRightSideOfComparisonJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("constant.on.right.side.of.comparison.display.name");
+        return InspectionJSLocalize.constantOnRightSideOfComparisonDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("constant.on.right.side.of.comparison.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.constantOnRightSideOfComparisonErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ConstantOnRHSOfComparisonVisitor();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class SwapComparisonFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("flip.comparison.fix");
+            return InspectionJSLocalize.flipComparisonFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
             final JSExpression rhs = expression.getROperand();
             final JSExpression lhs = expression.getLOperand();
@@ -71,14 +73,13 @@ public void doFix(Project project, ProblemDescriptor descriptor)
             final String rhsText = rhs.getText();
             final String flippedComparison = ComparisonUtils.getFlippedComparison(sign);
             final String lhsText = lhs.getText();
-            replaceExpression(expression,
-                    rhsText + ' ' + flippedComparison + ' ' + lhsText);
+            replaceExpression(expression, rhsText + ' ' + flippedComparison + ' ' + lhsText);
         }
     }
 
     private static class ConstantOnRHSOfComparisonVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index faaaf425..2564d85a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -1,20 +1,20 @@
 package com.sixrr.inspectjs.validity;
 
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import consulo.language.psi.PsiFile;
-import consulo.language.psi.ResolveResult;
-import consulo.language.ast.IElementType;
-import consulo.language.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ecmascript.psi.ES6ExportDefaultAssignment;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.ResolveResult;
+import consulo.language.psi.util.PsiTreeUtil;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
@@ -27,7 +27,7 @@ public class BadExpressionStatementJSInspection extends JavaScriptInspection
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("expression.statement.which.is.not.assignment.or.call.display.name");
+		return InspectionJSLocalize.expressionStatementWhichIsNotAssignmentOrCallDisplayName().get();
 	}
 
 	@Override
@@ -48,7 +48,7 @@ public boolean isEnabledByDefault()
 	@Nullable
 	protected String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message("expression.statement.is.not.assignment.or.call.error.string");
+		return InspectionJSLocalize.expressionStatementIsNotAssignmentOrCallErrorString().get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
index e3f56ac5..bfceb191 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
@@ -4,51 +4,49 @@
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nullable;
+import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class DebuggerStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("debugger.statement.display.name");
+        return InspectionJSLocalize.debuggerStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return false;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("debugger.statement.error.string");
+        return InspectionJSLocalize.debuggerStatementErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSExpressionStatement(JSExpressionStatement jsExpressionStatement) {
+        @Override
+        public void visitJSExpressionStatement(JSExpressionStatement jsExpressionStatement) {
             super.visitJSExpressionStatement(jsExpressionStatement);
             final JSExpression expression = jsExpressionStatement.getExpression();
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index fba8afb0..32b7b889 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -4,13 +4,12 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
@@ -20,40 +19,39 @@
 @ExtensionImpl
 public class DuplicateCaseLabelJSInspection extends JavaScriptInspection {
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("duplicate.case.label.display.name");
+        return InspectionJSLocalize.duplicateCaseLabelDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("duplicate.case.label.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.duplicateCaseLabelErrorString().get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
-    private static class Visitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
 
-            final Set<JSExpression> conditions = new HashSet<JSExpression>();
+            final Set<JSExpression> conditions = new HashSet<>();
             collectCaseLabels(statement, conditions);
             final int numConditions = conditions.size();
             if (numConditions < 2) {
@@ -102,8 +100,7 @@ private static class Visitor
             }
         }
 
-        private static void collectCaseLabels(JSSwitchStatement statement,
-                                              Set<JSExpression> conditions) {
+        private static void collectCaseLabels(JSSwitchStatement statement, Set<JSExpression> conditions) {
             final JSCaseClause[] clauses = statement.getCaseClauses();
             for (JSCaseClause clause : clauses) {
                 if (!clause.isDefault()) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index 785d884c..feb3a510 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -3,12 +3,11 @@
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
@@ -16,37 +15,36 @@
 @ExtensionImpl
 public class DuplicatePropertyOnObjectJSInspection extends JavaScriptInspection {
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("duplicate.property.on.object.literal.display.name");
+        return InspectionJSLocalize.duplicatePropertyOnObjectLiteralDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("duplicate.object.property.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.duplicateObjectPropertyErrorString().get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
-    private static class Visitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSObjectLiteralExpression(JSObjectLiteralExpression jsObjectLiteralExpression) {
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSObjectLiteralExpression(JSObjectLiteralExpression jsObjectLiteralExpression) {
             super.visitJSObjectLiteralExpression(jsObjectLiteralExpression);
             final JSProperty[] properties = jsObjectLiteralExpression.getProperties();
             final boolean[] matched = new boolean[properties.length];
@@ -75,8 +73,6 @@ private static class Visitor
                     }
                 }
             }
-
         }
-
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index 67d5a840..a36d628c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -2,14 +2,17 @@
 
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JSRecursiveElementVisitor;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-import com.sixrr.inspectjs.*;
-import com.sixrr.inspectjs.utils.ControlFlowUtils;
-import consulo.language.editor.inspection.ProblemHighlightType;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -21,7 +24,7 @@ public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspe
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("function.with.inconsistent.returns.display.name");
+		return InspectionJSLocalize.functionWithInconsistentReturnsDisplayName().get();
 	}
 
 	@Override
@@ -46,11 +49,11 @@ protected String buildErrorString(Object state, Object... args)
 		assert function != null;
 		if(functionHasIdentifier(function))
 		{
-			return InspectionJSBundle.message("function.has.inconsistent.return.points.error.string");
+			return InspectionJSLocalize.functionHasInconsistentReturnPointsErrorString().get();
 		}
 		else
 		{
-			return InspectionJSBundle.message("anonymous.function.has.inconsistent.return.points.error.string");
+			return InspectionJSLocalize.anonymousFunctionHasInconsistentReturnPointsErrorString().get();
 		}
 	}
 

From ed04f65124df7c6bc968cc9a52c9633027b1c322 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 14 Jul 2024 17:00:49 +0300
Subject: [PATCH 195/340] Replacing Bundle with Localize (part 2). Making same
 indents within file.

---
 .../documentation/JSDocumentationBuilder.java |   9 +-
 .../javascript/lang/parsing/Parsing.java      |  20 +-
 .../NestedAssignmentJSInspection.java         |  28 +--
 ...entWithOperatorAssignmentJSInspection.java |  68 +++---
 .../SillyAssignmentJSInspection.java          |  31 +--
 ...ointlessBitwiseExpressionJSInspection.java |  27 +--
 .../bitwise/ShiftOutOfRangeJSInspection.java  |  42 ++--
 .../bugs/InfiniteLoopJSInspection.java        |  44 ++--
 .../bugs/InfiniteRecursionJSInspection.java   |  34 ++-
 ...tCircuitBooleanExpressionJSInspection.java |  59 ++---
 .../ObjectAllocationIgnoredJSInspection.java  |  31 +--
 ...extLabelInSwitchStatementJSInspection.java |  34 ++-
 .../confusing/MagicNumberJSInspection.java    |  77 +++---
 ...atedConditionalExpressionJSInspection.java |  50 ++--
 .../NegatedIfStatementJSInspection.java       |  50 ++--
 ...stedConditionalExpressionJSInspection.java |  22 +-
 .../confusing/NestedFunctionJSInspection.java |  11 +-
 .../confusing/OctalIntegerJSInspection.java   |  36 ++-
 ...mplexArithmeticExpressionJSInspection.java |   6 +-
 ...yComplexBooleanExpressionJSInspection.java |   7 +-
 ...tlessArithmeticExpressionJSInspection.java |  74 +++---
 ...ointlessBooleanExpressionJSInspection.java | 148 +++++-------
 .../control/LabeledStatementJSInspection.java |  21 +-
 ...opStatementThatDoesntLoopJSInspection.java |  51 ++--
 .../NestedSwitchStatementJSInspection.java    |  25 +-
 ...tementWithNoDefaultBranchJSInspection.java |  21 +-
 .../control/TailRecursionJSInspection.java    |  18 +-
 .../TrivialConditionalJSInspection.java       |  46 ++--
 .../control/TrivialIfJSInspection.java        | 227 ++++++------------
 .../UnnecessaryContinueJSInspection.java      |  61 +++--
 .../control/UnnecessaryLabelJSInspection.java |  63 +++--
 .../ReuseOfLocalVariableJSInspection.java     |  34 +--
 .../inspectjs/dom/InnerHTMLJSInspection.java  |  23 +-
 .../dom/PlatformDetectionJSInspection.java    |  18 +-
 .../ReturnFromFinallyBlockJSInspection.java   |  25 +-
 .../ThrowFromFinallyBlockJSInspection.java    |  29 ++-
 .../com/sixrr/inspectjs/fix/RenameFix.java    |  29 +--
 .../NestingDepthJSInspection.java             |  23 +-
 .../ParametersPerFunctionJSInspection.java    |  18 +-
 .../StatementsPerFunctionJSInspection.java    |  18 +-
 ...ThreeNegationsPerFunctionJSInspection.java |  30 +--
 ...lVariableNamingConventionJSInspection.java |  22 +-
 ...ParameterNamingConventionJSInspection.java |  15 +-
 .../style/NestedFunctionCallJSInspection.java |  29 +--
 .../NonBlockStatementBodyJSInspection.java    |  67 +++---
 .../inspectjs/ui/RegExInputVerifier.java      |  18 +-
 .../StringLiteralBreaksHTMLJSInspection.java  |  31 ++-
 ...ionReferencesGlobalObjectJSInspection.java |  30 +--
 .../javascript/JSParameterInfoHandler.java    |   6 +-
 .../refactoring/JSBaseIntroduceHandler.java   |  28 ++-
 50 files changed, 813 insertions(+), 1121 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
index 31d14df2..2c10d265 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
@@ -24,15 +24,14 @@
 
 import com.intellij.lang.javascript.index.JSSymbolUtil;
 import com.intellij.lang.javascript.psi.*;
-import consulo.language.editor.CodeInsightBundle;
+import consulo.language.editor.localize.CodeInsightLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.util.io.URLUtil;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -519,7 +518,7 @@ String getDoc()
 			if(methodInfo.parameterInfoMap.size() > 0)
 			{
 				result.append("<DT><b>");
-				result.append(CodeInsightBundle.message("javadoc.parameters"));
+				result.append(CodeInsightLocalize.javadocParameters().get());
 				result.append("</b></DT>");
 			}
 
@@ -540,7 +539,7 @@ String getDoc()
 			if(methodInfo.returnInfo.description.length() > 0)
 			{
 				result.append("<DT><b>");
-				result.append(CodeInsightBundle.message("javadoc.returns"));
+				result.append(CodeInsightLocalize.javadocReturns().get());
 				result.append("</b></DT>");
 
 				result.append("<DD>");
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index ea68756d..e20f1062 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -43,14 +43,14 @@ public Parsing(C context)
 
 	public boolean isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType)
 	{
-		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
+		if (builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 		{
 			IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
-			if(contextKeywordElementType == null)
+			if (contextKeywordElementType == null)
 			{
 				return false;
 			}
-			if(elementType == contextKeywordElementType)
+			if (elementType == contextKeywordElementType)
 			{
 				return true;
 			}
@@ -61,14 +61,14 @@ public boolean isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementTy
 	@Nullable
 	public IElementType isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
 	{
-		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
+		if (builder.getTokenType() == JSTokenTypes.IDENTIFIER)
 		{
 			IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
-			if(contextKeywordElementType == null)
+			if (contextKeywordElementType == null)
 			{
 				return null;
 			}
-			if(tokenSet.contains(contextKeywordElementType))
+			if (tokenSet.contains(contextKeywordElementType))
 			{
 				return contextKeywordElementType;
 			}
@@ -92,11 +92,11 @@ public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElement
 	public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
 	{
 		IElementType elementType = isContextKeyword(builder, tokenSet);
-		if(elementType != null)
+		if (elementType != null)
 		{
-			if(builder instanceof JavaScriptStrictParserBuilder)
+			if (builder instanceof JavaScriptStrictParserBuilder strictParserBuilder)
 			{
-				((JavaScriptStrictParserBuilder) builder).disableNonStrictRemap(builder.getCurrentOffset());
+				strictParserBuilder.disableNonStrictRemap(builder.getCurrentOffset());
 			}
 			builder.remapCurrentToken(elementType);
 			builder.advanceLexer();
@@ -127,7 +127,7 @@ public static void buildTokenElement(IElementType type, PsiBuilder builder)
 
 	public static boolean checkMatches(final PsiBuilder builder, final IElementType token, final LocalizeValue message)
 	{
-		if(builder.getTokenType() == token)
+		if (builder.getTokenType() == token)
 		{
 			builder.advanceLexer();
 			return true;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
index 245f3938..dd12889d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
@@ -2,52 +2,46 @@
 
 import com.intellij.lang.javascript.psi.JSAssignmentExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NestedAssignmentJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("nested.assignment.display.name");
+        return InspectionJSLocalize.nestedAssignmentDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("nested.assignment.error.string");
+        return InspectionJSLocalize.nestedAssignmentErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new NestedAssignmentVisitor();
     }
 
     private static class NestedAssignmentVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSAssignmentExpression(
-                @Nonnull JSAssignmentExpression expression) {
+        @Override
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
             final PsiElement parent = expression.getParent();
-            if (parent == null) {
-                return;
-            }
-            if (!(parent instanceof JSAssignmentExpression )) {
+            if (parent == null || !(parent instanceof JSAssignmentExpression)) {
                 return;
             }
             registerError(expression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
index 1c89b27d..55941976 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
@@ -5,7 +5,11 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import com.sixrr.inspectjs.utils.SideEffectChecker;
 import consulo.annotation.access.RequiredReadAction;
@@ -19,38 +23,34 @@
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
-public class ReplaceAssignmentWithOperatorAssignmentJSInspection
-        extends JavaScriptInspection {
+public class ReplaceAssignmentWithOperatorAssignmentJSInspection extends JavaScriptInspection {
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "AssignmentReplaceableWithOperatorAssignmentJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("assignment.replaceable.with.operator.assignment.display.name");
+        return InspectionJSLocalize.assignmentReplaceableWithOperatorAssignmentDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message(
-                "assignment.replaceable.with.operator.assignment.error.string",
-                calculateReplacementExpression((JSAssignmentExpression) args[0]));
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        String expression = calculateReplacementExpression((JSAssignmentExpression)args[0]);
+        return InspectionJSLocalize.assignmentReplaceableWithOperatorAssignmentErrorString(expression).get();
     }
 
-    private static String calculateReplacementExpression(
-            JSAssignmentExpression expression) {
-        final JSBinaryExpression rhs =
-                (JSBinaryExpression) expression.getROperand();
+    private static String calculateReplacementExpression(JSAssignmentExpression expression) {
+        final JSBinaryExpression rhs = (JSBinaryExpression) expression.getROperand();
         final JSExpression lhs = expression.getLOperand();
         assert rhs != null;
         final IElementType sign = rhs.getOperationSign();
@@ -61,52 +61,44 @@ private static String calculateReplacementExpression(
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ReplaceAssignmentWithOperatorAssignmentVisitor();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
-        return new ReplaceAssignmentWithOperatorAssignmentFix(
-                (JSAssignmentExpression) location);
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
+        return new ReplaceAssignmentWithOperatorAssignmentFix((JSAssignmentExpression) location);
     }
 
-    private static class ReplaceAssignmentWithOperatorAssignmentFix
-            extends InspectionJSFix {
+    private static class ReplaceAssignmentWithOperatorAssignmentFix extends InspectionJSFix {
         private final String m_name;
 
-        private ReplaceAssignmentWithOperatorAssignmentFix(
-                JSAssignmentExpression expression) {
+        private ReplaceAssignmentWithOperatorAssignmentFix(JSAssignmentExpression expression) {
             super();
-            final JSBinaryExpression rhs =
-                    (JSBinaryExpression) expression.getROperand();
+            final JSBinaryExpression rhs = (JSBinaryExpression) expression.getROperand();
             assert rhs != null;
             final IElementType sign = rhs.getOperationSign();
             String signText = getTextForOperator(sign);
-            m_name = InspectionJSBundle.message("replace.with.operator.assign.fix", signText);
+            m_name = InspectionJSLocalize.replaceWithOperatorAssignFix(signText).get();
         }
 
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
             return m_name;
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
-            final JSAssignmentExpression expression =
-                    (JSAssignmentExpression) descriptor.getPsiElement();
-            final String newExpression =
-                    calculateReplacementExpression(expression);
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final JSAssignmentExpression expression = (JSAssignmentExpression) descriptor.getPsiElement();
+            final String newExpression = calculateReplacementExpression(expression);
             replaceExpression(expression, newExpression);
         }
     }
 
-    private static class ReplaceAssignmentWithOperatorAssignmentVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+    private static class ReplaceAssignmentWithOperatorAssignmentVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
 
             final IElementType sign = assignment.getOperationSign();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
index 2cf5f9c2..cc18347b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
@@ -6,54 +6,49 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class SillyAssignmentJSInspection
-        extends JavaScriptInspection {
-
-
+public class SillyAssignmentJSInspection extends JavaScriptInspection {
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("silly.assignment.display.name");
+        return InspectionJSLocalize.sillyAssignmentDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("silly.assignment.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.sillyAssignmentErrorString().get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
-    private static class Visitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
 
             final IElementType sign = assignment.getOperationSign();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index 006e9fd3..0d3528ee 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -4,7 +4,11 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -14,15 +18,15 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
+
 import java.util.HashSet;
 import java.util.Set;
 
 @ExtensionImpl
 public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection
 {
-	static final Set<IElementType> bitwiseTokens = new HashSet<IElementType>(6);
+	static final Set<IElementType> bitwiseTokens = new HashSet<>(6);
 
 	static
 	{
@@ -38,8 +42,7 @@ public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message(
-				"pointless.bitwise.expression.display.name");
+		return InspectionJSLocalize.pointlessBitwiseExpressionDisplayName().get();
 	}
 
 	@Override
@@ -55,9 +58,7 @@ public String getGroupDisplayName()
 	public String buildErrorString(Object state, Object... args)
 	{
 		final String replacementExpression = calculateReplacementExpression((JSExpression) args[0], (PointlessBitwiseExpressionJSInspectionState) state);
-		return InspectionJSBundle.message(
-				"pointless.bitwise.expression.problem.descriptor",
-				replacementExpression);
+		return InspectionJSLocalize.pointlessBitwiseExpressionProblemDescriptor(replacementExpression).get();
 	}
 
 	@Override
@@ -159,8 +160,7 @@ public PointlessBitwiseFix(Object state)
 		@Nonnull
 		public String getName()
 		{
-			return InspectionJSBundle.message(
-					"pointless.bitwise.expression.simplify.quickfix");
+			return InspectionJSLocalize.pointlessBitwiseExpressionSimplifyQuickfix().get();
 		}
 
 		@Override
@@ -264,12 +264,11 @@ private boolean isZero(JSExpression expression, PointlessBitwiseExpressionJSInsp
 
 	private boolean isAllOnes(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state)
 	{
-		if(state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression))
+		if (state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression))
 		{
 			return false;
 		}
-		final Object value =
-				ExpressionUtil.computeConstantExpression(expression);
-		return value != null && value instanceof Integer && (Integer) value == 0xffffffff;
+		final Object value = ExpressionUtil.computeConstantExpression(expression);
+		return value instanceof Integer intValue && intValue == 0xffffffff;
 	}
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index 4db0ba49..6dfba585 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -3,60 +3,53 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ExpressionUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ShiftOutOfRangeJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "shift.operation.by.inappropriate.constant.display.name");
+        return InspectionJSLocalize.shiftOperationByInappropriateConstantDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     public String buildErrorString(Object state, Object... args) {
         final Integer value = (Integer) args[0];
-        if (value > 0) {
-            return InspectionJSBundle.message(
-                    "shift.operation.by.inappropriate.constant.problem.descriptor.too.large");
-        } else {
-            return InspectionJSBundle.message(
-                    "shift.operation.by.inappropriate.constant.problem.descriptor.negative");
-        }
+        return value > 0
+            ? InspectionJSLocalize.shiftOperationByInappropriateConstantProblemDescriptorTooLarge().get()
+            : InspectionJSLocalize.shiftOperationByInappropriateConstantProblemDescriptorNegative().get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ShiftOutOfRange();
     }
 
     private static class ShiftOutOfRange extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(
-                @Nonnull JSBinaryExpression expression) {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final IElementType tokenType = expression.getOperationSign();
             if (tokenType == null ||
@@ -72,8 +65,7 @@ private static class ShiftOutOfRange extends BaseInspectionVisitor {
             if (!ExpressionUtil.isConstantExpression(rhs)) {
                 return;
             }
-            final Object valueObject =
-                     ExpressionUtil.computeConstantExpression(rhs);
+            final Object valueObject = ExpressionUtil.computeConstantExpression(rhs);
             if (!(valueObject instanceof Integer)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
index 6e933a9f..a71f50f4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
@@ -4,50 +4,47 @@
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class InfiniteLoopJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("infinite.loop.statement.display.name");
+        return InspectionJSLocalize.infiniteLoopStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("infinite.loop.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.infiniteLoopErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-
-        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
+        @Override
+        public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
             if (ControlFlowUtils.statementMayCompleteNormally(statement)) {
                 return;
@@ -58,24 +55,21 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
-
+        @Override
+        public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
-            if (ControlFlowUtils.statementMayCompleteNormally(statement)) {
-                return;
-            }
-            if (ControlFlowUtils.statementContainsReturn(statement)) {
+            if (ControlFlowUtils.statementMayCompleteNormally(statement)
+                || ControlFlowUtils.statementContainsReturn(statement)) {
                 return;
             }
             registerStatementError(statement);
         }
 
-        @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+        @Override
+        public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
-            if (ControlFlowUtils.statementMayCompleteNormally(statement)) {
-                return;
-            }
-            if (ControlFlowUtils.statementContainsReturn(statement)) {
+            if (ControlFlowUtils.statementMayCompleteNormally(statement)
+                || ControlFlowUtils.statementContainsReturn(statement)) {
                 return;
             }
             registerStatementError(statement);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
index 6edd655f..f0537276 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
@@ -2,13 +2,12 @@
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.logging.Logger;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -16,46 +15,41 @@ public class InfiniteRecursionJSInspection extends JavaScriptInspection {
     private static Logger logger = Logger.getInstance("ULVJS");
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "infinite.recursion.display.name");
+        return InspectionJSLocalize.infiniteRecursionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message(
-                "infinite.recursion.problem.descriptor");
+        return InspectionJSLocalize.infiniteRecursionProblemDescriptor().get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new InfiniteRecursionVisitor();
     }
 
-    private static class InfiniteRecursionVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+    private static class InfiniteRecursionVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             super.visitJSFunctionDeclaration(function);
 
-            if (!RecursionUtils.functionMayRecurse(function)) {
-                return;
-            }
-            if (!RecursionUtils.functionDefinitelyRecurses(function)) {
+            if (!RecursionUtils.functionMayRecurse(function)
+                || !RecursionUtils.functionDefinitelyRecurses(function)) {
                 return;
             }
             registerFunctionError(function);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index 7ce96288..b159e8e3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -3,7 +3,11 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
@@ -11,87 +15,72 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NonShortCircuitBooleanExpressionJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("non.short.circuit.boolean.expression.display.name");
+        return InspectionJSLocalize.nonShortCircuitBooleanExpressionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("non.short.circuit.boolean.expression.error.string");
+        return InspectionJSLocalize.nonShortCircuitBooleanExpressionErrorString().get();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new NonShortCircuitBooleanFix();
     }
 
-    private static class NonShortCircuitBooleanFix
-            extends InspectionJSFix {
-
+    private static class NonShortCircuitBooleanFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("replace.with.short.circuit.expression.fix.string");
+            return InspectionJSLocalize.replaceWithShortCircuitExpressionFixString().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
-            final JSBinaryExpression expression =
-                    (JSBinaryExpression) descriptor.getPsiElement();
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
             final JSExpression lhs = expression.getLOperand();
             final JSExpression rhs = expression.getROperand();
             final IElementType operationSign = expression.getOperationSign();
             assert rhs != null;
-            final String newExpression = lhs.getText() +
-                    getShortCircuitOperand(operationSign) + rhs.getText();
+            final String newExpression = lhs.getText() + getShortCircuitOperand(operationSign) + rhs.getText();
             replaceExpression(expression, newExpression);
         }
 
         private static String getShortCircuitOperand(IElementType tokenType) {
-            if (JSTokenTypes.AND.equals(tokenType)) {
-                return "&&";
-            } else {
-                return "||";
-            }
+            return JSTokenTypes.AND.equals(tokenType) ? "&&" : "||";
         }
-
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new NonShortCircuitBooleanVisitor();
     }
 
-    private static class NonShortCircuitBooleanVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(
-                @Nonnull JSBinaryExpression expression) {
+    private static class NonShortCircuitBooleanVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
             }
             final IElementType sign = expression.getOperationSign();
-            if (!JSTokenTypes.AND.equals(sign) &&
-                    !JSTokenTypes.OR.equals(sign)) {
+            if (!JSTokenTypes.AND.equals(sign) && !JSTokenTypes.OR.equals(sign)) {
                 return;
             }
             registerError(expression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
index db19d923..d074ac92 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
@@ -4,59 +4,54 @@
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSNewExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ObjectAllocationIgnoredJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "ObjectAllocationIgnored";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("result.of.object.allocation.ignored.display.name");
+        return InspectionJSLocalize.resultOfObjectAllocationIgnoredDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("result.of.object.allocation.ignored.error.string");
+        return InspectionJSLocalize.resultOfObjectAllocationIgnoredErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new ObjectAllocationIgnoredVisitor();
     }
 
     private static class ObjectAllocationIgnoredVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSExpressionStatement(
-                @Nonnull JSExpressionStatement statement) {
+        @Override
+        public void visitJSExpressionStatement(@Nonnull JSExpressionStatement statement) {
             super.visitJSExpressionStatement(statement);
             if (!(statement.getExpression()instanceof JSNewExpression)) {
                 return;
             }
-            final JSNewExpression newExpression =
-                    (JSNewExpression) statement.getExpression();
-            final JSExpression methodExpression =
-                    newExpression.getMethodExpression();
+            final JSNewExpression newExpression = (JSNewExpression) statement.getExpression();
+            final JSExpression methodExpression = newExpression.getMethodExpression();
             if (methodExpression == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index 80554a31..e3909748 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -4,47 +4,44 @@
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.psi.PsiElement;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class TextLabelInSwitchStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("text.label.in.switch.statement.display.name");
+        return InspectionJSLocalize.textLabelInSwitchStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("text.label.in.switch.statement.error.string");
+        return InspectionJSLocalize.textLabelInSwitchStatementErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new TextLabelInSwitchStatementVisitor();
     }
 
-    private static class TextLabelInSwitchStatementVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSSwitchStatement(
-                @Nonnull JSSwitchStatement statement) {
+    private static class TextLabelInSwitchStatementVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
             final JSCaseClause[] caseClauses = statement.getCaseClauses();
             for (JSCaseClause caseClause : caseClauses) {
@@ -59,8 +56,7 @@ private void checkForLabel(JSStatement statement) {
             if (!(statement instanceof JSLabeledStatement)) {
                 return;
             }
-            final JSLabeledStatement labeledStatement =
-                    (JSLabeledStatement) statement;
+            final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
             final PsiElement label = labeledStatement.getLabelIdentifier();
             registerError(label);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index b3bb4367..be08800c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -1,63 +1,59 @@
 package com.sixrr.inspectjs.confusing;
 
 import com.intellij.lang.javascript.psi.*;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.language.psi.PsiElement;
-import org.jetbrains.annotations.NonNls;
+import consulo.language.psi.util.PsiTreeUtil;
 import jakarta.annotation.Nonnull;
+import org.jetbrains.annotations.NonNls;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
 @ExtensionImpl
 public class MagicNumberJSInspection extends JavaScriptInspection {
-
-    @NonNls private static final String[] s_specialCaseLiteralArray =
-            new String[]{
-                    "0", "1", "2", "3", "4",
-                    "5", "6", "7", "8", "9",
-                    "10", "0L", "1L", "2L", "0l",
-                    "1l", "2l", "0.0", "1.0", "0.0F",
-                    "1.0F", "0.0f", "1.0f"
-            };
+    @NonNls
+    private static final String[] s_specialCaseLiteralArray = new String[]{
+      "0", "1", "2", "3", "4",
+      "5", "6", "7", "8", "9",
+      "10", "0L", "1L", "2L", "0l",
+      "1l", "2l", "0.0", "1.0", "0.0F",
+      "1.0F", "0.0f", "1.0f"
+    };
 
     /**
      * @noinspection StaticCollection
      */
-    private static final Set<String> s_specialCaseLiterals =
-            new HashSet<String>(23);
+    private static final Set<String> s_specialCaseLiterals = new HashSet<>(23);
 
     static {
-        for (String string : s_specialCaseLiteralArray) {
-            s_specialCaseLiterals.add(string);
-        }
+        Collections.addAll(s_specialCaseLiterals, s_specialCaseLiteralArray);
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("magic.number.display.name");
+        return InspectionJSLocalize.magicNumberDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message(
-                "magic.number.problem.descriptor");
+        return InspectionJSLocalize.magicNumberProblemDescriptor().get();
     }
 
     static boolean isSpecialCaseLiteral(String text) {
@@ -65,28 +61,17 @@ static boolean isSpecialCaseLiteral(String text) {
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new MagicNumberVisitor();
     }
 
     private static class MagicNumberVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSLiteralExpression(
-                @Nonnull JSSimpleLiteralExpression expression) {
+        @Override
+        public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression expression) {
             super.visitJSLiteralExpression(expression);
 
             final String text = expression.getText();
-            if (text == null) {
-                return;
-            }
-            if(!isNumeric(text))
-            {
-                return;
-            }
-            if (isSpecialCaseLiteral(text)) {
-                return;
-            }
-            if (isDeclaredConstant(expression)) {
+            if (text == null || !isNumeric(text) || isSpecialCaseLiteral(text) || isDeclaredConstant(expression)) {
                 return;
             }
             final PsiElement parent = expression.getParent();
@@ -96,25 +81,23 @@ private static class MagicNumberVisitor extends BaseInspectionVisitor {
                 registerError(expression);
             }
         }
-
     }
 
     private static boolean isNumeric(String text) {
-        if(text.length()==0)
+        if (text.isEmpty())
         {
             return false;
         }
         final char firstChar = text.charAt(0);
         return Character.isDigit(firstChar)|| firstChar == '.';
     }
+
     private static boolean isDeclaredConstant(JSLiteralExpression expression) {
-        final JSFunction containingFunction =
-                PsiTreeUtil.getParentOfType(expression, JSFunction.class);
+        final JSFunction containingFunction = PsiTreeUtil.getParentOfType(expression, JSFunction.class);
         if (containingFunction != null) {
             return false;
         }
-        final JSVarStatement varStatement =
-                PsiTreeUtil.getParentOfType(expression, JSVarStatement.class);
+        final JSVarStatement varStatement = PsiTreeUtil.getParentOfType(expression, JSVarStatement.class);
         if (varStatement == null) {
             return false;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index a3dd49c8..bbf64a2f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -4,7 +4,11 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
 import consulo.annotation.access.RequiredReadAction;
@@ -14,7 +18,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -23,65 +26,59 @@ public class NegatedConditionalExpressionJSInspection extends JavaScriptInspecti
     private final NegatedConditionalFix fix = new NegatedConditionalFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("negated.conditional.expression.display.name");
+        return InspectionJSLocalize.negatedConditionalExpressionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("negated.conditional.expression.error.string");
+        return InspectionJSLocalize.negatedConditionalExpressionErrorString().get();
     }
 
     @Override
-	protected InspectionJSFix buildFix(PsiElement location, Object state) {
+    protected InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class NegatedConditionalFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("invert.condition.fix");
+            return InspectionJSLocalize.invertConditionFix().get();
         }
 
         @Override
-		public void doFix(Project project,
-                          ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
-            final JSConditionalExpression exp =
-                    (JSConditionalExpression) descriptor.getPsiElement();
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final JSConditionalExpression exp = (JSConditionalExpression) descriptor.getPsiElement();
             assert exp != null;
-            final JSExpression elseBranch = (JSExpression) exp.getElse();
+            final JSExpression elseBranch = exp.getElse();
             final JSExpression thenBranch = exp.getThen();
             final JSExpression condition = exp.getCondition();
-            final String negatedCondition =
-                    BoolUtils.getNegatedExpressionText(condition);
+            final String negatedCondition = BoolUtils.getNegatedExpressionText(condition);
             assert elseBranch != null;
             assert thenBranch != null;
-            final String newStatement =
-                    negatedCondition + '?' + elseBranch.getText() + ':' +
-                            thenBranch.getText();
+            final String newStatement = negatedCondition + '?' + elseBranch.getText() + ':' + thenBranch.getText();
             replaceExpression(exp, newStatement);
         }
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSConditionalExpression(JSConditionalExpression exp) {
+        @Override
+        public void visitJSConditionalExpression(JSConditionalExpression exp) {
             super.visitJSConditionalExpression(exp);
             JSExpression condition = exp.getCondition();
             condition = ParenthesesUtils.stripExpression(condition);
@@ -95,8 +92,7 @@ private boolean isNotEquals(JSExpression expression) {
             if (!(expression instanceof JSBinaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryExpression =
-                    (JSBinaryExpression) expression;
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
             final IElementType sign = binaryExpression.getOperationSign();
             return JSTokenTypes.NE.equals(sign) ||JSTokenTypes.NEQEQ.equals(sign);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index 077d2a4c..be015db5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -5,7 +5,11 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
 import consulo.annotation.access.RequiredReadAction;
@@ -16,32 +20,31 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class NegatedIfStatementJSInspection extends JavaScriptInspection {
     private final NegatedIfElseFix fix = new NegatedIfElseFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("negated.if.statement.display.name");
+        return InspectionJSLocalize.negatedIfStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("negated.ref.statement.error.string");
+        return InspectionJSLocalize.negatedRefStatementErrorString().get();
     }
 
     @Override
@@ -50,29 +53,26 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
-	protected InspectionJSFix buildFix(PsiElement location, Object state) {
+    protected InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class NegatedIfElseFix extends InspectionJSFix {
-
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("invert.if.condition.fix");
+            return InspectionJSLocalize.invertIfConditionFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement ifToken = descriptor.getPsiElement();
             final JSIfStatement ifStatement = (JSIfStatement) ifToken.getParent();
             assert ifStatement != null;
             final JSStatement elseBranch = ifStatement.getElse();
             final JSStatement thenBranch = ifStatement.getThen();
             final JSExpression condition = ifStatement.getCondition();
-            final String negatedCondition =
-                    BoolUtils.getNegatedExpressionText(condition);
+            final String negatedCondition = BoolUtils.getNegatedExpressionText(condition);
             String elseText = elseBranch.getText();
             final PsiElement lastChild = elseBranch.getLastChild();
             if (lastChild instanceof PsiComment) {
@@ -82,19 +82,17 @@ public void doFix(Project project, ProblemDescriptor descriptor)
                     elseText += '\n';
                 }
             }
-            @NonNls final String newStatement = "if(" + negatedCondition + ')' +
-                    elseText + " else " + thenBranch.getText();
+            @NonNls final String newStatement = "if(" + negatedCondition + ')' + elseText + " else " + thenBranch.getText();
             replaceStatement(ifStatement, newStatement);
         }
     }
-    private static class Visitor extends BaseInspectionVisitor {
-
 
-        @Override public void visitJSIfStatement(JSIfStatement statement) {
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSIfStatement(JSIfStatement statement) {
             super.visitJSIfStatement(statement);
             final PsiElement parent = statement.getParent();
-            if (parent instanceof JSIfStatement) {
-                final JSIfStatement parentStatement = (JSIfStatement) parent;
+            if (parent instanceof JSIfStatement parentStatement) {
                 final JSStatement elseBranch = parentStatement.getElse();
                 if (statement.equals(elseBranch)) {
                     return;
@@ -104,7 +102,6 @@ private static class Visitor extends BaseInspectionVisitor {
                 return;
             }
 
-
             JSExpression condition = statement.getCondition();
             condition = ParenthesesUtils.stripExpression(condition);
             if (condition == null || (!BoolUtils.isNegation(condition) && !isNotEquals(condition))) {
@@ -117,8 +114,7 @@ private boolean isNotEquals(JSExpression expression) {
             if (!(expression instanceof JSBinaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryExpression =
-                    (JSBinaryExpression) expression;
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
             final IElementType sign = binaryExpression.getOperationSign();
             return JSTokenTypes.NE.equals(sign) || JSTokenTypes.NEQEQ.equals(sign);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
index 86370e10..ac40b022 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
@@ -2,9 +2,9 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -13,36 +13,36 @@
 
 @ExtensionImpl
 public class NestedConditionalExpressionJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("nested.conditional.expression.display.name");
+        return InspectionJSLocalize.nestedConditionalExpressionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("nested.conditional.expression.error.string");
+        return InspectionJSLocalize.nestedConditionalExpressionErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSConditionalExpression(JSConditionalExpression jsConditionalExpression) {
+        @Override
+        public void visitJSConditionalExpression(JSConditionalExpression jsConditionalExpression) {
             super.visitJSConditionalExpression(jsConditionalExpression);
             final JSConditionalExpression containingConditionalExpression =
-                    PsiTreeUtil.getParentOfType(jsConditionalExpression, JSConditionalExpression.class, true);
+                PsiTreeUtil.getParentOfType(jsConditionalExpression, JSConditionalExpression.class, true);
             if (containingConditionalExpression == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index cac0c708..8f6fbf60 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -3,16 +3,15 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import jakarta.annotation.Nonnull;
-
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
@@ -22,7 +21,7 @@ public class NestedFunctionJSInspection extends JavaScriptInspection
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("nested.function.display.name");
+		return InspectionJSLocalize.nestedFunctionDisplayName().get();
 	}
 
 	@Override
@@ -38,11 +37,11 @@ public String getGroupDisplayName()
 	protected String buildErrorString(Object state, Object... args)
 	{
 		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-		if(functionHasIdentifier(function))
+		if (functionHasIdentifier(function))
 		{
-			return InspectionJSBundle.message("nested.function.error.string");
+			return InspectionJSLocalize.nestedFunctionErrorString().get();
 		}
-		return InspectionJSBundle.message("nested.anonymous.function.error.string");
+		return InspectionJSLocalize.nestedAnonymousFunctionErrorString().get();
 	}
 
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index deae7244..d3098271 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -1,55 +1,53 @@
 package com.sixrr.inspectjs.confusing;
 
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 import jakarta.annotation.Nullable;
+import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class OctalIntegerJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("octal.integer.display.name");
+        return InspectionJSLocalize.octalIntegerDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("octal.integer.error.string");
+        return InspectionJSLocalize.octalIntegerErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSLiteralExpression(JSSimpleLiteralExpression jsLiteralExpression) {
+        @Override
+        public void visitJSLiteralExpression(JSSimpleLiteralExpression jsLiteralExpression) {
             super.visitJSLiteralExpression(jsLiteralExpression);
             @NonNls final String text = jsLiteralExpression.getText();
-            if(text.startsWith("0")&&  !"0".equals(text) &&
-                    !text.startsWith("0x") &&!text.startsWith("0X") &&
-                    !text.contains(".") &&!text.contains("e")&&!text.contains("E"))
+            if (text.startsWith("0") && !"0".equals(text)
+                && !text.startsWith("0x") && !text.startsWith("0X")
+                && !text.contains(".") && !text.contains("e") && !text.contains("E"))
             {
                 registerError(jsLiteralExpression);
             }
         }
-
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
index 01fa2167..2e258e51 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
@@ -3,9 +3,9 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
@@ -23,7 +23,7 @@ public class OverlyComplexArithmeticExpressionJSInspection extends JavaScriptIns
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("overly.complex.arithmetic.expression.display.name");
+		return InspectionJSLocalize.overlyComplexArithmeticExpressionDisplayName().get();
 	}
 
 	@Override
@@ -44,7 +44,7 @@ public InspectionToolState<?> createStateProvider()
 	@Override
 	protected String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message("overly.complex.arithmetic.expression.error.string");
+		return InspectionJSLocalize.overlyComplexArithmeticExpressionErrorString().get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
index a5f4510b..076f060d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
@@ -6,15 +6,14 @@
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -24,7 +23,7 @@ public class OverlyComplexBooleanExpressionJSInspection extends JavaScriptInspec
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("overly.complex.boolean.expression.display.name");
+		return InspectionJSLocalize.overlyComplexBooleanExpressionDisplayName().get();
 	}
 
 	@Override
@@ -51,7 +50,7 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
 	@Override
 	protected String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message("overly.complex.boolean.expression.error.string");
+		return InspectionJSLocalize.overlyComplexBooleanExpressionErrorString().get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
index ac3851b9..89ea75c6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
@@ -1,55 +1,55 @@
 package com.sixrr.inspectjs.confusing;
 
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.language.psi.PsiElement;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-import com.sixrr.inspectjs.*;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
 import jakarta.annotation.Nonnull;
+import org.jetbrains.annotations.NonNls;
 
 import java.util.HashSet;
 import java.util.Set;
 
 @ExtensionImpl
-public class PointlessArithmeticExpressionJSInspection
-        extends JavaScriptInspection {
-
-
+public class PointlessArithmeticExpressionJSInspection extends JavaScriptInspection {
     private final PointlessArithmeticFix fix = new PointlessArithmeticFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("pointless.arithmetic.expression.display.name");
+        return InspectionJSLocalize.pointlessArithmeticExpressionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("pointless.arithmetic.error.message", calculateReplacementExpression((JSExpression)args[0]));
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.pointlessArithmeticErrorMessage(calculateReplacementExpression((JSExpression)args[0])).get();
     }
 
-    private String calculateReplacementExpression(
-            JSExpression expression) {
+    private String calculateReplacementExpression(JSExpression expression) {
         final JSBinaryExpression exp = (JSBinaryExpression) expression;
         final IElementType sign = exp.getOperationSign();
         final JSExpression lhs = exp.getLOperand();
@@ -79,36 +79,32 @@ private String calculateReplacementExpression(
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new PointlessArithmeticVisitor();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private class PointlessArithmeticFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("simplify.fix");
+            return InspectionJSLocalize.simplifyFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
-            final JSExpression expression = (JSExpression) descriptor
-                    .getPsiElement();
-            final String newExpression =
-                    calculateReplacementExpression(expression);
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final JSExpression expression = (JSExpression) descriptor.getPsiElement();
+            final String newExpression = calculateReplacementExpression(expression);
             replaceExpression(expression, newExpression);
         }
     }
 
     private class PointlessArithmeticVisitor extends BaseInspectionVisitor {
-        private final Set<IElementType> arithmeticTokens =
-                new HashSet<IElementType>(4);
+        private final Set<IElementType> arithmeticTokens = new HashSet<>(4);
 
         {
             arithmeticTokens.add(JSTokenTypes.PLUS);
@@ -117,8 +113,8 @@ private class PointlessArithmeticVisitor extends BaseInspectionVisitor {
             arithmeticTokens.add(JSTokenTypes.DIV);
         }
 
-        @Override public void visitJSBinaryExpression(
-                @Nonnull JSBinaryExpression expression) {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
@@ -158,13 +154,11 @@ private boolean subtractionExpressionIsPointless(JSExpression rhs) {
         return isZero(rhs);
     }
 
-    private boolean additionExpressionIsPointless(JSExpression lhs,
-                                                  JSExpression rhs) {
+    private boolean additionExpressionIsPointless(JSExpression lhs, JSExpression rhs) {
         return (isZero(lhs) && !isString(rhs)) || (isZero(rhs) && !isString(lhs));
     }
 
-    private boolean multiplyExpressionIsPointless(JSExpression lhs,
-                                                  JSExpression rhs) {
+    private boolean multiplyExpressionIsPointless(JSExpression lhs, JSExpression rhs) {
         return isZero(lhs) || isZero(rhs) || isOne(lhs) || isOne(rhs);
     }
 
@@ -185,10 +179,10 @@ private static boolean isZero(JSExpression expression) {
                 text.equals("0l");
     }
 
-  private static boolean isString(JSExpression expression) {
+    private static boolean isString(JSExpression expression) {
         if (expression instanceof JSLiteralExpression) {
-          final String s = expression.getText();
-          return s.startsWith("'") || s.startsWith("\"");
+            final String s = expression.getText();
+            return s.startsWith("'") || s.startsWith("\"");
         }
         return false;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
index a240125f..a93405a6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
@@ -1,63 +1,63 @@
 package com.sixrr.inspectjs.confusing;
 
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
-import consulo.language.util.IncorrectOperationException;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ComparisonUtils;
 import com.sixrr.inspectjs.utils.ParenthesesUtils;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.ast.IElementType;
+import consulo.language.editor.inspection.ProblemDescriptor;
+import consulo.language.psi.PsiElement;
+import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import org.jetbrains.annotations.NonNls;
 
 import java.util.HashSet;
 import java.util.Set;
 
 @ExtensionImpl
 public class PointlessBooleanExpressionJSInspection extends JavaScriptInspection {
-
-    private final BooleanLiteralComparisonFix fix =
-            new BooleanLiteralComparisonFix();
+    private final BooleanLiteralComparisonFix fix = new BooleanLiteralComparisonFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("pointless.boolean.expression.display.name");
+        return InspectionJSLocalize.pointlessBooleanExpressionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new PointlessBooleanExpressionVisitor();
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        if ( args[0]instanceof JSBinaryExpression) {
-            return InspectionJSBundle.message("pointless.boolean.error.string", calculateSimplifiedBinaryExpression((JSBinaryExpression) args[0]));
-        } else {
-            return InspectionJSBundle.message("pointless.boolean.error.string", calculateSimplifiedPrefixExpression((JSPrefixExpression) args[0]));
-        }
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return args[0] instanceof JSBinaryExpression binaryExpression
+            ? InspectionJSLocalize.pointlessBooleanErrorString(calculateSimplifiedBinaryExpression(binaryExpression)).get()
+            : InspectionJSLocalize.pointlessBooleanErrorString(calculateSimplifiedPrefixExpression((JSPrefixExpression)args[0])).get();
     }
 
     @Nullable
@@ -71,22 +71,12 @@ private String calculateSimplifiedBinaryExpression(JSBinaryExpression expression
         }
         final String rhsText = rhs.getText();
         final String lhsText = lhs.getText();
-        if (JSTokenTypes.ANDAND.equals(sign) ||
-                JSTokenTypes.AND.equals(sign)) {
-            if (isTrue(lhs)) {
-                return rhsText;
-            } else {
-                return lhsText;
-            }
-        } else if (JSTokenTypes.OROR.equals(sign) ||
-                JSTokenTypes.OR.equals(sign)) {
-            if (isFalse(lhs)) {
-                return rhsText;
-            } else {
-                return lhsText;
-            }
-        } else if (JSTokenTypes.XOR.equals(sign) ||
-                JSTokenTypes.NE.equals(sign) /*|| // IMPORTANT: simplifiying !== changes code semantic
+        if (JSTokenTypes.ANDAND.equals(sign) || JSTokenTypes.AND.equals(sign)) {
+            return isTrue(lhs) ? rhsText : lhsText;
+        } else if (JSTokenTypes.OROR.equals(sign) || JSTokenTypes.OR.equals(sign)) {
+            return isFalse(lhs) ? rhsText : lhsText;
+        } else if (JSTokenTypes.XOR.equals(sign) || JSTokenTypes.NE.equals(sign)
+            /*|| // IMPORTANT: simplifiying !== changes code semantic
                 sign.equals(JSTokenTypes.NEQEQ)*/) {
             if (isFalse(lhs)) {
                 return rhsText;
@@ -115,72 +105,54 @@ private String calculateSimplifiedBinaryExpression(JSBinaryExpression expression
 
     private static String createStringForNegatedExpression(JSExpression exp) {
         if (ComparisonUtils.isComparison(exp)) {
-            final JSBinaryExpression binaryExpression =
-                    (JSBinaryExpression) exp;
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression) exp;
             final IElementType sign = binaryExpression.getOperationSign();
-            final String negatedComparison =
-                    ComparisonUtils.getNegatedComparison(sign);
+            final String negatedComparison = ComparisonUtils.getNegatedComparison(sign);
             final JSExpression lhs = binaryExpression.getLOperand();
             final JSExpression rhs = binaryExpression.getROperand();
             assert rhs != null;
             return lhs.getText() + negatedComparison + rhs.getText();
         } else {
-            if (ParenthesesUtils.getPrecendence(exp) >
-                    ParenthesesUtils.PREFIX_PRECEDENCE) {
-                return "!(" + exp.getText() + ')';
-            } else {
-                return '!' + exp.getText();
-            }
+            return ParenthesesUtils.getPrecendence(exp) > ParenthesesUtils.PREFIX_PRECEDENCE
+                ? "!(" + exp.getText() + ')'
+                : '!' + exp.getText();
         }
     }
 
     @NonNls
     private static String calculateSimplifiedPrefixExpression(JSPrefixExpression expression) {
         final JSExpression operand = expression.getExpression();
-        if (isTrue(operand)) {
-            return "false";
-        } else {
-            return "true";
-        }
+        return isTrue(operand) ? "false" : "true";
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
-    private class BooleanLiteralComparisonFix
-            extends InspectionJSFix {
+    private class BooleanLiteralComparisonFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("simplify.fix");
+            return InspectionJSLocalize.simplifyFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement element = descriptor.getPsiElement();
-            if (element instanceof JSBinaryExpression) {
-                final JSBinaryExpression expression =
-                        (JSBinaryExpression) element;
-                final String replacementString =
-                        calculateSimplifiedBinaryExpression(expression);
+            if (element instanceof JSBinaryExpression expression) {
+                final String replacementString = calculateSimplifiedBinaryExpression(expression);
                 replaceExpression(expression, replacementString);
             } else {
-                final JSPrefixExpression expression =
-                        (JSPrefixExpression) element;
-                final String replacementString =
-                        calculateSimplifiedPrefixExpression(expression);
+                final JSPrefixExpression expression = (JSPrefixExpression) element;
+                final String replacementString = calculateSimplifiedPrefixExpression(expression);
                 replaceExpression(expression, replacementString);
             }
         }
     }
 
-    private class PointlessBooleanExpressionVisitor
-            extends BaseInspectionVisitor {
-        private final Set<IElementType> booleanTokens =
-                new HashSet<IElementType>(10);
+    private class PointlessBooleanExpressionVisitor extends BaseInspectionVisitor {
+        private final Set<IElementType> booleanTokens = new HashSet<>(10);
 
         {
             booleanTokens.add(JSTokenTypes.ANDAND);
@@ -194,7 +166,8 @@ private class PointlessBooleanExpressionVisitor
             //booleanTokens.add(JSTokenTypes.NEQEQ); // !== has strict semantic so do not report it
         }
 
-        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
@@ -228,7 +201,8 @@ private class PointlessBooleanExpressionVisitor
             registerError(expression);
         }
 
-        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        @Override
+        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             final IElementType sign = expression.getOperationSign();
             if (sign == null) {
@@ -242,23 +216,19 @@ private class PointlessBooleanExpressionVisitor
         }
     }
 
-    private static boolean equalityExpressionIsPointless(JSExpression lhs,
-                                                  JSExpression rhs) {
+    private static boolean equalityExpressionIsPointless(JSExpression lhs, JSExpression rhs) {
         return isTrue(lhs) || isTrue(rhs) || isFalse(lhs) || isFalse(rhs);
     }
 
-    private static boolean andExpressionIsPointless(JSExpression lhs,
-                                             JSExpression rhs) {
+    private static boolean andExpressionIsPointless(JSExpression lhs, JSExpression rhs) {
         return isTrue(lhs) || isTrue(rhs);
     }
 
-    private static boolean orExpressionIsPointless(JSExpression lhs,
-                                            JSExpression rhs) {
+    private static boolean orExpressionIsPointless(JSExpression lhs, JSExpression rhs) {
         return isFalse(lhs) /*|| isFalse(rhs) // since variable can be undefined*/;
     }
 
-    private static boolean xorExpressionIsPointless(JSExpression lhs,
-                                             JSExpression rhs) {
+    private static boolean xorExpressionIsPointless(JSExpression lhs, JSExpression rhs) {
         return isTrue(lhs) || isTrue(rhs) || isFalse(lhs) || isFalse(rhs);
     }
 
@@ -267,10 +237,7 @@ private static boolean notExpressionIsPointless(JSExpression arg) {
     }
 
     private static boolean isTrue(JSExpression expression) {
-        if (expression == null) {
-            return false;
-        }
-        if (!(expression instanceof JSLiteralExpression)) {
+        if (expression == null || !(expression instanceof JSLiteralExpression)) {
             return false;
         }
         @NonNls final String text = expression.getText();
@@ -278,10 +245,7 @@ private static boolean isTrue(JSExpression expression) {
     }
 
     private static boolean isFalse(JSExpression expression) {
-        if (expression == null) {
-            return false;
-        }
-        if (!(expression instanceof JSLiteralExpression)) {
+        if (expression == null || !(expression instanceof JSLiteralExpression)) {
             return false;
         }
         @NonNls final String text = expression.getText();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
index 40f0f30a..619ccaad 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
@@ -2,9 +2,9 @@
 
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import jakarta.annotation.Nonnull;
@@ -13,34 +13,33 @@
 
 @ExtensionImpl
 public class LabeledStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("labeled.statement.display.name");
+        return InspectionJSLocalize.labeledStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("statement.label.error.string");
+        return InspectionJSLocalize.statementLabelErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSLabeledStatement(@Nonnull JSLabeledStatement statement) {
+        @Override
+        public void visitJSLabeledStatement(@Nonnull JSLabeledStatement statement) {
             super.visitJSLabeledStatement(statement);
             @NonNls final String label = statement.getLabel();
             if("javascript".equals(label))
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
index 83ffc86c..93f5bd3c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
@@ -2,50 +2,47 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class LoopStatementThatDoesntLoopJSInspection extends JavaScriptInspection {
-
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("loop.statement.that.doesn.t.loop.display.name");
+        return InspectionJSLocalize.loopStatementThatDoesnTLoopDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("loop.statement.that.doesnt.loop.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.loopStatementThatDoesntLoopErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
+        @Override
+        public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
             final JSStatement body = statement.getBody();
             if (body == null) {
@@ -60,7 +57,8 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+        @Override
+        public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
             super.visitJSForInStatement(statement);
             final JSStatement body = statement.getBody();
             if (body == null) {
@@ -75,16 +73,13 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+        @Override
+        public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
             final JSStatement body = statement.getBody();
-            if (body == null) {
-                return;
-            }
-            if (ControlFlowUtils.statementMayCompleteNormally(body)) {
-                return;
-            }
-            if (ControlFlowUtils.statementIsContinueTarget(statement)) {
+            if (body == null
+                || ControlFlowUtils.statementMayCompleteNormally(body)
+                || ControlFlowUtils.statementIsContinueTarget(statement)) {
                 return;
             }
             registerStatementError(statement);
@@ -93,13 +88,9 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
             final JSStatement body = statement.getBody();
-            if (body == null) {
-                return;
-            }
-            if (ControlFlowUtils.statementMayCompleteNormally(body)) {
-                return;
-            }
-            if (ControlFlowUtils.statementIsContinueTarget(statement)) {
+            if (body == null
+                || ControlFlowUtils.statementMayCompleteNormally(body)
+                || ControlFlowUtils.statementIsContinueTarget(statement)) {
                 return;
             }
             registerStatementError(statement);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
index d09fdc66..3ecc7cf0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
@@ -2,9 +2,9 @@
 
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -13,41 +13,40 @@
 
 @ExtensionImpl
 public class NestedSwitchStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("nested.switch.statement.display.name");
+        return InspectionJSLocalize.nestedSwitchStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("nested.switch.statement.error.string");
+        return InspectionJSLocalize.nestedSwitchStatementErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSSwitchStatement(JSSwitchStatement jsSwitchStatement) {
+        @Override
+        public void visitJSSwitchStatement(JSSwitchStatement jsSwitchStatement) {
             super.visitJSSwitchStatement(jsSwitchStatement);
             final JSSwitchStatement containingSwitchStatement =
-                    PsiTreeUtil.getParentOfType(jsSwitchStatement, JSSwitchStatement.class, true);
-            if (containingSwitchStatement ==null) {
+                PsiTreeUtil.getParentOfType(jsSwitchStatement, JSSwitchStatement.class, true);
+            if (containingSwitchStatement == null) {
                 return;
             }
             registerStatementError(jsSwitchStatement);
         }
-
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
index 64882d6f..d789ea2b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
@@ -3,44 +3,43 @@
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class SwitchStatementWithNoDefaultBranchJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("switch.statement.with.no.default.branch.display.name");
+        return InspectionJSLocalize.switchStatementWithNoDefaultBranchDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("switch.statement.with.no.default.branch.error.string");
+        return InspectionJSLocalize.switchStatementWithNoDefaultBranchErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSSwitchStatement(JSSwitchStatement jsSwitchStatement) {
+        @Override
+        public void visitJSSwitchStatement(JSSwitchStatement jsSwitchStatement) {
             super.visitJSSwitchStatement(jsSwitchStatement);
             if (hasDefaultBranch(jsSwitchStatement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
index 980ad6e6..48432219 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
@@ -2,38 +2,34 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class TailRecursionJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message(
-                "tail.recursion.display.name");
+        return InspectionJSLocalize.tailRecursionDisplayName().get();
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message(
-                "tail.recursion.problem.descriptor");
+        return InspectionJSLocalize.tailRecursionProblemDescriptor().get();
     }
 
     /*
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
index 121565a7..1a70959a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
@@ -3,7 +3,11 @@
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -15,43 +19,42 @@
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
-public class TrivialConditionalJSInspection
-        extends JavaScriptInspection {
+public class TrivialConditionalJSInspection extends JavaScriptInspection {
     private final TrivialConditionalFix fix = new TrivialConditionalFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "RedundantConditionalExpressionJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("redundant.conditional.expression.display.name");
+        return InspectionJSLocalize.redundantConditionalExpressionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new UnnecessaryConditionalExpressionVisitor();
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
+    @Override
+    public String buildErrorString(Object state, Object... args) {
         final JSConditionalExpression exp = (JSConditionalExpression) args[0];
-        return InspectionJSBundle.message("trivial.conditional.error.string", exp.getText(), calculateReplacementExpression(exp));
+        return InspectionJSLocalize.trivialConditionalErrorString(exp.getText(), calculateReplacementExpression(exp)).get();
     }
 
     private static String calculateReplacementExpression(JSConditionalExpression exp) {
@@ -67,31 +70,28 @@ private static String calculateReplacementExpression(JSConditionalExpression exp
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
-    private static class
-            TrivialConditionalFix extends InspectionJSFix {
+    private static class TrivialConditionalFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("simplify.fix");
+            return InspectionJSLocalize.simplifyFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final JSConditionalExpression expression = (JSConditionalExpression) descriptor.getPsiElement();
             final String newExpression = calculateReplacementExpression(expression);
             replaceExpression(expression, newExpression);
         }
     }
 
-    private static class UnnecessaryConditionalExpressionVisitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSConditionalExpression(JSConditionalExpression exp) {
+    private static class UnnecessaryConditionalExpressionVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSConditionalExpression(JSConditionalExpression exp) {
             super.visitJSConditionalExpression(exp);
             final JSExpression thenExpression = exp.getThen();
             if (thenExpression == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
index 9664939f..f552b298 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
@@ -2,7 +2,11 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.BoolUtils;
 import com.sixrr.inspectjs.utils.ConditionalUtils;
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
@@ -15,10 +19,8 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
-
+import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class TrivialIfJSInspection extends JavaScriptInspection {
@@ -31,51 +33,49 @@ public String getID() {
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("redundant.if.statement.display.name");
+        return InspectionJSLocalize.redundantIfStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new TrivialIfVisitor();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("trivial.if.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.trivialIfErrorString().get();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class TrivialIfFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("simplify.fix");
+            return InspectionJSLocalize.simplifyFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement ifKeywordElement = descriptor.getPsiElement();
-            final JSIfStatement statement =
-                    (JSIfStatement) ifKeywordElement.getParent();
+            final JSIfStatement statement = (JSIfStatement) ifKeywordElement.getParent();
             if (isSimplifiableAssignment(statement)) {
                 replaceSimplifiableAssignment(statement);
             } else if (isSimplifiableReturn(statement)) {
@@ -95,107 +95,74 @@ public void doFix(Project project, ProblemDescriptor descriptor)
             }
         }
 
-        private void replaceSimplifiableImplicitReturn(JSIfStatement statement)
-                throws IncorrectOperationException {
+        private void replaceSimplifiableImplicitReturn(JSIfStatement statement) throws IncorrectOperationException {
             final JSExpression condition = statement.getCondition();
             final String conditionText = condition.getText();
-            final PsiElement nextStatement =
-                    PsiTreeUtil.skipSiblingsForward(statement,
-                            new Class[]{
-                                    PsiWhiteSpace.class});
+            final PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(statement, new Class[]{PsiWhiteSpace.class});
             @NonNls final String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
             assert nextStatement != null;
             deleteElement(nextStatement);
         }
 
-        private void repaceSimplifiableReturn(JSIfStatement statement)
-                throws IncorrectOperationException {
+        private void repaceSimplifiableReturn(JSIfStatement statement) throws IncorrectOperationException {
             final JSExpression condition = statement.getCondition();
             final String conditionText = condition.getText();
             @NonNls final String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
         }
 
-        private void replaceSimplifiableAssignment(JSIfStatement statement)
-                throws IncorrectOperationException {
+        private void replaceSimplifiableAssignment(JSIfStatement statement) throws IncorrectOperationException {
             final JSExpression condition = statement.getCondition();
             final String conditionText = condition.getText();
             final JSStatement thenBranch = statement.getThen();
-            final JSExpressionStatement assignmentStatement =
-                    (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
-            final JSAssignmentExpression assignmentExpression =
-                    (JSAssignmentExpression) assignmentStatement.getExpression();
-            final IElementType operator =
-                    assignmentExpression.getOperationSign();
+            final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
+            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+            final IElementType operator = assignmentExpression.getOperationSign();
             final String operatorText = getTextForOperator(operator);
             final JSExpression lhs = assignmentExpression.getLOperand();
             final String lhsText = lhs.getText();
-            replaceStatement(statement,
-                    lhsText + operatorText + conditionText + ';');
+            replaceStatement(statement, lhsText + operatorText + conditionText + ';');
         }
 
-        private void replaceSimplifiableImplicitAssignment(JSIfStatement statement)
-                throws IncorrectOperationException {
-            final PsiElement prevStatement =
-                    PsiTreeUtil.skipSiblingsBackward(statement,
-                            new Class[]{
-                                    PsiWhiteSpace.class});
+        private void replaceSimplifiableImplicitAssignment(JSIfStatement statement) throws IncorrectOperationException {
+            final PsiElement prevStatement = PsiTreeUtil.skipSiblingsBackward(statement, new Class[]{PsiWhiteSpace.class});
             if (prevStatement == null) {
                 return;
             }
             final JSExpression condition = statement.getCondition();
             final String conditionText = condition.getText();
             final JSStatement thenBranch = statement.getThen();
-            final JSExpressionStatement assignmentStatement =
-                    (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
-            final JSAssignmentExpression assignmentExpression =
-                    (JSAssignmentExpression) assignmentStatement.getExpression();
-            final IElementType operator =
-                    assignmentExpression.getOperationSign();
+            final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
+            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+            final IElementType operator = assignmentExpression.getOperationSign();
             final JSExpression lhs = assignmentExpression.getLOperand();
             final String lhsText = lhs.getText();
-            replaceStatement(statement,
-                    lhsText + operator + conditionText + ';');
+            replaceStatement(statement, lhsText + operator + conditionText + ';');
             deleteElement(prevStatement);
         }
 
-        private void replaceSimplifiableImplicitAssignmentNegated(JSIfStatement statement)
-                throws IncorrectOperationException {
-            final PsiElement prevStatement =
-                    PsiTreeUtil.skipSiblingsBackward(statement,
-                            new Class[]{
-                                    PsiWhiteSpace.class});
-
+        private void replaceSimplifiableImplicitAssignmentNegated(JSIfStatement statement) throws IncorrectOperationException {
+            final PsiElement prevStatement = PsiTreeUtil.skipSiblingsBackward(statement, new Class[]{PsiWhiteSpace.class});
             final JSExpression condition = statement.getCondition();
-            final String conditionText =
-                    BoolUtils.getNegatedExpressionText(condition);
+            final String conditionText = BoolUtils.getNegatedExpressionText(condition);
             final JSStatement thenBranch = statement.getThen();
-            final JSExpressionStatement assignmentStatement =
-                    (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
-            final JSAssignmentExpression assignmentExpression =
-                    (JSAssignmentExpression) assignmentStatement.getExpression();
-            final IElementType operator =
-                    assignmentExpression.getOperationSign();
+            final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
+            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+            final IElementType operator = assignmentExpression.getOperationSign();
             final String operatorText = getTextForOperator(operator);
             final JSExpression lhs = assignmentExpression.getLOperand();
             final String lhsText = lhs.getText();
-            replaceStatement(statement,
-                    lhsText + operatorText + conditionText + ';');
+            replaceStatement(statement, lhsText + operatorText + conditionText + ';');
             assert prevStatement != null;
             deleteElement(prevStatement);
         }
 
-        private void replaceSimplifiableImplicitReturnNegated(JSIfStatement statement)
-                throws IncorrectOperationException {
+        private void replaceSimplifiableImplicitReturnNegated(JSIfStatement statement) throws IncorrectOperationException {
             final JSExpression condition = statement.getCondition();
 
-            final String conditionText =
-                    BoolUtils.getNegatedExpressionText(condition);
-            final PsiElement nextStatement =
-                    PsiTreeUtil.skipSiblingsForward(statement,
-                            new Class[]{
-                                    PsiWhiteSpace.class});
+            final String conditionText = BoolUtils.getNegatedExpressionText(condition);
+            final PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(statement, new Class[]{PsiWhiteSpace.class});
             if (nextStatement == null) {
                 return;
             }
@@ -204,39 +171,31 @@ private void replaceSimplifiableImplicitReturnNegated(JSIfStatement statement)
             deleteElement(nextStatement);
         }
 
-        private void repaceSimplifiableReturnNegated(JSIfStatement statement)
-                throws IncorrectOperationException {
+        private void repaceSimplifiableReturnNegated(JSIfStatement statement) throws IncorrectOperationException {
             final JSExpression condition = statement.getCondition();
-            final String conditionText =
-                    BoolUtils.getNegatedExpressionText(condition);
+            final String conditionText = BoolUtils.getNegatedExpressionText(condition);
             @NonNls final String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
         }
 
-        private void replaceSimplifiableAssignmentNegated(JSIfStatement statement)
-                throws IncorrectOperationException {
+        private void replaceSimplifiableAssignmentNegated(JSIfStatement statement) throws IncorrectOperationException {
             final JSExpression condition = statement.getCondition();
-            final String conditionText =
-                    BoolUtils.getNegatedExpressionText(condition);
+            final String conditionText = BoolUtils.getNegatedExpressionText(condition);
             final JSStatement thenBranch = statement.getThen();
-            final JSExpressionStatement assignmentStatement =
-                    (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
-            final JSAssignmentExpression assignmentExpression =
-                    (JSAssignmentExpression) assignmentStatement.getExpression();
-            final IElementType operator =
-                    assignmentExpression.getOperationSign();
+            final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
+            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+            final IElementType operator = assignmentExpression.getOperationSign();
             final String operatorText = getTextForOperator(operator);
             final JSExpression lhs = assignmentExpression.getLOperand();
             final String lhsText = lhs.getText();
-            replaceStatement(statement,
-                    lhsText + operatorText + conditionText + ';');
+            replaceStatement(statement, lhsText + operatorText + conditionText + ';');
         }
 
     }
 
     private static class TrivialIfVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSIfStatement(@Nonnull JSIfStatement ifStatement) {
+        @Override
+        public void visitJSIfStatement(@Nonnull JSIfStatement ifStatement) {
             super.visitJSIfStatement(ifStatement);
             final JSExpression condition = ifStatement.getCondition();
             if (condition == null) {
@@ -287,17 +246,13 @@ public static boolean isSimplifiableImplicitReturn(JSIfStatement ifStatement) {
         }
         JSStatement thenBranch = ifStatement.getThen();
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
-        final PsiElement nextStatement =
-                PsiTreeUtil.skipSiblingsForward(ifStatement,
-                        new Class[]{
-                                PsiWhiteSpace.class});
+        final PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(ifStatement, new Class[]{PsiWhiteSpace.class});
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
 
         final JSStatement elseBranch = (JSStatement) nextStatement;
-        return ConditionalUtils.isReturn(thenBranch, "true")
-                && ConditionalUtils.isReturn(elseBranch, "false");
+        return ConditionalUtils.isReturn(thenBranch, "true") && ConditionalUtils.isReturn(elseBranch, "false");
     }
 
     public static boolean isSimplifiableImplicitReturnNegated(JSIfStatement ifStatement) {
@@ -307,16 +262,12 @@ public static boolean isSimplifiableImplicitReturnNegated(JSIfStatement ifStatem
         JSStatement thenBranch = ifStatement.getThen();
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
 
-        final PsiElement nextStatement =
-                PsiTreeUtil.skipSiblingsForward(ifStatement,
-                        new Class[]{
-                                PsiWhiteSpace.class});
+        final PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(ifStatement, new Class[]{PsiWhiteSpace.class});
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
         final JSStatement elseBranch = (JSStatement) nextStatement;
-        return ConditionalUtils.isReturn(thenBranch, "false")
-                && ConditionalUtils.isReturn(elseBranch, "true");
+        return ConditionalUtils.isReturn(thenBranch, "false") && ConditionalUtils.isReturn(elseBranch, "true");
     }
 
     public static boolean isSimplifiableReturn(JSIfStatement ifStatement) {
@@ -324,8 +275,7 @@ public static boolean isSimplifiableReturn(JSIfStatement ifStatement) {
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
         JSStatement elseBranch = ifStatement.getElse();
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
-        return ConditionalUtils.isReturn(thenBranch, "true")
-                && ConditionalUtils.isReturn(elseBranch, "false");
+        return ConditionalUtils.isReturn(thenBranch, "true") && ConditionalUtils.isReturn(elseBranch, "false");
     }
 
     public static boolean isSimplifiableReturnNegated(JSIfStatement ifStatement) {
@@ -333,8 +283,7 @@ public static boolean isSimplifiableReturnNegated(JSIfStatement ifStatement) {
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
         JSStatement elseBranch = ifStatement.getElse();
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
-        return ConditionalUtils.isReturn(thenBranch, "false")
-                && ConditionalUtils.isReturn(elseBranch, "true");
+        return ConditionalUtils.isReturn(thenBranch, "false") && ConditionalUtils.isReturn(elseBranch, "true");
     }
 
     public static boolean isSimplifiableAssignment(JSIfStatement ifStatement) {
@@ -342,12 +291,9 @@ public static boolean isSimplifiableAssignment(JSIfStatement ifStatement) {
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
         JSStatement elseBranch = ifStatement.getElse();
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
-        if (ConditionalUtils.isAssignment(thenBranch, "true") &&
-                ConditionalUtils.isAssignment(elseBranch, "false")) {
-            final JSAssignmentExpression thenExpression =
-                    (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression =
-                    (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+        if (ConditionalUtils.isAssignment(thenBranch, "true") && ConditionalUtils.isAssignment(elseBranch, "false")) {
+            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
             final IElementType thenSign = thenExpression.getOperationSign();
             final IElementType elseSign = elseExpression.getOperationSign();
             if (!thenSign.equals(elseSign)) {
@@ -355,8 +301,7 @@ public static boolean isSimplifiableAssignment(JSIfStatement ifStatement) {
             }
             final JSExpression thenLhs = thenExpression.getLOperand();
             final JSExpression elseLhs = elseExpression.getLOperand();
-            return EquivalenceChecker.expressionsAreEquivalent(thenLhs,
-                    elseLhs);
+            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         } else {
             return false;
         }
@@ -367,12 +312,9 @@ public static boolean isSimplifiableAssignmentNegated(JSIfStatement ifStatement)
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
         JSStatement elseBranch = ifStatement.getElse();
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
-        if (ConditionalUtils.isAssignment(thenBranch, "false") &&
-                ConditionalUtils.isAssignment(elseBranch, "true")) {
-            final JSAssignmentExpression thenExpression =
-                    (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression =
-                    (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+        if (ConditionalUtils.isAssignment(thenBranch, "false") && ConditionalUtils.isAssignment(elseBranch, "true")) {
+            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
             final IElementType thenSign = thenExpression.getOperationSign();
             final IElementType elseSign = elseExpression.getOperationSign();
             if (!thenSign.equals(elseSign)) {
@@ -380,8 +322,7 @@ public static boolean isSimplifiableAssignmentNegated(JSIfStatement ifStatement)
             }
             final JSExpression thenLhs = thenExpression.getLOperand();
             final JSExpression elseLhs = elseExpression.getLOperand();
-            return EquivalenceChecker.expressionsAreEquivalent(thenLhs,
-                    elseLhs);
+            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         } else {
             return false;
         }
@@ -393,22 +334,16 @@ public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement
         }
         JSStatement thenBranch = ifStatement.getThen();
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
-        final PsiElement nextStatement =
-                PsiTreeUtil.skipSiblingsBackward(ifStatement,
-                        new Class[]{
-                                PsiWhiteSpace.class});
+        final PsiElement nextStatement = PsiTreeUtil.skipSiblingsBackward(ifStatement, new Class[]{PsiWhiteSpace.class});
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
         JSStatement elseBranch = (JSStatement) nextStatement;
 
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
-        if (ConditionalUtils.isAssignment(thenBranch, "true") &&
-                ConditionalUtils.isAssignment(elseBranch, "false")) {
-            final JSAssignmentExpression thenExpression =
-                    (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression =
-                    (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+        if (ConditionalUtils.isAssignment(thenBranch, "true") && ConditionalUtils.isAssignment(elseBranch, "false")) {
+            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
             final IElementType thenSign = thenExpression.getOperationSign();
             final IElementType elseSign = elseExpression.getOperationSign();
             if (!thenSign.equals(elseSign)) {
@@ -416,8 +351,7 @@ public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement
             }
             final JSExpression thenLhs = thenExpression.getLOperand();
             final JSExpression elseLhs = elseExpression.getLOperand();
-            return EquivalenceChecker.expressionsAreEquivalent(thenLhs,
-                    elseLhs);
+            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         } else {
             return false;
         }
@@ -429,22 +363,16 @@ public static boolean isSimplifiableImplicitAssignmentNegated(JSIfStatement ifSt
         }
         JSStatement thenBranch = ifStatement.getThen();
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
-        final PsiElement nextStatement =
-                PsiTreeUtil.skipSiblingsBackward(ifStatement,
-                        new Class[]{
-                                PsiWhiteSpace.class});
+        final PsiElement nextStatement = PsiTreeUtil.skipSiblingsBackward(ifStatement, new Class[]{PsiWhiteSpace.class});
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
         JSStatement elseBranch = (JSStatement) nextStatement;
 
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
-        if (ConditionalUtils.isAssignment(thenBranch, "false") &&
-                ConditionalUtils.isAssignment(elseBranch, "true")) {
-            final JSAssignmentExpression thenExpression =
-                    (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression =
-                    (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+        if (ConditionalUtils.isAssignment(thenBranch, "false") && ConditionalUtils.isAssignment(elseBranch, "true")) {
+            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
             final IElementType thenSign = thenExpression.getOperationSign();
             final IElementType elseSign = elseExpression.getOperationSign();
             if (!thenSign.equals(elseSign)) {
@@ -452,8 +380,7 @@ public static boolean isSimplifiableImplicitAssignmentNegated(JSIfStatement ifSt
             }
             final JSExpression thenLhs = thenExpression.getLOperand();
             final JSExpression elseLhs = elseExpression.getLOperand();
-            return EquivalenceChecker.expressionsAreEquivalent(thenLhs,
-                    elseLhs);
+            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         } else {
             return false;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
index 9858989a..99d122e5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
@@ -1,7 +1,11 @@
 package com.sixrr.inspectjs.control;
 
 import com.intellij.lang.javascript.psi.*;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -16,69 +20,64 @@ public class UnnecessaryContinueJSInspection extends JavaScriptInspection {
     private final UnnecessaryContinueFix fix = new UnnecessaryContinueFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("unnecessary.continue.statement.display.name");
+        return InspectionJSLocalize.unnecessaryContinueStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("unnecessary.continue.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.unnecessaryContinueErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class UnnecessaryContinueFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("remove.unnecessary.continue.fix");
+            return InspectionJSLocalize.removeUnnecessaryContinueFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement continueKeywordElement = descriptor.getPsiElement();
-            final PsiElement continueStatement =
-                    continueKeywordElement.getParent();
+            final PsiElement continueStatement = continueKeywordElement.getParent();
             assert continueStatement != null;
             deleteElement(continueStatement);
         }
     }
 
-    private static class Visitor
-            extends BaseInspectionVisitor {
-
-        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
-
-            JSStatement continuedStatement =
-                    statement.getStatementToContinue();
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
+            JSStatement continuedStatement = statement.getStatementToContinue();
             if (continuedStatement == null) {
                 return;
             }
-            if(continuedStatement instanceof JSLabeledStatement)
+            if (continuedStatement instanceof JSLabeledStatement labeledStatement)
             {
-                continuedStatement = ((JSLabeledStatement)continuedStatement).getStatement();
+                continuedStatement = labeledStatement.getStatement();
             }
             if (!(continuedStatement instanceof JSLoopStatement)) {
                 return;
@@ -87,16 +86,12 @@ private static class Visitor
             if (body == null) {
                 return;
             }
-            if (body instanceof JSBlockStatement) {
-                if (ControlFlowUtils.blockCompletesWithStatement((JSBlockStatement) body,
-                        statement)) {
-                    registerStatementError(statement);
-                }
-            } else {
-                if (ControlFlowUtils.statementCompletesWithStatement(body,
-                        statement)) {
+            if (body instanceof JSBlockStatement blockStatement) {
+                if (ControlFlowUtils.blockCompletesWithStatement(blockStatement, statement)) {
                     registerStatementError(statement);
                 }
+            } else if (ControlFlowUtils.statementCompletesWithStatement(body, statement)) {
+                registerStatementError(statement);
             }
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
index a6a37150..b1104809 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
@@ -1,71 +1,66 @@
 package com.sixrr.inspectjs.control;
 
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.editor.inspection.ProblemDescriptor;
 import com.intellij.lang.javascript.psi.JSBreakStatement;
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-import com.sixrr.inspectjs.*;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnnecessaryLabelJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("unnecessary.label.display.name");
+        return InspectionJSLocalize.unnecessaryLabelDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new UnusedLabelVisitor();
     }
 
     @RequiredReadAction
-	@Override
-	@Nonnull
+    @Override
+    @Nonnull
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("unnecessary.label.error.string");
-
+        return InspectionJSLocalize.unnecessaryLabelErrorString().get();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new UnusedLabelFix();
     }
 
     private static class UnusedLabelFix extends InspectionJSFix {
-
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("remove.label.fix");
+            return InspectionJSLocalize.removeLabelFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement label = descriptor.getPsiElement();
-            final JSLabeledStatement statement =
-                    (JSLabeledStatement) label.getParent();
+            final JSLabeledStatement statement = (JSLabeledStatement) label.getParent();
             assert statement != null;
             final JSStatement labeledStatement = statement.getStatement();
             if (labeledStatement == null) {
@@ -77,18 +72,16 @@ public void doFix(Project project, ProblemDescriptor descriptor)
     }
 
     private static class UnusedLabelVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSLabeledStatement(JSLabeledStatement statement) {
+        @Override
+        public void visitJSLabeledStatement(JSLabeledStatement statement) {
             if (containsBreakOrContinueForLabel(statement)) {
                 return;
             }
-            final PsiElement labelIdentifier =
-                    statement.getLabelIdentifier();
+            final PsiElement labelIdentifier = statement.getLabelIdentifier();
             registerError(labelIdentifier);
         }
 
-        private static boolean containsBreakOrContinueForLabel(
-                JSLabeledStatement statement) {
+        private static boolean containsBreakOrContinueForLabel(JSLabeledStatement statement) {
             final LabelFinder labelFinder = new LabelFinder(statement);
             statement.accept(labelFinder);
             return labelFinder.jumpFound();
@@ -96,7 +89,6 @@ private static boolean containsBreakOrContinueForLabel(
     }
 
     private static class LabelFinder extends JSRecursiveElementVisitor {
-
         private boolean found = false;
         private String label = null;
 
@@ -106,14 +98,15 @@ private LabelFinder(JSLabeledStatement target) {
             label = labelIdentifier.getText();
         }
 
-        @Override public void visitElement(@Nonnull PsiElement element) {
+        @Override
+        public void visitElement(@Nonnull PsiElement element) {
             if (!found) {
                 super.visitElement(element);
             }
         }
 
-        @Override public void visitJSContinueStatement(
-                @Nonnull JSContinueStatement continueStatement) {
+        @Override
+        public void visitJSContinueStatement(@Nonnull JSContinueStatement continueStatement) {
             if (found) {
                 return;
             }
@@ -124,8 +117,8 @@ private LabelFinder(JSLabeledStatement target) {
             }
         }
 
-        @Override public void visitJSBreakStatement(
-                @Nonnull JSBreakStatement breakStatement) {
+        @Override
+        public void visitJSBreakStatement(@Nonnull JSBreakStatement breakStatement) {
             if (found) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index 247c00c0..f2cf294b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -3,29 +3,26 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ReuseOfLocalVariableJSInspection extends JavaScriptInspection
 {
-
 	@Override
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message(
-				"reuse.of.local.variable.display.name");
+		return InspectionJSLocalize.reuseOfLocalVariableDisplayName().get();
 	}
 
 	@Override
@@ -40,24 +37,19 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message(
-				"reuse.of.local.variable.problem.descriptor");
+		return InspectionJSLocalize.reuseOfLocalVariableProblemDescriptor().get();
 	}
 
-
 	@Override
 	public BaseInspectionVisitor buildVisitor()
 	{
 		return new ReuseOfLocalVariableVisitor();
 	}
 
-	private static class ReuseOfLocalVariableVisitor
-			extends BaseInspectionVisitor
+	private static class ReuseOfLocalVariableVisitor extends BaseInspectionVisitor
 	{
-
 		@Override
-		public void visitJSAssignmentExpression(
-				@Nonnull JSAssignmentExpression assignment)
+		public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment)
 		{
 			super.visitJSAssignmentExpression(assignment);
 			if(assignment.getROperand() == null)
@@ -119,8 +111,7 @@ public void visitJSAssignmentExpression(
 				// that a variable is used in only one branch of a try statement
 				return;
 			}
-			final PsiElement assignmentBlock =
-					assignmentParent.getParent();
+			final PsiElement assignmentBlock = assignmentParent.getParent();
 			if(assignmentBlock == null)
 			{
 				return;
@@ -131,8 +122,7 @@ public void visitJSAssignmentExpression(
 				return;
 			}
 			final JSStatement[] statements = variableBlock.getStatements();
-			final PsiElement containingStatement =
-					getChildWhichContainsElement(variableBlock, assignment);
+			final PsiElement containingStatement = getChildWhichContainsElement(variableBlock, assignment);
 			int statementPosition = -1;
 			for(int i = 0; i < statements.length; i++)
 			{
@@ -156,8 +146,7 @@ public void visitJSAssignmentExpression(
 			registerError(lhs);
 		}
 
-		private static boolean loopExistsBetween(
-				JSAssignmentExpression assignment, JSBlockStatement block)
+		private static boolean loopExistsBetween(JSAssignmentExpression assignment, JSBlockStatement block)
 		{
 			PsiElement elementToTest = assignment;
 			while(elementToTest != null)
@@ -175,8 +164,7 @@ private static boolean loopExistsBetween(
 			return false;
 		}
 
-		private static boolean tryExistsBetween(
-				JSAssignmentExpression assignment, JSBlockStatement block)
+		private static boolean tryExistsBetween(JSAssignmentExpression assignment, JSBlockStatement block)
 		{
 			PsiElement elementToTest = assignment;
 			while(elementToTest != null)
@@ -198,9 +186,7 @@ private static boolean tryExistsBetween(
 		 * @noinspection AssignmentToMethodParameter
 		 */
 		@Nullable
-		public static PsiElement getChildWhichContainsElement(
-				@Nonnull JSBlockStatement ancestor,
-				@Nonnull PsiElement descendant)
+		public static PsiElement getChildWhichContainsElement(@Nonnull JSBlockStatement ancestor, @Nonnull PsiElement descendant)
 		{
 			PsiElement element = descendant;
 			while(!element.equals(ancestor))
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index 3ddbdcd2..2b52ebfc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -2,48 +2,47 @@
 
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class InnerHTMLJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("use.of.innerhtml.property.display.name");
+        return InspectionJSLocalize.useOfInnerhtmlPropertyDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("inner.html.error.string");
+        return InspectionJSLocalize.innerHtmlErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
         @SuppressWarnings({"HardCodedStringLiteral"})
-        @Override public void visitJSReferenceExpression(JSReferenceExpression expression) {
+        @Override
+        public void visitJSReferenceExpression(JSReferenceExpression expression) {
             super.visitJSReferenceExpression(expression);
             final String referenceName = expression.getReferencedName();
-            if(!"innerHTML".equalsIgnoreCase(referenceName))
+            if (!"innerHTML".equalsIgnoreCase(referenceName))
             {
                  return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index 8f3cf5c5..344990a9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -3,39 +3,37 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import jakarta.annotation.Nonnull;
-
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class PlatformDetectionJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("platform.detection.display.name");
+        return InspectionJSLocalize.platformDetectionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("platform.detection.error.string");
+        return InspectionJSLocalize.platformDetectionErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
index a015acc3..05879706 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
@@ -2,54 +2,53 @@
 
 import com.intellij.lang.javascript.psi.JSReturnStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ReturnFromFinallyBlockJSInspection extends JavaScriptInspection {
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "ReturnInsideFinallyBlockJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("return.inside.finally.block.display.name");
+        return InspectionJSLocalize.returnInsideFinallyBlockDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("return.inside.finally.block.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.returnInsideFinallyBlockErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSReturnStatement(@Nonnull JSReturnStatement statement) {
+        @Override
+        public void visitJSReturnStatement(@Nonnull JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
index a58ddf57..403a6fc8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
@@ -1,55 +1,54 @@
 package com.sixrr.inspectjs.exception;
 
-import jakarta.annotation.Nonnull;
-
 import com.intellij.lang.javascript.psi.JSThrowStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ThrowFromFinallyBlockJSInspection extends JavaScriptInspection {
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "ThrowInsideFinallyBlockJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("throw.inside.finally.block.display.name");
+        return InspectionJSLocalize.throwInsideFinallyBlockDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("throw.inside.finally.block.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.throwInsideFinallyBlockErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
+        @Override
+        public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
             super.visitJSThrowStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
@@ -57,4 +56,4 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
index 7e64ffab..77d3e9ef 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
@@ -1,15 +1,15 @@
 package com.sixrr.inspectjs.fix;
 
-import consulo.language.editor.refactoring.RefactoringFactory;
-import consulo.project.Project;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.dataContext.DataManager;
 import consulo.language.editor.inspection.ProblemDescriptor;
-import consulo.language.psi.PsiElement;
-import consulo.language.editor.refactoring.action.RefactoringActionHandlerFactory;
-import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.language.editor.refactoring.RefactoringFactory;
 import consulo.language.editor.refactoring.RenameRefactoring;
-import com.sixrr.inspectjs.InspectionJSFix;
-import com.sixrr.inspectjs.InspectionJSBundle;
+import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.language.editor.refactoring.action.RefactoringActionHandlerFactory;
+import consulo.language.psi.PsiElement;
+import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
 public class RenameFix extends InspectionJSFix {
@@ -26,22 +26,19 @@ public RenameFix(String targetName) {
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getName() {
-        if (m_targetName == null) {
-            return InspectionJSBundle.message("rename.fix");
-        } else {
-            return InspectionJSBundle.message("rename.to.fix", m_targetName);
-        }
+        return m_targetName == null
+            ? InspectionJSLocalize.renameFix().get()
+            : InspectionJSLocalize.renameToFix(m_targetName).get();
     }
 
     @Override
-	public void doFix(Project project, ProblemDescriptor descriptor) {
+    public void doFix(Project project, ProblemDescriptor descriptor) {
         final PsiElement nameIdentifier = descriptor.getPsiElement();
         final PsiElement elementToRename = nameIdentifier.getParent();
         if (m_targetName == null) {
-            final RefactoringActionHandlerFactory factory =
-                    RefactoringActionHandlerFactory.getInstance();
+            final RefactoringActionHandlerFactory factory = RefactoringActionHandlerFactory.getInstance();
             final RefactoringActionHandler renameHandler = factory.createRenameHandler();
             renameHandler.invoke(project, new PsiElement[]{elementToRename}, DataManager.getInstance().getDataContext());
         } else {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index fc77aa9b..3abd5190 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -2,14 +2,13 @@
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -26,7 +25,7 @@ public String getID()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("overly.nested.function.display.name");
+		return InspectionJSLocalize.overlyNestedFunctionDisplayName().get();
 	}
 
 	@Override
@@ -52,14 +51,9 @@ public String buildErrorString(Object state, Object... args)
 		final NestingDepthVisitor visitor = new NestingDepthVisitor();
 		function.accept(visitor);
 		final int nestingDepth = visitor.getMaximumDepth();
-		if(functionHasIdentifier(function))
-		{
-			return InspectionJSBundle.message("function.is.overly.nested.error.string", nestingDepth);
-		}
-		else
-		{
-			return InspectionJSBundle.message("anonymous.function.is.overly.nested.error.string", nestingDepth);
-		}
+		return functionHasIdentifier(function)
+			? InspectionJSLocalize.functionIsOverlyNestedErrorString(nestingDepth).get()
+			: InspectionJSLocalize.anonymousFunctionIsOverlyNestedErrorString(nestingDepth).get();
 	}
 
 	@Override
@@ -70,7 +64,6 @@ public BaseInspectionVisitor buildVisitor()
 
 	private class Visitor extends BaseInspectionVisitor<NestingDepthJSInspectionState>
 	{
-
 		@Override
 		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
 		{
@@ -78,11 +71,9 @@ public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
 			function.accept(visitor);
 			final int count = visitor.getMaximumDepth();
 
-			if(count <= myState.getLimit())
-			{
-				return;
+			if (count > myState.getLimit()) {
+				registerFunctionError(function);
 			}
-			registerFunctionError(function);
 		}
 	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index e382b0e0..ec48c69f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -4,14 +4,13 @@
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -28,7 +27,7 @@ public String getID()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("function.with.too.many.parameters.display.name");
+		return InspectionJSLocalize.functionWithTooManyParametersDisplayName().get();
 	}
 
 	@Override
@@ -54,14 +53,9 @@ public String buildErrorString(Object state, Object... args)
 		final JSParameterList parameterList = function.getParameterList();
 		final JSParameter[] parameters = parameterList.getParameters();
 		final int numParameters = parameters.length;
-		if(functionHasIdentifier(function))
-		{
-			return InspectionJSBundle.message("function.has.too.many.parameters.error.string", numParameters);
-		}
-		else
-		{
-			return InspectionJSBundle.message("anonymous.function.has.too.many.parameters.error.string", numParameters);
-		}
+		return functionHasIdentifier(function)
+			? InspectionJSLocalize.functionHasTooManyParametersErrorString(numParameters).get()
+			: InspectionJSLocalize.anonymousFunctionHasTooManyParametersErrorString(numParameters).get();
 	}
 
 	@Override
@@ -72,7 +66,6 @@ public BaseInspectionVisitor buildVisitor()
 
 	private class Visitor extends BaseInspectionVisitor<ParametersPerFunctionJSInspectionState>
 	{
-
 		@Override
 		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
 		{
@@ -95,4 +88,3 @@ public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
 		}
 	}
 }
-
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index f03377d1..65e1cf21 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -3,14 +3,13 @@
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -27,7 +26,7 @@ public String getID()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("overly.long.function.display.name");
+		return InspectionJSLocalize.overlyLongFunctionDisplayName().get();
 	}
 
 	@Override
@@ -55,14 +54,9 @@ public String buildErrorString(Object state, Object... args)
 		assert lastChild != null;
 		lastChild.accept(visitor);
 		final int coupling = visitor.getStatementCount();
-		if(functionHasIdentifier(function))
-		{
-			return InspectionJSBundle.message("function.is.overly.long.statement.error.string", coupling);
-		}
-		else
-		{
-			return InspectionJSBundle.message("anonymous.function.is.overly.long.statement.error.string", coupling);
-		}
+		return functionHasIdentifier(function)
+			? InspectionJSLocalize.functionIsOverlyLongStatementErrorString(coupling).get()
+			: InspectionJSLocalize.anonymousFunctionIsOverlyLongStatementErrorString(coupling).get();
 	}
 
 	@Override
@@ -73,7 +67,6 @@ public BaseInspectionVisitor buildVisitor()
 
 	private class Visitor extends BaseInspectionVisitor<StatementsPerFunctionJSInspectionState>
 	{
-
 		@Override
 		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
 		{
@@ -95,4 +88,3 @@ public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
 		}
 	}
 }
-
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index bf44209b..3d319b7b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -3,39 +3,37 @@
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ThreeNegationsPerFunctionJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "FunctionWithMoreThanThreeNegationsJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("function.with.more.than.three.negations.display.name");
+        return InspectionJSLocalize.functionWithMoreThanThreeNegationsDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
+    @Override
+    public String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
         assert function != null;
         final PsiElement lastChild = function.getLastChild();
@@ -43,21 +41,19 @@ public String buildErrorString(Object state, Object... args) {
         assert lastChild != null;
         lastChild.accept(visitor);
         final int negationCount = visitor.getNegationCount();
-        if (functionHasIdentifier(function)) {
-            return InspectionJSBundle.message("function.contains.too.many.negation.error.string", negationCount);
-        } else {
-            return InspectionJSBundle.message("anonymous.function.contains.too.many.negation.error.string", negationCount);
-        }
+        return functionHasIdentifier(function)
+            ? InspectionJSLocalize.functionContainsTooManyNegationErrorString(negationCount).get()
+            : InspectionJSLocalize.anonymousFunctionContainsTooManyNegationErrorString(negationCount).get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        @Override
+        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             final NegationCountVisitor visitor = new NegationCountVisitor();
             final PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index f1bd22e7..a2213e74 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -3,15 +3,14 @@
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -29,7 +28,7 @@ public boolean isEnabledByDefault()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("local.variable.naming.convention.display.name");
+		return InspectionJSLocalize.localVariableNamingConventionDisplayName().get();
 	}
 
 	@Override
@@ -60,15 +59,15 @@ public String buildErrorString(Object state, Object... args)
 		final JSVariable variable = (JSVariable) ((PsiElement) args[0]).getParent();
 		assert variable != null;
 		final String variableName = variable.getName();
-		if(variableName.length() < inspectionState.m_minLength)
+		if (variableName.length() < inspectionState.m_minLength)
 		{
-			return InspectionJSBundle.message("variable.name.is.too.short.error.string");
+			return InspectionJSLocalize.variableNameIsTooShortErrorString().get();
 		}
-		else if(variableName.length() > inspectionState.m_maxLength)
+		else if (variableName.length() > inspectionState.m_maxLength)
 		{
-			return InspectionJSBundle.message("variable.name.is.too.long.error.string");
+			return InspectionJSLocalize.variableNameIsTooLongErrorString().get();
 		}
-		return InspectionJSBundle.message("variable.name.doesnt.match.regex.error.string", inspectionState.m_regex);
+		return InspectionJSLocalize.variableNameDoesntMatchRegexErrorString(inspectionState.m_regex).get();
 	}
 
 	@Nonnull
@@ -91,20 +90,19 @@ public void visitJSVarStatement(JSVarStatement jsVarStatement)
 		{
 			super.visitJSVarStatement(jsVarStatement);
 			final JSVariable[] variables = jsVarStatement.getVariables();
-			for(JSVariable variable : variables)
+			for (JSVariable variable : variables)
 			{
 				final String name = variable.getName();
-				if(name == null)
+				if (name == null)
 				{
 					continue;
 				}
-				if(isValid(name, myState))
+				if (isValid(name, myState))
 				{
 					continue;
 				}
 				registerVariableError(variable);
 			}
 		}
-
 	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index 51e6add9..bdfdbc63 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -5,15 +5,14 @@
 import com.intellij.lang.javascript.psi.JSParameterList;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.InspectionJSFix;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.fix.RenameFix;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -31,7 +30,7 @@ public boolean isEnabledByDefault()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("function.parameter.naming.convention.display.name");
+		return InspectionJSLocalize.functionParameterNamingConventionDisplayName().get();
 	}
 
 	@Nonnull
@@ -69,15 +68,15 @@ public String buildErrorString(Object state, Object... args)
 		final JSParameter parameter = (JSParameter) ((PsiElement) args[0]).getParent();
 		assert parameter != null;
 		final String parameterName = parameter.getName();
-		if(parameterName.length() < inspectionState.m_minLength)
+		if (parameterName.length() < inspectionState.m_minLength)
 		{
-			return InspectionJSBundle.message("parameter.name.is.too.short.error.string");
+			return InspectionJSLocalize.parameterNameIsTooShortErrorString().get();
 		}
-		else if(parameterName.length() > inspectionState.m_maxLength)
+		else if (parameterName.length() > inspectionState.m_maxLength)
 		{
-			return InspectionJSBundle.message("parameter.name.is.too.long.error.string");
+			return InspectionJSLocalize.parameterNameIsTooLongErrorString().get();
 		}
-		return InspectionJSBundle.message("parameter.name.doesnt.match.regex.error.string", inspectionState.m_regex);
+		return InspectionJSLocalize.parameterNameDoesntMatchRegexErrorString(inspectionState.m_regex).get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index f158d5b7..83f37bc6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -4,16 +4,14 @@
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
-
 @ExtensionImpl
 public class NestedFunctionCallJSInspection extends JavaScriptInspection
 {
@@ -34,8 +32,7 @@ public String getGroupDisplayName()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message(
-				"nested.function.call.display.name");
+		return InspectionJSLocalize.nestedFunctionCallDisplayName().get();
 	}
 
 	@RequiredReadAction
@@ -43,8 +40,7 @@ public String getDisplayName()
 	@Nonnull
 	protected String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message(
-				"nested.function.call.problem.descriptor");
+		return InspectionJSLocalize.nestedFunctionCallProblemDescriptor().get();
 	}
 
 	@Override
@@ -55,30 +51,21 @@ public BaseInspectionVisitor buildVisitor()
 
 	private static class NestedMethodCallVisitor extends BaseInspectionVisitor
 	{
-
 		@Override
-		public void visitJSCallExpression(
-				@Nonnull JSCallExpression expression)
+		public void visitJSCallExpression(@Nonnull JSCallExpression expression)
 		{
 			super.visitJSCallExpression(expression);
 			JSExpression outerExpression = expression;
-			while(outerExpression != null &&
-					outerExpression.getParent() instanceof JSExpression)
+			while (outerExpression != null && outerExpression.getParent() instanceof JSExpression parentExpression)
 			{
-				outerExpression = (JSExpression) outerExpression.getParent();
+				outerExpression = parentExpression;
 			}
-			if(outerExpression == null)
+			if (outerExpression == null)
 			{
 				return;
 			}
 			final PsiElement parent = outerExpression.getParent();
-			if(!(parent instanceof JSArgumentList))
-			{
-				return;
-			}
-			final PsiElement grandParent = parent.getParent();
-			if(!(grandParent instanceof JSCallExpression))
-			{
+			if (!(parent instanceof JSArgumentList && parent.getParent() instanceof JSCallExpression)) {
 				return;
 			}
 			registerFunctionCallError(expression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
index 75b431ca..366a0606 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
@@ -1,14 +1,17 @@
 package com.sixrr.inspectjs.style;
 
 import com.intellij.lang.javascript.psi.*;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -16,51 +19,48 @@ public class NonBlockStatementBodyJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new WrapBodyFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("non.block.statement.body.display.name");
+        return InspectionJSLocalize.nonBlockStatementBodyDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return false;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        if (args[0] instanceof JSIfStatement) {
-            return InspectionJSBundle.message("non.block.branch.error.string");
-        } else {
-            return InspectionJSBundle.message("non.block.body.error.string");
-        }
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return args[0] instanceof JSIfStatement
+            ? InspectionJSLocalize.nonBlockBranchErrorString().get()
+            : InspectionJSLocalize.nonBlockBodyErrorString().get();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class WrapBodyFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("wrap.statement.body.fix");
+            return InspectionJSLocalize.wrapStatementBodyFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement statementIdentifier = descriptor.getPsiElement();
             final JSStatement statement = (JSStatement) statementIdentifier.getParent();
-            if (statement instanceof JSLoopStatement) {
-                final JSStatement body = ((JSLoopStatement) statement).getBody();
+            if (statement instanceof JSLoopStatement loopStatement) {
+                final JSStatement body = loopStatement.getBody();
                 wrapStatement(body);
             } else {
                 final JSIfStatement ifStatement = (JSIfStatement) statement;
@@ -82,13 +82,13 @@ private static void wrapStatement(JSStatement statement) throws IncorrectOperati
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+        @Override
+        public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -96,13 +96,14 @@ private static class Visitor extends BaseInspectionVisitor {
                 return;
             }
 
-            if (!!(body instanceof JSBlockStatement)) {
+            if (body instanceof JSBlockStatement) {
                 return;
             }
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+        @Override
+        public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -116,7 +117,8 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
+        @Override
+        public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -130,7 +132,8 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+        @Override
+        public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
             super.visitJSForInStatement(statement);
 
             final JSStatement body = statement.getBody();
@@ -144,7 +147,8 @@ private static class Visitor extends BaseInspectionVisitor {
             registerStatementError(statement, statement);
         }
 
-        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+        @Override
+        public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
 
             final JSStatement thenBranch = statement.getThen();
@@ -156,11 +160,8 @@ private static class Visitor extends BaseInspectionVisitor {
             }
             final JSStatement elseBranch = statement.getElse();
 
-            if (elseBranch != null) {
-                if (!(elseBranch instanceof JSBlockStatement) &&
-                        !(elseBranch instanceof JSIfStatement)) {
-                    registerStatementError(statement, statement);
-                }
+            if (elseBranch != null && !(elseBranch instanceof JSBlockStatement || elseBranch instanceof JSIfStatement)) {
+                registerStatementError(statement, statement);
             }
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
index 9cf1b118..6b206bb1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
@@ -1,32 +1,28 @@
 package com.sixrr.inspectjs.ui;
 
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.ui.ex.awt.Messages;
-import com.sixrr.inspectjs.InspectionJSBundle;
 
 import javax.swing.*;
 import java.text.ParseException;
 
 public class RegExInputVerifier extends InputVerifier {
     @Override
-	public boolean verify(JComponent input) {
+    public boolean verify(JComponent input) {
         return true;
     }
 
     @Override
-	public boolean shouldYieldFocus(JComponent input) {
-        if (input instanceof JFormattedTextField) {
-            final JFormattedTextField ftf = (JFormattedTextField) input;
+    public boolean shouldYieldFocus(JComponent input) {
+        if (input instanceof JFormattedTextField ftf) {
             final JFormattedTextField.AbstractFormatter formatter = ftf.getFormatter();
             if (formatter != null) {
                 try {
                     formatter.stringToValue(ftf.getText());
                 } catch (final ParseException e) {
-                    SwingUtilities.invokeLater(new Runnable() {
-                        @Override
-						public void run() {
-                            Messages.showErrorDialog(e.getMessage(), InspectionJSBundle.message("malformed.naming.pattern.alert"));
-                        }
-                    });
+                    SwingUtilities.invokeLater(
+                        () -> Messages.showErrorDialog(e.getMessage(), InspectionJSLocalize.malformedNamingPatternAlert().get())
+                    );
                 }
             }
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index 86fb22fb..4f8b0aed 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -1,51 +1,49 @@
 package com.sixrr.inspectjs.validity;
 
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.psi.JSSimpleLiteralExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.psi.JSSimpleLiteralExpression;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class StringLiteralBreaksHTMLJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("string.literal.breaks.html.display.name");
+        return InspectionJSLocalize.stringLiteralBreaksHtmlDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return false;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("string.literal.breaks.html.error.string");
+        return InspectionJSLocalize.stringLiteralBreaksHtmlErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-
-        @Override public void visitJSLiteralExpression(JSSimpleLiteralExpression jsLiteralExpression) {
+        @Override
+        public void visitJSLiteralExpression(JSSimpleLiteralExpression jsLiteralExpression) {
             super.visitJSLiteralExpression(jsLiteralExpression);
             final String text = jsLiteralExpression.getText();
             if (!text.startsWith("\"") && !text.startsWith("'")) {
@@ -55,6 +53,5 @@ private static class Visitor extends BaseInspectionVisitor {
                 registerError(jsLiteralExpression);
             }
         }
-
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index a718ea61..20e58f61 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -5,65 +5,61 @@
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSThisExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.xml.psi.xml.XmlAttributeValue;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ThisExpressionReferencesGlobalObjectJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("this.expression.which.references.the.global.object.display.name");
+        return InspectionJSLocalize.thisExpressionWhichReferencesTheGlobalObjectDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("this.expression.references.global.object.error.string");
+        return InspectionJSLocalize.thisExpressionReferencesGlobalObjectErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSThisExpression(JSThisExpression jsThisExpression) {
+        @Override
+        public void visitJSThisExpression(JSThisExpression jsThisExpression) {
             super.visitJSThisExpression(jsThisExpression);
             final JSObjectLiteralExpression containingObject = PsiTreeUtil.getParentOfType(jsThisExpression, JSObjectLiteralExpression.class);
             if (containingObject != null) {
                 return;
             }
-            final JSFunction containingFunction =
-                    PsiTreeUtil.getParentOfType(jsThisExpression, JSFunction.class);
+            final JSFunction containingFunction = PsiTreeUtil.getParentOfType(jsThisExpression, JSFunction.class);
             if (containingFunction != null) {
                 return;
             }
-            final XmlAttributeValue containingAttribute =
-                    PsiTreeUtil.getParentOfType(jsThisExpression, XmlAttributeValue.class);
+            final XmlAttributeValue containingAttribute = PsiTreeUtil.getParentOfType(jsThisExpression, XmlAttributeValue.class);
             if (containingAttribute != null) {
                 return;
             }
diff --git a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
index e82ff321..aff26a6b 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
@@ -23,18 +23,18 @@
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
 import consulo.language.ast.IElementType;
-import consulo.language.editor.CodeInsightBundle;
 import consulo.language.editor.completion.lookup.LookupElement;
 import consulo.language.editor.completion.lookup.MutableLookupElement;
+import consulo.language.editor.localize.CodeInsightLocalize;
 import consulo.language.editor.parameterInfo.*;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.search.DefinitionsScopedSearch;
 import consulo.util.collection.ArrayUtil;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.*;
 
 /**
@@ -251,7 +251,7 @@ SignatureInfo buildSignature(final JSParameter[] params, final boolean skipType,
 		}
 		else
 		{
-			info.text = CodeInsightBundle.message("parameter.info.no.parameters");
+			info.text = CodeInsightLocalize.parameterInfoNoParameters().get();
 		}
 		return info;
 	}
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
index ee97e355..93f366ff 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
@@ -32,8 +32,8 @@
 import consulo.document.util.TextRange;
 import consulo.language.editor.PsiEquivalenceUtil;
 import consulo.language.editor.highlight.HighlightManager;
-import consulo.language.editor.refactoring.RefactoringBundle;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
+import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -46,11 +46,10 @@
 import consulo.project.ui.wm.WindowManager;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.undoRedo.CommandProcessor;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -339,10 +338,10 @@ private void doRefactoring(final Project project, final Editor editor, BaseIntro
 				}
 			}
 
-			final JSExpression refExpr = (JSExpression) JSChangeUtil.createExpressionFromText(project, settings.getVariableName());
+			final JSExpression refExpr = JSChangeUtil.createExpressionFromText(project, settings.getVariableName());
 			if(replaceAllOccurences)
 			{
-				List<JSExpression> toHighight = new ArrayList<JSExpression>();
+				List<JSExpression> toHighight = new ArrayList<>();
 				for(JSExpression occurence : occurrences)
 				{
 					if(occurence != expression || !replacedOriginal)
@@ -368,10 +367,13 @@ else if(!replacedOriginal)
 		}
 	}
 
-	protected JSVarStatement prepareDeclaration(final String varDeclText, BaseIntroduceContext<S> context, final Project project) throws IncorrectOperationException
+	protected JSVarStatement prepareDeclaration(final String varDeclText, BaseIntroduceContext<S> context, final Project project)
+		throws IncorrectOperationException
 	{
-		JSVarStatement declaration = (JSVarStatement) JSChangeUtil.createStatementFromText(project, varDeclText + " = 0" + JSChangeUtil.getSemicolon
-				(project)).getPsi();
+		JSVarStatement declaration = (JSVarStatement) JSChangeUtil.createStatementFromText(
+			project,
+			varDeclText + " = 0" + JSChangeUtil.getSemicolon(project)
+		).getPsi();
 		declaration.getVariables()[0].getInitializer().replace(context.expression);
 		return declaration;
 	}
@@ -405,9 +407,9 @@ private static ArrayList<RangeHighlighter> highlightOccurences(Project project,
 		HighlightManager highlightManager = HighlightManager.getInstance(project);
 		EditorColorsManager colorsManager = EditorColorsManager.getInstance();
 		TextAttributes attributes = colorsManager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
-		ArrayList<RangeHighlighter> result = new ArrayList<RangeHighlighter>();
+		ArrayList<RangeHighlighter> result = new ArrayList<>();
 		highlightManager.addOccurrenceHighlights(editor, occurences, attributes, true, result);
-		WindowManager.getInstance().getStatusBar(project).setInfo(RefactoringBundle.message("press.escape.to.remove.the.highlighting"));
+		WindowManager.getInstance().getStatusBar(project).setInfo(RefactoringLocalize.pressEscapeToRemoveTheHighlighting().get());
 		return result;
 	}
 
@@ -455,12 +457,12 @@ protected static JSElement findClassAnchor(final PsiElement expression)
 
 		JSElement parent = PsiTreeUtil.getParentOfType(expression, JSFile.class, JSClass.class);
 
-		if(parent instanceof JSFile)
+		if (parent instanceof JSFile)
 		{
 			final PsiElement classRef = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
-			if(classRef instanceof JSClass)
+			if (classRef instanceof JSClass jsClass)
 			{
-				parent = (JSElement) classRef;
+				parent = jsClass;
 			}
 		}
 

From bb6ca135e9ce3aac4ee6f738a12e41aa29a18f8e Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 15 Jul 2024 17:03:20 +0300
Subject: [PATCH 196/340] Replacing Bundle with Localize (part 3). Making same
 indents within file.

---
 .../com/sixrr/inspectjs/JSGroupNames.java     |  29 +++--
 .../AssignmentResultUsedJSInspection.java     |   2 +-
 ...ignmentToForLoopParameterJSInspection.java |   2 +-
 ...gnmentToFunctionParameterJSInspection.java |   2 +-
 .../NestedAssignmentJSInspection.java         |   2 +-
 ...entWithOperatorAssignmentJSInspection.java |   2 +-
 .../SillyAssignmentJSInspection.java          |   2 +-
 .../bitwise/IncompatibleMaskJSInspection.java |   2 +-
 ...ointlessBitwiseExpressionJSInspection.java |   2 +-
 .../bitwise/ShiftOutOfRangeJSInspection.java  |   2 +-
 .../bugs/DivideByZeroJSInspection.java        |   2 +-
 ...ityComparisonWithCoercionJSInspection.java | 111 +++++++++---------
 .../bugs/InfiniteLoopJSInspection.java        |   2 +-
 .../bugs/InfiniteRecursionJSInspection.java   |   2 +-
 ...tCircuitBooleanExpressionJSInspection.java |   2 +-
 .../ObjectAllocationIgnoredJSInspection.java  |   2 +-
 ...extLabelInSwitchStatementJSInspection.java |   2 +-
 .../AnonymousFunctionJSInspection.java        |   2 +-
 .../confusing/BlockStatementJSInspection.java |   2 +-
 .../confusing/CallerJSInspection.java         |   2 +-
 .../CommaExpressionJSInspection.java          |   2 +-
 .../ConditionalExpressionJSInspection.java    |   2 +-
 ...usingFloatingPointLiteralJSInspection.java |   2 +-
 .../ConfusingPlusesOrMinusesJSInspection.java |   2 +-
 .../DynamicallyGeneratedCodeJSInspection.java |   2 +-
 .../EmptyStatementBodyJSInspection.java       |   2 +-
 ...rementDecrementResultUsedJSInspection.java |   2 +-
 .../confusing/MagicNumberJSInspection.java    |   2 +-
 ...atedConditionalExpressionJSInspection.java |   2 +-
 .../NegatedIfStatementJSInspection.java       |   2 +-
 ...stedConditionalExpressionJSInspection.java |   2 +-
 .../confusing/NestedFunctionJSInspection.java |   2 +-
 .../confusing/OctalIntegerJSInspection.java   |   2 +-
 ...mplexArithmeticExpressionJSInspection.java |   2 +-
 ...yComplexBooleanExpressionJSInspection.java |   2 +-
 ...tlessArithmeticExpressionJSInspection.java |   2 +-
 ...ointlessBooleanExpressionJSInspection.java |   2 +-
 .../confusing/VoidExpressionJSInspection.java |  25 ++--
 .../confusing/WithStatementJSInspection.java  |  24 ++--
 .../control/BreakStatementJSInspection.java   |   2 +-
 .../BreakStatementWithLabelJSInspection.java  |   2 +-
 ...sionWithIdenticalBranchesJSInspection.java |   2 +-
 ...tantConditionalExpressionJSInspection.java |   2 +-
 .../ConstantIfStatementJSInspection.java      |   2 +-
 .../ContinueStatementJSInspection.java        |   2 +-
 ...ontinueStatementWithLabelJSInspection.java |   2 +-
 ...efaultNotLastCaseInSwitchJSInspection.java |   2 +-
 .../DuplicateConditionJSInspection.java       |   2 +-
 ...lthroughInSwitchStatementJSInspection.java |   2 +-
 ...ForLoopReplaceableByWhileJSInspection.java |   2 +-
 ...ThatDoesntUseLoopVariableJSInspection.java |   2 +-
 ...mentWithIdenticalBranchesJSInspection.java |   2 +-
 ...tementWithTooManyBranchesJSInspection.java |   2 +-
 .../control/LabeledStatementJSInspection.java |   2 +-
 ...opStatementThatDoesntLoopJSInspection.java |   2 +-
 .../NestedSwitchStatementJSInspection.java    |   2 +-
 ...tementWithNoDefaultBranchJSInspection.java |   2 +-
 .../control/TailRecursionJSInspection.java    |   2 +-
 .../TrivialConditionalJSInspection.java       |   2 +-
 .../control/TrivialIfJSInspection.java        |   2 +-
 .../UnnecessaryContinueJSInspection.java      |   2 +-
 .../control/UnnecessaryLabelJSInspection.java |   2 +-
 ...saryLabelOnBreakStatementJSInspection.java |  54 ++++-----
 ...yLabelOnContinueStatementJSInspection.java |  54 ++++-----
 .../UnnecessaryReturnJSInspection.java        |  42 +++----
 .../ReuseOfLocalVariableJSInspection.java     |   2 +-
 .../UnnecessaryLocalVariableJSInspection.java |  76 ++++--------
 .../dom/DocumentWriteJSInspection.java        |   2 +-
 .../inspectjs/dom/InnerHTMLJSInspection.java  |   2 +-
 .../dom/PlatformDetectionJSInspection.java    |   2 +-
 .../XHTMLIncompatabilitiesJSInspection.java   |  20 ++--
 ...ueOrBreakFromFinallyBlockJSInspection.java |   2 +-
 .../EmptyCatchBlockJSInspection.java          |   2 +-
 .../EmptyFinallyBlockJSInspection.java        |   2 +-
 .../exception/EmptyTryBlockJSInspection.java  |   2 +-
 .../ExceptionCaughtLocallyJSInspection.java   |   2 +-
 .../ReturnFromFinallyBlockJSInspection.java   |   2 +-
 .../ThrowFromFinallyBlockJSInspection.java    |   2 +-
 .../UnusedCatchParameterJSInspection.java     |  15 +--
 .../CyclomaticComplexityJSInspection.java     |   2 +-
 ...FunctionWithMultipleLoopsJSInspection.java |   2 +-
 ...nWithMultipleReturnPointsJSInspection.java |   2 +-
 .../NestingDepthJSInspection.java             |   2 +-
 .../ParametersPerFunctionJSInspection.java    |   2 +-
 .../StatementsPerFunctionJSInspection.java    |   2 +-
 ...ThreeNegationsPerFunctionJSInspection.java |   2 +-
 .../FunctionNamingConventionJSInspection.java |   2 +-
 ...lVariableNamingConventionJSInspection.java |   2 +-
 ...ParameterNamingConventionJSInspection.java |   2 +-
 .../style/ChainedEqualityJSInspection.java    |   2 +-
 .../ChainedFunctionCallJSInspection.java      |   2 +-
 ...ConstantOnLHSOfComparisonJSInspection.java |   2 +-
 ...ConstantOnRHSOfComparisonJSInspection.java |   2 +-
 .../style/NestedFunctionCallJSInspection.java |   2 +-
 .../NonBlockStatementBodyJSInspection.java    |   2 +-
 .../UnterminatedStatementJSInspection.java    |  16 +--
 .../BadExpressionStatementJSInspection.java   |   2 +-
 .../DebuggerStatementJSInspection.java        |   2 +-
 .../DuplicateCaseLabelJSInspection.java       |   2 +-
 ...DuplicatePropertyOnObjectJSInspection.java |   2 +-
 ...onWithInconsistentReturnsJSInspection.java |   2 +-
 .../StringLiteralBreaksHTMLJSInspection.java  |   2 +-
 ...ionReferencesGlobalObjectJSInspection.java |   2 +-
 .../validity/UnreachableCodeJSInspection.java |  30 ++---
 104 files changed, 319 insertions(+), 361 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/JSGroupNames.java b/inspections/src/main/java/com/sixrr/inspectjs/JSGroupNames.java
index 44a21e55..c8a36ebb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/JSGroupNames.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/JSGroupNames.java
@@ -1,17 +1,20 @@
 package com.sixrr.inspectjs;
 
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
+import consulo.localize.LocalizeValue;
+
 public interface JSGroupNames {
-    String ERRORHANDLING_GROUP_NAME = InspectionJSBundle.message("error.handling.javascript.group.name");
-    String CONTROL_FLOW_GROUP_NAME = InspectionJSBundle.message("control.flow.issues.javascript.group.name");
-    String VALIDITY_GROUP_NAME = InspectionJSBundle.message("javascript.validity.issues.group.name");
-    String CONFUSING_GROUP_NAME = InspectionJSBundle.message("potentially.confusing.code.constructs.javascript.group.name");
-    String FUNCTIONMETRICS_GROUP_NAME = InspectionJSBundle.message("javascript.function.metrics.group.name");
-    String ASSIGNMENT_GROUP_NAME = InspectionJSBundle.message("assignment.issues.javascript.group.name");
-    String NAMING_CONVENTIONS_GROUP_NAME = InspectionJSBundle.message("naming.conventions.javascript.group.name");
-    String STYLE_GROUP_NAME = InspectionJSBundle.message("code.style.issues.javascript.group.name");
-    String DOM_GROUP_NAME = InspectionJSBundle.message("javascript.dom.issues.group.name");
-    String BUGS_GROUP_NAME = InspectionJSBundle.message("probable.bugs.javascript.group.name");
-    String MATURITY_GROUP_NAME = InspectionJSBundle.message("code.maturity.javascript.group.name");
-    String DATA_FLOW_ISSUES = InspectionJSBundle.message("data.flow.issues.javascript.group.name");
-    String BITWISE_GROUP_NAME = InspectionJSBundle.message("bitwise.issues.javascript.group.name");
+    LocalizeValue ERRORHANDLING_GROUP_NAME = InspectionJSLocalize.errorHandlingJavascriptGroupName();
+    LocalizeValue CONTROL_FLOW_GROUP_NAME = InspectionJSLocalize.controlFlowIssuesJavascriptGroupName();
+    LocalizeValue VALIDITY_GROUP_NAME = InspectionJSLocalize.javascriptValidityIssuesGroupName();
+    LocalizeValue CONFUSING_GROUP_NAME = InspectionJSLocalize.potentiallyConfusingCodeConstructsJavascriptGroupName();
+    LocalizeValue FUNCTIONMETRICS_GROUP_NAME = InspectionJSLocalize.javascriptFunctionMetricsGroupName();
+    LocalizeValue ASSIGNMENT_GROUP_NAME = InspectionJSLocalize.assignmentIssuesJavascriptGroupName();
+    LocalizeValue NAMING_CONVENTIONS_GROUP_NAME = InspectionJSLocalize.namingConventionsJavascriptGroupName();
+    LocalizeValue STYLE_GROUP_NAME = InspectionJSLocalize.codeStyleIssuesJavascriptGroupName();
+    LocalizeValue DOM_GROUP_NAME = InspectionJSLocalize.javascriptDomIssuesGroupName();
+    LocalizeValue BUGS_GROUP_NAME = InspectionJSLocalize.probableBugsJavascriptGroupName();
+    LocalizeValue MATURITY_GROUP_NAME = InspectionJSLocalize.codeMaturityJavascriptGroupName();
+    LocalizeValue DATA_FLOW_ISSUES = InspectionJSLocalize.dataFlowIssuesJavascriptGroupName();
+    LocalizeValue BITWISE_GROUP_NAME = InspectionJSLocalize.bitwiseIssuesJavascriptGroupName();
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
index 2f9e9ab3..92f8c41d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
index bf643ad1..a00b8b22 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
@@ -24,7 +24,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
index f869a6b4..22c5cbbf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
@@ -24,7 +24,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
index dd12889d..770a0455 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
@@ -21,7 +21,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
index 55941976..a02c3790 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
@@ -39,7 +39,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
index cc18347b..b5e60b18 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
@@ -27,7 +27,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
index 885544ea..006b58fe 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
@@ -32,7 +32,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.BITWISE_GROUP_NAME;
+        return JSGroupNames.BITWISE_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index 0d3528ee..5908c4f1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -49,7 +49,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.BITWISE_GROUP_NAME;
+		return JSGroupNames.BITWISE_GROUP_NAME.get();
 	}
 
 	@RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index 6dfba585..f0bbf392 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -24,7 +24,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.BITWISE_GROUP_NAME;
+        return JSGroupNames.BITWISE_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index e766a96f..327a6223 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -31,7 +31,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME;
+        return JSGroupNames.BUGS_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index 37ecc722..be684bd7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -20,31 +20,30 @@
 
 @ExtensionImpl
 public class EqualityComparisonWithCoercionJSInspection extends JavaScriptInspection {
-
-    @Override
+	@Override
 	@Nonnull
-    public String getID() {
-        return "EqualityComparisonWithCoercionJS";
-    }
+	public String getID() {
+		return "EqualityComparisonWithCoercionJS";
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.equalityComparisonWithCoercionDisplayName().get();
-    }
+	public String getDisplayName() {
+		return InspectionJSLocalize.equalityComparisonWithCoercionDisplayName().get();
+	}
 
-    @Override
+	@Override
 	@Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME;
-    }
+	public String getGroupDisplayName() {
+		return JSGroupNames.BUGS_GROUP_NAME.get();
+	}
 
-    @RequiredReadAction
+	@RequiredReadAction
 	@Override
 	@Nonnull
-    protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSLocalize.equalityComparisonWithCoercionErrorString().get();
-    }
+	protected String buildErrorString(Object state, Object... args) {
+		return InspectionJSLocalize.equalityComparisonWithCoercionErrorString().get();
+	}
 
 	@Override
 	protected InspectionJSFix buildFix(PsiElement location, Object state) {
@@ -59,7 +58,6 @@ protected InspectionJSFix buildFix(PsiElement location, Object state) {
 	}
 
 	private static class EqualityComparisonWithCoercionFix extends InspectionJSFix {
-
 		private final String sign;
 
 		public EqualityComparisonWithCoercionFix(String sign) {
@@ -73,8 +71,7 @@ public String getName() {
 		}
 
 		@Override
-		protected void doFix(Project project, ProblemDescriptor descriptor)
-				throws IncorrectOperationException {
+		protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
 			final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
 			final JSExpression lhs = expression.getLOperand();
 			final JSExpression rhs = expression.getROperand();
@@ -87,44 +84,42 @@ public BaseInspectionVisitor buildVisitor() {
         return new EqualityComparisonWithCoercionVisitor();
     }
 
-    private static class EqualityComparisonWithCoercionVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(
-                @Nonnull JSBinaryExpression expression) {
-            super.visitJSBinaryExpression(expression);
-            final JSExpression lhs = expression.getLOperand();
-            if (lhs == null) {
-                return;
-            }
-            final JSExpression rhs = expression.getROperand();
-            if (rhs == null) {
-                return;
-            }
-            final IElementType tokenType = expression.getOperationSign();
-            if (!JSTokenTypes.EQEQ.equals(tokenType) &&
-                    !JSTokenTypes.NE.equals(tokenType)) {
-                return;
-            }
-            if(!mayCauseCoercion(rhs) &&!mayCauseCoercion(lhs)) {
+	private static class EqualityComparisonWithCoercionVisitor extends BaseInspectionVisitor {
+		@Override
+		public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+			super.visitJSBinaryExpression(expression);
+			final JSExpression lhs = expression.getLOperand();
+			if (lhs == null) {
 				return;
-            }
-            registerError(expression);
-        }
-    }
+			}
+			final JSExpression rhs = expression.getROperand();
+			if (rhs == null) {
+				return;
+			}
+			final IElementType tokenType = expression.getOperationSign();
+			if (!JSTokenTypes.EQEQ.equals(tokenType) && !JSTokenTypes.NE.equals(tokenType)) {
+				return;
+			}
+			if(!mayCauseCoercion(rhs) &&!mayCauseCoercion(lhs)) {
+				return;
+			}
+			registerError(expression);
+		}
+	}
 
-    private static boolean mayCauseCoercion(JSExpression expression) {
-        @NonNls
-        final String text = expression.getText();
-        return "0".equals(text) ||
-                "0x0".equals(text) ||
-                "0X0".equals(text) ||
-                "0.0".equals(text) ||
-                "0L".equals(text) ||
-                "0l".equals(text) ||
-                "null".equals(text) ||
-                "undefined".equals(text) ||
-                "true".equals(text) ||
-                "false".equals(text) ||
-                "''".equals(text);
-    }
+	private static boolean mayCauseCoercion(JSExpression expression) {
+		@NonNls
+		final String text = expression.getText();
+		return "0".equals(text) ||
+			"0x0".equals(text) ||
+			"0X0".equals(text) ||
+			"0.0".equals(text) ||
+			"0L".equals(text) ||
+			"0l".equals(text) ||
+			"null".equals(text) ||
+			"undefined".equals(text) ||
+			"true".equals(text) ||
+			"false".equals(text) ||
+			"''".equals(text);
+	}
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
index a71f50f4..f93eba5b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
@@ -23,7 +23,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME;
+        return JSGroupNames.BUGS_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
index f0537276..fb15c7e0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
@@ -23,7 +23,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME;
+        return JSGroupNames.BUGS_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index b159e8e3..9731fe8e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -29,7 +29,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME;
+        return JSGroupNames.BUGS_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
index d074ac92..eb1ecf94 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
@@ -28,7 +28,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME;
+        return JSGroupNames.BUGS_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index e3909748..7aeeff5d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -24,7 +24,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME;
+        return JSGroupNames.BUGS_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index 5e589a5f..bd7ad3c9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -24,7 +24,7 @@ public String getDisplayName(){
     @Override
     @Nonnull
     public String getGroupDisplayName(){
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index 76599fe4..739d817f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
index 4574b1ec..329d273f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
@@ -21,7 +21,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
index 6ce167b4..476c4e0a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index 637dfebc..b5b176d4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -30,7 +30,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.CONFUSING_GROUP_NAME;
+		return JSGroupNames.CONFUSING_GROUP_NAME.get();
 	}
 
 	@RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index 28a8a25f..c30c9fbd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -28,7 +28,7 @@ public class ConfusingFloatingPointLiteralJSInspection extends JavaScriptInspect
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index db9ec79b..65c1031e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -26,7 +26,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 044291a9..6ba53895 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -25,7 +25,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index 102e0b2e..cd394f19 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -31,7 +31,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.CONFUSING_GROUP_NAME;
+		return JSGroupNames.CONFUSING_GROUP_NAME.get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index d10d8254..096e8cbb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -24,7 +24,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index be08800c..b7e669be 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -46,7 +46,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index bbf64a2f..11b3e6de 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -34,7 +34,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index be015db5..bf061fe3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -37,7 +37,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
index ac40b022..01093511 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index 8f6fbf60..14f2a4ea 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -28,7 +28,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.CONFUSING_GROUP_NAME;
+		return JSGroupNames.CONFUSING_GROUP_NAME.get();
 	}
 
 	@RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index d3098271..dd3465e5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
index 2e258e51..e511953e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
@@ -30,7 +30,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.CONFUSING_GROUP_NAME;
+		return JSGroupNames.CONFUSING_GROUP_NAME.get();
 	}
 
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
index 076f060d..9960e2ce 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
@@ -30,7 +30,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.CONFUSING_GROUP_NAME;
+		return JSGroupNames.CONFUSING_GROUP_NAME.get();
 	}
 
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
index 89ea75c6..6d562ef0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
@@ -35,7 +35,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
index a93405a6..9c718127 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
@@ -39,7 +39,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
index 2d2579d2..4b67ebb8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
@@ -2,46 +2,45 @@
 
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class VoidExpressionJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("void.expression.display.name");
+        return InspectionJSLocalize.voidExpressionDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("void.expression.error.string");
+        return InspectionJSLocalize.voidExpressionErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSPrefixExpression(JSPrefixExpression expression) {
+        @Override
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             final PsiElement firstChild = expression.getFirstChild();
             if(firstChild == null)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
index f1838b75..943d63eb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
@@ -2,45 +2,43 @@
 
 import com.intellij.lang.javascript.psi.JSWithStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class WithStatementJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("with.statement.display.name");
+        return InspectionJSLocalize.withStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME;
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("with.expression.error.string");
+        return InspectionJSLocalize.withExpressionErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSWithStatement(@Nonnull JSWithStatement statement) {
+        @Override
+        public void visitJSWithStatement(@Nonnull JSWithStatement statement) {
             super.visitJSWithStatement(statement);
             registerStatementError(statement);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
index 349e8917..96b335bc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
index 70dd6321..8c46d114 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
@@ -21,7 +21,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
index e4acf517..f1dd5375 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
@@ -29,7 +29,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
index e334e535..454da65b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
@@ -21,7 +21,7 @@ public class ConstantConditionalExpressionJSInspection extends JavaScriptInspect
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
index cc02f2a1..30110186 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
@@ -28,7 +28,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
index f74f71bc..7f666f83 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
@@ -23,7 +23,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
index 750d9e81..fe810264 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
@@ -21,7 +21,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index 1f6ff470..05d7ea5d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -16,7 +16,7 @@ public class DefaultNotLastCaseInSwitchJSInspection extends JavaScriptInspection
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
index 60215888..0c6644d4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
@@ -28,7 +28,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
index 08d4538d..14276956 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
@@ -25,7 +25,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
index f1309842..a98f2b71 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
@@ -40,7 +40,7 @@ public String getID()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+		return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
 	}
 
 	@RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
index 46cfa7ac..6eb6e85e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
@@ -20,7 +20,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME;
+        return JSGroupNames.BUGS_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
index 990e32f4..c8ee89f0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
@@ -29,7 +29,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
index 87a8942d..9143eaaa 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
@@ -26,7 +26,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+		return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
 	}
 
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
index 619ccaad..c2952f68 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
index 93f5bd3c..a927aab4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
@@ -21,7 +21,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
index 3ecc7cf0..e9070b90 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
index d789ea2b..71701535 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
index 48432219..b26d2c19 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
@@ -16,7 +16,7 @@ public class TailRecursionJSInspection extends JavaScriptInspection {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
index 1a70959a..cd87e5f1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
@@ -37,7 +37,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
index f552b298..2b9d22f8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
@@ -41,7 +41,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
index 99d122e5..a51a7dfd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
@@ -28,7 +28,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
index b1104809..46447904 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
@@ -25,7 +25,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
index b6b66f3a..468c23d3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
@@ -4,7 +4,11 @@
 import com.intellij.lang.javascript.psi.JSLoopStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -12,81 +16,75 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class UnnecessaryLabelOnBreakStatementJSInspection extends JavaScriptInspection {
-    private final UnnecessaryLabelOnBreakStatementFix fix =
-            new UnnecessaryLabelOnBreakStatementFix();
+    private final UnnecessaryLabelOnBreakStatementFix fix = new UnnecessaryLabelOnBreakStatementFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("unnecessary.label.on.break.statement.display.name");
+        return InspectionJSLocalize.unnecessaryLabelOnBreakStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class UnnecessaryLabelOnBreakStatementFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("remove.label.fix");
+            return InspectionJSLocalize.removeLabelFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement breakKeywordElement = descriptor.getPsiElement();
-            final JSBreakStatement breakStatement =
-                    (JSBreakStatement) breakKeywordElement.getParent();
+            final JSBreakStatement breakStatement = (JSBreakStatement) breakKeywordElement.getParent();
             replaceStatement(breakStatement, "break;");
         }
     }
+
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("unnecessary.label.on.break.error.string");
+        return InspectionJSLocalize.unnecessaryLabelOnBreakErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
+        @Override
+        public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (statement.getLabel() == null) {
                 return;
             }
             final JSStatement statementToBreak = statement.getStatementToBreak();
-            if(statementToBreak == null)
-            {
+            if (statementToBreak == null) {
                 return;
             }
-            final JSStatement containingStatement =
-                    PsiTreeUtil.getParentOfType(statement, JSLoopStatement.class,
-                            JSSwitchStatement.class);
-            if(containingStatement == null)
-            {
+            final JSStatement containingStatement = PsiTreeUtil.getParentOfType(statement, JSLoopStatement.class, JSSwitchStatement.class);
+            if (containingStatement == null) {
                 return;
             }
             final PsiElement parent = containingStatement.getParent();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
index 8b3ab4b5..5ef4c212 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
@@ -3,7 +3,11 @@
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.intellij.lang.javascript.psi.JSLoopStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -11,85 +15,79 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class UnnecessaryLabelOnContinueStatementJSInspection extends JavaScriptInspection {
-    private final UnnecessaryLabelOnContinueStatementFix fix =
-            new UnnecessaryLabelOnContinueStatementFix();
+    private final UnnecessaryLabelOnContinueStatementFix fix = new UnnecessaryLabelOnContinueStatementFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("unnecessary.label.on.continue.statement.display.name");
+        return InspectionJSLocalize.unnecessaryLabelOnContinueStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("unnecessary.label.on.continue.error.string");
+        return InspectionJSLocalize.unnecessaryLabelOnContinueErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class UnnecessaryLabelOnContinueStatementFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("remove.label.fix");
+            return InspectionJSLocalize.removeLabelFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement continueKeywordElement = descriptor.getPsiElement();
-            final JSContinueStatement continueStatement =
-                    (JSContinueStatement) continueKeywordElement.getParent();
+            final JSContinueStatement continueStatement = (JSContinueStatement) continueKeywordElement.getParent();
             replaceStatement(continueStatement, "continue;");
         }
     }
-    private static class Visitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             if (statement.getLabel() == null) {
                 return;
             }
             final JSStatement statementToContinue = statement.getStatementToContinue();
-            if(statementToContinue == null)
-            {
+            if (statementToContinue == null) {
                 return;
             }
             final JSLoopStatement containingLoop = PsiTreeUtil.getParentOfType(statement, JSLoopStatement.class);
-            if(containingLoop == null)
-            {
+            if (containingLoop == null) {
                 return;
             }
             final PsiElement parent = containingLoop.getParent();
-            if(!statementToContinue.equals(parent))
-            {
+            if (!statementToContinue.equals(parent)) {
                 return;
             }
             registerStatementError(statement);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
index dc21bac3..1d20dbb3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
@@ -1,7 +1,11 @@
 package com.sixrr.inspectjs.control;
 
 import com.intellij.lang.javascript.psi.*;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
@@ -17,54 +21,53 @@ public class  UnnecessaryReturnJSInspection extends JavaScriptInspection {
     private final UnnecessaryReturnFix fix = new UnnecessaryReturnFix();
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getID() {
         return "UnnecessaryReturnStatementJS";
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("unnecessary.return.statement.display.name");
+        return InspectionJSLocalize.unnecessaryReturnStatementDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("unnecessary.return.error.string");
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.unnecessaryReturnErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new UnnecessaryReturnVisitor();
     }
 
     @Override
-	public InspectionJSFix buildFix(PsiElement location, Object state) {
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
         return fix;
     }
 
     private static class UnnecessaryReturnFix extends InspectionJSFix {
         @Override
-		@Nonnull
+        @Nonnull
         public String getName() {
-            return InspectionJSBundle.message("remove.unnecessary.return.fix");
+            return InspectionJSLocalize.removeUnnecessaryReturnFix().get();
         }
 
         @Override
-		public void doFix(Project project, ProblemDescriptor descriptor)
-                throws IncorrectOperationException {
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement returnKeywordElement = descriptor.getPsiElement();
             final PsiElement returnStatement = returnKeywordElement.getParent();
             assert returnStatement != null;
@@ -73,8 +76,8 @@ public void doFix(Project project, ProblemDescriptor descriptor)
     }
 
     private static class UnnecessaryReturnVisitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSReturnStatement(@Nonnull JSReturnStatement statement) {
+        @Override
+        public void visitJSReturnStatement(@Nonnull JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
 
             final JSExpression returnValue = statement.getExpression();
@@ -82,8 +85,7 @@ private static class UnnecessaryReturnVisitor extends BaseInspectionVisitor {
             {
                 return;
             }
-            final JSFunction function =
-                    PsiTreeUtil.getParentOfType(statement, JSFunction.class);
+            final JSFunction function = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
             if (function == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index f2cf294b..c41be56a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -29,7 +29,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.DATA_FLOW_ISSUES;
+		return JSGroupNames.DATA_FLOW_ISSUES.get();
 	}
 
 	@RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index cfa3e6d4..88706ac7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -5,6 +5,7 @@
 import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
@@ -21,15 +22,14 @@ public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message(
-				"redundant.local.variable.display.name");
+		return InspectionJSLocalize.redundantLocalVariableDisplayName().get();
 	}
 
 	@Override
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.DATA_FLOW_ISSUES;
+		return JSGroupNames.DATA_FLOW_ISSUES.get();
 	}
 
 	@Nonnull
@@ -50,8 +50,7 @@ public boolean isEnabledByDefault()
 	@Nonnull
 	public String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message(
-				"unnecessary.local.variable.problem.descriptor");
+		return InspectionJSLocalize.unnecessaryLocalVariableProblemDescriptor().get();
 	}
 
 	@Override
@@ -75,7 +74,6 @@ public void visitJSVarStatement(@Nonnull JSVarStatement varStatement)
 			final JSVariable[] variables = varStatement.getVariables();
 			for(JSVariable variable : variables)
 			{
-
 				if(isCopyVariable(variable))
 				{
 					registerVariableError(variable);
@@ -121,8 +119,7 @@ private boolean isCopyVariable(JSVariable variable)
 			{
 				return false;
 			}
-			final JSBlockStatement containingScope =
-					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
 			if(containingScope == null || isClassMember(referent))
 			{
 				return false;
@@ -135,8 +132,7 @@ private boolean isCopyVariable(JSVariable variable)
 				return false;
 			}
 			final JSVariable initialization = (JSVariable) referent;
-			final VariableAssignedVisitor visitor2 =
-					new VariableAssignedVisitor(initialization);
+			final VariableAssignedVisitor visitor2 = new VariableAssignedVisitor(initialization);
 			containingScope.accept(visitor2);
 			if(visitor2.isAssigned())
 			{
@@ -154,8 +150,7 @@ private boolean isClassMember(final PsiElement referent)
 
 		private boolean isImmediatelyReturned(JSVariable variable)
 		{
-			final JSBlockStatement containingScope =
-					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
 			if(containingScope == null)
 			{
 				return false;
@@ -184,8 +179,7 @@ private boolean isImmediatelyReturned(JSVariable variable)
 			{
 				return false;
 			}
-			final JSReturnStatement returnStatement =
-					(JSReturnStatement) nextStatement;
+			final JSReturnStatement returnStatement = (JSReturnStatement) nextStatement;
 			final JSExpression returnValue = returnStatement.getExpression();
 			if(returnValue == null)
 			{
@@ -201,15 +195,12 @@ private boolean isImmediatelyReturned(JSVariable variable)
 
 		private boolean isImmediatelyThrown(JSVariable variable)
 		{
-			final JSBlockStatement containingScope =
-					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
 			if(containingScope == null)
 			{
 				return false;
 			}
-			final JSVarStatement declarationStatement =
-					PsiTreeUtil.getParentOfType(variable,
-							JSVarStatement.class);
+			final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
 			if(declarationStatement == null)
 			{
 				return false;
@@ -231,8 +222,7 @@ private boolean isImmediatelyThrown(JSVariable variable)
 			{
 				return false;
 			}
-			final JSThrowStatement throwStatement =
-					(JSThrowStatement) nextStatement;
+			final JSThrowStatement throwStatement = (JSThrowStatement) nextStatement;
 			final JSExpression returnValue = throwStatement.getExpression();
 			if(returnValue == null)
 			{
@@ -248,15 +238,12 @@ private boolean isImmediatelyThrown(JSVariable variable)
 
 		private boolean isImmediatelyAssigned(JSVariable variable)
 		{
-			final JSBlockStatement containingScope =
-					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
 			if(containingScope == null)
 			{
 				return false;
 			}
-			final JSVarStatement declarationStatement =
-					PsiTreeUtil.getParentOfType(variable,
-							JSVarStatement.class);
+			final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
 			if(declarationStatement == null)
 			{
 				return false;
@@ -280,16 +267,13 @@ private boolean isImmediatelyAssigned(JSVariable variable)
 			{
 				return false;
 			}
-			final JSExpressionStatement expressionStatement =
-					(JSExpressionStatement) nextStatement;
-			final JSExpression expression =
-					expressionStatement.getExpression();
+			final JSExpressionStatement expressionStatement = (JSExpressionStatement) nextStatement;
+			final JSExpression expression = expressionStatement.getExpression();
 			if(!(expression instanceof JSAssignmentExpression))
 			{
 				return false;
 			}
-			final JSAssignmentExpression assignmentExpression =
-					(JSAssignmentExpression) expression;
+			final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) expression;
 			final JSExpression rhs = assignmentExpression.getROperand();
 			if(rhs == null)
 			{
@@ -299,8 +283,7 @@ private boolean isImmediatelyAssigned(JSVariable variable)
 			{
 				return false;
 			}
-			final JSReferenceExpression reference =
-					(JSReferenceExpression) rhs;
+			final JSReferenceExpression reference = (JSReferenceExpression) rhs;
 			final PsiElement referent = reference.resolve();
 			if(referent == null || !referent.equals(variable))
 			{
@@ -313,8 +296,7 @@ private boolean isImmediatelyAssigned(JSVariable variable)
 			}
 			for(int i = followingStatementNumber; i < statements.length; i++)
 			{
-				if(VariableAccessUtils.variableIsUsed(variable,
-						statements[i]))
+				if(VariableAccessUtils.variableIsUsed(variable, statements[i]))
 				{
 					return false;
 				}
@@ -322,18 +304,14 @@ private boolean isImmediatelyAssigned(JSVariable variable)
 			return true;
 		}
 
-		private boolean isImmediatelyAssignedAsDeclaration(
-				JSVariable variable)
+		private boolean isImmediatelyAssignedAsDeclaration(JSVariable variable)
 		{
-			final JSBlockStatement containingScope =
-					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
 			if(containingScope == null)
 			{
 				return false;
 			}
-			final JSVarStatement declarationStatement =
-					PsiTreeUtil.getParentOfType(variable,
-							JSVarStatement.class);
+			final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
 			if(declarationStatement == null)
 			{
 				return false;
@@ -357,15 +335,13 @@ private boolean isImmediatelyAssignedAsDeclaration(
 			{
 				return false;
 			}
-			final JSVarStatement declaration =
-					(JSVarStatement) nextStatement;
+			final JSVarStatement declaration = (JSVarStatement) nextStatement;
 			final JSVariable[] declarations = declaration.getVariables();
 			if(declarations.length != 1)
 			{
 				return false;
 			}
-			final JSExpression rhs =
-					declarations[0].getInitializer();
+			final JSExpression rhs = declarations[0].getInitializer();
 			if(rhs == null)
 			{
 				return false;
@@ -381,8 +357,7 @@ private boolean isImmediatelyAssignedAsDeclaration(
 			}
 			for(int i = followingStatementNumber; i < statements.length; i++)
 			{
-				if(VariableAccessUtils.variableIsUsed(variable,
-						statements[i]))
+				if(VariableAccessUtils.variableIsUsed(variable, statements[i]))
 				{
 					return false;
 				}
@@ -390,8 +365,7 @@ private boolean isImmediatelyAssignedAsDeclaration(
 			return true;
 		}
 
-		private boolean variableIsUsedInInnerFunction(JSBlockStatement block,
-													  JSVariable variable)
+		private boolean variableIsUsedInInnerFunction(JSBlockStatement block, JSVariable variable)
 		{
 			final VariableUsedInInnerFunctionVisitor visitor = new VariableUsedInInnerFunctionVisitor(variable);
 			block.accept(visitor);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index ea123f44..9d371f8a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -26,7 +26,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.DOM_GROUP_NAME;
+        return JSGroupNames.DOM_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index 2b52ebfc..c189fc65 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -21,7 +21,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.DOM_GROUP_NAME;
+        return JSGroupNames.DOM_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index 344990a9..2891d364 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.DOM_GROUP_NAME;
+        return JSGroupNames.DOM_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
index a044ec8f..0634f694 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
@@ -3,39 +3,37 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class XHTMLIncompatabilitiesJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("xhtml.incompatibilities.display.name");
+        return InspectionJSLocalize.xhtmlIncompatibilitiesDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.DOM_GROUP_NAME;
+        return JSGroupNames.DOM_GROUP_NAME.get();
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("xhtml.incompatabilities.error.string");
+        return InspectionJSLocalize.xhtmlIncompatabilitiesErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
index 5857e0b2..89a3366c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
@@ -23,7 +23,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index cf575d27..5488f623 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -25,7 +25,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
index 593bacb1..a23d13c3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
@@ -23,7 +23,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index 2855d572..13fb461a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -23,7 +23,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index 8faa83a5..a6b902fc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -26,7 +26,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
index 05879706..5c3cb01f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
@@ -27,7 +27,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
index 403a6fc8..cd5a42bb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
@@ -27,7 +27,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
index 8f65e82f..84e74f8e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
@@ -5,15 +5,14 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -23,15 +22,14 @@ public class UnusedCatchParameterJSInspection extends JavaScriptInspection
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message(
-				"unused.catch.parameter.display.name");
+		return InspectionJSLocalize.unusedCatchParameterDisplayName().get();
 	}
 
 	@Override
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.ERRORHANDLING_GROUP_NAME;
+		return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
 	}
 
 	@Nonnull
@@ -46,8 +44,7 @@ public InspectionToolState<?> createStateProvider()
 	@Nonnull
 	protected String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message(
-				"unused.catch.parameter.problem.descriptor");
+		return InspectionJSLocalize.unusedCatchParameterProblemDescriptor().get();
 	}
 
 	@Override
@@ -58,7 +55,6 @@ public BaseInspectionVisitor buildVisitor()
 
 	private class EmptyCatchBlockVisitor extends BaseInspectionVisitor<UnusedCatchParameterJSInspectionState>
 	{
-
 		@Override
 		public void visitJSTryStatement(@Nonnull JSTryStatement statement)
 		{
@@ -95,8 +91,7 @@ private void checkCatchSection(JSCatchBlock section)
 					}
 				}
 			}
-			final CatchParameterUsedVisitor visitor =
-					new CatchParameterUsedVisitor(param);
+			final CatchParameterUsedVisitor visitor = new CatchParameterUsedVisitor(param);
 			block.accept(visitor);
 			if(!visitor.isUsed())
 			{
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index d8b043f1..17c41055 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -33,7 +33,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
 	}
 
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index 51821b91..23b4cc0d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -22,7 +22,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index a04d5687..faff94dc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -32,7 +32,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
 	}
 
 	@RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index 3abd5190..fc2448c6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -32,7 +32,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
 	}
 
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index ec48c69f..58656d09 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -34,7 +34,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
 	}
 
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index 65e1cf21..3091ffce 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -33,7 +33,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
 	}
 
 	@Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index 3d319b7b..c523582f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -28,7 +28,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index 70516e96..e0751bda 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -42,7 +42,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
+		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index a2213e74..c07480ec 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -35,7 +35,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
+		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index bdfdbc63..696ad7f1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -44,7 +44,7 @@ public InspectionToolState<?> createStateProvider()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
+		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index 376cc56d..aee85d6f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -28,7 +28,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME;
+        return JSGroupNames.STYLE_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index 677f419f..ef2f1183 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -25,7 +25,7 @@ public boolean isEnabledByDefault()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.STYLE_GROUP_NAME;
+		return JSGroupNames.STYLE_GROUP_NAME.get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index fcaa58f8..28e554e3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -35,7 +35,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME;
+        return JSGroupNames.STYLE_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index 43ca4ecf..26083608 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -37,7 +37,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME;
+        return JSGroupNames.STYLE_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index 83f37bc6..a22ccdfe 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -25,7 +25,7 @@ public boolean isEnabledByDefault()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.STYLE_GROUP_NAME;
+		return JSGroupNames.STYLE_GROUP_NAME.get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
index 366a0606..81b82d4f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
@@ -27,7 +27,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME;
+        return JSGroupNames.STYLE_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index cb1499f7..8bb4904b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -1,7 +1,11 @@
 package com.sixrr.inspectjs.style;
 
 import com.intellij.lang.javascript.psi.*;
-import com.sixrr.inspectjs.*;
+import com.sixrr.inspectjs.BaseInspectionVisitor;
+import com.sixrr.inspectjs.InspectionJSFix;
+import com.sixrr.inspectjs.JSGroupNames;
+import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -13,7 +17,6 @@
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTagChild;
 import jakarta.annotation.Nonnull;
-
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
@@ -31,14 +34,14 @@ public boolean isEnabledByDefault()
 	@Nonnull
 	public String getDisplayName()
 	{
-		return InspectionJSBundle.message("unterminated.statement.display.name");
+		return InspectionJSLocalize.unterminatedStatementDisplayName().get();
 	}
 
 	@Override
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.STYLE_GROUP_NAME;
+		return JSGroupNames.STYLE_GROUP_NAME.get();
 	}
 
 	@RequiredReadAction
@@ -46,7 +49,7 @@ public String getGroupDisplayName()
 	@Nullable
 	protected String buildErrorString(Object state, Object... args)
 	{
-		return InspectionJSBundle.message("unterminated.statement.error.string");
+		return InspectionJSLocalize.unterminatedStatementErrorString().get();
 	}
 
 	@Override
@@ -67,7 +70,7 @@ private static class TerminateStatementFix extends InspectionJSFix
 		@Nonnull
 		public String getName()
 		{
-			return InspectionJSBundle.message("terminate.statement.fix");
+			return InspectionJSLocalize.terminateStatementFix().get();
 		}
 
 		@Override
@@ -89,7 +92,6 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
 
 	private static class Visitor extends BaseInspectionVisitor
 	{
-
 		@Override
 		public void visitJSExpressionStatement(JSExpressionStatement statement)
 		{
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index 2564d85a..8a1a3f0a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -34,7 +34,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.VALIDITY_GROUP_NAME;
+		return JSGroupNames.VALIDITY_GROUP_NAME.get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
index bfceb191..0939d572 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
@@ -24,7 +24,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME;
+        return JSGroupNames.VALIDITY_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index 32b7b889..31162f5f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -27,7 +27,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME;
+        return JSGroupNames.VALIDITY_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index feb3a510..ceeb3bc9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -23,7 +23,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME;
+        return JSGroupNames.VALIDITY_GROUP_NAME.get();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index a36d628c..a5014a89 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -31,7 +31,7 @@ public String getDisplayName()
 	@Nonnull
 	public String getGroupDisplayName()
 	{
-		return JSGroupNames.VALIDITY_GROUP_NAME;
+		return JSGroupNames.VALIDITY_GROUP_NAME.get();
 	}
 
 	@Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index 4f8b0aed..bb46f3d0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -21,7 +21,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME;
+        return JSGroupNames.VALIDITY_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index 20e58f61..0bc602d1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -27,7 +27,7 @@ public String getDisplayName() {
     @Override
     @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME;
+        return JSGroupNames.VALIDITY_GROUP_NAME.get();
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
index beff78f7..9fceed01 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
@@ -3,60 +3,56 @@
 import com.intellij.lang.javascript.psi.JSBlockStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
+import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class UnreachableCodeJSInspection extends JavaScriptInspection {
-
     @Override
-	@Nonnull
+    @Nonnull
     public String getDisplayName() {
-        return InspectionJSBundle.message("unreachable.code.display.name");
+        return InspectionJSLocalize.unreachableCodeDisplayName().get();
     }
 
     @Override
-	@Nonnull
+    @Nonnull
     public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME;
+        return JSGroupNames.VALIDITY_GROUP_NAME.get();
     }
 
     @Override
-	public boolean isEnabledByDefault() {
+    public boolean isEnabledByDefault() {
         return true;
     }
 
     @RequiredReadAction
-	@Override
-	@Nullable
+    @Override
+    @Nullable
     protected String buildErrorString(Object state, Object... args) {
-        return InspectionJSBundle.message("unreachable.code.error.string");
+        return InspectionJSLocalize.unreachableCodeErrorString().get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        
         //TODO: this doesn't work at the top level
-        @Override public void visitJSBlock(JSBlockStatement statement) {
+        @Override
+        public void visitJSBlock(JSBlockStatement statement) {
             super.visitJSBlock(statement);
             final JSStatement[] statements = statement.getStatements();
             for (int i = 0; i < statements.length-1; i++) {
-                if(!ControlFlowUtils.statementMayCompleteNormally(statements[i]))
-                {
+                if (!ControlFlowUtils.statementMayCompleteNormally(statements[i])) {
                     registerStatementError(statements[i+1]);
                 }
-
             }
         }
     }

From 8eb83a3c57d9db94d03d06cdba78db592df75fb0 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 15 Jul 2024 21:12:56 +0300
Subject: [PATCH 197/340] Inlining JSIntention.getSuffixedDisplayName() and
 JSIntention.getText(Object...).

---
 .../idea/lang/javascript/intention/JSIntention.java | 13 +------------
 .../intention/bool/JSDeMorgansLawIntention.java     |  8 +++++---
 .../intention/bool/JSFlipComparisonIntention.java   | 13 +++++++------
 .../intention/bool/JSFlipConjunctionIntention.java  |  5 +++--
 .../intention/bool/JSNegateComparisonIntention.java | 12 ++++--------
 .../bool/JSRemoveBooleanEqualityIntention.java      |  8 ++++----
 .../intention/braces/JSAddBracesIntention.java      |  8 ++++----
 .../intention/braces/JSRemoveBracesIntention.java   |  8 ++++----
 .../constant/JSConstantSubexpressionIntention.java  |  5 +++--
 .../increment/JSExtractIncrementIntention.java      |  8 ++++----
 .../number/JSReplaceMultiplyWithShiftIntention.java |  9 +++++++--
 .../number/JSReplaceShiftWithMultiplyIntention.java |  9 +++++++--
 .../JSReplaceWithOperatorAssignmentIntention.java   |  5 +++--
 13 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index ea2bbc8b..50592ffc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -24,10 +24,9 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlElement;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import org.jetbrains.annotations.NonNls;
 
 public abstract class JSIntention extends PsiElementBaseIntentionAction {
   private static final String INTENTION_SUFFIX = "Intention";
@@ -101,14 +100,4 @@ protected String getTextKey(@NonNls Object... suffixes) {
   public String getText() {
     return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME));
   }
-
-  @SuppressWarnings({"UnresolvedPropertyKey"})
-  public String getText(@NonNls Object... arguments) {
-    return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME), arguments);
-  }
-
-  @SuppressWarnings({"UnresolvedPropertyKey"})
-  protected String getSuffixedDisplayName(@NonNls String suffix, @NonNls Object... arguments) {
-    return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME, '.', suffix), arguments);
-  }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 67590497..c4024d4f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -24,14 +24,14 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSDeMorgansLawIntention", categories = {
 		"JavaScript",
@@ -53,7 +53,9 @@ protected String getTextForElement(PsiElement element)
 	{
 		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
 
-		return this.getSuffixedDisplayName(tokenType.equals(JSTokenTypes.ANDAND) ? AND_SUFFIX : OR_SUFFIX);
+		return tokenType.equals(JSTokenTypes.ANDAND)
+				? JSIntentionBundle.message("bool.de-morgans-law.display-name.ANDAND")
+				: JSIntentionBundle.message("bool.de-morgans-law.display-name.OROR");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 94748537..68c52502 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -42,23 +43,23 @@ public String getTextForElement(PsiElement element)
 		String operatorText = null;
 		String flippedOperatorText = null;
 
-		if(exp != null)
+		if (exp != null)
 		{
 			operatorText = ComparisonUtils.getOperatorText(exp.getOperationSign());
 			flippedOperatorText = ComparisonUtils.getFlippedOperatorText(exp.getOperationSign());
 		}
 
-		if(exp == null)
+		if (exp == null)
 		{
-			return this.getSuffixedDisplayName("unknown");
+			return JSIntentionBundle.message("bool.flip-comparison.display-name.unknown");
 		}
-		else if(operatorText.equals(flippedOperatorText))
+		else if (operatorText.equals(flippedOperatorText))
 		{
-			return this.getSuffixedDisplayName("equals", operatorText);
+			return JSIntentionBundle.message("bool.flip-comparison.display-name.equals", operatorText);
 		}
 		else
 		{
-			return this.getSuffixedDisplayName("not-equals", operatorText, flippedOperatorText);
+			return JSIntentionBundle.message("bool.flip-comparison.display-name.not-equals", operatorText, flippedOperatorText);
 		}
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 2317d749..efe30754 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -42,8 +43,8 @@ protected String getTextForElement(PsiElement element)
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
 		final IElementType sign = binaryExpression.getOperationSign();
 
-		return this.getText(BinaryOperatorUtils.getOperatorText(sign));
-	}
+		return JSIntentionBundle.message("bool.flip-conjunction.display-name", BinaryOperatorUtils.getOperatorText(sign));
+  }
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index 6664739f..2cfc0455 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -50,14 +51,9 @@ public String getTextForElement(PsiElement element)
 			negatedOperatorText = ComparisonUtils.getNegatedOperatorText(sign);
 		}
 
-		if(operatorText.equals(negatedOperatorText))
-		{
-			return this.getSuffixedDisplayName("equals", operatorText);
-		}
-		else
-		{
-			return this.getSuffixedDisplayName("not-equals", operatorText, negatedOperatorText);
-		}
+		return operatorText.equals(negatedOperatorText)
+			? JSIntentionBundle.message("bool.negate-comparison.display-name.equals", operatorText)
+			: JSIntentionBundle.message("bool.negate-comparison.display-name.not-equals", operatorText, negatedOperatorText);
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index b5e54f06..7c399772 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -23,15 +23,15 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSRemoveBooleanEqualityIntention", categories = {
 		"JavaScript",
@@ -44,8 +44,8 @@ protected String getTextForElement(PsiElement element)
 	{
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
 
-		return this.getText(BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign()));
-	}
+		return JSIntentionBundle.message("bool.remove-boolean-equality.display-name", BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign()));
+  }
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index ea715b5c..8ed525a3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -21,13 +21,13 @@
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSAddBracesIntention", categories = {
 		"JavaScript",
@@ -71,8 +71,8 @@ protected String getTextForElement(PsiElement element)
 			keyword = firstChild.getText();
 		}
 
-		return this.getText(keyword);
-	}
+		return JSIntentionBundle.message("braces.add-braces.display-name", keyword);
+  }
 
 	@Override
 	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index 6bbec666..6408694c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
@@ -70,12 +71,11 @@ protected String getTextForElement(PsiElement element)
 			keyword = keywordChild.getText();
 		}
 
-		return this.getText(keyword);
-	}
+		return JSIntentionBundle.message("braces.remove-braces.display-name", keyword);
+  }
 
 	@Override
-	protected void processIntention(@Nonnull PsiElement element)
-			throws IncorrectOperationException
+	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSBlockStatement blockStatement = (JSBlockStatement) element;
 		final JSStatement[] statements = blockStatement.getStatements();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index 01e645da..95362b02 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -27,6 +27,7 @@
 import consulo.util.lang.StringUtil;
 import jakarta.annotation.Nullable;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
@@ -71,8 +72,8 @@ protected String getTextForElement(PsiElement element)
 		assert (rhs != null);
 		assert (leftSide != null);
 
-		return this.getText(leftSide.getText(), BinaryOperatorUtils.getOperatorText(operationSign), rhs.getText());
-	}
+		return JSIntentionBundle.message("constant.constant-subexpression.display-name", leftSide.getText(),BinaryOperatorUtils.getOperatorText(operationSign),rhs.getText());
+  }
 
 	@Override
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index d23d2e82..2245312c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -21,12 +21,12 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(ignoreId = "JSExtractIncrementIntention", categories = {
 		"JavaScript",
@@ -37,8 +37,8 @@ public class JSExtractIncrementIntention extends JSMutablyNamedIntention
 	@Override
 	public String getTextForElement(PsiElement element)
 	{
-		return this.getText(BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
-	}
+		return JSIntentionBundle.message("increment.extract-increment.display-name", BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
+  }
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index 64bb725e..c70e69e4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -23,6 +23,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -52,8 +53,12 @@ protected String getTextForElement(PsiElement element)
 			operatorString = (tokenType.equals(JSTokenTypes.MULT) ? "<<" : ">>");
 		}
 
-		return this.getText(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
-	}
+		return JSIntentionBundle.message(
+			"number.replace-multiply-with-shift.display-name",
+			BinaryOperatorUtils.getOperatorText(tokenType),
+			operatorString
+		);
+  }
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index 28a236d0..bf15b4fa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -51,8 +52,12 @@ protected String getTextForElement(PsiElement element)
 			operatorString = (tokenType.equals(JSTokenTypes.LTLT) ? "*" : "/");
 		}
 
-		return this.getText(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
-	}
+		return JSIntentionBundle.message(
+			"number.replace-shift-with-multiply.display-name",
+			BinaryOperatorUtils.getOperatorText(tokenType),
+			operatorString
+		);
+  }
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index 77035391..21988941 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -27,6 +27,7 @@
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
 
@@ -45,8 +46,8 @@ public String getTextForElement(PsiElement element)
 		assert (rhs != null);
 		final IElementType sign = rhs.getOperationSign();
 
-		return this.getText(BinaryOperatorUtils.getOperatorText(sign));
-	}
+		return JSIntentionBundle.message("opassign.replace-with-operator-assignment.display-name", BinaryOperatorUtils.getOperatorText(sign));
+  }
 
 	@Override
 	@Nonnull

From 9287d8c87cab19436a4cf971d55d74cae0329741 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Tue, 16 Jul 2024 01:03:36 +0300
Subject: [PATCH 198/340] Intention classes refactoring.

---
 .../bool/JSDeMorgansLawIntention.java         |  42 ++--
 .../bool/JSFlipComparisonIntention.java       |  12 +-
 .../bool/JSFlipConjunctionIntention.java      |  37 ++-
 .../bool/JSNegateComparisonIntention.java     |  18 +-
 .../JSRemoveBooleanEqualityIntention.java     |  44 ++--
 .../braces/JSAddBracesIntention.java          |  41 ++--
 .../braces/JSRemoveBracesIntention.java       |  22 +-
 .../JSChangeToCStyleCommentIntention.java     |  59 ++---
 .../JSChangeToEndOfLineCommentIntention.java  |  37 ++-
 .../JSFlipConditionalIntention.java           |  26 +--
 .../JSConstantExpressionIntention.java        |  48 ++--
 .../JSConstantSubexpressionIntention.java     |  87 +++----
 .../JSExtractIncrementIntention.java          |  48 ++--
 ...DeclarationAndInitializationIntention.java |  35 +--
 .../JSConvertIntegerToDecimalIntention.java   |  17 +-
 .../JSConvertIntegerToHexIntention.java       |  19 +-
 .../JSConvertIntegerToOctalIntention.java     |  17 +-
 .../JSReplaceMultiplyWithShiftIntention.java  |  88 +++----
 .../JSReplaceShiftWithMultiplyIntention.java  |  83 +++----
 ...eplaceWithOperatorAssignmentIntention.java |  53 ++---
 ...JSDoubleToSingleQuotedStringIntention.java |  27 +--
 ...JSSingleToDoubleQuotedStringIntention.java |  28 +--
 .../JSReplaceSwitchWithIfIntention.java       | 215 ++++++++++--------
 .../trivialif/JSSimplifyIfElseIntention.java  |  38 ++--
 .../trivialif/JSSplitElseIfIntention.java     |  19 +-
 .../trivialif/JSSplitIfAndIntention.java      |  51 ++---
 .../trivialif/JSSplitIfOrIntention.java       |  53 ++---
 27 files changed, 565 insertions(+), 699 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index c4024d4f..a79dae7d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -33,28 +34,26 @@
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSDeMorgansLawIntention", categories = {
-		"JavaScript",
-		"Boolean"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSDeMorgansLawIntention",
+	categories = {"JavaScript", "Boolean"},
+	fileExtensions = "js"
+)
 public class JSDeMorgansLawIntention extends JSMutablyNamedIntention
 {
 	@NonNls
 	private static final String AND_OPERATOR = "&&";
 	@NonNls
 	private static final String OR_OPERATOR = "||";
-	@NonNls
-	private static final String AND_SUFFIX = "ANDAND";
-	@NonNls
-	private static final String OR_SUFFIX = "OROR";
 
 	@Override
+	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
 	{
 		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
 
 		return tokenType.equals(JSTokenTypes.ANDAND)
-				? JSIntentionBundle.message("bool.de-morgans-law.display-name.ANDAND")
+			? JSIntentionBundle.message("bool.de-morgans-law.display-name.ANDAND")
 				: JSIntentionBundle.message("bool.de-morgans-law.display-name.OROR");
 	}
 
@@ -72,7 +71,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final IElementType tokenType = exp.getOperationSign();
 		JSElement parent = (JSElement) exp.getParent();
 
-		while(isConjunctionExpression(parent, tokenType))
+		while (isConjunctionExpression(parent, tokenType))
 		{
 			exp = (JSBinaryExpression) parent;
 			assert (exp != null);
@@ -84,8 +83,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, newExpression);
 	}
 
-	private String convertConjunctionExpression(JSBinaryExpression exp,
-												IElementType tokenType)
+	private String convertConjunctionExpression(JSBinaryExpression exp, IElementType tokenType)
 	{
 		final String leftText = this.getOperandText(exp.getLOperand(), tokenType);
 		final String rightText = this.getOperandText(exp.getROperand(), tokenType);
@@ -96,22 +94,14 @@ private String convertConjunctionExpression(JSBinaryExpression exp,
 
 	private String getOperandText(JSExpression operand, IElementType tokenType)
 	{
-		return (isConjunctionExpression(operand, tokenType)
-				? this.convertConjunctionExpression((JSBinaryExpression) operand, tokenType)
-				: BoolUtils.getNegatedExpressionText(operand));
+		return isConjunctionExpression(operand, tokenType)
+			? this.convertConjunctionExpression((JSBinaryExpression) operand, tokenType)
+			: BoolUtils.getNegatedExpressionText(operand);
 	}
 
-	private static boolean isConjunctionExpression(JSElement exp,
-												   IElementType conjunctionType)
+	@RequiredReadAction
+	private static boolean isConjunctionExpression(JSElement exp, IElementType conjunctionType)
 	{
-		if(!(exp instanceof JSBinaryExpression))
-		{
-			return false;
-		}
-
-		final JSBinaryExpression binaryExpression = (JSBinaryExpression) exp;
-		final IElementType tokenType = binaryExpression.getOperationSign();
-
-		return tokenType.equals(conjunctionType);
+		return exp instanceof JSBinaryExpression binaryExpression && binaryExpression.getOperationSign().equals(conjunctionType);
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 68c52502..157fdaf6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -17,6 +17,7 @@
 
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -30,13 +31,15 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSFlipComparisonIntention", categories = {
-		"JavaScript",
-		"Boolean"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSFlipComparisonIntention",
+	categories = {"JavaScript", "Boolean"},
+	fileExtensions = "js"
+)
 public class JSFlipComparisonIntention extends JSMutablyNamedIntention
 {
 	@Override
+	@RequiredReadAction
 	public String getTextForElement(PsiElement element)
 	{
 		final JSBinaryExpression exp = (JSBinaryExpression) element;
@@ -71,6 +74,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSBinaryExpression exp = (JSBinaryExpression) element;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index efe30754..54f9bb7c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -18,6 +18,7 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -31,13 +32,15 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSFlipConjunctionIntention", categories = {
-		"JavaScript",
-		"Boolean"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSFlipConjunctionIntention",
+	categories = {"JavaScript", "Boolean"},
+	fileExtensions = "js"
+)
 public class JSFlipConjunctionIntention extends JSMutablyNamedIntention
 {
 	@Override
+	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
 	{
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
@@ -54,6 +57,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
@@ -62,7 +66,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final IElementType sign = binaryExpression.getOperationSign();
 		JSElement parent = (JSElement) exp.getParent();
 
-		while(isConjunctionExpression(parent, sign))
+		while (isConjunctionExpression(parent, sign))
 		{
 			exp = (JSExpression) parent;
 			assert (exp != null);
@@ -71,16 +75,16 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		JSElementFactory.replaceExpression(exp, this.flipExpression(exp, sign));
 	}
 
-	private String flipExpression(JSExpression exp,
-								  IElementType conjunctionType)
+	@RequiredReadAction
+	private String flipExpression(JSExpression exp, IElementType conjunctionType)
 	{
-		if(isConjunctionExpression(exp, conjunctionType))
+		if (isConjunctionExpression(exp, conjunctionType))
 		{
 			final JSBinaryExpression andExpression = (JSBinaryExpression) exp;
 
 			return this.flipExpression(andExpression.getROperand(), conjunctionType) + ' ' +
-					BinaryOperatorUtils.getOperatorText(conjunctionType) + ' ' +
-					this.flipExpression(andExpression.getLOperand(), conjunctionType);
+				BinaryOperatorUtils.getOperatorText(conjunctionType) + ' ' +
+				this.flipExpression(andExpression.getLOperand(), conjunctionType);
 		}
 		else
 		{
@@ -88,16 +92,9 @@ private String flipExpression(JSExpression exp,
 		}
 	}
 
-	private static boolean isConjunctionExpression(JSElement expression,
-												   IElementType conjunctionType)
+	@RequiredReadAction
+	private static boolean isConjunctionExpression(JSElement expression, IElementType conjunctionType)
 	{
-		if(!(expression instanceof JSBinaryExpression))
-		{
-			return false;
-		}
-
-		final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-
-		return binaryExpression.getOperationSign().equals(conjunctionType);
+		return expression instanceof JSBinaryExpression binaryExpression && binaryExpression.getOperationSign().equals(conjunctionType);
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index 2cfc0455..a13dcb06 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -17,6 +17,7 @@
 
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -30,20 +31,22 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSNegateComparisonIntention", categories = {
-		"JavaScript",
-		"Boolean"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSNegateComparisonIntention",
+	categories = {"JavaScript", "Boolean"},
+	fileExtensions = "js"
+)
 public class JSNegateComparisonIntention extends JSMutablyNamedIntention
 {
 	@Override
+	@RequiredReadAction
 	public String getTextForElement(PsiElement element)
 	{
 		final JSBinaryExpression expression = (JSBinaryExpression) element;
 		String operatorText = "";
 		String negatedOperatorText = "";
 
-		if(expression != null)
+		if (expression != null)
 		{
 			final IElementType sign = expression.getOperationSign();
 
@@ -64,6 +67,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSBinaryExpression exp = (JSBinaryExpression) element;
@@ -75,8 +79,6 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
 		assert (rhs != null);
 
-		JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, lhsText +
-				negatedOperator +
-				rhs.getText());
+		JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, lhsText + negatedOperator + rhs.getText());
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index 7c399772..d170f695 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -33,10 +33,11 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSRemoveBooleanEqualityIntention", categories = {
-		"JavaScript",
-		"Boolean"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSRemoveBooleanEqualityIntention",
+	categories = {"JavaScript", "Boolean"},
+	fileExtensions = "js"
+)
 public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention
 {
 	@Override
@@ -44,7 +45,10 @@ protected String getTextForElement(PsiElement element)
 	{
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
 
-		return JSIntentionBundle.message("bool.remove-boolean-equality.display-name", BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign()));
+		return JSIntentionBundle.message(
+			"bool.remove-boolean-equality.display-name",
+			BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign())
+		);
   }
 
 	@Override
@@ -55,8 +59,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
-	public void processIntention(@Nonnull PsiElement element)
-			throws IncorrectOperationException
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSBinaryExpression exp = (JSBinaryExpression) element;
 		final boolean isEquals = exp.getOperationSign().equals(JSTokenTypes.EQEQ);
@@ -69,9 +72,9 @@ public void processIntention(@Nonnull PsiElement element)
 		final String lhsText = lhs.getText();
 		final String rhsText = rhs.getText();
 
-		if(BoolUtils.TRUE.equals(lhsText))
+		if (BoolUtils.TRUE.equals(lhsText))
 		{
-			if(isEquals)
+			if (isEquals)
 			{
 				JSElementFactory.replaceExpression(exp, rhsText);
 			}
@@ -80,9 +83,9 @@ public void processIntention(@Nonnull PsiElement element)
 				JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
 			}
 		}
-		else if(BoolUtils.FALSE.equals(lhsText))
+		else if (BoolUtils.FALSE.equals(lhsText))
 		{
-			if(isEquals)
+			if (isEquals)
 			{
 				JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
 			}
@@ -91,9 +94,9 @@ else if(BoolUtils.FALSE.equals(lhsText))
 				JSElementFactory.replaceExpression(exp, rhsText);
 			}
 		}
-		else if(BoolUtils.TRUE.equals(rhsText))
+		else if (BoolUtils.TRUE.equals(rhsText))
 		{
-			if(isEquals)
+			if (isEquals)
 			{
 				JSElementFactory.replaceExpression(exp, lhsText);
 			}
@@ -104,7 +107,7 @@ else if(BoolUtils.TRUE.equals(rhsText))
 		}
 		else
 		{
-			if(isEquals)
+			if (isEquals)
 			{
 				JSElementFactory.replaceExpressionWithNegatedExpression(lhs, exp);
 			}
@@ -120,19 +123,15 @@ private static class BooleanLiteralEqualityPredicate implements JSElementPredica
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSBinaryExpression))
+			if (!(element instanceof JSBinaryExpression) || ErrorUtil.containsError(element))
 			{
-				return false;
-			}
-			if(ErrorUtil.containsError(element))
-			{
-				return false;
+        return false;
 			}
 
 			final JSBinaryExpression expression = (JSBinaryExpression) element;
 			final IElementType sign = expression.getOperationSign();
 
-			if(!(sign.equals(JSTokenTypes.EQEQ) || sign.equals(JSTokenTypes.NE)))
+			if (!(sign.equals(JSTokenTypes.EQEQ) || sign.equals(JSTokenTypes.NE)))
 			{
 				return false;
 			}
@@ -140,8 +139,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final JSExpression lhs = expression.getLOperand();
 			final JSExpression rhs = expression.getROperand();
 
-			return (lhs != null && rhs != null &&
-					(BoolUtils.isBooleanLiteral(lhs) || BoolUtils.isBooleanLiteral(rhs)));
+			return lhs != null && rhs != null && (BoolUtils.isBooleanLiteral(lhs) || BoolUtils.isBooleanLiteral(rhs));
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index 8ed525a3..cc7b712e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.braces;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
@@ -29,13 +30,13 @@
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSAddBracesIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSAddBracesIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSAddBracesIntention extends JSMutablyNamedIntention
 {
-
 	@NonNls
 	private static final String IF_KEYWORD = "if";
 	@NonNls
@@ -75,6 +76,7 @@ protected String getTextForElement(PsiElement element)
   }
 
 	@Override
+	@RequiredReadAction
 	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		if(!(element instanceof JSStatement))
@@ -84,16 +86,9 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe
 		final JSStatement statement = (JSStatement) element;
 		final JSElement parent = (JSElement) element.getParent();
 		final String text = element.getText();
-		String newText;
-
-		if(parent.getLastChild() instanceof PsiComment)
-		{
-			newText = '{' + text + "\n}";
-		}
-		else
-		{
-			newText = '{' + text + '}';
-		}
+		String newText = parent.getLastChild() instanceof PsiComment
+			? '{' + text + "\n}"
+			: '{' + text + '}';
 		JSElementFactory.replaceStatement(statement, newText);
 	}
 
@@ -112,29 +107,23 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			}
 
 			final PsiElement parentElement = element.getParent();
-			if(!(parentElement instanceof JSElement))
+			if (!(parentElement instanceof JSElement))
 			{
 				return false;
 			}
 			final JSElement parent = (JSElement) parentElement;
 
-			if(parent instanceof JSIfStatement)
+			if (parent instanceof JSIfStatement ifStatement)
 			{
-				final JSIfStatement ifStatement = (JSIfStatement) parent;
-
-				return (!(element instanceof JSIfStatement &&
-						element.equals(ifStatement.getElse())));
+				return !(element instanceof JSIfStatement && element.equals(ifStatement.getElse()));
 			}
 
-			if(parent instanceof JSForStatement ||
-					parent instanceof JSForInStatement
-			)
+			if (parent instanceof JSForStatement || parent instanceof JSForInStatement)
 			{
 				return element.equals(((JSLoopStatement) parent).getBody());
 			}
 
-			return (parent instanceof JSWhileStatement ||
-					parent instanceof JSDoWhileStatement);
+			return parent instanceof JSWhileStatement || parent instanceof JSDoWhileStatement;
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index 6408694c..bbf03e96 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.braces;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
@@ -30,10 +31,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSRemoveBracesIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSRemoveBracesIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSRemoveBracesIntention extends JSMutablyNamedIntention
 {
 	@NonNls
@@ -49,6 +51,7 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
 	{
 		final JSElement parent = (JSElement) element.getParent();
@@ -61,7 +64,7 @@ protected String getTextForElement(PsiElement element)
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 			final JSStatement elseBranch = ifStatement.getElse();
 
-			keyword = (element.equals(elseBranch) ? ELSE_KEYWORD : IF_KEYWORD);
+			keyword = element.equals(elseBranch) ? ELSE_KEYWORD : IF_KEYWORD;
 		}
 		else
 		{
@@ -75,6 +78,7 @@ protected String getTextForElement(PsiElement element)
   }
 
 	@Override
+	@RequiredReadAction
 	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSBlockStatement blockStatement = (JSBlockStatement) element;
@@ -95,9 +99,9 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe
 		assert (sibling != null);
 
 		sibling = sibling.getNextSibling();
-		while(sibling != null && !sibling.equals(statement))
+		while (sibling != null && !sibling.equals(statement))
 		{
-			if(sibling instanceof PsiComment)
+			if (sibling instanceof PsiComment)
 			{
 				grandParent.addBefore(sibling, parent);
 			}
@@ -106,7 +110,7 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe
 
 		final PsiElement lastChild = blockStatement.getLastChild();
 
-		if(lastChild instanceof PsiComment)
+		if (lastChild instanceof PsiComment)
 		{
 			final JSElement nextSibling = (JSElement) parent.getNextSibling();
 
@@ -122,7 +126,7 @@ public static class RemoveBracesPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSBlockStatement))
+			if (!(element instanceof JSBlockStatement))
 			{
 				return false;
 			}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index e4be30c6..e7c93406 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.comment;
 
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -32,13 +33,13 @@
 import java.util.List;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSChangeToCStyleCommentIntention", categories = {
-		"JavaScript",
-		"Comments"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSChangeToCStyleCommentIntention",
+	categories = {"JavaScript", "Comments"},
+	fileExtensions = "js"
+)
 public class JSChangeToCStyleCommentIntention extends JSIntention
 {
-
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
@@ -47,15 +48,16 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		PsiComment firstComment = (PsiComment) element;
 
-		while(true)
+		while (true)
 		{
 			final PsiElement prevComment = JSElementFactory.getNonWhiteSpaceSibling(firstComment, false);
 
-			if(!isEndOfLineComment(prevComment))
+			if (!isEndOfLineComment(prevComment))
 			{
 				break;
 			}
@@ -64,15 +66,15 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		}
 
 		final StringBuilder buffer = new StringBuilder(getCommentContents(firstComment));
-		final List<PsiElement> elementsToDelete = new ArrayList<PsiElement>();
+		final List<PsiElement> elementsToDelete = new ArrayList<>();
 		PsiElement nextComment = firstComment;
 
-		while(true)
+		while (true)
 		{
 			elementsToDelete.add(nextComment);
 
 			nextComment = JSElementFactory.getNonWhiteSpaceSibling(nextComment, true);
-			if(!isEndOfLineComment(nextComment))
+			if (!isEndOfLineComment(nextComment))
 			{
 				break;
 			}
@@ -84,23 +86,16 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 			elementsToDelete.add(prevSibling);
 
 			buffer.append(prevSibling.getText())  // White space
-					.append(getCommentContents((PsiComment) nextComment));
+				.append(getCommentContents((PsiComment) nextComment));
 		}
 
 		final String text = StringUtil.replace(buffer.toString(), "*/", "* /");
-		final String newCommentString;
-
-		if(text.indexOf('\n') >= 0)
-		{
-			newCommentString = "/*\n" + text + "\n*/";
-		}
-		else
-		{
-			newCommentString = "/*" + text + "*/";
-		}
+		final String newCommentString = text.indexOf('\n') >= 0
+			? "/*\n" + text + "\n*/"
+			: "/*" + text + "*/";
 
 		JSElementFactory.addElementBefore(firstComment, newCommentString);
-		for(final PsiElement elementToDelete : elementsToDelete)
+		for (final PsiElement elementToDelete : elementsToDelete)
 		{
 			JSElementFactory.removeElement(elementToDelete);
 		}
@@ -108,17 +103,10 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
 	private static boolean isEndOfLineComment(PsiElement element)
 	{
-		if(!(element instanceof PsiComment))
-		{
-			return false;
-		}
-
-		final PsiComment comment = (PsiComment) element;
-		final IElementType tokenType = comment.getTokenType();
-
-		return JSTokenTypes.END_OF_LINE_COMMENT.equals(tokenType);
+		return element instanceof PsiComment comment && JSTokenTypes.END_OF_LINE_COMMENT.equals(comment.getTokenType());
 	}
 
+	@RequiredReadAction
 	private static String getCommentContents(PsiComment comment)
 	{
 		return comment.getText().substring(2);
@@ -130,14 +118,7 @@ private static class EndOfLineCommentPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof PsiComment))
-			{
-				return false;
-			}
-
-			final IElementType type = ((PsiComment) element).getTokenType();
-
-			return JSTokenTypes.END_OF_LINE_COMMENT.equals(type);
+			return element instanceof PsiComment comment && JSTokenTypes.END_OF_LINE_COMMENT.equals(comment.getTokenType());
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index c841acc5..193873c3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -31,10 +31,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSChangeToEndOfLineCommentIntention", categories = {
-		"JavaScript",
-		"Comments"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSChangeToEndOfLineCommentIntention",
+	categories = {"JavaScript", "Comments"},
+	fileExtensions = "js"
+)
 public class JSChangeToEndOfLineCommentIntention extends JSIntention
 {
 	@Override
@@ -58,15 +59,15 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final String[] newComments = buildCommentStrings(lines);
 		PsiElement currentElement = element;
 
-		for(int index = newComments.length; --index >= 0; )
+		for (int index = newComments.length; --index >= 0; )
 		{
-			if(newComments[index].length() > 0)
+			if (newComments[index].length() > 0)
 			{
 				currentElement = JSElementFactory.addElementBefore(currentElement, "\n");
 				currentElement = JSElementFactory.addElementBefore(currentElement, newComments[index]);
 			}
 		}
-		if(whitespace != null)
+		if (whitespace != null)
 		{
 			JSElementFactory.removeElement(whitespace);
 		}
@@ -80,12 +81,12 @@ private static String[] buildCommentStrings(String[] lines)
 		for(int i = lines.length - 1; i >= 0 && lastNonEmtpyLine == -1; i--)
 		{
 			final String line = lines[i].trim();
-			if(line.length() != 0)
+			if (!line.isEmpty())
 			{
 				lastNonEmtpyLine = i;
 			}
 		}
-		if(lastNonEmtpyLine == -1)
+		if (lastNonEmtpyLine == -1)
 		{
 			return new String[]{"//"};
 		}
@@ -93,19 +94,19 @@ private static String[] buildCommentStrings(String[] lines)
 		final StringBuilder buffer = new StringBuilder();
 		final String[] commentStrings = new String[lastNonEmtpyLine + 1];
 
-		for(int i = 0; i <= lastNonEmtpyLine; i++)
+		for (int i = 0; i <= lastNonEmtpyLine; i++)
 		{
 			final String line = lines[i];
 
-			if(line.trim().length() != 0)
+			if (line.trim().length() != 0)
 			{
 				buffer.replace(0, buffer.length(), "//");
 
-				if(line.startsWith(" *"))
+				if (line.startsWith(" *"))
 				{
 					buffer.append(line.substring(2));
 				}
-				else if(line.startsWith("*"))
+				else if (line.startsWith("*"))
 				{
 					buffer.append(line.substring(1));
 				}
@@ -122,11 +123,10 @@ else if(line.startsWith("*"))
 
 	private static class CStyleCommentPredicate implements JSElementPredicate
 	{
-
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof PsiComment))
+			if (!(element instanceof PsiComment))
 			{
 				return false;
 			}
@@ -134,18 +134,17 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final PsiComment comment = (PsiComment) element;
 			final IElementType type = comment.getTokenType();
 
-			if(!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.C_STYLE_COMMENT.equals(type)))
+			if (!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.C_STYLE_COMMENT.equals(type)))
 			{
 				return false;
 			}
 			final PsiElement sibling = TreeUtil.getNextLeaf(comment);
-			if(!(sibling instanceof PsiWhiteSpace))
+			if (!(sibling instanceof PsiWhiteSpace))
 			{
 				return false;
 			}
 			final String whitespaceText = sibling.getText();
-			return (whitespaceText.indexOf((int) '\n') >= 0 ||
-					whitespaceText.indexOf((int) '\r') >= 0);
+			return whitespaceText.indexOf((int) '\n') >= 0 || whitespaceText.indexOf((int) '\r') >= 0;
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 37cfbed0..4956d147 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -18,6 +18,7 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -31,10 +32,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSFlipConditionalIntention", categories = {
-		"JavaScript",
-		"Conditional"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSFlipConditionalIntention",
+	categories = {"JavaScript", "Conditional"},
+	fileExtensions = "js"
+)
 public class JSFlipConditionalIntention extends JSIntention
 {
 	@Override
@@ -45,6 +47,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSConditionalExpression exp = (JSConditionalExpression) element;
@@ -56,7 +59,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		assert (thenExpression != null);
 
 		final String newExpression = BoolUtils.getNegatedExpressionText(condition) + '?' +
-				elseExpression.getText() + ':' + thenExpression.getText();
+			elseExpression.getText() + ':' + thenExpression.getText();
 
 		JSElementFactory.replaceExpression(exp, newExpression);
 	}
@@ -66,20 +69,13 @@ private static class FlipConditionalPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSConditionalExpression))
-			{
-				return false;
-			}
-			if(ErrorUtil.containsError(element))
-			{
-				return false;
+			if (!(element instanceof JSConditionalExpression) || ErrorUtil.containsError(element)) {
+        return false;
 			}
 
 			final JSConditionalExpression condition = (JSConditionalExpression) element;
 
-			return (condition.getCondition() != null &&
-					condition.getThen() != null &&
-					condition.getElse() != null);
+			return condition.getCondition() != null && condition.getThen() != null && condition.getElse() != null;
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 66aeda6a..33db3d3b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -32,10 +32,11 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSConstantExpressionIntention", categories = {
-		"JavaScript",
-		"Other"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSConstantExpressionIntention",
+	categories = {"JavaScript", "Other"},
+	fileExtensions = "js"
+)
 public class JSConstantExpressionIntention extends JSIntention
 {
 	@Override
@@ -52,9 +53,9 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final Object value = ExpressionUtil.computeConstantExpression(expression);
 		final String newExpression;
 
-		if(value instanceof String)
+		if (value instanceof String strValue)
 		{
-			newExpression = '"' + StringUtil.escapeStringCharacters((String) value) + '"';
+			newExpression = '"' + StringUtil.escapeStringCharacters(strValue) + '"';
 		}
 		else
 		{
@@ -68,42 +69,23 @@ private static class ConstantExpressionPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSExpression))
+			if (!(element instanceof JSExpression) || ErrorUtil.containsError(element))
 			{
-				return false;
-			}
-			if(ErrorUtil.containsError(element))
-			{
-				return false;
+        return false;
 			}
 			final JSExpression expression = (JSExpression) element;
 
-			if(element instanceof JSLiteralExpression ||
-					(element instanceof JSReferenceExpression &&
-							((JSReferenceExpression) element).getQualifier() != null
-					) ||
-					expression instanceof JSCallExpression
-			)
-			{
-				return false;
-			}
-			if(!ExpressionUtil.isConstantExpression(expression))
-			{
-				return false;
-			}
-
-			if(ExpressionUtil.computeConstantExpression(expression) == null)
-			{
+			if (element instanceof JSLiteralExpression
+				|| (element instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() != null)
+				|| expression instanceof JSCallExpression
+				|| !ExpressionUtil.isConstantExpression(expression)
+				|| ExpressionUtil.computeConstantExpression(expression) == null) {
 				return false;
 			}
 
 			final PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSExpression))
-			{
-				return true;
-			}
-			return (!ExpressionUtil.isConstantExpression((JSExpression) parent));
+			return !(parent instanceof JSExpression parentExpression && ExpressionUtil.isConstantExpression(parentExpression));
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index 95362b02..8005adb8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -37,10 +38,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSConstantSubexpressionIntention", categories = {
-		"JavaScript",
-		"Other"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSConstantSubexpressionIntention",
+	categories = {"JavaScript", "Other"},
+	fileExtensions = "js"
+)
 public class JSConstantSubexpressionIntention extends JSMutablyNamedIntention
 {
 	@Override
@@ -51,31 +53,29 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
 	{
 		final PsiElement parent = element.getParent();
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) (parent instanceof JSBinaryExpression ? parent : element);
 		final JSExpression lhs = binaryExpression.getLOperand();
-		final JSExpression leftSide;
-
-		if(lhs instanceof JSBinaryExpression)
-		{
-			leftSide = ((JSBinaryExpression) lhs).getROperand();
-		}
-		else
-		{
-			leftSide = lhs;
-		}
+		final JSExpression leftSide = lhs instanceof JSBinaryExpression lhsBinaryExpression ? lhsBinaryExpression.getROperand() : lhs;
 		final IElementType operationSign = binaryExpression.getOperationSign();
 		final JSExpression rhs = binaryExpression.getROperand();
 
 		assert (rhs != null);
 		assert (leftSide != null);
 
-		return JSIntentionBundle.message("constant.constant-subexpression.display-name", leftSide.getText(),BinaryOperatorUtils.getOperatorText(operationSign),rhs.getText());
+		return JSIntentionBundle.message(
+			"constant.constant-subexpression.display-name",
+			leftSide.getText(),
+			BinaryOperatorUtils.getOperatorText(operationSign),
+			rhs.getText()
+		);
   }
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final PsiElement parent = element.getParent();
@@ -83,14 +83,13 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		String newExpression = "";
 		final Object constantValue;
 
-		if(expression instanceof JSBinaryExpression)
+		if (expression instanceof JSBinaryExpression)
 		{
 			final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
 			final JSExpression lhs = binaryExpression.getLOperand();
 
-			if(lhs instanceof JSBinaryExpression)
+			if (lhs instanceof JSBinaryExpression lhsBinaryExpression)
 			{
-				final JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression) lhs;
 				final JSExpression rightSide = lhsBinaryExpression.getROperand();
 
 				newExpression += getLeftSideText(lhsBinaryExpression);
@@ -104,9 +103,9 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 			constantValue = ExpressionUtil.computeConstantExpression(expression);
 		}
 
-		if(constantValue instanceof String)
+		if (constantValue instanceof String strValue)
 		{
-			newExpression += '"' + StringUtil.escapeStringCharacters(constantValue.toString()) + '"';
+			newExpression += '"' + StringUtil.escapeStringCharacters(strValue) + '"';
 		}
 		else
 		{
@@ -115,6 +114,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		JSElementFactory.replaceExpression(expression, newExpression);
 	}
 
+	@RequiredReadAction
 	private static String getLeftSideText(JSBinaryExpression binaryExpression)
 	{
 		return binaryExpression.getLOperand().getText() +
@@ -130,20 +130,21 @@ private static String getLeftSideText(JSBinaryExpression binaryExpression)
 	 * @return the found common sub-expression if found, or <tt>null</tt> otherwise.
 	 */
 	@Nullable
+	@RequiredReadAction
 	private static JSBinaryExpression getSubexpression(JSBinaryExpression expression)
 	{
 		final JSExpression rhs = expression.getROperand();
 		final IElementType sign = expression.getOperationSign();
 		final int parentPrecendence = ParenthesesUtils.getPrecendence(expression);
 
-		if(rhs == null)
+		if (rhs == null)
 		{
 			return null;
 		}
 
 		final JSExpression lhs = expression.getLOperand();
 
-		if(!(lhs instanceof JSBinaryExpression))
+		if (!(lhs instanceof JSBinaryExpression))
 		{
 			return expression;
 		}
@@ -152,26 +153,17 @@ private static JSBinaryExpression getSubexpression(JSBinaryExpression expression
 		final int childPrecendence = ParenthesesUtils.getPrecendence(lhsBinaryExpression);
 		final JSExpression leftSide = lhsBinaryExpression.getROperand();
 
-		if(leftSide == null)
-		{
-			return null;
-		}
-
-		if(parentPrecendence > childPrecendence)
+		if (leftSide == null || parentPrecendence > childPrecendence)
 		{
-			return null;
+      return null;
 		}
 
 		try
 		{
-			final String subExpressionText = leftSide.getText() + BinaryOperatorUtils.getOperatorText(sign) +
-					rhs.getText();
-			final JSExpression subExpression = JSChangeUtil.createExpressionFromText(expression.getProject(),
-					subExpressionText);
-
-			return (JSBinaryExpression) subExpression;
+			final String subExpressionText = leftSide.getText() + BinaryOperatorUtils.getOperatorText(sign) + rhs.getText();
+			return (JSBinaryExpression) JSChangeUtil.createExpressionFromText(expression.getProject(), subExpressionText);
 		}
-		catch(Throwable ignore)
+		catch (Throwable ignore)
 		{
 			return null;
 		}
@@ -180,10 +172,10 @@ private static JSBinaryExpression getSubexpression(JSBinaryExpression expression
 	private static class ConstantSubexpressionPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSElement ||
-					element.getPrevSibling() instanceof JSElement))
+			if (!(element instanceof JSElement || element.getPrevSibling() instanceof JSElement))
 			{
 				return false;
 			}
@@ -192,8 +184,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 
 			if(!(parent instanceof JSBinaryExpression))
 			{
-				if(element instanceof JSBinaryExpression &&
-						((JSBinaryExpression) element).getLOperand() instanceof JSBinaryExpression)
+				if (element instanceof JSBinaryExpression binaryExpression && binaryExpression.getLOperand() instanceof JSBinaryExpression)
 				{
 					parent = element;
 				}
@@ -205,30 +196,24 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final JSBinaryExpression binaryExpression = (JSBinaryExpression) parent;
 
 			final JSBinaryExpression subexpression = getSubexpression(binaryExpression);
-			if(subexpression == null)
+			if (subexpression == null)
 			{
 				return false;
 			}
-			if(binaryExpression.equals(subexpression) &&
-					!isPartOfConstantExpression(binaryExpression))
+			if (binaryExpression.equals(subexpression) && !isPartOfConstantExpression(binaryExpression))
 			{
 				// handled by JSConstantExpressionIntention
 				return false;
 			}
-			if(!ExpressionUtil.isConstantExpression(subexpression))
-			{
-				return false;
-			}
-
-			return (ExpressionUtil.computeConstantExpression(subexpression) != null);
+			return ExpressionUtil.isConstantExpression(subexpression)
+				&& ExpressionUtil.computeConstantExpression(subexpression) != null;
 		}
 
 		private static boolean isPartOfConstantExpression(JSBinaryExpression binaryExpression)
 		{
 			final PsiElement containingElement = binaryExpression.getParent();
 
-			return (containingElement instanceof JSExpression &&
-					ExpressionUtil.isConstantExpression((JSExpression) containingElement));
+			return containingElement instanceof JSExpression expression && ExpressionUtil.isConstantExpression(expression);
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index 2245312c..8bac99d0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.increment;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -28,10 +29,11 @@
 import org.intellij.idea.lang.javascript.psiutil.*;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSExtractIncrementIntention", categories = {
-		"JavaScript",
-		"Other"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSExtractIncrementIntention",
+	categories = {"JavaScript", "Other"},
+	fileExtensions = "js"
+)
 public class JSExtractIncrementIntention extends JSMutablyNamedIntention
 {
 	@Override
@@ -48,16 +50,18 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final boolean isPostfix = (element instanceof JSPostfixExpression);
-		final JSExpression operand = (isPostfix ? ((JSPostfixExpression) element).getExpression()
-				: ((JSPrefixExpression) element).getExpression());
+		final JSExpression operand = isPostfix
+			? ((JSPostfixExpression) element).getExpression()
+			: ((JSPrefixExpression) element).getExpression();
 		final JSStatement statement = TreeUtil.getParentOfType(element, JSStatement.class);
 
 		assert (statement != null);
 
-		if(isPostfix)
+		if (isPostfix)
 		{
 			JSElementFactory.addStatementAfter(statement, element.getText() + ';');
 		}
@@ -68,11 +72,12 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		JSElementFactory.replaceExpression((JSExpression) element, operand.getText());
 	}
 
+	@RequiredReadAction
 	private static IElementType getOperationSign(PsiElement element)
 	{
-		return ((element instanceof JSPostfixExpression)
-				? ((JSPostfixExpression) element).getOperationSign()
-				: ((JSPrefixExpression) element).getOperationSign());
+		return element instanceof JSPostfixExpression postfixExpression
+				? postfixExpression.getOperationSign()
+				: ((JSPrefixExpression) element).getOperationSign();
 	}
 
 	private static class ExtractIncrementPredicate implements JSElementPredicate
@@ -80,27 +85,16 @@ private static class ExtractIncrementPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!ExpressionUtil.isIncrementDecrementExpression(element))
-			{
-				return false;
-			}
-			if(ErrorUtil.containsError(element))
-			{
-				return false;
-			}
-
-			final PsiElement parent = element.getParent();
-
-			if(parent instanceof JSExpressionStatement)
-			{
-				return false;
+			if (!ExpressionUtil.isIncrementDecrementExpression(element)
+				|| ErrorUtil.containsError(element)
+				|| element.getParent() instanceof JSExpressionStatement) {
+        return false;
 			}
 
 			final JSStatement containingStatement = TreeUtil.getParentOfType(element, JSStatement.class);
 
-			if(element instanceof JSPostfixExpression &&
-					(containingStatement instanceof JSReturnStatement ||
-							containingStatement instanceof JSThrowStatement))
+			if (element instanceof JSPostfixExpression
+				&& (containingStatement instanceof JSReturnStatement || containingStatement instanceof JSThrowStatement))
 			{
 				return false;
 			}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index 3b83b734..ee941fc5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSPsiImplUtils;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -35,10 +36,11 @@
 import java.util.List;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSSplitDeclarationAndInitializationIntention", categories = {
-		"JavaScript",
-		"Declaration"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSSplitDeclarationAndInitializationIntention",
+	categories = {"JavaScript", "Declaration"},
+	fileExtensions = "js"
+)
 public class JSSplitDeclarationAndInitializationIntention extends JSIntention
 {
 	@NonNls
@@ -52,32 +54,33 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		assert (element instanceof JSVarStatement);
 
 		final JSVarStatement varStatement = (JSVarStatement) element;
 		StringBuilder declarationBuffer = new StringBuilder();
-		List<String> initializations = new ArrayList<String>();
+		List<String> initializations = new ArrayList<>();
 
-		for(JSVariable variable : varStatement.getVariables())
+		for (JSVariable variable : varStatement.getVariables())
 		{
-			declarationBuffer.append((declarationBuffer.length() == 0) ? VAR_KEYWORD : ",")
+			declarationBuffer.append(declarationBuffer.isEmpty() ? VAR_KEYWORD : ",")
 					.append(variable.getName());
 
 			String s = JSPsiImplUtils.getTypeFromDeclaration(variable);
 			final PsiFile containingFile = element.getContainingFile();
 
-			if(s == null && containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4)
+			if (s == null && containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4)
 			{
 				s = JSResolveUtil.getExpressionType(variable.getInitializer(), containingFile);
 			}
 
-			if(s != null)
+			if (s != null)
 			{
 				declarationBuffer.append(":").append(s);
 			}
-			if(variable.hasInitializer())
+			if (variable.hasInitializer())
 			{
 				initializations.add(variable.getName() + '=' + variable.getInitializer().getText() + ';');
 			}
@@ -87,7 +90,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		// Do replacement.
 		JSStatement newStatement = JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
 
-		for(final String initialization : initializations)
+		for (final String initialization : initializations)
 		{
 			newStatement = JSElementFactory.addStatementAfter(newStatement, initialization);
 		}
@@ -100,8 +103,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
 			PsiElement elementParent;
 
-			if(!(element instanceof JSVarStatement) ||
-					(elementParent = element.getParent()) instanceof JSForStatement ||
+			if(!(element instanceof JSVarStatement)
+				|| (elementParent = element.getParent()) instanceof JSForStatement ||
 					elementParent instanceof JSClass
 			)
 			{
@@ -109,14 +112,14 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			}
 
 			final JSVarStatement varStatement = (JSVarStatement) element;
-			if(ErrorUtil.containsError(varStatement))
+			if (ErrorUtil.containsError(varStatement))
 			{
 				return false;
 			}
 
-			for(JSVariable variable : varStatement.getVariables())
+			for (JSVariable variable : varStatement.getVariables())
 			{
-				if(variable.hasInitializer())
+				if (variable.hasInitializer())
 				{
 					return true;
 				}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index 7552dde9..3d1fd970 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -16,7 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.number;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
@@ -28,10 +28,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSConvertIntegerToDecimalIntention", categories = {
-		"JavaScript",
-		"Numbers"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSConvertIntegerToDecimalIntention",
+	categories = {"JavaScript", "Numbers"},
+	fileExtensions = "js"
+)
 public class JSConvertIntegerToDecimalIntention extends JSIntention
 {
 	@Override
@@ -52,17 +53,17 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 	private static class ConvertIntegerToDecimalPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSLiteralExpression))
+			if (!(element instanceof JSLiteralExpression))
 			{
 				return false;
 			}
 
 			final String elementText = element.getText();
 
-			return (NumberUtil.isHex(elementText) ||
-					NumberUtil.isOctal(elementText));
+			return NumberUtil.isHex(elementText) || NumberUtil.isOctal(elementText);
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index 7b42bc59..4470a156 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -16,7 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.number;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
@@ -28,10 +28,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSConvertIntegerToHexIntention", categories = {
-		"JavaScript",
-		"Numbers"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSConvertIntegerToHexIntention",
+	categories = {"JavaScript", "Numbers"},
+	fileExtensions = "js"
+)
 public class JSConvertIntegerToHexIntention extends JSIntention
 {
 	@Override
@@ -52,14 +53,10 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 	private static class ConvertIntegerToHexPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSLiteralExpression))
-			{
-				return false;
-			}
-
-			return NumberUtil.isDecimal(element.getText());
+			return element instanceof JSLiteralExpression && NumberUtil.isDecimal(element.getText());
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index bb29594b..ce16fbb8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -16,7 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.number;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
@@ -28,10 +28,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSConvertIntegerToOctalIntention", categories = {
-		"JavaScript",
-		"Numbers"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSConvertIntegerToOctalIntention",
+	categories = {"JavaScript", "Numbers"},
+	fileExtensions = "js"
+)
 public class JSConvertIntegerToOctalIntention extends JSIntention
 {
 	@Override
@@ -52,6 +53,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 	private static class ConvertIntegerToOctalPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
 			if(!(element instanceof JSLiteralExpression))
@@ -61,10 +63,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 
 			final String elementText = element.getText();
 
-			return (NumberUtil.isHex(elementText) ||
-					(NumberUtil.isDecimal(elementText) &&
-							!NumberUtil.isOctal(elementText)));
+			return NumberUtil.isHex(elementText) || (NumberUtil.isDecimal(elementText) && !NumberUtil.isOctal(elementText));
 		}
 	}
-
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index c70e69e4..f0907f09 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -17,6 +17,7 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -32,25 +33,27 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSReplaceMultiplyWithShiftIntention", categories = {
-		"JavaScript",
-		"Shift"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSReplaceMultiplyWithShiftIntention",
+	categories = {"JavaScript", "Shift"},
+	fileExtensions = "js"
+)
 public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention
 {
 	@Override
+	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
 	{
 		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
 		final String operatorString;
 
-		if(element instanceof JSAssignmentExpression)
+		if (element instanceof JSAssignmentExpression)
 		{
-			operatorString = (tokenType.equals(JSTokenTypes.MULTEQ) ? "<<=" : ">>=");
+			operatorString = tokenType.equals(JSTokenTypes.MULTEQ) ? "<<=" : ">>=";
 		}
 		else
 		{
-			operatorString = (tokenType.equals(JSTokenTypes.MULT) ? "<<" : ">>");
+			operatorString = tokenType.equals(JSTokenTypes.MULT) ? "<<" : ">>";
 		}
 
 		return JSIntentionBundle.message(
@@ -68,12 +71,12 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
-	public void processIntention(@Nonnull PsiElement element)
-			throws IncorrectOperationException
+	@RequiredReadAction
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
-		if(element instanceof JSAssignmentExpression)
+		if (element instanceof JSAssignmentExpression assignmentExpression)
 		{
-			this.replaceMultiplyOrDivideAssignWithShiftAssign((JSAssignmentExpression) element);
+			this.replaceMultiplyOrDivideAssignWithShiftAssign(assignmentExpression);
 		}
 		else
 		{
@@ -81,28 +84,27 @@ public void processIntention(@Nonnull PsiElement element)
 		}
 	}
 
-	private void replaceMultiplyOrDivideAssignWithShiftAssign(JSAssignmentExpression exp)
-			throws IncorrectOperationException
+	@RequiredReadAction
+	private void replaceMultiplyOrDivideAssignWithShiftAssign(JSAssignmentExpression exp) throws IncorrectOperationException
 	{
 		final JSExpression lhs = exp.getLOperand();
 		final JSExpression rhs = exp.getROperand();
 		final IElementType tokenType = exp.getOperationSign();
-		final String assignString = (tokenType.equals(JSTokenTypes.MULTEQ) ? "<<=" : ">>=");
-		final String expString = lhs.getText() + assignString +
-				ShiftUtils.getLogBase2(rhs);
+		final String assignString = JSTokenTypes.MULTEQ.equals(tokenType) ? "<<=" : ">>=";
+		final String expString = lhs.getText() + assignString + ShiftUtils.getLogBase2(rhs);
 
 		JSElementFactory.replaceExpression(exp, expString);
 	}
 
-	private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp)
-			throws IncorrectOperationException
+	@RequiredReadAction
+	private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp) throws IncorrectOperationException
 	{
 		JSExpression lhs = exp.getLOperand();
 		JSExpression rhs = exp.getROperand();
 		final IElementType tokenType = exp.getOperationSign();
-		final String operatorString = (tokenType.equals(JSTokenTypes.MULT) ? "<<" : ">>");
+		final String operatorString = JSTokenTypes.MULT.equals(tokenType) ? "<<" : ">>";
 
-		if(ShiftUtils.isPowerOfTwo(lhs) && tokenType.equals(JSTokenTypes.MULT))
+		if (ShiftUtils.isPowerOfTwo(lhs) && JSTokenTypes.MULT.equals(tokenType))
 		{
 			JSExpression swap = lhs;
 
@@ -114,13 +116,9 @@ private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp)
 		String expString = lhsText + operatorString + ShiftUtils.getLogBase2(rhs);
 		final JSElement parent = (JSElement) exp.getParent();
 
-		if(parent != null && parent instanceof JSExpression)
-		{
-			if(!(parent instanceof JSParenthesizedExpression) &&
-					ParenthesesUtils.getPrecendence((JSExpression) parent) < ParenthesesUtils.SHIFT_PRECENDENCE)
-			{
-				expString = '(' + expString + ')';
-			}
+		if (parent != null && parent instanceof JSExpression parentExpression && !(parent instanceof JSParenthesizedExpression)
+			&& ParenthesesUtils.getPrecendence(parentExpression) < ParenthesesUtils.SHIFT_PRECENDENCE) {
+			expString = '(' + expString + ')';
 		}
 		JSElementFactory.replaceExpression(exp, expString);
 	}
@@ -128,46 +126,35 @@ private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp)
 	private static class MultiplyByPowerOfTwoPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(element instanceof JSAssignmentExpression)
-			{
-				return isMultiplyByPowerOfTwo((JSAssignmentExpression) element);
-			}
-			else if(element instanceof JSBinaryExpression)
-			{
-				return isMultiplyByPowerOfTwo((JSBinaryExpression) element);
-			}
-			else
-			{
-				return false;
-			}
+			return element instanceof JSAssignmentExpression assignmentExpression
+				? isMultiplyByPowerOfTwo(assignmentExpression)
+				: element instanceof JSBinaryExpression binaryExpression && isMultiplyByPowerOfTwo(binaryExpression);
 		}
 
+		@RequiredReadAction
 		private static boolean isMultiplyByPowerOfTwo(JSAssignmentExpression expression)
 		{
 			final IElementType operator = expression.getOperationSign();
 
-			if(operator == null || !(operator.equals(JSTokenTypes.MULTEQ) || operator.equals(JSTokenTypes.DIVEQ)))
+			if (operator == null || !(operator.equals(JSTokenTypes.MULTEQ) || operator.equals(JSTokenTypes.DIVEQ)))
 			{
 				return false;
 			}
 
 			final JSExpression rightExpression = expression.getROperand();
 
-			if(rightExpression == null)
-			{
-				return false;
-			}
-
-			return ShiftUtils.isPowerOfTwo(rightExpression);
+			return rightExpression != null && ShiftUtils.isPowerOfTwo(rightExpression);
 		}
 
+		@RequiredReadAction
 		private static boolean isMultiplyByPowerOfTwo(JSBinaryExpression expression)
 		{
 			final IElementType operator = expression.getOperationSign();
 
-			if(operator == null || !(operator.equals(JSTokenTypes.MULT) || operator.equals(JSTokenTypes.DIV)))
+			if (operator == null || !(operator.equals(JSTokenTypes.MULT) || operator.equals(JSTokenTypes.DIV)))
 			{
 				return false;
 			}
@@ -175,11 +162,8 @@ private static boolean isMultiplyByPowerOfTwo(JSBinaryExpression expression)
 			final JSExpression leftOperand = expression.getLOperand();
 			final JSExpression rightOperand = expression.getROperand();
 
-			if(leftOperand == null || rightOperand == null)
-			{
-				return false;
-			}
-			return (ShiftUtils.isPowerOfTwo(leftOperand) || ShiftUtils.isPowerOfTwo(rightOperand));
+			return leftOperand != null && rightOperand != null
+				&& (ShiftUtils.isPowerOfTwo(leftOperand) || ShiftUtils.isPowerOfTwo(rightOperand));
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index bf15b4fa..38d27e1d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -17,6 +17,7 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -31,25 +32,27 @@
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSReplaceShiftWithMultiplyIntention", categories = {
-		"JavaScript",
-		"Shift"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSReplaceShiftWithMultiplyIntention",
+	categories = {"JavaScript", "Shift"},
+	fileExtensions = "js"
+)
 public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention
 {
 	@Override
+	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
 	{
 		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
 		final String operatorString;
 
-		if(element instanceof JSAssignmentExpression)
+		if (element instanceof JSAssignmentExpression)
 		{
-			operatorString = (tokenType.equals(JSTokenTypes.LTLTEQ) ? "*=" : "/=");
+			operatorString = JSTokenTypes.LTLTEQ.equals(tokenType) ? "*=" : "/=";
 		}
 		else
 		{
-			operatorString = (tokenType.equals(JSTokenTypes.LTLT) ? "*" : "/");
+			operatorString = JSTokenTypes.LTLT.equals(tokenType) ? "*" : "/";
 		}
 
 		return JSIntentionBundle.message(
@@ -67,11 +70,12 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
-		if(element instanceof JSAssignmentExpression)
+		if (element instanceof JSAssignmentExpression assignmentExpression)
 		{
-			this.replaceShiftAssignWithMultiplyOrDivideAssign((JSAssignmentExpression) element);
+			this.replaceShiftAssignWithMultiplyOrDivideAssign(assignmentExpression);
 		}
 		else
 		{
@@ -80,37 +84,33 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		}
 	}
 
-	private void replaceShiftAssignWithMultiplyOrDivideAssign(JSAssignmentExpression exp)
-			throws IncorrectOperationException
+	@RequiredReadAction
+	private void replaceShiftAssignWithMultiplyOrDivideAssign(JSAssignmentExpression exp) throws IncorrectOperationException
 	{
 		final JSExpression lhs = exp.getLOperand();
 		final JSExpression rhs = exp.getROperand();
 		final IElementType tokenType = exp.getOperationSign();
-		final String assignString = ((tokenType.equals(JSTokenTypes.LTLTEQ)) ? "*=" : "/=");
+		final String assignString = JSTokenTypes.LTLTEQ.equals(tokenType) ? "*=" : "/=";
 
 		final String expString = lhs.getText() + assignString + ShiftUtils.getExpBase2(rhs);
 
 		JSElementFactory.replaceExpression(exp, expString);
 	}
 
-	private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp)
-			throws IncorrectOperationException
+	@RequiredReadAction
+	private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp) throws IncorrectOperationException
 	{
 		final JSExpression lhs = exp.getLOperand();
 		final JSExpression rhs = exp.getROperand();
 		final IElementType tokenType = exp.getOperationSign();
-		final String operatorString = ((tokenType.equals(JSTokenTypes.LTLT)) ? "*" : "/");
+		final String operatorString = JSTokenTypes.LTLT.equals(tokenType) ? "*" : "/";
 		final String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE);
 		String expString = lhsText + operatorString + ShiftUtils.getExpBase2(rhs);
 		final JSElement parent = (JSElement) exp.getParent();
 
-		if(parent != null && parent instanceof JSExpression)
-		{
-			if(!(parent instanceof JSParenthesizedExpression) &&
-					ParenthesesUtils.getPrecendence((JSExpression) parent) < ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE)
-			{
-				expString = '(' + expString + ')';
-			}
+		if (parent != null && parent instanceof JSExpression parentExpression && !(parent instanceof JSParenthesizedExpression)
+			&& ParenthesesUtils.getPrecendence(parentExpression) < ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE) {
+			expString = '(' + expString + ')';
 		}
 		JSElementFactory.replaceExpression(exp, expString);
 	}
@@ -118,55 +118,36 @@ private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp)
 	private static class ShiftByLiteralPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(element instanceof JSAssignmentExpression)
-			{
-				return this.isAssignmentShiftByLiteral((JSAssignmentExpression) element);
-			}
-			else if(element instanceof JSBinaryExpression)
-			{
-				return this.isBinaryShiftByLiteral((JSBinaryExpression) element);
-			}
-			else
-			{
-				return false;
-			}
+			return element instanceof JSAssignmentExpression assignmentExpression
+				? this.isAssignmentShiftByLiteral(assignmentExpression)
+				: element instanceof JSBinaryExpression binaryExpression && this.isBinaryShiftByLiteral(binaryExpression);
 		}
 
+		@RequiredReadAction
 		private boolean isAssignmentShiftByLiteral(JSAssignmentExpression expression)
 		{
 			final IElementType tokenType = expression.getOperationSign();
 
-			if(tokenType == null ||
-					!(tokenType.equals(JSTokenTypes.LTLTEQ) ||
-							tokenType.equals(JSTokenTypes.GTGTEQ)
-					)
-			)
+			if (tokenType == null || !(JSTokenTypes.LTLTEQ.equals(tokenType) || JSTokenTypes.GTGTEQ.equals(tokenType)))
 			{
 				return false;
 			}
 
 			final JSExpression rhs = expression.getROperand();
 
-			if(rhs == null)
-			{
-				return false;
-			}
-			return ShiftUtils.isIntLiteral(rhs);
+			return rhs != null && ShiftUtils.isIntLiteral(rhs);
 		}
 
+		@RequiredReadAction
 		private boolean isBinaryShiftByLiteral(JSBinaryExpression expression)
 		{
 			final IElementType tokenType = expression.getOperationSign();
 
-			if(!(tokenType.equals(JSTokenTypes.LTLT) ||
-					tokenType.equals(JSTokenTypes.GTGT)))
-			{
-				return false;
-			}
-
-			return ShiftUtils.isIntLiteral(expression.getROperand());
+			return (JSTokenTypes.LTLT.equals(tokenType) || JSTokenTypes.GTGT.equals(tokenType))
+				&& ShiftUtils.isIntLiteral(expression.getROperand());
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index 21988941..ab639f7e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -32,13 +33,15 @@
 import org.intellij.idea.lang.javascript.psiutil.*;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSReplaceWithOperatorAssignmentIntention", categories = {
-		"JavaScript",
-		"Other"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSReplaceWithOperatorAssignmentIntention",
+	categories = {"JavaScript", "Other"},
+	fileExtensions = "js"
+)
 public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedIntention
 {
 	@Override
+	@RequiredReadAction
 	public String getTextForElement(PsiElement element)
 	{
 		final JSAssignmentExpression exp = (JSAssignmentExpression) element;
@@ -57,6 +60,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSAssignmentExpression exp = (JSAssignmentExpression) element;
@@ -77,58 +81,43 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 	private static class Predicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSAssignmentExpression))
-			{
-				return false;
-			}
-			if(ErrorUtil.containsError(element))
-			{
-				return false;
+			if (!(element instanceof JSAssignmentExpression) || ErrorUtil.containsError(element)) {
+        return false;
 			}
 			final JSAssignmentExpression assignment = (JSAssignmentExpression) element;
 			final IElementType tokenType = assignment.getOperationSign();
-			if(!JSTokenTypes.EQ.equals(tokenType))
+			if (!JSTokenTypes.EQ.equals(tokenType))
 			{
 				return false;
 			}
 			JSExpression lhs = assignment.getLOperand();
 			final JSExpression rhs = assignment.getROperand();
 
-			if(lhs instanceof JSDefinitionExpression)
-			{
-				lhs = ((JSDefinitionExpression) lhs).getExpression();
-			}
-			if(lhs == null || rhs == null)
+			if (lhs instanceof JSDefinitionExpression definitionExpression)
 			{
-				return false;
+				lhs = definitionExpression.getExpression();
 			}
-			if(!(rhs instanceof JSBinaryExpression))
-			{
-				return false;
+			if (lhs == null || !(rhs instanceof JSBinaryExpression)) {
+        return false;
 			}
 			final JSBinaryExpression binaryRhs = (JSBinaryExpression) rhs;
 			final JSExpression rhsRhs = binaryRhs.getROperand();
 			final JSExpression rhsLhs = binaryRhs.getLOperand();
 
-			if(rhsRhs == null)
+			if (rhsRhs == null)
 			{
 				return false;
 			}
 
 			final IElementType rhsTokenType = binaryRhs.getOperationSign();
 
-			if(JSTokenTypes.OROR.equals(rhsTokenType) ||
-					JSTokenTypes.ANDAND.equals(rhsTokenType))
-			{
-				return false;
-			}
-			if(SideEffectChecker.mayHaveSideEffects(lhs))
-			{
-				return false;
-			}
-			return EquivalenceChecker.expressionsAreEquivalent(lhs, rhsLhs);
+			return !JSTokenTypes.OROR.equals(rhsTokenType)
+				&& !JSTokenTypes.ANDAND.equals(rhsTokenType)
+				&& !SideEffectChecker.mayHaveSideEffects(lhs)
+				&& EquivalenceChecker.expressionsAreEquivalent(lhs, rhsLhs);
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index 4db8293e..a9411491 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -16,7 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.string;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
@@ -27,10 +27,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSDoubleToSingleQuotedStringIntention", categories = {
-		"JavaScript",
-		"Other"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSDoubleToSingleQuotedStringIntention",
+	categories = {"JavaScript", "Other"},
+	fileExtensions = "js"
+)
 public class JSDoubleToSingleQuotedStringIntention extends JSIntention
 {
 	@Override
@@ -41,6 +42,7 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSLiteralExpression stringLiteral = (JSLiteralExpression) element;
@@ -54,11 +56,11 @@ static String changeQuotes(String stringLiteral)
 		int simpleIndex = stringLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE);
 		int doubleIndex = stringLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, stringLiteral.length() - 2);
 
-		while(simpleIndex >= 0 || doubleIndex > 0)
+		while (simpleIndex >= 0 || doubleIndex > 0)
 		{
-			if(simpleIndex > doubleIndex)
+			if (simpleIndex > doubleIndex)
 			{
-				if(stringLiteral.charAt(simpleIndex - 1) != StringUtil.BACKSLASH)
+				if (stringLiteral.charAt(simpleIndex - 1) != StringUtil.BACKSLASH)
 				{
 					buffer.insert(simpleIndex, StringUtil.BACKSLASH);
 				}
@@ -66,7 +68,7 @@ static String changeQuotes(String stringLiteral)
 			}
 			else
 			{
-				if(stringLiteral.charAt(doubleIndex - 1) == StringUtil.BACKSLASH)
+				if (stringLiteral.charAt(doubleIndex - 1) == StringUtil.BACKSLASH)
 				{
 					buffer.deleteCharAt(doubleIndex - 1);
 				}
@@ -81,15 +83,10 @@ static String changeQuotes(String stringLiteral)
 
 	private static class DoubleToSingleQuotedStringPredicate implements JSElementPredicate
 	{
-
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSLiteralExpression))
-			{
-				return false;
-			}
-			return StringUtil.isDoubleQuoteStringLiteral((JSLiteralExpression) element);
+			return element instanceof JSLiteralExpression literalExpression && StringUtil.isDoubleQuoteStringLiteral(literalExpression);
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index fade7b3e..63c0b6f9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.string;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -27,10 +28,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSSingleToDoubleQuotedStringIntention", categories = {
-		"JavaScript",
-		"Other"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSSingleToDoubleQuotedStringIntention",
+	categories = {"JavaScript", "Other"},
+	fileExtensions = "js"
+)
 public class JSSingleToDoubleQuotedStringIntention extends JSIntention
 {
 	@Override
@@ -41,6 +43,7 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSLiteralExpression charLiteral = (JSLiteralExpression) element;
@@ -54,11 +57,11 @@ static String changeQuotes(String charLiteral)
 		int simpleIndex = charLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, charLiteral.length() - 2);
 		int doubleIndex = charLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE);
 
-		while(simpleIndex > 0 || doubleIndex >= 0)
+		while (simpleIndex > 0 || doubleIndex >= 0)
 		{
-			if(simpleIndex > doubleIndex)
+			if (simpleIndex > doubleIndex)
 			{
-				if(charLiteral.charAt(simpleIndex - 1) == StringUtil.BACKSLASH)
+				if (charLiteral.charAt(simpleIndex - 1) == StringUtil.BACKSLASH)
 				{
 					buffer.deleteCharAt(simpleIndex - 1);
 				}
@@ -66,7 +69,7 @@ static String changeQuotes(String charLiteral)
 			}
 			else
 			{
-				if(charLiteral.charAt(doubleIndex - 1) != StringUtil.BACKSLASH)
+				if (charLiteral.charAt(doubleIndex - 1) != StringUtil.BACKSLASH)
 				{
 					buffer.insert(doubleIndex, StringUtil.BACKSLASH);
 				}
@@ -84,14 +87,7 @@ private static class SingleToDoubleQuotedStringPredicate implements JSElementPre
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSLiteralExpression))
-			{
-				return false;
-			}
-
-			final JSLiteralExpression expression = (JSLiteralExpression) element;
-
-			return StringUtil.isSimpleQuoteStringLiteral(expression);
+			return element instanceof JSLiteralExpression expression && StringUtil.isSimpleQuoteStringLiteral(expression);
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index 43c98e14..eac6bf5e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -17,6 +17,7 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -33,13 +34,13 @@
 import java.util.*;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSReplaceSwitchWithIfIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSReplaceSwitchWithIfIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSReplaceSwitchWithIfIntention extends JSIntention
 {
-
 	@NonNls
 	private static final String IF_PREFIX = "if (";
 	@NonNls
@@ -63,6 +64,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSSwitchStatement switchStatement = (JSSwitchStatement) element.getParent();
@@ -110,9 +112,9 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 					.append(':');
 		}
 
-		final List<SwitchStatementBranch> openBranches = new ArrayList<SwitchStatementBranch>();
-		final Set<JSVariable> declaredVars = new HashSet<JSVariable>(5);
-		final List<SwitchStatementBranch> allBranches = new ArrayList<SwitchStatementBranch>();
+		final List<SwitchStatementBranch> openBranches = new ArrayList<>();
+		final Set<JSVariable> declaredVars = new HashSet<>(5);
+		final List<SwitchStatementBranch> allBranches = new ArrayList<>();
 		SwitchStatementBranch currentBranch = null;
 
 		for(JSCaseClause caseClause : switchStatement.getCaseClauses())
@@ -157,27 +159,24 @@ else if(child instanceof JSStatement)
 					// Processes case clause statements
 					final JSStatement statement = (JSStatement) child;
 
-					if(statement instanceof JSVarStatement)
+					if (statement instanceof JSVarStatement)
 					{
-						for(JSVariable variable : ((JSVarStatement) statement).getVariables())
-						{
-							declaredVars.add(variable);
-						}
+						Collections.addAll(declaredVars, ((JSVarStatement)statement).getVariables());
 					}
-					else if(statement instanceof JSBlockStatement)
+					else if (statement instanceof JSBlockStatement)
 					{
-						for(PsiElement blockElement : statement.getChildren())
+						for (PsiElement blockElement : statement.getChildren())
 						{
 							final boolean isJsElement = (blockElement instanceof JSElement);
 							final boolean isWhiteSpace = (blockElement instanceof PsiWhiteSpace);
 
-							for(SwitchStatementBranch branch : openBranches)
+							for (SwitchStatementBranch branch : openBranches)
 							{
-								if(isJsElement)
+								if (isJsElement)
 								{
 									branch.addStatement((JSElement) blockElement);
 								}
-								else if(isWhiteSpace)
+								else if (isWhiteSpace)
 								{
 									branch.addWhiteSpace(blockElement);
 								}
@@ -190,13 +189,13 @@ else if(isWhiteSpace)
 					}
 					else
 					{
-						for(SwitchStatementBranch branch : openBranches)
+						for (SwitchStatementBranch branch : openBranches)
 						{
 							branch.addStatement(statement);
 						}
 					}
 
-					if(!ControlFlowUtils.statementMayCompleteNormally(statement))
+					if (!ControlFlowUtils.statementMayCompleteNormally(statement))
 					{
 						currentBranch = null;
 					}
@@ -205,9 +204,9 @@ else if(isWhiteSpace)
 				{
 					final boolean isWhiteSpace = (child instanceof PsiWhiteSpace);
 
-					for(SwitchStatementBranch openBranch : openBranches)
+					for (SwitchStatementBranch openBranch : openBranches)
 					{
-						if(isWhiteSpace)
+						if (isWhiteSpace)
 						{
 							openBranch.addWhiteSpace(child);
 						}
@@ -223,9 +222,9 @@ else if(isWhiteSpace)
 		boolean firstBranch = true;
 		SwitchStatementBranch defaultBranch = null;
 
-		for(SwitchStatementBranch branch : allBranches)
+		for (SwitchStatementBranch branch : allBranches)
 		{
-			if(branch.isDefault())
+			if (branch.isDefault())
 			{
 				defaultBranch = branch;
 			}
@@ -235,24 +234,35 @@ else if(isWhiteSpace)
 				final List<PsiElement> bodyElements = branch.getBodyElements();
 				final Set<JSVariable> pendingVariableDeclarations = branch.getPendingVariableDeclarations();
 
-				dumpBranch(ifStatementBuffer, expressionText,
-						labels, bodyElements, firstBranch,
-						renameBreaks && CaseUtil.containsHiddenBreak(bodyElements), breakLabel,
-						pendingVariableDeclarations);
+				dumpBranch(
+					ifStatementBuffer,
+					expressionText,
+					labels,
+					bodyElements,
+					firstBranch,
+					renameBreaks && CaseUtil.containsHiddenBreak(bodyElements),
+					breakLabel,
+					pendingVariableDeclarations
+				);
 				firstBranch = false;
 			}
 		}
-		if(defaultBranch != null)
+		if (defaultBranch != null)
 		{
 			final List<PsiElement> bodyElements = defaultBranch.getBodyElements();
 			final Set<JSVariable> pendingVariableDeclarations = defaultBranch.getPendingVariableDeclarations();
 
-			dumpDefaultBranch(ifStatementBuffer, bodyElements,
-					firstBranch, renameBreaks, breakLabel,
-					pendingVariableDeclarations);
+			dumpDefaultBranch(
+				ifStatementBuffer,
+				bodyElements,
+				firstBranch,
+				renameBreaks,
+				breakLabel,
+				pendingVariableDeclarations
+			);
 		}
 
-		if(hadSideEffects)
+		if (hadSideEffects)
 		{
 			final String ifStatementString = ifStatementBuffer.toString();
 			final JSStatement declarationStatement = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), declarationString).getPsi();
@@ -272,72 +282,74 @@ else if(isWhiteSpace)
 		}
 	}
 
-	private static void dumpBranch(StringBuilder ifStatementString,
-								   String expressionText,
-								   List<String> labels,
-								   List<PsiElement> bodyStatements,
-								   boolean firstBranch,
-								   boolean renameBreaks,
-								   String breakLabel,
-								   Set<JSVariable> variableDecls)
+	@RequiredReadAction
+	private static void dumpBranch(
+		StringBuilder ifStatementString,
+		String expressionText,
+		List<String> labels,
+		List<PsiElement> bodyStatements,
+		boolean firstBranch,
+		boolean renameBreaks,
+		String breakLabel,
+		Set<JSVariable> variableDecls
+	)
 	{
-		if(!firstBranch)
+		if (!firstBranch)
 		{
 			ifStatementString.append(ELSE_KEYWORD);
 		}
 		dumpLabels(ifStatementString, expressionText, labels);
-		dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel,
-				variableDecls);
+		dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel, variableDecls);
 	}
 
-	private static void dumpDefaultBranch(StringBuilder ifStatementString,
-										  List<PsiElement> bodyStatements,
-										  boolean firstBranch,
-										  boolean renameBreaks,
-										  String breakLabel,
-										  Set<JSVariable> variableDecls)
+	@RequiredReadAction
+	private static void dumpDefaultBranch(
+		StringBuilder ifStatementString,
+		List<PsiElement> bodyStatements,
+		boolean firstBranch,
+		boolean renameBreaks,
+		String breakLabel,
+		Set<JSVariable> variableDecls
+	)
 	{
-		if(!firstBranch)
+		if (!firstBranch)
 		{
 			ifStatementString.append(ELSE_KEYWORD);
 		}
-		dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel,
-				variableDecls);
+		dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel, variableDecls);
 	}
 
-	private static void dumpLabels(StringBuilder ifStatementString,
-								   String expressionText,
-								   List<String> labels)
+	private static void dumpLabels(StringBuilder ifStatementString, String expressionText, List<String> labels)
 	{
 		boolean firstLabel = true;
 
 		ifStatementString.append(IF_PREFIX);
-		for(String label : labels)
+		for (String label : labels)
 		{
-			if(!firstLabel)
+			if (!firstLabel)
 			{
 				ifStatementString.append("||");
 			}
 			firstLabel = false;
 
-			ifStatementString.append(expressionText)
-					.append("==")
-					.append(label);
+			ifStatementString.append(expressionText).append("==").append(label);
 		}
 		ifStatementString.append(')');
 	}
 
-	private static void dumpBody(StringBuilder ifStatementString,
-								 List<PsiElement> bodyStatements,
-								 boolean renameBreaks,
-								 String breakLabel,
-								 Set<JSVariable> variableDecls)
+	@RequiredReadAction
+	private static void dumpBody(
+		StringBuilder ifStatementString,
+		List<PsiElement> bodyStatements,
+		boolean renameBreaks,
+		String breakLabel,
+		Set<JSVariable> variableDecls
+	)
 	{
-
 		ifStatementString.append('{');
-		for(final JSVariable var : variableDecls)
+		for (final JSVariable var : variableDecls)
 		{
-			if(CaseUtil.isUsedByStatementList(var, bodyStatements))
+			if (CaseUtil.isUsedByStatementList(var, bodyStatements))
 			{
 				ifStatementString.append(VAR_PREFIX)
 						.append(var.getName())
@@ -345,9 +357,9 @@ private static void dumpBody(StringBuilder ifStatementString,
 			}
 		}
 
-		for(final PsiElement bodyStatement : bodyStatements)
+		for (final PsiElement bodyStatement : bodyStatements)
 		{
-			if(!(bodyStatement instanceof JSBreakStatement))
+			if (!(bodyStatement instanceof JSBreakStatement))
 			{
 				appendElement(ifStatementString, bodyStatement, renameBreaks,
 						breakLabel);
@@ -356,50 +368,49 @@ private static void dumpBody(StringBuilder ifStatementString,
 		ifStatementString.append('}');
 	}
 
-	private static void appendElement(StringBuilder ifStatementString,
-									  PsiElement element,
-									  boolean renameBreakElements,
-									  String breakLabelString)
+	@RequiredReadAction
+	private static void appendElement(
+		StringBuilder ifStatementString,
+		PsiElement element,
+		boolean renameBreakElements,
+		String breakLabelString
+	)
 	{
-		if(!renameBreakElements)
+		if (!renameBreakElements)
 		{
 			final String text = element.getText();
 
 			ifStatementString.append(text);
 		}
-		else if(element instanceof JSBreakStatement)
+		else if (element instanceof JSBreakStatement breakStatement)
 		{
-			final String identifier = ((JSBreakStatement) element).getLabel();
+			final String identifier = breakStatement.getLabel();
 
-			if(identifier == null || identifier.length() == 0)
+			if (identifier == null || identifier.isEmpty())
 			{
-				ifStatementString.append(BREAK_KEYWORD)
-						.append(breakLabelString)
-						.append(';');
+				ifStatementString.append(BREAK_KEYWORD).append(breakLabelString).append(';');
 			}
 			else
 			{
-				final String text = element.getText();
-				ifStatementString.append(text);
+				ifStatementString.append(element.getText());
 			}
 		}
-		else if(element instanceof JSBlockStatement)
+		else if (element instanceof JSBlockStatement)
 		{
-			for(final PsiElement child : element.getChildren())
+			for (final PsiElement child : element.getChildren())
 			{
 				appendElement(ifStatementString, child, renameBreakElements, breakLabelString);
 			}
 		}
-		else if(element instanceof JSIfStatement)
+		else if (element instanceof JSIfStatement ifStatement)
 		{
-			JSIfStatement ifStatement = (JSIfStatement) element;
 			JSStatement elseBranch = ifStatement.getElse();
 
 			ifStatementString.append(IF_PREFIX)
 					.append(ifStatement.getCondition().getText())
 					.append(IF_SUFFIX);
 			appendElement(ifStatementString, ifStatement.getThen(), renameBreakElements, breakLabelString);
-			if(elseBranch != null)
+			if (elseBranch != null)
 			{
 				ifStatementString.append(ELSE);
 				appendElement(ifStatementString, elseBranch, renameBreakElements, breakLabelString);
@@ -419,28 +430,30 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
 			final PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSSwitchStatement))
+			if (parent instanceof JSSwitchStatement switchStatement)
 			{
-				return false;
+				if (ErrorUtil.containsError(switchStatement))
+				{
+					return false;
+				}
+
+				final JSExpression expression = switchStatement.getSwitchExpression();
+
+				return expression != null && expression.isValid();
 			}
-			final JSSwitchStatement switchStatement = (JSSwitchStatement) parent;
-			if(ErrorUtil.containsError(switchStatement))
+			else
 			{
 				return false;
 			}
-
-			final JSExpression expression = switchStatement.getSwitchExpression();
-
-			return (expression != null && expression.isValid());
 		}
 	}
 
 	private static class SwitchStatementBranch
 	{
-		private final Set<JSVariable> pendingVariableDeclarations = new HashSet<JSVariable>(5);
-		private final List<String> labels = new ArrayList<String>(2);
-		private final List<PsiElement> bodyElements = new ArrayList<PsiElement>(5);
-		private final List<PsiElement> pendingWhiteSpace = new ArrayList<PsiElement>(2);
+		private final Set<JSVariable> pendingVariableDeclarations = new HashSet<>(5);
+		private final List<String> labels = new ArrayList<>(2);
+		private final List<PsiElement> bodyElements = new ArrayList<>(5);
+		private final List<PsiElement> pendingWhiteSpace = new ArrayList<>(2);
 		private boolean isDefault;
 		private boolean hasStatements;
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 0b9176c3..63149a54 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -30,10 +30,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSSimplifyIfElseIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSSimplifyIfElseIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSSimplifyIfElseIntention extends JSIntention
 {
 	@Override
@@ -46,7 +47,7 @@ public JSElementPredicate getElementPredicate()
 	@Override
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
-		final PsiElement statement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+		final PsiElement statement = element.getParent() instanceof JSIfStatement ? element.getParent() : element;
 
 		ConditionalUtils.replaceAssignmentOrReturnIfSimplifiable((JSIfStatement) statement);
 	}
@@ -56,16 +57,16 @@ private static class SimplifyIfElsePredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSElement))
+			if (!(element instanceof JSElement))
 			{
 				return false;
 			}
 
 			PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSIfStatement))
+			if (!(parent instanceof JSIfStatement))
 			{
-				if(element instanceof JSIfStatement)
+				if (element instanceof JSIfStatement)
 				{
 					parent = element;
 				}
@@ -74,7 +75,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 					return false;
 				}
 			}
-			if(ErrorUtil.containsError(parent))
+			if (ErrorUtil.containsError(parent))
 			{
 				return false;
 			}
@@ -82,20 +83,19 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 			final JSExpression condition = ifStatement.getCondition();
 
-			if(condition == null || !condition.isValid())
+			if (condition == null || !condition.isValid())
 			{
 				return false;
 			}
 
-			return (ConditionalUtils.isSimplifiableAssignment(ifStatement, false) ||
-					ConditionalUtils.isSimplifiableAssignment(ifStatement, true) ||
-					ConditionalUtils.isSimplifiableReturn(ifStatement, false) ||
-					ConditionalUtils.isSimplifiableReturn(ifStatement, true) ||
-					ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, false) ||
-					ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, true) ||
-					ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, false) ||
-					ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, true));
-
+			return ConditionalUtils.isSimplifiableAssignment(ifStatement, false)
+				|| ConditionalUtils.isSimplifiableAssignment(ifStatement, true)
+				|| ConditionalUtils.isSimplifiableReturn(ifStatement, false)
+				|| ConditionalUtils.isSimplifiableReturn(ifStatement, true)
+				|| ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, false)
+				|| ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, true)
+				|| ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, false)
+				|| ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, true);
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index e78afee8..b3b153f6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -17,7 +17,7 @@
 
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
@@ -29,10 +29,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSSplitElseIfIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSSplitElseIfIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSSplitElseIfIntention extends JSIntention
 {
 	@Override
@@ -43,6 +44,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSIfStatement parentStatement = (JSIfStatement) element.getParent();
@@ -62,22 +64,21 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
 			final PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSIfStatement))
+			if (!(parent instanceof JSIfStatement))
 			{
 				return false;
 			}
 
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 
-			if(ErrorUtil.containsError(ifStatement))
+			if (ErrorUtil.containsError(ifStatement))
 			{
 				return false;
 			}
 			final JSStatement thenBranch = ifStatement.getThen();
 			final JSStatement elseBranch = ifStatement.getElse();
 
-			return (thenBranch != null && elseBranch != null &&
-					elseBranch instanceof JSIfStatement);
+			return thenBranch != null && elseBranch != null && elseBranch instanceof JSIfStatement;
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index 7dd47c43..f9a97ced 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -33,10 +34,11 @@
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSSplitIfAndIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSSplitIfAndIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSSplitIfAndIntention extends JSIntention
 {
 	@NonNls
@@ -54,6 +56,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
@@ -71,29 +74,27 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final JSStatement thenBranch = ifStatement.getThen();
 		final JSStatement elseBranch = ifStatement.getElse();
 		final String thenText = thenBranch.getText();
-		final String elseText = ((elseBranch == null) ? null : elseBranch.getText());
-		final int elseLength = ((elseBranch == null) ? 0 : elseText.length());
+		final String elseText = (elseBranch == null) ? null : elseBranch.getText();
+		final int elseLength = (elseBranch == null) ? 0 : elseText.length();
 
-		assert (condition.getOperationSign().equals(JSTokenTypes.ANDAND));
+		assert JSTokenTypes.ANDAND.equals(condition.getOperationSign());
 
 		final StringBuilder statement = new StringBuilder(ifStatement.getTextLength() + elseLength + 30);
 
 		statement.append(IF_STATEMENT_PREFIX)
-				.append(lhsText)
-				.append(INNER_IF_STATEMENT_PREFIX)
-				.append(rhsText)
-				.append(')')
-				.append(thenText);
-		if(elseBranch != null)
+			.append(lhsText)
+			.append(INNER_IF_STATEMENT_PREFIX)
+			.append(rhsText)
+			.append(')')
+			.append(thenText);
+		if (elseBranch != null)
 		{
-			statement.append(ELSE_KEYWORD)
-					.append(elseText);
+			statement.append(ELSE_KEYWORD).append(elseText);
 		}
 		statement.append('}');
-		if(elseBranch != null)
+		if (elseBranch != null)
 		{
-			statement.append(ELSE_KEYWORD)
-					.append(elseText);
+			statement.append(ELSE_KEYWORD).append(elseText);
 		}
 
 		JSElementFactory.replaceStatement(ifStatement, statement.toString());
@@ -102,13 +103,14 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 	private static class SplitIfAndPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
 			PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSIfStatement))
+			if (!(parent instanceof JSIfStatement))
 			{
-				if(element instanceof JSIfStatement)
+				if (element instanceof JSIfStatement)
 				{
 					parent = element;
 				}
@@ -121,13 +123,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 			final JSExpression condition = ifStatement.getCondition();
 
-			if(condition == null || ErrorUtil.containsError(condition))
-			{
-				return false;
-			}
-
-			return (condition instanceof JSBinaryExpression &&
-					((JSBinaryExpression) condition).getOperationSign().equals(JSTokenTypes.ANDAND));
+			return condition != null && !ErrorUtil.containsError(condition) && condition instanceof JSBinaryExpression binaryExpression
+				&& JSTokenTypes.ANDAND.equals(binaryExpression.getOperationSign());
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index 4ba0fa15..5617ce93 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -29,24 +30,17 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSSplitIfOrIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSSplitIfOrIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSSplitIfOrIntention extends JSIntention
 {
-	@NonNls
-	private static final String IF_STATEMENT_PREFIX = "if (";
-	@NonNls
-	private static final String ELSE_IF_STATEMENT_PREFIX = "else if (";
-	@NonNls
-	private static final String ELSE_KEYWORD = "else ";
-
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
@@ -55,6 +49,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
@@ -73,22 +68,18 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final JSStatement elseBranch = ifStatement.getElse();
 		final String thenText = thenBranch.getText();
 
-		assert (condition.getOperationSign().equals(JSTokenTypes.OROR));
+		assert JSTokenTypes.OROR.equals(condition.getOperationSign());
 
 		final StringBuilder statement = new StringBuilder(ifStatement.getTextLength());
 
-		statement.append(IF_STATEMENT_PREFIX)
-				.append(lhsText)
-				.append(')')
-				.append(thenText)
-				.append(ELSE_IF_STATEMENT_PREFIX)
-				.append(rhsText)
-				.append(')')
-				.append(thenText);
-		if(elseBranch != null)
+		statement.append("if (").append(lhsText).append(')')
+			.append(thenText)
+			.append("else if (").append(rhsText).append(')')
+			.append(thenText);
+
+		if (elseBranch != null)
 		{
-			statement.append(ELSE_KEYWORD)
-					.append(elseBranch.getText());
+			statement.append("else ").append(elseBranch.getText());
 		}
 
 		JSElementFactory.replaceStatement(ifStatement, statement.toString());
@@ -97,13 +88,14 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 	private static class SplitIfOrPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
 			PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSIfStatement))
+			if (!(parent instanceof JSIfStatement))
 			{
-				if(element instanceof JSIfStatement)
+				if (element instanceof JSIfStatement)
 				{
 					parent = element;
 				}
@@ -116,13 +108,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 			final JSExpression condition = ifStatement.getCondition();
 
-			if(condition == null || ErrorUtil.containsError(condition))
-			{
-				return false;
-			}
-
-			return (condition instanceof JSBinaryExpression &&
-					((JSBinaryExpression) condition).getOperationSign().equals(JSTokenTypes.OROR));
+			return condition != null && !ErrorUtil.containsError(condition) && condition instanceof JSBinaryExpression binaryExpression
+				&& JSTokenTypes.OROR.equals(binaryExpression.getOperationSign());
 		}
 	}
 }

From 6b77409566101700621100029bd7504bb80ac28a Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Wed, 17 Jul 2024 19:13:59 +0300
Subject: [PATCH 199/340] Remaining Intention classes refactoring.

---
 .../lang/javascript/JSTokenTypes.java         | 170 +++++++++--
 .../intention/JSMutablyNamedIntention.java    |   4 +-
 .../braces/JSAddBracesIntention.java          |  34 +--
 .../braces/JSRemoveBracesIntention.java       |  33 +--
 .../JSChangeToEndOfLineCommentIntention.java  |   8 +-
 .../JSMoveCommentToSeparateLineIntention.java |  41 ++-
 .../conditional/JSFlipIfIntention.java        |  44 ++-
 .../JSRemoveConditionalIntention.java         |  34 +--
 .../JSReplaceConditionalWithIfIntention.java  |   9 +-
 ...DeclarationAndInitializationIntention.java |  75 +++--
 ...DeclarationAndInitializationIntention.java |   4 +-
 .../JSMergeParallelForInLoopsIntention.java   |  88 +++---
 .../JSMergeParallelForLoopsIntention.java     |  64 ++---
 .../JSConvertIntegerToOctalIntention.java     |   8 +-
 ...RemoveUnnecessaryParenthesesIntention.java |  52 ++--
 ...inConcatenatedStringLiteralsIntention.java |  57 ++--
 .../JSReplaceIfWithSwitchIntention.java       | 271 ++++++++----------
 .../JSReplaceSwitchWithIfIntention.java       |  31 +-
 .../trivialif/JSMergeElseIfIntention.java     |  60 +---
 .../trivialif/JSMergeIfAndIntention.java      |  35 +--
 .../trivialif/JSMergeIfOrIntention.java       | 118 +++-----
 .../JSMergeParallelIfsIntention.java          |  68 ++---
 .../JSRemoveRedundantElseIntention.java       |  51 ++--
 .../JSReplaceIfWithConditionalIntention.java  | 131 ++++-----
 24 files changed, 674 insertions(+), 816 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 04641b25..79560473 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -168,13 +168,13 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 		{
 			PsiBuilder.Marker root = builder.mark();
 			Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
-			if(builder.getTokenType() != JSTokenTypes.RBRACE)
+			if (builder.getTokenType() != JSTokenTypes.RBRACE)
 			{
 				context.getExpressionParsing().parseExpression(builder);
 			}
 			Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
 
-			while(!builder.eof())
+			while (!builder.eof())
 			{
 				builder.advanceLexer();
 			}
@@ -187,8 +187,25 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType XML_ENTITY_REF = new JSElementType("XML_ENTITY_REF");
 	IElementType XML_TAG_WHITE_SPACE = new JSElementType("XML_TAG_WHITESPACE");
 
-	TokenSet XML_TOKENS = TokenSet.create(XML_START_TAG_START, XML_START_TAG_LIST, XML_END_TAG_LIST, XML_END_TAG_START, XML_EMPTY_TAG_END, XML_NAME, XML_TAG_NAME, XML_ATTR_EQUAL, XML_ATTR_VALUE,
-			XML_ATTR_VALUE_START, XML_ATTR_VALUE_END, XML_TAG_END, XML_JS_SCRIPT, XML_TAG_CONTENT, XML_STYLE_COMMENT, XML_ENTITY_REF, XML_TAG_WHITE_SPACE);
+	TokenSet XML_TOKENS = TokenSet.create(
+		XML_ATTR_EQUAL,
+		XML_ATTR_VALUE,
+		XML_ATTR_VALUE_END,
+		XML_ATTR_VALUE_START,
+		XML_EMPTY_TAG_END,
+		XML_END_TAG_LIST,
+		XML_END_TAG_START,
+		XML_ENTITY_REF,
+		XML_JS_SCRIPT,
+		XML_NAME,
+		XML_START_TAG_LIST,
+		XML_START_TAG_START,
+		XML_STYLE_COMMENT,
+		XML_TAG_CONTENT,
+		XML_TAG_END,
+		XML_TAG_NAME,
+		XML_TAG_WHITE_SPACE
+	);
 
 	@Deprecated
 	// FIXME [VISTALL] what the heck? maybe old jsp inject support
@@ -202,17 +219,75 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType NULL_KEYWORD = new JSElementType("NULL_KEYWORD");
 	IElementType UNDEFINED_KEYWORD = new JSElementType("UNDEFINED_KEYWORD");
 
-	TokenSet JS_KEYWORDS = TokenSet.create(BREAK_KEYWORD, CASE_KEYWORD, CATCH_KEYWORD, CONST_KEYWORD, CONTINUE_KEYWORD, DELETE_KEYWORD, DEFAULT_KEYWORD, DO_KEYWORD, ELSE_KEYWORD, FINALLY_KEYWORD,
-			FOR_KEYWORD, FUNCTION_KEYWORD, IF_KEYWORD, IN_KEYWORD, INSTANCEOF_KEYWORD, NEW_KEYWORD, RETURN_KEYWORD, SWITCH_KEYWORD, THIS_KEYWORD, THROW_KEYWORD, TRY_KEYWORD, TYPEOF_KEYWORD,
-			VAR_KEYWORD, VOID_KEYWORD, WHILE_KEYWORD, WITH_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, NULL_KEYWORD, UNDEFINED_KEYWORD, YIELD_KEYWORD, LET_KEYWORD);
-
-	TokenSet JS2_KEYWORDS = TokenSet.create(INTERNAL_KEYWORD, DYNAMIC_KEYWORD, FINAL_KEYWORD, NATIVE_KEYWORD, VIRTUAL_KEYWORD,
-			CLASS_KEYWORD, EXTENDS_KEYWORD, IMPORT_KEYWORD, USE_KEYWORD, NAMESPACE_KEYWORD, OVERRIDE_KEYWORD, INCLUDE_KEYWORD,
-			SUPER_KEYWORD, IS_KEYWORD, AS_KEYWORD, GET_KEYWORD, SET_KEYWORD, EACH_KEYWORD, INT_KEYWORD, UINT_KEYWORD);
+	TokenSet JS_KEYWORDS = TokenSet.create(
+		BREAK_KEYWORD,
+		CASE_KEYWORD,
+		CATCH_KEYWORD,
+		CONST_KEYWORD,
+		CONTINUE_KEYWORD,
+		DELETE_KEYWORD,
+		DEFAULT_KEYWORD,
+		DO_KEYWORD,
+		ELSE_KEYWORD,
+		FALSE_KEYWORD,
+		FINALLY_KEYWORD,
+		FOR_KEYWORD,
+		FUNCTION_KEYWORD,
+		IF_KEYWORD,
+		IN_KEYWORD,
+		INSTANCEOF_KEYWORD,
+		LET_KEYWORD,
+		NEW_KEYWORD,
+		NULL_KEYWORD,
+		RETURN_KEYWORD,
+		SWITCH_KEYWORD,
+		THIS_KEYWORD,
+		THROW_KEYWORD,
+		TRUE_KEYWORD,
+		TRY_KEYWORD,
+		TYPEOF_KEYWORD,
+		UNDEFINED_KEYWORD,
+		VAR_KEYWORD,
+		VOID_KEYWORD,
+		WHILE_KEYWORD,
+		WITH_KEYWORD,
+		YIELD_KEYWORD
+	);
+
+	TokenSet JS2_KEYWORDS = TokenSet.create(
+		AS_KEYWORD,
+		CLASS_KEYWORD,
+		DYNAMIC_KEYWORD,
+		EACH_KEYWORD,
+		EXTENDS_KEYWORD,
+		FINAL_KEYWORD,
+		GET_KEYWORD,
+		INTERNAL_KEYWORD,
+		NATIVE_KEYWORD,
+		IMPORT_KEYWORD,
+		INT_KEYWORD,
+		IS_KEYWORD,
+		USE_KEYWORD,
+		NAMESPACE_KEYWORD,
+		OVERRIDE_KEYWORD,
+		INCLUDE_KEYWORD,
+		SET_KEYWORD,
+		SUPER_KEYWORD,
+		UINT_KEYWORD,
+		VIRTUAL_KEYWORD
+	);
 
 	TokenSet ECMASCRIPT6_KEYWORDS = TokenSet.create(EXPORT_KEYWORD, ENUM_KEYWORD, FROM_KEYWORD);
 
-	TokenSet ECMASCRIPT6_STRICT_KEYWORDS = TokenSet.create(PUBLIC_KEYWORD, PRIVATE_KEYWORD, PROTECTED_KEYWORD, PACKAGE_KEYWORD, IMPLEMENTS_KEYWORD, INTERFACE_KEYWORD, STATIC_KEYWORD);
+	TokenSet ECMASCRIPT6_STRICT_KEYWORDS = TokenSet.create(
+		IMPLEMENTS_KEYWORD,
+		INTERFACE_KEYWORD,
+		PACKAGE_KEYWORD,
+		PRIVATE_KEYWORD,
+		PROTECTED_KEYWORD,
+		PUBLIC_KEYWORD,
+		STATIC_KEYWORD
+	);
 
 	TokenSet KEYWORDS = TokenSet.orSet(JS_KEYWORDS, JS2_KEYWORDS, ECMASCRIPT6_KEYWORDS);
 
@@ -291,13 +366,41 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 	IElementType CDATA_END = new JSElementType("CDATA_END"); // ]]>
 	IElementType JSDOC_TAG_DATA = new JSElementType("JSDOC_TAG_DATA");
 
-	TokenSet OPERATIONS = TokenSet.create(LT, GT, LE, GE, EQEQ, NE, EQEQEQ, NEQEQ, PLUS, MINUS, MULT, PERC, PLUSPLUS, MINUSMINUS, LTLT, GTGT, GTGTGT, AND, OR, XOR, EXCL, TILDE, ANDAND, OROR, QUEST,
-			COLON, EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIV, DIVEQ, MULTMULT, COMMA, IS_KEYWORD, AS_KEYWORD, OR_OR_EQ, AND_AND_EQ, QUEST_QUEST_EQ,
-			MULT_MULT_EQ);
+	TokenSet OPERATIONS = TokenSet.create(
+		LT, GT, LE, GE,
+		EQEQ, NE, EQEQEQ, NEQEQ,
+		PLUS, MINUS, MULT, PERC,
+		PLUSPLUS, MINUSMINUS, LTLT,
+		GTGT, GTGTGT, AND, OR, XOR,
+		EXCL, TILDE, ANDAND, OROR,
+		QUEST, COLON, EQ, PLUSEQ,
+		MINUSEQ, MULTEQ, PERCEQ, LTLTEQ,
+		GTGTEQ, GTGTGTEQ, ANDEQ, OREQ,
+		XOREQ, DIV, DIVEQ, MULTMULT,
+		COMMA, IS_KEYWORD, AS_KEYWORD,
+		OR_OR_EQ, AND_AND_EQ, QUEST_QUEST_EQ, MULT_MULT_EQ
+	);
 
 	TokenSet ASSOC_OPERATIONS = TokenSet.create(PLUS, MULT, AND, OR, XOR, OROR, ANDAND);
 
-	TokenSet ASSIGNMENT_OPERATIONS = TokenSet.create(EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ, ANDEQ, OREQ, XOREQ, DIVEQ, OR_OR_EQ, AND_AND_EQ, QUEST_QUEST_EQ, MULT_MULT_EQ);
+	TokenSet ASSIGNMENT_OPERATIONS = TokenSet.create(
+		EQ,
+		PLUSEQ,
+		MINUSEQ,
+		MULTEQ,
+		PERCEQ,
+		LTLTEQ,
+		GTGTEQ,
+		GTGTGTEQ,
+		ANDEQ,
+		OREQ,
+		XOREQ,
+		DIVEQ,
+		OR_OR_EQ,
+		AND_AND_EQ,
+		QUEST_QUEST_EQ,
+		MULT_MULT_EQ
+	);
 
 	TokenSet EQUALITY_OPERATIONS = TokenSet.create(EQEQ, NE, EQEQEQ, NEQEQ);
 
@@ -311,11 +414,33 @@ public void parseScriptExpression(JavaScriptParsingContext context, final PsiBui
 
 	TokenSet UNARY_OPERATIONS = TokenSet.create(PLUS, MINUS, PLUSPLUS, MINUSMINUS, TILDE, EXCL, TYPEOF_KEYWORD, VOID_KEYWORD, DELETE_KEYWORD);
 
-	TokenSet COMMENTS = TokenSet.create(END_OF_LINE_COMMENT, DOC_COMMENT, C_STYLE_COMMENT, XML_STYLE_COMMENT, CDATA_START, CDATA_END, XML_STYLE_COMMENT_START,
-			JavaScriptHighlightingLexer.getTagContentTokenType(), XML_TAG_WHITE_SPACE, JSP_TEXT, JSDOC_TAG_DATA);
-
-	TokenSet MODIFIERS = TokenSet.create(PUBLIC_KEYWORD, STATIC_KEYWORD, OVERRIDE_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD, DYNAMIC_KEYWORD, FINAL_KEYWORD, NATIVE_KEYWORD,
-			VIRTUAL_KEYWORD, EXPORT_KEYWORD);
+	TokenSet COMMENTS = TokenSet.create(
+		C_STYLE_COMMENT,
+		CDATA_START,
+		CDATA_END,
+		DOC_COMMENT,
+		END_OF_LINE_COMMENT,
+		JavaScriptHighlightingLexer.getTagContentTokenType(),
+		JSDOC_TAG_DATA,
+		JSP_TEXT,
+		XML_STYLE_COMMENT,
+		XML_STYLE_COMMENT_START,
+		XML_TAG_WHITE_SPACE
+	);
+
+	TokenSet MODIFIERS = TokenSet.create(
+		DYNAMIC_KEYWORD,
+		EXPORT_KEYWORD,
+		FINAL_KEYWORD,
+		INTERNAL_KEYWORD,
+		NATIVE_KEYWORD,
+		OVERRIDE_KEYWORD,
+		PROTECTED_KEYWORD,
+		PRIVATE_KEYWORD,
+		PUBLIC_KEYWORD,
+		STATIC_KEYWORD,
+		VIRTUAL_KEYWORD
+	);
 
 	TokenSet ACCESS_MODIFIERS = TokenSet.create(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD);
 
@@ -341,7 +466,8 @@ protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElemen
 			final Language languageForParser = getLanguageForParser(psi);
 			final LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
 			final LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
-			final PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, createLexer(), languageForParser, languageVersion, chameleon.getChars());
+			final PsiBuilder builder = PsiBuilderFactory.getInstance()
+				.createBuilder(project, chameleon, createLexer(), languageForParser, languageVersion, chameleon.getChars());
 			final JavaScriptParser parser = (JavaScriptParser) ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
 
 			JavaScriptParsingContext parsingContext = parser.createParsingContext();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 37fe5a12..586bd636 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -32,7 +32,7 @@ public abstract class JSMutablyNamedIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		if(myText != null)
+		if (myText != null)
 		{
 			return myText;
 		}
@@ -43,7 +43,7 @@ public String getText()
 	public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node)
 	{
 		final PsiElement element = findMatchingElement(node);
-		if(element != null)
+		if (element != null)
 		{
 			myText = getTextForElement(element);
 			return true;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index cc7b712e..d40cce39 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -27,7 +27,6 @@
 import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 @IntentionMetaData(
@@ -37,11 +36,6 @@
 )
 public class JSAddBracesIntention extends JSMutablyNamedIntention
 {
-	@NonNls
-	private static final String IF_KEYWORD = "if";
-	@NonNls
-	private static final String ELSE_KEYWORD = "else";
-
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
@@ -50,6 +44,7 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
 	{
 		final JSElement parent = (JSElement) element.getParent();
@@ -57,12 +52,11 @@ protected String getTextForElement(PsiElement element)
 
 		assert (parent != null);
 
-		if(parent instanceof JSIfStatement)
+		if (parent instanceof JSIfStatement ifStatement)
 		{
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
 			final JSStatement elseBranch = ifStatement.getElse();
 
-			keyword = (element.equals(elseBranch) ? ELSE_KEYWORD : IF_KEYWORD);
+			keyword = (element.equals(elseBranch) ? "else" : "if");
 		}
 		else
 		{
@@ -79,11 +73,10 @@ protected String getTextForElement(PsiElement element)
 	@RequiredReadAction
 	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
-		if(!(element instanceof JSStatement))
+		if (!(element instanceof JSStatement statement))
 		{
 			return;
 		}
-		final JSStatement statement = (JSStatement) element;
 		final JSElement parent = (JSElement) element.getParent();
 		final String text = element.getText();
 		String newText = parent.getLastChild() instanceof PsiComment
@@ -95,23 +88,12 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe
 	private static class AddBracesPredicate implements JSElementPredicate
 	{
 		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if(!(element instanceof JSStatement))
-			{
-				return false;
-			}
-			if(element instanceof JSBlockStatement)
-			{
-				return false;
-			}
-
-			final PsiElement parentElement = element.getParent();
-			if (!(parentElement instanceof JSElement))
-			{
+		public boolean satisfiedBy(@Nonnull PsiElement element) {
+			if (!(element instanceof JSStatement)
+				|| element instanceof JSBlockStatement
+				|| !(element.getParent() instanceof JSElement parent)) {
 				return false;
 			}
-			final JSElement parent = (JSElement) parentElement;
 
 			if (parent instanceof JSIfStatement ifStatement)
 			{
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index bbf03e96..7066c59a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -22,13 +22,11 @@
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
-
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 @IntentionMetaData(
@@ -38,11 +36,6 @@
 )
 public class JSRemoveBracesIntention extends JSMutablyNamedIntention
 {
-	@NonNls
-	private static final String IF_KEYWORD = "if";
-	@NonNls
-	private static final String ELSE_KEYWORD = "else";
-
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
@@ -59,12 +52,11 @@ protected String getTextForElement(PsiElement element)
 
 		assert (parent != null);
 
-		if(parent instanceof JSIfStatement)
+		if (parent instanceof JSIfStatement ifStatement)
 		{
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
 			final JSStatement elseBranch = ifStatement.getElse();
 
-			keyword = element.equals(elseBranch) ? ELSE_KEYWORD : IF_KEYWORD;
+			keyword = element.equals(elseBranch) ? "else" : "if";
 		}
 		else
 		{
@@ -126,26 +118,21 @@ public static class RemoveBracesPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if (!(element instanceof JSBlockStatement))
+			if (!(element instanceof JSBlockStatement blockStatement))
 			{
 				return false;
 			}
 
-			final JSBlockStatement blockStatement = (JSBlockStatement) element;
 			final PsiElement parent = blockStatement.getParent();
 
-			if(!(parent instanceof JSIfStatement ||
-					parent instanceof JSWhileStatement ||
-					parent instanceof JSDoWhileStatement ||
-					parent instanceof JSForStatement ||
-					parent instanceof JSForInStatement))
-			{
-				return false;
+			return (parent instanceof JSIfStatement || parent instanceof JSWhileStatement || parent instanceof JSDoWhileStatement
+				|| parent instanceof JSForStatement || parent instanceof JSForInStatement)
+				&& isSingleNonVarStatement(blockStatement.getStatements());
 			}
 
-			final JSStatement[] statements = blockStatement.getStatements();
-
-			return (statements.length == 1 && !(statements[0] instanceof JSVarStatement));
+		private boolean isSingleNonVarStatement(JSStatement[] statements)
+		{
+			return statements.length == 1 && !(statements[0] instanceof JSVarStatement);
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 193873c3..69dc738f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.comment;
 
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -23,13 +24,12 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSChangeToEndOfLineCommentIntention",
@@ -46,6 +46,7 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final PsiElement parent = element.getParent();
@@ -78,7 +79,7 @@ private static String[] buildCommentStrings(String[] lines)
 	{
 		int lastNonEmtpyLine = -1;
 
-		for(int i = lines.length - 1; i >= 0 && lastNonEmtpyLine == -1; i--)
+		for (int i = lines.length - 1; i >= 0 && lastNonEmtpyLine == -1; i--)
 		{
 			final String line = lines[i].trim();
 			if (!line.isEmpty())
@@ -124,6 +125,7 @@ else if (line.startsWith("*"))
 	private static class CStyleCommentPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
 			if (!(element instanceof PsiComment))
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index 0b70d805..540e80ff 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.comment;
 
 import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -30,10 +31,11 @@
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSMoveCommentToSeparateLineIntention", categories = {
-		"JavaScript",
-		"Comments"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSMoveCommentToSeparateLineIntention",
+	categories = {"JavaScript", "Comments"},
+	fileExtensions = "js"
+)
 public class JSMoveCommentToSeparateLineIntention extends JSIntention
 {
 	@Override
@@ -44,20 +46,21 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final PsiComment selectedComment = (PsiComment) element;
 		PsiElement elementToCheck = selectedComment;
 		final PsiWhiteSpace whiteSpace;
 
-		while(true)
+		while (true)
 		{
 			elementToCheck = TreeUtil.getPrevLeaf(elementToCheck);
-			if(elementToCheck == null)
+			if (elementToCheck == null)
 			{
 				return;
 			}
-			if(isLineBreakWhiteSpace(elementToCheck))
+			if (isLineBreakWhiteSpace(elementToCheck))
 			{
 				whiteSpace = (PsiWhiteSpace) elementToCheck;
 				break;
@@ -70,56 +73,52 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		JSElementFactory.removeElement(selectedComment);
 	}
 
+	@RequiredReadAction
 	private static boolean isLineBreakWhiteSpace(PsiElement element)
 	{
-		return (element instanceof PsiWhiteSpace &&
-				containsLineBreak(element.getText()));
+		return (element instanceof PsiWhiteSpace && containsLineBreak(element.getText()));
 	}
 
 	private static boolean containsLineBreak(String text)
 	{
-		return (text.indexOf((int) '\n') >= 0 ||
-				text.indexOf((int) '\r') >= 0);
+		return (text.indexOf((int) '\n') >= 0 || text.indexOf((int) '\r') >= 0);
 	}
 
 	private static class CommentOnLineWithSourcePredicate implements JSElementPredicate
 	{
-
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof PsiComment))
+			if (!(element instanceof PsiComment))
 			{
 				return false;
 			}
 			final PsiComment comment = (PsiComment) element;
 			final IElementType type = comment.getTokenType();
 
-			if(!(JSTokenTypes.C_STYLE_COMMENT.equals(type) ||
-					JSTokenTypes.END_OF_LINE_COMMENT.equals(type)))
+			if (!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.END_OF_LINE_COMMENT.equals(type)))
 			{
 				return false; // can't move JSP comments
 			}
 
 			final PsiElement prevSibling = TreeUtil.getPrevLeaf(element);
-			if(!(prevSibling instanceof PsiWhiteSpace))
+			if (!(prevSibling instanceof PsiWhiteSpace))
 			{
 				return true;
 			}
 			final String prevSiblingText = prevSibling.getText();
-			if(prevSiblingText.indexOf('\n') < 0 &&
-					prevSiblingText.indexOf('\r') < 0)
+			if (prevSiblingText.indexOf('\n') < 0 && prevSiblingText.indexOf('\r') < 0)
 			{
 				return true;
 			}
 			final PsiElement nextSibling = TreeUtil.getNextLeaf(element);
-			if(!(nextSibling instanceof PsiWhiteSpace))
+			if (!(nextSibling instanceof PsiWhiteSpace))
 			{
 				return true;
 			}
 			final String nextSiblingText = nextSibling.getText();
-			return (nextSiblingText.indexOf('\n') < 0 &&
-					nextSiblingText.indexOf('\r') < 0);
+			return (nextSiblingText.indexOf('\n') < 0 && nextSiblingText.indexOf('\r') < 0);
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index 64f9bb2b..8cdaf833 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -19,32 +19,26 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
-
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSFlipIfIntention", categories = {
-		"JavaScript",
-		"Conditional"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSFlipIfIntention",
+	categories = {"JavaScript", "Conditional"},
+	fileExtensions = "js"
+)
 public class JSFlipIfIntention extends JSIntention
 {
-
-	@NonNls
-	private static final String IF_PREFIX = "if (";
-	@NonNls
-	private static final String ELSE_KEYWORD = "else ";
-
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
@@ -53,6 +47,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSIfStatement exp = (JSIfStatement) element;
@@ -60,13 +55,12 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final JSStatement thenBranch = exp.getThen();
 		final JSStatement elseBranch = exp.getElse();
 		final String negatedText = BoolUtils.getNegatedExpressionText(condition);
-		final boolean emptyThenBranch = (thenBranch == null ||
-				(thenBranch instanceof JSBlockStatement &&
-						((JSBlockStatement) thenBranch).getStatements().length == 0));
-		final String thenText = (emptyThenBranch ? "" : ELSE_KEYWORD + thenBranch.getText());
-		final String elseText = ((elseBranch == null) ? "{}" : elseBranch.getText());
+		final boolean emptyThenBranch =
+			(thenBranch == null || (thenBranch instanceof JSBlockStatement blockStatement && blockStatement.getStatements().length == 0));
+		final String thenText = emptyThenBranch ? "" : "else " + thenBranch.getText();
+		final String elseText = elseBranch == null ? "{}" : elseBranch.getText();
 
-		final String newStatement = IF_PREFIX + negatedText + ')' + elseText + thenText;
+		final String newStatement = "if (" + negatedText + ')' + elseText + thenText;
 
 		JSElementFactory.replaceStatement(exp, newStatement);
 	}
@@ -76,15 +70,9 @@ private static class FlipIfPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSIfStatement) ||
-					ErrorUtil.containsError(element))
-			{
-				return false;
-			}
-
-			final JSIfStatement condition = (JSIfStatement) element;
-
-			return (condition.getCondition() != null);
+			return element instanceof JSIfStatement ifStatement
+				&& !ErrorUtil.containsError(ifStatement)
+				&& ifStatement.getCondition() != null;
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 9d97e5f6..c8f48b92 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -17,6 +17,7 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -31,10 +32,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSRemoveConditionalIntention", categories = {
-		"JavaScript",
-		"Conditional"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSRemoveConditionalIntention",
+	categories = {"JavaScript", "Conditional"},
+	fileExtensions = "js"
+)
 public class JSRemoveConditionalIntention extends JSIntention
 {
 	@Override
@@ -45,6 +47,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSConditionalExpression exp = (JSConditionalExpression) element;
@@ -56,33 +59,26 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final String thenExpressionText = thenExpression.getText();
 		final String newExpression;
 
-		newExpression = (thenExpressionText.equals(BoolUtils.TRUE)
-				? condition.getText()
-				: BoolUtils.getNegatedExpressionText(condition));
+		newExpression = thenExpressionText.equals(BoolUtils.TRUE)
+			? condition.getText()
+			: BoolUtils.getNegatedExpressionText(condition);
 		JSElementFactory.replaceExpression(exp, newExpression);
 	}
 
 	private static class RemoveConditionalPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSConditionalExpression))
-			{
-				return false;
-			}
-			if(ErrorUtil.containsError(element))
-			{
+			if (!(element instanceof JSConditionalExpression condition  && !ErrorUtil.containsError(element))) {
 				return false;
 			}
 
-			final JSConditionalExpression condition = (JSConditionalExpression) element;
 			final JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
 			final JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
 
-			if(condition.getCondition() == null ||
-					thenExpression == null ||
-					elseExpression == null)
+			if (condition.getCondition() == null || thenExpression == null || elseExpression == null)
 			{
 				return false;
 			}
@@ -90,8 +86,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final String thenText = thenExpression.getText();
 			final String elseText = elseExpression.getText();
 
-			return ((BoolUtils.TRUE.equals(elseText) && BoolUtils.FALSE.equals(thenText)) ||
-					(BoolUtils.TRUE.equals(thenText) && BoolUtils.FALSE.equals(elseText)));
+			return (BoolUtils.TRUE.equals(elseText) && BoolUtils.FALSE.equals(thenText))
+				|| (BoolUtils.TRUE.equals(thenText) && BoolUtils.FALSE.equals(elseText));
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 2b3c17d3..6e0f566e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -27,10 +27,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSReplaceConditionalWithIfIntention", categories = {
-		"JavaScript",
-		"Conditional"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSReplaceConditionalWithIfIntention",
+	categories = {"JavaScript", "Conditional"},
+	fileExtensions = "js"
+)
 public class JSReplaceConditionalWithIfIntention extends JSIntention
 {
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index c7f0fc62..8aa322f1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.initialization;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -26,20 +27,17 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.FindReferenceUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.Iterator;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSMergeDeclarationAndInitializationIntention", categories = {
-		"JavaScript",
-		"Declaration"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSMergeDeclarationAndInitializationIntention",
+	categories = {"JavaScript", "Declaration"},
+	fileExtensions = "js"
+)
 public class JSMergeDeclarationAndInitializationIntention extends JSIntention
 {
-	@NonNls
-	private static final String JS_VAR_PREFIX = "var ";
-
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
@@ -48,6 +46,7 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		assert (element instanceof JSVarStatement);
@@ -55,39 +54,37 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final JSVarStatement varStatement = (JSVarStatement) element;
 		StringBuilder declarationBuffer = new StringBuilder();
 
-		for(final JSVariable variable : varStatement.getVariables())
+		for (final JSVariable variable : varStatement.getVariables())
 		{
-			if(variable.hasInitializer())
+			if (variable.hasInitializer())
 			{
-				declarationBuffer.append((declarationBuffer.length() == 0) ? JS_VAR_PREFIX : ", ")
-						.append(variable.getName())
-						.append(" = ")
-						.append(variable.getInitializer().getText());
+				declarationBuffer.append(declarationBuffer.isEmpty() ? "var " : ", ")
+					.append(variable.getName()).append(" = ").append(variable.getInitializer().getText());
 			}
 			else
 			{
-				final Iterator<PsiElement> referenceIterator = FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
+				final Iterator<PsiElement> referenceIterator =
+					FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
 				final JSReferenceExpression firstReference = (JSReferenceExpression) (referenceIterator.hasNext() ? referenceIterator.next() : null);
-				//                final JSReferenceExpression firstReference = FindReferenceUtil.findFirstReference(variable);
+				//final JSReferenceExpression firstReference = FindReferenceUtil.findFirstReference(variable);
 
-				if(firstReference != null &&
-						firstReference.getParent() instanceof JSDefinitionExpression)
+				if (firstReference != null && firstReference.getParent() instanceof JSDefinitionExpression definitionExpression)
 				{
-					final JSExpressionStatement assignmentStatement = (JSExpressionStatement) firstReference.getParent().getParent().getParent();
+					final JSExpressionStatement assignmentStatement = (JSExpressionStatement) definitionExpression.getParent().getParent();
 
 					// Replace assignment statement by var statement.
-					JSElementFactory.replaceStatement(assignmentStatement, JS_VAR_PREFIX + assignmentStatement.getText());
+					JSElementFactory.replaceStatement(assignmentStatement, "var " + assignmentStatement.getText());
 				}
 				else
 				{
-					declarationBuffer.append((declarationBuffer.length() == 0) ? JS_VAR_PREFIX : ", ")
+					declarationBuffer.append((declarationBuffer.length() == 0) ? "var " : ", ")
 							.append(variable.getName());
 				}
 			}
 		}
 
 		// Do replacement.
-		if(declarationBuffer.length() == 0)
+		if (declarationBuffer.length() == 0)
 		{
 			JSElementFactory.removeElement(varStatement);
 		}
@@ -103,30 +100,26 @@ private static class Predicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSVarStatement))
-			{
-				return false;
-			}
-			final JSVarStatement varStatement = (JSVarStatement) element;
-			if(ErrorUtil.containsError(varStatement))
-			{
+			if (!(element instanceof JSVarStatement varStatement && !ErrorUtil.containsError(varStatement))) {
 				return false;
 			}
 
-			for(JSVariable variable : varStatement.getVariables())
+			for (JSVariable variable : varStatement.getVariables())
 			{
-				if(!variable.hasInitializer())
-				{
-					final Iterator<PsiElement> referenceIterator = FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
-					final JSReferenceExpression firstReference = (JSReferenceExpression) (referenceIterator.hasNext() ? referenceIterator.next() : null);
+				if (variable.hasInitializer()) {
+					continue;
+				}
 
-					if(firstReference != null &&
-							firstReference.getParent() instanceof JSDefinitionExpression &&
-							firstReference.getParent().getParent() instanceof JSAssignmentExpression &&
-							firstReference.getParent().getParent().getParent() instanceof JSExpressionStatement)
-					{
-						return true;
-					}
+				final Iterator<PsiElement> referenceIterator =
+					FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
+				final JSReferenceExpression firstReference = (JSReferenceExpression) (referenceIterator.hasNext() ? referenceIterator.next() : null);
+
+				if (firstReference != null
+					&& firstReference.getParent() instanceof JSDefinitionExpression definitionExpression
+					&& definitionExpression.getParent() instanceof JSAssignmentExpression assignmentExpression
+					&& assignmentExpression.getParent() instanceof JSExpressionStatement)
+				{
+					return true;
 				}
 			}
 			return false;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index ee941fc5..4cbb4361 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -25,13 +25,13 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -103,7 +103,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
 			PsiElement elementParent;
 
-			if(!(element instanceof JSVarStatement)
+			if (!(element instanceof JSVarStatement)
 				|| (elementParent = element.getParent()) instanceof JSForStatement ||
 					elementParent instanceof JSClass
 			)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index 2f6c26a2..1a8d37f3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -20,7 +20,7 @@
 import com.intellij.lang.javascript.psi.JSForInStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
-import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.ASTNode;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -31,23 +31,17 @@
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSMergeParallelForInLoopsIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSMergeParallelForInLoopsIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSMergeParallelForInLoopsIntention extends JSIntention
 {
-
-	@NonNls
-	private static final String FOR_IN_PREFIX = "for (";
-	@NonNls
-	private static final String FOR_IN_COLLECTION_PREFIX = " in ";
-
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
@@ -56,6 +50,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
@@ -71,9 +66,8 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		JSElementFactory.removeElement(secondStatement);
 	}
 
-	private void mergeForInStatements(StringBuilder statementBuffer,
-									  JSForInStatement firstStatement,
-									  JSForInStatement secondStatement)
+	@RequiredReadAction
+	private void mergeForInStatements(StringBuilder statementBuffer, JSForInStatement firstStatement, JSForInStatement secondStatement)
 	{
 		final JSExpression variableExpression = getVariableExpression(firstStatement);
 		final JSVarStatement declaration = firstStatement.getDeclarationStatement();
@@ -81,11 +75,11 @@ private void mergeForInStatements(StringBuilder statementBuffer,
 		final JSStatement firstBody = firstStatement.getBody();
 		final JSStatement secondBody = secondStatement.getBody();
 
-		statementBuffer.append(FOR_IN_PREFIX)
-				.append((declaration == null) ? variableExpression.getText() : declaration.getText())
-				.append(FOR_IN_COLLECTION_PREFIX)
-				.append(collectionExpression.getText())
-				.append(')');
+		statementBuffer.append("for (")
+			.append((declaration == null) ? variableExpression.getText() : declaration.getText())
+			.append(" in ")
+			.append(collectionExpression.getText())
+			.append(')');
 		ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
 	}
 
@@ -94,59 +88,44 @@ private static class MergeParallelForInLoopsPredicate implements JSElementPredic
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSForInStatement) || ErrorUtil.containsError(element))
+			if (!(element instanceof JSForInStatement forInStatement && !ErrorUtil.containsError(element)))
 			{
 				return false;
 			}
 
 			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
-			if(!(nextStatement instanceof JSForInStatement) ||
-					ErrorUtil.containsError(nextStatement))
-			{
-				return false;
-			}
-
-			return forInStatementsCanBeMerged((JSForInStatement) element,
-					(JSForInStatement) nextStatement);
+			return nextStatement instanceof JSForInStatement nextForInStatement
+				&& !ErrorUtil.containsError(nextStatement)
+				&& forInStatementsCanBeMerged(forInStatement, nextForInStatement);
 		}
 
-		public static boolean forInStatementsCanBeMerged(JSForInStatement statement1,
-														 JSForInStatement statement2)
+		public static boolean forInStatementsCanBeMerged(JSForInStatement statement1, JSForInStatement statement2)
 		{
-
-			//            final JSExpression firstVarExpression  = statement1.getVariableExpression();
-			//            final JSExpression secondVarExpression = statement2.getVariableExpression();
 			final JSExpression firstVarExpression = getVariableExpression(statement1);
 			final JSExpression secondVarExpression = getVariableExpression(statement2);
-			if(!EquivalenceChecker.expressionsAreEquivalent(firstVarExpression,
-					secondVarExpression))
+			if (!EquivalenceChecker.expressionsAreEquivalent(firstVarExpression, secondVarExpression))
 			{
 				return false;
 			}
 
 			final JSVarStatement firstDeclaration = statement1.getDeclarationStatement();
 			final JSVarStatement secondDeclaration = statement2.getDeclarationStatement();
-			if(!EquivalenceChecker.statementsAreEquivalent(firstDeclaration,
-					secondDeclaration))
+			if (!EquivalenceChecker.statementsAreEquivalent(firstDeclaration, secondDeclaration))
 			{
 				return false;
 			}
 
-			//            final JSExpression firstCollection  = statement1.getCollectionExpression();
-			//            final JSExpression secondCollection = statement2.getCollectionExpression();
 			final JSExpression firstCollection = getCollectionExpression(statement1);
 			final JSExpression secondCollection = getCollectionExpression(statement2);
-			if(!EquivalenceChecker.expressionsAreEquivalent(firstCollection,
-					secondCollection))
+			if (!EquivalenceChecker.expressionsAreEquivalent(firstCollection, secondCollection))
 			{
 				return false;
 			}
 
 			final JSStatement firstBody = statement1.getBody();
 			final JSStatement secondBody = statement2.getBody();
-			return (firstBody == null || secondBody == null ||
-					ControlFlowUtils.canBeMerged(firstBody, secondBody));
+			return firstBody == null || secondBody == null || ControlFlowUtils.canBeMerged(firstBody, secondBody);
 		}
 	}
 
@@ -159,18 +138,18 @@ public static boolean forInStatementsCanBeMerged(JSForInStatement statement1,
 	private static JSExpression getCollectionExpression(JSForInStatement forInStatement)
 	{
 		final ASTNode statementNode = forInStatement.getNode();
-		ASTNode child = ((statementNode == null) ? null : statementNode.getFirstChildNode());
+		ASTNode child = (statementNode == null) ? null : statementNode.getFirstChildNode();
 		boolean inPassed = false;
 
-		while(child != null)
+		while (child != null)
 		{
-			if(child.getElementType() == JSTokenTypes.IN_KEYWORD)
+			if (child.getElementType() == JSTokenTypes.IN_KEYWORD)
 			{
 				inPassed = true;
 			}
-			if(inPassed && child.getPsi() instanceof JSExpression)
+			if (inPassed && child.getPsi() instanceof JSExpression childExpression)
 			{
-				return (JSExpression) child.getPsi();
+				return childExpression;
 			}
 			child = child.getTreeNext();
 		}
@@ -187,23 +166,22 @@ private static JSExpression getCollectionExpression(JSForInStatement forInStatem
 	private static JSExpression getVariableExpression(JSForInStatement forInStatement)
 	{
 		final ASTNode statementNode = forInStatement.getNode();
-		ASTNode child = ((statementNode == null) ? null : statementNode.getFirstChildNode());
+		ASTNode child = (statementNode == null) ? null : statementNode.getFirstChildNode();
 
-		while(child != null)
+		while (child != null)
 		{
-			if(child.getElementType() == JSTokenTypes.IN_KEYWORD)
+			if (child.getElementType() == JSTokenTypes.IN_KEYWORD)
 			{
 				return null;
 			}
 
-			if(child.getPsi() instanceof JSExpression)
+			if (child.getPsi() instanceof JSExpression childExpression)
 			{
-				return (JSExpression) child.getPsi();
+				return childExpression;
 			}
 			child = child.getTreeNext();
 		}
 
 		return null;
 	}
-
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index d0c6d1b4..d4da8774 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.JSForStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -29,20 +30,17 @@
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSMergeParallelForLoopsIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSMergeParallelForLoopsIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSMergeParallelForLoopsIntention extends JSIntention
 {
-	@NonNls
-	private static final String FOR_STATEMENT_PREFIX = "for (";
-
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
@@ -51,6 +49,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
@@ -66,9 +65,8 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		JSElementFactory.removeElement(secondStatement);
 	}
 
-	private void mergeForStatements(StringBuilder statementBuffer,
-									JSForStatement firstStatement,
-									JSForStatement secondStatement)
+	@RequiredReadAction
+	private void mergeForStatements(StringBuilder statementBuffer, JSForStatement firstStatement, JSForStatement secondStatement)
 	{
 		final JSExpression initialization = firstStatement.getInitialization();
 		final JSVarStatement varStatement = firstStatement.getVarDeclaration();
@@ -77,13 +75,13 @@ private void mergeForStatements(StringBuilder statementBuffer,
 		final JSStatement firstBody = firstStatement.getBody();
 		final JSStatement secondBody = secondStatement.getBody();
 
-		statementBuffer.append(FOR_STATEMENT_PREFIX)
-				.append((initialization == null) ? varStatement.getText() : initialization.getText())
-				.append(';')
-				.append(condition.getText())
-				.append(';')
-				.append(update.getText())
-				.append(')');
+		statementBuffer.append("for (")
+			.append((initialization == null) ? varStatement.getText() : initialization.getText())
+			.append(';')
+			.append(condition.getText())
+			.append(';')
+			.append(update.getText())
+			.append(')');
 		ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
 	}
 
@@ -92,61 +90,51 @@ private static class MergeParallelForLoopsPredicate implements JSElementPredicat
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSForStatement) || ErrorUtil.containsError(element))
+			if (!(element instanceof JSForStatement forStatement && !ErrorUtil.containsError(forStatement)))
 			{
 				return false;
 			}
 
 			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
-			if(!(nextStatement instanceof JSForStatement) || ErrorUtil.containsError(nextStatement))
-			{
-				return false;
-			}
-
-			return forStatementsCanBeMerged((JSForStatement) element,
-					(JSForStatement) nextStatement);
+			return nextStatement instanceof JSForStatement nextForStatement
+				&& !ErrorUtil.containsError(nextStatement)
+				&& forStatementsCanBeMerged(forStatement, nextForStatement);
 		}
 
-		public static boolean forStatementsCanBeMerged(JSForStatement statement1,
-													   JSForStatement statement2)
+		public static boolean forStatementsCanBeMerged(JSForStatement statement1, JSForStatement statement2)
 		{
 			final JSExpression firstInitialization = statement1.getInitialization();
 			final JSExpression secondInitialization = statement2.getInitialization();
-			if(!EquivalenceChecker.expressionsAreEquivalent(firstInitialization,
-					secondInitialization))
+			if (!EquivalenceChecker.expressionsAreEquivalent(firstInitialization, secondInitialization))
 			{
 				return false;
 			}
 
 			final JSVarStatement firstVarStatement = statement1.getVarDeclaration();
 			final JSVarStatement secondVarStatement = statement2.getVarDeclaration();
-			if(!EquivalenceChecker.statementsAreEquivalent(firstVarStatement,
-					secondVarStatement))
+			if (!EquivalenceChecker.statementsAreEquivalent(firstVarStatement, secondVarStatement))
 			{
 				return false;
 			}
 
 			final JSExpression firstCondition = statement1.getCondition();
 			final JSExpression secondCondition = statement2.getCondition();
-			if(!EquivalenceChecker.expressionsAreEquivalent(firstCondition,
-					secondCondition))
+			if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition, secondCondition))
 			{
 				return false;
 			}
 
 			final JSExpression firstUpdate = statement1.getUpdate();
 			final JSExpression secondUpdate = statement2.getUpdate();
-			if(!EquivalenceChecker.expressionsAreEquivalent(firstUpdate,
-					secondUpdate))
+			if (!EquivalenceChecker.expressionsAreEquivalent(firstUpdate, secondUpdate))
 			{
 				return false;
 			}
 
 			final JSStatement firstBody = statement1.getBody();
 			final JSStatement secondBody = statement2.getBody();
-			return (firstBody == null || secondBody == null ||
-					ControlFlowUtils.canBeMerged(firstBody, secondBody));
+			return (firstBody == null || secondBody == null || ControlFlowUtils.canBeMerged(firstBody, secondBody));
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index ce16fbb8..6e5af520 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -16,17 +16,17 @@
 package org.intellij.idea.lang.javascript.intention.number;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSConvertIntegerToOctalIntention",
@@ -56,7 +56,7 @@ private static class ConvertIntegerToOctalPredicate implements JSElementPredicat
 		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSLiteralExpression))
+			if (!(element instanceof JSLiteralExpression))
 			{
 				return false;
 			}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 10107559..cdd6c673 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.parenthesis;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -30,10 +31,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSRemoveUnnecessaryParenthesesIntention", categories = {
-		"JavaScript",
-		"Other"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSRemoveUnnecessaryParenthesesIntention",
+	categories = {"JavaScript", "Other"},
+	fileExtensions = "js"
+)
 public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention
 {
 	@Override
@@ -48,10 +50,9 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 	{
 		JSExpression exp = (JSExpression) element;
 
-		while(exp.getParent() instanceof JSExpression)
+		while (exp.getParent() instanceof JSExpression parentExp)
 		{
-			exp = (JSExpression) exp.getParent();
-			assert exp != null;
+			exp = parentExp;
 		}
 
 		final String newExpression = ParenthesesUtils.removeParentheses(exp);
@@ -62,52 +63,41 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 	private static class UnnecessaryParenthesesPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSParenthesizedExpression))
+			if (!(element instanceof JSParenthesizedExpression expression && !ErrorUtil.containsError(element)))
 			{
 				return false;
 			}
-			if(ErrorUtil.containsError(element))
-			{
-				return false;
-			}
-
-			final JSParenthesizedExpression expression = (JSParenthesizedExpression) element;
-			final JSElement parent = (JSElement) expression.getParent();
 
-			if(!(parent instanceof JSExpression))
+			if (!(expression.getParent() instanceof JSExpression parentExpression))
 			{
 				return true;
 			}
 
 			final JSExpression body = expression.getInnerExpression();
 
-			if(body instanceof JSParenthesizedExpression)
+			if (body instanceof JSParenthesizedExpression)
 			{
 				return true;
 			}
 
-			final int parentPrecendence = ParenthesesUtils.getPrecendence((JSExpression) parent);
+			final int parentPrecendence = ParenthesesUtils.getPrecendence(parentExpression);
 			final int childPrecendence = ParenthesesUtils.getPrecendence(body);
 
-			if(parentPrecendence > childPrecendence)
+			if (parentPrecendence > childPrecendence)
 			{
-				if(body instanceof JSFunctionExpression)
-				{
-					return false;
-				}
-				return true;
+				return !(body instanceof JSFunctionExpression);
 			}
-			else if(parentPrecendence == childPrecendence)
+			else if (parentPrecendence == childPrecendence)
 			{
-				if(parent instanceof JSBinaryExpression &&
-						body instanceof JSBinaryExpression)
+				if (parentExpression instanceof JSBinaryExpression parentBinaryExpression
+					&& body instanceof JSBinaryExpression bodyBinaryExpression)
 				{
-					final IElementType parentOperator = ((JSBinaryExpression) parent).getOperationSign();
-					final IElementType childOperator = ((JSBinaryExpression) body).getOperationSign();
-					final JSBinaryExpression binaryExpression = (JSBinaryExpression) parent;
-					final JSExpression lhs = binaryExpression.getLOperand();
+					final IElementType parentOperator = parentBinaryExpression.getOperationSign();
+					final IElementType childOperator = bodyBinaryExpression.getOperationSign();
+					final JSExpression lhs = parentBinaryExpression.getLOperand();
 
 					return (lhs.equals(expression) && parentOperator.equals(childOperator));
 				}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 013a8a9b..668dc5bf 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -33,10 +33,11 @@
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSJoinConcatenatedStringLiteralsIntention", categories = {
-		"JavaScript",
-		"Other"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSJoinConcatenatedStringLiteralsIntention",
+	categories = {"JavaScript", "Other"},
+	fileExtensions = "js"
+)
 public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention
 {
 	@Override
@@ -47,8 +48,8 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Override
-	public void processIntention(@Nonnull PsiElement element)
-			throws IncorrectOperationException
+	@RequiredReadAction
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSBinaryExpression expression = (JSBinaryExpression) element;
 		final JSExpression lhs = expression.getLOperand();
@@ -62,13 +63,13 @@ public void processIntention(@Nonnull PsiElement element)
 		String rhsText = rhs.getText();
 		final String newExpression;
 
-		if(StringUtil.isSimpleQuoteStringLiteral(leftLiteral) &&
-				StringUtil.isDoubleQuoteStringLiteral(rightLiteral))
+		if (StringUtil.isSimpleQuoteStringLiteral(leftLiteral)
+			&& StringUtil.isDoubleQuoteStringLiteral(rightLiteral))
 		{
 			rhsText = JSDoubleToSingleQuotedStringIntention.changeQuotes(rhsText);
 		}
-		else if(StringUtil.isDoubleQuoteStringLiteral(leftLiteral) &&
-				StringUtil.isSimpleQuoteStringLiteral(rightLiteral))
+		else if (StringUtil.isDoubleQuoteStringLiteral(leftLiteral)
+			&& StringUtil.isSimpleQuoteStringLiteral(rightLiteral))
 		{
 			rhsText = JSSingleToDoubleQuotedStringIntention.changeQuotes(rhsText);
 		}
@@ -80,41 +81,21 @@ else if(StringUtil.isDoubleQuoteStringLiteral(leftLiteral) &&
 	private static class StringConcatPredicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSBinaryExpression))
-			{
-				return false;
-			}
-
-			final JSBinaryExpression expression = (JSBinaryExpression) element;
-			final IElementType sign = expression.getOperationSign();
-
-			if(!sign.equals(JSTokenTypes.PLUS))
-			{
-				return false;
-			}
-			final JSExpression lhs = expression.getLOperand();
-			final JSExpression rhs = expression.getROperand();
-
-			if(!isApplicableLiteral(lhs))
-			{
-				return false;
-			}
-			if(!isApplicableLiteral(rhs))
-			{
-				return false;
-			}
-
-			return true;
+			return element instanceof JSBinaryExpression expression
+				&& JSTokenTypes.PLUS.equals(expression.getOperationSign())
+				&& isApplicableLiteral(expression.getLOperand())
+				&& isApplicableLiteral(expression.getROperand());
 		}
 
 		@RequiredReadAction
 		private static boolean isApplicableLiteral(JSExpression lhs)
 		{
-			return lhs != null &&
-					lhs instanceof JSSimpleLiteralExpression &&
-					JavaScriptTokenSets.STRING_LITERALS.contains(((JSSimpleLiteralExpression) lhs).getLiteralElementType());
+			return lhs != null
+				&& lhs instanceof JSSimpleLiteralExpression simpleLiteralExpression
+				&& JavaScriptTokenSets.STRING_LITERALS.contains(simpleLiteralExpression.getLiteralElementType());
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 847c76dc..14aeac2a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -17,6 +17,7 @@
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -31,10 +32,11 @@
 import java.util.*;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSReplaceIfWithSwitchIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSReplaceIfWithSwitchIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSReplaceIfWithSwitchIntention extends JSIntention
 {
 	@NonNls
@@ -42,12 +44,8 @@ public class JSReplaceIfWithSwitchIntention extends JSIntention
 	@NonNls
 	private static final String DEFAULT_LABEL_NAME = "Label";
 	@NonNls
-	private static final String SWITCH_STATEMENT_PREFIX = "switch(";
-	@NonNls
 	private static final String DEFAULT_CASE_CLAUSE_EXPRESSION = "default: ";
 	@NonNls
-	private static final String CASE_EXPRESSION_PREFIX = "\ncase ";
-	@NonNls
 	private static final String LABELED_BREAK_STATEMENT_PREFIX = "break ";
 	@NonNls
 	private static final String BREAK_STATEMENT = "\nbreak;";
@@ -60,8 +58,8 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
-	public void processIntention(@Nonnull PsiElement element)
-			throws IncorrectOperationException
+	@RequiredReadAction
+	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		JSIfStatement ifStatement = (JSIfStatement) element.getParent();
 
@@ -71,23 +69,24 @@ public void processIntention(@Nonnull PsiElement element)
 		JSStatement breakTarget = null;
 		String labelString = "";
 
-		if(ControlFlowUtils.statementContainsExitingBreak(ifStatement))
+		if (ControlFlowUtils.statementContainsExitingBreak(ifStatement))
 		{
 			JSElement ancestor = (JSElement) ifStatement.getParent();
-			while(ancestor != null)
+			while (ancestor != null)
 			{
-				if(ancestor instanceof JSForStatement ||
-						ancestor instanceof JSForInStatement ||
-						ancestor instanceof JSDoWhileStatement ||
-						ancestor instanceof JSWhileStatement ||
-						ancestor instanceof JSSwitchStatement)
+				if (ancestor instanceof JSForStatement
+					|| ancestor instanceof JSForInStatement
+					|| ancestor instanceof JSDoWhileStatement
+					|| ancestor instanceof JSWhileStatement
+					|| ancestor instanceof JSSwitchStatement)
 				{
 					breakTarget = (JSStatement) ancestor;
 					break;
 				}
 				ancestor = (JSElement) ancestor.getParent();
 			}
-			if(breakTarget != null)
+
+			if (breakTarget != null)
 			{
 				labelString = CaseUtil.findUniqueLabel(ifStatement, DEFAULT_LABEL_NAME);
 				breaksNeedRelabeled = true;
@@ -100,32 +99,27 @@ public void processIntention(@Nonnull PsiElement element)
 
 		final StringBuilder switchStatementBuffer = new StringBuilder(1024);
 
-		switchStatementBuffer.append(SWITCH_STATEMENT_PREFIX)
-				.append(caseExpression.getText())
-				.append(')')
+		switchStatementBuffer.append("switch(").append(caseExpression.getText()).append(')')
 				.append('{');
 
-		final List<IfStatementBranch> branches = new ArrayList<IfStatementBranch>(20);
+		final List<IfStatementBranch> branches = new ArrayList<>(20);
 
-		while(true)
+		while (true)
 		{
-			final Set<String> topLevelVariables = new HashSet<String>(5);
-			final Set<String> innerVariables = new HashSet<String>(5);
+			final Set<String> topLevelVariables = new HashSet<>(5);
+			final Set<String> innerVariables = new HashSet<>(5);
 			final JSExpression condition = ifStatement.getCondition();
 			final JSExpression[] labels = getValuesFromCondition(condition, caseExpression);
 			final JSStatement thenBranch = ifStatement.getThen();
 
-			DeclarationUtils.calculateVariablesDeclared(thenBranch,
-					topLevelVariables,
-					innerVariables,
-					true);
+			DeclarationUtils.calculateVariablesDeclared(thenBranch, topLevelVariables, innerVariables, true);
 
 			final IfStatementBranch ifBranch = new IfStatementBranch();
 
 			ifBranch.setInnerVariables(innerVariables);
 			ifBranch.setTopLevelVariables(topLevelVariables);
 			ifBranch.setStatement(thenBranch);
-			for(final JSExpression label : labels)
+			for (final JSExpression label : labels)
 			{
 				ifBranch.addCondition(label.getText());
 			}
@@ -133,21 +127,20 @@ public void processIntention(@Nonnull PsiElement element)
 
 			final JSStatement elseBranch = ifStatement.getElse();
 
-			if(elseBranch instanceof JSIfStatement)
+			if (elseBranch instanceof JSIfStatement elseIfStatement)
 			{
-				ifStatement = (JSIfStatement) elseBranch;
+				ifStatement = elseIfStatement;
 			}
-			else if(elseBranch == null)
+			else if (elseBranch == null)
 			{
 				break;
 			}
 			else
 			{
-				final Set<String> elseTopLevelVariables = new HashSet<String>(5);
-				final Set<String> elseInnerVariables = new HashSet<String>(5);
+				final Set<String> elseTopLevelVariables = new HashSet<>(5);
+				final Set<String> elseInnerVariables = new HashSet<>(5);
 
-				DeclarationUtils.calculateVariablesDeclared(elseBranch, elseTopLevelVariables,
-						elseInnerVariables, true);
+				DeclarationUtils.calculateVariablesDeclared(elseBranch, elseTopLevelVariables, elseInnerVariables, true);
 
 				final IfStatementBranch elseIfBranch = new IfStatementBranch();
 
@@ -160,30 +153,28 @@ else if(elseBranch == null)
 			}
 		}
 
-		for(IfStatementBranch branch : branches)
+		for (IfStatementBranch branch : branches)
 		{
 			boolean hasConflicts = false;
-			for(IfStatementBranch testBranch : branches)
+			for (IfStatementBranch testBranch : branches)
 			{
-				if(branch.topLevelDeclarationsConfictWith(testBranch))
+				if (branch.topLevelDeclarationsConfictWith(testBranch))
 				{
 					hasConflicts = true;
 				}
 			}
 
-			final JSStatement branchStatement = (JSStatement) branch.getStatement();
+			final JSStatement branchStatement = branch.getStatement();
 
-			if(branch.isElse())
+			if (branch.isElse())
 			{
-				dumpDefaultBranch(switchStatementBuffer, branchStatement,
-						hasConflicts, breaksNeedRelabeled, labelString);
+				dumpDefaultBranch(switchStatementBuffer, branchStatement, hasConflicts, breaksNeedRelabeled, labelString);
 			}
 			else
 			{
 				final List<String> conditions = branch.getConditions();
 
-				dumpBranch(switchStatementBuffer, conditions, branchStatement,
-						hasConflicts, breaksNeedRelabeled, labelString);
+				dumpBranch(switchStatementBuffer, conditions, branchStatement, hasConflicts, breaksNeedRelabeled, labelString);
 			}
 		}
 
@@ -191,13 +182,12 @@ else if(elseBranch == null)
 
 		final String switchStatementString = switchStatementBuffer.toString();
 
-		if(breaksNeedRelabeled)
+		if (breaksNeedRelabeled)
 		{
 			final int length = switchStatementBuffer.length();
 			final StringBuilder out = new StringBuilder(length);
 
-			out.append(labelString)
-					.append(':');
+			out.append(labelString).append(':');
 			termReplace(out, breakTarget, statementToReplace, switchStatementString);
 			JSElementFactory.replaceStatement(breakTarget, out.toString());
 		}
@@ -207,19 +197,17 @@ else if(elseBranch == null)
 		}
 	}
 
-	private static void termReplace(StringBuilder out,
-									JSElement target,
-									JSElement replace,
-									String stringToReplaceWith)
+	@RequiredReadAction
+	private static void termReplace(StringBuilder out, JSElement target, JSElement replace, String stringToReplaceWith)
 	{
-		if(target.equals(replace))
+		if (target.equals(replace))
 		{
 			out.append(stringToReplaceWith);
 		}
-		else if(target.getChildren().length != 0)
+		else if (target.getChildren().length != 0)
 		{
 			final JSElement[] children = (JSElement[]) target.getChildren();
-			for(final JSElement child : children)
+			for (final JSElement child : children)
 			{
 				termReplace(out, child, replace, stringToReplaceWith);
 			}
@@ -231,97 +219,96 @@ else if(target.getChildren().length != 0)
 		}
 	}
 
-	private static JSExpression[] getValuesFromCondition(JSExpression condition,
-														 JSExpression caseExpression)
+	@RequiredReadAction
+	private static JSExpression[] getValuesFromCondition(JSExpression condition, JSExpression caseExpression)
 	{
-		final List<JSExpression> values = new ArrayList<JSExpression>(10);
+		final List<JSExpression> values = new ArrayList<>(10);
 
 		getValuesFromExpression(condition, caseExpression, values);
 		return values.toArray(new JSExpression[values.size()]);
 	}
 
-	private static void getValuesFromExpression(JSExpression expression,
-												JSExpression caseExpression,
-												List<JSExpression> values)
+	@RequiredReadAction
+	private static void getValuesFromExpression(JSExpression expression, JSExpression caseExpression, List<JSExpression> values)
 	{
-		if(expression instanceof JSBinaryExpression)
+		if (expression instanceof JSBinaryExpression)
 		{
-			final JSBinaryExpression binaryExpression =
-					(JSBinaryExpression) expression;
+			final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
 			final JSExpression lhs = binaryExpression.getLOperand();
 			final JSExpression rhs = binaryExpression.getROperand();
 			final IElementType tokenType = binaryExpression.getOperationSign();
 
-			if(JSTokenTypes.OROR.equals(tokenType))
+			if (JSTokenTypes.OROR.equals(tokenType))
 			{
 				getValuesFromExpression(lhs, caseExpression, values);
 				getValuesFromExpression(rhs, caseExpression, values);
 			}
+			else if (EquivalenceChecker.expressionsAreEquivalent(caseExpression, rhs))
+			{
+				values.add(lhs);
+			}
 			else
 			{
-				if(EquivalenceChecker.expressionsAreEquivalent(caseExpression, rhs))
-				{
-					values.add(lhs);
-				}
-				else
-				{
-					values.add(rhs);
-				}
+				values.add(rhs);
 			}
 		}
-		else if(expression instanceof JSParenthesizedExpression)
+		else if (expression instanceof JSParenthesizedExpression parenExpression)
 		{
-			final JSParenthesizedExpression parenExpression = (JSParenthesizedExpression) expression;
 			final JSExpression contents = parenExpression.getInnerExpression();
 
 			getValuesFromExpression(contents, caseExpression, values);
 		}
 	}
 
-	private static void dumpBranch(StringBuilder switchStatementString,
-								   List<String> labels,
-								   JSStatement body,
-								   boolean wrap,
-								   boolean renameBreaks,
-								   String breakLabelName)
+	@RequiredReadAction
+	private static void dumpBranch(
+		StringBuilder switchStatementString,
+		List<String> labels,
+		JSStatement body,
+		boolean wrap,
+		boolean renameBreaks,
+		String breakLabelName
+	)
 	{
 		dumpLabels(switchStatementString, labels);
 		dumpBody(switchStatementString, body, wrap, renameBreaks, breakLabelName);
 	}
 
-	private static void dumpDefaultBranch(StringBuilder switchStatementString,
-										  JSStatement body,
-										  boolean wrap,
-										  boolean renameBreaks,
-										  String breakLabelName)
+	@RequiredReadAction
+	private static void dumpDefaultBranch(
+		StringBuilder switchStatementString,
+		JSStatement body,
+		boolean wrap,
+		boolean renameBreaks,
+		String breakLabelName
+	)
 	{
 		switchStatementString.append(DEFAULT_CASE_CLAUSE_EXPRESSION);
 		dumpBody(switchStatementString, body, wrap, renameBreaks, breakLabelName);
 	}
 
-	private static void dumpLabels(StringBuilder switchStatementString,
-								   List<String> labels)
+	private static void dumpLabels(StringBuilder switchStatementString, List<String> labels)
 	{
-		for(String label : labels)
+		for (String label : labels)
 		{
-			switchStatementString.append(CASE_EXPRESSION_PREFIX);
-			switchStatementString.append(label);
-			switchStatementString.append(": ");
+			switchStatementString.append("\ncase ").append(label).append(": ");
 		}
 	}
 
-	private static void dumpBody(StringBuilder switchStatementString,
-								 JSStatement bodyStatement,
-								 boolean wrap,
-								 boolean renameBreaks,
-								 String breakLabelName)
+	@RequiredReadAction
+	private static void dumpBody(
+		StringBuilder switchStatementString,
+		JSStatement bodyStatement,
+		boolean wrap,
+		boolean renameBreaks,
+		String breakLabelName
+	)
 	{
-		if(bodyStatement instanceof JSBlockStatement)
+		if (bodyStatement instanceof JSBlockStatement)
 		{
-			if(wrap)
+			if (wrap)
 			{
-				appendElement(switchStatementString, bodyStatement,
-						renameBreaks, breakLabelName);
+				appendElement(switchStatementString, bodyStatement, renameBreaks, breakLabelName);
 			}
 			else
 			{
@@ -332,41 +319,42 @@ private static void dumpBody(StringBuilder switchStatementString,
 		}
 		else
 		{
-			if(wrap)
+			if (wrap)
 			{
 				switchStatementString.append('{');
-				appendElement(switchStatementString, bodyStatement,
-						renameBreaks, breakLabelName);
+				appendElement(switchStatementString, bodyStatement, renameBreaks, breakLabelName);
 				switchStatementString.append('}');
 			}
 			else
 			{
-				appendElement(switchStatementString, bodyStatement,
-						renameBreaks, breakLabelName);
+				appendElement(switchStatementString, bodyStatement, renameBreaks, breakLabelName);
 			}
 		}
-		if(ControlFlowUtils.statementMayCompleteNormally(bodyStatement))
+		if (ControlFlowUtils.statementMayCompleteNormally(bodyStatement))
 		{
 			switchStatementString.append(BREAK_STATEMENT);
 		}
 		switchStatementString.append('\n');
 	}
 
-	private static void appendElement(StringBuilder switchStatementString,
-									  JSElement element,
-									  boolean renameBreakElements,
-									  String breakLabelString)
+	@RequiredReadAction
+	private static void appendElement(
+		StringBuilder switchStatementString,
+		JSElement element,
+		boolean renameBreakElements,
+		String breakLabelString
+	)
 	{
 		final String text = element.getText();
 
-		if(!renameBreakElements)
+		if (!renameBreakElements)
 		{
 			switchStatementString.append(text);
 		}
-		else if(element instanceof JSBreakStatement)
+		else if (element instanceof JSBreakStatement breakStatement)
 		{
-			final String identifier = ((JSBreakStatement) element).getLabel();
-			if(identifier == null || identifier.length() == 0)
+			final String identifier = breakStatement.getLabel();
+			if (identifier == null || identifier.isEmpty())
 			{
 				switchStatementString.append(LABELED_BREAK_STATEMENT_PREFIX);
 				switchStatementString.append(breakLabelString);
@@ -377,14 +365,12 @@ else if(element instanceof JSBreakStatement)
 				switchStatementString.append(text);
 			}
 		}
-		else if(element instanceof JSBlockStatement ||
-				element instanceof JSIfStatement)
+		else if (element instanceof JSBlockStatement || element instanceof JSIfStatement)
 		{
 			final JSElement[] children = (JSElement[]) element.getChildren();
-			for(final JSElement child : children)
+			for (final JSElement child : children)
 			{
-				appendElement(switchStatementString, child, renameBreakElements,
-						breakLabelString);
+				appendElement(switchStatementString, child, renameBreakElements, breakLabelString);
 			}
 		}
 		else
@@ -395,34 +381,22 @@ else if(element instanceof JSBlockStatement ||
 
 	private static class IfToSwitchPredicate implements JSElementPredicate
 	{
-
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			final PsiElement parent = element.getParent();
-			if(!(parent instanceof JSIfStatement))
-			{
-				return false;
-			}
-			final String text = element.getText();
-			if(!IF_KEYWORD.equals(text))
-			{
-				return false;
-			}
-			final JSIfStatement statement = (JSIfStatement) parent;
-			if(ErrorUtil.containsError(statement))
-			{
-				return false;
-			}
-			return (CaseUtil.getCaseExpression(statement) != null);
+			return element.getParent() instanceof JSIfStatement statement
+				&& IF_KEYWORD.equals(element.getText())
+				&& !ErrorUtil.containsError(statement)
+				&& CaseUtil.getCaseExpression(statement) != null;
 		}
 	}
 
 	private static class IfStatementBranch
 	{
-		private final List<String> conditions = new ArrayList<String>(3);
-		private Set<String> topLevelVariables = new HashSet<String>(3);
-		private Set<String> innerVariables = new HashSet<String>(3);
+		private final List<String> conditions = new ArrayList<>(3);
+		private Set<String> topLevelVariables = new HashSet<>(3);
+		private Set<String> innerVariables = new HashSet<>(3);
 		private JSStatement statement;
 		private boolean isElse;
 
@@ -458,12 +432,12 @@ public void setElse()
 
 		public void setTopLevelVariables(Set<String> topLevelVariables)
 		{
-			this.topLevelVariables = new HashSet<String>(topLevelVariables);
+			this.topLevelVariables = new HashSet<>(topLevelVariables);
 		}
 
 		public void setInnerVariables(Set<String> innerVariables)
 		{
-			this.innerVariables = new HashSet<String>(innerVariables);
+			this.innerVariables = new HashSet<>(innerVariables);
 		}
 
 		private Set<String> getTopLevelVariables()
@@ -481,16 +455,15 @@ public boolean topLevelDeclarationsConfictWith(IfStatementBranch testBranch)
 			final Set<String> innerVariables = testBranch.getInnerVariables();
 			final Set<String> topLevel = testBranch.getTopLevelVariables();
 
-			return (hasNonEmptyIntersection(this.topLevelVariables, topLevel) ||
-					hasNonEmptyIntersection(this.topLevelVariables, innerVariables));
+			return hasNonEmptyIntersection(this.topLevelVariables, topLevel)
+				|| hasNonEmptyIntersection(this.topLevelVariables, innerVariables);
 		}
 
-		private static boolean hasNonEmptyIntersection(Set<String> set1,
-													   Set<String> set2)
+		private static boolean hasNonEmptyIntersection(Set<String> set1, Set<String> set2)
 		{
-			for(final String set1Element : set1)
+			for (final String set1Element : set1)
 			{
-				if(set2.contains(set1Element))
+				if (set2.contains(set1Element))
 				{
 					return true;
 				}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index eac6bf5e..aa0e8339 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -25,12 +25,12 @@
 import consulo.language.psi.PsiManager;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
 import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
 import java.util.*;
 
 @ExtensionImpl
@@ -78,7 +78,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final String declarationString;
 		final String expressionText;
 
-		if(hadSideEffects)
+		if (hadSideEffects)
 		{
 			final String variableName = "i"; // TODO JavaCodeStyleManager.getInstance(switchExpression.getProject()).suggestUniqueVariableName("i", switchExpression, true);
 
@@ -93,9 +93,9 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
 		boolean renameBreaks = false;
 
-		for(JSCaseClause caseClause : switchStatement.getCaseClauses())
+		for (JSCaseClause caseClause : switchStatement.getCaseClauses())
 		{
-			if(CaseUtil.containsHiddenBreak(caseClause))
+			if (CaseUtil.containsHiddenBreak(caseClause))
 			{
 				renameBreaks = true;
 				break;
@@ -105,11 +105,10 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final StringBuilder ifStatementBuffer = new StringBuilder(1024);
 		String breakLabel = null;
 
-		if(renameBreaks)
+		if (renameBreaks)
 		{
 			breakLabel = CaseUtil.findUniqueLabel(switchStatement, DEFAULT_LABEL_NAME);
-			ifStatementBuffer.append(breakLabel)
-					.append(':');
+			ifStatementBuffer.append(breakLabel).append(':');
 		}
 
 		final List<SwitchStatementBranch> openBranches = new ArrayList<>();
@@ -117,15 +116,15 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final List<SwitchStatementBranch> allBranches = new ArrayList<>();
 		SwitchStatementBranch currentBranch = null;
 
-		for(JSCaseClause caseClause : switchStatement.getCaseClauses())
+		for (JSCaseClause caseClause : switchStatement.getCaseClauses())
 		{
 			final PsiElement[] caseClauseChildren = caseClause.getChildren();
 
-			for(PsiElement child : caseClauseChildren)
+			for (PsiElement child : caseClauseChildren)
 			{
-				if(child == caseClauseChildren[0])
+				if (child == caseClauseChildren[0])
 				{
-					if(currentBranch == null)
+					if (currentBranch == null)
 					{
 						openBranches.clear();
 						currentBranch = new SwitchStatementBranch();
@@ -133,20 +132,20 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 						allBranches.add(currentBranch);
 						openBranches.add(currentBranch);
 					}
-					else if(currentBranch.hasStatements())
+					else if (currentBranch.hasStatements())
 					{
 						currentBranch = new SwitchStatementBranch();
 						allBranches.add(currentBranch);
 						openBranches.add(currentBranch);
 					}
 
-					if(caseClause.isDefault())
+					if (caseClause.isDefault())
 					{
 						currentBranch.setDefault();
 					}
 				}
 
-				if(child instanceof JSExpression)
+				if (child instanceof JSExpression)
 				{
 					// Processes case clause expression
 					final JSExpression value = ParenthesesUtils.stripParentheses(caseClause.getCaseExpression());
@@ -154,7 +153,7 @@ else if(currentBranch.hasStatements())
 					assert (currentBranch != null);
 					currentBranch.addLabel(value.getText());
 				}
-				else if(child instanceof JSStatement)
+				else if (child instanceof JSStatement)
 				{
 					// Processes case clause statements
 					final JSStatement statement = (JSStatement) child;
@@ -482,7 +481,7 @@ private void addElement(PsiElement element)
 
 		public void addWhiteSpace(PsiElement whiteSpace)
 		{
-			if(this.bodyElements.size() > 0)
+			if (this.bodyElements.size() > 0)
 			{
 				this.pendingWhiteSpace.add(whiteSpace);
 			}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index 86cd6107..d48f5458 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -31,10 +31,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSMergeElseIfIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSMergeElseIfIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSMergeElseIfIntention extends JSIntention
 {
 	@Override
@@ -62,48 +63,17 @@ private static class MergeElseIfPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSElement))
-			{
-				return false;
-			}
-
-			final PsiElement parent = element.getParent();
-
-			if(!(parent instanceof JSIfStatement))
-			{
-				return false;
-			}
-
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
-
-			if(ErrorUtil.containsError(ifStatement))
-			{
-				return false;
-			}
-
-			final JSStatement thenBranch = ifStatement.getThen();
-			final JSStatement elseBranch = ifStatement.getElse();
-
-			if(thenBranch == null)
-			{
-				return false;
-			}
-			if(elseBranch == null)
-			{
-				return false;
-			}
-			if(!(elseBranch instanceof JSBlockStatement))
-			{
-				return false;
-			}
-
-			final JSStatement[] statements = ((JSBlockStatement) elseBranch).getStatements();
+			return element instanceof JSElement
+				&& element.getParent() instanceof JSIfStatement ifStatement
+				&& !ErrorUtil.containsError(ifStatement)
+				&& ifStatement.getThen() != null
+				&& ifStatement.getElse() instanceof JSBlockStatement elseBlock
+				&& isSingleIfStatement(elseBlock.getStatements());
+		}
 
-			if(statements.length != 1)
-			{
-				return false;
-			}
-			return (statements[0] != null && statements[0] instanceof JSIfStatement);
+		private boolean isSingleIfStatement(JSStatement[] statements)
+		{
+			return statements.length == 1 && statements[0] instanceof JSIfStatement;
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index 40e917ab..c6379381 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -34,10 +35,11 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSMergeIfAndIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSMergeIfAndIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSMergeIfAndIntention extends JSIntention
 {
 	@NonNls
@@ -51,6 +53,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		assert (element.getParent() != null);
@@ -63,8 +66,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.AND_PRECENDENCE);
 		final String parentConditionText = ParenthesesUtils.getParenthesized(parentCondition, ParenthesesUtils.AND_PRECENDENCE);
 		final JSStatement childThenBranch = childStatement.getThen();
-		final String statement = IF_STATEMENT_PREFIX + parentConditionText + " && " + childConditionText + ')' +
-				childThenBranch.getText();
+		final String statement = IF_STATEMENT_PREFIX + parentConditionText + " && " + childConditionText + ')' + childThenBranch.getText();
 
 		JSElementFactory.replaceStatement(parentStatement, statement);
 	}
@@ -75,16 +77,16 @@ private static class MergeIfAndPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSElement))
+			if (!(element instanceof JSElement))
 			{
 				return false;
 			}
 
 			PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSIfStatement))
+			if (!(parent instanceof JSIfStatement))
 			{
-				if(element instanceof JSIfStatement)
+				if (element instanceof JSIfStatement)
 				{
 					parent = element;
 				}
@@ -96,7 +98,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 
-			if(ErrorUtil.containsError(ifStatement))
+			if (ErrorUtil.containsError(ifStatement))
 			{
 				return false;
 			}
@@ -104,18 +106,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
 			final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
 
-			if(thenBranch == null || elseBranch != null)
-			{
-				return false;
-			}
-			if(!(thenBranch instanceof JSIfStatement))
-			{
-				return false;
-			}
-
-			final JSIfStatement childIfStatement = (JSIfStatement) thenBranch;
-
-			return (childIfStatement.getElse() == null);
+			return elseBranch == null && thenBranch instanceof JSIfStatement childIfStatement && childIfStatement.getElse() == null;
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index 06edb2e0..e87736b5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -26,22 +27,17 @@
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSMergeIfOrIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSMergeIfOrIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSMergeIfOrIntention extends JSIntention
 {
-	@NonNls
-	private static final String IF_STATEMENT_PREFIX = "if (";
-	@NonNls
-	private static final String ELSE_KEYWORD = "else ";
-
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
@@ -50,11 +46,12 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		assert (element instanceof JSElement);
 		JSElement jsElement = (JSElement) element;
-		if(MergeIfOrPredicate.isMergableExplicitIf(jsElement))
+		if (MergeIfOrPredicate.isMergableExplicitIf(jsElement))
 		{
 			replaceMergeableExplicitIf(jsElement);
 		}
@@ -64,6 +61,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		}
 	}
 
+	@RequiredReadAction
 	private static void replaceMergeableExplicitIf(JSElement token) throws IncorrectOperationException
 	{
 		final JSIfStatement parentStatement = (JSIfStatement) (token.getParent() instanceof JSIfStatement ? token.getParent() : token);
@@ -76,26 +74,20 @@ private static void replaceMergeableExplicitIf(JSElement token) throws Incorrect
 		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
 		final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
 		final JSStatement parentThenBranch = parentStatement.getThen();
-		final String parentThenBranchText = parentThenBranch.getText();
-		final StringBuilder statement = new StringBuilder(IF_STATEMENT_PREFIX)
-				.append(parentConditionText)
-				.append(" || ")
-				.append(childConditionText)
-				.append(')')
-				.append(parentThenBranchText);
+		final StringBuilder statement =
+			new StringBuilder("if (").append(parentConditionText).append(" || ").append(childConditionText).append(')')
+				.append(parentThenBranch.getText());
 		final JSStatement childElseBranch = childStatement.getElse();
 
-		if(childElseBranch != null)
+		if (childElseBranch != null)
 		{
-			final String childElseBranchText = childElseBranch.getText();
-
-			statement.append(ELSE_KEYWORD)
-					.append(childElseBranchText);
+			statement.append("else ").append(childElseBranch.getText());
 		}
 
 		JSElementFactory.replaceStatement(parentStatement, statement.toString());
 	}
 
+	@RequiredReadAction
 	private static void replaceMergeableImplicitIf(JSElement token) throws IncorrectOperationException
 	{
 		final JSIfStatement parentStatement = (JSIfStatement) (token.getParent() instanceof JSIfStatement ? token.getParent() : token);
@@ -110,17 +102,16 @@ private static void replaceMergeableImplicitIf(JSElement token) throws Incorrect
 		final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
 		final JSStatement parentThenBranch = parentStatement.getThen();
 		final JSStatement childElseBranch = childStatement.getElse();
-		StringBuilder statement = new StringBuilder(IF_STATEMENT_PREFIX)
-				.append(parentConditionText)
-				.append(" || ")
-				.append(childConditionText)
-				.append(')')
-				.append(parentThenBranch.getText());
-
-		if(childElseBranch != null)
+		StringBuilder statement = new StringBuilder("if (")
+			.append(parentConditionText)
+			.append(" || ")
+			.append(childConditionText)
+			.append(')')
+			.append(parentThenBranch.getText());
+
+		if (childElseBranch != null)
 		{
-			statement.append(ELSE_KEYWORD)
-					.append(childElseBranch.getText());
+			statement.append("else ").append(childElseBranch.getText());
 		}
 
 		JSElementFactory.replaceStatement(parentStatement, statement.toString());
@@ -132,23 +123,17 @@ private static class MergeIfOrPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSElement))
-			{
-				return false;
-			}
-
-			final JSElement jsElement = (JSElement) element;
-
-			return (isMergableExplicitIf(jsElement) || isMergableImplicitIf(jsElement));
+			return element instanceof JSElement jsElement
+				&& (isMergableExplicitIf(jsElement) || isMergableImplicitIf(jsElement));
 		}
 
 		public static boolean isMergableExplicitIf(JSElement element)
 		{
 			PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSIfStatement))
+			if (!(parent instanceof JSIfStatement))
 			{
-				if(element instanceof JSIfStatement)
+				if (element instanceof JSIfStatement)
 				{
 					parent = element;
 				}
@@ -160,36 +145,25 @@ public static boolean isMergableExplicitIf(JSElement element)
 
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 
-			if(ErrorUtil.containsError(ifStatement))
-			{
-				return false;
-			}
-
-			final JSStatement thenBranch = ifStatement.getThen();
-			final JSStatement elseBranch = ifStatement.getElse();
-
-			if(thenBranch == null || elseBranch == null)
-			{
-				return false;
-			}
-			if(!(elseBranch instanceof JSIfStatement))
+			if (ErrorUtil.containsError(ifStatement))
 			{
 				return false;
 			}
 
-			final JSIfStatement childIfStatement = (JSIfStatement) elseBranch;
-			final JSStatement childThenBranch = childIfStatement.getThen();
+			final JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
 
-			return EquivalenceChecker.statementsAreEquivalent(thenBranch, childThenBranch);
+			return thenBranch != null
+				&& elseBranch instanceof JSIfStatement childIfStatement
+				&& EquivalenceChecker.statementsAreEquivalent(thenBranch, childIfStatement.getThen());
 		}
 
 		private static boolean isMergableImplicitIf(JSElement element)
 		{
 			PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSIfStatement))
+			if (!(parent instanceof JSIfStatement))
 			{
-				if(element instanceof JSIfStatement)
+				if (element instanceof JSIfStatement)
 				{
 					parent = element;
 				}
@@ -200,30 +174,16 @@ private static boolean isMergableImplicitIf(JSElement element)
 			}
 
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
-			final JSStatement thenBranch = ifStatement.getThen();
-			final JSStatement elseBranch = ifStatement.getElse();
-
-			if(thenBranch == null || elseBranch != null)
-			{
-				return false;
-			}
+			final JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
 
-			if(ControlFlowUtils.statementMayCompleteNormally(thenBranch))
-			{
+			if (thenBranch == null || elseBranch != null || ControlFlowUtils.statementMayCompleteNormally(thenBranch)) {
 				return false;
 			}
 
 			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
 
-			if(!(nextStatement instanceof JSIfStatement))
-			{
-				return false;
-			}
-
-			final JSIfStatement childIfStatement = (JSIfStatement) nextStatement;
-			final JSStatement childThenBranch = childIfStatement.getThen();
-
-			return EquivalenceChecker.statementsAreEquivalent(thenBranch, childThenBranch);
+			return nextStatement instanceof JSIfStatement childIfStatement
+				&& EquivalenceChecker.statementsAreEquivalent(thenBranch, childIfStatement.getThen());
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index bd19fb6b..f6ce3bd5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -18,6 +18,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -28,22 +29,17 @@
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSMergeParallelIfsIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSMergeParallelIfsIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSMergeParallelIfsIntention extends JSIntention
 {
-	@NonNls
-	private static final String IF_STATEMENT_PREFIX = "if (";
-	@NonNls
-	private static final String ELSE_KEYWORD = "else ";
-
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
@@ -52,6 +48,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
@@ -67,9 +64,8 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		JSElementFactory.removeElement(secondStatement);
 	}
 
-	private void mergeIfStatements(StringBuilder statementBuffer,
-								   JSIfStatement firstStatement,
-								   JSIfStatement secondStatement)
+	@RequiredReadAction
+	private void mergeIfStatements(StringBuilder statementBuffer, JSIfStatement firstStatement, JSIfStatement secondStatement)
 	{
 		final JSExpression condition = firstStatement.getCondition();
 		final JSStatement firstThenBranch = firstStatement.getThen();
@@ -77,22 +73,17 @@ private void mergeIfStatements(StringBuilder statementBuffer,
 		final JSStatement firstElseBranch = firstStatement.getElse();
 		final JSStatement secondElseBranch = secondStatement.getElse();
 
-		statementBuffer.append(IF_STATEMENT_PREFIX)
-				.append(condition.getText())
-				.append(')');
+		statementBuffer.append("if (").append(condition.getText()).append(')');
 		ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstThenBranch, secondThenBranch);
 
-		if(firstElseBranch != null || secondElseBranch != null)
+		if (firstElseBranch != null || secondElseBranch != null)
 		{
-			statementBuffer.append(ELSE_KEYWORD);
-			if(firstElseBranch instanceof JSIfStatement &&
-					secondElseBranch instanceof JSIfStatement &&
-					MergeParallelIfsPredicate.ifStatementsCanBeMerged((JSIfStatement) firstElseBranch,
-							(JSIfStatement) secondElseBranch))
+			statementBuffer.append("else ");
+			if (firstElseBranch instanceof JSIfStatement firstIfStatement
+				&& secondElseBranch instanceof JSIfStatement secondIfStatement
+				&& MergeParallelIfsPredicate.ifStatementsCanBeMerged(firstIfStatement, secondIfStatement))
 			{
-				this.mergeIfStatements(statementBuffer,
-						(JSIfStatement) firstElseBranch,
-						(JSIfStatement) secondElseBranch);
+				this.mergeIfStatements(statementBuffer, firstIfStatement, secondIfStatement);
 			}
 			else
 			{
@@ -106,46 +97,41 @@ private static class MergeParallelIfsPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSIfStatement) || ErrorUtil.containsError(element))
+			if (!(element instanceof JSIfStatement ifStatement && !ErrorUtil.containsError(element)))
 			{
 				return false;
 			}
 
 			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
-			if(!(nextStatement instanceof JSIfStatement) || ErrorUtil.containsError(nextStatement))
-			{
-				return false;
-			}
-
-			return ifStatementsCanBeMerged((JSIfStatement) element,
-					(JSIfStatement) nextStatement);
+			return nextStatement instanceof JSIfStatement nextIfStatement
+				&& !ErrorUtil.containsError(nextStatement)
+				&& ifStatementsCanBeMerged(ifStatement, nextIfStatement);
 		}
 
-		public static boolean ifStatementsCanBeMerged(JSIfStatement statement1,
-													  JSIfStatement statement2)
+		public static boolean ifStatementsCanBeMerged(JSIfStatement statement1, JSIfStatement statement2)
 		{
 			final JSStatement thenBranch = statement1.getThen();
 			final JSStatement elseBranch = statement1.getElse();
-			if(thenBranch == null)
+			if (thenBranch == null)
 			{
 				return false;
 			}
 			final JSExpression firstCondition = statement1.getCondition();
 			final JSExpression secondCondition = statement2.getCondition();
-			if(!EquivalenceChecker.expressionsAreEquivalent(firstCondition,
-					secondCondition))
+			if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition, secondCondition))
 			{
 				return false;
 			}
+
 			final JSStatement nextThenBranch = statement2.getThen();
-			if(!ControlFlowUtils.canBeMerged(thenBranch, nextThenBranch))
+			if (!ControlFlowUtils.canBeMerged(thenBranch, nextThenBranch))
 			{
 				return false;
 			}
+
 			final JSStatement nextElseBranch = statement2.getElse();
-			return (elseBranch == null || nextElseBranch == null ||
-					ControlFlowUtils.canBeMerged(elseBranch, nextElseBranch));
+			return (elseBranch == null || nextElseBranch == null || ControlFlowUtils.canBeMerged(elseBranch, nextElseBranch));
 		}
 	}
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index 6afc6e36..7440961c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSReturnStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -28,18 +29,15 @@
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSRemoveRedundantElseIntention", categories = {
-		"JavaScript",
-		"Control Flow"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSRemoveRedundantElseIntention",
+	categories = {"JavaScript", "Control Flow"},
+	fileExtensions = "js"
+)
 public class JSRemoveRedundantElseIntention extends JSIntention
 {
-	@NonNls
-	private static final String IF_STATEMENT_PREFIX = "if (";
-
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
@@ -48,6 +46,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSIfStatement ifStatement = (JSIfStatement) element;
@@ -57,11 +56,11 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		assert (thenBranch != null);
 		assert (elseBranch != null);
 
-		final String newIfText = IF_STATEMENT_PREFIX + ifStatement.getCondition().getText() + ')' + thenBranch.getText();
+		final String newIfText = "if (" + ifStatement.getCondition().getText() + ')' + thenBranch.getText();
 		final String elseText = elseBranch.getText();
-		final String newStatement = (elseBranch instanceof JSBlockStatement
-				? elseText.substring(elseText.indexOf('{') + 1, elseText.lastIndexOf('}') - 1).trim()
-				: elseText);
+		final String newStatement = elseBranch instanceof JSBlockStatement
+			? elseText.substring(elseText.indexOf('{') + 1, elseText.lastIndexOf('}') - 1).trim()
+			: elseText;
 
 		JSElementFactory.addStatementAfter(ifStatement, newStatement);
 		JSElementFactory.replaceStatement(ifStatement, newIfText);
@@ -72,42 +71,28 @@ private static class RemoveRedundantElsePredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSIfStatement))
-			{
-				return false;
-			}
-
-			final JSIfStatement ifStatement = (JSIfStatement) element;
-
-			if(ErrorUtil.containsError(ifStatement))
-			{
+			if (!(element instanceof JSIfStatement ifStatement && !ErrorUtil.containsError(ifStatement))
+				|| ifStatement.getElse() == null) {
 				return false;
 			}
 
-			final JSStatement elseBranch = ifStatement.getElse();
 			JSStatement thenBranch = ifStatement.getThen();
-
-			if(elseBranch == null)
-			{
-				return false;
-			}
-
-			while(thenBranch != null && thenBranch instanceof JSBlockStatement)
+			while (thenBranch instanceof JSBlockStatement thenBlockStatement)
 			{
-				JSStatement[] thenStatements = ((JSBlockStatement) thenBranch).getStatements();
+				JSStatement[] thenStatements = thenBlockStatement.getStatements();
 
-				if(thenStatements.length == 0)
+				if (thenStatements.length == 0)
 				{
 					return true;
 				}
-				else if(thenStatements.length > 1)
+				else if (thenStatements.length > 1)
 				{
 					return false;
 				}
 				thenBranch = thenStatements[0];
 			}
 
-			return (thenBranch != null && thenBranch instanceof JSReturnStatement);
+			return thenBranch instanceof JSReturnStatement;
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index cb239fde..48863dc3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -16,6 +16,7 @@
 package org.intellij.idea.lang.javascript.intention.trivialif;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
@@ -29,14 +30,13 @@
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
-@IntentionMetaData(ignoreId = "JSReplaceIfWithConditionalIntention", categories = {
-		"JavaScript",
-		"Conditional"
-}, fileExtensions = "js")
+@IntentionMetaData(
+	ignoreId = "JSReplaceIfWithConditionalIntention",
+	categories = {"JavaScript", "Conditional"},
+	fileExtensions = "js"
+)
 public class JSReplaceIfWithConditionalIntention extends JSIntention
 {
-	private static final char TERNARY_QUESTION = '?';
-	private static final char TERNARY_SEMICOLON = ':';
 	@NonNls
 	private static final String RETURN_KEYWORD = "return ";
 
@@ -48,13 +48,14 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		final JSIfStatement ifStatement = (JSIfStatement) (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
 		assert (ifStatement != null);
 
-		if(ReplaceIfWithConditionalPredicate.isReplaceableAssignment(ifStatement))
+		if (ReplaceIfWithConditionalPredicate.isReplaceableAssignment(ifStatement))
 		{
 			final StringBuilder newStatement = new StringBuilder();
 
@@ -62,7 +63,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 			newStatement.append(';');
 			JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
 		}
-		else if(ReplaceIfWithConditionalPredicate.isReplaceableReturn(ifStatement))
+		else if (ReplaceIfWithConditionalPredicate.isReplaceableReturn(ifStatement))
 		{
 			final StringBuilder newStatement = new StringBuilder(RETURN_KEYWORD);
 
@@ -70,7 +71,7 @@ else if(ReplaceIfWithConditionalPredicate.isReplaceableReturn(ifStatement))
 			newStatement.append(';');
 			JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
 		}
-		else if(ReplaceIfWithConditionalPredicate.isReplaceableImplicitReturn(ifStatement))
+		else if (ReplaceIfWithConditionalPredicate.isReplaceableImplicitReturn(ifStatement))
 		{
 			final JSExpression condition = ifStatement.getCondition();
 			final JSReturnStatement thenBranch = (JSReturnStatement) ConditionalUtils.stripBraces(ifStatement.getThen());
@@ -78,13 +79,14 @@ else if(ReplaceIfWithConditionalPredicate.isReplaceableImplicitReturn(ifStatemen
 			final String newStatement = getImplicitReturnReplacement(condition, thenBranch, elseBranch);
 
 			JSElementFactory.replaceStatement(ifStatement, newStatement);
-			if(elseBranch != null)
+			if (elseBranch != null)
 			{
 				JSElementFactory.removeElement(elseBranch);
 			}
 		}
 	}
 
+	@RequiredReadAction
 	private static void getAssignmentReplacement(StringBuilder buffer, JSIfStatement ifStatement)
 	{
 		final JSExpression condition = ifStatement.getCondition();
@@ -97,13 +99,13 @@ private static void getAssignmentReplacement(StringBuilder buffer, JSIfStatement
 		assert (thenRhs != null);
 
 		buffer.append(thenAssign.getLOperand().getText())
-				.append(operator)
-				.append(ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-				.append(TERNARY_QUESTION)
-				.append(ParenthesesUtils.getParenthesized(thenRhs, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-				.append(TERNARY_SEMICOLON);
+			.append(operator)
+			.append(ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+			.append('?')
+			.append(ParenthesesUtils.getParenthesized(thenRhs, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+			.append(':');
 
-		if(elseBranch instanceof JSIfStatement)
+		if (elseBranch instanceof JSIfStatement)
 		{
 			getAssignmentReplacement(buffer, (JSIfStatement) elseBranch);
 			return;
@@ -124,23 +126,20 @@ private static void getReturnReplacement(StringBuilder buffer, JSIfStatement ifS
 		final JSReturnStatement thenReturn = (JSReturnStatement) ConditionalUtils.stripBraces(thenBranch);
 		final JSStatement elseBranch = ifStatement.getElse();
 
-		buffer.append(ParenthesesUtils.getParenthesized(ifStatement.getCondition(),
-				ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-				.append(TERNARY_QUESTION)
-				.append(ParenthesesUtils.getParenthesized(thenReturn.getExpression(),
-						ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-				.append(TERNARY_SEMICOLON);
+		buffer.append(ParenthesesUtils.getParenthesized(ifStatement.getCondition(), ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+			.append('?')
+			.append(ParenthesesUtils.getParenthesized(thenReturn.getExpression(), ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+			.append(':');
 
-		if(elseBranch instanceof JSIfStatement)
+		if (elseBranch instanceof JSIfStatement elseIfStatement)
 		{
-			getReturnReplacement(buffer, (JSIfStatement) elseBranch);
+			getReturnReplacement(buffer, elseIfStatement);
 			return;
 		}
 
 		final JSReturnStatement elseReturn = (JSReturnStatement) ConditionalUtils.stripBraces(elseBranch);
 
-		buffer.append(ParenthesesUtils.getParenthesized(elseReturn.getExpression(),
-				ParenthesesUtils.CONDITIONAL_PRECENDENCE));
+		buffer.append(ParenthesesUtils.getParenthesized(elseReturn.getExpression(), ParenthesesUtils.CONDITIONAL_PRECENDENCE));
 	}
 
 	private static String getImplicitReturnReplacement(JSExpression condition, JSReturnStatement thenBranch, JSReturnStatement elseBranch)
@@ -155,7 +154,7 @@ private static String getImplicitReturnReplacement(JSExpression condition, JSRet
 		final String elseValue = ParenthesesUtils.getParenthesized(elseReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
 		final String conditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
 
-		return RETURN_KEYWORD + conditionText + TERNARY_QUESTION + thenValue + TERNARY_SEMICOLON + elseValue + ';';
+		return RETURN_KEYWORD + conditionText + '?' + thenValue + ':' + elseValue + ';';
 	}
 
 	private static class ReplaceIfWithConditionalPredicate implements JSElementPredicate
@@ -163,16 +162,16 @@ private static class ReplaceIfWithConditionalPredicate implements JSElementPredi
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if(!(element instanceof JSElement))
+			if (!(element instanceof JSElement))
 			{
 				return false;
 			}
 
 			PsiElement parent = element.getParent();
 
-			if(!(parent instanceof JSIfStatement))
+			if (!(parent instanceof JSIfStatement))
 			{
-				if(element instanceof JSIfStatement)
+				if (element instanceof JSIfStatement)
 				{
 					parent = element;
 				}
@@ -182,7 +181,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 				}
 			}
 
-			if(ErrorUtil.containsError(parent))
+			if (ErrorUtil.containsError(parent))
 			{
 				return false;
 			}
@@ -190,39 +189,29 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 			final JSExpression condition = ifStatement.getCondition();
 
-			if(condition == null || !condition.isValid())
+			if (condition == null || !condition.isValid())
 			{
 				return false;
 			}
-			if(isReplaceableAssignment(ifStatement))
-			{
-				return true;
-			}
-			if(isReplaceableReturn(ifStatement))
-			{
-				return true;
-			}
-			return isReplaceableImplicitReturn(ifStatement);
+			return isReplaceableAssignment(ifStatement)
+				|| isReplaceableReturn(ifStatement)
+				|| isReplaceableImplicitReturn(ifStatement);
 		}
 
 		public static boolean isReplaceableImplicitReturn(JSIfStatement ifStatement)
 		{
 			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
 
-			if(!(nextStatement instanceof JSReturnStatement))
+			if (!(nextStatement instanceof JSReturnStatement nextReturnStatement))
 			{
 				return false;
 			}
 
 			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
 
-			if(!(thenBranch instanceof JSReturnStatement))
-			{
-				return false;
-			}
-
-			return (((JSReturnStatement) thenBranch).getExpression() != null &&
-					((JSReturnStatement) nextStatement).getExpression() != null);
+			return thenBranch instanceof JSReturnStatement thenReturnStatement
+				&& thenReturnStatement.getExpression() != null
+				&& nextReturnStatement.getExpression() != null;
 		}
 
 		public static boolean isReplaceableReturn(JSIfStatement ifStatement)
@@ -230,49 +219,47 @@ public static boolean isReplaceableReturn(JSIfStatement ifStatement)
 			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
 			final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
 
-			if(!(thenBranch instanceof JSReturnStatement))
+			if (!(thenBranch instanceof JSReturnStatement thenReturnStatement))
 			{
 				return false;
 			}
 
-			if(elseBranch instanceof JSIfStatement)
+			if (elseBranch instanceof JSIfStatement elseIfStatement)
 			{
-				return isReplaceableReturn((JSIfStatement) elseBranch);
-			}
-			if(!(elseBranch instanceof JSReturnStatement))
-			{
-				return false;
+				return isReplaceableReturn(elseIfStatement);
 			}
 
-			return (((JSReturnStatement) thenBranch).getExpression() != null &&
-					((JSReturnStatement) elseBranch).getExpression() != null);
-
+			return elseBranch instanceof JSReturnStatement elseReturnStatement
+				&& thenReturnStatement.getExpression() != null
+				&& elseReturnStatement.getExpression() != null;
 		}
 
+		@RequiredReadAction
 		public static boolean isReplaceableAssignment(JSIfStatement ifStatement)
 		{
 			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-			if(thenBranch == null)
+			if (thenBranch == null)
 			{
 				return false;
 			}
 
-			if(!ConditionalUtils.isAssignment(thenBranch))
+			if (!ConditionalUtils.isAssignment(thenBranch))
 			{
 				return false;
 			}
 			final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
 
-			if(elseBranch == null)
+			if (elseBranch == null)
 			{
 				return false;
 			}
-			if(elseBranch instanceof JSIfStatement)
+
+			if (elseBranch instanceof JSIfStatement elseIfStatement)
 			{
-				return isReplaceableAssignment((JSIfStatement) elseBranch);
+				return isReplaceableAssignment(elseIfStatement);
 			}
 
-			if(!ConditionalUtils.isAssignment(elseBranch))
+			if (!ConditionalUtils.isAssignment(elseBranch))
 			{
 				return false;
 			}
@@ -282,27 +269,23 @@ public static boolean isReplaceableAssignment(JSIfStatement ifStatement)
 			final IElementType thenSign = thenExpression.getOperationSign();
 			final IElementType elseSign = elseExpression.getOperationSign();
 
-			if(!thenSign.equals(elseSign))
+			if (!thenSign.equals(elseSign))
 			{
 				return false;
 			}
 
 			final JSExpression thenLhs = thenExpression.getLOperand();
 
-			if(thenExpression.getROperand() == null)
-			{
-				return false;
-			}
-			if(elseExpression.getROperand() == null ||
-					elseExpression.getLOperand() == null)
-			{
+			if (thenExpression.getROperand() == null
+				|| elseExpression.getROperand() == null
+				|| elseExpression.getLOperand() == null) {
 				return false;
 			}
 			final JSExpression thenRhs = thenExpression.getROperand();
 			assert thenRhs != null;
 
 			final JSExpression elseRhs = elseExpression.getROperand();
-			if(elseRhs == null)
+			if (elseRhs == null)
 			{
 				return false;
 			}

From f0b2949ba2e5da20492c2186e7deaac19118db59 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Wed, 17 Jul 2024 19:39:10 +0300
Subject: [PATCH 200/340] Improving readability after Intention refactoring.

---
 .../JSRemoveConditionalIntention.java         | 28 +++++-----
 ...DeclarationAndInitializationIntention.java | 34 ++++++-------
 .../JSMergeParallelForInLoopsIntention.java   | 13 ++---
 .../JSMergeParallelForLoopsIntention.java     | 13 ++---
 ...RemoveUnnecessaryParenthesesIntention.java | 51 ++++++++-----------
 .../trivialif/JSMergeIfOrIntention.java       |  9 ++--
 .../JSMergeParallelIfsIntention.java          | 13 ++---
 .../JSRemoveRedundantElseIntention.java       | 35 +++++++------
 .../trivialif/JSSplitIfAndIntention.java      |  4 +-
 .../trivialif/JSSplitIfOrIntention.java       |  4 +-
 10 files changed, 92 insertions(+), 112 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index c8f48b92..352e4d4f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -71,23 +71,23 @@ private static class RemoveConditionalPredicate implements JSElementPredicate
 		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if (!(element instanceof JSConditionalExpression condition  && !ErrorUtil.containsError(element))) {
-				return false;
-			}
-
-			final JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
-			final JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
-
-			if (condition.getCondition() == null || thenExpression == null || elseExpression == null)
+			if (element instanceof JSConditionalExpression condition && !ErrorUtil.containsError(element))
 			{
-				return false;
-			}
+				final JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
+        final JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
+
+				if (condition.getCondition() == null || thenExpression == null || elseExpression == null)
+				{
+					return false;
+				}
 
-			final String thenText = thenExpression.getText();
-			final String elseText = elseExpression.getText();
+				final String thenText = thenExpression.getText();
+				final String elseText = elseExpression.getText();
 
-			return (BoolUtils.TRUE.equals(elseText) && BoolUtils.FALSE.equals(thenText))
-				|| (BoolUtils.TRUE.equals(thenText) && BoolUtils.FALSE.equals(elseText));
+				return (BoolUtils.TRUE.equals(elseText) && BoolUtils.FALSE.equals(thenText))
+					|| (BoolUtils.TRUE.equals(thenText) && BoolUtils.FALSE.equals(elseText));
+			}
+			return false;
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 8aa322f1..b0315b3f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -98,28 +98,28 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 	private static class Predicate implements JSElementPredicate
 	{
 		@Override
+		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if (!(element instanceof JSVarStatement varStatement && !ErrorUtil.containsError(varStatement))) {
-				return false;
-			}
-
-			for (JSVariable variable : varStatement.getVariables())
+			if (element instanceof JSVarStatement varStatement && !ErrorUtil.containsError(varStatement))
 			{
-				if (variable.hasInitializer()) {
-					continue;
-				}
+				for (JSVariable variable : varStatement.getVariables())
+				{
+					if (variable.hasInitializer()) {
+						continue;
+					}
 
-				final Iterator<PsiElement> referenceIterator =
-					FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
-				final JSReferenceExpression firstReference = (JSReferenceExpression) (referenceIterator.hasNext() ? referenceIterator.next() : null);
+					final Iterator<PsiElement> referenceIterator =
+						FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
+					final JSReferenceExpression firstReference =
+						(JSReferenceExpression)(referenceIterator.hasNext() ? referenceIterator.next() : null);
 
-				if (firstReference != null
-					&& firstReference.getParent() instanceof JSDefinitionExpression definitionExpression
-					&& definitionExpression.getParent() instanceof JSAssignmentExpression assignmentExpression
-					&& assignmentExpression.getParent() instanceof JSExpressionStatement)
-				{
-					return true;
+					if (firstReference != null
+						&& firstReference.getParent() instanceof JSDefinitionExpression definitionExpression
+						&& definitionExpression.getParent() instanceof JSAssignmentExpression assignmentExpression
+						&& assignmentExpression.getParent() instanceof JSExpressionStatement) {
+						return true;
+					}
 				}
 			}
 			return false;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index 1a8d37f3..f33934bc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -88,15 +88,10 @@ private static class MergeParallelForInLoopsPredicate implements JSElementPredic
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if (!(element instanceof JSForInStatement forInStatement && !ErrorUtil.containsError(element)))
-			{
-				return false;
-			}
-
-			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-			return nextStatement instanceof JSForInStatement nextForInStatement
-				&& !ErrorUtil.containsError(nextStatement)
+			return element instanceof JSForInStatement forInStatement
+				&& !ErrorUtil.containsError(element)
+				&& JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSForInStatement nextForInStatement
+				&& !ErrorUtil.containsError(nextForInStatement)
 				&& forInStatementsCanBeMerged(forInStatement, nextForInStatement);
 		}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index d4da8774..237d0c3b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -90,15 +90,10 @@ private static class MergeParallelForLoopsPredicate implements JSElementPredicat
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if (!(element instanceof JSForStatement forStatement && !ErrorUtil.containsError(forStatement)))
-			{
-				return false;
-			}
-
-			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-			return nextStatement instanceof JSForStatement nextForStatement
-				&& !ErrorUtil.containsError(nextStatement)
+			return element instanceof JSForStatement forStatement
+				&& !ErrorUtil.containsError(forStatement)
+				&& JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSForStatement nextForStatement
+				&& !ErrorUtil.containsError(nextForStatement)
 				&& forStatementsCanBeMerged(forStatement, nextForStatement);
 		}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index cdd6c673..8195af84 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -66,50 +66,39 @@ private static class UnnecessaryParenthesesPredicate implements JSElementPredica
 		@RequiredReadAction
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if (!(element instanceof JSParenthesizedExpression expression && !ErrorUtil.containsError(element)))
+			if (element instanceof JSParenthesizedExpression expression && !ErrorUtil.containsError(element))
 			{
-				return false;
-			}
-
-			if (!(expression.getParent() instanceof JSExpression parentExpression))
-			{
-				return true;
-			}
+				if (!(expression.getParent() instanceof JSExpression parentExpression))
+				{
+          return true;
+				}
 
-			final JSExpression body = expression.getInnerExpression();
+				final JSExpression body = expression.getInnerExpression();
 
-			if (body instanceof JSParenthesizedExpression)
-			{
-				return true;
-			}
+				if (body instanceof JSParenthesizedExpression)
+				{
+					return true;
+				}
 
-			final int parentPrecendence = ParenthesesUtils.getPrecendence(parentExpression);
-			final int childPrecendence = ParenthesesUtils.getPrecendence(body);
+				final int parentPrecendence = ParenthesesUtils.getPrecendence(parentExpression);
+				final int childPrecendence = ParenthesesUtils.getPrecendence(body);
 
-			if (parentPrecendence > childPrecendence)
-			{
-				return !(body instanceof JSFunctionExpression);
-			}
-			else if (parentPrecendence == childPrecendence)
-			{
-				if (parentExpression instanceof JSBinaryExpression parentBinaryExpression
+				if (parentPrecendence > childPrecendence)
+				{
+					return !(body instanceof JSFunctionExpression);
+				}
+				else if (parentPrecendence == childPrecendence
+					&& parentExpression instanceof JSBinaryExpression parentBinaryExpression
 					&& body instanceof JSBinaryExpression bodyBinaryExpression)
 				{
 					final IElementType parentOperator = parentBinaryExpression.getOperationSign();
 					final IElementType childOperator = bodyBinaryExpression.getOperationSign();
 					final JSExpression lhs = parentBinaryExpression.getLOperand();
 
-					return (lhs.equals(expression) && parentOperator.equals(childOperator));
+					return lhs.equals(expression) && parentOperator.equals(childOperator);
 				}
-				else
-				{
-					return false;
-				}
-			}
-			else
-			{
-				return false;
 			}
+			return false;
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index e87736b5..0f32cdf5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -74,9 +74,12 @@ private static void replaceMergeableExplicitIf(JSElement token) throws Incorrect
 		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
 		final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
 		final JSStatement parentThenBranch = parentStatement.getThen();
-		final StringBuilder statement =
-			new StringBuilder("if (").append(parentConditionText).append(" || ").append(childConditionText).append(')')
-				.append(parentThenBranch.getText());
+		final StringBuilder statement = new StringBuilder("if (")
+			.append(parentConditionText)
+			.append(" || ")
+			.append(childConditionText)
+			.append(')')
+			.append(parentThenBranch.getText());
 		final JSStatement childElseBranch = childStatement.getElse();
 
 		if (childElseBranch != null)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index f6ce3bd5..cfd25c3f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -97,15 +97,10 @@ private static class MergeParallelIfsPredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if (!(element instanceof JSIfStatement ifStatement && !ErrorUtil.containsError(element)))
-			{
-				return false;
-			}
-
-			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-			return nextStatement instanceof JSIfStatement nextIfStatement
-				&& !ErrorUtil.containsError(nextStatement)
+			return element instanceof JSIfStatement ifStatement
+				&& !ErrorUtil.containsError(element)
+				&& JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSIfStatement nextIfStatement
+				&& !ErrorUtil.containsError(nextIfStatement)
 				&& ifStatementsCanBeMerged(ifStatement, nextIfStatement);
 		}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index 7440961c..8e56eaf1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -71,28 +71,27 @@ private static class RemoveRedundantElsePredicate implements JSElementPredicate
 		@Override
 		public boolean satisfiedBy(@Nonnull PsiElement element)
 		{
-			if (!(element instanceof JSIfStatement ifStatement && !ErrorUtil.containsError(ifStatement))
-				|| ifStatement.getElse() == null) {
-				return false;
-			}
-
-			JSStatement thenBranch = ifStatement.getThen();
-			while (thenBranch instanceof JSBlockStatement thenBlockStatement)
+			if (element instanceof JSIfStatement ifStatement && !ErrorUtil.containsError(ifStatement) && ifStatement.getElse() != null)
 			{
-				JSStatement[] thenStatements = thenBlockStatement.getStatements();
-
-				if (thenStatements.length == 0)
-				{
-					return true;
-				}
-				else if (thenStatements.length > 1)
+				JSStatement thenBranch = ifStatement.getThen();
+				while (thenBranch instanceof JSBlockStatement thenBlockStatement)
 				{
-					return false;
+					JSStatement[] thenStatements = thenBlockStatement.getStatements();
+
+					if (thenStatements.length == 0)
+					{
+						return true;
+					}
+					else if (thenStatements.length > 1)
+					{
+						return false;
+					}
+					thenBranch = thenStatements[0];
 				}
-				thenBranch = thenStatements[0];
-			}
 
-			return thenBranch instanceof JSReturnStatement;
+				return thenBranch instanceof JSReturnStatement;
+			}
+			return false;
 		}
 	}
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index f9a97ced..d95dd5ad 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -123,7 +123,9 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 			final JSExpression condition = ifStatement.getCondition();
 
-			return condition != null && !ErrorUtil.containsError(condition) && condition instanceof JSBinaryExpression binaryExpression
+			return condition != null
+				&& !ErrorUtil.containsError(condition)
+				&& condition instanceof JSBinaryExpression binaryExpression
 				&& JSTokenTypes.ANDAND.equals(binaryExpression.getOperationSign());
 		}
 	}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index 5617ce93..00dfa536 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -108,7 +108,9 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			final JSIfStatement ifStatement = (JSIfStatement) parent;
 			final JSExpression condition = ifStatement.getCondition();
 
-			return condition != null && !ErrorUtil.containsError(condition) && condition instanceof JSBinaryExpression binaryExpression
+			return condition != null
+				&& !ErrorUtil.containsError(condition)
+				&& condition instanceof JSBinaryExpression binaryExpression
 				&& JSTokenTypes.OROR.equals(binaryExpression.getOperationSign());
 		}
 	}

From d25b8da13ad9fa7736a05306be01089c3bd101e5 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Wed, 17 Jul 2024 23:52:27 +0300
Subject: [PATCH 201/340] =?UTF-8?q?Reworking=20JSIntention.getText()=20?=
 =?UTF-8?q?=E2=80=94=20direct=20call=20to=20JSIntentionBundle.message()=20?=
 =?UTF-8?q?with=20constant=20key=20instead=20of=20key=20calculation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lang/javascript/intention/JSIntention.java   | 12 +++---------
 .../intention/bool/JSDeMorgansLawIntention.java  |  5 +++++
 .../bool/JSFlipComparisonIntention.java          |  5 +++++
 .../bool/JSFlipConjunctionIntention.java         |  5 +++++
 .../bool/JSNegateComparisonIntention.java        |  5 +++++
 .../bool/JSRemoveBooleanEqualityIntention.java   |  5 +++++
 .../intention/braces/JSAddBracesIntention.java   |  5 +++++
 .../braces/JSRemoveBracesIntention.java          |  5 +++++
 .../JSChangeToCStyleCommentIntention.java        |  6 ++++++
 .../JSChangeToEndOfLineCommentIntention.java     |  6 ++++++
 .../JSMoveCommentToSeparateLineIntention.java    |  6 ++++++
 .../conditional/JSFlipConditionalIntention.java  |  6 ++++++
 .../intention/conditional/JSFlipIfIntention.java |  6 ++++++
 .../JSRemoveConditionalIntention.java            |  8 +++++++-
 .../JSReplaceConditionalWithIfIntention.java     |  6 ++++++
 .../constant/JSConstantExpressionIntention.java  |  6 ++++++
 .../JSConstantSubexpressionIntention.java        |  5 +++++
 .../increment/JSExtractIncrementIntention.java   |  5 +++++
 ...rgeDeclarationAndInitializationIntention.java |  6 ++++++
 ...litDeclarationAndInitializationIntention.java |  6 ++++++
 .../loop/JSMergeParallelForInLoopsIntention.java |  6 ++++++
 .../loop/JSMergeParallelForLoopsIntention.java   |  6 ++++++
 .../JSConvertIntegerToDecimalIntention.java      |  6 ++++++
 .../number/JSConvertIntegerToHexIntention.java   |  6 ++++++
 .../number/JSConvertIntegerToOctalIntention.java |  6 ++++++
 .../JSReplaceMultiplyWithShiftIntention.java     |  5 +++++
 .../JSReplaceShiftWithMultiplyIntention.java     |  5 +++++
 ...JSReplaceWithOperatorAssignmentIntention.java |  5 +++++
 .../JSRemoveUnnecessaryParenthesesIntention.java | 16 ++++++++++++----
 .../JSDoubleToSingleQuotedStringIntention.java   |  6 ++++++
 ...SJoinConcatenatedStringLiteralsIntention.java |  6 ++++++
 .../JSSingleToDoubleQuotedStringIntention.java   |  6 ++++++
 .../JSReplaceIfWithSwitchIntention.java          |  6 ++++++
 .../JSReplaceSwitchWithIfIntention.java          |  6 ++++++
 .../trivialif/JSMergeElseIfIntention.java        |  6 ++++++
 .../trivialif/JSMergeIfAndIntention.java         | 10 ++++++----
 .../trivialif/JSMergeIfOrIntention.java          |  6 ++++++
 .../trivialif/JSMergeParallelIfsIntention.java   |  6 ++++++
 .../JSRemoveRedundantElseIntention.java          |  6 ++++++
 .../JSReplaceIfWithConditionalIntention.java     | 12 +++++++-----
 .../trivialif/JSSimplifyIfElseIntention.java     |  6 ++++++
 .../trivialif/JSSplitElseIfIntention.java        |  6 ++++++
 .../trivialif/JSSplitIfAndIntention.java         |  6 ++++++
 .../trivialif/JSSplitIfOrIntention.java          |  6 ++++++
 44 files changed, 257 insertions(+), 23 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index 50592ffc..16a5b83a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -87,17 +87,11 @@ public boolean startInWriteAction() {
     return true;
   }
 
-  protected String getTextKey(@NonNls Object... suffixes) {
-    return JSIntentionBundle.getKey(this.getClass().getName().substring(PACKAGE_NAME.length() + 1).replace("JS", ""),
-                                    INTENTION_SUFFIX,
-                                    null,
-                                    suffixes);
-  }
-
   @Override
-  @SuppressWarnings({"UnresolvedPropertyKey"})
   @Nonnull
   public String getText() {
-    return JSIntentionBundle.message(this.getTextKey(DISPLAY_NAME));
+    return getBasicText();
   }
+
+  protected abstract String getBasicText();
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index a79dae7d..0701b01a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -46,6 +46,11 @@ public class JSDeMorgansLawIntention extends JSMutablyNamedIntention
 	@NonNls
 	private static final String OR_OPERATOR = "||";
 
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("bool.de-morgans-law.family-name");
+	}
+
 	@Override
 	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 157fdaf6..45bdeef4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -38,6 +38,11 @@
 )
 public class JSFlipComparisonIntention extends JSMutablyNamedIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("bool.flip-comparison.family-name");
+	}
+
 	@Override
 	@RequiredReadAction
 	public String getTextForElement(PsiElement element)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 54f9bb7c..0222659b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -39,6 +39,11 @@
 )
 public class JSFlipConjunctionIntention extends JSMutablyNamedIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("bool.flip-conjunction.family-name");
+	}
+
 	@Override
 	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index a13dcb06..f7e628c8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -38,6 +38,11 @@
 )
 public class JSNegateComparisonIntention extends JSMutablyNamedIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("bool.negate-comparison.family-name");
+	}
+
 	@Override
 	@RequiredReadAction
 	public String getTextForElement(PsiElement element)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index d170f695..9ea71667 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -40,6 +40,11 @@
 )
 public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("bool.remove-boolean-equality.family-name");
+	}
+
 	@Override
 	protected String getTextForElement(PsiElement element)
 	{
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index d40cce39..653658b2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -43,6 +43,11 @@ protected JSElementPredicate getElementPredicate()
 		return new AddBracesPredicate();
 	}
 
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("braces.add-braces.family-name");
+	}
+
 	@Override
 	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index 7066c59a..e21e07e4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -36,6 +36,11 @@
 )
 public class JSRemoveBracesIntention extends JSMutablyNamedIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("braces.remove-braces.family-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index e7c93406..443af3de 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -26,6 +26,7 @@
 import consulo.util.lang.StringUtil;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 import jakarta.annotation.Nonnull;
@@ -40,6 +41,11 @@
 )
 public class JSChangeToCStyleCommentIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("comment.change-to-cstyle-comment.display-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 69dc738f..5f864938 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -27,6 +27,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
@@ -38,6 +39,11 @@
 )
 public class JSChangeToEndOfLineCommentIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("comment.change-to-end-of-line-comment.display-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index 540e80ff..de0f4027 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -27,6 +27,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
@@ -38,6 +39,11 @@
 )
 public class JSMoveCommentToSeparateLineIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("comment.move-comment-to-separate-line.display-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 4956d147..717e15cc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -39,6 +40,11 @@
 )
 public class JSFlipConditionalIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("conditional.flip-conditional.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index 8cdaf833..8c8f0cea 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -27,6 +27,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -39,6 +40,11 @@
 )
 public class JSFlipIfIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("conditional.flip-if.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 352e4d4f..7d15424d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -39,6 +40,11 @@
 )
 public class JSRemoveConditionalIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("conditional.remove-conditional.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
@@ -74,7 +80,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			if (element instanceof JSConditionalExpression condition && !ErrorUtil.containsError(element))
 			{
 				final JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
-        final JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
+				final JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
 
 				if (condition.getCondition() == null || thenExpression == null || elseExpression == null)
 				{
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 6e0f566e..f5a53f36 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 
 import jakarta.annotation.Nonnull;
@@ -34,6 +35,11 @@
 )
 public class JSReplaceConditionalWithIfIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("conditional.replace-conditional-with-if.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 33db3d3b..4cf7b102 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -27,6 +27,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -39,6 +40,11 @@
 )
 public class JSConstantExpressionIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("constant.constant-expression.display-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index 8005adb8..cff7a6bf 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -52,6 +52,11 @@ protected JSElementPredicate getElementPredicate()
 		return new ConstantSubexpressionPredicate();
 	}
 
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("constant.constant-subexpression.family-name");
+	}
+
 	@Override
 	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index 8bac99d0..7e395914 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -36,6 +36,11 @@
 )
 public class JSExtractIncrementIntention extends JSMutablyNamedIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("increment.extract-increment.family-name");
+	}
+
 	@Override
 	public String getTextForElement(PsiElement element)
 	{
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index b0315b3f..89cbddba 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -24,6 +24,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.FindReferenceUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -38,6 +39,11 @@
 )
 public class JSMergeDeclarationAndInitializationIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("initialization.merge-declaration-and-initialization.display-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index 4cbb4361..d2b4264b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -28,6 +28,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
@@ -46,6 +47,11 @@ public class JSSplitDeclarationAndInitializationIntention extends JSIntention
 	@NonNls
 	private static final String VAR_KEYWORD = "var ";
 
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("initialization.split-declaration-and-initialization.display-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index f33934bc..b6150d0d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -27,6 +27,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -42,6 +43,11 @@
 )
 public class JSMergeParallelForInLoopsIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("loop.merge-parallel-for-in-loops.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 237d0c3b..67979209 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -26,6 +26,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -41,6 +42,11 @@
 )
 public class JSMergeParallelForLoopsIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("loop.merge-parallel-for-loops.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index 3d1fd970..3b85f4bf 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
@@ -35,6 +36,11 @@
 )
 public class JSConvertIntegerToDecimalIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("number.convert-integer-to-decimal.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index 4470a156..c6075c00 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
@@ -35,6 +36,11 @@
 )
 public class JSConvertIntegerToHexIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("number.convert-integer-to-hex.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 6e5af520..0fce97cf 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -24,6 +24,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
@@ -35,6 +36,11 @@
 )
 public class JSConvertIntegerToOctalIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("number.convert-integer-to-octal.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index f0907f09..38b15527 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -40,6 +40,11 @@
 )
 public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("number.replace-multiply-with-shift.family-name");
+	}
+
 	@Override
 	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index 38d27e1d..a2f57855 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -39,6 +39,11 @@
 )
 public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("number.replace-shift-with-multiply.family-name");
+	}
+
 	@Override
 	@RequiredReadAction
 	protected String getTextForElement(PsiElement element)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index ab639f7e..c00eeece 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -40,6 +40,11 @@
 )
 public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("opassign.replace-with-operator-assignment.family-name");
+	}
+
 	@Override
 	@RequiredReadAction
 	public String getTextForElement(PsiElement element)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 8195af84..f45bcc31 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -15,21 +15,24 @@
  */
 package org.intellij.idea.lang.javascript.intention.parenthesis;
 
-import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSFunctionExpression;
+import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSRemoveUnnecessaryParenthesesIntention",
@@ -38,6 +41,11 @@
 )
 public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("parenthesis.remove-unnecessary-parentheses.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
@@ -70,7 +78,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 			{
 				if (!(expression.getParent() instanceof JSExpression parentExpression))
 				{
-          return true;
+					return true;
 				}
 
 				final JSExpression body = expression.getInnerExpression();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index a9411491..f6faae5b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 import jakarta.annotation.Nonnull;
@@ -34,6 +35,11 @@
 )
 public class JSDoubleToSingleQuotedStringIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("string.double-to-single-quoted-string.display-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 668dc5bf..43799a11 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -30,6 +30,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 @ExtensionImpl
@@ -40,6 +41,11 @@
 )
 public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("string.join-concatenated-string-literals.display-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index 63c0b6f9..a379401d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -23,6 +23,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 import jakarta.annotation.Nonnull;
@@ -35,6 +36,11 @@
 )
 public class JSSingleToDoubleQuotedStringIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("string.single-to-double-quoted-string.display-name");
+	}
+
 	@Override
 	@Nonnull
 	protected JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 14aeac2a..4af9ee58 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -26,6 +26,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.*;
 import org.jetbrains.annotations.NonNls;
 
@@ -50,6 +51,11 @@ public class JSReplaceIfWithSwitchIntention extends JSIntention
 	@NonNls
 	private static final String BREAK_STATEMENT = "\nbreak;";
 
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("switchtoif.replace-if-with-switch.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index aa0e8339..39ac33aa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -28,6 +28,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.*;
 import org.jetbrains.annotations.NonNls;
 
@@ -56,6 +57,11 @@ public class JSReplaceSwitchWithIfIntention extends JSIntention
 	@NonNls
 	private static final String DEFAULT_LABEL_NAME = "Label";
 
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("switchtoif.replace-switch-with-if.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index d48f5458..f36c5ef8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
@@ -38,6 +39,11 @@
 )
 public class JSMergeElseIfIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.merge-else-if.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index c6379381..219954f1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -26,11 +26,11 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
@@ -42,8 +42,10 @@
 )
 public class JSMergeIfAndIntention extends JSIntention
 {
-	@NonNls
-	private static final String IF_STATEMENT_PREFIX = "if (";
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.merge-if-and.display-name");
+	}
 
 	@Override
 	@Nonnull
@@ -66,7 +68,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.AND_PRECENDENCE);
 		final String parentConditionText = ParenthesesUtils.getParenthesized(parentCondition, ParenthesesUtils.AND_PRECENDENCE);
 		final JSStatement childThenBranch = childStatement.getThen();
-		final String statement = IF_STATEMENT_PREFIX + parentConditionText + " && " + childConditionText + ')' + childThenBranch.getText();
+		final String statement = "if (" + parentConditionText + " && " + childConditionText + ')' + childThenBranch.getText();
 
 		JSElementFactory.replaceStatement(parentStatement, statement);
 	}
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index 0f32cdf5..1fa8b844 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -26,6 +26,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.*;
 
 import jakarta.annotation.Nonnull;
@@ -38,6 +39,11 @@
 )
 public class JSMergeIfOrIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.merge-if-or.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index cfd25c3f..5efae060 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -40,6 +41,11 @@
 )
 public class JSMergeParallelIfsIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.merge-parallel-ifs.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index 8e56eaf1..4182bb92 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -27,6 +27,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
@@ -38,6 +39,11 @@
 )
 public class JSRemoveRedundantElseIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.remove-redundant-else.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index 48863dc3..9490a788 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -26,8 +26,8 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.*;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 @IntentionMetaData(
@@ -37,8 +37,10 @@
 )
 public class JSReplaceIfWithConditionalIntention extends JSIntention
 {
-	@NonNls
-	private static final String RETURN_KEYWORD = "return ";
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.replace-if-with-conditional.display-name");
+	}
 
 	@Override
 	@Nonnull
@@ -65,7 +67,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		}
 		else if (ReplaceIfWithConditionalPredicate.isReplaceableReturn(ifStatement))
 		{
-			final StringBuilder newStatement = new StringBuilder(RETURN_KEYWORD);
+			final StringBuilder newStatement = new StringBuilder("return ");
 
 			getReturnReplacement(newStatement, ifStatement);
 			newStatement.append(';');
@@ -154,7 +156,7 @@ private static String getImplicitReturnReplacement(JSExpression condition, JSRet
 		final String elseValue = ParenthesesUtils.getParenthesized(elseReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
 		final String conditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
 
-		return RETURN_KEYWORD + conditionText + '?' + thenValue + ':' + elseValue + ';';
+		return "return " + conditionText + '?' + thenValue + ':' + elseValue + ';';
 	}
 
 	private static class ReplaceIfWithConditionalPredicate implements JSElementPredicate
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 63149a54..67bc5f94 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 
@@ -37,6 +38,11 @@
 )
 public class JSSimplifyIfElseIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.simplify-if-else.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index b3b153f6..9fe75aa3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -23,6 +23,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
@@ -36,6 +37,11 @@
 )
 public class JSSplitElseIfIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.split-else-if.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index d95dd5ad..cfb66ea3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -28,6 +28,7 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
@@ -48,6 +49,11 @@ public class JSSplitIfAndIntention extends JSIntention
 	@NonNls
 	private static final String ELSE_KEYWORD = "else ";
 
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.split-if-and.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index 00dfa536..1b57b4d9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -27,6 +27,7 @@
 import consulo.language.util.IncorrectOperationException;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
+import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
@@ -41,6 +42,11 @@
 )
 public class JSSplitIfOrIntention extends JSIntention
 {
+	@Override
+	protected String getBasicText() {
+		return JSIntentionBundle.message("trivialif.split-if-or.display-name");
+	}
+
 	@Override
 	@Nonnull
 	public JSElementPredicate getElementPredicate()

From b98c3400deddd4064b9a90b7b4e90752f8a81a3b Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 18 Jul 2024 12:07:26 +0300
Subject: [PATCH 202/340] Intention fixes after code-review.

---
 .../javascript/intention/JSIntention.java     |  6 +-----
 .../intention/JSMutablyNamedIntention.java    |  9 ++++-----
 .../bool/JSDeMorgansLawIntention.java         |  4 +++-
 .../bool/JSFlipComparisonIntention.java       |  4 +++-
 .../bool/JSFlipConjunctionIntention.java      |  4 +++-
 .../bool/JSNegateComparisonIntention.java     |  4 +++-
 .../JSRemoveBooleanEqualityIntention.java     |  4 +++-
 .../braces/JSAddBracesIntention.java          |  6 ++++--
 .../braces/JSRemoveBracesIntention.java       |  4 +++-
 .../JSChangeToCStyleCommentIntention.java     |  4 +++-
 .../JSChangeToEndOfLineCommentIntention.java  |  4 +++-
 .../JSMoveCommentToSeparateLineIntention.java |  4 +++-
 .../JSFlipConditionalIntention.java           |  4 +++-
 .../conditional/JSFlipIfIntention.java        |  4 +++-
 .../JSRemoveConditionalIntention.java         |  4 +++-
 .../JSReplaceConditionalWithIfIntention.java  |  4 +++-
 .../JSConstantExpressionIntention.java        |  4 +++-
 .../JSConstantSubexpressionIntention.java     |  6 ++++--
 .../JSExtractIncrementIntention.java          |  4 +++-
 ...DeclarationAndInitializationIntention.java |  4 +++-
 ...DeclarationAndInitializationIntention.java |  4 +++-
 .../JSMergeParallelForInLoopsIntention.java   |  4 +++-
 .../JSMergeParallelForLoopsIntention.java     |  4 +++-
 .../JSConvertIntegerToDecimalIntention.java   |  4 +++-
 .../JSConvertIntegerToHexIntention.java       |  4 +++-
 .../JSConvertIntegerToOctalIntention.java     |  4 +++-
 .../JSReplaceMultiplyWithShiftIntention.java  |  4 +++-
 .../JSReplaceShiftWithMultiplyIntention.java  |  4 +++-
 ...eplaceWithOperatorAssignmentIntention.java |  4 +++-
 ...RemoveUnnecessaryParenthesesIntention.java |  4 +++-
 ...JSDoubleToSingleQuotedStringIntention.java |  4 +++-
 ...inConcatenatedStringLiteralsIntention.java |  4 +++-
 ...JSSingleToDoubleQuotedStringIntention.java |  4 +++-
 .../JSReplaceIfWithSwitchIntention.java       |  4 +++-
 .../JSReplaceSwitchWithIfIntention.java       |  4 +++-
 .../trivialif/JSMergeElseIfIntention.java     |  4 +++-
 .../trivialif/JSMergeIfAndIntention.java      |  4 +++-
 .../trivialif/JSMergeIfOrIntention.java       |  4 +++-
 .../JSMergeParallelIfsIntention.java          |  4 +++-
 .../JSRemoveRedundantElseIntention.java       |  4 +++-
 .../JSReplaceIfWithConditionalIntention.java  |  4 +++-
 .../trivialif/JSSimplifyIfElseIntention.java  |  4 +++-
 .../trivialif/JSSplitElseIfIntention.java     |  4 +++-
 .../trivialif/JSSplitIfAndIntention.java      | 20 +++++++------------
 .../trivialif/JSSplitIfOrIntention.java       |  4 +++-
 45 files changed, 140 insertions(+), 67 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index 16a5b83a..af5f9e0d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -89,9 +89,5 @@ public boolean startInWriteAction() {
 
   @Override
   @Nonnull
-  public String getText() {
-    return getBasicText();
-  }
-
-  protected abstract String getBasicText();
+  public abstract String getText();
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 586bd636..f28b31cb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -32,13 +32,12 @@ public abstract class JSMutablyNamedIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		if (myText != null)
-		{
-			return myText;
-		}
-		return super.getText();
+		return myText != null ? myText : getBasicText();
 	}
 
+	@Nonnull
+	protected abstract String getBasicText();
+
 	@Override
 	public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node)
 	{
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 0701b01a..76492915 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -47,7 +47,9 @@ public class JSDeMorgansLawIntention extends JSMutablyNamedIntention
 	private static final String OR_OPERATOR = "||";
 
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("bool.de-morgans-law.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 45bdeef4..35f96cae 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -38,8 +38,10 @@
 )
 public class JSFlipComparisonIntention extends JSMutablyNamedIntention
 {
+	@Nonnull
 	@Override
-	protected String getBasicText() {
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("bool.flip-comparison.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 0222659b..a1f65eb8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -39,8 +39,10 @@
 )
 public class JSFlipConjunctionIntention extends JSMutablyNamedIntention
 {
+	@Nonnull
 	@Override
-	protected String getBasicText() {
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("bool.flip-conjunction.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index f7e628c8..e0aeb5e2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -38,8 +38,10 @@
 )
 public class JSNegateComparisonIntention extends JSMutablyNamedIntention
 {
+	@Nonnull
 	@Override
-	protected String getBasicText() {
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("bool.negate-comparison.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index 9ea71667..b386d2f3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -40,8 +40,10 @@
 )
 public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention
 {
+	@Nonnull
 	@Override
-	protected String getBasicText() {
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("bool.remove-boolean-equality.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index 653658b2..efbce779 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -43,8 +43,10 @@ protected JSElementPredicate getElementPredicate()
 		return new AddBracesPredicate();
 	}
 
-	@Override
-	protected String getBasicText() {
+	@Nonnull
+  @Override
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("braces.add-braces.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index e21e07e4..42811dd1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -36,8 +36,10 @@
 )
 public class JSRemoveBracesIntention extends JSMutablyNamedIntention
 {
+	@Nonnull
 	@Override
-	protected String getBasicText() {
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("braces.remove-braces.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index 443af3de..f62299d3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -42,7 +42,9 @@
 public class JSChangeToCStyleCommentIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("comment.change-to-cstyle-comment.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 5f864938..2c6e95c8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -40,7 +40,9 @@
 public class JSChangeToEndOfLineCommentIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("comment.change-to-end-of-line-comment.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index de0f4027..67b0c4a1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -40,7 +40,9 @@
 public class JSMoveCommentToSeparateLineIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("comment.move-comment-to-separate-line.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 717e15cc..c553c11b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -41,7 +41,9 @@
 public class JSFlipConditionalIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("conditional.flip-conditional.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index 8c8f0cea..e65c5368 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -41,7 +41,9 @@
 public class JSFlipIfIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("conditional.flip-if.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 7d15424d..8ef06e4a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -41,7 +41,9 @@
 public class JSRemoveConditionalIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("conditional.remove-conditional.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index f5a53f36..542de20b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -36,7 +36,9 @@
 public class JSReplaceConditionalWithIfIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("conditional.replace-conditional-with-if.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 4cf7b102..22f12b9a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -41,7 +41,9 @@
 public class JSConstantExpressionIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("constant.constant-expression.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index cff7a6bf..14822720 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -52,8 +52,10 @@ protected JSElementPredicate getElementPredicate()
 		return new ConstantSubexpressionPredicate();
 	}
 
-	@Override
-	protected String getBasicText() {
+	@Nonnull
+  @Override
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("constant.constant-subexpression.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index 7e395914..207991f1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -37,7 +37,9 @@
 public class JSExtractIncrementIntention extends JSMutablyNamedIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("increment.extract-increment.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 89cbddba..b5c78155 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -40,7 +40,9 @@
 public class JSMergeDeclarationAndInitializationIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("initialization.merge-declaration-and-initialization.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index d2b4264b..8acf9b02 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -48,7 +48,9 @@ public class JSSplitDeclarationAndInitializationIntention extends JSIntention
 	private static final String VAR_KEYWORD = "var ";
 
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("initialization.split-declaration-and-initialization.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index b6150d0d..6a065081 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -44,7 +44,9 @@
 public class JSMergeParallelForInLoopsIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("loop.merge-parallel-for-in-loops.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 67979209..7a517424 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -43,7 +43,9 @@
 public class JSMergeParallelForLoopsIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("loop.merge-parallel-for-loops.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index 3b85f4bf..d0e7585e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -37,7 +37,9 @@
 public class JSConvertIntegerToDecimalIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("number.convert-integer-to-decimal.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index c6075c00..5f138df4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -37,7 +37,9 @@
 public class JSConvertIntegerToHexIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("number.convert-integer-to-hex.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 0fce97cf..9b777eda 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -37,7 +37,9 @@
 public class JSConvertIntegerToOctalIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("number.convert-integer-to-octal.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index 38b15527..68073578 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -40,8 +40,10 @@
 )
 public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention
 {
+	@Nonnull
 	@Override
-	protected String getBasicText() {
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("number.replace-multiply-with-shift.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index a2f57855..97fbd731 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -39,8 +39,10 @@
 )
 public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention
 {
+	@Nonnull
 	@Override
-	protected String getBasicText() {
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("number.replace-shift-with-multiply.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index c00eeece..4ed1416b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -40,8 +40,10 @@
 )
 public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedIntention
 {
+	@Nonnull
 	@Override
-	protected String getBasicText() {
+	protected String getBasicText()
+	{
 		return JSIntentionBundle.message("opassign.replace-with-operator-assignment.family-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index f45bcc31..20fbea32 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -42,7 +42,9 @@
 public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("parenthesis.remove-unnecessary-parentheses.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index f6faae5b..869040a4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -36,7 +36,9 @@
 public class JSDoubleToSingleQuotedStringIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("string.double-to-single-quoted-string.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 43799a11..32e8caee 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -42,7 +42,9 @@
 public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("string.join-concatenated-string-literals.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index a379401d..3084ba6c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -37,7 +37,9 @@
 public class JSSingleToDoubleQuotedStringIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("string.single-to-double-quoted-string.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 4af9ee58..50d77834 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -52,7 +52,9 @@ public class JSReplaceIfWithSwitchIntention extends JSIntention
 	private static final String BREAK_STATEMENT = "\nbreak;";
 
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("switchtoif.replace-if-with-switch.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index 39ac33aa..a39644a9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -58,7 +58,9 @@ public class JSReplaceSwitchWithIfIntention extends JSIntention
 	private static final String DEFAULT_LABEL_NAME = "Label";
 
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("switchtoif.replace-switch-with-if.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index f36c5ef8..d3fc5f83 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -40,7 +40,9 @@
 public class JSMergeElseIfIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.merge-else-if.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index 219954f1..b57acdff 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -43,7 +43,9 @@
 public class JSMergeIfAndIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.merge-if-and.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index 1fa8b844..ac672568 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -40,7 +40,9 @@
 public class JSMergeIfOrIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.merge-if-or.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index 5efae060..94f529da 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -42,7 +42,9 @@
 public class JSMergeParallelIfsIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.merge-parallel-ifs.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index 4182bb92..c0b3d59e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -40,7 +40,9 @@
 public class JSRemoveRedundantElseIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.remove-redundant-else.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index 9490a788..e6935052 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -38,7 +38,9 @@
 public class JSReplaceIfWithConditionalIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.replace-if-with-conditional.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 67bc5f94..180a1814 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -38,8 +38,10 @@
 )
 public class JSSimplifyIfElseIntention extends JSIntention
 {
+	@Nonnull
 	@Override
-	protected String getBasicText() {
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.simplify-if-else.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index 9fe75aa3..545d9a26 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -38,7 +38,9 @@
 public class JSSplitElseIfIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.split-else-if.display-name");
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index cfb66ea3..b99d964b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -32,7 +32,6 @@
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 @IntentionMetaData(
@@ -42,15 +41,10 @@
 )
 public class JSSplitIfAndIntention extends JSIntention
 {
-	@NonNls
-	private static final String IF_STATEMENT_PREFIX = "if (";
-	@NonNls
-	private static final String INNER_IF_STATEMENT_PREFIX = ") {\n if (";
-	@NonNls
-	private static final String ELSE_KEYWORD = "else ";
-
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.split-if-and.display-name");
 	}
 
@@ -87,20 +81,20 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
 		final StringBuilder statement = new StringBuilder(ifStatement.getTextLength() + elseLength + 30);
 
-		statement.append(IF_STATEMENT_PREFIX)
+		statement.append("if (")
 			.append(lhsText)
-			.append(INNER_IF_STATEMENT_PREFIX)
+			.append(") {\n if (")
 			.append(rhsText)
 			.append(')')
 			.append(thenText);
 		if (elseBranch != null)
 		{
-			statement.append(ELSE_KEYWORD).append(elseText);
+			statement.append("else ").append(elseText);
 		}
 		statement.append('}');
 		if (elseBranch != null)
 		{
-			statement.append(ELSE_KEYWORD).append(elseText);
+			statement.append("else ").append(elseText);
 		}
 
 		JSElementFactory.replaceStatement(ifStatement, statement.toString());
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index 1b57b4d9..e693b5e2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -43,7 +43,9 @@
 public class JSSplitIfOrIntention extends JSIntention
 {
 	@Override
-	protected String getBasicText() {
+	@Nonnull
+	public String getText()
+	{
 		return JSIntentionBundle.message("trivialif.split-if-or.display-name");
 	}
 

From 8e019872b4985c786880c73b2cda6dc8638c8884 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 18 Jul 2024 12:20:25 +0300
Subject: [PATCH 203/340] Compilation fix for JSDeMorgansLawIntention.

---
 .../lang/javascript/intention/bool/JSDeMorgansLawIntention.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 76492915..202c2828 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -48,7 +48,7 @@ public class JSDeMorgansLawIntention extends JSMutablyNamedIntention
 
 	@Override
 	@Nonnull
-	public String getText()
+	protected String getBasicText()
 	{
 		return JSIntentionBundle.message("bool.de-morgans-law.family-name");
 	}

From 6a2807d05826c2ad616a44f4a01030a8cda005ca Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 19 Jul 2024 13:54:24 +0300
Subject: [PATCH 204/340] Removed unused properties from
 JavaScriptIntentionBundle.properties, renamed used ones in order to exclude
 dashes.

---
 .../bool/JSDeMorgansLawIntention.java         |  19 +-
 .../bool/JSFlipComparisonIntention.java       |   8 +-
 .../bool/JSFlipConjunctionIntention.java      |   4 +-
 .../bool/JSNegateComparisonIntention.java     |   6 +-
 .../JSRemoveBooleanEqualityIntention.java     |   4 +-
 .../braces/JSAddBracesIntention.java          |   4 +-
 .../braces/JSRemoveBracesIntention.java       |   4 +-
 .../JSChangeToCStyleCommentIntention.java     |   2 +-
 .../JSChangeToEndOfLineCommentIntention.java  |   2 +-
 .../JSMoveCommentToSeparateLineIntention.java |   2 +-
 .../JSFlipConditionalIntention.java           |   2 +-
 .../conditional/JSFlipIfIntention.java        |   2 +-
 .../JSRemoveConditionalIntention.java         |   2 +-
 .../JSReplaceConditionalWithIfIntention.java  |   2 +-
 .../JSConstantExpressionIntention.java        |   2 +-
 .../JSConstantSubexpressionIntention.java     |   4 +-
 .../JSExtractIncrementIntention.java          |   4 +-
 ...DeclarationAndInitializationIntention.java |   2 +-
 ...DeclarationAndInitializationIntention.java |   2 +-
 .../JSMergeParallelForInLoopsIntention.java   |   2 +-
 .../JSMergeParallelForLoopsIntention.java     |   2 +-
 .../JSConvertIntegerToDecimalIntention.java   |   2 +-
 .../JSConvertIntegerToHexIntention.java       |   2 +-
 .../JSConvertIntegerToOctalIntention.java     |   2 +-
 .../JSReplaceMultiplyWithShiftIntention.java  |   4 +-
 .../JSReplaceShiftWithMultiplyIntention.java  |   4 +-
 ...eplaceWithOperatorAssignmentIntention.java |   4 +-
 ...RemoveUnnecessaryParenthesesIntention.java |   2 +-
 ...JSDoubleToSingleQuotedStringIntention.java |   2 +-
 ...inConcatenatedStringLiteralsIntention.java |   2 +-
 ...JSSingleToDoubleQuotedStringIntention.java |   2 +-
 .../JSReplaceIfWithSwitchIntention.java       |   2 +-
 .../JSReplaceSwitchWithIfIntention.java       |   2 +-
 .../trivialif/JSMergeElseIfIntention.java     |   2 +-
 .../trivialif/JSMergeIfAndIntention.java      |   2 +-
 .../trivialif/JSMergeIfOrIntention.java       |   2 +-
 .../JSMergeParallelIfsIntention.java          |   2 +-
 .../JSRemoveRedundantElseIntention.java       |   2 +-
 .../JSReplaceIfWithConditionalIntention.java  |   2 +-
 .../trivialif/JSSimplifyIfElseIntention.java  |   2 +-
 .../trivialif/JSSplitElseIfIntention.java     |   2 +-
 .../trivialif/JSSplitIfAndIntention.java      |   2 +-
 .../trivialif/JSSplitIfOrIntention.java       |   2 +-
 .../JavaScriptIntentionBundle.properties      | 163 +++++++-----------
 44 files changed, 123 insertions(+), 171 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 202c2828..1e208c6e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -31,7 +31,6 @@
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 @IntentionMetaData(
@@ -41,16 +40,11 @@
 )
 public class JSDeMorgansLawIntention extends JSMutablyNamedIntention
 {
-	@NonNls
-	private static final String AND_OPERATOR = "&&";
-	@NonNls
-	private static final String OR_OPERATOR = "||";
-
 	@Override
 	@Nonnull
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("bool.de-morgans-law.family-name");
+		return JSIntentionBundle.message("bool.de.morgans.law");
 	}
 
 	@Override
@@ -59,9 +53,9 @@ protected String getTextForElement(PsiElement element)
 	{
 		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
 
-		return tokenType.equals(JSTokenTypes.ANDAND)
-			? JSIntentionBundle.message("bool.de-morgans-law.display-name.ANDAND")
-				: JSIntentionBundle.message("bool.de-morgans-law.display-name.OROR");
+		return JSTokenTypes.ANDAND.equals(tokenType)
+			? JSIntentionBundle.message("bool.de.morgans.law.and.to.or")
+			: JSIntentionBundle.message("bool.de.morgans.law.or.to.and");
 	}
 
 	@Override
@@ -72,6 +66,7 @@ public JSElementPredicate getElementPredicate()
 	}
 
 	@Override
+	@RequiredReadAction
 	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
 	{
 		JSBinaryExpression exp = (JSBinaryExpression) element;
@@ -90,15 +85,17 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 		JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, newExpression);
 	}
 
+	@RequiredReadAction
 	private String convertConjunctionExpression(JSBinaryExpression exp, IElementType tokenType)
 	{
 		final String leftText = this.getOperandText(exp.getLOperand(), tokenType);
 		final String rightText = this.getOperandText(exp.getROperand(), tokenType);
-		final String flippedConjunction = (tokenType.equals(JSTokenTypes.ANDAND) ? OR_OPERATOR : AND_OPERATOR);
+		final String flippedConjunction = tokenType.equals(JSTokenTypes.ANDAND) ? "||" : "&&";
 
 		return leftText + flippedConjunction + rightText;
 	}
 
+	@RequiredReadAction
 	private String getOperandText(JSExpression operand, IElementType tokenType)
 	{
 		return isConjunctionExpression(operand, tokenType)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 35f96cae..20c0078e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -42,7 +42,7 @@ public class JSFlipComparisonIntention extends JSMutablyNamedIntention
 	@Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("bool.flip-comparison.family-name");
+		return JSIntentionBundle.message("bool.flip.comparison");
 	}
 
 	@Override
@@ -61,15 +61,15 @@ public String getTextForElement(PsiElement element)
 
 		if (exp == null)
 		{
-			return JSIntentionBundle.message("bool.flip-comparison.display-name.unknown");
+			return JSIntentionBundle.message("bool.flip.comparison.unknown");
 		}
 		else if (operatorText.equals(flippedOperatorText))
 		{
-			return JSIntentionBundle.message("bool.flip-comparison.display-name.equals", operatorText);
+			return JSIntentionBundle.message("bool.flip.comparison.equals", operatorText);
 		}
 		else
 		{
-			return JSIntentionBundle.message("bool.flip-comparison.display-name.not-equals", operatorText, flippedOperatorText);
+			return JSIntentionBundle.message("bool.flip.comparison.not.equals", operatorText, flippedOperatorText);
 		}
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index a1f65eb8..66ef9eb0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -43,7 +43,7 @@ public class JSFlipConjunctionIntention extends JSMutablyNamedIntention
 	@Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("bool.flip-conjunction.family-name");
+		return JSIntentionBundle.message("bool.flip.conjunction");
 	}
 
 	@Override
@@ -53,7 +53,7 @@ protected String getTextForElement(PsiElement element)
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
 		final IElementType sign = binaryExpression.getOperationSign();
 
-		return JSIntentionBundle.message("bool.flip-conjunction.display-name", BinaryOperatorUtils.getOperatorText(sign));
+		return JSIntentionBundle.message("bool.flip.conjunction.message", BinaryOperatorUtils.getOperatorText(sign));
   }
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index e0aeb5e2..bb4c2f52 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -42,7 +42,7 @@ public class JSNegateComparisonIntention extends JSMutablyNamedIntention
 	@Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("bool.negate-comparison.family-name");
+		return JSIntentionBundle.message("bool.negate.comparison");
 	}
 
 	@Override
@@ -62,8 +62,8 @@ public String getTextForElement(PsiElement element)
 		}
 
 		return operatorText.equals(negatedOperatorText)
-			? JSIntentionBundle.message("bool.negate-comparison.display-name.equals", operatorText)
-			: JSIntentionBundle.message("bool.negate-comparison.display-name.not-equals", operatorText, negatedOperatorText);
+			? JSIntentionBundle.message("bool.negate.comparison.equals", operatorText)
+			: JSIntentionBundle.message("bool.negate.comparison.not.equals", operatorText, negatedOperatorText);
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index b386d2f3..6c8c5433 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -44,7 +44,7 @@ public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention
 	@Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("bool.remove-boolean-equality.family-name");
+		return JSIntentionBundle.message("bool.remove.boolean.equality");
 	}
 
 	@Override
@@ -53,7 +53,7 @@ protected String getTextForElement(PsiElement element)
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
 
 		return JSIntentionBundle.message(
-			"bool.remove-boolean-equality.display-name",
+			"bool.remove.boolean.equality.message",
 			BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign())
 		);
   }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index efbce779..f5dddd9b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -47,7 +47,7 @@ protected JSElementPredicate getElementPredicate()
   @Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("braces.add-braces.family-name");
+		return JSIntentionBundle.message("braces.add");
 	}
 
 	@Override
@@ -73,7 +73,7 @@ protected String getTextForElement(PsiElement element)
 			keyword = firstChild.getText();
 		}
 
-		return JSIntentionBundle.message("braces.add-braces.display-name", keyword);
+		return JSIntentionBundle.message("braces.add.message", keyword);
   }
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index 42811dd1..aaa6f12d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -40,7 +40,7 @@ public class JSRemoveBracesIntention extends JSMutablyNamedIntention
 	@Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("braces.remove-braces.family-name");
+		return JSIntentionBundle.message("braces.remove");
 	}
 
 	@Override
@@ -73,7 +73,7 @@ protected String getTextForElement(PsiElement element)
 			keyword = keywordChild.getText();
 		}
 
-		return JSIntentionBundle.message("braces.remove-braces.display-name", keyword);
+		return JSIntentionBundle.message("braces.remove.message", keyword);
   }
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index f62299d3..63b5d761 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -45,7 +45,7 @@ public class JSChangeToCStyleCommentIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("comment.change-to-cstyle-comment.display-name");
+		return JSIntentionBundle.message("comment.change.to.cstyle.comment");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 2c6e95c8..8208fa96 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -43,7 +43,7 @@ public class JSChangeToEndOfLineCommentIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("comment.change-to-end-of-line-comment.display-name");
+		return JSIntentionBundle.message("comment.change.to.end.of.line.comment");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index 67b0c4a1..d0f14acb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -43,7 +43,7 @@ public class JSMoveCommentToSeparateLineIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("comment.move-comment-to-separate-line.display-name");
+		return JSIntentionBundle.message("comment.move.comment.to.separate.line");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index c553c11b..39b176b8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -44,7 +44,7 @@ public class JSFlipConditionalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("conditional.flip-conditional.display-name");
+		return JSIntentionBundle.message("conditional.flip.conditional");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index e65c5368..db450f86 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -44,7 +44,7 @@ public class JSFlipIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("conditional.flip-if.display-name");
+		return JSIntentionBundle.message("conditional.flip.if");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 8ef06e4a..ac447872 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -44,7 +44,7 @@ public class JSRemoveConditionalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("conditional.remove-conditional.display-name");
+		return JSIntentionBundle.message("conditional.remove.conditional");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 542de20b..61ee6594 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -39,7 +39,7 @@ public class JSReplaceConditionalWithIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("conditional.replace-conditional-with-if.display-name");
+		return JSIntentionBundle.message("conditional.replace.conditional.with.if");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 22f12b9a..7de3a84c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -44,7 +44,7 @@ public class JSConstantExpressionIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("constant.constant-expression.display-name");
+		return JSIntentionBundle.message("constant.compute.expression");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index 14822720..8d6a8c10 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -56,7 +56,7 @@ protected JSElementPredicate getElementPredicate()
   @Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("constant.constant-subexpression.family-name");
+		return JSIntentionBundle.message("constant.compute.subexpression");
 	}
 
 	@Override
@@ -74,7 +74,7 @@ protected String getTextForElement(PsiElement element)
 		assert (leftSide != null);
 
 		return JSIntentionBundle.message(
-			"constant.constant-subexpression.display-name",
+			"constant.compute.subexpression.message",
 			leftSide.getText(),
 			BinaryOperatorUtils.getOperatorText(operationSign),
 			rhs.getText()
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index 207991f1..6a8b84df 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -40,13 +40,13 @@ public class JSExtractIncrementIntention extends JSMutablyNamedIntention
 	@Nonnull
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("increment.extract-increment.family-name");
+		return JSIntentionBundle.message("increment.extract");
 	}
 
 	@Override
 	public String getTextForElement(PsiElement element)
 	{
-		return JSIntentionBundle.message("increment.extract-increment.display-name", BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
+		return JSIntentionBundle.message("increment.extract.message", BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
   }
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index b5c78155..6d49931a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -43,7 +43,7 @@ public class JSMergeDeclarationAndInitializationIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("initialization.merge-declaration-and-initialization.display-name");
+		return JSIntentionBundle.message("initialization.merge.declaration.and.initialization");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index 8acf9b02..587dc36b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -51,7 +51,7 @@ public class JSSplitDeclarationAndInitializationIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("initialization.split-declaration-and-initialization.display-name");
+		return JSIntentionBundle.message("initialization.split.declaration.and.initialization");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index 6a065081..df2c82b9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -47,7 +47,7 @@ public class JSMergeParallelForInLoopsIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("loop.merge-parallel-for-in-loops.display-name");
+		return JSIntentionBundle.message("loop.merge.parallel.for.in.loops");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 7a517424..81f29ced 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -46,7 +46,7 @@ public class JSMergeParallelForLoopsIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("loop.merge-parallel-for-loops.display-name");
+		return JSIntentionBundle.message("loop.merge.parallel.for.loops");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index d0e7585e..f52aaedf 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -40,7 +40,7 @@ public class JSConvertIntegerToDecimalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("number.convert-integer-to-decimal.display-name");
+		return JSIntentionBundle.message("number.convert.integer.to.decimal");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index 5f138df4..c7202128 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -40,7 +40,7 @@ public class JSConvertIntegerToHexIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("number.convert-integer-to-hex.display-name");
+		return JSIntentionBundle.message("number.convert.integer.to.hex");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 9b777eda..5e2dde56 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -40,7 +40,7 @@ public class JSConvertIntegerToOctalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("number.convert-integer-to-octal.display-name");
+		return JSIntentionBundle.message("number.convert.integer.to.octal");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index 68073578..6fe48ee2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -44,7 +44,7 @@ public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention
 	@Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("number.replace-multiply-with-shift.family-name");
+		return JSIntentionBundle.message("number.replace.multiply.with.shift");
 	}
 
 	@Override
@@ -64,7 +64,7 @@ protected String getTextForElement(PsiElement element)
 		}
 
 		return JSIntentionBundle.message(
-			"number.replace-multiply-with-shift.display-name",
+			"number.replace.multiply.with.shift.message",
 			BinaryOperatorUtils.getOperatorText(tokenType),
 			operatorString
 		);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index 97fbd731..f9d158cd 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -43,7 +43,7 @@ public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention
 	@Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("number.replace-shift-with-multiply.family-name");
+		return JSIntentionBundle.message("number.replace.shift.with.multiply");
 	}
 
 	@Override
@@ -63,7 +63,7 @@ protected String getTextForElement(PsiElement element)
 		}
 
 		return JSIntentionBundle.message(
-			"number.replace-shift-with-multiply.display-name",
+			"number.replace.shift.with.multiply.message",
 			BinaryOperatorUtils.getOperatorText(tokenType),
 			operatorString
 		);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index 4ed1416b..4683a0dd 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -44,7 +44,7 @@ public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedInte
 	@Override
 	protected String getBasicText()
 	{
-		return JSIntentionBundle.message("opassign.replace-with-operator-assignment.family-name");
+		return JSIntentionBundle.message("opassign.replace.with.operator.assignment");
 	}
 
 	@Override
@@ -56,7 +56,7 @@ public String getTextForElement(PsiElement element)
 		assert (rhs != null);
 		final IElementType sign = rhs.getOperationSign();
 
-		return JSIntentionBundle.message("opassign.replace-with-operator-assignment.display-name", BinaryOperatorUtils.getOperatorText(sign));
+		return JSIntentionBundle.message("opassign.replace.with.operator.assignment.message", BinaryOperatorUtils.getOperatorText(sign));
   }
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 20fbea32..65931e45 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -45,7 +45,7 @@ public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("parenthesis.remove-unnecessary-parentheses.display-name");
+		return JSIntentionBundle.message("parenthesis.remove.unnecessary.parentheses");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index 869040a4..65f6dcdd 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -39,7 +39,7 @@ public class JSDoubleToSingleQuotedStringIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("string.double-to-single-quoted-string.display-name");
+		return JSIntentionBundle.message("string.double.quoted.to.single.quoted");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 32e8caee..feb758e0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -45,7 +45,7 @@ public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("string.join-concatenated-string-literals.display-name");
+		return JSIntentionBundle.message("string.join.concatenated.string.literals");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index 3084ba6c..90518881 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -40,7 +40,7 @@ public class JSSingleToDoubleQuotedStringIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("string.single-to-double-quoted-string.display-name");
+		return JSIntentionBundle.message("string.single.to.double.quoted.string");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 50d77834..38fa03b1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -55,7 +55,7 @@ public class JSReplaceIfWithSwitchIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("switchtoif.replace-if-with-switch.display-name");
+		return JSIntentionBundle.message("switchtoif.replace.if.with.switch");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index a39644a9..ee765ad7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -61,7 +61,7 @@ public class JSReplaceSwitchWithIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("switchtoif.replace-switch-with-if.display-name");
+		return JSIntentionBundle.message("switchtoif.replace.switch.with.if");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index d3fc5f83..aaefd27e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -43,7 +43,7 @@ public class JSMergeElseIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.merge-else-if.display-name");
+		return JSIntentionBundle.message("trivialif.merge.else.if");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index b57acdff..703911ad 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -46,7 +46,7 @@ public class JSMergeIfAndIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.merge-if-and.display-name");
+		return JSIntentionBundle.message("trivialif.merge.if.and");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index ac672568..fc3622b4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -43,7 +43,7 @@ public class JSMergeIfOrIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.merge-if-or.display-name");
+		return JSIntentionBundle.message("trivialif.merge.if.or");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index 94f529da..e494d11b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -45,7 +45,7 @@ public class JSMergeParallelIfsIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.merge-parallel-ifs.display-name");
+		return JSIntentionBundle.message("trivialif.merge.parallel.ifs");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index c0b3d59e..3bf9082a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -43,7 +43,7 @@ public class JSRemoveRedundantElseIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.remove-redundant-else.display-name");
+		return JSIntentionBundle.message("trivialif.remove.redundant.else");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index e6935052..e6b2f202 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -41,7 +41,7 @@ public class JSReplaceIfWithConditionalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.replace-if-with-conditional.display-name");
+		return JSIntentionBundle.message("trivialif.replace.if.with.conditional");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 180a1814..382de82c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -42,7 +42,7 @@ public class JSSimplifyIfElseIntention extends JSIntention
 	@Override
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.simplify-if-else.display-name");
+		return JSIntentionBundle.message("trivialif.simplify.if.else");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index 545d9a26..1a49f326 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -41,7 +41,7 @@ public class JSSplitElseIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.split-else-if.display-name");
+		return JSIntentionBundle.message("trivialif.split.else.if");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index b99d964b..c4633a44 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -45,7 +45,7 @@ public class JSSplitIfAndIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.split-if-and.display-name");
+		return JSIntentionBundle.message("trivialif.split.if.and");
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index e693b5e2..fb2ab850 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -46,7 +46,7 @@ public class JSSplitIfOrIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.split-if-or.display-name");
+		return JSIntentionBundle.message("trivialif.split.if.or");
 	}
 
 	@Override
diff --git a/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties b/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
index fafa58fb..fdf14ba2 100644
--- a/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
+++ b/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
@@ -1,104 +1,59 @@
-plugin.test.processing                  = Processing intention: {0}
-plugin.test.title                       = Testing JSIntentionPowerPack plugin...
-plugin.test.summary                     = {0} completed, {1} failed ({2} due to detection, {3} due to fix)
-plugin.intention.untested               = Intention {0} not tested.
-
-plugin.category.numbers      = JavaScript/Numbers
-plugin.category.boolean      = JavaScript/Boolean
-plugin.category.conditional  = JavaScript/Conditional Operator
-plugin.category.shift        = JavaScript/Shift Operation
-plugin.category.declaration  = JavaScript/Declaration
-plugin.category.comments     = JavaScript/Comments
-plugin.category.control-flow = JavaScript/Control Flow
-plugin.category.other        = JavaScript/Other
-
-bool.de-morgans-law.display-name.ANDAND                          = Replace && with ||
-bool.de-morgans-law.display-name.OROR                            = Replace || with &&
-bool.de-morgans-law.family-name                                  = DeMorgan Law
-bool.flip-comparison.display-name.equals                         = Flip {0}
-bool.flip-comparison.display-name.not-equals                     = Flip {0} to {1}
-bool.flip-comparison.display-name.unknown                        = Flip Comparison
-bool.flip-comparison.family-name                                 = Flip Comparison
-bool.flip-conjunction.display-name                               = Flip {0}
-bool.flip-conjunction.family-name                                = Flip Conjunction Operands
-bool.negate-comparison.display-name.equals                       = Negate {0}
-bool.negate-comparison.display-name.not-equals                   = Negate {0} to {1}
-bool.negate-comparison.family-name                               = Negate Comparison
-bool.remove-boolean-equality.display-name                        = Simplify {0}
-bool.remove-boolean-equality.family-name                         = Remove Boolean Equality
-braces.add-braces.display-name                                   = Add braces from ''{0}'' statement
-braces.add-braces.family-name                                    = Add Braces
-braces.remove-braces.display-name                                = Remove braces from ''{0}'' statement
-braces.remove-braces.family-name                                 = Remove Braces
-comment.change-to-cstyle-comment.display-name                    = Replace with C-style comment
-comment.change-to-cstyle-comment.family-name                     = Replace With C-Style Comment
-comment.change-to-end-of-line-comment.display-name               = Replace with end-of-line comment
-comment.change-to-end-of-line-comment.family-name                = Replace With End Of Line Comment
-comment.move-comment-to-separate-line.display-name               = Move comment to separate line
-comment.move-comment-to-separate-line.family-name                = Move Comment To Separate Line
-conditional.flip-conditional.display-name                        = Flip ?:
-conditional.flip-conditional.family-name                         = Flip Conditional
-conditional.flip-if.display-name                                 = Flip if-else
-conditional.flip-if.family-name                                  = Flip If
-conditional.remove-conditional.display-name                      = Simplify ?:
-conditional.remove-conditional.family-name                       = Remove Pointless Conditional
-conditional.replace-conditional-with-if.display-name             = Replace ?: with if-else
-conditional.replace-conditional-with-if.family-name              = Replace Conditional With If Else
-constant.constant-expression.display-name                        = Compute constant value
-constant.constant-expression.family-name                         = Compute Constant Value
-constant.constant-subexpression.display-name                     = Compute constant value of {0} {1} {2}
-constant.constant-subexpression.family-name                      = Compute Constant Value For Subexpression
-increment.extract-increment.display-name                         = Extract {0}
-increment.extract-increment.family-name                          = Extract Increment
-initialization.merge-declaration-and-initialization.display-name = Merge declaration and initialization
-initialization.merge-declaration-and-initialization.family-name  = Merge Declaration And Initialization
-initialization.split-declaration-and-initialization.display-name = Split into declaration and initialization
-initialization.split-declaration-and-initialization.family-name  = Split Declaration And Initialization
-loop.merge-parallel-for-loops.display-name                       = Merge 'for' loops
-loop.merge-parallel-for-loops.family-name                        = Merge Parallel For Loops
-loop.merge-parallel-for-in-loops.display-name                    = Merge 'for-in' loops
-loop.merge-parallel-for-in-loops.family-name                     = Merge Parallel For-In Loops
-number.convert-integer-to-decimal.display-name                   = Convert to decimal
-number.convert-integer-to-decimal.family-name                    = Convert To Decimal
-number.convert-integer-to-hex.display-name                       = Convert to hex
-number.convert-integer-to-hex.family-name                        = Convert To Hexadecimal
-number.convert-integer-to-octal.display-name                     = Convert to octal
-number.convert-integer-to-octal.family-name                      = Convert To Octal
-number.replace-multiply-with-shift.display-name                  = Replace {0} with {1}
-number.replace-multiply-with-shift.family-name                   = Replace Multiply with Shift
-number.replace-shift-with-multiply.display-name                  = Replace {0} with {1}
-number.replace-shift-with-multiply.family-name                   = Replace Shift with Multiply
-opassign.replace-with-operator-assignment.display-name           = Replace = with {0}=
-opassign.replace-with-operator-assignment.family-name            = Replace Assignment With Operator Assignment
-parenthesis.remove-unnecessary-parentheses.display-name          = Remove unnecessary parentheses
-parenthesis.remove-unnecessary-parentheses.family-name           = Remove Unnecessary Parentheses
-string.double-to-single-quoted-string.display-name               = Replace double-quoted string with single-quoted string
-string.double-to-single-quoted-string.family-name                = Replace Double-Quoted String with Single-Quoted String
-string.join-concatenated-string-literals.display-name            = Join concatenated String literals
-string.join-concatenated-string-literals.family-name             = Join Concatenated String Literals
-string.single-to-double-quoted-string.display-name               = Replace single-quoted string with double-quoted string
-string.single-to-double-quoted-string.family-name                = Replace Single-Quoted String with Double-Quoted String
-switchtoif.replace-if-with-switch.display-name                   = Replace if with switch
-switchtoif.replace-if-with-switch.family-name                    = Replace If With Switch
-switchtoif.replace-switch-with-if.display-name                   = Replace switch with if
-switchtoif.replace-switch-with-if.family-name                    = Replace Switch With If
-trivialif.merge-else-if.display-name                             = Merge else-if
-trivialif.merge-else-if.family-name                              = Merge Else If
-trivialif.merge-if-and.display-name                              = Merge 'if's
-trivialif.merge-if-and.family-name                               = Merge Nested Ifs To ANDed Condition
-trivialif.merge-if-or.display-name                               = Merge 'if's
-trivialif.merge-if-or.family-name                                = Merge Equivalent Ifs To ORed Condition
-trivialif.merge-parallel-ifs.display-name                        = Merge 'if's
-trivialif.merge-parallel-ifs.family-name                         = Merge Parallel Ifs
-trivialif.remove-redundant-else.display-name                     = Remove redundant else
-trivialif.remove-redundant-else.family-name                      = Remove Redundant Else
-trivialif.replace-if-with-conditional.display-name               = Replace if-else with ?:
-trivialif.replace-if-with-conditional.family-name                = Replace If Else With Conditional
-trivialif.simplify-if-else.display-name                          = Simplify if-else
-trivialif.simplify-if-else.family-name                           = Simplify If Else
-trivialif.split-else-if.display-name                             = Split else-if
-trivialif.split-else-if.family-name                              = Split Else If
-trivialif.split-if-and.display-name                              = Split AND-ed if
-trivialif.split-if-and.family-name                               = Split ANDed Condition To Nested Ifs
-trivialif.split-if-or.display-name                               = Split OR-ed if
-trivialif.split-if-or.family-name                                = Split ORed Condition To Equivalent Ifs
+bool.de.morgans.law = DeMorgan law
+bool.de.morgans.law.and.to.or = Replace && with ||
+bool.de.morgans.law.or.to.and = Replace || with &&
+bool.flip.comparison = Flip comparison
+bool.flip.comparison.equals = Flip {0}
+bool.flip.comparison.not.equals = Flip {0} to {1}
+bool.flip.comparison.unknown = Flip comparison
+bool.flip.conjunction = Flip conjunction operands
+bool.flip.conjunction.message = Flip {0}
+bool.negate.comparison = Negate comparison
+bool.negate.comparison.equals = Negate {0}
+bool.negate.comparison.not.equals = Negate {0} to {1}
+bool.remove.boolean.equality = Remove boolean equality
+bool.remove.boolean.equality.message = Simplify {0}
+braces.add = Add braces
+braces.add.message = Add braces from ''{0}'' statement
+braces.remove = Remove braces
+braces.remove.message = Remove braces from ''{0}'' statement
+comment.change.to.cstyle.comment = Replace with C-style comment
+comment.change.to.end.of.line.comment = Replace with end-of-line comment
+comment.move.comment.to.separate.line = Move comment to separate line
+conditional.flip.conditional = Flip ?:
+conditional.flip.if = Flip if-else
+conditional.remove.conditional = Simplify ?:
+conditional.replace.conditional.with.if = Replace ?: with if-else
+constant.compute.expression = Compute constant value
+constant.compute.subexpression = Compute constant value for subexpression
+constant.compute.subexpression.message = Compute constant value of {0} {1} {2}
+increment.extract = Extract increment
+increment.extract.message = Extract {0}
+initialization.merge.declaration.and.initialization = Merge declaration and initialization
+initialization.split.declaration.and.initialization = Split into declaration and initialization
+loop.merge.parallel.for.loops = Merge 'for' loops
+loop.merge.parallel.for.in.loops = Merge 'for-in' loops
+number.convert.integer.to.decimal = Convert to decimal
+number.convert.integer.to.hex = Convert to hex
+number.convert.integer.to.octal = Convert to octal
+number.replace.multiply.with.shift = Replace multiply with shift
+number.replace.multiply.with.shift.message = Replace {0} with {1}
+number.replace.shift.with.multiply = Replace shift with multiply
+number.replace.shift.with.multiply.message = Replace {0} with {1}
+opassign.replace.with.operator.assignment = Replace assignment with operator assignment
+opassign.replace.with.operator.assignment.message = Replace = with {0}=
+parenthesis.remove.unnecessary.parentheses = Remove unnecessary parentheses
+string.double.quoted.to.single.quoted = Replace double-quoted string with single-quoted string
+string.join.concatenated.string.literals = Join concatenated String literals
+string.single.to.double.quoted.string = Replace single-quoted string with double-quoted string
+switchtoif.replace.if.with.switch = Replace if with switch
+switchtoif.replace.switch.with.if = Replace switch with if
+trivialif.merge.else.if = Merge else-if
+trivialif.merge.if.and = Merge 'if's
+trivialif.merge.if.or = Merge 'if's
+trivialif.merge.parallel.ifs = Merge 'if's
+trivialif.remove.redundant.else = Remove redundant else
+trivialif.replace.if.with.conditional = Replace if-else with ?:
+trivialif.simplify.if.else = Simplify if-else
+trivialif.split.else.if = Split else-if
+trivialif.split.if.and = Split AND-ed if
+trivialif.split.if.or = Split OR-ed if

From fa454813e467e1ed38924b630411a4ee2a20274c Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 19 Jul 2024 16:14:55 +0300
Subject: [PATCH 205/340] Replacing JSIntentionBundle with JSIntentionLocalize.

---
 intentions/pom.xml                            |  18 +++
 .../intention/JSIntentionBundle.java          |   6 +
 .../intention/JSMutablyNamedIntention.java    |   9 +-
 .../bool/JSDeMorgansLawIntention.java         |  13 +-
 .../bool/JSFlipComparisonIntention.java       |  15 +--
 .../bool/JSFlipConjunctionIntention.java      |  13 +-
 .../bool/JSNegateComparisonIntention.java     |  13 +-
 .../JSRemoveBooleanEqualityIntention.java     |  16 +--
 .../braces/JSAddBracesIntention.java          |  13 +-
 .../braces/JSRemoveBracesIntention.java       |  11 +-
 .../JSChangeToCStyleCommentIntention.java     |   7 +-
 .../JSChangeToEndOfLineCommentIntention.java  |   4 +-
 .../JSMoveCommentToSeparateLineIntention.java |   4 +-
 .../JSFlipConditionalIntention.java           |   7 +-
 .../conditional/JSFlipIfIntention.java        |   4 +-
 .../JSRemoveConditionalIntention.java         |   7 +-
 .../JSReplaceConditionalWithIfIntention.java  |   7 +-
 .../JSConstantExpressionIntention.java        |   4 +-
 .../JSConstantSubexpressionIntention.java     |  19 ++-
 .../JSExtractIncrementIntention.java          |  16 +--
 ...DeclarationAndInitializationIntention.java |   4 +-
 ...DeclarationAndInitializationIntention.java |   4 +-
 .../JSMergeParallelForInLoopsIntention.java   |  10 +-
 .../JSMergeParallelForLoopsIntention.java     |   7 +-
 .../JSConvertIntegerToDecimalIntention.java   |  10 +-
 .../JSConvertIntegerToHexIntention.java       |  10 +-
 .../JSConvertIntegerToOctalIntention.java     |   4 +-
 .../JSReplaceMultiplyWithShiftIntention.java  |  20 ++-
 .../JSReplaceShiftWithMultiplyIntention.java  |  17 ++-
 ...eplaceWithOperatorAssignmentIntention.java |  13 +-
 ...RemoveUnnecessaryParenthesesIntention.java |   4 +-
 ...JSDoubleToSingleQuotedStringIntention.java |  10 +-
 ...inConcatenatedStringLiteralsIntention.java |   5 +-
 ...JSSingleToDoubleQuotedStringIntention.java |   7 +-
 .../JSReplaceIfWithSwitchIntention.java       |   4 +-
 .../JSReplaceSwitchWithIfIntention.java       |   4 +-
 .../trivialif/JSMergeElseIfIntention.java     |   7 +-
 .../trivialif/JSMergeIfAndIntention.java      |   7 +-
 .../trivialif/JSMergeIfOrIntention.java       |   7 +-
 .../JSMergeParallelIfsIntention.java          |   7 +-
 .../JSRemoveRedundantElseIntention.java       |   4 +-
 .../JSReplaceIfWithConditionalIntention.java  |   4 +-
 .../trivialif/JSSimplifyIfElseIntention.java  |   7 +-
 .../trivialif/JSSplitElseIfIntention.java     |  10 +-
 .../trivialif/JSSplitIfAndIntention.java      |   4 +-
 .../trivialif/JSSplitIfOrIntention.java       |   7 +-
 ...ascript.intention.JSIntentionLocalize.yaml | 118 ++++++++++++++++++
 47 files changed, 327 insertions(+), 194 deletions(-)
 create mode 100644 intentions/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.intention.JSIntentionLocalize.yaml

diff --git a/intentions/pom.xml b/intentions/pom.xml
index 3f3bf736..deac49a9 100644
--- a/intentions/pom.xml
+++ b/intentions/pom.xml
@@ -40,6 +40,24 @@
 		</repository>
 	</repositories>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>consulo.maven</groupId>
+				<artifactId>maven-consulo-plugin</artifactId>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate-localize</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
index 6cca6e24..3f7e2d30 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
@@ -15,13 +15,19 @@
  */
 package org.intellij.idea.lang.javascript.intention;
 
+import consulo.annotation.DeprecationInfo;
+import consulo.annotation.internal.MigratedExtensionsTo;
 import consulo.application.CommonBundle;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import org.intellij.idea.lang.javascript.JSAbstractBundle;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.PropertyKey;
 
 import java.util.ResourceBundle;
 
+@Deprecated
+@DeprecationInfo("Use JSIntentionLocalize")
+@MigratedExtensionsTo(JSIntentionLocalize.class)
 public class JSIntentionBundle extends JSAbstractBundle
 {
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index f28b31cb..6066e071 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -17,6 +17,7 @@
 
 import consulo.codeEditor.Editor;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 import jakarta.annotation.Nonnull;
@@ -26,17 +27,17 @@ public abstract class JSMutablyNamedIntention extends JSIntention
 {
 	private String myText;
 
-	protected abstract String getTextForElement(PsiElement element);
+	protected abstract LocalizeValue getTextForElement(PsiElement element);
 
 	@Override
 	@Nonnull
 	public String getText()
 	{
-		return myText != null ? myText : getBasicText();
+		return myText != null ? myText : getBasicText().get();
 	}
 
 	@Nonnull
-	protected abstract String getBasicText();
+	protected abstract LocalizeValue getBasicText();
 
 	@Override
 	public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node)
@@ -44,7 +45,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable Ps
 		final PsiElement element = findMatchingElement(node);
 		if (element != null)
 		{
-			myText = getTextForElement(element);
+			myText = getTextForElement(element).get();
 			return true;
 		}
 		else
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 1e208c6e..8fec4573 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -21,13 +21,14 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -42,20 +43,20 @@ public class JSDeMorgansLawIntention extends JSMutablyNamedIntention
 {
 	@Override
 	@Nonnull
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("bool.de.morgans.law");
+		return JSIntentionLocalize.boolDeMorgansLaw();
 	}
 
 	@Override
 	@RequiredReadAction
-	protected String getTextForElement(PsiElement element)
+	protected LocalizeValue getTextForElement(PsiElement element)
 	{
 		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
 
 		return JSTokenTypes.ANDAND.equals(tokenType)
-			? JSIntentionBundle.message("bool.de.morgans.law.and.to.or")
-			: JSIntentionBundle.message("bool.de.morgans.law.or.to.and");
+			? JSIntentionLocalize.boolDeMorgansLawAndToOr()
+			: JSIntentionLocalize.boolDeMorgansLawOrToAnd();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 20c0078e..9226b11c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -19,13 +19,14 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -40,14 +41,14 @@ public class JSFlipComparisonIntention extends JSMutablyNamedIntention
 {
 	@Nonnull
 	@Override
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("bool.flip.comparison");
+		return JSIntentionLocalize.boolFlipComparison();
 	}
 
 	@Override
 	@RequiredReadAction
-	public String getTextForElement(PsiElement element)
+	public LocalizeValue getTextForElement(PsiElement element)
 	{
 		final JSBinaryExpression exp = (JSBinaryExpression) element;
 		String operatorText = null;
@@ -61,15 +62,15 @@ public String getTextForElement(PsiElement element)
 
 		if (exp == null)
 		{
-			return JSIntentionBundle.message("bool.flip.comparison.unknown");
+			return JSIntentionLocalize.boolFlipComparisonUnknown();
 		}
 		else if (operatorText.equals(flippedOperatorText))
 		{
-			return JSIntentionBundle.message("bool.flip.comparison.equals", operatorText);
+			return JSIntentionLocalize.boolFlipComparisonEquals(operatorText);
 		}
 		else
 		{
-			return JSIntentionBundle.message("bool.flip.comparison.not.equals", operatorText, flippedOperatorText);
+			return JSIntentionLocalize.boolFlipComparisonNotEquals(operatorText, flippedOperatorText);
 		}
 	}
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 66ef9eb0..8fba5912 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -20,13 +20,14 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -41,20 +42,20 @@ public class JSFlipConjunctionIntention extends JSMutablyNamedIntention
 {
 	@Nonnull
 	@Override
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("bool.flip.conjunction");
+		return JSIntentionLocalize.boolFlipConjunction();
 	}
 
 	@Override
 	@RequiredReadAction
-	protected String getTextForElement(PsiElement element)
+	protected LocalizeValue getTextForElement(PsiElement element)
 	{
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
 		final IElementType sign = binaryExpression.getOperationSign();
 
-		return JSIntentionBundle.message("bool.flip.conjunction.message", BinaryOperatorUtils.getOperatorText(sign));
-  }
+		return JSIntentionLocalize.boolFlipConjunctionMessage(BinaryOperatorUtils.getOperatorText(sign));
+	}
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index bb4c2f52..613a087f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -19,13 +19,14 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -40,14 +41,14 @@ public class JSNegateComparisonIntention extends JSMutablyNamedIntention
 {
 	@Nonnull
 	@Override
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("bool.negate.comparison");
+		return JSIntentionLocalize.boolNegateComparison();
 	}
 
 	@Override
 	@RequiredReadAction
-	public String getTextForElement(PsiElement element)
+	public LocalizeValue getTextForElement(PsiElement element)
 	{
 		final JSBinaryExpression expression = (JSBinaryExpression) element;
 		String operatorText = "";
@@ -62,8 +63,8 @@ public String getTextForElement(PsiElement element)
 		}
 
 		return operatorText.equals(negatedOperatorText)
-			? JSIntentionBundle.message("bool.negate.comparison.equals", operatorText)
-			: JSIntentionBundle.message("bool.negate.comparison.not.equals", operatorText, negatedOperatorText);
+			? JSIntentionLocalize.boolNegateComparisonEquals(operatorText)
+			: JSIntentionLocalize.boolNegateComparisonNotEquals(operatorText, negatedOperatorText);
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index 6c8c5433..dceaa107 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -18,14 +18,16 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
@@ -42,21 +44,21 @@ public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention
 {
 	@Nonnull
 	@Override
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("bool.remove.boolean.equality");
+		return JSIntentionLocalize.boolRemoveBooleanEquality();
 	}
 
 	@Override
-	protected String getTextForElement(PsiElement element)
+	@RequiredReadAction
+	protected LocalizeValue getTextForElement(PsiElement element)
 	{
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
 
-		return JSIntentionBundle.message(
-			"bool.remove.boolean.equality.message",
+		return JSIntentionLocalize.boolRemoveBooleanEqualityMessage(
 			BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign())
 		);
-  }
+	}
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index f5dddd9b..3e5b4cca 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -18,13 +18,14 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
@@ -44,15 +45,15 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Nonnull
-  @Override
-	protected String getBasicText()
+	@Override
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("braces.add");
+		return JSIntentionLocalize.bracesAdd();
 	}
 
 	@Override
 	@RequiredReadAction
-	protected String getTextForElement(PsiElement element)
+	protected LocalizeValue getTextForElement(PsiElement element)
 	{
 		final JSElement parent = (JSElement) element.getParent();
 		final String keyword;
@@ -73,7 +74,7 @@ protected String getTextForElement(PsiElement element)
 			keyword = firstChild.getText();
 		}
 
-		return JSIntentionBundle.message("braces.add.message", keyword);
+		return JSIntentionLocalize.bracesAddMessage(keyword);
   }
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index aaa6f12d..f0045628 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -18,13 +18,14 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
@@ -38,9 +39,9 @@ public class JSRemoveBracesIntention extends JSMutablyNamedIntention
 {
 	@Nonnull
 	@Override
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("braces.remove");
+		return JSIntentionLocalize.bracesRemove();
 	}
 
 	@Override
@@ -52,7 +53,7 @@ protected JSElementPredicate getElementPredicate()
 
 	@Override
 	@RequiredReadAction
-	protected String getTextForElement(PsiElement element)
+	protected LocalizeValue getTextForElement(PsiElement element)
 	{
 		final JSElement parent = (JSElement) element.getParent();
 		final String keyword;
@@ -73,7 +74,7 @@ protected String getTextForElement(PsiElement element)
 			keyword = keywordChild.getText();
 		}
 
-		return JSIntentionBundle.message("braces.remove.message", keyword);
+		return JSIntentionLocalize.bracesRemoveMessage(keyword);
   }
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index 63b5d761..5be7c53a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -18,18 +18,17 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.language.ast.IElementType;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,7 +44,7 @@ public class JSChangeToCStyleCommentIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("comment.change.to.cstyle.comment");
+		return JSIntentionLocalize.commentChangeToCstyleComment().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 8208fa96..d63de048 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -18,6 +18,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
@@ -27,7 +28,6 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
@@ -43,7 +43,7 @@ public class JSChangeToEndOfLineCommentIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("comment.change.to.end.of.line.comment");
+		return JSIntentionLocalize.commentChangeToEndOfLineComment().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index d0f14acb..a488f675 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -18,6 +18,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiComment;
@@ -27,7 +28,6 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.TreeUtil;
 
@@ -43,7 +43,7 @@ public class JSMoveCommentToSeparateLineIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("comment.move.comment.to.separate.line");
+		return JSIntentionLocalize.commentMoveCommentToSeparateLine().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 39b176b8..8ab1fd29 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -20,18 +20,17 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSFlipConditionalIntention",
@@ -44,7 +43,7 @@ public class JSFlipConditionalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("conditional.flip.conditional");
+		return JSIntentionLocalize.conditionalFlipConditional().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index db450f86..f08449d2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -21,13 +21,13 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -44,7 +44,7 @@ public class JSFlipIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("conditional.flip.if");
+		return JSIntentionLocalize.conditionalFlipIf().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index ac447872..24aadbf2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -19,19 +19,18 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSRemoveConditionalIntention",
@@ -44,7 +43,7 @@ public class JSRemoveConditionalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("conditional.remove.conditional");
+		return JSIntentionLocalize.conditionalRemoveConditional().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 61ee6594..6615b723 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -17,16 +17,15 @@
 
 import com.intellij.lang.javascript.psi.JSConditionalExpression;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSReplaceConditionalWithIfIntention",
@@ -39,7 +38,7 @@ public class JSReplaceConditionalWithIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("conditional.replace.conditional.with.if");
+		return JSIntentionLocalize.conditionalReplaceConditionalWithIf().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 7de3a84c..f6501bef 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
@@ -27,7 +28,6 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -44,7 +44,7 @@ public class JSConstantExpressionIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("constant.compute.expression");
+		return JSIntentionLocalize.constantComputeExpression().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index 8d6a8c10..6f93443d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -21,22 +21,22 @@
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.ExpressionUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSConstantSubexpressionIntention",
@@ -53,15 +53,15 @@ protected JSElementPredicate getElementPredicate()
 	}
 
 	@Nonnull
-  @Override
-	protected String getBasicText()
+	@Override
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("constant.compute.subexpression");
+		return JSIntentionLocalize.constantComputeSubexpression();
 	}
 
 	@Override
 	@RequiredReadAction
-	protected String getTextForElement(PsiElement element)
+	protected LocalizeValue getTextForElement(PsiElement element)
 	{
 		final PsiElement parent = element.getParent();
 		final JSBinaryExpression binaryExpression = (JSBinaryExpression) (parent instanceof JSBinaryExpression ? parent : element);
@@ -73,13 +73,12 @@ protected String getTextForElement(PsiElement element)
 		assert (rhs != null);
 		assert (leftSide != null);
 
-		return JSIntentionBundle.message(
-			"constant.compute.subexpression.message",
+		return JSIntentionLocalize.constantComputeSubexpressionMessage(
 			leftSide.getText(),
 			BinaryOperatorUtils.getOperatorText(operationSign),
 			rhs.getText()
 		);
-  }
+	}
 
 	@Override
 	@RequiredReadAction
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index 6a8b84df..13d4a36f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -18,13 +18,14 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
 
@@ -38,16 +39,17 @@ public class JSExtractIncrementIntention extends JSMutablyNamedIntention
 {
 	@Override
 	@Nonnull
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("increment.extract");
+		return JSIntentionLocalize.incrementExtract();
 	}
 
 	@Override
-	public String getTextForElement(PsiElement element)
+	@RequiredReadAction
+	public LocalizeValue getTextForElement(PsiElement element)
 	{
-		return JSIntentionBundle.message("increment.extract.message", BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
-  }
+		return JSIntentionLocalize.incrementExtractMessage(BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
+	}
 
 	@Override
 	@Nonnull
@@ -100,7 +102,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element)
 
 			final JSStatement containingStatement = TreeUtil.getParentOfType(element, JSStatement.class);
 
-			if (element instanceof JSPostfixExpression
+            if (element instanceof JSPostfixExpression
 				&& (containingStatement instanceof JSReturnStatement || containingStatement instanceof JSThrowStatement))
 			{
 				return false;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 6d49931a..5e289fb7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -18,13 +18,13 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.FindReferenceUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -43,7 +43,7 @@ public class JSMergeDeclarationAndInitializationIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("initialization.merge.declaration.and.initialization");
+		return JSIntentionLocalize.initializationMergeDeclarationAndInitialization().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index 587dc36b..ba22fd5a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -28,7 +29,6 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.jetbrains.annotations.NonNls;
@@ -51,7 +51,7 @@ public class JSSplitDeclarationAndInitializationIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("initialization.split.declaration.and.initialization");
+		return JSIntentionLocalize.initializationSplitDeclarationAndInitialization().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index df2c82b9..f9b0f767 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -20,21 +20,21 @@
 import com.intellij.lang.javascript.psi.JSForInStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSVarStatement;
-import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSMergeParallelForInLoopsIntention",
@@ -47,7 +47,7 @@ public class JSMergeParallelForInLoopsIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("loop.merge.parallel.for.in.loops");
+		return JSIntentionLocalize.loopMergeParallelForInLoops().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 81f29ced..6436814a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -21,19 +21,18 @@
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSMergeParallelForLoopsIntention",
@@ -46,7 +45,7 @@ public class JSMergeParallelForLoopsIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("loop.merge.parallel.for.loops");
+		return JSIntentionLocalize.loopMergeParallelForLoops().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index f52aaedf..ec7b5edd 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -16,18 +16,18 @@
 package org.intellij.idea.lang.javascript.intention.number;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSConvertIntegerToDecimalIntention",
@@ -40,7 +40,7 @@ public class JSConvertIntegerToDecimalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("number.convert.integer.to.decimal");
+		return JSIntentionLocalize.numberConvertIntegerToDecimal().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index c7202128..cd795521 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -16,18 +16,18 @@
 package org.intellij.idea.lang.javascript.intention.number;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSConvertIntegerToHexIntention",
@@ -40,7 +40,7 @@ public class JSConvertIntegerToHexIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("number.convert.integer.to.hex");
+		return JSIntentionLocalize.numberConvertIntegerToHex().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 5e2dde56..e64e0c98 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -18,13 +18,13 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.NumberUtil;
 
@@ -40,7 +40,7 @@ public class JSConvertIntegerToOctalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("number.convert.integer.to.octal");
+		return JSIntentionLocalize.numberConvertIntegerToOctal().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index 6fe48ee2..91d0be9e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -19,19 +19,19 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSReplaceMultiplyWithShiftIntention",
@@ -42,14 +42,14 @@ public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention
 {
 	@Nonnull
 	@Override
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("number.replace.multiply.with.shift");
+		return JSIntentionLocalize.numberReplaceMultiplyWithShift();
 	}
 
 	@Override
 	@RequiredReadAction
-	protected String getTextForElement(PsiElement element)
+	protected LocalizeValue getTextForElement(PsiElement element)
 	{
 		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
 		final String operatorString;
@@ -63,12 +63,8 @@ protected String getTextForElement(PsiElement element)
 			operatorString = tokenType.equals(JSTokenTypes.MULT) ? "<<" : ">>";
 		}
 
-		return JSIntentionBundle.message(
-			"number.replace.multiply.with.shift.message",
-			BinaryOperatorUtils.getOperatorText(tokenType),
-			operatorString
-		);
-  }
+		return JSIntentionLocalize.numberReplaceMultiplyWithShiftMessage(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
+	}
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index f9d158cd..5b9e4956 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -19,13 +19,14 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -41,14 +42,14 @@ public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention
 {
 	@Nonnull
 	@Override
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("number.replace.shift.with.multiply");
+		return JSIntentionLocalize.numberReplaceShiftWithMultiply();
 	}
 
 	@Override
 	@RequiredReadAction
-	protected String getTextForElement(PsiElement element)
+	protected LocalizeValue getTextForElement(PsiElement element)
 	{
 		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
 		final String operatorString;
@@ -62,12 +63,8 @@ protected String getTextForElement(PsiElement element)
 			operatorString = JSTokenTypes.LTLT.equals(tokenType) ? "*" : "/";
 		}
 
-		return JSIntentionBundle.message(
-			"number.replace.shift.with.multiply.message",
-			BinaryOperatorUtils.getOperatorText(tokenType),
-			operatorString
-		);
-  }
+		return JSIntentionLocalize.numberReplaceShiftWithMultiplyMessage(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
+	}
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index 4683a0dd..1d065d56 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -22,13 +22,14 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
 
@@ -42,22 +43,22 @@ public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedInte
 {
 	@Nonnull
 	@Override
-	protected String getBasicText()
+	protected LocalizeValue getBasicText()
 	{
-		return JSIntentionBundle.message("opassign.replace.with.operator.assignment");
+		return JSIntentionLocalize.opassignReplaceWithOperatorAssignment();
 	}
 
 	@Override
 	@RequiredReadAction
-	public String getTextForElement(PsiElement element)
+	public LocalizeValue getTextForElement(PsiElement element)
 	{
 		final JSAssignmentExpression exp = (JSAssignmentExpression) element;
 		final JSBinaryExpression rhs = (JSBinaryExpression) exp.getROperand();
 		assert (rhs != null);
 		final IElementType sign = rhs.getOperationSign();
 
-		return JSIntentionBundle.message("opassign.replace.with.operator.assignment.message", BinaryOperatorUtils.getOperatorText(sign));
-  }
+		return JSIntentionLocalize.opassignReplaceWithOperatorAssignmentMessage(BinaryOperatorUtils.getOperatorText(sign));
+	}
 
 	@Override
 	@Nonnull
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 65931e45..319185a8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -28,7 +29,6 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
@@ -45,7 +45,7 @@ public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("parenthesis.remove.unnecessary.parentheses");
+		return JSIntentionLocalize.parenthesisRemoveUnnecessaryParentheses().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index 65f6dcdd..e001b08f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -16,17 +16,17 @@
 package org.intellij.idea.lang.javascript.intention.string;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSDoubleToSingleQuotedStringIntention",
@@ -39,7 +39,7 @@ public class JSDoubleToSingleQuotedStringIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("string.double.quoted.to.single.quoted");
+		return JSIntentionLocalize.stringDoubleQuotedToSingleQuoted().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index feb758e0..54e28fb0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -21,16 +21,15 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
-import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
 @ExtensionImpl
@@ -45,7 +44,7 @@ public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("string.join.concatenated.string.literals");
+		return JSIntentionLocalize.stringJoinConcatenatedStringLiterals().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index 90518881..4cba562e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -18,16 +18,15 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSSingleToDoubleQuotedStringIntention",
@@ -40,7 +39,7 @@ public class JSSingleToDoubleQuotedStringIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("string.single.to.double.quoted.string");
+		return JSIntentionLocalize.stringSingleToDoubleQuotedString().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 38fa03b1..19f4eb8e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -26,7 +27,6 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.*;
 import org.jetbrains.annotations.NonNls;
 
@@ -55,7 +55,7 @@ public class JSReplaceIfWithSwitchIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("switchtoif.replace.if.with.switch");
+		return JSIntentionLocalize.switchtoifReplaceIfWithSwitch().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index ee765ad7..74c42692 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -28,7 +29,6 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.*;
 import org.jetbrains.annotations.NonNls;
 
@@ -61,7 +61,7 @@ public class JSReplaceSwitchWithIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("switchtoif.replace.switch.with.if");
+		return JSIntentionLocalize.switchtoifReplaceSwitchWithIf().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index aaefd27e..324958a5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -20,17 +20,16 @@
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSMergeElseIfIntention",
@@ -43,7 +42,7 @@ public class JSMergeElseIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.merge.else.if");
+		return JSIntentionLocalize.trivialifMergeElseIf().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index 703911ad..bbec21bc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -21,19 +21,18 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSMergeIfAndIntention",
@@ -46,7 +45,7 @@ public class JSMergeIfAndIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.merge.if.and");
+		return JSIntentionLocalize.trivialifMergeIfAnd().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index fc3622b4..ff3f942a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -21,16 +21,15 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.*;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSMergeIfOrIntention",
@@ -43,7 +42,7 @@ public class JSMergeIfOrIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.merge.if.or");
+		return JSIntentionLocalize.trivialifMergeIfOr().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index e494d11b..70927bb1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -20,19 +20,18 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
 import org.intellij.idea.lang.javascript.psiutil.EquivalenceChecker;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSMergeParallelIfsIntention",
@@ -45,7 +44,7 @@ public class JSMergeParallelIfsIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.merge.parallel.ifs");
+		return JSIntentionLocalize.trivialifMergeParallelIfs().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index 3bf9082a..fb77e24c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -21,13 +21,13 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
@@ -43,7 +43,7 @@ public class JSRemoveRedundantElseIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.remove.redundant.else");
+		return JSIntentionLocalize.trivialifRemoveRedundantElse().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index e6b2f202..64e90852 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -18,6 +18,7 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
@@ -26,7 +27,6 @@
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.*;
 
 @ExtensionImpl
@@ -41,7 +41,7 @@ public class JSReplaceIfWithConditionalIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.replace.if.with.conditional");
+		return JSIntentionLocalize.trivialifReplaceIfWithConditional().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 382de82c..55ef2555 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -19,17 +19,16 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSSimplifyIfElseIntention",
@@ -42,7 +41,7 @@ public class JSSimplifyIfElseIntention extends JSIntention
 	@Override
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.simplify.if.else");
+		return JSIntentionLocalize.trivialifSimplifyIfElse().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index 1a49f326..efce24d0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -17,18 +17,18 @@
 
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import consulo.annotation.access.RequiredReadAction;import consulo.annotation.component.ExtensionImpl;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSSplitElseIfIntention",
@@ -41,7 +41,7 @@ public class JSSplitElseIfIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.split.else.if");
+		return JSIntentionLocalize.trivialifSplitElseIf().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index c4633a44..a3871a5a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -22,13 +22,13 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
@@ -45,7 +45,7 @@ public class JSSplitIfAndIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.split.if.and");
+		return JSIntentionLocalize.trivialifSplitIfAnd().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index fb2ab850..0487eb49 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -22,18 +22,17 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.javascript.intention.localize.JSIntentionLocalize;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
-import org.intellij.idea.lang.javascript.intention.JSIntentionBundle;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
 import org.intellij.idea.lang.javascript.psiutil.ParenthesesUtils;
 
-import jakarta.annotation.Nonnull;
-
 @ExtensionImpl
 @IntentionMetaData(
 	ignoreId = "JSSplitIfOrIntention",
@@ -46,7 +45,7 @@ public class JSSplitIfOrIntention extends JSIntention
 	@Nonnull
 	public String getText()
 	{
-		return JSIntentionBundle.message("trivialif.split.if.or");
+		return JSIntentionLocalize.trivialifSplitIfOr().get();
 	}
 
 	@Override
diff --git a/intentions/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.intention.JSIntentionLocalize.yaml b/intentions/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.intention.JSIntentionLocalize.yaml
new file mode 100644
index 00000000..512e713a
--- /dev/null
+++ b/intentions/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.intention.JSIntentionLocalize.yaml
@@ -0,0 +1,118 @@
+bool.de.morgans.law:
+  text: DeMorgan law
+bool.de.morgans.law.and.to.or:
+  text: Replace && with ||
+bool.de.morgans.law.or.to.and:
+  text: Replace || with &&
+bool.flip.comparison:
+  text: Flip comparison
+bool.flip.comparison.equals:
+  text: Flip {0}
+bool.flip.comparison.not.equals:
+  text: Flip {0} to {1}
+bool.flip.comparison.unknown:
+  text: Flip comparison
+bool.flip.conjunction:
+  text: Flip conjunction operands
+bool.flip.conjunction.message:
+  text: Flip {0}
+bool.negate.comparison:
+  text: Negate comparison
+bool.negate.comparison.equals:
+  text: Negate {0}
+bool.negate.comparison.not.equals:
+  text: Negate {0} to {1}
+bool.remove.boolean.equality:
+  text: Remove boolean equality
+bool.remove.boolean.equality.message:
+  text: Simplify {0}
+braces.add:
+  text: Add braces
+braces.add.message:
+  text: Add braces from ''{0}'' statement
+braces.remove:
+  text: Remove braces
+braces.remove.message:
+  text: Remove braces from ''{0}'' statement
+comment.change.to.cstyle.comment:
+  text: Replace with C-style comment
+comment.change.to.end.of.line.comment:
+  text: Replace with end-of-line comment
+comment.move.comment.to.separate.line:
+  text: Move comment to separate line
+conditional.flip.conditional:
+  text: 'Flip ?:'
+conditional.flip.if:
+  text: Flip if-else
+conditional.remove.conditional:
+  text: 'Simplify ?:'
+conditional.replace.conditional.with.if:
+  text: 'Replace ?: with if-else'
+constant.compute.expression:
+  text: Compute constant value
+constant.compute.subexpression:
+  text: Compute constant value for subexpression
+constant.compute.subexpression.message:
+  text: Compute constant value of {0} {1} {2}
+increment.extract:
+  text: Extract increment
+increment.extract.message:
+  text: Extract {0}
+initialization.merge.declaration.and.initialization:
+  text: Merge declaration and initialization
+initialization.split.declaration.and.initialization:
+  text: Split into declaration and initialization
+loop.merge.parallel.for.loops:
+  text: Merge 'for' loops
+loop.merge.parallel.for.in.loops:
+  text: Merge 'for-in' loops
+number.convert.integer.to.decimal:
+  text: Convert to decimal
+number.convert.integer.to.hex:
+  text: Convert to hex
+number.convert.integer.to.octal:
+  text: Convert to octal
+number.replace.multiply.with.shift:
+  text: Replace multiply with shift
+number.replace.multiply.with.shift.message:
+  text: Replace {0} with {1}
+number.replace.shift.with.multiply:
+  text: Replace shift with multiply
+number.replace.shift.with.multiply.message:
+  text: Replace {0} with {1}
+opassign.replace.with.operator.assignment:
+  text: Replace assignment with operator assignment
+opassign.replace.with.operator.assignment.message:
+  text: Replace = with {0}=
+parenthesis.remove.unnecessary.parentheses:
+  text: Remove unnecessary parentheses
+string.double.quoted.to.single.quoted:
+  text: Replace double-quoted string with single-quoted string
+string.join.concatenated.string.literals:
+  text: Join concatenated String literals
+string.single.to.double.quoted.string:
+  text: Replace single-quoted string with double-quoted string
+switchtoif.replace.if.with.switch:
+  text: Replace if with switch
+switchtoif.replace.switch.with.if:
+  text: Replace switch with if
+trivialif.merge.else.if:
+  text: Merge else-if
+trivialif.merge.if.and:
+  text: Merge 'if's
+trivialif.merge.if.or:
+  text: Merge 'if's
+trivialif.merge.parallel.ifs:
+  text: Merge 'if's
+trivialif.remove.redundant.else:
+  text: Remove redundant else
+trivialif.replace.if.with.conditional:
+  text: 'Replace if-else with ?:'
+trivialif.simplify.if.else:
+  text: Simplify if-else
+trivialif.split.else.if:
+  text: Split else-if
+trivialif.split.if.and:
+  text: Split AND-ed if
+trivialif.split.if.or:
+  text: Split OR-ed if

From 82d0092774743655d99178ae52f1081b8bfe47f3 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 19 Jul 2024 17:16:57 +0300
Subject: [PATCH 206/340] Removing deprecated Bundle classes and properties.

---
 .../javascript/language/JavaScriptBundle.java |  50 ---
 .../messages/JavaScriptBundle.properties      | 284 ------------------
 .../sixrr/inspectjs/InspectionJSBundle.java   |  18 --
 .../ContinueStatementJSInspection.java        |   1 -
 ...efaultNotLastCaseInSwitchJSInspection.java |   1 -
 .../UnnecessaryLocalVariableJSInspection.java |   1 -
 .../dom/DocumentWriteJSInspection.java        |   1 -
 .../ExceptionCaughtLocallyJSInspection.java   |   1 -
 .../inspectjs/InspectionJSBundle.properties   | 278 -----------------
 .../intention/JSIntentionBundle.java          |  47 ---
 .../JavaScriptIntentionBundle.properties      |  59 ----
 11 files changed, 741 deletions(-)
 delete mode 100644 base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java
 delete mode 100644 base-api/src/main/resources/messages/JavaScriptBundle.properties
 delete mode 100644 inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java
 delete mode 100644 inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties
 delete mode 100644 intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
 delete mode 100644 intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties

diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java
deleted file mode 100644
index e99945a8..00000000
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptBundle.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2000-2005 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.
- */
-
-package consulo.javascript.language;
-
-import consulo.annotation.DeprecationInfo;
-import consulo.annotation.internal.MigratedExtensionsTo;
-import consulo.javascript.localize.JavaScriptLocalize;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.PropertyKey;
-import consulo.component.util.localize.AbstractBundle;
-
-@Deprecated(forRemoval = true)
-@DeprecationInfo("Use JavaScriptLocalize")
-@MigratedExtensionsTo(JavaScriptLocalize.class)
-public class JavaScriptBundle extends AbstractBundle
-{
-	@NonNls
-	public static final String BUNDLE = "messages.JavaScriptBundle";
-
-	private static final JavaScriptBundle ourInstance = new JavaScriptBundle();
-
-	private JavaScriptBundle()
-	{
-		super(BUNDLE);
-	}
-
-	public static String message(@PropertyKey(resourceBundle = BUNDLE) String key)
-	{
-		return ourInstance.getMessage(key);
-	}
-
-	public static String message(@PropertyKey(resourceBundle = BUNDLE) String key, Object... params)
-	{
-		return ourInstance.getMessage(key, params);
-	}
-}
diff --git a/base-api/src/main/resources/messages/JavaScriptBundle.properties b/base-api/src/main/resources/messages/JavaScriptBundle.properties
deleted file mode 100644
index e16ad614..00000000
--- a/base-api/src/main/resources/messages/JavaScriptBundle.properties
+++ /dev/null
@@ -1,284 +0,0 @@
-javascript.filetype.description=JavaScript files
-typescript.filetype.description=TypeScript files
-
-#language terms
-javascript.language.term.function=function
-javascript.language.term.class=class
-javascript.language.term.namespace=namespace
-javascript.language.term.parameter=parameter
-javascript.language.term.property=property
-javascript.language.term.variable=variable
-javascript.language.term.value=value
-javascript.language.term.tag=tag
-javascript.language.term.label=label
-javascript.language.term.prototype=prototype
-
-#parser error messages
-javascript.parser.message.expected.expression=expression expected
-javascript.parser.message.expected.xml.element=xml element expected
-javascript.parser.property.expected=property expected
-javascript.parser.message.expected.lbrace={ expected
-javascript.parser.message.expected.rbrace=} expected
-javascript.parser.message.expected.identifier.string.literal.or.numeric.literal=identifier or string literal or numeric literal expected
-javascript.parser.message.expected.colon=: expected
-javascript.parser.message.expected.semicolon=; expected
-javascript.parser.message.expected.rbracket=] expected
-javascript.parser.message.expected.lparen=( expected
-javascript.parser.message.expected.rparen=) expected
-javascript.parser.message.expected.name=name expected
-javascript.parser.message.expected.comma.or.rparen=, or ) expected
-javascript.parser.message.expected.function.name=function name expected
-javascript.parser.message.expected.formal.parameter.name=formal parameter name expected
-javascript.parser.message.expected.statement=statement expected
-javascript.parser.message.expected.parameter.name=parameter name expected
-javascript.parser.message.expected.catch.or.default=catch or default expected
-javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration=left hand side expression or variable declaration expected before 'in'
-javascript.parser.message.expected.forloop.in.or.semicolon='in' or ; expected
-javascript.parser.message.expected.forloop.in.of.or.semicolon='in', 'of' or ; expected
-javascript.parser.message.expected.while.keyword=while expected
-javascript.parser.message.expected.comma=, expected
-javascript.parser.message.expected.variable.name=variable name expected
-javascript.parser.message.missing.rbrace=missing }
-javascript.parser.message.unexpected.end.of.file=unexpected end of file
-javascript.parser.message.unclosed.string.literal=Unclosed string literal
-
-#validation messages
-javascript.validation.message.duplicate.declaration=Duplicate declaration
-javascript.validation.message.assignment.to.const=Attempt to assign to const variable
-javascript.validation.message.arguments.out.of.function=Using function arguments object outside function
-javascript.validation.message.must.be.lvalue=Must be lvalue
-javascript.validation.message.const.variable.without.initializer.=const variable without initializer. It won't be possible to assign meaningful value later.
-javascript.validation.message.continue.without.target=Cannot determine target for 'continue'
-javascript.validation.message.break.without.target=Cannot determine target for 'break'
-javascript.validation.message.return.outside.function.definition='return' outside function definition
-javascript.validation.message.duplicate.label=Duplicate label
-
-#surround with names
-javascript.surround.with.do.while=do / while
-javascript.surround.with.for=for
-javascript.surround.with.if=if
-javascript.surround.with.if.else=if / else
-javascript.surround.with.parenthesis=(expr)
-javascript.surround.with.try.catch=try / catch
-javascript.surround.with.try.finally=try / finally
-javascript.surround.with.try.catch.finally=try / catch / finally
-javascript.surround.with.while=while
-javascript.surround.with.with=with
-javascript.surround.with.function=function
-javascript.surround.with.function.expression=function expression
-
-javascript.introduce.variable.title=Introduce Variable
-javascript.introduce.variable.error.no.expression.selected=Cannot introduce variable.\nSelection does not form an expression.
-javascript.introduce.variable.name.prompt=&Name:
-javascript.introduce.variable.replace.all.occurrences=Replace &all occurrences ({0} occurrences found)
-javascript.introduce.variable.invalid.name=Please enter a valid name.
-javascript.introduce.variable.variable.already.exists=Variable with name {0} already exists in the scope.
-javascript.introduce.variable.function.already.exists=Function with name {0} already exists in the scope.
-
-javascript.introduce.field.title=Introduce Field
-javascript.introduce.field.error.no.expression.selected=Cannot introduce field.\nSelection does not form an expression.
-javascript.introduce.constant.title=Introduce Constant
-javascript.introduce.constant.error.no.expression.selected=Cannot introduce constant.\nSelection does not form an expression.
-javascript.introduce.constant.error.not.constant.expression.selected=Cannot introduce constant.\nSelection is not constant expression.
-
-#Highlighting categories
-javascript.keyword=Keyword
-javascript.string=String
-javascript.number=Number
-javascript.linecomment=Line comment
-javascript.doccomment=Doc comment
-javascript.blockcomment=Block comment
-javascript.regexp=Regular expression
-javascript.operation=Operation
-javascript.parens=Parenthesis
-javascript.brackets=Brackets
-javascript.braces=Braces
-javascript.semicolon=Semicolon
-javascript.badcharacter=Bad character
-javascript.docmarkup=Documentation markup
-javascript.doctag=Documentation tag
-javascript.valid.string.escape=Valid string escape
-javascript.invalid.string.escape=Invalid string escape
-javascript.comma=Comma
-javascript.dot=Dot
-
-building.index.message=Building JavaScript indices
-loading.index.message=Loading JavaScript indices
-
-#errors with intentions
-javascript.unresolved.function.name.message=Unresolved function or method {0}() #loc
-javascript.unresolved.variable.name.message=Unresolved variable {0} #loc
-javascript.unresolved.type.name.message=Unresolved type {0} #loc
-javascript.unresolved.variable.or.type.name.message=Unresolved variable or type {0} #loc
-javascript.unresolved.variable.or.type.name.message2=Unresolved variable or type {0}
-javascript.undeclared.variable.name.message=Variable {0} implicitly declared #loc
-javascript.create.function.intention.name=Create Function {0}
-javascript.create.variable.intention.name=Create Variable {0}
-javascript.create.constant.intention.name=Create Constant {0}
-javascript.declare.variable.intention.name=Insert Var Declaration for {0}
-javascript.create.namespace.intention.name=Create Namespace {0}
-javascript.create.property.intention.name=Create Field {0}
-javascript.create.constant.field.intention.name=Create Constant Field {0}
-javascript.create.method.intention.name=Create Method {0}
-javascript.create.get.property.intention.name=Create Get Property {0}
-javascript.create.set.property.intention.name=Create Set Property {0}
-javascript.create.function.intention.family=Create JavaScript Function or Method
-javascript.create.variable.intention.family=Create JavaScript Variable Or Property
-js.inspection.group.name=JavaScript
-js.unresolved.variable.inspection.name=Unresolved JavaScript variable
-js.undeclared.variable.inspection.name=Implicitly declared JavaScript variable
-js.duplicated.declaration.inspection.name=Duplicated JavaScript declaration
-js.unused.local.symbol.inspection.name=Unused JavaScript local symbol
-js.unresolved.function.inspection.name=Unresolved JavaScript function
-js.deprecated.symbols.inspection.name=Deprecated JavaScript symbol
-javascript.parser.message.expected.typename=* or type name expected
-javascript.parser.message.expected.name.or.lbrace=Expected package name or {
-javascript.parser.message.expected.function.var.class.interface.namespace=Expected function, variable, class, interface or namespace declaration
-interface.function.declaration.should.have.no.body=Interface functions declaration should have no body
-javascript.parser.message.expected.namespace=Namespace keyword expected
-javascript.parser.message.expected.string.literal=String literal expected
-javascript.parser.message.expected.xml=xml context keyword expected
-javascript.parser.message.expected.equal=expected =
-javascript.parser.message.expected.lbrace.or.lbracket={ or [ expected
-javascript.parser.message.expected.eof=End of file expected
-javascript.deprecated.symbol.used.name.message=Deprecated symbol used, consult docs for better alternative #loc
-js.classname.macro.description=jsClassName()
-js.methodname.macro.description=jsMethodName()
-js.unused.parameter=Unused parameter
-js.unused.function.declaration=Unused function declaration
-js.unused.local.variable=Unused local variable declaration
-js.unused.symbol.remove=Remove unused symbol
-javascript.parser.message.expected.identifier=Expected identifier
-javascript.parser.message.expected.instanceof=Expected instanceof
-javascript.parser.message.expected.value=value expected
-javascript.parser.message.expected.identifer.or.value=Identifier or value expected
-js.show.overriding.markers.inspection.name=Shows function overriding markers in JavaScript
-js.untyped.declaration.inspection.name=Declaration with no type
-js.untyped.variable.problem=Variable {0} has no type
-js.untyped.function.problem=Function {0} has no return type
-js.untyped.declaration.problem.addtype.fix=Add Type to Declaration
-invalid.identifier.value=invalid identifier value
-javascript.validation.message.this.referenced.from.static.context='this' referenced in static context
-javascript.validation.message.super.referenced.without.class.instance.context='super' referenced without class instance context
-javascript.validation.message.super.referenced.from.static.context='super' referenced in static context
-javascript.validation.message.function.override.without.override.modifier=Method overrides method in superclass {0} without override keyword
-javascript.language.term.attribute.value=Attribute value
-javascript.validation.message.class.should.be.in.file=Class ''{0}'' should be defined in file ''{1}''
-javascript.validation.message.function.should.be.in.file=Function ''{0}'' should be defined in file ''{1}''
-javascript.validation.message.namespace.should.be.in.file=Namespace ''{0}'' should be defined in file ''{1}''
-javascript.validation.message.variable.should.be.in.file=Variable ''{0}'' should be defined in file ''{1}''
-javascript.validation.message.incorrect.package.name=Package name ''{0}'' does not correspond to file path ''{1}''
-javascript.fix.package.name=Set package name to ''{0}''
-javascript.fix.add.override.modifier=Add override modifier
-js.code.style.tab.name=JavaScript / ECMAScript / ActionScript
-to.indent.package.statement.children=&Indent package statement children
-javascript.formatting.options.panel.title=Formatting options
-preview.panel.title=Preview
-
-javascript.validation.message.interface.members.cannot.have.access.modifiers=Interface members cannot have access modifiers
-javascript.template.context.type=Java Sc&ript
-flex.import.class=Import Class {0}
-flex.import.function=Import Function {0}
-interface.should.have.no.variable.declarations=Interface should have no variable declarations
-javascript.validation.message.implements.for.interface.not.allowed=Implements list is not allowed for interface
-javascript.validation.message.interface.name.expected.here=Interface name expected here
-javascript.validation.message.class.name.expected.here=Class name expected here
-javascript.validation.message.circular.dependency=Circular dependency
-javascript.fix.remove.circular.dependency=Remove circular dependency
-javascript.validation.message.more.than.one.externally.visible.symbol=More than one externally visible symbol defined in file
-javascript.validation.message.interface.method.not.implemented=Method {0} from interface {1} is not implemented
-javascript.fix.remove.externally.visible.symbol=Remove externally visible symbol
-javascript.fix.implement.methods=Implement Methods
-javascript.parameter=Parameter
-javascript.local.variable=Local variable
-javascript.global.variable=Global variable
-javascript.global.function=Global function
-javascript.static.member.function=Static member function
-javascript.static.member.variable=Static member variable
-javascript.instance.member.variable=Instance member variable
-javascript.instance.member.function=Instance member function
-javascript.create.class.intention.name=Create Class {0}
-javascript.create.interface.intention.name=Create Interface {0}
-create.class.dialog.title=Create Class
-create.interface.dialog.title=Create Interface
-choose.class.title=Choose Class
-javascript.fix.remove.override.modifier=Remove override modifier
-javascript.validation.message.function.override.for.object.method=Method inherited from Object does not need override
-javascript.validation.message.function.override.without.parent.method=Method does not override method from super class
-javascript.parser.message.expected.lt=Expected >
-
-generate.constructor.fields.chooser.title=Choose Fields to Initialize by Constructor
-generate.getter.setter.chooser.title=Select Fields to Generate Getters and Setters
-generate.to.string.chooser.title=Select Fields to Use in toString function
-generate.getter.fields.chooser.title=Select Fields to Generate Getters
-generate.setter.fields.chooser.title=Select Fields to Generate Setters
-methods.to.implement.chooser.title=Select Methods to Implement
-methods.to.override.chooser.title=Select Methods to Override
-use.semicolon.to.terminate.statement=Use &semicolon to terminate statements
-javascript.validation.unused.import=Unused import
-javascript.fix.optimize.imports=Optimize imports
-javascript.parser.message.expected.doc.tag.value=Expected doc tag value
-javascript.validation.message.incorrect.tag.value=Incorrect Tag Value
-javascript.validation.message.incorrect.parameter.name=Incorrect parameter name
-javascript.parser.message.expected.doc.tag.name=Expected doc tag name
-javascript.invalid.number.of.parameters=Invalid number of parameters, expected {0}
-javascript.argument.type.mismatch=Argument type {1} is not assignable to parameter type {0}
-javascript.initializer.type.mismatch=Initializer type {1} is not assignable to variable type {0}
-javascript.binary.operand.type.mismatch=Binary operation argument type {1} is not assignable to type {0}
-javascript.incorrect.variable.type.mismatch=Variable type {1} is not assignable to type {0}
-javascript.term.does.not.evaluate.to.function=Method expression is not of Function type
-javascript.term.does.not.evaluate.to.function2=Property can not be invoked as function
-javascript.term.does.not.evaluate.to.function2.fix=Remove argument list
-javascript.assigned.expression.type.mismatch=Assigned expression type {1} is not assignable to type {0}
-javascript.returned.expression.type.mismatch=Returned expression type {1} is not assignable to type {0}
-javascript.insert.cast.fix=Insert cast
-javascript.introduce.constant.error.not.available.in.javascript.code=Introduce Constant is not available in JavaScript code
-javascript.introduce.field.error.not.available.in.javascript.code=Introduce Field is not available in JavaScript code
-javascript.extract.method.title=Extract Function
-javascript.validation.message.function.override.incompatible.access.modifier=Incompatible override, should have ''{0}'' access modifier
-javascript.validation.message.function.override.incompatible.signature=Incompatible override, should have signature ''{0}''
-javascript.validation.message.function.override.incompatible.signature2=Incompatible override, should have return type ''{0}''
-javascript.validation.message.interface.method.invalid.access.modifier=Incompatible implementation, should have 'public' access modifier
-javascript.validation.message.interface.method.invalid.signature=Incompatible implementation, should have signature ''{0}''
-javascript.validation.message.interface.method.invalid.signature2=Incompatible implementation, should have return type ''{0}''
-javascript.validation.message.duplicated.catch.block=Duplicated catch block #loc
-javascript.validation.message.duplicated.catch.block.fix=Remove duplicated catch block
-javascript.validation.message.return.value.of.type.is.required=Return value of type {0} is required
-javascript.validation.message.constructor.in.mxml.is.not.allowed=Constructor is not allowed for MXML class
-javascript.fix.remove.constructor=Remove constructor
-javascript.validation.message.package.shouldbe.first.statement=Package should be first statement in file
-javascript.metadata=Metadata
-javascript.validation.message.file.should.be.under.source.root=Object is located in file out of source root, certain functionality will not be available
-javascript.validation.message.unneeded.comma=Unneeded comma
-javascript.validation.message.remove.unneeded.comma.fix=Remove unneeded comma
-javascript.create.event.handler.intention.name=Create Event Handler {0}
-javascript.validation.message.missed.super.constructor.call=Missed superclass's constructor invokation
-javascript.fix.create.constructor.invoke.super=Create constructor matching super
-javascript.fix.create.invoke.super=Insert super class constructor invokation
-javascript.interface.can.not.be.instantiated.message=Interface can not be instantiated
-javascript.validation.message.set.method.should.be.void.or.without.type=Return type of a setter definition must be unspecified or void
-javascript.validation.message.set.method.should.have.one.parameter=A setter definition must have exactly one parameter
-javascript.validation.message.get.method.should.have.no.parameter=A getter definition must have no parameters
-javascript.validation.message.get.method.should.be.valid.type=Return type of a getter definition should not be {0}
-javascript.validation.message.access.modifier.allowed.only.for.class.members=Access modifier allowed for class members only
-javascript.validation.message.namespace.allowed.only.for.class.members=Namespace allowed for class members only
-javascript.validation.message.access.modifier.allowed.only.for.package.members=Only public / internal modifiers allowed for package members
-javascript.validation.message.use.namespace.reference.or.access.modifier=Use namespace OR access modifier
-javascript.fix.remove.access.modifier=Remove access modifier
-javascript.fix.remove.namespace.reference=Remove namespace reference
-javascript.incorrect.array.type.in.forin=Array key type should be String
-javascript.validation.message.unexpected.type.for.rest.parameter=Rest parameter should have no type
-javascript.fix.remove.type.reference=Remove type reference
-javascript.validation.message.parameter.is.not.allowed.after.rest.parameter=No parameter is allowed after rest parameter
-javascript.fix.remove.parameter=Remove parameter
-javascript.fix.remove.initializer=Remove initializer
-javascript.validation.message.parameter.should.be.initialized=Parameter should be initialized
-javascript.validation.message.rest.parameter.should.not.be.initialized=Rest parameter should not be initialized
-javascript.validation.message.nested.classes.are.not.allowed=Nested classes are not allowed
-generate.getter.fields.bindable.properties=&Bindable properties
-javascript.language.term.package=package
-javascript.validation.message.arguments.with.rest.parameter='arguments' object is not available when using rest parameter
-
-action.JavaScript.File.text=JavaScript File
-
-this.feature.is.not.supported.by.current.language=''{0}'' is not supported by current language version
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java
deleted file mode 100644
index 911db83c..00000000
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSBundle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.sixrr.inspectjs;
-
-import consulo.application.CommonBundle;
-import org.jetbrains.annotations.PropertyKey;
-
-import java.util.ResourceBundle;
-
-public class InspectionJSBundle {
-    private static final ResourceBundle ourBundle =
-            ResourceBundle.getBundle("com.sixrr.inspectjs.InspectionJSBundle");
-
-    private InspectionJSBundle() {
-    }
-
-    public static String message(@PropertyKey(resourceBundle = "com.sixrr.inspectjs.InspectionJSBundle")String key, Object... params) {
-        return CommonBundle.message(ourBundle, key, params);
-    }
-}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
index 7f666f83..d67138cc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
@@ -2,7 +2,6 @@
 
 import com.intellij.lang.javascript.psi.JSContinueStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index 05d7ea5d..4b7b8bd4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -3,7 +3,6 @@
 import com.intellij.lang.javascript.psi.JSCaseClause;
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index 88706ac7..85482f78 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -2,7 +2,6 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index 9d371f8a..92519597 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -4,7 +4,6 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index a6b902fc..75aeae59 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -5,7 +5,6 @@
 import com.intellij.lang.javascript.psi.JSThrowStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
 import com.sixrr.inspectjs.BaseInspectionVisitor;
-import com.sixrr.inspectjs.InspectionJSBundle;
 import com.sixrr.inspectjs.JSGroupNames;
 import com.sixrr.inspectjs.JavaScriptInspection;
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
diff --git a/inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties b/inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties
deleted file mode 100644
index 01076546..00000000
--- a/inspections/src/main/resources/com/sixrr/inspectjs/InspectionJSBundle.properties
+++ /dev/null
@@ -1,278 +0,0 @@
-result.of.assignment.used.displayName=Result of assignment used
-result.of.assignment.expression.used.error.string=Result of assignment expression used #loc
-assignment.to.for.loop.parameter.display.name=Assignment to 'for' loop parameter
-assignment.to.for.loop.parameter.error.string=Assignment to for-loop parameter #ref #loc
-assignment.to.function.parameter.display.name=Assignment to function parameter
-assignment.to.function.parameter.error.string=Assignment to function parameter '#ref' #loc
-nested.assignment.display.name=Nested assignment
-nested.assignment.error.string=Nested assignment <code>#ref</code> #loc
-assignment.replaceable.with.operator.assignment.display.name=Assignment replaceable with operator assignment
-assignment.replaceable.with.operator.assignment.error.string=#ref could be simplified to {0} #loc
-silly.assignment.display.name=Variable is assigned to itself
-silly.assignment.error.string=Variable is assigned to itself #loc
-divide.by.zero.display.name=Divide by zero
-division.by.zero.error.string=Division by zero #loc
-equality.comparison.with.coercion.display.name=Equality comparison which may cause unexpected coercion
-equality.comparison.with.coercion.error.string=Comparison #ref may cause unexpected type coercion #loc
-equality.comparison.with.coercion.fix=Replace with ''{0}''
-non.short.circuit.boolean.expression.display.name=Non short-circuit boolean expression
-non.short.circuit.boolean.expression.error.string=Non short-circuit boolean expression #loc
-replace.with.short.circuit.expression.fix.string=Replace with short circuit expression
-result.of.object.allocation.ignored.display.name=Result of object allocation ignored
-result.of.object.allocation.ignored.error.string=Result of <code>new #ref()</code> is ignored #loc
-text.label.in.switch.statement.display.name=Text label in 'switch' statement
-text.label.in.switch.statement.error.string=Text label <code>#ref:</code> in 'switch' statement #loc
-anonymous.function.display.name=Anonymous function
-anonymous.function.error.string=Anonymous #ref #loc
-unnecessary.block.statement.display.name=Unnecessary 'block' statement
-comma.expression.display.name=Comma expression
-conditional.expression.display.name=Conditional expression
-statement.with.empty.body.display.name=Statement with empty body
-result.of.increment.or.decrement.used.display.name=Result of increment or decrement used
-negated.conditional.expression.display.name=Negated conditional expression
-negated.if.statement.display.name=Negated 'if' statement
-nested.conditional.expression.display.name=Nested conditional expression
-nested.function.display.name=Nested function
-octal.integer.display.name=Octal Integer
-overly.complex.arithmetic.expression.display.name=Overly complex arithmetic expression
-overly.complex.boolean.expression.display.name=Overly complex boolean expression
-pointless.arithmetic.expression.display.name=Pointless arithmetic expression
-pointless.boolean.expression.display.name=Pointless boolean expression
-void.expression.display.name='void' expression
-with.statement.display.name='with' statement
-break.statement.display.name='break' statement
-break.statement.with.label.display.name='break' statement with label
-conditional.expression.with.identical.branches.display.name=Conditional expression with identical branches
-constant.conditional.expression.display.name=Constant conditional expression
-continue.statement.display.name='continue' statement
-continue.statement.with.label.display.name='continue' statement with label
-default.not.last.case.in.switch.display.name='default' not last case in 'switch'
-duplicate.condition.in.if.statement.display.name=Duplicate condition in 'if' statement
-fall.through.in.switch.statement.display.name=Fall-through in 'switch' statement
-if.statement.with.identical.branches.display.name='if' statement with identical branches
-if.statement.with.too.many.branches.display.name='if' statement with too many branches
-infinite.loop.statement.display.name=Infinite loop statement
-labeled.statement.display.name=Labeled statement
-loop.statement.that.doesn.t.loop.display.name=Loop statement that doesn't loop
-nested.switch.statement.display.name=Nested 'switch' statement
-switch.statement.with.no.default.branch.display.name='switch' statement with no default branch
-redundant.conditional.expression.display.name=Redundant conditional expression
-redundant.if.statement.display.name=Redundant 'if' statement
-unnecessary.continue.statement.display.name=Unnecessary 'continue' statement
-unnecessary.label.display.name=Unnecessary label
-unnecessary.label.on.break.statement.display.name=Unnecessary label on 'break' statement
-unnecessary.label.on.continue.statement.display.name=Unnecessary label on 'continue' statement
-unnecessary.return.statement.display.name=Unnecessary 'return' statement
-call.to.document.write.display.name=Call to 'document.write()'
-use.of.innerhtml.property.display.name=Use of 'innerHTML' property
-platform.detection.display.name=Platform detection
-xhtml.incompatibilities.display.name=XHTML incompatibilities
-continue.or.break.inside.finally.block.display.name='continue' or 'break' inside 'finally' block
-empty.catch.block.display.name=Empty 'catch' block
-empty.finally.block.display.name=Empty 'finally' block
-empty.try.block.display.name=Empty 'try' block
-exception.used.for.local.control.flow.display.name=Exception used for local control-flow
-return.inside.finally.block.display.name='return' inside 'finally' block
-throw.inside.finally.block.display.name='throw' inside 'finally' block
-overly.complex.function.display.name=Overly complex function
-function.with.multiple.loops.display.name=Function with multiple loops
-function.with.multiple.return.points.display.name=Function with multiple return points
-overly.nested.function.display.name=Overly nested function
-nesting.depth.limit=Nesting depth limit:
-function.with.too.many.parameters.display.name=Function with too many parameters
-function.parameter.limit=Function parameter limit:
-overly.long.function.display.name=Overly long function
-maximum.statements.per.function=Maximum statements per function:
-function.with.more.than.three.negations.display.name=Function with more than three negations
-function.naming.convention.display.name=Function naming convention
-local.variable.naming.convention.display.name=Local variable naming convention
-function.parameter.naming.convention.display.name=Function parameter naming convention
-expression.statement.which.is.not.assignment.or.call.display.name=Expression statement which is not assignment or call
-debugger.statement.display.name='debugger' statement
-duplicate.case.label.display.name=Duplicate case label
-duplicate.property.on.object.literal.display.name=Duplicate property on object literal
-function.with.inconsistent.returns.display.name=Function with inconsistent returns
-reserved.word.used.as.name.display.name=Reserved word used as name
-this.expression.which.references.the.global.object.display.name='this' expression which references the global object
-unreachable.code.display.name=Unreachable code
-chained.equality.display.name=Chained equality
-constant.on.right.side.of.comparison.display.name=Constant on right side of comparison
-constant.on.left.side.of.comparison.display.name=Constant on left side of comparison
-non.block.statement.body.display.name=Non-block statement body
-unterminated.statement.display.name=Unterminated statement
-terminate.statement.fix=Terminate statement
-unnecessary.block.statement.error.string=Unnecessary block statement #loc
-comma.expression.error.string=Comma expression #loc
-conditional.expression.error.string=Conditional expression #loc
-statement.has.empty.branch.error.string=<code>#ref</code> statement has empty branch #loc
-statement.has.empty.body.error.string=<code>#ref</code> statement has empty body #loc
-include.statement.bodies.that.are.empty.code.blocks.parameter=Include statement bodies that are empty code blocks
-result.of.increment.or.decrement.expression.used.error.string=Result of increment or decrement expression used #loc
-negated.conditional.expression.error.string=Negated conditional expression #loc
-invert.condition.fix=Invert condition
-negated.ref.statement.error.string=Negated '#ref' statement #loc
-invert.if.condition.fix=Invert If Condition
-nested.conditional.expression.error.string=Nested conditional expression #loc
-nested.function.error.string=Nested function '#ref' #loc
-nested.anonymous.function.error.string=Nested #ref #loc
-include.anonymous.functions.parameter=Include anonymous functions
-octal.integer.error.string=Octal integer '#ref' #loc
-maximum.number.of.terms.parameter=Maximum number of terms:
-overly.complex.arithmetic.expression.error.string=Overly complex arithmetic expression #loc
-pointless.arithmetic.error.message=#ref can be replaced with {0} #loc
-simplify.fix=Simplify
-pointless.boolean.error.string=#ref can be simplified to {0} #loc
-void.expression.error.string='#ref' expression #loc
-with.expression.error.string='#ref' statement #loc
-break.statement.error.string='#ref' statement #loc
-break.statement.with.label.error.string='#ref' statement with label #loc
-conditional.expression.with.identical.branches.error.string=Conditional expression #ref with identical branches #loc
-constant.conditional.expression.error.string=#ref can be simplified #loc
-continue.statement.error.string='#ref' statement #loc
-continue.statement.with.label.error.string='#ref' statement with label #loc
-default.branch.not.last.case.in.switch.error.string=<code>#ref</code> branch not last case in 'switch' #loc
-duplicate.condition.error.string=Duplicate condition #ref #loc
-fall.through.in.switch.statement.error.string=Fall-through in 'switch' statement #loc
-ref.statement.with.identical.branches.error.string=<code>#ref</code> statement with identical branches #loc
-collapse.if.statement.fix=Collapse 'if' statement
-maximum.number.of.branches.parameter=Maximum number of branches:
-if.statement.with.too.many.branches.error.string=''#ref'' has too many branches ({0}) #loc
-infinite.loop.error.string=<code>#ref</code> statement cannot complete without throwing an exception #loc
-statement.label.error.string=Statement label '#ref' #loc
-loop.statement.that.doesnt.loop.error.string=<code>#ref</code> statement doesn't loop #loc
-nested.switch.statement.error.string=Nested '#ref' statement #loc
-switch.statement.with.no.default.branch.error.string='#ref' statement with no default branch #loc
-trivial.conditional.error.string=''{0}'' can be simplified to ''{1}'' #loc
-trivial.if.error.string=#ref statement can be simplified #loc
-unnecessary.continue.error.string=#ref is unnecessary as the last statement in a loop #loc
-unnecessary.label.error.string=Unnecessary label #ref #loc
-remove.label.fix=Remove label
-unnecessary.label.on.break.error.string='#ref' statement with unnecessary label #loc
-unnecessary.label.on.continue.error.string='#ref' statement with unnecessary label #loc
-unnecessary.return.error.string=#ref is unnecessary as the last statement in a function with no return value #loc
-document.write.error.string=Call to '#ref()' #loc
-inner.html.error.string=use of '#ref' property #loc
-platform.detection.error.string='#ref' probably used for platform detection #loc
-xhtml.incompatabilities.error.string='#ref' may produce inconsistent results for XHTML documents #loc
-continue.or.break.inside.finally.block.error.string='#ref' inside 'finally' block #loc
-empty.catch.block.error.string=Empty '#ref' block #loc
-empty.finally.block.error.string=Empty 'finally' block #loc
-empty.try.block.error.string=Empty '#ref' block #loc
-exception.caught.locally.error.string='#ref' of exception caught locally #loc
-return.inside.finally.block.error.string='#ref' inside 'finally' block #loc
-throw.inside.finally.block.error.string='#ref' inside 'finally' block #loc
-rename.fix=Rename
-rename.to.fix=Rename to ''{0}''
-function.complexity.limit.parameter=Function complexity limit:
-function.ref.is.overly.complex.cyclomatic.complexity.error.string=function ''#ref'' is overly complex (cyclomatic complexity = {0}) #loc
-anonymous.function.is.overly.complex.cyclomatic.complexity.error.string=#ref  is overly complex (cyclomatic complexity = {0}) #loc
-function.contains.multiple.loops.error.string=function ''#ref'' contains {0} loops #loc
-anonymous.function.contains.multiple.loops.error.string=#ref contains {0} loops #loc
-function.contains.multiple.return.points.error.string=function ''#ref'' has {0} return points #loc
-anonymous.function.contains.multiple.return.points.error.string=#ref has {0} return points #loc
-function.is.overly.nested.error.string=function ''#ref'' is overly nested (maximum nesting depth = {0}) #loc
-anonymous.function.is.overly.nested.error.string=#ref is overly nested (maximum nesting depth = {0}) #loc
-function.has.too.many.parameters.error.string=function ''#ref'' has too many parameters (parameter count = {0}) #loc
-anonymous.function.has.too.many.parameters.error.string=#ref has too many parameters (parameter count = {0}) #loc
-function.is.overly.long.statement.error.string=function ''#ref'' is overly long (statement count = {0}) #loc
-anonymous.function.is.overly.long.statement.error.string=#ref is overly long (statement count = {0}) #loc
-function.contains.too.many.negation.error.string=function ''#ref'' contains {0} negations #loc
-anonymous.function.contains.too.many.negation.error.string=#ref contains {0} negations #loc
-function.name.is.too.short.error.string=Function name ''{0}'' is too short #loc
-function.name.is.too.long.error.string=Function name ''{0}''is too long #loc
-function.name.doesnt.match.regex.error.string=Function name ''{0}'' doesn''t match regex ''{1}'' #loc
-variable.name.is.too.short.error.string=Variable name '#ref' is too short #loc
-variable.name.is.too.long.error.string=Variable name '#ref' is too long #loc
-variable.name.doesnt.match.regex.error.string=Variable name ''#ref'' doesn''t match regex ''{0}'' #loc
-parameter.name.is.too.short.error.string=Parameter name '#ref' is too short #loc
-parameter.name.is.too.long.error.string=Parameter name '#ref' is too long #loc
-parameter.name.doesnt.match.regex.error.string=Parameter name ''#ref'' doesn''t match regex ''{0}'' #loc
-chained.equality.error.string=Chained equality comparison <code>#ref</code> #loc
-constant.on.left.side.of.comparison.error.string=#ref: constant on left side of comparison #loc
-constant.on.right.side.of.comparison.error.string=#ref: constant on right side of comparison #loc
-flip.comparison.fix=Flip comparison
-non.block.branch.error.string=<code>#ref</code> statement has non-block branch #loc
-non.block.body.error.string=<code>#ref</code> statement has non-block body #loc
-unterminated.statement.error.string=Unterminated statement #loc
-expression.statement.is.not.assignment.or.call.error.string=Expression statement is not assignment or call #loc
-debugger.statement.error.string='#ref' statement #loc
-duplicate.case.label.error.string=Duplicate case label #ref #loc
-duplicate.object.property.error.string=Duplicate object property #ref #loc
-function.has.inconsistent.return.points.error.string=function '#ref' has inconsistent return points #loc
-anonymous.function.has.inconsistent.return.points.error.string=#ref has inconsistent return points #loc
-reserved.word.used.as.name.error.string=Reserved word '#ref' used as name
-this.expression.references.global.object.error.string=Top-level '#ref' expression #loc
-unreachable.code.error.string=Unreachable code #loc
-malformed.naming.pattern.alert=Malformed Naming Pattern
-replace.with.operator.assign.fix=Replace = with {0}=
-overly.complex.boolean.expression.error.string=Overly complex boolean expression #loc
-collapse.conditional.expression.fix=Collapse conditional expression
-remove.unnecessary.continue.fix=Remove unnecessary continue
-remove.unnecessary.return.fix=Remove unnecessary return
-pattern.parameter=Pattern:
-min.length.parameter=Min Length:
-max.length.parameter=Max Length:
-wrap.statement.body.fix=Wrap statement body
-error.handling.javascript.group.name=Error handling
-control.flow.issues.javascript.group.name=Control flow issues
-javascript.validity.issues.group.name=JavaScript validity issues
-potentially.confusing.code.constructs.javascript.group.name=Potentially confusing code constructs
-javascript.function.metrics.group.name=JavaScript function metrics
-assignment.issues.javascript.group.name=Assignment issues
-naming.conventions.javascript.group.name=Naming conventions
-code.style.issues.javascript.group.name=Code style issues
-javascript.dom.issues.group.name=JavaScript DOM issues
-probable.bugs.javascript.group.name=Probable Bugs
-code.maturity.javascript.group.name=Code Maturity
-confusing.floating.point.literal.display.name=Confusing floating point literal
-confusing.floating.point.literal.problem.descriptor=Confusing floating point literal <code>#ref</code> #loc
-confusing.pluses.or.minuses.display.name=Confusing sequence of '+' or '-'
-confusing.pluses.or.minuses.error.string=Sequence of '+' or '-' may change meaning if whitespace removed #loc
-confusing.floating.point.literal.change.quickfix=Change To canonical form
-string.literal.breaks.html.display.name=String literal which breaks HTML parsing
-string.literal.breaks.html.error.string=String literal #ref may break HTML parsers
-for.loop.not.use.loop.variable.display.name='for' loop where update or condition does not use loop variable
-for.loop.not.use.loop.variable.problem.descriptor.condition=<code>#ref</code> statement has condition which does not use the for loop variable #loc
-for.loop.not.use.loop.variable.problem.descriptor.update=<code>#ref</code> statement has update which does not use the for loop variable #loc
-for.loop.not.use.loop.variable.problem.descriptor.both.condition.and.update=<code>#ref</code> statement has condition and update which do not use the for loop variable #loc
-unused.catch.parameter.display.name=Unused 'catch' parameter
-unused.catch.parameter.problem.descriptor=Unused catch parameter <code>#ref</code> #loc
-unused.catch.parameter.ignore.catch.option=Ignore catch blocks containing comments
-tail.recursion.display.name=Tail recursion
-tail.recursion.problem.descriptor=Tail recursion #loc
-redundant.local.variable.display.name=Redundant local variable
-data.flow.issues.javascript.group.name=Data flow issues
-bitwise.issues.javascript.group.name=Bitwise operation issues
-redundant.local.variable.ignore.option=Ignore immediately returned or thrown variables
-unnecessary.local.variable.problem.descriptor=Unnecessary local variable
-reuse.of.local.variable.display.name=Reuse of local variable
-reuse.of.local.variable.problem.descriptor=Reuse of local variable <code>#ref</code> #loc
-infinite.recursion.display.name=Infinite recursion
-infinite.recursion.problem.descriptor=Function <code>#ref</code> recurses infinitely, and can only end by throwing an exception #loc
-constant.if.statement.problem.descriptor=<code>#ref</code> statement can be simplified #loc
-constant.if.statement.display.name=Constant if statement
-constant.conditional.expression.simplify.quickfix=Simplify
-caller.error.string=Use of '#ref' property #loc
-caller.display.name=Use of 'caller' property
-dynamically.generated.code.error.string=Function '#ref' indicative of dynamically generated code #loc
-dynamically.generated.code.display.name=Execution of dynamically generated JavaScript
-for.loop.replaceable.by.while.problem.descriptor=<code>#ref</code> loop may be replaced by 'while' loop #loc
-for.loop.replaceable.by.while.display.name='for' loop may be replaced by 'while' loop
-for.loop.replaceable.by.while.replace.quickfix=Replace with 'while'
-for.loop.replaceable.by.while.ignore.option=Ignore 'infinite' for loops without conditions
-nested.function.call.display.name=Nested function call
-nested.function.call.problem.descriptor=Nested call to function '#ref' #loc
-chained.function.call.display.name=Chained function call
-chained.function.call.problem.descriptor=Chained call to function '#ref' #loc
-magic.number.display.name=Magic number
-magic.number.problem.descriptor=Magic number '#ref' #loc
-incompatible.mask.operation.display.name=Incompatible bitwise mask operation
-incompatible.mask.operation.problem.descriptor.always.false=<code>#ref</code> is always false #loc
-incompatible.mask.operation.problem.descriptor.always.true=<code>#ref</code> is always true #loc
-pointless.bitwise.expression.display.name=Pointless bitwise expression
-pointless.bitwise.expression.ignore.option=Ignore named constant in determinining pointless expressions
-pointless.bitwise.expression.problem.descriptor=<code>#ref</code> can be replaced with ''{0}'' #loc
-pointless.bitwise.expression.simplify.quickfix=Simplify
-shift.operation.by.inappropriate.constant.display.name=Shift operation by inappropriate constant
-shift.operation.by.inappropriate.constant.problem.descriptor.too.large=Shift operation <code>#ref</code> by overly large constant value #loc
-shift.operation.by.inappropriate.constant.problem.descriptor.negative=Shift operation <code>#ref</code> by negative constant value #loc
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
deleted file mode 100644
index 3f7e2d30..00000000
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntentionBundle.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2005-2006 Olivier Descout
- *
- * 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.
- */
-package org.intellij.idea.lang.javascript.intention;
-
-import consulo.annotation.DeprecationInfo;
-import consulo.annotation.internal.MigratedExtensionsTo;
-import consulo.application.CommonBundle;
-import consulo.javascript.intention.localize.JSIntentionLocalize;
-import org.intellij.idea.lang.javascript.JSAbstractBundle;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.PropertyKey;
-
-import java.util.ResourceBundle;
-
-@Deprecated
-@DeprecationInfo("Use JSIntentionLocalize")
-@MigratedExtensionsTo(JSIntentionLocalize.class)
-public class JSIntentionBundle extends JSAbstractBundle
-{
-
-	@NonNls
-	private static final String bundleClassName = "org.intellij.idea.lang.javascript.intention.JavaScriptIntentionBundle";
-	private static final ResourceBundle ourBundle = ResourceBundle.getBundle(bundleClassName);
-
-	private JSIntentionBundle()
-	{
-	}
-
-	public static String message(@PropertyKey(resourceBundle = bundleClassName) String key,
-								 Object... params)
-	{
-		return CommonBundle.message(ourBundle, key, params);
-	}
-}
diff --git a/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties b/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
deleted file mode 100644
index fdf14ba2..00000000
--- a/intentions/src/main/resources/org/intellij/idea/lang/javascript/intention/JavaScriptIntentionBundle.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-bool.de.morgans.law = DeMorgan law
-bool.de.morgans.law.and.to.or = Replace && with ||
-bool.de.morgans.law.or.to.and = Replace || with &&
-bool.flip.comparison = Flip comparison
-bool.flip.comparison.equals = Flip {0}
-bool.flip.comparison.not.equals = Flip {0} to {1}
-bool.flip.comparison.unknown = Flip comparison
-bool.flip.conjunction = Flip conjunction operands
-bool.flip.conjunction.message = Flip {0}
-bool.negate.comparison = Negate comparison
-bool.negate.comparison.equals = Negate {0}
-bool.negate.comparison.not.equals = Negate {0} to {1}
-bool.remove.boolean.equality = Remove boolean equality
-bool.remove.boolean.equality.message = Simplify {0}
-braces.add = Add braces
-braces.add.message = Add braces from ''{0}'' statement
-braces.remove = Remove braces
-braces.remove.message = Remove braces from ''{0}'' statement
-comment.change.to.cstyle.comment = Replace with C-style comment
-comment.change.to.end.of.line.comment = Replace with end-of-line comment
-comment.move.comment.to.separate.line = Move comment to separate line
-conditional.flip.conditional = Flip ?:
-conditional.flip.if = Flip if-else
-conditional.remove.conditional = Simplify ?:
-conditional.replace.conditional.with.if = Replace ?: with if-else
-constant.compute.expression = Compute constant value
-constant.compute.subexpression = Compute constant value for subexpression
-constant.compute.subexpression.message = Compute constant value of {0} {1} {2}
-increment.extract = Extract increment
-increment.extract.message = Extract {0}
-initialization.merge.declaration.and.initialization = Merge declaration and initialization
-initialization.split.declaration.and.initialization = Split into declaration and initialization
-loop.merge.parallel.for.loops = Merge 'for' loops
-loop.merge.parallel.for.in.loops = Merge 'for-in' loops
-number.convert.integer.to.decimal = Convert to decimal
-number.convert.integer.to.hex = Convert to hex
-number.convert.integer.to.octal = Convert to octal
-number.replace.multiply.with.shift = Replace multiply with shift
-number.replace.multiply.with.shift.message = Replace {0} with {1}
-number.replace.shift.with.multiply = Replace shift with multiply
-number.replace.shift.with.multiply.message = Replace {0} with {1}
-opassign.replace.with.operator.assignment = Replace assignment with operator assignment
-opassign.replace.with.operator.assignment.message = Replace = with {0}=
-parenthesis.remove.unnecessary.parentheses = Remove unnecessary parentheses
-string.double.quoted.to.single.quoted = Replace double-quoted string with single-quoted string
-string.join.concatenated.string.literals = Join concatenated String literals
-string.single.to.double.quoted.string = Replace single-quoted string with double-quoted string
-switchtoif.replace.if.with.switch = Replace if with switch
-switchtoif.replace.switch.with.if = Replace switch with if
-trivialif.merge.else.if = Merge else-if
-trivialif.merge.if.and = Merge 'if's
-trivialif.merge.if.or = Merge 'if's
-trivialif.merge.parallel.ifs = Merge 'if's
-trivialif.remove.redundant.else = Remove redundant else
-trivialif.replace.if.with.conditional = Replace if-else with ?:
-trivialif.simplify.if.else = Simplify if-else
-trivialif.split.else.if = Split else-if
-trivialif.split.if.and = Split AND-ed if
-trivialif.split.if.or = Split OR-ed if

From 9212640ed2b4edd204bd5d88886dcf1e37fe6bf5 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 20 Jul 2024 18:53:02 +0300
Subject: [PATCH 207/340] Removing reference to JavaScriptBundle from
 plugin.xml and *.form.

---
 .../lang/javascript/impl/formatter/JSCodeStylePanel.form  | 8 ++++----
 .../introduceConstant/JSIntroduceConstant.form            | 2 +-
 .../impl/refactoring/introduceField/JSIntroduceField.form | 2 +-
 .../introduceVariable/JSIntroduceVariable.form            | 2 +-
 plugin/src/main/resources/META-INF/plugin.xml             | 3 +--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.form
index a0967b44..600734de 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.form
@@ -14,14 +14,14 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="none" title-resource-bundle="messages/JavaScriptBundle" title-key="javascript.formatting.options.panel.title"/>
+        <border type="none" title="Formatting options"/>
         <children>
           <component id="16c22" class="javax.swing.JCheckBox" binding="myIndentPackageChildren">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/JavaScriptBundle" key="to.indent.package.statement.children"/>
+              <text value="Indent package statement children"/>
             </properties>
           </component>
           <hspacer id="4efc">
@@ -37,7 +37,7 @@
           <grid row="0" column="1" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="none" title-resource-bundle="messages/JavaScriptBundle" title-key="preview.panel.title"/>
+        <border type="none" title="Preview"/>
         <children/>
       </grid>
       <grid id="1fb9d" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -102,7 +102,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/JavaScriptBundle" key="use.semicolon.to.terminate.statement"/>
+              <text value="Use semicolon to terminate statements"/>
             </properties>
           </component>
           <hspacer id="cbb90">
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstant.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstant.form
index 163b8f68..4f561f5f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstant.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstant.form
@@ -15,7 +15,7 @@
         <properties>
           <labelFor value="2c355"/>
           <requestFocusEnabled value="false"/>
-          <text resource-bundle="com/intellij/lang/javascript/JavaScriptBundle" key="javascript.introduce.variable.name.prompt"/>
+          <text value="Name:"/>
         </properties>
       </component>
       <component id="2c355" class="javax.swing.JTextField" binding="myNameField">
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceField.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceField.form
index 8f07f9cb..8084f9b3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceField.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceField.form
@@ -130,7 +130,7 @@
         <properties>
           <labelFor value="2c355"/>
           <requestFocusEnabled value="false"/>
-          <text resource-bundle="com/intellij/lang/javascript/JavaScriptBundle" key="javascript.introduce.variable.name.prompt"/>
+          <text value="Name:"/>
         </properties>
       </component>
     </children>
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariable.form b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariable.form
index 8d2b3c62..88aa7510 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariable.form
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariable.form
@@ -15,7 +15,7 @@
         <properties>
           <labelFor value="2c355"/>
           <requestFocusEnabled value="false"/>
-          <text resource-bundle="messages/JavaScriptBundle" key="javascript.introduce.variable.name.prompt"/>
+          <text value="Name:"/>
         </properties>
       </component>
       <component id="2c355" class="javax.swing.JTextField" binding="myNameField">
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index de3e1796..35fa9759 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -1,5 +1,5 @@
 <!--
-  - Copyright 2013-2019 consulo.io
+  - Copyright 2013-2024 consulo.io
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 	<version>SNAPSHOT</version>
 	<category>Custom Languages</category>
 	<vendor>JetBrains &amp; consulo.io</vendor>
-	<resource-bundle>messages.JavaScriptBundle</resource-bundle>
 	<depends>com.intellij.xml</depends>
 	<depends optional="true">com.intellij.regexp</depends>
 	<tags>

From 152ef4381edf93945c324d6951e1d2f7bed750c0 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 20 Jul 2024 22:05:48 +0300
Subject: [PATCH 208/340] Link to JavaScriptLocalize from plugin.xml.

---
 plugin/src/main/resources/META-INF/plugin.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 35fa9759..180e1e42 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -22,6 +22,7 @@
 	<vendor>JetBrains &amp; consulo.io</vendor>
 	<depends>com.intellij.xml</depends>
 	<depends optional="true">com.intellij.regexp</depends>
+	<localize>consulo.јavascript.JavaScriptLocalize</localize>
 	<tags>
 		<tag>custom.language</tag>
 	</tags>

From c329af9954881952d2954d73db7b89cd2f8da94c Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 22 Jul 2024 01:23:17 +0300
Subject: [PATCH 209/340] Code reformat using IJ4 code style (part 1).

---
 .../intention/bool/ComparisonPredicate.java   |  32 +-
 .../intention/bool/ConjunctionPredicate.java  |  30 +-
 .../bool/JSDeMorgansLawIntention.java         | 115 +++---
 .../bool/JSFlipComparisonIntention.java       |  99 +++---
 .../bool/JSFlipConjunctionIntention.java      | 112 +++---
 .../bool/JSNegateComparisonIntention.java     |  88 +++--
 .../JSRemoveBooleanEqualityIntention.java     | 183 +++++-----
 .../braces/JSAddBracesIntention.java          | 133 ++++---
 .../braces/JSRemoveBracesIntention.java       | 208 +++++------
 .../JSChangeToCStyleCommentIntention.java     | 173 +++++----
 .../JSChangeToEndOfLineCommentIntention.java  | 225 ++++++------
 .../JSMoveCommentToSeparateLineIntention.java | 154 ++++----
 .../JSFlipConditionalIntention.java           |  80 ++---
 .../conditional/JSFlipIfIntention.java        |  80 ++---
 .../JSRemoveConditionalIntention.java         | 100 +++---
 .../JSReplaceConditionalWithIfIntention.java  |  56 ++-
 .../JSConstantExpressionIntention.java        |  96 +++--
 .../JSConstantSubexpressionIntention.java     | 336 ++++++++----------
 .../JSExtractIncrementIntention.java          | 125 +++----
 ...DeclarationAndInitializationIntention.java | 164 ++++-----
 ...DeclarationAndInitializationIntention.java | 177 +++++----
 .../JSMergeParallelForInLoopsIntention.java   | 279 +++++++--------
 .../JSMergeParallelForLoopsIntention.java     | 168 ++++-----
 .../JSConvertIntegerToDecimalIntention.java   |  67 ++--
 .../JSConvertIntegerToHexIntention.java       |  58 ++-
 25 files changed, 1523 insertions(+), 1815 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
index c9420f4a..89f22aff 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
@@ -24,25 +24,19 @@
 
 import jakarta.annotation.Nonnull;
 
-class ComparisonPredicate implements JSElementPredicate
-{
-	@Override
-	public boolean satisfiedBy(@Nonnull PsiElement element)
-	{
-		if(!(element instanceof JSBinaryExpression))
-		{
-			return false;
-		}
-		if(ErrorUtil.containsError(element))
-		{
-			return false;
-		}
+class ComparisonPredicate implements JSElementPredicate {
+    @Override
+    public boolean satisfiedBy(@Nonnull PsiElement element) {
+        if (!(element instanceof JSBinaryExpression)) {
+            return false;
+        }
+        if (ErrorUtil.containsError(element)) {
+            return false;
+        }
 
-		final JSBinaryExpression expression = (JSBinaryExpression) element;
-		final JSExpression rhs = expression.getROperand();
+        final JSBinaryExpression expression = (JSBinaryExpression)element;
+        final JSExpression rhs = expression.getROperand();
 
-		return (rhs != null &&
-				ComparisonUtils.isComparisonOperator((JSExpression) element));
-
-	}
+        return (rhs != null && ComparisonUtils.isComparisonOperator((JSExpression)element));
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
index 447c6e63..e5dccfe0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
@@ -23,23 +23,19 @@
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 
-class ConjunctionPredicate implements JSElementPredicate
-{
-	@Override
-	public boolean satisfiedBy(@Nonnull PsiElement element)
-	{
-		if(!(element instanceof JSBinaryExpression))
-		{
-			return false;
-		}
-		if(ErrorUtil.containsError(element))
-		{
-			return false;
-		}
+class ConjunctionPredicate implements JSElementPredicate {
+    @Override
+    public boolean satisfiedBy(@Nonnull PsiElement element) {
+        if (!(element instanceof JSBinaryExpression)) {
+            return false;
+        }
+        if (ErrorUtil.containsError(element)) {
+            return false;
+        }
 
-		final JSBinaryExpression expression = (JSBinaryExpression) element;
-		final IElementType sign = expression.getOperationSign();
+        final JSBinaryExpression expression = (JSBinaryExpression)element;
+        final IElementType sign = expression.getOperationSign();
 
-		return (sign.equals(JSTokenTypes.ANDAND) || sign.equals(JSTokenTypes.OROR));
-	}
+        return (JSTokenTypes.ANDAND.equals(sign) || JSTokenTypes.OROR.equals(sign));
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 8fec4573..08e290bf 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -35,78 +35,69 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSDeMorgansLawIntention",
-	categories = {"JavaScript", "Boolean"},
-	fileExtensions = "js"
+    ignoreId = "JSDeMorgansLawIntention",
+    categories = {"JavaScript", "Boolean"},
+    fileExtensions = "js"
 )
-public class JSDeMorgansLawIntention extends JSMutablyNamedIntention
-{
-	@Override
-	@Nonnull
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.boolDeMorgansLaw();
-	}
+public class JSDeMorgansLawIntention extends JSMutablyNamedIntention {
+    @Override
+    @Nonnull
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.boolDeMorgansLaw();
+    }
 
-	@Override
-	@RequiredReadAction
-	protected LocalizeValue getTextForElement(PsiElement element)
-	{
-		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
+    @Override
+    @RequiredReadAction
+    protected LocalizeValue getTextForElement(PsiElement element) {
+        final IElementType tokenType = ((JSBinaryExpression)element).getOperationSign();
 
-		return JSTokenTypes.ANDAND.equals(tokenType)
-			? JSIntentionLocalize.boolDeMorgansLawAndToOr()
-			: JSIntentionLocalize.boolDeMorgansLawOrToAnd();
-	}
+        return JSTokenTypes.ANDAND.equals(tokenType)
+            ? JSIntentionLocalize.boolDeMorgansLawAndToOr()
+            : JSIntentionLocalize.boolDeMorgansLawOrToAnd();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ConjunctionPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ConjunctionPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		JSBinaryExpression exp = (JSBinaryExpression) element;
-		final IElementType tokenType = exp.getOperationSign();
-		JSElement parent = (JSElement) exp.getParent();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        JSBinaryExpression exp = (JSBinaryExpression)element;
+        final IElementType tokenType = exp.getOperationSign();
+        JSElement parent = (JSElement)exp.getParent();
 
-		while (isConjunctionExpression(parent, tokenType))
-		{
-			exp = (JSBinaryExpression) parent;
-			assert (exp != null);
-			parent = (JSElement) exp.getParent();
-		}
+        while (isConjunctionExpression(parent, tokenType)) {
+            exp = (JSBinaryExpression)parent;
+            assert (exp != null);
+            parent = (JSElement)exp.getParent();
+        }
 
-		final String newExpression = this.convertConjunctionExpression(exp, tokenType);
+        final String newExpression = this.convertConjunctionExpression(exp, tokenType);
 
-		JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, newExpression);
-	}
+        JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, newExpression);
+    }
 
-	@RequiredReadAction
-	private String convertConjunctionExpression(JSBinaryExpression exp, IElementType tokenType)
-	{
-		final String leftText = this.getOperandText(exp.getLOperand(), tokenType);
-		final String rightText = this.getOperandText(exp.getROperand(), tokenType);
-		final String flippedConjunction = tokenType.equals(JSTokenTypes.ANDAND) ? "||" : "&&";
+    @RequiredReadAction
+    private String convertConjunctionExpression(JSBinaryExpression exp, IElementType tokenType) {
+        final String leftText = this.getOperandText(exp.getLOperand(), tokenType);
+        final String rightText = this.getOperandText(exp.getROperand(), tokenType);
+        final String flippedConjunction = tokenType.equals(JSTokenTypes.ANDAND) ? "||" : "&&";
 
-		return leftText + flippedConjunction + rightText;
-	}
+        return leftText + flippedConjunction + rightText;
+    }
 
-	@RequiredReadAction
-	private String getOperandText(JSExpression operand, IElementType tokenType)
-	{
-		return isConjunctionExpression(operand, tokenType)
-			? this.convertConjunctionExpression((JSBinaryExpression) operand, tokenType)
-			: BoolUtils.getNegatedExpressionText(operand);
-	}
+    @RequiredReadAction
+    private String getOperandText(JSExpression operand, IElementType tokenType) {
+        return isConjunctionExpression(operand, tokenType)
+            ? this.convertConjunctionExpression((JSBinaryExpression)operand, tokenType)
+            : BoolUtils.getNegatedExpressionText(operand);
+    }
 
-	@RequiredReadAction
-	private static boolean isConjunctionExpression(JSElement exp, IElementType conjunctionType)
-	{
-		return exp instanceof JSBinaryExpression binaryExpression && binaryExpression.getOperationSign().equals(conjunctionType);
-	}
+    @RequiredReadAction
+    private static boolean isConjunctionExpression(JSElement exp, IElementType conjunctionType) {
+        return exp instanceof JSBinaryExpression binaryExpression && binaryExpression.getOperationSign().equals(conjunctionType);
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 9226b11c..375158c4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -33,66 +33,57 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSFlipComparisonIntention",
-	categories = {"JavaScript", "Boolean"},
-	fileExtensions = "js"
+    ignoreId = "JSFlipComparisonIntention",
+    categories = {"JavaScript", "Boolean"},
+    fileExtensions = "js"
 )
-public class JSFlipComparisonIntention extends JSMutablyNamedIntention
-{
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.boolFlipComparison();
-	}
+public class JSFlipComparisonIntention extends JSMutablyNamedIntention {
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.boolFlipComparison();
+    }
 
-	@Override
-	@RequiredReadAction
-	public LocalizeValue getTextForElement(PsiElement element)
-	{
-		final JSBinaryExpression exp = (JSBinaryExpression) element;
-		String operatorText = null;
-		String flippedOperatorText = null;
+    @Override
+    @RequiredReadAction
+    public LocalizeValue getTextForElement(PsiElement element) {
+        final JSBinaryExpression exp = (JSBinaryExpression)element;
+        String operatorText = null;
+        String flippedOperatorText = null;
 
-		if (exp != null)
-		{
-			operatorText = ComparisonUtils.getOperatorText(exp.getOperationSign());
-			flippedOperatorText = ComparisonUtils.getFlippedOperatorText(exp.getOperationSign());
-		}
+        if (exp != null) {
+            operatorText = ComparisonUtils.getOperatorText(exp.getOperationSign());
+            flippedOperatorText = ComparisonUtils.getFlippedOperatorText(exp.getOperationSign());
+        }
 
-		if (exp == null)
-		{
-			return JSIntentionLocalize.boolFlipComparisonUnknown();
-		}
-		else if (operatorText.equals(flippedOperatorText))
-		{
-			return JSIntentionLocalize.boolFlipComparisonEquals(operatorText);
-		}
-		else
-		{
-			return JSIntentionLocalize.boolFlipComparisonNotEquals(operatorText, flippedOperatorText);
-		}
-	}
+        if (exp == null) {
+            return JSIntentionLocalize.boolFlipComparisonUnknown();
+        }
+        else if (operatorText.equals(flippedOperatorText)) {
+            return JSIntentionLocalize.boolFlipComparisonEquals(operatorText);
+        }
+        else {
+            return JSIntentionLocalize.boolFlipComparisonNotEquals(operatorText, flippedOperatorText);
+        }
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ComparisonPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ComparisonPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSBinaryExpression exp = (JSBinaryExpression) element;
-		final JSExpression lhs = exp.getLOperand();
-		final JSExpression rhs = exp.getROperand();
-		final IElementType sign = exp.getOperationSign();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSBinaryExpression exp = (JSBinaryExpression)element;
+        final JSExpression lhs = exp.getLOperand();
+        final JSExpression rhs = exp.getROperand();
+        final IElementType sign = exp.getOperationSign();
 
-		assert (rhs != null);
+        assert (rhs != null);
 
-		final String expString = rhs.getText() + ComparisonUtils.getFlippedOperatorText(sign) + lhs.getText();
-		JSElementFactory.replaceExpression(exp, expString);
-	}
+        final String expString = rhs.getText() + ComparisonUtils.getFlippedOperatorText(sign) + lhs.getText();
+        JSElementFactory.replaceExpression(exp, expString);
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 8fba5912..77aa1d0a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -34,75 +34,65 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSFlipConjunctionIntention",
-	categories = {"JavaScript", "Boolean"},
-	fileExtensions = "js"
+    ignoreId = "JSFlipConjunctionIntention",
+    categories = {"JavaScript", "Boolean"},
+    fileExtensions = "js"
 )
-public class JSFlipConjunctionIntention extends JSMutablyNamedIntention
-{
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.boolFlipConjunction();
-	}
+public class JSFlipConjunctionIntention extends JSMutablyNamedIntention {
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.boolFlipConjunction();
+    }
 
-	@Override
-	@RequiredReadAction
-	protected LocalizeValue getTextForElement(PsiElement element)
-	{
-		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
-		final IElementType sign = binaryExpression.getOperationSign();
+    @Override
+    @RequiredReadAction
+    protected LocalizeValue getTextForElement(PsiElement element) {
+        final JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
+        final IElementType sign = binaryExpression.getOperationSign();
 
-		return JSIntentionLocalize.boolFlipConjunctionMessage(BinaryOperatorUtils.getOperatorText(sign));
-	}
+        return JSIntentionLocalize.boolFlipConjunctionMessage(BinaryOperatorUtils.getOperatorText(sign));
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ConjunctionPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ConjunctionPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
-		JSExpression exp = binaryExpression;
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
+        JSExpression exp = binaryExpression;
 
-		final IElementType sign = binaryExpression.getOperationSign();
-		JSElement parent = (JSElement) exp.getParent();
+        final IElementType sign = binaryExpression.getOperationSign();
+        JSElement parent = (JSElement)exp.getParent();
 
-		while (isConjunctionExpression(parent, sign))
-		{
-			exp = (JSExpression) parent;
-			assert (exp != null);
-			parent = (JSElement) exp.getParent();
-		}
-		JSElementFactory.replaceExpression(exp, this.flipExpression(exp, sign));
-	}
+        while (isConjunctionExpression(parent, sign)) {
+            exp = (JSExpression)parent;
+            assert (exp != null);
+            parent = (JSElement)exp.getParent();
+        }
+        JSElementFactory.replaceExpression(exp, this.flipExpression(exp, sign));
+    }
 
-	@RequiredReadAction
-	private String flipExpression(JSExpression exp, IElementType conjunctionType)
-	{
-		if (isConjunctionExpression(exp, conjunctionType))
-		{
-			final JSBinaryExpression andExpression = (JSBinaryExpression) exp;
+    @RequiredReadAction
+    private String flipExpression(JSExpression exp, IElementType conjunctionType) {
+        if (isConjunctionExpression(exp, conjunctionType)) {
+            final JSBinaryExpression andExpression = (JSBinaryExpression)exp;
 
-			return this.flipExpression(andExpression.getROperand(), conjunctionType) + ' ' +
-				BinaryOperatorUtils.getOperatorText(conjunctionType) + ' ' +
-				this.flipExpression(andExpression.getLOperand(), conjunctionType);
-		}
-		else
-		{
-			return exp.getText();
-		}
-	}
+            return this.flipExpression(andExpression.getROperand(), conjunctionType) + ' ' +
+                BinaryOperatorUtils.getOperatorText(conjunctionType) + ' ' +
+                this.flipExpression(andExpression.getLOperand(), conjunctionType);
+        }
+        else {
+            return exp.getText();
+        }
+    }
 
-	@RequiredReadAction
-	private static boolean isConjunctionExpression(JSElement expression, IElementType conjunctionType)
-	{
-		return expression instanceof JSBinaryExpression binaryExpression && binaryExpression.getOperationSign().equals(conjunctionType);
-	}
+    @RequiredReadAction
+    private static boolean isConjunctionExpression(JSElement expression, IElementType conjunctionType) {
+        return expression instanceof JSBinaryExpression binaryExpression && binaryExpression.getOperationSign().equals(conjunctionType);
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index 613a087f..d53ba2aa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -33,60 +33,54 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSNegateComparisonIntention",
-	categories = {"JavaScript", "Boolean"},
-	fileExtensions = "js"
+    ignoreId = "JSNegateComparisonIntention",
+    categories = {"JavaScript", "Boolean"},
+    fileExtensions = "js"
 )
-public class JSNegateComparisonIntention extends JSMutablyNamedIntention
-{
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.boolNegateComparison();
-	}
+public class JSNegateComparisonIntention extends JSMutablyNamedIntention {
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.boolNegateComparison();
+    }
 
-	@Override
-	@RequiredReadAction
-	public LocalizeValue getTextForElement(PsiElement element)
-	{
-		final JSBinaryExpression expression = (JSBinaryExpression) element;
-		String operatorText = "";
-		String negatedOperatorText = "";
+    @Override
+    @RequiredReadAction
+    public LocalizeValue getTextForElement(PsiElement element) {
+        final JSBinaryExpression expression = (JSBinaryExpression)element;
+        String operatorText = "";
+        String negatedOperatorText = "";
 
-		if (expression != null)
-		{
-			final IElementType sign = expression.getOperationSign();
+        if (expression != null) {
+            final IElementType sign = expression.getOperationSign();
 
-			operatorText = ComparisonUtils.getOperatorText(sign);
-			negatedOperatorText = ComparisonUtils.getNegatedOperatorText(sign);
-		}
+            operatorText = ComparisonUtils.getOperatorText(sign);
+            negatedOperatorText = ComparisonUtils.getNegatedOperatorText(sign);
+        }
 
-		return operatorText.equals(negatedOperatorText)
-			? JSIntentionLocalize.boolNegateComparisonEquals(operatorText)
-			: JSIntentionLocalize.boolNegateComparisonNotEquals(operatorText, negatedOperatorText);
-	}
+        return operatorText.equals(negatedOperatorText)
+            ? JSIntentionLocalize.boolNegateComparisonEquals(operatorText)
+            : JSIntentionLocalize.boolNegateComparisonNotEquals(operatorText, negatedOperatorText);
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ComparisonPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ComparisonPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSBinaryExpression exp = (JSBinaryExpression) element;
-		final JSExpression lhs = exp.getLOperand();
-		final JSExpression rhs = exp.getROperand();
-		final IElementType sign = exp.getOperationSign();
-		final String negatedOperator = ComparisonUtils.getNegatedOperatorText(sign);
-		final String lhsText = lhs.getText();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSBinaryExpression exp = (JSBinaryExpression)element;
+        final JSExpression lhs = exp.getLOperand();
+        final JSExpression rhs = exp.getROperand();
+        final IElementType sign = exp.getOperationSign();
+        final String negatedOperator = ComparisonUtils.getNegatedOperatorText(sign);
+        final String lhsText = lhs.getText();
 
-		assert (rhs != null);
+        assert (rhs != null);
 
-		JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, lhsText + negatedOperator + rhs.getText());
-	}
+        JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, lhsText + negatedOperator + rhs.getText());
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index dceaa107..73baf36f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -36,119 +36,98 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSRemoveBooleanEqualityIntention",
-	categories = {"JavaScript", "Boolean"},
-	fileExtensions = "js"
+    ignoreId = "JSRemoveBooleanEqualityIntention",
+    categories = {"JavaScript", "Boolean"},
+    fileExtensions = "js"
 )
-public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention
-{
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.boolRemoveBooleanEquality();
-	}
+public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention {
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.boolRemoveBooleanEquality();
+    }
 
-	@Override
-	@RequiredReadAction
-	protected LocalizeValue getTextForElement(PsiElement element)
-	{
-		final JSBinaryExpression binaryExpression = (JSBinaryExpression) element;
+    @Override
+    @RequiredReadAction
+    protected LocalizeValue getTextForElement(PsiElement element) {
+        final JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
 
-		return JSIntentionLocalize.boolRemoveBooleanEqualityMessage(
-			BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign())
-		);
-	}
+        return JSIntentionLocalize.boolRemoveBooleanEqualityMessage(
+            BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign())
+        );
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new BooleanLiteralEqualityPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new BooleanLiteralEqualityPredicate();
+    }
 
-	@Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSBinaryExpression exp = (JSBinaryExpression) element;
-		final boolean isEquals = exp.getOperationSign().equals(JSTokenTypes.EQEQ);
-		final JSExpression lhs = exp.getLOperand();
-		final JSExpression rhs = exp.getROperand();
+    @Override
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSBinaryExpression exp = (JSBinaryExpression)element;
+        final boolean isEquals = exp.getOperationSign().equals(JSTokenTypes.EQEQ);
+        final JSExpression lhs = exp.getLOperand();
+        final JSExpression rhs = exp.getROperand();
 
-		assert (lhs != null);
-		assert (rhs != null);
+        assert (lhs != null);
+        assert (rhs != null);
 
-		final String lhsText = lhs.getText();
-		final String rhsText = rhs.getText();
+        final String lhsText = lhs.getText();
+        final String rhsText = rhs.getText();
 
-		if (BoolUtils.TRUE.equals(lhsText))
-		{
-			if (isEquals)
-			{
-				JSElementFactory.replaceExpression(exp, rhsText);
-			}
-			else
-			{
-				JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
-			}
-		}
-		else if (BoolUtils.FALSE.equals(lhsText))
-		{
-			if (isEquals)
-			{
-				JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
-			}
-			else
-			{
-				JSElementFactory.replaceExpression(exp, rhsText);
-			}
-		}
-		else if (BoolUtils.TRUE.equals(rhsText))
-		{
-			if (isEquals)
-			{
-				JSElementFactory.replaceExpression(exp, lhsText);
-			}
-			else
-			{
-				JSElementFactory.replaceExpressionWithNegatedExpression(lhs, exp);
-			}
-		}
-		else
-		{
-			if (isEquals)
-			{
-				JSElementFactory.replaceExpressionWithNegatedExpression(lhs, exp);
-			}
-			else
-			{
-				JSElementFactory.replaceExpression(exp, lhsText);
-			}
-		}
-	}
+        if (BoolUtils.TRUE.equals(lhsText)) {
+            if (isEquals) {
+                JSElementFactory.replaceExpression(exp, rhsText);
+            }
+            else {
+                JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
+            }
+        }
+        else if (BoolUtils.FALSE.equals(lhsText)) {
+            if (isEquals) {
+                JSElementFactory.replaceExpressionWithNegatedExpression(rhs, exp);
+            }
+            else {
+                JSElementFactory.replaceExpression(exp, rhsText);
+            }
+        }
+        else if (BoolUtils.TRUE.equals(rhsText)) {
+            if (isEquals) {
+                JSElementFactory.replaceExpression(exp, lhsText);
+            }
+            else {
+                JSElementFactory.replaceExpressionWithNegatedExpression(lhs, exp);
+            }
+        }
+        else {
+            if (isEquals) {
+                JSElementFactory.replaceExpressionWithNegatedExpression(lhs, exp);
+            }
+            else {
+                JSElementFactory.replaceExpression(exp, lhsText);
+            }
+        }
+    }
 
-	private static class BooleanLiteralEqualityPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSBinaryExpression) || ErrorUtil.containsError(element))
-			{
-        return false;
-			}
+    private static class BooleanLiteralEqualityPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSBinaryExpression) || ErrorUtil.containsError(element)) {
+                return false;
+            }
 
-			final JSBinaryExpression expression = (JSBinaryExpression) element;
-			final IElementType sign = expression.getOperationSign();
+            final JSBinaryExpression expression = (JSBinaryExpression)element;
+            final IElementType sign = expression.getOperationSign();
 
-			if (!(sign.equals(JSTokenTypes.EQEQ) || sign.equals(JSTokenTypes.NE)))
-			{
-				return false;
-			}
+            if (!(JSTokenTypes.EQEQ.equals(sign) || JSTokenTypes.NE.equals(sign))) {
+                return false;
+            }
 
-			final JSExpression lhs = expression.getLOperand();
-			final JSExpression rhs = expression.getROperand();
+            final JSExpression lhs = expression.getLOperand();
+            final JSExpression rhs = expression.getROperand();
 
-			return lhs != null && rhs != null && (BoolUtils.isBooleanLiteral(lhs) || BoolUtils.isBooleanLiteral(rhs));
-		}
-	}
+            return lhs != null && rhs != null && (BoolUtils.isBooleanLiteral(lhs) || BoolUtils.isBooleanLiteral(rhs));
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index 3e5b4cca..5779b100 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -31,89 +31,78 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSAddBracesIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSAddBracesIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSAddBracesIntention extends JSMutablyNamedIntention
-{
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new AddBracesPredicate();
-	}
+public class JSAddBracesIntention extends JSMutablyNamedIntention {
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new AddBracesPredicate();
+    }
 
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.bracesAdd();
-	}
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.bracesAdd();
+    }
 
-	@Override
-	@RequiredReadAction
-	protected LocalizeValue getTextForElement(PsiElement element)
-	{
-		final JSElement parent = (JSElement) element.getParent();
-		final String keyword;
+    @Override
+    @RequiredReadAction
+    protected LocalizeValue getTextForElement(PsiElement element) {
+        final JSElement parent = (JSElement)element.getParent();
+        final String keyword;
 
-		assert (parent != null);
+        assert (parent != null);
 
-		if (parent instanceof JSIfStatement ifStatement)
-		{
-			final JSStatement elseBranch = ifStatement.getElse();
+        if (parent instanceof JSIfStatement ifStatement) {
+            final JSStatement elseBranch = ifStatement.getElse();
 
-			keyword = (element.equals(elseBranch) ? "else" : "if");
-		}
-		else
-		{
-			final PsiElement firstChild = parent.getFirstChild();
+            keyword = (element.equals(elseBranch) ? "else" : "if");
+        }
+        else {
+            final PsiElement firstChild = parent.getFirstChild();
 
-			assert (firstChild != null);
-			keyword = firstChild.getText();
-		}
+            assert (firstChild != null);
+            keyword = firstChild.getText();
+        }
 
-		return JSIntentionLocalize.bracesAddMessage(keyword);
-  }
+        return JSIntentionLocalize.bracesAddMessage(keyword);
+    }
 
-	@Override
-	@RequiredReadAction
-	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		if (!(element instanceof JSStatement statement))
-		{
-			return;
-		}
-		final JSElement parent = (JSElement) element.getParent();
-		final String text = element.getText();
-		String newText = parent.getLastChild() instanceof PsiComment
-			? '{' + text + "\n}"
-			: '{' + text + '}';
-		JSElementFactory.replaceStatement(statement, newText);
-	}
+    @Override
+    @RequiredReadAction
+    protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        if (!(element instanceof JSStatement statement)) {
+            return;
+        }
+        final JSElement parent = (JSElement)element.getParent();
+        final String text = element.getText();
+        String newText = parent.getLastChild() instanceof PsiComment
+            ? '{' + text + "\n}"
+            : '{' + text + '}';
+        JSElementFactory.replaceStatement(statement, newText);
+    }
 
-	private static class AddBracesPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element) {
-			if (!(element instanceof JSStatement)
-				|| element instanceof JSBlockStatement
-				|| !(element.getParent() instanceof JSElement parent)) {
-				return false;
-			}
+    private static class AddBracesPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSStatement)
+                || element instanceof JSBlockStatement
+                || !(element.getParent() instanceof JSElement parent)) {
+                return false;
+            }
 
-			if (parent instanceof JSIfStatement ifStatement)
-			{
-				return !(element instanceof JSIfStatement && element.equals(ifStatement.getElse()));
-			}
+            if (parent instanceof JSIfStatement ifStatement) {
+                return !(element instanceof JSIfStatement && element.equals(ifStatement.getElse()));
+            }
 
-			if (parent instanceof JSForStatement || parent instanceof JSForInStatement)
-			{
-				return element.equals(((JSLoopStatement) parent).getBody());
-			}
+            if (parent instanceof JSForStatement || parent instanceof JSForInStatement) {
+                return element.equals(((JSLoopStatement)parent).getBody());
+            }
 
-			return parent instanceof JSWhileStatement || parent instanceof JSDoWhileStatement;
-		}
-	}
+            return parent instanceof JSWhileStatement || parent instanceof JSDoWhileStatement;
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index f0045628..764954cb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -31,116 +31,102 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSRemoveBracesIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSRemoveBracesIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSRemoveBracesIntention extends JSMutablyNamedIntention
-{
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.bracesRemove();
-	}
-
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new RemoveBracesPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	protected LocalizeValue getTextForElement(PsiElement element)
-	{
-		final JSElement parent = (JSElement) element.getParent();
-		final String keyword;
-
-		assert (parent != null);
-
-		if (parent instanceof JSIfStatement ifStatement)
-		{
-			final JSStatement elseBranch = ifStatement.getElse();
-
-			keyword = element.equals(elseBranch) ? "else" : "if";
-		}
-		else
-		{
-			final PsiElement keywordChild = parent.getFirstChild();
-
-			assert (keywordChild != null);
-			keyword = keywordChild.getText();
-		}
-
-		return JSIntentionLocalize.bracesRemoveMessage(keyword);
-  }
-
-	@Override
-	@RequiredReadAction
-	protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSBlockStatement blockStatement = (JSBlockStatement) element;
-		final JSStatement[] statements = blockStatement.getStatements();
-		final JSStatement statement = statements[0];
-
-		// handle comments
-		final JSElement parent = (JSElement) blockStatement.getParent();
-
-		assert (parent != null);
-
-		final JSElement grandParent = (JSElement) parent.getParent();
-
-		assert (grandParent != null);
-
-		PsiElement sibling = statement.getFirstChild();
-
-		assert (sibling != null);
-
-		sibling = sibling.getNextSibling();
-		while (sibling != null && !sibling.equals(statement))
-		{
-			if (sibling instanceof PsiComment)
-			{
-				grandParent.addBefore(sibling, parent);
-			}
-			sibling = sibling.getNextSibling();
-		}
-
-		final PsiElement lastChild = blockStatement.getLastChild();
-
-		if (lastChild instanceof PsiComment)
-		{
-			final JSElement nextSibling = (JSElement) parent.getNextSibling();
-
-			grandParent.addAfter(lastChild, nextSibling);
-		}
-
-		String text = statement.getText();
-		JSElementFactory.replaceStatement(blockStatement, text);
-	}
-
-	public static class RemoveBracesPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSBlockStatement blockStatement))
-			{
-				return false;
-			}
-
-			final PsiElement parent = blockStatement.getParent();
-
-			return (parent instanceof JSIfStatement || parent instanceof JSWhileStatement || parent instanceof JSDoWhileStatement
-				|| parent instanceof JSForStatement || parent instanceof JSForInStatement)
-				&& isSingleNonVarStatement(blockStatement.getStatements());
-			}
-
-		private boolean isSingleNonVarStatement(JSStatement[] statements)
-		{
-			return statements.length == 1 && !(statements[0] instanceof JSVarStatement);
-		}
-	}
+public class JSRemoveBracesIntention extends JSMutablyNamedIntention {
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.bracesRemove();
+    }
+
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new RemoveBracesPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    protected LocalizeValue getTextForElement(PsiElement element) {
+        final JSElement parent = (JSElement)element.getParent();
+        final String keyword;
+
+        assert (parent != null);
+
+        if (parent instanceof JSIfStatement ifStatement) {
+            final JSStatement elseBranch = ifStatement.getElse();
+
+            keyword = element.equals(elseBranch) ? "else" : "if";
+        }
+        else {
+            final PsiElement keywordChild = parent.getFirstChild();
+
+            assert (keywordChild != null);
+            keyword = keywordChild.getText();
+        }
+
+        return JSIntentionLocalize.bracesRemoveMessage(keyword);
+    }
+
+    @Override
+    @RequiredReadAction
+    protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSBlockStatement blockStatement = (JSBlockStatement)element;
+        final JSStatement[] statements = blockStatement.getStatements();
+        final JSStatement statement = statements[0];
+
+        // handle comments
+        final JSElement parent = (JSElement)blockStatement.getParent();
+
+        assert (parent != null);
+
+        final JSElement grandParent = (JSElement)parent.getParent();
+
+        assert (grandParent != null);
+
+        PsiElement sibling = statement.getFirstChild();
+
+        assert (sibling != null);
+
+        sibling = sibling.getNextSibling();
+        while (sibling != null && !sibling.equals(statement)) {
+            if (sibling instanceof PsiComment) {
+                grandParent.addBefore(sibling, parent);
+            }
+            sibling = sibling.getNextSibling();
+        }
+
+        final PsiElement lastChild = blockStatement.getLastChild();
+
+        if (lastChild instanceof PsiComment) {
+            final JSElement nextSibling = (JSElement)parent.getNextSibling();
+
+            grandParent.addAfter(lastChild, nextSibling);
+        }
+
+        String text = statement.getText();
+        JSElementFactory.replaceStatement(blockStatement, text);
+    }
+
+    public static class RemoveBracesPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSBlockStatement blockStatement)) {
+                return false;
+            }
+
+            final PsiElement parent = blockStatement.getParent();
+
+            return (parent instanceof JSIfStatement || parent instanceof JSWhileStatement || parent instanceof JSDoWhileStatement
+                || parent instanceof JSForStatement || parent instanceof JSForInStatement)
+                && isSingleNonVarStatement(blockStatement.getStatements());
+        }
+
+        private boolean isSingleNonVarStatement(JSStatement[] statements) {
+            return statements.length == 1 && !(statements[0] instanceof JSVarStatement);
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index 5be7c53a..10cd0301 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -34,98 +34,85 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSChangeToCStyleCommentIntention",
-	categories = {"JavaScript", "Comments"},
-	fileExtensions = "js"
+    ignoreId = "JSChangeToCStyleCommentIntention",
+    categories = {"JavaScript", "Comments"},
+    fileExtensions = "js"
 )
-public class JSChangeToCStyleCommentIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.commentChangeToCstyleComment().get();
-	}
-
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new EndOfLineCommentPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		PsiComment firstComment = (PsiComment) element;
-
-		while (true)
-		{
-			final PsiElement prevComment = JSElementFactory.getNonWhiteSpaceSibling(firstComment, false);
-
-			if (!isEndOfLineComment(prevComment))
-			{
-				break;
-			}
-			assert (prevComment != null);
-			firstComment = (PsiComment) prevComment;
-		}
-
-		final StringBuilder buffer = new StringBuilder(getCommentContents(firstComment));
-		final List<PsiElement> elementsToDelete = new ArrayList<>();
-		PsiElement nextComment = firstComment;
-
-		while (true)
-		{
-			elementsToDelete.add(nextComment);
-
-			nextComment = JSElementFactory.getNonWhiteSpaceSibling(nextComment, true);
-			if (!isEndOfLineComment(nextComment))
-			{
-				break;
-			}
-			assert (nextComment != null);
-
-			final PsiElement prevSibling = nextComment.getPrevSibling();
-
-			assert (prevSibling != null);
-			elementsToDelete.add(prevSibling);
-
-			buffer.append(prevSibling.getText())  // White space
-				.append(getCommentContents((PsiComment) nextComment));
-		}
-
-		final String text = StringUtil.replace(buffer.toString(), "*/", "* /");
-		final String newCommentString = text.indexOf('\n') >= 0
-			? "/*\n" + text + "\n*/"
-			: "/*" + text + "*/";
-
-		JSElementFactory.addElementBefore(firstComment, newCommentString);
-		for (final PsiElement elementToDelete : elementsToDelete)
-		{
-			JSElementFactory.removeElement(elementToDelete);
-		}
-	}
-
-	private static boolean isEndOfLineComment(PsiElement element)
-	{
-		return element instanceof PsiComment comment && JSTokenTypes.END_OF_LINE_COMMENT.equals(comment.getTokenType());
-	}
-
-	@RequiredReadAction
-	private static String getCommentContents(PsiComment comment)
-	{
-		return comment.getText().substring(2);
-	}
-
-	private static class EndOfLineCommentPredicate implements JSElementPredicate
-	{
-
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof PsiComment comment && JSTokenTypes.END_OF_LINE_COMMENT.equals(comment.getTokenType());
-		}
-	}
+public class JSChangeToCStyleCommentIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.commentChangeToCstyleComment().get();
+    }
+
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new EndOfLineCommentPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        PsiComment firstComment = (PsiComment)element;
+
+        while (true) {
+            final PsiElement prevComment = JSElementFactory.getNonWhiteSpaceSibling(firstComment, false);
+
+            if (!isEndOfLineComment(prevComment)) {
+                break;
+            }
+            assert (prevComment != null);
+            firstComment = (PsiComment)prevComment;
+        }
+
+        final StringBuilder buffer = new StringBuilder(getCommentContents(firstComment));
+        final List<PsiElement> elementsToDelete = new ArrayList<>();
+        PsiElement nextComment = firstComment;
+
+        while (true) {
+            elementsToDelete.add(nextComment);
+
+            nextComment = JSElementFactory.getNonWhiteSpaceSibling(nextComment, true);
+            if (!isEndOfLineComment(nextComment)) {
+                break;
+            }
+            assert (nextComment != null);
+
+            final PsiElement prevSibling = nextComment.getPrevSibling();
+
+            assert (prevSibling != null);
+            elementsToDelete.add(prevSibling);
+
+            buffer.append(prevSibling.getText())  // White space
+                .append(getCommentContents((PsiComment)nextComment));
+        }
+
+        final String text = StringUtil.replace(buffer.toString(), "*/", "* /");
+        final String newCommentString = text.indexOf('\n') >= 0
+            ? "/*\n" + text + "\n*/"
+            : "/*" + text + "*/";
+
+        JSElementFactory.addElementBefore(firstComment, newCommentString);
+        for (final PsiElement elementToDelete : elementsToDelete) {
+            JSElementFactory.removeElement(elementToDelete);
+        }
+    }
+
+    private static boolean isEndOfLineComment(PsiElement element) {
+        return element instanceof PsiComment comment && JSTokenTypes.END_OF_LINE_COMMENT.equals(comment.getTokenType());
+    }
+
+    @RequiredReadAction
+    private static String getCommentContents(PsiComment comment) {
+        return comment.getText().substring(2);
+    }
+
+    private static class EndOfLineCommentPredicate implements JSElementPredicate {
+
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof PsiComment comment && JSTokenTypes.END_OF_LINE_COMMENT.equals(comment.getTokenType());
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index d63de048..48ac087c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -33,128 +33,107 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSChangeToEndOfLineCommentIntention",
-	categories = {"JavaScript", "Comments"},
-	fileExtensions = "js"
+    ignoreId = "JSChangeToEndOfLineCommentIntention",
+    categories = {"JavaScript", "Comments"},
+    fileExtensions = "js"
 )
-public class JSChangeToEndOfLineCommentIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.commentChangeToEndOfLineComment().get();
-	}
-
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new CStyleCommentPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiElement parent = element.getParent();
-
-		assert (parent != null);
-
-		final String commentText = element.getText();
-		final PsiElement whitespace = element.getNextSibling();
-		final String text = commentText.substring(2, commentText.length() - 2);
-		final String[] lines = text.split("\n");
-		final String[] newComments = buildCommentStrings(lines);
-		PsiElement currentElement = element;
-
-		for (int index = newComments.length; --index >= 0; )
-		{
-			if (newComments[index].length() > 0)
-			{
-				currentElement = JSElementFactory.addElementBefore(currentElement, "\n");
-				currentElement = JSElementFactory.addElementBefore(currentElement, newComments[index]);
-			}
-		}
-		if (whitespace != null)
-		{
-			JSElementFactory.removeElement(whitespace);
-		}
-		JSElementFactory.removeElement(element);
-	}
-
-	private static String[] buildCommentStrings(String[] lines)
-	{
-		int lastNonEmtpyLine = -1;
-
-		for (int i = lines.length - 1; i >= 0 && lastNonEmtpyLine == -1; i--)
-		{
-			final String line = lines[i].trim();
-			if (!line.isEmpty())
-			{
-				lastNonEmtpyLine = i;
-			}
-		}
-		if (lastNonEmtpyLine == -1)
-		{
-			return new String[]{"//"};
-		}
-
-		final StringBuilder buffer = new StringBuilder();
-		final String[] commentStrings = new String[lastNonEmtpyLine + 1];
-
-		for (int i = 0; i <= lastNonEmtpyLine; i++)
-		{
-			final String line = lines[i];
-
-			if (line.trim().length() != 0)
-			{
-				buffer.replace(0, buffer.length(), "//");
-
-				if (line.startsWith(" *"))
-				{
-					buffer.append(line.substring(2));
-				}
-				else if (line.startsWith("*"))
-				{
-					buffer.append(line.substring(1));
-				}
-				else
-				{
-					buffer.append(line);
-				}
-			}
-
-			commentStrings[i] = buffer.toString();
-		}
-		return commentStrings;
-	}
-
-	private static class CStyleCommentPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof PsiComment))
-			{
-				return false;
-			}
-
-			final PsiComment comment = (PsiComment) element;
-			final IElementType type = comment.getTokenType();
-
-			if (!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.C_STYLE_COMMENT.equals(type)))
-			{
-				return false;
-			}
-			final PsiElement sibling = TreeUtil.getNextLeaf(comment);
-			if (!(sibling instanceof PsiWhiteSpace))
-			{
-				return false;
-			}
-			final String whitespaceText = sibling.getText();
-			return whitespaceText.indexOf((int) '\n') >= 0 || whitespaceText.indexOf((int) '\r') >= 0;
-		}
-	}
+public class JSChangeToEndOfLineCommentIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.commentChangeToEndOfLineComment().get();
+    }
+
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new CStyleCommentPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiElement parent = element.getParent();
+
+        assert (parent != null);
+
+        final String commentText = element.getText();
+        final PsiElement whitespace = element.getNextSibling();
+        final String text = commentText.substring(2, commentText.length() - 2);
+        final String[] lines = text.split("\n");
+        final String[] newComments = buildCommentStrings(lines);
+        PsiElement currentElement = element;
+
+        for (int index = newComments.length; --index >= 0; ) {
+            if (newComments[index].length() > 0) {
+                currentElement = JSElementFactory.addElementBefore(currentElement, "\n");
+                currentElement = JSElementFactory.addElementBefore(currentElement, newComments[index]);
+            }
+        }
+        if (whitespace != null) {
+            JSElementFactory.removeElement(whitespace);
+        }
+        JSElementFactory.removeElement(element);
+    }
+
+    private static String[] buildCommentStrings(String[] lines) {
+        int lastNonEmtpyLine = -1;
+
+        for (int i = lines.length - 1; i >= 0 && lastNonEmtpyLine == -1; i--) {
+            final String line = lines[i].trim();
+            if (!line.isEmpty()) {
+                lastNonEmtpyLine = i;
+            }
+        }
+        if (lastNonEmtpyLine == -1) {
+            return new String[]{"//"};
+        }
+
+        final StringBuilder buffer = new StringBuilder();
+        final String[] commentStrings = new String[lastNonEmtpyLine + 1];
+
+        for (int i = 0; i <= lastNonEmtpyLine; i++) {
+            final String line = lines[i];
+
+            if (line.trim().length() != 0) {
+                buffer.replace(0, buffer.length(), "//");
+
+                if (line.startsWith(" *")) {
+                    buffer.append(line.substring(2));
+                }
+                else if (line.startsWith("*")) {
+                    buffer.append(line.substring(1));
+                }
+                else {
+                    buffer.append(line);
+                }
+            }
+
+            commentStrings[i] = buffer.toString();
+        }
+        return commentStrings;
+    }
+
+    private static class CStyleCommentPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof PsiComment)) {
+                return false;
+            }
+
+            final PsiComment comment = (PsiComment)element;
+            final IElementType type = comment.getTokenType();
+
+            if (!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.C_STYLE_COMMENT.equals(type))) {
+                return false;
+            }
+            final PsiElement sibling = TreeUtil.getNextLeaf(comment);
+            if (!(sibling instanceof PsiWhiteSpace)) {
+                return false;
+            }
+            final String whitespaceText = sibling.getText();
+            return whitespaceText.indexOf((int)'\n') >= 0 || whitespaceText.indexOf((int)'\r') >= 0;
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index a488f675..e0fbfef0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -33,100 +33,84 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSMoveCommentToSeparateLineIntention",
-	categories = {"JavaScript", "Comments"},
-	fileExtensions = "js"
+    ignoreId = "JSMoveCommentToSeparateLineIntention",
+    categories = {"JavaScript", "Comments"},
+    fileExtensions = "js"
 )
-public class JSMoveCommentToSeparateLineIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.commentMoveCommentToSeparateLine().get();
-	}
+public class JSMoveCommentToSeparateLineIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.commentMoveCommentToSeparateLine().get();
+    }
 
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new CommentOnLineWithSourcePredicate();
-	}
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new CommentOnLineWithSourcePredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiComment selectedComment = (PsiComment) element;
-		PsiElement elementToCheck = selectedComment;
-		final PsiWhiteSpace whiteSpace;
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiComment selectedComment = (PsiComment)element;
+        PsiElement elementToCheck = selectedComment;
+        final PsiWhiteSpace whiteSpace;
 
-		while (true)
-		{
-			elementToCheck = TreeUtil.getPrevLeaf(elementToCheck);
-			if (elementToCheck == null)
-			{
-				return;
-			}
-			if (isLineBreakWhiteSpace(elementToCheck))
-			{
-				whiteSpace = (PsiWhiteSpace) elementToCheck;
-				break;
-			}
-		}
+        while (true) {
+            elementToCheck = TreeUtil.getPrevLeaf(elementToCheck);
+            if (elementToCheck == null) {
+                return;
+            }
+            if (isLineBreakWhiteSpace(elementToCheck)) {
+                whiteSpace = (PsiWhiteSpace)elementToCheck;
+                break;
+            }
+        }
 
-		PsiElement commentElement = JSElementFactory.addElementBefore(whiteSpace, selectedComment.getText());
-		JSElementFactory.addElementBefore(commentElement, "\n");
+        PsiElement commentElement = JSElementFactory.addElementBefore(whiteSpace, selectedComment.getText());
+        JSElementFactory.addElementBefore(commentElement, "\n");
 
-		JSElementFactory.removeElement(selectedComment);
-	}
+        JSElementFactory.removeElement(selectedComment);
+    }
 
-	@RequiredReadAction
-	private static boolean isLineBreakWhiteSpace(PsiElement element)
-	{
-		return (element instanceof PsiWhiteSpace && containsLineBreak(element.getText()));
-	}
+    @RequiredReadAction
+    private static boolean isLineBreakWhiteSpace(PsiElement element) {
+        return (element instanceof PsiWhiteSpace && containsLineBreak(element.getText()));
+    }
 
-	private static boolean containsLineBreak(String text)
-	{
-		return (text.indexOf((int) '\n') >= 0 || text.indexOf((int) '\r') >= 0);
-	}
+    private static boolean containsLineBreak(String text) {
+        return (text.indexOf((int)'\n') >= 0 || text.indexOf((int)'\r') >= 0);
+    }
 
-	private static class CommentOnLineWithSourcePredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof PsiComment))
-			{
-				return false;
-			}
-			final PsiComment comment = (PsiComment) element;
-			final IElementType type = comment.getTokenType();
+    private static class CommentOnLineWithSourcePredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof PsiComment)) {
+                return false;
+            }
+            final PsiComment comment = (PsiComment)element;
+            final IElementType type = comment.getTokenType();
 
-			if (!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.END_OF_LINE_COMMENT.equals(type)))
-			{
-				return false; // can't move JSP comments
-			}
+            if (!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.END_OF_LINE_COMMENT.equals(type))) {
+                return false; // can't move JSP comments
+            }
 
-			final PsiElement prevSibling = TreeUtil.getPrevLeaf(element);
-			if (!(prevSibling instanceof PsiWhiteSpace))
-			{
-				return true;
-			}
-			final String prevSiblingText = prevSibling.getText();
-			if (prevSiblingText.indexOf('\n') < 0 && prevSiblingText.indexOf('\r') < 0)
-			{
-				return true;
-			}
-			final PsiElement nextSibling = TreeUtil.getNextLeaf(element);
-			if (!(nextSibling instanceof PsiWhiteSpace))
-			{
-				return true;
-			}
-			final String nextSiblingText = nextSibling.getText();
-			return (nextSiblingText.indexOf('\n') < 0 && nextSiblingText.indexOf('\r') < 0);
-		}
-	}
+            final PsiElement prevSibling = TreeUtil.getPrevLeaf(element);
+            if (!(prevSibling instanceof PsiWhiteSpace)) {
+                return true;
+            }
+            final String prevSiblingText = prevSibling.getText();
+            if (prevSiblingText.indexOf('\n') < 0 && prevSiblingText.indexOf('\r') < 0) {
+                return true;
+            }
+            final PsiElement nextSibling = TreeUtil.getNextLeaf(element);
+            if (!(nextSibling instanceof PsiWhiteSpace)) {
+                return true;
+            }
+            final String nextSiblingText = nextSibling.getText();
+            return (nextSiblingText.indexOf('\n') < 0 && nextSiblingText.indexOf('\r') < 0);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 8ab1fd29..197bd9bf 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -33,56 +33,50 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSFlipConditionalIntention",
-	categories = {"JavaScript", "Conditional"},
-	fileExtensions = "js"
+    ignoreId = "JSFlipConditionalIntention",
+    categories = {"JavaScript", "Conditional"},
+    fileExtensions = "js"
 )
-public class JSFlipConditionalIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.conditionalFlipConditional().get();
-	}
+public class JSFlipConditionalIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.conditionalFlipConditional().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new FlipConditionalPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new FlipConditionalPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSConditionalExpression exp = (JSConditionalExpression) element;
-		final JSExpression condition = exp.getCondition();
-		final JSExpression elseExpression = exp.getElse();
-		final JSExpression thenExpression = exp.getThen();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSConditionalExpression exp = (JSConditionalExpression)element;
+        final JSExpression condition = exp.getCondition();
+        final JSExpression elseExpression = exp.getElse();
+        final JSExpression thenExpression = exp.getThen();
 
-		assert (elseExpression != null);
-		assert (thenExpression != null);
+        assert (elseExpression != null);
+        assert (thenExpression != null);
 
-		final String newExpression = BoolUtils.getNegatedExpressionText(condition) + '?' +
-			elseExpression.getText() + ':' + thenExpression.getText();
+        final String newExpression = BoolUtils.getNegatedExpressionText(condition) + '?' +
+            elseExpression.getText() + ':' + thenExpression.getText();
 
-		JSElementFactory.replaceExpression(exp, newExpression);
-	}
+        JSElementFactory.replaceExpression(exp, newExpression);
+    }
 
-	private static class FlipConditionalPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSConditionalExpression) || ErrorUtil.containsError(element)) {
-        return false;
-			}
+    private static class FlipConditionalPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSConditionalExpression) || ErrorUtil.containsError(element)) {
+                return false;
+            }
 
-			final JSConditionalExpression condition = (JSConditionalExpression) element;
+            final JSConditionalExpression condition = (JSConditionalExpression)element;
 
-			return condition.getCondition() != null && condition.getThen() != null && condition.getElse() != null;
-		}
-	}
+            return condition.getCondition() != null && condition.getThen() != null && condition.getElse() != null;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index f08449d2..f19c94a2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -34,53 +34,47 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSFlipIfIntention",
-	categories = {"JavaScript", "Conditional"},
-	fileExtensions = "js"
+    ignoreId = "JSFlipIfIntention",
+    categories = {"JavaScript", "Conditional"},
+    fileExtensions = "js"
 )
-public class JSFlipIfIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.conditionalFlipIf().get();
-	}
+public class JSFlipIfIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.conditionalFlipIf().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new FlipIfPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new FlipIfPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSIfStatement exp = (JSIfStatement) element;
-		final JSExpression condition = exp.getCondition();
-		final JSStatement thenBranch = exp.getThen();
-		final JSStatement elseBranch = exp.getElse();
-		final String negatedText = BoolUtils.getNegatedExpressionText(condition);
-		final boolean emptyThenBranch =
-			(thenBranch == null || (thenBranch instanceof JSBlockStatement blockStatement && blockStatement.getStatements().length == 0));
-		final String thenText = emptyThenBranch ? "" : "else " + thenBranch.getText();
-		final String elseText = elseBranch == null ? "{}" : elseBranch.getText();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSIfStatement exp = (JSIfStatement)element;
+        final JSExpression condition = exp.getCondition();
+        final JSStatement thenBranch = exp.getThen();
+        final JSStatement elseBranch = exp.getElse();
+        final String negatedText = BoolUtils.getNegatedExpressionText(condition);
+        final boolean emptyThenBranch =
+            (thenBranch == null || (thenBranch instanceof JSBlockStatement blockStatement && blockStatement.getStatements().length == 0));
+        final String thenText = emptyThenBranch ? "" : "else " + thenBranch.getText();
+        final String elseText = elseBranch == null ? "{}" : elseBranch.getText();
 
-		final String newStatement = "if (" + negatedText + ')' + elseText + thenText;
+        final String newStatement = "if (" + negatedText + ')' + elseText + thenText;
 
-		JSElementFactory.replaceStatement(exp, newStatement);
-	}
+        JSElementFactory.replaceStatement(exp, newStatement);
+    }
 
-	private static class FlipIfPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSIfStatement ifStatement
-				&& !ErrorUtil.containsError(ifStatement)
-				&& ifStatement.getCondition() != null;
-		}
-	}
+    private static class FlipIfPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSIfStatement ifStatement
+                && !ErrorUtil.containsError(ifStatement)
+                && ifStatement.getCondition() != null;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 24aadbf2..1eb93d0b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -33,68 +33,60 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSRemoveConditionalIntention",
-	categories = {"JavaScript", "Conditional"},
-	fileExtensions = "js"
+    ignoreId = "JSRemoveConditionalIntention",
+    categories = {"JavaScript", "Conditional"},
+    fileExtensions = "js"
 )
-public class JSRemoveConditionalIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.conditionalRemoveConditional().get();
-	}
+public class JSRemoveConditionalIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.conditionalRemoveConditional().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new RemoveConditionalPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new RemoveConditionalPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSConditionalExpression exp = (JSConditionalExpression) element;
-		final JSExpression condition = exp.getCondition();
-		final JSExpression thenExpression = exp.getThen();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSConditionalExpression exp = (JSConditionalExpression)element;
+        final JSExpression condition = exp.getCondition();
+        final JSExpression thenExpression = exp.getThen();
 
-		assert (thenExpression != null);
+        assert (thenExpression != null);
 
-		final String thenExpressionText = thenExpression.getText();
-		final String newExpression;
+        final String thenExpressionText = thenExpression.getText();
+        final String newExpression;
 
-		newExpression = thenExpressionText.equals(BoolUtils.TRUE)
-			? condition.getText()
-			: BoolUtils.getNegatedExpressionText(condition);
-		JSElementFactory.replaceExpression(exp, newExpression);
-	}
+        newExpression = thenExpressionText.equals(BoolUtils.TRUE)
+            ? condition.getText()
+            : BoolUtils.getNegatedExpressionText(condition);
+        JSElementFactory.replaceExpression(exp, newExpression);
+    }
 
-	private static class RemoveConditionalPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (element instanceof JSConditionalExpression condition && !ErrorUtil.containsError(element))
-			{
-				final JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
-				final JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
+    private static class RemoveConditionalPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (element instanceof JSConditionalExpression condition && !ErrorUtil.containsError(element)) {
+                final JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
+                final JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
 
-				if (condition.getCondition() == null || thenExpression == null || elseExpression == null)
-				{
-					return false;
-				}
+                if (condition.getCondition() == null || thenExpression == null || elseExpression == null) {
+                    return false;
+                }
 
-				final String thenText = thenExpression.getText();
-				final String elseText = elseExpression.getText();
+                final String thenText = thenExpression.getText();
+                final String elseText = elseExpression.getText();
 
-				return (BoolUtils.TRUE.equals(elseText) && BoolUtils.FALSE.equals(thenText))
-					|| (BoolUtils.TRUE.equals(thenText) && BoolUtils.FALSE.equals(elseText));
-			}
-			return false;
-		}
-	}
+                return (BoolUtils.TRUE.equals(elseText) && BoolUtils.FALSE.equals(thenText))
+                    || (BoolUtils.TRUE.equals(thenText) && BoolUtils.FALSE.equals(elseText));
+            }
+            return false;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 6615b723..439ecc40 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -28,39 +28,33 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSReplaceConditionalWithIfIntention",
-	categories = {"JavaScript", "Conditional"},
-	fileExtensions = "js"
+    ignoreId = "JSReplaceConditionalWithIfIntention",
+    categories = {"JavaScript", "Conditional"},
+    fileExtensions = "js"
 )
-public class JSReplaceConditionalWithIfIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.conditionalReplaceConditionalWithIf().get();
-	}
+public class JSReplaceConditionalWithIfIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.conditionalReplaceConditionalWithIf().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ReplaceConditionalWithIfPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ReplaceConditionalWithIfPredicate();
+    }
 
-	@Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		assert (element instanceof JSConditionalExpression);
-		ConditionalUtils.replaceConditionalWithIf((JSConditionalExpression) element);
-	}
+    @Override
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        assert (element instanceof JSConditionalExpression);
+        ConditionalUtils.replaceConditionalWithIf((JSConditionalExpression)element);
+    }
 
-	private static class ReplaceConditionalWithIfPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return (element instanceof JSConditionalExpression);
-		}
-	}
+    private static class ReplaceConditionalWithIfPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return (element instanceof JSConditionalExpression);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index f6501bef..bf3b677b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -34,66 +34,52 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSConstantExpressionIntention",
-	categories = {"JavaScript", "Other"},
-	fileExtensions = "js"
+    ignoreId = "JSConstantExpressionIntention",
+    categories = {"JavaScript", "Other"},
+    fileExtensions = "js"
 )
-public class JSConstantExpressionIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.constantComputeExpression().get();
-	}
+public class JSConstantExpressionIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.constantComputeExpression().get();
+    }
 
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new ConstantExpressionPredicate();
-	}
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new ConstantExpressionPredicate();
+    }
 
-	@Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSExpression expression = (JSExpression) element;
-		final Object value = ExpressionUtil.computeConstantExpression(expression);
-		final String newExpression;
+    @Override
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSExpression expression = (JSExpression)element;
+        final Object value = ExpressionUtil.computeConstantExpression(expression);
+        final String newExpression = value instanceof String strValue
+            ? '"' + StringUtil.escapeStringCharacters(strValue) + '"'
+            : String.valueOf(value);
+        JSElementFactory.replaceExpression(expression, newExpression);
+    }
 
-		if (value instanceof String strValue)
-		{
-			newExpression = '"' + StringUtil.escapeStringCharacters(strValue) + '"';
-		}
-		else
-		{
-			newExpression = String.valueOf(value);
-		}
-		JSElementFactory.replaceExpression(expression, newExpression);
-	}
+    private static class ConstantExpressionPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSExpression) || ErrorUtil.containsError(element)) {
+                return false;
+            }
+            final JSExpression expression = (JSExpression)element;
 
-	private static class ConstantExpressionPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSExpression) || ErrorUtil.containsError(element))
-			{
-        return false;
-			}
-			final JSExpression expression = (JSExpression) element;
+            if (element instanceof JSLiteralExpression
+                || (element instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() != null)
+                || expression instanceof JSCallExpression
+                || !ExpressionUtil.isConstantExpression(expression)
+                || ExpressionUtil.computeConstantExpression(expression) == null) {
+                return false;
+            }
 
-			if (element instanceof JSLiteralExpression
-				|| (element instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() != null)
-				|| expression instanceof JSCallExpression
-				|| !ExpressionUtil.isConstantExpression(expression)
-				|| ExpressionUtil.computeConstantExpression(expression) == null) {
-				return false;
-			}
+            final PsiElement parent = element.getParent();
 
-			final PsiElement parent = element.getParent();
-
-			return !(parent instanceof JSExpression parentExpression && ExpressionUtil.isConstantExpression(parentExpression));
-		}
-	}
+            return !(parent instanceof JSExpression parentExpression && ExpressionUtil.isConstantExpression(parentExpression));
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index 6f93443d..a55dfbdb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -39,187 +39,159 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSConstantSubexpressionIntention",
-	categories = {"JavaScript", "Other"},
-	fileExtensions = "js"
+    ignoreId = "JSConstantSubexpressionIntention",
+    categories = {"JavaScript", "Other"},
+    fileExtensions = "js"
 )
-public class JSConstantSubexpressionIntention extends JSMutablyNamedIntention
-{
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new ConstantSubexpressionPredicate();
-	}
-
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.constantComputeSubexpression();
-	}
-
-	@Override
-	@RequiredReadAction
-	protected LocalizeValue getTextForElement(PsiElement element)
-	{
-		final PsiElement parent = element.getParent();
-		final JSBinaryExpression binaryExpression = (JSBinaryExpression) (parent instanceof JSBinaryExpression ? parent : element);
-		final JSExpression lhs = binaryExpression.getLOperand();
-		final JSExpression leftSide = lhs instanceof JSBinaryExpression lhsBinaryExpression ? lhsBinaryExpression.getROperand() : lhs;
-		final IElementType operationSign = binaryExpression.getOperationSign();
-		final JSExpression rhs = binaryExpression.getROperand();
-
-		assert (rhs != null);
-		assert (leftSide != null);
-
-		return JSIntentionLocalize.constantComputeSubexpressionMessage(
-			leftSide.getText(),
-			BinaryOperatorUtils.getOperatorText(operationSign),
-			rhs.getText()
-		);
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiElement parent = element.getParent();
-		final JSExpression expression = (JSExpression) (parent instanceof JSBinaryExpression ? parent : element);
-		String newExpression = "";
-		final Object constantValue;
-
-		if (expression instanceof JSBinaryExpression)
-		{
-			final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-			final JSExpression lhs = binaryExpression.getLOperand();
-
-			if (lhs instanceof JSBinaryExpression lhsBinaryExpression)
-			{
-				final JSExpression rightSide = lhsBinaryExpression.getROperand();
-
-				newExpression += getLeftSideText(lhsBinaryExpression);
-
-				assert (rightSide != null);
-			}
-			constantValue = ExpressionUtil.computeConstantExpression(getSubexpression(binaryExpression));
-		}
-		else
-		{
-			constantValue = ExpressionUtil.computeConstantExpression(expression);
-		}
-
-		if (constantValue instanceof String strValue)
-		{
-			newExpression += '"' + StringUtil.escapeStringCharacters(strValue) + '"';
-		}
-		else
-		{
-			newExpression += String.valueOf(constantValue);
-		}
-		JSElementFactory.replaceExpression(expression, newExpression);
-	}
-
-	@RequiredReadAction
-	private static String getLeftSideText(JSBinaryExpression binaryExpression)
-	{
-		return binaryExpression.getLOperand().getText() +
-				BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign());
-	}
-
-	/**
-	 * Returns the smallest subexpression (if precendence allows it). For instance:
-	 * variable + 2 + 3 normally gets evaluated left to right -> (variable + 2)
-	 * + 3 this method returns the right most legal subexpression -> 2 + 3
-	 *
-	 * @param expression the expression to analyse
-	 * @return the found common sub-expression if found, or <tt>null</tt> otherwise.
-	 */
-	@Nullable
-	@RequiredReadAction
-	private static JSBinaryExpression getSubexpression(JSBinaryExpression expression)
-	{
-		final JSExpression rhs = expression.getROperand();
-		final IElementType sign = expression.getOperationSign();
-		final int parentPrecendence = ParenthesesUtils.getPrecendence(expression);
-
-		if (rhs == null)
-		{
-			return null;
-		}
-
-		final JSExpression lhs = expression.getLOperand();
-
-		if (!(lhs instanceof JSBinaryExpression))
-		{
-			return expression;
-		}
-
-		final JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression) lhs;
-		final int childPrecendence = ParenthesesUtils.getPrecendence(lhsBinaryExpression);
-		final JSExpression leftSide = lhsBinaryExpression.getROperand();
-
-		if (leftSide == null || parentPrecendence > childPrecendence)
-		{
-      return null;
-		}
-
-		try
-		{
-			final String subExpressionText = leftSide.getText() + BinaryOperatorUtils.getOperatorText(sign) + rhs.getText();
-			return (JSBinaryExpression) JSChangeUtil.createExpressionFromText(expression.getProject(), subExpressionText);
-		}
-		catch (Throwable ignore)
-		{
-			return null;
-		}
-	}
-
-	private static class ConstantSubexpressionPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSElement || element.getPrevSibling() instanceof JSElement))
-			{
-				return false;
-			}
-
-			PsiElement parent = element.getParent();
-
-			if(!(parent instanceof JSBinaryExpression))
-			{
-				if (element instanceof JSBinaryExpression binaryExpression && binaryExpression.getLOperand() instanceof JSBinaryExpression)
-				{
-					parent = element;
-				}
-				else
-				{
-					return false;
-				}
-			}
-			final JSBinaryExpression binaryExpression = (JSBinaryExpression) parent;
-
-			final JSBinaryExpression subexpression = getSubexpression(binaryExpression);
-			if (subexpression == null)
-			{
-				return false;
-			}
-			if (binaryExpression.equals(subexpression) && !isPartOfConstantExpression(binaryExpression))
-			{
-				// handled by JSConstantExpressionIntention
-				return false;
-			}
-			return ExpressionUtil.isConstantExpression(subexpression)
-				&& ExpressionUtil.computeConstantExpression(subexpression) != null;
-		}
-
-		private static boolean isPartOfConstantExpression(JSBinaryExpression binaryExpression)
-		{
-			final PsiElement containingElement = binaryExpression.getParent();
-
-			return containingElement instanceof JSExpression expression && ExpressionUtil.isConstantExpression(expression);
-		}
-	}
+public class JSConstantSubexpressionIntention extends JSMutablyNamedIntention {
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new ConstantSubexpressionPredicate();
+    }
+
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.constantComputeSubexpression();
+    }
+
+    @Override
+    @RequiredReadAction
+    protected LocalizeValue getTextForElement(PsiElement element) {
+        final PsiElement parent = element.getParent();
+        final JSBinaryExpression binaryExpression = (JSBinaryExpression)(parent instanceof JSBinaryExpression ? parent : element);
+        final JSExpression lhs = binaryExpression.getLOperand();
+        final JSExpression leftSide = lhs instanceof JSBinaryExpression lhsBinaryExpression ? lhsBinaryExpression.getROperand() : lhs;
+        final IElementType operationSign = binaryExpression.getOperationSign();
+        final JSExpression rhs = binaryExpression.getROperand();
+
+        assert (rhs != null);
+        assert (leftSide != null);
+
+        return JSIntentionLocalize.constantComputeSubexpressionMessage(
+            leftSide.getText(),
+            BinaryOperatorUtils.getOperatorText(operationSign),
+            rhs.getText()
+        );
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiElement parent = element.getParent();
+        final JSExpression expression = (JSExpression)(parent instanceof JSBinaryExpression ? parent : element);
+        String newExpression = "";
+        final Object constantValue;
+
+        if (expression instanceof JSBinaryExpression) {
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
+            final JSExpression lhs = binaryExpression.getLOperand();
+
+            if (lhs instanceof JSBinaryExpression lhsBinaryExpression) {
+                final JSExpression rightSide = lhsBinaryExpression.getROperand();
+
+                newExpression += getLeftSideText(lhsBinaryExpression);
+
+                assert (rightSide != null);
+            }
+            constantValue = ExpressionUtil.computeConstantExpression(getSubexpression(binaryExpression));
+        }
+        else {
+            constantValue = ExpressionUtil.computeConstantExpression(expression);
+        }
+
+        newExpression += constantValue instanceof String strValue
+            ? '"' + StringUtil.escapeStringCharacters(strValue) + '"'
+            : String.valueOf(constantValue);
+        JSElementFactory.replaceExpression(expression, newExpression);
+    }
+
+    @RequiredReadAction
+    private static String getLeftSideText(JSBinaryExpression binaryExpression) {
+        return binaryExpression.getLOperand().getText() +
+            BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign());
+    }
+
+    /**
+     * Returns the smallest subexpression (if precendence allows it). For instance:
+     * variable + 2 + 3 normally gets evaluated left to right -> (variable + 2)
+     * + 3 this method returns the right most legal subexpression -> 2 + 3
+     *
+     * @param expression the expression to analyse
+     * @return the found common sub-expression if found, or <tt>null</tt> otherwise.
+     */
+    @Nullable
+    @RequiredReadAction
+    private static JSBinaryExpression getSubexpression(JSBinaryExpression expression) {
+        final JSExpression rhs = expression.getROperand();
+        final IElementType sign = expression.getOperationSign();
+        final int parentPrecendence = ParenthesesUtils.getPrecendence(expression);
+
+        if (rhs == null) {
+            return null;
+        }
+
+        final JSExpression lhs = expression.getLOperand();
+
+        if (!(lhs instanceof JSBinaryExpression)) {
+            return expression;
+        }
+
+        final JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression)lhs;
+        final int childPrecendence = ParenthesesUtils.getPrecendence(lhsBinaryExpression);
+        final JSExpression leftSide = lhsBinaryExpression.getROperand();
+
+        if (leftSide == null || parentPrecendence > childPrecendence) {
+            return null;
+        }
+
+        try {
+            final String subExpressionText = leftSide.getText() + BinaryOperatorUtils.getOperatorText(sign) + rhs.getText();
+            return (JSBinaryExpression)JSChangeUtil.createExpressionFromText(expression.getProject(), subExpressionText);
+        }
+        catch (Throwable ignore) {
+            return null;
+        }
+    }
+
+    private static class ConstantSubexpressionPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSElement || element.getPrevSibling() instanceof JSElement)) {
+                return false;
+            }
+
+            PsiElement parent = element.getParent();
+
+            if (!(parent instanceof JSBinaryExpression)) {
+                if (element instanceof JSBinaryExpression binaryExpression
+                    && binaryExpression.getLOperand() instanceof JSBinaryExpression) {
+                    parent = element;
+                }
+                else {
+                    return false;
+                }
+            }
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression)parent;
+
+            final JSBinaryExpression subexpression = getSubexpression(binaryExpression);
+            if (subexpression == null) {
+                return false;
+            }
+            if (binaryExpression.equals(subexpression) && !isPartOfConstantExpression(binaryExpression)) {
+                // handled by JSConstantExpressionIntention
+                return false;
+            }
+            return ExpressionUtil.isConstantExpression(subexpression)
+                && ExpressionUtil.computeConstantExpression(subexpression) != null;
+        }
+
+        private static boolean isPartOfConstantExpression(JSBinaryExpression binaryExpression) {
+            final PsiElement containingElement = binaryExpression.getParent();
+
+            return containingElement instanceof JSExpression expression && ExpressionUtil.isConstantExpression(expression);
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index 13d4a36f..bfbdf265 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -31,83 +31,72 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSExtractIncrementIntention",
-	categories = {"JavaScript", "Other"},
-	fileExtensions = "js"
+    ignoreId = "JSExtractIncrementIntention",
+    categories = {"JavaScript", "Other"},
+    fileExtensions = "js"
 )
-public class JSExtractIncrementIntention extends JSMutablyNamedIntention
-{
-	@Override
-	@Nonnull
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.incrementExtract();
-	}
+public class JSExtractIncrementIntention extends JSMutablyNamedIntention {
+    @Override
+    @Nonnull
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.incrementExtract();
+    }
 
-	@Override
-	@RequiredReadAction
-	public LocalizeValue getTextForElement(PsiElement element)
-	{
-		return JSIntentionLocalize.incrementExtractMessage(BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
-	}
+    @Override
+    @RequiredReadAction
+    public LocalizeValue getTextForElement(PsiElement element) {
+        return JSIntentionLocalize.incrementExtractMessage(BinaryOperatorUtils.getOperatorText(getOperationSign(element)));
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ExtractIncrementPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ExtractIncrementPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final boolean isPostfix = (element instanceof JSPostfixExpression);
-		final JSExpression operand = isPostfix
-			? ((JSPostfixExpression) element).getExpression()
-			: ((JSPrefixExpression) element).getExpression();
-		final JSStatement statement = TreeUtil.getParentOfType(element, JSStatement.class);
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final boolean isPostfix = (element instanceof JSPostfixExpression);
+        final JSExpression operand = isPostfix
+            ? ((JSPostfixExpression)element).getExpression()
+            : ((JSPrefixExpression)element).getExpression();
+        final JSStatement statement = TreeUtil.getParentOfType(element, JSStatement.class);
 
-		assert (statement != null);
+        assert (statement != null);
 
-		if (isPostfix)
-		{
-			JSElementFactory.addStatementAfter(statement, element.getText() + ';');
-		}
-		else
-		{
-			JSElementFactory.addStatementBefore(statement, element.getText() + ';');
-		}
-		JSElementFactory.replaceExpression((JSExpression) element, operand.getText());
-	}
+        if (isPostfix) {
+            JSElementFactory.addStatementAfter(statement, element.getText() + ';');
+        }
+        else {
+            JSElementFactory.addStatementBefore(statement, element.getText() + ';');
+        }
+        JSElementFactory.replaceExpression((JSExpression)element, operand.getText());
+    }
 
-	@RequiredReadAction
-	private static IElementType getOperationSign(PsiElement element)
-	{
-		return element instanceof JSPostfixExpression postfixExpression
-				? postfixExpression.getOperationSign()
-				: ((JSPrefixExpression) element).getOperationSign();
-	}
+    @RequiredReadAction
+    private static IElementType getOperationSign(PsiElement element) {
+        return element instanceof JSPostfixExpression postfixExpression
+            ? postfixExpression.getOperationSign()
+            : ((JSPrefixExpression)element).getOperationSign();
+    }
 
-	private static class ExtractIncrementPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!ExpressionUtil.isIncrementDecrementExpression(element)
-				|| ErrorUtil.containsError(element)
-				|| element.getParent() instanceof JSExpressionStatement) {
-        return false;
-			}
+    private static class ExtractIncrementPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!ExpressionUtil.isIncrementDecrementExpression(element)
+                || ErrorUtil.containsError(element)
+                || element.getParent() instanceof JSExpressionStatement) {
+                return false;
+            }
 
-			final JSStatement containingStatement = TreeUtil.getParentOfType(element, JSStatement.class);
+            final JSStatement containingStatement = TreeUtil.getParentOfType(element, JSStatement.class);
 
             if (element instanceof JSPostfixExpression
-				&& (containingStatement instanceof JSReturnStatement || containingStatement instanceof JSThrowStatement))
-			{
-				return false;
-			}
-			return (containingStatement != null);
-		}
-	}
+                && (containingStatement instanceof JSReturnStatement || containingStatement instanceof JSThrowStatement)) {
+                return false;
+            }
+            return (containingStatement != null);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 5e289fb7..25f8a8a1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -33,104 +33,90 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSMergeDeclarationAndInitializationIntention",
-	categories = {"JavaScript", "Declaration"},
-	fileExtensions = "js"
+    ignoreId = "JSMergeDeclarationAndInitializationIntention",
+    categories = {"JavaScript", "Declaration"},
+    fileExtensions = "js"
 )
-public class JSMergeDeclarationAndInitializationIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.initializationMergeDeclarationAndInitialization().get();
-	}
+public class JSMergeDeclarationAndInitializationIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.initializationMergeDeclarationAndInitialization().get();
+    }
 
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new Predicate();
-	}
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new Predicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		assert (element instanceof JSVarStatement);
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        assert (element instanceof JSVarStatement);
 
-		final JSVarStatement varStatement = (JSVarStatement) element;
-		StringBuilder declarationBuffer = new StringBuilder();
+        final JSVarStatement varStatement = (JSVarStatement)element;
+        StringBuilder declarationBuffer = new StringBuilder();
 
-		for (final JSVariable variable : varStatement.getVariables())
-		{
-			if (variable.hasInitializer())
-			{
-				declarationBuffer.append(declarationBuffer.isEmpty() ? "var " : ", ")
-					.append(variable.getName()).append(" = ").append(variable.getInitializer().getText());
-			}
-			else
-			{
-				final Iterator<PsiElement> referenceIterator =
-					FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
-				final JSReferenceExpression firstReference = (JSReferenceExpression) (referenceIterator.hasNext() ? referenceIterator.next() : null);
-				//final JSReferenceExpression firstReference = FindReferenceUtil.findFirstReference(variable);
+        for (final JSVariable variable : varStatement.getVariables()) {
+            if (variable.hasInitializer()) {
+                declarationBuffer.append(declarationBuffer.isEmpty() ? "var " : ", ")
+                    .append(variable.getName()).append(" = ").append(variable.getInitializer().getText());
+            }
+            else {
+                final Iterator<PsiElement> referenceIterator =
+                    FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
+                final JSReferenceExpression firstReference =
+                    (JSReferenceExpression)(referenceIterator.hasNext() ? referenceIterator.next() : null);
+                //final JSReferenceExpression firstReference = FindReferenceUtil.findFirstReference(variable);
 
-				if (firstReference != null && firstReference.getParent() instanceof JSDefinitionExpression definitionExpression)
-				{
-					final JSExpressionStatement assignmentStatement = (JSExpressionStatement) definitionExpression.getParent().getParent();
+                if (firstReference != null && firstReference.getParent() instanceof JSDefinitionExpression definitionExpression) {
+                    final JSExpressionStatement assignmentStatement = (JSExpressionStatement)definitionExpression.getParent().getParent();
 
-					// Replace assignment statement by var statement.
-					JSElementFactory.replaceStatement(assignmentStatement, "var " + assignmentStatement.getText());
-				}
-				else
-				{
-					declarationBuffer.append((declarationBuffer.length() == 0) ? "var " : ", ")
-							.append(variable.getName());
-				}
-			}
-		}
+                    // Replace assignment statement by var statement.
+                    JSElementFactory.replaceStatement(assignmentStatement, "var " + assignmentStatement.getText());
+                }
+                else {
+                    declarationBuffer.append((declarationBuffer.length() == 0) ? "var " : ", ")
+                        .append(variable.getName());
+                }
+            }
+        }
 
-		// Do replacement.
-		if (declarationBuffer.length() == 0)
-		{
-			JSElementFactory.removeElement(varStatement);
-		}
-		else
-		{
-			declarationBuffer.append(';');
-			JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
-		}
-	}
+        // Do replacement.
+        if (declarationBuffer.length() == 0) {
+            JSElementFactory.removeElement(varStatement);
+        }
+        else {
+            declarationBuffer.append(';');
+            JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
+        }
+    }
 
-	private static class Predicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (element instanceof JSVarStatement varStatement && !ErrorUtil.containsError(varStatement))
-			{
-				for (JSVariable variable : varStatement.getVariables())
-				{
-					if (variable.hasInitializer()) {
-						continue;
-					}
+    private static class Predicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (element instanceof JSVarStatement varStatement && !ErrorUtil.containsError(varStatement)) {
+                for (JSVariable variable : varStatement.getVariables()) {
+                    if (variable.hasInitializer()) {
+                        continue;
+                    }
 
-					final Iterator<PsiElement> referenceIterator =
-						FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
-					final JSReferenceExpression firstReference =
-						(JSReferenceExpression)(referenceIterator.hasNext() ? referenceIterator.next() : null);
+                    final Iterator<PsiElement> referenceIterator =
+                        FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
+                    final JSReferenceExpression firstReference =
+                        (JSReferenceExpression)(referenceIterator.hasNext() ? referenceIterator.next() : null);
 
-					if (firstReference != null
-						&& firstReference.getParent() instanceof JSDefinitionExpression definitionExpression
-						&& definitionExpression.getParent() instanceof JSAssignmentExpression assignmentExpression
-						&& assignmentExpression.getParent() instanceof JSExpressionStatement) {
-						return true;
-					}
-				}
-			}
-			return false;
-		}
-	}
+                    if (firstReference != null
+                        && firstReference.getParent() instanceof JSDefinitionExpression definitionExpression
+                        && definitionExpression.getParent() instanceof JSAssignmentExpression assignmentExpression
+                        && assignmentExpression.getParent() instanceof JSExpressionStatement) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index ba22fd5a..510ab000 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -38,101 +38,86 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSSplitDeclarationAndInitializationIntention",
-	categories = {"JavaScript", "Declaration"},
-	fileExtensions = "js"
+    ignoreId = "JSSplitDeclarationAndInitializationIntention",
+    categories = {"JavaScript", "Declaration"},
+    fileExtensions = "js"
 )
-public class JSSplitDeclarationAndInitializationIntention extends JSIntention
-{
-	@NonNls
-	private static final String VAR_KEYWORD = "var ";
-
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.initializationSplitDeclarationAndInitialization().get();
-	}
-
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new Predicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		assert (element instanceof JSVarStatement);
-
-		final JSVarStatement varStatement = (JSVarStatement) element;
-		StringBuilder declarationBuffer = new StringBuilder();
-		List<String> initializations = new ArrayList<>();
-
-		for (JSVariable variable : varStatement.getVariables())
-		{
-			declarationBuffer.append(declarationBuffer.isEmpty() ? VAR_KEYWORD : ",")
-					.append(variable.getName());
-
-			String s = JSPsiImplUtils.getTypeFromDeclaration(variable);
-			final PsiFile containingFile = element.getContainingFile();
-
-			if (s == null && containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-			{
-				s = JSResolveUtil.getExpressionType(variable.getInitializer(), containingFile);
-			}
-
-			if (s != null)
-			{
-				declarationBuffer.append(":").append(s);
-			}
-			if (variable.hasInitializer())
-			{
-				initializations.add(variable.getName() + '=' + variable.getInitializer().getText() + ';');
-			}
-		}
-		declarationBuffer.append(';');
-
-		// Do replacement.
-		JSStatement newStatement = JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
-
-		for (final String initialization : initializations)
-		{
-			newStatement = JSElementFactory.addStatementAfter(newStatement, initialization);
-		}
-	}
-
-	private static class Predicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			PsiElement elementParent;
-
-			if (!(element instanceof JSVarStatement)
-				|| (elementParent = element.getParent()) instanceof JSForStatement ||
-					elementParent instanceof JSClass
-			)
-			{
-				return false;
-			}
-
-			final JSVarStatement varStatement = (JSVarStatement) element;
-			if (ErrorUtil.containsError(varStatement))
-			{
-				return false;
-			}
-
-			for (JSVariable variable : varStatement.getVariables())
-			{
-				if (variable.hasInitializer())
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-	}
+public class JSSplitDeclarationAndInitializationIntention extends JSIntention {
+    @NonNls
+    private static final String VAR_KEYWORD = "var ";
+
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.initializationSplitDeclarationAndInitialization().get();
+    }
+
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new Predicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        assert (element instanceof JSVarStatement);
+
+        final JSVarStatement varStatement = (JSVarStatement)element;
+        StringBuilder declarationBuffer = new StringBuilder();
+        List<String> initializations = new ArrayList<>();
+
+        for (JSVariable variable : varStatement.getVariables()) {
+            declarationBuffer.append(declarationBuffer.isEmpty() ? VAR_KEYWORD : ",")
+                .append(variable.getName());
+
+            String s = JSPsiImplUtils.getTypeFromDeclaration(variable);
+            final PsiFile containingFile = element.getContainingFile();
+
+            if (s == null && containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+                s = JSResolveUtil.getExpressionType(variable.getInitializer(), containingFile);
+            }
+
+            if (s != null) {
+                declarationBuffer.append(":").append(s);
+            }
+            if (variable.hasInitializer()) {
+                initializations.add(variable.getName() + '=' + variable.getInitializer().getText() + ';');
+            }
+        }
+        declarationBuffer.append(';');
+
+        // Do replacement.
+        JSStatement newStatement = JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
+
+        for (final String initialization : initializations) {
+            newStatement = JSElementFactory.addStatementAfter(newStatement, initialization);
+        }
+    }
+
+    private static class Predicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            PsiElement elementParent;
+
+            if (!(element instanceof JSVarStatement)
+                || (elementParent = element.getParent()) instanceof JSForStatement ||
+                elementParent instanceof JSClass
+            ) {
+                return false;
+            }
+
+            final JSVarStatement varStatement = (JSVarStatement)element;
+            if (ErrorUtil.containsError(varStatement)) {
+                return false;
+            }
+
+            for (JSVariable variable : varStatement.getVariables()) {
+                if (variable.hasInitializer()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index f9b0f767..ba5e9cb4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -37,154 +37,135 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSMergeParallelForInLoopsIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSMergeParallelForInLoopsIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSMergeParallelForInLoopsIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.loopMergeParallelForInLoops().get();
-	}
-
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new MergeParallelForInLoopsPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
-
-		assert (nextElement != null);
-
-		final JSForInStatement firstStatement = (JSForInStatement) element;
-		final JSForInStatement secondStatement = (JSForInStatement) nextElement;
-		final StringBuilder statementBuffer = new StringBuilder();
-
-		this.mergeForInStatements(statementBuffer, firstStatement, secondStatement);
-		JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
-		JSElementFactory.removeElement(secondStatement);
-	}
-
-	@RequiredReadAction
-	private void mergeForInStatements(StringBuilder statementBuffer, JSForInStatement firstStatement, JSForInStatement secondStatement)
-	{
-		final JSExpression variableExpression = getVariableExpression(firstStatement);
-		final JSVarStatement declaration = firstStatement.getDeclarationStatement();
-		final JSExpression collectionExpression = getCollectionExpression(firstStatement);
-		final JSStatement firstBody = firstStatement.getBody();
-		final JSStatement secondBody = secondStatement.getBody();
-
-		statementBuffer.append("for (")
-			.append((declaration == null) ? variableExpression.getText() : declaration.getText())
-			.append(" in ")
-			.append(collectionExpression.getText())
-			.append(')');
-		ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
-	}
-
-	private static class MergeParallelForInLoopsPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSForInStatement forInStatement
-				&& !ErrorUtil.containsError(element)
-				&& JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSForInStatement nextForInStatement
-				&& !ErrorUtil.containsError(nextForInStatement)
-				&& forInStatementsCanBeMerged(forInStatement, nextForInStatement);
-		}
-
-		public static boolean forInStatementsCanBeMerged(JSForInStatement statement1, JSForInStatement statement2)
-		{
-			final JSExpression firstVarExpression = getVariableExpression(statement1);
-			final JSExpression secondVarExpression = getVariableExpression(statement2);
-			if (!EquivalenceChecker.expressionsAreEquivalent(firstVarExpression, secondVarExpression))
-			{
-				return false;
-			}
-
-			final JSVarStatement firstDeclaration = statement1.getDeclarationStatement();
-			final JSVarStatement secondDeclaration = statement2.getDeclarationStatement();
-			if (!EquivalenceChecker.statementsAreEquivalent(firstDeclaration, secondDeclaration))
-			{
-				return false;
-			}
-
-			final JSExpression firstCollection = getCollectionExpression(statement1);
-			final JSExpression secondCollection = getCollectionExpression(statement2);
-			if (!EquivalenceChecker.expressionsAreEquivalent(firstCollection, secondCollection))
-			{
-				return false;
-			}
-
-			final JSStatement firstBody = statement1.getBody();
-			final JSStatement secondBody = statement2.getBody();
-			return firstBody == null || secondBody == null || ControlFlowUtils.canBeMerged(firstBody, secondBody);
-		}
-	}
-
-	/**
-	 * Method provided as a workaround of a bug in the JavaScript language IDEA plugin.
-	 *
-	 * @param forInStatement the for-in statement
-	 * @return the for-in statement collection expression
-	 */
-	private static JSExpression getCollectionExpression(JSForInStatement forInStatement)
-	{
-		final ASTNode statementNode = forInStatement.getNode();
-		ASTNode child = (statementNode == null) ? null : statementNode.getFirstChildNode();
-		boolean inPassed = false;
-
-		while (child != null)
-		{
-			if (child.getElementType() == JSTokenTypes.IN_KEYWORD)
-			{
-				inPassed = true;
-			}
-			if (inPassed && child.getPsi() instanceof JSExpression childExpression)
-			{
-				return childExpression;
-			}
-			child = child.getTreeNext();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Method provided as a workaround of a bug in the JavaScript language IDEA plugin.
-	 *
-	 * @param forInStatement the for-in statement
-	 * @return the for-in statement collection expression
-	 */
-	private static JSExpression getVariableExpression(JSForInStatement forInStatement)
-	{
-		final ASTNode statementNode = forInStatement.getNode();
-		ASTNode child = (statementNode == null) ? null : statementNode.getFirstChildNode();
-
-		while (child != null)
-		{
-			if (child.getElementType() == JSTokenTypes.IN_KEYWORD)
-			{
-				return null;
-			}
-
-			if (child.getPsi() instanceof JSExpression childExpression)
-			{
-				return childExpression;
-			}
-			child = child.getTreeNext();
-		}
-
-		return null;
-	}
+public class JSMergeParallelForInLoopsIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.loopMergeParallelForInLoops().get();
+    }
+
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new MergeParallelForInLoopsPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+
+        assert (nextElement != null);
+
+        final JSForInStatement firstStatement = (JSForInStatement)element;
+        final JSForInStatement secondStatement = (JSForInStatement)nextElement;
+        final StringBuilder statementBuffer = new StringBuilder();
+
+        this.mergeForInStatements(statementBuffer, firstStatement, secondStatement);
+        JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
+        JSElementFactory.removeElement(secondStatement);
+    }
+
+    @RequiredReadAction
+    private void mergeForInStatements(StringBuilder statementBuffer, JSForInStatement firstStatement, JSForInStatement secondStatement) {
+        final JSExpression variableExpression = getVariableExpression(firstStatement);
+        final JSVarStatement declaration = firstStatement.getDeclarationStatement();
+        final JSExpression collectionExpression = getCollectionExpression(firstStatement);
+        final JSStatement firstBody = firstStatement.getBody();
+        final JSStatement secondBody = secondStatement.getBody();
+
+        statementBuffer.append("for (")
+            .append((declaration == null) ? variableExpression.getText() : declaration.getText())
+            .append(" in ")
+            .append(collectionExpression.getText())
+            .append(')');
+        ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
+    }
+
+    private static class MergeParallelForInLoopsPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSForInStatement forInStatement
+                && !ErrorUtil.containsError(element)
+                && JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSForInStatement nextForInStatement
+                && !ErrorUtil.containsError(nextForInStatement)
+                && forInStatementsCanBeMerged(forInStatement, nextForInStatement);
+        }
+
+        public static boolean forInStatementsCanBeMerged(JSForInStatement statement1, JSForInStatement statement2) {
+            final JSExpression firstVarExpression = getVariableExpression(statement1);
+            final JSExpression secondVarExpression = getVariableExpression(statement2);
+            if (!EquivalenceChecker.expressionsAreEquivalent(firstVarExpression, secondVarExpression)) {
+                return false;
+            }
+
+            final JSVarStatement firstDeclaration = statement1.getDeclarationStatement();
+            final JSVarStatement secondDeclaration = statement2.getDeclarationStatement();
+            if (!EquivalenceChecker.statementsAreEquivalent(firstDeclaration, secondDeclaration)) {
+                return false;
+            }
+
+            final JSExpression firstCollection = getCollectionExpression(statement1);
+            final JSExpression secondCollection = getCollectionExpression(statement2);
+            if (!EquivalenceChecker.expressionsAreEquivalent(firstCollection, secondCollection)) {
+                return false;
+            }
+
+            final JSStatement firstBody = statement1.getBody();
+            final JSStatement secondBody = statement2.getBody();
+            return firstBody == null || secondBody == null || ControlFlowUtils.canBeMerged(firstBody, secondBody);
+        }
+    }
+
+    /**
+     * Method provided as a workaround of a bug in the JavaScript language IDEA plugin.
+     *
+     * @param forInStatement the for-in statement
+     * @return the for-in statement collection expression
+     */
+    private static JSExpression getCollectionExpression(JSForInStatement forInStatement) {
+        final ASTNode statementNode = forInStatement.getNode();
+        ASTNode child = (statementNode == null) ? null : statementNode.getFirstChildNode();
+        boolean inPassed = false;
+
+        while (child != null) {
+            if (child.getElementType() == JSTokenTypes.IN_KEYWORD) {
+                inPassed = true;
+            }
+            if (inPassed && child.getPsi() instanceof JSExpression childExpression) {
+                return childExpression;
+            }
+            child = child.getTreeNext();
+        }
+
+        return null;
+    }
+
+    /**
+     * Method provided as a workaround of a bug in the JavaScript language IDEA plugin.
+     *
+     * @param forInStatement the for-in statement
+     * @return the for-in statement collection expression
+     */
+    private static JSExpression getVariableExpression(JSForInStatement forInStatement) {
+        final ASTNode statementNode = forInStatement.getNode();
+        ASTNode child = (statementNode == null) ? null : statementNode.getFirstChildNode();
+
+        while (child != null) {
+            if (child.getElementType() == JSTokenTypes.IN_KEYWORD) {
+                return null;
+            }
+
+            if (child.getPsi() instanceof JSExpression childExpression) {
+                return childExpression;
+            }
+            child = child.getTreeNext();
+        }
+
+        return null;
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 6436814a..d3711b24 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -35,108 +35,96 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSMergeParallelForLoopsIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSMergeParallelForLoopsIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSMergeParallelForLoopsIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.loopMergeParallelForLoops().get();
-	}
+public class JSMergeParallelForLoopsIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.loopMergeParallelForLoops().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new MergeParallelForLoopsPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new MergeParallelForLoopsPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
-		assert (nextElement != null);
+        assert (nextElement != null);
 
-		final JSForStatement firstStatement = (JSForStatement) element;
-		final JSForStatement secondStatement = (JSForStatement) nextElement;
-		final StringBuilder statementBuffer = new StringBuilder();
+        final JSForStatement firstStatement = (JSForStatement)element;
+        final JSForStatement secondStatement = (JSForStatement)nextElement;
+        final StringBuilder statementBuffer = new StringBuilder();
 
-		this.mergeForStatements(statementBuffer, firstStatement, secondStatement);
-		JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
-		JSElementFactory.removeElement(secondStatement);
-	}
+        this.mergeForStatements(statementBuffer, firstStatement, secondStatement);
+        JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
+        JSElementFactory.removeElement(secondStatement);
+    }
 
-	@RequiredReadAction
-	private void mergeForStatements(StringBuilder statementBuffer, JSForStatement firstStatement, JSForStatement secondStatement)
-	{
-		final JSExpression initialization = firstStatement.getInitialization();
-		final JSVarStatement varStatement = firstStatement.getVarDeclaration();
-		final JSExpression condition = firstStatement.getCondition();
-		final JSExpression update = firstStatement.getUpdate();
-		final JSStatement firstBody = firstStatement.getBody();
-		final JSStatement secondBody = secondStatement.getBody();
+    @RequiredReadAction
+    private void mergeForStatements(StringBuilder statementBuffer, JSForStatement firstStatement, JSForStatement secondStatement) {
+        final JSExpression initialization = firstStatement.getInitialization();
+        final JSVarStatement varStatement = firstStatement.getVarDeclaration();
+        final JSExpression condition = firstStatement.getCondition();
+        final JSExpression update = firstStatement.getUpdate();
+        final JSStatement firstBody = firstStatement.getBody();
+        final JSStatement secondBody = secondStatement.getBody();
 
-		statementBuffer.append("for (")
-			.append((initialization == null) ? varStatement.getText() : initialization.getText())
-			.append(';')
-			.append(condition.getText())
-			.append(';')
-			.append(update.getText())
-			.append(')');
-		ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
-	}
+        statementBuffer.append("for (")
+            .append((initialization == null) ? varStatement.getText() : initialization.getText())
+            .append(';')
+            .append(condition.getText())
+            .append(';')
+            .append(update.getText())
+            .append(')');
+        ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstBody, secondBody);
+    }
 
-	private static class MergeParallelForLoopsPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSForStatement forStatement
-				&& !ErrorUtil.containsError(forStatement)
-				&& JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSForStatement nextForStatement
-				&& !ErrorUtil.containsError(nextForStatement)
-				&& forStatementsCanBeMerged(forStatement, nextForStatement);
-		}
+    private static class MergeParallelForLoopsPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSForStatement forStatement
+                && !ErrorUtil.containsError(forStatement)
+                && JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSForStatement nextForStatement
+                && !ErrorUtil.containsError(nextForStatement)
+                && forStatementsCanBeMerged(forStatement, nextForStatement);
+        }
 
-		public static boolean forStatementsCanBeMerged(JSForStatement statement1, JSForStatement statement2)
-		{
-			final JSExpression firstInitialization = statement1.getInitialization();
-			final JSExpression secondInitialization = statement2.getInitialization();
-			if (!EquivalenceChecker.expressionsAreEquivalent(firstInitialization, secondInitialization))
-			{
-				return false;
-			}
+        public static boolean forStatementsCanBeMerged(JSForStatement statement1, JSForStatement statement2) {
+            final JSExpression firstInitialization = statement1.getInitialization();
+            final JSExpression secondInitialization = statement2.getInitialization();
+            if (!EquivalenceChecker.expressionsAreEquivalent(firstInitialization, secondInitialization)) {
+                return false;
+            }
 
-			final JSVarStatement firstVarStatement = statement1.getVarDeclaration();
-			final JSVarStatement secondVarStatement = statement2.getVarDeclaration();
-			if (!EquivalenceChecker.statementsAreEquivalent(firstVarStatement, secondVarStatement))
-			{
-				return false;
-			}
+            final JSVarStatement firstVarStatement = statement1.getVarDeclaration();
+            final JSVarStatement secondVarStatement = statement2.getVarDeclaration();
+            if (!EquivalenceChecker.statementsAreEquivalent(firstVarStatement, secondVarStatement)) {
+                return false;
+            }
 
-			final JSExpression firstCondition = statement1.getCondition();
-			final JSExpression secondCondition = statement2.getCondition();
-			if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition, secondCondition))
-			{
-				return false;
-			}
+            final JSExpression firstCondition = statement1.getCondition();
+            final JSExpression secondCondition = statement2.getCondition();
+            if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition, secondCondition)) {
+                return false;
+            }
 
-			final JSExpression firstUpdate = statement1.getUpdate();
-			final JSExpression secondUpdate = statement2.getUpdate();
-			if (!EquivalenceChecker.expressionsAreEquivalent(firstUpdate, secondUpdate))
-			{
-				return false;
-			}
+            final JSExpression firstUpdate = statement1.getUpdate();
+            final JSExpression secondUpdate = statement2.getUpdate();
+            if (!EquivalenceChecker.expressionsAreEquivalent(firstUpdate, secondUpdate)) {
+                return false;
+            }
 
-			final JSStatement firstBody = statement1.getBody();
-			final JSStatement secondBody = statement2.getBody();
-			return (firstBody == null || secondBody == null || ControlFlowUtils.canBeMerged(firstBody, secondBody));
-		}
-	}
+            final JSStatement firstBody = statement1.getBody();
+            final JSStatement secondBody = statement2.getBody();
+            return (firstBody == null || secondBody == null || ControlFlowUtils.canBeMerged(firstBody, secondBody));
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index ec7b5edd..356b707b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -30,48 +30,41 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSConvertIntegerToDecimalIntention",
-	categories = {"JavaScript", "Numbers"},
-	fileExtensions = "js"
+    ignoreId = "JSConvertIntegerToDecimalIntention",
+    categories = {"JavaScript", "Numbers"},
+    fileExtensions = "js"
 )
-public class JSConvertIntegerToDecimalIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.numberConvertIntegerToDecimal().get();
-	}
+public class JSConvertIntegerToDecimalIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.numberConvertIntegerToDecimal().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ConvertIntegerToDecimalPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ConvertIntegerToDecimalPredicate();
+    }
 
-	@Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSLiteralExpression exp = (JSLiteralExpression) element;
+    @Override
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSLiteralExpression exp = (JSLiteralExpression)element;
 
-		JSElementFactory.replaceExpression(exp, NumberUtil.getLiteralNumber(exp).toString());
-	}
+        JSElementFactory.replaceExpression(exp, NumberUtil.getLiteralNumber(exp).toString());
+    }
 
-	private static class ConvertIntegerToDecimalPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSLiteralExpression))
-			{
-				return false;
-			}
+    private static class ConvertIntegerToDecimalPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSLiteralExpression)) {
+                return false;
+            }
 
-			final String elementText = element.getText();
+            final String elementText = element.getText();
 
-			return NumberUtil.isHex(elementText) || NumberUtil.isOctal(elementText);
-		}
-	}
+            return NumberUtil.isHex(elementText) || NumberUtil.isOctal(elementText);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index cd795521..d1648972 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -30,41 +30,35 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSConvertIntegerToHexIntention",
-	categories = {"JavaScript", "Numbers"},
-	fileExtensions = "js"
+    ignoreId = "JSConvertIntegerToHexIntention",
+    categories = {"JavaScript", "Numbers"},
+    fileExtensions = "js"
 )
-public class JSConvertIntegerToHexIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.numberConvertIntegerToHex().get();
-	}
+public class JSConvertIntegerToHexIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.numberConvertIntegerToHex().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ConvertIntegerToHexPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ConvertIntegerToHexPredicate();
+    }
 
-	@Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSLiteralExpression exp = (JSLiteralExpression) element;
+    @Override
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSLiteralExpression exp = (JSLiteralExpression)element;
 
-		JSElementFactory.replaceExpression(exp, "0x" + NumberUtil.getLiteralNumber(exp).toString(16));
-	}
+        JSElementFactory.replaceExpression(exp, "0x" + NumberUtil.getLiteralNumber(exp).toString(16));
+    }
 
-	private static class ConvertIntegerToHexPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSLiteralExpression && NumberUtil.isDecimal(element.getText());
-		}
-	}
+    private static class ConvertIntegerToHexPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSLiteralExpression && NumberUtil.isDecimal(element.getText());
+        }
+    }
 }

From b8c2bd3e5dc9fc386cef404d73b00f48cb607f8e Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 22 Jul 2024 11:50:10 +0300
Subject: [PATCH 210/340] Code reformat using IJ4 code style (part 2).

---
 .../javascript/intention/JSIntention.java     |  94 +-
 .../intention/JSMutablyNamedIntention.java    |  48 +-
 .../JSConvertIntegerToOctalIntention.java     |  67 +-
 .../JSReplaceMultiplyWithShiftIntention.java  | 250 +++--
 .../JSReplaceShiftWithMultiplyIntention.java  | 222 ++---
 .../intention/number/ShiftUtils.java          | 162 ++--
 ...eplaceWithOperatorAssignmentIntention.java | 148 ++-
 ...RemoveUnnecessaryParenthesesIntention.java | 116 +--
 ...JSDoubleToSingleQuotedStringIntention.java | 108 +--
 ...inConcatenatedStringLiteralsIntention.java | 115 +--
 ...JSSingleToDoubleQuotedStringIntention.java | 108 +--
 .../intention/string/StringUtil.java          |  50 +-
 .../intention/switchtoif/CaseUtil.java        | 405 ++++----
 .../JSReplaceIfWithSwitchIntention.java       | 818 +++++++---------
 .../JSReplaceSwitchWithIfIntention.java       | 913 ++++++++----------
 .../switchtoif/LabelSearchVisitor.java        |  39 +-
 .../switchtoif/LocalVariableUsageVisitor.java |  40 +-
 .../trivialif/JSMergeElseIfIntention.java     |  79 +-
 .../trivialif/JSMergeIfAndIntention.java      | 117 +--
 .../trivialif/JSMergeIfOrIntention.java       | 305 +++---
 .../JSMergeParallelIfsIntention.java          | 164 ++--
 .../JSRemoveRedundantElseIntention.java       | 110 +--
 .../JSReplaceIfWithConditionalIntention.java  | 498 +++++-----
 .../trivialif/JSSimplifyIfElseIntention.java  | 116 +--
 .../trivialif/JSSplitElseIfIntention.java     |  86 +-
 25 files changed, 2354 insertions(+), 2824 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index af5f9e0d..af999150 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -26,68 +26,62 @@
 import consulo.xml.psi.xml.XmlElement;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
 
 public abstract class JSIntention extends PsiElementBaseIntentionAction {
-  private static final String INTENTION_SUFFIX = "Intention";
-  private static final String DISPLAY_NAME = ".display-name";
-  private static final String PACKAGE_NAME = JSIntention.class.getPackage().getName();
+    private final JSElementPredicate predicate;
 
-  private final JSElementPredicate predicate;
-
-  protected JSIntention() {
-    this.predicate = this.getElementPredicate();
-  }
+    protected JSIntention() {
+        this.predicate = this.getElementPredicate();
+    }
 
-  @Override
-  public void invoke(@Nonnull Project project, Editor editor, @Nonnull PsiElement element) throws IncorrectOperationException {
-    PsiElement matchingElement = findMatchingElement(element);
-    if (matchingElement == null) {
-      return;
+    @Override
+    public void invoke(@Nonnull Project project, Editor editor, @Nonnull PsiElement element) throws IncorrectOperationException {
+        PsiElement matchingElement = findMatchingElement(element);
+        if (matchingElement == null) {
+            return;
+        }
+        processIntention(matchingElement);
     }
-    processIntention(matchingElement);
-  }
 
-  protected abstract void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException;
+    protected abstract void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException;
 
-  @Nonnull
-  protected abstract JSElementPredicate getElementPredicate();
+    @Nonnull
+    protected abstract JSElementPredicate getElementPredicate();
 
-  @Nullable
-  protected PsiElement findMatchingElement(@Nullable PsiElement element) {
-    if (element == null || element instanceof PsiFile) {
-      return null;
-    }
+    @Nullable
+    protected PsiElement findMatchingElement(@Nullable PsiElement element) {
+        if (element == null || element instanceof PsiFile) {
+            return null;
+        }
 
-    final Language language = element.getLanguage();
-    if (language != Language.ANY && language != JavaScriptLanguage.INSTANCE) {
-      return null;
-    }
+        final Language language = element.getLanguage();
+        if (language != Language.ANY && language != JavaScriptLanguage.INSTANCE) {
+            return null;
+        }
 
-    while (element != null) {
-      if (this.predicate.satisfiedBy(element)) {
-        return element;
-      }
-      element = element.getParent();
-      if (element instanceof PsiFile || element instanceof XmlElement) {
-        break;
-      }
+        while (element != null) {
+            if (this.predicate.satisfiedBy(element)) {
+                return element;
+            }
+            element = element.getParent();
+            if (element instanceof PsiFile || element instanceof XmlElement) {
+                break;
+            }
+        }
+        return null;
     }
-    return null;
-  }
 
+    @Override
+    public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement element) {
+        return element != null && findMatchingElement(element) != null;
+    }
 
-  @Override
-  public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement element) {
-    return element != null && findMatchingElement(element) != null;
-  }
-
-  @Override
-  public boolean startInWriteAction() {
-    return true;
-  }
+    @Override
+    public boolean startInWriteAction() {
+        return true;
+    }
 
-  @Override
-  @Nonnull
-  public abstract String getText();
+    @Override
+    @Nonnull
+    public abstract String getText();
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 6066e071..5ff58ac0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -19,38 +19,32 @@
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
-public abstract class JSMutablyNamedIntention extends JSIntention
-{
-	private String myText;
+public abstract class JSMutablyNamedIntention extends JSIntention {
+    private String myText;
 
-	protected abstract LocalizeValue getTextForElement(PsiElement element);
+    protected abstract LocalizeValue getTextForElement(PsiElement element);
 
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return myText != null ? myText : getBasicText().get();
-	}
+    @Override
+    @Nonnull
+    public String getText() {
+        return myText != null ? myText : getBasicText().get();
+    }
 
-	@Nonnull
-	protected abstract LocalizeValue getBasicText();
+    @Nonnull
+    protected abstract LocalizeValue getBasicText();
 
-	@Override
-	public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node)
-	{
-		final PsiElement element = findMatchingElement(node);
-		if (element != null)
-		{
-			myText = getTextForElement(element).get();
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
+    @Override
+    public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node) {
+        final PsiElement element = findMatchingElement(node);
+        if (element != null) {
+            myText = getTextForElement(element).get();
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index e64e0c98..29e25724 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -30,48 +30,41 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSConvertIntegerToOctalIntention",
-	categories = {"JavaScript", "Numbers"},
-	fileExtensions = "js"
+    ignoreId = "JSConvertIntegerToOctalIntention",
+    categories = {"JavaScript", "Numbers"},
+    fileExtensions = "js"
 )
-public class JSConvertIntegerToOctalIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.numberConvertIntegerToOctal().get();
-	}
+public class JSConvertIntegerToOctalIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.numberConvertIntegerToOctal().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ConvertIntegerToOctalPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ConvertIntegerToOctalPredicate();
+    }
 
-	@Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSLiteralExpression exp = (JSLiteralExpression) element;
+    @Override
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSLiteralExpression exp = (JSLiteralExpression)element;
 
-		JSElementFactory.replaceExpression(exp, '0' + NumberUtil.getLiteralNumber(exp).toString(8));
-	}
+        JSElementFactory.replaceExpression(exp, '0' + NumberUtil.getLiteralNumber(exp).toString(8));
+    }
 
-	private static class ConvertIntegerToOctalPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSLiteralExpression))
-			{
-				return false;
-			}
+    private static class ConvertIntegerToOctalPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSLiteralExpression)) {
+                return false;
+            }
 
-			final String elementText = element.getText();
+            final String elementText = element.getText();
 
-			return NumberUtil.isHex(elementText) || (NumberUtil.isDecimal(elementText) && !NumberUtil.isOctal(elementText));
-		}
-	}
+            return NumberUtil.isHex(elementText) || (NumberUtil.isDecimal(elementText) && !NumberUtil.isOctal(elementText));
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index 91d0be9e..556c7d8b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -34,139 +34,121 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSReplaceMultiplyWithShiftIntention",
-	categories = {"JavaScript", "Shift"},
-	fileExtensions = "js"
+    ignoreId = "JSReplaceMultiplyWithShiftIntention",
+    categories = {"JavaScript", "Shift"},
+    fileExtensions = "js"
 )
-public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention
-{
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.numberReplaceMultiplyWithShift();
-	}
-
-	@Override
-	@RequiredReadAction
-	protected LocalizeValue getTextForElement(PsiElement element)
-	{
-		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
-		final String operatorString;
-
-		if (element instanceof JSAssignmentExpression)
-		{
-			operatorString = tokenType.equals(JSTokenTypes.MULTEQ) ? "<<=" : ">>=";
-		}
-		else
-		{
-			operatorString = tokenType.equals(JSTokenTypes.MULT) ? "<<" : ">>";
-		}
-
-		return JSIntentionLocalize.numberReplaceMultiplyWithShiftMessage(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
-	}
-
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new MultiplyByPowerOfTwoPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		if (element instanceof JSAssignmentExpression assignmentExpression)
-		{
-			this.replaceMultiplyOrDivideAssignWithShiftAssign(assignmentExpression);
-		}
-		else
-		{
-			this.replaceMultiplyOrDivideWithShift((JSBinaryExpression) element);
-		}
-	}
-
-	@RequiredReadAction
-	private void replaceMultiplyOrDivideAssignWithShiftAssign(JSAssignmentExpression exp) throws IncorrectOperationException
-	{
-		final JSExpression lhs = exp.getLOperand();
-		final JSExpression rhs = exp.getROperand();
-		final IElementType tokenType = exp.getOperationSign();
-		final String assignString = JSTokenTypes.MULTEQ.equals(tokenType) ? "<<=" : ">>=";
-		final String expString = lhs.getText() + assignString + ShiftUtils.getLogBase2(rhs);
-
-		JSElementFactory.replaceExpression(exp, expString);
-	}
-
-	@RequiredReadAction
-	private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp) throws IncorrectOperationException
-	{
-		JSExpression lhs = exp.getLOperand();
-		JSExpression rhs = exp.getROperand();
-		final IElementType tokenType = exp.getOperationSign();
-		final String operatorString = JSTokenTypes.MULT.equals(tokenType) ? "<<" : ">>";
-
-		if (ShiftUtils.isPowerOfTwo(lhs) && JSTokenTypes.MULT.equals(tokenType))
-		{
-			JSExpression swap = lhs;
-
-			lhs = rhs;
-			rhs = swap;
-		}
-
-		final String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.SHIFT_PRECENDENCE);
-		String expString = lhsText + operatorString + ShiftUtils.getLogBase2(rhs);
-		final JSElement parent = (JSElement) exp.getParent();
-
-		if (parent != null && parent instanceof JSExpression parentExpression && !(parent instanceof JSParenthesizedExpression)
-			&& ParenthesesUtils.getPrecendence(parentExpression) < ParenthesesUtils.SHIFT_PRECENDENCE) {
-			expString = '(' + expString + ')';
-		}
-		JSElementFactory.replaceExpression(exp, expString);
-	}
-
-	private static class MultiplyByPowerOfTwoPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSAssignmentExpression assignmentExpression
-				? isMultiplyByPowerOfTwo(assignmentExpression)
-				: element instanceof JSBinaryExpression binaryExpression && isMultiplyByPowerOfTwo(binaryExpression);
-		}
-
-		@RequiredReadAction
-		private static boolean isMultiplyByPowerOfTwo(JSAssignmentExpression expression)
-		{
-			final IElementType operator = expression.getOperationSign();
-
-			if (operator == null || !(operator.equals(JSTokenTypes.MULTEQ) || operator.equals(JSTokenTypes.DIVEQ)))
-			{
-				return false;
-			}
-
-			final JSExpression rightExpression = expression.getROperand();
-
-			return rightExpression != null && ShiftUtils.isPowerOfTwo(rightExpression);
-		}
-
-		@RequiredReadAction
-		private static boolean isMultiplyByPowerOfTwo(JSBinaryExpression expression)
-		{
-			final IElementType operator = expression.getOperationSign();
-
-			if (operator == null || !(operator.equals(JSTokenTypes.MULT) || operator.equals(JSTokenTypes.DIV)))
-			{
-				return false;
-			}
-
-			final JSExpression leftOperand = expression.getLOperand();
-			final JSExpression rightOperand = expression.getROperand();
-
-			return leftOperand != null && rightOperand != null
-				&& (ShiftUtils.isPowerOfTwo(leftOperand) || ShiftUtils.isPowerOfTwo(rightOperand));
-		}
-	}
+public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention {
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.numberReplaceMultiplyWithShift();
+    }
+
+    @Override
+    @RequiredReadAction
+    protected LocalizeValue getTextForElement(PsiElement element) {
+        final IElementType tokenType = ((JSBinaryExpression)element).getOperationSign();
+        final String operatorString;
+
+        if (element instanceof JSAssignmentExpression) {
+            operatorString = JSTokenTypes.MULTEQ.equals(tokenType) ? "<<=" : ">>=";
+        }
+        else {
+            operatorString = JSTokenTypes.MULT.equals(tokenType) ? "<<" : ">>";
+        }
+
+        return JSIntentionLocalize.numberReplaceMultiplyWithShiftMessage(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
+    }
+
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new MultiplyByPowerOfTwoPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        if (element instanceof JSAssignmentExpression assignmentExpression) {
+            this.replaceMultiplyOrDivideAssignWithShiftAssign(assignmentExpression);
+        }
+        else {
+            this.replaceMultiplyOrDivideWithShift((JSBinaryExpression)element);
+        }
+    }
+
+    @RequiredReadAction
+    private void replaceMultiplyOrDivideAssignWithShiftAssign(JSAssignmentExpression exp) throws IncorrectOperationException {
+        final JSExpression lhs = exp.getLOperand();
+        final JSExpression rhs = exp.getROperand();
+        final IElementType tokenType = exp.getOperationSign();
+        final String assignString = JSTokenTypes.MULTEQ.equals(tokenType) ? "<<=" : ">>=";
+        final String expString = lhs.getText() + assignString + ShiftUtils.getLogBase2(rhs);
+
+        JSElementFactory.replaceExpression(exp, expString);
+    }
+
+    @RequiredReadAction
+    private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp) throws IncorrectOperationException {
+        JSExpression lhs = exp.getLOperand();
+        JSExpression rhs = exp.getROperand();
+        final IElementType tokenType = exp.getOperationSign();
+        final String operatorString = JSTokenTypes.MULT.equals(tokenType) ? "<<" : ">>";
+
+        if (ShiftUtils.isPowerOfTwo(lhs) && JSTokenTypes.MULT.equals(tokenType)) {
+            JSExpression swap = lhs;
+
+            lhs = rhs;
+            rhs = swap;
+        }
+
+        final String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.SHIFT_PRECENDENCE);
+        String expString = lhsText + operatorString + ShiftUtils.getLogBase2(rhs);
+        final JSElement parent = (JSElement)exp.getParent();
+
+        if (parent != null && parent instanceof JSExpression parentExpression && !(parent instanceof JSParenthesizedExpression)
+            && ParenthesesUtils.getPrecendence(parentExpression) < ParenthesesUtils.SHIFT_PRECENDENCE) {
+            expString = '(' + expString + ')';
+        }
+        JSElementFactory.replaceExpression(exp, expString);
+    }
+
+    private static class MultiplyByPowerOfTwoPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSAssignmentExpression assignmentExpression
+                ? isMultiplyByPowerOfTwo(assignmentExpression)
+                : element instanceof JSBinaryExpression binaryExpression && isMultiplyByPowerOfTwo(binaryExpression);
+        }
+
+        @RequiredReadAction
+        private static boolean isMultiplyByPowerOfTwo(JSAssignmentExpression expression) {
+            final IElementType operator = expression.getOperationSign();
+
+            if (operator == null || !(operator.equals(JSTokenTypes.MULTEQ) || operator.equals(JSTokenTypes.DIVEQ))) {
+                return false;
+            }
+
+            final JSExpression rightExpression = expression.getROperand();
+
+            return rightExpression != null && ShiftUtils.isPowerOfTwo(rightExpression);
+        }
+
+        @RequiredReadAction
+        private static boolean isMultiplyByPowerOfTwo(JSBinaryExpression expression) {
+            final IElementType operator = expression.getOperationSign();
+
+            if (operator == null || !(JSTokenTypes.MULT.equals(operator) || JSTokenTypes.DIV.equals(operator))) {
+                return false;
+            }
+
+            final JSExpression leftOperand = expression.getLOperand();
+            final JSExpression rightOperand = expression.getROperand();
+
+            return leftOperand != null && rightOperand != null
+                && (ShiftUtils.isPowerOfTwo(leftOperand) || ShiftUtils.isPowerOfTwo(rightOperand));
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index 5b9e4956..9e462d5a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -34,124 +34,108 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSReplaceShiftWithMultiplyIntention",
-	categories = {"JavaScript", "Shift"},
-	fileExtensions = "js"
+    ignoreId = "JSReplaceShiftWithMultiplyIntention",
+    categories = {"JavaScript", "Shift"},
+    fileExtensions = "js"
 )
-public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention
-{
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.numberReplaceShiftWithMultiply();
-	}
-
-	@Override
-	@RequiredReadAction
-	protected LocalizeValue getTextForElement(PsiElement element)
-	{
-		final IElementType tokenType = ((JSBinaryExpression) element).getOperationSign();
-		final String operatorString;
-
-		if (element instanceof JSAssignmentExpression)
-		{
-			operatorString = JSTokenTypes.LTLTEQ.equals(tokenType) ? "*=" : "/=";
-		}
-		else
-		{
-			operatorString = JSTokenTypes.LTLT.equals(tokenType) ? "*" : "/";
-		}
-
-		return JSIntentionLocalize.numberReplaceShiftWithMultiplyMessage(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
-	}
-
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ShiftByLiteralPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		if (element instanceof JSAssignmentExpression assignmentExpression)
-		{
-			this.replaceShiftAssignWithMultiplyOrDivideAssign(assignmentExpression);
-		}
-		else
-		{
-			assert (element instanceof JSBinaryExpression);
-			this.replaceShiftWithMultiplyOrDivide((JSBinaryExpression) element);
-		}
-	}
-
-	@RequiredReadAction
-	private void replaceShiftAssignWithMultiplyOrDivideAssign(JSAssignmentExpression exp) throws IncorrectOperationException
-	{
-		final JSExpression lhs = exp.getLOperand();
-		final JSExpression rhs = exp.getROperand();
-		final IElementType tokenType = exp.getOperationSign();
-		final String assignString = JSTokenTypes.LTLTEQ.equals(tokenType) ? "*=" : "/=";
-
-		final String expString = lhs.getText() + assignString + ShiftUtils.getExpBase2(rhs);
-
-		JSElementFactory.replaceExpression(exp, expString);
-	}
-
-	@RequiredReadAction
-	private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp) throws IncorrectOperationException
-	{
-		final JSExpression lhs = exp.getLOperand();
-		final JSExpression rhs = exp.getROperand();
-		final IElementType tokenType = exp.getOperationSign();
-		final String operatorString = JSTokenTypes.LTLT.equals(tokenType) ? "*" : "/";
-		final String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE);
-		String expString = lhsText + operatorString + ShiftUtils.getExpBase2(rhs);
-		final JSElement parent = (JSElement) exp.getParent();
-
-		if (parent != null && parent instanceof JSExpression parentExpression && !(parent instanceof JSParenthesizedExpression)
-			&& ParenthesesUtils.getPrecendence(parentExpression) < ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE) {
-			expString = '(' + expString + ')';
-		}
-		JSElementFactory.replaceExpression(exp, expString);
-	}
-
-	private static class ShiftByLiteralPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSAssignmentExpression assignmentExpression
-				? this.isAssignmentShiftByLiteral(assignmentExpression)
-				: element instanceof JSBinaryExpression binaryExpression && this.isBinaryShiftByLiteral(binaryExpression);
-		}
-
-		@RequiredReadAction
-		private boolean isAssignmentShiftByLiteral(JSAssignmentExpression expression)
-		{
-			final IElementType tokenType = expression.getOperationSign();
-
-			if (tokenType == null || !(JSTokenTypes.LTLTEQ.equals(tokenType) || JSTokenTypes.GTGTEQ.equals(tokenType)))
-			{
-				return false;
-			}
-
-			final JSExpression rhs = expression.getROperand();
-
-			return rhs != null && ShiftUtils.isIntLiteral(rhs);
-		}
-
-		@RequiredReadAction
-		private boolean isBinaryShiftByLiteral(JSBinaryExpression expression)
-		{
-			final IElementType tokenType = expression.getOperationSign();
-
-			return (JSTokenTypes.LTLT.equals(tokenType) || JSTokenTypes.GTGT.equals(tokenType))
-				&& ShiftUtils.isIntLiteral(expression.getROperand());
-		}
-	}
+public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention {
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.numberReplaceShiftWithMultiply();
+    }
+
+    @Override
+    @RequiredReadAction
+    protected LocalizeValue getTextForElement(PsiElement element) {
+        final IElementType tokenType = ((JSBinaryExpression)element).getOperationSign();
+        final String operatorString;
+
+        if (element instanceof JSAssignmentExpression) {
+            operatorString = JSTokenTypes.LTLTEQ.equals(tokenType) ? "*=" : "/=";
+        }
+        else {
+            operatorString = JSTokenTypes.LTLT.equals(tokenType) ? "*" : "/";
+        }
+
+        return JSIntentionLocalize.numberReplaceShiftWithMultiplyMessage(BinaryOperatorUtils.getOperatorText(tokenType), operatorString);
+    }
+
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ShiftByLiteralPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        if (element instanceof JSAssignmentExpression assignmentExpression) {
+            this.replaceShiftAssignWithMultiplyOrDivideAssign(assignmentExpression);
+        }
+        else {
+            assert (element instanceof JSBinaryExpression);
+            this.replaceShiftWithMultiplyOrDivide((JSBinaryExpression)element);
+        }
+    }
+
+    @RequiredReadAction
+    private void replaceShiftAssignWithMultiplyOrDivideAssign(JSAssignmentExpression exp) throws IncorrectOperationException {
+        final JSExpression lhs = exp.getLOperand();
+        final JSExpression rhs = exp.getROperand();
+        final IElementType tokenType = exp.getOperationSign();
+        final String assignString = JSTokenTypes.LTLTEQ.equals(tokenType) ? "*=" : "/=";
+
+        final String expString = lhs.getText() + assignString + ShiftUtils.getExpBase2(rhs);
+
+        JSElementFactory.replaceExpression(exp, expString);
+    }
+
+    @RequiredReadAction
+    private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp) throws IncorrectOperationException {
+        final JSExpression lhs = exp.getLOperand();
+        final JSExpression rhs = exp.getROperand();
+        final IElementType tokenType = exp.getOperationSign();
+        final String operatorString = JSTokenTypes.LTLT.equals(tokenType) ? "*" : "/";
+        final String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE);
+        String expString = lhsText + operatorString + ShiftUtils.getExpBase2(rhs);
+        final JSElement parent = (JSElement)exp.getParent();
+
+        if (parent != null && parent instanceof JSExpression parentExpression && !(parent instanceof JSParenthesizedExpression)
+            && ParenthesesUtils.getPrecendence(parentExpression) < ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE) {
+            expString = '(' + expString + ')';
+        }
+        JSElementFactory.replaceExpression(exp, expString);
+    }
+
+    private static class ShiftByLiteralPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSAssignmentExpression assignmentExpression
+                ? this.isAssignmentShiftByLiteral(assignmentExpression)
+                : element instanceof JSBinaryExpression binaryExpression && this.isBinaryShiftByLiteral(binaryExpression);
+        }
+
+        @RequiredReadAction
+        private boolean isAssignmentShiftByLiteral(JSAssignmentExpression expression) {
+            final IElementType tokenType = expression.getOperationSign();
+
+            if (tokenType == null || !(JSTokenTypes.LTLTEQ.equals(tokenType) || JSTokenTypes.GTGTEQ.equals(tokenType))) {
+                return false;
+            }
+
+            final JSExpression rhs = expression.getROperand();
+
+            return rhs != null && ShiftUtils.isIntLiteral(rhs);
+        }
+
+        @RequiredReadAction
+        private boolean isBinaryShiftByLiteral(JSBinaryExpression expression) {
+            final IElementType tokenType = expression.getOperationSign();
+
+            return (JSTokenTypes.LTLT.equals(tokenType) || JSTokenTypes.GTGT.equals(tokenType))
+                && ShiftUtils.isIntLiteral(expression.getROperand());
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
index 8e979d46..9974fce8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
@@ -18,109 +18,85 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 
-class ShiftUtils
-{
-	private ShiftUtils()
-	{
-	}
+class ShiftUtils {
+    private ShiftUtils() {
+    }
 
-	public static boolean isPowerOfTwo(JSExpression expression)
-	{
-		if(!(expression instanceof JSLiteralExpression))
-		{
-			return false;
-		}
-		final String value = expression.getText();
-		long intValue;
+    public static boolean isPowerOfTwo(JSExpression expression) {
+        if (!(expression instanceof JSLiteralExpression)) {
+            return false;
+        }
+        final String value = expression.getText();
+        long intValue;
 
-		try
-		{
-			intValue = Integer.decode(value).longValue();
-		}
-		catch(NumberFormatException e)
-		{
-			return false;
-		}
+        try {
+            intValue = Integer.decode(value).longValue();
+        }
+        catch (NumberFormatException e) {
+            return false;
+        }
 
-		if(intValue <= 0)
-		{
-			return false;
-		}
-		while((intValue & 1) == 0)
-		{
-			intValue >>= 1;
-		}
-		return (intValue == 1);
-	}
+        if (intValue <= 0) {
+            return false;
+        }
+        while ((intValue & 1) == 0) {
+            intValue >>= 1;
+        }
+        return (intValue == 1);
+    }
 
-	public static int getLogBase2(JSExpression rhs)
-	{
-		final String value = rhs.getText();
-		long intValue;
+    public static int getLogBase2(JSExpression rhs) {
+        final String value = rhs.getText();
+        long intValue;
 
-		try
-		{
-			intValue = Integer.decode(value).longValue();
-		}
-		catch(NumberFormatException e)
-		{
-			assert (false);
-			return 0;
-		}
+        try {
+            intValue = Integer.decode(value).longValue();
+        }
+        catch (NumberFormatException e) {
+            assert (false);
+            return 0;
+        }
 
-		int log = 0;
-		while((intValue & 1) == 0)
-		{
-			intValue >>= 1;
-			log++;
-		}
-		return log;
-	}
+        int log = 0;
+        while ((intValue & 1) == 0) {
+            intValue >>= 1;
+            log++;
+        }
+        return log;
+    }
 
-	public static int getExpBase2(JSExpression rhs)
-	{
-		final String value = rhs.getText();
-		final long intValue;
+    public static int getExpBase2(JSExpression rhs) {
+        final String value = rhs.getText();
+        final long intValue;
 
-		try
-		{
-			intValue = Integer.decode(value).longValue();
-		}
-		catch(NumberFormatException e)
-		{
-			assert (false);
-			return 0;
-		}
+        try {
+            intValue = Integer.decode(value).longValue();
+        }
+        catch (NumberFormatException e) {
+            assert (false);
+            return 0;
+        }
 
-		int exp = 1;
-		for(int i = 0; i < intValue; i++)
-		{
-			exp <<= 1;
-		}
-		return exp;
-	}
+        int exp = 1;
+        for (int i = 0; i < intValue; i++) {
+            exp <<= 1;
+        }
+        return exp;
+    }
 
-	public static boolean isIntLiteral(JSExpression expression)
-	{
-		if(!(expression instanceof JSLiteralExpression))
-		{
-			return false;
-		}
+    public static boolean isIntLiteral(JSExpression expression) {
+        if (!(expression instanceof JSLiteralExpression)) {
+            return false;
+        }
 
-		if(!(expression instanceof JSLiteralExpression))
-		{
-			return false;
-		}
-		final String value = expression.getText();
+        final String value = expression.getText();
 
-		try
-		{
-			Integer.decode(value);
-			return true;
-		}
-		catch(NumberFormatException e)
-		{
-			return false;
-		}
-	}
+        try {
+            Integer.decode(value);
+            return true;
+        }
+        catch (NumberFormatException e) {
+            return false;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index 1d065d56..675499c0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -35,97 +35,87 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSReplaceWithOperatorAssignmentIntention",
-	categories = {"JavaScript", "Other"},
-	fileExtensions = "js"
+    ignoreId = "JSReplaceWithOperatorAssignmentIntention",
+    categories = {"JavaScript", "Other"},
+    fileExtensions = "js"
 )
-public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedIntention
-{
-	@Nonnull
-	@Override
-	protected LocalizeValue getBasicText()
-	{
-		return JSIntentionLocalize.opassignReplaceWithOperatorAssignment();
-	}
+public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedIntention {
+    @Nonnull
+    @Override
+    protected LocalizeValue getBasicText() {
+        return JSIntentionLocalize.opassignReplaceWithOperatorAssignment();
+    }
 
-	@Override
-	@RequiredReadAction
-	public LocalizeValue getTextForElement(PsiElement element)
-	{
-		final JSAssignmentExpression exp = (JSAssignmentExpression) element;
-		final JSBinaryExpression rhs = (JSBinaryExpression) exp.getROperand();
-		assert (rhs != null);
-		final IElementType sign = rhs.getOperationSign();
+    @Override
+    @RequiredReadAction
+    public LocalizeValue getTextForElement(PsiElement element) {
+        final JSAssignmentExpression exp = (JSAssignmentExpression)element;
+        final JSBinaryExpression rhs = (JSBinaryExpression)exp.getROperand();
+        assert (rhs != null);
+        final IElementType sign = rhs.getOperationSign();
 
-		return JSIntentionLocalize.opassignReplaceWithOperatorAssignmentMessage(BinaryOperatorUtils.getOperatorText(sign));
-	}
+        return JSIntentionLocalize.opassignReplaceWithOperatorAssignmentMessage(BinaryOperatorUtils.getOperatorText(sign));
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new Predicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new Predicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSAssignmentExpression exp = (JSAssignmentExpression) element;
-		final JSBinaryExpression rhs = (JSBinaryExpression) exp.getROperand();
-		final JSExpression lhs = exp.getLOperand();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSAssignmentExpression exp = (JSAssignmentExpression)element;
+        final JSBinaryExpression rhs = (JSBinaryExpression)exp.getROperand();
+        final JSExpression lhs = exp.getLOperand();
 
-		assert (rhs != null);
+        assert (rhs != null);
 
-		final IElementType sign = rhs.getOperationSign();
-		final String operand = BinaryOperatorUtils.getOperatorText(sign);
-		final JSExpression rhsrhs = rhs.getROperand();
+        final IElementType sign = rhs.getOperationSign();
+        final String operand = BinaryOperatorUtils.getOperatorText(sign);
+        final JSExpression rhsrhs = rhs.getROperand();
 
-		assert (rhsrhs != null);
+        assert (rhsrhs != null);
 
-		JSElementFactory.replaceExpression(exp, lhs.getText() + operand + '=' + rhsrhs.getText());
-	}
+        JSElementFactory.replaceExpression(exp, lhs.getText() + operand + '=' + rhsrhs.getText());
+    }
 
-	private static class Predicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSAssignmentExpression) || ErrorUtil.containsError(element)) {
-        return false;
-			}
-			final JSAssignmentExpression assignment = (JSAssignmentExpression) element;
-			final IElementType tokenType = assignment.getOperationSign();
-			if (!JSTokenTypes.EQ.equals(tokenType))
-			{
-				return false;
-			}
-			JSExpression lhs = assignment.getLOperand();
-			final JSExpression rhs = assignment.getROperand();
+    private static class Predicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSAssignmentExpression) || ErrorUtil.containsError(element)) {
+                return false;
+            }
+            final JSAssignmentExpression assignment = (JSAssignmentExpression)element;
+            final IElementType tokenType = assignment.getOperationSign();
+            if (!JSTokenTypes.EQ.equals(tokenType)) {
+                return false;
+            }
+            JSExpression lhs = assignment.getLOperand();
+            final JSExpression rhs = assignment.getROperand();
 
-			if (lhs instanceof JSDefinitionExpression definitionExpression)
-			{
-				lhs = definitionExpression.getExpression();
-			}
-			if (lhs == null || !(rhs instanceof JSBinaryExpression)) {
-        return false;
-			}
-			final JSBinaryExpression binaryRhs = (JSBinaryExpression) rhs;
-			final JSExpression rhsRhs = binaryRhs.getROperand();
-			final JSExpression rhsLhs = binaryRhs.getLOperand();
+            if (lhs instanceof JSDefinitionExpression definitionExpression) {
+                lhs = definitionExpression.getExpression();
+            }
+            if (lhs == null || !(rhs instanceof JSBinaryExpression)) {
+                return false;
+            }
+            final JSBinaryExpression binaryRhs = (JSBinaryExpression)rhs;
+            final JSExpression rhsRhs = binaryRhs.getROperand();
+            final JSExpression rhsLhs = binaryRhs.getLOperand();
 
-			if (rhsRhs == null)
-			{
-				return false;
-			}
+            if (rhsRhs == null) {
+                return false;
+            }
 
-			final IElementType rhsTokenType = binaryRhs.getOperationSign();
+            final IElementType rhsTokenType = binaryRhs.getOperationSign();
 
-			return !JSTokenTypes.OROR.equals(rhsTokenType)
-				&& !JSTokenTypes.ANDAND.equals(rhsTokenType)
-				&& !SideEffectChecker.mayHaveSideEffects(lhs)
-				&& EquivalenceChecker.expressionsAreEquivalent(lhs, rhsLhs);
-		}
-	}
+            return !JSTokenTypes.OROR.equals(rhsTokenType)
+                && !JSTokenTypes.ANDAND.equals(rhsTokenType)
+                && !SideEffectChecker.mayHaveSideEffects(lhs)
+                && EquivalenceChecker.expressionsAreEquivalent(lhs, rhsLhs);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 319185a8..c6ce7a08 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -35,80 +35,68 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSRemoveUnnecessaryParenthesesIntention",
-	categories = {"JavaScript", "Other"},
-	fileExtensions = "js"
+    ignoreId = "JSRemoveUnnecessaryParenthesesIntention",
+    categories = {"JavaScript", "Other"},
+    fileExtensions = "js"
 )
-public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.parenthesisRemoveUnnecessaryParentheses().get();
-	}
+public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.parenthesisRemoveUnnecessaryParentheses().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new UnnecessaryParenthesesPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new UnnecessaryParenthesesPredicate();
+    }
 
-	@Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		JSExpression exp = (JSExpression) element;
+    @Override
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        JSExpression exp = (JSExpression)element;
 
-		while (exp.getParent() instanceof JSExpression parentExp)
-		{
-			exp = parentExp;
-		}
+        while (exp.getParent() instanceof JSExpression parentExp) {
+            exp = parentExp;
+        }
 
-		final String newExpression = ParenthesesUtils.removeParentheses(exp);
+        final String newExpression = ParenthesesUtils.removeParentheses(exp);
 
-		JSElementFactory.replaceExpression(exp, newExpression);
-	}
+        JSElementFactory.replaceExpression(exp, newExpression);
+    }
 
-	private static class UnnecessaryParenthesesPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (element instanceof JSParenthesizedExpression expression && !ErrorUtil.containsError(element))
-			{
-				if (!(expression.getParent() instanceof JSExpression parentExpression))
-				{
-					return true;
-				}
+    private static class UnnecessaryParenthesesPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (element instanceof JSParenthesizedExpression expression && !ErrorUtil.containsError(element)) {
+                if (!(expression.getParent() instanceof JSExpression parentExpression)) {
+                    return true;
+                }
 
-				final JSExpression body = expression.getInnerExpression();
+                final JSExpression body = expression.getInnerExpression();
 
-				if (body instanceof JSParenthesizedExpression)
-				{
-					return true;
-				}
+                if (body instanceof JSParenthesizedExpression) {
+                    return true;
+                }
 
-				final int parentPrecendence = ParenthesesUtils.getPrecendence(parentExpression);
-				final int childPrecendence = ParenthesesUtils.getPrecendence(body);
+                final int parentPrecendence = ParenthesesUtils.getPrecendence(parentExpression);
+                final int childPrecendence = ParenthesesUtils.getPrecendence(body);
 
-				if (parentPrecendence > childPrecendence)
-				{
-					return !(body instanceof JSFunctionExpression);
-				}
-				else if (parentPrecendence == childPrecendence
-					&& parentExpression instanceof JSBinaryExpression parentBinaryExpression
-					&& body instanceof JSBinaryExpression bodyBinaryExpression)
-				{
-					final IElementType parentOperator = parentBinaryExpression.getOperationSign();
-					final IElementType childOperator = bodyBinaryExpression.getOperationSign();
-					final JSExpression lhs = parentBinaryExpression.getLOperand();
+                if (parentPrecendence > childPrecendence) {
+                    return !(body instanceof JSFunctionExpression);
+                }
+                else if (parentPrecendence == childPrecendence
+                    && parentExpression instanceof JSBinaryExpression parentBinaryExpression
+                    && body instanceof JSBinaryExpression bodyBinaryExpression) {
+                    final IElementType parentOperator = parentBinaryExpression.getOperationSign();
+                    final IElementType childOperator = bodyBinaryExpression.getOperationSign();
+                    final JSExpression lhs = parentBinaryExpression.getLOperand();
 
-					return lhs.equals(expression) && parentOperator.equals(childOperator);
-				}
-			}
-			return false;
-		}
-	}
+                    return lhs.equals(expression) && parentOperator.equals(childOperator);
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index e001b08f..126a8612 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -29,72 +29,60 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSDoubleToSingleQuotedStringIntention",
-	categories = {"JavaScript", "Other"},
-	fileExtensions = "js"
+    ignoreId = "JSDoubleToSingleQuotedStringIntention",
+    categories = {"JavaScript", "Other"},
+    fileExtensions = "js"
 )
-public class JSDoubleToSingleQuotedStringIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.stringDoubleQuotedToSingleQuoted().get();
-	}
+public class JSDoubleToSingleQuotedStringIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.stringDoubleQuotedToSingleQuoted().get();
+    }
 
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new DoubleToSingleQuotedStringPredicate();
-	}
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new DoubleToSingleQuotedStringPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSLiteralExpression stringLiteral = (JSLiteralExpression) element;
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSLiteralExpression stringLiteral = (JSLiteralExpression)element;
 
-		JSElementFactory.replaceExpression(stringLiteral, changeQuotes(stringLiteral.getText()));
-	}
+        JSElementFactory.replaceExpression(stringLiteral, changeQuotes(stringLiteral.getText()));
+    }
 
-	static String changeQuotes(String stringLiteral)
-	{
-		StringBuilder buffer = new StringBuilder(stringLiteral);
-		int simpleIndex = stringLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE);
-		int doubleIndex = stringLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, stringLiteral.length() - 2);
+    static String changeQuotes(String stringLiteral) {
+        StringBuilder buffer = new StringBuilder(stringLiteral);
+        int simpleIndex = stringLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE);
+        int doubleIndex = stringLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, stringLiteral.length() - 2);
 
-		while (simpleIndex >= 0 || doubleIndex > 0)
-		{
-			if (simpleIndex > doubleIndex)
-			{
-				if (stringLiteral.charAt(simpleIndex - 1) != StringUtil.BACKSLASH)
-				{
-					buffer.insert(simpleIndex, StringUtil.BACKSLASH);
-				}
-				simpleIndex = stringLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, simpleIndex - 1);
-			}
-			else
-			{
-				if (stringLiteral.charAt(doubleIndex - 1) == StringUtil.BACKSLASH)
-				{
-					buffer.deleteCharAt(doubleIndex - 1);
-				}
-				doubleIndex = stringLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, doubleIndex - 2);
-			}
-		}
-		buffer.setCharAt(0, StringUtil.SIMPLE_QUOTE);
-		buffer.setCharAt(buffer.length() - 1, StringUtil.SIMPLE_QUOTE);
+        while (simpleIndex >= 0 || doubleIndex > 0) {
+            if (simpleIndex > doubleIndex) {
+                if (stringLiteral.charAt(simpleIndex - 1) != StringUtil.BACKSLASH) {
+                    buffer.insert(simpleIndex, StringUtil.BACKSLASH);
+                }
+                simpleIndex = stringLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, simpleIndex - 1);
+            }
+            else {
+                if (stringLiteral.charAt(doubleIndex - 1) == StringUtil.BACKSLASH) {
+                    buffer.deleteCharAt(doubleIndex - 1);
+                }
+                doubleIndex = stringLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, doubleIndex - 2);
+            }
+        }
+        buffer.setCharAt(0, StringUtil.SIMPLE_QUOTE);
+        buffer.setCharAt(buffer.length() - 1, StringUtil.SIMPLE_QUOTE);
 
-		return buffer.toString();
-	}
+        return buffer.toString();
+    }
 
-	private static class DoubleToSingleQuotedStringPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSLiteralExpression literalExpression && StringUtil.isDoubleQuoteStringLiteral(literalExpression);
-		}
-	}
+    private static class DoubleToSingleQuotedStringPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSLiteralExpression literalExpression && StringUtil.isDoubleQuoteStringLiteral(literalExpression);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 54e28fb0..449e652c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -34,75 +34,66 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSJoinConcatenatedStringLiteralsIntention",
-	categories = {"JavaScript", "Other"},
-	fileExtensions = "js"
+    ignoreId = "JSJoinConcatenatedStringLiteralsIntention",
+    categories = {"JavaScript", "Other"},
+    fileExtensions = "js"
 )
-public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.stringJoinConcatenatedStringLiterals().get();
-	}
+public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.stringJoinConcatenatedStringLiterals().get();
+    }
 
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new StringConcatPredicate();
-	}
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new StringConcatPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSBinaryExpression expression = (JSBinaryExpression) element;
-		final JSExpression lhs = expression.getLOperand();
-		final JSExpression rhs = expression.getROperand();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSBinaryExpression expression = (JSBinaryExpression)element;
+        final JSExpression lhs = expression.getLOperand();
+        final JSExpression rhs = expression.getROperand();
 
-		assert (lhs instanceof JSLiteralExpression && rhs instanceof JSLiteralExpression);
+        assert (lhs instanceof JSLiteralExpression && rhs instanceof JSLiteralExpression);
 
-		final JSLiteralExpression leftLiteral = (JSLiteralExpression) lhs;
-		final JSLiteralExpression rightLiteral = (JSLiteralExpression) rhs;
-		String lhsText = lhs.getText();
-		String rhsText = rhs.getText();
-		final String newExpression;
+        final JSLiteralExpression leftLiteral = (JSLiteralExpression)lhs;
+        final JSLiteralExpression rightLiteral = (JSLiteralExpression)rhs;
+        String lhsText = lhs.getText();
+        String rhsText = rhs.getText();
+        final String newExpression;
 
-		if (StringUtil.isSimpleQuoteStringLiteral(leftLiteral)
-			&& StringUtil.isDoubleQuoteStringLiteral(rightLiteral))
-		{
-			rhsText = JSDoubleToSingleQuotedStringIntention.changeQuotes(rhsText);
-		}
-		else if (StringUtil.isDoubleQuoteStringLiteral(leftLiteral)
-			&& StringUtil.isSimpleQuoteStringLiteral(rightLiteral))
-		{
-			rhsText = JSSingleToDoubleQuotedStringIntention.changeQuotes(rhsText);
-		}
+        if (StringUtil.isSimpleQuoteStringLiteral(leftLiteral)
+            && StringUtil.isDoubleQuoteStringLiteral(rightLiteral)) {
+            rhsText = JSDoubleToSingleQuotedStringIntention.changeQuotes(rhsText);
+        }
+        else if (StringUtil.isDoubleQuoteStringLiteral(leftLiteral)
+            && StringUtil.isSimpleQuoteStringLiteral(rightLiteral)) {
+            rhsText = JSSingleToDoubleQuotedStringIntention.changeQuotes(rhsText);
+        }
 
-		newExpression = lhsText.substring(0, lhsText.length() - 1) + rhsText.substring(1);
-		JSElementFactory.replaceExpression(expression, newExpression);
-	}
+        newExpression = lhsText.substring(0, lhsText.length() - 1) + rhsText.substring(1);
+        JSElementFactory.replaceExpression(expression, newExpression);
+    }
 
-	private static class StringConcatPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSBinaryExpression expression
-				&& JSTokenTypes.PLUS.equals(expression.getOperationSign())
-				&& isApplicableLiteral(expression.getLOperand())
-				&& isApplicableLiteral(expression.getROperand());
-		}
+    private static class StringConcatPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSBinaryExpression expression
+                && JSTokenTypes.PLUS.equals(expression.getOperationSign())
+                && isApplicableLiteral(expression.getLOperand())
+                && isApplicableLiteral(expression.getROperand());
+        }
 
-		@RequiredReadAction
-		private static boolean isApplicableLiteral(JSExpression lhs)
-		{
-			return lhs != null
-				&& lhs instanceof JSSimpleLiteralExpression simpleLiteralExpression
-				&& JavaScriptTokenSets.STRING_LITERALS.contains(simpleLiteralExpression.getLiteralElementType());
-		}
-	}
+        @RequiredReadAction
+        private static boolean isApplicableLiteral(JSExpression lhs) {
+            return lhs != null
+                && lhs instanceof JSSimpleLiteralExpression simpleLiteralExpression
+                && JavaScriptTokenSets.STRING_LITERALS.contains(simpleLiteralExpression.getLiteralElementType());
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index 4cba562e..6999720b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -29,72 +29,60 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSSingleToDoubleQuotedStringIntention",
-	categories = {"JavaScript", "Other"},
-	fileExtensions = "js"
+    ignoreId = "JSSingleToDoubleQuotedStringIntention",
+    categories = {"JavaScript", "Other"},
+    fileExtensions = "js"
 )
-public class JSSingleToDoubleQuotedStringIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.stringSingleToDoubleQuotedString().get();
-	}
+public class JSSingleToDoubleQuotedStringIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.stringSingleToDoubleQuotedString().get();
+    }
 
-	@Override
-	@Nonnull
-	protected JSElementPredicate getElementPredicate()
-	{
-		return new SingleToDoubleQuotedStringPredicate();
-	}
+    @Override
+    @Nonnull
+    protected JSElementPredicate getElementPredicate() {
+        return new SingleToDoubleQuotedStringPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSLiteralExpression charLiteral = (JSLiteralExpression) element;
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSLiteralExpression charLiteral = (JSLiteralExpression)element;
 
-		JSElementFactory.replaceExpression(charLiteral, changeQuotes(charLiteral.getText()));
-	}
+        JSElementFactory.replaceExpression(charLiteral, changeQuotes(charLiteral.getText()));
+    }
 
-	static String changeQuotes(String charLiteral)
-	{
-		StringBuilder buffer = new StringBuilder(charLiteral);
-		int simpleIndex = charLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, charLiteral.length() - 2);
-		int doubleIndex = charLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE);
+    static String changeQuotes(String charLiteral) {
+        StringBuilder buffer = new StringBuilder(charLiteral);
+        int simpleIndex = charLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, charLiteral.length() - 2);
+        int doubleIndex = charLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE);
 
-		while (simpleIndex > 0 || doubleIndex >= 0)
-		{
-			if (simpleIndex > doubleIndex)
-			{
-				if (charLiteral.charAt(simpleIndex - 1) == StringUtil.BACKSLASH)
-				{
-					buffer.deleteCharAt(simpleIndex - 1);
-				}
-				simpleIndex = charLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, simpleIndex - 2);
-			}
-			else
-			{
-				if (charLiteral.charAt(doubleIndex - 1) != StringUtil.BACKSLASH)
-				{
-					buffer.insert(doubleIndex, StringUtil.BACKSLASH);
-				}
-				doubleIndex = charLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, doubleIndex - 1);
-			}
-		}
-		buffer.setCharAt(0, StringUtil.DOUBLE_QUOTE);
-		buffer.setCharAt(buffer.length() - 1, StringUtil.DOUBLE_QUOTE);
+        while (simpleIndex > 0 || doubleIndex >= 0) {
+            if (simpleIndex > doubleIndex) {
+                if (charLiteral.charAt(simpleIndex - 1) == StringUtil.BACKSLASH) {
+                    buffer.deleteCharAt(simpleIndex - 1);
+                }
+                simpleIndex = charLiteral.lastIndexOf(StringUtil.SIMPLE_QUOTE, simpleIndex - 2);
+            }
+            else {
+                if (charLiteral.charAt(doubleIndex - 1) != StringUtil.BACKSLASH) {
+                    buffer.insert(doubleIndex, StringUtil.BACKSLASH);
+                }
+                doubleIndex = charLiteral.lastIndexOf(StringUtil.DOUBLE_QUOTE, doubleIndex - 1);
+            }
+        }
+        buffer.setCharAt(0, StringUtil.DOUBLE_QUOTE);
+        buffer.setCharAt(buffer.length() - 1, StringUtil.DOUBLE_QUOTE);
 
-		return buffer.toString();
-	}
+        return buffer.toString();
+    }
 
-	private static class SingleToDoubleQuotedStringPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSLiteralExpression expression && StringUtil.isSimpleQuoteStringLiteral(expression);
-		}
-	}
+    private static class SingleToDoubleQuotedStringPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSLiteralExpression expression && StringUtil.isSimpleQuoteStringLiteral(expression);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
index d014e24a..8373939b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
@@ -17,32 +17,28 @@
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 
-class StringUtil
-{
-	public static final char SIMPLE_QUOTE = '\'';
-	public static final char DOUBLE_QUOTE = '"';
-	public static final char BACKSLASH = '\\';
-
-	private StringUtil()
-	{
-	}
-
-	public static boolean isSimpleQuoteStringLiteral(JSLiteralExpression expression)
-	{
-		final String value = expression.getText();
-
-		return (value != null &&
-				value.charAt(0) == SIMPLE_QUOTE &&
-				value.charAt(value.length() - 1) == SIMPLE_QUOTE);
-	}
-
-	public static boolean isDoubleQuoteStringLiteral(JSLiteralExpression expression)
-	{
-		final String value = expression.getText();
-
-		return (value != null &&
-				value.charAt(0) == DOUBLE_QUOTE &&
-				value.charAt(value.length() - 1) == DOUBLE_QUOTE);
-	}
+class StringUtil {
+    public static final char SIMPLE_QUOTE = '\'';
+    public static final char DOUBLE_QUOTE = '"';
+    public static final char BACKSLASH = '\\';
+
+    private StringUtil() {
+    }
+
+    public static boolean isSimpleQuoteStringLiteral(JSLiteralExpression expression) {
+        final String value = expression.getText();
+
+        return (value != null &&
+            value.charAt(0) == SIMPLE_QUOTE &&
+            value.charAt(value.length() - 1) == SIMPLE_QUOTE);
+    }
+
+    public static boolean isDoubleQuoteStringLiteral(JSLiteralExpression expression) {
+        final String value = expression.getText();
+
+        return (value != null &&
+            value.charAt(0) == DOUBLE_QUOTE &&
+            value.charAt(value.length() - 1) == DOUBLE_QUOTE);
+    }
 
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
index 5db0821d..0d383a6a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
@@ -28,238 +28,175 @@
 import java.util.ArrayList;
 import java.util.List;
 
-class CaseUtil
-{
-
-	private CaseUtil()
-	{
-	}
-
-	private static boolean canBeCaseLabel(JSExpression expression)
-	{
-		if(expression == null)
-		{
-			return false;
-		}
-		return ExpressionUtil.isConstantExpression(expression);
-	}
-
-	public static boolean containsHiddenBreak(JSCaseClause caseClause)
-	{
-		for(JSStatement statement : caseClause.getStatements())
-		{
-			if(CaseUtil.containsHiddenBreak(statement, true))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static boolean containsHiddenBreak(List<PsiElement> elements)
-	{
-		for(final PsiElement element : elements)
-		{
-			if(element instanceof JSStatement &&
-					containsHiddenBreak((JSStatement) element, true))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static boolean containsHiddenBreak(JSStatement statement)
-	{
-		return containsHiddenBreak(statement, true);
-	}
-
-	private static boolean containsHiddenBreak(JSStatement statement,
-											   boolean isTopLevel)
-	{
-		if(statement instanceof JSBlockStatement)
-		{
-			final JSStatement[] statements = ((JSBlockStatement) statement).getStatements();
-			for(final JSStatement childStatement : statements)
-			{
-				if(containsHiddenBreak(childStatement, false))
-				{
-					return true;
-				}
-			}
-		}
-		else if(statement instanceof JSIfStatement)
-		{
-			final JSIfStatement ifStatement = (JSIfStatement) statement;
-
-			return (containsHiddenBreak(ifStatement.getThen(), false) ||
-					containsHiddenBreak(ifStatement.getElse(), false));
-		}
-		else if(statement instanceof JSBreakStatement)
-		{
-			if(isTopLevel)
-			{
-				return false;
-			}
-
-			final String identifier = ((JSBreakStatement) statement).getLabel();
-
-			return (identifier == null || identifier.length() == 0);
-		}
-
-		return false;
-	}
-
-	public static boolean isUsedByStatementList(JSVariable var,
-												List<PsiElement> elements)
-	{
-		for(PsiElement element : elements)
-		{
-			if(element instanceof JSElement &&
-					isUsedByStatement(var, (JSElement) element))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static boolean isUsedByStatement(JSVariable var,
-											 JSElement statement)
-	{
-		final LocalVariableUsageVisitor visitor = new LocalVariableUsageVisitor(var);
-		statement.accept(visitor);
-		return visitor.isUsed();
-	}
-
-	public static String findUniqueLabel(JSStatement statement,
-										 String baseName)
-	{
-		JSElement ancestor = statement;
-
-		while(ancestor.getParent() != null)
-		{
-			if(ancestor instanceof PsiFile)
-			{
-				break;
-			}
-			ancestor = (JSElement) ancestor.getParent();
-		}
-
-		if(!checkForLabel(baseName, ancestor))
-		{
-			return baseName;
-		}
-
-		int val = 1;
-
-		while(true)
-		{
-			final String name = baseName + val;
-
-			if(!checkForLabel(name, ancestor))
-			{
-				return name;
-			}
-			val++;
-		}
-	}
-
-	private static boolean checkForLabel(String name, JSElement ancestor)
-	{
-		final LabelSearchVisitor visitor = new LabelSearchVisitor(name);
-		ancestor.accept(visitor);
-		return visitor.isUsed();
-	}
-
-	public static JSExpression getCaseExpression(JSIfStatement statement)
-	{
-		final JSExpression condition = statement.getCondition();
-		final List<JSExpression> possibleCaseExpressions = determinePossibleCaseExpressions(condition);
-
-		if(possibleCaseExpressions != null)
-		{
-			for(final JSExpression caseExpression : possibleCaseExpressions)
-			{
-				if(!SideEffectChecker.mayHaveSideEffects(caseExpression))
-				{
-					JSIfStatement statementToCheck = statement;
-
-					while(canBeMadeIntoCase(statementToCheck.getCondition(), caseExpression))
-					{
-						final JSStatement elseBranch = statementToCheck.getElse();
-
-						if(elseBranch == null || !(elseBranch instanceof JSIfStatement))
-						{
-							return caseExpression;
-						}
-						statementToCheck = (JSIfStatement) elseBranch;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	private static List<JSExpression> determinePossibleCaseExpressions(JSExpression exp)
-	{
-		final JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
-		final List<JSExpression> out = new ArrayList<JSExpression>(10);
-
-		if(expToCheck instanceof JSBinaryExpression)
-		{
-			final JSBinaryExpression binaryExp = (JSBinaryExpression) expToCheck;
-			final IElementType operation = binaryExp.getOperationSign();
-			final JSExpression lhs = binaryExp.getLOperand();
-			final JSExpression rhs = binaryExp.getROperand();
-
-			if(operation.equals(JSTokenTypes.OROR))
-			{
-				return determinePossibleCaseExpressions(lhs);
-			}
-			else if(operation.equals(JSTokenTypes.EQEQ))
-			{
-				if(canBeCaseLabel(lhs) && rhs != null)
-				{
-					out.add(rhs);
-				}
-				if(canBeCaseLabel(rhs))
-				{
-					out.add(lhs);
-				}
-			}
-		}
-		return out;
-	}
-
-	private static boolean canBeMadeIntoCase(JSExpression exp,
-											 JSExpression caseExpression)
-	{
-		final JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
-
-		if(!(expToCheck instanceof JSBinaryExpression))
-		{
-			return false;
-		}
-
-		final JSBinaryExpression binaryExp = (JSBinaryExpression) expToCheck;
-		final IElementType operation = binaryExp.getOperationSign();
-		final JSExpression leftOperand = binaryExp.getLOperand();
-		final JSExpression rightOperand = binaryExp.getROperand();
-
-		if(operation.equals(JSTokenTypes.OROR))
-		{
-			return (canBeMadeIntoCase(leftOperand, caseExpression) &&
-					canBeMadeIntoCase(rightOperand, caseExpression));
-		}
-		else if(operation.equals(JSTokenTypes.EQEQ))
-		{
-			return ((canBeCaseLabel(leftOperand) && EquivalenceChecker.expressionsAreEquivalent(caseExpression, rightOperand)) ||
-					(canBeCaseLabel(rightOperand) && EquivalenceChecker.expressionsAreEquivalent(caseExpression, leftOperand)));
-		}
-		else
-		{
-			return false;
-		}
-	}
+class CaseUtil {
+    private CaseUtil() {
+    }
+
+    private static boolean canBeCaseLabel(JSExpression expression) {
+        return expression != null && ExpressionUtil.isConstantExpression(expression);
+    }
+
+    public static boolean containsHiddenBreak(JSCaseClause caseClause) {
+        for (JSStatement statement : caseClause.getStatements()) {
+            if (CaseUtil.containsHiddenBreak(statement, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean containsHiddenBreak(List<PsiElement> elements) {
+        for (final PsiElement element : elements) {
+            if (element instanceof JSStatement statement && containsHiddenBreak(statement, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean containsHiddenBreak(JSStatement statement) {
+        return containsHiddenBreak(statement, true);
+    }
+
+    private static boolean containsHiddenBreak(JSStatement statement, boolean isTopLevel) {
+        if (statement instanceof JSBlockStatement blockStatement) {
+            for (final JSStatement childStatement : blockStatement.getStatements()) {
+                if (containsHiddenBreak(childStatement, false)) {
+                    return true;
+                }
+            }
+        }
+        else if (statement instanceof JSIfStatement ifStatement) {
+            return containsHiddenBreak(ifStatement.getThen(), false) || containsHiddenBreak(ifStatement.getElse(), false);
+        }
+        else if (statement instanceof JSBreakStatement breakStatement) {
+            if (isTopLevel) {
+                return false;
+            }
+
+            final String identifier = breakStatement.getLabel();
+
+            return (identifier == null || identifier.length() == 0);
+        }
+
+        return false;
+    }
+
+    public static boolean isUsedByStatementList(JSVariable var, List<PsiElement> elements) {
+        for (PsiElement element : elements) {
+            if (element instanceof JSElement jsElement && isUsedByStatement(var, jsElement)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean isUsedByStatement(JSVariable var, JSElement statement) {
+        final LocalVariableUsageVisitor visitor = new LocalVariableUsageVisitor(var);
+        statement.accept(visitor);
+        return visitor.isUsed();
+    }
+
+    public static String findUniqueLabel(JSStatement statement, String baseName) {
+        JSElement ancestor = statement;
+
+        while (ancestor.getParent() != null) {
+            if (ancestor instanceof PsiFile) {
+                break;
+            }
+            ancestor = (JSElement)ancestor.getParent();
+        }
+
+        if (!checkForLabel(baseName, ancestor)) {
+            return baseName;
+        }
+
+        int val = 1;
+
+        while (true) {
+            final String name = baseName + val;
+
+            if (!checkForLabel(name, ancestor)) {
+                return name;
+            }
+            val++;
+        }
+    }
+
+    private static boolean checkForLabel(String name, JSElement ancestor) {
+        final LabelSearchVisitor visitor = new LabelSearchVisitor(name);
+        ancestor.accept(visitor);
+        return visitor.isUsed();
+    }
+
+    public static JSExpression getCaseExpression(JSIfStatement statement) {
+        final JSExpression condition = statement.getCondition();
+        final List<JSExpression> possibleCaseExpressions = determinePossibleCaseExpressions(condition);
+
+        if (possibleCaseExpressions != null) {
+            for (final JSExpression caseExpression : possibleCaseExpressions) {
+                if (!SideEffectChecker.mayHaveSideEffects(caseExpression)) {
+                    JSIfStatement statementToCheck = statement;
+
+                    while (canBeMadeIntoCase(statementToCheck.getCondition(), caseExpression)) {
+                        final JSStatement elseBranch = statementToCheck.getElse();
+
+                        if (elseBranch == null || !(elseBranch instanceof JSIfStatement)) {
+                            return caseExpression;
+                        }
+                        statementToCheck = (JSIfStatement)elseBranch;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private static List<JSExpression> determinePossibleCaseExpressions(JSExpression exp) {
+        final JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
+        final List<JSExpression> out = new ArrayList<>(10);
+
+        if (expToCheck instanceof JSBinaryExpression binaryExp) {
+            final IElementType operation = binaryExp.getOperationSign();
+            final JSExpression lhs = binaryExp.getLOperand();
+            final JSExpression rhs = binaryExp.getROperand();
+
+            if (JSTokenTypes.OROR.equals(operation)) {
+                return determinePossibleCaseExpressions(lhs);
+            }
+            else if (JSTokenTypes.EQEQ.equals(operation)) {
+                if (canBeCaseLabel(lhs) && rhs != null) {
+                    out.add(rhs);
+                }
+                if (canBeCaseLabel(rhs)) {
+                    out.add(lhs);
+                }
+            }
+        }
+        return out;
+    }
+
+    private static boolean canBeMadeIntoCase(JSExpression exp, JSExpression caseExpression) {
+        final JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
+
+        if (!(expToCheck instanceof JSBinaryExpression)) {
+            return false;
+        }
+
+        final JSBinaryExpression binaryExp = (JSBinaryExpression)expToCheck;
+        final IElementType operation = binaryExp.getOperationSign();
+        final JSExpression leftOperand = binaryExp.getLOperand();
+        final JSExpression rightOperand = binaryExp.getROperand();
+
+        if (JSTokenTypes.OROR.equals(operation)) {
+            return canBeMadeIntoCase(leftOperand, caseExpression) && canBeMadeIntoCase(rightOperand, caseExpression);
+        }
+        else if (JSTokenTypes.EQEQ.equals(operation)) {
+            return (canBeCaseLabel(leftOperand) && EquivalenceChecker.expressionsAreEquivalent(caseExpression, rightOperand)
+                || (canBeCaseLabel(rightOperand) && EquivalenceChecker.expressionsAreEquivalent(caseExpression, leftOperand)));
+        }
+        else {
+            return false;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 19f4eb8e..d6371ffa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -34,449 +34,379 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSReplaceIfWithSwitchIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSReplaceIfWithSwitchIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSReplaceIfWithSwitchIntention extends JSIntention
-{
-	@NonNls
-	private static final String IF_KEYWORD = "if";
-	@NonNls
-	private static final String DEFAULT_LABEL_NAME = "Label";
-	@NonNls
-	private static final String DEFAULT_CASE_CLAUSE_EXPRESSION = "default: ";
-	@NonNls
-	private static final String LABELED_BREAK_STATEMENT_PREFIX = "break ";
-	@NonNls
-	private static final String BREAK_STATEMENT = "\nbreak;";
-
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.switchtoifReplaceIfWithSwitch().get();
-	}
-
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new IfToSwitchPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		JSIfStatement ifStatement = (JSIfStatement) element.getParent();
-
-		assert (ifStatement != null);
-
-		boolean breaksNeedRelabeled = false;
-		JSStatement breakTarget = null;
-		String labelString = "";
-
-		if (ControlFlowUtils.statementContainsExitingBreak(ifStatement))
-		{
-			JSElement ancestor = (JSElement) ifStatement.getParent();
-			while (ancestor != null)
-			{
-				if (ancestor instanceof JSForStatement
-					|| ancestor instanceof JSForInStatement
-					|| ancestor instanceof JSDoWhileStatement
-					|| ancestor instanceof JSWhileStatement
-					|| ancestor instanceof JSSwitchStatement)
-				{
-					breakTarget = (JSStatement) ancestor;
-					break;
-				}
-				ancestor = (JSElement) ancestor.getParent();
-			}
-
-			if (breakTarget != null)
-			{
-				labelString = CaseUtil.findUniqueLabel(ifStatement, DEFAULT_LABEL_NAME);
-				breaksNeedRelabeled = true;
-			}
-		}
-		final JSIfStatement statementToReplace = ifStatement;
-		final JSExpression caseExpression = CaseUtil.getCaseExpression(ifStatement);
-
-		assert (caseExpression != null);
-
-		final StringBuilder switchStatementBuffer = new StringBuilder(1024);
-
-		switchStatementBuffer.append("switch(").append(caseExpression.getText()).append(')')
-				.append('{');
-
-		final List<IfStatementBranch> branches = new ArrayList<>(20);
-
-		while (true)
-		{
-			final Set<String> topLevelVariables = new HashSet<>(5);
-			final Set<String> innerVariables = new HashSet<>(5);
-			final JSExpression condition = ifStatement.getCondition();
-			final JSExpression[] labels = getValuesFromCondition(condition, caseExpression);
-			final JSStatement thenBranch = ifStatement.getThen();
-
-			DeclarationUtils.calculateVariablesDeclared(thenBranch, topLevelVariables, innerVariables, true);
-
-			final IfStatementBranch ifBranch = new IfStatementBranch();
-
-			ifBranch.setInnerVariables(innerVariables);
-			ifBranch.setTopLevelVariables(topLevelVariables);
-			ifBranch.setStatement(thenBranch);
-			for (final JSExpression label : labels)
-			{
-				ifBranch.addCondition(label.getText());
-			}
-			branches.add(ifBranch);
-
-			final JSStatement elseBranch = ifStatement.getElse();
-
-			if (elseBranch instanceof JSIfStatement elseIfStatement)
-			{
-				ifStatement = elseIfStatement;
-			}
-			else if (elseBranch == null)
-			{
-				break;
-			}
-			else
-			{
-				final Set<String> elseTopLevelVariables = new HashSet<>(5);
-				final Set<String> elseInnerVariables = new HashSet<>(5);
-
-				DeclarationUtils.calculateVariablesDeclared(elseBranch, elseTopLevelVariables, elseInnerVariables, true);
-
-				final IfStatementBranch elseIfBranch = new IfStatementBranch();
-
-				elseIfBranch.setInnerVariables(elseInnerVariables);
-				elseIfBranch.setTopLevelVariables(elseTopLevelVariables);
-				elseIfBranch.setElse();
-				elseIfBranch.setStatement(elseBranch);
-				branches.add(elseIfBranch);
-				break;
-			}
-		}
-
-		for (IfStatementBranch branch : branches)
-		{
-			boolean hasConflicts = false;
-			for (IfStatementBranch testBranch : branches)
-			{
-				if (branch.topLevelDeclarationsConfictWith(testBranch))
-				{
-					hasConflicts = true;
-				}
-			}
-
-			final JSStatement branchStatement = branch.getStatement();
-
-			if (branch.isElse())
-			{
-				dumpDefaultBranch(switchStatementBuffer, branchStatement, hasConflicts, breaksNeedRelabeled, labelString);
-			}
-			else
-			{
-				final List<String> conditions = branch.getConditions();
-
-				dumpBranch(switchStatementBuffer, conditions, branchStatement, hasConflicts, breaksNeedRelabeled, labelString);
-			}
-		}
-
-		switchStatementBuffer.append('}');
-
-		final String switchStatementString = switchStatementBuffer.toString();
-
-		if (breaksNeedRelabeled)
-		{
-			final int length = switchStatementBuffer.length();
-			final StringBuilder out = new StringBuilder(length);
-
-			out.append(labelString).append(':');
-			termReplace(out, breakTarget, statementToReplace, switchStatementString);
-			JSElementFactory.replaceStatement(breakTarget, out.toString());
-		}
-		else
-		{
-			JSElementFactory.replaceStatement(statementToReplace, switchStatementString);
-		}
-	}
-
-	@RequiredReadAction
-	private static void termReplace(StringBuilder out, JSElement target, JSElement replace, String stringToReplaceWith)
-	{
-		if (target.equals(replace))
-		{
-			out.append(stringToReplaceWith);
-		}
-		else if (target.getChildren().length != 0)
-		{
-			final JSElement[] children = (JSElement[]) target.getChildren();
-			for (final JSElement child : children)
-			{
-				termReplace(out, child, replace, stringToReplaceWith);
-			}
-		}
-		else
-		{
-			final String text = target.getText();
-			out.append(text);
-		}
-	}
-
-	@RequiredReadAction
-	private static JSExpression[] getValuesFromCondition(JSExpression condition, JSExpression caseExpression)
-	{
-		final List<JSExpression> values = new ArrayList<>(10);
-
-		getValuesFromExpression(condition, caseExpression, values);
-		return values.toArray(new JSExpression[values.size()]);
-	}
-
-	@RequiredReadAction
-	private static void getValuesFromExpression(JSExpression expression, JSExpression caseExpression, List<JSExpression> values)
-	{
-		if (expression instanceof JSBinaryExpression)
-		{
-			final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-			final JSExpression lhs = binaryExpression.getLOperand();
-			final JSExpression rhs = binaryExpression.getROperand();
-			final IElementType tokenType = binaryExpression.getOperationSign();
-
-			if (JSTokenTypes.OROR.equals(tokenType))
-			{
-				getValuesFromExpression(lhs, caseExpression, values);
-				getValuesFromExpression(rhs, caseExpression, values);
-			}
-			else if (EquivalenceChecker.expressionsAreEquivalent(caseExpression, rhs))
-			{
-				values.add(lhs);
-			}
-			else
-			{
-				values.add(rhs);
-			}
-		}
-		else if (expression instanceof JSParenthesizedExpression parenExpression)
-		{
-			final JSExpression contents = parenExpression.getInnerExpression();
-
-			getValuesFromExpression(contents, caseExpression, values);
-		}
-	}
-
-	@RequiredReadAction
-	private static void dumpBranch(
-		StringBuilder switchStatementString,
-		List<String> labels,
-		JSStatement body,
-		boolean wrap,
-		boolean renameBreaks,
-		String breakLabelName
-	)
-	{
-		dumpLabels(switchStatementString, labels);
-		dumpBody(switchStatementString, body, wrap, renameBreaks, breakLabelName);
-	}
-
-	@RequiredReadAction
-	private static void dumpDefaultBranch(
-		StringBuilder switchStatementString,
-		JSStatement body,
-		boolean wrap,
-		boolean renameBreaks,
-		String breakLabelName
-	)
-	{
-		switchStatementString.append(DEFAULT_CASE_CLAUSE_EXPRESSION);
-		dumpBody(switchStatementString, body, wrap, renameBreaks, breakLabelName);
-	}
-
-	private static void dumpLabels(StringBuilder switchStatementString, List<String> labels)
-	{
-		for (String label : labels)
-		{
-			switchStatementString.append("\ncase ").append(label).append(": ");
-		}
-	}
-
-	@RequiredReadAction
-	private static void dumpBody(
-		StringBuilder switchStatementString,
-		JSStatement bodyStatement,
-		boolean wrap,
-		boolean renameBreaks,
-		String breakLabelName
-	)
-	{
-		if (bodyStatement instanceof JSBlockStatement)
-		{
-			if (wrap)
-			{
-				appendElement(switchStatementString, bodyStatement, renameBreaks, breakLabelName);
-			}
-			else
-			{
-				// Skip the first and last characters to unwrap the block
-				final String bodyText = bodyStatement.getText();
-				switchStatementString.append(bodyText.substring(1, bodyText.length() - 1));
-			}
-		}
-		else
-		{
-			if (wrap)
-			{
-				switchStatementString.append('{');
-				appendElement(switchStatementString, bodyStatement, renameBreaks, breakLabelName);
-				switchStatementString.append('}');
-			}
-			else
-			{
-				appendElement(switchStatementString, bodyStatement, renameBreaks, breakLabelName);
-			}
-		}
-		if (ControlFlowUtils.statementMayCompleteNormally(bodyStatement))
-		{
-			switchStatementString.append(BREAK_STATEMENT);
-		}
-		switchStatementString.append('\n');
-	}
-
-	@RequiredReadAction
-	private static void appendElement(
-		StringBuilder switchStatementString,
-		JSElement element,
-		boolean renameBreakElements,
-		String breakLabelString
-	)
-	{
-		final String text = element.getText();
-
-		if (!renameBreakElements)
-		{
-			switchStatementString.append(text);
-		}
-		else if (element instanceof JSBreakStatement breakStatement)
-		{
-			final String identifier = breakStatement.getLabel();
-			if (identifier == null || identifier.isEmpty())
-			{
-				switchStatementString.append(LABELED_BREAK_STATEMENT_PREFIX);
-				switchStatementString.append(breakLabelString);
-				switchStatementString.append(';');
-			}
-			else
-			{
-				switchStatementString.append(text);
-			}
-		}
-		else if (element instanceof JSBlockStatement || element instanceof JSIfStatement)
-		{
-			final JSElement[] children = (JSElement[]) element.getChildren();
-			for (final JSElement child : children)
-			{
-				appendElement(switchStatementString, child, renameBreakElements, breakLabelString);
-			}
-		}
-		else
-		{
-			switchStatementString.append(text);
-		}
-	}
-
-	private static class IfToSwitchPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element.getParent() instanceof JSIfStatement statement
-				&& IF_KEYWORD.equals(element.getText())
-				&& !ErrorUtil.containsError(statement)
-				&& CaseUtil.getCaseExpression(statement) != null;
-		}
-	}
-
-	private static class IfStatementBranch
-	{
-		private final List<String> conditions = new ArrayList<>(3);
-		private Set<String> topLevelVariables = new HashSet<>(3);
-		private Set<String> innerVariables = new HashSet<>(3);
-		private JSStatement statement;
-		private boolean isElse;
-
-		public void addCondition(String conditionString)
-		{
-			this.conditions.add(conditionString);
-		}
-
-		public void setStatement(JSStatement statement)
-		{
-			this.statement = statement;
-		}
-
-		public JSStatement getStatement()
-		{
-			return this.statement;
-		}
-
-		public List<String> getConditions()
-		{
-			return Collections.unmodifiableList(this.conditions);
-		}
-
-		public boolean isElse()
-		{
-			return this.isElse;
-		}
-
-		public void setElse()
-		{
-			this.isElse = true;
-		}
-
-		public void setTopLevelVariables(Set<String> topLevelVariables)
-		{
-			this.topLevelVariables = new HashSet<>(topLevelVariables);
-		}
-
-		public void setInnerVariables(Set<String> innerVariables)
-		{
-			this.innerVariables = new HashSet<>(innerVariables);
-		}
-
-		private Set<String> getTopLevelVariables()
-		{
-			return Collections.unmodifiableSet(this.topLevelVariables);
-		}
-
-		private Set<String> getInnerVariables()
-		{
-			return Collections.unmodifiableSet(this.innerVariables);
-		}
-
-		public boolean topLevelDeclarationsConfictWith(IfStatementBranch testBranch)
-		{
-			final Set<String> innerVariables = testBranch.getInnerVariables();
-			final Set<String> topLevel = testBranch.getTopLevelVariables();
-
-			return hasNonEmptyIntersection(this.topLevelVariables, topLevel)
-				|| hasNonEmptyIntersection(this.topLevelVariables, innerVariables);
-		}
-
-		private static boolean hasNonEmptyIntersection(Set<String> set1, Set<String> set2)
-		{
-			for (final String set1Element : set1)
-			{
-				if (set2.contains(set1Element))
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-	}
+public class JSReplaceIfWithSwitchIntention extends JSIntention {
+    @NonNls
+    private static final String IF_KEYWORD = "if";
+    @NonNls
+    private static final String DEFAULT_LABEL_NAME = "Label";
+    @NonNls
+    private static final String DEFAULT_CASE_CLAUSE_EXPRESSION = "default: ";
+    @NonNls
+    private static final String LABELED_BREAK_STATEMENT_PREFIX = "break ";
+    @NonNls
+    private static final String BREAK_STATEMENT = "\nbreak;";
+
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.switchtoifReplaceIfWithSwitch().get();
+    }
+
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new IfToSwitchPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        JSIfStatement ifStatement = (JSIfStatement)element.getParent();
+
+        assert (ifStatement != null);
+
+        boolean breaksNeedRelabeled = false;
+        JSStatement breakTarget = null;
+        String labelString = "";
+
+        if (ControlFlowUtils.statementContainsExitingBreak(ifStatement)) {
+            JSElement ancestor = (JSElement)ifStatement.getParent();
+            while (ancestor != null) {
+                if (ancestor instanceof JSForStatement
+                    || ancestor instanceof JSForInStatement
+                    || ancestor instanceof JSDoWhileStatement
+                    || ancestor instanceof JSWhileStatement
+                    || ancestor instanceof JSSwitchStatement) {
+                    breakTarget = (JSStatement)ancestor;
+                    break;
+                }
+                ancestor = (JSElement)ancestor.getParent();
+            }
+
+            if (breakTarget != null) {
+                labelString = CaseUtil.findUniqueLabel(ifStatement, DEFAULT_LABEL_NAME);
+                breaksNeedRelabeled = true;
+            }
+        }
+        final JSIfStatement statementToReplace = ifStatement;
+        final JSExpression caseExpression = CaseUtil.getCaseExpression(ifStatement);
+
+        assert (caseExpression != null);
+
+        final StringBuilder switchStatementBuffer = new StringBuilder(1024);
+
+        switchStatementBuffer.append("switch(").append(caseExpression.getText()).append(')')
+            .append('{');
+
+        final List<IfStatementBranch> branches = new ArrayList<>(20);
+
+        while (true) {
+            final Set<String> topLevelVariables = new HashSet<>(5);
+            final Set<String> innerVariables = new HashSet<>(5);
+            final JSExpression condition = ifStatement.getCondition();
+            final JSExpression[] labels = getValuesFromCondition(condition, caseExpression);
+            final JSStatement thenBranch = ifStatement.getThen();
+
+            DeclarationUtils.calculateVariablesDeclared(thenBranch, topLevelVariables, innerVariables, true);
+
+            final IfStatementBranch ifBranch = new IfStatementBranch();
+
+            ifBranch.setInnerVariables(innerVariables);
+            ifBranch.setTopLevelVariables(topLevelVariables);
+            ifBranch.setStatement(thenBranch);
+            for (final JSExpression label : labels) {
+                ifBranch.addCondition(label.getText());
+            }
+            branches.add(ifBranch);
+
+            final JSStatement elseBranch = ifStatement.getElse();
+
+            if (elseBranch instanceof JSIfStatement elseIfStatement) {
+                ifStatement = elseIfStatement;
+            }
+            else if (elseBranch == null) {
+                break;
+            }
+            else {
+                final Set<String> elseTopLevelVariables = new HashSet<>(5);
+                final Set<String> elseInnerVariables = new HashSet<>(5);
+
+                DeclarationUtils.calculateVariablesDeclared(elseBranch, elseTopLevelVariables, elseInnerVariables, true);
+
+                final IfStatementBranch elseIfBranch = new IfStatementBranch();
+
+                elseIfBranch.setInnerVariables(elseInnerVariables);
+                elseIfBranch.setTopLevelVariables(elseTopLevelVariables);
+                elseIfBranch.setElse();
+                elseIfBranch.setStatement(elseBranch);
+                branches.add(elseIfBranch);
+                break;
+            }
+        }
+
+        for (IfStatementBranch branch : branches) {
+            boolean hasConflicts = false;
+            for (IfStatementBranch testBranch : branches) {
+                if (branch.topLevelDeclarationsConfictWith(testBranch)) {
+                    hasConflicts = true;
+                }
+            }
+
+            final JSStatement branchStatement = branch.getStatement();
+
+            if (branch.isElse()) {
+                dumpDefaultBranch(switchStatementBuffer, branchStatement, hasConflicts, breaksNeedRelabeled, labelString);
+            }
+            else {
+                final List<String> conditions = branch.getConditions();
+
+                dumpBranch(switchStatementBuffer, conditions, branchStatement, hasConflicts, breaksNeedRelabeled, labelString);
+            }
+        }
+
+        switchStatementBuffer.append('}');
+
+        final String switchStatementString = switchStatementBuffer.toString();
+
+        if (breaksNeedRelabeled) {
+            final int length = switchStatementBuffer.length();
+            final StringBuilder out = new StringBuilder(length);
+
+            out.append(labelString).append(':');
+            termReplace(out, breakTarget, statementToReplace, switchStatementString);
+            JSElementFactory.replaceStatement(breakTarget, out.toString());
+        }
+        else {
+            JSElementFactory.replaceStatement(statementToReplace, switchStatementString);
+        }
+    }
+
+    @RequiredReadAction
+    private static void termReplace(StringBuilder out, JSElement target, JSElement replace, String stringToReplaceWith) {
+        if (target.equals(replace)) {
+            out.append(stringToReplaceWith);
+        }
+        else if (target.getChildren().length != 0) {
+            final JSElement[] children = (JSElement[])target.getChildren();
+            for (final JSElement child : children) {
+                termReplace(out, child, replace, stringToReplaceWith);
+            }
+        }
+        else {
+            final String text = target.getText();
+            out.append(text);
+        }
+    }
+
+    @RequiredReadAction
+    private static JSExpression[] getValuesFromCondition(JSExpression condition, JSExpression caseExpression) {
+        final List<JSExpression> values = new ArrayList<>(10);
+
+        getValuesFromExpression(condition, caseExpression, values);
+        return values.toArray(new JSExpression[values.size()]);
+    }
+
+    @RequiredReadAction
+    private static void getValuesFromExpression(JSExpression expression, JSExpression caseExpression, List<JSExpression> values) {
+        if (expression instanceof JSBinaryExpression binaryExpression) {
+            final JSExpression lhs = binaryExpression.getLOperand();
+            final JSExpression rhs = binaryExpression.getROperand();
+            final IElementType tokenType = binaryExpression.getOperationSign();
+
+            if (JSTokenTypes.OROR.equals(tokenType)) {
+                getValuesFromExpression(lhs, caseExpression, values);
+                getValuesFromExpression(rhs, caseExpression, values);
+            }
+            else if (EquivalenceChecker.expressionsAreEquivalent(caseExpression, rhs)) {
+                values.add(lhs);
+            }
+            else {
+                values.add(rhs);
+            }
+        }
+        else if (expression instanceof JSParenthesizedExpression parenExpression) {
+            final JSExpression contents = parenExpression.getInnerExpression();
+
+            getValuesFromExpression(contents, caseExpression, values);
+        }
+    }
+
+    @RequiredReadAction
+    private static void dumpBranch(
+        StringBuilder switchStatementString,
+        List<String> labels,
+        JSStatement body,
+        boolean wrap,
+        boolean renameBreaks,
+        String breakLabelName
+    ) {
+        dumpLabels(switchStatementString, labels);
+        dumpBody(switchStatementString, body, wrap, renameBreaks, breakLabelName);
+    }
+
+    @RequiredReadAction
+    private static void dumpDefaultBranch(
+        StringBuilder switchStatementString,
+        JSStatement body,
+        boolean wrap,
+        boolean renameBreaks,
+        String breakLabelName
+    ) {
+        switchStatementString.append(DEFAULT_CASE_CLAUSE_EXPRESSION);
+        dumpBody(switchStatementString, body, wrap, renameBreaks, breakLabelName);
+    }
+
+    private static void dumpLabels(StringBuilder switchStatementString, List<String> labels) {
+        for (String label : labels) {
+            switchStatementString.append("\ncase ").append(label).append(": ");
+        }
+    }
+
+    @RequiredReadAction
+    private static void dumpBody(
+        StringBuilder switchStatementString,
+        JSStatement bodyStatement,
+        boolean wrap,
+        boolean renameBreaks,
+        String breakLabelName
+    ) {
+        if (bodyStatement instanceof JSBlockStatement) {
+            if (wrap) {
+                appendElement(switchStatementString, bodyStatement, renameBreaks, breakLabelName);
+            }
+            else {
+                // Skip the first and last characters to unwrap the block
+                final String bodyText = bodyStatement.getText();
+                switchStatementString.append(bodyText.substring(1, bodyText.length() - 1));
+            }
+        }
+        else {
+            if (wrap) {
+                switchStatementString.append('{');
+                appendElement(switchStatementString, bodyStatement, renameBreaks, breakLabelName);
+                switchStatementString.append('}');
+            }
+            else {
+                appendElement(switchStatementString, bodyStatement, renameBreaks, breakLabelName);
+            }
+        }
+        if (ControlFlowUtils.statementMayCompleteNormally(bodyStatement)) {
+            switchStatementString.append(BREAK_STATEMENT);
+        }
+        switchStatementString.append('\n');
+    }
+
+    @RequiredReadAction
+    private static void appendElement(
+        StringBuilder switchStatementString,
+        JSElement element,
+        boolean renameBreakElements,
+        String breakLabelString
+    ) {
+        final String text = element.getText();
+
+        if (!renameBreakElements) {
+            switchStatementString.append(text);
+        }
+        else if (element instanceof JSBreakStatement breakStatement) {
+            final String identifier = breakStatement.getLabel();
+            if (identifier == null || identifier.isEmpty()) {
+                switchStatementString.append(LABELED_BREAK_STATEMENT_PREFIX);
+                switchStatementString.append(breakLabelString);
+                switchStatementString.append(';');
+            }
+            else {
+                switchStatementString.append(text);
+            }
+        }
+        else if (element instanceof JSBlockStatement || element instanceof JSIfStatement) {
+            final JSElement[] children = (JSElement[])element.getChildren();
+            for (final JSElement child : children) {
+                appendElement(switchStatementString, child, renameBreakElements, breakLabelString);
+            }
+        }
+        else {
+            switchStatementString.append(text);
+        }
+    }
+
+    private static class IfToSwitchPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element.getParent() instanceof JSIfStatement statement
+                && IF_KEYWORD.equals(element.getText())
+                && !ErrorUtil.containsError(statement)
+                && CaseUtil.getCaseExpression(statement) != null;
+        }
+    }
+
+    private static class IfStatementBranch {
+        private final List<String> conditions = new ArrayList<>(3);
+        private Set<String> topLevelVariables = new HashSet<>(3);
+        private Set<String> innerVariables = new HashSet<>(3);
+        private JSStatement statement;
+        private boolean isElse;
+
+        public void addCondition(String conditionString) {
+            this.conditions.add(conditionString);
+        }
+
+        public void setStatement(JSStatement statement) {
+            this.statement = statement;
+        }
+
+        public JSStatement getStatement() {
+            return this.statement;
+        }
+
+        public List<String> getConditions() {
+            return Collections.unmodifiableList(this.conditions);
+        }
+
+        public boolean isElse() {
+            return this.isElse;
+        }
+
+        public void setElse() {
+            this.isElse = true;
+        }
+
+        public void setTopLevelVariables(Set<String> topLevelVariables) {
+            this.topLevelVariables = new HashSet<>(topLevelVariables);
+        }
+
+        public void setInnerVariables(Set<String> innerVariables) {
+            this.innerVariables = new HashSet<>(innerVariables);
+        }
+
+        private Set<String> getTopLevelVariables() {
+            return Collections.unmodifiableSet(this.topLevelVariables);
+        }
+
+        private Set<String> getInnerVariables() {
+            return Collections.unmodifiableSet(this.innerVariables);
+        }
+
+        public boolean topLevelDeclarationsConfictWith(IfStatementBranch testBranch) {
+            final Set<String> innerVariables = testBranch.getInnerVariables();
+            final Set<String> topLevel = testBranch.getTopLevelVariables();
+
+            return hasNonEmptyIntersection(this.topLevelVariables, topLevel)
+                || hasNonEmptyIntersection(this.topLevelVariables, innerVariables);
+        }
+
+        private static boolean hasNonEmptyIntersection(Set<String> set1, Set<String> set2) {
+            for (final String set1Element : set1) {
+                if (set2.contains(set1Element)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index 74c42692..498ea5ff 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -36,498 +36,425 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSReplaceSwitchWithIfIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSReplaceSwitchWithIfIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSReplaceSwitchWithIfIntention extends JSIntention
-{
-	@NonNls
-	private static final String IF_PREFIX = "if (";
-	@NonNls
-	private static final String IF_SUFFIX = ") {";
-	@NonNls
-	private static final String ELSE = "} else {";
-	@NonNls
-	private static final String ELSE_KEYWORD = "else ";
-	@NonNls
-	private static final String VAR_PREFIX = "var ";
-	@NonNls
-	private static final String BREAK_KEYWORD = "break ";
-	@NonNls
-	private static final String DEFAULT_LABEL_NAME = "Label";
-
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.switchtoifReplaceSwitchWithIf().get();
-	}
-
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new SwitchPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSSwitchStatement switchStatement = (JSSwitchStatement) element.getParent();
-
-		assert (switchStatement != null);
-
-		final PsiManager mgr = switchStatement.getManager();
-		final JSExpression switchExpression = switchStatement.getSwitchExpression();
-		final CodeStyleManager codeStyleMgr = CodeStyleManager.getInstance(element.getProject());
-		final boolean hadSideEffects = SideEffectChecker.mayHaveSideEffects(switchExpression);
-		final String declarationString;
-		final String expressionText;
-
-		if (hadSideEffects)
-		{
-			final String variableName = "i"; // TODO JavaCodeStyleManager.getInstance(switchExpression.getProject()).suggestUniqueVariableName("i", switchExpression, true);
-
-			expressionText = variableName;
-			declarationString = VAR_PREFIX + variableName + " = " + switchExpression.getText() + ';';
-		}
-		else
-		{
-			declarationString = null;
-			expressionText = switchExpression.getText();
-		}
-
-		boolean renameBreaks = false;
-
-		for (JSCaseClause caseClause : switchStatement.getCaseClauses())
-		{
-			if (CaseUtil.containsHiddenBreak(caseClause))
-			{
-				renameBreaks = true;
-				break;
-			}
-		}
-
-		final StringBuilder ifStatementBuffer = new StringBuilder(1024);
-		String breakLabel = null;
-
-		if (renameBreaks)
-		{
-			breakLabel = CaseUtil.findUniqueLabel(switchStatement, DEFAULT_LABEL_NAME);
-			ifStatementBuffer.append(breakLabel).append(':');
-		}
-
-		final List<SwitchStatementBranch> openBranches = new ArrayList<>();
-		final Set<JSVariable> declaredVars = new HashSet<>(5);
-		final List<SwitchStatementBranch> allBranches = new ArrayList<>();
-		SwitchStatementBranch currentBranch = null;
-
-		for (JSCaseClause caseClause : switchStatement.getCaseClauses())
-		{
-			final PsiElement[] caseClauseChildren = caseClause.getChildren();
-
-			for (PsiElement child : caseClauseChildren)
-			{
-				if (child == caseClauseChildren[0])
-				{
-					if (currentBranch == null)
-					{
-						openBranches.clear();
-						currentBranch = new SwitchStatementBranch();
-						currentBranch.addPendingVariableDeclarations(declaredVars);
-						allBranches.add(currentBranch);
-						openBranches.add(currentBranch);
-					}
-					else if (currentBranch.hasStatements())
-					{
-						currentBranch = new SwitchStatementBranch();
-						allBranches.add(currentBranch);
-						openBranches.add(currentBranch);
-					}
-
-					if (caseClause.isDefault())
-					{
-						currentBranch.setDefault();
-					}
-				}
-
-				if (child instanceof JSExpression)
-				{
-					// Processes case clause expression
-					final JSExpression value = ParenthesesUtils.stripParentheses(caseClause.getCaseExpression());
-
-					assert (currentBranch != null);
-					currentBranch.addLabel(value.getText());
-				}
-				else if (child instanceof JSStatement)
-				{
-					// Processes case clause statements
-					final JSStatement statement = (JSStatement) child;
-
-					if (statement instanceof JSVarStatement)
-					{
-						Collections.addAll(declaredVars, ((JSVarStatement)statement).getVariables());
-					}
-					else if (statement instanceof JSBlockStatement)
-					{
-						for (PsiElement blockElement : statement.getChildren())
-						{
-							final boolean isJsElement = (blockElement instanceof JSElement);
-							final boolean isWhiteSpace = (blockElement instanceof PsiWhiteSpace);
-
-							for (SwitchStatementBranch branch : openBranches)
-							{
-								if (isJsElement)
-								{
-									branch.addStatement((JSElement) blockElement);
-								}
-								else if (isWhiteSpace)
-								{
-									branch.addWhiteSpace(blockElement);
-								}
-								else
-								{
-									branch.addComment(blockElement);
-								}
-							}
-						}
-					}
-					else
-					{
-						for (SwitchStatementBranch branch : openBranches)
-						{
-							branch.addStatement(statement);
-						}
-					}
-
-					if (!ControlFlowUtils.statementMayCompleteNormally(statement))
-					{
-						currentBranch = null;
-					}
-				}
-				else
-				{
-					final boolean isWhiteSpace = (child instanceof PsiWhiteSpace);
-
-					for (SwitchStatementBranch openBranch : openBranches)
-					{
-						if (isWhiteSpace)
-						{
-							openBranch.addWhiteSpace(child);
-						}
-						else
-						{
-							openBranch.addComment(child);
-						}
-					}
-				}
-			}
-		}
-
-		boolean firstBranch = true;
-		SwitchStatementBranch defaultBranch = null;
-
-		for (SwitchStatementBranch branch : allBranches)
-		{
-			if (branch.isDefault())
-			{
-				defaultBranch = branch;
-			}
-			else
-			{
-				final List<String> labels = branch.getLabels();
-				final List<PsiElement> bodyElements = branch.getBodyElements();
-				final Set<JSVariable> pendingVariableDeclarations = branch.getPendingVariableDeclarations();
-
-				dumpBranch(
-					ifStatementBuffer,
-					expressionText,
-					labels,
-					bodyElements,
-					firstBranch,
-					renameBreaks && CaseUtil.containsHiddenBreak(bodyElements),
-					breakLabel,
-					pendingVariableDeclarations
-				);
-				firstBranch = false;
-			}
-		}
-		if (defaultBranch != null)
-		{
-			final List<PsiElement> bodyElements = defaultBranch.getBodyElements();
-			final Set<JSVariable> pendingVariableDeclarations = defaultBranch.getPendingVariableDeclarations();
-
-			dumpDefaultBranch(
-				ifStatementBuffer,
-				bodyElements,
-				firstBranch,
-				renameBreaks,
-				breakLabel,
-				pendingVariableDeclarations
-			);
-		}
-
-		if (hadSideEffects)
-		{
-			final String ifStatementString = ifStatementBuffer.toString();
-			final JSStatement declarationStatement = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), declarationString).getPsi();
-			final JSStatement ifStatement = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
-
-			codeStyleMgr.reformat(declarationStatement);
-			codeStyleMgr.reformat(ifStatement);
-			JSElementFactory.replaceStatement(switchStatement, declarationStatement.getText() + '\n' + ifStatement.getText());
-		}
-		else
-		{
-			final String ifStatementString = ifStatementBuffer.toString();
-			final JSStatement newStatement = (JSStatement) JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
-
-			codeStyleMgr.reformat(newStatement);
-			JSElementFactory.replaceStatement(switchStatement, newStatement.getText());
-		}
-	}
-
-	@RequiredReadAction
-	private static void dumpBranch(
-		StringBuilder ifStatementString,
-		String expressionText,
-		List<String> labels,
-		List<PsiElement> bodyStatements,
-		boolean firstBranch,
-		boolean renameBreaks,
-		String breakLabel,
-		Set<JSVariable> variableDecls
-	)
-	{
-		if (!firstBranch)
-		{
-			ifStatementString.append(ELSE_KEYWORD);
-		}
-		dumpLabels(ifStatementString, expressionText, labels);
-		dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel, variableDecls);
-	}
-
-	@RequiredReadAction
-	private static void dumpDefaultBranch(
-		StringBuilder ifStatementString,
-		List<PsiElement> bodyStatements,
-		boolean firstBranch,
-		boolean renameBreaks,
-		String breakLabel,
-		Set<JSVariable> variableDecls
-	)
-	{
-		if (!firstBranch)
-		{
-			ifStatementString.append(ELSE_KEYWORD);
-		}
-		dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel, variableDecls);
-	}
-
-	private static void dumpLabels(StringBuilder ifStatementString, String expressionText, List<String> labels)
-	{
-		boolean firstLabel = true;
-
-		ifStatementString.append(IF_PREFIX);
-		for (String label : labels)
-		{
-			if (!firstLabel)
-			{
-				ifStatementString.append("||");
-			}
-			firstLabel = false;
-
-			ifStatementString.append(expressionText).append("==").append(label);
-		}
-		ifStatementString.append(')');
-	}
-
-	@RequiredReadAction
-	private static void dumpBody(
-		StringBuilder ifStatementString,
-		List<PsiElement> bodyStatements,
-		boolean renameBreaks,
-		String breakLabel,
-		Set<JSVariable> variableDecls
-	)
-	{
-		ifStatementString.append('{');
-		for (final JSVariable var : variableDecls)
-		{
-			if (CaseUtil.isUsedByStatementList(var, bodyStatements))
-			{
-				ifStatementString.append(VAR_PREFIX)
-						.append(var.getName())
-						.append(';');
-			}
-		}
-
-		for (final PsiElement bodyStatement : bodyStatements)
-		{
-			if (!(bodyStatement instanceof JSBreakStatement))
-			{
-				appendElement(ifStatementString, bodyStatement, renameBreaks,
-						breakLabel);
-			}
-		}
-		ifStatementString.append('}');
-	}
-
-	@RequiredReadAction
-	private static void appendElement(
-		StringBuilder ifStatementString,
-		PsiElement element,
-		boolean renameBreakElements,
-		String breakLabelString
-	)
-	{
-		if (!renameBreakElements)
-		{
-			final String text = element.getText();
-
-			ifStatementString.append(text);
-		}
-		else if (element instanceof JSBreakStatement breakStatement)
-		{
-			final String identifier = breakStatement.getLabel();
-
-			if (identifier == null || identifier.isEmpty())
-			{
-				ifStatementString.append(BREAK_KEYWORD).append(breakLabelString).append(';');
-			}
-			else
-			{
-				ifStatementString.append(element.getText());
-			}
-		}
-		else if (element instanceof JSBlockStatement)
-		{
-			for (final PsiElement child : element.getChildren())
-			{
-				appendElement(ifStatementString, child, renameBreakElements, breakLabelString);
-			}
-		}
-		else if (element instanceof JSIfStatement ifStatement)
-		{
-			JSStatement elseBranch = ifStatement.getElse();
-
-			ifStatementString.append(IF_PREFIX)
-					.append(ifStatement.getCondition().getText())
-					.append(IF_SUFFIX);
-			appendElement(ifStatementString, ifStatement.getThen(), renameBreakElements, breakLabelString);
-			if (elseBranch != null)
-			{
-				ifStatementString.append(ELSE);
-				appendElement(ifStatementString, elseBranch, renameBreakElements, breakLabelString);
-			}
-			ifStatementString.append('}');
-		}
-		else
-		{
-			ifStatementString.append(element.getText());
-		}
-	}
-
-	private static class SwitchPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			final PsiElement parent = element.getParent();
-
-			if (parent instanceof JSSwitchStatement switchStatement)
-			{
-				if (ErrorUtil.containsError(switchStatement))
-				{
-					return false;
-				}
-
-				final JSExpression expression = switchStatement.getSwitchExpression();
-
-				return expression != null && expression.isValid();
-			}
-			else
-			{
-				return false;
-			}
-		}
-	}
-
-	private static class SwitchStatementBranch
-	{
-		private final Set<JSVariable> pendingVariableDeclarations = new HashSet<>(5);
-		private final List<String> labels = new ArrayList<>(2);
-		private final List<PsiElement> bodyElements = new ArrayList<>(5);
-		private final List<PsiElement> pendingWhiteSpace = new ArrayList<>(2);
-		private boolean isDefault;
-		private boolean hasStatements;
-
-		public void addLabel(String labelString)
-		{
-			this.labels.add(labelString);
-		}
-
-		public void addStatement(JSElement statement)
-		{
-			this.hasStatements = true;
-			this.addElement(statement);
-		}
-
-		public void addComment(PsiElement comment)
-		{
-			this.addElement(comment);
-		}
-
-		private void addElement(PsiElement element)
-		{
-			this.bodyElements.addAll(this.pendingWhiteSpace);
-			this.pendingWhiteSpace.clear();
-			this.bodyElements.add(element);
-		}
-
-		public void addWhiteSpace(PsiElement whiteSpace)
-		{
-			if (this.bodyElements.size() > 0)
-			{
-				this.pendingWhiteSpace.add(whiteSpace);
-			}
-		}
-
-		public List<String> getLabels()
-		{
-			return Collections.unmodifiableList(this.labels);
-		}
-
-		public List<PsiElement> getBodyElements()
-		{
-			return Collections.unmodifiableList(this.bodyElements);
-		}
-
-		public boolean isDefault()
-		{
-			return this.isDefault;
-		}
-
-		public void setDefault()
-		{
-			this.isDefault = true;
-		}
-
-		public boolean hasStatements()
-		{
-			return this.hasStatements;
-		}
-
-		public void addPendingVariableDeclarations(Set<JSVariable> vars)
-		{
-			this.pendingVariableDeclarations.addAll(vars);
-		}
-
-		public Set<JSVariable> getPendingVariableDeclarations()
-		{
-			return Collections.unmodifiableSet(this.pendingVariableDeclarations);
-		}
-	}
+public class JSReplaceSwitchWithIfIntention extends JSIntention {
+    @NonNls
+    private static final String IF_PREFIX = "if (";
+    @NonNls
+    private static final String IF_SUFFIX = ") {";
+    @NonNls
+    private static final String ELSE = "} else {";
+    @NonNls
+    private static final String ELSE_KEYWORD = "else ";
+    @NonNls
+    private static final String VAR_PREFIX = "var ";
+    @NonNls
+    private static final String BREAK_KEYWORD = "break ";
+    @NonNls
+    private static final String DEFAULT_LABEL_NAME = "Label";
+
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.switchtoifReplaceSwitchWithIf().get();
+    }
+
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new SwitchPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSSwitchStatement switchStatement = (JSSwitchStatement)element.getParent();
+
+        assert (switchStatement != null);
+
+        final PsiManager mgr = switchStatement.getManager();
+        final JSExpression switchExpression = switchStatement.getSwitchExpression();
+        final CodeStyleManager codeStyleMgr = CodeStyleManager.getInstance(element.getProject());
+        final boolean hadSideEffects = SideEffectChecker.mayHaveSideEffects(switchExpression);
+        final String declarationString;
+        final String expressionText;
+
+        if (hadSideEffects) {
+            final String variableName =
+                "i"; // TODO JavaCodeStyleManager.getInstance(switchExpression.getProject()).suggestUniqueVariableName("i", switchExpression, true);
+
+            expressionText = variableName;
+            declarationString = VAR_PREFIX + variableName + " = " + switchExpression.getText() + ';';
+        }
+        else {
+            declarationString = null;
+            expressionText = switchExpression.getText();
+        }
+
+        boolean renameBreaks = false;
+
+        for (JSCaseClause caseClause : switchStatement.getCaseClauses()) {
+            if (CaseUtil.containsHiddenBreak(caseClause)) {
+                renameBreaks = true;
+                break;
+            }
+        }
+
+        final StringBuilder ifStatementBuffer = new StringBuilder(1024);
+        String breakLabel = null;
+
+        if (renameBreaks) {
+            breakLabel = CaseUtil.findUniqueLabel(switchStatement, DEFAULT_LABEL_NAME);
+            ifStatementBuffer.append(breakLabel).append(':');
+        }
+
+        final List<SwitchStatementBranch> openBranches = new ArrayList<>();
+        final Set<JSVariable> declaredVars = new HashSet<>(5);
+        final List<SwitchStatementBranch> allBranches = new ArrayList<>();
+        SwitchStatementBranch currentBranch = null;
+
+        for (JSCaseClause caseClause : switchStatement.getCaseClauses()) {
+            final PsiElement[] caseClauseChildren = caseClause.getChildren();
+
+            for (PsiElement child : caseClauseChildren) {
+                if (child == caseClauseChildren[0]) {
+                    if (currentBranch == null) {
+                        openBranches.clear();
+                        currentBranch = new SwitchStatementBranch();
+                        currentBranch.addPendingVariableDeclarations(declaredVars);
+                        allBranches.add(currentBranch);
+                        openBranches.add(currentBranch);
+                    }
+                    else if (currentBranch.hasStatements()) {
+                        currentBranch = new SwitchStatementBranch();
+                        allBranches.add(currentBranch);
+                        openBranches.add(currentBranch);
+                    }
+
+                    if (caseClause.isDefault()) {
+                        currentBranch.setDefault();
+                    }
+                }
+
+                if (child instanceof JSExpression) {
+                    // Processes case clause expression
+                    final JSExpression value = ParenthesesUtils.stripParentheses(caseClause.getCaseExpression());
+
+                    assert (currentBranch != null);
+                    currentBranch.addLabel(value.getText());
+                }
+                else if (child instanceof JSStatement) {
+                    // Processes case clause statements
+                    final JSStatement statement = (JSStatement)child;
+
+                    if (statement instanceof JSVarStatement) {
+                        Collections.addAll(declaredVars, ((JSVarStatement)statement).getVariables());
+                    }
+                    else if (statement instanceof JSBlockStatement) {
+                        for (PsiElement blockElement : statement.getChildren()) {
+                            final boolean isJsElement = (blockElement instanceof JSElement);
+                            final boolean isWhiteSpace = (blockElement instanceof PsiWhiteSpace);
+
+                            for (SwitchStatementBranch branch : openBranches) {
+                                if (isJsElement) {
+                                    branch.addStatement((JSElement)blockElement);
+                                }
+                                else if (isWhiteSpace) {
+                                    branch.addWhiteSpace(blockElement);
+                                }
+                                else {
+                                    branch.addComment(blockElement);
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        for (SwitchStatementBranch branch : openBranches) {
+                            branch.addStatement(statement);
+                        }
+                    }
+
+                    if (!ControlFlowUtils.statementMayCompleteNormally(statement)) {
+                        currentBranch = null;
+                    }
+                }
+                else {
+                    final boolean isWhiteSpace = (child instanceof PsiWhiteSpace);
+
+                    for (SwitchStatementBranch openBranch : openBranches) {
+                        if (isWhiteSpace) {
+                            openBranch.addWhiteSpace(child);
+                        }
+                        else {
+                            openBranch.addComment(child);
+                        }
+                    }
+                }
+            }
+        }
+
+        boolean firstBranch = true;
+        SwitchStatementBranch defaultBranch = null;
+
+        for (SwitchStatementBranch branch : allBranches) {
+            if (branch.isDefault()) {
+                defaultBranch = branch;
+            }
+            else {
+                final List<String> labels = branch.getLabels();
+                final List<PsiElement> bodyElements = branch.getBodyElements();
+                final Set<JSVariable> pendingVariableDeclarations = branch.getPendingVariableDeclarations();
+
+                dumpBranch(
+                    ifStatementBuffer,
+                    expressionText,
+                    labels,
+                    bodyElements,
+                    firstBranch,
+                    renameBreaks && CaseUtil.containsHiddenBreak(bodyElements),
+                    breakLabel,
+                    pendingVariableDeclarations
+                );
+                firstBranch = false;
+            }
+        }
+        if (defaultBranch != null) {
+            final List<PsiElement> bodyElements = defaultBranch.getBodyElements();
+            final Set<JSVariable> pendingVariableDeclarations = defaultBranch.getPendingVariableDeclarations();
+
+            dumpDefaultBranch(
+                ifStatementBuffer,
+                bodyElements,
+                firstBranch,
+                renameBreaks,
+                breakLabel,
+                pendingVariableDeclarations
+            );
+        }
+
+        if (hadSideEffects) {
+            final String ifStatementString = ifStatementBuffer.toString();
+            final JSStatement declarationStatement =
+                (JSStatement)JSChangeUtil.createStatementFromText(element.getProject(), declarationString).getPsi();
+            final JSStatement ifStatement =
+                (JSStatement)JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
+
+            codeStyleMgr.reformat(declarationStatement);
+            codeStyleMgr.reformat(ifStatement);
+            JSElementFactory.replaceStatement(switchStatement, declarationStatement.getText() + '\n' + ifStatement.getText());
+        }
+        else {
+            final String ifStatementString = ifStatementBuffer.toString();
+            final JSStatement newStatement =
+                (JSStatement)JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
+
+            codeStyleMgr.reformat(newStatement);
+            JSElementFactory.replaceStatement(switchStatement, newStatement.getText());
+        }
+    }
+
+    @RequiredReadAction
+    private static void dumpBranch(
+        StringBuilder ifStatementString,
+        String expressionText,
+        List<String> labels,
+        List<PsiElement> bodyStatements,
+        boolean firstBranch,
+        boolean renameBreaks,
+        String breakLabel,
+        Set<JSVariable> variableDecls
+    ) {
+        if (!firstBranch) {
+            ifStatementString.append(ELSE_KEYWORD);
+        }
+        dumpLabels(ifStatementString, expressionText, labels);
+        dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel, variableDecls);
+    }
+
+    @RequiredReadAction
+    private static void dumpDefaultBranch(
+        StringBuilder ifStatementString,
+        List<PsiElement> bodyStatements,
+        boolean firstBranch,
+        boolean renameBreaks,
+        String breakLabel,
+        Set<JSVariable> variableDecls
+    ) {
+        if (!firstBranch) {
+            ifStatementString.append(ELSE_KEYWORD);
+        }
+        dumpBody(ifStatementString, bodyStatements, renameBreaks, breakLabel, variableDecls);
+    }
+
+    private static void dumpLabels(StringBuilder ifStatementString, String expressionText, List<String> labels) {
+        boolean firstLabel = true;
+
+        ifStatementString.append(IF_PREFIX);
+        for (String label : labels) {
+            if (!firstLabel) {
+                ifStatementString.append("||");
+            }
+            firstLabel = false;
+
+            ifStatementString.append(expressionText).append("==").append(label);
+        }
+        ifStatementString.append(')');
+    }
+
+    @RequiredReadAction
+    private static void dumpBody(
+        StringBuilder ifStatementString,
+        List<PsiElement> bodyStatements,
+        boolean renameBreaks,
+        String breakLabel,
+        Set<JSVariable> variableDecls
+    ) {
+        ifStatementString.append('{');
+        for (final JSVariable var : variableDecls) {
+            if (CaseUtil.isUsedByStatementList(var, bodyStatements)) {
+                ifStatementString.append(VAR_PREFIX)
+                    .append(var.getName())
+                    .append(';');
+            }
+        }
+
+        for (final PsiElement bodyStatement : bodyStatements) {
+            if (!(bodyStatement instanceof JSBreakStatement)) {
+                appendElement(ifStatementString, bodyStatement, renameBreaks,
+                    breakLabel
+                );
+            }
+        }
+        ifStatementString.append('}');
+    }
+
+    @RequiredReadAction
+    private static void appendElement(
+        StringBuilder ifStatementString,
+        PsiElement element,
+        boolean renameBreakElements,
+        String breakLabelString
+    ) {
+        if (!renameBreakElements) {
+            final String text = element.getText();
+
+            ifStatementString.append(text);
+        }
+        else if (element instanceof JSBreakStatement breakStatement) {
+            final String identifier = breakStatement.getLabel();
+
+            if (identifier == null || identifier.isEmpty()) {
+                ifStatementString.append(BREAK_KEYWORD).append(breakLabelString).append(';');
+            }
+            else {
+                ifStatementString.append(element.getText());
+            }
+        }
+        else if (element instanceof JSBlockStatement) {
+            for (final PsiElement child : element.getChildren()) {
+                appendElement(ifStatementString, child, renameBreakElements, breakLabelString);
+            }
+        }
+        else if (element instanceof JSIfStatement ifStatement) {
+            JSStatement elseBranch = ifStatement.getElse();
+
+            ifStatementString.append(IF_PREFIX)
+                .append(ifStatement.getCondition().getText())
+                .append(IF_SUFFIX);
+            appendElement(ifStatementString, ifStatement.getThen(), renameBreakElements, breakLabelString);
+            if (elseBranch != null) {
+                ifStatementString.append(ELSE);
+                appendElement(ifStatementString, elseBranch, renameBreakElements, breakLabelString);
+            }
+            ifStatementString.append('}');
+        }
+        else {
+            ifStatementString.append(element.getText());
+        }
+    }
+
+    private static class SwitchPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            final PsiElement parent = element.getParent();
+
+            if (parent instanceof JSSwitchStatement switchStatement) {
+                if (ErrorUtil.containsError(switchStatement)) {
+                    return false;
+                }
+
+                final JSExpression expression = switchStatement.getSwitchExpression();
+
+                return expression != null && expression.isValid();
+            }
+            else {
+                return false;
+            }
+        }
+    }
+
+    private static class SwitchStatementBranch {
+        private final Set<JSVariable> pendingVariableDeclarations = new HashSet<>(5);
+        private final List<String> labels = new ArrayList<>(2);
+        private final List<PsiElement> bodyElements = new ArrayList<>(5);
+        private final List<PsiElement> pendingWhiteSpace = new ArrayList<>(2);
+        private boolean isDefault;
+        private boolean hasStatements;
+
+        public void addLabel(String labelString) {
+            this.labels.add(labelString);
+        }
+
+        public void addStatement(JSElement statement) {
+            this.hasStatements = true;
+            this.addElement(statement);
+        }
+
+        public void addComment(PsiElement comment) {
+            this.addElement(comment);
+        }
+
+        private void addElement(PsiElement element) {
+            this.bodyElements.addAll(this.pendingWhiteSpace);
+            this.pendingWhiteSpace.clear();
+            this.bodyElements.add(element);
+        }
+
+        public void addWhiteSpace(PsiElement whiteSpace) {
+            if (this.bodyElements.size() > 0) {
+                this.pendingWhiteSpace.add(whiteSpace);
+            }
+        }
+
+        public List<String> getLabels() {
+            return Collections.unmodifiableList(this.labels);
+        }
+
+        public List<PsiElement> getBodyElements() {
+            return Collections.unmodifiableList(this.bodyElements);
+        }
+
+        public boolean isDefault() {
+            return this.isDefault;
+        }
+
+        public void setDefault() {
+            this.isDefault = true;
+        }
+
+        public boolean hasStatements() {
+            return this.hasStatements;
+        }
+
+        public void addPendingVariableDeclarations(Set<JSVariable> vars) {
+            this.pendingVariableDeclarations.addAll(vars);
+        }
+
+        public Set<JSVariable> getPendingVariableDeclarations() {
+            return Collections.unmodifiableSet(this.pendingVariableDeclarations);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
index 4c057810..29302983 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
@@ -19,31 +19,26 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import org.intellij.idea.lang.javascript.psiutil.JSRecursiveElementVisitor;
 
-class LabelSearchVisitor extends JSRecursiveElementVisitor
-{
-	private final String labelName;
-	private boolean used;
+class LabelSearchVisitor extends JSRecursiveElementVisitor {
+    private final String labelName;
+    private boolean used;
 
-	LabelSearchVisitor(String name)
-	{
-		this.labelName = name;
-	}
+    LabelSearchVisitor(String name) {
+        this.labelName = name;
+    }
 
-	@Override
-	public void visitJSReferenceExpression(JSReferenceExpression expression)
-	{
-	}
+    @Override
+    public void visitJSReferenceExpression(JSReferenceExpression expression) {
+    }
 
-	@Override
-	public void visitJSLabeledStatement(JSLabeledStatement statement)
-	{
-		final String labelText = statement.getLabel();
+    @Override
+    public void visitJSLabeledStatement(JSLabeledStatement statement) {
+        final String labelText = statement.getLabel();
 
-		this.used = (labelText != null && labelText.equals(this.labelName));
-	}
+        this.used = labelText != null && labelText.equals(this.labelName);
+    }
 
-	public boolean isUsed()
-	{
-		return this.used;
-	}
+    public boolean isUsed() {
+        return this.used;
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
index 212abb00..787ede47 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
@@ -20,30 +20,24 @@
 import com.intellij.lang.javascript.psi.JSVariable;
 import org.intellij.idea.lang.javascript.psiutil.JSRecursiveElementVisitor;
 
+class LocalVariableUsageVisitor extends JSRecursiveElementVisitor {
+    private final JSVariable variable;
+    private boolean used;
 
-class LocalVariableUsageVisitor extends JSRecursiveElementVisitor
-{
-	private final JSVariable variable;
-	private boolean used;
+    LocalVariableUsageVisitor(JSVariable name) {
+        this.variable = name;
+    }
 
-	LocalVariableUsageVisitor(JSVariable name)
-	{
-		this.variable = name;
-	}
+    @Override
+    public void visitJSReferenceExpression(JSReferenceExpression expression) {
+        final JSElement reference = (JSElement)expression.resolve();
+        if (this.variable.equals(reference)) {
+            this.used = true;
+        }
+        super.visitJSReferenceExpression(expression);
+    }
 
-	@Override
-	public void visitJSReferenceExpression(JSReferenceExpression expression)
-	{
-		final JSElement reference = (JSElement) expression.resolve();
-		if(this.variable.equals(reference))
-		{
-			this.used = true;
-		}
-		super.visitJSReferenceExpression(expression);
-	}
-
-	public boolean isUsed()
-	{
-		return this.used;
-	}
+    public boolean isUsed() {
+        return this.used;
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index 324958a5..e645d590 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -32,55 +32,48 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSMergeElseIfIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSMergeElseIfIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSMergeElseIfIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifMergeElseIf().get();
-	}
+public class JSMergeElseIfIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.trivialifMergeElseIf().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new MergeElseIfPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new MergeElseIfPredicate();
+    }
 
-	@Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSIfStatement parentStatement = (JSIfStatement) element.getParent();
+    @Override
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSIfStatement parentStatement = (JSIfStatement)element.getParent();
 
-		assert (parentStatement != null);
+        assert (parentStatement != null);
 
-		final JSBlockStatement elseBranch = (JSBlockStatement) parentStatement.getElse();
-		final JSStatement elseBranchContents = elseBranch.getStatements()[0];
+        final JSBlockStatement elseBranch = (JSBlockStatement)parentStatement.getElse();
+        final JSStatement elseBranchContents = elseBranch.getStatements()[0];
 
-		JSElementFactory.replaceStatement(elseBranch, elseBranchContents.getText());
-	}
+        JSElementFactory.replaceStatement(elseBranch, elseBranchContents.getText());
+    }
 
-	private static class MergeElseIfPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSElement
-				&& element.getParent() instanceof JSIfStatement ifStatement
-				&& !ErrorUtil.containsError(ifStatement)
-				&& ifStatement.getThen() != null
-				&& ifStatement.getElse() instanceof JSBlockStatement elseBlock
-				&& isSingleIfStatement(elseBlock.getStatements());
-		}
+    private static class MergeElseIfPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSElement
+                && element.getParent() instanceof JSIfStatement ifStatement
+                && !ErrorUtil.containsError(ifStatement)
+                && ifStatement.getThen() != null
+                && ifStatement.getElse() instanceof JSBlockStatement elseBlock
+                && isSingleIfStatement(elseBlock.getStatements());
+        }
 
-		private boolean isSingleIfStatement(JSStatement[] statements)
-		{
-			return statements.length == 1 && statements[0] instanceof JSIfStatement;
-		}
-	}
+        private boolean isSingleIfStatement(JSStatement[] statements) {
+            return statements.length == 1 && statements[0] instanceof JSIfStatement;
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index bbec21bc..1327aabc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -35,81 +35,70 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSMergeIfAndIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSMergeIfAndIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSMergeIfAndIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifMergeIfAnd().get();
-	}
+public class JSMergeIfAndIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.trivialifMergeIfAnd().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new MergeIfAndPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new MergeIfAndPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		assert (element.getParent() != null);
-		assert (element.getParent() instanceof JSIfStatement || element instanceof JSIfStatement);
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        assert (element.getParent() != null);
+        assert (element.getParent() instanceof JSIfStatement || element instanceof JSIfStatement);
 
-		final JSIfStatement parentStatement = (JSIfStatement) (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
-		final JSIfStatement childStatement = (JSIfStatement) ConditionalUtils.stripBraces(parentStatement.getThen());
-		final JSExpression childCondition = childStatement.getCondition();
-		final JSExpression parentCondition = parentStatement.getCondition();
-		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.AND_PRECENDENCE);
-		final String parentConditionText = ParenthesesUtils.getParenthesized(parentCondition, ParenthesesUtils.AND_PRECENDENCE);
-		final JSStatement childThenBranch = childStatement.getThen();
-		final String statement = "if (" + parentConditionText + " && " + childConditionText + ')' + childThenBranch.getText();
+        final JSIfStatement parentStatement = (JSIfStatement)(element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+        final JSIfStatement childStatement = (JSIfStatement)ConditionalUtils.stripBraces(parentStatement.getThen());
+        final JSExpression childCondition = childStatement.getCondition();
+        final JSExpression parentCondition = parentStatement.getCondition();
+        final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.AND_PRECENDENCE);
+        final String parentConditionText = ParenthesesUtils.getParenthesized(parentCondition, ParenthesesUtils.AND_PRECENDENCE);
+        final JSStatement childThenBranch = childStatement.getThen();
+        final String statement = "if (" + parentConditionText + " && " + childConditionText + ')' + childThenBranch.getText();
 
-		JSElementFactory.replaceStatement(parentStatement, statement);
-	}
+        JSElementFactory.replaceStatement(parentStatement, statement);
+    }
 
-	private static class MergeIfAndPredicate implements JSElementPredicate
-	{
+    private static class MergeIfAndPredicate implements JSElementPredicate {
 
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSElement))
-			{
-				return false;
-			}
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSElement)) {
+                return false;
+            }
 
-			PsiElement parent = element.getParent();
+            PsiElement parent = element.getParent();
 
-			if (!(parent instanceof JSIfStatement))
-			{
-				if (element instanceof JSIfStatement)
-				{
-					parent = element;
-				}
-				else
-				{
-					return false;
-				}
-			}
+            if (!(parent instanceof JSIfStatement)) {
+                if (element instanceof JSIfStatement) {
+                    parent = element;
+                }
+                else {
+                    return false;
+                }
+            }
 
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
+            final JSIfStatement ifStatement = (JSIfStatement)parent;
 
-			if (ErrorUtil.containsError(ifStatement))
-			{
-				return false;
-			}
+            if (ErrorUtil.containsError(ifStatement)) {
+                return false;
+            }
 
-			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-			final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+            final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
 
-			return elseBranch == null && thenBranch instanceof JSIfStatement childIfStatement && childIfStatement.getElse() == null;
-		}
-	}
+            return elseBranch == null && thenBranch instanceof JSIfStatement childIfStatement && childIfStatement.getElse() == null;
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index ff3f942a..3cc8c917 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -32,168 +32,147 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSMergeIfOrIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSMergeIfOrIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSMergeIfOrIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifMergeIfOr().get();
-	}
-
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new MergeIfOrPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		assert (element instanceof JSElement);
-		JSElement jsElement = (JSElement) element;
-		if (MergeIfOrPredicate.isMergableExplicitIf(jsElement))
-		{
-			replaceMergeableExplicitIf(jsElement);
-		}
-		else
-		{
-			replaceMergeableImplicitIf(jsElement);
-		}
-	}
-
-	@RequiredReadAction
-	private static void replaceMergeableExplicitIf(JSElement token) throws IncorrectOperationException
-	{
-		final JSIfStatement parentStatement = (JSIfStatement) (token.getParent() instanceof JSIfStatement ? token.getParent() : token);
-
-		assert (parentStatement != null);
-
-		final JSIfStatement childStatement = (JSIfStatement) parentStatement.getElse();
-		final JSExpression childCondition = childStatement.getCondition();
-		final JSExpression condition = parentStatement.getCondition();
-		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
-		final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
-		final JSStatement parentThenBranch = parentStatement.getThen();
-		final StringBuilder statement = new StringBuilder("if (")
-			.append(parentConditionText)
-			.append(" || ")
-			.append(childConditionText)
-			.append(')')
-			.append(parentThenBranch.getText());
-		final JSStatement childElseBranch = childStatement.getElse();
-
-		if (childElseBranch != null)
-		{
-			statement.append("else ").append(childElseBranch.getText());
-		}
-
-		JSElementFactory.replaceStatement(parentStatement, statement.toString());
-	}
-
-	@RequiredReadAction
-	private static void replaceMergeableImplicitIf(JSElement token) throws IncorrectOperationException
-	{
-		final JSIfStatement parentStatement = (JSIfStatement) (token.getParent() instanceof JSIfStatement ? token.getParent() : token);
-		final JSIfStatement childStatement = (JSIfStatement) JSElementFactory.getNonWhiteSpaceSibling(parentStatement, true);
-
-		assert (childStatement != null);
-		assert (parentStatement != null);
-
-		final JSExpression childCondition = childStatement.getCondition();
-		final JSExpression condition = parentStatement.getCondition();
-		final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
-		final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
-		final JSStatement parentThenBranch = parentStatement.getThen();
-		final JSStatement childElseBranch = childStatement.getElse();
-		StringBuilder statement = new StringBuilder("if (")
-			.append(parentConditionText)
-			.append(" || ")
-			.append(childConditionText)
-			.append(')')
-			.append(parentThenBranch.getText());
-
-		if (childElseBranch != null)
-		{
-			statement.append("else ").append(childElseBranch.getText());
-		}
-
-		JSElementFactory.replaceStatement(parentStatement, statement.toString());
-		JSElementFactory.removeElement(childStatement);
-	}
-
-	private static class MergeIfOrPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSElement jsElement
-				&& (isMergableExplicitIf(jsElement) || isMergableImplicitIf(jsElement));
-		}
-
-		public static boolean isMergableExplicitIf(JSElement element)
-		{
-			PsiElement parent = element.getParent();
-
-			if (!(parent instanceof JSIfStatement))
-			{
-				if (element instanceof JSIfStatement)
-				{
-					parent = element;
-				}
-				else
-				{
-					return false;
-				}
-			}
-
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
-
-			if (ErrorUtil.containsError(ifStatement))
-			{
-				return false;
-			}
-
-			final JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
-
-			return thenBranch != null
-				&& elseBranch instanceof JSIfStatement childIfStatement
-				&& EquivalenceChecker.statementsAreEquivalent(thenBranch, childIfStatement.getThen());
-		}
-
-		private static boolean isMergableImplicitIf(JSElement element)
-		{
-			PsiElement parent = element.getParent();
-
-			if (!(parent instanceof JSIfStatement))
-			{
-				if (element instanceof JSIfStatement)
-				{
-					parent = element;
-				}
-				else
-				{
-					return false;
-				}
-			}
-
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
-			final JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
-
-			if (thenBranch == null || elseBranch != null || ControlFlowUtils.statementMayCompleteNormally(thenBranch)) {
-				return false;
-			}
-
-			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
-
-			return nextStatement instanceof JSIfStatement childIfStatement
-				&& EquivalenceChecker.statementsAreEquivalent(thenBranch, childIfStatement.getThen());
-		}
-	}
+public class JSMergeIfOrIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.trivialifMergeIfOr().get();
+    }
+
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new MergeIfOrPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        assert (element instanceof JSElement);
+        JSElement jsElement = (JSElement)element;
+        if (MergeIfOrPredicate.isMergableExplicitIf(jsElement)) {
+            replaceMergeableExplicitIf(jsElement);
+        }
+        else {
+            replaceMergeableImplicitIf(jsElement);
+        }
+    }
+
+    @RequiredReadAction
+    private static void replaceMergeableExplicitIf(JSElement token) throws IncorrectOperationException {
+        final JSIfStatement parentStatement = (JSIfStatement)(token.getParent() instanceof JSIfStatement ? token.getParent() : token);
+
+        assert (parentStatement != null);
+
+        final JSIfStatement childStatement = (JSIfStatement)parentStatement.getElse();
+        final JSExpression childCondition = childStatement.getCondition();
+        final JSExpression condition = parentStatement.getCondition();
+        final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
+        final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
+        final JSStatement parentThenBranch = parentStatement.getThen();
+        final StringBuilder statement = new StringBuilder("if (")
+            .append(parentConditionText)
+            .append(" || ")
+            .append(childConditionText)
+            .append(')')
+            .append(parentThenBranch.getText());
+        final JSStatement childElseBranch = childStatement.getElse();
+
+        if (childElseBranch != null) {
+            statement.append("else ").append(childElseBranch.getText());
+        }
+
+        JSElementFactory.replaceStatement(parentStatement, statement.toString());
+    }
+
+    @RequiredReadAction
+    private static void replaceMergeableImplicitIf(JSElement token) throws IncorrectOperationException {
+        final JSIfStatement parentStatement = (JSIfStatement)(token.getParent() instanceof JSIfStatement ? token.getParent() : token);
+        final JSIfStatement childStatement = (JSIfStatement)JSElementFactory.getNonWhiteSpaceSibling(parentStatement, true);
+
+        assert (childStatement != null);
+        assert (parentStatement != null);
+
+        final JSExpression childCondition = childStatement.getCondition();
+        final JSExpression condition = parentStatement.getCondition();
+        final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
+        final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
+        final JSStatement parentThenBranch = parentStatement.getThen();
+        final JSStatement childElseBranch = childStatement.getElse();
+        StringBuilder statement = new StringBuilder("if (")
+            .append(parentConditionText)
+            .append(" || ")
+            .append(childConditionText)
+            .append(')')
+            .append(parentThenBranch.getText());
+
+        if (childElseBranch != null) {
+            statement.append("else ").append(childElseBranch.getText());
+        }
+
+        JSElementFactory.replaceStatement(parentStatement, statement.toString());
+        JSElementFactory.removeElement(childStatement);
+    }
+
+    private static class MergeIfOrPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSElement jsElement
+                && (isMergableExplicitIf(jsElement) || isMergableImplicitIf(jsElement));
+        }
+
+        public static boolean isMergableExplicitIf(JSElement element) {
+            PsiElement parent = element.getParent();
+
+            if (!(parent instanceof JSIfStatement)) {
+                if (element instanceof JSIfStatement) {
+                    parent = element;
+                }
+                else {
+                    return false;
+                }
+            }
+
+            final JSIfStatement ifStatement = (JSIfStatement)parent;
+
+            if (ErrorUtil.containsError(ifStatement)) {
+                return false;
+            }
+
+            final JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
+
+            return thenBranch != null
+                && elseBranch instanceof JSIfStatement childIfStatement
+                && EquivalenceChecker.statementsAreEquivalent(thenBranch, childIfStatement.getThen());
+        }
+
+        private static boolean isMergableImplicitIf(JSElement element) {
+            PsiElement parent = element.getParent();
+
+            if (!(parent instanceof JSIfStatement)) {
+                if (element instanceof JSIfStatement) {
+                    parent = element;
+                }
+                else {
+                    return false;
+                }
+            }
+
+            final JSIfStatement ifStatement = (JSIfStatement)parent;
+            final JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
+
+            if (thenBranch == null || elseBranch != null || ControlFlowUtils.statementMayCompleteNormally(thenBranch)) {
+                return false;
+            }
+
+            final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
+
+            return nextStatement instanceof JSIfStatement childIfStatement
+                && EquivalenceChecker.statementsAreEquivalent(thenBranch, childIfStatement.getThen());
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index 70927bb1..ea22ab92 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -34,106 +34,92 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSMergeParallelIfsIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSMergeParallelIfsIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSMergeParallelIfsIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifMergeParallelIfs().get();
-	}
+public class JSMergeParallelIfsIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.trivialifMergeParallelIfs().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new MergeParallelIfsPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new MergeParallelIfsPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
-		assert (nextElement != null);
+        assert (nextElement != null);
 
-		final JSIfStatement firstStatement = (JSIfStatement) element;
-		final JSIfStatement secondStatement = (JSIfStatement) nextElement;
-		final StringBuilder statementBuffer = new StringBuilder();
+        final JSIfStatement firstStatement = (JSIfStatement)element;
+        final JSIfStatement secondStatement = (JSIfStatement)nextElement;
+        final StringBuilder statementBuffer = new StringBuilder();
 
-		this.mergeIfStatements(statementBuffer, firstStatement, secondStatement);
-		JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
-		JSElementFactory.removeElement(secondStatement);
-	}
+        this.mergeIfStatements(statementBuffer, firstStatement, secondStatement);
+        JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
+        JSElementFactory.removeElement(secondStatement);
+    }
 
-	@RequiredReadAction
-	private void mergeIfStatements(StringBuilder statementBuffer, JSIfStatement firstStatement, JSIfStatement secondStatement)
-	{
-		final JSExpression condition = firstStatement.getCondition();
-		final JSStatement firstThenBranch = firstStatement.getThen();
-		final JSStatement secondThenBranch = secondStatement.getThen();
-		final JSStatement firstElseBranch = firstStatement.getElse();
-		final JSStatement secondElseBranch = secondStatement.getElse();
+    @RequiredReadAction
+    private void mergeIfStatements(StringBuilder statementBuffer, JSIfStatement firstStatement, JSIfStatement secondStatement) {
+        final JSExpression condition = firstStatement.getCondition();
+        final JSStatement firstThenBranch = firstStatement.getThen();
+        final JSStatement secondThenBranch = secondStatement.getThen();
+        final JSStatement firstElseBranch = firstStatement.getElse();
+        final JSStatement secondElseBranch = secondStatement.getElse();
 
-		statementBuffer.append("if (").append(condition.getText()).append(')');
-		ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstThenBranch, secondThenBranch);
+        statementBuffer.append("if (").append(condition.getText()).append(')');
+        ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstThenBranch, secondThenBranch);
 
-		if (firstElseBranch != null || secondElseBranch != null)
-		{
-			statementBuffer.append("else ");
-			if (firstElseBranch instanceof JSIfStatement firstIfStatement
-				&& secondElseBranch instanceof JSIfStatement secondIfStatement
-				&& MergeParallelIfsPredicate.ifStatementsCanBeMerged(firstIfStatement, secondIfStatement))
-			{
-				this.mergeIfStatements(statementBuffer, firstIfStatement, secondIfStatement);
-			}
-			else
-			{
-				ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstElseBranch, secondElseBranch);
-			}
-		}
-	}
+        if (firstElseBranch != null || secondElseBranch != null) {
+            statementBuffer.append("else ");
+            if (firstElseBranch instanceof JSIfStatement firstIfStatement
+                && secondElseBranch instanceof JSIfStatement secondIfStatement
+                && MergeParallelIfsPredicate.ifStatementsCanBeMerged(firstIfStatement, secondIfStatement)) {
+                this.mergeIfStatements(statementBuffer, firstIfStatement, secondIfStatement);
+            }
+            else {
+                ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstElseBranch, secondElseBranch);
+            }
+        }
+    }
 
-	private static class MergeParallelIfsPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			return element instanceof JSIfStatement ifStatement
-				&& !ErrorUtil.containsError(element)
-				&& JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSIfStatement nextIfStatement
-				&& !ErrorUtil.containsError(nextIfStatement)
-				&& ifStatementsCanBeMerged(ifStatement, nextIfStatement);
-		}
+    private static class MergeParallelIfsPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            return element instanceof JSIfStatement ifStatement
+                && !ErrorUtil.containsError(element)
+                && JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSIfStatement nextIfStatement
+                && !ErrorUtil.containsError(nextIfStatement)
+                && ifStatementsCanBeMerged(ifStatement, nextIfStatement);
+        }
 
-		public static boolean ifStatementsCanBeMerged(JSIfStatement statement1, JSIfStatement statement2)
-		{
-			final JSStatement thenBranch = statement1.getThen();
-			final JSStatement elseBranch = statement1.getElse();
-			if (thenBranch == null)
-			{
-				return false;
-			}
-			final JSExpression firstCondition = statement1.getCondition();
-			final JSExpression secondCondition = statement2.getCondition();
-			if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition, secondCondition))
-			{
-				return false;
-			}
+        public static boolean ifStatementsCanBeMerged(JSIfStatement statement1, JSIfStatement statement2) {
+            final JSStatement thenBranch = statement1.getThen();
+            final JSStatement elseBranch = statement1.getElse();
+            if (thenBranch == null) {
+                return false;
+            }
+            final JSExpression firstCondition = statement1.getCondition();
+            final JSExpression secondCondition = statement2.getCondition();
+            if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition, secondCondition)) {
+                return false;
+            }
 
-			final JSStatement nextThenBranch = statement2.getThen();
-			if (!ControlFlowUtils.canBeMerged(thenBranch, nextThenBranch))
-			{
-				return false;
-			}
+            final JSStatement nextThenBranch = statement2.getThen();
+            if (!ControlFlowUtils.canBeMerged(thenBranch, nextThenBranch)) {
+                return false;
+            }
 
-			final JSStatement nextElseBranch = statement2.getElse();
-			return (elseBranch == null || nextElseBranch == null || ControlFlowUtils.canBeMerged(elseBranch, nextElseBranch));
-		}
-	}
+            final JSStatement nextElseBranch = statement2.getElse();
+            return (elseBranch == null || nextElseBranch == null || ControlFlowUtils.canBeMerged(elseBranch, nextElseBranch));
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index fb77e24c..365d4796 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -33,73 +33,63 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSRemoveRedundantElseIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSRemoveRedundantElseIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSRemoveRedundantElseIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifRemoveRedundantElse().get();
-	}
+public class JSRemoveRedundantElseIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.trivialifRemoveRedundantElse().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new RemoveRedundantElsePredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new RemoveRedundantElsePredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSIfStatement ifStatement = (JSIfStatement) element;
-		final JSStatement thenBranch = ifStatement.getThen();
-		final JSStatement elseBranch = ifStatement.getElse();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSIfStatement ifStatement = (JSIfStatement)element;
+        final JSStatement thenBranch = ifStatement.getThen();
+        final JSStatement elseBranch = ifStatement.getElse();
 
-		assert (thenBranch != null);
-		assert (elseBranch != null);
+        assert (thenBranch != null);
+        assert (elseBranch != null);
 
-		final String newIfText = "if (" + ifStatement.getCondition().getText() + ')' + thenBranch.getText();
-		final String elseText = elseBranch.getText();
-		final String newStatement = elseBranch instanceof JSBlockStatement
-			? elseText.substring(elseText.indexOf('{') + 1, elseText.lastIndexOf('}') - 1).trim()
-			: elseText;
+        final String newIfText = "if (" + ifStatement.getCondition().getText() + ')' + thenBranch.getText();
+        final String elseText = elseBranch.getText();
+        final String newStatement = elseBranch instanceof JSBlockStatement
+            ? elseText.substring(elseText.indexOf('{') + 1, elseText.lastIndexOf('}') - 1).trim()
+            : elseText;
 
-		JSElementFactory.addStatementAfter(ifStatement, newStatement);
-		JSElementFactory.replaceStatement(ifStatement, newIfText);
-	}
+        JSElementFactory.addStatementAfter(ifStatement, newStatement);
+        JSElementFactory.replaceStatement(ifStatement, newIfText);
+    }
 
-	private static class RemoveRedundantElsePredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (element instanceof JSIfStatement ifStatement && !ErrorUtil.containsError(ifStatement) && ifStatement.getElse() != null)
-			{
-				JSStatement thenBranch = ifStatement.getThen();
-				while (thenBranch instanceof JSBlockStatement thenBlockStatement)
-				{
-					JSStatement[] thenStatements = thenBlockStatement.getStatements();
+    private static class RemoveRedundantElsePredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (element instanceof JSIfStatement ifStatement && !ErrorUtil.containsError(ifStatement) && ifStatement.getElse() != null) {
+                JSStatement thenBranch = ifStatement.getThen();
+                while (thenBranch instanceof JSBlockStatement thenBlockStatement) {
+                    JSStatement[] thenStatements = thenBlockStatement.getStatements();
 
-					if (thenStatements.length == 0)
-					{
-						return true;
-					}
-					else if (thenStatements.length > 1)
-					{
-						return false;
-					}
-					thenBranch = thenStatements[0];
-				}
+                    if (thenStatements.length == 0) {
+                        return true;
+                    }
+                    else if (thenStatements.length > 1) {
+                        return false;
+                    }
+                    thenBranch = thenStatements[0];
+                }
 
-				return thenBranch instanceof JSReturnStatement;
-			}
-			return false;
-		}
-	}
+                return thenBranch instanceof JSReturnStatement;
+            }
+            return false;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index 64e90852..b6574e79 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -31,271 +31,237 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSReplaceIfWithConditionalIntention",
-	categories = {"JavaScript", "Conditional"},
-	fileExtensions = "js"
+    ignoreId = "JSReplaceIfWithConditionalIntention",
+    categories = {"JavaScript", "Conditional"},
+    fileExtensions = "js"
 )
-public class JSReplaceIfWithConditionalIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifReplaceIfWithConditional().get();
-	}
-
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new ReplaceIfWithConditionalPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSIfStatement ifStatement = (JSIfStatement) (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
-
-		assert (ifStatement != null);
-
-		if (ReplaceIfWithConditionalPredicate.isReplaceableAssignment(ifStatement))
-		{
-			final StringBuilder newStatement = new StringBuilder();
-
-			getAssignmentReplacement(newStatement, ifStatement);
-			newStatement.append(';');
-			JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
-		}
-		else if (ReplaceIfWithConditionalPredicate.isReplaceableReturn(ifStatement))
-		{
-			final StringBuilder newStatement = new StringBuilder("return ");
-
-			getReturnReplacement(newStatement, ifStatement);
-			newStatement.append(';');
-			JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
-		}
-		else if (ReplaceIfWithConditionalPredicate.isReplaceableImplicitReturn(ifStatement))
-		{
-			final JSExpression condition = ifStatement.getCondition();
-			final JSReturnStatement thenBranch = (JSReturnStatement) ConditionalUtils.stripBraces(ifStatement.getThen());
-			final JSReturnStatement elseBranch = PsiTreeUtil.getNextSiblingOfType(ifStatement, JSReturnStatement.class);
-			final String newStatement = getImplicitReturnReplacement(condition, thenBranch, elseBranch);
-
-			JSElementFactory.replaceStatement(ifStatement, newStatement);
-			if (elseBranch != null)
-			{
-				JSElementFactory.removeElement(elseBranch);
-			}
-		}
-	}
-
-	@RequiredReadAction
-	private static void getAssignmentReplacement(StringBuilder buffer, JSIfStatement ifStatement)
-	{
-		final JSExpression condition = ifStatement.getCondition();
-		final JSExpressionStatement thenBranch = (JSExpressionStatement) ConditionalUtils.stripBraces(ifStatement.getThen());
-		final JSAssignmentExpression thenAssign = (JSAssignmentExpression) thenBranch.getExpression();
-		final JSExpression thenRhs = thenAssign.getROperand();
-		final String operator = BinaryOperatorUtils.getOperatorText(thenAssign.getOperationSign());
-		final JSStatement elseBranch = ifStatement.getElse();
-
-		assert (thenRhs != null);
-
-		buffer.append(thenAssign.getLOperand().getText())
-			.append(operator)
-			.append(ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-			.append('?')
-			.append(ParenthesesUtils.getParenthesized(thenRhs, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-			.append(':');
-
-		if (elseBranch instanceof JSIfStatement)
-		{
-			getAssignmentReplacement(buffer, (JSIfStatement) elseBranch);
-			return;
-		}
-
-		final JSExpressionStatement strippedElseBranch = (JSExpressionStatement) ConditionalUtils.stripBraces(elseBranch);
-		final JSAssignmentExpression elseAssign = (JSAssignmentExpression) strippedElseBranch.getExpression();
-		final JSExpression elseRhs = elseAssign.getROperand();
-
-		assert (elseRhs != null);
-
-		buffer.append(ParenthesesUtils.getParenthesized(elseRhs, ParenthesesUtils.CONDITIONAL_PRECENDENCE));
-	}
-
-	private static void getReturnReplacement(StringBuilder buffer, JSIfStatement ifStatement)
-	{
-		final JSStatement thenBranch = ifStatement.getThen();
-		final JSReturnStatement thenReturn = (JSReturnStatement) ConditionalUtils.stripBraces(thenBranch);
-		final JSStatement elseBranch = ifStatement.getElse();
-
-		buffer.append(ParenthesesUtils.getParenthesized(ifStatement.getCondition(), ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-			.append('?')
-			.append(ParenthesesUtils.getParenthesized(thenReturn.getExpression(), ParenthesesUtils.CONDITIONAL_PRECENDENCE))
-			.append(':');
-
-		if (elseBranch instanceof JSIfStatement elseIfStatement)
-		{
-			getReturnReplacement(buffer, elseIfStatement);
-			return;
-		}
-
-		final JSReturnStatement elseReturn = (JSReturnStatement) ConditionalUtils.stripBraces(elseBranch);
-
-		buffer.append(ParenthesesUtils.getParenthesized(elseReturn.getExpression(), ParenthesesUtils.CONDITIONAL_PRECENDENCE));
-	}
-
-	private static String getImplicitReturnReplacement(JSExpression condition, JSReturnStatement thenBranch, JSReturnStatement elseBranch)
-	{
-		assert (thenBranch != null);
-		assert (elseBranch != null);
-
-		final JSExpression thenReturnValue = thenBranch.getExpression();
-		final JSExpression elseReturnValue = elseBranch.getExpression();
-
-		final String thenValue = ParenthesesUtils.getParenthesized(thenReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
-		final String elseValue = ParenthesesUtils.getParenthesized(elseReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
-		final String conditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
-
-		return "return " + conditionText + '?' + thenValue + ':' + elseValue + ';';
-	}
-
-	private static class ReplaceIfWithConditionalPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSElement))
-			{
-				return false;
-			}
-
-			PsiElement parent = element.getParent();
-
-			if (!(parent instanceof JSIfStatement))
-			{
-				if (element instanceof JSIfStatement)
-				{
-					parent = element;
-				}
-				else
-				{
-					return false;
-				}
-			}
-
-			if (ErrorUtil.containsError(parent))
-			{
-				return false;
-			}
-
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
-			final JSExpression condition = ifStatement.getCondition();
-
-			if (condition == null || !condition.isValid())
-			{
-				return false;
-			}
-			return isReplaceableAssignment(ifStatement)
-				|| isReplaceableReturn(ifStatement)
-				|| isReplaceableImplicitReturn(ifStatement);
-		}
-
-		public static boolean isReplaceableImplicitReturn(JSIfStatement ifStatement)
-		{
-			final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
-
-			if (!(nextStatement instanceof JSReturnStatement nextReturnStatement))
-			{
-				return false;
-			}
-
-			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-
-			return thenBranch instanceof JSReturnStatement thenReturnStatement
-				&& thenReturnStatement.getExpression() != null
-				&& nextReturnStatement.getExpression() != null;
-		}
-
-		public static boolean isReplaceableReturn(JSIfStatement ifStatement)
-		{
-			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-			final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
-
-			if (!(thenBranch instanceof JSReturnStatement thenReturnStatement))
-			{
-				return false;
-			}
-
-			if (elseBranch instanceof JSIfStatement elseIfStatement)
-			{
-				return isReplaceableReturn(elseIfStatement);
-			}
-
-			return elseBranch instanceof JSReturnStatement elseReturnStatement
-				&& thenReturnStatement.getExpression() != null
-				&& elseReturnStatement.getExpression() != null;
-		}
-
-		@RequiredReadAction
-		public static boolean isReplaceableAssignment(JSIfStatement ifStatement)
-		{
-			final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-			if (thenBranch == null)
-			{
-				return false;
-			}
-
-			if (!ConditionalUtils.isAssignment(thenBranch))
-			{
-				return false;
-			}
-			final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
-
-			if (elseBranch == null)
-			{
-				return false;
-			}
-
-			if (elseBranch instanceof JSIfStatement elseIfStatement)
-			{
-				return isReplaceableAssignment(elseIfStatement);
-			}
-
-			if (!ConditionalUtils.isAssignment(elseBranch))
-			{
-				return false;
-			}
-
-			final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-			final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-			final IElementType thenSign = thenExpression.getOperationSign();
-			final IElementType elseSign = elseExpression.getOperationSign();
-
-			if (!thenSign.equals(elseSign))
-			{
-				return false;
-			}
-
-			final JSExpression thenLhs = thenExpression.getLOperand();
-
-			if (thenExpression.getROperand() == null
-				|| elseExpression.getROperand() == null
-				|| elseExpression.getLOperand() == null) {
-				return false;
-			}
-			final JSExpression thenRhs = thenExpression.getROperand();
-			assert thenRhs != null;
-
-			final JSExpression elseRhs = elseExpression.getROperand();
-			if (elseRhs == null)
-			{
-				return false;
-			}
-
-			final JSExpression elseLhs = elseExpression.getLOperand();
-			return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-		}
-	}
+public class JSReplaceIfWithConditionalIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.trivialifReplaceIfWithConditional().get();
+    }
+
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new ReplaceIfWithConditionalPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSIfStatement ifStatement = (JSIfStatement)(element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+
+        assert (ifStatement != null);
+
+        if (ReplaceIfWithConditionalPredicate.isReplaceableAssignment(ifStatement)) {
+            final StringBuilder newStatement = new StringBuilder();
+
+            getAssignmentReplacement(newStatement, ifStatement);
+            newStatement.append(';');
+            JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
+        }
+        else if (ReplaceIfWithConditionalPredicate.isReplaceableReturn(ifStatement)) {
+            final StringBuilder newStatement = new StringBuilder("return ");
+
+            getReturnReplacement(newStatement, ifStatement);
+            newStatement.append(';');
+            JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
+        }
+        else if (ReplaceIfWithConditionalPredicate.isReplaceableImplicitReturn(ifStatement)) {
+            final JSExpression condition = ifStatement.getCondition();
+            final JSReturnStatement thenBranch = (JSReturnStatement)ConditionalUtils.stripBraces(ifStatement.getThen());
+            final JSReturnStatement elseBranch = PsiTreeUtil.getNextSiblingOfType(ifStatement, JSReturnStatement.class);
+            final String newStatement = getImplicitReturnReplacement(condition, thenBranch, elseBranch);
+
+            JSElementFactory.replaceStatement(ifStatement, newStatement);
+            if (elseBranch != null) {
+                JSElementFactory.removeElement(elseBranch);
+            }
+        }
+    }
+
+    @RequiredReadAction
+    private static void getAssignmentReplacement(StringBuilder buffer, JSIfStatement ifStatement) {
+        final JSExpression condition = ifStatement.getCondition();
+        final JSExpressionStatement thenBranch = (JSExpressionStatement)ConditionalUtils.stripBraces(ifStatement.getThen());
+        final JSAssignmentExpression thenAssign = (JSAssignmentExpression)thenBranch.getExpression();
+        final JSExpression thenRhs = thenAssign.getROperand();
+        final String operator = BinaryOperatorUtils.getOperatorText(thenAssign.getOperationSign());
+        final JSStatement elseBranch = ifStatement.getElse();
+
+        assert (thenRhs != null);
+
+        buffer.append(thenAssign.getLOperand().getText())
+            .append(operator)
+            .append(ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+            .append('?')
+            .append(ParenthesesUtils.getParenthesized(thenRhs, ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+            .append(':');
+
+        if (elseBranch instanceof JSIfStatement) {
+            getAssignmentReplacement(buffer, (JSIfStatement)elseBranch);
+            return;
+        }
+
+        final JSExpressionStatement strippedElseBranch = (JSExpressionStatement)ConditionalUtils.stripBraces(elseBranch);
+        final JSAssignmentExpression elseAssign = (JSAssignmentExpression)strippedElseBranch.getExpression();
+        final JSExpression elseRhs = elseAssign.getROperand();
+
+        assert (elseRhs != null);
+
+        buffer.append(ParenthesesUtils.getParenthesized(elseRhs, ParenthesesUtils.CONDITIONAL_PRECENDENCE));
+    }
+
+    private static void getReturnReplacement(StringBuilder buffer, JSIfStatement ifStatement) {
+        final JSStatement thenBranch = ifStatement.getThen();
+        final JSReturnStatement thenReturn = (JSReturnStatement)ConditionalUtils.stripBraces(thenBranch);
+        final JSStatement elseBranch = ifStatement.getElse();
+
+        buffer.append(ParenthesesUtils.getParenthesized(ifStatement.getCondition(), ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+            .append('?')
+            .append(ParenthesesUtils.getParenthesized(thenReturn.getExpression(), ParenthesesUtils.CONDITIONAL_PRECENDENCE))
+            .append(':');
+
+        if (elseBranch instanceof JSIfStatement elseIfStatement) {
+            getReturnReplacement(buffer, elseIfStatement);
+            return;
+        }
+
+        final JSReturnStatement elseReturn = (JSReturnStatement)ConditionalUtils.stripBraces(elseBranch);
+
+        buffer.append(ParenthesesUtils.getParenthesized(elseReturn.getExpression(), ParenthesesUtils.CONDITIONAL_PRECENDENCE));
+    }
+
+    private static String getImplicitReturnReplacement(JSExpression condition, JSReturnStatement thenBranch, JSReturnStatement elseBranch) {
+        assert (thenBranch != null);
+        assert (elseBranch != null);
+
+        final JSExpression thenReturnValue = thenBranch.getExpression();
+        final JSExpression elseReturnValue = elseBranch.getExpression();
+
+        final String thenValue = ParenthesesUtils.getParenthesized(thenReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
+        final String elseValue = ParenthesesUtils.getParenthesized(elseReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
+        final String conditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
+
+        return "return " + conditionText + '?' + thenValue + ':' + elseValue + ';';
+    }
+
+    private static class ReplaceIfWithConditionalPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSElement)) {
+                return false;
+            }
+
+            PsiElement parent = element.getParent();
+
+            if (!(parent instanceof JSIfStatement)) {
+                if (element instanceof JSIfStatement) {
+                    parent = element;
+                }
+                else {
+                    return false;
+                }
+            }
+
+            if (ErrorUtil.containsError(parent)) {
+                return false;
+            }
+
+            final JSIfStatement ifStatement = (JSIfStatement)parent;
+            final JSExpression condition = ifStatement.getCondition();
+
+            if (condition == null || !condition.isValid()) {
+                return false;
+            }
+            return isReplaceableAssignment(ifStatement)
+                || isReplaceableReturn(ifStatement)
+                || isReplaceableImplicitReturn(ifStatement);
+        }
+
+        public static boolean isReplaceableImplicitReturn(JSIfStatement ifStatement) {
+            final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
+
+            if (!(nextStatement instanceof JSReturnStatement nextReturnStatement)) {
+                return false;
+            }
+
+            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+
+            return thenBranch instanceof JSReturnStatement thenReturnStatement
+                && thenReturnStatement.getExpression() != null
+                && nextReturnStatement.getExpression() != null;
+        }
+
+        public static boolean isReplaceableReturn(JSIfStatement ifStatement) {
+            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+            final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+
+            if (!(thenBranch instanceof JSReturnStatement thenReturnStatement)) {
+                return false;
+            }
+
+            if (elseBranch instanceof JSIfStatement elseIfStatement) {
+                return isReplaceableReturn(elseIfStatement);
+            }
+
+            return elseBranch instanceof JSReturnStatement elseReturnStatement
+                && thenReturnStatement.getExpression() != null
+                && elseReturnStatement.getExpression() != null;
+        }
+
+        @RequiredReadAction
+        public static boolean isReplaceableAssignment(JSIfStatement ifStatement) {
+            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+            if (thenBranch == null) {
+                return false;
+            }
+
+            if (!ConditionalUtils.isAssignment(thenBranch)) {
+                return false;
+            }
+            final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+
+            if (elseBranch == null) {
+                return false;
+            }
+
+            if (elseBranch instanceof JSIfStatement elseIfStatement) {
+                return isReplaceableAssignment(elseIfStatement);
+            }
+
+            if (!ConditionalUtils.isAssignment(elseBranch)) {
+                return false;
+            }
+
+            final JSAssignmentExpression thenExpression = (JSAssignmentExpression)((JSExpressionStatement)thenBranch).getExpression();
+            final JSAssignmentExpression elseExpression = (JSAssignmentExpression)((JSExpressionStatement)elseBranch).getExpression();
+            final IElementType thenSign = thenExpression.getOperationSign();
+            final IElementType elseSign = elseExpression.getOperationSign();
+
+            if (!thenSign.equals(elseSign)) {
+                return false;
+            }
+
+            final JSExpression thenLhs = thenExpression.getLOperand();
+
+            if (thenExpression.getROperand() == null
+                || elseExpression.getROperand() == null
+                || elseExpression.getLOperand() == null) {
+                return false;
+            }
+            final JSExpression thenRhs = thenExpression.getROperand();
+            assert thenRhs != null;
+
+            final JSExpression elseRhs = elseExpression.getROperand();
+            if (elseRhs == null) {
+                return false;
+            }
+
+            final JSExpression elseLhs = elseExpression.getLOperand();
+            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 55ef2555..9f1dc29c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -31,78 +31,66 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSSimplifyIfElseIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSSimplifyIfElseIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSSimplifyIfElseIntention extends JSIntention
-{
-	@Nonnull
-	@Override
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifSimplifyIfElse().get();
-	}
+public class JSSimplifyIfElseIntention extends JSIntention {
+    @Nonnull
+    @Override
+    public String getText() {
+        return JSIntentionLocalize.trivialifSimplifyIfElse().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new SimplifyIfElsePredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new SimplifyIfElsePredicate();
+    }
 
-	@Override
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiElement statement = element.getParent() instanceof JSIfStatement ? element.getParent() : element;
+    @Override
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiElement statement = element.getParent() instanceof JSIfStatement ? element.getParent() : element;
 
-		ConditionalUtils.replaceAssignmentOrReturnIfSimplifiable((JSIfStatement) statement);
-	}
+        ConditionalUtils.replaceAssignmentOrReturnIfSimplifiable((JSIfStatement)statement);
+    }
 
-	private static class SimplifyIfElsePredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			if (!(element instanceof JSElement))
-			{
-				return false;
-			}
+    private static class SimplifyIfElsePredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            if (!(element instanceof JSElement)) {
+                return false;
+            }
 
-			PsiElement parent = element.getParent();
+            PsiElement parent = element.getParent();
 
-			if (!(parent instanceof JSIfStatement))
-			{
-				if (element instanceof JSIfStatement)
-				{
-					parent = element;
-				}
-				else
-				{
-					return false;
-				}
-			}
-			if (ErrorUtil.containsError(parent))
-			{
-				return false;
-			}
+            if (!(parent instanceof JSIfStatement)) {
+                if (element instanceof JSIfStatement) {
+                    parent = element;
+                }
+                else {
+                    return false;
+                }
+            }
+            if (ErrorUtil.containsError(parent)) {
+                return false;
+            }
 
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
-			final JSExpression condition = ifStatement.getCondition();
+            final JSIfStatement ifStatement = (JSIfStatement)parent;
+            final JSExpression condition = ifStatement.getCondition();
 
-			if (condition == null || !condition.isValid())
-			{
-				return false;
-			}
+            if (condition == null || !condition.isValid()) {
+                return false;
+            }
 
-			return ConditionalUtils.isSimplifiableAssignment(ifStatement, false)
-				|| ConditionalUtils.isSimplifiableAssignment(ifStatement, true)
-				|| ConditionalUtils.isSimplifiableReturn(ifStatement, false)
-				|| ConditionalUtils.isSimplifiableReturn(ifStatement, true)
-				|| ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, false)
-				|| ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, true)
-				|| ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, false)
-				|| ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, true);
-		}
-	}
+            return ConditionalUtils.isSimplifiableAssignment(ifStatement, false)
+                || ConditionalUtils.isSimplifiableAssignment(ifStatement, true)
+                || ConditionalUtils.isSimplifiableReturn(ifStatement, false)
+                || ConditionalUtils.isSimplifiableReturn(ifStatement, true)
+                || ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, false)
+                || ConditionalUtils.isSimplifiableImplicitReturn(ifStatement, true)
+                || ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, false)
+                || ConditionalUtils.isSimplifiableImplicitAssignment(ifStatement, true);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index efce24d0..cf5b4d33 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -31,62 +31,54 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSSplitElseIfIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSSplitElseIfIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSSplitElseIfIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifSplitElseIf().get();
-	}
+public class JSSplitElseIfIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.trivialifSplitElseIf().get();
+    }
 
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new SplitElseIfPredicate();
-	}
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new SplitElseIfPredicate();
+    }
 
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final JSIfStatement parentStatement = (JSIfStatement) element.getParent();
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final JSIfStatement parentStatement = (JSIfStatement)element.getParent();
 
-		assert (parentStatement != null);
+        assert (parentStatement != null);
 
-		final JSStatement elseBranch = parentStatement.getElse();
-		final String newStatement = '{' + elseBranch.getText() + '}';
+        final JSStatement elseBranch = parentStatement.getElse();
+        final String newStatement = '{' + elseBranch.getText() + '}';
 
-		JSElementFactory.replaceStatement(elseBranch, newStatement);
-	}
+        JSElementFactory.replaceStatement(elseBranch, newStatement);
+    }
 
-	private static class SplitElseIfPredicate implements JSElementPredicate
-	{
-		@Override
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			final PsiElement parent = element.getParent();
+    private static class SplitElseIfPredicate implements JSElementPredicate {
+        @Override
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            final PsiElement parent = element.getParent();
 
-			if (!(parent instanceof JSIfStatement))
-			{
-				return false;
-			}
+            if (!(parent instanceof JSIfStatement)) {
+                return false;
+            }
 
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
+            final JSIfStatement ifStatement = (JSIfStatement)parent;
 
-			if (ErrorUtil.containsError(ifStatement))
-			{
-				return false;
-			}
-			final JSStatement thenBranch = ifStatement.getThen();
-			final JSStatement elseBranch = ifStatement.getElse();
+            if (ErrorUtil.containsError(ifStatement)) {
+                return false;
+            }
+            final JSStatement thenBranch = ifStatement.getThen();
+            final JSStatement elseBranch = ifStatement.getElse();
 
-			return thenBranch != null && elseBranch != null && elseBranch instanceof JSIfStatement;
-		}
-	}
+            return thenBranch != null && elseBranch != null && elseBranch instanceof JSIfStatement;
+        }
+    }
 }
\ No newline at end of file

From f4d4550148cd5dc3eeb13ceb1078546ded44ee93 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 22 Jul 2024 16:55:25 +0300
Subject: [PATCH 211/340] Code reformat using IJ4 code style (part 3).

---
 .../intention/JSElementIterator.java          |  296 ++--
 .../intention/JSElementPredicate.java         |    5 +-
 .../intention/JSFunctionVisitor.java          |  318 ++--
 .../trivialif/JSSplitIfAndIntention.java      |  175 +--
 .../trivialif/JSSplitIfOrIntention.java       |  160 +-
 .../lang/javascript/psiutil/ArrayStack.java   |  197 ++-
 .../psiutil/BinaryOperatorUtils.java          |  191 ++-
 .../lang/javascript/psiutil/BoolUtils.java    |  314 ++--
 .../javascript/psiutil/ComparisonUtils.java   |  156 +-
 .../javascript/psiutil/ConditionalUtils.java  |  656 ++++----
 .../javascript/psiutil/ControlFlowUtils.java  | 1324 +++++++---------
 .../javascript/psiutil/DeclarationUtils.java  |  363 ++---
 .../psiutil/EquivalenceChecker.java           | 1393 ++++++++---------
 .../lang/javascript/psiutil/ErrorUtil.java    |   70 +-
 .../javascript/psiutil/ExpressionUtil.java    |  367 ++---
 .../javascript/psiutil/FindReferenceUtil.java |  330 ++--
 .../javascript/psiutil/JSElementFactory.java  |  648 ++++----
 .../psiutil/JSRecursionVisitor.java           |   95 +-
 .../psiutil/JSRecursiveElementVisitor.java    |   12 +-
 .../lang/javascript/psiutil/NumberUtil.java   |   80 +-
 .../javascript/psiutil/ParenthesesUtils.java  |  671 ++++----
 .../javascript/psiutil/RecursionUtil.java     | 1218 ++++++--------
 .../javascript/psiutil/SideEffectChecker.java |  114 +-
 .../lang/javascript/psiutil/TreeUtil.java     |  296 ++--
 .../psiutil/VariableAccessUtil.java           |  959 +++++-------
 25 files changed, 4655 insertions(+), 5753 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
index 2d6362c1..01f2cfe9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
@@ -23,165 +23,139 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-public abstract class JSElementIterator implements Iterator<PsiElement>
-{
-
-	private boolean reverse;
-	private final int minTextOffset;
-	private final int maxTextOffset;
-	private ArrayStack<PsiElement> elementStack;
-	private PsiElement next;
-	private boolean retrieveNext;
-
-	public JSElementIterator(PsiElement element)
-	{
-		this(element, false, 0, Integer.MAX_VALUE);
-	}
-
-	public JSElementIterator(PsiElement element, boolean reverse)
-	{
-		this(element, reverse, 0, Integer.MAX_VALUE);
-	}
-
-	public JSElementIterator(PsiElement element, boolean reverse, int minTextOffset, int maxTextOffset)
-	{
-		this.reverse = reverse;
-		this.minTextOffset = minTextOffset;
-		this.maxTextOffset = maxTextOffset;
-		this.retrieveNext = true;
-		this.elementStack = new ArrayStack<PsiElement>();
-
-		if(element instanceof XmlFile)
-		{
-			for(JSElement embeddedElement : JSFunctionVisitor.getEmbeddedJSElements((XmlFile) element))
-			{
-				if(reverse)
-				{
-					this.elementStack.add(0, embeddedElement);
-				}
-				else
-				{
-					this.elementStack.add(embeddedElement);
-				}
-			}
-		}
-		else if(element instanceof JSElement)
-		{
-			this.elementStack.push(element);
-		}
-		else
-		{
-			throw new ClassCastException(element.getClass().getName());
-		}
-	}
-
-	/**
-	 * Returns <tt>true</tt> if this element should be part of the iteration,
-	 * <tt>false</tt> otherwise.
-	 *
-	 * @param element this element
-	 * @return <tt>true</tt> if this element should be part of the iteration,
-	 * <tt>false</tt> otherwise.
-	 */
-	protected abstract boolean visitElement(PsiElement element);
-
-	private void findNext()
-	{
-		PsiElement element = null;
-		boolean pass = false;
-
-		if(!this.elementStack.empty())
-		{
-			do
-			{
-				element = this.elementStack.pop();
-
-				final int elementTextOffset = element.getTextOffset();
-				final int elementTextEndOffset = elementTextOffset + element.getTextLength();
-
-				if(elementTextEndOffset >= this.minTextOffset &&
-						elementTextOffset <= this.maxTextOffset)
-				{
-					pass = this.visitElement(element);
-					this.pushChildren(element.getChildren(),
-							(this.reverse ? elementTextOffset : elementTextEndOffset));
-				}
-			}
-			while(!(pass || this.elementStack.empty()));
-		}
-
-		this.next = (pass ? element : null);
-		this.retrieveNext = false;
-	}
-
-	private void pushChildren(PsiElement[] children, int elementTextOffset)
-	{
-		int childTextOffset = elementTextOffset;
-
-		if(this.reverse)
-		{
-			int index = 0;
-
-			while(index < children.length && childTextOffset <= this.maxTextOffset)
-			{
-				final PsiElement child = children[index];
-
-				childTextOffset = child.getTextOffset();
-				if(childTextOffset <= this.maxTextOffset)
-				{
-					this.elementStack.push(child);
-				}
-				index++;
-			}
-		}
-		else
-		{
-			int index = children.length - 1;
-
-			while(index >= 0 && childTextOffset >= this.minTextOffset)
-			{
-				final PsiElement child = children[index];
-
-				childTextOffset = child.getTextOffset() + child.getTextLength();
-				if(childTextOffset >= this.minTextOffset)
-				{
-					this.elementStack.push(child);
-				}
-				index--;
-			}
-		}
-	}
-
-	@Override
-	public boolean hasNext()
-	{
-		if(this.retrieveNext)
-		{
-			this.findNext();
-		}
-
-		return (this.next != null);
-	}
-
-	@Override
-	public PsiElement next()
-	{
-		if(this.retrieveNext)
-		{
-			this.findNext();  // hasNext() has not been called
-		}
-		if(this.next == null)
-		{
-			throw new NoSuchElementException();
-		}
-
-		this.retrieveNext = true;
-		return this.next;
-	}
-
-	@Override
-	public void remove()
-	{
-		throw new UnsupportedOperationException();
-	}
+public abstract class JSElementIterator implements Iterator<PsiElement> {
+    private boolean reverse;
+    private final int minTextOffset;
+    private final int maxTextOffset;
+    private ArrayStack<PsiElement> elementStack;
+    private PsiElement next;
+    private boolean retrieveNext;
+
+    public JSElementIterator(PsiElement element) {
+        this(element, false, 0, Integer.MAX_VALUE);
+    }
+
+    public JSElementIterator(PsiElement element, boolean reverse) {
+        this(element, reverse, 0, Integer.MAX_VALUE);
+    }
+
+    public JSElementIterator(PsiElement element, boolean reverse, int minTextOffset, int maxTextOffset) {
+        this.reverse = reverse;
+        this.minTextOffset = minTextOffset;
+        this.maxTextOffset = maxTextOffset;
+        this.retrieveNext = true;
+        this.elementStack = new ArrayStack<PsiElement>();
+
+        if (element instanceof XmlFile) {
+            for (JSElement embeddedElement : JSFunctionVisitor.getEmbeddedJSElements((XmlFile)element)) {
+                if (reverse) {
+                    this.elementStack.add(0, embeddedElement);
+                }
+                else {
+                    this.elementStack.add(embeddedElement);
+                }
+            }
+        }
+        else if (element instanceof JSElement) {
+            this.elementStack.push(element);
+        }
+        else {
+            throw new ClassCastException(element.getClass().getName());
+        }
+    }
+
+    /**
+     * Returns <tt>true</tt> if this element should be part of the iteration,
+     * <tt>false</tt> otherwise.
+     *
+     * @param element this element
+     * @return <tt>true</tt> if this element should be part of the iteration,
+     * <tt>false</tt> otherwise.
+     */
+    protected abstract boolean visitElement(PsiElement element);
+
+    private void findNext() {
+        PsiElement element = null;
+        boolean pass = false;
+
+        if (!this.elementStack.empty()) {
+            do {
+                element = this.elementStack.pop();
+
+                final int elementTextOffset = element.getTextOffset();
+                final int elementTextEndOffset = elementTextOffset + element.getTextLength();
+
+                if (elementTextEndOffset >= this.minTextOffset &&
+                    elementTextOffset <= this.maxTextOffset) {
+                    pass = this.visitElement(element);
+                    this.pushChildren(
+                        element.getChildren(),
+                        this.reverse ? elementTextOffset : elementTextEndOffset
+                    );
+                }
+            }
+            while (!pass && !this.elementStack.empty());
+        }
+
+        this.next = pass ? element : null;
+        this.retrieveNext = false;
+    }
+
+    private void pushChildren(PsiElement[] children, int elementTextOffset) {
+        int childTextOffset = elementTextOffset;
+
+        if (this.reverse) {
+            int index = 0;
+
+            while (index < children.length && childTextOffset <= this.maxTextOffset) {
+                final PsiElement child = children[index];
+
+                childTextOffset = child.getTextOffset();
+                if (childTextOffset <= this.maxTextOffset) {
+                    this.elementStack.push(child);
+                }
+                index++;
+            }
+        }
+        else {
+            int index = children.length - 1;
+
+            while (index >= 0 && childTextOffset >= this.minTextOffset) {
+                final PsiElement child = children[index];
+
+                childTextOffset = child.getTextOffset() + child.getTextLength();
+                if (childTextOffset >= this.minTextOffset) {
+                    this.elementStack.push(child);
+                }
+                index--;
+            }
+        }
+    }
+
+    @Override
+    public boolean hasNext() {
+        if (this.retrieveNext) {
+            this.findNext();
+        }
+
+        return (this.next != null);
+    }
+
+    @Override
+    public PsiElement next() {
+        if (this.retrieveNext) {
+            this.findNext();  // hasNext() has not been called
+        }
+        if (this.next == null) {
+            throw new NoSuchElementException();
+        }
+
+        this.retrieveNext = true;
+        return this.next;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
index 15e223eb..6fd19076 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
@@ -19,7 +19,6 @@
 
 import jakarta.annotation.Nonnull;
 
-public interface JSElementPredicate
-{
-	boolean satisfiedBy(@Nonnull PsiElement element);
+public interface JSElementPredicate {
+    boolean satisfiedBy(@Nonnull PsiElement element);
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
index cc0ca1a1..6cebb058 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
@@ -30,179 +30,147 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-public class JSFunctionVisitor extends JSElementVisitor
-{
-
-	@Override
-	public void visitElement(PsiElement element)
-	{
-		if(element instanceof JSFunction)
-		{
-			this.visitJSFunctionDeclaration((JSFunction) element);
-		}
-		else if(element instanceof JSReferenceExpression)
-		{
-			if(element == element.getParent().getChildren()[0])
-			{
-				final PsiElement firstChild = element.getParent().getFirstChild();
-
-				if(firstChild != null && firstChild.toString().indexOf(JSTokenTypes.NEW_KEYWORD.toString()) >= 0)
-				{
-					this.visitJSNewExpression(new JSNewExpressionImpl(element.getParent().getNode()));
-				}
-			}
-		}
-		else if(element instanceof XmlFile)
-		{
-			processFile((XmlFile) element);
-		}
-
-		super.visitElement(element);
-
-		for(final PsiElement childElement : element.getChildren())
-		{
-			childElement.accept(this);
-		}
-	}
-
-	@Override
-	public void visitJSNewExpression(JSNewExpression newExpression)
-	{
-	}
-
-	private static final Logger logger = Logger.getInstance(JSFunctionVisitor.class.getName());
-
-	private void processFile(XmlFile file)
-	{
-		int count = 0;
-		long start = System.currentTimeMillis();
-
-		for(final JSElement element : getEmbeddedJSElements(file))
-		{
-			this.visitElement(element);
-			count++;
-		}
-		logger.info("Processed inspection " + this.getClass().getSimpleName() + " on file " + file.getName() +
-				" (" + count + " blocks) in " + (System.currentTimeMillis() - start) + " ms.");
-	}
-
-	static Iterable<JSElement> getEmbeddedJSElements(final XmlFile file)
-	{
-		return new Iterable<JSElement>()
-		{
-			@Override
-			public Iterator<JSElement> iterator()
-			{
-				return new EmbeddedJSElementIterator(file);
-			}
-		};
-	}
-
-	/**
-	 * This iterator makes a textual search for every SCRIPT sub-text and
-	 * tries and finds JSElement instances within this SCRIPT, on which
-	 * this.visitElement() can be called.
-	 */
-	private static class EmbeddedJSElementIterator implements Iterator<JSElement>
-	{
-		@NonNls
-		private static final String SCRIPT_START = "<SCRIPT";
-		@NonNls
-		private static final String SCRIPT_END = "</SCRIPT>";
-		@NonNls
-		private static final String HTML_TAG_END = ">";
-
-		final XmlFile file;
-		final String fileText;
-		int scriptStartIndex;
-		int scriptEndIndex;
-		JSElement next;
-
-		public EmbeddedJSElementIterator(XmlFile file)
-		{
-			this.file = file;
-			this.fileText = file.getText();
-			this.scriptEndIndex = -SCRIPT_END.length();
-
-			this.findNext();
-		}
-
-		@Override
-		public boolean hasNext()
-		{
-			return (this.next != null);
-		}
-
-		@Override
-		public JSElement next()
-		{
-			if(this.next == null)
-			{
-				throw new NoSuchElementException();
-			}
-
-			JSElement next = this.next;
-
-			this.findNext();
-			return next;
-		}
-
-		private void findNext()
-		{
-			if(!(this.next == null || this.next instanceof JSEmbeddedContentImpl))
-			{
-				this.next = PsiTreeUtil.getNextSiblingOfType(this.next, JSElement.class);
-
-				if(this.next != null)
-				{
-					return;
-				}
-			}
-
-			PsiElement psiElement;
-
-			do
-			{
-				if(this.scriptStartIndex >= 0)
-				{
-					this.scriptStartIndex = this.fileText.indexOf(SCRIPT_START, this.scriptEndIndex + SCRIPT_END.length());
-				}
-
-				if(this.scriptStartIndex < 0)
-				{
-					this.next = null;
-					return;
-				}
-
-				int offset = ((this.scriptStartIndex >= 0) ? this.fileText.indexOf(HTML_TAG_END, this.scriptStartIndex + SCRIPT_START.length()) + 1
-						: 0);
-
-				this.scriptEndIndex = ((offset > 0) ? this.fileText.indexOf(SCRIPT_END, offset) : -1);
-				if(this.scriptEndIndex < 0)
-				{
-					this.scriptStartIndex = -1;
-					return;
-				}
-
-				psiElement = this.file.findElementAt(offset);
-
-				if(psiElement instanceof PsiWhiteSpace)
-				{
-					psiElement = PsiTreeUtil.getNextSiblingOfType(psiElement, JSElement.class);
-				}
-
-				if(psiElement != null && psiElement instanceof JSElement)
-				{
-					this.next = FindReferenceUtil.getFarthestAncestor(psiElement, JSElement.class);
-				}
-			}
-			while(this.next == null);
-		}
-
-		@Override
-		public void remove()
-		{
-			throw new UnsupportedOperationException();
-		}
-	}
+public class JSFunctionVisitor extends JSElementVisitor {
+    @Override
+    public void visitElement(PsiElement element) {
+        if (element instanceof JSFunction function) {
+            this.visitJSFunctionDeclaration(function);
+        }
+        else if (element instanceof JSReferenceExpression) {
+            if (element == element.getParent().getChildren()[0]) {
+                final PsiElement firstChild = element.getParent().getFirstChild();
+
+                if (firstChild != null && firstChild.toString().indexOf(JSTokenTypes.NEW_KEYWORD.toString()) >= 0) {
+                    this.visitJSNewExpression(new JSNewExpressionImpl(element.getParent().getNode()));
+                }
+            }
+        }
+        else if (element instanceof XmlFile xmlFile) {
+            processFile(xmlFile);
+        }
+
+        super.visitElement(element);
+
+        for (final PsiElement childElement : element.getChildren()) {
+            childElement.accept(this);
+        }
+    }
+
+    @Override
+    public void visitJSNewExpression(JSNewExpression newExpression) {
+    }
+
+    private static final Logger logger = Logger.getInstance(JSFunctionVisitor.class.getName());
+
+    private void processFile(XmlFile file) {
+        int count = 0;
+        long start = System.currentTimeMillis();
+
+        for (final JSElement element : getEmbeddedJSElements(file)) {
+            this.visitElement(element);
+            count++;
+        }
+        logger.info(
+            "Processed inspection " + this.getClass().getSimpleName() + " on file " + file.getName() +
+                " (" + count + " blocks) in " + (System.currentTimeMillis() - start) + " ms."
+        );
+    }
+
+    static Iterable<JSElement> getEmbeddedJSElements(final XmlFile file) {
+        return () -> new EmbeddedJSElementIterator(file);
+    }
+
+    /**
+     * This iterator makes a textual search for every SCRIPT sub-text and
+     * tries and finds JSElement instances within this SCRIPT, on which
+     * this.visitElement() can be called.
+     */
+    private static class EmbeddedJSElementIterator implements Iterator<JSElement> {
+        @NonNls
+        private static final String SCRIPT_START = "<SCRIPT";
+        @NonNls
+        private static final String SCRIPT_END = "</SCRIPT>";
+        @NonNls
+        private static final String HTML_TAG_END = ">";
+
+        final XmlFile file;
+        final String fileText;
+        int scriptStartIndex;
+        int scriptEndIndex;
+        JSElement next;
+
+        public EmbeddedJSElementIterator(XmlFile file) {
+            this.file = file;
+            this.fileText = file.getText();
+            this.scriptEndIndex = -SCRIPT_END.length();
+
+            this.findNext();
+        }
+
+        @Override
+        public boolean hasNext() {
+            return (this.next != null);
+        }
+
+        @Override
+        public JSElement next() {
+            if (this.next == null) {
+                throw new NoSuchElementException();
+            }
+
+            JSElement next = this.next;
+
+            this.findNext();
+            return next;
+        }
+
+        private void findNext() {
+            if (!(this.next == null || this.next instanceof JSEmbeddedContentImpl)) {
+                this.next = PsiTreeUtil.getNextSiblingOfType(this.next, JSElement.class);
+
+                if (this.next != null) {
+                    return;
+                }
+            }
+
+            PsiElement psiElement;
+
+            do {
+                if (this.scriptStartIndex >= 0) {
+                    this.scriptStartIndex = this.fileText.indexOf(SCRIPT_START, this.scriptEndIndex + SCRIPT_END.length());
+                }
+
+                if (this.scriptStartIndex < 0) {
+                    this.next = null;
+                    return;
+                }
+
+                int offset = this.scriptStartIndex >= 0
+                    ? this.fileText.indexOf(HTML_TAG_END, this.scriptStartIndex + SCRIPT_START.length()) + 1
+                    : 0;
+
+                this.scriptEndIndex = ((offset > 0) ? this.fileText.indexOf(SCRIPT_END, offset) : -1);
+                if (this.scriptEndIndex < 0) {
+                    this.scriptStartIndex = -1;
+                    return;
+                }
+
+                psiElement = this.file.findElementAt(offset);
+
+                if (psiElement instanceof PsiWhiteSpace) {
+                    psiElement = PsiTreeUtil.getNextSiblingOfType(psiElement, JSElement.class);
+                }
+
+                if (psiElement != null && psiElement instanceof JSElement) {
+                    this.next = FindReferenceUtil.getFarthestAncestor(psiElement, JSElement.class);
+                }
+            }
+            while (this.next == null);
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index a3871a5a..484da6ca 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -35,98 +35,87 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSSplitIfAndIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSSplitIfAndIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSSplitIfAndIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifSplitIfAnd().get();
-	}
-
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new SplitIfAndPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
-
-		assert (jsElement != null);
-		assert (jsElement instanceof JSIfStatement);
-
-		final JSIfStatement ifStatement = (JSIfStatement) jsElement;
-
-		assert (ifStatement.getCondition() instanceof JSBinaryExpression);
-
-		final JSBinaryExpression condition = (JSBinaryExpression) ifStatement.getCondition();
-		final String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
-		final String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
-		final JSStatement thenBranch = ifStatement.getThen();
-		final JSStatement elseBranch = ifStatement.getElse();
-		final String thenText = thenBranch.getText();
-		final String elseText = (elseBranch == null) ? null : elseBranch.getText();
-		final int elseLength = (elseBranch == null) ? 0 : elseText.length();
-
-		assert JSTokenTypes.ANDAND.equals(condition.getOperationSign());
-
-		final StringBuilder statement = new StringBuilder(ifStatement.getTextLength() + elseLength + 30);
-
-		statement.append("if (")
-			.append(lhsText)
-			.append(") {\n if (")
-			.append(rhsText)
-			.append(')')
-			.append(thenText);
-		if (elseBranch != null)
-		{
-			statement.append("else ").append(elseText);
-		}
-		statement.append('}');
-		if (elseBranch != null)
-		{
-			statement.append("else ").append(elseText);
-		}
-
-		JSElementFactory.replaceStatement(ifStatement, statement.toString());
-	}
-
-	private static class SplitIfAndPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			PsiElement parent = element.getParent();
-
-			if (!(parent instanceof JSIfStatement))
-			{
-				if (element instanceof JSIfStatement)
-				{
-					parent = element;
-				}
-				else
-				{
-					return false;
-				}
-			}
-
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
-			final JSExpression condition = ifStatement.getCondition();
-
-			return condition != null
-				&& !ErrorUtil.containsError(condition)
-				&& condition instanceof JSBinaryExpression binaryExpression
-				&& JSTokenTypes.ANDAND.equals(binaryExpression.getOperationSign());
-		}
-	}
+public class JSSplitIfAndIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.trivialifSplitIfAnd().get();
+    }
+
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new SplitIfAndPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+
+        assert (jsElement != null);
+        assert (jsElement instanceof JSIfStatement);
+
+        final JSIfStatement ifStatement = (JSIfStatement)jsElement;
+
+        assert (ifStatement.getCondition() instanceof JSBinaryExpression);
+
+        final JSBinaryExpression condition = (JSBinaryExpression)ifStatement.getCondition();
+        final String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
+        final String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
+        final JSStatement thenBranch = ifStatement.getThen();
+        final JSStatement elseBranch = ifStatement.getElse();
+        final String thenText = thenBranch.getText();
+        final String elseText = (elseBranch == null) ? null : elseBranch.getText();
+        final int elseLength = (elseBranch == null) ? 0 : elseText.length();
+
+        assert JSTokenTypes.ANDAND.equals(condition.getOperationSign());
+
+        final StringBuilder statement = new StringBuilder(ifStatement.getTextLength() + elseLength + 30);
+
+        statement.append("if (")
+            .append(lhsText)
+            .append(") {\n if (")
+            .append(rhsText)
+            .append(')')
+            .append(thenText);
+        if (elseBranch != null) {
+            statement.append("else ").append(elseText);
+        }
+        statement.append('}');
+        if (elseBranch != null) {
+            statement.append("else ").append(elseText);
+        }
+
+        JSElementFactory.replaceStatement(ifStatement, statement.toString());
+    }
+
+    private static class SplitIfAndPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            PsiElement parent = element.getParent();
+
+            if (!(parent instanceof JSIfStatement)) {
+                if (element instanceof JSIfStatement) {
+                    parent = element;
+                }
+                else {
+                    return false;
+                }
+            }
+
+            final JSIfStatement ifStatement = (JSIfStatement)parent;
+            final JSExpression condition = ifStatement.getCondition();
+
+            return condition != null
+                && !ErrorUtil.containsError(condition)
+                && condition instanceof JSBinaryExpression binaryExpression
+                && JSTokenTypes.ANDAND.equals(binaryExpression.getOperationSign());
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index 0487eb49..f2e3f8f5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -35,90 +35,80 @@
 
 @ExtensionImpl
 @IntentionMetaData(
-	ignoreId = "JSSplitIfOrIntention",
-	categories = {"JavaScript", "Control Flow"},
-	fileExtensions = "js"
+    ignoreId = "JSSplitIfOrIntention",
+    categories = {"JavaScript", "Control Flow"},
+    fileExtensions = "js"
 )
-public class JSSplitIfOrIntention extends JSIntention
-{
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return JSIntentionLocalize.trivialifSplitIfOr().get();
-	}
-
-	@Override
-	@Nonnull
-	public JSElementPredicate getElementPredicate()
-	{
-		return new SplitIfOrPredicate();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
-
-		assert (jsElement != null);
-		assert (jsElement instanceof JSIfStatement);
-
-		final JSIfStatement ifStatement = (JSIfStatement) jsElement;
-
-		assert (ifStatement.getCondition() instanceof JSBinaryExpression);
-
-		final JSBinaryExpression condition = (JSBinaryExpression) ifStatement.getCondition();
-		final String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
-		final String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
-		final JSStatement thenBranch = ifStatement.getThen();
-		final JSStatement elseBranch = ifStatement.getElse();
-		final String thenText = thenBranch.getText();
-
-		assert JSTokenTypes.OROR.equals(condition.getOperationSign());
-
-		final StringBuilder statement = new StringBuilder(ifStatement.getTextLength());
-
-		statement.append("if (").append(lhsText).append(')')
-			.append(thenText)
-			.append("else if (").append(rhsText).append(')')
-			.append(thenText);
-
-		if (elseBranch != null)
-		{
-			statement.append("else ").append(elseBranch.getText());
-		}
-
-		JSElementFactory.replaceStatement(ifStatement, statement.toString());
-	}
-
-	private static class SplitIfOrPredicate implements JSElementPredicate
-	{
-		@Override
-		@RequiredReadAction
-		public boolean satisfiedBy(@Nonnull PsiElement element)
-		{
-			PsiElement parent = element.getParent();
-
-			if (!(parent instanceof JSIfStatement))
-			{
-				if (element instanceof JSIfStatement)
-				{
-					parent = element;
-				}
-				else
-				{
-					return false;
-				}
-			}
-
-			final JSIfStatement ifStatement = (JSIfStatement) parent;
-			final JSExpression condition = ifStatement.getCondition();
-
-			return condition != null
-				&& !ErrorUtil.containsError(condition)
-				&& condition instanceof JSBinaryExpression binaryExpression
-				&& JSTokenTypes.OROR.equals(binaryExpression.getOperationSign());
-		}
-	}
+public class JSSplitIfOrIntention extends JSIntention {
+    @Override
+    @Nonnull
+    public String getText() {
+        return JSIntentionLocalize.trivialifSplitIfOr().get();
+    }
+
+    @Override
+    @Nonnull
+    public JSElementPredicate getElementPredicate() {
+        return new SplitIfOrPredicate();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+
+        assert (jsElement != null);
+        assert (jsElement instanceof JSIfStatement);
+
+        final JSIfStatement ifStatement = (JSIfStatement)jsElement;
+
+        assert (ifStatement.getCondition() instanceof JSBinaryExpression);
+
+        final JSBinaryExpression condition = (JSBinaryExpression)ifStatement.getCondition();
+        final String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
+        final String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
+        final JSStatement thenBranch = ifStatement.getThen();
+        final JSStatement elseBranch = ifStatement.getElse();
+        final String thenText = thenBranch.getText();
+
+        assert JSTokenTypes.OROR.equals(condition.getOperationSign());
+
+        final StringBuilder statement = new StringBuilder(ifStatement.getTextLength());
+
+        statement.append("if (").append(lhsText).append(')')
+            .append(thenText)
+            .append("else if (").append(rhsText).append(')')
+            .append(thenText);
+
+        if (elseBranch != null) {
+            statement.append("else ").append(elseBranch.getText());
+        }
+
+        JSElementFactory.replaceStatement(ifStatement, statement.toString());
+    }
+
+    private static class SplitIfOrPredicate implements JSElementPredicate {
+        @Override
+        @RequiredReadAction
+        public boolean satisfiedBy(@Nonnull PsiElement element) {
+            PsiElement parent = element.getParent();
+
+            if (!(parent instanceof JSIfStatement)) {
+                if (element instanceof JSIfStatement) {
+                    parent = element;
+                }
+                else {
+                    return false;
+                }
+            }
+
+            final JSIfStatement ifStatement = (JSIfStatement)parent;
+            final JSExpression condition = ifStatement.getCondition();
+
+            return condition != null
+                && !ErrorUtil.containsError(condition)
+                && condition instanceof JSBinaryExpression binaryExpression
+                && JSTokenTypes.OROR.equals(binaryExpression.getOperationSign());
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java
index 712115cb..07ad8b11 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ArrayStack.java
@@ -34,119 +34,108 @@
  * please use the standard {@link java.util.Stack java.util.Stack} class
  * instead.
  */
-public class ArrayStack<E> extends ArrayList<E> implements Cloneable
-{
+public class ArrayStack<E> extends ArrayList<E> implements Cloneable {
+    /**
+     * Creates an empty <tt>ArrayStack</tt>.
+     */
+    public ArrayStack() {
+    }
 
-	/**
-	 * Creates an empty <tt>ArrayStack</tt>.
-	 */
-	public ArrayStack()
-	{
-	}
+    /**
+     * Pushes an item onto the top of this stack. This has exactly
+     * the same effect as:
+     * <blockquote><pre>
+     * add(item)</pre></blockquote>
+     *
+     * @param item the item to be pushed onto this stack.
+     * @return the <tt>item</tt> argument.
+     * @see ArrayList#add
+     */
+    public E push(E item) {
+        this.add(item);
+        return item;
+    }
 
-	/**
-	 * Pushes an item onto the top of this stack. This has exactly
-	 * the same effect as:
-	 * <blockquote><pre>
-	 * add(item)</pre></blockquote>
-	 *
-	 * @param item the item to be pushed onto this stack.
-	 * @return the <tt>item</tt> argument.
-	 * @see ArrayList#add
-	 */
-	public E push(E item)
-	{
-		this.add(item);
-		return item;
-	}
+    /**
+     * Removes the object at the top of this stack and returns that
+     * object as the value of this function.
+     *
+     * @return The object at the top of this stack (the last item
+     * of the <tt>ArrayList</tt> object).
+     * @throws EmptyStackException if this stack is empty.
+     */
+    public E pop() {
+        int len = this.size();
+        E obj = this.peek();
 
-	/**
-	 * Removes the object at the top of this stack and returns that
-	 * object as the value of this function.
-	 *
-	 * @return The object at the top of this stack (the last item
-	 * of the <tt>ArrayList</tt> object).
-	 * @throws EmptyStackException if this stack is empty.
-	 */
-	public E pop()
-	{
-		int len = this.size();
-		E obj = this.peek();
+        this.remove(len - 1);
+        return obj;
+    }
 
-		this.remove(len - 1);
-		return obj;
-	}
+    /**
+     * Looks at the object at the top of this stack without removing it
+     * from the stack.
+     *
+     * @return the object at the top of this stack (the last item
+     * of the <tt>ArrayList</tt> object).
+     * @throws EmptyStackException if this stack is empty.
+     */
+    public E peek() {
+        int len = this.size();
 
-	/**
-	 * Looks at the object at the top of this stack without removing it
-	 * from the stack.
-	 *
-	 * @return the object at the top of this stack (the last item
-	 * of the <tt>ArrayList</tt> object).
-	 * @throws EmptyStackException if this stack is empty.
-	 */
-	public E peek()
-	{
-		int len = this.size();
+        if (len == 0) {
+            throw new EmptyStackException();
+        }
+        return this.get(len - 1);
+    }
 
-		if(len == 0)
-		{
-			throw new EmptyStackException();
-		}
-		return this.get(len - 1);
-	}
+    /**
+     * Tests if this stack is empty.
+     *
+     * @return <tt>true</tt> if and only if this stack contains
+     * no items; <tt>false</tt> otherwise.
+     */
+    public boolean empty() {
+        return (this.size() == 0);
+    }
 
-	/**
-	 * Tests if this stack is empty.
-	 *
-	 * @return <tt>true</tt> if and only if this stack contains
-	 * no items; <tt>false</tt> otherwise.
-	 */
-	public boolean empty()
-	{
-		return (this.size() == 0);
-	}
+    /**
+     * Returns the 1-based position where an object is on this stack.
+     * If the object <tt>o</tt> occurs as an item in this stack, this
+     * method returns the distance from the top of the stack of the
+     * occurrence nearest the top of the stack; the topmost item on the
+     * stack is considered to be at distance <tt>1</tt>. The <tt>equals</tt>
+     * method is used to compare <tt>o</tt> to the
+     * items in this stack.
+     *
+     * @param o the desired object.
+     * @return the 1-based position from the top of the stack where
+     * the object is located; the return value <tt>-1</tt>
+     * indicates that the object is not on the stack.
+     */
+    public int search(E o) {
+        int index = this.lastIndexOf(o);
 
-	/**
-	 * Returns the 1-based position where an object is on this stack.
-	 * If the object <tt>o</tt> occurs as an item in this stack, this
-	 * method returns the distance from the top of the stack of the
-	 * occurrence nearest the top of the stack; the topmost item on the
-	 * stack is considered to be at distance <tt>1</tt>. The <tt>equals</tt>
-	 * method is used to compare <tt>o</tt> to the
-	 * items in this stack.
-	 *
-	 * @param o the desired object.
-	 * @return the 1-based position from the top of the stack where
-	 * the object is located; the return value <tt>-1</tt>
-	 * indicates that the object is not on the stack.
-	 */
-	public int search(E o)
-	{
-		int index = this.lastIndexOf(o);
+        if (index >= 0) {
+            return this.size() - index;
+        }
 
-		if(index >= 0)
-		{
-			return this.size() - index;
-		}
+        return -1;
+    }
 
-		return -1;
-	}
+    /**
+     * Returns a shallow copy of this <tt>ArrayList</tt> instance.  (The
+     * elements themselves are not copied.)
+     *
+     * @return a clone of this <tt>ArrayList</tt> instance.
+     */
+    @Override
+    public Object clone() {
+        return super.clone();
+    }
 
-	/**
-	 * Returns a shallow copy of this <tt>ArrayList</tt> instance.  (The
-	 * elements themselves are not copied.)
-	 *
-	 * @return a clone of this <tt>ArrayList</tt> instance.
-	 */
-	@Override
-	public Object clone()
-	{
-		return (ArrayStack<E>) super.clone();
-	}
-
-	/**
-	 * use java.util.Stack#serialVersionUID from JDK 1.0.2 for interoperability
-	 */
-	private static final long serialVersionUID = 1224463164541339165L;
+    /**
+     * use java.util.Stack#serialVersionUID from JDK 1.0.2 for interoperability
+     */
+    private static final long serialVersionUID = 1224463164541339165L;
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
index e0e421f8..5aeb2e64 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
@@ -24,116 +24,103 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class BinaryOperatorUtils
-{
-	private static final Map<IElementType, OperatorProperties> operators;
+public class BinaryOperatorUtils {
+    private static final Map<IElementType, OperatorProperties> operators;
 
-	private BinaryOperatorUtils()
-	{
-	}
+    private BinaryOperatorUtils() {
+    }
 
-	public static boolean isBinaryOperator(JSExpression expression)
-	{
-		return (expression instanceof JSBinaryExpression &&
-				operators.containsKey(((JSBinaryExpression) expression).getOperationSign()));
-	}
+    public static boolean isBinaryOperator(JSExpression expression) {
+        return expression instanceof JSBinaryExpression binaryExpression
+            && operators.containsKey(binaryExpression.getOperationSign());
+    }
 
-	public static boolean isShiftOperator(JSExpression expression)
-	{
-		if(expression instanceof JSBinaryExpression)
-		{
-			final IElementType sign = ((JSBinaryExpression) expression).getOperationSign();
+    public static boolean isShiftOperator(JSExpression expression) {
+        if (expression instanceof JSBinaryExpression binaryExpression) {
+            final IElementType sign = binaryExpression.getOperationSign();
 
-			return (sign.equals(JSTokenTypes.LTLT) ||
-					sign.equals(JSTokenTypes.GTGT) ||
-					sign.equals(JSTokenTypes.GTGTGT));
-		}
-		else
-		{
-			return false;
-		}
-	}
+            return JSTokenTypes.LTLT.equals(sign) ||
+                JSTokenTypes.GTGT.equals(sign) ||
+                JSTokenTypes.GTGTGT.equals(sign);
+        }
+        else {
+            return false;
+        }
+    }
 
-	public static String getOperatorText(IElementType operator)
-	{
-		if(operator == null)
-		{
-			return "";
-		}
-		final OperatorProperties operatorProperties = operators.get(operator);
-		assert operatorProperties != null : "Operator properties is null for " + operator;
-		return operatorProperties.text;
-	}
+    public static String getOperatorText(IElementType operator) {
+        if (operator == null) {
+            return "";
+        }
+        final OperatorProperties operatorProperties = operators.get(operator);
+        assert operatorProperties != null : "Operator properties is null for " + operator;
+        return operatorProperties.text;
+    }
 
-	public static boolean isCommutative(IElementType operator)
-	{
-		if(operator == null)
-		{
-			return false;
-		}
-		final OperatorProperties operatorProperties = operators.get(operator);
-		assert operatorProperties != null : "Operator properties is null for " + operator;
-		return operatorProperties.commutative;
-	}
+    public static boolean isCommutative(IElementType operator) {
+        if (operator == null) {
+            return false;
+        }
+        final OperatorProperties operatorProperties = operators.get(operator);
+        assert operatorProperties != null : "Operator properties is null for " + operator;
+        return operatorProperties.commutative;
+    }
 
-	static
-	{
-		operators = new HashMap<IElementType, OperatorProperties>(39);
+    static {
+        operators = new HashMap<IElementType, OperatorProperties>(39);
 
-		operators.put(JSTokenTypes.LT, new OperatorProperties("<", false));
-		operators.put(JSTokenTypes.GT, new OperatorProperties(">", false));
-		operators.put(JSTokenTypes.LE, new OperatorProperties("<=", false));
-		operators.put(JSTokenTypes.GE, new OperatorProperties(">=", false));
-		operators.put(JSTokenTypes.EQEQ, new OperatorProperties("==", true));
-		operators.put(JSTokenTypes.NE, new OperatorProperties("!=", true));
-		operators.put(JSTokenTypes.EQEQEQ, new OperatorProperties("===", true));
-		operators.put(JSTokenTypes.NEQEQ, new OperatorProperties("!==", true));
-		operators.put(JSTokenTypes.PLUS, new OperatorProperties("+", true));
-		operators.put(JSTokenTypes.MINUS, new OperatorProperties("-", false));
-		operators.put(JSTokenTypes.MULT, new OperatorProperties("*", true));
-		operators.put(JSTokenTypes.DIV, new OperatorProperties("/", false));
-		operators.put(JSTokenTypes.PERC, new OperatorProperties("%", false));
-		operators.put(JSTokenTypes.PLUSPLUS, new OperatorProperties("++", false));
-		operators.put(JSTokenTypes.MINUSMINUS, new OperatorProperties("--", false));
-		operators.put(JSTokenTypes.LTLT, new OperatorProperties("<<", false));
-		operators.put(JSTokenTypes.GTGT, new OperatorProperties(">>", false));
-		operators.put(JSTokenTypes.GTGTGT, new OperatorProperties(">>>", false));
-		operators.put(JSTokenTypes.AND, new OperatorProperties("&", true));
-		operators.put(JSTokenTypes.OR, new OperatorProperties("|", true));
-		operators.put(JSTokenTypes.XOR, new OperatorProperties("^", true));
-		operators.put(JSTokenTypes.EXCL, new OperatorProperties("!", false));
-		operators.put(JSTokenTypes.TILDE, new OperatorProperties("~", false));
-		operators.put(JSTokenTypes.ANDAND, new OperatorProperties("&&", true));
-		operators.put(JSTokenTypes.OROR, new OperatorProperties("||", true));
-		operators.put(JSTokenTypes.EQ, new OperatorProperties("=", false));
-		operators.put(JSTokenTypes.PLUSEQ, new OperatorProperties("+=", false));
-		operators.put(JSTokenTypes.MINUSEQ, new OperatorProperties("-=", false));
-		operators.put(JSTokenTypes.MULTEQ, new OperatorProperties("*=", false));
-		operators.put(JSTokenTypes.PERCEQ, new OperatorProperties("%=", false));
-		operators.put(JSTokenTypes.LTLTEQ, new OperatorProperties("<<=", false));
-		operators.put(JSTokenTypes.GTGTEQ, new OperatorProperties(">>=", false));
-		operators.put(JSTokenTypes.GTGTGTEQ, new OperatorProperties(">>>=", false));
-		operators.put(JSTokenTypes.ANDEQ, new OperatorProperties("&=", false));
-		operators.put(JSTokenTypes.OREQ, new OperatorProperties("|=", false));
-		operators.put(JSTokenTypes.XOREQ, new OperatorProperties("^=", false));
-		operators.put(JSTokenTypes.DIVEQ, new OperatorProperties("/=", false));
-		operators.put(JSTokenTypes.COMMA, new OperatorProperties(",", false));
-		operators.put(JSTokenTypes.IS_KEYWORD, new OperatorProperties("is", false));
-		operators.put(JSTokenTypes.AS_KEYWORD, new OperatorProperties("as", false));
-		operators.put(JSTokenTypes.DELETE_KEYWORD, new OperatorProperties("delete ", false));
-		operators.put(JSTokenTypes.VOID_KEYWORD, new OperatorProperties("void ", false));
-		operators.put(JSTokenTypes.TYPEOF_KEYWORD, new OperatorProperties("typeof ", false));
-	}
+        operators.put(JSTokenTypes.LT, new OperatorProperties("<", false));
+        operators.put(JSTokenTypes.GT, new OperatorProperties(">", false));
+        operators.put(JSTokenTypes.LE, new OperatorProperties("<=", false));
+        operators.put(JSTokenTypes.GE, new OperatorProperties(">=", false));
+        operators.put(JSTokenTypes.EQEQ, new OperatorProperties("==", true));
+        operators.put(JSTokenTypes.NE, new OperatorProperties("!=", true));
+        operators.put(JSTokenTypes.EQEQEQ, new OperatorProperties("===", true));
+        operators.put(JSTokenTypes.NEQEQ, new OperatorProperties("!==", true));
+        operators.put(JSTokenTypes.PLUS, new OperatorProperties("+", true));
+        operators.put(JSTokenTypes.MINUS, new OperatorProperties("-", false));
+        operators.put(JSTokenTypes.MULT, new OperatorProperties("*", true));
+        operators.put(JSTokenTypes.DIV, new OperatorProperties("/", false));
+        operators.put(JSTokenTypes.PERC, new OperatorProperties("%", false));
+        operators.put(JSTokenTypes.PLUSPLUS, new OperatorProperties("++", false));
+        operators.put(JSTokenTypes.MINUSMINUS, new OperatorProperties("--", false));
+        operators.put(JSTokenTypes.LTLT, new OperatorProperties("<<", false));
+        operators.put(JSTokenTypes.GTGT, new OperatorProperties(">>", false));
+        operators.put(JSTokenTypes.GTGTGT, new OperatorProperties(">>>", false));
+        operators.put(JSTokenTypes.AND, new OperatorProperties("&", true));
+        operators.put(JSTokenTypes.OR, new OperatorProperties("|", true));
+        operators.put(JSTokenTypes.XOR, new OperatorProperties("^", true));
+        operators.put(JSTokenTypes.EXCL, new OperatorProperties("!", false));
+        operators.put(JSTokenTypes.TILDE, new OperatorProperties("~", false));
+        operators.put(JSTokenTypes.ANDAND, new OperatorProperties("&&", true));
+        operators.put(JSTokenTypes.OROR, new OperatorProperties("||", true));
+        operators.put(JSTokenTypes.EQ, new OperatorProperties("=", false));
+        operators.put(JSTokenTypes.PLUSEQ, new OperatorProperties("+=", false));
+        operators.put(JSTokenTypes.MINUSEQ, new OperatorProperties("-=", false));
+        operators.put(JSTokenTypes.MULTEQ, new OperatorProperties("*=", false));
+        operators.put(JSTokenTypes.PERCEQ, new OperatorProperties("%=", false));
+        operators.put(JSTokenTypes.LTLTEQ, new OperatorProperties("<<=", false));
+        operators.put(JSTokenTypes.GTGTEQ, new OperatorProperties(">>=", false));
+        operators.put(JSTokenTypes.GTGTGTEQ, new OperatorProperties(">>>=", false));
+        operators.put(JSTokenTypes.ANDEQ, new OperatorProperties("&=", false));
+        operators.put(JSTokenTypes.OREQ, new OperatorProperties("|=", false));
+        operators.put(JSTokenTypes.XOREQ, new OperatorProperties("^=", false));
+        operators.put(JSTokenTypes.DIVEQ, new OperatorProperties("/=", false));
+        operators.put(JSTokenTypes.COMMA, new OperatorProperties(",", false));
+        operators.put(JSTokenTypes.IS_KEYWORD, new OperatorProperties("is", false));
+        operators.put(JSTokenTypes.AS_KEYWORD, new OperatorProperties("as", false));
+        operators.put(JSTokenTypes.DELETE_KEYWORD, new OperatorProperties("delete ", false));
+        operators.put(JSTokenTypes.VOID_KEYWORD, new OperatorProperties("void ", false));
+        operators.put(JSTokenTypes.TYPEOF_KEYWORD, new OperatorProperties("typeof ", false));
+    }
 
-	private static class OperatorProperties
-	{
-		String text;
-		boolean commutative;
+    private static class OperatorProperties {
+        String text;
+        boolean commutative;
 
-		public OperatorProperties(@NonNls String text, boolean commutative)
-		{
-			this.text = text;
-			this.commutative = commutative;
-		}
-	}
+        public OperatorProperties(@NonNls String text, boolean commutative) {
+            this.text = text;
+            this.commutative = commutative;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
index c04eedb7..d30446cb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
@@ -22,181 +22,141 @@
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
-public class BoolUtils
-{
-
-	@NonNls
-	public static final String TRUE = "true";
-	@NonNls
-	public static final String FALSE = "false";
-
-	private BoolUtils()
-	{
-	}
-
-	public static boolean isNegated(JSExpression condition)
-	{
-		return (findNegation(condition) != null);
-	}
-
-	@Nullable
-	public static JSExpression findNegation(JSExpression condition)
-	{
-		JSExpression ancestor = condition;
-
-		while(ancestor.getParent() instanceof JSParenthesizedExpression)
-		{
-			ancestor = (JSExpression) ancestor.getParent();
-		}
-
-		if(ancestor.getParent() instanceof JSPrefixExpression)
-		{
-			final JSPrefixExpression prefixAncestor = (JSPrefixExpression) ancestor.getParent();
-			if(prefixAncestor.getOperationSign().equals(JSTokenTypes.EXCL))
-			{
-				return prefixAncestor;
-			}
-		}
-
-		return null;
-	}
-
-	public static boolean isNegation(JSExpression condition)
-	{
-		return isNegation(condition, false);
-	}
-
-	public static boolean isNegation(JSExpression condition, boolean ignoreNegatedNullComparison)
-	{
-		if(condition instanceof JSPrefixExpression)
-		{
-			final JSPrefixExpression prefixExpression = (JSPrefixExpression) condition;
-			final IElementType sign = prefixExpression.getOperationSign();
-
-			return sign.equals(JSTokenTypes.EXCL);
-		}
-		else if(condition instanceof JSBinaryExpression)
-		{
-			final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
-			final IElementType sign = binaryExpression.getOperationSign();
-			final JSExpression lhs = binaryExpression.getLOperand();
-			final JSExpression rhs = binaryExpression.getROperand();
-
-			if(rhs != null && sign.equals(JSTokenTypes.NE))
-			{
-				if(!ignoreNegatedNullComparison)
-				{
-					return true;
-				}
-
-				return !isNullLiteral(lhs) && !isNullLiteral(rhs);
-			}
-			else
-			{
-				return false;
-			}
-		}
-		else if(condition instanceof JSParenthesizedExpression)
-		{
-			return isNegation(((JSParenthesizedExpression) condition).getInnerExpression());
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	private static boolean isNullLiteral(final JSExpression lhs)
-	{
-		return lhs.getNode() != null && JSTokenTypes.NULL_KEYWORD.equals(lhs.getNode().getElementType());
-	}
-
-	public static JSExpression getNegated(JSExpression condition)
-	{
-		if(condition instanceof JSPrefixExpression)
-		{
-			final JSPrefixExpression prefixExp = (JSPrefixExpression) condition;
-			final JSExpression operand = prefixExp.getExpression();
-
-			return ParenthesesUtils.stripParentheses(operand);
-		}
-		else if(condition instanceof JSBinaryExpression)
-		{
-			final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
-			final IElementType sign = binaryExpression.getOperationSign();
-			final JSExpression lhs = binaryExpression.getLOperand();
-			final JSExpression rhs = binaryExpression.getROperand();
-			final String negatedSign = ComparisonUtils.getNegatedOperatorText(sign);
-			final String negatedText = lhs.getText() + negatedSign + rhs.getText();
-
-			return (JSExpression) JSChangeUtil.createExpressionFromText(
-					condition.getProject(),
-					negatedText);
-		}
-		else if(condition instanceof JSParenthesizedExpression)
-		{
-			return getNegated(((JSParenthesizedExpression) condition).getInnerExpression());
-		}
-		return condition;
-	}
-
-	public static boolean isBooleanLiteral(JSExpression condition)
-	{
-		if(!(condition instanceof JSLiteralExpression))
-		{
-			return false;
-		}
-
-		final String text = condition.getText();
-
-		return (TRUE.equals(text) || FALSE.equals(text));
-	}
-
-	public static Boolean getBooleanLiteral(JSExpression condition)
-	{
-		if(!(condition instanceof JSLiteralExpression))
-		{
-			return null;
-		}
-
-		final String text = condition.getText();
-
-		return (TRUE.equals(text) ? Boolean.TRUE :
-				FALSE.equals(text) ? Boolean.FALSE
-						: null);
-	}
-
-	public static boolean isTrue(@Nullable JSExpression condition)
-	{
-		return (condition instanceof JSLiteralExpression &&
-				TRUE.equals(condition.getText()));
-	}
-
-	public static boolean isFalse(@Nullable JSExpression condition)
-	{
-		return (condition instanceof JSLiteralExpression &&
-				FALSE.equals(condition.getText()));
-	}
-
-	public static String getNegatedExpressionText(JSExpression condition)
-	{
-		if(BoolUtils.isNegation(condition))
-		{
-			return ParenthesesUtils.getParenthesized(BoolUtils.getNegated(condition), ParenthesesUtils.OR_PRECENDENCE);
-		}
-		else if(ComparisonUtils.isComparisonOperator(condition))
-		{
-			final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
-			final IElementType sign = binaryExpression.getOperationSign();
-			final String negatedComparison = ComparisonUtils.getNegatedOperatorText(sign);
-			final JSExpression leftOperand = binaryExpression.getLOperand();
-			final JSExpression rightOperand = binaryExpression.getROperand();
-
-			return leftOperand.getText() + negatedComparison + (rightOperand != null ? rightOperand.getText() : "");
-		}
-		else
-		{
-			return '!' + ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.PREFIX_PRECENDENCE);
-		}
-	}
+public class BoolUtils {
+    @NonNls
+    public static final String TRUE = "true";
+    @NonNls
+    public static final String FALSE = "false";
+
+    private BoolUtils() {
+    }
+
+    public static boolean isNegated(JSExpression condition) {
+        return (findNegation(condition) != null);
+    }
+
+    @Nullable
+    public static JSExpression findNegation(JSExpression condition) {
+        JSExpression ancestor = condition;
+
+        while (ancestor.getParent() instanceof JSParenthesizedExpression) {
+            ancestor = (JSExpression)ancestor.getParent();
+        }
+
+        if (ancestor.getParent() instanceof JSPrefixExpression) {
+            final JSPrefixExpression prefixAncestor = (JSPrefixExpression)ancestor.getParent();
+            if (JSTokenTypes.EXCL.equals(prefixAncestor.getOperationSign())) {
+                return prefixAncestor;
+            }
+        }
+
+        return null;
+    }
+
+    public static boolean isNegation(JSExpression condition) {
+        return isNegation(condition, false);
+    }
+
+    public static boolean isNegation(JSExpression condition, boolean ignoreNegatedNullComparison) {
+        if (condition instanceof JSPrefixExpression prefixExpression) {
+            final IElementType sign = prefixExpression.getOperationSign();
+
+            return JSTokenTypes.EXCL.equals(sign);
+        }
+        else if (condition instanceof JSBinaryExpression binaryExpression) {
+            final IElementType sign = binaryExpression.getOperationSign();
+            final JSExpression lhs = binaryExpression.getLOperand();
+            final JSExpression rhs = binaryExpression.getROperand();
+
+            if (rhs != null && JSTokenTypes.NE.equals(sign)) {
+                if (!ignoreNegatedNullComparison) {
+                    return true;
+                }
+
+                return !isNullLiteral(lhs) && !isNullLiteral(rhs);
+            }
+            else {
+                return false;
+            }
+        }
+        else if (condition instanceof JSParenthesizedExpression parenExp) {
+            return isNegation(parenExp.getInnerExpression());
+        }
+        else {
+            return false;
+        }
+    }
+
+    private static boolean isNullLiteral(final JSExpression lhs) {
+        return lhs.getNode() != null && JSTokenTypes.NULL_KEYWORD.equals(lhs.getNode().getElementType());
+    }
+
+    public static JSExpression getNegated(JSExpression condition) {
+        if (condition instanceof JSPrefixExpression prefixExp) {
+            final JSExpression operand = prefixExp.getExpression();
+
+            return ParenthesesUtils.stripParentheses(operand);
+        }
+        else if (condition instanceof JSBinaryExpression binaryExpression) {
+            final IElementType sign = binaryExpression.getOperationSign();
+            final JSExpression lhs = binaryExpression.getLOperand();
+            final JSExpression rhs = binaryExpression.getROperand();
+            final String negatedSign = ComparisonUtils.getNegatedOperatorText(sign);
+            final String negatedText = lhs.getText() + negatedSign + rhs.getText();
+
+            return JSChangeUtil.createExpressionFromText(condition.getProject(), negatedText);
+        }
+        else if (condition instanceof JSParenthesizedExpression parenExp) {
+            return getNegated(parenExp.getInnerExpression());
+        }
+        return condition;
+    }
+
+    public static boolean isBooleanLiteral(JSExpression condition) {
+        if (!(condition instanceof JSLiteralExpression)) {
+            return false;
+        }
+
+        final String text = condition.getText();
+
+        return (TRUE.equals(text) || FALSE.equals(text));
+    }
+
+    public static Boolean getBooleanLiteral(JSExpression condition) {
+        if (!(condition instanceof JSLiteralExpression)) {
+            return null;
+        }
+
+        final String text = condition.getText();
+
+        return TRUE.equals(text) ? Boolean.TRUE
+            : FALSE.equals(text) ? Boolean.FALSE
+            : null;
+    }
+
+    public static boolean isTrue(@Nullable JSExpression condition) {
+        return condition instanceof JSLiteralExpression && TRUE.equals(condition.getText());
+    }
+
+    public static boolean isFalse(@Nullable JSExpression condition) {
+        return condition instanceof JSLiteralExpression && FALSE.equals(condition.getText());
+    }
+
+    public static String getNegatedExpressionText(JSExpression condition) {
+        if (BoolUtils.isNegation(condition)) {
+            return ParenthesesUtils.getParenthesized(BoolUtils.getNegated(condition), ParenthesesUtils.OR_PRECENDENCE);
+        }
+        else if (ComparisonUtils.isComparisonOperator(condition)) {
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression)condition;
+            final IElementType sign = binaryExpression.getOperationSign();
+            final String negatedComparison = ComparisonUtils.getNegatedOperatorText(sign);
+            final JSExpression leftOperand = binaryExpression.getLOperand();
+            final JSExpression rightOperand = binaryExpression.getROperand();
+
+            return leftOperand.getText() + negatedComparison + (rightOperand != null ? rightOperand.getText() : "");
+        }
+        else {
+            return '!' + ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.PREFIX_PRECENDENCE);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
index 93e92d35..842d99e4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ComparisonUtils.java
@@ -23,90 +23,74 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class ComparisonUtils
-{
-
-	private static final Map<IElementType, OperatorTexts> operators;
-
-	private ComparisonUtils()
-	{
-	}
-
-	public static boolean isComparisonOperator(JSExpression expression)
-	{
-		return (expression instanceof JSBinaryExpression &&
-				operators.containsKey(((JSBinaryExpression) expression).getOperationSign()));
-	}
-
-	public static String getOperatorText(IElementType operator)
-	{
-		return operators.get(operator).getText();
-	}
-
-	public static boolean isEqualityTestExpression(JSBinaryExpression expression)
-	{
-		IElementType operator = expression.getOperationSign();
-		return (operator.equals(JSTokenTypes.EQEQ) || operator.equals(JSTokenTypes.NE));
-	}
-
-	public static boolean mayBeEqualExpression(JSBinaryExpression expression)
-	{
-		IElementType operator = expression.getOperationSign();
-		return (operator.equals(JSTokenTypes.EQEQ) || operator.equals(JSTokenTypes.EQEQEQ) ||
-				operator.equals(JSTokenTypes.LE) || operator.equals(JSTokenTypes.GE));
-	}
-
-	public static String getNegatedOperatorText(IElementType operator)
-	{
-		return operators.get(operator).getNegatedText();
-	}
-
-	public static String getFlippedOperatorText(IElementType operator)
-	{
-		return operators.get(operator).getFlippedText();
-	}
-
-	static
-	{
-		operators = new HashMap<IElementType, OperatorTexts>(8);
-
-		operators.put(JSTokenTypes.EQEQ, new OperatorTexts("==", "!=", "=="));
-		operators.put(JSTokenTypes.EQEQEQ, new OperatorTexts("===", "!==", "==="));
-		operators.put(JSTokenTypes.NE, new OperatorTexts("!=", "==", "!="));
-		operators.put(JSTokenTypes.NEQEQ, new OperatorTexts("!==", "===", "!=="));
-		operators.put(JSTokenTypes.GT, new OperatorTexts(">", "<=", "<"));
-		operators.put(JSTokenTypes.LT, new OperatorTexts("<", ">=", ">"));
-		operators.put(JSTokenTypes.GE, new OperatorTexts(">=", "<", "<="));
-		operators.put(JSTokenTypes.LE, new OperatorTexts("<=", ">", ">="));
-	}
-
-	private static class OperatorTexts
-	{
-		private String text;
-		private String negatedText;
-		private String flippedText;
-
-		public OperatorTexts(String text, String negatedText, String flippedText)
-		{
-			this.text = text;
-			this.negatedText = negatedText;
-			this.flippedText = flippedText;
-		}
-
-		public String getText()
-		{
-			return this.text;
-		}
-
-		public String getNegatedText()
-		{
-			return this.negatedText;
-		}
-
-		public String getFlippedText()
-		{
-			return this.flippedText;
-		}
-	}
+public class ComparisonUtils {
+    private static final Map<IElementType, OperatorTexts> operators;
+
+    private ComparisonUtils() {
+    }
+
+    public static boolean isComparisonOperator(JSExpression expression) {
+        return expression instanceof JSBinaryExpression binaryExpression
+            && operators.containsKey(binaryExpression.getOperationSign());
+    }
+
+    public static String getOperatorText(IElementType operator) {
+        return operators.get(operator).getText();
+    }
+
+    public static boolean isEqualityTestExpression(JSBinaryExpression expression) {
+        IElementType operator = expression.getOperationSign();
+        return JSTokenTypes.EQEQ.equals(operator) || JSTokenTypes.NE.equals(operator);
+    }
+
+    public static boolean mayBeEqualExpression(JSBinaryExpression expression) {
+        IElementType operator = expression.getOperationSign();
+        return JSTokenTypes.EQEQ.equals(operator) || JSTokenTypes.EQEQEQ.equals(operator)
+            || JSTokenTypes.LE.equals(operator) || JSTokenTypes.GE.equals(operator);
+    }
+
+    public static String getNegatedOperatorText(IElementType operator) {
+        return operators.get(operator).getNegatedText();
+    }
+
+    public static String getFlippedOperatorText(IElementType operator) {
+        return operators.get(operator).getFlippedText();
+    }
+
+    static {
+        operators = new HashMap<IElementType, OperatorTexts>(8);
+
+        operators.put(JSTokenTypes.EQEQ, new OperatorTexts("==", "!=", "=="));
+        operators.put(JSTokenTypes.EQEQEQ, new OperatorTexts("===", "!==", "==="));
+        operators.put(JSTokenTypes.NE, new OperatorTexts("!=", "==", "!="));
+        operators.put(JSTokenTypes.NEQEQ, new OperatorTexts("!==", "===", "!=="));
+        operators.put(JSTokenTypes.GT, new OperatorTexts(">", "<=", "<"));
+        operators.put(JSTokenTypes.LT, new OperatorTexts("<", ">=", ">"));
+        operators.put(JSTokenTypes.GE, new OperatorTexts(">=", "<", "<="));
+        operators.put(JSTokenTypes.LE, new OperatorTexts("<=", ">", ">="));
+    }
+
+    private static class OperatorTexts {
+        private String text;
+        private String negatedText;
+        private String flippedText;
+
+        public OperatorTexts(String text, String negatedText, String flippedText) {
+            this.text = text;
+            this.negatedText = negatedText;
+            this.flippedText = flippedText;
+        }
+
+        public String getText() {
+            return this.text;
+        }
+
+        public String getNegatedText() {
+            return this.negatedText;
+        }
+
+        public String getFlippedText() {
+            return this.flippedText;
+        }
+    }
 }
-
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
index c7114316..45452eac 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
@@ -23,363 +23,301 @@
 import consulo.language.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 
-public class ConditionalUtils
-{
-	private ConditionalUtils()
-	{
-	}
-
-	public static JSStatement stripBraces(JSStatement branch)
-	{
-		if(branch != null && branch instanceof JSBlockStatement)
-		{
-			final JSBlockStatement block = (JSBlockStatement) branch;
-			final JSStatement[] statements = block.getStatements();
-
-			if(statements.length == 1)
-			{
-				return statements[0];
-			}
-			else
-			{
-				return block;
-			}
-		}
-
-		return branch;
-	}
-
-	public static boolean isReturn(JSStatement statement, String value)
-	{
-		if(statement == null)
-		{
-			return false;
-		}
-		if(!(statement instanceof JSReturnStatement))
-		{
-			return false;
-		}
-
-		final JSExpression returnExpression = ((JSReturnStatement) statement).getExpression();
-
-		return (returnExpression != null && value.equals(returnExpression.getText()));
-	}
-
-	public static boolean isAssignment(JSStatement statement, String value)
-	{
-		if(statement == null || !(statement instanceof JSExpressionStatement))
-		{
-			return false;
-		}
-
-		final JSExpression expression = ((JSExpressionStatement) statement).getExpression();
-
-		if(!(expression instanceof JSAssignmentExpression))
-		{
-			return false;
-		}
-
-		final JSExpression rhs = ((JSAssignmentExpression) expression).getROperand();
-
-		return (rhs != null && rhs.getText().equals(value));
-	}
-
-	public static boolean isAssignment(JSStatement statement)
-	{
-		if(!(statement instanceof JSExpressionStatement))
-		{
-			return false;
-		}
-
-		final JSExpressionStatement expressionStatement = (JSExpressionStatement) statement;
-
-		return (expressionStatement.getExpression() instanceof JSAssignmentExpression);
-	}
-
-	public static boolean isConditional(JSExpression expression)
-	{
-		expression = ParenthesesUtils.stripParentheses(expression);
-
-		if(expression == null)
-		{
-			return false;
-		}
-
-		if(expression instanceof JSConditionalExpression)
-		{
-			return true;
-		}
-
-		if(expression instanceof JSBinaryExpression)
-		{
-			final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-			final IElementType sign = binaryExpression.getOperationSign();
-
-			if(JSTokenTypes.XOR.equals(sign))
-			{
-				return (isConditional(binaryExpression.getLOperand()) &&
-						isConditional(binaryExpression.getROperand()));
-			}
-
-			return (JSTokenTypes.ANDAND.equals(sign) || JSTokenTypes.OROR.equals(sign) ||
-					JSTokenTypes.EQ.equals(sign) || JSTokenTypes.NE.equals(sign) ||
-					JSTokenTypes.LT.equals(sign) || JSTokenTypes.LE.equals(sign) ||
-					JSTokenTypes.GT.equals(sign) || JSTokenTypes.GE.equals(sign));
-		}
-
-		return BoolUtils.isBooleanLiteral(expression);
-	}
-
-	public static boolean isSimplifiableImplicitReturn(JSIfStatement ifStatement, boolean negated)
-	{
-		final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-		final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
-
-		if(!(nextStatement instanceof JSStatement))
-		{
-			return false;
-		}
-
-		final JSStatement elseBranch = (JSStatement) nextStatement;
-
-		if(negated)
-		{
-			return (ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE) &&
-					ConditionalUtils.isReturn(elseBranch, BoolUtils.TRUE));
-		}
-		else
-		{
-			return (ConditionalUtils.isReturn(thenBranch, BoolUtils.TRUE) &&
-					ConditionalUtils.isReturn(elseBranch, BoolUtils.FALSE));
-		}
-	}
-
-	public static boolean isSimplifiableReturn(JSIfStatement ifStatement, boolean negated)
-	{
-		final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-		final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
-
-		if(negated)
-		{
-			return (ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE) &&
-					ConditionalUtils.isReturn(elseBranch, BoolUtils.TRUE));
-		}
-		else
-		{
-			return (ConditionalUtils.isReturn(thenBranch, BoolUtils.TRUE) &&
-					ConditionalUtils.isReturn(elseBranch, BoolUtils.FALSE));
-		}
-	}
-
-	public static boolean isSimplifiableAssignment(JSIfStatement ifStatement, boolean negated)
-	{
-		final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-		final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
-
-		final boolean isAssignment;
-
-		if(negated)
-		{
-			isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE) &&
-					ConditionalUtils.isAssignment(elseBranch, BoolUtils.TRUE));
-		}
-		else
-		{
-			isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.TRUE) &&
-					ConditionalUtils.isAssignment(elseBranch, BoolUtils.FALSE));
-		}
-
-		if(isAssignment)
-		{
-			final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-			final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-			final IElementType thenSign = thenExpression.getOperationSign();
-			final IElementType elseSign = elseExpression.getOperationSign();
-
-			if(!thenSign.equals(elseSign))
-			{
-				return false;
-			}
-
-			final JSExpression thenLhs = thenExpression.getLOperand();
-			final JSExpression elseLhs = elseExpression.getLOperand();
-
-			return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement, boolean negated)
-	{
-		if(ifStatement.getElse() != null)
-		{
-			return false;
-		}
-		final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-		final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, false);
-
-		if(!(nextStatement instanceof JSStatement))
-		{
-			return false;
-		}
-
-		final JSStatement elseBranch = ConditionalUtils.stripBraces((JSStatement) nextStatement);
-
-		final boolean isAssignment;
-
-		if(negated)
-		{
-			isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE) &&
-					ConditionalUtils.isAssignment(elseBranch, BoolUtils.TRUE));
-		}
-		else
-		{
-			isAssignment = (ConditionalUtils.isAssignment(thenBranch, BoolUtils.TRUE) &&
-					ConditionalUtils.isAssignment(elseBranch, BoolUtils.FALSE));
-		}
-
-		if(isAssignment)
-		{
-			final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-			final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-			final IElementType thenSign = thenExpression.getOperationSign();
-			final IElementType elseSign = elseExpression.getOperationSign();
-
-			if(!thenSign.equals(elseSign))
-			{
-				return false;
-			}
-
-			final JSExpression thenLhs = thenExpression.getLOperand();
-			final JSExpression elseLhs = elseExpression.getLOperand();
-
-			return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	public static void replaceSimplifiableImplicitReturn(JSIfStatement statement, boolean negated)
-			throws IncorrectOperationException
-	{
-		final JSExpression condition = statement.getCondition();
-		final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-		final JSElement nextStatement = (JSElement) JSElementFactory.getNonWhiteSpaceSibling(statement, true);
-		@NonNls final String newStatement = "return " + conditionText + ';';
-
-		JSElementFactory.replaceStatement(statement, newStatement);
-		assert (nextStatement != null);
-		JSElementFactory.removeElement(nextStatement);
-	}
-
-	public static void replaceSimplifiableReturn(JSIfStatement statement, boolean negated)
-			throws IncorrectOperationException
-	{
-		final JSExpression condition = statement.getCondition();
-		final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-		@NonNls final String newStatement = "return " + conditionText + ';';
-
-		JSElementFactory.replaceStatement(statement, newStatement);
-	}
-
-	public static void replaceSimplifiableAssignment(JSIfStatement statement, boolean negated)
-			throws IncorrectOperationException
-	{
-		final JSExpression condition = statement.getCondition();
-		final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-		final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(statement.getThen());
-		final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-		final IElementType operator = assignmentExpression.getOperationSign();
-		final String operand = BinaryOperatorUtils.getOperatorText(operator);
-		final JSExpression lhs = assignmentExpression.getLOperand();
-		final String lhsText = lhs.getText();
-
-		JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
-	}
-
-	public static void replaceSimplifiableImplicitAssignment(JSIfStatement statement, boolean negated)
-			throws IncorrectOperationException
-	{
-		final JSElement prevStatement = (JSElement) JSElementFactory.getNonWhiteSpaceSibling(statement, false);
-		final JSExpression condition = statement.getCondition();
-		final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-		final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(statement.getThen());
-		final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-		final IElementType operator = assignmentExpression.getOperationSign();
-		final String operand = BinaryOperatorUtils.getOperatorText(operator);
-		final JSExpression lhs = assignmentExpression.getLOperand();
-		final String lhsText = lhs.getText();
-
-		JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
-
-		assert (prevStatement != null);
-
-		JSElementFactory.removeElement(prevStatement);
-	}
-
-	public static void replaceAssignmentOrReturnIfSimplifiable(JSIfStatement statement)
-			throws IncorrectOperationException
-	{
-		if(isSimplifiableAssignment(statement, false))
-		{
-			replaceSimplifiableAssignment(statement, false);
-		}
-		else if(isSimplifiableAssignment(statement, true))
-		{
-			replaceSimplifiableAssignment(statement, true);
-		}
-		else if(isSimplifiableReturn(statement, false))
-		{
-			replaceSimplifiableReturn(statement, false);
-		}
-		else if(isSimplifiableReturn(statement, true))
-		{
-			replaceSimplifiableReturn(statement, true);
-		}
-		else if(isSimplifiableImplicitReturn(statement, false))
-		{
-			replaceSimplifiableImplicitReturn(statement, false);
-		}
-		else if(isSimplifiableImplicitReturn(statement, true))
-		{
-			replaceSimplifiableImplicitReturn(statement, true);
-		}
-		else if(isSimplifiableImplicitAssignment(statement, false))
-		{
-			replaceSimplifiableImplicitAssignment(statement, false);
-		}
-		else if(isSimplifiableImplicitAssignment(statement, true))
-		{
-			replaceSimplifiableImplicitAssignment(statement, true);
-		}
-	}
-
-	public static void replaceConditionalWithIf(JSConditionalExpression conditional)
-			throws IncorrectOperationException
-	{
-		final JSStatement statement = PsiTreeUtil.getParentOfType(conditional, JSStatement.class);
-
-		assert (statement != null);
-
-		final String statementText = statement.getText();
-		final String conditionalText = ParenthesesUtils.unstripParentheses(conditional).getText();
-		final int conditionalIndex = statementText.indexOf(conditionalText);
-		final String statementStart = statementText.substring(0, conditionalIndex);
-		final String statementEnd = statementText.substring(conditionalIndex + conditionalText.length());
-		final JSExpression condition = ParenthesesUtils.stripParentheses(conditional.getCondition());
-		final JSExpression thenExpression = ParenthesesUtils.stripParentheses(conditional.getThen());
-		final JSExpression elseExpression = ParenthesesUtils.stripParentheses(conditional.getElse());
-
-		@NonNls final String ifStatementText = "if (" + condition.getText() + ") {" +
-				statementStart + thenExpression.getText() + statementEnd +
-				"} else {" +
-				statementStart + elseExpression.getText() + statementEnd +
-				'}';
-		JSElementFactory.replaceStatement(statement, ifStatementText);
-	}
+public class ConditionalUtils {
+    private ConditionalUtils() {
+    }
+
+    public static JSStatement stripBraces(JSStatement branch) {
+        if (branch != null && branch instanceof JSBlockStatement block) {
+            final JSStatement[] statements = block.getStatements();
+
+            if (statements.length == 1) {
+                return statements[0];
+            }
+            else {
+                return block;
+            }
+        }
+
+        return branch;
+    }
+
+    public static boolean isReturn(JSStatement statement, String value) {
+        if (statement == null) {
+            return false;
+        }
+        if (!(statement instanceof JSReturnStatement)) {
+            return false;
+        }
+
+        final JSExpression returnExpression = ((JSReturnStatement)statement).getExpression();
+
+        return (returnExpression != null && value.equals(returnExpression.getText()));
+    }
+
+    public static boolean isAssignment(JSStatement statement, String value) {
+        if (statement == null || !(statement instanceof JSExpressionStatement)) {
+            return false;
+        }
+
+        final JSExpression expression = ((JSExpressionStatement)statement).getExpression();
+
+        if (!(expression instanceof JSAssignmentExpression)) {
+            return false;
+        }
+
+        final JSExpression rhs = ((JSAssignmentExpression)expression).getROperand();
+
+        return (rhs != null && rhs.getText().equals(value));
+    }
+
+    public static boolean isAssignment(JSStatement statement) {
+        if (!(statement instanceof JSExpressionStatement)) {
+            return false;
+        }
+
+        final JSExpressionStatement expressionStatement = (JSExpressionStatement)statement;
+
+        return (expressionStatement.getExpression() instanceof JSAssignmentExpression);
+    }
+
+    public static boolean isConditional(JSExpression expression) {
+        expression = ParenthesesUtils.stripParentheses(expression);
+
+        if (expression == null) {
+            return false;
+        }
+
+        if (expression instanceof JSConditionalExpression) {
+            return true;
+        }
+
+        if (expression instanceof JSBinaryExpression) {
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
+            final IElementType sign = binaryExpression.getOperationSign();
+
+            if (JSTokenTypes.XOR.equals(sign)) {
+                return (isConditional(binaryExpression.getLOperand()) &&
+                    isConditional(binaryExpression.getROperand()));
+            }
+
+            return (JSTokenTypes.ANDAND.equals(sign) || JSTokenTypes.OROR.equals(sign) ||
+                JSTokenTypes.EQ.equals(sign) || JSTokenTypes.NE.equals(sign) ||
+                JSTokenTypes.LT.equals(sign) || JSTokenTypes.LE.equals(sign) ||
+                JSTokenTypes.GT.equals(sign) || JSTokenTypes.GE.equals(sign));
+        }
+
+        return BoolUtils.isBooleanLiteral(expression);
+    }
+
+    public static boolean isSimplifiableImplicitReturn(JSIfStatement ifStatement, boolean negated) {
+        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+        final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
+
+        if (!(nextStatement instanceof JSStatement)) {
+            return false;
+        }
+
+        final JSStatement elseBranch = (JSStatement)nextStatement;
+
+        if (negated) {
+            return ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE)
+                && ConditionalUtils.isReturn(elseBranch, BoolUtils.TRUE);
+        }
+        else {
+            return ConditionalUtils.isReturn(thenBranch, BoolUtils.TRUE)
+                && ConditionalUtils.isReturn(elseBranch, BoolUtils.FALSE);
+        }
+    }
+
+    public static boolean isSimplifiableReturn(JSIfStatement ifStatement, boolean negated) {
+        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+        final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+
+        if (negated) {
+            return ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE)
+                && ConditionalUtils.isReturn(elseBranch, BoolUtils.TRUE);
+        }
+        else {
+            return ConditionalUtils.isReturn(thenBranch, BoolUtils.TRUE)
+                && ConditionalUtils.isReturn(elseBranch, BoolUtils.FALSE);
+        }
+    }
+
+    public static boolean isSimplifiableAssignment(JSIfStatement ifStatement, boolean negated) {
+        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+        final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+
+        final boolean isAssignment;
+
+        if (negated) {
+            isAssignment = ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE)
+                && ConditionalUtils.isAssignment(elseBranch, BoolUtils.TRUE);
+        }
+        else {
+            isAssignment = ConditionalUtils.isAssignment(thenBranch, BoolUtils.TRUE)
+                && ConditionalUtils.isAssignment(elseBranch, BoolUtils.FALSE);
+        }
+
+        if (isAssignment) {
+            final JSAssignmentExpression thenExpression = (JSAssignmentExpression)((JSExpressionStatement)thenBranch).getExpression();
+            final JSAssignmentExpression elseExpression = (JSAssignmentExpression)((JSExpressionStatement)elseBranch).getExpression();
+            final IElementType thenSign = thenExpression.getOperationSign();
+            final IElementType elseSign = elseExpression.getOperationSign();
+
+            if (!thenSign.equals(elseSign)) {
+                return false;
+            }
+
+            final JSExpression thenLhs = thenExpression.getLOperand();
+            final JSExpression elseLhs = elseExpression.getLOperand();
+
+            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
+        }
+        else {
+            return false;
+        }
+    }
+
+    public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement, boolean negated) {
+        if (ifStatement.getElse() != null) {
+            return false;
+        }
+        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+        final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, false);
+
+        if (!(nextStatement instanceof JSStatement)) {
+            return false;
+        }
+
+        final JSStatement elseBranch = ConditionalUtils.stripBraces((JSStatement)nextStatement);
+
+        final boolean isAssignment = negated
+            ? ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE) && ConditionalUtils.isAssignment(elseBranch, BoolUtils.TRUE)
+            : ConditionalUtils.isAssignment(thenBranch, BoolUtils.TRUE) && ConditionalUtils.isAssignment(elseBranch, BoolUtils.FALSE);
+
+        if (isAssignment) {
+            final JSAssignmentExpression thenExpression = (JSAssignmentExpression)((JSExpressionStatement)thenBranch).getExpression();
+            final JSAssignmentExpression elseExpression = (JSAssignmentExpression)((JSExpressionStatement)elseBranch).getExpression();
+            final IElementType thenSign = thenExpression.getOperationSign();
+            final IElementType elseSign = elseExpression.getOperationSign();
+
+            if (!thenSign.equals(elseSign)) {
+                return false;
+            }
+
+            final JSExpression thenLhs = thenExpression.getLOperand();
+            final JSExpression elseLhs = elseExpression.getLOperand();
+
+            return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
+        }
+        else {
+            return false;
+        }
+    }
+
+    public static void replaceSimplifiableImplicitReturn(JSIfStatement statement, boolean negated)
+        throws IncorrectOperationException {
+        final JSExpression condition = statement.getCondition();
+        final String conditionText = negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText();
+        final JSElement nextStatement = (JSElement)JSElementFactory.getNonWhiteSpaceSibling(statement, true);
+        @NonNls final String newStatement = "return " + conditionText + ';';
+
+        JSElementFactory.replaceStatement(statement, newStatement);
+        assert (nextStatement != null);
+        JSElementFactory.removeElement(nextStatement);
+    }
+
+    public static void replaceSimplifiableReturn(JSIfStatement statement, boolean negated)
+        throws IncorrectOperationException {
+        final JSExpression condition = statement.getCondition();
+        final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
+        @NonNls final String newStatement = "return " + conditionText + ';';
+
+        JSElementFactory.replaceStatement(statement, newStatement);
+    }
+
+    public static void replaceSimplifiableAssignment(JSIfStatement statement, boolean negated)
+        throws IncorrectOperationException {
+        final JSExpression condition = statement.getCondition();
+        final String conditionText = negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText();
+        final JSExpressionStatement assignmentStatement = (JSExpressionStatement)ConditionalUtils.stripBraces(statement.getThen());
+        final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression)assignmentStatement.getExpression();
+        final IElementType operator = assignmentExpression.getOperationSign();
+        final String operand = BinaryOperatorUtils.getOperatorText(operator);
+        final JSExpression lhs = assignmentExpression.getLOperand();
+        final String lhsText = lhs.getText();
+
+        JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
+    }
+
+    public static void replaceSimplifiableImplicitAssignment(JSIfStatement statement, boolean negated)
+        throws IncorrectOperationException {
+        final JSElement prevStatement = (JSElement)JSElementFactory.getNonWhiteSpaceSibling(statement, false);
+        final JSExpression condition = statement.getCondition();
+        final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
+        final JSExpressionStatement assignmentStatement = (JSExpressionStatement)ConditionalUtils.stripBraces(statement.getThen());
+        final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression)assignmentStatement.getExpression();
+        final IElementType operator = assignmentExpression.getOperationSign();
+        final String operand = BinaryOperatorUtils.getOperatorText(operator);
+        final JSExpression lhs = assignmentExpression.getLOperand();
+        final String lhsText = lhs.getText();
+
+        JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
+
+        assert (prevStatement != null);
+
+        JSElementFactory.removeElement(prevStatement);
+    }
+
+    public static void replaceAssignmentOrReturnIfSimplifiable(JSIfStatement statement)
+        throws IncorrectOperationException {
+        if (isSimplifiableAssignment(statement, false)) {
+            replaceSimplifiableAssignment(statement, false);
+        }
+        else if (isSimplifiableAssignment(statement, true)) {
+            replaceSimplifiableAssignment(statement, true);
+        }
+        else if (isSimplifiableReturn(statement, false)) {
+            replaceSimplifiableReturn(statement, false);
+        }
+        else if (isSimplifiableReturn(statement, true)) {
+            replaceSimplifiableReturn(statement, true);
+        }
+        else if (isSimplifiableImplicitReturn(statement, false)) {
+            replaceSimplifiableImplicitReturn(statement, false);
+        }
+        else if (isSimplifiableImplicitReturn(statement, true)) {
+            replaceSimplifiableImplicitReturn(statement, true);
+        }
+        else if (isSimplifiableImplicitAssignment(statement, false)) {
+            replaceSimplifiableImplicitAssignment(statement, false);
+        }
+        else if (isSimplifiableImplicitAssignment(statement, true)) {
+            replaceSimplifiableImplicitAssignment(statement, true);
+        }
+    }
+
+    public static void replaceConditionalWithIf(JSConditionalExpression conditional)
+        throws IncorrectOperationException {
+        final JSStatement statement = PsiTreeUtil.getParentOfType(conditional, JSStatement.class);
+
+        assert (statement != null);
+
+        final String statementText = statement.getText();
+        final String conditionalText = ParenthesesUtils.unstripParentheses(conditional).getText();
+        final int conditionalIndex = statementText.indexOf(conditionalText);
+        final String statementStart = statementText.substring(0, conditionalIndex);
+        final String statementEnd = statementText.substring(conditionalIndex + conditionalText.length());
+        final JSExpression condition = ParenthesesUtils.stripParentheses(conditional.getCondition());
+        final JSExpression thenExpression = ParenthesesUtils.stripParentheses(conditional.getThen());
+        final JSExpression elseExpression = ParenthesesUtils.stripParentheses(conditional.getElse());
+
+        @NonNls final String ifStatementText = "if (" + condition.getText() + ") {" +
+            statementStart + thenExpression.getText() + statementEnd +
+            "} else {" +
+            statementStart + elseExpression.getText() + statementEnd +
+            '}';
+        JSElementFactory.replaceStatement(statement, ifStatementText);
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
index 2772a5b2..2f882b00 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
@@ -22,756 +22,586 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-public class ControlFlowUtils
-{
-	private ControlFlowUtils()
-	{
-	}
-
-	public static boolean statementMayCompleteNormally(@Nullable JSStatement statement)
-	{
-		if(statement == null ||
-				statement instanceof JSBreakStatement ||
-				statement instanceof JSContinueStatement ||
-				statement instanceof JSReturnStatement ||
-				statement instanceof JSThrowStatement ||
-				statement instanceof JSWithStatement)
-		{
-			return false;
-		}
-		else if(statement instanceof JSExpressionStatement ||
-				statement instanceof JSEmptyStatement ||
-				statement instanceof JSVarStatement)
-		{
-			return true;
-		}
-		else if(statement instanceof JSForStatement)
-		{
-			final JSForStatement loopStatement = (JSForStatement) statement;
-			final JSExpression condition = loopStatement.getCondition();
-
-			return (condition != null && !isBooleanConstant(condition, false) ||
-					statementIsBreakTarget(loopStatement));
-		}
-		else if(statement instanceof JSForInStatement)
-		{
-			return (statementIsBreakTarget(statement));
-		}
-		else if(statement instanceof JSWhileStatement)
-		{
-			final JSWhileStatement loopStatement = (JSWhileStatement) statement;
-
-			return (!isBooleanConstant(loopStatement.getCondition(), true) ||
-					statementIsBreakTarget(loopStatement));
-		}
-		else if(statement instanceof JSDoWhileStatement)
-		{
-			final JSDoWhileStatement loopStatement = (JSDoWhileStatement) statement;
-
-			return (statementMayCompleteNormally(loopStatement.getBody()) &&
-					(!isBooleanConstant(loopStatement.getCondition(), true) ||
-							statementIsBreakTarget(loopStatement)));
-		}
-		else if(statement instanceof JSBlockStatement)
-		{
-			return codeBlockMayCompleteNormally(((JSBlockStatement) statement).getStatements());
-		}
-		else if(statement instanceof JSLabeledStatement)
-		{
-			final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
-			final JSStatement body = labeledStatement.getStatement();
-
-			return (statementMayCompleteNormally(body) || statementIsBreakTarget(body));
-		}
-		else if(statement instanceof JSIfStatement)
-		{
-			final JSIfStatement ifStatement = (JSIfStatement) statement;
-			final JSStatement thenBranch = ifStatement.getThen();
-			final JSStatement elseBranch = ifStatement.getElse();
-
-			return (elseBranch == null ||
-					statementMayCompleteNormally(thenBranch) ||
-					statementMayCompleteNormally(elseBranch));
-		}
-		else if(statement instanceof JSTryStatement)
-		{
-			final JSTryStatement tryStatement = (JSTryStatement) statement;
-
-			if(!statementMayCompleteNormally(tryStatement.getFinallyStatement()))
-			{
-				return false;
-			}
-			if(statementMayCompleteNormally(tryStatement.getStatement()))
-			{
-				return true;
-			}
-
-			final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
-
-			return (catchBlock != null && statementMayCompleteNormally(catchBlock.getStatement()));
-		}
-		else if(statement instanceof JSSwitchStatement)
-		{
-			final JSSwitchStatement switchStatement = (JSSwitchStatement) statement;
-
-			if(statementIsBreakTarget(switchStatement))
-			{
-				return true;
-			}
-
-			for(JSCaseClause caseClause : switchStatement.getCaseClauses())
-			{
-				if(!codeBlockMayCompleteNormally(caseClause.getStatements()))
-				{
-					return false;
-				}
-			}
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	public static boolean codeBlockMayCompleteNormally(@Nullable JSStatement[] statements)
-	{
-		if(statements != null)
-		{
-			for(final JSStatement statement : statements)
-			{
-				if(!statementMayCompleteNormally(statement))
-				{
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	@SuppressWarnings({"UnnecessaryUnboxing"})
-	private static boolean isBooleanConstant(JSExpression test, boolean val)
-	{
-		if(!ExpressionUtil.isConstantExpression(test))
-		{
-			return false;
-		}
-		final Object value = ExpressionUtil.computeConstantExpression(test);
-		return (value != null &&
-				value instanceof Boolean &&
-				((Boolean) value).booleanValue() == val);
-	}
-
-	private static boolean statementIsBreakTarget(@Nullable JSStatement statement)
-	{
-		if(statement == null)
-		{
-			return false;
-		}
-
-		final BreakTargetFinder breakFinder = new BreakTargetFinder(statement);
-
-		statement.accept(breakFinder);
-		return breakFinder.breakFound();
-	}
-
-	public static boolean statementContainsExitingBreak(@Nullable JSStatement statement)
-	{
-		if(statement == null)
-		{
-			return false;
-		}
-
-		final ExitingBreakFinder breakFinder = new ExitingBreakFinder();
-
-		statement.accept(breakFinder);
-		return breakFinder.breakFound();
-	}
-
-	public static boolean statementIsContinueTarget(@Nullable JSStatement statement)
-	{
-		if(statement == null)
-		{
-			return false;
-		}
-
-		final ContinueTargetFinder continueFinder = new ContinueTargetFinder(statement);
-
-		statement.accept(continueFinder);
-		return continueFinder.continueFound();
-	}
-
-	public static boolean statementContainsReturn(@Nullable JSStatement statement)
-	{
-		if(statement == null)
-		{
-			return false;
-		}
-
-		final ReturnFinder returnFinder = new ReturnFinder();
-
-		statement.accept(returnFinder);
-		return returnFinder.returnFound();
-	}
-
-	public static boolean statementCompletesWithStatement(
-			@Nonnull JSStatement containingStatement,
-			@Nonnull JSStatement statement)
-	{
-		JSElement statementToCheck = statement;
-
-		while(true)
-		{
-			if(statementToCheck.equals(containingStatement))
-			{
-				return true;
-			}
-
-			final JSStatement container = PsiTreeUtil.getParentOfType(statementToCheck, JSStatement.class);
-
-			if(container == null)
-			{
-				return false;
-			}
-			if(container instanceof JSBlockStatement)
-			{
-				if(!statementIsLastInBlock((JSBlockStatement) container,
-						(JSStatement) statementToCheck))
-				{
-					return false;
-				}
-			}
-			if(container instanceof JSLoopStatement)
-			{
-				return false;
-			}
-			statementToCheck = container;
-		}
-	}
-
-	private static boolean elementCompletesWithStatement(
-			@Nonnull JSElement element,
-			@Nonnull JSStatement statement)
-	{
-		PsiElement statementToCheck = statement;
-
-		while(true)
-		{
-			if(statementToCheck == null)
-			{
-				return false;
-			}
-			if(statementToCheck.equals(element))
-			{
-				return true;
-			}
-
-			final JSElement container = PsiTreeUtil.getParentOfType(statementToCheck, JSElement.class);
-
-			if(container == null || container instanceof JSLoopStatement)
-			{
-				return false;
-			}
-
-			if(container instanceof JSBlockStatement)
-			{
-				if(!statementIsLastInBlock((JSBlockStatement) container,
-						(JSStatement) statementToCheck))
-				{
-					return false;
-				}
-				if(container.equals(element))
-				{
-					return true;
-				}
-				statementToCheck = PsiTreeUtil.getParentOfType(container, JSStatement.class, JSFunction.class);
-			}
-			else
-			{
-				statementToCheck = container;
-			}
-		}
-	}
-
-	public static boolean functionCompletesWithStatement(
-			@Nonnull JSFunction function,
-			@Nonnull JSStatement statement)
-	{
-		return elementCompletesWithStatement(function, statement);
-	}
-
-	public static boolean blockCompletesWithStatement(
-			@Nonnull JSBlockStatement block,
-			@Nonnull JSStatement statement)
-	{
-		return elementCompletesWithStatement(block, statement);
-	}
-
-	private static boolean statementIsLastInBlock(
-			@Nonnull JSBlockStatement block, @Nonnull JSStatement statement)
-	{
-		final JSStatement[] statements = block.getStatements();
-
-		//noinspection ForLoopWithMissingComponent
-		for(int index = statements.length; --index >= 0; )
-		{
-			final JSStatement childStatement = statements[index];
-
-			if(statement.equals(childStatement))
-			{
-				return true;
-			}
-			if(!(statement instanceof JSEmptyStatement))
-			{
-				return false;
-			}
-		}
-		return false;
-	}
-
-	@Nullable
-	public static JSVariable resolveVariable(@Nullable JSExpression expression)
-	{
-		if(expression == null)
-		{
-			return null;
-		}
-		else if(expression instanceof JSReferenceExpression)
-		{
-			final PsiElement variable = ((JSReferenceExpression) expression).resolve();
-
-			return ((variable != null && variable instanceof JSVariable) ? (JSVariable) variable : null);
-		}
-		else if(expression instanceof JSDefinitionExpression)
-		{
-			final JSExpression referentExpression = ((JSDefinitionExpression) expression).getExpression();
-			final PsiReference reference = (referentExpression == null) ? null : referentExpression.getReference();
-			final PsiElement variable = (reference == null) ? null : reference.resolve();
-
-			return ((variable != null && variable instanceof JSVariable) ? (JSVariable) variable : null);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	@Nullable
-	public static JSFunction resolveMethod(JSCallExpression expression)
-	{
-		final JSExpression methodExpression = (expression == null) ? null : expression.getMethodExpression();
-
-		if(methodExpression != null && methodExpression instanceof JSReferenceExpression)
-		{
-			final PsiElement referent = ((JSReferenceExpression) methodExpression).resolve();
-
-			return ((referent != null && referent instanceof JSFunction) ? (JSFunction) referent : null);
-		}
-		return null;
-	}
-
-	public static boolean canBeMerged(JSStatement statement1,
-									  JSStatement statement2)
-	{
-		if(!ControlFlowUtils.statementMayCompleteNormally(statement1))
-		{
-			return false;
-		}
-		final Set<String> statement1Declarations = calculateTopLevelDeclarations(statement1);
-		if(containsConflictingDeclarations(statement1Declarations, statement2))
-		{
-			return false;
-		}
-		final Set<String> statement2Declarations = calculateTopLevelDeclarations(statement2);
-		return (!containsConflictingDeclarations(statement2Declarations, statement1));
-	}
-
-	public static boolean isInLoopStatementBody(@Nonnull PsiElement element)
-	{
-		final JSLoopStatement forStatement = PsiTreeUtil.getParentOfType(element, JSLoopStatement.class);
-
-		if(forStatement == null)
-		{
-			return false;
-		}
-
-		final JSStatement body = forStatement.getBody();
-
-		return (body != null && PsiTreeUtil.isAncestor(body, element, true));
-	}
-
-	@Nonnull
-	public static List<JSCallExpression> getRecursiveCalls(@Nonnull JSFunction function)
-	{
-		final RecursiveCallVisitor recursiveCallVisitor = new RecursiveCallVisitor(function);
-
-		function.accept(recursiveCallVisitor);
-		return recursiveCallVisitor.getCalls();
-	}
-
-	private static boolean containsConflictingDeclarations(Set<String> declarations,
-														   JSStatement statement)
-	{
-		final DeclarationUtils.DeclarationConflictVisitor visitor =
-				new DeclarationUtils.DeclarationConflictVisitor(declarations);
-		statement.accept(visitor);
-		return visitor.hasConflict();
-	}
-
-	public static boolean containsConflictingDeclarations(
-			JSBlockStatement block, JSBlockStatement parentBlock)
-	{
-		final JSStatement[] statements = block.getStatements();
-		final Set<JSVariable> declaredVars = new HashSet<JSVariable>();
-
-		for(final JSStatement statement : statements)
-		{
-			if(statement instanceof JSVarStatement)
-			{
-				final JSVarStatement declaration = (JSVarStatement) statement;
-
-				for(final JSVariable var : declaration.getVariables())
-				{
-					declaredVars.add(var);
-				}
-			}
-		}
-
-		for(final JSVariable variable : declaredVars)
-		{
-			if(conflictingDeclarationExists(variable.getName(), parentBlock, block))
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	private static boolean conflictingDeclarationExists(
-			String name,
-			JSBlockStatement parentBlock,
-			JSBlockStatement exceptBlock)
-	{
-		final ConflictingDeclarationVisitor visitor = new ConflictingDeclarationVisitor(name, exceptBlock);
-		parentBlock.accept(visitor);
-		return visitor.hasConflictingDeclaration();
-	}
-
-	private static Set<String> calculateTopLevelDeclarations(JSStatement statement)
-	{
-		final Set<String> out = new HashSet<String>();
-
-		if(statement instanceof JSVarStatement)
-		{
-			addDeclarations((JSVarStatement) statement, out);
-		}
-		else if(statement instanceof JSBlockStatement)
-		{
-			for(JSStatement subStatement : ((JSBlockStatement) statement).getStatements())
-			{
-				if(subStatement instanceof JSVarStatement)
-				{
-					addDeclarations((JSVarStatement) subStatement, out);
-				}
-			}
-		}
-		return out;
-	}
-
-	private static void addDeclarations(JSVarStatement statement,
-										Set<String> declaredVars)
-	{
-		for(final JSVariable variable : statement.getVariables())
-		{
-			declaredVars.add(variable.getName());
-		}
-	}
-
-	public static void appendStatementsInSequence(StringBuilder buffer,
-												  JSStatement statement1,
-												  JSStatement statement2)
-	{
-		if(statement1 == null)
-		{
-			buffer.append(' ')
-					.append(statement2.getText());
-		}
-		else if(statement2 == null)
-		{
-			buffer.append(' ')
-					.append(statement1.getText());
-		}
-		else
-		{
-			buffer.append('{');
-			appendStatementStripped(buffer, statement1);
-			appendStatementStripped(buffer, statement2);
-			buffer.append('}');
-		}
-	}
-
-	private static void appendStatementStripped(StringBuilder buffer, JSStatement statement)
-	{
-		if(statement instanceof JSBlockStatement)
-		{
-			for(PsiElement child : statement.getChildren())
-			{
-				buffer.append(child.getText());
-			}
-		}
-		else
-		{
-			buffer.append(statement.getText());
-		}
-	}
-
-	private static class BreakTargetFinder extends JSRecursiveElementVisitor
-	{
-		private boolean found;
-		private final JSStatement target;
-
-		private BreakTargetFinder(JSStatement target)
-		{
-			this.target = target;
-		}
-
-		private boolean breakFound()
-		{
-			return this.found;
-		}
-
-		@Override
-		public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpression)
-		{
-		}
-
-		@Override
-		public void visitJSBreakStatement(JSBreakStatement breakStatement)
-		{
-			super.visitJSBreakStatement(breakStatement);
-			final JSStatement exitedStatement = breakStatement.getStatementToBreak();
-			if(exitedStatement == null)
-			{
-				return;
-			}
-			this.found = (exitedStatement.equals(this.target));
-		}
-	}
-
-	private static class ContinueTargetFinder extends JSRecursiveElementVisitor
-	{
-		private boolean found;
-		private final JSStatement target;
-
-		private ContinueTargetFinder(JSStatement target)
-		{
-			this.target = target;
-		}
-
-		private boolean continueFound()
-		{
-			return this.found;
-		}
-
-		@Override
-		public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpression)
-		{
-		}
-
-		@Override
-		public void visitJSContinueStatement(JSContinueStatement continueStatement)
-		{
-			super.visitJSContinueStatement(continueStatement);
-			final JSStatement statement = continueStatement.getStatementToContinue();
-			if(statement == null)
-			{
-				return;
-			}
-			this.found = (statement.equals(this.target));
-		}
-	}
-
-	private static class ExitingBreakFinder extends JSRecursiveElementVisitor
-	{
-		private boolean found;
-
-		private ExitingBreakFinder()
-		{
-		}
-
-		private boolean breakFound()
-		{
-			return this.found;
-		}
-
-		@Override
-		public void visitJSReferenceExpression(JSReferenceExpression exp)
-		{
-		}
-
-		@Override
-		public void visitJSBreakStatement(JSBreakStatement breakStatement)
-		{
-			if(breakStatement.getLabel() != null)
-			{
-				return;
-			}
-			this.found = true;
-		}
-
-		@Override
-		public void visitJSDoWhileStatement(JSDoWhileStatement statement)
-		{
-			// don't drill down
-		}
-
-		@Override
-		public void visitJSForStatement(JSForStatement statement)
-		{
-			// don't drill down
-		}
-
-		@Override
-		public void visitJSForInStatement(JSForInStatement statement)
-		{
-			// don't drill down
-		}
-
-		@Override
-		public void visitJSWhileStatement(JSWhileStatement statement)
-		{
-			// don't drill down
-		}
-
-		@Override
-		public void visitJSSwitchStatement(JSSwitchStatement statement)
-		{
-			// don't drill down
-		}
-	}
-
-	private static class ReturnFinder extends JSRecursiveElementVisitor
-	{
-		private boolean found;
-
-		private ReturnFinder()
-		{
-		}
-
-		private boolean returnFound()
-		{
-			return this.found;
-		}
-
-		@Override
-		public void visitJSReturnStatement(JSReturnStatement returnStatement)
-		{
-			this.found = true;
-		}
-	}
-
-	private static class ConflictingDeclarationVisitor extends JSRecursiveElementVisitor
-	{
-
-		private final String variableName;
-		private final JSBlockStatement exceptBlock;
-		private boolean hasConflictingDeclaration;
-
-		ConflictingDeclarationVisitor(String variableName,
-									  JSBlockStatement exceptBlock)
-		{
-			this.variableName = variableName;
-			this.exceptBlock = exceptBlock;
-		}
-
-		@Override
-		public void visitJSElement(JSElement element)
-		{
-			if(!this.hasConflictingDeclaration)
-			{
-				super.visitJSElement(element);
-			}
-		}
-
-		@Override
-		public void visitJSBlock(JSBlockStatement block)
-		{
-			if(!(this.hasConflictingDeclaration ||
-					block.equals(this.exceptBlock)))
-			{
-				super.visitJSBlock(block);
-			}
-		}
-
-		@Override
-		public void visitJSVariable(JSVariable variable)
-		{
-			if(!this.hasConflictingDeclaration)
-			{
-				super.visitJSVariable(variable);
-				final String name = variable.getName();
-				this.hasConflictingDeclaration = (name != null && name.equals(this.variableName));
-			}
-		}
-
-		public boolean hasConflictingDeclaration()
-		{
-			return this.hasConflictingDeclaration;
-		}
-	}
-
-	private static class RecursiveCallVisitor extends JSRecursiveElementVisitor
-	{
-
-		private final JSFunction function;
-		private List<JSCallExpression> recursionReturns;
-
-		RecursiveCallVisitor(JSFunction function)
-		{
-			this.function = function;
-			this.recursionReturns = new ArrayList<JSCallExpression>();
-		}
-
-		@Override
-		public void visitJSCallExpression(JSCallExpression callExpression)
-		{
-			super.visitJSCallExpression(callExpression);
-
-			final JSExpression methodExpression = callExpression.getMethodExpression();
-
-			if(methodExpression == null || !(methodExpression instanceof JSReferenceExpression))
-			{
-				return;
-			}
-
-			final JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(callExpression, JSReturnStatement.class);
-
-			if(returnStatement == null)
-			{
-				return;
-			}
-
-			final PsiElement calledFunction = ((JSReferenceExpression) methodExpression).resolve();
-
-			if(calledFunction == null ||
-					(!(calledFunction instanceof JSFunction) || !calledFunction.equals(this.function)))
-			{
-				return;
-			}
-
-
-			this.recursionReturns.add(callExpression);
-		}
-
-		public List<JSCallExpression> getCalls()
-		{
-			return this.recursionReturns;
-		}
-	}
+public class ControlFlowUtils {
+    private ControlFlowUtils() {
+    }
+
+    public static boolean statementMayCompleteNormally(@Nullable JSStatement statement) {
+        if (statement == null
+            || statement instanceof JSBreakStatement
+            || statement instanceof JSContinueStatement
+            || statement instanceof JSReturnStatement
+            || statement instanceof JSThrowStatement
+            || statement instanceof JSWithStatement) {
+            return false;
+        }
+        else if (statement instanceof JSExpressionStatement
+            || statement instanceof JSEmptyStatement
+            || statement instanceof JSVarStatement) {
+            return true;
+        }
+        else if (statement instanceof JSForStatement loopStatement) {
+            final JSExpression condition = loopStatement.getCondition();
+
+            return condition != null && !isBooleanConstant(condition, false) || statementIsBreakTarget(loopStatement);
+        }
+        else if (statement instanceof JSForInStatement) {
+            return statementIsBreakTarget(statement);
+        }
+        else if (statement instanceof JSWhileStatement loopStatement) {
+            return !isBooleanConstant(loopStatement.getCondition(), true) || statementIsBreakTarget(loopStatement);
+        }
+        else if (statement instanceof JSDoWhileStatement loopStatement) {
+            return statementMayCompleteNormally(loopStatement.getBody())
+                && (!isBooleanConstant(loopStatement.getCondition(), true) || statementIsBreakTarget(loopStatement));
+        }
+        else if (statement instanceof JSBlockStatement blockStatement) {
+            return codeBlockMayCompleteNormally(blockStatement.getStatements());
+        }
+        else if (statement instanceof JSLabeledStatement) {
+            final JSLabeledStatement labeledStatement = (JSLabeledStatement)statement;
+            final JSStatement body = labeledStatement.getStatement();
+
+            return (statementMayCompleteNormally(body) || statementIsBreakTarget(body));
+        }
+        else if (statement instanceof JSIfStatement ifStatement) {
+            final JSStatement thenBranch = ifStatement.getThen();
+            final JSStatement elseBranch = ifStatement.getElse();
+
+            return elseBranch == null ||
+                statementMayCompleteNormally(thenBranch) ||
+                statementMayCompleteNormally(elseBranch);
+        }
+        else if (statement instanceof JSTryStatement tryStatement) {
+            if (!statementMayCompleteNormally(tryStatement.getFinallyStatement())) {
+                return false;
+            }
+            if (statementMayCompleteNormally(tryStatement.getStatement())) {
+                return true;
+            }
+
+            final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+
+            return catchBlock != null && statementMayCompleteNormally(catchBlock.getStatement());
+        }
+        else if (statement instanceof JSSwitchStatement switchStatement) {
+            if (statementIsBreakTarget(switchStatement)) {
+                return true;
+            }
+
+            for (JSCaseClause caseClause : switchStatement.getCaseClauses()) {
+                if (!codeBlockMayCompleteNormally(caseClause.getStatements())) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    public static boolean codeBlockMayCompleteNormally(@Nullable JSStatement[] statements) {
+        if (statements != null) {
+            for (final JSStatement statement : statements) {
+                if (!statementMayCompleteNormally(statement)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    @SuppressWarnings({"UnnecessaryUnboxing"})
+    private static boolean isBooleanConstant(JSExpression test, boolean val) {
+        if (!ExpressionUtil.isConstantExpression(test)) {
+            return false;
+        }
+        final Object value = ExpressionUtil.computeConstantExpression(test);
+        return value != null && value instanceof Boolean && ((Boolean)value).booleanValue() == val;
+    }
+
+    private static boolean statementIsBreakTarget(@Nullable JSStatement statement) {
+        if (statement == null) {
+            return false;
+        }
+
+        final BreakTargetFinder breakFinder = new BreakTargetFinder(statement);
+
+        statement.accept(breakFinder);
+        return breakFinder.breakFound();
+    }
+
+    public static boolean statementContainsExitingBreak(@Nullable JSStatement statement) {
+        if (statement == null) {
+            return false;
+        }
+
+        final ExitingBreakFinder breakFinder = new ExitingBreakFinder();
+
+        statement.accept(breakFinder);
+        return breakFinder.breakFound();
+    }
+
+    public static boolean statementIsContinueTarget(@Nullable JSStatement statement) {
+        if (statement == null) {
+            return false;
+        }
+
+        final ContinueTargetFinder continueFinder = new ContinueTargetFinder(statement);
+
+        statement.accept(continueFinder);
+        return continueFinder.continueFound();
+    }
+
+    public static boolean statementContainsReturn(@Nullable JSStatement statement) {
+        if (statement == null) {
+            return false;
+        }
+
+        final ReturnFinder returnFinder = new ReturnFinder();
+
+        statement.accept(returnFinder);
+        return returnFinder.returnFound();
+    }
+
+    public static boolean statementCompletesWithStatement(@Nonnull JSStatement containingStatement, @Nonnull JSStatement statement) {
+        JSElement statementToCheck = statement;
+
+        while (true) {
+            if (statementToCheck.equals(containingStatement)) {
+                return true;
+            }
+
+            final JSStatement container = PsiTreeUtil.getParentOfType(statementToCheck, JSStatement.class);
+
+            if (container == null) {
+                return false;
+            }
+            if (container instanceof JSBlockStatement blockStatement) {
+                if (!statementIsLastInBlock(blockStatement, (JSStatement)statementToCheck)) {
+                    return false;
+                }
+            }
+            if (container instanceof JSLoopStatement) {
+                return false;
+            }
+            statementToCheck = container;
+        }
+    }
+
+    private static boolean elementCompletesWithStatement(@Nonnull JSElement element, @Nonnull JSStatement statement) {
+        PsiElement statementToCheck = statement;
+
+        while (true) {
+            if (statementToCheck == null) {
+                return false;
+            }
+            if (statementToCheck.equals(element)) {
+                return true;
+            }
+
+            final JSElement container = PsiTreeUtil.getParentOfType(statementToCheck, JSElement.class);
+
+            if (container == null || container instanceof JSLoopStatement) {
+                return false;
+            }
+
+            if (container instanceof JSBlockStatement blockStatement) {
+                if (!statementIsLastInBlock(blockStatement, (JSStatement)statementToCheck)) {
+                    return false;
+                }
+                if (container.equals(element)) {
+                    return true;
+                }
+                statementToCheck = PsiTreeUtil.getParentOfType(container, JSStatement.class, JSFunction.class);
+            }
+            else {
+                statementToCheck = container;
+            }
+        }
+    }
+
+    public static boolean functionCompletesWithStatement(@Nonnull JSFunction function, @Nonnull JSStatement statement) {
+        return elementCompletesWithStatement(function, statement);
+    }
+
+    public static boolean blockCompletesWithStatement(@Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
+        return elementCompletesWithStatement(block, statement);
+    }
+
+    private static boolean statementIsLastInBlock(@Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
+        final JSStatement[] statements = block.getStatements();
+
+        //noinspection ForLoopWithMissingComponent
+        for (int index = statements.length; --index >= 0; ) {
+            final JSStatement childStatement = statements[index];
+
+            if (statement.equals(childStatement)) {
+                return true;
+            }
+            if (!(statement instanceof JSEmptyStatement)) {
+                return false;
+            }
+        }
+        return false;
+    }
+
+    @Nullable
+    public static JSVariable resolveVariable(@Nullable JSExpression expression) {
+        if (expression == null) {
+            return null;
+        }
+        else if (expression instanceof JSReferenceExpression referenceExpression) {
+            final PsiElement variable = referenceExpression.resolve();
+
+            return variable != null && variable instanceof JSVariable jsVariable ? jsVariable : null;
+        }
+        else if (expression instanceof JSDefinitionExpression definitionExpression) {
+            final JSExpression referentExpression = definitionExpression.getExpression();
+            final PsiReference reference = (referentExpression == null) ? null : referentExpression.getReference();
+            final PsiElement variable = (reference == null) ? null : reference.resolve();
+
+            return variable != null && variable instanceof JSVariable jsVariable ? jsVariable : null;
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Nullable
+    public static JSFunction resolveMethod(JSCallExpression expression) {
+        final JSExpression methodExpression = (expression == null) ? null : expression.getMethodExpression();
+
+        if (methodExpression != null && methodExpression instanceof JSReferenceExpression referenceExpression) {
+            final PsiElement referent = referenceExpression.resolve();
+
+            return referent != null && referent instanceof JSFunction function ? function : null;
+        }
+        return null;
+    }
+
+    public static boolean canBeMerged(JSStatement statement1, JSStatement statement2) {
+        if (!ControlFlowUtils.statementMayCompleteNormally(statement1)) {
+            return false;
+        }
+        final Set<String> statement1Declarations = calculateTopLevelDeclarations(statement1);
+        if (containsConflictingDeclarations(statement1Declarations, statement2)) {
+            return false;
+        }
+        final Set<String> statement2Declarations = calculateTopLevelDeclarations(statement2);
+        return (!containsConflictingDeclarations(statement2Declarations, statement1));
+    }
+
+    public static boolean isInLoopStatementBody(@Nonnull PsiElement element) {
+        final JSLoopStatement forStatement = PsiTreeUtil.getParentOfType(element, JSLoopStatement.class);
+
+        if (forStatement == null) {
+            return false;
+        }
+
+        final JSStatement body = forStatement.getBody();
+
+        return (body != null && PsiTreeUtil.isAncestor(body, element, true));
+    }
+
+    @Nonnull
+    public static List<JSCallExpression> getRecursiveCalls(@Nonnull JSFunction function) {
+        final RecursiveCallVisitor recursiveCallVisitor = new RecursiveCallVisitor(function);
+
+        function.accept(recursiveCallVisitor);
+        return recursiveCallVisitor.getCalls();
+    }
+
+    private static boolean containsConflictingDeclarations(Set<String> declarations, JSStatement statement) {
+        final DeclarationUtils.DeclarationConflictVisitor visitor =
+            new DeclarationUtils.DeclarationConflictVisitor(declarations);
+        statement.accept(visitor);
+        return visitor.hasConflict();
+    }
+
+    public static boolean containsConflictingDeclarations(JSBlockStatement block, JSBlockStatement parentBlock) {
+        final JSStatement[] statements = block.getStatements();
+        final Set<JSVariable> declaredVars = new HashSet<>();
+
+        for (final JSStatement statement : statements) {
+            if (statement instanceof JSVarStatement declaration) {
+                for (final JSVariable var : declaration.getVariables()) {
+                    declaredVars.add(var);
+                }
+            }
+        }
+
+        for (final JSVariable variable : declaredVars) {
+            if (conflictingDeclarationExists(variable.getName(), parentBlock, block)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean conflictingDeclarationExists(String name, JSBlockStatement parentBlock, JSBlockStatement exceptBlock) {
+        final ConflictingDeclarationVisitor visitor = new ConflictingDeclarationVisitor(name, exceptBlock);
+        parentBlock.accept(visitor);
+        return visitor.hasConflictingDeclaration();
+    }
+
+    private static Set<String> calculateTopLevelDeclarations(JSStatement statement) {
+        final Set<String> out = new HashSet<>();
+
+        if (statement instanceof JSVarStatement varStatement) {
+            addDeclarations(varStatement, out);
+        }
+        else if (statement instanceof JSBlockStatement blockStatement) {
+            for (JSStatement subStatement : blockStatement.getStatements()) {
+                if (subStatement instanceof JSVarStatement varStatement) {
+                    addDeclarations(varStatement, out);
+                }
+            }
+        }
+        return out;
+    }
+
+    private static void addDeclarations(JSVarStatement statement, Set<String> declaredVars) {
+        for (final JSVariable variable : statement.getVariables()) {
+            declaredVars.add(variable.getName());
+        }
+    }
+
+    public static void appendStatementsInSequence(StringBuilder buffer, JSStatement statement1, JSStatement statement2) {
+        if (statement1 == null) {
+            buffer.append(' ')
+                .append(statement2.getText());
+        }
+        else if (statement2 == null) {
+            buffer.append(' ')
+                .append(statement1.getText());
+        }
+        else {
+            buffer.append('{');
+            appendStatementStripped(buffer, statement1);
+            appendStatementStripped(buffer, statement2);
+            buffer.append('}');
+        }
+    }
+
+    private static void appendStatementStripped(StringBuilder buffer, JSStatement statement) {
+        if (statement instanceof JSBlockStatement) {
+            for (PsiElement child : statement.getChildren()) {
+                buffer.append(child.getText());
+            }
+        }
+        else {
+            buffer.append(statement.getText());
+        }
+    }
+
+    private static class BreakTargetFinder extends JSRecursiveElementVisitor {
+        private boolean found;
+        private final JSStatement target;
+
+        private BreakTargetFinder(JSStatement target) {
+            this.target = target;
+        }
+
+        private boolean breakFound() {
+            return this.found;
+        }
+
+        @Override
+        public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpression) {
+        }
+
+        @Override
+        public void visitJSBreakStatement(JSBreakStatement breakStatement) {
+            super.visitJSBreakStatement(breakStatement);
+            final JSStatement exitedStatement = breakStatement.getStatementToBreak();
+            if (exitedStatement == null) {
+                return;
+            }
+            this.found = (exitedStatement.equals(this.target));
+        }
+    }
+
+    private static class ContinueTargetFinder extends JSRecursiveElementVisitor {
+        private boolean found;
+        private final JSStatement target;
+
+        private ContinueTargetFinder(JSStatement target) {
+            this.target = target;
+        }
+
+        private boolean continueFound() {
+            return this.found;
+        }
+
+        @Override
+        public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpression) {
+        }
+
+        @Override
+        public void visitJSContinueStatement(JSContinueStatement continueStatement) {
+            super.visitJSContinueStatement(continueStatement);
+            final JSStatement statement = continueStatement.getStatementToContinue();
+            if (statement == null) {
+                return;
+            }
+            this.found = (statement.equals(this.target));
+        }
+    }
+
+    private static class ExitingBreakFinder extends JSRecursiveElementVisitor {
+        private boolean found;
+
+        private ExitingBreakFinder() {
+        }
+
+        private boolean breakFound() {
+            return this.found;
+        }
+
+        @Override
+        public void visitJSReferenceExpression(JSReferenceExpression exp) {
+        }
+
+        @Override
+        public void visitJSBreakStatement(JSBreakStatement breakStatement) {
+            if (breakStatement.getLabel() != null) {
+                return;
+            }
+            this.found = true;
+        }
+
+        @Override
+        public void visitJSDoWhileStatement(JSDoWhileStatement statement) {
+            // don't drill down
+        }
+
+        @Override
+        public void visitJSForStatement(JSForStatement statement) {
+            // don't drill down
+        }
+
+        @Override
+        public void visitJSForInStatement(JSForInStatement statement) {
+            // don't drill down
+        }
+
+        @Override
+        public void visitJSWhileStatement(JSWhileStatement statement) {
+            // don't drill down
+        }
+
+        @Override
+        public void visitJSSwitchStatement(JSSwitchStatement statement) {
+            // don't drill down
+        }
+    }
+
+    private static class ReturnFinder extends JSRecursiveElementVisitor {
+        private boolean found;
+
+        private ReturnFinder() {
+        }
+
+        private boolean returnFound() {
+            return this.found;
+        }
+
+        @Override
+        public void visitJSReturnStatement(JSReturnStatement returnStatement) {
+            this.found = true;
+        }
+    }
+
+    private static class ConflictingDeclarationVisitor extends JSRecursiveElementVisitor {
+
+        private final String variableName;
+        private final JSBlockStatement exceptBlock;
+        private boolean hasConflictingDeclaration;
+
+        ConflictingDeclarationVisitor(
+            String variableName,
+            JSBlockStatement exceptBlock
+        ) {
+            this.variableName = variableName;
+            this.exceptBlock = exceptBlock;
+        }
+
+        @Override
+        public void visitJSElement(JSElement element) {
+            if (!this.hasConflictingDeclaration) {
+                super.visitJSElement(element);
+            }
+        }
+
+        @Override
+        public void visitJSBlock(JSBlockStatement block) {
+            if (!(this.hasConflictingDeclaration ||
+                block.equals(this.exceptBlock))) {
+                super.visitJSBlock(block);
+            }
+        }
+
+        @Override
+        public void visitJSVariable(JSVariable variable) {
+            if (!this.hasConflictingDeclaration) {
+                super.visitJSVariable(variable);
+                final String name = variable.getName();
+                this.hasConflictingDeclaration = (name != null && name.equals(this.variableName));
+            }
+        }
+
+        public boolean hasConflictingDeclaration() {
+            return this.hasConflictingDeclaration;
+        }
+    }
+
+    private static class RecursiveCallVisitor extends JSRecursiveElementVisitor {
+        private final JSFunction function;
+        private List<JSCallExpression> recursionReturns;
+
+        RecursiveCallVisitor(JSFunction function) {
+            this.function = function;
+            this.recursionReturns = new ArrayList<>();
+        }
+
+        @Override
+        public void visitJSCallExpression(JSCallExpression callExpression) {
+            super.visitJSCallExpression(callExpression);
+
+            final JSExpression methodExpression = callExpression.getMethodExpression();
+
+            if (methodExpression == null || !(methodExpression instanceof JSReferenceExpression)) {
+                return;
+            }
+
+            final JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(callExpression, JSReturnStatement.class);
+
+            if (returnStatement == null) {
+                return;
+            }
+
+            final PsiElement calledFunction = ((JSReferenceExpression)methodExpression).resolve();
+
+            if (calledFunction == null ||
+                (!(calledFunction instanceof JSFunction) || !calledFunction.equals(this.function))) {
+                return;
+            }
+
+
+            this.recursionReturns.add(callExpression);
+        }
+
+        public List<JSCallExpression> getCalls() {
+            return this.recursionReturns;
+        }
+    }
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
index 1d1bcbd7..502aaf0e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
@@ -20,185 +20,186 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class DeclarationUtils
-{
-	private DeclarationUtils()
-	{
-	}
-
-	public static void calculateVariablesDeclared(JSStatement statement,
-												  Set<String> variablesDeclaredAtTopLevel,
-												  Set<String> variablesDeclaredAtLowerLevels,
-												  boolean isTopLevel)
-	{
-		if(statement == null)
-		{
-			return;
-		}
-
-		if(statement instanceof JSBreakStatement ||
-				statement instanceof JSExpressionStatement ||
-				statement instanceof JSContinueStatement ||
-				statement instanceof JSThrowStatement ||
-				statement instanceof JSReturnStatement)
-		{
-			// Nothing to do.
-		}
-		else if(statement instanceof JSVarStatement)
-		{
-			calculateVariablesDeclared((JSVarStatement) statement, variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels, isTopLevel);
-		}
-		else if(statement instanceof JSForStatement)
-		{
-			final JSForStatement loopStatement = (JSForStatement) statement;
-
-			calculateVariablesDeclared(loopStatement.getVarDeclaration(), variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels, false);
-			calculateVariablesDeclared(loopStatement.getBody(), variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels, false);
-		}
-		else if(statement instanceof JSWhileStatement)
-		{
-			final JSWhileStatement loopStatement = (JSWhileStatement) statement;
-
-			calculateVariablesDeclared(loopStatement.getBody(), variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels, false);
-		}
-		else if(statement instanceof JSDoWhileStatement)
-		{
-			final JSDoWhileStatement loopStatement = (JSDoWhileStatement) statement;
-
-			calculateVariablesDeclared(loopStatement.getBody(), variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels, false);
-		}
-		else if(statement instanceof JSBlockStatement)
-		{
-			final JSBlockStatement block = (JSBlockStatement) statement;
-
-			calculateVariablesDeclared(block.getStatements(), variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels, false);
-		}
-		else if(statement instanceof JSLabeledStatement)
-		{
-			final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
-
-			calculateVariablesDeclared(labeledStatement.getStatement(), variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels, false);
-		}
-		else if(statement instanceof JSIfStatement)
-		{
-			final JSIfStatement ifStatement = (JSIfStatement) statement;
-			final JSStatement thenBranch = ifStatement.getThen();
-			final JSStatement elseBranch = ifStatement.getElse();
-
-			calculateVariablesDeclared(thenBranch, variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels, false);
-			calculateVariablesDeclared(elseBranch, variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels, false);
-		}
-		else if(statement instanceof JSTryStatement)
-		{
-			final JSTryStatement tryStatement = (JSTryStatement) statement;
-
-			calculateVariablesDeclared(tryStatement.getStatement(),
-					variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels,
-					false);
-			calculateVariablesDeclared(tryStatement.getFinallyStatement(),
-					variablesDeclaredAtTopLevel,
-					variablesDeclaredAtLowerLevels,
-					false);
-
-			final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
-
-			if(catchBlock != null)
-			{
-				calculateVariablesDeclared(catchBlock.getStatement(),
-						variablesDeclaredAtTopLevel,
-						variablesDeclaredAtLowerLevels,
-						false);
-			}
-		}
-		else if(statement instanceof JSSwitchStatement)
-		{
-			final JSSwitchStatement switchStatement = (JSSwitchStatement) statement;
-
-			for(JSCaseClause caseClause : switchStatement.getCaseClauses())
-			{
-				calculateVariablesDeclared(caseClause.getStatements(), variablesDeclaredAtTopLevel,
-						variablesDeclaredAtLowerLevels, false);
-			}
-		}
-	}
-
-	private static void calculateVariablesDeclared(JSVarStatement statement,
-												   Set<String> variablesDeclaredAtTopLevel,
-												   Set<String> variablesDeclaredAtLowerLevels,
-												   boolean isTopLevel)
-	{
-		for(JSVariable variable : statement.getVariables())
-		{
-			final String variableName = variable.getName();
-
-			if(isTopLevel)
-			{
-				variablesDeclaredAtTopLevel.add(variableName);
-			}
-			else
-			{
-				variablesDeclaredAtLowerLevels.add(variableName);
-			}
-		}
-	}
-
-	private static void calculateVariablesDeclared(JSStatement[] statements,
-												   Set<String> variablesDeclaredAtTopLevel,
-												   Set<String> variablesDeclaredAtLowerLevels,
-												   boolean isTopLevel)
-	{
-		if(statements != null)
-		{
-			for(JSStatement statement : statements)
-			{
-				calculateVariablesDeclared(statement,
-						variablesDeclaredAtTopLevel,
-						variablesDeclaredAtLowerLevels,
-						isTopLevel);
-			}
-		}
-	}
-
-	public static class DeclarationConflictVisitor extends JSRecursiveElementVisitor
-	{
-		private final Set<String> declarations;
-		private boolean hasConflict;
-
-		public DeclarationConflictVisitor(Set<String> declarations)
-		{
-			this.declarations = new HashSet<String>(declarations);
-		}
-
-		@Override
-		public void visitJSVariable(JSVariable variable)
-		{
-			super.visitJSVariable(variable);
-
-			final String name = variable.getName();
-
-			for(String declaration : this.declarations)
-			{
-				if(declaration.equals(name))
-				{
-					this.hasConflict = true;
-					break;
-				}
-			}
-		}
-
-		public boolean hasConflict()
-		{
-			return this.hasConflict;
-		}
-	}
+public class DeclarationUtils {
+    private DeclarationUtils() {
+    }
+
+    public static void calculateVariablesDeclared(
+        JSStatement statement,
+        Set<String> variablesDeclaredAtTopLevel,
+        Set<String> variablesDeclaredAtLowerLevels,
+        boolean isTopLevel
+    ) {
+        if (statement == null) {
+            return;
+        }
+
+        if (statement instanceof JSBreakStatement
+            || statement instanceof JSExpressionStatement
+            || statement instanceof JSContinueStatement
+            || statement instanceof JSThrowStatement
+            || statement instanceof JSReturnStatement) {
+            // Nothing to do.
+        }
+        else if (statement instanceof JSVarStatement varStatement) {
+            calculateVariablesDeclared(varStatement, variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels, isTopLevel
+            );
+        }
+        else if (statement instanceof JSForStatement loopStatement) {
+            calculateVariablesDeclared(
+                loopStatement.getVarDeclaration(),
+                variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels,
+                false
+            );
+            calculateVariablesDeclared(
+                loopStatement.getBody(),
+                variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels,
+                false
+            );
+        }
+        else if (statement instanceof JSWhileStatement loopStatement) {
+            calculateVariablesDeclared(
+                loopStatement.getBody(),
+                variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels,
+                false
+            );
+        }
+        else if (statement instanceof JSDoWhileStatement loopStatement) {
+            calculateVariablesDeclared(
+                loopStatement.getBody(),
+                variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels,
+                false
+            );
+        }
+        else if (statement instanceof JSBlockStatement block) {
+            calculateVariablesDeclared(
+                block.getStatements(),
+                variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels,
+                false
+            );
+        }
+        else if (statement instanceof JSLabeledStatement labeledStatement) {
+            calculateVariablesDeclared(
+                labeledStatement.getStatement(),
+                variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels,
+                false
+            );
+        }
+        else if (statement instanceof JSIfStatement ifStatement) {
+            final JSStatement thenBranch = ifStatement.getThen();
+            final JSStatement elseBranch = ifStatement.getElse();
+
+            calculateVariablesDeclared(thenBranch, variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels, false
+            );
+            calculateVariablesDeclared(elseBranch, variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels, false
+            );
+        }
+        else if (statement instanceof JSTryStatement tryStatement) {
+            calculateVariablesDeclared(
+                tryStatement.getStatement(),
+                variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels,
+                false
+            );
+            calculateVariablesDeclared(
+                tryStatement.getFinallyStatement(),
+                variablesDeclaredAtTopLevel,
+                variablesDeclaredAtLowerLevels,
+                false
+            );
+
+            final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+
+            if (catchBlock != null) {
+                calculateVariablesDeclared(
+                    catchBlock.getStatement(),
+                    variablesDeclaredAtTopLevel,
+                    variablesDeclaredAtLowerLevels,
+                    false
+                );
+            }
+        }
+        else if (statement instanceof JSSwitchStatement switchStatement) {
+            for (JSCaseClause caseClause : switchStatement.getCaseClauses()) {
+                calculateVariablesDeclared(
+                    caseClause.getStatements(),
+                    variablesDeclaredAtTopLevel,
+                    variablesDeclaredAtLowerLevels,
+                    false
+                );
+            }
+        }
+    }
+
+    private static void calculateVariablesDeclared(
+        JSVarStatement statement,
+        Set<String> variablesDeclaredAtTopLevel,
+        Set<String> variablesDeclaredAtLowerLevels,
+        boolean isTopLevel
+    ) {
+        for (JSVariable variable : statement.getVariables()) {
+            final String variableName = variable.getName();
+
+            if (isTopLevel) {
+                variablesDeclaredAtTopLevel.add(variableName);
+            }
+            else {
+                variablesDeclaredAtLowerLevels.add(variableName);
+            }
+        }
+    }
+
+    private static void calculateVariablesDeclared(
+        JSStatement[] statements,
+        Set<String> variablesDeclaredAtTopLevel,
+        Set<String> variablesDeclaredAtLowerLevels,
+        boolean isTopLevel
+    ) {
+        if (statements != null) {
+            for (JSStatement statement : statements) {
+                calculateVariablesDeclared(
+                    statement,
+                    variablesDeclaredAtTopLevel,
+                    variablesDeclaredAtLowerLevels,
+                    isTopLevel
+                );
+            }
+        }
+    }
+
+    public static class DeclarationConflictVisitor extends JSRecursiveElementVisitor {
+        private final Set<String> declarations;
+        private boolean hasConflict;
+
+        public DeclarationConflictVisitor(Set<String> declarations) {
+            this.declarations = new HashSet<String>(declarations);
+        }
+
+        @Override
+        public void visitJSVariable(JSVariable variable) {
+            super.visitJSVariable(variable);
+
+            final String name = variable.getName();
+
+            for (String declaration : this.declarations) {
+                if (declaration.equals(name)) {
+                    this.hasConflict = true;
+                    break;
+                }
+            }
+        }
+
+        public boolean hasConflict() {
+            return this.hasConflict;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
index e3ec9489..001e0dc2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
@@ -20,777 +20,624 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 
-public class EquivalenceChecker
-{
-
-	private EquivalenceChecker()
-	{
-	}
-
-	private static final int THIS_EXPRESSION = 0;
-	private static final int LITERAL_EXPRESSION = 1;
-	private static final int CLASS_OBJECT_EXPRESSION = 2;
-	private static final int REFERENCE_EXPRESSION = 3;
-	private static final int SUPER_EXPRESSION = 4;
-	private static final int CALL_EXPRESSION = 5;
-	private static final int NEW_EXPRESSION = 6;
-	private static final int ARRAY_LITERAL_EXPRESSION = 7;
-	private static final int PREFIX_EXPRESSION = 8;
-	private static final int POSTFIX_EXPRESSION = 9;
-	private static final int ASSIGNMENT_EXPRESSION = 10;
-	private static final int BINARY_EXPRESSION = 11;
-	private static final int CONDITIONAL_EXPRESSION = 12;
-	private static final int INDEX_PROPERTY_ACCESS_EXPRESSION = 13;
-	private static final int OBJECT_LITERAL_EXPRESSION = 14;
-	private static final int FUNCTION_EXPRESSION = 15;
-	private static final int DEFINITION_EXPRESSION = 16;
-
-	private static final int BLOCK_STATEMENT = 0;
-	private static final int BREAK_STATEMENT = 1;
-	private static final int CONTINUE_STATEMENT = 2;
-	private static final int VAR_STATEMENT = 3;
-	private static final int DO_WHILE_STATEMENT = 4;
-	private static final int EMPTY_STATEMENT = 5;
-	private static final int EXPRESSION_STATEMENT = 6;
-	private static final int FOR_STATEMENT = 7;
-	private static final int FOR_IN_STATEMENT = 8;
-	private static final int IF_STATEMENT = 9;
-	private static final int LABELED_STATEMENT = 10;
-	private static final int RETURN_STATEMENT = 11;
-	private static final int SWITCH_STATEMENT = 12;
-	private static final int THROW_STATEMENT = 13;
-	private static final int TRY_STATEMENT = 14;
-	private static final int WHILE_STATEMENT = 15;
-	private static final int WITH_STATEMENT = 16;
-
-	public static boolean statementsAreEquivalent(JSStatement exp1,
-												  JSStatement exp2)
-	{
-		if(exp1 == null && exp2 == null)
-		{
-			return true;
-		}
-
-		if(exp1 == null || exp2 == null)
-		{
-			return false;
-		}
-
-		final int type1 = getStatementType(exp1);
-		final int type2 = getStatementType(exp2);
-
-		if(type1 != type2)
-		{
-			return false;
-		}
-
-		switch(type1)
-		{
-			case BLOCK_STATEMENT:
-				return codeBlocksAreEquivalent((JSBlockStatement) exp1,
-						(JSBlockStatement) exp2);
-			case BREAK_STATEMENT:
-				return breakStatementsAreEquivalent((JSBreakStatement) exp1,
-						(JSBreakStatement) exp2);
-			case CONTINUE_STATEMENT:
-				return continueStatementsAreEquivalent((JSContinueStatement) exp1,
-						(JSContinueStatement) exp2);
-			case VAR_STATEMENT:
-				return declarationStatementsAreEquivalent((JSVarStatement) exp1,
-						(JSVarStatement) exp2);
-			case DO_WHILE_STATEMENT:
-				return doWhileStatementsAreEquivalent((JSDoWhileStatement) exp1,
-						(JSDoWhileStatement) exp2);
-			case EMPTY_STATEMENT:
-				return true;
-			case EXPRESSION_STATEMENT:
-				return expressionStatementsAreEquivalent((JSExpressionStatement) exp1,
-						(JSExpressionStatement) exp2);
-			case FOR_STATEMENT:
-				return forStatementsAreEquivalent((JSForStatement) exp1,
-						(JSForStatement) exp2);
-			case FOR_IN_STATEMENT:
-				return forInStatementsAreEquivalent((JSForInStatement) exp1,
-						(JSForInStatement) exp2);
-			case IF_STATEMENT:
-				return ifStatementsAreEquivalent((JSIfStatement) exp1,
-						(JSIfStatement) exp2);
-			case LABELED_STATEMENT:
-				return labeledStatementsAreEquivalent((JSLabeledStatement) exp1,
-						(JSLabeledStatement) exp2);
-			case RETURN_STATEMENT:
-				return returnStatementsAreEquivalent((JSReturnStatement) exp1,
-						(JSReturnStatement) exp2);
-			case SWITCH_STATEMENT:
-				return switchStatementsAreEquivalent((JSSwitchStatement) exp1,
-						(JSSwitchStatement) exp2);
-			case THROW_STATEMENT:
-				return throwStatementsAreEquivalent((JSThrowStatement) exp1,
-						(JSThrowStatement) exp2);
-			case TRY_STATEMENT:
-				return tryStatementsAreEquivalent((JSTryStatement) exp1,
-						(JSTryStatement) exp2);
-			case WHILE_STATEMENT:
-				return whileStatementsAreEquivalent((JSWhileStatement) exp1,
-						(JSWhileStatement) exp2);
-			case WITH_STATEMENT:
-				return withStatementsAreEquivalent((JSWithStatement) exp1,
-						(JSWithStatement) exp2);
-			default:
-				return false;
-		}
-	}
-
-	private static boolean declarationStatementsAreEquivalent(JSVarStatement statement1,
-															  JSVarStatement statement2)
-	{
-		if(statement1 == null || statement2 == null)
-		{
-			return statement1 == statement2;
-		}
-		JSVariable[] vars1 = statement1.getVariables();
-		JSVariable[] vars2 = statement2.getVariables();
-
-		if(vars1.length == vars2.length)
-		{
-			for(int index = 0; index < vars2.length; index++)
-			{
-				if(!localVariableAreEquivalent(vars1[index], vars2[index]))
-				{
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	private static boolean tryStatementsAreEquivalent(JSTryStatement statement1,
-													  JSTryStatement statement2)
-	{
-		if(!statementsAreEquivalent(statement1.getStatement(),
-				statement2.getStatement()))
-		{
-			return false;
-		}
-		if(!statementsAreEquivalent(statement1.getFinallyStatement(),
-				statement2.getFinallyStatement()))
-		{
-			return false;
-		}
-		JSCatchBlock catchBlock1 = statement1.getCatchBlock();
-		JSCatchBlock catchBlock2 = statement2.getCatchBlock();
-		if(catchBlock1 == null)
-		{
-			return (catchBlock2 == null);
-		}
-		else if(catchBlock2 == null)
-		{
-			return false;
-		}
-
-		if(!parametersAreEquivalent(catchBlock1.getParameter(),
-				catchBlock2.getParameter()))
-		{
-			return false;
-		}
-		return statementsAreEquivalent(catchBlock1.getStatement(),
-				catchBlock2.getStatement());
-	}
-
-	private static boolean localVariableAreEquivalent(JSVariable var1,
-													  JSVariable var2)
-	{
-		return (expressionsAreEquivalent(var1.getInitializer(), var2.getInitializer()) &&
-				typesAreEquivalent(var1.getType(), var2.getType()) &&
-				areEqual(var1.getName(), var2.getName()));
-	}
-
-	private static boolean parametersAreEquivalent(JSParameter parameter1,
-												   JSParameter parameter2)
-	{
-		return (typesAreEquivalent(parameter1.getType(), parameter2.getType()) &&
-				areEqual(parameter1.getName(), parameter2.getName()));
-	}
-
-	private static boolean typesAreEquivalent(JavaScriptType type1, JavaScriptType type2)
-	{
-		return areEqual(type1, type2);
-	}
-
-	private static boolean whileStatementsAreEquivalent(JSWhileStatement statement1,
-														JSWhileStatement statement2)
-	{
-		return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
-				statementsAreEquivalent(statement1.getBody(), statement2.getBody()));
-	}
-
-	private static boolean forStatementsAreEquivalent(JSForStatement statement1,
-													  JSForStatement statement2)
-	{
-		return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
-				expressionsAreEquivalent(statement1.getInitialization(), statement2.getInitialization()) &&
-				expressionsAreEquivalent(statement1.getUpdate(), statement2.getUpdate()) &&
-				statementsAreEquivalent(statement1.getBody(), statement2.getBody()));
-	}
-
-	private static boolean forInStatementsAreEquivalent(JSForInStatement statement1,
-														JSForInStatement statement2)
-	{
-		return (expressionsAreEquivalent(statement1.getCollectionExpression(), statement2.getCollectionExpression()) &&
-				expressionsAreEquivalent(statement1.getVariableExpression(), statement2.getVariableExpression()) &&
-				declarationStatementsAreEquivalent(statement1.getDeclarationStatement(), statement2.getDeclarationStatement()) &&
-				statementsAreEquivalent(statement1.getBody(), statement2.getBody()));
-	}
-
-	private static boolean switchStatementsAreEquivalent(JSSwitchStatement statement1,
-														 JSSwitchStatement statement2)
-	{
-		if(!expressionsAreEquivalent(statement1.getSwitchExpression(),
-				statement2.getSwitchExpression()))
-		{
-			return false;
-		}
-
-		final JSCaseClause[] caseClauses1 = statement1.getCaseClauses();
-		final JSCaseClause[] caseClauses2 = statement2.getCaseClauses();
-
-		if(caseClauses1.length != caseClauses2.length)
-		{
-			return false;
-		}
-
-		for(int index = 0; index < caseClauses1.length; index++)
-		{
-			if(!caseClausesAreEquivalent(caseClauses1[index], caseClauses2[index]))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private static boolean caseClausesAreEquivalent(JSCaseClause caseClause1, JSCaseClause caseClause2)
-	{
-		if(caseClause1.isDefault() != caseClause2.isDefault())
-		{
-			return false;
-		}
-		if(!expressionsAreEquivalent(caseClause1.getCaseExpression(), caseClause2.getCaseExpression()))
-		{
-			return false;
-		}
-
-		final JSStatement[] statements1 = caseClause1.getStatements();
-		final JSStatement[] statements2 = caseClause2.getStatements();
-
-		if(statements1.length != statements2.length)
-		{
-			return false;
-		}
-
-		for(int index = 0; index < statements1.length; index++)
-		{
-			if(!statementsAreEquivalent(statements1[index], statements2[index]))
-			{
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	private static boolean doWhileStatementsAreEquivalent(JSDoWhileStatement statement1,
-														  JSDoWhileStatement statement2)
-	{
-		return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
-				statementsAreEquivalent(statement1.getBody(), statement2.getBody()));
-	}
-
-	private static boolean codeBlocksAreEquivalent(JSBlockStatement statement1,
-												   JSBlockStatement statement2)
-	{
-		if(statement1 == null && statement2 == null)
-		{
-			return true;
-		}
-		if(statement1 == null || statement2 == null)
-		{
-			return false;
-		}
-		return blockStatementsAreEquivalent(statement1.getStatements(), statement2.getStatements());
-	}
-
-	private static boolean breakStatementsAreEquivalent(JSBreakStatement statement1,
-														JSBreakStatement statement2)
-	{
-		return areEqual(statement1.getLabel(), statement2.getLabel());
-	}
-
-	private static boolean continueStatementsAreEquivalent(JSContinueStatement statement1,
-														   JSContinueStatement statement2)
-	{
-		return areEqual(statement1.getLabel(), statement2.getLabel());
-	}
-
-	private static boolean labeledStatementsAreEquivalent(JSLabeledStatement statement1,
-														  JSLabeledStatement statement2)
-	{
-		final PsiElement element1 = statement1.getLabelIdentifier();
-		final PsiElement element2 = statement2.getLabelIdentifier();
-
-		return ((element1 == null) ? (element2 == null)
-				: (element2 != null && element1.getText().equals(element2.getText())));
-	}
-
-	private static boolean blockStatementsAreEquivalent(JSStatement[] statements1,
-														JSStatement[] statements2)
-	{
-		if(statements1.length != statements2.length)
-		{
-			return false;
-		}
-		for(int index = 0; index < statements1.length; index++)
-		{
-			if(!statementsAreEquivalent(statements1[index], statements2[index]))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static boolean ifStatementsAreEquivalent(JSIfStatement statement1,
-													 JSIfStatement statement2)
-	{
-		return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
-				statementsAreEquivalent(statement1.getThen(), statement2.getThen()) &&
-				statementsAreEquivalent(statement1.getElse(), statement2.getElse()));
-	}
-
-	private static boolean expressionStatementsAreEquivalent(JSExpressionStatement statement1,
-															 JSExpressionStatement statement2)
-	{
-		return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
-	}
-
-	private static boolean returnStatementsAreEquivalent(JSReturnStatement statement1,
-														 JSReturnStatement statement2)
-	{
-		return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
-	}
-
-	private static boolean throwStatementsAreEquivalent(JSThrowStatement statement1,
-														JSThrowStatement statement2)
-	{
-		return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
-	}
-
-	private static boolean withStatementsAreEquivalent(JSWithStatement statement1,
-													   JSWithStatement statement2)
-	{
-		return (expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression()) &&
-				statementsAreEquivalent(statement1.getStatement(), statement2.getStatement()));
-	}
-
-	public static boolean expressionsAreEquivalent(JSExpression exp1,
-												   JSExpression exp2)
-	{
-		if(exp1 == null && exp2 == null)
-		{
-			return true;
-		}
-		if(exp1 == null || exp2 == null)
-		{
-			return false;
-		}
-
-		final JSExpression expToCompare1 = ParenthesesUtils.stripParentheses(exp1);
-		final JSExpression expToCompare2 = ParenthesesUtils.stripParentheses(exp2);
-		final int type1 = getExpressionType(expToCompare1);
-		final int type2 = getExpressionType(expToCompare2);
-
-		if(type1 != type2)
-		{
-			return false;
-		}
-		switch(type1)
-		{
-			case THIS_EXPRESSION:
-			case SUPER_EXPRESSION:
-				return true;
-
-			case LITERAL_EXPRESSION:
-			case CLASS_OBJECT_EXPRESSION:
-			case REFERENCE_EXPRESSION:
-			case DEFINITION_EXPRESSION:
-				return expToCompare1.getText().equals(expToCompare2.getText());
-
-			case CALL_EXPRESSION:
-				return callExpressionsAreEquivalent((JSCallExpression) expToCompare1,
-						(JSCallExpression) expToCompare2);
-
-			case NEW_EXPRESSION:
-				return newExpressionsAreEquivalent((JSNewExpression) expToCompare1,
-						(JSNewExpression) expToCompare2);
-
-			case ARRAY_LITERAL_EXPRESSION:
-				return arrayLiteralExpressionsAreEquivalent((JSArrayLiteralExpression) expToCompare1,
-						(JSArrayLiteralExpression) expToCompare2);
-
-			case PREFIX_EXPRESSION:
-				return prefixExpressionsAreEquivalent((JSPrefixExpression) expToCompare1,
-						(JSPrefixExpression) expToCompare2);
-
-			case POSTFIX_EXPRESSION:
-				return postfixExpressionsAreEquivalent((JSPostfixExpression) expToCompare1,
-						(JSPostfixExpression) expToCompare2);
-
-			case BINARY_EXPRESSION:
-				return binaryExpressionsAreEquivalent((JSBinaryExpression) expToCompare1,
-						(JSBinaryExpression) expToCompare2);
-
-			case ASSIGNMENT_EXPRESSION:
-				return assignmentExpressionsAreEquivalent((JSAssignmentExpression) expToCompare1,
-						(JSAssignmentExpression) expToCompare2);
-
-			case CONDITIONAL_EXPRESSION:
-				return conditionalExpressionsAreEquivalent((JSConditionalExpression) expToCompare1,
-						(JSConditionalExpression) expToCompare2);
-
-			case INDEX_PROPERTY_ACCESS_EXPRESSION:
-				return indexedPropertyAccessExpressionsAreEquivalent((JSIndexedPropertyAccessExpression) expToCompare1,
-						(JSIndexedPropertyAccessExpression) expToCompare2);
-
-			case OBJECT_LITERAL_EXPRESSION:
-				return objectLiteralExpressionsAreEquivalent((JSObjectLiteralExpression) expToCompare1,
-						(JSObjectLiteralExpression) expToCompare2);
-
-			case FUNCTION_EXPRESSION:
-				return functionExpressionsAreEquivalent((JSFunctionExpression) expToCompare1,
-						(JSFunctionExpression) expToCompare2);
-
-			default:
-				return false;
-		}
-	}
-
-	@SuppressWarnings({"UNUSED_SYMBOL"})
-	private static boolean functionExpressionsAreEquivalent(JSFunctionExpression functionExp1,
-															JSFunctionExpression functionExp2)
-	{
-		return false;
-	}
-
-	private static boolean objectLiteralExpressionsAreEquivalent(JSObjectLiteralExpression objectLiteralExp1,
-																 JSObjectLiteralExpression objectLiteralExp2)
-	{
-		final JSProperty[] properties1 = objectLiteralExp1.getProperties();
-		final JSProperty[] properties2 = objectLiteralExp2.getProperties();
-
-		if(properties1.length != properties2.length)
-		{
-			return false;
-		}
-
-		for(int index = 0; index < properties2.length; index++)
-		{
-			final JSProperty property1 = properties1[index];
-			final JSProperty property2 = properties2[index];
-			final String propertyName1 = property1.getName();
-			final String propertyName2 = property2.getName();
-
-			if(!(propertyName1 != null && propertyName2 != null &&
-					propertyName2.equals(propertyName1) &&
-					expressionsAreEquivalent(property1.getValue(), property2.getValue())))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private static boolean indexedPropertyAccessExpressionsAreEquivalent(JSIndexedPropertyAccessExpression exp1,
-																		 JSIndexedPropertyAccessExpression exp2)
-	{
-		return (expressionsAreEquivalent(exp1.getIndexExpression(), exp2.getIndexExpression()) &&
-				expressionsAreEquivalent(exp1.getQualifier(), exp2.getQualifier()));
-	}
-
-	private static boolean callExpressionsAreEquivalent(JSCallExpression methodExp1,
-														JSCallExpression methodExp2)
-	{
-		JSExpression exp1;
-		JSExpression exp2;
-
-		try
-		{
-			exp1 = methodExp1.getMethodExpression();
-			exp2 = methodExp2.getMethodExpression();
-		}
-		catch(Exception exception)
-		{
-			return false;
-		}
-
-		if(!expressionsAreEquivalent(exp1, exp2))
-		{
-			return false;
-		}
-
-		final JSArgumentList argumentList1 = methodExp1.getArgumentList();
-		final JSArgumentList argumentList2 = methodExp2.getArgumentList();
-
-		return (argumentList1 != null &&
-				argumentList2 != null &&
-				expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments()));
-	}
-
-	private static boolean newExpressionsAreEquivalent(JSNewExpression newExp1,
-													   JSNewExpression newExp2)
-	{
-		final JSExpression exp1 = newExp1.getMethodExpression();
-		final JSExpression exp2 = newExp2.getMethodExpression();
-
-		if(!expressionsAreEquivalent(exp1, exp2))
-		{
-			return false;
-		}
-
-		final JSArgumentList argumentList1 = newExp1.getArgumentList();
-		final JSArgumentList argumentList2 = newExp2.getArgumentList();
-
-		return (argumentList1 != null &&
-				argumentList2 != null &&
-				expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments()));
-	}
-
-	private static boolean arrayLiteralExpressionsAreEquivalent(JSArrayLiteralExpression arrInitExp1,
-																JSArrayLiteralExpression arrInitExp2)
-	{
-		return expressionListsAreEquivalent(arrInitExp1.getExpressions(), arrInitExp2.getExpressions());
-	}
-
-	private static boolean prefixExpressionsAreEquivalent(JSPrefixExpression prefixExp1,
-														  JSPrefixExpression prefixExp2)
-	{
-		final IElementType operator1 = prefixExp1.getOperationSign();
-		final IElementType operator2 = prefixExp2.getOperationSign();
-
-		return (operator1 != null && operator2 != null &&
-				operator1.equals(operator2) &&
-				expressionsAreEquivalent(prefixExp1.getExpression(), prefixExp2.getExpression()));
-	}
-
-	private static boolean postfixExpressionsAreEquivalent(JSPostfixExpression postfixExp1,
-														   JSPostfixExpression postfixExp2)
-	{
-		final IElementType operator1 = postfixExp1.getOperationSign();
-		final IElementType operator2 = postfixExp2.getOperationSign();
-
-		return (operator1.equals(operator2) &&
-				expressionsAreEquivalent(postfixExp1.getExpression(), postfixExp2.getExpression()));
-	}
-
-	private static boolean binaryExpressionsAreEquivalent(JSBinaryExpression binaryExp1,
-														  JSBinaryExpression binaryExp2)
-	{
-		final IElementType operator1 = binaryExp1.getOperationSign();
-		final IElementType operator2 = binaryExp2.getOperationSign();
-
-		return (operator1.equals(operator2) &&
-				expressionsAreEquivalent(binaryExp1.getLOperand(), binaryExp2.getLOperand()) &&
-				expressionsAreEquivalent(binaryExp1.getROperand(), binaryExp2.getROperand()));
-	}
-
-	private static boolean assignmentExpressionsAreEquivalent(JSAssignmentExpression assignExp1,
-															  JSAssignmentExpression assignExp2)
-	{
-		final IElementType operator1 = assignExp1.getOperationSign();
-		final IElementType operator2 = assignExp2.getOperationSign();
-
-		return (operator1.equals(operator2) &&
-				expressionsAreEquivalent(assignExp1.getLOperand(), assignExp2.getLOperand()) &&
-				expressionsAreEquivalent(assignExp1.getROperand(), assignExp2.getROperand()));
-	}
-
-	private static boolean conditionalExpressionsAreEquivalent(JSConditionalExpression condExp1,
-															   JSConditionalExpression condExp2)
-	{
-		return (expressionsAreEquivalent(condExp1.getCondition(), condExp2.getCondition()) &&
-				expressionsAreEquivalent(condExp1.getThen(), condExp2.getThen()) &&
-				expressionsAreEquivalent(condExp1.getElse(), condExp2.getElse()));
-	}
-
-	private static boolean expressionListsAreEquivalent(JSExpression[] expressions1,
-														JSExpression[] expressions2)
-	{
-		if(expressions1 == null && expressions2 == null)
-		{
-			return true;
-		}
-
-		if(expressions1 == null || expressions2 == null)
-		{
-			return false;
-		}
-		if(expressions1.length != expressions2.length)
-		{
-			return false;
-		}
-
-		for(int index = 0; index < expressions1.length; index++)
-		{
-			if(!expressionsAreEquivalent(expressions1[index], expressions2[index]))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static boolean areEqual(Object o1, Object o2)
-	{
-		return ((o1 == null) ? (o2 == null) : o1.equals(o2));
-	}
-
-	private static int getExpressionType(JSExpression exp)
-	{
-		if(exp instanceof JSThisExpression)
-		{
-			return THIS_EXPRESSION;
-		}
-		if(exp instanceof JSLiteralExpression)
-		{
-			return LITERAL_EXPRESSION;
-		}
-		if(exp instanceof JSReferenceExpression)
-		{
-			return REFERENCE_EXPRESSION;
-		}
-		if(exp instanceof JSNewExpression)
-		{
-			return NEW_EXPRESSION;
-		}
-		if(exp instanceof JSCallExpression)
-		{
-			return CALL_EXPRESSION;
-		}
-		if(exp instanceof JSArrayLiteralExpression)
-		{
-			return ARRAY_LITERAL_EXPRESSION;
-		}
-		if(exp instanceof JSPrefixExpression)
-		{
-			return PREFIX_EXPRESSION;
-		}
-		if(exp instanceof JSPostfixExpression)
-		{
-			return POSTFIX_EXPRESSION;
-		}
-		if(exp instanceof JSAssignmentExpression)
-		{
-			return ASSIGNMENT_EXPRESSION;
-		}
-		if(exp instanceof JSBinaryExpression)
-		{
-			return BINARY_EXPRESSION;
-		}
-		if(exp instanceof JSConditionalExpression)
-		{
-			return CONDITIONAL_EXPRESSION;
-		}
-		if(exp instanceof JSIndexedPropertyAccessExpression)
-		{
-			return INDEX_PROPERTY_ACCESS_EXPRESSION;
-		}
-		if(exp instanceof JSFunctionExpression)
-		{
-			return FUNCTION_EXPRESSION;
-		}
-		if(exp instanceof JSObjectLiteralExpression)
-		{
-			return OBJECT_LITERAL_EXPRESSION;
-		}
-		if(exp instanceof JSDefinitionExpression)
-		{
-			return DEFINITION_EXPRESSION;
-		}
-		return -1;
-	}
-
-	private static int getStatementType(JSStatement statement)
-	{
-		if(statement instanceof JSBlockStatement)
-		{
-			return BLOCK_STATEMENT;
-		}
-		if(statement instanceof JSBreakStatement)
-		{
-			return BREAK_STATEMENT;
-		}
-		if(statement instanceof JSContinueStatement)
-		{
-			return CONTINUE_STATEMENT;
-		}
-		if(statement instanceof JSVarStatement)
-		{
-			return VAR_STATEMENT;
-		}
-		if(statement instanceof JSDoWhileStatement)
-		{
-			return DO_WHILE_STATEMENT;
-		}
-		if(statement instanceof JSEmptyStatement)
-		{
-			return EMPTY_STATEMENT;
-		}
-		if(statement instanceof JSExpressionStatement)
-		{
-			return EXPRESSION_STATEMENT;
-		}
-		if(statement instanceof JSForStatement)
-		{
-			return FOR_STATEMENT;
-		}
-		if(statement instanceof JSForInStatement)
-		{
-			return FOR_IN_STATEMENT;
-		}
-		if(statement instanceof JSIfStatement)
-		{
-			return IF_STATEMENT;
-		}
-		if(statement instanceof JSLabeledStatement)
-		{
-			return LABELED_STATEMENT;
-		}
-		if(statement instanceof JSReturnStatement)
-		{
-			return RETURN_STATEMENT;
-		}
-		if(statement instanceof JSSwitchStatement)
-		{
-			return SWITCH_STATEMENT;
-		}
-		if(statement instanceof JSThrowStatement)
-		{
-			return THROW_STATEMENT;
-		}
-		if(statement instanceof JSTryStatement)
-		{
-			return TRY_STATEMENT;
-		}
-		if(statement instanceof JSWhileStatement)
-		{
-			return WHILE_STATEMENT;
-		}
-		if(statement instanceof JSWithStatement)
-		{
-			return WITH_STATEMENT;
-		}
-		return -1;
-	}
+public class EquivalenceChecker {
+    private EquivalenceChecker() {
+    }
+
+    private static final int THIS_EXPRESSION = 0;
+    private static final int LITERAL_EXPRESSION = 1;
+    private static final int CLASS_OBJECT_EXPRESSION = 2;
+    private static final int REFERENCE_EXPRESSION = 3;
+    private static final int SUPER_EXPRESSION = 4;
+    private static final int CALL_EXPRESSION = 5;
+    private static final int NEW_EXPRESSION = 6;
+    private static final int ARRAY_LITERAL_EXPRESSION = 7;
+    private static final int PREFIX_EXPRESSION = 8;
+    private static final int POSTFIX_EXPRESSION = 9;
+    private static final int ASSIGNMENT_EXPRESSION = 10;
+    private static final int BINARY_EXPRESSION = 11;
+    private static final int CONDITIONAL_EXPRESSION = 12;
+    private static final int INDEX_PROPERTY_ACCESS_EXPRESSION = 13;
+    private static final int OBJECT_LITERAL_EXPRESSION = 14;
+    private static final int FUNCTION_EXPRESSION = 15;
+    private static final int DEFINITION_EXPRESSION = 16;
+
+    private static final int BLOCK_STATEMENT = 0;
+    private static final int BREAK_STATEMENT = 1;
+    private static final int CONTINUE_STATEMENT = 2;
+    private static final int VAR_STATEMENT = 3;
+    private static final int DO_WHILE_STATEMENT = 4;
+    private static final int EMPTY_STATEMENT = 5;
+    private static final int EXPRESSION_STATEMENT = 6;
+    private static final int FOR_STATEMENT = 7;
+    private static final int FOR_IN_STATEMENT = 8;
+    private static final int IF_STATEMENT = 9;
+    private static final int LABELED_STATEMENT = 10;
+    private static final int RETURN_STATEMENT = 11;
+    private static final int SWITCH_STATEMENT = 12;
+    private static final int THROW_STATEMENT = 13;
+    private static final int TRY_STATEMENT = 14;
+    private static final int WHILE_STATEMENT = 15;
+    private static final int WITH_STATEMENT = 16;
+
+    public static boolean statementsAreEquivalent(JSStatement exp1, JSStatement exp2) {
+        if (exp1 == null && exp2 == null) {
+            return true;
+        }
+
+        if (exp1 == null || exp2 == null) {
+            return false;
+        }
+
+        final int type1 = getStatementType(exp1);
+        final int type2 = getStatementType(exp2);
+
+        if (type1 != type2) {
+            return false;
+        }
+
+        switch (type1) {
+            case BLOCK_STATEMENT:
+                return codeBlocksAreEquivalent((JSBlockStatement)exp1, (JSBlockStatement)exp2);
+            case BREAK_STATEMENT:
+                return breakStatementsAreEquivalent((JSBreakStatement)exp1, (JSBreakStatement)exp2);
+            case CONTINUE_STATEMENT:
+                return continueStatementsAreEquivalent((JSContinueStatement)exp1, (JSContinueStatement)exp2);
+            case VAR_STATEMENT:
+                return declarationStatementsAreEquivalent((JSVarStatement)exp1, (JSVarStatement)exp2);
+            case DO_WHILE_STATEMENT:
+                return doWhileStatementsAreEquivalent((JSDoWhileStatement)exp1, (JSDoWhileStatement)exp2);
+            case EMPTY_STATEMENT:
+                return true;
+            case EXPRESSION_STATEMENT:
+                return expressionStatementsAreEquivalent((JSExpressionStatement)exp1, (JSExpressionStatement)exp2);
+            case FOR_STATEMENT:
+                return forStatementsAreEquivalent((JSForStatement)exp1, (JSForStatement)exp2);
+            case FOR_IN_STATEMENT:
+                return forInStatementsAreEquivalent((JSForInStatement)exp1, (JSForInStatement)exp2);
+            case IF_STATEMENT:
+                return ifStatementsAreEquivalent((JSIfStatement)exp1, (JSIfStatement)exp2);
+            case LABELED_STATEMENT:
+                return labeledStatementsAreEquivalent((JSLabeledStatement)exp1, (JSLabeledStatement)exp2);
+            case RETURN_STATEMENT:
+                return returnStatementsAreEquivalent((JSReturnStatement)exp1, (JSReturnStatement)exp2);
+            case SWITCH_STATEMENT:
+                return switchStatementsAreEquivalent((JSSwitchStatement)exp1, (JSSwitchStatement)exp2);
+            case THROW_STATEMENT:
+                return throwStatementsAreEquivalent((JSThrowStatement)exp1, (JSThrowStatement)exp2);
+            case TRY_STATEMENT:
+                return tryStatementsAreEquivalent((JSTryStatement)exp1, (JSTryStatement)exp2);
+            case WHILE_STATEMENT:
+                return whileStatementsAreEquivalent((JSWhileStatement)exp1, (JSWhileStatement)exp2);
+            case WITH_STATEMENT:
+                return withStatementsAreEquivalent((JSWithStatement)exp1, (JSWithStatement)exp2);
+            default:
+                return false;
+        }
+    }
+
+    private static boolean declarationStatementsAreEquivalent(JSVarStatement statement1, JSVarStatement statement2) {
+        if (statement1 == null || statement2 == null) {
+            return statement1 == statement2;
+        }
+        JSVariable[] vars1 = statement1.getVariables();
+        JSVariable[] vars2 = statement2.getVariables();
+
+        if (vars1.length == vars2.length) {
+            for (int index = 0; index < vars2.length; index++) {
+                if (!localVariableAreEquivalent(vars1[index], vars2[index])) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    private static boolean tryStatementsAreEquivalent(JSTryStatement statement1, JSTryStatement statement2) {
+        if (!statementsAreEquivalent(
+            statement1.getStatement(),
+            statement2.getStatement()
+        )) {
+            return false;
+        }
+        if (!statementsAreEquivalent(
+            statement1.getFinallyStatement(),
+            statement2.getFinallyStatement()
+        )) {
+            return false;
+        }
+        JSCatchBlock catchBlock1 = statement1.getCatchBlock();
+        JSCatchBlock catchBlock2 = statement2.getCatchBlock();
+        if (catchBlock1 == null) {
+            return (catchBlock2 == null);
+        }
+        else if (catchBlock2 == null) {
+            return false;
+        }
+
+        if (!parametersAreEquivalent(
+            catchBlock1.getParameter(),
+            catchBlock2.getParameter()
+        )) {
+            return false;
+        }
+        return statementsAreEquivalent(
+            catchBlock1.getStatement(),
+            catchBlock2.getStatement()
+        );
+    }
+
+    private static boolean localVariableAreEquivalent(JSVariable var1, JSVariable var2) {
+        return expressionsAreEquivalent(var1.getInitializer(), var2.getInitializer())
+            && typesAreEquivalent(var1.getType(), var2.getType())
+            && areEqual(var1.getName(), var2.getName());
+    }
+
+    private static boolean parametersAreEquivalent(JSParameter parameter1, JSParameter parameter2) {
+        return typesAreEquivalent(parameter1.getType(), parameter2.getType())
+            && areEqual(parameter1.getName(), parameter2.getName());
+    }
+
+    private static boolean typesAreEquivalent(JavaScriptType type1, JavaScriptType type2) {
+        return areEqual(type1, type2);
+    }
+
+    private static boolean whileStatementsAreEquivalent(JSWhileStatement statement1, JSWhileStatement statement2) {
+        return expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition())
+            && statementsAreEquivalent(statement1.getBody(), statement2.getBody());
+    }
+
+    private static boolean forStatementsAreEquivalent(JSForStatement statement1, JSForStatement statement2) {
+        return expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition())
+            && expressionsAreEquivalent(statement1.getInitialization(), statement2.getInitialization())
+            && expressionsAreEquivalent(statement1.getUpdate(), statement2.getUpdate())
+            && statementsAreEquivalent(statement1.getBody(), statement2.getBody());
+    }
+
+    private static boolean forInStatementsAreEquivalent(JSForInStatement statement1, JSForInStatement statement2) {
+        return expressionsAreEquivalent(statement1.getCollectionExpression(), statement2.getCollectionExpression())
+            && expressionsAreEquivalent(statement1.getVariableExpression(), statement2.getVariableExpression())
+            && declarationStatementsAreEquivalent(statement1.getDeclarationStatement(), statement2.getDeclarationStatement())
+            && statementsAreEquivalent(statement1.getBody(), statement2.getBody());
+    }
+
+    private static boolean switchStatementsAreEquivalent(JSSwitchStatement statement1, JSSwitchStatement statement2) {
+        if (!expressionsAreEquivalent(statement1.getSwitchExpression(), statement2.getSwitchExpression())) {
+            return false;
+        }
+
+        final JSCaseClause[] caseClauses1 = statement1.getCaseClauses();
+        final JSCaseClause[] caseClauses2 = statement2.getCaseClauses();
+
+        if (caseClauses1.length != caseClauses2.length) {
+            return false;
+        }
+
+        for (int index = 0; index < caseClauses1.length; index++) {
+            if (!caseClausesAreEquivalent(caseClauses1[index], caseClauses2[index])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private static boolean caseClausesAreEquivalent(JSCaseClause caseClause1, JSCaseClause caseClause2) {
+        if (caseClause1.isDefault() != caseClause2.isDefault()) {
+            return false;
+        }
+        if (!expressionsAreEquivalent(caseClause1.getCaseExpression(), caseClause2.getCaseExpression())) {
+            return false;
+        }
+
+        final JSStatement[] statements1 = caseClause1.getStatements();
+        final JSStatement[] statements2 = caseClause2.getStatements();
+
+        if (statements1.length != statements2.length) {
+            return false;
+        }
+
+        for (int index = 0; index < statements1.length; index++) {
+            if (!statementsAreEquivalent(statements1[index], statements2[index])) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean doWhileStatementsAreEquivalent(JSDoWhileStatement statement1, JSDoWhileStatement statement2) {
+        return (expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition()) &&
+            statementsAreEquivalent(statement1.getBody(), statement2.getBody()));
+    }
+
+    private static boolean codeBlocksAreEquivalent(JSBlockStatement statement1, JSBlockStatement statement2) {
+        if (statement1 == null && statement2 == null) {
+            return true;
+        }
+        if (statement1 == null || statement2 == null) {
+            return false;
+        }
+        return blockStatementsAreEquivalent(statement1.getStatements(), statement2.getStatements());
+    }
+
+    private static boolean breakStatementsAreEquivalent(JSBreakStatement statement1, JSBreakStatement statement2) {
+        return areEqual(statement1.getLabel(), statement2.getLabel());
+    }
+
+    private static boolean continueStatementsAreEquivalent(JSContinueStatement statement1, JSContinueStatement statement2) {
+        return areEqual(statement1.getLabel(), statement2.getLabel());
+    }
+
+    private static boolean labeledStatementsAreEquivalent(JSLabeledStatement statement1, JSLabeledStatement statement2) {
+        final PsiElement element1 = statement1.getLabelIdentifier();
+        final PsiElement element2 = statement2.getLabelIdentifier();
+
+        return element1 == null
+            ? element2 == null
+            : element2 != null && element1.getText().equals(element2.getText());
+    }
+
+    private static boolean blockStatementsAreEquivalent(JSStatement[] statements1, JSStatement[] statements2) {
+        if (statements1.length != statements2.length) {
+            return false;
+        }
+        for (int index = 0; index < statements1.length; index++) {
+            if (!statementsAreEquivalent(statements1[index], statements2[index])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static boolean ifStatementsAreEquivalent(JSIfStatement statement1, JSIfStatement statement2) {
+        return expressionsAreEquivalent(statement1.getCondition(), statement2.getCondition())
+            && statementsAreEquivalent(statement1.getThen(), statement2.getThen())
+            && statementsAreEquivalent(statement1.getElse(), statement2.getElse());
+    }
+
+    private static boolean expressionStatementsAreEquivalent(JSExpressionStatement statement1, JSExpressionStatement statement2) {
+        return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
+    }
+
+    private static boolean returnStatementsAreEquivalent(JSReturnStatement statement1, JSReturnStatement statement2) {
+        return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
+    }
+
+    private static boolean throwStatementsAreEquivalent(JSThrowStatement statement1, JSThrowStatement statement2) {
+        return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression());
+    }
+
+    private static boolean withStatementsAreEquivalent(JSWithStatement statement1, JSWithStatement statement2) {
+        return expressionsAreEquivalent(statement1.getExpression(), statement2.getExpression())
+            && statementsAreEquivalent(statement1.getStatement(), statement2.getStatement());
+    }
+
+    public static boolean expressionsAreEquivalent(JSExpression exp1, JSExpression exp2) {
+        if (exp1 == null && exp2 == null) {
+            return true;
+        }
+        if (exp1 == null || exp2 == null) {
+            return false;
+        }
+
+        final JSExpression expToCompare1 = ParenthesesUtils.stripParentheses(exp1);
+        final JSExpression expToCompare2 = ParenthesesUtils.stripParentheses(exp2);
+        final int type1 = getExpressionType(expToCompare1);
+        final int type2 = getExpressionType(expToCompare2);
+
+        if (type1 != type2) {
+            return false;
+        }
+        switch (type1) {
+            case THIS_EXPRESSION:
+            case SUPER_EXPRESSION:
+                return true;
+
+            case LITERAL_EXPRESSION:
+            case CLASS_OBJECT_EXPRESSION:
+            case REFERENCE_EXPRESSION:
+            case DEFINITION_EXPRESSION:
+                return expToCompare1.getText().equals(expToCompare2.getText());
+
+            case CALL_EXPRESSION:
+                return callExpressionsAreEquivalent((JSCallExpression)expToCompare1, (JSCallExpression)expToCompare2);
+
+            case NEW_EXPRESSION:
+                return newExpressionsAreEquivalent((JSNewExpression)expToCompare1, (JSNewExpression)expToCompare2);
+
+            case ARRAY_LITERAL_EXPRESSION:
+                return arrayLiteralExpressionsAreEquivalent(
+                    (JSArrayLiteralExpression)expToCompare1,
+                    (JSArrayLiteralExpression)expToCompare2
+                );
+
+            case PREFIX_EXPRESSION:
+                return prefixExpressionsAreEquivalent((JSPrefixExpression)expToCompare1, (JSPrefixExpression)expToCompare2);
+
+            case POSTFIX_EXPRESSION:
+                return postfixExpressionsAreEquivalent((JSPostfixExpression)expToCompare1, (JSPostfixExpression)expToCompare2);
+
+            case BINARY_EXPRESSION:
+                return binaryExpressionsAreEquivalent((JSBinaryExpression)expToCompare1, (JSBinaryExpression)expToCompare2);
+
+            case ASSIGNMENT_EXPRESSION:
+                return assignmentExpressionsAreEquivalent((JSAssignmentExpression)expToCompare1, (JSAssignmentExpression)expToCompare2);
+
+            case CONDITIONAL_EXPRESSION:
+                return conditionalExpressionsAreEquivalent((JSConditionalExpression)expToCompare1, (JSConditionalExpression)expToCompare2);
+
+            case INDEX_PROPERTY_ACCESS_EXPRESSION:
+                return indexedPropertyAccessExpressionsAreEquivalent(
+                    (JSIndexedPropertyAccessExpression)expToCompare1,
+                    (JSIndexedPropertyAccessExpression)expToCompare2
+                );
+
+            case OBJECT_LITERAL_EXPRESSION:
+                return objectLiteralExpressionsAreEquivalent(
+                    (JSObjectLiteralExpression)expToCompare1,
+                    (JSObjectLiteralExpression)expToCompare2
+                );
+
+            case FUNCTION_EXPRESSION:
+                return functionExpressionsAreEquivalent((JSFunctionExpression)expToCompare1, (JSFunctionExpression)expToCompare2);
+
+            default:
+                return false;
+        }
+    }
+
+    @SuppressWarnings({"UNUSED_SYMBOL"})
+    private static boolean functionExpressionsAreEquivalent(JSFunctionExpression functionExp1, JSFunctionExpression functionExp2) {
+        return false;
+    }
+
+    private static boolean objectLiteralExpressionsAreEquivalent(
+        JSObjectLiteralExpression objectLiteralExp1,
+        JSObjectLiteralExpression objectLiteralExp2
+    ) {
+        final JSProperty[] properties1 = objectLiteralExp1.getProperties();
+        final JSProperty[] properties2 = objectLiteralExp2.getProperties();
+
+        if (properties1.length != properties2.length) {
+            return false;
+        }
+
+        for (int index = 0; index < properties2.length; index++) {
+            final JSProperty property1 = properties1[index];
+            final JSProperty property2 = properties2[index];
+            final String propertyName1 = property1.getName();
+            final String propertyName2 = property2.getName();
+
+            if (!(propertyName1 != null && propertyName2 != null &&
+                propertyName2.equals(propertyName1) &&
+                expressionsAreEquivalent(property1.getValue(), property2.getValue()))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private static boolean indexedPropertyAccessExpressionsAreEquivalent(
+        JSIndexedPropertyAccessExpression exp1,
+        JSIndexedPropertyAccessExpression exp2
+    ) {
+        return (expressionsAreEquivalent(exp1.getIndexExpression(), exp2.getIndexExpression()) &&
+            expressionsAreEquivalent(exp1.getQualifier(), exp2.getQualifier()));
+    }
+
+    private static boolean callExpressionsAreEquivalent(JSCallExpression methodExp1, JSCallExpression methodExp2) {
+        JSExpression exp1;
+        JSExpression exp2;
+
+        try {
+            exp1 = methodExp1.getMethodExpression();
+            exp2 = methodExp2.getMethodExpression();
+        }
+        catch (Exception exception) {
+            return false;
+        }
+
+        if (!expressionsAreEquivalent(exp1, exp2)) {
+            return false;
+        }
+
+        final JSArgumentList argumentList1 = methodExp1.getArgumentList();
+        final JSArgumentList argumentList2 = methodExp2.getArgumentList();
+
+        return argumentList1 != null && argumentList2 != null
+            && expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments());
+    }
+
+    private static boolean newExpressionsAreEquivalent(JSNewExpression newExp1, JSNewExpression newExp2) {
+        final JSExpression exp1 = newExp1.getMethodExpression();
+        final JSExpression exp2 = newExp2.getMethodExpression();
+
+        if (!expressionsAreEquivalent(exp1, exp2)) {
+            return false;
+        }
+
+        final JSArgumentList argumentList1 = newExp1.getArgumentList();
+        final JSArgumentList argumentList2 = newExp2.getArgumentList();
+
+        return argumentList1 != null && argumentList2 != null
+            && expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments());
+    }
+
+    private static boolean arrayLiteralExpressionsAreEquivalent(
+        JSArrayLiteralExpression arrInitExp1,
+        JSArrayLiteralExpression arrInitExp2
+    ) {
+        return expressionListsAreEquivalent(arrInitExp1.getExpressions(), arrInitExp2.getExpressions());
+    }
+
+    private static boolean prefixExpressionsAreEquivalent(JSPrefixExpression prefixExp1, JSPrefixExpression prefixExp2) {
+        final IElementType operator1 = prefixExp1.getOperationSign();
+        final IElementType operator2 = prefixExp2.getOperationSign();
+
+        return (operator1 != null && operator2 != null &&
+            operator1.equals(operator2) &&
+            expressionsAreEquivalent(prefixExp1.getExpression(), prefixExp2.getExpression()));
+    }
+
+    private static boolean postfixExpressionsAreEquivalent(JSPostfixExpression postfixExp1, JSPostfixExpression postfixExp2) {
+        final IElementType operator1 = postfixExp1.getOperationSign();
+        final IElementType operator2 = postfixExp2.getOperationSign();
+
+        return operator1.equals(operator2) && expressionsAreEquivalent(postfixExp1.getExpression(), postfixExp2.getExpression());
+    }
+
+    private static boolean binaryExpressionsAreEquivalent(JSBinaryExpression binaryExp1, JSBinaryExpression binaryExp2) {
+        final IElementType operator1 = binaryExp1.getOperationSign();
+        final IElementType operator2 = binaryExp2.getOperationSign();
+
+        return operator1.equals(operator2)
+            && expressionsAreEquivalent(binaryExp1.getLOperand(), binaryExp2.getLOperand())
+            && expressionsAreEquivalent(binaryExp1.getROperand(), binaryExp2.getROperand());
+    }
+
+    private static boolean assignmentExpressionsAreEquivalent(JSAssignmentExpression assignExp1, JSAssignmentExpression assignExp2) {
+        final IElementType operator1 = assignExp1.getOperationSign();
+        final IElementType operator2 = assignExp2.getOperationSign();
+
+        return operator1.equals(operator2)
+            && expressionsAreEquivalent(assignExp1.getLOperand(), assignExp2.getLOperand())
+            && expressionsAreEquivalent(assignExp1.getROperand(), assignExp2.getROperand());
+    }
+
+    private static boolean conditionalExpressionsAreEquivalent(JSConditionalExpression condExp1, JSConditionalExpression condExp2) {
+        return expressionsAreEquivalent(condExp1.getCondition(), condExp2.getCondition())
+            && expressionsAreEquivalent(condExp1.getThen(), condExp2.getThen())
+            && expressionsAreEquivalent(condExp1.getElse(), condExp2.getElse());
+    }
+
+    private static boolean expressionListsAreEquivalent(JSExpression[] expressions1, JSExpression[] expressions2) {
+        if (expressions1 == null && expressions2 == null) {
+            return true;
+        }
+
+        if (expressions1 == null || expressions2 == null) {
+            return false;
+        }
+        if (expressions1.length != expressions2.length) {
+            return false;
+        }
+
+        for (int index = 0; index < expressions1.length; index++) {
+            if (!expressionsAreEquivalent(expressions1[index], expressions2[index])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static boolean areEqual(Object o1, Object o2) {
+        return o1 == null ? o2 == null : o1.equals(o2);
+    }
+
+    private static int getExpressionType(JSExpression exp) {
+        if (exp instanceof JSThisExpression) {
+            return THIS_EXPRESSION;
+        }
+        if (exp instanceof JSLiteralExpression) {
+            return LITERAL_EXPRESSION;
+        }
+        if (exp instanceof JSReferenceExpression) {
+            return REFERENCE_EXPRESSION;
+        }
+        if (exp instanceof JSNewExpression) {
+            return NEW_EXPRESSION;
+        }
+        if (exp instanceof JSCallExpression) {
+            return CALL_EXPRESSION;
+        }
+        if (exp instanceof JSArrayLiteralExpression) {
+            return ARRAY_LITERAL_EXPRESSION;
+        }
+        if (exp instanceof JSPrefixExpression) {
+            return PREFIX_EXPRESSION;
+        }
+        if (exp instanceof JSPostfixExpression) {
+            return POSTFIX_EXPRESSION;
+        }
+        if (exp instanceof JSAssignmentExpression) {
+            return ASSIGNMENT_EXPRESSION;
+        }
+        if (exp instanceof JSBinaryExpression) {
+            return BINARY_EXPRESSION;
+        }
+        if (exp instanceof JSConditionalExpression) {
+            return CONDITIONAL_EXPRESSION;
+        }
+        if (exp instanceof JSIndexedPropertyAccessExpression) {
+            return INDEX_PROPERTY_ACCESS_EXPRESSION;
+        }
+        if (exp instanceof JSFunctionExpression) {
+            return FUNCTION_EXPRESSION;
+        }
+        if (exp instanceof JSObjectLiteralExpression) {
+            return OBJECT_LITERAL_EXPRESSION;
+        }
+        if (exp instanceof JSDefinitionExpression) {
+            return DEFINITION_EXPRESSION;
+        }
+        return -1;
+    }
+
+    private static int getStatementType(JSStatement statement) {
+        if (statement instanceof JSBlockStatement) {
+            return BLOCK_STATEMENT;
+        }
+        if (statement instanceof JSBreakStatement) {
+            return BREAK_STATEMENT;
+        }
+        if (statement instanceof JSContinueStatement) {
+            return CONTINUE_STATEMENT;
+        }
+        if (statement instanceof JSVarStatement) {
+            return VAR_STATEMENT;
+        }
+        if (statement instanceof JSDoWhileStatement) {
+            return DO_WHILE_STATEMENT;
+        }
+        if (statement instanceof JSEmptyStatement) {
+            return EMPTY_STATEMENT;
+        }
+        if (statement instanceof JSExpressionStatement) {
+            return EXPRESSION_STATEMENT;
+        }
+        if (statement instanceof JSForStatement) {
+            return FOR_STATEMENT;
+        }
+        if (statement instanceof JSForInStatement) {
+            return FOR_IN_STATEMENT;
+        }
+        if (statement instanceof JSIfStatement) {
+            return IF_STATEMENT;
+        }
+        if (statement instanceof JSLabeledStatement) {
+            return LABELED_STATEMENT;
+        }
+        if (statement instanceof JSReturnStatement) {
+            return RETURN_STATEMENT;
+        }
+        if (statement instanceof JSSwitchStatement) {
+            return SWITCH_STATEMENT;
+        }
+        if (statement instanceof JSThrowStatement) {
+            return THROW_STATEMENT;
+        }
+        if (statement instanceof JSTryStatement) {
+            return TRY_STATEMENT;
+        }
+        if (statement instanceof JSWhileStatement) {
+            return WHILE_STATEMENT;
+        }
+        if (statement instanceof JSWithStatement) {
+            return WITH_STATEMENT;
+        }
+        return -1;
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
index a794d5f9..adcd38ba 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
@@ -21,43 +21,35 @@
 import consulo.language.psi.PsiRecursiveElementVisitor;
 import jakarta.annotation.Nonnull;
 
-public class ErrorUtil
-{
-	private ErrorUtil()
-	{
-	}
-
-	private static final boolean fullTraversal = false;
-
-	public static boolean containsError(@Nonnull PsiElement element)
-	{
-		// check only immediate children, full tree traversal is too expensive
-		if(fullTraversal)
-		{
-			final ErrorElementVisitor visitor = new ErrorElementVisitor();
-
-			element.accept(visitor);
-			return visitor.containsErrorElement();
-		}
-		else
-		{
-			return PsiUtilBase.hasErrorElementChild(element);
-		}
-	}
-
-	private static class ErrorElementVisitor extends PsiRecursiveElementVisitor
-	{
-		private boolean containsErrorElement;
-
-		@Override
-		public void visitErrorElement(PsiErrorElement element)
-		{
-			this.containsErrorElement = true;
-		}
-
-		private boolean containsErrorElement()
-		{
-			return this.containsErrorElement;
-		}
-	}
+public class ErrorUtil {
+    private ErrorUtil() {
+    }
+
+    private static final boolean fullTraversal = false;
+
+    public static boolean containsError(@Nonnull PsiElement element) {
+        // check only immediate children, full tree traversal is too expensive
+        if (fullTraversal) {
+            final ErrorElementVisitor visitor = new ErrorElementVisitor();
+
+            element.accept(visitor);
+            return visitor.containsErrorElement();
+        }
+        else {
+            return PsiUtilBase.hasErrorElementChild(element);
+        }
+    }
+
+    private static class ErrorElementVisitor extends PsiRecursiveElementVisitor {
+        private boolean containsErrorElement;
+
+        @Override
+        public void visitErrorElement(PsiErrorElement element) {
+            this.containsErrorElement = true;
+        }
+
+        private boolean containsErrorElement() {
+            return this.containsErrorElement;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
index 061a1cbf..78aae5b7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
@@ -23,207 +23,174 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
 
-public class ExpressionUtil
-{
-
-	private ExpressionUtil()
-	{
-	}
-
-	public static boolean isConstantExpression(JSExpression expression)
-	{
-		if(expression == null)
-		{
-			return false;
-		}
-		IsConstantExpressionVisitor visitor = new IsConstantExpressionVisitor();
-		expression.accept(visitor);
-		return visitor.isConstant;
-	}
-
-	public static boolean isIncrementDecrementExpression(@Nonnull PsiElement expression)
-	{
-		if(expression instanceof JSPostfixExpression)
-		{
-			final IElementType operator = ((JSPostfixExpression) expression).getOperationSign();
-			return (JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator));
-		}
-		else if(expression instanceof JSPrefixExpression)
-		{
-			final IElementType operator = ((JSPrefixExpression) expression).getOperationSign();
-			return (JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator));
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	public static class IsConstantExpressionVisitor extends JSElementVisitor
-	{
-		protected boolean isConstant;
-		private final Map<JSVariable, Boolean> isVariableConstant = new HashMap<JSVariable, Boolean>();
-
-		public boolean isConstant()
-		{
-			return this.isConstant;
-		}
-
-		@Override
-		public void visitJSExpression(JSExpression expression)
-		{
-			this.isConstant = false;
-		}
-
-		@Override
-		public void visitJSLiteralExpression(JSSimpleLiteralExpression expression)
-		{
-			this.isConstant = true;
-		}
-
-		@Override
-		public void visitJSParenthesizedExpression(JSParenthesizedExpression expression)
-		{
-			JSExpression expr = expression.getInnerExpression();
-			if(expr != null)
-			{
-				expr.accept(this);
-			}
-		}
-
-		@Override
-		public void visitJSPrefixExpression(JSPrefixExpression expression)
-		{
-			this.visitJSPrefixOrPostfixExpression(expression.getExpression(), expression.getOperationSign());
-		}
-
-		@Override
-		public void visitJSPostfixExpression(JSPostfixExpression expression)
-		{
-			this.visitJSPrefixOrPostfixExpression(expression.getExpression(), expression.getOperationSign());
-		}
-
-		public void visitJSPrefixOrPostfixExpression(JSExpression operand, IElementType sign)
-		{
-			if(operand == null)
-			{
-				this.isConstant = false;
-				return;
-			}
-
-			operand.accept(this);
-			if(!this.isConstant)
-			{
-				return;
-			}
-
-			if(sign == JSTokenTypes.PLUS ||
-					sign == JSTokenTypes.MINUS ||
-					sign == JSTokenTypes.TILDE ||
-					sign == JSTokenTypes.EXCL)
-			{
-				return;
-			}
-			this.isConstant = false;
-		}
-
-		@Override
-		public void visitJSBinaryExpression(JSBinaryExpression expression)
-		{
-			final JSExpression jsExpression = expression.getLOperand();
-			if(jsExpression == null)
-			{
-				return;
-			}
-			jsExpression.accept(this);
-			if(!this.isConstant)
-			{
-				return;
-			}
-			JSExpression rOperand = expression.getROperand();
-			if(rOperand != null)
-			{
-				rOperand.accept(this);
-			}
-		}
-
-		@Override
-		public void visitJSConditionalExpression(JSConditionalExpression expression)
-		{
-			JSExpression thenExpr = expression.getThen();
-			JSExpression elseExpr = expression.getElse();
-			if(thenExpr == null || elseExpr == null)
-			{
-				this.isConstant = false;
-				return;
-			}
-
-			expression.getCondition().accept(this);
-			if(!this.isConstant)
-			{
-				return;
-			}
-			thenExpr.accept(this);
-			if(!this.isConstant)
-			{
-				return;
-			}
-			elseExpr.accept(this);
-		}
-
-		@Override
-		public void visitJSReferenceExpression(JSReferenceExpression expression)
-		{
-			JSElement refElement = (JSElement) expression.resolve();
-
-			if(!(refElement instanceof JSVariable))
-			{
-				this.isConstant = false;
-				return;
-			}
-
-			JSVariable variable = (JSVariable) refElement;
-			Boolean isConst = this.isVariableConstant.get(variable);
-
-			if(isConst != null)
-			{
-				this.isConstant &= isConst;
-				return;
-			}
-
-			this.isVariableConstant.put(variable, Boolean.FALSE);
-			this.isConstant = false;
-		}
-	}
-
-	@Nullable
-	public static Object computeConstantExpression(JSExpression expression)
-	{
-		if(expression == null)
-		{
-			return null;
-		}
-
-		//try {
-		//    final PsiManager                  manager  = expression.getManager();
-		//    final PsiElementFactory           factory  = manager.getElementFactory();
-		//    final PsiConstantEvaluationHelper helper   = manager.getConstantEvaluationHelper();
-		//    PsiExpression                     expr     = factory.createExpressionFromText(expression.getText(), expression);
-		//    final PsiType                     exprType = expr.getType();
-		//
-		//    if (exprType != null && exprType.equals(PsiType.INT)) {
-		//        expr = factory.createExpressionFromText("(long)" + expression.getText(), expression);
-		//    }
-		//
-		//    return helper.computeConstantExpression(expr);
-		//} catch (IncorrectOperationException e) {
-		//    return null;
-		//}
-
-		// TODO: constant expressions are not evaluated by PsiManager et al
-		return null;
-	}
+public class ExpressionUtil {
+    private ExpressionUtil() {
+    }
+
+    public static boolean isConstantExpression(JSExpression expression) {
+        if (expression == null) {
+            return false;
+        }
+        IsConstantExpressionVisitor visitor = new IsConstantExpressionVisitor();
+        expression.accept(visitor);
+        return visitor.isConstant;
+    }
+
+    public static boolean isIncrementDecrementExpression(@Nonnull PsiElement expression) {
+        if (expression instanceof JSPostfixExpression postfixExpression) {
+            final IElementType operator = postfixExpression.getOperationSign();
+            return JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator);
+        }
+        else if (expression instanceof JSPrefixExpression prefixExpression) {
+            final IElementType operator = prefixExpression.getOperationSign();
+            return JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator);
+        }
+        else {
+            return false;
+        }
+    }
+
+    public static class IsConstantExpressionVisitor extends JSElementVisitor {
+        protected boolean isConstant;
+        private final Map<JSVariable, Boolean> isVariableConstant = new HashMap<>();
+
+        public boolean isConstant() {
+            return this.isConstant;
+        }
+
+        @Override
+        public void visitJSExpression(JSExpression expression) {
+            this.isConstant = false;
+        }
+
+        @Override
+        public void visitJSLiteralExpression(JSSimpleLiteralExpression expression) {
+            this.isConstant = true;
+        }
+
+        @Override
+        public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
+            JSExpression expr = expression.getInnerExpression();
+            if (expr != null) {
+                expr.accept(this);
+            }
+        }
+
+        @Override
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
+            this.visitJSPrefixOrPostfixExpression(expression.getExpression(), expression.getOperationSign());
+        }
+
+        @Override
+        public void visitJSPostfixExpression(JSPostfixExpression expression) {
+            this.visitJSPrefixOrPostfixExpression(expression.getExpression(), expression.getOperationSign());
+        }
+
+        public void visitJSPrefixOrPostfixExpression(JSExpression operand, IElementType sign) {
+            if (operand == null) {
+                this.isConstant = false;
+                return;
+            }
+
+            operand.accept(this);
+            if (!this.isConstant) {
+                return;
+            }
+
+            if (sign == JSTokenTypes.PLUS ||
+                sign == JSTokenTypes.MINUS ||
+                sign == JSTokenTypes.TILDE ||
+                sign == JSTokenTypes.EXCL) {
+                return;
+            }
+            this.isConstant = false;
+        }
+
+        @Override
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
+            final JSExpression jsExpression = expression.getLOperand();
+            if (jsExpression == null) {
+                return;
+            }
+            jsExpression.accept(this);
+            if (!this.isConstant) {
+                return;
+            }
+            JSExpression rOperand = expression.getROperand();
+            if (rOperand != null) {
+                rOperand.accept(this);
+            }
+        }
+
+        @Override
+        public void visitJSConditionalExpression(JSConditionalExpression expression) {
+            JSExpression thenExpr = expression.getThen();
+            JSExpression elseExpr = expression.getElse();
+            if (thenExpr == null || elseExpr == null) {
+                this.isConstant = false;
+                return;
+            }
+
+            expression.getCondition().accept(this);
+            if (!this.isConstant) {
+                return;
+            }
+            thenExpr.accept(this);
+            if (!this.isConstant) {
+                return;
+            }
+            elseExpr.accept(this);
+        }
+
+        @Override
+        public void visitJSReferenceExpression(JSReferenceExpression expression) {
+            JSElement refElement = (JSElement)expression.resolve();
+
+            if (!(refElement instanceof JSVariable)) {
+                this.isConstant = false;
+                return;
+            }
+
+            JSVariable variable = (JSVariable)refElement;
+            Boolean isConst = this.isVariableConstant.get(variable);
+
+            if (isConst != null) {
+                this.isConstant &= isConst;
+                return;
+            }
+
+            this.isVariableConstant.put(variable, Boolean.FALSE);
+            this.isConstant = false;
+        }
+    }
+
+    @Nullable
+    public static Object computeConstantExpression(JSExpression expression) {
+        if (expression == null) {
+            return null;
+        }
+
+        //try {
+        //    final PsiManager                  manager  = expression.getManager();
+        //    final PsiElementFactory           factory  = manager.getElementFactory();
+        //    final PsiConstantEvaluationHelper helper   = manager.getConstantEvaluationHelper();
+        //    PsiExpression                     expr     = factory.createExpressionFromText(expression.getText(), expression);
+        //    final PsiType                     exprType = expr.getType();
+        //
+        //    if (exprType != null && exprType.equals(PsiType.INT)) {
+        //        expr = factory.createExpressionFromText("(long)" + expression.getText(), expression);
+        //    }
+        //
+        //    return helper.computeConstantExpression(expr);
+        //} catch (IncorrectOperationException e) {
+        //    return null;
+        //}
+
+        // TODO: constant expressions are not evaluated by PsiManager et al
+        return null;
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
index 21c2fc31..d9d5f155 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
@@ -31,184 +31,154 @@
 import java.util.Iterator;
 import java.util.List;
 
-public class FindReferenceUtil
-{
-	private FindReferenceUtil()
-	{
-	}
-
-	public static JSReferenceExpression[] findReferences(@Nonnull JSVariable variable)
-	{
-		final JSReferenceVisitor visitor = new JSReferenceVisitor(variable, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
-		JSElement scope = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
-
-		if(scope == null)
-		{
-			scope = getFarthestAncestor(variable, JSElement.class);
-		}
-		visitor.visitJSElement(scope);
-
-		return visitor.getReferences();
-	}
-
-	public static <T extends PsiElement> T getFarthestAncestor(@Nonnull PsiElement element, @Nonnull Class<T> aClass)
-	{
-		PsiElement previousElement = element;
-		PsiElement currentElement;
-
-		do
-		{
-			currentElement = previousElement.getParent();
-			if(!aClass.isInstance(currentElement))
-			{
-				//noinspection unchecked
-				return (T) previousElement;
-			}
-			previousElement = currentElement;
-		}
-		while(currentElement != null);
-
-		return null;
-	}
-
-	private static final class JSReferenceVisitor extends JSFunctionVisitor
-	{
-		private final JSVariable variable;
-		private final String variableName;
-		private final int maxCount;
-		private final int minTextOffset;
-		private final int maxTextOffset;
-		private List<JSReferenceExpression> references;
-
-		public JSReferenceVisitor(@Nonnull JSVariable variable, int maxCount, int minTextOffset, int maxTextOffset)
-		{
-			this.variable = variable;
-			this.variableName = variable.getName();
-			this.maxCount = maxCount;
-			this.minTextOffset = minTextOffset;
-			this.maxTextOffset = maxTextOffset;
-			this.references = new ArrayList<JSReferenceExpression>();
-		}
-
-		@Override
-		public void visitElement(PsiElement element)
-		{
-			if(this.references.size() < this.maxCount)
-			{
-				final int elementTextOffset = element.getTextOffset();
-
-				if(elementTextOffset + element.getTextLength() >= this.minTextOffset &&
-						elementTextOffset <= this.maxTextOffset)
-				{
-					super.visitElement(element);
-				}
-			}
-		}
-
-		@Override
-		public void visitJSReferenceExpression(final JSReferenceExpression expression)
-		{
-			super.visitJSReferenceExpression(expression);
-
-			if(expression.getText().equals(this.variableName))
-			{
-				final JSVariable referent = ControlFlowUtils.resolveVariable(expression);
-
-				if(referent != null && this.variable.equals(referent))
-				{
-					this.references.add(expression);
-				}
-			}
-		}
-
-		public JSReferenceExpression[] getReferences()
-		{
-			return this.references.toArray(new JSReferenceExpression[this.references.size()]);
-		}
-
-		public JSReferenceExpression getReference(int index)
-		{
-			return ((index >= 0 && index < this.references.size())
-					? this.references.get(index)
-					: null);
-		}
-	}
-
-
-	public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable)
-	{
-		return getReferences(variable, null, 0, Integer.MAX_VALUE);
-	}
-
-	public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable,
-													 @Nullable PsiElement scope)
-	{
-		return getReferences(variable, scope, 0, Integer.MAX_VALUE);
-	}
-
-	public static Iterable<PsiElement> getReferencesBefore(@Nonnull JSVariable variable, int textOffset)
-	{
-		return getReferences(variable, null, 0, textOffset);
-	}
-
-	public static Iterable<PsiElement> getReferencesAfter(@Nonnull JSVariable variable, int textOffset)
-	{
-		return getReferences(variable, null, textOffset, Integer.MAX_VALUE);
-	}
-
-	private static Iterable<PsiElement> getReferences(@Nonnull final JSVariable variable,
-													  @Nullable final PsiElement scope,
-													  final int minTextOffset, final int maxTextOffset)
-	{
-		final PsiElement iteratedScope;
-
-		if(scope == null)
-		{
-			JSElement function = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
-			iteratedScope = ((function == null) ? FindReferenceUtil.getFarthestAncestor(variable, XmlFile.class)
-					: function);
-		}
-		else
-		{
-			iteratedScope = scope;
-		}
-
-		return new Iterable<PsiElement>()
-		{
-			@Override
-			public Iterator<PsiElement> iterator()
-			{
-				return new JSReferenceIterator(variable, minTextOffset, maxTextOffset, iteratedScope);
-			}
-		};
-	}
-
-	public static final class JSReferenceIterator extends JSElementIterator
-	{
-		private final JSVariable variable;
-		private final String variableName;
-
-		public JSReferenceIterator(@Nonnull JSVariable variable,
-								   int minTextOffset, int maxTextOffset,
-								   @Nonnull PsiElement element)
-		{
-			super(element, false, minTextOffset, maxTextOffset);
-			this.variable = variable;
-			this.variableName = variable.getName();
-		}
-
-		@Override
-		public boolean visitElement(PsiElement element)
-		{
-			if(!(element.getText().equals(this.variableName) &&
-					element instanceof JSReferenceExpression))
-			{
-				return false;
-			}
-
-			final JSVariable referent = ControlFlowUtils.resolveVariable((JSReferenceExpression) element);
-
-			return (referent != null && this.variable.equals(referent));
-		}
-	}
+public class FindReferenceUtil {
+    private FindReferenceUtil() {
+    }
+
+    public static JSReferenceExpression[] findReferences(@Nonnull JSVariable variable) {
+        final JSReferenceVisitor visitor = new JSReferenceVisitor(variable, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
+        JSElement scope = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
+
+        if (scope == null) {
+            scope = getFarthestAncestor(variable, JSElement.class);
+        }
+        visitor.visitJSElement(scope);
+
+        return visitor.getReferences();
+    }
+
+    public static <T extends PsiElement> T getFarthestAncestor(@Nonnull PsiElement element, @Nonnull Class<T> aClass) {
+        PsiElement previousElement = element;
+        PsiElement currentElement;
+
+        do {
+            currentElement = previousElement.getParent();
+            if (!aClass.isInstance(currentElement)) {
+                //noinspection unchecked
+                return (T)previousElement;
+            }
+            previousElement = currentElement;
+        }
+        while (currentElement != null);
+
+        return null;
+    }
+
+    private static final class JSReferenceVisitor extends JSFunctionVisitor {
+        private final JSVariable variable;
+        private final String variableName;
+        private final int maxCount;
+        private final int minTextOffset;
+        private final int maxTextOffset;
+        private List<JSReferenceExpression> references;
+
+        public JSReferenceVisitor(@Nonnull JSVariable variable, int maxCount, int minTextOffset, int maxTextOffset) {
+            this.variable = variable;
+            this.variableName = variable.getName();
+            this.maxCount = maxCount;
+            this.minTextOffset = minTextOffset;
+            this.maxTextOffset = maxTextOffset;
+            this.references = new ArrayList<>();
+        }
+
+        @Override
+        public void visitElement(PsiElement element) {
+            if (this.references.size() < this.maxCount) {
+                final int elementTextOffset = element.getTextOffset();
+
+                if (elementTextOffset + element.getTextLength() >= this.minTextOffset &&
+                    elementTextOffset <= this.maxTextOffset) {
+                    super.visitElement(element);
+                }
+            }
+        }
+
+        @Override
+        public void visitJSReferenceExpression(final JSReferenceExpression expression) {
+            super.visitJSReferenceExpression(expression);
+
+            if (expression.getText().equals(this.variableName)) {
+                final JSVariable referent = ControlFlowUtils.resolveVariable(expression);
+
+                if (referent != null && this.variable.equals(referent)) {
+                    this.references.add(expression);
+                }
+            }
+        }
+
+        public JSReferenceExpression[] getReferences() {
+            return this.references.toArray(new JSReferenceExpression[this.references.size()]);
+        }
+
+        public JSReferenceExpression getReference(int index) {
+            return index >= 0 && index < this.references.size()
+                ? this.references.get(index)
+                : null;
+        }
+    }
+
+
+    public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable) {
+        return getReferences(variable, null, 0, Integer.MAX_VALUE);
+    }
+
+    public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable, @Nullable PsiElement scope) {
+        return getReferences(variable, scope, 0, Integer.MAX_VALUE);
+    }
+
+    public static Iterable<PsiElement> getReferencesBefore(@Nonnull JSVariable variable, int textOffset) {
+        return getReferences(variable, null, 0, textOffset);
+    }
+
+    public static Iterable<PsiElement> getReferencesAfter(@Nonnull JSVariable variable, int textOffset) {
+        return getReferences(variable, null, textOffset, Integer.MAX_VALUE);
+    }
+
+    private static Iterable<PsiElement> getReferences(
+        @Nonnull final JSVariable variable,
+        @Nullable final PsiElement scope,
+        final int minTextOffset,
+        final int maxTextOffset
+    ) {
+        final PsiElement iteratedScope;
+
+        if (scope == null) {
+            JSElement function = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
+            iteratedScope = function == null
+                ? FindReferenceUtil.getFarthestAncestor(variable, XmlFile.class)
+                : function;
+        }
+        else {
+            iteratedScope = scope;
+        }
+
+        return () -> new JSReferenceIterator(variable, minTextOffset, maxTextOffset, iteratedScope);
+    }
+
+    public static final class JSReferenceIterator extends JSElementIterator {
+        private final JSVariable variable;
+        private final String variableName;
+
+        public JSReferenceIterator(
+            @Nonnull JSVariable variable,
+            int minTextOffset,
+            int maxTextOffset,
+            @Nonnull PsiElement element
+        ) {
+            super(element, false, minTextOffset, maxTextOffset);
+            this.variable = variable;
+            this.variableName = variable.getName();
+        }
+
+        @Override
+        public boolean visitElement(PsiElement element) {
+            if (!(element.getText().equals(this.variableName) && element instanceof JSReferenceExpression)) {
+                return false;
+            }
+
+            final JSVariable referent = ControlFlowUtils.resolveVariable((JSReferenceExpression)element);
+
+            return referent != null && this.variable.equals(referent);
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
index b4980d05..1cfd392e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
@@ -38,355 +38,301 @@
 /**
  *
  */
-public class JSElementFactory
-{
-	private static final Class[] WHITESPACE_CLASS = new Class[]{PsiWhiteSpace.class};
-
-	private JSElementFactory()
-	{
-	}
-
-	public static PsiElement addElementBefore(@Nonnull PsiElement element,
-											  @Nonnull PsiElement newElement)
-	{
-		final ASTNode oldElementParentNode = element.getNode();
-		final PsiElement parentNode = element.getParent();
-		final ASTNode newElementParentNode = parentNode.getNode();
-		final ASTNode newElementNode = newElement.getNode();
-
-		if(newElementParentNode == null || newElementNode == null)
-		{
-			return null;
-		}
-		newElementParentNode.addChild(newElementNode, oldElementParentNode);
-		return newElement;
-	}
-
-	public static PsiElement addElementAfter(@Nonnull PsiElement element,
-											 @Nonnull PsiElement newElement)
-	{
-		final ASTNode elementNode = element.getNode();
-		final ASTNode oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
-		final PsiElement parentNode = element.getParent();
-		final ASTNode newElementParentNode = parentNode.getNode();
-		final ASTNode newElementNode = newElement.getNode();
-
-		if(newElementParentNode == null || newElementNode == null)
-		{
-			return null;
-		}
-		newElementParentNode.addChild(newElementNode, oldElementParentNode);
-
-		return newElement;
-	}
-
-	public static PsiElement addElementBefore(@Nonnull PsiElement element,
-											  @NonNls @Nonnull String elementText)
-	{
-		final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
-
-		assert (newElement != null);
-		return addElementBefore(element, newElement);
-	}
-
-	public static PsiElement addElementAfter(@Nonnull PsiElement element,
-											 @Nonnull String elementText)
-	{
-		final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
-
-		assert (newElement != null);
-		return addElementAfter(element, newElement);
-	}
-
-	public static ASTNode createElementFromText(Project project, String text)
-	{
-		final PsiElement element = createDummyFile(project, text).getFirstChild();
-
-		assert (element != null);
-		return element.getNode();
-	}
-
-	@Nonnull
-	private static PsiFile createDummyFile(Project project, String text)
-	{
-		final ParserDefinition def = ParserDefinition.forLanguage(JavaScriptLanguage.INSTANCE);
-
-		assert (def != null);
-		return PsiFileFactory.getInstance(project)
-				.createFileFromText("dummy.js", text);
-	}
-
-	public static JSStatement replaceElementWithStatement(@Nonnull JSElement element,
-														  @NonNls @Nonnull String statementText)
-			throws IncorrectOperationException
-	{
-		final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
-				element.getProject(),
-				statementText);
-
-		final ASTNode oldStatementParentNode = element.getNode();
-		final PsiElement parentNode = element.getParent();
-		final ASTNode newStatementParentNode = parentNode.getNode();
-
-		if(newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null)
-		{
-			return null;
-		}
-		newStatementParentNode.replaceChild(oldStatementParentNode, newStatementNode);
-		reformat(parentNode);
-
-		return (JSStatement) newStatementNode.getPsi();
-	}
-
-	public static JSExpression replaceExpression(@Nonnull JSExpression expression,
-												 @NonNls @Nonnull String text)
-			throws IncorrectOperationException
-	{
-		final JSExpression newExpressionNode = JSChangeUtil.createExpressionFromText(
-				expression.getProject(),
-				text);
-
-		return replaceExpression(expression, newExpressionNode);
-	}
-
-	public static JSExpression replaceExpression(@Nonnull JSExpression expression,
-												 @Nonnull JSExpression newExpression)
-			throws IncorrectOperationException
-	{
-		final ASTNode newExpressionNode = newExpression.getNode();
-		final ASTNode oldExpressionNode = expression.getNode();
-		final PsiElement parentNode = expression.getParent();
-		final ASTNode grandParentNode = parentNode.getNode();
-
-		if(grandParentNode == null || oldExpressionNode == null || newExpressionNode == null)
-		{
-			return null;
-		}
-
-		grandParentNode.replaceChild(oldExpressionNode, newExpressionNode);
-		reformat(parentNode);
-
-		return (JSExpression) newExpressionNode.getPsi();
-	}
-
-	public static JSStatement replaceStatement(@Nonnull JSStatement statement,
-											   @NonNls @Nonnull String text)
-			throws IncorrectOperationException
-	{
-		final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
-				statement.getProject(),
-				text);
-
-		final ASTNode oldStatementParentNode = statement.getNode();
-		final PsiElement parentNode = statement.getParent();
-		final ASTNode newStatementParentNode = parentNode.getNode();
-
-		if(newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null)
-		{
-			return null;
-		}
-
-		newStatementParentNode.replaceChild(oldStatementParentNode, newStatementNode);
-		reformat(parentNode);
-
-		return (JSStatement) newStatementNode.getPsi();
-	}
-
-	public static JSStatement addStatementBefore(@Nonnull JSStatement statement,
-												 @NonNls @Nonnull String previousStatementText)
-			throws IncorrectOperationException
-	{
-		final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
-				statement.getProject(),
-				previousStatementText);
-		final ASTNode oldStatementParentNode = statement.getNode();
-		final PsiElement parentNode = statement.getParent();
-		final ASTNode newStatementParentNode = parentNode.getNode();
-
-		if(newStatementParentNode == null || newStatementNode == null)
-		{
-			return null;
-		}
-
-		newStatementParentNode.addChild(newStatementNode, oldStatementParentNode);
-		reformat(parentNode);
-
-		return (JSStatement) newStatementNode.getPsi();
-	}
-
-	public static JSStatement addStatementAfter(@Nonnull JSStatement statement,
-												@NonNls @Nonnull String nextStatementText)
-			throws IncorrectOperationException
-	{
-		final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
-				statement.getProject(),
-				nextStatementText);
-		final ASTNode statementNode = statement.getNode();
-		final ASTNode oldStatementParentNode = ((statementNode == null) ? null : statementNode.getTreeNext());
-		final PsiElement parentNode = statement.getParent();
-		final ASTNode newStatementParentNode = parentNode.getNode();
-
-		if(newStatementParentNode == null || newStatementNode == null)
-		{
-			return null;
-		}
-
-		newStatementParentNode.addChild(newStatementNode, oldStatementParentNode);
-		reformat(parentNode);
-
-		return (JSStatement) newStatementNode.getPsi();
-	}
-
-	public static void addRangeBefore(JSStatement[] statements, JSStatement statement)
-			throws IncorrectOperationException
-	{
-		addRangeBefore(statements, 0, statements.length, statement);
-	}
-
-	public static void addRangeAfter(JSStatement[] statements, JSStatement statement)
-			throws IncorrectOperationException
-	{
-		addRangeAfter(statements, 0, statements.length, statement);
-	}
-
-	@SuppressWarnings({"ForLoopWithMissingComponent"})
-	public static void addRangeBefore(JSStatement[] statements, int start, int length, JSStatement statement)
-			throws IncorrectOperationException
-	{
-		for(int index = start; index < length; index++)
-		{
-			addStatementBefore(statement, statements[index].getText());
-		}
-	}
-
-	@SuppressWarnings({"ForLoopWithMissingComponent"})
-	public static void addRangeAfter(JSStatement[] statements, int start, int length, JSStatement statement)
-			throws IncorrectOperationException
-	{
-		for(int index = length; --index >= start; )
-		{
-			addStatementAfter(statement, statements[index].getText());
-		}
-	}
-
-	public static void replaceExpressionWithNegatedExpression(@Nonnull JSExpression newExpression,
-															  @Nonnull JSExpression exp)
-			throws IncorrectOperationException
-	{
-		JSExpression expressionToReplace = BoolUtils.findNegation(exp);
-		final String replacementString;
-
-		if(expressionToReplace == null)
-		{
-			expressionToReplace = exp;
-
-			if(ComparisonUtils.isComparisonOperator(newExpression))
-			{
-				final JSBinaryExpression binaryExpression = (JSBinaryExpression) newExpression;
-				final IElementType operationSign = binaryExpression.getOperationSign();
-				final String negatedComparison = ComparisonUtils.getNegatedOperatorText(operationSign);
-				final JSExpression leftOperand = binaryExpression.getLOperand();
-				final JSExpression rightOperand = binaryExpression.getROperand();
-
-				assert (rightOperand != null);
-
-				replacementString = leftOperand.getText() + negatedComparison + rightOperand.getText();
-			}
-			else
-			{
-				replacementString = '!' + ParenthesesUtils.getParenthesized(newExpression, ParenthesesUtils.PREFIX_PRECENDENCE);
-			}
-		}
-		else
-		{
-			replacementString = newExpression.getText();
-		}
-		replaceExpression(expressionToReplace, replacementString);
-	}
-
-	public static void replaceExpressionWithNegatedExpressionString(JSExpression exp, String newExpression)
-			throws IncorrectOperationException
-	{
-		assert (exp != null);
-
-		JSExpression expressionToReplace = BoolUtils.findNegation(exp);
-		String replacementString = newExpression;
-
-		if(expressionToReplace == null)
-		{
-			expressionToReplace = exp;
-			replacementString = "!(" + newExpression + ')';
-		}
-
-		replaceExpression(expressionToReplace, replacementString);
-	}
-
-
-	public static void replaceStatementWithUnwrapping(JSStatement statement, JSStatement newBranch)
-			throws IncorrectOperationException
-	{
-		if(!(newBranch instanceof JSBlockStatement))
-		{
-			JSElementFactory.replaceStatement(statement, newBranch.getText());
-			return;
-		}
-
-		final JSBlockStatement parentBlock = PsiTreeUtil.getParentOfType(newBranch, JSBlockStatement.class);
-
-		if(parentBlock == null)
-		{
-			JSElementFactory.replaceStatement(statement, newBranch.getText());
-			return;
-		}
-
-		final JSBlockStatement block = (JSBlockStatement) newBranch;
-
-		if(ControlFlowUtils.containsConflictingDeclarations(block, parentBlock))
-		{
-			JSElementFactory.replaceStatement(statement, newBranch.getText());
-			return;
-		}
-
-		final PsiElement containingElement = statement.getParent();
-
-		assert (containingElement instanceof JSStatement);
-
-		JSElementFactory.addRangeBefore(block.getStatements(), statement);
-		JSElementFactory.removeElement(statement);
-	}
-
-	public static void removeElement(PsiElement element)
-	{
-		final ASTNode node = element.getNode();
-		final ASTNode parentNode = element.getParent().getNode();
-
-		if(node != null && parentNode != null)
-		{
-			parentNode.removeChild(node);
-		}
-	}
-
-	public static void reformat(PsiElement statement) throws IncorrectOperationException
-	{
-		// Reformat only in .js files due to a bug in JavaScript reformatting module when doing it in JSP files
-		if(statement.getContainingFile() instanceof JSFile)
-		{
-			CodeStyleManager.getInstance(statement.getProject()).reformat(statement);
-		}
-	}
-
-	public static PsiElement getNonWhiteSpaceSibling(PsiElement element, boolean forward)
-	{
-		return forward
-				? PsiTreeUtil.skipSiblingsForward(element, WHITESPACE_CLASS)
-				: PsiTreeUtil.skipSiblingsBackward(element, WHITESPACE_CLASS);
-	}
-
-	public static boolean isFileReadOnly(Project project, PsiFile file)
-	{
-		final ReadonlyStatusHandler instance = ReadonlyStatusHandler.getInstance(project);
-		final VirtualFile virtualFile = file.getVirtualFile();
-
-		return virtualFile != null && instance.ensureFilesWritable(virtualFile).hasReadonlyFiles();
-	}
+public class JSElementFactory {
+    private static final Class[] WHITESPACE_CLASS = new Class[]{PsiWhiteSpace.class};
+
+    private JSElementFactory() {
+    }
+
+    public static PsiElement addElementBefore(@Nonnull PsiElement element, @Nonnull PsiElement newElement) {
+        final ASTNode oldElementParentNode = element.getNode();
+        final PsiElement parentNode = element.getParent();
+        final ASTNode newElementParentNode = parentNode.getNode();
+        final ASTNode newElementNode = newElement.getNode();
+
+        if (newElementParentNode == null || newElementNode == null) {
+            return null;
+        }
+        newElementParentNode.addChild(newElementNode, oldElementParentNode);
+        return newElement;
+    }
+
+    public static PsiElement addElementAfter(@Nonnull PsiElement element, @Nonnull PsiElement newElement) {
+        final ASTNode elementNode = element.getNode();
+        final ASTNode oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
+        final PsiElement parentNode = element.getParent();
+        final ASTNode newElementParentNode = parentNode.getNode();
+        final ASTNode newElementNode = newElement.getNode();
+
+        if (newElementParentNode == null || newElementNode == null) {
+            return null;
+        }
+        newElementParentNode.addChild(newElementNode, oldElementParentNode);
+
+        return newElement;
+    }
+
+    public static PsiElement addElementBefore(@Nonnull PsiElement element, @NonNls @Nonnull String elementText) {
+        final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
+
+        assert (newElement != null);
+        return addElementBefore(element, newElement);
+    }
+
+    public static PsiElement addElementAfter(@Nonnull PsiElement element, @Nonnull String elementText) {
+        final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
+
+        assert (newElement != null);
+        return addElementAfter(element, newElement);
+    }
+
+    public static ASTNode createElementFromText(Project project, String text) {
+        final PsiElement element = createDummyFile(project, text).getFirstChild();
+
+        assert (element != null);
+        return element.getNode();
+    }
+
+    @Nonnull
+    private static PsiFile createDummyFile(Project project, String text) {
+        final ParserDefinition def = ParserDefinition.forLanguage(JavaScriptLanguage.INSTANCE);
+
+        assert (def != null);
+        return PsiFileFactory.getInstance(project)
+            .createFileFromText("dummy.js", text);
+    }
+
+    public static JSStatement replaceElementWithStatement(@Nonnull JSElement element, @NonNls @Nonnull String statementText)
+        throws IncorrectOperationException {
+        final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+            element.getProject(),
+            statementText
+        );
+
+        final ASTNode oldStatementParentNode = element.getNode();
+        final PsiElement parentNode = element.getParent();
+        final ASTNode newStatementParentNode = parentNode.getNode();
+
+        if (newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null) {
+            return null;
+        }
+        newStatementParentNode.replaceChild(oldStatementParentNode, newStatementNode);
+        reformat(parentNode);
+
+        return (JSStatement)newStatementNode.getPsi();
+    }
+
+    public static JSExpression replaceExpression(@Nonnull JSExpression expression, @NonNls @Nonnull String text)
+        throws IncorrectOperationException {
+        final JSExpression newExpressionNode = JSChangeUtil.createExpressionFromText(
+            expression.getProject(),
+            text
+        );
+
+        return replaceExpression(expression, newExpressionNode);
+    }
+
+    public static JSExpression replaceExpression(@Nonnull JSExpression expression, @Nonnull JSExpression newExpression)
+        throws IncorrectOperationException {
+        final ASTNode newExpressionNode = newExpression.getNode();
+        final ASTNode oldExpressionNode = expression.getNode();
+        final PsiElement parentNode = expression.getParent();
+        final ASTNode grandParentNode = parentNode.getNode();
+
+        if (grandParentNode == null || oldExpressionNode == null || newExpressionNode == null) {
+            return null;
+        }
+
+        grandParentNode.replaceChild(oldExpressionNode, newExpressionNode);
+        reformat(parentNode);
+
+        return (JSExpression)newExpressionNode.getPsi();
+    }
+
+    public static JSStatement replaceStatement(@Nonnull JSStatement statement, @NonNls @Nonnull String text)
+        throws IncorrectOperationException {
+        final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+            statement.getProject(),
+            text
+        );
+
+        final ASTNode oldStatementParentNode = statement.getNode();
+        final PsiElement parentNode = statement.getParent();
+        final ASTNode newStatementParentNode = parentNode.getNode();
+
+        if (newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null) {
+            return null;
+        }
+
+        newStatementParentNode.replaceChild(oldStatementParentNode, newStatementNode);
+        reformat(parentNode);
+
+        return (JSStatement)newStatementNode.getPsi();
+    }
+
+    public static JSStatement addStatementBefore(@Nonnull JSStatement statement, @NonNls @Nonnull String previousStatementText)
+        throws IncorrectOperationException {
+        final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+            statement.getProject(),
+            previousStatementText
+        );
+        final ASTNode oldStatementParentNode = statement.getNode();
+        final PsiElement parentNode = statement.getParent();
+        final ASTNode newStatementParentNode = parentNode.getNode();
+
+        if (newStatementParentNode == null || newStatementNode == null) {
+            return null;
+        }
+
+        newStatementParentNode.addChild(newStatementNode, oldStatementParentNode);
+        reformat(parentNode);
+
+        return (JSStatement)newStatementNode.getPsi();
+    }
+
+    public static JSStatement addStatementAfter(@Nonnull JSStatement statement, @NonNls @Nonnull String nextStatementText)
+        throws IncorrectOperationException {
+        final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+            statement.getProject(),
+            nextStatementText
+        );
+        final ASTNode statementNode = statement.getNode();
+        final ASTNode oldStatementParentNode = ((statementNode == null) ? null : statementNode.getTreeNext());
+        final PsiElement parentNode = statement.getParent();
+        final ASTNode newStatementParentNode = parentNode.getNode();
+
+        if (newStatementParentNode == null || newStatementNode == null) {
+            return null;
+        }
+
+        newStatementParentNode.addChild(newStatementNode, oldStatementParentNode);
+        reformat(parentNode);
+
+        return (JSStatement)newStatementNode.getPsi();
+    }
+
+    public static void addRangeBefore(JSStatement[] statements, JSStatement statement) throws IncorrectOperationException {
+        addRangeBefore(statements, 0, statements.length, statement);
+    }
+
+    public static void addRangeAfter(JSStatement[] statements, JSStatement statement) throws IncorrectOperationException {
+        addRangeAfter(statements, 0, statements.length, statement);
+    }
+
+    @SuppressWarnings({"ForLoopWithMissingComponent"})
+    public static void addRangeBefore(JSStatement[] statements, int start, int length, JSStatement statement)
+        throws IncorrectOperationException {
+        for (int index = start; index < length; index++) {
+            addStatementBefore(statement, statements[index].getText());
+        }
+    }
+
+    @SuppressWarnings({"ForLoopWithMissingComponent"})
+    public static void addRangeAfter(JSStatement[] statements, int start, int length, JSStatement statement)
+        throws IncorrectOperationException {
+        for (int index = length; --index >= start; ) {
+            addStatementAfter(statement, statements[index].getText());
+        }
+    }
+
+    public static void replaceExpressionWithNegatedExpression(@Nonnull JSExpression newExpression, @Nonnull JSExpression exp)
+        throws IncorrectOperationException {
+        JSExpression expressionToReplace = BoolUtils.findNegation(exp);
+        final String replacementString;
+
+        if (expressionToReplace == null) {
+            expressionToReplace = exp;
+
+            if (ComparisonUtils.isComparisonOperator(newExpression)) {
+                final JSBinaryExpression binaryExpression = (JSBinaryExpression)newExpression;
+                final IElementType operationSign = binaryExpression.getOperationSign();
+                final String negatedComparison = ComparisonUtils.getNegatedOperatorText(operationSign);
+                final JSExpression leftOperand = binaryExpression.getLOperand();
+                final JSExpression rightOperand = binaryExpression.getROperand();
+
+                assert (rightOperand != null);
+
+                replacementString = leftOperand.getText() + negatedComparison + rightOperand.getText();
+            }
+            else {
+                replacementString = '!' + ParenthesesUtils.getParenthesized(newExpression, ParenthesesUtils.PREFIX_PRECENDENCE);
+            }
+        }
+        else {
+            replacementString = newExpression.getText();
+        }
+        replaceExpression(expressionToReplace, replacementString);
+    }
+
+    public static void replaceExpressionWithNegatedExpressionString(JSExpression exp, String newExpression)
+        throws IncorrectOperationException {
+        assert (exp != null);
+
+        JSExpression expressionToReplace = BoolUtils.findNegation(exp);
+        String replacementString = newExpression;
+
+        if (expressionToReplace == null) {
+            expressionToReplace = exp;
+            replacementString = "!(" + newExpression + ')';
+        }
+
+        replaceExpression(expressionToReplace, replacementString);
+    }
+
+    public static void replaceStatementWithUnwrapping(JSStatement statement, JSStatement newBranch) throws IncorrectOperationException {
+        if (!(newBranch instanceof JSBlockStatement)) {
+            JSElementFactory.replaceStatement(statement, newBranch.getText());
+            return;
+        }
+
+        final JSBlockStatement parentBlock = PsiTreeUtil.getParentOfType(newBranch, JSBlockStatement.class);
+
+        if (parentBlock == null) {
+            JSElementFactory.replaceStatement(statement, newBranch.getText());
+            return;
+        }
+
+        final JSBlockStatement block = (JSBlockStatement)newBranch;
+
+        if (ControlFlowUtils.containsConflictingDeclarations(block, parentBlock)) {
+            JSElementFactory.replaceStatement(statement, newBranch.getText());
+            return;
+        }
+
+        final PsiElement containingElement = statement.getParent();
+
+        assert (containingElement instanceof JSStatement);
+
+        JSElementFactory.addRangeBefore(block.getStatements(), statement);
+        JSElementFactory.removeElement(statement);
+    }
+
+    public static void removeElement(PsiElement element) {
+        final ASTNode node = element.getNode();
+        final ASTNode parentNode = element.getParent().getNode();
+
+        if (node != null && parentNode != null) {
+            parentNode.removeChild(node);
+        }
+    }
+
+    public static void reformat(PsiElement statement) throws IncorrectOperationException {
+        // Reformat only in .js files due to a bug in JavaScript reformatting module when doing it in JSP files
+        if (statement.getContainingFile() instanceof JSFile) {
+            CodeStyleManager.getInstance(statement.getProject()).reformat(statement);
+        }
+    }
+
+    public static PsiElement getNonWhiteSpaceSibling(PsiElement element, boolean forward) {
+        return forward
+            ? PsiTreeUtil.skipSiblingsForward(element, WHITESPACE_CLASS)
+            : PsiTreeUtil.skipSiblingsBackward(element, WHITESPACE_CLASS);
+    }
+
+    public static boolean isFileReadOnly(Project project, PsiFile file) {
+        final ReadonlyStatusHandler instance = ReadonlyStatusHandler.getInstance(project);
+        final VirtualFile virtualFile = file.getVirtualFile();
+
+        return virtualFile != null && instance.ensureFilesWritable(virtualFile).hasReadonlyFiles();
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
index bddde225..aa1adf0d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
@@ -19,66 +19,53 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 
-public class JSRecursionVisitor extends JSRecursiveElementVisitor
-{
+public class JSRecursionVisitor extends JSRecursiveElementVisitor {
+    private final JSFunction function;
+    private final String functionName;
+    private boolean recursive;
 
-	private final JSFunction function;
-	private final String functionName;
-	private boolean recursive;
+    public JSRecursionVisitor(JSFunction function) {
+        this.function = function;
+        this.functionName = function.getName();
+    }
 
-	public JSRecursionVisitor(JSFunction function)
-	{
-		this.function = function;
-		this.functionName = function.getName();
-	}
+    @Override
+    public void visitJSElement(JSElement element) {
+        if (!this.recursive) {
+            super.visitJSElement(element);
+        }
+    }
 
-	@Override
-	public void visitJSElement(JSElement element)
-	{
-		if(!this.recursive)
-		{
-			super.visitJSElement(element);
-		}
-	}
+    @Override
+    public void visitJSCallExpression(JSCallExpression call) {
+        if (!this.recursive) {
+            super.visitJSCallExpression(call);
 
-	@Override
-	public void visitJSCallExpression(JSCallExpression call)
-	{
-		if(!this.recursive)
-		{
-			super.visitJSCallExpression(call);
+            final JSExpression methodExpression = call.getMethodExpression();
+            final String qualifiedMethodText = methodExpression.getText();
+            final String methodText = qualifiedMethodText.substring(qualifiedMethodText.lastIndexOf('.') + 1);
 
-			final JSExpression methodExpression = call.getMethodExpression();
-			final String qualifiedMethodText = methodExpression.getText();
-			final String methodText = qualifiedMethodText.substring(qualifiedMethodText.lastIndexOf('.') + 1);
+            if (methodText.equals(this.functionName)) {
+                final PsiReference methodReference = methodExpression.getReference();
+                final PsiElement referent = methodReference == null ? null : methodReference.resolve();
 
-			if(methodText.equals(this.functionName))
-			{
-				final PsiReference methodReference = methodExpression.getReference();
-				final PsiElement referent = ((methodReference == null) ? null : methodReference.resolve());
+                if (referent != null) {
+                    if (referent instanceof JSFunction) {
+                        this.recursive = referent.equals(this.function);
+                    }
+                    else if (referent instanceof JSFunctionExpression functionExpression) {
+                        this.recursive = functionExpression.getFunction().equals(this.function);
+                    }
+                }
+            }
+        }
+    }
 
-				if(referent != null)
-				{
-					if(referent instanceof JSFunction)
-					{
-						this.recursive = referent.equals(this.function);
-					}
-					else if(referent instanceof JSFunctionExpression)
-					{
-						this.recursive = ((JSFunctionExpression) referent).getFunction().equals(this.function);
-					}
-				}
-			}
-		}
-	}
+    public boolean isFunctionNamed() {
+        return (this.functionName != null);
+    }
 
-	public boolean isFunctionNamed()
-	{
-		return (this.functionName != null);
-	}
-
-	public boolean isRecursive()
-	{
-		return this.recursive;
-	}
+    public boolean isRecursive() {
+        return this.recursive;
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java
index ebfac5ff..cf105fd1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursiveElementVisitor.java
@@ -22,12 +22,10 @@
  * Represents a JS element visitor which recursively visits the children of the element
  * on which the visit was started.
  */
-public abstract class JSRecursiveElementVisitor extends JSElementVisitor
-{
-	@Override
-	public void visitJSElement(JSElement element)
-	{
-		element.acceptChildren(this);
-	}
+public abstract class JSRecursiveElementVisitor extends JSElementVisitor {
+    @Override
+    public void visitJSElement(JSElement element) {
+        element.acceptChildren(this);
+    }
 }
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
index f2634cc2..fcceb313 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
@@ -24,57 +24,47 @@
 /**
  *
  */
-public class NumberUtil
-{
-	private NumberUtil()
-	{
-	}
+public class NumberUtil {
+    private NumberUtil() {
+    }
 
-	@NonNls
-	public static final Pattern decimalPattern = Pattern.compile("[0-9]+");
-	@NonNls
-	public static final Pattern octalPattern = Pattern.compile("0[0-7]+");
-	@NonNls
-	public static final Pattern hexPattern = Pattern.compile("0[xX][0-9a-fA-F]+");
+    @NonNls
+    public static final Pattern decimalPattern = Pattern.compile("[0-9]+");
+    @NonNls
+    public static final Pattern octalPattern = Pattern.compile("0[0-7]+");
+    @NonNls
+    public static final Pattern hexPattern = Pattern.compile("0[xX][0-9a-fA-F]+");
 
-	public static BigInteger getLiteralNumber(JSLiteralExpression expression)
-	{
-		String expressionText = expression.getText();
-		int radix = 10;
+    public static BigInteger getLiteralNumber(JSLiteralExpression expression) {
+        String expressionText = expression.getText();
+        int radix = 10;
 
-		if(expressionText == null || expressionText.length() == 0)
-		{
-			return new BigInteger(new byte[]{0});
-		}
+        if (expressionText == null || expressionText.length() == 0) {
+            return new BigInteger(new byte[]{0});
+        }
 
-		if(expressionText.charAt(0) == '0')
-		{
-			if(expressionText.length() > 2 && Character.toUpperCase(expressionText.charAt(1)) == 'X')
-			{
-				expressionText = expressionText.substring(2);
-				radix = 16;
-			}
-			else if(octalPattern.matcher(expressionText).matches())
-			{
-				radix = 8;
-			}
-		}
+        if (expressionText.charAt(0) == '0') {
+            if (expressionText.length() > 2 && Character.toUpperCase(expressionText.charAt(1)) == 'X') {
+                expressionText = expressionText.substring(2);
+                radix = 16;
+            }
+            else if (octalPattern.matcher(expressionText).matches()) {
+                radix = 8;
+            }
+        }
 
-		return new BigInteger(expressionText, radix);
-	}
+        return new BigInteger(expressionText, radix);
+    }
 
-	public static boolean isOctal(String number)
-	{
-		return octalPattern.matcher(number).matches();
-	}
+    public static boolean isOctal(String number) {
+        return octalPattern.matcher(number).matches();
+    }
 
-	public static boolean isDecimal(String number)
-	{
-		return decimalPattern.matcher(number).matches();
-	}
+    public static boolean isDecimal(String number) {
+        return decimalPattern.matcher(number).matches();
+    }
 
-	public static boolean isHex(String number)
-	{
-		return hexPattern.matcher(number).matches();
-	}
+    public static boolean isHex(String number) {
+        return hexPattern.matcher(number).matches();
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
index 83cb1f22..c8f6ff95 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
@@ -24,369 +24,310 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class ParenthesesUtils
-{
-	private ParenthesesUtils()
-	{
-	}
-
-	private static final int PARENTHESIZED_PRECENDENCE = 0;
-	private static final int LITERAL_PRECENDENCE = 0;
-	public static final int METHOD_CALL_PRECENDENCE = 1;
-
-	private static final int POSTFIX_PRECENDENCE = 2;
-	public static final int PREFIX_PRECENDENCE = 3;
-	public static final int TYPE_CAST_PRECENDENCE = 4;
-	public static final int MULTIPLICATIVE_PRECENDENCE = 5;
-	private static final int ADDITIVE_PRECENDENCE = 6;
-	public static final int SHIFT_PRECENDENCE = 7;
-	private static final int RELATIONAL_PRECENDENCE = 8;
-	public static final int EQUALITY_PRECENDENCE = 9;
-
-	private static final int BINARY_AND_PRECENDENCE = 10;
-	private static final int BINARY_XOR_PRECENDENCE = 11;
-	private static final int BINARY_OR_PRECENDENCE = 12;
-	public static final int AND_PRECENDENCE = 13;
-	public static final int OR_PRECENDENCE = 14;
-	public static final int CONDITIONAL_PRECENDENCE = 15;
-	private static final int ASSIGNMENT_PRECENDENCE = 16;
-
-	private static final int NUM_PRECENDENCES = 17;
-
-	private static final Map<IElementType, Integer> binaryOperatorPrecendence =
-			new HashMap<IElementType, Integer>(NUM_PRECENDENCES);
-
-	static
-	{
-		binaryOperatorPrecendence.put(JSTokenTypes.PLUS, ADDITIVE_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.MINUS, ADDITIVE_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.MULT, MULTIPLICATIVE_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.DIV, MULTIPLICATIVE_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.PERC, MULTIPLICATIVE_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.ANDAND, AND_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.OROR, OR_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.AND, BINARY_AND_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.OR, BINARY_OR_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.XOR, BINARY_XOR_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.COMMA, ASSIGNMENT_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.LTLT, SHIFT_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.GTGT, SHIFT_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.GTGTGT, SHIFT_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.GT, RELATIONAL_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.GE, RELATIONAL_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.LT, RELATIONAL_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.LE, RELATIONAL_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.EQEQ, EQUALITY_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.NE, EQUALITY_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.EQEQEQ, EQUALITY_PRECENDENCE);
-		binaryOperatorPrecendence.put(JSTokenTypes.NEQEQ, EQUALITY_PRECENDENCE);
-	}
-
-	public static JSExpression stripParentheses(JSExpression expression)
-	{
-		JSExpression parenthesized = expression;
-
-		if(parenthesized != null)
-		{
-			while(parenthesized instanceof JSParenthesizedExpression)
-			{
-				parenthesized = ((JSParenthesizedExpression) parenthesized).getInnerExpression();
-			}
-		}
-
-		return parenthesized;
-	}
-
-	public static JSExpression unstripParentheses(JSExpression expression)
-	{
-		JSExpression parenthesized = expression;
-
-		if(parenthesized != null)
-		{
-			PsiElement parent = parenthesized.getParent();
-
-			while(parent instanceof JSParenthesizedExpression)
-			{
-				parenthesized = (JSParenthesizedExpression) parent;
-				parent = parenthesized.getParent();
-			}
-		}
-
-		return parenthesized;
-	}
-
-	public static String getParenthesized(JSExpression expression, int precendence)
-	{
-		return (ParenthesesUtils.getPrecendence(expression) > precendence
-				? '(' + expression.getText() + ')'
-				: expression.getText());
-	}
-
-	public static int getPrecendence(JSExpression expression)
-	{
-		if(expression instanceof JSThisExpression ||
-				expression instanceof JSLiteralExpression ||
-				expression instanceof JSArrayLiteralExpression ||
-				expression instanceof JSObjectLiteralExpression ||
-				expression instanceof JSIndexedPropertyAccessExpression)
-		{
-			return LITERAL_PRECENDENCE;
-		}
-		if(expression instanceof JSReferenceExpression)
-		{
-			return ((JSReferenceExpression) expression).getQualifier() == null
-					? LITERAL_PRECENDENCE
-					: METHOD_CALL_PRECENDENCE;
-		}
-		if(expression instanceof JSNewExpression)
-		{
-			return TYPE_CAST_PRECENDENCE;
-		}
-		if(expression instanceof JSCallExpression)
-		{
-			return METHOD_CALL_PRECENDENCE;
-		}
-		if(expression instanceof JSPostfixExpression)
-		{
-			return POSTFIX_PRECENDENCE;
-		}
-		if(expression instanceof JSPrefixExpression)
-		{
-			return PREFIX_PRECENDENCE;
-		}
-		if(expression instanceof JSAssignmentExpression)
-		{
-			return ASSIGNMENT_PRECENDENCE;
-		}
-		if(expression instanceof JSBinaryExpression)
-		{
-			return getBinaryOperatorPrecendence(((JSBinaryExpression) expression).getOperationSign());
-		}
-		if(expression instanceof JSConditionalExpression)
-		{
-			return CONDITIONAL_PRECENDENCE;
-		}
-		if(expression instanceof JSParenthesizedExpression)
-		{
-			return PARENTHESIZED_PRECENDENCE;
-		}
-
-		// expression instanceof JSCommaExpression      ||
-		// expression instanceof JSDefinitionExpression ||
-		// expression instanceof JSFunctionExpression
-		return -1;
-	}
-
-	private static int getBinaryOperatorPrecendence(IElementType sign)
-	{
-		if(binaryOperatorPrecendence.containsKey(sign))
-		{
-			return binaryOperatorPrecendence.get(sign);
-		}
-		return ASSIGNMENT_PRECENDENCE;
-	}
-
-	public static String removeParentheses(JSExpression expression)
-	{
-		if(expression instanceof JSCallExpression)
-		{
-			return removeParensFromFunctionCallExpression((JSCallExpression) expression);
-		}
-		if(expression instanceof JSReferenceExpression)
-		{
-			return removeParensFromReferenceExpression(
-					(JSReferenceExpression) expression);
-		}
-		if(expression instanceof JSAssignmentExpression)
-		{
-			return removeParensFromAssignmentExpression(
-					(JSAssignmentExpression) expression);
-		}
-		if(expression instanceof JSArrayLiteralExpression)
-		{
-			return removeParensFromArrayLiteralExpression((JSArrayLiteralExpression) expression);
-		}
-		if(expression instanceof JSPrefixExpression)
-		{
-			return removeParensFromPrefixExpression((JSPrefixExpression) expression);
-		}
-		if(expression instanceof JSPostfixExpression)
-		{
-			return removeParensFromPostfixExpression((JSPostfixExpression) expression);
-		}
-		if(expression instanceof JSBinaryExpression)
-		{
-			return removeParensFromBinaryExpression((JSBinaryExpression) expression);
-		}
-		if(expression instanceof JSConditionalExpression)
-		{
-			return removeParensFromConditionalExpression((JSConditionalExpression) expression);
-		}
-		if(expression instanceof JSParenthesizedExpression)
-		{
-			return removeParensFromParenthesizedExpression((JSParenthesizedExpression) expression);
-		}
-
-		return expression.getText();
-	}
-
-	private static String removeParensFromReferenceExpression(JSReferenceExpression expression)
-	{
-		final JSExpression qualifier = expression.getQualifier();
-
-		if(qualifier != null)
-		{
-			return removeParentheses(qualifier) + '.' + expression.getReferencedName();
-		}
-		else
-		{
-			return expression.getText();
-		}
-	}
-
-	private static String removeParensFromParenthesizedExpression(JSParenthesizedExpression parenthesizedExp)
-	{
-		final JSExpression body = stripParentheses(parenthesizedExp.getInnerExpression());
-
-		if(!(parenthesizedExp.getParent() instanceof JSExpression))
-		{
-			return removeParentheses(body);
-		}
-
-		final JSExpression parentExp = (JSExpression) parenthesizedExp.getParent();
-		final int parentPrecendence = getPrecendence(parentExp);
-		final int childPrecendence = getPrecendence(body);
-
-		if(parentPrecendence < childPrecendence)
-		{
-			return '(' + removeParentheses(body) + ')';
-		}
-		else if(parentPrecendence == childPrecendence)
-		{
-			if(parentExp instanceof JSBinaryExpression && body instanceof JSBinaryExpression)
-			{
-				final IElementType parentOperator = ((JSBinaryExpression) parentExp).getOperationSign();
-				final IElementType bodyOperator = ((JSBinaryExpression) body).getOperationSign();
-				final JSExpression lhs = ((JSBinaryExpression) parentExp).getLOperand();
-
-				if(lhs.equals(parenthesizedExp) && parentOperator.equals(bodyOperator))
-				{
-					return removeParentheses(body);
-				}
-				else
-				{
-					return '(' + removeParentheses(body) + ')';
-				}
-			}
-			else
-			{
-				return removeParentheses(body);
-			}
-		}
-		else
-		{
-			return removeParentheses(body);
-		}
-	}
-
-	private static String removeParensFromConditionalExpression(JSConditionalExpression conditionalExp)
-	{
-		final JSExpression condition = conditionalExp.getCondition();
-		final JSExpression thenBranch = conditionalExp.getThen();
-		final JSExpression elseBranch = conditionalExp.getElse();
-
-		return removeParentheses(condition) + " ? " +
-				removeParentheses(thenBranch) + " : " +
-				removeParentheses(elseBranch);
-	}
-
-	private static String removeParensFromBinaryExpression(JSBinaryExpression binaryExp)
-	{
-		final JSExpression lhs = binaryExp.getLOperand();
-		final JSExpression rhs = binaryExp.getROperand();
-		final IElementType sign = binaryExp.getOperationSign();
-
-		return removeParentheses(lhs) + ' ' + BinaryOperatorUtils.getOperatorText(sign) + ' ' + removeParentheses(rhs);
-	}
-
-	private static String removeParensFromPostfixExpression(JSPostfixExpression postfixExp)
-	{
-		final JSExpression body = postfixExp.getExpression();
-		final IElementType sign = postfixExp.getOperationSign();
-
-		return removeParentheses(body) + BinaryOperatorUtils.getOperatorText(sign);
-	}
-
-	private static String removeParensFromPrefixExpression(JSPrefixExpression prefixExp)
-	{
-		final JSExpression body = prefixExp.getExpression();
-		IElementType sign = prefixExp.getOperationSign();
-		if(sign == null)
-		{
-			final ASTNode[] astNodes = prefixExp.getNode().getChildren(JSTokenTypes.UNARY_OPERATIONS); // hack for 8.1
-			sign = astNodes.length == 1 ? astNodes[0].getElementType() : null;
-		}
-
-		return (sign != null ? BinaryOperatorUtils.getOperatorText(sign) : "delete ") + removeParentheses(body);
-	}
-
-	private static String removeParensFromArrayLiteralExpression(JSArrayLiteralExpression init)
-	{
-		final JSExpression[] contents = init.getExpressions();
-		final String text = init.getText();
-		final int textLength = text.length();
-		final StringBuilder out = new StringBuilder(textLength);
-
-		out.append('(');
-		for(int index = 0; index < contents.length; index++)
-		{
-			final JSExpression arg = contents[index];
-
-			if(index != 0)
-			{
-				out.append(',');
-			}
-			out.append(removeParentheses(arg));
-		}
-
-		return out.append(')').toString();
-	}
-
-	private static String removeParensFromAssignmentExpression(JSAssignmentExpression assignment)
-	{
-		final JSExpression lhs = assignment.getLOperand();
-		final JSExpression rhs = assignment.getROperand();
-		final IElementType sign = assignment.getOperationSign();
-		return removeParentheses(lhs) + ' ' +
-				BinaryOperatorUtils.getOperatorText(sign) + ' ' +
-				removeParentheses(rhs);
-	}
-
-	private static String removeParensFromFunctionCallExpression(JSCallExpression functionCall)
-	{
-		final JSExpression target = functionCall.getMethodExpression();
-		final JSArgumentList argumentList = functionCall.getArgumentList();
-
-		assert (argumentList != null);
-
-		final JSExpression[] args = argumentList.getArguments();
-		final String methodCallText = functionCall.getText();
-		final int length = methodCallText.length();
-		final StringBuilder out = new StringBuilder(length);
-		final String strippedTarget = removeParentheses(target);
-
-		out.append(strippedTarget);
-		out.append('(');
-		for(int index = 0; index < args.length; index++)
-		{
-			final JSExpression arg = args[index];
-			if(index != 0)
-			{
-				out.append(',');
-			}
-			out.append(removeParentheses(arg));
-		}
-		out.append(')');
-		return out.toString();
-	}
+public class ParenthesesUtils {
+    private ParenthesesUtils() {
+    }
+
+    private static final int PARENTHESIZED_PRECENDENCE = 0;
+    private static final int LITERAL_PRECENDENCE = 0;
+    public static final int METHOD_CALL_PRECENDENCE = 1;
+
+    private static final int POSTFIX_PRECENDENCE = 2;
+    public static final int PREFIX_PRECENDENCE = 3;
+    public static final int TYPE_CAST_PRECENDENCE = 4;
+    public static final int MULTIPLICATIVE_PRECENDENCE = 5;
+    private static final int ADDITIVE_PRECENDENCE = 6;
+    public static final int SHIFT_PRECENDENCE = 7;
+    private static final int RELATIONAL_PRECENDENCE = 8;
+    public static final int EQUALITY_PRECENDENCE = 9;
+
+    private static final int BINARY_AND_PRECENDENCE = 10;
+    private static final int BINARY_XOR_PRECENDENCE = 11;
+    private static final int BINARY_OR_PRECENDENCE = 12;
+    public static final int AND_PRECENDENCE = 13;
+    public static final int OR_PRECENDENCE = 14;
+    public static final int CONDITIONAL_PRECENDENCE = 15;
+    private static final int ASSIGNMENT_PRECENDENCE = 16;
+
+    private static final int NUM_PRECENDENCES = 17;
+
+    private static final Map<IElementType, Integer> binaryOperatorPrecendence =
+        new HashMap<IElementType, Integer>(NUM_PRECENDENCES);
+
+    static {
+        binaryOperatorPrecendence.put(JSTokenTypes.PLUS, ADDITIVE_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.MINUS, ADDITIVE_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.MULT, MULTIPLICATIVE_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.DIV, MULTIPLICATIVE_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.PERC, MULTIPLICATIVE_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.ANDAND, AND_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.OROR, OR_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.AND, BINARY_AND_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.OR, BINARY_OR_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.XOR, BINARY_XOR_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.COMMA, ASSIGNMENT_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.LTLT, SHIFT_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.GTGT, SHIFT_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.GTGTGT, SHIFT_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.GT, RELATIONAL_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.GE, RELATIONAL_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.LT, RELATIONAL_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.LE, RELATIONAL_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.EQEQ, EQUALITY_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.NE, EQUALITY_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.EQEQEQ, EQUALITY_PRECENDENCE);
+        binaryOperatorPrecendence.put(JSTokenTypes.NEQEQ, EQUALITY_PRECENDENCE);
+    }
+
+    public static JSExpression stripParentheses(JSExpression expression) {
+        JSExpression parenthesized = expression;
+
+        if (parenthesized != null) {
+            while (parenthesized instanceof JSParenthesizedExpression) {
+                parenthesized = ((JSParenthesizedExpression)parenthesized).getInnerExpression();
+            }
+        }
+
+        return parenthesized;
+    }
+
+    public static JSExpression unstripParentheses(JSExpression expression) {
+        JSExpression parenthesized = expression;
+
+        if (parenthesized != null) {
+            PsiElement parent = parenthesized.getParent();
+
+            while (parent instanceof JSParenthesizedExpression parenExp) {
+                parenthesized = parenExp;
+                parent = parenthesized.getParent();
+            }
+        }
+
+        return parenthesized;
+    }
+
+    public static String getParenthesized(JSExpression expression, int precendence) {
+        return ParenthesesUtils.getPrecendence(expression) > precendence
+            ? '(' + expression.getText() + ')'
+            : expression.getText();
+    }
+
+    public static int getPrecendence(JSExpression expression) {
+        if (expression instanceof JSThisExpression
+            || expression instanceof JSLiteralExpression
+            || expression instanceof JSArrayLiteralExpression
+            || expression instanceof JSObjectLiteralExpression
+            || expression instanceof JSIndexedPropertyAccessExpression) {
+            return LITERAL_PRECENDENCE;
+        }
+        if (expression instanceof JSReferenceExpression referenceExpression) {
+            return referenceExpression.getQualifier() == null
+                ? LITERAL_PRECENDENCE
+                : METHOD_CALL_PRECENDENCE;
+        }
+        if (expression instanceof JSNewExpression) {
+            return TYPE_CAST_PRECENDENCE;
+        }
+        if (expression instanceof JSCallExpression) {
+            return METHOD_CALL_PRECENDENCE;
+        }
+        if (expression instanceof JSPostfixExpression) {
+            return POSTFIX_PRECENDENCE;
+        }
+        if (expression instanceof JSPrefixExpression) {
+            return PREFIX_PRECENDENCE;
+        }
+        if (expression instanceof JSAssignmentExpression) {
+            return ASSIGNMENT_PRECENDENCE;
+        }
+        if (expression instanceof JSBinaryExpression binaryExpression) {
+            return getBinaryOperatorPrecendence(binaryExpression.getOperationSign());
+        }
+        if (expression instanceof JSConditionalExpression) {
+            return CONDITIONAL_PRECENDENCE;
+        }
+        if (expression instanceof JSParenthesizedExpression) {
+            return PARENTHESIZED_PRECENDENCE;
+        }
+
+        // expression instanceof JSCommaExpression      ||
+        // expression instanceof JSDefinitionExpression ||
+        // expression instanceof JSFunctionExpression
+        return -1;
+    }
+
+    private static int getBinaryOperatorPrecendence(IElementType sign) {
+        if (binaryOperatorPrecendence.containsKey(sign)) {
+            return binaryOperatorPrecendence.get(sign);
+        }
+        return ASSIGNMENT_PRECENDENCE;
+    }
+
+    public static String removeParentheses(JSExpression expression) {
+        if (expression instanceof JSCallExpression callExpression) {
+            return removeParensFromFunctionCallExpression(callExpression);
+        }
+        if (expression instanceof JSReferenceExpression referenceExpression) {
+            return removeParensFromReferenceExpression(referenceExpression);
+        }
+        if (expression instanceof JSAssignmentExpression assignmentExpression) {
+            return removeParensFromAssignmentExpression(assignmentExpression);
+        }
+        if (expression instanceof JSArrayLiteralExpression arrayLiteralExpression) {
+            return removeParensFromArrayLiteralExpression(arrayLiteralExpression);
+        }
+        if (expression instanceof JSPrefixExpression prefixExpression) {
+            return removeParensFromPrefixExpression(prefixExpression);
+        }
+        if (expression instanceof JSPostfixExpression postfixExpression) {
+            return removeParensFromPostfixExpression(postfixExpression);
+        }
+        if (expression instanceof JSBinaryExpression binaryExpression) {
+            return removeParensFromBinaryExpression(binaryExpression);
+        }
+        if (expression instanceof JSConditionalExpression conditionalExpression) {
+            return removeParensFromConditionalExpression(conditionalExpression);
+        }
+        if (expression instanceof JSParenthesizedExpression parenthesizedExpression) {
+            return removeParensFromParenthesizedExpression(parenthesizedExpression);
+        }
+
+        return expression.getText();
+    }
+
+    private static String removeParensFromReferenceExpression(JSReferenceExpression expression) {
+        final JSExpression qualifier = expression.getQualifier();
+
+        if (qualifier != null) {
+            return removeParentheses(qualifier) + '.' + expression.getReferencedName();
+        }
+        else {
+            return expression.getText();
+        }
+    }
+
+    private static String removeParensFromParenthesizedExpression(JSParenthesizedExpression parenthesizedExp) {
+        final JSExpression body = stripParentheses(parenthesizedExp.getInnerExpression());
+
+        if (!(parenthesizedExp.getParent() instanceof JSExpression)) {
+            return removeParentheses(body);
+        }
+
+        final JSExpression parentExp = (JSExpression)parenthesizedExp.getParent();
+        final int parentPrecendence = getPrecendence(parentExp);
+        final int childPrecendence = getPrecendence(body);
+
+        if (parentPrecendence < childPrecendence) {
+            return '(' + removeParentheses(body) + ')';
+        }
+        else if (parentPrecendence == childPrecendence) {
+            if (parentExp instanceof JSBinaryExpression parentBiExp && body instanceof JSBinaryExpression bodyBiExp) {
+                final IElementType parentOperator = parentBiExp.getOperationSign();
+                final IElementType bodyOperator = bodyBiExp.getOperationSign();
+                final JSExpression lhs = parentBiExp.getLOperand();
+
+                if (lhs.equals(parenthesizedExp) && parentOperator.equals(bodyOperator)) {
+                    return removeParentheses(body);
+                }
+                else {
+                    return '(' + removeParentheses(body) + ')';
+                }
+            }
+            else {
+                return removeParentheses(body);
+            }
+        }
+        else {
+            return removeParentheses(body);
+        }
+    }
+
+    private static String removeParensFromConditionalExpression(JSConditionalExpression conditionalExp) {
+        final JSExpression condition = conditionalExp.getCondition();
+        final JSExpression thenBranch = conditionalExp.getThen();
+        final JSExpression elseBranch = conditionalExp.getElse();
+
+        return removeParentheses(condition) + " ? " +
+            removeParentheses(thenBranch) + " : " +
+            removeParentheses(elseBranch);
+    }
+
+    private static String removeParensFromBinaryExpression(JSBinaryExpression binaryExp) {
+        final JSExpression lhs = binaryExp.getLOperand();
+        final JSExpression rhs = binaryExp.getROperand();
+        final IElementType sign = binaryExp.getOperationSign();
+
+        return removeParentheses(lhs) + ' ' + BinaryOperatorUtils.getOperatorText(sign) + ' ' + removeParentheses(rhs);
+    }
+
+    private static String removeParensFromPostfixExpression(JSPostfixExpression postfixExp) {
+        final JSExpression body = postfixExp.getExpression();
+        final IElementType sign = postfixExp.getOperationSign();
+
+        return removeParentheses(body) + BinaryOperatorUtils.getOperatorText(sign);
+    }
+
+    private static String removeParensFromPrefixExpression(JSPrefixExpression prefixExp) {
+        final JSExpression body = prefixExp.getExpression();
+        IElementType sign = prefixExp.getOperationSign();
+        if (sign == null) {
+            final ASTNode[] astNodes = prefixExp.getNode().getChildren(JSTokenTypes.UNARY_OPERATIONS); // hack for 8.1
+            sign = astNodes.length == 1 ? astNodes[0].getElementType() : null;
+        }
+
+        return (sign != null ? BinaryOperatorUtils.getOperatorText(sign) : "delete ") + removeParentheses(body);
+    }
+
+    private static String removeParensFromArrayLiteralExpression(JSArrayLiteralExpression init) {
+        final JSExpression[] contents = init.getExpressions();
+        final String text = init.getText();
+        final int textLength = text.length();
+        final StringBuilder out = new StringBuilder(textLength);
+
+        out.append('(');
+        for (int index = 0; index < contents.length; index++) {
+            final JSExpression arg = contents[index];
+
+            if (index != 0) {
+                out.append(',');
+            }
+            out.append(removeParentheses(arg));
+        }
+
+        return out.append(')').toString();
+    }
+
+    private static String removeParensFromAssignmentExpression(JSAssignmentExpression assignment) {
+        final JSExpression lhs = assignment.getLOperand();
+        final JSExpression rhs = assignment.getROperand();
+        final IElementType sign = assignment.getOperationSign();
+        return removeParentheses(lhs) + ' ' +
+            BinaryOperatorUtils.getOperatorText(sign) + ' ' +
+            removeParentheses(rhs);
+    }
+
+    private static String removeParensFromFunctionCallExpression(JSCallExpression functionCall) {
+        final JSExpression target = functionCall.getMethodExpression();
+        final JSArgumentList argumentList = functionCall.getArgumentList();
+
+        assert (argumentList != null);
+
+        final JSExpression[] args = argumentList.getArguments();
+        final String methodCallText = functionCall.getText();
+        final int length = methodCallText.length();
+        final StringBuilder out = new StringBuilder(length);
+        final String strippedTarget = removeParentheses(target);
+
+        out.append(strippedTarget);
+        out.append('(');
+        for (int index = 0; index < args.length; index++) {
+            final JSExpression arg = args[index];
+            if (index != 0) {
+                out.append(',');
+            }
+            out.append(removeParentheses(arg));
+        }
+        out.append(')');
+        return out.toString();
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
index e8573086..dac655d9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
@@ -20,718 +20,508 @@
 import consulo.language.ast.IElementType;
 import jakarta.annotation.Nonnull;
 
-public class RecursionUtil
-{
-
-	private RecursionUtil()
-	{
-	}
-
-	public static boolean statementMayReturnBeforeRecursing(
-			JSStatement statement, JSFunction method)
-	{
-		if(statement == null)
-		{
-			return true;
-		}
-
-		if(statement instanceof JSBreakStatement ||
-				statement instanceof JSContinueStatement ||
-				statement instanceof JSThrowStatement ||
-				statement instanceof JSExpressionStatement ||
-				statement instanceof JSEmptyStatement ||
-				statement instanceof JSVarStatement)
-		{
-			return false;
-		}
-		else if(statement instanceof JSReturnStatement)
-		{
-			final JSReturnStatement returnStatement =
-					(JSReturnStatement) statement;
-			final JSExpression returnValue = returnStatement.getExpression();
-			return (returnValue == null ||
-					!RecursionUtil.expressionDefinitelyRecurses(returnValue, method));
-		}
-		else if(statement instanceof JSForStatement)
-		{
-			return RecursionUtil.forStatementMayReturnBeforeRecursing(
-					(JSForStatement) statement, method);
-		}
-		else if(statement instanceof JSForInStatement)
-		{
-			return RecursionUtil.forInStatementMayReturnBeforeRecursing(
-					(JSForInStatement) statement, method);
-		}
-		else if(statement instanceof JSWhileStatement)
-		{
-			return RecursionUtil.whileStatementMayReturnBeforeRecursing(
-					(JSWhileStatement) statement, method);
-		}
-		else if(statement instanceof JSDoWhileStatement)
-		{
-			return RecursionUtil.doWhileStatementMayReturnBeforeRecursing(
-					(JSDoWhileStatement) statement, method);
-		}
-		else if(statement instanceof JSBlockStatement)
-		{
-			final JSBlockStatement blockStatement =
-					(JSBlockStatement) statement;
-			return RecursionUtil.blockStatementMayReturnBeforeRecursing(blockStatement, method, false);
-		}
-		else if(statement instanceof JSLabeledStatement)
-		{
-			return RecursionUtil.labeledStatementMayReturnBeforeRecursing(
-					(JSLabeledStatement) statement, method);
-		}
-		else if(statement instanceof JSIfStatement)
-		{
-			return RecursionUtil.ifStatementMayReturnBeforeRecursing(
-					(JSIfStatement) statement, method);
-		}
-		else if(statement instanceof JSTryStatement)
-		{
-			return RecursionUtil.tryStatementMayReturnBeforeRecursing(
-					(JSTryStatement) statement, method);
-		}
-		else if(statement instanceof JSSwitchStatement)
-		{
-			return RecursionUtil.switchStatementMayReturnBeforeRecursing(
-					(JSSwitchStatement) statement, method);
-		}
-		else
-		{
-			// unknown statement type
-			return true;
-		}
-	}
-
-	private static boolean doWhileStatementMayReturnBeforeRecursing(
-			JSDoWhileStatement loopStatement, JSFunction method)
-	{
-		final JSStatement body = loopStatement.getBody();
-		return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
-	}
-
-	private static boolean whileStatementMayReturnBeforeRecursing(
-			JSWhileStatement loopStatement, JSFunction method)
-	{
-		final JSExpression test = loopStatement.getCondition();
-		if(RecursionUtil.expressionDefinitelyRecurses(test, method))
-		{
-			return false;
-		}
-		final JSStatement body = loopStatement.getBody();
-		return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
-	}
-
-	private static boolean forStatementMayReturnBeforeRecursing(
-			JSForStatement loopStatement, JSFunction method)
-	{
-
-		if(RecursionUtil.statementMayReturnBeforeRecursing(loopStatement.getVarDeclaration(), method))
-		{
-			return true;
-		}
-		if(RecursionUtil.expressionDefinitelyRecurses(loopStatement.getInitialization(), method))
-		{
-			return false;
-		}
-		if(RecursionUtil.expressionDefinitelyRecurses(loopStatement.getCondition(), method))
-		{
-			return false;
-		}
-		return RecursionUtil.statementMayReturnBeforeRecursing(loopStatement.getBody(), method);
-	}
-
-	private static boolean forInStatementMayReturnBeforeRecursing(
-			JSForInStatement loopStatement, JSFunction method)
-	{
-		final JSExpression collection = loopStatement.getCollectionExpression();
-		if(RecursionUtil.expressionDefinitelyRecurses(collection, method))
-		{
-			return false;
-		}
-		final JSStatement body = loopStatement.getBody();
-		return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
-	}
-
-	private static boolean switchStatementMayReturnBeforeRecursing(
-			JSSwitchStatement switchStatement, JSFunction method)
-	{
-
-		for(final JSCaseClause clause : switchStatement.getCaseClauses())
-		{
-			for(final JSStatement statement : clause.getStatements())
-			{
-				if(RecursionUtil.statementMayReturnBeforeRecursing(statement, method))
-				{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	private static boolean tryStatementMayReturnBeforeRecursing(
-			JSTryStatement tryStatement, JSFunction method)
-	{
-		final JSStatement finallyStatement = tryStatement.getFinallyStatement();
-
-		if(finallyStatement != null)
-		{
-			if(RecursionUtil.statementMayReturnBeforeRecursing(finallyStatement, method))
-			{
-				return true;
-			}
-			if(RecursionUtil.statementDefinitelyRecurses(finallyStatement, method))
-			{
-				return false;
-			}
-		}
-
-		final JSStatement statement = tryStatement.getStatement();
-
-		if(RecursionUtil.statementMayReturnBeforeRecursing(statement, method))
-		{
-			return true;
-		}
-
-		final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
-
-		if(catchBlock != null)
-		{
-			final JSStatement catchStatement = catchBlock.getStatement();
-
-			if(RecursionUtil.statementMayReturnBeforeRecursing(catchStatement, method))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static boolean ifStatementMayReturnBeforeRecursing(
-			JSIfStatement ifStatement, JSFunction method)
-	{
-		final JSExpression test = ifStatement.getCondition();
-		if(RecursionUtil.expressionDefinitelyRecurses(test, method))
-		{
-			return false;
-		}
-		final JSStatement thenBranch = ifStatement.getThen();
-		if(RecursionUtil.statementMayReturnBeforeRecursing(thenBranch, method))
-		{
-			return true;
-		}
-		final JSStatement elseBranch = ifStatement.getElse();
-		return elseBranch != null &&
-				RecursionUtil.statementMayReturnBeforeRecursing(elseBranch, method);
-	}
-
-	private static boolean labeledStatementMayReturnBeforeRecursing(
-			JSLabeledStatement labeledStatement, JSFunction method)
-	{
-		final JSStatement statement = labeledStatement.getStatement();
-		return RecursionUtil.statementMayReturnBeforeRecursing(statement, method);
-	}
-
-	private static boolean blockStatementMayReturnBeforeRecursing(
-			JSBlockStatement block, JSFunction method, boolean endsInImplicitReturn)
-	{
-		if(block == null)
-		{
-			return true;
-		}
-
-		final JSStatement[] statements = block.getStatements();
-
-		for(final JSStatement statement : statements)
-		{
-			if(RecursionUtil.statementMayReturnBeforeRecursing(statement, method))
-			{
-				return true;
-			}
-			if(RecursionUtil.statementDefinitelyRecurses(statement, method))
-			{
-				return false;
-			}
-		}
-		return endsInImplicitReturn;
-	}
-
-	public static boolean functionMayRecurse(@Nonnull JSFunction function)
-	{
-		final JSRecursionVisitor recursionVisitor = new JSRecursionVisitor(function);
-
-		if(recursionVisitor.isFunctionNamed())
-		{
-			function.accept(recursionVisitor);
-		}
-		return recursionVisitor.isRecursive();
-	}
-
-	private static boolean expressionDefinitelyRecurses(JSExpression exp,
-														JSFunction method)
-	{
-		if(exp == null)
-		{
-			return false;
-		}
-		if(exp instanceof JSNewExpression)
-		{
-			return RecursionUtil.newExpressionDefinitelyRecurses(
-					(JSNewExpression) exp, method);
-		}
-		if(exp instanceof JSCallExpression)
-		{
-			return RecursionUtil.callExpressionDefinitelyRecurses(
-					(JSCallExpression) exp, method);
-		}
-		if(exp instanceof JSAssignmentExpression)
-		{
-			return RecursionUtil.assignmentExpressionDefinitelyRecurses(
-					(JSAssignmentExpression) exp, method);
-		}
-		if(exp instanceof JSArrayLiteralExpression)
-		{
-			return RecursionUtil.arrayLiteralExpressionDefinitelyRecurses(
-					(JSArrayLiteralExpression) exp, method);
-		}
-		if(exp instanceof JSIndexedPropertyAccessExpression)
-		{
-			return RecursionUtil.indexedPropertyAccessExpressionDefinitelyRecurses(
-					(JSIndexedPropertyAccessExpression) exp, method);
-		}
-		if(exp instanceof JSPrefixExpression)
-		{
-			return RecursionUtil.prefixExpressionDefinitelyRecurses(
-					(JSPrefixExpression) exp, method);
-		}
-		if(exp instanceof JSPostfixExpression)
-		{
-			return RecursionUtil.postfixExpressionDefinitelyRecurses(
-					(JSPostfixExpression) exp, method);
-		}
-		if(exp instanceof JSBinaryExpression)
-		{
-			return RecursionUtil.binaryExpressionDefinitelyRecurses(
-					(JSBinaryExpression) exp, method);
-		}
-		if(exp instanceof JSConditionalExpression)
-		{
-			return RecursionUtil.conditionalExpressionDefinitelyRecurses(
-					(JSConditionalExpression) exp, method);
-		}
-		if(exp instanceof JSParenthesizedExpression)
-		{
-			return RecursionUtil.parenthesizedExpressionDefinitelyRecurses(
-					(JSParenthesizedExpression) exp, method);
-		}
-		if(exp instanceof JSReferenceExpression)
-		{
-			return RecursionUtil.referenceExpressionDefinitelyRecurses(
-					(JSReferenceExpression) exp, method);
-		}
-		if(exp instanceof JSLiteralExpression ||
-				exp instanceof JSThisExpression)
-		{
-			return false;
-		}
-		return false;
-	}
-
-	private static boolean conditionalExpressionDefinitelyRecurses(
-			JSConditionalExpression expression, JSFunction method)
-	{
-		final JSExpression condExpression = expression.getCondition();
-
-		return RecursionUtil.expressionDefinitelyRecurses(condExpression, method) ||
-				(RecursionUtil.expressionDefinitelyRecurses(expression.getThen(), method) &&
-						RecursionUtil.expressionDefinitelyRecurses(expression.getElse(), method));
-
-	}
-
-	private static boolean binaryExpressionDefinitelyRecurses(
-			JSBinaryExpression expression, JSFunction method)
-	{
-		final JSExpression lhs = expression.getLOperand();
-
-		if(RecursionUtil.expressionDefinitelyRecurses(lhs, method))
-		{
-			return true;
-		}
-
-		final IElementType tokenType = expression.getOperationSign();
-
-		if(tokenType.equals(JSTokenTypes.ANDAND) ||
-				tokenType.equals(JSTokenTypes.OROR))
-		{
-			return false;
-		}
-
-		return RecursionUtil.expressionDefinitelyRecurses(expression.getROperand(), method);
-	}
-
-	private static boolean indexedPropertyAccessExpressionDefinitelyRecurses(
-			JSIndexedPropertyAccessExpression expression, JSFunction method)
-	{
-		final JSExpression arrayExp = expression.getQualifier();
-		final JSExpression indexExp = expression.getIndexExpression();
-		return (RecursionUtil.expressionDefinitelyRecurses(arrayExp, method) ||
-				RecursionUtil.expressionDefinitelyRecurses(indexExp, method));
-	}
-
-	private static boolean arrayLiteralExpressionDefinitelyRecurses(
-			JSArrayLiteralExpression expression, JSFunction method)
-	{
-		for(final JSExpression initializer : expression.getExpressions())
-		{
-			if(RecursionUtil.expressionDefinitelyRecurses(initializer, method))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static boolean prefixExpressionDefinitelyRecurses(
-			JSPrefixExpression expression, JSFunction method)
-	{
-		final JSExpression operand = expression.getExpression();
-		return RecursionUtil.expressionDefinitelyRecurses(operand, method);
-	}
-
-	private static boolean postfixExpressionDefinitelyRecurses(
-			JSPostfixExpression expression, JSFunction method)
-	{
-		final JSExpression operand = expression.getExpression();
-		return RecursionUtil.expressionDefinitelyRecurses(operand, method);
-	}
-
-	private static boolean parenthesizedExpressionDefinitelyRecurses(
-			JSParenthesizedExpression expression, JSFunction method)
-	{
-		final JSExpression innerExpression = expression.getInnerExpression();
-		return RecursionUtil.expressionDefinitelyRecurses(innerExpression, method);
-	}
-
-	private static boolean referenceExpressionDefinitelyRecurses(
-			JSReferenceExpression expression, JSFunction method)
-	{
-		final JSExpression qualifierExpression = expression.getQualifier();
-		return (qualifierExpression != null &&
-				RecursionUtil.expressionDefinitelyRecurses(qualifierExpression, method));
-	}
-
-	private static boolean assignmentExpressionDefinitelyRecurses(
-			JSAssignmentExpression assignmentExpression, JSFunction method)
-	{
-		final JSExpression lhs = assignmentExpression.getLOperand();
-		final JSExpression rhs = assignmentExpression.getROperand();
-		return (RecursionUtil.expressionDefinitelyRecurses(rhs, method) ||
-				RecursionUtil.expressionDefinitelyRecurses(lhs, method));
-	}
-
-	private static boolean newExpressionDefinitelyRecurses(JSNewExpression exp,
-														   JSFunction method)
-	{
-		final JSArgumentList argumentList = exp.getArgumentList();
-		if(argumentList != null)
-		{
-			final JSExpression[] args = argumentList.getArguments();
-			for(final JSExpression arg : args)
-			{
-				if(RecursionUtil.expressionDefinitelyRecurses(arg, method))
-				{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	private static boolean callExpressionDefinitelyRecurses(
-			JSCallExpression exp, JSFunction method)
-	{
-		final JSFunction calledMethod = ControlFlowUtils.resolveMethod(exp);
-
-		if(calledMethod != null && calledMethod.equals(method))
-		{
-			return true;
-		}
-
-		final JSExpression methodExpression = exp.getMethodExpression();
-
-		if(methodExpression == null)
-		{
-			return false;
-		}
-		else if(RecursionUtil.expressionDefinitelyRecurses(methodExpression, method))
-		{
-			return true;
-		}
-
-		for(final JSExpression arg : exp.getArgumentList().getArguments())
-		{
-			if(RecursionUtil.expressionDefinitelyRecurses(arg, method))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static boolean statementDefinitelyRecurses(JSStatement statement,
-													   JSFunction method)
-	{
-		if(statement == null)
-		{
-			return false;
-		}
-		if(statement instanceof JSBreakStatement ||
-				statement instanceof JSContinueStatement ||
-				statement instanceof JSThrowStatement ||
-				statement instanceof JSEmptyStatement)
-		{
-			return false;
-		}
-		else if(statement instanceof JSExpressionStatement)
-		{
-			final JSExpressionStatement expressionStatement =
-					(JSExpressionStatement) statement;
-			final JSExpression expression =
-					expressionStatement.getExpression();
-			return RecursionUtil.expressionDefinitelyRecurses(expression, method);
-		}
-		else if(statement instanceof JSVarStatement)
-		{
-			final JSVarStatement varStatement =
-					(JSVarStatement) statement;
-			for(final JSVariable variable : varStatement.getVariables())
-			{
-				final JSExpression initializer = variable.getInitializer();
-				if(RecursionUtil.expressionDefinitelyRecurses(initializer, method))
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-		else if(statement instanceof JSReturnStatement)
-		{
-			final JSReturnStatement returnStatement =
-					(JSReturnStatement) statement;
-			final JSExpression returnValue = returnStatement.getExpression();
-			if(returnValue != null)
-			{
-				if(RecursionUtil.expressionDefinitelyRecurses(returnValue, method))
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-		else if(statement instanceof JSForStatement)
-		{
-			return RecursionUtil.forStatementDefinitelyRecurses((JSForStatement)
-					statement, method);
-		}
-		else if(statement instanceof JSForInStatement)
-		{
-			return RecursionUtil.forInStatementDefinitelyRecurses(
-					(JSForInStatement) statement, method);
-		}
-		else if(statement instanceof JSWhileStatement)
-		{
-			return RecursionUtil.whileStatementDefinitelyRecurses(
-					(JSWhileStatement) statement, method);
-		}
-		else if(statement instanceof JSDoWhileStatement)
-		{
-			return RecursionUtil.doWhileStatementDefinitelyRecurses(
-					(JSDoWhileStatement) statement, method);
-		}
-		else if(statement instanceof JSBlockStatement)
-		{
-			return RecursionUtil.blockStatementDefinitelyRecurses(
-					(JSBlockStatement) statement, method);
-		}
-		else if(statement instanceof JSLabeledStatement)
-		{
-			return RecursionUtil.labeledStatementDefinitelyRecurses(
-					(JSLabeledStatement) statement, method);
-		}
-		else if(statement instanceof JSIfStatement)
-		{
-			return RecursionUtil.ifStatementDefinitelyRecurses(
-					(JSIfStatement) statement, method);
-		}
-		else if(statement instanceof JSTryStatement)
-		{
-			return RecursionUtil.tryStatementDefinitelyRecurses(
-					(JSTryStatement) statement, method);
-		}
-		else if(statement instanceof JSSwitchStatement)
-		{
-			return RecursionUtil.switchStatementDefinitelyRecurses(
-					(JSSwitchStatement) statement, method);
-		}
-		else
-		{
-			// unknown statement type
-			return false;
-		}
-	}
-
-	private static boolean switchStatementDefinitelyRecurses(
-			JSSwitchStatement switchStatement, JSFunction method)
-	{
-		final JSExpression switchExpression = switchStatement.getSwitchExpression();
-		return RecursionUtil.expressionDefinitelyRecurses(switchExpression, method);
-	}
-
-	private static boolean tryStatementDefinitelyRecurses(
-			JSTryStatement tryStatement, JSFunction method)
-	{
-		final JSStatement statement = tryStatement.getStatement();
-		if(RecursionUtil.statementDefinitelyRecurses(statement, method))
-		{
-			return true;
-		}
-		final JSStatement finallyStatement = tryStatement.getFinallyStatement();
-		return RecursionUtil.statementDefinitelyRecurses(finallyStatement, method);
-	}
-
-	private static boolean blockStatementDefinitelyRecurses(JSBlockStatement block,
-															JSFunction method)
-	{
-		if(block != null)
-		{
-			for(final JSStatement statement : block.getStatements())
-			{
-				if(RecursionUtil.statementDefinitelyRecurses(statement, method))
-				{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	private static boolean ifStatementDefinitelyRecurses(
-			JSIfStatement ifStatement, JSFunction method)
-	{
-		final JSExpression condition = ifStatement.getCondition();
-		if(RecursionUtil.expressionDefinitelyRecurses(condition, method))
-		{
-			return true;
-		}
-		final JSStatement thenBranch = ifStatement.getThen();
-		final JSStatement elseBranch = ifStatement.getElse();
-		if(thenBranch == null || elseBranch == null)
-		{
-			return false;
-		}
-		return RecursionUtil.statementDefinitelyRecurses(thenBranch, method) &&
-				RecursionUtil.statementDefinitelyRecurses(elseBranch, method);
-	}
-
-	private static boolean forStatementDefinitelyRecurses(
-			JSForStatement forStatement, JSFunction method)
-	{
-		final JSStatement declaration = forStatement.getVarDeclaration();
-		final JSExpression initialization = forStatement.getInitialization();
-
-		if(declaration != null &&
-				RecursionUtil.statementDefinitelyRecurses(declaration, method))
-		{
-			return true;
-		}
-		else if(initialization != null &&
-				RecursionUtil.expressionDefinitelyRecurses(initialization, method))
-		{
-			return true;
-		}
-
-		final JSExpression condition = forStatement.getCondition();
-
-		if(RecursionUtil.expressionDefinitelyRecurses(condition, method))
-		{
-			return true;
-		}
-		if(BoolUtils.isTrue(condition))
-		{
-			final JSStatement body = forStatement.getBody();
-			return RecursionUtil.statementDefinitelyRecurses(body, method);
-		}
-		return false;
-	}
-
-	private static boolean forInStatementDefinitelyRecurses(
-			JSForInStatement foreachStatement, JSFunction method)
-	{
-		final JSExpression collection = foreachStatement.getCollectionExpression();
-		return RecursionUtil.expressionDefinitelyRecurses(collection, method);
-	}
-
-	private static boolean whileStatementDefinitelyRecurses(
-			JSWhileStatement whileStatement, JSFunction method)
-	{
-
-		final JSExpression condition = whileStatement.getCondition();
-		if(RecursionUtil.expressionDefinitelyRecurses(condition, method))
-		{
-			return true;
-		}
-		if(BoolUtils.isTrue(condition))
-		{
-			final JSStatement body = whileStatement.getBody();
-			return RecursionUtil.statementDefinitelyRecurses(body, method);
-		}
-		return false;
-	}
-
-	private static boolean doWhileStatementDefinitelyRecurses(
-			JSDoWhileStatement doWhileStatement, JSFunction method)
-	{
-
-		final JSStatement body = doWhileStatement.getBody();
-		if(RecursionUtil.statementDefinitelyRecurses(body, method))
-		{
-			return true;
-		}
-		final JSExpression condition = doWhileStatement.getCondition();
-		return RecursionUtil.expressionDefinitelyRecurses(condition, method);
-	}
-
-	private static boolean labeledStatementDefinitelyRecurses(
-			JSLabeledStatement labeledStatement, JSFunction method)
-	{
-		final JSStatement body = labeledStatement.getStatement();
-		return RecursionUtil.statementDefinitelyRecurses(body, method);
-	}
-
-	public static boolean functionDefinitelyRecurses(
-			@Nonnull JSFunction method)
-	{
-		final JSSourceElement[] body = method.getBody();
-
-		if(body != null)
-		{
-			for(final JSSourceElement element : body)
-			{
-				if(element instanceof JSStatement &&
-						RecursionUtil.statementDefinitelyRecurses((JSStatement) element, method))
-				{
-					return true;
-				}
-				else if(element instanceof JSExpression &&
-						RecursionUtil.expressionDefinitelyRecurses((JSExpression) element, method))
-				{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
+public class RecursionUtil {
+    private RecursionUtil() {
+    }
+
+    public static boolean statementMayReturnBeforeRecursing(JSStatement statement, JSFunction method) {
+        if (statement == null) {
+            return true;
+        }
+
+        if (statement instanceof JSBreakStatement
+            || statement instanceof JSContinueStatement
+            || statement instanceof JSThrowStatement
+            || statement instanceof JSExpressionStatement
+            || statement instanceof JSEmptyStatement
+            || statement instanceof JSVarStatement) {
+            return false;
+        }
+        else if (statement instanceof JSReturnStatement returnStatement) {
+            final JSExpression returnValue = returnStatement.getExpression();
+            return returnValue == null || !RecursionUtil.expressionDefinitelyRecurses(returnValue, method);
+        }
+        else if (statement instanceof JSForStatement forStatement) {
+            return RecursionUtil.forStatementMayReturnBeforeRecursing(forStatement, method);
+        }
+        else if (statement instanceof JSForInStatement forInStatement) {
+            return RecursionUtil.forInStatementMayReturnBeforeRecursing(forInStatement, method);
+        }
+        else if (statement instanceof JSWhileStatement whileStatement) {
+            return RecursionUtil.whileStatementMayReturnBeforeRecursing(whileStatement, method);
+        }
+        else if (statement instanceof JSDoWhileStatement doWhileStatement) {
+            return RecursionUtil.doWhileStatementMayReturnBeforeRecursing(doWhileStatement, method);
+        }
+        else if (statement instanceof JSBlockStatement blockStatement) {
+            return RecursionUtil.blockStatementMayReturnBeforeRecursing(blockStatement, method, false);
+        }
+        else if (statement instanceof JSLabeledStatement labeledStatement) {
+            return RecursionUtil.labeledStatementMayReturnBeforeRecursing(labeledStatement, method);
+        }
+        else if (statement instanceof JSIfStatement ifStatement) {
+            return RecursionUtil.ifStatementMayReturnBeforeRecursing(ifStatement, method);
+        }
+        else if (statement instanceof JSTryStatement tryStatement) {
+            return RecursionUtil.tryStatementMayReturnBeforeRecursing(tryStatement, method);
+        }
+        else if (statement instanceof JSSwitchStatement switchStatement) {
+            return RecursionUtil.switchStatementMayReturnBeforeRecursing(switchStatement, method);
+        }
+        else {
+            // unknown statement type
+            return true;
+        }
+    }
+
+    private static boolean doWhileStatementMayReturnBeforeRecursing(JSDoWhileStatement loopStatement, JSFunction method) {
+        final JSStatement body = loopStatement.getBody();
+        return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
+    }
+
+    private static boolean whileStatementMayReturnBeforeRecursing(JSWhileStatement loopStatement, JSFunction method) {
+        final JSExpression test = loopStatement.getCondition();
+        if (RecursionUtil.expressionDefinitelyRecurses(test, method)) {
+            return false;
+        }
+        final JSStatement body = loopStatement.getBody();
+        return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
+    }
+
+    private static boolean forStatementMayReturnBeforeRecursing(JSForStatement loopStatement, JSFunction method) {
+        if (RecursionUtil.statementMayReturnBeforeRecursing(loopStatement.getVarDeclaration(), method)) {
+            return true;
+        }
+        if (RecursionUtil.expressionDefinitelyRecurses(loopStatement.getInitialization(), method)) {
+            return false;
+        }
+        if (RecursionUtil.expressionDefinitelyRecurses(loopStatement.getCondition(), method)) {
+            return false;
+        }
+        return RecursionUtil.statementMayReturnBeforeRecursing(loopStatement.getBody(), method);
+    }
+
+    private static boolean forInStatementMayReturnBeforeRecursing(JSForInStatement loopStatement, JSFunction method) {
+        final JSExpression collection = loopStatement.getCollectionExpression();
+        if (RecursionUtil.expressionDefinitelyRecurses(collection, method)) {
+            return false;
+        }
+        final JSStatement body = loopStatement.getBody();
+        return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
+    }
+
+    private static boolean switchStatementMayReturnBeforeRecursing(JSSwitchStatement switchStatement, JSFunction method) {
+        for (final JSCaseClause clause : switchStatement.getCaseClauses()) {
+            for (final JSStatement statement : clause.getStatements()) {
+                if (RecursionUtil.statementMayReturnBeforeRecursing(statement, method)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean tryStatementMayReturnBeforeRecursing(JSTryStatement tryStatement, JSFunction method) {
+        final JSStatement finallyStatement = tryStatement.getFinallyStatement();
+
+        if (finallyStatement != null) {
+            if (RecursionUtil.statementMayReturnBeforeRecursing(finallyStatement, method)) {
+                return true;
+            }
+            if (RecursionUtil.statementDefinitelyRecurses(finallyStatement, method)) {
+                return false;
+            }
+        }
+
+        final JSStatement statement = tryStatement.getStatement();
+
+        if (RecursionUtil.statementMayReturnBeforeRecursing(statement, method)) {
+            return true;
+        }
+
+        final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+
+        if (catchBlock != null) {
+            final JSStatement catchStatement = catchBlock.getStatement();
+
+            if (RecursionUtil.statementMayReturnBeforeRecursing(catchStatement, method)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean ifStatementMayReturnBeforeRecursing(JSIfStatement ifStatement, JSFunction method) {
+        final JSExpression test = ifStatement.getCondition();
+        if (RecursionUtil.expressionDefinitelyRecurses(test, method)) {
+            return false;
+        }
+        final JSStatement thenBranch = ifStatement.getThen();
+        if (RecursionUtil.statementMayReturnBeforeRecursing(thenBranch, method)) {
+            return true;
+        }
+        final JSStatement elseBranch = ifStatement.getElse();
+        return elseBranch != null && RecursionUtil.statementMayReturnBeforeRecursing(elseBranch, method);
+    }
+
+    private static boolean labeledStatementMayReturnBeforeRecursing(JSLabeledStatement labeledStatement, JSFunction method) {
+        final JSStatement statement = labeledStatement.getStatement();
+        return RecursionUtil.statementMayReturnBeforeRecursing(statement, method);
+    }
+
+    private static boolean blockStatementMayReturnBeforeRecursing(JSBlockStatement block, JSFunction method, boolean endsInImplicitReturn) {
+        if (block == null) {
+            return true;
+        }
+
+        final JSStatement[] statements = block.getStatements();
+
+        for (final JSStatement statement : statements) {
+            if (RecursionUtil.statementMayReturnBeforeRecursing(statement, method)) {
+                return true;
+            }
+            if (RecursionUtil.statementDefinitelyRecurses(statement, method)) {
+                return false;
+            }
+        }
+        return endsInImplicitReturn;
+    }
+
+    public static boolean functionMayRecurse(@Nonnull JSFunction function) {
+        final JSRecursionVisitor recursionVisitor = new JSRecursionVisitor(function);
+
+        if (recursionVisitor.isFunctionNamed()) {
+            function.accept(recursionVisitor);
+        }
+        return recursionVisitor.isRecursive();
+    }
+
+    private static boolean expressionDefinitelyRecurses(JSExpression exp, JSFunction method) {
+        if (exp == null) {
+            return false;
+        }
+        if (exp instanceof JSNewExpression newExpression) {
+            return RecursionUtil.newExpressionDefinitelyRecurses(newExpression, method);
+        }
+        if (exp instanceof JSCallExpression callExpression) {
+            return RecursionUtil.callExpressionDefinitelyRecurses(callExpression, method);
+        }
+        if (exp instanceof JSAssignmentExpression assignmentExpression) {
+            return RecursionUtil.assignmentExpressionDefinitelyRecurses(assignmentExpression, method);
+        }
+        if (exp instanceof JSArrayLiteralExpression arrayLiteralExpression) {
+            return RecursionUtil.arrayLiteralExpressionDefinitelyRecurses(arrayLiteralExpression, method);
+        }
+        if (exp instanceof JSIndexedPropertyAccessExpression indexedPropertyAccessExpression) {
+            return RecursionUtil.indexedPropertyAccessExpressionDefinitelyRecurses(indexedPropertyAccessExpression, method);
+        }
+        if (exp instanceof JSPrefixExpression prefixExpression) {
+            return RecursionUtil.prefixExpressionDefinitelyRecurses(prefixExpression, method);
+        }
+        if (exp instanceof JSPostfixExpression postfixExpression) {
+            return RecursionUtil.postfixExpressionDefinitelyRecurses(postfixExpression, method);
+        }
+        if (exp instanceof JSBinaryExpression binaryExpression) {
+            return RecursionUtil.binaryExpressionDefinitelyRecurses(binaryExpression, method);
+        }
+        if (exp instanceof JSConditionalExpression conditionalExpression) {
+            return RecursionUtil.conditionalExpressionDefinitelyRecurses(conditionalExpression, method);
+        }
+        if (exp instanceof JSParenthesizedExpression parenthesizedExpression) {
+            return RecursionUtil.parenthesizedExpressionDefinitelyRecurses(parenthesizedExpression, method);
+        }
+        if (exp instanceof JSReferenceExpression referenceExpression) {
+            return RecursionUtil.referenceExpressionDefinitelyRecurses(referenceExpression, method);
+        }
+        if (exp instanceof JSLiteralExpression || exp instanceof JSThisExpression) {
+            return false;
+        }
+        return false;
+    }
+
+    private static boolean conditionalExpressionDefinitelyRecurses(JSConditionalExpression expression, JSFunction method) {
+        final JSExpression condExpression = expression.getCondition();
+
+        return RecursionUtil.expressionDefinitelyRecurses(condExpression, method) ||
+            (RecursionUtil.expressionDefinitelyRecurses(expression.getThen(), method) &&
+                RecursionUtil.expressionDefinitelyRecurses(expression.getElse(), method));
+    }
+
+    private static boolean binaryExpressionDefinitelyRecurses(JSBinaryExpression expression, JSFunction method) {
+        final JSExpression lhs = expression.getLOperand();
+
+        if (RecursionUtil.expressionDefinitelyRecurses(lhs, method)) {
+            return true;
+        }
+
+        final IElementType tokenType = expression.getOperationSign();
+
+        if (JSTokenTypes.ANDAND.equals(tokenType) || JSTokenTypes.OROR.equals(tokenType)) {
+            return false;
+        }
+
+        return RecursionUtil.expressionDefinitelyRecurses(expression.getROperand(), method);
+    }
+
+    private static boolean indexedPropertyAccessExpressionDefinitelyRecurses(
+        JSIndexedPropertyAccessExpression expression,
+        JSFunction method
+    ) {
+        final JSExpression arrayExp = expression.getQualifier();
+        final JSExpression indexExp = expression.getIndexExpression();
+        return RecursionUtil.expressionDefinitelyRecurses(arrayExp, method)
+            || RecursionUtil.expressionDefinitelyRecurses(indexExp, method);
+    }
+
+    private static boolean arrayLiteralExpressionDefinitelyRecurses(JSArrayLiteralExpression expression, JSFunction method) {
+        for (final JSExpression initializer : expression.getExpressions()) {
+            if (RecursionUtil.expressionDefinitelyRecurses(initializer, method)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean prefixExpressionDefinitelyRecurses(JSPrefixExpression expression, JSFunction method) {
+        final JSExpression operand = expression.getExpression();
+        return RecursionUtil.expressionDefinitelyRecurses(operand, method);
+    }
+
+    private static boolean postfixExpressionDefinitelyRecurses(JSPostfixExpression expression, JSFunction method) {
+        final JSExpression operand = expression.getExpression();
+        return RecursionUtil.expressionDefinitelyRecurses(operand, method);
+    }
+
+    private static boolean parenthesizedExpressionDefinitelyRecurses(JSParenthesizedExpression expression, JSFunction method) {
+        final JSExpression innerExpression = expression.getInnerExpression();
+        return RecursionUtil.expressionDefinitelyRecurses(innerExpression, method);
+    }
+
+    private static boolean referenceExpressionDefinitelyRecurses(JSReferenceExpression expression, JSFunction method) {
+        final JSExpression qualifierExpression = expression.getQualifier();
+        return (qualifierExpression != null &&
+            RecursionUtil.expressionDefinitelyRecurses(qualifierExpression, method));
+    }
+
+    private static boolean assignmentExpressionDefinitelyRecurses(JSAssignmentExpression assignmentExpression, JSFunction method) {
+        final JSExpression lhs = assignmentExpression.getLOperand();
+        final JSExpression rhs = assignmentExpression.getROperand();
+        return RecursionUtil.expressionDefinitelyRecurses(rhs, method)
+            || RecursionUtil.expressionDefinitelyRecurses(lhs, method);
+    }
+
+    private static boolean newExpressionDefinitelyRecurses(JSNewExpression exp, JSFunction method) {
+        final JSArgumentList argumentList = exp.getArgumentList();
+        if (argumentList != null) {
+            final JSExpression[] args = argumentList.getArguments();
+            for (final JSExpression arg : args) {
+                if (RecursionUtil.expressionDefinitelyRecurses(arg, method)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean callExpressionDefinitelyRecurses(JSCallExpression exp, JSFunction method) {
+        final JSFunction calledMethod = ControlFlowUtils.resolveMethod(exp);
+
+        if (calledMethod != null && calledMethod.equals(method)) {
+            return true;
+        }
+
+        final JSExpression methodExpression = exp.getMethodExpression();
+
+        if (methodExpression == null) {
+            return false;
+        }
+        else if (RecursionUtil.expressionDefinitelyRecurses(methodExpression, method)) {
+            return true;
+        }
+
+        for (final JSExpression arg : exp.getArgumentList().getArguments()) {
+            if (RecursionUtil.expressionDefinitelyRecurses(arg, method)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean statementDefinitelyRecurses(JSStatement statement, JSFunction method) {
+        if (statement == null) {
+            return false;
+        }
+        if (statement instanceof JSBreakStatement
+            || statement instanceof JSContinueStatement
+            || statement instanceof JSThrowStatement
+            || statement instanceof JSEmptyStatement) {
+            return false;
+        }
+        else if (statement instanceof JSExpressionStatement expressionStatement) {
+            final JSExpression expression = expressionStatement.getExpression();
+            return RecursionUtil.expressionDefinitelyRecurses(expression, method);
+        }
+        else if (statement instanceof JSVarStatement varStatement) {
+            for (final JSVariable variable : varStatement.getVariables()) {
+                final JSExpression initializer = variable.getInitializer();
+                if (RecursionUtil.expressionDefinitelyRecurses(initializer, method)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        else if (statement instanceof JSReturnStatement returnStatement) {
+            final JSExpression returnValue = returnStatement.getExpression();
+            if (returnValue != null) {
+                if (RecursionUtil.expressionDefinitelyRecurses(returnValue, method)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        else if (statement instanceof JSForStatement forStatement) {
+            return RecursionUtil.forStatementDefinitelyRecurses(forStatement, method);
+        }
+        else if (statement instanceof JSForInStatement forInStatement) {
+            return RecursionUtil.forInStatementDefinitelyRecurses(forInStatement, method);
+        }
+        else if (statement instanceof JSWhileStatement whileStatement) {
+            return RecursionUtil.whileStatementDefinitelyRecurses(whileStatement, method);
+        }
+        else if (statement instanceof JSDoWhileStatement doWhileStatement) {
+            return RecursionUtil.doWhileStatementDefinitelyRecurses(doWhileStatement, method);
+        }
+        else if (statement instanceof JSBlockStatement blockStatement) {
+            return RecursionUtil.blockStatementDefinitelyRecurses(blockStatement, method);
+        }
+        else if (statement instanceof JSLabeledStatement labeledStatement) {
+            return RecursionUtil.labeledStatementDefinitelyRecurses(labeledStatement, method);
+        }
+        else if (statement instanceof JSIfStatement ifStatement) {
+            return RecursionUtil.ifStatementDefinitelyRecurses(ifStatement, method);
+        }
+        else if (statement instanceof JSTryStatement tryStatement) {
+            return RecursionUtil.tryStatementDefinitelyRecurses(tryStatement, method);
+        }
+        else if (statement instanceof JSSwitchStatement switchStatement) {
+            return RecursionUtil.switchStatementDefinitelyRecurses(switchStatement, method);
+        }
+        else {
+            // unknown statement type
+            return false;
+        }
+    }
+
+    private static boolean switchStatementDefinitelyRecurses(JSSwitchStatement switchStatement, JSFunction method) {
+        final JSExpression switchExpression = switchStatement.getSwitchExpression();
+        return RecursionUtil.expressionDefinitelyRecurses(switchExpression, method);
+    }
+
+    private static boolean tryStatementDefinitelyRecurses(JSTryStatement tryStatement, JSFunction method) {
+        final JSStatement statement = tryStatement.getStatement();
+        if (RecursionUtil.statementDefinitelyRecurses(statement, method)) {
+            return true;
+        }
+        final JSStatement finallyStatement = tryStatement.getFinallyStatement();
+        return RecursionUtil.statementDefinitelyRecurses(finallyStatement, method);
+    }
+
+    private static boolean blockStatementDefinitelyRecurses(JSBlockStatement block, JSFunction method) {
+        if (block != null) {
+            for (final JSStatement statement : block.getStatements()) {
+                if (RecursionUtil.statementDefinitelyRecurses(statement, method)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean ifStatementDefinitelyRecurses(JSIfStatement ifStatement, JSFunction method) {
+        final JSExpression condition = ifStatement.getCondition();
+        if (RecursionUtil.expressionDefinitelyRecurses(condition, method)) {
+            return true;
+        }
+        final JSStatement thenBranch = ifStatement.getThen();
+        final JSStatement elseBranch = ifStatement.getElse();
+        if (thenBranch == null || elseBranch == null) {
+            return false;
+        }
+        return RecursionUtil.statementDefinitelyRecurses(thenBranch, method)
+            && RecursionUtil.statementDefinitelyRecurses(elseBranch, method);
+    }
+
+    private static boolean forStatementDefinitelyRecurses(JSForStatement forStatement, JSFunction method) {
+        final JSStatement declaration = forStatement.getVarDeclaration();
+        final JSExpression initialization = forStatement.getInitialization();
+
+        if (declaration != null &&
+            RecursionUtil.statementDefinitelyRecurses(declaration, method)) {
+            return true;
+        }
+        else if (initialization != null &&
+            RecursionUtil.expressionDefinitelyRecurses(initialization, method)) {
+            return true;
+        }
+
+        final JSExpression condition = forStatement.getCondition();
+
+        if (RecursionUtil.expressionDefinitelyRecurses(condition, method)) {
+            return true;
+        }
+        if (BoolUtils.isTrue(condition)) {
+            final JSStatement body = forStatement.getBody();
+            return RecursionUtil.statementDefinitelyRecurses(body, method);
+        }
+        return false;
+    }
+
+    private static boolean forInStatementDefinitelyRecurses(JSForInStatement foreachStatement, JSFunction method) {
+        final JSExpression collection = foreachStatement.getCollectionExpression();
+        return RecursionUtil.expressionDefinitelyRecurses(collection, method);
+    }
+
+    private static boolean whileStatementDefinitelyRecurses(JSWhileStatement whileStatement, JSFunction method) {
+        final JSExpression condition = whileStatement.getCondition();
+        if (RecursionUtil.expressionDefinitelyRecurses(condition, method)) {
+            return true;
+        }
+        if (BoolUtils.isTrue(condition)) {
+            final JSStatement body = whileStatement.getBody();
+            return RecursionUtil.statementDefinitelyRecurses(body, method);
+        }
+        return false;
+    }
+
+    private static boolean doWhileStatementDefinitelyRecurses(JSDoWhileStatement doWhileStatement, JSFunction method) {
+        final JSStatement body = doWhileStatement.getBody();
+        if (RecursionUtil.statementDefinitelyRecurses(body, method)) {
+            return true;
+        }
+        final JSExpression condition = doWhileStatement.getCondition();
+        return RecursionUtil.expressionDefinitelyRecurses(condition, method);
+    }
+
+    private static boolean labeledStatementDefinitelyRecurses(JSLabeledStatement labeledStatement, JSFunction method) {
+        final JSStatement body = labeledStatement.getStatement();
+        return RecursionUtil.statementDefinitelyRecurses(body, method);
+    }
+
+    public static boolean functionDefinitelyRecurses(@Nonnull JSFunction method) {
+        final JSSourceElement[] body = method.getBody();
+
+        if (body != null) {
+            for (final JSSourceElement element : body) {
+                if (element instanceof JSStatement &&
+                    RecursionUtil.statementDefinitelyRecurses((JSStatement)element, method)) {
+                    return true;
+                }
+                else if (element instanceof JSExpression &&
+                    RecursionUtil.expressionDefinitelyRecurses((JSExpression)element, method)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
index 0393c7b8..5fe9c4e9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
@@ -19,81 +19,63 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.ast.IElementType;
 
-public class SideEffectChecker
-{
-	private SideEffectChecker()
-	{
-	}
+public class SideEffectChecker {
+    private SideEffectChecker() {
+    }
 
-	public static boolean mayHaveSideEffects(JSExpression exp)
-	{
-		final SideEffectsVisitor visitor = new SideEffectsVisitor();
-		exp.accept(visitor);
-		return visitor.mayHaveSideEffects();
-	}
+    public static boolean mayHaveSideEffects(JSExpression exp) {
+        final SideEffectsVisitor visitor = new SideEffectsVisitor();
+        exp.accept(visitor);
+        return visitor.mayHaveSideEffects();
+    }
 
-	private static class SideEffectsVisitor extends JSRecursiveElementVisitor
-	{
-		private boolean mayHaveSideEffects;
+    private static class SideEffectsVisitor extends JSRecursiveElementVisitor {
+        private boolean mayHaveSideEffects;
 
-		@Override
-		public void visitJSElement(JSElement element)
-		{
-			if(!this.mayHaveSideEffects)
-			{
-				super.visitJSElement(element);
-			}
-		}
+        @Override
+        public void visitJSElement(JSElement element) {
+            if (!this.mayHaveSideEffects) {
+                super.visitJSElement(element);
+            }
+        }
 
-		@Override
-		public void visitJSCallExpression(JSCallExpression expression)
-		{
-			this.mayHaveSideEffects = true;
-		}
+        @Override
+        public void visitJSCallExpression(JSCallExpression expression) {
+            this.mayHaveSideEffects = true;
+        }
 
-		@Override
-		public void visitJSNewExpression(JSNewExpression expression)
-		{
-			this.mayHaveSideEffects = true;
-		}
+        @Override
+        public void visitJSNewExpression(JSNewExpression expression) {
+            this.mayHaveSideEffects = true;
+        }
 
-		@Override
-		public void visitJSAssignmentExpression(JSAssignmentExpression expression)
-		{
-			this.mayHaveSideEffects = true;
-		}
+        @Override
+        public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
+            this.mayHaveSideEffects = true;
+        }
 
-		@Override
-		public void visitJSPrefixExpression(JSPrefixExpression expression)
-		{
-			super.visitJSPrefixExpression(expression);
-			final IElementType sign = expression.getOperationSign();
+        @Override
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
+            super.visitJSPrefixExpression(expression);
+            final IElementType sign = expression.getOperationSign();
 
-			if(sign != null &&
-					(sign.equals(JSTokenTypes.PLUSPLUS) ||
-							sign.equals(JSTokenTypes.MINUSMINUS)))
-			{
-				this.mayHaveSideEffects = true;
-			}
-		}
+            if (sign != null && (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign))) {
+                this.mayHaveSideEffects = true;
+            }
+        }
 
-		@Override
-		public void visitJSPostfixExpression(JSPostfixExpression expression)
-		{
-			super.visitJSPostfixExpression(expression);
-			final IElementType sign = expression.getOperationSign();
+        @Override
+        public void visitJSPostfixExpression(JSPostfixExpression expression) {
+            super.visitJSPostfixExpression(expression);
+            final IElementType sign = expression.getOperationSign();
 
-			if(sign != null &&
-					(sign.equals(JSTokenTypes.PLUSPLUS) ||
-							sign.equals(JSTokenTypes.MINUSMINUS)))
-			{
-				this.mayHaveSideEffects = true;
-			}
-		}
+            if (sign != null && (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign))) {
+                this.mayHaveSideEffects = true;
+            }
+        }
 
-		public boolean mayHaveSideEffects()
-		{
-			return this.mayHaveSideEffects;
-		}
-	}
+        public boolean mayHaveSideEffects() {
+            return this.mayHaveSideEffects;
+        }
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
index 488afd66..bd66915b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
@@ -21,162 +21,142 @@
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
-public class TreeUtil
-{
-	private TreeUtil()
-	{
-	}
-
-	public static PsiElement getNextLeaf(PsiElement element)
-	{
-		if(element == null)
-		{
-			return null;
-		}
-		final PsiElement sibling = element.getNextSibling();
-		if(sibling == null)
-		{
-			final PsiElement parent = element.getParent();
-			return getNextLeaf(parent);
-		}
-		return getFirstLeaf(sibling);
-	}
-
-	private static PsiElement getFirstLeaf(PsiElement element)
-	{
-		final PsiElement[] children = element.getChildren();
-		if(children.length == 0)
-		{
-			return element;
-		}
-		return getFirstLeaf(children[0]);
-	}
-
-	public static PsiElement getPrevLeaf(PsiElement element)
-	{
-		if(element == null)
-		{
-			return null;
-		}
-		final PsiElement sibling = element.getPrevSibling();
-		if(sibling == null)
-		{
-			final PsiElement parent = element.getParent();
-			return getPrevLeaf(parent);
-		}
-		return getLastLeaf(sibling);
-	}
-
-	private static PsiElement getLastLeaf(PsiElement element)
-	{
-		final PsiElement[] children = element.getChildren();
-		if(children.length == 0)
-		{
-			return element;
-		}
-		return getLastLeaf(children[children.length - 1]);
-	}
-
-	@Nullable
-	public static <ParentType extends PsiElement> ParentType getParentOfType(@Nullable PsiElement element,
-																			 @Nonnull Class<ParentType> aClass)
-	{
-		return getParentOfType(element, aClass, true);
-	}
-
-	public static <ParentType extends PsiElement> ParentType getParentOfType(PsiElement element,
-																			 Class<ParentType> aClass,
-																			 boolean strict)
-	{
-		if(element == null)
-		{
-			return null;
-		}
-		if(strict)
-		{
-			element = element.getParent();
-		}
-
-		while(element != null && !aClass.isInstance(element))
-		{
-			element = element.getParent();
-		}
-
-		return (ParentType) element;
-	}
-
-	@Nullable
-	public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(@Nullable PsiElement element,
-																			   @Nonnull Class<ParentType> aClass)
-	{
-		return getPrevLeafOfType(element, aClass, true);
-	}
-
-	public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(PsiElement element,
-																			   Class<ParentType> aClass,
-																			   boolean strict)
-	{
-		if(element == null)
-		{
-			return null;
-		}
-		if(strict)
-		{
-			element = getPrevLeaf(element);
-		}
-
-		while(element != null && !aClass.isInstance(element))
-		{
-			element = getPrevLeaf(element);
-		}
-
-		return (ParentType) element;
-	}
-
-	@Nullable
-	public static <ParentType extends PsiElement> ParentType getNextLeafOfType(@Nullable PsiElement element,
-																			   @Nonnull Class<ParentType> aClass)
-	{
-		return getNextLeafOfType(element, aClass, true);
-	}
-
-	public static <ParentType extends PsiElement> ParentType getNextLeafOfType(PsiElement element,
-																			   Class<ParentType> aClass,
-																			   boolean strict)
-	{
-		if(element == null)
-		{
-			return null;
-		}
-		if(strict)
-		{
-			element = getNextLeaf(element);
-		}
-
-		while(element != null && !aClass.isInstance(element))
-		{
-			element = getNextLeaf(element);
-		}
-
-		return (ParentType) element;
-	}
-
-	public static boolean isAncestor(@Nonnull JSElement ancestor,
-									 @Nonnull JSElement element,
-									 boolean strict)
-	{
-		PsiElement parent = (strict ? element.getParent() : element);
-
-		while(parent != null && parent instanceof JSElement)
-		{
-			if(parent.equals(ancestor))
-			{
-				return true;
-			}
-
-			parent = parent.getParent();
-		}
-
-		return false;
-	}
+public class TreeUtil {
+    private TreeUtil() {
+    }
+
+    public static PsiElement getNextLeaf(PsiElement element) {
+        if (element == null) {
+            return null;
+        }
+        final PsiElement sibling = element.getNextSibling();
+        if (sibling == null) {
+            final PsiElement parent = element.getParent();
+            return getNextLeaf(parent);
+        }
+        return getFirstLeaf(sibling);
+    }
+
+    private static PsiElement getFirstLeaf(PsiElement element) {
+        final PsiElement[] children = element.getChildren();
+        if (children.length == 0) {
+            return element;
+        }
+        return getFirstLeaf(children[0]);
+    }
+
+    public static PsiElement getPrevLeaf(PsiElement element) {
+        if (element == null) {
+            return null;
+        }
+        final PsiElement sibling = element.getPrevSibling();
+        if (sibling == null) {
+            final PsiElement parent = element.getParent();
+            return getPrevLeaf(parent);
+        }
+        return getLastLeaf(sibling);
+    }
+
+    private static PsiElement getLastLeaf(PsiElement element) {
+        final PsiElement[] children = element.getChildren();
+        if (children.length == 0) {
+            return element;
+        }
+        return getLastLeaf(children[children.length - 1]);
+    }
+
+    @Nullable
+    public static <ParentType extends PsiElement> ParentType getParentOfType(
+        @Nullable PsiElement element,
+        @Nonnull Class<ParentType> aClass
+    ) {
+        return getParentOfType(element, aClass, true);
+    }
+
+    public static <ParentType extends PsiElement> ParentType getParentOfType(
+        PsiElement element,
+        Class<ParentType> aClass,
+        boolean strict
+    ) {
+        if (element == null) {
+            return null;
+        }
+        if (strict) {
+            element = element.getParent();
+        }
+
+        while (element != null && !aClass.isInstance(element)) {
+            element = element.getParent();
+        }
+
+        return (ParentType)element;
+    }
+
+    @Nullable
+    public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(
+        @Nullable PsiElement element,
+        @Nonnull Class<ParentType> aClass
+    ) {
+        return getPrevLeafOfType(element, aClass, true);
+    }
+
+    public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(
+        PsiElement element,
+        Class<ParentType> aClass,
+        boolean strict
+    ) {
+        if (element == null) {
+            return null;
+        }
+        if (strict) {
+            element = getPrevLeaf(element);
+        }
+
+        while (element != null && !aClass.isInstance(element)) {
+            element = getPrevLeaf(element);
+        }
+
+        return (ParentType)element;
+    }
+
+    @Nullable
+    public static <ParentType extends PsiElement> ParentType getNextLeafOfType(
+        @Nullable PsiElement element,
+        @Nonnull Class<ParentType> aClass
+    ) {
+        return getNextLeafOfType(element, aClass, true);
+    }
+
+    public static <ParentType extends PsiElement> ParentType getNextLeafOfType(
+        PsiElement element,
+        Class<ParentType> aClass,
+        boolean strict
+    ) {
+        if (element == null) {
+            return null;
+        }
+        if (strict) {
+            element = getNextLeaf(element);
+        }
+
+        while (element != null && !aClass.isInstance(element)) {
+            element = getNextLeaf(element);
+        }
+
+        return (ParentType)element;
+    }
+
+    public static boolean isAncestor(@Nonnull JSElement ancestor, @Nonnull JSElement element, boolean strict) {
+        PsiElement parent = strict ? element.getParent() : element;
+
+        while (parent != null && parent instanceof JSElement) {
+            if (parent.equals(ancestor)) {
+                return true;
+            }
+
+            parent = parent.getParent();
+        }
+
+        return false;
+    }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
index 9fac204b..7618f850 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
@@ -21,537 +21,440 @@
 import consulo.language.psi.PsiElement;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-public class VariableAccessUtil
-{
-
-	private VariableAccessUtil()
-	{
-	}
-
-	public static boolean variableIsAssignedFrom(JSVariable variable,
-												 JSElement context)
-	{
-		final VariableAssignedFromVisitor visitor = new VariableAssignedFromVisitor(variable);
-		context.accept(visitor);
-		return visitor.isAssignedFrom();
-	}
-
-	//    public static boolean variableIsPassedAsMethodArgument(
-	//            JSVariable variable, JSElement context) {
-	//        final VariablePassedAsArgumentVisitor visitor =
-	//                new VariablePassedAsArgumentVisitor(variable);
-	//        context.accept(visitor);
-	//        return visitor.isPassed();
-	//    }
-
-	//    public static boolean variableIsUsedInArrayInitializer(
-	//            JSVariable variable, JSElement context) {
-	//        final VariableUsedInArrayInitializerVisitor visitor =
-	//                new VariableUsedInArrayInitializerVisitor(variable);
-	//        context.accept(visitor);
-	//        return visitor.isPassed();
-	//    }
-
-	public static boolean variableIsAssigned(
-			JSVariable variable, JSElement context)
-	{
-		//noinspection unchecked
-		return variableIsAssigned(variable, context, Collections.EMPTY_SET, Collections.EMPTY_SET);
-	}
-
-	public static boolean variableIsAssigned(
-			JSVariable variable,
-			JSElement context,
-			Set<JSVariable> notUpdatedSymbols)
-	{
-		//noinspection unchecked
-		return variableIsAssigned(variable, context, notUpdatedSymbols, Collections.EMPTY_SET);
-	}
-
-	private static boolean variableIsAssigned(
-			JSVariable variable,
-			JSElement context,
-			Set<JSVariable> notUpdatedSymbols,
-			Set<JSVariable> candidateSymbols)
-	{
-		final VariableAssignedVisitor visitor = new VariableAssignedVisitor(variable, context, notUpdatedSymbols,
-				candidateSymbols);
-		context.accept(visitor);
-		return visitor.isAssigned();
-	}
-
-	public static boolean variableIsReturned(
-			JSVariable variable, JSElement context)
-	{
-		final VariableReturnedVisitor visitor = new VariableReturnedVisitor(variable);
-		context.accept(visitor);
-		return visitor.isReturned();
-	}
-
-	public static boolean arrayContentsAreAccessed(
-			JSVariable variable, JSElement context)
-	{
-		final ArrayContentsAccessedVisitor visitor = new ArrayContentsAccessedVisitor(variable);
-		context.accept(visitor);
-		return visitor.isAccessed();
-	}
-
-	public static boolean arrayContentsAreAssigned(
-			JSVariable variable, JSElement context)
-	{
-		final ArrayContentsAssignedVisitor visitor = new ArrayContentsAssignedVisitor(variable);
-		context.accept(visitor);
-		return visitor.isAssigned();
-	}
-
-	public static boolean mayEvaluateToVariable(JSExpression expression,
-												JSVariable variable)
-	{
-		final String variableName = variable.getName();
-		JSExpression expr = expression;
-
-		if(variableName == null)
-		{
-			return false;
-		}
-
-		while(true)
-		{
-			if(expr == null)
-			{
-				return false;
-			}
-			else if(expr instanceof JSParenthesizedExpression)
-			{
-				expr = ((JSParenthesizedExpression) expr).getInnerExpression();
-			}
-			else if(expr instanceof JSConditionalExpression)
-			{
-				final JSConditionalExpression conditional = (JSConditionalExpression) expr;
-
-				return (mayEvaluateToVariable(conditional.getThen(), variable) ||
-						mayEvaluateToVariable(conditional.getElse(), variable));
-			}
-			else if(expr instanceof JSIndexedPropertyAccessExpression)
-			{
-				expr = ((JSIndexedPropertyAccessExpression) expr).getQualifier();
-			}
-			else if(expr instanceof JSDefinitionExpression)
-			{
-				expr = ((JSDefinitionExpression) expr).getExpression();
-			}
-			else if(expr instanceof JSReferenceExpression)
-			{
-				final PsiElement referent = ((JSReferenceExpression) expr).resolve();
-
-				return (referent != null && referent.equals(variable));
-			}
-			else
-			{
-				return false;
-			}
-		}
-	}
-
-	public static boolean variableIsUsed(JSVariable variable,
-										 PsiElement context)
-	{
-		return (variable.getName() != null &&
-				FindReferenceUtil.getReferences(variable, context).iterator().hasNext());
-	}
-
-	public static Set<JSVariable> getUsedVariables(PsiElement context)
-	{
-		final UsedVariableVisitor visitor = new UsedVariableVisitor();
-		context.accept(visitor);
-		return visitor.getVariables();
-	}
-
-	private static class VariableAssignedVisitor extends JSRecursiveElementVisitor
-	{
-		private final JSVariable variable;
-		private final JSElement context;
-		private Set<JSVariable> notUpdatedSymbols;
-		private final Set<JSVariable> candidateSymbols;
-		private boolean assigned;
-
-		public VariableAssignedVisitor(@Nonnull JSVariable variable,
-									   @Nonnull JSElement context,
-									   @Nonnull Set<JSVariable> notUpdatedSymbols)
-		{
-			this.variable = variable;
-			this.context = context;
-			this.notUpdatedSymbols = notUpdatedSymbols;
-			this.candidateSymbols = new LinkedHashSet<>();
-
-			this.candidateSymbols.add(variable);
-		}
-
-		private VariableAssignedVisitor(@Nonnull JSVariable variable,
-										@Nonnull JSElement context,
-										@Nonnull Set<JSVariable> notUpdatedSymbols,
-										@Nonnull Set<JSVariable> candidateSymbols)
-		{
-			this.variable = variable;
-			this.context = context;
-			this.notUpdatedSymbols = notUpdatedSymbols;
-			this.candidateSymbols = candidateSymbols;
-		}
-
-		@Override
-		public void visitJSElement(JSElement element)
-		{
-			if(!this.assigned)
-			{
-				super.visitJSElement(element);
-			}
-		}
-
-		@Override
-		public void visitJSAssignmentExpression(JSAssignmentExpression assignment)
-		{
-			if(!this.assigned)
-			{
-				super.visitJSAssignmentExpression(assignment);
-
-				final JSExpression arg = assignment.getLOperand();
-
-				if(VariableAccessUtil.mayEvaluateToVariable(arg, this.variable))
-				{
-					final Set<JSVariable> usedVariables = getUsedVariables(assignment.getROperand());
-					final Set<JSVariable> newCandidateSet = new LinkedHashSet<>();
-					boolean assigned = false;
-
-					newCandidateSet.addAll(this.candidateSymbols);
-					newCandidateSet.add(this.variable);
-					for(JSVariable variable : usedVariables)
-					{
-						if(newCandidateSet.contains(variable) ||
-								variableIsAssigned(variable, this.context, this.notUpdatedSymbols, newCandidateSet))
-						{
-							assigned = true;
-						}
-						else
-						{
-							if(this.notUpdatedSymbols.isEmpty())
-							{
-								this.notUpdatedSymbols = new LinkedHashSet<>();
-							}
-							this.notUpdatedSymbols.add(variable);
-						}
-					}
-					this.assigned = assigned;
-				}
-				else
-				{
-					this.assigned = false;
-				}
-			}
-		}
-
-		@Override
-		public void visitJSPrefixExpression(JSPrefixExpression expression)
-		{
-			if(!this.assigned)
-			{
-				super.visitJSPrefixExpression(expression);
-
-				final IElementType tokenType = expression.getOperationSign();
-
-				if(!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
-						tokenType.equals(JSTokenTypes.MINUSMINUS)))
-				{
-					return;
-				}
-
-				final JSExpression operand = expression.getExpression();
-
-				this.assigned = (VariableAccessUtil.mayEvaluateToVariable(operand, this.variable));
-			}
-		}
-
-		@Override
-		public void visitJSPostfixExpression(JSPostfixExpression postfixExpression)
-		{
-			if(!this.assigned)
-			{
-				super.visitJSPostfixExpression(postfixExpression);
-
-				final IElementType tokenType = postfixExpression.getOperationSign();
-
-				if(!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
-						tokenType.equals(JSTokenTypes.MINUSMINUS)))
-				{
-					return;
-				}
-
-				final JSExpression operand = postfixExpression.getExpression();
-
-				this.assigned = VariableAccessUtil.mayEvaluateToVariable(operand, this.variable);
-			}
-		}
-
-		public boolean isAssigned()
-		{
-			return this.assigned;
-		}
-	}
-
-	private static class VariableAssignedFromVisitor extends JSRecursiveElementVisitor
-	{
-		private final JSVariable variable;
-		private boolean assignedFrom;
-
-		public VariableAssignedFromVisitor(@Nonnull JSVariable variable)
-		{
-			this.variable = variable;
-		}
-
-		@Override
-		public void visitJSElement(@Nonnull JSElement element)
-		{
-			if(!this.assignedFrom)
-			{
-				super.visitJSElement(element);
-			}
-		}
-
-		@Override
-		public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment)
-		{
-			if(!this.assignedFrom)
-			{
-				super.visitJSAssignmentExpression(assignment);
-
-				this.assignedFrom = VariableAccessUtil.mayEvaluateToVariable(assignment.getROperand(), this.variable);
-			}
-		}
-
-		@Override
-		public void visitJSVarStatement(@Nonnull JSVarStatement statement)
-		{
-			if(!this.assignedFrom)
-			{
-				super.visitJSVarStatement(statement);
-
-				for(JSVariable declaredVariable : statement.getVariables())
-				{
-					final JSExpression initializer = declaredVariable.getInitializer();
-
-					if(initializer != null)
-					{
-						this.assignedFrom = VariableAccessUtil.mayEvaluateToVariable(initializer, this.variable);
-					}
-				}
-			}
-		}
-
-		@Override
-		public void visitJSVariable(JSVariable var)
-		{
-			if(!this.assignedFrom)
-			{
-				super.visitJSVariable(var);
-				this.assignedFrom = (VariableAccessUtil.mayEvaluateToVariable(var.getInitializer(), this.variable));
-			}
-		}
-
-		public boolean isAssignedFrom()
-		{
-			return this.assignedFrom;
-		}
-	}
-
-	private static class VariableReturnedVisitor extends JSRecursiveElementVisitor
-	{
-		@Nonnull
-		private final JSVariable variable;
-		private boolean returned;
-
-		public VariableReturnedVisitor(@Nonnull JSVariable variable)
-		{
-			this.variable = variable;
-		}
-
-		@Override
-		public void visitJSReturnStatement(@Nonnull JSReturnStatement returnStatement)
-		{
-			if(!this.returned)
-			{
-				super.visitJSReturnStatement(returnStatement);
-				this.returned = VariableAccessUtil.mayEvaluateToVariable(returnStatement.getExpression(), this.variable);
-			}
-		}
-
-		public boolean isReturned()
-		{
-			return this.returned;
-		}
-	}
-
-	private static class ArrayContentsAccessedVisitor extends JSRecursiveElementVisitor
-	{
-		private final JSVariable variable;
-		private boolean accessed;
-
-		public ArrayContentsAccessedVisitor(@Nonnull JSVariable variable)
-		{
-			this.variable = variable;
-		}
-
-		@Override
-		public void visitJSForInStatement(@Nonnull JSForInStatement statement)
-		{
-			if(!this.accessed)
-			{
-				super.visitJSForInStatement(statement);
-				this.checkQualifier(statement.getCollectionExpression());
-			}
-		}
-
-		@Override
-		public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAccessExpression accessExpression)
-		{
-			if(!this.accessed)
-			{
-				super.visitJSIndexedPropertyAccessExpression(accessExpression);
-
-				final PsiElement parent = accessExpression.getParent();
-
-				if(!(parent instanceof JSAssignmentExpression ||
-						((JSAssignmentExpression) parent).getLOperand().equals(accessExpression)))
-				{
-					this.checkQualifier(accessExpression.getQualifier());
-				}
-			}
-		}
-
-		private void checkQualifier(JSExpression qualifier)
-		{
-			if(qualifier instanceof JSReferenceExpression)
-			{
-				final PsiElement referent = ((JSReferenceExpression) qualifier).resolve();
-
-				this.accessed = (referent != null && referent.equals(this.variable));
-			}
-		}
-
-		public boolean isAccessed()
-		{
-			return this.accessed;
-		}
-	}
-
-	private static class ArrayContentsAssignedVisitor extends JSRecursiveElementVisitor
-	{
-		private final JSVariable variable;
-		private boolean assigned;
-
-		public ArrayContentsAssignedVisitor(@Nonnull JSVariable variable)
-		{
-			this.variable = variable;
-		}
-
-		@Override
-		public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment)
-		{
-			if(!this.assigned)
-			{
-				super.visitJSAssignmentExpression(assignment);
-				this.checkExpression(null, assignment.getLOperand());
-			}
-		}
-
-		@Override
-		public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression)
-		{
-			if(!this.assigned)
-			{
-				super.visitJSPrefixExpression(expression);
-				this.checkExpression(expression.getOperationSign(), expression.getExpression());
-			}
-		}
-
-		@Override
-		public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression)
-		{
-			if(!this.assigned)
-			{
-				super.visitJSPostfixExpression(expression);
-				this.checkExpression(expression.getOperationSign(), expression.getExpression());
-			}
-		}
-
-		private void checkExpression(IElementType tokenType, JSExpression expression)
-		{
-			if(!(tokenType == null ||
-					tokenType.equals(JSTokenTypes.PLUSPLUS) ||
-					tokenType.equals(JSTokenTypes.MINUSMINUS)))
-			{
-				return;
-			}
-			if(!(expression instanceof JSIndexedPropertyAccessExpression))
-			{
-				return;
-			}
-
-			JSExpression arrayExpression = ((JSIndexedPropertyAccessExpression) expression).getQualifier();
-
-			while(arrayExpression instanceof JSIndexedPropertyAccessExpression)
-			{
-				final JSIndexedPropertyAccessExpression accessExpression = (JSIndexedPropertyAccessExpression) arrayExpression;
-
-				arrayExpression = accessExpression.getQualifier();
-			}
-
-			if(arrayExpression instanceof JSReferenceExpression)
-			{
-				final String referencedName = ((JSReferenceExpression) arrayExpression).getReferencedName();
-
-
-				// TODO maybe it's better to check ((JSReferenceExpression) arrayExpression).isReferenceTo(variable) ?
-				this.assigned = referencedName != null && referencedName.equals(this.variable.getName());
-			}
-		}
-
-		public boolean isAssigned()
-		{
-			return this.assigned;
-		}
-	}
-
-	private static class UsedVariableVisitor extends JSRecursiveElementVisitor
-	{
-
-		@Nonnull
-		private final Set<JSVariable> variables;
-
-		public UsedVariableVisitor()
-		{
-			this.variables = new HashSet<JSVariable>();
-		}
-
-		@Override
-		public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref)
-		{
-			super.visitJSReferenceExpression(ref);
-
-			final PsiElement referent = ref.resolve();
-
-			if(referent != null && referent instanceof JSVariable)
-			{
-				this.variables.add((JSVariable) referent);
-			}
-		}
-
-		public Set<JSVariable> getVariables()
-		{
-			return this.variables;
-		}
-	}
+public class VariableAccessUtil {
+    private VariableAccessUtil() {
+    }
+
+    public static boolean variableIsAssignedFrom(
+        JSVariable variable,
+        JSElement context
+    ) {
+        final VariableAssignedFromVisitor visitor = new VariableAssignedFromVisitor(variable);
+        context.accept(visitor);
+        return visitor.isAssignedFrom();
+    }
+
+    //    public static boolean variableIsPassedAsMethodArgument(
+    //            JSVariable variable, JSElement context) {
+    //        final VariablePassedAsArgumentVisitor visitor =
+    //                new VariablePassedAsArgumentVisitor(variable);
+    //        context.accept(visitor);
+    //        return visitor.isPassed();
+    //    }
+
+    //    public static boolean variableIsUsedInArrayInitializer(
+    //            JSVariable variable, JSElement context) {
+    //        final VariableUsedInArrayInitializerVisitor visitor =
+    //                new VariableUsedInArrayInitializerVisitor(variable);
+    //        context.accept(visitor);
+    //        return visitor.isPassed();
+    //    }
+
+    public static boolean variableIsAssigned(JSVariable variable, JSElement context) {
+        //noinspection unchecked
+        return variableIsAssigned(variable, context, Collections.EMPTY_SET, Collections.EMPTY_SET);
+    }
+
+    public static boolean variableIsAssigned(JSVariable variable, JSElement context, Set<JSVariable> notUpdatedSymbols) {
+        //noinspection unchecked
+        return variableIsAssigned(variable, context, notUpdatedSymbols, Collections.EMPTY_SET);
+    }
+
+    private static boolean variableIsAssigned(
+        JSVariable variable,
+        JSElement context,
+        Set<JSVariable> notUpdatedSymbols,
+        Set<JSVariable> candidateSymbols
+    ) {
+        final VariableAssignedVisitor visitor = new VariableAssignedVisitor(variable, context, notUpdatedSymbols,
+            candidateSymbols
+        );
+        context.accept(visitor);
+        return visitor.isAssigned();
+    }
+
+    public static boolean variableIsReturned(JSVariable variable, JSElement context) {
+        final VariableReturnedVisitor visitor = new VariableReturnedVisitor(variable);
+        context.accept(visitor);
+        return visitor.isReturned();
+    }
+
+    public static boolean arrayContentsAreAccessed(JSVariable variable, JSElement context) {
+        final ArrayContentsAccessedVisitor visitor = new ArrayContentsAccessedVisitor(variable);
+        context.accept(visitor);
+        return visitor.isAccessed();
+    }
+
+    public static boolean arrayContentsAreAssigned(JSVariable variable, JSElement context) {
+        final ArrayContentsAssignedVisitor visitor = new ArrayContentsAssignedVisitor(variable);
+        context.accept(visitor);
+        return visitor.isAssigned();
+    }
+
+    public static boolean mayEvaluateToVariable(JSExpression expression, JSVariable variable) {
+        final String variableName = variable.getName();
+        JSExpression expr = expression;
+
+        if (variableName == null) {
+            return false;
+        }
+
+        while (true) {
+            if (expr == null) {
+                return false;
+            }
+            else if (expr instanceof JSParenthesizedExpression parenExpr) {
+                expr = parenExpr.getInnerExpression();
+            }
+            else if (expr instanceof JSConditionalExpression conditional) {
+                return mayEvaluateToVariable(conditional.getThen(), variable)
+                    || mayEvaluateToVariable(conditional.getElse(), variable);
+            }
+            else if (expr instanceof JSIndexedPropertyAccessExpression indexedExpr) {
+                expr = indexedExpr.getQualifier();
+            }
+            else if (expr instanceof JSDefinitionExpression defExpr) {
+                expr = defExpr.getExpression();
+            }
+            else if (expr instanceof JSReferenceExpression refExpr) {
+                final PsiElement referent = refExpr.resolve();
+
+                return referent != null && referent.equals(variable);
+            }
+            else {
+                return false;
+            }
+        }
+    }
+
+    public static boolean variableIsUsed(JSVariable variable, PsiElement context) {
+        return variable.getName() != null &&
+            FindReferenceUtil.getReferences(variable, context).iterator().hasNext();
+    }
+
+    public static Set<JSVariable> getUsedVariables(PsiElement context) {
+        final UsedVariableVisitor visitor = new UsedVariableVisitor();
+        context.accept(visitor);
+        return visitor.getVariables();
+    }
+
+    private static class VariableAssignedVisitor extends JSRecursiveElementVisitor {
+        private final JSVariable variable;
+        private final JSElement context;
+        private Set<JSVariable> notUpdatedSymbols;
+        private final Set<JSVariable> candidateSymbols;
+        private boolean assigned;
+
+        public VariableAssignedVisitor(
+            @Nonnull JSVariable variable,
+            @Nonnull JSElement context,
+            @Nonnull Set<JSVariable> notUpdatedSymbols
+        ) {
+            this.variable = variable;
+            this.context = context;
+            this.notUpdatedSymbols = notUpdatedSymbols;
+            this.candidateSymbols = new LinkedHashSet<>();
+
+            this.candidateSymbols.add(variable);
+        }
+
+        private VariableAssignedVisitor(
+            @Nonnull JSVariable variable,
+            @Nonnull JSElement context,
+            @Nonnull Set<JSVariable> notUpdatedSymbols,
+            @Nonnull Set<JSVariable> candidateSymbols
+        ) {
+            this.variable = variable;
+            this.context = context;
+            this.notUpdatedSymbols = notUpdatedSymbols;
+            this.candidateSymbols = candidateSymbols;
+        }
+
+        @Override
+        public void visitJSElement(JSElement element) {
+            if (!this.assigned) {
+                super.visitJSElement(element);
+            }
+        }
+
+        @Override
+        public void visitJSAssignmentExpression(JSAssignmentExpression assignment) {
+            if (!this.assigned) {
+                super.visitJSAssignmentExpression(assignment);
+
+                final JSExpression arg = assignment.getLOperand();
+
+                if (VariableAccessUtil.mayEvaluateToVariable(arg, this.variable)) {
+                    final Set<JSVariable> usedVariables = getUsedVariables(assignment.getROperand());
+                    final Set<JSVariable> newCandidateSet = new LinkedHashSet<>();
+                    boolean assigned = false;
+
+                    newCandidateSet.addAll(this.candidateSymbols);
+                    newCandidateSet.add(this.variable);
+                    for (JSVariable variable : usedVariables) {
+                        if (newCandidateSet.contains(variable) ||
+                            variableIsAssigned(variable, this.context, this.notUpdatedSymbols, newCandidateSet)) {
+                            assigned = true;
+                        }
+                        else {
+                            if (this.notUpdatedSymbols.isEmpty()) {
+                                this.notUpdatedSymbols = new LinkedHashSet<>();
+                            }
+                            this.notUpdatedSymbols.add(variable);
+                        }
+                    }
+                    this.assigned = assigned;
+                }
+                else {
+                    this.assigned = false;
+                }
+            }
+        }
+
+        @Override
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
+            if (!this.assigned) {
+                super.visitJSPrefixExpression(expression);
+
+                final IElementType tokenType = expression.getOperationSign();
+
+                if (!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
+                    tokenType.equals(JSTokenTypes.MINUSMINUS))) {
+                    return;
+                }
+
+                final JSExpression operand = expression.getExpression();
+
+                this.assigned = VariableAccessUtil.mayEvaluateToVariable(operand, this.variable);
+            }
+        }
+
+        @Override
+        public void visitJSPostfixExpression(JSPostfixExpression postfixExpression) {
+            if (!this.assigned) {
+                super.visitJSPostfixExpression(postfixExpression);
+
+                final IElementType tokenType = postfixExpression.getOperationSign();
+
+                if (!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
+                    tokenType.equals(JSTokenTypes.MINUSMINUS))) {
+                    return;
+                }
+
+                final JSExpression operand = postfixExpression.getExpression();
+
+                this.assigned = VariableAccessUtil.mayEvaluateToVariable(operand, this.variable);
+            }
+        }
+
+        public boolean isAssigned() {
+            return this.assigned;
+        }
+    }
+
+    private static class VariableAssignedFromVisitor extends JSRecursiveElementVisitor {
+        private final JSVariable variable;
+        private boolean assignedFrom;
+
+        public VariableAssignedFromVisitor(@Nonnull JSVariable variable) {
+            this.variable = variable;
+        }
+
+        @Override
+        public void visitJSElement(@Nonnull JSElement element) {
+            if (!this.assignedFrom) {
+                super.visitJSElement(element);
+            }
+        }
+
+        @Override
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+            if (!this.assignedFrom) {
+                super.visitJSAssignmentExpression(assignment);
+
+                this.assignedFrom = VariableAccessUtil.mayEvaluateToVariable(assignment.getROperand(), this.variable);
+            }
+        }
+
+        @Override
+        public void visitJSVarStatement(@Nonnull JSVarStatement statement) {
+            if (!this.assignedFrom) {
+                super.visitJSVarStatement(statement);
+
+                for (JSVariable declaredVariable : statement.getVariables()) {
+                    final JSExpression initializer = declaredVariable.getInitializer();
+
+                    if (initializer != null) {
+                        this.assignedFrom = VariableAccessUtil.mayEvaluateToVariable(initializer, this.variable);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void visitJSVariable(JSVariable var) {
+            if (!this.assignedFrom) {
+                super.visitJSVariable(var);
+                this.assignedFrom = (VariableAccessUtil.mayEvaluateToVariable(var.getInitializer(), this.variable));
+            }
+        }
+
+        public boolean isAssignedFrom() {
+            return this.assignedFrom;
+        }
+    }
+
+    private static class VariableReturnedVisitor extends JSRecursiveElementVisitor {
+        @Nonnull
+        private final JSVariable variable;
+        private boolean returned;
+
+        public VariableReturnedVisitor(@Nonnull JSVariable variable) {
+            this.variable = variable;
+        }
+
+        @Override
+        public void visitJSReturnStatement(@Nonnull JSReturnStatement returnStatement) {
+            if (!this.returned) {
+                super.visitJSReturnStatement(returnStatement);
+                this.returned = VariableAccessUtil.mayEvaluateToVariable(returnStatement.getExpression(), this.variable);
+            }
+        }
+
+        public boolean isReturned() {
+            return this.returned;
+        }
+    }
+
+    private static class ArrayContentsAccessedVisitor extends JSRecursiveElementVisitor {
+        private final JSVariable variable;
+        private boolean accessed;
+
+        public ArrayContentsAccessedVisitor(@Nonnull JSVariable variable) {
+            this.variable = variable;
+        }
+
+        @Override
+        public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+            if (!this.accessed) {
+                super.visitJSForInStatement(statement);
+                this.checkQualifier(statement.getCollectionExpression());
+            }
+        }
+
+        @Override
+        public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAccessExpression accessExpression) {
+            if (!this.accessed) {
+                super.visitJSIndexedPropertyAccessExpression(accessExpression);
+
+                final PsiElement parent = accessExpression.getParent();
+
+                if (!(parent instanceof JSAssignmentExpression ||
+                    ((JSAssignmentExpression)parent).getLOperand().equals(accessExpression))) {
+                    this.checkQualifier(accessExpression.getQualifier());
+                }
+            }
+        }
+
+        private void checkQualifier(JSExpression qualifier) {
+            if (qualifier instanceof JSReferenceExpression referenceExpression) {
+                final PsiElement referent = referenceExpression.resolve();
+
+                this.accessed = (referent != null && referent.equals(this.variable));
+            }
+        }
+
+        public boolean isAccessed() {
+            return this.accessed;
+        }
+    }
+
+    private static class ArrayContentsAssignedVisitor extends JSRecursiveElementVisitor {
+        private final JSVariable variable;
+        private boolean assigned;
+
+        public ArrayContentsAssignedVisitor(@Nonnull JSVariable variable) {
+            this.variable = variable;
+        }
+
+        @Override
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+            if (!this.assigned) {
+                super.visitJSAssignmentExpression(assignment);
+                this.checkExpression(null, assignment.getLOperand());
+            }
+        }
+
+        @Override
+        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+            if (!this.assigned) {
+                super.visitJSPrefixExpression(expression);
+                this.checkExpression(expression.getOperationSign(), expression.getExpression());
+            }
+        }
+
+        @Override
+        public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
+            if (!this.assigned) {
+                super.visitJSPostfixExpression(expression);
+                this.checkExpression(expression.getOperationSign(), expression.getExpression());
+            }
+        }
+
+        private void checkExpression(IElementType tokenType, JSExpression expression) {
+            if (!(tokenType == null || JSTokenTypes.PLUSPLUS.equals(tokenType) || JSTokenTypes.MINUSMINUS.equals(tokenType))) {
+                return;
+            }
+            if (!(expression instanceof JSIndexedPropertyAccessExpression)) {
+                return;
+            }
+
+            JSExpression arrayExpression = ((JSIndexedPropertyAccessExpression)expression).getQualifier();
+
+            while (arrayExpression instanceof JSIndexedPropertyAccessExpression accessExpression) {
+                arrayExpression = accessExpression.getQualifier();
+            }
+
+            if (arrayExpression instanceof JSReferenceExpression referenceExpression) {
+                final String referencedName = referenceExpression.getReferencedName();
+
+                // TODO maybe it's better to check ((JSReferenceExpression) arrayExpression).isReferenceTo(variable) ?
+                this.assigned = referencedName != null && referencedName.equals(this.variable.getName());
+            }
+        }
+
+        public boolean isAssigned() {
+            return this.assigned;
+        }
+    }
+
+    private static class UsedVariableVisitor extends JSRecursiveElementVisitor {
+        @Nonnull
+        private final Set<JSVariable> variables;
+
+        public UsedVariableVisitor() {
+            this.variables = new HashSet<>();
+        }
+
+        @Override
+        public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
+            super.visitJSReferenceExpression(ref);
+
+            final PsiElement referent = ref.resolve();
+
+            if (referent != null && referent instanceof JSVariable variable) {
+                this.variables.add(variable);
+            }
+        }
+
+        public Set<JSVariable> getVariables() {
+            return this.variables;
+        }
+    }
 }

From 9169da3877b1a36fe97cf9c901f976041c3c446b Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 22 Jul 2024 17:53:52 +0300
Subject: [PATCH 212/340] Code reformat using IJ4 code style (part 4).

---
 intentions/src/main/java/module-info.java     |   8 +-
 .../lang/javascript/JSAbstractBundle.java     |  87 +-
 .../actionscript/ActionScriptFileType.java    |  69 +-
 .../ActionScriptFileTypeFactory.java          |  12 +-
 .../lang/ActionScriptLanguageVersion.java     |  77 +-
 .../src/main/java/module-info.java            |   6 +-
 .../EcmaScript6QuickFixFactory.java           |  21 +-
 ...cmaScript6CreateJSFunctionOrMethodFix.java |  10 +-
 .../EcmaScript6KeywordCompletionExtender.java |  12 +-
 .../lang/BaseEcmaScriptJavaScriptVersion.java |  71 +-
 .../lang/EcmaScript6JavaScriptVersion.java    |  60 +-
 .../lang/EcmaScript7JavaScriptVersion.java    |  34 +-
 .../lang/EcmaScript8JavaScriptVersion.java    |  32 +-
 .../parsing/EcmaScriptExpressionParsing.java  | 386 ++++----
 .../lang/parsing/EcmaScriptParser.java        |  25 +-
 .../parsing/EcmaScriptParsingContext.java     |  25 +-
 .../parsing/EcmaScriptStatementParsing.java   | 865 ++++++++---------
 .../EcmaScriptStrictParserBuilder.java        |  24 +-
 .../lang/EcmaScript4JavaScriptVersion.java    |  47 +-
 .../parsing/EcmaScript4ExpressionParsing.java | 357 ++++---
 .../parsing/EcmaScript4FunctionParsing.java   | 328 +++----
 .../lang/parsing/EcmaScript4Parser.java       |  14 +-
 .../parsing/EcmaScript4ParsingContext.java    |  36 +-
 .../parsing/EcmaScript4StatementParsing.java  | 915 ++++++++----------
 .../src/main/java/module-info.java            |   6 +-
 25 files changed, 1589 insertions(+), 1938 deletions(-)

diff --git a/intentions/src/main/java/module-info.java b/intentions/src/main/java/module-info.java
index b5485cce..2c22f7dd 100644
--- a/intentions/src/main/java/module-info.java
+++ b/intentions/src/main/java/module-info.java
@@ -4,10 +4,10 @@
  */
 module consulo.javascript.intentions
 {
-	// TODO remove in future
-	requires java.desktop;
+    // TODO remove in future
+    requires java.desktop;
 
-	requires consulo.javascript.base.impl;
+    requires consulo.javascript.base.impl;
 
-	requires com.intellij.xml;
+    requires com.intellij.xml;
 }
\ No newline at end of file
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
index d6c06a82..cb91c16a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
@@ -18,61 +18,48 @@
 /**
  * Abstract super class for JS inspection and intention bundles
  */
-public abstract class JSAbstractBundle
-{
-	protected JSAbstractBundle()
-	{
-	}
+public abstract class JSAbstractBundle {
+    protected JSAbstractBundle() {
+    }
 
-	public static String getKey(String className, String classNameSuffix,
-								String alternateClassNameSuffix, Object... suffixes)
-	{
-		String name = className;
-		int dollarIndex = name.indexOf((int) '$');
+    public static String getKey(String className, String classNameSuffix, String alternateClassNameSuffix, Object... suffixes) {
+        String name = className;
+        int dollarIndex = name.indexOf((int)'$');
 
-		if(dollarIndex >= 0)
-		{
-			name = name.substring(0, dollarIndex);
-		}
-		if(name.endsWith(classNameSuffix))
-		{
-			name = name.substring(0, name.length() - classNameSuffix.length());
-		}
-		if(alternateClassNameSuffix != null && name.endsWith(alternateClassNameSuffix))
-		{
-			name = name.substring(0, name.length() - alternateClassNameSuffix.length());
-		}
+        if (dollarIndex >= 0) {
+            name = name.substring(0, dollarIndex);
+        }
+        if (name.endsWith(classNameSuffix)) {
+            name = name.substring(0, name.length() - classNameSuffix.length());
+        }
+        if (alternateClassNameSuffix != null && name.endsWith(alternateClassNameSuffix)) {
+            name = name.substring(0, name.length() - alternateClassNameSuffix.length());
+        }
 
-		final int length = name.length();
-		final StringBuilder buffer = new StringBuilder(length + 10);
-		boolean addWordSeparator = false;
+        final int length = name.length();
+        final StringBuilder buffer = new StringBuilder(length + 10);
+        boolean addWordSeparator = false;
 
-		for(int index = 0; index < length; index++)
-		{
-			final char c = name.charAt(index);
+        for (int index = 0; index < length; index++) {
+            final char c = name.charAt(index);
 
-			if(Character.isUpperCase(c))
-			{
-				if(addWordSeparator)
-				{
-					buffer.append('-');
-					addWordSeparator = false;
-				}
-				buffer.append(Character.toLowerCase(c));
-			}
-			else
-			{
-				addWordSeparator = (c != '.');
-				buffer.append(c);
-			}
-		}
+            if (Character.isUpperCase(c)) {
+                if (addWordSeparator) {
+                    buffer.append('-');
+                    addWordSeparator = false;
+                }
+                buffer.append(Character.toLowerCase(c));
+            }
+            else {
+                addWordSeparator = (c != '.');
+                buffer.append(c);
+            }
+        }
 
-		for(final Object suffix : suffixes)
-		{
-			buffer.append(suffix);
-		}
-
-		return buffer.toString();
-	}
+        for (final Object suffix : suffixes) {
+            buffer.append(suffix);
+        }
 
+        return buffer.toString();
+    }
 }
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
index ede6de31..68b0dc9d 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
@@ -35,48 +35,41 @@
  * @author VISTALL
  * @since 02.12.13.
  */
-public class ActionScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion
-{
-	public static final ActionScriptFileType INSTANCE = new ActionScriptFileType();
+public class ActionScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion {
+    public static final ActionScriptFileType INSTANCE = new ActionScriptFileType();
 
-	private ActionScriptFileType()
-	{
-		super(JavaScriptLanguage.INSTANCE);
-	}
+    private ActionScriptFileType() {
+        super(JavaScriptLanguage.INSTANCE);
+    }
 
-	@Nonnull
-	@Override
-	public String getId()
-	{
-		return "ACTIONSCRIPT";
-	}
+    @Nonnull
+    @Override
+    public String getId() {
+        return "ACTIONSCRIPT";
+    }
 
-	@Nonnull
-	@Override
-	public LocalizeValue getDescription()
-	{
-		return LocalizeValue.localizeTODO("ActionScript files");
-	}
+    @Nonnull
+    @Override
+    public LocalizeValue getDescription() {
+        return LocalizeValue.localizeTODO("ActionScript files");
+    }
 
-	@Nonnull
-	@Override
-	public String getDefaultExtension()
-	{
-		return "as";
-	}
+    @Nonnull
+    @Override
+    public String getDefaultExtension() {
+        return "as";
+    }
 
-	@Nullable
-	@Override
-	public Image getIcon()
-	{
-		return JavaScriptIconGroup.as();
-	}
+    @Nullable
+    @Override
+    public Image getIcon() {
+        return JavaScriptIconGroup.as();
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
-	{
-		return ActionScriptLanguageVersion.getInstance();
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
+        return ActionScriptLanguageVersion.getInstance();
+    }
 }
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
index 75a3054e..d13d334e 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
@@ -10,11 +10,9 @@
  * @since 06.04.2015
  */
 @ExtensionImpl
-public class ActionScriptFileTypeFactory extends FileTypeFactory
-{
-	@Override
-	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
-	{
-		consumer.consume(ActionScriptFileType.INSTANCE);
-	}
+public class ActionScriptFileTypeFactory extends FileTypeFactory {
+    @Override
+    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
+        consumer.consume(ActionScriptFileType.INSTANCE);
+    }
 }
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
index 8c74a0e0..7ad902a1 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
@@ -17,46 +17,39 @@
  * @since 06.04.2015
  */
 @ExtensionImpl
-public class ActionScriptLanguageVersion extends BaseJavaScriptLanguageVersion
-{
-	@Nonnull
-	public static ActionScriptLanguageVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(ActionScriptLanguageVersion.class);
-	}
-
-	private final DialectOptionHolder myDialectOptionHolder = new DialectOptionHolder(true, false);
-
-	public ActionScriptLanguageVersion()
-	{
-		super("ACTIONSCRIPT");
-	}
-
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "ActionScript";
-	}
-
-	@Nonnull
-	@Override
-	public PsiParser createParser()
-	{
-		return new EcmaScript4Parser();
-	}
-
-	@Nonnull
-	@Override
-	public JSHighlighter getSyntaxHighlighter()
-	{
-		return new JSHighlighter(myDialectOptionHolder);
-	}
-
-	@Nonnull
-	@Override
-	public Lexer createLexer()
-	{
-		return new JavaScriptParsingFlexLexer(myDialectOptionHolder);
-	}
+public class ActionScriptLanguageVersion extends BaseJavaScriptLanguageVersion {
+    @Nonnull
+    public static ActionScriptLanguageVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(ActionScriptLanguageVersion.class);
+    }
+
+    private final DialectOptionHolder myDialectOptionHolder = new DialectOptionHolder(true, false);
+
+    public ActionScriptLanguageVersion() {
+        super("ACTIONSCRIPT");
+    }
+
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "ActionScript";
+    }
+
+    @Nonnull
+    @Override
+    public PsiParser createParser() {
+        return new EcmaScript4Parser();
+    }
+
+    @Nonnull
+    @Override
+    public JSHighlighter getSyntaxHighlighter() {
+        return new JSHighlighter(myDialectOptionHolder);
+    }
+
+    @Nonnull
+    @Override
+    public Lexer createLexer() {
+        return new JavaScriptParsingFlexLexer(myDialectOptionHolder);
+    }
 }
diff --git a/lang-version-impl/actionscript-impl/src/main/java/module-info.java b/lang-version-impl/actionscript-impl/src/main/java/module-info.java
index e17104fe..6968758f 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/module-info.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/module-info.java
@@ -4,8 +4,8 @@
  */
 module consulo.javascript.actionscript.impl
 {
-	requires transitive consulo.javascript.ecmascript4.impl;
+    requires transitive consulo.javascript.ecmascript4.impl;
 
-	exports consulo.actionscript;
-	exports consulo.actionscript.lang;
+    exports consulo.actionscript;
+    exports consulo.actionscript.lang;
 }
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
index a236f186..a4b7d28b 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
@@ -29,17 +29,14 @@
  * @since 24.02.2016
  */
 @ExtensionImpl
-public class EcmaScript6QuickFixFactory extends JavaScriptQuickFixFactory
-{
-	@Override
-	public CreateJSFunctionOrMethodFix createFunctionOrMethodFix(String referenceName, boolean isMethod)
-	{
-		return new EcmaScript6CreateJSFunctionOrMethodFix(referenceName, isMethod);
-	}
+public class EcmaScript6QuickFixFactory extends JavaScriptQuickFixFactory {
+    @Override
+    public CreateJSFunctionOrMethodFix createFunctionOrMethodFix(String referenceName, boolean isMethod) {
+        return new EcmaScript6CreateJSFunctionOrMethodFix(referenceName, isMethod);
+    }
 
-	@Override
-	public boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version)
-	{
-		return version instanceof BaseEcmaScriptJavaScriptVersion;
-	}
+    @Override
+    public boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version) {
+        return version instanceof BaseEcmaScriptJavaScriptVersion;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
index 745518ff..5a3a5581 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
@@ -22,10 +22,8 @@
  * @author VISTALL
  * @since 24.02.2016
  */
-public class EcmaScript6CreateJSFunctionOrMethodFix extends CreateJSFunctionOrMethodFix
-{
-	public EcmaScript6CreateJSFunctionOrMethodFix(String name, boolean isMethod)
-	{
-		super(name, isMethod);
-	}
+public class EcmaScript6CreateJSFunctionOrMethodFix extends CreateJSFunctionOrMethodFix {
+    public EcmaScript6CreateJSFunctionOrMethodFix(String name, boolean isMethod) {
+        super(name, isMethod);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
index 6085f2a1..6c88e784 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
@@ -14,11 +14,9 @@
  * @since 2019-12-17
  */
 @ExtensionImpl
-public class EcmaScript6KeywordCompletionExtender implements JavaScriptKeywordCompletionExtender
-{
-	@Override
-	public void fillCompletion(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
-	{
-		result.addElement(LookupElementBuilder.create("let").withInsertHandler(AddSpaceInsertHandler.INSTANCE).bold());
-	}
+public class EcmaScript6KeywordCompletionExtender implements JavaScriptKeywordCompletionExtender {
+    @Override
+    public void fillCompletion(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result) {
+        result.addElement(LookupElementBuilder.create("let").withInsertHandler(AddSpaceInsertHandler.INSTANCE).bold());
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
index 5c2883cf..4cefcee5 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -22,48 +22,43 @@
  * @author VISTALL
  * @since 06/12/2021
  */
-public abstract class BaseEcmaScriptJavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion, JavaScriptVersionWithHelper
-{
-	protected BaseEcmaScriptJavaScriptVersion(@Nonnull String id)
-	{
-		super(id);
-	}
+public abstract class BaseEcmaScriptJavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion, JavaScriptVersionWithHelper {
+    protected BaseEcmaScriptJavaScriptVersion(@Nonnull String id) {
+        super(id);
+    }
 
-	protected BaseEcmaScriptJavaScriptVersion(String name, String... mimeTypes)
-	{
-		super(name, mimeTypes);
-	}
+    protected BaseEcmaScriptJavaScriptVersion(String name, String... mimeTypes) {
+        super(name, mimeTypes);
+    }
 
-	@Nonnull
-	@Override
-	public Lexer createLexer()
-	{
-		return createLexer(false);
-	}
+    @Nonnull
+    @Override
+    public Lexer createLexer() {
+        return createLexer(false);
+    }
 
-	@Nonnull
-	@Override
-	public SyntaxHighlighter getSyntaxHighlighter()
-	{
-		return new JavaScriptHighlighter(() -> createLexer(true));
-	}
+    @Nonnull
+    @Override
+    public SyntaxHighlighter getSyntaxHighlighter() {
+        return new JavaScriptHighlighter(() -> createLexer(true));
+    }
 
-	private Lexer createLexer(boolean hightlight)
-	{
-		return new MergingLexerAdapter(new JavaScriptFlexAdapter(new _EcmaScript6Lexer(hightlight)), TokenSet.create(JSTokenTypes.XML_JS_SCRIPT));
-	}
+    private Lexer createLexer(boolean hightlight) {
+        return new MergingLexerAdapter(
+            new JavaScriptFlexAdapter(new _EcmaScript6Lexer(hightlight)),
+            TokenSet.create(JSTokenTypes.XML_JS_SCRIPT)
+        );
+    }
 
-	@Nonnull
-	@Override
-	public PsiParser createParser()
-	{
-		return new EcmaScriptParser();
-	}
+    @Nonnull
+    @Override
+    public PsiParser createParser() {
+        return new EcmaScriptParser();
+    }
 
-	@Nonnull
-	@Override
-	public ResolveHelper getHelper()
-	{
-		return EcmaScript6ResolveHelper.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public ResolveHelper getHelper() {
+        return EcmaScript6ResolveHelper.INSTANCE;
+    }
 }
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
index fe0fd375..d48013ee 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
@@ -30,42 +30,36 @@
  * @since 12.12.2015
  */
 @ExtensionImpl
-public class EcmaScript6JavaScriptVersion extends BaseEcmaScriptJavaScriptVersion implements StandardJavaScriptVersion, JavaScriptVersionWithHelper
-{
-	@Nonnull
-	public static EcmaScript6JavaScriptVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript6JavaScriptVersion.class);
-	}
+public class EcmaScript6JavaScriptVersion extends BaseEcmaScriptJavaScriptVersion implements StandardJavaScriptVersion, JavaScriptVersionWithHelper {
+    @Nonnull
+    public static EcmaScript6JavaScriptVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript6JavaScriptVersion.class);
+    }
 
-	@Inject
-	public EcmaScript6JavaScriptVersion()
-	{
-		super("ECMASCRIPT_6");
-	}
+    @Inject
+    public EcmaScript6JavaScriptVersion() {
+        super("ECMASCRIPT_6");
+    }
 
-	public EcmaScript6JavaScriptVersion(@Nonnull String id)
-	{
-		super(id);
+    public EcmaScript6JavaScriptVersion(@Nonnull String id) {
+        super(id);
 
-		addFeature(JavaScriptFeature.CLASS);
-		addFeature(JavaScriptFeature.BINARY_LITERAL);
-		addFeature(JavaScriptFeature.OCTAL_LITERAL);
-		addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
-		addFeature(JavaScriptFeature.REST_PARAMETER);
-		addFeature(JavaScriptFeature.FUNCTION_PROPERTY);
-	}
+        addFeature(JavaScriptFeature.CLASS);
+        addFeature(JavaScriptFeature.BINARY_LITERAL);
+        addFeature(JavaScriptFeature.OCTAL_LITERAL);
+        addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
+        addFeature(JavaScriptFeature.REST_PARAMETER);
+        addFeature(JavaScriptFeature.FUNCTION_PROPERTY);
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "ECMAScript 6";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "ECMAScript 6";
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 600;
-	}
+    @Override
+    public int getWeight() {
+        return 600;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
index 8d68b172..502aae46 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
@@ -11,26 +11,22 @@
  * @since 06/12/2021
  */
 @ExtensionImpl
-public class EcmaScript7JavaScriptVersion extends EcmaScript6JavaScriptVersion
-{
-	@Inject
-	public EcmaScript7JavaScriptVersion()
-	{
-		super("ECMASCRIPT_7");
+public class EcmaScript7JavaScriptVersion extends EcmaScript6JavaScriptVersion {
+    @Inject
+    public EcmaScript7JavaScriptVersion() {
+        super("ECMASCRIPT_7");
 
-		addFeature(JavaScriptFeature.EXPONENTIATION_OPERATOR);
-	}
+        addFeature(JavaScriptFeature.EXPONENTIATION_OPERATOR);
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "ECMAScript 7";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "ECMAScript 7";
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 700;
-	}
+    @Override
+    public int getWeight() {
+        return 700;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
index 762eb6d9..891e9b45 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
@@ -9,24 +9,20 @@
  * @since 06/12/2021
  */
 @ExtensionImpl
-public class EcmaScript8JavaScriptVersion extends EcmaScript6JavaScriptVersion
-{
-	@Inject
-	public EcmaScript8JavaScriptVersion()
-	{
-		super("ECMASCRIPT_8");
-	}
+public class EcmaScript8JavaScriptVersion extends EcmaScript6JavaScriptVersion {
+    @Inject
+    public EcmaScript8JavaScriptVersion() {
+        super("ECMASCRIPT_8");
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "ECMAScript 8";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "ECMAScript 8";
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 800;
-	}
+    @Override
+    public int getWeight() {
+        return 800;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
index 1ab98d6c..0cdf5924 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -27,215 +27,179 @@
  * @author VISTALL
  * @since 03.03.2016
  */
-public class EcmaScriptExpressionParsing extends ExpressionParsing<EcmaScriptParsingContext>
-{
-	public EcmaScriptExpressionParsing(EcmaScriptParsingContext context)
-	{
-		super(context);
-	}
-
-	@Override
-	public EcmaScriptStatementParsing getStatementParsing()
-	{
-		return (EcmaScriptStatementParsing) super.getStatementParsing();
-	}
-
-	@Override
-	protected boolean parsePrimaryExpression(PsiBuilder builder)
-	{
-		if(builder.getTokenType() == JSTokenTypes.DOT_DOT_DOT)
-		{
-			PsiBuilder.Marker mark = builder.mark();
-			builder.advanceLexer();
-
-			if(!parseExpressionOptional(builder))
-			{
-				mark.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			else
-			{
-				mark.done(JSElementTypes.SPREAD_EXPRESSION);
-			}
-
-			return true;
-		}
-		else if(builder.getTokenType() == JSTokenTypes.CLASS_KEYWORD)
-		{
-			PsiBuilder.Marker mark = builder.mark();
-			getStatementParsing().parseClassWithMarker(builder, builder.mark(), false);
-			mark.done(JSElementTypes.CLASS_EXPRESSION);
-			return true;
-		}
-
-		if(canParseLambdaExpression(builder))
-		{
-			return parseLambdaExpression(builder);
-		}
-		return super.parsePrimaryExpression(builder);
-	}
-
-	private boolean parseLambdaExpression(PsiBuilder builder)
-	{
-		PsiBuilder.Marker mark = builder.mark();
-
-		IElementType tokenType = builder.getTokenType();
-		if(tokenType == JSTokenTypes.IDENTIFIER)
-		{
-			PsiBuilder.Marker parameterList = builder.mark();
-			getFunctionParsing().parseParameter(builder, null);
-			parameterList.done(JSElementTypes.PARAMETER_LIST);
-		}
-		else
-		{
-			getFunctionParsing().parseParameterList(builder);
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.DARROW)
-		{
-			builder.advanceLexer();
-		}
-		else
-		{
-			mark.rollbackTo();
-			return false;
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.LBRACE)
-		{
-			getStatementParsing().parseBlock(builder);
-		}
-		else
-		{
-			parseAssignmentExpression(builder);
-		}
-
-		mark.done(JSElementTypes.LAMBDA_EXPRESSION);
-		return true;
-	}
-
-	private boolean canParseLambdaExpression(PsiBuilder builder)
-	{
-		PsiBuilder.Marker marker = builder.mark();
-		try
-		{
-			IElementType tokenType = builder.getTokenType();
-			if(tokenType == JSTokenTypes.IDENTIFIER)
-			{
-				builder.advanceLexer();
-				if(builder.getTokenType() == JSTokenTypes.DARROW)
-				{
-					return true;
-				}
-			}
-			else if(tokenType == JSTokenTypes.LPAR)
-			{
-				getFunctionParsing().parseParameterList(builder);
-
-				if(builder.getTokenType() == JSTokenTypes.DARROW)
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-		finally
-		{
-			marker.rollbackTo();
-		}
-	}
-
-	@Override
-	protected void parseProperty(PsiBuilder builder)
-	{
-		final IElementType nameTokenType = builder.getTokenType();
-		PsiBuilder.Marker propertyMark = builder.mark();
-
-		IElementType isSetterOrGetterType = null;
-
-		if(nameTokenType == JSTokenTypes.LBRACKET)
-		{
-			PsiBuilder.Marker mark = builder.mark();
-			builder.advanceLexer();
-			parseExpression(builder);
-			checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
-			mark.done(JSElementTypes.COMPUTED_NAME);
-		}
-		else
-		{
-			if(isNotPropertyStart(builder, nameTokenType))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
-			}
-
-			IElementType setOrGetToken = isContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET);
-
-			if(setOrGetToken != null && builder.lookAhead(1) == JSTokenTypes.IDENTIFIER)
-			{
-				isSetterOrGetterType = setOrGetToken;
-
-				advanceContextKeyword(builder, isSetterOrGetterType);
-			}
-			else
-			{
-				// just advance identifier
-				builder.advanceLexer();
-			}
-		}
-
-		IElementType doneElement = JSElementTypes.PROPERTY;
-
-		if(isSetterOrGetterType != null)
-		{
-			// advance name - see isSetterOrGetterType set
-			builder.advanceLexer();
-
-			getFunctionParsing().parseParameterList(builder);
-
-			getStatementParsing().parseFunctionBody(builder);
-
-			doneElement = JSElementTypes.FUNCTION_PROPERTY;
-		}
-		else
-		{
-			IElementType nextTokenType = builder.getTokenType();
-			// we finished property
-			if((nextTokenType == JSTokenTypes.COMMA || nextTokenType == JSTokenTypes.RBRACE) && nameTokenType == JSTokenTypes.IDENTIFIER)
-			{
-				propertyMark.rollbackTo(); // rollback it
-
-				propertyMark = builder.mark();
-
-				PsiBuilder.Marker referenceMark = builder.mark();
-				builder.advanceLexer();
-				referenceMark.done(JSElementTypes.REFERENCE_EXPRESSION);
-			}
-			else if(nextTokenType == JSTokenTypes.LPAR)
-			{
-				getFunctionParsing().parseParameterList(builder);
-
-				getStatementParsing().parseFunctionBody(builder);
-
-				doneElement = JSElementTypes.FUNCTION_PROPERTY;
-			}
-			else
-			{
-				checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
-
-				builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
-				if(!parseAssignmentExpression(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-				}
-				builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
-			}
-		}
-
-		propertyMark.done(doneElement);
-	}
-
-	@Override
-	public boolean isNotPropertyStart(PsiBuilder builder, IElementType elementType)
-	{
-		return super.isNotPropertyStart(builder, elementType) && elementType != JSTokenTypes.LBRACKET;
-	}
+public class EcmaScriptExpressionParsing extends ExpressionParsing<EcmaScriptParsingContext> {
+    public EcmaScriptExpressionParsing(EcmaScriptParsingContext context) {
+        super(context);
+    }
+
+    @Override
+    public EcmaScriptStatementParsing getStatementParsing() {
+        return (EcmaScriptStatementParsing)super.getStatementParsing();
+    }
+
+    @Override
+    protected boolean parsePrimaryExpression(PsiBuilder builder) {
+        if (builder.getTokenType() == JSTokenTypes.DOT_DOT_DOT) {
+            PsiBuilder.Marker mark = builder.mark();
+            builder.advanceLexer();
+
+            if (!parseExpressionOptional(builder)) {
+                mark.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            else {
+                mark.done(JSElementTypes.SPREAD_EXPRESSION);
+            }
+
+            return true;
+        }
+        else if (builder.getTokenType() == JSTokenTypes.CLASS_KEYWORD) {
+            PsiBuilder.Marker mark = builder.mark();
+            getStatementParsing().parseClassWithMarker(builder, builder.mark(), false);
+            mark.done(JSElementTypes.CLASS_EXPRESSION);
+            return true;
+        }
+
+        if (canParseLambdaExpression(builder)) {
+            return parseLambdaExpression(builder);
+        }
+        return super.parsePrimaryExpression(builder);
+    }
+
+    private boolean parseLambdaExpression(PsiBuilder builder) {
+        PsiBuilder.Marker mark = builder.mark();
+
+        IElementType tokenType = builder.getTokenType();
+        if (tokenType == JSTokenTypes.IDENTIFIER) {
+            PsiBuilder.Marker parameterList = builder.mark();
+            getFunctionParsing().parseParameter(builder, null);
+            parameterList.done(JSElementTypes.PARAMETER_LIST);
+        }
+        else {
+            getFunctionParsing().parseParameterList(builder);
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.DARROW) {
+            builder.advanceLexer();
+        }
+        else {
+            mark.rollbackTo();
+            return false;
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.LBRACE) {
+            getStatementParsing().parseBlock(builder);
+        }
+        else {
+            parseAssignmentExpression(builder);
+        }
+
+        mark.done(JSElementTypes.LAMBDA_EXPRESSION);
+        return true;
+    }
+
+    private boolean canParseLambdaExpression(PsiBuilder builder) {
+        PsiBuilder.Marker marker = builder.mark();
+        try {
+            IElementType tokenType = builder.getTokenType();
+            if (tokenType == JSTokenTypes.IDENTIFIER) {
+                builder.advanceLexer();
+                if (builder.getTokenType() == JSTokenTypes.DARROW) {
+                    return true;
+                }
+            }
+            else if (tokenType == JSTokenTypes.LPAR) {
+                getFunctionParsing().parseParameterList(builder);
+
+                if (builder.getTokenType() == JSTokenTypes.DARROW) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        finally {
+            marker.rollbackTo();
+        }
+    }
+
+    @Override
+    protected void parseProperty(PsiBuilder builder) {
+        final IElementType nameTokenType = builder.getTokenType();
+        PsiBuilder.Marker propertyMark = builder.mark();
+
+        IElementType isSetterOrGetterType = null;
+
+        if (nameTokenType == JSTokenTypes.LBRACKET) {
+            PsiBuilder.Marker mark = builder.mark();
+            builder.advanceLexer();
+            parseExpression(builder);
+            checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
+            mark.done(JSElementTypes.COMPUTED_NAME);
+        }
+        else {
+            if (isNotPropertyStart(builder, nameTokenType)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
+            }
+
+            IElementType setOrGetToken = isContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET);
+
+            if (setOrGetToken != null && builder.lookAhead(1) == JSTokenTypes.IDENTIFIER) {
+                isSetterOrGetterType = setOrGetToken;
+
+                advanceContextKeyword(builder, isSetterOrGetterType);
+            }
+            else {
+                // just advance identifier
+                builder.advanceLexer();
+            }
+        }
+
+        IElementType doneElement = JSElementTypes.PROPERTY;
+
+        if (isSetterOrGetterType != null) {
+            // advance name - see isSetterOrGetterType set
+            builder.advanceLexer();
+
+            getFunctionParsing().parseParameterList(builder);
+
+            getStatementParsing().parseFunctionBody(builder);
+
+            doneElement = JSElementTypes.FUNCTION_PROPERTY;
+        }
+        else {
+            IElementType nextTokenType = builder.getTokenType();
+            // we finished property
+            if ((nextTokenType == JSTokenTypes.COMMA || nextTokenType == JSTokenTypes.RBRACE) && nameTokenType == JSTokenTypes.IDENTIFIER) {
+                propertyMark.rollbackTo(); // rollback it
+
+                propertyMark = builder.mark();
+
+                PsiBuilder.Marker referenceMark = builder.mark();
+                builder.advanceLexer();
+                referenceMark.done(JSElementTypes.REFERENCE_EXPRESSION);
+            }
+            else if (nextTokenType == JSTokenTypes.LPAR) {
+                getFunctionParsing().parseParameterList(builder);
+
+                getStatementParsing().parseFunctionBody(builder);
+
+                doneElement = JSElementTypes.FUNCTION_PROPERTY;
+            }
+            else {
+                checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
+
+                builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
+                if (!parseAssignmentExpression(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+                }
+                builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
+            }
+        }
+
+        propertyMark.done(doneElement);
+    }
+
+    @Override
+    public boolean isNotPropertyStart(PsiBuilder builder, IElementType elementType) {
+        return super.isNotPropertyStart(builder, elementType) && elementType != JSTokenTypes.LBRACKET;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
index 1dee3897..8a0133e0 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
@@ -27,19 +27,16 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public class EcmaScriptParser extends JavaScriptParser
-{
-	@Nonnull
-	@Override
-	public JavaScriptParsingContext createParsingContext()
-	{
-		return new EcmaScriptParsingContext();
-	}
+public class EcmaScriptParser extends JavaScriptParser {
+    @Nonnull
+    @Override
+    public JavaScriptParsingContext createParsingContext() {
+        return new EcmaScriptParsingContext();
+    }
 
-	@Nonnull
-	@Override
-	public JavaScriptParserBuilder createBuilder(PsiBuilder builder)
-	{
-		return new EcmaScriptStrictParserBuilder(builder);
-	}
+    @Nonnull
+    @Override
+    public JavaScriptParserBuilder createBuilder(PsiBuilder builder) {
+        return new EcmaScriptStrictParserBuilder(builder);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
index 33bfbd51..0270a2e0 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
@@ -26,19 +26,16 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public class EcmaScriptParsingContext extends JavaScriptParsingContext
-{
-	@Nonnull
-	@Override
-	protected StatementParsing createStatementParsing()
-	{
-		return new EcmaScriptStatementParsing(this);
-	}
+public class EcmaScriptParsingContext extends JavaScriptParsingContext {
+    @Nonnull
+    @Override
+    protected StatementParsing createStatementParsing() {
+        return new EcmaScriptStatementParsing(this);
+    }
 
-	@Nonnull
-	@Override
-	protected ExpressionParsing createExpressionParsing()
-	{
-		return new EcmaScriptExpressionParsing(this);
-	}
+    @Nonnull
+    @Override
+    protected ExpressionParsing createExpressionParsing() {
+        return new EcmaScriptExpressionParsing(this);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index a7f2acc2..ae2ce722 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -34,477 +34,396 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public class EcmaScriptStatementParsing extends StatementParsing
-{
-	private static final Logger LOGGER = Logger.getInstance(EcmaScriptStatementParsing.class);
-
-	public EcmaScriptStatementParsing(EcmaScriptParsingContext context)
-	{
-		super(context);
-	}
-
-	@Override
-	public void parseSourceElement(PsiBuilder builder)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		if(tokenType == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			getFunctionParsing().parseFunctionDeclaration(builder);
-		}
-		else if(tokenType == JSTokenTypes.EXPORT_KEYWORD && builder.lookAhead(1) == JSTokenTypes.DEFAULT_KEYWORD)
-		{
-			PsiBuilder.Marker mark = builder.mark();
-			builder.advanceLexer();
-			builder.advanceLexer();
-
-			parseSourceElement(builder);
-
-			mark.done(EcmaScript6ElementTypes.EXPORT_DEFAULT_ASSIGMENT);
-		}
-		else if(tokenType == JSTokenTypes.EXPORT_KEYWORD)
-		{
-			PsiBuilder.Marker mark = builder.mark();
-			PsiBuilder.Marker attributeMark = builder.mark();
-			builder.advanceLexer();
-			attributeMark.done(JSElementTypes.ATTRIBUTE_LIST);
-
-			IElementType nextType = builder.getTokenType();
-			if(nextType == JSTokenTypes.FUNCTION_KEYWORD)
-			{
-				getFunctionParsing().parseFunctionNoMarker(builder, false, mark);
-			}
-			else if(nextType == JSTokenTypes.CLASS_KEYWORD)
-			{
-				parseClassWithMarker(builder, mark, false);
-			}
-			else if(nextType == JSTokenTypes.VAR_KEYWORD ||
-					nextType == JSTokenTypes.CONST_KEYWORD ||
-					nextType == JSTokenTypes.LET_KEYWORD)
-			{
-				parseVarStatementWithMarker(builder, false, mark);
-			}
-			else
-			{
-				mark.error("Expected function or variable");
-			}
-		}
-		else
-		{
-			doParseStatement(builder, true);
-		}
-	}
-
-	@Override
-	protected boolean parseForLoopHeader(final PsiBuilder builder)
-	{
-		builder.advanceLexer();
-
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-		final boolean empty;
-		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD || builder.getTokenType() == JSTokenTypes.CONST_KEYWORD)
-		{
-			parseVarStatement(builder, true);
-			empty = false;
-		}
-		else
-		{
-			empty = !getExpressionParsing().parseExpressionOptional(builder, false);
-		}
-
-		boolean forin = false;
-		if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
-		{
-			builder.advanceLexer();
-			getExpressionParsing().parseExpressionOptional(builder);
-
-			if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
-			{
-				builder.advanceLexer();
-			}
-			else
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon());
-			}
-			getExpressionParsing().parseExpressionOptional(builder);
-		}
-		else if(isContextKeyword(builder, JSTokenTypes.OF_KEYWORD) || builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
-		{
-			forin = true;
-			if(empty)
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration());
-			}
-
-			if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
-			{
-				builder.advanceLexer();
-			}
-			else
-			{
-				advanceContextKeyword(builder, JSTokenTypes.OF_KEYWORD);
-			}
-
-			getExpressionParsing().parseExpression(builder);
-		}
-		else
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOfOrSemicolon());
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-		return forin;
-	}
-
-	@Override
-	protected void doParseStatement(PsiBuilder builder, boolean canHaveClasses)
-	{
-		if(canHaveClasses)
-		{
-			if(builder.getTokenType() == JSTokenTypes.IMPORT_KEYWORD)
-			{
-				parseImportStatement(builder);
-				return;
-			}
-		}
-		super.doParseStatement(builder, canHaveClasses);
-	}
-
-	private void parseImportStatement(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker importStatement = builder.mark();
-		try
-		{
-			builder.advanceLexer();
-
-			boolean wantFrom = true;
-
-			if(builder.getTokenType() == JSTokenTypes.ASTERISK)
-			{
-				PsiBuilder.Marker bindingMark = builder.mark();
-
-				builder.advanceLexer();
-
-				if(isContextKeyword(builder, JSTokenTypes.AS_KEYWORD))
-				{
-					advanceContextKeyword(builder, JSTokenTypes.AS_KEYWORD);
-
-					if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-					{
-						builder.advanceLexer();
-					}
-					else
-					{
-						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-					}
-				}
-
-				bindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
-			}
-			else if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
-			{
-				builder.advanceLexer();
-				wantFrom = false;
-			}
-			else
-			{
-				boolean firstBinding = true;
-
-				while(!builder.eof())
-				{
-					if(builder.getTokenType() != JSTokenTypes.COMMA && !isIdentifierToken(builder) && builder.getTokenType() != JSTokenTypes.LBRACE)
-					{
-						break;
-					}
-
-					if(isContextKeyword(builder, JSTokenTypes.FROM_KEYWORD))
-					{
-						break;
-					}
-
-					if(!firstBinding)
-					{
-						Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
-					}
-
-					if(builder.getTokenType() == JSTokenTypes.LBRACE)
-					{
-						PsiBuilder.Marker namedImportsMark = builder.mark();
-						builder.advanceLexer();
-
-						boolean first = true;
-						while(!builder.eof())
-						{
-							if(builder.getTokenType() == JSTokenTypes.RBRACE)
-							{
-								break;
-							}
-
-							if(!first)
-							{
-								if(builder.getTokenType() == JSTokenTypes.COMMA)
-								{
-									builder.advanceLexer();
-								}
-								else
-								{
-									builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
-								}
-							}
-
-							first = false;
-
-							if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-							{
-								PsiBuilder.Marker importBindingMark = builder.mark();
-								builder.advanceLexer();
-
-								if(isContextKeyword(builder, JSTokenTypes.AS_KEYWORD))
-								{
-									PsiBuilder.Marker importSpecificMark = builder.mark();
-									advanceContextKeyword(builder, JSTokenTypes.AS_KEYWORD);
-
-									if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-									{
-										builder.advanceLexer();
-
-										importSpecificMark.done(EcmaScript6ElementTypes.IMPORT_SPECIFIER);
-									}
-									else
-									{
-										importSpecificMark.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-									}
-								}
-
-								importBindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
-							}
-							else if(builder.getTokenType() != JSTokenTypes.RBRACE)
-							{
-								builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-								break;
-							}
-						}
-
-						Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
-
-						namedImportsMark.done(EcmaScript6ElementTypes.NAMED_IMPORTS);
-					}
-					else if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-					{
-						PsiBuilder.Marker importBindingMark = builder.mark();
-						builder.advanceLexer();
-						importBindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
-					}
-					else
-					{
-						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
-						break;
-					}
-
-					firstBinding = false;
-				}
-			}
-
-			if(wantFrom && isContextKeyword(builder, JSTokenTypes.FROM_KEYWORD))
-			{
-				advanceContextKeyword(builder, JSTokenTypes.FROM_KEYWORD);
-
-				if(JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType()))
-				{
-					builder.advanceLexer();
-				}
-				else
-				{
-					builder.error("Expected 'from' target");
-				}
-			}
-
-			checkForSemicolon(builder);
-		}
-		finally
-		{
-			importStatement.done(EcmaScript6ElementTypes.IMPORT_DECLARATION);
-		}
-	}
-
-	@Override
-	protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses)
-	{
-		IElementType tokenType = builder.getTokenType();
-		if(canHaveClasses)
-		{
-			if(tokenType == JSTokenTypes.CLASS_KEYWORD)
-			{
-				parseClass(builder, true);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private void parseClass(final PsiBuilder builder, boolean nameRequired)
-	{
-		parseClassWithMarker(builder, builder.mark(), nameRequired);
-	}
-
-	public void parseClassWithMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz, boolean nameRequired)
-	{
-		builder.advanceLexer();
-
-		if(builder.getTokenType() != JSTokenTypes.IDENTIFIER)
-		{
-			if(nameRequired)
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-			}
-		}
-		else
-		{
-			builder.advanceLexer();
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.EXTENDS_KEYWORD)
-		{
-			parseReferenceList(builder);
-		}
-
-		parseClassBody(builder, BlockType.PACKAGE_OR_CLASS_BODY);
-		clazz.done(JSElementTypes.CLASS);
-	}
-
-	protected void parseClassBody(final PsiBuilder builder, BlockType type)
-	{
-		if(builder.getTokenType() != JSTokenTypes.LBRACE)
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
-			return;
-		}
-
-		builder.advanceLexer();
-		while(builder.getTokenType() != JSTokenTypes.RBRACE)
-		{
-			if(builder.eof())
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageMissingRbrace());
-				return;
-			}
-
-			PsiBuilder.Marker attributeListMarker = builder.mark();
-			if(expectStaticKeywordExpected(builder))
-			{
-				attributeListMarker.done(JSElementTypes.ATTRIBUTE_LIST);
-			}
-			else
-			{
-				attributeListMarker.drop();
-				attributeListMarker = null;
-			}
-
-			IElementType tokenType = builder.getTokenType();
-			if(tokenType != JSTokenTypes.IDENTIFIER && tokenType != JSTokenTypes.MULT)
-			{
-				if(attributeListMarker != null)
-				{
-					attributeListMarker.rollbackTo();
-				}
-
-				PsiBuilder.Marker mark = builder.mark();
-
-				if(attributeListMarker != null)
-				{
-					PsiBuilder.Marker temp = builder.mark();
-					expectStaticKeywordExpected(builder);
-					temp.done(JSElementTypes.ATTRIBUTE_LIST);
-				}
-
-				builder.advanceLexer();
-				mark.error("Expected identifier or *");
-			}
-			else
-			{
-				if(attributeListMarker != null)
-				{
-					attributeListMarker.rollbackTo();
-				}
-
-				PsiBuilder.Marker mark = builder.mark();
-
-				if(attributeListMarker != null)
-				{
-					PsiBuilder.Marker temp = builder.mark();
-					expectStaticKeywordExpected(builder);
-					temp.done(JSElementTypes.ATTRIBUTE_LIST);
-				}
-
-				if(builder.getTokenType() == JSTokenTypes.MULT)
-				{
-					builder.advanceLexer();
-				}
-				else
-				{
-					if(isContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET) != null && builder.lookAhead(1) == JSTokenTypes.IDENTIFIER)
-					{
-						advanceContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET);
-					}
-				}
-
-				if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-				}
-				else
-				{
-					builder.advanceLexer();
-				}
-
-				getFunctionParsing().parseParameterList(builder);
-				getStatementParsing().parseFunctionBody(builder);
-
-				checkForSemicolon(builder);
-
-				mark.done(JSElementTypes.FUNCTION_DECLARATION);
-			}
-		}
-
-		builder.advanceLexer();
-	}
-
-	private boolean expectStaticKeywordExpected(PsiBuilder builder)
-	{
-		IElementType tokenType = builder.getTokenType();
-		if(tokenType == JSTokenTypes.STATIC_KEYWORD)
-		{
-			builder.advanceLexer();
-			return true;
-		}
-		else if(isContextKeyword(builder, TokenSet.create(JSTokenTypes.STATIC_KEYWORD)) != null)
-		{
-			if(builder.lookAhead(1) == JSTokenTypes.IDENTIFIER)
-			{
-				advanceContextKeyword(builder, TokenSet.create(JSTokenTypes.STATIC_KEYWORD));
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private void parseReferenceList(final PsiBuilder builder)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
-		final PsiBuilder.Marker referenceList = builder.mark();
-		builder.advanceLexer();
-
-		if(getExpressionParsing().parseSimpleExpression(builder))
-		{
-			while(builder.getTokenType() == JSTokenTypes.COMMA)
-			{
-				builder.advanceLexer();
-				if(!getExpressionParsing().parseSimpleExpression(builder))
-				{
-					break;
-				}
-			}
-		}
-		referenceList.done(JSElementTypes.EXTENDS_LIST);
-	}
+public class EcmaScriptStatementParsing extends StatementParsing {
+    private static final Logger LOGGER = Logger.getInstance(EcmaScriptStatementParsing.class);
+
+    public EcmaScriptStatementParsing(EcmaScriptParsingContext context) {
+        super(context);
+    }
+
+    @Override
+    public void parseSourceElement(PsiBuilder builder) {
+        final IElementType tokenType = builder.getTokenType();
+        if (tokenType == JSTokenTypes.FUNCTION_KEYWORD) {
+            getFunctionParsing().parseFunctionDeclaration(builder);
+        }
+        else if (tokenType == JSTokenTypes.EXPORT_KEYWORD && builder.lookAhead(1) == JSTokenTypes.DEFAULT_KEYWORD) {
+            PsiBuilder.Marker mark = builder.mark();
+            builder.advanceLexer();
+            builder.advanceLexer();
+
+            parseSourceElement(builder);
+
+            mark.done(EcmaScript6ElementTypes.EXPORT_DEFAULT_ASSIGMENT);
+        }
+        else if (tokenType == JSTokenTypes.EXPORT_KEYWORD) {
+            PsiBuilder.Marker mark = builder.mark();
+            PsiBuilder.Marker attributeMark = builder.mark();
+            builder.advanceLexer();
+            attributeMark.done(JSElementTypes.ATTRIBUTE_LIST);
+
+            IElementType nextType = builder.getTokenType();
+            if (nextType == JSTokenTypes.FUNCTION_KEYWORD) {
+                getFunctionParsing().parseFunctionNoMarker(builder, false, mark);
+            }
+            else if (nextType == JSTokenTypes.CLASS_KEYWORD) {
+                parseClassWithMarker(builder, mark, false);
+            }
+            else if (nextType == JSTokenTypes.VAR_KEYWORD ||
+                nextType == JSTokenTypes.CONST_KEYWORD ||
+                nextType == JSTokenTypes.LET_KEYWORD) {
+                parseVarStatementWithMarker(builder, false, mark);
+            }
+            else {
+                mark.error("Expected function or variable");
+            }
+        }
+        else {
+            doParseStatement(builder, true);
+        }
+    }
+
+    @Override
+    protected boolean parseForLoopHeader(final PsiBuilder builder) {
+        builder.advanceLexer();
+
+        Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+        final boolean empty;
+        if (builder.getTokenType() == JSTokenTypes.VAR_KEYWORD
+            || builder.getTokenType() == JSTokenTypes.LET_KEYWORD
+            || builder.getTokenType() == JSTokenTypes.CONST_KEYWORD) {
+            parseVarStatement(builder, true);
+            empty = false;
+        }
+        else {
+            empty = !getExpressionParsing().parseExpressionOptional(builder, false);
+        }
+
+        boolean forin = false;
+        if (builder.getTokenType() == JSTokenTypes.SEMICOLON) {
+            builder.advanceLexer();
+            getExpressionParsing().parseExpressionOptional(builder);
+
+            if (builder.getTokenType() == JSTokenTypes.SEMICOLON) {
+                builder.advanceLexer();
+            }
+            else {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon());
+            }
+            getExpressionParsing().parseExpressionOptional(builder);
+        }
+        else if (isContextKeyword(builder, JSTokenTypes.OF_KEYWORD) || builder.getTokenType() == JSTokenTypes.IN_KEYWORD) {
+            forin = true;
+            if (empty) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration());
+            }
+
+            if (builder.getTokenType() == JSTokenTypes.IN_KEYWORD) {
+                builder.advanceLexer();
+            }
+            else {
+                advanceContextKeyword(builder, JSTokenTypes.OF_KEYWORD);
+            }
+
+            getExpressionParsing().parseExpression(builder);
+        }
+        else {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOfOrSemicolon());
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+        return forin;
+    }
+
+    @Override
+    protected void doParseStatement(PsiBuilder builder, boolean canHaveClasses) {
+        if (canHaveClasses) {
+            if (builder.getTokenType() == JSTokenTypes.IMPORT_KEYWORD) {
+                parseImportStatement(builder);
+                return;
+            }
+        }
+        super.doParseStatement(builder, canHaveClasses);
+    }
+
+    private void parseImportStatement(final PsiBuilder builder) {
+        final PsiBuilder.Marker importStatement = builder.mark();
+        try {
+            builder.advanceLexer();
+
+            boolean wantFrom = true;
+
+            if (builder.getTokenType() == JSTokenTypes.ASTERISK) {
+                PsiBuilder.Marker bindingMark = builder.mark();
+
+                builder.advanceLexer();
+
+                if (isContextKeyword(builder, JSTokenTypes.AS_KEYWORD)) {
+                    advanceContextKeyword(builder, JSTokenTypes.AS_KEYWORD);
+
+                    if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+                        builder.advanceLexer();
+                    }
+                    else {
+                        builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+                    }
+                }
+
+                bindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
+            }
+            else if (JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType())) {
+                builder.advanceLexer();
+                wantFrom = false;
+            }
+            else {
+                boolean firstBinding = true;
+
+                while (!builder.eof()) {
+                    if (builder.getTokenType() != JSTokenTypes.COMMA
+                        && !isIdentifierToken(builder)
+                        && builder.getTokenType() != JSTokenTypes.LBRACE) {
+                        break;
+                    }
+
+                    if (isContextKeyword(builder, JSTokenTypes.FROM_KEYWORD)) {
+                        break;
+                    }
+
+                    if (!firstBinding) {
+                        Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
+                    }
+
+                    if (builder.getTokenType() == JSTokenTypes.LBRACE) {
+                        PsiBuilder.Marker namedImportsMark = builder.mark();
+                        builder.advanceLexer();
+
+                        boolean first = true;
+                        while (!builder.eof()) {
+                            if (builder.getTokenType() == JSTokenTypes.RBRACE) {
+                                break;
+                            }
+
+                            if (!first) {
+                                if (builder.getTokenType() == JSTokenTypes.COMMA) {
+                                    builder.advanceLexer();
+                                }
+                                else {
+                                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
+                                }
+                            }
+
+                            first = false;
+
+                            if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+                                PsiBuilder.Marker importBindingMark = builder.mark();
+                                builder.advanceLexer();
+
+                                if (isContextKeyword(builder, JSTokenTypes.AS_KEYWORD)) {
+                                    PsiBuilder.Marker importSpecificMark = builder.mark();
+                                    advanceContextKeyword(builder, JSTokenTypes.AS_KEYWORD);
+
+                                    if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+                                        builder.advanceLexer();
+
+                                        importSpecificMark.done(EcmaScript6ElementTypes.IMPORT_SPECIFIER);
+                                    }
+                                    else {
+                                        importSpecificMark.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+                                    }
+                                }
+
+                                importBindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
+                            }
+                            else if (builder.getTokenType() != JSTokenTypes.RBRACE) {
+                                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+                                break;
+                            }
+                        }
+
+                        Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
+
+                        namedImportsMark.done(EcmaScript6ElementTypes.NAMED_IMPORTS);
+                    }
+                    else if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+                        PsiBuilder.Marker importBindingMark = builder.mark();
+                        builder.advanceLexer();
+                        importBindingMark.done(EcmaScript6ElementTypes.IMPORTED_BINDING);
+                    }
+                    else {
+                        builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
+                        break;
+                    }
+
+                    firstBinding = false;
+                }
+            }
+
+            if (wantFrom && isContextKeyword(builder, JSTokenTypes.FROM_KEYWORD)) {
+                advanceContextKeyword(builder, JSTokenTypes.FROM_KEYWORD);
+
+                if (JavaScriptTokenSets.STRING_LITERALS.contains(builder.getTokenType())) {
+                    builder.advanceLexer();
+                }
+                else {
+                    builder.error("Expected 'from' target");
+                }
+            }
+
+            checkForSemicolon(builder);
+        }
+        finally {
+            importStatement.done(EcmaScript6ElementTypes.IMPORT_DECLARATION);
+        }
+    }
+
+    @Override
+    protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses) {
+        IElementType tokenType = builder.getTokenType();
+        if (canHaveClasses) {
+            if (tokenType == JSTokenTypes.CLASS_KEYWORD) {
+                parseClass(builder, true);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void parseClass(final PsiBuilder builder, boolean nameRequired) {
+        parseClassWithMarker(builder, builder.mark(), nameRequired);
+    }
+
+    public void parseClassWithMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz, boolean nameRequired) {
+        builder.advanceLexer();
+
+        if (builder.getTokenType() != JSTokenTypes.IDENTIFIER) {
+            if (nameRequired) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+            }
+        }
+        else {
+            builder.advanceLexer();
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.EXTENDS_KEYWORD) {
+            parseReferenceList(builder);
+        }
+
+        parseClassBody(builder, BlockType.PACKAGE_OR_CLASS_BODY);
+        clazz.done(JSElementTypes.CLASS);
+    }
+
+    protected void parseClassBody(final PsiBuilder builder, BlockType type) {
+        if (builder.getTokenType() != JSTokenTypes.LBRACE) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
+            return;
+        }
+
+        builder.advanceLexer();
+        while (builder.getTokenType() != JSTokenTypes.RBRACE) {
+            if (builder.eof()) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageMissingRbrace());
+                return;
+            }
+
+            PsiBuilder.Marker attributeListMarker = builder.mark();
+            if (expectStaticKeywordExpected(builder)) {
+                attributeListMarker.done(JSElementTypes.ATTRIBUTE_LIST);
+            }
+            else {
+                attributeListMarker.drop();
+                attributeListMarker = null;
+            }
+
+            IElementType tokenType = builder.getTokenType();
+            if (tokenType != JSTokenTypes.IDENTIFIER && tokenType != JSTokenTypes.MULT) {
+                if (attributeListMarker != null) {
+                    attributeListMarker.rollbackTo();
+                }
+
+                PsiBuilder.Marker mark = builder.mark();
+
+                if (attributeListMarker != null) {
+                    PsiBuilder.Marker temp = builder.mark();
+                    expectStaticKeywordExpected(builder);
+                    temp.done(JSElementTypes.ATTRIBUTE_LIST);
+                }
+
+                builder.advanceLexer();
+                mark.error("Expected identifier or *");
+            }
+            else {
+                if (attributeListMarker != null) {
+                    attributeListMarker.rollbackTo();
+                }
+
+                PsiBuilder.Marker mark = builder.mark();
+
+                if (attributeListMarker != null) {
+                    PsiBuilder.Marker temp = builder.mark();
+                    expectStaticKeywordExpected(builder);
+                    temp.done(JSElementTypes.ATTRIBUTE_LIST);
+                }
+
+                if (builder.getTokenType() == JSTokenTypes.MULT) {
+                    builder.advanceLexer();
+                }
+                else {
+                    if (isContextKeyword(
+                        builder,
+                        JSTokenTypes.GET_SET_TOKEN_SET
+                    ) != null && builder.lookAhead(1) == JSTokenTypes.IDENTIFIER) {
+                        advanceContextKeyword(builder, JSTokenTypes.GET_SET_TOKEN_SET);
+                    }
+                }
+
+                if (!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType())) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+                }
+                else {
+                    builder.advanceLexer();
+                }
+
+                getFunctionParsing().parseParameterList(builder);
+                getStatementParsing().parseFunctionBody(builder);
+
+                checkForSemicolon(builder);
+
+                mark.done(JSElementTypes.FUNCTION_DECLARATION);
+            }
+        }
+
+        builder.advanceLexer();
+    }
+
+    private boolean expectStaticKeywordExpected(PsiBuilder builder) {
+        IElementType tokenType = builder.getTokenType();
+        if (tokenType == JSTokenTypes.STATIC_KEYWORD) {
+            builder.advanceLexer();
+            return true;
+        }
+        else if (isContextKeyword(builder, TokenSet.create(JSTokenTypes.STATIC_KEYWORD)) != null) {
+            if (builder.lookAhead(1) == JSTokenTypes.IDENTIFIER) {
+                advanceContextKeyword(builder, TokenSet.create(JSTokenTypes.STATIC_KEYWORD));
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void parseReferenceList(final PsiBuilder builder) {
+        final IElementType tokenType = builder.getTokenType();
+        LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
+        final PsiBuilder.Marker referenceList = builder.mark();
+        builder.advanceLexer();
+
+        if (getExpressionParsing().parseSimpleExpression(builder)) {
+            while (builder.getTokenType() == JSTokenTypes.COMMA) {
+                builder.advanceLexer();
+                if (!getExpressionParsing().parseSimpleExpression(builder)) {
+                    break;
+                }
+            }
+        }
+        referenceList.done(JSElementTypes.EXTENDS_LIST);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStrictParserBuilder.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStrictParserBuilder.java
index fd05746a..89e957ab 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStrictParserBuilder.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStrictParserBuilder.java
@@ -8,18 +8,16 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public class EcmaScriptStrictParserBuilder extends JavaScriptStrictParserBuilder
-{
-	public EcmaScriptStrictParserBuilder(PsiBuilder delegate)
-	{
-		super(delegate);
+public class EcmaScriptStrictParserBuilder extends JavaScriptStrictParserBuilder {
+    public EcmaScriptStrictParserBuilder(PsiBuilder delegate) {
+        super(delegate);
 
-		onlyInStrictMode(JSTokenTypes.IMPLEMENTS_KEYWORD);
-		onlyInStrictMode(JSTokenTypes.PACKAGE_KEYWORD);
-		onlyInStrictMode(JSTokenTypes.PUBLIC_KEYWORD);
-		onlyInStrictMode(JSTokenTypes.PRIVATE_KEYWORD);
-		onlyInStrictMode(JSTokenTypes.PROTECTED_KEYWORD);
-		onlyInStrictMode(JSTokenTypes.INTERFACE_KEYWORD);
-		onlyInStrictMode(JSTokenTypes.STATIC_KEYWORD);
-	}
+        onlyInStrictMode(JSTokenTypes.IMPLEMENTS_KEYWORD);
+        onlyInStrictMode(JSTokenTypes.PACKAGE_KEYWORD);
+        onlyInStrictMode(JSTokenTypes.PUBLIC_KEYWORD);
+        onlyInStrictMode(JSTokenTypes.PRIVATE_KEYWORD);
+        onlyInStrictMode(JSTokenTypes.PROTECTED_KEYWORD);
+        onlyInStrictMode(JSTokenTypes.INTERFACE_KEYWORD);
+        onlyInStrictMode(JSTokenTypes.STATIC_KEYWORD);
+    }
 }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
index f3e084fb..b08e4b56 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
@@ -19,34 +19,29 @@
 @Deprecated
 @DeprecationInfo("This language version was dropped. We keep it only for history, many options may not supported")
 @ExtensionImpl
-public class EcmaScript4JavaScriptVersion extends BaseJavaScriptLanguageVersion
-{
-	private final DialectOptionHolder myDialectOptionHolder = new DialectOptionHolder(true, false);
+public class EcmaScript4JavaScriptVersion extends BaseJavaScriptLanguageVersion {
+    private final DialectOptionHolder myDialectOptionHolder = new DialectOptionHolder(true, false);
 
-	public EcmaScript4JavaScriptVersion()
-	{
-		super("ECMA4");
-		addFeature(JavaScriptFeature.CLASS);
-	}
+    public EcmaScript4JavaScriptVersion() {
+        super("ECMA4");
+        addFeature(JavaScriptFeature.CLASS);
+    }
 
-	@Nonnull
-	@Override
-	public PsiParser createParser()
-	{
-		return new EcmaScript4Parser();
-	}
+    @Nonnull
+    @Override
+    public PsiParser createParser() {
+        return new EcmaScript4Parser();
+    }
 
-	@Nonnull
-	@Override
-	public JSHighlighter getSyntaxHighlighter()
-	{
-		return new JSHighlighter(myDialectOptionHolder);
-	}
+    @Nonnull
+    @Override
+    public JSHighlighter getSyntaxHighlighter() {
+        return new JSHighlighter(myDialectOptionHolder);
+    }
 
-	@Nonnull
-	@Override
-	public Lexer createLexer()
-	{
-		return new JavaScriptParsingFlexLexer(myDialectOptionHolder);
-	}
+    @Nonnull
+    @Override
+    public Lexer createLexer() {
+        return new JavaScriptParsingFlexLexer(myDialectOptionHolder);
+    }
 }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
index 91610b67..4bddc76c 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
@@ -13,199 +13,166 @@
  * @author VISTALL
  * @since 24.08.14
  */
-public class EcmaScript4ExpressionParsing extends ExpressionParsing
-{
-	public EcmaScript4ExpressionParsing(JavaScriptParsingContext context)
-	{
-		super(context);
-	}
-
-	@Override
-	protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		boolean isNew;
-
-		final IElementType type = builder.getTokenType();
-
-		if(type == JSTokenTypes.NEW_KEYWORD)
-		{
-			isNew = true;
-			final boolean isfunction = parseNewExpression(builder);
-
-			if(isfunction)
-			{
-				expr.done(JSElementTypes.NEW_EXPRESSION);
-				if(builder.getTokenType() != JSTokenTypes.LPAR)
-				{
-					return true;
-				}
-				expr = expr.precede();
-				isNew = false;
-			}
-		}
-		else
-		{
-			isNew = false;
-			if(!parsePrimaryExpression(builder))
-			{
-				expr.drop();
-				return false;
-			}
-		}
-
-		boolean currentlyAllowCallSyntax = allowCallSyntax && (type != JSTokenTypes.LBRACE && type != JSTokenTypes.LBRACKET);
-
-		while(true)
-		{
-			IElementType tokenType = builder.getTokenType();
-			if(tokenType == JSTokenTypes.DOT || (tokenType == JSTokenTypes.COLON_COLON || tokenType == JSTokenTypes.DOT_DOT))
-			{
-				currentlyAllowCallSyntax = allowCallSyntax;
-				builder.advanceLexer();
-
-				if(builder.getTokenType() == JSTokenTypes.AT)
-				{
-					builder.advanceLexer();
-				}
-
-				tokenType = builder.getTokenType();
-
-				if(tokenType == JSTokenTypes.LT)
-				{
-					parseGenericSignature(builder);
-					expr.done(JSElementTypes.REFERENCE_EXPRESSION);
-					expr = expr.precede();
-					continue;
-				}
-
-				if(tokenType == JSTokenTypes.LBRACKET || tokenType == JSTokenTypes.LPAR)
-				{
-					continue;
-				}
-
-				if(tokenType == JSTokenTypes.ANY_IDENTIFIER || isIdentifierToken(builder, tokenType))
-				{
-					builder.advanceLexer();
-				}
-				else
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName());
-				}
-
-				expr.done(JSElementTypes.REFERENCE_EXPRESSION);
-				expr = expr.precede();
-			}
-			else if(tokenType == JSTokenTypes.LBRACKET)
-			{
-				builder.advanceLexer();
-				parseExpression(builder);
-				checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
-				expr.done(JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION);
-				expr = expr.precede();
-			}
-			else if(currentlyAllowCallSyntax && tokenType == JSTokenTypes.LPAR)
-			{
-				parseArgumentList(builder);
-				expr.done(isNew ? JSElementTypes.NEW_EXPRESSION : JSElementTypes.CALL_EXPRESSION);
-				expr = expr.precede();
-				isNew = false;
-			}
-			else
-			{
-				if(isNew)
-				{
-					expr.done(JSElementTypes.NEW_EXPRESSION);
-				}
-				else
-				{
-					expr.drop();
-				}
-				break;
-			}
-		}
-
-		return true;
-	}
-
-	@Override
-	public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, TokenSet separatorsSet)
-	{
-		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
-		{
-			return false;
-		}
-		PsiBuilder.Marker expr = builder.mark();
-		buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
-		boolean hasGenerics = false;
-
-		while(separatorsSet.contains(builder.getTokenType()))
-		{
-			boolean stop = false;
-			builder.advanceLexer();
-
-			final IElementType tokenType = builder.getTokenType();
-			if(tokenType == JSTokenTypes.ANY_IDENTIFIER && allowStar)
-			{
-				builder.advanceLexer();
-				stop = true;
-			}
-			else if(tokenType == JSTokenTypes.LT)
-			{
-				parseGenericSignature(builder);
-				stop = true;
-				hasGenerics = true;
-			}
-			else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.IDENTIFIER && JSTokenTypes.IDENTIFIER_TOKENS_SET
-					.contains(tokenType)))
-			{
-				builder.advanceLexer(); // TODO: allow any keyword
-			}
-			else
-			{
-				checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName());
-			}
-			expr.done(JSElementTypes.REFERENCE_EXPRESSION);
-			expr = expr.precede();
-
-			if(stop)
-			{
-				break;
-			}
-		}
-
-		if(!hasGenerics && builder.getTokenType() == JSTokenTypes.LT)
-		{
-			parseGenericSignature(builder);
-			expr.done(JSElementTypes.REFERENCE_EXPRESSION);
-		}
-		else
-		{
-			expr.drop();
-		}
-		return true;
-	}
-
-	@Override
-	public boolean tryParseType(final PsiBuilder builder)
-	{
-		if(builder.getTokenType() == JSTokenTypes.COLON)
-		{
-			builder.advanceLexer();
-
-			return parseType(builder);
-		}
-
-		return false;
-	}
-
-	private void parseGenericSignature(final PsiBuilder builder)
-	{
-		assert builder.getTokenType() == JSTokenTypes.LT;
-		PsiBuilder.Marker genericTypeSignature = builder.mark();
-		builder.advanceLexer();
-		parseType(builder);
-		checkMatches(builder, JSTokenTypes.GT, JavaScriptLocalize.javascriptParserMessageExpectedLt());
-		genericTypeSignature.done(JSElementTypes.GENERIC_SIGNATURE);
-	}
+public class EcmaScript4ExpressionParsing extends ExpressionParsing {
+    public EcmaScript4ExpressionParsing(JavaScriptParsingContext context) {
+        super(context);
+    }
+
+    @Override
+    protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax) {
+        PsiBuilder.Marker expr = builder.mark();
+        boolean isNew;
+
+        final IElementType type = builder.getTokenType();
+
+        if (type == JSTokenTypes.NEW_KEYWORD) {
+            isNew = true;
+            final boolean isfunction = parseNewExpression(builder);
+
+            if (isfunction) {
+                expr.done(JSElementTypes.NEW_EXPRESSION);
+                if (builder.getTokenType() != JSTokenTypes.LPAR) {
+                    return true;
+                }
+                expr = expr.precede();
+                isNew = false;
+            }
+        }
+        else {
+            isNew = false;
+            if (!parsePrimaryExpression(builder)) {
+                expr.drop();
+                return false;
+            }
+        }
+
+        boolean currentlyAllowCallSyntax = allowCallSyntax && (type != JSTokenTypes.LBRACE && type != JSTokenTypes.LBRACKET);
+
+        while (true) {
+            IElementType tokenType = builder.getTokenType();
+            if (tokenType == JSTokenTypes.DOT || (tokenType == JSTokenTypes.COLON_COLON || tokenType == JSTokenTypes.DOT_DOT)) {
+                currentlyAllowCallSyntax = allowCallSyntax;
+                builder.advanceLexer();
+
+                if (builder.getTokenType() == JSTokenTypes.AT) {
+                    builder.advanceLexer();
+                }
+
+                tokenType = builder.getTokenType();
+
+                if (tokenType == JSTokenTypes.LT) {
+                    parseGenericSignature(builder);
+                    expr.done(JSElementTypes.REFERENCE_EXPRESSION);
+                    expr = expr.precede();
+                    continue;
+                }
+
+                if (tokenType == JSTokenTypes.LBRACKET || tokenType == JSTokenTypes.LPAR) {
+                    continue;
+                }
+
+                if (tokenType == JSTokenTypes.ANY_IDENTIFIER || isIdentifierToken(builder, tokenType)) {
+                    builder.advanceLexer();
+                }
+                else {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName());
+                }
+
+                expr.done(JSElementTypes.REFERENCE_EXPRESSION);
+                expr = expr.precede();
+            }
+            else if (tokenType == JSTokenTypes.LBRACKET) {
+                builder.advanceLexer();
+                parseExpression(builder);
+                checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
+                expr.done(JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION);
+                expr = expr.precede();
+            }
+            else if (currentlyAllowCallSyntax && tokenType == JSTokenTypes.LPAR) {
+                parseArgumentList(builder);
+                expr.done(isNew ? JSElementTypes.NEW_EXPRESSION : JSElementTypes.CALL_EXPRESSION);
+                expr = expr.precede();
+                isNew = false;
+            }
+            else {
+                if (isNew) {
+                    expr.done(JSElementTypes.NEW_EXPRESSION);
+                }
+                else {
+                    expr.drop();
+                }
+                break;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, TokenSet separatorsSet) {
+        if (!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType())) {
+            return false;
+        }
+        PsiBuilder.Marker expr = builder.mark();
+        buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
+        boolean hasGenerics = false;
+
+        while (separatorsSet.contains(builder.getTokenType())) {
+            boolean stop = false;
+            builder.advanceLexer();
+
+            final IElementType tokenType = builder.getTokenType();
+            if (tokenType == JSTokenTypes.ANY_IDENTIFIER && allowStar) {
+                builder.advanceLexer();
+                stop = true;
+            }
+            else if (tokenType == JSTokenTypes.LT) {
+                parseGenericSignature(builder);
+                stop = true;
+                hasGenerics = true;
+            }
+            else if (tokenType == JSTokenTypes.DEFAULT_KEYWORD
+                || (tokenType != JSTokenTypes.IDENTIFIER && JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(tokenType))) {
+                builder.advanceLexer(); // TODO: allow any keyword
+            }
+            else {
+                checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName());
+            }
+            expr.done(JSElementTypes.REFERENCE_EXPRESSION);
+            expr = expr.precede();
+
+            if (stop) {
+                break;
+            }
+        }
+
+        if (!hasGenerics && builder.getTokenType() == JSTokenTypes.LT) {
+            parseGenericSignature(builder);
+            expr.done(JSElementTypes.REFERENCE_EXPRESSION);
+        }
+        else {
+            expr.drop();
+        }
+        return true;
+    }
+
+    @Override
+    public boolean tryParseType(final PsiBuilder builder) {
+        if (builder.getTokenType() == JSTokenTypes.COLON) {
+            builder.advanceLexer();
+
+            return parseType(builder);
+        }
+
+        return false;
+    }
+
+    private void parseGenericSignature(final PsiBuilder builder) {
+        assert builder.getTokenType() == JSTokenTypes.LT;
+        PsiBuilder.Marker genericTypeSignature = builder.mark();
+        builder.advanceLexer();
+        parseType(builder);
+        checkMatches(builder, JSTokenTypes.GT, JavaScriptLocalize.javascriptParserMessageExpectedLt());
+        genericTypeSignature.done(JSElementTypes.GENERIC_SIGNATURE);
+    }
 }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
index d4abf341..9436a68f 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
@@ -12,183 +12,153 @@
  * @author VISTALL
  * @since 24.08.14
  */
-public class EcmaScript4FunctionParsing extends FunctionParsing
-{
-	public EcmaScript4FunctionParsing(JavaScriptParsingContext context)
-	{
-		super(context);
-	}
-
-	public void parseAttributeWithoutBrackets(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker attribute = builder.mark();
-		if (!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier()))
-		{
-			attribute.drop();
-			return;
-		}
-		parseAttributeBody(builder);
-		attribute.done(JSElementTypes.ATTRIBUTE);
-	}
-
-	void parseAttributesList(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker modifierList = builder.mark();
-
-		boolean seenNs = false;
-		boolean seenAnyAttributes = false;
-
-		try
-		{
-			boolean hasSomethingInAttrList = true;
-
-			while(hasSomethingInAttrList)
-			{
-				hasSomethingInAttrList = false;
-
-				while(builder.getTokenType() == JSTokenTypes.LBRACKET)
-				{
-					seenAnyAttributes = true;
-					PsiBuilder.Marker attribute = builder.mark();
-
-					builder.advanceLexer();
-
-					if (builder.eof() || (
-						!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier())
-							&& builder.getTokenType() != JSTokenTypes.RBRACKET
-					))
-					{
-						attribute.drop();
-						return;
-					}
-
-					while(builder.getTokenType() != JSTokenTypes.RBRACKET)
-					{
-						parseAttributeBody(builder);
-
-						if(builder.eof())
-						{
-							attribute.done(JSElementTypes.ATTRIBUTE);
-							builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
-							return;
-						}
-					}
-
-					builder.advanceLexer();
-					attribute.done(JSElementTypes.ATTRIBUTE);
-					hasSomethingInAttrList = true;
-				}
-
-				if(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD)
-				{
-					hasSomethingInAttrList = true;
-					getStatementParsing().parseIncludeDirective(builder);
-				}
-
-				if(builder.getTokenType() == JSTokenTypes.IDENTIFIER && !seenNs)
-				{
-					hasSomethingInAttrList = true;
-					seenNs = true;
-					PsiBuilder.Marker marker = builder.mark();
-					builder.advanceLexer();
-					marker.done(JSElementTypes.REFERENCE_EXPRESSION);
-				}
-
-				while(JSTokenTypes.MODIFIERS.contains(builder.getTokenType()))
-				{
-					seenAnyAttributes = true;
-					hasSomethingInAttrList = true;
-					builder.advanceLexer();
-				}
-
-				if(builder.eof())
-				{
-					return;
-				}
-			}
-		}
-		finally
-		{
-			final IElementType currentTokenType = builder.getTokenType();
-
-			if(seenNs &&
-					!seenAnyAttributes &&
-					(currentTokenType != JSTokenTypes.VAR_KEYWORD &&
-							currentTokenType != JSTokenTypes.FUNCTION_KEYWORD &&
-							currentTokenType != JSTokenTypes.CLASS_KEYWORD &&
-							currentTokenType != JSTokenTypes.INTERFACE_KEYWORD))
-			{
-				modifierList.drop();
-			}
-			else
-			{
-				modifierList.done(JSElementTypes.ATTRIBUTE_LIST);
-			}
-		}
-	}
-
-	private void parseAttributeBody(final PsiBuilder builder)
-	{
-		final boolean haveLParen = checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-		boolean hasName;
-
-		while(haveLParen)
-		{
-			PsiBuilder.Marker attributeNameValuePair;
-			hasName = builder.getTokenType() == JSTokenTypes.IDENTIFIER;
-
-			if(builder.getTokenType() == JSTokenTypes.COMMA)
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentiferOrValue());
-				break;
-			}
-			if(builder.getTokenType() == JSTokenTypes.RBRACKET)
-			{
-				break;
-			}
-
-			attributeNameValuePair = builder.mark();
-			builder.advanceLexer();
-
-			if(hasName && builder.getTokenType() != JSTokenTypes.COMMA && builder.getTokenType() != JSTokenTypes.RPAR)
-			{
-				checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual());
-
-				if(builder.getTokenType() != JSTokenTypes.COMMA && builder.getTokenType() != JSTokenTypes.RBRACKET && builder.getTokenType() !=
-						JSTokenTypes.RPAR)
-				{
-					builder.advanceLexer();
-				}
-				else
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedValue());
-				}
-			}
-
-			if(attributeNameValuePair != null)
-			{
-				attributeNameValuePair.done(JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR);
-			}
-			if(builder.getTokenType() != JSTokenTypes.COMMA)
-			{
-				break;
-			}
-			builder.advanceLexer();
-
-			if(builder.eof())
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-				return;
-			}
-		}
-
-		if (haveLParen)
-		{
-			checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-		}
-		else
-		{
-			builder.advanceLexer();
-		}
-	}
+public class EcmaScript4FunctionParsing extends FunctionParsing {
+    public EcmaScript4FunctionParsing(JavaScriptParsingContext context) {
+        super(context);
+    }
+
+    public void parseAttributeWithoutBrackets(final PsiBuilder builder) {
+        final PsiBuilder.Marker attribute = builder.mark();
+        if (!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier())) {
+            attribute.drop();
+            return;
+        }
+        parseAttributeBody(builder);
+        attribute.done(JSElementTypes.ATTRIBUTE);
+    }
+
+    void parseAttributesList(final PsiBuilder builder) {
+        final PsiBuilder.Marker modifierList = builder.mark();
+
+        boolean seenNs = false;
+        boolean seenAnyAttributes = false;
+
+        try {
+            boolean hasSomethingInAttrList = true;
+
+            while (hasSomethingInAttrList) {
+                hasSomethingInAttrList = false;
+
+                while (builder.getTokenType() == JSTokenTypes.LBRACKET) {
+                    seenAnyAttributes = true;
+                    PsiBuilder.Marker attribute = builder.mark();
+
+                    builder.advanceLexer();
+
+                    if (builder.eof() || (
+                        !checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier())
+                            && builder.getTokenType() != JSTokenTypes.RBRACKET
+                    )) {
+                        attribute.drop();
+                        return;
+                    }
+
+                    while (builder.getTokenType() != JSTokenTypes.RBRACKET) {
+                        parseAttributeBody(builder);
+
+                        if (builder.eof()) {
+                            attribute.done(JSElementTypes.ATTRIBUTE);
+                            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
+                            return;
+                        }
+                    }
+
+                    builder.advanceLexer();
+                    attribute.done(JSElementTypes.ATTRIBUTE);
+                    hasSomethingInAttrList = true;
+                }
+
+                if (builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD) {
+                    hasSomethingInAttrList = true;
+                    getStatementParsing().parseIncludeDirective(builder);
+                }
+
+                if (builder.getTokenType() == JSTokenTypes.IDENTIFIER && !seenNs) {
+                    hasSomethingInAttrList = true;
+                    seenNs = true;
+                    PsiBuilder.Marker marker = builder.mark();
+                    builder.advanceLexer();
+                    marker.done(JSElementTypes.REFERENCE_EXPRESSION);
+                }
+
+                while (JSTokenTypes.MODIFIERS.contains(builder.getTokenType())) {
+                    seenAnyAttributes = true;
+                    hasSomethingInAttrList = true;
+                    builder.advanceLexer();
+                }
+
+                if (builder.eof()) {
+                    return;
+                }
+            }
+        }
+        finally {
+            final IElementType currentTokenType = builder.getTokenType();
+
+            if (seenNs && !seenAnyAttributes
+                && currentTokenType != JSTokenTypes.VAR_KEYWORD
+                && currentTokenType != JSTokenTypes.FUNCTION_KEYWORD
+                && currentTokenType != JSTokenTypes.CLASS_KEYWORD
+                && currentTokenType != JSTokenTypes.INTERFACE_KEYWORD) {
+                modifierList.drop();
+            }
+            else {
+                modifierList.done(JSElementTypes.ATTRIBUTE_LIST);
+            }
+        }
+    }
+
+    private void parseAttributeBody(final PsiBuilder builder) {
+        final boolean haveLParen = checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+        boolean hasName;
+
+        while (haveLParen) {
+            PsiBuilder.Marker attributeNameValuePair;
+            hasName = builder.getTokenType() == JSTokenTypes.IDENTIFIER;
+
+            if (builder.getTokenType() == JSTokenTypes.COMMA) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentiferOrValue());
+                break;
+            }
+            if (builder.getTokenType() == JSTokenTypes.RBRACKET) {
+                break;
+            }
+
+            attributeNameValuePair = builder.mark();
+            builder.advanceLexer();
+
+            if (hasName && builder.getTokenType() != JSTokenTypes.COMMA && builder.getTokenType() != JSTokenTypes.RPAR) {
+                checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual());
+
+                if (builder.getTokenType() != JSTokenTypes.COMMA
+                    && builder.getTokenType() != JSTokenTypes.RBRACKET
+                    && builder.getTokenType() != JSTokenTypes.RPAR) {
+                    builder.advanceLexer();
+                }
+                else {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedValue());
+                }
+            }
+
+            if (attributeNameValuePair != null) {
+                attributeNameValuePair.done(JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR);
+            }
+            if (builder.getTokenType() != JSTokenTypes.COMMA) {
+                break;
+            }
+            builder.advanceLexer();
+
+            if (builder.eof()) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+                return;
+            }
+        }
+
+        if (haveLParen) {
+            checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+        }
+        else {
+            builder.advanceLexer();
+        }
+    }
 }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
index 5bd643de..44560b9a 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
@@ -9,12 +9,10 @@
  * @author VISTALL
  * @since 24.08.14
  */
-public class EcmaScript4Parser extends JavaScriptParser
-{
-	@Nonnull
-	@Override
-	public JavaScriptParsingContext createParsingContext()
-	{
-		return new EcmaScript4ParsingContext();
-	}
+public class EcmaScript4Parser extends JavaScriptParser {
+    @Nonnull
+    @Override
+    public JavaScriptParsingContext createParsingContext() {
+        return new EcmaScript4ParsingContext();
+    }
 }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
index 3533cd4f..18a97942 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
@@ -10,26 +10,22 @@
  * @author VISTALL
  * @since 24.08.14
  */
-public class EcmaScript4ParsingContext extends JavaScriptParsingContext
-{
-	@Nonnull
-	@Override
-	protected StatementParsing createStatementParsing()
-	{
-		return new EcmaScript4StatementParsing(this);
-	}
+public class EcmaScript4ParsingContext extends JavaScriptParsingContext {
+    @Nonnull
+    @Override
+    protected StatementParsing createStatementParsing() {
+        return new EcmaScript4StatementParsing(this);
+    }
 
-	@Nonnull
-	@Override
-	protected FunctionParsing createFunctionParsing()
-	{
-		return new EcmaScript4FunctionParsing(this);
-	}
+    @Nonnull
+    @Override
+    protected FunctionParsing createFunctionParsing() {
+        return new EcmaScript4FunctionParsing(this);
+    }
 
-	@Nonnull
-	@Override
-	protected ExpressionParsing createExpressionParsing()
-	{
-		return new EcmaScript4ExpressionParsing(this);
-	}
+    @Nonnull
+    @Override
+    protected ExpressionParsing createExpressionParsing() {
+        return new EcmaScript4ExpressionParsing(this);
+    }
 }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
index df29143d..73530063 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
@@ -14,509 +14,414 @@
  * @author VISTALL
  * @since 24.08.14
  */
-public class EcmaScript4StatementParsing extends StatementParsing
-{
-	public static final Logger LOGGER = Logger.getInstance(EcmaScript4StatementParsing.class);
-
-	public EcmaScript4StatementParsing(EcmaScript4ParsingContext context)
-	{
-		super(context);
-	}
-
-	@Override
-	public EcmaScript4FunctionParsing getFunctionParsing()
-	{
-		return (EcmaScript4FunctionParsing) super.getFunctionParsing();
-	}
-
-	@Override
-	public void parseSourceElement(PsiBuilder builder)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		if(tokenType == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			getFunctionParsing().parseFunctionDeclaration(builder);
-		}
-		else if(tokenType == JSTokenTypes.PACKAGE_KEYWORD)
-		{
-			parsePackage(builder);
-		}
-		else if(tokenType == JSTokenTypes.AT)
-		{
-			builder.advanceLexer();
-			getFunctionParsing().parseAttributeWithoutBrackets(builder);
-		}
-		else
-		{
-			doParseStatement(builder, true);
-		}
-	}
-
-	@Override
-	protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
-	{
-		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName());
-			builder.advanceLexer();
-			return;
-		}
-
-		PsiBuilder.Marker var = builder.mark();
-
-		getExpressionParsing().parseQualifiedTypeName(builder, false);
-
-		getExpressionParsing().tryParseType(builder);
-
-		if(builder.getTokenType() == JSTokenTypes.EQ)
-		{
-			builder.advanceLexer();
-			if(allowIn)
-			{
-				if(!getExpressionParsing().parseAssignmentExpression(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-				}
-			}
-			else
-			{
-				if(!getExpressionParsing().parseAssignmentExpressionNoIn(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-				}
-			}
-		}
-		var.done(JSElementTypes.VARIABLE);
-	}
-
-	@Override
-	protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses)
-	{
-		final IElementType firstToken = builder.getTokenType();
-
-		if(firstToken == null)
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.LBRACE)
-		{
-			parseBlock(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.VAR_KEYWORD ||
-				firstToken == JSTokenTypes.CONST_KEYWORD ||
-				firstToken == JSTokenTypes.LET_KEYWORD)
-		{
-			parseVarStatement(builder, false);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.SEMICOLON)
-		{
-			parseEmptyStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.IF_KEYWORD)
-		{
-			parseIfStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.DO_KEYWORD ||
-				firstToken == JSTokenTypes.WHILE_KEYWORD ||
-				firstToken == JSTokenTypes.FOR_KEYWORD)
-		{
-			parseIterationStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.CONTINUE_KEYWORD)
-		{
-			parseContinueStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.BREAK_KEYWORD)
-		{
-			parseBreakStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.RETURN_KEYWORD)
-		{
-			parseReturnStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.WITH_KEYWORD)
-		{
-			parseWithStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.YIELD_KEYWORD)
-		{
-			parseYieldStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.LET_KEYWORD)
-		{
-			parseLetStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.SWITCH_KEYWORD)
-		{
-			parseSwitchStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.THROW_KEYWORD)
-		{
-			parseThrowStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.TRY_KEYWORD)
-		{
-			parseTryStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.DEFAULT_KEYWORD)
-		{
-			parseDefaultNsStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			getFunctionParsing().parseFunctionDeclaration(builder);
-			return;
-		}
-
-		if(canHaveClasses)
-		{
-			if(firstToken == JSTokenTypes.IMPORT_KEYWORD)
-			{
-				parseImportStatement(builder);
-				return;
-			}
-
-			if((firstToken == JSTokenTypes.CLASS_KEYWORD || firstToken == JSTokenTypes.INTERFACE_KEYWORD))
-			{
-				parseClass(builder);
-				return;
-			}
-
-			if(firstToken == JSTokenTypes.USE_KEYWORD)
-			{
-				parseUseNamespaceDirective(builder);
-				return;
-			}
-
-			if(firstToken == JSTokenTypes.INCLUDE_KEYWORD)
-			{
-				parseIncludeDirective(builder);
-				return;
-			}
-
-			if(firstToken == JSTokenTypes.NAMESPACE_KEYWORD)
-			{
-				if(parseNamespaceNoMarker(builder, builder.mark()))
-				{
-					return;
-				}
-			}
-
-			if((JSTokenTypes.IDENTIFIER == firstToken ||
-					JSTokenTypes.MODIFIERS.contains(firstToken) ||
-					JSTokenTypes.LBRACKET == firstToken))
-			{
-				PsiBuilder.Marker marker = builder.mark();
-				getFunctionParsing().parseAttributesList(builder);
-
-				if(builder.eof())
-				{
-					marker.drop();
-					return;
-				}
-
-				final IElementType tokenType = builder.getTokenType();
-				if(tokenType == JSTokenTypes.FUNCTION_KEYWORD)
-				{
-					getFunctionParsing().parseFunctionNoMarker(builder, false, marker);
-					return;
-				}
-				else if(tokenType == JSTokenTypes.VAR_KEYWORD || tokenType == JSTokenTypes.CONST_KEYWORD)
-				{
-					parseVarStatementWithMarker(builder, false, marker);
-					return;
-				}
-				else if(tokenType == JSTokenTypes.NAMESPACE_KEYWORD)
-				{
-					if(parseNamespaceNoMarker(builder, marker))
-					{
-						return;
-					}
-					else
-					{
-						builder.advanceLexer();
-					}
-				}
-				else if(tokenType == JSTokenTypes.CLASS_KEYWORD || tokenType == JSTokenTypes.INTERFACE_KEYWORD)
-				{
-					parseClassNoMarker(builder, marker);
-					return;
-				}
-				else
-				{
-
-					if(firstToken == JSTokenTypes.IDENTIFIER)
-					{
-						marker.rollbackTo();
-					}
-					else if(JSTokenTypes.COLON_COLON == builder.getTokenType())
-					{
-						marker.rollbackTo();
-						if(parseExpressionStatement(builder))
-						{
-							return;
-						}
-					}
-					else
-					{
-						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionVarClassInterfaceNamespace());
-						marker.drop();
-					}
-				}
-			}
-		}
-
-		if(firstToken == JSTokenTypes.IDENTIFIER)
-		{
-			// Try labeled statement:
-			final PsiBuilder.Marker labeledStatement = builder.mark();
-			builder.advanceLexer();
-			if(builder.getTokenType() == JSTokenTypes.COLON)
-			{
-				builder.advanceLexer();
-				parseStatement(builder);
-				labeledStatement.done(JSElementTypes.LABELED_STATEMENT);
-				return;
-			}
-			else
-			{
-				labeledStatement.rollbackTo();
-			}
-		}
-
-		if(firstToken != JSTokenTypes.LBRACE && firstToken != JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			if(parseExpressionStatement(builder))
-			{
-				return;
-			}
-		}
-
-		builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement().get());
-		builder.advanceLexer();
-	}
-
-	private void parseDefaultNsStatement(final PsiBuilder builder)
-	{
-		EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.DEFAULT_KEYWORD);
-		final PsiBuilder.Marker marker = builder.mark();
-		builder.advanceLexer();
-
-		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER && "xml".equals(builder.getTokenText()))
-		{
-			builder.advanceLexer();
-
-			if (checkMatches(builder, JSTokenTypes.NAMESPACE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedNamespace()))
-			{
-				if (checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual()))
-				{
-					getExpressionParsing().parseExpression(builder);
-				}
-			}
-		}
-		else
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedXml());
-		}
-		marker.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
-	}
-
-
-	private void parseImportStatement(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker importStatement = builder.mark();
-		try
-		{
-			builder.advanceLexer();
-
-			final PsiBuilder.Marker nsAssignment = builder.mark();
-			if(!getExpressionParsing().parseQualifiedTypeName(builder, true))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
-				nsAssignment.drop();
-				return;
-			}
-
-			if(builder.getTokenType() == JSTokenTypes.EQ)
-			{
-				builder.advanceLexer();
-				if(!getExpressionParsing().parseQualifiedTypeName(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
-				}
-
-				nsAssignment.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
-			}
-			else
-			{
-				nsAssignment.drop();
-			}
-
-			checkForSemicolon(builder);
-		}
-		finally
-		{
-			importStatement.done(JSElementTypes.ES4_IMPORT_STATEMENT);
-		}
-	}
-
-	private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker useNSStatement)
-	{
-		EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NAMESPACE_KEYWORD);
-
-		builder.advanceLexer();
-		if(builder.getTokenType() == JSTokenTypes.LPAR)
-		{
-			useNSStatement.rollbackTo();
-			return false;
-		}
-
-		if(!getExpressionParsing().parseQualifiedTypeName(builder))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
-		}
-		if(builder.getTokenType() == JSTokenTypes.EQ)
-		{
-			builder.advanceLexer();
-			checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral());
-		}
-		checkForSemicolon(builder);
-		useNSStatement.done(JSElementTypes.NAMESPACE_DECLARATION);
-		return true;
-	}
-
-	private void parseUseNamespaceDirective(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker useNSStatement = builder.mark();
-		builder.advanceLexer();
-
-		if(builder.getTokenType() != JSTokenTypes.NAMESPACE_KEYWORD)
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNamespace());
-		}
-		else
-		{
-			builder.advanceLexer();
-
-			if(!getExpressionParsing().parseQualifiedTypeName(builder))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
-			}
-
-			while(builder.getTokenType() == JSTokenTypes.COMMA)
-			{
-				builder.advanceLexer();
-				if(!getExpressionParsing().parseQualifiedTypeName(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
-					break;
-				}
-			}
-		}
-		checkForSemicolon(builder);
-		useNSStatement.done(JSElementTypes.USE_NAMESPACE_DIRECTIVE);
-	}
-
-	private void parseClass(final PsiBuilder builder)
-	{
-		parseClassNoMarker(builder, builder.mark());
-	}
-
-	private void parseClassNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		EcmaScript4StatementParsing.LOGGER.assertTrue(JSTokenTypes.CLASS_KEYWORD == tokenType || JSTokenTypes.INTERFACE_KEYWORD == tokenType);
-
-		builder.advanceLexer();
-		if(!getExpressionParsing().parseQualifiedTypeName(builder))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.EXTENDS_KEYWORD)
-		{
-			parseReferenceList(builder);
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.IMPLEMENTS_KEYWORD)
-		{
-			parseReferenceList(builder);
-		}
-
-		parseBlockOrFunctionBody(builder, BlockType.PACKAGE_OR_CLASS_BODY);
-		clazz.done(JSElementTypes.CLASS);
-	}
-
-	private void parseReferenceList(final PsiBuilder builder)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		EcmaScript4StatementParsing.LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
-		final PsiBuilder.Marker referenceList = builder.mark();
-		builder.advanceLexer();
-
-		if(getExpressionParsing().parseQualifiedTypeName(builder))
-		{
-			while(builder.getTokenType() == JSTokenTypes.COMMA)
-			{
-				builder.advanceLexer();
-				if(!getExpressionParsing().parseQualifiedTypeName(builder))
-				{
-					break;
-				}
-			}
-		}
-		referenceList.done(tokenType == JSTokenTypes.EXTENDS_KEYWORD ? JSElementTypes.EXTENDS_LIST : JSElementTypes.IMPLEMENTS_LIST);
-	}
-
-	private void parsePackage(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker packageMarker = builder.mark();
-		builder.advanceLexer();
-		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-		{
-			getExpressionParsing().parseQualifiedTypeName(builder);
-		}
-
-		if(builder.getTokenType() != JSTokenTypes.LBRACE)
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNameOrLbrace());
-		}
-		else
-		{
-			parseBlockOrFunctionBody(builder, BlockType.PACKAGE_OR_CLASS_BODY);
-		}
-		packageMarker.done(JSElementTypes.PACKAGE_STATEMENT);
-	}
+public class EcmaScript4StatementParsing extends StatementParsing {
+    public static final Logger LOGGER = Logger.getInstance(EcmaScript4StatementParsing.class);
+
+    public EcmaScript4StatementParsing(EcmaScript4ParsingContext context) {
+        super(context);
+    }
+
+    @Override
+    public EcmaScript4FunctionParsing getFunctionParsing() {
+        return (EcmaScript4FunctionParsing)super.getFunctionParsing();
+    }
+
+    @Override
+    public void parseSourceElement(PsiBuilder builder) {
+        final IElementType tokenType = builder.getTokenType();
+        if (tokenType == JSTokenTypes.FUNCTION_KEYWORD) {
+            getFunctionParsing().parseFunctionDeclaration(builder);
+        }
+        else if (tokenType == JSTokenTypes.PACKAGE_KEYWORD) {
+            parsePackage(builder);
+        }
+        else if (tokenType == JSTokenTypes.AT) {
+            builder.advanceLexer();
+            getFunctionParsing().parseAttributeWithoutBrackets(builder);
+        }
+        else {
+            doParseStatement(builder, true);
+        }
+    }
+
+    @Override
+    protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn) {
+        if (!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType())) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName());
+            builder.advanceLexer();
+            return;
+        }
+
+        PsiBuilder.Marker var = builder.mark();
+
+        getExpressionParsing().parseQualifiedTypeName(builder, false);
+
+        getExpressionParsing().tryParseType(builder);
+
+        if (builder.getTokenType() == JSTokenTypes.EQ) {
+            builder.advanceLexer();
+            if (allowIn) {
+                if (!getExpressionParsing().parseAssignmentExpression(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+                }
+            }
+            else {
+                if (!getExpressionParsing().parseAssignmentExpressionNoIn(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+                }
+            }
+        }
+        var.done(JSElementTypes.VARIABLE);
+    }
+
+    @Override
+    protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses) {
+        final IElementType firstToken = builder.getTokenType();
+
+        if (firstToken == null) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.LBRACE) {
+            parseBlock(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.VAR_KEYWORD ||
+            firstToken == JSTokenTypes.CONST_KEYWORD ||
+            firstToken == JSTokenTypes.LET_KEYWORD) {
+            parseVarStatement(builder, false);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.SEMICOLON) {
+            parseEmptyStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.IF_KEYWORD) {
+            parseIfStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.DO_KEYWORD ||
+            firstToken == JSTokenTypes.WHILE_KEYWORD ||
+            firstToken == JSTokenTypes.FOR_KEYWORD) {
+            parseIterationStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.CONTINUE_KEYWORD) {
+            parseContinueStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.BREAK_KEYWORD) {
+            parseBreakStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.RETURN_KEYWORD) {
+            parseReturnStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.WITH_KEYWORD) {
+            parseWithStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.YIELD_KEYWORD) {
+            parseYieldStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.LET_KEYWORD) {
+            parseLetStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.SWITCH_KEYWORD) {
+            parseSwitchStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.THROW_KEYWORD) {
+            parseThrowStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.TRY_KEYWORD) {
+            parseTryStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.DEFAULT_KEYWORD) {
+            parseDefaultNsStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.FUNCTION_KEYWORD) {
+            getFunctionParsing().parseFunctionDeclaration(builder);
+            return;
+        }
+
+        if (canHaveClasses) {
+            if (firstToken == JSTokenTypes.IMPORT_KEYWORD) {
+                parseImportStatement(builder);
+                return;
+            }
+
+            if ((firstToken == JSTokenTypes.CLASS_KEYWORD || firstToken == JSTokenTypes.INTERFACE_KEYWORD)) {
+                parseClass(builder);
+                return;
+            }
+
+            if (firstToken == JSTokenTypes.USE_KEYWORD) {
+                parseUseNamespaceDirective(builder);
+                return;
+            }
+
+            if (firstToken == JSTokenTypes.INCLUDE_KEYWORD) {
+                parseIncludeDirective(builder);
+                return;
+            }
+
+            if (firstToken == JSTokenTypes.NAMESPACE_KEYWORD && parseNamespaceNoMarker(builder, builder.mark())) {
+                return;
+            }
+
+            if (JSTokenTypes.IDENTIFIER == firstToken
+                || JSTokenTypes.MODIFIERS.contains(firstToken)
+                || JSTokenTypes.LBRACKET == firstToken) {
+                PsiBuilder.Marker marker = builder.mark();
+                getFunctionParsing().parseAttributesList(builder);
+
+                if (builder.eof()) {
+                    marker.drop();
+                    return;
+                }
+
+                final IElementType tokenType = builder.getTokenType();
+                if (tokenType == JSTokenTypes.FUNCTION_KEYWORD) {
+                    getFunctionParsing().parseFunctionNoMarker(builder, false, marker);
+                    return;
+                }
+                else if (tokenType == JSTokenTypes.VAR_KEYWORD || tokenType == JSTokenTypes.CONST_KEYWORD) {
+                    parseVarStatementWithMarker(builder, false, marker);
+                    return;
+                }
+                else if (tokenType == JSTokenTypes.NAMESPACE_KEYWORD) {
+                    if (parseNamespaceNoMarker(builder, marker)) {
+                        return;
+                    }
+                    else {
+                        builder.advanceLexer();
+                    }
+                }
+                else if (tokenType == JSTokenTypes.CLASS_KEYWORD || tokenType == JSTokenTypes.INTERFACE_KEYWORD) {
+                    parseClassNoMarker(builder, marker);
+                    return;
+                }
+                else if (firstToken == JSTokenTypes.IDENTIFIER) {
+                    marker.rollbackTo();
+                }
+                else if (JSTokenTypes.COLON_COLON == builder.getTokenType()) {
+                    marker.rollbackTo();
+                    if (parseExpressionStatement(builder)) {
+                        return;
+                    }
+                }
+                else {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionVarClassInterfaceNamespace());
+                    marker.drop();
+                }
+            }
+        }
+
+        if (firstToken == JSTokenTypes.IDENTIFIER) {
+            // Try labeled statement:
+            final PsiBuilder.Marker labeledStatement = builder.mark();
+            builder.advanceLexer();
+            if (builder.getTokenType() == JSTokenTypes.COLON) {
+                builder.advanceLexer();
+                parseStatement(builder);
+                labeledStatement.done(JSElementTypes.LABELED_STATEMENT);
+                return;
+            }
+            else {
+                labeledStatement.rollbackTo();
+            }
+        }
+
+        if (firstToken != JSTokenTypes.LBRACE && firstToken != JSTokenTypes.FUNCTION_KEYWORD) {
+            if (parseExpressionStatement(builder)) {
+                return;
+            }
+        }
+
+        builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement().get());
+        builder.advanceLexer();
+    }
+
+    private void parseDefaultNsStatement(final PsiBuilder builder) {
+        EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.DEFAULT_KEYWORD);
+        final PsiBuilder.Marker marker = builder.mark();
+        builder.advanceLexer();
+
+        if (builder.getTokenType() == JSTokenTypes.IDENTIFIER && "xml".equals(builder.getTokenText())) {
+            builder.advanceLexer();
+
+            if (checkMatches(builder, JSTokenTypes.NAMESPACE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedNamespace())) {
+                if (checkMatches(builder, JSTokenTypes.EQ, JavaScriptLocalize.javascriptParserMessageExpectedEqual())) {
+                    getExpressionParsing().parseExpression(builder);
+                }
+            }
+        }
+        else {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedXml());
+        }
+        marker.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
+    }
+
+    private void parseImportStatement(final PsiBuilder builder) {
+        final PsiBuilder.Marker importStatement = builder.mark();
+        try {
+            builder.advanceLexer();
+
+            final PsiBuilder.Marker nsAssignment = builder.mark();
+            if (!getExpressionParsing().parseQualifiedTypeName(builder, true)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
+                nsAssignment.drop();
+                return;
+            }
+
+            if (builder.getTokenType() == JSTokenTypes.EQ) {
+                builder.advanceLexer();
+                if (!getExpressionParsing().parseQualifiedTypeName(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
+                }
+
+                nsAssignment.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
+            }
+            else {
+                nsAssignment.drop();
+            }
+
+            checkForSemicolon(builder);
+        }
+        finally {
+            importStatement.done(JSElementTypes.ES4_IMPORT_STATEMENT);
+        }
+    }
+
+    private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker useNSStatement) {
+        EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NAMESPACE_KEYWORD);
+
+        builder.advanceLexer();
+        if (builder.getTokenType() == JSTokenTypes.LPAR) {
+            useNSStatement.rollbackTo();
+            return false;
+        }
+
+        if (!getExpressionParsing().parseQualifiedTypeName(builder)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
+        }
+        if (builder.getTokenType() == JSTokenTypes.EQ) {
+            builder.advanceLexer();
+            checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral());
+        }
+        checkForSemicolon(builder);
+        useNSStatement.done(JSElementTypes.NAMESPACE_DECLARATION);
+        return true;
+    }
+
+    private void parseUseNamespaceDirective(final PsiBuilder builder) {
+        final PsiBuilder.Marker useNSStatement = builder.mark();
+        builder.advanceLexer();
+
+        if (builder.getTokenType() != JSTokenTypes.NAMESPACE_KEYWORD) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNamespace());
+        }
+        else {
+            builder.advanceLexer();
+
+            if (!getExpressionParsing().parseQualifiedTypeName(builder)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
+            }
+
+            while (builder.getTokenType() == JSTokenTypes.COMMA) {
+                builder.advanceLexer();
+                if (!getExpressionParsing().parseQualifiedTypeName(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
+                    break;
+                }
+            }
+        }
+        checkForSemicolon(builder);
+        useNSStatement.done(JSElementTypes.USE_NAMESPACE_DIRECTIVE);
+    }
+
+    private void parseClass(final PsiBuilder builder) {
+        parseClassNoMarker(builder, builder.mark());
+    }
+
+    private void parseClassNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz) {
+        final IElementType tokenType = builder.getTokenType();
+        EcmaScript4StatementParsing.LOGGER.assertTrue(
+            JSTokenTypes.CLASS_KEYWORD == tokenType || JSTokenTypes.INTERFACE_KEYWORD == tokenType
+        );
+
+        builder.advanceLexer();
+        if (!getExpressionParsing().parseQualifiedTypeName(builder)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.EXTENDS_KEYWORD) {
+            parseReferenceList(builder);
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.IMPLEMENTS_KEYWORD) {
+            parseReferenceList(builder);
+        }
+
+        parseBlockOrFunctionBody(builder, BlockType.PACKAGE_OR_CLASS_BODY);
+        clazz.done(JSElementTypes.CLASS);
+    }
+
+    private void parseReferenceList(final PsiBuilder builder) {
+        final IElementType tokenType = builder.getTokenType();
+        EcmaScript4StatementParsing.LOGGER.assertTrue(
+            tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD
+        );
+        final PsiBuilder.Marker referenceList = builder.mark();
+        builder.advanceLexer();
+
+        if (getExpressionParsing().parseQualifiedTypeName(builder)) {
+            while (builder.getTokenType() == JSTokenTypes.COMMA) {
+                builder.advanceLexer();
+                if (!getExpressionParsing().parseQualifiedTypeName(builder)) {
+                    break;
+                }
+            }
+        }
+        referenceList.done(tokenType == JSTokenTypes.EXTENDS_KEYWORD ? JSElementTypes.EXTENDS_LIST : JSElementTypes.IMPLEMENTS_LIST);
+    }
+
+    private void parsePackage(final PsiBuilder builder) {
+        final PsiBuilder.Marker packageMarker = builder.mark();
+        builder.advanceLexer();
+        if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+            getExpressionParsing().parseQualifiedTypeName(builder);
+        }
+
+        if (builder.getTokenType() != JSTokenTypes.LBRACE) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedNameOrLbrace());
+        }
+        else {
+            parseBlockOrFunctionBody(builder, BlockType.PACKAGE_OR_CLASS_BODY);
+        }
+        packageMarker.done(JSElementTypes.PACKAGE_STATEMENT);
+    }
 }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java b/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java
index 2e12821c..caf3803d 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java
@@ -4,8 +4,8 @@
  */
 module consulo.javascript.ecmascript4.impl
 {
-	requires transitive consulo.javascript.base.impl;
+    requires transitive consulo.javascript.base.impl;
 
-	exports consulo.javascript.ecmascript4.lang;
-	exports consulo.javascript.ecmascript4.lang.parsing;
+    exports consulo.javascript.ecmascript4.lang;
+    exports consulo.javascript.ecmascript4.lang.parsing;
 }
\ No newline at end of file

From a5849a396a822aa9614d3d64098c9936b2dc3534 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 22 Jul 2024 21:44:02 +0300
Subject: [PATCH 213/340] Code reformat using IJ4 code style (part 5).

---
 .../lang/EcmaScript10JavaScriptVersion.java   |  32 ++---
 .../lang/EcmaScript11JavaScriptVersion.java   |  34 +++--
 .../lang/EcmaScript12JavaScriptVersion.java   |  41 +++---
 .../ecmascript/lang/EcmaScriptFileType.java   |  85 ++++++-------
 .../lang/EcmaScriptFileTypeFactory.java       |  12 +-
 .../psi/ES6ExportDefaultAssignment.java       |   3 +-
 .../ecmascript/psi/ES6ImportDeclaration.java  |   3 +-
 .../ecmascript/psi/ES6ImportSpecifier.java    |   3 +-
 .../ecmascript/psi/ES6ImportedBinding.java    |   9 +-
 .../ecmascript/psi/ES6NamedImports.java       |   9 +-
 .../impl/ES6ExportDefaultAssignmentImpl.java  |  51 ++++----
 .../psi/impl/ES6ImportDeclarationImpl.java    |  45 ++++---
 .../psi/impl/ES6ImportSpecifierImpl.java      |  43 +++----
 .../psi/impl/ES6ImportedBindingImpl.java      | 105 ++++++++-------
 .../psi/impl/ES6NamedImportsImpl.java         |  58 ++++-----
 .../psi/impl/EcmaScript6ElementTypes.java     |  18 ++-
 .../resolve/EcmaScript6ResolveHelper.java     | 120 ++++++++----------
 .../JSXTagTreeHighlightingPassFactory.java    |  37 ++----
 .../JSXCreateFromTemplateHandler.java         |  30 ++---
 .../javascript/jsx/language/JSXFileType.java  |  81 ++++++------
 .../jsx/language/JSXFileTypeFactory.java      |  12 +-
 .../jsx/language/JSXJavaScriptVersion.java    |  39 +++---
 .../language/psi/impl/JSXmlTagReference.java  |  36 +++---
 .../impl/JSXmlTagReferenceContributor.java    |  39 +++---
 .../src/main/java/module-info.java            |  28 ++--
 25 files changed, 445 insertions(+), 528 deletions(-)

diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
index a2f42dc0..2baaabe4 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
@@ -10,24 +10,20 @@
  * @since 06/12/2021
  */
 @ExtensionImpl
-public class EcmaScript10JavaScriptVersion extends EcmaScript6JavaScriptVersion
-{
-	@Inject
-	public EcmaScript10JavaScriptVersion()
-	{
-		super("ECMASCRIPT_10");
-	}
+public class EcmaScript10JavaScriptVersion extends EcmaScript6JavaScriptVersion {
+    @Inject
+    public EcmaScript10JavaScriptVersion() {
+        super("ECMASCRIPT_10");
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "ECMAScript 10";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "ECMAScript 10";
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 1000;
-	}
+    @Override
+    public int getWeight() {
+        return 1000;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
index 6215b1e0..06f6e281 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
@@ -10,26 +10,22 @@
  * @since 06/12/2021
  */
 @ExtensionImpl
-public class EcmaScript11JavaScriptVersion extends EcmaScript6JavaScriptVersion
-{
-	@Inject
-	public EcmaScript11JavaScriptVersion()
-	{
-		super("ECMASCRIPT_11");
+public class EcmaScript11JavaScriptVersion extends EcmaScript6JavaScriptVersion {
+    @Inject
+    public EcmaScript11JavaScriptVersion() {
+        super("ECMASCRIPT_11");
 
-		addFeature(JavaScriptFeature.OPTIONAL_CHAINING_OPERATOR);
-	}
+        addFeature(JavaScriptFeature.OPTIONAL_CHAINING_OPERATOR);
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "ECMAScript 11";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "ECMAScript 11";
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 1100;
-	}
+    @Override
+    public int getWeight() {
+        return 1100;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
index 6931cd51..e6d5bc0c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
@@ -12,30 +12,25 @@
  * @since 06/12/2021
  */
 @ExtensionImpl
-public class EcmaScript12JavaScriptVersion extends EcmaScript6JavaScriptVersion implements DefaultJavaScriptVersion
-{
-	@Nonnull
-	public static EcmaScript12JavaScriptVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript12JavaScriptVersion.class);
-	}
+public class EcmaScript12JavaScriptVersion extends EcmaScript6JavaScriptVersion implements DefaultJavaScriptVersion {
+    @Nonnull
+    public static EcmaScript12JavaScriptVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript12JavaScriptVersion.class);
+    }
 
-	@Inject
-	public EcmaScript12JavaScriptVersion()
-	{
-		super("ECMASCRIPT_12");
-	}
+    @Inject
+    public EcmaScript12JavaScriptVersion() {
+        super("ECMASCRIPT_12");
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "ECMAScript 12";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "ECMAScript 12";
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 1200;
-	}
+    @Override
+    public int getWeight() {
+        return 1200;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
index 24eb3133..79e9e536 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
@@ -36,58 +36,49 @@
  * @author VISTALL
  * @since 23.12.13.
  */
-public class EcmaScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion
-{
-	public static final EcmaScriptFileType INSTANCE = new EcmaScriptFileType();
+public class EcmaScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion {
+    public static final EcmaScriptFileType INSTANCE = new EcmaScriptFileType();
 
-	private EcmaScriptFileType()
-	{
-		super(JavaScriptLanguage.INSTANCE);
-	}
+    private EcmaScriptFileType() {
+        super(JavaScriptLanguage.INSTANCE);
+    }
 
-	@Nonnull
-	@Override
-	public String getId()
-	{
-		return "ECMASCRIPT";
-	}
+    @Nonnull
+    @Override
+    public String getId() {
+        return "ECMASCRIPT";
+    }
 
-	@Nonnull
-	@Override
-	public LocalizeValue getDescription()
-	{
-		return LocalizeValue.localizeTODO("ECMAScript files");
-	}
+    @Nonnull
+    @Override
+    public LocalizeValue getDescription() {
+        return LocalizeValue.localizeTODO("ECMAScript files");
+    }
 
-	@Nonnull
-	@Override
-	public String getDefaultExtension()
-	{
-		return "es";
-	}
+    @Nonnull
+    @Override
+    public String getDefaultExtension() {
+        return "es";
+    }
 
-	@Nullable
-	@Override
-	public Image getIcon()
-	{
-		return JavaScriptIconGroup.ecmascript();
-	}
+    @Nullable
+    @Override
+    public Image getIcon() {
+        return JavaScriptIconGroup.ecmascript();
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
-	{
-		if(module == null)
-		{
-			return EcmaScript12JavaScriptVersion.getInstance();
-		}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
+        if (module == null) {
+            return EcmaScript12JavaScriptVersion.getInstance();
+        }
 
-		JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
-		if(extension != null)
-		{
-			return extension.getLanguageVersion();
-		}
-		return EcmaScript12JavaScriptVersion.getInstance();
-	}
+        JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
+        if (extension != null) {
+            return extension.getLanguageVersion();
+        }
+        return EcmaScript12JavaScriptVersion.getInstance();
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
index 561bdcef..2ae27109 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
@@ -11,11 +11,9 @@
  * @since 05.03.2015
  */
 @ExtensionImpl
-public class EcmaScriptFileTypeFactory extends FileTypeFactory
-{
-	@Override
-	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
-	{
-		consumer.consume(EcmaScriptFileType.INSTANCE, "es;js2");
-	}
+public class EcmaScriptFileTypeFactory extends FileTypeFactory {
+    @Override
+    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
+        consumer.consume(EcmaScriptFileType.INSTANCE, "es;js2");
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ExportDefaultAssignment.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ExportDefaultAssignment.java
index 3fd3ff17..001e62fc 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ExportDefaultAssignment.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ExportDefaultAssignment.java
@@ -6,6 +6,5 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public interface ES6ExportDefaultAssignment extends JSStatement
-{
+public interface ES6ExportDefaultAssignment extends JSStatement {
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportDeclaration.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportDeclaration.java
index 45afdd32..e62f8616 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportDeclaration.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportDeclaration.java
@@ -8,6 +8,5 @@
  *
  * import ...
  */
-public interface ES6ImportDeclaration extends JavaScriptImportStatementBase
-{
+public interface ES6ImportDeclaration extends JavaScriptImportStatementBase {
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportSpecifier.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportSpecifier.java
index 658ea9c5..9341ccc6 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportSpecifier.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportSpecifier.java
@@ -9,6 +9,5 @@
  *
  * import {import as importSpecifier} ...
  */
-public interface ES6ImportSpecifier extends JSElement, PsiNameIdentifierOwner
-{
+public interface ES6ImportSpecifier extends JSElement, PsiNameIdentifierOwner {
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
index 6351b677..de9c92ba 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
@@ -15,9 +15,8 @@
  * <p>
  * import * as util ...
  */
-public interface ES6ImportedBinding extends JSElement, PsiNameIdentifierOwner
-{
-	@Nullable
-	@RequiredReadAction
-	ES6ImportSpecifier getImportSpecifier();
+public interface ES6ImportedBinding extends JSElement, PsiNameIdentifierOwner {
+    @Nullable
+    @RequiredReadAction
+    ES6ImportSpecifier getImportSpecifier();
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
index 5bf95e50..52ad21e0 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
@@ -12,9 +12,8 @@
  * import { test } ...
  * .......^^^^^^^ named imports group
  */
-public interface ES6NamedImports extends JSElement
-{
-	@Nonnull
-	@RequiredReadAction
-	ES6ImportedBinding[] getBindings();
+public interface ES6NamedImports extends JSElement {
+    @Nonnull
+    @RequiredReadAction
+    ES6ImportedBinding[] getBindings();
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
index da3e1c29..c721f470 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
@@ -17,33 +17,32 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public class ES6ExportDefaultAssignmentImpl extends JSStatementImpl implements ES6ExportDefaultAssignment
-{
-	public ES6ExportDefaultAssignmentImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class ES6ExportDefaultAssignmentImpl extends JSStatementImpl implements ES6ExportDefaultAssignment {
+    public ES6ExportDefaultAssignmentImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@Nullable
-	public JSElement getElement()
-	{
-		return findChildByClass(JSClass.class);
-	}
+    @Nullable
+    public JSElement getElement() {
+        return findChildByClass(JSClass.class);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
-	{
-		JSElement element = getElement();
-		if(element != null && !element.processDeclarations(processor, state, lastParent, place))
-		{
-			return false;
-		}
-		return super.processDeclarations(processor, state, lastParent, place);
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        JSElement element = getElement();
+        if (element != null && !element.processDeclarations(processor, state, lastParent, place)) {
+            return false;
+        }
+        return super.processDeclarations(processor, state, lastParent, place);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
index ea19c28c..ef0d54d4 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
@@ -14,29 +14,28 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public class ES6ImportDeclarationImpl extends JSStatementImpl implements ES6ImportDeclaration
-{
-	public ES6ImportDeclarationImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class ES6ImportDeclarationImpl extends JSStatementImpl implements ES6ImportDeclaration {
+    public ES6ImportDeclarationImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
-	{
-		for(PsiElement child : getChildren())
-		{
-			if(!child.processDeclarations(processor, state, lastParent, place))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        for (PsiElement child : getChildren()) {
+            if (!child.processDeclarations(processor, state, lastParent, place)) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
index d2734fff..22fd511a 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
@@ -17,31 +17,26 @@
  * @author VISTALL
  * @since 2020-08-26
  */
-public class ES6ImportSpecifierImpl extends JSElementImpl implements ES6ImportSpecifier
-{
-	public ES6ImportSpecifierImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class ES6ImportSpecifierImpl extends JSElementImpl implements ES6ImportSpecifier {
+    public ES6ImportSpecifierImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		return findChildByType(JSTokenTypes.IDENTIFIER);
-	}
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        return findChildByType(JSTokenTypes.IDENTIFIER);
+    }
 
-	@RequiredWriteAction
-	@Override
-	public PsiElement setName(@Nonnull String s) throws IncorrectOperationException
-	{
-		return null;
-	}
+    @RequiredWriteAction
+    @Override
+    public PsiElement setName(@Nonnull String s) throws IncorrectOperationException {
+        return null;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
index f7d64c3b..70f5b3b2 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
@@ -20,66 +20,61 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public class ES6ImportedBindingImpl extends JSElementImpl implements ES6ImportedBinding
-{
-	public ES6ImportedBindingImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class ES6ImportedBindingImpl extends JSElementImpl implements ES6ImportedBinding {
+    public ES6ImportedBindingImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@RequiredReadAction
-	@Override
-	public String getName()
-	{
-		PsiElement nameIdentifier = getNameIdentifier();
-		return nameIdentifier == null ? null : nameIdentifier.getText();
-	}
+    @RequiredReadAction
+    @Override
+    public String getName() {
+        PsiElement nameIdentifier = getNameIdentifier();
+        return nameIdentifier == null ? null : nameIdentifier.getText();
+    }
 
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		ES6ImportSpecifier importSpecifier = getImportSpecifier();
-		if(importSpecifier != null)
-		{
-			return importSpecifier.getNameIdentifier();
-		}
-		return findChildByType(JSTokenTypes.IDENTIFIER);
-	}
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        ES6ImportSpecifier importSpecifier = getImportSpecifier();
+        if (importSpecifier != null) {
+            return importSpecifier.getNameIdentifier();
+        }
+        return findChildByType(JSTokenTypes.IDENTIFIER);
+    }
 
-	@RequiredReadAction
-	@Override
-	public int getTextOffset()
-	{
-		PsiElement nameIdentifier = getNameIdentifier();
-		return nameIdentifier == null ? super.getTextOffset() : nameIdentifier.getTextOffset();
-	}
+    @RequiredReadAction
+    @Override
+    public int getTextOffset() {
+        PsiElement nameIdentifier = getNameIdentifier();
+        return nameIdentifier == null ? super.getTextOffset() : nameIdentifier.getTextOffset();
+    }
 
-	@RequiredWriteAction
-	@Override
-	public PsiElement setName(@Nonnull String s) throws IncorrectOperationException
-	{
-		return null;
-	}
+    @RequiredWriteAction
+    @Override
+    public PsiElement setName(@Nonnull String s) throws IncorrectOperationException {
+        return null;
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
-	{
-		return processor.execute(this, state);
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        return processor.execute(this, state);
+    }
 
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public ES6ImportSpecifier getImportSpecifier()
-	{
-		return findChildByClass(ES6ImportSpecifier.class);
-	}
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public ES6ImportSpecifier getImportSpecifier() {
+        return findChildByClass(ES6ImportSpecifier.class);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
index 9dc3a191..04f126ac 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
@@ -16,37 +16,35 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public class ES6NamedImportsImpl extends JSElementImpl implements ES6NamedImports
-{
-	public ES6NamedImportsImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class ES6NamedImportsImpl extends JSElementImpl implements ES6NamedImports {
+    public ES6NamedImportsImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
-	{
-		for(PsiElement child : getChildren())
-		{
-			if(!child.processDeclarations(processor, state, lastParent, place))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        for (PsiElement child : getChildren()) {
+            if (!child.processDeclarations(processor, state, lastParent, place)) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public ES6ImportedBinding[] getBindings()
-	{
-		return findChildrenByClass(ES6ImportedBinding.class);
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public ES6ImportedBinding[] getBindings() {
+        return findChildrenByClass(ES6ImportedBinding.class);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/EcmaScript6ElementTypes.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/EcmaScript6ElementTypes.java
index c2ca4834..f9e96af8 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/EcmaScript6ElementTypes.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/EcmaScript6ElementTypes.java
@@ -8,15 +8,19 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public interface EcmaScript6ElementTypes
-{
-	IElementType EXPORT_DEFAULT_ASSIGMENT = new ElementTypeAsPsiFactory("EXPORT_DEFAULT_ASSIGMENT", JavaScriptLanguage.INSTANCE, ES6ExportDefaultAssignmentImpl::new);
+public interface EcmaScript6ElementTypes {
+    IElementType EXPORT_DEFAULT_ASSIGMENT =
+        new ElementTypeAsPsiFactory("EXPORT_DEFAULT_ASSIGMENT", JavaScriptLanguage.INSTANCE, ES6ExportDefaultAssignmentImpl::new);
 
-	IElementType IMPORT_DECLARATION = new ElementTypeAsPsiFactory("IMPORT_DECLARATION", JavaScriptLanguage.INSTANCE, ES6ImportDeclarationImpl::new);
+    IElementType IMPORT_DECLARATION =
+        new ElementTypeAsPsiFactory("IMPORT_DECLARATION", JavaScriptLanguage.INSTANCE, ES6ImportDeclarationImpl::new);
 
-	IElementType IMPORTED_BINDING = new ElementTypeAsPsiFactory("IMPORTED_BINDING", JavaScriptLanguage.INSTANCE, ES6ImportedBindingImpl::new);
+    IElementType IMPORTED_BINDING =
+        new ElementTypeAsPsiFactory("IMPORTED_BINDING", JavaScriptLanguage.INSTANCE, ES6ImportedBindingImpl::new);
 
-	IElementType NAMED_IMPORTS = new ElementTypeAsPsiFactory("NAMED_IMPORTS", JavaScriptLanguage.INSTANCE, ES6NamedImportsImpl::new);
+    IElementType NAMED_IMPORTS =
+        new ElementTypeAsPsiFactory("NAMED_IMPORTS", JavaScriptLanguage.INSTANCE, ES6NamedImportsImpl::new);
 
-	IElementType IMPORT_SPECIFIER = new ElementTypeAsPsiFactory("IMPORT_SPECIFIER", JavaScriptLanguage.INSTANCE, ES6ImportSpecifierImpl::new);
+    IElementType IMPORT_SPECIFIER =
+        new ElementTypeAsPsiFactory("IMPORT_SPECIFIER", JavaScriptLanguage.INSTANCE, ES6ImportSpecifierImpl::new);
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
index 0dbfa943..1c29d353 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
@@ -23,77 +23,69 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public class EcmaScript6ResolveHelper extends ResolveHelper
-{
-	public static final ResolveHelper INSTANCE = new EcmaScript6ResolveHelper();
+public class EcmaScript6ResolveHelper extends ResolveHelper {
+    public static final ResolveHelper INSTANCE = new EcmaScript6ResolveHelper();
 
-	private static class ImportProcessor extends BaseScopeProcessor
-	{
-		private final String myReferencedName;
-		private JSImportedElementResolveResult myResult;
+    private static class ImportProcessor extends BaseScopeProcessor {
+        private final String myReferencedName;
+        private JSImportedElementResolveResult myResult;
 
-		public ImportProcessor(String referencedName)
-		{
-			myReferencedName = referencedName;
-		}
+        public ImportProcessor(String referencedName) {
+            myReferencedName = referencedName;
+        }
 
-		@Override
-		public boolean execute(@Nonnull PsiElement psiElement, ResolveState resolveState)
-		{
-			if(psiElement instanceof ES6ImportedBinding && myReferencedName.equals(((ES6ImportedBinding) psiElement).getName()))
-			{
-				myResult = new JSImportedElementResolveResult(myReferencedName, psiElement, PsiTreeUtil.getParentOfType(psiElement, ES6ImportDeclaration.class));
-				return false;
-			}
-			return true;
-		}
-	}
+        @Override
+        public boolean execute(@Nonnull PsiElement psiElement, ResolveState resolveState) {
+            if (psiElement instanceof ES6ImportedBinding es6ImportedBinding && myReferencedName.equals(es6ImportedBinding.getName())) {
+                myResult = new JSImportedElementResolveResult(
+                    myReferencedName,
+                    psiElement,
+                    PsiTreeUtil.getParentOfType(psiElement, ES6ImportDeclaration.class)
+                );
+                return false;
+            }
+            return true;
+        }
+    }
 
-	@Nullable
-	@Override
-	public JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull String referencedName, PsiNamedElement parent)
-	{
-		ImportProcessor processor = new ImportProcessor(referencedName);
+    @Nullable
+    @Override
+    public JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull String referencedName, PsiNamedElement parent) {
+        ImportProcessor processor = new ImportProcessor(referencedName);
 
-		PsiFile containingFile = parent.getContainingFile();
-		if(containingFile instanceof JSFile)
-		{
-			ES6ImportDeclaration[] childrenOfType = PsiTreeUtil.getChildrenOfType(containingFile, ES6ImportDeclaration.class);
-			if(childrenOfType == null)
-			{
-				return null;
-			}
+        PsiFile containingFile = parent.getContainingFile();
+        if (containingFile instanceof JSFile) {
+            ES6ImportDeclaration[] childrenOfType = PsiTreeUtil.getChildrenOfType(containingFile, ES6ImportDeclaration.class);
+            if (childrenOfType == null) {
+                return null;
+            }
 
-			for(ES6ImportDeclaration declaration : childrenOfType)
-			{
-				if(!declaration.processDeclarations(processor, ResolveState.initial(), declaration, parent))
-				{
-					break;
-				}
-			}
-		}
+            for (ES6ImportDeclaration declaration : childrenOfType) {
+                if (!declaration.processDeclarations(processor, ResolveState.initial(), declaration, parent)) {
+                    break;
+                }
+            }
+        }
 
-		return processor.myResult;
-	}
+        return processor.myResult;
+    }
 
-	@Override
-	public boolean execute(ResolveProcessor resolveProcessor, PsiElement element, ResolveState state)
-	{
-		if(element instanceof ES6ImportedBinding && Comparing.equal(((ES6ImportedBinding) element).getName(), resolveProcessor.getName()))
-		{
-			return true;
-		}
-		return false;
-	}
+    @Override
+    public boolean execute(ResolveProcessor resolveProcessor, PsiElement element, ResolveState state) {
+        if (element instanceof ES6ImportedBinding es6ImportedBinding
+            && Comparing.equal(es6ImportedBinding.getName(), resolveProcessor.getName())) {
+            return true;
+        }
+        return false;
+    }
 
-	@RequiredReadAction
-	@Override
-	public boolean isResolveTo(JSReferenceExpressionImpl expression, PsiElement element)
-	{
-		if(element instanceof ES6ImportedBinding && Comparing.equal(expression.getReferencedName(), ((ES6ImportedBinding) element).getName()))
-		{
-			return true;
-		}
-		return super.isResolveTo(expression, element);
-	}
+    @RequiredReadAction
+    @Override
+    public boolean isResolveTo(JSReferenceExpressionImpl expression, PsiElement element) {
+        if (element instanceof ES6ImportedBinding es6ImportedBinding
+            && Comparing.equal(expression.getReferencedName(), es6ImportedBinding.getName())) {
+            return true;
+        }
+        return super.isResolveTo(expression, element);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
index d7e72f19..46947a8a 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
@@ -17,29 +17,20 @@
  * @since 2019-12-15
  */
 @ExtensionImpl
-public class JSXTagTreeHighlightingPassFactory implements TextEditorHighlightingPassFactory
-{
-	@Override
-	public void register(@Nonnull Registrar registrar)
-	{
-		registrar.registerTextEditorHighlightingPass(this, new int[]{Pass.UPDATE_ALL}, null, false, -1);
-	}
-
-	@Override
-	public TextEditorHighlightingPass createHighlightingPass(@Nonnull final PsiFile file, @Nonnull final Editor editor)
-	{
-		if(editor.isOneLineMode())
-		{
-			return null;
-		}
-
-		if(!(editor instanceof EditorEx) || !(file.getLanguageVersion() instanceof JSXJavaScriptVersion))
-		{
-			return null;
-		}
-
-		return new XmlTagTreeHighlightingPass(file, (EditorEx) editor);
-	}
+public class JSXTagTreeHighlightingPassFactory implements TextEditorHighlightingPassFactory {
+    @Override
+    public void register(@Nonnull Registrar registrar) {
+        registrar.registerTextEditorHighlightingPass(this, new int[]{Pass.UPDATE_ALL}, null, false, -1);
+    }
+
+    @Override
+    public TextEditorHighlightingPass createHighlightingPass(@Nonnull final PsiFile file, @Nonnull final Editor editor) {
+        if (editor.isOneLineMode() || !(editor instanceof EditorEx) || !(file.getLanguageVersion() instanceof JSXJavaScriptVersion)) {
+            return null;
+        }
+
+        return new XmlTagTreeHighlightingPass(file, (EditorEx)editor);
+    }
 }
 
 
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
index 84b25056..d1b90062 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
@@ -12,22 +12,18 @@
  * @since 2019-12-17
  */
 @ExtensionImpl
-public class JSXCreateFromTemplateHandler implements CreateFromTemplateHandler
-{
-	@Override
-	public boolean handlesTemplate(FileTemplate template)
-	{
-		return template.getExtension().equals(JavaScriptFileType.INSTANCE.getDefaultExtension());
-	}
+public class JSXCreateFromTemplateHandler implements CreateFromTemplateHandler {
+    @Override
+    public boolean handlesTemplate(FileTemplate template) {
+        return template.getExtension().equals(JavaScriptFileType.INSTANCE.getDefaultExtension());
+    }
 
-	@Nonnull
-	@Override
-	public String checkAppendExtension(String fileName, FileTemplate template)
-	{
-		if(fileName.endsWith("." + JSXFileType.INSTANCE.getDefaultExtension()))
-		{
-			return fileName;
-		}
-		return CreateFromTemplateHandler.super.checkAppendExtension(fileName, template);
-	}
+    @Nonnull
+    @Override
+    public String checkAppendExtension(String fileName, FileTemplate template) {
+        if (fileName.endsWith("." + JSXFileType.INSTANCE.getDefaultExtension())) {
+            return fileName;
+        }
+        return CreateFromTemplateHandler.super.checkAppendExtension(fileName, template);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
index df836de1..eea40447 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
@@ -18,48 +18,41 @@
  * @author VISTALL
  * @since 2019-12-16
  */
-public class JSXFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion
-{
-	public static final JSXFileType INSTANCE = new JSXFileType();
-
-	private JSXFileType()
-	{
-		super(JavaScriptLanguage.INSTANCE);
-	}
-
-	@Nonnull
-	@Override
-	public String getId()
-	{
-		return "JSX";
-	}
-
-	@Nonnull
-	@Override
-	public LocalizeValue getDescription()
-	{
-		return LocalizeValue.localizeTODO("JSX files");
-	}
-
-	@Nonnull
-	@Override
-	public String getDefaultExtension()
-	{
-		return "jsx";
-	}
-
-	@Nullable
-	@Override
-	public Image getIcon()
-	{
-		return JavaScriptIconGroup.jsx();
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
-	{
-		return JSXJavaScriptVersion.getInstance();
-	}
+public class JSXFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion {
+    public static final JSXFileType INSTANCE = new JSXFileType();
+
+    private JSXFileType() {
+        super(JavaScriptLanguage.INSTANCE);
+    }
+
+    @Nonnull
+    @Override
+    public String getId() {
+        return "JSX";
+    }
+
+    @Nonnull
+    @Override
+    public LocalizeValue getDescription() {
+        return LocalizeValue.localizeTODO("JSX files");
+    }
+
+    @Nonnull
+    @Override
+    public String getDefaultExtension() {
+        return "jsx";
+    }
+
+    @Nullable
+    @Override
+    public Image getIcon() {
+        return JavaScriptIconGroup.jsx();
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
+        return JSXJavaScriptVersion.getInstance();
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
index 944d87af..3db5b739 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
@@ -11,11 +11,9 @@
  * @since 2019-12-16
  */
 @ExtensionImpl
-public class JSXFileTypeFactory extends FileTypeFactory
-{
-	@Override
-	public void createFileTypes(@Nonnull FileTypeConsumer fileTypeConsumer)
-	{
-		fileTypeConsumer.consume(JSXFileType.INSTANCE);
-	}
+public class JSXFileTypeFactory extends FileTypeFactory {
+    @Override
+    public void createFileTypes(@Nonnull FileTypeConsumer fileTypeConsumer) {
+        fileTypeConsumer.consume(JSXFileType.INSTANCE);
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
index f835371c..ffd168ab 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
@@ -10,29 +10,24 @@
  * @since 2019-12-16
  */
 @ExtensionImpl
-public class JSXJavaScriptVersion extends EcmaScript6JavaScriptVersion
-{
-	@Nonnull
-	public static EcmaScript6JavaScriptVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(JSXJavaScriptVersion.class);
-	}
+public class JSXJavaScriptVersion extends EcmaScript6JavaScriptVersion {
+    @Nonnull
+    public static EcmaScript6JavaScriptVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(JSXJavaScriptVersion.class);
+    }
 
-	public JSXJavaScriptVersion()
-	{
-		super("JSX");
-	}
+    public JSXJavaScriptVersion() {
+        super("JSX");
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 60;
-	}
+    @Override
+    public int getWeight() {
+        return 60;
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "JSX";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "JSX";
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
index 15d371f5..0cb87032 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
@@ -11,26 +11,22 @@
  * @author VISTALL
  * @since 2019-12-17
  */
-public class JSXmlTagReference extends PsiReferenceBase<PsiElement>
-{
-	public JSXmlTagReference(@Nonnull PsiElement element)
-	{
-		super(element);
-	}
+public class JSXmlTagReference extends PsiReferenceBase<PsiElement> {
+    public JSXmlTagReference(@Nonnull PsiElement element) {
+        super(element);
+    }
 
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiElement resolve()
-	{
-		return null;
-	}
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement resolve() {
+        return null;
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public Object[] getVariants()
-	{
-		return new Object[0];
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public Object[] getVariants() {
+        return new Object[0];
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
index a1de075d..7b441d58 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
@@ -15,33 +15,28 @@
  * @since 2019-12-17
  */
 @ExtensionImpl
-public class JSXmlTagReferenceContributor extends PsiReferenceContributor
-{
-	@Override
-	public void registerReferenceProviders(PsiReferenceRegistrar registrar)
-	{
-		registrar.registerReferenceProvider(StandardPatterns.psiElement(JSXmlLiteralExpressionImpl.class), new PsiReferenceProvider()
-		{
-			@Nonnull
-			@Override
-			public PsiReference[] getReferencesByElement(@Nonnull PsiElement psiElement, @Nonnull ProcessingContext processingContext)
-			{
-				return PsiReference.EMPTY_ARRAY;
-				// TODO 
+public class JSXmlTagReferenceContributor extends PsiReferenceContributor {
+    @Override
+    public void registerReferenceProviders(PsiReferenceRegistrar registrar) {
+        registrar.registerReferenceProvider(StandardPatterns.psiElement(JSXmlLiteralExpressionImpl.class), new PsiReferenceProvider() {
+            @Nonnull
+            @Override
+            public PsiReference[] getReferencesByElement(@Nonnull PsiElement psiElement, @Nonnull ProcessingContext processingContext) {
+                return PsiReference.EMPTY_ARRAY;
+                // TODO
 //				ASTNode[] children = psiElement.getNode().getChildren(TokenSet.create(JSTokenTypes.XML_NAME));
 //				if(children.length == 0)
 //				{
 //					return PsiReference.EMPTY_ARRAY;
 //				}
 //				return Arrays.stream(children).map(node -> new JSXmlTagReference(node.getPsi())).toArray(PsiReference[]::new);
-			}
-		});
-	}
+            }
+        });
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/module-info.java b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
index 938bdbfb..e2368115 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
@@ -4,21 +4,21 @@
  */
 module consulo.javascript.ecmascript.impl
 {
-	requires transitive consulo.javascript.base.impl;
+    requires transitive consulo.javascript.base.impl;
 
-	requires consulo.language.editor.impl;
+    requires consulo.language.editor.impl;
 
-	requires com.intellij.xml;
+    requires com.intellij.xml;
 
-	exports consulo.javascript.ecmascript.codeInsight;
-	exports consulo.javascript.ecmascript.codeInsight.quickFixes;
-	exports consulo.javascript.ecmascript.completion;
-	exports consulo.javascript.ecmascript.lang;
-	exports consulo.javascript.ecmascript.lang.parsing;
-	exports consulo.javascript.ecmascript.psi;
-	exports consulo.javascript.ecmascript.psi.impl;
-	exports consulo.javascript.ecmascript.psi.impl.resolve;
-	exports consulo.javascript.jsx.fileTemplate;
-	exports consulo.javascript.jsx.language;
-	exports consulo.javascript.jsx.language.psi.impl;
+    exports consulo.javascript.ecmascript.codeInsight;
+    exports consulo.javascript.ecmascript.codeInsight.quickFixes;
+    exports consulo.javascript.ecmascript.completion;
+    exports consulo.javascript.ecmascript.lang;
+    exports consulo.javascript.ecmascript.lang.parsing;
+    exports consulo.javascript.ecmascript.psi;
+    exports consulo.javascript.ecmascript.psi.impl;
+    exports consulo.javascript.ecmascript.psi.impl.resolve;
+    exports consulo.javascript.jsx.fileTemplate;
+    exports consulo.javascript.jsx.language;
+    exports consulo.javascript.jsx.language.psi.impl;
 }
\ No newline at end of file

From d8589984fb6e40a1bc80011680afe8fca3043530 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Tue, 23 Jul 2024 15:29:36 +0300
Subject: [PATCH 214/340] Code reformat using IJ4 code style (part 6).

---
 inspections/src/main/java/module-info.java    |   13 +-
 .../src/main/java/module-info.java            |    3 +-
 .../src/main/java/module-info.java            |    3 +-
 .../src/main/java/module-info.java            |    3 +-
 .../lang/JavaScript16LanguageVersion.java     |   64 +-
 .../lang/lexer/JavaScript16Lexer.java         | 2515 ++++++++--------
 .../src/main/java/module-info.java            |    9 +-
 .../lang/JavaScript17LanguageVersion.java     |   64 +-
 .../lang/lexer/JavaScript17Lexer.java         | 2558 +++++++++--------
 .../src/main/java/module-info.java            |    9 +-
 .../lang/JavaScript185LanguageVersion.java    |   64 +-
 .../lang/JavaScript18LanguageVersion.java     |   63 +-
 .../src/main/java/module-info.java            |    9 +-
 .../java/consulo/json/jom/JomElement.java     |    4 +-
 .../consulo/json/jom/JomFileDescriptor.java   |   29 +-
 .../java/consulo/json/jom/JomFileElement.java |   59 +-
 .../proxy/JomBadValueExpressionException.java |   29 +-
 .../jom/proxy/JomProxyInvocationHandler.java  |  103 +-
 .../json/jom/proxy/JomValueConverter.java     |  214 +-
 .../json/jom/proxy/impl/JomBooleanValue.java  |   57 +-
 .../jom/proxy/impl/JomCollectionValue.java    |  120 +-
 .../json/jom/proxy/impl/JomMapConverter.java  |   83 +-
 .../proxy/impl/JomNullableNumberValue.java    |   77 +-
 .../json/jom/proxy/impl/JomNumberValue.java   |   33 +-
 .../jom/proxy/impl/JomStringConverter.java    |   41 +-
 25 files changed, 3278 insertions(+), 2948 deletions(-)

diff --git a/inspections/src/main/java/module-info.java b/inspections/src/main/java/module-info.java
index 4e5439d1..a1043b5b 100644
--- a/inspections/src/main/java/module-info.java
+++ b/inspections/src/main/java/module-info.java
@@ -2,14 +2,13 @@
  * @author VISTALL
  * @since 29-Aug-22
  */
-open module consulo.javascript.inspections
-{
-	// TODO remove in future
-	requires java.desktop;
+open module consulo.javascript.inspections {
+    // TODO remove in future
+    requires java.desktop;
 
-	requires consulo.javascript.base.impl;
+    requires consulo.javascript.base.impl;
 
-	requires consulo.javascript.ecmascript.impl;
+    requires consulo.javascript.ecmascript.impl;
 
-	requires com.intellij.xml;
+    requires com.intellij.xml;
 }
\ No newline at end of file
diff --git a/lang-version-impl/actionscript-impl/src/main/java/module-info.java b/lang-version-impl/actionscript-impl/src/main/java/module-info.java
index 6968758f..04bc48a7 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/module-info.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/module-info.java
@@ -2,8 +2,7 @@
  * @author VISTALL
  * @since 23-Aug-22
  */
-module consulo.javascript.actionscript.impl
-{
+module consulo.javascript.actionscript.impl {
     requires transitive consulo.javascript.ecmascript4.impl;
 
     exports consulo.actionscript;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/module-info.java b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
index e2368115..eeda9ade 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
@@ -2,8 +2,7 @@
  * @author VISTALL
  * @since 23-Aug-22
  */
-module consulo.javascript.ecmascript.impl
-{
+module consulo.javascript.ecmascript.impl {
     requires transitive consulo.javascript.base.impl;
 
     requires consulo.language.editor.impl;
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java b/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java
index caf3803d..2d84b4f0 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/module-info.java
@@ -2,8 +2,7 @@
  * @author VISTALL
  * @since 23-Aug-22
  */
-module consulo.javascript.ecmascript4.impl
-{
+module consulo.javascript.ecmascript4.impl {
     requires transitive consulo.javascript.base.impl;
 
     exports consulo.javascript.ecmascript4.lang;
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
index e2bd9187..b6c51243 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
@@ -26,6 +26,7 @@
 import consulo.language.lexer.Lexer;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.function.Supplier;
 
 /**
@@ -33,45 +34,38 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScript16LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
-{
-	private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript16Lexer();
+public class JavaScript16LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
+    private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript16Lexer();
 
-	@Nonnull
-	public static JavaScript16LanguageVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript16LanguageVersion.class);
-	}
+    @Nonnull
+    public static JavaScript16LanguageVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript16LanguageVersion.class);
+    }
 
-	public JavaScript16LanguageVersion()
-	{
-		super("JAVASCRIPT_1_6");
-	}
+    public JavaScript16LanguageVersion() {
+        super("JAVASCRIPT_1_6");
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "JavaScript 1.6";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "JavaScript 1.6";
+    }
 
-	@Nonnull
-	@Override
-	public Lexer createLexer()
-	{
-		return ourLexerFactory.get();
-	}
+    @Nonnull
+    @Override
+    public Lexer createLexer() {
+        return ourLexerFactory.get();
+    }
 
-	@Nonnull
-	@Override
-	public SyntaxHighlighter getSyntaxHighlighter()
-	{
-		return new JavaScriptHighlighter(ourLexerFactory);
-	}
+    @Nonnull
+    @Override
+    public SyntaxHighlighter getSyntaxHighlighter() {
+        return new JavaScriptHighlighter(ourLexerFactory);
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 10;
-	}
+    @Override
+    public int getWeight() {
+        return 10;
+    }
 }
\ No newline at end of file
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java
index a700f38a..031c2052 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java
@@ -6,1202 +6,1415 @@
 import consulo.language.ast.IElementType;
 import com.intellij.lang.javascript.JSTokenTypes;
 
-
 /**
- * This class is a scanner generated by 
+ * This class is a scanner generated by
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.4
  * on 15.02.16 12:38 from the specification file
  * <tt>R:/_github.com/consulo/consulo-javascript/javascript16-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript16.flex</tt>
  */
 public class JavaScript16Lexer extends LexerBase {
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 16384;
-
-  /** lexical states */
-  public static final int DIV_OR_GT = 2;
-  public static final int YYINITIAL = 0;
-
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = { 
-     0,  0,  1, 1
-  };
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final String ZZ_CMAP_PACKED = 
-    "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\54"+
-    "\1\21\1\0\1\4\1\63\1\60\1\17\1\64\1\65\1\7\1\55"+
-    "\1\71\1\15\1\13\1\6\1\11\7\1\2\1\1\74\1\70\1\56"+
-    "\1\53\1\57\1\73\1\0\4\2\1\14\1\2\21\4\1\12\2\4"+
-    "\1\22\1\20\1\23\1\62\1\4\1\0\1\33\1\41\1\43\1\37"+
-    "\1\31\1\32\1\52\1\44\1\40\1\4\1\42\1\34\1\24\1\36"+
-    "\1\45\1\50\1\4\1\27\1\35\1\26\1\30\1\51\1\47\1\25"+
-    "\1\46\1\4\1\66\1\61\1\67\1\72\41\5\2\0\4\4\4\0"+
-    "\1\4\2\0\1\5\7\0\1\4\4\0\1\4\5\0\27\4\1\0"+
-    "\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4\16\0\5\4\11\0"+
-    "\1\4\21\0\130\5\5\0\23\5\12\0\1\4\13\0\1\4\1\0"+
-    "\3\4\1\0\1\4\1\0\24\4\1\0\54\4\1\0\46\4\1\0"+
-    "\5\4\4\0\202\4\1\0\4\5\3\0\105\4\1\0\46\4\2\0"+
-    "\2\4\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4\11\0"+
-    "\21\5\1\0\27\5\1\0\3\5\1\0\1\5\1\0\2\5\1\0"+
-    "\1\5\13\0\33\4\5\0\3\4\15\0\4\5\14\0\6\5\13\0"+
-    "\32\4\5\0\13\4\16\5\7\0\12\5\4\0\2\4\1\5\143\4"+
-    "\1\0\1\4\10\5\1\0\6\5\2\4\2\5\1\0\4\5\2\4"+
-    "\12\5\3\4\2\0\1\4\17\0\1\5\1\4\1\5\36\4\33\5"+
-    "\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0\3\5\66\4\2\0"+
-    "\1\5\1\4\20\5\2\0\1\4\4\5\3\0\12\4\2\5\2\0"+
-    "\12\5\21\0\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0"+
-    "\7\4\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0"+
-    "\2\5\2\0\3\5\11\0\1\5\4\0\2\4\1\0\3\4\2\5"+
-    "\2\0\12\5\4\4\15\0\3\5\1\0\6\4\4\0\2\4\2\0"+
-    "\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0\2\4\2\0"+
-    "\1\5\1\0\5\5\4\0\2\5\2\0\3\5\13\0\4\4\1\0"+
-    "\1\4\7\0\14\5\3\4\14\0\3\5\1\0\11\4\1\0\3\4"+
-    "\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5"+
-    "\1\4\10\5\1\0\3\5\1\0\3\5\2\0\1\4\17\0\2\4"+
-    "\2\5\2\0\12\5\1\0\1\4\17\0\3\5\1\0\10\4\2\0"+
-    "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0"+
-    "\1\5\1\4\6\5\3\0\2\5\2\0\3\5\10\0\2\5\4\0"+
-    "\2\4\1\0\3\4\4\0\12\5\1\0\1\4\20\0\1\5\1\4"+
-    "\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4"+
-    "\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4\1\0\3\4"+
-    "\4\0\5\5\3\0\3\5\1\0\4\5\11\0\1\5\17\0\11\5"+
-    "\11\0\1\4\7\0\3\5\1\0\10\4\1\0\3\4\1\0\27\4"+
-    "\1\0\12\4\1\0\5\4\4\0\7\5\1\0\3\5\1\0\4\5"+
-    "\7\0\2\5\11\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4"+
-    "\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4\2\0\1\5"+
-    "\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5\7\0\1\4"+
-    "\1\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4\1\0\3\4"+
-    "\1\0\27\4\1\0\20\4\4\0\6\5\2\0\3\5\1\0\4\5"+
-    "\11\0\1\5\10\0\2\4\4\0\12\5\22\0\2\5\1\0\22\4"+
-    "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5"+
-    "\4\0\6\5\1\0\1\5\1\0\10\5\22\0\2\5\15\0\60\4"+
-    "\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5\47\0\2\4"+
-    "\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4"+
-    "\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4"+
-    "\1\0\4\4\1\5\2\4\6\5\1\0\2\5\1\4\2\0\5\4"+
-    "\1\0\1\4\1\0\6\5\2\0\12\5\2\0\2\4\42\0\1\4"+
-    "\27\0\2\5\6\0\12\5\13\0\1\5\1\0\1\5\1\0\1\5"+
-    "\4\0\2\5\10\4\1\0\42\4\6\0\24\5\1\0\2\5\4\4"+
-    "\4\0\10\5\1\0\44\5\11\0\1\5\71\0\42\4\1\0\5\4"+
-    "\1\0\2\4\1\0\7\5\3\0\4\5\6\0\12\5\6\0\6\4"+
-    "\4\5\106\0\46\4\12\0\51\4\7\0\132\4\5\0\104\4\5\0"+
-    "\122\4\6\0\7\4\1\0\77\4\1\0\1\4\1\0\4\4\2\0"+
-    "\7\4\1\0\1\4\1\0\4\4\2\0\47\4\1\0\1\4\1\0"+
-    "\4\4\2\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0"+
-    "\1\4\1\0\4\4\2\0\7\4\1\0\7\4\1\0\27\4\1\0"+
-    "\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\47\4\1\0"+
-    "\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4\2\0\10\4\12\0"+
-    "\32\4\5\0\113\4\3\0\3\4\17\0\15\4\1\0\4\4\3\5"+
-    "\13\0\22\4\3\5\13\0\22\4\2\5\14\0\15\4\1\0\3\4"+
-    "\1\0\2\5\14\0\64\4\40\5\3\0\1\4\3\0\2\4\1\5"+
-    "\2\0\12\5\41\0\3\5\2\0\12\5\6\0\130\4\10\0\51\4"+
-    "\1\5\126\0\35\4\3\0\14\5\4\0\14\5\12\0\12\5\36\4"+
-    "\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0\132\4\6\0\26\4"+
-    "\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4\1\0\1\4"+
-    "\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4\1\0\7\4"+
-    "\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4\2\0\6\4"+
-    "\4\0\15\4\5\0\3\4\1\0\7\4\17\0\4\5\32\0\5\5"+
-    "\20\0\2\4\23\0\1\4\13\0\4\5\6\0\6\5\1\0\1\4"+
-    "\15\0\1\4\40\0\22\4\36\0\15\5\4\0\1\5\3\0\6\5"+
-    "\27\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4"+
-    "\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4\1\0\3\4"+
-    "\1\0\7\4\3\0\3\4\5\0\5\4\26\0\44\4\u0e81\0\3\4"+
-    "\31\0\11\4\6\5\1\0\5\4\2\0\5\4\4\0\126\4\2\0"+
-    "\2\5\2\0\3\4\1\0\137\4\5\0\50\4\4\0\136\4\21\0"+
-    "\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0"+
-    "\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4\5\0"+
-    "\1\4\1\5\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0"+
-    "\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0"+
-    "\66\4\50\0\15\4\3\0\20\5\20\0\4\5\17\0\2\4\30\0"+
-    "\3\4\31\0\1\4\6\0\5\4\1\0\207\4\2\0\1\5\4\0"+
-    "\1\4\13\0\12\5\7\0\32\4\4\0\1\4\1\0\32\4\12\0"+
-    "\132\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0\3\4\3\0"+
-    "\2\4\3\0\2\4\22\0\3\5\4\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\2\0\1\1\1\2\1\3\1\4\1\5\1\6\1\2"+
-    "\1\7\1\10\1\11\1\12\1\13\1\14\16\3\1\15"+
-    "\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25"+
-    "\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35"+
-    "\1\36\1\6\1\37\2\2\1\40\1\41\1\42\1\0"+
-    "\1\40\1\2\1\43\1\44\2\11\2\12\17\3\1\45"+
-    "\1\46\1\47\10\3\1\50\1\51\1\52\1\53\1\54"+
-    "\1\55\1\56\1\57\1\60\1\61\1\62\1\63\1\64"+
-    "\1\65\1\66\1\67\1\2\1\40\1\42\1\70\1\40"+
-    "\2\0\2\11\2\12\1\3\1\71\11\3\1\72\1\73"+
-    "\2\3\1\74\11\3\1\75\1\3\1\76\1\77\1\100"+
-    "\1\101\1\102\1\103\1\0\2\70\1\104\1\3\1\105"+
-    "\3\3\1\106\4\3\1\107\5\3\1\110\2\3\1\111"+
-    "\1\3\1\112\1\113\1\42\1\0\1\114\4\3\1\115"+
-    "\5\3\1\116\1\117\1\3\1\120\1\121\1\122\1\123"+
-    "\3\3\1\124\1\3\1\125\4\3\1\126\1\127\3\3"+
-    "\1\130\1\3\1\131\1\132\1\3\1\133";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[217];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\75\0\172\0\267\0\364\0\u0131\0\u016e\0\172"+
-    "\0\u01ab\0\u01e8\0\u0225\0\u0262\0\u029f\0\172\0\172\0\u02dc"+
-    "\0\u0319\0\u0356\0\u0393\0\u03d0\0\u040d\0\u044a\0\u0487\0\u04c4"+
-    "\0\u0501\0\u053e\0\u057b\0\u05b8\0\u05f5\0\u0632\0\u066f\0\u06ac"+
-    "\0\u06e9\0\u0726\0\u0763\0\u07a0\0\u07dd\0\172\0\172\0\172"+
-    "\0\172\0\172\0\172\0\172\0\172\0\172\0\u081a\0\u0857"+
-    "\0\u0894\0\u08d1\0\u090e\0\u094b\0\u0988\0\u09c5\0\u0a02\0\u0a3f"+
-    "\0\u0a7c\0\172\0\172\0\172\0\u0ab9\0\u0af6\0\172\0\u0b33"+
-    "\0\u0b70\0\u0bad\0\u0bea\0\u0c27\0\u0c64\0\u0ca1\0\u0cde\0\u0d1b"+
-    "\0\u0d58\0\u0d95\0\u0dd2\0\u0e0f\0\u0e4c\0\u0e89\0\364\0\364"+
-    "\0\u0ec6\0\u0f03\0\u0f40\0\u0f7d\0\u0fba\0\u0ff7\0\u1034\0\u1071"+
-    "\0\u10ae\0\u10eb\0\u1128\0\172\0\172\0\172\0\u1165\0\172"+
-    "\0\172\0\172\0\172\0\172\0\172\0\172\0\172\0\172"+
-    "\0\u11a2\0\u11df\0\u121c\0\u1259\0\u1296\0\u12d3\0\u1310\0\u134d"+
-    "\0\u138a\0\u13c7\0\u1404\0\u1441\0\u147e\0\364\0\u14bb\0\u14f8"+
-    "\0\u1535\0\u1572\0\u15af\0\u15ec\0\u1629\0\u1666\0\u16a3\0\364"+
-    "\0\364\0\u16e0\0\u171d\0\364\0\u175a\0\u1797\0\u17d4\0\u1811"+
-    "\0\u184e\0\u188b\0\u18c8\0\u1905\0\u1942\0\364\0\u197f\0\364"+
-    "\0\172\0\172\0\172\0\u19bc\0\172\0\u19f9\0\u1a36\0\172"+
-    "\0\364\0\u1a73\0\364\0\u1ab0\0\u1aed\0\u1b2a\0\364\0\u1b67"+
-    "\0\u1ba4\0\u1be1\0\u1c1e\0\364\0\u1c5b\0\u1c98\0\u1cd5\0\u1d12"+
-    "\0\u1d4f\0\364\0\u1d8c\0\u1dc9\0\364\0\u1e06\0\364\0\172"+
-    "\0\172\0\u1e43\0\364\0\u1e80\0\u1ebd\0\u1efa\0\u1f37\0\364"+
-    "\0\u1f74\0\u1fb1\0\u1fee\0\u202b\0\u2068\0\364\0\364\0\u20a5"+
-    "\0\364\0\364\0\364\0\364\0\u20e2\0\u211f\0\u215c\0\364"+
-    "\0\u2199\0\364\0\u21d6\0\u2213\0\u2250\0\u228d\0\364\0\364"+
-    "\0\u22ca\0\u2307\0\u2344\0\364\0\u2381\0\364\0\364\0\u23be"+
-    "\0\364";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[217];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
+    /**
+     * initial size of the lookahead buffer
+     */
+    private static final int ZZ_BUFFERSIZE = 16384;
+
+    /**
+     * lexical states
+     */
+    public static final int DIV_OR_GT = 2;
+    public static final int YYINITIAL = 0;
+
+    /**
+     * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+     * at the beginning of a line
+     * l is of the form l = 2*k, k a non negative integer
+     */
+    private static final int ZZ_LEXSTATE[] = {
+        0, 0, 1, 1
+    };
+
+    /**
+     * Translates characters to character classes
+     */
+    private static final String ZZ_CMAP_PACKED =
+        "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\54" +
+            "\1\21\1\0\1\4\1\63\1\60\1\17\1\64\1\65\1\7\1\55" +
+            "\1\71\1\15\1\13\1\6\1\11\7\1\2\1\1\74\1\70\1\56" +
+            "\1\53\1\57\1\73\1\0\4\2\1\14\1\2\21\4\1\12\2\4" +
+            "\1\22\1\20\1\23\1\62\1\4\1\0\1\33\1\41\1\43\1\37" +
+            "\1\31\1\32\1\52\1\44\1\40\1\4\1\42\1\34\1\24\1\36" +
+            "\1\45\1\50\1\4\1\27\1\35\1\26\1\30\1\51\1\47\1\25" +
+            "\1\46\1\4\1\66\1\61\1\67\1\72\41\5\2\0\4\4\4\0" +
+            "\1\4\2\0\1\5\7\0\1\4\4\0\1\4\5\0\27\4\1\0" +
+            "\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4\16\0\5\4\11\0" +
+            "\1\4\21\0\130\5\5\0\23\5\12\0\1\4\13\0\1\4\1\0" +
+            "\3\4\1\0\1\4\1\0\24\4\1\0\54\4\1\0\46\4\1\0" +
+            "\5\4\4\0\202\4\1\0\4\5\3\0\105\4\1\0\46\4\2\0" +
+            "\2\4\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4\11\0" +
+            "\21\5\1\0\27\5\1\0\3\5\1\0\1\5\1\0\2\5\1\0" +
+            "\1\5\13\0\33\4\5\0\3\4\15\0\4\5\14\0\6\5\13\0" +
+            "\32\4\5\0\13\4\16\5\7\0\12\5\4\0\2\4\1\5\143\4" +
+            "\1\0\1\4\10\5\1\0\6\5\2\4\2\5\1\0\4\5\2\4" +
+            "\12\5\3\4\2\0\1\4\17\0\1\5\1\4\1\5\36\4\33\5" +
+            "\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0\3\5\66\4\2\0" +
+            "\1\5\1\4\20\5\2\0\1\4\4\5\3\0\12\4\2\5\2\0" +
+            "\12\5\21\0\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0" +
+            "\7\4\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0" +
+            "\2\5\2\0\3\5\11\0\1\5\4\0\2\4\1\0\3\4\2\5" +
+            "\2\0\12\5\4\4\15\0\3\5\1\0\6\4\4\0\2\4\2\0" +
+            "\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0\2\4\2\0" +
+            "\1\5\1\0\5\5\4\0\2\5\2\0\3\5\13\0\4\4\1\0" +
+            "\1\4\7\0\14\5\3\4\14\0\3\5\1\0\11\4\1\0\3\4" +
+            "\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5" +
+            "\1\4\10\5\1\0\3\5\1\0\3\5\2\0\1\4\17\0\2\4" +
+            "\2\5\2\0\12\5\1\0\1\4\17\0\3\5\1\0\10\4\2\0" +
+            "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0" +
+            "\1\5\1\4\6\5\3\0\2\5\2\0\3\5\10\0\2\5\4\0" +
+            "\2\4\1\0\3\4\4\0\12\5\1\0\1\4\20\0\1\5\1\4" +
+            "\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4" +
+            "\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4\1\0\3\4" +
+            "\4\0\5\5\3\0\3\5\1\0\4\5\11\0\1\5\17\0\11\5" +
+            "\11\0\1\4\7\0\3\5\1\0\10\4\1\0\3\4\1\0\27\4" +
+            "\1\0\12\4\1\0\5\4\4\0\7\5\1\0\3\5\1\0\4\5" +
+            "\7\0\2\5\11\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4" +
+            "\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4\2\0\1\5" +
+            "\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5\7\0\1\4" +
+            "\1\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4\1\0\3\4" +
+            "\1\0\27\4\1\0\20\4\4\0\6\5\2\0\3\5\1\0\4\5" +
+            "\11\0\1\5\10\0\2\4\4\0\12\5\22\0\2\5\1\0\22\4" +
+            "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5" +
+            "\4\0\6\5\1\0\1\5\1\0\10\5\22\0\2\5\15\0\60\4" +
+            "\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5\47\0\2\4" +
+            "\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4" +
+            "\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4" +
+            "\1\0\4\4\1\5\2\4\6\5\1\0\2\5\1\4\2\0\5\4" +
+            "\1\0\1\4\1\0\6\5\2\0\12\5\2\0\2\4\42\0\1\4" +
+            "\27\0\2\5\6\0\12\5\13\0\1\5\1\0\1\5\1\0\1\5" +
+            "\4\0\2\5\10\4\1\0\42\4\6\0\24\5\1\0\2\5\4\4" +
+            "\4\0\10\5\1\0\44\5\11\0\1\5\71\0\42\4\1\0\5\4" +
+            "\1\0\2\4\1\0\7\5\3\0\4\5\6\0\12\5\6\0\6\4" +
+            "\4\5\106\0\46\4\12\0\51\4\7\0\132\4\5\0\104\4\5\0" +
+            "\122\4\6\0\7\4\1\0\77\4\1\0\1\4\1\0\4\4\2\0" +
+            "\7\4\1\0\1\4\1\0\4\4\2\0\47\4\1\0\1\4\1\0" +
+            "\4\4\2\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0" +
+            "\1\4\1\0\4\4\2\0\7\4\1\0\7\4\1\0\27\4\1\0" +
+            "\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\47\4\1\0" +
+            "\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4\2\0\10\4\12\0" +
+            "\32\4\5\0\113\4\3\0\3\4\17\0\15\4\1\0\4\4\3\5" +
+            "\13\0\22\4\3\5\13\0\22\4\2\5\14\0\15\4\1\0\3\4" +
+            "\1\0\2\5\14\0\64\4\40\5\3\0\1\4\3\0\2\4\1\5" +
+            "\2\0\12\5\41\0\3\5\2\0\12\5\6\0\130\4\10\0\51\4" +
+            "\1\5\126\0\35\4\3\0\14\5\4\0\14\5\12\0\12\5\36\4" +
+            "\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0\132\4\6\0\26\4" +
+            "\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4\1\0\1\4" +
+            "\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4\1\0\7\4" +
+            "\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4\2\0\6\4" +
+            "\4\0\15\4\5\0\3\4\1\0\7\4\17\0\4\5\32\0\5\5" +
+            "\20\0\2\4\23\0\1\4\13\0\4\5\6\0\6\5\1\0\1\4" +
+            "\15\0\1\4\40\0\22\4\36\0\15\5\4\0\1\5\3\0\6\5" +
+            "\27\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4" +
+            "\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4\1\0\3\4" +
+            "\1\0\7\4\3\0\3\4\5\0\5\4\26\0\44\4\u0e81\0\3\4" +
+            "\31\0\11\4\6\5\1\0\5\4\2\0\5\4\4\0\126\4\2\0" +
+            "\2\5\2\0\3\4\1\0\137\4\5\0\50\4\4\0\136\4\21\0" +
+            "\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0" +
+            "\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4\5\0" +
+            "\1\4\1\5\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0" +
+            "\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0" +
+            "\66\4\50\0\15\4\3\0\20\5\20\0\4\5\17\0\2\4\30\0" +
+            "\3\4\31\0\1\4\6\0\5\4\1\0\207\4\2\0\1\5\4\0" +
+            "\1\4\13\0\12\5\7\0\32\4\4\0\1\4\1\0\32\4\12\0" +
+            "\132\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0\3\4\3\0" +
+            "\2\4\3\0\2\4\22\0\3\5\4\0";
+
+    /**
+     * Translates characters to character classes
+     */
+    private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
+
+    /**
+     * Translates DFA states to action switch labels.
+     */
+    private static final int[] ZZ_ACTION = zzUnpackAction();
+
+    private static final String ZZ_ACTION_PACKED_0 =
+        "\2\0\1\1\1\2\1\3\1\4\1\5\1\6\1\2" +
+            "\1\7\1\10\1\11\1\12\1\13\1\14\16\3\1\15" +
+            "\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25" +
+            "\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35" +
+            "\1\36\1\6\1\37\2\2\1\40\1\41\1\42\1\0" +
+            "\1\40\1\2\1\43\1\44\2\11\2\12\17\3\1\45" +
+            "\1\46\1\47\10\3\1\50\1\51\1\52\1\53\1\54" +
+            "\1\55\1\56\1\57\1\60\1\61\1\62\1\63\1\64" +
+            "\1\65\1\66\1\67\1\2\1\40\1\42\1\70\1\40" +
+            "\2\0\2\11\2\12\1\3\1\71\11\3\1\72\1\73" +
+            "\2\3\1\74\11\3\1\75\1\3\1\76\1\77\1\100" +
+            "\1\101\1\102\1\103\1\0\2\70\1\104\1\3\1\105" +
+            "\3\3\1\106\4\3\1\107\5\3\1\110\2\3\1\111" +
+            "\1\3\1\112\1\113\1\42\1\0\1\114\4\3\1\115" +
+            "\5\3\1\116\1\117\1\3\1\120\1\121\1\122\1\123" +
+            "\3\3\1\124\1\3\1\125\4\3\1\126\1\127\3\3" +
+            "\1\130\1\3\1\131\1\132\1\3\1\133";
+
+    private static int[] zzUnpackAction() {
+        int[] result = new int[217];
+        int offset = 0;
+        offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+        return result;
     }
-    return j;
-  }
-
-  /** 
-   * The transition table of the DFA
-   */
-  private static final int [] ZZ_TRANS = zzUnpackTrans();
-
-  private static final String ZZ_TRANS_PACKED_0 =
-    "\1\3\1\4\1\5\1\6\1\5\1\3\1\7\1\10"+
-    "\1\6\1\11\1\5\1\12\1\5\1\13\1\6\1\14"+
-    "\1\3\1\15\1\16\1\17\2\5\1\20\1\21\1\22"+
-    "\1\23\1\24\2\5\1\25\1\26\1\27\1\30\1\31"+
-    "\1\5\1\32\3\5\1\33\1\5\1\34\1\35\1\36"+
-    "\1\37\1\40\1\3\1\41\1\42\1\43\1\44\1\45"+
-    "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55"+
-    "\1\56\1\3\1\4\1\5\1\6\1\5\1\3\1\57"+
-    "\1\60\1\6\1\11\1\5\1\12\1\5\1\13\1\6"+
-    "\1\14\1\3\1\15\1\16\1\17\2\5\1\20\1\21"+
-    "\1\22\1\23\1\24\2\5\1\25\1\26\1\27\1\30"+
-    "\1\31\1\5\1\32\3\5\1\33\1\5\1\34\1\35"+
-    "\1\36\1\37\1\40\1\61\1\41\1\42\1\43\1\44"+
-    "\1\45\1\46\1\47\1\50\1\51\1\52\1\53\1\54"+
-    "\1\55\1\56\76\0\1\4\7\0\1\4\1\0\1\62"+
-    "\1\63\14\0\1\63\44\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\27\5\25\0\1\6\4\0"+
-    "\1\6\5\0\1\6\56\0\6\64\1\65\1\66\1\0"+
-    "\5\64\1\0\1\64\1\67\1\64\1\70\52\64\1\0"+
-    "\1\4\7\0\1\4\1\71\1\62\1\63\10\0\1\71"+
-    "\3\0\1\63\44\0\1\62\7\0\1\62\100\0\1\72"+
-    "\35\0\1\73\21\0\10\14\1\0\5\14\1\0\1\74"+
-    "\1\75\54\14\10\15\1\0\5\15\1\0\1\15\1\76"+
-    "\1\77\53\15\1\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\3\5\1\100\14\5\1\101\1\5"+
-    "\1\102\4\5\23\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\5\5\1\103\21\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\12\5"+
-    "\1\104\14\5\23\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\10\5\1\105\16\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\4\5"+
-    "\1\106\2\5\1\107\4\5\1\110\4\5\1\111\5\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\112\15\5\1\113\3\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\4\5"+
-    "\1\114\1\115\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\5\5\1\116\13\5\1\117"+
-    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\6\5\1\120\3\5\1\121\14\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\3\5\1\122\23\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\7\5\1\123\11\5\1\124"+
-    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\125\3\5\1\126\6\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\7\5\1\127\11\5\1\130\5\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\131"+
-    "\21\5\75\0\1\132\74\0\1\133\74\0\1\134\1\0"+
-    "\1\135\72\0\1\136\3\0\1\137\70\0\1\140\4\0"+
-    "\1\141\67\0\1\142\5\0\1\143\66\0\1\144\74\0"+
-    "\1\145\27\0\1\65\1\66\43\0\1\146\74\0\1\147"+
-    "\74\0\1\150\2\0\1\151\17\0\1\62\7\0\1\62"+
-    "\2\0\1\63\14\0\1\63\44\0\1\152\7\0\1\152"+
-    "\3\0\1\152\37\0\1\152\17\0\6\64\1\153\1\64"+
-    "\1\0\5\64\1\0\1\64\1\67\1\64\1\70\52\64"+
-    "\10\65\1\0\5\65\1\0\56\65\7\154\1\155\65\154"+
-    "\10\64\1\0\5\64\1\0\56\64\6\70\1\156\1\70"+
-    "\1\157\5\70\1\157\1\70\1\160\2\70\1\64\51\70"+
-    "\1\0\2\71\6\0\1\71\2\0\1\71\14\0\3\71"+
-    "\3\0\1\71\1\0\1\71\1\0\1\71\31\0\3\14"+
-    "\1\161\4\14\1\162\64\14\3\15\1\163\4\15\1\164"+
-    "\64\15\1\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\4\5\1\165\15\5\1\166\4\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\3\5\1\167\10\5\1\170\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\24\5\1\171"+
-    "\2\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\2\5\1\172\24\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\13\5\1\173"+
-    "\13\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\11\5\1\174\15\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\175"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\10\5\1\176\16\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\177"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\3\5\1\200\23\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\201"+
-    "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\202\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\10\5\1\203"+
-    "\16\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\23\5\1\204\3\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\6\5\1\205"+
-    "\1\5\1\206\16\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\11\5\1\207\15\5\23\0"+
-    "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0"+
-    "\5\5\1\210\21\5\23\0\2\5\1\0\2\5\3\0"+
-    "\2\5\1\0\1\5\7\0\2\5\1\211\6\5\1\212"+
-    "\15\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\12\5\1\213\14\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\214"+
-    "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\215\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\3\5\1\216"+
-    "\23\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\217\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\220"+
-    "\24\5\75\0\1\221\74\0\1\222\74\0\1\223\3\0"+
-    "\1\224\70\0\1\225\22\0\1\152\7\0\1\152\107\0"+
-    "\2\153\12\0\1\153\11\0\1\153\22\0\7\154\1\226"+
-    "\65\154\6\227\1\230\1\155\65\227\23\157\1\64\2\156"+
-    "\12\157\1\156\11\157\1\156\45\157\1\64\51\157\10\70"+
-    "\1\157\5\70\1\157\4\70\1\64\51\70\3\14\1\161"+
-    "\4\14\1\162\6\14\1\74\1\75\64\14\1\0\6\14"+
-    "\1\74\1\75\54\14\3\15\1\163\4\15\1\164\7\15"+
-    "\1\76\1\77\63\15\1\0\7\15\1\76\1\77\53\15"+
-    "\1\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\231\21\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\21\5\1\232\5\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\11\5\1\233\15\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\234\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\4\5\1\235\22\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\236\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\237\21\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\17\5\1\240\7\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\11\5\1\241\15\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\7\5\1\242\17\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\243\24\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\10\5\1\244\16\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\7\5\1\245\17\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\246\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\247\24\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\7\5\1\250\17\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\17\5\1\251\7\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\5\5\1\252\21\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\253\6\5\1\254\15\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\20\5"+
-    "\1\255\6\5\23\0\2\5\1\0\2\5\3\0\2\5"+
-    "\1\0\1\5\7\0\10\5\1\256\16\5\23\0\2\5"+
-    "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\13\5"+
-    "\1\257\13\5\75\0\1\260\21\0\6\154\1\261\1\226"+
-    "\65\154\7\227\1\262\65\227\1\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\23\5\1\263\3\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\21\5\1\264\5\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\3\5\1\265\23\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\6\5\1\266\20\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\2\5\1\267\24\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\270\21\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\10\5\1\271\16\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\17\5\1\272\7\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\4\5\1\273\22\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\2\5\1\274\24\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\7\5\1\275\17\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\16\5\1\276\10\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\20\5\1\277\6\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\14\5\1\300\12\5\23\0\2\5\1\0\2\5"+
-    "\3\0\2\5\1\0\1\5\7\0\2\5\1\301\24\5"+
-    "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5"+
-    "\7\0\5\5\1\302\21\5\22\0\6\227\1\230\1\262"+
-    "\65\227\1\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\6\5\1\303\20\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\304"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\14\5\1\305\12\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\14\5\1\306"+
-    "\12\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\10\5\1\307\16\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\20\5\1\310"+
-    "\6\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\10\5\1\311\16\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\312"+
-    "\21\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\12\5\1\313\14\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\314"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\12\5\1\315\14\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\21\5\1\316"+
-    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\22\5\1\317\4\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\320"+
-    "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\17\5\1\321\7\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\4\5\1\322"+
-    "\22\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\5\5\1\323\21\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\324"+
-    "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\5\5\1\325\21\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\326"+
-    "\21\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\13\5\1\327\13\5\23\0\2\5\1\0"+
-    "\2\5\3\0\2\5\1\0\1\5\7\0\21\5\1\330"+
-    "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0"+
-    "\1\5\7\0\6\5\1\331\20\5\22\0";
-
-  private static int [] zzUnpackTrans() {
-    int [] result = new int[9211];
-    int offset = 0;
-    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackTrans(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do result[j++] = value; while (--count > 0);
+
+    private static int zzUnpackAction(String packed, int offset, int[] result) {
+        int i = 0;       /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            do result[j++] = value;
+            while (--count > 0);
+        }
+        return j;
     }
-    return j;
-  }
-
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-  private static final char[] EMPTY_BUFFER = new char[0];
-  private static final int YYEOF = -1;
-
-  /* error messages for the codes above */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\2\0\1\11\4\1\1\11\5\1\2\11\26\1\11\11"+
-    "\10\1\1\0\2\1\3\11\2\1\1\11\34\1\3\11"+
-    "\1\1\11\11\6\1\2\0\40\1\3\11\1\1\1\11"+
-    "\1\0\1\1\1\11\27\1\2\11\1\0\47\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[217];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
+
+
+    /**
+     * Translates a state to a row index in the transition table
+     */
+    private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
+
+    private static final String ZZ_ROWMAP_PACKED_0 =
+        "\0\0\0\75\0\172\0\267\0\364\0\u0131\0\u016e\0\172" +
+            "\0\u01ab\0\u01e8\0\u0225\0\u0262\0\u029f\0\172\0\172\0\u02dc" +
+            "\0\u0319\0\u0356\0\u0393\0\u03d0\0\u040d\0\u044a\0\u0487\0\u04c4" +
+            "\0\u0501\0\u053e\0\u057b\0\u05b8\0\u05f5\0\u0632\0\u066f\0\u06ac" +
+            "\0\u06e9\0\u0726\0\u0763\0\u07a0\0\u07dd\0\172\0\172\0\172" +
+            "\0\172\0\172\0\172\0\172\0\172\0\172\0\u081a\0\u0857" +
+            "\0\u0894\0\u08d1\0\u090e\0\u094b\0\u0988\0\u09c5\0\u0a02\0\u0a3f" +
+            "\0\u0a7c\0\172\0\172\0\172\0\u0ab9\0\u0af6\0\172\0\u0b33" +
+            "\0\u0b70\0\u0bad\0\u0bea\0\u0c27\0\u0c64\0\u0ca1\0\u0cde\0\u0d1b" +
+            "\0\u0d58\0\u0d95\0\u0dd2\0\u0e0f\0\u0e4c\0\u0e89\0\364\0\364" +
+            "\0\u0ec6\0\u0f03\0\u0f40\0\u0f7d\0\u0fba\0\u0ff7\0\u1034\0\u1071" +
+            "\0\u10ae\0\u10eb\0\u1128\0\172\0\172\0\172\0\u1165\0\172" +
+            "\0\172\0\172\0\172\0\172\0\172\0\172\0\172\0\172" +
+            "\0\u11a2\0\u11df\0\u121c\0\u1259\0\u1296\0\u12d3\0\u1310\0\u134d" +
+            "\0\u138a\0\u13c7\0\u1404\0\u1441\0\u147e\0\364\0\u14bb\0\u14f8" +
+            "\0\u1535\0\u1572\0\u15af\0\u15ec\0\u1629\0\u1666\0\u16a3\0\364" +
+            "\0\364\0\u16e0\0\u171d\0\364\0\u175a\0\u1797\0\u17d4\0\u1811" +
+            "\0\u184e\0\u188b\0\u18c8\0\u1905\0\u1942\0\364\0\u197f\0\364" +
+            "\0\172\0\172\0\172\0\u19bc\0\172\0\u19f9\0\u1a36\0\172" +
+            "\0\364\0\u1a73\0\364\0\u1ab0\0\u1aed\0\u1b2a\0\364\0\u1b67" +
+            "\0\u1ba4\0\u1be1\0\u1c1e\0\364\0\u1c5b\0\u1c98\0\u1cd5\0\u1d12" +
+            "\0\u1d4f\0\364\0\u1d8c\0\u1dc9\0\364\0\u1e06\0\364\0\172" +
+            "\0\172\0\u1e43\0\364\0\u1e80\0\u1ebd\0\u1efa\0\u1f37\0\364" +
+            "\0\u1f74\0\u1fb1\0\u1fee\0\u202b\0\u2068\0\364\0\364\0\u20a5" +
+            "\0\364\0\364\0\364\0\364\0\u20e2\0\u211f\0\u215c\0\364" +
+            "\0\u2199\0\364\0\u21d6\0\u2213\0\u2250\0\u228d\0\364\0\364" +
+            "\0\u22ca\0\u2307\0\u2344\0\364\0\u2381\0\364\0\364\0\u23be" +
+            "\0\364";
+
+    private static int[] zzUnpackRowMap() {
+        int[] result = new int[217];
+        int offset = 0;
+        offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+        return result;
     }
-    return j;
-  }
 
-  /** the current state of the DFA */
-  private int zzState;
+    private static int zzUnpackRowMap(String packed, int offset, int[] result) {
+        int i = 0;  /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int high = packed.charAt(i++) << 16;
+            result[j++] = high | packed.charAt(i++);
+        }
+        return j;
+    }
 
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
+    /**
+     * The transition table of the DFA
+     */
+    private static final int[] ZZ_TRANS = zzUnpackTrans();
+
+    private static final String ZZ_TRANS_PACKED_0 =
+        "\1\3\1\4\1\5\1\6\1\5\1\3\1\7\1\10" +
+            "\1\6\1\11\1\5\1\12\1\5\1\13\1\6\1\14" +
+            "\1\3\1\15\1\16\1\17\2\5\1\20\1\21\1\22" +
+            "\1\23\1\24\2\5\1\25\1\26\1\27\1\30\1\31" +
+            "\1\5\1\32\3\5\1\33\1\5\1\34\1\35\1\36" +
+            "\1\37\1\40\1\3\1\41\1\42\1\43\1\44\1\45" +
+            "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55" +
+            "\1\56\1\3\1\4\1\5\1\6\1\5\1\3\1\57" +
+            "\1\60\1\6\1\11\1\5\1\12\1\5\1\13\1\6" +
+            "\1\14\1\3\1\15\1\16\1\17\2\5\1\20\1\21" +
+            "\1\22\1\23\1\24\2\5\1\25\1\26\1\27\1\30" +
+            "\1\31\1\5\1\32\3\5\1\33\1\5\1\34\1\35" +
+            "\1\36\1\37\1\40\1\61\1\41\1\42\1\43\1\44" +
+            "\1\45\1\46\1\47\1\50\1\51\1\52\1\53\1\54" +
+            "\1\55\1\56\76\0\1\4\7\0\1\4\1\0\1\62" +
+            "\1\63\14\0\1\63\44\0\2\5\1\0\2\5\3\0" +
+            "\2\5\1\0\1\5\7\0\27\5\25\0\1\6\4\0" +
+            "\1\6\5\0\1\6\56\0\6\64\1\65\1\66\1\0" +
+            "\5\64\1\0\1\64\1\67\1\64\1\70\52\64\1\0" +
+            "\1\4\7\0\1\4\1\71\1\62\1\63\10\0\1\71" +
+            "\3\0\1\63\44\0\1\62\7\0\1\62\100\0\1\72" +
+            "\35\0\1\73\21\0\10\14\1\0\5\14\1\0\1\74" +
+            "\1\75\54\14\10\15\1\0\5\15\1\0\1\15\1\76" +
+            "\1\77\53\15\1\0\2\5\1\0\2\5\3\0\2\5" +
+            "\1\0\1\5\7\0\3\5\1\100\14\5\1\101\1\5" +
+            "\1\102\4\5\23\0\2\5\1\0\2\5\3\0\2\5" +
+            "\1\0\1\5\7\0\5\5\1\103\21\5\23\0\2\5" +
+            "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\12\5" +
+            "\1\104\14\5\23\0\2\5\1\0\2\5\3\0\2\5" +
+            "\1\0\1\5\7\0\10\5\1\105\16\5\23\0\2\5" +
+            "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\4\5" +
+            "\1\106\2\5\1\107\4\5\1\110\4\5\1\111\5\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\5\5\1\112\15\5\1\113\3\5\23\0\2\5" +
+            "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\4\5" +
+            "\1\114\1\115\21\5\23\0\2\5\1\0\2\5\3\0" +
+            "\2\5\1\0\1\5\7\0\5\5\1\116\13\5\1\117" +
+            "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\6\5\1\120\3\5\1\121\14\5\23\0" +
+            "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0" +
+            "\3\5\1\122\23\5\23\0\2\5\1\0\2\5\3\0" +
+            "\2\5\1\0\1\5\7\0\7\5\1\123\11\5\1\124" +
+            "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\14\5\1\125\3\5\1\126\6\5\23\0" +
+            "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0" +
+            "\7\5\1\127\11\5\1\130\5\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\131" +
+            "\21\5\75\0\1\132\74\0\1\133\74\0\1\134\1\0" +
+            "\1\135\72\0\1\136\3\0\1\137\70\0\1\140\4\0" +
+            "\1\141\67\0\1\142\5\0\1\143\66\0\1\144\74\0" +
+            "\1\145\27\0\1\65\1\66\43\0\1\146\74\0\1\147" +
+            "\74\0\1\150\2\0\1\151\17\0\1\62\7\0\1\62" +
+            "\2\0\1\63\14\0\1\63\44\0\1\152\7\0\1\152" +
+            "\3\0\1\152\37\0\1\152\17\0\6\64\1\153\1\64" +
+            "\1\0\5\64\1\0\1\64\1\67\1\64\1\70\52\64" +
+            "\10\65\1\0\5\65\1\0\56\65\7\154\1\155\65\154" +
+            "\10\64\1\0\5\64\1\0\56\64\6\70\1\156\1\70" +
+            "\1\157\5\70\1\157\1\70\1\160\2\70\1\64\51\70" +
+            "\1\0\2\71\6\0\1\71\2\0\1\71\14\0\3\71" +
+            "\3\0\1\71\1\0\1\71\1\0\1\71\31\0\3\14" +
+            "\1\161\4\14\1\162\64\14\3\15\1\163\4\15\1\164" +
+            "\64\15\1\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\4\5\1\165\15\5\1\166\4\5\23\0" +
+            "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0" +
+            "\3\5\1\167\10\5\1\170\12\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\24\5\1\171" +
+            "\2\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\2\5\1\172\24\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\13\5\1\173" +
+            "\13\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\11\5\1\174\15\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\175" +
+            "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\10\5\1\176\16\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\177" +
+            "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\3\5\1\200\23\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\201" +
+            "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\14\5\1\202\12\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\10\5\1\203" +
+            "\16\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\23\5\1\204\3\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\6\5\1\205" +
+            "\1\5\1\206\16\5\23\0\2\5\1\0\2\5\3\0" +
+            "\2\5\1\0\1\5\7\0\11\5\1\207\15\5\23\0" +
+            "\2\5\1\0\2\5\3\0\2\5\1\0\1\5\7\0" +
+            "\5\5\1\210\21\5\23\0\2\5\1\0\2\5\3\0" +
+            "\2\5\1\0\1\5\7\0\2\5\1\211\6\5\1\212" +
+            "\15\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\12\5\1\213\14\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\214" +
+            "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\14\5\1\215\12\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\3\5\1\216" +
+            "\23\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\14\5\1\217\12\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\220" +
+            "\24\5\75\0\1\221\74\0\1\222\74\0\1\223\3\0" +
+            "\1\224\70\0\1\225\22\0\1\152\7\0\1\152\107\0" +
+            "\2\153\12\0\1\153\11\0\1\153\22\0\7\154\1\226" +
+            "\65\154\6\227\1\230\1\155\65\227\23\157\1\64\2\156" +
+            "\12\157\1\156\11\157\1\156\45\157\1\64\51\157\10\70" +
+            "\1\157\5\70\1\157\4\70\1\64\51\70\3\14\1\161" +
+            "\4\14\1\162\6\14\1\74\1\75\64\14\1\0\6\14" +
+            "\1\74\1\75\54\14\3\15\1\163\4\15\1\164\7\15" +
+            "\1\76\1\77\63\15\1\0\7\15\1\76\1\77\53\15" +
+            "\1\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\5\5\1\231\21\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\21\5\1\232\5\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\11\5\1\233\15\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\5\5\1\234\21\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\4\5\1\235\22\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\5\5\1\236\21\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\5\5\1\237\21\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\17\5\1\240\7\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\11\5\1\241\15\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\7\5\1\242\17\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\2\5\1\243\24\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\10\5\1\244\16\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\7\5\1\245\17\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\5\5\1\246\21\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\2\5\1\247\24\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\7\5\1\250\17\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\17\5\1\251\7\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\5\5\1\252\21\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\2\5\1\253\6\5\1\254\15\5\23\0\2\5" +
+            "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\20\5" +
+            "\1\255\6\5\23\0\2\5\1\0\2\5\3\0\2\5" +
+            "\1\0\1\5\7\0\10\5\1\256\16\5\23\0\2\5" +
+            "\1\0\2\5\3\0\2\5\1\0\1\5\7\0\13\5" +
+            "\1\257\13\5\75\0\1\260\21\0\6\154\1\261\1\226" +
+            "\65\154\7\227\1\262\65\227\1\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\23\5\1\263\3\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\21\5\1\264\5\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\3\5\1\265\23\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\6\5\1\266\20\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\2\5\1\267\24\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\5\5\1\270\21\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\10\5\1\271\16\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\17\5\1\272\7\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\4\5\1\273\22\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\2\5\1\274\24\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\7\5\1\275\17\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\16\5\1\276\10\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\20\5\1\277\6\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\14\5\1\300\12\5\23\0\2\5\1\0\2\5" +
+            "\3\0\2\5\1\0\1\5\7\0\2\5\1\301\24\5" +
+            "\23\0\2\5\1\0\2\5\3\0\2\5\1\0\1\5" +
+            "\7\0\5\5\1\302\21\5\22\0\6\227\1\230\1\262" +
+            "\65\227\1\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\6\5\1\303\20\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\304" +
+            "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\14\5\1\305\12\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\14\5\1\306" +
+            "\12\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\10\5\1\307\16\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\20\5\1\310" +
+            "\6\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\10\5\1\311\16\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\312" +
+            "\21\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\12\5\1\313\14\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\314" +
+            "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\12\5\1\315\14\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\21\5\1\316" +
+            "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\22\5\1\317\4\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\2\5\1\320" +
+            "\24\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\17\5\1\321\7\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\4\5\1\322" +
+            "\22\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\5\5\1\323\21\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\12\5\1\324" +
+            "\14\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\5\5\1\325\21\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\5\5\1\326" +
+            "\21\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\13\5\1\327\13\5\23\0\2\5\1\0" +
+            "\2\5\3\0\2\5\1\0\1\5\7\0\21\5\1\330" +
+            "\5\5\23\0\2\5\1\0\2\5\3\0\2\5\1\0" +
+            "\1\5\7\0\6\5\1\331\20\5\22\0";
+
+    private static int[] zzUnpackTrans() {
+        int[] result = new int[9211];
+        int offset = 0;
+        offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
+        return result;
+    }
 
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private CharSequence zzBuffer = "";
+    private static int zzUnpackTrans(String packed, int offset, int[] result) {
+        int i = 0;       /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            value--;
+            do result[j++] = value;
+            while (--count > 0);
+        }
+        return j;
+    }
 
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
 
-  /** the textposition at the last state to be included in yytext */
-  private int zzPushbackPos;
+    /* error codes */
+    private static final int ZZ_UNKNOWN_ERROR = 0;
+    private static final int ZZ_NO_MATCH = 1;
+    private static final int ZZ_PUSHBACK_2BIG = 2;
+    private static final char[] EMPTY_BUFFER = new char[0];
+    private static final int YYEOF = -1;
+
+    /* error messages for the codes above */
+    private static final String ZZ_ERROR_MSG[] = {
+        "Unkown internal scanner error",
+        "Error: could not match input",
+        "Error: pushback value was too large"
+    };
+
+    /**
+     * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
+     */
+    private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
+
+    private static final String ZZ_ATTRIBUTE_PACKED_0 =
+        "\2\0\1\11\4\1\1\11\5\1\2\11\26\1\11\11" +
+            "\10\1\1\0\2\1\3\11\2\1\1\11\34\1\3\11" +
+            "\1\1\11\11\6\1\2\0\40\1\3\11\1\1\1\11" +
+            "\1\0\1\1\1\11\27\1\2\11\1\0\47\1";
+
+    private static int[] zzUnpackAttribute() {
+        int[] result = new int[217];
+        int offset = 0;
+        offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+        return result;
+    }
 
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
+    private static int zzUnpackAttribute(String packed, int offset, int[] result) {
+        int i = 0;       /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            do result[j++] = value;
+            while (--count > 0);
+        }
+        return j;
+    }
 
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
+    /**
+     * the current state of the DFA
+     */
+    private int zzState;
+
+    /**
+     * the current lexical state
+     */
+    private int zzLexicalState = YYINITIAL;
+
+    /**
+     * this buffer contains the current text to be matched and is
+     * the source of the yytext() string
+     */
+    private CharSequence zzBuffer = "";
+
+    /**
+     * the textposition at the last accepting state
+     */
+    private int zzMarkedPos;
+
+    /**
+     * the textposition at the last state to be included in yytext
+     */
+    private int zzPushbackPos;
+
+    /**
+     * the current text position in the buffer
+     */
+    private int zzCurrentPos;
+
+    /**
+     * startRead marks the beginning of the yytext() string in the buffer
+     */
+    private int zzStartRead;
+
+    /**
+     * endRead marks the last character in the buffer, that has been read
+     * from input
+     */
+    private int zzEndRead;
+
+    /**
+     * zzAtBOL == true <=> the scanner is currently at the beginning of a line
+     */
+    private boolean zzAtBOL = true;
+
+    /**
+     * zzAtEOF == true <=> the scanner is at the EOF
+     */
+    private boolean zzAtEOF;
+
+    private IElementType myTokenType;
+    private int myState;
+
+    /**
+     * denotes if the user-EOF-code has already been executed
+     */
+    private boolean zzEOFDone;
+
+
+    /**
+     * Unpacks the compressed character translation table.
+     *
+     * @param packed the packed character translation table
+     * @return the unpacked character translation table
+     */
+    private static char[] zzUnpackCMap(String packed) {
+        char[] map = new char[0x10000];
+        int i = 0;  /* index in packed string  */
+        int j = 0;  /* index in unpacked array */
+        while (i < 1772) {
+            int count = packed.charAt(i++);
+            char value = packed.charAt(i++);
+            do map[j++] = value;
+            while (--count > 0);
+        }
+        return map;
+    }
 
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
+    @Override
+    public IElementType getTokenType() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        return myTokenType;
+    }
 
-  /**
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
+    @Override
+    public final int getTokenStart() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        return zzStartRead;
+    }
 
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
+    @Override
+    public final int getTokenEnd() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        return getTokenStart() + yylength();
+    }
 
-  private IElementType myTokenType;
-  private int myState;
+    @Override
+    public void advance() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        myTokenType = null;
+    }
 
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
+    @Override
+    public int getState() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        return myState;
+    }
 
+    @Override
+    public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
+        reset(buffer, startOffset, endOffset, initialState);
+        myTokenType = null;
+    }
 
+    @Override
+    public CharSequence getBufferSequence() {
+        return zzBuffer;
+    }
 
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 1772) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
+    @Override
+    public int getBufferEnd() {
+        return zzEndRead;
     }
-    return map;
-  }
-
-  @Override
-  public IElementType getTokenType() {
-    if (myTokenType == null) locateToken();
-    return myTokenType;
-  }
-
-  @Override
-  public final int getTokenStart(){
-    if (myTokenType == null) locateToken();
-    return zzStartRead;
-  }
-
-  @Override
-  public final int getTokenEnd(){
-    if (myTokenType == null) locateToken();
-    return getTokenStart() + yylength();
-  }
-
-  @Override
-  public void advance() {
-    if (myTokenType == null) locateToken();
-    myTokenType = null;
-  }
-
-  @Override
-  public int getState() {
-    if (myTokenType == null) locateToken();
-    return myState;
-  }
-
-  @Override
-  public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
-    reset(buffer, startOffset, endOffset, initialState);
-    myTokenType = null;
-  }
-
-   @Override
-   public CharSequence getBufferSequence() {
-     return zzBuffer;
-   }
-
-   @Override
-   public int getBufferEnd() {
-     return zzEndRead;
-   }
-
-  public void reset(CharSequence buffer, int start, int end,int initialState){
-    zzBuffer = buffer;
-    zzCurrentPos = zzMarkedPos = zzStartRead = start;
-    zzPushbackPos = 0;
-    zzAtEOF  = false;
-    zzAtBOL = true;
-    zzEndRead = end;
-    yybegin(initialState);
-    myTokenType = null;
-  }
-
-   private void locateToken() {
-     if (myTokenType != null) return;
-     try {
-       myState = yystate();
-       myTokenType = advanceImpl();
-     }
-     catch (java.io.IOException e) { /*Can't happen*/ }
-     catch (Error e) {
-       // add lexer class name to the error
-       final Error error = new Error(getClass().getName() + ": " + e.getMessage());
-       error.setStackTrace(e.getStackTrace());
-       throw error;
-     }
-   }
-
-   /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   *
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-    return true;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  public final CharSequence yytext() {
-    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the
-   * matched text.
-   *
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch.
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  public final char yycharat(int pos) {
-    return zzBuffer.charAt(zzStartRead+pos);
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of
-   * yypushback(int) and a match-all fallback rule) this method
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
+
+    public void reset(CharSequence buffer, int start, int end, int initialState) {
+        zzBuffer = buffer;
+        zzCurrentPos = zzMarkedPos = zzStartRead = start;
+        zzPushbackPos = 0;
+        zzAtEOF = false;
+        zzAtBOL = true;
+        zzEndRead = end;
+        yybegin(initialState);
+        myTokenType = null;
     }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+
+    private void locateToken() {
+      if (myTokenType != null) {
+        return;
+      }
+        try {
+            myState = yystate();
+            myTokenType = advanceImpl();
+        }
+        catch (java.io.IOException e) { /*Can't happen*/ }
+        catch (Error e) {
+            // add lexer class name to the error
+            final Error error = new Error(getClass().getName() + ": " + e.getMessage());
+            error.setStackTrace(e.getStackTrace());
+            throw error;
+        }
     }
 
-    throw new Error(message);
-  }
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-  /**
-   * Contains user EOF-code, which will be executed exactly once,
-   * when the end of file is reached
-   */
-  private void zzDoEOF() {
-    if (!zzEOFDone) {
-      zzEOFDone = true;
-    
+    /**
+     * Refills the input buffer.
+     *
+     * @return <code>false</code>, iff there was new input.
+     * @throws java.io.IOException if any I/O-Error occurs
+     */
+    private boolean zzRefill() throws java.io.IOException {
+        return true;
     }
-  }
 
 
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public IElementType advanceImpl() throws java.io.IOException {
-    int zzInput;
-    int zzAction;
+    /**
+     * Returns the current lexical state.
+     */
+    public final int yystate() {
+        return zzLexicalState;
+    }
 
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    CharSequence zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
 
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
+    /**
+     * Enters a new lexical state
+     *
+     * @param newState the new lexical state
+     */
+    public final void yybegin(int newState) {
+        zzLexicalState = newState;
+    }
 
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
 
-      zzAction = -1;
+    /**
+     * Returns the text matched by the current regular expression.
+     */
+    public final CharSequence yytext() {
+        return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
+    }
 
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
 
-      zzState = ZZ_LEXSTATE[zzLexicalState];
+    /**
+     * Returns the character at position <tt>pos</tt> from the
+     * matched text.
+     * <p>
+     * It is equivalent to yytext().charAt(pos), but faster
+     *
+     * @param pos the position of the character to fetch.
+     *            A value from 0 to yylength()-1.
+     * @return the character at position pos
+     */
+    public final char yycharat(int pos) {
+        return zzBuffer.charAt(zzStartRead + pos);
+    }
 
 
-      zzForAction: {
-        while (true) {
+    /**
+     * Returns the length of the matched text region.
+     */
+    public final int yylength() {
+        return zzMarkedPos - zzStartRead;
+    }
 
-          if (zzCurrentPosL < zzEndReadL)
-            zzInput = zzBufferL.charAt(zzCurrentPosL++);
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = zzBufferL.charAt(zzCurrentPosL++);
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
-
-          int zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
 
+    /**
+     * Reports an error that occured while scanning.
+     * <p>
+     * In a wellformed scanner (no or only correct usage of
+     * yypushback(int) and a match-all fallback rule) this method
+     * will only be called with things that "Can't Possibly Happen".
+     * If this method is called, something is seriously wrong
+     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     * <p>
+     * Usual syntax/scanner level error handling should be done
+     * in error fallback rules.
+     *
+     * @param errorCode the code of the errormessage to display
+     */
+    private void zzScanError(int errorCode) {
+        String message;
+        try {
+            message = ZZ_ERROR_MSG[errorCode];
         }
-      }
+        catch (ArrayIndexOutOfBoundsException e) {
+            message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+        }
+
+        throw new Error(message);
+    }
 
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 88: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD;
-          }
-        case 92: break;
-        case 29: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COLON;
-          }
-        case 93: break;
-        case 4: 
-          { return JSTokenTypes.WHITE_SPACE;
-          }
-        case 94: break;
-        case 32: 
-          { return JSTokenTypes.REGEXP_LITERAL;
-          }
-        case 95: break;
-        case 81: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD;
-          }
-        case 96: break;
-        case 21: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LPAR;
-          }
-        case 97: break;
-        case 68: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD;
-          }
-        case 98: break;
-        case 44: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GE;
-          }
-        case 99: break;
-        case 84: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD;
-          }
-        case 100: break;
-        case 34: 
-          { return JSTokenTypes.C_STYLE_COMMENT;
-          }
-        case 101: break;
-        case 49: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OROR;
-          }
-        case 102: break;
-        case 56: 
-          { return JSTokenTypes.DOC_COMMENT;
-          }
-        case 103: break;
-        case 58: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD;
-          }
-        case 104: break;
-        case 65: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ;
-          }
-        case 105: break;
-        case 26: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COMMA;
-          }
-        case 106: break;
-        case 13: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQ;
-          }
-        case 107: break;
-        case 37: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD;
-          }
-        case 108: break;
-        case 47: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDAND;
-          }
-        case 109: break;
-        case 43: 
-          { return JSTokenTypes.PLUSPLUS;
-          }
-        case 110: break;
-        case 10: 
-          { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL;
-          }
-        case 111: break;
-        case 3: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER;
-          }
-        case 112: break;
-        case 5: 
-          { return JSTokenTypes.DIV;
-          }
-        case 113: break;
-        case 25: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON;
-          }
-        case 114: break;
-        case 50: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOREQ;
-          }
-        case 115: break;
-        case 82: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD;
-          }
-        case 116: break;
-        case 70: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD;
-          }
-        case 117: break;
-        case 67: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ;
-          }
-        case 118: break;
-        case 57: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD;
-          }
-        case 119: break;
-        case 6: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULT;
-          }
-        case 120: break;
-        case 53: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ;
-          }
-        case 121: break;
-        case 17: 
-          { yybegin(YYINITIAL); return JSTokenTypes.AND;
-          }
-        case 122: break;
-        case 59: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SET_KEYWORD;
-          }
-        case 123: break;
-        case 63: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ;
-          }
-        case 124: break;
-        case 69: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD;
-          }
-        case 125: break;
-        case 36: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ;
-          }
-        case 126: break;
-        case 52: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ;
-          }
-        case 127: break;
-        case 62: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GET_KEYWORD;
-          }
-        case 128: break;
-        case 61: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD;
-          }
-        case 129: break;
-        case 15: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUS;
-          }
-        case 130: break;
-        case 33: 
-          { return JSTokenTypes.END_OF_LINE_COMMENT;
-          }
-        case 131: break;
-        case 71: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD;
-          }
-        case 132: break;
-        case 79: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD;
-          }
-        case 133: break;
-        case 40: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQ;
-          }
-        case 134: break;
-        case 1: 
-          { return JSTokenTypes.BAD_CHARACTER;
-          }
-        case 135: break;
-        case 86: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD;
-          }
-        case 136: break;
-        case 85: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD;
-          }
-        case 137: break;
-        case 76: 
-          { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD;
-          }
-        case 138: break;
-        case 80: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD;
-          }
-        case 139: break;
-        case 46: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ;
-          }
-        case 140: break;
-        case 55: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLT;
-          }
-        case 141: break;
-        case 31: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LT;
-          }
-        case 142: break;
-        case 74: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD;
-          }
-        case 143: break;
-        case 14: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EXCL;
-          }
-        case 144: break;
-        case 38: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD;
-          }
-        case 145: break;
-        case 64: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ;
-          }
-        case 146: break;
-        case 42: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ;
-          }
-        case 147: break;
-        case 48: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OREQ;
-          }
-        case 148: break;
-        case 89: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD;
-          }
-        case 149: break;
-        case 66: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT;
-          }
-        case 150: break;
-        case 45: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGT;
-          }
-        case 151: break;
-        case 27: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TILDE;
-          }
-        case 152: break;
-        case 87: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD;
-          }
-        case 153: break;
-        case 2: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL;
-          }
-        case 154: break;
-        case 19: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOR;
-          }
-        case 155: break;
-        case 30: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIV;
-          }
-        case 156: break;
-        case 16: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GT;
-          }
-        case 157: break;
-        case 39: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD;
-          }
-        case 158: break;
-        case 83: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD;
-          }
-        case 159: break;
-        case 60: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD;
-          }
-        case 160: break;
-        case 77: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD;
-          }
-        case 161: break;
-        case 9: 
-          { return  JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
-          }
-        case 162: break;
-        case 18: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OR;
-          }
-        case 163: break;
-        case 51: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ;
-          }
-        case 164: break;
-        case 8: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUS;
-          }
-        case 165: break;
-        case 35: 
-          { return JSTokenTypes.MINUSMINUS;
-          }
-        case 166: break;
-        case 28: 
-          { yybegin(YYINITIAL); return JSTokenTypes.QUEST;
-          }
-        case 167: break;
-        case 78: 
-          { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD;
-          }
-        case 168: break;
-        case 7: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DOT;
-          }
-        case 169: break;
-        case 72: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD;
-          }
-        case 170: break;
-        case 12: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RBRACKET;
-          }
-        case 171: break;
-        case 24: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RBRACE;
-          }
-        case 172: break;
-        case 91: 
-          { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD;
-          }
-        case 173: break;
-        case 41: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NE;
-          }
-        case 174: break;
-        case 23: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACE;
-          }
-        case 175: break;
-        case 22: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RPAR;
-          }
-        case 176: break;
-        case 20: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERC;
-          }
-        case 177: break;
-        case 73: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD;
-          }
-        case 178: break;
-        case 54: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LE;
-          }
-        case 179: break;
-        case 11: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET;
-          }
-        case 180: break;
-        case 75: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ;
-          }
-        case 181: break;
-        case 90: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.UNDEFINED_KEYWORD;
-          }
-        case 182: break;
-        default:
-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-            zzAtEOF = true;
-            zzDoEOF();
-            return null;
-          }
-          else {
-            zzScanError(ZZ_NO_MATCH);
-          }
+
+    /**
+     * Pushes the specified amount of characters back into the input stream.
+     * <p>
+     * They will be read again by then next call of the scanning method
+     *
+     * @param number the number of characters to be read again.
+     *               This number must not be greater than yylength()!
+     */
+    public void yypushback(int number) {
+      if (number > yylength()) {
+        zzScanError(ZZ_PUSHBACK_2BIG);
       }
+
+        zzMarkedPos -= number;
+    }
+
+
+    /**
+     * Contains user EOF-code, which will be executed exactly once,
+     * when the end of file is reached
+     */
+    private void zzDoEOF() {
+        if (!zzEOFDone) {
+            zzEOFDone = true;
+
+        }
     }
-  }
 
 
+    /**
+     * Resumes scanning until the next regular expression is matched,
+     * the end of input is encountered or an I/O-Error occurs.
+     *
+     * @return the next token
+     * @throws java.io.IOException if any I/O-Error occurs
+     */
+    public IElementType advanceImpl() throws java.io.IOException {
+        int zzInput;
+        int zzAction;
+
+        // cached fields:
+        int zzCurrentPosL;
+        int zzMarkedPosL;
+        int zzEndReadL = zzEndRead;
+        CharSequence zzBufferL = zzBuffer;
+        char[] zzCMapL = ZZ_CMAP;
+
+        int[] zzTransL = ZZ_TRANS;
+        int[] zzRowMapL = ZZ_ROWMAP;
+        int[] zzAttrL = ZZ_ATTRIBUTE;
+
+        while (true) {
+            zzMarkedPosL = zzMarkedPos;
+
+            zzAction = -1;
+
+            zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+
+            zzState = ZZ_LEXSTATE[zzLexicalState];
+
+
+            zzForAction:
+            {
+                while (true) {
+
+                  if (zzCurrentPosL < zzEndReadL) {
+                    zzInput = zzBufferL.charAt(zzCurrentPosL++);
+                  }
+                  else if (zzAtEOF) {
+                    zzInput = YYEOF;
+                    break zzForAction;
+                  }
+                  else {
+                    // store back cached positions
+                    zzCurrentPos = zzCurrentPosL;
+                    zzMarkedPos = zzMarkedPosL;
+                    boolean eof = zzRefill();
+                    // get translated positions and possibly new buffer
+                    zzCurrentPosL = zzCurrentPos;
+                    zzMarkedPosL = zzMarkedPos;
+                    zzBufferL = zzBuffer;
+                    zzEndReadL = zzEndRead;
+                    if (eof) {
+                      zzInput = YYEOF;
+                      break zzForAction;
+                    }
+                    else {
+                      zzInput = zzBufferL.charAt(zzCurrentPosL++);
+                    }
+                  }
+                    int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]];
+                  if (zzNext == -1) {
+                    break zzForAction;
+                  }
+                    zzState = zzNext;
+
+                    int zzAttributes = zzAttrL[zzState];
+                    if ((zzAttributes & 1) == 1) {
+                        zzAction = zzState;
+                        zzMarkedPosL = zzCurrentPosL;
+                      if ((zzAttributes & 8) == 8) {
+                        break zzForAction;
+                      }
+                    }
+
+                }
+            }
+
+            // store back cached position
+            zzMarkedPos = zzMarkedPosL;
+
+            switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+                case 88: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.FUNCTION_KEYWORD;
+                }
+                case 92:
+                    break;
+                case 29: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.COLON;
+                }
+                case 93:
+                    break;
+                case 4: {
+                    return JSTokenTypes.WHITE_SPACE;
+                }
+                case 94:
+                    break;
+                case 32: {
+                    return JSTokenTypes.REGEXP_LITERAL;
+                }
+                case 95:
+                    break;
+                case 81: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.WHILE_KEYWORD;
+                }
+                case 96:
+                    break;
+                case 21: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LPAR;
+                }
+                case 97:
+                    break;
+                case 68: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.TRUE_KEYWORD;
+                }
+                case 98:
+                    break;
+                case 44: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GE;
+                }
+                case 99:
+                    break;
+                case 84: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.SWITCH_KEYWORD;
+                }
+                case 100:
+                    break;
+                case 34: {
+                    return JSTokenTypes.C_STYLE_COMMENT;
+                }
+                case 101:
+                    break;
+                case 49: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.OROR;
+                }
+                case 102:
+                    break;
+                case 56: {
+                    return JSTokenTypes.DOC_COMMENT;
+                }
+                case 103:
+                    break;
+                case 58: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.FOR_KEYWORD;
+                }
+                case 104:
+                    break;
+                case 65: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GTGTEQ;
+                }
+                case 105:
+                    break;
+                case 26: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.COMMA;
+                }
+                case 106:
+                    break;
+                case 13: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.EQ;
+                }
+                case 107:
+                    break;
+                case 37: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DO_KEYWORD;
+                }
+                case 108:
+                    break;
+                case 47: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.ANDAND;
+                }
+                case 109:
+                    break;
+                case 43: {
+                    return JSTokenTypes.PLUSPLUS;
+                }
+                case 110:
+                    break;
+                case 10: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.STRING_LITERAL;
+                }
+                case 111:
+                    break;
+                case 3: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.IDENTIFIER;
+                }
+                case 112:
+                    break;
+                case 5: {
+                    return JSTokenTypes.DIV;
+                }
+                case 113:
+                    break;
+                case 25: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.SEMICOLON;
+                }
+                case 114:
+                    break;
+                case 50: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.XOREQ;
+                }
+                case 115:
+                    break;
+                case 82: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.TYPEOF_KEYWORD;
+                }
+                case 116:
+                    break;
+                case 70: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.ELSE_KEYWORD;
+                }
+                case 117:
+                    break;
+                case 67: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LTLTEQ;
+                }
+                case 118:
+                    break;
+                case 57: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.TRY_KEYWORD;
+                }
+                case 119:
+                    break;
+                case 6: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.MULT;
+                }
+                case 120:
+                    break;
+                case 53: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.MULTEQ;
+                }
+                case 121:
+                    break;
+                case 17: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.AND;
+                }
+                case 122:
+                    break;
+                case 59: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.SET_KEYWORD;
+                }
+                case 123:
+                    break;
+                case 63: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.EQEQEQ;
+                }
+                case 124:
+                    break;
+                case 69: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.THIS_KEYWORD;
+                }
+                case 125:
+                    break;
+                case 36: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.MINUSEQ;
+                }
+                case 126:
+                    break;
+                case 52: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DIVEQ;
+                }
+                case 127:
+                    break;
+                case 62: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GET_KEYWORD;
+                }
+                case 128:
+                    break;
+                case 61: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.VAR_KEYWORD;
+                }
+                case 129:
+                    break;
+                case 15: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.PLUS;
+                }
+                case 130:
+                    break;
+                case 33: {
+                    return JSTokenTypes.END_OF_LINE_COMMENT;
+                }
+                case 131:
+                    break;
+                case 71: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.NULL_KEYWORD;
+                }
+                case 132:
+                    break;
+                case 79: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.CATCH_KEYWORD;
+                }
+                case 133:
+                    break;
+                case 40: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.EQEQ;
+                }
+                case 134:
+                    break;
+                case 1: {
+                    return JSTokenTypes.BAD_CHARACTER;
+                }
+                case 135:
+                    break;
+                case 86: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.FINALLY_KEYWORD;
+                }
+                case 136:
+                    break;
+                case 85: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DELETE_KEYWORD;
+                }
+                case 137:
+                    break;
+                case 76: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.THROW_KEYWORD;
+                }
+                case 138:
+                    break;
+                case 80: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.CONST_KEYWORD;
+                }
+                case 139:
+                    break;
+                case 46: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.ANDEQ;
+                }
+                case 140:
+                    break;
+                case 55: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LTLT;
+                }
+                case 141:
+                    break;
+                case 31: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LT;
+                }
+                case 142:
+                    break;
+                case 74: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.VOID_KEYWORD;
+                }
+                case 143:
+                    break;
+                case 14: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.EXCL;
+                }
+                case 144:
+                    break;
+                case 38: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.IF_KEYWORD;
+                }
+                case 145:
+                    break;
+                case 64: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.NEQEQ;
+                }
+                case 146:
+                    break;
+                case 42: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.PLUSEQ;
+                }
+                case 147:
+                    break;
+                case 48: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.OREQ;
+                }
+                case 148:
+                    break;
+                case 89: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.CONTINUE_KEYWORD;
+                }
+                case 149:
+                    break;
+                case 66: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GTGTGT;
+                }
+                case 150:
+                    break;
+                case 45: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GTGT;
+                }
+                case 151:
+                    break;
+                case 27: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.TILDE;
+                }
+                case 152:
+                    break;
+                case 87: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DEFAULT_KEYWORD;
+                }
+                case 153:
+                    break;
+                case 2: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.NUMERIC_LITERAL;
+                }
+                case 154:
+                    break;
+                case 19: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.XOR;
+                }
+                case 155:
+                    break;
+                case 30: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DIV;
+                }
+                case 156:
+                    break;
+                case 16: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GT;
+                }
+                case 157:
+                    break;
+                case 39: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.IN_KEYWORD;
+                }
+                case 158:
+                    break;
+                case 83: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.RETURN_KEYWORD;
+                }
+                case 159:
+                    break;
+                case 60: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.NEW_KEYWORD;
+                }
+                case 160:
+                    break;
+                case 77: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.FALSE_KEYWORD;
+                }
+                case 161:
+                    break;
+                case 9: {
+                    return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
+                }
+                case 162:
+                    break;
+                case 18: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.OR;
+                }
+                case 163:
+                    break;
+                case 51: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.PERCEQ;
+                }
+                case 164:
+                    break;
+                case 8: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.MINUS;
+                }
+                case 165:
+                    break;
+                case 35: {
+                    return JSTokenTypes.MINUSMINUS;
+                }
+                case 166:
+                    break;
+                case 28: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.QUEST;
+                }
+                case 167:
+                    break;
+                case 78: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.BREAK_KEYWORD;
+                }
+                case 168:
+                    break;
+                case 7: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DOT;
+                }
+                case 169:
+                    break;
+                case 72: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.CASE_KEYWORD;
+                }
+                case 170:
+                    break;
+                case 12: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.RBRACKET;
+                }
+                case 171:
+                    break;
+                case 24: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.RBRACE;
+                }
+                case 172:
+                    break;
+                case 91: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.INSTANCEOF_KEYWORD;
+                }
+                case 173:
+                    break;
+                case 41: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.NE;
+                }
+                case 174:
+                    break;
+                case 23: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LBRACE;
+                }
+                case 175:
+                    break;
+                case 22: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.RPAR;
+                }
+                case 176:
+                    break;
+                case 20: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.PERC;
+                }
+                case 177:
+                    break;
+                case 73: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.WITH_KEYWORD;
+                }
+                case 178:
+                    break;
+                case 54: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LE;
+                }
+                case 179:
+                    break;
+                case 11: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LBRACKET;
+                }
+                case 180:
+                    break;
+                case 75: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GTGTGTEQ;
+                }
+                case 181:
+                    break;
+                case 90: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.UNDEFINED_KEYWORD;
+                }
+                case 182:
+                    break;
+                default:
+                    if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+                        zzAtEOF = true;
+                        zzDoEOF();
+                        return null;
+                    }
+                    else {
+                        zzScanError(ZZ_NO_MATCH);
+                    }
+            }
+        }
+    }
 }
diff --git a/lang-version-impl/javascript16-impl/src/main/java/module-info.java b/lang-version-impl/javascript16-impl/src/main/java/module-info.java
index 76447d51..34b49fec 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/module-info.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/module-info.java
@@ -2,10 +2,9 @@
  * @author VISTALL
  * @since 23-Aug-22
  */
-module consulo.javascript.javascript16.impl
-{
-	requires transitive consulo.javascript.base.impl;
+module consulo.javascript.javascript16.impl {
+    requires transitive consulo.javascript.base.impl;
 
-	exports consulo.javascript.javascript16.lang;
-	exports consulo.javascript.javascript16.lang.lexer;
+    exports consulo.javascript.javascript16.lang;
+    exports consulo.javascript.javascript16.lang.lexer;
 }
\ No newline at end of file
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
index 13b62614..bc892773 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
@@ -26,6 +26,7 @@
 import consulo.language.lexer.Lexer;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.function.Supplier;
 
 /**
@@ -33,45 +34,38 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScript17LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
-{
-	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
+public class JavaScript17LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
+    private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
-	@Nonnull
-	public static JavaScript17LanguageVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript17LanguageVersion.class);
-	}
+    @Nonnull
+    public static JavaScript17LanguageVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript17LanguageVersion.class);
+    }
 
-	public JavaScript17LanguageVersion()
-	{
-		super("JAVASCRIPT_1_7");
-	}
+    public JavaScript17LanguageVersion() {
+        super("JAVASCRIPT_1_7");
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "JavaScript 1.7";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "JavaScript 1.7";
+    }
 
-	@Nonnull
-	@Override
-	public Lexer createLexer()
-	{
-		return ourLexerFactory.get();
-	}
+    @Nonnull
+    @Override
+    public Lexer createLexer() {
+        return ourLexerFactory.get();
+    }
 
-	@Nonnull
-	@Override
-	public SyntaxHighlighter getSyntaxHighlighter()
-	{
-		return new JavaScriptHighlighter(ourLexerFactory);
-	}
+    @Nonnull
+    @Override
+    public SyntaxHighlighter getSyntaxHighlighter() {
+        return new JavaScriptHighlighter(ourLexerFactory);
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 20;
-	}
+    @Override
+    public int getWeight() {
+        return 20;
+    }
 }
\ No newline at end of file
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java
index 072f173c..b57964f2 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java
@@ -8,1220 +8,1438 @@
 
 
 /**
- * This class is a scanner generated by 
+ * This class is a scanner generated by
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.4
  * on 12.02.16 16:59 from the specification file
  * <tt>R:/_github.com/consulo/consulo-javascript/javascript17-impl/src/org/mustbe/consulo/javascript/lang/lexer/javascript17.flex</tt>
  */
 public class JavaScript17Lexer extends LexerBase {
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 16384;
-
-  /** lexical states */
-  public static final int DIV_OR_GT = 2;
-  public static final int YYINITIAL = 0;
-  public static final int LAST_STATE = 4;
-
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = { 
-     0,  0,  1,  1,  2, 2
-  };
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final String ZZ_CMAP_PACKED = 
-    "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\54"+
-    "\1\21\1\0\1\4\1\63\1\60\1\17\1\64\1\65\1\7\1\55"+
-    "\1\71\1\15\1\13\1\6\1\11\7\1\2\1\1\74\1\70\1\56"+
-    "\1\53\1\57\1\73\1\0\4\2\1\14\1\2\21\4\1\12\2\4"+
-    "\1\22\1\20\1\23\1\62\1\4\1\0\1\33\1\41\1\43\1\37"+
-    "\1\31\1\32\1\52\1\44\1\40\1\4\1\42\1\34\1\24\1\36"+
-    "\1\45\1\50\1\4\1\27\1\35\1\26\1\30\1\51\1\47\1\25"+
-    "\1\46\1\4\1\66\1\61\1\67\1\72\41\5\2\0\4\4\4\0"+
-    "\1\4\2\0\1\5\7\0\1\4\4\0\1\4\5\0\27\4\1\0"+
-    "\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4\16\0\5\4\11\0"+
-    "\1\4\21\0\130\5\5\0\23\5\12\0\1\4\13\0\1\4\1\0"+
-    "\3\4\1\0\1\4\1\0\24\4\1\0\54\4\1\0\46\4\1\0"+
-    "\5\4\4\0\202\4\1\0\4\5\3\0\105\4\1\0\46\4\2\0"+
-    "\2\4\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4\11\0"+
-    "\21\5\1\0\27\5\1\0\3\5\1\0\1\5\1\0\2\5\1\0"+
-    "\1\5\13\0\33\4\5\0\3\4\15\0\4\5\14\0\6\5\13\0"+
-    "\32\4\5\0\13\4\16\5\7\0\12\5\4\0\2\4\1\5\143\4"+
-    "\1\0\1\4\10\5\1\0\6\5\2\4\2\5\1\0\4\5\2\4"+
-    "\12\5\3\4\2\0\1\4\17\0\1\5\1\4\1\5\36\4\33\5"+
-    "\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0\3\5\66\4\2\0"+
-    "\1\5\1\4\20\5\2\0\1\4\4\5\3\0\12\4\2\5\2\0"+
-    "\12\5\21\0\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0"+
-    "\7\4\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0"+
-    "\2\5\2\0\3\5\11\0\1\5\4\0\2\4\1\0\3\4\2\5"+
-    "\2\0\12\5\4\4\15\0\3\5\1\0\6\4\4\0\2\4\2\0"+
-    "\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0\2\4\2\0"+
-    "\1\5\1\0\5\5\4\0\2\5\2\0\3\5\13\0\4\4\1\0"+
-    "\1\4\7\0\14\5\3\4\14\0\3\5\1\0\11\4\1\0\3\4"+
-    "\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5"+
-    "\1\4\10\5\1\0\3\5\1\0\3\5\2\0\1\4\17\0\2\4"+
-    "\2\5\2\0\12\5\1\0\1\4\17\0\3\5\1\0\10\4\2\0"+
-    "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0"+
-    "\1\5\1\4\6\5\3\0\2\5\2\0\3\5\10\0\2\5\4\0"+
-    "\2\4\1\0\3\4\4\0\12\5\1\0\1\4\20\0\1\5\1\4"+
-    "\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4"+
-    "\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4\1\0\3\4"+
-    "\4\0\5\5\3\0\3\5\1\0\4\5\11\0\1\5\17\0\11\5"+
-    "\11\0\1\4\7\0\3\5\1\0\10\4\1\0\3\4\1\0\27\4"+
-    "\1\0\12\4\1\0\5\4\4\0\7\5\1\0\3\5\1\0\4\5"+
-    "\7\0\2\5\11\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4"+
-    "\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4\2\0\1\5"+
-    "\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5\7\0\1\4"+
-    "\1\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4\1\0\3\4"+
-    "\1\0\27\4\1\0\20\4\4\0\6\5\2\0\3\5\1\0\4\5"+
-    "\11\0\1\5\10\0\2\4\4\0\12\5\22\0\2\5\1\0\22\4"+
-    "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5"+
-    "\4\0\6\5\1\0\1\5\1\0\10\5\22\0\2\5\15\0\60\4"+
-    "\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5\47\0\2\4"+
-    "\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4"+
-    "\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4"+
-    "\1\0\4\4\1\5\2\4\6\5\1\0\2\5\1\4\2\0\5\4"+
-    "\1\0\1\4\1\0\6\5\2\0\12\5\2\0\2\4\42\0\1\4"+
-    "\27\0\2\5\6\0\12\5\13\0\1\5\1\0\1\5\1\0\1\5"+
-    "\4\0\2\5\10\4\1\0\42\4\6\0\24\5\1\0\2\5\4\4"+
-    "\4\0\10\5\1\0\44\5\11\0\1\5\71\0\42\4\1\0\5\4"+
-    "\1\0\2\4\1\0\7\5\3\0\4\5\6\0\12\5\6\0\6\4"+
-    "\4\5\106\0\46\4\12\0\51\4\7\0\132\4\5\0\104\4\5\0"+
-    "\122\4\6\0\7\4\1\0\77\4\1\0\1\4\1\0\4\4\2\0"+
-    "\7\4\1\0\1\4\1\0\4\4\2\0\47\4\1\0\1\4\1\0"+
-    "\4\4\2\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0"+
-    "\1\4\1\0\4\4\2\0\7\4\1\0\7\4\1\0\27\4\1\0"+
-    "\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\47\4\1\0"+
-    "\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4\2\0\10\4\12\0"+
-    "\32\4\5\0\113\4\3\0\3\4\17\0\15\4\1\0\4\4\3\5"+
-    "\13\0\22\4\3\5\13\0\22\4\2\5\14\0\15\4\1\0\3\4"+
-    "\1\0\2\5\14\0\64\4\40\5\3\0\1\4\3\0\2\4\1\5"+
-    "\2\0\12\5\41\0\3\5\2\0\12\5\6\0\130\4\10\0\51\4"+
-    "\1\5\126\0\35\4\3\0\14\5\4\0\14\5\12\0\12\5\36\4"+
-    "\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0\132\4\6\0\26\4"+
-    "\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4\1\0\1\4"+
-    "\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4\1\0\7\4"+
-    "\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4\2\0\6\4"+
-    "\4\0\15\4\5\0\3\4\1\0\7\4\17\0\4\5\32\0\5\5"+
-    "\20\0\2\4\23\0\1\4\13\0\4\5\6\0\6\5\1\0\1\4"+
-    "\15\0\1\4\40\0\22\4\36\0\15\5\4\0\1\5\3\0\6\5"+
-    "\27\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4"+
-    "\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4\1\0\3\4"+
-    "\1\0\7\4\3\0\3\4\5\0\5\4\26\0\44\4\u0e81\0\3\4"+
-    "\31\0\11\4\6\5\1\0\5\4\2\0\5\4\4\0\126\4\2\0"+
-    "\2\5\2\0\3\4\1\0\137\4\5\0\50\4\4\0\136\4\21\0"+
-    "\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0"+
-    "\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4\5\0"+
-    "\1\4\1\5\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0"+
-    "\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0"+
-    "\66\4\50\0\15\4\3\0\20\5\20\0\4\5\17\0\2\4\30\0"+
-    "\3\4\31\0\1\4\6\0\5\4\1\0\207\4\2\0\1\5\4\0"+
-    "\1\4\13\0\12\5\7\0\32\4\4\0\1\4\1\0\32\4\12\0"+
-    "\132\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0\3\4\3\0"+
-    "\2\4\3\0\2\4\22\0\3\5\4\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\3\0\1\1\1\2\1\3\1\4\1\5\1\6\1\2"+
-    "\1\7\1\10\1\11\1\12\1\13\1\14\20\3\1\15"+
-    "\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25"+
-    "\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35"+
-    "\1\36\1\6\1\37\2\2\1\40\1\41\1\42\1\0"+
-    "\1\40\1\2\1\43\1\44\2\11\2\12\20\3\1\45"+
-    "\1\46\1\47\11\3\1\50\1\51\1\52\1\53\1\54"+
-    "\1\55\1\56\1\57\1\60\1\61\1\62\1\63\1\64"+
-    "\1\65\1\66\1\67\1\2\1\40\1\42\1\70\1\40"+
-    "\2\0\2\11\2\12\1\3\1\71\11\3\1\72\1\73"+
-    "\1\74\2\3\1\75\12\3\1\76\1\3\1\77\1\100"+
-    "\1\101\1\102\1\103\1\104\1\0\2\70\1\105\1\3"+
-    "\1\106\3\3\1\107\4\3\1\110\5\3\1\111\3\3"+
-    "\1\112\1\3\1\113\1\114\1\42\1\0\1\115\4\3"+
-    "\1\116\5\3\1\117\1\120\1\3\1\121\1\122\1\123"+
-    "\1\124\1\125\3\3\1\126\1\3\1\127\4\3\1\130"+
-    "\1\131\3\3\1\132\1\3\1\133\1\134\1\3\1\135";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[226];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
+    /**
+     * initial size of the lookahead buffer
+     */
+    private static final int ZZ_BUFFERSIZE = 16384;
+
+    /**
+     * lexical states
+     */
+    public static final int DIV_OR_GT = 2;
+    public static final int YYINITIAL = 0;
+    public static final int LAST_STATE = 4;
+
+    /**
+     * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+     * at the beginning of a line
+     * l is of the form l = 2*k, k a non negative integer
+     */
+    private static final int ZZ_LEXSTATE[] = {
+        0, 0, 1, 1, 2, 2
+    };
+
+    /**
+     * Translates characters to character classes
+     */
+    private static final String ZZ_CMAP_PACKED =
+        "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\54" +
+            "\1\21\1\0\1\4\1\63\1\60\1\17\1\64\1\65\1\7\1\55" +
+            "\1\71\1\15\1\13\1\6\1\11\7\1\2\1\1\74\1\70\1\56" +
+            "\1\53\1\57\1\73\1\0\4\2\1\14\1\2\21\4\1\12\2\4" +
+            "\1\22\1\20\1\23\1\62\1\4\1\0\1\33\1\41\1\43\1\37" +
+            "\1\31\1\32\1\52\1\44\1\40\1\4\1\42\1\34\1\24\1\36" +
+            "\1\45\1\50\1\4\1\27\1\35\1\26\1\30\1\51\1\47\1\25" +
+            "\1\46\1\4\1\66\1\61\1\67\1\72\41\5\2\0\4\4\4\0" +
+            "\1\4\2\0\1\5\7\0\1\4\4\0\1\4\5\0\27\4\1\0" +
+            "\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4\16\0\5\4\11\0" +
+            "\1\4\21\0\130\5\5\0\23\5\12\0\1\4\13\0\1\4\1\0" +
+            "\3\4\1\0\1\4\1\0\24\4\1\0\54\4\1\0\46\4\1\0" +
+            "\5\4\4\0\202\4\1\0\4\5\3\0\105\4\1\0\46\4\2\0" +
+            "\2\4\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4\11\0" +
+            "\21\5\1\0\27\5\1\0\3\5\1\0\1\5\1\0\2\5\1\0" +
+            "\1\5\13\0\33\4\5\0\3\4\15\0\4\5\14\0\6\5\13\0" +
+            "\32\4\5\0\13\4\16\5\7\0\12\5\4\0\2\4\1\5\143\4" +
+            "\1\0\1\4\10\5\1\0\6\5\2\4\2\5\1\0\4\5\2\4" +
+            "\12\5\3\4\2\0\1\4\17\0\1\5\1\4\1\5\36\4\33\5" +
+            "\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0\3\5\66\4\2\0" +
+            "\1\5\1\4\20\5\2\0\1\4\4\5\3\0\12\4\2\5\2\0" +
+            "\12\5\21\0\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0" +
+            "\7\4\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0" +
+            "\2\5\2\0\3\5\11\0\1\5\4\0\2\4\1\0\3\4\2\5" +
+            "\2\0\12\5\4\4\15\0\3\5\1\0\6\4\4\0\2\4\2\0" +
+            "\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0\2\4\2\0" +
+            "\1\5\1\0\5\5\4\0\2\5\2\0\3\5\13\0\4\4\1\0" +
+            "\1\4\7\0\14\5\3\4\14\0\3\5\1\0\11\4\1\0\3\4" +
+            "\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5" +
+            "\1\4\10\5\1\0\3\5\1\0\3\5\2\0\1\4\17\0\2\4" +
+            "\2\5\2\0\12\5\1\0\1\4\17\0\3\5\1\0\10\4\2\0" +
+            "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0" +
+            "\1\5\1\4\6\5\3\0\2\5\2\0\3\5\10\0\2\5\4\0" +
+            "\2\4\1\0\3\4\4\0\12\5\1\0\1\4\20\0\1\5\1\4" +
+            "\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4" +
+            "\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4\1\0\3\4" +
+            "\4\0\5\5\3\0\3\5\1\0\4\5\11\0\1\5\17\0\11\5" +
+            "\11\0\1\4\7\0\3\5\1\0\10\4\1\0\3\4\1\0\27\4" +
+            "\1\0\12\4\1\0\5\4\4\0\7\5\1\0\3\5\1\0\4\5" +
+            "\7\0\2\5\11\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4" +
+            "\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4\2\0\1\5" +
+            "\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5\7\0\1\4" +
+            "\1\0\2\4\4\0\12\5\22\0\2\5\1\0\10\4\1\0\3\4" +
+            "\1\0\27\4\1\0\20\4\4\0\6\5\2\0\3\5\1\0\4\5" +
+            "\11\0\1\5\10\0\2\4\4\0\12\5\22\0\2\5\1\0\22\4" +
+            "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5" +
+            "\4\0\6\5\1\0\1\5\1\0\10\5\22\0\2\5\15\0\60\4" +
+            "\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5\47\0\2\4" +
+            "\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4" +
+            "\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4" +
+            "\1\0\4\4\1\5\2\4\6\5\1\0\2\5\1\4\2\0\5\4" +
+            "\1\0\1\4\1\0\6\5\2\0\12\5\2\0\2\4\42\0\1\4" +
+            "\27\0\2\5\6\0\12\5\13\0\1\5\1\0\1\5\1\0\1\5" +
+            "\4\0\2\5\10\4\1\0\42\4\6\0\24\5\1\0\2\5\4\4" +
+            "\4\0\10\5\1\0\44\5\11\0\1\5\71\0\42\4\1\0\5\4" +
+            "\1\0\2\4\1\0\7\5\3\0\4\5\6\0\12\5\6\0\6\4" +
+            "\4\5\106\0\46\4\12\0\51\4\7\0\132\4\5\0\104\4\5\0" +
+            "\122\4\6\0\7\4\1\0\77\4\1\0\1\4\1\0\4\4\2\0" +
+            "\7\4\1\0\1\4\1\0\4\4\2\0\47\4\1\0\1\4\1\0" +
+            "\4\4\2\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0" +
+            "\1\4\1\0\4\4\2\0\7\4\1\0\7\4\1\0\27\4\1\0" +
+            "\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\47\4\1\0" +
+            "\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4\2\0\10\4\12\0" +
+            "\32\4\5\0\113\4\3\0\3\4\17\0\15\4\1\0\4\4\3\5" +
+            "\13\0\22\4\3\5\13\0\22\4\2\5\14\0\15\4\1\0\3\4" +
+            "\1\0\2\5\14\0\64\4\40\5\3\0\1\4\3\0\2\4\1\5" +
+            "\2\0\12\5\41\0\3\5\2\0\12\5\6\0\130\4\10\0\51\4" +
+            "\1\5\126\0\35\4\3\0\14\5\4\0\14\5\12\0\12\5\36\4" +
+            "\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0\132\4\6\0\26\4" +
+            "\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4\1\0\1\4" +
+            "\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4\1\0\7\4" +
+            "\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4\2\0\6\4" +
+            "\4\0\15\4\5\0\3\4\1\0\7\4\17\0\4\5\32\0\5\5" +
+            "\20\0\2\4\23\0\1\4\13\0\4\5\6\0\6\5\1\0\1\4" +
+            "\15\0\1\4\40\0\22\4\36\0\15\5\4\0\1\5\3\0\6\5" +
+            "\27\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4" +
+            "\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4\1\0\3\4" +
+            "\1\0\7\4\3\0\3\4\5\0\5\4\26\0\44\4\u0e81\0\3\4" +
+            "\31\0\11\4\6\5\1\0\5\4\2\0\5\4\4\0\126\4\2\0" +
+            "\2\5\2\0\3\4\1\0\137\4\5\0\50\4\4\0\136\4\21\0" +
+            "\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0" +
+            "\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4\5\0" +
+            "\1\4\1\5\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0" +
+            "\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0" +
+            "\66\4\50\0\15\4\3\0\20\5\20\0\4\5\17\0\2\4\30\0" +
+            "\3\4\31\0\1\4\6\0\5\4\1\0\207\4\2\0\1\5\4\0" +
+            "\1\4\13\0\12\5\7\0\32\4\4\0\1\4\1\0\32\4\12\0" +
+            "\132\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0\3\4\3\0" +
+            "\2\4\3\0\2\4\22\0\3\5\4\0";
+
+    /**
+     * Translates characters to character classes
+     */
+    private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
+
+    /**
+     * Translates DFA states to action switch labels.
+     */
+    private static final int[] ZZ_ACTION = zzUnpackAction();
+
+    private static final String ZZ_ACTION_PACKED_0 =
+        "\3\0\1\1\1\2\1\3\1\4\1\5\1\6\1\2" +
+            "\1\7\1\10\1\11\1\12\1\13\1\14\20\3\1\15" +
+            "\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25" +
+            "\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35" +
+            "\1\36\1\6\1\37\2\2\1\40\1\41\1\42\1\0" +
+            "\1\40\1\2\1\43\1\44\2\11\2\12\20\3\1\45" +
+            "\1\46\1\47\11\3\1\50\1\51\1\52\1\53\1\54" +
+            "\1\55\1\56\1\57\1\60\1\61\1\62\1\63\1\64" +
+            "\1\65\1\66\1\67\1\2\1\40\1\42\1\70\1\40" +
+            "\2\0\2\11\2\12\1\3\1\71\11\3\1\72\1\73" +
+            "\1\74\2\3\1\75\12\3\1\76\1\3\1\77\1\100" +
+            "\1\101\1\102\1\103\1\104\1\0\2\70\1\105\1\3" +
+            "\1\106\3\3\1\107\4\3\1\110\5\3\1\111\3\3" +
+            "\1\112\1\3\1\113\1\114\1\42\1\0\1\115\4\3" +
+            "\1\116\5\3\1\117\1\120\1\3\1\121\1\122\1\123" +
+            "\1\124\1\125\3\3\1\126\1\3\1\127\4\3\1\130" +
+            "\1\131\3\3\1\132\1\3\1\133\1\134\1\3\1\135";
+
+    private static int[] zzUnpackAction() {
+        int[] result = new int[226];
+        int offset = 0;
+        offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+        return result;
     }
-    return j;
-  }
-
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\75\0\172\0\172\0\267\0\364\0\u0131\0\u016e"+
-    "\0\172\0\u01ab\0\u01e8\0\u0225\0\u0262\0\u029f\0\172\0\172"+
-    "\0\u02dc\0\u0319\0\u0356\0\u0393\0\u03d0\0\u040d\0\u044a\0\u0487"+
-    "\0\u04c4\0\u0501\0\u053e\0\u057b\0\u05b8\0\u05f5\0\u0632\0\u066f"+
-    "\0\u06ac\0\u06e9\0\u0726\0\u0763\0\u07a0\0\u07dd\0\u081a\0\u0857"+
-    "\0\172\0\172\0\172\0\172\0\172\0\172\0\172\0\172"+
-    "\0\172\0\u0894\0\u08d1\0\u090e\0\u094b\0\u0988\0\u09c5\0\u0a02"+
-    "\0\u0a3f\0\u0a7c\0\u0ab9\0\u0af6\0\172\0\172\0\172\0\u0b33"+
-    "\0\u0b70\0\172\0\u0bad\0\u0bea\0\u0c27\0\u0c64\0\u0ca1\0\u0cde"+
-    "\0\u0d1b\0\u0d58\0\u0d95\0\u0dd2\0\u0e0f\0\u0e4c\0\u0e89\0\u0ec6"+
-    "\0\u0f03\0\u0f40\0\364\0\364\0\u0f7d\0\u0fba\0\u0ff7\0\u1034"+
-    "\0\u1071\0\u10ae\0\u10eb\0\u1128\0\u1165\0\u11a2\0\u11df\0\u121c"+
-    "\0\172\0\172\0\172\0\u1259\0\172\0\172\0\172\0\172"+
-    "\0\172\0\172\0\172\0\172\0\172\0\u1296\0\u12d3\0\u1310"+
-    "\0\u134d\0\u138a\0\u13c7\0\u1404\0\u1441\0\u147e\0\u14bb\0\u14f8"+
-    "\0\u1535\0\u1572\0\364\0\u15af\0\u15ec\0\u1629\0\u1666\0\u16a3"+
-    "\0\u16e0\0\u171d\0\u175a\0\u1797\0\364\0\364\0\364\0\u17d4"+
-    "\0\u1811\0\364\0\u184e\0\u188b\0\u18c8\0\u1905\0\u1942\0\u197f"+
-    "\0\u19bc\0\u19f9\0\u1a36\0\u1a73\0\364\0\u1ab0\0\364\0\172"+
-    "\0\172\0\172\0\u1aed\0\172\0\u1b2a\0\u1b67\0\172\0\364"+
-    "\0\u1ba4\0\364\0\u1be1\0\u1c1e\0\u1c5b\0\364\0\u1c98\0\u1cd5"+
-    "\0\u1d12\0\u1d4f\0\364\0\u1d8c\0\u1dc9\0\u1e06\0\u1e43\0\u1e80"+
-    "\0\364\0\u1ebd\0\u1efa\0\u1f37\0\364\0\u1f74\0\364\0\172"+
-    "\0\172\0\u1fb1\0\364\0\u1fee\0\u202b\0\u2068\0\u20a5\0\364"+
-    "\0\u20e2\0\u211f\0\u215c\0\u2199\0\u21d6\0\364\0\364\0\u2213"+
-    "\0\364\0\364\0\364\0\364\0\364\0\u2250\0\u228d\0\u22ca"+
-    "\0\364\0\u2307\0\364\0\u2344\0\u2381\0\u23be\0\u23fb\0\364"+
-    "\0\364\0\u2438\0\u2475\0\u24b2\0\364\0\u24ef\0\364\0\364"+
-    "\0\u252c\0\364";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[226];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
-    }
-    return j;
-  }
-
-  /** 
-   * The transition table of the DFA
-   */
-  private static final int [] ZZ_TRANS = zzUnpackTrans();
-
-  private static final String ZZ_TRANS_PACKED_0 =
-    "\1\4\1\5\1\6\1\7\1\6\1\4\1\10\1\11"+
-    "\1\7\1\12\1\6\1\13\1\6\1\14\1\7\1\15"+
-    "\1\4\1\16\1\17\1\20\2\6\1\21\1\22\1\23"+
-    "\1\24\1\25\1\6\1\26\1\27\1\30\1\31\1\32"+
-    "\1\33\1\6\1\34\2\6\1\35\1\36\1\6\1\37"+
-    "\1\40\1\41\1\42\1\43\1\4\1\44\1\45\1\46"+
-    "\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56"+
-    "\1\57\1\60\1\61\1\4\1\5\1\6\1\7\1\6"+
-    "\1\4\1\62\1\63\1\7\1\12\1\6\1\13\1\6"+
-    "\1\14\1\7\1\15\1\4\1\16\1\17\1\20\2\6"+
-    "\1\21\1\22\1\23\1\24\1\25\1\6\1\26\1\27"+
-    "\1\30\1\31\1\32\1\33\1\6\1\34\2\6\1\35"+
-    "\1\36\1\6\1\37\1\40\1\41\1\42\1\43\1\64"+
-    "\1\44\1\45\1\46\1\47\1\50\1\51\1\52\1\53"+
-    "\1\54\1\55\1\56\1\57\1\60\1\61\76\0\1\5"+
-    "\7\0\1\5\1\0\1\65\1\66\14\0\1\66\44\0"+
-    "\2\6\1\0\2\6\3\0\2\6\1\0\1\6\7\0"+
-    "\27\6\25\0\1\7\4\0\1\7\5\0\1\7\56\0"+
-    "\6\67\1\70\1\71\1\0\5\67\1\0\1\67\1\72"+
-    "\1\67\1\73\52\67\1\0\1\5\7\0\1\5\1\74"+
-    "\1\65\1\66\10\0\1\74\3\0\1\66\44\0\1\65"+
-    "\7\0\1\65\100\0\1\75\35\0\1\76\21\0\10\15"+
-    "\1\0\5\15\1\0\1\77\1\100\54\15\10\16\1\0"+
-    "\5\16\1\0\1\16\1\101\1\102\53\16\1\0\2\6"+
-    "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\3\6"+
-    "\1\103\14\6\1\104\1\6\1\105\4\6\23\0\2\6"+
-    "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\5\6"+
-    "\1\106\21\6\23\0\2\6\1\0\2\6\3\0\2\6"+
-    "\1\0\1\6\7\0\12\6\1\107\14\6\23\0\2\6"+
-    "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\10\6"+
-    "\1\110\16\6\23\0\2\6\1\0\2\6\3\0\2\6"+
-    "\1\0\1\6\7\0\4\6\1\111\2\6\1\112\4\6"+
-    "\1\113\4\6\1\114\5\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\5\6\1\115\21\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\5\6\1\116\15\6\1\117\3\6\23\0\2\6"+
-    "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\4\6"+
-    "\1\120\1\121\21\6\23\0\2\6\1\0\2\6\3\0"+
-    "\2\6\1\0\1\6\7\0\5\6\1\122\13\6\1\123"+
-    "\5\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\6\6\1\124\3\6\1\125\14\6\23\0"+
-    "\2\6\1\0\2\6\3\0\2\6\1\0\1\6\7\0"+
-    "\3\6\1\126\23\6\23\0\2\6\1\0\2\6\3\0"+
-    "\2\6\1\0\1\6\7\0\7\6\1\127\11\6\1\130"+
-    "\5\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\14\6\1\131\12\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\14\6\1\132"+
-    "\3\6\1\133\6\6\23\0\2\6\1\0\2\6\3\0"+
-    "\2\6\1\0\1\6\7\0\7\6\1\134\11\6\1\135"+
-    "\5\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\5\6\1\136\21\6\75\0\1\137\74\0"+
-    "\1\140\74\0\1\141\1\0\1\142\72\0\1\143\3\0"+
-    "\1\144\70\0\1\145\4\0\1\146\67\0\1\147\5\0"+
-    "\1\150\66\0\1\151\74\0\1\152\27\0\1\70\1\71"+
-    "\43\0\1\153\74\0\1\154\74\0\1\155\2\0\1\156"+
-    "\17\0\1\65\7\0\1\65\2\0\1\66\14\0\1\66"+
-    "\44\0\1\157\7\0\1\157\3\0\1\157\37\0\1\157"+
-    "\17\0\6\67\1\160\1\67\1\0\5\67\1\0\1\67"+
-    "\1\72\1\67\1\73\52\67\10\70\1\0\5\70\1\0"+
-    "\56\70\7\161\1\162\65\161\10\67\1\0\5\67\1\0"+
-    "\56\67\6\73\1\163\1\73\1\164\5\73\1\164\1\73"+
-    "\1\165\2\73\1\67\51\73\1\0\2\74\6\0\1\74"+
-    "\2\0\1\74\14\0\3\74\3\0\1\74\1\0\1\74"+
-    "\1\0\1\74\31\0\3\15\1\166\4\15\1\167\64\15"+
-    "\3\16\1\170\4\16\1\171\64\16\1\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\4\6\1\172"+
-    "\15\6\1\173\4\6\23\0\2\6\1\0\2\6\3\0"+
-    "\2\6\1\0\1\6\7\0\3\6\1\174\10\6\1\175"+
-    "\12\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\24\6\1\176\2\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\2\6\1\177"+
-    "\24\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\13\6\1\200\13\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\11\6\1\201"+
-    "\15\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\12\6\1\202\14\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\10\6\1\203"+
-    "\16\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\12\6\1\204\14\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\3\6\1\205"+
-    "\23\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\2\6\1\206\24\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\2\6\1\207"+
-    "\24\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\14\6\1\210\12\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\10\6\1\211"+
-    "\16\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\23\6\1\212\3\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\6\6\1\213"+
-    "\1\6\1\214\16\6\23\0\2\6\1\0\2\6\3\0"+
-    "\2\6\1\0\1\6\7\0\11\6\1\215\15\6\23\0"+
-    "\2\6\1\0\2\6\3\0\2\6\1\0\1\6\7\0"+
-    "\5\6\1\216\21\6\23\0\2\6\1\0\2\6\3\0"+
-    "\2\6\1\0\1\6\7\0\2\6\1\217\6\6\1\220"+
-    "\15\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\12\6\1\221\14\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\5\6\1\222"+
-    "\21\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\2\6\1\223\24\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\14\6\1\224"+
-    "\12\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\3\6\1\225\23\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\14\6\1\226"+
-    "\12\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\2\6\1\227\24\6\75\0\1\230\74\0"+
-    "\1\231\74\0\1\232\3\0\1\233\70\0\1\234\22\0"+
-    "\1\157\7\0\1\157\107\0\2\160\12\0\1\160\11\0"+
-    "\1\160\22\0\7\161\1\235\65\161\6\236\1\237\1\162"+
-    "\65\236\23\164\1\67\2\163\12\164\1\163\11\164\1\163"+
-    "\45\164\1\67\51\164\10\73\1\164\5\73\1\164\4\73"+
-    "\1\67\51\73\3\15\1\166\4\15\1\167\6\15\1\77"+
-    "\1\100\64\15\1\0\6\15\1\77\1\100\54\15\3\16"+
-    "\1\170\4\16\1\171\7\16\1\101\1\102\63\16\1\0"+
-    "\7\16\1\101\1\102\53\16\1\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\5\6\1\240\21\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\21\6\1\241\5\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\11\6\1\242\15\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\5\6\1\243\21\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\4\6\1\244\22\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\5\6\1\245\21\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\5\6\1\246\21\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\17\6\1\247\7\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\11\6\1\250\15\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\7\6\1\251\17\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\2\6\1\252\24\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\10\6\1\253\16\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\7\6\1\254\17\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\5\6\1\255\21\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\2\6\1\256\24\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\7\6\1\257\17\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\17\6\1\260\7\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\5\6\1\261\21\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\2\6\1\262\6\6"+
-    "\1\263\15\6\23\0\2\6\1\0\2\6\3\0\2\6"+
-    "\1\0\1\6\7\0\10\6\1\264\16\6\23\0\2\6"+
-    "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\20\6"+
-    "\1\265\6\6\23\0\2\6\1\0\2\6\3\0\2\6"+
-    "\1\0\1\6\7\0\10\6\1\266\16\6\23\0\2\6"+
-    "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\13\6"+
-    "\1\267\13\6\75\0\1\270\21\0\6\161\1\271\1\235"+
-    "\65\161\7\236\1\272\65\236\1\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\23\6\1\273\3\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\21\6\1\274\5\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\3\6\1\275\23\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\6\6\1\276\20\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\2\6\1\277\24\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\5\6\1\300\21\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\10\6\1\301\16\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\17\6\1\302\7\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\4\6\1\303\22\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\2\6\1\304\24\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\7\6\1\305\17\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\16\6\1\306\10\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\20\6\1\307\6\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\14\6\1\310\12\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\2\6\1\311\24\6"+
-    "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6"+
-    "\7\0\13\6\1\312\13\6\23\0\2\6\1\0\2\6"+
-    "\3\0\2\6\1\0\1\6\7\0\5\6\1\313\21\6"+
-    "\22\0\6\236\1\237\1\272\65\236\1\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\6\6\1\314"+
-    "\20\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\12\6\1\315\14\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\14\6\1\316"+
-    "\12\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\14\6\1\317\12\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\10\6\1\320"+
-    "\16\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\20\6\1\321\6\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\10\6\1\322"+
-    "\16\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\5\6\1\323\21\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\12\6\1\324"+
-    "\14\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\12\6\1\325\14\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\12\6\1\326"+
-    "\14\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\21\6\1\327\5\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\22\6\1\330"+
-    "\4\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\2\6\1\331\24\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\17\6\1\332"+
-    "\7\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\4\6\1\333\22\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\5\6\1\334"+
-    "\21\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\12\6\1\335\14\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\5\6\1\336"+
-    "\21\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\5\6\1\337\21\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\13\6\1\340"+
-    "\13\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0"+
-    "\1\6\7\0\21\6\1\341\5\6\23\0\2\6\1\0"+
-    "\2\6\3\0\2\6\1\0\1\6\7\0\6\6\1\342"+
-    "\20\6\22\0";
-
-  private static int [] zzUnpackTrans() {
-    int [] result = new int[9577];
-    int offset = 0;
-    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackTrans(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do result[j++] = value; while (--count > 0);
+
+    private static int zzUnpackAction(String packed, int offset, int[] result) {
+        int i = 0;       /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            do result[j++] = value;
+            while (--count > 0);
+        }
+        return j;
     }
-    return j;
-  }
-
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-  private static final char[] EMPTY_BUFFER = new char[0];
-  private static final int YYEOF = -1;
-
-  /* error messages for the codes above */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\2\0\1\10\1\11\4\1\1\11\5\1\2\11\30\1"+
-    "\11\11\10\1\1\0\2\1\3\11\2\1\1\11\36\1"+
-    "\3\11\1\1\11\11\6\1\2\0\42\1\3\11\1\1"+
-    "\1\11\1\0\1\1\1\11\30\1\2\11\1\0\50\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[226];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
+
+
+    /**
+     * Translates a state to a row index in the transition table
+     */
+    private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
+
+    private static final String ZZ_ROWMAP_PACKED_0 =
+        "\0\0\0\75\0\172\0\172\0\267\0\364\0\u0131\0\u016e" +
+            "\0\172\0\u01ab\0\u01e8\0\u0225\0\u0262\0\u029f\0\172\0\172" +
+            "\0\u02dc\0\u0319\0\u0356\0\u0393\0\u03d0\0\u040d\0\u044a\0\u0487" +
+            "\0\u04c4\0\u0501\0\u053e\0\u057b\0\u05b8\0\u05f5\0\u0632\0\u066f" +
+            "\0\u06ac\0\u06e9\0\u0726\0\u0763\0\u07a0\0\u07dd\0\u081a\0\u0857" +
+            "\0\172\0\172\0\172\0\172\0\172\0\172\0\172\0\172" +
+            "\0\172\0\u0894\0\u08d1\0\u090e\0\u094b\0\u0988\0\u09c5\0\u0a02" +
+            "\0\u0a3f\0\u0a7c\0\u0ab9\0\u0af6\0\172\0\172\0\172\0\u0b33" +
+            "\0\u0b70\0\172\0\u0bad\0\u0bea\0\u0c27\0\u0c64\0\u0ca1\0\u0cde" +
+            "\0\u0d1b\0\u0d58\0\u0d95\0\u0dd2\0\u0e0f\0\u0e4c\0\u0e89\0\u0ec6" +
+            "\0\u0f03\0\u0f40\0\364\0\364\0\u0f7d\0\u0fba\0\u0ff7\0\u1034" +
+            "\0\u1071\0\u10ae\0\u10eb\0\u1128\0\u1165\0\u11a2\0\u11df\0\u121c" +
+            "\0\172\0\172\0\172\0\u1259\0\172\0\172\0\172\0\172" +
+            "\0\172\0\172\0\172\0\172\0\172\0\u1296\0\u12d3\0\u1310" +
+            "\0\u134d\0\u138a\0\u13c7\0\u1404\0\u1441\0\u147e\0\u14bb\0\u14f8" +
+            "\0\u1535\0\u1572\0\364\0\u15af\0\u15ec\0\u1629\0\u1666\0\u16a3" +
+            "\0\u16e0\0\u171d\0\u175a\0\u1797\0\364\0\364\0\364\0\u17d4" +
+            "\0\u1811\0\364\0\u184e\0\u188b\0\u18c8\0\u1905\0\u1942\0\u197f" +
+            "\0\u19bc\0\u19f9\0\u1a36\0\u1a73\0\364\0\u1ab0\0\364\0\172" +
+            "\0\172\0\172\0\u1aed\0\172\0\u1b2a\0\u1b67\0\172\0\364" +
+            "\0\u1ba4\0\364\0\u1be1\0\u1c1e\0\u1c5b\0\364\0\u1c98\0\u1cd5" +
+            "\0\u1d12\0\u1d4f\0\364\0\u1d8c\0\u1dc9\0\u1e06\0\u1e43\0\u1e80" +
+            "\0\364\0\u1ebd\0\u1efa\0\u1f37\0\364\0\u1f74\0\364\0\172" +
+            "\0\172\0\u1fb1\0\364\0\u1fee\0\u202b\0\u2068\0\u20a5\0\364" +
+            "\0\u20e2\0\u211f\0\u215c\0\u2199\0\u21d6\0\364\0\364\0\u2213" +
+            "\0\364\0\364\0\364\0\364\0\364\0\u2250\0\u228d\0\u22ca" +
+            "\0\364\0\u2307\0\364\0\u2344\0\u2381\0\u23be\0\u23fb\0\364" +
+            "\0\364\0\u2438\0\u2475\0\u24b2\0\364\0\u24ef\0\364\0\364" +
+            "\0\u252c\0\364";
+
+    private static int[] zzUnpackRowMap() {
+        int[] result = new int[226];
+        int offset = 0;
+        offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+        return result;
     }
-    return j;
-  }
 
-  /** the current state of the DFA */
-  private int zzState;
+    private static int zzUnpackRowMap(String packed, int offset, int[] result) {
+        int i = 0;  /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int high = packed.charAt(i++) << 16;
+            result[j++] = high | packed.charAt(i++);
+        }
+        return j;
+    }
 
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
+    /**
+     * The transition table of the DFA
+     */
+    private static final int[] ZZ_TRANS = zzUnpackTrans();
+
+    private static final String ZZ_TRANS_PACKED_0 =
+        "\1\4\1\5\1\6\1\7\1\6\1\4\1\10\1\11" +
+            "\1\7\1\12\1\6\1\13\1\6\1\14\1\7\1\15" +
+            "\1\4\1\16\1\17\1\20\2\6\1\21\1\22\1\23" +
+            "\1\24\1\25\1\6\1\26\1\27\1\30\1\31\1\32" +
+            "\1\33\1\6\1\34\2\6\1\35\1\36\1\6\1\37" +
+            "\1\40\1\41\1\42\1\43\1\4\1\44\1\45\1\46" +
+            "\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56" +
+            "\1\57\1\60\1\61\1\4\1\5\1\6\1\7\1\6" +
+            "\1\4\1\62\1\63\1\7\1\12\1\6\1\13\1\6" +
+            "\1\14\1\7\1\15\1\4\1\16\1\17\1\20\2\6" +
+            "\1\21\1\22\1\23\1\24\1\25\1\6\1\26\1\27" +
+            "\1\30\1\31\1\32\1\33\1\6\1\34\2\6\1\35" +
+            "\1\36\1\6\1\37\1\40\1\41\1\42\1\43\1\64" +
+            "\1\44\1\45\1\46\1\47\1\50\1\51\1\52\1\53" +
+            "\1\54\1\55\1\56\1\57\1\60\1\61\76\0\1\5" +
+            "\7\0\1\5\1\0\1\65\1\66\14\0\1\66\44\0" +
+            "\2\6\1\0\2\6\3\0\2\6\1\0\1\6\7\0" +
+            "\27\6\25\0\1\7\4\0\1\7\5\0\1\7\56\0" +
+            "\6\67\1\70\1\71\1\0\5\67\1\0\1\67\1\72" +
+            "\1\67\1\73\52\67\1\0\1\5\7\0\1\5\1\74" +
+            "\1\65\1\66\10\0\1\74\3\0\1\66\44\0\1\65" +
+            "\7\0\1\65\100\0\1\75\35\0\1\76\21\0\10\15" +
+            "\1\0\5\15\1\0\1\77\1\100\54\15\10\16\1\0" +
+            "\5\16\1\0\1\16\1\101\1\102\53\16\1\0\2\6" +
+            "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\3\6" +
+            "\1\103\14\6\1\104\1\6\1\105\4\6\23\0\2\6" +
+            "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\5\6" +
+            "\1\106\21\6\23\0\2\6\1\0\2\6\3\0\2\6" +
+            "\1\0\1\6\7\0\12\6\1\107\14\6\23\0\2\6" +
+            "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\10\6" +
+            "\1\110\16\6\23\0\2\6\1\0\2\6\3\0\2\6" +
+            "\1\0\1\6\7\0\4\6\1\111\2\6\1\112\4\6" +
+            "\1\113\4\6\1\114\5\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\5\6\1\115\21\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\5\6\1\116\15\6\1\117\3\6\23\0\2\6" +
+            "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\4\6" +
+            "\1\120\1\121\21\6\23\0\2\6\1\0\2\6\3\0" +
+            "\2\6\1\0\1\6\7\0\5\6\1\122\13\6\1\123" +
+            "\5\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\6\6\1\124\3\6\1\125\14\6\23\0" +
+            "\2\6\1\0\2\6\3\0\2\6\1\0\1\6\7\0" +
+            "\3\6\1\126\23\6\23\0\2\6\1\0\2\6\3\0" +
+            "\2\6\1\0\1\6\7\0\7\6\1\127\11\6\1\130" +
+            "\5\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\14\6\1\131\12\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\14\6\1\132" +
+            "\3\6\1\133\6\6\23\0\2\6\1\0\2\6\3\0" +
+            "\2\6\1\0\1\6\7\0\7\6\1\134\11\6\1\135" +
+            "\5\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\5\6\1\136\21\6\75\0\1\137\74\0" +
+            "\1\140\74\0\1\141\1\0\1\142\72\0\1\143\3\0" +
+            "\1\144\70\0\1\145\4\0\1\146\67\0\1\147\5\0" +
+            "\1\150\66\0\1\151\74\0\1\152\27\0\1\70\1\71" +
+            "\43\0\1\153\74\0\1\154\74\0\1\155\2\0\1\156" +
+            "\17\0\1\65\7\0\1\65\2\0\1\66\14\0\1\66" +
+            "\44\0\1\157\7\0\1\157\3\0\1\157\37\0\1\157" +
+            "\17\0\6\67\1\160\1\67\1\0\5\67\1\0\1\67" +
+            "\1\72\1\67\1\73\52\67\10\70\1\0\5\70\1\0" +
+            "\56\70\7\161\1\162\65\161\10\67\1\0\5\67\1\0" +
+            "\56\67\6\73\1\163\1\73\1\164\5\73\1\164\1\73" +
+            "\1\165\2\73\1\67\51\73\1\0\2\74\6\0\1\74" +
+            "\2\0\1\74\14\0\3\74\3\0\1\74\1\0\1\74" +
+            "\1\0\1\74\31\0\3\15\1\166\4\15\1\167\64\15" +
+            "\3\16\1\170\4\16\1\171\64\16\1\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\4\6\1\172" +
+            "\15\6\1\173\4\6\23\0\2\6\1\0\2\6\3\0" +
+            "\2\6\1\0\1\6\7\0\3\6\1\174\10\6\1\175" +
+            "\12\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\24\6\1\176\2\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\2\6\1\177" +
+            "\24\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\13\6\1\200\13\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\11\6\1\201" +
+            "\15\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\12\6\1\202\14\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\10\6\1\203" +
+            "\16\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\12\6\1\204\14\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\3\6\1\205" +
+            "\23\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\2\6\1\206\24\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\2\6\1\207" +
+            "\24\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\14\6\1\210\12\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\10\6\1\211" +
+            "\16\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\23\6\1\212\3\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\6\6\1\213" +
+            "\1\6\1\214\16\6\23\0\2\6\1\0\2\6\3\0" +
+            "\2\6\1\0\1\6\7\0\11\6\1\215\15\6\23\0" +
+            "\2\6\1\0\2\6\3\0\2\6\1\0\1\6\7\0" +
+            "\5\6\1\216\21\6\23\0\2\6\1\0\2\6\3\0" +
+            "\2\6\1\0\1\6\7\0\2\6\1\217\6\6\1\220" +
+            "\15\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\12\6\1\221\14\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\5\6\1\222" +
+            "\21\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\2\6\1\223\24\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\14\6\1\224" +
+            "\12\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\3\6\1\225\23\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\14\6\1\226" +
+            "\12\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\2\6\1\227\24\6\75\0\1\230\74\0" +
+            "\1\231\74\0\1\232\3\0\1\233\70\0\1\234\22\0" +
+            "\1\157\7\0\1\157\107\0\2\160\12\0\1\160\11\0" +
+            "\1\160\22\0\7\161\1\235\65\161\6\236\1\237\1\162" +
+            "\65\236\23\164\1\67\2\163\12\164\1\163\11\164\1\163" +
+            "\45\164\1\67\51\164\10\73\1\164\5\73\1\164\4\73" +
+            "\1\67\51\73\3\15\1\166\4\15\1\167\6\15\1\77" +
+            "\1\100\64\15\1\0\6\15\1\77\1\100\54\15\3\16" +
+            "\1\170\4\16\1\171\7\16\1\101\1\102\63\16\1\0" +
+            "\7\16\1\101\1\102\53\16\1\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\5\6\1\240\21\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\21\6\1\241\5\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\11\6\1\242\15\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\5\6\1\243\21\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\4\6\1\244\22\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\5\6\1\245\21\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\5\6\1\246\21\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\17\6\1\247\7\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\11\6\1\250\15\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\7\6\1\251\17\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\2\6\1\252\24\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\10\6\1\253\16\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\7\6\1\254\17\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\5\6\1\255\21\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\2\6\1\256\24\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\7\6\1\257\17\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\17\6\1\260\7\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\5\6\1\261\21\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\2\6\1\262\6\6" +
+            "\1\263\15\6\23\0\2\6\1\0\2\6\3\0\2\6" +
+            "\1\0\1\6\7\0\10\6\1\264\16\6\23\0\2\6" +
+            "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\20\6" +
+            "\1\265\6\6\23\0\2\6\1\0\2\6\3\0\2\6" +
+            "\1\0\1\6\7\0\10\6\1\266\16\6\23\0\2\6" +
+            "\1\0\2\6\3\0\2\6\1\0\1\6\7\0\13\6" +
+            "\1\267\13\6\75\0\1\270\21\0\6\161\1\271\1\235" +
+            "\65\161\7\236\1\272\65\236\1\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\23\6\1\273\3\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\21\6\1\274\5\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\3\6\1\275\23\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\6\6\1\276\20\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\2\6\1\277\24\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\5\6\1\300\21\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\10\6\1\301\16\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\17\6\1\302\7\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\4\6\1\303\22\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\2\6\1\304\24\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\7\6\1\305\17\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\16\6\1\306\10\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\20\6\1\307\6\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\14\6\1\310\12\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\2\6\1\311\24\6" +
+            "\23\0\2\6\1\0\2\6\3\0\2\6\1\0\1\6" +
+            "\7\0\13\6\1\312\13\6\23\0\2\6\1\0\2\6" +
+            "\3\0\2\6\1\0\1\6\7\0\5\6\1\313\21\6" +
+            "\22\0\6\236\1\237\1\272\65\236\1\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\6\6\1\314" +
+            "\20\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\12\6\1\315\14\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\14\6\1\316" +
+            "\12\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\14\6\1\317\12\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\10\6\1\320" +
+            "\16\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\20\6\1\321\6\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\10\6\1\322" +
+            "\16\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\5\6\1\323\21\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\12\6\1\324" +
+            "\14\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\12\6\1\325\14\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\12\6\1\326" +
+            "\14\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\21\6\1\327\5\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\22\6\1\330" +
+            "\4\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\2\6\1\331\24\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\17\6\1\332" +
+            "\7\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\4\6\1\333\22\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\5\6\1\334" +
+            "\21\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\12\6\1\335\14\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\5\6\1\336" +
+            "\21\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\5\6\1\337\21\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\13\6\1\340" +
+            "\13\6\23\0\2\6\1\0\2\6\3\0\2\6\1\0" +
+            "\1\6\7\0\21\6\1\341\5\6\23\0\2\6\1\0" +
+            "\2\6\3\0\2\6\1\0\1\6\7\0\6\6\1\342" +
+            "\20\6\22\0";
+
+    private static int[] zzUnpackTrans() {
+        int[] result = new int[9577];
+        int offset = 0;
+        offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
+        return result;
+    }
 
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private CharSequence zzBuffer = "";
+    private static int zzUnpackTrans(String packed, int offset, int[] result) {
+        int i = 0;       /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            value--;
+            do result[j++] = value;
+            while (--count > 0);
+        }
+        return j;
+    }
 
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
 
-  /** the textposition at the last state to be included in yytext */
-  private int zzPushbackPos;
+    /* error codes */
+    private static final int ZZ_UNKNOWN_ERROR = 0;
+    private static final int ZZ_NO_MATCH = 1;
+    private static final int ZZ_PUSHBACK_2BIG = 2;
+    private static final char[] EMPTY_BUFFER = new char[0];
+    private static final int YYEOF = -1;
+
+    /* error messages for the codes above */
+    private static final String ZZ_ERROR_MSG[] = {
+        "Unkown internal scanner error",
+        "Error: could not match input",
+        "Error: pushback value was too large"
+    };
+
+    /**
+     * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
+     */
+    private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
+
+    private static final String ZZ_ATTRIBUTE_PACKED_0 =
+        "\2\0\1\10\1\11\4\1\1\11\5\1\2\11\30\1" +
+            "\11\11\10\1\1\0\2\1\3\11\2\1\1\11\36\1" +
+            "\3\11\1\1\11\11\6\1\2\0\42\1\3\11\1\1" +
+            "\1\11\1\0\1\1\1\11\30\1\2\11\1\0\50\1";
+
+    private static int[] zzUnpackAttribute() {
+        int[] result = new int[226];
+        int offset = 0;
+        offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+        return result;
+    }
 
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
+    private static int zzUnpackAttribute(String packed, int offset, int[] result) {
+        int i = 0;       /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            do result[j++] = value;
+            while (--count > 0);
+        }
+        return j;
+    }
 
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
+    /**
+     * the current state of the DFA
+     */
+    private int zzState;
+
+    /**
+     * the current lexical state
+     */
+    private int zzLexicalState = YYINITIAL;
+
+    /**
+     * this buffer contains the current text to be matched and is
+     * the source of the yytext() string
+     */
+    private CharSequence zzBuffer = "";
+
+    /**
+     * the textposition at the last accepting state
+     */
+    private int zzMarkedPos;
+
+    /**
+     * the textposition at the last state to be included in yytext
+     */
+    private int zzPushbackPos;
+
+    /**
+     * the current text position in the buffer
+     */
+    private int zzCurrentPos;
+
+    /**
+     * startRead marks the beginning of the yytext() string in the buffer
+     */
+    private int zzStartRead;
+
+    /**
+     * endRead marks the last character in the buffer, that has been read
+     * from input
+     */
+    private int zzEndRead;
+
+    /**
+     * zzAtBOL == true <=> the scanner is currently at the beginning of a line
+     */
+    private boolean zzAtBOL = true;
+
+    /**
+     * zzAtEOF == true <=> the scanner is at the EOF
+     */
+    private boolean zzAtEOF;
+
+    private IElementType myTokenType;
+    private int myState;
+
+    /**
+     * denotes if the user-EOF-code has already been executed
+     */
+    private boolean zzEOFDone;
+
+
+    /**
+     * Unpacks the compressed character translation table.
+     *
+     * @param packed the packed character translation table
+     * @return the unpacked character translation table
+     */
+    private static char[] zzUnpackCMap(String packed) {
+        char[] map = new char[0x10000];
+        int i = 0;  /* index in packed string  */
+        int j = 0;  /* index in unpacked array */
+        while (i < 1772) {
+            int count = packed.charAt(i++);
+            char value = packed.charAt(i++);
+            do map[j++] = value;
+            while (--count > 0);
+        }
+        return map;
+    }
 
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
+    @Override
+    public IElementType getTokenType() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        return myTokenType;
+    }
 
-  /**
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
+    @Override
+    public final int getTokenStart() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        return zzStartRead;
+    }
 
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
+    @Override
+    public final int getTokenEnd() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        return getTokenStart() + yylength();
+    }
 
-  private IElementType myTokenType;
-  private int myState;
+    @Override
+    public void advance() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        myTokenType = null;
+    }
 
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
+    @Override
+    public int getState() {
+      if (myTokenType == null) {
+        locateToken();
+      }
+        return myState;
+    }
 
+    @Override
+    public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
+        reset(buffer, startOffset, endOffset, initialState);
+        myTokenType = null;
+    }
 
+    @Override
+    public CharSequence getBufferSequence() {
+        return zzBuffer;
+    }
 
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 1772) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
+    @Override
+    public int getBufferEnd() {
+        return zzEndRead;
     }
-    return map;
-  }
-
-  @Override
-  public IElementType getTokenType() {
-    if (myTokenType == null) locateToken();
-    return myTokenType;
-  }
-
-  @Override
-  public final int getTokenStart(){
-    if (myTokenType == null) locateToken();
-    return zzStartRead;
-  }
-
-  @Override
-  public final int getTokenEnd(){
-    if (myTokenType == null) locateToken();
-    return getTokenStart() + yylength();
-  }
-
-  @Override
-  public void advance() {
-    if (myTokenType == null) locateToken();
-    myTokenType = null;
-  }
-
-  @Override
-  public int getState() {
-    if (myTokenType == null) locateToken();
-    return myState;
-  }
-
-  @Override
-  public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
-    reset(buffer, startOffset, endOffset, initialState);
-    myTokenType = null;
-  }
-
-   @Override
-   public CharSequence getBufferSequence() {
-     return zzBuffer;
-   }
-
-   @Override
-   public int getBufferEnd() {
-     return zzEndRead;
-   }
-
-  public void reset(CharSequence buffer, int start, int end,int initialState){
-    zzBuffer = buffer;
-    zzCurrentPos = zzMarkedPos = zzStartRead = start;
-    zzPushbackPos = 0;
-    zzAtEOF  = false;
-    zzAtBOL = true;
-    zzEndRead = end;
-    yybegin(initialState);
-    myTokenType = null;
-  }
-
-   private void locateToken() {
-     if (myTokenType != null) return;
-     try {
-       myState = yystate();
-       myTokenType = advanceImpl();
-     }
-     catch (java.io.IOException e) { /*Can't happen*/ }
-     catch (Error e) {
-       // add lexer class name to the error
-       final Error error = new Error(getClass().getName() + ": " + e.getMessage());
-       error.setStackTrace(e.getStackTrace());
-       throw error;
-     }
-   }
-
-   /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   *
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-    return true;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  public final CharSequence yytext() {
-    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the
-   * matched text.
-   *
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch.
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  public final char yycharat(int pos) {
-    return zzBuffer.charAt(zzStartRead+pos);
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of
-   * yypushback(int) and a match-all fallback rule) this method
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
+
+    public void reset(CharSequence buffer, int start, int end, int initialState) {
+        zzBuffer = buffer;
+        zzCurrentPos = zzMarkedPos = zzStartRead = start;
+        zzPushbackPos = 0;
+        zzAtEOF = false;
+        zzAtBOL = true;
+        zzEndRead = end;
+        yybegin(initialState);
+        myTokenType = null;
     }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+
+    private void locateToken() {
+      if (myTokenType != null) {
+        return;
+      }
+        try {
+            myState = yystate();
+            myTokenType = advanceImpl();
+        }
+        catch (java.io.IOException e) { /*Can't happen*/ }
+        catch (Error e) {
+            // add lexer class name to the error
+            final Error error = new Error(getClass().getName() + ": " + e.getMessage());
+            error.setStackTrace(e.getStackTrace());
+            throw error;
+        }
     }
 
-    throw new Error(message);
-  }
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-  /**
-   * Contains user EOF-code, which will be executed exactly once,
-   * when the end of file is reached
-   */
-  private void zzDoEOF() {
-    if (!zzEOFDone) {
-      zzEOFDone = true;
-    
+    /**
+     * Refills the input buffer.
+     *
+     * @return <code>false</code>, iff there was new input.
+     * @throws java.io.IOException if any I/O-Error occurs
+     */
+    private boolean zzRefill() throws java.io.IOException {
+        return true;
     }
-  }
 
 
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public IElementType advanceImpl() throws java.io.IOException {
-    int zzInput;
-    int zzAction;
+    /**
+     * Returns the current lexical state.
+     */
+    public final int yystate() {
+        return zzLexicalState;
+    }
 
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    CharSequence zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
 
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
+    /**
+     * Enters a new lexical state
+     *
+     * @param newState the new lexical state
+     */
+    public final void yybegin(int newState) {
+        zzLexicalState = newState;
+    }
 
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
 
-      zzAction = -1;
+    /**
+     * Returns the text matched by the current regular expression.
+     */
+    public final CharSequence yytext() {
+        return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
+    }
 
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
 
-      zzState = ZZ_LEXSTATE[zzLexicalState];
+    /**
+     * Returns the character at position <tt>pos</tt> from the
+     * matched text.
+     * <p>
+     * It is equivalent to yytext().charAt(pos), but faster
+     *
+     * @param pos the position of the character to fetch.
+     *            A value from 0 to yylength()-1.
+     * @return the character at position pos
+     */
+    public final char yycharat(int pos) {
+        return zzBuffer.charAt(zzStartRead + pos);
+    }
 
 
-      zzForAction: {
-        while (true) {
+    /**
+     * Returns the length of the matched text region.
+     */
+    public final int yylength() {
+        return zzMarkedPos - zzStartRead;
+    }
 
-          if (zzCurrentPosL < zzEndReadL)
-            zzInput = zzBufferL.charAt(zzCurrentPosL++);
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = zzBufferL.charAt(zzCurrentPosL++);
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
-
-          int zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
 
+    /**
+     * Reports an error that occured while scanning.
+     * <p>
+     * In a wellformed scanner (no or only correct usage of
+     * yypushback(int) and a match-all fallback rule) this method
+     * will only be called with things that "Can't Possibly Happen".
+     * If this method is called, something is seriously wrong
+     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     * <p>
+     * Usual syntax/scanner level error handling should be done
+     * in error fallback rules.
+     *
+     * @param errorCode the code of the errormessage to display
+     */
+    private void zzScanError(int errorCode) {
+        String message;
+        try {
+            message = ZZ_ERROR_MSG[errorCode];
         }
-      }
+        catch (ArrayIndexOutOfBoundsException e) {
+            message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+        }
+
+        throw new Error(message);
+    }
 
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 90: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD;
-          }
-        case 94: break;
-        case 29: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COLON;
-          }
-        case 95: break;
-        case 4: 
-          { return JSTokenTypes.WHITE_SPACE;
-          }
-        case 96: break;
-        case 32: 
-          { return JSTokenTypes.REGEXP_LITERAL;
-          }
-        case 97: break;
-        case 83: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD;
-          }
-        case 98: break;
-        case 21: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LPAR;
-          }
-        case 99: break;
-        case 69: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD;
-          }
-        case 100: break;
-        case 44: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GE;
-          }
-        case 101: break;
-        case 86: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD;
-          }
-        case 102: break;
-        case 34: 
-          { return JSTokenTypes.C_STYLE_COMMENT;
-          }
-        case 103: break;
-        case 49: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OROR;
-          }
-        case 104: break;
-        case 56: 
-          { return JSTokenTypes.DOC_COMMENT;
-          }
-        case 105: break;
-        case 58: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD;
-          }
-        case 106: break;
-        case 66: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ;
-          }
-        case 107: break;
-        case 26: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COMMA;
-          }
-        case 108: break;
-        case 13: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQ;
-          }
-        case 109: break;
-        case 37: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD;
-          }
-        case 110: break;
-        case 47: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDAND;
-          }
-        case 111: break;
-        case 43: 
-          { return JSTokenTypes.PLUSPLUS;
-          }
-        case 112: break;
-        case 10: 
-          { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL;
-          }
-        case 113: break;
-        case 3: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.IDENTIFIER;
-          }
-        case 114: break;
-        case 5: 
-          { return JSTokenTypes.DIV;
-          }
-        case 115: break;
-        case 25: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON;
-          }
-        case 116: break;
-        case 50: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOREQ;
-          }
-        case 117: break;
-        case 84: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD;
-          }
-        case 118: break;
-        case 71: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD;
-          }
-        case 119: break;
-        case 68: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ;
-          }
-        case 120: break;
-        case 57: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD;
-          }
-        case 121: break;
-        case 6: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULT;
-          }
-        case 122: break;
-        case 53: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ;
-          }
-        case 123: break;
-        case 17: 
-          { yybegin(YYINITIAL); return JSTokenTypes.AND;
-          }
-        case 124: break;
-        case 60: 
-          { yybegin(YYINITIAL); return JSTokenTypes.SET_KEYWORD;
-          }
-        case 125: break;
-        case 64: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ;
-          }
-        case 126: break;
-        case 70: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD;
-          }
-        case 127: break;
-        case 36: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ;
-          }
-        case 128: break;
-        case 52: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ;
-          }
-        case 129: break;
-        case 63: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GET_KEYWORD;
-          }
-        case 130: break;
-        case 62: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD;
-          }
-        case 131: break;
-        case 15: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUS;
-          }
-        case 132: break;
-        case 33: 
-          { return JSTokenTypes.END_OF_LINE_COMMENT;
-          }
-        case 133: break;
-        case 72: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD;
-          }
-        case 134: break;
-        case 80: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD;
-          }
-        case 135: break;
-        case 40: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EQEQ;
-          }
-        case 136: break;
-        case 1: 
-          { return JSTokenTypes.BAD_CHARACTER;
-          }
-        case 137: break;
-        case 88: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD;
-          }
-        case 138: break;
-        case 87: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD;
-          }
-        case 139: break;
-        case 77: 
-          { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD;
-          }
-        case 140: break;
-        case 81: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD;
-          }
-        case 141: break;
-        case 46: 
-          { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ;
-          }
-        case 142: break;
-        case 55: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LTLT;
-          }
-        case 143: break;
-        case 31: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LT;
-          }
-        case 144: break;
-        case 75: 
-          { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD;
-          }
-        case 145: break;
-        case 14: 
-          { yybegin(YYINITIAL); return JSTokenTypes.EXCL;
-          }
-        case 146: break;
-        case 38: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD;
-          }
-        case 147: break;
-        case 65: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ;
-          }
-        case 148: break;
-        case 42: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ;
-          }
-        case 149: break;
-        case 48: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OREQ;
-          }
-        case 150: break;
-        case 91: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD;
-          }
-        case 151: break;
-        case 67: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT;
-          }
-        case 152: break;
-        case 45: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGT;
-          }
-        case 153: break;
-        case 27: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TILDE;
-          }
-        case 154: break;
-        case 89: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD;
-          }
-        case 155: break;
-        case 59: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LET_KEYWORD;
-          }
-        case 156: break;
-        case 2: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL;
-          }
-        case 157: break;
-        case 19: 
-          { yybegin(YYINITIAL); return JSTokenTypes.XOR;
-          }
-        case 158: break;
-        case 30: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DIV;
-          }
-        case 159: break;
-        case 16: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GT;
-          }
-        case 160: break;
-        case 39: 
-          { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD;
-          }
-        case 161: break;
-        case 85: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD;
-          }
-        case 162: break;
-        case 82: 
-          { yybegin(YYINITIAL); return JSTokenTypes.YIELD_KEYWORD;
-          }
-        case 163: break;
-        case 61: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD;
-          }
-        case 164: break;
-        case 78: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD;
-          }
-        case 165: break;
-        case 9: 
-          { return  JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
-          }
-        case 166: break;
-        case 18: 
-          { yybegin(YYINITIAL); return JSTokenTypes.OR;
-          }
-        case 167: break;
-        case 51: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ;
-          }
-        case 168: break;
-        case 8: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUS;
-          }
-        case 169: break;
-        case 35: 
-          { return JSTokenTypes.MINUSMINUS;
-          }
-        case 170: break;
-        case 28: 
-          { yybegin(YYINITIAL); return JSTokenTypes.QUEST;
-          }
-        case 171: break;
-        case 79: 
-          { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD;
-          }
-        case 172: break;
-        case 7: 
-          { yybegin(YYINITIAL); return JSTokenTypes.DOT;
-          }
-        case 173: break;
-        case 73: 
-          { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD;
-          }
-        case 174: break;
-        case 12: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RBRACKET;
-          }
-        case 175: break;
-        case 24: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RBRACE;
-          }
-        case 176: break;
-        case 93: 
-          { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD;
-          }
-        case 177: break;
-        case 41: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NE;
-          }
-        case 178: break;
-        case 23: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACE;
-          }
-        case 179: break;
-        case 22: 
-          { yybegin(DIV_OR_GT);       return JSTokenTypes.RPAR;
-          }
-        case 180: break;
-        case 20: 
-          { yybegin(YYINITIAL); return JSTokenTypes.PERC;
-          }
-        case 181: break;
-        case 74: 
-          { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD;
-          }
-        case 182: break;
-        case 54: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LE;
-          }
-        case 183: break;
-        case 11: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET;
-          }
-        case 184: break;
-        case 76: 
-          { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ;
-          }
-        case 185: break;
-        case 92: 
-          { yybegin(DIV_OR_GT); return JSTokenTypes.UNDEFINED_KEYWORD;
-          }
-        case 186: break;
-        default:
-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-            zzAtEOF = true;
-            zzDoEOF();
-            return null;
-          }
-          else {
-            zzScanError(ZZ_NO_MATCH);
-          }
+
+    /**
+     * Pushes the specified amount of characters back into the input stream.
+     * <p>
+     * They will be read again by then next call of the scanning method
+     *
+     * @param number the number of characters to be read again.
+     *               This number must not be greater than yylength()!
+     */
+    public void yypushback(int number) {
+      if (number > yylength()) {
+        zzScanError(ZZ_PUSHBACK_2BIG);
       }
+
+        zzMarkedPos -= number;
+    }
+
+
+    /**
+     * Contains user EOF-code, which will be executed exactly once,
+     * when the end of file is reached
+     */
+    private void zzDoEOF() {
+        if (!zzEOFDone) {
+            zzEOFDone = true;
+
+        }
     }
-  }
 
 
+    /**
+     * Resumes scanning until the next regular expression is matched,
+     * the end of input is encountered or an I/O-Error occurs.
+     *
+     * @return the next token
+     * @throws java.io.IOException if any I/O-Error occurs
+     */
+    public IElementType advanceImpl() throws java.io.IOException {
+        int zzInput;
+        int zzAction;
+
+        // cached fields:
+        int zzCurrentPosL;
+        int zzMarkedPosL;
+        int zzEndReadL = zzEndRead;
+        CharSequence zzBufferL = zzBuffer;
+        char[] zzCMapL = ZZ_CMAP;
+
+        int[] zzTransL = ZZ_TRANS;
+        int[] zzRowMapL = ZZ_ROWMAP;
+        int[] zzAttrL = ZZ_ATTRIBUTE;
+
+        while (true) {
+            zzMarkedPosL = zzMarkedPos;
+
+            zzAction = -1;
+
+            zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+
+            zzState = ZZ_LEXSTATE[zzLexicalState];
+
+
+            zzForAction:
+            {
+                while (true) {
+
+                  if (zzCurrentPosL < zzEndReadL) {
+                    zzInput = zzBufferL.charAt(zzCurrentPosL++);
+                  }
+                  else if (zzAtEOF) {
+                    zzInput = YYEOF;
+                    break zzForAction;
+                  }
+                  else {
+                    // store back cached positions
+                    zzCurrentPos = zzCurrentPosL;
+                    zzMarkedPos = zzMarkedPosL;
+                    boolean eof = zzRefill();
+                    // get translated positions and possibly new buffer
+                    zzCurrentPosL = zzCurrentPos;
+                    zzMarkedPosL = zzMarkedPos;
+                    zzBufferL = zzBuffer;
+                    zzEndReadL = zzEndRead;
+                    if (eof) {
+                      zzInput = YYEOF;
+                      break zzForAction;
+                    }
+                    else {
+                      zzInput = zzBufferL.charAt(zzCurrentPosL++);
+                    }
+                  }
+                    int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]];
+                  if (zzNext == -1) {
+                    break zzForAction;
+                  }
+                    zzState = zzNext;
+
+                    int zzAttributes = zzAttrL[zzState];
+                    if ((zzAttributes & 1) == 1) {
+                        zzAction = zzState;
+                        zzMarkedPosL = zzCurrentPosL;
+                      if ((zzAttributes & 8) == 8) {
+                        break zzForAction;
+                      }
+                    }
+
+                }
+            }
+
+            // store back cached position
+            zzMarkedPos = zzMarkedPosL;
+
+            switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+                case 90: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.FUNCTION_KEYWORD;
+                }
+                case 94:
+                    break;
+                case 29: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.COLON;
+                }
+                case 95:
+                    break;
+                case 4: {
+                    return JSTokenTypes.WHITE_SPACE;
+                }
+                case 96:
+                    break;
+                case 32: {
+                    return JSTokenTypes.REGEXP_LITERAL;
+                }
+                case 97:
+                    break;
+                case 83: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.WHILE_KEYWORD;
+                }
+                case 98:
+                    break;
+                case 21: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LPAR;
+                }
+                case 99:
+                    break;
+                case 69: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.TRUE_KEYWORD;
+                }
+                case 100:
+                    break;
+                case 44: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GE;
+                }
+                case 101:
+                    break;
+                case 86: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.SWITCH_KEYWORD;
+                }
+                case 102:
+                    break;
+                case 34: {
+                    return JSTokenTypes.C_STYLE_COMMENT;
+                }
+                case 103:
+                    break;
+                case 49: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.OROR;
+                }
+                case 104:
+                    break;
+                case 56: {
+                    return JSTokenTypes.DOC_COMMENT;
+                }
+                case 105:
+                    break;
+                case 58: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.FOR_KEYWORD;
+                }
+                case 106:
+                    break;
+                case 66: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GTGTEQ;
+                }
+                case 107:
+                    break;
+                case 26: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.COMMA;
+                }
+                case 108:
+                    break;
+                case 13: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.EQ;
+                }
+                case 109:
+                    break;
+                case 37: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DO_KEYWORD;
+                }
+                case 110:
+                    break;
+                case 47: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.ANDAND;
+                }
+                case 111:
+                    break;
+                case 43: {
+                    return JSTokenTypes.PLUSPLUS;
+                }
+                case 112:
+                    break;
+                case 10: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.STRING_LITERAL;
+                }
+                case 113:
+                    break;
+                case 3: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.IDENTIFIER;
+                }
+                case 114:
+                    break;
+                case 5: {
+                    return JSTokenTypes.DIV;
+                }
+                case 115:
+                    break;
+                case 25: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.SEMICOLON;
+                }
+                case 116:
+                    break;
+                case 50: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.XOREQ;
+                }
+                case 117:
+                    break;
+                case 84: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.TYPEOF_KEYWORD;
+                }
+                case 118:
+                    break;
+                case 71: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.ELSE_KEYWORD;
+                }
+                case 119:
+                    break;
+                case 68: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LTLTEQ;
+                }
+                case 120:
+                    break;
+                case 57: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.TRY_KEYWORD;
+                }
+                case 121:
+                    break;
+                case 6: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.MULT;
+                }
+                case 122:
+                    break;
+                case 53: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.MULTEQ;
+                }
+                case 123:
+                    break;
+                case 17: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.AND;
+                }
+                case 124:
+                    break;
+                case 60: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.SET_KEYWORD;
+                }
+                case 125:
+                    break;
+                case 64: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.EQEQEQ;
+                }
+                case 126:
+                    break;
+                case 70: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.THIS_KEYWORD;
+                }
+                case 127:
+                    break;
+                case 36: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.MINUSEQ;
+                }
+                case 128:
+                    break;
+                case 52: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DIVEQ;
+                }
+                case 129:
+                    break;
+                case 63: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GET_KEYWORD;
+                }
+                case 130:
+                    break;
+                case 62: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.VAR_KEYWORD;
+                }
+                case 131:
+                    break;
+                case 15: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.PLUS;
+                }
+                case 132:
+                    break;
+                case 33: {
+                    return JSTokenTypes.END_OF_LINE_COMMENT;
+                }
+                case 133:
+                    break;
+                case 72: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.NULL_KEYWORD;
+                }
+                case 134:
+                    break;
+                case 80: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.CATCH_KEYWORD;
+                }
+                case 135:
+                    break;
+                case 40: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.EQEQ;
+                }
+                case 136:
+                    break;
+                case 1: {
+                    return JSTokenTypes.BAD_CHARACTER;
+                }
+                case 137:
+                    break;
+                case 88: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.FINALLY_KEYWORD;
+                }
+                case 138:
+                    break;
+                case 87: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DELETE_KEYWORD;
+                }
+                case 139:
+                    break;
+                case 77: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.THROW_KEYWORD;
+                }
+                case 140:
+                    break;
+                case 81: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.CONST_KEYWORD;
+                }
+                case 141:
+                    break;
+                case 46: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.ANDEQ;
+                }
+                case 142:
+                    break;
+                case 55: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LTLT;
+                }
+                case 143:
+                    break;
+                case 31: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LT;
+                }
+                case 144:
+                    break;
+                case 75: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.VOID_KEYWORD;
+                }
+                case 145:
+                    break;
+                case 14: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.EXCL;
+                }
+                case 146:
+                    break;
+                case 38: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.IF_KEYWORD;
+                }
+                case 147:
+                    break;
+                case 65: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.NEQEQ;
+                }
+                case 148:
+                    break;
+                case 42: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.PLUSEQ;
+                }
+                case 149:
+                    break;
+                case 48: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.OREQ;
+                }
+                case 150:
+                    break;
+                case 91: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.CONTINUE_KEYWORD;
+                }
+                case 151:
+                    break;
+                case 67: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GTGTGT;
+                }
+                case 152:
+                    break;
+                case 45: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GTGT;
+                }
+                case 153:
+                    break;
+                case 27: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.TILDE;
+                }
+                case 154:
+                    break;
+                case 89: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DEFAULT_KEYWORD;
+                }
+                case 155:
+                    break;
+                case 59: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LET_KEYWORD;
+                }
+                case 156:
+                    break;
+                case 2: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.NUMERIC_LITERAL;
+                }
+                case 157:
+                    break;
+                case 19: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.XOR;
+                }
+                case 158:
+                    break;
+                case 30: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DIV;
+                }
+                case 159:
+                    break;
+                case 16: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GT;
+                }
+                case 160:
+                    break;
+                case 39: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.IN_KEYWORD;
+                }
+                case 161:
+                    break;
+                case 85: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.RETURN_KEYWORD;
+                }
+                case 162:
+                    break;
+                case 82: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.YIELD_KEYWORD;
+                }
+                case 163:
+                    break;
+                case 61: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.NEW_KEYWORD;
+                }
+                case 164:
+                    break;
+                case 78: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.FALSE_KEYWORD;
+                }
+                case 165:
+                    break;
+                case 9: {
+                    return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
+                }
+                case 166:
+                    break;
+                case 18: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.OR;
+                }
+                case 167:
+                    break;
+                case 51: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.PERCEQ;
+                }
+                case 168:
+                    break;
+                case 8: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.MINUS;
+                }
+                case 169:
+                    break;
+                case 35: {
+                    return JSTokenTypes.MINUSMINUS;
+                }
+                case 170:
+                    break;
+                case 28: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.QUEST;
+                }
+                case 171:
+                    break;
+                case 79: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.BREAK_KEYWORD;
+                }
+                case 172:
+                    break;
+                case 7: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.DOT;
+                }
+                case 173:
+                    break;
+                case 73: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.CASE_KEYWORD;
+                }
+                case 174:
+                    break;
+                case 12: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.RBRACKET;
+                }
+                case 175:
+                    break;
+                case 24: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.RBRACE;
+                }
+                case 176:
+                    break;
+                case 93: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.INSTANCEOF_KEYWORD;
+                }
+                case 177:
+                    break;
+                case 41: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.NE;
+                }
+                case 178:
+                    break;
+                case 23: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LBRACE;
+                }
+                case 179:
+                    break;
+                case 22: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.RPAR;
+                }
+                case 180:
+                    break;
+                case 20: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.PERC;
+                }
+                case 181:
+                    break;
+                case 74: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.WITH_KEYWORD;
+                }
+                case 182:
+                    break;
+                case 54: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LE;
+                }
+                case 183:
+                    break;
+                case 11: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LBRACKET;
+                }
+                case 184:
+                    break;
+                case 76: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.GTGTGTEQ;
+                }
+                case 185:
+                    break;
+                case 92: {
+                    yybegin(DIV_OR_GT);
+                    return JSTokenTypes.UNDEFINED_KEYWORD;
+                }
+                case 186:
+                    break;
+                default:
+                    if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+                        zzAtEOF = true;
+                        zzDoEOF();
+                        return null;
+                    }
+                    else {
+                        zzScanError(ZZ_NO_MATCH);
+                    }
+            }
+        }
+    }
 }
diff --git a/lang-version-impl/javascript17-impl/src/main/java/module-info.java b/lang-version-impl/javascript17-impl/src/main/java/module-info.java
index bdde4e91..4fa46039 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/module-info.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/module-info.java
@@ -2,10 +2,9 @@
  * @author VISTALL
  * @since 23-Aug-22
  */
-module consulo.javascript.javascript17.impl
-{
-	requires transitive consulo.javascript.base.impl;
+module consulo.javascript.javascript17.impl {
+    requires transitive consulo.javascript.base.impl;
 
-	exports consulo.javascript.javascript17.lang;
-	exports consulo.javascript.javascript17.lang.lexer;
+    exports consulo.javascript.javascript17.lang;
+    exports consulo.javascript.javascript17.lang.lexer;
 }
\ No newline at end of file
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
index 2c8bf63d..6fb550dc 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
@@ -26,6 +26,7 @@
 import consulo.language.lexer.Lexer;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.function.Supplier;
 
 /**
@@ -33,45 +34,38 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScript185LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
-{
-	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
+public class JavaScript185LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
+    private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
-	@Nonnull
-	public static JavaScript185LanguageVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript185LanguageVersion.class);
-	}
+    @Nonnull
+    public static JavaScript185LanguageVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript185LanguageVersion.class);
+    }
 
-	public JavaScript185LanguageVersion()
-	{
-		super("JAVASCRIPT_1_8_5");
-	}
+    public JavaScript185LanguageVersion() {
+        super("JAVASCRIPT_1_8_5");
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "JavaScript 1.8.5";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "JavaScript 1.8.5";
+    }
 
-	@Nonnull
-	@Override
-	public Lexer createLexer()
-	{
-		return ourLexerFactory.get();
-	}
+    @Nonnull
+    @Override
+    public Lexer createLexer() {
+        return ourLexerFactory.get();
+    }
 
-	@Nonnull
-	@Override
-	public SyntaxHighlighter getSyntaxHighlighter()
-	{
-		return new JavaScriptHighlighter(ourLexerFactory);
-	}
+    @Nonnull
+    @Override
+    public SyntaxHighlighter getSyntaxHighlighter() {
+        return new JavaScriptHighlighter(ourLexerFactory);
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 40;
-	}
+    @Override
+    public int getWeight() {
+        return 40;
+    }
 }
\ No newline at end of file
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
index c5eaad98..98f9195a 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
@@ -33,45 +33,38 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScript18LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
-{
-	private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
+public class JavaScript18LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
+    private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
-	@Nonnull
-	public static JavaScript18LanguageVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript18LanguageVersion.class);
-	}
+    @Nonnull
+    public static JavaScript18LanguageVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript18LanguageVersion.class);
+    }
 
-	public JavaScript18LanguageVersion()
-	{
-		super("JAVASCRIPT_1_8");
-	}
+    public JavaScript18LanguageVersion() {
+        super("JAVASCRIPT_1_8");
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "JavaScript 1.8";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "JavaScript 1.8";
+    }
 
-	@Nonnull
-	@Override
-	public Lexer createLexer()
-	{
-		return ourLexerFactory.get();
-	}
+    @Nonnull
+    @Override
+    public Lexer createLexer() {
+        return ourLexerFactory.get();
+    }
 
-	@Nonnull
-	@Override
-	public SyntaxHighlighter getSyntaxHighlighter()
-	{
-		return new JavaScriptHighlighter(ourLexerFactory);
-	}
+    @Nonnull
+    @Override
+    public SyntaxHighlighter getSyntaxHighlighter() {
+        return new JavaScriptHighlighter(ourLexerFactory);
+    }
 
-	@Override
-	public int getWeight()
-	{
-		return 30;
-	}
+    @Override
+    public int getWeight() {
+        return 30;
+    }
 }
\ No newline at end of file
diff --git a/lang-version-impl/javascript18-impl/src/main/java/module-info.java b/lang-version-impl/javascript18-impl/src/main/java/module-info.java
index f169dd24..0693d8fc 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/module-info.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/module-info.java
@@ -2,11 +2,10 @@
  * @author VISTALL
  * @since 23-Aug-22
  */
-module consulo.javascript.javascript18.impl
-{
-	requires transitive consulo.javascript.base.impl;
+module consulo.javascript.javascript18.impl {
+    requires transitive consulo.javascript.base.impl;
 
-	requires consulo.javascript.javascript17.impl;
+    requires consulo.javascript.javascript17.impl;
 
-	exports consulo.javascript.javascript18.lang;
+    exports consulo.javascript.javascript18.lang;
 }
\ No newline at end of file
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java
index f45cb566..a832ee47 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java
@@ -20,7 +20,5 @@
  * @author VISTALL
  * @since 10.11.2015
  */
-public interface JomElement
-{
-
+public interface JomElement {
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
index 8437d4be..c614fd6a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
@@ -29,25 +29,22 @@
  * @since 10.11.2015
  */
 @ExtensionAPI(ComponentScope.APPLICATION)
-public abstract class JomFileDescriptor<T extends JomElement>
-{
-	public static ExtensionPointName<JomFileDescriptor> EP_NAME = ExtensionPointName.create(JomFileDescriptor.class);
+public abstract class JomFileDescriptor<T extends JomElement> {
+    public static ExtensionPointName<JomFileDescriptor> EP_NAME = ExtensionPointName.create(JomFileDescriptor.class);
 
-	private Class<T> myDefinitionClass;
+    private Class<T> myDefinitionClass;
 
-	public JomFileDescriptor(@Nonnull Class<T> definitionClass)
-	{
-		myDefinitionClass = definitionClass;
-	}
+    public JomFileDescriptor(@Nonnull Class<T> definitionClass) {
+        myDefinitionClass = definitionClass;
+    }
 
-	@Nonnull
-	public Class<T> getDefinitionClass()
-	{
-		return myDefinitionClass;
-	}
+    @Nonnull
+    public Class<T> getDefinitionClass() {
+        return myDefinitionClass;
+    }
 
-	@Nonnull
-	public abstract Image getIcon();
+    @Nonnull
+    public abstract Image getIcon();
 
-	public abstract boolean isMyFile(@Nonnull PsiFile psiFile);
+    public abstract boolean isMyFile(@Nonnull PsiFile psiFile);
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
index 3c47c095..4c99508a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
@@ -23,40 +23,39 @@
 import consulo.util.lang.lazy.LazyValue;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.function.Supplier;
 
 /**
  * @author VISTALL
  * @since 10.11.2015
  */
-public class JomFileElement<T extends JomElement>
-{
-	private final JomFileDescriptor<T> myFileDescriptor;
-	private final JSFile myPsiFile;
-	private final Supplier<T> myRootValue;
-
-	public JomFileElement(JSFile psiFile, JomFileDescriptor<T> fileDescriptor)
-	{
-		myPsiFile = psiFile;
-		myFileDescriptor = fileDescriptor;
-		myRootValue = LazyValue.notNull(() -> (T) JomProxyInvocationHandler.createProxy(myFileDescriptor.getDefinitionClass(), PsiTreeUtil.findChildOfType(myPsiFile, JSObjectLiteralExpression.class)));
-	}
-
-	@Nonnull
-	public T getRootElement()
-	{
-		return myRootValue.get();
-	}
-
-	@Nonnull
-	public JomFileDescriptor<T> getFileDescriptor()
-	{
-		return myFileDescriptor;
-	}
-
-	@Nonnull
-	public JSFile getFile()
-	{
-		return myPsiFile;
-	}
+public class JomFileElement<T extends JomElement> {
+    private final JomFileDescriptor<T> myFileDescriptor;
+    private final JSFile myPsiFile;
+    private final Supplier<T> myRootValue;
+
+    public JomFileElement(JSFile psiFile, JomFileDescriptor<T> fileDescriptor) {
+        myPsiFile = psiFile;
+        myFileDescriptor = fileDescriptor;
+        myRootValue = LazyValue.notNull(() -> (T)JomProxyInvocationHandler.createProxy(
+            myFileDescriptor.getDefinitionClass(),
+            PsiTreeUtil.findChildOfType(myPsiFile, JSObjectLiteralExpression.class)
+        ));
+    }
+
+    @Nonnull
+    public T getRootElement() {
+        return myRootValue.get();
+    }
+
+    @Nonnull
+    public JomFileDescriptor<T> getFileDescriptor() {
+        return myFileDescriptor;
+    }
+
+    @Nonnull
+    public JSFile getFile() {
+        return myPsiFile;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java
index e6ba5e1f..c76fca2e 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java
@@ -4,24 +4,19 @@
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomBadValueExpressionException extends RuntimeException
-{
-	public JomBadValueExpressionException()
-	{
-	}
+public class JomBadValueExpressionException extends RuntimeException {
+    public JomBadValueExpressionException() {
+    }
 
-	public JomBadValueExpressionException(String message)
-	{
-		super(message);
-	}
+    public JomBadValueExpressionException(String message) {
+        super(message);
+    }
 
-	public JomBadValueExpressionException(String message, Throwable cause)
-	{
-		super(message, cause);
-	}
+    public JomBadValueExpressionException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-	public JomBadValueExpressionException(Throwable cause)
-	{
-		super(cause);
-	}
+    public JomBadValueExpressionException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
index f16689ec..f14e766b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
@@ -17,63 +17,56 @@
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomProxyInvocationHandler implements InvocationHandler
-{
-	@Nonnull
-	public static JomElement createProxy(@Nonnull Class<?> interfaceClass, @Nullable final JSObjectLiteralExpression objectLiteralExpression)
-	{
-		return (JomElement) Proxy.newProxyInstance(interfaceClass.getClassLoader(), new Class[]{interfaceClass}, new JomProxyInvocationHandler(objectLiteralExpression));
-	}
+public class JomProxyInvocationHandler implements InvocationHandler {
+    @Nonnull
+    public static JomElement createProxy(
+        @Nonnull Class<?> interfaceClass,
+        @Nullable final JSObjectLiteralExpression objectLiteralExpression
+    ) {
+        return (JomElement)Proxy.newProxyInstance(
+            interfaceClass.getClassLoader(),
+            new Class[]{interfaceClass},
+            new JomProxyInvocationHandler(objectLiteralExpression)
+        );
+    }
 
-	private JSObjectLiteralExpression myObjectLiteralExpression;
+    private JSObjectLiteralExpression myObjectLiteralExpression;
 
-	public JomProxyInvocationHandler(@Nullable JSObjectLiteralExpression objectLiteralExpression)
-	{
-		myObjectLiteralExpression = objectLiteralExpression;
-	}
+    public JomProxyInvocationHandler(@Nullable JSObjectLiteralExpression objectLiteralExpression) {
+        myObjectLiteralExpression = objectLiteralExpression;
+    }
 
-	@Override
-	@RequiredReadAction
-	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
-	{
-		String propertyName = JomUtil.getJsonGetPropertyName(method);
-		if(propertyName != null)
-		{
-			JSProperty jsProperty = findProperty(myObjectLiteralExpression, propertyName);
-			if(jsProperty == null)
-			{
-				return JomValueConverter.getDefaultValueForType(method.getReturnType());
-			}
-			else
-			{
-				try
-				{
-					return JomValueConverter.convertToObject(method.getReturnType(), method.getGenericReturnType(), jsProperty.getValue());
-				}
-				catch(JomBadValueExpressionException e)
-				{
-					return JomValueConverter.getDefaultValueForType(method.getReturnType());
-				}
-			}
-		}
-		return null;
-	}
+    @Override
+    @RequiredReadAction
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        String propertyName = JomUtil.getJsonGetPropertyName(method);
+        if (propertyName != null) {
+            JSProperty jsProperty = findProperty(myObjectLiteralExpression, propertyName);
+            if (jsProperty == null) {
+                return JomValueConverter.getDefaultValueForType(method.getReturnType());
+            }
+            else {
+                try {
+                    return JomValueConverter.convertToObject(method.getReturnType(), method.getGenericReturnType(), jsProperty.getValue());
+                }
+                catch (JomBadValueExpressionException e) {
+                    return JomValueConverter.getDefaultValueForType(method.getReturnType());
+                }
+            }
+        }
+        return null;
+    }
 
-
-	@Nullable
-	private static JSProperty findProperty(@Nullable JSObjectLiteralExpression objectLiteralExpression, String name)
-	{
-		if(objectLiteralExpression == null)
-		{
-			return null;
-		}
-		for(JSProperty property : objectLiteralExpression.getProperties())
-		{
-			if(Comparing.equal(property.getName(), name))
-			{
-				return property;
-			}
-		}
-		return null;
-	}
+    @Nullable
+    private static JSProperty findProperty(@Nullable JSObjectLiteralExpression objectLiteralExpression, String name) {
+        if (objectLiteralExpression == null) {
+            return null;
+        }
+        for (JSProperty property : objectLiteralExpression.getProperties()) {
+            if (Comparing.equal(property.getName(), name)) {
+                return property;
+            }
+        }
+        return null;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
index b4556dd2..a15d9f4b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
@@ -10,6 +10,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
 import java.util.*;
@@ -18,115 +19,106 @@
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomValueConverter
-{
-	public interface Converter<T>
-	{
-		T getDefaultValue();
-
-		@RequiredReadAction
-		T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException;
-	}
-
-	private static Map<Class, Converter> ourDefaultConverters = new HashMap<Class, Converter>();
-
-	static
-	{
-		// primitives
-		ourDefaultConverters.put(byte.class, new JomNumberValue<Byte>(Byte.class));
-		ourDefaultConverters.put(short.class, new JomNumberValue<Short>(Short.class));
-		ourDefaultConverters.put(int.class, new JomNumberValue<Integer>(Integer.class));
-		ourDefaultConverters.put(long.class, new JomNumberValue<Long>(Long.class));
-		ourDefaultConverters.put(float.class, new JomNumberValue<Float>(Float.class));
-		ourDefaultConverters.put(double.class, new JomNumberValue<Double>(Double.class));
-		ourDefaultConverters.put(boolean.class, new JomBooleanValue(Boolean.FALSE));
-
-		// primitive wrappers
-		ourDefaultConverters.put(Byte.class, new JomNullableNumberValue<Byte>(Byte.class));
-		ourDefaultConverters.put(Short.class, new JomNullableNumberValue<Short>(Short.class));
-		ourDefaultConverters.put(Integer.class, new JomNullableNumberValue<Integer>(Integer.class));
-		ourDefaultConverters.put(Long.class, new JomNullableNumberValue<Long>(Long.class));
-		ourDefaultConverters.put(Float.class, new JomNullableNumberValue<Float>(Float.class));
-		ourDefaultConverters.put(Double.class, new JomNullableNumberValue<Double>(Double.class));
-		ourDefaultConverters.put(Boolean.class, new JomBooleanValue(null));
-
-		ourDefaultConverters.put(String.class, new JomStringConverter());
-
-		// collections
-		ourDefaultConverters.put(Map.class, new JomMapConverter());
-		ourDefaultConverters.put(Collection.class, new JomCollectionValue<Collection>(ArrayList.class));
-		ourDefaultConverters.put(List.class, new JomCollectionValue<List>(ArrayList.class));
-		ourDefaultConverters.put(Set.class, new JomCollectionValue<Set>(LinkedHashSet.class));
-	}
-
-	@RequiredReadAction
-	@SuppressWarnings("unchecked")
-	public static Object convertToObject(@Nonnull Class type, @Nonnull Type genericType, @Nullable JSExpression value) throws JomBadValueExpressionException
-	{
-		if(value == null)
-		{
-			throw new JomBadValueExpressionException("No value for property");
-		}
-
-		JomValueConverter.Converter converter = JomValueConverter.ourDefaultConverters.get(type);
-		if(converter != null)
-		{
-			return converter.parseValue(type, genericType, value);
-		}
-
-		if(type.isArray())
-		{
-			if(value instanceof JSArrayLiteralExpression)
-			{
-				Class componentType = type.getComponentType();
-
-				JSExpression[] expressions = ((JSArrayLiteralExpression) value).getExpressions();
-
-				List list = new ArrayList(expressions.length);
-				for(JSExpression expression : expressions)
-				{
-					try
-					{
-						Object o = JomValueConverter.convertToObject(componentType, componentType, expression);
-						list.add(o);
-					}
-					catch(JomBadValueExpressionException e)
-					{
-						// we dont interest in bad value
-					}
-				}
-
-				return list.toArray((Object[]) Array.newInstance(componentType, list.size()));
-			}
-		}
-
-		if(JomElement.class.isAssignableFrom(type))
-		{
-			return JomProxyInvocationHandler.createProxy(type, value instanceof JSObjectLiteralExpression ? (JSObjectLiteralExpression) value : null);
-		}
-
-		throw new UnsupportedOperationException("Unsupported type: " + genericType);
-	}
-
-	@Nullable
-	public static Object getDefaultValueForType(@Nonnull Class type)
-	{
-		JomValueConverter.Converter converter = JomValueConverter.ourDefaultConverters.get(type);
-		if(converter != null)
-		{
-			return converter.getDefaultValue();
-		}
-
-		if(type.isArray())
-		{
-			return Array.newInstance(type.getComponentType(), 0);
-		}
-
-		if(JomElement.class.isAssignableFrom(type))
-		{
-			return null;
-		}
-
-		throw new UnsupportedOperationException("Unsupported type: " + type);
-	}
+public class JomValueConverter {
+    public interface Converter<T> {
+        T getDefaultValue();
+
+        @RequiredReadAction
+        T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException;
+    }
+
+    private static Map<Class, Converter> ourDefaultConverters = new HashMap<Class, Converter>();
+
+    static {
+        // primitives
+        ourDefaultConverters.put(byte.class, new JomNumberValue<Byte>(Byte.class));
+        ourDefaultConverters.put(short.class, new JomNumberValue<Short>(Short.class));
+        ourDefaultConverters.put(int.class, new JomNumberValue<Integer>(Integer.class));
+        ourDefaultConverters.put(long.class, new JomNumberValue<Long>(Long.class));
+        ourDefaultConverters.put(float.class, new JomNumberValue<Float>(Float.class));
+        ourDefaultConverters.put(double.class, new JomNumberValue<Double>(Double.class));
+        ourDefaultConverters.put(boolean.class, new JomBooleanValue(Boolean.FALSE));
+
+        // primitive wrappers
+        ourDefaultConverters.put(Byte.class, new JomNullableNumberValue<Byte>(Byte.class));
+        ourDefaultConverters.put(Short.class, new JomNullableNumberValue<Short>(Short.class));
+        ourDefaultConverters.put(Integer.class, new JomNullableNumberValue<Integer>(Integer.class));
+        ourDefaultConverters.put(Long.class, new JomNullableNumberValue<Long>(Long.class));
+        ourDefaultConverters.put(Float.class, new JomNullableNumberValue<Float>(Float.class));
+        ourDefaultConverters.put(Double.class, new JomNullableNumberValue<Double>(Double.class));
+        ourDefaultConverters.put(Boolean.class, new JomBooleanValue(null));
+
+        ourDefaultConverters.put(String.class, new JomStringConverter());
+
+        // collections
+        ourDefaultConverters.put(Map.class, new JomMapConverter());
+        ourDefaultConverters.put(Collection.class, new JomCollectionValue<Collection>(ArrayList.class));
+        ourDefaultConverters.put(List.class, new JomCollectionValue<List>(ArrayList.class));
+        ourDefaultConverters.put(Set.class, new JomCollectionValue<Set>(LinkedHashSet.class));
+    }
+
+    @RequiredReadAction
+    @SuppressWarnings("unchecked")
+    public static Object convertToObject(
+        @Nonnull Class type,
+        @Nonnull Type genericType,
+        @Nullable JSExpression value
+    ) throws JomBadValueExpressionException {
+        if (value == null) {
+            throw new JomBadValueExpressionException("No value for property");
+        }
+
+        JomValueConverter.Converter converter = JomValueConverter.ourDefaultConverters.get(type);
+        if (converter != null) {
+            return converter.parseValue(type, genericType, value);
+        }
+
+        if (type.isArray()) {
+            if (value instanceof JSArrayLiteralExpression) {
+                Class componentType = type.getComponentType();
+
+                JSExpression[] expressions = ((JSArrayLiteralExpression)value).getExpressions();
+
+                List list = new ArrayList(expressions.length);
+                for (JSExpression expression : expressions) {
+                    try {
+                        Object o = JomValueConverter.convertToObject(componentType, componentType, expression);
+                        list.add(o);
+                    }
+                    catch (JomBadValueExpressionException e) {
+                        // we dont interest in bad value
+                    }
+                }
+
+                return list.toArray((Object[])Array.newInstance(componentType, list.size()));
+            }
+        }
+
+        if (JomElement.class.isAssignableFrom(type)) {
+            return JomProxyInvocationHandler.createProxy(
+                type,
+                value instanceof JSObjectLiteralExpression ? (JSObjectLiteralExpression)value : null
+            );
+        }
+
+        throw new UnsupportedOperationException("Unsupported type: " + genericType);
+    }
+
+    @Nullable
+    public static Object getDefaultValueForType(@Nonnull Class type) {
+        JomValueConverter.Converter converter = JomValueConverter.ourDefaultConverters.get(type);
+        if (converter != null) {
+            return converter.getDefaultValue();
+        }
+
+        if (type.isArray()) {
+            return Array.newInstance(type.getComponentType(), 0);
+        }
+
+        if (JomElement.class.isAssignableFrom(type)) {
+            return null;
+        }
+
+        throw new UnsupportedOperationException("Unsupported type: " + type);
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
index ff4f53f5..cab77251 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
@@ -17,37 +17,34 @@
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomBooleanValue implements JomValueConverter.Converter<Boolean>
-{
-	private Boolean myDefaultValue;
+public class JomBooleanValue implements JomValueConverter.Converter<Boolean> {
+    private Boolean myDefaultValue;
 
-	public JomBooleanValue(@Nullable Boolean defaultValue)
-	{
-		myDefaultValue = defaultValue;
-	}
+    public JomBooleanValue(@Nullable Boolean defaultValue) {
+        myDefaultValue = defaultValue;
+    }
 
-	@Override
-	public Boolean getDefaultValue()
-	{
-		return myDefaultValue;
-	}
+    @Override
+    public Boolean getDefaultValue() {
+        return myDefaultValue;
+    }
 
-	@RequiredReadAction
-	@Override
-	public Boolean parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
-	{
-		if(value instanceof JSLiteralExpression)
-		{
-			IElementType elementType = PsiUtilCore.getElementType(value.getFirstChild());
-			if(elementType == JSTokenTypes.TRUE_KEYWORD)
-			{
-				return Boolean.TRUE;
-			}
-			else if(elementType == JSTokenTypes.FALSE_KEYWORD)
-			{
-				return Boolean.FALSE;
-			}
-		}
-		throw new JomBadValueExpressionException();
-	}
+    @RequiredReadAction
+    @Override
+    public Boolean parseValue(
+        @Nonnull Class type,
+        @Nonnull Type genericType,
+        @Nonnull PsiElement value
+    ) throws JomBadValueExpressionException {
+        if (value instanceof JSLiteralExpression) {
+            IElementType elementType = PsiUtilCore.getElementType(value.getFirstChild());
+            if (elementType == JSTokenTypes.TRUE_KEYWORD) {
+                return Boolean.TRUE;
+            }
+            else if (elementType == JSTokenTypes.FALSE_KEYWORD) {
+                return Boolean.FALSE;
+            }
+        }
+        throw new JomBadValueExpressionException();
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
index 71cc177a..6d33d0aa 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
@@ -1,92 +1,74 @@
 package consulo.json.jom.proxy.impl;
 
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Collection;
-
-import jakarta.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
+import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.json.jom.proxy.JomBadValueExpressionException;
 import consulo.json.jom.proxy.JomValueConverter;
-import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.language.psi.PsiElement;
 import consulo.util.lang.Pair;
 import consulo.util.lang.reflect.ReflectionUtil;
+import jakarta.annotation.Nonnull;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Collection;
 
 /**
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomCollectionValue<T extends Collection> implements JomValueConverter.Converter<T>
-{
-	private Class<? extends T> myNewInstanceClass;
+public class JomCollectionValue<T extends Collection> implements JomValueConverter.Converter<T> {
+    private Class<? extends T> myNewInstanceClass;
 
-	public JomCollectionValue(Class<? extends T> newInstanceClass)
-	{
-		myNewInstanceClass = newInstanceClass;
-	}
+    public JomCollectionValue(Class<? extends T> newInstanceClass) {
+        myNewInstanceClass = newInstanceClass;
+    }
 
-	@Override
-	public T getDefaultValue()
-	{
-		return ReflectionUtil.newInstance(myNewInstanceClass);
-	}
+    @Override
+    public T getDefaultValue() {
+        return ReflectionUtil.newInstance(myNewInstanceClass);
+    }
 
-	@RequiredReadAction
-	@Override
-	@SuppressWarnings("unchecked")
-	public T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
-	{
-		if(value instanceof JSArrayLiteralExpression)
-		{
-			JSExpression[] expressions = ((JSArrayLiteralExpression) value).getExpressions();
-			T collection = ReflectionUtil.newInstance(myNewInstanceClass);
+    @RequiredReadAction
+    @Override
+    @SuppressWarnings("unchecked")
+    public T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException {
+        if (value instanceof JSArrayLiteralExpression) {
+            JSExpression[] expressions = ((JSArrayLiteralExpression)value).getExpressions();
+            T collection = ReflectionUtil.newInstance(myNewInstanceClass);
 
-			Pair<Class, Type> valueType = findValueTypeInsideGeneric(genericType, 0); // E
+            Pair<Class, Type> valueType = findValueTypeInsideGeneric(genericType, 0); // E
 
-			for(JSExpression expression : expressions)
-			{
-				try
-				{
-					Object o = JomValueConverter.convertToObject(valueType.getFirst(), valueType.getSecond(), expression);
-					collection.add(o);
-				}
-				catch(JomBadValueExpressionException e)
-				{
-					// we dont interest in bad value
-				}
-			}
-			return collection;
-		}
-		throw new JomBadValueExpressionException();
-	}
+            for (JSExpression expression : expressions) {
+                try {
+                    Object o = JomValueConverter.convertToObject(valueType.getFirst(), valueType.getSecond(), expression);
+                    collection.add(o);
+                }
+                catch (JomBadValueExpressionException e) {
+                    // we dont interest in bad value
+                }
+            }
+            return collection;
+        }
+        throw new JomBadValueExpressionException();
+    }
 
 
-	public static Pair<Class, Type> findValueTypeInsideGeneric(@Nonnull Type genericType, int index)
-	{
-		if(!(genericType instanceof ParameterizedType))
-		{
-			throw new JomBadValueExpressionException();
-		}
+    public static Pair<Class, Type> findValueTypeInsideGeneric(@Nonnull Type genericType, int index) {
+        if (!(genericType instanceof ParameterizedType)) {
+            throw new JomBadValueExpressionException();
+        }
 
-		Type[] actualTypeArguments = ((ParameterizedType) genericType).getActualTypeArguments();
-		if(actualTypeArguments.length <= index)
-		{
-			throw new JomBadValueExpressionException();
-		}
+        Type[] actualTypeArguments = ((ParameterizedType)genericType).getActualTypeArguments();
+        if (actualTypeArguments.length <= index) {
+            throw new JomBadValueExpressionException();
+        }
 
-		Class rawType = null;
-		Type valueType = actualTypeArguments[index];
-		if(valueType instanceof ParameterizedType)
-		{
-			rawType = (Class) ((ParameterizedType) valueType).getRawType();
-		}
-		else
-		{
-			rawType = (Class) valueType;
-		}
-		return Pair.create(rawType, valueType);
-	}
+        Type valueType = actualTypeArguments[index];
+        Class rawType = valueType instanceof ParameterizedType parameterizedType
+            ? (Class)parameterizedType.getRawType()
+            : (Class)valueType;
+        return Pair.create(rawType, valueType);
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
index 42b48943..8575084d 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
@@ -18,50 +18,41 @@
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomMapConverter implements JomValueConverter.Converter<Map>
-{
-	@Override
-	public Map getDefaultValue()
-	{
-		return Collections.emptyMap();
-	}
-
-	@RequiredReadAction
-	@Override
-	@SuppressWarnings("unchecked")
-	public Map parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
-	{
-		if(!(value instanceof JSObjectLiteralExpression))
-		{
-			throw new JomBadValueExpressionException();
-		}
-
-		Pair<Class, Type> valueType = JomCollectionValue.findValueTypeInsideGeneric(genericType, 1); // K, V
-
-		JSProperty[] properties = ((JSObjectLiteralExpression) value).getProperties();
-
-		Map map = new LinkedHashMap(properties.length);
-
-		for(JSProperty property : properties)
-		{
-			String name = property.getName();
-			if(name == null)
-			{
-				continue;
-			}
-
-			try
-			{
-				Object object = JomValueConverter.convertToObject(valueType.getFirst(), valueType.getSecond(), property.getValue());
-				map.put(name, object);
-			}
-			catch(JomBadValueExpressionException e)
-			{
-				// we dont interest in bad value
-			}
-		}
-
-		return map;
-	}
-
+public class JomMapConverter implements JomValueConverter.Converter<Map> {
+    @Override
+    public Map getDefaultValue() {
+        return Collections.emptyMap();
+    }
+
+    @RequiredReadAction
+    @Override
+    @SuppressWarnings("unchecked")
+    public Map parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException {
+        if (!(value instanceof JSObjectLiteralExpression)) {
+            throw new JomBadValueExpressionException();
+        }
+
+        Pair<Class, Type> valueType = JomCollectionValue.findValueTypeInsideGeneric(genericType, 1); // K, V
+
+        JSProperty[] properties = ((JSObjectLiteralExpression)value).getProperties();
+
+        Map map = new LinkedHashMap(properties.length);
+
+        for (JSProperty property : properties) {
+            String name = property.getName();
+            if (name == null) {
+                continue;
+            }
+
+            try {
+                Object object = JomValueConverter.convertToObject(valueType.getFirst(), valueType.getSecond(), property.getValue());
+                map.put(name, object);
+            }
+            catch (JomBadValueExpressionException e) {
+                // we dont interest in bad value
+            }
+        }
+
+        return map;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
index 48eeba33..2a268036 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
@@ -13,6 +13,7 @@
 import consulo.util.lang.reflect.ReflectionUtil;
 
 import jakarta.annotation.Nonnull;
+
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.function.Supplier;
@@ -21,52 +22,44 @@
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomNullableNumberValue<T> implements JomValueConverter.Converter<T>
-{
-	protected Class<T> myClass;
+public class JomNullableNumberValue<T> implements JomValueConverter.Converter<T> {
+    protected Class<T> myClass;
 
-	protected Supplier<Method> myParseMethodValue;
+    protected Supplier<Method> myParseMethodValue;
 
-	public JomNullableNumberValue(Class<T> aClass)
-	{
-		myClass = aClass;
-		myParseMethodValue = LazyValue.notNull(() ->
-		{
-			Class primitiveType = ReflectionUtil.getStaticFieldValue(myClass, Class.class, "TYPE");
+    public JomNullableNumberValue(Class<T> aClass) {
+        myClass = aClass;
+        myParseMethodValue = LazyValue.notNull(() -> {
+            Class primitiveType = ReflectionUtil.getStaticFieldValue(myClass, Class.class, "TYPE");
 
-			Method method = ReflectionUtil.getMethod(myClass, "parse" + StringUtil.capitalize(primitiveType.getSimpleName()), String.class);
-			assert method != null;
-			return method;
-		});
-	}
+            String methodName = "parse" + StringUtil.capitalize(primitiveType.getSimpleName());
+            Method method = ReflectionUtil.getMethod(myClass, methodName, String.class);
+            assert method != null;
+            return method;
+        });
+    }
 
-	@Override
-	public T getDefaultValue()
-	{
-		return null;
-	}
+    @Override
+    public T getDefaultValue() {
+        return null;
+    }
 
-	@RequiredReadAction
-	@Override
-	@SuppressWarnings("unchecked")
-	public T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
-	{
-		if(value instanceof JSLiteralExpression)
-		{
-			IElementType elementType = PsiUtilCore.getElementType(value.getFirstChild());
-			if(elementType == JSTokenTypes.NUMERIC_LITERAL)
-			{
-				try
-				{
-					return (T) myParseMethodValue.get().invoke(null, value.getText());
-				}
-				catch(Exception e)
-				{
-					throw new JomBadValueExpressionException(e);
-				}
-			}
-		}
+    @RequiredReadAction
+    @Override
+    @SuppressWarnings("unchecked")
+    public T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException {
+        if (value instanceof JSLiteralExpression) {
+            IElementType elementType = PsiUtilCore.getElementType(value.getFirstChild());
+            if (elementType == JSTokenTypes.NUMERIC_LITERAL) {
+                try {
+                    return (T)myParseMethodValue.get().invoke(null, value.getText());
+                }
+                catch (Exception e) {
+                    throw new JomBadValueExpressionException(e);
+                }
+            }
+        }
 
-		throw new JomBadValueExpressionException();
-	}
+        throw new JomBadValueExpressionException();
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
index 161e9d8d..50d53688 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
@@ -6,24 +6,19 @@
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomNumberValue<T> extends JomNullableNumberValue<T>
-{
-	public JomNumberValue(Class<T> aClass)
-	{
-		super(aClass);
-	}
+public class JomNumberValue<T> extends JomNullableNumberValue<T> {
+    public JomNumberValue(Class<T> aClass) {
+        super(aClass);
+    }
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public T getDefaultValue()
-	{
-		try
-		{
-			return (T) myParseMethodValue.get().invoke(null, "0");
-		}
-		catch(Exception e)
-		{
-			throw new JomBadValueExpressionException(e);
-		}
-	}
+    @Override
+    @SuppressWarnings("unchecked")
+    public T getDefaultValue() {
+        try {
+            return (T)myParseMethodValue.get().invoke(null, "0");
+        }
+        catch (Exception e) {
+            throw new JomBadValueExpressionException(e);
+        }
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
index 11937677..dbcde025 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
@@ -17,27 +17,26 @@
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomStringConverter implements JomValueConverter.Converter<String>
-{
-	@Override
-	public String getDefaultValue()
-	{
-		return null;
-	}
+public class JomStringConverter implements JomValueConverter.Converter<String> {
+    @Override
+    public String getDefaultValue() {
+        return null;
+    }
 
-	@RequiredReadAction
-	@Override
-	public String parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException
-	{
-		if(value instanceof JSSimpleLiteralExpression)
-		{
-			IElementType elementType = ((JSSimpleLiteralExpression) value).getLiteralElementType();
-			if(JavaScriptTokenSets.STRING_LITERALS.contains(elementType))
-			{
-				return StringUtil.unquoteString(value.getText());
-			}
-		}
+    @RequiredReadAction
+    @Override
+    public String parseValue(
+        @Nonnull Class type,
+        @Nonnull Type genericType,
+        @Nonnull PsiElement value
+    ) throws JomBadValueExpressionException {
+        if (value instanceof JSSimpleLiteralExpression simpleLiteralExpression) {
+            IElementType elementType = simpleLiteralExpression.getLiteralElementType();
+            if (JavaScriptTokenSets.STRING_LITERALS.contains(elementType)) {
+                return StringUtil.unquoteString(value.getText());
+            }
+        }
 
-		throw new JomBadValueExpressionException();
-	}
+        throw new JomBadValueExpressionException();
+    }
 }

From 19baadf8d58dc4854b1e6971412cd24faabd86fc Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Tue, 23 Jul 2024 20:28:24 +0300
Subject: [PATCH 215/340] Code reformat using IJ4 code style (part 7).

---
 .../main/java/consulo/json/JsonFileType.java  |   69 +-
 .../consulo/json/JsonFileTypeFactory.java     |   12 +-
 .../json/jom/JomIconDescriptorUpdater.java    |   26 +-
 .../java/consulo/json/jom/JomManager.java     |  108 +-
 .../JomModeAsJsonFileDescriptorProvider.java  |  270 ++--
 .../consulo/json/jom/JomPropertyGetter.java   |    5 +-
 .../main/java/consulo/json/jom/JomUtil.java   |   33 +-
 .../json/lang/JsonJavaScriptParser.java       |  442 +++---
 .../json/lang/JsonJavaScriptVersion.java      |   78 +-
 .../consulo/json/lang/JsonQuoteHandler.java   |   14 +-
 .../consulo/json/lang/lexer/JsonLexer.java    | 1371 +++++++++--------
 .../JsonFileDescriptorProvider.java           |   13 +-
 .../JsonFileDescriptorProviders.java          |   56 +-
 .../consulo/json/validation/NativeArray.java  |   21 +-
 .../completion/JsonCompletionContributor.java |  403 +++--
 ...ByAnotherPsiElementEditorNotification.java |  196 +--
 ...therPsiElementJsonDescriptionProvider.java |   56 +-
 ...escriptionByAnotherPsiElementProvider.java |   35 +-
 ...scriptionByAnotherPsiElementRegistrar.java |   41 +-
 ...DescriptionByAnotherPsiElementService.java |  489 +++---
 .../descriptor/JsonObjectDescriptor.java      |   64 +-
 .../descriptor/JsonPropertyDescriptor.java    |   94 +-
 .../PropertyValidationInspection.java         |  673 ++++----
 .../reference/JsonPropertyNameReference.java  |   63 +-
 .../JsonPropertyNameReferenceProvider.java    |   29 +-
 25 files changed, 2229 insertions(+), 2432 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
index 4311100a..7c31e6dc 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
@@ -34,48 +34,41 @@
  * @author VISTALL
  * @since 02.12.13.
  */
-public class JsonFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion
-{
-	public static final JsonFileType INSTANCE = new JsonFileType();
+public class JsonFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion {
+    public static final JsonFileType INSTANCE = new JsonFileType();
 
-	private JsonFileType()
-	{
-		super(JavaScriptLanguage.INSTANCE);
-	}
+    private JsonFileType() {
+        super(JavaScriptLanguage.INSTANCE);
+    }
 
-	@Nonnull
-	@Override
-	public String getId()
-	{
-		return "JSON";
-	}
+    @Nonnull
+    @Override
+    public String getId() {
+        return "JSON";
+    }
 
-	@Nonnull
-	@Override
-	public LocalizeValue getDescription()
-	{
-		return LocalizeValue.localizeTODO("Json files");
-	}
+    @Nonnull
+    @Override
+    public LocalizeValue getDescription() {
+        return LocalizeValue.localizeTODO("Json files");
+    }
 
-	@Nonnull
-	@Override
-	public String getDefaultExtension()
-	{
-		return "json";
-	}
+    @Nonnull
+    @Override
+    public String getDefaultExtension() {
+        return "json";
+    }
 
-	@Nullable
-	@Override
-	public Image getIcon()
-	{
-		return JavaScriptIconGroup.json();
-	}
+    @Nullable
+    @Override
+    public Image getIcon() {
+        return JavaScriptIconGroup.json();
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JsonJavaScriptVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
-	{
-		return JsonJavaScriptVersion.getInstance();
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JsonJavaScriptVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
+        return JsonJavaScriptVersion.getInstance();
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
index 305ec2a9..7651431c 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
@@ -10,11 +10,9 @@
  * @since 05.03.2015
  */
 @ExtensionImpl
-public class JsonFileTypeFactory extends FileTypeFactory
-{
-	@Override
-	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
-	{
-		consumer.consume(JsonFileType.INSTANCE);
-	}
+public class JsonFileTypeFactory extends FileTypeFactory {
+    @Override
+    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
+        consumer.consume(JsonFileType.INSTANCE);
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
index 1fb03a90..bdbf79da 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
@@ -29,19 +29,15 @@
  * @since 10.11.2015
  */
 @ExtensionImpl
-public class JomIconDescriptorUpdater implements IconDescriptorUpdater
-{
-	@RequiredReadAction
-	@Override
-	public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiElement element, int flags)
-	{
-		if(element instanceof PsiFile)
-		{
-			JomFileElement<JomElement> fileElement = JomManager.getInstance(element.getProject()).getFileElement((PsiFile) element);
-			if(fileElement != null)
-			{
-				iconDescriptor.setMainIcon(fileElement.getFileDescriptor().getIcon());
-			}
-		}
-	}
+public class JomIconDescriptorUpdater implements IconDescriptorUpdater {
+    @RequiredReadAction
+    @Override
+    public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiElement element, int flags) {
+        if (element instanceof PsiFile file) {
+            JomFileElement<JomElement> fileElement = JomManager.getInstance(element.getProject()).getFileElement(file);
+            if (fileElement != null) {
+                iconDescriptor.setMainIcon(fileElement.getFileDescriptor().getIcon());
+            }
+        }
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index 614c0c7f..1239c116 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -44,72 +44,60 @@
 @Singleton
 @ServiceAPI(ComponentScope.PROJECT)
 @ServiceImpl
-public class JomManager
-{
-	@Nonnull
-	public static JomManager getInstance(@Nonnull Project project)
-	{
-		return ServiceManager.getService(project, JomManager.class);
-	}
+public class JomManager {
+    @Nonnull
+    public static JomManager getInstance(@Nonnull Project project) {
+        return ServiceManager.getService(project, JomManager.class);
+    }
 
-	private static final Key<CachedValue<JomFileElement<?>>> JOM_FILE_ELEMENT = Key.create("jom.file.lement");
+    private static final Key<CachedValue<JomFileElement<?>>> JOM_FILE_ELEMENT = Key.create("jom.file.lement");
 
-	private final Project myProject;
+    private final Project myProject;
 
-	@Inject
-	public JomManager(Project project)
-	{
-		myProject = project;
-	}
+    @Inject
+    public JomManager(Project project) {
+        myProject = project;
+    }
 
-	@Nullable
-	@RequiredReadAction
-	@SuppressWarnings("unchecked")
-	public <T extends JomElement> JomFileElement<T> getFileElement(@Nonnull final PsiFile psiFile)
-	{
-		FileType fileType = psiFile.getFileType();
-		if(fileType != JsonFileType.INSTANCE)
-		{
-			return null;
-		}
+    @Nullable
+    @RequiredReadAction
+    @SuppressWarnings("unchecked")
+    public <T extends JomElement> JomFileElement<T> getFileElement(@Nonnull final PsiFile psiFile) {
+        FileType fileType = psiFile.getFileType();
+        if (fileType != JsonFileType.INSTANCE) {
+            return null;
+        }
 
-		CachedValue<JomFileElement<?>> cachedValue = psiFile.getUserData(JOM_FILE_ELEMENT);
-		if(cachedValue == null)
-		{
-			cachedValue = CachedValuesManager.getManager(myProject).createCachedValue(new CachedValueProvider<JomFileElement<?>>()
-			{
-				@Nullable
-				@Override
-				public Result<JomFileElement<?>> compute()
-				{
-					JomFileElement<?> value = null;
-					JomFileDescriptor fileDescriptor = findFileDescriptor(psiFile);
-					if(fileDescriptor != null)
-					{
-						value = new JomFileElement((JSFile) psiFile, fileDescriptor);
-					}
-					return Result.<JomFileElement<?>>create(value, psiFile, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
-				}
-			}, false);
+        CachedValue<JomFileElement<?>> cachedValue = psiFile.getUserData(JOM_FILE_ELEMENT);
+        if (cachedValue == null) {
+            cachedValue = CachedValuesManager.getManager(myProject).createCachedValue(new CachedValueProvider<JomFileElement<?>>() {
+                @Nullable
+                @Override
+                public Result<JomFileElement<?>> compute() {
+                    JomFileElement<?> value = null;
+                    JomFileDescriptor fileDescriptor = findFileDescriptor(psiFile);
+                    if (fileDescriptor != null) {
+                        value = new JomFileElement((JSFile)psiFile, fileDescriptor);
+                    }
+                    return Result.<JomFileElement<?>>create(value, psiFile, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+                }
+            }, false);
 
-			psiFile.putUserData(JOM_FILE_ELEMENT, cachedValue);
-		}
+            psiFile.putUserData(JOM_FILE_ELEMENT, cachedValue);
+        }
 
-		return (JomFileElement<T>) cachedValue.getValue();
-	}
+        return (JomFileElement<T>)cachedValue.getValue();
+    }
 
-	@Nullable
-	private static JomFileDescriptor findFileDescriptor(@Nonnull PsiFile psiFile)
-	{
-		JomFileDescriptor jomFileDescriptor = null;
-		for(JomFileDescriptor temp : JomFileDescriptor.EP_NAME.getExtensions())
-		{
-			if(temp.isMyFile(psiFile))
-			{
-				jomFileDescriptor = temp;
-				break;
-			}
-		}
-		return jomFileDescriptor;
-	}
+    @Nullable
+    private static JomFileDescriptor findFileDescriptor(@Nonnull PsiFile psiFile) {
+        JomFileDescriptor jomFileDescriptor = null;
+        for (JomFileDescriptor temp : JomFileDescriptor.EP_NAME.getExtensions()) {
+            if (temp.isMyFile(psiFile)) {
+                jomFileDescriptor = temp;
+                break;
+            }
+        }
+        return jomFileDescriptor;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
index 025fd8b4..3d576f66 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
@@ -27,6 +27,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -38,150 +39,127 @@
  * @since 10.11.2015
  */
 @ExtensionImpl
-public class JomModeAsJsonFileDescriptorProvider implements JsonFileDescriptorProvider
-{
-	@RequiredReadAction
-	@Override
-	public boolean isMyFile(@Nonnull PsiFile file)
-	{
-		return JomManager.getInstance(file.getProject()).getFileElement(file) != null;
-	}
-
-	@RequiredReadAction
-	@Override
-	public void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file)
-	{
-		JomFileElement<JomElement> fileElement = JomManager.getInstance(file.getProject()).getFileElement(file);
-		if(fileElement == null)
-		{
-			return;
-		}
-
-		fillDescriptor(root, fileElement.getFileDescriptor().getDefinitionClass());
-	}
-
-	private static void fillDescriptor(JsonObjectDescriptor objectDescriptor, Class<?> clazz)
-	{
-		Set<Method> methods = new HashSet<Method>();
-		collectMethods(clazz, methods, new HashSet<Class<?>>());
-
-		for(Method method : methods)
-		{
-			String jsonGetPropertyName = JomUtil.getJsonGetPropertyName(method);
-			if(jsonGetPropertyName == null)
-			{
-				continue;
-			}
-
-			JsonPropertyDescriptor propertyDescriptor = fillObjectDescriptor(objectDescriptor, method.getReturnType(), method.getGenericReturnType(), jsonGetPropertyName);
-
-			if(method.isAnnotationPresent(Deprecated.class))
-			{
-				propertyDescriptor.deprecated();
-			}
-		}
-	}
-
-	@Nonnull
-	private static JsonPropertyDescriptor fillObjectDescriptor(JsonObjectDescriptor objectDescriptor, @Nonnull Class<?> classType, @Nonnull Type genericType, @Nullable String propertyName)
-	{
-		if(classType.isArray())
-		{
-			Class<?> componentType = classType.getComponentType();
-
-			return objectDescriptor.addProperty(propertyName, new NativeArray(componentType));
-		}
-		else if(classType == Collection.class || classType == Set.class || classType == List.class)
-		{
-			if(!(genericType instanceof ParameterizedType))
-			{
-				throw new IllegalArgumentException();
-			}
-
-			Type[] actualTypeArguments = ((ParameterizedType) genericType).getActualTypeArguments();
-
-			return objectDescriptor.addProperty(propertyName, new NativeArray(actualTypeArguments[0]));
-		}
-		else if(classType == boolean.class)
-		{
-			return objectDescriptor.addProperty(propertyName, Boolean.class);
-		}
-		else if(classType == Boolean.class)
-		{
-			return objectDescriptor.addProperty(propertyName, Boolean.class).notNull();
-		}
-		else if(classType == String.class)
-		{
-			return objectDescriptor.addProperty(propertyName, String.class);
-		}
-		else if(classType == byte.class ||
-				classType == short.class ||
-				classType == int.class ||
-				classType == long.class ||
-				classType == float.class ||
-				classType == double.class)
-		{
-			return objectDescriptor.addProperty(propertyName, Number.class).notNull();
-		}
-		else if(classType == Byte.class ||
-				classType == Short.class ||
-				classType == Integer.class ||
-				classType == Long.class ||
-				classType == Float.class ||
-				classType == Double.class ||
-				classType == BigInteger.class)
-		{
-			return objectDescriptor.addProperty(propertyName, Number.class);
-		}
-		else if(classType == Map.class)
-		{
-			if(!(genericType instanceof ParameterizedType))
-			{
-				throw new IllegalArgumentException();
-			}
-
-			Type[] actualTypeArguments = ((ParameterizedType) genericType).getActualTypeArguments();
-
-			Class rawType;
-			Type actualTypeArgument = actualTypeArguments[1];
-			if(actualTypeArgument instanceof ParameterizedType)
-			{
-				rawType = (Class) ((ParameterizedType) actualTypeArgument).getRawType();
-			}
-			else
-			{
-				rawType = (Class) actualTypeArgument;
-			}
-
-			JsonObjectDescriptor child = new JsonObjectDescriptor();
-			fillObjectDescriptor(child, rawType, actualTypeArguments[1], null);
-
-			return objectDescriptor.addProperty(propertyName, child);
-		}
-		else
-		{
-			JsonObjectDescriptor another = new JsonObjectDescriptor();
-			fillDescriptor(another, classType);
-			return objectDescriptor.addProperty(propertyName, another);
-		}
-	}
-
-	private static void collectMethods(Class<?> clazz, Set<Method> methods, Set<Class<?>> processClasses)
-	{
-		if(processClasses.contains(clazz))
-		{
-			return;
-		}
-
-		processClasses.add(clazz);
-
-		Method[] declaredMethods = clazz.getDeclaredMethods();
-		ContainerUtil.addAllNotNull(methods, declaredMethods);
-
-		Class<?>[] interfaces = clazz.getInterfaces();
-		for(Class<?> anInterface : interfaces)
-		{
-			collectMethods(anInterface, methods, processClasses);
-		}
-	}
+public class JomModeAsJsonFileDescriptorProvider implements JsonFileDescriptorProvider {
+    @RequiredReadAction
+    @Override
+    public boolean isMyFile(@Nonnull PsiFile file) {
+        return JomManager.getInstance(file.getProject()).getFileElement(file) != null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file) {
+        JomFileElement<JomElement> fileElement = JomManager.getInstance(file.getProject()).getFileElement(file);
+        if (fileElement == null) {
+            return;
+        }
+
+        fillDescriptor(root, fileElement.getFileDescriptor().getDefinitionClass());
+    }
+
+    private static void fillDescriptor(JsonObjectDescriptor objectDescriptor, Class<?> clazz) {
+        Set<Method> methods = new HashSet<Method>();
+        collectMethods(clazz, methods, new HashSet<Class<?>>());
+
+        for (Method method : methods) {
+            String jsonGetPropertyName = JomUtil.getJsonGetPropertyName(method);
+            if (jsonGetPropertyName == null) {
+                continue;
+            }
+
+            JsonPropertyDescriptor propertyDescriptor =
+                fillObjectDescriptor(objectDescriptor, method.getReturnType(), method.getGenericReturnType(), jsonGetPropertyName);
+
+            if (method.isAnnotationPresent(Deprecated.class)) {
+                propertyDescriptor.deprecated();
+            }
+        }
+    }
+
+    @Nonnull
+    private static JsonPropertyDescriptor fillObjectDescriptor(
+        JsonObjectDescriptor objectDescriptor,
+        @Nonnull Class<?> classType,
+        @Nonnull Type genericType,
+        @Nullable String propertyName
+    ) {
+        if (classType.isArray()) {
+            Class<?> componentType = classType.getComponentType();
+
+            return objectDescriptor.addProperty(propertyName, new NativeArray(componentType));
+        }
+        else if (classType == Collection.class || classType == Set.class || classType == List.class) {
+            if (!(genericType instanceof ParameterizedType)) {
+                throw new IllegalArgumentException();
+            }
+
+            Type[] actualTypeArguments = ((ParameterizedType)genericType).getActualTypeArguments();
+
+            return objectDescriptor.addProperty(propertyName, new NativeArray(actualTypeArguments[0]));
+        }
+        else if (classType == boolean.class) {
+            return objectDescriptor.addProperty(propertyName, Boolean.class);
+        }
+        else if (classType == Boolean.class) {
+            return objectDescriptor.addProperty(propertyName, Boolean.class).notNull();
+        }
+        else if (classType == String.class) {
+            return objectDescriptor.addProperty(propertyName, String.class);
+        }
+        else if (classType == byte.class ||
+            classType == short.class ||
+            classType == int.class ||
+            classType == long.class ||
+            classType == float.class ||
+            classType == double.class) {
+            return objectDescriptor.addProperty(propertyName, Number.class).notNull();
+        }
+        else if (classType == Byte.class ||
+            classType == Short.class ||
+            classType == Integer.class ||
+            classType == Long.class ||
+            classType == Float.class ||
+            classType == Double.class ||
+            classType == BigInteger.class) {
+            return objectDescriptor.addProperty(propertyName, Number.class);
+        }
+        else if (classType == Map.class) {
+            if (!(genericType instanceof ParameterizedType)) {
+                throw new IllegalArgumentException();
+            }
+
+            Type[] actualTypeArguments = ((ParameterizedType)genericType).getActualTypeArguments();
+
+            Type actualTypeArgument = actualTypeArguments[1];
+            Class rawType = actualTypeArgument instanceof ParameterizedType actualParameterizedType
+                ? (Class)actualParameterizedType.getRawType()
+                : (Class)actualTypeArgument;
+
+            JsonObjectDescriptor child = new JsonObjectDescriptor();
+            fillObjectDescriptor(child, rawType, actualTypeArguments[1], null);
+
+            return objectDescriptor.addProperty(propertyName, child);
+        }
+        else {
+            JsonObjectDescriptor another = new JsonObjectDescriptor();
+            fillDescriptor(another, classType);
+            return objectDescriptor.addProperty(propertyName, another);
+        }
+    }
+
+    private static void collectMethods(Class<?> clazz, Set<Method> methods, Set<Class<?>> processClasses) {
+        if (processClasses.contains(clazz)) {
+            return;
+        }
+
+        processClasses.add(clazz);
+
+        Method[] declaredMethods = clazz.getDeclaredMethods();
+        ContainerUtil.addAllNotNull(methods, declaredMethods);
+
+        Class<?>[] interfaces = clazz.getInterfaces();
+        for (Class<?> anInterface : interfaces) {
+            collectMethods(anInterface, methods, processClasses);
+        }
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java
index 3d0cd702..24f44afb 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java
@@ -27,7 +27,6 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface JomPropertyGetter
-{
-	String value() default "";
+public @interface JomPropertyGetter {
+    String value() default "";
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
index bc7de45e..ad59a248 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
@@ -5,29 +5,26 @@
 import jakarta.annotation.Nonnull;
 
 import jakarta.annotation.Nullable;
+
 import java.lang.reflect.Method;
 
 /**
  * @author VISTALL
  * @since 13.11.2015
  */
-public class JomUtil
-{
-	@Nullable
-	public static String getJsonGetPropertyName(@Nonnull Method method)
-	{
-		JomPropertyGetter annotation = method.getAnnotation(JomPropertyGetter.class);
-		if(annotation == null)
-		{
-			return null;
-		}
+public class JomUtil {
+    @Nullable
+    public static String getJsonGetPropertyName(@Nonnull Method method) {
+        JomPropertyGetter annotation = method.getAnnotation(JomPropertyGetter.class);
+        if (annotation == null) {
+            return null;
+        }
 
-		String propertyName = StringUtil.getPropertyName(method.getName());
-		propertyName = ObjectUtil.notNull(propertyName, method.getName());
-		if(!StringUtil.isEmpty(annotation.value()))
-		{
-			propertyName = annotation.value();
-		}
-		return propertyName;
-	}
+        String propertyName = StringUtil.getPropertyName(method.getName());
+        propertyName = ObjectUtil.notNull(propertyName, method.getName());
+        if (!StringUtil.isEmpty(annotation.value())) {
+            propertyName = annotation.value();
+        }
+        return propertyName;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index e556faba..0f2c53c9 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -20,247 +20,203 @@
  * @author VISTALL
  * @since 05.03.2015
  */
-public class JsonJavaScriptParser implements PsiParser
-{
-	private static final Logger LOG = Logger.getInstance(JsonJavaScriptParser.class);
-
-	private int myPropertyDepth;
-
-	@Nonnull
-	@Override
-	public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder builder, @Nonnull LanguageVersion languageVersion)
-	{
-		final PsiBuilder.Marker rootMarker = builder.mark();
-		parseRoot(builder);
-		rootMarker.done(root);
-		return builder.getTreeBuilt();
-	}
-
-	private void parseRoot(PsiBuilder builder)
-	{
-		if(builder.getTokenType() == JSTokenTypes.LBRACKET)
-		{
-			parseArrayLiteralExpression(builder);
-			if(builder.getTokenType() != null)
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof());
-			}
-		}
-		else if(builder.getTokenType() == JSTokenTypes.LBRACE)
-		{
-			parseObjectLiteralExpression(builder);
-			if(builder.getTokenType() != null)
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof());
-			}
-		}
-		else
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbraceOrLbracket());
-		}
-
-		while(builder.getTokenType() != null)
-		{
-			builder.advanceLexer();
-		}
-	}
-
-	private void parseProperty(final PsiBuilder builder)
-	{
-		if(myPropertyDepth > 1000)
-		{
-			builder.error("Too big depth for property");
-			int braceCount = 0;
-			int bracketCount = 0;
-			while(!builder.eof())
-			{
-				IElementType tokenType = builder.getTokenType();
-				if(tokenType == JSTokenTypes.LBRACE)
-				{
-					braceCount++;
-				}
-				else if(tokenType == JSTokenTypes.LBRACKET)
-				{
-					bracketCount++;
-				}
-				else if(tokenType == JSTokenTypes.RBRACE)
-				{
-					braceCount--;
-					if(braceCount < 0)
-					{
-						break;
-					}
-				}
-				else if(tokenType == JSTokenTypes.RBRACKET)
-				{
-					bracketCount--;
-					if(bracketCount < 0)
-					{
-						break;
-					}
-				}
-				builder.advanceLexer();
-			}
-		}
-
-		final IElementType nameToken = builder.getTokenType();
-		final PsiBuilder.Marker property = builder.mark();
-		myPropertyDepth++;
-
-		if(isNotPropertyStart(nameToken))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
-		}
-		builder.advanceLexer();
-		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
-
-		if(!parseValue(builder))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-		}
-		myPropertyDepth--;
-
-		property.done(JSElementTypes.PROPERTY);
-	}
-
-	public void parseObjectLiteralExpression(final PsiBuilder builder)
-	{
-		LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
-		final PsiBuilder.Marker expr = builder.mark();
-		builder.advanceLexer();
-
-		IElementType elementType = builder.getTokenType();
-
-		while(elementType != JSTokenTypes.RBRACE && elementType != null)
-		{
-			parseProperty(builder);
-
-			elementType = builder.getTokenType();
-			if(elementType == JSTokenTypes.RBRACE)
-			{
-				break;
-			}
-			else if(elementType == JSTokenTypes.COMMA)
-			{
-				builder.advanceLexer();
-
-				if(builder.getTokenType() == JSTokenTypes.RBRACE)
-				{
-					break;
-				}
-			}
-			else
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
-			}
-
-			elementType = builder.getTokenType();
-			if(elementType == JSTokenTypes.RBRACE)
-			{
-				break;
-			}
-			else if(isNotPropertyStart(elementType))
-			{
-				break;
-			}
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
-		expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
-	}
-
-	public static boolean isNotPropertyStart(final IElementType elementType)
-	{
-		return !JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(elementType) && !JavaScriptTokenSets.STRING_LITERALS.contains(elementType) && elementType != JSTokenTypes.NUMERIC_LITERAL;
-	}
-
-	public void parseArrayLiteralExpression(final PsiBuilder builder)
-	{
-		JsonJavaScriptParser.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
-		final PsiBuilder.Marker expr = builder.mark();
-		builder.advanceLexer();
-		boolean commaExpected = false;
-
-		while(builder.getTokenType() != JSTokenTypes.RBRACKET)
-		{
-			if(commaExpected)
-			{
-				final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
-				if(!b)
-				{
-					break;
-				}
-			}
-
-			while(builder.getTokenType() == JSTokenTypes.COMMA)
-			{
-				builder.advanceLexer();
-			}
-
-			commaExpected = false;
-			if(builder.getTokenType() != JSTokenTypes.RBRACKET)
-			{
-				if(!parseValue(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-					break;
-				}
-				else
-				{
-					commaExpected = true;
-				}
-			}
-		}
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
-		expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
-	}
-
-	private boolean parseValue(PsiBuilder builder)
-	{
-		final IElementType firstToken = builder.getTokenType();
-		if(firstToken == JSTokenTypes.NUMERIC_LITERAL ||
-				firstToken == JSTokenTypes.STRING_LITERAL ||
-				firstToken == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL ||
-				firstToken == JSTokenTypes.NULL_KEYWORD ||
-				firstToken == JSTokenTypes.FALSE_KEYWORD ||
-				firstToken == JSTokenTypes.TRUE_KEYWORD)
-		{
-			LocalizeValue errorMessage = ExpressionParsing.validateLiteral(builder);
-			Parsing.buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
-			if(errorMessage != null)
-			{
-				builder.error(errorMessage);
-			}
-			return true;
-		}
-		if(firstToken == JSTokenTypes.LBRACKET)
-		{
-			parseArrayLiteralExpression(builder);
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.MINUS)
-		{
-			PsiBuilder.Marker marker = builder.mark();
-			builder.advanceLexer();
-			if(builder.getTokenType() == JSTokenTypes.NUMERIC_LITERAL)
-			{
-				builder.advanceLexer();
-				marker.done(JSElementTypes.PREFIX_EXPRESSION);
-			}
-			else
-			{
-				marker.error("Unexpected token");
-			}
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.LBRACE)
-		{
-			parseObjectLiteralExpression(builder);
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
+public class JsonJavaScriptParser implements PsiParser {
+    private static final Logger LOG = Logger.getInstance(JsonJavaScriptParser.class);
+
+    private int myPropertyDepth;
+
+    @Nonnull
+    @Override
+    public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder builder, @Nonnull LanguageVersion languageVersion) {
+        final PsiBuilder.Marker rootMarker = builder.mark();
+        parseRoot(builder);
+        rootMarker.done(root);
+        return builder.getTreeBuilt();
+    }
+
+    private void parseRoot(PsiBuilder builder) {
+        if (builder.getTokenType() == JSTokenTypes.LBRACKET) {
+            parseArrayLiteralExpression(builder);
+            if (builder.getTokenType() != null) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof());
+            }
+        }
+        else if (builder.getTokenType() == JSTokenTypes.LBRACE) {
+            parseObjectLiteralExpression(builder);
+            if (builder.getTokenType() != null) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof());
+            }
+        }
+        else {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbraceOrLbracket());
+        }
+
+        while (builder.getTokenType() != null) {
+            builder.advanceLexer();
+        }
+    }
+
+    private void parseProperty(final PsiBuilder builder) {
+        if (myPropertyDepth > 1000) {
+            builder.error("Too big depth for property");
+            int braceCount = 0;
+            int bracketCount = 0;
+            while (!builder.eof()) {
+                IElementType tokenType = builder.getTokenType();
+                if (tokenType == JSTokenTypes.LBRACE) {
+                    braceCount++;
+                }
+                else if (tokenType == JSTokenTypes.LBRACKET) {
+                    bracketCount++;
+                }
+                else if (tokenType == JSTokenTypes.RBRACE) {
+                    braceCount--;
+                    if (braceCount < 0) {
+                        break;
+                    }
+                }
+                else if (tokenType == JSTokenTypes.RBRACKET) {
+                    bracketCount--;
+                    if (bracketCount < 0) {
+                        break;
+                    }
+                }
+                builder.advanceLexer();
+            }
+        }
+
+        final IElementType nameToken = builder.getTokenType();
+        final PsiBuilder.Marker property = builder.mark();
+        myPropertyDepth++;
+
+        if (isNotPropertyStart(nameToken)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
+        }
+        builder.advanceLexer();
+        Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
+
+        if (!parseValue(builder)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+        }
+        myPropertyDepth--;
+
+        property.done(JSElementTypes.PROPERTY);
+    }
+
+    public void parseObjectLiteralExpression(final PsiBuilder builder) {
+        LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
+        final PsiBuilder.Marker expr = builder.mark();
+        builder.advanceLexer();
+
+        IElementType elementType = builder.getTokenType();
+
+        while (elementType != JSTokenTypes.RBRACE && elementType != null) {
+            parseProperty(builder);
+
+            elementType = builder.getTokenType();
+            if (elementType == JSTokenTypes.RBRACE) {
+                break;
+            }
+            else if (elementType == JSTokenTypes.COMMA) {
+                builder.advanceLexer();
+
+                if (builder.getTokenType() == JSTokenTypes.RBRACE) {
+                    break;
+                }
+            }
+            else {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
+            }
+
+            elementType = builder.getTokenType();
+            if (elementType == JSTokenTypes.RBRACE) {
+                break;
+            }
+            else if (isNotPropertyStart(elementType)) {
+                break;
+            }
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
+        expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
+    }
+
+    public static boolean isNotPropertyStart(final IElementType elementType) {
+        return !JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(elementType)
+            && !JavaScriptTokenSets.STRING_LITERALS.contains(elementType)
+            && elementType != JSTokenTypes.NUMERIC_LITERAL;
+    }
+
+    public void parseArrayLiteralExpression(final PsiBuilder builder) {
+        JsonJavaScriptParser.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
+        final PsiBuilder.Marker expr = builder.mark();
+        builder.advanceLexer();
+        boolean commaExpected = false;
+
+        while (builder.getTokenType() != JSTokenTypes.RBRACKET) {
+            if (commaExpected) {
+                final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
+                if (!b) {
+                    break;
+                }
+            }
+
+            while (builder.getTokenType() == JSTokenTypes.COMMA) {
+                builder.advanceLexer();
+            }
+
+            commaExpected = false;
+            if (builder.getTokenType() != JSTokenTypes.RBRACKET) {
+                if (!parseValue(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+                    break;
+                }
+                else {
+                    commaExpected = true;
+                }
+            }
+        }
+        Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
+        expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
+    }
+
+    private boolean parseValue(PsiBuilder builder) {
+        final IElementType firstToken = builder.getTokenType();
+        if (firstToken == JSTokenTypes.NUMERIC_LITERAL ||
+            firstToken == JSTokenTypes.STRING_LITERAL ||
+            firstToken == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL ||
+            firstToken == JSTokenTypes.NULL_KEYWORD ||
+            firstToken == JSTokenTypes.FALSE_KEYWORD ||
+            firstToken == JSTokenTypes.TRUE_KEYWORD) {
+            LocalizeValue errorMessage = ExpressionParsing.validateLiteral(builder);
+            Parsing.buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
+            if (errorMessage != null) {
+                builder.error(errorMessage);
+            }
+            return true;
+        }
+        if (firstToken == JSTokenTypes.LBRACKET) {
+            parseArrayLiteralExpression(builder);
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.MINUS) {
+            PsiBuilder.Marker marker = builder.mark();
+            builder.advanceLexer();
+            if (builder.getTokenType() == JSTokenTypes.NUMERIC_LITERAL) {
+                builder.advanceLexer();
+                marker.done(JSElementTypes.PREFIX_EXPRESSION);
+            }
+            else {
+                marker.error("Unexpected token");
+            }
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.LBRACE) {
+            parseObjectLiteralExpression(builder);
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
index e88e67f0..effbc675 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
@@ -21,45 +21,39 @@
  * @since 05.03.2015
  */
 @ExtensionImpl
-public class JsonJavaScriptVersion extends BaseJavaScriptLanguageVersion
-{
-	private static final Supplier<Lexer> ourLexerFactory = JsonLexer::new;
-
-	@Nonnull
-	public static JsonJavaScriptVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(JsonJavaScriptVersion.class);
-	}
-
-	public JsonJavaScriptVersion()
-	{
-		super("JSON", "application/json");
-	}
-
-	@Nullable
-	@Override
-	public FileType getAssociatedFileType()
-	{
-		return JsonFileType.INSTANCE;
-	}
-
-	@Nonnull
-	@Override
-	public SyntaxHighlighter getSyntaxHighlighter()
-	{
-		return new JavaScriptHighlighter(ourLexerFactory);
-	}
-
-	@Nonnull
-	@Override
-	public Lexer createLexer()
-	{
-		return ourLexerFactory.get();
-	}
-
-	@Nonnull
-	@Override
-	public PsiParser createParser()
-	{
-		return new JsonJavaScriptParser();
-	}}
+public class JsonJavaScriptVersion extends BaseJavaScriptLanguageVersion {
+    private static final Supplier<Lexer> ourLexerFactory = JsonLexer::new;
+
+    @Nonnull
+    public static JsonJavaScriptVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(JsonJavaScriptVersion.class);
+    }
+
+    public JsonJavaScriptVersion() {
+        super("JSON", "application/json");
+    }
+
+    @Nullable
+    @Override
+    public FileType getAssociatedFileType() {
+        return JsonFileType.INSTANCE;
+    }
+
+    @Nonnull
+    @Override
+    public SyntaxHighlighter getSyntaxHighlighter() {
+        return new JavaScriptHighlighter(ourLexerFactory);
+    }
+
+    @Nonnull
+    @Override
+    public Lexer createLexer() {
+        return ourLexerFactory.get();
+    }
+
+    @Nonnull
+    @Override
+    public PsiParser createParser() {
+        return new JsonJavaScriptParser();
+    }
+}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
index 4e50b3ba..b64def48 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
@@ -12,12 +12,10 @@
  * @since 29-Aug-22
  */
 @ExtensionImpl
-public class JsonQuoteHandler extends JavaScriptQuoteHandler
-{
-	@Nonnull
-	@Override
-	public FileType getFileType()
-	{
-		return JsonFileType.INSTANCE;
-	}
+public class JsonQuoteHandler extends JavaScriptQuoteHandler {
+    @Nonnull
+    @Override
+    public FileType getFileType() {
+        return JsonFileType.INSTANCE;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
index 1d8eb18d..8d513cde 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
@@ -6,708 +6,761 @@
 import consulo.language.ast.IElementType;
 import consulo.language.lexer.LexerBase;
 
-
 /**
- * This class is a scanner generated by 
+ * This class is a scanner generated by
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.4
  * on 15.02.16 12:22 from the specification file
  * <tt>R:/_github.com/consulo/consulo-javascript/json-javascript-impl/src/org/mustbe/consulo/json/lang/lexer/json.flex</tt>
  */
-public class JsonLexer extends LexerBase
-{
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 16384;
-
-  /** lexical states */
-  public static final int YYINITIAL = 0;
-
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = { 
-     0, 0
-  };
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final String ZZ_CMAP_PACKED = 
-    "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\0"+
-    "\1\21\1\0\1\4\2\0\1\17\2\0\1\7\1\15\1\37\1\41"+
-    "\1\13\1\6\1\11\7\1\2\1\1\40\6\0\4\2\1\14\1\2"+
-    "\21\4\1\12\2\4\1\35\1\20\1\36\1\0\1\4\1\0\1\27"+
-    "\3\2\1\25\1\26\5\4\1\30\1\4\1\32\3\4\1\23\1\31"+
-    "\1\22\1\24\2\4\1\12\2\4\1\33\1\0\1\34\1\0\41\5"+
-    "\2\0\4\4\4\0\1\4\2\0\1\5\7\0\1\4\4\0\1\4"+
-    "\5\0\27\4\1\0\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4"+
-    "\16\0\5\4\11\0\1\4\21\0\130\5\5\0\23\5\12\0\1\4"+
-    "\13\0\1\4\1\0\3\4\1\0\1\4\1\0\24\4\1\0\54\4"+
-    "\1\0\46\4\1\0\5\4\4\0\202\4\1\0\4\5\3\0\105\4"+
-    "\1\0\46\4\2\0\2\4\6\0\20\4\41\0\46\4\2\0\1\4"+
-    "\7\0\47\4\11\0\21\5\1\0\27\5\1\0\3\5\1\0\1\5"+
-    "\1\0\2\5\1\0\1\5\13\0\33\4\5\0\3\4\15\0\4\5"+
-    "\14\0\6\5\13\0\32\4\5\0\13\4\16\5\7\0\12\5\4\0"+
-    "\2\4\1\5\143\4\1\0\1\4\10\5\1\0\6\5\2\4\2\5"+
-    "\1\0\4\5\2\4\12\5\3\4\2\0\1\4\17\0\1\5\1\4"+
-    "\1\5\36\4\33\5\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0"+
-    "\3\5\66\4\2\0\1\5\1\4\20\5\2\0\1\4\4\5\3\0"+
-    "\12\4\2\5\2\0\12\5\21\0\3\5\1\0\10\4\2\0\2\4"+
-    "\2\0\26\4\1\0\7\4\1\0\1\4\3\0\4\4\2\0\1\5"+
-    "\1\4\7\5\2\0\2\5\2\0\3\5\11\0\1\5\4\0\2\4"+
-    "\1\0\3\4\2\5\2\0\12\5\4\4\15\0\3\5\1\0\6\4"+
-    "\4\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\2\4"+
-    "\1\0\2\4\2\0\1\5\1\0\5\5\4\0\2\5\2\0\3\5"+
-    "\13\0\4\4\1\0\1\4\7\0\14\5\3\4\14\0\3\5\1\0"+
-    "\11\4\1\0\3\4\1\0\26\4\1\0\7\4\1\0\2\4\1\0"+
-    "\5\4\2\0\1\5\1\4\10\5\1\0\3\5\1\0\3\5\2\0"+
-    "\1\4\17\0\2\4\2\5\2\0\12\5\1\0\1\4\17\0\3\5"+
-    "\1\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4"+
-    "\1\0\5\4\2\0\1\5\1\4\6\5\3\0\2\5\2\0\3\5"+
-    "\10\0\2\5\4\0\2\4\1\0\3\4\4\0\12\5\1\0\1\4"+
-    "\20\0\1\5\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0"+
-    "\2\4\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0"+
-    "\10\4\1\0\3\4\4\0\5\5\3\0\3\5\1\0\4\5\11\0"+
-    "\1\5\17\0\11\5\11\0\1\4\7\0\3\5\1\0\10\4\1\0"+
-    "\3\4\1\0\27\4\1\0\12\4\1\0\5\4\4\0\7\5\1\0"+
-    "\3\5\1\0\4\5\7\0\2\5\11\0\2\4\4\0\12\5\22\0"+
-    "\2\5\1\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4\1\0"+
-    "\5\4\2\0\1\5\1\4\7\5\1\0\3\5\1\0\4\5\7\0"+
-    "\2\5\7\0\1\4\1\0\2\4\4\0\12\5\22\0\2\5\1\0"+
-    "\10\4\1\0\3\4\1\0\27\4\1\0\20\4\4\0\6\5\2\0"+
-    "\3\5\1\0\4\5\11\0\1\5\10\0\2\4\4\0\12\5\22\0"+
-    "\2\5\1\0\22\4\3\0\30\4\1\0\11\4\1\0\1\4\2\0"+
-    "\7\4\3\0\1\5\4\0\6\5\1\0\1\5\1\0\10\5\22\0"+
-    "\2\5\15\0\60\4\1\5\2\4\7\5\4\0\10\4\10\5\1\0"+
-    "\12\5\47\0\2\4\1\0\1\4\2\0\2\4\1\0\1\4\2\0"+
-    "\1\4\6\0\4\4\1\0\7\4\1\0\3\4\1\0\1\4\1\0"+
-    "\1\4\2\0\2\4\1\0\4\4\1\5\2\4\6\5\1\0\2\5"+
-    "\1\4\2\0\5\4\1\0\1\4\1\0\6\5\2\0\12\5\2\0"+
-    "\2\4\42\0\1\4\27\0\2\5\6\0\12\5\13\0\1\5\1\0"+
-    "\1\5\1\0\1\5\4\0\2\5\10\4\1\0\42\4\6\0\24\5"+
-    "\1\0\2\5\4\4\4\0\10\5\1\0\44\5\11\0\1\5\71\0"+
-    "\42\4\1\0\5\4\1\0\2\4\1\0\7\5\3\0\4\5\6\0"+
-    "\12\5\6\0\6\4\4\5\106\0\46\4\12\0\51\4\7\0\132\4"+
-    "\5\0\104\4\5\0\122\4\6\0\7\4\1\0\77\4\1\0\1\4"+
-    "\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0\47\4"+
-    "\1\0\1\4\1\0\4\4\2\0\37\4\1\0\1\4\1\0\4\4"+
-    "\2\0\7\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\7\4"+
-    "\1\0\27\4\1\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4"+
-    "\1\0\47\4\1\0\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4"+
-    "\2\0\10\4\12\0\32\4\5\0\113\4\3\0\3\4\17\0\15\4"+
-    "\1\0\4\4\3\5\13\0\22\4\3\5\13\0\22\4\2\5\14\0"+
-    "\15\4\1\0\3\4\1\0\2\5\14\0\64\4\40\5\3\0\1\4"+
-    "\3\0\2\4\1\5\2\0\12\5\41\0\3\5\2\0\12\5\6\0"+
-    "\130\4\10\0\51\4\1\5\126\0\35\4\3\0\14\5\4\0\14\5"+
-    "\12\0\12\5\36\4\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0"+
-    "\132\4\6\0\26\4\2\0\6\4\2\0\46\4\2\0\6\4\2\0"+
-    "\10\4\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4\2\0"+
-    "\65\4\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4\3\0"+
-    "\4\4\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4\17\0"+
-    "\4\5\32\0\5\5\20\0\2\4\23\0\1\4\13\0\4\5\6\0"+
-    "\6\5\1\0\1\4\15\0\1\4\40\0\22\4\36\0\15\5\4\0"+
-    "\1\5\3\0\6\5\27\0\1\4\4\0\1\4\2\0\12\4\1\0"+
-    "\1\4\3\0\5\4\6\0\1\4\1\0\1\4\1\0\1\4\1\0"+
-    "\4\4\1\0\3\4\1\0\7\4\3\0\3\4\5\0\5\4\26\0"+
-    "\44\4\u0e81\0\3\4\31\0\11\4\6\5\1\0\5\4\2\0\5\4"+
-    "\4\0\126\4\2\0\2\5\2\0\3\4\1\0\137\4\5\0\50\4"+
-    "\4\0\136\4\21\0\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4"+
-    "\132\0\u048d\4\u0773\0\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4"+
-    "\14\0\5\4\5\0\1\4\1\5\12\4\1\0\15\4\1\0\5\4"+
-    "\1\0\1\4\1\0\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4"+
-    "\22\0\100\4\2\0\66\4\50\0\15\4\3\0\20\5\20\0\4\5"+
-    "\17\0\2\4\30\0\3\4\31\0\1\4\6\0\5\4\1\0\207\4"+
-    "\2\0\1\5\4\0\1\4\13\0\12\5\7\0\32\4\4\0\1\4"+
-    "\1\0\32\4\12\0\132\4\3\0\6\4\2\0\6\4\2\0\6\4"+
-    "\2\0\3\4\3\0\2\4\3\0\2\4\22\0\3\5\4\0";
-
-  /** 
-   * Translates characters to character classes
-   */
-  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\1\0\1\1\1\2\1\3\1\4\1\1\1\2\1\1"+
-    "\1\5\1\6\3\3\1\7\1\10\1\11\1\12\1\13"+
-    "\1\14\1\15\2\2\1\16\1\17\1\2\2\5\2\6"+
-    "\3\3\1\2\1\17\2\5\2\6\3\3\1\0\1\20"+
-    "\1\3\1\21\1\17\1\22";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[47];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
+public class JsonLexer extends LexerBase {
+    /** initial size of the lookahead buffer */
+    private static final int ZZ_BUFFERSIZE = 16384;
+
+    /** lexical states */
+    public static final int YYINITIAL = 0;
+
+    /**
+     * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+     * at the beginning of a line
+     * l is of the form l = 2*k, k a non negative integer
+     */
+    private static final int ZZ_LEXSTATE[] = {
+        0, 0
+    };
+
+    /**
+     * Translates characters to character classes
+     */
+    private static final String ZZ_CMAP_PACKED =
+        "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\0" +
+            "\1\21\1\0\1\4\2\0\1\17\2\0\1\7\1\15\1\37\1\41" +
+            "\1\13\1\6\1\11\7\1\2\1\1\40\6\0\4\2\1\14\1\2" +
+            "\21\4\1\12\2\4\1\35\1\20\1\36\1\0\1\4\1\0\1\27" +
+            "\3\2\1\25\1\26\5\4\1\30\1\4\1\32\3\4\1\23\1\31" +
+            "\1\22\1\24\2\4\1\12\2\4\1\33\1\0\1\34\1\0\41\5" +
+            "\2\0\4\4\4\0\1\4\2\0\1\5\7\0\1\4\4\0\1\4" +
+            "\5\0\27\4\1\0\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4" +
+            "\16\0\5\4\11\0\1\4\21\0\130\5\5\0\23\5\12\0\1\4" +
+            "\13\0\1\4\1\0\3\4\1\0\1\4\1\0\24\4\1\0\54\4" +
+            "\1\0\46\4\1\0\5\4\4\0\202\4\1\0\4\5\3\0\105\4" +
+            "\1\0\46\4\2\0\2\4\6\0\20\4\41\0\46\4\2\0\1\4" +
+            "\7\0\47\4\11\0\21\5\1\0\27\5\1\0\3\5\1\0\1\5" +
+            "\1\0\2\5\1\0\1\5\13\0\33\4\5\0\3\4\15\0\4\5" +
+            "\14\0\6\5\13\0\32\4\5\0\13\4\16\5\7\0\12\5\4\0" +
+            "\2\4\1\5\143\4\1\0\1\4\10\5\1\0\6\5\2\4\2\5" +
+            "\1\0\4\5\2\4\12\5\3\4\2\0\1\4\17\0\1\5\1\4" +
+            "\1\5\36\4\33\5\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0" +
+            "\3\5\66\4\2\0\1\5\1\4\20\5\2\0\1\4\4\5\3\0" +
+            "\12\4\2\5\2\0\12\5\21\0\3\5\1\0\10\4\2\0\2\4" +
+            "\2\0\26\4\1\0\7\4\1\0\1\4\3\0\4\4\2\0\1\5" +
+            "\1\4\7\5\2\0\2\5\2\0\3\5\11\0\1\5\4\0\2\4" +
+            "\1\0\3\4\2\5\2\0\12\5\4\4\15\0\3\5\1\0\6\4" +
+            "\4\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\2\4" +
+            "\1\0\2\4\2\0\1\5\1\0\5\5\4\0\2\5\2\0\3\5" +
+            "\13\0\4\4\1\0\1\4\7\0\14\5\3\4\14\0\3\5\1\0" +
+            "\11\4\1\0\3\4\1\0\26\4\1\0\7\4\1\0\2\4\1\0" +
+            "\5\4\2\0\1\5\1\4\10\5\1\0\3\5\1\0\3\5\2\0" +
+            "\1\4\17\0\2\4\2\5\2\0\12\5\1\0\1\4\17\0\3\5" +
+            "\1\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4" +
+            "\1\0\5\4\2\0\1\5\1\4\6\5\3\0\2\5\2\0\3\5" +
+            "\10\0\2\5\4\0\2\4\1\0\3\4\4\0\12\5\1\0\1\4" +
+            "\20\0\1\5\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0" +
+            "\2\4\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0" +
+            "\10\4\1\0\3\4\4\0\5\5\3\0\3\5\1\0\4\5\11\0" +
+            "\1\5\17\0\11\5\11\0\1\4\7\0\3\5\1\0\10\4\1\0" +
+            "\3\4\1\0\27\4\1\0\12\4\1\0\5\4\4\0\7\5\1\0" +
+            "\3\5\1\0\4\5\7\0\2\5\11\0\2\4\4\0\12\5\22\0" +
+            "\2\5\1\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4\1\0" +
+            "\5\4\2\0\1\5\1\4\7\5\1\0\3\5\1\0\4\5\7\0" +
+            "\2\5\7\0\1\4\1\0\2\4\4\0\12\5\22\0\2\5\1\0" +
+            "\10\4\1\0\3\4\1\0\27\4\1\0\20\4\4\0\6\5\2\0" +
+            "\3\5\1\0\4\5\11\0\1\5\10\0\2\4\4\0\12\5\22\0" +
+            "\2\5\1\0\22\4\3\0\30\4\1\0\11\4\1\0\1\4\2\0" +
+            "\7\4\3\0\1\5\4\0\6\5\1\0\1\5\1\0\10\5\22\0" +
+            "\2\5\15\0\60\4\1\5\2\4\7\5\4\0\10\4\10\5\1\0" +
+            "\12\5\47\0\2\4\1\0\1\4\2\0\2\4\1\0\1\4\2\0" +
+            "\1\4\6\0\4\4\1\0\7\4\1\0\3\4\1\0\1\4\1\0" +
+            "\1\4\2\0\2\4\1\0\4\4\1\5\2\4\6\5\1\0\2\5" +
+            "\1\4\2\0\5\4\1\0\1\4\1\0\6\5\2\0\12\5\2\0" +
+            "\2\4\42\0\1\4\27\0\2\5\6\0\12\5\13\0\1\5\1\0" +
+            "\1\5\1\0\1\5\4\0\2\5\10\4\1\0\42\4\6\0\24\5" +
+            "\1\0\2\5\4\4\4\0\10\5\1\0\44\5\11\0\1\5\71\0" +
+            "\42\4\1\0\5\4\1\0\2\4\1\0\7\5\3\0\4\5\6\0" +
+            "\12\5\6\0\6\4\4\5\106\0\46\4\12\0\51\4\7\0\132\4" +
+            "\5\0\104\4\5\0\122\4\6\0\7\4\1\0\77\4\1\0\1\4" +
+            "\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0\47\4" +
+            "\1\0\1\4\1\0\4\4\2\0\37\4\1\0\1\4\1\0\4\4" +
+            "\2\0\7\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\7\4" +
+            "\1\0\27\4\1\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4" +
+            "\1\0\47\4\1\0\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4" +
+            "\2\0\10\4\12\0\32\4\5\0\113\4\3\0\3\4\17\0\15\4" +
+            "\1\0\4\4\3\5\13\0\22\4\3\5\13\0\22\4\2\5\14\0" +
+            "\15\4\1\0\3\4\1\0\2\5\14\0\64\4\40\5\3\0\1\4" +
+            "\3\0\2\4\1\5\2\0\12\5\41\0\3\5\2\0\12\5\6\0" +
+            "\130\4\10\0\51\4\1\5\126\0\35\4\3\0\14\5\4\0\14\5" +
+            "\12\0\12\5\36\4\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0" +
+            "\132\4\6\0\26\4\2\0\6\4\2\0\46\4\2\0\6\4\2\0" +
+            "\10\4\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4\2\0" +
+            "\65\4\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4\3\0" +
+            "\4\4\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4\17\0" +
+            "\4\5\32\0\5\5\20\0\2\4\23\0\1\4\13\0\4\5\6\0" +
+            "\6\5\1\0\1\4\15\0\1\4\40\0\22\4\36\0\15\5\4\0" +
+            "\1\5\3\0\6\5\27\0\1\4\4\0\1\4\2\0\12\4\1\0" +
+            "\1\4\3\0\5\4\6\0\1\4\1\0\1\4\1\0\1\4\1\0" +
+            "\4\4\1\0\3\4\1\0\7\4\3\0\3\4\5\0\5\4\26\0" +
+            "\44\4\u0e81\0\3\4\31\0\11\4\6\5\1\0\5\4\2\0\5\4" +
+            "\4\0\126\4\2\0\2\5\2\0\3\4\1\0\137\4\5\0\50\4" +
+            "\4\0\136\4\21\0\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4" +
+            "\132\0\u048d\4\u0773\0\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4" +
+            "\14\0\5\4\5\0\1\4\1\5\12\4\1\0\15\4\1\0\5\4" +
+            "\1\0\1\4\1\0\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4" +
+            "\22\0\100\4\2\0\66\4\50\0\15\4\3\0\20\5\20\0\4\5" +
+            "\17\0\2\4\30\0\3\4\31\0\1\4\6\0\5\4\1\0\207\4" +
+            "\2\0\1\5\4\0\1\4\13\0\12\5\7\0\32\4\4\0\1\4" +
+            "\1\0\32\4\12\0\132\4\3\0\6\4\2\0\6\4\2\0\6\4" +
+            "\2\0\3\4\3\0\2\4\3\0\2\4\22\0\3\5\4\0";
+
+    /**
+     * Translates characters to character classes
+     */
+    private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
+
+    /**
+     * Translates DFA states to action switch labels.
+     */
+    private static final int[] ZZ_ACTION = zzUnpackAction();
+
+    private static final String ZZ_ACTION_PACKED_0 =
+        "\1\0\1\1\1\2\1\3\1\4\1\1\1\2\1\1" +
+            "\1\5\1\6\3\3\1\7\1\10\1\11\1\12\1\13" +
+            "\1\14\1\15\2\2\1\16\1\17\1\2\2\5\2\6" +
+            "\3\3\1\2\1\17\2\5\2\6\3\3\1\0\1\20" +
+            "\1\3\1\21\1\17\1\22";
+
+    private static int[] zzUnpackAction() {
+        int[] result = new int[47];
+        int offset = 0;
+        offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+        return result;
+    }
+
+    private static int zzUnpackAction(String packed, int offset, int[] result) {
+        int i = 0;       /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            do {
+                result[j++] = value;
+            }
+            while (--count > 0);
+        }
+        return j;
     }
-    return j;
-  }
-
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\42\0\104\0\146\0\210\0\252\0\314\0\356"+
-    "\0\u0110\0\u0132\0\u0154\0\u0176\0\u0198\0\42\0\42\0\42"+
-    "\0\42\0\42\0\42\0\42\0\u01ba\0\u01dc\0\u01fe\0\u0220"+
-    "\0\u0242\0\42\0\u0264\0\u0286\0\42\0\u02a8\0\u02ca\0\u02ec"+
-    "\0\u030e\0\u0330\0\u0352\0\u0374\0\u0396\0\u03b8\0\u03da\0\u03fc"+
-    "\0\u041e\0\u0440\0\146\0\u0462\0\146\0\42\0\146";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[47];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
+
+
+    /**
+     * Translates a state to a row index in the transition table
+     */
+    private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
+
+    private static final String ZZ_ROWMAP_PACKED_0 =
+        "\0\0\0\42\0\104\0\146\0\210\0\252\0\314\0\356" +
+            "\0\u0110\0\u0132\0\u0154\0\u0176\0\u0198\0\42\0\42\0\42" +
+            "\0\42\0\42\0\42\0\42\0\u01ba\0\u01dc\0\u01fe\0\u0220" +
+            "\0\u0242\0\42\0\u0264\0\u0286\0\42\0\u02a8\0\u02ca\0\u02ec" +
+            "\0\u030e\0\u0330\0\u0352\0\u0374\0\u0396\0\u03b8\0\u03da\0\u03fc" +
+            "\0\u041e\0\u0440\0\146\0\u0462\0\146\0\42\0\146";
+
+    private static int[] zzUnpackRowMap() {
+        int[] result = new int[47];
+        int offset = 0;
+        offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+        return result;
     }
-    return j;
-  }
-
-  /** 
-   * The transition table of the DFA
-   */
-  private static final int [] ZZ_TRANS = zzUnpackTrans();
-
-  private static final String ZZ_TRANS_PACKED_0 =
-    "\1\2\1\3\1\4\1\5\1\4\1\2\1\6\1\2"+
-    "\1\5\1\7\1\4\1\10\1\4\1\2\1\5\1\11"+
-    "\1\2\1\12\1\13\3\4\1\14\3\4\1\15\1\16"+
-    "\1\17\1\20\1\21\1\22\1\23\1\24\43\0\1\3"+
-    "\7\0\1\3\1\0\1\25\1\26\10\0\1\26\15\0"+
-    "\2\4\1\0\2\4\3\0\2\4\1\0\1\4\5\0"+
-    "\11\4\12\0\1\5\4\0\1\5\5\0\1\5\31\0"+
-    "\1\27\1\30\33\0\1\3\7\0\1\3\1\31\1\25"+
-    "\1\26\10\0\1\26\15\0\1\25\7\0\1\25\30\0"+
-    "\10\11\1\0\5\11\1\0\1\32\1\33\21\11\10\12"+
-    "\1\0\5\12\1\0\1\12\1\34\1\35\20\12\1\0"+
-    "\2\4\1\0\2\4\3\0\2\4\1\0\1\4\5\0"+
-    "\1\4\1\36\7\4\10\0\2\4\1\0\2\4\3\0"+
-    "\2\4\1\0\1\4\5\0\5\4\1\37\3\4\10\0"+
-    "\2\4\1\0\2\4\3\0\2\4\1\0\1\4\5\0"+
-    "\2\4\1\40\6\4\10\0\1\25\7\0\1\25\2\0"+
-    "\1\26\10\0\1\26\15\0\1\41\7\0\1\41\3\0"+
-    "\1\41\23\0\1\41\10\27\1\0\5\27\1\0\23\27"+
-    "\7\42\1\0\32\42\1\0\2\31\6\0\1\31\2\0"+
-    "\1\31\10\0\3\31\12\0\3\11\1\43\4\11\1\44"+
-    "\31\11\3\12\1\45\4\12\1\46\31\12\1\0\2\4"+
-    "\1\0\2\4\3\0\2\4\1\0\1\4\5\0\2\4"+
-    "\1\47\6\4\10\0\2\4\1\0\2\4\3\0\2\4"+
-    "\1\0\1\4\5\0\6\4\1\50\2\4\10\0\2\4"+
-    "\1\0\2\4\3\0\2\4\1\0\1\4\5\0\6\4"+
-    "\1\51\2\4\10\0\1\41\7\0\1\41\30\0\7\42"+
-    "\1\52\32\42\3\11\1\43\4\11\1\44\6\11\1\32"+
-    "\1\33\31\11\1\0\6\11\1\32\1\33\21\11\3\12"+
-    "\1\45\4\12\1\46\7\12\1\34\1\35\30\12\1\0"+
-    "\7\12\1\34\1\35\20\12\1\0\2\4\1\0\2\4"+
-    "\3\0\2\4\1\0\1\4\5\0\3\4\1\53\5\4"+
-    "\10\0\2\4\1\0\2\4\3\0\2\4\1\0\1\4"+
-    "\5\0\7\4\1\54\1\4\10\0\2\4\1\0\2\4"+
-    "\3\0\2\4\1\0\1\4\5\0\6\4\1\55\2\4"+
-    "\7\0\6\42\1\56\1\52\32\42\1\0\2\4\1\0"+
-    "\2\4\3\0\2\4\1\0\1\4\5\0\3\4\1\57"+
-    "\5\4\7\0";
-
-  private static int [] zzUnpackTrans() {
-    int [] result = new int[1156];
-    int offset = 0;
-    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackTrans(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do result[j++] = value; while (--count > 0);
+
+    private static int zzUnpackRowMap(String packed, int offset, int[] result) {
+        int i = 0;  /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int high = packed.charAt(i++) << 16;
+            result[j++] = high | packed.charAt(i++);
+        }
+        return j;
     }
-    return j;
-  }
-
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-  private static final char[] EMPTY_BUFFER = new char[0];
-  private static final int YYEOF = -1;
-
-  /* error messages for the codes above */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\1\0\1\11\13\1\7\11\5\1\1\11\2\1\1\11"+
-    "\14\1\1\0\3\1\1\11\1\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[47];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
+
+    /**
+     * The transition table of the DFA
+     */
+    private static final int[] ZZ_TRANS = zzUnpackTrans();
+
+    private static final String ZZ_TRANS_PACKED_0 =
+        "\1\2\1\3\1\4\1\5\1\4\1\2\1\6\1\2" +
+            "\1\5\1\7\1\4\1\10\1\4\1\2\1\5\1\11" +
+            "\1\2\1\12\1\13\3\4\1\14\3\4\1\15\1\16" +
+            "\1\17\1\20\1\21\1\22\1\23\1\24\43\0\1\3" +
+            "\7\0\1\3\1\0\1\25\1\26\10\0\1\26\15\0" +
+            "\2\4\1\0\2\4\3\0\2\4\1\0\1\4\5\0" +
+            "\11\4\12\0\1\5\4\0\1\5\5\0\1\5\31\0" +
+            "\1\27\1\30\33\0\1\3\7\0\1\3\1\31\1\25" +
+            "\1\26\10\0\1\26\15\0\1\25\7\0\1\25\30\0" +
+            "\10\11\1\0\5\11\1\0\1\32\1\33\21\11\10\12" +
+            "\1\0\5\12\1\0\1\12\1\34\1\35\20\12\1\0" +
+            "\2\4\1\0\2\4\3\0\2\4\1\0\1\4\5\0" +
+            "\1\4\1\36\7\4\10\0\2\4\1\0\2\4\3\0" +
+            "\2\4\1\0\1\4\5\0\5\4\1\37\3\4\10\0" +
+            "\2\4\1\0\2\4\3\0\2\4\1\0\1\4\5\0" +
+            "\2\4\1\40\6\4\10\0\1\25\7\0\1\25\2\0" +
+            "\1\26\10\0\1\26\15\0\1\41\7\0\1\41\3\0" +
+            "\1\41\23\0\1\41\10\27\1\0\5\27\1\0\23\27" +
+            "\7\42\1\0\32\42\1\0\2\31\6\0\1\31\2\0" +
+            "\1\31\10\0\3\31\12\0\3\11\1\43\4\11\1\44" +
+            "\31\11\3\12\1\45\4\12\1\46\31\12\1\0\2\4" +
+            "\1\0\2\4\3\0\2\4\1\0\1\4\5\0\2\4" +
+            "\1\47\6\4\10\0\2\4\1\0\2\4\3\0\2\4" +
+            "\1\0\1\4\5\0\6\4\1\50\2\4\10\0\2\4" +
+            "\1\0\2\4\3\0\2\4\1\0\1\4\5\0\6\4" +
+            "\1\51\2\4\10\0\1\41\7\0\1\41\30\0\7\42" +
+            "\1\52\32\42\3\11\1\43\4\11\1\44\6\11\1\32" +
+            "\1\33\31\11\1\0\6\11\1\32\1\33\21\11\3\12" +
+            "\1\45\4\12\1\46\7\12\1\34\1\35\30\12\1\0" +
+            "\7\12\1\34\1\35\20\12\1\0\2\4\1\0\2\4" +
+            "\3\0\2\4\1\0\1\4\5\0\3\4\1\53\5\4" +
+            "\10\0\2\4\1\0\2\4\3\0\2\4\1\0\1\4" +
+            "\5\0\7\4\1\54\1\4\10\0\2\4\1\0\2\4" +
+            "\3\0\2\4\1\0\1\4\5\0\6\4\1\55\2\4" +
+            "\7\0\6\42\1\56\1\52\32\42\1\0\2\4\1\0" +
+            "\2\4\3\0\2\4\1\0\1\4\5\0\3\4\1\57" +
+            "\5\4\7\0";
+
+    private static int[] zzUnpackTrans() {
+        int[] result = new int[1156];
+        int offset = 0;
+        offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
+        return result;
     }
-    return j;
-  }
 
-  /** the current state of the DFA */
-  private int zzState;
+    private static int zzUnpackTrans(String packed, int offset, int[] result) {
+        int i = 0;       /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            value--;
+            do {
+                result[j++] = value;
+            }
+            while (--count > 0);
+        }
+        return j;
+    }
+
+
+    /* error codes */
+    private static final int ZZ_UNKNOWN_ERROR = 0;
+    private static final int ZZ_NO_MATCH = 1;
+    private static final int ZZ_PUSHBACK_2BIG = 2;
+    private static final char[] EMPTY_BUFFER = new char[0];
+    private static final int YYEOF = -1;
+
+    /* error messages for the codes above */
+    private static final String ZZ_ERROR_MSG[] = {
+        "Unkown internal scanner error",
+        "Error: could not match input",
+        "Error: pushback value was too large"
+    };
+
+    /**
+     * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
+     */
+    private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
+
+    private static final String ZZ_ATTRIBUTE_PACKED_0 =
+        "\1\0\1\11\13\1\7\11\5\1\1\11\2\1\1\11" +
+            "\14\1\1\0\3\1\1\11\1\1";
+
+    private static int[] zzUnpackAttribute() {
+        int[] result = new int[47];
+        int offset = 0;
+        offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+        return result;
+    }
+
+    private static int zzUnpackAttribute(String packed, int offset, int[] result) {
+        int i = 0;       /* index in packed string  */
+        int j = offset;  /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            do {
+                result[j++] = value;
+            }
+            while (--count > 0);
+        }
+        return j;
+    }
 
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
+    /** the current state of the DFA */
+    private int zzState;
 
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private CharSequence zzBuffer = "";
+    /** the current lexical state */
+    private int zzLexicalState = YYINITIAL;
 
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
+    /** this buffer contains the current text to be matched and is
+        the source of the yytext() string */
+    private CharSequence zzBuffer = "";
 
-  /** the textposition at the last state to be included in yytext */
-  private int zzPushbackPos;
+    /** the textposition at the last accepting state */
+    private int zzMarkedPos;
 
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
+    /** the textposition at the last state to be included in yytext */
+    private int zzPushbackPos;
 
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
+    /** the current text position in the buffer */
+    private int zzCurrentPos;
 
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
+    /** startRead marks the beginning of the yytext() string in the buffer */
+    private int zzStartRead;
 
-  /**
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
+    /** endRead marks the last character in the buffer, that has been read
+        from input */
+    private int zzEndRead;
 
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
+    /**
+     * zzAtBOL == true <=> the scanner is currently at the beginning of a line
+     */
+    private boolean zzAtBOL = true;
 
-  private IElementType myTokenType;
-  private int myState;
+    /** zzAtEOF == true <=> the scanner is at the EOF */
+    private boolean zzAtEOF;
 
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
+    private IElementType myTokenType;
+    private int myState;
 
+    /** denotes if the user-EOF-code has already been executed */
+    private boolean zzEOFDone;
 
 
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    char [] map = new char[0x10000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 1738) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
+    /**
+     * Unpacks the compressed character translation table.
+     *
+     * @param packed the packed character translation table
+     * @return the unpacked character translation table
+     */
+    private static char[] zzUnpackCMap(String packed) {
+        char[] map = new char[0x10000];
+        int i = 0;  /* index in packed string  */
+        int j = 0;  /* index in unpacked array */
+        while (i < 1738) {
+            int count = packed.charAt(i++);
+            char value = packed.charAt(i++);
+            do {
+                map[j++] = value;
+            }
+            while (--count > 0);
+        }
+        return map;
     }
-    return map;
-  }
-
-  @Override
-  public IElementType getTokenType() {
-    if (myTokenType == null) locateToken();
-    return myTokenType;
-  }
-
-  @Override
-  public final int getTokenStart(){
-    if (myTokenType == null) locateToken();
-    return zzStartRead;
-  }
-
-  @Override
-  public final int getTokenEnd(){
-    if (myTokenType == null) locateToken();
-    return getTokenStart() + yylength();
-  }
-
-  @Override
-  public void advance() {
-    if (myTokenType == null) locateToken();
-    myTokenType = null;
-  }
-
-  @Override
-  public int getState() {
-    if (myTokenType == null) locateToken();
-    return myState;
-  }
-
-  @Override
-  public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
-    reset(buffer, startOffset, endOffset, initialState);
-    myTokenType = null;
-  }
-
-   @Override
-   public CharSequence getBufferSequence() {
-     return zzBuffer;
-   }
-
-   @Override
-   public int getBufferEnd() {
-     return zzEndRead;
-   }
-
-  public void reset(CharSequence buffer, int start, int end,int initialState){
-    zzBuffer = buffer;
-    zzCurrentPos = zzMarkedPos = zzStartRead = start;
-    zzPushbackPos = 0;
-    zzAtEOF  = false;
-    zzAtBOL = true;
-    zzEndRead = end;
-    yybegin(initialState);
-    myTokenType = null;
-  }
-
-   private void locateToken() {
-     if (myTokenType != null) return;
-     try {
-       myState = yystate();
-       myTokenType = advanceImpl();
-     }
-     catch (java.io.IOException e) { /*Can't happen*/ }
-     catch (Error e) {
-       // add lexer class name to the error
-       final Error error = new Error(getClass().getName() + ": " + e.getMessage());
-       error.setStackTrace(e.getStackTrace());
-       throw error;
-     }
-   }
-
-   /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   *
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-    return true;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  public final CharSequence yytext() {
-    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the
-   * matched text.
-   *
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch.
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  public final char yycharat(int pos) {
-    return zzBuffer.charAt(zzStartRead+pos);
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of
-   * yypushback(int) and a match-all fallback rule) this method
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
+
+    @Override
+    public IElementType getTokenType() {
+        if (myTokenType == null) {
+           locateToken();
+        }
+        return myTokenType;
     }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+
+    @Override
+    public final int getTokenStart() {
+        if (myTokenType == null) {
+            locateToken();
+        }
+        return zzStartRead;
     }
 
-    throw new Error(message);
-  }
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-  /**
-   * Contains user EOF-code, which will be executed exactly once,
-   * when the end of file is reached
-   */
-  private void zzDoEOF() {
-    if (!zzEOFDone) {
-      zzEOFDone = true;
-    
+    @Override
+    public final int getTokenEnd() {
+        if (myTokenType == null) {
+            locateToken();
+        }
+        return getTokenStart() + yylength();
     }
-  }
 
+    @Override
+    public void advance() {
+        if (myTokenType == null) {
+            locateToken();
+        }
+        myTokenType = null;
+    }
 
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public IElementType advanceImpl() throws java.io.IOException {
-    int zzInput;
-    int zzAction;
+    @Override
+    public int getState() {
+        if (myTokenType == null) {
+          locateToken();
+        }
+        return myState;
+    }
 
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    CharSequence zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
+    @Override
+    public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
+        reset(buffer, startOffset, endOffset, initialState);
+        myTokenType = null;
+    }
 
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
+    @Override
+    public CharSequence getBufferSequence() {
+        return zzBuffer;
+    }
 
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
+    @Override
+    public int getBufferEnd() {
+        return zzEndRead;
+    }
 
-      zzAction = -1;
+    public void reset(CharSequence buffer, int start, int end, int initialState) {
+        zzBuffer = buffer;
+        zzCurrentPos = zzMarkedPos = zzStartRead = start;
+        zzPushbackPos = 0;
+        zzAtEOF = false;
+        zzAtBOL = true;
+        zzEndRead = end;
+        yybegin(initialState);
+        myTokenType = null;
+    }
 
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+    private void locateToken() {
+        if (myTokenType != null) {
+            return;
+        }
+        try {
+            myState = yystate();
+            myTokenType = advanceImpl();
+        }
+        catch (java.io.IOException e) { /*Can't happen*/ }
+        catch (Error e) {
+            // add lexer class name to the error
+            final Error error = new Error(getClass().getName() + ": " + e.getMessage());
+            error.setStackTrace(e.getStackTrace());
+            throw error;
+        }
+    }
 
-      zzState = ZZ_LEXSTATE[zzLexicalState];
+    /**
+     * Refills the input buffer.
+     *
+     * @return <code>false</code>, iff there was new input.
+     * @throws java.io.IOException if any I/O-Error occurs
+     */
+    private boolean zzRefill() throws java.io.IOException {
+        return true;
+    }
 
 
-      zzForAction: {
-        while (true) {
+    /**
+     * Returns the current lexical state.
+     */
+    public final int yystate() {
+        return zzLexicalState;
+    }
 
-          if (zzCurrentPosL < zzEndReadL)
-            zzInput = zzBufferL.charAt(zzCurrentPosL++);
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = zzBufferL.charAt(zzCurrentPosL++);
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
-
-          int zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
+
+    /**
+     * Enters a new lexical state
+     *
+     * @param newState the new lexical state
+     */
+    public final void yybegin(int newState) {
+        zzLexicalState = newState;
+    }
+
+
+    /**
+     * Returns the text matched by the current regular expression.
+     */
+    public final CharSequence yytext() {
+        return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
+    }
+
+
+    /**
+     * Returns the character at position <tt>pos</tt> from the
+     * matched text.
+     *
+     * It is equivalent to yytext().charAt(pos), but faster
+     *
+     * @param pos the position of the character to fetch.
+     *            A value from 0 to yylength()-1.
+     *
+     * @return the character at position pos
+     */
+    public final char yycharat(int pos) {
+        return zzBuffer.charAt(zzStartRead + pos);
+    }
+
+
+    /**
+     * Returns the length of the matched text region.
+     */
+    public final int yylength() {
+        return zzMarkedPos - zzStartRead;
+    }
+
+
+    /**
+     * Reports an error that occured while scanning.
+     *
+     * In a wellformed scanner (no or only correct usage of
+     * yypushback(int) and a match-all fallback rule) this method
+     * will only be called with things that "Can't Possibly Happen".
+     * If this method is called, something is seriously wrong
+     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     *
+     * Usual syntax/scanner level error handling should be done
+     * in error fallback rules.
+     *
+     * @param errorCode the code of the errormessage to display
+     */
+    private void zzScanError(int errorCode) {
+        String message;
+        try {
+            message = ZZ_ERROR_MSG[errorCode];
+        }
+        catch (ArrayIndexOutOfBoundsException e) {
+            message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+        }
+
+        throw new Error(message);
+    }
+
+
+    /**
+     * Pushes the specified amount of characters back into the input stream.
+     *
+     * They will be read again by then next call of the scanning method
+     *
+     * @param number the number of characters to be read again.
+     *               This number must not be greater than yylength()!
+     */
+    public void yypushback(int number) {
+        if (number > yylength()) {
+          zzScanError(ZZ_PUSHBACK_2BIG);
+        }
+
+        zzMarkedPos -= number;
+    }
+
+
+    /**
+     * Contains user EOF-code, which will be executed exactly once,
+     * when the end of file is reached
+     */
+    private void zzDoEOF() {
+        if (!zzEOFDone) {
+            zzEOFDone = true;
 
         }
-      }
-
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 13: 
-          { yybegin(YYINITIAL); return JSTokenTypes.MINUS;
-          }
-        case 19: break;
-        case 7: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACE;
-          }
-        case 20: break;
-        case 6: 
-          { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL;
-          }
-        case 21: break;
-        case 9: 
-          { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET;
-          }
-        case 22: break;
-        case 16: 
-          { yybegin(YYINITIAL); return JSTokenTypes.TRUE_KEYWORD;
-          }
-        case 23: break;
-        case 12: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COLON;
-          }
-        case 24: break;
-        case 4: 
-          { return JSTokenTypes.WHITE_SPACE;
-          }
-        case 25: break;
-        case 17: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NULL_KEYWORD;
-          }
-        case 26: break;
-        case 1: 
-          { return JSTokenTypes.BAD_CHARACTER;
-          }
-        case 27: break;
-        case 18: 
-          { yybegin(YYINITIAL); return JSTokenTypes.FALSE_KEYWORD;
-          }
-        case 28: break;
-        case 10: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RBRACKET;
-          }
-        case 29: break;
-        case 15: 
-          { return JSTokenTypes.C_STYLE_COMMENT;
-          }
-        case 30: break;
-        case 3: 
-          { yybegin(YYINITIAL);       return JSTokenTypes.IDENTIFIER;
-          }
-        case 31: break;
-        case 14: 
-          { return JSTokenTypes.END_OF_LINE_COMMENT;
-          }
-        case 32: break;
-        case 2: 
-          { yybegin(YYINITIAL); return JSTokenTypes.NUMERIC_LITERAL;
-          }
-        case 33: break;
-        case 8: 
-          { yybegin(YYINITIAL); return JSTokenTypes.RBRACE;
-          }
-        case 34: break;
-        case 11: 
-          { yybegin(YYINITIAL); return JSTokenTypes.COMMA;
-          }
-        case 35: break;
-        case 5: 
-          { return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
-          }
-        case 36: break;
-        default:
-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-            zzAtEOF = true;
-            zzDoEOF();
-            return null;
-          }
-          else {
-            zzScanError(ZZ_NO_MATCH);
-          }
-      }
     }
-  }
 
 
+    /**
+     * Resumes scanning until the next regular expression is matched,
+     * the end of input is encountered or an I/O-Error occurs.
+     *
+     * @return the next token
+     * @throws java.io.IOException if any I/O-Error occurs
+     */
+    public IElementType advanceImpl() throws java.io.IOException {
+        int zzInput;
+        int zzAction;
+
+        // cached fields:
+        int zzCurrentPosL;
+        int zzMarkedPosL;
+        int zzEndReadL = zzEndRead;
+        CharSequence zzBufferL = zzBuffer;
+        char[] zzCMapL = ZZ_CMAP;
+
+        int[] zzTransL = ZZ_TRANS;
+        int[] zzRowMapL = ZZ_ROWMAP;
+        int[] zzAttrL = ZZ_ATTRIBUTE;
+
+        while (true) {
+            zzMarkedPosL = zzMarkedPos;
+
+            zzAction = -1;
+
+            zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+
+            zzState = ZZ_LEXSTATE[zzLexicalState];
+
+
+            zzForAction: {
+                while (true) {
+                    if (zzCurrentPosL < zzEndReadL) {
+                        zzInput = zzBufferL.charAt(zzCurrentPosL++);
+                    }
+                    else if (zzAtEOF) {
+                        zzInput = YYEOF;
+                        break zzForAction;
+                    }
+                    else {
+                        // store back cached positions
+                        zzCurrentPos = zzCurrentPosL;
+                        zzMarkedPos = zzMarkedPosL;
+                        boolean eof = zzRefill();
+                        // get translated positions and possibly new buffer
+                        zzCurrentPosL = zzCurrentPos;
+                        zzMarkedPosL = zzMarkedPos;
+                        zzBufferL = zzBuffer;
+                        zzEndReadL = zzEndRead;
+                        if (eof) {
+                            zzInput = YYEOF;
+                            break zzForAction;
+                        }
+                        else {
+                            zzInput = zzBufferL.charAt(zzCurrentPosL++);
+                        }
+                    }
+                    int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]];
+                    if (zzNext == -1) {
+                        break zzForAction;
+                    }
+                    zzState = zzNext;
+
+                    int zzAttributes = zzAttrL[zzState];
+                    if ((zzAttributes & 1) == 1) {
+                        zzAction = zzState;
+                        zzMarkedPosL = zzCurrentPosL;
+                        if ((zzAttributes & 8) == 8) {
+                            break zzForAction;
+                        }
+                    }
+                }
+            }
+
+            // store back cached position
+            zzMarkedPos = zzMarkedPosL;
+
+            switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+                case 13: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.MINUS;
+                }
+                case 19:
+                    break;
+                case 7: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LBRACE;
+                }
+                case 20:
+                    break;
+                case 6: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.STRING_LITERAL;
+                }
+                case 21:
+                    break;
+                case 9: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.LBRACKET;
+                }
+                case 22:
+                    break;
+                case 16: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.TRUE_KEYWORD;
+                }
+                case 23:
+                    break;
+                case 12: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.COLON;
+                }
+                case 24:
+                    break;
+                case 4: {
+                    return JSTokenTypes.WHITE_SPACE;
+                }
+                case 25:
+                    break;
+                case 17: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.NULL_KEYWORD;
+                }
+                case 26:
+                    break;
+                case 1: {
+                    return JSTokenTypes.BAD_CHARACTER;
+                }
+                case 27:
+                    break;
+                case 18: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.FALSE_KEYWORD;
+                }
+                case 28:
+                    break;
+                case 10: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.RBRACKET;
+                }
+                case 29:
+                    break;
+                case 15: {
+                    return JSTokenTypes.C_STYLE_COMMENT;
+                }
+                case 30:
+                    break;
+                case 3: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.IDENTIFIER;
+                }
+                case 31:
+                    break;
+                case 14: {
+                    return JSTokenTypes.END_OF_LINE_COMMENT;
+                }
+                case 32:
+                    break;
+                case 2: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.NUMERIC_LITERAL;
+                }
+                case 33:
+                    break;
+                case 8: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.RBRACE;
+                }
+                case 34:
+                    break;
+                case 11: {
+                    yybegin(YYINITIAL);
+                    return JSTokenTypes.COMMA;
+                }
+                case 35:
+                    break;
+                case 5: {
+                    return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
+                }
+                case 36:
+                    break;
+                default:
+                    if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+                        zzAtEOF = true;
+                        zzDoEOF();
+                        return null;
+                    }
+                    else {
+                        zzScanError(ZZ_NO_MATCH);
+                    }
+            }
+        }
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
index ea37c99f..b0f64ff4 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
@@ -30,13 +30,12 @@
  * @since 10.11.2015
  */
 @ExtensionAPI(ComponentScope.APPLICATION)
-public interface JsonFileDescriptorProvider
-{
-	ExtensionPointName<JsonFileDescriptorProvider> EP_NAME = ExtensionPointName.create(JsonFileDescriptorProvider.class);
+public interface JsonFileDescriptorProvider {
+    ExtensionPointName<JsonFileDescriptorProvider> EP_NAME = ExtensionPointName.create(JsonFileDescriptorProvider.class);
 
-	@RequiredReadAction
-	boolean isMyFile(@Nonnull PsiFile file);
+    @RequiredReadAction
+    boolean isMyFile(@Nonnull PsiFile file);
 
-	@RequiredReadAction
-	void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file);
+    @RequiredReadAction
+    void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file);
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
index 397513a0..e6e675cb 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
@@ -29,35 +29,31 @@
  * @author VISTALL
  * @since 10.11.2015
  */
-public class JsonFileDescriptorProviders
-{
-	@Nullable
-	@RequiredReadAction
-	public static JsonObjectDescriptor getRootDescriptor(@Nullable final PsiFile file)
-	{
-		if(file == null || file.getFileType() != JsonFileType.INSTANCE)
-		{
-			return null;
-		}
-		return CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider<JsonObjectDescriptor>()
-		{
-			@Nullable
-			@Override
-			@RequiredReadAction
-			public Result<JsonObjectDescriptor> compute()
-			{
-				for(JsonFileDescriptorProvider provider : JsonFileDescriptorProvider.EP_NAME.getExtensions())
-				{
-					if(provider.isMyFile(file))
-					{
-						JsonObjectDescriptor objectDescriptor = new JsonObjectDescriptor();
-						provider.fillRootObject(objectDescriptor, file);
+public class JsonFileDescriptorProviders {
+    @Nullable
+    @RequiredReadAction
+    public static JsonObjectDescriptor getRootDescriptor(@Nullable final PsiFile file) {
+        if (file == null || file.getFileType() != JsonFileType.INSTANCE) {
+            return null;
+        }
+        return CachedValuesManager.getManager(file.getProject()).createCachedValue(
+            new CachedValueProvider<JsonObjectDescriptor>() {
+                @Nullable
+                @Override
+                @RequiredReadAction
+                public Result<JsonObjectDescriptor> compute() {
+                    for (JsonFileDescriptorProvider provider : JsonFileDescriptorProvider.EP_NAME.getExtensions()) {
+                        if (provider.isMyFile(file)) {
+                            JsonObjectDescriptor objectDescriptor = new JsonObjectDescriptor();
+                            provider.fillRootObject(objectDescriptor, file);
 
-						return Result.create(objectDescriptor, file, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
-					}
-				}
-				return null;
-			}
-		}, false).getValue();
-	}
+                            return Result.create(objectDescriptor, file, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+                        }
+                    }
+                    return null;
+                }
+            },
+            false
+        ).getValue();
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
index 2915ad10..65f1aed9 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
@@ -22,18 +22,15 @@
  * @author VISTALL
  * @since 25.11.2015
  */
-public class NativeArray
-{
-	private final Object myComponentType;
+public class NativeArray {
+    private final Object myComponentType;
 
-	public NativeArray(@Nonnull Object componentType)
-	{
-		myComponentType = componentType;
-	}
+    public NativeArray(@Nonnull Object componentType) {
+        myComponentType = componentType;
+    }
 
-	@Nonnull
-	public Object getComponentType()
-	{
-		return myComponentType;
-	}
+    @Nonnull
+    public Object getComponentType() {
+        return myComponentType;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
index 41b38436..7ac3c06d 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -44,6 +44,7 @@
 import consulo.util.lang.StringUtil;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.*;
 
 /**
@@ -51,231 +52,211 @@
  * @since 10.11.2015
  */
 @ExtensionImpl
-public class JsonCompletionContributor extends CompletionContributor
-{
-	public JsonCompletionContributor()
-	{
-		extend(CompletionType.BASIC, StandardPatterns.psiElement(JSTokenTypes.IDENTIFIER), new CompletionProvider()
-		{
-			@RequiredReadAction
-			@Override
-			public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
-			{
-				addVariants(parameters, result, true);
-			}
-		});
+public class JsonCompletionContributor extends CompletionContributor {
+    public JsonCompletionContributor() {
+        extend(
+            CompletionType.BASIC,
+            StandardPatterns.psiElement(JSTokenTypes.IDENTIFIER),
+            new CompletionProvider() {
+                @RequiredReadAction
+                @Override
+                public void addCompletions(
+                    @Nonnull CompletionParameters parameters,
+                    ProcessingContext context,
+                    @Nonnull CompletionResultSet result
+                ) {
+                    addVariants(parameters, result, true);
+                }
+            }
+        );
 
-		extend(CompletionType.BASIC, StandardPatterns.psiElement(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL), new CompletionProvider()
-		{
-			@RequiredReadAction
-			@Override
-			public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
-			{
-				PsiElement originalPosition = parameters.getOriginalPosition();
-				if(originalPosition == null)
-				{
-					return;
-				}
-				if(!"\'\'".equals(originalPosition.getText()))
-				{
-					return;
-				}
-				addVariants(parameters, result, false);
-			}
-		});
+        extend(
+            CompletionType.BASIC,
+            StandardPatterns.psiElement(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL),
+            new CompletionProvider() {
+                @RequiredReadAction
+                @Override
+                public void addCompletions(
+                    @Nonnull CompletionParameters parameters,
+                    ProcessingContext context,
+                    @Nonnull CompletionResultSet result
+                ) {
+                    PsiElement originalPosition = parameters.getOriginalPosition();
+                    if (originalPosition == null) {
+                        return;
+                    }
+                    if (!"\'\'".equals(originalPosition.getText())) {
+                        return;
+                    }
+                    addVariants(parameters, result, false);
+                }
+            }
+        );
 
-		extend(CompletionType.BASIC, StandardPatterns.psiElement(JSTokenTypes.STRING_LITERAL), new CompletionProvider()
-		{
-			@RequiredReadAction
-			@Override
-			public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
-			{
-				PsiElement originalPosition = parameters.getOriginalPosition();
-				if(originalPosition == null)
-				{
-					return;
-				}
-				if(!"\"\"".equals(originalPosition.getText()))
-				{
-					return;
-				}
-				addVariants(parameters, result, false);
-			}
-		});
-	}
+        extend(
+            CompletionType.BASIC,
+            StandardPatterns.psiElement(JSTokenTypes.STRING_LITERAL),
+            new CompletionProvider() {
+                @RequiredReadAction
+                @Override
+                public void addCompletions(
+                    @Nonnull CompletionParameters parameters,
+                    ProcessingContext context,
+                    @Nonnull CompletionResultSet result
+                ) {
+                    PsiElement originalPosition = parameters.getOriginalPosition();
+                    if (originalPosition == null) {
+                        return;
+                    }
+                    if (!"\"\"".equals(originalPosition.getText())) {
+                        return;
+                    }
+                    addVariants(parameters, result, false);
+                }
+            }
+        );
+    }
 
-	@RequiredReadAction
-	private static void addVariants(@Nonnull CompletionParameters parameters, @Nonnull CompletionResultSet result, boolean quotes)
-	{
-		final PsiFile originalFile = parameters.getOriginalFile();
+    @RequiredReadAction
+    private static void addVariants(@Nonnull CompletionParameters parameters, @Nonnull CompletionResultSet result, boolean quotes) {
+        final PsiFile originalFile = parameters.getOriginalFile();
 
-		JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(originalFile);
-		if(rootDescriptor == null)
-		{
-			return;
-		}
+        JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(originalFile);
+        if (rootDescriptor == null) {
+            return;
+        }
 
-		PsiElement position = parameters.getPosition();
-		final PsiElement jsProperty = position.getParent();
-		if(!(jsProperty instanceof JSProperty))
-		{
-			return;
-		}
+        PsiElement position = parameters.getPosition();
+        final PsiElement jsProperty = position.getParent();
+        if (!(jsProperty instanceof JSProperty)) {
+            return;
+        }
 
-		Collection<JSProperty> jsProperties = PropertyValidationInspection.buildPropertiesAsTree(position, rootDescriptor);
-		if(jsProperties.isEmpty())
-		{
-			return;
-		}
+        Collection<JSProperty> jsProperties = PropertyValidationInspection.buildPropertiesAsTree(position, rootDescriptor);
+        if (jsProperties.isEmpty()) {
+            return;
+        }
 
-		JsonObjectDescriptor parentObject = null;
-		JsonPropertyDescriptor currentProperty = null;
-		JsonObjectDescriptor currentObject = rootDescriptor;
-		for(JSProperty property : jsProperties)
-		{
-			String name = property.getName();
-			if(name == null)
-			{
-				return;
-			}
+        JsonObjectDescriptor parentObject = null;
+        JsonPropertyDescriptor currentProperty = null;
+        JsonObjectDescriptor currentObject = rootDescriptor;
+        for (JSProperty property : jsProperties) {
+            String name = property.getName();
+            if (name == null) {
+                return;
+            }
 
-			currentProperty = currentObject.getProperty(name);
-			if(currentProperty == null)
-			{
-				if(property == jsProperty)
-				{
-					parentObject = currentObject;
-					break;
-				}
-				else
-				{
-					return;
-				}
-			}
-			else if(currentProperty.getValue() instanceof JsonObjectDescriptor)
-			{
-				currentObject = (JsonObjectDescriptor) currentProperty.getValue();
-			}
-			else if(currentProperty.getValue() instanceof NativeArray)
-			{
-				Object componentType = ((NativeArray) currentProperty.getValue()).getComponentType();
-				if(componentType instanceof JsonObjectDescriptor)
-				{
-					currentObject = (JsonObjectDescriptor) componentType;
-				}
-				else
-				{
-					return;
-				}
-			}
-			else
-			{
-				break;
-			}
-		}
+            currentProperty = currentObject.getProperty(name);
+            if (currentProperty == null) {
+                if (property == jsProperty) {
+                    parentObject = currentObject;
+                    break;
+                }
+                else {
+                    return;
+                }
+            }
+            else if (currentProperty.getValue() instanceof JsonObjectDescriptor objectDescriptor) {
+                currentObject = objectDescriptor;
+            }
+            else if (currentProperty.getValue() instanceof NativeArray nativeArray) {
+                Object componentType = nativeArray.getComponentType();
+                if (componentType instanceof JsonObjectDescriptor objectDescriptor) {
+                    currentObject = objectDescriptor;
+                }
+                else {
+                    return;
+                }
+            }
+            else {
+                break;
+            }
+        }
 
-		if(parentObject == null)
-		{
-			return;
-		}
+        if (parentObject == null) {
+            return;
+        }
 
-		Map<String, JsonPropertyDescriptor> properties = parentObject.getProperties();
+        Map<String, JsonPropertyDescriptor> properties = parentObject.getProperties();
 
-		Set<String> alreadyDefined = Collections.emptySet();
-		PsiElement parent = jsProperty.getParent();
-		if(parent instanceof JSObjectLiteralExpression)
-		{
-			JSProperty[] parentProperties = ((JSObjectLiteralExpression) parent).getProperties();
-			alreadyDefined = new HashSet<String>(parentProperties.length);
-			for(JSProperty parentProperty : parentProperties)
-			{
-				ContainerUtil.addIfNotNull(alreadyDefined, parentProperty.getName());
-			}
-		}
+        Set<String> alreadyDefined = Collections.emptySet();
+        PsiElement parent = jsProperty.getParent();
+        if (parent instanceof JSObjectLiteralExpression objectLiteralExpression) {
+            JSProperty[] parentProperties = objectLiteralExpression.getProperties();
+            alreadyDefined = new HashSet<>(parentProperties.length);
+            for (JSProperty parentProperty : parentProperties) {
+                ContainerUtil.addIfNotNull(alreadyDefined, parentProperty.getName());
+            }
+        }
 
-		for(final Map.Entry<String, JsonPropertyDescriptor> entry : properties.entrySet())
-		{
-			String key = entry.getKey();
-			if(key == null || alreadyDefined.contains(key))
-			{
-				continue;
-			}
-			LookupElementBuilder builder = LookupElementBuilder.create(quotes ? StringUtil.QUOTER.apply(key) : key);
-			builder = builder.withPresentableText(quotes ? StringUtil.QUOTER.apply(key) : key);
-			builder = builder.withIcon((Image) AllIcons.Nodes.Property);
-			final JsonPropertyDescriptor value = entry.getValue();
-			if(value.isDeprecated())
-			{
-				builder = builder.strikeout();
-			}
-			final Object type = value.getValue();
-			builder = builder.withTypeText(formatValue(type), true);
+        for (final Map.Entry<String, JsonPropertyDescriptor> entry : properties.entrySet()) {
+            String key = entry.getKey();
+            if (key == null || alreadyDefined.contains(key)) {
+                continue;
+            }
+            LookupElementBuilder builder = LookupElementBuilder.create(quotes ? StringUtil.QUOTER.apply(key) : key);
+            builder = builder.withPresentableText(quotes ? StringUtil.QUOTER.apply(key) : key);
+            builder = builder.withIcon(AllIcons.Nodes.Property);
+            final JsonPropertyDescriptor value = entry.getValue();
+            if (value.isDeprecated()) {
+                builder = builder.strikeout();
+            }
+            final Object type = value.getValue();
+            builder = builder.withTypeText(formatValue(type), true);
 
-			if(quotes && ((JSProperty) jsProperty).getValue() == null)
-			{
-				builder = builder.withInsertHandler(new InsertHandler<LookupElement>()
-				{
-					@Override
-					public void handleInsert(InsertionContext context, LookupElement item)
-					{
-						if(type == Object.class)
-						{
-							context.getDocument().insertString(context.getTailOffset(), ": {\n}");
-							context.getEditor().getCaretModel().moveToOffset(context.getTailOffset() - 2);
+            if (quotes && ((JSProperty)jsProperty).getValue() == null) {
+                builder = builder.withInsertHandler(new InsertHandler<LookupElement>() {
+                    @Override
+                    public void handleInsert(InsertionContext context, LookupElement item) {
+                        if (type == Object.class) {
+                            context.getDocument().insertString(context.getTailOffset(), ": {\n}");
+                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset() - 2);
 
-							context.commitDocument();
-							CodeStyleManager.getInstance(context.getProject()).reformatRange(originalFile, context.getStartOffset(), context.getTailOffset());
-						}
-						else if(type == Boolean.class)
-						{
-							context.getDocument().insertString(context.getTailOffset(), ": false");
-							context.getEditor().getCaretModel().moveToOffset(context.getTailOffset());
-						}
-						else if(type == String.class)
-						{
-							context.getDocument().insertString(context.getTailOffset(), ": \"\"");
-							context.getEditor().getCaretModel().moveToOffset(context.getTailOffset() - 1);
-						}
-						else if(type == Number.class)
-						{
-							context.getDocument().insertString(context.getTailOffset(), ": 0");
-							context.getEditor().getCaretModel().moveToOffset(context.getTailOffset());
-						}
-						else if(value.getValue() instanceof NativeArray)
-						{
-							context.getDocument().insertString(context.getTailOffset(), ": []");
-							context.getEditor().getCaretModel().moveToOffset(context.getTailOffset() - 1);
-						}
-						else
-						{
-							context.getDocument().insertString(context.getTailOffset(), ": ");
-							context.getEditor().getCaretModel().moveToOffset(context.getTailOffset());
-						}
-					}
-				});
-			}
-			result.addElement(builder);
-		}
-	}
+                            context.commitDocument();
+                            CodeStyleManager.getInstance(context.getProject())
+                                .reformatRange(originalFile, context.getStartOffset(), context.getTailOffset());
+                        }
+                        else if (type == Boolean.class) {
+                            context.getDocument().insertString(context.getTailOffset(), ": false");
+                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset());
+                        }
+                        else if (type == String.class) {
+                            context.getDocument().insertString(context.getTailOffset(), ": \"\"");
+                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset() - 1);
+                        }
+                        else if (type == Number.class) {
+                            context.getDocument().insertString(context.getTailOffset(), ": 0");
+                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset());
+                        }
+                        else if (value.getValue() instanceof NativeArray) {
+                            context.getDocument().insertString(context.getTailOffset(), ": []");
+                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset() - 1);
+                        }
+                        else {
+                            context.getDocument().insertString(context.getTailOffset(), ": ");
+                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset());
+                        }
+                    }
+                });
+            }
+            result.addElement(builder);
+        }
+    }
 
-	private static String formatValue(Object value)
-	{
-		if(value instanceof Class)
-		{
-			return StringUtil.decapitalize(((Class) value).getSimpleName());
-		}
-		else if(value instanceof NativeArray)
-		{
-			return formatValue(((NativeArray) value).getComponentType()) + "[]";
-		}
-		// JsonObjectDescriptor
-		return "object";
-	}
+    private static String formatValue(Object value) {
+        if (value instanceof Class aClass) {
+            return StringUtil.decapitalize(aClass.getSimpleName());
+        }
+        else if (value instanceof NativeArray nativeArray) {
+            return formatValue(nativeArray.getComponentType()) + "[]";
+        }
+        // JsonObjectDescriptor
+        return "object";
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index f81dc90a..ad70357b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -40,6 +40,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -47,102 +48,101 @@
  * @author VISTALL
  * @since 12.11.2015
  */
-public class DescriptionByAnotherPsiElementEditorNotification<T extends PsiElement> implements EditorNotificationProvider
-{
-	private Project myProject;
-	private DescriptionByAnotherPsiElementProvider<T> myProvider;
-
-	public DescriptionByAnotherPsiElementEditorNotification(@Nonnull Project project, @Nonnull DescriptionByAnotherPsiElementProvider<T> provider)
-	{
-		myProject = project;
-		myProvider = provider;
-	}
-
-	@Nonnull
-	@Override
-	public String getId()
-	{
-		return myProvider.getId();
-	}
-
-	@Override
-	@Nullable
-	@RequiredReadAction
-	public EditorNotificationBuilder buildNotification(@Nonnull VirtualFile file, @Nonnull FileEditor fileEditor, @Nonnull Supplier<EditorNotificationBuilder> supplier)
-	{
-		if(file.getFileType() != JsonFileType.INSTANCE)
-		{
-			return null;
-		}
-
-		final PsiFile psiFile = PsiManager.getInstance(myProject).findFile(file);
-		if(psiFile == null)
-		{
-			return null;
-		}
-
-		JomFileElement<JomElement> fileElement = JomManager.getInstance(myProject).getFileElement(psiFile);
-		if(fileElement != null)
-		{
-			return null;
-		}
-
-		if(!myProvider.isAvailable(myProject))
-		{
-			return null;
-		}
-
-		String registeredPsiElementId = DescriptionByAnotherPsiElementService.getInstance(myProject).getRegisteredPsiElementId(file);
-		if(registeredPsiElementId == null)
-		{
-			EditorNotificationBuilder panel = supplier.get();
-			panel.withText(LocalizeValue.localizeTODO(StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) + " model description is available for this file"));
-			panel.withAction(LocalizeValue.localizeTODO("Choose " + myProvider.getPsiElementName()), new Consumer<UIEvent<Component>>()
-			{
-				@Override
-				@RequiredUIAccess
-				public void accept(UIEvent<Component> uiEvent)
-				{
-					T chooseElement = myProvider.chooseElement(myProject);
-					if(chooseElement == null)
-					{
-						return;
-					}
-
-					DescriptionByAnotherPsiElementService.getInstance(myProject).registerFile(file, chooseElement, myProvider);
-
-					wantUpdate(psiFile);
-				}
-			});
-			return panel;
-		}
-		else
-		{
-			EditorNotificationBuilder panel = supplier.get();
-			panel.withText(LocalizeValue.localizeTODO(StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) + " model description is registered for this file. " + myProvider.getPsiElementName() + ": "
-					+ registeredPsiElementId));
-			panel.withAction(LocalizeValue.localizeTODO("Cancel"), new Consumer<UIEvent<Component>>()
-			{
-				@Override
-				@RequiredUIAccess
-				public void accept(UIEvent<Component> uiEvent)
-				{
-					if(DescriptionByAnotherPsiElementService.getInstance(myProject).removeFile(file))
-					{
-						wantUpdate(psiFile);
-					}
-				}
-			});
-			return panel;
-		}
-	}
-
-	private void wantUpdate(PsiFile psiFile)
-	{
-		PsiModificationTracker.getInstance(myProject).incCounter();
-
-		DaemonCodeAnalyzer.getInstance(myProject).restart(psiFile);
-
-		EditorNotifications.getInstance(psiFile.getProject()).updateNotifications(psiFile.getVirtualFile());
-	}
+public class DescriptionByAnotherPsiElementEditorNotification<T extends PsiElement> implements EditorNotificationProvider {
+    private Project myProject;
+    private DescriptionByAnotherPsiElementProvider<T> myProvider;
+
+    public DescriptionByAnotherPsiElementEditorNotification(
+        @Nonnull Project project,
+        @Nonnull DescriptionByAnotherPsiElementProvider<T> provider
+    ) {
+        myProject = project;
+        myProvider = provider;
+    }
+
+    @Nonnull
+    @Override
+    public String getId() {
+        return myProvider.getId();
+    }
+
+    @Override
+    @Nullable
+    @RequiredReadAction
+    public EditorNotificationBuilder buildNotification(
+        @Nonnull VirtualFile file,
+        @Nonnull FileEditor fileEditor,
+        @Nonnull Supplier<EditorNotificationBuilder> supplier
+    ) {
+        if (file.getFileType() != JsonFileType.INSTANCE) {
+            return null;
+        }
+
+        final PsiFile psiFile = PsiManager.getInstance(myProject).findFile(file);
+        if (psiFile == null) {
+            return null;
+        }
+
+        JomFileElement<JomElement> fileElement = JomManager.getInstance(myProject).getFileElement(psiFile);
+        if (fileElement != null) {
+            return null;
+        }
+
+        if (!myProvider.isAvailable(myProject)) {
+            return null;
+        }
+
+        String registeredPsiElementId = DescriptionByAnotherPsiElementService.getInstance(myProject).getRegisteredPsiElementId(file);
+        if (registeredPsiElementId == null) {
+            EditorNotificationBuilder panel = supplier.get();
+            panel.withText(LocalizeValue.localizeTODO(StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) + " model description is available for this file"));
+            panel.withAction(
+                LocalizeValue.localizeTODO("Choose " + myProvider.getPsiElementName()),
+                new Consumer<>() {
+                    @Override
+                    @RequiredUIAccess
+                    public void accept(UIEvent<Component> uiEvent) {
+                        T chooseElement = myProvider.chooseElement(myProject);
+                        if (chooseElement == null) {
+                            return;
+                        }
+
+                        DescriptionByAnotherPsiElementService.getInstance(myProject).registerFile(file, chooseElement, myProvider);
+
+                        wantUpdate(psiFile);
+                    }
+                }
+            );
+            return panel;
+        }
+        else {
+            EditorNotificationBuilder panel = supplier.get();
+            panel.withText(LocalizeValue.localizeTODO(
+                StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) +
+                    " model description is registered for this file. " +
+                    myProvider.getPsiElementName() + ": " + registeredPsiElementId
+            ));
+            panel.withAction(
+                LocalizeValue.localizeTODO("Cancel"),
+                new Consumer<>() {
+                    @Override
+                    @RequiredUIAccess
+                    public void accept(UIEvent<Component> uiEvent) {
+                        if (DescriptionByAnotherPsiElementService.getInstance(myProject).removeFile(file)) {
+                            wantUpdate(psiFile);
+                        }
+                    }
+                }
+            );
+            return panel;
+        }
+    }
+
+    private void wantUpdate(PsiFile psiFile) {
+        PsiModificationTracker.getInstance(myProject).incCounter();
+
+        DaemonCodeAnalyzer.getInstance(myProject).restart(psiFile);
+
+        EditorNotifications.getInstance(psiFile.getProject()).updateNotifications(psiFile.getVirtualFile());
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
index 374b9355..5eaea206 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
@@ -33,39 +33,33 @@
  * @since 12.11.2015
  */
 @ExtensionImpl
-public class DescriptionByAnotherPsiElementJsonDescriptionProvider implements JsonFileDescriptorProvider
-{
-	@RequiredReadAction
-	@Override
-	public boolean isMyFile(@Nonnull PsiFile file)
-	{
-		VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
-		if(virtualFile == null)
-		{
-			return false;
-		}
-		return DescriptionByAnotherPsiElementService.getInstance(file.getProject()).getRegisteredPsiElementId(virtualFile) != null;
-	}
+public class DescriptionByAnotherPsiElementJsonDescriptionProvider implements JsonFileDescriptorProvider {
+    @RequiredReadAction
+    @Override
+    public boolean isMyFile(@Nonnull PsiFile file) {
+        VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
+        if (virtualFile == null) {
+            return false;
+        }
+        return DescriptionByAnotherPsiElementService.getInstance(file.getProject()).getRegisteredPsiElementId(virtualFile) != null;
+    }
 
-	@RequiredReadAction
-	@Override
-	public void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file)
-	{
-		VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
-		if(virtualFile == null)
-		{
-			return;
-		}
+    @RequiredReadAction
+    @Override
+    public void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file) {
+        VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
+        if (virtualFile == null) {
+            return;
+        }
 
-		Pair<DescriptionByAnotherPsiElementProvider<PsiElement>, PsiElement> pair = DescriptionByAnotherPsiElementService.getInstance(file.getProject())
-				.getRegisteredPsiElementInfo(virtualFile);
+        Pair<DescriptionByAnotherPsiElementProvider<PsiElement>, PsiElement> pair =
+            DescriptionByAnotherPsiElementService.getInstance(file.getProject()).getRegisteredPsiElementInfo(virtualFile);
 
-		PsiElement psiElement = pair.getSecond();
-		if(psiElement == null)
-		{
-			return;
-		}
+        PsiElement psiElement = pair.getSecond();
+        if (psiElement == null) {
+            return;
+        }
 
-		pair.getFirst().fillRootObject(psiElement, root);
-	}
+        pair.getFirst().fillRootObject(psiElement, root);
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
index 2625158b..7bf30d43 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
@@ -32,28 +32,27 @@
  * @since 12.11.2015
  */
 @ExtensionAPI(ComponentScope.APPLICATION)
-public interface DescriptionByAnotherPsiElementProvider<T extends PsiElement>
-{
-	@Nonnull
-	String getId();
+public interface DescriptionByAnotherPsiElementProvider<T extends PsiElement> {
+    @Nonnull
+    String getId();
 
-	@Nonnull
-	String getPsiElementName();
+    @Nonnull
+    String getPsiElementName();
 
-	@Nonnull
-	@RequiredReadAction
-	String getIdFromPsiElement(@Nonnull T element);
+    @Nonnull
+    @RequiredReadAction
+    String getIdFromPsiElement(@Nonnull T element);
 
-	@Nullable
-	@RequiredReadAction
-	T getPsiElementById(@Nonnull String id, @Nonnull Project project);
+    @Nullable
+    @RequiredReadAction
+    T getPsiElementById(@Nonnull String id, @Nonnull Project project);
 
-	@RequiredUIAccess
-	@Nullable
-	T chooseElement(@Nonnull Project project);
+    @RequiredUIAccess
+    @Nullable
+    T chooseElement(@Nonnull Project project);
 
-	@RequiredReadAction
-	boolean isAvailable(@Nonnull Project project);
+    @RequiredReadAction
+    boolean isAvailable(@Nonnull Project project);
 
-	void fillRootObject(@Nonnull T psiElement, @Nonnull JsonObjectDescriptor root);
+    void fillRootObject(@Nonnull T psiElement, @Nonnull JsonObjectDescriptor root);
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
index 9ca87e37..f2142121 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
@@ -19,10 +19,12 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.component.ComponentManager;
 import consulo.component.extension.ExtensionExtender;
+import consulo.component.extension.ExtensionPoint;
 import consulo.fileEditor.EditorNotificationProvider;
 import consulo.project.Project;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.function.Consumer;
 
 /**
@@ -31,27 +33,24 @@
  */
 @ExtensionImpl
 @SuppressWarnings("unchecked")
-public class DescriptionByAnotherPsiElementRegistrar implements ExtensionExtender<EditorNotificationProvider>
-{
-	@Override
-	public void extend(@Nonnull ComponentManager componentManager, @Nonnull Consumer<EditorNotificationProvider> consumer)
-	{
-		for(final DescriptionByAnotherPsiElementProvider<?> provider : componentManager.getExtensionPoint(DescriptionByAnotherPsiElementProvider.class))
-		{
-			consumer.accept(new DescriptionByAnotherPsiElementEditorNotification((Project) componentManager, provider));
-		}
-	}
+public class DescriptionByAnotherPsiElementRegistrar implements ExtensionExtender<EditorNotificationProvider> {
+    @Override
+    public void extend(@Nonnull ComponentManager componentManager, @Nonnull Consumer<EditorNotificationProvider> consumer) {
+        ExtensionPoint<DescriptionByAnotherPsiElementProvider> extensionPoint =
+            componentManager.getExtensionPoint(DescriptionByAnotherPsiElementProvider.class);
+        for (final DescriptionByAnotherPsiElementProvider<?> provider : extensionPoint) {
+            consumer.accept(new DescriptionByAnotherPsiElementEditorNotification((Project)componentManager, provider));
+        }
+    }
 
-	@Nonnull
-	@Override
-	public Class<EditorNotificationProvider> getExtensionClass()
-	{
-		return EditorNotificationProvider.class;
-	}
+    @Nonnull
+    @Override
+    public Class<EditorNotificationProvider> getExtensionClass() {
+        return EditorNotificationProvider.class;
+    }
 
-	@Override
-	public boolean hasAnyExtensions(ComponentManager componentManager)
-	{
-		return componentManager.getExtensionPoint(DescriptionByAnotherPsiElementProvider.class).hasAnyExtensions();
-	}
+    @Override
+    public boolean hasAnyExtensions(ComponentManager componentManager) {
+        return componentManager.getExtensionPoint(DescriptionByAnotherPsiElementProvider.class).hasAnyExtensions();
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index 2e43d504..8818b69f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -43,6 +43,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -55,265 +56,231 @@
 @State(name = "JSONDescriptionByAnotherPsiElementService", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
 @ServiceAPI(ComponentScope.PROJECT)
 @ServiceImpl
-public class DescriptionByAnotherPsiElementService implements PersistentStateComponent<Element>, Disposable
-{
-	private static class Info implements Disposable
-	{
-		private final VirtualFilePointer myVirtualFilePointer;
-		private SmartPsiElementPointer<? extends PsiElement> myElementPointer;
-		private final DescriptionByAnotherPsiElementProvider myProvider;
-
-		private final String myId;
-		private String myPsiElementId;
-		private Project myProject;
-
-		public Info(@Nonnull Project project, @Nonnull VirtualFile virtualFile, @Nonnull PsiElement element, @Nonnull DescriptionByAnotherPsiElementProvider<?> provider)
-		{
-			myProject = project;
-			myId = provider.getId();
-			myProvider = provider;
-			myVirtualFilePointer = VirtualFilePointerManager.getInstance().create(virtualFile, this, null);
-			myElementPointer = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
-		}
-
-		public Info(@Nonnull Project project, @Nonnull String url, @Nonnull final String providerId, @Nonnull String psiElementId)
-		{
-			myProject = project;
-			myVirtualFilePointer = VirtualFilePointerManager.getInstance().create(url, this, null);
-
-			myProvider = ContainerUtil.find(ApplicationManager.getApplication().getExtensionList(DescriptionByAnotherPsiElementProvider.class), it -> it.getId().equals(providerId));
-
-			myId = providerId;
-			myPsiElementId = psiElementId;
-		}
-
-		public void tryToInit()
-		{
-			if(myProvider == null || myElementPointer != null)
-			{
-				return;
-			}
-
-			ApplicationManager.getApplication().runReadAction(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					PsiElement psiElementById = myProvider.getPsiElementById(myPsiElementId, myProject);
-					if(psiElementById == null)
-					{
-						return;
-					}
-					myElementPointer = SmartPointerManager.getInstance(myProject).createSmartPsiElementPointer(psiElementById);
-				}
-			});
-		}
-
-		@Nonnull
-		public String getId()
-		{
-			if(myId != null)
-			{
-				return myId;
-			}
-			return myProvider.getId();
-		}
-
-		@Nonnull
-		public String getUrl()
-		{
-			return myVirtualFilePointer.getUrl();
-		}
-
-		@Nullable
-		@SuppressWarnings("unchecked")
-		public String getPsiElementId()
-		{
-			if(myPsiElementId != null)
-			{
-				return myPsiElementId;
-			}
-
-			return ApplicationManager.getApplication().runReadAction(new Computable<String>()
-			{
-				@Override
-				public String compute()
-				{
-					PsiElement element = myElementPointer.getElement();
-					if(element == null)
-					{
-						return null;
-					}
-					return myProvider.getIdFromPsiElement(element);
-				}
-			});
-		}
-
-		@Nullable
-		public PsiElement getPsiElement()
-		{
-			if(myElementPointer == null)
-			{
-				if(myProvider == null)
-				{
-					return null;
-				}
-				return ApplicationManager.getApplication().runReadAction(new Computable<PsiElement>()
-				{
-					@Override
-					public PsiElement compute()
-					{
-						PsiElement element = myElementPointer == null ? null : myElementPointer.getElement();
-						if(element == null)
-						{
-							return null;
-						}
-						return myProvider.getPsiElementById(myPsiElementId, myProject);
-					}
-				});
-			}
-			else
-			{
-				return myElementPointer.getElement();
-			}
-		}
-
-		@Override
-		public void dispose()
-		{
-		}
-	}
-
-	@Nonnull
-	public static DescriptionByAnotherPsiElementService getInstance(@Nonnull Project project)
-	{
-		return ServiceManager.getService(project, DescriptionByAnotherPsiElementService.class);
-	}
-
-	private final Project myProject;
-	private final List<Info> myRegisteredFiles = new ArrayList<Info>();
-
-	@Inject
-	public DescriptionByAnotherPsiElementService(Project project)
-	{
-		myProject = project;
-	}
-
-	public <T extends PsiElement> void registerFile(@Nonnull VirtualFile virtualFile, @Nonnull T element, @Nonnull DescriptionByAnotherPsiElementProvider<?> provider)
-	{
-		Info info = new Info(myProject, virtualFile, element, provider);
-		Disposer.register(this, info);
-		myRegisteredFiles.add(info);
-	}
-
-
-	public boolean removeFile(@Nonnull VirtualFile file)
-	{
-		Iterator<Info> iterator = myRegisteredFiles.iterator();
-		while(iterator.hasNext())
-		{
-			Info info = iterator.next();
-			if(file.equals(info.myVirtualFilePointer.getFile()))
-			{
-				iterator.remove();
-				Disposer.dispose(info);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Nullable
-	public String getRegisteredPsiElementId(@Nonnull VirtualFile virtualFile)
-	{
-		for(Info registeredFile : myRegisteredFiles)
-		{
-			VirtualFile file = registeredFile.myVirtualFilePointer.getFile();
-			if(virtualFile.equals(file))
-			{
-				return registeredFile.getPsiElementId();
-			}
-		}
-		return null;
-	}
-
-	@Nonnull
-	@SuppressWarnings("unchecked")
-	public <T extends PsiElement> Pair<DescriptionByAnotherPsiElementProvider<T>, T> getRegisteredPsiElementInfo(@Nonnull VirtualFile virtualFile)
-	{
-		for(Info info : myRegisteredFiles)
-		{
-			VirtualFile file = info.myVirtualFilePointer.getFile();
-			if(virtualFile.equals(file))
-			{
-				PsiElement psiElement = info.getPsiElement();
-				if(psiElement == null)
-				{
-					return Pair.empty();
-				}
-				return new Pair.NonNull(info.myProvider, psiElement);
-			}
-		}
-		return Pair.empty();
-	}
-
-	@Nullable
-	@Override
-	public Element getState()
-	{
-		Element stateElement = new Element("state");
-		for(final Info registeredFile : myRegisteredFiles)
-		{
-			String psiElementId = registeredFile.getPsiElementId();
-			if(psiElementId == null)
-			{
-				continue;
-			}
-
-			Element fileElement = new Element("file");
-			fileElement.setAttribute("id", registeredFile.getId());
-			fileElement.setAttribute("url", registeredFile.getUrl());
-			fileElement.setAttribute("psiElementId", psiElementId);
-			stateElement.addContent(fileElement);
-		}
-		return stateElement;
-	}
-
-	@Override
-	public void loadState(Element state)
-	{
-		if(!myRegisteredFiles.isEmpty())
-		{
-			for(Info registeredFile : myRegisteredFiles)
-			{
-				Disposer.dispose(registeredFile);
-			}
-			myRegisteredFiles.clear();
-		}
-
-		for(Element element : state.getChildren("file"))
-		{
-			String id = element.getAttributeValue("id");
-			String url = element.getAttributeValue("url");
-			String psiElementId = element.getAttributeValue("psiElementId");
-
-			final Info info = new Info(myProject, url, id, psiElementId);
-			ApplicationManager.getApplication().runReadAction(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					info.tryToInit();
-				}
-			});
-			Disposer.register(this, info);
-			myRegisteredFiles.add(info);
-		}
-	}
-
-	@Override
-	public void dispose()
-	{
-		myRegisteredFiles.clear();
-	}
+public class DescriptionByAnotherPsiElementService implements PersistentStateComponent<Element>, Disposable {
+    private static class Info implements Disposable {
+        private final VirtualFilePointer myVirtualFilePointer;
+        private SmartPsiElementPointer<? extends PsiElement> myElementPointer;
+        private final DescriptionByAnotherPsiElementProvider myProvider;
+
+        private final String myId;
+        private String myPsiElementId;
+        private Project myProject;
+
+        public Info(
+            @Nonnull Project project,
+            @Nonnull VirtualFile virtualFile,
+            @Nonnull PsiElement element,
+            @Nonnull DescriptionByAnotherPsiElementProvider<?> provider
+        ) {
+            myProject = project;
+            myId = provider.getId();
+            myProvider = provider;
+            myVirtualFilePointer = VirtualFilePointerManager.getInstance().create(virtualFile, this, null);
+            myElementPointer = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
+        }
+
+        public Info(@Nonnull Project project, @Nonnull String url, @Nonnull final String providerId, @Nonnull String psiElementId) {
+            myProject = project;
+            myVirtualFilePointer = VirtualFilePointerManager.getInstance().create(url, this, null);
+
+            myProvider = ContainerUtil.find(
+                ApplicationManager.getApplication().getExtensionList(DescriptionByAnotherPsiElementProvider.class),
+                it -> it.getId().equals(providerId)
+            );
+
+            myId = providerId;
+            myPsiElementId = psiElementId;
+        }
+
+        public void tryToInit() {
+            if (myProvider == null || myElementPointer != null) {
+                return;
+            }
+
+            ApplicationManager.getApplication().runReadAction(new Runnable() {
+                @Override
+                public void run() {
+                    PsiElement psiElementById = myProvider.getPsiElementById(myPsiElementId, myProject);
+                    if (psiElementById == null) {
+                        return;
+                    }
+                    myElementPointer = SmartPointerManager.getInstance(myProject).createSmartPsiElementPointer(psiElementById);
+                }
+            });
+        }
+
+        @Nonnull
+        public String getId() {
+            if (myId != null) {
+                return myId;
+            }
+            return myProvider.getId();
+        }
+
+        @Nonnull
+        public String getUrl() {
+            return myVirtualFilePointer.getUrl();
+        }
+
+        @Nullable
+        @SuppressWarnings("unchecked")
+        public String getPsiElementId() {
+            if (myPsiElementId != null) {
+                return myPsiElementId;
+            }
+
+            return ApplicationManager.getApplication().runReadAction(new Computable<String>() {
+                @Override
+                public String compute() {
+                    PsiElement element = myElementPointer.getElement();
+                    if (element == null) {
+                        return null;
+                    }
+                    return myProvider.getIdFromPsiElement(element);
+                }
+            });
+        }
+
+        @Nullable
+        public PsiElement getPsiElement() {
+            if (myElementPointer == null) {
+                if (myProvider == null) {
+                    return null;
+                }
+                return ApplicationManager.getApplication().runReadAction(new Computable<PsiElement>() {
+                    @Override
+                    public PsiElement compute() {
+                        PsiElement element = myElementPointer == null ? null : myElementPointer.getElement();
+                        if (element == null) {
+                            return null;
+                        }
+                        return myProvider.getPsiElementById(myPsiElementId, myProject);
+                    }
+                });
+            }
+            else {
+                return myElementPointer.getElement();
+            }
+        }
+
+        @Override
+        public void dispose() {
+        }
+    }
+
+    @Nonnull
+    public static DescriptionByAnotherPsiElementService getInstance(@Nonnull Project project) {
+        return ServiceManager.getService(project, DescriptionByAnotherPsiElementService.class);
+    }
+
+    private final Project myProject;
+    private final List<Info> myRegisteredFiles = new ArrayList<>();
+
+    @Inject
+    public DescriptionByAnotherPsiElementService(Project project) {
+        myProject = project;
+    }
+
+    public <T extends PsiElement> void registerFile(
+        @Nonnull VirtualFile virtualFile,
+        @Nonnull T element,
+        @Nonnull DescriptionByAnotherPsiElementProvider<?> provider
+    ) {
+        Info info = new Info(myProject, virtualFile, element, provider);
+        Disposer.register(this, info);
+        myRegisteredFiles.add(info);
+    }
+
+
+    public boolean removeFile(@Nonnull VirtualFile file) {
+        Iterator<Info> iterator = myRegisteredFiles.iterator();
+        while (iterator.hasNext()) {
+            Info info = iterator.next();
+            if (file.equals(info.myVirtualFilePointer.getFile())) {
+                iterator.remove();
+                Disposer.dispose(info);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Nullable
+    public String getRegisteredPsiElementId(@Nonnull VirtualFile virtualFile) {
+        for (Info registeredFile : myRegisteredFiles) {
+            VirtualFile file = registeredFile.myVirtualFilePointer.getFile();
+            if (virtualFile.equals(file)) {
+                return registeredFile.getPsiElementId();
+            }
+        }
+        return null;
+    }
+
+    @Nonnull
+    @SuppressWarnings("unchecked")
+    public <T extends PsiElement> Pair<DescriptionByAnotherPsiElementProvider<T>, T> getRegisteredPsiElementInfo(
+        @Nonnull VirtualFile virtualFile
+    ) {
+        for (Info info : myRegisteredFiles) {
+            VirtualFile file = info.myVirtualFilePointer.getFile();
+            if (virtualFile.equals(file)) {
+                PsiElement psiElement = info.getPsiElement();
+                if (psiElement == null) {
+                    return Pair.empty();
+                }
+                return new Pair.NonNull(info.myProvider, psiElement);
+            }
+        }
+        return Pair.empty();
+    }
+
+    @Nullable
+    @Override
+    public Element getState() {
+        Element stateElement = new Element("state");
+        for (final Info registeredFile : myRegisteredFiles) {
+            String psiElementId = registeredFile.getPsiElementId();
+            if (psiElementId == null) {
+                continue;
+            }
+
+            Element fileElement = new Element("file");
+            fileElement.setAttribute("id", registeredFile.getId());
+            fileElement.setAttribute("url", registeredFile.getUrl());
+            fileElement.setAttribute("psiElementId", psiElementId);
+            stateElement.addContent(fileElement);
+        }
+        return stateElement;
+    }
+
+    @Override
+    public void loadState(Element state) {
+        if (!myRegisteredFiles.isEmpty()) {
+            for (Info registeredFile : myRegisteredFiles) {
+                Disposer.dispose(registeredFile);
+            }
+            myRegisteredFiles.clear();
+        }
+
+        for (Element element : state.getChildren("file")) {
+            String id = element.getAttributeValue("id");
+            String url = element.getAttributeValue("url");
+            String psiElementId = element.getAttributeValue("psiElementId");
+
+            final Info info = new Info(myProject, url, id, psiElementId);
+            ApplicationManager.getApplication().runReadAction(new Runnable() {
+                @Override
+                public void run() {
+                    info.tryToInit();
+                }
+            });
+            Disposer.register(this, info);
+            myRegisteredFiles.add(info);
+        }
+    }
+
+    @Override
+    public void dispose() {
+        myRegisteredFiles.clear();
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
index d57b039d..c06a7d4e 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
@@ -28,47 +28,39 @@
  * @author VISTALL
  * @since 10.11.2015
  */
-public class JsonObjectDescriptor
-{
-	private Map<String, JsonPropertyDescriptor> myProperties = new HashMap<String, JsonPropertyDescriptor>();
+public class JsonObjectDescriptor {
+    private Map<String, JsonPropertyDescriptor> myProperties = new HashMap<>();
 
-	@Nonnull
-	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final Class<?> value)
-	{
-		if(value == Object.class)
-		{
-			throw new IllegalArgumentException("We cant add object type, use JsonObjectDescriptor as parameter");
-		}
+    @Nonnull
+    public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final Class<?> value) {
+        if (value == Object.class) {
+            throw new IllegalArgumentException("We cant add object type, use JsonObjectDescriptor as parameter");
+        }
 
-		return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
-	}
+        return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
+    }
 
-	@Nonnull
-	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final JsonObjectDescriptor value)
-	{
-		return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
-	}
+    @Nonnull
+    public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final JsonObjectDescriptor value) {
+        return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
+    }
 
-	@Nonnull
-	public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final NativeArray value)
-	{
-		return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
-	}
+    @Nonnull
+    public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final NativeArray value) {
+        return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
+    }
 
-	@Nullable
-	public JsonPropertyDescriptor getProperty(@Nonnull final String propertyName)
-	{
-		JsonPropertyDescriptor propertyDescriptor = myProperties.get(propertyName);
-		if(propertyDescriptor != null)
-		{
-			return propertyDescriptor;
-		}
+    @Nullable
+    public JsonPropertyDescriptor getProperty(@Nonnull final String propertyName) {
+        JsonPropertyDescriptor propertyDescriptor = myProperties.get(propertyName);
+        if (propertyDescriptor != null) {
+            return propertyDescriptor;
+        }
 
-		return myProperties.get(null);
-	}
+        return myProperties.get(null);
+    }
 
-	public Map<String, JsonPropertyDescriptor> getProperties()
-	{
-		return myProperties;
-	}
+    public Map<String, JsonPropertyDescriptor> getProperties() {
+        return myProperties;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
index d5d0778c..f7c1fa0f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
@@ -28,66 +28,56 @@
  * @author VISTALL
  * @since 10.11.2015
  */
-public class JsonPropertyDescriptor
-{
-	private SmartPsiElementPointer<?> myNavigationElement;
+public class JsonPropertyDescriptor {
+    private SmartPsiElementPointer<?> myNavigationElement;
 
-	private String myName;
-	private Object myValue;
-	private boolean myDeprecated;
-	private boolean myNullable = true;
+    private String myName;
+    private Object myValue;
+    private boolean myDeprecated;
+    private boolean myNullable = true;
 
-	public JsonPropertyDescriptor(@Nullable String name, @Nonnull Object value)
-	{
-		myName = name;
-		myValue = value;
-	}
+    public JsonPropertyDescriptor(@Nullable String name, @Nonnull Object value) {
+        myName = name;
+        myValue = value;
+    }
 
-	public boolean isNullable()
-	{
-		return myNullable;
-	}
+    public boolean isNullable() {
+        return myNullable;
+    }
 
-	public boolean isDeprecated()
-	{
-		return myDeprecated;
-	}
+    public boolean isDeprecated() {
+        return myDeprecated;
+    }
 
-	@Nonnull
-	public JsonPropertyDescriptor deprecated()
-	{
-		myDeprecated = true;
-		return this;
-	}
+    @Nonnull
+    public JsonPropertyDescriptor deprecated() {
+        myDeprecated = true;
+        return this;
+    }
 
-	@Nonnull
-	public JsonPropertyDescriptor notNull()
-	{
-		myNullable = false;
-		return this;
-	}
+    @Nonnull
+    public JsonPropertyDescriptor notNull() {
+        myNullable = false;
+        return this;
+    }
 
-	@Nonnull
-	public Object getValue()
-	{
-		return myValue;
-	}
+    @Nonnull
+    public Object getValue() {
+        return myValue;
+    }
 
-	@Nullable
-	public String getName()
-	{
-		return myName;
-	}
+    @Nullable
+    public String getName() {
+        return myName;
+    }
 
-	@UsedInPlugin
-	public void setNavigationElement(@Nonnull PsiElement element)
-	{
-		myNavigationElement = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
-	}
+    @UsedInPlugin
+    public void setNavigationElement(@Nonnull PsiElement element) {
+        myNavigationElement = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
+    }
 
-	@Nullable
-	public PsiElement getNavigationElement()
-	{
-		return myNavigationElement == null ? null : myNavigationElement.getElement();
-	}
+    @Nullable
+    public PsiElement getNavigationElement() {
+        return myNavigationElement == null ? null : myNavigationElement.getElement();
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index 7e3ef5ea..787c239b 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -44,6 +44,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.*;
 
 /**
@@ -51,369 +52,311 @@
  * @since 10.11.2015
  */
 @ExtensionImpl
-public class PropertyValidationInspection extends LocalInspectionTool
-{
-	@Nonnull
-	@Override
-	public PsiElementVisitor buildVisitor(@Nonnull final ProblemsHolder holder, boolean isOnTheFly)
-	{
-		return new JSElementVisitor()
-		{
-			@Override
-			@RequiredReadAction
-			public void visitJSLiteralExpression(JSSimpleLiteralExpression node)
-			{
-				validateValue(node, holder);
-			}
-
-			@Override
-			@RequiredReadAction
-			public void visitJSPrefixExpression(JSPrefixExpression expression)
-			{
-				validateValue(expression, holder);
-			}
-
-			@Override
-			@RequiredReadAction
-			public void visitJSObjectLiteralExpression(JSObjectLiteralExpression node)
-			{
-				validateValue(node, holder);
-			}
-
-			@Override
-			@RequiredReadAction
-			public void visitJSArrayLiteralExpression(JSArrayLiteralExpression node)
-			{
-				validateValue(node, holder);
-			}
-
-			@Override
-			@RequiredReadAction
-			public void visitJSProperty(JSProperty node)
-			{
-				JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(node.getContainingFile());
-				if(rootDescriptor == null)
-				{
-					return;
-				}
-
-				Collection<JSProperty> jsProperties = buildPropertiesAsTree(node, rootDescriptor);
-				if(jsProperties.isEmpty())
-				{
-					return;
-				}
-
-				JsonObjectDescriptor currentObject = rootDescriptor;
-				for(JSProperty property : jsProperties)
-				{
-					String name = property.getName();
-					if(name == null)
-					{
-						return;
-					}
-
-					JsonPropertyDescriptor propertyDescriptor = currentObject.getProperty(name);
-					if(propertyDescriptor == null)
-					{
-						if(node == property)
-						{
-							PsiElement nameIdentifier = node.getNameIdentifier();
-							assert nameIdentifier != null;
-
-							holder.registerProblem(nameIdentifier, "Undefined property", ProblemHighlightType.ERROR);
-						}
-						return;
-					}
-					else if(propertyDescriptor.getValue() instanceof JsonObjectDescriptor)
-					{
-						currentObject = (JsonObjectDescriptor) propertyDescriptor.getValue();
-					}
-					else
-					{
-						return;
-					}
-				}
-			}
-		};
-	}
-
-	@RequiredReadAction
-	public static Collection<JSProperty> buildPropertiesAsTree(PsiElement element, @Nullable JsonObjectDescriptor objectDescriptor)
-	{
-		JsonObjectDescriptor rootDescriptor = objectDescriptor == null ? JsonFileDescriptorProviders.getRootDescriptor(element.getContainingFile()) : objectDescriptor;
-		if(rootDescriptor == null)
-		{
-			return Collections.emptyList();
-		}
-
-		final Deque<JSProperty> queue = new ArrayDeque<>();
-		PsiTreeUtil.treeWalkUp(element, null, new PairProcessor<PsiElement, PsiElement>()
-		{
-			@Override
-			public boolean process(PsiElement element, PsiElement element2)
-			{
-				if(element instanceof JSProperty)
-				{
-					queue.addFirst((JSProperty) element);
-				}
-				return true;
-			}
-		});
-		return queue;
-	}
-
-	@Nullable
-	@RequiredReadAction
-	private static Object getTypeOfExpression(@Nonnull PsiElement node)
-	{
-		if(node instanceof JSLiteralExpression)
-		{
-			PsiElement firstChild = node.getFirstChild();
-			IElementType elementType = PsiUtilCore.getElementType(firstChild);
-			if(elementType == null)
-			{
-				return null;
-			}
-
-			Class<?> propertyType = null;
-			if(elementType == JSTokenTypes.NUMERIC_LITERAL)
-			{
-				propertyType = Number.class;
-			}
-			else if(JavaScriptTokenSets.STRING_LITERALS.contains(elementType))
-			{
-				propertyType = String.class;
-			}
-			else if(elementType == JSTokenTypes.NULL_KEYWORD)
-			{
-				propertyType = Void.class;
-			}
-			else if(elementType == JSTokenTypes.TRUE_KEYWORD || elementType == JSTokenTypes.FALSE_KEYWORD)
-			{
-				propertyType = Boolean.class;
-			}
-
-			if(propertyType == null)
-			{
-				return null;
-			}
-			return propertyType;
-		}
-		else if(node instanceof JSPrefixExpression)
-		{
-			return Number.class;
-		}
-		else if(node instanceof JSObjectLiteralExpression)
-		{
-			return Object.class;
-		}
-		else if(node instanceof JSArrayLiteralExpression)
-		{
-			Set<Object> types = new HashSet<>();
-			JSExpression[] expressions = ((JSArrayLiteralExpression) node).getExpressions();
-			for(JSExpression expression : expressions)
-			{
-				if(expression == null)
-				{
-					continue;
-				}
-
-				Object typeOfExpression = getTypeOfExpression(expression);
-				ContainerUtil.addIfNotNull(types, typeOfExpression);
-			}
-
-			int size = types.size();
-			switch(size)
-			{
-				case 0:
-					return null;
-				case 1:
-					Object firstItem = ContainerUtil.getFirstItem(types);
-					assert firstItem != null;
-					return new NativeArray(firstItem);
-				default:
-					return new NativeArray(Object.class);
-			}
-		}
-		return null;
-	}
-
-	@Nullable
-	@RequiredReadAction
-	public static JsonPropertyDescriptor findPropertyDescriptor(@Nonnull final JSProperty jsProperty)
-	{
-		return CachedValuesManager.getManager(jsProperty.getProject()).createCachedValue(new CachedValueProvider<JsonPropertyDescriptor>()
-		{
-			@Nullable
-			@Override
-			@RequiredReadAction
-			public Result<JsonPropertyDescriptor> compute()
-			{
-				return Result.create(findPropertyDescriptorImpl(jsProperty), jsProperty, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
-			}
-		}, false).getValue();
-	}
-
-	@Nullable
-	@RequiredReadAction
-	private static JsonPropertyDescriptor findPropertyDescriptorImpl(@Nonnull JSProperty jsProperty)
-	{
-		JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(jsProperty.getContainingFile());
-		if(rootDescriptor == null)
-		{
-			return null;
-		}
-
-		Collection<JSProperty> jsProperties = buildPropertiesAsTree(jsProperty, rootDescriptor);
-		if(jsProperties.isEmpty())
-		{
-			return null;
-		}
-
-		JsonPropertyDescriptor currentProperty = null;
-		JsonObjectDescriptor currentObject = rootDescriptor;
-		for(JSProperty property : jsProperties)
-		{
-			String name = property.getName();
-			if(name == null)
-			{
-				return null;
-			}
-
-			currentProperty = currentObject.getProperty(name);
-			if(currentProperty == null)
-			{
-				return null;
-			}
-
-			Object value = currentProperty.getValue();
-			if(value instanceof JsonObjectDescriptor)
-			{
-				currentObject = (JsonObjectDescriptor) value;
-			}
-			else if(value instanceof NativeArray)
-			{
-				Object componentType = ((NativeArray) value).getComponentType();
-				if(componentType instanceof JsonObjectDescriptor)
-				{
-					currentObject = (JsonObjectDescriptor) componentType;
-				}
-			}
-			else
-			{
-				break;
-			}
-		}
-
-		return currentProperty;
-	}
-
-	@RequiredReadAction
-	private static void validateValue(@Nonnull PsiElement value, @Nonnull ProblemsHolder holder)
-	{
-		Object actualType = getTypeOfExpression(value);
-		if(actualType == null)
-		{
-			return;
-		}
-		PsiElement parent = value.getParent();
-		if(!(parent instanceof JSProperty))
-		{
-			return;
-		}
-
-		JsonPropertyDescriptor currentProperty = findPropertyDescriptor((JSProperty) parent);
-		if(currentProperty == null)
-		{
-			return;
-		}
-
-		Object expectedValue = currentProperty.getValue();
-		if(!isInheritable(currentProperty, expectedValue, actualType))
-		{
-			holder.registerProblem(value, "Wrong property value. Expected: " + getSimpleName(expectedValue) + ", actual: " + getSimpleName(actualType), ProblemHighlightType.GENERIC_ERROR);
-		}
-
-		if(currentProperty.isDeprecated())
-		{
-			PsiElement nameIdentifier = ((JSProperty) parent).getNameIdentifier();
-			assert nameIdentifier != null;
-			holder.registerProblem(nameIdentifier, "Deprecated property", ProblemHighlightType.LIKE_DEPRECATED);
-		}
-	}
-
-	public static boolean isInheritable(JsonPropertyDescriptor currentProperty, Object expected, Object actual)
-	{
-		// null value
-		if(currentProperty.isNullable() && actual == Void.class)
-		{
-			return true;
-		}
-
-		if(expected instanceof Class && actual instanceof Class)
-		{
-			return expected == actual;
-		}
-
-		if(expected instanceof JsonObjectDescriptor && actual == Object.class)
-		{
-			return true;
-		}
-
-		if(expected instanceof NativeArray && actual instanceof NativeArray)
-		{
-			return isInheritable(currentProperty, ((NativeArray) expected).getComponentType(), ((NativeArray) actual).getComponentType());
-		}
-		return false;
-	}
-
-	@Nonnull
-	private static String getSimpleName(Object o)
-	{
-		if(o instanceof Class)
-		{
-			if(o == Void.class)
-			{
-				return "null";
-			}
-			return StringUtil.decapitalize(((Class) o).getSimpleName());
-		}
-		else if(o instanceof JsonObjectDescriptor)
-		{
-			return getSimpleName(Object.class);
-		}
-		else if(o instanceof NativeArray)
-		{
-			return getSimpleName(((NativeArray) o).getComponentType()) + "[]";
-		}
-		return "null";
-	}
-
-	@Nonnull
-	@Override
-	public String[] getGroupPath()
-	{
-		return new String[]{"JSON"};
-	}
-
-	@Nonnull
-	@Override
-	public String getGroupDisplayName()
-	{
-		throw new UnsupportedOperationException();
-	}
-
-	@Nonnull
-	@Override
-	public String getDisplayName()
-	{
-		return "Property validation";
-	}
-
-	@Nonnull
-	@Override
-	public HighlightDisplayLevel getDefaultLevel()
-	{
-		return HighlightDisplayLevel.ERROR;
-	}
+public class PropertyValidationInspection extends LocalInspectionTool {
+    @Nonnull
+    @Override
+    public PsiElementVisitor buildVisitor(@Nonnull final ProblemsHolder holder, boolean isOnTheFly) {
+        return new JSElementVisitor() {
+            @Override
+            @RequiredReadAction
+            public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
+                validateValue(node, holder);
+            }
+
+            @Override
+            @RequiredReadAction
+            public void visitJSPrefixExpression(JSPrefixExpression expression) {
+                validateValue(expression, holder);
+            }
+
+            @Override
+            @RequiredReadAction
+            public void visitJSObjectLiteralExpression(JSObjectLiteralExpression node) {
+                validateValue(node, holder);
+            }
+
+            @Override
+            @RequiredReadAction
+            public void visitJSArrayLiteralExpression(JSArrayLiteralExpression node) {
+                validateValue(node, holder);
+            }
+
+            @Override
+            @RequiredReadAction
+            public void visitJSProperty(JSProperty node) {
+                JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(node.getContainingFile());
+                if (rootDescriptor == null) {
+                    return;
+                }
+
+                Collection<JSProperty> jsProperties = buildPropertiesAsTree(node, rootDescriptor);
+                if (jsProperties.isEmpty()) {
+                    return;
+                }
+
+                JsonObjectDescriptor currentObject = rootDescriptor;
+                for (JSProperty property : jsProperties) {
+                    String name = property.getName();
+                    if (name == null) {
+                        return;
+                    }
+
+                    JsonPropertyDescriptor propertyDescriptor = currentObject.getProperty(name);
+                    if (propertyDescriptor == null) {
+                        if (node == property) {
+                            PsiElement nameIdentifier = node.getNameIdentifier();
+                            assert nameIdentifier != null;
+
+                            holder.registerProblem(nameIdentifier, "Undefined property", ProblemHighlightType.ERROR);
+                        }
+                        return;
+                    }
+                    else if (propertyDescriptor.getValue() instanceof JsonObjectDescriptor) {
+                        currentObject = (JsonObjectDescriptor)propertyDescriptor.getValue();
+                    }
+                    else {
+                        return;
+                    }
+                }
+            }
+        };
+    }
+
+    @RequiredReadAction
+    public static Collection<JSProperty> buildPropertiesAsTree(PsiElement element, @Nullable JsonObjectDescriptor objectDescriptor) {
+        JsonObjectDescriptor rootDescriptor =
+            objectDescriptor == null ? JsonFileDescriptorProviders.getRootDescriptor(element.getContainingFile()) : objectDescriptor;
+        if (rootDescriptor == null) {
+            return Collections.emptyList();
+        }
+
+        final Deque<JSProperty> queue = new ArrayDeque<>();
+        PsiTreeUtil.treeWalkUp(element, null, new PairProcessor<PsiElement, PsiElement>() {
+            @Override
+            public boolean process(PsiElement element, PsiElement element2) {
+                if (element instanceof JSProperty) {
+                    queue.addFirst((JSProperty)element);
+                }
+                return true;
+            }
+        });
+        return queue;
+    }
+
+    @Nullable
+    @RequiredReadAction
+    private static Object getTypeOfExpression(@Nonnull PsiElement node) {
+        if (node instanceof JSLiteralExpression) {
+            PsiElement firstChild = node.getFirstChild();
+            IElementType elementType = PsiUtilCore.getElementType(firstChild);
+            if (elementType == null) {
+                return null;
+            }
+
+            Class<?> propertyType = null;
+            if (elementType == JSTokenTypes.NUMERIC_LITERAL) {
+                propertyType = Number.class;
+            }
+            else if (JavaScriptTokenSets.STRING_LITERALS.contains(elementType)) {
+                propertyType = String.class;
+            }
+            else if (elementType == JSTokenTypes.NULL_KEYWORD) {
+                propertyType = Void.class;
+            }
+            else if (elementType == JSTokenTypes.TRUE_KEYWORD || elementType == JSTokenTypes.FALSE_KEYWORD) {
+                propertyType = Boolean.class;
+            }
+
+            if (propertyType == null) {
+                return null;
+            }
+            return propertyType;
+        }
+        else if (node instanceof JSPrefixExpression) {
+            return Number.class;
+        }
+        else if (node instanceof JSObjectLiteralExpression) {
+            return Object.class;
+        }
+        else if (node instanceof JSArrayLiteralExpression) {
+            Set<Object> types = new HashSet<>();
+            JSExpression[] expressions = ((JSArrayLiteralExpression)node).getExpressions();
+            for (JSExpression expression : expressions) {
+                if (expression == null) {
+                    continue;
+                }
+
+                Object typeOfExpression = getTypeOfExpression(expression);
+                ContainerUtil.addIfNotNull(types, typeOfExpression);
+            }
+
+            int size = types.size();
+            switch (size) {
+                case 0:
+                    return null;
+                case 1:
+                    Object firstItem = ContainerUtil.getFirstItem(types);
+                    assert firstItem != null;
+                    return new NativeArray(firstItem);
+                default:
+                    return new NativeArray(Object.class);
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    @RequiredReadAction
+    public static JsonPropertyDescriptor findPropertyDescriptor(@Nonnull final JSProperty jsProperty) {
+        return CachedValuesManager.getManager(jsProperty.getProject()).createCachedValue(new CachedValueProvider<JsonPropertyDescriptor>() {
+            @Nullable
+            @Override
+            @RequiredReadAction
+            public Result<JsonPropertyDescriptor> compute() {
+                return Result.create(
+                    findPropertyDescriptorImpl(jsProperty),
+                    jsProperty,
+                    PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT
+                );
+            }
+        }, false).getValue();
+    }
+
+    @Nullable
+    @RequiredReadAction
+    private static JsonPropertyDescriptor findPropertyDescriptorImpl(@Nonnull JSProperty jsProperty) {
+        JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(jsProperty.getContainingFile());
+        if (rootDescriptor == null) {
+            return null;
+        }
+
+        Collection<JSProperty> jsProperties = buildPropertiesAsTree(jsProperty, rootDescriptor);
+        if (jsProperties.isEmpty()) {
+            return null;
+        }
+
+        JsonPropertyDescriptor currentProperty = null;
+        JsonObjectDescriptor currentObject = rootDescriptor;
+        for (JSProperty property : jsProperties) {
+            String name = property.getName();
+            if (name == null) {
+                return null;
+            }
+
+            currentProperty = currentObject.getProperty(name);
+            if (currentProperty == null) {
+                return null;
+            }
+
+            Object value = currentProperty.getValue();
+            if (value instanceof JsonObjectDescriptor objectDescriptor) {
+                currentObject = objectDescriptor;
+            }
+            else if (value instanceof NativeArray nativeArray) {
+                Object componentType = nativeArray.getComponentType();
+                if (componentType instanceof JsonObjectDescriptor objectDescriptor) {
+                    currentObject = objectDescriptor;
+                }
+            }
+            else {
+                break;
+            }
+        }
+
+        return currentProperty;
+    }
+
+    @RequiredReadAction
+    private static void validateValue(@Nonnull PsiElement value, @Nonnull ProblemsHolder holder) {
+        Object actualType = getTypeOfExpression(value);
+        if (actualType == null) {
+            return;
+        }
+        PsiElement parent = value.getParent();
+        if (!(parent instanceof JSProperty)) {
+            return;
+        }
+
+        JsonPropertyDescriptor currentProperty = findPropertyDescriptor((JSProperty)parent);
+        if (currentProperty == null) {
+            return;
+        }
+
+        Object expectedValue = currentProperty.getValue();
+        if (!isInheritable(currentProperty, expectedValue, actualType)) {
+            holder.registerProblem(
+                value,
+                "Wrong property value. Expected: " + getSimpleName(expectedValue) +
+                    ", actual: " + getSimpleName(actualType),
+                ProblemHighlightType.GENERIC_ERROR
+            );
+        }
+
+        if (currentProperty.isDeprecated()) {
+            PsiElement nameIdentifier = ((JSProperty)parent).getNameIdentifier();
+            assert nameIdentifier != null;
+            holder.registerProblem(nameIdentifier, "Deprecated property", ProblemHighlightType.LIKE_DEPRECATED);
+        }
+    }
+
+    public static boolean isInheritable(JsonPropertyDescriptor currentProperty, Object expected, Object actual) {
+        // null value
+        if (currentProperty.isNullable() && actual == Void.class) {
+            return true;
+        }
+
+        if (expected instanceof Class && actual instanceof Class) {
+            return expected == actual;
+        }
+
+        if (expected instanceof JsonObjectDescriptor && actual == Object.class) {
+            return true;
+        }
+
+        if (expected instanceof NativeArray expectedArray && actual instanceof NativeArray actualArray) {
+            return isInheritable(currentProperty, expectedArray.getComponentType(), actualArray.getComponentType());
+        }
+        return false;
+    }
+
+    @Nonnull
+    private static String getSimpleName(Object o) {
+        if (o instanceof Class aClass) {
+            if (o == Void.class) {
+                return "null";
+            }
+            return StringUtil.decapitalize(aClass.getSimpleName());
+        }
+        else if (o instanceof JsonObjectDescriptor) {
+            return getSimpleName(Object.class);
+        }
+        else if (o instanceof NativeArray nativeArray) {
+            return getSimpleName(nativeArray.getComponentType()) + "[]";
+        }
+        return "null";
+    }
+
+    @Nonnull
+    @Override
+    public String[] getGroupPath() {
+        return new String[]{"JSON"};
+    }
+
+    @Nonnull
+    @Override
+    public String getGroupDisplayName() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Nonnull
+    @Override
+    public String getDisplayName() {
+        return "Property validation";
+    }
+
+    @Nonnull
+    @Override
+    public HighlightDisplayLevel getDefaultLevel() {
+        return HighlightDisplayLevel.ERROR;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
index 06225e2e..563b5008 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
@@ -28,42 +28,35 @@
  * @author VISTALL
  * @since 02.12.2015
  */
-public class JsonPropertyNameReference extends JSPropertyNameReference
-{
-	private JsonPropertyDescriptor myPropertyDescriptor;
+public class JsonPropertyNameReference extends JSPropertyNameReference {
+    private JsonPropertyDescriptor myPropertyDescriptor;
 
-	public JsonPropertyNameReference(JSProperty property, PsiElement nameIdentifier, JsonPropertyDescriptor propertyDescriptor)
-	{
-		super(property, nameIdentifier);
-		myPropertyDescriptor = propertyDescriptor;
-	}
+    public JsonPropertyNameReference(JSProperty property, PsiElement nameIdentifier, JsonPropertyDescriptor propertyDescriptor) {
+        super(property, nameIdentifier);
+        myPropertyDescriptor = propertyDescriptor;
+    }
 
-	@Nullable
-	@Override
-	@RequiredReadAction
-	public PsiElement resolve()
-	{
-		PsiElement navigationElement = myPropertyDescriptor.getNavigationElement();
-		if(navigationElement != null)
-		{
-			return navigationElement;
-		}
-		return super.resolve();
-	}
+    @Nullable
+    @Override
+    @RequiredReadAction
+    public PsiElement resolve() {
+        PsiElement navigationElement = myPropertyDescriptor.getNavigationElement();
+        if (navigationElement != null) {
+            return navigationElement;
+        }
+        return super.resolve();
+    }
 
-	@RequiredReadAction
-	@Override
-	public boolean isReferenceTo(PsiElement element)
-	{
-		if(element instanceof JSProperty)
-		{
-			JsonPropertyDescriptor propertyDescriptor = PropertyValidationInspection.findPropertyDescriptor((JSProperty) element);
-			return myPropertyDescriptor == propertyDescriptor;
-		}
-		else if(element == myPropertyDescriptor.getNavigationElement())
-		{
-			return true;
-		}
-		return false;
-	}
+    @RequiredReadAction
+    @Override
+    public boolean isReferenceTo(PsiElement element) {
+        if (element instanceof JSProperty property) {
+            JsonPropertyDescriptor propertyDescriptor = PropertyValidationInspection.findPropertyDescriptor(property);
+            return myPropertyDescriptor == propertyDescriptor;
+        }
+        else if (element == myPropertyDescriptor.getNavigationElement()) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
index 35466612..d834d8f5 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
@@ -32,21 +32,18 @@
  * @since 02.12.2015
  */
 @ExtensionImpl(order = "before default")
-public class JsonPropertyNameReferenceProvider implements JSPropertyNameReferenceProvider
-{
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiReference getReference(@Nonnull JSProperty property)
-	{
-		JsonPropertyDescriptor propertyDescriptor = PropertyValidationInspection.findPropertyDescriptor(property);
-		if(propertyDescriptor == null)
-		{
-			return null;
-		}
+public class JsonPropertyNameReferenceProvider implements JSPropertyNameReferenceProvider {
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiReference getReference(@Nonnull JSProperty property) {
+        JsonPropertyDescriptor propertyDescriptor = PropertyValidationInspection.findPropertyDescriptor(property);
+        if (propertyDescriptor == null) {
+            return null;
+        }
 
-		PsiElement nameIdentifier = property.getNameIdentifier();
-		assert nameIdentifier != null;
-		return new JsonPropertyNameReference(property, nameIdentifier, propertyDescriptor);
-	}
+        PsiElement nameIdentifier = property.getNameIdentifier();
+        assert nameIdentifier != null;
+        return new JsonPropertyNameReference(property, nameIdentifier, propertyDescriptor);
+    }
 }

From a4f1a5e171af9fbe4018640425a3406253f1ee2e Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Tue, 23 Jul 2024 23:04:58 +0300
Subject: [PATCH 216/340] Code reformat using IJ4 code style (part 8).

---
 .../src/main/java/module-info.java            |   33 +-
 .../typescript/TypeScriptFileType.java        |   69 +-
 .../version/TypeScriptLanguageVersion.java    |   42 +-
 .../intellij/javascript/JSClassNameMacro.java |  129 +-
 .../JSImplementationTextSelectioner.java      |   43 +-
 .../javascript/JSMethodNameMacro.java         |   87 +-
 .../javascript/JSParameterInfoHandler.java    |  546 ++--
 .../JSAbstractElementManipulator.java         |   20 +-
 .../JSAttributeNameValuePairManipulator.java  |   27 +-
 .../manipulators/JSDocTagManipulator.java     |   27 +-
 .../JSIncludeDirectiveManipulator.java        |   23 +-
 .../findUsages/JSReadWriteAccessDetector.java |   93 +-
 .../impl/findUsages/JSWordsScanner.java       |   17 +-
 .../JavaScriptClassGroupRuleProvider.java     |   42 +-
 .../JavaScriptFindUsagesProvider.java         |  144 +-
 .../JavaScriptFunctionGroupRuleProvider.java  |   33 +-
 .../JavaScriptGroupRuleProviderBase.java      |  304 +--
 .../flex/importer/AS3InterfaceDumper.java     |  460 ++--
 .../flex/importer/AS3InterfaceStubDumper.java |  150 +-
 .../javascript/impl/flex/importer/Abc.java    | 2240 ++++++++---------
 .../impl/flex/importer/AbcDumper.java         |  261 +-
 .../flex/importer/AbstractDumpProcessor.java  |  536 ++--
 .../impl/flex/importer/ByteBuffer.java        |  363 ++-
 .../FlexByteCodeInformationProcessor.java     |   49 +-
 .../impl/flex/importer/FlexImporter.java      |  214 +-
 25 files changed, 2785 insertions(+), 3167 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/module-info.java b/lang-version-impl/json-javascript-impl/src/main/java/module-info.java
index 7efd96d2..e04aa4a5 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/module-info.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/module-info.java
@@ -2,23 +2,22 @@
  * @author VISTALL
  * @since 29-Aug-22
  */
-module consulo.javascript.json.javascript.impl
-{
-	// TODO remove in future
-	requires java.desktop;
+module consulo.javascript.json.javascript.impl {
+    // TODO remove in future
+    requires java.desktop;
 
-	requires consulo.javascript.base.impl;
+    requires consulo.javascript.base.impl;
 
-	exports consulo.json;
-	exports consulo.json.jom;
-	exports consulo.json.jom.proxy;
-	exports consulo.json.jom.proxy.impl;
-	exports consulo.json.lang;
-	exports consulo.json.lang.lexer;
-	exports consulo.json.validation;
-	exports consulo.json.validation.completion;
-	exports consulo.json.validation.descriptionByAnotherPsiElement;
-	exports consulo.json.validation.descriptor;
-	exports consulo.json.validation.inspections;
-	exports consulo.json.validation.psi.reference;
+    exports consulo.json;
+    exports consulo.json.jom;
+    exports consulo.json.jom.proxy;
+    exports consulo.json.jom.proxy.impl;
+    exports consulo.json.lang;
+    exports consulo.json.lang.lexer;
+    exports consulo.json.validation;
+    exports consulo.json.validation.completion;
+    exports consulo.json.validation.descriptionByAnotherPsiElement;
+    exports consulo.json.validation.descriptor;
+    exports consulo.json.validation.inspections;
+    exports consulo.json.validation.psi.reference;
 }
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index ac7b376e..ead84fcc 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -36,48 +36,41 @@
  * @author VISTALL
  * @since 03.03.2016
  */
-public class TypeScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion
-{
-	public static final TypeScriptFileType INSTANCE = new TypeScriptFileType();
+public class TypeScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion {
+    public static final TypeScriptFileType INSTANCE = new TypeScriptFileType();
 
-	private TypeScriptFileType()
-	{
-		super(JavaScriptLanguage.INSTANCE);
-	}
+    private TypeScriptFileType() {
+        super(JavaScriptLanguage.INSTANCE);
+    }
 
-	@Nonnull
-	@Override
-	public String getId()
-	{
-		return "TypeScript";
-	}
+    @Nonnull
+    @Override
+    public String getId() {
+        return "TypeScript";
+    }
 
-	@Nonnull
-	@Override
-	public LocalizeValue getDescription()
-	{
-		return JavaScriptLocalize.typescriptFiletypeDescription();
-	}
+    @Nonnull
+    @Override
+    public LocalizeValue getDescription() {
+        return JavaScriptLocalize.typescriptFiletypeDescription();
+    }
 
-	@Nonnull
-	@Override
-	public String getDefaultExtension()
-	{
-		return "ts";
-	}
+    @Nonnull
+    @Override
+    public String getDefaultExtension() {
+        return "ts";
+    }
 
-	@Nullable
-	@Override
-	public Image getIcon()
-	{
-		return JavaScriptIconGroup.typescript();
-	}
+    @Nullable
+    @Override
+    public Image getIcon() {
+        return JavaScriptIconGroup.typescript();
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
-	{
-		return TypeScriptLanguageVersion.getInstance();
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
+        return TypeScriptLanguageVersion.getInstance();
+    }
 }
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
index ab50be70..f6259a92 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
@@ -12,29 +12,25 @@
  * @since 20-Jul-22
  */
 @ExtensionImpl
-public class TypeScriptLanguageVersion extends BaseEcmaScriptJavaScriptVersion
-{
-	@Nonnull
-	public static TypeScriptLanguageVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(TypeScriptLanguageVersion.class);
-	}
+public class TypeScriptLanguageVersion extends BaseEcmaScriptJavaScriptVersion {
+    @Nonnull
+    public static TypeScriptLanguageVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(TypeScriptLanguageVersion.class);
+    }
 
-	public TypeScriptLanguageVersion()
-	{
-		super("TYPESCRIPT", "application/typescript");
-		addFeature(JavaScriptFeature.CLASS);
-		addFeature(JavaScriptFeature.BINARY_LITERAL);
-		addFeature(JavaScriptFeature.OCTAL_LITERAL);
-		addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
-		addFeature(JavaScriptFeature.REST_PARAMETER);
-		addFeature(JavaScriptFeature.FUNCTION_PROPERTY);
-	}
+    public TypeScriptLanguageVersion() {
+        super("TYPESCRIPT", "application/typescript");
+        addFeature(JavaScriptFeature.CLASS);
+        addFeature(JavaScriptFeature.BINARY_LITERAL);
+        addFeature(JavaScriptFeature.OCTAL_LITERAL);
+        addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
+        addFeature(JavaScriptFeature.REST_PARAMETER);
+        addFeature(JavaScriptFeature.FUNCTION_PROPERTY);
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "TypeScript";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "TypeScript";
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
index affa83ad..0aa0e2b8 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
@@ -36,74 +36,63 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JSClassNameMacro extends Macro
-{
-	@Override
-	@NonNls
-	public String getName()
-	{
-		return "jsClassName";
-	}
-
-	@Override
-	public String getPresentableName()
-	{
-		return JavaScriptLocalize.jsClassnameMacroDescription().get();
-	}
-
-	@Override
-	@NonNls
-	public String getDefaultValue()
-	{
-		return "";
-	}
-
-	@Override
-	public Result calculateResult(@Nonnull final Expression[] params, final ExpressionContext context)
-	{
-		final PsiElement elementAtCaret = findElementAtCaret(context);
-		final JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(elementAtCaret);
-
-		String text = resolver.getQualifierAsString();
-		if(text == null)
-		{
-			final JSFunction previousFunction = PsiTreeUtil.getPrevSiblingOfType(elementAtCaret, JSFunction.class);
-
-			if(previousFunction != null)
-			{
-				text = previousFunction.getName();
-			}
-		}
-
-		if(text != null)
-		{
-			return new TextResult(text);
-		}
-
-		return null;
-	}
-
-	public static PsiElement findElementAtCaret(final ExpressionContext context)
-	{
-		Project project = context.getProject();
-		int templateStartOffset = context.getTemplateStartOffset();
-		int offset = templateStartOffset > 0 ? context.getTemplateStartOffset() - 1 : context.getTemplateStartOffset();
-
-		PsiDocumentManager.getInstance(project).commitAllDocuments();
-
-		PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(context.getEditor().getDocument());
-		return file.findElementAt(offset);
-	}
-
-	@Override
-	public Result calculateQuickResult(@Nonnull final Expression[] params, final ExpressionContext context)
-	{
-		return null;
-	}
-
-	@Override
-	public LookupElement[] calculateLookupItems(@Nonnull final Expression[] params, final ExpressionContext context)
-	{
-		return null;
-	}
+public class JSClassNameMacro extends Macro {
+    @Override
+    @NonNls
+    public String getName() {
+        return "jsClassName";
+    }
+
+    @Override
+    public String getPresentableName() {
+        return JavaScriptLocalize.jsClassnameMacroDescription().get();
+    }
+
+    @Override
+    @NonNls
+    public String getDefaultValue() {
+        return "";
+    }
+
+    @Override
+    public Result calculateResult(@Nonnull final Expression[] params, final ExpressionContext context) {
+        final PsiElement elementAtCaret = findElementAtCaret(context);
+        final JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(elementAtCaret);
+
+        String text = resolver.getQualifierAsString();
+        if (text == null) {
+            final JSFunction previousFunction = PsiTreeUtil.getPrevSiblingOfType(elementAtCaret, JSFunction.class);
+
+            if (previousFunction != null) {
+                text = previousFunction.getName();
+            }
+        }
+
+        if (text != null) {
+            return new TextResult(text);
+        }
+
+        return null;
+    }
+
+    public static PsiElement findElementAtCaret(final ExpressionContext context) {
+        Project project = context.getProject();
+        int templateStartOffset = context.getTemplateStartOffset();
+        int offset = templateStartOffset > 0 ? context.getTemplateStartOffset() - 1 : context.getTemplateStartOffset();
+
+        PsiDocumentManager.getInstance(project).commitAllDocuments();
+
+        PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(context.getEditor().getDocument());
+        return file.findElementAt(offset);
+    }
+
+    @Override
+    public Result calculateQuickResult(@Nonnull final Expression[] params, final ExpressionContext context) {
+        return null;
+    }
+
+    @Override
+    public LookupElement[] calculateLookupItems(@Nonnull final Expression[] params, final ExpressionContext context) {
+        return null;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
index 67d427d1..3f80953a 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
@@ -33,30 +33,25 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JSImplementationTextSelectioner implements ImplementationTextSelectioner
-{
-	@RequiredReadAction
-	@Override
-	public int getTextStartOffset(@Nonnull PsiElement element)
-	{
-		return element.getTextOffset();
-	}
+public class JSImplementationTextSelectioner implements ImplementationTextSelectioner {
+    @RequiredReadAction
+    @Override
+    public int getTextStartOffset(@Nonnull PsiElement element) {
+        return element.getTextOffset();
+    }
 
-	@RequiredReadAction
-	@Override
-	public int getTextEndOffset(@Nonnull PsiElement element)
-	{
-		if(element instanceof JSDefinitionExpression)
-		{
-			element = PsiTreeUtil.getParentOfType(element, JSExpressionStatement.class);
-		}
-		return element.getTextRange().getEndOffset();
-	}
+    @RequiredReadAction
+    @Override
+    public int getTextEndOffset(@Nonnull PsiElement element) {
+        if (element instanceof JSDefinitionExpression) {
+            element = PsiTreeUtil.getParentOfType(element, JSExpressionStatement.class);
+        }
+        return element.getTextRange().getEndOffset();
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
index bb7d8e12..02ad8535 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
@@ -32,59 +32,48 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JSMethodNameMacro extends Macro
-{
-	@Override
-	public String getName()
-	{
-		return "jsMethodName";
-	}
+public class JSMethodNameMacro extends Macro {
+    @Override
+    public String getName() {
+        return "jsMethodName";
+    }
 
-	@Override
-	public String getPresentableName()
-	{
-		return JavaScriptLocalize.jsMethodnameMacroDescription().get();
-	}
+    @Override
+    public String getPresentableName() {
+        return JavaScriptLocalize.jsMethodnameMacroDescription().get();
+    }
 
-	@Override
-	public String getDefaultValue()
-	{
-		return "";
-	}
+    @Override
+    public String getDefaultValue() {
+        return "";
+    }
 
-	@Override
-	public Result calculateResult(@Nonnull Expression[] params, ExpressionContext context)
-	{
-		final PsiElement elementAtCaret = JSClassNameMacro.findElementAtCaret(context);
-		if(elementAtCaret != null)
-		{
-			JSFunction function = PsiTreeUtil.getParentOfType(elementAtCaret, JSFunction.class);
-			if(function instanceof JSFunctionExpression)
-			{
-				function = ((JSFunctionExpression) function).getFunction();
-			}
+    @Override
+    public Result calculateResult(@Nonnull Expression[] params, ExpressionContext context) {
+        final PsiElement elementAtCaret = JSClassNameMacro.findElementAtCaret(context);
+        if (elementAtCaret != null) {
+            JSFunction function = PsiTreeUtil.getParentOfType(elementAtCaret, JSFunction.class);
+            if (function instanceof JSFunctionExpression functionExpression) {
+                function = functionExpression.getFunction();
+            }
 
-			if(function != null)
-			{
-				final String name = function.getName();
-				if(name != null)
-				{
-					return new TextResult(name);
-				}
-			}
-		}
-		return null;
-	}
+            if (function != null) {
+                final String name = function.getName();
+                if (name != null) {
+                    return new TextResult(name);
+                }
+            }
+        }
+        return null;
+    }
 
-	@Override
-	public Result calculateQuickResult(@Nonnull Expression[] params, ExpressionContext context)
-	{
-		return null;
-	}
+    @Override
+    public Result calculateQuickResult(@Nonnull Expression[] params, ExpressionContext context) {
+        return null;
+    }
 
-	@Override
-	public LookupElement[] calculateLookupItems(@Nonnull Expression[] params, ExpressionContext context)
-	{
-		return null;
-	}
+    @Override
+    public LookupElement[] calculateLookupItems(@Nonnull Expression[] params, ExpressionContext context) {
+        return null;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
index aff26a6b..24bffda6 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
@@ -41,301 +41,253 @@
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
-public class JSParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport<JSArgumentList, JSFunction, JSExpression>
-{
-	private static final Set<Class<?>> ourArgumentListAllowedParentClassesSet = Set.of(JSCallExpression.class);
-
-	@Override
-	public boolean couldShowInLookup()
-	{
-		return true;
-	}
-
-	@Override
-	public Object[] getParametersForLookup(final LookupElement item, final ParameterInfoContext context)
-	{
-		if(!(item instanceof MutableLookupElement))
-		{
-			return null;
-		}
-
-		PsiElement element = item.getPsiElement();
-		if(element instanceof JSFunction)
-		{
-			final JSFunction originalFunction = (JSFunction) element;
-			final List<JSFunction> lookupItems = new ArrayList<JSFunction>();
-			Set<String> availableSignatures = new HashSet<String>();
-
-			for(PsiElement el : DefinitionsScopedSearch.search(originalFunction))
-			{
-				doAddSignature(lookupItems, availableSignatures, el);
-			}
-
-			if(lookupItems.size() == 0)
-			{
-				lookupItems.add(originalFunction);
-			}
-
-			return lookupItems.toArray(new Object[lookupItems.size()]);
-		}
-
-		return ArrayUtil.EMPTY_OBJECT_ARRAY;
-	}
-
-	private static void doAddSignature(final List<JSFunction> lookupItems, final Set<String> availableSignatures, final PsiElement el)
-	{
-		if(el instanceof JSFunction)
-		{
-			final JSFunction function = (JSFunction) el;
-			final JSParameterList parameterList = function.getParameterList();
-
-			if(parameterList != null)
-			{
-				final String typedSignature = buildSignature(parameterList.getParameters(), false, -1).text;
-				final String untypedSignature = buildSignature(parameterList.getParameters(), true, -1).text;
-
-				if(!availableSignatures.contains(typedSignature) && !availableSignatures.contains(untypedSignature))
-				{
-					lookupItems.add(function);
-					availableSignatures.add(typedSignature);
-					availableSignatures.add(untypedSignature);
-				}
-			}
-		}
-	}
-
-	@Override
-	public JSArgumentList findElementForParameterInfo(final CreateParameterInfoContext context)
-	{
-		JSArgumentList argList = findArgumentList(context.getFile(), context.getOffset());
-
-		if(argList != null)
-		{
-			return fillSignaturesForArgumentList(context, argList);
-		}
-		return argList;
-	}
-
-	@Nullable
-	public static JSArgumentList findArgumentList(final PsiFile file, final int offset)
-	{
-		JSArgumentList argList = ParameterInfoUtils.findParentOfType(file, offset, JSArgumentList.class);
-		if(argList == null)
-		{
-			final JSCallExpression callExpression = ParameterInfoUtils.findParentOfType(file, offset, JSCallExpression.class);
-			if(callExpression != null)
-			{
-				argList = callExpression.getArgumentList();
-			}
-		}
-		return argList;
-	}
-
-	@Nullable
-	private static JSArgumentList fillSignaturesForArgumentList(final CreateParameterInfoContext context, final @Nonnull JSArgumentList argList)
-	{
-		final PsiElement psiElement = argList.getParent();
-		if(!(psiElement instanceof JSCallExpression))
-		{
-			return null;
-		}
-
-		final JSCallExpression parent = (JSCallExpression) psiElement;
-		final JSExpression methodExpression = parent.getMethodExpression();
-
-		if(methodExpression instanceof JSReferenceExpression)
-		{
-			final ResolveResult[] resolveResults = ((JSReferenceExpression) methodExpression).multiResolve(true);
-
-			if(resolveResults.length > 0)
-			{
-				List<JSFunction> items = new ArrayList<JSFunction>(resolveResults.length);
-				Set<String> availableSignatures = new HashSet<String>();
-
-				for(ResolveResult r : resolveResults)
-				{
-					PsiElement element = r.getElement();
-					if(element instanceof JSProperty)
-					{
-						element = ((JSProperty) element).getValue();
-					}
-
-					doAddSignature(items, availableSignatures, element);
-				}
-
-				context.setItemsToShow(ArrayUtil.toObjectArray(items));
-				return argList;
-			}
-		}
-		else if(methodExpression instanceof JSSuperExpression)
-		{
-			final PsiElement clazz = methodExpression.getReference().resolve();
-			if(clazz instanceof JSFunction)
-			{
-				context.setItemsToShow(new Object[]{clazz});
-				return argList;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public void showParameterInfo(@Nonnull final JSArgumentList element, final CreateParameterInfoContext context)
-	{
-		context.showHint(element, element.getTextOffset(), this);
-	}
-
-	@Override
-	public JSArgumentList findElementForUpdatingParameterInfo(final UpdateParameterInfoContext context)
-	{
-		return findArgumentList(context.getFile(), context.getOffset());
-	}
-
-	@Override
-	public void updateParameterInfo(@Nonnull final JSArgumentList o, final UpdateParameterInfoContext context)
-	{
-		if(context.getParameterOwner() != o)
-		{
-			context.removeHint();
-			return;
-		}
-		final int currentParameterIndex = ParameterInfoUtils.getCurrentParameterIndex(o.getNode(), context.getOffset(), JSTokenTypes.COMMA);
-		context.setCurrentParameter(currentParameterIndex);
-	}
-
-	@Override
-	public void updateUI(final JSFunction p, final ParameterInfoUIContext context)
-	{
-		final JSParameterList parameterList = p.getParameterList();
-		final JSParameter[] params = parameterList != null ? parameterList.getParameters() : new JSParameter[0];
-		final int currentParameterIndex = context.getCurrentParameterIndex() >= 0 ? context.getCurrentParameterIndex() : params.length;
-		final JSParameter parameter = currentParameterIndex < params.length ? params[currentParameterIndex] : null;
-
-		final SignatureInfo signatureInfo = buildSignature(params, false, currentParameterIndex);
-		final String name = signatureInfo.text;
-
-		final String currentParameterSignature = parameter != null ? getSignatureForParameter(parameter, false) : null;
-		int highlightStart = parameter != null ? signatureInfo.selectedParameterStart : 0;
-		int highlightEnd = parameter != null ? highlightStart + currentParameterSignature.length() : 0;
-		context.setupUIComponentPresentation(name, highlightStart, highlightEnd, false, false, false, context.getDefaultParameterColor());
-	}
-
-	private static class SignatureInfo
-	{
-		String text;
-		int selectedParameterStart = -1;
-	}
-
-	private static
-	@Nonnull
-	SignatureInfo buildSignature(final JSParameter[] params, final boolean skipType, int selectedParameterIndex)
-	{
-		SignatureInfo info = new SignatureInfo();
-		if(params.length > 0)
-		{
-			StringBuilder result = new StringBuilder();
-			for(int i = 0; i < params.length; ++i)
-			{
-				if(result.length() > 0)
-				{
-					result.append(", ");
-				}
-				if(selectedParameterIndex == i)
-				{
-					info.selectedParameterStart = result.length();
-				}
-				result.append(getSignatureForParameter(params[i], skipType));
-			}
-
-			info.text = result.toString();
-		}
-		else
-		{
-			info.text = CodeInsightLocalize.parameterInfoNoParameters().get();
-		}
-		return info;
-	}
-
-	public static String getSignatureForParameter(final JSParameter p, boolean skipType)
-	{
-		final String s = skipType ? null : p.getTypeString();
-
-		if(s != null && s.length() > 0)
-		{
-			final boolean ecmal4 = p.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
-			String result;
-
-			if(ecmal4)
-			{
-				if(p.isRest())
-				{
-					result = "...";
-				}
-				else
-				{
-					result = p.getName() + ":" + s;
-				}
-			}
-			else
-			{
-				result = "[" + s + "] " + p.getName();
-			}
-			final String initializerText = p.getInitializerText();
-			if(initializerText != null)
-			{
-				result += " = " + initializerText;
-			}
-			return result;
-		}
-		return p.getName();
-	}
-
-	@Override
-	@Nonnull
-	public JSExpression[] getActualParameters(@Nonnull final JSArgumentList jsArgumentList)
-	{
-		return jsArgumentList.getArguments();
-	}
-
-	@Override
-	@Nonnull
-	public IElementType getActualParameterDelimiterType()
-	{
-		return JSTokenTypes.COMMA;
-	}
-
-	@Override
-	@Nonnull
-	public IElementType getActualParametersRBraceType()
-	{
-		return JSTokenTypes.RBRACE;
-	}
-
-	@Override
-	@Nonnull
-	public Set<Class<?>> getArgumentListAllowedParentClasses()
-	{
-		return ourArgumentListAllowedParentClassesSet;
-	}
-
-	@Nonnull
-	@Override
-	public Set<? extends Class<?>> getArgListStopSearchClasses()
-	{
-		return Collections.emptySet();
-	}
-
-	@Override
-	@Nonnull
-	public Class<JSArgumentList> getArgumentListClass()
-	{
-		return JSArgumentList.class;
-	}
-
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JSParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport<JSArgumentList, JSFunction, JSExpression> {
+    private static final Set<Class<?>> ourArgumentListAllowedParentClassesSet = Set.of(JSCallExpression.class);
+
+    @Override
+    public boolean couldShowInLookup() {
+        return true;
+    }
+
+    @Override
+    public Object[] getParametersForLookup(final LookupElement item, final ParameterInfoContext context) {
+        if (!(item instanceof MutableLookupElement)) {
+            return null;
+        }
+
+        PsiElement element = item.getPsiElement();
+        if (element instanceof JSFunction) {
+            final JSFunction originalFunction = (JSFunction)element;
+            final List<JSFunction> lookupItems = new ArrayList<>();
+            Set<String> availableSignatures = new HashSet<>();
+
+            for (PsiElement el : DefinitionsScopedSearch.search(originalFunction)) {
+                doAddSignature(lookupItems, availableSignatures, el);
+            }
+
+            if (lookupItems.size() == 0) {
+                lookupItems.add(originalFunction);
+            }
+
+            return lookupItems.toArray(new Object[lookupItems.size()]);
+        }
+
+        return ArrayUtil.EMPTY_OBJECT_ARRAY;
+    }
+
+    private static void doAddSignature(final List<JSFunction> lookupItems, final Set<String> availableSignatures, final PsiElement el) {
+        if (el instanceof JSFunction function) {
+            final JSParameterList parameterList = function.getParameterList();
+
+            if (parameterList != null) {
+                final String typedSignature = buildSignature(parameterList.getParameters(), false, -1).text;
+                final String untypedSignature = buildSignature(parameterList.getParameters(), true, -1).text;
+
+                if (!availableSignatures.contains(typedSignature) && !availableSignatures.contains(untypedSignature)) {
+                    lookupItems.add(function);
+                    availableSignatures.add(typedSignature);
+                    availableSignatures.add(untypedSignature);
+                }
+            }
+        }
+    }
+
+    @Override
+    public JSArgumentList findElementForParameterInfo(final CreateParameterInfoContext context) {
+        JSArgumentList argList = findArgumentList(context.getFile(), context.getOffset());
+
+        if (argList != null) {
+            return fillSignaturesForArgumentList(context, argList);
+        }
+        return argList;
+    }
+
+    @Nullable
+    public static JSArgumentList findArgumentList(final PsiFile file, final int offset) {
+        JSArgumentList argList = ParameterInfoUtils.findParentOfType(file, offset, JSArgumentList.class);
+        if (argList == null) {
+            final JSCallExpression callExpression = ParameterInfoUtils.findParentOfType(file, offset, JSCallExpression.class);
+            if (callExpression != null) {
+                argList = callExpression.getArgumentList();
+            }
+        }
+        return argList;
+    }
+
+    @Nullable
+    private static JSArgumentList fillSignaturesForArgumentList(
+        final CreateParameterInfoContext context,
+        final @Nonnull JSArgumentList argList
+    ) {
+        final PsiElement psiElement = argList.getParent();
+        if (!(psiElement instanceof JSCallExpression)) {
+            return null;
+        }
+
+        final JSCallExpression parent = (JSCallExpression)psiElement;
+        final JSExpression methodExpression = parent.getMethodExpression();
+
+        if (methodExpression instanceof JSReferenceExpression referenceExpression) {
+            final ResolveResult[] resolveResults = referenceExpression.multiResolve(true);
+
+            if (resolveResults.length > 0) {
+                List<JSFunction> items = new ArrayList<JSFunction>(resolveResults.length);
+                Set<String> availableSignatures = new HashSet<String>();
+
+                for (ResolveResult r : resolveResults) {
+                    PsiElement element = r.getElement();
+                    if (element instanceof JSProperty property) {
+                        element = property.getValue();
+                    }
+
+                    doAddSignature(items, availableSignatures, element);
+                }
+
+                context.setItemsToShow(ArrayUtil.toObjectArray(items));
+                return argList;
+            }
+        }
+        else if (methodExpression instanceof JSSuperExpression) {
+            final PsiElement clazz = methodExpression.getReference().resolve();
+            if (clazz instanceof JSFunction) {
+                context.setItemsToShow(new Object[]{clazz});
+                return argList;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void showParameterInfo(@Nonnull final JSArgumentList element, final CreateParameterInfoContext context) {
+        context.showHint(element, element.getTextOffset(), this);
+    }
+
+    @Override
+    public JSArgumentList findElementForUpdatingParameterInfo(final UpdateParameterInfoContext context) {
+        return findArgumentList(context.getFile(), context.getOffset());
+    }
+
+    @Override
+    public void updateParameterInfo(@Nonnull final JSArgumentList o, final UpdateParameterInfoContext context) {
+        if (context.getParameterOwner() != o) {
+            context.removeHint();
+            return;
+        }
+        final int currentParameterIndex = ParameterInfoUtils.getCurrentParameterIndex(o.getNode(), context.getOffset(), JSTokenTypes.COMMA);
+        context.setCurrentParameter(currentParameterIndex);
+    }
+
+    @Override
+    public void updateUI(final JSFunction p, final ParameterInfoUIContext context) {
+        final JSParameterList parameterList = p.getParameterList();
+        final JSParameter[] params = parameterList != null ? parameterList.getParameters() : new JSParameter[0];
+        final int currentParameterIndex = context.getCurrentParameterIndex() >= 0 ? context.getCurrentParameterIndex() : params.length;
+        final JSParameter parameter = currentParameterIndex < params.length ? params[currentParameterIndex] : null;
+
+        final SignatureInfo signatureInfo = buildSignature(params, false, currentParameterIndex);
+        final String name = signatureInfo.text;
+
+        final String currentParameterSignature = parameter != null ? getSignatureForParameter(parameter, false) : null;
+        int highlightStart = parameter != null ? signatureInfo.selectedParameterStart : 0;
+        int highlightEnd = parameter != null ? highlightStart + currentParameterSignature.length() : 0;
+        context.setupUIComponentPresentation(name, highlightStart, highlightEnd, false, false, false, context.getDefaultParameterColor());
+    }
+
+    private static class SignatureInfo {
+        String text;
+        int selectedParameterStart = -1;
+    }
+
+    private static
+    @Nonnull
+    SignatureInfo buildSignature(final JSParameter[] params, final boolean skipType, int selectedParameterIndex) {
+        SignatureInfo info = new SignatureInfo();
+        if (params.length > 0) {
+            StringBuilder result = new StringBuilder();
+            for (int i = 0; i < params.length; ++i) {
+                if (result.length() > 0) {
+                    result.append(", ");
+                }
+                if (selectedParameterIndex == i) {
+                    info.selectedParameterStart = result.length();
+                }
+                result.append(getSignatureForParameter(params[i], skipType));
+            }
+
+            info.text = result.toString();
+        }
+        else {
+            info.text = CodeInsightLocalize.parameterInfoNoParameters().get();
+        }
+        return info;
+    }
+
+    public static String getSignatureForParameter(final JSParameter p, boolean skipType) {
+        final String s = skipType ? null : p.getTypeString();
+
+        if (s != null && s.length() > 0) {
+            final boolean ecmal4 = p.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+            String result;
+
+            if (ecmal4) {
+                if (p.isRest()) {
+                    result = "...";
+                }
+                else {
+                    result = p.getName() + ":" + s;
+                }
+            }
+            else {
+                result = "[" + s + "] " + p.getName();
+            }
+            final String initializerText = p.getInitializerText();
+            if (initializerText != null) {
+                result += " = " + initializerText;
+            }
+            return result;
+        }
+        return p.getName();
+    }
+
+    @Override
+    @Nonnull
+    public JSExpression[] getActualParameters(@Nonnull final JSArgumentList jsArgumentList) {
+        return jsArgumentList.getArguments();
+    }
+
+    @Override
+    @Nonnull
+    public IElementType getActualParameterDelimiterType() {
+        return JSTokenTypes.COMMA;
+    }
+
+    @Override
+    @Nonnull
+    public IElementType getActualParametersRBraceType() {
+        return JSTokenTypes.RBRACE;
+    }
+
+    @Override
+    @Nonnull
+    public Set<Class<?>> getArgumentListAllowedParentClasses() {
+        return ourArgumentListAllowedParentClassesSet;
+    }
+
+    @Nonnull
+    @Override
+    public Set<? extends Class<?>> getArgListStopSearchClasses() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    @Nonnull
+    public Class<JSArgumentList> getArgumentListClass() {
+        return JSArgumentList.class;
+    }
+
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
index b3b21f06..6f991038 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
@@ -25,17 +25,15 @@
 /**
  * @author peter
  */
-abstract class JSAbstractElementManipulator<T extends PsiElement> extends AbstractElementManipulator<T>
-{
-	@Override
-	public T handleContentChange(final T element, final TextRange range, String newContent) throws IncorrectOperationException
-	{
-		String oldText = element.getText();
-		newContent = StringUtil.escapeStringCharacters(newContent);
-		String newText = oldText.substring(0, range.getStartOffset()) + newContent + oldText.substring(range.getEndOffset());
+abstract class JSAbstractElementManipulator<T extends PsiElement> extends AbstractElementManipulator<T> {
+    @Override
+    public T handleContentChange(final T element, final TextRange range, String newContent) throws IncorrectOperationException {
+        String oldText = element.getText();
+        newContent = StringUtil.escapeStringCharacters(newContent);
+        String newText = oldText.substring(0, range.getStartOffset()) + newContent + oldText.substring(range.getEndOffset());
 
-		return (T) element.replace(createTree(newText, element.getProject()));
-	}
+        return (T)element.replace(createTree(newText, element.getProject()));
+    }
 
-	protected abstract T createTree(final String newText, final Project project);
+    protected abstract T createTree(final String newText, final Project project);
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
index 688c380a..a3bbee6b 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
@@ -29,20 +29,17 @@
  * @author peter
  */
 @ExtensionImpl
-public class JSAttributeNameValuePairManipulator extends JSAbstractElementManipulator<JSAttributeNameValuePair>
-{
-	@Override
-	protected JSAttributeNameValuePair createTree(final String newText, final Project project)
-	{
-		@NonNls String ToCreate = "[A(" + newText + ")] class C {}";
-		final PsiElement element = JSChangeUtil.createStatementFromText(project, ToCreate).getPsi();
-		return ((JSClass) element).getAttributeList().getAttributes()[0].getValues()[0];
-	}
+public class JSAttributeNameValuePairManipulator extends JSAbstractElementManipulator<JSAttributeNameValuePair> {
+    @Override
+    protected JSAttributeNameValuePair createTree(final String newText, final Project project) {
+        @NonNls String ToCreate = "[A(" + newText + ")] class C {}";
+        final PsiElement element = JSChangeUtil.createStatementFromText(project, ToCreate).getPsi();
+        return ((JSClass)element).getAttributeList().getAttributes()[0].getValues()[0];
+    }
 
-	@Nonnull
-	@Override
-	public Class<JSAttributeNameValuePair> getElementClass()
-	{
-		return JSAttributeNameValuePair.class;
-	}
+    @Nonnull
+    @Override
+    public Class<JSAttributeNameValuePair> getElementClass() {
+        return JSAttributeNameValuePair.class;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
index ac65997a..6288ea6c 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
@@ -24,20 +24,17 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JSDocTagManipulator extends JSAbstractElementManipulator<JSDocTag>
-{
-	@Override
-	protected JSDocTag createTree(final String newText, final Project project)
-	{
-		String ToCreate = "/** " + newText + " */";
-		final PsiElement element = JSChangeUtil.createJSTreeFromText(project, ToCreate).getPsi();
-		return ((JSDocComment) element).getTags()[0];
-	}
+public class JSDocTagManipulator extends JSAbstractElementManipulator<JSDocTag> {
+    @Override
+    protected JSDocTag createTree(final String newText, final Project project) {
+        String ToCreate = "/** " + newText + " */";
+        final PsiElement element = JSChangeUtil.createJSTreeFromText(project, ToCreate).getPsi();
+        return ((JSDocComment)element).getTags()[0];
+    }
 
-	@Nonnull
-	@Override
-	public Class<JSDocTag> getElementClass()
-	{
-		return JSDocTag.class;
-	}
+    @Nonnull
+    @Override
+    public Class<JSDocTag> getElementClass() {
+        return JSDocTag.class;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
index 6346874b..fa35041c 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
@@ -26,18 +26,15 @@
  * @author peter
  */
 @ExtensionImpl
-public class JSIncludeDirectiveManipulator extends JSAbstractElementManipulator<JSIncludeDirectiveImpl>
-{
-	@Override
-	protected JSIncludeDirectiveImpl createTree(final String newText, final Project project)
-	{
-		return (JSIncludeDirectiveImpl) JSChangeUtil.createStatementFromText(project, newText).getPsi();
-	}
+public class JSIncludeDirectiveManipulator extends JSAbstractElementManipulator<JSIncludeDirectiveImpl> {
+    @Override
+    protected JSIncludeDirectiveImpl createTree(final String newText, final Project project) {
+        return (JSIncludeDirectiveImpl)JSChangeUtil.createStatementFromText(project, newText).getPsi();
+    }
 
-	@Nonnull
-	@Override
-	public Class<JSIncludeDirectiveImpl> getElementClass()
-	{
-		return JSIncludeDirectiveImpl.class;
-	}
+    @Nonnull
+    @Override
+    public Class<JSIncludeDirectiveImpl> getElementClass() {
+        return JSIncludeDirectiveImpl.class;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
index 7777138a..588f8b22 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
@@ -35,61 +35,50 @@
  * Time: 21:51:25
  */
 @ExtensionImpl
-public class JSReadWriteAccessDetector extends ReadWriteAccessDetector
-{
-	@Override
-	public boolean isReadWriteAccessible(PsiElement element)
-	{
-		return element instanceof JSVariable ||
-				((element instanceof JSFunction) && (((JSFunction) element).isGetProperty() || ((JSFunction) element).isSetProperty())) ||
-				element instanceof JSDefinitionExpression;
-	}
+public class JSReadWriteAccessDetector extends ReadWriteAccessDetector {
+    @Override
+    public boolean isReadWriteAccessible(PsiElement element) {
+        return element instanceof JSVariable
+            || (element instanceof JSFunction function && (function.isGetProperty() || function.isSetProperty()))
+            || element instanceof JSDefinitionExpression;
+    }
 
-	@Override
-	public boolean isDeclarationWriteAccess(PsiElement element)
-	{
-		return (element instanceof JSVariable && ((JSVariable) element).getInitializer() != null);
-	}
+    @Override
+    public boolean isDeclarationWriteAccess(PsiElement element) {
+        return (element instanceof JSVariable variable && variable.getInitializer() != null);
+    }
 
-	@Override
-	public Access getReferenceAccess(PsiElement referencedElement, PsiReference reference)
-	{
-		return getExpressionAccess(reference.getElement());
-	}
+    @Override
+    public Access getReferenceAccess(PsiElement referencedElement, PsiReference reference) {
+        return getExpressionAccess(reference.getElement());
+    }
 
-	@Override
-	public Access getExpressionAccess(PsiElement expression)
-	{
-		expression = expression.getParent();
-		if(expression instanceof JSDefinitionExpression)
-		{
-			PsiElement grandParent = expression.getParent();
-			if(grandParent instanceof JSAssignmentExpression && ((JSAssignmentExpression) grandParent).getOperationSign() == JSTokenTypes.EQ)
-			{
-				return Access.Write;
-			}
+    @Override
+    public Access getExpressionAccess(PsiElement expression) {
+        expression = expression.getParent();
+        if (expression instanceof JSDefinitionExpression) {
+            PsiElement grandParent = expression.getParent();
+            if (expression.getParent() instanceof JSAssignmentExpression assignmentExpression
+                && assignmentExpression.getOperationSign() == JSTokenTypes.EQ) {
+                return Access.Write;
+            }
 
-			return Access.ReadWrite;
-		}
-		if(expression instanceof JSPrefixExpression)
-		{
-			if(isIncrementOrDecrement(((JSPrefixExpression) expression).getOperationSign()))
-			{
-				return Access.ReadWrite;
-			}
-		}
-		else if(expression instanceof JSPostfixExpression)
-		{
-			if(isIncrementOrDecrement(((JSPostfixExpression) expression).getOperationSign()))
-			{
-				return Access.ReadWrite;
-			}
-		}
-		return Access.Read;
-	}
+            return Access.ReadWrite;
+        }
+        if (expression instanceof JSPrefixExpression prefixExpression) {
+            if (isIncrementOrDecrement(prefixExpression.getOperationSign())) {
+                return Access.ReadWrite;
+            }
+        }
+        else if (expression instanceof JSPostfixExpression postfixExpression) {
+            if (isIncrementOrDecrement(postfixExpression.getOperationSign())) {
+                return Access.ReadWrite;
+            }
+        }
+        return Access.Read;
+    }
 
-	private static boolean isIncrementOrDecrement(IElementType sign)
-	{
-		return sign == JSTokenTypes.PLUSPLUS || sign == JSTokenTypes.MINUSMINUS;
-	}
+    private static boolean isIncrementOrDecrement(IElementType sign) {
+        return sign == JSTokenTypes.PLUSPLUS || sign == JSTokenTypes.MINUSMINUS;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java
index acc35dbc..cce7bde8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java
@@ -29,11 +29,14 @@
  * Time: 9:34:58 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSWordsScanner extends DefaultWordsScanner
-{
-	public JSWordsScanner()
-	{
-		super(new JSFlexAdapter(false, DialectOptionHolder.dummy()), JSTokenTypes.IDENTIFIER_TOKENS_SET, JSTokenTypes.COMMENTS, JavaScriptTokenSets.STRING_LITERALS);
-		setMayHaveFileRefsInLiterals(true);
-	}
+public class JSWordsScanner extends DefaultWordsScanner {
+    public JSWordsScanner() {
+        super(
+            new JSFlexAdapter(false, DialectOptionHolder.dummy()),
+            JSTokenTypes.IDENTIFIER_TOKENS_SET,
+            JSTokenTypes.COMMENTS,
+            JavaScriptTokenSets.STRING_LITERALS
+        );
+        setMayHaveFileRefsInLiterals(true);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
index dc2a10a5..da683da4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
@@ -28,31 +28,25 @@
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
-public class JavaScriptClassGroupRuleProvider extends JavaScriptGroupRuleProviderBase<JSClass>
-{
-	@Override
-	protected Class<? extends JSNamedElement> getUsageClass()
-	{
-		return JSClass.class;
-	}
+public class JavaScriptClassGroupRuleProvider extends JavaScriptGroupRuleProviderBase<JSClass> {
+    @Override
+    protected Class<? extends JSNamedElement> getUsageClass() {
+        return JSClass.class;
+    }
 
-	@Override
-	protected UsageGroup createUsageGroup(final JSClass clazz)
-	{
-		return new ClassUsageGroup(clazz);
-	}
+    @Override
+    protected UsageGroup createUsageGroup(final JSClass clazz) {
+        return new ClassUsageGroup(clazz);
+    }
 
-	@Override
-	protected boolean isAcceptableElement(JSNamedElement element)
-	{
-		return super.isAcceptableElement(element) && !JSResolveUtil.isArtificialClassUsedForReferenceList((JSClass) element);
-	}
+    @Override
+    protected boolean isAcceptableElement(JSNamedElement element) {
+        return super.isAcceptableElement(element) && !JSResolveUtil.isArtificialClassUsedForReferenceList((JSClass)element);
+    }
 
-	private static class ClassUsageGroup extends JavaScriptGroupRuleProviderBase.PsiNamedElementUsageGroupBase<JSClass>
-	{
-		public ClassUsageGroup(@Nonnull JSClass clazz)
-		{
-			super(clazz, AllIcons.Nodes.Class);
-		}
-	}
+    private static class ClassUsageGroup extends JavaScriptGroupRuleProviderBase.PsiNamedElementUsageGroupBase<JSClass> {
+        public ClassUsageGroup(@Nonnull JSClass clazz) {
+            super(clazz, AllIcons.Nodes.Class);
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
index 4494aa5b..1a37cd57 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
@@ -36,90 +36,72 @@
  * Time: 6:44:02 PM
  */
 @ExtensionImpl
-public class JavaScriptFindUsagesProvider implements FindUsagesProvider
-{
-	@Override
-	public boolean canFindUsagesFor(@Nonnull PsiElement psiElement)
-	{
-		return psiElement instanceof PsiNamedElement;
-	}
+public class JavaScriptFindUsagesProvider implements FindUsagesProvider {
+    @Override
+    public boolean canFindUsagesFor(@Nonnull PsiElement psiElement) {
+        return psiElement instanceof PsiNamedElement;
+    }
 
-	@Override
-	@Nonnull
-	public String getType(@Nonnull PsiElement element)
-	{
-		if (element instanceof JSFunction)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermFunction().get();
-		}
-		if (element instanceof JSClass)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermClass().get();
-		}
-		if (element instanceof JSNamespaceDeclaration)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermNamespace().get();
-		}
-		if (element instanceof JSParameter)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermParameter().get();
-		}
-		if (element instanceof JSProperty)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermProperty().get();
-		}
-		if (element instanceof JSVariable)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermVariable().get();
-		}
-		if (element instanceof JSLabeledStatement)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermLabel().get();
-		}
-		if (element instanceof JSDefinitionExpression)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermValue().get();
-		}
-		if (element instanceof XmlTag)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermTag().get();
-		}
-		if (element instanceof XmlToken)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermAttributeValue().get();
-		}
-		if (element instanceof JSPackageStatement)
-		{
-			return JavaScriptLocalize.javascriptLanguageTermPackage().get();
-		}
-		return "";
-	}
+    @Override
+    @Nonnull
+    public String getType(@Nonnull PsiElement element) {
+        if (element instanceof JSFunction) {
+            return JavaScriptLocalize.javascriptLanguageTermFunction().get();
+        }
+        if (element instanceof JSClass) {
+            return JavaScriptLocalize.javascriptLanguageTermClass().get();
+        }
+        if (element instanceof JSNamespaceDeclaration) {
+            return JavaScriptLocalize.javascriptLanguageTermNamespace().get();
+        }
+        if (element instanceof JSParameter) {
+            return JavaScriptLocalize.javascriptLanguageTermParameter().get();
+        }
+        if (element instanceof JSProperty) {
+            return JavaScriptLocalize.javascriptLanguageTermProperty().get();
+        }
+        if (element instanceof JSVariable) {
+            return JavaScriptLocalize.javascriptLanguageTermVariable().get();
+        }
+        if (element instanceof JSLabeledStatement) {
+            return JavaScriptLocalize.javascriptLanguageTermLabel().get();
+        }
+        if (element instanceof JSDefinitionExpression) {
+            return JavaScriptLocalize.javascriptLanguageTermValue().get();
+        }
+        if (element instanceof XmlTag) {
+            return JavaScriptLocalize.javascriptLanguageTermTag().get();
+        }
+        if (element instanceof XmlToken) {
+            return JavaScriptLocalize.javascriptLanguageTermAttributeValue().get();
+        }
+        if (element instanceof JSPackageStatement) {
+            return JavaScriptLocalize.javascriptLanguageTermPackage().get();
+        }
+        return "";
+    }
 
-	@Override
-	@Nonnull
-	public String getDescriptiveName(@Nonnull PsiElement element)
-	{
-		String name = ((PsiNamedElement) element).getName();
-		return name != null ? name : "";
-	}
+    @Override
+    @Nonnull
+    public String getDescriptiveName(@Nonnull PsiElement element) {
+        String name = ((PsiNamedElement)element).getName();
+        return name != null ? name : "";
+    }
 
-	@Override
-	@Nonnull
-	public String getNodeText(@Nonnull PsiElement element, boolean useFullName)
-	{
-		return getDescriptiveName(element);
-	}
+    @Override
+    @Nonnull
+    public String getNodeText(@Nonnull PsiElement element, boolean useFullName) {
+        return getDescriptiveName(element);
+    }
 
-	@Override
-	public WordsScanner getWordsScanner()
-	{
-		return new JSWordsScanner();
-	}
+    @Override
+    public WordsScanner getWordsScanner() {
+        return new JSWordsScanner();
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
index 51b80a31..f600e83b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
@@ -27,25 +27,20 @@
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
-public class JavaScriptFunctionGroupRuleProvider extends JavaScriptGroupRuleProviderBase<JSFunction>
-{
-	@Override
-	protected Class<? extends JSNamedElement> getUsageClass()
-	{
-		return JSFunction.class;
-	}
+public class JavaScriptFunctionGroupRuleProvider extends JavaScriptGroupRuleProviderBase<JSFunction> {
+    @Override
+    protected Class<? extends JSNamedElement> getUsageClass() {
+        return JSFunction.class;
+    }
 
-	@Override
-	protected UsageGroup createUsageGroup(final JSFunction jsFunction)
-	{
-		return new FunctionUsageGroup(jsFunction);
-	}
+    @Override
+    protected UsageGroup createUsageGroup(final JSFunction jsFunction) {
+        return new FunctionUsageGroup(jsFunction);
+    }
 
-	private static class FunctionUsageGroup extends JavaScriptGroupRuleProviderBase.PsiNamedElementUsageGroupBase<JSFunction>
-	{
-		public FunctionUsageGroup(@Nonnull JSFunction function)
-		{
-			super(function, AllIcons.Nodes.Function);
-		}
-	}
+    private static class FunctionUsageGroup extends JavaScriptGroupRuleProviderBase.PsiNamedElementUsageGroupBase<JSFunction> {
+        public FunctionUsageGroup(@Nonnull JSFunction function) {
+            super(function, AllIcons.Nodes.Function);
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
index 20b2dd6f..0ec9b64f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -45,171 +45,141 @@
 /**
  * @author Maxim.Mossienko
  */
-abstract class JavaScriptGroupRuleProviderBase<T extends JSNamedElement> implements FileStructureGroupRuleProvider
-{
-	@Override
-	@Nullable
-	public UsageGroupingRule getUsageGroupingRule(final Project project)
-	{
-		return new UsageGroupingRule()
-		{
-			@Override
-			@Nullable
-			public UsageGroup groupUsage(final Usage usage)
-			{
-				if(usage instanceof PsiElementUsage)
-				{
-					PsiElement psiElement = ((PsiElementUsage) usage).getElement();
-
-					if(!psiElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE))
-					{
-						return null;
-					}
-					final JSNamedElement element = PsiTreeUtil.getParentOfType(psiElement, getUsageClass());
-
-					if(isAcceptableElement(element))
-					{
-						return createUsageGroup((T) element);
-					}
-				}
-				return null;
-			}
-		};
-	}
-
-	protected boolean isAcceptableElement(JSNamedElement element)
-	{
-		return element != null;
-	}
-
-	protected abstract Class<? extends JSNamedElement> getUsageClass();
-
-	protected abstract UsageGroup createUsageGroup(final T t);
-
-	/**
-	 * @author Maxim.Mossienko
-	 */
-	abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement & NavigationItem> implements UsageGroup, TypeSafeDataProvider
-	{
-		private SmartPsiElementPointer myElementPointer;
-		private String myName;
-		private Image myIcon;
-
-		PsiNamedElementUsageGroupBase(@Nonnull T element, Image icon)
-		{
-			myIcon = icon;
-
-			myName = element.getName();
-			if(myName == null)
-			{
-				myName = "<anonymous>";
-			}
-			myElementPointer = SmartPointerManager.getInstance(element.getProject()).createLazyPointer(element);
-		}
-
-		@Override
-		public Image getIcon()
-		{
-			return myIcon;
-		}
-
-		public T getElement()
-		{
-			return (T) myElementPointer.getElement();
-		}
-
-		@Override
-		@Nonnull
-		public String getText(UsageView view)
-		{
-			return myName;
-		}
-
-		@Override
-		public FileStatus getFileStatus()
-		{
-			return isValid() ? FileStatusManager.getInstance(getElement().getProject()).getStatus(getElement().getContainingFile().getVirtualFile()) : null;
-		}
-
-		@Override
-		public boolean isValid()
-		{
-			final T element = getElement();
-			return element != null && element.isValid();
-		}
-
-		@Override
-		public void navigate(boolean focus) throws UnsupportedOperationException
-		{
-			if(canNavigate())
-			{
-				getElement().navigate(focus);
-			}
-		}
-
-		@Override
-		public boolean canNavigate()
-		{
-			return isValid();
-		}
-
-		@Override
-		public boolean canNavigateToSource()
-		{
-			return canNavigate();
-		}
-
-		@Override
-		public void update()
-		{
-		}
-
-		@Override
-		public int compareTo(final UsageGroup o)
-		{
-			return myName.compareTo(((PsiNamedElementUsageGroupBase) o).myName);
-		}
-
-		@Override
-		public boolean equals(final Object obj)
-		{
-			if(!(obj instanceof PsiNamedElementUsageGroupBase))
-			{
-				return false;
-			}
-			PsiNamedElementUsageGroupBase group = (PsiNamedElementUsageGroupBase) obj;
-			if(isValid() && group.isValid())
-			{
-				return getElement().getManager().areElementsEquivalent(getElement(), group.getElement());
-			}
-			return Comparing.equal(myName, ((PsiNamedElementUsageGroupBase) obj).myName);
-		}
-
-		@Override
-		public int hashCode()
-		{
-			return myName.hashCode();
-		}
-
-		@Override
-		public void calcData(final Key<?> key, final DataSink sink)
-		{
-			if(!isValid())
-			{
-				return;
-			}
-			if(LangDataKeys.PSI_ELEMENT == key)
-			{
-				sink.put(LangDataKeys.PSI_ELEMENT, getElement());
-			}
-			if(UsageView.USAGE_INFO_KEY == key)
-			{
-				T element = getElement();
-				if(element != null)
-				{
-					sink.put(UsageView.USAGE_INFO_KEY, new UsageInfo(element));
-				}
-			}
-		}
-	}
+abstract class JavaScriptGroupRuleProviderBase<T extends JSNamedElement> implements FileStructureGroupRuleProvider {
+    @Override
+    @Nullable
+    public UsageGroupingRule getUsageGroupingRule(final Project project) {
+        return new UsageGroupingRule() {
+            @Override
+            @Nullable
+            public UsageGroup groupUsage(final Usage usage) {
+                if (usage instanceof PsiElementUsage) {
+                    PsiElement psiElement = ((PsiElementUsage)usage).getElement();
+
+                    if (!psiElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE)) {
+                        return null;
+                    }
+                    final JSNamedElement element = PsiTreeUtil.getParentOfType(psiElement, getUsageClass());
+
+                    if (isAcceptableElement(element)) {
+                        return createUsageGroup((T)element);
+                    }
+                }
+                return null;
+            }
+        };
+    }
+
+    protected boolean isAcceptableElement(JSNamedElement element) {
+        return element != null;
+    }
+
+    protected abstract Class<? extends JSNamedElement> getUsageClass();
+
+    protected abstract UsageGroup createUsageGroup(final T t);
+
+    /**
+     * @author Maxim.Mossienko
+     */
+    abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement & NavigationItem> implements UsageGroup, TypeSafeDataProvider {
+        private SmartPsiElementPointer myElementPointer;
+        private String myName;
+        private Image myIcon;
+
+        PsiNamedElementUsageGroupBase(@Nonnull T element, Image icon) {
+            myIcon = icon;
+
+            myName = element.getName();
+            if (myName == null) {
+                myName = "<anonymous>";
+            }
+            myElementPointer = SmartPointerManager.getInstance(element.getProject()).createLazyPointer(element);
+        }
+
+        @Override
+        public Image getIcon() {
+            return myIcon;
+        }
+
+        public T getElement() {
+            return (T)myElementPointer.getElement();
+        }
+
+        @Override
+        @Nonnull
+        public String getText(UsageView view) {
+            return myName;
+        }
+
+        @Override
+        public FileStatus getFileStatus() {
+            return isValid() ? FileStatusManager.getInstance(getElement().getProject())
+                .getStatus(getElement().getContainingFile().getVirtualFile()) : null;
+        }
+
+        @Override
+        public boolean isValid() {
+            final T element = getElement();
+            return element != null && element.isValid();
+        }
+
+        @Override
+        public void navigate(boolean focus) throws UnsupportedOperationException {
+            if (canNavigate()) {
+                getElement().navigate(focus);
+            }
+        }
+
+        @Override
+        public boolean canNavigate() {
+            return isValid();
+        }
+
+        @Override
+        public boolean canNavigateToSource() {
+            return canNavigate();
+        }
+
+        @Override
+        public void update() {
+        }
+
+        @Override
+        public int compareTo(final UsageGroup o) {
+            return myName.compareTo(((PsiNamedElementUsageGroupBase)o).myName);
+        }
+
+        @Override
+        public boolean equals(final Object obj) {
+            if (!(obj instanceof PsiNamedElementUsageGroupBase)) {
+                return false;
+            }
+            PsiNamedElementUsageGroupBase group = (PsiNamedElementUsageGroupBase)obj;
+            if (isValid() && group.isValid()) {
+                return getElement().getManager().areElementsEquivalent(getElement(), group.getElement());
+            }
+            return Comparing.equal(myName, ((PsiNamedElementUsageGroupBase)obj).myName);
+        }
+
+        @Override
+        public int hashCode() {
+            return myName.hashCode();
+        }
+
+        @Override
+        public void calcData(final Key<?> key, final DataSink sink) {
+            if (!isValid()) {
+                return;
+            }
+            if (LangDataKeys.PSI_ELEMENT == key) {
+                sink.put(LangDataKeys.PSI_ELEMENT, getElement());
+            }
+            if (UsageView.USAGE_INFO_KEY == key) {
+                T element = getElement();
+                if (element != null) {
+                    sink.put(UsageView.USAGE_INFO_KEY, new UsageInfo(element));
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
index fb424486..25e1b265 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
@@ -20,257 +20,221 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.Set;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:02:29 PM
+ * Date: Oct 20, 2008
+ * Time: 7:02:29 PM
  */
-class AS3InterfaceDumper extends AbstractDumpProcessor
-{
-	private int memberCount;
-	private boolean isInterface;
-
-	@Override
-	public void dumpStat(@Nonnull final String stat)
-	{
-	}
-
-	@Override
-	public void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m)
-	{
-	}
-
-	@Override
-	public void dumpTopLevelTraits(final Abc abc, final @Nonnull Traits t, final String indent)
-	{
-		t.dump(abc, indent, "", this);
-	}
-
-	@Override
-	public boolean doDumpMember(final @Nonnull MemberInfo memberInfo)
-	{
-		if(memberInfo.name == null)
-		{
-			return false;
-		}
-		if(memberInfo.name.name != null && memberInfo.name.name.indexOf(Abc.$CINIT) >= 0)
-		{
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public void appendMethodSeparator()
-	{
-		append((++memberCount % 5) == 0 ? "\n" : "");
-	}
-
-	@Override
-	public void appendFieldSeparator()
-	{
-		appendMethodSeparator();
-	}
-
-	@Override
-	public String getAbcInSwfIndent()
-	{
-		return "";
-	}
-
-	@Override
-	public void processValue(final Multiname typeName, final Object valueObject)
-	{
-		append(" = ");
-		append(getValueRepr(valueObject));
-	}
-
-	protected static String getValueRepr(Object valueObject)
-	{
-		if(valueObject == null)
-		{
-			return null;
-		}
-		@NonNls String value = valueObject.toString();
-		char ch;
-
-		if(needsQuoting(value))
-		{
-			boolean doQoute = true;
-
-			if(value.indexOf('.') != -1)
-			{
-				try
-				{
-					Double.parseDouble(value);
-					doQoute = false;
-				}
-				catch(NumberFormatException ex)
-				{
-				}
-			}
-			else if(value.length() > 0 && (Character.isDigit(ch = value.charAt(0)) || (ch == '-' && value.length() > 1 && Character.isDigit(value.charAt(1)
-			))))
-			{
-				try
-				{
-					Integer.parseInt(value);
-					doQoute = false;
-				}
-				catch(NumberFormatException ex)
-				{
-				}
-			}
-
-			if(doQoute)
-			{
-				value = "\"" + quote(value) + "\"";
-			}
-		}
-		return value;
-	}
-
-	private static
-	@NonNls
-	Set<String> doNotNeedQoting = Set.of("null", "NaN", "undefined", "true", "false", "Infinity", "-Infinity");
-
-	private static boolean needsQuoting(final String value)
-	{
-		return !doNotNeedQoting.contains(value);
-	}
-
-	@Override
-	public boolean doDumpMetaData(final @Nonnull MetaData md)
-	{
-		return md.name.indexOf("__") == -1;
-	}
-
-	@Override
-	public void processParameter(@Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest)
-	{
-		if(rest)
-		{
-			append("... ");
-			append(name);
-		}
-		else
-		{
-			append(name);
-			append(":");
-			processMultinameAsPackageName(type, parentName, true);
-			if(value != null)
-			{
-				processValue(type, value);
-			}
-		}
-	}
-
-	@Override
-	public boolean doStarTypeDumpInExtends()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean doStarMetaAttrNameDump()
-	{
-		return false;
-	}
-
-	@Override
-	public void setProcessingInterface(final boolean anInterface)
-	{
-		isInterface = anInterface;
-	}
-
-	@Override
-	public void hasError(@Nonnull final String error)
-	{
-		sb.append("/*" + error + "*/");
-	}
-
-	@Override
-	public void processMultinameAsPackageName(Multiname name, String parentName, boolean verbose)
-	{
-		append(getMultinameAsPackageName(name, parentName, verbose));
-	}
-
-	protected static String getMultinameAsPackageName(Multiname name, String parentName, boolean verbose)
-	{
-		if(name.hasNotEmptyNs())
-		{
-			if(name.hasNamespace() || (!verbose && parentName != null &&
-					(parentName.equals(name.nsset[0].replaceAll(":", "::"))) || (parentName != null && parentName.equals(name.toString()))))
-			{
-				return name.name;
-			}
-
-			return name.nsset[0] + "." + name.name;
-		}
-
-		return name.toString();
-	}
-
-	@Override
-	protected String appendModifiers(MemberInfo member, String attr)
-	{
-		@NonNls String s = attr;
-
-		s += "native ";
-		boolean hasNs = false;
-		if(member.name != null && member.name.hasNotEmptyNs() && member.name.hasNamespace())
-		{
-			hasNs = true;
-			s += member.name.getNsName() + " ";
-		}
-
-		if(s.indexOf("private") == -1 && !hasNs && !isInterface)
-		{
-			@NonNls String parentName;
-
-			if(member.isPublic ||
-					member.name.nsset[0].length() == 0 ||
-					(member.parentTraits != null && ((parentName = member.parentTraits.name.toString()).equals(member.name.toString()) || parentName.startsWith
-							("script"))))
-			{
-				s += "public ";
-			}
-			else
-			{
-				s += "protected ";
-			}
-		}
-
-		if(member.isFinal)
-		{
-			s += "final ";
-		}
-		if(member.isOverride)
-		{
-			s += "override ";
-		}
-		return s;
-	}
-
-	@Override
-	public void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr)
-	{
-		super.processFunction(methodInfo, referenceNameRequested, abc, indent, attr);
-		append(";\n");
-	}
-
-	@Override
-	public void processVariable(SlotInfo info, String indent, String attr)
-	{
-		super.processVariable(info, indent, attr);
-		append(";\n");
-	}
-
-	@Override
-	protected boolean dumpRestParameter()
-	{
-		return true;
-	}
+class AS3InterfaceDumper extends AbstractDumpProcessor {
+    private int memberCount;
+    private boolean isInterface;
+
+    @Override
+    public void dumpStat(@Nonnull final String stat) {
+    }
+
+    @Override
+    public void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m) {
+    }
+
+    @Override
+    public void dumpTopLevelTraits(final Abc abc, final @Nonnull Traits t, final String indent) {
+        t.dump(abc, indent, "", this);
+    }
+
+    @Override
+    public boolean doDumpMember(final @Nonnull MemberInfo memberInfo) {
+        if (memberInfo.name == null) {
+            return false;
+        }
+        if (memberInfo.name.name != null && memberInfo.name.name.indexOf(Abc.$CINIT) >= 0) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public void appendMethodSeparator() {
+        append((++memberCount % 5) == 0 ? "\n" : "");
+    }
+
+    @Override
+    public void appendFieldSeparator() {
+        appendMethodSeparator();
+    }
+
+    @Override
+    public String getAbcInSwfIndent() {
+        return "";
+    }
+
+    @Override
+    public void processValue(final Multiname typeName, final Object valueObject) {
+        append(" = ");
+        append(getValueRepr(valueObject));
+    }
+
+    protected static String getValueRepr(Object valueObject) {
+        if (valueObject == null) {
+            return null;
+        }
+        @NonNls String value = valueObject.toString();
+        char ch;
+
+        if (needsQuoting(value)) {
+            boolean doQoute = true;
+
+            if (value.indexOf('.') != -1) {
+                try {
+                    Double.parseDouble(value);
+                    doQoute = false;
+                }
+                catch (NumberFormatException ex) {
+                }
+            }
+            else if (value.length() > 0 && (Character.isDigit(
+                ch = value.charAt(0)) || (ch == '-' && value.length() > 1 && Character.isDigit(value.charAt(1)
+            )))) {
+                try {
+                    Integer.parseInt(value);
+                    doQoute = false;
+                }
+                catch (NumberFormatException ex) {
+                }
+            }
+
+            if (doQoute) {
+                value = "\"" + quote(value) + "\"";
+            }
+        }
+        return value;
+    }
+
+    private static
+    @NonNls
+    Set<String> doNotNeedQoting = Set.of("null", "NaN", "undefined", "true", "false", "Infinity", "-Infinity");
+
+    private static boolean needsQuoting(final String value) {
+        return !doNotNeedQoting.contains(value);
+    }
+
+    @Override
+    public boolean doDumpMetaData(final @Nonnull MetaData md) {
+        return md.name.indexOf("__") == -1;
+    }
+
+    @Override
+    public void processParameter(
+        @Nonnull String name,
+        @Nullable Multiname type,
+        String parentName,
+        @Nullable Multiname value,
+        boolean rest
+    ) {
+        if (rest) {
+            append("... ");
+            append(name);
+        }
+        else {
+            append(name);
+            append(":");
+            processMultinameAsPackageName(type, parentName, true);
+            if (value != null) {
+                processValue(type, value);
+            }
+        }
+    }
+
+    @Override
+    public boolean doStarTypeDumpInExtends() {
+        return false;
+    }
+
+    @Override
+    public boolean doStarMetaAttrNameDump() {
+        return false;
+    }
+
+    @Override
+    public void setProcessingInterface(final boolean anInterface) {
+        isInterface = anInterface;
+    }
+
+    @Override
+    public void hasError(@Nonnull final String error) {
+        sb.append("/*" + error + "*/");
+    }
+
+    @Override
+    public void processMultinameAsPackageName(Multiname name, String parentName, boolean verbose) {
+        append(getMultinameAsPackageName(name, parentName, verbose));
+    }
+
+    protected static String getMultinameAsPackageName(Multiname name, String parentName, boolean verbose) {
+        if (name.hasNotEmptyNs()) {
+            if (name.hasNamespace() || (!verbose && parentName != null &&
+                (parentName.equals(name.nsset[0].replaceAll(":", "::"))) || (parentName != null && parentName.equals(name.toString())))) {
+                return name.name;
+            }
+
+            return name.nsset[0] + "." + name.name;
+        }
+
+        return name.toString();
+    }
+
+    @Override
+    protected String appendModifiers(MemberInfo member, String attr) {
+        @NonNls String s = attr;
+
+        s += "native ";
+        boolean hasNs = false;
+        if (member.name != null && member.name.hasNotEmptyNs() && member.name.hasNamespace()) {
+            hasNs = true;
+            s += member.name.getNsName() + " ";
+        }
+
+        if (s.indexOf("private") == -1 && !hasNs && !isInterface) {
+            @NonNls String parentName;
+
+            if (member.isPublic ||
+                member.name.nsset[0].length() == 0 ||
+                (member.parentTraits != null && ((parentName =
+                    member.parentTraits.name.toString()).equals(member.name.toString()) || parentName.startsWith
+                    ("script")))) {
+                s += "public ";
+            }
+            else {
+                s += "protected ";
+            }
+        }
+
+        if (member.isFinal) {
+            s += "final ";
+        }
+        if (member.isOverride) {
+            s += "override ";
+        }
+        return s;
+    }
+
+    @Override
+    public void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr) {
+        super.processFunction(methodInfo, referenceNameRequested, abc, indent, attr);
+        append(";\n");
+    }
+
+    @Override
+    public void processVariable(SlotInfo info, String indent, String attr) {
+        super.processVariable(info, indent, attr);
+        append(";\n");
+    }
+
+    @Override
+    protected boolean dumpRestParameter() {
+        return true;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
index ae72c5bf..ccc2b853 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
@@ -34,54 +34,52 @@
  * Time: 0:43:37
  * To change this template use File | Settings | File Templates.
  */
-class AS3InterfaceStubDumper extends AS3InterfaceDumper
-{
-	final LinkedList<StubElement> parents;
-
-	public AS3InterfaceStubDumper(StubElement parent)
-	{
-		parents = new LinkedList<StubElement>();
-		parents.add(parent);
-	}
-
-	@Override
-	public void processMetadata(MetaData metaData)
-	{
-		/*parents.addLast(new JSAttributeStubImpl(metaData.name, parents.getLast()));
-		super.processMetadata(metaData);
+class AS3InterfaceStubDumper extends AS3InterfaceDumper {
+    final LinkedList<StubElement> parents;
+
+    public AS3InterfaceStubDumper(StubElement parent) {
+        parents = new LinkedList<>();
+        parents.add(parent);
+    }
+
+    @Override
+    public void processMetadata(MetaData metaData) {
+        /*parents.addLast(new JSAttributeStubImpl(metaData.name, parents.getLast()));
+        super.processMetadata(metaData);
 		parents.removeLast();     */
-	}
+    }
 
-	@Override
-	public void addMetaDataValue(String s, String s1)
-	{
-		new JSAttributeNameValuePairStubImpl(s, StringUtil.stripQuotesAroundValue(s1), parents.getLast());
-	}
+    @Override
+    public void addMetaDataValue(String s, String s1) {
+        new JSAttributeNameValuePairStubImpl(s, StringUtil.stripQuotesAroundValue(s1), parents.getLast());
+    }
 
-	@Override
-	protected void processArgumentList(MethodInfo methodInfo, String parentName)
-	{
+    @Override
+    protected void processArgumentList(MethodInfo methodInfo, String parentName) {
 		/*parents.add(new JSParameterListStubImpl(parents.getLast()));
 		super.processArgumentList(methodInfo, parentName);
 		parents.removeLast();   */
-	}
-
-	@Override
-	public void processParameter(@Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest)
-	{
+    }
+
+    @Override
+    public void processParameter(
+        @Nonnull String name,
+        @Nullable Multiname type,
+        String parentName,
+        @Nullable Multiname value,
+        boolean rest
+    ) {
 		/*new JSParameterStubImpl(name, rest ? JSParameterStubImpl.REST_MASK : 0, getMultinameAsPackageName(type, parentName, true),
 			getValueRepr(value),
 				parents.getLast());*/
-	}
+    }
 
-	@Override
-	public void append(@Nonnull @NonNls String str)
-	{
-	}
+    @Override
+    public void append(@Nonnull @NonNls String str) {
+    }
 
-	@Override
-	public void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr)
-	{
+    @Override
+    public void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr) {
 		/*parents.add(new JSFunctionStubImpl(methodInfo.name.name, methodInfo.isGetMethod() ? JSFunctionStubImpl.GET_PROPERTY_MASK : methodInfo
 			.isSetMethod
 				() ? JSFunctionStubImpl.SET_PROPERTY_MASK : methodInfo.parentTraits != null && methodInfo.parentTraits.name == methodInfo.name ?
@@ -90,11 +88,10 @@ public void processFunction(MethodInfo methodInfo, boolean referenceNameRequeste
 				referenceNameRequested), parents.getLast()));
 		super.processFunction(methodInfo, referenceNameRequested, abc, indent, attr);
 		parents.removeLast();    */
-	}
+    }
 
-	@Override
-	public void processVariable(SlotInfo info, String indent, String attr)
-	{
+    @Override
+    public void processVariable(SlotInfo info, String indent, String attr) {
 		/*parents.add(new JSVarStatementStubImpl(parents.getLast()));
 		super.processVariable(info, indent, attr);
 		String parentName = info.getParentName();
@@ -102,20 +99,18 @@ public void processVariable(SlotInfo info, String indent, String attr)
 		new JSVariableStubImpl(qName.substring(qName.lastIndexOf('.') + 1), info.isConst() ? JSVariableStubImpl.CONST_MASK : 0,
 				getMultinameAsPackageName(info.type, parentName, false), getValueRepr(info.value), qName, parents.getLast());
 		parents.removeLast();  */
-	}
+    }
 
-	@Override
-	public void processClass(SlotInfo slotInfo, Abc abc, String attr, String indent)
-	{
+    @Override
+    public void processClass(SlotInfo slotInfo, Abc abc, String attr, String indent) {
 		/*parents.add(new JSClassStubImpl(slotInfo.name.name, slotInfo.isInterfaceClass() ? JSClassStubImpl.INTERFACE_MASK : 0,
 				getMultinameAsPackageName(slotInfo.name, null, false), parents.getLast()));
 		super.processClass(slotInfo, abc, attr, indent);
 		parents.removeLast();   */
-	}
+    }
 
-	@Override
-	protected void processModifierList(MemberInfo memberInfo, String attr, String indent)
-	{
+    @Override
+    protected void processModifierList(MemberInfo memberInfo, String attr, String indent) {
 		/*StringTokenizer tokenizer = new StringTokenizer(attr, " ");
 		List<JSAttributeList.ModifierType> modifiers = new SmartList<JSAttributeList.ModifierType>();
 		JSAttributeList.AccessType accessType = null;
@@ -157,31 +152,34 @@ protected void processModifierList(MemberInfo memberInfo, String attr, String in
 		parents.add(new JSAttributeListStubImpl(parents.getLast(), ns, accessType, modifiers.toArray(new JSAttributeList.ModifierType[modifiers.size()])));
 		super.processModifierList(memberInfo, attr, indent);
 		parents.removeLast();  */
-	}
-
-	@Override
-	protected void dumpExtendsList(Traits it)
-	{
-		if(!it.base.isStarReference())
-		{
-			new JSReferenceListStubImpl(new String[]{getMultinameAsPackageName(it.base, null, true)}, parents.getLast(), JSElementTypes.EXTENDS_LIST);
-		}
-	}
-
-	@Override
-	protected void dumpInterfacesList(String indent, Traits it, boolean anInterface)
-	{
-		String[] interfaces;
-		if(it.interfaces.length > 0)
-		{
-			interfaces = new String[it.interfaces.length];
-
-			int i = 0;
-			for(Multiname name : it.interfaces)
-			{
-				interfaces[i++] = getMultinameAsPackageName(name, null, true);
-			}
-			new JSReferenceListStubImpl(interfaces, parents.getLast(), anInterface ? JSElementTypes.EXTENDS_LIST : JSElementTypes.IMPLEMENTS_LIST);
-		}
-	}
+    }
+
+    @Override
+    protected void dumpExtendsList(Traits it) {
+        if (!it.base.isStarReference()) {
+            new JSReferenceListStubImpl(
+                new String[]{getMultinameAsPackageName(it.base, null, true)},
+                parents.getLast(),
+                JSElementTypes.EXTENDS_LIST
+            );
+        }
+    }
+
+    @Override
+    protected void dumpInterfacesList(String indent, Traits it, boolean anInterface) {
+        String[] interfaces;
+        if (it.interfaces.length > 0) {
+            interfaces = new String[it.interfaces.length];
+
+            int i = 0;
+            for (Multiname name : it.interfaces) {
+                interfaces[i++] = getMultinameAsPackageName(name, null, true);
+            }
+            new JSReferenceListStubImpl(
+                interfaces,
+                parents.getLast(),
+                anInterface ? JSElementTypes.EXTENDS_LIST : JSElementTypes.IMPLEMENTS_LIST
+            );
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
index 23a63665..23f9a447 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
@@ -26,1162 +26,1090 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:01:16 PM
+ * Date: Oct 20, 2008
+ * Time: 7:01:16 PM
  */
-class Abc
-{
-	static final
-	@NonNls
-	String TAB = "  ";
-	@NonNls
-	static final String $CINIT = "$cinit";
-	@NonNls
-	static final String $ = "$";
-
-	private static final int ATTR_final = 0x01; // 1=final, 0=virtual
-	private static final int ATTR_override = 0x02; // 1=override, 0=new
-	private static final int ATTR_metadata = 0x04; // 1=has metadata, 0=no metadata
-	private static final int ATTR_public = 0x08; // 1=add public namespace
-
-	static final int CLASS_FLAG_sealed = 0x01;
-	static final int CLASS_FLAG_final = 0x02;
-	static final int CLASS_FLAG_interface = 0x04;
-	static final int CLASS_FLAG_protected = 0x08;
-
-
-	// method flags
-	private static final int NEED_ARGUMENTS = 0x01;
-	static final int NEED_ACTIVATION = 0x02;
-	private static final int NEED_REST = 0x04;
-	private static final int HAS_OPTIONAL = 0x08;
-	private static final int IGNORE_REST = 0x10;
-	static final int NATIVE = 0x20;
-	private static final int HAS_ParamNames = 0x80;
-
-	private static final int CONSTANT_Utf8 = 0x01;
-	private static final int CONSTANT_Int = 0x03;
-	private static final int CONSTANT_UInt = 0x04;
-	private static final int CONSTANT_PrivateNs = 0x05; // non-shared namespace
-	private static final int CONSTANT_Double = 0x06;
-	private static final int CONSTANT_Qname = 0x07; // o.ns::name, ct ns, ct name
-	private static final int CONSTANT_Namespace = 0x08;
-	private static final int CONSTANT_Multiname = 0x09; // o.name, ct nsset, ct name
-	private static final int CONSTANT_False = 0x0A;
-	private static final int CONSTANT_True = 0x0B;
-	private static final int CONSTANT_Null = 0x0C;
-	private static final int CONSTANT_QnameA = 0x0D; // o.@ns::name, ct ns, ct attr-name
-	private static final int CONSTANT_MultinameA = 0x0E; // o.@name, ct attr-name
-	private static final int CONSTANT_RTQname = 0x0F; // o.ns::name, rt ns, ct name
-	private static final int CONSTANT_RTQnameA = 0x10; // o.@ns::name, rt ns, ct attr-name
-	private static final int CONSTANT_RTQnameL = 0x11; // o.ns::[name], rt ns, rt name
-	private static final int CONSTANT_RTQnameLA = 0x12; // o.@ns::[name], rt ns, rt attr-name
-	private static final int CONSTANT_NameL = 0x13;    // o.[], ns=public implied, rt name
-	private static final int CONSTANT_NameLA = 0x14; // o.@[], ns=public implied, rt attr-name
-	private static final int CONSTANT_NamespaceSet = 0x15;
-	private static final int CONSTANT_PackageNs = 0x16;
-	private static final int CONSTANT_PackageInternalNs = 0x17;
-	private static final int CONSTANT_ProtectedNs = 0x18;
-	private static final int CONSTANT_StaticProtectedNs = 0x19;
-	private static final int CONSTANT_StaticProtectedNs2 = 0x1a;
-	private static final int CONSTANT_MultinameL = 0x1B;
-	private static final int CONSTANT_MultinameLA = 0x1C;
-	private static final int CONSTANT_TypeName = 0x1D;
-
-	static final
-	@NonNls
-	String[] constantKinds = {
-			"0",
-			"utf8",
-			"2",
-			"int",
-			"uint",
-			"private",
-			"double",
-			"qname",
-			"namespace",
-			"multiname",
-			"false",
-			"true",
-			"null",
-			"@qname",
-			"@multiname",
-			"rtqname",
-			"@rtqname",
-			"[qname]",
-			"@[qname]",
-			"[name]",
-			"@[name]",
-			"nsset"
-	};
-
-	static final int TRAIT_Slot = 0x00;
-	private static final int TRAIT_Method = 0x01;
-	private static final int TRAIT_Getter = 0x02;
-	private static final int TRAIT_Setter = 0x03;
-	private static final int TRAIT_Class = 0x04;
-	private static final int TRAIT_Function = 0x05;
-	static final int TRAIT_Const = 0x06;
-
-	static final
-	@NonNls
-	String[] traitKinds = {
-			"var",
-			"function",
-			"function get",
-			"function set",
-			"class",
-			"function",
-			"const"
-	};
-
-	private static final int OP_bkpt = 0x01;
-	private static final int OP_nop = 0x02;
-	private static final int OP_throw = 0x03;
-	static final int OP_getsuper = 0x04;
-	static final int OP_setsuper = 0x05;
-	private static final int OP_dxns = 0x06;
-	private static final int OP_dxnslate = 0x07;
-	static final int OP_kill = 0x08;
-	static final int OP_label = 0x09;
-	static final int OP_ifnlt = 0x0C;
-	static final int OP_ifnle = 0x0D;
-	static final int OP_ifngt = 0x0E;
-	static final int OP_ifnge = 0x0F;
-	static final int OP_jump = 0x10;
-	static final int OP_iftrue = 0x11;
-	static final int OP_iffalse = 0x12;
-	static final int OP_ifeq = 0x13;
-	static final int OP_ifne = 0x14;
-	static final int OP_iflt = 0x15;
-	static final int OP_ifle = 0x16;
-	static final int OP_ifgt = 0x17;
-	static final int OP_ifge = 0x18;
-	static final int OP_ifstricteq = 0x19;
-	static final int OP_ifstrictne = 0x1A;
-	static final int OP_lookupswitch = 0x1B;
-	private static final int OP_pushwith = 0x1C;
-	private static final int OP_popscope = 0x1D;
-	private static final int OP_nextname = 0x1E;
-	private static final int OP_hasnext = 0x1F;
-	private static final int OP_pushnull = 0x20;
-	private static final int OP_pushundefined = 0x21;
-	private static final int OP_pushconstant = 0x22;
-	private static final int OP_nextvalue = 0x23;
-	static final int OP_pushbyte = 0x24;
-	static final int OP_pushshort = 0x25;
-	private static final int OP_pushtrue = 0x26;
-	private static final int OP_pushfalse = 0x27;
-	private static final int OP_pushnan = 0x28;
-	private static final int OP_pop = 0x29;
-	private static final int OP_dup = 0x2A;
-	private static final int OP_swap = 0x2B;
-	static final int OP_pushstring = 0x2C;
-	static final int OP_pushint = 0x2D;
-	static final int OP_pushuint = 0x2E;
-	static final int OP_pushdouble = 0x2F;
-	private static final int OP_pushscope = 0x30;
-	static final int OP_pushnamespace = 0x31;
-	static final int OP_hasnext2 = 0x32;
-	static final int OP_newfunction = 0x40;
-	static final int OP_call = 0x41;
-	static final int OP_construct = 0x42;
-	private static final int OP_callmethod = 0x43;
-	static final int OP_callstatic = 0x44;
-	static final int OP_callsuper = 0x45;
-	static final int OP_callproperty = 0x46;
-	private static final int OP_returnvoid = 0x47;
-	private static final int OP_returnvalue = 0x48;
-	static final int OP_constructsuper = 0x49;
-	static final int OP_constructprop = 0x4A;
-	private static final int OP_callsuperid = 0x4B;
-	static final int OP_callproplex = 0x4C;
-	private static final int OP_callinterface = 0x4D;
-	static final int OP_callsupervoid = 0x4E;
-	static final int OP_callpropvoid = 0x4F;
-	private static final int OP_applytype = 0x53;
-	static final int OP_newobject = 0x55;
-	static final int OP_newarray = 0x56;
-	private static final int OP_newactivation = 0x57;
-	static final int OP_newclass = 0x58;
-	static final int OP_getdescendants = 0x59;
-	static final int OP_newcatch = 0x5A;
-	static final int OP_findpropstrict = 0x5D;
-	static final int OP_findproperty = 0x5E;
-	static final int OP_finddef = 0x5F;
-	static final int OP_getlex = 0x60;
-	static final int OP_setproperty = 0x61;
-	static final int OP_getlocal = 0x62;
-	static final int OP_setlocal = 0x63;
-	private static final int OP_getglobalscope = 0x64;
-	static final int OP_getscopeobject = 0x65;
-	static final int OP_getproperty = 0x66;
-	private static final int OP_getouterscope = 0x67;
-	static final int OP_initproperty = 0x68;
-	private static final int OP_setpropertylate = 0x69;
-	static final int OP_deleteproperty = 0x6A;
-	private static final int OP_deletepropertylate = 0x6B;
-	static final int OP_getslot = 0x6C;
-	static final int OP_setslot = 0x6D;
-	static final int OP_getglobalslot = 0x6E;
-	static final int OP_setglobalslot = 0x6F;
-	private static final int OP_convert_s = 0x70;
-	private static final int OP_esc_xelem = 0x71;
-	private static final int OP_esc_xattr = 0x72;
-	private static final int OP_convert_i = 0x73;
-	private static final int OP_convert_u = 0x74;
-	private static final int OP_convert_d = 0x75;
-	private static final int OP_convert_b = 0x76;
-	private static final int OP_convert_o = 0x77;
-	static final int OP_coerce = 0x80;
-	private static final int OP_coerce_b = 0x81;
-	private static final int OP_coerce_a = 0x82;
-	private static final int OP_coerce_i = 0x83;
-	private static final int OP_coerce_d = 0x84;
-	private static final int OP_coerce_s = 0x85;
-	static final int OP_astype = 0x86;
-	private static final int OP_astypelate = 0x87;
-	private static final int OP_coerce_u = 0x88;
-	private static final int OP_coerce_o = 0x89;
-	private static final int OP_negate = 0x90;
-	private static final int OP_increment = 0x91;
-	static final int OP_inclocal = 0x92;
-	private static final int OP_decrement = 0x93;
-	static final int OP_declocal = 0x94;
-	private static final int OP_typeof = 0x95;
-	private static final int OP_not = 0x96;
-	private static final int OP_bitnot = 0x97;
-	private static final int OP_concat = 0x9A;
-	private static final int OP_add_d = 0x9B;
-	private static final int OP_add = 0xA0;
-	private static final int OP_subtract = 0xA1;
-	private static final int OP_multiply = 0xA2;
-	private static final int OP_divide = 0xA3;
-	private static final int OP_modulo = 0xA4;
-	private static final int OP_lshift = 0xA5;
-	private static final int OP_rshift = 0xA6;
-	private static final int OP_urshift = 0xA7;
-	private static final int OP_bitand = 0xA8;
-	private static final int OP_bitor = 0xA9;
-	private static final int OP_bitxor = 0xAA;
-	private static final int OP_equals = 0xAB;
-	private static final int OP_strictequals = 0xAC;
-	private static final int OP_lessthan = 0xAD;
-	private static final int OP_lessequals = 0xAE;
-	private static final int OP_greaterthan = 0xAF;
-	private static final int OP_greaterequals = 0xB0;
-	private static final int OP_instanceof = 0xB1;
-	static final int OP_istype = 0xB2;
-	private static final int OP_istypelate = 0xB3;
-	private static final int OP_in = 0xB4;
-	private static final int OP_increment_i = 0xC0;
-	private static final int OP_decrement_i = 0xC1;
-	static final int OP_inclocal_i = 0xC2;
-	static final int OP_declocal_i = 0xC3;
-	private static final int OP_negate_i = 0xC4;
-	private static final int OP_add_i = 0xC5;
-	private static final int OP_subtract_i = 0xC6;
-	private static final int OP_multiply_i = 0xC7;
-	private static final int OP_getlocal0 = 0xD0;
-	private static final int OP_getlocal1 = 0xD1;
-	private static final int OP_getlocal2 = 0xD2;
-	private static final int OP_getlocal3 = 0xD3;
-	private static final int OP_setlocal0 = 0xD4;
-	private static final int OP_setlocal1 = 0xD5;
-	private static final int OP_setlocal2 = 0xD6;
-	private static final int OP_setlocal3 = 0xD7;
-	static final int OP_debug = 0xEF;
-	static final int OP_debugline = 0xF0;
-	static final int OP_debugfile = 0xF1;
-	private static final int OP_bkptline = 0xF2;
-
-	static final
-	@NonNls
-	String[] opNames = {
-			"OP_0x00       ",
-			"bkpt          ",
-			"nop           ",
-			"throw         ",
-			"getsuper      ",
-			"setsuper      ",
-			"dxns          ",
-			"dxnslate      ",
-			"kill          ",
-			"label         ",
-			"OP_0x0A       ",
-			"OP_0x0B       ",
-			"ifnlt         ",
-			"ifnle         ",
-			"ifngt         ",
-			"ifnge         ",
-			"jump          ",
-			"iftrue        ",
-			"iffalse       ",
-			"ifeq          ",
-			"ifne          ",
-			"iflt          ",
-			"ifle          ",
-			"ifgt          ",
-			"ifge          ",
-			"ifstricteq    ",
-			"ifstrictne    ",
-			"lookupswitch  ",
-			"pushwith      ",
-			"popscope      ",
-			"nextname      ",
-			"hasnext       ",
-			"pushnull      ",
-			"pushundefined ",
-			"pushconstant  ",
-			"nextvalue     ",
-			"pushbyte      ",
-			"pushshort     ",
-			"pushtrue      ",
-			"pushfalse     ",
-			"pushnan       ",
-			"pop           ",
-			"dup           ",
-			"swap          ",
-			"pushstring    ",
-			"pushint       ",
-			"pushuint      ",
-			"pushdouble    ",
-			"pushscope     ",
-			"pushnamespace ",
-			"hasnext2      ",
-			"OP_0x33       ",
-			"OP_0x34       ",
-			"OP_0x35       ",
-			"OP_0x36       ",
-			"OP_0x37       ",
-			"OP_0x38       ",
-			"OP_0x39       ",
-			"OP_0x3A       ",
-			"OP_0x3B       ",
-			"OP_0x3C       ",
-			"OP_0x3D       ",
-			"OP_0x3E       ",
-			"OP_0x3F       ",
-			"newfunction   ",
-			"call          ",
-			"construct     ",
-			"callmethod    ",
-			"callstatic    ",
-			"callsuper     ",
-			"callproperty  ",
-			"returnvoid    ",
-			"returnvalue   ",
-			"constructsuper",
-			"constructprop ",
-			"callsuperid   ",
-			"callproplex   ",
-			"callinterface ",
-			"callsupervoid ",
-			"callpropvoid  ",
-			"OP_0x50       ",
-			"OP_0x51       ",
-			"OP_0x52       ",
-			"applytype     ",
-			"OP_0x54       ",
-			"newobject     ",
-			"newarray      ",
-			"newactivation ",
-			"newclass      ",
-			"getdescendants",
-			"newcatch      ",
-			"OP_0x5B       ",
-			"OP_0x5C       ",
-			"findpropstrict",
-			"findproperty  ",
-			"finddef       ",
-			"getlex        ",
-			"setproperty   ",
-			"getlocal      ",
-			"setlocal      ",
-			"getglobalscope",
-			"getscopeobject",
-			"getproperty   ",
-			"getouterscope ",
-			"initproperty  ",
-			"OP_0x69       ",
-			"deleteproperty",
-			"OP_0x6A       ",
-			"getslot       ",
-			"setslot       ",
-			"getglobalslot ",
-			"setglobalslot ",
-			"convert_s     ",
-			"esc_xelem     ",
-			"esc_xattr     ",
-			"convert_i     ",
-			"convert_u     ",
-			"convert_d     ",
-			"convert_b     ",
-			"convert_o     ",
-			"checkfilter   ",
-			"OP_0x79       ",
-			"OP_0x7A       ",
-			"OP_0x7B       ",
-			"OP_0x7C       ",
-			"OP_0x7D       ",
-			"OP_0x7E       ",
-			"OP_0x7F       ",
-			"coerce        ",
-			"coerce_b      ",
-			"coerce_a      ",
-			"coerce_i      ",
-			"coerce_d      ",
-			"coerce_s      ",
-			"astype        ",
-			"astypelate    ",
-			"coerce_u      ",
-			"coerce_o      ",
-			"OP_0x8A       ",
-			"OP_0x8B       ",
-			"OP_0x8C       ",
-			"OP_0x8D       ",
-			"OP_0x8E       ",
-			"OP_0x8F       ",
-			"negate        ",
-			"increment     ",
-			"inclocal      ",
-			"decrement     ",
-			"declocal      ",
-			"typeof        ",
-			"not           ",
-			"bitnot        ",
-			"OP_0x98       ",
-			"OP_0x99       ",
-			"concat        ",
-			"add_d         ",
-			"OP_0x9C       ",
-			"OP_0x9D       ",
-			"OP_0x9E       ",
-			"OP_0x9F       ",
-			"add           ",
-			"subtract      ",
-			"multiply      ",
-			"divide        ",
-			"modulo        ",
-			"lshift        ",
-			"rshift        ",
-			"urshift       ",
-			"bitand        ",
-			"bitor         ",
-			"bitxor        ",
-			"equals        ",
-			"strictequals  ",
-			"lessthan      ",
-			"lessequals    ",
-			"greaterthan   ",
-			"greaterequals ",
-			"instanceof    ",
-			"istype        ",
-			"istypelate    ",
-			"in            ",
-			"OP_0xB5       ",
-			"OP_0xB6       ",
-			"OP_0xB7       ",
-			"OP_0xB8       ",
-			"OP_0xB9       ",
-			"OP_0xBA       ",
-			"OP_0xBB       ",
-			"OP_0xBC       ",
-			"OP_0xBD       ",
-			"OP_0xBE       ",
-			"OP_0xBF       ",
-			"increment_i   ",
-			"decrement_i   ",
-			"inclocal_i    ",
-			"declocal_i    ",
-			"negate_i      ",
-			"add_i         ",
-			"subtract_i    ",
-			"multiply_i    ",
-			"OP_0xC8       ",
-			"OP_0xC9       ",
-			"OP_0xCA       ",
-			"OP_0xCB       ",
-			"OP_0xCC       ",
-			"OP_0xCD       ",
-			"OP_0xCE       ",
-			"OP_0xCF       ",
-			"getlocal0     ",
-			"getlocal1     ",
-			"getlocal2     ",
-			"getlocal3     ",
-			"setlocal0     ",
-			"setlocal1     ",
-			"setlocal2     ",
-			"setlocal3     ",
-			"OP_0xD8       ",
-			"OP_0xD9       ",
-			"OP_0xDA       ",
-			"OP_0xDB       ",
-			"OP_0xDC       ",
-			"OP_0xDD       ",
-			"OP_0xDE       ",
-			"OP_0xDF       ",
-			"OP_0xE0       ",
-			"OP_0xE1       ",
-			"OP_0xE2       ",
-			"OP_0xE3       ",
-			"OP_0xE4       ",
-			"OP_0xE5       ",
-			"OP_0xE6       ",
-			"OP_0xE7       ",
-			"OP_0xE8       ",
-			"OP_0xE9       ",
-			"OP_0xEA       ",
-			"OP_0xEB       ",
-			"OP_0xEC       ",
-			"OP_0xED       ",
-			"OP_0xEE       ",
-			"debug         ",
-			"debugline     ",
-			"debugfile     ",
-			"bkptline      ",
-			"timestamp     ",
-			"OP_0xF4       ",
-			"verifypass    ",
-			"alloc         ",
-			"mark          ",
-			"wb            ",
-			"prologue      ",
-			"sendenter     ",
-			"doubletoatom  ",
-			"sweep         ",
-			"codegenop     ",
-			"verifyop      ",
-			"decode        "
-	};
-
-	private FlexByteCodeInformationProcessor processor;
-	int totalSize;
-	final int opSizes[] = new int[256];
-
-	public Abc(final @Nonnull ByteBuffer _data, @Nonnull FlexByteCodeInformationProcessor _processor)
-	{
-		data = _data;
-		processor = _processor;
-
-		data.setPosition(0);
-		magic = data.readInt();
-
-		_processor.dumpStat("magic " + Integer.toString(magic, 16) + "\n");
-
-		if(magic != (46 << 16 | 14) && magic != (46 << 16 | 15) && magic != (46 << 16 | 16))
-		{
-			throw new Error("not an abc file.  magic=" + Integer.toString(magic, 16));
-		}
-
-		parseCpool();
-
-		defaults[CONSTANT_Utf8] = strings;
-		defaults[CONSTANT_Int] = ints;
-		defaults[CONSTANT_UInt] = uints;
-		defaults[CONSTANT_Double] = doubles;
-		defaults[CONSTANT_Int] = ints;
-		defaults[CONSTANT_False] = buildSparseArray(10, "false");
-		defaults[CONSTANT_True] = buildSparseArray(11, "true");
-		defaults[CONSTANT_Namespace] = namespaces;
-		defaults[CONSTANT_PrivateNs] = namespaces;
-		defaults[CONSTANT_PackageNs] = namespaces;
-		defaults[CONSTANT_PackageInternalNs] = namespaces;
-		defaults[CONSTANT_ProtectedNs] = namespaces;
-		defaults[CONSTANT_StaticProtectedNs] = namespaces;
-		defaults[CONSTANT_StaticProtectedNs2] = namespaces;
-		defaults[CONSTANT_Null] = buildSparseArray(12, "null");
-
-		parseMethodInfos();
-		parseMetadataInfos();
-		parseInstanceInfos();
-		parseClassInfos();
-		parseScriptInfos();
-		parseMethodBodies();
-	}
-
-	private static Object[] buildSparseArray(int index, @NonNls String s1)
-	{
-		final Object[] result = new Object[index + 1];
-		result[index] = s1;
-		return result;
-	}
-
-	public void dump(String indent)
-	{
-		for(Traits t : scripts)
-		{
-			processor.dumpTopLevelTraits(this, t, indent);
-		}
-
-		for(MethodInfo m : methods)
-		{
-			if(m.anon)
-			{
-				processor.dumpToplevelAnonymousMethod(this, m);
-			}
-		}
-
-		processor.dumpStat("OPCODE\tSIZE\t% OF " + totalSize + "\n");
-		final Set<Integer> done = new HashSet<Integer>();
-		while(true)
-		{
-			int max = -1;
-			int maxsize = 0;
-			for(int i = 0; i < 256; i++)
-			{
-				if(opSizes[i] > maxsize && !done.contains(i))
-				{
-					max = i;
-					maxsize = opSizes[i];
-				}
-			}
-			if(max == -1)
-			{
-				break;
-			}
-			done.add(max);
-			processor.dumpStat(opNames[max] + "\t" + opSizes[max] + "\t" + (int) (100f * opSizes[max] / totalSize) + "%\n");
-		}
-	}
-
-	private final ByteBuffer data;
-	int major;
-	int minor;
-
-	Integer[] ints;
-	Integer[] uints;
-	Double[] doubles;
-	@NonNls
-	String[] strings;
-	@NonNls
-	String[] namespaces;
-	@NonNls
-	String[][] nssets;
-	Multiname[] names;
-
-	final Object[][] defaults = new Object[Math.max(constantKinds.length, CONSTANT_MultinameLA + 1)][];
-
-	MethodInfo methods[];
-	Traits instances[];
-	Traits classes[];
-	Traits[] scripts;
-	MetaData metadata[];
-
-	@NonNls
-	String publicNs = "";
-	@NonNls
-	String anyNs = "*";
-
-	final int magic;
-
-	int readU32()
-	{
-		return data.readU32();
-	}
-
-	void parseCpool()
-	{
-		int i, j;
-		int n;
-		int start = data.getPosition();
-
-		// ints
-		n = readU32();
-		ints = new Integer[n > 0 ? n : 1];
-		ints[0] = 0;
-		for(i = 1; i < n; i++)
-		{
-			ints[i] = readU32();
-		}
-
-		// uints
-		n = readU32();
-		uints = new Integer[n > 0 ? n : 1];
-		uints[0] = 0;
-		for(i = 1; i < n; i++)
-		{
-			uints[i] = readU32();
-		}
-
-		// doubles
-		n = readU32();
-		doubles = new Double[n > 0 ? n : 1];
-		doubles[0] = Double.NaN;
-		for(i = 1; i < n; i++)
-		{
-			doubles[i] = data.readDouble();
-		}
-
-		reportAboutPercentage("Cpool numbers size ", data, start, processor);
-		start = data.getPosition();
-
-		// strings
-		n = readU32();
-		strings = new String[n];
-		strings[0] = "";
-		for(i = 1; i < n; i++)
-		{
-			strings[i] = data.readUTFBytes(readU32());
-		}
-
-		reportAboutPercentage("Cpool strings count " + n + " size ", data, start, processor);
-		start = data.getPosition();
-
-		// namespaces
-		n = readU32();
-		namespaces = new String[n];
-		namespaces[0] = publicNs;
-		for(i = 1; i < n; i++)
-		{
-			switch(data.readByte())
-			{
-				case CONSTANT_Namespace:
-				case CONSTANT_PackageNs:
-				case CONSTANT_PackageInternalNs:
-				case CONSTANT_ProtectedNs:
-				case CONSTANT_StaticProtectedNs:
-				case CONSTANT_StaticProtectedNs2:
-				{
-					namespaces[i] = strings[readU32()];
-					// todo mark kind of namespace.
-					break;
-				}
-				case CONSTANT_PrivateNs:
-					readU32();
-					namespaces[i] = "private";
-					break;
-			}
-		}
-
-		reportAboutPercentage("Cpool namespaces count " + n + " size ", data, start, processor);
-		start = data.getPosition();
-
-		// namespace sets
-		n = readU32();
-		nssets = new String[n][];
-		for(i = 1; i < n; i++)
-		{
-			int count = readU32();
-			String[] nsset = nssets[i] = new String[count];
-			for(j = 0; j < count; j++)
-			{
-				nsset[j] = namespaces[readU32()];
-			}
-		}
-
-		reportAboutPercentage("Cpool nssets count " + n + " size ", data, start, processor);
-		start = data.getPosition();
-
-		// multinames
-		n = readU32();
-		names = new Multiname[n];
-		namespaces[0] = anyNs;
-		strings[0] = "*"; // any name
-		for(i = 1; i < n; i++)
-		{
-			switch(data.readByte())
-			{
-				case CONSTANT_Qname:
-				case CONSTANT_QnameA:
-					names[i] = new Multiname(new String[]{namespaces[readU32()]}, strings[readU32()]);
-					break;
-
-				case CONSTANT_RTQname:
-				case CONSTANT_RTQnameA:
-					names[i] = new Multiname(new String[]{strings[readU32()]}, null);
-					break;
-
-				case CONSTANT_RTQnameL:
-				case CONSTANT_RTQnameLA:
-					names[i] = null;
-					break;
-
-				case CONSTANT_NameL:
-				case CONSTANT_NameLA:
-					names[i] = new Multiname(new String[]{""}, null);
-					break;
-
-				case CONSTANT_Multiname:
-				case CONSTANT_MultinameA:
-					String name = strings[readU32()];
-					names[i] = new Multiname(nssets[readU32()], name);
-					break;
-
-				case CONSTANT_MultinameL:
-				case CONSTANT_MultinameLA:
-					names[i] = new Multiname(nssets[readU32()], null);
-					break;
-
-				case CONSTANT_TypeName:
-					// TODO:
-					int nameId = readU32();
-					String nsName = names[nameId].toString();
-
-					int count = readU32();
-
-					if(count > 0)
-					{
-						nsName += "<";
-						for(int k = 0; k < count; k++)
-						{
-							if(k != 0)
-							{
-								nsName += ",";
-							}
-							nameId = readU32();
-							final Multiname typeArgName = names[nameId];
-							String typeArgNameString;
-
-							if(processor instanceof AS3InterfaceDumper)
-							{
-								final boolean vector = typeArgName.hasNotEmptyNs() && typeArgName.nsset[0].equals("__AS3__.vec");
-								typeArgNameString = vector ? typeArgName.name : typeArgName.toString();
-								typeArgNameString = typeArgNameString.replaceAll("::", ".") + (vector ? " " : "");
-							}
-							else
-							{
-								typeArgNameString = typeArgName.toString();
-							}
-							nsName += typeArgNameString;
-						}
-
-						nsName += ">";
-					}
-
-					final int index = nsName.indexOf("::");
-
-					names[i] = new Multiname(new String[]{index != -1 ? nsName.substring(0, index) : ""}, index != -1 ? nsName.substring(index + 2) : nsName);
-					break;
-
-				default:
-					throw new Error("invalid kind " + data.getByte(data.getPosition() - 1));
-			}
-		}
-
-		reportAboutPercentage("Cpool names count " + n + " size ", data, start, processor);
-		start = data.getPosition();
-
-		namespaces[0] = publicNs;
-		strings[0] = "*";
-	}
-
-	void parseMethodInfos()
-	{
-		int start = data.getPosition();
-		names[0] = new Multiname(new String[]{publicNs}, "*");
-		int method_count = readU32();
-		methods = new MethodInfo[method_count];
-
-		for(int i = 0; i < method_count; i++)
-		{
-			MethodInfo m = methods[i] = new MethodInfo();
-			int param_count = readU32();
-			m.returnType = names[readU32()];
-			m.paramTypes = new Multiname[param_count];
-			for(int j = 0; j < param_count; j++)
-			{
-				m.paramTypes[j] = names[readU32()];
-			}
-			m.debugName = strings[readU32()];
-			m.flags = data.readByte();
-
-			if((m.flags & HAS_OPTIONAL) != 0)
-			{
-				// has_optional
-				int optional_count = readU32();
-				m.optionalValues = new Multiname[param_count];
-				for(int k = param_count - optional_count; k < param_count; ++k)
-				{
-					int index = readU32();    // optional value index
-					int kind = data.readByte(); // kind byte for each default value
-
-					if(index == 0)
-					{
-						// kind is ignored, default value is based on type
-						@NonNls String value;
-						final @NonNls String type = m.paramTypes[k].toString();
-
-						if("Number".equals(type) || "decimal".equals(type))
-						{
-							value = "0";
-						}
-						else if("*".equals(type))
-						{
-							value = "null";
-						}
-						else if("String".equals(type))
-						{
-							value = "";
-						}
-						else
-						{
-							value = "null";
-						}
-						m.optionalValues[k] = new Multiname(null, value);
-					}
-					else
-					{
-						if(defaults[kind] == null)
-						{
-							processor.hasError("ERROR kind=" + kind + " method_id " + i + "\n");
-						}
-						else
-						{
-							m.optionalValues[k] = new Multiname(null, defaults[kind][index].toString());
-						}
-					}
-				}
-			}
-			if((m.flags & HAS_ParamNames) != 0)
-			{
-				m.paramNames = new String[param_count];
-				for(int k = 0; k < param_count; ++k)
-				{
-					final int index = readU32();
-					final String name = strings[index];
-					m.paramNames[k] = StringUtil.isJavaIdentifier(name) ? name : "_" + index;
-				}
-			}
-
-			if((m.flags & NEED_REST) != 0)
-			{
-				m.paramTypes = ArrayUtil.append(m.paramTypes, new Multiname(null, "..."));
-
-				if(m.paramNames != null)
-				{
-					m.paramNames = ArrayUtil.append(m.paramNames, "__rest");
-				}
-			}
-		}
-
-		reportAboutPercentage("MethodInfo count " + method_count + " size ", data, start, processor);
-	}
-
-	void parseMetadataInfos()
-	{
-		int count = readU32();
-		metadata = new MetaData[count];
-		for(int i = 0; i < count; i++)
-		{
-			// MetadataInfo
-			MetaData m = metadata[i] = new MetaData();
-			m.name = strings[readU32()];
-			int values_count = readU32();
-			String names[] = new String[values_count];
-
-			for(int q = 0; q < values_count; ++q)
-			{
-				names[q] = strings[readU32()]; // name
-			}
-			for(int q = 0; q < values_count; ++q)
-			{
-				m.put(names[q], strings[readU32()]); // value
-			}
-		}
-	}
-
-	void parseInstanceInfos()
-	{
-		int start = data.getPosition();
-		int count = readU32();
-		instances = new Traits[count];
-		for(int i = 0; i < count; i++)
-		{
-			Traits t = instances[i] = new Traits();
-			t.name = names[readU32()];
-			t.base = names[readU32()];
-			t.flags = data.readByte();
-
-			if((t.flags & CLASS_FLAG_protected) != 0)
-			{
-				t.protectedNs = namespaces[readU32()];
-			}
-
-			int interface_count = readU32();
-			t.interfaces = new Multiname[interface_count];
-			for(int j = 0; j < interface_count; j++)
-			{
-				t.interfaces[j] = names[readU32()];
-			}
-			MethodInfo m = t.init = methods[readU32()];
-			m.name = ((Multiname) t.name);
-			m.kind = TRAIT_Method;
-			m.id = -1;
-			m.parentTraits = t;
-			parseTraits(t);
-		}
-
-		reportAboutPercentage("InstanceInfo size ", data, start, processor);
-	}
-
-	void parseTraits(Traits t)
-	{
-		int namecount = readU32();
-		for(int i = 0; i < namecount; i++)
-		{
-			Multiname name = names[readU32()];
-			int tag = data.readByte();
-			int kind = tag & 0xf;
-			MemberInfo member = null;
-
-			switch(kind)
-			{
-				case TRAIT_Slot:
-				case TRAIT_Const:
-				case TRAIT_Class:
-					SlotInfo slot = new SlotInfo();
-					member = slot;
-					slot.id = readU32();
-					t.slots.put(slot.id, slot);
-					if(kind == TRAIT_Slot || kind == TRAIT_Const)
-					{
-						slot.type = names[readU32()];
-						int index = readU32();
-						if(index > 0)
-						{
-							slot.value = defaults[data.readByte()][index];
-						}
-					}
-					else // (kind == TRAIT_Class)
-					{
-						slot.value = classes[readU32()];
-					}
-					break;
-				case TRAIT_Method:
-				case TRAIT_Getter:
-				case TRAIT_Setter:
-					int disp_id = readU32();
-					MethodInfo method = methods[readU32()];
-					member = method;
-					t.methods.put(disp_id, method);
-					method.id = disp_id;
-					//sb.append("\t",traitKinds[kind],name,disp_id,method,"// disp_id", disp_id)
-					break;
-			}
-			if(member == null)
-			{
-				processor.hasError("error trait kind " + kind + "\n");
-			}
-			member.kind = kind;
-			member.name = name;
-			t.members.put(i, member);
-			t.names.put(name.toString(), member);
-			member.parentTraits = t;
-
-			final int val = tag >> 4;
-			if((val & ATTR_metadata) != 0)
-			{
-				int mdCount = readU32();
-				member.metadata = new MetaData[mdCount];
-				for(int j = 0; j < mdCount; ++j)
-				{
-					member.metadata[j] = metadata[readU32()];
-				}
-			}
-
-			if((val & ATTR_final) != 0)
-			{
-				member.isFinal = true;
-			}
-
-			if((val & ATTR_public) != 0)
-			{
-				member.isPublic = true;
-			}
-
-			if((val & ATTR_override) != 0)
-			{
-				member.isOverride = true;
-			}
-		}
-	}
-
-	void parseClassInfos()
-	{
-		int start = data.getPosition();
-		int count = instances.length;
-		classes = new Traits[count];
-		for(int i = 0; i < count; i++)
-		{
-			Traits t = classes[i] = new Traits();
-			t.init = methods[readU32()];
-			t.base = new Multiname(null, "Class");
-			t.itraits = instances[i];
-			t.name = t.itraits.name + $;
-			t.init.parentTraits = t;
-			t.init.name = new Multiname(null, t.itraits.name + $CINIT);
-			t.init.kind = TRAIT_Method;
-			parseTraits(t);
-		}
-		reportAboutPercentage("ClassInfo size ", data, start, processor);
-	}
-
-	void parseScriptInfos()
-	{
-		int start = data.getPosition();
-		int count = readU32();
-		scripts = new Traits[count];
-
-		for(int i = 0; i < count; i++)
-		{
-			Traits t = new Traits();
-			scripts[i] = t;
-			t.name = "script" + i;
-			t.base = names[0]; // Object
-			t.init = methods[readU32()];
-			t.init.name = new Multiname(null, t.name + "$init");
-			t.init.kind = TRAIT_Method;
-			t.init.parentTraits = t;
-			parseTraits(t);
-		}
-
-		reportAboutPercentage("ScriptInfo size ", data, start, processor);
-	}
-
-	void parseMethodBodies()
-	{
-		int start = data.getPosition();
-		int count = readU32();
-
-		for(int i = 0; i < count; i++)
-		{
-			MethodInfo m = methods[readU32()];
-			m.max_stack = readU32();
-			m.local_count = readU32();
-			int initScopeDepth = readU32();
-			int maxScopeDepth = readU32();
-			m.max_scope = maxScopeDepth - initScopeDepth;
-			int code_length = readU32();
-			m.code = new ByteBuffer();
-			m.code.setLittleEndian();
-
-			if(code_length > 0)
-			{
-				data.readBytes(m.code, code_length);
-			}
-
-			int ex_count = readU32();
-			for(int j = 0; j < ex_count; j++)
-			{
-				int from = readU32();
-				int to = readU32();
-				int target = readU32();
-				Multiname type = names[readU32()];
-				//sb.append("magic " + magic.toString(16))
-				//if (magic >= (46<<16|16))
-				Multiname name = names[readU32()];
-			}
-			parseTraits(m.activation = new Traits());
-		}
-
-		reportAboutPercentage("MethodBodies size ", data, start, processor);
-	}
-
-	private static void reportAboutPercentage(String s, ByteBuffer data, int start, @Nonnull FlexByteCodeInformationProcessor processor)
-	{
-		processor.dumpStat(s + (data.getPosition() - start) + " " + (int) 100f * (data.getPosition() - start) / data.bytesSize() + " %\n");
-	}
+class Abc {
+    static final
+    @NonNls
+    String TAB = "  ";
+    @NonNls
+    static final String $CINIT = "$cinit";
+    @NonNls
+    static final String $ = "$";
+
+    private static final int ATTR_final = 0x01; // 1=final, 0=virtual
+    private static final int ATTR_override = 0x02; // 1=override, 0=new
+    private static final int ATTR_metadata = 0x04; // 1=has metadata, 0=no metadata
+    private static final int ATTR_public = 0x08; // 1=add public namespace
+
+    static final int CLASS_FLAG_sealed = 0x01;
+    static final int CLASS_FLAG_final = 0x02;
+    static final int CLASS_FLAG_interface = 0x04;
+    static final int CLASS_FLAG_protected = 0x08;
+
+
+    // method flags
+    private static final int NEED_ARGUMENTS = 0x01;
+    static final int NEED_ACTIVATION = 0x02;
+    private static final int NEED_REST = 0x04;
+    private static final int HAS_OPTIONAL = 0x08;
+    private static final int IGNORE_REST = 0x10;
+    static final int NATIVE = 0x20;
+    private static final int HAS_ParamNames = 0x80;
+
+    private static final int CONSTANT_Utf8 = 0x01;
+    private static final int CONSTANT_Int = 0x03;
+    private static final int CONSTANT_UInt = 0x04;
+    private static final int CONSTANT_PrivateNs = 0x05; // non-shared namespace
+    private static final int CONSTANT_Double = 0x06;
+    private static final int CONSTANT_Qname = 0x07; // o.ns::name, ct ns, ct name
+    private static final int CONSTANT_Namespace = 0x08;
+    private static final int CONSTANT_Multiname = 0x09; // o.name, ct nsset, ct name
+    private static final int CONSTANT_False = 0x0A;
+    private static final int CONSTANT_True = 0x0B;
+    private static final int CONSTANT_Null = 0x0C;
+    private static final int CONSTANT_QnameA = 0x0D; // o.@ns::name, ct ns, ct attr-name
+    private static final int CONSTANT_MultinameA = 0x0E; // o.@name, ct attr-name
+    private static final int CONSTANT_RTQname = 0x0F; // o.ns::name, rt ns, ct name
+    private static final int CONSTANT_RTQnameA = 0x10; // o.@ns::name, rt ns, ct attr-name
+    private static final int CONSTANT_RTQnameL = 0x11; // o.ns::[name], rt ns, rt name
+    private static final int CONSTANT_RTQnameLA = 0x12; // o.@ns::[name], rt ns, rt attr-name
+    private static final int CONSTANT_NameL = 0x13;    // o.[], ns=public implied, rt name
+    private static final int CONSTANT_NameLA = 0x14; // o.@[], ns=public implied, rt attr-name
+    private static final int CONSTANT_NamespaceSet = 0x15;
+    private static final int CONSTANT_PackageNs = 0x16;
+    private static final int CONSTANT_PackageInternalNs = 0x17;
+    private static final int CONSTANT_ProtectedNs = 0x18;
+    private static final int CONSTANT_StaticProtectedNs = 0x19;
+    private static final int CONSTANT_StaticProtectedNs2 = 0x1a;
+    private static final int CONSTANT_MultinameL = 0x1B;
+    private static final int CONSTANT_MultinameLA = 0x1C;
+    private static final int CONSTANT_TypeName = 0x1D;
+
+    static final
+    @NonNls
+    String[] constantKinds = {
+        "0",
+        "utf8",
+        "2",
+        "int",
+        "uint",
+        "private",
+        "double",
+        "qname",
+        "namespace",
+        "multiname",
+        "false",
+        "true",
+        "null",
+        "@qname",
+        "@multiname",
+        "rtqname",
+        "@rtqname",
+        "[qname]",
+        "@[qname]",
+        "[name]",
+        "@[name]",
+        "nsset"
+    };
+
+    static final int TRAIT_Slot = 0x00;
+    private static final int TRAIT_Method = 0x01;
+    private static final int TRAIT_Getter = 0x02;
+    private static final int TRAIT_Setter = 0x03;
+    private static final int TRAIT_Class = 0x04;
+    private static final int TRAIT_Function = 0x05;
+    static final int TRAIT_Const = 0x06;
+
+    static final
+    @NonNls
+    String[] traitKinds = {
+        "var",
+        "function",
+        "function get",
+        "function set",
+        "class",
+        "function",
+        "const"
+    };
+
+    private static final int OP_bkpt = 0x01;
+    private static final int OP_nop = 0x02;
+    private static final int OP_throw = 0x03;
+    static final int OP_getsuper = 0x04;
+    static final int OP_setsuper = 0x05;
+    private static final int OP_dxns = 0x06;
+    private static final int OP_dxnslate = 0x07;
+    static final int OP_kill = 0x08;
+    static final int OP_label = 0x09;
+    static final int OP_ifnlt = 0x0C;
+    static final int OP_ifnle = 0x0D;
+    static final int OP_ifngt = 0x0E;
+    static final int OP_ifnge = 0x0F;
+    static final int OP_jump = 0x10;
+    static final int OP_iftrue = 0x11;
+    static final int OP_iffalse = 0x12;
+    static final int OP_ifeq = 0x13;
+    static final int OP_ifne = 0x14;
+    static final int OP_iflt = 0x15;
+    static final int OP_ifle = 0x16;
+    static final int OP_ifgt = 0x17;
+    static final int OP_ifge = 0x18;
+    static final int OP_ifstricteq = 0x19;
+    static final int OP_ifstrictne = 0x1A;
+    static final int OP_lookupswitch = 0x1B;
+    private static final int OP_pushwith = 0x1C;
+    private static final int OP_popscope = 0x1D;
+    private static final int OP_nextname = 0x1E;
+    private static final int OP_hasnext = 0x1F;
+    private static final int OP_pushnull = 0x20;
+    private static final int OP_pushundefined = 0x21;
+    private static final int OP_pushconstant = 0x22;
+    private static final int OP_nextvalue = 0x23;
+    static final int OP_pushbyte = 0x24;
+    static final int OP_pushshort = 0x25;
+    private static final int OP_pushtrue = 0x26;
+    private static final int OP_pushfalse = 0x27;
+    private static final int OP_pushnan = 0x28;
+    private static final int OP_pop = 0x29;
+    private static final int OP_dup = 0x2A;
+    private static final int OP_swap = 0x2B;
+    static final int OP_pushstring = 0x2C;
+    static final int OP_pushint = 0x2D;
+    static final int OP_pushuint = 0x2E;
+    static final int OP_pushdouble = 0x2F;
+    private static final int OP_pushscope = 0x30;
+    static final int OP_pushnamespace = 0x31;
+    static final int OP_hasnext2 = 0x32;
+    static final int OP_newfunction = 0x40;
+    static final int OP_call = 0x41;
+    static final int OP_construct = 0x42;
+    private static final int OP_callmethod = 0x43;
+    static final int OP_callstatic = 0x44;
+    static final int OP_callsuper = 0x45;
+    static final int OP_callproperty = 0x46;
+    private static final int OP_returnvoid = 0x47;
+    private static final int OP_returnvalue = 0x48;
+    static final int OP_constructsuper = 0x49;
+    static final int OP_constructprop = 0x4A;
+    private static final int OP_callsuperid = 0x4B;
+    static final int OP_callproplex = 0x4C;
+    private static final int OP_callinterface = 0x4D;
+    static final int OP_callsupervoid = 0x4E;
+    static final int OP_callpropvoid = 0x4F;
+    private static final int OP_applytype = 0x53;
+    static final int OP_newobject = 0x55;
+    static final int OP_newarray = 0x56;
+    private static final int OP_newactivation = 0x57;
+    static final int OP_newclass = 0x58;
+    static final int OP_getdescendants = 0x59;
+    static final int OP_newcatch = 0x5A;
+    static final int OP_findpropstrict = 0x5D;
+    static final int OP_findproperty = 0x5E;
+    static final int OP_finddef = 0x5F;
+    static final int OP_getlex = 0x60;
+    static final int OP_setproperty = 0x61;
+    static final int OP_getlocal = 0x62;
+    static final int OP_setlocal = 0x63;
+    private static final int OP_getglobalscope = 0x64;
+    static final int OP_getscopeobject = 0x65;
+    static final int OP_getproperty = 0x66;
+    private static final int OP_getouterscope = 0x67;
+    static final int OP_initproperty = 0x68;
+    private static final int OP_setpropertylate = 0x69;
+    static final int OP_deleteproperty = 0x6A;
+    private static final int OP_deletepropertylate = 0x6B;
+    static final int OP_getslot = 0x6C;
+    static final int OP_setslot = 0x6D;
+    static final int OP_getglobalslot = 0x6E;
+    static final int OP_setglobalslot = 0x6F;
+    private static final int OP_convert_s = 0x70;
+    private static final int OP_esc_xelem = 0x71;
+    private static final int OP_esc_xattr = 0x72;
+    private static final int OP_convert_i = 0x73;
+    private static final int OP_convert_u = 0x74;
+    private static final int OP_convert_d = 0x75;
+    private static final int OP_convert_b = 0x76;
+    private static final int OP_convert_o = 0x77;
+    static final int OP_coerce = 0x80;
+    private static final int OP_coerce_b = 0x81;
+    private static final int OP_coerce_a = 0x82;
+    private static final int OP_coerce_i = 0x83;
+    private static final int OP_coerce_d = 0x84;
+    private static final int OP_coerce_s = 0x85;
+    static final int OP_astype = 0x86;
+    private static final int OP_astypelate = 0x87;
+    private static final int OP_coerce_u = 0x88;
+    private static final int OP_coerce_o = 0x89;
+    private static final int OP_negate = 0x90;
+    private static final int OP_increment = 0x91;
+    static final int OP_inclocal = 0x92;
+    private static final int OP_decrement = 0x93;
+    static final int OP_declocal = 0x94;
+    private static final int OP_typeof = 0x95;
+    private static final int OP_not = 0x96;
+    private static final int OP_bitnot = 0x97;
+    private static final int OP_concat = 0x9A;
+    private static final int OP_add_d = 0x9B;
+    private static final int OP_add = 0xA0;
+    private static final int OP_subtract = 0xA1;
+    private static final int OP_multiply = 0xA2;
+    private static final int OP_divide = 0xA3;
+    private static final int OP_modulo = 0xA4;
+    private static final int OP_lshift = 0xA5;
+    private static final int OP_rshift = 0xA6;
+    private static final int OP_urshift = 0xA7;
+    private static final int OP_bitand = 0xA8;
+    private static final int OP_bitor = 0xA9;
+    private static final int OP_bitxor = 0xAA;
+    private static final int OP_equals = 0xAB;
+    private static final int OP_strictequals = 0xAC;
+    private static final int OP_lessthan = 0xAD;
+    private static final int OP_lessequals = 0xAE;
+    private static final int OP_greaterthan = 0xAF;
+    private static final int OP_greaterequals = 0xB0;
+    private static final int OP_instanceof = 0xB1;
+    static final int OP_istype = 0xB2;
+    private static final int OP_istypelate = 0xB3;
+    private static final int OP_in = 0xB4;
+    private static final int OP_increment_i = 0xC0;
+    private static final int OP_decrement_i = 0xC1;
+    static final int OP_inclocal_i = 0xC2;
+    static final int OP_declocal_i = 0xC3;
+    private static final int OP_negate_i = 0xC4;
+    private static final int OP_add_i = 0xC5;
+    private static final int OP_subtract_i = 0xC6;
+    private static final int OP_multiply_i = 0xC7;
+    private static final int OP_getlocal0 = 0xD0;
+    private static final int OP_getlocal1 = 0xD1;
+    private static final int OP_getlocal2 = 0xD2;
+    private static final int OP_getlocal3 = 0xD3;
+    private static final int OP_setlocal0 = 0xD4;
+    private static final int OP_setlocal1 = 0xD5;
+    private static final int OP_setlocal2 = 0xD6;
+    private static final int OP_setlocal3 = 0xD7;
+    static final int OP_debug = 0xEF;
+    static final int OP_debugline = 0xF0;
+    static final int OP_debugfile = 0xF1;
+    private static final int OP_bkptline = 0xF2;
+
+    static final
+    @NonNls
+    String[] opNames = {
+        "OP_0x00       ",
+        "bkpt          ",
+        "nop           ",
+        "throw         ",
+        "getsuper      ",
+        "setsuper      ",
+        "dxns          ",
+        "dxnslate      ",
+        "kill          ",
+        "label         ",
+        "OP_0x0A       ",
+        "OP_0x0B       ",
+        "ifnlt         ",
+        "ifnle         ",
+        "ifngt         ",
+        "ifnge         ",
+        "jump          ",
+        "iftrue        ",
+        "iffalse       ",
+        "ifeq          ",
+        "ifne          ",
+        "iflt          ",
+        "ifle          ",
+        "ifgt          ",
+        "ifge          ",
+        "ifstricteq    ",
+        "ifstrictne    ",
+        "lookupswitch  ",
+        "pushwith      ",
+        "popscope      ",
+        "nextname      ",
+        "hasnext       ",
+        "pushnull      ",
+        "pushundefined ",
+        "pushconstant  ",
+        "nextvalue     ",
+        "pushbyte      ",
+        "pushshort     ",
+        "pushtrue      ",
+        "pushfalse     ",
+        "pushnan       ",
+        "pop           ",
+        "dup           ",
+        "swap          ",
+        "pushstring    ",
+        "pushint       ",
+        "pushuint      ",
+        "pushdouble    ",
+        "pushscope     ",
+        "pushnamespace ",
+        "hasnext2      ",
+        "OP_0x33       ",
+        "OP_0x34       ",
+        "OP_0x35       ",
+        "OP_0x36       ",
+        "OP_0x37       ",
+        "OP_0x38       ",
+        "OP_0x39       ",
+        "OP_0x3A       ",
+        "OP_0x3B       ",
+        "OP_0x3C       ",
+        "OP_0x3D       ",
+        "OP_0x3E       ",
+        "OP_0x3F       ",
+        "newfunction   ",
+        "call          ",
+        "construct     ",
+        "callmethod    ",
+        "callstatic    ",
+        "callsuper     ",
+        "callproperty  ",
+        "returnvoid    ",
+        "returnvalue   ",
+        "constructsuper",
+        "constructprop ",
+        "callsuperid   ",
+        "callproplex   ",
+        "callinterface ",
+        "callsupervoid ",
+        "callpropvoid  ",
+        "OP_0x50       ",
+        "OP_0x51       ",
+        "OP_0x52       ",
+        "applytype     ",
+        "OP_0x54       ",
+        "newobject     ",
+        "newarray      ",
+        "newactivation ",
+        "newclass      ",
+        "getdescendants",
+        "newcatch      ",
+        "OP_0x5B       ",
+        "OP_0x5C       ",
+        "findpropstrict",
+        "findproperty  ",
+        "finddef       ",
+        "getlex        ",
+        "setproperty   ",
+        "getlocal      ",
+        "setlocal      ",
+        "getglobalscope",
+        "getscopeobject",
+        "getproperty   ",
+        "getouterscope ",
+        "initproperty  ",
+        "OP_0x69       ",
+        "deleteproperty",
+        "OP_0x6A       ",
+        "getslot       ",
+        "setslot       ",
+        "getglobalslot ",
+        "setglobalslot ",
+        "convert_s     ",
+        "esc_xelem     ",
+        "esc_xattr     ",
+        "convert_i     ",
+        "convert_u     ",
+        "convert_d     ",
+        "convert_b     ",
+        "convert_o     ",
+        "checkfilter   ",
+        "OP_0x79       ",
+        "OP_0x7A       ",
+        "OP_0x7B       ",
+        "OP_0x7C       ",
+        "OP_0x7D       ",
+        "OP_0x7E       ",
+        "OP_0x7F       ",
+        "coerce        ",
+        "coerce_b      ",
+        "coerce_a      ",
+        "coerce_i      ",
+        "coerce_d      ",
+        "coerce_s      ",
+        "astype        ",
+        "astypelate    ",
+        "coerce_u      ",
+        "coerce_o      ",
+        "OP_0x8A       ",
+        "OP_0x8B       ",
+        "OP_0x8C       ",
+        "OP_0x8D       ",
+        "OP_0x8E       ",
+        "OP_0x8F       ",
+        "negate        ",
+        "increment     ",
+        "inclocal      ",
+        "decrement     ",
+        "declocal      ",
+        "typeof        ",
+        "not           ",
+        "bitnot        ",
+        "OP_0x98       ",
+        "OP_0x99       ",
+        "concat        ",
+        "add_d         ",
+        "OP_0x9C       ",
+        "OP_0x9D       ",
+        "OP_0x9E       ",
+        "OP_0x9F       ",
+        "add           ",
+        "subtract      ",
+        "multiply      ",
+        "divide        ",
+        "modulo        ",
+        "lshift        ",
+        "rshift        ",
+        "urshift       ",
+        "bitand        ",
+        "bitor         ",
+        "bitxor        ",
+        "equals        ",
+        "strictequals  ",
+        "lessthan      ",
+        "lessequals    ",
+        "greaterthan   ",
+        "greaterequals ",
+        "instanceof    ",
+        "istype        ",
+        "istypelate    ",
+        "in            ",
+        "OP_0xB5       ",
+        "OP_0xB6       ",
+        "OP_0xB7       ",
+        "OP_0xB8       ",
+        "OP_0xB9       ",
+        "OP_0xBA       ",
+        "OP_0xBB       ",
+        "OP_0xBC       ",
+        "OP_0xBD       ",
+        "OP_0xBE       ",
+        "OP_0xBF       ",
+        "increment_i   ",
+        "decrement_i   ",
+        "inclocal_i    ",
+        "declocal_i    ",
+        "negate_i      ",
+        "add_i         ",
+        "subtract_i    ",
+        "multiply_i    ",
+        "OP_0xC8       ",
+        "OP_0xC9       ",
+        "OP_0xCA       ",
+        "OP_0xCB       ",
+        "OP_0xCC       ",
+        "OP_0xCD       ",
+        "OP_0xCE       ",
+        "OP_0xCF       ",
+        "getlocal0     ",
+        "getlocal1     ",
+        "getlocal2     ",
+        "getlocal3     ",
+        "setlocal0     ",
+        "setlocal1     ",
+        "setlocal2     ",
+        "setlocal3     ",
+        "OP_0xD8       ",
+        "OP_0xD9       ",
+        "OP_0xDA       ",
+        "OP_0xDB       ",
+        "OP_0xDC       ",
+        "OP_0xDD       ",
+        "OP_0xDE       ",
+        "OP_0xDF       ",
+        "OP_0xE0       ",
+        "OP_0xE1       ",
+        "OP_0xE2       ",
+        "OP_0xE3       ",
+        "OP_0xE4       ",
+        "OP_0xE5       ",
+        "OP_0xE6       ",
+        "OP_0xE7       ",
+        "OP_0xE8       ",
+        "OP_0xE9       ",
+        "OP_0xEA       ",
+        "OP_0xEB       ",
+        "OP_0xEC       ",
+        "OP_0xED       ",
+        "OP_0xEE       ",
+        "debug         ",
+        "debugline     ",
+        "debugfile     ",
+        "bkptline      ",
+        "timestamp     ",
+        "OP_0xF4       ",
+        "verifypass    ",
+        "alloc         ",
+        "mark          ",
+        "wb            ",
+        "prologue      ",
+        "sendenter     ",
+        "doubletoatom  ",
+        "sweep         ",
+        "codegenop     ",
+        "verifyop      ",
+        "decode        "
+    };
+
+    private FlexByteCodeInformationProcessor processor;
+    int totalSize;
+    final int opSizes[] = new int[256];
+
+    public Abc(final @Nonnull ByteBuffer _data, @Nonnull FlexByteCodeInformationProcessor _processor) {
+        data = _data;
+        processor = _processor;
+
+        data.setPosition(0);
+        magic = data.readInt();
+
+        _processor.dumpStat("magic " + Integer.toString(magic, 16) + "\n");
+
+        if (magic != (46 << 16 | 14) && magic != (46 << 16 | 15) && magic != (46 << 16 | 16)) {
+            throw new Error("not an abc file.  magic=" + Integer.toString(magic, 16));
+        }
+
+        parseCpool();
+
+        defaults[CONSTANT_Utf8] = strings;
+        defaults[CONSTANT_Int] = ints;
+        defaults[CONSTANT_UInt] = uints;
+        defaults[CONSTANT_Double] = doubles;
+        defaults[CONSTANT_Int] = ints;
+        defaults[CONSTANT_False] = buildSparseArray(10, "false");
+        defaults[CONSTANT_True] = buildSparseArray(11, "true");
+        defaults[CONSTANT_Namespace] = namespaces;
+        defaults[CONSTANT_PrivateNs] = namespaces;
+        defaults[CONSTANT_PackageNs] = namespaces;
+        defaults[CONSTANT_PackageInternalNs] = namespaces;
+        defaults[CONSTANT_ProtectedNs] = namespaces;
+        defaults[CONSTANT_StaticProtectedNs] = namespaces;
+        defaults[CONSTANT_StaticProtectedNs2] = namespaces;
+        defaults[CONSTANT_Null] = buildSparseArray(12, "null");
+
+        parseMethodInfos();
+        parseMetadataInfos();
+        parseInstanceInfos();
+        parseClassInfos();
+        parseScriptInfos();
+        parseMethodBodies();
+    }
+
+    private static Object[] buildSparseArray(int index, @NonNls String s1) {
+        final Object[] result = new Object[index + 1];
+        result[index] = s1;
+        return result;
+    }
+
+    public void dump(String indent) {
+        for (Traits t : scripts) {
+            processor.dumpTopLevelTraits(this, t, indent);
+        }
+
+        for (MethodInfo m : methods) {
+            if (m.anon) {
+                processor.dumpToplevelAnonymousMethod(this, m);
+            }
+        }
+
+        processor.dumpStat("OPCODE\tSIZE\t% OF " + totalSize + "\n");
+        final Set<Integer> done = new HashSet<Integer>();
+        while (true) {
+            int max = -1;
+            int maxsize = 0;
+            for (int i = 0; i < 256; i++) {
+                if (opSizes[i] > maxsize && !done.contains(i)) {
+                    max = i;
+                    maxsize = opSizes[i];
+                }
+            }
+            if (max == -1) {
+                break;
+            }
+            done.add(max);
+            processor.dumpStat(opNames[max] + "\t" + opSizes[max] + "\t" + (int)(100f * opSizes[max] / totalSize) + "%\n");
+        }
+    }
+
+    private final ByteBuffer data;
+    int major;
+    int minor;
+
+    Integer[] ints;
+    Integer[] uints;
+    Double[] doubles;
+    @NonNls
+    String[] strings;
+    @NonNls
+    String[] namespaces;
+    @NonNls
+    String[][] nssets;
+    Multiname[] names;
+
+    final Object[][] defaults = new Object[Math.max(constantKinds.length, CONSTANT_MultinameLA + 1)][];
+
+    MethodInfo methods[];
+    Traits instances[];
+    Traits classes[];
+    Traits[] scripts;
+    MetaData metadata[];
+
+    @NonNls
+    String publicNs = "";
+    @NonNls
+    String anyNs = "*";
+
+    final int magic;
+
+    int readU32() {
+        return data.readU32();
+    }
+
+    void parseCpool() {
+        int i, j;
+        int n;
+        int start = data.getPosition();
+
+        // ints
+        n = readU32();
+        ints = new Integer[n > 0 ? n : 1];
+        ints[0] = 0;
+        for (i = 1; i < n; i++) {
+            ints[i] = readU32();
+        }
+
+        // uints
+        n = readU32();
+        uints = new Integer[n > 0 ? n : 1];
+        uints[0] = 0;
+        for (i = 1; i < n; i++) {
+            uints[i] = readU32();
+        }
+
+        // doubles
+        n = readU32();
+        doubles = new Double[n > 0 ? n : 1];
+        doubles[0] = Double.NaN;
+        for (i = 1; i < n; i++) {
+            doubles[i] = data.readDouble();
+        }
+
+        reportAboutPercentage("Cpool numbers size ", data, start, processor);
+        start = data.getPosition();
+
+        // strings
+        n = readU32();
+        strings = new String[n];
+        strings[0] = "";
+        for (i = 1; i < n; i++) {
+            strings[i] = data.readUTFBytes(readU32());
+        }
+
+        reportAboutPercentage("Cpool strings count " + n + " size ", data, start, processor);
+        start = data.getPosition();
+
+        // namespaces
+        n = readU32();
+        namespaces = new String[n];
+        namespaces[0] = publicNs;
+        for (i = 1; i < n; i++) {
+            switch (data.readByte()) {
+                case CONSTANT_Namespace:
+                case CONSTANT_PackageNs:
+                case CONSTANT_PackageInternalNs:
+                case CONSTANT_ProtectedNs:
+                case CONSTANT_StaticProtectedNs:
+                case CONSTANT_StaticProtectedNs2: {
+                    namespaces[i] = strings[readU32()];
+                    // todo mark kind of namespace.
+                    break;
+                }
+                case CONSTANT_PrivateNs:
+                    readU32();
+                    namespaces[i] = "private";
+                    break;
+            }
+        }
+
+        reportAboutPercentage("Cpool namespaces count " + n + " size ", data, start, processor);
+        start = data.getPosition();
+
+        // namespace sets
+        n = readU32();
+        nssets = new String[n][];
+        for (i = 1; i < n; i++) {
+            int count = readU32();
+            String[] nsset = nssets[i] = new String[count];
+            for (j = 0; j < count; j++) {
+                nsset[j] = namespaces[readU32()];
+            }
+        }
+
+        reportAboutPercentage("Cpool nssets count " + n + " size ", data, start, processor);
+        start = data.getPosition();
+
+        // multinames
+        n = readU32();
+        names = new Multiname[n];
+        namespaces[0] = anyNs;
+        strings[0] = "*"; // any name
+        for (i = 1; i < n; i++) {
+            switch (data.readByte()) {
+                case CONSTANT_Qname:
+                case CONSTANT_QnameA:
+                    names[i] = new Multiname(new String[]{namespaces[readU32()]}, strings[readU32()]);
+                    break;
+
+                case CONSTANT_RTQname:
+                case CONSTANT_RTQnameA:
+                    names[i] = new Multiname(new String[]{strings[readU32()]}, null);
+                    break;
+
+                case CONSTANT_RTQnameL:
+                case CONSTANT_RTQnameLA:
+                    names[i] = null;
+                    break;
+
+                case CONSTANT_NameL:
+                case CONSTANT_NameLA:
+                    names[i] = new Multiname(new String[]{""}, null);
+                    break;
+
+                case CONSTANT_Multiname:
+                case CONSTANT_MultinameA:
+                    String name = strings[readU32()];
+                    names[i] = new Multiname(nssets[readU32()], name);
+                    break;
+
+                case CONSTANT_MultinameL:
+                case CONSTANT_MultinameLA:
+                    names[i] = new Multiname(nssets[readU32()], null);
+                    break;
+
+                case CONSTANT_TypeName:
+                    // TODO:
+                    int nameId = readU32();
+                    String nsName = names[nameId].toString();
+
+                    int count = readU32();
+
+                    if (count > 0) {
+                        nsName += "<";
+                        for (int k = 0; k < count; k++) {
+                            if (k != 0) {
+                                nsName += ",";
+                            }
+                            nameId = readU32();
+                            final Multiname typeArgName = names[nameId];
+                            String typeArgNameString;
+
+                            if (processor instanceof AS3InterfaceDumper) {
+                                final boolean vector = typeArgName.hasNotEmptyNs() && typeArgName.nsset[0].equals("__AS3__.vec");
+                                typeArgNameString = vector ? typeArgName.name : typeArgName.toString();
+                                typeArgNameString = typeArgNameString.replaceAll("::", ".") + (vector ? " " : "");
+                            }
+                            else {
+                                typeArgNameString = typeArgName.toString();
+                            }
+                            nsName += typeArgNameString;
+                        }
+
+                        nsName += ">";
+                    }
+
+                    final int index = nsName.indexOf("::");
+
+                    names[i] = new Multiname(
+                        new String[]{index != -1 ? nsName.substring(0, index) : ""},
+                        index != -1 ? nsName.substring(index + 2) : nsName
+                    );
+                    break;
+
+                default:
+                    throw new Error("invalid kind " + data.getByte(data.getPosition() - 1));
+            }
+        }
+
+        reportAboutPercentage("Cpool names count " + n + " size ", data, start, processor);
+        start = data.getPosition();
+
+        namespaces[0] = publicNs;
+        strings[0] = "*";
+    }
+
+    void parseMethodInfos() {
+        int start = data.getPosition();
+        names[0] = new Multiname(new String[]{publicNs}, "*");
+        int method_count = readU32();
+        methods = new MethodInfo[method_count];
+
+        for (int i = 0; i < method_count; i++) {
+            MethodInfo m = methods[i] = new MethodInfo();
+            int param_count = readU32();
+            m.returnType = names[readU32()];
+            m.paramTypes = new Multiname[param_count];
+            for (int j = 0; j < param_count; j++) {
+                m.paramTypes[j] = names[readU32()];
+            }
+            m.debugName = strings[readU32()];
+            m.flags = data.readByte();
+
+            if ((m.flags & HAS_OPTIONAL) != 0) {
+                // has_optional
+                int optional_count = readU32();
+                m.optionalValues = new Multiname[param_count];
+                for (int k = param_count - optional_count; k < param_count; ++k) {
+                    int index = readU32();    // optional value index
+                    int kind = data.readByte(); // kind byte for each default value
+
+                    if (index == 0) {
+                        // kind is ignored, default value is based on type
+                        @NonNls String value;
+                        final @NonNls String type = m.paramTypes[k].toString();
+
+                        if ("Number".equals(type) || "decimal".equals(type)) {
+                            value = "0";
+                        }
+                        else if ("*".equals(type)) {
+                            value = "null";
+                        }
+                        else if ("String".equals(type)) {
+                            value = "";
+                        }
+                        else {
+                            value = "null";
+                        }
+                        m.optionalValues[k] = new Multiname(null, value);
+                    }
+                    else {
+                        if (defaults[kind] == null) {
+                            processor.hasError("ERROR kind=" + kind + " method_id " + i + "\n");
+                        }
+                        else {
+                            m.optionalValues[k] = new Multiname(null, defaults[kind][index].toString());
+                        }
+                    }
+                }
+            }
+            if ((m.flags & HAS_ParamNames) != 0) {
+                m.paramNames = new String[param_count];
+                for (int k = 0; k < param_count; ++k) {
+                    final int index = readU32();
+                    final String name = strings[index];
+                    m.paramNames[k] = StringUtil.isJavaIdentifier(name) ? name : "_" + index;
+                }
+            }
+
+            if ((m.flags & NEED_REST) != 0) {
+                m.paramTypes = ArrayUtil.append(m.paramTypes, new Multiname(null, "..."));
+
+                if (m.paramNames != null) {
+                    m.paramNames = ArrayUtil.append(m.paramNames, "__rest");
+                }
+            }
+        }
+
+        reportAboutPercentage("MethodInfo count " + method_count + " size ", data, start, processor);
+    }
+
+    void parseMetadataInfos() {
+        int count = readU32();
+        metadata = new MetaData[count];
+        for (int i = 0; i < count; i++) {
+            // MetadataInfo
+            MetaData m = metadata[i] = new MetaData();
+            m.name = strings[readU32()];
+            int values_count = readU32();
+            String names[] = new String[values_count];
+
+            for (int q = 0; q < values_count; ++q) {
+                names[q] = strings[readU32()]; // name
+            }
+            for (int q = 0; q < values_count; ++q) {
+                m.put(names[q], strings[readU32()]); // value
+            }
+        }
+    }
+
+    void parseInstanceInfos() {
+        int start = data.getPosition();
+        int count = readU32();
+        instances = new Traits[count];
+        for (int i = 0; i < count; i++) {
+            Traits t = instances[i] = new Traits();
+            t.name = names[readU32()];
+            t.base = names[readU32()];
+            t.flags = data.readByte();
+
+            if ((t.flags & CLASS_FLAG_protected) != 0) {
+                t.protectedNs = namespaces[readU32()];
+            }
+
+            int interface_count = readU32();
+            t.interfaces = new Multiname[interface_count];
+            for (int j = 0; j < interface_count; j++) {
+                t.interfaces[j] = names[readU32()];
+            }
+            MethodInfo m = t.init = methods[readU32()];
+            m.name = ((Multiname)t.name);
+            m.kind = TRAIT_Method;
+            m.id = -1;
+            m.parentTraits = t;
+            parseTraits(t);
+        }
+
+        reportAboutPercentage("InstanceInfo size ", data, start, processor);
+    }
+
+    void parseTraits(Traits t) {
+        int namecount = readU32();
+        for (int i = 0; i < namecount; i++) {
+            Multiname name = names[readU32()];
+            int tag = data.readByte();
+            int kind = tag & 0xf;
+            MemberInfo member = null;
+
+            switch (kind) {
+                case TRAIT_Slot:
+                case TRAIT_Const:
+                case TRAIT_Class:
+                    SlotInfo slot = new SlotInfo();
+                    member = slot;
+                    slot.id = readU32();
+                    t.slots.put(slot.id, slot);
+                    if (kind == TRAIT_Slot || kind == TRAIT_Const) {
+                        slot.type = names[readU32()];
+                        int index = readU32();
+                        if (index > 0) {
+                            slot.value = defaults[data.readByte()][index];
+                        }
+                    }
+                    else // (kind == TRAIT_Class)
+                    {
+                        slot.value = classes[readU32()];
+                    }
+                    break;
+                case TRAIT_Method:
+                case TRAIT_Getter:
+                case TRAIT_Setter:
+                    int disp_id = readU32();
+                    MethodInfo method = methods[readU32()];
+                    member = method;
+                    t.methods.put(disp_id, method);
+                    method.id = disp_id;
+                    //sb.append("\t",traitKinds[kind],name,disp_id,method,"// disp_id", disp_id)
+                    break;
+            }
+            if (member == null) {
+                processor.hasError("error trait kind " + kind + "\n");
+            }
+            member.kind = kind;
+            member.name = name;
+            t.members.put(i, member);
+            t.names.put(name.toString(), member);
+            member.parentTraits = t;
+
+            final int val = tag >> 4;
+            if ((val & ATTR_metadata) != 0) {
+                int mdCount = readU32();
+                member.metadata = new MetaData[mdCount];
+                for (int j = 0; j < mdCount; ++j) {
+                    member.metadata[j] = metadata[readU32()];
+                }
+            }
+
+            if ((val & ATTR_final) != 0) {
+                member.isFinal = true;
+            }
+
+            if ((val & ATTR_public) != 0) {
+                member.isPublic = true;
+            }
+
+            if ((val & ATTR_override) != 0) {
+                member.isOverride = true;
+            }
+        }
+    }
+
+    void parseClassInfos() {
+        int start = data.getPosition();
+        int count = instances.length;
+        classes = new Traits[count];
+        for (int i = 0; i < count; i++) {
+            Traits t = classes[i] = new Traits();
+            t.init = methods[readU32()];
+            t.base = new Multiname(null, "Class");
+            t.itraits = instances[i];
+            t.name = t.itraits.name + $;
+            t.init.parentTraits = t;
+            t.init.name = new Multiname(null, t.itraits.name + $CINIT);
+            t.init.kind = TRAIT_Method;
+            parseTraits(t);
+        }
+        reportAboutPercentage("ClassInfo size ", data, start, processor);
+    }
+
+    void parseScriptInfos() {
+        int start = data.getPosition();
+        int count = readU32();
+        scripts = new Traits[count];
+
+        for (int i = 0; i < count; i++) {
+            Traits t = new Traits();
+            scripts[i] = t;
+            t.name = "script" + i;
+            t.base = names[0]; // Object
+            t.init = methods[readU32()];
+            t.init.name = new Multiname(null, t.name + "$init");
+            t.init.kind = TRAIT_Method;
+            t.init.parentTraits = t;
+            parseTraits(t);
+        }
+
+        reportAboutPercentage("ScriptInfo size ", data, start, processor);
+    }
+
+    void parseMethodBodies() {
+        int start = data.getPosition();
+        int count = readU32();
+
+        for (int i = 0; i < count; i++) {
+            MethodInfo m = methods[readU32()];
+            m.max_stack = readU32();
+            m.local_count = readU32();
+            int initScopeDepth = readU32();
+            int maxScopeDepth = readU32();
+            m.max_scope = maxScopeDepth - initScopeDepth;
+            int code_length = readU32();
+            m.code = new ByteBuffer();
+            m.code.setLittleEndian();
+
+            if (code_length > 0) {
+                data.readBytes(m.code, code_length);
+            }
+
+            int ex_count = readU32();
+            for (int j = 0; j < ex_count; j++) {
+                int from = readU32();
+                int to = readU32();
+                int target = readU32();
+                Multiname type = names[readU32()];
+                //sb.append("magic " + magic.toString(16))
+                //if (magic >= (46<<16|16))
+                Multiname name = names[readU32()];
+            }
+            parseTraits(m.activation = new Traits());
+        }
+
+        reportAboutPercentage("MethodBodies size ", data, start, processor);
+    }
+
+    private static void reportAboutPercentage(String s, ByteBuffer data, int start, @Nonnull FlexByteCodeInformationProcessor processor) {
+        processor.dumpStat(s + (data.getPosition() - start) + " " + (int)100f * (data.getPosition() - start) / data.bytesSize() + " %\n");
+    }
 
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
index e684bec6..1a724ff5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
@@ -21,142 +21,129 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:02:22 PM
+ * Date: Oct 20, 2008
+ * Time: 7:02:22 PM
  */
-class AbcDumper extends AbstractDumpProcessor
-{
-	private boolean dumpCode;
-
-	public AbcDumper(final boolean _dumpCode)
-	{
-		dumpCode = _dumpCode;
-	}
-
-	@Override
-	public void dumpStat(@Nonnull final String stat)
-	{
-		sb.append(stat);
-	}
-
-	@Override
-	public void hasError(@Nonnull final String error)
-	{
-		sb.append(error);
-	}
-
-	@Override
-	protected String appendModifiers(MemberInfo member, String attr)
-	{
-		attr += (member instanceof MethodInfo && (((MethodInfo) member).flags & Abc.NATIVE) != 0 ? "native " : "");
-		return attr;
-	}
-
-	@Override
-	public void processMultinameAsPackageName(@Nonnull final Multiname name, @Nullable final String parentName, final boolean referenceNameRequested)
-	{
-		append(name.toString());
-	}
-
-	@Override
-	public void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m)
-	{
-		m.dump(abc, "", "", this);
-	}
-
-	@Override
-	public void dumpTopLevelTraits(final Abc abc, final @Nonnull Traits t, final String indent)
-	{
-		sb.append(indent + t.name + "\n");
-		t.dump(abc, indent, "", this);
-		t.init.dump(abc, indent, "", this);
-	}
-
-	@Override
-	public boolean doDumpMember(final @Nonnull MemberInfo memberInfo)
-	{
-		return true;
-	}
-
-	@Override
-	public void appendMethodSeparator()
-	{
-		append("\n");
-	}
-
-	@Override
-	public void appendFieldSeparator()
-	{
-		append("");
-	}
-
-	@Override
-	public String getAbcInSwfIndent()
-	{
-		return "  ";
-	}
-
-	@Override
-	public void processValue(final Multiname type, final Object value)
-	{
-		append(" = " + String.valueOf(value instanceof String ? ('"' + value.toString() + '"') : value));
-	}
-
-	@Override
-	public boolean doDumpMetaData(final @Nonnull MetaData md)
-	{
-		return true;
-	}
-
-	@Override
-	public void processParameter(@Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest)
-	{
-		processMultinameAsPackageName(type, parentName, true);
-	}
-
-	@Override
-	public boolean doStarTypeDumpInExtends()
-	{
-		return true;
-	}
-
-	@Override
-	public boolean doStarMetaAttrNameDump()
-	{
-		return true;
-	}
-
-	@Override
-	public void setProcessingInterface(final boolean anInterface)
-	{
-	}
-
-	@Override
-	protected boolean dumpRestParameter()
-	{
-		return false;
-	}
-
-	@Override
-	public void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr)
-	{
-		super.processFunction(methodInfo, referenceNameRequested, abc, indent, attr);
-		append("\t/* disp_id " + methodInfo.id + "*/");
-
-		if(!referenceNameRequested)
-		{ // !verbose -> anonymouse
-			append("\n");
-			if(dumpCode && methodInfo.code != null)
-			{
-				methodInfo.dumpCode(abc, indent, this);
-			}
-		}
-	}
-
-	@Override
-	public void processVariable(SlotInfo info, String indent, String attr)
-	{
-		super.processVariable(info, indent, attr);
-		append("\t/* slot_id " + info.id + " */\n");
-	}
+class AbcDumper extends AbstractDumpProcessor {
+    private boolean dumpCode;
+
+    public AbcDumper(final boolean _dumpCode) {
+        dumpCode = _dumpCode;
+    }
+
+    @Override
+    public void dumpStat(@Nonnull final String stat) {
+        sb.append(stat);
+    }
+
+    @Override
+    public void hasError(@Nonnull final String error) {
+        sb.append(error);
+    }
+
+    @Override
+    protected String appendModifiers(MemberInfo member, String attr) {
+        attr += (member instanceof MethodInfo && (((MethodInfo)member).flags & Abc.NATIVE) != 0 ? "native " : "");
+        return attr;
+    }
+
+    @Override
+    public void processMultinameAsPackageName(
+        @Nonnull final Multiname name,
+        @Nullable final String parentName,
+        final boolean referenceNameRequested
+    ) {
+        append(name.toString());
+    }
+
+    @Override
+    public void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m) {
+        m.dump(abc, "", "", this);
+    }
+
+    @Override
+    public void dumpTopLevelTraits(final Abc abc, final @Nonnull Traits t, final String indent) {
+        sb.append(indent + t.name + "\n");
+        t.dump(abc, indent, "", this);
+        t.init.dump(abc, indent, "", this);
+    }
+
+    @Override
+    public boolean doDumpMember(final @Nonnull MemberInfo memberInfo) {
+        return true;
+    }
+
+    @Override
+    public void appendMethodSeparator() {
+        append("\n");
+    }
+
+    @Override
+    public void appendFieldSeparator() {
+        append("");
+    }
+
+    @Override
+    public String getAbcInSwfIndent() {
+        return "  ";
+    }
+
+    @Override
+    public void processValue(final Multiname type, final Object value) {
+        append(" = " + String.valueOf(value instanceof String ? ('"' + value.toString() + '"') : value));
+    }
+
+    @Override
+    public boolean doDumpMetaData(final @Nonnull MetaData md) {
+        return true;
+    }
+
+    @Override
+    public void processParameter(
+        @Nonnull String name,
+        @Nullable Multiname type,
+        String parentName,
+        @Nullable Multiname value,
+        boolean rest
+    ) {
+        processMultinameAsPackageName(type, parentName, true);
+    }
+
+    @Override
+    public boolean doStarTypeDumpInExtends() {
+        return true;
+    }
+
+    @Override
+    public boolean doStarMetaAttrNameDump() {
+        return true;
+    }
+
+    @Override
+    public void setProcessingInterface(final boolean anInterface) {
+    }
+
+    @Override
+    protected boolean dumpRestParameter() {
+        return false;
+    }
+
+    @Override
+    public void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr) {
+        super.processFunction(methodInfo, referenceNameRequested, abc, indent, attr);
+        append("\t/* disp_id " + methodInfo.id + "*/");
+
+        if (!referenceNameRequested) { // !verbose -> anonymouse
+            append("\n");
+            if (dumpCode && methodInfo.code != null) {
+                methodInfo.dumpCode(abc, indent, this);
+            }
+        }
+    }
+
+    @Override
+    public void processVariable(SlotInfo info, String indent, String attr) {
+        super.processVariable(info, indent, attr);
+        append("\t/* slot_id " + info.id + " */\n");
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
index 81f9de42..42fa8194 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
@@ -21,294 +21,252 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:02:13 PM
+ * Date: Oct 20, 2008
+ * Time: 7:02:13 PM
  */
-abstract class AbstractDumpProcessor implements FlexByteCodeInformationProcessor
-{
-	protected
-	@NonNls
-	StringBuilder sb = new StringBuilder();
-	private boolean firstMetaDataMember;
-
-	String getResult()
-	{
-		return sb.toString();
-	}
-
-	@Override
-	public void append(@Nonnull @NonNls String str)
-	{
-		sb.append(str);
-	}
-
-	@Override
-	public String getParentName(final MemberInfo member)
-	{
-		String parentName = null;
-
-		if(member.parentTraits != null)
-		{
-			if(member.parentTraits.name instanceof Multiname)
-			{
-				final Multiname multiname = (Multiname) member.parentTraits.name;
-
-				if(multiname.hasNamespace())
-				{
-					parentName = multiname.name;
-				}
-			}
-			if(parentName == null)
-			{
-				parentName = member.parentTraits.name.toString().replaceAll("::", ".");
-			}
-		}
-		return parentName;
-	}
-
-	public void addMetaDataValue(String s, String s1)
-	{
-		append(firstMetaDataMember ? "(" : ",");
-		firstMetaDataMember = false;
-		if(s != null)
-		{
-			append(s);
-			append("=");
-		}
-		append(s1);
-	}
-
-	@Override
-	public void processVariable(SlotInfo info, String indent, String attr)
-	{
-		appendFieldSeparator();
-
-		attr = appendModifiers(info, attr);
-		processModifierList(info, attr, indent);
-		append(indent + attr);
-		processMemberKindAndName(info);
-
-		append(":");
-		processMultinameAsPackageName(info.type, info.parentTraits.getClassName(), true);
-		if(info.value != null)
-		{
-			processValue(info.type, info.value);
-		}
-	}
-
-	@Override
-	public void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr)
-	{
-		if(!referenceNameRequested)
-		{
-			appendMethodSeparator();
-		}
-
-		attr = appendModifiers(methodInfo, attr);
-		processModifierList(methodInfo, attr, indent);
-
-		append(indent + attr);
-
-		processMemberKindAndName(methodInfo);
-		final String parentName = methodInfo.getParentName();
-		processArgumentList(methodInfo, parentName);
-		append(":");
-		processMultinameAsPackageName(methodInfo.returnType, parentName, referenceNameRequested);
-	}
-
-	protected void processMemberKindAndName(@Nonnull final MemberInfo member)
-	{
-		append(Abc.traitKinds[member.kind]);
-		append(" ");
-
-		if(member.name != null)
-		{
-			processMultinameAsPackageName(member.name, member.parentTraits.getClassName(), false);
-		}
-		else
-		{
-			append("undefined");
-		}
-	}
-
-	protected abstract String appendModifiers(MemberInfo methodInfo, String attr);
-
-	protected abstract void processValue(Multiname type, Object value);
-
-	protected void processArgumentList(MethodInfo methodInfo, String parentName)
-	{
-		append("(");
-
-		for(int i = 0; i < methodInfo.paramTypes.length; ++i)
-		{
-			final Multiname paramType = methodInfo.paramTypes[i];
-			final boolean restParameter = FlexByteCodeInformationProcessor.REST_PARAMETER_TYPE.equals(paramType.name);
-			if(restParameter && !dumpRestParameter())
-			{
-				break; // original one do not dump
-			}
-			if(i > 0)
-			{
-				append(",");
-			}
-
-			processParameter(methodInfo.paramNames != null ? methodInfo.paramNames[i] : "a" + (i > 0 ? "" + (i + 1) : ""), methodInfo.paramTypes[i],
-					parentName, methodInfo.optionalValues != null && i < methodInfo.optionalValues.length ? methodInfo.optionalValues[i] : null, restParameter);
-		}
-
-		append(")");
-	}
-
-	protected abstract boolean dumpRestParameter();
-
-	@Override
-	public void processMetadata(MetaData metaData)
-	{
-		append("[");
-		append(metaData.name);
-		firstMetaDataMember = true;
-
-		for(String n : metaData.keySet())
-		{
-			addMetaDataValue(!"*".equals(n) || doStarMetaAttrNameDump() ? n : null, '"' + metaData.get(n) + '"');
-		}
-
-		if(!firstMetaDataMember)
-		{
-			append(")");
-		}
-		append("]");
-	}
-
-	@Override
-	public void processClass(SlotInfo slotInfo, Abc abc, String attr, String indent)
-	{
-		append("\n");
-
-		@NonNls String def;
-		final boolean isInterface = slotInfo.isInterfaceClass();
-		if(isInterface)
-		{
-			def = "interface";
-		}
-		else
-		{
-			def = "class";
-		}
-
-		if(!doStarTypeDumpInExtends())
-		{
-			final String ns = slotInfo.name.hasNamespace() ? slotInfo.name.getNsName() : null;
-
-			if(ns != null && ns.length() > 0)
-			{
-				attr += ns;
-			}
-			else
-			{
-				attr += "public";
-			}
-			attr += " ";
-		}
-
-		Traits ct = (Traits) slotInfo.value;
-		Traits it = ct.itraits;
-		if(!isInterface)
-		{
-			if((it.flags & Abc.CLASS_FLAG_final) != 0)
-			{
-				attr += "final ";
-			}
-			if((it.flags & Abc.CLASS_FLAG_sealed) == 0)
-			{
-				attr += "dynamic ";
-			}
-		}
-
-		processModifierList(slotInfo, attr, indent);
-
-		append(indent + attr + def + " ");
-		processMultinameAsPackageName(slotInfo.name, null, true);
-		dumpExtendsList(it);
-
-		append("\n");
-		String oldindent = indent;
-		indent += Abc.TAB;
-
-		dumpInterfacesList(indent, it, isInterface);
-		append(oldindent + "{\n");
-		setProcessingInterface(isInterface);
-
-		it.init.dump(abc, indent, "", this);
-		it.dump(abc, indent, "", this);
-		ct.dump(abc, indent, "static ", this);
-		ct.init.dump(abc, indent, "static ", this);
-		append(oldindent + "}\n");
-		setProcessingInterface(false);
-	}
-
-	protected void processModifierList(MemberInfo memberInfo, String attr, String indent)
-	{
-		memberInfo.dumpMetaData(indent, this);
-	}
-
-	protected void dumpExtendsList(Traits it)
-	{
-		if(!it.base.isStarReference() || doStarTypeDumpInExtends())
-		{
-			append(" extends ");
-			processMultinameAsPackageName(it.base, null, true);
-		}
-	}
-
-	protected void dumpInterfacesList(String indent, Traits it, boolean anInterface)
-	{
-		if(it.interfaces.length > 0)
-		{
-			append(indent + (anInterface && this instanceof AS3InterfaceDumper ? "extends " : "implements "));
-			boolean first = true;
-
-			for(Multiname name : it.interfaces)
-			{
-				if(!first)
-				{
-					append(",");
-				}
-				first = false;
-				processMultinameAsPackageName(name, null, true);
-			}
-			append("\n");
-		}
-	}
-
-	protected static String quote(final String s)
-	{
-		if(s.length() == 0)
-		{
-			return s;
-		}
-		final StringBuilder b = new StringBuilder(s.length());
-
-		for(int i = 0; i < s.length(); ++i)
-		{
-			final char ch = s.charAt(i);
-
-			if(ch == '\\' || ch == '"')
-			{
-				b.append('\\');
-			}
-			else if(ch == '\n')
-			{
-				b.append("\\n");
-				continue;
-			}
-			else if(ch == '\r')
-			{
-				b.append("\\r");
-				continue;
-			}
-			b.append(ch);
-		}
-		return b.toString();
-	}
+abstract class AbstractDumpProcessor implements FlexByteCodeInformationProcessor {
+    protected
+    @NonNls
+    StringBuilder sb = new StringBuilder();
+    private boolean firstMetaDataMember;
+
+    String getResult() {
+        return sb.toString();
+    }
+
+    @Override
+    public void append(@Nonnull @NonNls String str) {
+        sb.append(str);
+    }
+
+    @Override
+    public String getParentName(final MemberInfo member) {
+        String parentName = null;
+
+        if (member.parentTraits != null) {
+            if (member.parentTraits.name instanceof Multiname) {
+                final Multiname multiname = (Multiname)member.parentTraits.name;
+
+                if (multiname.hasNamespace()) {
+                    parentName = multiname.name;
+                }
+            }
+            if (parentName == null) {
+                parentName = member.parentTraits.name.toString().replaceAll("::", ".");
+            }
+        }
+        return parentName;
+    }
+
+    public void addMetaDataValue(String s, String s1) {
+        append(firstMetaDataMember ? "(" : ",");
+        firstMetaDataMember = false;
+        if (s != null) {
+            append(s);
+            append("=");
+        }
+        append(s1);
+    }
+
+    @Override
+    public void processVariable(SlotInfo info, String indent, String attr) {
+        appendFieldSeparator();
+
+        attr = appendModifiers(info, attr);
+        processModifierList(info, attr, indent);
+        append(indent + attr);
+        processMemberKindAndName(info);
+
+        append(":");
+        processMultinameAsPackageName(info.type, info.parentTraits.getClassName(), true);
+        if (info.value != null) {
+            processValue(info.type, info.value);
+        }
+    }
+
+    @Override
+    public void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr) {
+        if (!referenceNameRequested) {
+            appendMethodSeparator();
+        }
+
+        attr = appendModifiers(methodInfo, attr);
+        processModifierList(methodInfo, attr, indent);
+
+        append(indent + attr);
+
+        processMemberKindAndName(methodInfo);
+        final String parentName = methodInfo.getParentName();
+        processArgumentList(methodInfo, parentName);
+        append(":");
+        processMultinameAsPackageName(methodInfo.returnType, parentName, referenceNameRequested);
+    }
+
+    protected void processMemberKindAndName(@Nonnull final MemberInfo member) {
+        append(Abc.traitKinds[member.kind]);
+        append(" ");
+
+        if (member.name != null) {
+            processMultinameAsPackageName(member.name, member.parentTraits.getClassName(), false);
+        }
+        else {
+            append("undefined");
+        }
+    }
+
+    protected abstract String appendModifiers(MemberInfo methodInfo, String attr);
+
+    protected abstract void processValue(Multiname type, Object value);
+
+    protected void processArgumentList(MethodInfo methodInfo, String parentName) {
+        append("(");
+
+        for (int i = 0; i < methodInfo.paramTypes.length; ++i) {
+            final Multiname paramType = methodInfo.paramTypes[i];
+            final boolean restParameter = FlexByteCodeInformationProcessor.REST_PARAMETER_TYPE.equals(paramType.name);
+            if (restParameter && !dumpRestParameter()) {
+                break; // original one do not dump
+            }
+            if (i > 0) {
+                append(",");
+            }
+
+            processParameter(methodInfo.paramNames != null ? methodInfo.paramNames[i] : "a" + (i > 0 ? "" + (i + 1) : ""),
+                methodInfo.paramTypes[i],
+                parentName,
+                methodInfo.optionalValues != null && i < methodInfo.optionalValues.length ? methodInfo.optionalValues[i] : null,
+                restParameter
+            );
+        }
+
+        append(")");
+    }
+
+    protected abstract boolean dumpRestParameter();
+
+    @Override
+    public void processMetadata(MetaData metaData) {
+        append("[");
+        append(metaData.name);
+        firstMetaDataMember = true;
+
+        for (String n : metaData.keySet()) {
+            addMetaDataValue(!"*".equals(n) || doStarMetaAttrNameDump() ? n : null, '"' + metaData.get(n) + '"');
+        }
+
+        if (!firstMetaDataMember) {
+            append(")");
+        }
+        append("]");
+    }
+
+    @Override
+    public void processClass(SlotInfo slotInfo, Abc abc, String attr, String indent) {
+        append("\n");
+
+        @NonNls String def;
+        final boolean isInterface = slotInfo.isInterfaceClass();
+        if (isInterface) {
+            def = "interface";
+        }
+        else {
+            def = "class";
+        }
+
+        if (!doStarTypeDumpInExtends()) {
+            final String ns = slotInfo.name.hasNamespace() ? slotInfo.name.getNsName() : null;
+
+            if (ns != null && ns.length() > 0) {
+                attr += ns;
+            }
+            else {
+                attr += "public";
+            }
+            attr += " ";
+        }
+
+        Traits ct = (Traits)slotInfo.value;
+        Traits it = ct.itraits;
+        if (!isInterface) {
+            if ((it.flags & Abc.CLASS_FLAG_final) != 0) {
+                attr += "final ";
+            }
+            if ((it.flags & Abc.CLASS_FLAG_sealed) == 0) {
+                attr += "dynamic ";
+            }
+        }
+
+        processModifierList(slotInfo, attr, indent);
+
+        append(indent + attr + def + " ");
+        processMultinameAsPackageName(slotInfo.name, null, true);
+        dumpExtendsList(it);
+
+        append("\n");
+        String oldindent = indent;
+        indent += Abc.TAB;
+
+        dumpInterfacesList(indent, it, isInterface);
+        append(oldindent + "{\n");
+        setProcessingInterface(isInterface);
+
+        it.init.dump(abc, indent, "", this);
+        it.dump(abc, indent, "", this);
+        ct.dump(abc, indent, "static ", this);
+        ct.init.dump(abc, indent, "static ", this);
+        append(oldindent + "}\n");
+        setProcessingInterface(false);
+    }
+
+    protected void processModifierList(MemberInfo memberInfo, String attr, String indent) {
+        memberInfo.dumpMetaData(indent, this);
+    }
+
+    protected void dumpExtendsList(Traits it) {
+        if (!it.base.isStarReference() || doStarTypeDumpInExtends()) {
+            append(" extends ");
+            processMultinameAsPackageName(it.base, null, true);
+        }
+    }
+
+    protected void dumpInterfacesList(String indent, Traits it, boolean anInterface) {
+        if (it.interfaces.length > 0) {
+            append(indent + (anInterface && this instanceof AS3InterfaceDumper ? "extends " : "implements "));
+            boolean first = true;
+
+            for (Multiname name : it.interfaces) {
+                if (!first) {
+                    append(",");
+                }
+                first = false;
+                processMultinameAsPackageName(name, null, true);
+            }
+            append("\n");
+        }
+    }
+
+    protected static String quote(final String s) {
+        if (s.length() == 0) {
+            return s;
+        }
+        final StringBuilder b = new StringBuilder(s.length());
+
+        for (int i = 0; i < s.length(); ++i) {
+            final char ch = s.charAt(i);
+
+            if (ch == '\\' || ch == '"') {
+                b.append('\\');
+            }
+            else if (ch == '\n') {
+                b.append("\\n");
+                continue;
+            }
+            else if (ch == '\r') {
+                b.append("\\r");
+                continue;
+            }
+            b.append(ch);
+        }
+        return b.toString();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
index 2074e0ca..a3b58bde 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
@@ -26,204 +26,169 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:02:53 PM
+ * Date: Oct 20, 2008
+ * Time: 7:02:53 PM
  */
-class ByteBuffer
-{
-	private byte[] bytes;
-	private int position;
-	private boolean littleEndian;
-
-	void read(@Nonnull InputStream inputStream) throws IOException
-	{
-		try
-		{
-			bytes = readStream(inputStream);
-		}
-		finally
-		{
-			if(inputStream != null)
-			{
-				inputStream.close();
-			}
-		}
-	}
-
-	void setLittleEndian()
-	{
-		littleEndian = true;
-	}
-
-	int readInt()
-	{
-		int result;
-		if(littleEndian)
-		{
-			result = (((bytes[position + 3] & 0xFF) << 8 | (bytes[position + 2] & 0xFF)) << 16) + ((bytes[position + 1] & 0xFF) << 8) | (bytes[position] &
-					0xFF);
-		}
-		else
-		{
-			result = (((bytes[position] & 0xFF) << 8 | (bytes[position + 1] & 0xFF)) << 16) + ((bytes[position + 2] & 0xFF) << 8) | (bytes[position + 3] &
-					0xFF);
-		}
-		position += 4;
-		return result;
-	}
-
-	public int readUnsignedInt()
-	{
-		return readInt();
-	}
-
-	public void setPosition(final int i)
-	{
-		position = i;
-	}
-
-	public int bytesSize()
-	{
-		return bytes.length;
-	}
-
-	public void uncompress() throws IOException
-	{
-		final InflaterInputStream zipInputStream = new InflaterInputStream(new ByteArrayInputStream(bytes));
-
-		bytes = readStream(zipInputStream);
-
-		zipInputStream.close();
-	}
-
-	private static byte[] readStream(final InputStream zipInputStream) throws IOException
-	{
-		final byte[] buf = new byte[8192];
-		byte[] result = new byte[8192];
-		int total = 0;
-
-		while(true)
-		{
-			int read = zipInputStream.read(buf);
-			if(read == -1)
-			{
-				break;
-			}
-			if(total + read >= result.length)
-			{
-				byte[] newresult = new byte[result.length * 2];
-				System.arraycopy(result, 0, newresult, 0, total);
-				result = newresult;
-			}
-
-			System.arraycopy(buf, 0, result, total, read);
-			total += read;
-		}
-
-		final byte[] realResult = new byte[total];
-		System.arraycopy(result, 0, realResult, 0, total);
-		return realResult;
-	}
-
-	public int readUnsignedByte()
-	{
-		return bytes[position++] & 0xFF;
-	}
-
-	public int readByte()
-	{
-		return bytes[position++];
-	}
-
-	public int readUnsignedShort()
-	{
-		int result;
-		if(littleEndian)
-		{
-			result = (bytes[position + 1] & 0xFF) << 8 | (bytes[position] & 0xFF);
-		}
-		else
-		{
-			result = (bytes[position] & 0xFF) << 8 | (bytes[position + 1] & 0xFF);
-		}
-		position += 2;
-		return result;
-	}
-
-	public void readBytes(ByteBuffer data2, int length)
-	{
-		data2.bytes = new byte[length];
-		System.arraycopy(bytes, position, data2.bytes, 0, length);
-		position += length;
-	}
-
-	public boolean eof()
-	{
-		return position >= bytes.length;
-	}
-
-	public String readUTFBytes(int i)
-	{
-		try
-		{
-			final byte[] buf = new byte[i];
-			while(i > 0)
-			{
-				buf[buf.length - i] = (byte) readByte();
-				--i;
-			}
-			return new String(buf, "utf-8");
-		}
-		catch(UnsupportedEncodingException e)
-		{
-			throw new RuntimeException(e);
-		}
-	}
-
-	public double readDouble()
-	{
-		int first = readInt();
-		int second = readInt();
-		return Double.longBitsToDouble(((long) second << 32) | first);
-	}
-
-	public int readU32()
-	{
-		int result = readUnsignedByte();
-		if((result & 0x00000080) == 0)
-		{
-			return result;
-		}
-		result = result & 0x0000007f | readUnsignedByte() << 7;
-		if((result & 0x00004000) == 0)
-		{
-			return result;
-		}
-		result = result & 0x00003fff | readUnsignedByte() << 14;
-		if((result & 0x00200000) == 0)
-		{
-			return result;
-		}
-		result = result & 0x001fffff | readUnsignedByte() << 21;
-		if((result & 0x10000000) == 0)
-		{
-			return result;
-		}
-		return result & 0x0fffffff | readUnsignedByte() << 28;
-	}
-
-	public byte getByte(int i)
-	{
-		return bytes[i];
-	}
-
-	public int getPosition()
-	{
-		return position;
-	}
-
-	public void incPosition(final int length)
-	{
-		position += length;
-	}
+class ByteBuffer {
+    private byte[] bytes;
+    private int position;
+    private boolean littleEndian;
+
+    void read(@Nonnull InputStream inputStream) throws IOException {
+        try {
+            bytes = readStream(inputStream);
+        }
+        finally {
+            if (inputStream != null) {
+                inputStream.close();
+            }
+        }
+    }
+
+    void setLittleEndian() {
+        littleEndian = true;
+    }
+
+    int readInt() {
+        int result;
+        if (littleEndian) {
+            result =
+                (((bytes[position + 3] & 0xFF) << 8 | (bytes[position + 2] & 0xFF)) << 16) + ((bytes[position + 1] & 0xFF) << 8) | (bytes[position] &
+                    0xFF);
+        }
+        else {
+            result =
+                (((bytes[position] & 0xFF) << 8 | (bytes[position + 1] & 0xFF)) << 16) + ((bytes[position + 2] & 0xFF) << 8) | (bytes[position + 3] &
+                    0xFF);
+        }
+        position += 4;
+        return result;
+    }
+
+    public int readUnsignedInt() {
+        return readInt();
+    }
+
+    public void setPosition(final int i) {
+        position = i;
+    }
+
+    public int bytesSize() {
+        return bytes.length;
+    }
+
+    public void uncompress() throws IOException {
+        final InflaterInputStream zipInputStream = new InflaterInputStream(new ByteArrayInputStream(bytes));
+
+        bytes = readStream(zipInputStream);
+
+        zipInputStream.close();
+    }
+
+    private static byte[] readStream(final InputStream zipInputStream) throws IOException {
+        final byte[] buf = new byte[8192];
+        byte[] result = new byte[8192];
+        int total = 0;
+
+        while (true) {
+            int read = zipInputStream.read(buf);
+            if (read == -1) {
+                break;
+            }
+            if (total + read >= result.length) {
+                byte[] newresult = new byte[result.length * 2];
+                System.arraycopy(result, 0, newresult, 0, total);
+                result = newresult;
+            }
+
+            System.arraycopy(buf, 0, result, total, read);
+            total += read;
+        }
+
+        final byte[] realResult = new byte[total];
+        System.arraycopy(result, 0, realResult, 0, total);
+        return realResult;
+    }
+
+    public int readUnsignedByte() {
+        return bytes[position++] & 0xFF;
+    }
+
+    public int readByte() {
+        return bytes[position++];
+    }
+
+    public int readUnsignedShort() {
+        int result;
+        if (littleEndian) {
+            result = (bytes[position + 1] & 0xFF) << 8 | (bytes[position] & 0xFF);
+        }
+        else {
+            result = (bytes[position] & 0xFF) << 8 | (bytes[position + 1] & 0xFF);
+        }
+        position += 2;
+        return result;
+    }
+
+    public void readBytes(ByteBuffer data2, int length) {
+        data2.bytes = new byte[length];
+        System.arraycopy(bytes, position, data2.bytes, 0, length);
+        position += length;
+    }
+
+    public boolean eof() {
+        return position >= bytes.length;
+    }
+
+    public String readUTFBytes(int i) {
+        try {
+            final byte[] buf = new byte[i];
+            while (i > 0) {
+                buf[buf.length - i] = (byte)readByte();
+                --i;
+            }
+            return new String(buf, "utf-8");
+        }
+        catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public double readDouble() {
+        int first = readInt();
+        int second = readInt();
+        return Double.longBitsToDouble(((long)second << 32) | first);
+    }
+
+    public int readU32() {
+        int result = readUnsignedByte();
+        if ((result & 0x00000080) == 0) {
+            return result;
+        }
+        result = result & 0x0000007f | readUnsignedByte() << 7;
+        if ((result & 0x00004000) == 0) {
+            return result;
+        }
+        result = result & 0x00003fff | readUnsignedByte() << 14;
+        if ((result & 0x00200000) == 0) {
+            return result;
+        }
+        result = result & 0x001fffff | readUnsignedByte() << 21;
+        if ((result & 0x10000000) == 0) {
+            return result;
+        }
+        return result & 0x0fffffff | readUnsignedByte() << 28;
+    }
+
+    public byte getByte(int i) {
+        return bytes[i];
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public void incPosition(final int length) {
+        position += length;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
index 2ca09555..50b3de24 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
@@ -22,50 +22,49 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:02:07 PM
+ * Date: Oct 20, 2008
+ * Time: 7:02:07 PM
  */
-interface FlexByteCodeInformationProcessor
-{
-	void dumpStat(@Nonnull @NonNls String stat);
+interface FlexByteCodeInformationProcessor {
+    void dumpStat(@Nonnull @NonNls String stat);
 
-	void hasError(@Nonnull String error);
+    void hasError(@Nonnull String error);
 
-	void append(@Nonnull @NonNls String str);
+    void append(@Nonnull @NonNls String str);
 
-	void processMultinameAsPackageName(@Nonnull Multiname name, @Nullable String parentName, boolean referenceNameRequested);
+    void processMultinameAsPackageName(@Nonnull Multiname name, @Nullable String parentName, boolean referenceNameRequested);
 
-	void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m);
+    void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m);
 
-	void dumpTopLevelTraits(final @Nonnull Abc abc, final @Nonnull Traits t, final String indent);
+    void dumpTopLevelTraits(final @Nonnull Abc abc, final @Nonnull Traits t, final String indent);
 
-	boolean doDumpMember(final @Nonnull MemberInfo memberInfo);
+    boolean doDumpMember(final @Nonnull MemberInfo memberInfo);
 
-	void appendMethodSeparator();
+    void appendMethodSeparator();
 
-	void appendFieldSeparator();
+    void appendFieldSeparator();
 
-	String getAbcInSwfIndent();
+    String getAbcInSwfIndent();
 
-	boolean doDumpMetaData(final @Nonnull MetaData md);
+    boolean doDumpMetaData(final @Nonnull MetaData md);
 
-	String REST_PARAMETER_TYPE = "...";
+    String REST_PARAMETER_TYPE = "...";
 
-	void processParameter(final @Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest);
+    void processParameter(final @Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest);
 
-	boolean doStarTypeDumpInExtends();
+    boolean doStarTypeDumpInExtends();
 
-	boolean doStarMetaAttrNameDump();
+    boolean doStarMetaAttrNameDump();
 
-	void setProcessingInterface(final boolean anInterface);
+    void setProcessingInterface(final boolean anInterface);
 
-	String getParentName(final MemberInfo member);
+    String getParentName(final MemberInfo member);
 
-	void processVariable(SlotInfo info, String indent, String attr);
+    void processVariable(SlotInfo info, String indent, String attr);
 
-	void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr);
+    void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr);
 
-	void processMetadata(MetaData metaData);
+    void processMetadata(MetaData metaData);
 
-	void processClass(SlotInfo slotInfo, Abc abc, String attr, String indent);
+    void processClass(SlotInfo slotInfo, Abc abc, String attr, String indent);
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
index 82574aa3..701abf3a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
@@ -29,127 +29,111 @@
 /**
  * Produced from abcdump.as
  */
-public class FlexImporter
-{
-	public static void main(String[] args) throws IOException
-	{
-		if(args.length < 1)
-		{
-			System.out.print("FlexImporter\nusage:\nFlexImporter <filename>");
-		}
-		else
-		{
-			long started = System.currentTimeMillis();
+public class FlexImporter {
+    public static void main(String[] args) throws IOException {
+        if (args.length < 1) {
+            System.out.print("FlexImporter\nusage:\nFlexImporter <filename>");
+        }
+        else {
+            long started = System.currentTimeMillis();
 
-			for(String file : args)
-			{
-				try
-				{
-					String result = dumpContentsFromStream(new BufferedInputStream(new FileInputStream(file)), true);
+            for (String file : args) {
+                try {
+                    String result = dumpContentsFromStream(new BufferedInputStream(new FileInputStream(file)), true);
 
-					saveStringAsFile(result, file + ".il");
-				}
-				finally
-				{
-					long total = System.currentTimeMillis() - started;
-					System.out.println("File created... " + total + "ms");
-				}
-			}
-		}
-	}
+                    saveStringAsFile(result, file + ".il");
+                }
+                finally {
+                    long total = System.currentTimeMillis() - started;
+                    System.out.println("File created... " + total + "ms");
+                }
+            }
+        }
+    }
 
-	private static void saveStringAsFile(final String result, final String fileName) throws IOException
-	{
-		final FileOutputStream fileOutputStream = new FileOutputStream(fileName);
-		try
-		{
-			fileOutputStream.write(result.getBytes());
-		}
-		finally
-		{
-			fileOutputStream.close();
-		}
-	}
+    private static void saveStringAsFile(final String result, final String fileName) throws IOException {
+        final FileOutputStream fileOutputStream = new FileOutputStream(fileName);
+        try {
+            fileOutputStream.write(result.getBytes());
+        }
+        finally {
+            fileOutputStream.close();
+        }
+    }
 
-	public static String dumpContentsFromStream(final InputStream in, boolean _dumpCode) throws IOException
-	{
-		final AbstractDumpProcessor abcDumper = new AbcDumper(_dumpCode);
-		processFlexByteCode(in, abcDumper);
-		return abcDumper.getResult();
-	}
+    public static String dumpContentsFromStream(final InputStream in, boolean _dumpCode) throws IOException {
+        final AbstractDumpProcessor abcDumper = new AbcDumper(_dumpCode);
+        processFlexByteCode(in, abcDumper);
+        return abcDumper.getResult();
+    }
 
-	@NonNls
-	public static String buildInterfaceFromStream(final InputStream in)
-	{
-		try
-		{
-			final AbstractDumpProcessor abcDumper = new AS3InterfaceDumper();
-			processFlexByteCode(in, abcDumper);
-			final String s = abcDumper.getResult();
-			//saveStringAsFile(s, File.createTempFile("fleximport", ".as").getPath());
-			return s;
-		}
-		catch(IOException ex)
-		{
-			return "/* " + ex.getLocalizedMessage() + " */";
-		}
-		catch(ArrayIndexOutOfBoundsException ex)
-		{
-			return "/* Invalid format */";
-		}
-	}
+    @NonNls
+    public static String buildInterfaceFromStream(final InputStream in) {
+        try {
+            final AbstractDumpProcessor abcDumper = new AS3InterfaceDumper();
+            processFlexByteCode(in, abcDumper);
+            final String s = abcDumper.getResult();
+            //saveStringAsFile(s, File.createTempFile("fleximport", ".as").getPath());
+            return s;
+        }
+        catch (IOException ex) {
+            return "/* " + ex.getLocalizedMessage() + " */";
+        }
+        catch (ArrayIndexOutOfBoundsException ex) {
+            return "/* Invalid format */";
+        }
+    }
 
-	@NonNls
-	public static void buildStubsInterfaceFromStream(final InputStream in, final StubElement parent) throws Exception
-	{
-		processFlexByteCode(in, new AS3InterfaceStubDumper(parent));
-	}
+    @NonNls
+    public static void buildStubsInterfaceFromStream(final InputStream in, final StubElement parent) throws Exception {
+        processFlexByteCode(in, new AS3InterfaceStubDumper(parent));
+    }
 
-	private static void processFlexByteCode(@Nonnull final InputStream in, @Nonnull FlexByteCodeInformationProcessor processor) throws IOException
-	{
-		ByteBuffer data = new ByteBuffer();
-		data.read(in);
-		data.setLittleEndian();
-		int version = data.readUnsignedInt();
-
-		switch(version)
-		{
-			case 46 << 16 | 14:
-			case 46 << 16 | 15:
-			case 46 << 16 | 16:
-				Abc abc = new Abc(data, processor);
-				abc.dump("");
-				break;
-			case 67 | 87 << 8 | 83 << 16 | 10 << 24: // needed for airglobal.swc
-			case 67 | 87 << 8 | 83 << 16 | 9 << 24: // SWC9
-			case 67 | 87 << 8 | 83 << 16 | 8 << 24: // SWC8
-			case 67 | 87 << 8 | 83 << 16 | 7 << 24: // SWC7
-			case 67 | 87 << 8 | 83 << 16 | 6 << 24: // SWC6
-				final int delta = 8;
-				data.setPosition(delta);
-				ByteBuffer udata = new ByteBuffer();
-				udata.setLittleEndian();
-				data.readBytes(udata, data.bytesSize() - delta);
-				int csize = udata.bytesSize();
-				udata.uncompress();
-				processor.dumpStat("decompressed swf " + csize + " -> " + udata.bytesSize() + "\n");
-				udata.setPosition(0);
-				new Swf(udata, processor);
-				break;
-			case 70 | 87 << 8 | 83 << 16 | 9 << 24: // SWC9
-			case 70 | 87 << 8 | 83 << 16 | 8 << 24: // SWC8
-			case 70 | 87 << 8 | 83 << 16 | 7 << 24: // SWC7
-			case 70 | 87 << 8 | 83 << 16 | 6 << 24: // SWC6
-			case 70 | 87 << 8 | 83 << 16 | 5 << 24: // SWC5
-			case 70 | 87 << 8 | 83 << 16 | 4 << 24: // SWC4
-				data.setPosition(8); // skip header and length
-				new Swf(data, processor);
-				break;
-			default:
-				processor.hasError("unknown format " + version + "\n");
-				break;
-		}
-		in.close();
-	}
+    private static void processFlexByteCode(
+        @Nonnull final InputStream in,
+        @Nonnull FlexByteCodeInformationProcessor processor
+    ) throws IOException {
+        ByteBuffer data = new ByteBuffer();
+        data.read(in);
+        data.setLittleEndian();
+        int version = data.readUnsignedInt();
 
+        switch (version) {
+            case 46 << 16 | 14:
+            case 46 << 16 | 15:
+            case 46 << 16 | 16:
+                Abc abc = new Abc(data, processor);
+                abc.dump("");
+                break;
+            case 67 | 87 << 8 | 83 << 16 | 10 << 24: // needed for airglobal.swc
+            case 67 | 87 << 8 | 83 << 16 | 9 << 24: // SWC9
+            case 67 | 87 << 8 | 83 << 16 | 8 << 24: // SWC8
+            case 67 | 87 << 8 | 83 << 16 | 7 << 24: // SWC7
+            case 67 | 87 << 8 | 83 << 16 | 6 << 24: // SWC6
+                final int delta = 8;
+                data.setPosition(delta);
+                ByteBuffer udata = new ByteBuffer();
+                udata.setLittleEndian();
+                data.readBytes(udata, data.bytesSize() - delta);
+                int csize = udata.bytesSize();
+                udata.uncompress();
+                processor.dumpStat("decompressed swf " + csize + " -> " + udata.bytesSize() + "\n");
+                udata.setPosition(0);
+                new Swf(udata, processor);
+                break;
+            case 70 | 87 << 8 | 83 << 16 | 9 << 24: // SWC9
+            case 70 | 87 << 8 | 83 << 16 | 8 << 24: // SWC8
+            case 70 | 87 << 8 | 83 << 16 | 7 << 24: // SWC7
+            case 70 | 87 << 8 | 83 << 16 | 6 << 24: // SWC6
+            case 70 | 87 << 8 | 83 << 16 | 5 << 24: // SWC5
+            case 70 | 87 << 8 | 83 << 16 | 4 << 24: // SWC4
+                data.setPosition(8); // skip header and length
+                new Swf(data, processor);
+                break;
+            default:
+                processor.hasError("unknown format " + version + "\n");
+                break;
+        }
+        in.close();
+    }
 }

From 44f4b7c8680d3eedba3c76dc5b17631e24860579 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Wed, 24 Jul 2024 12:12:44 +0300
Subject: [PATCH 217/340] JS file creation action name fixed.

---
 .../impl/ide/actions/JavaScriptCreateFileAction.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
index 87957250..a970fc86 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
@@ -6,6 +6,7 @@
 import consulo.ide.IdeView;
 import consulo.ide.action.CreateFileFromTemplateAction;
 import consulo.ide.action.CreateFileFromTemplateDialog;
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
 import consulo.language.editor.CommonDataKeys;
 import consulo.language.psi.PsiDirectory;
@@ -26,7 +27,11 @@ public class JavaScriptCreateFileAction extends CreateFileFromTemplateAction
 {
 	public JavaScriptCreateFileAction()
 	{
-		super(LocalizeValue.empty(), LocalizeValue.empty(), JavaScriptFileType.INSTANCE.getIcon());
+		super(
+			JavaScriptLocalize.actionJavascriptFileText(),
+			JavaScriptLocalize.actionJavascriptFileText(),
+			JavaScriptFileType.INSTANCE.getIcon()
+		);
 	}
 
 	@Override

From d60809c2c06b0b796ba99fa5b85000e52eebb2fa Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 25 Jul 2024 09:03:18 +0300
Subject: [PATCH 218/340] Code reformat using IJ4 code style (part 9).

---
 .../ReuseOfLocalVariableJSInspection.java     | 313 ++++-----
 .../UnnecessaryLocalVariableJSInspection.java | 613 ++++++++----------
 ...cessaryLocalVariableJSInspectionState.java |  44 +-
 .../dataflow/VariableAccessUtils.java         |  28 +-
 .../dataflow/VariableAssignedVisitor.java     |  22 +-
 .../VariableUsedInInnerFunctionVisitor.java   |  38 +-
 .../dataflow/VariableUsedVisitor.java         |  11 +-
 .../dom/DocumentWriteJSInspection.java        |  17 +-
 .../inspectjs/dom/InnerHTMLJSInspection.java  |   5 +-
 .../dom/PlatformDetectionJSInspection.java    |  18 +-
 .../XHTMLIncompatabilitiesJSInspection.java   |  15 +-
 .../exception/CatchParameterUsedVisitor.java  |   6 +-
 .../EmptyCatchBlockJSInspection.java          |   4 +-
 .../exception/EmptyTryBlockJSInspection.java  |   3 +-
 .../ExceptionCaughtLocallyJSInspection.java   |   4 +-
 .../UnusedCatchParameterJSInspection.java     | 138 ++--
 ...UnusedCatchParameterJSInspectionState.java |  44 +-
 .../com/sixrr/inspectjs/fix/RenameFix.java    |   3 +-
 .../CyclomaticComplexityJSInspection.java     | 127 ++--
 ...CyclomaticComplexityJSInspectionState.java |  10 +-
 .../CyclomaticComplexityVisitor.java          |  29 +-
 .../FunctionMetricsInspectionState.java       |  66 +-
 ...FunctionWithMultipleLoopsJSInspection.java |  14 +-
 .../typescript/TypeScriptFileTypeFactory.java |  12 +-
 .../src/main/java/module-info.java            |  11 +-
 25 files changed, 715 insertions(+), 880 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index c41be56a..b1ec4b53 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -16,189 +16,152 @@
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
-public class ReuseOfLocalVariableJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.reuseOfLocalVariableDisplayName().get();
-	}
+public class ReuseOfLocalVariableJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.reuseOfLocalVariableDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.DATA_FLOW_ISSUES.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.DATA_FLOW_ISSUES.get();
+    }
 
-	@RequiredReadAction
-	@Override
-	@Nonnull
-	public String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.reuseOfLocalVariableProblemDescriptor().get();
-	}
+    @RequiredReadAction
+    @Override
+    @Nonnull
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.reuseOfLocalVariableProblemDescriptor().get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new ReuseOfLocalVariableVisitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new ReuseOfLocalVariableVisitor();
+    }
 
-	private static class ReuseOfLocalVariableVisitor extends BaseInspectionVisitor
-	{
-		@Override
-		public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment)
-		{
-			super.visitJSAssignmentExpression(assignment);
-			if(assignment.getROperand() == null)
-			{
-				return;
-			}
-			final PsiElement assignmentParent = assignment.getParent();
-			if(!(assignmentParent instanceof JSExpressionStatement))
-			{
-				return;
-			}
-			final JSExpression lhs = assignment.getLOperand();
-			if(!(lhs instanceof JSDefinitionExpression))
-			{
-				return;
-			}
-			final JSDefinitionExpression def = (JSDefinitionExpression) lhs;
-			final JSExpression defExpression = def.getExpression();
-			if(!(defExpression instanceof JSReferenceExpression))
-			{
-				return;
-			}
-			final PsiElement referent = ((PsiReference) defExpression).resolve();
-			if(!(referent instanceof JSVariable))
-			{
-				return;
-			}
-			final JSVariable variable = (JSVariable) referent;
+    private static class ReuseOfLocalVariableVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+            super.visitJSAssignmentExpression(assignment);
+            if (assignment.getROperand() == null) {
+                return;
+            }
+            final PsiElement assignmentParent = assignment.getParent();
+            if (!(assignmentParent instanceof JSExpressionStatement)) {
+                return;
+            }
+            final JSExpression lhs = assignment.getLOperand();
+            if (!(lhs instanceof JSDefinitionExpression)) {
+                return;
+            }
+            final JSDefinitionExpression def = (JSDefinitionExpression)lhs;
+            final JSExpression defExpression = def.getExpression();
+            if (!(defExpression instanceof JSReferenceExpression)) {
+                return;
+            }
+            final PsiElement referent = ((PsiReference)defExpression).resolve();
+            if (!(referent instanceof JSVariable)) {
+                return;
+            }
+            final JSVariable variable = (JSVariable)referent;
 
-			if(variable.getInitializer() == null)
-			{
-				return;
-			}
-			final IElementType tokenType = assignment.getOperationSign();
+            if (variable.getInitializer() == null) {
+                return;
+            }
+            final IElementType tokenType = assignment.getOperationSign();
 
-			if(!JSTokenTypes.EQ.equals(tokenType))
-			{
-				return;
-			}
-			final JSExpression rhs = assignment.getROperand();
-			if(VariableAccessUtils.variableIsUsed(variable, rhs))
-			{
-				return;
-			}
-			final JSBlockStatement variableBlock =
-					PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-			if(variableBlock == null)
-			{
-				return;
-			}
+            if (!JSTokenTypes.EQ.equals(tokenType)) {
+                return;
+            }
+            final JSExpression rhs = assignment.getROperand();
+            if (VariableAccessUtils.variableIsUsed(variable, rhs)) {
+                return;
+            }
+            final JSBlockStatement variableBlock = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            if (variableBlock == null) {
+                return;
+            }
 
-			if(loopExistsBetween(assignment, variableBlock))
-			{
-				return;
-			}
-			if(tryExistsBetween(assignment, variableBlock))
-			{
-				// this could be weakened, slightly, if it could be verified
-				// that a variable is used in only one branch of a try statement
-				return;
-			}
-			final PsiElement assignmentBlock = assignmentParent.getParent();
-			if(assignmentBlock == null)
-			{
-				return;
-			}
-			if(variableBlock.equals(assignmentBlock))
-			{
-				registerError(lhs);
-				return;
-			}
-			final JSStatement[] statements = variableBlock.getStatements();
-			final PsiElement containingStatement = getChildWhichContainsElement(variableBlock, assignment);
-			int statementPosition = -1;
-			for(int i = 0; i < statements.length; i++)
-			{
-				if(statements[i].equals(containingStatement))
-				{
-					statementPosition = i;
-					break;
-				}
-			}
-			if(statementPosition == -1)
-			{
-				return;
-			}
-			for(int i = statementPosition + 1; i < statements.length; i++)
-			{
-				if(VariableAccessUtils.variableIsUsed(variable, statements[i]))
-				{
-					return;
-				}
-			}
-			registerError(lhs);
-		}
+            if (loopExistsBetween(assignment, variableBlock)) {
+                return;
+            }
+            if (tryExistsBetween(assignment, variableBlock)) {
+                // this could be weakened, slightly, if it could be verified
+                // that a variable is used in only one branch of a try statement
+                return;
+            }
+            final PsiElement assignmentBlock = assignmentParent.getParent();
+            if (assignmentBlock == null) {
+                return;
+            }
+            if (variableBlock.equals(assignmentBlock)) {
+                registerError(lhs);
+                return;
+            }
+            final JSStatement[] statements = variableBlock.getStatements();
+            final PsiElement containingStatement = getChildWhichContainsElement(variableBlock, assignment);
+            int statementPosition = -1;
+            for (int i = 0; i < statements.length; i++) {
+                if (statements[i].equals(containingStatement)) {
+                    statementPosition = i;
+                    break;
+                }
+            }
+            if (statementPosition == -1) {
+                return;
+            }
+            for (int i = statementPosition + 1; i < statements.length; i++) {
+                if (VariableAccessUtils.variableIsUsed(variable, statements[i])) {
+                    return;
+                }
+            }
+            registerError(lhs);
+        }
 
-		private static boolean loopExistsBetween(JSAssignmentExpression assignment, JSBlockStatement block)
-		{
-			PsiElement elementToTest = assignment;
-			while(elementToTest != null)
-			{
-				if(elementToTest.equals(block))
-				{
-					return false;
-				}
-				if(elementToTest instanceof JSLoopStatement)
-				{
-					return true;
-				}
-				elementToTest = elementToTest.getParent();
-			}
-			return false;
-		}
+        private static boolean loopExistsBetween(JSAssignmentExpression assignment, JSBlockStatement block) {
+            PsiElement elementToTest = assignment;
+            while (elementToTest != null) {
+                if (elementToTest.equals(block)) {
+                    return false;
+                }
+                if (elementToTest instanceof JSLoopStatement) {
+                    return true;
+                }
+                elementToTest = elementToTest.getParent();
+            }
+            return false;
+        }
 
-		private static boolean tryExistsBetween(JSAssignmentExpression assignment, JSBlockStatement block)
-		{
-			PsiElement elementToTest = assignment;
-			while(elementToTest != null)
-			{
-				if(elementToTest.equals(block))
-				{
-					return false;
-				}
-				if(elementToTest instanceof JSTryStatement)
-				{
-					return true;
-				}
-				elementToTest = elementToTest.getParent();
-			}
-			return false;
-		}
+        private static boolean tryExistsBetween(JSAssignmentExpression assignment, JSBlockStatement block) {
+            PsiElement elementToTest = assignment;
+            while (elementToTest != null) {
+                if (elementToTest.equals(block)) {
+                    return false;
+                }
+                if (elementToTest instanceof JSTryStatement) {
+                    return true;
+                }
+                elementToTest = elementToTest.getParent();
+            }
+            return false;
+        }
 
-		/**
-		 * @noinspection AssignmentToMethodParameter
-		 */
-		@Nullable
-		public static PsiElement getChildWhichContainsElement(@Nonnull JSBlockStatement ancestor, @Nonnull PsiElement descendant)
-		{
-			PsiElement element = descendant;
-			while(!element.equals(ancestor))
-			{
-				descendant = element;
-				element = descendant.getParent();
-				if(element == null)
-				{
-					return null;
-				}
-			}
-			return descendant;
-		}
-	}
+        /**
+         * @noinspection AssignmentToMethodParameter
+         */
+        @Nullable
+        public static PsiElement getChildWhichContainsElement(@Nonnull JSBlockStatement ancestor, @Nonnull PsiElement descendant) {
+            PsiElement element = descendant;
+            while (!element.equals(ancestor)) {
+                descendant = element;
+                element = descendant.getParent();
+                if (element == null) {
+                    return null;
+                }
+            }
+            return descendant;
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index 85482f78..2547e0a8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -15,360 +15,291 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.redundantLocalVariableDisplayName().get();
-	}
+public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.redundantLocalVariableDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.DATA_FLOW_ISSUES.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.DATA_FLOW_ISSUES.get();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new UnnecessaryLocalVariableJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new UnnecessaryLocalVariableJSInspectionState();
+    }
 
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return true;
-	}
+    @Override
+    public boolean isEnabledByDefault() {
+        return true;
+    }
 
-	@RequiredReadAction
-	@Override
-	@Nonnull
-	public String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.unnecessaryLocalVariableProblemDescriptor().get();
-	}
+    @RequiredReadAction
+    @Override
+    @Nonnull
+    public String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.unnecessaryLocalVariableProblemDescriptor().get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new UnnecessaryLocalVariableVisitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new UnnecessaryLocalVariableVisitor();
+    }
 
-	@Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
-	{
-		return true;
-	}
+    @Override
+    protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
+        return true;
+    }
 
-	private class UnnecessaryLocalVariableVisitor extends BaseInspectionVisitor<UnnecessaryLocalVariableJSInspectionState>
-	{
-		@Override
-		public void visitJSVarStatement(@Nonnull JSVarStatement varStatement)
-		{
-			super.visitJSVarStatement(varStatement);
-			final JSVariable[] variables = varStatement.getVariables();
-			for(JSVariable variable : variables)
-			{
-				if(isCopyVariable(variable))
-				{
-					registerVariableError(variable);
-				}
-				else if(!myState.m_ignoreImmediatelyReturnedVariables && isImmediatelyReturned(variable))
-				{
-					registerVariableError(variable);
-				}
-				else if(!myState.m_ignoreImmediatelyReturnedVariables && isImmediatelyThrown(variable))
-				{
-					registerVariableError(variable);
-				}
-				else if(isImmediatelyAssigned(variable))
-				{
-					registerVariableError(variable);
-				}
-				else if(isImmediatelyAssignedAsDeclaration(variable))
-				{
-					registerVariableError(variable);
-				}
-			}
-		}
+    private class UnnecessaryLocalVariableVisitor extends BaseInspectionVisitor<UnnecessaryLocalVariableJSInspectionState> {
+        @Override
+        public void visitJSVarStatement(@Nonnull JSVarStatement varStatement) {
+            super.visitJSVarStatement(varStatement);
+            final JSVariable[] variables = varStatement.getVariables();
+            for (JSVariable variable : variables) {
+                if (isCopyVariable(variable)) {
+                    registerVariableError(variable);
+                }
+                else if (!myState.m_ignoreImmediatelyReturnedVariables && isImmediatelyReturned(variable)) {
+                    registerVariableError(variable);
+                }
+                else if (!myState.m_ignoreImmediatelyReturnedVariables && isImmediatelyThrown(variable)) {
+                    registerVariableError(variable);
+                }
+                else if (isImmediatelyAssigned(variable)) {
+                    registerVariableError(variable);
+                }
+                else if (isImmediatelyAssignedAsDeclaration(variable)) {
+                    registerVariableError(variable);
+                }
+            }
+        }
 
-		private boolean isCopyVariable(JSVariable variable)
-		{
-			final JSExpression initializer = variable.getInitializer();
-			if(initializer == null)
-			{
-				return false;
-			}
-			if(!(initializer instanceof JSReferenceExpression))
-			{
-				return false;
-			}
-			final JSReferenceExpression reference =
-					(JSReferenceExpression) initializer;
-			final PsiElement referent = reference.resolve();
-			if(referent == null)
-			{
-				return false;
-			}
-			if(!(referent instanceof JSVariable))
-			{
-				return false;
-			}
-			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-			if(containingScope == null || isClassMember(referent))
-			{
-				return false;
-			}
-			final VariableAssignedVisitor visitor =
-					new VariableAssignedVisitor(variable);
-			containingScope.accept(visitor);
-			if(visitor.isAssigned())
-			{
-				return false;
-			}
-			final JSVariable initialization = (JSVariable) referent;
-			final VariableAssignedVisitor visitor2 = new VariableAssignedVisitor(initialization);
-			containingScope.accept(visitor2);
-			if(visitor2.isAssigned())
-			{
-				return false;
-			}
+        private boolean isCopyVariable(JSVariable variable) {
+            final JSExpression initializer = variable.getInitializer();
+            if (initializer == null) {
+                return false;
+            }
+            if (!(initializer instanceof JSReferenceExpression)) {
+                return false;
+            }
+            final JSReferenceExpression reference =
+                (JSReferenceExpression)initializer;
+            final PsiElement referent = reference.resolve();
+            if (referent == null) {
+                return false;
+            }
+            if (!(referent instanceof JSVariable)) {
+                return false;
+            }
+            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            if (containingScope == null || isClassMember(referent)) {
+                return false;
+            }
+            final VariableAssignedVisitor visitor =
+                new VariableAssignedVisitor(variable);
+            containingScope.accept(visitor);
+            if (visitor.isAssigned()) {
+                return false;
+            }
+            final JSVariable initialization = (JSVariable)referent;
+            final VariableAssignedVisitor visitor2 = new VariableAssignedVisitor(initialization);
+            containingScope.accept(visitor2);
+            if (visitor2.isAssigned()) {
+                return false;
+            }
 
-			return !variableIsUsedInInnerFunction(containingScope, variable);
-		}
+            return !variableIsUsedInInnerFunction(containingScope, variable);
+        }
 
-		private boolean isClassMember(final PsiElement referent)
-		{
-			final PsiElement grandParent = referent.getParent().getParent();
-			return grandParent instanceof JSClass || (grandParent instanceof JSFile && grandParent.getContext() != null);
-		}
+        private boolean isClassMember(final PsiElement referent) {
+            final PsiElement grandParent = referent.getParent().getParent();
+            return grandParent instanceof JSClass || (grandParent instanceof JSFile && grandParent.getContext() != null);
+        }
 
-		private boolean isImmediatelyReturned(JSVariable variable)
-		{
-			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-			if(containingScope == null)
-			{
-				return false;
-			}
-			final JSVarStatement declarationStatement =
-					PsiTreeUtil.getParentOfType(variable,
-							JSVarStatement.class);
-			if(declarationStatement == null)
-			{
-				return false;
-			}
-			JSStatement nextStatement = null;
-			final JSStatement[] statements = containingScope.getStatements();
-			for(int i = 0; i < statements.length - 1; i++)
-			{
-				if(statements[i].equals(declarationStatement))
-				{
-					nextStatement = statements[i + 1];
-				}
-			}
-			if(nextStatement == null)
-			{
-				return false;
-			}
-			if(!(nextStatement instanceof JSReturnStatement))
-			{
-				return false;
-			}
-			final JSReturnStatement returnStatement = (JSReturnStatement) nextStatement;
-			final JSExpression returnValue = returnStatement.getExpression();
-			if(returnValue == null)
-			{
-				return false;
-			}
-			if(!(returnValue instanceof JSReferenceExpression))
-			{
-				return false;
-			}
-			final PsiElement referent = ((PsiReference) returnValue).resolve();
-			return !(referent == null || !referent.equals(variable));
-		}
+        private boolean isImmediatelyReturned(JSVariable variable) {
+            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            if (containingScope == null) {
+                return false;
+            }
+            final JSVarStatement declarationStatement =
+                PsiTreeUtil.getParentOfType(
+                    variable,
+                    JSVarStatement.class
+                );
+            if (declarationStatement == null) {
+                return false;
+            }
+            JSStatement nextStatement = null;
+            final JSStatement[] statements = containingScope.getStatements();
+            for (int i = 0; i < statements.length - 1; i++) {
+                if (statements[i].equals(declarationStatement)) {
+                    nextStatement = statements[i + 1];
+                }
+            }
+            if (nextStatement == null) {
+                return false;
+            }
+            if (!(nextStatement instanceof JSReturnStatement)) {
+                return false;
+            }
+            final JSReturnStatement returnStatement = (JSReturnStatement)nextStatement;
+            final JSExpression returnValue = returnStatement.getExpression();
+            if (returnValue == null) {
+                return false;
+            }
+            if (!(returnValue instanceof JSReferenceExpression)) {
+                return false;
+            }
+            final PsiElement referent = ((PsiReference)returnValue).resolve();
+            return !(referent == null || !referent.equals(variable));
+        }
 
-		private boolean isImmediatelyThrown(JSVariable variable)
-		{
-			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-			if(containingScope == null)
-			{
-				return false;
-			}
-			final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
-			if(declarationStatement == null)
-			{
-				return false;
-			}
-			JSStatement nextStatement = null;
-			final JSStatement[] statements = containingScope.getStatements();
-			for(int i = 0; i < statements.length - 1; i++)
-			{
-				if(statements[i].equals(declarationStatement))
-				{
-					nextStatement = statements[i + 1];
-				}
-			}
-			if(nextStatement == null)
-			{
-				return false;
-			}
-			if(!(nextStatement instanceof JSThrowStatement))
-			{
-				return false;
-			}
-			final JSThrowStatement throwStatement = (JSThrowStatement) nextStatement;
-			final JSExpression returnValue = throwStatement.getExpression();
-			if(returnValue == null)
-			{
-				return false;
-			}
-			if(!(returnValue instanceof JSReferenceExpression))
-			{
-				return false;
-			}
-			final PsiElement referent = ((PsiReference) returnValue).resolve();
-			return !(referent == null || !referent.equals(variable));
-		}
+        private boolean isImmediatelyThrown(JSVariable variable) {
+            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            if (containingScope == null) {
+                return false;
+            }
+            final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
+            if (declarationStatement == null) {
+                return false;
+            }
+            JSStatement nextStatement = null;
+            final JSStatement[] statements = containingScope.getStatements();
+            for (int i = 0; i < statements.length - 1; i++) {
+                if (statements[i].equals(declarationStatement)) {
+                    nextStatement = statements[i + 1];
+                }
+            }
+            if (nextStatement == null) {
+                return false;
+            }
+            if (!(nextStatement instanceof JSThrowStatement)) {
+                return false;
+            }
+            final JSThrowStatement throwStatement = (JSThrowStatement)nextStatement;
+            final JSExpression returnValue = throwStatement.getExpression();
+            if (returnValue == null) {
+                return false;
+            }
+            if (!(returnValue instanceof JSReferenceExpression)) {
+                return false;
+            }
+            final PsiElement referent = ((PsiReference)returnValue).resolve();
+            return !(referent == null || !referent.equals(variable));
+        }
 
-		private boolean isImmediatelyAssigned(JSVariable variable)
-		{
-			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-			if(containingScope == null)
-			{
-				return false;
-			}
-			final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
-			if(declarationStatement == null)
-			{
-				return false;
-			}
-			JSStatement nextStatement = null;
-			int followingStatementNumber = 0;
-			final JSStatement[] statements = containingScope.getStatements();
-			for(int i = 0; i < statements.length - 1; i++)
-			{
-				if(statements[i].equals(declarationStatement))
-				{
-					nextStatement = statements[i + 1];
-					followingStatementNumber = i + 2;
-				}
-			}
-			if(nextStatement == null)
-			{
-				return false;
-			}
-			if(!(nextStatement instanceof JSExpressionStatement))
-			{
-				return false;
-			}
-			final JSExpressionStatement expressionStatement = (JSExpressionStatement) nextStatement;
-			final JSExpression expression = expressionStatement.getExpression();
-			if(!(expression instanceof JSAssignmentExpression))
-			{
-				return false;
-			}
-			final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) expression;
-			final JSExpression rhs = assignmentExpression.getROperand();
-			if(rhs == null)
-			{
-				return false;
-			}
-			if(!(rhs instanceof JSReferenceExpression))
-			{
-				return false;
-			}
-			final JSReferenceExpression reference = (JSReferenceExpression) rhs;
-			final PsiElement referent = reference.resolve();
-			if(referent == null || !referent.equals(variable))
-			{
-				return false;
-			}
-			final JSExpression lhs = assignmentExpression.getLOperand();
-			if(VariableAccessUtils.variableIsUsed(variable, lhs))
-			{
-				return false;
-			}
-			for(int i = followingStatementNumber; i < statements.length; i++)
-			{
-				if(VariableAccessUtils.variableIsUsed(variable, statements[i]))
-				{
-					return false;
-				}
-			}
-			return true;
-		}
+        private boolean isImmediatelyAssigned(JSVariable variable) {
+            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            if (containingScope == null) {
+                return false;
+            }
+            final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
+            if (declarationStatement == null) {
+                return false;
+            }
+            JSStatement nextStatement = null;
+            int followingStatementNumber = 0;
+            final JSStatement[] statements = containingScope.getStatements();
+            for (int i = 0; i < statements.length - 1; i++) {
+                if (statements[i].equals(declarationStatement)) {
+                    nextStatement = statements[i + 1];
+                    followingStatementNumber = i + 2;
+                }
+            }
+            if (nextStatement == null) {
+                return false;
+            }
+            if (!(nextStatement instanceof JSExpressionStatement)) {
+                return false;
+            }
+            final JSExpressionStatement expressionStatement = (JSExpressionStatement)nextStatement;
+            final JSExpression expression = expressionStatement.getExpression();
+            if (!(expression instanceof JSAssignmentExpression)) {
+                return false;
+            }
+            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression)expression;
+            final JSExpression rhs = assignmentExpression.getROperand();
+            if (rhs == null) {
+                return false;
+            }
+            if (!(rhs instanceof JSReferenceExpression)) {
+                return false;
+            }
+            final JSReferenceExpression reference = (JSReferenceExpression)rhs;
+            final PsiElement referent = reference.resolve();
+            if (referent == null || !referent.equals(variable)) {
+                return false;
+            }
+            final JSExpression lhs = assignmentExpression.getLOperand();
+            if (VariableAccessUtils.variableIsUsed(variable, lhs)) {
+                return false;
+            }
+            for (int i = followingStatementNumber; i < statements.length; i++) {
+                if (VariableAccessUtils.variableIsUsed(variable, statements[i])) {
+                    return false;
+                }
+            }
+            return true;
+        }
 
-		private boolean isImmediatelyAssignedAsDeclaration(JSVariable variable)
-		{
-			final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
-			if(containingScope == null)
-			{
-				return false;
-			}
-			final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
-			if(declarationStatement == null)
-			{
-				return false;
-			}
-			JSStatement nextStatement = null;
-			int followingStatementNumber = 0;
-			final JSStatement[] statements = containingScope.getStatements();
-			for(int i = 0; i < statements.length - 1; i++)
-			{
-				if(statements[i].equals(declarationStatement))
-				{
-					nextStatement = statements[i + 1];
-					followingStatementNumber = i + 2;
-				}
-			}
-			if(nextStatement == null)
-			{
-				return false;
-			}
-			if(!(nextStatement instanceof JSVarStatement))
-			{
-				return false;
-			}
-			final JSVarStatement declaration = (JSVarStatement) nextStatement;
-			final JSVariable[] declarations = declaration.getVariables();
-			if(declarations.length != 1)
-			{
-				return false;
-			}
-			final JSExpression rhs = declarations[0].getInitializer();
-			if(rhs == null)
-			{
-				return false;
-			}
-			if(!(rhs instanceof JSReferenceExpression))
-			{
-				return false;
-			}
-			final PsiElement referent = ((PsiReference) rhs).resolve();
-			if(referent == null || !referent.equals(variable))
-			{
-				return false;
-			}
-			for(int i = followingStatementNumber; i < statements.length; i++)
-			{
-				if(VariableAccessUtils.variableIsUsed(variable, statements[i]))
-				{
-					return false;
-				}
-			}
-			return true;
-		}
+        private boolean isImmediatelyAssignedAsDeclaration(JSVariable variable) {
+            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            if (containingScope == null) {
+                return false;
+            }
+            final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
+            if (declarationStatement == null) {
+                return false;
+            }
+            JSStatement nextStatement = null;
+            int followingStatementNumber = 0;
+            final JSStatement[] statements = containingScope.getStatements();
+            for (int i = 0; i < statements.length - 1; i++) {
+                if (statements[i].equals(declarationStatement)) {
+                    nextStatement = statements[i + 1];
+                    followingStatementNumber = i + 2;
+                }
+            }
+            if (nextStatement == null) {
+                return false;
+            }
+            if (!(nextStatement instanceof JSVarStatement)) {
+                return false;
+            }
+            final JSVarStatement declaration = (JSVarStatement)nextStatement;
+            final JSVariable[] declarations = declaration.getVariables();
+            if (declarations.length != 1) {
+                return false;
+            }
+            final JSExpression rhs = declarations[0].getInitializer();
+            if (rhs == null) {
+                return false;
+            }
+            if (!(rhs instanceof JSReferenceExpression)) {
+                return false;
+            }
+            final PsiElement referent = ((PsiReference)rhs).resolve();
+            if (referent == null || !referent.equals(variable)) {
+                return false;
+            }
+            for (int i = followingStatementNumber; i < statements.length; i++) {
+                if (VariableAccessUtils.variableIsUsed(variable, statements[i])) {
+                    return false;
+                }
+            }
+            return true;
+        }
 
-		private boolean variableIsUsedInInnerFunction(JSBlockStatement block, JSVariable variable)
-		{
-			final VariableUsedInInnerFunctionVisitor visitor = new VariableUsedInInnerFunctionVisitor(variable);
-			block.accept(visitor);
-			return visitor.isUsedInInnerFunction();
-		}
-	}
+        private boolean variableIsUsedInInnerFunction(JSBlockStatement block, JSVariable variable) {
+            final VariableUsedInInnerFunctionVisitor visitor = new VariableUsedInInnerFunctionVisitor(variable);
+            block.accept(visitor);
+            return visitor.isUsedInInnerFunction();
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
index 6485d7c6..25472038 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
@@ -13,29 +13,29 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class UnnecessaryLocalVariableJSInspectionState implements InspectionToolState<UnnecessaryLocalVariableJSInspectionState>
-{
-	public boolean m_ignoreImmediatelyReturnedVariables = false;
+public class UnnecessaryLocalVariableJSInspectionState implements InspectionToolState<UnnecessaryLocalVariableJSInspectionState> {
+    public boolean m_ignoreImmediatelyReturnedVariables = false;
 
-	@Nullable
-	@Override
-	public UnnamedConfigurable createConfigurable()
-	{
-		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
-		builder.checkBox(InspectionJSLocalize.redundantLocalVariableIgnoreOption(), () -> m_ignoreImmediatelyReturnedVariables, b -> m_ignoreImmediatelyReturnedVariables = b);
-		return builder.buildUnnamed();
-	}
+    @Nullable
+    @Override
+    public UnnamedConfigurable createConfigurable() {
+        ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+        builder.checkBox(
+            InspectionJSLocalize.redundantLocalVariableIgnoreOption(),
+            () -> m_ignoreImmediatelyReturnedVariables,
+            b -> m_ignoreImmediatelyReturnedVariables = b
+        );
+        return builder.buildUnnamed();
+    }
 
-	@Nullable
-	@Override
-	public UnnecessaryLocalVariableJSInspectionState getState()
-	{
-		return this;
-	}
+    @Nullable
+    @Override
+    public UnnecessaryLocalVariableJSInspectionState getState() {
+        return this;
+    }
 
-	@Override
-	public void loadState(UnnecessaryLocalVariableJSInspectionState state)
-	{
-		XmlSerializerUtil.copyBean(state, this);
-	}
+    @Override
+    public void loadState(UnnecessaryLocalVariableJSInspectionState state) {
+        XmlSerializerUtil.copyBean(state, this);
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
index 1f3f9031..3c4d8d45 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
@@ -5,43 +5,35 @@
 import consulo.language.psi.PsiReference;
 
 public class VariableAccessUtils {
-    public static boolean mayEvaluateToVariable(JSExpression expression,
-                                                JSVariable variable) {
+    public static boolean mayEvaluateToVariable(JSExpression expression, JSVariable variable) {
         if (expression == null) {
             return false;
         }
-        if (expression instanceof JSParenthesizedExpression) {
-            final JSExpression containedExpression =
-                    ((JSParenthesizedExpression) expression).getInnerExpression();
+        if (expression instanceof JSParenthesizedExpression parenthesized) {
+            final JSExpression containedExpression = parenthesized.getInnerExpression();
             return mayEvaluateToVariable(containedExpression, variable);
         }
-        if (expression instanceof JSDefinitionExpression) {
-            final JSExpression containedExpression =
-                    ((JSDefinitionExpression) expression).getExpression();
+        if (expression instanceof JSDefinitionExpression definition) {
+            final JSExpression containedExpression = definition.getExpression();
             return mayEvaluateToVariable(containedExpression, variable);
         }
-        if (expression instanceof JSConditionalExpression) {
-            final JSConditionalExpression conditional =
-                    (JSConditionalExpression) expression;
+        if (expression instanceof JSConditionalExpression conditional) {
             final JSExpression thenExpression = conditional.getThen();
             final JSExpression elseExpression = conditional.getElse();
-            return mayEvaluateToVariable(thenExpression, variable) ||
-                    mayEvaluateToVariable(elseExpression, variable);
+            return mayEvaluateToVariable(thenExpression, variable) || mayEvaluateToVariable(elseExpression, variable);
         }
         if (!(expression instanceof JSReferenceExpression)) {
             return false;
         }
-        final PsiElement referent = ((PsiReference) expression).resolve();
+        final PsiElement referent = ((PsiReference)expression).resolve();
         if (referent == null) {
             return false;
         }
         return referent.equals(variable);
     }
 
-    public static boolean variableIsUsed(JSVariable variable,
-                                         PsiElement context) {
-        final VariableUsedVisitor visitor
-                = new VariableUsedVisitor(variable);
+    public static boolean variableIsUsed(JSVariable variable, PsiElement context) {
+        final VariableUsedVisitor visitor = new VariableUsedVisitor(variable);
         context.accept(visitor);
         return visitor.isUsed();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
index 445439f8..15784ef0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
@@ -8,24 +8,24 @@
 import jakarta.annotation.Nonnull;
 
 public class VariableAssignedVisitor extends JSRecursiveElementVisitor {
-
     private boolean assigned = false;
     @Nonnull
-	private final JSVariable variable;
+    private final JSVariable variable;
 
     public VariableAssignedVisitor(@Nonnull JSVariable variable) {
         super();
         this.variable = variable;
     }
 
-    @Override public void visitElement(@Nonnull PsiElement element) {
+    @Override
+    public void visitElement(@Nonnull PsiElement element) {
         if (!assigned) {
             super.visitElement(element);
         }
     }
 
-    @Override public void visitJSAssignmentExpression(
-            @Nonnull JSAssignmentExpression assignment) {
+    @Override
+    public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
         if (assigned) {
             return;
         }
@@ -36,15 +36,15 @@ public VariableAssignedVisitor(@Nonnull JSVariable variable) {
         }
     }
 
-    @Override public void visitJSPrefixExpression(
-            @Nonnull JSPrefixExpression expression) {
+    @Override
+    public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
         if (assigned) {
             return;
         }
         super.visitJSPrefixExpression(expression);
         final IElementType operationSign = expression.getOperationSign();
         if (!JSTokenTypes.PLUSPLUS.equals(operationSign) &&
-                !JSTokenTypes.MINUSMINUS.equals(operationSign)) {
+            !JSTokenTypes.MINUSMINUS.equals(operationSign)) {
             return;
         }
         final JSExpression operand = expression.getExpression();
@@ -53,15 +53,15 @@ public VariableAssignedVisitor(@Nonnull JSVariable variable) {
         }
     }
 
-    @Override public void visitJSPostfixExpression(
-            @Nonnull JSPostfixExpression postfixExpression) {
+    @Override
+    public void visitJSPostfixExpression(@Nonnull JSPostfixExpression postfixExpression) {
         if (assigned) {
             return;
         }
         super.visitJSPostfixExpression(postfixExpression);
         final IElementType operationSign = postfixExpression.getOperationSign();
         if (!JSTokenTypes.PLUSPLUS.equals(operationSign) &&
-                !JSTokenTypes.MINUSMINUS.equals(operationSign)) {
+            !JSTokenTypes.MINUSMINUS.equals(operationSign)) {
             return;
         }
         final JSExpression operand = postfixExpression.getExpression();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
index 71b5293c..5b5c9e4f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
@@ -7,32 +7,27 @@
 import consulo.language.psi.PsiElement;
 import jakarta.annotation.Nonnull;
 
-public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisitor
-{
+public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisitor {
     private final JSVariable variable;
     private boolean usedInInnerFunction = false;
     private boolean inInnerFunction = false;
 
-    VariableUsedInInnerFunctionVisitor(JSVariable variable)
-    {
+    VariableUsedInInnerFunctionVisitor(JSVariable variable) {
         super();
         this.variable = variable;
     }
 
-    @Override public void visitElement(@Nonnull PsiElement element)
-    {
-        if (usedInInnerFunction)
-        {
+    @Override
+    public void visitElement(@Nonnull PsiElement element) {
+        if (usedInInnerFunction) {
             return;
         }
         super.visitElement(element);
     }
 
-    @Override public void visitJSFunctionExpression(
-            @Nonnull JSFunctionExpression funcExpr)
-    {
-        if(usedInInnerFunction)
-        {
+    @Override
+    public void visitJSFunctionExpression(@Nonnull JSFunctionExpression funcExpr) {
+        if (usedInInnerFunction) {
             return;
         }
         final boolean wasInInnerFunction = inInnerFunction;
@@ -41,26 +36,21 @@ public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisito
         inInnerFunction = wasInInnerFunction;
     }
 
-    @Override public void visitJSReferenceExpression(
-            @Nonnull JSReferenceExpression reference)
-    {
-        if(usedInInnerFunction)
-        {
+    @Override
+    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression reference) {
+        if (usedInInnerFunction) {
             return;
         }
         super.visitJSReferenceExpression(reference);
-        if(inInnerFunction)
-        {
+        if (inInnerFunction) {
             final PsiElement element = reference.resolve();
-            if(variable.equals(element))
-            {
+            if (variable.equals(element)) {
                 usedInInnerFunction = true;
             }
         }
     }
 
-    public boolean isUsedInInnerFunction()
-    {
+    public boolean isUsedInInnerFunction() {
         return usedInInnerFunction;
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
index 53bef780..3a2b971f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
@@ -9,29 +9,30 @@
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 
 public class VariableUsedVisitor extends JSRecursiveElementVisitor {
-
     private boolean used = false;
     @Nonnull
-	private final JSVariable variable;
+    private final JSVariable variable;
 
     public VariableUsedVisitor(@Nonnull JSVariable variable) {
         super();
         this.variable = variable;
     }
 
-    @Override public void visitElement(@Nonnull PsiElement element) {
+    @Override
+    public void visitElement(@Nonnull PsiElement element) {
         if (!used) {
             super.visitElement(element);
         }
     }
 
-    @Override public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
+    @Override
+    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
         if (used) {
             return;
         }
         super.visitJSReferenceExpression(ref);
         PsiElement element = ref.resolve();
-        final JSElement referent = element instanceof JSElement ? (JSElement) element:null;
+        final JSElement referent = element instanceof JSElement jsElement ? jsElement : null;
         if (referent == null) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index 92519597..c517e030 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -47,27 +47,24 @@ public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             final JSExpression methodExpression;
             try {
                 methodExpression = jsCallExpression.getMethodExpression();
-            } catch (Exception e) {
+            }
+            catch (Exception e) {
                 return; //catching an intelliJ CCE
             }
-            if(!(methodExpression instanceof JSReferenceExpression))
-            {
+            if (!(methodExpression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression referenceExpression = (JSReferenceExpression) methodExpression;
+            final JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
             final JSExpression qualifier = referenceExpression.getQualifier();
-            if(qualifier == null)
-            {
+            if (qualifier == null) {
                 return;
             }
             @NonNls final String qualifierText = qualifier.getText();
-            if(!"document".equals(qualifierText))
-            {
+            if (!"document".equals(qualifierText)) {
                 return;
             }
             @NonNls final String methodName = referenceExpression.getReferencedName();
-            if(!"write".equals(methodName) && !"writeln".equals(methodName))
-            {
+            if (!"write".equals(methodName) && !"writeln".equals(methodName)) {
                 return;
             }
             registerError(methodExpression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index c189fc65..bb2a0750 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -42,9 +42,8 @@ private static class Visitor extends BaseInspectionVisitor {
         public void visitJSReferenceExpression(JSReferenceExpression expression) {
             super.visitJSReferenceExpression(expression);
             final String referenceName = expression.getReferencedName();
-            if (!"innerHTML".equalsIgnoreCase(referenceName))
-            {
-                 return;
+            if (!"innerHTML".equalsIgnoreCase(referenceName)) {
+                return;
             }
             registerError(expression);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index 2891d364..bf9cdd6f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -39,7 +39,8 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @SuppressWarnings({"HardCodedStringLiteral"})
-        @Override public void visitJSReferenceExpression(JSReferenceExpression referenceExpression) {
+        @Override
+        public void visitJSReferenceExpression(JSReferenceExpression referenceExpression) {
             super.visitJSReferenceExpression(referenceExpression);
             final JSExpression qualifier = referenceExpression.getQualifier();
             if (qualifier == null) {
@@ -49,18 +50,19 @@ private static class Visitor extends BaseInspectionVisitor {
             if ("navigator".equalsIgnoreCase(qualifierText)) {
                 final String methodName = referenceExpression.getReferencedName();
                 if (!"userAgent".equalsIgnoreCase(methodName) &&
-                        !"appName".equalsIgnoreCase(methodName) &&
-                        !"appCodeName".equalsIgnoreCase(methodName) &&
-                        !"platform".equalsIgnoreCase(methodName) &&
-                        !"oscpu".equalsIgnoreCase(methodName)
-                        ) {
+                    !"appName".equalsIgnoreCase(methodName) &&
+                    !"appCodeName".equalsIgnoreCase(methodName) &&
+                    !"platform".equalsIgnoreCase(methodName) &&
+                    !"oscpu".equalsIgnoreCase(methodName)
+                ) {
                     return;
                 }
                 registerError(referenceExpression);
-            } else if ("document".equalsIgnoreCase(qualifierText)) {
+            }
+            else if ("document".equalsIgnoreCase(qualifierText)) {
                 final String methodName = referenceExpression.getReferencedName();
                 if (!"all".equalsIgnoreCase(methodName) &&
-                        !"layers".equalsIgnoreCase(methodName)) {
+                    !"layers".equalsIgnoreCase(methodName)) {
                     return;
                 }
                 registerError(referenceExpression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
index 0634f694..40b7f7f3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
@@ -39,7 +39,8 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @SuppressWarnings({"HardCodedStringLiteral"})
-        @Override public void visitJSReferenceExpression(JSReferenceExpression referenceExpression) {
+        @Override
+        public void visitJSReferenceExpression(JSReferenceExpression referenceExpression) {
             super.visitJSReferenceExpression(referenceExpression);
             final JSExpression qualifier = referenceExpression.getQualifier();
             if (qualifier == null) {
@@ -52,12 +53,12 @@ private static class Visitor extends BaseInspectionVisitor {
             }
             final String methodName = referenceExpression.getReferencedName();
             if (!"images".equalsIgnoreCase(methodName) &&
-                    !"body".equalsIgnoreCase(methodName) &&
-                    !"applets".equalsIgnoreCase(methodName) &&
-                    !"links".equalsIgnoreCase(methodName) &&
-                    !"forms".equalsIgnoreCase(methodName) &&
-                    !"anchors".equalsIgnoreCase(methodName)
-                    ) {
+                !"body".equalsIgnoreCase(methodName) &&
+                !"applets".equalsIgnoreCase(methodName) &&
+                !"links".equalsIgnoreCase(methodName) &&
+                !"forms".equalsIgnoreCase(methodName) &&
+                !"anchors".equalsIgnoreCase(methodName)
+            ) {
                 return;
             }
             registerError(referenceExpression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
index 300682d5..d909e58f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
@@ -16,13 +16,15 @@ class CatchParameterUsedVisitor extends JSRecursiveElementVisitor {
         parameter = variable;
     }
 
-    @Override public void visitElement(@Nonnull PsiElement element) {
+    @Override
+    public void visitElement(@Nonnull PsiElement element) {
         if (!used) {
             super.visitElement(element);
         }
     }
 
-    @Override public void visitJSReferenceExpression(@Nonnull JSReferenceExpression reference) {
+    @Override
+    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression reference) {
         if (used) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index 5488f623..64df0d7f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -39,6 +39,7 @@ protected String buildErrorString(Object state, Object... args) {
     public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
+
     private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSTryStatement(JSTryStatement jsTryStatement) {
@@ -48,8 +49,7 @@ public void visitJSTryStatement(JSTryStatement jsTryStatement) {
                 return;
             }
             final JSStatement body = catchBlock.getStatement();
-            if(StatementUtils.isEmpty(body))
-            {
+            if (StatementUtils.isEmpty(body)) {
                 final PsiElement catchToken = catchBlock.getFirstChild();
                 registerError(catchToken);
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index 13fb461a..a94a2dfc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -46,8 +46,7 @@ public void visitJSTryStatement(JSTryStatement jsTryStatement) {
             if (statement == null) {
                 return;
             }
-            if(StatementUtils.isEmpty(statement))
-            {
+            if (StatementUtils.isEmpty(statement)) {
                 registerStatementError(jsTryStatement);
             }
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index 75aeae59..b484cb7c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -58,9 +58,7 @@ public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
     public static boolean isCaughtLocally(@Nonnull JSThrowStatement throwStatement) {
         JSElement currentElement = throwStatement;
         while (true) {
-            final JSTryStatement tryStatement =
-                    PsiTreeUtil.getParentOfType(currentElement,
-                            JSTryStatement.class);
+            final JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
             if (tryStatement == null) {
                 return false;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
index 84e74f8e..db2d49c9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
@@ -16,87 +16,71 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class UnusedCatchParameterJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.unusedCatchParameterDisplayName().get();
-	}
+public class UnusedCatchParameterJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.unusedCatchParameterDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new UnusedCatchParameterJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new UnusedCatchParameterJSInspectionState();
+    }
 
-	@RequiredReadAction
-	@Override
-	@Nonnull
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.unusedCatchParameterProblemDescriptor().get();
-	}
+    @RequiredReadAction
+    @Override
+    @Nonnull
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.unusedCatchParameterProblemDescriptor().get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new EmptyCatchBlockVisitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new EmptyCatchBlockVisitor();
+    }
 
-	private class EmptyCatchBlockVisitor extends BaseInspectionVisitor<UnusedCatchParameterJSInspectionState>
-	{
-		@Override
-		public void visitJSTryStatement(@Nonnull JSTryStatement statement)
-		{
-			super.visitJSTryStatement(statement);
-			final JSCatchBlock jsCatchBlock = statement.getCatchBlock();
-			if(jsCatchBlock == null)
-			{
-				return;
-			}
-			checkCatchSection(jsCatchBlock);
-		}
+    private class EmptyCatchBlockVisitor extends BaseInspectionVisitor<UnusedCatchParameterJSInspectionState> {
+        @Override
+        public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
+            super.visitJSTryStatement(statement);
+            final JSCatchBlock jsCatchBlock = statement.getCatchBlock();
+            if (jsCatchBlock == null) {
+                return;
+            }
+            checkCatchSection(jsCatchBlock);
+        }
 
-		private void checkCatchSection(JSCatchBlock section)
-		{
-			final JSParameter param = section.getParameter();
-			final JSStatement block = section.getStatement();
-			if(param == null || block == null)
-			{
-				return;
-			}
-			final String paramName = param.getName();
-			if("ignore".equals(paramName) || "ignored".equals(paramName))
-			{
-				return;
-			}
-			if(myState.m_ignoreCatchBlocksWithComments)
-			{
-				final PsiElement[] children = block.getChildren();
-				for(final PsiElement child : children)
-				{
-					if(child instanceof PsiComment)
-					{
-						return;
-					}
-				}
-			}
-			final CatchParameterUsedVisitor visitor = new CatchParameterUsedVisitor(param);
-			block.accept(visitor);
-			if(!visitor.isUsed())
-			{
-				registerVariableError(param);
-			}
-		}
-	}
+        private void checkCatchSection(JSCatchBlock section) {
+            final JSParameter param = section.getParameter();
+            final JSStatement block = section.getStatement();
+            if (param == null || block == null) {
+                return;
+            }
+            final String paramName = param.getName();
+            if ("ignore".equals(paramName) || "ignored".equals(paramName)) {
+                return;
+            }
+            if (myState.m_ignoreCatchBlocksWithComments) {
+                final PsiElement[] children = block.getChildren();
+                for (final PsiElement child : children) {
+                    if (child instanceof PsiComment) {
+                        return;
+                    }
+                }
+            }
+            final CatchParameterUsedVisitor visitor = new CatchParameterUsedVisitor(param);
+            block.accept(visitor);
+            if (!visitor.isUsed()) {
+                registerVariableError(param);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
index ba17efdf..3426c1f5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
@@ -13,29 +13,29 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class UnusedCatchParameterJSInspectionState implements InspectionToolState<UnusedCatchParameterJSInspectionState>
-{
-	public boolean m_ignoreCatchBlocksWithComments = false;
+public class UnusedCatchParameterJSInspectionState implements InspectionToolState<UnusedCatchParameterJSInspectionState> {
+    public boolean m_ignoreCatchBlocksWithComments = false;
 
-	@Nullable
-	@Override
-	public UnnamedConfigurable createConfigurable()
-	{
-		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
-		builder.checkBox(InspectionJSLocalize.unusedCatchParameterIgnoreCatchOption(), () -> m_ignoreCatchBlocksWithComments, b -> m_ignoreCatchBlocksWithComments = b);
-		return builder.buildUnnamed();
-	}
+    @Nullable
+    @Override
+    public UnnamedConfigurable createConfigurable() {
+        ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+        builder.checkBox(
+            InspectionJSLocalize.unusedCatchParameterIgnoreCatchOption(),
+            () -> m_ignoreCatchBlocksWithComments,
+            b -> m_ignoreCatchBlocksWithComments = b
+        );
+        return builder.buildUnnamed();
+    }
 
-	@Nullable
-	@Override
-	public UnusedCatchParameterJSInspectionState getState()
-	{
-		return this;
-	}
+    @Nullable
+    @Override
+    public UnusedCatchParameterJSInspectionState getState() {
+        return this;
+    }
 
-	@Override
-	public void loadState(UnusedCatchParameterJSInspectionState state)
-	{
-		XmlSerializerUtil.copyBean(state, this);
-	}
+    @Override
+    public void loadState(UnusedCatchParameterJSInspectionState state) {
+        XmlSerializerUtil.copyBean(state, this);
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
index 77d3e9ef..d866d58c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
@@ -41,7 +41,8 @@ public void doFix(Project project, ProblemDescriptor descriptor) {
             final RefactoringActionHandlerFactory factory = RefactoringActionHandlerFactory.getInstance();
             final RefactoringActionHandler renameHandler = factory.createRenameHandler();
             renameHandler.invoke(project, new PsiElement[]{elementToRename}, DataManager.getInstance().getDataContext());
-        } else {
+        }
+        else {
             final RefactoringFactory factory = RefactoringFactory.getInstance(project);
             final RenameRefactoring renameRefactoring = factory.createRename(elementToRename, m_targetName);
             renameRefactoring.run();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index 17c41055..4c95d4b7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -13,83 +13,66 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class CyclomaticComplexityJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getID()
-	{
-		return "OverlyComplexFunctionJS";
-	}
+public class CyclomaticComplexityJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getID() {
+        return "OverlyComplexFunctionJS";
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.overlyComplexFunctionDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.overlyComplexFunctionDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new CyclomaticComplexityJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new CyclomaticComplexityJSInspectionState();
+    }
 
-	@RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args)
-	{
-		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-		assert function != null;
-		final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
-		final PsiElement lastChild = function.getLastChild();
-		assert lastChild != null;
-		lastChild.accept(visitor);
-		final int coupling = visitor.getComplexity();
-		if(functionHasIdentifier(function))
-		{
-			return InspectionJSLocalize.functionRefIsOverlyComplexCyclomaticComplexityErrorString(coupling).get();
-		}
-		else
-		{
-			return InspectionJSLocalize.anonymousFunctionIsOverlyComplexCyclomaticComplexityErrorString(coupling).get();
-		}
-	}
+    @RequiredReadAction
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        assert function != null;
+        final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
+        final PsiElement lastChild = function.getLastChild();
+        assert lastChild != null;
+        lastChild.accept(visitor);
+        final int coupling = visitor.getComplexity();
+        return functionHasIdentifier(function)
+            ? InspectionJSLocalize.functionRefIsOverlyComplexCyclomaticComplexityErrorString(coupling).get()
+            : InspectionJSLocalize.anonymousFunctionIsOverlyComplexCyclomaticComplexityErrorString(coupling).get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private class Visitor extends BaseInspectionVisitor<CyclomaticComplexityJSInspectionState>
-	{
+    private class Visitor extends BaseInspectionVisitor<CyclomaticComplexityJSInspectionState> {
+        @Override
+        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+            final PsiElement lastChild = function.getLastChild();
+            if (!(lastChild instanceof JSBlockStatement)) {
+                return;
+            }
+            final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
+            lastChild.accept(visitor);
+            final int complexity = visitor.getComplexity();
 
-		@Override
-		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
-		{
-			final PsiElement lastChild = function.getLastChild();
-			if(!(lastChild instanceof JSBlockStatement))
-			{
-				return;
-			}
-			final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
-			lastChild.accept(visitor);
-			final int complexity = visitor.getComplexity();
-
-			if(complexity <= myState.getLimit())
-			{
-				return;
-			}
-			registerFunctionError(function);
-		}
-	}
+            if (complexity <= myState.getLimit()) {
+                return;
+            }
+            registerFunctionError(function);
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspectionState.java
index 285b0b20..bf8ae785 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspectionState.java
@@ -7,10 +7,8 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class CyclomaticComplexityJSInspectionState extends FunctionMetricsInspectionState<CyclomaticComplexityJSInspectionState> implements InspectionToolState<CyclomaticComplexityJSInspectionState>
-{
-	public CyclomaticComplexityJSInspectionState()
-	{
-		super(10, InspectionJSLocalize.overlyComplexFunctionDisplayName());
-	}
+public class CyclomaticComplexityJSInspectionState extends FunctionMetricsInspectionState<CyclomaticComplexityJSInspectionState> implements InspectionToolState<CyclomaticComplexityJSInspectionState> {
+    public CyclomaticComplexityJSInspectionState() {
+        super(10, InspectionJSLocalize.overlyComplexFunctionDisplayName());
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
index 517ae42a..d8a2ba9e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
@@ -7,10 +7,10 @@
 class CyclomaticComplexityVisitor extends JSRecursiveElementVisitor {
     private int complexity = 1;
 
-    @Override public void visitJSElement(JSElement jsElement) {
+    @Override
+    public void visitJSElement(JSElement jsElement) {
         int oldComplexity = 0;
-        if(jsElement instanceof JSFunction)
-        {
+        if (jsElement instanceof JSFunction) {
             oldComplexity = complexity;
         }
         super.visitJSElement(jsElement);
@@ -20,45 +20,50 @@ class CyclomaticComplexityVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
+    @Override
+    public void visitJSForStatement(@Nonnull JSForStatement statement) {
         super.visitJSForStatement(statement);
         complexity++;
     }
 
     @Override
-	public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+    public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
         super.visitJSForInStatement(statement);
         complexity++;
     }
 
-    @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+    @Override
+    public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
         super.visitJSIfStatement(statement);
         complexity++;
     }
 
-    @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+    @Override
+    public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
         super.visitJSDoWhileStatement(statement);
         complexity++;
     }
 
-    @Override public void visitJSConditionalExpression(JSConditionalExpression expression) {
+    @Override
+    public void visitJSConditionalExpression(JSConditionalExpression expression) {
         super.visitJSConditionalExpression(expression);
         complexity++;
     }
 
-    @Override public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
+    @Override
+    public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
         super.visitJSSwitchStatement(statement);
         final JSCaseClause[] caseClauses = statement.getCaseClauses();
         for (JSCaseClause clause : caseClauses) {
             final JSStatement[] statements = clause.getStatements();
-            if(statements!=null && statements.length!=0)
-            {
+            if (statements != null && statements.length != 0) {
                 complexity++;
             }
         }
     }
 
-    @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+    @Override
+    public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
         super.visitJSWhileStatement(statement);
         complexity++;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspectionState.java
index 9863a898..90e9ba44 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionMetricsInspectionState.java
@@ -13,40 +13,34 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class FunctionMetricsInspectionState<T extends FunctionMetricsInspectionState<T>>
-{
-	@Transient
-	private final LocalizeValue myLabelText;
-
-	public int m_limit;
-
-	public FunctionMetricsInspectionState(int m_limit, LocalizeValue labelText)
-	{
-		this.m_limit = m_limit;
-		myLabelText = labelText;
-	}
-
-	public int getLimit()
-	{
-		return m_limit;
-	}
-
-	public UnnamedConfigurable createConfigurable()
-	{
-		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
-		builder.component(() -> Label.create(myLabelText));
-		builder.valueComponent(IntBox::create, () -> m_limit, it -> m_limit = it);
-		return builder.buildUnnamed();
-	}
-
-	@SuppressWarnings("unchecked")
-	public T getState()
-	{
-		return (T) this;
-	}
-
-	public void loadState(T state)
-	{
-		XmlSerializerUtil.copyBean(state, this);
-	}
+public class FunctionMetricsInspectionState<T extends FunctionMetricsInspectionState<T>> {
+    @Transient
+    private final LocalizeValue myLabelText;
+
+    public int m_limit;
+
+    public FunctionMetricsInspectionState(int m_limit, LocalizeValue labelText) {
+        this.m_limit = m_limit;
+        myLabelText = labelText;
+    }
+
+    public int getLimit() {
+        return m_limit;
+    }
+
+    public UnnamedConfigurable createConfigurable() {
+        ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+        builder.component(() -> Label.create(myLabelText));
+        builder.valueComponent(IntBox::create, () -> m_limit, it -> m_limit = it);
+        return builder.buildUnnamed();
+    }
+
+    @SuppressWarnings("unchecked")
+    public T getState() {
+        return (T)this;
+    }
+
+    public void loadState(T state) {
+        XmlSerializerUtil.copyBean(state, this);
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index 23b4cc0d..4a38e949 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -28,25 +28,23 @@ public String getGroupDisplayName() {
     @RequiredReadAction
     @Override
     public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
+        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
         final LoopCountVisitor visitor = new LoopCountVisitor();
         final PsiElement lastChild = function.getLastChild();
         assert lastChild != null;
         lastChild.accept(visitor);
         final int loopCount = visitor.getCount();
-        if (functionHasIdentifier(function)) {
-            return InspectionJSLocalize.functionContainsMultipleLoopsErrorString(loopCount).get();
-        }
-        else {
-            return InspectionJSLocalize.anonymousFunctionContainsMultipleLoopsErrorString(loopCount).get();
-        }
+        return functionHasIdentifier(function)
+            ? InspectionJSLocalize.functionContainsMultipleLoopsErrorString(loopCount).get()
+            : InspectionJSLocalize.anonymousFunctionContainsMultipleLoopsErrorString(loopCount).get();
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
+
     private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
index 71248ff8..e74068ec 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
@@ -26,11 +26,9 @@
  * @since 03.03.2016
  */
 @ExtensionImpl
-public class TypeScriptFileTypeFactory extends FileTypeFactory
-{
-	@Override
-	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
-	{
-		consumer.consume(TypeScriptFileType.INSTANCE);
-	}
+public class TypeScriptFileTypeFactory extends FileTypeFactory {
+    @Override
+    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
+        consumer.consume(TypeScriptFileType.INSTANCE);
+    }
 }
diff --git a/lang-version-impl/typescript-impl/src/main/java/module-info.java b/lang-version-impl/typescript-impl/src/main/java/module-info.java
index f74cc481..35176754 100644
--- a/lang-version-impl/typescript-impl/src/main/java/module-info.java
+++ b/lang-version-impl/typescript-impl/src/main/java/module-info.java
@@ -2,11 +2,10 @@
  * @author VISTALL
  * @since 29-Aug-22
  */
-module consulo.javascript.typescript.impl
-{
-	requires consulo.javascript.base.impl;
-	requires consulo.javascript.ecmascript.impl;
+module consulo.javascript.typescript.impl {
+    requires consulo.javascript.base.impl;
+    requires consulo.javascript.ecmascript.impl;
 
-	exports consulo.typescript;
-	exports consulo.typescript.version;
+    exports consulo.typescript;
+    exports consulo.typescript.version;
 }
\ No newline at end of file

From 58c8db916526f365ea7f1b226da24991cf18eefd Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 25 Jul 2024 11:35:09 +0300
Subject: [PATCH 219/340] Code reformat using IJ4 code style (part 10).

---
 ...nWithMultipleReturnPointsJSInspection.java | 184 ++++++++----------
 .../functionmetrics/LoopCountVisitor.java     |  15 +-
 .../functionmetrics/NegationCountVisitor.java |   9 +-
 .../NestingDepthJSInspection.java             | 105 +++++-----
 .../NestingDepthJSInspectionState.java        |  10 +-
 .../functionmetrics/NestingDepthVisitor.java  |  20 +-
 .../ParametersPerFunctionJSInspection.java    | 122 ++++++------
 ...arametersPerFunctionJSInspectionState.java |  10 +-
 .../StatementCountVisitor.java                |  12 +-
 .../StatementsPerFunctionJSInspection.java    | 121 ++++++------
 ...tatementsPerFunctionJSInspectionState.java |  10 +-
 ...ThreeNegationsPerFunctionJSInspection.java |   2 +-
 .../naming/ConventionInspection.java          |  37 ++--
 .../naming/ConventionInspectionState.java     | 159 +++++++--------
 .../FunctionNamingConventionJSInspection.java | 147 +++++++-------
 ...tionNamingConventionJSInspectionState.java |  11 +-
 ...lVariableNamingConventionJSInspection.java | 146 +++++++-------
 ...ableNamingConventionJSInspectionState.java |  12 +-
 ...ParameterNamingConventionJSInspection.java | 155 +++++++--------
 ...eterNamingConventionJSInspectionState.java |  10 +-
 .../style/ChainedEqualityJSInspection.java    |   2 +-
 .../ChainedFunctionCallJSInspection.java      | 122 +++++-------
 ...ConstantOnLHSOfComparisonJSInspection.java |   5 +-
 ...ConstantOnRHSOfComparisonJSInspection.java |   4 +-
 .../style/NestedFunctionCallJSInspection.java |  96 ++++-----
 25 files changed, 688 insertions(+), 838 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index faff94dc..cbc5f23c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -13,122 +13,94 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class FunctionWithMultipleReturnPointsJSInspection extends JavaScriptInspection
-{
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return false;
-	}
+public class FunctionWithMultipleReturnPointsJSInspection extends JavaScriptInspection {
+    @Override
+    public boolean isEnabledByDefault() {
+        return false;
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.functionWithMultipleReturnPointsDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.functionWithMultipleReturnPointsDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    }
 
-	@RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args)
-	{
-		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-		assert function != null;
-		final int returnPointCount = countReturnPoints(function);
-		if(functionHasIdentifier(function))
-		{
-			return InspectionJSLocalize.functionContainsMultipleReturnPointsErrorString(returnPointCount).get();
-		}
-		else
-		{
-			return InspectionJSLocalize.anonymousFunctionContainsMultipleReturnPointsErrorString(returnPointCount).get();
-		}
-	}
+    @RequiredReadAction
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        assert function != null;
+        final int returnPointCount = countReturnPoints(function);
+        if (functionHasIdentifier(function)) {
+            return InspectionJSLocalize.functionContainsMultipleReturnPointsErrorString(returnPointCount).get();
+        }
+        else {
+            return InspectionJSLocalize.anonymousFunctionContainsMultipleReturnPointsErrorString(returnPointCount).get();
+        }
+    }
 
-	private static int countReturnPoints(JSFunction function)
-	{
-		final PsiElement lastChild = function.getLastChild();
-		if(!(lastChild instanceof JSBlockStatement))
-		{
-			return 0;
-		}
-		boolean hasFallthroughReturn = false;
-		if(ControlFlowUtils.statementMayCompleteNormally((JSStatement) lastChild))
-		{
-			hasFallthroughReturn = true;
-		}
-		final ReturnCountVisitor visitor = new ReturnCountVisitor();
-		lastChild.accept(visitor);
+    private static int countReturnPoints(JSFunction function) {
+        final PsiElement lastChild = function.getLastChild();
+        if (!(lastChild instanceof JSBlockStatement)) {
+            return 0;
+        }
+        boolean hasFallthroughReturn = false;
+        if (ControlFlowUtils.statementMayCompleteNormally((JSStatement)lastChild)) {
+            hasFallthroughReturn = true;
+        }
+        final ReturnCountVisitor visitor = new ReturnCountVisitor();
+        lastChild.accept(visitor);
 
-		final int returnCount = visitor.getReturnCount();
-		if(hasFallthroughReturn)
-		{
-			return returnCount + 1;
-		}
-		else
-		{
-			return returnCount;
-		}
-	}
+        final int returnCount = visitor.getReturnCount();
+        return hasFallthroughReturn ? returnCount + 1 : returnCount;
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private static class Visitor extends BaseInspectionVisitor
-	{
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+            final int returnPointCount = countReturnPoints(function);
+            if (returnPointCount <= 1) {
+                return;
+            }
+            registerFunctionError(function);
+        }
+    }
 
-		@Override
-		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
-		{
-			final int returnPointCount = countReturnPoints(function);
-			if(returnPointCount <= 1)
-			{
-				return;
-			}
-			registerFunctionError(function);
-		}
-	}
+    private static class ReturnCountVisitor extends JSRecursiveElementVisitor {
+        private int returnCount = 0;
 
-	private static class ReturnCountVisitor extends JSRecursiveElementVisitor
-	{
-		private int returnCount = 0;
+        @Override
+        public void visitJSElement(JSElement jsElement) {
+            int oldCount = 0;
+            if (jsElement instanceof JSFunction) {
+                oldCount = returnCount;
+            }
+            super.visitJSElement(jsElement);
 
-		@Override
-		public void visitJSElement(JSElement jsElement)
-		{
-			int oldCount = 0;
-			if(jsElement instanceof JSFunction)
-			{
-				oldCount = returnCount;
-			}
-			super.visitJSElement(jsElement);
+            if (jsElement instanceof JSFunction) {
+                returnCount = oldCount;
+            }
+        }
 
-			if(jsElement instanceof JSFunction)
-			{
-				returnCount = oldCount;
-			}
-		}
+        @Override
+        public void visitJSReturnStatement(JSReturnStatement statement) {
+            super.visitJSReturnStatement(statement);
+            returnCount++;
+        }
 
-		@Override
-		public void visitJSReturnStatement(JSReturnStatement statement)
-		{
-			super.visitJSReturnStatement(statement);
-			returnCount++;
-		}
-
-		public int getReturnCount()
-		{
-			return returnCount;
-		}
-	}
+        public int getReturnCount() {
+            return returnCount;
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
index a6827dc8..04d827b6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
@@ -7,7 +7,8 @@
 class LoopCountVisitor extends JSRecursiveElementVisitor {
     private int loopCount = 0;
 
-    @Override public void visitJSElement(JSElement jsElement) {
+    @Override
+    public void visitJSElement(JSElement jsElement) {
         int oldCount = 0;
         if (jsElement instanceof JSFunction) {
             oldCount = loopCount;
@@ -19,22 +20,26 @@ class LoopCountVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSForStatement(@Nonnull JSForStatement jsForStatement) {
+    @Override
+    public void visitJSForStatement(@Nonnull JSForStatement jsForStatement) {
         super.visitJSForStatement(jsForStatement);
         loopCount++;
     }
 
-    @Override public void visitJSForInStatement(@Nonnull JSForInStatement jsForStatement) {
+    @Override
+    public void visitJSForInStatement(@Nonnull JSForInStatement jsForStatement) {
         super.visitJSForInStatement(jsForStatement);
         loopCount++;
     }
 
-    @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement jsWhileStatement) {
+    @Override
+    public void visitJSWhileStatement(@Nonnull JSWhileStatement jsWhileStatement) {
         super.visitJSWhileStatement(jsWhileStatement);
         loopCount++;
     }
 
-    @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement jsDoWhileStatement) {
+    @Override
+    public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement jsDoWhileStatement) {
         super.visitJSDoWhileStatement(jsDoWhileStatement);
         loopCount++;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
index a7b384b5..0ec54ac1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
@@ -12,7 +12,8 @@
 class NegationCountVisitor extends JSRecursiveElementVisitor {
     private int negationCount = 0;
 
-    @Override public void visitJSElement(JSElement jsElement) {
+    @Override
+    public void visitJSElement(JSElement jsElement) {
         int oldCount = 0;
         if (jsElement instanceof JSFunction) {
             oldCount = negationCount;
@@ -24,7 +25,8 @@ class NegationCountVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+    @Override
+    public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
         super.visitJSBinaryExpression(expression);
         final IElementType sign = expression.getOperationSign();
         if (JSTokenTypes.NE.equals(sign) || JSTokenTypes.NEQEQ.equals(sign)) {
@@ -32,7 +34,8 @@ class NegationCountVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+    @Override
+    public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
         super.visitJSPrefixExpression(expression);
         final IElementType sign = expression.getOperationSign();
         if (JSTokenTypes.EXCL.equals(sign)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index fc2448c6..affa50a2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -12,68 +12,59 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class NestingDepthJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getID()
-	{
-		return "OverlyNestedFunctionJS";
-	}
+public class NestingDepthJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getID() {
+        return "OverlyNestedFunctionJS";
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.overlyNestedFunctionDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.overlyNestedFunctionDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new NestingDepthJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new NestingDepthJSInspectionState();
+    }
 
-	@RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args)
-	{
-		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-		assert function != null;
-		final NestingDepthVisitor visitor = new NestingDepthVisitor();
-		function.accept(visitor);
-		final int nestingDepth = visitor.getMaximumDepth();
-		return functionHasIdentifier(function)
-			? InspectionJSLocalize.functionIsOverlyNestedErrorString(nestingDepth).get()
-			: InspectionJSLocalize.anonymousFunctionIsOverlyNestedErrorString(nestingDepth).get();
-	}
+    @RequiredReadAction
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        assert function != null;
+        final NestingDepthVisitor visitor = new NestingDepthVisitor();
+        function.accept(visitor);
+        final int nestingDepth = visitor.getMaximumDepth();
+        return functionHasIdentifier(function)
+            ? InspectionJSLocalize.functionIsOverlyNestedErrorString(nestingDepth).get()
+            : InspectionJSLocalize.anonymousFunctionIsOverlyNestedErrorString(nestingDepth).get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private class Visitor extends BaseInspectionVisitor<NestingDepthJSInspectionState>
-	{
-		@Override
-		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
-		{
-			final NestingDepthVisitor visitor = new NestingDepthVisitor();
-			function.accept(visitor);
-			final int count = visitor.getMaximumDepth();
+    private class Visitor extends BaseInspectionVisitor<NestingDepthJSInspectionState> {
+        @Override
+        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+            final NestingDepthVisitor visitor = new NestingDepthVisitor();
+            function.accept(visitor);
+            final int count = visitor.getMaximumDepth();
 
-			if (count > myState.getLimit()) {
-				registerFunctionError(function);
-			}
-		}
-	}
+            if (count > myState.getLimit()) {
+                registerFunctionError(function);
+            }
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspectionState.java
index d181bc3f..2cf9e287 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspectionState.java
@@ -7,10 +7,8 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class NestingDepthJSInspectionState extends FunctionMetricsInspectionState<NestingDepthJSInspectionState> implements InspectionToolState<NestingDepthJSInspectionState>
-{
-	public NestingDepthJSInspectionState()
-	{
-		super(5, InspectionJSLocalize.nestingDepthLimit());
-	}
+public class NestingDepthJSInspectionState extends FunctionMetricsInspectionState<NestingDepthJSInspectionState> implements InspectionToolState<NestingDepthJSInspectionState> {
+    public NestingDepthJSInspectionState() {
+        super(5, InspectionJSLocalize.nestingDepthLimit());
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
index bc36e0ef..e87bcaac 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
@@ -25,22 +25,25 @@ class NestingDepthVisitor extends JSRecursiveElementVisitor {
     //    }
     //}
 
-    @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+    @Override
+    public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
         enterScope();
         super.visitJSDoWhileStatement(statement);
         exitScope();
     }
 
-    @Override public void visitJSForStatement(@Nonnull JSForStatement statement) {
+    @Override
+    public void visitJSForStatement(@Nonnull JSForStatement statement) {
         enterScope();
         super.visitJSForStatement(statement);
         exitScope();
     }
 
-    @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+    @Override
+    public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
         boolean isAlreadyCounted = false;
         if (statement.getParent() instanceof JSIfStatement) {
-            final JSIfStatement parent = (JSIfStatement) statement.getParent();
+            final JSIfStatement parent = (JSIfStatement)statement.getParent();
             assert parent != null;
             final JSStatement elseBranch = parent.getElse();
             if (statement.equals(elseBranch)) {
@@ -56,19 +59,22 @@ class NestingDepthVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
+    @Override
+    public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
         enterScope();
         super.visitJSTryStatement(statement);
         exitScope();
     }
 
-    @Override public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
+    @Override
+    public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
         enterScope();
         super.visitJSSwitchStatement(statement);
         exitScope();
     }
 
-    @Override public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+    @Override
+    public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
         enterScope();
         super.visitJSWhileStatement(statement);
         exitScope();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index 58656d09..18d7e084 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -14,77 +14,65 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class ParametersPerFunctionJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getID()
-	{
-		return "OverlyComplexFunctionJS";
-	}
+public class ParametersPerFunctionJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getID() {
+        return "OverlyComplexFunctionJS";
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.functionWithTooManyParametersDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.functionWithTooManyParametersDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new ParametersPerFunctionJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new ParametersPerFunctionJSInspectionState();
+    }
 
-	@RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args)
-	{
-		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-		assert function != null;
-		final JSParameterList parameterList = function.getParameterList();
-		final JSParameter[] parameters = parameterList.getParameters();
-		final int numParameters = parameters.length;
-		return functionHasIdentifier(function)
-			? InspectionJSLocalize.functionHasTooManyParametersErrorString(numParameters).get()
-			: InspectionJSLocalize.anonymousFunctionHasTooManyParametersErrorString(numParameters).get();
-	}
+    @RequiredReadAction
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        assert function != null;
+        final JSParameterList parameterList = function.getParameterList();
+        final JSParameter[] parameters = parameterList.getParameters();
+        final int numParameters = parameters.length;
+        return functionHasIdentifier(function)
+            ? InspectionJSLocalize.functionHasTooManyParametersErrorString(numParameters).get()
+            : InspectionJSLocalize.anonymousFunctionHasTooManyParametersErrorString(numParameters).get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private class Visitor extends BaseInspectionVisitor<ParametersPerFunctionJSInspectionState>
-	{
-		@Override
-		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
-		{
-			final JSParameterList parameterList = function.getParameterList();
-			if(parameterList == null)
-			{
-				return;
-			}
-			final JSParameter[] parameters = parameterList.getParameters();
-			if(parameters == null)
-			{
-				return;
-			}
-			final int numParameters = parameters.length;
-			if(numParameters <= myState.getLimit())
-			{
-				return;
-			}
-			registerFunctionError(function);
-		}
-	}
+    private class Visitor extends BaseInspectionVisitor<ParametersPerFunctionJSInspectionState> {
+        @Override
+        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+            final JSParameterList parameterList = function.getParameterList();
+            if (parameterList == null) {
+                return;
+            }
+            final JSParameter[] parameters = parameterList.getParameters();
+            if (parameters == null) {
+                return;
+            }
+            final int numParameters = parameters.length;
+            if (numParameters <= myState.getLimit()) {
+                return;
+            }
+            registerFunctionError(function);
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspectionState.java
index 461520e1..31d5bccf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspectionState.java
@@ -7,10 +7,8 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class ParametersPerFunctionJSInspectionState extends FunctionMetricsInspectionState<ParametersPerFunctionJSInspectionState> implements InspectionToolState<ParametersPerFunctionJSInspectionState>
-{
-	public ParametersPerFunctionJSInspectionState()
-	{
-		super(5, InspectionJSLocalize.functionParameterLimit());
-	}
+public class ParametersPerFunctionJSInspectionState extends FunctionMetricsInspectionState<ParametersPerFunctionJSInspectionState> implements InspectionToolState<ParametersPerFunctionJSInspectionState> {
+    public ParametersPerFunctionJSInspectionState() {
+        super(5, InspectionJSLocalize.functionParameterLimit());
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
index c5038a3a..e25f696c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
@@ -8,7 +8,8 @@
 class StatementCountVisitor extends JSRecursiveElementVisitor {
     private int statementCount = 0;
 
-    @Override public void visitJSElement(JSElement jsElement) {
+    @Override
+    public void visitJSElement(JSElement jsElement) {
         int oldCount = 0;
         if (jsElement instanceof JSFunction) {
             oldCount = statementCount;
@@ -20,18 +21,15 @@ class StatementCountVisitor extends JSRecursiveElementVisitor {
         }
     }
 
-    @Override public void visitJSStatement(@Nonnull JSStatement statement) {
+    @Override
+    public void visitJSStatement(@Nonnull JSStatement statement) {
         super.visitJSStatement(statement);
-        if(statement instanceof JSEmptyStatement ||
-                statement instanceof JSBlockStatement)
-        {
+        if (statement instanceof JSEmptyStatement || statement instanceof JSBlockStatement) {
             return;
         }
         statementCount++;
     }
 
-
-
     public int getStatementCount() {
         return statementCount;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index 3091ffce..2f83d82c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -13,78 +13,67 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class StatementsPerFunctionJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getID()
-	{
-		return "FunctionTooLongJS";
-	}
+public class StatementsPerFunctionJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getID() {
+        return "FunctionTooLongJS";
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.overlyLongFunctionDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.overlyLongFunctionDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new StatementsPerFunctionJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new StatementsPerFunctionJSInspectionState();
+    }
 
-	@RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args)
-	{
-		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-		assert function != null;
-		final PsiElement lastChild = function.getLastChild();
-		final StatementCountVisitor visitor = new StatementCountVisitor();
-		assert lastChild != null;
-		lastChild.accept(visitor);
-		final int coupling = visitor.getStatementCount();
-		return functionHasIdentifier(function)
-			? InspectionJSLocalize.functionIsOverlyLongStatementErrorString(coupling).get()
-			: InspectionJSLocalize.anonymousFunctionIsOverlyLongStatementErrorString(coupling).get();
-	}
+    @RequiredReadAction
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        assert function != null;
+        final PsiElement lastChild = function.getLastChild();
+        final StatementCountVisitor visitor = new StatementCountVisitor();
+        assert lastChild != null;
+        lastChild.accept(visitor);
+        final int coupling = visitor.getStatementCount();
+        return functionHasIdentifier(function)
+            ? InspectionJSLocalize.functionIsOverlyLongStatementErrorString(coupling).get()
+            : InspectionJSLocalize.anonymousFunctionIsOverlyLongStatementErrorString(coupling).get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private class Visitor extends BaseInspectionVisitor<StatementsPerFunctionJSInspectionState>
-	{
-		@Override
-		public void visitJSFunctionDeclaration(@Nonnull JSFunction function)
-		{
+    private class Visitor extends BaseInspectionVisitor<StatementsPerFunctionJSInspectionState> {
+        @Override
+        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
 
-			final PsiElement lastChild = function.getLastChild();
-			if(!(lastChild instanceof JSBlockStatement))
-			{
-				return;
-			}
-			final StatementCountVisitor visitor = new StatementCountVisitor();
-			lastChild.accept(visitor);
-			final int statementCount = visitor.getStatementCount();
+            final PsiElement lastChild = function.getLastChild();
+            if (!(lastChild instanceof JSBlockStatement)) {
+                return;
+            }
+            final StatementCountVisitor visitor = new StatementCountVisitor();
+            lastChild.accept(visitor);
+            final int statementCount = visitor.getStatementCount();
 
-			if(statementCount <= myState.getLimit())
-			{
-				return;
-			}
-			registerFunctionError(function);
-		}
-	}
+            if (statementCount <= myState.getLimit()) {
+                return;
+            }
+            registerFunctionError(function);
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspectionState.java
index fe0130ee..a5a9bf35 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspectionState.java
@@ -8,10 +8,8 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class StatementsPerFunctionJSInspectionState extends FunctionMetricsInspectionState<StatementsPerFunctionJSInspectionState> implements InspectionToolState<StatementsPerFunctionJSInspectionState>
-{
-	public StatementsPerFunctionJSInspectionState()
-	{
-		super(30, InspectionJSLocalize.maximumStatementsPerFunction());
-	}
+public class StatementsPerFunctionJSInspectionState extends FunctionMetricsInspectionState<StatementsPerFunctionJSInspectionState> implements InspectionToolState<StatementsPerFunctionJSInspectionState> {
+    public StatementsPerFunctionJSInspectionState() {
+        super(30, InspectionJSLocalize.maximumStatementsPerFunction());
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index c523582f..c09f68a4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -34,7 +34,7 @@ public String getGroupDisplayName() {
     @RequiredReadAction
     @Override
     public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
+        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
         final PsiElement lastChild = function.getLastChild();
         final NegationCountVisitor visitor = new NegationCountVisitor();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
index dc7eb94d..ba3a1695 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
@@ -4,28 +4,23 @@
 
 import java.util.regex.Matcher;
 
-public abstract class ConventionInspection extends JavaScriptInspection
-{
-	boolean isValid(String name, ConventionInspectionState state)
-	{
-		final int length = name.length();
-		if(length < state.m_minLength)
-		{
-			return false;
-		}
-		if(length > state.m_maxLength)
-		{
-			return false;
-		}
-		if("serialVersionUID".equals(name))
-		{
-			return true;
-		}
-		final Matcher matcher = state.getPattern().matcher(name);
-		return matcher.matches();
-	}
+public abstract class ConventionInspection extends JavaScriptInspection {
+    boolean isValid(String name, ConventionInspectionState state) {
+        final int length = name.length();
+        if (length < state.m_minLength) {
+            return false;
+        }
+        if (length > state.m_maxLength) {
+            return false;
+        }
+        if ("serialVersionUID".equals(name)) {
+            return true;
+        }
+        final Matcher matcher = state.getPattern().matcher(name);
+        return matcher.matches();
+    }
 
-	private static final int REGEX_COLUMN_COUNT = 25;
+    private static final int REGEX_COLUMN_COUNT = 25;
 
 //	@Override
 //	public JComponent createOptionsPanel()
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
index b05d51c3..358f9375 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
@@ -9,96 +9,83 @@
 import consulo.util.xml.serializer.annotation.Transient;
 
 import jakarta.annotation.Nullable;
+
 import java.util.regex.Pattern;
 
 /**
  * @author VISTALL
  * @since 18/03/2023
  */
-public class ConventionInspectionState<T extends ConventionInspectionState<T>>
-{
-	public String m_regex;
-
-	public int m_minLength;
-
-	public int m_maxLength;
-
-	@Transient
-	private Pattern m_regexPattern;
-
-	public ConventionInspectionState()
-	{
-	}
-
-	public ConventionInspectionState(String regex, int minLength, int maxLength)
-	{
-		this.m_regex = regex;
-		this.m_minLength = minLength;
-		this.m_maxLength = maxLength;
-	}
-
-	public String getRegex()
-	{
-		return m_regex;
-	}
-
-	public void setRegex(String m_regex)
-	{
-		this.m_regex = m_regex;
-	}
-
-	public int getMinLength()
-	{
-		return m_minLength;
-	}
-
-	public void setMinLength(int m_minLength)
-	{
-		this.m_minLength = m_minLength;
-	}
-
-	public int getMaxLength()
-	{
-		return m_maxLength;
-	}
-
-	public void setMaxLength(int m_maxLength)
-	{
-		this.m_maxLength = m_maxLength;
-	}
-
-	public Pattern getPattern()
-	{
-		if(m_regexPattern == null)
-		{
-			m_regexPattern = Pattern.compile(m_regex);
-		}
-		return m_regexPattern;
-	}
-
-	@SuppressWarnings("unchecked")
-	public T getState()
-	{
-		return (T) this;
-	}
-
-	public void loadState(T state)
-	{
-		XmlSerializerUtil.copyBean(state, this);
-
-		m_regexPattern = null;
-	}
-
-	@Nullable
-	public UnnamedConfigurable createConfigurable()
-	{
-		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
-		builder.component(() -> Label.create(InspectionJSLocalize.patternParameter()));
-		builder.textBox(() -> m_regex, s -> m_regex = s);
-		builder.component(() -> Label.create(InspectionJSLocalize.minLengthParameter()));
-		builder.intBox(() -> m_minLength, value -> m_minLength = value);
-		builder.component(() -> Label.create(InspectionJSLocalize.maxLengthParameter()));
-		builder.intBox(() -> m_maxLength, value -> m_maxLength = value);
-		return builder.buildUnnamed();
-	}
+public class ConventionInspectionState<T extends ConventionInspectionState<T>> {
+    public String m_regex;
+
+    public int m_minLength;
+
+    public int m_maxLength;
+
+    @Transient
+    private Pattern m_regexPattern;
+
+    public ConventionInspectionState() {
+    }
+
+    public ConventionInspectionState(String regex, int minLength, int maxLength) {
+        this.m_regex = regex;
+        this.m_minLength = minLength;
+        this.m_maxLength = maxLength;
+    }
+
+    public String getRegex() {
+        return m_regex;
+    }
+
+    public void setRegex(String m_regex) {
+        this.m_regex = m_regex;
+    }
+
+    public int getMinLength() {
+        return m_minLength;
+    }
+
+    public void setMinLength(int m_minLength) {
+        this.m_minLength = m_minLength;
+    }
+
+    public int getMaxLength() {
+        return m_maxLength;
+    }
+
+    public void setMaxLength(int m_maxLength) {
+        this.m_maxLength = m_maxLength;
+    }
+
+    public Pattern getPattern() {
+        if (m_regexPattern == null) {
+            m_regexPattern = Pattern.compile(m_regex);
+        }
+        return m_regexPattern;
+    }
+
+    @SuppressWarnings("unchecked")
+    public T getState() {
+        return (T)this;
+    }
+
+    public void loadState(T state) {
+        XmlSerializerUtil.copyBean(state, this);
+
+        m_regexPattern = null;
+    }
+
+    @Nullable
+    public UnnamedConfigurable createConfigurable() {
+        ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+        builder.component(() -> Label.create(InspectionJSLocalize.patternParameter()));
+        builder.textBox(() -> m_regex, s -> m_regex = s);
+        builder.component(() -> Label.create(InspectionJSLocalize.minLengthParameter()));
+        builder.intBox(() -> m_minLength, value -> m_minLength = value);
+        builder.component(() -> Label.create(InspectionJSLocalize.maxLengthParameter()));
+        builder.intBox(() -> m_maxLength, value -> m_maxLength = value);
+        return builder.buildUnnamed();
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index e0751bda..979614d6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -14,97 +14,80 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class FunctionNamingConventionJSInspection extends ConventionInspection
-{
-	private final RenameFix fix = new RenameFix();
+public class FunctionNamingConventionJSInspection extends ConventionInspection {
+    private final RenameFix fix = new RenameFix();
 
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return false;
-	}
+    @Override
+    public boolean isEnabledByDefault() {
+        return false;
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new FunctionNamingConventionJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new FunctionNamingConventionJSInspectionState();
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.functionNamingConventionDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.functionNamingConventionDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
+    }
 
-	@Override
-	protected InspectionJSFix buildFix(PsiElement location, Object state)
-	{
-		return fix;
-	}
+    @Override
+    protected InspectionJSFix buildFix(PsiElement location, Object state) {
+        return fix;
+    }
 
-	@Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
-	{
-		return true;
-	}
+    @Override
+    protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
+        return true;
+    }
 
-	@RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args)
-	{
-		ConventionInspectionState inspectionState = (ConventionInspectionState) state;
-		final String functionName = ((PsiElement) args[0]).getText();
+    @RequiredReadAction
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        ConventionInspectionState inspectionState = (ConventionInspectionState)state;
+        final String functionName = ((PsiElement)args[0]).getText();
 
-		assert functionName != null;
-		if(functionName.length() < inspectionState.m_minLength)
-		{
-			return InspectionJSLocalize.functionNameIsTooShortErrorString(functionName).get();
-		}
-		else if(functionName.length() > inspectionState.m_maxLength)
-		{
-			return InspectionJSLocalize.functionNameIsTooLongErrorString(functionName).get();
-		}
-		return InspectionJSLocalize.functionNameDoesntMatchRegexErrorString(functionName, inspectionState.m_regex).get();
-	}
+        assert functionName != null;
+        if (functionName.length() < inspectionState.m_minLength) {
+            return InspectionJSLocalize.functionNameIsTooShortErrorString(functionName).get();
+        }
+        else if (functionName.length() > inspectionState.m_maxLength) {
+            return InspectionJSLocalize.functionNameIsTooLongErrorString(functionName).get();
+        }
+        return InspectionJSLocalize.functionNameDoesntMatchRegexErrorString(functionName, inspectionState.m_regex).get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private class Visitor extends BaseInspectionVisitor<ConventionInspectionState>
-	{
-		@Override
-		public void visitJSFunctionDeclaration(JSFunction function)
-		{
-			super.visitJSFunctionDeclaration(function);
+    private class Visitor extends BaseInspectionVisitor<ConventionInspectionState> {
+        @Override
+        public void visitJSFunctionDeclaration(JSFunction function) {
+            super.visitJSFunctionDeclaration(function);
 
-			final String name = function.getName();
-			if(name == null)
-			{
-				return;
-			}
-			if(isValid(name, myState))
-			{
-				return;
-			}
-			final PsiElement identifier = function.getNameIdentifier();
-			if(identifier == null ||
-					!PsiTreeUtil.isAncestor(function, identifier, true))
-			{
-				return;
-			}
-			registerFunctionError(function);
-		}
-	}
+            final String name = function.getName();
+            if (name == null) {
+                return;
+            }
+            if (isValid(name, myState)) {
+                return;
+            }
+            final PsiElement identifier = function.getNameIdentifier();
+            if (identifier == null || !PsiTreeUtil.isAncestor(function, identifier, true)) {
+                return;
+            }
+            registerFunctionError(function);
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java
index c5c77f65..44c4075f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspectionState.java
@@ -6,10 +6,9 @@
  * @author VISTALL
  * @since 18/03/2023
  */
-public class FunctionNamingConventionJSInspectionState extends ConventionInspectionState<FunctionNamingConventionJSInspectionState> implements InspectionToolState<FunctionNamingConventionJSInspectionState>
-{
-	public FunctionNamingConventionJSInspectionState()
-	{
-		super("[a-z][A-Za-z]*", 4, 32);
-	}
+public class FunctionNamingConventionJSInspectionState extends ConventionInspectionState<FunctionNamingConventionJSInspectionState>
+    implements InspectionToolState<FunctionNamingConventionJSInspectionState> {
+    public FunctionNamingConventionJSInspectionState() {
+        super("[a-z][A-Za-z]*", 4, 32);
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index c07480ec..61a85512 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -14,95 +14,79 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class LocalVariableNamingConventionJSInspection extends ConventionInspection
-{
-	private final RenameFix fix = new RenameFix();
+public class LocalVariableNamingConventionJSInspection extends ConventionInspection {
+    private final RenameFix fix = new RenameFix();
 
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return false;
-	}
+    @Override
+    public boolean isEnabledByDefault() {
+        return false;
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.localVariableNamingConventionDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.localVariableNamingConventionDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
+    }
 
-	@Override
-	protected InspectionJSFix buildFix(PsiElement location, Object state)
-	{
-		return fix;
-	}
+    @Override
+    protected InspectionJSFix buildFix(PsiElement location, Object state) {
+        return fix;
+    }
 
-	@Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
-	{
-		return true;
-	}
+    @Override
+    protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
+        return true;
+    }
 
-	@RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args)
-	{
-		LocalVariableNamingConventionJSInspectionState inspectionState = (LocalVariableNamingConventionJSInspectionState) state;
+    @RequiredReadAction
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        LocalVariableNamingConventionJSInspectionState inspectionState = (LocalVariableNamingConventionJSInspectionState)state;
 
-		final JSVariable variable = (JSVariable) ((PsiElement) args[0]).getParent();
-		assert variable != null;
-		final String variableName = variable.getName();
-		if (variableName.length() < inspectionState.m_minLength)
-		{
-			return InspectionJSLocalize.variableNameIsTooShortErrorString().get();
-		}
-		else if (variableName.length() > inspectionState.m_maxLength)
-		{
-			return InspectionJSLocalize.variableNameIsTooLongErrorString().get();
-		}
-		return InspectionJSLocalize.variableNameDoesntMatchRegexErrorString(inspectionState.m_regex).get();
-	}
+        final JSVariable variable = (JSVariable)((PsiElement)args[0]).getParent();
+        assert variable != null;
+        final String variableName = variable.getName();
+        if (variableName.length() < inspectionState.m_minLength) {
+            return InspectionJSLocalize.variableNameIsTooShortErrorString().get();
+        }
+        else if (variableName.length() > inspectionState.m_maxLength) {
+            return InspectionJSLocalize.variableNameIsTooLongErrorString().get();
+        }
+        return InspectionJSLocalize.variableNameDoesntMatchRegexErrorString(inspectionState.m_regex).get();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new LocalVariableNamingConventionJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new LocalVariableNamingConventionJSInspectionState();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private class Visitor extends BaseInspectionVisitor<LocalVariableNamingConventionJSInspectionState>
-	{
-		@Override
-		public void visitJSVarStatement(JSVarStatement jsVarStatement)
-		{
-			super.visitJSVarStatement(jsVarStatement);
-			final JSVariable[] variables = jsVarStatement.getVariables();
-			for (JSVariable variable : variables)
-			{
-				final String name = variable.getName();
-				if (name == null)
-				{
-					continue;
-				}
-				if (isValid(name, myState))
-				{
-					continue;
-				}
-				registerVariableError(variable);
-			}
-		}
-	}
+    private class Visitor extends BaseInspectionVisitor<LocalVariableNamingConventionJSInspectionState> {
+        @Override
+        public void visitJSVarStatement(JSVarStatement jsVarStatement) {
+            super.visitJSVarStatement(jsVarStatement);
+            final JSVariable[] variables = jsVarStatement.getVariables();
+            for (JSVariable variable : variables) {
+                final String name = variable.getName();
+                if (name == null) {
+                    continue;
+                }
+                if (isValid(name, myState)) {
+                    continue;
+                }
+                registerVariableError(variable);
+            }
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspectionState.java
index 5ecc0c09..0e40d656 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspectionState.java
@@ -6,10 +6,10 @@
  * @author VISTALL
  * @since 18/03/2023
  */
-public class LocalVariableNamingConventionJSInspectionState extends ConventionInspectionState<LocalVariableNamingConventionJSInspectionState> implements InspectionToolState<LocalVariableNamingConventionJSInspectionState>
-{
-	public LocalVariableNamingConventionJSInspectionState()
-	{
-		super("[a-z][A-Za-z]*", 1, 32);
-	}
+public class LocalVariableNamingConventionJSInspectionState
+    extends ConventionInspectionState<LocalVariableNamingConventionJSInspectionState>
+    implements InspectionToolState<LocalVariableNamingConventionJSInspectionState> {
+    public LocalVariableNamingConventionJSInspectionState() {
+        super("[a-z][A-Za-z]*", 1, 32);
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index 696ad7f1..e29f331c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -16,100 +16,83 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class ParameterNamingConventionJSInspection extends ConventionInspection
-{
-	private final RenameFix fix = new RenameFix();
+public class ParameterNamingConventionJSInspection extends ConventionInspection {
+    private final RenameFix fix = new RenameFix();
 
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return false;
-	}
+    @Override
+    public boolean isEnabledByDefault() {
+        return false;
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.functionParameterNamingConventionDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.functionParameterNamingConventionDisplayName().get();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new ParameterNamingConventionJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new ParameterNamingConventionJSInspectionState();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
+    }
 
-	@Override
-	protected InspectionJSFix buildFix(PsiElement location, Object state)
-	{
-		return fix;
-	}
+    @Override
+    protected InspectionJSFix buildFix(PsiElement location, Object state) {
+        return fix;
+    }
 
-	@Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
-	{
-		return true;
-	}
+    @Override
+    protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
+        return true;
+    }
 
-	@RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args)
-	{
-		ParameterNamingConventionJSInspectionState inspectionState = (ParameterNamingConventionJSInspectionState) state;
+    @RequiredReadAction
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        ParameterNamingConventionJSInspectionState inspectionState = (ParameterNamingConventionJSInspectionState)state;
 
-		final JSParameter parameter = (JSParameter) ((PsiElement) args[0]).getParent();
-		assert parameter != null;
-		final String parameterName = parameter.getName();
-		if (parameterName.length() < inspectionState.m_minLength)
-		{
-			return InspectionJSLocalize.parameterNameIsTooShortErrorString().get();
-		}
-		else if (parameterName.length() > inspectionState.m_maxLength)
-		{
-			return InspectionJSLocalize.parameterNameIsTooLongErrorString().get();
-		}
-		return InspectionJSLocalize.parameterNameDoesntMatchRegexErrorString(inspectionState.m_regex).get();
-	}
+        final JSParameter parameter = (JSParameter)((PsiElement)args[0]).getParent();
+        assert parameter != null;
+        final String parameterName = parameter.getName();
+        if (parameterName.length() < inspectionState.m_minLength) {
+            return InspectionJSLocalize.parameterNameIsTooShortErrorString().get();
+        }
+        else if (parameterName.length() > inspectionState.m_maxLength) {
+            return InspectionJSLocalize.parameterNameIsTooLongErrorString().get();
+        }
+        return InspectionJSLocalize.parameterNameDoesntMatchRegexErrorString(inspectionState.m_regex).get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private class Visitor extends BaseInspectionVisitor<ParameterNamingConventionJSInspectionState>
-	{
-		@Override
-		public void visitJSFunctionDeclaration(JSFunction function)
-		{
-			super.visitJSFunctionDeclaration(function);
-			final JSParameterList parameterList = function.getParameterList();
-			if(parameterList == null)
-			{
-				return;
-			}
-			final JSParameter[] parameters = parameterList.getParameters();
-			for(JSVariable variable : parameters)
-			{
-				final String name = variable.getName();
-				if(name == null)
-				{
-					continue;
-				}
-				if(isValid(name, myState))
-				{
-					continue;
-				}
-				registerVariableError(variable);
-			}
-		}
-	}
+    private class Visitor extends BaseInspectionVisitor<ParameterNamingConventionJSInspectionState> {
+        @Override
+        public void visitJSFunctionDeclaration(JSFunction function) {
+            super.visitJSFunctionDeclaration(function);
+            final JSParameterList parameterList = function.getParameterList();
+            if (parameterList == null) {
+                return;
+            }
+            final JSParameter[] parameters = parameterList.getParameters();
+            for (JSVariable variable : parameters) {
+                final String name = variable.getName();
+                if (name == null) {
+                    continue;
+                }
+                if (isValid(name, myState)) {
+                    continue;
+                }
+                registerVariableError(variable);
+            }
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspectionState.java
index ae5151c0..920aa3db 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspectionState.java
@@ -6,10 +6,8 @@
  * @author VISTALL
  * @since 18/03/2023
  */
-public class ParameterNamingConventionJSInspectionState extends ConventionInspectionState<ParameterNamingConventionJSInspectionState> implements InspectionToolState<ParameterNamingConventionJSInspectionState>
-{
-	public ParameterNamingConventionJSInspectionState()
-	{
-		super("[a-z][A-Za-z]*", 1, 32);
-	}
+public class ParameterNamingConventionJSInspectionState extends ConventionInspectionState<ParameterNamingConventionJSInspectionState> implements InspectionToolState<ParameterNamingConventionJSInspectionState> {
+    public ParameterNamingConventionJSInspectionState() {
+        super("[a-z][A-Za-z]*", 1, 32);
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index aee85d6f..bf361813 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -57,7 +57,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             if (!(lhs instanceof JSBinaryExpression)) {
                 return;
             }
-            if (!isEqualityComparison((JSBinaryExpression) lhs)) {
+            if (!isEqualityComparison((JSBinaryExpression)lhs)) {
                 return;
             }
             registerError(expression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index ef2f1183..db98c53b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -13,79 +13,63 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class ChainedFunctionCallJSInspection extends JavaScriptInspection
-{
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return true;
-	}
+public class ChainedFunctionCallJSInspection extends JavaScriptInspection {
+    @Override
+    public boolean isEnabledByDefault() {
+        return true;
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.STYLE_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME.get();
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.chainedFunctionCallDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.chainedFunctionCallDisplayName().get();
+    }
 
-	@RequiredReadAction
-	@Override
-	@Nonnull
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.chainedFunctionCallProblemDescriptor().get();
-	}
+    @RequiredReadAction
+    @Override
+    @Nonnull
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.chainedFunctionCallProblemDescriptor().get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new NestedMethodCallVisitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new NestedMethodCallVisitor();
+    }
 
-	private static class NestedMethodCallVisitor extends BaseInspectionVisitor
-	{
-		@Override
-		public void visitJSCallExpression(@Nonnull JSCallExpression expression)
-		{
-			super.visitJSCallExpression(expression);
-			final JSExpression reference = expression.getMethodExpression();
-			if(!(reference instanceof JSReferenceExpression))
-			{
-				return;
-			}
-			final JSExpression qualifier = ((JSReferenceExpression) reference).getQualifier();
-			if(qualifier == null)
-			{
-				return;
-			}
-			if(!isCallExpression(qualifier))
-			{
-				return;
-			}
-			registerFunctionCallError(expression);
-		}
+    private static class NestedMethodCallVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
+            super.visitJSCallExpression(expression);
+            final JSExpression reference = expression.getMethodExpression();
+            if (!(reference instanceof JSReferenceExpression)) {
+                return;
+            }
+            final JSExpression qualifier = ((JSReferenceExpression)reference).getQualifier();
+            if (qualifier == null) {
+                return;
+            }
+            if (!isCallExpression(qualifier)) {
+                return;
+            }
+            registerFunctionCallError(expression);
+        }
 
-
-		private static boolean isCallExpression(JSExpression expression)
-		{
-			if(expression instanceof JSCallExpression)
-			{
-				return true;
-			}
-			if(expression instanceof JSParenthesizedExpression)
-			{
-				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-				final JSExpression containedExpression = parenthesizedExpression.getInnerExpression();
-				return isCallExpression(containedExpression);
-			}
-			return false;
-		}
-	}
+        private static boolean isCallExpression(JSExpression expression) {
+            if (expression instanceof JSCallExpression) {
+                return true;
+            }
+            if (expression instanceof JSParenthesizedExpression parenthesizedExpression) {
+                final JSExpression containedExpression = parenthesizedExpression.getInnerExpression();
+                return isCallExpression(containedExpression);
+            }
+            return false;
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index 28e554e3..c901b5ee 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -63,7 +63,7 @@ public String getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
+            final JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
             final JSExpression rhs = expression.getROperand();
             final JSExpression lhs = expression.getLOperand();
             final IElementType sign = expression.getOperationSign();
@@ -76,7 +76,8 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
     }
 
     private static class ConstantOnRHSOfComparisonVisitor extends BaseInspectionVisitor {
-        @Override public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index 26083608..245fb0d0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -65,7 +65,7 @@ public String getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
+            final JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
             final JSExpression rhs = expression.getROperand();
             final JSExpression lhs = expression.getLOperand();
             final IElementType sign = expression.getOperationSign();
@@ -90,7 +90,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             final JSExpression lhs = expression.getLOperand();
             final JSExpression rhs = expression.getROperand();
             if (lhs instanceof JSLiteralExpression ||
-                    !(rhs instanceof JSLiteralExpression)) {
+                !(rhs instanceof JSLiteralExpression)) {
                 return;
             }
             registerError(expression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index a22ccdfe..ee42f20e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -13,62 +13,52 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class NestedFunctionCallJSInspection extends JavaScriptInspection
-{
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return false;
-	}
+public class NestedFunctionCallJSInspection extends JavaScriptInspection {
+    @Override
+    public boolean isEnabledByDefault() {
+        return false;
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.STYLE_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME.get();
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.nestedFunctionCallDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.nestedFunctionCallDisplayName().get();
+    }
 
-	@RequiredReadAction
-	@Override
-	@Nonnull
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.nestedFunctionCallProblemDescriptor().get();
-	}
+    @RequiredReadAction
+    @Override
+    @Nonnull
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.nestedFunctionCallProblemDescriptor().get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new NestedMethodCallVisitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new NestedMethodCallVisitor();
+    }
 
-	private static class NestedMethodCallVisitor extends BaseInspectionVisitor
-	{
-		@Override
-		public void visitJSCallExpression(@Nonnull JSCallExpression expression)
-		{
-			super.visitJSCallExpression(expression);
-			JSExpression outerExpression = expression;
-			while (outerExpression != null && outerExpression.getParent() instanceof JSExpression parentExpression)
-			{
-				outerExpression = parentExpression;
-			}
-			if (outerExpression == null)
-			{
-				return;
-			}
-			final PsiElement parent = outerExpression.getParent();
-			if (!(parent instanceof JSArgumentList && parent.getParent() instanceof JSCallExpression)) {
-				return;
-			}
-			registerFunctionCallError(expression);
-		}
-	}
+    private static class NestedMethodCallVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
+            super.visitJSCallExpression(expression);
+            JSExpression outerExpression = expression;
+            while (outerExpression != null && outerExpression.getParent() instanceof JSExpression parentExpression) {
+                outerExpression = parentExpression;
+            }
+            if (outerExpression == null) {
+                return;
+            }
+            final PsiElement parent = outerExpression.getParent();
+            if (!(parent instanceof JSArgumentList && parent.getParent() instanceof JSCallExpression)) {
+                return;
+            }
+            registerFunctionCallError(expression);
+        }
+    }
 }
\ No newline at end of file

From 300341a4229840d7f78c90de24b78e415f957986 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 25 Jul 2024 14:23:57 +0300
Subject: [PATCH 220/340] Code reformat using IJ4 code style (part 11).

---
 .../com/sixrr/inspectjs/BaseInspection.java   | 171 ++++----
 .../inspectjs/BaseInspectionVisitor.java      | 286 ++++++-------
 .../sixrr/inspectjs/InspectionComparator.java |  11 +-
 .../com/sixrr/inspectjs/InspectionJSFix.java  |  41 +-
 .../sixrr/inspectjs/JavaScriptInspection.java |   1 -
 .../UnterminatedStatementJSInspection.java    | 341 +++++++--------
 .../sixrr/inspectjs/ui/RegExFormatter.java    |   9 +-
 .../inspectjs/ui/RegExInputVerifier.java      |   3 +-
 .../ui/SingleCheckboxOptionsPanel.java        |  14 +-
 .../ui/SingleIntegerFieldOptionsPanel.java    |  14 +-
 .../com/sixrr/inspectjs/utils/BoolUtils.java  |  22 +-
 .../inspectjs/utils/ComparisonUtils.java      |   2 +-
 .../inspectjs/utils/ConditionalUtils.java     |  21 +-
 .../inspectjs/utils/ControlFlowUtils.java     | 274 +++++-------
 .../inspectjs/utils/EquivalenceChecker.java   | 396 +++++++-----------
 .../sixrr/inspectjs/utils/ExpressionUtil.java |  35 +-
 .../inspectjs/utils/ParenthesesUtils.java     |  39 +-
 .../inspectjs/utils/SideEffectChecker.java    |  24 +-
 .../sixrr/inspectjs/utils/StatementUtils.java |   9 +-
 .../BadExpressionStatementJSInspection.java   | 285 ++++++-------
 .../DuplicateCaseLabelJSInspection.java       |   7 +-
 ...DuplicatePropertyOnObjectJSInspection.java |   5 +-
 ...onWithInconsistentReturnsJSInspection.java | 313 ++++++--------
 ...ionReferencesGlobalObjectJSInspection.java |   3 +-
 .../validity/UnreachableCodeJSInspection.java |   4 +-
 25 files changed, 1028 insertions(+), 1302 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
index e04561dc..3b7adf8a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
@@ -17,94 +17,85 @@
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
-public abstract class BaseInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool
-{
-	@Override
-	@Nonnull
-	@SuppressWarnings("unchecked")
-	public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder problemsHolder, boolean onTheFly, LocalInspectionToolSession session, Object state)
-	{
-		if(!canBuildVisitor(problemsHolder.getFile()))
-		{
-			return PsiElementVisitor.EMPTY_VISITOR;
-		}
-
-		final BaseInspectionVisitor visitor = buildVisitor();
-		visitor.setProblemsHolder(problemsHolder);
-		visitor.setOnTheFly(onTheFly);
-		visitor.setInspection(this);
-		visitor.setState(state);
-		return visitor;
-	}
-
-	@Nullable
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
-
-	@Nonnull
-	@Override
-	public HighlightDisplayLevel getDefaultLevel()
-	{
-		return HighlightDisplayLevel.WARNING;
-	}
-
-	public boolean canBuildVisitor(@Nonnull PsiFile psiFile)
-	{
-		return true;
-	}
-
-	@Nullable
-	@RequiredReadAction
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return null;
-	}
-
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
-	{
-		return false;
-	}
-
-	@Nullable
-	protected InspectionJSFix buildFix(PsiElement location, Object state)
-	{
-		return null;
-	}
-
-	@Nullable
-	protected InspectionJSFix[] buildFixes(PsiElement location)
-	{
-		return null;
-	}
-
-	public abstract BaseInspectionVisitor buildVisitor();
-
-	protected boolean functionHasIdentifier(JSFunction function)
-	{
-		final PsiElement identifier = function.getNameIdentifier();
-		return identifier != null && PsiTreeUtil.isAncestor(function, identifier, true);
-	}
-
-	@Override
-	public PsiNamedElement getProblemElement(final PsiElement psiElement)
-	{
-		return PsiTreeUtil.getNonStrictParentOfType(psiElement, PsiFile.class);
-	}
-
-	@Override
-	public SuppressIntentionAction[] getSuppressActions(@Nullable final PsiElement element)
-	{
-		return new SuppressIntentionAction[]{
-		   /* new AddNoInspectionCommentFix(HighlightDisplayKey.find(getShortName()), JSSuppressionHolder.class),  */
-		};
-	}
-
-	@Override
-	public boolean isSuppressedFor(@Nonnull final PsiElement element)
-	{
-		return SuppressionUtil.isSuppressedInStatement(element, getID(), JSSuppressionHolder.class);
-	}
+public abstract class BaseInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool {
+    @Override
+    @Nonnull
+    @SuppressWarnings("unchecked")
+    public PsiElementVisitor buildVisitor(
+        @Nonnull ProblemsHolder problemsHolder,
+        boolean onTheFly,
+        LocalInspectionToolSession session,
+        Object state
+    ) {
+        if (!canBuildVisitor(problemsHolder.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
+        final BaseInspectionVisitor visitor = buildVisitor();
+        visitor.setProblemsHolder(problemsHolder);
+        visitor.setOnTheFly(onTheFly);
+        visitor.setInspection(this);
+        visitor.setState(state);
+        return visitor;
+    }
+
+    @Nullable
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
+
+    @Nonnull
+    @Override
+    public HighlightDisplayLevel getDefaultLevel() {
+        return HighlightDisplayLevel.WARNING;
+    }
+
+    public boolean canBuildVisitor(@Nonnull PsiFile psiFile) {
+        return true;
+    }
+
+    @Nullable
+    @RequiredReadAction
+    protected String buildErrorString(Object state, Object... args) {
+        return null;
+    }
+
+    protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
+        return false;
+    }
+
+    @Nullable
+    protected InspectionJSFix buildFix(PsiElement location, Object state) {
+        return null;
+    }
+
+    @Nullable
+    protected InspectionJSFix[] buildFixes(PsiElement location) {
+        return null;
+    }
+
+    public abstract BaseInspectionVisitor buildVisitor();
+
+    protected boolean functionHasIdentifier(JSFunction function) {
+        final PsiElement identifier = function.getNameIdentifier();
+        return identifier != null && PsiTreeUtil.isAncestor(function, identifier, true);
+    }
+
+    @Override
+    public PsiNamedElement getProblemElement(final PsiElement psiElement) {
+        return PsiTreeUtil.getNonStrictParentOfType(psiElement, PsiFile.class);
+    }
+
+    @Override
+    public SuppressIntentionAction[] getSuppressActions(@Nullable final PsiElement element) {
+        return new SuppressIntentionAction[]{
+            /* new AddNoInspectionCommentFix(HighlightDisplayKey.find(getShortName()), JSSuppressionHolder.class),  */
+        };
+    }
+
+    @Override
+    public boolean isSuppressedFor(@Nonnull final PsiElement element) {
+        return SuppressionUtil.isSuppressedInStatement(element, getID(), JSSuppressionHolder.class);
+    }
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
index c3d7779d..93d32e6e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
@@ -11,160 +11,134 @@
 
 import java.util.List;
 
-public abstract class BaseInspectionVisitor<T> extends JSElementVisitor
-{
-	private BaseInspection inspection = null;
-	private ProblemsHolder problemsHolder = null;
-	private boolean onTheFly = false;
-	private List<ProblemDescriptor> errors = null;
-	protected T myState;
-
-	public void setState(T state)
-	{
-		myState = state;
-	}
-
-	public void setInspection(BaseInspection inspection)
-	{
-		this.inspection = inspection;
-	}
-
-	public void setProblemsHolder(ProblemsHolder problemsHolder)
-	{
-		this.problemsHolder = problemsHolder;
-	}
-
-	public void setOnTheFly(boolean onTheFly)
-	{
-		this.onTheFly = onTheFly;
-	}
-
-	@RequiredReadAction
-	protected void registerFunctionCallError(JSCallExpression expression)
-	{
-		final JSExpression methodExpression = expression.getMethodExpression();
-		PsiElement errorLocation = null;
-
-		if(methodExpression instanceof JSReferenceExpression)
-		{
-			errorLocation = ((JSReferenceExpression) methodExpression).getReferenceNameElement();
-		}
-		else if(methodExpression instanceof JSFunction)
-		{
-			final PsiElement node = ((JSFunction) methodExpression).getNameIdentifier();
-			if(node != null)
-			{
-				errorLocation = node;
-			}
-			else
-			{
-				errorLocation = methodExpression;
-			}
-		}
-
-		registerError(errorLocation);
-	}
-
-	protected void registerStatementError(JSStatement statement, Object... args)
-	{
-		final PsiElement statementToken = statement.getFirstChild();
-		registerError(statementToken, args);
-	}
-
-	protected void registerFunctionError(JSFunction function)
-	{
-		final PsiElement identifier = function.getNameIdentifier();
-		if(identifier == null ||
-				!PsiTreeUtil.isAncestor(function, identifier, true))
-		{
-			registerError(function.getFirstChild());
-		}
-		else
-		{
-			registerError(identifier);
-		}
-	}
-
-	protected void registerVariableError(JSVariable variable)
-	{
-		final PsiElement nameIdentifier = variable.getFirstChild();
-		registerError(nameIdentifier);
-	}
-
-	protected void registerError(PsiElement location)
-	{
-		if(location == null)
-		{
-			return;
-		}
-		final LocalQuickFix[] fix = createFixes(location, myState);
-		final String description = inspection.buildErrorString(myState, location);
-		registerError(location, description, fix);
-	}
-
-	private void registerError(PsiElement location, String description,
-							   LocalQuickFix[] fixes)
-	{
-		problemsHolder.registerProblem(getEditorErrorLocation(location),
-				description,
-				getProblemHighlightType(location), fixes);
-	}
-
-	protected ProblemHighlightType getProblemHighlightType(PsiElement location)
-	{
-		return ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-	}
-
-	protected PsiElement getEditorErrorLocation(final @Nonnull PsiElement location)
-	{
-		return location;
-	}
-
-	protected void registerError(PsiElement location, Object... args)
-	{
-		final LocalQuickFix[] fix = createFixes(location, myState);
-		final String description = inspection.buildErrorString(myState, args);
-		registerError(location, description, fix);
-	}
-
-	@Nullable
-	private LocalQuickFix[] createFixes(PsiElement location, Object state)
-	{
-		if(!onTheFly && inspection.buildQuickFixesOnlyForOnTheFlyErrors())
-		{
-			return null;
-		}
-		final InspectionJSFix[] fixes = inspection.buildFixes(location);
-		if(fixes != null)
-		{
-			return fixes;
-		}
-		final InspectionJSFix fix = inspection.buildFix(location, state);
-		if(fix == null)
-		{
-			return null;
-		}
-		return new InspectionJSFix[]{fix};
-	}
-
-	@Nullable
-	public ProblemDescriptor[] getErrors()
-	{
-		if(errors == null)
-		{
-			return null;
-		}
-		else
-		{
-			final int numErrors = errors.size();
-			return errors.toArray(new ProblemDescriptor[numErrors]);
-		}
-	}
-
-	@Override
-	public void visitWhiteSpace(PsiWhiteSpace space)
-	{
-		// none of our inspections need to do anything with white space,
-		// so this is a performance optimization
-	}
+public abstract class BaseInspectionVisitor<T> extends JSElementVisitor {
+    private BaseInspection inspection = null;
+    private ProblemsHolder problemsHolder = null;
+    private boolean onTheFly = false;
+    private List<ProblemDescriptor> errors = null;
+    protected T myState;
+
+    public void setState(T state) {
+        myState = state;
+    }
+
+    public void setInspection(BaseInspection inspection) {
+        this.inspection = inspection;
+    }
+
+    public void setProblemsHolder(ProblemsHolder problemsHolder) {
+        this.problemsHolder = problemsHolder;
+    }
+
+    public void setOnTheFly(boolean onTheFly) {
+        this.onTheFly = onTheFly;
+    }
+
+    @RequiredReadAction
+    protected void registerFunctionCallError(JSCallExpression expression) {
+        final JSExpression methodExpression = expression.getMethodExpression();
+        PsiElement errorLocation = null;
+
+        if (methodExpression instanceof JSReferenceExpression referenceExpression) {
+            errorLocation = referenceExpression.getReferenceNameElement();
+        }
+        else if (methodExpression instanceof JSFunction function) {
+            final PsiElement node = function.getNameIdentifier();
+            if (node != null) {
+                errorLocation = node;
+            }
+            else {
+                errorLocation = methodExpression;
+            }
+        }
+
+        registerError(errorLocation);
+    }
+
+    protected void registerStatementError(JSStatement statement, Object... args) {
+        final PsiElement statementToken = statement.getFirstChild();
+        registerError(statementToken, args);
+    }
+
+    protected void registerFunctionError(JSFunction function) {
+        final PsiElement identifier = function.getNameIdentifier();
+        if (identifier == null ||
+            !PsiTreeUtil.isAncestor(function, identifier, true)) {
+            registerError(function.getFirstChild());
+        }
+        else {
+            registerError(identifier);
+        }
+    }
+
+    protected void registerVariableError(JSVariable variable) {
+        final PsiElement nameIdentifier = variable.getFirstChild();
+        registerError(nameIdentifier);
+    }
+
+    protected void registerError(PsiElement location) {
+        if (location == null) {
+            return;
+        }
+        final LocalQuickFix[] fix = createFixes(location, myState);
+        final String description = inspection.buildErrorString(myState, location);
+        registerError(location, description, fix);
+    }
+
+    private void registerError(
+        PsiElement location, String description,
+        LocalQuickFix[] fixes
+    ) {
+        problemsHolder.registerProblem(getEditorErrorLocation(location),
+            description,
+            getProblemHighlightType(location), fixes
+        );
+    }
+
+    protected ProblemHighlightType getProblemHighlightType(PsiElement location) {
+        return ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
+    }
+
+    protected PsiElement getEditorErrorLocation(final @Nonnull PsiElement location) {
+        return location;
+    }
+
+    protected void registerError(PsiElement location, Object... args) {
+        final LocalQuickFix[] fix = createFixes(location, myState);
+        final String description = inspection.buildErrorString(myState, args);
+        registerError(location, description, fix);
+    }
+
+    @Nullable
+    private LocalQuickFix[] createFixes(PsiElement location, Object state) {
+        if (!onTheFly && inspection.buildQuickFixesOnlyForOnTheFlyErrors()) {
+            return null;
+        }
+        final InspectionJSFix[] fixes = inspection.buildFixes(location);
+        if (fixes != null) {
+            return fixes;
+        }
+        final InspectionJSFix fix = inspection.buildFix(location, state);
+        if (fix == null) {
+            return null;
+        }
+        return new InspectionJSFix[]{fix};
+    }
+
+    @Nullable
+    public ProblemDescriptor[] getErrors() {
+        if (errors == null) {
+            return null;
+        }
+        else {
+            final int numErrors = errors.size();
+            return errors.toArray(new ProblemDescriptor[numErrors]);
+        }
+    }
+
+    @Override
+    public void visitWhiteSpace(PsiWhiteSpace space) {
+        // none of our inspections need to do anything with white space,
+        // so this is a performance optimization
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
index 4221ac76..ccd9cfe2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
@@ -11,16 +11,17 @@ class InspectionComparator implements Comparator<Class<? extends LocalInspection
     }
 
     @Override
-	public int compare(Class<? extends LocalInspectionTool> class1,
-                       Class<? extends LocalInspectionTool> class2) {
+    public int compare(Class<? extends LocalInspectionTool> class1, Class<? extends LocalInspectionTool> class2) {
         final LocalInspectionTool inspection1;
         final LocalInspectionTool inspection2;
         try {
             inspection1 = class1.newInstance();
             inspection2 = class2.newInstance();
-        } catch (InstantiationException ignore) {
+        }
+        catch (InstantiationException ignore) {
             return -1;
-        } catch (IllegalAccessException ignore) {
+        }
+        catch (IllegalAccessException ignore) {
             return -1;
         }
         final String groupName1 = inspection1.getGroupDisplayName();
@@ -40,7 +41,7 @@ public int compare(Class<? extends LocalInspectionTool> class1,
     }
 
     private static String stripQuotes(String str) {
-        if (str.indexOf((int) '\'') < 0 && str.indexOf((int) '"') < 0) {
+        if (str.indexOf((int)'\'') < 0 && str.indexOf((int)'"') < 0) {
             return str;
         }
         final int length = str.length();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
index 7235e786..41dcf73f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
@@ -18,18 +18,16 @@
 
 import jakarta.annotation.Nonnull;
 
-public abstract class InspectionJSFix implements LocalQuickFix
-{
+public abstract class InspectionJSFix implements LocalQuickFix {
     //to appear in "Apply Fix" statement when multiple Quick Fixes exist
     @Override
-	@Nonnull
+    @Nonnull
     public String getFamilyName() {
         return "";
     }
 
     @Override
-	public void applyFix(@Nonnull Project project,
-                         @Nonnull ProblemDescriptor descriptor) {
+    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
         final PsiElement problemElement = descriptor.getPsiElement();
         if (problemElement == null || !problemElement.isValid()) {
             return;
@@ -39,7 +37,8 @@ public void applyFix(@Nonnull Project project,
         }
         try {
             doFix(project, descriptor);
-        } catch (IncorrectOperationException e) {
+        }
+        catch (IncorrectOperationException e) {
             final Class<? extends InspectionJSFix> aClass = getClass();
             final String className = aClass.getName();
             final Logger logger = Logger.getInstance(className);
@@ -47,24 +46,20 @@ public void applyFix(@Nonnull Project project,
         }
     }
 
-    protected abstract void doFix(Project project, ProblemDescriptor descriptor)
-            throws IncorrectOperationException;
+    protected abstract void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException;
 
     protected static void deleteElement(@Nonnull PsiElement element)
-            throws IncorrectOperationException {
+        throws IncorrectOperationException {
         final ASTNode node = element.getNode();
         final ASTNode parent = element.getParent().getNode();
         parent.removeChild(node);
     }
 
-    protected static void replaceExpression(JSExpression expression,
-                                            String newExpression)
-            throws IncorrectOperationException {
-
+    protected static void replaceExpression(JSExpression expression, String newExpression) throws IncorrectOperationException {
         final ASTNode fromText = JSChangeUtil.createStatementFromText(expression.getProject(), newExpression + ';');
         final PsiElement element = fromText != null ? fromText.getPsi() : null;
 
-        final JSExpressionStatement expressionStatement = element instanceof JSExpressionStatement ? (JSExpressionStatement) element:null;
+        final JSExpressionStatement expressionStatement = element instanceof JSExpressionStatement expr ? expr : null;
         if (expressionStatement == null) {
             return;
         }
@@ -74,17 +69,15 @@ protected static void replaceExpression(JSExpression expression,
         final PsiElement parent = expression.getParent();
         final ASTNode parentNode = parent.getNode();
         parentNode.replaceChild(expressionNode, newExpressionNode);
-       // final CodeStyleManager styleManager = manager.getCodeStyleManager();
-       // styleManager.reformat(newExpressionNode.getPsi());
+        // final CodeStyleManager styleManager = manager.getCodeStyleManager();
+        // styleManager.reformat(newExpressionNode.getPsi());
     }
 
-    protected static void replaceStatement(JSStatement statement,
-                                           @NonNls String newStatement)
-            throws IncorrectOperationException {
+    protected static void replaceStatement(JSStatement statement, @NonNls String newStatement) throws IncorrectOperationException {
         final ASTNode fromText = JSChangeUtil.createStatementFromText(statement.getProject(), newStatement);
         final PsiElement element = fromText != null ? fromText.getPsi() : null;
-        final JSStatement newStmt = element instanceof JSStatement ? (JSStatement)element:null;
-      
+        final JSStatement newStmt = element instanceof JSStatement ? (JSStatement)element : null;
+
         if (newStmt == null) {
             return;
         }
@@ -93,14 +86,14 @@ protected static void replaceStatement(JSStatement statement,
         final ASTNode statementNode = statement.getNode();
         final ASTNode newStatementNode = newStmt.getNode();
         parentNode.replaceChild(statementNode, newStatementNode);
-       // final CodeStyleManager styleManager = manager.getCodeStyleManager();
-       // styleManager.reformat(newStatementNode.getPsi());
+        // final CodeStyleManager styleManager = manager.getCodeStyleManager();
+        // styleManager.reformat(newStatementNode.getPsi());
     }
 
     private static boolean isQuickFixOnReadOnlyFile(PsiElement problemElement) {
         final PsiFile containingPsiFile = problemElement.getContainingFile();
         if (containingPsiFile == null) {
-          return false;
+            return false;
         }
         final VirtualFile virtualFile = containingPsiFile.getVirtualFile();
         final Project project = problemElement.getProject();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java
index 12654d84..0b4cbaea 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/JavaScriptInspection.java
@@ -2,4 +2,3 @@
 
 public abstract class JavaScriptInspection extends BaseInspection {
 }
-
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index 8bb4904b..1fd3da62 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -20,191 +20,158 @@
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
-public class UnterminatedStatementJSInspection extends JavaScriptInspection
-{
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return false;
-	}
-
-	private final TerminateStatementFix fix = new TerminateStatementFix();
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.unterminatedStatementDisplayName().get();
-	}
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.STYLE_GROUP_NAME.get();
-	}
-
-	@RequiredReadAction
-	@Override
-	@Nullable
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.unterminatedStatementErrorString().get();
-	}
-
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
-
-	@Override
-	public InspectionJSFix buildFix(PsiElement location, Object state)
-	{
-		return fix;
-	}
-
-	private static class TerminateStatementFix extends InspectionJSFix
-	{
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return InspectionJSLocalize.terminateStatementFix().get();
-		}
-
-		@Override
-		public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException
-		{
-			JSStatement expression = PsiTreeUtil.getParentOfType(descriptor.getPsiElement(), JSStatement.class);
-			if(expression instanceof JSBlockStatement && expression.getParent() instanceof JSFunctionExpression)
-			{
-				expression = PsiTreeUtil.getParentOfType(expression, JSStatement.class);
-			}
-			if(expression == null)
-			{
-				return;
-			}
-			final String text = expression.getText();
-			replaceStatement(expression, text + ';');
-		}
-	}
-
-	private static class Visitor extends BaseInspectionVisitor
-	{
-		@Override
-		public void visitJSExpressionStatement(JSExpressionStatement statement)
-		{
-			super.visitJSExpressionStatement(statement);
-			if(statement.getContainingFile() instanceof JSExpressionCodeFragment || isTerminated(statement))
-			{
-				return;
-			}
-			registerError(statement);
-		}
-
-		@Override
-		public void visitJSBreakStatement(JSBreakStatement jsBreakStatement)
-		{
-			super.visitJSBreakStatement(jsBreakStatement);
-			if(isTerminated(jsBreakStatement))
-			{
-				return;
-			}
-			registerError(jsBreakStatement);
-		}
-
-		@Override
-		public void visitJSContinueStatement(JSContinueStatement jsContinueStatement)
-		{
-			super.visitJSContinueStatement(jsContinueStatement);
-			if(isTerminated(jsContinueStatement))
-			{
-				return;
-			}
-			registerError(jsContinueStatement);
-		}
-
-		@Override
-		public void visitJSReturnStatement(JSReturnStatement jsReturnStatement)
-		{
-			super.visitJSReturnStatement(jsReturnStatement);
-			if(isTerminated(jsReturnStatement))
-			{
-				return;
-			}
-			registerError(jsReturnStatement);
-		}
-
-		@Override
-		public void visitJSThrowStatement(JSThrowStatement jsThrowStatement)
-		{
-			super.visitJSThrowStatement(jsThrowStatement);
-			if(isTerminated(jsThrowStatement))
-			{
-				return;
-			}
-			registerError(jsThrowStatement);
-		}
-
-		@Override
-		public void visitJSDoWhileStatement(JSDoWhileStatement jsDoWhileStatement)
-		{
-			super.visitJSDoWhileStatement(jsDoWhileStatement);
-			if(isTerminated(jsDoWhileStatement))
-			{
-				return;
-			}
-			registerError(jsDoWhileStatement);
-		}
-
-		@Override
-		public void visitJSVarStatement(JSVarStatement jsVarStatement)
-		{
-			super.visitJSVarStatement(jsVarStatement);
-			if(isTerminated(jsVarStatement))
-			{
-				return;
-			}
-			registerError(jsVarStatement);
-		}
-
-		@Override
-		protected PsiElement getEditorErrorLocation(final PsiElement location)
-		{
-			PsiElement editorErrorLocation = PsiTreeUtil.lastChild(location);
-			while(editorErrorLocation instanceof PsiErrorElement || (editorErrorLocation != null && editorErrorLocation.getTextLength() == 0))
-			{
-				editorErrorLocation = PsiTreeUtil.prevLeaf(editorErrorLocation);
-			}
-
-			return editorErrorLocation;
-		}
-	}
-
-	private static boolean isTerminated(JSStatement statement)
-	{
-		final PsiElement parent = statement.getParent();
-		if(parent instanceof JSForInStatement || parent instanceof JSForStatement)
-		{
-			return true;
-		}
-		final String text = statement.getText();
-		if(text == null)
-		{
-			return true;
-		}
-
-		boolean terminated = text.endsWith(";");
-		if(!terminated)
-		{
-			PsiElement container = PsiTreeUtil.getNonStrictParentOfType(parent, JSFile.class, XmlAttributeValue.class, XmlTagChild.class);
-			if(container instanceof JSFile)
-			{
-				container = container.getContext();
-			}
-			terminated = container instanceof XmlAttributeValue; // some inline javascript
-		}
-		return terminated;
-	}
+public class UnterminatedStatementJSInspection extends JavaScriptInspection {
+    @Override
+    public boolean isEnabledByDefault() {
+        return false;
+    }
+
+    private final TerminateStatementFix fix = new TerminateStatementFix();
+
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.unterminatedStatementDisplayName().get();
+    }
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME.get();
+    }
+
+    @RequiredReadAction
+    @Override
+    @Nullable
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.unterminatedStatementErrorString().get();
+    }
+
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
+
+    @Override
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
+        return fix;
+    }
+
+    private static class TerminateStatementFix extends InspectionJSFix {
+        @Override
+        @Nonnull
+        public String getName() {
+            return InspectionJSLocalize.terminateStatementFix().get();
+        }
+
+        @Override
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            JSStatement expression = PsiTreeUtil.getParentOfType(descriptor.getPsiElement(), JSStatement.class);
+            if (expression instanceof JSBlockStatement && expression.getParent() instanceof JSFunctionExpression) {
+                expression = PsiTreeUtil.getParentOfType(expression, JSStatement.class);
+            }
+            if (expression == null) {
+                return;
+            }
+            final String text = expression.getText();
+            replaceStatement(expression, text + ';');
+        }
+    }
+
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSExpressionStatement(JSExpressionStatement statement) {
+            super.visitJSExpressionStatement(statement);
+            if (statement.getContainingFile() instanceof JSExpressionCodeFragment || isTerminated(statement)) {
+                return;
+            }
+            registerError(statement);
+        }
+
+        @Override
+        public void visitJSBreakStatement(JSBreakStatement jsBreakStatement) {
+            super.visitJSBreakStatement(jsBreakStatement);
+            if (isTerminated(jsBreakStatement)) {
+                return;
+            }
+            registerError(jsBreakStatement);
+        }
+
+        @Override
+        public void visitJSContinueStatement(JSContinueStatement jsContinueStatement) {
+            super.visitJSContinueStatement(jsContinueStatement);
+            if (isTerminated(jsContinueStatement)) {
+                return;
+            }
+            registerError(jsContinueStatement);
+        }
+
+        @Override
+        public void visitJSReturnStatement(JSReturnStatement jsReturnStatement) {
+            super.visitJSReturnStatement(jsReturnStatement);
+            if (isTerminated(jsReturnStatement)) {
+                return;
+            }
+            registerError(jsReturnStatement);
+        }
+
+        @Override
+        public void visitJSThrowStatement(JSThrowStatement jsThrowStatement) {
+            super.visitJSThrowStatement(jsThrowStatement);
+            if (isTerminated(jsThrowStatement)) {
+                return;
+            }
+            registerError(jsThrowStatement);
+        }
+
+        @Override
+        public void visitJSDoWhileStatement(JSDoWhileStatement jsDoWhileStatement) {
+            super.visitJSDoWhileStatement(jsDoWhileStatement);
+            if (isTerminated(jsDoWhileStatement)) {
+                return;
+            }
+            registerError(jsDoWhileStatement);
+        }
+
+        @Override
+        public void visitJSVarStatement(JSVarStatement jsVarStatement) {
+            super.visitJSVarStatement(jsVarStatement);
+            if (isTerminated(jsVarStatement)) {
+                return;
+            }
+            registerError(jsVarStatement);
+        }
+
+        @Override
+        protected PsiElement getEditorErrorLocation(final PsiElement location) {
+            PsiElement editorErrorLocation = PsiTreeUtil.lastChild(location);
+            while (editorErrorLocation instanceof PsiErrorElement
+                || (editorErrorLocation != null && editorErrorLocation.getTextLength() == 0)) {
+                editorErrorLocation = PsiTreeUtil.prevLeaf(editorErrorLocation);
+            }
+
+            return editorErrorLocation;
+        }
+    }
+
+    private static boolean isTerminated(JSStatement statement) {
+        final PsiElement parent = statement.getParent();
+        if (parent instanceof JSForInStatement || parent instanceof JSForStatement) {
+            return true;
+        }
+        final String text = statement.getText();
+        if (text == null) {
+            return true;
+        }
+
+        boolean terminated = text.endsWith(";");
+        if (!terminated) {
+            PsiElement container = PsiTreeUtil.getNonStrictParentOfType(parent, JSFile.class, XmlAttributeValue.class, XmlTagChild.class);
+            if (container instanceof JSFile) {
+                container = container.getContext();
+            }
+            terminated = container instanceof XmlAttributeValue; // some inline javascript
+        }
+        return terminated;
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java
index 6bc8619c..45e22855 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java
@@ -12,19 +12,20 @@ public RegExFormatter() {
     }
 
     @Override
-	public Object stringToValue(String text) throws ParseException {
+    public Object stringToValue(String text) throws ParseException {
         try {
             return Pattern.compile(text);
-        } catch (final PatternSyntaxException e) {
+        }
+        catch (final PatternSyntaxException e) {
             throw new ParseException(e.getMessage(), e.getIndex());
         }
     }
 
     @Override
-	public String valueToString(Object value) throws ParseException {
+    public String valueToString(Object value) throws ParseException {
         if (value == null) {
             return "";
         }
-        return ((Pattern) value).pattern();
+        return ((Pattern)value).pattern();
     }
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
index 6b206bb1..f587cb05 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
@@ -19,7 +19,8 @@ public boolean shouldYieldFocus(JComponent input) {
             if (formatter != null) {
                 try {
                     formatter.stringToValue(ftf.getText());
-                } catch (final ParseException e) {
+                }
+                catch (final ParseException e) {
                     SwingUtilities.invokeLater(
                         () -> Messages.showErrorDialog(e.getMessage(), InspectionJSLocalize.malformedNamingPatternAlert().get())
                     );
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
index 1cc43ddb..b8ceb269 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
@@ -15,13 +15,7 @@ public SingleCheckboxOptionsPanel(String label, final BaseInspection owner, @Non
         final boolean selected = getPropertyValue(owner, property);
         final JCheckBox checkBox = new JCheckBox(label, selected);
         final ButtonModel model = checkBox.getModel();
-        model.addChangeListener(new ChangeListener() {
-
-            @Override
-			public void stateChanged(ChangeEvent e) {
-                setPropertyValue(owner, property, model.isSelected());
-            }
-        });
+        model.addChangeListener(e -> setPropertyValue(owner, property, model.isSelected()));
 
         final GridBagConstraints constraints = new GridBagConstraints();
         constraints.gridx = 0;
@@ -35,14 +29,16 @@ public void stateChanged(ChangeEvent e) {
     private void setPropertyValue(BaseInspection owner, String property, boolean selected) {
         try {
             owner.getClass().getField(property).setBoolean(owner, selected);
-        } catch (Exception e) {
+        }
+        catch (Exception ignore) {
         }
     }
 
     private boolean getPropertyValue(BaseInspection owner, String property) {
         try {
             return owner.getClass().getField(property).getBoolean(owner);
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             return false;
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
index ce7e24f8..ae072da2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
@@ -23,22 +23,22 @@ public SingleIntegerFieldOptionsPanel(String labelString, final BaseInspection o
         final Document document = valueField.getDocument();
         document.addDocumentListener(new DocumentListener() {
             @Override
-			public void changedUpdate(DocumentEvent e) {
+            public void changedUpdate(DocumentEvent e) {
                 textChanged();
             }
 
             @Override
-			public void insertUpdate(DocumentEvent e) {
+            public void insertUpdate(DocumentEvent e) {
                 textChanged();
             }
 
             @Override
-			public void removeUpdate(DocumentEvent e) {
+            public void removeUpdate(DocumentEvent e) {
                 textChanged();
             }
 
             private void textChanged() {
-                setPropertyValue(owner, property, ((Number) valueField.getValue()).intValue());
+                setPropertyValue(owner, property, ((Number)valueField.getValue()).intValue());
             }
         });
         final GridBagConstraints constraints = new GridBagConstraints();
@@ -59,14 +59,16 @@ private void textChanged() {
     private void setPropertyValue(BaseInspection owner, String property, int value) {
         try {
             owner.getClass().getField(property).setInt(owner, value);
-        } catch (Exception e) {
+        }
+        catch (Exception ignore) {
         }
     }
 
     private int getPropertyValue(BaseInspection owner, String property) {
         try {
             return owner.getClass().getField(property).getInt(owner);
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             return 0;
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
index 3aeda2a5..2307b8d0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
@@ -21,7 +21,7 @@ public static boolean isNegation(@Nonnull JSExpression exp) {
         if (!(exp instanceof JSPrefixExpression)) {
             return false;
         }
-        final JSPrefixExpression prefixExp = (JSPrefixExpression) exp;
+        final JSPrefixExpression prefixExp = (JSPrefixExpression)exp;
         final IElementType sign = prefixExp.getOperationSign();
         return JSTokenTypes.EXCL.equals(sign);
     }
@@ -45,29 +45,33 @@ public static boolean isFalse(@Nullable JSExpression test) {
 
     public static String getNegatedExpressionText(@Nonnull JSExpression condition) {
         if (condition instanceof JSParenthesizedExpression) {
-            final JSExpression contentExpression = ((JSParenthesizedExpression) condition).getInnerExpression();
+            final JSExpression contentExpression = ((JSParenthesizedExpression)condition).getInnerExpression();
             return '(' + getNegatedExpressionText(contentExpression) + ')';
-        } else if (BoolUtils.isNegation(condition)) {
+        }
+        else if (BoolUtils.isNegation(condition)) {
             final JSExpression negated = getNegated(condition);
             return negated.getText();
-        } else if (ComparisonUtils.isComparison(condition)) {
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression) condition;
+        }
+        else if (ComparisonUtils.isComparison(condition)) {
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression)condition;
             final IElementType sign = binaryExpression.getOperationSign();
             final String negatedComparison = ComparisonUtils.getNegatedComparison(sign);
             final JSExpression lhs = binaryExpression.getLOperand();
             final JSExpression rhs = binaryExpression.getROperand();
             assert rhs != null;
             return lhs.getText() + negatedComparison + rhs.getText();
-        } else if (ParenthesesUtils.getPrecendence(condition) >
-                ParenthesesUtils.PREFIX_PRECEDENCE) {
+        }
+        else if (ParenthesesUtils.getPrecendence(condition) >
+            ParenthesesUtils.PREFIX_PRECEDENCE) {
             return "!(" + condition.getText() + ')';
-        } else {
+        }
+        else {
             return '!' + condition.getText();
         }
     }
 
     private static JSExpression getNegated(@Nonnull JSExpression exp) {
-        final JSPrefixExpression prefixExp = (JSPrefixExpression) exp;
+        final JSPrefixExpression prefixExp = (JSPrefixExpression)exp;
         final JSExpression operand = prefixExp.getExpression();
         return ParenthesesUtils.stripParentheses(operand);
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
index a3ebf101..9e48d508 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
@@ -54,7 +54,7 @@ public static boolean isComparison(@Nullable JSExpression exp) {
         if (!(exp instanceof JSBinaryExpression)) {
             return false;
         }
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression) exp;
+        final JSBinaryExpression binaryExpression = (JSBinaryExpression)exp;
         final IElementType sign = binaryExpression.getOperationSign();
         return s_comparisonStrings.contains(sign);
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
index 2a049253..205e2a66 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
@@ -10,15 +10,11 @@ private ConditionalUtils() {
     }
 
     public static JSStatement stripBraces(JSStatement branch) {
-        if (branch instanceof JSBlockStatement) {
-            final JSBlockStatement block = (JSBlockStatement) branch;
+        if (branch instanceof JSBlockStatement block) {
             final JSStatement[] statements = block.getStatements();
-            if (statements.length == 1) {
-                return statements[0];
-            } else {
-                return block;
-            }
-        } else {
+            return statements.length == 1 ? statements[0] : block;
+        }
+        else {
             return branch;
         }
     }
@@ -30,8 +26,7 @@ public static boolean isReturn(JSStatement statement, String value) {
         if (!(statement instanceof JSReturnStatement)) {
             return false;
         }
-        final JSReturnStatement returnStatement =
-                (JSReturnStatement) statement;
+        final JSReturnStatement returnStatement = (JSReturnStatement)statement;
         if (returnStatement.getExpression() == null) {
             return false;
         }
@@ -47,14 +42,12 @@ public static boolean isAssignment(JSStatement statement, String value) {
         if (!(statement instanceof JSExpressionStatement)) {
             return false;
         }
-        final JSExpressionStatement expressionStatement =
-                (JSExpressionStatement) statement;
+        final JSExpressionStatement expressionStatement = (JSExpressionStatement)statement;
         final JSExpression expression = expressionStatement.getExpression();
         if (!(expression instanceof JSAssignmentExpression)) {
             return false;
         }
-        final JSAssignmentExpression assignment =
-                (JSAssignmentExpression) expression;
+        final JSAssignmentExpression assignment = (JSAssignmentExpression)expression;
         final JSExpression rhs = assignment.getROperand();
         if (rhs == null) {
             return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
index 40b97227..27e917a3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
@@ -13,48 +13,52 @@ private ControlFlowUtils() {
         super();
     }
 
-    public static boolean statementMayCompleteNormally(
-            @Nullable JSStatement statement) {
+    public static boolean statementMayCompleteNormally(@Nullable JSStatement statement) {
         if (statement == null) {
             return true;
         }
-        if (statement instanceof JSBreakStatement ||
-                statement instanceof JSContinueStatement ||
-                statement instanceof JSReturnStatement ||
-                statement instanceof JSThrowStatement) {
+        if (statement instanceof JSBreakStatement
+            || statement instanceof JSContinueStatement
+            || statement instanceof JSReturnStatement
+            || statement instanceof JSThrowStatement) {
             return false;
-        } else if (statement instanceof JSExpressionStatement ||
-                statement instanceof JSEmptyStatement ||
-                statement instanceof JSVarStatement) {
+        }
+        else if (statement instanceof JSExpressionStatement
+            || statement instanceof JSEmptyStatement
+            || statement instanceof JSVarStatement) {
             return true;
-        } else if (statement instanceof JSForStatement) {
-            return forStatementMayReturnNormally((JSForStatement) statement);
-        } else if (statement instanceof JSForInStatement) {
-            return foreachStatementMayReturnNormally(
-                    (JSForInStatement) statement);
-        } else if (statement instanceof JSWhileStatement) {
-            return whileStatementMayReturnNormally(
-                    (JSWhileStatement) statement);
-        } else if (statement instanceof JSDoWhileStatement) {
-            return doWhileStatementMayReturnNormally(
-                    (JSDoWhileStatement) statement);
-        } else if (statement instanceof JSBlockStatement) {
-            return blockMayCompleteNormally((JSBlockStatement) statement);
-        } else if (statement instanceof JSLabeledStatement) {
-            return labeledStatementMayCompleteNormally(
-                    (JSLabeledStatement) statement);
-        } else if (statement instanceof JSIfStatement) {
-            return ifStatementMayReturnNormally((JSIfStatement) statement);
-        } else if (statement instanceof JSTryStatement) {
-            return tryStatementMayReturnNormally((JSTryStatement) statement);
-        } else if (statement instanceof JSSwitchStatement) {
-            return switchStatementMayReturnNormally(
-                    (JSSwitchStatement) statement);
-        } else if (statement instanceof JSWithStatement) {
-            return withStatementMayReturnNormally(
-                    (JSWithStatement) statement);
-        } else   // unknown statement type
-        {
+        }
+        else if (statement instanceof JSForStatement forStatement) {
+            return forStatementMayReturnNormally(forStatement);
+        }
+        else if (statement instanceof JSForInStatement forInStatement) {
+            return foreachStatementMayReturnNormally(forInStatement);
+        }
+        else if (statement instanceof JSWhileStatement whileStatement) {
+            return whileStatementMayReturnNormally(whileStatement);
+        }
+        else if (statement instanceof JSDoWhileStatement doWhileStatement) {
+            return doWhileStatementMayReturnNormally(doWhileStatement);
+        }
+        else if (statement instanceof JSBlockStatement blockStatement) {
+            return blockMayCompleteNormally(blockStatement);
+        }
+        else if (statement instanceof JSLabeledStatement labeledStatement) {
+            return labeledStatementMayCompleteNormally(labeledStatement);
+        }
+        else if (statement instanceof JSIfStatement ifStatement) {
+            return ifStatementMayReturnNormally(ifStatement);
+        }
+        else if (statement instanceof JSTryStatement tryStatement) {
+            return tryStatementMayReturnNormally(tryStatement);
+        }
+        else if (statement instanceof JSSwitchStatement switchStatement) {
+            return switchStatementMayReturnNormally(switchStatement);
+        }
+        else if (statement instanceof JSWithStatement withStatement) {
+            return withStatementMayReturnNormally(withStatement);
+        }
+        else { // unknown statement type
             return true;
         }
     }
@@ -64,23 +68,18 @@ private static boolean withStatementMayReturnNormally(JSWithStatement jsWithStat
         return statementMayCompleteNormally(body);
     }
 
-    private static boolean doWhileStatementMayReturnNormally(
-            @Nonnull JSDoWhileStatement loopStatement) {
+    private static boolean doWhileStatementMayReturnNormally(@Nonnull JSDoWhileStatement loopStatement) {
         final JSExpression test = loopStatement.getCondition();
         final JSStatement body = loopStatement.getBody();
-        return statementMayCompleteNormally(body) && !BoolUtils.isTrue(test)
-                || statementIsBreakTarget(loopStatement);
+        return statementMayCompleteNormally(body) && !BoolUtils.isTrue(test) || statementIsBreakTarget(loopStatement);
     }
 
-    private static boolean whileStatementMayReturnNormally(
-            @Nonnull JSWhileStatement loopStatement) {
+    private static boolean whileStatementMayReturnNormally(@Nonnull JSWhileStatement loopStatement) {
         final JSExpression test = loopStatement.getCondition();
-        return !BoolUtils.isTrue(test)
-                || statementIsBreakTarget(loopStatement);
+        return !BoolUtils.isTrue(test) || statementIsBreakTarget(loopStatement);
     }
 
-    private static boolean forStatementMayReturnNormally(
-            @Nonnull JSForStatement loopStatement) {
+    private static boolean forStatementMayReturnNormally(@Nonnull JSForStatement loopStatement) {
         final JSExpression test = loopStatement.getCondition();
         if (statementIsBreakTarget(loopStatement)) {
             return true;
@@ -91,13 +90,11 @@ private static boolean forStatementMayReturnNormally(
         return !BoolUtils.isTrue(test);
     }
 
-    private static boolean foreachStatementMayReturnNormally(
-            @Nonnull JSForInStatement loopStatement) {
+    private static boolean foreachStatementMayReturnNormally(@Nonnull JSForInStatement loopStatement) {
         return true;
     }
 
-    private static boolean switchStatementMayReturnNormally(
-            @Nonnull JSSwitchStatement switchStatement) {
+    private static boolean switchStatementMayReturnNormally(@Nonnull JSSwitchStatement switchStatement) {
         if (statementIsBreakTarget(switchStatement)) {
             return true;
         }
@@ -108,8 +105,7 @@ private static boolean switchStatementMayReturnNormally(
         }
         boolean hasDefaultCase = false;
         for (JSCaseClause clause : caseClauses) {
-            if(clause.isDefault())
-            {
+            if (clause.isDefault()) {
                 hasDefaultCase = true;
             }
         }
@@ -119,54 +115,44 @@ private static boolean switchStatementMayReturnNormally(
         }
         final JSCaseClause lastClause = caseClauses[caseClauses.length - 1];
         final JSStatement[] statements = lastClause.getStatements();
-        if(statements.length == 0)
-        {
+        if (statements.length == 0) {
             return true;
         }
-        return statementMayCompleteNormally(statements[statements.length-1]);
+        return statementMayCompleteNormally(statements[statements.length - 1]);
     }
 
-    private static boolean tryStatementMayReturnNormally(
-            @Nonnull JSTryStatement tryStatement) {
+    private static boolean tryStatementMayReturnNormally(@Nonnull JSTryStatement tryStatement) {
         final JSStatement finallyBlock = tryStatement.getFinallyStatement();
-        if (finallyBlock != null) {
-            if (!statementMayCompleteNormally(finallyBlock)) {
-                return false;
-            }
+        if (finallyBlock != null && !statementMayCompleteNormally(finallyBlock)) {
+            return false;
         }
         final JSStatement tryBlock = tryStatement.getStatement();
         if (statementMayCompleteNormally(tryBlock)) {
             return true;
         }
         final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
-        if(catchBlock == null)
-        {
+        if (catchBlock == null) {
             return false;
         }
         final JSStatement catchStatement = catchBlock.getStatement();
         return statementMayCompleteNormally(catchStatement);
     }
 
-    private static boolean ifStatementMayReturnNormally(
-            @Nonnull JSIfStatement ifStatement) {
+    private static boolean ifStatementMayReturnNormally(@Nonnull JSIfStatement ifStatement) {
         final JSStatement thenBranch = ifStatement.getThen();
         if (statementMayCompleteNormally(thenBranch)) {
             return true;
         }
         final JSStatement elseBranch = ifStatement.getElse();
-        return elseBranch == null ||
-                statementMayCompleteNormally(elseBranch);
+        return elseBranch == null || statementMayCompleteNormally(elseBranch);
     }
 
-    private static boolean labeledStatementMayCompleteNormally(
-            @Nonnull JSLabeledStatement labeledStatement) {
+    private static boolean labeledStatementMayCompleteNormally(@Nonnull JSLabeledStatement labeledStatement) {
         final JSStatement statement = labeledStatement.getStatement();
-        return statementMayCompleteNormally(statement) ||
-                statementIsBreakTarget(statement);
+        return statementMayCompleteNormally(statement) || statementIsBreakTarget(statement);
     }
 
-    public static boolean blockMayCompleteNormally(
-            @Nullable JSBlockStatement block) {
+    public static boolean blockMayCompleteNormally(@Nullable JSBlockStatement block) {
         if (block == null) {
             return true;
         }
@@ -179,40 +165,35 @@ public static boolean blockMayCompleteNormally(
         return true;
     }
 
-    private static boolean statementIsBreakTarget(
-            @Nonnull JSStatement statement) {
+    private static boolean statementIsBreakTarget(@Nonnull JSStatement statement) {
         final BreakFinder breakFinder = new BreakFinder(statement);
         statement.accept(breakFinder);
         return breakFinder.breakFound();
     }
 
-    public static boolean statementContainsReturn(
-            @Nonnull JSStatement statement) {
+    public static boolean statementContainsReturn(@Nonnull JSStatement statement) {
         final ReturnFinder returnFinder = new ReturnFinder();
         statement.accept(returnFinder);
         return returnFinder.returnFound();
     }
 
-    public static boolean statementIsContinueTarget(
-            @Nonnull JSStatement statement) {
+    public static boolean statementIsContinueTarget(@Nonnull JSStatement statement) {
         final ContinueFinder continueFinder = new ContinueFinder(statement);
         statement.accept(continueFinder);
         return continueFinder.continueFound();
     }
 
     public static boolean isInLoop(@Nonnull JSElement element) {
-        return isInForStatementBody(element) ||
-                isInForeachStatementBody(element) ||
-                isInWhileStatementBody(element) ||
-                isInDoWhileStatementBody(element);
+        return isInForStatementBody(element)
+            || isInForeachStatementBody(element)
+            || isInWhileStatementBody(element)
+            || isInDoWhileStatementBody(element);
     }
 
     public static boolean isInFinallyBlock(@Nonnull JSElement element) {
         JSElement currentElement = element;
         while (true) {
-            final JSTryStatement tryStatement =
-                    PsiTreeUtil.getParentOfType(currentElement,
-                            JSTryStatement.class);
+            final JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
             if (tryStatement == null) {
                 return false;
             }
@@ -229,9 +210,7 @@ public static boolean isInFinallyBlock(@Nonnull JSElement element) {
     public static boolean isInCatchBlock(@Nonnull JSElement element) {
         JSElement currentElement = element;
         while (true) {
-            final JSTryStatement tryStatement =
-                    PsiTreeUtil.getParentOfType(currentElement,
-                            JSTryStatement.class);
+            final JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
             if (tryStatement == null) {
                 return false;
             }
@@ -247,9 +226,7 @@ public static boolean isInCatchBlock(@Nonnull JSElement element) {
     }
 
     private static boolean isInWhileStatementBody(@Nonnull JSElement element) {
-        final JSWhileStatement whileStatement =
-                PsiTreeUtil.getParentOfType(element,
-                        JSWhileStatement.class);
+        final JSWhileStatement whileStatement = PsiTreeUtil.getParentOfType(element, JSWhileStatement.class);
         if (whileStatement == null) {
             return false;
         }
@@ -257,11 +234,8 @@ private static boolean isInWhileStatementBody(@Nonnull JSElement element) {
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
-    private static boolean isInDoWhileStatementBody(
-            @Nonnull JSElement element) {
-        final JSDoWhileStatement doWhileStatement =
-                PsiTreeUtil.getParentOfType(element,
-                        JSDoWhileStatement.class);
+    private static boolean isInDoWhileStatementBody(@Nonnull JSElement element) {
+        final JSDoWhileStatement doWhileStatement = PsiTreeUtil.getParentOfType(element, JSDoWhileStatement.class);
         if (doWhileStatement == null) {
             return false;
         }
@@ -270,8 +244,7 @@ private static boolean isInDoWhileStatementBody(
     }
 
     private static boolean isInForStatementBody(@Nonnull JSElement element) {
-        final JSForStatement forStatement =
-                PsiTreeUtil.getParentOfType(element, JSForStatement.class);
+        final JSForStatement forStatement = PsiTreeUtil.getParentOfType(element, JSForStatement.class);
         if (forStatement == null) {
             return false;
         }
@@ -279,11 +252,8 @@ private static boolean isInForStatementBody(@Nonnull JSElement element) {
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
-    private static boolean isInForeachStatementBody(
-            @Nonnull JSElement element) {
-        final JSForInStatement foreachStatement =
-                PsiTreeUtil.getParentOfType(element,
-                        JSForInStatement.class);
+    private static boolean isInForeachStatementBody(@Nonnull JSElement element) {
+        final JSForInStatement foreachStatement = PsiTreeUtil.getParentOfType(element, JSForInStatement.class);
         if (foreachStatement == null) {
             return false;
         }
@@ -292,76 +262,59 @@ private static boolean isInForeachStatementBody(
     }
 
     public static JSStatement stripBraces(@Nonnull JSStatement branch) {
-        if (branch instanceof JSBlockStatement) {
-            final JSBlockStatement block = (JSBlockStatement) branch;
+        if (branch instanceof JSBlockStatement block) {
             final JSStatement[] statements = block.getStatements();
-            if (statements.length == 1) {
-                return statements[0];
-            } else {
-                return block;
-            }
-        } else {
+            return statements.length == 1 ? statements[0] : block;
+        }
+        else {
             return branch;
         }
     }
 
-    public static boolean statementCompletesWithStatement(
-            @Nonnull JSStatement containingStatement,
-            @Nonnull JSStatement statement) {
+    public static boolean statementCompletesWithStatement(@Nonnull JSStatement containingStatement, @Nonnull JSStatement statement) {
         JSElement statementToCheck = statement;
         while (true) {
             if (statementToCheck.equals(containingStatement)) {
                 return true;
             }
-            final JSElement container =
-                    getContainingStatement(statementToCheck);
+            final JSElement container = getContainingStatement(statementToCheck);
             if (container == null) {
                 return false;
             }
-            if (container instanceof JSBlockStatement) {
-                if (!statementIsLastInBlock((JSBlockStatement) container,
-                        (JSStatement) statementToCheck)) {
-                    return false;
-                }
-            }
-            if (isLoop(container)) {
+            if (container instanceof JSBlockStatement containerBlock
+                && !statementIsLastInBlock(containerBlock, (JSStatement)statementToCheck)) {
                 return false;
             }
-            if (container instanceof JSSwitchStatement) {
+            if (isLoop(container) || container instanceof JSSwitchStatement) {
                 return false;
             }
             statementToCheck = container;
         }
     }
 
-    public static boolean blockCompletesWithStatement(
-            @Nonnull JSBlockStatement body,
-            @Nonnull JSStatement statement) {
+    public static boolean blockCompletesWithStatement(@Nonnull JSBlockStatement body, @Nonnull JSStatement statement) {
         JSElement statementToCheck = statement;
         while (true) {
             if (statementToCheck == null) {
                 return false;
             }
-            final JSElement container =
-                    getContainingStatement(statementToCheck);
+            final JSElement container = getContainingStatement(statementToCheck);
             if (container == null) {
                 return false;
             }
             if (isLoop(container)) {
                 return false;
             }
-            if (container instanceof JSBlockStatement) {
-                if (!statementIsLastInBlock((JSBlockStatement) container,
-                        (JSStatement) statementToCheck)) {
+            if (container instanceof JSBlockStatement containerBlock) {
+                if (!statementIsLastInBlock(containerBlock, (JSStatement)statementToCheck)) {
                     return false;
                 }
                 if (container.equals(body)) {
                     return true;
                 }
-                statementToCheck =
-                        PsiTreeUtil.getParentOfType(container,
-                                JSStatement.class);
-            } else {
+                statementToCheck = PsiTreeUtil.getParentOfType(container, JSStatement.class);
+            }
+            else {
                 statementToCheck = container;
             }
         }
@@ -372,14 +325,11 @@ private static boolean isLoop(@Nonnull JSElement element) {
     }
 
     @Nullable
-    private static JSElement getContainingStatement(
-            @Nonnull JSElement statement) {
-        return PsiTreeUtil
-                .getParentOfType(statement, JSStatement.class);
+    private static JSElement getContainingStatement(@Nonnull JSElement statement) {
+        return PsiTreeUtil.getParentOfType(statement, JSStatement.class);
     }
 
-    private static boolean statementIsLastInBlock(@Nonnull JSBlockStatement block,
-                                                  @Nonnull JSStatement statement) {
+    private static boolean statementIsLastInBlock(@Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
         final JSStatement[] statements = block.getStatements();
         for (int i = statements.length - 1; i >= 0; i--) {
             final JSStatement childStatement = statements[i];
@@ -400,8 +350,8 @@ public boolean returnFound() {
             return m_found;
         }
 
-        @Override public void visitJSReturnStatement(
-                @Nonnull JSReturnStatement returnStatement) {
+        @Override
+        public void visitJSReturnStatement(@Nonnull JSReturnStatement returnStatement) {
             if (m_found) {
                 return;
             }
@@ -423,14 +373,13 @@ public boolean breakFound() {
             return m_found;
         }
 
-        @Override public void visitJSBreakStatement(
-                @Nonnull JSBreakStatement breakStatement) {
+        @Override
+        public void visitJSBreakStatement(@Nonnull JSBreakStatement breakStatement) {
             if (m_found) {
                 return;
             }
             super.visitJSBreakStatement(breakStatement);
-            final JSStatement exitedStatement =
-                    breakStatement.getStatementToBreak();
+            final JSStatement exitedStatement = breakStatement.getStatementToBreak();
             if (exitedStatement == null) {
                 return;
             }
@@ -453,14 +402,13 @@ public boolean continueFound() {
             return m_found;
         }
 
-        @Override public void visitJSContinueStatement(
-                @Nonnull JSContinueStatement continueStatement) {
+        @Override
+        public void visitJSContinueStatement(@Nonnull JSContinueStatement continueStatement) {
             if (m_found) {
                 return;
             }
             super.visitJSContinueStatement(continueStatement);
-            final JSStatement exitedStatement =
-                    continueStatement.getStatementToContinue();
+            final JSStatement exitedStatement = continueStatement.getStatementToContinue();
             if (exitedStatement == null) {
                 return;
             }
@@ -471,24 +419,16 @@ public boolean continueFound() {
     }
 
     public static boolean isInExitStatement(@Nonnull JSExpression expression) {
-        return isInReturnStatementArgument(expression) ||
-                isInThrowStatementArgument(expression);
+        return isInReturnStatementArgument(expression) || isInThrowStatementArgument(expression);
     }
 
-    private static boolean isInReturnStatementArgument(
-            @Nonnull JSExpression expression) {
-        final JSReturnStatement returnStatement =
-                PsiTreeUtil
-                        .getParentOfType(expression, JSReturnStatement.class);
+    private static boolean isInReturnStatementArgument(@Nonnull JSExpression expression) {
+        final JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(expression, JSReturnStatement.class);
         return returnStatement != null;
     }
 
-    private static boolean isInThrowStatementArgument(
-            @Nonnull JSExpression expression) {
-        final JSThrowStatement throwStatement =
-                PsiTreeUtil
-                        .getParentOfType(expression, JSThrowStatement.class);
+    private static boolean isInThrowStatementArgument(@Nonnull JSExpression expression) {
+        final JSThrowStatement throwStatement = PsiTreeUtil.getParentOfType(expression, JSThrowStatement.class);
         return throwStatement != null;
     }
-
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
index 21222477..d4d508b9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
@@ -8,13 +8,13 @@
 import consulo.language.ast.IElementType;
 
 @SuppressWarnings({"OverlyComplexMethod",
-        "MethodWithMultipleLoops",
-        "OverlyComplexMethod",
-        "OverlyLongMethod",
-        "SwitchStatementWithTooManyBranches",
-        "SwitchStatement",
-        "OverlyComplexClass",
-        "ClassWithTooManyMethods"})
+    "MethodWithMultipleLoops",
+    "OverlyComplexMethod",
+    "OverlyLongMethod",
+    "SwitchStatementWithTooManyBranches",
+    "SwitchStatement",
+    "OverlyComplexClass",
+    "ClassWithTooManyMethods"})
 public class EquivalenceChecker {
     private EquivalenceChecker() {
         super();
@@ -56,8 +56,7 @@ private EquivalenceChecker() {
     private static final int FOR_EACH_STATEMENT = 19;
     private static final int WITH_STATEMENT = 20;
 
-    public static boolean statementsAreEquivalent(@Nullable JSStatement exp1,
-                                                  @Nullable JSStatement exp2) {
+    public static boolean statementsAreEquivalent(@Nullable JSStatement exp1, @Nullable JSStatement exp2) {
         if (exp1 == null && exp2 == null) {
             return true;
         }
@@ -69,67 +68,32 @@ public static boolean statementsAreEquivalent(@Nullable JSStatement exp1,
         if (type1 != type2) {
             return false;
         }
-        switch (type1) {
-            case BLOCK_STATEMENT:
-                return blockStatementsAreEquivalent((JSBlockStatement) exp1,
-                        (JSBlockStatement) exp2);
-            case BREAK_STATEMENT:
-                return breakStatementsAreEquivalent((JSBreakStatement) exp1,
-                        (JSBreakStatement) exp2);
-            case CONTINUE_STATEMENT:
-                return continueStatementsAreEquivalent((JSContinueStatement) exp1,
-                        (JSContinueStatement) exp2);
-            case VAR_STATEMENT:
-                return varStatementsAreEquivalent((JSVarStatement) exp1,
-                        (JSVarStatement) exp2);
-            case DO_WHILE_STATEMENT:
-                return doWhileStatementsAreEquivalent((JSDoWhileStatement) exp1,
-                        (JSDoWhileStatement) exp2);
-            case EMPTY_STATEMENT:
-                return true;
-            case EXPRESSION_STATEMENT:
-                return expressionStatementsAreEquivalent((JSExpressionStatement) exp1,
-                        (JSExpressionStatement) exp2);
-            case FOR_STATEMENT:
-                return forStatementsAreEquivalent((JSForStatement) exp1,
-                        (JSForStatement) exp2);
-            case FOR_EACH_STATEMENT:
-                return forInStatementsAreEquivalent((JSForInStatement) exp1,
-                        (JSForInStatement) exp2);
-            case IF_STATEMENT:
-                return ifStatementsAreEquivalent((JSIfStatement) exp1,
-                        (JSIfStatement) exp2);
-            case LABELED_STATEMENT:
-                return labeledStatementsAreEquivalent((JSLabeledStatement) exp1,
-                        (JSLabeledStatement) exp2);
-            case RETURN_STATEMENT:
-                return returnStatementsAreEquivalent((JSReturnStatement) exp1,
-                        (JSReturnStatement) exp2);
-             case SWITCH_STATEMENT:
-                return switchStatementsAreEquivalent((JSSwitchStatement) exp1,
-                        (JSSwitchStatement) exp2);
-            case THROW_STATEMENT:
-                return throwStatementsAreEquivalent((JSThrowStatement) exp1,
-                        (JSThrowStatement) exp2);
-            case TRY_STATEMENT:
-                return tryStatementsAreEquivalent((JSTryStatement) exp1,
-                        (JSTryStatement) exp2);
-            case WHILE_STATEMENT:
-                return whileStatementsAreEquivalent((JSWhileStatement) exp1,
-                        (JSWhileStatement) exp2);
-           case WITH_STATEMENT:
-                return withStatementsAreEquivalent((JSWithStatement) exp1,
-                        (JSWithStatement) exp2);
-            default:
-                return false;
-        }
+        return switch (type1) {
+            case BLOCK_STATEMENT -> blockStatementsAreEquivalent((JSBlockStatement)exp1, (JSBlockStatement)exp2);
+            case BREAK_STATEMENT -> breakStatementsAreEquivalent((JSBreakStatement)exp1, (JSBreakStatement)exp2);
+            case CONTINUE_STATEMENT -> continueStatementsAreEquivalent((JSContinueStatement)exp1, (JSContinueStatement)exp2);
+            case VAR_STATEMENT -> varStatementsAreEquivalent((JSVarStatement)exp1, (JSVarStatement)exp2);
+            case DO_WHILE_STATEMENT -> doWhileStatementsAreEquivalent((JSDoWhileStatement)exp1, (JSDoWhileStatement)exp2);
+            case EMPTY_STATEMENT -> true;
+            case EXPRESSION_STATEMENT -> expressionStatementsAreEquivalent((JSExpressionStatement)exp1, (JSExpressionStatement)exp2);
+            case FOR_STATEMENT -> forStatementsAreEquivalent((JSForStatement)exp1, (JSForStatement)exp2);
+            case FOR_EACH_STATEMENT -> forInStatementsAreEquivalent((JSForInStatement)exp1, (JSForInStatement)exp2);
+            case IF_STATEMENT -> ifStatementsAreEquivalent((JSIfStatement)exp1, (JSIfStatement)exp2);
+            case LABELED_STATEMENT -> labeledStatementsAreEquivalent((JSLabeledStatement)exp1, (JSLabeledStatement)exp2);
+            case RETURN_STATEMENT -> returnStatementsAreEquivalent((JSReturnStatement)exp1, (JSReturnStatement)exp2);
+            case SWITCH_STATEMENT -> switchStatementsAreEquivalent((JSSwitchStatement)exp1, (JSSwitchStatement)exp2);
+            case THROW_STATEMENT -> throwStatementsAreEquivalent((JSThrowStatement)exp1, (JSThrowStatement)exp2);
+            case TRY_STATEMENT -> tryStatementsAreEquivalent((JSTryStatement)exp1, (JSTryStatement)exp2);
+            case WHILE_STATEMENT -> whileStatementsAreEquivalent((JSWhileStatement)exp1, (JSWhileStatement)exp2);
+            case WITH_STATEMENT -> withStatementsAreEquivalent((JSWithStatement)exp1, (JSWithStatement)exp2);
+            default -> false;
+        };
     }
 
     private static boolean withStatementsAreEquivalent(JSWithStatement statement1, JSWithStatement statement2) {
         final JSExpression expression1 = statement1.getExpression();
         final JSExpression expression2 = statement2.getExpression();
-        if(!expressionsAreEquivalent(expression1,  expression2))
-        {
+        if (!expressionsAreEquivalent(expression1, expression2)) {
             return false;
         }
         final JSStatement body1 = statement1.getStatement();
@@ -137,25 +101,21 @@ private static boolean withStatementsAreEquivalent(JSWithStatement statement1, J
         return statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean varStatementsAreEquivalent(@Nonnull JSVarStatement statement1,
-                                                      @Nonnull JSVarStatement statement2) {
+    private static boolean varStatementsAreEquivalent(@Nonnull JSVarStatement statement1, @Nonnull JSVarStatement statement2) {
         final JSVariable[] variables1 = statement1.getVariables();
         final JSVariable[] variables2 = statement2.getVariables();
-        if(variables1.length!=variables2.length)
-        {
+        if (variables1.length != variables2.length) {
             return false;
         }
         for (int i = 0; i < variables2.length; i++) {
-            if(!variablesAreEquivalent(variables1[i], variables2[i]))
-            {
+            if (!variablesAreEquivalent(variables1[i], variables2[i])) {
                 return false;
             }
         }
         return true;
     }
 
-    private static boolean variablesAreEquivalent(@Nonnull JSVariable var1,
-                                                  @Nonnull JSVariable var2) {
+    private static boolean variablesAreEquivalent(@Nonnull JSVariable var1, @Nonnull JSVariable var2) {
         final JSExpression initializer1 = var1.getInitializer();
         final JSExpression initializer2 = var2.getInitializer();
         if (!expressionsAreEquivalent(initializer1, initializer2)) {
@@ -174,8 +134,7 @@ private static boolean variablesAreEquivalent(@Nonnull JSVariable var1,
         return name1.equals(name2);
     }
 
-    private static boolean tryStatementsAreEquivalent(@Nonnull JSTryStatement statement1,
-                                                      @Nonnull JSTryStatement statement2) {
+    private static boolean tryStatementsAreEquivalent(@Nonnull JSTryStatement statement1, @Nonnull JSTryStatement statement2) {
         final JSStatement tryBlock1 = statement1.getStatement();
         final JSStatement tryBlock2 = statement2.getStatement();
         if (!statementsAreEquivalent(tryBlock1, tryBlock2)) {
@@ -188,18 +147,15 @@ private static boolean tryStatementsAreEquivalent(@Nonnull JSTryStatement statem
         }
         final JSCatchBlock catchBlock1 = statement1.getCatchBlock();
         final JSCatchBlock catchBlock2 = statement2.getCatchBlock();
-        if(catchBlock1 == null)
-        {
+        if (catchBlock1 == null) {
             return catchBlock2 == null;
         }
-        if(catchBlock2 == null)
-        {
+        if (catchBlock2 == null) {
             return false;
         }
         final JSParameter parameter1 = catchBlock1.getParameter();
         final JSParameter parameter2 = catchBlock2.getParameter();
-        if(!parametersAreEquivalent(parameter1, parameter2))
-        {
+        if (!parametersAreEquivalent(parameter1, parameter2)) {
             return false;
         }
         final JSStatement catchStatement1 = catchBlock1.getStatement();
@@ -207,8 +163,7 @@ private static boolean tryStatementsAreEquivalent(@Nonnull JSTryStatement statem
         return statementsAreEquivalent(catchStatement1, catchStatement2);
     }
 
-    private static boolean parametersAreEquivalent(@Nonnull JSParameter parameter1,
-                                                   @Nonnull JSParameter parameter2) {
+    private static boolean parametersAreEquivalent(@Nonnull JSParameter parameter1, @Nonnull JSParameter parameter2) {
         final JavaScriptType type1 = parameter1.getType();
         final JavaScriptType type2 = parameter2.getType();
         if (!typesAreEquivalent(type1, type2)) {
@@ -232,18 +187,15 @@ private static boolean typesAreEquivalent(@Nullable JavaScriptType type1, @Nulla
         return type1.equals(type2);
     }
 
-    private static boolean whileStatementsAreEquivalent(@Nonnull JSWhileStatement statement1,
-                                                        @Nonnull JSWhileStatement statement2) {
+    private static boolean whileStatementsAreEquivalent(@Nonnull JSWhileStatement statement1, @Nonnull JSWhileStatement statement2) {
         final JSExpression condition1 = statement1.getCondition();
         final JSExpression condition2 = statement2.getCondition();
         final JSStatement body1 = statement1.getBody();
         final JSStatement body2 = statement2.getBody();
-        return expressionsAreEquivalent(condition1, condition2) &&
-                statementsAreEquivalent(body1, body2);
+        return expressionsAreEquivalent(condition1, condition2) && statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean forStatementsAreEquivalent(@Nonnull JSForStatement statement1,
-                                                      @Nonnull JSForStatement statement2) {
+    private static boolean forStatementsAreEquivalent(@Nonnull JSForStatement statement1, @Nonnull JSForStatement statement2) {
         final JSExpression condition1 = statement1.getCondition();
         final JSExpression condition2 = statement2.getCondition();
         if (!expressionsAreEquivalent(condition1, condition2)) {
@@ -264,8 +216,7 @@ private static boolean forStatementsAreEquivalent(@Nonnull JSForStatement statem
         return statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean forInStatementsAreEquivalent(@Nonnull JSForInStatement statement1,
-                                                        @Nonnull JSForInStatement statement2) {
+    private static boolean forInStatementsAreEquivalent(@Nonnull JSForInStatement statement1, @Nonnull JSForInStatement statement2) {
         final JSExpression value1 = statement1.getCollectionExpression();
         final JSExpression value2 = statement2.getCollectionExpression();
         if (!expressionsAreEquivalent(value1, value2)) {
@@ -281,8 +232,7 @@ private static boolean forInStatementsAreEquivalent(@Nonnull JSForInStatement st
         return statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean switchStatementsAreEquivalent(@Nonnull JSSwitchStatement statement1,
-                                                         @Nonnull JSSwitchStatement statement2) {
+    private static boolean switchStatementsAreEquivalent(@Nonnull JSSwitchStatement statement1, @Nonnull JSSwitchStatement statement2) {
         final JSExpression switchExpression1 = statement1.getSwitchExpression();
         final JSExpression swithcExpression2 = statement2.getSwitchExpression();
         if (!expressionsAreEquivalent(switchExpression1, swithcExpression2)) {
@@ -290,15 +240,13 @@ private static boolean switchStatementsAreEquivalent(@Nonnull JSSwitchStatement
         }
         final JSCaseClause[] clauses1 = statement1.getCaseClauses();
         final JSCaseClause[] clauses2 = statement2.getCaseClauses();
-        if(clauses1.length!=clauses2.length)
-        {
+        if (clauses1.length != clauses2.length) {
             return false;
         }
         for (int i = 0; i < clauses1.length; i++) {
             final JSCaseClause clause1 = clauses1[i];
             final JSCaseClause clause2 = clauses2[i];
-            if(!caseClausesAreEquivalent(clause1, clause2))
-            {
+            if (!caseClausesAreEquivalent(clause1, clause2)) {
                 return false;
             }
         }
@@ -306,14 +254,12 @@ private static boolean switchStatementsAreEquivalent(@Nonnull JSSwitchStatement
     }
 
     private static boolean caseClausesAreEquivalent(JSCaseClause clause1, JSCaseClause clause2) {
-        if(clause1.isDefault()!=clause2.isDefault())
-        {
+        if (clause1.isDefault() != clause2.isDefault()) {
             return false;
         }
         final JSExpression exp1 = clause1.getCaseExpression();
         final JSExpression exp2 = clause2.getCaseExpression();
-        if(!expressionsAreEquivalent(exp1, exp2))
-        {
+        if (!expressionsAreEquivalent(exp1, exp2)) {
             return false;
         }
         final JSStatement[] statements1 = clause1.getStatements();
@@ -329,35 +275,29 @@ private static boolean caseClausesAreEquivalent(JSCaseClause clause1, JSCaseClau
         return false;
     }
 
-    private static boolean doWhileStatementsAreEquivalent(@Nonnull JSDoWhileStatement statement1,
-                                                          @Nonnull JSDoWhileStatement statement2) {
+    private static boolean doWhileStatementsAreEquivalent(@Nonnull JSDoWhileStatement statement1, @Nonnull JSDoWhileStatement statement2) {
         final JSExpression condition1 = statement1.getCondition();
         final JSExpression condition2 = statement2.getCondition();
         final JSStatement body1 = statement1.getBody();
         final JSStatement body2 = statement2.getBody();
-        return expressionsAreEquivalent(condition1, condition2) &&
-                statementsAreEquivalent(body1, body2);
+        return expressionsAreEquivalent(condition1, condition2) && statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean blockStatementsAreEquivalent(@Nonnull JSBlockStatement statement1,
-                                                        @Nonnull JSBlockStatement statement2) {
+    private static boolean blockStatementsAreEquivalent(@Nonnull JSBlockStatement statement1, @Nonnull JSBlockStatement statement2) {
         final JSStatement[] statements1 = statement1.getStatements();
         final JSStatement[] statements2 = statement2.getStatements();
-        if(statements1.length !=statements2.length)
-        {
+        if (statements1.length != statements2.length) {
             return false;
         }
         for (int i = 0; i < statements1.length; i++) {
-            if(!statementsAreEquivalent(statements1[i], statements2[i]))
-            {
+            if (!statementsAreEquivalent(statements1[i], statements2[i])) {
                 return false;
             }
         }
         return true;
     }
 
-    private static boolean breakStatementsAreEquivalent(@Nonnull JSBreakStatement statement1,
-                                                        @Nonnull JSBreakStatement statement2) {
+    private static boolean breakStatementsAreEquivalent(@Nonnull JSBreakStatement statement1, @Nonnull JSBreakStatement statement2) {
         final String identifier1 = statement1.getLabel();
         final String identifier2 = statement2.getLabel();
         if (identifier1 == null) {
@@ -369,8 +309,10 @@ private static boolean breakStatementsAreEquivalent(@Nonnull JSBreakStatement st
         return identifier1.equals(identifier2);
     }
 
-    private static boolean continueStatementsAreEquivalent(@Nonnull JSContinueStatement statement1,
-                                                           @Nonnull JSContinueStatement statement2) {
+    private static boolean continueStatementsAreEquivalent(
+        @Nonnull JSContinueStatement statement1,
+        @Nonnull JSContinueStatement statement2
+    ) {
         final String identifier1 = statement1.getLabel();
         final String identifier2 = statement2.getLabel();
         if (identifier1 == null) {
@@ -382,10 +324,7 @@ private static boolean continueStatementsAreEquivalent(@Nonnull JSContinueStatem
         return identifier1.equals(identifier2);
     }
 
-
-    private static boolean labeledStatementsAreEquivalent(@Nonnull JSLabeledStatement statement1,
-                                                          @Nonnull JSLabeledStatement statement2) {
-
+    private static boolean labeledStatementsAreEquivalent(@Nonnull JSLabeledStatement statement1, @Nonnull JSLabeledStatement statement2) {
         final PsiElement identifier1 = statement1.getLabelIdentifier();
         final PsiElement identifier2 = statement2.getLabelIdentifier();
         if (identifier1 == null) {
@@ -399,43 +338,40 @@ private static boolean labeledStatementsAreEquivalent(@Nonnull JSLabeledStatemen
         return text1.equals(text2);
     }
 
-
-    private static boolean ifStatementsAreEquivalent(@Nonnull JSIfStatement statement1,
-                                                     @Nonnull JSIfStatement statement2) {
+    private static boolean ifStatementsAreEquivalent(@Nonnull JSIfStatement statement1, @Nonnull JSIfStatement statement2) {
         final JSExpression condition1 = statement1.getCondition();
         final JSExpression condition2 = statement2.getCondition();
         final JSStatement thenBranch1 = statement1.getThen();
         final JSStatement thenBranch2 = statement2.getThen();
         final JSStatement elseBranch1 = statement1.getElse();
         final JSStatement elseBranch2 = statement2.getElse();
-        return expressionsAreEquivalent(condition1, condition2) &&
-                statementsAreEquivalent(thenBranch1, thenBranch2) &&
-                statementsAreEquivalent(elseBranch1, elseBranch2);
+        return expressionsAreEquivalent(condition1, condition2)
+            && statementsAreEquivalent(thenBranch1, thenBranch2)
+            && statementsAreEquivalent(elseBranch1, elseBranch2);
     }
 
-    private static boolean expressionStatementsAreEquivalent(@Nonnull JSExpressionStatement statement1,
-                                                             @Nonnull JSExpressionStatement statement2) {
+    private static boolean expressionStatementsAreEquivalent(
+        @Nonnull JSExpressionStatement statement1,
+        @Nonnull JSExpressionStatement statement2
+    ) {
         final JSExpression expression1 = statement1.getExpression();
         final JSExpression expression2 = statement2.getExpression();
         return expressionsAreEquivalent(expression1, expression2);
     }
 
-    private static boolean returnStatementsAreEquivalent(@Nonnull JSReturnStatement statement1,
-                                                         @Nonnull JSReturnStatement statement2) {
+    private static boolean returnStatementsAreEquivalent(@Nonnull JSReturnStatement statement1, @Nonnull JSReturnStatement statement2) {
         final JSExpression returnValue1 = statement1.getExpression();
         final JSExpression returnValue2 = statement2.getExpression();
         return expressionsAreEquivalent(returnValue1, returnValue2);
     }
 
-    private static boolean throwStatementsAreEquivalent(@Nonnull JSThrowStatement statement1,
-                                                        @Nonnull JSThrowStatement statement2) {
+    private static boolean throwStatementsAreEquivalent(@Nonnull JSThrowStatement statement1, @Nonnull JSThrowStatement statement2) {
         final JSExpression exception1 = statement1.getExpression();
         final JSExpression exception2 = statement2.getExpression();
         return expressionsAreEquivalent(exception1, exception2);
     }
 
-    public static boolean expressionsAreEquivalent(@Nullable JSExpression exp1,
-                                                   @Nullable JSExpression exp2) {
+    public static boolean expressionsAreEquivalent(@Nullable JSExpression exp1, @Nullable JSExpression exp2) {
         if (exp1 == null && exp2 == null) {
             return true;
         }
@@ -443,108 +379,95 @@ public static boolean expressionsAreEquivalent(@Nullable JSExpression exp1,
             return false;
         }
         JSExpression expToCompare1 = exp1;
-        while (expToCompare1 instanceof JSParenthesizedExpression) {
-            expToCompare1 = ((JSParenthesizedExpression) expToCompare1).getInnerExpression();
+        while (expToCompare1 instanceof JSParenthesizedExpression parenExp1) {
+            expToCompare1 = parenExp1.getInnerExpression();
         }
         JSExpression expToCompare2 = exp2;
-        while (expToCompare2 instanceof JSParenthesizedExpression) {
-            expToCompare2 = ((JSParenthesizedExpression) expToCompare2).getInnerExpression();
+        while (expToCompare2 instanceof JSParenthesizedExpression parenExp2) {
+            expToCompare2 = parenExp2.getInnerExpression();
         }
         final int type1 = getExpressionType(expToCompare1);
         final int type2 = getExpressionType(expToCompare2);
         if (type1 != type2) {
             return false;
         }
-        switch (type1) {
+        return switch (type1) {
             case THIS_EXPRESSION:
-            case SUPER_EXPRESSION:
-                return true;
+            case SUPER_EXPRESSION -> true;
             case LITERAL_EXPRESSION:
             case CLASS_OBJECT_EXPRESSION:
-            case REFERENCE_EXPRESSION:
-                final String text1 = expToCompare1.getText();
-                final String text2 = expToCompare2.getText();
-                return text1.equals(text2);
-            case CALL_EXPRESSION:
-                return methodCallExpressionsAreEquivalent((JSCallExpression) expToCompare1,
-                        (JSCallExpression) expToCompare2);
-            case NEW_EXPRESSION:
-                return newExpressionsAreEquivalent((JSNewExpression) expToCompare1,
-                        (JSNewExpression) expToCompare2);
-            case ARRAY_LITERAL_EXPRESSION:
-                return arrayInitializerExpressionsAreEquivalent((JSArrayLiteralExpression) expToCompare1,
-                        (JSArrayLiteralExpression) expToCompare2);
-            case PREFIX_EXPRESSION:
-                return prefixExpressionsAreEquivalent((JSPrefixExpression) expToCompare1,
-                        (JSPrefixExpression) expToCompare2);
-            case POSTFIX_EXPRESSION:
-                return postfixExpressionsAreEquivalent((JSPostfixExpression) expToCompare1,
-                        (JSPostfixExpression) expToCompare2);
-            case BINARY_EXPRESSION:
-                return binaryExpressionsAreEquivalent((JSBinaryExpression) expToCompare1,
-                        (JSBinaryExpression) expToCompare2);
-            case ASSIGNMENT_EXPRESSION:
-                return assignmentExpressionsAreEquivalent((JSAssignmentExpression) expToCompare1,
-                        (JSAssignmentExpression) expToCompare2);
-            case CONDITIONAL_EXPRESSION:
-                return conditionalExpressionsAreEquivalent((JSConditionalExpression) expToCompare1,
-                        (JSConditionalExpression) expToCompare2);
-            case INDEXED_PROPERTY_ACCESS_EXPRESSION:
-                return indexedAccessExpressionsAreEquivalent((JSIndexedPropertyAccessExpression) expToCompare1,
-                        (JSIndexedPropertyAccessExpression) expToCompare2);
-            case OBJECT_LITERAL_EXPRESSION:
-                return objectLiteralExpressionsAreEquivalent((JSObjectLiteralExpression) expToCompare1,
-                        (JSObjectLiteralExpression) expToCompare2);
-            case FUNCTION_EXPRESSION:
-                return functionExpressionsAreEquivalent((JSFunctionExpression) expToCompare1,
-                        (JSFunctionExpression) expToCompare2);
-             case DEFINITION_EXPRESSION:
-                return definitionExpressionsAreEquivalent((JSDefinitionExpression) expToCompare1,
-                        (JSDefinitionExpression) expToCompare2);
-            default:
-                return false;
-        }
-    }
-
-    private static boolean definitionExpressionsAreEquivalent(JSDefinitionExpression jsDefinitionExpression, JSDefinitionExpression jsDefinitionExpression1) {
+            case REFERENCE_EXPRESSION -> expToCompare1.getText().equals(expToCompare2.getText());
+            case CALL_EXPRESSION -> methodCallExpressionsAreEquivalent((JSCallExpression)expToCompare1, (JSCallExpression)expToCompare2);
+            case NEW_EXPRESSION -> newExpressionsAreEquivalent((JSNewExpression)expToCompare1, (JSNewExpression)expToCompare2);
+            case ARRAY_LITERAL_EXPRESSION -> arrayInitializerExpressionsAreEquivalent(
+                    (JSArrayLiteralExpression)expToCompare1,
+                    (JSArrayLiteralExpression)expToCompare2
+                );
+            case PREFIX_EXPRESSION -> prefixExpressionsAreEquivalent((JSPrefixExpression)expToCompare1, (JSPrefixExpression)expToCompare2);
+            case POSTFIX_EXPRESSION ->
+                postfixExpressionsAreEquivalent((JSPostfixExpression)expToCompare1, (JSPostfixExpression)expToCompare2);
+            case BINARY_EXPRESSION -> binaryExpressionsAreEquivalent((JSBinaryExpression)expToCompare1, (JSBinaryExpression)expToCompare2);
+            case ASSIGNMENT_EXPRESSION ->
+                assignmentExpressionsAreEquivalent((JSAssignmentExpression)expToCompare1, (JSAssignmentExpression)expToCompare2);
+            case CONDITIONAL_EXPRESSION -> conditionalExpressionsAreEquivalent(
+                    (JSConditionalExpression)expToCompare1,
+                    (JSConditionalExpression)expToCompare2
+                );
+            case INDEXED_PROPERTY_ACCESS_EXPRESSION -> indexedAccessExpressionsAreEquivalent(
+                    (JSIndexedPropertyAccessExpression)expToCompare1,
+                    (JSIndexedPropertyAccessExpression)expToCompare2
+                );
+            case OBJECT_LITERAL_EXPRESSION -> objectLiteralExpressionsAreEquivalent(
+                    (JSObjectLiteralExpression)expToCompare1,
+                    (JSObjectLiteralExpression)expToCompare2
+                );
+            case FUNCTION_EXPRESSION ->
+                functionExpressionsAreEquivalent((JSFunctionExpression)expToCompare1, (JSFunctionExpression)expToCompare2);
+            case DEFINITION_EXPRESSION ->
+                definitionExpressionsAreEquivalent((JSDefinitionExpression)expToCompare1, (JSDefinitionExpression)expToCompare2);
+            default -> false;
+        };
+    }
+
+    private static boolean definitionExpressionsAreEquivalent(
+        JSDefinitionExpression jsDefinitionExpression,
+        JSDefinitionExpression jsDefinitionExpression1
+    ) {
         return expressionsAreEquivalent(jsDefinitionExpression.getExpression(), jsDefinitionExpression1.getExpression());
     }
 
-    private static boolean functionExpressionsAreEquivalent(JSFunctionExpression exp1,
-                                                            JSFunctionExpression exp2) {
+    private static boolean functionExpressionsAreEquivalent(JSFunctionExpression exp1, JSFunctionExpression exp2) {
         return false;
     }
 
-    private static boolean objectLiteralExpressionsAreEquivalent(JSObjectLiteralExpression exp1,
-                                                                 JSObjectLiteralExpression exp2) {
+    private static boolean objectLiteralExpressionsAreEquivalent(JSObjectLiteralExpression exp1, JSObjectLiteralExpression exp2) {
         final JSProperty[] properties1 = exp1.getProperties();
         final JSProperty[] properties2 = exp2.getProperties();
-        if(properties1.length!=properties2.length) {
+        if (properties1.length != properties2.length) {
             return false;
         }
         for (int i = 0; i < properties2.length; i++) {
             final JSProperty property1 = properties1[i];
             final JSProperty property2 = properties2[i];
-            if(!property2.getName().equals(property1.getName()))
-            {
+            if (!property2.getName().equals(property1.getName())) {
                 return false;
             }
             final JSExpression value1 = property1.getValue();
             final JSExpression value2 = property2.getValue();
-            if(!expressionsAreEquivalent(value1, value2))
-            {
+            if (!expressionsAreEquivalent(value1, value2)) {
                 return false;
             }
         }
         return true;
     }
 
-    private static boolean indexedAccessExpressionsAreEquivalent(JSIndexedPropertyAccessExpression exp1,
-                                                                 JSIndexedPropertyAccessExpression exp2) {
+    private static boolean indexedAccessExpressionsAreEquivalent(
+        JSIndexedPropertyAccessExpression exp1,
+        JSIndexedPropertyAccessExpression exp2
+    ) {
         final JSExpression index1 = exp1.getIndexExpression();
         final JSExpression index2 = exp2.getIndexExpression();
-        if(!expressionsAreEquivalent(index1, index2))
-        {
+        if (!expressionsAreEquivalent(index1, index2)) {
             return false;
         }
         final JSExpression qualifier1 = exp1.getQualifier();
@@ -552,15 +475,18 @@ private static boolean indexedAccessExpressionsAreEquivalent(JSIndexedPropertyAc
         return expressionsAreEquivalent(qualifier1, qualifier2);
     }
 
-    private static boolean methodCallExpressionsAreEquivalent(@Nonnull JSCallExpression methodExp1,
-                                                              @Nonnull JSCallExpression methodExp2) {
+    private static boolean methodCallExpressionsAreEquivalent(
+        @Nonnull JSCallExpression methodExp1,
+        @Nonnull JSCallExpression methodExp2
+    ) {
         final JSExpression methodExpression1;
         final JSExpression methodExpression2;
         try {
             methodExpression1 = methodExp1.getMethodExpression();
             methodExpression2 = methodExp2.getMethodExpression();
-        } catch (Exception e) {
-           return false; //catching an intelliJ CCE
+        }
+        catch (Exception e) {
+            return false; //catching an intelliJ CCE
         }
         if (!expressionsAreEquivalent(methodExpression1, methodExpression2)) {
             return false;
@@ -578,12 +504,9 @@ private static boolean methodCallExpressionsAreEquivalent(@Nonnull JSCallExpress
         return expressionListsAreEquivalent(args1, args2);
     }
 
-    private static boolean newExpressionsAreEquivalent(@Nonnull JSNewExpression newExp1,
-                                                       @Nonnull JSNewExpression newExp2) {
-        final JSExpression methodExpression1 =
-                newExp1.getMethodExpression();
-        final JSExpression methodExpression2 =
-                newExp2.getMethodExpression();
+    private static boolean newExpressionsAreEquivalent(@Nonnull JSNewExpression newExp1, @Nonnull JSNewExpression newExp2) {
+        final JSExpression methodExpression1 = newExp1.getMethodExpression();
+        final JSExpression methodExpression2 = newExp2.getMethodExpression();
         if (!expressionsAreEquivalent(methodExpression1, methodExpression2)) {
             return false;
         }
@@ -600,19 +523,24 @@ private static boolean newExpressionsAreEquivalent(@Nonnull JSNewExpression newE
         return expressionListsAreEquivalent(args1, args2);
     }
 
-    private static boolean arrayInitializerExpressionsAreEquivalent(@Nonnull JSArrayLiteralExpression arrInitExp1,
-                                                                    @Nonnull JSArrayLiteralExpression arrInitExp2) {
+    private static boolean arrayInitializerExpressionsAreEquivalent(
+        @Nonnull JSArrayLiteralExpression arrInitExp1,
+        @Nonnull JSArrayLiteralExpression arrInitExp2
+    ) {
         final JSExpression[] initializers1 = arrInitExp1.getExpressions();
         final JSExpression[] initializers2 = arrInitExp2.getExpressions();
         return expressionListsAreEquivalent(initializers1, initializers2);
     }
 
-
-    private static boolean prefixExpressionsAreEquivalent(@Nonnull JSPrefixExpression prefixExp1,
-                                                          @Nonnull JSPrefixExpression prefixExp2) {
+    private static boolean prefixExpressionsAreEquivalent(
+        @Nonnull JSPrefixExpression prefixExp1,
+        @Nonnull JSPrefixExpression prefixExp2
+    ) {
         final IElementType sign1 = prefixExp1.getOperationSign();
         final IElementType sign2 = prefixExp2.getOperationSign();
-        if (sign1 == null) return sign1 == sign2;
+        if (sign1 == null) {
+            return sign1 == sign2;
+        }
         if (!sign1.equals(sign2)) {
             return false;
         }
@@ -621,8 +549,10 @@ private static boolean prefixExpressionsAreEquivalent(@Nonnull JSPrefixExpressio
         return expressionsAreEquivalent(operand1, operand2);
     }
 
-    private static boolean postfixExpressionsAreEquivalent(@Nonnull JSPostfixExpression postfixExp1,
-                                                           @Nonnull JSPostfixExpression postfixExp2) {
+    private static boolean postfixExpressionsAreEquivalent(
+        @Nonnull JSPostfixExpression postfixExp1,
+        @Nonnull JSPostfixExpression postfixExp2
+    ) {
         final IElementType sign1 = postfixExp1.getOperationSign();
         final IElementType sign2 = postfixExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
@@ -633,8 +563,7 @@ private static boolean postfixExpressionsAreEquivalent(@Nonnull JSPostfixExpress
         return expressionsAreEquivalent(operand1, operand2);
     }
 
-    private static boolean binaryExpressionsAreEquivalent(@Nonnull JSBinaryExpression binaryExp1,
-                                                          @Nonnull JSBinaryExpression binaryExp2) {
+    private static boolean binaryExpressionsAreEquivalent(@Nonnull JSBinaryExpression binaryExp1, @Nonnull JSBinaryExpression binaryExp2) {
         final IElementType sign1 = binaryExp1.getOperationSign();
         final IElementType sign2 = binaryExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
@@ -644,12 +573,13 @@ private static boolean binaryExpressionsAreEquivalent(@Nonnull JSBinaryExpressio
         final JSExpression lhs2 = binaryExp2.getLOperand();
         final JSExpression rhs1 = binaryExp1.getROperand();
         final JSExpression rhs2 = binaryExp2.getROperand();
-        return expressionsAreEquivalent(lhs1, lhs2)
-                && expressionsAreEquivalent(rhs1, rhs2);
+        return expressionsAreEquivalent(lhs1, lhs2) && expressionsAreEquivalent(rhs1, rhs2);
     }
 
-    private static boolean assignmentExpressionsAreEquivalent(@Nonnull JSAssignmentExpression assignExp1,
-                                                              @Nonnull JSAssignmentExpression assignExp2) {
+    private static boolean assignmentExpressionsAreEquivalent(
+        @Nonnull JSAssignmentExpression assignExp1,
+        @Nonnull JSAssignmentExpression assignExp2
+    ) {
         final IElementType sign1 = assignExp1.getOperationSign();
         final IElementType sign2 = assignExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
@@ -660,11 +590,13 @@ private static boolean assignmentExpressionsAreEquivalent(@Nonnull JSAssignmentE
         final JSExpression rhs1 = assignExp1.getROperand();
         final JSExpression rhs2 = assignExp2.getROperand();
         return expressionsAreEquivalent(lhs1, lhs2)
-                && expressionsAreEquivalent(rhs1, rhs2);
+            && expressionsAreEquivalent(rhs1, rhs2);
     }
 
-    private static boolean conditionalExpressionsAreEquivalent(@Nonnull JSConditionalExpression condExp1,
-                                                               @Nonnull JSConditionalExpression condExp2) {
+    private static boolean conditionalExpressionsAreEquivalent(
+        @Nonnull JSConditionalExpression condExp1,
+        @Nonnull JSConditionalExpression condExp2
+    ) {
         final JSExpression condition1 = condExp1.getCondition();
         final JSExpression condition2 = condExp2.getCondition();
         final JSExpression thenExpression1 = condExp1.getThen();
@@ -672,16 +604,11 @@ private static boolean conditionalExpressionsAreEquivalent(@Nonnull JSConditiona
         final JSExpression elseExpression1 = condExp1.getElse();
         final JSExpression elseExpression2 = condExp2.getElse();
         return expressionsAreEquivalent(condition1, condition2)
-                &&
-                expressionsAreEquivalent(thenExpression1,
-                        thenExpression2)
-                &&
-                expressionsAreEquivalent(elseExpression1,
-                        elseExpression2);
+            && expressionsAreEquivalent(thenExpression1, thenExpression2)
+            && expressionsAreEquivalent(elseExpression1, elseExpression2);
     }
 
-    private static boolean expressionListsAreEquivalent(@Nullable JSExpression[] expressions1,
-                                                        @Nullable JSExpression[] expressions2) {
+    private static boolean expressionListsAreEquivalent(@Nullable JSExpression[] expressions1, @Nullable JSExpression[] expressions2) {
         if (expressions1 == null && expressions2 == null) {
             return true;
         }
@@ -804,4 +731,3 @@ private static int getStatementType(@Nullable JSStatement statement) {
         return -1;
     }
 }
-
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
index d76b82a1..d95fa2d0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
@@ -24,28 +24,32 @@ public static boolean isConstantExpression(JSExpression expression) {
 
     private static class IsConstantExpressionVisitor extends JSElementVisitor {
         private boolean isConstant = false;
-        private final Map<JSVariable, Boolean> isVariableConstant = new HashMap<JSVariable, Boolean>();
+        private final Map<JSVariable, Boolean> isVariableConstant = new HashMap<>();
 
         public boolean isConstant() {
             return isConstant;
         }
 
-        @Override public void visitJSExpression(JSExpression expression) {
+        @Override
+        public void visitJSExpression(JSExpression expression) {
             isConstant = false;
         }
 
-        @Override public void visitJSLiteralExpression(JSSimpleLiteralExpression expression) {
+        @Override
+        public void visitJSLiteralExpression(JSSimpleLiteralExpression expression) {
             isConstant = true;
         }
 
-        @Override public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
+        @Override
+        public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
             final JSExpression expr = expression.getInnerExpression();
             if (expr != null) {
                 expr.accept(this);
             }
         }
 
-        @Override public void visitJSPrefixExpression(JSPrefixExpression expression) {
+        @Override
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             final JSExpression operand = expression.getExpression();
             if (operand == null) {
                 isConstant = false;
@@ -59,16 +63,17 @@ public boolean isConstant() {
 
             final IElementType opType = expression.getOperationSign();
 
-            if (JSTokenTypes.PLUS.equals(opType) ||
-                    JSTokenTypes.MINUS.equals(opType) ||
-                    JSTokenTypes.TILDE.equals(opType) ||
-                    JSTokenTypes.EXCL.equals(opType)) {
+            if (JSTokenTypes.PLUS.equals(opType)
+                || JSTokenTypes.MINUS.equals(opType)
+                || JSTokenTypes.TILDE.equals(opType)
+                || JSTokenTypes.EXCL.equals(opType)) {
                 return;
             }
             isConstant = false;
         }
 
-        @Override public void visitJSBinaryExpression(JSBinaryExpression expression) {
+        @Override
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             expression.getLOperand().accept(this);
             if (!isConstant) {
                 return;
@@ -79,7 +84,8 @@ public boolean isConstant() {
             }
         }
 
-        @Override public void visitJSConditionalExpression(JSConditionalExpression expression) {
+        @Override
+        public void visitJSConditionalExpression(JSConditionalExpression expression) {
             final JSExpression thenExpr = expression.getThen();
             final JSExpression elseExpr = expression.getElse();
             if (thenExpr == null || elseExpr == null) {
@@ -98,15 +104,16 @@ public boolean isConstant() {
             elseExpr.accept(this);
         }
 
-        @Override public void visitJSReferenceExpression(JSReferenceExpression expression) {
-            final JSElement refElement = (JSElement) expression.resolve();
+        @Override
+        public void visitJSReferenceExpression(JSReferenceExpression expression) {
+            final JSElement refElement = (JSElement)expression.resolve();
 
             if (!(refElement instanceof JSVariable)) {
                 isConstant = false;
                 return;
             }
 
-            final JSVariable variable = (JSVariable) refElement;
+            final JSVariable variable = (JSVariable)refElement;
             final Boolean isConst = isVariableConstant.get(variable);
 
             if (isConst != null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
index 7c04d932..6c870274 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
@@ -35,7 +35,7 @@ private ParenthesesUtils() {
     private static final int NUM_PRECEDENCES = 17;
 
     private static final Map<IElementType, Integer> s_binaryOperatorPrecedence =
-            new HashMap<IElementType, Integer>(NUM_PRECEDENCES);
+        new HashMap<IElementType, Integer>(NUM_PRECEDENCES);
 
     static {
         s_binaryOperatorPrecedence.put(JSTokenTypes.PLUS, ADDITIVE_PRECEDENCE);
@@ -63,16 +63,17 @@ private ParenthesesUtils() {
 
     public static int getPrecendence(JSExpression exp) {
         if (exp instanceof JSThisExpression ||
-                exp instanceof JSLiteralExpression ||
-                exp instanceof JSObjectLiteralExpression ||
-                exp instanceof JSArrayLiteralExpression ||
-                exp instanceof JSIndexedPropertyAccessExpression) {
+            exp instanceof JSLiteralExpression ||
+            exp instanceof JSObjectLiteralExpression ||
+            exp instanceof JSArrayLiteralExpression ||
+            exp instanceof JSIndexedPropertyAccessExpression) {
             return LITERAL_PRECEDENCE;
         }
         if (exp instanceof JSReferenceExpression) {
-            if (((JSReferenceExpression) exp).getQualifier() != null) {
+            if (((JSReferenceExpression)exp).getQualifier() != null) {
                 return METHOD_CALL_PRECEDENCE;
-            } else {
+            }
+            else {
                 return LITERAL_PRECEDENCE;
             }
         }
@@ -86,8 +87,8 @@ public static int getPrecendence(JSExpression exp) {
             return POSTFIX_PRECEDENCE;
         }
         if (exp instanceof JSBinaryExpression && !(exp instanceof JSAssignmentExpression)) {
-            final IElementType sign = ((JSBinaryExpression) exp)
-                    .getOperationSign();
+            final IElementType sign = ((JSBinaryExpression)exp)
+                .getOperationSign();
             return precedenceForBinaryOperator(sign);
         }
         if (exp instanceof JSConditionalExpression) {
@@ -103,26 +104,26 @@ public static int getPrecendence(JSExpression exp) {
     }
 
     private static int precedenceForBinaryOperator(IElementType sign) {
-        if (s_binaryOperatorPrecedence.containsKey(sign)) return s_binaryOperatorPrecedence.get(sign);
+        if (s_binaryOperatorPrecedence.containsKey(sign)) {
+            return s_binaryOperatorPrecedence.get(sign);
+        }
         return ASSIGNMENT_PRECEDENCE;
     }
 
     public static JSExpression stripExpression(JSExpression expression) {
         JSExpression workingExpression = expression;
-        while (workingExpression instanceof JSParenthesizedExpression) {
-            final JSParenthesizedExpression parenthesizedExpression =
-                    (JSParenthesizedExpression) workingExpression;
+        while (workingExpression instanceof JSParenthesizedExpression parenthesizedExpression) {
             workingExpression = parenthesizedExpression.getInnerExpression();
         }
         return workingExpression;
     }
 
     public static JSExpression stripParentheses(JSExpression exp) {
-        JSExpression parenthesized = exp;
-        while (parenthesized instanceof JSParenthesizedExpression) {
-            parenthesized = ((JSParenthesizedExpression) parenthesized)
-                    .getInnerExpression();
+        JSExpression strippedExpression = exp;
+        while (strippedExpression instanceof JSParenthesizedExpression parenthesizedExpression) {
+            strippedExpression = parenthesizedExpression.getInnerExpression();
         }
 
-        return parenthesized;
-    }}
+        return strippedExpression;
+    }
+}
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
index a3fbd60b..18295993 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
@@ -21,22 +21,24 @@ public static boolean mayHaveSideEffects(@Nonnull JSExpression exp) {
     private static class SideEffectsVisitor extends JSRecursiveElementVisitor {
         private boolean mayHaveSideEffects = false;
 
-        @Override public void visitJSElement(@Nonnull JSElement element) {
+        @Override
+        public void visitJSElement(@Nonnull JSElement element) {
             if (!mayHaveSideEffects) {
                 super.visitJSElement(element);
             }
         }
 
-        @Override public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
+        @Override
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
             super.visitJSAssignmentExpression(expression);
             mayHaveSideEffects = true;
         }
-      
+
         @Override
-		public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
+        public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -44,7 +46,8 @@ public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
             mayHaveSideEffects = true;
         }
 
-        @Override public void visitJSNewExpression(@Nonnull JSNewExpression expression) {
+        @Override
+        public void visitJSNewExpression(@Nonnull JSNewExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -52,26 +55,27 @@ public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
             mayHaveSideEffects = true;
         }
 
-        @Override public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
+        @Override
+        public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
             super.visitJSPostfixExpression(expression);
             final IElementType sign = expression.getOperationSign();
             if (JSTokenTypes.PLUSPLUS.equals(sign) ||
-                    JSTokenTypes.MINUSMINUS.equals(sign)) {
+                JSTokenTypes.MINUSMINUS.equals(sign)) {
                 mayHaveSideEffects = true;
             }
         }
 
-        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        @Override
+        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
             super.visitJSPrefixExpression(expression);
             final IElementType sign = expression.getOperationSign();
-            if (JSTokenTypes.PLUSPLUS.equals(sign) ||
-                    JSTokenTypes.MINUSMINUS.equals(sign)) {
+            if (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign)) {
                 mayHaveSideEffects = true;
             }
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java
index d02387c7..c6cce4e1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java
@@ -9,14 +9,11 @@ private StatementUtils() {
         super();
     }
 
-    public static boolean   isEmpty(JSStatement body) {
-        if(body instanceof JSEmptyStatement)
-        {
+    public static boolean isEmpty(JSStatement body) {
+        if (body instanceof JSEmptyStatement) {
             return true;
         }
-        else if(body instanceof JSBlockStatement)
-        {
-            final JSBlockStatement block = (JSBlockStatement) body;
+        else if (body instanceof JSBlockStatement block) {
             final JSStatement[] statements = block.getStatements();
             return statements == null || statements.length == 0;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index 8a1a3f0a..0d6fba68 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -20,163 +20,130 @@
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
-public class BadExpressionStatementJSInspection extends JavaScriptInspection
-{
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.expressionStatementWhichIsNotAssignmentOrCallDisplayName().get();
-	}
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.VALIDITY_GROUP_NAME.get();
-	}
-
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return true;
-	}
-
-	@RequiredReadAction
-	@Override
-	@Nullable
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.expressionStatementIsNotAssignmentOrCallErrorString().get();
-	}
-
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
-
-	private static class Visitor extends BaseInspectionVisitor
-	{
-		@Override
-		@RequiredReadAction
-		public void visitJSExpressionStatement(JSExpressionStatement jsExpressionStatement)
-		{
-			super.visitJSExpressionStatement(jsExpressionStatement);
-			final JSExpression expression = jsExpressionStatement.getExpression();
-			if(isNotPointless(expression) || jsExpressionStatement.getParent() instanceof ES6ExportDefaultAssignment)
-			{
-				return;
-			}
-
-			PsiFile file = jsExpressionStatement.getContainingFile();
-			if(file instanceof JSExpressionCodeFragment)
-			{
-				return;
-			}
-
-			if(expression instanceof JSReferenceExpression)
-			{
-				if("debugger".equals(expression.getText()))
-				{
-					return;
-				}
-			}
-
-			registerError(jsExpressionStatement);
-		}
-
-		private boolean isNotPointless(final JSExpression expression)
-		{
-			if(expression instanceof JSCallExpression)
-			{
-				return true;
-			}
-			if(expression instanceof JSAssignmentExpression)
-			{
-				return true;
-			}
-
-			if(expression instanceof JSPrefixExpression)
-			{
-				final JSPrefixExpression prefix = (JSPrefixExpression) expression;
-				final IElementType sign = prefix.getOperationSign();
-				if(JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign))
-				{
-					return true;
-				}
-				final PsiElement signElement = expression.getFirstChild();
-				if(signElement != null)
-				{
-					@NonNls final String text = signElement.getText();
-					if("delete".equals(text))
-					{
-						return true;
-					}
-
-					ASTNode node;
-					if(sign == null && (node = signElement.getNode()) != null && node.getElementType() == JSTokenTypes.VOID_KEYWORD)
-					{
-						if("void(0)".equals(expression.getText()))
-						{
-							return true;
-						}
-					}
-				}
-			}
-			if(expression instanceof JSPostfixExpression)
-			{
-				final JSPostfixExpression prefix = (JSPostfixExpression) expression;
-				final IElementType sign = prefix.getOperationSign();
-				if(JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign))
-				{
-					return true;
-				}
-			}
-
-			if(expression instanceof JSBinaryExpression)
-			{
-				final JSBinaryExpression binary = (JSBinaryExpression) expression;
-				final IElementType sign = binary.getOperationSign();
-
-				if(sign == JSTokenTypes.ANDAND || sign == JSTokenTypes.OROR)
-				{
-					final JSExpression leftOp = binary.getLOperand();
-
-					if((leftOp instanceof JSReferenceExpression || leftOp instanceof JSIndexedPropertyAccessExpression) && isNotPointless(binary.getROperand()))
-					{
-						return true;
-					}
-				}
-				else if(sign == JSTokenTypes.COMMA)
-				{
-					return isNotPointless(binary.getLOperand()) || isNotPointless(binary.getROperand());
-				}
-			}
-
-			if(expression instanceof JSParenthesizedExpression)
-			{
-				return isNotPointless(((JSParenthesizedExpression) expression).getInnerExpression());
-			}
-
-			if(expression instanceof JSReferenceExpression)
-			{
-				if(expression.getParent().getParent() instanceof JSClass || PsiTreeUtil.getParentOfType(expression, PsiFile.class).getContext() != null)
-				{
-					final ResolveResult[] results = ((JSReferenceExpression) expression).multiResolve(false);
-					if(results.length > 0)
-					{
-						final PsiElement element = results[0].getElement();
-						if(element instanceof JSClass || element instanceof JSFunction)
-						{
-							return true; // class A { import B; B; } // x = "foo"
-						}
-					}
-				}
-			}
-
-			return false;
-		}
-	}
+public class BadExpressionStatementJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.expressionStatementWhichIsNotAssignmentOrCallDisplayName().get();
+    }
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    }
+
+    @Override
+    public boolean isEnabledByDefault() {
+        return true;
+    }
+
+    @RequiredReadAction
+    @Override
+    @Nullable
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.expressionStatementIsNotAssignmentOrCallErrorString().get();
+    }
+
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
+
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        @RequiredReadAction
+        public void visitJSExpressionStatement(JSExpressionStatement jsExpressionStatement) {
+            super.visitJSExpressionStatement(jsExpressionStatement);
+            final JSExpression expression = jsExpressionStatement.getExpression();
+            if (isNotPointless(expression) || jsExpressionStatement.getParent() instanceof ES6ExportDefaultAssignment) {
+                return;
+            }
+
+            PsiFile file = jsExpressionStatement.getContainingFile();
+            if (file instanceof JSExpressionCodeFragment) {
+                return;
+            }
+
+            if (expression instanceof JSReferenceExpression && "debugger".equals(expression.getText())) {
+                return;
+            }
+
+            registerError(jsExpressionStatement);
+        }
+
+        private boolean isNotPointless(final JSExpression expression) {
+            if (expression instanceof JSCallExpression) {
+                return true;
+            }
+            if (expression instanceof JSAssignmentExpression) {
+                return true;
+            }
+
+            if (expression instanceof JSPrefixExpression) {
+                final JSPrefixExpression prefix = (JSPrefixExpression)expression;
+                final IElementType sign = prefix.getOperationSign();
+                if (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign)) {
+                    return true;
+                }
+                final PsiElement signElement = expression.getFirstChild();
+                if (signElement != null) {
+                    @NonNls final String text = signElement.getText();
+                    if ("delete".equals(text)) {
+                        return true;
+                    }
+
+                    ASTNode node;
+                    if (sign == null && (node = signElement.getNode()) != null && node.getElementType() == JSTokenTypes.VOID_KEYWORD) {
+                        if ("void(0)".equals(expression.getText())) {
+                            return true;
+                        }
+                    }
+                }
+            }
+            if (expression instanceof JSPostfixExpression) {
+                final JSPostfixExpression prefix = (JSPostfixExpression)expression;
+                final IElementType sign = prefix.getOperationSign();
+                if (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign)) {
+                    return true;
+                }
+            }
+
+            if (expression instanceof JSBinaryExpression) {
+                final JSBinaryExpression binary = (JSBinaryExpression)expression;
+                final IElementType sign = binary.getOperationSign();
+
+                if (sign == JSTokenTypes.ANDAND || sign == JSTokenTypes.OROR) {
+                    final JSExpression leftOp = binary.getLOperand();
+
+                    if ((leftOp instanceof JSReferenceExpression || leftOp instanceof JSIndexedPropertyAccessExpression)
+                        && isNotPointless(binary.getROperand())) {
+                        return true;
+                    }
+                }
+                else if (sign == JSTokenTypes.COMMA) {
+                    return isNotPointless(binary.getLOperand()) || isNotPointless(binary.getROperand());
+                }
+            }
+
+            if (expression instanceof JSParenthesizedExpression parenthesized) {
+                return isNotPointless(parenthesized.getInnerExpression());
+            }
+
+            if (expression instanceof JSReferenceExpression referenceExpression) {
+                if (expression.getParent().getParent() instanceof JSClass
+                    || PsiTreeUtil.getParentOfType(expression, PsiFile.class).getContext() != null) {
+                    final ResolveResult[] results = referenceExpression.multiResolve(false);
+                    if (results.length > 0) {
+                        final PsiElement element = results[0].getElement();
+                        if (element instanceof JSClass || element instanceof JSFunction) {
+                            return true; // class A { import B; B; } // x = "foo"
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index 31162f5f..6e2f7fae 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -57,8 +57,7 @@ public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
             if (numConditions < 2) {
                 return;
             }
-            final JSExpression[] conditionArray =
-                    conditions.toArray(new JSExpression[numConditions]);
+            final JSExpression[] conditionArray = conditions.toArray(new JSExpression[numConditions]);
             final boolean[] matched = new boolean[conditionArray.length];
             Arrays.fill(matched, false);
             for (int i = 0; i < conditionArray.length; i++) {
@@ -71,9 +70,7 @@ public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
                         continue;
                     }
                     final JSExpression testCondition = conditionArray[j];
-                    final boolean areEquivalent =
-                            EquivalenceChecker.expressionsAreEquivalent(condition,
-                                    testCondition);
+                    final boolean areEquivalent = EquivalenceChecker.expressionsAreEquivalent(condition, testCondition);
                     if (areEquivalent) {
                         registerError(testCondition);
                         if (!matched[i]) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index ceeb3bc9..4e82967e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -61,9 +61,8 @@ public void visitJSObjectLiteralExpression(JSObjectLiteralExpression jsObjectLit
                     final JSProperty property2 = properties[j];
                     final String property1Name = property1.getName();
                     final String property2Name = property2.getName();
-                    if(property1Name !=null && property2Name!=null &&
-                            property1Name.equals(property2Name))
-                    {
+                    if (property1Name != null && property2Name != null &&
+                        property1Name.equals(property2Name)) {
                         registerError(property2.getFirstChild());
                         if (!matched[i]) {
                             registerError(property1.getFirstChild());
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index a5014a89..adf4f829 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -17,178 +17,143 @@
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
-public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspection
-{
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.functionWithInconsistentReturnsDisplayName().get();
-	}
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.VALIDITY_GROUP_NAME.get();
-	}
-
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return true;
-	}
-
-	@RequiredReadAction
-	@Override
-	@Nullable
-	protected String buildErrorString(Object state, Object... args)
-	{
-		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-		assert function != null;
-		if(functionHasIdentifier(function))
-		{
-			return InspectionJSLocalize.functionHasInconsistentReturnPointsErrorString().get();
-		}
-		else
-		{
-			return InspectionJSLocalize.anonymousFunctionHasInconsistentReturnPointsErrorString().get();
-		}
-	}
-
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
-
-	private static class Visitor extends BaseInspectionVisitor
-	{
-		@Override
-		protected ProblemHighlightType getProblemHighlightType(PsiElement location)
-		{
-			return location.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 ? ProblemHighlightType.GENERIC_ERROR : super.getProblemHighlightType(location);
-		}
-
-		@Override
-		public void visitJSFunctionDeclaration(JSFunction function)
-		{
-			super.visitJSFunctionDeclaration(function);
-			String typeString = function.getReturnTypeString();
-			if(typeString == null && !functionHasReturnValues(function))
-			{
-				return;
-			}
-			if("void".equals(typeString) || !functionHasValuelessReturns(function))
-			{
-				return;
-			}
-			registerFunctionError(function);
-		}
-
-		@Override
-		public void visitJSFunctionExpression(JSFunctionExpression node)
-		{
-			super.visitJSFunctionExpression(node);
-			JSFunction function = node.getFunction();
-			String typeString = function.getReturnTypeString();
-
-			if(typeString != null && !"void".equals(typeString))
-			{
-				if(functionHasValuelessReturns(function))
-				{
-					registerFunctionError(function);
-				}
-			}
-		}
-	}
-
-	private static boolean functionHasReturnValues(JSFunction function)
-	{
-		final ReturnValuesVisitor visitor = new ReturnValuesVisitor(function);
-		function.accept(visitor);
-		return visitor.hasReturnValues();
-	}
-
-	private static boolean functionHasValuelessReturns(JSFunction function)
-	{
-		final PsiElement lastChild = function.getLastChild();
-		if(lastChild instanceof JSBlockStatement)
-		{
-			if(ControlFlowUtils.statementMayCompleteNormally((JSStatement) lastChild))
-			{
-				return true;
-			}
-		}
-		final ValuelessReturnVisitor visitor = new ValuelessReturnVisitor(function);
-		function.acceptChildren(visitor);
-		return visitor.hasValuelessReturns();
-	}
-
-	private static class ReturnValuesVisitor extends JSRecursiveElementVisitor
-	{
-		private final JSFunction function;
-		private boolean hasReturnValues = false;
-
-		ReturnValuesVisitor(JSFunction function)
-		{
-			this.function = function;
-		}
-
-		@Override
-		public void visitJSReturnStatement(JSReturnStatement statement)
-		{
-			super.visitJSReturnStatement(statement);
-			if(statement.getExpression() != null)
-			{
-				final JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
-				if(function.equals(containingFunction))
-				{
-					hasReturnValues = true;
-				}
-			}
-		}
-
-		public boolean hasReturnValues()
-		{
-			return hasReturnValues;
-		}
-	}
-
-	private static class ValuelessReturnVisitor extends JSRecursiveElementVisitor
-	{
-		private final JSFunction function;
-		private boolean hasValuelessReturns = false;
-
-		ValuelessReturnVisitor(JSFunction function)
-		{
-			this.function = function;
-		}
-
-		@Override
-		public void visitJSReturnStatement(JSReturnStatement statement)
-		{
-			super.visitJSReturnStatement(statement);
-			if(statement.getExpression() == null)
-			{
-				final JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
-				if(function.equals(containingFunction))
-				{
-					hasValuelessReturns = true;
-				}
-			}
-		}
-
-		@Override
-		public void visitJSFunctionDeclaration(JSFunction function)
-		{
-			// do nothing, so that it doesn't drill into nested functions
-		}
-
-		public boolean hasValuelessReturns()
-		{
-			return hasValuelessReturns;
-		}
-	}
+public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.functionWithInconsistentReturnsDisplayName().get();
+    }
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    }
+
+    @Override
+    public boolean isEnabledByDefault() {
+        return true;
+    }
+
+    @RequiredReadAction
+    @Override
+    @Nullable
+    protected String buildErrorString(Object state, Object... args) {
+        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        assert function != null;
+        return functionHasIdentifier(function)
+            ? InspectionJSLocalize.functionHasInconsistentReturnPointsErrorString().get()
+            : InspectionJSLocalize.anonymousFunctionHasInconsistentReturnPointsErrorString().get();
+    }
+
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
+
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        protected ProblemHighlightType getProblemHighlightType(PsiElement location) {
+            return location.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4
+                ? ProblemHighlightType.GENERIC_ERROR
+                : super.getProblemHighlightType(location);
+        }
+
+        @Override
+        public void visitJSFunctionDeclaration(JSFunction function) {
+            super.visitJSFunctionDeclaration(function);
+            String typeString = function.getReturnTypeString();
+            if (typeString == null && !functionHasReturnValues(function)) {
+                return;
+            }
+            if ("void".equals(typeString) || !functionHasValuelessReturns(function)) {
+                return;
+            }
+            registerFunctionError(function);
+        }
+
+        @Override
+        public void visitJSFunctionExpression(JSFunctionExpression node) {
+            super.visitJSFunctionExpression(node);
+            JSFunction function = node.getFunction();
+            String typeString = function.getReturnTypeString();
+
+            if (typeString != null && !"void".equals(typeString)) {
+                if (functionHasValuelessReturns(function)) {
+                    registerFunctionError(function);
+                }
+            }
+        }
+    }
+
+    private static boolean functionHasReturnValues(JSFunction function) {
+        final ReturnValuesVisitor visitor = new ReturnValuesVisitor(function);
+        function.accept(visitor);
+        return visitor.hasReturnValues();
+    }
+
+    private static boolean functionHasValuelessReturns(JSFunction function) {
+        final PsiElement lastChild = function.getLastChild();
+        if (lastChild instanceof JSBlockStatement) {
+            if (ControlFlowUtils.statementMayCompleteNormally((JSStatement)lastChild)) {
+                return true;
+            }
+        }
+        final ValuelessReturnVisitor visitor = new ValuelessReturnVisitor(function);
+        function.acceptChildren(visitor);
+        return visitor.hasValuelessReturns();
+    }
+
+    private static class ReturnValuesVisitor extends JSRecursiveElementVisitor {
+        private final JSFunction function;
+        private boolean hasReturnValues = false;
+
+        ReturnValuesVisitor(JSFunction function) {
+            this.function = function;
+        }
+
+        @Override
+        public void visitJSReturnStatement(JSReturnStatement statement) {
+            super.visitJSReturnStatement(statement);
+            if (statement.getExpression() != null) {
+                final JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
+                if (function.equals(containingFunction)) {
+                    hasReturnValues = true;
+                }
+            }
+        }
+
+        public boolean hasReturnValues() {
+            return hasReturnValues;
+        }
+    }
+
+    private static class ValuelessReturnVisitor extends JSRecursiveElementVisitor {
+        private final JSFunction function;
+        private boolean hasValuelessReturns = false;
+
+        ValuelessReturnVisitor(JSFunction function) {
+            this.function = function;
+        }
+
+        @Override
+        public void visitJSReturnStatement(JSReturnStatement statement) {
+            super.visitJSReturnStatement(statement);
+            if (statement.getExpression() == null) {
+                final JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
+                if (function.equals(containingFunction)) {
+                    hasValuelessReturns = true;
+                }
+            }
+        }
+
+        @Override
+        public void visitJSFunctionDeclaration(JSFunction function) {
+            // do nothing, so that it doesn't drill into nested functions
+        }
+
+        public boolean hasValuelessReturns() {
+            return hasValuelessReturns;
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index 0bc602d1..83b5a899 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -51,7 +51,8 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSThisExpression(JSThisExpression jsThisExpression) {
             super.visitJSThisExpression(jsThisExpression);
-            final JSObjectLiteralExpression containingObject = PsiTreeUtil.getParentOfType(jsThisExpression, JSObjectLiteralExpression.class);
+            final JSObjectLiteralExpression containingObject =
+                PsiTreeUtil.getParentOfType(jsThisExpression, JSObjectLiteralExpression.class);
             if (containingObject != null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
index 9fceed01..2a2f2fa3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
@@ -49,9 +49,9 @@ private static class Visitor extends BaseInspectionVisitor {
         public void visitJSBlock(JSBlockStatement statement) {
             super.visitJSBlock(statement);
             final JSStatement[] statements = statement.getStatements();
-            for (int i = 0; i < statements.length-1; i++) {
+            for (int i = 0; i < statements.length - 1; i++) {
                 if (!ControlFlowUtils.statementMayCompleteNormally(statements[i])) {
-                    registerStatementError(statements[i+1]);
+                    registerStatementError(statements[i + 1]);
                 }
             }
         }

From e5ae556a5acb372c6a727a1cc9b8ce65f2498fba Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 25 Jul 2024 14:53:15 +0300
Subject: [PATCH 221/340] Fixed switch expression in EquivalenceChecker.

---
 .../com/sixrr/inspectjs/utils/EquivalenceChecker.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
index d4d508b9..68371cab 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
@@ -392,11 +392,9 @@ public static boolean expressionsAreEquivalent(@Nullable JSExpression exp1, @Nul
             return false;
         }
         return switch (type1) {
-            case THIS_EXPRESSION:
-            case SUPER_EXPRESSION -> true;
-            case LITERAL_EXPRESSION:
-            case CLASS_OBJECT_EXPRESSION:
-            case REFERENCE_EXPRESSION -> expToCompare1.getText().equals(expToCompare2.getText());
+            case THIS_EXPRESSION, SUPER_EXPRESSION -> true;
+            case LITERAL_EXPRESSION, CLASS_OBJECT_EXPRESSION, REFERENCE_EXPRESSION ->
+                expToCompare1.getText().equals(expToCompare2.getText());
             case CALL_EXPRESSION -> methodCallExpressionsAreEquivalent((JSCallExpression)expToCompare1, (JSCallExpression)expToCompare2);
             case NEW_EXPRESSION -> newExpressionsAreEquivalent((JSNewExpression)expToCompare1, (JSNewExpression)expToCompare2);
             case ARRAY_LITERAL_EXPRESSION -> arrayInitializerExpressionsAreEquivalent(

From 7a388c8682a60e84c5d55e99cdb7517c88d41462 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 25 Jul 2024 18:24:02 +0300
Subject: [PATCH 222/340] Code reformat using IJ4 code style (part 12).

---
 .../documentation/JSDocumentationBuilder.java | 1371 ++++++------
 .../JSDocumentationProcessor.java             |   46 +-
 .../JSDocumentationProvider.java              | 1985 ++++++++---------
 .../documentation/JSDocumentationUtils.java   | 1733 +++++++-------
 .../flex/AnnotationBackedDescriptor.java      |    7 +-
 .../javascript/flex/FlexImportSupport.java    |  354 ++-
 .../lang/javascript/flex/JSResolveHelper.java |   22 +-
 .../javascript/flex/XmlBackedJSClassImpl.java | 1321 +++++------
 .../highlighting/JSHighlighter.java           |  187 +-
 .../JavaScriptHighlightingLexer.java          |  197 +-
 .../javascript/index/JSItemPresentation.java  |  105 +-
 .../lang/javascript/index/JSSymbolUtil.java   |  750 +++----
 .../index/JSTypeEvaluateManager.java          |   99 +-
 .../javascript/index/JavaScriptIndex.java     |   26 +-
 .../inspections/qucikFixes/BaseCreateFix.java |  808 ++++---
 .../CreateJSFunctionOrMethodFix.java          |  180 +-
 .../lang/javascript/parsing/JSDocParsing.java |  221 +-
 .../psi/impl/JSArgumentListImpl.java          |   39 +-
 .../impl/JSArrayLiteralExpressionImpl.java    |   72 +-
 .../psi/impl/JSAssignmentExpressionImpl.java  |   19 +-
 .../javascript/psi/impl/JSAttributeImpl.java  |  336 ++-
 .../psi/impl/JSAttributeListImpl.java         |  280 ++-
 .../impl/JSAttributeNameValuePairImpl.java    |  279 ++-
 .../psi/impl/JSBinaryExpressionImpl.java      |  106 +-
 .../reference/JSPropertyNameReference.java    |  184 +-
 .../inspectjs/JSRecursiveElementVisitor.java  |   14 +-
 26 files changed, 4933 insertions(+), 5808 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
index 2c10d265..642fc700 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
@@ -37,751 +37,628 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-class JSDocumentationBuilder implements JSDocumentationProcessor
-{
-	private static class SymbolInfo
-	{
-		String visibility;
-		StringBuilder description = new StringBuilder();
-		String type;
-		String access;
-		boolean deprecated;
-		String namespace;
-	}
-
-	private static class MethodInfo extends SymbolInfo
-	{
-		String methodType;
-		Map<String, ParameterInfo> parameterInfoMap = new LinkedHashMap<String, ParameterInfo>();
-		int parameterCount = -1;
-		SymbolInfo returnInfo = new SymbolInfo();
-	}
-
-	private static class ParameterInfo extends SymbolInfo
-	{
-		boolean optional;
-		String initialValue;
-	}
-
-	private boolean myOptionalParametersStarted;
-	private boolean myEventsStarted;
-	private SymbolInfo generationInfo;
-	private ParameterInfo currentParameterInfo;
-	private
-	@NonNls
-	StringBuilder result;
-
-	private JSFunction function;
-	private JSNamedElement namedItem;
-	private final PsiElement myElement;
-	private PsiElement contextElement;
-
-	private int myNewLinesPendingCount;
-	private boolean seenPre;
-	private boolean seenSeeAlso;
-	@NonNls
-	private static final String BR_DELIMITER = "<BR>\n";
-
-	JSDocumentationBuilder(PsiElement element, PsiElement _contextElement)
-	{
-		myElement = element;
-		contextElement = _contextElement;
-		final PsiElement parent = element.getParent();
-		if(element instanceof JSVariable)
-		{
-			JSExpression initializer = ((JSVariable) element).getInitializer();
-			if(initializer instanceof JSFunctionExpression)
-			{
-				element = initializer;
-			}
-		}
-
-		if(element instanceof JSFunction)
-		{
-			function = (JSFunction) element;
-			generationInfo = new MethodInfo();
-
-			if(parent instanceof JSClass)
-			{
-				generationInfo.namespace = ((JSClass) parent).getQualifiedName();
-			}
-
-			for(JSParameter parameter : function.getParameterList().getParameters())
-			{
-				final ParameterInfo paramInfo = new ParameterInfo();
-				((MethodInfo) generationInfo).parameterInfoMap.put(parameter.getName(), paramInfo);
-				paramInfo.type = parameter.getTypeString();
-				paramInfo.initialValue = parameter.getInitializerText();
-			}
-
-			((MethodInfo) generationInfo).returnInfo.type = function.getReturnTypeString();
-		}
-		else if(element instanceof JSNamedElement)
-		{
-			namedItem = (JSNamedElement) element;
-			generationInfo = new SymbolInfo();
-
-			if(namedItem instanceof JSClass)
-			{
-				if(parent instanceof JSPackageStatement)
-				{
-					generationInfo.namespace = ((JSPackageStatement) parent).getQualifiedName();
-				}
-			}
-		}
-		else
-		{
-			generationInfo = new SymbolInfo();
-		}
-
-		result = generationInfo.description;
-	}
-
-	private void doAppend(final @NonNls String str)
-	{
-		while(myNewLinesPendingCount > 0)
-		{
-			result.append(seenPre ? "\n" : BR_DELIMITER);
-			--myNewLinesPendingCount;
-		}
-
-		result.append(str);
-	}
-
-	private static final Pattern ourTagStartPattern = Pattern.compile("<(/)?(\\w+)");
-
-	@Override
-	public boolean needsPlainCommentData()
-	{
-		return true;
-	}
-
-	@Override
-	public boolean onCommentLine(@Nonnull String line)
-	{
-		String trimmedLine = line.trim();
-		boolean parametersStarted = false;
-		boolean parametersEnded = false;
-
-		if(generationInfo instanceof MethodInfo)
-		{
-			final MethodInfo methodInfo = (MethodInfo) generationInfo;
-			parametersEnded = methodInfo.parameterCount + 1 == methodInfo.parameterInfoMap.size();
-			parametersStarted = methodInfo.parameterCount >= 0;
-		}
-
-		if(trimmedLine.length() == 0)
-		{
-			if(result.length() == 0)
-			{
-				return true;
-			}
-
-			final int maxSubsequentBr = parametersStarted && !parametersEnded ? 0 : 2;
-			if(myNewLinesPendingCount < maxSubsequentBr)
-			{
-				++myNewLinesPendingCount;
-			}
-
-			if(parametersEnded && ((MethodInfo) generationInfo).returnInfo.description != result)
-			{
-				setResult(generationInfo.description);
-				myNewLinesPendingCount = 1;
-			}
-
-			return true;
-		}
-
-		if(line.indexOf("<pre>") != -1)
-		{
-			seenPre = true;
-		}
-
-		if(!seenPre && line.indexOf('<') != -1)
-		{
-			Matcher matcher = ourTagStartPattern.matcher(line);
-			int offset = 0;
-
-			while(matcher.find())
-			{
-				final boolean isTagEnd = matcher.start(1) != matcher.end(1);
-				final String s = matcher.group(2);
-				// tags that do not need escaping
-				if(tagNameThatDoNotNeedEscaping(s))
-				{
-					continue;
-				}
-				line = line.substring(0, offset + matcher.start(0)) + "&lt;" + (isTagEnd ? "/" : "") + s + line.substring(offset + matcher.end(0));
-				offset += 3;
-			}
-		}
-
-		doAppend(line);
-		myNewLinesPendingCount = parametersStarted && !parametersEnded ? 0 : 1;
-
-		if(line.indexOf("</pre>") != -1)
-		{
-			seenPre = false;
-		}
-		return true;
-	}
-
-	private static boolean tagNameThatDoNotNeedEscaping(final @NonNls String s)
-	{
-		return s.equalsIgnoreCase("p") || s.equalsIgnoreCase("i") || s.equalsIgnoreCase("code") || s.equalsIgnoreCase("ul") ||
-				s.equalsIgnoreCase("li") || s.equalsIgnoreCase("b");
-	}
-
-	private void setResult(final StringBuilder builder)
-	{
-		result = builder;
-		myNewLinesPendingCount = 0;
-	}
-
-	@Override
-	public boolean onPatternMatch(@Nonnull MetaDocType metaDocType, @Nullable String matchName, @Nullable String matchValue,
-								  @Nullable String remainingLineContent, @Nonnull final String line, final String patternMatched)
-	{
-		if(metaDocType == MetaDocType.DEFAULT)
-		{
-			boolean color = remainingLineContent.startsWith("0x") && remainingLineContent.length() == 8;
-			remainingLineContent = appendCurrentOrDefaultValue(remainingLineContent.substring(color ? 2 : 0), color, true);
-		}
-
-		if(metaDocType == MetaDocType.SEE)
-		{
-			if(!seenSeeAlso)
-			{
-				seenSeeAlso = true;
-				result.append("<DL><DT><b>See also:</b></DT><DD>");
-			}
-			else
-			{
-				result.append("</DD><DD>");
-			}
-			if(URLUtil.isAbsoluteURL(remainingLineContent))
-			{
-				result.append("<a href=\"").append(remainingLineContent).append("\">").append(remainingLineContent).append("</a>");
-			}
-			else if(StringUtil.containsAnyChar(remainingLineContent, JSDocumentationProvider.SEE_PLAIN_TEXT_CHARS))
-			{
-				result.append(StringUtil.stripQuotesAroundValue(remainingLineContent));
-			}
-			else
-			{
-				JSDocumentationUtils.appendHyperLinkToElement(null, getSeeAlsoLink(remainingLineContent), result, remainingLineContent, null);
-				return true;
-			}
-		}
-		else if(seenSeeAlso)
-		{
-			seenSeeAlso = false;
-			result.append("</DD></DL>");
-		}
-
-		if(metaDocType == MetaDocType.EVENT)
-		{
-			if(myEventsStarted)
-			{
-				result.append("</DD><DD>");
-			}
-
-			result.append("\n");
-			if(!myEventsStarted)
-			{
-				myEventsStarted = true;
-				result.append("<DL><DT><b>Events:</b></DT><DD>");
-			}
-			result.append("Event <code>" + matchName + "</code> -" + remainingLineContent);
-			return true;
-		}
-		else if(myEventsStarted)
-		{
-			myEventsStarted = false;
-			result.append("</DD></DL>");
-		}
-
-		if(metaDocType == MetaDocType.NOTE)
-		{
-			result.append("\n<p><b>Note:</b> " + remainingLineContent);
-			return true;
-		}
-
-		if(metaDocType == MetaDocType.OPTIONAL_PARAMETERS)
-		{
-			myOptionalParametersStarted = true;
-			if(currentParameterInfo != null)
-			{
-				currentParameterInfo.optional = true;
-			}
-			if(remainingLineContent != null)
-			{
-				onCommentLine(remainingLineContent);
-			}
-			return true;
-		}
-
-		if(metaDocType == MetaDocType.DEPRECATED)
-		{
-			generationInfo.deprecated = true;
-			if(remainingLineContent != null)
-			{
-				onCommentLine(remainingLineContent);
-			}
-			return true;
-		}
-
-		if(metaDocType == MetaDocType.DESCRIPTION)
-		{
-			generationInfo.description.append(remainingLineContent);
-			return true;
-		}
-
-		if(metaDocType == MetaDocType.PRIVATE ||
-				metaDocType == MetaDocType.PUBLIC ||
-				metaDocType == MetaDocType.PROTECTED ||
-				metaDocType == MetaDocType.STATIC)
-		{
-			final String s = metaDocType.name().toLowerCase();
-			if(generationInfo.visibility == null)
-			{
-				generationInfo.visibility = s;
-			}
-			else
-			{
-				generationInfo.visibility += ", " + s;
-			}
-			return true;
-		}
-		else if(metaDocType == MetaDocType.TYPE)
-		{
-			generationInfo.type = matchName;
-			return true;
-		}
-		else if(metaDocType == MetaDocType.FINAL)
-		{
-			generationInfo.access = "final";
-			return true;
-		}
-		else if(metaDocType == MetaDocType.REQUIRES)
-		{
-			//onCommentLine("Requires:"+matchName);
-			return true;
-		}
-		else if(metaDocType == MetaDocType.NAMESPACE)
-		{
-			generationInfo.namespace = matchName;
-			return true;
-		}
-
-		if(function != null)
-		{
-			final MethodInfo methodGenerationInfo = ((MethodInfo) generationInfo);
-
-			if(metaDocType == MetaDocType.CONSTRUCTOR)
-			{
-				methodGenerationInfo.methodType = "contructor";
-			}
-			else if(metaDocType == MetaDocType.METHOD)
-			{
-				methodGenerationInfo.methodType = "method";
-			}
-			else if(metaDocType == MetaDocType.PARAMETER)
-			{
-				ParameterInfo info = methodGenerationInfo.parameterInfoMap.get(matchName);
-
-				if(info != null)
-				{
-					int index = 0;
-					for(SymbolInfo _info : methodGenerationInfo.parameterInfoMap.values())
-					{
-						if(info == _info)
-						{
-							break;
-						}
-						++index;
-					}
-
-					methodGenerationInfo.parameterCount = index;
-				}
-				else if(patternMatched.indexOf('@') != -1)
-				{
-					// wrong doc (without parameter name)
-					methodGenerationInfo.parameterCount++;
-					int index = 0;
-
-					for(SymbolInfo _info : methodGenerationInfo.parameterInfoMap.values())
-					{
-						if(index == methodGenerationInfo.parameterCount)
-						{
-							info = (ParameterInfo) _info;
-							break;
-						}
-						++index;
-					}
-				}
-
-				if(info != null)
-				{
-					if(matchValue != null)
-					{
-						info.type = matchValue;
-					}
-					setResult(info.description);
-					info.description.append(remainingLineContent);
-					info.optional = myOptionalParametersStarted;
-					currentParameterInfo = info;
-				}
-				else
-				{
-					onCommentLine(line);
-				}
-			}
-			else if(metaDocType == MetaDocType.RETURN)
-			{
-				result = methodGenerationInfo.returnInfo.description;
-				if(matchName != null)
-				{
-					methodGenerationInfo.returnInfo.type = matchName;
-				}
-				if(matchValue != null)
-				{
-					methodGenerationInfo.returnInfo.description.append(matchValue);
-				}
-				if(remainingLineContent != null)
-				{
-					methodGenerationInfo.returnInfo.description.append(remainingLineContent);
-				}
-			}
-		}
-		return true;
-	}
-
-	private String getSeeAlsoLink(String remainingLineContent)
-	{
-		if(URLUtil.isAbsoluteURL(remainingLineContent))
-		{
-			return remainingLineContent;
-		}
-
-		if(!remainingLineContent.contains(".") && !remainingLineContent.startsWith("#"))
-		{
-			// first try to find class in the same package, then in default one
-			JSQualifiedNamedElement qualifiedElement = JSDocumentationProvider.findParentQualifiedElement(myElement);
-			if(qualifiedElement != null)
-			{
-				String qname = qualifiedElement.getQualifiedName();
-				String aPackage = qname.contains(".") ? qname.substring(0, qname.lastIndexOf('.') + 1) : "";
-				String resolvedLink = JSDocumentationProvider.getSeeAlsoLinkResolved(myElement, aPackage + remainingLineContent);
-				if(resolvedLink != null)
-				{
-					return resolvedLink;
-				}
-			}
-		}
-
-		String resolvedLink = JSDocumentationProvider.getSeeAlsoLinkResolved(myElement, remainingLineContent);
-		return resolvedLink != null ? resolvedLink : remainingLineContent;
-	}
-
-	private String appendCurrentOrDefaultValue(String remainingLineContent, boolean color, boolean defaultValue)
-	{
-		if(color)
-		{
-			remainingLineContent = "<span style=\"background-color:#" + remainingLineContent + "\">&nbsp;&nbsp;&nbsp;</span>";
-		}
-		else
-		{
-			remainingLineContent = "<code>" + remainingLineContent + "</code>";
-		}
-		result.append("<br>\n<u>").append(defaultValue ? "Default" : "Current").append(" value:</u>").append(remainingLineContent);
-		return remainingLineContent;
-	}
-
-	String getDoc()
-	{
-		if(seenSeeAlso)
-		{
-			seenSeeAlso = false;
-			result.append("</DD></DL>");
-		}
-		result = new StringBuilder();
-
-		if(function != null)
-		{
-			startFunction(function);
-			result.append(generationInfo.description.toString());
-
-			result.append("\n<DL>");
-			final MethodInfo methodInfo = ((MethodInfo) generationInfo);
-
-			if(methodInfo.parameterInfoMap.size() > 0)
-			{
-				result.append("<DT><b>");
-				result.append(CodeInsightLocalize.javadocParameters().get());
-				result.append("</b></DT>");
-			}
-
-			for(Map.Entry<String, ParameterInfo> parameterInfo : methodInfo.parameterInfoMap.entrySet())
-			{
-				result.append("<DD><code>");
-				result.append(parameterInfo.getKey());
-				result.append("</code>");
-
-				if(parameterInfo.getValue().description.length() > 0)
-				{
-					result.append(" - ");
-					result.append(parameterInfo.getValue().description.toString());
-				}
-				result.append("</DD>\n");
-			}
-
-			if(methodInfo.returnInfo.description.length() > 0)
-			{
-				result.append("<DT><b>");
-				result.append(CodeInsightLocalize.javadocReturns().get());
-				result.append("</b></DT>");
-
-				result.append("<DD>");
-				result.append(methodInfo.returnInfo.description.toString());
-				result.append("</DD>");
-			}
-
-			result.append("</DL>");
-		}
-		else
-		{
-			if(namedItem != null)
-			{
-				startNamedItem(namedItem.getName());
-				endNamedItem();
-			}
-
-			result.append(generationInfo.description.toString());
-		}
-
-		if(contextElement != null)
-		{
-			final String text = contextElement.getText();
-			if(text.startsWith("#") && text.length() == 7)
-			{
-				appendCurrentOrDefaultValue(text.substring(1), true, false);
-			}
-		}
-
-		return result.toString();
-	}
-
-	public String getParameterDoc(final String name)
-	{
-		if(function != null)
-		{
-			final MethodInfo methodInfo = ((MethodInfo) generationInfo);
-			final ParameterInfo parameterInfo = methodInfo.parameterInfoMap.get(name);
-
-			if(parameterInfo != null && parameterInfo.description.length() > 0)
-			{
-				result = new StringBuilder();
-				startNamedItem(name, parameterInfo);
-				endNamedItem();
-				result.append(parameterInfo.description.toString());
-				return result.toString();
-			}
-		}
-
-		return null;
-	}
-
-
-	private void startFunction(JSFunction function)
-	{
-		@NonNls String functionName = function.getName();
-		final PsiElement parent = function.getParent();
-
-		if(parent instanceof JSAssignmentExpression)
-		{
-			final String unqualifiedFunctionName = functionName;
-			JSExpression expression = ((JSDefinitionExpression) ((JSAssignmentExpression) parent).getLOperand()).getExpression();
-			functionName = null;
-
-			if(expression instanceof JSReferenceExpression)
-			{
-				final JSExpression qualifierExpression = ((JSReferenceExpression) expression).getQualifier();
-				if(qualifierExpression instanceof JSReferenceExpression)
-				{
-					expression = JSSymbolUtil.findReferenceExpressionUsedForClassExtending((JSReferenceExpression) qualifierExpression);
-					functionName = expression.getText() + "." + unqualifiedFunctionName;
-				}
-			}
-
-			if(functionName == null)
-			{
-				functionName = expression.getText();
-			}
-			if(generationInfo.namespace != null && functionName.equals(generationInfo.namespace + "." + unqualifiedFunctionName))
-			{
-				generationInfo.namespace = null;
-			}
-		}
-
-		if(functionName == null)
-		{
-			functionName = "<anonymous>";
-		}
-
-		int indent = startNamedItem(functionName);
-
-		result.append("(");
-		int resultLength = result.length();
-
-		for(Map.Entry<String, ParameterInfo> parameterInfo : ((MethodInfo) generationInfo).parameterInfoMap.entrySet())
-		{
-
-			if(result.length() != resultLength)
-			{
-				result.append(",\n");
-				for(int i = 0; i < indent; ++i)
-				{
-					result.append(" ");
-				}
-			}
-			result.append("&nbsp;");
-
-			String parameterType = parameterInfo.getValue().type;
-			if(parameterType != null)
-			{
-				boolean optional = parameterInfo.getValue().optional;
-
-				if(parameterType.endsWith("?"))
-				{
-					optional = true;
-					parameterType = parameterType.substring(0, parameterType.length() - 1);
-				}
-
-
-				result.append("[ ");
-				result.append(parameterType);
-				if(optional)
-				{
-					result.append(", optional");
-				}
-				result.append(" ] ");
-			}
-
-			result.append(parameterInfo.getKey());
-
-			final String initialValue = parameterInfo.getValue().initialValue;
-			if(initialValue != null)
-			{
-				result.append(" = ").append(initialValue);
-			}
-		}
-
-		result.append("&nbsp;)\n");
-		endNamedItem();
-	}
-
-	private void endNamedItem()
-	{
-		result.append("</PRE>");
-	}
-
-	private int startNamedItem(final String functionName)
-	{
-		return startNamedItem(functionName, generationInfo);
-	}
-
-	private int startNamedItem(final String functionName, SymbolInfo generationInfo)
-	{
-		result.append("<PRE>");
-
-		StringBuffer options = new StringBuffer();
-		int offset = result.length();
-
-		if(generationInfo instanceof MethodInfo)
-		{
-			addVisibilityAndAccess(options, generationInfo);
-			String returnType = ((MethodInfo) generationInfo).returnInfo.type;
-			if(returnType != null)
-			{
-				if(options.length() > 0)
-				{
-					options.append(", ");
-				}
-				options.append(returnType);
-			}
-
-			final String type = ((MethodInfo) generationInfo).methodType;
-			if(type != null)
-			{
-				if(options.length() > 0)
-				{
-					options.append(", ");
-				}
-				options.append(type);
-			}
-		}
-		else
-		{
-			if(generationInfo.type != null)
-			{
-				if(options.length() > 0)
-				{
-					options.append(", ");
-				}
-				options.append(generationInfo.type);
-			}
-
-			addVisibilityAndAccess(options, generationInfo);
-		}
-
-		if(options.length() > 0)
-		{
-			result.append("[ ");
-			result.append(options.toString());
-			result.append(" ] ");
-		}
-
-		offset = result.length() - offset + functionName.length() + 1;
-
-		result.append("<b>");
-		if(generationInfo.namespace != null && generationInfo.namespace.length() > 0)
-		{
-			result.append(generationInfo.namespace).append('.');
-		}
-		result.append(functionName);
-		result.append("</b>");
-
-		return offset;
-	}
-
-	private void addVisibilityAndAccess(final StringBuffer options, SymbolInfo generationInfo)
-	{
-		if(generationInfo.visibility != null)
-		{
-			if(options.length() > 0)
-			{
-				options.append(", ");
-			}
-			options.append(generationInfo.visibility);
-		}
-
-		if(generationInfo.access != null)
-		{
-			if(options.length() > 0)
-			{
-				options.append(", ");
-			}
-			options.append(generationInfo.access);
-		}
-
-		if(generationInfo.deprecated)
-		{
-			if(options.length() > 0)
-			{
-				options.append(", ");
-			}
-			options.append("deprecated");
-		}
-	}
+class JSDocumentationBuilder implements JSDocumentationProcessor {
+    private static class SymbolInfo {
+        String visibility;
+        StringBuilder description = new StringBuilder();
+        String type;
+        String access;
+        boolean deprecated;
+        String namespace;
+    }
+
+    private static class MethodInfo extends SymbolInfo {
+        String methodType;
+        Map<String, ParameterInfo> parameterInfoMap = new LinkedHashMap<String, ParameterInfo>();
+        int parameterCount = -1;
+        SymbolInfo returnInfo = new SymbolInfo();
+    }
+
+    private static class ParameterInfo extends SymbolInfo {
+        boolean optional;
+        String initialValue;
+    }
+
+    private boolean myOptionalParametersStarted;
+    private boolean myEventsStarted;
+    private SymbolInfo generationInfo;
+    private ParameterInfo currentParameterInfo;
+    private
+    @NonNls
+    StringBuilder result;
+
+    private JSFunction function;
+    private JSNamedElement namedItem;
+    private final PsiElement myElement;
+    private PsiElement contextElement;
+
+    private int myNewLinesPendingCount;
+    private boolean seenPre;
+    private boolean seenSeeAlso;
+    @NonNls
+    private static final String BR_DELIMITER = "<BR>\n";
+
+    JSDocumentationBuilder(PsiElement element, PsiElement _contextElement) {
+        myElement = element;
+        contextElement = _contextElement;
+        final PsiElement parent = element.getParent();
+        if (element instanceof JSVariable variable
+            && variable.getInitializer() instanceof JSFunctionExpression functionExpression) {
+            element = functionExpression;
+        }
+
+        if (element instanceof JSFunction func) {
+            function = func;
+            generationInfo = new MethodInfo();
+
+            if (parent instanceof JSClass jsClass) {
+                generationInfo.namespace = jsClass.getQualifiedName();
+            }
+
+            for (JSParameter parameter : function.getParameterList().getParameters()) {
+                final ParameterInfo paramInfo = new ParameterInfo();
+                ((MethodInfo)generationInfo).parameterInfoMap.put(parameter.getName(), paramInfo);
+                paramInfo.type = parameter.getTypeString();
+                paramInfo.initialValue = parameter.getInitializerText();
+            }
+
+            ((MethodInfo)generationInfo).returnInfo.type = function.getReturnTypeString();
+        }
+        else if (element instanceof JSNamedElement namedElement) {
+            namedItem = namedElement;
+            generationInfo = new SymbolInfo();
+
+            if (namedItem instanceof JSClass && parent instanceof JSPackageStatement packageStatement) {
+                generationInfo.namespace = packageStatement.getQualifiedName();
+            }
+        }
+        else {
+            generationInfo = new SymbolInfo();
+        }
+
+        result = generationInfo.description;
+    }
+
+    private void doAppend(final @NonNls String str) {
+        while (myNewLinesPendingCount > 0) {
+            result.append(seenPre ? "\n" : BR_DELIMITER);
+            --myNewLinesPendingCount;
+        }
+
+        result.append(str);
+    }
+
+    private static final Pattern ourTagStartPattern = Pattern.compile("<(/)?(\\w+)");
+
+    @Override
+    public boolean needsPlainCommentData() {
+        return true;
+    }
+
+    @Override
+    public boolean onCommentLine(@Nonnull String line) {
+        String trimmedLine = line.trim();
+        boolean parametersStarted = false;
+        boolean parametersEnded = false;
+
+        if (generationInfo instanceof MethodInfo methodInfo) {
+            parametersEnded = methodInfo.parameterCount + 1 == methodInfo.parameterInfoMap.size();
+            parametersStarted = methodInfo.parameterCount >= 0;
+        }
+
+        if (trimmedLine.length() == 0) {
+            if (result.length() == 0) {
+                return true;
+            }
+
+            final int maxSubsequentBr = parametersStarted && !parametersEnded ? 0 : 2;
+            if (myNewLinesPendingCount < maxSubsequentBr) {
+                ++myNewLinesPendingCount;
+            }
+
+            if (parametersEnded && ((MethodInfo)generationInfo).returnInfo.description != result) {
+                setResult(generationInfo.description);
+                myNewLinesPendingCount = 1;
+            }
+
+            return true;
+        }
+
+        if (line.indexOf("<pre>") != -1) {
+            seenPre = true;
+        }
+
+        if (!seenPre && line.indexOf('<') != -1) {
+            Matcher matcher = ourTagStartPattern.matcher(line);
+            int offset = 0;
+
+            while (matcher.find()) {
+                final boolean isTagEnd = matcher.start(1) != matcher.end(1);
+                final String s = matcher.group(2);
+                // tags that do not need escaping
+                if (tagNameThatDoNotNeedEscaping(s)) {
+                    continue;
+                }
+                line = line.substring(0, offset + matcher.start(0)) + "&lt;" + (isTagEnd ? "/" : "") + s +
+                    line.substring(offset + matcher.end(0));
+                offset += 3;
+            }
+        }
+
+        doAppend(line);
+        myNewLinesPendingCount = parametersStarted && !parametersEnded ? 0 : 1;
+
+        if (line.indexOf("</pre>") != -1) {
+            seenPre = false;
+        }
+        return true;
+    }
+
+    private static boolean tagNameThatDoNotNeedEscaping(final @NonNls String s) {
+        return s.equalsIgnoreCase("p") || s.equalsIgnoreCase("i") || s.equalsIgnoreCase("code")
+            || s.equalsIgnoreCase("ul") || s.equalsIgnoreCase("li") || s.equalsIgnoreCase("b");
+    }
+
+    private void setResult(final StringBuilder builder) {
+        result = builder;
+        myNewLinesPendingCount = 0;
+    }
+
+    @Override
+    public boolean onPatternMatch(
+        @Nonnull MetaDocType metaDocType,
+        @Nullable String matchName,
+        @Nullable String matchValue,
+        @Nullable String remainingLineContent,
+        @Nonnull final String line,
+        final String patternMatched
+    ) {
+        if (metaDocType == MetaDocType.DEFAULT) {
+            boolean color = remainingLineContent.startsWith("0x") && remainingLineContent.length() == 8;
+            remainingLineContent = appendCurrentOrDefaultValue(remainingLineContent.substring(color ? 2 : 0), color, true);
+        }
+
+        if (metaDocType == MetaDocType.SEE) {
+            if (!seenSeeAlso) {
+                seenSeeAlso = true;
+                result.append("<DL><DT><b>See also:</b></DT><DD>");
+            }
+            else {
+                result.append("</DD><DD>");
+            }
+            if (URLUtil.isAbsoluteURL(remainingLineContent)) {
+                result.append("<a href=\"").append(remainingLineContent).append("\">").append(remainingLineContent).append("</a>");
+            }
+            else if (StringUtil.containsAnyChar(remainingLineContent, JSDocumentationProvider.SEE_PLAIN_TEXT_CHARS)) {
+                result.append(StringUtil.stripQuotesAroundValue(remainingLineContent));
+            }
+            else {
+                JSDocumentationUtils.appendHyperLinkToElement(
+                    null,
+                    getSeeAlsoLink(remainingLineContent),
+                    result,
+                    remainingLineContent,
+                    null
+                );
+                return true;
+            }
+        }
+        else if (seenSeeAlso) {
+            seenSeeAlso = false;
+            result.append("</DD></DL>");
+        }
+
+        if (metaDocType == MetaDocType.EVENT) {
+            if (myEventsStarted) {
+                result.append("</DD><DD>");
+            }
+
+            result.append("\n");
+            if (!myEventsStarted) {
+                myEventsStarted = true;
+                result.append("<DL><DT><b>Events:</b></DT><DD>");
+            }
+            result.append("Event <code>" + matchName + "</code> -" + remainingLineContent);
+            return true;
+        }
+        else if (myEventsStarted) {
+            myEventsStarted = false;
+            result.append("</DD></DL>");
+        }
+
+        if (metaDocType == MetaDocType.NOTE) {
+            result.append("\n<p><b>Note:</b> " + remainingLineContent);
+            return true;
+        }
+
+        if (metaDocType == MetaDocType.OPTIONAL_PARAMETERS) {
+            myOptionalParametersStarted = true;
+            if (currentParameterInfo != null) {
+                currentParameterInfo.optional = true;
+            }
+            if (remainingLineContent != null) {
+                onCommentLine(remainingLineContent);
+            }
+            return true;
+        }
+
+        if (metaDocType == MetaDocType.DEPRECATED) {
+            generationInfo.deprecated = true;
+            if (remainingLineContent != null) {
+                onCommentLine(remainingLineContent);
+            }
+            return true;
+        }
+
+        if (metaDocType == MetaDocType.DESCRIPTION) {
+            generationInfo.description.append(remainingLineContent);
+            return true;
+        }
+
+        if (metaDocType == MetaDocType.PRIVATE ||
+            metaDocType == MetaDocType.PUBLIC ||
+            metaDocType == MetaDocType.PROTECTED ||
+            metaDocType == MetaDocType.STATIC) {
+            final String s = metaDocType.name().toLowerCase();
+            if (generationInfo.visibility == null) {
+                generationInfo.visibility = s;
+            }
+            else {
+                generationInfo.visibility += ", " + s;
+            }
+            return true;
+        }
+        else if (metaDocType == MetaDocType.TYPE) {
+            generationInfo.type = matchName;
+            return true;
+        }
+        else if (metaDocType == MetaDocType.FINAL) {
+            generationInfo.access = "final";
+            return true;
+        }
+        else if (metaDocType == MetaDocType.REQUIRES) {
+            //onCommentLine("Requires:"+matchName);
+            return true;
+        }
+        else if (metaDocType == MetaDocType.NAMESPACE) {
+            generationInfo.namespace = matchName;
+            return true;
+        }
+
+        if (function != null) {
+            final MethodInfo methodGenerationInfo = ((MethodInfo)generationInfo);
+
+            if (metaDocType == MetaDocType.CONSTRUCTOR) {
+                methodGenerationInfo.methodType = "contructor";
+            }
+            else if (metaDocType == MetaDocType.METHOD) {
+                methodGenerationInfo.methodType = "method";
+            }
+            else if (metaDocType == MetaDocType.PARAMETER) {
+                ParameterInfo info = methodGenerationInfo.parameterInfoMap.get(matchName);
+
+                if (info != null) {
+                    int index = 0;
+                    for (SymbolInfo _info : methodGenerationInfo.parameterInfoMap.values()) {
+                        if (info == _info) {
+                            break;
+                        }
+                        ++index;
+                    }
+
+                    methodGenerationInfo.parameterCount = index;
+                }
+                else if (patternMatched.indexOf('@') != -1) {
+                    // wrong doc (without parameter name)
+                    methodGenerationInfo.parameterCount++;
+                    int index = 0;
+
+                    for (SymbolInfo _info : methodGenerationInfo.parameterInfoMap.values()) {
+                        if (index == methodGenerationInfo.parameterCount) {
+                            info = (ParameterInfo)_info;
+                            break;
+                        }
+                        ++index;
+                    }
+                }
+
+                if (info != null) {
+                    if (matchValue != null) {
+                        info.type = matchValue;
+                    }
+                    setResult(info.description);
+                    info.description.append(remainingLineContent);
+                    info.optional = myOptionalParametersStarted;
+                    currentParameterInfo = info;
+                }
+                else {
+                    onCommentLine(line);
+                }
+            }
+            else if (metaDocType == MetaDocType.RETURN) {
+                result = methodGenerationInfo.returnInfo.description;
+                if (matchName != null) {
+                    methodGenerationInfo.returnInfo.type = matchName;
+                }
+                if (matchValue != null) {
+                    methodGenerationInfo.returnInfo.description.append(matchValue);
+                }
+                if (remainingLineContent != null) {
+                    methodGenerationInfo.returnInfo.description.append(remainingLineContent);
+                }
+            }
+        }
+        return true;
+    }
+
+    private String getSeeAlsoLink(String remainingLineContent) {
+        if (URLUtil.isAbsoluteURL(remainingLineContent)) {
+            return remainingLineContent;
+        }
+
+        if (!remainingLineContent.contains(".") && !remainingLineContent.startsWith("#")) {
+            // first try to find class in the same package, then in default one
+            JSQualifiedNamedElement qualifiedElement = JSDocumentationProvider.findParentQualifiedElement(myElement);
+            if (qualifiedElement != null) {
+                String qname = qualifiedElement.getQualifiedName();
+                String aPackage = qname.contains(".") ? qname.substring(0, qname.lastIndexOf('.') + 1) : "";
+                String resolvedLink = JSDocumentationProvider.getSeeAlsoLinkResolved(myElement, aPackage + remainingLineContent);
+                if (resolvedLink != null) {
+                    return resolvedLink;
+                }
+            }
+        }
+
+        String resolvedLink = JSDocumentationProvider.getSeeAlsoLinkResolved(myElement, remainingLineContent);
+        return resolvedLink != null ? resolvedLink : remainingLineContent;
+    }
+
+    private String appendCurrentOrDefaultValue(String remainingLineContent, boolean color, boolean defaultValue) {
+        if (color) {
+            remainingLineContent = "<span style=\"background-color:#" + remainingLineContent + "\">&nbsp;&nbsp;&nbsp;</span>";
+        }
+        else {
+            remainingLineContent = "<code>" + remainingLineContent + "</code>";
+        }
+        result.append("<br>\n<u>").append(defaultValue ? "Default" : "Current").append(" value:</u>").append(remainingLineContent);
+        return remainingLineContent;
+    }
+
+    String getDoc() {
+        if (seenSeeAlso) {
+            seenSeeAlso = false;
+            result.append("</DD></DL>");
+        }
+        result = new StringBuilder();
+
+        if (function != null) {
+            startFunction(function);
+            result.append(generationInfo.description.toString());
+
+            result.append("\n<DL>");
+            final MethodInfo methodInfo = ((MethodInfo)generationInfo);
+
+            if (methodInfo.parameterInfoMap.size() > 0) {
+                result.append("<DT><b>");
+                result.append(CodeInsightLocalize.javadocParameters().get());
+                result.append("</b></DT>");
+            }
+
+            for (Map.Entry<String, ParameterInfo> parameterInfo : methodInfo.parameterInfoMap.entrySet()) {
+                result.append("<DD><code>");
+                result.append(parameterInfo.getKey());
+                result.append("</code>");
+
+                if (parameterInfo.getValue().description.length() > 0) {
+                    result.append(" - ");
+                    result.append(parameterInfo.getValue().description.toString());
+                }
+                result.append("</DD>\n");
+            }
+
+            if (methodInfo.returnInfo.description.length() > 0) {
+                result.append("<DT><b>");
+                result.append(CodeInsightLocalize.javadocReturns().get());
+                result.append("</b></DT>");
+
+                result.append("<DD>");
+                result.append(methodInfo.returnInfo.description.toString());
+                result.append("</DD>");
+            }
+
+            result.append("</DL>");
+        }
+        else {
+            if (namedItem != null) {
+                startNamedItem(namedItem.getName());
+                endNamedItem();
+            }
+
+            result.append(generationInfo.description.toString());
+        }
+
+        if (contextElement != null) {
+            final String text = contextElement.getText();
+            if (text.startsWith("#") && text.length() == 7) {
+                appendCurrentOrDefaultValue(text.substring(1), true, false);
+            }
+        }
+
+        return result.toString();
+    }
+
+    public String getParameterDoc(final String name) {
+        if (function != null) {
+            final MethodInfo methodInfo = ((MethodInfo)generationInfo);
+            final ParameterInfo parameterInfo = methodInfo.parameterInfoMap.get(name);
+
+            if (parameterInfo != null && parameterInfo.description.length() > 0) {
+                result = new StringBuilder();
+                startNamedItem(name, parameterInfo);
+                endNamedItem();
+                result.append(parameterInfo.description.toString());
+                return result.toString();
+            }
+        }
+
+        return null;
+    }
+
+
+    private void startFunction(JSFunction function) {
+        @NonNls String functionName = function.getName();
+        final PsiElement parent = function.getParent();
+
+        if (parent instanceof JSAssignmentExpression) {
+            final String unqualifiedFunctionName = functionName;
+            JSExpression expression = ((JSDefinitionExpression)((JSAssignmentExpression)parent).getLOperand()).getExpression();
+            functionName = null;
+
+            if (expression instanceof JSReferenceExpression) {
+                final JSExpression qualifierExpression = ((JSReferenceExpression)expression).getQualifier();
+                if (qualifierExpression instanceof JSReferenceExpression) {
+                    expression = JSSymbolUtil.findReferenceExpressionUsedForClassExtending((JSReferenceExpression)qualifierExpression);
+                    functionName = expression.getText() + "." + unqualifiedFunctionName;
+                }
+            }
+
+            if (functionName == null) {
+                functionName = expression.getText();
+            }
+            if (generationInfo.namespace != null && functionName.equals(generationInfo.namespace + "." + unqualifiedFunctionName)) {
+                generationInfo.namespace = null;
+            }
+        }
+
+        if (functionName == null) {
+            functionName = "<anonymous>";
+        }
+
+        int indent = startNamedItem(functionName);
+
+        result.append("(");
+        int resultLength = result.length();
+
+        for (Map.Entry<String, ParameterInfo> parameterInfo : ((MethodInfo)generationInfo).parameterInfoMap.entrySet()) {
+            if (result.length() != resultLength) {
+                result.append(",\n");
+                for (int i = 0; i < indent; ++i) {
+                    result.append(" ");
+                }
+            }
+            result.append("&nbsp;");
+
+            String parameterType = parameterInfo.getValue().type;
+            if (parameterType != null) {
+                boolean optional = parameterInfo.getValue().optional;
+
+                if (parameterType.endsWith("?")) {
+                    optional = true;
+                    parameterType = parameterType.substring(0, parameterType.length() - 1);
+                }
+
+
+                result.append("[ ");
+                result.append(parameterType);
+                if (optional) {
+                    result.append(", optional");
+                }
+                result.append(" ] ");
+            }
+
+            result.append(parameterInfo.getKey());
+
+            final String initialValue = parameterInfo.getValue().initialValue;
+            if (initialValue != null) {
+                result.append(" = ").append(initialValue);
+            }
+        }
+
+        result.append("&nbsp;)\n");
+        endNamedItem();
+    }
+
+    private void endNamedItem() {
+        result.append("</PRE>");
+    }
+
+    private int startNamedItem(final String functionName) {
+        return startNamedItem(functionName, generationInfo);
+    }
+
+    private int startNamedItem(final String functionName, SymbolInfo generationInfo) {
+        result.append("<PRE>");
+
+        StringBuffer options = new StringBuffer();
+        int offset = result.length();
+
+        if (generationInfo instanceof MethodInfo) {
+            addVisibilityAndAccess(options, generationInfo);
+            String returnType = ((MethodInfo)generationInfo).returnInfo.type;
+            if (returnType != null) {
+                if (options.length() > 0) {
+                    options.append(", ");
+                }
+                options.append(returnType);
+            }
+
+            final String type = ((MethodInfo)generationInfo).methodType;
+            if (type != null) {
+                if (options.length() > 0) {
+                    options.append(", ");
+                }
+                options.append(type);
+            }
+        }
+        else {
+            if (generationInfo.type != null) {
+                if (options.length() > 0) {
+                    options.append(", ");
+                }
+                options.append(generationInfo.type);
+            }
+
+            addVisibilityAndAccess(options, generationInfo);
+        }
+
+        if (options.length() > 0) {
+            result.append("[ ");
+            result.append(options.toString());
+            result.append(" ] ");
+        }
+
+        offset = result.length() - offset + functionName.length() + 1;
+
+        result.append("<b>");
+        if (generationInfo.namespace != null && generationInfo.namespace.length() > 0) {
+            result.append(generationInfo.namespace).append('.');
+        }
+        result.append(functionName);
+        result.append("</b>");
+
+        return offset;
+    }
+
+    private void addVisibilityAndAccess(final StringBuffer options, SymbolInfo generationInfo) {
+        if (generationInfo.visibility != null) {
+            if (options.length() > 0) {
+                options.append(", ");
+            }
+            options.append(generationInfo.visibility);
+        }
+
+        if (generationInfo.access != null) {
+            if (options.length() > 0) {
+                options.append(", ");
+            }
+            options.append(generationInfo.access);
+        }
+
+        if (generationInfo.deprecated) {
+            if (options.length() > 0) {
+                options.append(", ");
+            }
+            options.append("deprecated");
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
index 1754dc4d..b7f303bd 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
@@ -25,18 +25,42 @@
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
-public interface JSDocumentationProcessor
-{
-	enum MetaDocType
-	{
-		RETURN, CONSTRUCTOR, METHOD, PARAMETER, PRIVATE, PUBLIC, PROTECTED, STATIC, DESCRIPTION, FINAL, REQUIRES, TYPE, NAMESPACE,
-		OPTIONAL_PARAMETERS, EVENT, NOTE, DEPRECATED, SEE, DEFAULT, EXTENDS, CLASS, FIELD
-	}
+public interface JSDocumentationProcessor {
+    enum MetaDocType {
+        RETURN,
+        CONSTRUCTOR,
+        METHOD,
+        PARAMETER,
+        PRIVATE,
+        PUBLIC,
+        PROTECTED,
+        STATIC,
+        DESCRIPTION,
+        FINAL,
+        REQUIRES,
+        TYPE,
+        NAMESPACE,
+        OPTIONAL_PARAMETERS,
+        EVENT,
+        NOTE,
+        DEPRECATED,
+        SEE,
+        DEFAULT,
+        EXTENDS,
+        CLASS,
+        FIELD
+    }
 
-	boolean needsPlainCommentData();
+    boolean needsPlainCommentData();
 
-	boolean onCommentLine(@Nonnull String line);
+    boolean onCommentLine(@Nonnull String line);
 
-	boolean onPatternMatch(@Nonnull MetaDocType type, @Nullable String matchName, @Nullable final String matchValue,
-						   @Nullable String remainingLineContent, @Nonnull final String line, final String patternMatched);
+    boolean onPatternMatch(
+        @Nonnull MetaDocType type,
+        @Nullable String matchName,
+        @Nullable final String matchValue,
+        @Nullable String remainingLineContent,
+        @Nonnull final String line,
+        final String patternMatched
+    );
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index e0e326a6..6c49e34b 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -41,10 +41,10 @@
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ref.Ref;
 import consulo.xml.psi.xml.XmlToken;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import org.jetbrains.annotations.NonNls;
+
 import java.io.File;
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -58,1104 +58,885 @@
  * Time: 5:04:28 PM
  */
 @ExtensionImpl
-public class JSDocumentationProvider implements CodeDocumentationProvider, LanguageDocumentationProvider
-{
-	private DocumentationProvider cssProvider;
-	@NonNls
-	private static final String OBJECT_NAME = "Object";
-	protected static final String SEE_PLAIN_TEXT_CHARS = "\t \"-\\/<>*";
-
-	@NonNls
-	protected static final String PACKAGE = "package";
-	@NonNls
-	protected static final String HTML_EXTENSION = ".html";
-	@NonNls
-	protected static final String PACKAGE_FILE = PACKAGE + HTML_EXTENSION;
-
-	protected static final Map<String, String> DOCUMENTED_ATTRIBUTES;
-
-	static
-	{
-		DOCUMENTED_ATTRIBUTES = new HashMap<String, String>();
-		DOCUMENTED_ATTRIBUTES.put("Event", "event:");
-		DOCUMENTED_ATTRIBUTES.put("Style", "style:");
-		DOCUMENTED_ATTRIBUTES.put("Effect", "effect:");
-	}
-
-	private DocumentationProvider getCssProvider(Project project) throws Exception
-	{
-		if(cssProvider == null)
-		{
-			final Class<?> aClass = Class.forName("com.intellij.psi.css.impl.util.CssDocumentationProvider");
-			cssProvider = (DocumentationProvider) aClass.getConstructor(new Class[]{}).newInstance(new Object[]{});
-		}
-
-		return cssProvider;
-	}
-
-	@Nullable
-	public String getQuickNavigateInfo(PsiElement element, PsiElement element2)
-	{
-		if(element instanceof JSFunction)
-		{
-			final JSFunction function = (JSFunction) element;
-			final PsiElement parent = element.getParent();
-
-			if(function.isConstructor())
-			{
-				if(parent instanceof JSClass)
-				{
-					return createQuickNavigateForClazz((JSClass) parent);
-				}
-			}
-			return createQuickNavigateForFunction(function);
-		}
-		else if(element instanceof JSClass)
-		{
-			return createQuickNavigateForClazz((JSClass) element);
-		}
-		else if(element instanceof JSVariable)
-		{
-			return createQuickNavigateForVariable((JSVariable) element);
-		}
-		else if(element instanceof JSAttributeNameValuePair)
-		{
-			return createQuickNavigateForAnnotationDerived(element);
-		}
-		else if(element instanceof XmlToken)
-		{
-			BaseJSSymbolProcessor.TagContextBuilder builder = new BaseJSSymbolProcessor.TagContextBuilder(element, "XmlTag");
-			return StringUtil.stripQuotesAroundValue(element.getText()) + ":" + builder.typeName;
-		}
-		else if(element instanceof JSNamespaceDeclaration)
-		{
-			return createQuickNavigateForNamespace((JSNamespaceDeclaration) element);
-		}
-
-		return null;
-	}
-
-	private static String createQuickNavigateForAnnotationDerived(final PsiElement element)
-	{
-		final JSAttributeNameValuePair valuePair = (JSAttributeNameValuePair) element;
-		final JSAttribute parent = (JSAttribute) valuePair.getParent();
-		final StringBuilder builder = new StringBuilder();
-		final JSClass clazz = PsiTreeUtil.getParentOfType(valuePair, JSClass.class);
-		appendParentInfo(clazz != null ? clazz : parent.getContainingFile(), builder, parent);
-		builder.append(parent.getName()).append(" ").append(valuePair.getSimpleValue());
-		return builder.toString();
-	}
-
-	private static
-	@Nullable
-	String createQuickNavigateForFunction(final JSFunction function)
-	{
-		final PsiElement parent = JSResolveUtil.findParent(function);
-		final StringBuilder result = new StringBuilder();
-
-		appendParentInfo(parent, result, function);
-
-		appendAttrList(function, result);
-		final boolean get = function.isGetProperty();
-		final boolean set = function.isSetProperty();
-
-		result.append(get || set ? "property " : "function ");
-		result.append(function.getName());
-
-		if(!get && !set)
-		{
-			result.append('(');
-			final JSParameterList jsParameterList = function.getParameterList();
-
-			if(jsParameterList != null)
-			{
-				final int start = result.length();
-
-				for(JSParameter p : jsParameterList.getParameters())
-				{
-					if(start != result.length())
-					{
-						result.append(", ");
-					}
-					result.append(p.getName());
-					appendVarType(p, result);
-				}
-			}
-
-			result.append(')');
-		}
-
-		String varType = null;
-
-		if(get || !set)
-		{
-			varType = JSImportHandlingUtil.resolveTypeName(function.getReturnTypeString(), function);
-		}
-		else
-		{
-			final JSParameterList jsParameterList = function.getParameterList();
-
-			if(jsParameterList != null)
-			{
-				final JSParameter[] jsParameters = jsParameterList.getParameters();
-				if(jsParameters != null && jsParameters.length > 0)
-				{
-					varType = JSImportHandlingUtil.resolveTypeName(jsParameters[0].getTypeString(), function);
-				}
-			}
-		}
-
-		if(varType != null)
-		{
-			result.append(':').append(varType);
-		}
-		return result.toString();
-	}
-
-	private static void appendParentInfo(final PsiElement parent, final StringBuilder builder, PsiNamedElement element)
-	{
-		if(parent instanceof JSClass)
-		{
-			builder.append(((JSClass) parent).getQualifiedName()).append("\n");
-		}
-		else if(parent instanceof JSPackageStatement)
-		{
-			builder.append(((JSPackageStatement) parent).getQualifiedName()).append("\n");
-		}
-		else if(parent instanceof JSFile)
-		{
-			if(parent.getContext() != null)
-			{
-				final String mxmlPackage = JSResolveUtil.findPackageForMxml(parent);
-				if(mxmlPackage != null)
-				{
-					builder.append(mxmlPackage).append(mxmlPackage.length() > 0 ? "." : "").append(parent.getContext().getContainingFile().getName()).append("\n");
-				}
-			}
-			else
-			{
-				boolean foundQualified = false;
-
-				if(element instanceof JSNamedElement)
-				{
-					PsiElement node = ((JSNamedElement) element).getNameIdentifier();
-					if(node != null)
-					{
-						final String s = node.getText();
-						int i = s.lastIndexOf('.');
-						if(i != -1)
-						{
-							builder.append(s.substring(0, i)).append("\n");
-							foundQualified = true;
-						}
-					}
-				}
-				if(!foundQualified)
-				{
-					builder.append(parent.getContainingFile().getName()).append("\n");
-				}
-			}
-		}
-	}
-
-	@Nullable
-	@RequiredReadAction
-	private static String createQuickNavigateForVariable(final JSVariable variable)
-	{
-		final PsiElement parent = JSResolveUtil.findParent(variable);
-		final StringBuilder result = new StringBuilder();
-
-		appendParentInfo(parent, result, variable);
-
-		appendAttrList(variable, result);
-		result.append(variable.isConst() ? "const " : "var ");
-		result.append(variable.getName());
-		appendVarType(variable, result);
-
-		JSExpression initializer = variable.getInitializer();
-		if(initializer != null)
-		{
-			result.append(" = ");
-			if(initializer instanceof JSLiteralExpression)
-			{
-				result.append(initializer.getText());
-			}
-			else if(initializer instanceof JSObjectLiteralExpression)
-			{
-				result.append("{...}");
-			}
-			else
-			{
-				result.append("...");
-			}
-		}
-		return result.toString();
-	}
-
-	private static void appendVarType(final JSVariable variable, final StringBuilder builder)
-	{
-		final String varType = variable.getTypeString();
-		if(varType != null)
-		{
-			builder.append(':').append(varType);
-		}
-	}
-
-	private static
-	@Nullable
-	String createQuickNavigateForClazz(final JSClass jsClass)
-	{
-		final String qName = jsClass.getQualifiedName();
-		if(qName == null)
-		{
-			return null;
-		}
-		StringBuilder result = new StringBuilder();
-		String packageName = StringUtil.getPackageName(qName);
-		if(packageName.length() > 0)
-		{
-			result.append(packageName).append("\n");
-		}
-
-		appendAttrList(jsClass, result);
-		if(jsClass.isInterface())
-		{
-			result.append("interface");
-		}
-		else
-		{
-			result.append("class");
-		}
-
-		final String name = jsClass.getName();
-		result.append(" ").append(name);
-
-		String s = generateReferenceTargetList(jsClass.getExtendsList(), packageName);
-		if(s == null && !OBJECT_NAME.equals(name))
-		{
-			s = OBJECT_NAME;
-		}
-		if(s != null)
-		{
-			result.append(" extends ").append(s);
-		}
-
-		s = generateReferenceTargetList(jsClass.getImplementsList(), packageName);
-		if(s != null)
-		{
-			result.append("\nimplements ").append(s);
-		}
-
-		return result.toString();
-	}
-
-	private static
-	@Nullable
-	String createQuickNavigateForNamespace(final JSNamespaceDeclaration ns)
-	{
-		final String qName = ns.getQualifiedName();
-		if(qName == null)
-		{
-			return null;
-		}
-		StringBuilder result = new StringBuilder();
-		String packageName = StringUtil.getPackageName(qName);
-		if(packageName.length() > 0)
-		{
-			result.append(packageName).append("\n");
-		}
-
-		result.append("namespace");
-
-		final String name = ns.getName();
-		result.append(" ").append(name);
-
-		String s = ns.getInitialValueString();
-		if(s != null)
-		{
-			result.append(" = ").append(s);
-		}
-		return result.toString();
-	}
-
-
-	private static void appendAttrList(final JSAttributeListOwner jsClass, final StringBuilder result)
-	{
-		final JSAttributeList attributeList = jsClass.getAttributeList();
-		if(attributeList != null)
-		{
-			if(attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE))
-			{
-				result.append("override ");
-			}
-			JSAttributeList.AccessType type = attributeList.getAccessType();
-			String ns = attributeList.getNamespace();
-			if(type != JSAttributeList.AccessType.PACKAGE_LOCAL || ns == null)
-			{
-				result.append(type.toString().toLowerCase());
-			}
-			else
-			{
-				result.append(ns);
-			}
-
-			result.append(" ");
-
-			if(attributeList.hasModifier(JSAttributeList.ModifierType.STATIC))
-			{
-				result.append("static ");
-			}
-			if(attributeList.hasModifier(JSAttributeList.ModifierType.FINAL))
-			{
-				result.append("final ");
-			}
-			if(attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC))
-			{
-				result.append("dynamic ");
-			}
-			if(attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE))
-			{
-				result.append("native ");
-			}
-		}
-	}
-
-	private static
-	@Nullable
-	String generateReferenceTargetList(final @Nullable JSReferenceList implementsList, @Nonnull String packageName)
-	{
-		if(implementsList == null)
-		{
-			return null;
-		}
-		StringBuilder result = null;
-
-		final String[] referenceExpressionTexts = implementsList.getReferenceTexts();
-
-		for(String refExprText : referenceExpressionTexts)
-		{
-			refExprText = JSImportHandlingUtil.resolveTypeName(refExprText, implementsList);
-			if(result == null)
-			{
-				result = new StringBuilder();
-			}
-			else
-			{
-				result.append(",");
-			}
-
-			final String referencedPackageName = StringUtil.getPackageName(refExprText);
-			result.append(referencedPackageName.equals(packageName) ? refExprText.substring(refExprText.lastIndexOf('.') + 1) : refExprText);
-		}
-		return result == null ? null : result.toString();
-	}
-
-	@Override
-	public List<String> getUrlFor(PsiElement element, PsiElement originalElement)
-	{
-		String possibleCssName = findPossibleCssName(element);
-
-		if(possibleCssName != null)
-		{
-			try
-			{
-				final DocumentationProvider documentationProvider = getCssProvider(element.getProject());
-				final Method method = documentationProvider.getClass().getMethod("getUrlFor", new Class[]{String.class});
-				final Object o = method.invoke(null, new Object[]{possibleCssName});
-
-				if(o instanceof String)
-				{
-					return Collections.singletonList((String) o);
-				}
-			}
-			catch(Exception e)
-			{
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public String generateDoc(PsiElement _element, PsiElement originalElement)
-	{
-		if(_element instanceof JSReferenceExpression)
-		{
-			StringBuilder buffer = null;
-
-			// ambigious reference
-			final JSReferenceExpression expression = (JSReferenceExpression) _element;
-			for(ResolveResult r : expression.multiResolve(false))
-			{
-				if(buffer == null)
-				{
-					buffer = new StringBuilder();
-				}
-				final PsiElement element = r.getElement();
-				final ItemPresentation presentation = ((NavigationItem) element).getPresentation();
-
-				JSDocumentationUtils.appendHyperLinkToElement(element, expression.getReferencedName(), buffer, presentation.getPresentableText(),
-						presentation.getLocationString());
-				buffer.append("<br/>\n");
-			}
-			return buffer != null ? buffer.toString() : null;
-		}
-
-		_element = _element.getNavigationElement();
-		PsiElement element = findElementForWhichPreviousCommentWillBeSearched(_element);
-
-		final boolean parameterDoc = element instanceof JSParameter;
-		if(parameterDoc)
-		{
-			element = findElementForWhichPreviousCommentWillBeSearched(PsiTreeUtil.getParentOfType(element, JSFunction.class));
-		}
-
-		if(element != null)
-		{
-			PsiElement docComment = JSDocumentationUtils.findDocComment(element, _element instanceof JSAttributeNameValuePair ? originalElement : null);
-
-			if(docComment != null)
-			{
-				docComment = findFirstDocComment(docComment);
-				element = findTargetElement(_element, element);
-				final JSDocumentationBuilder builder = new JSDocumentationBuilder(element, originalElement);
-				JSDocumentationUtils.processDocumentationTextFromComment(docComment.getNode(), builder);
-
-				return parameterDoc ? builder.getParameterDoc(((JSParameter) _element).getName()) : builder.getDoc();
-			}
-
-			element = findTargetElement(_element, element);
-
-			if(element instanceof JSFunction)
-			{
-				ASTNode initialComment = JSDocumentationUtils.findLeadingCommentInFunctionBody(element);
-
-				if(initialComment != null)
-				{
-					final JSDocumentationBuilder builder = new JSDocumentationBuilder(element, originalElement);
-					JSDocumentationUtils.processDocumentationTextFromComment(initialComment, builder);
-					return builder.getDoc();
-				}
-			}
-		}
-
-		String possibleCssName = findPossibleCssName(_element);
-		if(possibleCssName != null)
-		{
-
-			try
-			{
-				final DocumentationProvider documentationProvider = getCssProvider(_element.getProject());
-				final Method declaredMethod = documentationProvider.getClass().getDeclaredMethod("generateDoc", String.class, PsiElement.class);
-				final Object o = declaredMethod.invoke(null, possibleCssName, null);
-
-				if(o instanceof String)
-				{
-					return (String) o;
-				}
-			}
-			catch(Exception e)
-			{
-			}
-
-		}
-
-		return null;
-	}
-
-	private static PsiElement findTargetElement(final PsiElement _element, PsiElement element)
-	{
-		if(_element instanceof JSDefinitionExpression)
-		{
-			final PsiElement parentElement = _element.getParent();
-
-			if(parentElement instanceof JSAssignmentExpression)
-			{
-				final JSExpression rOperand = ((JSAssignmentExpression) parentElement).getROperand();
-
-				if(rOperand instanceof JSFunctionExpression)
-				{
-					element = rOperand;
-				}
-				else
-				{
-					element = _element;
-				}
-			}
-		}
-		else if(_element instanceof JSFunctionExpression)
-		{
-			element = _element;
-		}
-		else if(_element instanceof JSProperty)
-		{
-			final JSExpression expression = ((JSProperty) _element).getValue();
-
-			if(expression instanceof JSFunction)
-			{
-				element = expression;
-			}
-		}
-		else if(_element instanceof JSVariable)
-		{
-			if(_element instanceof JSParameter)
-			{
-				return PsiTreeUtil.getParentOfType(_element, JSFunction.class);
-			}
-			element = _element;
-		}
-		else if(_element instanceof JSAttributeNameValuePair)
-		{
-			return _element;
-		}
-		return element;
-	}
-
-	private static PsiElement findFirstDocComment(PsiElement docComment)
-	{
-		if(docComment.getNode().getElementType() == JSTokenTypes.END_OF_LINE_COMMENT)
-		{
-			while(true)
-			{
-				PsiElement prev = docComment.getPrevSibling();
-				if(prev instanceof PsiWhiteSpace)
-				{
-					prev = prev.getPrevSibling();
-				}
-				if(prev == null)
-				{
-					break;
-				}
-				if(prev.getNode().getElementType() != JSTokenTypes.END_OF_LINE_COMMENT)
-				{
-					break;
-				}
-				docComment = prev;
-			}
-		}
-		return docComment;
-	}
-
-	private static String findPossibleCssName(PsiElement _element)
-	{
-		if(_element instanceof JSDefinitionExpression)
-		{
-			final JSExpression expression = ((JSDefinitionExpression) _element).getExpression();
-
-			if(expression instanceof JSReferenceExpression)
-			{
-				final String text = ((JSReferenceExpression) expression).getReferencedName();
-				if(text == null)
-				{
-					return null;
-				}
-				final StringBuffer buf = new StringBuffer(text.length());
-
-				for(int i = 0; i < text.length(); ++i)
-				{
-					final char ch = text.charAt(i);
-
-					if(Character.isUpperCase(ch))
-					{
-						buf.append('-').append(Character.toLowerCase(ch));
-					}
-					else
-					{
-						buf.append(ch);
-					}
-				}
-
-				return buf.toString();
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element)
-	{
-		final PsiElement psiElement = findElementForWhichPreviousCommentWillBeSearched(object);
-		if(psiElement != null && JSDocumentationUtils.findDocComment(psiElement) != null)
-		{
-			return psiElement;
-		}
-		if(object instanceof PsiElement)
-		{
-			return (PsiElement) object;
-		}
-		return null;
-	}
-
-	public static PsiElement findElementForWhichPreviousCommentWillBeSearched(Object object)
-	{
-		if(object instanceof JSFunction)
-		{
-			PsiElement psiElement = (PsiElement) object;
-			PsiElement parent = psiElement.getParent();
-			if(parent instanceof JSNewExpression)
-			{
-				parent = parent.getParent();
-			}
-			if(parent instanceof JSProperty)
-			{
-				psiElement = parent;
-			}
-			else if(parent instanceof JSAssignmentExpression)
-			{
-				psiElement = parent.getParent();
-			}
-
-			JSFunction function = (JSFunction) object;
-			if(function.isSetProperty() || function.isGetProperty())
-			{
-				for(PsiElement el = function.getPrevSibling(); el != null; el = el.getPrevSibling())
-				{
-					if(!(el instanceof PsiWhiteSpace) && !(el instanceof PsiComment))
-					{
-						if(el instanceof JSFunction)
-						{
-							JSFunction prevFunction = (JSFunction) el;
-							String name = prevFunction.getName();
-
-							if(name != null &&
-									name.equals(function.getName()) &&
-									((prevFunction.isGetProperty() && function.isSetProperty()) || prevFunction.isSetProperty() && function.isGetProperty()))
-							{
-								PsiElement doc = JSDocumentationUtils.findDocComment(prevFunction);
-								if(doc != null)
-								{
-									return prevFunction;
-								}
-							}
-						}
-						break;
-					}
-				}
-			}
-			return psiElement;
-		}
-		else if(object instanceof JSProperty || object instanceof JSStatement || object instanceof JSClass)
-		{
-			return (PsiElement) object;
-		}
-		else if(object instanceof PsiElement)
-		{
-			final PsiElement parent = ((PsiElement) object).getParent();
-			if(parent instanceof JSAssignmentExpression)
-			{
-				return parent.getParent();
-			}
-			else if(parent instanceof JSVarStatement)
-			{
-				final PsiElement firstChild = parent.getFirstChild();
-				if(firstChild instanceof JSAttributeList)
-				{
-					if(JSDocumentationUtils.findDocComment((PsiElement) object) != null)
-					{
-						return (PsiElement) object;
-					}
-				}
-				return parent;
-			}
-			else if(parent instanceof JSAttribute)
-			{
-				final PsiElement grandParent = parent.getParent();
-				if(grandParent.getFirstChild() == parent)
-				{
-					final PsiElement element = grandParent.getParent();
-					if(element instanceof JSFile)
-					{
-						return grandParent;
-					}
-					return element;
-				}
-				return parent;
-			}
-			else if(parent instanceof JSSuppressionHolder)
-			{
-				return parent;
-			}
-			else
-			{
-				return (PsiElement) object;
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	@Nullable
-	public PsiElement getDocumentationElementForLink(final PsiManager psiManager, String link, final PsiElement context)
-	{
-		return getDocumentationElementForLinkStatic(psiManager, link, context);
-	}
-
-	@Nullable
-	private static PsiElement getDocumentationElementForLinkStatic(final PsiManager psiManager, String link, @Nonnull PsiElement context)
-	{
-		final int delimiterIndex = link.lastIndexOf(':');
-
-		String attributeType = null;
-		String attributeName = null;
-		for(Map.Entry<String, String> e : DOCUMENTED_ATTRIBUTES.entrySet())
-		{
-			final String pattern = "." + e.getValue();
-			if(link.contains(pattern))
-			{
-				attributeType = e.getKey();
-				attributeName = link.substring(link.indexOf(pattern) + pattern.length());
-				link = link.substring(0, link.indexOf(pattern));
-				break;
-			}
-		}
-		if(delimiterIndex != -1 && attributeType == null)
-		{
-			final int delimiterIndex2 = link.lastIndexOf(':', delimiterIndex - 1);
-			String fileName = link.substring(0, delimiterIndex2).replace(File.separatorChar, '/');
-			String name = link.substring(delimiterIndex2 + 1, delimiterIndex);
-			int offset = Integer.parseInt(link.substring(delimiterIndex + 1));
-			return JavaScriptIndex.findSymbolByFileAndNameAndOffset(fileName, name, offset);
-		}
-		else if(attributeType != null)
-		{
-			PsiElement clazz = JSResolveUtil.findClassByQName(link, context.getResolveScope(), psiManager.getProject());
-			if(!(clazz instanceof JSClass))
-			{
-				return null;
-			}
-			return findNamedAttribute((JSClass) clazz, attributeType, attributeName);
-		}
-		else
-		{
-			PsiElement clazz = JSResolveUtil.findClassByQName(link, context.getResolveScope(), psiManager.getProject());
-			if(clazz == null && link.contains("."))
-			{
-				String qname = link.substring(0, link.lastIndexOf('.'));
-				clazz = JSResolveUtil.findClassByQName(qname, context.getResolveScope(), psiManager.getProject());
-				if(clazz instanceof JSClass)
-				{
-					JSClass jsClass = (JSClass) clazz;
-					String member = link.substring(link.lastIndexOf('.') + 1);
-
-					if(member.endsWith("()"))
-					{
-						member = member.substring(0, member.length() - 2);
-
-						PsiElement result = findMethod(jsClass, member);
-						if(result == null)
-						{
-							result = findProperty(jsClass, member); // user might refer to a property
-						}
-						return result;
-					}
-					else
-					{
-						PsiElement result = jsClass.findFieldByName(member);
-						if(result == null)
-						{
-							result = findProperty(jsClass, member);
-						}
-						if(result == null)
-						{
-							result = findMethod(jsClass, member); // user might forget brackets
-						}
-						return result;
-					}
-				}
-			}
-
-			if(clazz instanceof JSVariable)
-			{
-				return clazz;
-			}
-
-			if(link.endsWith("()"))
-			{
-				link = link.substring(0, link.length() - 2);
-				clazz = JSResolveUtil.findClassByQName(link, context.getResolveScope(), psiManager.getProject());
-				if(clazz instanceof JSFunction)
-				{
-					return clazz;
-				}
-			}
-			return clazz;
-		}
-	}
-
-	@Nullable
-	protected static JSAttributeNameValuePair findNamedAttribute(JSClass clazz, final String type, final String name)
-	{
-		final Ref<JSAttributeNameValuePair> attribute = new Ref<JSAttributeNameValuePair>();
-		JSResolveUtil.processMetaAttributesForClass(clazz, new JSResolveUtil.MetaDataProcessor()
-		{
-			@Override
-			public boolean process(@Nonnull JSAttribute jsAttribute)
-			{
-				if(type.equals(jsAttribute.getName()))
-				{
-					final JSAttributeNameValuePair jsAttributeNameValuePair = jsAttribute.getValueByName("name");
-					if(jsAttributeNameValuePair != null && name.equals(jsAttributeNameValuePair.getSimpleValue()))
-					{
-						attribute.set(jsAttributeNameValuePair);
-						return false;
-					}
-				}
-				return true;
-			}
-
-			@Override
-			public boolean handleOtherElement(PsiElement el, PsiElement context, @Nullable Ref<PsiElement> continuePassElement)
-			{
-				return true;
-			}
-		});
-		return attribute.get();
-	}
-
-	private static PsiElement findProperty(JSClass jsClass, String name)
-	{
-		PsiElement result = jsClass.findFunctionByNameAndKind(name, JSFunction.FunctionKind.GETTER);
-		if(result == null)
-		{
-			result = jsClass.findFunctionByNameAndKind(name, JSFunction.FunctionKind.SETTER);
-		}
-		return result;
-	}
-
-	private static PsiElement findMethod(JSClass jsClass, String name)
-	{
-		PsiElement result = jsClass.findFunctionByNameAndKind(name, JSFunction.FunctionKind.CONSTRUCTOR);
-		if(result == null)
-		{
-			result = jsClass.findFunctionByNameAndKind(name, JSFunction.FunctionKind.SIMPLE);
-		}
-		return result;
-	}
-
-	@Override
-	@Nullable
-	public PsiComment findExistingDocComment(PsiComment contextElement)
-	{
-		return contextElement;
-	}
-
-	@Nullable
-	@Override
-	public Pair<PsiElement, PsiComment> parseContext(@Nonnull PsiElement element)
-	{
-		return null;
-	}
-
-	@Override
-	@Nullable
-	public String generateDocumentationContentStub(PsiComment contextComment)
-	{
-		for(PsiElement el = contextComment.getParent(); el != null; el = el.getNextSibling())
-		{
-			if(el instanceof JSProperty)
-			{
-				final JSExpression propertyValue = ((JSProperty) el).getValue();
-				if(propertyValue instanceof JSFunction)
-				{
-					return doGenerateDoc((JSFunction) propertyValue);
-				}
-			}
-			else if(el instanceof JSFunction)
-			{
-				final JSFunction function = ((JSFunction) el);
-				return doGenerateDoc(function);
-			}
-			else if(el instanceof JSExpressionStatement)
-			{
-				final JSExpression expression = ((JSExpressionStatement) el).getExpression();
-
-				if(expression instanceof JSAssignmentExpression)
-				{
-					final JSExpression rOperand = ((JSAssignmentExpression) expression).getROperand();
-
-					if(rOperand instanceof JSFunctionExpression)
-					{
-						return doGenerateDoc(((JSFunctionExpression) rOperand).getFunction());
-					}
-				}
-			}
-			else if(el instanceof JSVarStatement)
-			{
-				JSVariable[] variables = ((JSVarStatement) el).getVariables();
-				if(variables.length > 0)
-				{
-					JSExpression expression = variables[0].getInitializer();
-					if(expression instanceof JSFunctionExpression)
-					{
-						return doGenerateDoc(((JSFunctionExpression) expression).getFunction());
-					}
-				}
-				break;
-			}
-		}
-		return null;
-	}
-
-	private static String doGenerateDoc(final JSFunction function)
-	{
-		StringBuilder builder = new StringBuilder();
-		final JSParameterList parameterList = function.getParameterList();
-		final PsiFile containingFile = function.getContainingFile();
-		final boolean ecma = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
-
-		if(parameterList != null)
-		{
-			for(JSParameter parameter : parameterList.getParameters())
-			{
-				builder.append("* @param ").append(parameter.getName());
-				//String s = JSPsiImplUtils.getTypeFromDeclaration(parameter);
-				//if (s != null) builder.append(" : ").append(s);
-				builder.append("\n");
-			}
-		}
-
-		if(ecma)
-		{
-			String s = JSPsiImplUtils.getTypeFromDeclaration(function);
-
-			if(s != null && !"void".equals(s))
-			{
-				builder.append("* @return ");
-
-				//builder.append(s);
-				builder.append("\n");
-			}
-		}
-
-		return builder.toString();
-	}
-
-	@Nullable
-	protected static String getSeeAlsoLinkResolved(PsiElement originElement, String link)
-	{
-		JSQualifiedNamedElement qualifiedElement = findParentQualifiedElement(originElement);
-		if(qualifiedElement == null)
-		{
-			return null;
-		}
-		String linkToResolve = getLinkToResolve(qualifiedElement, link);
-		final PsiElement resolvedElement = getDocumentationElementForLinkStatic(originElement.getManager(), linkToResolve, originElement);
-		if(resolvedElement != null)
-		{
-			return linkToResolve;
-		}
-		return null;
-	}
-
-	private static String getLinkToResolve(JSQualifiedNamedElement origin, String link)
-	{
-		String originQname = origin.getQualifiedName();
-		if(link.length() == 0)
-		{
-			return originQname;
-		}
-		else if(StringUtil.startsWithChar(link, '#'))
-		{
-			if(origin instanceof JSClass)
-			{
-				return originQname + "." + link.substring(1);
-			}
-			else
-			{
-				String aPackage = StringUtil.getPackageName(originQname);
-				return aPackage + "." + link.substring(1);
-			}
-		}
-		else
-		{
-			String linkFile = link.contains("#") ? link.substring(0, link.lastIndexOf('#')) : link;
-			String linkAnchor = link.contains("#") ? link.substring(link.lastIndexOf('#') + 1) : null;
-
-			final String qname;
-			if(StringUtil.endsWithIgnoreCase(linkFile, HTML_EXTENSION))
-			{
-				String prefix = StringUtil.getPackageName(originQname);
-				while(linkFile.startsWith("../"))
-				{
-					linkFile = linkFile.substring("../".length());
-					prefix = StringUtil.getPackageName(prefix);
-				}
-
-				String linkFilename;
-				if(linkFile.endsWith(PACKAGE_FILE))
-				{
-					linkFilename = StringUtil.trimEnd(linkFile, PACKAGE_FILE);
-					linkFilename = StringUtil.trimEnd(linkFilename, "/");
-				}
-				else
-				{
-					linkFilename = linkFile.substring(0, linkFile.lastIndexOf("."));
-				}
-				if(linkFilename.length() > 0)
-				{
-					qname = (prefix.length() > 0 ? prefix + "." : prefix) + linkFilename.replaceAll("/", ".");
-				}
-				else
-				{
-					qname = prefix;
-				}
-			}
-			else
-			{
-				qname = linkFile;
-			}
-
-			return linkAnchor != null ? (qname.length() > 0 ? qname + "." : qname) + linkAnchor : qname;
-		}
-	}
-
-	@Nullable
-	protected static JSQualifiedNamedElement findParentQualifiedElement(PsiElement element)
-	{
-		if(element instanceof JSClass)
-		{
-			return (JSClass) element;
-		}
-		if(element instanceof JSFunction || element instanceof JSVariable)
-		{
-			final PsiElement parent = JSResolveUtil.findParent(element);
-			if(parent instanceof JSClass)
-			{
-				return (JSClass) parent;
-			}
-			else if(parent instanceof JSFile)
-			{
-				return (JSQualifiedNamedElement) element;
-			}
-		}
-
-		JSAttribute attribute = null;
-		if(element instanceof JSAttribute)
-		{
-			attribute = (JSAttribute) element;
-		}
-		else if(element instanceof JSAttributeNameValuePair)
-		{
-			attribute = (JSAttribute) element.getParent();
-		}
-
-		if(attribute != null && DOCUMENTED_ATTRIBUTES.containsKey(attribute.getName()))
-		{
-			final JSClass jsClass = PsiTreeUtil.getParentOfType(element, JSClass.class);
-			if(jsClass != null)
-			{
-				return jsClass;
-			}
-		}
-
-		return null;
-	}
-
-
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JSDocumentationProvider implements CodeDocumentationProvider, LanguageDocumentationProvider {
+    private DocumentationProvider cssProvider;
+    @NonNls
+    private static final String OBJECT_NAME = "Object";
+    protected static final String SEE_PLAIN_TEXT_CHARS = "\t \"-\\/<>*";
+
+    @NonNls
+    protected static final String PACKAGE = "package";
+    @NonNls
+    protected static final String HTML_EXTENSION = ".html";
+    @NonNls
+    protected static final String PACKAGE_FILE = PACKAGE + HTML_EXTENSION;
+
+    protected static final Map<String, String> DOCUMENTED_ATTRIBUTES;
+
+    static {
+        DOCUMENTED_ATTRIBUTES = new HashMap<String, String>();
+        DOCUMENTED_ATTRIBUTES.put("Event", "event:");
+        DOCUMENTED_ATTRIBUTES.put("Style", "style:");
+        DOCUMENTED_ATTRIBUTES.put("Effect", "effect:");
+    }
+
+    private DocumentationProvider getCssProvider(Project project) throws Exception {
+        if (cssProvider == null) {
+            final Class<?> aClass = Class.forName("com.intellij.psi.css.impl.util.CssDocumentationProvider");
+            cssProvider = (DocumentationProvider)aClass.getConstructor(new Class[]{}).newInstance(new Object[]{});
+        }
+
+        return cssProvider;
+    }
+
+    @Nullable
+    public String getQuickNavigateInfo(PsiElement element, PsiElement element2) {
+        if (element instanceof JSFunction) {
+            final JSFunction function = (JSFunction)element;
+            final PsiElement parent = element.getParent();
+
+            if (function.isConstructor() && parent instanceof JSClass jsClass) {
+                return createQuickNavigateForClazz(jsClass);
+            }
+            return createQuickNavigateForFunction(function);
+        }
+        else if (element instanceof JSClass jsClass) {
+            return createQuickNavigateForClazz(jsClass);
+        }
+        else if (element instanceof JSVariable variable) {
+            return createQuickNavigateForVariable(variable);
+        }
+        else if (element instanceof JSAttributeNameValuePair) {
+            return createQuickNavigateForAnnotationDerived(element);
+        }
+        else if (element instanceof XmlToken) {
+            BaseJSSymbolProcessor.TagContextBuilder builder = new BaseJSSymbolProcessor.TagContextBuilder(element, "XmlTag");
+            return StringUtil.stripQuotesAroundValue(element.getText()) + ":" + builder.typeName;
+        }
+        else if (element instanceof JSNamespaceDeclaration namespaceDeclaration) {
+            return createQuickNavigateForNamespace(namespaceDeclaration);
+        }
+
+        return null;
+    }
+
+    private static String createQuickNavigateForAnnotationDerived(final PsiElement element) {
+        final JSAttributeNameValuePair valuePair = (JSAttributeNameValuePair)element;
+        final JSAttribute parent = (JSAttribute)valuePair.getParent();
+        final StringBuilder builder = new StringBuilder();
+        final JSClass clazz = PsiTreeUtil.getParentOfType(valuePair, JSClass.class);
+        appendParentInfo(clazz != null ? clazz : parent.getContainingFile(), builder, parent);
+        builder.append(parent.getName()).append(" ").append(valuePair.getSimpleValue());
+        return builder.toString();
+    }
+
+    @Nullable
+    private static String createQuickNavigateForFunction(final JSFunction function) {
+        final PsiElement parent = JSResolveUtil.findParent(function);
+        final StringBuilder result = new StringBuilder();
+
+        appendParentInfo(parent, result, function);
+
+        appendAttrList(function, result);
+        final boolean get = function.isGetProperty();
+        final boolean set = function.isSetProperty();
+
+        result.append(get || set ? "property " : "function ");
+        result.append(function.getName());
+
+        if (!get && !set) {
+            result.append('(');
+            final JSParameterList jsParameterList = function.getParameterList();
+
+            if (jsParameterList != null) {
+                final int start = result.length();
+
+                for (JSParameter p : jsParameterList.getParameters()) {
+                    if (start != result.length()) {
+                        result.append(", ");
+                    }
+                    result.append(p.getName());
+                    appendVarType(p, result);
+                }
+            }
+
+            result.append(')');
+        }
+
+        String varType = null;
+
+        if (get || !set) {
+            varType = JSImportHandlingUtil.resolveTypeName(function.getReturnTypeString(), function);
+        }
+        else {
+            final JSParameterList jsParameterList = function.getParameterList();
+
+            if (jsParameterList != null) {
+                final JSParameter[] jsParameters = jsParameterList.getParameters();
+                if (jsParameters != null && jsParameters.length > 0) {
+                    varType = JSImportHandlingUtil.resolveTypeName(jsParameters[0].getTypeString(), function);
+                }
+            }
+        }
+
+        if (varType != null) {
+            result.append(':').append(varType);
+        }
+        return result.toString();
+    }
+
+    private static void appendParentInfo(final PsiElement parent, final StringBuilder builder, PsiNamedElement element) {
+        if (parent instanceof JSClass) {
+            builder.append(((JSClass)parent).getQualifiedName()).append("\n");
+        }
+        else if (parent instanceof JSPackageStatement) {
+            builder.append(((JSPackageStatement)parent).getQualifiedName()).append("\n");
+        }
+        else if (parent instanceof JSFile) {
+            if (parent.getContext() != null) {
+                final String mxmlPackage = JSResolveUtil.findPackageForMxml(parent);
+                if (mxmlPackage != null) {
+                    builder.append(mxmlPackage)
+                        .append(mxmlPackage.length() > 0 ? "." : "")
+                        .append(parent.getContext().getContainingFile().getName())
+                        .append("\n");
+                }
+            }
+            else {
+                boolean foundQualified = false;
+
+                if (element instanceof JSNamedElement namedElement) {
+                    PsiElement node = namedElement.getNameIdentifier();
+                    if (node != null) {
+                        final String s = node.getText();
+                        int i = s.lastIndexOf('.');
+                        if (i != -1) {
+                            builder.append(s.substring(0, i)).append("\n");
+                            foundQualified = true;
+                        }
+                    }
+                }
+                if (!foundQualified) {
+                    builder.append(parent.getContainingFile().getName()).append("\n");
+                }
+            }
+        }
+    }
+
+    @Nullable
+    @RequiredReadAction
+    private static String createQuickNavigateForVariable(final JSVariable variable) {
+        final PsiElement parent = JSResolveUtil.findParent(variable);
+        final StringBuilder result = new StringBuilder();
+
+        appendParentInfo(parent, result, variable);
+
+        appendAttrList(variable, result);
+        result.append(variable.isConst() ? "const " : "var ");
+        result.append(variable.getName());
+        appendVarType(variable, result);
+
+        JSExpression initializer = variable.getInitializer();
+        if (initializer != null) {
+            result.append(" = ");
+            if (initializer instanceof JSLiteralExpression) {
+                result.append(initializer.getText());
+            }
+            else if (initializer instanceof JSObjectLiteralExpression) {
+                result.append("{...}");
+            }
+            else {
+                result.append("...");
+            }
+        }
+        return result.toString();
+    }
+
+    private static void appendVarType(final JSVariable variable, final StringBuilder builder) {
+        final String varType = variable.getTypeString();
+        if (varType != null) {
+            builder.append(':').append(varType);
+        }
+    }
+
+    private static
+    @Nullable
+    String createQuickNavigateForClazz(final JSClass jsClass) {
+        final String qName = jsClass.getQualifiedName();
+        if (qName == null) {
+            return null;
+        }
+        StringBuilder result = new StringBuilder();
+        String packageName = StringUtil.getPackageName(qName);
+        if (packageName.length() > 0) {
+            result.append(packageName).append("\n");
+        }
+
+        appendAttrList(jsClass, result);
+        if (jsClass.isInterface()) {
+            result.append("interface");
+        }
+        else {
+            result.append("class");
+        }
+
+        final String name = jsClass.getName();
+        result.append(" ").append(name);
+
+        String s = generateReferenceTargetList(jsClass.getExtendsList(), packageName);
+        if (s == null && !OBJECT_NAME.equals(name)) {
+            s = OBJECT_NAME;
+        }
+        if (s != null) {
+            result.append(" extends ").append(s);
+        }
+
+        s = generateReferenceTargetList(jsClass.getImplementsList(), packageName);
+        if (s != null) {
+            result.append("\nimplements ").append(s);
+        }
+
+        return result.toString();
+    }
+
+    private static
+    @Nullable
+    String createQuickNavigateForNamespace(final JSNamespaceDeclaration ns) {
+        final String qName = ns.getQualifiedName();
+        if (qName == null) {
+            return null;
+        }
+        StringBuilder result = new StringBuilder();
+        String packageName = StringUtil.getPackageName(qName);
+        if (packageName.length() > 0) {
+            result.append(packageName).append("\n");
+        }
+
+        result.append("namespace");
+
+        final String name = ns.getName();
+        result.append(" ").append(name);
+
+        String s = ns.getInitialValueString();
+        if (s != null) {
+            result.append(" = ").append(s);
+        }
+        return result.toString();
+    }
+
+
+    private static void appendAttrList(final JSAttributeListOwner jsClass, final StringBuilder result) {
+        final JSAttributeList attributeList = jsClass.getAttributeList();
+        if (attributeList != null) {
+            if (attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
+                result.append("override ");
+            }
+            JSAttributeList.AccessType type = attributeList.getAccessType();
+            String ns = attributeList.getNamespace();
+            if (type != JSAttributeList.AccessType.PACKAGE_LOCAL || ns == null) {
+                result.append(type.toString().toLowerCase());
+            }
+            else {
+                result.append(ns);
+            }
+
+            result.append(" ");
+
+            if (attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
+                result.append("static ");
+            }
+            if (attributeList.hasModifier(JSAttributeList.ModifierType.FINAL)) {
+                result.append("final ");
+            }
+            if (attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
+                result.append("dynamic ");
+            }
+            if (attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)) {
+                result.append("native ");
+            }
+        }
+    }
+
+    private static
+    @Nullable
+    String generateReferenceTargetList(final @Nullable JSReferenceList implementsList, @Nonnull String packageName) {
+        if (implementsList == null) {
+            return null;
+        }
+        StringBuilder result = null;
+
+        final String[] referenceExpressionTexts = implementsList.getReferenceTexts();
+
+        for (String refExprText : referenceExpressionTexts) {
+            refExprText = JSImportHandlingUtil.resolveTypeName(refExprText, implementsList);
+            if (result == null) {
+                result = new StringBuilder();
+            }
+            else {
+                result.append(",");
+            }
+
+            final String referencedPackageName = StringUtil.getPackageName(refExprText);
+            result.append(referencedPackageName.equals(packageName)
+                ? refExprText.substring(refExprText.lastIndexOf('.') + 1)
+                : refExprText);
+        }
+        return result == null ? null : result.toString();
+    }
+
+    @Override
+    public List<String> getUrlFor(PsiElement element, PsiElement originalElement) {
+        String possibleCssName = findPossibleCssName(element);
+
+        if (possibleCssName != null) {
+            try {
+                final DocumentationProvider documentationProvider = getCssProvider(element.getProject());
+                final Method method = documentationProvider.getClass().getMethod("getUrlFor", new Class[]{String.class});
+                final Object o = method.invoke(null, new Object[]{possibleCssName});
+
+                if (o instanceof String) {
+                    return Collections.singletonList((String)o);
+                }
+            }
+            catch (Exception e) {
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String generateDoc(PsiElement _element, PsiElement originalElement) {
+        if (_element instanceof JSReferenceExpression) {
+            StringBuilder buffer = null;
+
+            // ambigious reference
+            final JSReferenceExpression expression = (JSReferenceExpression)_element;
+            for (ResolveResult r : expression.multiResolve(false)) {
+                if (buffer == null) {
+                    buffer = new StringBuilder();
+                }
+                final PsiElement element = r.getElement();
+                final ItemPresentation presentation = ((NavigationItem)element).getPresentation();
+
+                JSDocumentationUtils.appendHyperLinkToElement(
+                    element,
+                    expression.getReferencedName(),
+                    buffer,
+                    presentation.getPresentableText(),
+                    presentation.getLocationString()
+                );
+                buffer.append("<br/>\n");
+            }
+            return buffer != null ? buffer.toString() : null;
+        }
+
+        _element = _element.getNavigationElement();
+        PsiElement element = findElementForWhichPreviousCommentWillBeSearched(_element);
+
+        final boolean parameterDoc = element instanceof JSParameter;
+        if (parameterDoc) {
+            element = findElementForWhichPreviousCommentWillBeSearched(PsiTreeUtil.getParentOfType(element, JSFunction.class));
+        }
+
+        if (element != null) {
+            PsiElement docComment =
+                JSDocumentationUtils.findDocComment(element, _element instanceof JSAttributeNameValuePair ? originalElement : null);
+
+            if (docComment != null) {
+                docComment = findFirstDocComment(docComment);
+                element = findTargetElement(_element, element);
+                final JSDocumentationBuilder builder = new JSDocumentationBuilder(element, originalElement);
+                JSDocumentationUtils.processDocumentationTextFromComment(docComment.getNode(), builder);
+
+                return parameterDoc ? builder.getParameterDoc(((JSParameter)_element).getName()) : builder.getDoc();
+            }
+
+            element = findTargetElement(_element, element);
+
+            if (element instanceof JSFunction) {
+                ASTNode initialComment = JSDocumentationUtils.findLeadingCommentInFunctionBody(element);
+
+                if (initialComment != null) {
+                    final JSDocumentationBuilder builder = new JSDocumentationBuilder(element, originalElement);
+                    JSDocumentationUtils.processDocumentationTextFromComment(initialComment, builder);
+                    return builder.getDoc();
+                }
+            }
+        }
+
+        String possibleCssName = findPossibleCssName(_element);
+        if (possibleCssName != null) {
+            try {
+                final DocumentationProvider documentationProvider = getCssProvider(_element.getProject());
+                final Method declaredMethod =
+                    documentationProvider.getClass().getDeclaredMethod("generateDoc", String.class, PsiElement.class);
+                final Object o = declaredMethod.invoke(null, possibleCssName, null);
+
+                if (o instanceof String) {
+                    return (String)o;
+                }
+            }
+            catch (Exception e) {
+            }
+        }
+
+        return null;
+    }
+
+    private static PsiElement findTargetElement(final PsiElement _element, PsiElement element) {
+        if (_element instanceof JSDefinitionExpression) {
+            final PsiElement parentElement = _element.getParent();
+
+            if (parentElement instanceof JSAssignmentExpression assignment) {
+                final JSExpression rOperand = assignment.getROperand();
+                element = rOperand instanceof JSFunctionExpression ? rOperand : _element;
+            }
+        }
+        else if (_element instanceof JSFunctionExpression) {
+            element = _element;
+        }
+        else if (_element instanceof JSProperty property) {
+            final JSExpression expression = property.getValue();
+
+            if (expression instanceof JSFunction) {
+                element = expression;
+            }
+        }
+        else if (_element instanceof JSVariable) {
+            if (_element instanceof JSParameter) {
+                return PsiTreeUtil.getParentOfType(_element, JSFunction.class);
+            }
+            element = _element;
+        }
+        else if (_element instanceof JSAttributeNameValuePair) {
+            return _element;
+        }
+        return element;
+    }
+
+    private static PsiElement findFirstDocComment(PsiElement docComment) {
+        if (docComment.getNode().getElementType() == JSTokenTypes.END_OF_LINE_COMMENT) {
+            while (true) {
+                PsiElement prev = docComment.getPrevSibling();
+                if (prev instanceof PsiWhiteSpace) {
+                    prev = prev.getPrevSibling();
+                }
+                if (prev == null) {
+                    break;
+                }
+                if (prev.getNode().getElementType() != JSTokenTypes.END_OF_LINE_COMMENT) {
+                    break;
+                }
+                docComment = prev;
+            }
+        }
+        return docComment;
+    }
+
+    private static String findPossibleCssName(PsiElement _element) {
+        if (_element instanceof JSDefinitionExpression definitionExpression) {
+            final JSExpression expression = definitionExpression.getExpression();
+
+            if (expression instanceof JSReferenceExpression referenceExpression) {
+                final String text = referenceExpression.getReferencedName();
+                if (text == null) {
+                    return null;
+                }
+                final StringBuffer buf = new StringBuffer(text.length());
+
+                for (int i = 0; i < text.length(); ++i) {
+                    final char ch = text.charAt(i);
+
+                    if (Character.isUpperCase(ch)) {
+                        buf.append('-').append(Character.toLowerCase(ch));
+                    }
+                    else {
+                        buf.append(ch);
+                    }
+                }
+
+                return buf.toString();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
+        final PsiElement psiElement = findElementForWhichPreviousCommentWillBeSearched(object);
+        if (psiElement != null && JSDocumentationUtils.findDocComment(psiElement) != null) {
+            return psiElement;
+        }
+        if (object instanceof PsiElement) {
+            return (PsiElement)object;
+        }
+        return null;
+    }
+
+    public static PsiElement findElementForWhichPreviousCommentWillBeSearched(Object object) {
+        if (object instanceof JSFunction function) {
+            PsiElement psiElement = function;
+            PsiElement parent = psiElement.getParent();
+            if (parent instanceof JSNewExpression) {
+                parent = parent.getParent();
+            }
+            if (parent instanceof JSProperty) {
+                psiElement = parent;
+            }
+            else if (parent instanceof JSAssignmentExpression) {
+                psiElement = parent.getParent();
+            }
+
+            if (function.isSetProperty() || function.isGetProperty()) {
+                for (PsiElement el = function.getPrevSibling(); el != null; el = el.getPrevSibling()) {
+                    if (!(el instanceof PsiWhiteSpace) && !(el instanceof PsiComment)) {
+                        if (el instanceof JSFunction prevFunction) {
+                            String name = prevFunction.getName();
+
+                            if (name != null && name.equals(function.getName()) && (
+                                (prevFunction.isGetProperty() && function.isSetProperty())
+                                    || prevFunction.isSetProperty() && function.isGetProperty()
+                            )) {
+                                PsiElement doc = JSDocumentationUtils.findDocComment(prevFunction);
+                                if (doc != null) {
+                                    return prevFunction;
+                                }
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+            return psiElement;
+        }
+        else if (object instanceof JSProperty || object instanceof JSStatement || object instanceof JSClass) {
+            return (PsiElement)object;
+        }
+        else if (object instanceof PsiElement psiElement) {
+            final PsiElement parent = psiElement.getParent();
+            if (parent instanceof JSAssignmentExpression) {
+                return parent.getParent();
+            }
+            else if (parent instanceof JSVarStatement) {
+                final PsiElement firstChild = parent.getFirstChild();
+                if (firstChild instanceof JSAttributeList) {
+                    if (JSDocumentationUtils.findDocComment((PsiElement)object) != null) {
+                        return (PsiElement)object;
+                    }
+                }
+                return parent;
+            }
+            else if (parent instanceof JSAttribute) {
+                final PsiElement grandParent = parent.getParent();
+                if (grandParent.getFirstChild() == parent) {
+                    final PsiElement element = grandParent.getParent();
+                    if (element instanceof JSFile) {
+                        return grandParent;
+                    }
+                    return element;
+                }
+                return parent;
+            }
+            else if (parent instanceof JSSuppressionHolder) {
+                return parent;
+            }
+            else {
+                return (PsiElement)object;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    @Nullable
+    public PsiElement getDocumentationElementForLink(final PsiManager psiManager, String link, final PsiElement context) {
+        return getDocumentationElementForLinkStatic(psiManager, link, context);
+    }
+
+    @Nullable
+    private static PsiElement getDocumentationElementForLinkStatic(final PsiManager psiManager, String link, @Nonnull PsiElement context) {
+        final int delimiterIndex = link.lastIndexOf(':');
+
+        String attributeType = null;
+        String attributeName = null;
+        for (Map.Entry<String, String> e : DOCUMENTED_ATTRIBUTES.entrySet()) {
+            final String pattern = "." + e.getValue();
+            if (link.contains(pattern)) {
+                attributeType = e.getKey();
+                attributeName = link.substring(link.indexOf(pattern) + pattern.length());
+                link = link.substring(0, link.indexOf(pattern));
+                break;
+            }
+        }
+        if (delimiterIndex != -1 && attributeType == null) {
+            final int delimiterIndex2 = link.lastIndexOf(':', delimiterIndex - 1);
+            String fileName = link.substring(0, delimiterIndex2).replace(File.separatorChar, '/');
+            String name = link.substring(delimiterIndex2 + 1, delimiterIndex);
+            int offset = Integer.parseInt(link.substring(delimiterIndex + 1));
+            return JavaScriptIndex.findSymbolByFileAndNameAndOffset(fileName, name, offset);
+        }
+        else if (attributeType != null) {
+            PsiElement clazz = JSResolveUtil.findClassByQName(link, context.getResolveScope(), psiManager.getProject());
+            if (!(clazz instanceof JSClass)) {
+                return null;
+            }
+            return findNamedAttribute((JSClass)clazz, attributeType, attributeName);
+        }
+        else {
+            PsiElement clazz = JSResolveUtil.findClassByQName(link, context.getResolveScope(), psiManager.getProject());
+            if (clazz == null && link.contains(".")) {
+                String qname = link.substring(0, link.lastIndexOf('.'));
+                clazz = JSResolveUtil.findClassByQName(qname, context.getResolveScope(), psiManager.getProject());
+                if (clazz instanceof JSClass jsClass) {
+                    String member = link.substring(link.lastIndexOf('.') + 1);
+
+                    if (member.endsWith("()")) {
+                        member = member.substring(0, member.length() - 2);
+
+                        PsiElement result = findMethod(jsClass, member);
+                        if (result == null) {
+                            result = findProperty(jsClass, member); // user might refer to a property
+                        }
+                        return result;
+                    }
+                    else {
+                        PsiElement result = jsClass.findFieldByName(member);
+                        if (result == null) {
+                            result = findProperty(jsClass, member);
+                        }
+                        if (result == null) {
+                            result = findMethod(jsClass, member); // user might forget brackets
+                        }
+                        return result;
+                    }
+                }
+            }
+
+            if (clazz instanceof JSVariable) {
+                return clazz;
+            }
+
+            if (link.endsWith("()")) {
+                link = link.substring(0, link.length() - 2);
+                clazz = JSResolveUtil.findClassByQName(link, context.getResolveScope(), psiManager.getProject());
+                if (clazz instanceof JSFunction) {
+                    return clazz;
+                }
+            }
+            return clazz;
+        }
+    }
+
+    @Nullable
+    protected static JSAttributeNameValuePair findNamedAttribute(JSClass clazz, final String type, final String name) {
+        final Ref<JSAttributeNameValuePair> attribute = new Ref<JSAttributeNameValuePair>();
+        JSResolveUtil.processMetaAttributesForClass(clazz, new JSResolveUtil.MetaDataProcessor() {
+            @Override
+            public boolean process(@Nonnull JSAttribute jsAttribute) {
+                if (type.equals(jsAttribute.getName())) {
+                    final JSAttributeNameValuePair jsAttributeNameValuePair = jsAttribute.getValueByName("name");
+                    if (jsAttributeNameValuePair != null && name.equals(jsAttributeNameValuePair.getSimpleValue())) {
+                        attribute.set(jsAttributeNameValuePair);
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            @Override
+            public boolean handleOtherElement(PsiElement el, PsiElement context, @Nullable Ref<PsiElement> continuePassElement) {
+                return true;
+            }
+        });
+        return attribute.get();
+    }
+
+    private static PsiElement findProperty(JSClass jsClass, String name) {
+        PsiElement result = jsClass.findFunctionByNameAndKind(name, JSFunction.FunctionKind.GETTER);
+        if (result == null) {
+            result = jsClass.findFunctionByNameAndKind(name, JSFunction.FunctionKind.SETTER);
+        }
+        return result;
+    }
+
+    private static PsiElement findMethod(JSClass jsClass, String name) {
+        PsiElement result = jsClass.findFunctionByNameAndKind(name, JSFunction.FunctionKind.CONSTRUCTOR);
+        if (result == null) {
+            result = jsClass.findFunctionByNameAndKind(name, JSFunction.FunctionKind.SIMPLE);
+        }
+        return result;
+    }
+
+    @Override
+    @Nullable
+    public PsiComment findExistingDocComment(PsiComment contextElement) {
+        return contextElement;
+    }
+
+    @Nullable
+    @Override
+    public Pair<PsiElement, PsiComment> parseContext(@Nonnull PsiElement element) {
+        return null;
+    }
+
+    @Override
+    @Nullable
+    public String generateDocumentationContentStub(PsiComment contextComment) {
+        for (PsiElement el = contextComment.getParent(); el != null; el = el.getNextSibling()) {
+            if (el instanceof JSProperty property) {
+                if (property.getValue() instanceof JSFunction function) {
+                    return doGenerateDoc(function);
+                }
+            }
+            else if (el instanceof JSFunction function) {
+                return doGenerateDoc(function);
+            }
+            else if (el instanceof JSExpressionStatement expressionStatement) {
+                if (expressionStatement.getExpression() instanceof JSAssignmentExpression assignmentExpression
+                    && assignmentExpression.getROperand() instanceof JSFunctionExpression functionExpression) {
+                    return doGenerateDoc(functionExpression.getFunction());
+                }
+            }
+            else if (el instanceof JSVarStatement varStatement) {
+                JSVariable[] variables = varStatement.getVariables();
+                if (variables.length > 0 && variables[0].getInitializer() instanceof JSFunctionExpression functionExpression) {
+                    return doGenerateDoc(functionExpression.getFunction());
+                }
+                break;
+            }
+        }
+        return null;
+    }
+
+    private static String doGenerateDoc(final JSFunction function) {
+        StringBuilder builder = new StringBuilder();
+        final JSParameterList parameterList = function.getParameterList();
+        final PsiFile containingFile = function.getContainingFile();
+        final boolean ecma = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+
+        if (parameterList != null) {
+            for (JSParameter parameter : parameterList.getParameters()) {
+                builder.append("* @param ").append(parameter.getName());
+                //String s = JSPsiImplUtils.getTypeFromDeclaration(parameter);
+                //if (s != null) builder.append(" : ").append(s);
+                builder.append("\n");
+            }
+        }
+
+        if (ecma) {
+            String s = JSPsiImplUtils.getTypeFromDeclaration(function);
+
+            if (s != null && !"void".equals(s)) {
+                builder.append("* @return ");
+
+                //builder.append(s);
+                builder.append("\n");
+            }
+        }
+
+        return builder.toString();
+    }
+
+    @Nullable
+    protected static String getSeeAlsoLinkResolved(PsiElement originElement, String link) {
+        JSQualifiedNamedElement qualifiedElement = findParentQualifiedElement(originElement);
+        if (qualifiedElement == null) {
+            return null;
+        }
+        String linkToResolve = getLinkToResolve(qualifiedElement, link);
+        final PsiElement resolvedElement = getDocumentationElementForLinkStatic(originElement.getManager(), linkToResolve, originElement);
+        if (resolvedElement != null) {
+            return linkToResolve;
+        }
+        return null;
+    }
+
+    private static String getLinkToResolve(JSQualifiedNamedElement origin, String link) {
+        String originQname = origin.getQualifiedName();
+        if (link.length() == 0) {
+            return originQname;
+        }
+        else if (StringUtil.startsWithChar(link, '#')) {
+            if (origin instanceof JSClass) {
+                return originQname + "." + link.substring(1);
+            }
+            else {
+                String aPackage = StringUtil.getPackageName(originQname);
+                return aPackage + "." + link.substring(1);
+            }
+        }
+        else {
+            String linkFile = link.contains("#") ? link.substring(0, link.lastIndexOf('#')) : link;
+            String linkAnchor = link.contains("#") ? link.substring(link.lastIndexOf('#') + 1) : null;
+
+            final String qname;
+            if (StringUtil.endsWithIgnoreCase(linkFile, HTML_EXTENSION)) {
+                String prefix = StringUtil.getPackageName(originQname);
+                while (linkFile.startsWith("../")) {
+                    linkFile = linkFile.substring("../".length());
+                    prefix = StringUtil.getPackageName(prefix);
+                }
+
+                String linkFilename;
+                if (linkFile.endsWith(PACKAGE_FILE)) {
+                    linkFilename = StringUtil.trimEnd(linkFile, PACKAGE_FILE);
+                    linkFilename = StringUtil.trimEnd(linkFilename, "/");
+                }
+                else {
+                    linkFilename = linkFile.substring(0, linkFile.lastIndexOf("."));
+                }
+                if (linkFilename.length() > 0) {
+                    qname = (prefix.length() > 0 ? prefix + "." : prefix) + linkFilename.replaceAll("/", ".");
+                }
+                else {
+                    qname = prefix;
+                }
+            }
+            else {
+                qname = linkFile;
+            }
+
+            return linkAnchor != null ? (qname.length() > 0 ? qname + "." : qname) + linkAnchor : qname;
+        }
+    }
+
+    @Nullable
+    protected static JSQualifiedNamedElement findParentQualifiedElement(PsiElement element) {
+        if (element instanceof JSClass jsClass) {
+            return jsClass;
+        }
+        if (element instanceof JSFunction || element instanceof JSVariable) {
+            final PsiElement parent = JSResolveUtil.findParent(element);
+            if (parent instanceof JSClass jsClass) {
+                return jsClass;
+            }
+            else if (parent instanceof JSFile) {
+                return (JSQualifiedNamedElement) element;
+            }
+        }
+
+        JSAttribute attribute = null;
+        if (element instanceof JSAttribute jsAttribute) {
+            attribute = jsAttribute;
+        }
+        else if (element instanceof JSAttributeNameValuePair) {
+            attribute = (JSAttribute)element.getParent();
+        }
+
+        if (attribute != null && DOCUMENTED_ATTRIBUTES.containsKey(attribute.getName())) {
+            final JSClass jsClass = PsiTreeUtil.getParentOfType(element, JSClass.class);
+            if (jsClass != null) {
+                return jsClass;
+            }
+        }
+
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
index 53aabdd5..1ccad5fe 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
@@ -39,6 +39,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
@@ -46,933 +47,807 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class JSDocumentationUtils
-{
-	private static final
-	@NonNls
-	Pattern ourDojoParametersPattern = Pattern.compile("^\\s*(\\w+):(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocParametersPattern = Pattern.compile("^\\s*@param\\s*(?:\\{([^\\}]+)\\}\\s*)?(\\w+)?(?:\\s:\\s(\\S+))?(?:\\s*\\[(\\w+)(?:\\.(\\w+))?" +
-			"(?:=([^\\]]*))?\\])?(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocEventPattern = Pattern.compile("^\\s*@event\\s*(\\w+)(?:\\s:\\s(\\S+))?(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocRemarkPattern = Pattern.compile("^\\s*@remarks (.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocMethodPattern = Pattern.compile("^\\s*@method\\s*(\\w+)(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocClassPattern = Pattern.compile("^\\s*@class\\s*(\\w+(?:\\.\\w+)*)(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocDeprecatedPattern = Pattern.compile("^\\s*@deprecated\\s*(.*)$");
-
-	private static final
-	@NonNls
-	Pattern ourJSDocConstructorPattern = Pattern.compile("^\\s*@constructor$");
-	private static final
-	@NonNls
-	Pattern ourJSDocFinalPattern = Pattern.compile("^\\s*@final$");
-	private static final
-	@NonNls
-	Pattern ourJSDocPrivatePattern = Pattern.compile("^\\s*@private$");
-	private static final
-	@NonNls
-	Pattern ourJSDocPublicPattern = Pattern.compile("^\\s*@public$");
-	private static final
-	@NonNls
-	Pattern ourJSDocProtectedPattern = Pattern.compile("^\\s*@protected$");
-
-	private static final
-	@NonNls
-	Pattern ourJSDocOptionalPattern = Pattern.compile("^\\s*@optional(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocStaticPattern = Pattern.compile("^\\s*@static$");
-	private static final
-	@NonNls
-	Pattern ourJSDocSeePattern = Pattern.compile("^\\s*@see (.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocDescriptionPattern = Pattern.compile("^\\s*@description\\s*(.+)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocReturnPattern = Pattern.compile("^\\s*@return(?:s)?\\s*(?:(?:\\{|:)?\\s*([^\\s\\}]+)\\s*\\}?\\s*)?(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocNamespacePattern = Pattern.compile("^\\s*@namespace\\s*([\\w\\.]+)(.*)$");
-
-	private static final
-	@NonNls
-	Pattern ourJSDocPropertyPattern = Pattern.compile("^\\s*@property\\s*(\\w+)(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocTypePattern = Pattern.compile("^\\s*@type\\s*\\{?([^\\s\\}]+)\\}?(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocRequiresPattern = Pattern.compile("^\\s*@requires\\s*(\\S+)(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocDefaultPattern = Pattern.compile("^\\s*@default\\s*(.*)$");
-	private static final
-	@NonNls
-	Pattern ourJSDocExtendsPattern = Pattern.compile("^\\s*@extends\\s*(.*)$");
-
-	private static final
-	@NonNls
-	Map<Pattern, String> patternToHintMap = new HashMap<Pattern, String>();
-	private static final
-	@NonNls
-	Map<Pattern, JSDocumentationProcessor.MetaDocType> patternToMetaDocTypeMap = new HashMap<Pattern, JSDocumentationProcessor.MetaDocType>();
-
-	static
-	{
-		patternToHintMap.put(ourDojoParametersPattern, ":");
-		patternToMetaDocTypeMap.put(ourDojoParametersPattern, JSDocumentationProcessor.MetaDocType.PARAMETER);
-		patternToHintMap.put(ourJSDocParametersPattern, "@pa");
-		patternToMetaDocTypeMap.put(ourJSDocParametersPattern, JSDocumentationProcessor.MetaDocType.PARAMETER);
-
-		patternToHintMap.put(ourJSDocMethodPattern, "@m");
-		patternToMetaDocTypeMap.put(ourJSDocMethodPattern, JSDocumentationProcessor.MetaDocType.METHOD);
-
-		patternToHintMap.put(ourJSDocOptionalPattern, "@o");
-		patternToMetaDocTypeMap.put(ourJSDocOptionalPattern, JSDocumentationProcessor.MetaDocType.OPTIONAL_PARAMETERS);
-
-		patternToHintMap.put(ourJSDocEventPattern, "@ev");
-		patternToMetaDocTypeMap.put(ourJSDocEventPattern, JSDocumentationProcessor.MetaDocType.EVENT);
-
-		patternToHintMap.put(ourJSDocExtendsPattern, "@ex");
-		patternToMetaDocTypeMap.put(ourJSDocExtendsPattern, JSDocumentationProcessor.MetaDocType.EXTENDS);
-
-		patternToHintMap.put(ourJSDocRemarkPattern, "@rem");
-		patternToMetaDocTypeMap.put(ourJSDocRemarkPattern, JSDocumentationProcessor.MetaDocType.NOTE);
-
-		patternToHintMap.put(ourJSDocReturnPattern, "@ret");
-		patternToMetaDocTypeMap.put(ourJSDocReturnPattern, JSDocumentationProcessor.MetaDocType.RETURN);
-
-		patternToHintMap.put(ourJSDocPublicPattern, "@pu");
-		patternToMetaDocTypeMap.put(ourJSDocPublicPattern, JSDocumentationProcessor.MetaDocType.PUBLIC);
-
-		patternToHintMap.put(ourJSDocProtectedPattern, "@prot");
-		patternToMetaDocTypeMap.put(ourJSDocProtectedPattern, JSDocumentationProcessor.MetaDocType.PROTECTED);
-
-		patternToHintMap.put(ourJSDocStaticPattern, "@st");
-		patternToMetaDocTypeMap.put(ourJSDocStaticPattern, JSDocumentationProcessor.MetaDocType.STATIC);
-
-		patternToHintMap.put(ourJSDocSeePattern, "@se");
-		patternToMetaDocTypeMap.put(ourJSDocSeePattern, JSDocumentationProcessor.MetaDocType.SEE);
-
-		patternToHintMap.put(ourJSDocDescriptionPattern, "@des");
-		patternToMetaDocTypeMap.put(ourJSDocDescriptionPattern, JSDocumentationProcessor.MetaDocType.DESCRIPTION);
-
-		patternToHintMap.put(ourJSDocDeprecatedPattern, "@dep");
-		patternToMetaDocTypeMap.put(ourJSDocDeprecatedPattern, JSDocumentationProcessor.MetaDocType.DEPRECATED);
-
-		patternToHintMap.put(ourJSDocConstructorPattern, "@co");
-
-		patternToMetaDocTypeMap.put(ourJSDocConstructorPattern, JSDocumentationProcessor.MetaDocType.CONSTRUCTOR);
-
-		patternToHintMap.put(ourJSDocClassPattern, "@cl");
-		patternToMetaDocTypeMap.put(ourJSDocClassPattern, JSDocumentationProcessor.MetaDocType.CLASS);
-		patternToHintMap.put(ourJSDocPrivatePattern, "@pri");
-		patternToMetaDocTypeMap.put(ourJSDocPrivatePattern, JSDocumentationProcessor.MetaDocType.PRIVATE);
-
-		patternToHintMap.put(ourJSDocNamespacePattern, "@n");
-		patternToMetaDocTypeMap.put(ourJSDocNamespacePattern, JSDocumentationProcessor.MetaDocType.NAMESPACE);
-
-		patternToHintMap.put(ourJSDocPropertyPattern, "@prop");
-		patternToHintMap.put(ourJSDocTypePattern, "@t");
-		patternToMetaDocTypeMap.put(ourJSDocTypePattern, JSDocumentationProcessor.MetaDocType.TYPE);
-
-		patternToHintMap.put(ourJSDocFinalPattern, "@f");
-		patternToMetaDocTypeMap.put(ourJSDocFinalPattern, JSDocumentationProcessor.MetaDocType.FINAL);
-		patternToHintMap.put(ourJSDocRequiresPattern, "@req");
-		patternToMetaDocTypeMap.put(ourJSDocRequiresPattern, JSDocumentationProcessor.MetaDocType.REQUIRES);
-
-		patternToHintMap.put(ourJSDocDefaultPattern, "@def");
-		patternToMetaDocTypeMap.put(ourJSDocDefaultPattern, JSDocumentationProcessor.MetaDocType.DEFAULT);
-	}
-
-	private static final
-	@NonNls
-	Map<Pattern, String> prefixToPatternToHintMap = new HashMap<Pattern, String>();
-
-	static
-	{
-		prefixToPatternToHintMap.put(Pattern.compile("^\\s*description:(.*)$"), "descr");
-
-		prefixToPatternToHintMap.put(Pattern.compile("^ summary(?:\\:)?(.*)$"), "summ");
-
-		prefixToPatternToHintMap.put(Pattern.compile("^\\s*\\*(?:\\*)?(.*)$"), "*");
-
-		prefixToPatternToHintMap.put(Pattern.compile("^[/]+(.*)$"), "/");
-
-		prefixToPatternToHintMap.put(Pattern.compile("^\\s*Parameters:(.*)$"), "Parame");
-	}
-
-	public static void processDocumentationTextFromComment(ASTNode _initialComment, JSDocumentationProcessor processor)
-	{
-		ASTNode prev = _initialComment.getTreePrev();
-
-		if(prev != null && prev.getPsi() instanceof OuterLanguageElement)
-		{
-			while(prev.getPsi() instanceof OuterLanguageElement)
-			{
-				prev = prev.getTreePrev();
-			}
-		}
-		else
-		{
-			prev = null;
-		}
-
-		if(prev != null && !(prev.getPsi() instanceof PsiComment))
-		{
-			prev = null;
-		}
-
-		final ASTNode initialComment = prev != null ? prev : _initialComment;
-		Enumeration<Object> commentLineIterator;
-
-		if(initialComment.getElementType() == JSTokenTypes.END_OF_LINE_COMMENT)
-		{
-			commentLineIterator = new Enumeration<Object>()
-			{
-				ASTNode commentNode = initialComment;
-
-				@Override
-				public boolean hasMoreElements()
-				{
-					return commentNode != null;
-				}
-
-				@Override
-				public String nextElement()
-				{
-					ASTNode resultCommentNode = commentNode;
-					commentNode = commentNode.getTreeNext();
-
-					if(commentNode != null && commentNode.getElementType() == TokenType.WHITE_SPACE)
-					{
-						commentNode = commentNode.getTreeNext();
-					}
-
-					if(commentNode != null && commentNode.getElementType() != JSTokenTypes.END_OF_LINE_COMMENT)
-					{
-						commentNode = null;
-					}
-
-					final String text = resultCommentNode.getText();
-					if(text.startsWith("//"))
-					{
-						return text.substring(2);
-					}
-					return "";
-				}
-			};
-		}
-		else
-		{
-			String text = initialComment.getText();
-			text = unwrapCommentDelimiters(text);
-
-			commentLineIterator = new StringTokenizer(text, "\r\n");
-		}
-
-		final boolean needPlainCharData = processor.needsPlainCommentData();
-
-		while(commentLineIterator.hasMoreElements())
-		{
-			final String s = (String) commentLineIterator.nextElement();
-			if(s.indexOf('@') == -1 && s.indexOf(':') == -1 && !needPlainCharData)
-			{
-				continue;
-			}
-
-			String commentText = s.replace('\t', ' ');
-
-			for(Map.Entry<Pattern, String> entry : prefixToPatternToHintMap.entrySet())
-			{
-				final Matcher matcher = commentText.indexOf(entry.getValue()) != -1 ? entry.getKey().matcher(commentText) : null;
-				if(matcher == null)
-				{
-					continue;
-				}
-
-				if(matcher.matches())
-				{
-					commentText = matcher.group(1);
-					break;
-				}
-			}
-
-			boolean matchedSomething = false;
-
-			for(Map.Entry<Pattern, String> entry : patternToHintMap.entrySet())
-			{
-				final Matcher matcher = commentText.indexOf(entry.getValue()) != -1 ? entry.getKey().matcher(commentText) : null;
-				if(matcher == null)
-				{
-					continue;
-				}
-
-				if(matcher.matches())
-				{
-					final JSDocumentationProcessor.MetaDocType docType = patternToMetaDocTypeMap.get(entry.getKey());
-					if(docType != null)
-					{
-						final int groupCount = matcher.groupCount();
-						String remainingLineContent = groupCount > 0 ? matcher.group(groupCount) : null;
-						String matchName = groupCount > 1 ? matcher.group(1) : null;
-						String matchValue = groupCount > 2 ? matcher.group(2) : null;
-
-						boolean reportAboutOptionalParameter = false;
-						boolean reportAboutFieldInParameter = false;
-						boolean reportAboutDefaultValue = false;
-
-						final int groupForInitialValue = 6;
-						final int groupForFieldName = 5;
-						String fieldName = null;
-
-						if(groupCount == 7 && entry.getKey() == ourJSDocParametersPattern)
-						{
-							String paramNameInBracket = matcher.group(4);
-
-							if(paramNameInBracket != null)
-							{
-								String tmp = matchName;
-								matchName = paramNameInBracket;
-								matchValue = tmp;
-								reportAboutFieldInParameter = (fieldName = matcher.group(groupForFieldName)) != null;
-								reportAboutOptionalParameter = true;
-								reportAboutDefaultValue = matcher.group(groupForInitialValue) != null;
-							}
-							else
-							{
-								String typeAfterParamName = matcher.group(3);
-								if(typeAfterParamName != null)
-								{
-									matchName = matchValue;
-									matchValue = typeAfterParamName;
-								}
-								else
-								{
-									String tmp = matchValue;
-									matchValue = matchName;
-									matchName = tmp;
-								}
-							}
-						}
-
-						String matched = entry.getKey().pattern();
-
-						if(reportAboutFieldInParameter)
-						{
-							if(!processor.onPatternMatch(JSDocumentationProcessor.MetaDocType.FIELD, matchName, null, matcher.group(groupForFieldName), commentText, matched))
-
-							{
-								break;
-							}
-						}
-						else
-						{
-							if(!processor.onPatternMatch(docType, matchName, matchValue, remainingLineContent, commentText, matched))
-							{
-								break;
-							}
-						}
-						if(reportAboutOptionalParameter)
-						{
-							if(!processor.onPatternMatch(JSDocumentationProcessor.MetaDocType.OPTIONAL_PARAMETERS, matchName, fieldName, null, commentText, matched))
-							{
-								break;
-							}
-						}
-
-						if(reportAboutDefaultValue)
-						{
-							if(!processor.onPatternMatch(JSDocumentationProcessor.MetaDocType.DEFAULT, matchName, fieldName, matcher.group(groupForInitialValue), commentText, matched))
-							{
-								break;
-							}
-						}
-					}
-					matchedSomething = true;
-					break;
-				}
-			}
-
-			if(!matchedSomething && needPlainCharData)
-			{
-				if(!processor.onCommentLine(commentText))
-				{
-					break;
-				}
-			}
-		}
-	}
-
-	public static String unwrapCommentDelimiters(String text)
-	{
-		if(text.startsWith("/**"))
-		{
-			text = text.substring(3);
-		}
-		else if(text.startsWith("/*") || text.startsWith("//"))
-		{
-			text = text.substring(2);
-		}
-
-		if(text.endsWith("*/"))
-		{
-			text = text.substring(0, text.length() - 2);
-		}
-		return text;
-	}
-
-	static
-	@Nullable
-	ASTNode findTrailingCommentInFunctionBody(final @Nonnull JSFunction function)
-	{
-		final ASTNode block = function.getNode().findChildByType(JSElementTypes.BLOCK_STATEMENT);
-		if(block == null)
-		{
-			return null;
-		}
-
-		for(ASTNode prev = block.getLastChildNode(); prev != null; prev = prev.getTreePrev())
-		{
-			if(prev.getElementType() == JSElementTypes.RETURN_STATEMENT)
-			{
-				return block.findChildByType(JSTokenTypes.COMMENTS, prev);
-			}
-			else if(prev.getPsi() instanceof JSStatement)
-			{
-				break;
-			}
-		}
-		return null;
-	}
-
-	static
-	@Nullable
-	ASTNode findLeadingCommentInFunctionBody(final @Nonnull PsiElement element)
-	{
-		final ASTNode functionNode = element.getNode();
-		final ASTNode block = functionNode.findChildByType(JSElementTypes.BLOCK_STATEMENT);
-		if(block == null)
-		{
-			return null;
-		}
-
-		for(ASTNode node = block.getFirstChildNode().getTreeNext(); node != null; node = node.getTreeNext())
-		{
-			final IElementType nodeType = node.getElementType();
-
-			if(nodeType != TokenType.WHITE_SPACE)
-			{
-				if(JSTokenTypes.COMMENTS.contains(nodeType))
-				{
-					return node;
-				}
-				return null;
-			}
-		}
-
-		return null;
-	}
-
-	public static PsiElement findDocComment(PsiElement element)
-	{
-		return findDocComment(element, null);
-	}
-
-	public static PsiElement findDocComment(PsiElement element, PsiElement context)
-	{
-		PsiElement docComment = null;
-		boolean skippedExprStatementOnce = false;
-
-		if(element instanceof JSAttributeListOwner && context == null)
-		{
-			final JSAttributeListOwner jsClass = (JSAttributeListOwner) element;
-			final JSAttributeList attributeList = jsClass.getAttributeList();
-			PsiElement anchor = null;
-
-			if(attributeList != null)
-			{
-				for(ASTNode currentNode = attributeList.getNode().getLastChildNode(); currentNode != null; currentNode = currentNode.getTreePrev())
-				{
-					final IElementType nodeType = currentNode.getElementType();
-
-					if(!JSTokenTypes.MODIFIERS.contains(nodeType) &&
-							nodeType != JSTokenTypes.WHITE_SPACE &&
-							nodeType != JSElementTypes.REFERENCE_EXPRESSION // namespace
-							)
-					{
-						final ASTNode nextNode = currentNode.getTreeNext();
-						if(nextNode != null)
-						{
-							anchor = nextNode.getPsi();
-						}
-						break;
-					}
-				}
-			}
-
-			if(anchor != null)
-			{
-				element = anchor;
-			}
-		}
-
-		if(!element.isValid() || element.getContainingFile() == null)
-		{
-			return docComment;
-		}
-
-		boolean shouldSkipPrevExprStatement = false;
-		String propName = getPropertyNameFromExprStatement(element);
-		if(propName != null)
-		{
-			shouldSkipPrevExprStatement = true;
-		}
-
-		for(PsiElement prev = element.getPrevSibling(); prev != null; prev = prev.getPrevSibling())
-		{
-			if(prev instanceof PsiWhiteSpace)
-			{
-				continue;
-			}
-
-			if(prev instanceof PsiComment)
-			{
-				docComment = prev;
-				if(((PsiComment) prev).getTokenType() == JSTokenTypes.DOC_COMMENT)
-				{
-					break;
-				}
-			}
-			else if(shouldSkipPrevExprStatement &&
-					prev instanceof JSExpressionStatement &&
-					!skippedExprStatementOnce)
-			{
-				String propNameFromPrev = getPropertyNameFromExprStatement(prev);
-				if(!propName.equals(propNameFromPrev))
-				{
-					break;
-				}
-				skippedExprStatementOnce = true; // presumably another accessor definition
-				continue;
-			}
-
-			break;
-		}
-
-		if(docComment != null)
-		{
-			while(docComment.getPrevSibling() instanceof OuterLanguageElement)
-			{
-				PsiElement siblingSibling = docComment.getPrevSibling().getPrevSibling();
-
-				if(siblingSibling != null && siblingSibling instanceof PsiComment)
-				{
-					docComment = siblingSibling;
-				}
-				else
-				{
-					break;
-				}
-			}
-		}
-		return docComment;
-	}
-
-	private static
-	@Nullable
-	String getPropertyNameFromExprStatement(@Nonnull PsiElement element)
-	{
-		String propName = null;
-
-		if(element instanceof JSExpressionStatement)
-		{
-			JSExpression expression = ((JSExpressionStatement) element).getExpression();
-			if(expression instanceof JSAssignmentExpression)
-			{
-				JSExpression rOperand = ((JSAssignmentExpression) expression).getROperand();
-				if(rOperand instanceof JSFunctionExpression)
-				{
-					String name = ((JSFunctionExpression) rOperand).getName();
-					if(name != null && (StringUtil.startsWith(name, "get") || (StringUtil.startsWith(name, "set"))))
-					{
-						propName = name.substring(3);
-					}
-				}
-			}
-		}
-		return propName;
-	}
-
-	private static String findTypeFromParameter(final JSVariable parameter, final PsiElement docComment)
-	{
-		if(docComment != null)
-		{
-			final String[] detectedType = new String[1];
-
-			processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor()
-			{
-				final String name = parameter.getName();
-				final boolean isparameter = parameter instanceof JSParameter;
-
-				@Override
-				public boolean needsPlainCommentData()
-				{
-					return false;
-				}
-
-				@Override
-				public boolean onCommentLine(@Nonnull final String line)
-				{
-					return true;
-				}
-
-				@Override
-				public boolean onPatternMatch(@Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-						@Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched)
-				{
-					if(isparameter && type == MetaDocType.PARAMETER && matchName != null && matchName.equals(name))
-					{
-						detectedType[0] = matchValue;
-						return false;
-					}
-					else if(type == MetaDocType.TYPE)
-					{
-						detectedType[0] = matchName;
-						return false;
-					}
-					return true;
-				}
-			});
-
-			return detectedType[0];
-		}
-		return null;
-	}
-
-	public static final TokenSet ourPrimitiveTypeFilter = TokenSet.create(JSTokenTypes.INT_KEYWORD, JSTokenTypes.UINT_KEYWORD,
-			JSTokenTypes.VOID_KEYWORD, JSTokenTypes.ANY_IDENTIFIER);
-	public static final TokenSet ourTypeFilter = TokenSet.orSet(TokenSet.create(JSElementTypes.REFERENCE_EXPRESSION), ourPrimitiveTypeFilter);
-
-	private static String findDocForAnchor(final PsiElement _anchor, final JSDocumentationProcessor.MetaDocType... expectedTypes)
-	{
-		PsiElement anchor = _anchor;
-		if(_anchor instanceof JSExpression)
-		{
-			anchor = PsiTreeUtil.getParentOfType(_anchor, JSStatement.class, JSProperty.class);
-		}
-
-		if(anchor != null)
-		{
-			final PsiElement docComment = findDocComment(anchor);
-
-			if(docComment != null)
-			{
-				final Ref<String> detectedType = new Ref<String>();
-
-				final PsiElement anchor1 = anchor;
-				processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor()
-				{
-					@Override
-					public boolean needsPlainCommentData()
-					{
-						return false;
-					}
-
-					@Override
-					public boolean onCommentLine(@Nonnull final String line)
-					{
-						return true;
-					}
-
-					@Override
-					public boolean onPatternMatch(@Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-							@Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched)
-					{
-						for(MetaDocType expectedType : expectedTypes)
-						{
-							if(type == expectedType)
-							{
-								if(type == MetaDocType.TYPE && _anchor instanceof JSFunction)
-								{
-									final JSParameterList jsParameterList = ((JSFunction) _anchor).getParameterList();
-									if(jsParameterList != null && jsParameterList.getParameters().length > 0)
-									{
-										return true;
-									}
-									if(_anchor.getParent() instanceof JSProperty)
-									{
-										return true;
-									}
-								}
-								else if(type == MetaDocType.RETURN)
-								{
-									//if (!isOurDocComment()) return true;
-								}
-
-								detectedType.set(matchName);
-								return false;
-							}
-						}
-						return true;
-					}
-				});
-
-				return detectedType.get();
-			}
-		}
-		return null;
-	}
-
-	public static String findType(final PsiElement def)
-	{
-		return findDocForAnchor(def, JSDocumentationProcessor.MetaDocType.TYPE);
-	}
-
-	public static boolean isDeprecated(PsiElement element)
-	{
-		if(element instanceof JSClass)
-		{
-			return ((JSClass) element).isDeprecated();
-		}
-		else if(element instanceof JSFunction)
-		{
-			return ((JSFunction) element).isDeprecated();
-		}
-		else if(element instanceof JSVariable)
-		{
-			return ((JSVariable) element).isDeprecated();
-		}
-		else if(element instanceof JSNamespaceDeclaration)
-		{
-			return ((JSNamespaceDeclaration) element).isDeprecated();
-		}
-
-		return calculateDeprecated(element);
-	}
-
-	public static boolean calculateDeprecated(PsiElement element)
-	{
-		if(element instanceof JSExpression)
-		{
-			element = PsiTreeUtil.getParentOfType(element, JSStatement.class, JSProperty.class);
-		}
-
-		final PsiElement docComment = element != null ? findDocComment(element) : null;
-		if(docComment != null)
-		{
-			final boolean[] deprecatedStatus = new boolean[1];
-
-			processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor()
-			{
-				@Override
-				public boolean needsPlainCommentData()
-				{
-					return false;
-				}
-
-				@Override
-				public boolean onCommentLine(@Nonnull final String line)
-				{
-					return true;
-				}
-
-				@Override
-				public boolean onPatternMatch(@Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-						@Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched)
-				{
-					if(type == MetaDocType.DEPRECATED)
-					{
-						deprecatedStatus[0] = true;
-						return false;
-					}
-					return true;
-				}
-			});
-
-			return deprecatedStatus[0];
-		}
-		return false;
-	}
-
-	public static void appendHyperLinkToElement(@Nullable PsiElement element, String elementName, final StringBuilder buffer,
-												final String presentableName, final @Nullable String presentableFileName)
-	{
-		final PsiFile containingFile = element != null ? element.getContainingFile() : null;
-		String fileName = containingFile == null ? null : !JSResolveUtil.isPredefinedFile(containingFile) ? containingFile.getVirtualFile()
-				.getPresentableUrl() : containingFile.getViewProvider().getVirtualFile().getName();
-
-		DocumentationManagerUtil.createHyperlink(buffer, (fileName != null ? fileName + ":" : "") + elementName + (element != null ? ":" + element
-				.getTextOffset() : ""), presentableName + (presentableFileName != null ? " in " + presentableFileName : ""), true);
-	}
-
-	private static String evaluateTypeFromParameter(final JSParameter parameter)
-	{
-		String s = evaluateTypeFromVariable(parameter);
-
-		if(s == null)
-		{
-			s = findTypeFromParameter(parameter, findFunctionComment(parameter));
-		}
-
-		return s;
-	}
-
-	private static PsiElement findFunctionComment(JSParameter parameter)
-	{
-		PsiElement anchor = PsiTreeUtil.getParentOfType(parameter, JSFunction.class);
-
-		if(anchor instanceof JSFunctionExpression)
-		{
-			anchor = PsiTreeUtil.getParentOfType(anchor, JSStatement.class, JSProperty.class);
-		}
-
-		if(anchor != null)
-		{
-			return findDocComment(anchor);
-		}
-		return null;
-	}
-
-	private static String evaluateTypeFromFunction(final JSFunction function)
-	{
-		final ASTNode lastCommentInFunctionBody = findTrailingCommentInFunctionBody(function);
-
-		String typeString = null;
-		if(lastCommentInFunctionBody != null)
-		{
-			typeString = unwrapCommentDelimiters(lastCommentInFunctionBody.getText()).trim();
-		}
-
-		if(typeString == null)
-		{
-			typeString = findDocForAnchor(function, JSDocumentationProcessor.MetaDocType.RETURN, JSDocumentationProcessor.MetaDocType.TYPE);
-		}
-		return typeString;
-	}
-
-	private static String evaluateTypeFromVariable(final JSVariable variable)
-	{
-		PsiElement prevSibling = variable.getFirstChild();
-		if(prevSibling != null && prevSibling.getNode().getElementType() == JSTokenTypes.IDENTIFIER)
-		{
-			prevSibling = variable.getPrevSibling();
-		}
-
-		if(prevSibling instanceof PsiWhiteSpace)
-		{
-			prevSibling = prevSibling.getPrevSibling();
-		}
-
-		if(prevSibling instanceof PsiComment && prevSibling.getNode().getElementType() != JSTokenTypes.END_OF_LINE_COMMENT)
-		{
-			String parameterCommentText = prevSibling.getText();
-			parameterCommentText = unwrapCommentDelimiters(parameterCommentText).trim();
-
-			if(parameterCommentText.length() > 0 && (Character.isUpperCase(parameterCommentText.charAt(0)) || parameterCommentText.indexOf(' ') == -1))
-			{
-				return parameterCommentText;
-			}
-		}
-
-		if(prevSibling != null && prevSibling.getNode() != null && prevSibling.getNode().getElementType() == JSTokenTypes.VAR_KEYWORD)
-		{
-			prevSibling = variable.getParent().getPrevSibling();
-
-			if(prevSibling instanceof PsiWhiteSpace)
-			{
-				prevSibling = prevSibling.getPrevSibling();
-			}
-
-			if(prevSibling instanceof PsiComment)
-			{
-				return findTypeFromParameter(variable, prevSibling);
-			}
-
-		}
-		return null;
-	}
-
-	public static String findTypeFromComments(final JSNamedElement element)
-	{
-		if(element instanceof JSParameter)
-		{
-			return evaluateTypeFromParameter((JSParameter) element);
-		}
-		else if(element instanceof JSVariable)
-		{
-			return evaluateTypeFromVariable((JSVariable) element);
-		}
-		else if(element instanceof JSFunction)
-		{
-			return evaluateTypeFromFunction((JSFunction) element);
-		}
-		return null;
-	}
-
-	public static boolean isSymbolReference(String content)
-	{
-		int i = content.indexOf(' ');
-		if(i == -1)
-		{
-			return false;
-		}
-		String text = content.substring(0, i);
-		return text.indexOf('.') != -1 || text.indexOf('#') != -1;
-	}
-
-	public static boolean findOptionalStatusFromComments(final JSParameter parameter)
-	{
-		PsiElement docComment = findFunctionComment(parameter);
-		if(docComment == null)
-		{
-			return false;
-		}
-
-		final boolean[] detectedType = new boolean[1];
-
-		processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor()
-		{
-			final String name = parameter.getName();
-
-			@Override
-			public boolean needsPlainCommentData()
-			{
-				return false;
-			}
-
-			@Override
-			public boolean onCommentLine(@Nonnull final String line)
-			{
-				return true;
-			}
-
-			@Override
-			public boolean onPatternMatch(@Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-					@Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched)
-			{
-				if(type == MetaDocType.OPTIONAL_PARAMETERS && matchName != null && matchName.equals(name) && matchValue == null)
-				{
-					detectedType[0] = true;
-					return false;
-				}
-
-				return true;
-			}
-		});
-
-		return detectedType[0];
-	}
+public class JSDocumentationUtils {
+    @NonNls
+    private static final Pattern ourDojoParametersPattern = Pattern.compile("^\\s*(\\w+):(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocParametersPattern =
+        Pattern.compile("^\\s*@param\\s*(?:\\{([^\\}]+)\\}\\s*)?(\\w+)?(?:\\s:\\s(\\S+))?(?:\\s*\\[(\\w+)(?:\\.(\\w+))?" +
+            "(?:=([^\\]]*))?\\])?(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocEventPattern = Pattern.compile("^\\s*@event\\s*(\\w+)(?:\\s:\\s(\\S+))?(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocRemarkPattern = Pattern.compile("^\\s*@remarks (.*)$");
+    @NonNls
+    private static final Pattern ourJSDocMethodPattern = Pattern.compile("^\\s*@method\\s*(\\w+)(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocClassPattern = Pattern.compile("^\\s*@class\\s*(\\w+(?:\\.\\w+)*)(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocDeprecatedPattern = Pattern.compile("^\\s*@deprecated\\s*(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocConstructorPattern = Pattern.compile("^\\s*@constructor$");
+    @NonNls
+    private static final Pattern ourJSDocFinalPattern = Pattern.compile("^\\s*@final$");
+    @NonNls
+    private static final Pattern ourJSDocPrivatePattern = Pattern.compile("^\\s*@private$");
+    @NonNls
+    private static final Pattern ourJSDocPublicPattern = Pattern.compile("^\\s*@public$");
+    @NonNls
+    private static final Pattern ourJSDocProtectedPattern = Pattern.compile("^\\s*@protected$");
+    @NonNls
+    private static final Pattern ourJSDocOptionalPattern = Pattern.compile("^\\s*@optional(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocStaticPattern = Pattern.compile("^\\s*@static$");
+    @NonNls
+    private static final Pattern ourJSDocSeePattern = Pattern.compile("^\\s*@see (.*)$");
+    @NonNls
+    private static final Pattern ourJSDocDescriptionPattern = Pattern.compile("^\\s*@description\\s*(.+)$");
+    @NonNls
+    private static final Pattern ourJSDocReturnPattern =
+        Pattern.compile("^\\s*@return(?:s)?\\s*(?:(?:\\{|:)?\\s*([^\\s\\}]+)\\s*\\}?\\s*)?(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocNamespacePattern = Pattern.compile("^\\s*@namespace\\s*([\\w\\.]+)(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocPropertyPattern = Pattern.compile("^\\s*@property\\s*(\\w+)(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocTypePattern = Pattern.compile("^\\s*@type\\s*\\{?([^\\s\\}]+)\\}?(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocRequiresPattern = Pattern.compile("^\\s*@requires\\s*(\\S+)(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocDefaultPattern = Pattern.compile("^\\s*@default\\s*(.*)$");
+    @NonNls
+    private static final Pattern ourJSDocExtendsPattern = Pattern.compile("^\\s*@extends\\s*(.*)$");
+    @NonNls
+    private static final Map<Pattern, String> patternToHintMap = new HashMap<>();
+    @NonNls
+    private static final Map<Pattern, JSDocumentationProcessor.MetaDocType> patternToMetaDocTypeMap = new HashMap<>();
+
+    static {
+        patternToHintMap.put(ourDojoParametersPattern, ":");
+        patternToMetaDocTypeMap.put(ourDojoParametersPattern, JSDocumentationProcessor.MetaDocType.PARAMETER);
+        patternToHintMap.put(ourJSDocParametersPattern, "@pa");
+        patternToMetaDocTypeMap.put(ourJSDocParametersPattern, JSDocumentationProcessor.MetaDocType.PARAMETER);
+
+        patternToHintMap.put(ourJSDocMethodPattern, "@m");
+        patternToMetaDocTypeMap.put(ourJSDocMethodPattern, JSDocumentationProcessor.MetaDocType.METHOD);
+
+        patternToHintMap.put(ourJSDocOptionalPattern, "@o");
+        patternToMetaDocTypeMap.put(ourJSDocOptionalPattern, JSDocumentationProcessor.MetaDocType.OPTIONAL_PARAMETERS);
+
+        patternToHintMap.put(ourJSDocEventPattern, "@ev");
+        patternToMetaDocTypeMap.put(ourJSDocEventPattern, JSDocumentationProcessor.MetaDocType.EVENT);
+
+        patternToHintMap.put(ourJSDocExtendsPattern, "@ex");
+        patternToMetaDocTypeMap.put(ourJSDocExtendsPattern, JSDocumentationProcessor.MetaDocType.EXTENDS);
+
+        patternToHintMap.put(ourJSDocRemarkPattern, "@rem");
+        patternToMetaDocTypeMap.put(ourJSDocRemarkPattern, JSDocumentationProcessor.MetaDocType.NOTE);
+
+        patternToHintMap.put(ourJSDocReturnPattern, "@ret");
+        patternToMetaDocTypeMap.put(ourJSDocReturnPattern, JSDocumentationProcessor.MetaDocType.RETURN);
+
+        patternToHintMap.put(ourJSDocPublicPattern, "@pu");
+        patternToMetaDocTypeMap.put(ourJSDocPublicPattern, JSDocumentationProcessor.MetaDocType.PUBLIC);
+
+        patternToHintMap.put(ourJSDocProtectedPattern, "@prot");
+        patternToMetaDocTypeMap.put(ourJSDocProtectedPattern, JSDocumentationProcessor.MetaDocType.PROTECTED);
+
+        patternToHintMap.put(ourJSDocStaticPattern, "@st");
+        patternToMetaDocTypeMap.put(ourJSDocStaticPattern, JSDocumentationProcessor.MetaDocType.STATIC);
+
+        patternToHintMap.put(ourJSDocSeePattern, "@se");
+        patternToMetaDocTypeMap.put(ourJSDocSeePattern, JSDocumentationProcessor.MetaDocType.SEE);
+
+        patternToHintMap.put(ourJSDocDescriptionPattern, "@des");
+        patternToMetaDocTypeMap.put(ourJSDocDescriptionPattern, JSDocumentationProcessor.MetaDocType.DESCRIPTION);
+
+        patternToHintMap.put(ourJSDocDeprecatedPattern, "@dep");
+        patternToMetaDocTypeMap.put(ourJSDocDeprecatedPattern, JSDocumentationProcessor.MetaDocType.DEPRECATED);
+
+        patternToHintMap.put(ourJSDocConstructorPattern, "@co");
+
+        patternToMetaDocTypeMap.put(ourJSDocConstructorPattern, JSDocumentationProcessor.MetaDocType.CONSTRUCTOR);
+
+        patternToHintMap.put(ourJSDocClassPattern, "@cl");
+        patternToMetaDocTypeMap.put(ourJSDocClassPattern, JSDocumentationProcessor.MetaDocType.CLASS);
+        patternToHintMap.put(ourJSDocPrivatePattern, "@pri");
+        patternToMetaDocTypeMap.put(ourJSDocPrivatePattern, JSDocumentationProcessor.MetaDocType.PRIVATE);
+
+        patternToHintMap.put(ourJSDocNamespacePattern, "@n");
+        patternToMetaDocTypeMap.put(ourJSDocNamespacePattern, JSDocumentationProcessor.MetaDocType.NAMESPACE);
+
+        patternToHintMap.put(ourJSDocPropertyPattern, "@prop");
+        patternToHintMap.put(ourJSDocTypePattern, "@t");
+        patternToMetaDocTypeMap.put(ourJSDocTypePattern, JSDocumentationProcessor.MetaDocType.TYPE);
+
+        patternToHintMap.put(ourJSDocFinalPattern, "@f");
+        patternToMetaDocTypeMap.put(ourJSDocFinalPattern, JSDocumentationProcessor.MetaDocType.FINAL);
+        patternToHintMap.put(ourJSDocRequiresPattern, "@req");
+        patternToMetaDocTypeMap.put(ourJSDocRequiresPattern, JSDocumentationProcessor.MetaDocType.REQUIRES);
+
+        patternToHintMap.put(ourJSDocDefaultPattern, "@def");
+        patternToMetaDocTypeMap.put(ourJSDocDefaultPattern, JSDocumentationProcessor.MetaDocType.DEFAULT);
+    }
+
+    private static final
+    @NonNls
+    Map<Pattern, String> prefixToPatternToHintMap = new HashMap<Pattern, String>();
+
+    static {
+        prefixToPatternToHintMap.put(Pattern.compile("^\\s*description:(.*)$"), "descr");
+
+        prefixToPatternToHintMap.put(Pattern.compile("^ summary(?:\\:)?(.*)$"), "summ");
+
+        prefixToPatternToHintMap.put(Pattern.compile("^\\s*\\*(?:\\*)?(.*)$"), "*");
+
+        prefixToPatternToHintMap.put(Pattern.compile("^[/]+(.*)$"), "/");
+
+        prefixToPatternToHintMap.put(Pattern.compile("^\\s*Parameters:(.*)$"), "Parame");
+    }
+
+    public static void processDocumentationTextFromComment(ASTNode _initialComment, JSDocumentationProcessor processor) {
+        ASTNode prev = _initialComment.getTreePrev();
+
+        if (prev != null && prev.getPsi() instanceof OuterLanguageElement) {
+            while (prev.getPsi() instanceof OuterLanguageElement) {
+                prev = prev.getTreePrev();
+            }
+        }
+        else {
+            prev = null;
+        }
+
+        if (prev != null && !(prev.getPsi() instanceof PsiComment)) {
+            prev = null;
+        }
+
+        final ASTNode initialComment = prev != null ? prev : _initialComment;
+        Enumeration<Object> commentLineIterator;
+
+        if (initialComment.getElementType() == JSTokenTypes.END_OF_LINE_COMMENT) {
+            commentLineIterator = new Enumeration<>() {
+                ASTNode commentNode = initialComment;
+
+                @Override
+                public boolean hasMoreElements() {
+                    return commentNode != null;
+                }
+
+                @Override
+                public String nextElement() {
+                    ASTNode resultCommentNode = commentNode;
+                    commentNode = commentNode.getTreeNext();
+
+                    if (commentNode != null && commentNode.getElementType() == TokenType.WHITE_SPACE) {
+                        commentNode = commentNode.getTreeNext();
+                    }
+
+                    if (commentNode != null && commentNode.getElementType() != JSTokenTypes.END_OF_LINE_COMMENT) {
+                        commentNode = null;
+                    }
+
+                    final String text = resultCommentNode.getText();
+                    if (text.startsWith("//")) {
+                        return text.substring(2);
+                    }
+                    return "";
+                }
+            };
+        }
+        else {
+            String text = initialComment.getText();
+            text = unwrapCommentDelimiters(text);
+
+            commentLineIterator = new StringTokenizer(text, "\r\n");
+        }
+
+        final boolean needPlainCharData = processor.needsPlainCommentData();
+
+        while (commentLineIterator.hasMoreElements()) {
+            final String s = (String)commentLineIterator.nextElement();
+            if (s.indexOf('@') == -1 && s.indexOf(':') == -1 && !needPlainCharData) {
+                continue;
+            }
+
+            String commentText = s.replace('\t', ' ');
+
+            for (Map.Entry<Pattern, String> entry : prefixToPatternToHintMap.entrySet()) {
+                final Matcher matcher = commentText.indexOf(entry.getValue()) != -1 ? entry.getKey().matcher(commentText) : null;
+                if (matcher == null) {
+                    continue;
+                }
+
+                if (matcher.matches()) {
+                    commentText = matcher.group(1);
+                    break;
+                }
+            }
+
+            boolean matchedSomething = false;
+
+            for (Map.Entry<Pattern, String> entry : patternToHintMap.entrySet()) {
+                final Matcher matcher = commentText.indexOf(entry.getValue()) != -1 ? entry.getKey().matcher(commentText) : null;
+                if (matcher == null) {
+                    continue;
+                }
+
+                if (matcher.matches()) {
+                    final JSDocumentationProcessor.MetaDocType docType = patternToMetaDocTypeMap.get(entry.getKey());
+                    if (docType != null) {
+                        final int groupCount = matcher.groupCount();
+                        String remainingLineContent = groupCount > 0 ? matcher.group(groupCount) : null;
+                        String matchName = groupCount > 1 ? matcher.group(1) : null;
+                        String matchValue = groupCount > 2 ? matcher.group(2) : null;
+
+                        boolean reportAboutOptionalParameter = false;
+                        boolean reportAboutFieldInParameter = false;
+                        boolean reportAboutDefaultValue = false;
+
+                        final int groupForInitialValue = 6;
+                        final int groupForFieldName = 5;
+                        String fieldName = null;
+
+                        if (groupCount == 7 && entry.getKey() == ourJSDocParametersPattern) {
+                            String paramNameInBracket = matcher.group(4);
+
+                            if (paramNameInBracket != null) {
+                                String tmp = matchName;
+                                matchName = paramNameInBracket;
+                                matchValue = tmp;
+                                reportAboutFieldInParameter = (fieldName = matcher.group(groupForFieldName)) != null;
+                                reportAboutOptionalParameter = true;
+                                reportAboutDefaultValue = matcher.group(groupForInitialValue) != null;
+                            }
+                            else {
+                                String typeAfterParamName = matcher.group(3);
+                                if (typeAfterParamName != null) {
+                                    matchName = matchValue;
+                                    matchValue = typeAfterParamName;
+                                }
+                                else {
+                                    String tmp = matchValue;
+                                    matchValue = matchName;
+                                    matchName = tmp;
+                                }
+                            }
+                        }
+
+                        String matched = entry.getKey().pattern();
+
+                        if (reportAboutFieldInParameter) {
+                            if (!processor.onPatternMatch(
+                                JSDocumentationProcessor.MetaDocType.FIELD,
+                                matchName,
+                                null,
+                                matcher.group(groupForFieldName),
+                                commentText,
+                                matched
+                            )) {
+                                break;
+                            }
+                        }
+                        else {
+                            if (!processor.onPatternMatch(docType, matchName, matchValue, remainingLineContent, commentText, matched)) {
+                                break;
+                            }
+                        }
+                        if (reportAboutOptionalParameter) {
+                            if (!processor.onPatternMatch(
+                                JSDocumentationProcessor.MetaDocType.OPTIONAL_PARAMETERS,
+                                matchName,
+                                fieldName,
+                                null,
+                                commentText,
+                                matched
+                            )) {
+                                break;
+                            }
+                        }
+
+                        if (reportAboutDefaultValue) {
+                            if (!processor.onPatternMatch(
+                                JSDocumentationProcessor.MetaDocType.DEFAULT,
+                                matchName,
+                                fieldName,
+                                matcher.group(groupForInitialValue),
+                                commentText,
+                                matched
+                            )) {
+                                break;
+                            }
+                        }
+                    }
+                    matchedSomething = true;
+                    break;
+                }
+            }
+
+            if (!matchedSomething && needPlainCharData && !processor.onCommentLine(commentText)) {
+                break;
+            }
+        }
+    }
+
+    public static String unwrapCommentDelimiters(String text) {
+        if (text.startsWith("/**")) {
+            text = text.substring(3);
+        }
+        else if (text.startsWith("/*") || text.startsWith("//")) {
+            text = text.substring(2);
+        }
+
+        if (text.endsWith("*/")) {
+            text = text.substring(0, text.length() - 2);
+        }
+        return text;
+    }
+
+    static
+    @Nullable
+    ASTNode findTrailingCommentInFunctionBody(final @Nonnull JSFunction function) {
+        final ASTNode block = function.getNode().findChildByType(JSElementTypes.BLOCK_STATEMENT);
+        if (block == null) {
+            return null;
+        }
+
+        for (ASTNode prev = block.getLastChildNode(); prev != null; prev = prev.getTreePrev()) {
+            if (prev.getElementType() == JSElementTypes.RETURN_STATEMENT) {
+                return block.findChildByType(JSTokenTypes.COMMENTS, prev);
+            }
+            else if (prev.getPsi() instanceof JSStatement) {
+                break;
+            }
+        }
+        return null;
+    }
+
+    static
+    @Nullable
+    ASTNode findLeadingCommentInFunctionBody(final @Nonnull PsiElement element) {
+        final ASTNode functionNode = element.getNode();
+        final ASTNode block = functionNode.findChildByType(JSElementTypes.BLOCK_STATEMENT);
+        if (block == null) {
+            return null;
+        }
+
+        for (ASTNode node = block.getFirstChildNode().getTreeNext(); node != null; node = node.getTreeNext()) {
+            final IElementType nodeType = node.getElementType();
+
+            if (nodeType != TokenType.WHITE_SPACE) {
+                if (JSTokenTypes.COMMENTS.contains(nodeType)) {
+                    return node;
+                }
+                return null;
+            }
+        }
+
+        return null;
+    }
+
+    public static PsiElement findDocComment(PsiElement element) {
+        return findDocComment(element, null);
+    }
+
+    public static PsiElement findDocComment(PsiElement element, PsiElement context) {
+        PsiElement docComment = null;
+        boolean skippedExprStatementOnce = false;
+
+        if (element instanceof JSAttributeListOwner jsClass && context == null) {
+            final JSAttributeList attributeList = jsClass.getAttributeList();
+            PsiElement anchor = null;
+
+            if (attributeList != null) {
+                for (ASTNode currentNode = attributeList.getNode().getLastChildNode(); currentNode != null;
+                     currentNode = currentNode.getTreePrev()) {
+                    final IElementType nodeType = currentNode.getElementType();
+
+                    if (!JSTokenTypes.MODIFIERS.contains(nodeType)
+                        && nodeType != JSTokenTypes.WHITE_SPACE
+                        && nodeType != JSElementTypes.REFERENCE_EXPRESSION // namespace
+                    ) {
+                        final ASTNode nextNode = currentNode.getTreeNext();
+                        if (nextNode != null) {
+                            anchor = nextNode.getPsi();
+                        }
+                        break;
+                    }
+                }
+            }
+
+            if (anchor != null) {
+                element = anchor;
+            }
+        }
+
+        if (!element.isValid() || element.getContainingFile() == null) {
+            return docComment;
+        }
+
+        boolean shouldSkipPrevExprStatement = false;
+        String propName = getPropertyNameFromExprStatement(element);
+        if (propName != null) {
+            shouldSkipPrevExprStatement = true;
+        }
+
+        for (PsiElement prev = element.getPrevSibling(); prev != null; prev = prev.getPrevSibling()) {
+            if (prev instanceof PsiWhiteSpace) {
+                continue;
+            }
+
+            if (prev instanceof PsiComment) {
+                docComment = prev;
+                if (((PsiComment)prev).getTokenType() == JSTokenTypes.DOC_COMMENT) {
+                    break;
+                }
+            }
+            else if (shouldSkipPrevExprStatement &&
+                prev instanceof JSExpressionStatement &&
+                !skippedExprStatementOnce) {
+                String propNameFromPrev = getPropertyNameFromExprStatement(prev);
+                if (!propName.equals(propNameFromPrev)) {
+                    break;
+                }
+                skippedExprStatementOnce = true; // presumably another accessor definition
+                continue;
+            }
+
+            break;
+        }
+
+        if (docComment != null) {
+            while (docComment.getPrevSibling() instanceof OuterLanguageElement) {
+                PsiElement siblingSibling = docComment.getPrevSibling().getPrevSibling();
+
+                if (siblingSibling != null && siblingSibling instanceof PsiComment) {
+                    docComment = siblingSibling;
+                }
+                else {
+                    break;
+                }
+            }
+        }
+        return docComment;
+    }
+
+    private static
+    @Nullable
+    String getPropertyNameFromExprStatement(@Nonnull PsiElement element) {
+        String propName = null;
+
+        if (element instanceof JSExpressionStatement expressionStatement
+            && expressionStatement.getExpression() instanceof JSAssignmentExpression assignmentExpression
+            && assignmentExpression.getROperand() instanceof JSFunctionExpression functionExpression) {
+            String name = functionExpression.getName();
+            if (name != null && (StringUtil.startsWith(name, "get") || (StringUtil.startsWith(name, "set")))) {
+                propName = name.substring(3);
+            }
+        }
+        return propName;
+    }
+
+    private static String findTypeFromParameter(final JSVariable parameter, final PsiElement docComment) {
+        if (docComment != null) {
+            final String[] detectedType = new String[1];
+
+            processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor() {
+                final String name = parameter.getName();
+                final boolean isparameter = parameter instanceof JSParameter;
+
+                @Override
+                public boolean needsPlainCommentData() {
+                    return false;
+                }
+
+                @Override
+                public boolean onCommentLine(@Nonnull final String line) {
+                    return true;
+                }
+
+                @Override
+                public boolean onPatternMatch(
+                    @Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
+                    @Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched
+                ) {
+                    if (isparameter && type == MetaDocType.PARAMETER && matchName != null && matchName.equals(name)) {
+                        detectedType[0] = matchValue;
+                        return false;
+                    }
+                    else if (type == MetaDocType.TYPE) {
+                        detectedType[0] = matchName;
+                        return false;
+                    }
+                    return true;
+                }
+            });
+
+            return detectedType[0];
+        }
+        return null;
+    }
+
+    public static final TokenSet ourPrimitiveTypeFilter = TokenSet.create(JSTokenTypes.INT_KEYWORD, JSTokenTypes.UINT_KEYWORD,
+        JSTokenTypes.VOID_KEYWORD, JSTokenTypes.ANY_IDENTIFIER
+    );
+    public static final TokenSet ourTypeFilter =
+        TokenSet.orSet(TokenSet.create(JSElementTypes.REFERENCE_EXPRESSION), ourPrimitiveTypeFilter);
+
+    private static String findDocForAnchor(final PsiElement _anchor, final JSDocumentationProcessor.MetaDocType... expectedTypes) {
+        PsiElement anchor = _anchor;
+        if (_anchor instanceof JSExpression) {
+            anchor = PsiTreeUtil.getParentOfType(_anchor, JSStatement.class, JSProperty.class);
+        }
+
+        if (anchor != null) {
+            final PsiElement docComment = findDocComment(anchor);
+
+            if (docComment != null) {
+                final Ref<String> detectedType = new Ref<>();
+
+                final PsiElement anchor1 = anchor;
+                processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor() {
+                    @Override
+                    public boolean needsPlainCommentData() {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean onCommentLine(@Nonnull final String line) {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean onPatternMatch(
+                        @Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
+                        @Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched
+                    ) {
+                        for (MetaDocType expectedType : expectedTypes) {
+                            if (type == expectedType) {
+                                if (type == MetaDocType.TYPE && _anchor instanceof JSFunction function) {
+                                    final JSParameterList jsParameterList = function.getParameterList();
+                                    if (jsParameterList != null && jsParameterList.getParameters().length > 0) {
+                                        return true;
+                                    }
+                                    if (_anchor.getParent() instanceof JSProperty) {
+                                        return true;
+                                    }
+                                }
+                                else if (type == MetaDocType.RETURN) {
+                                    //if (!isOurDocComment()) return true;
+                                }
+
+                                detectedType.set(matchName);
+                                return false;
+                            }
+                        }
+                        return true;
+                    }
+                });
+
+                return detectedType.get();
+            }
+        }
+        return null;
+    }
+
+    public static String findType(final PsiElement def) {
+        return findDocForAnchor(def, JSDocumentationProcessor.MetaDocType.TYPE);
+    }
+
+    public static boolean isDeprecated(PsiElement element) {
+        if (element instanceof JSClass jsClass) {
+            return jsClass.isDeprecated();
+        }
+        else if (element instanceof JSFunction function) {
+            return function.isDeprecated();
+        }
+        else if (element instanceof JSVariable variable) {
+            return variable.isDeprecated();
+        }
+        else if (element instanceof JSNamespaceDeclaration namespaceDeclaration) {
+            return namespaceDeclaration.isDeprecated();
+        }
+
+        return calculateDeprecated(element);
+    }
+
+    public static boolean calculateDeprecated(PsiElement element) {
+        if (element instanceof JSExpression) {
+            element = PsiTreeUtil.getParentOfType(element, JSStatement.class, JSProperty.class);
+        }
+
+        final PsiElement docComment = element != null ? findDocComment(element) : null;
+        if (docComment != null) {
+            final boolean[] deprecatedStatus = new boolean[1];
+
+            processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor() {
+                @Override
+                public boolean needsPlainCommentData() {
+                    return false;
+                }
+
+                @Override
+                public boolean onCommentLine(@Nonnull final String line) {
+                    return true;
+                }
+
+                @Override
+                public boolean onPatternMatch(
+                    @Nonnull final MetaDocType type,
+                    @Nullable final String matchName,
+                    @Nullable final String matchValue,
+                    @Nullable final String remainingLineContent,
+                    @Nonnull final String line,
+                    final String patternMatched
+                ) {
+                    if (type == MetaDocType.DEPRECATED) {
+                        deprecatedStatus[0] = true;
+                        return false;
+                    }
+                    return true;
+                }
+            });
+
+            return deprecatedStatus[0];
+        }
+        return false;
+    }
+
+    public static void appendHyperLinkToElement(
+        @Nullable PsiElement element,
+        String elementName,
+        final StringBuilder buffer,
+        final String presentableName,
+        final @Nullable String presentableFileName
+    ) {
+        final PsiFile containingFile = element != null ? element.getContainingFile() : null;
+        String fileName = containingFile == null
+            ? null
+            : !JSResolveUtil.isPredefinedFile(containingFile)
+            ? containingFile.getVirtualFile().getPresentableUrl()
+            : containingFile.getViewProvider().getVirtualFile().getName();
+
+        DocumentationManagerUtil.createHyperlink(
+            buffer,
+            (fileName != null ? fileName + ":" : "") + elementName + (element != null ? ":" + element
+                .getTextOffset() : ""),
+            presentableName + (presentableFileName != null ? " in " + presentableFileName : ""),
+            true
+        );
+    }
+
+    private static String evaluateTypeFromParameter(final JSParameter parameter) {
+        String s = evaluateTypeFromVariable(parameter);
+
+        if (s == null) {
+            s = findTypeFromParameter(parameter, findFunctionComment(parameter));
+        }
+
+        return s;
+    }
+
+    private static PsiElement findFunctionComment(JSParameter parameter) {
+        PsiElement anchor = PsiTreeUtil.getParentOfType(parameter, JSFunction.class);
+
+        if (anchor instanceof JSFunctionExpression) {
+            anchor = PsiTreeUtil.getParentOfType(anchor, JSStatement.class, JSProperty.class);
+        }
+
+        if (anchor != null) {
+            return findDocComment(anchor);
+        }
+        return null;
+    }
+
+    private static String evaluateTypeFromFunction(final JSFunction function) {
+        final ASTNode lastCommentInFunctionBody = findTrailingCommentInFunctionBody(function);
+
+        String typeString = null;
+        if (lastCommentInFunctionBody != null) {
+            typeString = unwrapCommentDelimiters(lastCommentInFunctionBody.getText()).trim();
+        }
+
+        if (typeString == null) {
+            typeString = findDocForAnchor(function, JSDocumentationProcessor.MetaDocType.RETURN, JSDocumentationProcessor.MetaDocType.TYPE);
+        }
+        return typeString;
+    }
+
+    private static String evaluateTypeFromVariable(final JSVariable variable) {
+        PsiElement prevSibling = variable.getFirstChild();
+        if (prevSibling != null && prevSibling.getNode().getElementType() == JSTokenTypes.IDENTIFIER) {
+            prevSibling = variable.getPrevSibling();
+        }
+
+        if (prevSibling instanceof PsiWhiteSpace) {
+            prevSibling = prevSibling.getPrevSibling();
+        }
+
+        if (prevSibling instanceof PsiComment && prevSibling.getNode().getElementType() != JSTokenTypes.END_OF_LINE_COMMENT) {
+            String parameterCommentText = prevSibling.getText();
+            parameterCommentText = unwrapCommentDelimiters(parameterCommentText).trim();
+
+            if (parameterCommentText.length() > 0
+                && (Character.isUpperCase(parameterCommentText.charAt(0)) || parameterCommentText.indexOf(' ') == -1)) {
+                return parameterCommentText;
+            }
+        }
+
+        if (prevSibling != null && prevSibling.getNode() != null && prevSibling.getNode().getElementType() == JSTokenTypes.VAR_KEYWORD) {
+            prevSibling = variable.getParent().getPrevSibling();
+
+            if (prevSibling instanceof PsiWhiteSpace) {
+                prevSibling = prevSibling.getPrevSibling();
+            }
+
+            if (prevSibling instanceof PsiComment) {
+                return findTypeFromParameter(variable, prevSibling);
+            }
+
+        }
+        return null;
+    }
+
+    public static String findTypeFromComments(final JSNamedElement element) {
+        if (element instanceof JSParameter parameter) {
+            return evaluateTypeFromParameter(parameter);
+        }
+        else if (element instanceof JSVariable variable) {
+            return evaluateTypeFromVariable(variable);
+        }
+        else if (element instanceof JSFunction function) {
+            return evaluateTypeFromFunction(function);
+        }
+        return null;
+    }
+
+    public static boolean isSymbolReference(String content) {
+        int i = content.indexOf(' ');
+        if (i == -1) {
+            return false;
+        }
+        String text = content.substring(0, i);
+        return text.indexOf('.') != -1 || text.indexOf('#') != -1;
+    }
+
+    public static boolean findOptionalStatusFromComments(final JSParameter parameter) {
+        PsiElement docComment = findFunctionComment(parameter);
+        if (docComment == null) {
+            return false;
+        }
+
+        final boolean[] detectedType = new boolean[1];
+
+        processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor() {
+            final String name = parameter.getName();
+
+            @Override
+            public boolean needsPlainCommentData() {
+                return false;
+            }
+
+            @Override
+            public boolean onCommentLine(@Nonnull final String line) {
+                return true;
+            }
+
+            @Override
+            public boolean onPatternMatch(
+                @Nonnull final MetaDocType type,
+                @Nullable final String matchName,
+                @Nullable final String matchValue,
+                @Nullable final String remainingLineContent,
+                @Nonnull final String line,
+                final String patternMatched
+            ) {
+                if (type == MetaDocType.OPTIONAL_PARAMETERS && matchName != null && matchName.equals(name) && matchValue == null) {
+                    detectedType[0] = true;
+                    return false;
+                }
+
+                return true;
+            }
+        });
+
+        return detectedType[0];
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
index 6dd41b8e..42e8ba86 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
@@ -23,9 +23,8 @@
 /**
  * @author Maxim.Mossienko
  */
-public interface AnnotationBackedDescriptor extends XmlAttributeDescriptor, XmlElementDescriptor, XmlElementDescriptorWithCDataContent
-{
-	String getType();
+public interface AnnotationBackedDescriptor extends XmlAttributeDescriptor, XmlElementDescriptor, XmlElementDescriptorWithCDataContent {
+    String getType();
 
-	String getArrayType();
+    String getArrayType();
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
index 8cd37ad2..1dad91a4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
@@ -26,190 +26,184 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * @author Maxim.Mossienko
  */
-public class FlexImportSupport
-{
-	// flex2.compiler.mxml.lang.StandardDefs
-	private static
-	@NonNls
-	String[] standardMxmlImports = new String[]{
-			"mx.styles.*",
-			"mx.binding.*",
-			"mx.core.mx_internal",
-			"mx.core.IDeferredInstance",
-			"mx.core.IFactory",
-			"mx.core.IPropertyChangeNotifier",
-			"mx.core.ClassFactory",
-			"mx.core.DeferredInstanceFromClass",
-			"mx.core.DeferredInstanceFromFunction",
-	};
-
-	private static
-	@NonNls
-	String[] airOnlyImplicitImports = new String[]{
-			"flash.data.*",
-			"flash.desktop.*",
-			"flash.filesystem.*",
-			"flash.html.*",
-			"flash.html.script.*"
-	};
-
-	private static
-	@NonNls
-	String[] implicitImports = new String[]{
-			"flash.accessibility.*",
-			"flash.debugger.*",
-			"flash.display.*",
-			"flash.errors.*",
-			"flash.events.*",
-			"flash.external.*",
-			"flash.filters.*",
-			"flash.geom.*",
-			"flash.media.*",
-			"flash.net.*",
-			"flash.printing.*",
-			"flash.profiler.*",
-			"flash.system.*",
-			"flash.text.*",
-			"flash.ui.*",
-			"flash.utils.*",
-			"flash.xml.*"
-	};
-
-	private static final Map<String, Object> implicitImportListMap = new HashMap<String, Object>();
-	private static final Map<String, Object> mxmlImportListMap = new HashMap<String, Object>();
-
-	static
-	{
-		fillMapFromImportsArray(implicitImports, implicitImportListMap);
-		fillMapFromImportsArray(standardMxmlImports, mxmlImportListMap);
-	}
-
-	private static void fillMapFromImportsArray(final String[] strings, final Map<String, Object> map)
-	{
-		for(String s : strings)
-		{
-			doAppendToMap(map, s);
-		}
-	}
-
-	public static void appendToMap(final Map<String, Object> map, final JSImportStatement importStatement)
-	{
-		doAppendToMap(map, importStatement);
-	}
-
-	private static void doAppendToMap(final Map<String, Object> map, final Object stringOrStatement)
-	{
-		String s = stringOrStatement instanceof String ? (String) stringOrStatement : ((JSImportStatement) stringOrStatement).getImportText();
-
-		final int index = s.lastIndexOf('.');
-		if(index == -1)
-		{
-			return; // nothing to import, global symbol
-		}
-		final String key = s.substring(index + 1);
-		final Object o = map.get(key);
-
-		if(o == null)
-		{
-			map.put(key, stringOrStatement);
-		}
-		else if(o instanceof Object[])
-		{
-			map.put(key, ArrayUtil.append((Object[]) o, stringOrStatement));
-		}
-		else
-		{
-			map.put(key, new Object[]{
-					stringOrStatement,
-					o
-			});
-		}
-	}
-
-	public static JSImportedElementResolveResult resolveTypeNameUsingImplicitImports(@Nonnull String referenceName, @Nonnull JSFile file)
-	{
-		final PsiElement context = file.getContext();
-
-		if(context != null)
-		{
-			JSImportedElementResolveResult expression = tryFindInMap(referenceName, file, implicitImportListMap, null);
-			if(expression != null)
-			{
-				return expression;
-			}
-			expression = tryFindInMap(referenceName, file, mxmlImportListMap, null);
-			if(expression != null)
-			{
-				return expression;
-			}
-		}
-		return null;
-	}
-
-
-	public static JSImportedElementResolveResult tryFindInMap(final String referenceName, final PsiNamedElement file, final Map<String, Object> map,
-															  String qName)
-	{
-		JSImportedElementResolveResult resolveResult = tryEntry(map.get(referenceName), referenceName, file, qName);
-		if(resolveResult == null)
-		{
-			resolveResult = tryEntry(map.get("*"), referenceName, file, qName);
-		}
-		return resolveResult;
-	}
-
-	public static JSImportedElementResolveResult tryFindInMap(final String referenceName, final PsiNamedElement file, final Map<String, Object> map)
-	{
-		return tryFindInMap(referenceName, file, map, null);
-	}
-
-	private static JSImportedElementResolveResult tryEntry(Object entry, String referenceName, PsiNamedElement file, String qName)
-	{
-		if(entry == null)
-		{
-			return null;
-		}
-		else if(entry instanceof Object[])
-		{
-			for(Object entryItem : (Object[]) entry)
-			{
-				JSImportedElementResolveResult expression = tryFindClass(referenceName, file, entryItem, qName);
-				if(expression != null)
-				{
-					return expression;
-				}
-			}
-			return null;
-		}
-		else
-		{
-			return tryFindClass(referenceName, file, entry, qName);
-		}
-	}
-
-	private static JSImportedElementResolveResult tryFindClass(final String referenceName, final PsiNamedElement file, final Object entry, String qName)
-	{
-		String importString = entry instanceof String ? (String) entry : ((JSImportStatement) entry).getImportText();
-
-		String nameToTry = importString.endsWith(".*") ? importString.substring(0, importString.length() - 1) + referenceName : importString;
-		if(qName != null && !qName.equals(nameToTry))
-		{
-			return null;
-		}
-
-		PsiElement element = JSResolveUtil.findClassByQName(nameToTry, file);
-
-		if(element != null)
-		{
-			return new JSImportedElementResolveResult(nameToTry, element, entry instanceof JSImportStatement ? (JSImportStatement) entry : null);
-		}
-
-		return null;
-	}
+public class FlexImportSupport {
+    // flex2.compiler.mxml.lang.StandardDefs
+    private static
+    @NonNls
+    String[] standardMxmlImports = new String[]{
+        "mx.styles.*",
+        "mx.binding.*",
+        "mx.core.mx_internal",
+        "mx.core.IDeferredInstance",
+        "mx.core.IFactory",
+        "mx.core.IPropertyChangeNotifier",
+        "mx.core.ClassFactory",
+        "mx.core.DeferredInstanceFromClass",
+        "mx.core.DeferredInstanceFromFunction",
+    };
+
+    private static
+    @NonNls
+    String[] airOnlyImplicitImports = new String[]{
+        "flash.data.*",
+        "flash.desktop.*",
+        "flash.filesystem.*",
+        "flash.html.*",
+        "flash.html.script.*"
+    };
+
+    private static
+    @NonNls
+    String[] implicitImports = new String[]{
+        "flash.accessibility.*",
+        "flash.debugger.*",
+        "flash.display.*",
+        "flash.errors.*",
+        "flash.events.*",
+        "flash.external.*",
+        "flash.filters.*",
+        "flash.geom.*",
+        "flash.media.*",
+        "flash.net.*",
+        "flash.printing.*",
+        "flash.profiler.*",
+        "flash.system.*",
+        "flash.text.*",
+        "flash.ui.*",
+        "flash.utils.*",
+        "flash.xml.*"
+    };
+
+    private static final Map<String, Object> implicitImportListMap = new HashMap<String, Object>();
+    private static final Map<String, Object> mxmlImportListMap = new HashMap<String, Object>();
+
+    static {
+        fillMapFromImportsArray(implicitImports, implicitImportListMap);
+        fillMapFromImportsArray(standardMxmlImports, mxmlImportListMap);
+    }
+
+    private static void fillMapFromImportsArray(final String[] strings, final Map<String, Object> map) {
+        for (String s : strings) {
+            doAppendToMap(map, s);
+        }
+    }
+
+    public static void appendToMap(final Map<String, Object> map, final JSImportStatement importStatement) {
+        doAppendToMap(map, importStatement);
+    }
+
+    private static void doAppendToMap(final Map<String, Object> map, final Object stringOrStatement) {
+        String s = stringOrStatement instanceof String string ? string : ((JSImportStatement)stringOrStatement).getImportText();
+
+        final int index = s.lastIndexOf('.');
+        if (index == -1) {
+            return; // nothing to import, global symbol
+        }
+        final String key = s.substring(index + 1);
+        final Object o = map.get(key);
+
+        if (o == null) {
+            map.put(key, stringOrStatement);
+        }
+        else if (o instanceof Object[]) {
+            map.put(key, ArrayUtil.append((Object[])o, stringOrStatement));
+        }
+        else {
+            map.put(key, new Object[]{
+                stringOrStatement,
+                o
+            });
+        }
+    }
+
+    public static JSImportedElementResolveResult resolveTypeNameUsingImplicitImports(@Nonnull String referenceName, @Nonnull JSFile file) {
+        final PsiElement context = file.getContext();
+
+        if (context != null) {
+            JSImportedElementResolveResult expression = tryFindInMap(referenceName, file, implicitImportListMap, null);
+            if (expression != null) {
+                return expression;
+            }
+            expression = tryFindInMap(referenceName, file, mxmlImportListMap, null);
+            if (expression != null) {
+                return expression;
+            }
+        }
+        return null;
+    }
+
+
+    public static JSImportedElementResolveResult tryFindInMap(
+        final String referenceName,
+        final PsiNamedElement file,
+        final Map<String, Object> map,
+        String qName
+    ) {
+        JSImportedElementResolveResult resolveResult = tryEntry(map.get(referenceName), referenceName, file, qName);
+        if (resolveResult == null) {
+            resolveResult = tryEntry(map.get("*"), referenceName, file, qName);
+        }
+        return resolveResult;
+    }
+
+    public static JSImportedElementResolveResult tryFindInMap(
+        final String referenceName,
+        final PsiNamedElement file,
+        final Map<String, Object> map
+    ) {
+        return tryFindInMap(referenceName, file, map, null);
+    }
+
+    private static JSImportedElementResolveResult tryEntry(Object entry, String referenceName, PsiNamedElement file, String qName) {
+        if (entry == null) {
+            return null;
+        }
+        else if (entry instanceof Object[]) {
+            for (Object entryItem : (Object[])entry) {
+                JSImportedElementResolveResult expression = tryFindClass(referenceName, file, entryItem, qName);
+                if (expression != null) {
+                    return expression;
+                }
+            }
+            return null;
+        }
+        else {
+            return tryFindClass(referenceName, file, entry, qName);
+        }
+    }
+
+    private static JSImportedElementResolveResult tryFindClass(
+        final String referenceName,
+        final PsiNamedElement file,
+        final Object entry,
+        String qName
+    ) {
+        String importString = entry instanceof String string ? string : ((JSImportStatement)entry).getImportText();
+
+        String nameToTry = importString.endsWith(".*")
+            ? importString.substring(0, importString.length() - 1) + referenceName
+            : importString;
+        if (qName != null && !qName.equals(nameToTry)) {
+            return null;
+        }
+
+        PsiElement element = JSResolveUtil.findClassByQName(nameToTry, file);
+
+        if (element != null) {
+            return new JSImportedElementResolveResult(
+                nameToTry,
+                element,
+                entry instanceof JSImportStatement importStatement ? importStatement : null
+            );
+        }
+
+        return null;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
index 09fb560f..c8489903 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
@@ -36,16 +36,20 @@
 @Deprecated
 @DeprecationInfo("We need this?")
 @ExtensionAPI(ComponentScope.APPLICATION)
-public interface JSResolveHelper
-{
-	ExtensionPointName<JSResolveHelper> EP_NAME = ExtensionPointName.create(JSResolveHelper.class);
+public interface JSResolveHelper {
+    ExtensionPointName<JSResolveHelper> EP_NAME = ExtensionPointName.create(JSResolveHelper.class);
 
-	// TODO: drop module
-	@Nullable
-	PsiElement findClassByQName(final String link, final Project project, final String className, GlobalSearchScope scope);
+    // TODO: drop module
+    @Nullable
+    PsiElement findClassByQName(final String link, final Project project, final String className, GlobalSearchScope scope);
 
-	void importClass(final PsiScopeProcessor processor, final PsiNamedElement file, final String packageQualifierText);
+    void importClass(final PsiScopeProcessor processor, final PsiNamedElement file, final String packageQualifierText);
 
-	boolean processPackage(final String packageQualifierText, String resolvedName, final Processor<VirtualFile> processor,
-						   GlobalSearchScope globalSearchScope, Project project);
+    boolean processPackage(
+        final String packageQualifierText,
+        String resolvedName,
+        final Processor<VirtualFile> processor,
+        GlobalSearchScope globalSearchScope,
+        Project project
+    );
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index 5ad5266b..ed8982e9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -50,717 +50,612 @@
 /**
  * @author Maxim.Mossienko
  */
-public class XmlBackedJSClassImpl extends JSClassBase implements JSClass
-{
-	@NonNls
-	public static final String COMPONENT_TAG_NAME = "Component";
-	@NonNls
-	public static final String CLASS_NAME_ATTRIBUTE_NAME = "className";
-
-	private volatile JSReferenceList myExtendsList;
-	private volatile JSReferenceList myImplementsList;
-
-	public XmlBackedJSClassImpl(XmlTag tag)
-	{
-		super(tag.getNode());
-	}
-
-	@Override
-	@Nullable
-	public JSReferenceList getExtendsList()
-	{
-		JSReferenceList refList = myExtendsList;
-		if(refList == null)
-		{
-			final XmlTag rootTag = getParent();
-			refList = createReferenceList(rootTag.getLocalName());
-			refList.getParent().putUserData(JSResolveUtil.contextKey, this);
-			myExtendsList = refList;
-		}
-		return refList;
-	}
-
-	private JSReferenceList createReferenceList(final String s)
-	{
-		final JSClass element = (JSClass) JSChangeUtil.createJSTreeFromText(getProject(), "class C extends " + s + " {}").getPsi();
-		return element.getExtendsList();
-	}
-
-	@Override
-	public int getTextOffset()
-	{
-		return 0;
-	}
-
-	@Override
-	@Nullable
-	public JSReferenceList getImplementsList()
-	{
-		JSReferenceList refList = myImplementsList;
-
-		if(refList == null)
-		{
-			final XmlTag rootTag = getParent();
-			myImplementsList = refList = createReferenceList(rootTag != null ? rootTag.getAttributeValue("implements") : null);
-		}
-		return refList;
-	}
-
-	@Override
-	public PsiElement getNavigationElement()
-	{
-		return getParent();
-	}
-
-	@Override
-	public String getName()
-	{
-		XmlTag parent = getParent();
-		if(isInlineComponentTag(parent))
-		{
-			String explicitName = getExplicitName();
-			if(explicitName != null)
-			{
-				return explicitName;
-			}
-		}
-		final PsiFile psi = parent.getContainingFile();
-		VirtualFile file = psi.getVirtualFile();
-		if(file == null && psi.getOriginalFile() != null)
-		{
-			file = psi.getOriginalFile().getVirtualFile();
-		}
-		return file != null ? file.getNameWithoutExtension() : null;
-	}
-
-	@Nullable
-	public String getExplicitName()
-	{
-		XmlTag parent = getParent();
-		return parent.getAttributeValue(CLASS_NAME_ATTRIBUTE_NAME, parent.getNamespace());
-	}
-
-	@Override
-	public String getQualifiedName()
-	{
-		final String name = getName();
-		if(name == null)
-		{
-			return null;
-		}
-		final PsiFile containingFile = getNode().getPsi().getContainingFile();
-		final String expectedPackageNameFromFile = JSResolveUtil.getExpectedPackageNameFromFile(containingFile.getVirtualFile(),
-				containingFile.getProject(), true);
-		if(expectedPackageNameFromFile != null && expectedPackageNameFromFile.length() > 0)
-		{
-			return expectedPackageNameFromFile + "." + name;
-		}
-
-		return name;
-	}
-
-	@Override
-	public boolean isInterface()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean isDeprecated()
-	{
-		return false;
-	}
-
-	@Nullable
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		return getParent();
-	}
-
-	@Override
-	public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException
-	{
-		final int i = name.lastIndexOf('.');
-		if(i != -1)
-		{
-			name = name.substring(0, i);
-		}
-		JSPsiImplUtils.updateFileName(this, name, getName());
-		return null;
-	}
-
-	@Override
-	@Nullable
-	public JSAttributeList getAttributeList()
-	{
-		return null;
-	}
-
-	@Override
-	protected boolean processMembers(final PsiScopeProcessor processor, final ResolveState substitutor, final PsiElement lastParent,
-									 final PsiElement place)
-	{
-		for(JSFile file : ourCachedScripts.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue())
-		{
-			if(!file.processDeclarations(processor, ResolveState.initial(), null, place))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState substitutor,
-			final PsiElement lastParent, @Nonnull final PsiElement place)
-	{
-		boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
-
-		if(b && JSResolveUtil.shouldProcessImports(place, processor))
-		{
-			b = JSImportHandlingUtil.tryResolveImports(processor, this, place);
-			if(!b)
-			{
-				return false;
-			}
-			b = doImportFromScripts(processor, place);
-		}
-
-		return b;
-	}
-
-	public boolean doImportFromScripts(final PsiScopeProcessor processor, final PsiElement place)
-	{
-		PsiElement context = place.getContainingFile().getContext();
-		if(context instanceof XmlText)
-		{
-			context = context.getParent();
-		}
-
-		boolean notResolvingTypeViaImport = !(place instanceof JSFile);
-
-		if((context instanceof XmlAttributeValue && (!(place instanceof JSReferenceExpression) || !JSResolveUtil.referenceExpressionShouldBeQualified(
-				(JSReferenceExpression) place))) ||
-				(context instanceof XmlTag && (!SCRIPT_TAG_NAME.equals(((XmlTag) context).getLocalName()) || notResolvingTypeViaImport)) ||
-				context == null)
-		{
-			boolean useImports = JSResolveUtil.shouldProcessImports(place, processor);
-			boolean adequatePlace = false;
-
-			XmlTag parent = getParent();
-			JSFile[] files = ourCachedScripts.get(CACHED_SCRIPTS_KEY, parent, null).getValue();
-			for(JSFile file : files)
-			{
-				if(JSImportHandlingUtil.isAdequatePlaceForImport(file, place))
-				{
-					if(useImports && JSImportHandlingUtil.importClass(processor, file))
-					{
-						return false;
-					}
-					adequatePlace = true;
-				}
-			}
-
-			if(adequatePlace && processor instanceof ResolveProcessor)
-			{
-				if(!processComponentNames((ResolveProcessor) processor))
-				{
-					return false;
-				}
-			}
-		}
-
-		if(processor instanceof ResolveProcessor && JSResolveUtil.shouldProcessTopLevelGlobalContext(place, processor) &&
-				notResolvingTypeViaImport)
-		{
-			if(!JSResolveUtil.processGlobalThings(processor, ResolveState.initial(), place, this))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public boolean processComponentNames(ResolveProcessor processor)
-	{
-		String s = processor.getName();
-		Map<String, String> value = myCachedComponentImportsCache.get(OUR_CACHED_SHORT_COMPONENTS_REF_KEY, (XmlFile) getContainingFile(), null).getValue();
-
-		if(s != null)
-		{
-			String qName = value.get(s);
-			if(qName != null)
-			{
-				PsiElement clazz = JSResolveUtil.findClassByQName(qName, this);
-				if(clazz != null)
-				{
-					return processor.execute(clazz, ResolveState.initial());
-				}
-			}
-		}
-		else
-		{
-			for(String qName : value.values())
-			{
-				PsiElement clazz = JSResolveUtil.findClassByQName(qName, this);
-				if(clazz != null && !processor.execute(clazz, ResolveState.initial()))
-				{
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	private static final Key<CachedValue<JSFile[]>> CACHED_SCRIPTS_KEY = Key.create("cached.scripts");
-	private static final Key<CachedValue<Map<String, String>>> OUR_CACHED_SHORT_COMPONENTS_REF_KEY = Key.create("cached.component.refs");
-
-	@NonNls
-	private static final String SCRIPT_TAG_NAME = "Script";
-
-	private static final UserDataCache<CachedValue<JSFile[]>, XmlTag, Object> ourCachedScripts = new UserDataCache<CachedValue<JSFile[]>, XmlTag,
-			Object>()
-	{
-		@Override
-		protected CachedValue<JSFile[]> compute(final XmlTag tag, final Object p)
-		{
-			return CachedValuesManager.getManager(tag.getProject()).createCachedValue(new CachedValueProvider<JSFile[]>()
-			{
-				@Override
-				public Result<JSFile[]> compute()
-				{
-					final List<JSFile> injectedFiles = new ArrayList<JSFile>(2);
-					final List<PsiElement> dependencies = new ArrayList<PsiElement>();
-					dependencies.add(tag);
-					new InjectedScriptsVisitor(tag, doProcessAllTags(tag), false, false, new InjectedFileVisitor()
-					{
-						@Override
-						public void visit(XmlTag rootTag, JSFile file)
-						{
-							injectedFiles.add(file);
-							dependencies.add(file);
-						}
-					}).go();
-					return new Result<JSFile[]>(injectedFiles.toArray(new JSFile[injectedFiles.size()]), dependencies.toArray());
-				}
-			}, false);
-		}
-	};
-
-	private static final UserDataCache<CachedValue<Map<String, String>>, XmlFile, Object> myCachedComponentImportsCache = new
-			UserDataCache<CachedValue<Map<String, String>>, XmlFile, Object>()
-	{
-		@Override
-		protected CachedValue<Map<String, String>> compute(final XmlFile file, final Object p)
-		{
-			return CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider<Map<String, String>>()
-			{
-				@Override
-				public Result<Map<String, String>> compute()
-				{
-					final Map<String, String> cachedComponentImports = new HashMap<String, String>();
-					final List<PsiFile> dependencies = new ArrayList<PsiFile>();
-					dependencies.add(file);
-
-					file.acceptChildren(new XmlRecursiveElementVisitor()
-					{
-						@Override
-						public void visitXmlTag(XmlTag tag)
-						{
-							XmlElementDescriptor descriptor = tag.getDescriptor();
-							if(descriptor != null)
-							{
-								PsiElement declaration = descriptor.getDeclaration();
-								if(declaration instanceof XmlFile)
-								{
-									declaration = XmlBackedJSClassImpl.getXmlBackedClass((XmlFile) declaration);
-								}
-								if(declaration instanceof JSClass)
-								{
-									JSClass jsClass = (JSClass) declaration;
-
-									cachedComponentImports.put(jsClass.getName(), jsClass.getQualifiedName());
-									dependencies.add(declaration.getContainingFile());
-								}
-							}
-							super.visitXmlTag(tag);
-						}
-					});
-					return new Result<Map<String, String>>(cachedComponentImports, dependencies.toArray());
-				}
-			}, false);
-		}
-	};
-
-
-	public static boolean doProcessAllTags(final XmlTag rootTag)
-	{
-		return JSLanguageInjector.isMozillaXulOrXblNs(rootTag != null ? rootTag.getNamespace() : null);
-	}
-
-	public static boolean doProcessAllTags(final XmlFile file)
-	{
-		return doProcessAllTags(getRootTag(file));
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return getNode().getPsi().isValid();
-	}
-
-	private static Key<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>> ourArtificialPsiKey = Key.create("xml.backed.class");
-
-	@Nullable
-	public static JSClass getXmlBackedClass(final XmlFile xmlFile)
-	{
-		final XmlTag rootTag = getRootTag(xmlFile);
-		return rootTag != null ? getXmlBackedClass(rootTag) : null;
-	}
-
-	@Nullable
-	private static XmlTag getRootTag(XmlFile xmlFile)
-	{
-		final XmlDocument document = xmlFile.getDocument();
-		return document != null ? document.getRootTag() : null;
-	}
-
-	public static XmlBackedJSClassImpl getXmlBackedClass(final XmlTag tag)
-	{
-		return myCachedClassCache.get(ourArtificialPsiKey, tag, null).getValue(tag);
-	}
-
-	public static Collection<JSClass> getClasses(XmlFile file)
-	{
-		XmlTag rootTag = getRootTag(file);
-		if(rootTag == null)
-		{
-			return Collections.emptyList();
-		}
-		final Collection<JSClass> result = new ArrayList<JSClass>();
-		result.add(getXmlBackedClass(rootTag));
-		result.addAll(getChildInlineComponents(rootTag, true));
-		return result;
-	}
-
-	public static XmlBackedJSClassImpl getContainingComponent(XmlElement element)
-	{
-		if(element instanceof XmlTag && isInlineComponentTag((XmlTag) element))
-		{
-			return getXmlBackedClass((XmlTag) element);
-		}
-		XmlTag parentTag = PsiTreeUtil.getParentOfType(element, XmlTag.class);
-		if(parentTag != null)
-		{
-			return getContainingComponent(parentTag);
-		}
-
-		if(!(element instanceof XmlTag))
-		{
-			return null;
-		}
-		return getXmlBackedClass((XmlTag) element);
-	}
-
-	private static final UserDataCache<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>, XmlTag,
-			Object> myCachedClassCache = new UserDataCache<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>, XmlTag, Object>()
-	{
-		@Override
-		protected ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag> compute(final XmlTag tag, final Object p)
-		{
-			return CachedValuesManager.getManager(tag.getProject()).createParameterizedCachedValue(new ParameterizedCachedValueProvider<XmlBackedJSClassImpl,
-					XmlTag>()
-			{
-				@Override
-				public CachedValueProvider.Result<XmlBackedJSClassImpl> compute(XmlTag tag)
-				{
-					return new CachedValueProvider.Result<XmlBackedJSClassImpl>(new XmlBackedJSClassImpl(tag), tag);
-				}
-			}, false);
-		}
-	};
-
-	@Override
-	public XmlTag getParent()
-	{
-		return (XmlTag) getNode().getPsi();
-	}
-
-	@Override
-	public boolean isEquivalentTo(final PsiElement element2)
-	{
-		return this == element2 ||
-				element2 == getContainingFile() ||
-				(element2 instanceof XmlBackedJSClassImpl && getContainingFile() == element2.getContainingFile());
-	}
-
-	@Override
-	public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		if(element instanceof JSFunction || element instanceof JSVarStatement)
-		{
-			final JSFile jsFile = createOrGetFirstScriptTag();
-
-			if(jsFile != null)
-			{
-				final PsiElement child = jsFile.getLastChild();
-
-				String text;
-				if(child instanceof PsiWhiteSpace && (text = child.getText()).indexOf("]]>") != -1)
-				{
-					int cdataAt = 0;
-					String marker = "<![CDATA[";
-
-					if((cdataAt = text.indexOf(marker)) == -1)
-					{
-						element = jsFile.addBefore(element, child);
-					}
-					else
-					{
-						int markerEnd = cdataAt + marker.length();
-						ASTNode fromText = JSChangeUtil.createJSTreeFromText(getProject(), text.substring(0, markerEnd) + element.getText() + text.substring
-								(markerEnd));
-						jsFile.getNode().replaceAllChildrenToChildrenOf(fromText.getTreeParent());
-						element = PsiTreeUtil.getParentOfType(jsFile.findElementAt(markerEnd + 1), element.getClass());
-					}
-				}
-				else
-				{
-					element = jsFile.add(element);
-				}
-
-				CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(jsFile.getNode(), element.getNode());
-				return element;
-			}
-		}
-
-		return super.add(element);
-	}
-
-	public JSFile createScriptTag() throws IncorrectOperationException
-	{
-		final XmlTag rootTag = getParent();
-
-		if(rootTag != null)
-		{
-			String ns = findScriptNs(rootTag);
-
-			rootTag.add(rootTag.createChildTag(SCRIPT_TAG_NAME, ns, "<![CDATA[\n]]>", false));
-			return findFirstScriptTag();
-		}
-		return null;
-	}
-
-	public static String findScriptNs(XmlTag rootTag)
-	{
-		String ns = rootTag.getNamespace();
-		if(JavaScriptSupportLoader.isFlexMxmFile(rootTag.getContainingFile()))
-		{
-			ns = "";
-			for(String testNs : JavaScriptSupportLoader.MXML_URIS)
-			{
-				if(rootTag.getPrefixByNamespace(testNs) != null)
-				{
-					ns = testNs;
-					break;
-				}
-			}
-		}
-		return ns;
-	}
-
-	@Override
-	public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException
-	{
-		if(anchor == null)
-		{
-			return add(element);
-		}
-		return anchor.getParent().addBefore(element, anchor);
-	}
-
-	@Nullable
-	public JSFile findFirstScriptTag()
-	{
-		JSFile[] value = ourCachedScripts.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue();
-		if(value.length > 0)
-		{
-			return value[0];
-		}
-		return null;
-	}
-
-	public JSFile createOrGetFirstScriptTag() throws IncorrectOperationException
-	{
-		JSFile jsFile = findFirstScriptTag();
-
-		if(jsFile == null)
-		{
-			jsFile = createScriptTag();
-		}
-
-		return jsFile;
-	}
-
-	public static XmlTag[] findMxmlSubTags(XmlTag tag, String scriptTagName)
-	{
-		String ns = findScriptNs(tag);
-		return tag.findSubTags(scriptTagName, ns);
-	}
-
-	public static void visitInjectedFiles(XmlFile file, final InjectedFileVisitor visitor)
-	{
-		new InjectedScriptsVisitor(getRootTag(file), true, true, true, visitor).go();
-	}
-
-	public static boolean isInlineComponentTag(XmlTag tag)
-	{
-		return COMPONENT_TAG_NAME.equals(tag.getLocalName()) &&
-				JavaScriptSupportLoader.isMxmlNs(tag.getNamespace()) &&
-				!(tag.getParent() instanceof XmlDocument);
-	}
-
-	public static Collection<XmlBackedJSClassImpl> getChildInlineComponents(XmlTag rootTag, final boolean recursive)
-	{
-		final Collection<XmlBackedJSClassImpl> result = new ArrayList<XmlBackedJSClassImpl>();
-		rootTag.processElements(new PsiElementProcessor()
-		{
-			@Override
-			public boolean execute(PsiElement element)
-			{
-				if(element instanceof XmlTag)
-				{
-					XmlTag tag = (XmlTag) element;
-					if(isInlineComponentTag(tag))
-					{
-						result.add(getXmlBackedClass(tag));
-						if(recursive)
-						{
-							tag.processElements(this, null);
-						}
-					}
-					else
-					{
-						tag.processElements(this, null);
-					}
-				}
-				return true;
-			}
-		}, null);
-		return result;
-	}
-
-	public interface InjectedFileVisitor
-	{
-		void visit(XmlTag rootTag, JSFile file);
-	}
-
-	public static class InjectedScriptsVisitor implements PsiElementProcessor
-	{
-		private final boolean myVisitAllTags;
-		private final boolean myVisitAttributes;
-		private final XmlTag myRootTag;
-		private final boolean myVisitInnerComponents;
-		private final InjectedFileVisitor myVisitor;
-
-		public InjectedScriptsVisitor(XmlTag rootTag, boolean visitAllTags, boolean visitAttributes, boolean visitInnerComponents,
-				InjectedFileVisitor visitor)
-		{
-			myVisitAllTags = visitAllTags;
-			myVisitAttributes = visitAttributes;
-			myRootTag = rootTag;
-			myVisitInnerComponents = visitInnerComponents;
-			myVisitor = visitor;
-		}
-
-		public void go()
-		{
-			myRootTag.processElements(this, null);
-		}
-
-		@Override
-		public boolean execute(final PsiElement element)
-		{
-			if(element instanceof XmlTag)
-			{
-				final XmlTag tag = (XmlTag) element;
-
-				if(myVisitAllTags || SCRIPT_TAG_NAME.equals(tag.getLocalName()))
-				{
-					final String srcLocation = tag.getAttributeValue("source");
-					if(srcLocation != null)
-					{
-						PsiReference ref = findFileReference(tag.getAttribute("source").getValueElement());
-						if(ref != null)
-						{
-							final PsiElement psiElement = ref.resolve();
-							if(psiElement instanceof JSFile)
-							{
-								psiElement.putUserData(JSResolveUtil.contextKey, tag);
-								myVisitor.visit(myRootTag, (JSFile) psiElement);
-							}
-						}
-					}
-					else
-					{
-						JSResolveUtil.processInjectedFileForTag(tag, new JSResolveUtil.JSInjectedFilesVisitor()
-						{
-							@Override
-							protected void process(final JSFile file)
-							{
-								myVisitor.visit(myRootTag, file);
-							}
-						});
-					}
-				}
-				if(isInlineComponentTag(tag))
-				{
-					if(myVisitInnerComponents)
-					{
-						new InjectedScriptsVisitor(tag, myVisitAllTags, myVisitAttributes, true, myVisitor).go();
-					}
-				}
-				else
-				{
-					tag.processElements(this, null);
-				}
-			}
-			if(myVisitAttributes && element instanceof XmlAttribute)
-			{
-				XmlAttributeValue value = ((XmlAttribute) element).getValueElement();
-				if(value != null)
-				{
-					InjectedLanguageManager.getInstance(element.getProject()).enumerate(value, new PsiLanguageInjectionHost.InjectedPsiVisitor()
-					{
-						@Override
-						public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places)
-						{
-							if(places.get(0).getHost() instanceof XmlAttributeValue)
-							{
-								myVisitor.visit(myRootTag, (JSFile) injectedPsi);
-							}
-						}
-					});
-				}
-			}
-			return true;
-		}
-
-		@Nullable
-		private static PsiReference findFileReference(XmlAttributeValue valueElement)
-		{
-			if(valueElement == null)
-			{
-				return null;
-			}
-			PsiReference[] references = valueElement.getReferences();
-			if(references.length > 0)
-			{
-				return references[references.length - 1];
-			}
-			return null;
-		}
-	}
-
+public class XmlBackedJSClassImpl extends JSClassBase implements JSClass {
+    @NonNls
+    public static final String COMPONENT_TAG_NAME = "Component";
+    @NonNls
+    public static final String CLASS_NAME_ATTRIBUTE_NAME = "className";
+
+    private volatile JSReferenceList myExtendsList;
+    private volatile JSReferenceList myImplementsList;
+
+    public XmlBackedJSClassImpl(XmlTag tag) {
+        super(tag.getNode());
+    }
+
+    @Override
+    @Nullable
+    public JSReferenceList getExtendsList() {
+        JSReferenceList refList = myExtendsList;
+        if (refList == null) {
+            final XmlTag rootTag = getParent();
+            refList = createReferenceList(rootTag.getLocalName());
+            refList.getParent().putUserData(JSResolveUtil.contextKey, this);
+            myExtendsList = refList;
+        }
+        return refList;
+    }
+
+    private JSReferenceList createReferenceList(final String s) {
+        final JSClass element = (JSClass)JSChangeUtil.createJSTreeFromText(getProject(), "class C extends " + s + " {}").getPsi();
+        return element.getExtendsList();
+    }
+
+    @Override
+    public int getTextOffset() {
+        return 0;
+    }
+
+    @Override
+    @Nullable
+    public JSReferenceList getImplementsList() {
+        JSReferenceList refList = myImplementsList;
+
+        if (refList == null) {
+            final XmlTag rootTag = getParent();
+            myImplementsList = refList = createReferenceList(rootTag != null ? rootTag.getAttributeValue("implements") : null);
+        }
+        return refList;
+    }
+
+    @Override
+    public PsiElement getNavigationElement() {
+        return getParent();
+    }
+
+    @Override
+    public String getName() {
+        XmlTag parent = getParent();
+        if (isInlineComponentTag(parent)) {
+            String explicitName = getExplicitName();
+            if (explicitName != null) {
+                return explicitName;
+            }
+        }
+        final PsiFile psi = parent.getContainingFile();
+        VirtualFile file = psi.getVirtualFile();
+        if (file == null && psi.getOriginalFile() != null) {
+            file = psi.getOriginalFile().getVirtualFile();
+        }
+        return file != null ? file.getNameWithoutExtension() : null;
+    }
+
+    @Nullable
+    public String getExplicitName() {
+        XmlTag parent = getParent();
+        return parent.getAttributeValue(CLASS_NAME_ATTRIBUTE_NAME, parent.getNamespace());
+    }
+
+    @Override
+    public String getQualifiedName() {
+        final String name = getName();
+        if (name == null) {
+            return null;
+        }
+        final PsiFile containingFile = getNode().getPsi().getContainingFile();
+        final String expectedPackageNameFromFile = JSResolveUtil.getExpectedPackageNameFromFile(containingFile.getVirtualFile(),
+            containingFile.getProject(), true
+        );
+        if (expectedPackageNameFromFile != null && expectedPackageNameFromFile.length() > 0) {
+            return expectedPackageNameFromFile + "." + name;
+        }
+
+        return name;
+    }
+
+    @Override
+    public boolean isInterface() {
+        return false;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        return getParent();
+    }
+
+    @Override
+    public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException {
+        final int i = name.lastIndexOf('.');
+        if (i != -1) {
+            name = name.substring(0, i);
+        }
+        JSPsiImplUtils.updateFileName(this, name, getName());
+        return null;
+    }
+
+    @Override
+    @Nullable
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+
+    @Override
+    protected boolean processMembers(
+        final PsiScopeProcessor processor,
+        final ResolveState substitutor,
+        final PsiElement lastParent,
+        final PsiElement place
+    ) {
+        for (JSFile file : ourCachedScripts.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue()) {
+            if (!file.processDeclarations(processor, ResolveState.initial(), null, place)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean processDeclarations(
+        @Nonnull final PsiScopeProcessor processor,
+        @Nonnull final ResolveState substitutor,
+        final PsiElement lastParent,
+        @Nonnull final PsiElement place
+    ) {
+        boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
+
+        if (b && JSResolveUtil.shouldProcessImports(place, processor)) {
+            b = JSImportHandlingUtil.tryResolveImports(processor, this, place);
+            if (!b) {
+                return false;
+            }
+            b = doImportFromScripts(processor, place);
+        }
+
+        return b;
+    }
+
+    public boolean doImportFromScripts(final PsiScopeProcessor processor, final PsiElement place) {
+        PsiElement context = place.getContainingFile().getContext();
+        if (context instanceof XmlText) {
+            context = context.getParent();
+        }
+
+        boolean notResolvingTypeViaImport = !(place instanceof JSFile);
+
+        if ((context instanceof XmlAttributeValue
+            && !(place instanceof JSReferenceExpression referenceExpression
+            && JSResolveUtil.referenceExpressionShouldBeQualified(referenceExpression)))
+            || (context instanceof XmlTag tag && (!SCRIPT_TAG_NAME.equals(tag.getLocalName()) || notResolvingTypeViaImport))
+            || context == null
+        ) {
+            boolean useImports = JSResolveUtil.shouldProcessImports(place, processor);
+            boolean adequatePlace = false;
+
+            XmlTag parent = getParent();
+            JSFile[] files = ourCachedScripts.get(CACHED_SCRIPTS_KEY, parent, null).getValue();
+            for (JSFile file : files) {
+                if (JSImportHandlingUtil.isAdequatePlaceForImport(file, place)) {
+                    if (useImports && JSImportHandlingUtil.importClass(processor, file)) {
+                        return false;
+                    }
+                    adequatePlace = true;
+                }
+            }
+
+            if (adequatePlace && processor instanceof ResolveProcessor resolveProcessor) {
+                if (!processComponentNames(resolveProcessor)) {
+                    return false;
+                }
+            }
+        }
+
+        if (processor instanceof ResolveProcessor && JSResolveUtil.shouldProcessTopLevelGlobalContext(place, processor)
+            && notResolvingTypeViaImport) {
+            if (!JSResolveUtil.processGlobalThings(processor, ResolveState.initial(), place, this)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean processComponentNames(ResolveProcessor processor) {
+        String s = processor.getName();
+        Map<String, String> value =
+            myCachedComponentImportsCache.get(OUR_CACHED_SHORT_COMPONENTS_REF_KEY, (XmlFile)getContainingFile(), null).getValue();
+
+        if (s != null) {
+            String qName = value.get(s);
+            if (qName != null) {
+                PsiElement clazz = JSResolveUtil.findClassByQName(qName, this);
+                if (clazz != null) {
+                    return processor.execute(clazz, ResolveState.initial());
+                }
+            }
+        }
+        else {
+            for (String qName : value.values()) {
+                PsiElement clazz = JSResolveUtil.findClassByQName(qName, this);
+                if (clazz != null && !processor.execute(clazz, ResolveState.initial())) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    private static final Key<CachedValue<JSFile[]>> CACHED_SCRIPTS_KEY = Key.create("cached.scripts");
+    private static final Key<CachedValue<Map<String, String>>> OUR_CACHED_SHORT_COMPONENTS_REF_KEY = Key.create("cached.component.refs");
+
+    @NonNls
+    private static final String SCRIPT_TAG_NAME = "Script";
+
+    private static final UserDataCache<CachedValue<JSFile[]>, XmlTag, Object> ourCachedScripts =
+        new UserDataCache<>() {
+            @Override
+            protected CachedValue<JSFile[]> compute(final XmlTag tag, final Object p) {
+                return CachedValuesManager.getManager(tag.getProject()).createCachedValue(
+                    () -> {
+                        final List<JSFile> injectedFiles = new ArrayList<JSFile>(2);
+                        final List<PsiElement> dependencies = new ArrayList<PsiElement>();
+                        dependencies.add(tag);
+                        new InjectedScriptsVisitor(
+                            tag,
+                            doProcessAllTags(tag),
+                            false,
+                            false,
+                            (rootTag, file) -> {
+                                injectedFiles.add(file);
+                                dependencies.add(file);
+                            }
+                        ).go();
+                        return new CachedValueProvider.Result<>(
+                            injectedFiles.toArray(new JSFile[injectedFiles.size()]),
+                            dependencies.toArray()
+                        );
+                    },
+                    false
+                );
+            }
+        };
+
+    private static final UserDataCache<CachedValue<Map<String, String>>, XmlFile, Object> myCachedComponentImportsCache = new
+        UserDataCache<>() {
+            @Override
+            protected CachedValue<Map<String, String>> compute(final XmlFile file, final Object p) {
+                return CachedValuesManager.getManager(file.getProject()).createCachedValue(
+                    new CachedValueProvider<Map<String, String>>() {
+                        @Override
+                        public Result<Map<String, String>> compute() {
+                            final Map<String, String> cachedComponentImports = new HashMap<>();
+                            final List<PsiFile> dependencies = new ArrayList<>();
+                            dependencies.add(file);
+
+                            file.acceptChildren(new XmlRecursiveElementVisitor() {
+                                @Override
+                                public void visitXmlTag(XmlTag tag) {
+                                    XmlElementDescriptor descriptor = tag.getDescriptor();
+                                    if (descriptor != null) {
+                                        PsiElement declaration = descriptor.getDeclaration();
+                                        if (declaration instanceof XmlFile) {
+                                            declaration = XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)declaration);
+                                        }
+                                        if (declaration instanceof JSClass) {
+                                            JSClass jsClass = (JSClass)declaration;
+
+                                            cachedComponentImports.put(jsClass.getName(), jsClass.getQualifiedName());
+                                            dependencies.add(declaration.getContainingFile());
+                                        }
+                                    }
+                                    super.visitXmlTag(tag);
+                                }
+                            });
+                            return new Result<>(cachedComponentImports, dependencies.toArray());
+                        }
+                    },
+                    false
+                );
+            }
+        };
+
+
+    public static boolean doProcessAllTags(final XmlTag rootTag) {
+        return JSLanguageInjector.isMozillaXulOrXblNs(rootTag != null ? rootTag.getNamespace() : null);
+    }
+
+    public static boolean doProcessAllTags(final XmlFile file) {
+        return doProcessAllTags(getRootTag(file));
+    }
+
+    @Override
+    public boolean isValid() {
+        return getNode().getPsi().isValid();
+    }
+
+    private static Key<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>> ourArtificialPsiKey = Key.create("xml.backed.class");
+
+    @Nullable
+    public static JSClass getXmlBackedClass(final XmlFile xmlFile) {
+        final XmlTag rootTag = getRootTag(xmlFile);
+        return rootTag != null ? getXmlBackedClass(rootTag) : null;
+    }
+
+    @Nullable
+    private static XmlTag getRootTag(XmlFile xmlFile) {
+        final XmlDocument document = xmlFile.getDocument();
+        return document != null ? document.getRootTag() : null;
+    }
+
+    public static XmlBackedJSClassImpl getXmlBackedClass(final XmlTag tag) {
+        return myCachedClassCache.get(ourArtificialPsiKey, tag, null).getValue(tag);
+    }
+
+    public static Collection<JSClass> getClasses(XmlFile file) {
+        XmlTag rootTag = getRootTag(file);
+        if (rootTag == null) {
+            return Collections.emptyList();
+        }
+        final Collection<JSClass> result = new ArrayList<>();
+        result.add(getXmlBackedClass(rootTag));
+        result.addAll(getChildInlineComponents(rootTag, true));
+        return result;
+    }
+
+    public static XmlBackedJSClassImpl getContainingComponent(XmlElement element) {
+        if (element instanceof XmlTag && isInlineComponentTag((XmlTag)element)) {
+            return getXmlBackedClass((XmlTag)element);
+        }
+        XmlTag parentTag = PsiTreeUtil.getParentOfType(element, XmlTag.class);
+        if (parentTag != null) {
+            return getContainingComponent(parentTag);
+        }
+
+        if (!(element instanceof XmlTag)) {
+            return null;
+        }
+        return getXmlBackedClass((XmlTag)element);
+    }
+
+    private static final UserDataCache<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>, XmlTag,
+        Object> myCachedClassCache = new UserDataCache<>() {
+        @Override
+        protected ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag> compute(final XmlTag tag, final Object p) {
+            return CachedValuesManager.getManager(tag.getProject()).createParameterizedCachedValue(
+                (ParameterizedCachedValueProvider<XmlBackedJSClassImpl, XmlTag>)tag1 ->
+                    new CachedValueProvider.Result<>(new XmlBackedJSClassImpl(tag1), tag1),
+                false
+            );
+        }
+    };
+
+    @Override
+    public XmlTag getParent() {
+        return (XmlTag)getNode().getPsi();
+    }
+
+    @Override
+    public boolean isEquivalentTo(final PsiElement element2) {
+        return this == element2
+            || element2 == getContainingFile()
+            || (element2 instanceof XmlBackedJSClassImpl && getContainingFile() == element2.getContainingFile());
+    }
+
+    @Override
+    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
+        if (element instanceof JSFunction || element instanceof JSVarStatement) {
+            final JSFile jsFile = createOrGetFirstScriptTag();
+
+            if (jsFile != null) {
+                final PsiElement child = jsFile.getLastChild();
+
+                String text;
+                if (child instanceof PsiWhiteSpace && (text = child.getText()).indexOf("]]>") != -1) {
+                    int cdataAt = 0;
+                    String marker = "<![CDATA[";
+
+                    if ((cdataAt = text.indexOf(marker)) == -1) {
+                        element = jsFile.addBefore(element, child);
+                    }
+                    else {
+                        int markerEnd = cdataAt + marker.length();
+                        ASTNode fromText = JSChangeUtil.createJSTreeFromText(
+                            getProject(),
+                            text.substring(0, markerEnd) + element.getText() + text.substring(markerEnd)
+                        );
+                        jsFile.getNode().replaceAllChildrenToChildrenOf(fromText.getTreeParent());
+                        element = PsiTreeUtil.getParentOfType(jsFile.findElementAt(markerEnd + 1), element.getClass());
+                    }
+                }
+                else {
+                    element = jsFile.add(element);
+                }
+
+                CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(jsFile.getNode(), element.getNode());
+                return element;
+            }
+        }
+
+        return super.add(element);
+    }
+
+    public JSFile createScriptTag() throws IncorrectOperationException {
+        final XmlTag rootTag = getParent();
+
+        if (rootTag != null) {
+            String ns = findScriptNs(rootTag);
+
+            rootTag.add(rootTag.createChildTag(SCRIPT_TAG_NAME, ns, "<![CDATA[\n]]>", false));
+            return findFirstScriptTag();
+        }
+        return null;
+    }
+
+    public static String findScriptNs(XmlTag rootTag) {
+        String ns = rootTag.getNamespace();
+        if (JavaScriptSupportLoader.isFlexMxmFile(rootTag.getContainingFile())) {
+            ns = "";
+            for (String testNs : JavaScriptSupportLoader.MXML_URIS) {
+                if (rootTag.getPrefixByNamespace(testNs) != null) {
+                    ns = testNs;
+                    break;
+                }
+            }
+        }
+        return ns;
+    }
+
+    @Override
+    public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException {
+        if (anchor == null) {
+            return add(element);
+        }
+        return anchor.getParent().addBefore(element, anchor);
+    }
+
+    @Nullable
+    public JSFile findFirstScriptTag() {
+        JSFile[] value = ourCachedScripts.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue();
+        if (value.length > 0) {
+            return value[0];
+        }
+        return null;
+    }
+
+    public JSFile createOrGetFirstScriptTag() throws IncorrectOperationException {
+        JSFile jsFile = findFirstScriptTag();
+
+        if (jsFile == null) {
+            jsFile = createScriptTag();
+        }
+
+        return jsFile;
+    }
+
+    public static XmlTag[] findMxmlSubTags(XmlTag tag, String scriptTagName) {
+        String ns = findScriptNs(tag);
+        return tag.findSubTags(scriptTagName, ns);
+    }
+
+    public static void visitInjectedFiles(XmlFile file, final InjectedFileVisitor visitor) {
+        new InjectedScriptsVisitor(getRootTag(file), true, true, true, visitor).go();
+    }
+
+    public static boolean isInlineComponentTag(XmlTag tag) {
+        return COMPONENT_TAG_NAME.equals(tag.getLocalName()) &&
+            JavaScriptSupportLoader.isMxmlNs(tag.getNamespace()) &&
+            !(tag.getParent() instanceof XmlDocument);
+    }
+
+    public static Collection<XmlBackedJSClassImpl> getChildInlineComponents(XmlTag rootTag, final boolean recursive) {
+        final Collection<XmlBackedJSClassImpl> result = new ArrayList<>();
+        rootTag.processElements(
+            new PsiElementProcessor() {
+                @Override
+                public boolean execute(PsiElement element) {
+                    if (element instanceof XmlTag tag) {
+                        if (isInlineComponentTag(tag)) {
+                            result.add(getXmlBackedClass(tag));
+                            if (recursive) {
+                                tag.processElements(this, null);
+                            }
+                        }
+                        else {
+                            tag.processElements(this, null);
+                        }
+                    }
+                    return true;
+                }
+            },
+            null
+        );
+        return result;
+    }
+
+    public interface InjectedFileVisitor {
+        void visit(XmlTag rootTag, JSFile file);
+    }
+
+    public static class InjectedScriptsVisitor implements PsiElementProcessor {
+        private final boolean myVisitAllTags;
+        private final boolean myVisitAttributes;
+        private final XmlTag myRootTag;
+        private final boolean myVisitInnerComponents;
+        private final InjectedFileVisitor myVisitor;
+
+        public InjectedScriptsVisitor(
+            XmlTag rootTag,
+            boolean visitAllTags,
+            boolean visitAttributes,
+            boolean visitInnerComponents,
+            InjectedFileVisitor visitor
+        ) {
+            myVisitAllTags = visitAllTags;
+            myVisitAttributes = visitAttributes;
+            myRootTag = rootTag;
+            myVisitInnerComponents = visitInnerComponents;
+            myVisitor = visitor;
+        }
+
+        public void go() {
+            myRootTag.processElements(this, null);
+        }
+
+        @Override
+        public boolean execute(final PsiElement element) {
+            if (element instanceof XmlTag) {
+                final XmlTag tag = (XmlTag)element;
+
+                if (myVisitAllTags || SCRIPT_TAG_NAME.equals(tag.getLocalName())) {
+                    final String srcLocation = tag.getAttributeValue("source");
+                    if (srcLocation != null) {
+                        PsiReference ref = findFileReference(tag.getAttribute("source").getValueElement());
+                        if (ref != null) {
+                            final PsiElement psiElement = ref.resolve();
+                            if (psiElement instanceof JSFile) {
+                                psiElement.putUserData(JSResolveUtil.contextKey, tag);
+                                myVisitor.visit(myRootTag, (JSFile)psiElement);
+                            }
+                        }
+                    }
+                    else {
+                        JSResolveUtil.processInjectedFileForTag(tag, new JSResolveUtil.JSInjectedFilesVisitor() {
+                            @Override
+                            protected void process(final JSFile file) {
+                                myVisitor.visit(myRootTag, file);
+                            }
+                        });
+                    }
+                }
+                if (isInlineComponentTag(tag)) {
+                    if (myVisitInnerComponents) {
+                        new InjectedScriptsVisitor(tag, myVisitAllTags, myVisitAttributes, true, myVisitor).go();
+                    }
+                }
+                else {
+                    tag.processElements(this, null);
+                }
+            }
+            if (myVisitAttributes && element instanceof XmlAttribute) {
+                XmlAttributeValue value = ((XmlAttribute)element).getValueElement();
+                if (value != null) {
+                    InjectedLanguageManager.getInstance(element.getProject()).enumerate(
+                        value,
+                        (injectedPsi, places) -> {
+                            if (places.get(0).getHost() instanceof XmlAttributeValue) {
+                                myVisitor.visit(myRootTag, (JSFile)injectedPsi);
+                            }
+                        }
+                    );
+                }
+            }
+            return true;
+        }
+
+        @Nullable
+        private static PsiReference findFileReference(XmlAttributeValue valueElement) {
+            if (valueElement == null) {
+                return null;
+            }
+            PsiReference[] references = valueElement.getReferences();
+            if (references.length > 0) {
+                return references[references.length - 1];
+            }
+            return null;
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
index 519e5582..1650fbbc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
@@ -18,7 +18,6 @@
 
 import com.intellij.lang.javascript.JavaScriptHighlightingLexer;
 import com.intellij.lang.javascript.*;
-import consulo.application.util.function.Processor;
 import consulo.colorScheme.TextAttributesKey;
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import consulo.language.ast.IElementType;
@@ -38,102 +37,92 @@
  * Time: 11:22:04 PM
  */
 @Deprecated
-public class JSHighlighter extends SyntaxHighlighterBase implements JavaScriptSyntaxHighlightKeys
-{
-	private static Map<IElementType, TextAttributesKey> keys1;
-	private static Map<IElementType, TextAttributesKey> keys2;
-	private final DialectOptionHolder myDialectOptionsHolder;
-
-	public JSHighlighter(DialectOptionHolder dialectOptionsHolder)
-	{
-		myDialectOptionsHolder = dialectOptionsHolder;
-	}
-
-	@Override
-	@Nonnull
-	public Lexer getHighlightingLexer()
-	{
-		return new JavaScriptHighlightingLexer(myDialectOptionsHolder);
-	}
-
-
-	static
-	{
-		keys1 = new HashMap<IElementType, TextAttributesKey>();
-		keys2 = new HashMap<IElementType, TextAttributesKey>();
-
-		SyntaxHighlighterBase.fillMap(keys1, JSTokenTypes.OPERATIONS, JS_OPERATION_SIGN); // we do need init OPERATIONS before KEYWORDS because has some
-		// OPERATIONS to be KEYWORDS (is, as)
-		fillMap(keys1, JSTokenTypes.KEYWORDS, JS_KEYWORD);
-
-		keys1.put(StringEscapesTokenTypes.VALID_STRING_ESCAPE_TOKEN, JS_VALID_STRING_ESCAPE);
-		keys1.put(StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN, JS_INVALID_STRING_ESCAPE);
-		keys1.put(StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN, JS_INVALID_STRING_ESCAPE);
-
-		keys1.put(JSTokenTypes.NUMERIC_LITERAL, JS_NUMBER);
-		keys1.put(JSTokenTypes.STRING_LITERAL, JS_STRING);
-		keys1.put(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JS_STRING);
-		keys1.put(JSTokenTypes.REGEXP_LITERAL, JS_REGEXP);
-
-		keys1.put(JSTokenTypes.LPAR, JS_PARENTHS);
-		keys1.put(JSTokenTypes.RPAR, JS_PARENTHS);
-
-		keys1.put(JSTokenTypes.LBRACE, JS_BRACES);
-		keys1.put(JSTokenTypes.RBRACE, JS_BRACES);
-
-		keys1.put(JSTokenTypes.LBRACKET, JS_BRACKETS);
-		keys1.put(JSTokenTypes.RBRACKET, JS_BRACKETS);
-
-		keys1.put(JSTokenTypes.COMMA, JS_COMMA);
-		keys1.put(JSTokenTypes.DOT, JS_DOT);
-		keys1.put(JSTokenTypes.SEMICOLON, JS_SEMICOLON);
-
-		keys1.put(JSTokenTypes.C_STYLE_COMMENT, JS_BLOCK_COMMENT);
-		keys1.put(JSTokenTypes.XML_STYLE_COMMENT, JS_BLOCK_COMMENT);
-		keys1.put(JSTokenTypes.DOC_COMMENT, JS_DOC_COMMENT);
-		keys1.put(JSTokenTypes.END_OF_LINE_COMMENT, JS_LINE_COMMENT);
-		keys1.put(JSTokenTypes.BAD_CHARACTER, JS_BAD_CHARACTER);
-
-		keys1.put(JSDocTokenTypes.DOC_TAG_NAME, JS_DOC_COMMENT);
-		keys2.put(JSDocTokenTypes.DOC_TAG_NAME, JS_DOC_TAG);
-
-		IElementType[] javadoc = IElementType.enumerate(new Processor<IElementType>()
-		{
-			@Override
-			public boolean process(IElementType type)
-			{
-				return type instanceof JSDocElementType;
-			}
-		});
-
-		for(IElementType type : javadoc)
-		{
-			keys1.put(type, JS_DOC_COMMENT);
-		}
-
-		keys1.put(JSTokenTypes.JSDOC_TAG_DATA, JS_DOC_COMMENT);
-
-		for(IElementType type : JSTokenTypes.XML_TOKENS.getTypes())
-		{
-			keys1.put(type, XmlHighlighterColors.XML_TAG);
-		}
-
-		keys2.put(JSTokenTypes.XML_TAG_NAME, XmlHighlighterColors.XML_TAG_NAME);
-		keys2.put(JSTokenTypes.XML_NAME, XmlHighlighterColors.XML_ATTRIBUTE_NAME);
-		keys2.put(JSTokenTypes.XML_ATTR_VALUE, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys2.put(JSTokenTypes.XML_ATTR_VALUE_END, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys2.put(JSTokenTypes.XML_ATTR_VALUE_START, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys2.put(JSTokenTypes.XML_ATTR_EQUAL, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys2.put(JSTokenTypes.XML_ENTITY_REF, XmlHighlighterColors.XML_ENTITY_REFERENCE);
-
-		keys1.put(JSTokenTypes.XML_STYLE_COMMENT, XmlHighlighterColors.XML_COMMENT);
-		keys1.put(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
-	}
-
-	@Override
-	@Nonnull
-	public TextAttributesKey[] getTokenHighlights(IElementType tokenType)
-	{
-		return pack(keys1.get(tokenType), keys2.get(tokenType));
-	}
+public class JSHighlighter extends SyntaxHighlighterBase implements JavaScriptSyntaxHighlightKeys {
+    private static Map<IElementType, TextAttributesKey> keys1;
+    private static Map<IElementType, TextAttributesKey> keys2;
+    private final DialectOptionHolder myDialectOptionsHolder;
+
+    public JSHighlighter(DialectOptionHolder dialectOptionsHolder) {
+        myDialectOptionsHolder = dialectOptionsHolder;
+    }
+
+    @Override
+    @Nonnull
+    public Lexer getHighlightingLexer() {
+        return new JavaScriptHighlightingLexer(myDialectOptionsHolder);
+    }
+
+
+    static {
+        keys1 = new HashMap<>();
+        keys2 = new HashMap<>();
+
+        SyntaxHighlighterBase.fillMap(
+            keys1,
+            JSTokenTypes.OPERATIONS,
+            JS_OPERATION_SIGN
+        ); // we do need init OPERATIONS before KEYWORDS because has some
+        // OPERATIONS to be KEYWORDS (is, as)
+        fillMap(keys1, JSTokenTypes.KEYWORDS, JS_KEYWORD);
+
+        keys1.put(StringEscapesTokenTypes.VALID_STRING_ESCAPE_TOKEN, JS_VALID_STRING_ESCAPE);
+        keys1.put(StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN, JS_INVALID_STRING_ESCAPE);
+        keys1.put(StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN, JS_INVALID_STRING_ESCAPE);
+
+        keys1.put(JSTokenTypes.NUMERIC_LITERAL, JS_NUMBER);
+        keys1.put(JSTokenTypes.STRING_LITERAL, JS_STRING);
+        keys1.put(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JS_STRING);
+        keys1.put(JSTokenTypes.REGEXP_LITERAL, JS_REGEXP);
+
+        keys1.put(JSTokenTypes.LPAR, JS_PARENTHS);
+        keys1.put(JSTokenTypes.RPAR, JS_PARENTHS);
+
+        keys1.put(JSTokenTypes.LBRACE, JS_BRACES);
+        keys1.put(JSTokenTypes.RBRACE, JS_BRACES);
+
+        keys1.put(JSTokenTypes.LBRACKET, JS_BRACKETS);
+        keys1.put(JSTokenTypes.RBRACKET, JS_BRACKETS);
+
+        keys1.put(JSTokenTypes.COMMA, JS_COMMA);
+        keys1.put(JSTokenTypes.DOT, JS_DOT);
+        keys1.put(JSTokenTypes.SEMICOLON, JS_SEMICOLON);
+
+        keys1.put(JSTokenTypes.C_STYLE_COMMENT, JS_BLOCK_COMMENT);
+        keys1.put(JSTokenTypes.XML_STYLE_COMMENT, JS_BLOCK_COMMENT);
+        keys1.put(JSTokenTypes.DOC_COMMENT, JS_DOC_COMMENT);
+        keys1.put(JSTokenTypes.END_OF_LINE_COMMENT, JS_LINE_COMMENT);
+        keys1.put(JSTokenTypes.BAD_CHARACTER, JS_BAD_CHARACTER);
+
+        keys1.put(JSDocTokenTypes.DOC_TAG_NAME, JS_DOC_COMMENT);
+        keys2.put(JSDocTokenTypes.DOC_TAG_NAME, JS_DOC_TAG);
+
+        IElementType[] javadoc = IElementType.enumerate(type -> type instanceof JSDocElementType);
+
+        for (IElementType type : javadoc) {
+            keys1.put(type, JS_DOC_COMMENT);
+        }
+
+        keys1.put(JSTokenTypes.JSDOC_TAG_DATA, JS_DOC_COMMENT);
+
+        for (IElementType type : JSTokenTypes.XML_TOKENS.getTypes()) {
+            keys1.put(type, XmlHighlighterColors.XML_TAG);
+        }
+
+        keys2.put(JSTokenTypes.XML_TAG_NAME, XmlHighlighterColors.XML_TAG_NAME);
+        keys2.put(JSTokenTypes.XML_NAME, XmlHighlighterColors.XML_ATTRIBUTE_NAME);
+        keys2.put(JSTokenTypes.XML_ATTR_VALUE, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        keys2.put(JSTokenTypes.XML_ATTR_VALUE_END, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        keys2.put(JSTokenTypes.XML_ATTR_VALUE_START, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        keys2.put(JSTokenTypes.XML_ATTR_EQUAL, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        keys2.put(JSTokenTypes.XML_ENTITY_REF, XmlHighlighterColors.XML_ENTITY_REFERENCE);
+
+        keys1.put(JSTokenTypes.XML_STYLE_COMMENT, XmlHighlighterColors.XML_COMMENT);
+        keys1.put(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
+    }
+
+    @Override
+    @Nonnull
+    public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
+        return pack(keys1.get(tokenType), keys2.get(tokenType));
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
index 847b64cc..f524df6d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
@@ -31,104 +31,101 @@
  * @author max
  * @since 12:13:05 AM Feb 15, 2005
  */
-public class JavaScriptHighlightingLexer extends LayeredLexer
-{
-	public JavaScriptHighlightingLexer(Supplier<Lexer> baseLexerFactory)
-	{
-		this(baseLexerFactory, true);
-	}
-
-	private JavaScriptHighlightingLexer(Supplier<Lexer> baseLexerFactory, boolean withEmbeddments)
-	{
-		super(baseLexerFactory.get());
-
-		if(withEmbeddments)
-		{
-			registerSelfStoppingLayer(new StringLiteralLexer('\"', JSTokenTypes.STRING_LITERAL, true, "/"), new IElementType[]{JSTokenTypes.STRING_LITERAL},
-					IElementType.EMPTY_ARRAY);
-
-			registerSelfStoppingLayer(new JavaScriptHighlightingLexer(baseLexerFactory, false), new IElementType[]{JSTokenTypes.XML_JS_SCRIPT},
-					IElementType.EMPTY_ARRAY);
-
-			registerSelfStoppingLayer(new StringLiteralLexer('\'', JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, true, "/"),
-					new IElementType[]{JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL}, IElementType.EMPTY_ARRAY);
-
-			final LayeredLexer docLexer = new LayeredLexer(new FlexAdapter(new _JSDocLexer(true)));
-			final Lexer lexer = getHtmlHighlightingLexer();
-
-			// Force html highlighting lexer not to return tag content type since it causes token type collision in javascript embedded to html
-			docLexer.registerLayer(new LexerBase()
-			{
-				final IElementType tagContentType = getTagContentTokenType();
-
-
-				@Override
-				public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState)
-				{
-					lexer.start(buffer, startOffset, endOffset, initialState);
-				}
-
-				@Override
-				public int getState()
-				{
-					return lexer.getState();
-				}
-
-				@Override
-				public IElementType getTokenType()
-				{
-					final IElementType tokenType = lexer.getTokenType();
-					if(tokenType == tagContentType)
-					{
-						return JSTokenTypes.JSDOC_TAG_DATA;
-					}
-					return tokenType;
-				}
-
-				@Override
-				public int getTokenStart()
-				{
-					return lexer.getTokenStart();
-				}
-
-				@Override
-				public int getTokenEnd()
-				{
-					return lexer.getTokenEnd();
-				}
-
-				@Override
-				public void advance()
-				{
-					lexer.advance();
-				}
-
-				@Override
-				public CharSequence getBufferSequence()
-				{
-					return lexer.getBufferSequence();
-				}
-
-
-				@Override
-				public int getBufferEnd()
-				{
-					return lexer.getBufferEnd();
-				}
-			}, JSDocTokenTypes.DOC_COMMENT_DATA);
-			registerSelfStoppingLayer(docLexer, new IElementType[]{JSTokenTypes.DOC_COMMENT}, new IElementType[]{JSDocTokenTypes.DOC_COMMENT_END});
-		}
-	}
-
-	public static IElementType getTagContentTokenType()
-	{
-		final Lexer highlightingLexer = getHtmlHighlightingLexer();
-		highlightingLexer.start("a", 0, 1, 0);
-		return highlightingLexer.getTokenType();
-	}
-
-	private static Lexer getHtmlHighlightingLexer()
-	{
-		return SyntaxHighlighterFactory.getSyntaxHighlighter(HTMLLanguage.INSTANCE, null, null).getHighlightingLexer();
-	}
+public class JavaScriptHighlightingLexer extends LayeredLexer {
+    public JavaScriptHighlightingLexer(Supplier<Lexer> baseLexerFactory) {
+        this(baseLexerFactory, true);
+    }
+
+    private JavaScriptHighlightingLexer(Supplier<Lexer> baseLexerFactory, boolean withEmbeddments) {
+        super(baseLexerFactory.get());
+
+        if (withEmbeddments) {
+            registerSelfStoppingLayer(
+                new StringLiteralLexer('\"', JSTokenTypes.STRING_LITERAL, true, "/"),
+                new IElementType[]{JSTokenTypes.STRING_LITERAL},
+                IElementType.EMPTY_ARRAY
+            );
+
+            registerSelfStoppingLayer(
+                new JavaScriptHighlightingLexer(baseLexerFactory, false),
+                new IElementType[]{JSTokenTypes.XML_JS_SCRIPT},
+                IElementType.EMPTY_ARRAY
+            );
+
+            registerSelfStoppingLayer(new StringLiteralLexer('\'', JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, true, "/"),
+                new IElementType[]{JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL}, IElementType.EMPTY_ARRAY
+            );
+
+            final LayeredLexer docLexer = new LayeredLexer(new FlexAdapter(new _JSDocLexer(true)));
+            final Lexer lexer = getHtmlHighlightingLexer();
+
+            // Force html highlighting lexer not to return tag content type
+            // since it causes token type collision in javascript embedded to html
+            docLexer.registerLayer(
+                new LexerBase() {
+                    final IElementType tagContentType = getTagContentTokenType();
+
+                    @Override
+                    public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState) {
+                        lexer.start(buffer, startOffset, endOffset, initialState);
+                    }
+
+                    @Override
+                    public int getState() {
+                        return lexer.getState();
+                    }
+
+                    @Override
+                    public IElementType getTokenType() {
+                        final IElementType tokenType = lexer.getTokenType();
+                        if (tokenType == tagContentType) {
+                            return JSTokenTypes.JSDOC_TAG_DATA;
+                        }
+                        return tokenType;
+                    }
+
+                    @Override
+                    public int getTokenStart() {
+                        return lexer.getTokenStart();
+                    }
+
+                    @Override
+                    public int getTokenEnd() {
+                        return lexer.getTokenEnd();
+                    }
+
+                    @Override
+                    public void advance() {
+                        lexer.advance();
+                    }
+
+                    @Override
+                    public CharSequence getBufferSequence() {
+                        return lexer.getBufferSequence();
+                    }
+
+                    @Override
+                    public int getBufferEnd() {
+                        return lexer.getBufferEnd();
+                    }
+                },
+                JSDocTokenTypes.DOC_COMMENT_DATA
+            );
+            registerSelfStoppingLayer(
+                docLexer,
+                new IElementType[]{JSTokenTypes.DOC_COMMENT},
+                new IElementType[]{JSDocTokenTypes.DOC_COMMENT_END}
+            );
+        }
+    }
+
+    public static IElementType getTagContentTokenType() {
+        final Lexer highlightingLexer = getHtmlHighlightingLexer();
+        highlightingLexer.start("a", 0, 1, 0);
+        return highlightingLexer.getTokenType();
+    }
+
+    private static Lexer getHtmlHighlightingLexer() {
+        return SyntaxHighlighterFactory.getSyntaxHighlighter(HTMLLanguage.INSTANCE, null, null).getHighlightingLexer();
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index 7500e9f5..f2c24579 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -34,71 +34,60 @@
  * @author Maxim.Mossienko
  * @since 9:55:49 PM Apr 7, 2006
  */
-public class JSItemPresentation implements ItemPresentation
-{
-	private JSNamedElement myElement;
+public class JSItemPresentation implements ItemPresentation {
+    private JSNamedElement myElement;
 
-	public JSItemPresentation(final JSNamedElement elementProxy)
-	{
-		this.myElement = elementProxy;
-	}
+    public JSItemPresentation(final JSNamedElement elementProxy) {
+        this.myElement = elementProxy;
+    }
 
-	@Override
-	public String getPresentableText()
-	{
-		return myElement.getName();
-	}
+    @Override
+    public String getPresentableText() {
+        return myElement.getName();
+    }
 
-	@Override
-	@Nullable
-	public String getLocationString()
-	{
-		final PsiFile psiFile = myElement.getContainingFile();
-		if(myElement instanceof JSVariable || myElement instanceof JSFunction)
-		{
-			PsiElement possibleClazz = JSResolveUtil.findParent(myElement);
+    @Override
+    @Nullable
+    public String getLocationString() {
+        final PsiFile psiFile = myElement.getContainingFile();
+        if (myElement instanceof JSVariable || myElement instanceof JSFunction) {
+            PsiElement possibleClazz = JSResolveUtil.findParent(myElement);
 
-			if(possibleClazz instanceof JSClass)
-			{
-				final StringBuilder presentation = new StringBuilder();
+            if (possibleClazz instanceof JSClass) {
+                final StringBuilder presentation = new StringBuilder();
 
-				presentation.append(((JSClass) possibleClazz).getQualifiedName());
-				presentation.append('(').append(getFileName(psiFile)).append(')');
-				return presentation.toString();
-			}
-		}
-		else if(myElement instanceof JSClass)
-		{
-			final String s = ((JSClass) myElement).getQualifiedName();
-			final int i = s.lastIndexOf('.');
+                presentation.append(((JSClass)possibleClazz).getQualifiedName());
+                presentation.append('(').append(getFileName(psiFile)).append(')');
+                return presentation.toString();
+            }
+        }
+        else if (myElement instanceof JSClass) {
+            final String s = ((JSClass)myElement).getQualifiedName();
+            final int i = s.lastIndexOf('.');
 
-			if(i != -1)
-			{
-				final StringBuilder presentation = new StringBuilder();
+            if (i != -1) {
+                final StringBuilder presentation = new StringBuilder();
 
-				presentation.append(s.substring(0, i));
-				presentation.append('(').append(getFileName(psiFile)).append(')');
-				return presentation.toString();
-			}
-		}
-		return getFileName(psiFile);
-	}
+                presentation.append(s.substring(0, i));
+                presentation.append('(').append(getFileName(psiFile)).append(')');
+                return presentation.toString();
+            }
+        }
+        return getFileName(psiFile);
+    }
 
-	private static String getFileName(final PsiFile psiFile)
-	{
-		final String s = psiFile.getName();
-		if(JSResolveUtil.isPredefinedFile(psiFile))
-		{
-			return s.substring(s.lastIndexOf('/') + 1);
-		}
-		return s;
-	}
+    private static String getFileName(final PsiFile psiFile) {
+        final String s = psiFile.getName();
+        if (JSResolveUtil.isPredefinedFile(psiFile)) {
+            return s.substring(s.lastIndexOf('/') + 1);
+        }
+        return s;
+    }
 
-	@Override
-	@Nullable
-	@RequiredUIAccess
-	public Image getIcon()
-	{
-		return IconDescriptorUpdaters.getIcon(myElement, Iconable.ICON_FLAG_VISIBILITY);
-	}
+    @Override
+    @Nullable
+    @RequiredUIAccess
+    public Image getIcon() {
+        return IconDescriptorUpdaters.getIcon(myElement, Iconable.ICON_FLAG_VISIBILITY);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
index 93dc7484..0b737f85 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
@@ -24,6 +24,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -32,417 +33,340 @@
 /**
  * @by maxim.mossienko, yole
  */
-public class JSSymbolUtil
-{
-	@NonNls
-	private static final String PROTOTYPE_FIELD_NAME = "prototype";
-	@NonNls
-	private static final String J_QUERY_VAR_NAME = "jQuery";
-	@NonNls
-	private static final String FN_FUN_NAME = "fn";
-
-
-	private static JSElement findNameComponent(JSElement expr)
-	{
-		if(expr instanceof JSReferenceExpression)
-		{
-			return expr;
-		}
-		JSElement current = expr;
-
-		while(expr != null)
-		{
-			if(expr instanceof JSReferenceExpression)
-			{
-				return expr;
-			}
-			else if(expr instanceof JSAssignmentExpression)
-			{
-				final JSExpression _lOperand = ((JSAssignmentExpression) expr).getLOperand();
-				if(!(_lOperand instanceof JSDefinitionExpression))
-				{
-					break;
-				}
-				final JSExpression lOperand = ((JSDefinitionExpression) _lOperand).getExpression();
-
-				if(lOperand instanceof JSReferenceExpression)
-				{
-					expr = lOperand;
-					continue;
-				}
-				else
-				{
-					break;
-				}
-			}
-			else if(expr instanceof JSVariable)
-			{
-				return expr;
-			}
-			else if(expr instanceof JSCallExpression)
-			{
-				final JSExpression method = ((JSCallExpression) expr).getMethodExpression();
-				if(method instanceof JSReferenceExpression)
-				{
-					return method;
-				}
-			}
-			else
-			{
-				current = expr;
-			}
-
-			if(current != null)
-			{
-				final PsiElement parent = current.getParent();
-				if(!(parent instanceof JSElement))
-				{
-					break;
-				}
-				if(parent instanceof JSStatement)
-				{
-					break;
-				}
-				expr = (JSElement) parent;
-			}
-		}
-
-		return null;
-	}
-
-	public static String[] buildNameIndexArray(final JSElement _expr)
-	{
-		final List<String> nameComponents = new ArrayList<String>();
-
-		JSElement nameComponent = findNameComponent(_expr);
-		JSReferenceExpression expr = null;
-
-		if(nameComponent instanceof JSVariable)
-		{
-			String varName = nameComponent.getName();
-			if(varName != null)
-			{
-				nameComponents.add(varName);
-			}
-		}
-		else if(nameComponent instanceof JSReferenceExpression)
-		{
-			expr = (JSReferenceExpression) nameComponent;
-		}
-
-		if(expr != null)
-		{
-			final JSReferenceExpression expr1 = expr;
-			visitReferenceExpressionComponentsInRootFirstOrder(expr, new ReferenceExpressionProcessor()
-			{
-
-				@Override
-				public void processExpression(JSReferenceExpression expr)
-				{
-					nameComponents.add(expr.getReferencedName());
-				}
-
-				@Override
-				public void processUnresolvedThis()
-				{
-					nameComponents.add("");
-				}
-
-				@Override
-				public boolean isTopLevel(final JSReferenceExpression expression)
-				{
-					return expr1 == expression;
-				}
-			});
-		}
-
-		return nameComponents.toArray(new String[nameComponents.size()]);
-	}
-
-	interface ReferenceExpressionProcessor
-	{
-		void processExpression(JSReferenceExpression expr);
-
-		void processUnresolvedThis();
-
-		boolean isTopLevel(final JSReferenceExpression expression);
-	}
-
-
-	private static void visitReferenceExpressionComponentsInRootFirstOrder(JSReferenceExpression expr, ReferenceExpressionProcessor processor)
-	{
-		JSExpression qualifier = expr.getQualifier();
-
-		if(qualifier instanceof JSCallExpression)
-		{
-			qualifier = ((JSCallExpression) qualifier).getMethodExpression();
-		}
-
-		if(qualifier instanceof JSIndexedPropertyAccessExpression)
-		{
-			qualifier = ((JSIndexedPropertyAccessExpression) qualifier).getQualifier();
-		}
-
-		if(qualifier instanceof JSReferenceExpression)
-		{
-			visitReferenceExpressionComponentsInRootFirstOrder((JSReferenceExpression) qualifier, processor);
-		}
-
-		if(qualifier instanceof JSThisExpression)
-		{
-			processor.processUnresolvedThis();
-		}
-
-		final String refName = expr.getReferencedName();
-
-		if(refName != null && (!refName.equals(PROTOTYPE_FIELD_NAME) || processor.isTopLevel(expr)))
-		{
-			processor.processExpression(expr);
-		}
-	}
-
-	private static JSReferenceExpression evaluateInitializedPrototype(final JSExpression initializer)
-	{
-		JSReferenceExpression initializedPrototype = null;
-
-		if(initializer instanceof JSReferenceExpression && PROTOTYPE_FIELD_NAME.equals(((JSReferenceExpression) initializer).getReferencedName()))
-		{
-			final JSExpression qualifier = ((JSReferenceExpression) initializer).getQualifier();
-			if(qualifier instanceof JSReferenceExpression)
-			{
-				initializedPrototype = (JSReferenceExpression) qualifier;
-			}
-		}
-		else if(initializer instanceof JSAssignmentExpression)
-		{
-			JSExpression initializerlOperand = ((JSAssignmentExpression) initializer).getLOperand();
-			if(initializerlOperand instanceof JSDefinitionExpression)
-			{
-				JSExpression lOperand = ((JSDefinitionExpression) initializerlOperand).getExpression();
-				initializedPrototype = evaluateInitializedPrototype(lOperand);
-			}
-		}
-		return initializedPrototype;
-	}
-
-	public static JSReferenceExpression findReferenceExpressionUsedForClassExtending(JSReferenceExpression lOperand)
-	{
-		return findReferenceExpressionUsedForClassExtending(lOperand, null);
-	}
-
-	private static JSReferenceExpression findReferenceExpressionUsedForClassExtending(JSReferenceExpression lOperand, @Nullable Set<String> visited)
-	{
-		JSReferenceExpression originalExpr = lOperand;
-		final ResolveProcessor processor = new ResolveProcessor(lOperand.getText(), true);
-		processor.setLocalResolve(true);
-		final PsiElement parent = lOperand.getParent();
-		JSResolveUtil.treeWalkUp(processor, lOperand, parent, lOperand);
-
-		PsiElement jsElement = processor.getResult();
-		if(jsElement == null && parent instanceof JSDefinitionExpression)
-		{
-			jsElement = (JSElement) parent;
-		}
-
-		if(jsElement instanceof JSVariable)
-		{
-			final JSExpression initialization = ((JSVariable) jsElement).getInitializer();
-			final JSReferenceExpression expression = initialization != null ? evaluateInitializedPrototype(initialization) : null;
-
-			if(expression != null)
-			{
-				lOperand = expression;
-			}
-			else if(initialization instanceof JSReferenceExpression)
-			{
-				lOperand = (JSReferenceExpression) initialization;
-			}
-		}
-		else
-		{
-			final PsiElement parentJsElement = jsElement != null ? jsElement.getParent() : null;
-
-			if(jsElement instanceof JSDefinitionExpression && parentJsElement instanceof JSAssignmentExpression)
-			{ // new expression also could mean something extension !
-				JSExpression rOperand = ((JSAssignmentExpression) parentJsElement).getROperand();
-
-				if(rOperand instanceof JSCallExpression && !(rOperand instanceof JSNewExpression))
-				{
-					final JSArgumentList list = ((JSCallExpression) rOperand).getArgumentList();
-
-					if(list != null)
-					{
-						final JSExpression[] jsExpressions = list.getArguments();
-
-						if(jsExpressions.length >= 2 &&
-								jsExpressions[0] instanceof JSReferenceExpression &&
-								jsExpressions[1] instanceof JSReferenceExpression)
-						{
-							lOperand = (JSReferenceExpression) jsExpressions[0];
-						}
-					}
-				}
-				else if(rOperand instanceof JSReferenceExpression)
-				{
-					final JSReferenceExpression expression = evaluateInitializedPrototype(rOperand);
-
-					if(expression != null)
-					{
-						lOperand = expression;
-					}
-					else
-					{
-						lOperand = (JSReferenceExpression) rOperand;
-					}
-				}
-			}
-		}
-		return lOperand != originalExpr ? replaceLocalVars(lOperand, visited) : lOperand;
-	}
-
-	private static JSReferenceExpression replaceLocalVars(final JSReferenceExpression expression, @Nullable Set<String> visited)
-	{
-		JSReferenceExpression expr = expression;
-		JSExpression qualifier = expr.getQualifier();
-
-		JSFunction func = PsiTreeUtil.getParentOfType(expression, JSFunction.class);
-		if(func == null)
-		{
-			return expression;
-		}
-
-		while(qualifier instanceof JSReferenceExpression)
-		{
-			expr = (JSReferenceExpression) qualifier;
-			qualifier = expr.getQualifier();
-		}
-
-		if(qualifier == null)
-		{
-			final PsiElement ref = JSResolveUtil.getLocalVariableRef(func, expr);
-
-			if(ref instanceof JSVariable && !(ref instanceof JSParameter))
-			{
-				final JSExpression initializer = ((JSVariable) ref).getInitializer();
-
-				if(initializer instanceof JSReferenceExpression)
-				{
-					return replaceExpression(expression, expr, (JSReferenceExpression) initializer);
-				}
-				else if(expr != expression)
-				{
-					if(visited == null)
-					{
-						visited = new HashSet<String>();
-					}
-					final String replaced = expr.getText();
-
-					if(!visited.contains(replaced))
-					{
-						visited.add(replaced);
-						return replaceExpression(expression, expr, findReferenceExpressionUsedForClassExtending(expr, visited));
-					}
-				}
-				else
-				{
-					return findReferenceExpressionUsedForClassExtending(expr, visited);
-				}
-			}
-		}
-		return expression;
-	}
-
-	private static JSReferenceExpression replaceExpression(final JSReferenceExpression expression, final JSReferenceExpression what,
-			final JSReferenceExpression by)
-	{
-		if(expression == what)
-		{
-			return by;
-		}
-		int offsetOfExprInExpression = what.getTextOffset() - expression.getTextOffset();
-		final JSReferenceExpression copyOfExpr = (JSReferenceExpression) expression.copy();
-		final JSReferenceExpression expressionToReplace = PsiTreeUtil.getParentOfType(copyOfExpr.findElementAt(offsetOfExprInExpression),
-				JSReferenceExpression.class);
-		expressionToReplace.replace(by);
-		return copyOfExpr;
-	}
-
-	public static JSElement findQualifyingExpressionFromArgumentList(final JSArgumentList parent)
-	{
-		PsiElement firstParent = parent.getParent();
-		final PsiElement grandParent = firstParent.getParent();
-
-		if(grandParent instanceof JSVariable)
-		{
-			return (JSElement) grandParent;
-		}
-
-		if(grandParent instanceof JSAssignmentExpression)
-		{
-			JSExpression jsExpression = ((JSAssignmentExpression) grandParent).getLOperand();
-			JSExpression assignedTo = jsExpression instanceof JSDefinitionExpression ? ((JSDefinitionExpression) jsExpression).getExpression() : null;
-			if(assignedTo instanceof JSReferenceExpression)
-			{
-				return assignedTo;
-			}
-		}
-		if(grandParent instanceof JSExpressionStatement && firstParent instanceof JSCallExpression)
-		{
-			JSExpression methodExpression = ((JSCallExpression) firstParent).getMethodExpression();
-			String methodName = methodExpression instanceof JSReferenceExpression ? ((JSReferenceExpression) methodExpression).getReferencedName() : null;
-
-			if("each".equals(methodName) || "extend".equals(methodName))
-			{
-				JSExpression expression = ((JSReferenceExpression) methodExpression).getQualifier();
-
-				if(expression instanceof JSReferenceExpression)
-				{
-					JSReferenceExpression qualifierExpr = (JSReferenceExpression) expression;
-
-					if(FN_FUN_NAME.equals(qualifierExpr.getReferencedName()))
-					{
-						expression = qualifierExpr.getQualifier();
-					}
-				}
-				if(expression != null && J_QUERY_VAR_NAME.equals(expression.getText()))
-				{
-					return expression;
-				}
-			}
-			else if("implement".equals(methodName))
-			{
-				JSExpression qualifier = ((JSReferenceExpression) methodExpression).getQualifier();
-				if(qualifier instanceof JSReferenceExpression && parent.getArguments().length == 1)
-				{
-					return qualifier;
-				}
-			}
-		}
-
-		JSExpression[] jsExpressions = parent.getArguments();
-		for(int i = 0; i < jsExpressions.length; ++i)
-		{
-			final JSExpression expr = jsExpressions[i];
-
-			if(expr instanceof JSReferenceExpression || (expr instanceof JSLiteralExpression && !expr.textContains(' ') && expr.getTextLength() < 100))
-			{
-				return expr;
-			}
-			else if(expr instanceof JSCallExpression)
-			{
-				final JSArgumentList argumentList = ((JSCallExpression) expr).getArgumentList();
-				if(argumentList != null)
-				{
-					jsExpressions = argumentList.getArguments();
-					i = -1;
-				}
-			}
-			else if(expr instanceof JSArrayLiteralExpression)
-			{
-				jsExpressions = ((JSArrayLiteralExpression) expr).getExpressions();
-				i = -1;
-			}
-		}
-		return null;
-	}
+public class JSSymbolUtil {
+    @NonNls
+    private static final String PROTOTYPE_FIELD_NAME = "prototype";
+    @NonNls
+    private static final String J_QUERY_VAR_NAME = "jQuery";
+    @NonNls
+    private static final String FN_FUN_NAME = "fn";
+
+
+    private static JSElement findNameComponent(JSElement expr) {
+        if (expr instanceof JSReferenceExpression) {
+            return expr;
+        }
+        JSElement current = expr;
+
+        while (expr != null) {
+            if (expr instanceof JSReferenceExpression) {
+                return expr;
+            }
+            else if (expr instanceof JSAssignmentExpression) {
+                final JSExpression _lOperand = ((JSAssignmentExpression)expr).getLOperand();
+                if (!(_lOperand instanceof JSDefinitionExpression)) {
+                    break;
+                }
+                final JSExpression lOperand = ((JSDefinitionExpression)_lOperand).getExpression();
+
+                if (lOperand instanceof JSReferenceExpression) {
+                    expr = lOperand;
+                    continue;
+                }
+                else {
+                    break;
+                }
+            }
+            else if (expr instanceof JSVariable) {
+                return expr;
+            }
+            else if (expr instanceof JSCallExpression) {
+                final JSExpression method = ((JSCallExpression)expr).getMethodExpression();
+                if (method instanceof JSReferenceExpression) {
+                    return method;
+                }
+            }
+            else {
+                current = expr;
+            }
+
+            if (current != null) {
+                final PsiElement parent = current.getParent();
+                if (!(parent instanceof JSElement)) {
+                    break;
+                }
+                if (parent instanceof JSStatement) {
+                    break;
+                }
+                expr = (JSElement)parent;
+            }
+        }
+
+        return null;
+    }
+
+    public static String[] buildNameIndexArray(final JSElement _expr) {
+        final List<String> nameComponents = new ArrayList<>();
+
+        JSElement nameComponent = findNameComponent(_expr);
+        JSReferenceExpression expr = null;
+
+        if (nameComponent instanceof JSVariable) {
+            String varName = nameComponent.getName();
+            if (varName != null) {
+                nameComponents.add(varName);
+            }
+        }
+        else if (nameComponent instanceof JSReferenceExpression) {
+            expr = (JSReferenceExpression)nameComponent;
+        }
+
+        if (expr != null) {
+            final JSReferenceExpression expr1 = expr;
+            visitReferenceExpressionComponentsInRootFirstOrder(expr, new ReferenceExpressionProcessor() {
+
+                @Override
+                public void processExpression(JSReferenceExpression expr) {
+                    nameComponents.add(expr.getReferencedName());
+                }
+
+                @Override
+                public void processUnresolvedThis() {
+                    nameComponents.add("");
+                }
+
+                @Override
+                public boolean isTopLevel(final JSReferenceExpression expression) {
+                    return expr1 == expression;
+                }
+            });
+        }
+
+        return nameComponents.toArray(new String[nameComponents.size()]);
+    }
+
+    interface ReferenceExpressionProcessor {
+        void processExpression(JSReferenceExpression expr);
+
+        void processUnresolvedThis();
+
+        boolean isTopLevel(final JSReferenceExpression expression);
+    }
+
+
+    private static void visitReferenceExpressionComponentsInRootFirstOrder(
+        JSReferenceExpression expr,
+        ReferenceExpressionProcessor processor
+    ) {
+        JSExpression qualifier = expr.getQualifier();
+
+        if (qualifier instanceof JSCallExpression callExpression) {
+            qualifier = callExpression.getMethodExpression();
+        }
+
+        if (qualifier instanceof JSIndexedPropertyAccessExpression indexedPropertyAccessExpression) {
+            qualifier = indexedPropertyAccessExpression.getQualifier();
+        }
+
+        if (qualifier instanceof JSReferenceExpression referenceExpression) {
+            visitReferenceExpressionComponentsInRootFirstOrder(referenceExpression, processor);
+        }
+
+        if (qualifier instanceof JSThisExpression) {
+            processor.processUnresolvedThis();
+        }
+
+        final String refName = expr.getReferencedName();
+
+        if (refName != null && (!refName.equals(PROTOTYPE_FIELD_NAME) || processor.isTopLevel(expr))) {
+            processor.processExpression(expr);
+        }
+    }
+
+    private static JSReferenceExpression evaluateInitializedPrototype(final JSExpression initializer) {
+        JSReferenceExpression initializedPrototype = null;
+
+        if (initializer instanceof JSReferenceExpression initializerRefExpr
+            && PROTOTYPE_FIELD_NAME.equals(initializerRefExpr.getReferencedName())
+            && initializerRefExpr.getQualifier() instanceof JSReferenceExpression qualifierRefExpr) {
+            initializedPrototype = qualifierRefExpr;
+        }
+        else if (initializer instanceof JSAssignmentExpression initializerAssignmentExpr
+            && initializerAssignmentExpr.getLOperand() instanceof JSDefinitionExpression lOperandDefExpr) {
+            initializedPrototype = evaluateInitializedPrototype(lOperandDefExpr.getExpression());
+        }
+        return initializedPrototype;
+    }
+
+    public static JSReferenceExpression findReferenceExpressionUsedForClassExtending(JSReferenceExpression lOperand) {
+        return findReferenceExpressionUsedForClassExtending(lOperand, null);
+    }
+
+    private static JSReferenceExpression findReferenceExpressionUsedForClassExtending(
+        JSReferenceExpression lOperand,
+        @Nullable Set<String> visited
+    ) {
+        JSReferenceExpression originalExpr = lOperand;
+        final ResolveProcessor processor = new ResolveProcessor(lOperand.getText(), true);
+        processor.setLocalResolve(true);
+        final PsiElement parent = lOperand.getParent();
+        JSResolveUtil.treeWalkUp(processor, lOperand, parent, lOperand);
+
+        PsiElement jsElement = processor.getResult();
+        if (jsElement == null && parent instanceof JSDefinitionExpression parentDefExpr) {
+            jsElement = parentDefExpr;
+        }
+
+        if (jsElement instanceof JSVariable variable) {
+            final JSExpression initialization = variable.getInitializer();
+            final JSReferenceExpression expression = initialization != null ? evaluateInitializedPrototype(initialization) : null;
+
+            if (expression != null) {
+                lOperand = expression;
+            }
+            else if (initialization instanceof JSReferenceExpression initializationRefExpr) {
+                lOperand = initializationRefExpr;
+            }
+        }
+        else {
+            final PsiElement parentJsElement = jsElement != null ? jsElement.getParent() : null;
+
+            // new expression also could mean something extension !
+            if (jsElement instanceof JSDefinitionExpression
+                && jsElement.getParent() instanceof JSAssignmentExpression parentAssignExpr) {
+                JSExpression rOperand = parentAssignExpr.getROperand();
+
+                if (rOperand instanceof JSCallExpression callExpression && !(rOperand instanceof JSNewExpression)) {
+                    final JSArgumentList list = callExpression.getArgumentList();
+
+                    if (list != null) {
+                        final JSExpression[] jsExpressions = list.getArguments();
+
+                        if (jsExpressions.length >= 2
+                            && jsExpressions[0] instanceof JSReferenceExpression
+                            && jsExpressions[1] instanceof JSReferenceExpression) {
+                            lOperand = (JSReferenceExpression)jsExpressions[0];
+                        }
+                    }
+                }
+                else if (rOperand instanceof JSReferenceExpression rOperandRefExpr) {
+                    final JSReferenceExpression expression = evaluateInitializedPrototype(rOperand);
+                    lOperand = expression != null ? expression : rOperandRefExpr;
+                }
+            }
+        }
+        return lOperand != originalExpr ? replaceLocalVars(lOperand, visited) : lOperand;
+    }
+
+    private static JSReferenceExpression replaceLocalVars(final JSReferenceExpression expression, @Nullable Set<String> visited) {
+        JSReferenceExpression expr = expression;
+        JSExpression qualifier = expr.getQualifier();
+
+        JSFunction func = PsiTreeUtil.getParentOfType(expression, JSFunction.class);
+        if (func == null) {
+            return expression;
+        }
+
+        while (qualifier instanceof JSReferenceExpression qualifierRefExpr) {
+            expr = qualifierRefExpr;
+            qualifier = expr.getQualifier();
+        }
+
+        if (qualifier == null) {
+            final PsiElement ref = JSResolveUtil.getLocalVariableRef(func, expr);
+
+            if (ref instanceof JSVariable variable && !(ref instanceof JSParameter)) {
+                final JSExpression initializer = variable.getInitializer();
+
+                if (initializer instanceof JSReferenceExpression initializerRefExpr) {
+                    return replaceExpression(expression, expr, initializerRefExpr);
+                }
+                else if (expr != expression) {
+                    if (visited == null) {
+                        visited = new HashSet<>();
+                    }
+                    final String replaced = expr.getText();
+
+                    if (!visited.contains(replaced)) {
+                        visited.add(replaced);
+                        return replaceExpression(expression, expr, findReferenceExpressionUsedForClassExtending(expr, visited));
+                    }
+                }
+                else {
+                    return findReferenceExpressionUsedForClassExtending(expr, visited);
+                }
+            }
+        }
+        return expression;
+    }
+
+    private static JSReferenceExpression replaceExpression(
+        final JSReferenceExpression expression,
+        final JSReferenceExpression what,
+        final JSReferenceExpression by
+    ) {
+        if (expression == what) {
+            return by;
+        }
+        int offsetOfExprInExpression = what.getTextOffset() - expression.getTextOffset();
+        final JSReferenceExpression copyOfExpr = (JSReferenceExpression)expression.copy();
+        final JSReferenceExpression expressionToReplace = PsiTreeUtil.getParentOfType(
+            copyOfExpr.findElementAt(offsetOfExprInExpression),
+            JSReferenceExpression.class
+        );
+        expressionToReplace.replace(by);
+        return copyOfExpr;
+    }
+
+    public static JSElement findQualifyingExpressionFromArgumentList(final JSArgumentList parent) {
+        PsiElement firstParent = parent.getParent();
+        final PsiElement grandParent = firstParent.getParent();
+
+        if (grandParent instanceof JSVariable variable) {
+            return variable;
+        }
+
+        if (grandParent instanceof JSAssignmentExpression assignExpr) {
+            JSExpression jsExpression = assignExpr.getLOperand();
+            JSExpression assignedTo = jsExpression instanceof JSDefinitionExpression defExpr ? defExpr.getExpression() : null;
+            if (assignedTo instanceof JSReferenceExpression) {
+                return assignedTo;
+            }
+        }
+        if (grandParent instanceof JSExpressionStatement && firstParent instanceof JSCallExpression call) {
+            JSExpression methodExpression = call.getMethodExpression();
+            String methodName = methodExpression instanceof JSReferenceExpression methodRefExpr ? methodRefExpr.getReferencedName() : null;
+
+            if ("each".equals(methodName) || "extend".equals(methodName)) {
+                JSExpression expression = ((JSReferenceExpression)methodExpression).getQualifier();
+
+                if (expression instanceof JSReferenceExpression qualifierExpr) {
+                    if (FN_FUN_NAME.equals(qualifierExpr.getReferencedName())) {
+                        expression = qualifierExpr.getQualifier();
+                    }
+                }
+                if (expression != null && J_QUERY_VAR_NAME.equals(expression.getText())) {
+                    return expression;
+                }
+            }
+            else if ("implement".equals(methodName)) {
+                JSExpression qualifier = ((JSReferenceExpression)methodExpression).getQualifier();
+                if (qualifier instanceof JSReferenceExpression && parent.getArguments().length == 1) {
+                    return qualifier;
+                }
+            }
+        }
+
+        JSExpression[] jsExpressions = parent.getArguments();
+        for (int i = 0; i < jsExpressions.length; ++i) {
+            final JSExpression expr = jsExpressions[i];
+
+            if (expr instanceof JSReferenceExpression
+                || (expr instanceof JSLiteralExpression && !expr.textContains(' ') && expr.getTextLength() < 100)) {
+                return expr;
+            }
+            else if (expr instanceof JSCallExpression call) {
+                final JSArgumentList argumentList = call.getArgumentList();
+                if (argumentList != null) {
+                    jsExpressions = argumentList.getArguments();
+                    i = -1;
+                }
+            }
+            else if (expr instanceof JSArrayLiteralExpression arrayLiteral) {
+                jsExpressions = arrayLiteral.getExpressions();
+                i = -1;
+            }
+        }
+        return null;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
index 37ae97a7..67e72ae7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSTypeEvaluateManager.java
@@ -21,63 +21,48 @@
 /**
  * @author Maxim.Mossienko
  */
-public class JSTypeEvaluateManager
-{
-	public static boolean isArrayType(String s)
-	{
-		if(s == null)
-		{
-			return false;
-		}
-		return s.endsWith("[]") ||
-				s.indexOf('[') != -1 ||
-				s.startsWith("Vector") && s.indexOf('<') != -1;
-	}
+public class JSTypeEvaluateManager {
+    public static boolean isArrayType(String s) {
+        if (s == null) {
+            return false;
+        }
+        return s.endsWith("[]") || s.indexOf('[') != -1
+            || s.startsWith("Vector") && s.indexOf('<') != -1;
+    }
 
-	public static String getComponentType(String s)
-	{
-		if(s.endsWith("[]"))
-		{
-			return s.substring(0, s.length() - 2);
-		}
-		else
-		{
-			int i = s.indexOf('[');
-			if(i != -1)
-			{
-				return s.substring(i + 1);
-			}
-			else if(s.startsWith("Vector"))
-			{
-				i = s.indexOf('<');
-				int i2 = s.lastIndexOf('>');
-				if(i2 == -1)
-				{
-					i2 = s.length();
-				}
-				if(i != -1 && i2 != -1 && i2 > i)
-				{
-					return s.substring(i + 1, i2);
-				}
-			}
-		}
-		return s;
-	}
+    public static String getComponentType(String s) {
+        if (s.endsWith("[]")) {
+            return s.substring(0, s.length() - 2);
+        }
+        else {
+            int i = s.indexOf('[');
+            if (i != -1) {
+                return s.substring(i + 1);
+            }
+            else if (s.startsWith("Vector")) {
+                i = s.indexOf('<');
+                int i2 = s.lastIndexOf('>');
+                if (i2 == -1) {
+                    i2 = s.length();
+                }
+                if (i != -1 && i2 != -1 && i2 > i) {
+                    return s.substring(i + 1, i2);
+                }
+            }
+        }
+        return s;
+    }
 
-	public static String getInstanceNameByType(String className)
-	{
-		if("Document".equals(className))
-		{
-			return "HTMLDocument";
-		}
-		if("Element".equals(className))
-		{
-			return BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME;
-		}
-		if("DOMNode".equalsIgnoreCase(className))
-		{
-			return BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME;
-		}
-		return className;
-	}
+    public static String getInstanceNameByType(String className) {
+        if ("Document".equals(className)) {
+            return "HTMLDocument";
+        }
+        if ("Element".equals(className)) {
+            return BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME;
+        }
+        if ("DOMNode".equalsIgnoreCase(className)) {
+            return BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME;
+        }
+        return className;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
index 7f76b24b..83d0debf 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
@@ -23,22 +23,18 @@
  * @author maxim, yole
  */
 @Deprecated
-public final class JavaScriptIndex
-{
-	public static final String ECMASCRIPT_JS2 = "ECMAScript.js2";
+public final class JavaScriptIndex {
+    public static final String ECMASCRIPT_JS2 = "ECMAScript.js2";
 
-	public static boolean isFromPredefinedFile(final PsiFile containingFile)
-	{
-		return false;
-	}
+    public static boolean isFromPredefinedFile(final PsiFile containingFile) {
+        return false;
+    }
 
-	public static PsiElement findSymbolByFileAndNameAndOffset(final String fileName, final String name, final int offset)
-	{
-		return null;
-	}
+    public static PsiElement findSymbolByFileAndNameAndOffset(final String fileName, final String name, final int offset) {
+        return null;
+    }
 
-	public static PsiElement findSymbolWithNameAndOffsetInEntry(final String nameId, final int offset)
-	{
-		return null;
-	}
+    public static PsiElement findSymbolWithNameAndOffsetInEntry(final String nameId, final int offset) {
+        return null;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index bb16d770..9746a0e4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -49,445 +49,383 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.Collections;
 import java.util.Set;
 
 /**
  * @author Maxim.Mossienko
  */
-public abstract class BaseCreateFix implements LocalQuickFix
-{
-	private static final String ANY_TYPE = "*";
-	private static final String SCRIPT_TAG_NAME = "Script";
-
-	@Override
-	@RequiredReadAction
-	public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor)
-	{
-		final PsiElement psiElement = descriptor.getPsiElement();
-		PsiFile file = psiElement.getContainingFile();
-		PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
-		Set<JavaScriptFeature> features = JavaScriptVersionUtil.getFeatures(psiElement);
-
-		JSReferenceExpression referenceExpression = (JSReferenceExpression) psiElement.getParent();
-		final JSExpression qualifier = referenceExpression.getQualifier();
-		PsiElement predefinedAnchor = null;
-
-		boolean classFeature = features.contains(JavaScriptFeature.CLASS);
-		if(qualifier != null && classFeature)
-		{
-			PsiElement type = getType(qualifier, file, features);
-			if(type == null)
-			{
-				return; // can not resolve
-			}
-
-			if(type.isWritable())
-			{
-				if(type instanceof XmlBackedJSClassImpl)
-				{
-					type = type.getParent().getContainingFile();
-				}
-				final PsiElement element = JSResolveUtil.unwrapProxy(type);
-
-				if(element instanceof JSClass)
-				{
-					file = type.getContainingFile();
-					realFile = file;
-					predefinedAnchor = element.getLastChild().getPrevSibling();
-				}
-				else if(element instanceof XmlFile)
-				{
-					file = type.getContainingFile();
-					realFile = file;
-					predefinedAnchor = element;
-				}
-			}
-		}
-
-		Editor editor = getEditor(project, realFile);
-		if(editor == null)
-		{
-			return;
-		}
-
-		PsiElement anchor = predefinedAnchor != null ? predefinedAnchor : JSUtils.findStatementAnchor(referenceExpression, file);
-		boolean insertAtEnd = false;
-		PsiElement anchorParent = null;
-
-		String prefix = "";
-		String suffix = "";
-
-		if(anchor != null && classFeature)
-		{
-			anchorParent = anchor.getParent();
-			while(anchorParent != null && !(anchorParent instanceof JSClass) && !(anchorParent instanceof JSFile))
-			{
-				anchor = anchorParent;
-				anchorParent = anchor.getParent();
-			}
-
-			insertAtEnd = anchorParent instanceof JSClass;
-
-			XmlFile contextFile = null;
-			if(anchorParent instanceof JSFile && anchorParent.getContext() != null)
-			{
-				final PsiElement context = anchorParent.getContext();
-				if(context instanceof XmlAttributeValue || context instanceof XmlText && !(SCRIPT_TAG_NAME.equals(((XmlTag) context.getParent()).getLocalName())))
-				{
-					contextFile = (XmlFile) context.getContainingFile();
-				}
-			}
-			else if(realFile instanceof XmlFile)
-			{
-				contextFile = (XmlFile) realFile;
-			}
-
-			if(contextFile != null)
-			{
-				final XmlTag rootTag = contextFile.getDocument().getRootTag();
-				JSClass jsClass = XmlBackedJSClassImpl.getXmlBackedClass(rootTag);
-				JSFile jsFile = ((XmlBackedJSClassImpl) jsClass).findFirstScriptTag();
-
-				if(jsFile != null)
-				{
-					anchor = jsFile.getFirstChild();
-					while(anchor instanceof PsiWhiteSpace || anchor instanceof PsiComment || anchor instanceof JSImportStatement)
-					{
-						PsiElement nextSibling = anchor.getNextSibling();
-						if(nextSibling == null)
-						{
-							break;
-						}
-						anchor = nextSibling;
-					}
-				}
-				else
-				{
-					jsFile = ((XmlBackedJSClassImpl) jsClass).createScriptTag();
-					Document document = PsiDocumentManager.getInstance(file.getProject()).getDocument(contextFile.getContainingFile());
-					PsiDocumentManager.getInstance(file.getProject()).doPostponedOperationsAndUnblockDocument(document);
-					anchor = PsiTreeUtil.firstChild(jsFile.getContext());
-					insertAtEnd = true;
-				}
-			}
-		}
-
-		if(anchor != null)
-		{
-			final TemplateManager templateManager = TemplateManager.getInstance(project);
-			Template template = templateManager.createTemplate("", "");
-
-			if(prefix.length() > 0)
-			{
-				template.addTextSegment(prefix);
-			}
-			if(insertAtEnd)
-			{
-				template.addTextSegment("\n");
-			}
-			template.setToReformat(true);
-
-			boolean isStatic = false;
-			if(classFeature)
-			{
-				if(qualifier != null)
-				{
-					if(qualifier instanceof JSReferenceExpression)
-					{
-						PsiElement qualifierResolve = ((JSReferenceExpression) qualifier).resolve();
-
-						if(qualifierResolve instanceof JSClass || qualifierResolve instanceof XmlFile)
-						{
-							isStatic = true;
-						}
-					}
-				}
-				else
-				{
-					JSAttributeListOwner attributeListOwner = PsiTreeUtil.getNonStrictParentOfType(psiElement, JSAttributeListOwner.class);
-					if(attributeListOwner instanceof JSVariable)
-					{
-						PsiElement grandParent = JSResolveUtil.findParent(attributeListOwner);
-
-						if(!(grandParent instanceof JSFile) && !(grandParent instanceof JSClass))
-						{
-							attributeListOwner = PsiTreeUtil.getNonStrictParentOfType(grandParent, JSAttributeListOwner.class);
-						}
-					}
-					if(attributeListOwner != null)
-					{
-						JSAttributeList attributeList = attributeListOwner.getAttributeList();
-						if(attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC))
-						{
-							isStatic = true;
-						}
-					}
-				}
-			}
-
-			int cdataStartOffset = 0, at;
-			if(!insertAtEnd && anchor instanceof PsiWhiteSpace && (at = anchor.getText().indexOf("<![CDATA[")) != -1)
-			{
-				cdataStartOffset += at + "<!CDATA[".length() + 1;
-				template.addTextSegment("\n");
-			}
-
-			buildTemplate(template, referenceExpression, features, isStatic, file, anchorParent);
-			if(!insertAtEnd)
-			{
-				template.addTextSegment("\n");
-			}
-
-			if(suffix.length() > 0)
-			{
-				template.addTextSegment(suffix);
-			}
-
-			if(!insertAtEnd && anchor instanceof PsiWhiteSpace && anchor.textToCharArray()[0] == '\n' && anchor.getPrevSibling() instanceof PsiComment)
-			{
-				insertAtEnd = true;
-			}
-
-			final TextRange anchorRange = anchor.getTextRange();
-			int offset = insertAtEnd ? anchorRange.getEndOffset() : anchorRange.getStartOffset();
-
-			if(file != realFile || file instanceof XmlFile)
-			{
-				final PsiFile anchorContainingFile = anchor.getContainingFile();
-				final PsiElement anchorFileContext = anchorContainingFile.getContext();
-
-				if(anchorFileContext != null)
-				{
-					if(anchorFileContext instanceof XmlText)
-					{
-						if(cdataStartOffset != 0)
-						{ //
-							offset += cdataStartOffset;
-						}
-						else
-						{
-							offset += ((XmlText) anchorFileContext).displayToPhysical(0);
-						}
-					}
-					offset += anchorFileContext.getTextOffset();
-				}
-			}
-			editor.getCaretModel().moveToOffset(offset);
-			templateManager.startTemplate(editor, template);
-		}
-	}
-
-	@Nullable
-	public static Editor getEditor(final Project project, final PsiFile realFile)
-	{
-		if(!FileModificationService.getInstance().prepareFileForWrite(realFile))
-		{
-			return null;
-		}
-
-		return FileEditorManager.getInstance(project).openTextEditor(OpenFileDescriptorFactory.getInstance(project).builder(realFile.getVirtualFile()).build(), true);
-	}
-
-	@RequiredReadAction
-	protected abstract void buildTemplate(final Template template,
-										  JSReferenceExpression referenceExpression,
-										  Set<JavaScriptFeature> features,
-										  boolean staticContext,
-										  PsiFile file,
-										  PsiElement anchorParent);
-
-	private static String getTypeOfValue(final JSExpression passedParameterValue, final PsiFile file, Set<JavaScriptFeature> features)
-	{
-		final PsiElement type = getType(passedParameterValue, file, features);
-		return type != null ? type instanceof JSClass ? ((JSClass) type).getQualifiedName() : ((PsiNamedElement) type).getName() : ANY_TYPE;
-	}
-
-	@RequiredReadAction
-	static PsiElement getType(final JSExpression passedParameterValue, final PsiFile file, Set<JavaScriptFeature> features)
-	{
-		if(passedParameterValue instanceof JSReferenceExpression)
-		{
-			JavaScriptType type = passedParameterValue.getType();
-
-			PsiElement targetElement = type.getTargetElement();
-			if(targetElement instanceof JSClass)
-			{
-				return targetElement;
-			}
-		}
-		return null;
-	}
-
-	protected static JSExpression addAccessModifier(final Template template, final JSReferenceExpression referenceExpression, final boolean ecma, boolean staticContext)
-	{
-		final JSExpression qualifier = referenceExpression.getQualifier();
-
-		if(ecma)
-		{
-			if((qualifier == null || qualifier instanceof JSThisExpression))
-			{
-				template.addTextSegment("private ");
-			}
-			if(staticContext)
-			{
-				template.addTextSegment("static ");
-			}
-		}
-		return qualifier;
-	}
-
-	private int uniqueCounter;
-
-	protected void addCompletionVar(final Template template)
-	{
-		final Expression paramTypeExpr = new MacroCallNode(MacroFactory.createMacro("complete"));
-		template.addVariable("__Type" + (uniqueCounter++), paramTypeExpr, paramTypeExpr, true);
-	}
-
-	protected void addSemicolonSegment(final Template template, final PsiFile file)
-	{
-		final String semicolon = JSChangeUtil.getSemicolon(file.getProject());
-		if(semicolon.length() > 0)
-		{
-			template.addTextSegment(semicolon);
-		}
-	}
-
-	public static void guessExprTypeAndAddSuchVariable(final JSExpression passedParameterValue, final Template template, final String var1, final PsiFile file, final Set<JavaScriptFeature> features)
-	{
-		String type = getTypeOfValue(passedParameterValue, file, features);
-
-		if(ApplicationManager.getApplication().isUnitTestMode())
-		{
-			template.addTextSegment(type);
-		}
-		else
-		{
-			final MyExpression paramTypeExpr = new MyExpression(type);
-			template.addVariable(var1 + "Type", paramTypeExpr, paramTypeExpr, true);
-		}
-	}
-
-	protected void guessTypeAndAddTemplateVariable(Template template, JSExpression referenceExpression, PsiFile file)
-	{
-		String type = null;
-		PsiElement elementForWhichExprTypeToEvaluate = null;
-		PsiElement parent = referenceExpression.getParent();
-		boolean isCall = false;
-
-		if(parent instanceof JSCallExpression)
-		{
-			isCall = true;
-			parent = parent.getParent();
-		}
-
-		if(parent instanceof JSDefinitionExpression)
-		{
-			PsiElement grandParent = parent.getParent();
-
-			if(grandParent instanceof JSAssignmentExpression)
-			{
-				elementForWhichExprTypeToEvaluate = ((JSAssignmentExpression) grandParent).getROperand();
-			}
-		}
-		else if(parent instanceof JSReturnStatement)
-		{
-			final JSFunction fun = PsiTreeUtil.getParentOfType(referenceExpression, JSFunction.class);
-
-			if(fun != null)
-			{
-				final String typeString = fun.getReturnTypeString();
-
-				if(typeString != null)
-				{
-					type = typeString;
-				}
-			}
-		}
-		else if(parent instanceof JSExpressionStatement && isCall)
-		{
-			type = "void";
-		}
-		else if(parent instanceof JSVariable)
-		{
-			type = ((JSVariable) parent).getTypeString();
-		}
-		else if(parent instanceof JSArgumentList)
-		{
-			JSParameter parameter = JSResolveUtil.findParameterForUsedArgument(isCall ? (JSExpression) referenceExpression.getParent() : referenceExpression, (JSArgumentList) parent);
-			if(parameter != null)
-			{
-				type = parameter.getTypeString();
-			}
-		}
-		else if(parent instanceof JSAssignmentExpression)
-		{
-			JSExpression lOperand = ((JSAssignmentExpression) parent).getLOperand();
-			if(lOperand != null)
-			{
-				type = getTypeOfValue(lOperand, file, Collections.singleton(JavaScriptFeature.CLASS));
-			}
-		}
-
-		String expressionType = elementForWhichExprTypeToEvaluate instanceof JSExpression ? JSResolveUtil.getExpressionType((JSExpression) elementForWhichExprTypeToEvaluate, file) : null;
-		if(expressionType != null && !expressionType.equals("*"))
-		{
-			type = expressionType;
-		}
-		if(type == null)
-		{
-			addCompletionVar(template);
-		}
-		else
-		{
-			MyExpression expression = new MyExpression(type);
-			template.addVariable("__type" + referenceExpression.getText(), expression, expression, true);
-		}
-	}
-
-	@Nullable
-	protected static JSClass findClass(PsiFile file, final PsiElement anchorParent)
-	{
-		if(anchorParent instanceof JSClass)
-		{
-			return (JSClass) anchorParent;
-		}
-
-		if(file instanceof JSFile)
-		{
-			return JSResolveUtil.getXmlBackedClass((JSFile) file);
-		}
-		return null;
-	}
-
-	public static class MyExpression extends Expression
-	{
-		TextResult result;
-		private final String myVar1;
-
-		public MyExpression(final String var1)
-		{
-			myVar1 = var1;
-			result = new TextResult(myVar1);
-		}
-
-		@Override
-		public Result calculateResult(ExpressionContext context)
-		{
-			return result;
-		}
-
-		@Override
-		public Result calculateQuickResult(ExpressionContext context)
-		{
-			return result;
-		}
-
-		@Override
-		public LookupElement[] calculateLookupItems(ExpressionContext context)
-		{
-			return LookupItem.EMPTY_ARRAY;
-		}
-	}
+public abstract class BaseCreateFix implements LocalQuickFix {
+    private static final String ANY_TYPE = "*";
+    private static final String SCRIPT_TAG_NAME = "Script";
+
+    @Override
+    @RequiredReadAction
+    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+        final PsiElement psiElement = descriptor.getPsiElement();
+        PsiFile file = psiElement.getContainingFile();
+        PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
+        Set<JavaScriptFeature> features = JavaScriptVersionUtil.getFeatures(psiElement);
+
+        JSReferenceExpression referenceExpression = (JSReferenceExpression)psiElement.getParent();
+        final JSExpression qualifier = referenceExpression.getQualifier();
+        PsiElement predefinedAnchor = null;
+
+        boolean classFeature = features.contains(JavaScriptFeature.CLASS);
+        if (qualifier != null && classFeature) {
+            PsiElement type = getType(qualifier, file, features);
+            if (type == null) {
+                return; // can not resolve
+            }
+
+            if (type.isWritable()) {
+                if (type instanceof XmlBackedJSClassImpl) {
+                    type = type.getParent().getContainingFile();
+                }
+                final PsiElement element = JSResolveUtil.unwrapProxy(type);
+
+                if (element instanceof JSClass) {
+                    file = type.getContainingFile();
+                    realFile = file;
+                    predefinedAnchor = element.getLastChild().getPrevSibling();
+                }
+                else if (element instanceof XmlFile) {
+                    file = type.getContainingFile();
+                    realFile = file;
+                    predefinedAnchor = element;
+                }
+            }
+        }
+
+        Editor editor = getEditor(project, realFile);
+        if (editor == null) {
+            return;
+        }
+
+        PsiElement anchor = predefinedAnchor != null ? predefinedAnchor : JSUtils.findStatementAnchor(referenceExpression, file);
+        boolean insertAtEnd = false;
+        PsiElement anchorParent = null;
+
+        String prefix = "";
+        String suffix = "";
+
+        if (anchor != null && classFeature) {
+            anchorParent = anchor.getParent();
+            while (anchorParent != null && !(anchorParent instanceof JSClass) && !(anchorParent instanceof JSFile)) {
+                anchor = anchorParent;
+                anchorParent = anchor.getParent();
+            }
+
+            insertAtEnd = anchorParent instanceof JSClass;
+
+            XmlFile contextFile = null;
+            if (anchorParent instanceof JSFile && anchorParent.getContext() != null) {
+                final PsiElement context = anchorParent.getContext();
+                if (context instanceof XmlAttributeValue
+                    || context instanceof XmlText && !(SCRIPT_TAG_NAME.equals(((XmlTag)context.getParent()).getLocalName()))) {
+                    contextFile = (XmlFile)context.getContainingFile();
+                }
+            }
+            else if (realFile instanceof XmlFile xmlFile) {
+                contextFile = xmlFile;
+            }
+
+            if (contextFile != null) {
+                final XmlTag rootTag = contextFile.getDocument().getRootTag();
+                JSClass jsClass = XmlBackedJSClassImpl.getXmlBackedClass(rootTag);
+                JSFile jsFile = ((XmlBackedJSClassImpl)jsClass).findFirstScriptTag();
+
+                if (jsFile != null) {
+                    anchor = jsFile.getFirstChild();
+                    while (anchor instanceof PsiWhiteSpace || anchor instanceof PsiComment || anchor instanceof JSImportStatement) {
+                        PsiElement nextSibling = anchor.getNextSibling();
+                        if (nextSibling == null) {
+                            break;
+                        }
+                        anchor = nextSibling;
+                    }
+                }
+                else {
+                    jsFile = ((XmlBackedJSClassImpl)jsClass).createScriptTag();
+                    Document document = PsiDocumentManager.getInstance(file.getProject()).getDocument(contextFile.getContainingFile());
+                    PsiDocumentManager.getInstance(file.getProject()).doPostponedOperationsAndUnblockDocument(document);
+                    anchor = PsiTreeUtil.firstChild(jsFile.getContext());
+                    insertAtEnd = true;
+                }
+            }
+        }
+
+        if (anchor != null) {
+            final TemplateManager templateManager = TemplateManager.getInstance(project);
+            Template template = templateManager.createTemplate("", "");
+
+            if (prefix.length() > 0) {
+                template.addTextSegment(prefix);
+            }
+            if (insertAtEnd) {
+                template.addTextSegment("\n");
+            }
+            template.setToReformat(true);
+
+            boolean isStatic = false;
+            if (classFeature) {
+                if (qualifier != null) {
+                    if (qualifier instanceof JSReferenceExpression qualifierRefExpr) {
+                        PsiElement qualifierResolve = qualifierRefExpr.resolve();
+
+                        if (qualifierResolve instanceof JSClass || qualifierResolve instanceof XmlFile) {
+                            isStatic = true;
+                        }
+                    }
+                }
+                else {
+                    JSAttributeListOwner attributeListOwner = PsiTreeUtil.getNonStrictParentOfType(psiElement, JSAttributeListOwner.class);
+                    if (attributeListOwner instanceof JSVariable) {
+                        PsiElement grandParent = JSResolveUtil.findParent(attributeListOwner);
+
+                        if (!(grandParent instanceof JSFile) && !(grandParent instanceof JSClass)) {
+                            attributeListOwner = PsiTreeUtil.getNonStrictParentOfType(grandParent, JSAttributeListOwner.class);
+                        }
+                    }
+                    if (attributeListOwner != null) {
+                        JSAttributeList attributeList = attributeListOwner.getAttributeList();
+                        if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
+                            isStatic = true;
+                        }
+                    }
+                }
+            }
+
+            int cdataStartOffset = 0, at;
+            if (!insertAtEnd && anchor instanceof PsiWhiteSpace && (at = anchor.getText().indexOf("<![CDATA[")) != -1) {
+                cdataStartOffset += at + "<!CDATA[".length() + 1;
+                template.addTextSegment("\n");
+            }
+
+            buildTemplate(template, referenceExpression, features, isStatic, file, anchorParent);
+            if (!insertAtEnd) {
+                template.addTextSegment("\n");
+            }
+
+            if (suffix.length() > 0) {
+                template.addTextSegment(suffix);
+            }
+
+            if (!insertAtEnd
+                && anchor instanceof PsiWhiteSpace
+                && anchor.textToCharArray()[0] == '\n'
+                && anchor.getPrevSibling() instanceof PsiComment) {
+                insertAtEnd = true;
+            }
+
+            final TextRange anchorRange = anchor.getTextRange();
+            int offset = insertAtEnd ? anchorRange.getEndOffset() : anchorRange.getStartOffset();
+
+            if (file != realFile || file instanceof XmlFile) {
+                final PsiFile anchorContainingFile = anchor.getContainingFile();
+                final PsiElement anchorFileContext = anchorContainingFile.getContext();
+
+                if (anchorFileContext != null) {
+                    if (anchorFileContext instanceof XmlText xmlText) {
+                        if (cdataStartOffset != 0) { //
+                            offset += cdataStartOffset;
+                        }
+                        else {
+                            offset += xmlText.displayToPhysical(0);
+                        }
+                    }
+                    offset += anchorFileContext.getTextOffset();
+                }
+            }
+            editor.getCaretModel().moveToOffset(offset);
+            templateManager.startTemplate(editor, template);
+        }
+    }
+
+    @Nullable
+    public static Editor getEditor(final Project project, final PsiFile realFile) {
+        if (!FileModificationService.getInstance().prepareFileForWrite(realFile)) {
+            return null;
+        }
+
+        return FileEditorManager.getInstance(project)
+            .openTextEditor(OpenFileDescriptorFactory.getInstance(project).builder(realFile.getVirtualFile()).build(), true);
+    }
+
+    @RequiredReadAction
+    protected abstract void buildTemplate(
+        final Template template,
+        JSReferenceExpression referenceExpression,
+        Set<JavaScriptFeature> features,
+        boolean staticContext,
+        PsiFile file,
+        PsiElement anchorParent
+    );
+
+    private static String getTypeOfValue(final JSExpression passedParameterValue, final PsiFile file, Set<JavaScriptFeature> features) {
+        final PsiElement type = getType(passedParameterValue, file, features);
+        return type != null ? type instanceof JSClass jsClass ? jsClass.getQualifiedName() : ((PsiNamedElement)type).getName() : ANY_TYPE;
+    }
+
+    @RequiredReadAction
+    static PsiElement getType(final JSExpression passedParameterValue, final PsiFile file, Set<JavaScriptFeature> features) {
+        if (passedParameterValue instanceof JSReferenceExpression) {
+            JavaScriptType type = passedParameterValue.getType();
+
+            PsiElement targetElement = type.getTargetElement();
+            if (targetElement instanceof JSClass) {
+                return targetElement;
+            }
+        }
+        return null;
+    }
+
+    protected static JSExpression addAccessModifier(
+        final Template template,
+        final JSReferenceExpression referenceExpression,
+        final boolean ecma,
+        boolean staticContext
+    ) {
+        final JSExpression qualifier = referenceExpression.getQualifier();
+
+        if (ecma) {
+            if ((qualifier == null || qualifier instanceof JSThisExpression)) {
+                template.addTextSegment("private ");
+            }
+            if (staticContext) {
+                template.addTextSegment("static ");
+            }
+        }
+        return qualifier;
+    }
+
+    private int uniqueCounter;
+
+    protected void addCompletionVar(final Template template) {
+        final Expression paramTypeExpr = new MacroCallNode(MacroFactory.createMacro("complete"));
+        template.addVariable("__Type" + (uniqueCounter++), paramTypeExpr, paramTypeExpr, true);
+    }
+
+    protected void addSemicolonSegment(final Template template, final PsiFile file) {
+        final String semicolon = JSChangeUtil.getSemicolon(file.getProject());
+        if (semicolon.length() > 0) {
+            template.addTextSegment(semicolon);
+        }
+    }
+
+    public static void guessExprTypeAndAddSuchVariable(
+        final JSExpression passedParameterValue,
+        final Template template,
+        final String var1,
+        final PsiFile file,
+        final Set<JavaScriptFeature> features
+    ) {
+        String type = getTypeOfValue(passedParameterValue, file, features);
+
+        if (ApplicationManager.getApplication().isUnitTestMode()) {
+            template.addTextSegment(type);
+        }
+        else {
+            final MyExpression paramTypeExpr = new MyExpression(type);
+            template.addVariable(var1 + "Type", paramTypeExpr, paramTypeExpr, true);
+        }
+    }
+
+    protected void guessTypeAndAddTemplateVariable(Template template, JSExpression referenceExpression, PsiFile file) {
+        String type = null;
+        PsiElement elementForWhichExprTypeToEvaluate = null;
+        PsiElement parent = referenceExpression.getParent();
+        boolean isCall = false;
+
+        if (parent instanceof JSCallExpression) {
+            isCall = true;
+            parent = parent.getParent();
+        }
+
+        if (parent instanceof JSDefinitionExpression) {
+            PsiElement grandParent = parent.getParent();
+
+            if (grandParent instanceof JSAssignmentExpression assignment) {
+                elementForWhichExprTypeToEvaluate = assignment.getROperand();
+            }
+        }
+        else if (parent instanceof JSReturnStatement) {
+            final JSFunction fun = PsiTreeUtil.getParentOfType(referenceExpression, JSFunction.class);
+
+            if (fun != null) {
+                final String typeString = fun.getReturnTypeString();
+
+                if (typeString != null) {
+                    type = typeString;
+                }
+            }
+        }
+        else if (parent instanceof JSExpressionStatement && isCall) {
+            type = "void";
+        }
+        else if (parent instanceof JSVariable variable) {
+            type = variable.getTypeString();
+        }
+        else if (parent instanceof JSArgumentList argumentList) {
+            JSParameter parameter = JSResolveUtil.findParameterForUsedArgument(
+                isCall ? (JSExpression)referenceExpression.getParent() : referenceExpression,
+                argumentList
+            );
+            if (parameter != null) {
+                type = parameter.getTypeString();
+            }
+        }
+        else if (parent instanceof JSAssignmentExpression assignment) {
+            JSExpression lOperand = assignment.getLOperand();
+            if (lOperand != null) {
+                type = getTypeOfValue(lOperand, file, Collections.singleton(JavaScriptFeature.CLASS));
+            }
+        }
+
+        String expressionType = elementForWhichExprTypeToEvaluate instanceof JSExpression expression
+            ? JSResolveUtil.getExpressionType(expression, file) : null;
+        if (expressionType != null && !expressionType.equals("*")) {
+            type = expressionType;
+        }
+        if (type == null) {
+            addCompletionVar(template);
+        }
+        else {
+            MyExpression expression = new MyExpression(type);
+            template.addVariable("__type" + referenceExpression.getText(), expression, expression, true);
+        }
+    }
+
+    @Nullable
+    protected static JSClass findClass(PsiFile file, final PsiElement anchorParent) {
+        return anchorParent instanceof JSClass jsClass ? jsClass
+            : file instanceof JSFile jsFile ? JSResolveUtil.getXmlBackedClass(jsFile)
+            : null;
+    }
+
+    public static class MyExpression extends Expression {
+        TextResult result;
+        private final String myVar1;
+
+        public MyExpression(final String var1) {
+            myVar1 = var1;
+            result = new TextResult(myVar1);
+        }
+
+        @Override
+        public Result calculateResult(ExpressionContext context) {
+            return result;
+        }
+
+        @Override
+        public Result calculateQuickResult(ExpressionContext context) {
+            return result;
+        }
+
+        @Override
+        public LookupElement[] calculateLookupItems(ExpressionContext context) {
+            return LookupItem.EMPTY_ARRAY;
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index 3e17cb49..e2f59f3a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -32,97 +32,91 @@
 
 import java.util.Set;
 
-public class CreateJSFunctionOrMethodFix extends CreateJSFunctionFixBase
-{
-	protected final boolean myIsMethod;
-
-	public CreateJSFunctionOrMethodFix(String name, boolean isMethod)
-	{
-		super(
-			isMethod 
-				? JavaScriptLocalize.javascriptCreateMethodIntentionName(name) 
-				: JavaScriptLocalize.javascriptCreateFunctionIntentionName(name)
-		);
-		myIsMethod = isMethod;
-	}
-
-	@Override
-	protected void writeFunctionAndName(Template template, String createdMethodName, Set<JavaScriptFeature> features)
-	{
-		boolean ecma = features.contains(JavaScriptFeature.CLASS);
-		if(!myIsMethod || ecma)
-		{
-			template.addTextSegment("function ");
-		}
-		template.addTextSegment(createdMethodName);
-		if(myIsMethod && !ecma)
-		{
-			template.addTextSegment(" = function ");
-		}
-	}
-
-	@Override
-	protected void addParameters(Template template, JSReferenceExpression referenceExpression, PsiFile file, Set<JavaScriptFeature> features)
-	{
-		JSCallExpression methodInvokation = (JSCallExpression) referenceExpression.getParent();
-		final JSArgumentList list = methodInvokation.getArgumentList();
-		final JSExpression[] expressions = list.getArguments();
-		int paramCount = expressions.length;
-
-		for(int i = 0; i < paramCount; ++i)
-		{
-			if(i != 0)
-			{
-				template.addTextSegment(", ");
-			}
-			String var = null;
-
-			final JSExpression passedParameterValue = expressions[i];
-			if(passedParameterValue instanceof JSReferenceExpression)
-			{
-				var = ((JSReferenceExpression) passedParameterValue).getReferencedName();
-			}
-
-			if(var == null || var.length() == 0)
-			{
-				var = "param" + (i != 0 ? Integer.toString(i + 1) : "");
-			}
-
-			final String var1 = var;
-			Expression expression = new MyExpression(var1);
-
-			template.addVariable(var, expression, expression, true);
-			if(features.contains(JavaScriptFeature.CLASS))
-			{
-				template.addTextSegment(":");
-				BaseCreateFix.guessExprTypeAndAddSuchVariable(passedParameterValue, template, var1, file, features);
-			}
-		}
-
-	}
-
-	@Override
-	protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile file)
-	{
-		guessTypeAndAddTemplateVariable(template, referenceExpression, file);
-	}
-
-	@Override
-	protected void addBody(Template template, JSReferenceExpression refExpr, PsiFile file)
-	{
-		template.addEndVariable();
-	}
-
-	@RequiredReadAction
-	@Override
-	protected void buildTemplate(final Template template, JSReferenceExpression referenceExpression, Set<JavaScriptFeature> features, boolean staticContext,
-			PsiFile file, PsiElement anchorParent)
-	{
-		super.buildTemplate(template, referenceExpression, features, staticContext, file, anchorParent);
-
-		if(myIsMethod && !features.contains(JavaScriptFeature.CLASS))
-		{
-			addSemicolonSegment(template, file);
-		}
-	}
+public class CreateJSFunctionOrMethodFix extends CreateJSFunctionFixBase {
+    protected final boolean myIsMethod;
+
+    public CreateJSFunctionOrMethodFix(String name, boolean isMethod) {
+        super(
+            isMethod
+                ? JavaScriptLocalize.javascriptCreateMethodIntentionName(name)
+                : JavaScriptLocalize.javascriptCreateFunctionIntentionName(name)
+        );
+        myIsMethod = isMethod;
+    }
+
+    @Override
+    protected void writeFunctionAndName(Template template, String createdMethodName, Set<JavaScriptFeature> features) {
+        boolean ecma = features.contains(JavaScriptFeature.CLASS);
+        if (!myIsMethod || ecma) {
+            template.addTextSegment("function ");
+        }
+        template.addTextSegment(createdMethodName);
+        if (myIsMethod && !ecma) {
+            template.addTextSegment(" = function ");
+        }
+    }
+
+    @Override
+    protected void addParameters(
+        Template template,
+        JSReferenceExpression referenceExpression,
+        PsiFile file,
+        Set<JavaScriptFeature> features
+    ) {
+        JSCallExpression methodInvokation = (JSCallExpression)referenceExpression.getParent();
+        final JSArgumentList list = methodInvokation.getArgumentList();
+        final JSExpression[] expressions = list.getArguments();
+        int paramCount = expressions.length;
+
+        for (int i = 0; i < paramCount; ++i) {
+            if (i != 0) {
+                template.addTextSegment(", ");
+            }
+            String var = null;
+
+            final JSExpression passedParameterValue = expressions[i];
+            if (passedParameterValue instanceof JSReferenceExpression parameterRefExpr) {
+                var = parameterRefExpr.getReferencedName();
+            }
+
+            if (var == null || var.length() == 0) {
+                var = "param" + (i != 0 ? Integer.toString(i + 1) : "");
+            }
+
+            final String var1 = var;
+            Expression expression = new MyExpression(var1);
+
+            template.addVariable(var, expression, expression, true);
+            if (features.contains(JavaScriptFeature.CLASS)) {
+                template.addTextSegment(":");
+                BaseCreateFix.guessExprTypeAndAddSuchVariable(passedParameterValue, template, var1, file, features);
+            }
+        }
+    }
+
+    @Override
+    protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile file) {
+        guessTypeAndAddTemplateVariable(template, referenceExpression, file);
+    }
+
+    @Override
+    protected void addBody(Template template, JSReferenceExpression refExpr, PsiFile file) {
+        template.addEndVariable();
+    }
+
+    @RequiredReadAction
+    @Override
+    protected void buildTemplate(
+        final Template template,
+        JSReferenceExpression referenceExpression,
+        Set<JavaScriptFeature> features,
+        boolean staticContext,
+        PsiFile file, PsiElement anchorParent
+    ) {
+        super.buildTemplate(template, referenceExpression, features, staticContext, file, anchorParent);
+
+        if (myIsMethod && !features.contains(JavaScriptFeature.CLASS)) {
+            addSemicolonSegment(template, file);
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
index edc1699b..96dff2ce 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
@@ -25,126 +25,105 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Aug 5, 2008
- *         Time: 3:55:54 PM
+ * Date: Aug 5, 2008
+ * Time: 3:55:54 PM
  */
-public class JSDocParsing
-{
-	public static void parseJSDoc(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker root = builder.mark();
-
-		while(!builder.eof())
-		{
-			final IElementType tokenType = builder.getTokenType();
-
-			if(tokenType == JSDocTokenTypes.DOC_TAG_NAME)
-			{
-				if(parseDocTag(builder))
-				{
-					continue;
-				}
-			}
-
-			builder.advanceLexer();
-		}
-
-		root.done(JSTokenTypes.DOC_COMMENT);
-	}
-
-	private static boolean parseDocTag(final PsiBuilder builder)
-	{
-		assert builder.getTokenType() == JSDocTokenTypes.DOC_TAG_NAME;
-		final PsiBuilder.Marker docTagMarker = builder.mark();
-
-		try
-		{
-			final @NonNls String tagName = builder.getTokenText();
-
-			builder.advanceLexer();
-			if("@param".equals(tagName))
-			{
-
-				if(isInvalidTokenType(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagName());
-					return false;
-				}
-
-				String currentText = builder.getTokenText();
-				if(currentText != null && currentText.startsWith("{"))
-				{
-					createDocTagValue(builder);
-					builder.getTokenType();
-				}
-				builder.advanceLexer();
-				currentText = builder.getTokenText();
-				if(currentText != null)
-				{
-					if(currentText.equals(":"))
-					{
-						builder.advanceLexer();
-					}
-					else if(!currentText.startsWith("{"))
-					{
-						return true;
-					}
-				}
-
-				if(isInvalidTokenType(builder))
-				{
-					return true;
-				}
-			}
-			else
-			{
-				final boolean hasDocTagValue = isToCreateDocTagValue(tagName);
-				if(!hasDocTagValue)
-				{
-					return true;
-				}
-
-				if(isInvalidTokenType(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagValue());
-					return false;
-				}
-			}
-
-			createDocTagValue(builder);
-		}
-		finally
-		{
-			docTagMarker.done(JSDocTokenTypes.DOC_TAG);
-		}
-
-		return true;
-	}
-
-	private static void createDocTagValue(final PsiBuilder builder)
-	{
-		PsiBuilder.Marker marker = builder.mark();
-		builder.advanceLexer();
-		marker.done(JSDocTokenTypes.DOC_TAG_VALUE);
-	}
-
-	private static boolean isInvalidTokenType(final PsiBuilder builder)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		return builder.eof() || tokenType == JSDocTokenTypes.DOC_COMMENT_LEADING_ASTERISK || tokenType == JSDocTokenTypes.DOC_COMMENT_END;
-	}
-
-	private static boolean isToCreateDocTagValue(final @NonNls String tokenText)
-	{
-		return tokenText.equals("@see") ||
-				tokenText.equals("@class") ||
-				tokenText.equals("@member") ||
-				tokenText.equals("@requires") ||
-				tokenText.equals("@type") ||
-				tokenText.equals("@copy") ||
-				tokenText.equals("@extends") ||
-				tokenText.equals("@base") ||
-				tokenText.equals("@base") ||
-				tokenText.equals("@returns");
-	}
+public class JSDocParsing {
+    public static void parseJSDoc(final PsiBuilder builder) {
+        final PsiBuilder.Marker root = builder.mark();
+
+        while (!builder.eof()) {
+            final IElementType tokenType = builder.getTokenType();
+
+            if (tokenType == JSDocTokenTypes.DOC_TAG_NAME) {
+                if (parseDocTag(builder)) {
+                    continue;
+                }
+            }
+
+            builder.advanceLexer();
+        }
+
+        root.done(JSTokenTypes.DOC_COMMENT);
+    }
+
+    private static boolean parseDocTag(final PsiBuilder builder) {
+        assert builder.getTokenType() == JSDocTokenTypes.DOC_TAG_NAME;
+        final PsiBuilder.Marker docTagMarker = builder.mark();
+
+        try {
+            final @NonNls String tagName = builder.getTokenText();
+
+            builder.advanceLexer();
+            if ("@param".equals(tagName)) {
+
+                if (isInvalidTokenType(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagName());
+                    return false;
+                }
+
+                String currentText = builder.getTokenText();
+                if (currentText != null && currentText.startsWith("{")) {
+                    createDocTagValue(builder);
+                    builder.getTokenType();
+                }
+                builder.advanceLexer();
+                currentText = builder.getTokenText();
+                if (currentText != null) {
+                    if (currentText.equals(":")) {
+                        builder.advanceLexer();
+                    }
+                    else if (!currentText.startsWith("{")) {
+                        return true;
+                    }
+                }
+
+                if (isInvalidTokenType(builder)) {
+                    return true;
+                }
+            }
+            else {
+                final boolean hasDocTagValue = isToCreateDocTagValue(tagName);
+                if (!hasDocTagValue) {
+                    return true;
+                }
+
+                if (isInvalidTokenType(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedDocTagValue());
+                    return false;
+                }
+            }
+
+            createDocTagValue(builder);
+        }
+        finally {
+            docTagMarker.done(JSDocTokenTypes.DOC_TAG);
+        }
+
+        return true;
+    }
+
+    private static void createDocTagValue(final PsiBuilder builder) {
+        PsiBuilder.Marker marker = builder.mark();
+        builder.advanceLexer();
+        marker.done(JSDocTokenTypes.DOC_TAG_VALUE);
+    }
+
+    private static boolean isInvalidTokenType(final PsiBuilder builder) {
+        final IElementType tokenType = builder.getTokenType();
+        return builder.eof() || tokenType == JSDocTokenTypes.DOC_COMMENT_LEADING_ASTERISK || tokenType == JSDocTokenTypes.DOC_COMMENT_END;
+    }
+
+    private static boolean isToCreateDocTagValue(final @NonNls String tokenText) {
+        return tokenText.equals("@see") ||
+            tokenText.equals("@class") ||
+            tokenText.equals("@member") ||
+            tokenText.equals("@requires") ||
+            tokenText.equals("@type") ||
+            tokenText.equals("@copy") ||
+            tokenText.equals("@extends") ||
+            tokenText.equals("@base") ||
+            tokenText.equals("@base") ||
+            tokenText.equals("@returns");
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
index bd7ff9ca..49a33183 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
@@ -31,29 +31,24 @@
  * Date: Jan 30, 2005
  * Time: 9:15:02 PM
  */
-public class JSArgumentListImpl extends JSElementImpl implements JSArgumentList
-{
-	public JSArgumentListImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSArgumentListImpl extends JSElementImpl implements JSArgumentList {
+    public JSArgumentListImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression[] getArguments()
-	{
-		return findChildrenByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression[] getArguments() {
+        return findChildrenByClass(JSExpression.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSArgumentList(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSArgumentList(this);
+    }
 
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		PsiElement element = getParent();
-		element.replace(((JSCallExpression) element).getMethodExpression());
-	}
+    @Override
+    public void delete() throws IncorrectOperationException {
+        PsiElement element = getParent();
+        element.replace(((JSCallExpression)element).getMethodExpression());
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
index 7112715f..824f5f61 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
@@ -24,6 +24,7 @@
 import consulo.language.ast.IElementType;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,47 +35,38 @@
  * Time: 11:32:23 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSArrayLiteralExpressionImpl extends JSExpressionImpl implements JSArrayLiteralExpression
-{
-	public JSArrayLiteralExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSArrayLiteralExpressionImpl extends JSExpressionImpl implements JSArrayLiteralExpression {
+    public JSArrayLiteralExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression[] getExpressions()
-	{
-		List<JSExpression> result = new ArrayList<JSExpression>();
-		ASTNode child = getNode().getFirstChildNode();
-		boolean wasExpression = false;
-		while(child != null)
-		{
-			final IElementType type = child.getElementType();
-			if(child.getPsi() instanceof JSExpression)
-			{
-				result.add((JSExpression) child.getPsi());
-				wasExpression = true;
-			}
-			else if(type == JSTokenTypes.COMMA)
-			{
-				if(wasExpression)
-				{
-					wasExpression = false;
-				}
-				else
-				{
-					result.add(null); // Skipped expression like [a,,b]
-				}
-			}
-			child = child.getTreeNext();
-		}
+    @Override
+    public JSExpression[] getExpressions() {
+        List<JSExpression> result = new ArrayList<>();
+        ASTNode child = getNode().getFirstChildNode();
+        boolean wasExpression = false;
+        while (child != null) {
+            final IElementType type = child.getElementType();
+            if (child.getPsi() instanceof JSExpression jsExpression) {
+                result.add(jsExpression);
+                wasExpression = true;
+            }
+            else if (type == JSTokenTypes.COMMA) {
+                if (wasExpression) {
+                    wasExpression = false;
+                }
+                else {
+                    result.add(null); // Skipped expression like [a,,b]
+                }
+            }
+            child = child.getTreeNext();
+        }
 
-		return result.toArray(new JSExpression[result.size()]);
-	}
+        return result.toArray(new JSExpression[result.size()]);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSArrayLiteralExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSArrayLiteralExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
index ec0a6bd9..c6e609d1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
@@ -29,16 +29,13 @@
  * Time: 11:41:42 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSAssignmentExpressionImpl extends JSBinaryExpressionImpl implements JSAssignmentExpression
-{
-	public JSAssignmentExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSAssignmentExpressionImpl extends JSBinaryExpressionImpl implements JSAssignmentExpression {
+    public JSAssignmentExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSAssignmentExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSAssignmentExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index 8f40fa38..b4faca39 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -37,186 +37,158 @@
 /**
  * @by Maxim.Mossienko
  */
-public class JSAttributeImpl extends JSStubElementImpl<JSAttributeStub> implements JSAttribute
-{
-	private PsiReference[] myReferences;
-	private static
-	@NonNls
-	String[] myPossibleMetaData = new String[]{
-			"AccessibilityClass",
-			"ArrayElementType",
-			"Bindable",
-			"DefaultProperty",
-			"Deprecated",
-			"Effect",
-			"Embed",
-			"Event",
-			"Exclude",
-			"ExcludeClass",
-			"IconFile",
-			"Inspectable",
-			"InstanceType",
-			"HostComponent",
-			"NonCommittingChangeEvent",
-			"Frame",
-			"RemoteClass",
-			"ResourceBundle",
-			"Style",
-			"Transient"
-	};
-
-	public JSAttributeImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSAttributeImpl(final JSAttributeStub node)
-	{
-		super(node, JSElementTypes.ATTRIBUTE);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSAttribute(this);
-	}
-
-	@Override
-	public String getName()
-	{
-		final JSAttributeStub attributeStub = getStub();
-		if(attributeStub != null)
-		{
-			return attributeStub.getName();
-		}
-		final ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
-		return node != null ? node.getText() : null;
-	}
-
-	@Override
-	public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException
-	{
-		throw new IncorrectOperationException();
-	}
-
-	@Override
-	public JSAttributeNameValuePair[] getValues()
-	{
-		return getStubOrPsiChildren(JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR, JSAttributeNameValuePair.EMPTY_ARRAY);
-	}
-
-	@Override
-	public JSAttributeNameValuePair getValueByName(final String name)
-	{
-		for(JSAttributeNameValuePair p : getValues())
-		{
-			final String pName = p.getName();
-
-			if((name != null && name.equals(pName)) || (name == null && name == pName))
-			{
-				return p;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public PsiReference[] getReferences()
-	{
-		if(myReferences == null)
-		{
-			final ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
-
-			if(node == null)
-			{
-				myReferences = PsiReference.EMPTY_ARRAY;
-			}
-			else
-			{
-				final int startOffsetInParent = node.getPsi().getStartOffsetInParent();
-				final TextRange range = new TextRange(startOffsetInParent, startOffsetInParent + node.getTextLength());
-
-				myReferences = new PsiReference[]{new AttrNameReference(range)};
-			}
-		}
-
-		return myReferences;
-	}
-
-	private class AttrNameReference implements PsiReference, EmptyResolveMessageProvider
-	{
-		private final TextRange myRange;
-
-		public AttrNameReference(final TextRange range)
-		{
-			myRange = range;
-		}
-
-		@Override
-		public PsiElement getElement()
-		{
-			return JSAttributeImpl.this;
-		}
-
-		@Override
-		public TextRange getRangeInElement()
-		{
-			return myRange;
-		}
-
-		@Override
-		public PsiElement resolve()
-		{
-			final String s = getCanonicalText();
-			return ArrayUtil.indexOf(myPossibleMetaData, s) >= 0 ? JSAttributeImpl.this : null;
-		}
-
-		@Override
-		public String getCanonicalText()
-		{
-			return getName();
-		}
-
-		@Override
-		public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException
-		{
-			return null;
-		}
-
-		@Override
-		public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException
-		{
-			return null;
-		}
-
-		@Override
-		public boolean isReferenceTo(final PsiElement element)
-		{
-			if(element instanceof JSAttribute)
-			{
-				final String name = getName();
-				return name != null && name.equals(((JSAttribute) element).getName());
-			}
-			return false;
-		}
-
-		@Override
-		public Object[] getVariants()
-		{
-			return myPossibleMetaData;
-		}
-
-		@Override
-		public boolean isSoft()
-		{
-			return true;
-		}
-
-		@Nonnull
-		@Override
-		public LocalizeValue buildUnresolvedMessage(@Nonnull String referenceText)
-		{
-			return LocalizeValue.localizeTODO("Unknown metadata tag");
-		}
-	}
+public class JSAttributeImpl extends JSStubElementImpl<JSAttributeStub> implements JSAttribute {
+    private PsiReference[] myReferences;
+    private static
+    @NonNls
+    String[] myPossibleMetaData = new String[]{
+        "AccessibilityClass",
+        "ArrayElementType",
+        "Bindable",
+        "DefaultProperty",
+        "Deprecated",
+        "Effect",
+        "Embed",
+        "Event",
+        "Exclude",
+        "ExcludeClass",
+        "IconFile",
+        "Inspectable",
+        "InstanceType",
+        "HostComponent",
+        "NonCommittingChangeEvent",
+        "Frame",
+        "RemoteClass",
+        "ResourceBundle",
+        "Style",
+        "Transient"
+    };
+
+    public JSAttributeImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSAttributeImpl(final JSAttributeStub node) {
+        super(node, JSElementTypes.ATTRIBUTE);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSAttribute(this);
+    }
+
+    @Override
+    public String getName() {
+        final JSAttributeStub attributeStub = getStub();
+        if (attributeStub != null) {
+            return attributeStub.getName();
+        }
+        final ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return node != null ? node.getText() : null;
+    }
+
+    @Override
+    public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException {
+        throw new IncorrectOperationException();
+    }
+
+    @Override
+    public JSAttributeNameValuePair[] getValues() {
+        return getStubOrPsiChildren(JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR, JSAttributeNameValuePair.EMPTY_ARRAY);
+    }
+
+    @Override
+    public JSAttributeNameValuePair getValueByName(final String name) {
+        for (JSAttributeNameValuePair p : getValues()) {
+            final String pName = p.getName();
+
+            if ((name != null && name.equals(pName)) || (name == null && name == pName)) {
+                return p;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public PsiReference[] getReferences() {
+        if (myReferences == null) {
+            final ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+
+            if (node == null) {
+                myReferences = PsiReference.EMPTY_ARRAY;
+            }
+            else {
+                final int startOffsetInParent = node.getPsi().getStartOffsetInParent();
+                final TextRange range = new TextRange(startOffsetInParent, startOffsetInParent + node.getTextLength());
+
+                myReferences = new PsiReference[]{new AttrNameReference(range)};
+            }
+        }
+
+        return myReferences;
+    }
+
+    private class AttrNameReference implements PsiReference, EmptyResolveMessageProvider {
+        private final TextRange myRange;
+
+        public AttrNameReference(final TextRange range) {
+            myRange = range;
+        }
+
+        @Override
+        public PsiElement getElement() {
+            return JSAttributeImpl.this;
+        }
+
+        @Override
+        public TextRange getRangeInElement() {
+            return myRange;
+        }
+
+        @Override
+        public PsiElement resolve() {
+            final String s = getCanonicalText();
+            return ArrayUtil.indexOf(myPossibleMetaData, s) >= 0 ? JSAttributeImpl.this : null;
+        }
+
+        @Override
+        public String getCanonicalText() {
+            return getName();
+        }
+
+        @Override
+        public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException {
+            return null;
+        }
+
+        @Override
+        public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException {
+            return null;
+        }
+
+        @Override
+        public boolean isReferenceTo(final PsiElement element) {
+            if (element instanceof JSAttribute) {
+                final String name = getName();
+                return name != null && name.equals(((JSAttribute)element).getName());
+            }
+            return false;
+        }
+
+        @Override
+        public Object[] getVariants() {
+            return myPossibleMetaData;
+        }
+
+        @Override
+        public boolean isSoft() {
+            return true;
+        }
+
+        @Nonnull
+        @Override
+        public LocalizeValue buildUnresolvedMessage(@Nonnull String referenceText) {
+            return LocalizeValue.localizeTODO("Unknown metadata tag");
+        }
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
index b90dfa2c..436c0ca5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
@@ -31,159 +31,139 @@
 import jakarta.annotation.Nonnull;
 
 import jakarta.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author  Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
-public class JSAttributeListImpl extends JSStubElementImpl<JSAttributeListStub> implements JSAttributeList
-{
-	private static final TokenSet ourModifiersTypeSet = TokenSet.create(JSTokenTypes.PUBLIC_KEYWORD, JSTokenTypes.PRIVATE_KEYWORD,
-			JSTokenTypes.PROTECTED_KEYWORD, JSTokenTypes.INTERNAL_KEYWORD);
-
-	public JSAttributeListImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSAttributeListImpl(final JSAttributeListStub stub)
-	{
-		super(stub, JSElementTypes.ATTRIBUTE_LIST);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSAttributeList(this);
-	}
-
-	@Override
-	@Nullable
-	public String getNamespace()
-	{
-		final JSAttributeListStub attributeListStub = getStub();
-		if(attributeListStub != null)
-		{
-			return attributeListStub.getNamespace();
-		}
-		final JSReferenceExpression namespaceElement = getNamespaceElement();
-		return namespaceElement != null ? namespaceElement.getText() : null;
-	}
-
-	@Override
-	public JSReferenceExpression getNamespaceElement()
-	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
-		return node != null ? (JSReferenceExpression) node.getPsi() : null;
-	}
-
-	@Override
-	public JSAttribute[] getAttributes()
-	{
-		return getStubOrPsiChildren(JSElementTypes.ATTRIBUTE, JSAttribute.ARRAY_FACTORY);
-	}
-
-	@Nonnull
-	@Override
-	public JSAttribute[] getAttributesByName(final @Nonnull String name)
-	{
-		List<JSAttribute> attributes = null;
-		for(JSAttribute attr : getAttributes())
-		{
-			if(name.equals(attr.getName()))
-			{
-				if(attributes == null)
-				{
-					attributes = new ArrayList<JSAttribute>();
-				}
-				attributes.add(attr);
-			}
-		}
-		return attributes != null ? attributes.toArray(new JSAttribute[attributes.size()]) : JSAttribute.EMPTY_ARRAY;
-	}
-
-	@Override
-	public AccessType getAccessType()
-	{
-		final JSAttributeListStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getAccessType();
-		}
-
-		final ASTNode node = getNode().findChildByType(ourModifiersTypeSet);
-		if(node != null)
-		{
-			final IElementType nodeType = node.getElementType();
-			if(nodeType == JSTokenTypes.PUBLIC_KEYWORD)
-			{
-				return AccessType.PUBLIC;
-			}
-			if(nodeType == JSTokenTypes.PROTECTED_KEYWORD)
-			{
-				return AccessType.PROTECTED;
-			}
-			if(nodeType == JSTokenTypes.PRIVATE_KEYWORD)
-			{
-				return AccessType.PRIVATE;
-			}
-			if(nodeType == JSTokenTypes.INTERNAL_KEYWORD)
-			{
-				return AccessType.PACKAGE_LOCAL;
-			}
-		}
-		return AccessType.PACKAGE_LOCAL;
-	}
-
-	@Override
-	public PsiElement findAccessTypeElement()
-	{
-		final ASTNode modifier = getNode().findChildByType(ourModifiersTypeSet);
-		return modifier != null ? modifier.getPsi() : null;
-	}
-
-	@Override
-	public boolean hasModifier(final ModifierType modifier)
-	{
-		final JSAttributeListStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.hasModifier(modifier);
-		}
-
-		IElementType type = null;
-		switch(modifier)
-		{
-			case DYNAMIC:
-				type = JSTokenTypes.DYNAMIC_KEYWORD;
-				break;
-			case OVERRIDE:
-				type = JSTokenTypes.OVERRIDE_KEYWORD;
-				break;
-			case NATIVE:
-				type = JSTokenTypes.NATIVE_KEYWORD;
-				break;
-			case STATIC:
-				type = JSTokenTypes.STATIC_KEYWORD;
-				break;
-			case FINAL:
-				type = JSTokenTypes.FINAL_KEYWORD;
-				break;
-			case VIRTUAL:
-				type = JSTokenTypes.VIRTUAL_KEYWORD;
-				break;
-		}
-		return type != null && getNode().findChildByType(type) != null;
-	}
-
-	@Override
-	public PsiElement add(@Nonnull final PsiElement element) throws IncorrectOperationException
-	{
-		if(element.getNode().getElementType() == JSTokenTypes.OVERRIDE_KEYWORD)
-		{
-			return JSChangeUtil.doDoAddBefore(this, element, getFirstChild());
-		}
-		return JSChangeUtil.doDoAddAfter(this, element, getLastChild());
-	}
+public class JSAttributeListImpl extends JSStubElementImpl<JSAttributeListStub> implements JSAttributeList {
+    private static final TokenSet ourModifiersTypeSet = TokenSet.create(
+        JSTokenTypes.PUBLIC_KEYWORD,
+        JSTokenTypes.PRIVATE_KEYWORD,
+        JSTokenTypes.PROTECTED_KEYWORD,
+        JSTokenTypes.INTERNAL_KEYWORD
+    );
+
+    public JSAttributeListImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSAttributeListImpl(final JSAttributeListStub stub) {
+        super(stub, JSElementTypes.ATTRIBUTE_LIST);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSAttributeList(this);
+    }
+
+    @Override
+    @Nullable
+    public String getNamespace() {
+        final JSAttributeListStub attributeListStub = getStub();
+        if (attributeListStub != null) {
+            return attributeListStub.getNamespace();
+        }
+        final JSReferenceExpression namespaceElement = getNamespaceElement();
+        return namespaceElement != null ? namespaceElement.getText() : null;
+    }
+
+    @Override
+    public JSReferenceExpression getNamespaceElement() {
+        final ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
+        return node != null ? (JSReferenceExpression)node.getPsi() : null;
+    }
+
+    @Override
+    public JSAttribute[] getAttributes() {
+        return getStubOrPsiChildren(JSElementTypes.ATTRIBUTE, JSAttribute.ARRAY_FACTORY);
+    }
+
+    @Nonnull
+    @Override
+    public JSAttribute[] getAttributesByName(final @Nonnull String name) {
+        List<JSAttribute> attributes = null;
+        for (JSAttribute attr : getAttributes()) {
+            if (name.equals(attr.getName())) {
+                if (attributes == null) {
+                    attributes = new ArrayList<>();
+                }
+                attributes.add(attr);
+            }
+        }
+        return attributes != null ? attributes.toArray(new JSAttribute[attributes.size()]) : JSAttribute.EMPTY_ARRAY;
+    }
+
+    @Override
+    public AccessType getAccessType() {
+        final JSAttributeListStub stub = getStub();
+        if (stub != null) {
+            return stub.getAccessType();
+        }
+
+        final ASTNode node = getNode().findChildByType(ourModifiersTypeSet);
+        if (node != null) {
+            final IElementType nodeType = node.getElementType();
+            if (nodeType == JSTokenTypes.PUBLIC_KEYWORD) {
+                return AccessType.PUBLIC;
+            }
+            if (nodeType == JSTokenTypes.PROTECTED_KEYWORD) {
+                return AccessType.PROTECTED;
+            }
+            if (nodeType == JSTokenTypes.PRIVATE_KEYWORD) {
+                return AccessType.PRIVATE;
+            }
+            if (nodeType == JSTokenTypes.INTERNAL_KEYWORD) {
+                return AccessType.PACKAGE_LOCAL;
+            }
+        }
+        return AccessType.PACKAGE_LOCAL;
+    }
+
+    @Override
+    public PsiElement findAccessTypeElement() {
+        final ASTNode modifier = getNode().findChildByType(ourModifiersTypeSet);
+        return modifier != null ? modifier.getPsi() : null;
+    }
+
+    @Override
+    public boolean hasModifier(final ModifierType modifier) {
+        final JSAttributeListStub stub = getStub();
+        if (stub != null) {
+            return stub.hasModifier(modifier);
+        }
+
+        IElementType type = null;
+        switch (modifier) {
+            case DYNAMIC:
+                type = JSTokenTypes.DYNAMIC_KEYWORD;
+                break;
+            case OVERRIDE:
+                type = JSTokenTypes.OVERRIDE_KEYWORD;
+                break;
+            case NATIVE:
+                type = JSTokenTypes.NATIVE_KEYWORD;
+                break;
+            case STATIC:
+                type = JSTokenTypes.STATIC_KEYWORD;
+                break;
+            case FINAL:
+                type = JSTokenTypes.FINAL_KEYWORD;
+                break;
+            case VIRTUAL:
+                type = JSTokenTypes.VIRTUAL_KEYWORD;
+                break;
+        }
+        return type != null && getNode().findChildByType(type) != null;
+    }
+
+    @Override
+    public PsiElement add(@Nonnull final PsiElement element) throws IncorrectOperationException {
+        if (element.getNode().getElementType() == JSTokenTypes.OVERRIDE_KEYWORD) {
+            return JSChangeUtil.doDoAddBefore(this, element, getFirstChild());
+        }
+        return JSChangeUtil.doDoAddAfter(this, element, getLastChild());
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
index ebac4856..6c16a82e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
@@ -36,157 +36,130 @@
 /**
  * @by Maxim.Mossienko
  */
-public class JSAttributeNameValuePairImpl extends JSStubElementImpl<JSAttributeNameValuePairStub> implements JSAttributeNameValuePair
-{
-	private JSReferenceSet myReferenceSet;
-	@NonNls
-	private static final String EMBED_ANNOTATION_NAME = "Embed";
-
-	public JSAttributeNameValuePairImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSAttributeNameValuePairImpl(final JSAttributeNameValuePairStub node)
-	{
-		super(node, JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSAttributeNameValuePair(this);
-	}
-
-	@Override
-	public String getName()
-	{
-		final JSAttributeNameValuePairStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getName();
-		}
-		final ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
-		return node != null ? node.getText() : null;
-	}
-
-	@Override
-	public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException
-	{
-		throw new IncorrectOperationException();
-	}
-
-	@Override
-	public JSExpression getValue()
-	{
-		final ASTNode astNode = findValueNode();
-		return astNode != null ? (JSExpression) astNode.getPsi() : null;
-	}
-
-	@Override
-	public String getSimpleValue()
-	{
-		final JSAttributeNameValuePairStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getValue();
-		}
-		final ASTNode expression = findValueNode();
-		return expression != null ? StringUtil.stripQuotesAroundValue(expression.getText()) : null;
-	}
-
-	private ASTNode findValueNode()
-	{
-		return getNode().findChildByType(JavaScriptTokenSets.STRING_LITERALS);
-	}
-
-	@Override
-	@Nonnull
-	public PsiReference[] getReferences()
-	{
-		final @NonNls String name = getName();
-
-		if("source".equals(name))
-		{
-			return getPathRefsCheckingParent();
-		}
-		else if("type".equals(name) || "arrayType".equals(name))
-		{
-			return getClassRefs();
-		}
-		else if(name == null)
-		{
-			return getDefaultPropertyRefs();
-		}
-		return PsiReference.EMPTY_ARRAY;
-	}
-
-	private PsiReference[] getClassRefs()
-	{
-		final ASTNode valueNode = findValueNode();
-
-		if(valueNode != null)
-		{
-			if(myReferenceSet == null)
-			{
-				myReferenceSet = new JSReferenceSet(this, false);
-			}
-			myReferenceSet.update(valueNode.getText(), valueNode.getPsi().getStartOffsetInParent());
-			return myReferenceSet.getReferences();
-		}
-		return PsiReference.EMPTY_ARRAY;
-	}
-
-	private PsiReference[] getDefaultPropertyRefs()
-	{
-		final @NonNls String parentName = ((JSAttribute) getParent()).getName();
-
-		if("HostComponent".equals(parentName) || "ArrayElementType".equals(parentName))
-		{
-			return getClassRefs();
-		}
-
-		if(EMBED_ANNOTATION_NAME.equals(parentName))
-		{
-			return getPathRefs();
-		}
-		if("DefaultProperty".equals(parentName))
-		{
-			final ASTNode valueNode = findValueNode();
-			if(valueNode != null)
-			{
-				if(myReferenceSet == null)
-				{
-					myReferenceSet = new JSReferenceSet(this, false);
-				}
-				myReferenceSet.update(valueNode.getText(), valueNode.getPsi().getStartOffsetInParent());
-				return myReferenceSet.getReferences();
-			}
-		}
-
-		return PsiReference.EMPTY_ARRAY;
-	}
-
-	private PsiReference[] getPathRefsCheckingParent()
-	{
-		final @NonNls String parentName = ((JSAttribute) getParent()).getName();
-
-		if(!EMBED_ANNOTATION_NAME.equals(parentName))
-		{
-			return PsiReference.EMPTY_ARRAY;
-		}
-		return getPathRefs();
-	}
-
-	private PsiReference[] getPathRefs()
-	{
-		final ASTNode valueNode = findValueNode();
-
-		if(valueNode != null)
-		{
-			return ReferenceSupport.getFileRefs(this, valueNode.getPsi(), valueNode.getPsi().getStartOffsetInParent() + 1,
-					ReferenceSupport.LookupOptions.EMBEDDED_ASSET);
-		}
-		return PsiReference.EMPTY_ARRAY;
-	}
+public class JSAttributeNameValuePairImpl extends JSStubElementImpl<JSAttributeNameValuePairStub> implements JSAttributeNameValuePair {
+    private JSReferenceSet myReferenceSet;
+    @NonNls
+    private static final String EMBED_ANNOTATION_NAME = "Embed";
+
+    public JSAttributeNameValuePairImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSAttributeNameValuePairImpl(final JSAttributeNameValuePairStub node) {
+        super(node, JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSAttributeNameValuePair(this);
+    }
+
+    @Override
+    public String getName() {
+        final JSAttributeNameValuePairStub stub = getStub();
+        if (stub != null) {
+            return stub.getName();
+        }
+        final ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return node != null ? node.getText() : null;
+    }
+
+    @Override
+    public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException {
+        throw new IncorrectOperationException();
+    }
+
+    @Override
+    public JSExpression getValue() {
+        final ASTNode astNode = findValueNode();
+        return astNode != null ? (JSExpression)astNode.getPsi() : null;
+    }
+
+    @Override
+    public String getSimpleValue() {
+        final JSAttributeNameValuePairStub stub = getStub();
+        if (stub != null) {
+            return stub.getValue();
+        }
+        final ASTNode expression = findValueNode();
+        return expression != null ? StringUtil.stripQuotesAroundValue(expression.getText()) : null;
+    }
+
+    private ASTNode findValueNode() {
+        return getNode().findChildByType(JavaScriptTokenSets.STRING_LITERALS);
+    }
+
+    @Override
+    @Nonnull
+    public PsiReference[] getReferences() {
+        final @NonNls String name = getName();
+
+        if ("source".equals(name)) {
+            return getPathRefsCheckingParent();
+        }
+        else if ("type".equals(name) || "arrayType".equals(name)) {
+            return getClassRefs();
+        }
+        else if (name == null) {
+            return getDefaultPropertyRefs();
+        }
+        return PsiReference.EMPTY_ARRAY;
+    }
+
+    private PsiReference[] getClassRefs() {
+        final ASTNode valueNode = findValueNode();
+
+        if (valueNode != null) {
+            if (myReferenceSet == null) {
+                myReferenceSet = new JSReferenceSet(this, false);
+            }
+            myReferenceSet.update(valueNode.getText(), valueNode.getPsi().getStartOffsetInParent());
+            return myReferenceSet.getReferences();
+        }
+        return PsiReference.EMPTY_ARRAY;
+    }
+
+    private PsiReference[] getDefaultPropertyRefs() {
+        final @NonNls String parentName = ((JSAttribute)getParent()).getName();
+
+        if ("HostComponent".equals(parentName) || "ArrayElementType".equals(parentName)) {
+            return getClassRefs();
+        }
+
+        if (EMBED_ANNOTATION_NAME.equals(parentName)) {
+            return getPathRefs();
+        }
+        if ("DefaultProperty".equals(parentName)) {
+            final ASTNode valueNode = findValueNode();
+            if (valueNode != null) {
+                if (myReferenceSet == null) {
+                    myReferenceSet = new JSReferenceSet(this, false);
+                }
+                myReferenceSet.update(valueNode.getText(), valueNode.getPsi().getStartOffsetInParent());
+                return myReferenceSet.getReferences();
+            }
+        }
+
+        return PsiReference.EMPTY_ARRAY;
+    }
+
+    private PsiReference[] getPathRefsCheckingParent() {
+        final @NonNls String parentName = ((JSAttribute)getParent()).getName();
+
+        if (!EMBED_ANNOTATION_NAME.equals(parentName)) {
+            return PsiReference.EMPTY_ARRAY;
+        }
+        return getPathRefs();
+    }
+
+    private PsiReference[] getPathRefs() {
+        final ASTNode valueNode = findValueNode();
+
+        if (valueNode != null) {
+            return ReferenceSupport.getFileRefs(this, valueNode.getPsi(), valueNode.getPsi().getStartOffsetInParent() + 1,
+                ReferenceSupport.LookupOptions.EMBEDDED_ASSET
+            );
+        }
+        return PsiReference.EMPTY_ARRAY;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
index c4afc293..3b26c27c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
@@ -40,69 +40,63 @@
  * Time: 11:41:42 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSBinaryExpressionImpl extends JSExpressionImpl implements JSBinaryExpression
-{
-	private static final TokenSet BINARY_OPERATIONS = TokenSet.orSet(JSTokenTypes.OPERATIONS, JSTokenTypes.RELATIONAL_OPERATIONS);
-	private static final TokenSet BINARY_OPERATIONS_WITH_DEFS = TokenSet.create(JSTokenTypes.COMMA, JSTokenTypes.EQ);
+public class JSBinaryExpressionImpl extends JSExpressionImpl implements JSBinaryExpression {
+    private static final TokenSet BINARY_OPERATIONS = TokenSet.orSet(JSTokenTypes.OPERATIONS, JSTokenTypes.RELATIONAL_OPERATIONS);
+    private static final TokenSet BINARY_OPERATIONS_WITH_DEFS = TokenSet.create(JSTokenTypes.COMMA, JSTokenTypes.EQ);
 
-	public JSBinaryExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+    public JSBinaryExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getLOperand()
-	{
-		final ASTNode astNode = getNode();
-		final JSExpression firstExpression = PsiTreeUtil.findChildOfType(astNode.getPsi(), JSExpression.class);
-		if(firstExpression != null && astNode.findChildByType(BINARY_OPERATIONS, firstExpression.getNode()) == null)
-		{
-			return null; // =a
-		}
-		return firstExpression != null ? firstExpression : null;
-	}
+    @Override
+    public JSExpression getLOperand() {
+        final ASTNode astNode = getNode();
+        final JSExpression firstExpression = PsiTreeUtil.findChildOfType(astNode.getPsi(), JSExpression.class);
+        if (firstExpression != null && astNode.findChildByType(BINARY_OPERATIONS, firstExpression.getNode()) == null) {
+            return null; // =a
+        }
+        return firstExpression != null ? firstExpression : null;
+    }
 
-	@Override
-	public JSExpression getROperand()
-	{
-		final ASTNode myNode = getNode();
-		final ASTNode secondExpression = myNode.findChildByType(JSElementTypes.EXPRESSIONS, myNode.findChildByType(BINARY_OPERATIONS));
-		return secondExpression != null ? (JSExpression) secondExpression.getPsi() : null;
-	}
+    @Override
+    public JSExpression getROperand() {
+        final ASTNode myNode = getNode();
+        final ASTNode secondExpression = myNode.findChildByType(JSElementTypes.EXPRESSIONS, myNode.findChildByType(BINARY_OPERATIONS));
+        return secondExpression != null ? (JSExpression)secondExpression.getPsi() : null;
+    }
 
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiElement getOperationElement()
-	{
-		final ASTNode operationASTNode = getNode().findChildByType(BINARY_OPERATIONS);
-		return operationASTNode != null ? operationASTNode.getPsi() : null;
-	}
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getOperationElement() {
+        final ASTNode operationASTNode = getNode().findChildByType(BINARY_OPERATIONS);
+        return operationASTNode != null ? operationASTNode.getPsi() : null;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSBinaryExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSBinaryExpression(this);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-									   @Nonnull PsiElement place)
-	{
-		final IElementType operationType = getOperationSign();
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        final IElementType operationType = getOperationSign();
 
-		if(BINARY_OPERATIONS_WITH_DEFS.contains(operationType))
-		{
-			final JSExpression loperand = getLOperand();
-			final JSExpression roperand = getROperand();
+        if (BINARY_OPERATIONS_WITH_DEFS.contains(operationType)) {
+            final JSExpression loperand = getLOperand();
+            final JSExpression roperand = getROperand();
 
-			if(loperand != null)
-			{
-				return loperand.processDeclarations(processor, state, lastParent, place) && (roperand != null ? roperand.processDeclarations(processor, state,
-						lastParent, place) : true);
-			}
-		}
+            if (loperand != null) {
+                return loperand.processDeclarations(processor, state, lastParent, place)
+                    && (roperand != null ? roperand.processDeclarations(processor, state, lastParent, place) : true);
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
index 4f0136f5..0ab54e57 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
@@ -34,104 +34,88 @@
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
-public class JSPropertyNameReference implements PsiReference
-{
-	private final JSProperty myProperty;
-	private final PsiElement myNameIdentifier;
-
-	public JSPropertyNameReference(JSProperty property, PsiElement nameIdentifier)
-	{
-		this.myProperty = property;
-		myNameIdentifier = nameIdentifier;
-	}
-
-	@Override
-	public PsiElement getElement()
-	{
-		return myNameIdentifier;
-	}
-
-	@Override
-	@RequiredReadAction
-	public TextRange getRangeInElement()
-	{
-		int quotesDelta = myNameIdentifier.getNode().getElementType() == JSTokenTypes.STRING_LITERAL ? 1 : 0;
-		final int startOffsetInParent = myNameIdentifier.getStartOffsetInParent();
-		int startOffset = startOffsetInParent + quotesDelta;
-		int endOffset = startOffsetInParent + myNameIdentifier.getTextLength() - quotesDelta;
-		if(endOffset <= startOffset)
-		{
-			return new TextRange(0, myProperty.getTextLength());
-		}
-		return new TextRange(startOffset, endOffset);
-	}
-
-	@Override
-	@Nullable
-	public PsiElement resolve()
-	{
-		return myProperty;
-	}
-
-	@Nonnull
-	@Override
-	@RequiredReadAction
-	public String getCanonicalText()
-	{
-		return StringUtil.stripQuotesAroundValue(myNameIdentifier.getText());
-	}
-
-	@Override
-	public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException
-	{
-		myProperty.setName(newElementName);
-		return null;
-	}
-
-	@Override
-	public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		return null;
-	}
-
-	@Override
-	@RequiredReadAction
-	public boolean isReferenceTo(PsiElement element)
-	{
-		final PsiElement element2 = resolve();
-		boolean proxyExpanded = false;
-
-		if(element instanceof JSDefinitionExpression)
-		{
-			final JSExpression expression = ((JSDefinitionExpression) element).getExpression();
-			if(expression instanceof JSReferenceExpression)
-			{
-				return ((JSReferenceExpression) expression).isReferenceTo(element2);
-			}
-		}
-
-		if(element != element2 && element instanceof JSProperty && element2 instanceof JSProperty)
-		{
-			return ((JSProperty) element).getName().equals(((JSProperty) element2).getName());
-		}
-		return proxyExpanded && element == element2;
-	}
-
-	@Nonnull
-	@Override
-	@RequiredReadAction
-	public Object[] getVariants()
-	{
-		final VariantsProcessor processor = new VariantsProcessor(null, myProperty.getContainingFile(), false, myProperty);
-
-		JSResolveUtil.processGlobalSymbols(myProperty, processor);
-
-		return processor.getResult();
-	}
-
-	@Override
-	public boolean isSoft()
-	{
-		return true;
-	}
+public class JSPropertyNameReference implements PsiReference {
+    private final JSProperty myProperty;
+    private final PsiElement myNameIdentifier;
+
+    public JSPropertyNameReference(JSProperty property, PsiElement nameIdentifier) {
+        this.myProperty = property;
+        myNameIdentifier = nameIdentifier;
+    }
+
+    @Override
+    public PsiElement getElement() {
+        return myNameIdentifier;
+    }
+
+    @Override
+    @RequiredReadAction
+    public TextRange getRangeInElement() {
+        int quotesDelta = myNameIdentifier.getNode().getElementType() == JSTokenTypes.STRING_LITERAL ? 1 : 0;
+        final int startOffsetInParent = myNameIdentifier.getStartOffsetInParent();
+        int startOffset = startOffsetInParent + quotesDelta;
+        int endOffset = startOffsetInParent + myNameIdentifier.getTextLength() - quotesDelta;
+        if (endOffset <= startOffset) {
+            return new TextRange(0, myProperty.getTextLength());
+        }
+        return new TextRange(startOffset, endOffset);
+    }
+
+    @Override
+    @Nullable
+    public PsiElement resolve() {
+        return myProperty;
+    }
+
+    @Nonnull
+    @Override
+    @RequiredReadAction
+    public String getCanonicalText() {
+        return StringUtil.stripQuotesAroundValue(myNameIdentifier.getText());
+    }
+
+    @Override
+    public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
+        myProperty.setName(newElementName);
+        return null;
+    }
+
+    @Override
+    public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+        return null;
+    }
+
+    @Override
+    @RequiredReadAction
+    public boolean isReferenceTo(PsiElement element) {
+        final PsiElement element2 = resolve();
+        boolean proxyExpanded = false;
+
+        if (element instanceof JSDefinitionExpression definition
+            && definition.getExpression() instanceof JSReferenceExpression referenceExpression) {
+            return referenceExpression.isReferenceTo(element2);
+        }
+
+        if (element != element2 && element instanceof JSProperty elem1Prop && element2 instanceof JSProperty elem2Prop) {
+            return elem1Prop.getName().equals(elem2Prop.getName());
+        }
+        return proxyExpanded && element == element2;
+    }
+
+    @Nonnull
+    @Override
+    @RequiredReadAction
+    public Object[] getVariants() {
+        final VariantsProcessor processor =
+            new VariantsProcessor(null, myProperty.getContainingFile(), false, myProperty);
+
+        JSResolveUtil.processGlobalSymbols(myProperty, processor);
+
+        return processor.getResult();
+    }
+
+    @Override
+    public boolean isSoft() {
+        return true;
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
index 639fcdea..d559a333 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/JSRecursiveElementVisitor.java
@@ -4,13 +4,11 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiRecursiveVisitor;
 
-public class JSRecursiveElementVisitor extends JSElementVisitor implements PsiRecursiveVisitor
-{
-	@Override
-	public void visitElement(PsiElement element)
-	{
-		super.visitElement(element);
+public class JSRecursiveElementVisitor extends JSElementVisitor implements PsiRecursiveVisitor {
+    @Override
+    public void visitElement(PsiElement element) {
+        super.visitElement(element);
 
-		element.acceptChildren(this);
-	}
+        element.acceptChildren(this);
+    }
 }

From c83c72ceb22b5da932020403a8ec211347d543d3 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 26 Jul 2024 12:53:21 +0300
Subject: [PATCH 223/340] Code reformat using IJ4 code style (part 13).

---
 .../psi/impl/JSBlockStatementImpl.java        |  62 +-
 .../psi/impl/JSBreakStatementImpl.java        |  42 +-
 .../psi/impl/JSCallExpressionImpl.java        |  39 +-
 .../javascript/psi/impl/JSCaseClauseImpl.java |  50 +-
 .../javascript/psi/impl/JSCatchBlockImpl.java |  79 +-
 .../javascript/psi/impl/JSChangeUtil.java     | 694 +++++++-------
 .../lang/javascript/psi/impl/JSClassBase.java | 897 ++++++++----------
 .../psi/impl/JSClassExpressionImpl.java       |  45 +-
 .../lang/javascript/psi/impl/JSClassImpl.java | 368 ++++---
 .../psi/impl/JSCommaExpressionImpl.java       |  19 +-
 .../psi/impl/JSConditionalExpressionImpl.java | 141 ++-
 .../psi/impl/JSContinueStatementImpl.java     |  42 +-
 .../psi/impl/JSDefinitionExpressionImpl.java  | 135 ++-
 .../psi/impl/JSDoWhileStatementImpl.java      |  37 +-
 .../javascript/psi/impl/JSDocCommentImpl.java |  46 +-
 .../javascript/psi/impl/JSDocTagImpl.java     | 547 +++++------
 .../psi/impl/JSDocTagValueImpl.java           | 186 ++--
 .../javascript/psi/impl/JSElementImpl.java    |  10 +-
 .../psi/impl/JSEmbeddedContentImpl.java       | 121 +--
 .../psi/impl/JSEmptyStatementImpl.java        |  19 +-
 .../impl/JSExpressionCodeFragmentImpl.java    | 107 +--
 .../javascript/psi/impl/JSExpressionImpl.java |  32 +-
 .../psi/impl/JSExpressionStatementImpl.java   |  99 +-
 .../lang/javascript/psi/impl/JSFileImpl.java  | 264 +++---
 .../psi/impl/JSForInStatementImpl.java        | 183 ++--
 25 files changed, 1921 insertions(+), 2343 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
index e870c59e..ee598323 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
@@ -35,43 +35,35 @@
  * Time: 9:17:15 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSBlockStatementImpl extends JSStatementImpl implements JSBlockStatement
-{
-	public JSBlockStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSBlockStatementImpl extends JSStatementImpl implements JSBlockStatement {
+    public JSBlockStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSStatement[] getStatements()
-	{
-		return findChildrenByClass(JSStatement.class);
-	}
+    @Override
+    public JSStatement[] getStatements() {
+        return findChildrenByClass(JSStatement.class);
+    }
 
-	public JSLabeledStatement setLabel(String label)
-	{
-		throw new UnsupportedOperationException("TODO: implement");
-	}
+    public JSLabeledStatement setLabel(String label) {
+        throw new UnsupportedOperationException("TODO: implement");
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSBlock(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSBlock(this);
+    }
 
-	@Override
-	public PsiElement add(@Nonnull final PsiElement element) throws IncorrectOperationException
-	{
-		if(element instanceof JSStatement)
-		{
-			ASTNode node = getNode().findChildByType(JSTokenTypes.RBRACE);
-			if(node != null)
-			{
-				PsiElement psiElement = super.addAfter(element, node.getTreePrev().getPsi());
-				CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), psiElement.getNode());
-				return psiElement;
-			}
-		}
-		return super.add(element);
-	}
+    @Override
+    public PsiElement add(@Nonnull final PsiElement element) throws IncorrectOperationException {
+        if (element instanceof JSStatement) {
+            ASTNode node = getNode().findChildByType(JSTokenTypes.RBRACE);
+            if (node != null) {
+                PsiElement psiElement = super.addAfter(element, node.getTreePrev().getPsi());
+                CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), psiElement.getNode());
+                return psiElement;
+            }
+        }
+        return super.add(element);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
index 13ac550a..85339e3b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
@@ -28,30 +28,24 @@
  * Time: 9:52:04 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSBreakStatementImpl extends JSStatementWithLabelReferenceImpl implements JSBreakStatement
-{
-	public JSBreakStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSBreakStatementImpl extends JSStatementWithLabelReferenceImpl implements JSBreakStatement {
+    public JSBreakStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSBreakStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSBreakStatement(this);
+    }
 
-	@Override
-	public JSStatement getStatementToBreak()
-	{
-		String label = getLabel();
-		if(label == null)
-		{
-			return PsiTreeUtil.getParentOfType(this, JSLoopStatement.class, JSSwitchStatement.class);
-		}
-		else
-		{
-			return (JSStatement) getReferences()[0].resolve();
-		}
-	}
+    @Override
+    public JSStatement getStatementToBreak() {
+        String label = getLabel();
+        if (label == null) {
+            return PsiTreeUtil.getParentOfType(this, JSLoopStatement.class, JSSwitchStatement.class);
+        }
+        else {
+            return (JSStatement)getReferences()[0].resolve();
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
index 28d67b65..329acb6c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
@@ -32,29 +32,24 @@
  * Time: 12:02:38 AM
  * To change this template use File | Settings | File Templates.
  */
-public class JSCallExpressionImpl extends JSExpressionImpl implements JSCallExpression
-{
-	public JSCallExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSCallExpressionImpl extends JSExpressionImpl implements JSCallExpression {
+    public JSCallExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getMethodExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getMethodExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	public JSArgumentList getArgumentList()
-	{
-		ASTNode node = getNode().findChildByType(JSElementTypes.ARGUMENT_LIST);
-		return node != null ? (JSArgumentList) node.getPsi() : null;
-	}
+    @Override
+    public JSArgumentList getArgumentList() {
+        ASTNode node = getNode().findChildByType(JSElementTypes.ARGUMENT_LIST);
+        return node != null ? (JSArgumentList)node.getPsi() : null;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSCallExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSCallExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
index 6ada727b..d59cd6f6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
@@ -31,38 +31,28 @@
  * Time: 10:11:23 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSCaseClauseImpl extends JSElementImpl implements JSCaseClause
-{
-	public JSCaseClauseImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSCaseClauseImpl extends JSElementImpl implements JSCaseClause {
+    public JSCaseClauseImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public boolean isDefault()
-	{
-		return getNode().findChildByType(JSTokenTypes.DEFAULT_KEYWORD) != null;
-	}
+    @Override
+    public boolean isDefault() {
+        return getNode().findChildByType(JSTokenTypes.DEFAULT_KEYWORD) != null;
+    }
 
-	@Override
-	public JSExpression getCaseExpression()
-	{
-		if(isDefault())
-		{
-			return null;
-		}
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getCaseExpression() {
+        return isDefault() ? null : findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	public JSStatement[] getStatements()
-	{
-		return findChildrenByClass(JSStatement.class);
-	}
+    @Override
+    public JSStatement[] getStatements() {
+        return findChildrenByClass(JSStatement.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSCaseClause(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSCaseClause(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
index 26f0e3a5..66d7c7a8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
@@ -36,52 +36,47 @@
  * Time: 10:06:09 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSCatchBlockImpl extends JSElementImpl implements JSCatchBlock
-{
-	public JSCatchBlockImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSCatchBlockImpl extends JSElementImpl implements JSCatchBlock {
+    public JSCatchBlockImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSParameter getParameter()
-	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.FORMAL_PARAMETER);
-		return node != null ? (JSParameter) node.getPsi() : null;
-	}
+    @Override
+    public JSParameter getParameter() {
+        final ASTNode node = getNode().findChildByType(JSElementTypes.FORMAL_PARAMETER);
+        return node != null ? (JSParameter)node.getPsi() : null;
+    }
 
-	@Override
-	public JSStatement getStatement()
-	{
-		return findChildByClass(JSStatement.class);
-	}
+    @Override
+    public JSStatement getStatement() {
+        return findChildByClass(JSStatement.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSCatchBlock(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSCatchBlock(this);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-									   @Nonnull PsiElement place)
-	{
-		if(lastParent != null)
-		{
-			final JSParameter param = getParameter();
-			if(param != null)
-			{
-				return processor.execute(param, state);
-			}
-		}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        if (lastParent != null) {
+            final JSParameter param = getParameter();
+            if (param != null) {
+                return processor.execute(param, state);
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		final ASTNode astNode = getNode();
-		astNode.getTreeParent().removeChild(astNode);
-	}
+    @Override
+    public void delete() throws IncorrectOperationException {
+        final ASTNode astNode = getNode();
+        astNode.getTreeParent().removeChild(astNode);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
index 13feaa15..a626f6f1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
@@ -44,378 +44,324 @@
  * Time: 7:56:28 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSChangeUtil
-{
-	private JSChangeUtil()
-	{
-	}
-
-	public static ASTNode createNameIdentifier(Project project, String name, IElementType type)
-	{
-		if(JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(type))
-		{
-			return createNameIdentifier(project, name);
-		}
-		else if(JavaScriptTokenSets.STRING_LITERALS.contains(type) && !StringUtil.isQuotedString(name))
-		{
-			return createExpressionFromText(project, "\"" + name + "\"").getNode().getFirstChildNode();
-		}
-		else
-		{
-			return createExpressionFromText(project, name).getNode().getFirstChildNode();
-		}
-	}
-
-	public static ASTNode createNameIdentifier(Project project, String name)
-	{
-		final JSExpressionStatement expressionStatement = (JSExpressionStatement) createJSTreeFromTextImpl(project, name + ";");
-		final JSReferenceExpressionImpl refExpression = (JSReferenceExpressionImpl) expressionStatement.getFirstChild();
-
-		return refExpression.getNode().getFirstChildNode();
-	}
-
-	@Nonnull
-	public static JSExpression createExpressionFromText(Project project, @NonNls String text)
-	{
-		text = "{\n" + text + "\n}";
-		PsiElement element = createJSTreeFromTextImpl(project, text);
-		assert element instanceof JSBlockStatement : "\"" + text + "\" was not parsed as BlockStatement";
-		element = ((JSBlockStatement) element).getStatements()[0];
-		final JSExpressionStatement expressionStatement = (JSExpressionStatement) element;
-		return (JSExpression) expressionStatement.getFirstChild();
-	}
-
-
-	public static ASTNode createStatementFromText(Project project, @NonNls String text)
-	{
-		final PsiElement element = createJSTreeFromTextImpl(project, text);
-		final JSSourceElement stmt = element instanceof JSSourceElement ? (JSSourceElement) element : null;
-		return stmt != null ? stmt.getNode() : null;
-	}
-
-	@Nullable
-	private static PsiElement createJSTreeFromTextImpl(Project project, @NonNls String text)
-	{
-		final PsiFile dummyFile;
-		dummyFile = PsiFileFactory.getInstance(project).createFileFromText("dummy.js", JavaScriptLanguage.INSTANCE, text);
-
-		return dummyFile.getFirstChild();
-	}
-
-	public static ASTNode createJSTreeFromText(Project project, @NonNls String text)
-	{
-		final PsiElement element = createJSTreeFromTextImpl(project, text);
-		if(element != null)
-		{
-			return element.getNode();
-		}
-		return null;
-	}
-
-	public static JSExpression replaceExpression(JSExpression oldExpr, JSExpression newExpr)
-	{
-		if(JSUtils.isNeedParenthesis(oldExpr, newExpr))
-		{
-			ASTNode parenthesized = createExpressionFromText(oldExpr.getProject(), "(a)").getNode();
-			final JSParenthesizedExpression parenthPsi = (JSParenthesizedExpression) parenthesized.getPsi();
-			parenthesized.replaceChild(parenthPsi.getInnerExpression().getNode(), newExpr.getNode().copyElement());
-			oldExpr.getParent().getNode().replaceChild(oldExpr.getNode(), parenthesized);
-			return parenthPsi;
-		}
-		else
-		{
-			final ASTNode newNode = newExpr.getNode().copyElement();
-			oldExpr.getParent().getNode().replaceChild(oldExpr.getNode(), newNode);
-			return (JSExpression) newNode.getPsi();
-		}
-	}
-
-	public static JSStatement replaceStatement(JSStatement oldStatement, JSStatement newStatement)
-	{
-		final ASTNode newNode = newStatement.getNode().copyElement();
-		oldStatement.getParent().getNode().replaceChild(oldStatement.getNode(), newNode);
-		return (JSStatement) newNode.getPsi();
-	}
-
-	public static void doIdentifierReplacement(PsiElement parent, PsiElement identifier, String name)
-	{
-		final ASTNode nameElement = JSChangeUtil.createNameIdentifier(parent.getProject(), name);
-		parent.getNode().replaceChild(identifier.getNode(), nameElement);
-	}
-
-	public static PsiElement doAddBefore(final PsiElement jsElement, final PsiElement element,
-			final PsiElement anchor) throws IncorrectOperationException
-	{
-		if(!JSChangeUtil.isStatementOrComment(element) && !(element instanceof PsiWhiteSpace))
-		{
-			throw new UnsupportedOperationException("js statement or whitespace expected");
-		}
-
-		return doDoAddBefore(jsElement, element, anchor);
-	}
-
-	public static PsiElement doDoAddBefore(final PsiElement jsElement, final PsiElement element,
-			final PsiElement anchor) throws IncorrectOperationException
-	{
-		final ASTNode elementNode = element.getNode();
-		if(elementNode == null)
-		{
-			throw new IncorrectOperationException("node should not be null");
-		}
-		ASTNode copiedElementNode = elementNode.copyElement();
-		final ASTNode parentNode = jsElement.getNode();
-		ASTNode anchorNode = anchor != null ? anchor.getNode() : null;
-
-		anchorNode = insertWhitespaceIfNeeded(anchorNode, elementNode, parentNode, anchorNode);
-
-		parentNode.addChild(copiedElementNode, anchorNode != null ? anchorNode : null);
-		if(copiedElementNode.getPsi() instanceof PsiComment && parentNode.getPsi().isPhysical())
-		{ // HACK !
-			CodeStyleManager.getInstance(element.getProject()).reformatNewlyAddedElement(parentNode, copiedElementNode);
-		}
-
-		return copiedElementNode.getPsi();
-	}
-
-	private static ASTNode insertWhitespaceIfNeeded(ASTNode anchorNode, final ASTNode elementNode, final ASTNode parentNode,
-			final ASTNode insertionPlaceNode) throws IncorrectOperationException
-	{
-		ParserDefinition parserDef = ParserDefinition.forLanguage(parentNode.getPsi().getLanguage());
-		final TokenSet comments = parserDef.getCommentTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
-		final TokenSet whitespaces = parserDef.getWhitespaceTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
-
-		if(anchorNode != null && ((!whitespaces.contains(anchorNode.getElementType()) && !whitespaces.contains(elementNode.getElementType())) ||
-				comments.contains(anchorNode.getElementType()) ||
-				comments.contains(elementNode.getElementType()) ||
-				elementNode.getPsi() instanceof PsiComment))
-		{
-			String commentString = " ";
-			if(comments.contains(anchorNode.getElementType()) ||
-					comments.contains(elementNode.getElementType()) ||
-					elementNode.getPsi() instanceof PsiComment)
-			{
-				commentString = "\n";
-			}
-
-			final ASTNode wsNode = PsiParserFacade.SERVICE.getInstance(parentNode.getPsi().getProject()).createWhiteSpaceFromText(commentString).getNode();
-			parentNode.addChild(wsNode, insertionPlaceNode);
-			anchorNode = wsNode;
-		}
-		return anchorNode;
-	}
-
-	public static boolean isStatementContainer(final PsiElement jsElement)
-	{
-		return jsElement instanceof JSBlockStatement || jsElement instanceof JSEmbeddedContentImpl || jsElement instanceof JSClass ||
-				jsElement instanceof JSPackageStatement;
-	}
-
-	public static boolean isStatementOrComment(final PsiElement jsElement)
-	{
-		return jsElement instanceof JSSourceElement || jsElement instanceof PsiComment;
-	}
-
-	public static PsiElement doAddAfter(final PsiElement jsElement, final PsiElement element,
-			final PsiElement anchor) throws IncorrectOperationException
-	{
-		if(!JSChangeUtil.isStatementOrComment(element) && !(element instanceof PsiWhiteSpace))
-		{
-			throw new UnsupportedOperationException("js statement or whitespace expected");
-		}
-
-		return doDoAddAfter(jsElement, element, anchor);
-	}
-
-	public static PsiElement doDoAddAfter(final PsiElement jsElement, final PsiElement element,
-			final PsiElement anchor) throws IncorrectOperationException
-	{
-		final ASTNode parentNode = jsElement.getNode();
-		final ASTNode node = element.getNode();
-		ASTNode anchorNode = anchor != null ? anchor.getNode() : parentNode.getLastChildNode();
-		anchorNode = insertWhitespaceIfNeeded(anchorNode, node, parentNode, anchorNode != null ? anchorNode.getTreeNext() : null);
-
-		final ASTNode nodeCopy = node.copyElement();
-
-		if(anchor == null)
-		{
-			parentNode.addChild(nodeCopy);
-		}
-		else
-		{
-			parentNode.addChild(nodeCopy, anchorNode.getTreeNext());
-		}
-
-		final ASTNode nextAfter = nodeCopy.getTreeNext();
-		insertWhitespaceIfNeeded(nextAfter, node, parentNode, nextAfter);
-
-		return nodeCopy.getPsi();
-	}
-
-	public static PsiElement doAddRangeBefore(PsiElement parent, PsiElement first, final PsiElement last,
-			final PsiElement anchor) throws IncorrectOperationException
-	{
-		final PsiElement resultElement;
-		PsiElement psiElement = resultElement = doAddBefore(parent, first, anchor);
-
-		while(first != last)
-		{
-			first = first.getNextSibling();
-			if(first == null)
-			{
-				break;
-			}
-			psiElement = doAddAfter(parent, first, psiElement);
-		}
-
-		return resultElement;
-	}
-
-	public static PsiElement doAddRangeAfter(final PsiElement jsElement, PsiElement first, final PsiElement last,
-			final PsiElement anchor) throws IncorrectOperationException
-	{
-		final PsiElement resultElement;
-		PsiElement psiElement = resultElement = doAddAfter(jsElement, first, anchor);
-
-		while(first != last)
-		{
-			first = first.getNextSibling();
-			if(first == null)
-			{
-				break;
-			}
-			psiElement = doAddAfter(jsElement, first, psiElement);
-		}
-
-		return resultElement;
-	}
-
-	public static boolean isBlockStatementContainer(final JSElement jsElement)
-	{
-		return jsElement instanceof JSIfStatement || jsElement instanceof JSLoopStatement;
-	}
-
-	public static PsiElement blockDoAddRangeBefore(final PsiElement first, final PsiElement last, final @Nonnull PsiElement anchor) throws
-			IncorrectOperationException
-	{
-		BlockAddContext addContext = new BlockAddContext(anchor)
-		{
-			@Override
-			PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException
-			{
-				return newlyAddedBlock.addRangeBefore(element[0], element[1], codeBlockAnchor);
-			}
-		};
-
-		return addContext.doAddElement(first, last);
-	}
-
-	public static PsiElement blockDoAddRangeAfter(final PsiElement first, final PsiElement last, final @Nonnull PsiElement anchor) throws
-			IncorrectOperationException
-	{
-		BlockAddContext addContext = new BlockAddContext(anchor)
-		{
-			@Override
-			PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException
-			{
-				return newlyAddedBlock.addRangeAfter(element[0], element[1], codeBlockAnchor);
-			}
-		};
-
-		return addContext.doAddElement(first, last);
-	}
-
-	public static PsiElement blockDoAddAfter(final PsiElement element, final @Nonnull PsiElement anchor) throws IncorrectOperationException
-	{
-		BlockAddContext addContext = new BlockAddContext(anchor)
-		{
-			@Override
-			PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException
-			{
-				return newlyAddedBlock.addAfter(element[0], codeBlockAnchor);
-			}
-		};
-
-		return addContext.doAddElement(element);
-	}
-
-	public static PsiElement blockDoAddBefore(final PsiElement element, final @Nonnull PsiElement anchor) throws IncorrectOperationException
-	{
-		BlockAddContext addContext = new BlockAddContext(anchor)
-		{
-			@Override
-			PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException
-			{
-				return newlyAddedBlock.addBefore(element[0], codeBlockAnchor);
-			}
-		};
-
-		return addContext.doAddElement(element);
-	}
-
-	public static String getSemicolon(final Project project)
-	{
-		return CodeStyleSettingsManager.getInstance(project).getCurrentSettings().getCustomSettings(JSCodeStyleSettings.class)
-				.USE_SEMICOLON_AFTER_STATEMENT ? ";" : "";
-	}
-
-	abstract static class BlockAddContext
-	{
-		final JSBlockStatement newlyAddedBlock;
-		final PsiElement codeBlockAnchor;
-
-		BlockAddContext(final @Nonnull PsiElement _anchor) throws IncorrectOperationException
-		{
-			final ASTNode codeBlockNode = JSChangeUtil.createStatementFromText(_anchor.getProject(), "{ a }");
-
-			newlyAddedBlock = (JSBlockStatement) _anchor.replace(((JSBlockStatement) codeBlockNode.getPsi()));
-
-			final JSStatement artificiallyAddedBlockAnchor = newlyAddedBlock.getStatements()[0];
-			codeBlockAnchor = newlyAddedBlock.addBefore(_anchor, artificiallyAddedBlockAnchor);
-			artificiallyAddedBlockAnchor.delete();
-		}
-
-		abstract PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException;
-	}
-
-	static void removeRangeWithRemovalOfCommas(final ASTNode myNode, final ASTNode parent)
-	{
-		ASTNode from = myNode, to = myNode.getTreeNext();
-		boolean seenComma = false;
-
-		if(to != null && to.getElementType() == JSTokenTypes.WHITE_SPACE)
-		{
-			to = to.getTreeNext();
-		}
-
-		if(to != null && to.getElementType() == JSTokenTypes.COMMA)
-		{
-			to = to.getTreeNext();
-			seenComma = true;
-
-			if(to != null && to.getElementType() == JSTokenTypes.WHITE_SPACE)
-			{
-				to = to.getTreeNext();
-			}
-		}
-
-		if(!seenComma)
-		{
-			ASTNode treePrev = from.getTreePrev();
-
-			if(treePrev != null && treePrev.getElementType() == JSTokenTypes.WHITE_SPACE)
-			{
-				treePrev = treePrev.getTreePrev();
-			}
-			if(treePrev != null && treePrev.getElementType() == JSTokenTypes.COMMA)
-			{
-				from = treePrev;
-			}
-
-			if(to != null && to.getElementType() == JSTokenTypes.WHITE_SPACE)
-			{
-				to = to.getTreeNext();
-			}
-		}
-		parent.removeRange(from, to);
-	}
+public class JSChangeUtil {
+    private JSChangeUtil() {
+    }
+
+    public static ASTNode createNameIdentifier(Project project, String name, IElementType type) {
+        if (JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(type)) {
+            return createNameIdentifier(project, name);
+        }
+        else if (JavaScriptTokenSets.STRING_LITERALS.contains(type) && !StringUtil.isQuotedString(name)) {
+            return createExpressionFromText(project, "\"" + name + "\"").getNode().getFirstChildNode();
+        }
+        else {
+            return createExpressionFromText(project, name).getNode().getFirstChildNode();
+        }
+    }
+
+    public static ASTNode createNameIdentifier(Project project, String name) {
+        final JSExpressionStatement expressionStatement = (JSExpressionStatement)createJSTreeFromTextImpl(project, name + ";");
+        final JSReferenceExpressionImpl refExpression = (JSReferenceExpressionImpl)expressionStatement.getFirstChild();
+
+        return refExpression.getNode().getFirstChildNode();
+    }
+
+    @Nonnull
+    public static JSExpression createExpressionFromText(Project project, @NonNls String text) {
+        text = "{\n" + text + "\n}";
+        PsiElement element = createJSTreeFromTextImpl(project, text);
+        assert element instanceof JSBlockStatement : "\"" + text + "\" was not parsed as BlockStatement";
+        element = ((JSBlockStatement)element).getStatements()[0];
+        final JSExpressionStatement expressionStatement = (JSExpressionStatement)element;
+        return (JSExpression)expressionStatement.getFirstChild();
+    }
+
+
+    public static ASTNode createStatementFromText(Project project, @NonNls String text) {
+        final PsiElement element = createJSTreeFromTextImpl(project, text);
+        final JSSourceElement stmt = element instanceof JSSourceElement ? (JSSourceElement)element : null;
+        return stmt != null ? stmt.getNode() : null;
+    }
+
+    @Nullable
+    private static PsiElement createJSTreeFromTextImpl(Project project, @NonNls String text) {
+        final PsiFile dummyFile;
+        dummyFile = PsiFileFactory.getInstance(project).createFileFromText("dummy.js", JavaScriptLanguage.INSTANCE, text);
+
+        return dummyFile.getFirstChild();
+    }
+
+    public static ASTNode createJSTreeFromText(Project project, @NonNls String text) {
+        final PsiElement element = createJSTreeFromTextImpl(project, text);
+        if (element != null) {
+            return element.getNode();
+        }
+        return null;
+    }
+
+    public static JSExpression replaceExpression(JSExpression oldExpr, JSExpression newExpr) {
+        if (JSUtils.isNeedParenthesis(oldExpr, newExpr)) {
+            ASTNode parenthesized = createExpressionFromText(oldExpr.getProject(), "(a)").getNode();
+            final JSParenthesizedExpression parenthPsi = (JSParenthesizedExpression)parenthesized.getPsi();
+            parenthesized.replaceChild(parenthPsi.getInnerExpression().getNode(), newExpr.getNode().copyElement());
+            oldExpr.getParent().getNode().replaceChild(oldExpr.getNode(), parenthesized);
+            return parenthPsi;
+        }
+        else {
+            final ASTNode newNode = newExpr.getNode().copyElement();
+            oldExpr.getParent().getNode().replaceChild(oldExpr.getNode(), newNode);
+            return (JSExpression)newNode.getPsi();
+        }
+    }
+
+    public static JSStatement replaceStatement(JSStatement oldStatement, JSStatement newStatement) {
+        final ASTNode newNode = newStatement.getNode().copyElement();
+        oldStatement.getParent().getNode().replaceChild(oldStatement.getNode(), newNode);
+        return (JSStatement)newNode.getPsi();
+    }
+
+    public static void doIdentifierReplacement(PsiElement parent, PsiElement identifier, String name) {
+        final ASTNode nameElement = JSChangeUtil.createNameIdentifier(parent.getProject(), name);
+        parent.getNode().replaceChild(identifier.getNode(), nameElement);
+    }
+
+    public static PsiElement doAddBefore(final PsiElement jsElement, final PsiElement element, final PsiElement anchor)
+        throws IncorrectOperationException {
+        if (!JSChangeUtil.isStatementOrComment(element) && !(element instanceof PsiWhiteSpace)) {
+            throw new UnsupportedOperationException("js statement or whitespace expected");
+        }
+
+        return doDoAddBefore(jsElement, element, anchor);
+    }
+
+    public static PsiElement doDoAddBefore(final PsiElement jsElement, final PsiElement element, final PsiElement anchor)
+        throws IncorrectOperationException {
+        final ASTNode elementNode = element.getNode();
+        if (elementNode == null) {
+            throw new IncorrectOperationException("node should not be null");
+        }
+        ASTNode copiedElementNode = elementNode.copyElement();
+        final ASTNode parentNode = jsElement.getNode();
+        ASTNode anchorNode = anchor != null ? anchor.getNode() : null;
+
+        anchorNode = insertWhitespaceIfNeeded(anchorNode, elementNode, parentNode, anchorNode);
+
+        parentNode.addChild(copiedElementNode, anchorNode != null ? anchorNode : null);
+        if (copiedElementNode.getPsi() instanceof PsiComment && parentNode.getPsi().isPhysical()) { // HACK !
+            CodeStyleManager.getInstance(element.getProject()).reformatNewlyAddedElement(parentNode, copiedElementNode);
+        }
+
+        return copiedElementNode.getPsi();
+    }
+
+    private static ASTNode insertWhitespaceIfNeeded(
+        ASTNode anchorNode,
+        final ASTNode elementNode,
+        final ASTNode parentNode,
+        final ASTNode insertionPlaceNode
+    ) throws IncorrectOperationException {
+        ParserDefinition parserDef = ParserDefinition.forLanguage(parentNode.getPsi().getLanguage());
+        final TokenSet comments = parserDef.getCommentTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
+        final TokenSet whitespaces = parserDef.getWhitespaceTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
+
+        if (anchorNode != null
+            && (!whitespaces.contains(anchorNode.getElementType()) && !whitespaces.contains(elementNode.getElementType())
+            || comments.contains(anchorNode.getElementType())
+            || comments.contains(elementNode.getElementType())
+            || elementNode.getPsi() instanceof PsiComment)) {
+            String commentString = " ";
+            if (comments.contains(anchorNode.getElementType())
+                || comments.contains(elementNode.getElementType())
+                || elementNode.getPsi() instanceof PsiComment) {
+                commentString = "\n";
+            }
+
+            final ASTNode wsNode =
+                PsiParserFacade.SERVICE.getInstance(parentNode.getPsi().getProject()).createWhiteSpaceFromText(commentString).getNode();
+            parentNode.addChild(wsNode, insertionPlaceNode);
+            anchorNode = wsNode;
+        }
+        return anchorNode;
+    }
+
+    public static boolean isStatementContainer(final PsiElement jsElement) {
+        return jsElement instanceof JSBlockStatement || jsElement instanceof JSEmbeddedContentImpl
+            || jsElement instanceof JSClass || jsElement instanceof JSPackageStatement;
+    }
+
+    public static boolean isStatementOrComment(final PsiElement jsElement) {
+        return jsElement instanceof JSSourceElement || jsElement instanceof PsiComment;
+    }
+
+    public static PsiElement doAddAfter(final PsiElement jsElement, final PsiElement element, final PsiElement anchor)
+        throws IncorrectOperationException {
+        if (!JSChangeUtil.isStatementOrComment(element) && !(element instanceof PsiWhiteSpace)) {
+            throw new UnsupportedOperationException("js statement or whitespace expected");
+        }
+
+        return doDoAddAfter(jsElement, element, anchor);
+    }
+
+    public static PsiElement doDoAddAfter(final PsiElement jsElement, final PsiElement element, final PsiElement anchor)
+        throws IncorrectOperationException {
+        final ASTNode parentNode = jsElement.getNode();
+        final ASTNode node = element.getNode();
+        ASTNode anchorNode = anchor != null ? anchor.getNode() : parentNode.getLastChildNode();
+        anchorNode = insertWhitespaceIfNeeded(anchorNode, node, parentNode, anchorNode != null ? anchorNode.getTreeNext() : null);
+
+        final ASTNode nodeCopy = node.copyElement();
+
+        if (anchor == null) {
+            parentNode.addChild(nodeCopy);
+        }
+        else {
+            parentNode.addChild(nodeCopy, anchorNode.getTreeNext());
+        }
+
+        final ASTNode nextAfter = nodeCopy.getTreeNext();
+        insertWhitespaceIfNeeded(nextAfter, node, parentNode, nextAfter);
+
+        return nodeCopy.getPsi();
+    }
+
+    public static PsiElement doAddRangeBefore(PsiElement parent, PsiElement first, final PsiElement last, final PsiElement anchor)
+        throws IncorrectOperationException {
+        final PsiElement resultElement;
+        PsiElement psiElement = resultElement = doAddBefore(parent, first, anchor);
+
+        while (first != last) {
+            first = first.getNextSibling();
+            if (first == null) {
+                break;
+            }
+            psiElement = doAddAfter(parent, first, psiElement);
+        }
+
+        return resultElement;
+    }
+
+    public static PsiElement doAddRangeAfter(final PsiElement jsElement, PsiElement first, final PsiElement last, final PsiElement anchor)
+        throws IncorrectOperationException {
+        final PsiElement resultElement;
+        PsiElement psiElement = resultElement = doAddAfter(jsElement, first, anchor);
+
+        while (first != last) {
+            first = first.getNextSibling();
+            if (first == null) {
+                break;
+            }
+            psiElement = doAddAfter(jsElement, first, psiElement);
+        }
+
+        return resultElement;
+    }
+
+    public static boolean isBlockStatementContainer(final JSElement jsElement) {
+        return jsElement instanceof JSIfStatement || jsElement instanceof JSLoopStatement;
+    }
+
+    public static PsiElement blockDoAddRangeBefore(final PsiElement first, final PsiElement last, final @Nonnull PsiElement anchor)
+        throws IncorrectOperationException {
+        BlockAddContext addContext = new BlockAddContext(anchor) {
+            @Override
+            PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException {
+                return newlyAddedBlock.addRangeBefore(element[0], element[1], codeBlockAnchor);
+            }
+        };
+
+        return addContext.doAddElement(first, last);
+    }
+
+    public static PsiElement blockDoAddRangeAfter(final PsiElement first, final PsiElement last, final @Nonnull PsiElement anchor)
+        throws IncorrectOperationException {
+        BlockAddContext addContext = new BlockAddContext(anchor) {
+            @Override
+            PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException {
+                return newlyAddedBlock.addRangeAfter(element[0], element[1], codeBlockAnchor);
+            }
+        };
+
+        return addContext.doAddElement(first, last);
+    }
+
+    public static PsiElement blockDoAddAfter(final PsiElement element, final @Nonnull PsiElement anchor)
+        throws IncorrectOperationException {
+        BlockAddContext addContext = new BlockAddContext(anchor) {
+            @Override
+            PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException {
+                return newlyAddedBlock.addAfter(element[0], codeBlockAnchor);
+            }
+        };
+
+        return addContext.doAddElement(element);
+    }
+
+    public static PsiElement blockDoAddBefore(final PsiElement element, final @Nonnull PsiElement anchor)
+        throws IncorrectOperationException {
+        BlockAddContext addContext = new BlockAddContext(anchor) {
+            @Override
+            PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException {
+                return newlyAddedBlock.addBefore(element[0], codeBlockAnchor);
+            }
+        };
+
+        return addContext.doAddElement(element);
+    }
+
+    public static String getSemicolon(final Project project) {
+        return CodeStyleSettingsManager.getInstance(project).getCurrentSettings().getCustomSettings(JSCodeStyleSettings.class)
+            .USE_SEMICOLON_AFTER_STATEMENT ? ";" : "";
+    }
+
+    abstract static class BlockAddContext {
+        final JSBlockStatement newlyAddedBlock;
+        final PsiElement codeBlockAnchor;
+
+        BlockAddContext(final @Nonnull PsiElement _anchor) throws IncorrectOperationException {
+            final ASTNode codeBlockNode = JSChangeUtil.createStatementFromText(_anchor.getProject(), "{ a }");
+
+            newlyAddedBlock = (JSBlockStatement)_anchor.replace((JSBlockStatement)codeBlockNode.getPsi());
+
+            final JSStatement artificiallyAddedBlockAnchor = newlyAddedBlock.getStatements()[0];
+            codeBlockAnchor = newlyAddedBlock.addBefore(_anchor, artificiallyAddedBlockAnchor);
+            artificiallyAddedBlockAnchor.delete();
+        }
+
+        abstract PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException;
+    }
+
+    static void removeRangeWithRemovalOfCommas(final ASTNode myNode, final ASTNode parent) {
+        ASTNode from = myNode, to = myNode.getTreeNext();
+        boolean seenComma = false;
+
+        if (to != null && to.getElementType() == JSTokenTypes.WHITE_SPACE) {
+            to = to.getTreeNext();
+        }
+
+        if (to != null && to.getElementType() == JSTokenTypes.COMMA) {
+            to = to.getTreeNext();
+            seenComma = true;
+
+            if (to != null && to.getElementType() == JSTokenTypes.WHITE_SPACE) {
+                to = to.getTreeNext();
+            }
+        }
+
+        if (!seenComma) {
+            ASTNode treePrev = from.getTreePrev();
+
+            if (treePrev != null && treePrev.getElementType() == JSTokenTypes.WHITE_SPACE) {
+                treePrev = treePrev.getTreePrev();
+            }
+            if (treePrev != null && treePrev.getElementType() == JSTokenTypes.COMMA) {
+                from = treePrev;
+            }
+
+            if (to != null && to.getElementType() == JSTokenTypes.WHITE_SPACE) {
+                to = to.getTreeNext();
+            }
+        }
+        parent.removeRange(from, to);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index 59187b98..197a048b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -38,503 +38,412 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.*;
 
 /**
  * @author Maxim.Mossienko
  */
-public abstract class JSClassBase extends JSStubElementImpl<JSClassStub> implements JSClass
-{
-	private volatile Map<String, Object> myName2FunctionMap;
-	private volatile Map<String, JSVariable> myName2FieldsMap;
-	private static Key<ParameterizedCachedValue<List<JSClass>, Object>> ourImplementsListCacheKey = Key.create("implements.list.cache");
-	private static Key<ParameterizedCachedValue<List<JSClass>, Object>> ourExtendsListCacheKey = Key.create("implements.list.cache");
-	private static UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> ourImplementsListCache = new
-			ClassesUserDataCache();
-	private static UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase,
-			Object> ourExtendsListCache = new ExtendsClassesUserDataCache();
-
-	protected JSClassBase(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSClassBase(final JSClassStub stub, final JSStubElementType<JSClassStub, JSClass> aClass)
-	{
-		super(stub, aClass);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSClass(this);
-	}
-
-	@Override
-	public void subtreeChanged()
-	{
-		dropCaches();
-
-		super.subtreeChanged();
-	}
-
-	@Override
-	protected Object clone()
-	{
-		final JSClassBase o = (JSClassBase) super.clone();
-		o.dropCaches();
-		return o;
-	}
-
-	private void dropCaches()
-	{
-		synchronized(this)
-		{
-			myName2FunctionMap = null;
-			myName2FieldsMap = null;
-		}
-	}
-
-	@Override
-	public JSFunction[] getFunctions()
-	{
-		final JSClassStub classStub = getStub();
-		if(classStub != null)
-		{
-			return getStubChildrenByType(classStub, JSElementTypes.FUNCTION_DECLARATION, JSFunction.ARRAY_FACTORY);
-		}
-		else
-		{
-			final List<JSFunction> functions = new ArrayList<JSFunction>();
-			processDeclarations(new PsiScopeProcessor()
-			{
-				@Override
-				public boolean execute(final PsiElement element, final ResolveState state)
-				{
-					if(element instanceof JSFunction)
-					{
-						functions.add((JSFunction) element);
-					}
-					return true;
-				}
-
-				@Override
-				public <T> T getHint(final Key<T> hintClass)
-				{
-					return null;
-				}
-
-				@Override
-				public void handleEvent(final Event event, final Object associated)
-				{
-				}
-			}, ResolveState.initial(), this, this);
-			return functions.toArray(JSFunction.EMPTY_ARRAY);
-		}
-	}
-
-	@Override
-	public JSFunction findFunctionByName(String functionName)
-	{
-		if(functionName == null)
-		{
-			return null;
-		}
-		final Map<String, Object> name2FunctionMap = initFunctions();
-		final Object o = name2FunctionMap.get(functionName);
-		if(o instanceof JSFunction)
-		{
-			return (JSFunction) o;
-		}
-		else if(o instanceof JSFunction[])
-		{
-			return ((JSFunction[]) o)[0];
-		}
-		return null;
-	}
-
-	@Override
-	public JSVariable[] getFields()
-	{
-		final JSClassStub classStub = getStub();
-		final List<JSVariable> vars = new ArrayList<JSVariable>(3);
-
-		if(classStub != null)
-		{
-			for(JSVarStatement var : getStubChildrenByType(classStub, JSElementTypes.VAR_STATEMENT, new ArrayFactory<JSVarStatement>()
-			{
-				@Override
-				public JSVarStatement[] create(final int count)
-				{
-					return new JSVarStatement[count];
-				}
-			}))
-			{
-				vars.addAll(Arrays.asList(var.getVariables()));
-			}
-		}
-		else
-		{
-			processDeclarations(new PsiScopeProcessor()
-			{
-				@Override
-				public boolean execute(final PsiElement element, final ResolveState state)
-				{
-					if(element instanceof JSVariable)
-					{
-						vars.add((JSVariable) element);
-					}
-					return true;
-				}
-
-				@Override
-				public <T> T getHint(final Key<T> hintClass)
-				{
-					return null;
-				}
-
-				@Override
-				public void handleEvent(final Event event, final Object associated)
-				{
-				}
-			}, ResolveState.initial(), this, this);
-		}
-		return vars.toArray(JSVariable.EMPTY_ARRAY);
-	}
-
-	@Override
-	public JSVariable findFieldByName(String name)
-	{
-		return initFields().get(name);
-	}
-
-	private
-	@Nonnull
-	Map<String, JSVariable> initFields()
-	{
-		Map<String, JSVariable> name2FieldsMap = myName2FieldsMap;
-
-		if(name2FieldsMap == null)
-		{
-			synchronized(this)
-			{
-				name2FieldsMap = myName2FieldsMap;
-
-				if(name2FieldsMap == null)
-				{
-					name2FieldsMap = new HashMap<String, JSVariable>();
-
-					for(JSVariable variable : getFields())
-					{
-						final String name = variable.getName();
-
-						if(name != null)
-						{
-							name2FieldsMap.put(name, variable);
-						}
-					}
-					myName2FieldsMap = name2FieldsMap;
-				}
-			}
-		}
-		return name2FieldsMap;
-	}
-
-	private
-	@Nonnull
-	Map<String, Object> initFunctions()
-	{
-		Map<String, Object> name2FunctionMap = myName2FunctionMap;
-
-		if(name2FunctionMap == null)
-		{
-			synchronized(this)
-			{
-				name2FunctionMap = myName2FunctionMap;
-
-				if(name2FunctionMap == null)
-				{
-					name2FunctionMap = new HashMap<String, Object>();
-
-					for(JSFunction function : getFunctions())
-					{
-						final String name = function.getName();
-
-						if(name != null)
-						{
-							final Object o = name2FunctionMap.get(name);
-							if(o == null)
-							{
-								name2FunctionMap.put(name, function);
-							}
-							else if(o instanceof JSFunction)
-							{
-								name2FunctionMap.put(name, new JSFunction[]{
-										(JSFunction) o,
-										function
-								});
-							}
-							else if(o instanceof JSFunction[])
-							{
-								name2FunctionMap.put(name, ArrayUtil.append((JSFunction[]) o, function));
-							}
-						}
-					}
-					myName2FunctionMap = name2FunctionMap;
-				}
-			}
-		}
-		return name2FunctionMap;
-	}
-
-	@Override
-	public JSFunction findFunctionByNameAndKind(final String name, JSFunction.FunctionKind kind)
-	{
-		if(name == null)
-		{
-			return null;
-		}
-		Map<String, Object> name2FunctionMap = initFunctions();
-		final Object o = name2FunctionMap.get(name);
-
-		if(o instanceof JSFunction)
-		{
-			final JSFunction function = (JSFunction) o;
-			return function.getKind() == kind ? function : null;
-		}
-		else if(o instanceof JSFunction[])
-		{
-			for(JSFunction fun : (JSFunction[]) o)
-			{
-				if(fun.getKind() == kind)
-				{
-					return fun;
-				}
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public JSClass[] getSupers()
-	{
-		List<JSClass> superClasses = new ArrayList<JSClass>(getClassesFromReferenceList(getExtendsList(), JSElementTypes.EXTENDS_LIST));
-		superClasses.addAll(getClassesFromReferenceList(getImplementsList(), JSElementTypes.IMPLEMENTS_LIST));
-		return superClasses.toArray(new JSClass[superClasses.size()]);
-	}
-
-	private List<JSClass> getClassesFromReferenceList(final @Nullable JSReferenceList extendsList, @Nonnull IElementType type)
-	{
-		final PsiElement element = extendsList != null ? extendsList : this;
-
-		if(type == JSElementTypes.EXTENDS_LIST)
-		{
-			return ourExtendsListCache.get(ourExtendsListCacheKey, this, extendsList).getValue(element);
-		}
-		else
-		{
-			return ourImplementsListCache.get(ourImplementsListCacheKey, this, extendsList).getValue(element);
-		}
-	}
-
-	@Override
-	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState substitutor,
-									   final PsiElement lastParent, @Nonnull final PsiElement place)
-	{
-		final ResolveProcessor resolveProcessor = processor instanceof ResolveProcessor ? (ResolveProcessor) processor : null;
-		final boolean toProcessClass = resolveProcessor != null && resolveProcessor.isTypeContext();
-
-		if(toProcessClass)
-		{
-			if(!processor.execute(this, null))
-			{
-				return false;
-			}
-		}
-
-		if(lastParent == null)
-		{
-			return true;
-		}
-
-		processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
-		final boolean toProcessMembers = (resolveProcessor == null || (!resolveProcessor.isToSkipClassDeclarationOnce() && resolveProcessor
-				.isToProcessMembers()));
-		if(toProcessMembers)
-		{
-			if(!processMembers(processor, substitutor, lastParent, place))
-			{
-				return false;
-			}
-		}
-		else
-		{
-			resolveProcessor.setToSkipClassDeclarationsOnce(false);
-		}
-
-		final boolean toProcessInHierarchy = processor instanceof ResolveProcessor && ((ResolveProcessor) processor).isToProcessHierarchy();
-
-		if(!toProcessInHierarchy || ((ResolveProcessor) processor).checkVisited(getQualifiedName()))
-		{
-			return true;
-		}
-
-		for(JSClass clazz : getSuperClasses())
-		{
-			if(!clazz.processDeclarations(processor, ResolveState.initial(), lastParent, place))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	protected abstract boolean processMembers(final PsiScopeProcessor processor, final ResolveState substitutor, final PsiElement lastParent,
-			final PsiElement place);
-
-	@Override
-	public JSClass[] getSuperClasses()
-	{
-		final JSReferenceList extendsList = getExtendsList();
-		final List<JSClass> supers = getClassesFromReferenceList(extendsList, JSElementTypes.EXTENDS_LIST);
-		return supers.toArray(new JSClass[supers.size()]);
-	}
-
-	public static PsiElement findClassFromNamespace(final String qname, PsiElement context)
-	{
-		PsiElement realClazz = null;
-		final PsiElement clazz = JSResolveUtil.findClassByQName(qname, context);
-
-		realClazz = clazz;
-		return realClazz;
-	}
-
-	@Override
-	public JSClass[] getImplementedInterfaces()
-	{
-		final JSReferenceList implementsList = getImplementsList();
-		if(implementsList == null)
-		{
-			return JSClass.EMPTY_ARRAY;
-		}
-		final List<JSClass> classes = getClassesFromReferenceList(implementsList, JSElementTypes.IMPLEMENTS_LIST);
-		return classes.toArray(new JSClass[classes.size()]);
-	}
-
-	private static class ExtendsClassesUserDataCache extends ClassesUserDataCache
-	{
-		@Override
-		protected List<JSClass> doCompute(final Object extendsList)
-		{
-			if(extendsList instanceof JSClass)
-			{
-				final JSClass jsClass = (JSClass) extendsList;
-
-				final ArrayList<JSClass> supers = new ArrayList<JSClass>(1);
-				if(!"Object".equals(jsClass.getQualifiedName()))
-				{
-					final PsiElement element = findClassFromNamespace("Object", jsClass);
-					if(element instanceof JSClass)
-					{
-						supers.add((JSClass) element);
-					}
-				}
-
-				return supers;
-			}
-			return super.doCompute(extendsList);
-		}
-	}
-
-	private static class ClassesUserDataCache extends UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object>
-	{
-		@Override
-		protected ParameterizedCachedValue<List<JSClass>, Object> compute(final JSClassBase jsClassBase, final Object p)
-		{
-			return CachedValuesManager.getManager(jsClassBase.getProject()).createParameterizedCachedValue(new
-																												   ParameterizedCachedValueProvider<List<JSClass>, Object>()
-			{
-				@Override
-				public CachedValueProvider.Result<List<JSClass>> compute(Object list)
-				{
-					return new CachedValueProvider.Result<List<JSClass>>(doCompute(list), PsiModificationTracker.MODIFICATION_COUNT);
-				}
-			}, false);
-		}
-
-		protected List<JSClass> doCompute(final Object object)
-		{
-			if(object instanceof JSClass)
-			{
-				return Collections.emptyList();
-			}
-
-			final ArrayList<JSClass> supers = new ArrayList<JSClass>(1);
-			final JSReferenceList extendsList = (JSReferenceList) object;
-
-			for(String refText : extendsList.getReferenceTexts())
-			{
-				refText = JSImportHandlingUtil.resolveTypeName(refText, extendsList.getParent());
-				final PsiElement element = findClassFromNamespace(refText, extendsList.getParent());
-				if(element instanceof JSClass)
-				{
-					supers.add((JSClass) element);
-				}
-			}
-			return supers;
-		}
-	}
-
-	private static <E extends PsiElement> E[] getStubChildrenByType(JSClassStub stub, final IElementType elementType, ArrayFactory<E> f)
-	{
-		assert JSElementTypes.INCLUDE_DIRECTIVE != elementType;
-
-		ArrayList<E> result = new ArrayList<E>(Arrays.asList(stub.getChildrenByType(elementType, f)));
-		JSIncludeDirective[] includes = stub.getChildrenByType(JSElementTypes.INCLUDE_DIRECTIVE, new ArrayFactory<JSIncludeDirective>()
-		{
-			@Override
-			public JSIncludeDirective[] create(final int count)
-			{
-				return new JSIncludeDirective[count];
-			}
-		});
-		Collection<JSFile> visited = new HashSet<JSFile>();
-		TokenSet filter = TokenSet.create(JSElementTypes.INCLUDE_DIRECTIVE, elementType);
-		for(JSIncludeDirective include : includes)
-		{
-			PsiFile file = include.resolveFile();
-			if(file instanceof JSFile)
-			{
-				process(filter, (JSFile) file, result, visited);
-			}
-		}
-		return result.toArray(f.create(result.size()));
-	}
-
-	private static <E extends PsiElement> void process(TokenSet filter, final JSFile file, final ArrayList<E> result, final Collection<JSFile> visited)
-	{
-		if(visited.contains(file))
-		{
-			return;
-		}
-		visited.add(file);
-		for(PsiElement element : JSResolveUtil.getStubbedChildren(file, filter))
-		{
-			if(element instanceof JSIncludeDirective)
-			{
-				PsiFile includedFile = ((JSIncludeDirective) element).resolveFile();
-				if(includedFile instanceof JSFile)
-				{
-					process(filter, (JSFile) includedFile, result, visited);
-				}
-			}
-			else
-			{
-				result.add((E) element);
-			}
-		}
-	}
-
-
+public abstract class JSClassBase extends JSStubElementImpl<JSClassStub> implements JSClass {
+    private volatile Map<String, Object> myName2FunctionMap;
+    private volatile Map<String, JSVariable> myName2FieldsMap;
+    private static Key<ParameterizedCachedValue<List<JSClass>, Object>> ourImplementsListCacheKey = Key.create("implements.list.cache");
+    private static Key<ParameterizedCachedValue<List<JSClass>, Object>> ourExtendsListCacheKey = Key.create("implements.list.cache");
+    private static UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> ourImplementsListCache =
+        new ClassesUserDataCache();
+    private static UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> ourExtendsListCache =
+        new ExtendsClassesUserDataCache();
+
+    protected JSClassBase(final ASTNode node) {
+        super(node);
+    }
+
+    public JSClassBase(final JSClassStub stub, final JSStubElementType<JSClassStub, JSClass> aClass) {
+        super(stub, aClass);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSClass(this);
+    }
+
+    @Override
+    public void subtreeChanged() {
+        dropCaches();
+
+        super.subtreeChanged();
+    }
+
+    @Override
+    protected Object clone() {
+        final JSClassBase o = (JSClassBase)super.clone();
+        o.dropCaches();
+        return o;
+    }
+
+    private void dropCaches() {
+        synchronized (this) {
+            myName2FunctionMap = null;
+            myName2FieldsMap = null;
+        }
+    }
+
+    @Override
+    public JSFunction[] getFunctions() {
+        final JSClassStub classStub = getStub();
+        if (classStub != null) {
+            return getStubChildrenByType(classStub, JSElementTypes.FUNCTION_DECLARATION, JSFunction.ARRAY_FACTORY);
+        }
+        else {
+            final List<JSFunction> functions = new ArrayList<>();
+            processDeclarations(
+                new PsiScopeProcessor() {
+                    @Override
+                    public boolean execute(final PsiElement element, final ResolveState state) {
+                        if (element instanceof JSFunction function) {
+                            functions.add(function);
+                        }
+                        return true;
+                    }
+
+                    @Override
+                    public <T> T getHint(final Key<T> hintClass) {
+                        return null;
+                    }
+
+                    @Override
+                    public void handleEvent(final Event event, final Object associated) {
+                    }
+                },
+                ResolveState.initial(),
+                this,
+                this
+            );
+            return functions.toArray(JSFunction.EMPTY_ARRAY);
+        }
+    }
+
+    @Override
+    public JSFunction findFunctionByName(String functionName) {
+        if (functionName == null) {
+            return null;
+        }
+        final Map<String, Object> name2FunctionMap = initFunctions();
+        final Object o = name2FunctionMap.get(functionName);
+        if (o instanceof JSFunction function) {
+            return function;
+        }
+        else if (o instanceof JSFunction[] functions) {
+            return functions[0];
+        }
+        return null;
+    }
+
+    @Override
+    public JSVariable[] getFields() {
+        final JSClassStub classStub = getStub();
+        final List<JSVariable> vars = new ArrayList<>(3);
+
+        if (classStub != null) {
+            for (JSVarStatement var : getStubChildrenByType(classStub, JSElementTypes.VAR_STATEMENT, count -> new JSVarStatement[count])) {
+                vars.addAll(Arrays.asList(var.getVariables()));
+            }
+        }
+        else {
+            processDeclarations(
+                new PsiScopeProcessor() {
+                    @Override
+                    public boolean execute(final PsiElement element, final ResolveState state) {
+                        if (element instanceof JSVariable variable) {
+                            vars.add(variable);
+                        }
+                        return true;
+                    }
+
+                    @Override
+                    public <T> T getHint(final Key<T> hintClass) {
+                        return null;
+                    }
+
+                    @Override
+                    public void handleEvent(final Event event, final Object associated) {
+                    }
+                },
+                ResolveState.initial(),
+                this,
+                this
+            );
+        }
+        return vars.toArray(JSVariable.EMPTY_ARRAY);
+    }
+
+    @Override
+    public JSVariable findFieldByName(String name) {
+        return initFields().get(name);
+    }
+
+    private
+    @Nonnull
+    Map<String, JSVariable> initFields() {
+        Map<String, JSVariable> name2FieldsMap = myName2FieldsMap;
+
+        if (name2FieldsMap == null) {
+            synchronized (this) {
+                name2FieldsMap = myName2FieldsMap;
+
+                if (name2FieldsMap == null) {
+                    name2FieldsMap = new HashMap<>();
+
+                    for (JSVariable variable : getFields()) {
+                        final String name = variable.getName();
+
+                        if (name != null) {
+                            name2FieldsMap.put(name, variable);
+                        }
+                    }
+                    myName2FieldsMap = name2FieldsMap;
+                }
+            }
+        }
+        return name2FieldsMap;
+    }
+
+    private
+    @Nonnull
+    Map<String, Object> initFunctions() {
+        Map<String, Object> name2FunctionMap = myName2FunctionMap;
+
+        if (name2FunctionMap == null) {
+            synchronized (this) {
+                name2FunctionMap = myName2FunctionMap;
+
+                if (name2FunctionMap == null) {
+                    name2FunctionMap = new HashMap<>();
+
+                    for (JSFunction function : getFunctions()) {
+                        final String name = function.getName();
+
+                        if (name != null) {
+                            final Object o = name2FunctionMap.get(name);
+                            if (o == null) {
+                                name2FunctionMap.put(name, function);
+                            }
+                            else if (o instanceof JSFunction sameNameFunction) {
+                                name2FunctionMap.put(name, new JSFunction[]{sameNameFunction, function});
+                            }
+                            else if (o instanceof JSFunction[] sameNameFunctions) {
+                                name2FunctionMap.put(name, ArrayUtil.append(sameNameFunctions, function));
+                            }
+                        }
+                    }
+                    myName2FunctionMap = name2FunctionMap;
+                }
+            }
+        }
+        return name2FunctionMap;
+    }
+
+    @Override
+    public JSFunction findFunctionByNameAndKind(final String name, JSFunction.FunctionKind kind) {
+        if (name == null) {
+            return null;
+        }
+        Map<String, Object> name2FunctionMap = initFunctions();
+        final Object o = name2FunctionMap.get(name);
+
+        if (o instanceof JSFunction) {
+            final JSFunction function = (JSFunction)o;
+            return function.getKind() == kind ? function : null;
+        }
+        else if (o instanceof JSFunction[]) {
+            for (JSFunction fun : (JSFunction[])o) {
+                if (fun.getKind() == kind) {
+                    return fun;
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public JSClass[] getSupers() {
+        List<JSClass> superClasses = new ArrayList<>(getClassesFromReferenceList(getExtendsList(), JSElementTypes.EXTENDS_LIST));
+        superClasses.addAll(getClassesFromReferenceList(getImplementsList(), JSElementTypes.IMPLEMENTS_LIST));
+        return superClasses.toArray(new JSClass[superClasses.size()]);
+    }
+
+    private List<JSClass> getClassesFromReferenceList(final @Nullable JSReferenceList extendsList, @Nonnull IElementType type) {
+        final PsiElement element = extendsList != null ? extendsList : this;
+
+        if (type == JSElementTypes.EXTENDS_LIST) {
+            return ourExtendsListCache.get(ourExtendsListCacheKey, this, extendsList).getValue(element);
+        }
+        else {
+            return ourImplementsListCache.get(ourImplementsListCacheKey, this, extendsList).getValue(element);
+        }
+    }
+
+    @Override
+    public boolean processDeclarations(
+        @Nonnull final PsiScopeProcessor processor,
+        @Nonnull final ResolveState substitutor,
+        final PsiElement lastParent,
+        @Nonnull final PsiElement place
+    ) {
+        final ResolveProcessor resolveProcessor = processor instanceof ResolveProcessor rProcessor ? rProcessor : null;
+        final boolean toProcessClass = resolveProcessor != null && resolveProcessor.isTypeContext();
+
+        if (toProcessClass) {
+            if (!processor.execute(this, null)) {
+                return false;
+            }
+        }
+
+        if (lastParent == null) {
+            return true;
+        }
+
+        processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
+        final boolean toProcessMembers = resolveProcessor == null
+            || !resolveProcessor.isToSkipClassDeclarationOnce() && resolveProcessor.isToProcessMembers();
+        if (toProcessMembers) {
+            if (!processMembers(processor, substitutor, lastParent, place)) {
+                return false;
+            }
+        }
+        else {
+            resolveProcessor.setToSkipClassDeclarationsOnce(false);
+        }
+
+        final boolean toProcessInHierarchy = processor instanceof ResolveProcessor rProcessor && rProcessor.isToProcessHierarchy();
+
+        if (!toProcessInHierarchy || ((ResolveProcessor)processor).checkVisited(getQualifiedName())) {
+            return true;
+        }
+
+        for (JSClass clazz : getSuperClasses()) {
+            if (!clazz.processDeclarations(processor, ResolveState.initial(), lastParent, place)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    protected abstract boolean processMembers(
+        final PsiScopeProcessor processor,
+        final ResolveState substitutor,
+        final PsiElement lastParent,
+        final PsiElement place
+    );
+
+    @Override
+    public JSClass[] getSuperClasses() {
+        final JSReferenceList extendsList = getExtendsList();
+        final List<JSClass> supers = getClassesFromReferenceList(extendsList, JSElementTypes.EXTENDS_LIST);
+        return supers.toArray(new JSClass[supers.size()]);
+    }
+
+    public static PsiElement findClassFromNamespace(final String qname, PsiElement context) {
+        PsiElement realClazz = null;
+        final PsiElement clazz = JSResolveUtil.findClassByQName(qname, context);
+
+        realClazz = clazz;
+        return realClazz;
+    }
+
+    @Override
+    public JSClass[] getImplementedInterfaces() {
+        final JSReferenceList implementsList = getImplementsList();
+        if (implementsList == null) {
+            return JSClass.EMPTY_ARRAY;
+        }
+        final List<JSClass> classes = getClassesFromReferenceList(implementsList, JSElementTypes.IMPLEMENTS_LIST);
+        return classes.toArray(new JSClass[classes.size()]);
+    }
+
+    private static class ExtendsClassesUserDataCache extends ClassesUserDataCache {
+        @Override
+        protected List<JSClass> doCompute(final Object extendsList) {
+            if (extendsList instanceof JSClass jsClass) {
+                final ArrayList<JSClass> supers = new ArrayList<>(1);
+                if (!"Object".equals(jsClass.getQualifiedName())) {
+                    final PsiElement element = findClassFromNamespace("Object", jsClass);
+                    if (element instanceof JSClass) {
+                        supers.add((JSClass)element);
+                    }
+                }
+
+                return supers;
+            }
+            return super.doCompute(extendsList);
+        }
+    }
+
+    private static class ClassesUserDataCache extends UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> {
+        @Override
+        protected ParameterizedCachedValue<List<JSClass>, Object> compute(final JSClassBase jsClassBase, final Object p) {
+            return CachedValuesManager.getManager(jsClassBase.getProject()).createParameterizedCachedValue(
+                list -> new CachedValueProvider.Result<>(doCompute(list), PsiModificationTracker.MODIFICATION_COUNT),
+                false
+            );
+        }
+
+        protected List<JSClass> doCompute(final Object object) {
+            if (object instanceof JSClass) {
+                return Collections.emptyList();
+            }
+
+            final ArrayList<JSClass> supers = new ArrayList<>(1);
+            final JSReferenceList extendsList = (JSReferenceList)object;
+
+            for (String refText : extendsList.getReferenceTexts()) {
+                refText = JSImportHandlingUtil.resolveTypeName(refText, extendsList.getParent());
+                final PsiElement element = findClassFromNamespace(refText, extendsList.getParent());
+                if (element instanceof JSClass jsClass) {
+                    supers.add(jsClass);
+                }
+            }
+            return supers;
+        }
+    }
+
+    private static <E extends PsiElement> E[] getStubChildrenByType(JSClassStub stub, final IElementType elementType, ArrayFactory<E> f) {
+        assert JSElementTypes.INCLUDE_DIRECTIVE != elementType;
+
+        ArrayList<E> result = new ArrayList<>(Arrays.asList(stub.getChildrenByType(elementType, f)));
+        JSIncludeDirective[] includes = stub.getChildrenByType(JSElementTypes.INCLUDE_DIRECTIVE, JSIncludeDirective[]::new);
+        Collection<JSFile> visited = new HashSet<>();
+        TokenSet filter = TokenSet.create(JSElementTypes.INCLUDE_DIRECTIVE, elementType);
+        for (JSIncludeDirective include : includes) {
+            PsiFile file = include.resolveFile();
+            if (file instanceof JSFile) {
+                process(filter, (JSFile)file, result, visited);
+            }
+        }
+        return result.toArray(f.create(result.size()));
+    }
+
+    private static <E extends PsiElement> void process(
+        TokenSet filter,
+        final JSFile file,
+        final ArrayList<E> result,
+        final Collection<JSFile> visited
+    ) {
+        if (visited.contains(file)) {
+            return;
+        }
+        visited.add(file);
+        for (PsiElement element : JSResolveUtil.getStubbedChildren(file, filter)) {
+            if (element instanceof JSIncludeDirective includeDirective) {
+                PsiFile includedFile = includeDirective.resolveFile();
+                if (includedFile instanceof JSFile jsFile) {
+                    process(filter, jsFile, result, visited);
+                }
+            }
+            else {
+                result.add((E)element);
+            }
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
index 2545bb72..156381da 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
@@ -14,32 +14,27 @@
  * @author VISTALL
  * @since 11/12/2021
  */
-public class JSClassExpressionImpl extends JSExpressionImpl implements JSClassExpression
-{
-	public JSClassExpressionImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class JSClassExpressionImpl extends JSExpressionImpl implements JSClassExpression {
+    public JSClassExpressionImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSExpression(this);
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JSClass getClassElement()
-	{
-		return findNotNullChildByClass(JSClass.class);
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JSClass getClassElement() {
+        return findNotNullChildByClass(JSClass.class);
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		return new JavaScriptClassType(getClassElement());
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        return new JavaScriptClassType(getClassElement());
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
index c50a2305..96012d61 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
@@ -45,199 +45,177 @@
 /**
  * @by Maxim.Mossienko
  */
-public class JSClassImpl extends JSClassBase implements JSSuppressionHolder
-{
-	public JSClassImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSClassImpl(final JSClassStub stub, JSStubElementType<JSClassStub, JSClass> elementType)
-	{
-		super(stub, elementType);
-	}
-
-	@RequiredReadAction
-	@Override
-	public int getTextOffset()
-	{
-		PsiElement nameIdentifier = getNameIdentifier();
-		return nameIdentifier == null ? super.getTextOffset() : nameIdentifier.getTextOffset();
-	}
-
-	@Override
-	public JSAttributeList getAttributeList()
-	{
-		return getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
-	}
-
-	@Override
-	@RequiredReadAction
-	public String getName()
-	{
-		final JSClassStub classStub = getStub();
-		if(classStub != null)
-		{
-			return classStub.getName();
-		}
-
-		PsiElement nameIdentifier = getNameIdentifier();
-		if(nameIdentifier instanceof JSReferenceExpression)
-		{
-			return ((JSReferenceExpression) nameIdentifier).getReferencedName();
-		}
-		else if(nameIdentifier != null)
-		{
-			return nameIdentifier.getText();
-		}
-		return null;
-	}
-
-	@Override
-	@RequiredReadAction
-	public PsiElement setName(@NonNls @Nonnull String newName) throws IncorrectOperationException
-	{
-		newName = newName.substring(newName.lastIndexOf('.') + 1);
-		final String oldName = getName();
-		if(newName.equals(oldName))
-		{
-			return this;
-		}
-		final JSFunction constructor = findFunctionByName(oldName);
-
-		PsiElement nameIdentifier = getNameIdentifier();
-		assert nameIdentifier != null;
-		getNode().replaceChild(nameIdentifier.getNode(), JSChangeUtil.createExpressionFromText(getProject(), newName).getNode());
-
-		if(constructor != null)
-		{
-			constructor.setName(newName);
-		}
-
-		JSPsiImplUtils.updateFileName(this, newName, oldName);
-
-		return this;
-	}
-
-	@Override
-	@RequiredReadAction
-	public PsiElement getNameIdentifier()
-	{
-		return findChildByType(JavaScriptTokenSets.NAME_TOKEN_TYPES);
-	}
-
-	@Override
-	public JSReferenceList getExtendsList()
-	{
-		return getStubOrPsiChild(JSElementTypes.EXTENDS_LIST);
-	}
-
-	@Override
-	public JSReferenceList getImplementsList()
-	{
-		return getStubOrPsiChild(JSElementTypes.IMPLEMENTS_LIST);
-	}
-
-	@Override
-	public
-	@NonNls
-	String getQualifiedName()
-	{
-		final JSClassStub classStub = getStub();
-		if(classStub != null)
-		{
-			return classStub.getQualifiedName();
-		}
-		return JSPsiImplUtils.getQName(this);
-	}
-
-	@Override
-	public boolean isInterface()
-	{
-		final JSClassStub classStub = getStub();
-		if(classStub != null)
-		{
-			return classStub.isInterface();
-		}
-		return getNode().findChildByType(JSTokenTypes.INTERFACE_KEYWORD) != null;
-	}
-
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		getNode().getTreeParent().removeChild(getNode());
-	}
-
-	@Override
-	public boolean isDeprecated()
-	{
-		final JSClassStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.isDeprecated();
-		}
-		return JSDocumentationUtils.calculateDeprecated(this);
-	}
-
-	@Override
-	protected boolean processMembers(final PsiScopeProcessor processor, final ResolveState substitutor, final PsiElement lastParent, final PsiElement place)
-	{
-		return JSResolveUtil.processDeclarationsInScope(this, processor, substitutor, lastParent, place);
-	}
-
-	@Override
-	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState substitutor, final PsiElement lastParent, @Nonnull final PsiElement place)
-	{
-		boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
-
-		if(b && lastParent != null && lastParent.getParent() == this && getParent() instanceof JSFile)
-		{
-			b = JSImportHandlingUtil.tryResolveImports(processor, this, place);
-		}
-		return b;
-	}
-
-	@Override
-	public PsiElement addAfter(@Nonnull final PsiElement element, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(anchor == null)
-		{
-			ASTNode node = getNode().findChildByType(JSTokenTypes.RBRACE);
-			if(node != null)
-			{
-				PsiElement psiElement = super.addAfter(element, node.getTreePrev().getPsi());
-				CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), psiElement.getNode());
-				return psiElement;
-			}
-		}
-
-		final PsiElement psiElement = super.addAfter(element, anchor);
-		CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), psiElement.getNode());
-		return psiElement;
-	}
-
-	@Override
-	public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException
-	{
-		final PsiElement superElement = super.addBefore(element, anchor);
-		CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), superElement.getNode());
-		return superElement;
-	}
-
-	@Override
-	public boolean isEquivalentTo(PsiElement another)
-	{
-		return super.isEquivalentTo(another) ||
-				(another instanceof JSFile &&
-						((JSFile) another).getVirtualFile().getNameWithoutExtension().equals(getName()) &&
-						another == getParent().getParent()) ||
-				JSPsiImplUtils.isTheSameClass(another, this);
-	}
-
-	@Override
-	public PsiElement getNavigationElement()
-	{
-		return JSPsiImplUtils.findTopLevelNavigatableElement(this);
-	}
-
+public class JSClassImpl extends JSClassBase implements JSSuppressionHolder {
+    public JSClassImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSClassImpl(final JSClassStub stub, JSStubElementType<JSClassStub, JSClass> elementType) {
+        super(stub, elementType);
+    }
+
+    @RequiredReadAction
+    @Override
+    public int getTextOffset() {
+        PsiElement nameIdentifier = getNameIdentifier();
+        return nameIdentifier == null ? super.getTextOffset() : nameIdentifier.getTextOffset();
+    }
+
+    @Override
+    public JSAttributeList getAttributeList() {
+        return getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
+    }
+
+    @Override
+    @RequiredReadAction
+    public String getName() {
+        final JSClassStub classStub = getStub();
+        if (classStub != null) {
+            return classStub.getName();
+        }
+
+        PsiElement nameIdentifier = getNameIdentifier();
+        if (nameIdentifier instanceof JSReferenceExpression referenceExpression) {
+            return referenceExpression.getReferencedName();
+        }
+        else if (nameIdentifier != null) {
+            return nameIdentifier.getText();
+        }
+        return null;
+    }
+
+    @Override
+    @RequiredReadAction
+    public PsiElement setName(@NonNls @Nonnull String newName) throws IncorrectOperationException {
+        newName = newName.substring(newName.lastIndexOf('.') + 1);
+        final String oldName = getName();
+        if (newName.equals(oldName)) {
+            return this;
+        }
+        final JSFunction constructor = findFunctionByName(oldName);
+
+        PsiElement nameIdentifier = getNameIdentifier();
+        assert nameIdentifier != null;
+        getNode().replaceChild(nameIdentifier.getNode(), JSChangeUtil.createExpressionFromText(getProject(), newName).getNode());
+
+        if (constructor != null) {
+            constructor.setName(newName);
+        }
+
+        JSPsiImplUtils.updateFileName(this, newName, oldName);
+
+        return this;
+    }
+
+    @Override
+    @RequiredReadAction
+    public PsiElement getNameIdentifier() {
+        return findChildByType(JavaScriptTokenSets.NAME_TOKEN_TYPES);
+    }
+
+    @Override
+    public JSReferenceList getExtendsList() {
+        return getStubOrPsiChild(JSElementTypes.EXTENDS_LIST);
+    }
+
+    @Override
+    public JSReferenceList getImplementsList() {
+        return getStubOrPsiChild(JSElementTypes.IMPLEMENTS_LIST);
+    }
+
+    @Override
+    public
+    @NonNls
+    String getQualifiedName() {
+        final JSClassStub classStub = getStub();
+        if (classStub != null) {
+            return classStub.getQualifiedName();
+        }
+        return JSPsiImplUtils.getQName(this);
+    }
+
+    @Override
+    public boolean isInterface() {
+        final JSClassStub classStub = getStub();
+        if (classStub != null) {
+            return classStub.isInterface();
+        }
+        return getNode().findChildByType(JSTokenTypes.INTERFACE_KEYWORD) != null;
+    }
+
+    @Override
+    public void delete() throws IncorrectOperationException {
+        getNode().getTreeParent().removeChild(getNode());
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        final JSClassStub stub = getStub();
+        if (stub != null) {
+            return stub.isDeprecated();
+        }
+        return JSDocumentationUtils.calculateDeprecated(this);
+    }
+
+    @Override
+    protected boolean processMembers(
+        final PsiScopeProcessor processor,
+        final ResolveState substitutor,
+        final PsiElement lastParent,
+        final PsiElement place
+    ) {
+        return JSResolveUtil.processDeclarationsInScope(this, processor, substitutor, lastParent, place);
+    }
+
+    @Override
+    public boolean processDeclarations(
+        @Nonnull final PsiScopeProcessor processor,
+        @Nonnull final ResolveState substitutor,
+        final PsiElement lastParent,
+        @Nonnull final PsiElement place
+    ) {
+        boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
+
+        if (b && lastParent != null && lastParent.getParent() == this && getParent() instanceof JSFile) {
+            b = JSImportHandlingUtil.tryResolveImports(processor, this, place);
+        }
+        return b;
+    }
+
+    @Override
+    public PsiElement addAfter(@Nonnull final PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        if (anchor == null) {
+            ASTNode node = getNode().findChildByType(JSTokenTypes.RBRACE);
+            if (node != null) {
+                PsiElement psiElement = super.addAfter(element, node.getTreePrev().getPsi());
+                CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), psiElement.getNode());
+                return psiElement;
+            }
+        }
+
+        final PsiElement psiElement = super.addAfter(element, anchor);
+        CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), psiElement.getNode());
+        return psiElement;
+    }
+
+    @Override
+    public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException {
+        final PsiElement superElement = super.addBefore(element, anchor);
+        CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), superElement.getNode());
+        return superElement;
+    }
+
+    @Override
+    public boolean isEquivalentTo(PsiElement another) {
+        return super.isEquivalentTo(another)
+            || (another instanceof JSFile file
+                && file.getVirtualFile().getNameWithoutExtension().equals(getName())
+                && another == getParent().getParent())
+            || JSPsiImplUtils.isTheSameClass(another, this);
+    }
+
+    @Override
+    public PsiElement getNavigationElement() {
+        return JSPsiImplUtils.findTopLevelNavigatableElement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
index a5b79a76..cf2d32f2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
@@ -28,16 +28,13 @@
  * Time: 11:41:42 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSCommaExpressionImpl extends JSBinaryExpressionImpl implements JSCommaExpression
-{
-	public JSCommaExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSCommaExpressionImpl extends JSBinaryExpressionImpl implements JSCommaExpression {
+    public JSCommaExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSCommaExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSCommaExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
index 22e5abdc..9ed843b9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
@@ -33,89 +33,72 @@
  * Time: 11:47:35 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSConditionalExpressionImpl extends JSExpressionImpl implements JSConditionalExpression
-{
-	public JSConditionalExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSConditionalExpressionImpl extends JSExpressionImpl implements JSConditionalExpression {
+    public JSConditionalExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getCondition()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		while(child != null)
-		{
-			final IElementType type = child.getElementType();
-			if(type == JSTokenTypes.QUEST)
-			{
-				return null;
-			}
-			if(JSElementTypes.EXPRESSIONS.contains(type))
-			{
-				return (JSExpression) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+    @Override
+    public JSExpression getCondition() {
+        ASTNode child = getNode().getFirstChildNode();
+        while (child != null) {
+            final IElementType type = child.getElementType();
+            if (type == JSTokenTypes.QUEST) {
+                return null;
+            }
+            if (JSElementTypes.EXPRESSIONS.contains(type)) {
+                return (JSExpression)child.getPsi();
+            }
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	public JSExpression getThen()
-	{
-		boolean questPassed = false;
-		ASTNode child = getNode().getFirstChildNode();
-		while(child != null)
-		{
-			final IElementType type = child.getElementType();
-			if(type == JSTokenTypes.QUEST)
-			{
-				questPassed = true;
-			}
-			if(type == JSTokenTypes.COLON)
-			{
-				return null;
-			}
-			if(questPassed && JSElementTypes.EXPRESSIONS.contains(type))
-			{
-				return (JSExpression) child.getPsi();
-			}
+    @Override
+    public JSExpression getThen() {
+        boolean questPassed = false;
+        ASTNode child = getNode().getFirstChildNode();
+        while (child != null) {
+            final IElementType type = child.getElementType();
+            if (type == JSTokenTypes.QUEST) {
+                questPassed = true;
+            }
+            if (type == JSTokenTypes.COLON) {
+                return null;
+            }
+            if (questPassed && JSElementTypes.EXPRESSIONS.contains(type)) {
+                return (JSExpression)child.getPsi();
+            }
 
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	public JSExpression getElse()
-	{
-		boolean questPassed = false;
-		boolean colonPassed = false;
-		ASTNode child = getNode().getFirstChildNode();
-		while(child != null)
-		{
-			final IElementType type = child.getElementType();
-			if(type == JSTokenTypes.QUEST)
-			{
-				questPassed = true;
-			}
-			if(type == JSTokenTypes.COLON)
-			{
-				colonPassed = true;
-			}
-			if(questPassed && colonPassed && JSElementTypes.EXPRESSIONS.contains(type))
-			{
-				return (JSExpression) child.getPsi();
-			}
+    @Override
+    public JSExpression getElse() {
+        boolean questPassed = false;
+        boolean colonPassed = false;
+        ASTNode child = getNode().getFirstChildNode();
+        while (child != null) {
+            final IElementType type = child.getElementType();
+            if (type == JSTokenTypes.QUEST) {
+                questPassed = true;
+            }
+            if (type == JSTokenTypes.COLON) {
+                colonPassed = true;
+            }
+            if (questPassed && colonPassed && JSElementTypes.EXPRESSIONS.contains(type)) {
+                return (JSExpression)child.getPsi();
+            }
 
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSConditionalExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSConditionalExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
index 4c1318d7..5c73e04a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
@@ -29,30 +29,24 @@
  * Time: 9:52:04 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSContinueStatementImpl extends JSStatementWithLabelReferenceImpl implements JSContinueStatement
-{
-	public JSContinueStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSContinueStatementImpl extends JSStatementWithLabelReferenceImpl implements JSContinueStatement {
+    public JSContinueStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSStatement getStatementToContinue()
-	{
-		String label = getLabel();
-		if(label == null)
-		{
-			return PsiTreeUtil.getParentOfType(this, JSLoopStatement.class, JSSwitchStatement.class);
-		}
-		else
-		{
-			return (JSStatement) getReferences()[0].resolve();
-		}
-	}
+    @Override
+    public JSStatement getStatementToContinue() {
+        String label = getLabel();
+        if (label == null) {
+            return PsiTreeUtil.getParentOfType(this, JSLoopStatement.class, JSSwitchStatement.class);
+        }
+        else {
+            return (JSStatement)getReferences()[0].resolve();
+        }
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSContinueStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSContinueStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
index d19877eb..5b221561 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
@@ -32,90 +32,71 @@
  * Time: 6:40:04 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSDefinitionExpressionImpl extends JSExpressionImpl implements JSDefinitionExpression
-{
-	public JSDefinitionExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSDefinitionExpressionImpl extends JSExpressionImpl implements JSDefinitionExpression {
+    public JSDefinitionExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	public String getName()
-	{
-		final JSExpression expression = getExpression();
-		if(expression instanceof JSReferenceExpression)
-		{
-			return ((JSReferenceExpression) expression).getReferencedName();
-		}
-		return null;
-	}
+    @Override
+    public String getName() {
+        return getExpression() instanceof JSReferenceExpression referenceExpression
+            ? referenceExpression.getReferencedName()
+            : null;
+    }
 
-	@Override
-	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
-	{
-		final JSExpression expression = getExpression();
-		if(expression instanceof JSReferenceExpressionImpl)
-		{
-			return ((JSReferenceExpressionImpl) expression).handleElementRenameInternal(name);
-		}
-		return null;
-	}
+    @Override
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+        return getExpression() instanceof JSReferenceExpressionImpl referenceExpression
+            ? referenceExpression.handleElementRenameInternal(name)
+            : null;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSDefinitionExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSDefinitionExpression(this);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-									   @Nonnull PsiElement place)
-	{
-		if(lastParent == null)
-		{
-			return processor.execute(this, state);
-		}
-		return true;
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        return lastParent == null ? processor.execute(this, state) : true;
+    }
 
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		final PsiElement parent = getParent();
+    @Override
+    public void delete() throws IncorrectOperationException {
+        final PsiElement parent = getParent();
 
-		if(parent instanceof JSAssignmentExpression)
-		{
-			final PsiElement grandParent = parent.getParent();
+        if (parent instanceof JSAssignmentExpression assignment) {
+            final PsiElement grandParent = parent.getParent();
 
-			if(grandParent instanceof JSStatement)
-			{
-				grandParent.delete();
-				return;
-			}
-			else if(grandParent instanceof JSBinaryExpression)
-			{
-				((JSBinaryExpression) grandParent).getROperand().replace(((JSAssignmentExpression) parent).getROperand());
-				return;
-			}
-			else if(grandParent instanceof JSVariable)
-			{
-				final JSExpression initializerExpression = ((JSVariable) grandParent).getInitializer();
-				initializerExpression.replace(((JSAssignmentExpression) parent).getROperand());
-				return;
-			}
-		}
-		super.delete();
-	}
+            if (grandParent instanceof JSStatement) {
+                grandParent.delete();
+                return;
+            }
+            else if (grandParent instanceof JSBinaryExpression binaryExpression) {
+                binaryExpression.getROperand().replace(assignment.getROperand());
+                return;
+            }
+            else if (grandParent instanceof JSVariable variable) {
+                final JSExpression initializerExpression = variable.getInitializer();
+                initializerExpression.replace(assignment.getROperand());
+                return;
+            }
+        }
+        super.delete();
+    }
 
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		return null;
-	}
+    @Override
+    public PsiElement getNameIdentifier() {
+        return null;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
index bfcaf37b..ba80efb1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
@@ -30,28 +30,23 @@
  * Time: 10:15:13 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSDoWhileStatementImpl extends JSStatementImpl implements JSDoWhileStatement
-{
-	public JSDoWhileStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSDoWhileStatementImpl extends JSStatementImpl implements JSDoWhileStatement {
+    public JSDoWhileStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getCondition()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getCondition() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	public JSStatement getBody()
-	{
-		return findChildByClass(JSStatement.class);
-	}
+    @Override
+    public JSStatement getBody() {
+        return findChildByClass(JSStatement.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSDoWhileStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSDoWhileStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
index 6ec245cf..50aa04f7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
@@ -25,33 +25,27 @@
 import consulo.language.ast.ASTNode;
 import jakarta.annotation.Nonnull;
 
-public class JSDocCommentImpl extends JSElementImpl implements JSDocComment
-{
-	public JSDocCommentImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSDocCommentImpl extends JSElementImpl implements JSDocComment {
+    public JSDocCommentImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public IElementType getTokenType()
-	{
-		return getNode().getElementType();
-	}
+    @Override
+    public IElementType getTokenType() {
+        return getNode().getElementType();
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSDocComment(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSDocComment(this);
+    }
 
-	@Override
-	public JSDocTag[] getTags()
-	{
-		final PsiElement firstChild = getFirstChild();
-		if(firstChild instanceof JSDocComment)
-		{
-			return ((JSDocComment) firstChild).getTags();
-		}
-		return findChildrenByType(JSDocTokenTypes.DOC_TAG, JSDocTag.class);
-	}
+    @Override
+    public JSDocTag[] getTags() {
+        final PsiElement firstChild = getFirstChild();
+        if (firstChild instanceof JSDocComment docComment) {
+            return docComment.getTags();
+        }
+        return findChildrenByType(JSDocTokenTypes.DOC_TAG, JSDocTag.class);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index 1f090952..e4570ed9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -31,305 +31,250 @@
 import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-public class JSDocTagImpl extends JSElementImpl implements JSDocTag
-{
-	private volatile PsiReference[] myRefs;
-	private volatile long myModificationCount = -1;
-
-	public JSDocTagImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	@Override
-	public String getName()
-	{
-		final PsiElement element = findChildByType(JSDocTokenTypes.DOC_TAG_NAME);
-		return element != null ? element.getText().substring(1) : null;
-	}
-
-	@Override
-	public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException
-	{
-		throw new IncorrectOperationException();
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSDocTag(this);
-	}
-
-	@Override
-	public JSDocTagValue getValue()
-	{
-		return findChildByClass(JSDocTagValue.class);
-	}
-
-	@Nonnull
-	@Override
-	public PsiReference[] getReferences()
-	{
-		final long count = getManager().getModificationTracker().getModificationCount();
-
-		if(count != myModificationCount)
-		{
-			final @NonNls String name = getName();
-			PsiReference[] result = PsiReference.EMPTY_ARRAY;
-
-			if("param".equals(name))
-			{
-				final PsiElement data = findChildByType(JSDocTokenTypes.DOC_COMMENT_DATA);
-				if(data != null)
-				{
-					result = new PsiReference[]{new ParamReference(this)};
-				}
-			}
-
-			myRefs = result;
-			myModificationCount = count;
-		}
-
-		return myRefs;
-	}
-
-	private static class ParamReference implements PsiReference, EmptyResolveMessageProvider
-	{
-		private PsiElement myJsDocTagValue;
-		private TextRange myRange;
-
-		public ParamReference(final JSDocTagImpl elt)
-		{
-			reset(elt);
-		}
-
-		private void reset(final JSDocTagImpl elt)
-		{
-			myJsDocTagValue = elt.findChildByType(JSDocTokenTypes.DOC_COMMENT_DATA);
-			int offsetInParent = myJsDocTagValue.getStartOffsetInParent();
-			int textLength;
-
-			if(myJsDocTagValue.textContains('['))
-			{
-				final String text = myJsDocTagValue.getText();
-				final int at = text.indexOf('[');
-				offsetInParent += at + 1;
-
-				// @param [name] | //@param[name="something"] | [obj.prop2(='somestring')?]
-				int rBracketIndex = text.indexOf(']');
-				int eqIndex = text.indexOf('=');
-				int dotIndex = text.indexOf('.');
-				int combinedIndex = text.length();
-
-				if(rBracketIndex != -1)
-				{
-					combinedIndex = rBracketIndex;
-				}
-				if(eqIndex != -1)
-				{
-					combinedIndex = eqIndex;
-				}
-				if(dotIndex != -1 && (eqIndex == -1 || dotIndex < eqIndex))
-				{
-					combinedIndex = dotIndex;
-				}
-				textLength = combinedIndex - at - 1;
-
-			}
-			else if(myJsDocTagValue.textContains('='))
-			{
-				textLength = myJsDocTagValue.getText().indexOf('='); // @param name=""
-			}
-			else
-			{
-				if(myJsDocTagValue.textContains('.'))
-				{ //@param userInfo.email
-					textLength = myJsDocTagValue.getText().indexOf('.');
-				}
-				else
-				{
-					textLength = myJsDocTagValue.getTextLength();
-				}
-			}
-			myRange = new TextRange(offsetInParent, offsetInParent + textLength);
-		}
-
-		@Override
-		public PsiElement getElement()
-		{
-			return myJsDocTagValue.getParent();
-		}
-
-		@Override
-		public TextRange getRangeInElement()
-		{
-			return myRange;
-		}
-
-		@Override
-		public String getCanonicalText()
-		{
-			final int offsetInText = myRange.getStartOffset() - myJsDocTagValue.getStartOffsetInParent();
-			return myJsDocTagValue.getText().substring(offsetInText, offsetInText + myRange.getLength());
-		}
-
-		@Override
-		public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException
-		{
-			JSDocTag jsDocTag = (JSDocTag) myJsDocTagValue.getParent();
-			final ElementManipulator<JSDocTag> manipulator = ElementManipulators.getManipulator(jsDocTag);
-			jsDocTag = manipulator.handleContentChange(jsDocTag, myRange, newElementName);
-			reset((JSDocTagImpl) jsDocTag);
-			return myJsDocTagValue;
-		}
-
-		@Override
-		public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException
-		{
-			return null;
-		}
-
-		@Override
-		public boolean isReferenceTo(final PsiElement element)
-		{
-			return element.isEquivalentTo(resolve());
-		}
-
-		private static JSParameterList findParameterList(PsiElement elt)
-		{
-			if(elt == null)
-			{
-				return null;
-			}
-			PsiComment psiComment = PsiTreeUtil.getParentOfType(elt, PsiComment.class);
-			if(psiComment == null)
-			{
-				return null;
-			}
-			final PsiElement parent = psiComment.getParent();
-			if(parent instanceof PsiComment)
-			{
-				psiComment = (PsiComment) parent;
-			}
-
-			PsiElement next = psiComment.getNextSibling();
-			if(next instanceof PsiWhiteSpace)
-			{
-				next = next.getNextSibling();
-			}
-			if(next instanceof PsiComment)
-			{
-				next = next.getNextSibling();
-				if(next instanceof PsiWhiteSpace)
-				{
-					next = next.getNextSibling();
-				}
-			}
-
-			if(next instanceof JSExpressionStatement)
-			{
-				final JSExpression expression = ((JSExpressionStatement) next).getExpression();
-
-				if(expression instanceof JSAssignmentExpression)
-				{
-					JSExpression roperand = ((JSAssignmentExpression) expression).getROperand();
-					if(roperand instanceof JSNewExpression)
-					{
-						roperand = ((JSNewExpression) roperand).getMethodExpression();
-					}
-
-					if(roperand instanceof JSFunctionExpression)
-					{
-						next = roperand;
-					}
-				}
-			}
-			else if(next instanceof JSProperty)
-			{
-				next = ((JSProperty) next).getValue();
-			}
-			else if(next instanceof JSVarStatement)
-			{
-				JSVariable[] variables = ((JSVarStatement) next).getVariables();
-				if(variables.length > 0)
-				{
-					JSExpression initializer = variables[0].getInitializer();
-					if(initializer instanceof JSFunctionExpression)
-					{
-						next = initializer;
-					}
-				}
-			}
-			else if(next != null)
-			{
-				if(next instanceof JSVariable)
-				{
-					JSExpression expression = ((JSVariable) next).getInitializer();
-					if(expression instanceof JSFunctionExpression)
-					{
-						next = expression;
-					}
-				}
-				PsiElement nextParent = next.getParent();
-				if(nextParent instanceof JSFunction)
-				{
-					next = nextParent;
-				}
-			}
-			if(next instanceof JSFunction)
-			{
-				return ((JSFunction) next).getParameterList();
-			}
-
-			return null;
-		}
-
-		@Override
-		public PsiElement resolve()
-		{
-			final JSParameterList parameterList = findParameterList(getElement());
-
-			if(parameterList != null)
-			{
-				final String name = getCanonicalText();
-				for(JSParameter param : parameterList.getParameters())
-				{
-					if(name.equals(param.getName()))
-					{
-						return param;
-					}
-				}
-			}
-
-			return null;
-		}
-
-		@Override
-		public Object[] getVariants()
-		{
-			final PsiElement elt = getElement();
-			final JSParameterList parameterList = findParameterList(PsiUtilBase.getOriginalElement(elt, elt.getClass()));
-
-			if(parameterList != null)
-			{
-				final JSParameter[] parameters = parameterList.getParameters();
-				final Object[] result = new Object[parameters.length];
-
-				for(int i = 0; i < parameters.length; ++i)
-				{
-					result[i] = JSLookupUtil.createLookupItem(parameters[i], parameters[i].getName(), JSLookupUtil.LookupPriority.HIGHEST);
-				}
-				return result;
-			}
-
-			return ArrayUtil.EMPTY_OBJECT_ARRAY;
-		}
-
-		@Nonnull
-		@Override
-		public LocalizeValue buildUnresolvedMessage(@Nonnull String referenceText)
-		{
-			return JavaScriptLocalize.javascriptValidationMessageIncorrectParameterName();
-		}
-	}
+public class JSDocTagImpl extends JSElementImpl implements JSDocTag {
+    private volatile PsiReference[] myRefs;
+    private volatile long myModificationCount = -1;
+
+    public JSDocTagImpl(final ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public String getName() {
+        final PsiElement element = findChildByType(JSDocTokenTypes.DOC_TAG_NAME);
+        return element != null ? element.getText().substring(1) : null;
+    }
+
+    @Override
+    public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException {
+        throw new IncorrectOperationException();
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSDocTag(this);
+    }
+
+    @Override
+    public JSDocTagValue getValue() {
+        return findChildByClass(JSDocTagValue.class);
+    }
+
+    @Nonnull
+    @Override
+    public PsiReference[] getReferences() {
+        final long count = getManager().getModificationTracker().getModificationCount();
+
+        if (count != myModificationCount) {
+            final @NonNls String name = getName();
+            PsiReference[] result = PsiReference.EMPTY_ARRAY;
+
+            if ("param".equals(name)) {
+                final PsiElement data = findChildByType(JSDocTokenTypes.DOC_COMMENT_DATA);
+                if (data != null) {
+                    result = new PsiReference[]{new ParamReference(this)};
+                }
+            }
+
+            myRefs = result;
+            myModificationCount = count;
+        }
+
+        return myRefs;
+    }
+
+    private static class ParamReference implements PsiReference, EmptyResolveMessageProvider {
+        private PsiElement myJsDocTagValue;
+        private TextRange myRange;
+
+        public ParamReference(final JSDocTagImpl elt) {
+            reset(elt);
+        }
+
+        private void reset(final JSDocTagImpl elt) {
+            myJsDocTagValue = elt.findChildByType(JSDocTokenTypes.DOC_COMMENT_DATA);
+            int offsetInParent = myJsDocTagValue.getStartOffsetInParent();
+            int textLength;
+
+            if (myJsDocTagValue.textContains('[')) {
+                final String text = myJsDocTagValue.getText();
+                final int at = text.indexOf('[');
+                offsetInParent += at + 1;
+
+                // @param [name] | //@param[name="something"] | [obj.prop2(='somestring')?]
+                int rBracketIndex = text.indexOf(']');
+                int eqIndex = text.indexOf('=');
+                int dotIndex = text.indexOf('.');
+                int combinedIndex = text.length();
+
+                if (rBracketIndex != -1) {
+                    combinedIndex = rBracketIndex;
+                }
+                if (eqIndex != -1) {
+                    combinedIndex = eqIndex;
+                }
+                if (dotIndex != -1 && (eqIndex == -1 || dotIndex < eqIndex)) {
+                    combinedIndex = dotIndex;
+                }
+                textLength = combinedIndex - at - 1;
+
+            }
+            else if (myJsDocTagValue.textContains('=')) {
+                textLength = myJsDocTagValue.getText().indexOf('='); // @param name=""
+            }
+            else {
+                if (myJsDocTagValue.textContains('.')) { //@param userInfo.email
+                    textLength = myJsDocTagValue.getText().indexOf('.');
+                }
+                else {
+                    textLength = myJsDocTagValue.getTextLength();
+                }
+            }
+            myRange = new TextRange(offsetInParent, offsetInParent + textLength);
+        }
+
+        @Override
+        public PsiElement getElement() {
+            return myJsDocTagValue.getParent();
+        }
+
+        @Override
+        public TextRange getRangeInElement() {
+            return myRange;
+        }
+
+        @Override
+        public String getCanonicalText() {
+            final int offsetInText = myRange.getStartOffset() - myJsDocTagValue.getStartOffsetInParent();
+            return myJsDocTagValue.getText().substring(offsetInText, offsetInText + myRange.getLength());
+        }
+
+        @Override
+        public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException {
+            JSDocTag jsDocTag = (JSDocTag)myJsDocTagValue.getParent();
+            final ElementManipulator<JSDocTag> manipulator = ElementManipulators.getManipulator(jsDocTag);
+            jsDocTag = manipulator.handleContentChange(jsDocTag, myRange, newElementName);
+            reset((JSDocTagImpl)jsDocTag);
+            return myJsDocTagValue;
+        }
+
+        @Override
+        public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException {
+            return null;
+        }
+
+        @Override
+        public boolean isReferenceTo(final PsiElement element) {
+            return element.isEquivalentTo(resolve());
+        }
+
+        private static JSParameterList findParameterList(PsiElement elt) {
+            if (elt == null) {
+                return null;
+            }
+            PsiComment psiComment = PsiTreeUtil.getParentOfType(elt, PsiComment.class);
+            if (psiComment == null) {
+                return null;
+            }
+            final PsiElement parent = psiComment.getParent();
+            if (parent instanceof PsiComment) {
+                psiComment = (PsiComment)parent;
+            }
+
+            PsiElement next = psiComment.getNextSibling();
+            if (next instanceof PsiWhiteSpace) {
+                next = next.getNextSibling();
+            }
+            if (next instanceof PsiComment) {
+                next = next.getNextSibling();
+                if (next instanceof PsiWhiteSpace) {
+                    next = next.getNextSibling();
+                }
+            }
+
+            if (next instanceof JSExpressionStatement expressionStatement) {
+                final JSExpression expression = expressionStatement.getExpression();
+
+                if (expression instanceof JSAssignmentExpression assignment) {
+                    JSExpression roperand = assignment.getROperand();
+                    if (roperand instanceof JSNewExpression newExpression) {
+                        roperand = newExpression.getMethodExpression();
+                    }
+
+                    if (roperand instanceof JSFunctionExpression) {
+                        next = roperand;
+                    }
+                }
+            }
+            else if (next instanceof JSProperty property) {
+                next = property.getValue();
+            }
+            else if (next instanceof JSVarStatement varStatement) {
+                JSVariable[] variables = varStatement.getVariables();
+                if (variables.length > 0) {
+                    JSExpression initializer = variables[0].getInitializer();
+                    if (initializer instanceof JSFunctionExpression) {
+                        next = initializer;
+                    }
+                }
+            }
+            else if (next != null) {
+                if (next instanceof JSVariable variable) {
+                    JSExpression expression = variable.getInitializer();
+                    if (expression instanceof JSFunctionExpression) {
+                        next = expression;
+                    }
+                }
+                PsiElement nextParent = next.getParent();
+                if (nextParent instanceof JSFunction) {
+                    next = nextParent;
+                }
+            }
+            if (next instanceof JSFunction function) {
+                return function.getParameterList();
+            }
+
+            return null;
+        }
+
+        @Override
+        public PsiElement resolve() {
+            final JSParameterList parameterList = findParameterList(getElement());
+
+            if (parameterList != null) {
+                final String name = getCanonicalText();
+                for (JSParameter param : parameterList.getParameters()) {
+                    if (name.equals(param.getName())) {
+                        return param;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        @Override
+        public Object[] getVariants() {
+            final PsiElement elt = getElement();
+            final JSParameterList parameterList = findParameterList(PsiUtilBase.getOriginalElement(elt, elt.getClass()));
+
+            if (parameterList != null) {
+                final JSParameter[] parameters = parameterList.getParameters();
+                final Object[] result = new Object[parameters.length];
+
+                for (int i = 0; i < parameters.length; ++i) {
+                    result[i] = JSLookupUtil.createLookupItem(parameters[i], parameters[i].getName(), JSLookupUtil.LookupPriority.HIGHEST);
+                }
+                return result;
+            }
+
+            return ArrayUtil.EMPTY_OBJECT_ARRAY;
+        }
+
+        @Nonnull
+        @Override
+        public LocalizeValue buildUnresolvedMessage(@Nonnull String referenceText) {
+            return JavaScriptLocalize.javascriptValidationMessageIncorrectParameterName();
+        }
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
index 990edd91..b8059ac3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
@@ -28,106 +28,88 @@
 
 import jakarta.annotation.Nonnull;
 
-public class JSDocTagValueImpl extends JSElementImpl implements JSDocTagValue
-{
-	private volatile PsiReference[] myRefs;
-	private volatile long myModificationCount = -1;
-
-	public JSDocTagValueImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	@Nonnull
-	@Override
-	public PsiReference[] getReferences()
-	{
-		final long count = getManager().getModificationTracker().getModificationCount();
-
-		if(count != myModificationCount)
-		{
-			final @NonNls String name = ((PsiNamedElement) getParent()).getName();
-			PsiReference[] result = PsiReference.EMPTY_ARRAY;
-
-			if(name != null)
-			{
-				@NonNls String text = getText();
-
-				boolean soft = false;
-
-				if("class".equals(name))
-				{
-					soft = text.indexOf('.') == -1;
-				}
-				else if("see".equals(name))
-				{
-					soft = true;
-					if(!text.startsWith("http:"))
-					{
-						if(text.indexOf('#') != -1)
-						{ //Array#length, flash.ui.ContextMenu#customItems, #updateProperties()
-							soft = false;
-						}
-						else
-						{
-							int dotPos = text.lastIndexOf('.');
-							if(dotPos != -1 && dotPos + 1 < text.length() && Character.isUpperCase(text.charAt(dotPos + 1)))
-							{
-								soft = false; // flash.ui.ContextMenu
-							}
-						}
-					}
-				}
-				else if("returns".equals(name))
-				{
-					soft = true;
-				}
-
-				int offset = 0;
-				if(text.startsWith("{"))
-				{
-					text = text.substring(1);
-					offset++;
-					soft = false;
-				}
-				if(text.endsWith("}"))
-				{
-					text = text.substring(0, text.length() - 1);
-				}
-
-				final StringTokenizer tokenizer = new StringTokenizer(text, JSResolveUtil.COMMENT_DELIMITERS);
-				while(tokenizer.hasMoreElements())
-				{
-					@NonNls String textFragment = tokenizer.nextElement();
-					int localOffset = offset + tokenizer.getCurrentPosition() - textFragment.length();
-					if(textFragment.endsWith("[]"))
-					{
-						textFragment = textFragment.substring(0, textFragment.length() - 2);
-					}
-					int i = textFragment.indexOf('?');
-					if(i != -1)
-					{
-						textFragment = textFragment.substring(0, i);
-					}
-
-					if(!"void".equals(textFragment))
-					{
-						final JSReferenceSet set = new JSReferenceSet(this, textFragment, localOffset, soft, false, false);
-						result = ArrayUtil.mergeArrays(result, set.getReferences(), PsiReference.ARRAY_FACTORY);
-					}
-				}
-			}
-
-			myRefs = result;
-			myModificationCount = count;
-		}
-
-		return myRefs;
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSDocTagValue(this);
-	}
+public class JSDocTagValueImpl extends JSElementImpl implements JSDocTagValue {
+    private volatile PsiReference[] myRefs;
+    private volatile long myModificationCount = -1;
+
+    public JSDocTagValueImpl(final ASTNode node) {
+        super(node);
+    }
+
+    @Nonnull
+    @Override
+    public PsiReference[] getReferences() {
+        final long count = getManager().getModificationTracker().getModificationCount();
+
+        if (count != myModificationCount) {
+            final @NonNls String name = ((PsiNamedElement)getParent()).getName();
+            PsiReference[] result = PsiReference.EMPTY_ARRAY;
+
+            if (name != null) {
+                @NonNls String text = getText();
+
+                boolean soft = false;
+
+                if ("class".equals(name)) {
+                    soft = text.indexOf('.') == -1;
+                }
+                else if ("see".equals(name)) {
+                    soft = true;
+                    if (!text.startsWith("http:")) {
+                        if (text.indexOf('#') != -1) { //Array#length, flash.ui.ContextMenu#customItems, #updateProperties()
+                            soft = false;
+                        }
+                        else {
+                            int dotPos = text.lastIndexOf('.');
+                            if (dotPos != -1 && dotPos + 1 < text.length() && Character.isUpperCase(text.charAt(dotPos + 1))) {
+                                soft = false; // flash.ui.ContextMenu
+                            }
+                        }
+                    }
+                }
+                else if ("returns".equals(name)) {
+                    soft = true;
+                }
+
+                int offset = 0;
+                if (text.startsWith("{")) {
+                    text = text.substring(1);
+                    offset++;
+                    soft = false;
+                }
+                if (text.endsWith("}")) {
+                    text = text.substring(0, text.length() - 1);
+                }
+
+                final StringTokenizer tokenizer = new StringTokenizer(text, JSResolveUtil.COMMENT_DELIMITERS);
+                while (tokenizer.hasMoreElements()) {
+                    @NonNls String textFragment = tokenizer.nextElement();
+                    int localOffset = offset + tokenizer.getCurrentPosition() - textFragment.length();
+                    if (textFragment.endsWith("[]")) {
+                        textFragment = textFragment.substring(0, textFragment.length() - 2);
+                    }
+                    int i = textFragment.indexOf('?');
+                    if (i != -1) {
+                        textFragment = textFragment.substring(0, i);
+                    }
+
+                    if (!"void".equals(textFragment)) {
+                        final JSReferenceSet set =
+                            new JSReferenceSet(this, textFragment, localOffset, soft, false, false);
+                        result = ArrayUtil.mergeArrays(result, set.getReferences(), PsiReference.ARRAY_FACTORY);
+                    }
+                }
+            }
+
+            myRefs = result;
+            myModificationCount = count;
+        }
+
+        return myRefs;
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSDocTagValue(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
index 57527f84..bc1df5a3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
@@ -23,10 +23,8 @@
  * @author max
  * @since Jan 30, 2005 8:23:10 PM
  */
-public abstract class JSElementImpl extends JSStubElementImpl<StubElement>
-{
-	public JSElementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public abstract class JSElementImpl extends JSStubElementImpl<StubElement> {
+    public JSElementImpl(final ASTNode node) {
+        super(node);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
index 11966cc2..b93ba72a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
@@ -38,82 +38,63 @@
  * Time: 12:02:38 AM
  * To change this template use File | Settings | File Templates.
  */
-public class JSEmbeddedContentImpl extends JSElementImpl implements XmlTagChild
-{
-	public JSEmbeddedContentImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSEmbeddedContentImpl extends JSElementImpl implements XmlTagChild {
+    public JSEmbeddedContentImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@Override
-	public XmlTag getParentTag()
-	{
-		final PsiElement parent = getParent();
-		if(parent instanceof XmlTag)
-		{
-			return (XmlTag) parent;
-		}
-		return null;
-	}
+    @Override
+    public XmlTag getParentTag() {
+        final PsiElement parent = getParent();
+        return parent instanceof XmlTag parentTag ? parentTag : null;
+    }
 
-	@Override
-	public XmlTagChild getNextSiblingInTag()
-	{
-		PsiElement nextSibling = getNextSibling();
-		if(nextSibling instanceof XmlTagChild)
-		{
-			return (XmlTagChild) nextSibling;
-		}
-		return null;
-	}
+    @Override
+    public XmlTagChild getNextSiblingInTag() {
+        PsiElement nextSibling = getNextSibling();
+        return nextSibling instanceof XmlTagChild tagChild ? tagChild : null;
+    }
 
-	@Override
-	public XmlTagChild getPrevSiblingInTag()
-	{
-		final PsiElement prevSibling = getPrevSibling();
-		if(prevSibling instanceof XmlTagChild)
-		{
-			return (XmlTagChild) prevSibling;
-		}
-		return null;
-	}
+    @Override
+    public XmlTagChild getPrevSiblingInTag() {
+        final PsiElement prevSibling = getPrevSibling();
+        return prevSibling instanceof XmlTagChild tagChild ? tagChild : null;
+    }
 
-	@Override
-	public boolean processElements(PsiElementProcessor processor, PsiElement place)
-	{
-		// TODO
-		return true;
-	}
+    @Override
+    public boolean processElements(PsiElementProcessor processor, PsiElement place) {
+        // TODO
+        return true;
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-			@Nonnull PsiElement place)
-	{
-		return JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        return JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
+    }
 
-	@Override
-	public String toString()
-	{
-		String s = super.toString();
-		final IElementType type = getNode().getElementType();
-		if(type != JSElementTypes.EMBEDDED_CONTENT)
-		{
-			s += ":" + type;
-		}
-		return s;
-	}
+    @Override
+    public String toString() {
+        String s = super.toString();
+        final IElementType type = getNode().getElementType();
+        if (type != JSElementTypes.EMBEDDED_CONTENT) {
+            s += ":" + type;
+        }
+        return s;
+    }
 
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		final ASTNode astNode = getNode();
-		astNode.getTreeParent().removeChild(astNode);
-	}
+    @Override
+    public void delete() throws IncorrectOperationException {
+        final ASTNode astNode = getNode();
+        astNode.getTreeParent().removeChild(astNode);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
index 1297ca47..a0685b35 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
@@ -28,16 +28,13 @@
  * Time: 9:48:05 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSEmptyStatementImpl extends JSStatementImpl implements JSEmptyStatement
-{
-	public JSEmptyStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSEmptyStatementImpl extends JSStatementImpl implements JSEmptyStatement {
+    public JSEmptyStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSEmptyStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSEmptyStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
index 4afdab2f..849c3d82 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
@@ -32,72 +32,59 @@
 /**
  * @author nik
  */
-public class JSExpressionCodeFragmentImpl extends JSFileImpl implements JSExpressionCodeFragment
-{
-	private PsiElement myContext;
-	private boolean myPhysical;
-	private FileViewProvider myViewProvider;
+public class JSExpressionCodeFragmentImpl extends JSFileImpl implements JSExpressionCodeFragment {
+    private PsiElement myContext;
+    private boolean myPhysical;
+    private FileViewProvider myViewProvider;
 
-	public JSExpressionCodeFragmentImpl(Project project, @NonNls String name, CharSequence text, boolean isPhysical)
-	{
-		super(new SingleRootFileViewProvider(PsiManager.getInstance(project), new LightVirtualFile(name, FileTypeManager.getInstance().getFileTypeByFileName(name), text), isPhysical));
-		myPhysical = isPhysical;
-		((SingleRootFileViewProvider) getViewProvider()).forceCachedPsi(this);
-	}
+    public JSExpressionCodeFragmentImpl(Project project, @NonNls String name, CharSequence text, boolean isPhysical) {
+        super(new SingleRootFileViewProvider(
+            PsiManager.getInstance(project),
+            new LightVirtualFile(name, FileTypeManager.getInstance().getFileTypeByFileName(name), text),
+            isPhysical
+        ));
+        myPhysical = isPhysical;
+        ((SingleRootFileViewProvider)getViewProvider()).forceCachedPsi(this);
+    }
 
-	//todo[nik] extract these methods from PsiCodeFragmentImpl?
-	@Override
-	protected JSExpressionCodeFragmentImpl clone()
-	{
-		final JSExpressionCodeFragmentImpl clone = (JSExpressionCodeFragmentImpl) cloneImpl((FileElement) calcTreeElement().clone());
-		clone.myPhysical = false;
-		clone.myOriginalFile = this;
-		SingleRootFileViewProvider cloneViewProvider = new SingleRootFileViewProvider(getManager(), new LightVirtualFile(getName(), getLanguage(), getText()), false);
-		cloneViewProvider.forceCachedPsi(clone);
-		clone.myViewProvider = cloneViewProvider;
-		return clone;
-	}
+    //todo[nik] extract these methods from PsiCodeFragmentImpl?
+    @Override
+    protected JSExpressionCodeFragmentImpl clone() {
+        final JSExpressionCodeFragmentImpl clone = (JSExpressionCodeFragmentImpl)cloneImpl((FileElement)calcTreeElement().clone());
+        clone.myPhysical = false;
+        clone.myOriginalFile = this;
+        SingleRootFileViewProvider cloneViewProvider =
+            new SingleRootFileViewProvider(getManager(), new LightVirtualFile(getName(), getLanguage(), getText()), false);
+        cloneViewProvider.forceCachedPsi(clone);
+        clone.myViewProvider = cloneViewProvider;
+        return clone;
+    }
 
-	@Override
-	public PsiElement getContext()
-	{
-		return myContext;
-	}
+    @Override
+    public PsiElement getContext() {
+        return myContext;
+    }
 
-	@Override
-	@Nonnull
-	public FileViewProvider getViewProvider()
-	{
-		if(myViewProvider != null)
-		{
-			return myViewProvider;
-		}
-		return super.getViewProvider();
-	}
+    @Override
+    @Nonnull
+    public FileViewProvider getViewProvider() {
+        return myViewProvider != null ? myViewProvider : super.getViewProvider();
+    }
 
-	@Override
-	public boolean isValid()
-	{
-		if(!super.isValid())
-		{
-			return false;
-		}
-		if(myContext != null && !myContext.isValid())
-		{
-			return false;
+    @Override
+    public boolean isValid() {
+		if (!super.isValid() || myContext != null && !myContext.isValid()) {
+            return false;
 		}
-		return true;
-	}
-
-	@Override
-	public boolean isPhysical()
-	{
-		return myPhysical;
-	}
+        return true;
+    }
 
-	public void setContext(PsiElement context)
-	{
-		myContext = context;
-	}
+    @Override
+    public boolean isPhysical() {
+        return myPhysical;
+    }
 
+    public void setContext(PsiElement context) {
+        myContext = context;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
index 83d4f6d2..733a59da 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
@@ -25,24 +25,20 @@
 /**
  * @author ven
  */
-public abstract class JSExpressionImpl extends JSElementImpl implements JSExpression
-{
-	public JSExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public abstract class JSExpressionImpl extends JSElementImpl implements JSExpression {
+    public JSExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		return JavaScriptType.UNKNOWN;
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        return JavaScriptType.UNKNOWN;
+    }
 
-	@Override
-	public JSExpression replace(JSExpression newExpr)
-	{
-		return JSChangeUtil.replaceExpression(this, newExpr);
-	}
+    @Override
+    public JSExpression replace(JSExpression newExpr) {
+        return JSChangeUtil.replaceExpression(this, newExpr);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index b924606a..54af43bc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -37,65 +37,56 @@
  * Time: 9:26:39 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSExpressionStatementImpl extends JSStatementImpl implements JSExpressionStatement
-{
-	public JSExpressionStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSExpressionStatementImpl extends JSStatementImpl implements JSExpressionStatement {
+    public JSExpressionStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @RequiredReadAction
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSExpressionStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSExpressionStatement(this);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-									   @Nonnull PsiElement place)
-	{
-		if(lastParent == null)
-		{
-			final JSExpression expression = getExpression();
-			if(expression != null)
-			{
-				return expression.processDeclarations(processor, state, lastParent, place);
-			}
-		}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+		@Nonnull ResolveState state,
+		PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        if (lastParent == null) {
+            final JSExpression expression = getExpression();
+            if (expression != null) {
+                return expression.processDeclarations(processor, state, lastParent, place);
+            }
+        }
 
-		return super.processDeclarations(processor, state, lastParent, place);
-	}
+        return super.processDeclarations(processor, state, lastParent, place);
+    }
 
-	@Override
-	public ItemPresentation getPresentation()
-	{
-		return new ItemPresentation()
-		{
-			@Override
-			public String getPresentableText()
-			{
-				return getText();
-			}
+    @Override
+    public ItemPresentation getPresentation() {
+        return new ItemPresentation() {
+            @Override
+            public String getPresentableText() {
+                return getText();
+            }
 
-			@Override
-			public String getLocationString()
-			{
-				return "";
-			}
+            @Override
+            public String getLocationString() {
+                return "";
+            }
 
-			@Override
-			public Image getIcon()
-			{
-				return IconDescriptorUpdaters.getIcon(JSExpressionStatementImpl.this, 0);
-			}
-		};
-
-	}
+            @Override
+            public Image getIcon() {
+                return IconDescriptorUpdaters.getIcon(JSExpressionStatementImpl.this, 0);
+            }
+        };
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
index 6185aad1..36890bcd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
@@ -46,147 +46,127 @@
  * Time: 12:25:04 AM
  * To change this template use File | Settings | File Templates.
  */
-public class JSFileImpl extends PsiFileBase implements JSFile
-{
-	public JSFileImpl(FileViewProvider fileViewProvider)
-	{
-		super(fileViewProvider, JavaScriptLanguage.INSTANCE);
-	}
-
-	@Override
-	public String toString()
-	{
-		return "JSFile:" + getName();
-	}
-
-	@Override
-	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, @Nullable PsiElement lastParent,
-									   @Nonnull PsiElement place)
-	{
-		boolean result = JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
-		if(lastParent == null)
-		{
-			return result;
-		}
-
-		if(result)
-		{
-			if(getContext() == null)
-			{
-				if(!(lastParent instanceof JSPackageStatement))
-				{
-					result = JSImportHandlingUtil.tryResolveImports(processor, this, place);
-				}
-
-				if(result &&
-						JSResolveUtil.isNewResolveAndCompletion(this) &&
-						(JSResolveUtil.shouldProcessImports(place, processor)))
-				{
-					result = JSResolveUtil.processGlobalThings(processor, state, place, this);
-				}
-			}
-		}
-
-		return result;
-	}
-
-	@Override
-	public void accept(@Nonnull PsiElementVisitor visitor)
-	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			((JSElementVisitor) visitor).visitJSElement(this);
-		}
-		else
-		{
-			super.accept(visitor);
-		}
-	}
-
-	@Override
-	public PsiElement addRangeBefore(@Nonnull PsiElement first, @Nonnull PsiElement last, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(first))
-		{
-			return JSChangeUtil.doAddRangeBefore(this, first, last, anchor);
-		}
-		return super.addRangeBefore(first, last, anchor);
-	}
-
-	@Override
-	public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOperationException
-	{
-		return addRangeAfter(first, last, null);
-	}
-
-	@Override
-	public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(element))
-		{
-			return JSChangeUtil.doAddAfter(this, element, anchor);
-		}
-		return super.addAfter(element, anchor);
-	}
-
-	@Override
-	public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(element))
-		{
-			return JSChangeUtil.doAddBefore(this, element, anchor);
-		}
-		return super.addBefore(element, anchor);
-	}
-
-	@Override
-	public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(first))
-		{
-			return JSChangeUtil.doAddRangeAfter(this, first, last, anchor);
-		}
-
-		return super.addRangeAfter(first, last, anchor);
-	}
-
-	@Override
-	public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		return addAfter(element, null);
-	}
-
-	@Override
-	public StubBasedPsiElement findStubbedElementAtOffset(final int offset, final Class<? extends StubBasedPsiElement> clazz)
-	{
-		final StubElement stub = getStub();
-
-		if(stub != null)
-		{
-			final List<StubElement> children = stub.getChildrenStubs();
-
-			for(StubElement child : children)
-			{
-				final PsiElement psi = child.getPsi();
-
-				if(psi.getTextRange().getStartOffset() == offset && clazz.isInstance(psi))
-				{
-					return (StubBasedPsiElement) psi;
-				}
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public JSSourceElement[] getStatements()
-	{
-		final StubElement stub = getStub();
-		if(stub != null)
-		{
-			return (JSSourceElement[]) stub.getChildrenByType(JSElementTypes.SOURCE_ELEMENTS, JSSourceElement.EMPTY_ARRAY);
-		}
-		return findChildrenByClass(JSSourceElement.class);
-	}
+public class JSFileImpl extends PsiFileBase implements JSFile {
+    public JSFileImpl(FileViewProvider fileViewProvider) {
+        super(fileViewProvider, JavaScriptLanguage.INSTANCE);
+    }
+
+    @Override
+    public String toString() {
+        return "JSFile:" + getName();
+    }
+
+    @Override
+    public boolean processDeclarations(
+        @Nonnull final PsiScopeProcessor processor,
+        @Nonnull final ResolveState state,
+        @Nullable PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        boolean result = JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
+        if (lastParent == null) {
+            return result;
+        }
+
+        if (result) {
+            if (getContext() == null) {
+                if (!(lastParent instanceof JSPackageStatement)) {
+                    result = JSImportHandlingUtil.tryResolveImports(processor, this, place);
+                }
+
+                if (result &&
+                    JSResolveUtil.isNewResolveAndCompletion(this) &&
+                    (JSResolveUtil.shouldProcessImports(place, processor))) {
+                    result = JSResolveUtil.processGlobalThings(processor, state, place, this);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor elementVisitor) {
+            elementVisitor.visitJSElement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @Override
+    public PsiElement addRangeBefore(
+        @Nonnull PsiElement first,
+        @Nonnull PsiElement last,
+        PsiElement anchor
+    ) throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(first)) {
+            return JSChangeUtil.doAddRangeBefore(this, first, last, anchor);
+        }
+        return super.addRangeBefore(first, last, anchor);
+    }
+
+    @Override
+    public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOperationException {
+        return addRangeAfter(first, last, null);
+    }
+
+    @Override
+    public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(element)) {
+            return JSChangeUtil.doAddAfter(this, element, anchor);
+        }
+        return super.addAfter(element, anchor);
+    }
+
+    @Override
+    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(element)) {
+            return JSChangeUtil.doAddBefore(this, element, anchor);
+        }
+        return super.addBefore(element, anchor);
+    }
+
+    @Override
+    public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement anchor) throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(first)) {
+            return JSChangeUtil.doAddRangeAfter(this, first, last, anchor);
+        }
+
+        return super.addRangeAfter(first, last, anchor);
+    }
+
+    @Override
+    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
+        return addAfter(element, null);
+    }
+
+    @Override
+    public StubBasedPsiElement findStubbedElementAtOffset(final int offset, final Class<? extends StubBasedPsiElement> clazz) {
+        final StubElement stub = getStub();
+
+        if (stub != null) {
+            final List<StubElement> children = stub.getChildrenStubs();
+
+            for (StubElement child : children) {
+                final PsiElement psi = child.getPsi();
+
+                if (psi.getTextRange().getStartOffset() == offset && clazz.isInstance(psi)) {
+                    return (StubBasedPsiElement)psi;
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public JSSourceElement[] getStatements() {
+        final StubElement stub = getStub();
+        if (stub != null) {
+            return (JSSourceElement[])stub.getChildrenByType(JSElementTypes.SOURCE_ELEMENTS, JSSourceElement.EMPTY_ARRAY);
+        }
+        return findChildrenByClass(JSSourceElement.class);
+    }
 }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
index 40aee640..b3cb69b1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
@@ -33,114 +33,97 @@
  * Date: Jan 30, 2005
  * Time: 11:20:30 PM
  */
-public class JSForInStatementImpl extends JSStatementImpl implements JSForInStatement
-{
-	private static final TokenSet ourSeparatorElementType = TokenSet.create(JSTokenTypes.IN_KEYWORD, JSTokenTypes.OF_KEYWORD);
+public class JSForInStatementImpl extends JSStatementImpl implements JSForInStatement {
+    private static final TokenSet ourSeparatorElementType = TokenSet.create(JSTokenTypes.IN_KEYWORD, JSTokenTypes.OF_KEYWORD);
 
-	public JSForInStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+    public JSForInStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSVarStatement getDeclarationStatement()
-	{
-		return findChildByClass(JSVarStatement.class);
-	}
+    @Override
+    public JSVarStatement getDeclarationStatement() {
+        return findChildByClass(JSVarStatement.class);
+    }
 
-	@Override
-	public JSExpression getVariableExpression()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		while(child != null)
-		{
-			if(ourSeparatorElementType.contains(child.getElementType()))
-			{
-				return null;
-			}
-			if(child.getPsi() instanceof JSExpression)
-			{
-				return (JSExpression) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+    @Override
+    public JSExpression getVariableExpression() {
+        ASTNode child = getNode().getFirstChildNode();
+        while (child != null) {
+            if (ourSeparatorElementType.contains(child.getElementType())) {
+                return null;
+            }
+            if (child.getPsi() instanceof JSExpression) {
+                return (JSExpression)child.getPsi();
+            }
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	public JSExpression getCollectionExpression()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		boolean inPassed = false;
-		while(child != null)
-		{
-			if(ourSeparatorElementType.contains(child.getElementType()))
-			{
-				inPassed = true;
-			}
-			if(inPassed && child.getPsi() instanceof JSExpression)
-			{
-				return (JSExpression) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
+    @Override
+    public JSExpression getCollectionExpression() {
+        ASTNode child = getNode().getFirstChildNode();
+        boolean inPassed = false;
+        while (child != null) {
+            if (ourSeparatorElementType.contains(child.getElementType())) {
+                inPassed = true;
+            }
+            if (inPassed && child.getPsi() instanceof JSExpression) {
+                return (JSExpression)child.getPsi();
+            }
+            child = child.getTreeNext();
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	@Override
-	@RequiredReadAction
-	public boolean isForEach()
-	{
-		return findChildByType(TokenSet.create(JSTokenTypes.EACH_KEYWORD, JSTokenTypes.OF_KEYWORD)) != null ;
-	}
+    @Override
+    @RequiredReadAction
+    public boolean isForEach() {
+        return findChildByType(TokenSet.create(JSTokenTypes.EACH_KEYWORD, JSTokenTypes.OF_KEYWORD)) != null;
+    }
 
-	@Override
-	public JSStatement getBody()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		boolean passedRParen = false;
-		while(child != null)
-		{
-			if(child.getElementType() == JSTokenTypes.RPAR)
-			{
-				passedRParen = true;
-			}
-			else if(passedRParen && child.getPsi() instanceof JSStatement)
-			{
-				return (JSStatement) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
+    @Override
+    public JSStatement getBody() {
+        ASTNode child = getNode().getFirstChildNode();
+        boolean passedRParen = false;
+        while (child != null) {
+            if (child.getElementType() == JSTokenTypes.RPAR) {
+                passedRParen = true;
+            }
+            else if (passedRParen && child.getPsi() instanceof JSStatement statement) {
+                return statement;
+            }
+            child = child.getTreeNext();
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
-	{
-		if(lastParent != null)
-		{
-			final JSVarStatement statement = getDeclarationStatement();
-			if(statement != null)
-			{
-				return statement.processDeclarations(processor, state, lastParent, place);
-			}
-			else
-			{
-				final JSExpression expression = getVariableExpression();
-				if(expression != null && !processor.execute(expression, null))
-				{
-					return false;
-				}
-			}
-		}
-		return true;
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        if (lastParent != null) {
+            final JSVarStatement statement = getDeclarationStatement();
+            if (statement != null) {
+                return statement.processDeclarations(processor, state, lastParent, place);
+            }
+            else {
+                final JSExpression expression = getVariableExpression();
+                if (expression != null && !processor.execute(expression, null)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSForInStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSForInStatement(this);
+    }
 }

From c0239979bb8393b279172bb477048fedb5f78c03 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 27 Jul 2024 17:25:11 +0300
Subject: [PATCH 224/340] Code reformat using IJ4 code style (part 14).

---
 .../psi/impl/JSForStatementImpl.java          | 214 ++---
 .../psi/impl/JSFunctionBaseImpl.java          | 447 +++++-----
 .../psi/impl/JSFunctionExpressionImpl.java    | 245 +++---
 .../javascript/psi/impl/JSFunctionImpl.java   | 233 +++--
 .../psi/impl/JSFunctionPropertyImpl.java      | 132 ++-
 .../psi/impl/JSGenericSignatureImpl.java      |  19 +-
 .../psi/impl/JSIfStatementImpl.java           |  79 +-
 .../psi/impl/JSImportStatementImpl.java       |  61 +-
 .../psi/impl/JSIncludeDirectiveImpl.java      | 125 ++-
 ...JSIndexedPropertyAccessExpressionImpl.java |  89 +-
 .../psi/impl/JSLabeledStatementImpl.java      |  91 +-
 .../psi/impl/JSLetExpressionImpl.java         |  28 +-
 .../psi/impl/JSLetStatementImpl.java          |  37 +-
 .../psi/impl/JSLiteralExpressionImpl.java     | 183 ++--
 .../psi/impl/JSNamespaceDeclarationImpl.java  | 212 +++--
 .../psi/impl/JSNewExpressionImpl.java         |  65 +-
 .../impl/JSObjectLiteralExpressionImpl.java   |  64 +-
 .../psi/impl/JSPackageStatementImpl.java      | 311 +++----
 .../javascript/psi/impl/JSParameterImpl.java  | 202 ++---
 .../psi/impl/JSParameterListImpl.java         |  35 +-
 .../impl/JSParenthesizedExpressionImpl.java   |  28 +-
 .../psi/impl/JSPostfixExpressionImpl.java     |  62 +-
 .../psi/impl/JSPrefixExpressionImpl.java      |  71 +-
 .../javascript/psi/impl/JSPropertyImpl.java   | 259 +++---
 .../javascript/psi/impl/JSPsiImplUtils.java   | 817 ++++++++----------
 25 files changed, 1859 insertions(+), 2250 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
index a3992ac7..b4aa54e0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
@@ -29,130 +29,108 @@
 /**
  * @author max
  */
-public class JSForStatementImpl extends JSStatementImpl implements JSForStatement
-{
-	public JSForStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSForStatementImpl extends JSStatementImpl implements JSForStatement {
+    public JSForStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSVarStatement getVarDeclaration()
-	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.VAR_STATEMENT);
-		return (JSVarStatement) (node != null ? node.getPsi() : null);
-	}
+    @Override
+    public JSVarStatement getVarDeclaration() {
+        final ASTNode node = getNode().findChildByType(JSElementTypes.VAR_STATEMENT);
+        return (JSVarStatement)(node != null ? node.getPsi() : null);
+    }
 
-	@Override
-	public JSExpression getInitialization()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		while(child != null)
-		{
-			if(child.getElementType() == JSTokenTypes.SEMICOLON)
-			{
-				return null;
-			}
-			if(JSElementTypes.EXPRESSIONS.contains(child.getElementType()))
-			{
-				return (JSExpression) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+    @Override
+    public JSExpression getInitialization() {
+        ASTNode child = getNode().getFirstChildNode();
+        while (child != null) {
+            if (child.getElementType() == JSTokenTypes.SEMICOLON) {
+                return null;
+            }
+            if (JSElementTypes.EXPRESSIONS.contains(child.getElementType())) {
+                return (JSExpression)child.getPsi();
+            }
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	public JSExpression getCondition()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		int semicolonCount = 0;
-		while(child != null)
-		{
-			if(child.getElementType() == JSTokenTypes.SEMICOLON)
-			{
-				semicolonCount++;
-				if(semicolonCount == 2)
-				{
-					return null;
-				}
-			}
-			else if(semicolonCount == 1 && JSElementTypes.EXPRESSIONS.contains(child.getElementType()))
-			{
-				return (JSExpression) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+    @Override
+    public JSExpression getCondition() {
+        ASTNode child = getNode().getFirstChildNode();
+        int semicolonCount = 0;
+        while (child != null) {
+            if (child.getElementType() == JSTokenTypes.SEMICOLON) {
+                semicolonCount++;
+                if (semicolonCount == 2) {
+                    return null;
+                }
+            }
+            else if (semicolonCount == 1 && JSElementTypes.EXPRESSIONS.contains(child.getElementType())) {
+                return (JSExpression)child.getPsi();
+            }
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	public JSExpression getUpdate()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		int semicolonCount = 0;
-		while(child != null)
-		{
-			if(child.getElementType() == JSTokenTypes.SEMICOLON)
-			{
-				semicolonCount++;
-			}
-			else if(semicolonCount == 2 && JSElementTypes.EXPRESSIONS.contains(child.getElementType()))
-			{
-				return (JSExpression) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+    @Override
+    public JSExpression getUpdate() {
+        ASTNode child = getNode().getFirstChildNode();
+        int semicolonCount = 0;
+        while (child != null) {
+            if (child.getElementType() == JSTokenTypes.SEMICOLON) {
+                semicolonCount++;
+            }
+            else if (semicolonCount == 2 && JSElementTypes.EXPRESSIONS.contains(child.getElementType())) {
+                return (JSExpression)child.getPsi();
+            }
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	public JSStatement getBody()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		boolean passedRParen = false;
-		while(child != null)
-		{
-			if(child.getElementType() == JSTokenTypes.RPAR)
-			{
-				passedRParen = true;
-			}
-			else if(passedRParen && child.getPsi() instanceof JSStatement)
-			{
-				return (JSStatement) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
+    @Override
+    public JSStatement getBody() {
+        ASTNode child = getNode().getFirstChildNode();
+        boolean passedRParen = false;
+        while (child != null) {
+            if (child.getElementType() == JSTokenTypes.RPAR) {
+                passedRParen = true;
+            }
+            else if (passedRParen && child.getPsi() instanceof JSStatement statement) {
+                return statement;
+            }
+            child = child.getTreeNext();
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-									   @Nonnull PsiElement place)
-	{
-		if(lastParent != null)
-		{
-			final JSVarStatement statement = getVarDeclaration();
-			if(statement != null)
-			{
-				return statement.processDeclarations(processor, state, lastParent, place);
-			}
-			else
-			{
-				final JSExpression initialization = getInitialization();
-				if(initialization != null)
-				{
-					return initialization.processDeclarations(processor, state, null, place);
-				}
-			}
-		}
-		return true;
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        if (lastParent != null) {
+            final JSVarStatement statement = getVarDeclaration();
+            if (statement != null) {
+                return statement.processDeclarations(processor, state, lastParent, place);
+            }
+            else {
+                final JSExpression initialization = getInitialization();
+                if (initialization != null) {
+                    return initialization.processDeclarations(processor, state, null, place);
+                }
+            }
+        }
+        return true;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSForStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSForStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index 1b2afcc8..e6115231 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -43,250 +43,205 @@
  * Date: Jan 30, 2005
  * Time: 8:25:27 PM
  */
-abstract class JSFunctionBaseImpl<T extends JSFunctionStub, T2 extends JSFunction> extends JSStubElementImpl<T> implements JSFunction
-{
-	private boolean referencesArgumentsCalculated;
-	private boolean referencesArguments;
-
-	public JSFunctionBaseImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSFunctionBaseImpl(final T stub, IStubElementType type)
-	{
-		super(stub, type);
-	}
-
-	@Override
-	public void subtreeChanged()
-	{
-		super.subtreeChanged();
-		referencesArgumentsCalculated = false;
-		referencesArguments = false;
-	}
-
-	@RequiredReadAction
-	@Override
-	public JSParameterList getParameterList()
-	{
-		return getStubOrPsiChild(JSElementTypes.PARAMETER_LIST);
-	}
-
-	@Override
-	public JSSourceElement[] getBody()
-	{
-		final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
-		if(children.length == 0)
-		{
-			return JSSourceElement.EMPTY_ARRAY;
-		}
-		JSSourceElement[] result = new JSSourceElement[children.length];
-		for(int i = 0; i < children.length; i++)
-		{
-			result[i] = (JSSourceElement) children[i].getPsi();
-		}
-		return result;
-	}
-
-	@Nonnull
-	@Override
-	public JavaScriptType getReturnType()
-	{
-		return JavaScriptType.UNKNOWN;
-	}
-
-	@Override
-	public String getReturnTypeString()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.getReturnTypeString();
-		}
-		return JSPsiImplUtils.getType(this);
-	}
-
-	@Override
-	public JavaScriptTypeElement getReturnTypeElement()
-	{
-		return JSPsiImplUtils.findTypeElement(this);
-	}
-
-	@Override
-	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
-	{
-		final ASTNode newNameElement = createNameIdentifier(name);
-		final ASTNode nameIdentifier = getNameIdentifier().getNode();
-		nameIdentifier.getTreeParent().replaceChild(nameIdentifier, newNameElement);
-		return this;
-	}
-
-	protected ASTNode createNameIdentifier(final String name)
-	{
-		return JSChangeUtil.createExpressionFromText(getProject(), name).getNode();
-	}
-
-	@Override
-	@RequiredReadAction
-	public String getName()
-	{
-		final JSFunctionStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getName();
-		}
-		final PsiElement name = getNameIdentifier();
-
-		if(name != null)
-		{
-			if(name instanceof JSReferenceExpression)
-			{
-				return ((JSReferenceExpression) name).getReferencedName();
-			}
-			else
-			{
-				return name.getText();
-			}
-		}
-		return null;
-	}
-
-	private static ASTNode advance(ASTNode astNode)
-	{
-		astNode = astNode != null ? astNode.getTreeNext() : null;
-
-		if(astNode != null && astNode.getElementType() == JSTokenTypes.WHITE_SPACE)
-		{
-			astNode = astNode.getTreeNext();
-		}
-		return astNode;
-	}
-
-	@RequiredReadAction
-	@Override
-	public int getTextOffset()
-	{
-		final PsiElement name = getNameIdentifier();
-		return name != null ? name.getTextOffset() : super.getTextOffset();
-	}
-
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-									   @Nonnull PsiElement place)
-	{
-		if(lastParent != null && lastParent.getParent() == this)
-		{
-			if(place instanceof JSReferenceExpression)
-			{
-				boolean b = JSImportHandlingUtil.tryResolveImports(processor, this, place);
-				if(!b || JSResolveUtil.isExprInStrictTypeContext((JSReferenceExpression) place))
-				{
-					return b;
-				}
-			}
-
-			final JSParameter[] params = getParameterList().getParameters();
-			for(JSParameter param : params)
-			{
-				if(!param.processDeclarations(processor, state, lastParent, place))
-				{
-					return false;
-				}
-			}
-
-			boolean b = JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
-			if(b)
-			{
-				processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
-			}
-			return b;
-		}
-
-		return processor.execute(this, state);
-	}
-
-	@Override
-	public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException
-	{
-		if(anchor == getFirstChild() && element instanceof JSAttributeList && anchor.getNode().getElementType() == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			return JSChangeUtil.doDoAddBefore(this, element, anchor);
-		}
-		return super.addBefore(element, anchor);
-	}
-
-	@Override
-	public boolean isDeprecated()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.isDeprecated();
-		}
-		return JSDocumentationUtils.calculateDeprecated(this);
-	}
-
-	@Override
-	public boolean isReferencesArguments()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.isReferencesArguments();
-		}
-
-		if(!referencesArgumentsCalculated)
-		{
-			acceptChildren(new JSElementVisitor()
-			{
-				boolean continueVisiting = true;
-
-				@Override
-				public void visitJSReferenceExpression(final JSReferenceExpression node)
-				{
-					if(isInJS(node) && node.getQualifier() == null)
-					{
-						if("arguments".equals(node.getText()))
-						{
-							referencesArguments = true;
-							continueVisiting = false;
-							return;
-						}
-					}
-					super.visitJSReferenceExpression(node);
-				}
-
-				@Override
-				public void visitJSElement(final JSElement node)
-				{
-					if(continueVisiting)
-					{
-						node.acceptChildren(this);
-					}
-				}
-			});
-
-			referencesArgumentsCalculated = true;
-		}
-
-		return referencesArguments;
-	}
-
-	private static boolean isInJS(final JSReferenceExpression node)
-	{
-		final PsiElement parent = node.getParent();
-		if(parent != null && !(parent.getLanguage() instanceof JavaScriptLanguage))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	@RequiredReadAction
-	public PsiElement getNameIdentifier()
-	{
-		return findChildByType(JavaScriptTokenSets.NAME_TOKEN_TYPES);
-	}
+abstract class JSFunctionBaseImpl<T extends JSFunctionStub, T2 extends JSFunction> extends JSStubElementImpl<T> implements JSFunction {
+    private boolean referencesArgumentsCalculated;
+    private boolean referencesArguments;
+
+    public JSFunctionBaseImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSFunctionBaseImpl(final T stub, IStubElementType type) {
+        super(stub, type);
+    }
+
+    @Override
+    public void subtreeChanged() {
+        super.subtreeChanged();
+        referencesArgumentsCalculated = false;
+        referencesArguments = false;
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSParameterList getParameterList() {
+        return getStubOrPsiChild(JSElementTypes.PARAMETER_LIST);
+    }
+
+    @Override
+    public JSSourceElement[] getBody() {
+        final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
+        if (children.length == 0) {
+            return JSSourceElement.EMPTY_ARRAY;
+        }
+        JSSourceElement[] result = new JSSourceElement[children.length];
+        for (int i = 0; i < children.length; i++) {
+            result[i] = (JSSourceElement)children[i].getPsi();
+        }
+        return result;
+    }
+
+    @Nonnull
+    @Override
+    public JavaScriptType getReturnType() {
+        return JavaScriptType.UNKNOWN;
+    }
+
+    @Override
+    public String getReturnTypeString() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.getReturnTypeString();
+        }
+        return JSPsiImplUtils.getType(this);
+    }
+
+    @Override
+    public JavaScriptTypeElement getReturnTypeElement() {
+        return JSPsiImplUtils.findTypeElement(this);
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+        final ASTNode newNameElement = createNameIdentifier(name);
+        final ASTNode nameIdentifier = getNameIdentifier().getNode();
+        nameIdentifier.getTreeParent().replaceChild(nameIdentifier, newNameElement);
+        return this;
+    }
+
+    protected ASTNode createNameIdentifier(final String name) {
+        return JSChangeUtil.createExpressionFromText(getProject(), name).getNode();
+    }
+
+    @Override
+    @RequiredReadAction
+    public String getName() {
+        final JSFunctionStub stub = getStub();
+        if (stub != null) {
+            return stub.getName();
+        }
+        final PsiElement name = getNameIdentifier();
+
+        if (name != null) {
+            if (name instanceof JSReferenceExpression) {
+                return ((JSReferenceExpression)name).getReferencedName();
+            }
+            else {
+                return name.getText();
+            }
+        }
+        return null;
+    }
+
+    private static ASTNode advance(ASTNode astNode) {
+        astNode = astNode != null ? astNode.getTreeNext() : null;
+
+        if (astNode != null && astNode.getElementType() == JSTokenTypes.WHITE_SPACE) {
+            astNode = astNode.getTreeNext();
+        }
+        return astNode;
+    }
+
+    @RequiredReadAction
+    @Override
+    public int getTextOffset() {
+        final PsiElement name = getNameIdentifier();
+        return name != null ? name.getTextOffset() : super.getTextOffset();
+    }
+
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        if (lastParent != null && lastParent.getParent() == this) {
+            if (place instanceof JSReferenceExpression referenceExpression) {
+                boolean b = JSImportHandlingUtil.tryResolveImports(processor, this, place);
+                if (!b || JSResolveUtil.isExprInStrictTypeContext(referenceExpression)) {
+                    return b;
+                }
+            }
+
+            final JSParameter[] params = getParameterList().getParameters();
+            for (JSParameter param : params) {
+                if (!param.processDeclarations(processor, state, lastParent, place)) {
+                    return false;
+                }
+            }
+
+            boolean b = JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
+            if (b) {
+                processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
+            }
+            return b;
+        }
+
+        return processor.execute(this, state);
+    }
+
+    @Override
+    public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException {
+        if (anchor == getFirstChild() && element instanceof JSAttributeList
+            && anchor.getNode().getElementType() == JSTokenTypes.FUNCTION_KEYWORD) {
+            return JSChangeUtil.doDoAddBefore(this, element, anchor);
+        }
+        return super.addBefore(element, anchor);
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.isDeprecated();
+        }
+        return JSDocumentationUtils.calculateDeprecated(this);
+    }
+
+    @Override
+    public boolean isReferencesArguments() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.isReferencesArguments();
+        }
+
+        if (!referencesArgumentsCalculated) {
+            acceptChildren(new JSElementVisitor() {
+                boolean continueVisiting = true;
+
+                @Override
+                public void visitJSReferenceExpression(final JSReferenceExpression node) {
+                    if (isInJS(node) && node.getQualifier() == null && "arguments".equals(node.getText())) {
+                        referencesArguments = true;
+                        continueVisiting = false;
+                        return;
+                    }
+                    super.visitJSReferenceExpression(node);
+                }
+
+                @Override
+                public void visitJSElement(final JSElement node) {
+                    if (continueVisiting) {
+                        node.acceptChildren(this);
+                    }
+                }
+            });
+
+            referencesArgumentsCalculated = true;
+        }
+
+        return referencesArguments;
+    }
+
+    private static boolean isInJS(final JSReferenceExpression node) {
+        final PsiElement parent = node.getParent();
+        return parent == null || parent.getLanguage() instanceof JavaScriptLanguage;
+    }
+
+    @Override
+    @RequiredReadAction
+    public PsiElement getNameIdentifier() {
+        return findChildByType(JavaScriptTokenSets.NAME_TOKEN_TYPES);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index 95ef42df..a83c668b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -35,138 +35,115 @@
  * Time: 11:55:33 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSFunctionExpressionImpl extends JSFunctionBaseImpl<JSFunctionStub, JSFunctionExpression> implements JSFunctionExpression
-{
-	public JSFunctionExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSFunctionExpressionImpl(final JSFunctionStub stub, IStubElementType type)
-	{
-		super(stub, type);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSFunctionExpression(this);
-	}
-
-	@Override
-	protected ASTNode createNameIdentifier(final String name)
-	{
-		return JSChangeUtil.createNameIdentifier(getProject(), name);
-	}
-
-	@Override
-	public JSExpression replace(JSExpression newExpr)
-	{
-		return JSChangeUtil.replaceExpression(this, newExpr);
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		return JavaScriptType.UNKNOWN;
-	}
-
-	@Override
-	public JSAttributeList getAttributeList()
-	{
-		return null;
-	}
-
-	@RequiredReadAction
-	@Override
-	public int getTextOffset()
-	{
-		final PsiElement name = getNameIdentifier();
-		return name != null ? name.getTextOffset() : super.getTextOffset();
-	}
-
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		final PsiElement parent = getParent();
-		if(parent instanceof JSAssignmentExpression)
-		{
-			((JSAssignmentExpression) parent).getLOperand().delete();
-			return;
-		}
-		super.delete();
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean isGetProperty()
-	{
-		return false;
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean isSetProperty()
-	{
-		return false;
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean isConstructor()
-	{
-		return false;
-	}
-
-	@Override
-	public String getQualifiedName()
-	{
-		return getName();
-	}
-
-	@RequiredReadAction
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		final ASTNode treeParent = getNode().getTreeParent();
-		PsiElement psi = treeParent != null ? treeParent.getPsi() : null;
-		if(psi instanceof JSCallExpression)
-		{
-			psi = psi.getParent();
-		}
-		if(psi instanceof JSAssignmentExpression)
-		{
-			final JSExpression jsExpression = ((JSAssignmentExpression) psi).getLOperand();
-			final JSExpression lOperand = jsExpression instanceof JSDefinitionExpression ? ((JSDefinitionExpression) jsExpression).getExpression() : null;
-
-			if(lOperand instanceof JSReferenceExpression)
-			{
-				ASTNode childByType = lOperand.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
-				return childByType != null ? childByType.getPsi() : null;
-			}
-		}
-		else if(psi instanceof JSProperty)
-		{
-			ASTNode childByType = psi.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
-			return childByType != null ? childByType.getPsi() : null;
-		}
-		else
-		{
-			final PsiElement node = super.getNameIdentifier();
-
-			if(node != null)
-			{
-				return node;
-			}
-
-			if(psi instanceof JSVariable)
-			{
-				ASTNode childByType = psi.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
-				return childByType != null ? childByType.getPsi() : null;
-			}
-		}
-		return null;
-	}
+public class JSFunctionExpressionImpl extends JSFunctionBaseImpl<JSFunctionStub, JSFunctionExpression> implements JSFunctionExpression {
+    public JSFunctionExpressionImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSFunctionExpressionImpl(final JSFunctionStub stub, IStubElementType type) {
+        super(stub, type);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSFunctionExpression(this);
+    }
+
+    @Override
+    protected ASTNode createNameIdentifier(final String name) {
+        return JSChangeUtil.createNameIdentifier(getProject(), name);
+    }
+
+    @Override
+    public JSExpression replace(JSExpression newExpr) {
+        return JSChangeUtil.replaceExpression(this, newExpr);
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        return JavaScriptType.UNKNOWN;
+    }
+
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public int getTextOffset() {
+        final PsiElement name = getNameIdentifier();
+        return name != null ? name.getTextOffset() : super.getTextOffset();
+    }
+
+    @Override
+    public void delete() throws IncorrectOperationException {
+        final PsiElement parent = getParent();
+        if (parent instanceof JSAssignmentExpression assignment) {
+            assignment.getLOperand().delete();
+            return;
+        }
+        super.delete();
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isGetProperty() {
+        return false;
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isSetProperty() {
+        return false;
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isConstructor() {
+        return false;
+    }
+
+    @Override
+    public String getQualifiedName() {
+        return getName();
+    }
+
+    @RequiredReadAction
+    @Override
+    public PsiElement getNameIdentifier() {
+        final ASTNode treeParent = getNode().getTreeParent();
+        PsiElement psi = treeParent != null ? treeParent.getPsi() : null;
+        if (psi instanceof JSCallExpression) {
+            psi = psi.getParent();
+        }
+        if (psi instanceof JSAssignmentExpression assignment) {
+            final JSExpression jsExpression = assignment.getLOperand();
+            final JSExpression lOperand = jsExpression instanceof JSDefinitionExpression definition ? definition.getExpression() : null;
+
+            if (lOperand instanceof JSReferenceExpression) {
+                ASTNode childByType = lOperand.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
+                return childByType != null ? childByType.getPsi() : null;
+            }
+        }
+        else if (psi instanceof JSProperty) {
+            ASTNode childByType = psi.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
+            return childByType != null ? childByType.getPsi() : null;
+        }
+        else {
+            final PsiElement node = super.getNameIdentifier();
+
+            if (node != null) {
+                return node;
+            }
+
+            if (psi instanceof JSVariable) {
+                ASTNode childByType = psi.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
+                return childByType != null ? childByType.getPsi() : null;
+            }
+        }
+        return null;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
index 5abf9f69..1e478b96 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
@@ -37,134 +37,107 @@
  * Date: Jan 30, 2005
  * Time: 8:25:27 PM
  */
-public class JSFunctionImpl extends JSFunctionBaseImpl<JSFunctionStub, JSFunction> implements JSSuppressionHolder
-{
-	public JSFunctionImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSFunctionImpl(final JSFunctionStub stub, IStubElementType type)
-	{
-		super(stub, type);
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean isGetProperty()
-	{
-		final JSFunctionStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.isGetProperty();
-		}
-		return findChildByType(JSTokenTypes.GET_KEYWORD) != null;
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean isSetProperty()
-	{
-		final JSFunctionStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.isGetProperty();
-		}
-		return findChildByType(JSTokenTypes.SET_KEYWORD) != null;
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean isConstructor()
-	{
-		final JSFunctionStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.isConstructor();
-		}
-		final PsiElement parent = JSResolveUtil.findParent(this);
-		if(parent instanceof JSClass && Comparing.equal("constructor", getName(), true))
-		{
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public JSAttributeList getAttributeList()
-	{
-		return getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSFunctionDeclaration(this);
-	}
-
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		getNode().getTreeParent().removeChild(getNode());
-	}
-
-	@Override
-	public String getQualifiedName()
-	{
-		final JSFunctionStub jsFunctionStub = getStub();
-		if(jsFunctionStub != null)
-		{
-			return jsFunctionStub.getQualifiedName();
-		}
-		final PsiElement parent = JSResolveUtil.findParent(this);
-
-		if(parent instanceof JSFile || parent instanceof JSPackageStatement)
-		{
-			return JSPsiImplUtils.getQName(this);
-		}
-		else
-		{
-			return getName();
-		}
-	}
-
-	@Override
-	@Nonnull
-	public SearchScope getUseScope()
-	{
-		if(isConstructor())
-		{
-			return super.getUseScope();
-		}
-		return JSResolveUtil.findUseScope(this);
-	}
-
-	@Override
-	public PsiElement getNavigationElement()
-	{
-		PsiElement parent = getParent();
-		if(parent instanceof JSClass)
-		{
-			PsiElement parentOriginalElement = parent.getNavigationElement();
-
-			if(parentOriginalElement != parent)
-			{
-				JSFunction functionByNameAndKind = ((JSClass) parentOriginalElement).findFunctionByNameAndKind(getName(), getKind());
-				return functionByNameAndKind != null ? functionByNameAndKind : this;
-			}
-		}
-		return JSPsiImplUtils.findTopLevelNavigatableElement(this);
-	}
-
-	@Override
-	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
-	{
-		String oldName = getName();
-		PsiElement element = super.setName(name);
-		if(getParent() instanceof JSPackageStatement)
-		{
-			JSPsiImplUtils.updateFileName(this, name, oldName);
-		}
-		return element;
-	}
+public class JSFunctionImpl extends JSFunctionBaseImpl<JSFunctionStub, JSFunction> implements JSSuppressionHolder {
+    public JSFunctionImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSFunctionImpl(final JSFunctionStub stub, IStubElementType type) {
+        super(stub, type);
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isGetProperty() {
+        final JSFunctionStub stub = getStub();
+        if (stub != null) {
+            return stub.isGetProperty();
+        }
+        return findChildByType(JSTokenTypes.GET_KEYWORD) != null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isSetProperty() {
+        final JSFunctionStub stub = getStub();
+        if (stub != null) {
+            return stub.isGetProperty();
+        }
+        return findChildByType(JSTokenTypes.SET_KEYWORD) != null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isConstructor() {
+        final JSFunctionStub stub = getStub();
+        if (stub != null) {
+            return stub.isConstructor();
+        }
+        final PsiElement parent = JSResolveUtil.findParent(this);
+        return parent instanceof JSClass && Comparing.equal("constructor", getName(), true);
+    }
+
+    @Override
+    public JSAttributeList getAttributeList() {
+        return getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSFunctionDeclaration(this);
+    }
+
+    @Override
+    public void delete() throws IncorrectOperationException {
+        getNode().getTreeParent().removeChild(getNode());
+    }
+
+    @Override
+    public String getQualifiedName() {
+        final JSFunctionStub jsFunctionStub = getStub();
+        if (jsFunctionStub != null) {
+            return jsFunctionStub.getQualifiedName();
+        }
+        final PsiElement parent = JSResolveUtil.findParent(this);
+
+        if (parent instanceof JSFile || parent instanceof JSPackageStatement) {
+            return JSPsiImplUtils.getQName(this);
+        }
+        else {
+            return getName();
+        }
+    }
+
+    @Override
+    @Nonnull
+    public SearchScope getUseScope() {
+        if (isConstructor()) {
+            return super.getUseScope();
+        }
+        return JSResolveUtil.findUseScope(this);
+    }
+
+    @Override
+    public PsiElement getNavigationElement() {
+        PsiElement parent = getParent();
+        if (parent instanceof JSClass) {
+            PsiElement parentOriginalElement = parent.getNavigationElement();
+
+            if (parentOriginalElement != parent) {
+                JSFunction functionByNameAndKind = ((JSClass)parentOriginalElement).findFunctionByNameAndKind(getName(), getKind());
+                return functionByNameAndKind != null ? functionByNameAndKind : this;
+            }
+        }
+        return JSPsiImplUtils.findTopLevelNavigatableElement(this);
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+        String oldName = getName();
+        PsiElement element = super.setName(name);
+        if (getParent() instanceof JSPackageStatement) {
+            JSPsiImplUtils.updateFileName(this, name, oldName);
+        }
+        return element;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
index b3058da9..800a8f87 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
@@ -18,87 +18,73 @@
  * @author VISTALL
  * @since 19/12/2021
  */
-public class JSFunctionPropertyImpl extends JSPropertyImpl implements JSFunctionProperty
-{
-	public JSFunctionPropertyImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class JSFunctionPropertyImpl extends JSPropertyImpl implements JSFunctionProperty {
+    public JSFunctionPropertyImpl(ASTNode node) {
+        super(node);
+    }
 
-	@RequiredReadAction
-	@Override
-	public boolean isGetProperty()
-	{
-		return findChildByType(JSTokenTypes.GET_KEYWORD) != null;
-	}
+    @RequiredReadAction
+    @Override
+    public boolean isGetProperty() {
+        return findChildByType(JSTokenTypes.GET_KEYWORD) != null;
+    }
 
-	@RequiredReadAction
-	@Override
-	public boolean isSetProperty()
-	{
-		return findChildByType(JSTokenTypes.SET_KEYWORD) != null;
-	}
+    @RequiredReadAction
+    @Override
+    public boolean isSetProperty() {
+        return findChildByType(JSTokenTypes.SET_KEYWORD) != null;
+    }
 
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public JSParameterList getParameterList()
-	{
-		return (JSParameterList) findChildByType(JSElementTypes.PARAMETER_LIST);
-	}
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSParameterList getParameterList() {
+        return (JSParameterList)findChildByType(JSElementTypes.PARAMETER_LIST);
+    }
 
-	@Override
-	public JSSourceElement[] getBody()
-	{
-		final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
-		if(children.length == 0)
-		{
-			return JSSourceElement.EMPTY_ARRAY;
-		}
-		JSSourceElement[] result = new JSSourceElement[children.length];
-		for(int i = 0; i < children.length; i++)
-		{
-			result[i] = (JSSourceElement) children[i].getPsi();
-		}
-		return result;
-	}
+    @Override
+    public JSSourceElement[] getBody() {
+        final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
+        if (children.length == 0) {
+            return JSSourceElement.EMPTY_ARRAY;
+        }
+        JSSourceElement[] result = new JSSourceElement[children.length];
+        for (int i = 0; i < children.length; i++) {
+            result[i] = (JSSourceElement)children[i].getPsi();
+        }
+        return result;
+    }
 
-	@Nonnull
-	@Override
-	public JavaScriptType getReturnType()
-	{
-		return JavaScriptType.UNKNOWN;
-	}
+    @Nonnull
+    @Override
+    public JavaScriptType getReturnType() {
+        return JavaScriptType.UNKNOWN;
+    }
 
-	@Override
-	public String getReturnTypeString()
-	{
-		return null;
-	}
+    @Override
+    public String getReturnTypeString() {
+        return null;
+    }
 
-	@Nullable
-	@Override
-	public JavaScriptTypeElement getReturnTypeElement()
-	{
-		return null;
-	}
+    @Nullable
+    @Override
+    public JavaScriptTypeElement getReturnTypeElement() {
+        return null;
+    }
 
-	@Override
-	public boolean isDeprecated()
-	{
-		return false;
-	}
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
 
-	@Nullable
-	@Override
-	public JSAttributeList getAttributeList()
-	{
-		return null;
-	}
+    @Nullable
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
 
-	@Override
-	public String getQualifiedName()
-	{
-		return null;
-	}
+    @Override
+    public String getQualifiedName() {
+        return null;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
index a7c8b7af..d51bccda 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
@@ -22,16 +22,13 @@
 
 import jakarta.annotation.Nonnull;
 
-public class JSGenericSignatureImpl extends JSElementImpl implements JSGenericSignature
-{
-	public JSGenericSignatureImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSGenericSignatureImpl extends JSElementImpl implements JSGenericSignature {
+    public JSGenericSignatureImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSGenericSignature(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSGenericSignature(this);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
index d6852643..e7761c2c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
@@ -32,55 +32,46 @@
  * Time: 9:49:01 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSIfStatementImpl extends JSStatementImpl implements JSIfStatement
-{
-	public JSIfStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSIfStatementImpl extends JSStatementImpl implements JSIfStatement {
+    public JSIfStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getCondition()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getCondition() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	public JSStatement getThen()
-	{
-		return findChildByClass(JSStatement.class);
-	}
+    @Override
+    public JSStatement getThen() {
+        return findChildByClass(JSStatement.class);
+    }
 
-	@Override
-	public JSStatement getElse()
-	{
-		final ASTNode myNode = getNode();
-		final ASTNode elseNode = myNode.findChildByType(JSTokenTypes.ELSE_KEYWORD);
-		final ASTNode node = elseNode != null ? myNode.findChildByType(JSElementTypes.STATEMENTS, elseNode) : null;
-		return node != null ? (JSStatement) node.getPsi() : null;
-	}
+    @Override
+    public JSStatement getElse() {
+        final ASTNode myNode = getNode();
+        final ASTNode elseNode = myNode.findChildByType(JSTokenTypes.ELSE_KEYWORD);
+        final ASTNode node = elseNode != null ? myNode.findChildByType(JSElementTypes.STATEMENTS, elseNode) : null;
+        return node != null ? (JSStatement)node.getPsi() : null;
+    }
 
-	@Override
-	public void setThen(JSStatement statement)
-	{
-		throw new UnsupportedOperationException("TODO: implement");
-	}
+    @Override
+    public void setThen(JSStatement statement) {
+        throw new UnsupportedOperationException("TODO: implement");
+    }
 
-	@Override
-	public void setElse(JSStatement statement)
-	{
-		throw new UnsupportedOperationException("TODO: implement");
-	}
+    @Override
+    public void setElse(JSStatement statement) {
+        throw new UnsupportedOperationException("TODO: implement");
+    }
 
-	@Override
-	public void setCondition(JSExpression expr)
-	{
-		throw new UnsupportedOperationException("TODO: implement");
-	}
+    @Override
+    public void setCondition(JSExpression expr) {
+        throw new UnsupportedOperationException("TODO: implement");
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSIfStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSIfStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
index 4c3e2324..7ee749ec 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
@@ -30,40 +30,37 @@
 /**
  * @by Maxim.Mossienko
  */
-public class JSImportStatementImpl extends JSStubbedStatementImpl<JSImportStatementStub> implements JSImportStatement
-{
-	public JSImportStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSImportStatementImpl extends JSStubbedStatementImpl<JSImportStatementStub> implements JSImportStatement {
+    public JSImportStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	public JSImportStatementImpl(final JSImportStatementStub stub)
-	{
-		super(stub, JSElementTypes.ES4_IMPORT_STATEMENT);
-	}
+    public JSImportStatementImpl(final JSImportStatementStub stub) {
+        super(stub, JSElementTypes.ES4_IMPORT_STATEMENT);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSImportStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSImportStatement(this);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
-									   @Nonnull final PsiElement place)
-	{
-		return true;
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull final PsiScopeProcessor processor,
+        @Nonnull final ResolveState state,
+        final PsiElement lastParent,
+        @Nonnull final PsiElement place
+    ) {
+        return true;
+    }
 
-	@Override
-	public String getImportText()
-	{
-		final JSImportStatementStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getImportText();
-		}
-		final ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
-		return node != null ? node.getText() : null;
-	}
+    @Override
+    public String getImportText() {
+        final JSImportStatementStub stub = getStub();
+        if (stub != null) {
+            return stub.getImportText();
+        }
+        final ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
+        return node != null ? node.getText() : null;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
index e66a2b33..ea501190 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
@@ -16,93 +16,84 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSIncludeDirective;
 import com.intellij.lang.javascript.psi.stubs.JSIncludeDirectiveStub;
 import consulo.application.util.SystemInfo;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.path.FileReference;
-import consulo.util.lang.StringUtil;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiFile;
 import consulo.language.psi.path.FileReferenceSet;
-import consulo.javascript.lang.JavaScriptTokenSets;
-
+import consulo.util.lang.StringUtil;
 import jakarta.annotation.Nonnull;
 
 /**
  * @by Maxim.Mossienko
  */
-public class JSIncludeDirectiveImpl extends JSStubbedStatementImpl<JSIncludeDirectiveStub> implements JSIncludeDirective
-{
-	public JSIncludeDirectiveImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSIncludeDirectiveImpl extends JSStubbedStatementImpl<JSIncludeDirectiveStub> implements JSIncludeDirective {
+    public JSIncludeDirectiveImpl(final ASTNode node) {
+        super(node);
+    }
 
-	public JSIncludeDirectiveImpl(final JSIncludeDirectiveStub stub)
-	{
-		super(stub, JSElementTypes.INCLUDE_DIRECTIVE);
-	}
+    public JSIncludeDirectiveImpl(final JSIncludeDirectiveStub stub) {
+        super(stub, JSElementTypes.INCLUDE_DIRECTIVE);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSIncludeDirective(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSIncludeDirective(this);
+    }
 
-	@Override
-	@Nonnull
-	public PsiReference[] getReferences()
-	{
-		ASTNode node = getIncludedFileNode();
+    @Override
+    @Nonnull
+    public PsiReference[] getReferences() {
+        ASTNode node = getIncludedFileNode();
 
-		if(node != null)
-		{
-			return new FileReferenceSet(StringUtil.stripQuotesAroundValue(node.getText()), this, node.getPsi().getStartOffsetInParent() + 1, null,
-					SystemInfo.isFileSystemCaseSensitive).getAllReferences();
-		}
-		return PsiReference.EMPTY_ARRAY;
-	}
+        if (node != null) {
+            return new FileReferenceSet(
+                StringUtil.stripQuotesAroundValue(node.getText()),
+                this,
+                node.getPsi().getStartOffsetInParent() + 1,
+                null,
+                SystemInfo.isFileSystemCaseSensitive
+            ).getAllReferences();
+        }
+        return PsiReference.EMPTY_ARRAY;
+    }
 
-	private ASTNode getIncludedFileNode()
-	{
-		return getNode().findChildByType(JavaScriptTokenSets.STRING_LITERALS);
-	}
+    private ASTNode getIncludedFileNode() {
+        return getNode().findChildByType(JavaScriptTokenSets.STRING_LITERALS);
+    }
 
-	@Override
-	public String getIncludeText()
-	{
-		final JSIncludeDirectiveStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getIncludeText();
-		}
-		final ASTNode astNode = getIncludedFileNode();
+    @Override
+    public String getIncludeText() {
+        final JSIncludeDirectiveStub stub = getStub();
+        if (stub != null) {
+            return stub.getIncludeText();
+        }
+        final ASTNode astNode = getIncludedFileNode();
 
-		return astNode != null ? StringUtil.stripQuotesAroundValue(astNode.getText()) : null;
-	}
+        return astNode != null ? StringUtil.stripQuotesAroundValue(astNode.getText()) : null;
+    }
 
-	@Override
-	public PsiFile resolveFile()
-	{
-		final String includeText = getIncludeText();
-		if(includeText == null)
-		{
-			return null;
-		}
-		final FileReference[] references = new FileReferenceSet(includeText, this, 0, null, SystemInfo.isFileSystemCaseSensitive).getAllReferences();
+    @Override
+    public PsiFile resolveFile() {
+        final String includeText = getIncludeText();
+        if (includeText == null) {
+            return null;
+        }
+        final FileReference[] references = new FileReferenceSet(
+            includeText,
+            this,
+            0,
+            null,
+            SystemInfo.isFileSystemCaseSensitive
+        ).getAllReferences();
 
-		if(references != null && references.length > 0)
-		{
-			final PsiElement element = references[references.length - 1].resolve();
-			if(element instanceof PsiFile)
-			{
-				return (PsiFile) element;
-			}
-		}
-		return null;
-	}
+        return references != null && references.length > 0 && references[references.length - 1].resolve() instanceof PsiFile file
+            ? file : null;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
index 1ba65315..f7b95a9c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
@@ -31,57 +31,46 @@
  * Time: 11:59:36 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSIndexedPropertyAccessExpressionImpl extends JSExpressionImpl implements JSIndexedPropertyAccessExpression
-{
-	public JSIndexedPropertyAccessExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSIndexedPropertyAccessExpressionImpl extends JSExpressionImpl implements JSIndexedPropertyAccessExpression {
+    public JSIndexedPropertyAccessExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getQualifier()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		while(child != null)
-		{
-			final IElementType type = child.getElementType();
-			if(type == JSTokenTypes.LBRACKET)
-			{
-				return null;
-			}
-			if(child.getPsi() instanceof JSExpression)
-			{
-				return (JSExpression) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+    @Override
+    public JSExpression getQualifier() {
+        ASTNode child = getNode().getFirstChildNode();
+        while (child != null) {
+            final IElementType type = child.getElementType();
+            if (type == JSTokenTypes.LBRACKET) {
+                return null;
+            }
+            if (child.getPsi() instanceof JSExpression expression) {
+                return expression;
+            }
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	public JSExpression getIndexExpression()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		boolean bracketPassed = false;
-		while(child != null)
-		{
-			final IElementType type = child.getElementType();
-			if(type == JSTokenTypes.LBRACKET)
-			{
-				bracketPassed = true;
-			}
-			if(bracketPassed && child.getPsi() instanceof JSExpression)
-			{
-				return (JSExpression) child.getPsi();
-			}
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+    @Override
+    public JSExpression getIndexExpression() {
+        ASTNode child = getNode().getFirstChildNode();
+        boolean bracketPassed = false;
+        while (child != null) {
+            final IElementType type = child.getElementType();
+            if (type == JSTokenTypes.LBRACKET) {
+                bracketPassed = true;
+            }
+            if (bracketPassed && child.getPsi() instanceof JSExpression expression) {
+                return expression;
+            }
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSIndexedPropertyAccessExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSIndexedPropertyAccessExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
index 8ac840e2..c97380ef 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
@@ -34,64 +34,53 @@
  * Time: 9:20:04 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSLabeledStatementImpl extends JSStatementImpl implements JSLabeledStatement, JSNamedElement
-{
-	public JSLabeledStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSLabeledStatementImpl extends JSStatementImpl implements JSLabeledStatement, JSNamedElement {
+    public JSLabeledStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public String getLabel()
-	{
-		return getNameIdentifier().getText();
-	}
+    @Override
+    public String getLabel() {
+        return getNameIdentifier().getText();
+    }
 
-	@Override
-	public PsiElement getLabelIdentifier()
-	{
-		return getNameIdentifier();
-	}
+    @Override
+    public PsiElement getLabelIdentifier() {
+        return getNameIdentifier();
+    }
 
-	@Override
-	public JSStatement getStatement()
-	{
-		return findChildByClass(JSStatement.class);
-	}
+    @Override
+    public JSStatement getStatement() {
+        return findChildByClass(JSStatement.class);
+    }
 
-	@Override
-	public JSStatement unlabel()
-	{
-		throw new UnsupportedOperationException("TODO: implement");
-	}
+    @Override
+    public JSStatement unlabel() {
+        throw new UnsupportedOperationException("TODO: implement");
+    }
 
-	public JSLabeledStatement setLabel(String label)
-	{
-		throw new UnsupportedOperationException("TODO: implement");
-	}
+    public JSLabeledStatement setLabel(String label) {
+        throw new UnsupportedOperationException("TODO: implement");
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSLabeledStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSLabeledStatement(this);
+    }
 
-	@Override
-	public String getName()
-	{
-		return getLabel();
-	}
+    @Override
+    public String getName() {
+        return getLabel();
+    }
 
-	@Override
-	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
-	{
-		JSChangeUtil.doIdentifierReplacement(this, getLabelIdentifier(), name);
-		return this;
-	}
+    @Override
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+        JSChangeUtil.doIdentifierReplacement(this, getLabelIdentifier(), name);
+        return this;
+    }
 
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		return findChildByType(JSTokenTypes.IDENTIFIER);
-	}
+    @Override
+    public PsiElement getNameIdentifier() {
+        return findChildByType(JSTokenTypes.IDENTIFIER);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
index 86833093..a390a2b5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
@@ -29,22 +29,18 @@
  * Time: 6:40:04 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSLetExpressionImpl extends JSExpressionImpl implements JSLetExpression
-{
-	public JSLetExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSLetExpressionImpl extends JSExpressionImpl implements JSLetExpression {
+    public JSLetExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSLetExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSLetExpression(this);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
index a8536b14..4e1f57a2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
@@ -27,28 +27,23 @@
 /**
  * @author maxim
  */
-public class JSLetStatementImpl extends JSStatementImpl implements JSLetStatement
-{
-	public JSLetStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSLetStatementImpl extends JSStatementImpl implements JSLetStatement {
+    public JSLetStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSLetStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSLetStatement(this);
+    }
 
-	@Override
-	public JSExpression[] getExpressions()
-	{
-		return findChildrenByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression[] getExpressions() {
+        return findChildrenByClass(JSExpression.class);
+    }
 
-	@Override
-	public JSBlockStatement getBody()
-	{
-		return findChildByClass(JSBlockStatement.class);
-	}
+    @Override
+    public JSBlockStatement getBody() {
+        return findChildByClass(JSBlockStatement.class);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index 5fbbf184..f3e18e86 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -36,117 +36,96 @@
  * @author max
  * @since 11:24:42 PM Jan 30, 2005
  */
-public class JSLiteralExpressionImpl extends JSExpressionImpl implements JSSimpleLiteralExpression, PsiLanguageInjectionHost
-{
-	private volatile JSReferenceSet myReferenceSet;
-	private volatile long myModCount;
+public class JSLiteralExpressionImpl extends JSExpressionImpl implements JSSimpleLiteralExpression, PsiLanguageInjectionHost {
+    private volatile JSReferenceSet myReferenceSet;
+    private volatile long myModCount;
 
-	public JSLiteralExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+    public JSLiteralExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public IElementType getLiteralElementType()
-	{
-		PsiElement firstChild = getFirstChild();
-		assert firstChild != null;
-		return firstChild.getNode().getElementType();
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public IElementType getLiteralElementType() {
+        PsiElement firstChild = getFirstChild();
+        assert firstChild != null;
+        return firstChild.getNode().getElementType();
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		IElementType literalElementType = getLiteralElementType();
-		if(literalElementType == JSTokenTypes.TRUE_KEYWORD || literalElementType == JSTokenTypes.FALSE_KEYWORD)
-		{
-			return JavaScriptPrimitiveType.BOOL;
-		}
-		else if(literalElementType == JSTokenTypes.REGEXP_LITERAL)
-		{
-			return JavaScriptPrimitiveType.REGEXP;
-		}
-		else if(literalElementType == JSTokenTypes.NUMERIC_LITERAL)
-		{
-			return JavaScriptPrimitiveType.NUMBER;
-		}
-		else if(literalElementType == JSTokenTypes.NULL_KEYWORD)
-		{
-			return JavaScriptPrimitiveType.NULL;
-		}
-		else if(JavaScriptTokenSets.STRING_LITERALS.contains(literalElementType))
-		{
-			return JavaScriptPrimitiveType.STRING;
-		}
-		return super.getType();
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        IElementType literalElementType = getLiteralElementType();
+        if (literalElementType == JSTokenTypes.TRUE_KEYWORD || literalElementType == JSTokenTypes.FALSE_KEYWORD) {
+            return JavaScriptPrimitiveType.BOOL;
+        }
+        else if (literalElementType == JSTokenTypes.REGEXP_LITERAL) {
+            return JavaScriptPrimitiveType.REGEXP;
+        }
+        else if (literalElementType == JSTokenTypes.NUMERIC_LITERAL) {
+            return JavaScriptPrimitiveType.NUMBER;
+        }
+        else if (literalElementType == JSTokenTypes.NULL_KEYWORD) {
+            return JavaScriptPrimitiveType.NULL;
+        }
+        else if (JavaScriptTokenSets.STRING_LITERALS.contains(literalElementType)) {
+            return JavaScriptPrimitiveType.STRING;
+        }
+        return super.getType();
+    }
 
-	@Override
-	@Nonnull
-	public PsiReference[] getReferences()
-	{
-		JSReferenceSet referenceSet = myReferenceSet;
+    @Override
+    @Nonnull
+    public PsiReference[] getReferences() {
+        JSReferenceSet referenceSet = myReferenceSet;
 
-		if(referenceSet == null)
-		{
-			synchronized(this)
-			{
-				referenceSet = myReferenceSet;
-				if(referenceSet == null)
-				{
-					referenceSet = new JSReferenceSet(this);
-					referenceSet.update(getText(), 0);
-					myReferenceSet = referenceSet;
-				}
-			}
-		}
-		else
-		{
-			final long count = getManager().getModificationTracker().getModificationCount();
+        if (referenceSet == null) {
+            synchronized (this) {
+                referenceSet = myReferenceSet;
+                if (referenceSet == null) {
+                    referenceSet = new JSReferenceSet(this);
+                    referenceSet.update(getText(), 0);
+                    myReferenceSet = referenceSet;
+                }
+            }
+        }
+        else {
+            final long count = getManager().getModificationTracker().getModificationCount();
 
-			if(count != myModCount)
-			{
-				synchronized(this)
-				{
-					if(count != myModCount)
-					{
-						referenceSet.update(getText(), 0);
-						myModCount = count;
-					}
-				}
-			}
-		}
+            if (count != myModCount) {
+                synchronized (this) {
+                    if (count != myModCount) {
+                        referenceSet.update(getText(), 0);
+                        myModCount = count;
+                    }
+                }
+            }
+        }
 
-		return myReferenceSet.getReferences();
-	}
+        return myReferenceSet.getReferences();
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSLiteralExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSLiteralExpression(this);
+    }
 
-	@Override
-	public boolean isValidHost()
-	{
-		return true;
-	}
+    @Override
+    public boolean isValidHost() {
+        return true;
+    }
 
-	@Override
-	public PsiLanguageInjectionHost updateText(@Nonnull String text)
-	{
-		JSExpression expressionFromText = JSChangeUtil.createExpressionFromText(getProject(), text);
-		return (PsiLanguageInjectionHost) replace(expressionFromText);
-	}
+    @Override
+    public PsiLanguageInjectionHost updateText(@Nonnull String text) {
+        JSExpression expressionFromText = JSChangeUtil.createExpressionFromText(getProject(), text);
+        return (PsiLanguageInjectionHost)replace(expressionFromText);
+    }
 
-	@Nonnull
-	@Override
-	public LiteralTextEscaper<? extends PsiLanguageInjectionHost> createLiteralTextEscaper()
-	{
-		return LiteralTextEscaper.createSimple(this);
-	}
+    @Nonnull
+    @Override
+    public LiteralTextEscaper<? extends PsiLanguageInjectionHost> createLiteralTextEscaper() {
+        return LiteralTextEscaper.createSimple(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
index 2d4333d0..b38e1f3c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
@@ -35,118 +35,102 @@
 /**
  * @by Maxim.Mossienko
  */
-public class JSNamespaceDeclarationImpl extends JSStubbedStatementImpl<JSNamespaceDeclarationStub> implements JSNamespaceDeclaration
-{
-	public JSNamespaceDeclarationImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSNamespaceDeclarationImpl(final JSNamespaceDeclarationStub node)
-	{
-		super(node, JSElementTypes.NAMESPACE_DECLARATION);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSNamespaceDeclaration(this);
-	}
-
-	@Override
-	public JSAttributeList getAttributeList()
-	{
-		return getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
-	}
-
-	@Override
-	public PsiElement setName(@NonNls @Nonnull String newName) throws IncorrectOperationException
-	{
-		final String oldName = getName();
-		if(newName.equals(oldName))
-		{
-			return this;
-		}
-
-		getNode().replaceChild(getNameIdentifier().getNode(), JSChangeUtil.createExpressionFromText(getProject(), newName).getNode());
-
-		JSPsiImplUtils.updateFileName(this, newName, oldName);
-		return this;
-	}
-
-	@Override
-	public String getName()
-	{
-		final JSNamespaceDeclarationStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getName();
-		}
-		final PsiElement node = getNameIdentifier();
-		return node != null ? node.getText() : null;
-	}
-
-	@Override
-	public int getTextOffset()
-	{
-		final PsiElement node = getNameIdentifier();
-		return node == null ? super.getTextOffset() : node.getTextOffset();
-	}
-
-	@Override
-	public String getQualifiedName()
-	{
-		final JSNamespaceDeclarationStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getQualifiedName();
-		}
-		return JSPsiImplUtils.getQName(this);
-	}
-
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		return findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
-	}
-
-	@Override
-	public String getInitialValueString()
-	{
-		final JSNamespaceDeclarationStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getInitialValueString();
-		}
-		final ASTNode anchor = getNode().findChildByType(JSTokenTypes.EQ);
-
-		if(anchor != null)
-		{
-			ASTNode node = anchor.getTreeNext();
-
-			if(node != null && node.getElementType() == JSTokenTypes.WHITE_SPACE)
-			{
-				node = node.getTreeNext();
-			}
-
-			if(node != null && JavaScriptTokenSets.STRING_LITERALS.contains(node.getElementType()))
-			{
-				return node.getText();
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public boolean isDeprecated()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
-									   @Nonnull final PsiElement place)
-	{
-		return processor.execute(lastParent, state);
-	}
+public class JSNamespaceDeclarationImpl extends JSStubbedStatementImpl<JSNamespaceDeclarationStub> implements JSNamespaceDeclaration {
+    public JSNamespaceDeclarationImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSNamespaceDeclarationImpl(final JSNamespaceDeclarationStub node) {
+        super(node, JSElementTypes.NAMESPACE_DECLARATION);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSNamespaceDeclaration(this);
+    }
+
+    @Override
+    public JSAttributeList getAttributeList() {
+        return getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
+    }
+
+    @Override
+    public PsiElement setName(@NonNls @Nonnull String newName) throws IncorrectOperationException {
+        final String oldName = getName();
+        if (newName.equals(oldName)) {
+            return this;
+        }
+
+        getNode().replaceChild(getNameIdentifier().getNode(), JSChangeUtil.createExpressionFromText(getProject(), newName).getNode());
+
+        JSPsiImplUtils.updateFileName(this, newName, oldName);
+        return this;
+    }
+
+    @Override
+    public String getName() {
+        final JSNamespaceDeclarationStub stub = getStub();
+        if (stub != null) {
+            return stub.getName();
+        }
+        final PsiElement node = getNameIdentifier();
+        return node != null ? node.getText() : null;
+    }
+
+    @Override
+    public int getTextOffset() {
+        final PsiElement node = getNameIdentifier();
+        return node == null ? super.getTextOffset() : node.getTextOffset();
+    }
+
+    @Override
+    public String getQualifiedName() {
+        final JSNamespaceDeclarationStub stub = getStub();
+        if (stub != null) {
+            return stub.getQualifiedName();
+        }
+        return JSPsiImplUtils.getQName(this);
+    }
+
+    @Override
+    public PsiElement getNameIdentifier() {
+        return findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
+    }
+
+    @Override
+    public String getInitialValueString() {
+        final JSNamespaceDeclarationStub stub = getStub();
+        if (stub != null) {
+            return stub.getInitialValueString();
+        }
+        final ASTNode anchor = getNode().findChildByType(JSTokenTypes.EQ);
+
+        if (anchor != null) {
+            ASTNode node = anchor.getTreeNext();
+
+            if (node != null && node.getElementType() == JSTokenTypes.WHITE_SPACE) {
+                node = node.getTreeNext();
+            }
+
+            if (node != null && JavaScriptTokenSets.STRING_LITERALS.contains(node.getElementType())) {
+                return node.getText();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
+
+    @Override
+    public boolean processDeclarations(
+        @Nonnull final PsiScopeProcessor processor,
+        @Nonnull final ResolveState state,
+        final PsiElement lastParent,
+        @Nonnull final PsiElement place
+    ) {
+        return processor.execute(lastParent, state);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index 66f64e5c..60cd6afc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -33,47 +33,36 @@
  * Time: 11:57:36 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSNewExpressionImpl extends JSExpressionImpl implements JSNewExpression
-{
-	public JSNewExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSNewExpressionImpl extends JSExpressionImpl implements JSNewExpression {
+    public JSNewExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		JSExpression methodExpression = getMethodExpression();
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        JSExpression methodExpression = getMethodExpression();
 
-		if(methodExpression instanceof JSReferenceExpression)
-		{
-			PsiElement resolvedElement = ((JSReferenceExpression) methodExpression).resolve();
-			if(resolvedElement instanceof JSClass)
-			{
-				return new JavaScriptClassType((JSClass) resolvedElement);
-			}
-		}
-		return super.getType();
-	}
+        return methodExpression instanceof JSReferenceExpression referenceExpression
+            && referenceExpression.resolve() instanceof JSClass jsClass
+            ? new JavaScriptClassType(jsClass)
+            : super.getType();
+    }
 
-	@Override
-	public JSExpression getMethodExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getMethodExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	public JSArgumentList getArgumentList()
-	{
-		final ASTNode node = getNode().findChildByType(JSElementTypes.ARGUMENT_LIST);
-		return node != null ? (JSArgumentList) node.getPsi() : null;
-	}
+    @Override
+    public JSArgumentList getArgumentList() {
+        final ASTNode node = getNode().findChildByType(JSElementTypes.ARGUMENT_LIST);
+        return node != null ? (JSArgumentList)node.getPsi() : null;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSNewExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSNewExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
index 3c242b81..a26e17e5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
@@ -32,43 +32,39 @@
  * Date: Jan 30, 2005
  * Time: 11:36:30 PM
  */
-public class JSObjectLiteralExpressionImpl extends JSExpressionImpl implements JSObjectLiteralExpression
-{
-	public JSObjectLiteralExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSObjectLiteralExpressionImpl extends JSExpressionImpl implements JSObjectLiteralExpression {
+    public JSObjectLiteralExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSProperty[] getProperties()
-	{
-		return findChildrenByClass(JSProperty.class);
-	}
+    @Override
+    public JSProperty[] getProperties() {
+        return findChildrenByClass(JSProperty.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSObjectLiteralExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSObjectLiteralExpression(this);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
-									   @Nonnull final PsiElement place)
-	{
-		if(lastParent == null || !(place instanceof JSProperty))
-		{
-			return true;
-		}
-		final JSProperty[] props = getProperties();
+    @Override
+    public boolean processDeclarations(
+        @Nonnull final PsiScopeProcessor processor,
+        @Nonnull final ResolveState state,
+        final PsiElement lastParent,
+        @Nonnull final PsiElement place
+    ) {
+        if (lastParent == null || !(place instanceof JSProperty)) {
+            return true;
+        }
+        final JSProperty[] props = getProperties();
 
-		for(JSProperty property : props)
-		{
-			if(!processor.execute(property, state))
-			{
-				return false;
-			}
-		}
+        for (JSProperty property : props) {
+            if (!processor.execute(property, state)) {
+                return false;
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
index 6fc625cb..9f2b5c0f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
@@ -37,181 +37,148 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.io.IOException;
 
 /**
  * @by Maxim.Mossienko
  */
-public class JSPackageStatementImpl extends JSStubbedStatementImpl<JSPackageStatementStub> implements JSPackageStatement
-{
-	public JSPackageStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSPackageStatementImpl(final JSPackageStatementStub stub)
-	{
-		super(stub, JSElementTypes.PACKAGE_STATEMENT);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSPackageStatement(this);
-	}
-
-	@Override
-	public String getName()
-	{
-		final JSPackageStatementStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getName();
-		}
-		final PsiElement node = getNameIdentifier();
-		if(node != null)
-		{
-			return ((JSReferenceExpression) node).getReferencedName();
-		}
-		return null;
-	}
-
-	@Override
-	public String getQualifiedName()
-	{
-		final JSPackageStatementStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getQualifiedName();
-		}
-
-		final PsiElement node = getNameIdentifier();
-		if(node != null)
-		{
-			return node.getText();
-		}
-		return null;
-	}
-
-	@Override
-	public JSSourceElement[] getStatements()
-	{
-		return getStubOrPsiChildren(JSElementTypes.SOURCE_ELEMENTS, JSSourceElement.EMPTY_ARRAY);
-	}
-
-	@Override
-	public void setQualifiedName(final String expectedPackageNameFromFile)
-	{
-		doChangeName(getProject(), this, expectedPackageNameFromFile);
-	}
-
-	@Override
-	public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException
-	{
-		VirtualFile virtualFile = getContainingFile().getVirtualFile();
-		String expectedPackageNameFromFile = JSResolveUtil.getExpectedPackageNameFromFile(virtualFile, getProject(), false);
-		if(expectedPackageNameFromFile != null && expectedPackageNameFromFile.equals(getQualifiedName()))
-		{
-			try
-			{
-				JSPsiImplUtils.doRenameParentDirectoryIfNeeded(virtualFile, name, this);
-			}
-			catch(IOException ex)
-			{
-				throw new IncorrectOperationException("", ex);
-			}
-		}
-
-		PsiElement child = getNameIdentifier();
-		if(child instanceof JSReferenceExpression)
-		{
-			JSReferenceExpression expr = (JSReferenceExpression) child;
-			PsiElement element = expr.getReferenceNameElement();
-			if(element != null)
-			{
-				JSChangeUtil.doIdentifierReplacement(expr, element, name);
-			}
-		}
-
-		return this;
-	}
-
-	@Override
-	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState substitutor,
-			final PsiElement lastParent, @Nonnull final PsiElement place)
-	{
-		if(lastParent != null && lastParent.getParent() == this)
-		{
-			return JSImportHandlingUtil.tryResolveImports(processor, this, place);
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		return findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
-	}
-
-	@Override
-	public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(element))
-		{
-			final PsiElement insertedElement = JSChangeUtil.doAddBefore(this, element, anchor);
-			CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), insertedElement.getNode());
-			return insertedElement;
-		}
-		return super.addBefore(element, anchor);
-	}
-
-	@Override
-	public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(element))
-		{
-			final PsiElement insertedElement = JSChangeUtil.doAddAfter(this, element, anchor);
-			CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), insertedElement.getNode());
-			return insertedElement;
-		}
-		return super.addAfter(element, anchor);
-	}
-
-	public static void doChangeName(final Project project, final JSPackageStatement packageStatement, final String expected)
-	{
-		if(expected == null)
-		{
-			return;
-		}
-		final PsiElement node = packageStatement.getNameIdentifier();
-		final ASTNode parent = packageStatement.getNode();
-
-		if(expected.length() == 0)
-		{
-			if(node != null)
-			{
-				final ASTNode treeNext = node.getNode().getTreeNext();
-				parent.removeChild(node.getNode());
-				if(treeNext.getPsi() instanceof PsiWhiteSpace)
-				{
-					parent.removeChild(treeNext);
-				}
-			}
-		}
-		else
-		{
-			final ASTNode child = JSChangeUtil.createExpressionFromText(project, expected).getNode();
-			if(node != null)
-			{
-				parent.replaceChild(node.getNode(), child);
-			}
-			else
-			{
-				parent.addChild(child, parent.findChildByType(JSTokenTypes.LBRACE));
-			}
-		}
-	}
+public class JSPackageStatementImpl extends JSStubbedStatementImpl<JSPackageStatementStub> implements JSPackageStatement {
+    public JSPackageStatementImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSPackageStatementImpl(final JSPackageStatementStub stub) {
+        super(stub, JSElementTypes.PACKAGE_STATEMENT);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSPackageStatement(this);
+    }
+
+    @Override
+    public String getName() {
+        final JSPackageStatementStub stub = getStub();
+        if (stub != null) {
+            return stub.getName();
+        }
+        final PsiElement node = getNameIdentifier();
+        if (node != null) {
+            return ((JSReferenceExpression)node).getReferencedName();
+        }
+        return null;
+    }
+
+    @Override
+    public String getQualifiedName() {
+        final JSPackageStatementStub stub = getStub();
+        if (stub != null) {
+            return stub.getQualifiedName();
+        }
+
+        final PsiElement node = getNameIdentifier();
+        if (node != null) {
+            return node.getText();
+        }
+        return null;
+    }
+
+    @Override
+    public JSSourceElement[] getStatements() {
+        return getStubOrPsiChildren(JSElementTypes.SOURCE_ELEMENTS, JSSourceElement.EMPTY_ARRAY);
+    }
+
+    @Override
+    public void setQualifiedName(final String expectedPackageNameFromFile) {
+        doChangeName(getProject(), this, expectedPackageNameFromFile);
+    }
+
+    @Override
+    public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException {
+        VirtualFile virtualFile = getContainingFile().getVirtualFile();
+        String expectedPackageNameFromFile =
+            JSResolveUtil.getExpectedPackageNameFromFile(virtualFile, getProject(), false);
+        if (expectedPackageNameFromFile != null && expectedPackageNameFromFile.equals(getQualifiedName())) {
+            try {
+                JSPsiImplUtils.doRenameParentDirectoryIfNeeded(virtualFile, name, this);
+            }
+            catch (IOException ex) {
+                throw new IncorrectOperationException("", ex);
+            }
+        }
+
+        PsiElement child = getNameIdentifier();
+        if (child instanceof JSReferenceExpression expr) {
+            PsiElement element = expr.getReferenceNameElement();
+            if (element != null) {
+                JSChangeUtil.doIdentifierReplacement(expr, element, name);
+            }
+        }
+
+        return this;
+    }
+
+    @Override
+    public boolean processDeclarations(
+        @Nonnull final PsiScopeProcessor processor,
+        @Nonnull final ResolveState substitutor,
+        final PsiElement lastParent,
+        @Nonnull final PsiElement place
+    ) {
+        return !(lastParent != null && lastParent.getParent() == this)
+            || JSImportHandlingUtil.tryResolveImports(processor, this, place);
+    }
+
+    @Override
+    public PsiElement getNameIdentifier() {
+        return findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
+    }
+
+    @Override
+    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(element)) {
+            final PsiElement insertedElement = JSChangeUtil.doAddBefore(this, element, anchor);
+            CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), insertedElement.getNode());
+            return insertedElement;
+        }
+        return super.addBefore(element, anchor);
+    }
+
+    @Override
+    public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(element)) {
+            final PsiElement insertedElement = JSChangeUtil.doAddAfter(this, element, anchor);
+            CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), insertedElement.getNode());
+            return insertedElement;
+        }
+        return super.addAfter(element, anchor);
+    }
+
+    public static void doChangeName(final Project project, final JSPackageStatement packageStatement, final String expected) {
+        if (expected == null) {
+            return;
+        }
+        final PsiElement node = packageStatement.getNameIdentifier();
+        final ASTNode parent = packageStatement.getNode();
+
+        if (expected.length() == 0) {
+            if (node != null) {
+                final ASTNode treeNext = node.getNode().getTreeNext();
+                parent.removeChild(node.getNode());
+                if (treeNext.getPsi() instanceof PsiWhiteSpace) {
+                    parent.removeChild(treeNext);
+                }
+            }
+        }
+        else {
+            final ASTNode child = JSChangeUtil.createExpressionFromText(project, expected).getNode();
+            if (node != null) {
+                parent.replaceChild(node.getNode(), child);
+            }
+            else {
+                parent.addChild(child, parent.findChildByType(JSTokenTypes.LBRACE));
+            }
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index 4fd430ee..11638b0a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -41,112 +41,98 @@
  * Time: 9:12:51 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSParameterImpl extends JSVariableBaseImpl<JSParameterStub, JSParameter> implements JSParameter
-{
-	public JSParameterImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSParameterImpl(final JSParameterStub stub)
-	{
-		super(stub, JSElementTypes.FORMAL_PARAMETER);
-	}
-
-	@Override
-	public JSFunction getDeclaringFunction()
-	{
-		return (JSFunction) getNode().getTreeParent().getTreeParent().getPsi();
-	}
-
-	@Override
-	@RequiredReadAction
-	public boolean isRest()
-	{
-		final JSParameterStub parameterStub = getStub();
-		if(parameterStub != null)
-		{
-			return parameterStub.isRest();
-		}
-		return getRestElement() != null;
-	}
-
-	@Nullable
-	@Override
-	@RequiredReadAction
-	public PsiElement getRestElement()
-	{
-		return findChildByType(JSTokenTypes.DOT_DOT_DOT);
-	}
-
-	@Override
-	public boolean isOptional()
-	{
-		final JSParameterStub parameterStub = getStub();
-		if(parameterStub != null)
-		{
-			return parameterStub.isOptional();
-		}
-		if(getInitializer() != null)
-		{
-			return true;
-		}
-
-		return JSDocumentationUtils.findOptionalStatusFromComments(this);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSParameter(this);
-	}
-
-	@Override
-	public JSAttributeList getAttributeList()
-	{
-		return null;
-	}
-
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		final ASTNode myNode = getNode();
-		final ASTNode parent = myNode.getTreeParent();
-
-		if(parent.getElementType() == JSElementTypes.PARAMETER_LIST)
-		{
-			JSChangeUtil.removeRangeWithRemovalOfCommas(myNode, parent);
-			return;
-		}
-
-		throw new IncorrectOperationException("Cannot delete variable from parent : " + parent.getElementType());
-	}
-
-	@Override
-	protected String doGetType()
-	{
-		String s = super.doGetType();
-
-		if(s == null)
-		{
-			final ASTNode astNode = getNode();
-			final ASTNode anchor = astNode.findChildByType(JSTokenTypes.INSTANCEOF_KEYWORD);
-
-			if(anchor != null)
-			{
-				ASTNode type = astNode.findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET, anchor);
-				if(type != null)
-				{
-					s = type.getText();
-				}
-			}
-		}
-		return s;
-	}
-
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
-	{
-		return processor.execute(this, state);
-	}
+public class JSParameterImpl extends JSVariableBaseImpl<JSParameterStub, JSParameter> implements JSParameter {
+    public JSParameterImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSParameterImpl(final JSParameterStub stub) {
+        super(stub, JSElementTypes.FORMAL_PARAMETER);
+    }
+
+    @Override
+    public JSFunction getDeclaringFunction() {
+        return (JSFunction)getNode().getTreeParent().getTreeParent().getPsi();
+    }
+
+    @Override
+    @RequiredReadAction
+    public boolean isRest() {
+        final JSParameterStub parameterStub = getStub();
+        if (parameterStub != null) {
+            return parameterStub.isRest();
+        }
+        return getRestElement() != null;
+    }
+
+    @Nullable
+    @Override
+    @RequiredReadAction
+    public PsiElement getRestElement() {
+        return findChildByType(JSTokenTypes.DOT_DOT_DOT);
+    }
+
+    @Override
+    public boolean isOptional() {
+        final JSParameterStub parameterStub = getStub();
+        if (parameterStub != null) {
+            return parameterStub.isOptional();
+        }
+        if (getInitializer() != null) {
+            return true;
+        }
+
+        return JSDocumentationUtils.findOptionalStatusFromComments(this);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSParameter(this);
+    }
+
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+
+    @Override
+    public void delete() throws IncorrectOperationException {
+        final ASTNode myNode = getNode();
+        final ASTNode parent = myNode.getTreeParent();
+
+        if (parent.getElementType() == JSElementTypes.PARAMETER_LIST) {
+            JSChangeUtil.removeRangeWithRemovalOfCommas(myNode, parent);
+            return;
+        }
+
+        throw new IncorrectOperationException("Cannot delete variable from parent : " + parent.getElementType());
+    }
+
+    @Override
+    protected String doGetType() {
+        String s = super.doGetType();
+
+        if (s == null) {
+            final ASTNode astNode = getNode();
+            final ASTNode anchor = astNode.findChildByType(JSTokenTypes.INSTANCEOF_KEYWORD);
+
+            if (anchor != null) {
+                ASTNode type = astNode.findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET, anchor);
+                if (type != null) {
+                    s = type.getText();
+                }
+            }
+        }
+        return s;
+    }
+
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        return processor.execute(this, state);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
index 0f9f7f03..ac3aa147 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
@@ -32,27 +32,22 @@
  * Time: 8:41:53 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSParameterListImpl extends JSStubElementImpl<JSParameterListStub> implements JSParameterList
-{
-	public JSParameterListImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSParameterListImpl extends JSStubElementImpl<JSParameterListStub> implements JSParameterList {
+    public JSParameterListImpl(final ASTNode node) {
+        super(node);
+    }
 
-	public JSParameterListImpl(final JSParameterListStub stub)
-	{
-		super(stub, JSElementTypes.PARAMETER_LIST);
-	}
+    public JSParameterListImpl(final JSParameterListStub stub) {
+        super(stub, JSElementTypes.PARAMETER_LIST);
+    }
 
-	@Override
-	public JSParameter[] getParameters()
-	{
-		return getStubOrPsiChildren(JSElementTypes.PARAMETERS, JSParameter.EMPTY_ARRAY);
-	}
+    @Override
+    public JSParameter[] getParameters() {
+        return getStubOrPsiChildren(JSElementTypes.PARAMETERS, JSParameter.EMPTY_ARRAY);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSParameterList(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSParameterList(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
index b147b83f..99cd3108 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
@@ -27,22 +27,18 @@
  * Date: Jan 30, 2005
  * Time: 11:30:44 PM
  */
-public class JSParenthesizedExpressionImpl extends JSExpressionImpl implements JSParenthesizedExpression
-{
-	public JSParenthesizedExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSParenthesizedExpressionImpl extends JSExpressionImpl implements JSParenthesizedExpression {
+    public JSParenthesizedExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getInnerExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getInnerExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSParenthesizedExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSParenthesizedExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index 5f461df6..a2336f0d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -32,38 +32,32 @@
  * Date: Jan 30, 2005
  * Time: 11:52:13 PM
  */
-public class JSPostfixExpressionImpl extends JSExpressionImpl implements JSPostfixExpression
-{
-	public JSPostfixExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		JSExpression expression = getExpression();
-		return expression == null ? JavaScriptType.UNKNOWN : expression.getType();
-	}
-
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
-
-	@Override
-	public IElementType getOperationSign()
-	{
-		final ASTNode[] nodes = getNode().getChildren(JSTokenTypes.OPERATIONS);
-		return nodes.length == 1 ? nodes[0].getElementType() : null;
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSPostfixExpression(this);
-	}
+public class JSPostfixExpressionImpl extends JSExpressionImpl implements JSPostfixExpression {
+    public JSPostfixExpressionImpl(final ASTNode node) {
+        super(node);
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        JSExpression expression = getExpression();
+        return expression == null ? JavaScriptType.UNKNOWN : expression.getType();
+    }
+
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
+
+    @Override
+    public IElementType getOperationSign() {
+        final ASTNode[] nodes = getNode().getChildren(JSTokenTypes.OPERATIONS);
+        return nodes.length == 1 ? nodes[0].getElementType() : null;
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSPostfixExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index f5b0e957..a08d72e9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -36,48 +36,41 @@
  * Time: 11:52:13 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSPrefixExpressionImpl extends JSExpressionImpl implements JSPrefixExpression
-{
-	public JSPrefixExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSPrefixExpressionImpl extends JSExpressionImpl implements JSPrefixExpression {
+    public JSPrefixExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Nullable
-	@RequiredReadAction
-	@Override
-	public IElementType getOperationSign()
-	{
-		PsiElement operatorElement = getOperatorElement();
-		return operatorElement != null ? operatorElement.getNode().getElementType() : null;
-	}
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public IElementType getOperationSign() {
+        PsiElement operatorElement = getOperatorElement();
+        return operatorElement != null ? operatorElement.getNode().getElementType() : null;
+    }
 
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiElement getOperatorElement()
-	{
-		return findChildByType(JSTokenTypes.OPERATIONS);
-	}
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getOperatorElement() {
+        return findChildByType(JSTokenTypes.OPERATIONS);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSPrefixExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSPrefixExpression(this);
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		JSExpression expression = getExpression();
-		return expression == null ? JavaScriptType.UNKNOWN : expression.getType();
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        JSExpression expression = getExpression();
+        return expression == null ? JavaScriptType.UNKNOWN : expression.getType();
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index afe784d6..cf71751c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -41,142 +41,125 @@
 /**
  * @author max
  */
-public class JSPropertyImpl extends JSElementImpl implements JSProperty
-{
-	private static TokenSet IDENTIFIER_TOKENS_SET = TokenSet.orSet(TokenSet.create(JSTokenTypes.NUMERIC_LITERAL, JSTokenTypes.IDENTIFIER), JavaScriptTokenSets.STRING_LITERALS);
-
-	public JSPropertyImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	@Override
-	@Nonnull
-	public PsiReference[] getReferences()
-	{
-		return LanguageCachedValueUtil.getCachedValue(this, new CachedValueProvider<PsiReference[]>()
-		{
-			@Nullable
-			@Override
-			@RequiredReadAction
-			public Result<PsiReference[]> compute()
-			{
-				return Result.create(buildReferences(), JSPropertyImpl.this, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
-			}
-		});
-	}
-
-	@Nonnull
-	@RequiredReadAction
-	private PsiReference[] buildReferences()
-	{
-		PsiElement nameIdentifier = getNameIdentifier();
-		if(nameIdentifier == null)
-		{
-			return PsiReference.EMPTY_ARRAY;
-		}
-		PsiReference reference = JSPropertyNameReferenceProvider.EP_NAME.computeSafeIfAny(it -> it.getReference(this));
-		if(reference != null)
-		{
-			return new PsiReference[]{reference};
-		}
-		return PsiReference.EMPTY_ARRAY;
-	}
-
-	@Override
-	@RequiredReadAction
-	public String getName()
-	{
-		final PsiElement nameIdentifier = getNameIdentifier();
-		if(nameIdentifier != null)
-		{
-			return StringUtil.stripQuotesAroundValue(nameIdentifier.getText());
-		}
-		return null;
-	}
-
-	@Override
-	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
-	{
-		final PsiElement nameNode = getNameIdentifier();
-		assert nameNode != null;
-		final ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), name, nameNode.getNode().getElementType());
-		getNode().replaceChild(nameNode.getNode(), nameElement);
-		return this;
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		JSExpression value = getValue();
-		if(value != null)
-		{
-			return value.getType();
-		}
-		return JavaScriptType.UNKNOWN;
-	}
-
-	@RequiredReadAction
-	@Override
-	public JSExpression getValue()
-	{
-		return findChildByClass(JSExpression.class);
-	}
-
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiElement getColonElement()
-	{
-		return findChildByType(JSTokenTypes.COLON);
-	}
-
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public JSComputedName getComputedName()
-	{
-		return findChildByClass(JSComputedName.class);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSProperty(this);
-	}
-
-	@RequiredReadAction
-	@Override
-	public int getTextOffset()
-	{
-		final PsiElement name = getNameIdentifier();
-		return name != null ? name.getTextOffset() : super.getTextOffset();
-	}
-
-	@Override
-	@RequiredReadAction
-	public void delete() throws IncorrectOperationException
-	{
-		final ASTNode myNode = getNode();
-		JSChangeUtil.removeRangeWithRemovalOfCommas(myNode, myNode.getTreeParent());
-	}
-
-	@Override
-	@RequiredReadAction
-	public PsiElement getNameIdentifier()
-	{
-		PsiElement nameIdentifier = findChildByType(IDENTIFIER_TOKENS_SET);
-		if(nameIdentifier == null)
-		{
-			JSExpression value = getValue();
-			// auto-property name
-			if(value != null && getColonElement() == null)
-			{
-				return value;
-			}
-		}
-		return nameIdentifier;
-	}
+public class JSPropertyImpl extends JSElementImpl implements JSProperty {
+    private static TokenSet IDENTIFIER_TOKENS_SET =
+        TokenSet.orSet(TokenSet.create(JSTokenTypes.NUMERIC_LITERAL, JSTokenTypes.IDENTIFIER), JavaScriptTokenSets.STRING_LITERALS);
+
+    public JSPropertyImpl(final ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    @Nonnull
+    public PsiReference[] getReferences() {
+        return LanguageCachedValueUtil.getCachedValue(this, new CachedValueProvider<PsiReference[]>() {
+            @Nullable
+            @Override
+            @RequiredReadAction
+            public Result<PsiReference[]> compute() {
+                return Result.create(
+                    buildReferences(),
+                    JSPropertyImpl.this,
+                    PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT
+                );
+            }
+        });
+    }
+
+    @Nonnull
+    @RequiredReadAction
+    private PsiReference[] buildReferences() {
+        PsiElement nameIdentifier = getNameIdentifier();
+        if (nameIdentifier == null) {
+            return PsiReference.EMPTY_ARRAY;
+        }
+        PsiReference reference = JSPropertyNameReferenceProvider.EP_NAME.computeSafeIfAny(it -> it.getReference(this));
+        if (reference != null) {
+            return new PsiReference[]{reference};
+        }
+        return PsiReference.EMPTY_ARRAY;
+    }
+
+    @Override
+    @RequiredReadAction
+    public String getName() {
+        final PsiElement nameIdentifier = getNameIdentifier();
+        if (nameIdentifier != null) {
+            return StringUtil.stripQuotesAroundValue(nameIdentifier.getText());
+        }
+        return null;
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+        final PsiElement nameNode = getNameIdentifier();
+        assert nameNode != null;
+        final ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), name, nameNode.getNode().getElementType());
+        getNode().replaceChild(nameNode.getNode(), nameElement);
+        return this;
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        JSExpression value = getValue();
+        if (value != null) {
+            return value.getType();
+        }
+        return JavaScriptType.UNKNOWN;
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSExpression getValue() {
+        return findChildByClass(JSExpression.class);
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getColonElement() {
+        return findChildByType(JSTokenTypes.COLON);
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSComputedName getComputedName() {
+        return findChildByClass(JSComputedName.class);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSProperty(this);
+    }
+
+    @RequiredReadAction
+    @Override
+    public int getTextOffset() {
+        final PsiElement name = getNameIdentifier();
+        return name != null ? name.getTextOffset() : super.getTextOffset();
+    }
+
+    @Override
+    @RequiredReadAction
+    public void delete() throws IncorrectOperationException {
+        final ASTNode myNode = getNode();
+        JSChangeUtil.removeRangeWithRemovalOfCommas(myNode, myNode.getTreeParent());
+    }
+
+    @Override
+    @RequiredReadAction
+    public PsiElement getNameIdentifier() {
+        PsiElement nameIdentifier = findChildByType(IDENTIFIER_TOKENS_SET);
+        if (nameIdentifier == null) {
+            JSExpression value = getValue();
+            // auto-property name
+            if (value != null && getColonElement() == null) {
+                return value;
+            }
+        }
+        return nameIdentifier;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 06fc85a9..28ba6890 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -49,6 +49,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nullable;
+
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
@@ -57,447 +58,379 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 8, 2008
- *         Time: 3:23:37 PM
+ * Date: Jun 8, 2008
+ * Time: 3:23:37 PM
  */
-public class JSPsiImplUtils
-{
-	@NonNls
-	private static final String ARRAY_TYPE_NAME = "Array";
-	@NonNls
-	private static final String ARRAY_ELEMENT_TYPE_ANNOTATION_NAME = "ArrayElementType";
-
-	@Nullable
-	@RequiredReadAction
-	public static JavaScriptTypeElement findTypeElement(@Nonnull PsiElement element)
-	{
-		if(element instanceof StubBasedPsiElement)
-		{
-			StubElement<?> stub = ((StubBasedPsiElement) element).getStub();
-			if(stub != null)
-			{
-				List<StubElement> childrenStubs = stub.getChildrenStubs();
-				for(StubElement childrenStub : childrenStubs)
-				{
-					IStubElementType stubType = childrenStub.getStubType();
-					if(stubType instanceof BaseJavaScriptElementType)
-					{
-						return (JavaScriptTypeElement) stub.getPsi();
-					}
-				}
-			}
-		}
-
-		return findChildrenByClass(element, JavaScriptTypeElement.class);
-	}
-
-	@Nullable
-	@RequiredReadAction
-	@SuppressWarnings("unchecked")
-	private static <T> T findChildrenByClass(@Nonnull PsiElement element, Class<T> aClass)
-	{
-		for(PsiElement cur = element.getFirstChild(); cur != null; cur = cur.getNextSibling())
-		{
-			if(aClass.isInstance(cur))
-			{
-				return (T) cur;
-			}
-		}
-		return null;
-	}
-
-	@Deprecated
-	public static ASTNode getTypeExpressionFromDeclaration(JSNamedElement element)
-	{
-		final ASTNode myNode = element.getNode();
-		final ASTNode node = myNode != null ? myNode.findChildByType(JSTokenTypes.COLON) : null;
-		String s = null;
-
-		if(node != null)
-		{
-			return myNode.findChildByType(JSDocumentationUtils.ourTypeFilter, node);
-		}
-
-		return null;
-	}
-
-	@Deprecated
-	public static String getTypeFromDeclaration(JSNamedElement element)
-	{
-		ASTNode typeExpr = getTypeExpressionFromDeclaration(element);
-
-		String s = null;
-		if(typeExpr != null)
-		{
-			s = typeExpr.getText();
-		}
-		else if(element instanceof JSParameter && ((JSParameter) element).isRest())
-		{
-			s = ARRAY_TYPE_NAME;
-		}
-
-		if(ARRAY_TYPE_NAME.equals(s))
-		{
-			final PsiComment psiComment = typeExpr != null ? PsiTreeUtil.getPrevSiblingOfType(typeExpr.getPsi(), PsiComment.class) : null;
-
-			if(psiComment != null)
-			{
-				final String elementType = JSDocumentationUtils.unwrapCommentDelimiters(psiComment.getText()).trim();
-
-				if(elementType.length() > 0)
-				{
-					return s + "[" + elementType;
-				}
-			}
-
-			if(element instanceof JSAttributeListOwner)
-			{
-				final JSAttributeListOwner attributeListOwner = (JSAttributeListOwner) element;
-				final JSAttributeList attributeList = attributeListOwner.getAttributeList();
-
-				if(attributeList != null)
-				{
-					String type = getArrayElementTypeFromAnnotation(attributeList);
-					if(type != null && type.length() > 0)
-					{
-						return s + "[" + type;
-					}
-				}
-			}
-
-		}
-
-		return s;
-	}
-
-	public static
-	@Nullable
-	String getArrayElementTypeFromAnnotation(JSAttributeList attributeList)
-	{
-		return getTypeFromAnnotationParameter(attributeList, ARRAY_ELEMENT_TYPE_ANNOTATION_NAME, null);
-	}
-
-	public static String getType(JSNamedElement element)
-	{
-		final String typeFromDeclaration = getTypeFromDeclaration(element);
-		if(typeFromDeclaration != null)
-		{
-			return typeFromDeclaration;
-		}
-
-		return JSDocumentationUtils.findTypeFromComments(element);
-	}
-
-	public static void updateFileName(JSQualifiedNamedElement jsClassBase, final String newName, final String oldName) throws IncorrectOperationException
-	{
-		final PsiFile containingFile = jsClassBase.getContainingFile();
-
-		if(containingFile.getContext() == null)
-		{
-			final VirtualFile virtualFile = containingFile.getVirtualFile();
-
-			if(virtualFile != null && virtualFile.getNameWithoutExtension().equals(oldName))
-			{
-				final String s = containingFile.getName();
-				containingFile.setName(newName + "." + s.substring(s.lastIndexOf('.') + 1));
-			}
-		}
-	}
-
-	public static
-	@Nullable
-	JSPackageStatement findPackageStatement(JSFile file)
-	{
-		JSPackageStatement packageStatement = null;
-
-		for(PsiElement statement : file.getChildren())
-		{
-			if(statement instanceof JSPackageStatement)
-			{
-				packageStatement = (JSPackageStatement) statement;
-				break;
-			}
-		}
-		return packageStatement;
-	}
-
-	static
-	@Nonnull
-	PsiElement findTopLevelNavigatableElement(@Nonnull JSQualifiedNamedElement jsClass)
-	{
-		PsiElement sourceElement = findTopLevelNavigatableElementWithSource(jsClass, null);
-		if(sourceElement != null)
-		{
-			return sourceElement;
-		}
-		return jsClass;
-	}
-
-	@Nullable
-	public static PsiElement findTopLevelNavigatableElementWithSource(@Nonnull JSQualifiedNamedElement jsClass, @Nullable Consumer<JSQualifiedNamedElement> candidatesConsumer)
-	{
-		if(candidatesConsumer != null)
-		{
-			candidatesConsumer.accept(jsClass);
-		}
-
-		PsiElement sourceElement = findSourceElement(jsClass);
-		if(sourceElement != null)
-		{
-			return sourceElement;
-		}
-
-		if(DumbService.isDumb(jsClass.getProject()))
-		{
-			return null;
-		}
-
-		GlobalSearchScope searchScope = jsClass.getResolveScope();
-		final String qName = jsClass.getQualifiedName();
-		final Collection<JSQualifiedNamedElement> candidates = StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_QNAME, qName, jsClass.getProject(), searchScope, JSQualifiedNamedElement.class);
-		for(Iterator<JSQualifiedNamedElement> i = candidates.iterator(); i.hasNext(); )
-		{
-			if(!qName.equals(i.next().getQualifiedName()))
-			{
-				i.remove();
-			}
-		}
-
-		for(JSQualifiedNamedElement candidate : candidates)
-		{
-			if(candidate == jsClass)
-			{
-				continue;
-			}
-
-			if(candidatesConsumer != null)
-			{
-				candidatesConsumer.accept(candidate);
-			}
-
-			PsiElement candidateSourceElement = findSourceElement(candidate);
-			if(candidateSourceElement != null)
-			{
-				return candidateSourceElement;
-			}
-		}
-		return null;
-	}
-
-	@Nullable
-	private static PsiElement findSourceElement(JSQualifiedNamedElement jsClass)
-	{
-		PsiFile containingFile = jsClass.getContainingFile();
-		if(containingFile == null)
-		{
-			return null;
-		}
-
-		VirtualFile vFile = containingFile.getVirtualFile();
-		ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(jsClass.getProject()).getFileIndex();
-		if(vFile == null || projectFileIndex.getClassRootForFile(vFile) == null)
-		{
-			return null;
-		}
-
-		final List<OrderEntry> orderEntries = projectFileIndex.getOrderEntriesForFile(vFile);
-
-		String qName = jsClass.getQualifiedName();
-		String baseSourceName = jsClass.getName();
-		int index = qName != null ? qName.lastIndexOf('.') : -1;
-		String packageName = index != -1 ? qName.substring(0, index) : "";
-		String relativeFilePath = packageName.length() == 0 ? baseSourceName : packageName.replace('.', '/') + '/' + baseSourceName;
-		String relativeFilePath2 = relativeFilePath + ".mxml";
-		String relativeFilePath3 = relativeFilePath + ".mxm";
-		relativeFilePath += ".as";
-
-		for(OrderEntry orderEntry : orderEntries)
-		{
-			VirtualFile[] files = orderEntry.getFiles(SourcesOrderRootType.getInstance());
-
-			for(VirtualFile file : files)
-			{
-				VirtualFile source = file.findFileByRelativePath(relativeFilePath);
-
-				if(source != null)
-				{
-					PsiFile psiSource = jsClass.getManager().findFile(source);
-
-					if(psiSource instanceof JSFile)
-					{
-						JSPackageStatement statement = findPackageStatement((JSFile) psiSource);
-
-						if(statement != null)
-						{
-							for(JSSourceElement el : statement.getStatements())
-							{
-								if(el.getClass() == jsClass.getClass() && jsClass.getName().equals(el.getName()))
-								{
-									return el;
-								}
-							}
-						}
-						return psiSource;
-					}
-				}
-				else
-				{
-					source = file.findFileByRelativePath(relativeFilePath2);
-					if(source == null)
-					{
-						source = file.findFileByRelativePath(relativeFilePath3);
-					}
-					if(source != null)
-					{
-						PsiFile psiSource = jsClass.getManager().findFile(source);
-						if(psiSource instanceof XmlFile)
-						{
-							return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile) psiSource);
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	static String getQName(final JSNamedElement element)
-	{
-		final PsiElement node = element.getNameIdentifier();
-		final String name = node != null ? node.getText() : null;
-		PsiElement responsibleParent = element.getParent();
-
-		if(responsibleParent instanceof JSVarStatement)
-		{
-			responsibleParent = responsibleParent.getParent();
-		}
-
-		if(responsibleParent instanceof JSPackageStatement && name != null)
-		{
-			final String packageName = ((JSPackageStatement) responsibleParent).getQualifiedName();
-			if(!StringUtil.isEmpty(packageName))
-			{
-				return packageName.concat(".").concat(name);
-			}
-		}
-		return name;
-	}
-
-	public static
-	@Nullable
-	String getTypeFromAnnotationParameter(@Nonnull JSAttributeList attributeList, @Nonnull String annotationName, @Nullable String annotationParameter)
-	{
-		String arrayType = null;
-		final JSAttribute[] byName = attributeList.getAttributesByName(annotationName);
-		if(byName.length > 0)
-		{
-			final JSAttributeNameValuePair jsAttributeNameValuePair = byName[0].getValueByName(annotationParameter);
-			arrayType = jsAttributeNameValuePair != null ? jsAttributeNameValuePair.getSimpleValue() : null;
-		}
-		return arrayType;
-	}
-
-	/**
-	 * @see <code>QUALIFIED_NAME_HASHING_STRATEGY</code>
-	 */
-	static boolean isTheSameClass(final PsiElement typeSource, final JSClass jsClass)
-	{
-		if(typeSource == jsClass)
-		{
-			return true;
-		}
-		if(typeSource instanceof JSClass && jsClass != null)
-		{
-			final String qName = ((JSClass) typeSource).getQualifiedName();
-			return qName != null && qName.equals(jsClass.getQualifiedName());
-		}
-		return false;
-	}
-
-	public static final HashingStrategy<JSQualifiedNamedElement> QUALIFIED_NAME_HASHING_STRATEGY = new HashingStrategy<>()
-	{
-		@Override
-		public int hashCode(final JSQualifiedNamedElement object)
-		{
-			return object == null || object.getQualifiedName() == null ? 0 : object.getQualifiedName().hashCode();
-		}
-
-		@Override
-		public boolean equals(final JSQualifiedNamedElement o1, final JSQualifiedNamedElement o2)
-		{
-			return Comparing.equal(o1.getQualifiedName(), o2.getQualifiedName());
-		}
-	};
-
-	static void doRenameParentDirectoryIfNeeded(VirtualFile file, String name, Object requestor) throws IOException
-	{
-		VirtualFile directory = file.isDirectory() ? file : file.getParent();
-		if(!name.equals(directory.getName()))
-		{
-			directory.rename(requestor, name);
-		}
-	}
-
-	static
-	@Nullable
-	String getQNameForMove(@Nonnull PsiElement targetElement, PsiElement elementToBind)
-	{
-		String qName = null;
-		Project project = targetElement.getProject();
-
-		if(elementToBind instanceof PsiFile)
-		{
-			String newName = ((PsiNamedElement) elementToBind).getName();
-			int index = newName.lastIndexOf('.');
-			if(index != -1)
-			{
-				newName = newName.substring(0, index);
-			}
-			VirtualFile elementToBindFile = elementToBind.getContainingFile().getVirtualFile();
-
-			String packageName = JSResolveUtil.getExpectedPackageNameFromFile(elementToBindFile, project, false);
-
-			if(targetElement instanceof JSReferenceExpression)
-			{
-				JSExpression qualifier = ((JSReferenceExpression) targetElement).getQualifier();
-				String targetElementPackageName = qualifier != null ? qualifier.getText() : JSResolveUtil.getExpectedPackageNameFromFile(targetElement.getContainingFile().getVirtualFile(), project,
-						false);
-				if(!differentPackageName(targetElementPackageName, packageName))
-				{
-					return null;
-				}
-				if(qualifier == null)
-				{
-					if(!(targetElement.getParent() instanceof JavaScriptImportStatementBase))
-					{
-						return null;
-					}
-				}
-			}
-
-			qName = packageName.isEmpty() ? newName : packageName + "." + newName;
-		}
-		else if(elementToBind instanceof PsiDirectoryContainer)
-		{
-			PsiDirectory[] directories = ((PsiDirectoryContainer) elementToBind).getDirectories(targetElement.getResolveScope());
-			if(directories.length > 0)
-			{
-				qName = JSResolveUtil.getExpectedPackageNameFromFile(directories[0].getVirtualFile(), project, false);
-			}
-		}
-		return qName;
-	}
-
-	public static boolean differentPackageName(final String s, final String expectedPackageNameFromFile)
-	{
-		final boolean sIsEmpty = isEmpty(s);
-		final boolean expectedIsEmpty = isEmpty(expectedPackageNameFromFile);
-
-		return (sIsEmpty && !expectedIsEmpty) || (!sIsEmpty && (expectedIsEmpty || !s.equals(expectedPackageNameFromFile)));
-	}
-
-	public static boolean isEmpty(final String expectedPackageNameFromFile)
-	{
-		return expectedPackageNameFromFile == null || expectedPackageNameFromFile.length() == 0;
-	}
+public class JSPsiImplUtils {
+    @NonNls
+    private static final String ARRAY_TYPE_NAME = "Array";
+    @NonNls
+    private static final String ARRAY_ELEMENT_TYPE_ANNOTATION_NAME = "ArrayElementType";
+
+    @Nullable
+    @RequiredReadAction
+    public static JavaScriptTypeElement findTypeElement(@Nonnull PsiElement element) {
+        if (element instanceof StubBasedPsiElement stubBasedPsiElement) {
+            StubElement<?> stub = stubBasedPsiElement.getStub();
+            if (stub != null) {
+                List<StubElement> childrenStubs = stub.getChildrenStubs();
+                for (StubElement childrenStub : childrenStubs) {
+                    IStubElementType stubType = childrenStub.getStubType();
+                    if (stubType instanceof BaseJavaScriptElementType) {
+                        return (JavaScriptTypeElement)stub.getPsi();
+                    }
+                }
+            }
+        }
+
+        return findChildrenByClass(element, JavaScriptTypeElement.class);
+    }
+
+    @Nullable
+    @RequiredReadAction
+    @SuppressWarnings("unchecked")
+    private static <T> T findChildrenByClass(@Nonnull PsiElement element, Class<T> aClass) {
+        for (PsiElement cur = element.getFirstChild(); cur != null; cur = cur.getNextSibling()) {
+            if (aClass.isInstance(cur)) {
+                return (T)cur;
+            }
+        }
+        return null;
+    }
+
+    @Deprecated
+    public static ASTNode getTypeExpressionFromDeclaration(JSNamedElement element) {
+        final ASTNode myNode = element.getNode();
+        final ASTNode node = myNode != null ? myNode.findChildByType(JSTokenTypes.COLON) : null;
+        String s = null;
+
+        if (node != null) {
+            return myNode.findChildByType(JSDocumentationUtils.ourTypeFilter, node);
+        }
+
+        return null;
+    }
+
+    @Deprecated
+    public static String getTypeFromDeclaration(JSNamedElement element) {
+        ASTNode typeExpr = getTypeExpressionFromDeclaration(element);
+
+        String s = null;
+        if (typeExpr != null) {
+            s = typeExpr.getText();
+        }
+        else if (element instanceof JSParameter && ((JSParameter)element).isRest()) {
+            s = ARRAY_TYPE_NAME;
+        }
+
+        if (ARRAY_TYPE_NAME.equals(s)) {
+            final PsiComment psiComment = typeExpr != null ? PsiTreeUtil.getPrevSiblingOfType(typeExpr.getPsi(), PsiComment.class) : null;
+
+            if (psiComment != null) {
+                final String elementType = JSDocumentationUtils.unwrapCommentDelimiters(psiComment.getText()).trim();
+
+                if (elementType.length() > 0) {
+                    return s + "[" + elementType;
+                }
+            }
+
+            if (element instanceof JSAttributeListOwner attributeListOwner) {
+                final JSAttributeList attributeList = attributeListOwner.getAttributeList();
+
+                if (attributeList != null) {
+                    String type = getArrayElementTypeFromAnnotation(attributeList);
+                    if (type != null && type.length() > 0) {
+                        return s + "[" + type;
+                    }
+                }
+            }
+
+        }
+
+        return s;
+    }
+
+    @Nullable
+    public static String getArrayElementTypeFromAnnotation(JSAttributeList attributeList) {
+        return getTypeFromAnnotationParameter(attributeList, ARRAY_ELEMENT_TYPE_ANNOTATION_NAME, null);
+    }
+
+    public static String getType(JSNamedElement element) {
+        final String typeFromDeclaration = getTypeFromDeclaration(element);
+        if (typeFromDeclaration != null) {
+            return typeFromDeclaration;
+        }
+
+        return JSDocumentationUtils.findTypeFromComments(element);
+    }
+
+    public static void updateFileName(
+        JSQualifiedNamedElement jsClassBase,
+        final String newName,
+        final String oldName
+    ) throws IncorrectOperationException {
+        final PsiFile containingFile = jsClassBase.getContainingFile();
+
+        if (containingFile.getContext() == null) {
+            final VirtualFile virtualFile = containingFile.getVirtualFile();
+
+            if (virtualFile != null && virtualFile.getNameWithoutExtension().equals(oldName)) {
+                final String s = containingFile.getName();
+                containingFile.setName(newName + "." + s.substring(s.lastIndexOf('.') + 1));
+            }
+        }
+    }
+
+    @Nullable
+    public static JSPackageStatement findPackageStatement(JSFile file) {
+        JSPackageStatement packageStatement = null;
+
+        for (PsiElement statement : file.getChildren()) {
+            if (statement instanceof JSPackageStatement packageStmt) {
+                packageStatement = packageStmt;
+                break;
+            }
+        }
+        return packageStatement;
+    }
+
+    @Nonnull
+    static PsiElement findTopLevelNavigatableElement(@Nonnull JSQualifiedNamedElement jsClass) {
+        PsiElement sourceElement = findTopLevelNavigatableElementWithSource(jsClass, null);
+        if (sourceElement != null) {
+            return sourceElement;
+        }
+        return jsClass;
+    }
+
+    @Nullable
+    public static PsiElement findTopLevelNavigatableElementWithSource(
+        @Nonnull JSQualifiedNamedElement jsClass,
+        @Nullable Consumer<JSQualifiedNamedElement> candidatesConsumer
+    ) {
+        if (candidatesConsumer != null) {
+            candidatesConsumer.accept(jsClass);
+        }
+
+        PsiElement sourceElement = findSourceElement(jsClass);
+        if (sourceElement != null) {
+            return sourceElement;
+        }
+
+        if (DumbService.isDumb(jsClass.getProject())) {
+            return null;
+        }
+
+        GlobalSearchScope searchScope = jsClass.getResolveScope();
+        final String qName = jsClass.getQualifiedName();
+        final Collection<JSQualifiedNamedElement> candidates = StubIndex.getElements(
+            JavaScriptIndexKeys.ELEMENTS_BY_QNAME,
+            qName,
+            jsClass.getProject(),
+            searchScope,
+            JSQualifiedNamedElement.class
+        );
+        for (Iterator<JSQualifiedNamedElement> i = candidates.iterator(); i.hasNext(); ) {
+            if (!qName.equals(i.next().getQualifiedName())) {
+                i.remove();
+            }
+        }
+
+        for (JSQualifiedNamedElement candidate : candidates) {
+            if (candidate == jsClass) {
+                continue;
+            }
+
+            if (candidatesConsumer != null) {
+                candidatesConsumer.accept(candidate);
+            }
+
+            PsiElement candidateSourceElement = findSourceElement(candidate);
+            if (candidateSourceElement != null) {
+                return candidateSourceElement;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    private static PsiElement findSourceElement(JSQualifiedNamedElement jsClass) {
+        PsiFile containingFile = jsClass.getContainingFile();
+        if (containingFile == null) {
+            return null;
+        }
+
+        VirtualFile vFile = containingFile.getVirtualFile();
+        ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(jsClass.getProject()).getFileIndex();
+        if (vFile == null || projectFileIndex.getClassRootForFile(vFile) == null) {
+            return null;
+        }
+
+        final List<OrderEntry> orderEntries = projectFileIndex.getOrderEntriesForFile(vFile);
+
+        String qName = jsClass.getQualifiedName();
+        String baseSourceName = jsClass.getName();
+        int index = qName != null ? qName.lastIndexOf('.') : -1;
+        String packageName = index != -1 ? qName.substring(0, index) : "";
+        String relativeFilePath = packageName.length() == 0 ? baseSourceName : packageName.replace('.', '/') + '/' + baseSourceName;
+        String relativeFilePath2 = relativeFilePath + ".mxml";
+        String relativeFilePath3 = relativeFilePath + ".mxm";
+        relativeFilePath += ".as";
+
+        for (OrderEntry orderEntry : orderEntries) {
+            VirtualFile[] files = orderEntry.getFiles(SourcesOrderRootType.getInstance());
+
+            for (VirtualFile file : files) {
+                VirtualFile source = file.findFileByRelativePath(relativeFilePath);
+
+                if (source != null) {
+                    PsiFile psiSource = jsClass.getManager().findFile(source);
+
+                    if (psiSource instanceof JSFile) {
+                        JSPackageStatement statement = findPackageStatement((JSFile)psiSource);
+
+                        if (statement != null) {
+                            for (JSSourceElement el : statement.getStatements()) {
+                                if (el.getClass() == jsClass.getClass() && jsClass.getName().equals(el.getName())) {
+                                    return el;
+                                }
+                            }
+                        }
+                        return psiSource;
+                    }
+                }
+                else {
+                    source = file.findFileByRelativePath(relativeFilePath2);
+                    if (source == null) {
+                        source = file.findFileByRelativePath(relativeFilePath3);
+                    }
+                    if (source != null) {
+                        PsiFile psiSource = jsClass.getManager().findFile(source);
+                        if (psiSource instanceof XmlFile) {
+                            return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)psiSource);
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    static String getQName(final JSNamedElement element) {
+        final PsiElement node = element.getNameIdentifier();
+        final String name = node != null ? node.getText() : null;
+        PsiElement responsibleParent = element.getParent();
+
+        if (responsibleParent instanceof JSVarStatement) {
+            responsibleParent = responsibleParent.getParent();
+        }
+
+        if (responsibleParent instanceof JSPackageStatement packageStatement && name != null) {
+            final String packageName = packageStatement.getQualifiedName();
+            if (!StringUtil.isEmpty(packageName)) {
+                return packageName.concat(".").concat(name);
+            }
+        }
+        return name;
+    }
+
+    @Nullable
+    public static String getTypeFromAnnotationParameter(
+        @Nonnull JSAttributeList attributeList,
+        @Nonnull String annotationName,
+        @Nullable String annotationParameter
+    ) {
+        String arrayType = null;
+        final JSAttribute[] byName = attributeList.getAttributesByName(annotationName);
+        if (byName.length > 0) {
+            final JSAttributeNameValuePair jsAttributeNameValuePair = byName[0].getValueByName(annotationParameter);
+            arrayType = jsAttributeNameValuePair != null ? jsAttributeNameValuePair.getSimpleValue() : null;
+        }
+        return arrayType;
+    }
+
+    /**
+     * @see <code>QUALIFIED_NAME_HASHING_STRATEGY</code>
+     */
+    static boolean isTheSameClass(final PsiElement typeSource, final JSClass jsClass) {
+        if (typeSource == jsClass) {
+            return true;
+        }
+        if (typeSource instanceof JSClass && jsClass != null) {
+            final String qName = ((JSClass)typeSource).getQualifiedName();
+            return qName != null && qName.equals(jsClass.getQualifiedName());
+        }
+        return false;
+    }
+
+    public static final HashingStrategy<JSQualifiedNamedElement> QUALIFIED_NAME_HASHING_STRATEGY = new HashingStrategy<>() {
+        @Override
+        public int hashCode(final JSQualifiedNamedElement object) {
+            return object == null || object.getQualifiedName() == null ? 0 : object.getQualifiedName().hashCode();
+        }
+
+        @Override
+        public boolean equals(final JSQualifiedNamedElement o1, final JSQualifiedNamedElement o2) {
+            return Comparing.equal(o1.getQualifiedName(), o2.getQualifiedName());
+        }
+    };
+
+    static void doRenameParentDirectoryIfNeeded(VirtualFile file, String name, Object requestor) throws IOException {
+        VirtualFile directory = file.isDirectory() ? file : file.getParent();
+        if (!name.equals(directory.getName())) {
+            directory.rename(requestor, name);
+        }
+    }
+
+    @Nullable
+    static String getQNameForMove(@Nonnull PsiElement targetElement, PsiElement elementToBind) {
+        String qName = null;
+        Project project = targetElement.getProject();
+
+        if (elementToBind instanceof PsiFile file) {
+            String newName = file.getName();
+            int index = newName.lastIndexOf('.');
+            if (index != -1) {
+                newName = newName.substring(0, index);
+            }
+            VirtualFile elementToBindFile = file.getContainingFile().getVirtualFile();
+
+            String packageName = JSResolveUtil.getExpectedPackageNameFromFile(elementToBindFile, project, false);
+
+            if (targetElement instanceof JSReferenceExpression) {
+                JSExpression qualifier = ((JSReferenceExpression)targetElement).getQualifier();
+                String targetElementPackageName = qualifier != null
+                    ? qualifier.getText()
+                    : JSResolveUtil.getExpectedPackageNameFromFile(targetElement.getContainingFile().getVirtualFile(), project, false);
+                if (!differentPackageName(targetElementPackageName, packageName)) {
+                    return null;
+                }
+                if (qualifier == null) {
+                    if (!(targetElement.getParent() instanceof JavaScriptImportStatementBase)) {
+                        return null;
+                    }
+                }
+            }
+
+            qName = packageName.isEmpty() ? newName : packageName + "." + newName;
+        }
+        else if (elementToBind instanceof PsiDirectoryContainer directoryContainer) {
+            PsiDirectory[] directories = directoryContainer.getDirectories(targetElement.getResolveScope());
+            if (directories.length > 0) {
+                qName = JSResolveUtil.getExpectedPackageNameFromFile(directories[0].getVirtualFile(), project, false);
+            }
+        }
+        return qName;
+    }
+
+    public static boolean differentPackageName(final String s, final String expectedPackageNameFromFile) {
+        final boolean sIsEmpty = isEmpty(s);
+        final boolean expectedIsEmpty = isEmpty(expectedPackageNameFromFile);
+
+        return (sIsEmpty && !expectedIsEmpty) || (!sIsEmpty && (expectedIsEmpty || !s.equals(expectedPackageNameFromFile)));
+    }
+
+    public static boolean isEmpty(final String expectedPackageNameFromFile) {
+        return expectedPackageNameFromFile == null || expectedPackageNameFromFile.isEmpty();
+    }
 }

From a9e0b555f2cfccd3aff93d80b6b407019feaaaf3 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 27 Jul 2024 18:34:44 +0300
Subject: [PATCH 225/340] Code reformat using IJ4 code style (part 15).

---
 .../psi/impl/JSReferenceExpressionImpl.java   | 1328 +++++-----
 .../psi/impl/JSReferenceListImpl.java         |  201 +-
 .../javascript/psi/impl/JSReferenceSet.java   | 1059 ++++----
 .../psi/impl/JSReturnStatementImpl.java       |   28 +-
 .../JSSmartCompletionVariantsHandler.java     |  362 ++-
 .../javascript/psi/impl/JSStatementImpl.java  |   10 +-
 .../JSStatementWithLabelReferenceImpl.java    |  275 +-
 .../psi/impl/JSStubElementImpl.java           |  261 +-
 .../psi/impl/JSStubbedStatementImpl.java      |  110 +-
 .../psi/impl/JSSuperExpressionImpl.java       |  229 +-
 .../psi/impl/JSSwitchStatementImpl.java       |   39 +-
 .../psi/impl/JSThisExpressionImpl.java        |   19 +-
 .../psi/impl/JSThrowStatementImpl.java        |   28 +-
 .../psi/impl/JSTryStatementImpl.java          |  120 +-
 .../psi/impl/JSUseNamespaceDirectiveImpl.java |   68 +-
 .../psi/impl/JSVarStatementImpl.java          |  102 +-
 .../psi/impl/JSVariableBaseImpl.java          |  498 ++--
 .../javascript/psi/impl/JSVariableImpl.java   |   64 +-
 .../psi/impl/JSWhileStatementImpl.java        |   37 +-
 .../psi/impl/JSWithStatementImpl.java         |   37 +-
 .../psi/impl/JSXmlLiteralExpressionImpl.java  |  636 +++--
 .../psi/impl/JSYieldStatementImpl.java        |   28 +-
 .../javascript/psi/impl/ReferenceSupport.java |  332 ++-
 .../psi/resolve/BaseJSSymbolProcessor.java    | 2209 ++++++++---------
 .../psi/resolve/CompletionProcessor.java      |   14 +-
 25 files changed, 3709 insertions(+), 4385 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index c955de91..349492fc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -42,206 +42,174 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.Set;
 
-public class JSReferenceExpressionImpl extends JSExpressionImpl implements JSReferenceExpression, BindablePsiReference
-{
-	private static final TokenSet IDENTIFIER_TOKENS_SET = TokenSet.orSet(JSTokenTypes.IDENTIFIER_TOKENS_SET, TokenSet.create(JSTokenTypes.ANY_IDENTIFIER));
-
-	public JSReferenceExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		PsiElement resolvedElement = resolve();
-		if(resolvedElement instanceof JSVariable)
-		{
-			return ((JSVariable) resolvedElement).getType();
-		}
-		else if(resolvedElement instanceof JSFunction)
-		{
-			return ((JSFunction) resolvedElement).getReturnType();
-		}
-		return super.getType();
-	}
-
-	@Override
-	@Nullable
-	@RequiredReadAction
-	public JSExpression getQualifier()
-	{
-		PsiElement firstChild = getFirstChild();
-		return firstChild instanceof JSExpression ? (JSExpression) firstChild : null;
-	}
-
-	@Override
-	@Nullable
-	@RequiredReadAction
-	public String getReferencedName()
-	{
-		final PsiElement nameElement = getNameElement();
-		return nameElement != null ? nameElement.getText() : null;
-	}
-
-	@Override
-	@Nullable
-	@RequiredReadAction
-	public PsiElement getReferenceNameElement()
-	{
-		final PsiElement element = getNameElement();
-		return element != null ? element : null;
-	}
-
-	@RequiredReadAction
-	@Override
-	public PsiElement getElement()
-	{
-		return this;
-	}
-
-	@Override
-	public PsiReference getReference()
-	{
-		return this;
-	}
-
-	@Nonnull
-	@Override
-	@RequiredReadAction
-	public TextRange getRangeInElement()
-	{
-		PsiElement nameElement = getNameElement();
-
-		if(nameElement != null)
-		{
-			int offset = nameElement.getStartOffsetInParent();
-			return new TextRange(offset, offset + nameElement.getTextLength());
-		}
-		else
-		{
-			return new TextRange(0, getTextLength());
-		}
-	}
-
-	@Nullable
-	@RequiredReadAction
-	private PsiElement getNameElement()
-	{
-		return findChildByType(IDENTIFIER_TOKENS_SET);
-	}
-
-	@Override
-	public PsiElement resolve()
-	{
-		final ResolveResult[] resolveResults = multiResolve(true);
-
-		return resolveResults.length == 0 || resolveResults.length > 1 ? null : resolveResults[0].getElement();
-	}
-
-	@Nonnull
-	@Override
-	@RequiredReadAction
-	public String getCanonicalText()
-	{
-		return getText();
-	}
-
-	@Override
-	public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException
-	{
-		return this;
-	}
-
-	@RequiredReadAction
-	PsiElement handleElementRenameInternal(String newElementName) throws IncorrectOperationException
-	{
-		final int i = newElementName.lastIndexOf('.');
-		if(i != -1)
-		{
-			newElementName = newElementName.substring(0, i);
-		}
-		if(!NamesValidator.forLanguage(JavaScriptLanguage.INSTANCE).isIdentifier(newElementName, null))
-		{
-			throw new IncorrectOperationException("Invalid javascript element name:" + newElementName);
-		}
-		final PsiElement parent = getParent();
-		if(parent instanceof JSClass || parent instanceof JSFunction)
-		{
-			final PsiElement node = ((JSNamedElement) parent).getNameIdentifier();
-			if(node != null && node == this)
-			{
-				return this; // JSNamedElement.setName will care of things
-			}
-		}
-		JSChangeUtil.doIdentifierReplacement(this, getNameElement(), newElementName);
-		return getParent();
-	}
-
-	@Override
-	@RequiredReadAction
-	public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		final PsiElement parent = getParent();
-
-		if(parent instanceof JSClass ||
-				parent instanceof JSNamespaceDeclaration ||
-				parent instanceof JSFunction)
-		{
-			final PsiElement node = ((JSNamedElement) parent).getNameIdentifier();
-
-			if(node != null && node == this)
-			{
-				if(parent == element || element instanceof PsiFile)
-				{
-					return this; // JSNamedElement.setName will care of things
-				}
-			}
-		}
-
-		String qName = JSPsiImplUtils.getQNameForMove(this, element);
-
-		if(qName != null)
-		{
-			PsiElement newChild = JSChangeUtil.createExpressionFromText(getProject(), qName);
-			getParent().getNode().replaceChild(getNode(), newChild.getNode());
-			return newChild;
-		}
-
-		String newName = ((PsiNamedElement) element).getName();
-		if(element instanceof PsiFile)
-		{
-			int index = newName.lastIndexOf('.');
-			if(index != -1)
-			{
-				newName = newName.substring(0, index);
-			}
-		}
-
-		final ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), newName);
-		getNode().replaceChild(getNameElement().getNode(), nameElement);
-		return this;
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean isReferenceTo(PsiElement element)
-	{
-		ResolveHelper helper = ResolveHelper.find(this);
-		if(helper.isResolveTo(this, element))
-		{
-			return true;
-		}
-
-		PsiElement resolvedElement = resolve();
-		if(resolvedElement != null && resolvedElement.isEquivalentTo(element))
-		{
-			return true;
-		}
+public class JSReferenceExpressionImpl extends JSExpressionImpl implements JSReferenceExpression, BindablePsiReference {
+    private static final TokenSet IDENTIFIER_TOKENS_SET =
+        TokenSet.orSet(JSTokenTypes.IDENTIFIER_TOKENS_SET, TokenSet.create(JSTokenTypes.ANY_IDENTIFIER));
+
+    public JSReferenceExpressionImpl(final ASTNode node) {
+        super(node);
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        PsiElement resolvedElement = resolve();
+        if (resolvedElement instanceof JSVariable variable) {
+            return variable.getType();
+        }
+        else if (resolvedElement instanceof JSFunction function) {
+            return function.getReturnType();
+        }
+        return super.getType();
+    }
+
+    @Override
+    @Nullable
+    @RequiredReadAction
+    public JSExpression getQualifier() {
+        PsiElement firstChild = getFirstChild();
+        return firstChild instanceof JSExpression ? (JSExpression)firstChild : null;
+    }
+
+    @Override
+    @Nullable
+    @RequiredReadAction
+    public String getReferencedName() {
+        final PsiElement nameElement = getNameElement();
+        return nameElement != null ? nameElement.getText() : null;
+    }
+
+    @Override
+    @Nullable
+    @RequiredReadAction
+    public PsiElement getReferenceNameElement() {
+        final PsiElement element = getNameElement();
+        return element != null ? element : null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public PsiElement getElement() {
+        return this;
+    }
+
+    @Override
+    public PsiReference getReference() {
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    @RequiredReadAction
+    public TextRange getRangeInElement() {
+        PsiElement nameElement = getNameElement();
+
+        if (nameElement != null) {
+            int offset = nameElement.getStartOffsetInParent();
+            return new TextRange(offset, offset + nameElement.getTextLength());
+        }
+        else {
+            return new TextRange(0, getTextLength());
+        }
+    }
+
+    @Nullable
+    @RequiredReadAction
+    private PsiElement getNameElement() {
+        return findChildByType(IDENTIFIER_TOKENS_SET);
+    }
+
+    @Override
+    public PsiElement resolve() {
+        final ResolveResult[] resolveResults = multiResolve(true);
+
+        return resolveResults.length == 0 || resolveResults.length > 1 ? null : resolveResults[0].getElement();
+    }
+
+    @Nonnull
+    @Override
+    @RequiredReadAction
+    public String getCanonicalText() {
+        return getText();
+    }
+
+    @Override
+    public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
+        return this;
+    }
+
+    @RequiredReadAction
+    PsiElement handleElementRenameInternal(String newElementName) throws IncorrectOperationException {
+        final int i = newElementName.lastIndexOf('.');
+        if (i != -1) {
+            newElementName = newElementName.substring(0, i);
+        }
+        if (!NamesValidator.forLanguage(JavaScriptLanguage.INSTANCE).isIdentifier(newElementName, null)) {
+            throw new IncorrectOperationException("Invalid javascript element name:" + newElementName);
+        }
+        final PsiElement parent = getParent();
+        if (parent instanceof JSClass || parent instanceof JSFunction) {
+            final PsiElement node = ((JSNamedElement)parent).getNameIdentifier();
+            if (node != null && node == this) {
+                return this; // JSNamedElement.setName will care of things
+            }
+        }
+        JSChangeUtil.doIdentifierReplacement(this, getNameElement(), newElementName);
+        return getParent();
+    }
+
+    @Override
+    @RequiredReadAction
+    public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+        final PsiElement parent = getParent();
+
+        if (parent instanceof JSClass || parent instanceof JSNamespaceDeclaration || parent instanceof JSFunction) {
+            final PsiElement node = ((JSNamedElement)parent).getNameIdentifier();
+
+            if (node != null && node == this) {
+                if (parent == element || element instanceof PsiFile) {
+                    return this; // JSNamedElement.setName will care of things
+                }
+            }
+        }
+
+        String qName = JSPsiImplUtils.getQNameForMove(this, element);
+
+        if (qName != null) {
+            PsiElement newChild = JSChangeUtil.createExpressionFromText(getProject(), qName);
+            getParent().getNode().replaceChild(getNode(), newChild.getNode());
+            return newChild;
+        }
+
+        String newName = ((PsiNamedElement)element).getName();
+        if (element instanceof PsiFile) {
+            int index = newName.lastIndexOf('.');
+            if (index != -1) {
+                newName = newName.substring(0, index);
+            }
+        }
+
+        final ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), newName);
+        getNode().replaceChild(getNameElement().getNode(), nameElement);
+        return this;
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isReferenceTo(PsiElement element) {
+        ResolveHelper helper = ResolveHelper.find(this);
+        if (helper.isResolveTo(this, element)) {
+            return true;
+        }
+
+        PsiElement resolvedElement = resolve();
+        if (resolvedElement != null && resolvedElement.isEquivalentTo(element)) {
+            return true;
+        }
 
 //		if(element instanceof PsiNamedElement || element instanceof XmlAttributeValue)
 //		{
@@ -276,519 +244,453 @@ public boolean isReferenceTo(PsiElement element)
 //			}
 //			return JSResolveUtil.isReferenceTo(this, referencedName, element);
 //		}
-		return false;
-	}
-
-	private void doProcessLocalDeclarations(final JSExpression qualifier, final ResolveProcessor processor, Set<JavaScriptFeature> features, boolean completion)
-	{
-		final JSClass jsClass = findEnclosingClass(this);
-		processor.configureClassScope(jsClass);
-
-		final boolean inTypeContext = JSResolveUtil.isExprInTypeContext(this);
-		final boolean whereTypeCanBe = inTypeContext || (completion && features.contains(JavaScriptFeature.CLASS) && JSResolveUtil.isInPlaceWhereTypeCanBeDuringCompletion(this));
-		PsiElement elToProcess = this;
-		PsiElement scopeToStopAt = null;
-
-		final PsiElement parent = getParent();
-		boolean strictClassOffset = JSResolveUtil.getTopReferenceParent(parent) instanceof JSImportStatement;
-		boolean toProcessMembers = !strictClassOffset;
-
-		if(qualifier != null)
-		{
-			elToProcess = jsClass;
-
-			if(jsClass == null)
-			{
-				if(qualifier instanceof JSThisExpression)
-				{
-					if(features.contains(JavaScriptFeature.CLASS))
-					{
-						final JSFunction nearestFunction = PsiTreeUtil.getParentOfType(this, JSFunction.class);
-						elToProcess = nearestFunction != null ? nearestFunction : this;
-					}
-					else
-					{
-						elToProcess = PsiTreeUtil.getParentOfType(this, JSProperty.class);
-						if(elToProcess != null)
-						{
-							scopeToStopAt = elToProcess.getParent();
-						}
-					}
-				}
-				else if(qualifier instanceof JSSuperExpression)
-				{
-					elToProcess = JSResolveUtil.getClassFromTagNameInMxml(this);
-				}
-			}
-		}
-		else if(whereTypeCanBe)
-		{
-			if(inTypeContext)
-			{
-				if(!(parent instanceof JSNewExpression) &&
-						!(parent instanceof JSAttributeList) &&
-						!(parent instanceof JSBinaryExpression))
-				{
-					toProcessMembers = false;
-					// get function since it can have imports
-					final JSFunction nearestFunction = PsiTreeUtil.getParentOfType(this, JSFunction.class);
-					elToProcess = nearestFunction != null ? nearestFunction.getFirstChild() : jsClass;
-				}
-			}
-			else if(parent instanceof JSExpressionStatement && JSResolveUtil.isPlaceWhereNsCanBe(parent))
-			{
-				toProcessMembers = false;
-				elToProcess = null;
-			}
-		}
-
-		if((qualifier instanceof JSThisExpression || qualifier instanceof JSSuperExpression) && jsClass != null)
-		{
-			scopeToStopAt = jsClass;
-			if(features.contains(JavaScriptFeature.CLASS))
-			{
-				JSFunctionExpression expression = PsiTreeUtil.getParentOfType(this, JSFunctionExpression.class);
-				if(expression != null)
-				{
-					elToProcess = expression.getFirstChild();
-				}
-			}
-		}
-
-		if(elToProcess == null && whereTypeCanBe)
-		{
-			elToProcess = PsiTreeUtil.getParentOfType(this, JSPackageStatement.class, JSFile.class);
-			if(elToProcess != null)
-			{
-				elToProcess = PsiTreeUtil.getChildOfType(elToProcess, PsiWhiteSpace.class);  // this is hack, get rid of it
-				if(elToProcess == null)
-				{
-					elToProcess = this;
-				}
-			}
-		}
-
-		processor.setTypeContext(whereTypeCanBe || (qualifier == null && parent instanceof JSReferenceExpression) || strictClassOffset);
-		processor.setToProcessMembers(toProcessMembers);
-
-		if(elToProcess != null)
-		{
-			processor.setToProcessHierarchy(qualifier != null || !inTypeContext);
-			processor.setToSkipClassDeclarationsOnce(qualifier instanceof JSSuperExpression);
-			JSResolveUtil.treeWalkUp(processor, elToProcess, elToProcess, this, scopeToStopAt);
-
-			processor.setToProcessHierarchy(false);
-			processor.setToSkipClassDeclarationsOnce(false);
-		}
-	}
-
-	private static
-	@Nullable
-	JSClass findEnclosingClass(PsiElement elt)
-	{
-		JSClass jsClass = PsiTreeUtil.getParentOfType(elt, JSClass.class);
-		if(jsClass == null && elt != null)
-		{
-			final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(elt.getContainingFile());
-			if(element instanceof JSClass)
-			{
-				jsClass = (JSClass) element;
-			}
-		}
-		return jsClass;
-	}
-
-	@Nonnull
-	@Override
-	@RequiredReadAction
-	public Object[] getVariants()
-	{
-		final PsiFile containingFile = getContainingFile();
-		Set<JavaScriptFeature> features = JavaScriptVersionUtil.getFeatures(this);
-		final boolean classFeature = features.contains(JavaScriptFeature.CLASS);
-		Object[] smartVariants = JSSmartCompletionVariantsHandler.getSmartVariants(this, classFeature);
-		if(smartVariants != null)
-		{
-			return smartVariants;
-		}
-		final JSExpression qualifier = getResolveQualifier();
-
-		if(qualifier == null)
-		{
-			if(JSResolveUtil.isSelfReference(getParent(), this))
-			{ // Prevent Rulezz to appear
-				return ArrayUtil.EMPTY_OBJECT_ARRAY;
-			}
-
-			ResolveProcessor localProcessor = new ResolveProcessor(null, this);
-
-			doProcessLocalDeclarations(qualifier, localProcessor, features, true);
-			final VariantsProcessor processor = new VariantsProcessor(null, containingFile, false, this);
-
-			processor.addLocalResults(localProcessor.getResults());
-
-			JSResolveUtil.processGlobalSymbols(this, processor);
-
-			return processor.getResult();
-		}
-		else
-		{
-			final MyTypeProcessor processor = new MyTypeProcessor(null, features, this);
-			BaseJSSymbolProcessor.doEvalForExpr(BaseJSSymbolProcessor.getOriginalQualifier(qualifier), containingFile, processor);
-
-			if(processor.resolved == MyTypeProcessor.TypeResolveState.Resolved ||
-					processor.resolved == MyTypeProcessor.TypeResolveState.Undefined ||
-					(processor.resolved == MyTypeProcessor.TypeResolveState.PrefixUnknown && classFeature))
-			{
-				String qualifiedNameToSkip = null;
-				if(JSResolveUtil.isSelfReference(getParent(), this))
-				{
-					PsiElement originalParent = PsiUtilBase.getOriginalElement(getParent(), JSQualifiedNamedElement.class);
-					if(originalParent instanceof JSQualifiedNamedElement)
-					{
-						qualifiedNameToSkip = ((JSQualifiedNamedElement) originalParent).getQualifiedName();
-					}
-				}
-				return processor.getResultsAsObjects(qualifiedNameToSkip);
-			}
-
-			return processor.getResultsAsObjects();
-		}
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSReferenceExpression(this);
-	}
-
-	@Override
-	@Nonnull
-	public ResolveResult[] multiResolve(final boolean incompleteCode)
-	{
-		return ResolveCache.getInstance(getContainingFile().getProject()).resolveWithCaching(this, MyResolver.INSTANCE, true, incompleteCode);
-	}
-
-	private static class MyResolver implements ResolveCache.PolyVariantResolver<JSReferenceExpressionImpl>
-	{
-		private static final MyResolver INSTANCE = new MyResolver();
-
-		@Nonnull
-		@Override
-		@RequiredReadAction
-		public ResolveResult[] resolve(@Nonnull JSReferenceExpressionImpl referenceExpression, boolean incompleteCode)
-		{
-			return referenceExpression.doResolve();
-		}
-	}
-
-	@RequiredReadAction
-	private ResolveResult[] doResolve()
-	{
-		PsiFile containingFile = getContainingFile();
-		final String referencedName = getReferencedName();
-		if(referencedName == null)
-		{
-			return ResolveResult.EMPTY_ARRAY;
-		}
-
-		final PsiElement parent = getParent();
-		final JSExpression qualifier = getResolveQualifier();
-		Set<JavaScriptFeature> features = JavaScriptVersionUtil.getFeatures(this);
-		final boolean classFeature = features.contains(JavaScriptFeature.CLASS);
-
-		final boolean localResolve = qualifier == null;
-		final boolean parentIsDefinition = parent instanceof JSDefinitionExpression;
-
-		// Handle self references
-		PsiElement currentParent = JSResolveUtil.getTopReferenceParent(parent);
-		if(JSResolveUtil.isSelfReference(currentParent, this))
-		{
-			if(!(currentParent instanceof JSPackageStatement) || parent == currentParent)
-			{
-				return new ResolveResult[]{new JSResolveUtil.MyResolveResult(currentParent)};
-			}
-		}
-
-		JSExpression realQualifier = getQualifier();
-		if(isE4XAttributeReference(realQualifier))
-		{ // TODO: fix tree
-			return new ResolveResult[]{new JSResolveUtil.MyResolveResult(this)};
-		}
-
-		if("*".equals(referencedName) && currentParent instanceof JSImportStatement && qualifier instanceof JSReferenceExpression)
-		{ // TODO: move to some processor
-			return ((JSReferenceExpression) qualifier).multiResolve(false);
-		}
-
-		ResolveProcessor localProcessor;
-
-		if(qualifier == null)
-		{
-			localProcessor = new ResolveProcessor(referencedName, this);
-
-			final boolean canResolveAllLocally = !parentIsDefinition || !classFeature;
-			doProcessLocalDeclarations(realQualifier, localProcessor, features, false);
-
-			if(canResolveAllLocally)
-			{
-				final PsiElement jsElement = localProcessor.getResult();
-
-				if(jsElement != null || (qualifier != null && classFeature && localProcessor.foundAllValidResults()))
-				{
-					return localProcessor.getResultsAsResolveResults();
-				}
-			}
-			return doOldResolve(containingFile, referencedName, parent, qualifier, classFeature, localResolve, parentIsDefinition, localProcessor);
-		}
-		else
-		{
-			final MyTypeProcessor processor = new MyTypeProcessor(referencedName, features, this);
-			BaseJSSymbolProcessor.doEvalForExpr(qualifier, containingFile, processor);
-
-			if(processor.resolved == MyTypeProcessor.TypeResolveState.PrefixUnknown && classFeature)
-			{
-				return new ResolveResult[]{new JSResolveUtil.MyResolveResult(this)};
-			}
-
-			if(processor.resolved == MyTypeProcessor.TypeResolveState.Resolved ||
-					processor.resolved == MyTypeProcessor.TypeResolveState.Undefined ||
-					processor.getResult() != null)
-			{
-				return processor.getResultsAsResolveResults();
-			}
-			else
-			{
-				return processor.getResultsAsResolveResults();
-			}
-		}
-	}
-
-	private boolean isE4XAttributeReference(JSExpression realQualifier)
-	{
-		return getNode().findChildByType(JSTokenTypes.AT) != null || (realQualifier != null && realQualifier.getNode().findChildByType(JSTokenTypes.AT) != null);
-	}
-
-	@Nullable
-	public JSExpression getResolveQualifier()
-	{
-		final JSExpression qualifier = getQualifier();
-
-		if(qualifier instanceof JSReferenceExpression)
-		{
-			final ASTNode astNode = getNode();
-			ASTNode selection = astNode.getTreeNext();
-			// TODO:this is not accurate
-			if(selection != null && selection.getElementType() == JSTokenTypes.COLON_COLON)
-			{
-				return null;
-			}
-
-			final ASTNode nsSelection = astNode.findChildByType(JSTokenTypes.COLON_COLON);
-			if(nsSelection != null)
-			{
-				return ((JSReferenceExpressionImpl) qualifier).getResolveQualifier();
-			}
-		}
-		else if(qualifier == null)
-		{
-			final ASTNode node = getNode().getFirstChildNode();
-
-			if(node.getElementType() == JSTokenTypes.AT)
-			{
-				PsiElement parent = getParent();
-				if(parent instanceof JSBinaryExpression)
-				{
-					PsiElement element = parent.getParent().getParent();
-					if(element instanceof JSCallExpression)
-					{
-						parent = ((JSCallExpression) element).getMethodExpression();
-					}
-				}
-				if(parent instanceof JSExpression)
-				{
-					return (JSExpression) parent;
-				}
-				return null;
-			}
-		}
-		return qualifier;
-	}
-
-	private ResolveResult[] doOldResolve(final PsiFile containingFile,
-			final String referencedName,
-			final PsiElement parent,
-			final JSExpression qualifier,
-			final boolean ecma,
-			final boolean localResolve,
-			final boolean parentIsDefinition,
-			ResolveProcessor localProcessor)
-	{
-		if(parentIsDefinition && ((ecma && !localResolve) || (!ecma && qualifier != null)))
-		{
-			return new ResolveResult[]{new JSResolveUtil.MyResolveResult(parent)};
-		}
-
-		if(localResolve && parentIsDefinition && ecma)
-		{
-			if(!localProcessor.processingEncounteredAbsenceOfTypes())
-			{
-				return localProcessor.getResultsAsResolveResults();
-			}
-
-			// Fallback for finding some assignment in global scope
-		}
-
-		final WalkUpResolveProcessor processor = new WalkUpResolveProcessor(referencedName, null, containingFile, false, this);
-
-		if(localProcessor != null)
-		{
-			processor.addLocalResults(localProcessor.getResultsAsResolveResults());
-		}
-
-		JSResolveUtil.processGlobalSymbols(this, processor);
-		return processor.getResults();
-	}
-
-	@Override
-	public boolean shouldCheckReferences()
-	{
-		return true;
-	}
-
-	private static class MyTypeProcessor extends ResolveProcessor implements BaseJSSymbolProcessor.TypeProcessor
-	{
-		private final Set<JavaScriptFeature> myFeatures;
-
-		public MyTypeProcessor(String referenceName, final Set<JavaScriptFeature> features, PsiElement _place)
-		{
-			super(referenceName, _place);
-			myFeatures = features;
-			setToProcessHierarchy(true);
-
-			configureClassScope(findEnclosingClass(_place));
-		}
-
-		enum TypeResolveState
-		{
-			Unknown, Resolved, Undefined, PrefixUnknown
-		}
-
-		TypeResolveState resolved = TypeResolveState.Unknown;
-
-		@Override
-		public Set<JavaScriptFeature> getFeatures()
-		{
-			return myFeatures;
-		}
-
-		@Override
-		public void process(String type, @Nonnull final BaseJSSymbolProcessor.EvaluateContext evaluateContext, PsiElement source)
-		{
-			if(evaluateContext.visitedTypes.contains(type))
-			{
-				return;
-			}
-			evaluateContext.visitedTypes.add(type);
-
-			if("*".equals(type) || "Object".equals(type))
-			{
-				return;
-			}
-
-			if(JSTypeEvaluateManager.isArrayType(type))
-			{
-				int index = type.indexOf('[');
-				if(index != -1)
-				{
-					type = type.substring(0, index);
-				}
-			}
-
-			PsiElement typeSource = evaluateContext.getSource();
-
-			setProcessStatics(false);
-
-			final PsiElement placeParent = place.getParent();
-			boolean setTypeContext = placeParent instanceof JSReferenceList;
-			final PsiElement clazz = source != null && (source instanceof JSClass || source instanceof XmlFile) ? source : JSClassImpl.findClassFromNamespace(type, place);
-
-			if(clazz instanceof JSClass)
-			{
-				final JSClass jsClass = (JSClass) clazz;
-
-				final boolean statics = ecma() && JSPsiImplUtils.isTheSameClass(typeSource, jsClass) && !(((JSReferenceExpression) place).getQualifier() instanceof JSCallExpression);
-				setProcessStatics(statics);
-				if(statics)
-				{
-					setTypeName(jsClass.getQualifiedName());
-				}
-
-				final boolean saveSetTypeContext = isTypeContext();
-				final boolean saveToProcessMembers = isToProcessMembers();
-
-				if(setTypeContext)
-				{
-					setTypeContext(setTypeContext);
-					setToProcessMembers(false);
-				}
-
-				try
-				{
-					final boolean b = clazz.processDeclarations(this, ResolveState.initial(), clazz, place);
-					if(!b)
-					{
-						resolved = TypeResolveState.Resolved;
-					}
-					else if(ecma())
-					{
-						final JSAttributeList attrList = jsClass.getAttributeList();
-						if(attrList == null || !attrList.hasModifier(JSAttributeList.ModifierType.DYNAMIC))
-						{
-							resolved = TypeResolveState.Resolved;
-						}
-					}
-				}
-				finally
-				{
-					if(setTypeContext)
-					{
-						setTypeContext(saveSetTypeContext);
-						setToProcessMembers(saveToProcessMembers);
-					}
-				}
-			}
-			else if(ecma())
-			{
-				resolved = TypeResolveState.Undefined;
-			}
-		}
-
-		@Override
-		public boolean execute(PsiElement element, ResolveState state)
-		{
-			boolean b = super.execute(element, state);
-			if(ecma() && getResult() != null)
-			{
-				resolved = MyTypeProcessor.TypeResolveState.Resolved;
-			}
-			return b;
-		}
-
-		@Override
-		public boolean ecma()
-		{
-			return myFeatures.contains(JavaScriptFeature.CLASS);
-		}
-
-		@Override
-		public void setUnknownElement(@Nonnull final PsiElement element)
-		{
-			if(!(element instanceof XmlToken))
-			{
-				boolean currentIsNotResolved = element == BaseJSSymbolProcessor.getOriginalQualifier(((JSReferenceExpression) place).getQualifier());
-				resolved = currentIsNotResolved ? TypeResolveState.PrefixUnknown : TypeResolveState.Unknown;
-			}
-		}
-	}
+        return false;
+    }
+
+    private void doProcessLocalDeclarations(
+        final JSExpression qualifier,
+        final ResolveProcessor processor,
+        Set<JavaScriptFeature> features,
+        boolean completion
+    ) {
+        final JSClass jsClass = findEnclosingClass(this);
+        processor.configureClassScope(jsClass);
+
+        final boolean inTypeContext = JSResolveUtil.isExprInTypeContext(this);
+        final boolean whereTypeCanBe = inTypeContext
+            || (completion && features.contains(JavaScriptFeature.CLASS) && JSResolveUtil.isInPlaceWhereTypeCanBeDuringCompletion(this));
+        PsiElement elToProcess = this;
+        PsiElement scopeToStopAt = null;
+
+        final PsiElement parent = getParent();
+        boolean strictClassOffset = JSResolveUtil.getTopReferenceParent(parent) instanceof JSImportStatement;
+        boolean toProcessMembers = !strictClassOffset;
+
+        if (qualifier != null) {
+            elToProcess = jsClass;
+
+            if (jsClass == null) {
+                if (qualifier instanceof JSThisExpression) {
+                    if (features.contains(JavaScriptFeature.CLASS)) {
+                        final JSFunction nearestFunction = PsiTreeUtil.getParentOfType(this, JSFunction.class);
+                        elToProcess = nearestFunction != null ? nearestFunction : this;
+                    }
+                    else {
+                        elToProcess = PsiTreeUtil.getParentOfType(this, JSProperty.class);
+                        if (elToProcess != null) {
+                            scopeToStopAt = elToProcess.getParent();
+                        }
+                    }
+                }
+                else if (qualifier instanceof JSSuperExpression) {
+                    elToProcess = JSResolveUtil.getClassFromTagNameInMxml(this);
+                }
+            }
+        }
+        else if (whereTypeCanBe) {
+            if (inTypeContext) {
+                if (!(parent instanceof JSNewExpression || parent instanceof JSAttributeList || parent instanceof JSBinaryExpression)) {
+                    toProcessMembers = false;
+                    // get function since it can have imports
+                    final JSFunction nearestFunction = PsiTreeUtil.getParentOfType(this, JSFunction.class);
+                    elToProcess = nearestFunction != null ? nearestFunction.getFirstChild() : jsClass;
+                }
+            }
+            else if (parent instanceof JSExpressionStatement && JSResolveUtil.isPlaceWhereNsCanBe(parent)) {
+                toProcessMembers = false;
+                elToProcess = null;
+            }
+        }
+
+        if ((qualifier instanceof JSThisExpression || qualifier instanceof JSSuperExpression) && jsClass != null) {
+            scopeToStopAt = jsClass;
+            if (features.contains(JavaScriptFeature.CLASS)) {
+                JSFunctionExpression expression = PsiTreeUtil.getParentOfType(this, JSFunctionExpression.class);
+                if (expression != null) {
+                    elToProcess = expression.getFirstChild();
+                }
+            }
+        }
+
+        if (elToProcess == null && whereTypeCanBe) {
+            elToProcess = PsiTreeUtil.getParentOfType(this, JSPackageStatement.class, JSFile.class);
+            if (elToProcess != null) {
+                elToProcess = PsiTreeUtil.getChildOfType(elToProcess, PsiWhiteSpace.class);  // this is hack, get rid of it
+                if (elToProcess == null) {
+                    elToProcess = this;
+                }
+            }
+        }
+
+        processor.setTypeContext(whereTypeCanBe || (qualifier == null && parent instanceof JSReferenceExpression) || strictClassOffset);
+        processor.setToProcessMembers(toProcessMembers);
+
+        if (elToProcess != null) {
+            processor.setToProcessHierarchy(qualifier != null || !inTypeContext);
+            processor.setToSkipClassDeclarationsOnce(qualifier instanceof JSSuperExpression);
+            JSResolveUtil.treeWalkUp(processor, elToProcess, elToProcess, this, scopeToStopAt);
+
+            processor.setToProcessHierarchy(false);
+            processor.setToSkipClassDeclarationsOnce(false);
+        }
+    }
+
+    private static
+    @Nullable
+    JSClass findEnclosingClass(PsiElement elt) {
+        JSClass jsClass = PsiTreeUtil.getParentOfType(elt, JSClass.class);
+        if (jsClass == null && elt != null) {
+            final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(elt.getContainingFile());
+            if (element instanceof JSClass) {
+                jsClass = (JSClass)element;
+            }
+        }
+        return jsClass;
+    }
+
+    @Nonnull
+    @Override
+    @RequiredReadAction
+    public Object[] getVariants() {
+        final PsiFile containingFile = getContainingFile();
+        Set<JavaScriptFeature> features = JavaScriptVersionUtil.getFeatures(this);
+        final boolean classFeature = features.contains(JavaScriptFeature.CLASS);
+        Object[] smartVariants = JSSmartCompletionVariantsHandler.getSmartVariants(this, classFeature);
+        if (smartVariants != null) {
+            return smartVariants;
+        }
+        final JSExpression qualifier = getResolveQualifier();
+
+        if (qualifier == null) {
+            if (JSResolveUtil.isSelfReference(getParent(), this)) { // Prevent Rulezz to appear
+                return ArrayUtil.EMPTY_OBJECT_ARRAY;
+            }
+
+            ResolveProcessor localProcessor = new ResolveProcessor(null, this);
+
+            doProcessLocalDeclarations(qualifier, localProcessor, features, true);
+            final VariantsProcessor processor = new VariantsProcessor(null, containingFile, false, this);
+
+            processor.addLocalResults(localProcessor.getResults());
+
+            JSResolveUtil.processGlobalSymbols(this, processor);
+
+            return processor.getResult();
+        }
+        else {
+            final MyTypeProcessor processor = new MyTypeProcessor(null, features, this);
+            BaseJSSymbolProcessor.doEvalForExpr(BaseJSSymbolProcessor.getOriginalQualifier(qualifier), containingFile, processor);
+
+            if (processor.resolved == MyTypeProcessor.TypeResolveState.Resolved ||
+                processor.resolved == MyTypeProcessor.TypeResolveState.Undefined ||
+                (processor.resolved == MyTypeProcessor.TypeResolveState.PrefixUnknown && classFeature)) {
+                String qualifiedNameToSkip = null;
+                if (JSResolveUtil.isSelfReference(getParent(), this)) {
+                    PsiElement originalParent = PsiUtilBase.getOriginalElement(getParent(), JSQualifiedNamedElement.class);
+                    if (originalParent instanceof JSQualifiedNamedElement) {
+                        qualifiedNameToSkip = ((JSQualifiedNamedElement)originalParent).getQualifiedName();
+                    }
+                }
+                return processor.getResultsAsObjects(qualifiedNameToSkip);
+            }
+
+            return processor.getResultsAsObjects();
+        }
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSReferenceExpression(this);
+    }
+
+    @Override
+    @Nonnull
+    public ResolveResult[] multiResolve(final boolean incompleteCode) {
+        return ResolveCache.getInstance(getContainingFile().getProject())
+            .resolveWithCaching(this, MyResolver.INSTANCE, true, incompleteCode);
+    }
+
+    private static class MyResolver implements ResolveCache.PolyVariantResolver<JSReferenceExpressionImpl> {
+        private static final MyResolver INSTANCE = new MyResolver();
+
+        @Nonnull
+        @Override
+        @RequiredReadAction
+        public ResolveResult[] resolve(@Nonnull JSReferenceExpressionImpl referenceExpression, boolean incompleteCode) {
+            return referenceExpression.doResolve();
+        }
+    }
+
+    @RequiredReadAction
+    private ResolveResult[] doResolve() {
+        PsiFile containingFile = getContainingFile();
+        final String referencedName = getReferencedName();
+        if (referencedName == null) {
+            return ResolveResult.EMPTY_ARRAY;
+        }
+
+        final PsiElement parent = getParent();
+        final JSExpression qualifier = getResolveQualifier();
+        Set<JavaScriptFeature> features = JavaScriptVersionUtil.getFeatures(this);
+        final boolean classFeature = features.contains(JavaScriptFeature.CLASS);
+
+        final boolean localResolve = qualifier == null;
+        final boolean parentIsDefinition = parent instanceof JSDefinitionExpression;
+
+        // Handle self references
+        PsiElement currentParent = JSResolveUtil.getTopReferenceParent(parent);
+        if (JSResolveUtil.isSelfReference(currentParent, this)) {
+            if (!(currentParent instanceof JSPackageStatement) || parent == currentParent) {
+                return new ResolveResult[]{new JSResolveUtil.MyResolveResult(currentParent)};
+            }
+        }
+
+        JSExpression realQualifier = getQualifier();
+        if (isE4XAttributeReference(realQualifier)) { // TODO: fix tree
+            return new ResolveResult[]{new JSResolveUtil.MyResolveResult(this)};
+        }
+
+        if ("*".equals(referencedName) && currentParent instanceof JSImportStatement
+            && qualifier instanceof JSReferenceExpression refExpr) { // TODO: move to some processor
+            return refExpr.multiResolve(false);
+        }
+
+        ResolveProcessor localProcessor;
+
+        if (qualifier == null) {
+            localProcessor = new ResolveProcessor(referencedName, this);
+
+            final boolean canResolveAllLocally = !parentIsDefinition || !classFeature;
+            doProcessLocalDeclarations(realQualifier, localProcessor, features, false);
+
+            if (canResolveAllLocally) {
+                final PsiElement jsElement = localProcessor.getResult();
+
+                if (jsElement != null || (qualifier != null && classFeature && localProcessor.foundAllValidResults())) {
+                    return localProcessor.getResultsAsResolveResults();
+                }
+            }
+            return doOldResolve(
+                containingFile,
+                referencedName,
+                parent,
+                qualifier,
+                classFeature,
+                localResolve,
+                parentIsDefinition,
+                localProcessor
+            );
+        }
+        else {
+            final MyTypeProcessor processor = new MyTypeProcessor(referencedName, features, this);
+            BaseJSSymbolProcessor.doEvalForExpr(qualifier, containingFile, processor);
+
+            if (processor.resolved == MyTypeProcessor.TypeResolveState.PrefixUnknown && classFeature) {
+                return new ResolveResult[]{new JSResolveUtil.MyResolveResult(this)};
+            }
+
+            if (processor.resolved == MyTypeProcessor.TypeResolveState.Resolved ||
+                processor.resolved == MyTypeProcessor.TypeResolveState.Undefined ||
+                processor.getResult() != null) {
+                return processor.getResultsAsResolveResults();
+            }
+            else {
+                return processor.getResultsAsResolveResults();
+            }
+        }
+    }
+
+    private boolean isE4XAttributeReference(JSExpression realQualifier) {
+        return getNode().findChildByType(JSTokenTypes.AT) != null
+            || (realQualifier != null && realQualifier.getNode().findChildByType(JSTokenTypes.AT) != null);
+    }
+
+    @Nullable
+    public JSExpression getResolveQualifier() {
+        final JSExpression qualifier = getQualifier();
+
+        if (qualifier instanceof JSReferenceExpression) {
+            final ASTNode astNode = getNode();
+            ASTNode selection = astNode.getTreeNext();
+            // TODO:this is not accurate
+            if (selection != null && selection.getElementType() == JSTokenTypes.COLON_COLON) {
+                return null;
+            }
+
+            final ASTNode nsSelection = astNode.findChildByType(JSTokenTypes.COLON_COLON);
+            if (nsSelection != null) {
+                return ((JSReferenceExpressionImpl)qualifier).getResolveQualifier();
+            }
+        }
+        else if (qualifier == null) {
+            final ASTNode node = getNode().getFirstChildNode();
+
+            if (node.getElementType() == JSTokenTypes.AT) {
+                PsiElement parent = getParent();
+                if (parent instanceof JSBinaryExpression && parent.getParent().getParent() instanceof JSCallExpression call) {
+                    parent = call.getMethodExpression();
+                }
+                if (parent instanceof JSExpression expression) {
+                    return expression;
+                }
+                return null;
+            }
+        }
+        return qualifier;
+    }
+
+    private ResolveResult[] doOldResolve(
+        final PsiFile containingFile,
+        final String referencedName,
+        final PsiElement parent,
+        final JSExpression qualifier,
+        final boolean ecma,
+        final boolean localResolve,
+        final boolean parentIsDefinition,
+        ResolveProcessor localProcessor
+    ) {
+        if (parentIsDefinition && ((ecma && !localResolve) || (!ecma && qualifier != null))) {
+            return new ResolveResult[]{new JSResolveUtil.MyResolveResult(parent)};
+        }
+
+        if (localResolve && parentIsDefinition && ecma) {
+            if (!localProcessor.processingEncounteredAbsenceOfTypes()) {
+                return localProcessor.getResultsAsResolveResults();
+            }
+
+            // Fallback for finding some assignment in global scope
+        }
+
+        final WalkUpResolveProcessor processor =
+            new WalkUpResolveProcessor(referencedName, null, containingFile, false, this);
+
+        if (localProcessor != null) {
+            processor.addLocalResults(localProcessor.getResultsAsResolveResults());
+        }
+
+        JSResolveUtil.processGlobalSymbols(this, processor);
+        return processor.getResults();
+    }
+
+    @Override
+    public boolean shouldCheckReferences() {
+        return true;
+    }
+
+    private static class MyTypeProcessor extends ResolveProcessor implements BaseJSSymbolProcessor.TypeProcessor {
+        private final Set<JavaScriptFeature> myFeatures;
+
+        public MyTypeProcessor(String referenceName, final Set<JavaScriptFeature> features, PsiElement _place) {
+            super(referenceName, _place);
+            myFeatures = features;
+            setToProcessHierarchy(true);
+
+            configureClassScope(findEnclosingClass(_place));
+        }
+
+        enum TypeResolveState {
+            Unknown,
+            Resolved,
+            Undefined,
+            PrefixUnknown
+        }
+
+        TypeResolveState resolved = TypeResolveState.Unknown;
+
+        @Override
+        public Set<JavaScriptFeature> getFeatures() {
+            return myFeatures;
+        }
+
+        @Override
+        public void process(String type, @Nonnull final BaseJSSymbolProcessor.EvaluateContext evaluateContext, PsiElement source) {
+            if (evaluateContext.visitedTypes.contains(type)) {
+                return;
+            }
+            evaluateContext.visitedTypes.add(type);
+
+            if ("*".equals(type) || "Object".equals(type)) {
+                return;
+            }
+
+            if (JSTypeEvaluateManager.isArrayType(type)) {
+                int index = type.indexOf('[');
+                if (index != -1) {
+                    type = type.substring(0, index);
+                }
+            }
+
+            PsiElement typeSource = evaluateContext.getSource();
+
+            setProcessStatics(false);
+
+            final PsiElement placeParent = place.getParent();
+            boolean setTypeContext = placeParent instanceof JSReferenceList;
+            final PsiElement clazz = source != null && (source instanceof JSClass || source instanceof XmlFile)
+                ? source
+                : JSClassImpl.findClassFromNamespace(type, place);
+
+            if (clazz instanceof JSClass jsClass) {
+                final boolean statics = ecma() && JSPsiImplUtils.isTheSameClass(typeSource, jsClass)
+                    && !(((JSReferenceExpression)place).getQualifier() instanceof JSCallExpression);
+                setProcessStatics(statics);
+                if (statics) {
+                    setTypeName(jsClass.getQualifiedName());
+                }
+
+                final boolean saveSetTypeContext = isTypeContext();
+                final boolean saveToProcessMembers = isToProcessMembers();
+
+                if (setTypeContext) {
+                    setTypeContext(setTypeContext);
+                    setToProcessMembers(false);
+                }
+
+                try {
+                    final boolean b = clazz.processDeclarations(this, ResolveState.initial(), clazz, place);
+                    if (!b) {
+                        resolved = TypeResolveState.Resolved;
+                    }
+                    else if (ecma()) {
+                        final JSAttributeList attrList = jsClass.getAttributeList();
+                        if (attrList == null || !attrList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
+                            resolved = TypeResolveState.Resolved;
+                        }
+                    }
+                }
+                finally {
+                    if (setTypeContext) {
+                        setTypeContext(saveSetTypeContext);
+                        setToProcessMembers(saveToProcessMembers);
+                    }
+                }
+            }
+            else if (ecma()) {
+                resolved = TypeResolveState.Undefined;
+            }
+        }
+
+        @Override
+        public boolean execute(PsiElement element, ResolveState state) {
+            boolean b = super.execute(element, state);
+            if (ecma() && getResult() != null) {
+                resolved = MyTypeProcessor.TypeResolveState.Resolved;
+            }
+            return b;
+        }
+
+        @Override
+        public boolean ecma() {
+            return myFeatures.contains(JavaScriptFeature.CLASS);
+        }
+
+        @Override
+        public void setUnknownElement(@Nonnull final PsiElement element) {
+            if (!(element instanceof XmlToken)) {
+                boolean currentIsNotResolved =
+                    element == BaseJSSymbolProcessor.getOriginalQualifier(((JSReferenceExpression)place).getQualifier());
+                resolved = currentIsNotResolved ? TypeResolveState.PrefixUnknown : TypeResolveState.Unknown;
+            }
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index f643ca22..50fafeb3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -30,117 +30,104 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.ArrayList;
 import java.util.Collection;
 
 /**
  * @author Maxim.Mossienko
  */
-public class JSReferenceListImpl extends JSStubElementImpl<JSReferenceListStub> implements JSReferenceList
-{
-	public JSReferenceListImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSReferenceListImpl(final JSReferenceListStub stub, IStubElementType stubElementType)
-	{
-		super(stub, stubElementType);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSReferenceList(this);
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JSReferenceExpression[] getExpressions()
-	{
-		return findChildrenByClass(JSReferenceExpression.class);
-	}
-
-	@Nonnull
-	@Override
-	@RequiredReadAction
-	public String[] getReferenceTexts()
-	{
-		final JSReferenceListStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getReferenceTexts();
-		}
-
-		final JSReferenceExpression[] referenceExpressions = getExpressions();
-		if(referenceExpressions.length == 0)
-		{
-			return ArrayUtil.EMPTY_STRING_ARRAY;
-		}
-		int count = referenceExpressions.length;
-		final String[] result = ArrayUtil.newStringArray(count);
-
-		for(int i = 0; i < count; ++i)
-		{
-			result[i] = referenceExpressions[i].getText();
-		}
-		return result;
-	}
-
-	@Nonnull
-	@RequiredReadAction
-	@Override
-	public JSClass[] getReferencedClasses()
-	{
-		@NonNls String[] texts = getReferenceTexts();
-
-		if(texts.length == 0)
-		{
-			return JSClass.EMPTY_ARRAY;
-		}
-
-		final Project project = getProject();
-		final ArrayList<JSClass> supers = new ArrayList<JSClass>(1);
-
-		for(String text : texts)
-		{
-			final int index = supers.size();
-
-			text = JSImportHandlingUtil.resolveTypeName(text, this);
-
-			final Collection<JSQualifiedNamedElement> candidates = StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_QNAME, text, project, getResolveScope(), JSQualifiedNamedElement.class);
-			for(JSQualifiedNamedElement _clazz : candidates)
-			{
-				if(!(_clazz instanceof JSClass))
-				{
-					continue;
-				}
-				final JSClass clazz = (JSClass) _clazz;
-
-				if(text.equals(clazz.getQualifiedName()))
-				{
-					if(clazz.canNavigate())
-					{
-						supers.add(index, clazz);
-					}
-					else
-					{
-						supers.add(clazz);
-					}
-				}
-			}
-
-			if(candidates.size() == 0)
-			{
-				final PsiElement element = JSClassImpl.findClassFromNamespace(text, this);
-				if(element instanceof JSClass)
-				{
-					supers.add((JSClass) element);
-				}
-			}
-		}
-
-		return supers.toArray(new JSClass[supers.size()]);
-	}
+public class JSReferenceListImpl extends JSStubElementImpl<JSReferenceListStub> implements JSReferenceList {
+    public JSReferenceListImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSReferenceListImpl(final JSReferenceListStub stub, IStubElementType stubElementType) {
+        super(stub, stubElementType);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSReferenceList(this);
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JSReferenceExpression[] getExpressions() {
+        return findChildrenByClass(JSReferenceExpression.class);
+    }
+
+    @Nonnull
+    @Override
+    @RequiredReadAction
+    public String[] getReferenceTexts() {
+        final JSReferenceListStub stub = getStub();
+        if (stub != null) {
+            return stub.getReferenceTexts();
+        }
+
+        final JSReferenceExpression[] referenceExpressions = getExpressions();
+        if (referenceExpressions.length == 0) {
+            return ArrayUtil.EMPTY_STRING_ARRAY;
+        }
+        int count = referenceExpressions.length;
+        final String[] result = ArrayUtil.newStringArray(count);
+
+        for (int i = 0; i < count; ++i) {
+            result[i] = referenceExpressions[i].getText();
+        }
+        return result;
+    }
+
+    @Nonnull
+    @RequiredReadAction
+    @Override
+    public JSClass[] getReferencedClasses() {
+        @NonNls String[] texts = getReferenceTexts();
+
+        if (texts.length == 0) {
+            return JSClass.EMPTY_ARRAY;
+        }
+
+        final Project project = getProject();
+        final ArrayList<JSClass> supers = new ArrayList<>(1);
+
+        for (String text : texts) {
+            final int index = supers.size();
+
+            text = JSImportHandlingUtil.resolveTypeName(text, this);
+
+            final Collection<JSQualifiedNamedElement> candidates = StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_QNAME,
+                text,
+                project,
+                getResolveScope(),
+                JSQualifiedNamedElement.class
+            );
+            for (JSQualifiedNamedElement _clazz : candidates) {
+                if (!(_clazz instanceof JSClass)) {
+                    continue;
+                }
+                final JSClass clazz = (JSClass)_clazz;
+
+                if (text.equals(clazz.getQualifiedName())) {
+                    if (clazz.canNavigate()) {
+                        supers.add(index, clazz);
+                    }
+                    else {
+                        supers.add(clazz);
+                    }
+                }
+            }
+
+            if (candidates.size() == 0) {
+                final PsiElement element = JSClassImpl.findClassFromNamespace(text, this);
+                if (element instanceof JSClass jsClass) {
+                    supers.add(jsClass);
+                }
+            }
+        }
+
+        return supers.toArray(new JSClass[supers.size()]);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index 369e486f..41e40846 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -37,579 +37,500 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * @author Maxim.Mossienko
  */
-public class JSReferenceSet
-{
-	private static final String GLOBAL_PREFIX = "global#";
-
-	private String myReferenceText;
-	private PsiReference[] myReferences;
-	private final PsiElement element;
-	private final boolean isSoft;
-	private final boolean onlyPackages;
-	private final boolean onlyFqns;
-	private boolean myOnlyDefaultPackage;
-
-	public JSReferenceSet(final PsiElement element, String text, int offset, boolean soft)
-	{
-		this(element, text, offset, soft, false, false);
-	}
-
-	public JSReferenceSet(final PsiElement element, String text, int offset, boolean soft, boolean _onlyPackages, boolean _onlyFqns)
-	{
-		this.element = element;
-		isSoft = soft;
-		myReferenceText = text;
-		myReferences = reparse(text, offset);
-		onlyPackages = _onlyPackages;
-		onlyFqns = _onlyFqns;
-	}
-
-	public JSReferenceSet(final PsiElement element, boolean soft)
-	{
-		this.element = element;
-		isSoft = soft;
-		onlyPackages = false;
-		onlyFqns = false;
-	}
-
-	public JSReferenceSet(final PsiElement element)
-	{
-		this(element, true);
-	}
-
-	public PsiReference[] getReferences()
-	{
-		return myReferences;
-	}
-
-	public void update(String text, int offset)
-	{
-		if(myReferences != null &&
-				myReferenceText != null &&
-				myReferenceText.equals(text))
-		{
-			return;
-		}
-
-		if(!StringUtil.startsWithChar(text, '"') && !StringUtil.startsWithChar(text, '\''))
-		{
-			myReferenceText = text;
-			myReferences = PsiReference.EMPTY_ARRAY;
-		}
-		else
-		{
-			final PsiReference[] list = reparse(StringUtil.stripQuotesAroundValue(text), offset + 1);
-			myReferenceText = text;
-			myReferences = list;
-		}
-	}
-
-	private PsiReference[] reparse(String value, int offset)
-	{
-		if(value.startsWith(GLOBAL_PREFIX))
-		{
-			value = value.substring(GLOBAL_PREFIX.length());
-			offset += GLOBAL_PREFIX.length();
-			myOnlyDefaultPackage = true;
-		}
-		List<PsiReference> refs = new ArrayList<PsiReference>(1);
-		int lastPos = 0;
-		int dotPos = findSeparatorPosition(value, lastPos);
-
-		while(dotPos != -1)
-		{
-			final String s = value.substring(lastPos, dotPos).trim();
-
-			if(s.length() > 0)
-			{
-				refs.add(new MyPsiReference(s, offset + lastPos, false));
-			}
-
-			lastPos = dotPos + 1;
-			dotPos = findSeparatorPosition(value, lastPos);
-		}
-
-		int end = value.length();
-
-		final int lpar = value.indexOf('(', lastPos);
-		if(lpar != -1)
-		{
-			end = lpar;
-		}
-
-		final String s = value.substring(lastPos, end).trim();
-
-		if(s.length() > 0)
-		{
-			refs.add(new MyPsiReference(s, offset + lastPos, lastPos > 0 && value.charAt(lastPos - 1) == '#'));
-		}
-
-		return refs.toArray(new PsiReference[refs.size()]);
-	}
-
-	private static int findSeparatorPosition(final String s, int fromIndex)
-	{
-		int pos = s.indexOf('.', fromIndex);
-		// no more than one ':' and '#' symbol after last '.'
-		if(pos == -1 && s.indexOf(":") >= fromIndex)
-		{
-			pos = s.indexOf(":", fromIndex);
-		}
-		if(pos == -1 && s.indexOf("#") >= fromIndex)
-		{
-			pos = s.indexOf("#", fromIndex);
-		}
-		return pos;
-	}
-
-	public boolean isSoft()
-	{
-		return isSoft;
-	}
-
-	private class MyPsiReference implements PsiPolyVariantReference, EmptyResolveMessageProvider
-	{
-		private
-		@NonNls
-		String myText;
-		private int myOffset;
-		private boolean myMethodRef;
-
-		MyPsiReference(final String s, final int i, boolean methodRef)
-		{
-			myText = s;
-			myOffset = i;
-			myMethodRef = methodRef;
-		}
-
-		@Override
-		public PsiElement getElement()
-		{
-			return element;
-		}
-
-		@Override
-		public TextRange getRangeInElement()
-		{
-			return new TextRange(myOffset, myOffset + myText.length());
-		}
-
-		@Override
-		@Nullable
-		public PsiElement resolve()
-		{
-			final ResolveResult[] resolveResults = multiResolve(false);
-			return resolveResults.length == 1 ? resolveResults[0].getElement() : null;
-		}
-
-		@Override
-		public String getCanonicalText()
-		{
-			return myText;
-		}
-
-		@Override
-		public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException
-		{
-			int i = newElementName.lastIndexOf('.');
-			if(i != -1)
-			{
-				newElementName = newElementName.substring(0, i);
-			}
-			return handleContentChange(getElement(), getRangeInElement(), newElementName);
-		}
-
-		@Override
-		public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException
-		{
-			String qName = JSPsiImplUtils.getQNameForMove(getElement(), element);
-			if(qName != null)
-			{
-				handleContentChange(getElement(), new TextRange(myReferences[0].getRangeInElement().getStartOffset(), getRangeInElement().getEndOffset()),
-						qName);
-			}
-			return null;
-		}
-
-		@Override
-		public boolean isReferenceTo(PsiElement element)
-		{
-			if(element instanceof PsiNamedElement || element instanceof XmlAttributeValue)
-			{
-				return JSResolveUtil.isReferenceTo(this, myText, element);
-			}
-			return false;
-		}
-
-		@Override
-		public Object[] getVariants()
-		{
-			final PsiFile containingFile = element.getContainingFile();
-			ResolveProcessor processor = null;
-
-			if(isNewResolveAndCompletion(containingFile))
-			{
-				processor = doProcess(element.getContainingFile(), null);
-				if(!(element instanceof JSLiteralExpression))
-				{
-					return processor.getResultsAsObjects();
-				}
-			}
-			return getOldVariants(containingFile, processor);
-		}
-
-		private Object[] getOldVariants(PsiFile containingFile, ResolveProcessor localProcessor)
-		{
-			final List<String> contextIds = fillContextIds();
-			final VariantsProcessor processor = new VariantsProcessor(contextIds != null ? ArrayUtil.toStringArray(contextIds) : null, containingFile, false, element);
-
-			processor.setAddOnlyCompleteMatches(contextIds != null || !(element instanceof JSLiteralExpression));
-			if(localProcessor != null)
-			{
-				processor.addLocalResults(localProcessor.getResults());  // TODO: remove this stuff as we create new js index
-			}
-			//JSResolveUtil.processGlobalSymbols(containingFile, processor);
-
-			final PsiElement context = containingFile.getContext();
-			if(context != null)
-			{
-				JSResolveUtil.treeWalkUp(processor, containingFile, containingFile, element);
-			}
-
-			return processor.getResult();
-		}
-
-		@Nullable
-		private List<String> fillContextIds()
-		{
-			List<String> contextIds = null;
-			PsiReference prevContextReference = null;
-			for(final PsiReference ref : myReferences)
-			{
-				if(ref == this)
-				{
-					break;
-				}
-				if(contextIds == null)
-				{
-					contextIds = new ArrayList<String>(3);
-				}
-				contextIds.add(ref.getCanonicalText());
-				prevContextReference = ref;
-			}
-
-			if(contextIds == null && myOffset > 0)
-			{
-				PsiElement elt = findNearestClass();
-
-				if(elt instanceof JSClass && !(getElement() instanceof JSLiteralExpression))
-				{
-					final String qName = ((JSClass) elt).getQualifiedName();
-					BaseJSSymbolProcessor.addIndexListFromQName(qName, elt, contextIds = new ArrayList<String>());
-				}
-			}
-			else if(contextIds != null)
-			{
-				PsiElement psiElement = JSResolveUtil.unwrapProxy(prevContextReference.resolve());
-
-				if(psiElement instanceof XmlToken)
-				{
-					final BaseJSSymbolProcessor.TagContextBuilder builder = new BaseJSSymbolProcessor.TagContextBuilder(psiElement,
-							BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME);
-					psiElement = builder.element;
-				}
-				if(psiElement instanceof JSClass)
-				{
-					final String qName = ((JSClass) psiElement).getQualifiedName();
-					BaseJSSymbolProcessor.addIndexListFromQName(qName, psiElement, contextIds = new ArrayList<String>());
-				}
-			}
-
-			return contextIds;
-		}
-
-		@Override
-		public boolean isSoft()
-		{
-			return JSReferenceSet.this.isSoft();
-		}
-
-		@Override
-		@Nonnull
-		@RequiredReadAction
-		public ResolveResult[] multiResolve(final boolean incompleteCode)
-		{
-			PsiFile containingFile = element.getContainingFile();
-			if(containingFile == null)
-			{
-				return ResolveResult.EMPTY_ARRAY;
-			}
-			return ResolveCache.getInstance(containingFile.getProject()).resolveWithCaching(this, MyResolver.INSTANCE, true, incompleteCode, containingFile);
-		}
-
-		private ResolveResult[] doResolve(PsiFile psiFile)
-		{
-			if("int".equals(myText) ||
-					"uint".equals(myText) ||
-					(onlyPackages && "*".equals(myText)))
-			{
-				return new ResolveResult[]{new JSResolveUtil.MyResolveResult(element)};
-			}
-
-			if(isNewResolveAndCompletion(psiFile))
-			{
-				ResolveProcessor processor = doProcess(psiFile, myText);
-
-				return processor.getResultsAsResolveResults();
-			}
-
-			return doOldResolve(psiFile);
-		}
-
-		private boolean isNewResolveAndCompletion(PsiFile psiFile)
-		{
-			return JSResolveUtil.isNewResolveAndCompletion(psiFile) || onlyFqns;
-		}
-
-		private ResolveProcessor doProcess(PsiFile psiFile, String text)
-		{
-			ResolveProcessor processor = new ResolveProcessor(text)
-			{
-				@Override
-				public boolean execute(PsiElement element, ResolveState state)
-				{
-					if(onlyPackages)
-					{
-						return false;
-					}
-					if(onlyFqns)
-					{
-						return true;
-					}
-					if(myOnlyDefaultPackage && element instanceof JSQualifiedNamedElement)
-					{
-						String qName = ((JSQualifiedNamedElement) element).getQualifiedName();
-						if(qName != null && !StringUtil.isEmpty(StringUtil.getPackageName(qName)))
-						{
-							return true;
-						}
-					}
-					return super.execute(element, state);
-				}
-			};
-
-			int i;
-			for(i = 0; i < myReferences.length && myReferences[i] != this; ++i)
-			{
-				;
-			}
-
-			if(i == 0)
-			{
-				PsiElement elt = findNearestClass();
-
-				if(myOffset > 0)
-				{
-					if(elt instanceof JSClass && !(element instanceof JSLiteralExpression))
-					{
-						processor.setToProcessHierarchy(true);
-						processor.setTypeContext(true);
-						if(!elt.processDeclarations(processor, ResolveState.initial(), elt, elt))
-						{
-							return processor;
-						}
-					}
-				}
-				else if(elt instanceof JSClass)
-				{
-					processor.setTypeContext(true);
-					processor.setToProcessMembers(false);
-					if(!elt.processDeclarations(processor, ResolveState.initial(), elt, elt))
-					{
-						return processor;
-					}
-				}
-				JSResolveUtil.treeWalkUp(processor, element, element.getParent(), element);
-			}
-			else
-			{
-				PsiElement psiElement = JSResolveUtil.unwrapProxy(myReferences[i - 1].resolve());
-
-				if(psiElement instanceof XmlToken)
-				{
-					final BaseJSSymbolProcessor.TagContextBuilder builder = new BaseJSSymbolProcessor.TagContextBuilder(psiElement,
-							BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME);
-					psiElement = builder.element;
-				}
-				if(psiElement != null)
-				{
-					if(psiElement instanceof JSClass)
-					{
-						processor.setToProcessHierarchy(true);
-					}
-					psiElement.processDeclarations(processor, ResolveState.initial(), psiElement, psiElement);
-				}
-			}
-
-			if(psiFile instanceof XmlFile && !JavaScriptSupportLoader.isFlexMxmFile(psiFile))
-			{
-				// TODO: short names during completion should be
-				JSResolveUtil.processTopLevelClasses(processor, ResolveState.initial(), psiFile.getProject(), psiFile.getResolveScope(), onlyFqns,
-						false);
-			}
-			return processor;
-		}
-
-		private PsiElement findNearestClass()
-		{
-			PsiElement elt = element;
-			PsiElement parent;
-			while(!((parent = elt.getParent()) instanceof JSFile) && !(parent instanceof JSPackageStatement))
-			{
-				if(parent instanceof XmlTagChild)
-				{
-					break;
-				}
-				elt = parent;
-				if(elt == null || elt instanceof JSClass)
-				{
-					break;
-				}
-			}
-
-			if(parent instanceof XmlTag && XmlBackedJSClassImpl.isInlineComponentTag((XmlTag) parent))
-			{
-				elt = XmlBackedJSClassImpl.getXmlBackedClass((XmlTag) parent);
-			}
-
-			if(elt != null && !(elt instanceof JSClass))
-			{
-				elt = elt.getNextSibling();
-				if(elt instanceof PsiWhiteSpace)
-				{
-					elt = elt.getNextSibling();
-				}
-			}
-			return elt;
-		}
-
-		private ResolveResult[] doOldResolve(PsiFile psiFile)
-		{
-			if("*".equals(myText))
-			{
-				return new ResolveResult[]{new JSResolveUtil.MyResolveResult(element)};
-			}
-			final List<String> contextIds = fillContextIds();
-
-			String text = myText;
-
-			if(getElement() instanceof JSDocTagValue)
-			{
-				if(myReferences.length == 1 &&
-						myReferences[myReferences.length - 1] == this &&
-						!myMethodRef)
-				{
-					text = StringUtil.capitalize(text);
-				}
-			}
-
-			final WalkUpResolveProcessor processor = new WalkUpResolveProcessor(text, contextIds != null ? ArrayUtil.toStringArray(contextIds) :
-					null, psiFile, false, element);
-
-			processor.setAddOnlyCompleteMatches(contextIds != null || !(element instanceof JSLiteralExpression));
-			//JSResolveUtil.processGlobalSymbols(psiFile, processor);
-			final StringBuilder b = new StringBuilder();
-
-			for(final PsiReference ref : myReferences)
-			{
-				if(b.length() > 0)
-				{
-					b.append('.');
-				}
-				b.append(ref.getCanonicalText());
-				if(ref == this)
-				{
-					break;
-				}
-			}
-			final String str = b.toString();
-
-			final PsiElement context = psiFile.getContext();
-			if(context != null && str.indexOf('.') == -1)
-			{
-				JSResolveUtil.treeWalkUp(processor, psiFile, psiFile, element);
-			}
-
-			return processor.getResults();
-		}
-
-		@Nonnull
-		@Override
-		public LocalizeValue buildUnresolvedMessage(@Nonnull String text)
-		{
-			text = "'" + text.replace("'", "''") + "'";
-			return JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage2(text);
-		}
-	}
-
-	static class MyResolver implements ResolveCache.PolyVariantContextResolver<MyPsiReference>
-	{
-		private static final MyResolver INSTANCE = new MyResolver();
-
-		@Nonnull
-		@Override
-		public ResolveResult[] resolve(@Nonnull MyPsiReference ref, @Nonnull PsiFile containingFile, boolean incompleteCode)
-		{
-			return ref.doResolve(containingFile);
-		}
-	}
-
-	private static PsiElement handleContentChange(PsiElement elt, TextRange range, String newElementName)
-	{
-		if(elt instanceof XmlTag || elt instanceof XmlAttributeValue)
-		{
-			int i = newElementName.indexOf('.');
-			if(i != -1)
-			{
-				newElementName = newElementName.substring(0, i);
-			}
-			return ElementManipulators.getManipulator(elt).handleContentChange(elt, range, newElementName);
-		}
-
-		String myReferenceText = elt.getText();
-		String newLiteralText = myReferenceText.substring(0, range.getStartOffset()) + newElementName + myReferenceText.substring(range.getEndOffset());
-		final ASTNode expressionFromText;
-
-		Project project = elt.getProject();
-		if(elt instanceof JSExpression)
-		{
-			expressionFromText = JSChangeUtil.createExpressionFromText(project, newLiteralText).getNode();
-		}
-		else if(elt instanceof JSAttributeNameValuePair)
-		{
-			final PsiElement element = JSChangeUtil.createJSTreeFromText(project, "[XXX(" + newLiteralText + ")]").getPsi();
-			expressionFromText = ((JSAttribute) element.getFirstChild()).getValues()[0].getNode();
-		}
-		else
-		{
-			assert elt instanceof JSDocTagValue;
-			final PsiElement tag = JSChangeUtil.createJSTreeFromText(project, "/** @see " + newLiteralText + " */").getPsi();
-			expressionFromText = ((JSDocTag) tag.getFirstChild().getChildren()[0]).getValue().getNode();
-		}
-
-		if(expressionFromText.getPsi().getClass() == elt.getClass())
-		{
-			final ASTNode astNode = elt.getNode();
-			astNode.replaceChild(astNode.getFirstChildNode(), expressionFromText.getFirstChildNode());
-		}
-
-		return null;
-	}
-
+public class JSReferenceSet {
+    private static final String GLOBAL_PREFIX = "global#";
+
+    private String myReferenceText;
+    private PsiReference[] myReferences;
+    private final PsiElement element;
+    private final boolean isSoft;
+    private final boolean onlyPackages;
+    private final boolean onlyFqns;
+    private boolean myOnlyDefaultPackage;
+
+    public JSReferenceSet(final PsiElement element, String text, int offset, boolean soft) {
+        this(element, text, offset, soft, false, false);
+    }
+
+    public JSReferenceSet(final PsiElement element, String text, int offset, boolean soft, boolean _onlyPackages, boolean _onlyFqns) {
+        this.element = element;
+        isSoft = soft;
+        myReferenceText = text;
+        myReferences = reparse(text, offset);
+        onlyPackages = _onlyPackages;
+        onlyFqns = _onlyFqns;
+    }
+
+    public JSReferenceSet(final PsiElement element, boolean soft) {
+        this.element = element;
+        isSoft = soft;
+        onlyPackages = false;
+        onlyFqns = false;
+    }
+
+    public JSReferenceSet(final PsiElement element) {
+        this(element, true);
+    }
+
+    public PsiReference[] getReferences() {
+        return myReferences;
+    }
+
+    public void update(String text, int offset) {
+        if (myReferences != null &&
+            myReferenceText != null &&
+            myReferenceText.equals(text)) {
+            return;
+        }
+
+        if (!StringUtil.startsWithChar(text, '"') && !StringUtil.startsWithChar(text, '\'')) {
+            myReferenceText = text;
+            myReferences = PsiReference.EMPTY_ARRAY;
+        }
+        else {
+            final PsiReference[] list = reparse(StringUtil.stripQuotesAroundValue(text), offset + 1);
+            myReferenceText = text;
+            myReferences = list;
+        }
+    }
+
+    private PsiReference[] reparse(String value, int offset) {
+        if (value.startsWith(GLOBAL_PREFIX)) {
+            value = value.substring(GLOBAL_PREFIX.length());
+            offset += GLOBAL_PREFIX.length();
+            myOnlyDefaultPackage = true;
+        }
+        List<PsiReference> refs = new ArrayList<>(1);
+        int lastPos = 0;
+        int dotPos = findSeparatorPosition(value, lastPos);
+
+        while (dotPos != -1) {
+            final String s = value.substring(lastPos, dotPos).trim();
+
+            if (s.length() > 0) {
+                refs.add(new MyPsiReference(s, offset + lastPos, false));
+            }
+
+            lastPos = dotPos + 1;
+            dotPos = findSeparatorPosition(value, lastPos);
+        }
+
+        int end = value.length();
+
+        final int lpar = value.indexOf('(', lastPos);
+        if (lpar != -1) {
+            end = lpar;
+        }
+
+        final String s = value.substring(lastPos, end).trim();
+
+        if (s.length() > 0) {
+            refs.add(new MyPsiReference(s, offset + lastPos, lastPos > 0 && value.charAt(lastPos - 1) == '#'));
+        }
+
+        return refs.toArray(new PsiReference[refs.size()]);
+    }
+
+    private static int findSeparatorPosition(final String s, int fromIndex) {
+        int pos = s.indexOf('.', fromIndex);
+        // no more than one ':' and '#' symbol after last '.'
+        if (pos == -1 && s.indexOf(":") >= fromIndex) {
+            pos = s.indexOf(":", fromIndex);
+        }
+        if (pos == -1 && s.indexOf("#") >= fromIndex) {
+            pos = s.indexOf("#", fromIndex);
+        }
+        return pos;
+    }
+
+    public boolean isSoft() {
+        return isSoft;
+    }
+
+    private class MyPsiReference implements PsiPolyVariantReference, EmptyResolveMessageProvider {
+        private
+        @NonNls
+        String myText;
+        private int myOffset;
+        private boolean myMethodRef;
+
+        MyPsiReference(final String s, final int i, boolean methodRef) {
+            myText = s;
+            myOffset = i;
+            myMethodRef = methodRef;
+        }
+
+        @Override
+        public PsiElement getElement() {
+            return element;
+        }
+
+        @Override
+        public TextRange getRangeInElement() {
+            return new TextRange(myOffset, myOffset + myText.length());
+        }
+
+        @Override
+        @Nullable
+        public PsiElement resolve() {
+            final ResolveResult[] resolveResults = multiResolve(false);
+            return resolveResults.length == 1 ? resolveResults[0].getElement() : null;
+        }
+
+        @Override
+        public String getCanonicalText() {
+            return myText;
+        }
+
+        @Override
+        public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
+            int i = newElementName.lastIndexOf('.');
+            if (i != -1) {
+                newElementName = newElementName.substring(0, i);
+            }
+            return handleContentChange(getElement(), getRangeInElement(), newElementName);
+        }
+
+        @Override
+        public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+            String qName = JSPsiImplUtils.getQNameForMove(getElement(), element);
+            if (qName != null) {
+                handleContentChange(
+                    getElement(),
+                    new TextRange(myReferences[0].getRangeInElement().getStartOffset(), getRangeInElement().getEndOffset()),
+                    qName
+                );
+            }
+            return null;
+        }
+
+        @Override
+        public boolean isReferenceTo(PsiElement element) {
+            if (element instanceof PsiNamedElement || element instanceof XmlAttributeValue) {
+                return JSResolveUtil.isReferenceTo(this, myText, element);
+            }
+            return false;
+        }
+
+        @Override
+        public Object[] getVariants() {
+            final PsiFile containingFile = element.getContainingFile();
+            ResolveProcessor processor = null;
+
+            if (isNewResolveAndCompletion(containingFile)) {
+                processor = doProcess(element.getContainingFile(), null);
+                if (!(element instanceof JSLiteralExpression)) {
+                    return processor.getResultsAsObjects();
+                }
+            }
+            return getOldVariants(containingFile, processor);
+        }
+
+        private Object[] getOldVariants(PsiFile containingFile, ResolveProcessor localProcessor) {
+            final List<String> contextIds = fillContextIds();
+            final VariantsProcessor processor =
+                new VariantsProcessor(contextIds != null ? ArrayUtil.toStringArray(contextIds) : null, containingFile, false, element);
+
+            processor.setAddOnlyCompleteMatches(contextIds != null || !(element instanceof JSLiteralExpression));
+            if (localProcessor != null) {
+                processor.addLocalResults(localProcessor.getResults());  // TODO: remove this stuff as we create new js index
+            }
+            //JSResolveUtil.processGlobalSymbols(containingFile, processor);
+
+            final PsiElement context = containingFile.getContext();
+            if (context != null) {
+                JSResolveUtil.treeWalkUp(processor, containingFile, containingFile, element);
+            }
+
+            return processor.getResult();
+        }
+
+        @Nullable
+        private List<String> fillContextIds() {
+            List<String> contextIds = null;
+            PsiReference prevContextReference = null;
+            for (final PsiReference ref : myReferences) {
+                if (ref == this) {
+                    break;
+                }
+                if (contextIds == null) {
+                    contextIds = new ArrayList<>(3);
+                }
+                contextIds.add(ref.getCanonicalText());
+                prevContextReference = ref;
+            }
+
+            if (contextIds == null && myOffset > 0) {
+                PsiElement elt = findNearestClass();
+
+                if (elt instanceof JSClass jsClass && !(getElement() instanceof JSLiteralExpression)) {
+                    final String qName = jsClass.getQualifiedName();
+                    BaseJSSymbolProcessor.addIndexListFromQName(qName, elt, contextIds = new ArrayList<>());
+                }
+            }
+            else if (contextIds != null) {
+                PsiElement psiElement = JSResolveUtil.unwrapProxy(prevContextReference.resolve());
+
+                if (psiElement instanceof XmlToken) {
+                    final BaseJSSymbolProcessor.TagContextBuilder builder =
+                        new BaseJSSymbolProcessor.TagContextBuilder(psiElement, BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME);
+                    psiElement = builder.element;
+                }
+                if (psiElement instanceof JSClass jsClass) {
+                    final String qName = jsClass.getQualifiedName();
+                    BaseJSSymbolProcessor.addIndexListFromQName(qName, psiElement, contextIds = new ArrayList<>());
+                }
+            }
+
+            return contextIds;
+        }
+
+        @Override
+        public boolean isSoft() {
+            return JSReferenceSet.this.isSoft();
+        }
+
+        @Override
+        @Nonnull
+        @RequiredReadAction
+        public ResolveResult[] multiResolve(final boolean incompleteCode) {
+            PsiFile containingFile = element.getContainingFile();
+            if (containingFile == null) {
+                return ResolveResult.EMPTY_ARRAY;
+            }
+            return ResolveCache.getInstance(containingFile.getProject())
+                .resolveWithCaching(this, MyResolver.INSTANCE, true, incompleteCode, containingFile);
+        }
+
+        private ResolveResult[] doResolve(PsiFile psiFile) {
+            if ("int".equals(myText) ||
+                "uint".equals(myText) ||
+                (onlyPackages && "*".equals(myText))) {
+                return new ResolveResult[]{new JSResolveUtil.MyResolveResult(element)};
+            }
+
+            if (isNewResolveAndCompletion(psiFile)) {
+                ResolveProcessor processor = doProcess(psiFile, myText);
+
+                return processor.getResultsAsResolveResults();
+            }
+
+            return doOldResolve(psiFile);
+        }
+
+        private boolean isNewResolveAndCompletion(PsiFile psiFile) {
+            return JSResolveUtil.isNewResolveAndCompletion(psiFile) || onlyFqns;
+        }
+
+        private ResolveProcessor doProcess(PsiFile psiFile, String text) {
+            ResolveProcessor processor = new ResolveProcessor(text) {
+                @Override
+                public boolean execute(PsiElement element, ResolveState state) {
+                    if (onlyPackages) {
+                        return false;
+                    }
+                    if (onlyFqns) {
+                        return true;
+                    }
+                    if (myOnlyDefaultPackage && element instanceof JSQualifiedNamedElement) {
+                        String qName = ((JSQualifiedNamedElement)element).getQualifiedName();
+                        if (qName != null && !StringUtil.isEmpty(StringUtil.getPackageName(qName))) {
+                            return true;
+                        }
+                    }
+                    return super.execute(element, state);
+                }
+            };
+
+            int i;
+            for (i = 0; i < myReferences.length && myReferences[i] != this; ++i) {
+                ;
+            }
+
+            if (i == 0) {
+                PsiElement elt = findNearestClass();
+
+                if (myOffset > 0) {
+                    if (elt instanceof JSClass && !(element instanceof JSLiteralExpression)) {
+                        processor.setToProcessHierarchy(true);
+                        processor.setTypeContext(true);
+                        if (!elt.processDeclarations(processor, ResolveState.initial(), elt, elt)) {
+                            return processor;
+                        }
+                    }
+                }
+                else if (elt instanceof JSClass) {
+                    processor.setTypeContext(true);
+                    processor.setToProcessMembers(false);
+                    if (!elt.processDeclarations(processor, ResolveState.initial(), elt, elt)) {
+                        return processor;
+                    }
+                }
+                JSResolveUtil.treeWalkUp(processor, element, element.getParent(), element);
+            }
+            else {
+                PsiElement psiElement = JSResolveUtil.unwrapProxy(myReferences[i - 1].resolve());
+
+                if (psiElement instanceof XmlToken) {
+                    final BaseJSSymbolProcessor.TagContextBuilder builder = new BaseJSSymbolProcessor.TagContextBuilder(
+                        psiElement,
+                        BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME
+                    );
+                    psiElement = builder.element;
+                }
+                if (psiElement != null) {
+                    if (psiElement instanceof JSClass) {
+                        processor.setToProcessHierarchy(true);
+                    }
+                    psiElement.processDeclarations(processor, ResolveState.initial(), psiElement, psiElement);
+                }
+            }
+
+            if (psiFile instanceof XmlFile && !JavaScriptSupportLoader.isFlexMxmFile(psiFile)) {
+                // TODO: short names during completion should be
+                JSResolveUtil.processTopLevelClasses(
+                    processor,
+                    ResolveState.initial(),
+                    psiFile.getProject(),
+                    psiFile.getResolveScope(),
+                    onlyFqns,
+                    false
+                );
+            }
+            return processor;
+        }
+
+        private PsiElement findNearestClass() {
+            PsiElement elt = element;
+            PsiElement parent;
+            while (!((parent = elt.getParent()) instanceof JSFile) && !(parent instanceof JSPackageStatement)) {
+                if (parent instanceof XmlTagChild) {
+                    break;
+                }
+                elt = parent;
+                if (elt == null || elt instanceof JSClass) {
+                    break;
+                }
+            }
+
+            if (parent instanceof XmlTag tag && XmlBackedJSClassImpl.isInlineComponentTag(tag)) {
+                elt = XmlBackedJSClassImpl.getXmlBackedClass(tag);
+            }
+
+            if (elt != null && !(elt instanceof JSClass)) {
+                elt = elt.getNextSibling();
+                if (elt instanceof PsiWhiteSpace) {
+                    elt = elt.getNextSibling();
+                }
+            }
+            return elt;
+        }
+
+        private ResolveResult[] doOldResolve(PsiFile psiFile) {
+            if ("*".equals(myText)) {
+                return new ResolveResult[]{new JSResolveUtil.MyResolveResult(element)};
+            }
+            final List<String> contextIds = fillContextIds();
+
+            String text = myText;
+
+            if (getElement() instanceof JSDocTagValue) {
+                if (myReferences.length == 1 &&
+                    myReferences[myReferences.length - 1] == this &&
+                    !myMethodRef) {
+                    text = StringUtil.capitalize(text);
+                }
+            }
+
+            final WalkUpResolveProcessor processor = new WalkUpResolveProcessor(
+                text,
+                contextIds != null ? ArrayUtil.toStringArray(contextIds) : null,
+                psiFile,
+                false,
+                element
+            );
+
+            processor.setAddOnlyCompleteMatches(contextIds != null || !(element instanceof JSLiteralExpression));
+            //JSResolveUtil.processGlobalSymbols(psiFile, processor);
+            final StringBuilder b = new StringBuilder();
+
+            for (final PsiReference ref : myReferences) {
+                if (b.length() > 0) {
+                    b.append('.');
+                }
+                b.append(ref.getCanonicalText());
+                if (ref == this) {
+                    break;
+                }
+            }
+            final String str = b.toString();
+
+            final PsiElement context = psiFile.getContext();
+            if (context != null && str.indexOf('.') == -1) {
+                JSResolveUtil.treeWalkUp(processor, psiFile, psiFile, element);
+            }
+
+            return processor.getResults();
+        }
+
+        @Nonnull
+        @Override
+        public LocalizeValue buildUnresolvedMessage(@Nonnull String text) {
+            text = "'" + text.replace("'", "''") + "'";
+            return JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage2(text);
+        }
+    }
+
+    static class MyResolver implements ResolveCache.PolyVariantContextResolver<MyPsiReference> {
+        private static final MyResolver INSTANCE = new MyResolver();
+
+        @Nonnull
+        @Override
+        public ResolveResult[] resolve(@Nonnull MyPsiReference ref, @Nonnull PsiFile containingFile, boolean incompleteCode) {
+            return ref.doResolve(containingFile);
+        }
+    }
+
+    private static PsiElement handleContentChange(PsiElement elt, TextRange range, String newElementName) {
+        if (elt instanceof XmlTag || elt instanceof XmlAttributeValue) {
+            int i = newElementName.indexOf('.');
+            if (i != -1) {
+                newElementName = newElementName.substring(0, i);
+            }
+            return ElementManipulators.getManipulator(elt).handleContentChange(elt, range, newElementName);
+        }
+
+        String myReferenceText = elt.getText();
+        String newLiteralText =
+            myReferenceText.substring(0, range.getStartOffset()) + newElementName + myReferenceText.substring(range.getEndOffset());
+        final ASTNode expressionFromText;
+
+        Project project = elt.getProject();
+        if (elt instanceof JSExpression) {
+            expressionFromText = JSChangeUtil.createExpressionFromText(project, newLiteralText).getNode();
+        }
+        else if (elt instanceof JSAttributeNameValuePair) {
+            final PsiElement element = JSChangeUtil.createJSTreeFromText(project, "[XXX(" + newLiteralText + ")]").getPsi();
+            expressionFromText = ((JSAttribute)element.getFirstChild()).getValues()[0].getNode();
+        }
+        else {
+            assert elt instanceof JSDocTagValue;
+            final PsiElement tag = JSChangeUtil.createJSTreeFromText(project, "/** @see " + newLiteralText + " */").getPsi();
+            expressionFromText = ((JSDocTag)tag.getFirstChild().getChildren()[0]).getValue().getNode();
+        }
+
+        if (expressionFromText.getPsi().getClass() == elt.getClass()) {
+            final ASTNode astNode = elt.getNode();
+            astNode.replaceChild(astNode.getFirstChildNode(), expressionFromText.getFirstChildNode());
+        }
+
+        return null;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
index 49eb9514..419650ae 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
@@ -27,22 +27,18 @@
  * Date: Jan 30, 2005
  * Time: 9:57:08 PM
  */
-public class JSReturnStatementImpl extends JSStatementImpl implements JSReturnStatement
-{
-	public JSReturnStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSReturnStatementImpl extends JSStatementImpl implements JSReturnStatement {
+    public JSReturnStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSReturnStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSReturnStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
index c29af19e..eb5426ca 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
@@ -35,6 +35,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -42,202 +43,169 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jan 25, 2008
- *         Time: 12:40:48 AM
+ * Date: Jan 25, 2008
+ * Time: 12:40:48 AM
  */
-public class JSSmartCompletionVariantsHandler
-{
-	static Object[] getSmartVariants(final @Nonnull PsiElement expr, final boolean ecma)
-	{
-		final PsiElement parent = expr.getParent();
-
-		if(parent instanceof JSArgumentList &&
-				((JSArgumentList) parent).getArguments()[0] == expr &&
-				ecma &&
-				((JSReferenceExpression) expr).getQualifier() == null)
-		{
-			final JSExpression calledExpr = ((JSCallExpression) parent.getParent()).getMethodExpression();
-
-			if(calledExpr instanceof JSReferenceExpression)
-			{
-				final JSReferenceExpression expression = (JSReferenceExpression) calledExpr;
-				final @NonNls String s = expression.getReferencedName();
-
-				if("addEventListener".equals(s) || "removeEventListener".equals(s))
-				{
-					final List<Object> variants = new ArrayList<Object>();
-					final MyEventSubclassesProcessor subclassesProcessor = new MyEventSubclassesProcessor(expr, variants);
-					subclassesProcessor.findAcceptableVariants(expression, parent.getProject());
-					if(variants.size() > 0)
-					{
-						return variants.toArray(new Object[variants.size()]);
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-
-	private static class MyEventSubclassesProcessor extends ResolveProcessor implements JSResolveUtil.MetaDataProcessor
-	{
-		private final PsiElement myExpr;
-		private final List<Object> myVariants;
-		private final ResolveState state = new ResolveState();
-		private final Map<String, JSVariable> myCandidatesMap = new HashMap<String, JSVariable>();
-		private boolean findAcceptableEvents;
-
-		public MyEventSubclassesProcessor(final PsiElement expr, final List<Object> variants)
-		{
-			super(null);
-			myExpr = expr;
-			myVariants = variants;
-
-			setToProcessHierarchy(true);
-		}
-
-		public boolean process(final JSClass clazz)
-		{
-			clazz.processDeclarations(this, state, clazz, clazz);
-
-			return true;
-		}
-
-		@Override
-		public boolean execute(final PsiElement element, final ResolveState state)
-		{
-			if(element instanceof JSVariable)
-			{
-				final JSVariable variable = (JSVariable) element;
-				final JSAttributeList attributeList = variable.getAttributeList();
-
-				if(attributeList != null &&
-						attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC &&
-						attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) &&
-						"String".equals(variable.getTypeString()))
-				{
-					final String s = variable.getInitializerText();
-					if(s != null && StringUtil.startsWith(s, "\"") && StringUtil.endsWith(s, "\""))
-					{
-						myCandidatesMap.put(StringUtil.stripQuotesAroundValue(s), variable);
-					}
-				}
-			}
-
-			if(findAcceptableEvents && element instanceof JSClass)
-			{
-				JSResolveUtil.processMetaAttributesForClass(element, this);
-			}
-
-			return true;
-		}
-
-		public void findAcceptableVariants(JSReferenceExpression expression, final Project project)
-		{
-
-			PsiElement clazz = JSResolveUtil.findClassByQName("flash.events.Event", expression.getResolveScope(), project);
-			clazz = JSResolveUtil.unwrapProxy(clazz);
-			if(!(clazz instanceof JSClass))
-			{
-				return;
-			}
-			final Query<JSClass> query = JSClassSearch.searchClassInheritors((JSClass) clazz, true);
-
-			for(JSClass extendedClass : query.findAll())
-			{
-				process(extendedClass);
-			}
-
-			final JSExpression qualifier = expression.getQualifier();
-
-			JSClass clazzToProcess = null;
-
-			if(qualifier instanceof JSThisExpression || qualifier instanceof JSSuperExpression)
-			{
-				clazzToProcess = PsiTreeUtil.getParentOfType(qualifier, JSClass.class);
-			}
-			else if(qualifier instanceof JSReferenceExpression)
-			{
-				final ResolveResult[] results = ((JSReferenceExpression) qualifier).multiResolve(false);
-				if(results.length > 0 && results[0].getElement() instanceof JSClass)
-				{
-					clazzToProcess = (JSClass) results[0].getElement();
-				}
-			}
-
-			if(clazzToProcess == null)
-			{
-				final PsiElement context = expression.getContainingFile().getContext();
-				clazzToProcess = JSResolveUtil.getClassFromTagNameInMxml(context);
-				if(clazzToProcess == null && context != null)
-				{
-					XmlFile file = PsiTreeUtil.getParentOfType(context, XmlFile.class);
-					if(file != null)
-					{
-						final XmlTag rootTag = file.getDocument().getRootTag();
-						final XmlTag[] tags = rootTag != null ? XmlBackedJSClassImpl.findMxmlSubTags(rootTag, "Metadata") : XmlTag.EMPTY;
-						final MyJSInjectedFilesVisitor injectedFilesVisitor = new MyJSInjectedFilesVisitor();
-
-						for(XmlTag tag : tags)
-						{
-							JSResolveUtil.processInjectedFileForTag(tag, injectedFilesVisitor);
-						}
-					}
-				}
-			}
-
-			if(clazzToProcess != null)
-			{
-				findAcceptableEvents = true;
-				setToProcessMembers(false);
-				setTypeContext(true);
-
-				clazzToProcess.processDeclarations(this, ResolveState.initial(), clazz, clazz);
-			}
-		}
-
-		@Override
-		public boolean process(final @Nonnull JSAttribute jsAttribute)
-		{
-			if("Event".equals(jsAttribute.getName()))
-			{
-				final JSAttributeNameValuePair eventName = jsAttribute.getValueByName("name");
-
-				if(eventName != null)
-				{
-					final String value = eventName.getSimpleValue();
-					final JSVariable variable = myCandidatesMap.get(value);
-
-					if(variable != null)
-					{
-						myCandidatesMap.remove(value);
-						myVariants.add(JSLookupUtil.createLookupItem(variable, ((JSClass) variable.getParent().getParent()).getName() + "." + variable
-								.getName(), JSLookupUtil.LookupPriority.HIGHER));
-					}
-				}
-			}
-			return true;
-		}
-
-		@Override
-		public boolean handleOtherElement(final PsiElement el, final PsiElement context, final Ref<PsiElement> continuePassElement)
-		{
-			return true;
-		}
-
-		private class MyJSInjectedFilesVisitor extends JSResolveUtil.JSInjectedFilesVisitor
-		{
-			@Override
-			protected void process(final JSFile file)
-			{
-				for(PsiElement element : file.getChildren())
-				{
-					if(element instanceof JSAttributeList)
-					{
-						JSResolveUtil.processAttributeList(MyEventSubclassesProcessor.this, null, (JSAttributeList) element, true);
-					}
-				}
-			}
-		}
-	}
+public class JSSmartCompletionVariantsHandler {
+    static Object[] getSmartVariants(final @Nonnull PsiElement expr, final boolean ecma) {
+        final PsiElement parent = expr.getParent();
+
+        if (parent instanceof JSArgumentList argumentList && argumentList.getArguments()[0] == expr && ecma
+            && ((JSReferenceExpression)expr).getQualifier() == null) {
+            final JSExpression calledExpr = ((JSCallExpression)parent.getParent()).getMethodExpression();
+
+            if (calledExpr instanceof JSReferenceExpression expression) {
+                final @NonNls String s = expression.getReferencedName();
+
+                if ("addEventListener".equals(s) || "removeEventListener".equals(s)) {
+                    final List<Object> variants = new ArrayList<Object>();
+                    final MyEventSubclassesProcessor subclassesProcessor = new MyEventSubclassesProcessor(expr, variants);
+                    subclassesProcessor.findAcceptableVariants(expression, parent.getProject());
+                    if (variants.size() > 0) {
+                        return variants.toArray(new Object[variants.size()]);
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private static class MyEventSubclassesProcessor extends ResolveProcessor implements JSResolveUtil.MetaDataProcessor {
+        private final PsiElement myExpr;
+        private final List<Object> myVariants;
+        private final ResolveState state = new ResolveState();
+        private final Map<String, JSVariable> myCandidatesMap = new HashMap<>();
+        private boolean findAcceptableEvents;
+
+        public MyEventSubclassesProcessor(final PsiElement expr, final List<Object> variants) {
+            super(null);
+            myExpr = expr;
+            myVariants = variants;
+
+            setToProcessHierarchy(true);
+        }
+
+        public boolean process(final JSClass clazz) {
+            clazz.processDeclarations(this, state, clazz, clazz);
+
+            return true;
+        }
+
+        @Override
+        public boolean execute(final PsiElement element, final ResolveState state) {
+            if (element instanceof JSVariable variable) {
+                final JSAttributeList attributeList = variable.getAttributeList();
+
+                if (attributeList != null
+                    && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC
+                    && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
+                    && "String".equals(variable.getTypeString())) {
+                    final String s = variable.getInitializerText();
+                    if (s != null && StringUtil.startsWith(s, "\"") && StringUtil.endsWith(s, "\"")) {
+                        myCandidatesMap.put(StringUtil.stripQuotesAroundValue(s), variable);
+                    }
+                }
+            }
+
+            if (findAcceptableEvents && element instanceof JSClass) {
+                JSResolveUtil.processMetaAttributesForClass(element, this);
+            }
+
+            return true;
+        }
+
+        public void findAcceptableVariants(JSReferenceExpression expression, final Project project) {
+            PsiElement clazz = JSResolveUtil.findClassByQName("flash.events.Event", expression.getResolveScope(), project);
+            clazz = JSResolveUtil.unwrapProxy(clazz);
+            if (!(clazz instanceof JSClass)) {
+                return;
+            }
+            final Query<JSClass> query = JSClassSearch.searchClassInheritors((JSClass)clazz, true);
+
+            for (JSClass extendedClass : query.findAll()) {
+                process(extendedClass);
+            }
+
+            final JSExpression qualifier = expression.getQualifier();
+
+            JSClass clazzToProcess = null;
+
+            if (qualifier instanceof JSThisExpression || qualifier instanceof JSSuperExpression) {
+                clazzToProcess = PsiTreeUtil.getParentOfType(qualifier, JSClass.class);
+            }
+            else if (qualifier instanceof JSReferenceExpression referenceExpression) {
+                final ResolveResult[] results = referenceExpression.multiResolve(false);
+                if (results.length > 0 && results[0].getElement() instanceof JSClass jsClass) {
+                    clazzToProcess = jsClass;
+                }
+            }
+
+            if (clazzToProcess == null) {
+                final PsiElement context = expression.getContainingFile().getContext();
+                clazzToProcess = JSResolveUtil.getClassFromTagNameInMxml(context);
+                if (clazzToProcess == null && context != null) {
+                    XmlFile file = PsiTreeUtil.getParentOfType(context, XmlFile.class);
+                    if (file != null) {
+                        final XmlTag rootTag = file.getDocument().getRootTag();
+                        final XmlTag[] tags = rootTag != null
+                            ? XmlBackedJSClassImpl.findMxmlSubTags(rootTag, "Metadata")
+                            : XmlTag.EMPTY;
+                        final MyJSInjectedFilesVisitor injectedFilesVisitor = new MyJSInjectedFilesVisitor();
+
+                        for (XmlTag tag : tags) {
+                            JSResolveUtil.processInjectedFileForTag(tag, injectedFilesVisitor);
+                        }
+                    }
+                }
+            }
+
+            if (clazzToProcess != null) {
+                findAcceptableEvents = true;
+                setToProcessMembers(false);
+                setTypeContext(true);
+
+                clazzToProcess.processDeclarations(this, ResolveState.initial(), clazz, clazz);
+            }
+        }
+
+        @Override
+        public boolean process(final @Nonnull JSAttribute jsAttribute) {
+            if ("Event".equals(jsAttribute.getName())) {
+                final JSAttributeNameValuePair eventName = jsAttribute.getValueByName("name");
+
+                if (eventName != null) {
+                    final String value = eventName.getSimpleValue();
+                    final JSVariable variable = myCandidatesMap.get(value);
+
+                    if (variable != null) {
+                        myCandidatesMap.remove(value);
+                        myVariants.add(JSLookupUtil.createLookupItem(
+                            variable,
+                            ((JSClass)variable.getParent().getParent()).getName() + "." + variable
+                                .getName(),
+                            JSLookupUtil.LookupPriority.HIGHER
+                        ));
+                    }
+                }
+            }
+            return true;
+        }
+
+        @Override
+        public boolean handleOtherElement(final PsiElement el, final PsiElement context, final Ref<PsiElement> continuePassElement) {
+            return true;
+        }
+
+        private class MyJSInjectedFilesVisitor extends JSResolveUtil.JSInjectedFilesVisitor {
+            @Override
+            protected void process(final JSFile file) {
+                for (PsiElement element : file.getChildren()) {
+                    if (element instanceof JSAttributeList attributeList) {
+                        JSResolveUtil.processAttributeList(MyEventSubclassesProcessor.this, null, attributeList, true);
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
index c1d21650..ca9cc5f4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
@@ -21,10 +21,8 @@
 /**
  * @author ven
  */
-public abstract class JSStatementImpl extends JSStubbedStatementImpl
-{
-	public JSStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public abstract class JSStatementImpl extends JSStubbedStatementImpl {
+    public JSStatementImpl(final ASTNode node) {
+        super(node);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
index c11b9603..0665b920 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
@@ -40,157 +40,126 @@
  * Time: 9:52:04 PM
  * To change this template use File | Settings | File Templates.
  */
-abstract class JSStatementWithLabelReferenceImpl extends JSStatementImpl
-{
-	private PsiReference[] myReferences;
-	private String myReferencesText;
-
-	protected JSStatementWithLabelReferenceImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public String getLabel()
-	{
-		final ASTNode label = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
-		return label != null ? label.getText() : null;
-	}
-
-	@Override
-	@Nonnull
-	public PsiReference[] getReferences()
-	{
-		final String text = getText();
-
-		if(!text.equals(myReferencesText) || myReferences == null)
-		{
-			final ASTNode label = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
-			if(label != null)
-			{
-				myReferences = new PsiReference[]{new JSStatementWithLabelReferenceImpl.LabelReference(label.getPsi())};
-			}
-			else
-			{
-				myReferences = PsiReference.EMPTY_ARRAY;
-			}
-			myReferencesText = text;
-		}
-		return myReferences;
-	}
-
-	private class LabelReference implements PsiReference
-	{
-		private PsiElement labelNode;
-
-		LabelReference(PsiElement _labelNode)
-		{
-			labelNode = _labelNode;
-		}
-
-		@Override
-		public PsiElement getElement()
-		{
-			return JSStatementWithLabelReferenceImpl.this;
-		}
-
-		@Override
-		public TextRange getRangeInElement()
-		{
-			final int startOffsetInParent = labelNode.getStartOffsetInParent();
-			return new TextRange(startOffsetInParent, startOffsetInParent + labelNode.getTextLength());
-		}
-
-		@Override
-		@Nullable
-		public PsiElement resolve()
-		{
-			final PsiElement[] result = new PsiElement[1];
-
-			processElements(new PsiElementProcessor<JSLabeledStatement>()
-			{
-				private final String label = getCanonicalText();
-
-				@Override
-				public boolean execute(final JSLabeledStatement element)
-				{
-					if(label.equals(element.getLabel()))
-					{
-						result[0] = element;
-						return false;
-					}
-					return true;
-				}
-			});
-
-			return result[0];
-		}
-
-		@Override
-		public String getCanonicalText()
-		{
-			return labelNode.getText();
-		}
-
-		@Override
-		public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException
-		{
-			JSChangeUtil.doIdentifierReplacement(getElement(), labelNode, newElementName);
-			return getElement();
-		}
-
-		@Override
-		public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException
-		{
-			return null;
-		}
-
-		@Override
-		public boolean isReferenceTo(PsiElement element)
-		{
-			return getManager().areElementsEquivalent(resolve(), element);
-		}
-
-		@Override
-		public Object[] getVariants()
-		{
-			final List<String> labels = new ArrayList<String>(1);
-			processElements(new PsiElementProcessor<JSLabeledStatement>()
-			{
-				@Override
-				public boolean execute(final JSLabeledStatement element)
-				{
-					labels.add(element.getLabel());
-					return true;
-				}
-			});
-			return ArrayUtil.toStringArray(labels);
-		}
-
-		private void processElements(PsiElementProcessor<JSLabeledStatement> processor)
-		{
-			PsiElement run = getParent();
-			while(run != null)
-			{
-				if(run instanceof JSLabeledStatement)
-				{
-					if(!processor.execute((JSLabeledStatement) run))
-					{
-						return;
-					}
-				}
-
-				if(run instanceof JSFunction)
-				{
-					break;
-				}
-				run = run.getParent();
-			}
-		}
-
-		@Override
-		public boolean isSoft()
-		{
-			return false;
-		}
-	}
+abstract class JSStatementWithLabelReferenceImpl extends JSStatementImpl {
+    private PsiReference[] myReferences;
+    private String myReferencesText;
+
+    protected JSStatementWithLabelReferenceImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public String getLabel() {
+        final ASTNode label = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return label != null ? label.getText() : null;
+    }
+
+    @Override
+    @Nonnull
+    public PsiReference[] getReferences() {
+        final String text = getText();
+
+        if (!text.equals(myReferencesText) || myReferences == null) {
+            final ASTNode label = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+            if (label != null) {
+                myReferences = new PsiReference[]{new JSStatementWithLabelReferenceImpl.LabelReference(label.getPsi())};
+            }
+            else {
+                myReferences = PsiReference.EMPTY_ARRAY;
+            }
+            myReferencesText = text;
+        }
+        return myReferences;
+    }
+
+    private class LabelReference implements PsiReference {
+        private PsiElement labelNode;
+
+        LabelReference(PsiElement _labelNode) {
+            labelNode = _labelNode;
+        }
+
+        @Override
+        public PsiElement getElement() {
+            return JSStatementWithLabelReferenceImpl.this;
+        }
+
+        @Override
+        public TextRange getRangeInElement() {
+            final int startOffsetInParent = labelNode.getStartOffsetInParent();
+            return new TextRange(startOffsetInParent, startOffsetInParent + labelNode.getTextLength());
+        }
+
+        @Override
+        @Nullable
+        public PsiElement resolve() {
+            final PsiElement[] result = new PsiElement[1];
+
+            processElements(new PsiElementProcessor<>() {
+                private final String label = getCanonicalText();
+
+                @Override
+                public boolean execute(final JSLabeledStatement element) {
+                    if (label.equals(element.getLabel())) {
+                        result[0] = element;
+                        return false;
+                    }
+                    return true;
+                }
+            });
+
+            return result[0];
+        }
+
+        @Override
+        public String getCanonicalText() {
+            return labelNode.getText();
+        }
+
+        @Override
+        public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
+            JSChangeUtil.doIdentifierReplacement(getElement(), labelNode, newElementName);
+            return getElement();
+        }
+
+        @Override
+        public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+            return null;
+        }
+
+        @Override
+        public boolean isReferenceTo(PsiElement element) {
+            return getManager().areElementsEquivalent(resolve(), element);
+        }
+
+        @Override
+        public Object[] getVariants() {
+            final List<String> labels = new ArrayList<>(1);
+            processElements(element -> {
+                labels.add(element.getLabel());
+                return true;
+            });
+            return ArrayUtil.toStringArray(labels);
+        }
+
+        private void processElements(PsiElementProcessor<JSLabeledStatement> processor) {
+            PsiElement run = getParent();
+            while (run != null) {
+                if (run instanceof JSLabeledStatement) {
+                    if (!processor.execute((JSLabeledStatement)run)) {
+                        return;
+                    }
+                }
+
+                if (run instanceof JSFunction) {
+                    break;
+                }
+                run = run.getParent();
+            }
+        }
+
+        @Override
+        public boolean isSoft() {
+            return false;
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
index cf0a52b0..e8f51204 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
@@ -38,149 +38,120 @@
  * Date: Jan 30, 2005
  * Time: 8:23:10 PM
  */
-public abstract class JSStubElementImpl<T extends StubElement> extends StubBasedPsiElementBase<T> implements JSElement
-{
-	public static Key<NavigationItem> ORIGINAL_ELEMENT = Key.create("ORIGINAL_NAMED_ELEMENT");
-
-	public JSStubElementImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	public JSStubElementImpl(final T t, IStubElementType type)
-	{
-		super(t, type);
-	}
-
-	protected abstract void accept(@Nonnull JSElementVisitor visitor);
-
-	@Override
-	public final void accept(@Nonnull PsiElementVisitor visitor)
-	{
-		if(visitor instanceof JSElementVisitor)
-		{
-			accept((JSElementVisitor)visitor);
-		}
-		else
-		{
-			super.accept(visitor);
-		}
-	}
-
-	public SearchScope getDefaultUseScope()
-	{
-		return super.getUseScope();
-	}
-
-	@Override
-	public ItemPresentation getPresentation()
-	{
-		if(this instanceof JSNamedElement)
-		{
-			final NavigationItem element = getUserData(ORIGINAL_ELEMENT);
-			if(element == null)
-			{
-				return new JSItemPresentation((JSNamedElement) this);
-			}
-			return element.getPresentation();
-		}
-		return null;
-	}
-
-	@Override
-	public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(element))
-		{
-			if(JSChangeUtil.isStatementContainer(this))
-			{
-				return JSChangeUtil.doAddBefore(this, element, anchor);
-			}
-			else if(JSChangeUtil.isBlockStatementContainer(this) && anchor != null)
-			{
-				return JSChangeUtil.blockDoAddBefore(element, anchor);
-			}
-		}
-
-		return super.addBefore(element, anchor);
-	}
-
-	@Override
-	public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(element))
-		{
-			if(JSChangeUtil.isStatementContainer(this))
-			{
-				return JSChangeUtil.doAddAfter(this, element, anchor);
-			}
-			else if(JSChangeUtil.isBlockStatementContainer(this) && anchor != null)
-			{
-				return JSChangeUtil.blockDoAddAfter(element, anchor);
-			}
-		}
-		return super.addAfter(element, anchor);
-	}
-
-	@Override
-	public PsiElement addRangeBefore(@Nonnull PsiElement first, @Nonnull PsiElement last, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(first))
-		{
-			if(JSChangeUtil.isStatementContainer(this))
-			{
-				return JSChangeUtil.doAddRangeBefore(this, first, last, anchor);
-			}
-			else if(JSChangeUtil.isBlockStatementContainer(this) && anchor != null)
-			{
-				return JSChangeUtil.blockDoAddRangeBefore(first, last, anchor);
-			}
-		}
-		return super.addRangeBefore(first, last, anchor);
-	}
-
-	@Override
-	public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(JSChangeUtil.isStatementOrComment(first))
-		{
-			if(JSChangeUtil.isStatementContainer(this))
-			{
-				return JSChangeUtil.doAddRangeAfter(this, first, last, anchor);
-			}
-			else if(JSChangeUtil.isBlockStatementContainer(this) && anchor != null)
-			{
-				return JSChangeUtil.blockDoAddRangeAfter(first, last, anchor);
-			}
-		}
-
-		return super.addRangeAfter(first, last, anchor);
-	}
-
-	@Override
-	public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException
-	{
-		return addAfter(element, null);
-	}
-
-	@Override
-	public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOperationException
-	{
-		return addRangeAfter(first, last, null);
-	}
-
-	@Override
-	public PsiElement replace(@Nonnull PsiElement newElement) throws IncorrectOperationException
-	{
-		final ASTNode myNode = getNode();
-		final ASTNode result = newElement.getNode().copyElement();
-		myNode.getTreeParent().replaceChild(myNode, result);
-		return result.getPsi();
-	}
-
-	@Override
-	public PsiElement getParent()
-	{
-		return getParentByStub();
-	}
+public abstract class JSStubElementImpl<T extends StubElement> extends StubBasedPsiElementBase<T> implements JSElement {
+    public static Key<NavigationItem> ORIGINAL_ELEMENT = Key.create("ORIGINAL_NAMED_ELEMENT");
+
+    public JSStubElementImpl(final ASTNode node) {
+        super(node);
+    }
+
+    public JSStubElementImpl(final T t, IStubElementType type) {
+        super(t, type);
+    }
+
+    protected abstract void accept(@Nonnull JSElementVisitor visitor);
+
+    @Override
+    public final void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor elementVisitor) {
+            accept(elementVisitor);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    public SearchScope getDefaultUseScope() {
+        return super.getUseScope();
+    }
+
+    @Override
+    public ItemPresentation getPresentation() {
+        if (this instanceof JSNamedElement namedThis) {
+            final NavigationItem element = getUserData(ORIGINAL_ELEMENT);
+            if (element == null) {
+                return new JSItemPresentation(namedThis);
+            }
+            return element.getPresentation();
+        }
+        return null;
+    }
+
+    @Override
+    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(element)) {
+            if (JSChangeUtil.isStatementContainer(this)) {
+                return JSChangeUtil.doAddBefore(this, element, anchor);
+            }
+            else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
+                return JSChangeUtil.blockDoAddBefore(element, anchor);
+            }
+        }
+
+        return super.addBefore(element, anchor);
+    }
+
+    @Override
+    public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(element)) {
+            if (JSChangeUtil.isStatementContainer(this)) {
+                return JSChangeUtil.doAddAfter(this, element, anchor);
+            }
+            else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
+                return JSChangeUtil.blockDoAddAfter(element, anchor);
+            }
+        }
+        return super.addAfter(element, anchor);
+    }
+
+    @Override
+    public PsiElement addRangeBefore(@Nonnull PsiElement first, @Nonnull PsiElement last, PsiElement anchor)
+        throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(first)) {
+            if (JSChangeUtil.isStatementContainer(this)) {
+                return JSChangeUtil.doAddRangeBefore(this, first, last, anchor);
+            }
+            else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
+                return JSChangeUtil.blockDoAddRangeBefore(first, last, anchor);
+            }
+        }
+        return super.addRangeBefore(first, last, anchor);
+    }
+
+    @Override
+    public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement anchor) throws IncorrectOperationException {
+        if (JSChangeUtil.isStatementOrComment(first)) {
+            if (JSChangeUtil.isStatementContainer(this)) {
+                return JSChangeUtil.doAddRangeAfter(this, first, last, anchor);
+            }
+            else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
+                return JSChangeUtil.blockDoAddRangeAfter(first, last, anchor);
+            }
+        }
+
+        return super.addRangeAfter(first, last, anchor);
+    }
+
+    @Override
+    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
+        return addAfter(element, null);
+    }
+
+    @Override
+    public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOperationException {
+        return addRangeAfter(first, last, null);
+    }
+
+    @Override
+    public PsiElement replace(@Nonnull PsiElement newElement) throws IncorrectOperationException {
+        final ASTNode myNode = getNode();
+        final ASTNode result = newElement.getNode().copyElement();
+        myNode.getTreeParent().replaceChild(myNode, result);
+        return result.getPsi();
+    }
+
+    @Override
+    public PsiElement getParent() {
+        return getParentByStub();
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
index feb03299..66805e1f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.psi.JSSuppressionHolder;
 import com.intellij.lang.javascript.types.JSFileElementType;
 import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.psi.stub.IStubElementType;
 import consulo.language.psi.stub.StubElement;
@@ -29,72 +30,61 @@
 /**
  * @author ven
  */
-abstract class JSStubbedStatementImpl<T extends StubElement> extends JSStubElementImpl<T> implements JSStatement, JSSuppressionHolder
-{
-	JSStubbedStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+abstract class JSStubbedStatementImpl<T extends StubElement> extends JSStubElementImpl<T> implements JSStatement, JSSuppressionHolder {
+    JSStubbedStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	JSStubbedStatementImpl(final T t, IStubElementType type)
-	{
-		super(t, type);
-	}
+    JSStubbedStatementImpl(final T t, IStubElementType type) {
+        super(t, type);
+    }
 
-	@Override
-	public JSStatement addStatementBefore(JSStatement toAdd) throws IncorrectOperationException
-	{
-		return addStatementImpl(toAdd, true);
-	}
+    @Override
+    public JSStatement addStatementBefore(JSStatement toAdd) throws IncorrectOperationException {
+        return addStatementImpl(toAdd, true);
+    }
 
-	@Override
-	public JSStatement addStatementAfter(JSStatement toAdd) throws IncorrectOperationException
-	{
-		return addStatementImpl(toAdd, false);
-	}
+    @Override
+    public JSStatement addStatementAfter(JSStatement toAdd) throws IncorrectOperationException {
+        return addStatementImpl(toAdd, false);
+    }
 
-	//TODO: [lesya] the formatter stuff definitely needs more intelligence
-	private JSStatement addStatementImpl(final JSStatement toAdd, final boolean before) throws IncorrectOperationException
-	{
-		final ASTNode treeParent = getNode().getTreeParent();
+    //TODO: [lesya] the formatter stuff definitely needs more intelligence
+    private JSStatement addStatementImpl(final JSStatement toAdd, final boolean before) throws IncorrectOperationException {
+        final ASTNode treeParent = getNode().getTreeParent();
 
-		if(treeParent.getElementType() != JSElementTypes.BLOCK_STATEMENT &&
-				!(treeParent.getElementType() instanceof JSFileElementType) &&
-				treeParent.getElementType() != JSElementTypes.CLASS &&
-				treeParent.getElementType() != JSElementTypes.EMBEDDED_CONTENT)
-		{
-			if(before)
-			{
-				return (JSStatement) treeParent.getPsi().addBefore(toAdd, this);
-			}
-			else
-			{
-				return (JSStatement) treeParent.getPsi().addAfter(toAdd, this);
-			}
-		}
-		else
-		{
-			final ASTNode copy = toAdd.getNode().copyElement();
-			addChildAndReformat(treeParent, copy, before ? getNode() : getNode().getTreeNext());
-			return (JSStatement) copy.getPsi();
-		}
-	}
+        IElementType elementType = treeParent.getElementType();
+        if (elementType != JSElementTypes.BLOCK_STATEMENT
+            && !(elementType instanceof JSFileElementType)
+            && elementType != JSElementTypes.CLASS
+            && elementType != JSElementTypes.EMBEDDED_CONTENT) {
+            if (before) {
+                return (JSStatement)treeParent.getPsi().addBefore(toAdd, this);
+            }
+            else {
+                return (JSStatement)treeParent.getPsi().addAfter(toAdd, this);
+            }
+        }
+        else {
+            final ASTNode copy = toAdd.getNode().copyElement();
+            addChildAndReformat(treeParent, copy, before ? getNode() : getNode().getTreeNext());
+            return (JSStatement)copy.getPsi();
+        }
+    }
 
-	private void addChildAndReformat(final ASTNode block, final ASTNode addedElement, final ASTNode anchorBefore) throws IncorrectOperationException
-	{
-		block.addChild(addedElement, anchorBefore);
-		CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(block, addedElement);
-	}
+    private void addChildAndReformat(final ASTNode block, final ASTNode addedElement, final ASTNode anchorBefore)
+        throws IncorrectOperationException {
+        block.addChild(addedElement, anchorBefore);
+        CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(block, addedElement);
+    }
 
-	@Override
-	public JSStatement replace(JSStatement newStatement)
-	{
-		return JSChangeUtil.replaceStatement(this, newStatement);
-	}
+    @Override
+    public JSStatement replace(JSStatement newStatement) {
+        return JSChangeUtil.replaceStatement(this, newStatement);
+    }
 
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		getNode().getTreeParent().removeChild(getNode());
-	}
+    @Override
+    public void delete() throws IncorrectOperationException {
+        getNode().getTreeParent().removeChild(getNode());
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
index cb5d6b5f..f5651132 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
@@ -38,130 +38,107 @@
  * Date: Jan 30, 2005
  * Time: 11:24:42 PM
  */
-public class JSSuperExpressionImpl extends JSExpressionImpl implements JSSuperExpression
-{
-	public JSSuperExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSSuperExpression(this);
-	}
-
-	@Override
-	public PsiReference getReference()
-	{
-		return getReferences()[0];
-	}
-
-	@Override
-	@Nonnull
-	public PsiReference[] getReferences()
-	{
-		PsiReference[] refs = {
-				new PsiReference()
-				{
-					@Override
-					public PsiElement getElement()
-					{
-						return JSSuperExpressionImpl.this;
-					}
-
-					@Override
-					public TextRange getRangeInElement()
-					{
-						return new TextRange(0, getTextLength());
-					}
-
-					@Override
-					@Nullable
-					public PsiElement resolve()
-					{
-						final PsiElement element = findClass();
-
-						if(getElement().getParent() instanceof JSCallExpression && element instanceof JSClass)
-						{
-							final JSClass clazz = (JSClass) element;
-							final ResolveProcessor processor = new ResolveProcessor(clazz.getName(), JSSuperExpressionImpl.this);
-							element.processDeclarations(processor, ResolveState.initial(), clazz, getElement());
-							if(processor.getResult() != null)
-							{
-								return processor.getResult();
-							}
-						}
-
-						return element;
-					}
-
-					private PsiElement findClass()
-					{
-						final JSClass jsClass = PsiTreeUtil.getParentOfType(getElement(), JSClass.class);
-
-						if(jsClass != null)
-						{
-							final JSReferenceList extendsList = jsClass.getExtendsList();
-							if(extendsList != null)
-							{
-								final JSReferenceExpression[] referenceExpressions = extendsList.getExpressions();
-								if(referenceExpressions != null && referenceExpressions.length > 0)
-								{
-									final ResolveResult[] results = referenceExpressions[0].multiResolve(false);
-									return results.length > 0 ? results[0].getElement() : null;
-								}
-							}
-						}
-						else
-						{
-							final JSFile jsFile = PsiTreeUtil.getParentOfType(getElement(), JSFile.class);
-
-							if(jsFile != null)
-							{
-								return JSResolveUtil.getClassReferenceForXmlFromContext(jsFile);
-							}
-						}
-						return null;
-					}
-
-					@Override
-					public String getCanonicalText()
-					{
-						return getText();
-					}
-
-					@Override
-					public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException
-					{
-						return null;
-					}
-
-					@Override
-					public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException
-					{
-						return null;
-					}
-
-					@Override
-					public boolean isReferenceTo(final PsiElement element)
-					{
-						return false;
-					}
-
-					@Override
-					public Object[] getVariants()
-					{
-						return ArrayUtil.EMPTY_OBJECT_ARRAY;
-					}
-
-					@Override
-					public boolean isSoft()
-					{
-						return true;
-					}
-				}
-		};
-		return refs;
-	}
+public class JSSuperExpressionImpl extends JSExpressionImpl implements JSSuperExpression {
+    public JSSuperExpressionImpl(final ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSSuperExpression(this);
+    }
+
+    @Override
+    public PsiReference getReference() {
+        return getReferences()[0];
+    }
+
+    @Override
+    @Nonnull
+    public PsiReference[] getReferences() {
+        PsiReference[] refs = {
+            new PsiReference() {
+                @Override
+                public PsiElement getElement() {
+                    return JSSuperExpressionImpl.this;
+                }
+
+                @Override
+                public TextRange getRangeInElement() {
+                    return new TextRange(0, getTextLength());
+                }
+
+                @Override
+                @Nullable
+                public PsiElement resolve() {
+                    final PsiElement element = findClass();
+
+                    if (getElement().getParent() instanceof JSCallExpression && element instanceof JSClass) {
+                        final JSClass clazz = (JSClass)element;
+                        final ResolveProcessor processor = new ResolveProcessor(clazz.getName(), JSSuperExpressionImpl.this);
+                        element.processDeclarations(processor, ResolveState.initial(), clazz, getElement());
+                        if (processor.getResult() != null) {
+                            return processor.getResult();
+                        }
+                    }
+
+                    return element;
+                }
+
+                private PsiElement findClass() {
+                    final JSClass jsClass = PsiTreeUtil.getParentOfType(getElement(), JSClass.class);
+
+                    if (jsClass != null) {
+                        final JSReferenceList extendsList = jsClass.getExtendsList();
+                        if (extendsList != null) {
+                            final JSReferenceExpression[] referenceExpressions = extendsList.getExpressions();
+                            if (referenceExpressions != null && referenceExpressions.length > 0) {
+                                final ResolveResult[] results = referenceExpressions[0].multiResolve(false);
+                                return results.length > 0 ? results[0].getElement() : null;
+                            }
+                        }
+                    }
+                    else {
+                        final JSFile jsFile = PsiTreeUtil.getParentOfType(getElement(), JSFile.class);
+
+                        if (jsFile != null) {
+                            return JSResolveUtil.getClassReferenceForXmlFromContext(jsFile);
+                        }
+                    }
+                    return null;
+                }
+
+                @Override
+                public String getCanonicalText() {
+                    return getText();
+                }
+
+                @Override
+                public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException {
+                    return null;
+                }
+
+                @Override
+                public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException {
+                    return null;
+                }
+
+                @Override
+                public boolean isReferenceTo(final PsiElement element) {
+                    return false;
+                }
+
+                @Override
+                public Object[] getVariants() {
+                    return ArrayUtil.EMPTY_OBJECT_ARRAY;
+                }
+
+                @Override
+                public boolean isSoft() {
+                    return true;
+                }
+            }
+        };
+        return refs;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
index 02feea3c..4591c2c4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
@@ -32,30 +32,25 @@
  * Time: 10:08:20 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSSwitchStatementImpl extends JSStatementImpl implements JSSwitchStatement
-{
-	private static final TokenSet CASE_CLAUSE_FILTER = TokenSet.create(JSElementTypes.CASE_CLAUSE);
+public class JSSwitchStatementImpl extends JSStatementImpl implements JSSwitchStatement {
+    private static final TokenSet CASE_CLAUSE_FILTER = TokenSet.create(JSElementTypes.CASE_CLAUSE);
 
-	public JSSwitchStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+    public JSSwitchStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getSwitchExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getSwitchExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	public JSCaseClause[] getCaseClauses()
-	{
-		return findChildrenByClass(JSCaseClause.class);
-	}
+    @Override
+    public JSCaseClause[] getCaseClauses() {
+        return findChildrenByClass(JSCaseClause.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSSwitchStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSSwitchStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
index 47c797af..1c7ecb31 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
@@ -29,16 +29,13 @@
  * Time: 11:24:42 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSThisExpressionImpl extends JSExpressionImpl implements JSThisExpression
-{
-	public JSThisExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSThisExpressionImpl extends JSExpressionImpl implements JSThisExpression {
+    public JSThisExpressionImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSThisExpression(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSThisExpression(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
index 8a04bf20..052cd3e3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
@@ -29,22 +29,18 @@
  * Time: 9:57:08 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSThrowStatementImpl extends JSStatementImpl implements JSThrowStatement
-{
-	public JSThrowStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSThrowStatementImpl extends JSStatementImpl implements JSThrowStatement {
+    public JSThrowStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSThrowStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSThrowStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
index 5665675a..8f997a4b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
@@ -36,77 +36,63 @@
  * Time: 9:59:44 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSTryStatementImpl extends JSStatementImpl implements JSTryStatement
-{
-	private static TokenSet ourCatchesTypeSet = TokenSet.create(JSElementTypes.CATCH_BLOCK);
+public class JSTryStatementImpl extends JSStatementImpl implements JSTryStatement {
+    private static TokenSet ourCatchesTypeSet = TokenSet.create(JSElementTypes.CATCH_BLOCK);
 
-	public JSTryStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+    public JSTryStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSStatement getStatement()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		while(child != null)
-		{
-			final IElementType type = child.getElementType();
-			if(child.getPsi() instanceof JSStatement)
-			{
-				return (JSStatement) child.getPsi();
-			}
-			if(type == JSTokenTypes.FINALLY_KEYWORD)
-			{
-				break;
-			}
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+    @Override
+    public JSStatement getStatement() {
+        ASTNode child = getNode().getFirstChildNode();
+        while (child != null) {
+            final IElementType type = child.getElementType();
+            if (child.getPsi() instanceof JSStatement) {
+                return (JSStatement)child.getPsi();
+            }
+            if (type == JSTokenTypes.FINALLY_KEYWORD) {
+                break;
+            }
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	@Nullable
-	public JSCatchBlock getCatchBlock()
-	{
-		final ASTNode catchChild = getNode().findChildByType(JSElementTypes.CATCH_BLOCK);
-		if(catchChild == null)
-		{
-			return null;
-		}
-		return (JSCatchBlock) catchChild.getPsi();
-	}
+    @Override
+    @Nullable
+    public JSCatchBlock getCatchBlock() {
+        final ASTNode catchChild = getNode().findChildByType(JSElementTypes.CATCH_BLOCK);
+        if (catchChild == null) {
+            return null;
+        }
+        return (JSCatchBlock)catchChild.getPsi();
+    }
 
-	@Override
-	public JSCatchBlock[] getAllCatchBlocks()
-	{
-		return findChildrenByClass(JSCatchBlock.class);
-	}
+    @Override
+    public JSCatchBlock[] getAllCatchBlocks() {
+        return findChildrenByClass(JSCatchBlock.class);
+    }
 
-	@Override
-	public JSStatement getFinallyStatement()
-	{
-		ASTNode child = getNode().getFirstChildNode();
-		boolean foundFinally = false;
-		while(child != null)
-		{
-			final IElementType type = child.getElementType();
-			if(foundFinally && child.getPsi() instanceof JSStatement)
-			{
-				return (JSStatement) child.getPsi();
-			}
-			if(type == JSTokenTypes.FINALLY_KEYWORD)
-			{
-				foundFinally = true;
-			}
-			child = child.getTreeNext();
-		}
-		return null;
-	}
+    @Override
+    public JSStatement getFinallyStatement() {
+        ASTNode child = getNode().getFirstChildNode();
+        boolean foundFinally = false;
+        while (child != null) {
+            final IElementType type = child.getElementType();
+            if (foundFinally && child.getPsi() instanceof JSStatement) {
+                return (JSStatement)child.getPsi();
+            }
+            if (type == JSTokenTypes.FINALLY_KEYWORD) {
+                foundFinally = true;
+            }
+            child = child.getTreeNext();
+        }
+        return null;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSTryStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSTryStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
index 5db9381e..a140f430 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
@@ -31,44 +31,40 @@
 /**
  * @by Maxim.Mossienko
  */
-public class JSUseNamespaceDirectiveImpl extends JSStubbedStatementImpl<JSUseNamespaceDirectiveStub> implements JSUseNamespaceDirective
-{
-	public JSUseNamespaceDirectiveImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSUseNamespaceDirectiveImpl extends JSStubbedStatementImpl<JSUseNamespaceDirectiveStub> implements JSUseNamespaceDirective {
+    public JSUseNamespaceDirectiveImpl(final ASTNode node) {
+        super(node);
+    }
 
-	public JSUseNamespaceDirectiveImpl(final JSUseNamespaceDirectiveStub stub)
-	{
-		super(stub, JSElementTypes.USE_NAMESPACE_DIRECTIVE);
-	}
+    public JSUseNamespaceDirectiveImpl(final JSUseNamespaceDirectiveStub stub) {
+        super(stub, JSElementTypes.USE_NAMESPACE_DIRECTIVE);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSUseNamespaceDirective(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSUseNamespaceDirective(this);
+    }
 
-	@Override
-	public String getNamespaceToBeUsed()
-	{
-		final JSUseNamespaceDirectiveStub stub = getStub();
-		if(stub != null)
-		{
-			return stub.getNamespaceToUse();
-		}
-		final ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
-		return node != null ? node.getText() : null;
-	}
+    @Override
+    public String getNamespaceToBeUsed() {
+        final JSUseNamespaceDirectiveStub stub = getStub();
+        if (stub != null) {
+            return stub.getNamespaceToUse();
+        }
+        final ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
+        return node != null ? node.getText() : null;
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-									   @Nonnull PsiElement place)
-	{
-		if(processor instanceof ResolveProcessor && ((ResolveProcessor) processor).lookingForUseNamespaces())
-		{
-			return processor.execute(this, state);
-		}
-		return true;
-	}
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+		@Nonnull ResolveState state,
+		PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        if (processor instanceof ResolveProcessor resolveProcessor && resolveProcessor.lookingForUseNamespaces()) {
+            return processor.execute(this, state);
+        }
+        return true;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
index 2954b238..0ddd589f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
@@ -35,68 +35,60 @@
  * Time: 9:35:47 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSVarStatementImpl extends JSStubbedStatementImpl<JSVarStatementStub> implements JSVarStatement
-{
-	public JSVarStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSVarStatementImpl extends JSStubbedStatementImpl<JSVarStatementStub> implements JSVarStatement {
+    public JSVarStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	public JSVarStatementImpl(final JSVarStatementStub node)
-	{
-		super(node, JSElementTypes.VAR_STATEMENT);
-	}
+    public JSVarStatementImpl(final JSVarStatementStub node) {
+        super(node, JSElementTypes.VAR_STATEMENT);
+    }
 
-	@Override
-	public JSVariable[] getVariables()
-	{
-		JSDestructuringElement destructuringElement = getDestructuringElement();
-		if(destructuringElement != null)
-		{
-			return destructuringElement.getVariables();
-		}
-		return getStubOrPsiChildren(JSElementTypes.VARIABLE, JSVariable.EMPTY_ARRAY);
-	}
+    @Override
+    public JSVariable[] getVariables() {
+        JSDestructuringElement destructuringElement = getDestructuringElement();
+        if (destructuringElement != null) {
+            return destructuringElement.getVariables();
+        }
+        return getStubOrPsiChildren(JSElementTypes.VARIABLE, JSVariable.EMPTY_ARRAY);
+    }
 
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public JSDestructuringElement getDestructuringElement()
-	{
-		return findChildByClass(JSDestructuringElement.class);
-	}
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSDestructuringElement getDestructuringElement() {
+        return findChildByClass(JSDestructuringElement.class);
+    }
 
-	@Override
-	public void declareVariable(String name, JSExpression initializer)
-	{
-		throw new UnsupportedOperationException("TODO: implement");
-	}
+    @Override
+    public void declareVariable(String name, JSExpression initializer) {
+        throw new UnsupportedOperationException("TODO: implement");
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSVarStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSVarStatement(this);
+    }
 
-	@Override
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent,
-									   @Nonnull PsiElement place)
-	{
-		final JSVariable[] vars = getVariables();
+    @Override
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        final JSVariable[] vars = getVariables();
 
-		for(JSVariable var : vars)
-		{
-			if(lastParent != null && lastParent.getParent() == var)
-			{
-				break;
-			}
+        for (JSVariable var : vars) {
+            if (lastParent != null && lastParent.getParent() == var) {
+                break;
+            }
 
-			if(!processor.execute(var, state))
-			{
-				return false;
-			}
-		}
+            if (!processor.execute(var, state)) {
+                return false;
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index b25cc8d9..a11e06da 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -46,275 +46,231 @@
  * Time: 8:47:58 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSVariableBaseImpl<T extends JSVariableStubBase<T2>, T2 extends JSVariable> extends JSStubElementImpl<T> implements JSVariable
-{
-	protected JSVariableBaseImpl(ASTNode node)
-	{
-		super(node);
-	}
-
-	protected JSVariableBaseImpl(final T stub, final JSStubElementType<T, T2> elementType)
-	{
-		super(stub, elementType);
-	}
-
-	@Override
-	public boolean hasInitializer()
-	{
-		return getInitializerText() != null;
-	}
-
-	@RequiredReadAction
-	@Override
-	public JSExpression getInitializer()
-	{
-		PsiElement element = findChildByType(JSTokenTypes.EQ);
-		if(element == null)
-		{
-			return null;
-		}
-
-		while((element = element.getNextSibling()) != null)
-		{
-			if(element instanceof JSExpression)
-			{
-				return (JSExpression) element;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public String getInitializerText()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.getInitializerText();
-		}
-
-		final JSExpression expression = getInitializer();
-		return expression != null ? expression.getText() : null;
-	}
-
-	@Override
-	@Nonnull
-	public SearchScope getUseScope()
-	{
-		return JSResolveUtil.findUseScope(this);
-	}
-
-	@Override
-	public String getName()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.getName();
-		}
-		final PsiElement name = getNameIdentifier();
-
-		if(name != null)
-		{
-			if(name instanceof JSReferenceExpression)
-			{
-				return ((JSReferenceExpression) name).getReferencedName();
-			}
-		}
-		return name != null ? name.getText() : "";
-	}
-
-	@Override
-	public JSAttributeList getAttributeList()
-	{
-		PsiElement parent = getParent();
-		if(!(parent instanceof JSVarStatement))
-		{
-			return null;
-		}
-		return ((JSVarStatementImpl) getParent()).getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
-	}
-
-	@Override
-	public void setInitializer(JSExpression expr) throws IncorrectOperationException
-	{
-		throw new UnsupportedOperationException("TODO: implement");
-	}
-
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		final JSExpression initializer = getInitializer();
-		if(initializer != null)
-		{
-			JavaScriptType javaScriptType = RecursionManager.doPreventingRecursion(this, false, new Computable<JavaScriptType>()
-			{
-				@Override
-				@RequiredReadAction
-				public JavaScriptType compute()
-				{
-					return initializer.getType();
-				}
-			});
-			return javaScriptType == null ? JavaScriptType.UNKNOWN : javaScriptType;
-		}
-		return JavaScriptType.UNKNOWN;
-	}
-
-	@Override
-	public String getTypeString()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.getTypeString();
-		}
-		return doGetType();
-	}
-
-	@RequiredReadAction
-	@Override
-	public JavaScriptTypeElement getTypeElement()
-	{
-		return JSPsiImplUtils.findTypeElement(this);
-	}
-
-	protected String doGetType()
-	{
-		return JSPsiImplUtils.getType(this);
-	}
-
-	@Override
-	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
-	{
-		final PsiElement nameNode = getNameIdentifier();
-		if(nameNode == null)
-		{
-			return this;
-		}
-		final ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), name);
-		getNode().replaceChild(nameNode.getNode(), nameElement);
-		return this;
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSVariable(this);
-	}
-
-	@RequiredReadAction
-	@Override
-	public int getTextOffset()
-	{
-		final PsiElement name = getNameIdentifier();
-		return name != null ? name.getTextOffset() : super.getTextOffset();
-	}
-
-	@Override
-	public boolean isConst()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.isConst();
-		}
-		final ASTNode parent = getNode().getTreeParent();
-
-		if(parent.getElementType() == JSElementTypes.VAR_STATEMENT)
-		{
-			ASTNode node = parent.getFirstChildNode();
-			IElementType type = node.getElementType();
-
-			if(type == JSElementTypes.ATTRIBUTE_LIST || type == JSElementTypes.REFERENCE_EXPRESSION)
-			{
-				node = node.getTreeNext();
-
-				if(node != null && node.getElementType() == JSTokenTypes.WHITE_SPACE)
-				{
-					node = node.getTreeNext();
-				}
-			}
-			return node != null && node.getElementType() == JSTokenTypes.CONST_KEYWORD;
-		}
-
-		return false;
-	}
-
-	@Override
-	public boolean isLocal()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.isLocal();
-		}
-		final ASTNode parent = getNode().getTreeParent();
-		return parent.getElementType() == JSElementTypes.VAR_STATEMENT && parent.getFirstChildNode().getElementType() == JSTokenTypes.LET_KEYWORD;
-	}
-
-	@Override
-	public boolean isDeprecated()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.isDeprecated();
-		}
-		return JSDocumentationUtils.calculateDeprecated(this);
-	}
-
-	@Override
-	public void delete() throws IncorrectOperationException
-	{
-		final ASTNode myNode = getNode();
-		final ASTNode parent = myNode.getTreeParent();
-
-		if(parent.getElementType() == JSElementTypes.VAR_STATEMENT)
-		{
-			final JSVariable[] jsVariables = ((JSVarStatement) parent.getPsi()).getVariables();
-
-			if(jsVariables.length == 1)
-			{
-				parent.getPsi().delete();
-			}
-			else
-			{
-				JSChangeUtil.removeRangeWithRemovalOfCommas(myNode, parent);
-			}
-			return;
-		}
-
-		throw new IncorrectOperationException("Cannot delete variable from parent : " + parent.getElementType());
-	}
-
-	@Override
-	public boolean processDeclarations(@Nonnull final PsiScopeProcessor processor, @Nonnull final ResolveState state, final PsiElement lastParent,
-									   @Nonnull final PsiElement place)
-	{
-		if(lastParent != null && lastParent.getParent() == this)
-		{
-			processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
-		}
-		return processor.execute(this, state);
-	}
-
-	@Override
-	public String getQualifiedName()
-	{
-		final T stub = getStub();
-		if(stub != null)
-		{
-			return stub.getQualifiedName();
-		}
-		return JSPsiImplUtils.getQName(this);
-	}
-
-	@Override
-	@RequiredReadAction
-	public PsiElement getNameIdentifier()
-	{
-		return findChildByType(JavaScriptTokenSets.NAME_TOKEN_TYPES);
-	}
+public class JSVariableBaseImpl<T extends JSVariableStubBase<T2>, T2 extends JSVariable>
+    extends JSStubElementImpl<T> implements JSVariable {
+    protected JSVariableBaseImpl(ASTNode node) {
+        super(node);
+    }
+
+    protected JSVariableBaseImpl(final T stub, final JSStubElementType<T, T2> elementType) {
+        super(stub, elementType);
+    }
+
+    @Override
+    public boolean hasInitializer() {
+        return getInitializerText() != null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSExpression getInitializer() {
+        PsiElement element = findChildByType(JSTokenTypes.EQ);
+        if (element == null) {
+            return null;
+        }
+
+        while ((element = element.getNextSibling()) != null) {
+            if (element instanceof JSExpression expression) {
+                return expression;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getInitializerText() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.getInitializerText();
+        }
+
+        final JSExpression expression = getInitializer();
+        return expression != null ? expression.getText() : null;
+    }
+
+    @Override
+    @Nonnull
+    public SearchScope getUseScope() {
+        return JSResolveUtil.findUseScope(this);
+    }
+
+    @Override
+    public String getName() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.getName();
+        }
+        final PsiElement name = getNameIdentifier();
+
+        if (name instanceof JSReferenceExpression referenceExpression) {
+            return referenceExpression.getReferencedName();
+        }
+        return name != null ? name.getText() : "";
+    }
+
+    @Override
+    public JSAttributeList getAttributeList() {
+        PsiElement parent = getParent();
+        if (!(parent instanceof JSVarStatement)) {
+            return null;
+        }
+        return ((JSVarStatementImpl)getParent()).getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
+    }
+
+    @Override
+    public void setInitializer(JSExpression expr) throws IncorrectOperationException {
+        throw new UnsupportedOperationException("TODO: implement");
+    }
+
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        final JSExpression initializer = getInitializer();
+        if (initializer != null) {
+            JavaScriptType javaScriptType = RecursionManager.doPreventingRecursion(this, false, new Computable<JavaScriptType>() {
+                @Override
+                @RequiredReadAction
+                public JavaScriptType compute() {
+                    return initializer.getType();
+                }
+            });
+            return javaScriptType == null ? JavaScriptType.UNKNOWN : javaScriptType;
+        }
+        return JavaScriptType.UNKNOWN;
+    }
+
+    @Override
+    public String getTypeString() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.getTypeString();
+        }
+        return doGetType();
+    }
+
+    @RequiredReadAction
+    @Override
+    public JavaScriptTypeElement getTypeElement() {
+        return JSPsiImplUtils.findTypeElement(this);
+    }
+
+    protected String doGetType() {
+        return JSPsiImplUtils.getType(this);
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+        final PsiElement nameNode = getNameIdentifier();
+        if (nameNode == null) {
+            return this;
+        }
+        final ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), name);
+        getNode().replaceChild(nameNode.getNode(), nameElement);
+        return this;
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSVariable(this);
+    }
+
+    @RequiredReadAction
+    @Override
+    public int getTextOffset() {
+        final PsiElement name = getNameIdentifier();
+        return name != null ? name.getTextOffset() : super.getTextOffset();
+    }
+
+    @Override
+    public boolean isConst() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.isConst();
+        }
+        final ASTNode parent = getNode().getTreeParent();
+
+        if (parent.getElementType() == JSElementTypes.VAR_STATEMENT) {
+            ASTNode node = parent.getFirstChildNode();
+            IElementType type = node.getElementType();
+
+            if (type == JSElementTypes.ATTRIBUTE_LIST || type == JSElementTypes.REFERENCE_EXPRESSION) {
+                node = node.getTreeNext();
+
+                if (node != null && node.getElementType() == JSTokenTypes.WHITE_SPACE) {
+                    node = node.getTreeNext();
+                }
+            }
+            return node != null && node.getElementType() == JSTokenTypes.CONST_KEYWORD;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean isLocal() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.isLocal();
+        }
+        final ASTNode parent = getNode().getTreeParent();
+        return parent.getElementType() == JSElementTypes.VAR_STATEMENT
+            && parent.getFirstChildNode().getElementType() == JSTokenTypes.LET_KEYWORD;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.isDeprecated();
+        }
+        return JSDocumentationUtils.calculateDeprecated(this);
+    }
+
+    @Override
+    public void delete() throws IncorrectOperationException {
+        final ASTNode myNode = getNode();
+        final ASTNode parent = myNode.getTreeParent();
+
+        if (parent.getElementType() == JSElementTypes.VAR_STATEMENT) {
+            final JSVariable[] jsVariables = ((JSVarStatement)parent.getPsi()).getVariables();
+
+            if (jsVariables.length == 1) {
+                parent.getPsi().delete();
+            }
+            else {
+                JSChangeUtil.removeRangeWithRemovalOfCommas(myNode, parent);
+            }
+            return;
+        }
+
+        throw new IncorrectOperationException("Cannot delete variable from parent : " + parent.getElementType());
+    }
+
+    @Override
+    public boolean processDeclarations(
+        @Nonnull final PsiScopeProcessor processor,
+        @Nonnull final ResolveState state,
+        final PsiElement lastParent,
+        @Nonnull final PsiElement place
+    ) {
+        if (lastParent != null && lastParent.getParent() == this) {
+            processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
+        }
+        return processor.execute(this, state);
+    }
+
+    @Override
+    public String getQualifiedName() {
+        final T stub = getStub();
+        if (stub != null) {
+            return stub.getQualifiedName();
+        }
+        return JSPsiImplUtils.getQName(this);
+    }
+
+    @Override
+    @RequiredReadAction
+    public PsiElement getNameIdentifier() {
+        return findChildByType(JavaScriptTokenSets.NAME_TOKEN_TYPES);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
index f4178b12..ba78ab6f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
@@ -33,44 +33,36 @@
  * Time: 8:47:58 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSVariableImpl extends JSVariableBaseImpl<JSVariableStub, JSVariable>
-{
-	public JSVariableImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSVariableImpl extends JSVariableBaseImpl<JSVariableStub, JSVariable> {
+    public JSVariableImpl(final ASTNode node) {
+        super(node);
+    }
 
-	public JSVariableImpl(final JSVariableStub stub)
-	{
-		super(stub, JSElementTypes.VARIABLE);
-	}
+    public JSVariableImpl(final JSVariableStub stub) {
+        super(stub, JSElementTypes.VARIABLE);
+    }
 
-	@Override
-	public PsiElement getNavigationElement()
-	{
-		PsiElement parent = getParent().getParent();
-		if(parent instanceof JSClass)
-		{
-			PsiElement parentOriginalElement = parent.getNavigationElement();
+    @Override
+    public PsiElement getNavigationElement() {
+        PsiElement parent = getParent().getParent();
+        if (parent instanceof JSClass) {
+            PsiElement parentOriginalElement = parent.getNavigationElement();
 
-			if(parentOriginalElement != parent)
-			{
-				JSVariable jsVariable = ((JSClass) parentOriginalElement).findFieldByName(getName());
-				return jsVariable != null ? jsVariable : this;
-			}
-		}
-		return JSPsiImplUtils.findTopLevelNavigatableElement(this);
-	}
+            if (parentOriginalElement != parent) {
+                JSVariable jsVariable = ((JSClass)parentOriginalElement).findFieldByName(getName());
+                return jsVariable != null ? jsVariable : this;
+            }
+        }
+        return JSPsiImplUtils.findTopLevelNavigatableElement(this);
+    }
 
-	@Override
-	public PsiElement setName(@Nonnull String name) throws IncorrectOperationException
-	{
-		String oldName = getName();
-		PsiElement element = super.setName(name);
-		if(getParent().getParent() instanceof JSPackageStatement)
-		{
-			JSPsiImplUtils.updateFileName(this, name, oldName);
-		}
-		return element;
-	}
+    @Override
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+        String oldName = getName();
+        PsiElement element = super.setName(name);
+        if (getParent().getParent() instanceof JSPackageStatement) {
+            JSPsiImplUtils.updateFileName(this, name, oldName);
+        }
+        return element;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
index 53fe7c50..8634f9e5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
@@ -29,28 +29,23 @@
  * Date: Jan 30, 2005
  * Time: 10:15:13 PM
  */
-public class JSWhileStatementImpl extends JSStatementImpl implements JSWhileStatement
-{
-	public JSWhileStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSWhileStatementImpl extends JSStatementImpl implements JSWhileStatement {
+    public JSWhileStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getCondition()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getCondition() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	public JSStatement getBody()
-	{
-		return findChildByClass(JSStatement.class);
-	}
+    @Override
+    public JSStatement getBody() {
+        return findChildByClass(JSStatement.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSWhileStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSWhileStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
index 097540df..97271ecc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
@@ -30,28 +30,23 @@
  * Time: 9:54:56 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSWithStatementImpl extends JSStatementImpl implements JSWithStatement
-{
-	public JSWithStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSWithStatementImpl extends JSStatementImpl implements JSWithStatement {
+    public JSWithStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	public JSStatement getStatement()
-	{
-		return findChildByClass(JSStatement.class);
-	}
+    @Override
+    public JSStatement getStatement() {
+        return findChildByClass(JSStatement.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSWithStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSWithStatement(this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 4e436105..f9c7ecff 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -36,6 +36,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -44,345 +45,298 @@
 /**
  * @since Maxim.Mossienko
  */
-public class JSXmlLiteralExpressionImpl extends JSExpressionImpl implements JSLiteralExpression, XmlTag
-{
-	private static class LightXmlValue extends LightElement implements XmlTagValue
-	{
-		protected LightXmlValue(PsiManager manager, Language language)
-		{
-			super(manager, language);
-		}
-
-		@Override
-		public TextRange getTextRange()
-		{
-			return TextRange.EMPTY_RANGE;
-		}
-
-		@Nonnull
-		@Override
-		public XmlTagChild[] getChildren()
-		{
-			return XmlTagChild.EMPTY_ARRAY;
-		}
-
-		@Override
-		public String toString()
-		{
-			return null;
-		}
-
-		@Override
-		public int getTextOffset()
-		{
-			return 0;
-		}
-
-		@Nonnull
-		@Override
-		public XmlText[] getTextElements()
-		{
-			return new XmlText[0];
-		}
-
-		@Nonnull
-		@Override
-		public String getTrimmedText()
-		{
-			return "";
-		}
-
-		@Override
-		public void setText(String s)
-		{
-
-		}
-
-		@Override
-		public void setEscapedText(String s)
-		{
-
-		}
-
-		@Override
-		public boolean hasCDATA()
-		{
-			return false;
-		}
-	}
-
-	public JSXmlLiteralExpressionImpl(final ASTNode node)
-	{
-		super(node);
-	}
-
-	@Nonnull
-	@Override
-	public PsiReference[] getReferences()
-	{
-		return ReferenceProvidersRegistry.getReferencesFromProviders(this);
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public PsiElement[] getChildren()
-	{
-		PsiElement psiChild = getFirstChild();
-		if(psiChild == null)
-		{
-			return PsiElement.EMPTY_ARRAY;
-		}
-
-		List<PsiElement> result = new ArrayList<>();
-		while(psiChild != null)
-		{
-			result.add(psiChild);
-
-			psiChild = psiChild.getNextSibling();
-		}
-		return PsiUtilCore.toPsiElementArray(result);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
-
-	@Override
-	@RequiredReadAction
-	public String getName()
-	{
-		PsiElement childByType = findChildByType(JSTokenTypes.XML_NAME);
-		return childByType != null ? childByType.getText() : "";
-	}
-
-	@RequiredWriteAction
-	@Override
-	public PsiElement setName(@Nonnull @NonNls String s) throws IncorrectOperationException
-	{
-		return null;
-	}
-
-	@Nonnull
-	@Override
-	public String getNamespace()
-	{
-		return "";
-	}
-
-	@Nonnull
-	@Override
-	public String getLocalName()
-	{
-		return getName();
-	}
-
-	@Nullable
-	@Override
-	public XmlElementDescriptor getDescriptor()
-	{
-		return null;
-	}
-
-	@Nonnull
-	@Override
-	public XmlAttribute[] getAttributes()
-	{
-		return new XmlAttribute[0];
-	}
-
-	@Nullable
-	@Override
-	public XmlAttribute getAttribute(@NonNls String name, @NonNls String namespace)
-	{
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public XmlAttribute getAttribute(@NonNls String qname)
-	{
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public String getAttributeValue(@NonNls String name, @NonNls String namespace)
-	{
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public String getAttributeValue(@NonNls String qname)
-	{
-		return null;
-	}
-
-	@Override
-	public XmlAttribute setAttribute(@NonNls String name, @NonNls String namespace, @NonNls String value) throws IncorrectOperationException
-	{
-		return null;
-	}
-
-	@Override
-	public XmlAttribute setAttribute(@NonNls String qname, @NonNls String value) throws IncorrectOperationException
-	{
-		return null;
-	}
-
-	@Override
-	public XmlTag createChildTag(@NonNls String localName, @NonNls String namespace, @Nullable @NonNls String bodyText, boolean enforceNamespacesDeep)
-	{
-		return null;
-	}
-
-	@Override
-	public XmlTag addSubTag(XmlTag subTag, boolean first)
-	{
-		return null;
-	}
-
-	@Nonnull
-	@Override
-	public XmlTag[] getSubTags()
-	{
-		return new XmlTag[0];
-	}
-
-	@Nonnull
-	@Override
-	public XmlTag[] findSubTags(@NonNls String qname)
-	{
-		return new XmlTag[0];
-	}
-
-	@Nonnull
-	@Override
-	public XmlTag[] findSubTags(@NonNls String localName, @Nullable String namespace)
-	{
-		return new XmlTag[0];
-	}
-
-	@Nullable
-	@Override
-	public XmlTag findFirstSubTag(@NonNls String qname)
-	{
-		return null;
-	}
-
-	@Nonnull
-	@Override
-	public String getNamespacePrefix()
-	{
-		return "";
-	}
-
-	@Nonnull
-	@Override
-	public String getNamespaceByPrefix(@NonNls String prefix)
-	{
-		return "";
-	}
-
-	@Nullable
-	@Override
-	public String getPrefixByNamespace(@NonNls String namespace)
-	{
-		return null;
-	}
-
-	@Override
-	public String[] knownNamespaces()
-	{
-		return new String[0];
-	}
-
-	@Override
-	public boolean hasNamespaceDeclarations()
-	{
-		return false;
-	}
-
-	@Nonnull
-	@Override
-	public Map<String, String> getLocalNamespaceDeclarations()
-	{
-		return Collections.emptyMap();
-	}
-
-	@RequiredReadAction
-	@Override
-	public int getTextOffset()
-	{
-		return 0;
-	}
-
-	@Nonnull
-	@Override
-	public XmlTagValue getValue()
-	{
-		return new LightXmlValue(getManager(), getLanguage());
-	}
-
-	@Nullable
-	@Override
-	public XmlNSDescriptor getNSDescriptor(@NonNls String namespace, boolean strict)
-	{
-		return null;
-	}
-
-	@Override
-	public boolean isEmpty()
-	{
-		return true;
-	}
-
-	@Override
-	public void collapseIfEmpty()
-	{
-
-	}
-
-	@Nullable
-	@Override
-	public String getSubTagText(@NonNls String qname)
-	{
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public PsiMetaData getMetaData()
-	{
-		return null;
-	}
-
-	@Override
-	public XmlTag getParentTag()
-	{
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public XmlTagChild getNextSiblingInTag()
-	{
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public XmlTagChild getPrevSiblingInTag()
-	{
-		return null;
-	}
-
-	@Override
-	public boolean processElements(PsiElementProcessor processor, PsiElement place)
-	{
-		return false;
-	}
+public class JSXmlLiteralExpressionImpl extends JSExpressionImpl implements JSLiteralExpression, XmlTag {
+    private static class LightXmlValue extends LightElement implements XmlTagValue {
+        protected LightXmlValue(PsiManager manager, Language language) {
+            super(manager, language);
+        }
+
+        @Override
+        public TextRange getTextRange() {
+            return TextRange.EMPTY_RANGE;
+        }
+
+        @Nonnull
+        @Override
+        public XmlTagChild[] getChildren() {
+            return XmlTagChild.EMPTY_ARRAY;
+        }
+
+        @Override
+        public String toString() {
+            return null;
+        }
+
+        @Override
+        public int getTextOffset() {
+            return 0;
+        }
+
+        @Nonnull
+        @Override
+        public XmlText[] getTextElements() {
+            return new XmlText[0];
+        }
+
+        @Nonnull
+        @Override
+        public String getTrimmedText() {
+            return "";
+        }
+
+        @Override
+        public void setText(String s) {
+
+        }
+
+        @Override
+        public void setEscapedText(String s) {
+
+        }
+
+        @Override
+        public boolean hasCDATA() {
+            return false;
+        }
+    }
+
+    public JSXmlLiteralExpressionImpl(final ASTNode node) {
+        super(node);
+    }
+
+    @Nonnull
+    @Override
+    public PsiReference[] getReferences() {
+        return ReferenceProvidersRegistry.getReferencesFromProviders(this);
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public PsiElement[] getChildren() {
+        PsiElement psiChild = getFirstChild();
+        if (psiChild == null) {
+            return PsiElement.EMPTY_ARRAY;
+        }
+
+        List<PsiElement> result = new ArrayList<>();
+        while (psiChild != null) {
+            result.add(psiChild);
+
+            psiChild = psiChild.getNextSibling();
+        }
+        return PsiUtilCore.toPsiElementArray(result);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
+
+    @Override
+    @RequiredReadAction
+    public String getName() {
+        PsiElement childByType = findChildByType(JSTokenTypes.XML_NAME);
+        return childByType != null ? childByType.getText() : "";
+    }
+
+    @RequiredWriteAction
+    @Override
+    public PsiElement setName(@Nonnull @NonNls String s) throws IncorrectOperationException {
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public String getNamespace() {
+        return "";
+    }
+
+    @Nonnull
+    @Override
+    public String getLocalName() {
+        return getName();
+    }
+
+    @Nullable
+    @Override
+    public XmlElementDescriptor getDescriptor() {
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public XmlAttribute[] getAttributes() {
+        return new XmlAttribute[0];
+    }
+
+    @Nullable
+    @Override
+    public XmlAttribute getAttribute(@NonNls String name, @NonNls String namespace) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public XmlAttribute getAttribute(@NonNls String qname) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getAttributeValue(@NonNls String name, @NonNls String namespace) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getAttributeValue(@NonNls String qname) {
+        return null;
+    }
+
+    @Override
+    public XmlAttribute setAttribute(@NonNls String name, @NonNls String namespace, @NonNls String value)
+        throws IncorrectOperationException {
+        return null;
+    }
+
+    @Override
+    public XmlAttribute setAttribute(@NonNls String qname, @NonNls String value) throws IncorrectOperationException {
+        return null;
+    }
+
+    @Override
+    public XmlTag createChildTag(
+        @NonNls String localName,
+        @NonNls String namespace,
+        @Nullable @NonNls String bodyText,
+        boolean enforceNamespacesDeep
+    ) {
+        return null;
+    }
+
+    @Override
+    public XmlTag addSubTag(XmlTag subTag, boolean first) {
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public XmlTag[] getSubTags() {
+        return new XmlTag[0];
+    }
+
+    @Nonnull
+    @Override
+    public XmlTag[] findSubTags(@NonNls String qname) {
+        return new XmlTag[0];
+    }
+
+    @Nonnull
+    @Override
+    public XmlTag[] findSubTags(@NonNls String localName, @Nullable String namespace) {
+        return new XmlTag[0];
+    }
+
+    @Nullable
+    @Override
+    public XmlTag findFirstSubTag(@NonNls String qname) {
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public String getNamespacePrefix() {
+        return "";
+    }
+
+    @Nonnull
+    @Override
+    public String getNamespaceByPrefix(@NonNls String prefix) {
+        return "";
+    }
+
+    @Nullable
+    @Override
+    public String getPrefixByNamespace(@NonNls String namespace) {
+        return null;
+    }
+
+    @Override
+    public String[] knownNamespaces() {
+        return new String[0];
+    }
+
+    @Override
+    public boolean hasNamespaceDeclarations() {
+        return false;
+    }
+
+    @Nonnull
+    @Override
+    public Map<String, String> getLocalNamespaceDeclarations() {
+        return Collections.emptyMap();
+    }
+
+    @RequiredReadAction
+    @Override
+    public int getTextOffset() {
+        return 0;
+    }
+
+    @Nonnull
+    @Override
+    public XmlTagValue getValue() {
+        return new LightXmlValue(getManager(), getLanguage());
+    }
+
+    @Nullable
+    @Override
+    public XmlNSDescriptor getNSDescriptor(@NonNls String namespace, boolean strict) {
+        return null;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return true;
+    }
+
+    @Override
+    public void collapseIfEmpty() {
+
+    }
+
+    @Nullable
+    @Override
+    public String getSubTagText(@NonNls String qname) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public PsiMetaData getMetaData() {
+        return null;
+    }
+
+    @Override
+    public XmlTag getParentTag() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public XmlTagChild getNextSiblingInTag() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public XmlTagChild getPrevSiblingInTag() {
+        return null;
+    }
+
+    @Override
+    public boolean processElements(PsiElementProcessor processor, PsiElement place) {
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
index 49106e4e..3d631dfa 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
@@ -26,22 +26,18 @@
 /**
  * @author maxim
  */
-public class JSYieldStatementImpl extends JSStatementImpl implements JSYieldStatement
-{
-	public JSYieldStatementImpl(final ASTNode node)
-	{
-		super(node);
-	}
+public class JSYieldStatementImpl extends JSStatementImpl implements JSYieldStatement {
+    public JSYieldStatementImpl(final ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSYieldStatement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSYieldStatement(this);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
index a5726e1f..534acd84 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
@@ -47,180 +47,160 @@
  * Time: 20:48:38
  * To change this template use File | Settings | File Templates.
  */
-public class ReferenceSupport
-{
-
-	public static PsiReference[] getFileRefs(final PsiElement elt, final PsiElement valueNode, final int offset, final LookupOptions lookupOptions)
-	{
-		String str = StringUtil.stripQuotesAroundValue(valueNode.getText());
-		return getFileRefs(elt, offset, str, lookupOptions);
-	}
-
-	public static PsiReference[] getFileRefs(final PsiElement elt, final int offset, String str, final LookupOptions lookupOptions)
-	{
-
-		if(lookupOptions.IGNORE_TEXT_ARTER_HASH)
-		{
-			int hashIndex = str.indexOf('#');
-			if(hashIndex != -1)
-			{
-				str = str.substring(0, hashIndex);
-			}
-		}
-
-		final FileReferenceSet base = new FileReferenceSet(str, elt, offset, null, SystemInfo.isFileSystemCaseSensitive);
-
-		final boolean lookForAbsolutePath = lookupOptions.ABSOLUTE && new File(str).isAbsolute();
-		final boolean startsWithSlash = str.startsWith("/");
-
-		base.addCustomization(FileReferenceSet.DEFAULT_PATH_EVALUATOR_OPTION, new Function<PsiFile, Collection<PsiFileSystemItem>>()
-		{
-			@Override
-			public Collection<PsiFileSystemItem> apply(PsiFile psiFile)
-			{
-				final PsiElement context = psiFile.getContext();
-				if(context instanceof PsiLanguageInjectionHost)
-				{
-					psiFile = context.getContainingFile();
-				}
-				PsiFile originalFile = psiFile.getOriginalFile();
-				if(originalFile != null)
-				{
-					psiFile = originalFile;
-				}
-
-				final List<VirtualFile> dirs = new ArrayList<VirtualFile>();
-
-				// paths relative to file should not start with slash
-				if(lookupOptions.RELATIVE_TO_FILE && !startsWithSlash)
-				{
-					appendFileLocation(dirs, psiFile);
-				}
-
-				if((lookupOptions.RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH && startsWithSlash) || (lookupOptions.RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH
-						&& !startsWithSlash))
-				{
-					appendSourceRoots(dirs, psiFile);
-				}
-
-				if(lookForAbsolutePath)
-				{
-					appendFileSystemRoot(dirs, psiFile.getProject());
-				}
-
-				if(lookupOptions.RELATIVE_TO_PROJECT_BASE_DIR)
-				{
-					dirs.add(psiFile.getProject().getBaseDir());
-				}
-
-				if(lookupOptions.IN_SDK_AND_LIBRARY_CLASS_ROOTS)
-				{
-					appendSdkAndLibraryClassRoots(dirs, psiFile);
-				}
-
-				final Collection<PsiFileSystemItem> result = new ArrayList<PsiFileSystemItem>();
-				final PsiManager psiManager = PsiManager.getInstance(psiFile.getProject());
-				for(final VirtualFile dir : dirs)
-				{
-					if(dir != null)
-					{
-						final PsiDirectory psiDir = psiManager.findDirectory(dir);
-						if(psiDir != null)
-						{
-							result.add(psiDir);
-						}
-					}
-				}
-				return result;
-			}
-		});
-		return base.getAllReferences();
-	}
-
-	private static void appendFileLocation(final List<VirtualFile> dirs, final PsiFile psiFile)
-	{
-		final VirtualFile file = psiFile.getVirtualFile();
-		if(file != null)
-		{
-			dirs.add(file.getParent());
-		}
-	}
-
-	private static void appendSourceRoots(final Collection<VirtualFile> dirs, final PsiFile psiFile)
-	{
-		final VirtualFile file = psiFile.getVirtualFile();
-		if(file == null)
-		{
-			return;
-		}
-		final Project project = psiFile.getProject();
-		final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
-		final Module module = index.getModuleForFile(file);
-		if(module != null && index.getSourceRootForFile(file) != null)
-		{
-			dirs.addAll(Arrays.asList(ModuleRootManager.getInstance(module).getSourceRoots()));
-		}
-	}
-
-	private static void appendFileSystemRoot(final Collection<VirtualFile> dirs, final Project project)
-	{
-		final VirtualFile fileSystemRoot;
-		if(SystemInfo.isWindows)
-		{
-			fileSystemRoot = ManagingFS.getInstance().findRoot("", LocalFileSystem.getInstance());
-		}
-		else
-		{
-			fileSystemRoot = LocalFileSystem.getInstance().findFileByPath("/");
-		}
-		dirs.add(fileSystemRoot);
-	}
-
-	private static void appendSdkAndLibraryClassRoots(List<VirtualFile> dirs, PsiFile psiFile)
-	{
-		final Module module = ModuleUtilCore.findModuleForPsiElement(psiFile);
-		if(module != null)
-		{
-			final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
-			for(final OrderEntry orderEntry : orderEntries)
-			{
-				if(orderEntry instanceof OrderEntryWithTracking)
-				{
-					dirs.addAll(Arrays.asList(orderEntry.getFiles(BinariesOrderRootType.getInstance())));
-				}
-			}
-		}
-	}
-
-	public static class LookupOptions
-	{
-		// default is absolute or relative to current file
-		public static final LookupOptions DEFAULT = new LookupOptions(false, true, true, false, false, false, false);
-		public static final LookupOptions MX_STYLE_SOURCE = new LookupOptions(false, true, true, true, true, false, true);
-		public static final LookupOptions EMBEDDED_ASSET = new LookupOptions(true, true, true, true, true, false, true);
-		public static final LookupOptions NON_EMBEDDED_ASSET = new LookupOptions(false, true, false, false, true, false, false);
-		public static final LookupOptions FLEX_COMPILER_CONFIG_PATH_ELEMENT = new LookupOptions(false, true, true, false, false, true, false);
-
-		public final boolean IGNORE_TEXT_ARTER_HASH;
-		public final boolean ABSOLUTE;
-		public final boolean RELATIVE_TO_FILE;
-		public final boolean RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH;
-		public final boolean RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH;
-		public final boolean RELATIVE_TO_PROJECT_BASE_DIR; // better name would be RELATIVE_TO_FCSH_START_DIR but FlexUtils.getFlexCompilerStartDirectory
-		// () is not accessible from this class
-		public final boolean IN_SDK_AND_LIBRARY_CLASS_ROOTS;
-
-		public LookupOptions(boolean IGNORE_TEXT_ARTER_HASH, boolean ABSOLUTE, boolean RELATIVE_TO_FILE,
-				boolean RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH, boolean RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH, boolean RELATIVE_TO_PROJECT_BASE_DIR,
-				boolean IN_SDK_AND_LIBRARY_CLASS_ROOTS)
-		{
-			this.IGNORE_TEXT_ARTER_HASH = IGNORE_TEXT_ARTER_HASH;
-			this.ABSOLUTE = ABSOLUTE;
-			this.RELATIVE_TO_FILE = RELATIVE_TO_FILE;
-			this.RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH = RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH;
-			this.RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH = RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH;
-			this.RELATIVE_TO_PROJECT_BASE_DIR = RELATIVE_TO_PROJECT_BASE_DIR;
-			this.IN_SDK_AND_LIBRARY_CLASS_ROOTS = IN_SDK_AND_LIBRARY_CLASS_ROOTS;
-		}
-	}
+public class ReferenceSupport {
+    public static PsiReference[] getFileRefs(
+        final PsiElement elt,
+        final PsiElement valueNode,
+        final int offset,
+        final LookupOptions lookupOptions
+    ) {
+        String str = StringUtil.stripQuotesAroundValue(valueNode.getText());
+        return getFileRefs(elt, offset, str, lookupOptions);
+    }
+
+    public static PsiReference[] getFileRefs(final PsiElement elt, final int offset, String str, final LookupOptions lookupOptions) {
+        if (lookupOptions.IGNORE_TEXT_ARTER_HASH) {
+            int hashIndex = str.indexOf('#');
+            if (hashIndex != -1) {
+                str = str.substring(0, hashIndex);
+            }
+        }
+
+        final FileReferenceSet base = new FileReferenceSet(str, elt, offset, null, SystemInfo.isFileSystemCaseSensitive);
+
+        final boolean lookForAbsolutePath = lookupOptions.ABSOLUTE && new File(str).isAbsolute();
+        final boolean startsWithSlash = str.startsWith("/");
+
+        base.addCustomization(
+            FileReferenceSet.DEFAULT_PATH_EVALUATOR_OPTION,
+            psiFile -> {
+                final PsiElement context = psiFile.getContext();
+                if (context instanceof PsiLanguageInjectionHost) {
+                    psiFile = context.getContainingFile();
+                }
+                PsiFile originalFile = psiFile.getOriginalFile();
+                if (originalFile != null) {
+                    psiFile = originalFile;
+                }
+
+                final List<VirtualFile> dirs = new ArrayList<>();
+
+                // paths relative to file should not start with slash
+                if (lookupOptions.RELATIVE_TO_FILE && !startsWithSlash) {
+                    appendFileLocation(dirs, psiFile);
+                }
+
+                if ((lookupOptions.RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH && startsWithSlash)
+                    || (lookupOptions.RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH && !startsWithSlash)) {
+                    appendSourceRoots(dirs, psiFile);
+                }
+
+                if (lookForAbsolutePath) {
+                    appendFileSystemRoot(dirs, psiFile.getProject());
+                }
+
+                if (lookupOptions.RELATIVE_TO_PROJECT_BASE_DIR) {
+                    dirs.add(psiFile.getProject().getBaseDir());
+                }
+
+                if (lookupOptions.IN_SDK_AND_LIBRARY_CLASS_ROOTS) {
+                    appendSdkAndLibraryClassRoots(dirs, psiFile);
+                }
+
+                final Collection<PsiFileSystemItem> result = new ArrayList<>();
+                final PsiManager psiManager = PsiManager.getInstance(psiFile.getProject());
+                for (final VirtualFile dir : dirs) {
+                    if (dir != null) {
+                        final PsiDirectory psiDir = psiManager.findDirectory(dir);
+                        if (psiDir != null) {
+                            result.add(psiDir);
+                        }
+                    }
+                }
+                return result;
+            }
+        );
+        return base.getAllReferences();
+    }
+
+    private static void appendFileLocation(final List<VirtualFile> dirs, final PsiFile psiFile) {
+        final VirtualFile file = psiFile.getVirtualFile();
+        if (file != null) {
+            dirs.add(file.getParent());
+        }
+    }
+
+    private static void appendSourceRoots(final Collection<VirtualFile> dirs, final PsiFile psiFile) {
+        final VirtualFile file = psiFile.getVirtualFile();
+        if (file == null) {
+            return;
+        }
+        final Project project = psiFile.getProject();
+        final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
+        final Module module = index.getModuleForFile(file);
+        if (module != null && index.getSourceRootForFile(file) != null) {
+            dirs.addAll(Arrays.asList(ModuleRootManager.getInstance(module).getSourceRoots()));
+        }
+    }
+
+    private static void appendFileSystemRoot(final Collection<VirtualFile> dirs, final Project project) {
+        final VirtualFile fileSystemRoot;
+        if (SystemInfo.isWindows) {
+            fileSystemRoot = ManagingFS.getInstance().findRoot("", LocalFileSystem.getInstance());
+        }
+        else {
+            fileSystemRoot = LocalFileSystem.getInstance().findFileByPath("/");
+        }
+        dirs.add(fileSystemRoot);
+    }
+
+    private static void appendSdkAndLibraryClassRoots(List<VirtualFile> dirs, PsiFile psiFile) {
+        final Module module = ModuleUtilCore.findModuleForPsiElement(psiFile);
+        if (module != null) {
+            final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
+            for (final OrderEntry orderEntry : orderEntries) {
+                if (orderEntry instanceof OrderEntryWithTracking) {
+                    dirs.addAll(Arrays.asList(orderEntry.getFiles(BinariesOrderRootType.getInstance())));
+                }
+            }
+        }
+    }
+
+    public static class LookupOptions {
+        // default is absolute or relative to current file
+        public static final LookupOptions DEFAULT = new LookupOptions(false, true, true, false, false, false, false);
+        public static final LookupOptions MX_STYLE_SOURCE = new LookupOptions(false, true, true, true, true, false, true);
+        public static final LookupOptions EMBEDDED_ASSET = new LookupOptions(true, true, true, true, true, false, true);
+        public static final LookupOptions NON_EMBEDDED_ASSET = new LookupOptions(false, true, false, false, true, false, false);
+        public static final LookupOptions FLEX_COMPILER_CONFIG_PATH_ELEMENT =
+            new LookupOptions(false, true, true, false, false, true, false);
+
+        public final boolean IGNORE_TEXT_ARTER_HASH;
+        public final boolean ABSOLUTE;
+        public final boolean RELATIVE_TO_FILE;
+        public final boolean RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH;
+        public final boolean RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH;
+        public final boolean RELATIVE_TO_PROJECT_BASE_DIR;
+        // better name would be RELATIVE_TO_FCSH_START_DIR but FlexUtils.getFlexCompilerStartDirectory
+        // () is not accessible from this class
+        public final boolean IN_SDK_AND_LIBRARY_CLASS_ROOTS;
+
+        public LookupOptions(
+            boolean IGNORE_TEXT_ARTER_HASH,
+            boolean ABSOLUTE,
+            boolean RELATIVE_TO_FILE,
+            boolean RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH,
+            boolean RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH,
+            boolean RELATIVE_TO_PROJECT_BASE_DIR,
+            boolean IN_SDK_AND_LIBRARY_CLASS_ROOTS
+        ) {
+            this.IGNORE_TEXT_ARTER_HASH = IGNORE_TEXT_ARTER_HASH;
+            this.ABSOLUTE = ABSOLUTE;
+            this.RELATIVE_TO_FILE = RELATIVE_TO_FILE;
+            this.RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH = RELATIVE_TO_SOURCE_ROOTS_START_WITH_SLASH;
+            this.RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH = RELATIVE_TO_SOURCE_ROOTS_START_WITHOUT_SLASH;
+            this.RELATIVE_TO_PROJECT_BASE_DIR = RELATIVE_TO_PROJECT_BASE_DIR;
+            this.IN_SDK_AND_LIBRARY_CLASS_ROOTS = IN_SDK_AND_LIBRARY_CLASS_ROOTS;
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index 80391404..36eec98e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -45,6 +45,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -53,1200 +54,1016 @@
 /**
  * @author Maxim.Mossienko
  */
-abstract public class BaseJSSymbolProcessor implements PsiScopeProcessor
-{
-	protected final PsiFile myTargetFile;
-	protected PsiFile myCurrentFile;
-	protected final boolean mySkipDclsInTargetFile;
-	protected final PsiElement myContext;
-	protected final String myWindowIndex;
-	protected final String myFunctionIndex;
-
-	protected String[] myContextNameIds;
-	@Deprecated
-	protected boolean ecmal4;
-	protected Set<JavaScriptFeature> myFeatures;
-	protected boolean myDefinitelyGlobalReference;
-	protected boolean myDefinitelyNonglobalReference;
-	protected boolean myAddOnlyCompleteMatches;
-	protected boolean myAllowPartialResults = true;
-
-	@NonNls
-	private static final String ANY_TYPE = "*";
-	@NonNls
-	public static final String ARRAY_TYPE_NAME = "Array";
-	@NonNls
-	public static final String STRING_TYPE_NAME = "String";
-	@NonNls
-	public static final String REG_EXP_TYPE_NAME = "RegExp";
-	@NonNls
-	public static final String XML_TYPE_NAME = "XML";
-	@NonNls
-	public static final String XML_LIST_TYPE_NAME = "XMLList";
-	@NonNls
-	public static final String NUMBER_TYPE_NAME = "Number";
-	@NonNls
-	public static final String FUNCTION_TYPE_NAME = "Function";
-	@NonNls
-	public static final String HTML_ELEMENT_TYPE_NAME = "HTMLElement";
-	@NonNls
-	private static final String INT_TYPE = "int";
-	@NonNls
-	private static final String BOOLEAN_TYPE_NAME = "Boolean";
-	protected String myIteratedTypeName;
-
-	protected BaseJSSymbolProcessor(final PsiFile targetFile, final boolean skipDclsInTargetFile, final PsiElement context, String[] contextIds)
-	{
-		myTargetFile = targetFile;
-		mySkipDclsInTargetFile = skipDclsInTargetFile;
-		myContext = context;
-
-		myWindowIndex = "window";
-		myFunctionIndex = "Function";
-
-		myFeatures = JavaScriptVersionUtil.getFeatures(targetFile);
-		ecmal4 = myFeatures.contains(JavaScriptFeature.CLASS);
-
-		if(contextIds == null && context instanceof JSReferenceExpression)
-		{
-			contextIds = calculateContextIds((JSReferenceExpression) context);
-		}
-
-		if(contextIds == null)
-		{ // TODO: workaround for NPE
-			contextIds = new String[0];
-		}
-
-		myContextNameIds = contextIds;
-
-		final boolean notWithinWithStatement = PsiTreeUtil.getParentOfType(myContext, JSWithStatement.class) == null;
-
-		if(((contextIds == null || contextIds.length == 0) &&
-				myContext instanceof JSReferenceExpression &&
-				((JSReferenceExpression) myContext).getQualifier() == null && notWithinWithStatement &&
-				JSResolveUtil.getRealRefExprQualifier((JSReferenceExpression) myContext) == null) || (contextIds != null && contextIds.length == 1 &&
-				contextIds[0].equals(myWindowIndex) && notWithinWithStatement))
-		{
-			myDefinitelyGlobalReference = true;
-		}
-
-		if(contextIds != null && (contextIds.length > 1 || (contextIds.length == 1 &&
-				contextIds[0].length() > 0 &&
-				!contextIds[0].equals(myWindowIndex))))
-		{
-			myDefinitelyNonglobalReference = true;
-		}
-	}
-
-	protected abstract String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression);
-
-	public void setAddOnlyCompleteMatches(final boolean addOnlyCompleteMatches)
-	{
-		myAddOnlyCompleteMatches = addOnlyCompleteMatches;
-		myAllowPartialResults = false;
-	}
-
-
-	protected boolean isFromRelevantFileOrDirectory()
-	{
-		final PsiFile psiFile = myCurrentFile;
-
-		return myTargetFile == psiFile || false;
-		//(myTargetFile != null &&
-		// psiFile != null &&
-		// myTargetFile.getContainingDirectory() == psiFile.getContainingDirectory()
-		//);
-	}
-
-	private static ThreadLocal<EvaluateContext> contextHolder = new ThreadLocal<EvaluateContext>();
-
-	public static void doEvalForExpr(JSExpression rawqualifier, final PsiFile myTargetFile, TypeProcessor typeProcessor)
-	{
-		EvaluateContext context = contextHolder.get();
-		boolean contextHolderInitialized = false;
-
-		if(context == null)
-		{
-			context = new EvaluateContext(myTargetFile);
-			contextHolder.set(context);
-			contextHolderInitialized = true;
-		}
-		else if(context.isAlreadyProcessingItem(rawqualifier))
-		{
-			return;
-		}
-		else
-		{
-			context.addProcessingItem(rawqualifier);
-		}
-
-		try
-		{
-			doEvalForExpr(rawqualifier, typeProcessor, contextHolderInitialized ? context : new EvaluateContext(myTargetFile));
-		}
-		finally
-		{
-			if(!contextHolderInitialized)
-			{
-				context.removeProcessingItem(rawqualifier);
-			}
-			if(contextHolderInitialized)
-			{
-				contextHolder.set(null);
-			}
-		}
-	}
-
-	public static JSExpression getOriginalQualifier(JSExpression rawqualifier)
-	{
-		if(rawqualifier instanceof JSReferenceExpression)
-		{
-			JSReferenceExpression qualifier = ((JSReferenceExpression) rawqualifier);
-			final TextRange textRange = qualifier.getTextRange();
-			PsiFile targetFile = rawqualifier.getContainingFile();
-			final PsiElement context = targetFile.getContext();
-			if(context != null)
-			{
-				targetFile = context.getContainingFile();
-			}
-
-			PsiFile originalFile = targetFile.getOriginalFile();
-
-			if(!targetFile.isPhysical() && originalFile != null)
-			{
-				PsiElement startElement;
-				if(context != null)
-				{
-					final PsiElement at = PsiTreeUtil.getNonStrictParentOfType(originalFile.findElementAt(context.getTextOffset()), PsiLanguageInjectionHost.class);
-					if(at instanceof PsiLanguageInjectionHost)
-					{
-						List<Pair<PsiElement, TextRange>> injectedPsiFiles = InjectedLanguageManager.getInstance(at.getProject()).getInjectedPsiFiles(at);
-						if(injectedPsiFiles != null)
-						{
-							for(Pair<PsiElement, TextRange> pair : injectedPsiFiles)
-							{
-								if(pair.getFirst() instanceof JSFile)
-								{
-									originalFile = (PsiFile) pair.getFirst();
-									break;
-								}
-							}
-						}
-					}
-				}
-				startElement = originalFile.findElementAt(qualifier.getTextOffset());
-
-				do
-				{
-					qualifier = PsiTreeUtil.getParentOfType(startElement, JSReferenceExpression.class);
-					if(qualifier == null)
-					{
-						break;
-					}
-					startElement = qualifier;
-				}
-				while(!textRange.equals(qualifier.getTextRange()));
-			}
-
-			rawqualifier = qualifier;
-		}
-		else if(rawqualifier instanceof JSIndexedPropertyAccessExpression)
-		{
-			final JSExpression qualifier = ((JSIndexedPropertyAccessExpression) rawqualifier).getQualifier();
-			if(qualifier != null)
-			{
-				final JSExpression jsExpression = getOriginalQualifier(qualifier);
-				if(jsExpression != null && jsExpression.getParent() instanceof JSIndexedPropertyAccessExpression)
-				{
-					return (JSExpression) jsExpression.getParent();
-				}
-			}
-		}
-		else if(rawqualifier instanceof JSCallExpression)
-		{
-			final JSExpression qualifier = ((JSCallExpression) rawqualifier).getMethodExpression();
-			if(qualifier != null)
-			{
-				final JSExpression jsExpression = getOriginalQualifier(qualifier);
-				if(jsExpression != null && jsExpression.getParent() instanceof JSCallExpression)
-				{
-					return (JSExpression) jsExpression.getParent();
-				}
-			}
-		}
-		return rawqualifier;
-	}
-
-	private static void doEvalForExpr(JSExpression rawqualifier, TypeProcessor typeProcessor, EvaluateContext context)
-	{
-		if(rawqualifier instanceof JSDefinitionExpression)
-		{
-			rawqualifier = ((JSDefinitionExpression) rawqualifier).getExpression();
-		}
-
-		if(rawqualifier instanceof JSNewExpression)
-		{
-			JSExpression methodExpr = ((JSNewExpression) rawqualifier).getMethodExpression();
-			if(methodExpr != null)
-			{
-				String text = methodExpr.getText();
-				if(methodExpr instanceof JSReferenceExpression && typeProcessor.ecma())
-				{
-					final SimpleTypeProcessor processor = new SimpleTypeProcessor(typeProcessor.getFeatures());
-					doEvalForExpr(methodExpr, context.targetFile, processor);
-
-					if(processor.type != null && !"*".equals(processor.type))
-					{
-						text = "Class".equals(processor.type) ? "*" : processor.type;
-					}
-				}
-				addType(text, typeProcessor, context, methodExpr);
-			}
-			return;
-		}
-
-		if(rawqualifier instanceof JSCallExpression)
-		{
-			rawqualifier = ((JSCallExpression) rawqualifier).getMethodExpression();
-		}
-
-		if(rawqualifier instanceof JSReferenceExpression)
-		{
-			JSReferenceExpression qualifier = ((JSReferenceExpression) rawqualifier);
-
-			boolean wasPrototype = false;
-
-			if(qualifier != null && "prototype".equals(qualifier.getReferencedName()))
-			{
-				final JSExpression expression = qualifier.getQualifier();
-				if(expression instanceof JSReferenceExpression)
-				{
-					qualifier = (JSReferenceExpression) expression;
-					wasPrototype = true;
-				}
-			}
-
-			boolean topLevelQualifier = qualifier.getQualifier() == null;
-
-			if(topLevelQualifier)
-			{
-				final JSReferenceExpression expression = typeProcessor.ecma() ? qualifier : JSSymbolUtil.findReferenceExpressionUsedForClassExtending(qualifier);
-				if(!typeProcessor.ecma() && expression != qualifier && expression.getQualifier() == null)
-				{
-					addType(expression.getText(), typeProcessor, context, qualifier);
-					return;
-				}
-			}
-
-			final ResolveResult[] resolveResults = qualifier != null ? qualifier.multiResolve(false) : ResolveResult.EMPTY_ARRAY;
-
-			if(resolveResults.length > 0)
-			{
-				for(ResolveResult r : resolveResults)
-				{
-					PsiElement psiElement = r.getElement();
-					context.setSource(psiElement);
-					if(psiElement == qualifier.getParent())
-					{
-						continue;
-					}
-
-					//if (psiElement == qualifier && ((JSReferenceExpressionImpl)qualifier).isAttributeReference()) {
-					//   addType(STRING_TYPE_NAME, typeProcessor, context, null); continue;
-					//}
-					String type = psiElement instanceof JSNamedElement ? null :  null;
-
-					if(type == null)
-					{
-						if(psiElement instanceof JSVariable)
-						{
-							final JSVariable jsVariable = (JSVariable) psiElement;
-							String parameterType = jsVariable.getTypeString();
-
-							if(isSomeFunctionCall(rawqualifier, parameterType))
-							{
-								parameterType = ANY_TYPE;
-
-								if(jsVariable.hasInitializer())
-								{
-									JSExpression jsExpression = jsVariable.getInitializer();
-									if(jsExpression instanceof JSFunctionExpression)
-									{
-										String typeString = ((JSFunctionExpression) jsExpression).getFunction().getReturnTypeString();
-										if(isValidType(typeString))
-										{
-											parameterType = typeString;
-										}
-									}
-								}
-							}
-
-							if(isValidType(parameterType))
-							{
-								addType(JSImportHandlingUtil.resolveTypeName(parameterType, jsVariable), typeProcessor, context, null);
-							}
-
-							if(!typeProcessor.ecma() || parameterType == null)
-							{
-								final JSExpression expression = jsVariable.getInitializer();
-								if(expression != null)
-								{
-									doEvalForExpr(expression, context.targetFile, typeProcessor);
-								}
-								else
-								{
-									boolean hasSomeInfoAboutVar = false;
-
-									if(topLevelQualifier)
-									{
-										final ResolveProcessor processor = new ResolveProcessor(qualifier.getText(), true);
-										hasSomeInfoAboutVar = findDef(typeProcessor, context, qualifier, processor);
-									}
-
-									if(!hasSomeInfoAboutVar && parameterType == null)
-									{
-										PsiElement grandParent;
-
-										if((grandParent = jsVariable.getParent().getParent()) instanceof JSForInStatement && jsVariable.getParent() == ((JSForInStatement)
-												grandParent).getDeclarationStatement())
-										{
-											parameterType = evalComponentTypeFromArrayExpression(rawqualifier, typeProcessor, context,
-													((JSForInStatement) grandParent).getCollectionExpression());
-										}
-									}
-									if(!hasSomeInfoAboutVar && parameterType == null)
-									{
-										typeProcessor.setUnknownElement(jsVariable);
-									}
-								}
-							}
-						}
-						else
-						{
-							boolean hasSomeType = false;
-
-							if(psiElement instanceof JSProperty)
-							{
-								psiElement = ((JSProperty) psiElement).getValue();
-							}
-
-							if(psiElement instanceof JSClass)
-							{
-								addType(((JSClass) psiElement).getQualifiedName(), typeProcessor, context, psiElement);
-								hasSomeType = true;
-							}
-							else if(psiElement instanceof JSObjectLiteralExpression && typeProcessor instanceof ResolveProcessor)
-							{
-								addTypeFromObjectLiteralExpression((JSExpression) psiElement, typeProcessor);
-							}
-							else if(psiElement instanceof JSDefinitionExpression)
-							{
-								PsiElement parent;
-								String parameterType = null;
-
-								if((parent = psiElement.getParent()) instanceof JSForInStatement && psiElement == ((JSForInStatement) parent).getVariableExpression())
-								{
-									parameterType = evalComponentTypeFromArrayExpression(rawqualifier, typeProcessor, context,
-											((JSForInStatement) parent).getCollectionExpression());
-								}
-								if(parameterType == null)
-								{
-									addTypeFromDefExpr(typeProcessor, context, psiElement);
-								}
-							}
-							else if(psiElement instanceof XmlToken)
-							{
-								hasSomeType = true;
-
-								final TagContextBuilder builder = new TagContextBuilder(psiElement, HTML_ELEMENT_TYPE_NAME);
-								final PsiElement element = builder.element;
-								final String typeName = builder.typeName;
-
-								if(HTML_ELEMENT_TYPE_NAME.equals(typeName))
-								{
-									hasSomeType = false;
-								}
-
-								addType(typeName, typeProcessor, context, element);
-							}
-							else if(psiElement instanceof JSNamedElement)
-							{
-								if(psiElement instanceof JSFunction)
-								{
-									final JSFunction function = (JSFunction) psiElement;
-									final boolean inCall = rawqualifier.getParent() instanceof JSCallExpression;
-
-									if(!inCall && (!function.isGetProperty() && !function.isSetProperty()))
-									{
-										addType(FUNCTION_TYPE_NAME, typeProcessor, context, psiElement);
-										hasSomeType = true;
-										if(wasPrototype)
-										{
-											final String name = ((JSNamedElement) psiElement).getName();
-											if(name != null)
-											{
-												addType(name, typeProcessor, context, null);
-											}
-										}
-									}
-									else
-									{
-										if(function.isConstructor())
-										{
-											PsiElement parentClass = JSResolveUtil.findParent(function);
-											if(parentClass instanceof JSClass)
-											{
-												final JSClass clazz = (JSClass) parentClass;
-												addType(clazz.getQualifiedName(), typeProcessor, context, clazz);
-												hasSomeType = true;
-											}
-										}
-										else
-										{
-											String s = null;
-											if(function.isSetProperty())
-											{
-												final JSParameterList parameterList = function.getParameterList();
-												final JSParameter[] parameters = parameterList != null ? parameterList.getParameters() : JSParameter.EMPTY_ARRAY;
-												s = parameters.length == 1 ? parameters[0].getTypeString() : null;
-											}
-
-											if(s == null)
-											{
-												s = function.getReturnTypeString();
-												if(isSomeFunctionCall(rawqualifier, s))
-												{
-													s = ANY_TYPE;
-												}
-											}
-											if(isValidType(s))
-											{
-												addType(JSImportHandlingUtil.resolveTypeName(s, function), typeProcessor, context, null);
-												hasSomeType = true;
-											}
-											else
-											{
-												addQNameFromElementAsType(typeProcessor, context, psiElement, false);
-											}
-										}
-									}
-								}
-								else
-								{
-									boolean hasTypeKnowledge = false;
-									boolean passSource = false;
-
-									if(!hasTypeKnowledge || wasPrototype)
-									{
-										addQNameFromElementAsType(typeProcessor, context, psiElement, passSource);
-									}
-								}
-							}
-							else if(psiElement instanceof JSLiteralExpression)
-							{
-								getTypeFromConstant((JSExpression) psiElement, typeProcessor, context);
-								hasSomeType = true;
-							}
-							else if(psiElement instanceof JSExpressionStatement)
-							{
-								final String s = JSDocumentationUtils.findType(psiElement);
-								if(isValidType(s))
-								{
-									addType(JSImportHandlingUtil.resolveTypeName(s, psiElement), typeProcessor, context, null);
-									hasSomeType = true;
-								}
-							}
-							if(!hasSomeType && psiElement != null)
-							{
-								typeProcessor.setUnknownElement(psiElement);
-							}
-						}
-						//myTargetFiles.add(psiElement.getContainingFile());
-					}
-					else if(!context.visitedTypes.contains(type))
-					{
-						//if (context.typeEvaluateManager.isArrayType(type))) type = ARRAY_TYPE_NAME;
-						addType(type, typeProcessor, context, null);
-					}
-				}
-			}
-			else
-			{
-				typeProcessor.setUnknownElement(qualifier);
-			}
-
-			JSReferenceExpression localQualifier = qualifier;
-
-			while(true)
-			{
-				JSExpression expression = localQualifier.getQualifier();
-
-				if(expression instanceof JSCallExpression)
-				{
-					JSExpression methodExpression = ((JSCallExpression) expression).getMethodExpression();
-
-					if(methodExpression instanceof JSReferenceExpression)
-					{
-						localQualifier = (JSReferenceExpression) methodExpression;
-						continue;
-					}
-				}
-
-				break;
-			}
-
-			if("$".equals(localQualifier.getText()))
-			{
-				addType("jQuery", typeProcessor, context, localQualifier);
-			}
-			if("$".equals(qualifier.getText()))
-			{
-				addType(HTML_ELEMENT_TYPE_NAME, typeProcessor, context, null);
-			}
-			else if("getComponentById".equals(qualifier.getReferencedName()))
-			{
-				tryAddBindowsType(qualifier, typeProcessor, context);
-			}
-		}
-		else if(rawqualifier instanceof JSBinaryExpression)
-		{
-			final JSBinaryExpression binaryExpression = (JSBinaryExpression) rawqualifier;
-			final IElementType sign = binaryExpression.getOperationSign();
-			final JSExpression rOperand = binaryExpression.getROperand();
-			final JSExpression lOperand = binaryExpression.getLOperand();
-
-			if(rOperand != null)
-			{
-				if(sign == JSTokenTypes.AS_KEYWORD)
-				{
-					addType(JSImportHandlingUtil.resolveTypeName(rOperand.getText(), rOperand), typeProcessor, context, null);
-				}
-				else if(JSTokenTypes.RELATIONAL_OPERATIONS.contains(sign) || JSTokenTypes.EQUALITY_OPERATIONS.contains(sign) ||
-						sign == JSTokenTypes.IS_KEYWORD)
-				{
-					addType(BOOLEAN_TYPE_NAME, typeProcessor, context, null);
-				}
-				else if(JSTokenTypes.ADDITIVE_OPERATIONS.contains(sign) ||
-						JSTokenTypes.MULTIPLICATIVE_OPERATIONS.contains(sign) ||
-						sign == JSTokenTypes.ANDAND ||
-						sign == JSTokenTypes.OROR)
-				{
-
-					final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
-					final SimpleTypeProcessor rprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
-					doEvalForExpr(lOperand, lprocessor, context);
-					doEvalForExpr(rOperand, rprocessor, context);
-
-					String evaluatedType = lprocessor.type != null && lprocessor.type.equals(rprocessor.type) ? lprocessor.type : null;
-					if(evaluatedType != null)
-					{
-						addType(evaluatedType, typeProcessor, context, rawqualifier);
-					}
-					else
-					{
-						typeProcessor.setUnknownElement(rawqualifier);
-					}
-				}
-				else if(sign == JSTokenTypes.EQ)
-				{
-					final SimpleTypeProcessor rprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
-					doEvalForExpr(rOperand, rprocessor, context);
-
-					String evaluatedType = rprocessor.type;
-					if(evaluatedType != null)
-					{
-						addType(evaluatedType, typeProcessor, context, rawqualifier);
-					}
-					else
-					{
-						typeProcessor.setUnknownElement(rawqualifier);
-					}
-				}
-			}
-		}
-		else if(rawqualifier instanceof JSLiteralExpression)
-		{
-			getTypeFromConstant(rawqualifier, typeProcessor, context);
-		}
-		else if(rawqualifier instanceof JSArrayLiteralExpression)
-		{
-			addType(ARRAY_TYPE_NAME, typeProcessor, context, rawqualifier);
-			if(typeProcessor instanceof ResolveProcessor)
-			{
-				((ResolveProcessor) typeProcessor).execute(rawqualifier, ResolveState.initial());
-			}
-		}
-		else if(rawqualifier instanceof JSIndexedPropertyAccessExpression)
-		{
-			final JSIndexedPropertyAccessExpression propertyAccessExpression = (JSIndexedPropertyAccessExpression) rawqualifier;
-			final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
-
-			doEvalForExpr(propertyAccessExpression.getQualifier(), lprocessor, context);
-
-			if(lprocessor.result instanceof JSArrayLiteralExpression && typeProcessor instanceof ResolveProcessor)
-			{
-				for(JSExpression expr : ((JSArrayLiteralExpression) lprocessor.result).getExpressions())
-				{
-					if(expr instanceof JSObjectLiteralExpression)
-					{
-						addTypeFromObjectLiteralExpression(expr, typeProcessor);
-					}
-				}
-			}
-
-			addComponentTypeFromProcessor(rawqualifier, typeProcessor, context, lprocessor);
-		}
-		else if(rawqualifier instanceof JSObjectLiteralExpression && typeProcessor instanceof ResolveProcessor)
-		{
-			addTypeFromObjectLiteralExpression(rawqualifier, typeProcessor);
-		}
-		else if(rawqualifier instanceof JSParenthesizedExpression)
-		{
-			doEvalForExpr(((JSParenthesizedExpression) rawqualifier).getInnerExpression(), typeProcessor, context);
-		}
-		else if(rawqualifier instanceof JSThisExpression)
-		{
-			final JSClass jsClass = JSResolveUtil.getClassOfContext(rawqualifier);
-			if(jsClass != null)
-			{
-				addType(jsClass.getQualifiedName(), typeProcessor, context, jsClass);
-			}
-			else
-			{
-				typeProcessor.setUnknownElement(rawqualifier);
-			}
-		}
-		else if(rawqualifier instanceof JSSuperExpression)
-		{
-			final JSClass jsClass = JSResolveUtil.getClassOfContext(rawqualifier);
-			if(jsClass != null)
-			{
-				final JSClass[] classes = jsClass.getSuperClasses();
-				if(classes.length > 0)
-				{
-					addType(classes[0].getQualifiedName(), typeProcessor, context, classes[0]);
-				}
-			}
-		}
-		else if(rawqualifier != null)
-		{
-			typeProcessor.setUnknownElement(rawqualifier);
-		}
-	}
-
-	private static boolean isSomeFunctionCall(JSExpression rawqualifier, String parameterType)
-	{
-		return FUNCTION_TYPE_NAME.equals(parameterType) && rawqualifier.getParent() instanceof JSCallExpression;
-	}
-
-	private static void addQNameFromElementAsType(TypeProcessor typeProcessor, EvaluateContext context, PsiElement psiElement, boolean passSource)
-	{
-		String name = ((JSNamedElement) psiElement).getName();
-		if(name == null)
-		{
-			return;
-		}
-		if(psiElement instanceof JSQualifiedNamedElement)
-		{
-			String qName = ((JSQualifiedNamedElement) psiElement).getQualifiedName();
-			if(qName != null)
-			{
-				name = qName;
-			}
-		}
-		addType(name, typeProcessor, context, passSource ? psiElement : null);
-	}
-
-	private static String evalComponentTypeFromArrayExpression(JSExpression rawqualifier, TypeProcessor typeProcessor, EvaluateContext context,
-			JSExpression collectionExpression)
-	{
-		if(collectionExpression != null)
-		{
-			if(context.isAlreadyProcessingItem(rawqualifier))
-			{
-				return null;
-			}
-			context.addProcessingItem(rawqualifier);
-			final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
-			doEvalForExpr(collectionExpression, lprocessor, context);
-			return addComponentTypeFromProcessor(rawqualifier, typeProcessor, context, lprocessor);
-		}
-
-		return null;
-	}
-
-	private static String addComponentTypeFromProcessor(JSExpression rawqualifier, TypeProcessor typeProcessor, EvaluateContext context,
-			SimpleTypeProcessor lprocessor)
-	{
-		if(lprocessor.type != null)
-		{
-			String type = lprocessor.type;
-			if(JSTypeEvaluateManager.isArrayType(type))
-			{
-				type = JSTypeEvaluateManager.getComponentType(type);
-			}
-			else
-			{
-				type = "*";
-			}
-			addType(JSImportHandlingUtil.resolveTypeName(type, rawqualifier), typeProcessor, context, rawqualifier);
-			return type;
-		}
-		return null;
-	}
-
-	private static boolean isValidType(String parameterType)
-	{
-		return parameterType != null && parameterType.length() > 0;
-	}
-
-	private static boolean findDef(final TypeProcessor typeProcessor, final EvaluateContext context, final JSReferenceExpression qualifier,
-			final ResolveProcessor processor)
-	{
-		final PsiElement parent = qualifier.getParent();
-		JSResolveUtil.treeWalkUp(processor, qualifier, parent, qualifier);
-
-		PsiElement jsElement = processor.getResult();
-		if(jsElement instanceof JSDefinitionExpression)
-		{
-			addTypeFromDefExpr(typeProcessor, context, jsElement);
-			return true;
-		}
-		return false;
-	}
-
-	private static void tryAddBindowsType(final JSReferenceExpression qualifier, final TypeProcessor typeProcessor, final EvaluateContext context)
-	{
-		final PsiElement element = qualifier.getParent();
-		if(!(element instanceof JSCallExpression))
-		{
-			return;
-		}
-		final JSArgumentList argumentList = ((JSCallExpression) element).getArgumentList();
-		if(argumentList == null)
-		{
-			return;
-		}
-		final JSExpression[] expressions = argumentList.getArguments();
-		if(expressions.length == 0 || !(expressions[0] instanceof JSLiteralExpression))
-		{
-			return;
-		}
-
-		final String val = StringUtil.stripQuotesAroundValue(expressions[0].getText());
-		final PsiElement contextElement = qualifier.getContainingFile().getContext();
-
-		if(contextElement != null)
-		{
-			final PsiFile containingFile = contextElement.getContainingFile();
-
-			if(isBindowsXml(containingFile))
-			{
-			}
-		}
-	}
-
-	private static boolean isBindowsXml(final PsiFile containingFile)
-	{
-		return containingFile.getName().endsWith(".xml") && containingFile instanceof XmlFile;
-	}
-
-	private static void addTypeFromObjectLiteralExpression(final JSExpression rawqualifier, final TypeProcessor typeProcessor)
-	{
-		final JSProperty[] properties = ((JSObjectLiteralExpression) rawqualifier).getProperties();
-
-		final boolean b = properties.length > 0 ? rawqualifier.processDeclarations((ResolveProcessor) typeProcessor, ResolveState.initial(),
-				properties[0], properties[0]) : true;
-		if(b)
-		{
-			typeProcessor.setUnknownElement(rawqualifier);
-		}
-	}
-
-	private static void addTypeFromDefExpr(final TypeProcessor typeProcessor, final EvaluateContext context, final PsiElement psiElement)
-	{
-		final String type;
-		type = psiElement.getText();
-
-		if(!context.visitedTypes.contains(type))
-		{
-			context.visitedTypes.add(type);
-			final PsiElement parentElement = psiElement.getParent();
-			if(parentElement instanceof JSAssignmentExpression)
-			{
-				JSExpression expr = ((JSAssignmentExpression) parentElement).getROperand();
-				while(expr instanceof JSAssignmentExpression)
-				{
-					expr = ((JSAssignmentExpression) expr).getROperand();
-				}
-				if(expr != null)
-				{
-					doEvalForExpr(expr, typeProcessor, context);
-				}
-			}
-			else
-			{
-				typeProcessor.setUnknownElement(parentElement);
-			}
-		}
-	}
-
-	private static void getTypeFromConstant(final JSExpression rawqualifier, TypeProcessor typeProcessor, EvaluateContext context)
-	{
-		final ASTNode childNode = rawqualifier.getNode().getFirstChildNode();
-		IElementType constantType = childNode.getElementType();
-
-		String type = JavaScriptTokenSets.STRING_LITERALS.contains(constantType) ? STRING_TYPE_NAME :
-				constantType == JSTokenTypes.NUMERIC_LITERAL ? NUMBER_TYPE_NAME : constantType == JSTokenTypes.REGEXP_LITERAL ? REG_EXP_TYPE_NAME : constantType
-						== JSTokenTypes.XML_START_TAG_START ? XML_TYPE_NAME : constantType == JSTokenTypes.XML_START_TAG_LIST ? XML_LIST_TYPE_NAME : constantType ==
-						JSTokenTypes.TRUE_KEYWORD || constantType == JSTokenTypes.FALSE_KEYWORD ? BOOLEAN_TYPE_NAME : null;
-
-		if(type == NUMBER_TYPE_NAME && typeProcessor.ecma())
-		{
-			final String text = childNode.getText();
-			if(text.indexOf('.') == -1)
-			{
-				type = INT_TYPE;
-			}
-		}
-
-		if(type != null)
-		{
-			addType(type, typeProcessor, context, rawqualifier);
-		}
-		else
-		{
-			typeProcessor.setUnknownElement(rawqualifier);
-		}
-	}
-
-	protected void addPackageScope(final List<String[]> possibleNameIds, final JSClass jsClass, final PsiElement expression)
-	{
-		final String packageQualifier = JSResolveUtil.findPackageStatementQualifier(expression);
-		String qName;
-
-		if(packageQualifier != null)
-		{
-			buildIndexListFromQNameAndCorrectQName(packageQualifier, jsClass, possibleNameIds);
-		}
-		else if(jsClass != null && (qName = jsClass.getQualifiedName()) != null && !qName.equals(jsClass.getName()))
-		{
-			final int index = qName.lastIndexOf('.');
-			if(index > 0)
-			{
-				buildIndexListFromQNameAndCorrectQName(qName.substring(0, index), jsClass, possibleNameIds);
-			}
-		}
-		else if(jsClass == null)
-		{
-			String s = JSResolveUtil.findPackageForMxml(expression);
-			if(isValidType(s))
-			{
-				buildIndexListFromQNameAndCorrectQName(s, expression, possibleNameIds);
-			}
-		}
-	}
-
-	protected String buildIndexListFromQNameAndCorrectQName(String type, final PsiElement source, List<String[]> possibleNameIds)
-	{
-		final List<String> list = new ArrayList<String>();
-		type = addIndexListFromQName(type, source, list);
-
-		possibleNameIds.add(ArrayUtil.toStringArray(list));
-		return type;
-	}
-
-	public static String addIndexListFromQName(String type, final PsiElement source, final List<String> list)
-	{
-		int i = type.indexOf('.');
-		int lastI = 0;
-
-		while(i != -1)
-		{
-			list.add(type.substring(lastI, i));
-			lastI = i + 1;
-			i = type.indexOf('.', lastI);
-		}
-
-		if(i != type.length())
-		{
-			String s = type.substring(lastI, type.length());
-			if(source == null)
-			{
-				s = StringUtil.capitalize(s); // when type name goes from comments
-			}
-			if(lastI == 0 && !s.equals(type))
-			{
-				type = s;
-			}
-			list.add(s);
-		}
-		return type;
-	}
-
-	private static void addType(String type, TypeProcessor typeProcessor, EvaluateContext context, final PsiElement source)
-	{
-		if(type == null)
-		{
-			return;
-		}
-		int spacePos = type.indexOf(' ');
-		if(spacePos != -1)
-		{
-			type = type.substring(0, spacePos);
-		}
-
-		if(!(typeProcessor instanceof GenericTypeParametersClient))
-		{
-			final int gtPos = type.indexOf('<');
-			if(gtPos > 0 && type.charAt(gtPos - 1) == '.')
-			{
-				type = type.substring(0, gtPos - 1);
-			}
-		}
-
-		if(!typeProcessor.ecma())
-		{
-			type = JSTypeEvaluateManager.getInstanceNameByType(type);
-		}
-		typeProcessor.process(type, context, source);
-	}
-
-	@Override
-	public <T> T getHint(final Key<T> hintClass)
-	{
-		return null;
-	}
-
-	@Override
-	public void handleEvent(Event event, Object associated)
-	{
-	}
-
-	enum MatchType
-	{
-		COMPLETE_TYPE, COMPLETE, COMPLETE_NS, PARTIAL, NOMATCH
-	}
-
-	interface HierarchyProcessor
-	{
-		boolean processClass(JSClass clazz);
-	}
-
-	protected void doIterateTypeHierarchy(final String[] contextIds, final HierarchyProcessor processor)
-	{
-		StringBuilder builder = new StringBuilder();
-		for(String cnameId : contextIds)
-		{
-			if(builder.length() > 0)
-			{
-				builder.append('.');
-			}
-			builder.append(cnameId);
-		}
-
-		final String typeName = builder.toString();
-		if(typeName.length() == 0)
-		{
-			return;
-		}
-
-		myIteratedTypeName = typeName;
-		doIterateHierarchy(typeName, processor);
-		myIteratedTypeName = null;
-	}
-
-	protected void doIterateHierarchy(final String typeName, final HierarchyProcessor processor)
-	{
-		final PsiElement clazz = JSResolveUtil.findClassByQName(typeName, myContext);
-		if(clazz instanceof JSClass)
-		{
-			for(JSClass superClazz : ((JSClass) clazz).getSuperClasses())
-			{
-				superClazz.processDeclarations(new ResolveProcessor(null)
-				{
-					{
-						setToProcessMembers(false);
-						setToProcessHierarchy(true);
-						setTypeContext(true);
-					}
-
-					@Override
-					public boolean execute(final PsiElement element, final ResolveState state)
-					{
-						if(element instanceof JSClass)
-						{
-							if(!processor.processClass((JSClass) element))
-							{
-								return false;
-							}
-						}
-						return true;
-					}
-				}, ResolveState.initial(), null, clazz);
-			}
-
-			return;
-		}
-	}
-
-
-	public static class EvaluateContext
-	{
-		public final PsiFile targetFile;
-		public final Set<String> visitedTypes = new HashSet<String>();
-		private Set<JSExpression> processingItems;
-		private PsiElement source;
-
-		public EvaluateContext(final PsiFile targetFile)
-		{
-			this.targetFile = targetFile;
-		}
-
-		public boolean isAlreadyProcessingItem(final JSExpression rawqualifier)
-		{
-			if(processingItems != null)
-			{
-				return processingItems.contains(rawqualifier);
-			}
-			return false;
-		}
-
-		public void addProcessingItem(final JSExpression rawqualifier)
-		{
-			if(processingItems == null)
-			{
-				processingItems = new HashSet<JSExpression>();
-			}
-			processingItems.add(rawqualifier);
-		}
-
-		public void removeProcessingItem(final JSExpression rawqualifier)
-		{
-			processingItems.remove(rawqualifier);
-		}
-
-		public PsiElement getSource()
-		{
-			return source;
-		}
-
-		public void setSource(final PsiElement source)
-		{
-			this.source = source;
-		}
-	}
-
-	public interface TypeProcessor
-	{
-		void process(@Nonnull String type, @Nonnull EvaluateContext evaluateContext, final PsiElement source);
-
-		@Deprecated
-		boolean ecma();
-
-		Set<JavaScriptFeature> getFeatures();
-
-		void setUnknownElement(@Nonnull PsiElement element);
-	}
-
-	public interface GenericTypeParametersClient
-	{
-	}
-
-	public static class SimpleTypeProcessor extends ResolveProcessor implements TypeProcessor, GenericTypeParametersClient
-	{
-		private String type;
-		private PsiElement result;
-		private PsiElement source;
-		private final Set<JavaScriptFeature> myFeatures;
-
-		public SimpleTypeProcessor(Set<JavaScriptFeature> features)
-		{
-			super(null);
-			myFeatures = features;
-		}
-
-		@Override
-		public void process(@Nonnull final String _type, @Nonnull final EvaluateContext evaluateContext, final PsiElement _source)
-		{
-			setType(type != null && !type.equals(_type) ? ANY_TYPE : _type, _source);
-		}
-
-		private void setType(final String s, final PsiElement _source)
-		{
-			type = s;
-			source = _source;
-		}
-
-		@Override
-		public Set<JavaScriptFeature> getFeatures()
-		{
-			return myFeatures;
-		}
-
-		@Override
-		public boolean ecma()
-		{
-			return myFeatures.contains(JavaScriptFeature.CLASS);
-		}
-
-		@Override
-		public boolean execute(final PsiElement element, final ResolveState state)
-		{
-			result = element;
-			return true;
-		}
-
-		@Override
-		public void setUnknownElement(@Nonnull final PsiElement _element)
-		{
-			setType(ANY_TYPE, _element);
-		}
-
-		public String getType()
-		{
-			return type;
-		}
-
-		public PsiElement getSource()
-		{
-			return source;
-		}
-	}
-
-	public static class TagContextBuilder
-	{
-		public final PsiElement element;
-		public final String typeName;
-
-		public TagContextBuilder(PsiElement psiElement, String defaultName)
-		{
-			String typeName = null;
-			final XmlTag tag = PsiTreeUtil.getParentOfType(psiElement, XmlTag.class);
-			JSClass element = null;
-
-			if(tag != null)
-			{
-				final PsiFile containingFile = tag.getContainingFile();
-
-				if(isBindowsXml(containingFile))
-				{
-					typeName = "Bi" + tag.getLocalName();
-				}
-				else
-				{
-					element = JSResolveUtil.getClassFromTagNameInMxml(tag);
-					typeName = element != null ? element.getQualifiedName() : null;
-				}
-			}
-
-			if(typeName == null)
-			{
-				typeName = defaultName;
-			}
-
-			this.typeName = typeName;
-			this.element = element;
-		}
-	}
+abstract public class BaseJSSymbolProcessor implements PsiScopeProcessor {
+    protected final PsiFile myTargetFile;
+    protected PsiFile myCurrentFile;
+    protected final boolean mySkipDclsInTargetFile;
+    protected final PsiElement myContext;
+    protected final String myWindowIndex;
+    protected final String myFunctionIndex;
+
+    protected String[] myContextNameIds;
+    @Deprecated
+    protected boolean ecmal4;
+    protected Set<JavaScriptFeature> myFeatures;
+    protected boolean myDefinitelyGlobalReference;
+    protected boolean myDefinitelyNonglobalReference;
+    protected boolean myAddOnlyCompleteMatches;
+    protected boolean myAllowPartialResults = true;
+
+    @NonNls
+    private static final String ANY_TYPE = "*";
+    @NonNls
+    public static final String ARRAY_TYPE_NAME = "Array";
+    @NonNls
+    public static final String STRING_TYPE_NAME = "String";
+    @NonNls
+    public static final String REG_EXP_TYPE_NAME = "RegExp";
+    @NonNls
+    public static final String XML_TYPE_NAME = "XML";
+    @NonNls
+    public static final String XML_LIST_TYPE_NAME = "XMLList";
+    @NonNls
+    public static final String NUMBER_TYPE_NAME = "Number";
+    @NonNls
+    public static final String FUNCTION_TYPE_NAME = "Function";
+    @NonNls
+    public static final String HTML_ELEMENT_TYPE_NAME = "HTMLElement";
+    @NonNls
+    private static final String INT_TYPE = "int";
+    @NonNls
+    private static final String BOOLEAN_TYPE_NAME = "Boolean";
+    protected String myIteratedTypeName;
+
+    protected BaseJSSymbolProcessor(
+        final PsiFile targetFile,
+        final boolean skipDclsInTargetFile,
+        final PsiElement context,
+        String[] contextIds
+    ) {
+        myTargetFile = targetFile;
+        mySkipDclsInTargetFile = skipDclsInTargetFile;
+        myContext = context;
+
+        myWindowIndex = "window";
+        myFunctionIndex = "Function";
+
+        myFeatures = JavaScriptVersionUtil.getFeatures(targetFile);
+        ecmal4 = myFeatures.contains(JavaScriptFeature.CLASS);
+
+        if (contextIds == null && context instanceof JSReferenceExpression) {
+            contextIds = calculateContextIds((JSReferenceExpression)context);
+        }
+
+        if (contextIds == null) { // TODO: workaround for NPE
+            contextIds = new String[0];
+        }
+
+        myContextNameIds = contextIds;
+
+        final boolean notWithinWithStatement = PsiTreeUtil.getParentOfType(myContext, JSWithStatement.class) == null;
+
+        if (((contextIds == null || contextIds.length == 0)
+            && myContext instanceof JSReferenceExpression referenceExpression
+            && referenceExpression.getQualifier() == null && notWithinWithStatement
+            && JSResolveUtil.getRealRefExprQualifier(referenceExpression) == null)
+            || (contextIds != null && contextIds.length == 1 && contextIds[0].equals(myWindowIndex) && notWithinWithStatement)) {
+            myDefinitelyGlobalReference = true;
+        }
+
+        if (contextIds != null
+            && (contextIds.length > 1 || (contextIds.length == 1 && !contextIds[0].isEmpty() && !contextIds[0].equals(myWindowIndex)))) {
+            myDefinitelyNonglobalReference = true;
+        }
+    }
+
+    protected abstract String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression);
+
+    public void setAddOnlyCompleteMatches(final boolean addOnlyCompleteMatches) {
+        myAddOnlyCompleteMatches = addOnlyCompleteMatches;
+        myAllowPartialResults = false;
+    }
+
+
+    protected boolean isFromRelevantFileOrDirectory() {
+        final PsiFile psiFile = myCurrentFile;
+
+        return myTargetFile == psiFile || false;
+        //(myTargetFile != null &&
+        // psiFile != null &&
+        // myTargetFile.getContainingDirectory() == psiFile.getContainingDirectory()
+        //);
+    }
+
+    private static ThreadLocal<EvaluateContext> contextHolder = new ThreadLocal<EvaluateContext>();
+
+    public static void doEvalForExpr(JSExpression rawqualifier, final PsiFile myTargetFile, TypeProcessor typeProcessor) {
+        EvaluateContext context = contextHolder.get();
+        boolean contextHolderInitialized = false;
+
+        if (context == null) {
+            context = new EvaluateContext(myTargetFile);
+            contextHolder.set(context);
+            contextHolderInitialized = true;
+        }
+        else if (context.isAlreadyProcessingItem(rawqualifier)) {
+            return;
+        }
+        else {
+            context.addProcessingItem(rawqualifier);
+        }
+
+        try {
+            doEvalForExpr(rawqualifier, typeProcessor, contextHolderInitialized ? context : new EvaluateContext(myTargetFile));
+        }
+        finally {
+            if (!contextHolderInitialized) {
+                context.removeProcessingItem(rawqualifier);
+            }
+            if (contextHolderInitialized) {
+                contextHolder.set(null);
+            }
+        }
+    }
+
+    public static JSExpression getOriginalQualifier(JSExpression rawQualifier) {
+        if (rawQualifier instanceof JSReferenceExpression qualifier) {
+            final TextRange textRange = qualifier.getTextRange();
+            PsiFile targetFile = rawQualifier.getContainingFile();
+            final PsiElement context = targetFile.getContext();
+            if (context != null) {
+                targetFile = context.getContainingFile();
+            }
+
+            PsiFile originalFile = targetFile.getOriginalFile();
+
+            if (!targetFile.isPhysical() && originalFile != null) {
+                PsiElement startElement;
+                if (context != null) {
+                    final PsiElement at = PsiTreeUtil.getNonStrictParentOfType(
+                        originalFile.findElementAt(context.getTextOffset()),
+                        PsiLanguageInjectionHost.class
+                    );
+                    if (at instanceof PsiLanguageInjectionHost) {
+                        List<Pair<PsiElement, TextRange>> injectedPsiFiles =
+                            InjectedLanguageManager.getInstance(at.getProject()).getInjectedPsiFiles(at);
+                        if (injectedPsiFiles != null) {
+                            for (Pair<PsiElement, TextRange> pair : injectedPsiFiles) {
+                                if (pair.getFirst() instanceof JSFile) {
+                                    originalFile = (PsiFile)pair.getFirst();
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                startElement = originalFile.findElementAt(qualifier.getTextOffset());
+
+                do {
+                    qualifier = PsiTreeUtil.getParentOfType(startElement, JSReferenceExpression.class);
+                    if (qualifier == null) {
+                        break;
+                    }
+                    startElement = qualifier;
+                }
+                while (!textRange.equals(qualifier.getTextRange()));
+            }
+
+            rawQualifier = qualifier;
+        }
+        else if (rawQualifier instanceof JSIndexedPropertyAccessExpression indexedPropertyAccessExpression) {
+            final JSExpression qualifier = indexedPropertyAccessExpression.getQualifier();
+            if (qualifier != null) {
+                final JSExpression jsExpression = getOriginalQualifier(qualifier);
+                if (jsExpression != null && jsExpression.getParent() instanceof JSIndexedPropertyAccessExpression) {
+                    return (JSExpression)jsExpression.getParent();
+                }
+            }
+        }
+        else if (rawQualifier instanceof JSCallExpression call) {
+            final JSExpression qualifier = call.getMethodExpression();
+            if (qualifier != null) {
+                final JSExpression jsExpression = getOriginalQualifier(qualifier);
+                if (jsExpression != null && jsExpression.getParent() instanceof JSCallExpression parentCall) {
+                    return parentCall;
+                }
+            }
+        }
+        return rawQualifier;
+    }
+
+    private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeProcessor, EvaluateContext context) {
+        if (rawQualifier instanceof JSDefinitionExpression definition) {
+            rawQualifier = definition.getExpression();
+        }
+
+        if (rawQualifier instanceof JSNewExpression newExpression) {
+            JSExpression methodExpr = newExpression.getMethodExpression();
+            if (methodExpr != null) {
+                String text = methodExpr.getText();
+                if (methodExpr instanceof JSReferenceExpression && typeProcessor.ecma()) {
+                    final SimpleTypeProcessor processor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+                    doEvalForExpr(methodExpr, context.targetFile, processor);
+
+                    if (processor.type != null && !"*".equals(processor.type)) {
+                        text = "Class".equals(processor.type) ? "*" : processor.type;
+                    }
+                }
+                addType(text, typeProcessor, context, methodExpr);
+            }
+            return;
+        }
+
+        if (rawQualifier instanceof JSCallExpression call) {
+            rawQualifier = call.getMethodExpression();
+        }
+
+        if (rawQualifier instanceof JSReferenceExpression qualifier) {
+            boolean wasPrototype = false;
+
+            if (qualifier != null && "prototype".equals(qualifier.getReferencedName())) {
+                final JSExpression expression = qualifier.getQualifier();
+                if (expression instanceof JSReferenceExpression) {
+                    qualifier = (JSReferenceExpression)expression;
+                    wasPrototype = true;
+                }
+            }
+
+            boolean topLevelQualifier = qualifier.getQualifier() == null;
+
+            if (topLevelQualifier) {
+                final JSReferenceExpression expression =
+                    typeProcessor.ecma() ? qualifier : JSSymbolUtil.findReferenceExpressionUsedForClassExtending(qualifier);
+                if (!typeProcessor.ecma() && expression != qualifier && expression.getQualifier() == null) {
+                    addType(expression.getText(), typeProcessor, context, qualifier);
+                    return;
+                }
+            }
+
+            final ResolveResult[] resolveResults = qualifier != null ? qualifier.multiResolve(false) : ResolveResult.EMPTY_ARRAY;
+
+            if (resolveResults.length > 0) {
+                for (ResolveResult r : resolveResults) {
+                    PsiElement psiElement = r.getElement();
+                    context.setSource(psiElement);
+                    if (psiElement == qualifier.getParent()) {
+                        continue;
+                    }
+
+                    //if (psiElement == qualifier && ((JSReferenceExpressionImpl)qualifier).isAttributeReference()) {
+                    //   addType(STRING_TYPE_NAME, typeProcessor, context, null); continue;
+                    //}
+                    String type = psiElement instanceof JSNamedElement ? null : null;
+
+                    if (type == null) {
+                        if (psiElement instanceof JSVariable) {
+                            final JSVariable jsVariable = (JSVariable)psiElement;
+                            String parameterType = jsVariable.getTypeString();
+
+                            if (isSomeFunctionCall(rawQualifier, parameterType)) {
+                                parameterType = ANY_TYPE;
+
+                                if (jsVariable.hasInitializer()
+                                    && jsVariable.getInitializer() instanceof JSFunctionExpression functionExpression) {
+                                    String typeString = functionExpression.getFunction().getReturnTypeString();
+                                    if (isValidType(typeString)) {
+                                        parameterType = typeString;
+                                    }
+                                }
+                            }
+
+                            if (isValidType(parameterType)) {
+                                addType(JSImportHandlingUtil.resolveTypeName(parameterType, jsVariable), typeProcessor, context, null);
+                            }
+
+                            if (!typeProcessor.ecma() || parameterType == null) {
+                                final JSExpression expression = jsVariable.getInitializer();
+                                if (expression != null) {
+                                    doEvalForExpr(expression, context.targetFile, typeProcessor);
+                                }
+                                else {
+                                    boolean hasSomeInfoAboutVar = false;
+
+                                    if (topLevelQualifier) {
+                                        final ResolveProcessor processor = new ResolveProcessor(qualifier.getText(), true);
+                                        hasSomeInfoAboutVar = findDef(typeProcessor, context, qualifier, processor);
+                                    }
+
+                                    if (!hasSomeInfoAboutVar && parameterType == null
+                                        && jsVariable.getParent().getParent() instanceof JSForInStatement forInStatement
+                                        && jsVariable.getParent() == forInStatement.getDeclarationStatement()) {
+                                        parameterType = evalComponentTypeFromArrayExpression(
+                                            rawQualifier,
+                                            typeProcessor,
+                                            context,
+                                            forInStatement.getCollectionExpression()
+                                        );
+                                    }
+                                    if (!hasSomeInfoAboutVar && parameterType == null) {
+                                        typeProcessor.setUnknownElement(jsVariable);
+                                    }
+                                }
+                            }
+                        }
+                        else {
+                            boolean hasSomeType = false;
+
+                            if (psiElement instanceof JSProperty property) {
+                                psiElement = property.getValue();
+                            }
+
+                            if (psiElement instanceof JSClass jsClass) {
+                                addType(jsClass.getQualifiedName(), typeProcessor, context, psiElement);
+                                hasSomeType = true;
+                            }
+                            else if (psiElement instanceof JSObjectLiteralExpression objectLiteralExpression
+                                && typeProcessor instanceof ResolveProcessor) {
+                                addTypeFromObjectLiteralExpression(objectLiteralExpression, typeProcessor);
+                            }
+                            else if (psiElement instanceof JSDefinitionExpression) {
+                                String parameterType = null;
+
+                                if (psiElement.getParent() instanceof JSForInStatement forInStatement
+                                    && psiElement == forInStatement.getVariableExpression()) {
+                                    parameterType = evalComponentTypeFromArrayExpression(
+                                        rawQualifier,
+                                        typeProcessor,
+                                        context,
+                                        forInStatement.getCollectionExpression()
+                                    );
+                                }
+                                if (parameterType == null) {
+                                    addTypeFromDefExpr(typeProcessor, context, psiElement);
+                                }
+                            }
+                            else if (psiElement instanceof XmlToken) {
+                                hasSomeType = true;
+
+                                final TagContextBuilder builder = new TagContextBuilder(psiElement, HTML_ELEMENT_TYPE_NAME);
+                                final PsiElement element = builder.element;
+                                final String typeName = builder.typeName;
+
+                                if (HTML_ELEMENT_TYPE_NAME.equals(typeName)) {
+                                    hasSomeType = false;
+                                }
+
+                                addType(typeName, typeProcessor, context, element);
+                            }
+                            else if (psiElement instanceof JSNamedElement) {
+                                if (psiElement instanceof JSFunction function) {
+                                    final boolean inCall = rawQualifier.getParent() instanceof JSCallExpression;
+
+                                    if (!inCall && (!function.isGetProperty() && !function.isSetProperty())) {
+                                        addType(FUNCTION_TYPE_NAME, typeProcessor, context, psiElement);
+                                        hasSomeType = true;
+                                        if (wasPrototype) {
+                                            final String name = function.getName();
+                                            if (name != null) {
+                                                addType(name, typeProcessor, context, null);
+                                            }
+                                        }
+                                    }
+                                    else if (function.isConstructor()) {
+                                        PsiElement parentClass = JSResolveUtil.findParent(function);
+                                        if (parentClass instanceof JSClass clazz) {
+                                            addType(clazz.getQualifiedName(), typeProcessor, context, clazz);
+                                            hasSomeType = true;
+                                        }
+                                    }
+                                    else {
+                                        String s = null;
+                                        if (function.isSetProperty()) {
+                                            final JSParameterList parameterList = function.getParameterList();
+                                            final JSParameter[] parameters =
+                                                parameterList != null ? parameterList.getParameters() : JSParameter.EMPTY_ARRAY;
+                                            s = parameters.length == 1 ? parameters[0].getTypeString() : null;
+                                        }
+
+                                        if (s == null) {
+                                            s = function.getReturnTypeString();
+                                            if (isSomeFunctionCall(rawQualifier, s)) {
+                                                s = ANY_TYPE;
+                                            }
+                                        }
+                                        if (isValidType(s)) {
+                                            addType(JSImportHandlingUtil.resolveTypeName(s, function), typeProcessor, context, null);
+                                            hasSomeType = true;
+                                        }
+                                        else {
+                                            addQNameFromElementAsType(typeProcessor, context, psiElement, false);
+                                        }
+                                    }
+                                }
+                                else {
+                                    boolean hasTypeKnowledge = false;
+                                    boolean passSource = false;
+
+                                    if (!hasTypeKnowledge || wasPrototype) {
+                                        addQNameFromElementAsType(typeProcessor, context, psiElement, passSource);
+                                    }
+                                }
+                            }
+                            else if (psiElement instanceof JSLiteralExpression) {
+                                getTypeFromConstant((JSExpression)psiElement, typeProcessor, context);
+                                hasSomeType = true;
+                            }
+                            else if (psiElement instanceof JSExpressionStatement) {
+                                final String s = JSDocumentationUtils.findType(psiElement);
+                                if (isValidType(s)) {
+                                    addType(JSImportHandlingUtil.resolveTypeName(s, psiElement), typeProcessor, context, null);
+                                    hasSomeType = true;
+                                }
+                            }
+                            if (!hasSomeType && psiElement != null) {
+                                typeProcessor.setUnknownElement(psiElement);
+                            }
+                        }
+                        //myTargetFiles.add(psiElement.getContainingFile());
+                    }
+                    else if (!context.visitedTypes.contains(type)) {
+                        //if (context.typeEvaluateManager.isArrayType(type))) type = ARRAY_TYPE_NAME;
+                        addType(type, typeProcessor, context, null);
+                    }
+                }
+            }
+            else {
+                typeProcessor.setUnknownElement(qualifier);
+            }
+
+            JSReferenceExpression localQualifier = qualifier;
+
+            while (true) {
+                JSExpression expression = localQualifier.getQualifier();
+
+                if (expression instanceof JSCallExpression call) {
+                    JSExpression methodExpression = call.getMethodExpression();
+
+                    if (methodExpression instanceof JSReferenceExpression referenceExpression) {
+                        localQualifier = referenceExpression;
+                        continue;
+                    }
+                }
+
+                break;
+            }
+
+            if ("$".equals(localQualifier.getText())) {
+                addType("jQuery", typeProcessor, context, localQualifier);
+            }
+            if ("$".equals(qualifier.getText())) {
+                addType(HTML_ELEMENT_TYPE_NAME, typeProcessor, context, null);
+            }
+            else if ("getComponentById".equals(qualifier.getReferencedName())) {
+                tryAddBindowsType(qualifier, typeProcessor, context);
+            }
+        }
+        else if (rawQualifier instanceof JSBinaryExpression binaryExpression) {
+            final IElementType sign = binaryExpression.getOperationSign();
+            final JSExpression rOperand = binaryExpression.getROperand();
+            final JSExpression lOperand = binaryExpression.getLOperand();
+
+            if (rOperand != null) {
+                if (sign == JSTokenTypes.AS_KEYWORD) {
+                    addType(JSImportHandlingUtil.resolveTypeName(rOperand.getText(), rOperand), typeProcessor, context, null);
+                }
+                else if (JSTokenTypes.RELATIONAL_OPERATIONS.contains(sign) || JSTokenTypes.EQUALITY_OPERATIONS.contains(sign) ||
+                    sign == JSTokenTypes.IS_KEYWORD) {
+                    addType(BOOLEAN_TYPE_NAME, typeProcessor, context, null);
+                }
+                else if (JSTokenTypes.ADDITIVE_OPERATIONS.contains(sign)
+                    || JSTokenTypes.MULTIPLICATIVE_OPERATIONS.contains(sign)
+                    || sign == JSTokenTypes.ANDAND || sign == JSTokenTypes.OROR) {
+
+                    final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+                    final SimpleTypeProcessor rprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+                    doEvalForExpr(lOperand, lprocessor, context);
+                    doEvalForExpr(rOperand, rprocessor, context);
+
+                    String evaluatedType = lprocessor.type != null && lprocessor.type.equals(rprocessor.type) ? lprocessor.type : null;
+                    if (evaluatedType != null) {
+                        addType(evaluatedType, typeProcessor, context, rawQualifier);
+                    }
+                    else {
+                        typeProcessor.setUnknownElement(rawQualifier);
+                    }
+                }
+                else if (sign == JSTokenTypes.EQ) {
+                    final SimpleTypeProcessor rprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+                    doEvalForExpr(rOperand, rprocessor, context);
+
+                    String evaluatedType = rprocessor.type;
+                    if (evaluatedType != null) {
+                        addType(evaluatedType, typeProcessor, context, rawQualifier);
+                    }
+                    else {
+                        typeProcessor.setUnknownElement(rawQualifier);
+                    }
+                }
+            }
+        }
+        else if (rawQualifier instanceof JSLiteralExpression) {
+            getTypeFromConstant(rawQualifier, typeProcessor, context);
+        }
+        else if (rawQualifier instanceof JSArrayLiteralExpression) {
+            addType(ARRAY_TYPE_NAME, typeProcessor, context, rawQualifier);
+            if (typeProcessor instanceof ResolveProcessor resolveProcessor) {
+                resolveProcessor.execute(rawQualifier, ResolveState.initial());
+            }
+        }
+        else if (rawQualifier instanceof JSIndexedPropertyAccessExpression propertyAccessExpression) {
+            final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+
+            doEvalForExpr(propertyAccessExpression.getQualifier(), lprocessor, context);
+
+            if (lprocessor.result instanceof JSArrayLiteralExpression arrayLiteral && typeProcessor instanceof ResolveProcessor) {
+                for (JSExpression expr : arrayLiteral.getExpressions()) {
+                    if (expr instanceof JSObjectLiteralExpression) {
+                        addTypeFromObjectLiteralExpression(expr, typeProcessor);
+                    }
+                }
+            }
+
+            addComponentTypeFromProcessor(rawQualifier, typeProcessor, context, lprocessor);
+        }
+        else if (rawQualifier instanceof JSObjectLiteralExpression && typeProcessor instanceof ResolveProcessor) {
+            addTypeFromObjectLiteralExpression(rawQualifier, typeProcessor);
+        }
+        else if (rawQualifier instanceof JSParenthesizedExpression parenthesizedExpression) {
+            doEvalForExpr(parenthesizedExpression.getInnerExpression(), typeProcessor, context);
+        }
+        else if (rawQualifier instanceof JSThisExpression) {
+            final JSClass jsClass = JSResolveUtil.getClassOfContext(rawQualifier);
+            if (jsClass != null) {
+                addType(jsClass.getQualifiedName(), typeProcessor, context, jsClass);
+            }
+            else {
+                typeProcessor.setUnknownElement(rawQualifier);
+            }
+        }
+        else if (rawQualifier instanceof JSSuperExpression) {
+            final JSClass jsClass = JSResolveUtil.getClassOfContext(rawQualifier);
+            if (jsClass != null) {
+                final JSClass[] classes = jsClass.getSuperClasses();
+                if (classes.length > 0) {
+                    addType(classes[0].getQualifiedName(), typeProcessor, context, classes[0]);
+                }
+            }
+        }
+        else if (rawQualifier != null) {
+            typeProcessor.setUnknownElement(rawQualifier);
+        }
+    }
+
+    private static boolean isSomeFunctionCall(JSExpression rawqualifier, String parameterType) {
+        return FUNCTION_TYPE_NAME.equals(parameterType) && rawqualifier.getParent() instanceof JSCallExpression;
+    }
+
+    private static void addQNameFromElementAsType(
+        TypeProcessor typeProcessor,
+        EvaluateContext context,
+        PsiElement psiElement,
+        boolean passSource
+    ) {
+        String name = ((JSNamedElement)psiElement).getName();
+        if (name == null) {
+            return;
+        }
+        if (psiElement instanceof JSQualifiedNamedElement qualifiedNamedElement) {
+            String qName = qualifiedNamedElement.getQualifiedName();
+            if (qName != null) {
+                name = qName;
+            }
+        }
+        addType(name, typeProcessor, context, passSource ? psiElement : null);
+    }
+
+    private static String evalComponentTypeFromArrayExpression(
+        JSExpression rawqualifier,
+        TypeProcessor typeProcessor,
+        EvaluateContext context,
+        JSExpression collectionExpression
+    ) {
+        if (collectionExpression != null) {
+            if (context.isAlreadyProcessingItem(rawqualifier)) {
+                return null;
+            }
+            context.addProcessingItem(rawqualifier);
+            final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+            doEvalForExpr(collectionExpression, lprocessor, context);
+            return addComponentTypeFromProcessor(rawqualifier, typeProcessor, context, lprocessor);
+        }
+
+        return null;
+    }
+
+    private static String addComponentTypeFromProcessor(
+        JSExpression rawqualifier,
+        TypeProcessor typeProcessor,
+        EvaluateContext context,
+        SimpleTypeProcessor lprocessor
+    ) {
+        if (lprocessor.type != null) {
+            String type = lprocessor.type;
+            type = JSTypeEvaluateManager.isArrayType(type) ? JSTypeEvaluateManager.getComponentType(type) : "*";
+            addType(JSImportHandlingUtil.resolveTypeName(type, rawqualifier), typeProcessor, context, rawqualifier);
+            return type;
+        }
+        return null;
+    }
+
+    private static boolean isValidType(String parameterType) {
+        return parameterType != null && parameterType.length() > 0;
+    }
+
+    private static boolean findDef(
+        final TypeProcessor typeProcessor,
+        final EvaluateContext context,
+        final JSReferenceExpression qualifier,
+        final ResolveProcessor processor
+    ) {
+        final PsiElement parent = qualifier.getParent();
+        JSResolveUtil.treeWalkUp(processor, qualifier, parent, qualifier);
+
+        PsiElement jsElement = processor.getResult();
+        if (jsElement instanceof JSDefinitionExpression) {
+            addTypeFromDefExpr(typeProcessor, context, jsElement);
+            return true;
+        }
+        return false;
+    }
+
+    private static void tryAddBindowsType(
+        final JSReferenceExpression qualifier,
+        final TypeProcessor typeProcessor,
+        final EvaluateContext context
+    ) {
+        final PsiElement element = qualifier.getParent();
+        if (!(element instanceof JSCallExpression)) {
+            return;
+        }
+        final JSArgumentList argumentList = ((JSCallExpression)element).getArgumentList();
+        if (argumentList == null) {
+            return;
+        }
+        final JSExpression[] expressions = argumentList.getArguments();
+        if (expressions.length == 0 || !(expressions[0] instanceof JSLiteralExpression)) {
+            return;
+        }
+
+        final String val = StringUtil.stripQuotesAroundValue(expressions[0].getText());
+        final PsiElement contextElement = qualifier.getContainingFile().getContext();
+
+        if (contextElement != null) {
+            final PsiFile containingFile = contextElement.getContainingFile();
+
+            if (isBindowsXml(containingFile)) {
+            }
+        }
+    }
+
+    private static boolean isBindowsXml(final PsiFile containingFile) {
+        return containingFile.getName().endsWith(".xml") && containingFile instanceof XmlFile;
+    }
+
+    private static void addTypeFromObjectLiteralExpression(final JSExpression rawqualifier, final TypeProcessor typeProcessor) {
+        final JSProperty[] properties = ((JSObjectLiteralExpression)rawqualifier).getProperties();
+
+        final boolean b = properties.length > 0
+            ? rawqualifier.processDeclarations((ResolveProcessor)typeProcessor, ResolveState.initial(), properties[0], properties[0])
+            : true;
+        if (b) {
+            typeProcessor.setUnknownElement(rawqualifier);
+        }
+    }
+
+    private static void addTypeFromDefExpr(final TypeProcessor typeProcessor, final EvaluateContext context, final PsiElement psiElement) {
+        final String type;
+        type = psiElement.getText();
+
+        if (!context.visitedTypes.contains(type)) {
+            context.visitedTypes.add(type);
+            final PsiElement parentElement = psiElement.getParent();
+            if (parentElement instanceof JSAssignmentExpression assignment) {
+                JSExpression expr = assignment.getROperand();
+                while (expr instanceof JSAssignmentExpression rOperandAssignment) {
+                    expr = rOperandAssignment.getROperand();
+                }
+                if (expr != null) {
+                    doEvalForExpr(expr, typeProcessor, context);
+                }
+            }
+            else {
+                typeProcessor.setUnknownElement(parentElement);
+            }
+        }
+    }
+
+    private static void getTypeFromConstant(final JSExpression rawqualifier, TypeProcessor typeProcessor, EvaluateContext context) {
+        final ASTNode childNode = rawqualifier.getNode().getFirstChildNode();
+        IElementType constantType = childNode.getElementType();
+
+        String type = JavaScriptTokenSets.STRING_LITERALS.contains(constantType)
+            ? STRING_TYPE_NAME
+            : constantType == JSTokenTypes.NUMERIC_LITERAL
+            ? NUMBER_TYPE_NAME
+            : constantType == JSTokenTypes.REGEXP_LITERAL
+            ? REG_EXP_TYPE_NAME
+            : constantType == JSTokenTypes.XML_START_TAG_START
+            ? XML_TYPE_NAME
+            : constantType == JSTokenTypes.XML_START_TAG_LIST
+            ? XML_LIST_TYPE_NAME
+            : constantType == JSTokenTypes.TRUE_KEYWORD || constantType == JSTokenTypes.FALSE_KEYWORD
+            ? BOOLEAN_TYPE_NAME
+            : null;
+
+        if (type == NUMBER_TYPE_NAME && typeProcessor.ecma()) {
+            final String text = childNode.getText();
+            if (text.indexOf('.') == -1) {
+                type = INT_TYPE;
+            }
+        }
+
+        if (type != null) {
+            addType(type, typeProcessor, context, rawqualifier);
+        }
+        else {
+            typeProcessor.setUnknownElement(rawqualifier);
+        }
+    }
+
+    protected void addPackageScope(final List<String[]> possibleNameIds, final JSClass jsClass, final PsiElement expression) {
+        final String packageQualifier = JSResolveUtil.findPackageStatementQualifier(expression);
+        String qName;
+
+        if (packageQualifier != null) {
+            buildIndexListFromQNameAndCorrectQName(packageQualifier, jsClass, possibleNameIds);
+        }
+        else if (jsClass != null && (qName = jsClass.getQualifiedName()) != null && !qName.equals(jsClass.getName())) {
+            final int index = qName.lastIndexOf('.');
+            if (index > 0) {
+                buildIndexListFromQNameAndCorrectQName(qName.substring(0, index), jsClass, possibleNameIds);
+            }
+        }
+        else if (jsClass == null) {
+            String s = JSResolveUtil.findPackageForMxml(expression);
+            if (isValidType(s)) {
+                buildIndexListFromQNameAndCorrectQName(s, expression, possibleNameIds);
+            }
+        }
+    }
+
+    protected String buildIndexListFromQNameAndCorrectQName(String type, final PsiElement source, List<String[]> possibleNameIds) {
+        final List<String> list = new ArrayList<>();
+        type = addIndexListFromQName(type, source, list);
+
+        possibleNameIds.add(ArrayUtil.toStringArray(list));
+        return type;
+    }
+
+    public static String addIndexListFromQName(String type, final PsiElement source, final List<String> list) {
+        int i = type.indexOf('.');
+        int lastI = 0;
+
+        while (i != -1) {
+            list.add(type.substring(lastI, i));
+            lastI = i + 1;
+            i = type.indexOf('.', lastI);
+        }
+
+        if (i != type.length()) {
+            String s = type.substring(lastI, type.length());
+            if (source == null) {
+                s = StringUtil.capitalize(s); // when type name goes from comments
+            }
+            if (lastI == 0 && !s.equals(type)) {
+                type = s;
+            }
+            list.add(s);
+        }
+        return type;
+    }
+
+    private static void addType(String type, TypeProcessor typeProcessor, EvaluateContext context, final PsiElement source) {
+        if (type == null) {
+            return;
+        }
+        int spacePos = type.indexOf(' ');
+        if (spacePos != -1) {
+            type = type.substring(0, spacePos);
+        }
+
+        if (!(typeProcessor instanceof GenericTypeParametersClient)) {
+            final int gtPos = type.indexOf('<');
+            if (gtPos > 0 && type.charAt(gtPos - 1) == '.') {
+                type = type.substring(0, gtPos - 1);
+            }
+        }
+
+        if (!typeProcessor.ecma()) {
+            type = JSTypeEvaluateManager.getInstanceNameByType(type);
+        }
+        typeProcessor.process(type, context, source);
+    }
+
+    @Override
+    public <T> T getHint(final Key<T> hintClass) {
+        return null;
+    }
+
+    @Override
+    public void handleEvent(Event event, Object associated) {
+    }
+
+    enum MatchType {
+        COMPLETE_TYPE,
+        COMPLETE,
+        COMPLETE_NS,
+        PARTIAL,
+        NOMATCH
+    }
+
+    interface HierarchyProcessor {
+        boolean processClass(JSClass clazz);
+    }
+
+    protected void doIterateTypeHierarchy(final String[] contextIds, final HierarchyProcessor processor) {
+        StringBuilder builder = new StringBuilder();
+        for (String cnameId : contextIds) {
+            if (builder.length() > 0) {
+                builder.append('.');
+            }
+            builder.append(cnameId);
+        }
+
+        final String typeName = builder.toString();
+        if (typeName.length() == 0) {
+            return;
+        }
+
+        myIteratedTypeName = typeName;
+        doIterateHierarchy(typeName, processor);
+        myIteratedTypeName = null;
+    }
+
+    protected void doIterateHierarchy(final String typeName, final HierarchyProcessor processor) {
+        final PsiElement clazz = JSResolveUtil.findClassByQName(typeName, myContext);
+        if (clazz instanceof JSClass jsClass) {
+            for (JSClass superClazz : jsClass.getSuperClasses()) {
+                superClazz.processDeclarations(
+                    new ResolveProcessor(null) {
+                        {
+                            setToProcessMembers(false);
+                            setToProcessHierarchy(true);
+                            setTypeContext(true);
+                        }
+
+                        @Override
+                        public boolean execute(final PsiElement element, final ResolveState state) {
+                            if (element instanceof JSClass) {
+                                if (!processor.processClass((JSClass)element)) {
+                                    return false;
+                                }
+                            }
+                            return true;
+                        }
+                    },
+                    ResolveState.initial(),
+                    null,
+                    clazz
+                );
+            }
+
+            return;
+        }
+    }
+
+
+    public static class EvaluateContext {
+        public final PsiFile targetFile;
+        public final Set<String> visitedTypes = new HashSet<>();
+        private Set<JSExpression> processingItems;
+        private PsiElement source;
+
+        public EvaluateContext(final PsiFile targetFile) {
+            this.targetFile = targetFile;
+        }
+
+        public boolean isAlreadyProcessingItem(final JSExpression rawqualifier) {
+            return processingItems != null && processingItems.contains(rawqualifier);
+        }
+
+        public void addProcessingItem(final JSExpression rawqualifier) {
+            if (processingItems == null) {
+                processingItems = new HashSet<>();
+            }
+            processingItems.add(rawqualifier);
+        }
+
+        public void removeProcessingItem(final JSExpression rawqualifier) {
+            processingItems.remove(rawqualifier);
+        }
+
+        public PsiElement getSource() {
+            return source;
+        }
+
+        public void setSource(final PsiElement source) {
+            this.source = source;
+        }
+    }
+
+    public interface TypeProcessor {
+        void process(@Nonnull String type, @Nonnull EvaluateContext evaluateContext, final PsiElement source);
+
+        @Deprecated
+        boolean ecma();
+
+        Set<JavaScriptFeature> getFeatures();
+
+        void setUnknownElement(@Nonnull PsiElement element);
+    }
+
+    public interface GenericTypeParametersClient {
+    }
+
+    public static class SimpleTypeProcessor extends ResolveProcessor implements TypeProcessor, GenericTypeParametersClient {
+        private String type;
+        private PsiElement result;
+        private PsiElement source;
+        private final Set<JavaScriptFeature> myFeatures;
+
+        public SimpleTypeProcessor(Set<JavaScriptFeature> features) {
+            super(null);
+            myFeatures = features;
+        }
+
+        @Override
+        public void process(@Nonnull final String _type, @Nonnull final EvaluateContext evaluateContext, final PsiElement _source) {
+            setType(type != null && !type.equals(_type) ? ANY_TYPE : _type, _source);
+        }
+
+        private void setType(final String s, final PsiElement _source) {
+            type = s;
+            source = _source;
+        }
+
+        @Override
+        public Set<JavaScriptFeature> getFeatures() {
+            return myFeatures;
+        }
+
+        @Override
+        public boolean ecma() {
+            return myFeatures.contains(JavaScriptFeature.CLASS);
+        }
+
+        @Override
+        public boolean execute(final PsiElement element, final ResolveState state) {
+            result = element;
+            return true;
+        }
+
+        @Override
+        public void setUnknownElement(@Nonnull final PsiElement _element) {
+            setType(ANY_TYPE, _element);
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public PsiElement getSource() {
+            return source;
+        }
+    }
+
+    public static class TagContextBuilder {
+        public final PsiElement element;
+        public final String typeName;
+
+        public TagContextBuilder(PsiElement psiElement, String defaultName) {
+            String typeName = null;
+            final XmlTag tag = PsiTreeUtil.getParentOfType(psiElement, XmlTag.class);
+            JSClass element = null;
+
+            if (tag != null) {
+                final PsiFile containingFile = tag.getContainingFile();
+
+                if (isBindowsXml(containingFile)) {
+                    typeName = "Bi" + tag.getLocalName();
+                }
+                else {
+                    element = JSResolveUtil.getClassFromTagNameInMxml(tag);
+                    typeName = element != null ? element.getQualifiedName() : null;
+                }
+            }
+
+            if (typeName == null) {
+                typeName = defaultName;
+            }
+
+            this.typeName = typeName;
+            this.element = element;
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
index 97dca68f..1f98e9e1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
@@ -19,13 +19,11 @@
 /**
  * @by Maxim.Mossienko
  */
-public class CompletionProcessor extends ResolveProcessor
-{
-	private boolean myInVarDcl;
-	private boolean myInFuncDcl;
+public class CompletionProcessor extends ResolveProcessor {
+    private boolean myInVarDcl;
+    private boolean myInFuncDcl;
 
-	public CompletionProcessor()
-	{
-		super(null);
-	}
+    public CompletionProcessor() {
+        super(null);
+    }
 }
\ No newline at end of file

From 5f43237a889e84981f15921b9eaefb113c678593 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 27 Jul 2024 20:05:46 +0400
Subject: [PATCH 226/340] add BUILD_NUMBER env - fix issue with downloading
 dependencies

---
 .github/workflows/maven.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b2e62c5b..8dae953b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,6 +1,3 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
 name: jdk21
 
 on:
@@ -8,6 +5,8 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+env:
+  BUILD_NUMBER: 999999
 
 jobs:
   build:

From b8ddc1edf334f76a01347b541781c1ea84c056ac Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 27 Jul 2024 22:03:01 +0300
Subject: [PATCH 227/340] Code reformat using IJ4 code style (part 16).

---
 .../psi/resolve/JSImportHandlingUtil.java     |  971 ++-
 .../JSImportedElementResolveResult.java       |   40 +-
 .../javascript/psi/resolve/JSResolveUtil.java | 5503 ++++++++---------
 3 files changed, 2981 insertions(+), 3533 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index a7652d02..893332b3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -46,6 +46,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -54,543 +55,437 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 29, 2008
- *         Time: 6:52:42 PM
+ * Date: Jul 29, 2008
+ * Time: 6:52:42 PM
  */
-public class JSImportHandlingUtil
-{
-	public static final Key<CachedValue<Map<String, Object>>> ourImportListCache = Key.create("js.import.list.cache");
-	public static final UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object> myImportListCache = new ImportListDataCache();
-	public static final Key<CachedValue<Map<String, JSImportedElementResolveResult>>> ourImportResolveCache = Key.create("js.import.resolve");
-	public static final UserDataCache<CachedValue<Map<String, JSImportedElementResolveResult>>, PsiElement, Object> myImportResolveCache = new UserDataCache<CachedValue<Map<String,
-			JSImportedElementResolveResult>>, PsiElement, Object>()
-	{
-		@Override
-		protected CachedValue<Map<String, JSImportedElementResolveResult>> compute(final PsiElement psiElement, final Object p)
-		{
-			return CachedValuesManager.getManager(psiElement.getProject()).createCachedValue(new CachedValueProvider<Map<String, JSImportedElementResolveResult>>()
-			{
-				@Override
-				public Result<Map<String, JSImportedElementResolveResult>> compute()
-				{
-					return new Result<Map<String, JSImportedElementResolveResult>>(new ConcurrentHashMap<String, JSImportedElementResolveResult>(), PsiModificationTracker.MODIFICATION_COUNT);
-				}
-			}, false);
-		}
-	};
-
-	public static String resolveTypeName(final String _str, @Nonnull PsiElement context)
-	{
-		final JSImportedElementResolveResult resolveResult = _resolveTypeName(_str, context);
-		if(resolveResult == null)
-		{
-			return _str;
-		}
-		return resolveResult.qualifiedName;
-	}
-
-	// TODO _str should be JSReferenceExpression for caching!
-	private static JSImportedElementResolveResult _resolveTypeName(final String _name, @Nonnull PsiElement context)
-	{
-		String name = _name;
-		if(name == null)
-		{
-			return null;
-		}
-		final int i = name.indexOf('<');
-		String signature = null;
-
-		if(i != -1)
-		{
-			final int index = name.lastIndexOf('.', i);
-			if(index == -1)
-			{
-				return null;
-			}
-			signature = name.substring(index);
-			name = name.substring(0, index);
-		}
-
-		if(name.indexOf('.') != -1)
-		{
-			return null;
-		}
-
-		final Ref<JSImportedElementResolveResult> resultRef = new Ref<JSImportedElementResolveResult>();
-
-		final String name1 = name;
-		JSResolveUtil.walkOverStructure(context, new Processor<PsiNamedElement>()
-		{
-			@Override
-			public boolean process(PsiNamedElement context)
-			{
-				JSImportedElementResolveResult resolved = null;
-
-				if(context instanceof XmlBackedJSClassImpl)
-				{ // reference list in mxml
-					XmlTag rootTag = ((XmlBackedJSClassImpl) context).getParent();
-					final XmlElementDescriptor descriptor = rootTag != null ? rootTag.getDescriptor() : null;
-					PsiElement element = descriptor != null ? descriptor.getDeclaration() : null;
-					if(element instanceof XmlFile)
-					{
-						element = XmlBackedJSClassImpl.getXmlBackedClass((XmlFile) element);
-					}
-
-					final String s = element instanceof JSClass ? ((JSClass) element).getQualifiedName() : rootTag.getLocalName();
-					resolved = new JSImportedElementResolveResult(s);
-				}
-				else if(context instanceof JSQualifiedNamedElement)
-				{
-					if(context instanceof JSClass && name1.equals(context.getName()))
-					{
-						resolved = new JSImportedElementResolveResult(((JSQualifiedNamedElement) context).getQualifiedName());
-					}
-					else
-					{
-						resolved = resolveTypeNameUsingImports(name1, context);
-
-						if(resolved == null)
-						{
-							final String qName = ((JSQualifiedNamedElement) context).getQualifiedName();
-							final String packageName = qName != null ? context instanceof JSPackageStatement ? qName + "." : qName.substring(0, qName.lastIndexOf('.') + 1) : "";
-
-							if(packageName.length() != 0)
-							{
-								final PsiElement byQName = JSClassBase.findClassFromNamespace(packageName + name1, context);
-
-								if(byQName instanceof JSQualifiedNamedElement)
-								{
-									resolved = new JSImportedElementResolveResult(((JSQualifiedNamedElement) byQName).getQualifiedName());
-								}
-							}
-						}
-					}
-				}
-				else
-				{
-					resolved = resolveTypeNameUsingImports(name1, context);
-					PsiElement contextOfContext;
-
-					if(resolved == null && context instanceof JSFile && (contextOfContext = context.getContext()) != null)
-					{
-						PsiFile containingFile = contextOfContext.getContainingFile();
-						XmlBackedJSClassImpl clazz = containingFile instanceof XmlFile ? (XmlBackedJSClassImpl) XmlBackedJSClassImpl.getXmlBackedClass((XmlFile) containingFile) : null;
-
-						if(clazz != null)
-						{
-							ResolveProcessor r = new ResolveProcessor(name1);
-							if(!clazz.processComponentNames(r))
-							{
-								PsiElement resultFromProcessor = r.getResult();
-								JSClass clazzFromComponent = resultFromProcessor instanceof JSClass ? (JSClass) resultFromProcessor : null;
-
-								if(clazzFromComponent != null)
-								{
-									resolved = new JSImportedElementResolveResult(clazzFromComponent.getQualifiedName(), clazz, null);
-								}
-							}
-						}
-					}
-				}
-
-				if(resolved != null)
-				{
-					resultRef.set(resolved);
-					return false;
-				}
-
-				if(context instanceof JSPackageStatement)
-				{
-					return false;
-				}
-				return true;
-			}
-		});
-
-		JSImportedElementResolveResult result = resultRef.get();
-
-		if(signature != null && result != null)
-		{
-			result = result.appendSignature(signature);
-		}
-		return result;
-	}
-
-	private static JSQualifiedNamedElement resolveTypeNameInTheSamePackage(final String str, final PsiElement context)
-	{
-		final String packageQualifierText = JSResolveUtil.findPackageStatementQualifier(context);
-		final String candidateText = packageQualifierText != null ? packageQualifierText + "." + str : str;
-
-		PsiElement byQName = JSClassBase.findClassFromNamespace(candidateText, context);
-		if(byQName instanceof JSQualifiedNamedElement)
-		{
-			return (JSQualifiedNamedElement) byQName;
-		}
-
-		if(packageQualifierText != null)
-		{
-			byQName = JSClassBase.findClassFromNamespace(str, context);
-			if(byQName instanceof JSQualifiedNamedElement)
-			{
-				return (JSQualifiedNamedElement) byQName;
-			}
-		}
-
-		return null;
-	}
-
-	public static
-	@Nullable
-	JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull final JSReferenceExpression expr)
-	{
-		if(expr.getQualifier() != null)
-		{
-			return null;
-		}
-		if(JSResolveUtil.referenceExpressionShouldBeQualified(expr))
-		{
-			return null;
-		}
-
-		if(expr.getReferencedName() == null)
-		{
-			return null;
-		}
-
-		return _resolveTypeName(expr.getText(), expr);
-	}
-
-	private static
-	@Nullable
-	JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String referencedName, PsiNamedElement parent)
-	{
-		LanguageVersion languageVersion = parent.getLanguageVersion();
-		if(languageVersion instanceof JavaScriptVersionWithHelper)
-		{
-			ResolveHelper helper = ((JavaScriptVersionWithHelper) languageVersion).getHelper();
-
-			JSImportedElementResolveResult result = helper.resolveTypeNameUsingImports(referencedName, parent);
-			if(result != null)
-			{
-				return result;
-			}
-		}
-
-		final Map<String, JSImportedElementResolveResult> map = myImportResolveCache.get(ourImportResolveCache, parent, null).getValue();
-		JSImportedElementResolveResult result = map.get(referencedName);
-
-		if(result == null)
-		{
-			result = resolveTypeNameUsingImportsInner(referencedName, parent);
-			map.put(referencedName, result != null ? result : JSImportedElementResolveResult.EMPTY_RESULT);
-		}
-
-		return result != JSImportedElementResolveResult.EMPTY_RESULT ? result : null;
-	}
-
-	private static JSImportedElementResolveResult resolveTypeNameUsingImportsInner(final String referencedName, final PsiNamedElement parent)
-	{
-		final Map<String, Object> value = myImportListCache.get(ourImportListCache, parent, null).getValue();
-		JSImportedElementResolveResult expression = FlexImportSupport.tryFindInMap(referencedName, parent, value);
-		if(expression != null)
-		{
-			return expression;
-		}
-
-		if(parent instanceof JSPackageStatement)
-		{
-			return checkTheSamePackageOrGlobal(referencedName, parent);
-		}
-		else if(parent instanceof JSFile && parent.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4))
-		{
-			final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
-
-			if(element instanceof XmlBackedJSClassImpl)
-			{
-				final ResolveProcessor processor = new ResolveProcessor(referencedName);
-				final boolean b = ((XmlBackedJSClassImpl) element).doImportFromScripts(processor, parent);
-
-				if(!b)
-				{
-					final JSQualifiedNamedElement jsClass = (JSQualifiedNamedElement) processor.getResult();
-					return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, processor.getImportUsed());
-				}
-
-				JSQualifiedNamedElement jsClass = resolveTypeNameInTheSamePackage(referencedName, element);
-
-				if(jsClass == null)
-				{
-					final JSClass parentClass = (JSClass) element;
-					final JSClass[] classes = parentClass.getSuperClasses();
-
-					if(classes != null && classes.length > 0 && referencedName.equals(classes[0].getName()))
-					{
-						jsClass = classes[0];
-					}
-				}
-
-				if(jsClass != null)
-				{
-					return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, null);
-				}
-			}
-			else
-			{
-				final JSImportedElementResolveResult resolveResult = checkTheSamePackageOrGlobal(referencedName, parent);
-				if(resolveResult != null)
-				{
-					return resolveResult;
-				}
-			}
-
-			expression = FlexImportSupport.resolveTypeNameUsingImplicitImports(referencedName, (JSFile) parent);
-			if(expression != null)
-			{
-				return expression;
-			}
-		}
-		else if(parent instanceof XmlBackedJSClassImpl)
-		{
-			JSQualifiedNamedElement jsClass = resolveTypeNameInTheSamePackage(referencedName, parent);
-			if(jsClass != null)
-			{
-				return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, null);
-			}
-
-			final Ref<JSImportedElementResolveResult> result = new Ref<JSImportedElementResolveResult>();
-			processInlineComponentsInScope((XmlBackedJSClassImpl) parent, new Processor<XmlBackedJSClassImpl>()
-			{
-				@Override
-				public boolean process(XmlBackedJSClassImpl inlineComponent)
-				{
-					if(referencedName.equals(inlineComponent.getExplicitName()))
-					{
-						result.set(new JSImportedElementResolveResult(inlineComponent.getQualifiedName(), inlineComponent, null));
-						return false;
-					}
-					return true;
-				}
-			});
-			if(!result.isNull())
-			{
-				return result.get();
-			}
-		}
-
-		return null;
-	}
-
-	private static boolean processInlineComponentsInScope(XmlBackedJSClassImpl context, Processor<XmlBackedJSClassImpl> processor)
-	{
-		XmlTag rootTag = ((XmlFile) context.getContainingFile()).getDocument().getRootTag();
-		boolean recursive = XmlBackedJSClassImpl.isInlineComponentTag(context.getParent());
-		for(XmlBackedJSClassImpl inlineComponent : XmlBackedJSClassImpl.getChildInlineComponents(rootTag, recursive))
-		{
-			if(!processor.process(inlineComponent))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static JSImportedElementResolveResult checkTheSamePackageOrGlobal(final String referencedName, final PsiNamedElement parent)
-	{
-		final JSQualifiedNamedElement jsClass = resolveTypeNameInTheSamePackage(referencedName, parent);
-
-		if(jsClass != null)
-		{
-			return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, null);
-		}
-		return null;
-	}
-
-	public static boolean tryResolveImports(final PsiScopeProcessor processor, PsiNamedElement parent, @Nonnull PsiElement place)
-	{
-		if(!isAdequatePlaceForImport(parent, place))
-		{
-			return true;
-		}
-
-		return !importClass(processor, parent);
-	}
-
-	public static boolean importClass(final PsiScopeProcessor processor, final PsiNamedElement parent)
-	{
-		if(processor instanceof ResolveProcessor && ((ResolveProcessor) processor).isLocalResolve())
-		{
-			return false;
-		}
-		ResolveProcessor resolveProcessor = (ResolveProcessor) processor;
-		final String s = resolveProcessor.getName();
-
-		if(s != null)
-		{
-			if(resolveProcessor.specificallyAskingToResolveQualifiedNames())
-			{
-				final Map<String, Object> value = myImportListCache.get(ourImportListCache, parent, null).getValue();
-				JSImportedElementResolveResult resolveResult = FlexImportSupport.tryFindInMap(s, parent, value, resolveProcessor.getQualifiedNameToImport());
-				if(dispatchResult(resolveResult, processor))
-				{
-					return true;
-				}
-			}
-
-			final JSImportedElementResolveResult expression = resolveTypeNameUsingImports(s, parent);
-
-			if(dispatchResult(expression, processor))
-			{
-				return true;
-			}
-		}
-		else
-		{
-			if(parent instanceof XmlBackedJSClassImpl)
-			{
-				if(!processInlineComponentsInScope((XmlBackedJSClassImpl) parent, new Processor<XmlBackedJSClassImpl>()
-				{
-					@Override
-					public boolean process(XmlBackedJSClassImpl inlineComponent)
-					{
-						return processor.execute(inlineComponent, ResolveState.initial());
-					}
-				}))
-				{
-					return false;
-				}
-			}
-			final String packageQualifierText = JSResolveUtil.findPackageStatementQualifier(parent);
-			importClassViaHelper(processor, parent, packageQualifierText);
-		}
-
-		return false;
-	}
-
-	private static boolean dispatchResult(JSImportedElementResolveResult expression, PsiScopeProcessor processor)
-	{
-		if(expression != null)
-		{
-			final PsiElement element = expression.resolvedElement;
-
-			if(element != null)
-			{
-				ResolveState state = ResolveState.initial();
-				if(expression.importStatement != null)
-				{
-					state = state.put(ResolveProcessor.IMPORT_KEY, expression.importStatement);
-				}
-				return !processor.execute(element, state);
-			}
-		}
-
-		return false;
-	}
-
-	public static void importClassViaHelper(final PsiScopeProcessor processor, final PsiNamedElement file, final String packageQualifierText)
-	{
-		for(JSResolveHelper helper : Extensions.getExtensions(JSResolveHelper.EP_NAME))
-		{
-			helper.importClass(processor, file, packageQualifierText);
-		}
-	}
-
-	public static boolean isAdequatePlaceForImport(final PsiNamedElement parent, @Nonnull PsiElement place)
-	{
-		if(parent instanceof JSFile && !parent.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4))
-		{
-			return false;
-		}
-
-		if(place instanceof JSReferenceExpression)
-		{
-			final PsiElement placeParent = place.getParent();
-
-			if(placeParent instanceof JSReferenceExpression)
-			{
-				final PsiElement currentParent = JSResolveUtil.getTopReferenceParent(placeParent);
-
-				if(JSResolveUtil.isSelfReference(currentParent, place) ||
-						//currentParent instanceof JSDefinitionExpression ||
-						currentParent instanceof JSReferenceList)
-				{
-					return false;
-				}
-			}
-		}
-		else if(place instanceof JSDocTagValue)
-		{
-			// further conditions to come
-		}
-		else
-		{
-			if(!(place instanceof JSFile))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private static class ImportListDataCache extends UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object>
-	{
-		@Override
-		protected final CachedValue<Map<String, Object>> compute(final PsiElement owner, Object o)
-		{
-			return CachedValuesManager.getManager(owner.getProject()).createCachedValue(new CachedValueProvider<Map<String, Object>>()
-			{
-				@Override
-				public Result<Map<String, Object>> compute()
-				{
-					final Map<String, Object> result = new HashMap<String, Object>();
-					collect(result, owner, null);
-					return new Result<Map<String, Object>>(result, owner);
-				}
-			}, false);
-		}
-
-		private static void collect(final Map<String, Object> result, final PsiElement owner, Set<PsiFile> visitedIncludes)
-		{
-			PsiElement[] children = PsiElement.EMPTY_ARRAY;
-
-			if(owner instanceof JSIncludeDirective)
-			{
-				final PsiFile file = ((JSIncludeDirective) owner).resolveFile();
-				if(file != null && (visitedIncludes == null || !visitedIncludes.contains(file)))
-				{
-					if(visitedIncludes == null)
-					{
-						visitedIncludes = new HashSet<PsiFile>();
-					}
-					visitedIncludes.add(file);
-					children = JSResolveUtil.getSourceElements(file);
-				}
-			}
-			else if(owner instanceof JSFile || owner instanceof JSStubElementImpl)
-			{
-				children = JSResolveUtil.getSourceElements(owner);
-			}
-			else
-			{
-				children = owner.getChildren();
-			}
-
-			for(PsiElement c : children)
-			{
-				if(c instanceof JSImportStatement)
-				{
-					final JSImportStatement s = ((JSImportStatement) c);
-
-					if(s.getImportText() != null)
-					{
-						FlexImportSupport.appendToMap(result, s);
-					}
-				}
-				else if(!(c instanceof JSPackageStatement) && !(c instanceof JSFunction))
-				{
-					collect(result, c, visitedIncludes);
-				}
-			}
-		}
-	}
+public class JSImportHandlingUtil {
+    public static final Key<CachedValue<Map<String, Object>>> ourImportListCache = Key.create("js.import.list.cache");
+    public static final UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object> myImportListCache = new ImportListDataCache();
+    public static final Key<CachedValue<Map<String, JSImportedElementResolveResult>>> ourImportResolveCache =
+        Key.create("js.import.resolve");
+    public static final UserDataCache<CachedValue<Map<String, JSImportedElementResolveResult>>, PsiElement, Object> myImportResolveCache =
+        new UserDataCache<>() {
+            @Override
+            protected CachedValue<Map<String, JSImportedElementResolveResult>> compute(final PsiElement psiElement, final Object p) {
+                return CachedValuesManager.getManager(psiElement.getProject()).createCachedValue(
+                    () -> new CachedValueProvider.Result<Map<String, JSImportedElementResolveResult>>(
+                        new ConcurrentHashMap<>(),
+                        PsiModificationTracker.MODIFICATION_COUNT
+                    ),
+                    false
+                );
+            }
+        };
+
+    public static String resolveTypeName(final String _str, @Nonnull PsiElement context) {
+        final JSImportedElementResolveResult resolveResult = _resolveTypeName(_str, context);
+        if (resolveResult == null) {
+            return _str;
+        }
+        return resolveResult.qualifiedName;
+    }
+
+    // TODO _str should be JSReferenceExpression for caching!
+    private static JSImportedElementResolveResult _resolveTypeName(final String _name, @Nonnull PsiElement context) {
+        String name = _name;
+        if (name == null) {
+            return null;
+        }
+        final int i = name.indexOf('<');
+        String signature = null;
+
+        if (i != -1) {
+            final int index = name.lastIndexOf('.', i);
+            if (index == -1) {
+                return null;
+            }
+            signature = name.substring(index);
+            name = name.substring(0, index);
+        }
+
+        if (name.indexOf('.') != -1) {
+            return null;
+        }
+
+        final Ref<JSImportedElementResolveResult> resultRef = new Ref<JSImportedElementResolveResult>();
+
+        final String name1 = name;
+        JSResolveUtil.walkOverStructure(
+            context,
+            context1 -> {
+                JSImportedElementResolveResult resolved = null;
+
+                if (context1 instanceof XmlBackedJSClassImpl xmlBackedJSClass) { // reference list in mxml
+                    XmlTag rootTag = xmlBackedJSClass.getParent();
+                    final XmlElementDescriptor descriptor = rootTag != null ? rootTag.getDescriptor() : null;
+                    PsiElement element = descriptor != null ? descriptor.getDeclaration() : null;
+                    if (element instanceof XmlFile xmlFile) {
+                        element = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
+                    }
+
+                    final String s = element instanceof JSClass jsClass ? jsClass.getQualifiedName() : rootTag.getLocalName();
+                    resolved = new JSImportedElementResolveResult(s);
+                }
+                else if (context1 instanceof JSQualifiedNamedElement qualifiedNamedElement) {
+                    if (context1 instanceof JSClass && name1.equals(context1.getName())) {
+                        resolved = new JSImportedElementResolveResult(qualifiedNamedElement.getQualifiedName());
+                    }
+                    else {
+                        resolved = resolveTypeNameUsingImports(name1, qualifiedNamedElement);
+
+                        if (resolved == null) {
+                            final String qName = qualifiedNamedElement.getQualifiedName();
+                            final String packageName = qName != null ? context1 instanceof JSPackageStatement
+                                ? qName + "."
+                                : qName.substring(0, qName.lastIndexOf('.') + 1) : "";
+
+                            if (packageName.length() != 0) {
+                                final PsiElement byQName = JSClassBase.findClassFromNamespace(packageName + name1, context1);
+
+                                if (byQName instanceof JSQualifiedNamedElement byQNameNamed) {
+                                    resolved = new JSImportedElementResolveResult(byQNameNamed.getQualifiedName());
+                                }
+                            }
+                        }
+                    }
+                }
+                else {
+                    resolved = resolveTypeNameUsingImports(name1, context1);
+                    PsiElement contextOfContext;
+
+                    if (resolved == null && context1 instanceof JSFile && (contextOfContext = context1.getContext()) != null) {
+                        PsiFile containingFile = contextOfContext.getContainingFile();
+                        XmlBackedJSClassImpl clazz = containingFile instanceof XmlFile
+                            ? (XmlBackedJSClassImpl)XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)containingFile) : null;
+
+                        if (clazz != null) {
+                            ResolveProcessor r = new ResolveProcessor(name1);
+                            if (!clazz.processComponentNames(r)) {
+                                PsiElement resultFromProcessor = r.getResult();
+                                JSClass clazzFromComponent = resultFromProcessor instanceof JSClass jsClass ? jsClass : null;
+
+                                if (clazzFromComponent != null) {
+                                    resolved = new JSImportedElementResolveResult(clazzFromComponent.getQualifiedName(), clazz, null);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (resolved != null) {
+                    resultRef.set(resolved);
+                    return false;
+                }
+
+                return !(context1 instanceof JSPackageStatement);
+            }
+        );
+
+        JSImportedElementResolveResult result = resultRef.get();
+
+        if (signature != null && result != null) {
+            result = result.appendSignature(signature);
+        }
+        return result;
+    }
+
+    private static JSQualifiedNamedElement resolveTypeNameInTheSamePackage(final String str, final PsiElement context) {
+        final String packageQualifierText = JSResolveUtil.findPackageStatementQualifier(context);
+        final String candidateText = packageQualifierText != null ? packageQualifierText + "." + str : str;
+
+        PsiElement byQName = JSClassBase.findClassFromNamespace(candidateText, context);
+        if (byQName instanceof JSQualifiedNamedElement) {
+            return (JSQualifiedNamedElement)byQName;
+        }
+
+        if (packageQualifierText != null) {
+            byQName = JSClassBase.findClassFromNamespace(str, context);
+            if (byQName instanceof JSQualifiedNamedElement qualifiedNamedElement) {
+                return qualifiedNamedElement;
+            }
+        }
+
+        return null;
+    }
+
+    public static
+    @Nullable
+    JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull final JSReferenceExpression expr) {
+        if (expr.getQualifier() != null) {
+            return null;
+        }
+        if (JSResolveUtil.referenceExpressionShouldBeQualified(expr)) {
+            return null;
+        }
+
+        if (expr.getReferencedName() == null) {
+            return null;
+        }
+
+        return _resolveTypeName(expr.getText(), expr);
+    }
+
+    private static
+    @Nullable
+    JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String referencedName, PsiNamedElement parent) {
+        LanguageVersion languageVersion = parent.getLanguageVersion();
+        if (languageVersion instanceof JavaScriptVersionWithHelper javaScriptVersionWithHelper) {
+            ResolveHelper helper = javaScriptVersionWithHelper.getHelper();
+
+            JSImportedElementResolveResult result = helper.resolveTypeNameUsingImports(referencedName, parent);
+            if (result != null) {
+                return result;
+            }
+        }
+
+        final Map<String, JSImportedElementResolveResult> map = myImportResolveCache.get(ourImportResolveCache, parent, null).getValue();
+        JSImportedElementResolveResult result = map.get(referencedName);
+
+        if (result == null) {
+            result = resolveTypeNameUsingImportsInner(referencedName, parent);
+            map.put(referencedName, result != null ? result : JSImportedElementResolveResult.EMPTY_RESULT);
+        }
+
+        return result != JSImportedElementResolveResult.EMPTY_RESULT ? result : null;
+    }
+
+    private static JSImportedElementResolveResult resolveTypeNameUsingImportsInner(
+        final String referencedName,
+        final PsiNamedElement parent
+    ) {
+        final Map<String, Object> value = myImportListCache.get(ourImportListCache, parent, null).getValue();
+        JSImportedElementResolveResult expression = FlexImportSupport.tryFindInMap(referencedName, parent, value);
+        if (expression != null) {
+            return expression;
+        }
+
+        if (parent instanceof JSPackageStatement) {
+            return checkTheSamePackageOrGlobal(referencedName, parent);
+        }
+        else if (parent instanceof JSFile && parent.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4)) {
+            final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+
+            if (element instanceof XmlBackedJSClassImpl xmlBackedJSClass) {
+                final ResolveProcessor processor = new ResolveProcessor(referencedName);
+                final boolean b = xmlBackedJSClass.doImportFromScripts(processor, parent);
+
+                if (!b) {
+                    final JSQualifiedNamedElement jsClass = (JSQualifiedNamedElement)processor.getResult();
+                    return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, processor.getImportUsed());
+                }
+
+                JSQualifiedNamedElement jsClass = resolveTypeNameInTheSamePackage(referencedName, element);
+
+                if (jsClass == null) {
+                    final JSClass parentClass = (JSClass)element;
+                    final JSClass[] classes = parentClass.getSuperClasses();
+
+                    if (classes != null && classes.length > 0 && referencedName.equals(classes[0].getName())) {
+                        jsClass = classes[0];
+                    }
+                }
+
+                if (jsClass != null) {
+                    return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, null);
+                }
+            }
+            else {
+                final JSImportedElementResolveResult resolveResult = checkTheSamePackageOrGlobal(referencedName, parent);
+                if (resolveResult != null) {
+                    return resolveResult;
+                }
+            }
+
+            expression = FlexImportSupport.resolveTypeNameUsingImplicitImports(referencedName, (JSFile)parent);
+            if (expression != null) {
+                return expression;
+            }
+        }
+        else if (parent instanceof XmlBackedJSClassImpl xmlBackedJSClass) {
+            JSQualifiedNamedElement jsClass = resolveTypeNameInTheSamePackage(referencedName, parent);
+            if (jsClass != null) {
+                return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, null);
+            }
+
+            final Ref<JSImportedElementResolveResult> result = new Ref<JSImportedElementResolveResult>();
+            processInlineComponentsInScope(
+                xmlBackedJSClass,
+                inlineComponent -> {
+                    if (referencedName.equals(inlineComponent.getExplicitName())) {
+                        result.set(new JSImportedElementResolveResult(inlineComponent.getQualifiedName(), inlineComponent, null));
+                        return false;
+                    }
+                    return true;
+                }
+            );
+            if (!result.isNull()) {
+                return result.get();
+            }
+        }
+
+        return null;
+    }
+
+    private static boolean processInlineComponentsInScope(XmlBackedJSClassImpl context, Processor<XmlBackedJSClassImpl> processor) {
+        XmlTag rootTag = ((XmlFile)context.getContainingFile()).getDocument().getRootTag();
+        boolean recursive = XmlBackedJSClassImpl.isInlineComponentTag(context.getParent());
+        for (XmlBackedJSClassImpl inlineComponent : XmlBackedJSClassImpl.getChildInlineComponents(rootTag, recursive)) {
+            if (!processor.process(inlineComponent)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static JSImportedElementResolveResult checkTheSamePackageOrGlobal(final String referencedName, final PsiNamedElement parent) {
+        final JSQualifiedNamedElement jsClass = resolveTypeNameInTheSamePackage(referencedName, parent);
+
+        if (jsClass != null) {
+            return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, null);
+        }
+        return null;
+    }
+
+    public static boolean tryResolveImports(final PsiScopeProcessor processor, PsiNamedElement parent, @Nonnull PsiElement place) {
+        return !isAdequatePlaceForImport(parent, place) || !importClass(processor, parent);
+    }
+
+    public static boolean importClass(final PsiScopeProcessor processor, final PsiNamedElement parent) {
+        if (processor instanceof ResolveProcessor resolveProcessor && resolveProcessor.isLocalResolve()) {
+            return false;
+        }
+        ResolveProcessor resolveProcessor = (ResolveProcessor)processor;
+        final String s = resolveProcessor.getName();
+
+        if (s != null) {
+            if (resolveProcessor.specificallyAskingToResolveQualifiedNames()) {
+                final Map<String, Object> value = myImportListCache.get(ourImportListCache, parent, null).getValue();
+                JSImportedElementResolveResult resolveResult =
+                    FlexImportSupport.tryFindInMap(s, parent, value, resolveProcessor.getQualifiedNameToImport());
+                if (dispatchResult(resolveResult, processor)) {
+                    return true;
+                }
+            }
+
+            final JSImportedElementResolveResult expression = resolveTypeNameUsingImports(s, parent);
+
+            if (dispatchResult(expression, processor)) {
+                return true;
+            }
+        }
+        else {
+            if (parent instanceof XmlBackedJSClassImpl xmlBackedJSClass && !processInlineComponentsInScope(
+                xmlBackedJSClass,
+                inlineComponent -> processor.execute(inlineComponent, ResolveState.initial())
+            )) {
+                return false;
+            }
+            final String packageQualifierText = JSResolveUtil.findPackageStatementQualifier(parent);
+            importClassViaHelper(processor, parent, packageQualifierText);
+        }
+
+        return false;
+    }
+
+    private static boolean dispatchResult(JSImportedElementResolveResult expression, PsiScopeProcessor processor) {
+        if (expression != null) {
+            final PsiElement element = expression.resolvedElement;
+
+            if (element != null) {
+                ResolveState state = ResolveState.initial();
+                if (expression.importStatement != null) {
+                    state = state.put(ResolveProcessor.IMPORT_KEY, expression.importStatement);
+                }
+                return !processor.execute(element, state);
+            }
+        }
+
+        return false;
+    }
+
+    public static void importClassViaHelper(
+        final PsiScopeProcessor processor,
+        final PsiNamedElement file,
+        final String packageQualifierText
+    ) {
+        for (JSResolveHelper helper : Extensions.getExtensions(JSResolveHelper.EP_NAME)) {
+            helper.importClass(processor, file, packageQualifierText);
+        }
+    }
+
+    public static boolean isAdequatePlaceForImport(final PsiNamedElement parent, @Nonnull PsiElement place) {
+        if (parent instanceof JSFile && !parent.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4)) {
+            return false;
+        }
+
+        if (place instanceof JSReferenceExpression) {
+            final PsiElement placeParent = place.getParent();
+
+            if (placeParent instanceof JSReferenceExpression) {
+                final PsiElement currentParent = JSResolveUtil.getTopReferenceParent(placeParent);
+
+                if (JSResolveUtil.isSelfReference(currentParent, place) ||
+                    //currentParent instanceof JSDefinitionExpression ||
+                    currentParent instanceof JSReferenceList) {
+                    return false;
+                }
+            }
+        }
+        else if (place instanceof JSDocTagValue) {
+            // further conditions to come
+        }
+        else if (!(place instanceof JSFile)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static class ImportListDataCache extends UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object> {
+        @Override
+        protected final CachedValue<Map<String, Object>> compute(final PsiElement owner, Object o) {
+            return CachedValuesManager.getManager(owner.getProject()).createCachedValue(
+                () -> {
+                    final Map<String, Object> result = new HashMap<>();
+                    collect(result, owner, null);
+                    return new CachedValueProvider.Result<>(result, owner);
+                },
+                false
+            );
+        }
+
+        private static void collect(final Map<String, Object> result, final PsiElement owner, Set<PsiFile> visitedIncludes) {
+            PsiElement[] children = PsiElement.EMPTY_ARRAY;
+
+            if (owner instanceof JSIncludeDirective includeDirective) {
+                final PsiFile file = includeDirective.resolveFile();
+                if (file != null && (visitedIncludes == null || !visitedIncludes.contains(file))) {
+                    if (visitedIncludes == null) {
+                        visitedIncludes = new HashSet<>();
+                    }
+                    visitedIncludes.add(file);
+                    children = JSResolveUtil.getSourceElements(file);
+                }
+            }
+            else if (owner instanceof JSFile || owner instanceof JSStubElementImpl) {
+                children = JSResolveUtil.getSourceElements(owner);
+            }
+            else {
+                children = owner.getChildren();
+            }
+
+            for (PsiElement c : children) {
+                if (c instanceof JSImportStatement) {
+                    final JSImportStatement s = ((JSImportStatement)c);
+
+                    if (s.getImportText() != null) {
+                        FlexImportSupport.appendToMap(result, s);
+                    }
+                }
+                else if (!(c instanceof JSPackageStatement) && !(c instanceof JSFunction)) {
+                    collect(result, c, visitedIncludes);
+                }
+            }
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
index 8cce5e44..42e426da 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
@@ -21,30 +21,26 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 29, 2008
- *         Time: 8:04:55 PM
+ * Date: Jul 29, 2008
+ * Time: 8:04:55 PM
  */
-public class JSImportedElementResolveResult
-{
-	public final String qualifiedName;
-	public final PsiElement resolvedElement;
-	public final JavaScriptImportStatementBase importStatement;
-	public static final JSImportedElementResolveResult EMPTY_RESULT = new JSImportedElementResolveResult(null);
+public class JSImportedElementResolveResult {
+    public final String qualifiedName;
+    public final PsiElement resolvedElement;
+    public final JavaScriptImportStatementBase importStatement;
+    public static final JSImportedElementResolveResult EMPTY_RESULT = new JSImportedElementResolveResult(null);
 
-	public JSImportedElementResolveResult(String _qualifiedName)
-	{
-		this(_qualifiedName, null, null);
-	}
+    public JSImportedElementResolveResult(String _qualifiedName) {
+        this(_qualifiedName, null, null);
+    }
 
-	public JSImportedElementResolveResult(String _qualifiedName, PsiElement _resolvedElement, JavaScriptImportStatementBase _importString)
-	{
-		qualifiedName = _qualifiedName;
-		resolvedElement = _resolvedElement;
-		importStatement = _importString;
-	}
+    public JSImportedElementResolveResult(String _qualifiedName, PsiElement _resolvedElement, JavaScriptImportStatementBase _importString) {
+        qualifiedName = _qualifiedName;
+        resolvedElement = _resolvedElement;
+        importStatement = _importString;
+    }
 
-	public JSImportedElementResolveResult appendSignature(final String s)
-	{
-		return new JSImportedElementResolveResult(qualifiedName + s, resolvedElement, importStatement);
-	}
+    public JSImportedElementResolveResult appendSignature(final String s) {
+        return new JSImportedElementResolveResult(qualifiedName + s, resolvedElement, importStatement);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 5cfe2a68..c31b7f6d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -84,2982 +84,2539 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.*;
 
 /**
  * @author max, maxim.mossienko
  */
-public class JSResolveUtil
-{
-	private static final Key<CachedValue<IntObjectMap<Object>>> MY_CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
-	private static UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> ourCachedDefsCache = new RelevantDefsUserDataCache();
-	@NonNls
-	public static final String PROTOTYPE_FIELD_NAME = "prototype";
-
-	@NonNls
-	private static final String ARRAY_TYPE_NAME = "Array";
-	@NonNls
-	private static final String ARGUMENTS_TYPE_NAME = "Arguments";
-
-	public static final String COMMENT_DELIMITERS = "|/";
-
-	public static void processInjectedFileForTag(final @Nonnull XmlTag tag, @Nonnull JSInjectedFilesVisitor visitor)
-	{
-		InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(tag.getProject());
-
-		for(XmlTagChild child : tag.getValue().getChildren())
-		{
-			if(child instanceof XmlText)
-			{
-				injectedLanguageManager.enumerate(child, visitor);
-			}
-		}
-	}
-
-	public static String findPackageForMxml(final PsiElement expression)
-	{
-		String s = null;
-		final PsiFile containingFile = expression.getContainingFile();
-
-		if(containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 && containingFile.getContext() != null)
-		{
-			final PsiFile contextContainigFile = containingFile.getContext().getContainingFile();
-			VirtualFile file = contextContainigFile.getVirtualFile();
-			if(file == null && contextContainigFile.getOriginalFile() != null)
-			{
-				file = contextContainigFile.getOriginalFile().getVirtualFile();
-			}
-
-			s = getExpectedPackageNameFromFile(file, containingFile.getProject(), true);
-		}
-		return s;
-	}
-
-	public static String getExpectedPackageNameFromFile(VirtualFile file, Project project, boolean allowEvaluationFromContextRoot)
-	{
-		final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex();
-		final Module moduleForFile = file != null ? projectFileIndex.getModuleForFile(file) : null;
-
-		if(moduleForFile != null)
-		{
-			if(file instanceof VirtualFileWindow)
-			{
-				file = ((VirtualFileWindow) file).getDelegate();
-			}
-			VirtualFile rootForFile = projectFileIndex.getSourceRootForFile(file);
-			if(rootForFile == null && allowEvaluationFromContextRoot)
-			{
-				rootForFile = projectFileIndex.getContentRootForFile(file);
-			}
-
-			if(rootForFile != null)
-			{
-				return VirtualFileUtil.getRelativePath(file.isDirectory() ? file : file.getParent(), rootForFile, '.');
-			}
-		}
-		return null;
-	}
-
-	public static void processInterfaceMethods(final JSClass clazz, final CollectMethodsToImplementProcessor implementedMethodProcessor)
-	{
-		clazz.processDeclarations(implementedMethodProcessor, ResolveState.initial(), clazz, clazz);
-	}
-
-	public static String getExpressionType(final JSExpression expression, final PsiFile containingFile)
-	{
-		String type = getQualifiedExpressionType(expression, containingFile);
-
-		return getShortenedType(type, expression);
-	}
-
-	public static String getShortenedType(String type, final PsiElement context)
-	{
-		if(type == null)
-		{
-			type = "*";
-		}
-		else
-		{
-			String shortName = getShortTypeName(type);
-			final String expr = JSImportHandlingUtil.resolveTypeName(shortName, context);
-			if(expr != null && !expr.equals(shortName))
-			{
-				type = shortName;
-			}
-		}
-		return type;
-	}
-
-	public static String getQualifiedExpressionType(final JSExpression expression, final PsiFile containingFile)
-	{
-		String type = null;
-
-		if(expression != null)
-		{
-			final BaseJSSymbolProcessor.SimpleTypeProcessor processor = new BaseJSSymbolProcessor.SimpleTypeProcessor(JavaScriptVersionUtil.getFeatures(expression));
-			BaseJSSymbolProcessor.doEvalForExpr(expression, containingFile, processor);
-			type = processor.getType();
-		}
-
-		return type;
-	}
-
-	private static String getShortTypeName(String type)
-	{
-		String str = type;
-
-		final int i = str.indexOf('<');
-		String signature = null;
-
-		if(i != -1)
-		{
-			final int index = str.lastIndexOf('.', i);
-			if(index == -1)
-			{
-				return type;
-			}
-			signature = str.substring(index);
-			str = str.substring(0, index);
-		}
-
-		final int i2 = str.lastIndexOf('.');
-		if(i2 != -1)
-		{
-			str = str.substring(i2 + 1);
-		}
-
-		return str + (signature != null ? signature : "");
-	}
-
-	// TODO remove this method, call generic one processing includes as well (like findParent())
-	public static PsiElement getClassReferenceForXmlFromContext(PsiElement parent)
-	{
-		final PsiElement context = parent != null ? parent.getContext() : null;
-		if(context instanceof XmlElement && context.getContainingFile() instanceof XmlFile)
-		{
-			return XmlBackedJSClassImpl.getContainingComponent((XmlElement) context);
-		}
-		return parent;
-	}
-
-	@Nullable
-	public static XmlBackedJSClassImpl getXmlBackedClass(final JSFile injectedJsFile)
-	{
-		final PsiElement context = injectedJsFile.getContext();
-		if(context instanceof XmlAttributeValue || context instanceof XmlText)
-		{
-			return XmlBackedJSClassImpl.getContainingComponent((XmlElement) context);
-		}
-		return null;
-	}
-
-
-	public static <T extends JSNamedElement & JSAttributeListOwner> SearchScope findUseScope(final T jsVariableBase)
-	{
-		PsiElement element = PsiTreeUtil.getParentOfType(jsVariableBase, JSFunction.class, JSCatchBlock.class, JSClass.class, JSObjectLiteralExpression.class, JSFile.class);
-		PsiElement scopeElement = element;
-
-		if(element instanceof JSFile)
-		{
-			final PsiElement xmlFromContext = getClassReferenceForXmlFromContext(element);
-
-			if(xmlFromContext != element)
-			{
-				element = xmlFromContext;
-				scopeElement = element.getContainingFile();
-			}
-			else
-			{
-				element = null;
-			}
-		}
-
-		if(element != null)
-		{
-			if(element instanceof JSFunction)
-			{
-				final PsiElement elt = JSDocumentationUtils.findDocComment(JSDocumentationProvider.findElementForWhichPreviousCommentWillBeSearched(element));
-				if(elt instanceof PsiComment)
-				{
-					return new LocalSearchScope(new PsiElement[]{
-							elt,
-							element
-					});
-				}
-			}
-
-			if(element instanceof JSClass)
-			{
-				final JSAttributeList attributeList = jsVariableBase.getAttributeList();
-
-				if(attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PRIVATE)
-				{
-					return ((JSStubElementImpl) jsVariableBase).getDefaultUseScope();
-				}
-			}
-			return new LocalSearchScope(scopeElement);
-		}
-		return ((JSStubElementImpl) jsVariableBase).getDefaultUseScope();
-	}
-
-	public static final boolean isAssignableType(@NonNls final String expectedType, @NonNls String type, PsiElement context)
-	{
-		if((expectedType != null && hasMultipleOccurenceDelimiters(expectedType)) || (type != null && hasMultipleOccurenceDelimiters(type)))
-		{
-			StringTokenizer expectedTypeIterator = new StringTokenizer(expectedType != null ? expectedType : "", COMMENT_DELIMITERS);
-
-			while(expectedTypeIterator.hasMoreElements())
-			{
-				String primitiveExpectedType = expectedTypeIterator.nextToken().trim();
-				StringTokenizer typeIterator = new StringTokenizer(type != null ? type : "", COMMENT_DELIMITERS);
-
-				while(typeIterator.hasMoreElements())
-				{
-					String primitiveType = typeIterator.nextToken().trim();
-					if(isAssignableType(primitiveExpectedType, primitiveType, context))
-					{
-						return true;
-					}
-				}
-			}
-
-			return false;
-		}
-		if(expectedType == null || expectedType.equals("*") || expectedType.equals(OBJECT_CLASS_NAME) || expectedType.equals("Class"))
-		{
-			return true;
-		}
-		if(expectedType.equals(type))
-		{
-			return true;
-		}
-
-		final boolean nonecma = context.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4;
-
-		if("Number".equals(expectedType) && ("int".equals(type) || "uint".equals(type) || (("Boolean".equals(type) || "String".equals(type)) && nonecma)))
-		{
-			return true;
-		}
-		if("int".equals(expectedType) && ("Number".equals(type) ||
-				("String".equals(type) && nonecma) ||
-				"uint".equals(type)))
-		{
-			return true; // compatibility
-		}
-
-		if("uint".equals(expectedType) && ("int".equals(type) || "Number".equals(type)))
-		{
-			return true;
-		}
-		if(ARRAY_TYPE_NAME.equals(type))
-		{
-			if(ARGUMENTS_TYPE_NAME.equals(expectedType) || expectedType.startsWith(ARRAY_TYPE_NAME) /*Array[*/ || JSTypeEvaluateManager.isArrayType(expectedType))
-			{
-				return true;
-			}
-		}
-
-		if(ARGUMENTS_TYPE_NAME.equals(type) && nonecma)
-		{
-			return true; // TODO: hack for indirect call Array.slice(arguments, 0)
-		}
-
-		if(ARRAY_TYPE_NAME.equals(expectedType) && JSTypeEvaluateManager.isArrayType(type))
-		{
-			return true;
-		}
-		if("String".equals(expectedType) && (("Number".equals(type) || "int".equals(type) || "Boolean".equals(type) || "RegExp".equals(type)) && nonecma))
-		{
-			return true;
-		}
-
-		if("*".equals(type) || (OBJECT_CLASS_NAME.equals(type) && nonecma))
-		{
-			return true; // Dynamic cast
-		}
-		if("void".equals(type))
-		{
-			return false;
-		}
-		final PsiElement typeClass = type != null ? unwrapProxy(findClassByQName(type, context)) : null;
-
-		if(!(typeClass instanceof JSClass))
-		{
-			return true;
-		}
-
-		boolean result = typeClass.processDeclarations(new ResolveProcessor(null)
-		{
-			{
-				setToProcessHierarchy(true);
-				setTypeContext(true);
-				setToProcessMembers(false);
-				setLocalResolve(true);
-			}
-
-			@Override
-			public boolean execute(final PsiElement element, final ResolveState state)
-			{
-				if(!(element instanceof JSClass))
-				{
-					return true;
-				}
-				final JSClass clazz = (JSClass) element;
-				boolean sameType = clazz.getQualifiedName().equals(expectedType);
-
-				if(!sameType)
-				{
-					for(JSClass implementedClazz : clazz.getImplementedInterfaces())
-					{
-						sameType = !implementedClazz.processDeclarations(this, ResolveState.initial(), implementedClazz, implementedClazz);
-						if(sameType)
-						{
-							break;
-						}
-					}
-				}
-				return !sameType;
-			}
-		}, ResolveState.initial(), typeClass, typeClass);
-
-		if(result && isImplicitCastPossible((JSClass) typeClass, expectedType))
-		{
-			result = false;
-		}
-
-		return !result;
-	}
-
-	private static boolean hasMultipleOccurenceDelimiters(String expectedType)
-	{
-		final String commentDelimiters = COMMENT_DELIMITERS;
-
-		for(int i = 0; i < commentDelimiters.length(); ++i)
-		{
-			if(expectedType.indexOf(commentDelimiters.charAt(i)) != -1)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static boolean isImplicitCastPossible(JSClass typeClass, String expectedType)
-	{
-		// TODO: move to flex support plugin
-		if(expectedType.equals("flash.events.IEventDispatcher"))
-		{
-			JSAttributeList attributeList = typeClass.getAttributeList();
-			if(attributeList != null)
-			{
-				return attributeList.getAttributesByName("Bindable").length != 0;
-			}
-		}
-		return false;
-	}
-
-	public static PsiElement getTopReferenceParent(final PsiElement parent)
-	{
-		PsiElement currentParent = parent;
-		for(; currentParent instanceof JSReferenceExpression; currentParent = currentParent.getParent())
-		{
-			;
-		}
-		return currentParent;
-	}
-
-	public static PsiElement getTopReferenceExpression(final @Nonnull PsiElement parent)
-	{
-		PsiElement element = parent;
-
-		for(PsiElement currentParent = parent.getParent(); currentParent instanceof JSReferenceExpression; element = currentParent, currentParent = currentParent.getParent())
-
-		{
-			;
-		}
-		return element;
-	}
-
-	public static boolean isSelfReference(final PsiElement currentParent, PsiElement elt)
-	{
-		return currentParent instanceof JSPackageStatement ||
-				currentParent instanceof JSNamespaceDeclaration ||
-				(currentParent instanceof JSVariable && (((JSVariable) currentParent).getNameIdentifier() == elt)) ||
-				(currentParent instanceof JSFunction && ((JSFunction) currentParent).getNameIdentifier() == elt) ||
-				currentParent instanceof JSClass;
-	}
-
-	public static PsiElement findParent(final PsiElement element)
-	{
-		PsiElement parent = element instanceof JSVariable ? element.getParent().getParent() : element.getParent();
-		return parent instanceof JSFile ? findParentClass((JSFile) parent) : parent;
-	}
-
-	private static PsiElement findParentClass(final JSFile file)
-	{
-		JSClass xmlBackedClass = getXmlBackedClass(file);
-		if(xmlBackedClass != null)
-		{
-			return xmlBackedClass;
-		}
-
-		PsiElement forcedContext = file.getUserData(contextKey);
-		if(forcedContext != null && !forcedContext.isValid())
-		{
-			forcedContext = null;
-		}
-		if(forcedContext instanceof JSClass)
-		{
-			return forcedContext;
-		}
-
-		if(forcedContext instanceof JSFile)
-		{
-			return findParentClass((JSFile) forcedContext);
-		}
-
-		if(forcedContext instanceof PsiFile && JavaScriptSupportLoader.isFlexMxmFile((PsiFile) forcedContext))
-		{
-			return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile) forcedContext);
-		}
-
-		if(forcedContext instanceof XmlElement)
-		{
-			PsiFile containingFile = forcedContext.getContainingFile();
-			if(JavaScriptSupportLoader.isFlexMxmFile(containingFile))
-			{
-				return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile) containingFile);
-			}
-		}
-
-		if(forcedContext != null)
-		{
-			PsiFile containingFile = forcedContext.getContainingFile();
-			if(containingFile instanceof JSFile && containingFile != file)
-			{
-				return findParentClass((JSFile) containingFile);
-			}
-
-		}
-		return file;
-	}
-
-	@Nullable
-	public static JSClass getClassOfContext(PsiElement node)
-	{
-		final JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
-		if(jsClass != null)
-		{
-			return jsClass;
-		}
-		else
-		{
-			final PsiElement context = getClassReferenceForXmlFromContext(node.getContainingFile());
-			if(context instanceof JSClass)
-			{
-				return (JSClass) context;
-			}
-		}
-
-		return null;
-	}
-
-	public static
-	@Nullable
-	JSClass findClassOfQualifier(final JSExpression qualifier, final PsiFile containingFile)
-	{
-		final String s = getQualifiedExpressionType(qualifier, containingFile);
-		final PsiElement qName = s != null ? unwrapProxy(findClassByQName(s, containingFile)) : null;
-		if(qName instanceof JSClass)
-		{
-			return (JSClass) qName;
-		}
-		return null;
-	}
-
-	public static boolean referenceExpressionShouldBeQualified(final JSReferenceExpression contextExpr)
-	{
-		PsiElement parent = contextExpr.getParent();
-		return parent instanceof JSImportStatement || (parent instanceof JSReferenceList && contextExpr.getContainingFile().getContext() != null);
-	}
-
-	public static boolean isArtificialClassUsedForReferenceList(JSClass clazz)
-	{
-		return clazz.getContainingFile().getContext() != null;
-	}
-
-	public static Collection<JSQualifiedNamedElement> findElementsByName(String name, Project project, GlobalSearchScope scope)
-	{
-		final Set<JSQualifiedNamedElement> result = new HashSet<JSQualifiedNamedElement>();
-		Collection<JSQualifiedNamedElement> jsQualifiedNamedElements = StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_NAME, name, project, scope, JSQualifiedNamedElement.class);
-
-		for(JSQualifiedNamedElement e : jsQualifiedNamedElements)
-		{
-			result.add((JSQualifiedNamedElement) e.getNavigationElement());
-		}
-
-		Collection<VirtualFile> files = new ArrayList<VirtualFile>();
-		files.addAll(FileBasedIndex.getInstance().getContainingFiles(FilenameIndex.NAME, name + JavaScriptSupportLoader.MXML_FILE_EXTENSION_DOT, scope));
-		files.addAll(FileBasedIndex.getInstance().getContainingFiles(FilenameIndex.NAME, name + JavaScriptSupportLoader.MXML_FILE_EXTENSION2_DOT, scope));
-
-		for(final VirtualFile file : files)
-		{
-			if(!file.isValid())
-			{
-				continue;
-			}
-			final PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
-			if(psiFile != null)
-			{
-				result.add(XmlBackedJSClassImpl.getXmlBackedClass((XmlFile) psiFile));
-			}
-		}
-		return result;
-	}
-
-	public static boolean isNewResolveAndCompletion(PsiFile psiFile)
-	{
-		return psiFile.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4) || JavaScriptSupportLoader.isFlexMxmFile(psiFile);
-	}
-
-	public static String getTypeFromSetAccessor(final JSNamedElement jsNamedElement)
-	{
-		if(!(jsNamedElement instanceof JSFunction) || !((JSFunction) jsNamedElement).isSetProperty())
-		{
-			return null;
-		}
-		final JSParameterList jsParameterList = ((JSFunction) jsNamedElement).getParameterList();
-		if(jsParameterList == null)
-		{
-			return null;
-		}
-		final JSParameter[] jsParameters = jsParameterList.getParameters();
-		if(jsParameters == null || jsParameters.length != 1)
-		{
-			return null;
-		}
-		return jsParameters[0].getTypeString();
-	}
-
-	public static boolean shouldProcessTopLevelGlobalContext(@Nonnull PsiElement place, @Nonnull PsiScopeProcessor processor)
-	{
-		PsiElement placeParent = null;
-
-		return shouldProcessImports(place, processor) && (!((placeParent = place.getParent()) instanceof JSCallExpression) ||
-				(place instanceof JSReferenceExpression &&
-						((JSReferenceExpression) place).getQualifier() != null &&
-						((ResolveProcessor) processor).specificallyAskingToResolveQualifiedNames()) ||
-				placeParent instanceof JSNewExpression);
-	}
-
-	public static boolean shouldProcessImports(@Nonnull PsiElement place, @Nonnull PsiScopeProcessor processor)
-	{
-		if(!(processor instanceof ResolveProcessor) || ((ResolveProcessor) processor).isLocalResolve())
-		{
-			return false;
-		}
-		return (!(place instanceof JSReferenceExpression) ||
-				((JSReferenceExpression) place).getQualifier() == null ||
-				((ResolveProcessor) processor).specificallyAskingToResolveQualifiedNames());
-	}
-
-	public static boolean processTopLevelClasses(PsiScopeProcessor processor, ResolveState state, Project project, GlobalSearchScope scope, boolean acceptOnlyClasses, boolean acceptQualifiedElements)
-	{
-		boolean result = true;
-		final String resolvedName = ((ResolveProcessor) processor).getName();
-
-		if(resolvedName == null)
-		{
-			for(String s : StubIndex.getInstance().getAllKeys(JavaScriptIndexKeys.ELEMENTS_BY_NAME, project))
-			{
-				for(JSQualifiedNamedElement e : StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_NAME, s, project, scope, JSQualifiedNamedElement.class))
-				{
-					if(ARGUMENTS_TYPE_NAME.equals(e.getName()))
-					{
-						continue;
-					}
-					if(acceptOnlyClasses && !(e instanceof JSClass))
-					{
-						continue;
-					}
-
-					if(!acceptQualifiedElements)
-					{
-						String qName = e.getQualifiedName();
-						if(qName != null && qName.indexOf('.') != -1)
-						{
-							continue;
-						}
-					}
-					result &= processor.execute(e, state);
-				}
-			}
-		}
-		else
-		{
-			for(JSQualifiedNamedElement e : StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_QNAME, resolvedName, project, scope, JSQualifiedNamedElement.class))
-			{
-				if(!e.getName().equals(resolvedName))
-				{
-					continue;
-				}
-				if(acceptOnlyClasses && !(e instanceof JSClass))
-				{
-					continue;
-				}
-				result = processor.execute(e, state);
-				if(!result)
-				{
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-	static boolean walkOverStructure(@Nonnull PsiElement context, Processor<PsiNamedElement> processor)
-	{
-		PsiNamedElement parent = PsiTreeUtil.getNonStrictParentOfType(context, JSQualifiedNamedElement.class, PsiFile.class);
-
-		if(parent instanceof JSClass)
-		{
-			PsiElement forcedContext = parent.getUserData(contextKey);
-
-			if(forcedContext instanceof XmlBackedJSClassImpl)
-			{
-				if(!processor.process((PsiNamedElement) forcedContext))
-				{
-					return false;
-				}
-			}
-		}
-
-		while(parent != null)
-		{
-			if(!processor.process(parent))
-			{
-				return false;
-			}
-
-			if(parent instanceof JSPackageStatement)
-			{
-				break;
-			}
-
-			if(parent instanceof PsiFile)
-			{
-				final PsiElement data = parent.getUserData(contextKey);
-
-				if(data instanceof JSElement)
-				{
-					parent = PsiTreeUtil.getNonStrictParentOfType(data, JSQualifiedNamedElement.class, PsiFile.class);
-				}
-				else
-				{
-					break;
-				}
-			}
-			else
-			{
-				parent = PsiTreeUtil.getParentOfType(parent, JSQualifiedNamedElement.class, PsiFile.class);
-			}
-		}
-
-		return true;
-	}
-
-	private static final Key<ParameterizedCachedValue<Set<String>, JSElement>> ourCachedOpenedNsesKey = Key.create("opened.nses");
-
-	private static final UserDataCache<ParameterizedCachedValue<Set<String>, JSElement>, JSElement, Object> ourCachedOpenedNsesCache = new UserDataCache<ParameterizedCachedValue<Set<String>,
-			JSElement>, JSElement, Object>()
-	{
-		@Override
-		protected ParameterizedCachedValue<Set<String>, JSElement> compute(JSElement jsElement, Object p)
-		{
-			return CachedValuesManager.getManager(jsElement.getProject()).createParameterizedCachedValue(new ParameterizedCachedValueProvider<Set<String>, JSElement>()
-			{
-				@Override
-				public CachedValueProvider.Result<Set<String>> compute(JSElement context)
-				{
-					class MyProcessor extends ResolveProcessor implements Processor<PsiNamedElement>
-					{
-						Set<String> openedNses;
-
-						public MyProcessor()
-						{
-							super(null);
-							putUserData(ResolveProcessor.LOOKING_FOR_USE_NAMESPACES, true);
-						}
-
-						@Override
-						public boolean process(PsiNamedElement psiNamedElement)
-						{
-							if(psiNamedElement instanceof JSElement)
-							{
-								processDeclarationsInScope((JSElement) psiNamedElement, this, ResolveState.initial(), psiNamedElement, psiNamedElement);
-							}
-							else
-							{
-								// TODO: XmlFile ?
-							}
-							return true;
-						}
-
-						@Override
-						public boolean execute(PsiElement element, ResolveState state)
-						{
-							if(!(element instanceof JSUseNamespaceDirective))
-							{
-								return true;
-							}
-							if(openedNses == null)
-							{
-								openedNses = new HashSet<String>();
-							}
-							openedNses.add(((JSUseNamespaceDirective) element).getNamespaceToBeUsed());
-							return true;
-						}
-					}
-					MyProcessor processor = new MyProcessor();
-					walkOverStructure(context, processor);
-					return new CachedValueProvider.Result<Set<String>>(processor.openedNses, PsiModificationTracker.EVER_CHANGED);
-				}
-			}, false);
-		}
-	};
-
-	public static Set<String> calculateOpenNses(PsiElement place)
-	{
-		final Ref<Set<String>> result = new Ref<Set<String>>();
-		walkOverStructure(place, new Processor<PsiNamedElement>()
-		{
-			@Override
-			public boolean process(PsiNamedElement psiNamedElement)
-			{
-				if(psiNamedElement instanceof JSElement)
-				{
-					result.set(ourCachedOpenedNsesCache.get(ourCachedOpenedNsesKey, (JSElement) psiNamedElement, null).getValue((JSElement) psiNamedElement));
-				}
-				return false;
-			}
-		});
-		return result.get() != null ? result.get() : Collections.<String>emptySet();
-	}
-
-	public static boolean processGlobalThings(PsiScopeProcessor processor, ResolveState state, PsiElement place, PsiElement context)
-	{
-		boolean result = true;
-		final Project project = context.getProject();
-		final GlobalSearchScope scope = context.getResolveScope();
-
-		if(shouldProcessTopLevelGlobalContext(place, processor))
-		{
-			//result = processTopPackages((ResolveProcessor) processor, state, project, scope);
-		}
-
-		if(result)
-		{
-			boolean acceptOnlyClasses = place instanceof JSReferenceExpression ? isExprInTypeContext((JSReferenceExpression) place) : false;
-
-			result = processTopLevelClasses(processor, state, project, scope, acceptOnlyClasses, true);
-		}
-		return result;
-	}
-
-	public static
-	@Nullable
-	JSParameter findParameterForUsedArgument(@Nonnull JSExpression mainOccurence, @Nonnull JSArgumentList parent)
-	{
-		int paramIndex = 0;
-
-		for(JSExpression expr : parent.getArguments())
-		{
-			if(expr == mainOccurence)
-			{
-				break;
-			}
-			paramIndex++;
-		}
-
-		final JSExpression methodExpr = ((JSCallExpression) parent.getParent()).getMethodExpression();
-		if(methodExpr instanceof JSReferenceExpression)
-		{
-			final ResolveResult[] results = ((JSReferenceExpression) methodExpr).multiResolve(false);
-
-			if(results.length > 0)
-			{
-				final PsiElement element = results[0].getElement();
-
-				if(element instanceof JSFunction)
-				{
-					final JSParameterList parameterList = ((JSFunction) element).getParameterList();
-					if(parameterList != null)
-					{
-						final JSParameter[] params = parameterList.getParameters();
-
-						if(paramIndex < params.length)
-						{
-							return params[paramIndex];
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	public static abstract class JSInjectedFilesVisitor implements PsiLanguageInjectionHost.InjectedPsiVisitor, XmlBackedJSClassImpl.InjectedFileVisitor
-	{
-		@Override
-		public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
-		{
-			if(injectedPsi instanceof JSFile)
-			{
-				process((JSFile) injectedPsi);
-			}
-		}
-
-		protected abstract void process(JSFile file);
-
-		@Override
-		public void visit(XmlTag rootTag, JSFile file)
-		{
-			process(file);
-		}
-	}
-
-	@NonNls
-	public static final String OBJECT_CLASS_NAME = "Object";
-
-	private JSResolveUtil()
-	{
-	}
-
-	private static final Key<CachedValue<PsiElement[]>> ourFileElementsValueKey = Key.create("file.elements");
-
-	public static void treeWalkUp(PsiScopeProcessor processor, PsiElement elt, PsiElement lastParent, PsiElement place)
-	{
-		treeWalkUp(processor, elt, lastParent, place, null, null);
-	}
-
-
-	public static void treeWalkUp(PsiScopeProcessor processor, PsiElement elt, PsiElement lastParent, PsiElement place, PsiElement terminatingParent)
-	{
-		treeWalkUp(processor, elt, lastParent, place, terminatingParent, null);
-	}
-
-	private static void treeWalkUp(final PsiScopeProcessor processor, PsiElement elt, PsiElement lastParent, PsiElement place, PsiElement terminatingParent, PsiElement currentScope)
-	{
-		if(elt == null)
-		{
-			return;
-		}
-
-		PsiElement parentElement = elt.getContext();
-		if(elt instanceof JSFunction || elt instanceof JSObjectLiteralExpression)
-		{
-			currentScope = elt;
-		}
-
-		if(parentElement instanceof JSDefinitionExpression || (parentElement instanceof JSAssignmentExpression && !(elt instanceof JSFunctionExpression)))
-		{
-			if(elt == terminatingParent)
-			{
-				return;
-			}
-			elt = parentElement.getParent();
-			parentElement = elt.getParent(); // when walking a| = b, start from enclosing statement
-			if(parentElement instanceof JSExpressionStatement)
-			{
-				elt = parentElement;
-				parentElement = parentElement.getParent();
-			}
-			currentScope = elt;
-		}
-		else if(parentElement instanceof JSVariable && currentScope == null)
-		{
-			// when walking from variable init start from enclosing statement (function expr / object literal could reference that could reference
-			// var in this case, better to check for any scope change)
-			currentScope = parentElement;
-			parentElement = parentElement.getParent();
-		}
-
-		final boolean parentIsClass = parentElement instanceof JSClass;
-		int index = -1;
-		PsiElement[] children = getChildren(parentElement);
-
-		if(children != null && children.length > 0)
-		{
-			index = 0;
-			for(PsiElement el : children)
-			{
-				if(el == elt)
-				{
-					break;
-				}
-				++index;
-			}
-		}
-
-		boolean finish = false;
-		PsiElement cur = elt;
-
-		do
-		{
-			if(!cur.processDeclarations(processor, ResolveState.initial(), cur == elt ? lastParent : null, place))
-			{
-				if(processor instanceof ResolveProcessor)
-				{
-					return;
-				}
-			}
-			if(terminatingParent == cur)
-			{
-				finish = true;
-				break;
-			}
-			if(cur instanceof PsiFile || parentIsClass)
-			{
-				break;
-			}
-			if(cur instanceof JSStatement && parentElement instanceof JSIfStatement)
-			{
-				// Do not try to resolve variables from then branch in else branch.
-				break;
-			}
-
-			if(index == -1)
-			{
-				cur = cur.getPrevSibling();
-			}
-			else
-			{
-				if(index != 0)
-				{
-					cur = children[--index];
-				}
-				else
-				{
-					cur = null;
-				}
-			}
-		}
-		while(cur != null);
-
-		final PsiElement func = parentIsClass || finish ? null : processFunctionDeclarations(processor, parentElement);
-		if(func != null)
-		{
-			return;
-		}
-
-		if(elt instanceof PsiFile)
-		{
-			if(elt instanceof XmlFile)
-			{
-				final XmlFile xmlFile = (XmlFile) elt;
-				final XmlDocument document = xmlFile.getDocument();
-				final XmlTag rootTag = document != null ? document.getRootTag() : null;
-				final String rootNs = rootTag != null ? rootTag.getNamespace() : null;
-
-				if(JavaScriptSupportLoader.isMxmlNs(rootNs))
-				{
-					processXmlFile(processor, xmlFile, place);
-				}
-				else
-				{
-					if(rootTag != null && xmlFile.getFileType() == XmlFileType.INSTANCE)
-					{ // TODO this is bindows specific
-						processXmlFile(processor, xmlFile, place);
-					}
-				}
-			}
-			else if(elt instanceof JSFile)
-			{
-				if(parentElement != null)
-				{
-					XmlTag tag = PsiTreeUtil.getParentOfType(parentElement, XmlTag.class);
-					final PsiFile containingFile = parentElement.getContainingFile();
-
-					while(tag != null)
-					{
-						if(XmlBackedJSClassImpl.isInlineComponentTag(tag))
-						{
-							for(JSVariable var : ourCachedPredefinedVars.get(ourCachedPredefinedVarsKey, (XmlFile) containingFile, null).getValue())
-							{
-								if(!processor.execute(var, ResolveState.initial()))
-								{
-									return;
-								}
-							}
-							JSClass clazz = XmlBackedJSClassImpl.getXmlBackedClass(tag);
-							clazz.processDeclarations(processor, ResolveState.initial(), clazz, place);
-							return;
-						}
-						tag = PsiTreeUtil.getParentOfType(tag, XmlTag.class);
-					}
-
-					parentElement = containingFile;
-				}
-				else
-				{
-					parentElement = elt.getUserData(contextKey);
-				}
-			}
-			if(!(elt instanceof JSExpressionCodeFragment) && parentElement == null)
-			{
-				return;
-			}
-		}
-
-		if(finish)
-		{
-			return;
-		}
-		treeWalkUp(processor, parentElement, elt, place, terminatingParent, currentScope);
-	}
-
-	private static UserDataCache<CachedValue<List<JSVariable>>, XmlFile, Object> ourCachedPredefinedVars = new UserDataCache<CachedValue<List<JSVariable>>, XmlFile, Object>()
-	{
-		@Override
-		protected CachedValue<List<JSVariable>> compute(final XmlFile xmlFile, Object p)
-		{
-			return CachedValuesManager.getManager(xmlFile.getProject()).createCachedValue(new CachedValueProvider<List<JSVariable>>()
-			{
-				@Override
-				public Result<List<JSVariable>> compute()
-				{
-					SmartList<JSVariable> vars = new SmartList<JSVariable>();
-					String qName = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile).getQualifiedName();
-					vars.add(new ImplicitJSVariableImpl("outerDocument", qName, xmlFile));
-					vars.add(new ImplicitJSVariableImpl("data", OBJECT_CLASS_NAME, xmlFile));
-					return new Result<List<JSVariable>>(vars, xmlFile);
-				}
-			}, false);
-		}
-	};
-
-	private static Key<CachedValue<List<JSVariable>>> ourCachedPredefinedVarsKey = Key.create("ourCachedPredefinedVarsKey");
-
-	public static boolean processXmlFile(final PsiScopeProcessor processor, final XmlFile xmlFile, final PsiElement place)
-	{
-		JSClass clazz = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
-		if(!clazz.processDeclarations(processor, ResolveState.initial(), clazz, place))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	private static PsiElement[] getChildren(final PsiElement element)
-	{
-		if(!(element instanceof JSFile) && (!(element instanceof JSBlockStatement) || !(element.getParent() instanceof JSNamedElement)))
-		{
-			return null;
-		}
-		CachedValue<PsiElement[]> value = element.getUserData(ourFileElementsValueKey);
-
-		if(value == null)
-		{
-			value = CachedValuesManager.getManager(element.getProject()).createCachedValue(new CachedValueProvider<PsiElement[]>()
-			{
-				@Override
-				public Result<PsiElement[]> compute()
-				{
-					return new Result<PsiElement[]>(element.getChildren(), element);
-				}
-			}, false);
-			element.putUserData(ourFileElementsValueKey, value);
-		}
-
-		return value.getValue();
-	}
-
-	@Nullable
-	private static PsiElement processFunctionDeclarations(final @Nonnull PsiScopeProcessor processor, final @Nullable PsiElement context)
-	{
-		if(!(context instanceof JSElement))
-		{
-			return null;
-		}
-		PsiElement[] children = getChildren(context);
-
-		if(context != null)
-		{
-			int index = children != null ? children.length - 1 : -1;
-			PsiElement cur = index >= 0 ? children[index] : context.getLastChild();
-
-			while(cur != null)
-			{
-				if(cur instanceof JSFunction || cur instanceof JSClass)
-				{
-					if(!processor.execute(cur, ResolveState.initial()))
-					{
-						if(processor instanceof ResolveProcessor)
-						{
-							return ((ResolveProcessor) processor).getResult();
-						}
-					}
-				}
-
-				if(index == -1)
-				{
-					cur = cur.getPrevSibling();
-				}
-				else
-				{
-					if(index != 0)
-					{
-						cur = children[--index];
-					}
-					else
-					{
-						cur = null;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	public static JSClass findDeclaringClass(final JSFunction method)
-	{
-		final Ref<JSClass> lastVisitedClass = new Ref<JSClass>();
-		iterateOverridenMethodsUp(method, new Processor<JSClass>()
-		{
-			@Override
-			public boolean process(JSClass jsClass)
-			{
-				lastVisitedClass.set(jsClass);
-				return true;
-			}
-		}, true);
-
-
-		Collection<JSClass> visited = new HashSet<JSClass>();
-		visitAllImplementedInterfaces(lastVisitedClass.get(), visited, new Processor<JSClass>()
-		{
-			@Override
-			public boolean process(JSClass jsClass)
-			{
-				// hierarchy may contain maximum one interface declaring a certain method
-				JSFunction interfaceMethod = jsClass.findFunctionByNameAndKind(method.getName(), method.getKind());
-				if(interfaceMethod != null)
-				{
-					// TODO check signature
-					lastVisitedClass.set(jsClass);
-					return false;
-				}
-				return true;
-			}
-		});
-
-		return lastVisitedClass.get();
-	}
-
-	/**
-	 * @return true if processor said enough
-	 */
-	private static boolean visitAllImplementedInterfaces(JSClass clazz, @Nonnull Collection<JSClass> visited, Processor<JSClass> processor)
-	{
-		if(visited.contains(clazz))
-		{
-			return true;
-		}
-		if(clazz.isInterface())
-		{
-			visited.add(clazz);
-			if(!processor.process(clazz))
-			{
-				return true;
-			}
-		}
-		JSClass[] interfaces = clazz.isInterface() ? clazz.getSuperClasses() : clazz.getImplementedInterfaces();
-		for(JSClass anInterface : interfaces)
-		{
-			if(visitAllImplementedInterfaces(anInterface, visited, processor))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @return true if processor said enough
-	 */
-	private static boolean iterateOverridenMethodsUp(JSFunction function, Processor<JSClass> processor, boolean allowDirectParent)
-	{
-		PsiElement clazz = findParent(function);
-		if(!(clazz instanceof JSClass))
-		{
-			return false;
-		}
-		final PsiElement directParent = clazz;
-
-		while(true)
-		{
-			if((allowDirectParent || directParent != clazz) && !processor.process((JSClass) clazz))
-			{
-				return true;
-			}
-
-			JSAttributeList attributeList = function.getAttributeList();
-			if(attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE))
-			{
-				return false;
-			}
-
-			// TODO check signature
-			final JSNamedElement overridenMethod = findOverriddenMethod(function, (JSClass) clazz);
-			if(!(overridenMethod instanceof JSFunction))
-			{
-				return false;
-			}
-			function = (JSFunction) overridenMethod;
-
-			clazz = findParent(function);
-			if(!(clazz instanceof JSClass))
-			{
-				return false;
-			}
-		}
-	}
-
-	public static boolean isReferenceTo(final PsiPolyVariantReference reference, final String referencedName, PsiElement _element)
-	{
-		String elementName;
-		if(_element instanceof JSNamedElement)
-		{
-			elementName = ((PsiNamedElement) _element).getName();
-		}
-		else if(_element instanceof XmlAttributeValue)
-		{
-			elementName = ((XmlAttributeValue) _element).getValue();
-		}
-		else if(_element instanceof PsiFile)
-		{
-			elementName = ((PsiFile) _element).getVirtualFile().getNameWithoutExtension();
-		}
-		else if(_element instanceof PsiDirectoryContainer)
-		{
-			elementName = ((PsiNamedElement) _element).getName();
-		}
-		else
-		{
-			return false;
-		}
-
-		if(Comparing.equal(referencedName, elementName, true))
-		{
-			PsiElement element = _element;
-
-			final ResolveResult[] resolveResults = reference.multiResolve(true);
-
-			for(ResolveResult r : resolveResults)
-			{
-				PsiElement resolvedElement = r.getElement();
-
-				if(resolvedElement.isEquivalentTo(element) ||
-						element.isEquivalentTo(resolvedElement) ||
-						((element instanceof JSProperty || element instanceof XmlAttributeValue) &&
-								resolvedElement != null &&
-								resolvedElement.getParent() == element))
-				{
-					if(reference instanceof JSReferenceExpression && ((((JSReferenceExpression) reference).getParent() == resolvedElement && resolvedElement instanceof JSDefinitionExpression) ||
-							resolvedElement instanceof JSFunctionExpression && ((JSFunctionExpression) resolvedElement).getFunction().getNameIdentifier().getNextSibling() == reference))
-					{
-						return false; // do not include self to usages
-					}
-
-					return true;
-				}
-
-				if(resolvedElement instanceof JSFunctionExpression)
-				{
-					final PsiElement nameIdentifier = ((JSFunctionExpression) resolvedElement).getFunction().getNameIdentifier();
-					if(nameIdentifier != null && nameIdentifier.getNextSibling() == element)
-					{
-						return true;
-					}
-				}
-				else if(resolvedElement instanceof JSFunction)
-				{
-					JSFunction fun = (JSFunction) resolvedElement;
-
-					if(fun.isConstructor())
-					{
-						if((element instanceof JSClass && resolvedElement.getParent() == element) || (element instanceof JSFile &&
-								reference.getElement().getParent() != resolvedElement &&
-								isPublicEntityReferenceToJSFile(findParent(resolvedElement), element)))
-						{
-							return true;
-						}
-					}
-					else if(element instanceof JSFunction)
-					{
-						JSFunction anotherFun = (JSFunction) element;
-						boolean getProperty;
-
-						if((getProperty = fun.isGetProperty()) || fun.isSetProperty())
-						{
-							if((getProperty && anotherFun.isSetProperty()) || (!getProperty && anotherFun.isGetProperty()))
-							{
-								PsiElement funParent = JSResolveUtil.findParent(fun);
-								PsiElement parent = JSResolveUtil.findParent(anotherFun);
-								if(funParent == parent || (parent != null && parent.isEquivalentTo(funParent)))
-								{
-									return true;
-								}
-							}
-						}
-						PsiElement resolvedElementParent = findParent(resolvedElement);
-						final PsiElement elementParent = findParent(element);
-
-						if(elementParent instanceof JSClass && resolvedElementParent instanceof JSClass)
-						{
-							final JSClass anotherClass = (JSClass) elementParent;
-
-							final Collection<JSClass> visitedInterfaces = new HashSet<JSClass>();
-							return iterateOverridenMethodsUp((JSFunction) resolvedElement, new Processor<JSClass>()
-							{
-								@Override
-								public boolean process(JSClass jsClass)
-								{
-									if(anotherClass.isInterface())
-									{
-										return !visitAllImplementedInterfaces(jsClass, visitedInterfaces, new Processor<JSClass>()
-										{
-											@Override
-											public boolean process(JSClass jsClass)
-											{
-												return !jsClass.isEquivalentTo(anotherClass);
-											}
-										});
-									}
-									else
-									{
-										return !jsClass.isEquivalentTo(anotherClass);
-									}
-								}
-							}, anotherClass.isInterface());
-						}
-					}
-				}
-				else if(resolvedElement instanceof JSClass && element instanceof JSFunction && element.getParent() == resolvedElement)
-				{
-					return true;
-				}
-
-				if((resolvedElement instanceof JSClass ||
-						resolvedElement instanceof JSNamespaceDeclaration ||
-						resolvedElement instanceof JSFunction ||
-						resolvedElement instanceof JSVariable) && ((element instanceof XmlFile && resolvedElement.getParent().getContainingFile() == element) || (element instanceof JSFile &&
-						reference.getElement().getParent() != resolvedElement &&
-						isPublicEntityReferenceToJSFile(resolvedElement, element))))
-				{
-					return true;
-				}
-
-				if(resolvedElement instanceof JSVariable && element instanceof JSFunction)
-				{
-					if(fieldIsImplicitAccessorMethod((JSFunction) element, (JSVariable) resolvedElement))
-					{
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	private static boolean fieldIsImplicitAccessorMethod(JSFunction fun, JSVariable var)
-	{
-		if(!fun.isGetProperty() && !fun.isSetProperty())
-		{
-			return false;
-		}
-		PsiElement funParent = findParent(fun);
-		if(!(funParent instanceof JSClass) || !((JSClass) funParent).isInterface())
-		{
-			return false;
-		}
-		JSAttributeList attributeList = var.getAttributeList();
-		if(attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC)
-		{
-			return false;
-		}
-
-		PsiElement parent = findParent(var);
-		if(!(parent instanceof JSClass))
-		{
-			return false;
-		}
-
-		for(JSClass c : ((JSClass) parent).getImplementedInterfaces())
-		{
-			if(c == funParent)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	private static boolean isPublicEntityReferenceToJSFile(PsiElement resolvedElement, PsiElement element)
-	{
-		PsiElement parent = resolvedElement.getParent();
-		if(parent instanceof JSVarStatement)
-		{
-			parent = parent.getParent();
-		}
-		return parent instanceof JSPackageStatement && parent.getParent() == element;
-	}
-
-	private static JSNamedElement findOverriddenMethod(PsiElement resolvedElement, JSClass resolvedElementClass)
-	{
-		final Ref<JSNamedElement> override = new Ref<JSNamedElement>();
-
-		iterateType((JSFunction) resolvedElement, resolvedElementClass, null, new OverrideHandler()
-		{
-			@Override
-			public boolean process(ResolveProcessor processor, PsiElement scope, String className)
-			{
-				PsiElement result = processor.getResult();
-				if(result instanceof JSNamedElement)
-				{
-					override.set((JSNamedElement) result);
-					return false;
-				}
-				return true;
-			}
-		});
-		return override.get();
-	}
-
-	public static boolean checkClassHasParentOfAnotherOne(final JSClass aClass, final JSClass parent, @Nullable Set<JSClass> visited)
-	{
-		if(visited != null && visited.contains(aClass))
-		{
-			return false;
-		}
-
-		for(JSClass superClazz : aClass.getSuperClasses())
-		{
-			if(superClazz == parent)
-			{
-				return true;
-			}
-			if(visited == null)
-			{
-				visited = new HashSet<JSClass>();
-			}
-			visited.add(aClass);
-			return checkClassHasParentOfAnotherOne(superClazz, parent, visited);
-		}
-		return false;
-	}
-
-	public static
-	@Nullable
-	JSExpression getRealRefExprQualifier(final JSReferenceExpression expr)
-	{
-		final JSExpression qualifier = ((JSReferenceExpressionImpl) expr).getResolveQualifier();
-		if(qualifier != null)
-		{
-			return qualifier;
-		}
-
-		if(isExprInTypeContext(expr))
-		{
-			final JSImportedElementResolveResult resolved = JSImportHandlingUtil.resolveTypeNameUsingImports(expr);
-			if(resolved == null)
-			{
-				return expr.getQualifier();
-			}
-
-			return getRealRefExprQualifierFromResult(expr, resolved);
-		}
-
-		return qualifier;
-	}
-
-	public static JSExpression getRealRefExprQualifierFromResult(final JSReferenceExpression expr, final JSImportedElementResolveResult resolved)
-	{
-		return ((JSReferenceExpression) JSChangeUtil.createExpressionFromText(expr.getProject(), resolved.qualifiedName)).getQualifier();
-	}
-
-	public static String findPackageStatementQualifier(final PsiElement context)
-	{
-		if(context instanceof JSClass)
-		{
-			final String s = ((JSClass) context).getQualifiedName();
-			if(s != null)
-			{
-				final int i = s.lastIndexOf('.');
-				if(i != -1)
-				{
-					return s.substring(0, i);
-				}
-				else
-				{
-					return null;
-				}
-			}
-		}
-
-		final JSPackageStatement packageStatement = PsiTreeUtil.getNonStrictParentOfType(context, JSPackageStatement.class);
-
-		if(packageStatement != null)
-		{
-			return packageStatement.getQualifiedName();
-		}
-
-		return null;
-	}
-
-	public static boolean isExprInStrictTypeContext(final JSReferenceExpression expr)
-	{
-		final PsiElement parent = expr.getParent();
-		boolean parentIsVar;
-
-		return (((parentIsVar = (parent instanceof JSVariable)) || parent instanceof JSFunction) && parent.getNode().findChildByType(JSTokenTypes.COLON) != null &&
-				(!parentIsVar || ((JSVariable) parent).getInitializer() != expr)) ||
-				parent instanceof JSAttributeList ||
-				parent instanceof JSGenericSignature ||
-				parent instanceof JSImportStatement ||
-				parent instanceof JSReferenceList;
-	}
-
-	public static boolean isExprInTypeContext(final JSReferenceExpression expr)
-	{
-		final PsiElement parent = expr.getParent();
-
-		return isExprInStrictTypeContext(expr) ||
-				parent instanceof JSNewExpression ||
-				parent instanceof JSUseNamespaceDirective ||
-				(parent instanceof JSBinaryExpression &&
-						((JSBinaryExpression) parent).getROperand() == expr &&
-						(((JSBinaryExpression) parent).getOperationSign() == JSTokenTypes.IS_KEYWORD || ((JSBinaryExpression) parent).getOperationSign() == JSTokenTypes.AS_KEYWORD));
-	}
-
-	@Nullable
-	public static PsiElement findClassByQName(final String link, final @Nonnull PsiElement context)
-	{
-		return findClassByQName(link, context.getProject(), context.getResolveScope());
-	}
-
-	@Nullable
-	public static PsiElement findClassByQName(final String link, @Nonnull GlobalSearchScope scope, @Nonnull Project project)
-	{
-		return findClassByQName(link, project, scope);
-	}
-
-	private static PsiElement findClassByQName(final String link, final Project project, final GlobalSearchScope searchScope)
-	{
-		synchronized(project)
-		{
-			final PsiElement[] result = new PsiElement[1];
-
-			final Collection<JSQualifiedNamedElement> candidates = StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_QNAME, link, project, searchScope, JSQualifiedNamedElement.class);
-			for(JSQualifiedNamedElement clazz : candidates)
-			{
-				if(link.equals(clazz.getQualifiedName()))
-				{
-					if("Object".equals(link) && !JavaScriptIndex.ECMASCRIPT_JS2.equals(clazz.getContainingFile().getVirtualFile().getName()) // object from swf do
-						// not contain necessary members!
-					)
-					{
-						continue;
-					}
-					result[0] = clazz;
-					break;
-				}
-			}
-
-			if(result[0] == null)
-			{
-				String className = link.substring(link.lastIndexOf('.') + 1);
-				if(className.length() > 0 &&
-						(Character.isUpperCase(className.charAt(0)) || Character.isLowerCase(className.charAt(0))) &&
-						!isBuiltInClassName(className))
-				{
-					// TODO optimization, remove when packages will be properly handled
-					result[0] = findClassByQNameViaHelper(link, project, className, searchScope);
-				}
-			}
-
-			return result[0];
-		}
-	}
-
-	private static boolean isBuiltInClassName(final String className)
-	{
-		return OBJECT_CLASS_NAME.equals(className) || "Boolean".equals(className) || "Function".equals(className) || "String".equals(className);
-	}
-
-	public static boolean isPredefinedFile(PsiFile file)
-	{
-		return false;
-	}
-
-	@Nullable
-	private static PsiElement findClassByQNameViaHelper(final String link, final Project project, final String className, final GlobalSearchScope scope)
-	{
-		for(JSResolveHelper helper : Extensions.getExtensions(JSResolveHelper.EP_NAME))
-		{
-			PsiElement result = helper.findClassByQName(link, project, className, scope);
-			if(result != null)
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	public static String[] buildNameIdsForQualifier(final JSExpression qualifier)
-	{
-		String[] nameIds = null;
-
-		if(qualifier == null)
-		{
-			nameIds = JSSymbolUtil.buildNameIndexArray(qualifier);
-		}
-		else
-		{
-			ContextResolver resolver = new ContextResolver(qualifier);
-			nameIds = resolver.getQualifierAsNameIndex();
-
-			if(nameIds == null)
-			{
-				nameIds = new String[]{""};
-			}
-		}
-
-		return nameIds;
-	}
-
-	public static JSExpression findClassIdentifier(JSExpression _qualifier)
-	{
-		JSExpression qualifier = _qualifier;
-		if(qualifier instanceof JSReferenceExpression && PROTOTYPE_FIELD_NAME.equals(((JSReferenceExpression) qualifier).getReferencedName()))
-		{
-			qualifier = ((JSReferenceExpression) qualifier).getQualifier();
-			if(qualifier == null)
-			{
-				qualifier = _qualifier;
-			}
-		}
-
-		if(qualifier instanceof JSReferenceExpression && ((JSReferenceExpression) qualifier).getQualifier() == null)
-		{
-			qualifier = JSSymbolUtil.findReferenceExpressionUsedForClassExtending((JSReferenceExpression) qualifier);
-		}
-		return qualifier;
-	}
-
-	public static boolean iterateType(final JSFunction node, final PsiElement jsClass, final String typeName, final OverrideHandler handler)
-	{
-		final Project project = jsClass.getProject();
-
-		if(jsClass instanceof JSClass)
-		{
-			String namespace = null;
-			JSAttributeList attributeList = node.getAttributeList();
-			if(attributeList != null)
-			{
-				namespace = attributeList.getNamespace();
-			}
-			return processOverrides(jsClass, handler, node.getName(), namespace, node);
-		}
-
-		return true;
-	}
-
-	public static boolean processOverrides(final PsiElement jsClass, final OverrideHandler handler, String name, final Object namespace, final PsiElement context)
-	{
-		JSClass clazz = (JSClass) jsClass;
-		final ResolveProcessor resolveProcessor = new ResolveProcessor(name, context)
-		{
-			{
-				setToProcessHierarchy(true);
-			}
-
-			@Override
-			public boolean execute(final PsiElement element, final ResolveState state)
-			{
-				if(!(element instanceof JSFunction))
-				{
-					return true;
-				}
-				JSFunction fun = (JSFunction) element;
-				final JSAttributeList attributeList = fun.getAttributeList();
-				if(attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE)
-				{
-					return false;
-				}
-
-				if((namespace == null && attributeList != null && attributeList.getNamespace() != null) || (namespace != null && (attributeList == null || !namespace.equals(attributeList
-						.getNamespace()))))
-				{
-					return true;
-				}
-				return super.execute(element, state);
-			}
-		};
-
-		for(JSClass superClazz : clazz.getSuperClasses())
-		{
-			if(superClazz == clazz)
-			{
-				break;
-			}
-			final boolean b = superClazz.processDeclarations(resolveProcessor, ResolveState.initial(), superClazz, context);
-
-			if(!b)
-			{
-				final PsiElement element = resolveProcessor.getResult();
-				if(element == null)
-				{
-					continue;
-				}
-				PsiElement parent = findParent(element);
-
-				if(parent instanceof JSClass && !handler.process(resolveProcessor, superClazz, ((JSClass) parent).getQualifiedName()))
-				{
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	public static String getQNameToStartHierarchySearch(final JSFunction node)
-	{
-		PsiElement parentNode = node.getParent();
-		parentNode = getClassReferenceForXmlFromContext(parentNode);
-
-		if(parentNode instanceof JSClass)
-		{
-			final JSAttributeList attributeList = node.getAttributeList();
-
-			if(attributeList == null ||
-					!attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE) ||
-					attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) ||
-					attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE)
-			{
-				return null;
-			}
-
-			if(parentNode instanceof JSClass)
-			{
-				return ((JSClass) parentNode).getQualifiedName();
-			}
-		}
-		else if(node instanceof JSFunctionExpression && parentNode.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-		{
-			final ContextResolver resolver = new ContextResolver(node.getFirstChild());
-			return resolver.getQualifierAsString();
-		}
-		else if(parentNode instanceof JSFile && parentNode.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-		{
-			return node.getName();
-		}
-		return null;
-	}
-
-	public static boolean isInPlaceWhereTypeCanBeDuringCompletion(PsiElement expr)
-	{
-		final PsiElement parent = expr.getParent();
-		if(parent instanceof JSArgumentList || (parent instanceof JSVariable && ((JSVariable) parent).getInitializer() == expr))
-		{
-			return true;
-		}
-		if(parent instanceof JSExpressionStatement)
-		{
-			if(expr instanceof JSReferenceExpression)
-			{
-				return ((JSReferenceExpression) expr).getQualifier() == null;
-			}
-
-			return true;
-		}
-		return false;
-	}
-
-	public static boolean isPlaceWhereNsCanBe(final PsiElement parent)
-	{
-		final PsiElement grandParent = parent.getParent();
-		return grandParent instanceof JSClass || grandParent instanceof JSPackageStatement || (grandParent instanceof JSFile && grandParent.getContext() == null);
-	}
-
-	public static
-	@Nullable
-	String getTypeFromTagNameInMxml(final @Nullable PsiElement psiElement)
-	{
-		JSClass clazz = getClassFromTagNameInMxml(psiElement);
-		return clazz != null ? clazz.getQualifiedName() : null;
-	}
-
-	public static JSClass getClassFromTagNameInMxml(final PsiElement psiElement)
-	{
-		XmlTag tag = psiElement != null ? PsiTreeUtil.getNonStrictParentOfType(psiElement, XmlTag.class) : null;
-		if(tag != null && (tag.getNamespacePrefix().length() > 0 || JavaScriptSupportLoader.isFlexMxmFile(tag.getContainingFile())))
-		{
-			if(isScriptContextTag(tag))
-			{
-				tag = ((XmlFile) tag.getContainingFile()).getDocument().getRootTag();
-			}
-			final XmlElementDescriptor descriptor = tag.getDescriptor();
-
-			if(descriptor != null)
-			{
-				PsiElement decl = descriptor.getDeclaration();
-				if(decl instanceof JSClass)
-				{
-					return ((JSClass) decl);
-				}
-				else if(decl instanceof XmlFile)
-				{
-					return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile) decl);
-				}
-			}
-		}
-		return null;
-	}
-
-	private static boolean isScriptContextTag(final XmlTag tag)
-	{
-		final String localName = tag.getLocalName();
-		return "Script".equals(localName) || (localName.length() > 0 && Character.isLowerCase(localName.charAt(0)) && !"method".equals(localName));
-	}
-
-	public static boolean processMetaAttributesForClass(final PsiElement jsClass, final MetaDataProcessor processor)
-	{
-		return doProcessMetaAttributesForClass(unwrapProxy(jsClass), processor, null, true);
-	}
-
-	private static boolean doProcessMetaAttributesForClass(final PsiElement jsClass, final MetaDataProcessor processor, PsiElement lastParent, boolean forward)
-	{
-		if(jsClass instanceof JSClass)
-		{
-			if(OBJECT_CLASS_NAME.equals((((JSClass) jsClass).getQualifiedName())))
-			{
-				return true;
-			}
-			final PsiElement[] elements = getStubbedChildren(jsClass.getParent());
-			int ind = elements.length - 1;
-			while(ind >= 0 && elements[ind] != jsClass)
-			{
-				--ind;
-			}
-			--ind;
-
-
-			while(ind >= 0)
-			{
-				final PsiElement current = elements[ind];
-
-				if(current instanceof JSIncludeDirective)
-				{
-					if(!processIncludeDirective(processor, jsClass, (JSIncludeDirective) current, false))
-					{
-						return false;
-					}
-					--ind;
-				}
-				else
-				{
-					break;
-				}
-			}
-
-			final JSAttributeList attributeList = ((JSClass) jsClass).getAttributeList();
-			if(attributeList != null)
-			{
-				if(!processAttributeList(processor, jsClass, attributeList, true))
-				{
-					return false;
-				}
-			}
-		}
-
-		final PsiElement[] elements = getStubbedChildren(jsClass);
-		Ref<PsiElement> continuePassElement = new Ref<PsiElement>();
-
-		for(int i = forward ? 0 : elements.length - 1; i < elements.length && i >= 0; i += (forward ? 1 : -1))
-		{
-			PsiElement el = elements[i];
-
-			if(el instanceof JSIncludeDirective)
-			{
-				if(!processIncludeDirective(processor, lastParent, (JSIncludeDirective) el, forward))
-				{
-					return false;
-				}
-			}
-			else if(el instanceof JSAttributeList /*&& lastParent != null*/)
-			{
-				if(!processAttributeList(processor, lastParent, (JSAttributeList) el, forward))
-				{
-					return false;
-				}
-			}
-			else
-			{
-				continuePassElement.set(null);
-				if(!processor.handleOtherElement(el, jsClass, continuePassElement))
-				{
-					return false;
-				}
-				PsiElement nextEl = continuePassElement.get();
-
-				if(nextEl instanceof JSAttributeListOwner)
-				{
-					JSAttributeList attributeList = ((JSAttributeListOwner) nextEl).getAttributeList();
-
-					if(attributeList != null)
-					{
-						if(!processAttributeList(processor, nextEl, attributeList, forward))
-						{
-							return false;
-						}
-					}
-				}
-
-			}
-		}
-		return true;
-	}
-
-	public static boolean processAttributeList(final MetaDataProcessor processor, final PsiElement el, final JSAttributeList attributeList, boolean forward)
-	{
-		final PsiElement[] elements = getStubbedChildren(attributeList);
-		for(int i = forward ? 0 : elements.length - 1; i < elements.length && i >= 0; i += (forward ? 1 : -1))
-		{
-			final PsiElement cur = elements[i];
-
-			if(cur instanceof JSIncludeDirective)
-			{
-				if(!processIncludeDirective(processor, el, (JSIncludeDirective) cur, forward))
-				{
-					return false;
-				}
-			}
-			else if(cur instanceof JSAttribute)
-			{
-				if(!processor.process((JSAttribute) cur))
-				{
-					return false;
-				}
-			}
-			else if(cur instanceof JSNamedElement)
-			{
-				break;
-			}
-		}
-
-		if(!processor.handleOtherElement(attributeList, el, null))
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	private static boolean processIncludeDirective(final MetaDataProcessor processor, final PsiElement lastParent, final JSIncludeDirective el, boolean forward)
-	{
-		final PsiFile file = el.resolveFile();
-
-		if(file instanceof JSFile)
-		{
-			if(!doProcessMetaAttributesForClass(file, processor, lastParent, forward))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public static PsiElement unwrapProxy(PsiElement jsClass)
-	{
-		return jsClass;
-	}
-
-	public static JSDefinitionExpression getDefinitionExpr(JSExpressionStatement exprStatement)
-	{
-		final JSExpression expression = exprStatement.getExpression();
-
-		if(expression instanceof JSAssignmentExpression)
-		{
-			return (JSDefinitionExpression) ((JSAssignmentExpression) expression).getLOperand();
-		}
-		return null;
-	}
-
-	public static boolean processDeclarationsInScope(final JSElement _scope, final PsiScopeProcessor processor, final ResolveState state, final PsiElement lastParent, final PsiElement place)
-	{
-		JSElement scope = PsiUtilBase.getOriginalElement(_scope, _scope.getClass());
-		if(scope == null)
-		{
-			return true;
-		}
-		String requiredName = null;
-
-		if(processor instanceof ResolveProcessor)
-		{
-			requiredName = ((ResolveProcessor) processor).getName();
-		}
-
-		boolean result = true;
-		final IntObjectMap<Object> defsMap = ourCachedDefsCache.get(MY_CACHED_STATEMENTS, scope, null).getValue();
-
-		if(requiredName == null)
-		{
-			for(Object value : defsMap.values())
-			{
-				result = dispatchResolve(processor, state, place, result, value);
-			}
-		}
-		else
-		{
-			final Object defs = defsMap.get(requiredName.hashCode());
-			if(defs != null)
-			{
-				result = dispatchResolve(processor, state, place, result, defs);
-			}
-		}
-
-		return result;
-	}
-
-	private static boolean dispatchResolve(final PsiScopeProcessor processor, final ResolveState state, final PsiElement place, boolean result, final Object o)
-	{
-		if(o instanceof JSElement[])
-		{
-			for(JSElement s : (JSElement[]) o)
-			{
-				result &= s.processDeclarations(processor, state, null, place);
-			}
-		}
-		else
-		{
-			JSElement s = (JSElement) o;
-			result &= s.processDeclarations(processor, state, null, place);
-		}
-		return result;
-	}
-
-	public static PsiElement getLocalVariableRef(JSFunction function, final JSReferenceExpression expr)
-	{
-		final ResolveProcessor processor = new ResolveProcessor(expr.getReferencedName(), true);
-
-		while(function != null)
-		{
-			final boolean val = function.processDeclarations(processor, ResolveState.initial(), function.getParameterList(), function);
-			if(!val)
-			{
-				return processor.getResult();
-			}
-			function = PsiTreeUtil.getParentOfType(function, JSFunction.class);
-			if(function == null)
-			{
-				break;
-			}
-		}
-		return null;
-	}
-
-	public static class MyResolveResult implements ResolveResult
-	{
-		private final PsiElement myFunction;
-		private final JavaScriptImportStatementBase myImportUsed;
-		private boolean myValidResult;
-
-		public MyResolveResult(final PsiElement function)
-		{
-			this(function, true);
-		}
-
-		public MyResolveResult(final PsiElement function, JSImportStatement importUsed)
-		{
-			this(function, importUsed, true);
-		}
-
-		public MyResolveResult(final PsiElement function, boolean validResult)
-		{
-			this(function, null, validResult);
-		}
-
-		public MyResolveResult(final PsiElement function, JavaScriptImportStatementBase importUsed, boolean validResult)
-		{
-			myFunction = function;
-			myValidResult = validResult;
-			myImportUsed = importUsed;
-		}
-
-		@Override
-		public PsiElement getElement()
-		{
-			return myFunction;
-		}
-
-		@Override
-		public boolean isValidResult()
-		{
-			return myValidResult;
-		}
-
-		public void setValid(final boolean b)
-		{
-			myValidResult = b;
-		}
-
-		public JavaScriptImportStatementBase getImportUsed()
-		{
-			return myImportUsed;
-		}
-	}
-
-	public static Key<PsiElement> contextKey = Key.create("context.key"); // JSElement or XmlElement
-
-	public static class RelevantDefsUserDataCache extends UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object>
-	{
-
-		@Override
-		protected CachedValue<IntObjectMap<Object>> compute(final JSElement jsElement, final Object o)
-		{
-			return CachedValuesManager.getManager(jsElement.getProject()).createCachedValue(new CachedValueProvider<IntObjectMap<Object>>()
-			{
-				@Override
-				public Result<IntObjectMap<Object>> compute()
-				{
-					final IntObjectMap<Object> relevantDefs = IntMaps.newIntObjectHashMap();
-					final MyJSElementVisitor elementVisitor = new MyJSElementVisitor(jsElement, relevantDefs);
-					elementVisitor.startVisiting(jsElement);
-
-					return new Result<IntObjectMap<Object>>(relevantDefs, jsElement);
-				}
-			}, false);
-		}
-
-		private static class MyJSElementVisitor extends JSElementVisitor
-		{
-			private HashMap<String, Boolean> checkedVarsToOurStatus;
-			private Set<JSFile> visitedIncludes;
-			private final IntObjectMap<Object> myRelevantDefs;
-			private final JSElement myBase;
-			private JSElement context;
-
-			public MyJSElementVisitor(JSElement base, final IntObjectMap<Object> relevantDefs)
-			{
-				myRelevantDefs = relevantDefs;
-				myBase = base;
-				context = base;
-			}
-
-			private void startVisiting(JSElement jsElement)
-			{
-				PsiElement first = null;
-
-				JSSourceElement[] arrayElementsToScan = null;
-
-				if(jsElement instanceof JSFunction)
-				{
-					final JSSourceElement[] body = ((JSFunction) jsElement).getBody();
-					if(body.length > 0 && body[0] instanceof JSBlockStatement)
-					{
-						first = PsiTreeUtil.findChildOfType(body[0], JSStatement.class);
-					}
-				}
-				else if(jsElement instanceof JSFile)
-				{
-					if(myBase == context)
-					{
-						first = jsElement.getFirstChild();
-					}
-					else
-					{
-						arrayElementsToScan = getSourceElements(jsElement);
-					}
-				}
-				else if(jsElement instanceof JSClass || jsElement instanceof JSPackageStatement)
-				{
-					arrayElementsToScan = getSourceElements(jsElement);
-				}
-				else
-				{
-					first = jsElement.getFirstChild();
-				}
-
-				if(arrayElementsToScan != null)
-				{
-					for(JSSourceElement elt : arrayElementsToScan)
-					{
-						elt.accept(this);
-					}
-				}
-				else
-				{
-					for(PsiElement e = first; e != null; e = e.getNextSibling())
-					{
-						if(e instanceof JSSourceElement)
-						{
-							e.accept(this);
-						}
-					}
-				}
-			}
-
-			@Override
-			public void visitJSDefinitionExpression(final JSDefinitionExpression node)
-			{
-				final JSExpression definedExpr = node.getExpression();
-				if(definedExpr instanceof JSReferenceExpression && ((JSReferenceExpression) definedExpr).getQualifier() == null && false)
-				{
-					final String s = definedExpr.getText();
-					if(checkedVarsToOurStatus == null)
-					{
-						checkedVarsToOurStatus = new HashMap<String, Boolean>(3);
-					}
-					Boolean aBoolean = checkedVarsToOurStatus.get(s);
-
-					if(aBoolean == null)
-					{
-						final boolean isInjectedFile = isInjectedFile(myBase);
-						PsiElement element = null;
-
-						if(myBase instanceof JSFunction || isInjectedFile)
-						{
-							final ResolveProcessor processor = new ResolveProcessor(s);
-							final PsiElement baseParent = myBase.getParent();
-							treeWalkUp(processor, baseParent, baseParent, baseParent);
-							element = processor.getResult();
-						}
-
-						aBoolean = (element == null) ? Boolean.TRUE : Boolean.FALSE;
-						checkedVarsToOurStatus.put(s, aBoolean);
-					}
-
-					if(aBoolean == Boolean.TRUE)
-					{
-						addRelevantDef(node);
-					}
-				}
-			}
-
-			@Override
-			public void visitJSVariable(JSVariable node)
-			{
-				addRelevantDef(node);
-			}
-
-			@Override
-			public void visitJSIncludeDirective(final JSIncludeDirective includeDirective)
-			{
-				final PsiFile _file = includeDirective.resolveFile();
-
-				if(!(_file instanceof JSFile) || myBase.getContainingFile() == _file)
-				{
-					return;
-				}
-				final JSFile file = (JSFile) _file;
-				if(visitedIncludes != null && visitedIncludes.contains(file))
-				{
-					return;
-				}
-				if(visitedIncludes == null)
-				{
-					visitedIncludes = new HashSet<JSFile>();
-				}
-				visitedIncludes.add(file);
-
-				final JSElement prevContext = context;
-				context = file;
-				context.putUserData(contextKey, myBase);
-				startVisiting(file);
-				context = prevContext;
-			}
-
-			@Override
-			public void visitJSVarStatement(final JSVarStatement node)
-			{
-				for(JSVariable var : node.getVariables())
-				{
-					if(!var.isLocal())
-					{
-						var.accept(this);
-					}
-				}
-			}
-
-			@Override
-			public void visitJSParameter(JSParameter node)
-			{
-			}
-
-			@Override
-			public void visitJSFunctionExpression(final JSFunctionExpression node)
-			{
-				// do not go inside other funcs
-			}
-
-			@Override
-			public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node)
-			{
-				// do not go inside other funcs
-			}
-
-			@Override
-			public void visitJSClass(final JSClass aClass)
-			{
-				// do not go inside other funcs
-			}
-
-			@Override
-			public void visitJSPackageStatement(JSPackageStatement packageStatement)
-			{
-				// do not go inside other funcs
-			}
-
-			@Override
-			public void visitJSFunctionDeclaration(final JSFunction node)
-			{
-				addRelevantDef(node);
-			}
-
-			@Override
-			public void visitJSImportStatement(final JSImportStatement importStatement)
-			{
-				// do not expand tree
-			}
-
-			@Override
-			public void visitJSUseNamespaceDirective(final JSUseNamespaceDirective useNamespaceDirective)
-			{
-				final String namespaceToBeUsed = useNamespaceDirective.getNamespaceToBeUsed();
-				if(namespaceToBeUsed != null)
-				{
-					addNamedElement(useNamespaceDirective, namespaceToBeUsed.hashCode());
-				}
-			}
-
-			private void addRelevantDef(final JSNamedElement node)
-			{
-				final String name = node.getName();
-
-				if(name != null)
-				{
-					final int key = name.hashCode();
-					addNamedElement(node, key);
-				}
-			}
-
-			private void addNamedElement(final JSElement node, final int key)
-			{
-				final Object o = myRelevantDefs.get(key);
-
-				if(o == null)
-				{
-					myRelevantDefs.put(key, node);
-				}
-				else if(o instanceof JSElement)
-				{
-					final JSElement[] newO = new JSElement[]{
-							(JSElement) o,
-							node
-					};
-					myRelevantDefs.put(key, newO);
-				}
-				else
-				{
-					final JSElement[] oldO = (JSElement[]) o;
-					final JSElement[] newO = new JSElement[oldO.length + 1];
-					System.arraycopy(oldO, 0, newO, 0, oldO.length);
-					newO[oldO.length] = node;
-					myRelevantDefs.put(key, newO);
-				}
-			}
-
-			@Override
-			public void visitElement(final PsiElement element)
-			{
-				element.acceptChildren(this);
-			}
-		}
-	}
-
-	public static class ContextResolver
-	{
-		private JSElement qualifyingExpression;
-		private JSNamedElement parentContainer;
-		private String typeName;
-
-		public ContextResolver(JSExpression expr)
-		{
-			if(expr instanceof JSThisExpression || expr instanceof JSSuperExpression)
-			{
-				// We need to resolve ns mapping for 'this', which function was the constructor of the object
-				resolveContext(expr);
-			}
-			else
-			{
-				qualifyingExpression = expr instanceof JSReferenceExpression ? JSSymbolUtil.findReferenceExpressionUsedForClassExtending((JSReferenceExpression) expr) : expr;
-			}
-		}
-
-		public ContextResolver(PsiElement element)
-		{
-			resolveContext(element);
-		}
-
-		private void resolveContext(final PsiElement context)
-		{
-			parentContainer = PsiTreeUtil.getParentOfType(context, JSFunction.class, JSClass.class);
-
-			if(parentContainer instanceof JSFunctionExpression)
-			{
-				boolean changedFunctionScope = false;
-
-				while(parentContainer instanceof JSFunctionExpression)
-				{
-					final PsiElement parentContainerParent = parentContainer.getParent();
-
-					if(parentContainerParent instanceof JSAssignmentExpression)
-					{
-						final JSExpression jsExpression = ((JSAssignmentExpression) parentContainerParent).getLOperand();
-						final JSElement functionExpressionName = jsExpression instanceof JSDefinitionExpression ? ((JSDefinitionExpression) jsExpression).getExpression() : null;
-						qualifyingExpression = functionExpressionName;
-
-						if(functionExpressionName instanceof JSReferenceExpression)
-						{
-							final JSExpression functionExpressionNameQualifier = ((JSReferenceExpression) functionExpressionName).getQualifier();
-
-							if(functionExpressionNameQualifier instanceof JSThisExpression)
-							{
-								parentContainer = PsiTreeUtil.getParentOfType(functionExpressionName, JSFunction.class);
-								qualifyingExpression = null;
-								changedFunctionScope = true;
-								continue;
-							}
-							else if(functionExpressionNameQualifier instanceof JSReferenceExpression)
-							{
-								final String functionExpressionNameQualifierText = ((JSReferenceExpression) functionExpressionNameQualifier).getReferencedName();
-
-								if(PROTOTYPE_FIELD_NAME.equals(functionExpressionNameQualifierText))
-								{
-									qualifyingExpression = ((JSReferenceExpression) functionExpressionNameQualifier).getQualifier();
-								}
-								else if(!changedFunctionScope)
-								{
-									String referencedName;
-
-									if(((JSReferenceExpression) functionExpressionNameQualifier).getQualifier() == null && ((referencedName = ((JSReferenceExpression) functionExpressionName)
-											.getReferencedName()) == null ||
-											referencedName.length() == 0 ||
-											!Character.isUpperCase(referencedName.charAt(0))))
-									{
-										qualifyingExpression = functionExpressionNameQualifier;
-									}
-								}
-							}
-						}
-					}
-					else if(parentContainerParent instanceof JSProperty)
-					{
-						final JSElement element = PsiTreeUtil.getParentOfType(parentContainerParent, JSVariable.class, JSAssignmentExpression.class, JSArgumentList.class);
-						if(element instanceof JSVariable)
-						{
-							qualifyingExpression = element;
-						}
-						else if(element instanceof JSAssignmentExpression)
-						{
-							JSExpression loperand = ((JSAssignmentExpression) element).getLOperand();
-							if(loperand != null)
-							{
-								qualifyingExpression = ((JSDefinitionExpression) loperand).getExpression();
-							}
-						}
-						else if(element instanceof JSArgumentList)
-						{
-							qualifyingExpression = JSSymbolUtil.findQualifyingExpressionFromArgumentList((JSArgumentList) element);
-						}
-					}
-					else if(parentContainerParent instanceof JSNewExpression)
-					{
-						final JSElement element = PsiTreeUtil.getParentOfType(parentContainerParent, JSVariable.class, JSAssignmentExpression.class, JSArgumentList.class);
-
-						if(element instanceof JSVariable)
-						{
-							qualifyingExpression = element;
-						}
-						else if(element instanceof JSAssignmentExpression)
-						{
-							qualifyingExpression = ((JSDefinitionExpression) ((JSAssignmentExpression) element).getLOperand()).getExpression();
-						}
-					}
-					else if(parentContainerParent instanceof JSReferenceExpression)
-					{
-						parentContainer = PsiTreeUtil.getParentOfType(parentContainerParent, JSFunction.class);
-						continue;
-					}
-					else if(parentContainer.getName() == null)
-					{
-						parentContainer = PsiTreeUtil.getParentOfType(parentContainerParent, JSFunction.class);
-						continue;
-					}
-
-					break;
-				}
-
-				if(qualifyingExpression instanceof JSReferenceExpression)
-				{
-					final JSReferenceExpression qualifyingReferenceExpression = ((JSReferenceExpression) qualifyingExpression);
-					final String functionExpressionNameQualifierText = qualifyingReferenceExpression.getReferencedName();
-
-					if(PROTOTYPE_FIELD_NAME.equals(functionExpressionNameQualifierText))
-					{
-						qualifyingExpression = qualifyingReferenceExpression.getQualifier();
-					}
-					else
-					{
-
-						qualifyingExpression = JSSymbolUtil.findReferenceExpressionUsedForClassExtending(qualifyingReferenceExpression);
-					}
-				}
-			}
-
-			PsiElement parentContainerParent = parentContainer != null ? parentContainer.getParent() : null;
-
-			if(parentContainerParent instanceof JSFile)
-			{
-				parentContainerParent = getClassReferenceForXmlFromContext(parentContainerParent);
-			}
-
-			if(parentContainerParent instanceof JSClass)
-			{
-				parentContainer = (JSNamedElement) parentContainerParent;
-			}
-
-			if(parentContainer instanceof JSFunctionExpression && parentContainer.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-			{
-				parentContainer = null;
-				qualifyingExpression = null;
-				typeName = OBJECT_CLASS_NAME;
-			}
-		}
-
-		public
-		@Nullable
-		String getQualifierAsString()
-		{
-			String qualifierAsString = getOriginalQualifierAsString();
-			return normalizeQualifier(qualifierAsString);
-		}
-
-		private static String normalizeQualifier(String qualifierAsString)
-		{
-			if("Window".equals(qualifierAsString) || "Document".equals(qualifierAsString))
-			{
-				qualifierAsString = StringUtil.decapitalize(qualifierAsString);
-			}
-			return qualifierAsString;
-		}
-
-		private String getOriginalQualifierAsString()
-		{
-			if(qualifyingExpression instanceof JSLiteralExpression)
-			{
-				return StringUtil.stripQuotesAroundValue(qualifyingExpression.getText());
-			}
-			else if(qualifyingExpression instanceof JSReferenceExpression)
-			{
-				return qualifyingExpression.getText();
-			}
-			else if(qualifyingExpression instanceof JSNamedElement)
-			{
-				return qualifyingExpression.getName();
-			}
-			else if(parentContainer instanceof JSQualifiedNamedElement)
-			{
-				return ((JSQualifiedNamedElement) parentContainer).getQualifiedName();
-			}
-
-			return typeName;
-		}
-
-		@Nullable
-		public String[] getQualifierAsNameIndex()
-		{
-			String qualifierAsString = getQualifierAsString();
-			if(qualifierAsString != null)
-			{
-				List<String> list = new ArrayList<String>();
-				qualifierAsString = BaseJSSymbolProcessor.addIndexListFromQName(qualifierAsString, qualifyingExpression, list);
-				return ArrayUtil.toStringArray(list);
-			}
-
-			return null;
-		}
-
-		public static String getQualifierOfExprAsString(JSElement expr)
-		{
-			if(expr instanceof JSNamedElement)
-			{
-				return expr.getName();
-			}
-			if(expr instanceof JSReferenceExpression && PROTOTYPE_FIELD_NAME.equals(((JSReferenceExpression) expr).getReferencedName()))
-			{
-				expr = ((JSReferenceExpression) expr).getQualifier();
-			}
-			return normalizeQualifier(StringUtil.stripQuotesAroundValue(expr.getText()));
-		}
-	}
-
-	private static boolean isInjectedFile(PsiElement element)
-	{
-		return element instanceof PsiFile && (((PsiFile) element).getVirtualFile() instanceof LightVirtualFile);
-	}
-
-	@RequiredReadAction
-	public static void processGlobalSymbols(PsiElement target, PsiScopeProcessor processor)
-	{
-		Sdk sdk = ModuleUtilCore.getSdk(target, JavaScriptModuleExtension.class);
-		if(sdk != null)
-		{
-			VirtualFile[] files = sdk.getRootProvider().getFiles(BinariesOrderRootType.getInstance());
-
-			for(VirtualFile file : files)
-			{
-				PsiFile psiFile = PsiManager.getInstance(target.getProject()).findFile(file);
-				if(psiFile instanceof JSFile)
-				{
-					if(!psiFile.processDeclarations(processor, ResolveState.initial(), null, target))
-					{
-						return;
-					}
-				}
-			}
-		}
-	}
-
-	public interface OverrideHandler
-	{
-		boolean process(ResolveProcessor processor, final PsiElement scope, String className);
-	}
-
-	public interface MetaDataProcessor
-	{
-		boolean process(final @Nonnull JSAttribute jsAttribute);
-
-		boolean handleOtherElement(final PsiElement el, PsiElement context, @Nullable Ref<PsiElement> continuePassElement);
-	}
-
-	public static abstract class CollectMethodsToImplementProcessor extends ResolveProcessor
-	{
-		private final String myName;
-
-		public CollectMethodsToImplementProcessor(final String name, PsiElement context)
-		{
-			super(null, context);
-			myName = name;
-
-			setToSkipClassDeclarationsOnce(true);
-			setToProcessHierarchy(true);
-			setToProcessMembers(false);
-			setTypeContext(true);
-		}
-
-		@Override
-		public boolean execute(final PsiElement element, final ResolveState state)
-		{
-			final ResolveProcessor processor = new ResolveProcessor(myName, place)
-			{
-				@Override
-				public boolean execute(final PsiElement element, final ResolveState state)
-				{
-					if(element instanceof JSFunction)
-					{
-						if(OBJECT_CLASS_NAME.equals(((JSClass) findParent((JSNamedElement) element)).getQualifiedName()) || ((JSFunction) element).isConstructor())
-						{
-							return true;
-						}
-					}
-					else
-					{
-						return true;
-					}
-					return super.execute(element, state);
-				}
-
-				{
-					setToProcessHierarchy(true);
-				}
-			};
-			for(JSClass implementedInterface : ((JSClass) element).getImplementedInterfaces())
-			{
-				if(!implementedInterface.isInterface())
-				{
-					continue;
-				}
-				final boolean b = implementedInterface.processDeclarations(processor, ResolveState.initial(), implementedInterface, implementedInterface);
-
-				if(!b)
-				{
-					process(processor);
-					break;
-				}
-			}
-
-			if(myName == null && processor.getResults() != null)
-			{
-				process(processor);
-			}
-			return false;
-		}
-
-		protected abstract boolean process(ResolveProcessor processor);
-	}
-
-	static JSSourceElement[] getSourceElements(final PsiElement owner)
-	{
-		if(owner instanceof JSStubElementImpl)
-		{
-			return (JSSourceElement[]) ((JSStubElementImpl) owner).getStubOrPsiChildren(JSElementTypes.SOURCE_ELEMENTS, JSSourceElement.EMPTY_ARRAY);
-		}
-		else if(owner instanceof JSFile)
-		{
-			return ((JSFile) owner).getStatements();
-		}
-		return JSSourceElement.EMPTY_ARRAY;
-	}
-
-	public static PsiElement[] getStubbedChildren(final PsiElement owner)
-	{
-		return getStubbedChildren(owner, ourStubbedFilter);
-	}
-
-	public static PsiElement[] getStubbedChildren(final PsiElement owner, TokenSet filter)
-	{
-		if(owner instanceof JSStubElementImpl)
-		{
-			final JSStubElementImpl element = (JSStubElementImpl) owner;
-			final StubElement stub = element.getStub();
-			if(stub != null)
-			{
-				return stub.getChildrenByType(filter, PsiElement.EMPTY_ARRAY);
-			}
-			return getChildrenFromTokenSet(element.getNode(), filter);
-		}
-		else if(owner instanceof JSFile)
-		{
-			final JSFile file = (JSFile) owner;
-			final StubElement stub = ((JSFileImpl) file).getStub();
-			if(stub != null)
-			{
-				return stub.getChildrenByType(filter, PsiElement.EMPTY_ARRAY);
-			}
-			return getChildrenFromTokenSet(file.getNode(), filter);
-		}
-		return PsiElement.EMPTY_ARRAY;
-	}
-
-	private static PsiElement[] getChildrenFromTokenSet(final ASTNode astNode, TokenSet filter)
-	{
-		final ASTNode[] astNodes = astNode.getChildren(filter);
-		PsiElement[] result = new PsiElement[astNodes.length];
-		for(int i = 0; i < astNodes.length; ++i)
-		{
-			result[i] = astNodes[i].getPsi();
-		}
-		return result;
-	}
-
-	private static final TokenSet ourStubbedFilter = TokenSet.create(JSElementTypes.CLASS, JSElementTypes.VAR_STATEMENT, JSElementTypes.FUNCTION_DECLARATION, JSElementTypes.ATTRIBUTE_LIST,
-			JSElementTypes.INCLUDE_DIRECTIVE, JSElementTypes.ATTRIBUTE, JSElementTypes.PACKAGE_STATEMENT);
-
-	private static class ImplicitJSVariableImpl extends LightElement implements JSVariable
-	{
-		private final PsiFile myContainingFile;
-		private final String myName;
-		private final String myType;
-
-		public ImplicitJSVariableImpl(final String name, String qName, PsiFile containingFile)
-		{
-			super(containingFile.getManager(), JavaScriptSupportLoader.ECMA_SCRIPT_L4.getBaseLanguage());
-			myContainingFile = containingFile;
-			myName = name;
-			myType = qName;
-		}
-
-		@Override
-		public JSAttributeList getAttributeList()
-		{
-			return null;
-		}
-
-		@Override
-		public boolean isValid()
-		{
-			return myContainingFile.isValid();
-		}
-
-		@Override
-		public PsiElement getParent()
-		{
-			return myContainingFile;
-		}
-
-		@Override
-		public PsiFile getContainingFile()
-		{
-			return myContainingFile;
-		}
-
-		@RequiredReadAction
-		@Override
-		public String getText()
-		{
-			return null;
-		}
-
-		@Override
-		public void accept(@Nonnull PsiElementVisitor visitor)
-		{
-			if(visitor instanceof JSElementVisitor)
-			{
-				((JSElementVisitor) visitor).visitJSVariable(this);
-			}
-			else
-			{
-				visitor.visitElement(this);
-			}
-		}
-
-		@Override
-		public PsiElement copy()
-		{
-			return new ImplicitJSVariableImpl(myName, myType, myContainingFile);
-		}
-
-		@Override
-		public boolean canNavigate()
-		{
-			return false;
-		}
-
-		@Override
-		public boolean isPhysical()
-		{
-			return false;
-		}
-
-		@Nonnull
-		@Override
-		public ASTNode getNode()
-		{
-			return null;
-		}
-
-		@Override
-		public boolean hasInitializer()
-		{
-			return false;
-		}
-
-		@Override
-		public JSExpression getInitializer()
-		{
-			return null;
-		}
-
-		@Override
-		public String getInitializerText()
-		{
-			return null;
-		}
-
-		@Override
-		public void setInitializer(JSExpression expr) throws IncorrectOperationException
-		{
-		}
-
-		@Nonnull
-		@Override
-		public JavaScriptType getType()
-		{
-			return JavaScriptType.UNKNOWN;
-		}
-
-		@Override
-		public String getTypeString()
-		{
-			return myType;
-		}
-
-		@RequiredReadAction
-		@Override
-		public JavaScriptTypeElement getTypeElement()
-		{
-			return null;
-		}
-
-		@Override
-		public boolean isConst()
-		{
-			return false;
-		}
-
-		@Override
-		public boolean isLocal()
-		{
-			return false;
-		}
-
-		@Override
-		public boolean isDeprecated()
-		{
-			return false;
-		}
-
-		@Override
-		public String getQualifiedName()
-		{
-			return myName;
-		}
-
-		@Override
-		public String getName()
-		{
-			return myName;
-		}
-
-		@Override
-		public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException
-		{
-			throw new IncorrectOperationException();
-		}
-
-		@Override
-		public PsiElement getNameIdentifier()
-		{
-			return null;
-		}
-
-		@Override
-		public String toString()
-		{
-			return "js_implicit_var:" + myName + ", type:" + myType + ", file:" + myContainingFile;
-		}
-
-		@Override
-		public boolean isEquivalentTo(PsiElement another)
-		{
-			return another == this || (another instanceof ImplicitJSVariableImpl &&
-					myContainingFile == ((ImplicitJSVariableImpl) another).myContainingFile &&
-					myName.equals(((ImplicitJSVariableImpl) another).myName));
-		}
-	}
+public class JSResolveUtil {
+    private static final Key<CachedValue<IntObjectMap<Object>>> MY_CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
+    private static UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> ourCachedDefsCache =
+        new RelevantDefsUserDataCache();
+    @NonNls
+    public static final String PROTOTYPE_FIELD_NAME = "prototype";
+
+    @NonNls
+    private static final String ARRAY_TYPE_NAME = "Array";
+    @NonNls
+    private static final String ARGUMENTS_TYPE_NAME = "Arguments";
+
+    public static final String COMMENT_DELIMITERS = "|/";
+
+    public static void processInjectedFileForTag(final @Nonnull XmlTag tag, @Nonnull JSInjectedFilesVisitor visitor) {
+        InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(tag.getProject());
+
+        for (XmlTagChild child : tag.getValue().getChildren()) {
+            if (child instanceof XmlText) {
+                injectedLanguageManager.enumerate(child, visitor);
+            }
+        }
+    }
+
+    public static String findPackageForMxml(final PsiElement expression) {
+        String s = null;
+        final PsiFile containingFile = expression.getContainingFile();
+
+        if (containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 && containingFile.getContext() != null) {
+            final PsiFile contextContainigFile = containingFile.getContext().getContainingFile();
+            VirtualFile file = contextContainigFile.getVirtualFile();
+            if (file == null && contextContainigFile.getOriginalFile() != null) {
+                file = contextContainigFile.getOriginalFile().getVirtualFile();
+            }
+
+            s = getExpectedPackageNameFromFile(file, containingFile.getProject(), true);
+        }
+        return s;
+    }
+
+    public static String getExpectedPackageNameFromFile(VirtualFile file, Project project, boolean allowEvaluationFromContextRoot) {
+        final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex();
+        final Module moduleForFile = file != null ? projectFileIndex.getModuleForFile(file) : null;
+
+        if (moduleForFile != null) {
+            if (file instanceof VirtualFileWindow) {
+                file = ((VirtualFileWindow)file).getDelegate();
+            }
+            VirtualFile rootForFile = projectFileIndex.getSourceRootForFile(file);
+            if (rootForFile == null && allowEvaluationFromContextRoot) {
+                rootForFile = projectFileIndex.getContentRootForFile(file);
+            }
+
+            if (rootForFile != null) {
+                return VirtualFileUtil.getRelativePath(file.isDirectory() ? file : file.getParent(), rootForFile, '.');
+            }
+        }
+        return null;
+    }
+
+    public static void processInterfaceMethods(final JSClass clazz, final CollectMethodsToImplementProcessor implementedMethodProcessor) {
+        clazz.processDeclarations(implementedMethodProcessor, ResolveState.initial(), clazz, clazz);
+    }
+
+    public static String getExpressionType(final JSExpression expression, final PsiFile containingFile) {
+        String type = getQualifiedExpressionType(expression, containingFile);
+
+        return getShortenedType(type, expression);
+    }
+
+    public static String getShortenedType(String type, final PsiElement context) {
+        if (type == null) {
+            type = "*";
+        }
+        else {
+            String shortName = getShortTypeName(type);
+            final String expr = JSImportHandlingUtil.resolveTypeName(shortName, context);
+            if (expr != null && !expr.equals(shortName)) {
+                type = shortName;
+            }
+        }
+        return type;
+    }
+
+    public static String getQualifiedExpressionType(final JSExpression expression, final PsiFile containingFile) {
+        String type = null;
+
+        if (expression != null) {
+            final BaseJSSymbolProcessor.SimpleTypeProcessor processor =
+                new BaseJSSymbolProcessor.SimpleTypeProcessor(JavaScriptVersionUtil.getFeatures(expression));
+            BaseJSSymbolProcessor.doEvalForExpr(expression, containingFile, processor);
+            type = processor.getType();
+        }
+
+        return type;
+    }
+
+    private static String getShortTypeName(String type) {
+        String str = type;
+
+        final int i = str.indexOf('<');
+        String signature = null;
+
+        if (i != -1) {
+            final int index = str.lastIndexOf('.', i);
+            if (index == -1) {
+                return type;
+            }
+            signature = str.substring(index);
+            str = str.substring(0, index);
+        }
+
+        final int i2 = str.lastIndexOf('.');
+        if (i2 != -1) {
+            str = str.substring(i2 + 1);
+        }
+
+        return str + (signature != null ? signature : "");
+    }
+
+    // TODO remove this method, call generic one processing includes as well (like findParent())
+    public static PsiElement getClassReferenceForXmlFromContext(PsiElement parent) {
+        final PsiElement context = parent != null ? parent.getContext() : null;
+        if (context instanceof XmlElement && context.getContainingFile() instanceof XmlFile) {
+            return XmlBackedJSClassImpl.getContainingComponent((XmlElement)context);
+        }
+        return parent;
+    }
+
+    @Nullable
+    public static XmlBackedJSClassImpl getXmlBackedClass(final JSFile injectedJsFile) {
+        final PsiElement context = injectedJsFile.getContext();
+        if (context instanceof XmlAttributeValue || context instanceof XmlText) {
+            return XmlBackedJSClassImpl.getContainingComponent((XmlElement)context);
+        }
+        return null;
+    }
+
+    public static <T extends JSNamedElement & JSAttributeListOwner> SearchScope findUseScope(final T jsVariableBase) {
+        PsiElement element = PsiTreeUtil.getParentOfType(
+            jsVariableBase,
+            JSFunction.class,
+            JSCatchBlock.class,
+            JSClass.class,
+            JSObjectLiteralExpression.class,
+            JSFile.class
+        );
+        PsiElement scopeElement = element;
+
+        if (element instanceof JSFile) {
+            final PsiElement xmlFromContext = getClassReferenceForXmlFromContext(element);
+
+            if (xmlFromContext != element) {
+                element = xmlFromContext;
+                scopeElement = element.getContainingFile();
+            }
+            else {
+                element = null;
+            }
+        }
+
+        if (element != null) {
+            if (element instanceof JSFunction) {
+                final PsiElement elt =
+                    JSDocumentationUtils.findDocComment(JSDocumentationProvider.findElementForWhichPreviousCommentWillBeSearched(element));
+                if (elt instanceof PsiComment) {
+                    return new LocalSearchScope(new PsiElement[]{
+                        elt,
+                        element
+                    });
+                }
+            }
+
+            if (element instanceof JSClass) {
+                final JSAttributeList attributeList = jsVariableBase.getAttributeList();
+
+                if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PRIVATE) {
+                    return ((JSStubElementImpl)jsVariableBase).getDefaultUseScope();
+                }
+            }
+            return new LocalSearchScope(scopeElement);
+        }
+        return ((JSStubElementImpl)jsVariableBase).getDefaultUseScope();
+    }
+
+    public static final boolean isAssignableType(@NonNls final String expectedType, @NonNls String type, PsiElement context) {
+        if ((expectedType != null && hasMultipleOccurenceDelimiters(expectedType))
+            || (type != null && hasMultipleOccurenceDelimiters(type))) {
+            StringTokenizer expectedTypeIterator = new StringTokenizer(expectedType != null ? expectedType : "", COMMENT_DELIMITERS);
+
+            while (expectedTypeIterator.hasMoreElements()) {
+                String primitiveExpectedType = expectedTypeIterator.nextToken().trim();
+                StringTokenizer typeIterator = new StringTokenizer(type != null ? type : "", COMMENT_DELIMITERS);
+
+                while (typeIterator.hasMoreElements()) {
+                    String primitiveType = typeIterator.nextToken().trim();
+                    if (isAssignableType(primitiveExpectedType, primitiveType, context)) {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+        if (expectedType == null || expectedType.equals("*") || expectedType.equals(OBJECT_CLASS_NAME) || expectedType.equals("Class")) {
+            return true;
+        }
+        if (expectedType.equals(type)) {
+            return true;
+        }
+
+        final boolean nonecma = context.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+
+        if ("Number".equals(expectedType) && ("int".equals(type) || "uint".equals(type)
+            || (("Boolean".equals(type) || "String".equals(type)) && nonecma))) {
+            return true;
+        }
+        if ("int".equals(expectedType)
+            && ("Number".equals(type) || ("String".equals(type) && nonecma) || "uint".equals(type))) {
+            return true; // compatibility
+        }
+
+        if ("uint".equals(expectedType) && ("int".equals(type) || "Number".equals(type))) {
+            return true;
+        }
+        if (ARRAY_TYPE_NAME.equals(type)) {
+            if (ARGUMENTS_TYPE_NAME.equals(expectedType) || expectedType.startsWith(ARRAY_TYPE_NAME) /*Array[*/
+                || JSTypeEvaluateManager.isArrayType(expectedType)) {
+                return true;
+            }
+        }
+
+        if (ARGUMENTS_TYPE_NAME.equals(type) && nonecma) {
+            return true; // TODO: hack for indirect call Array.slice(arguments, 0)
+        }
+
+        if (ARRAY_TYPE_NAME.equals(expectedType) && JSTypeEvaluateManager.isArrayType(type)) {
+            return true;
+        }
+        if ("String".equals(expectedType)
+            && (("Number".equals(type) || "int".equals(type) || "Boolean".equals(type) || "RegExp".equals(type))
+            && nonecma)) {
+            return true;
+        }
+
+        if ("*".equals(type) || (OBJECT_CLASS_NAME.equals(type) && nonecma)) {
+            return true; // Dynamic cast
+        }
+        if ("void".equals(type)) {
+            return false;
+        }
+        final PsiElement typeClass = type != null ? unwrapProxy(findClassByQName(type, context)) : null;
+
+        if (!(typeClass instanceof JSClass)) {
+            return true;
+        }
+
+        boolean result = typeClass.processDeclarations(
+            new ResolveProcessor(null) {
+                {
+                    setToProcessHierarchy(true);
+                    setTypeContext(true);
+                    setToProcessMembers(false);
+                    setLocalResolve(true);
+                }
+
+                @Override
+                public boolean execute(final PsiElement element, final ResolveState state) {
+                    if (!(element instanceof JSClass)) {
+                        return true;
+                    }
+                    final JSClass clazz = (JSClass)element;
+                    boolean sameType = clazz.getQualifiedName().equals(expectedType);
+
+                    if (!sameType) {
+                        for (JSClass implementedClazz : clazz.getImplementedInterfaces()) {
+                            sameType =
+                                !implementedClazz.processDeclarations(this, ResolveState.initial(), implementedClazz, implementedClazz);
+                            if (sameType) {
+                                break;
+                            }
+                        }
+                    }
+                    return !sameType;
+                }
+            },
+            ResolveState.initial(),
+            typeClass,
+            typeClass
+        );
+
+        if (result && isImplicitCastPossible((JSClass)typeClass, expectedType)) {
+            result = false;
+        }
+
+        return !result;
+    }
+
+    private static boolean hasMultipleOccurenceDelimiters(String expectedType) {
+        final String commentDelimiters = COMMENT_DELIMITERS;
+
+        for (int i = 0; i < commentDelimiters.length(); ++i) {
+            if (expectedType.indexOf(commentDelimiters.charAt(i)) != -1) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean isImplicitCastPossible(JSClass typeClass, String expectedType) {
+        // TODO: move to flex support plugin
+        if (expectedType.equals("flash.events.IEventDispatcher")) {
+            JSAttributeList attributeList = typeClass.getAttributeList();
+            if (attributeList != null) {
+                return attributeList.getAttributesByName("Bindable").length != 0;
+            }
+        }
+        return false;
+    }
+
+    public static PsiElement getTopReferenceParent(final PsiElement parent) {
+        PsiElement currentParent = parent;
+        for (; currentParent instanceof JSReferenceExpression; currentParent = currentParent.getParent()) {
+            ;
+        }
+        return currentParent;
+    }
+
+    public static PsiElement getTopReferenceExpression(final @Nonnull PsiElement parent) {
+        PsiElement element = parent;
+
+        for (PsiElement currentParent = parent.getParent(); currentParent instanceof JSReferenceExpression;
+             element = currentParent, currentParent = currentParent.getParent()) {
+            ;
+        }
+        return element;
+    }
+
+    public static boolean isSelfReference(final PsiElement currentParent, PsiElement elt) {
+        return currentParent instanceof JSPackageStatement || currentParent instanceof JSNamespaceDeclaration
+            || (currentParent instanceof JSVariable variable && variable.getNameIdentifier() == elt)
+            || (currentParent instanceof JSFunction function && function.getNameIdentifier() == elt)
+            || currentParent instanceof JSClass;
+    }
+
+    public static PsiElement findParent(final PsiElement element) {
+        PsiElement parent = element instanceof JSVariable ? element.getParent().getParent() : element.getParent();
+        return parent instanceof JSFile jsFile ? findParentClass(jsFile) : parent;
+    }
+
+    private static PsiElement findParentClass(final JSFile file) {
+        JSClass xmlBackedClass = getXmlBackedClass(file);
+        if (xmlBackedClass != null) {
+            return xmlBackedClass;
+        }
+
+        PsiElement forcedContext = file.getUserData(contextKey);
+        if (forcedContext != null && !forcedContext.isValid()) {
+            forcedContext = null;
+        }
+        if (forcedContext instanceof JSClass) {
+            return forcedContext;
+        }
+
+        if (forcedContext instanceof JSFile) {
+            return findParentClass((JSFile)forcedContext);
+        }
+
+        if (forcedContext instanceof PsiFile && JavaScriptSupportLoader.isFlexMxmFile((PsiFile)forcedContext)) {
+            return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)forcedContext);
+        }
+
+        if (forcedContext instanceof XmlElement) {
+            PsiFile containingFile = forcedContext.getContainingFile();
+            if (JavaScriptSupportLoader.isFlexMxmFile(containingFile)) {
+                return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)containingFile);
+            }
+        }
+
+        if (forcedContext != null) {
+            PsiFile containingFile = forcedContext.getContainingFile();
+            if (containingFile instanceof JSFile jsFile && containingFile != file) {
+                return findParentClass(jsFile);
+            }
+        }
+        return file;
+    }
+
+    @Nullable
+    public static JSClass getClassOfContext(PsiElement node) {
+        final JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
+        if (jsClass != null) {
+            return jsClass;
+        }
+        else {
+            final PsiElement context = getClassReferenceForXmlFromContext(node.getContainingFile());
+            if (context instanceof JSClass) {
+                return (JSClass)context;
+            }
+        }
+
+        return null;
+    }
+
+    public static
+    @Nullable
+    JSClass findClassOfQualifier(final JSExpression qualifier, final PsiFile containingFile) {
+        final String s = getQualifiedExpressionType(qualifier, containingFile);
+        final PsiElement qName = s != null ? unwrapProxy(findClassByQName(s, containingFile)) : null;
+        return qName instanceof JSClass jsClass ? jsClass : null;
+    }
+
+    public static boolean referenceExpressionShouldBeQualified(final JSReferenceExpression contextExpr) {
+        PsiElement parent = contextExpr.getParent();
+        return parent instanceof JSImportStatement
+            || (parent instanceof JSReferenceList && contextExpr.getContainingFile().getContext() != null);
+    }
+
+    public static boolean isArtificialClassUsedForReferenceList(JSClass clazz) {
+        return clazz.getContainingFile().getContext() != null;
+    }
+
+    public static Collection<JSQualifiedNamedElement> findElementsByName(String name, Project project, GlobalSearchScope scope) {
+        final Set<JSQualifiedNamedElement> result = new HashSet<>();
+        Collection<JSQualifiedNamedElement> jsQualifiedNamedElements =
+            StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_NAME, name, project, scope, JSQualifiedNamedElement.class);
+
+        for (JSQualifiedNamedElement e : jsQualifiedNamedElements) {
+            result.add((JSQualifiedNamedElement)e.getNavigationElement());
+        }
+
+        Collection<VirtualFile> files = new ArrayList<>();
+        files.addAll(FileBasedIndex.getInstance()
+            .getContainingFiles(FilenameIndex.NAME, name + JavaScriptSupportLoader.MXML_FILE_EXTENSION_DOT, scope));
+        files.addAll(FileBasedIndex.getInstance()
+            .getContainingFiles(FilenameIndex.NAME, name + JavaScriptSupportLoader.MXML_FILE_EXTENSION2_DOT, scope));
+
+        for (final VirtualFile file : files) {
+            if (!file.isValid()) {
+                continue;
+            }
+            final PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
+            if (psiFile != null) {
+                result.add(XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)psiFile));
+            }
+        }
+        return result;
+    }
+
+    public static boolean isNewResolveAndCompletion(PsiFile psiFile) {
+        return psiFile.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4) || JavaScriptSupportLoader.isFlexMxmFile(psiFile);
+    }
+
+    public static String getTypeFromSetAccessor(final JSNamedElement jsNamedElement) {
+        if (!(jsNamedElement instanceof JSFunction function && function.isSetProperty())) {
+            return null;
+        }
+        final JSParameterList jsParameterList = ((JSFunction)jsNamedElement).getParameterList();
+        if (jsParameterList == null) {
+            return null;
+        }
+        final JSParameter[] jsParameters = jsParameterList.getParameters();
+        if (jsParameters == null || jsParameters.length != 1) {
+            return null;
+        }
+        return jsParameters[0].getTypeString();
+    }
+
+    public static boolean shouldProcessTopLevelGlobalContext(@Nonnull PsiElement place, @Nonnull PsiScopeProcessor processor) {
+        PsiElement placeParent = null;
+
+        return shouldProcessImports(place, processor) && (
+            !((placeParent = place.getParent()) instanceof JSCallExpression)
+                || (place instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() != null
+                && ((ResolveProcessor)processor).specificallyAskingToResolveQualifiedNames())
+                || placeParent instanceof JSNewExpression);
+    }
+
+    public static boolean shouldProcessImports(@Nonnull PsiElement place, @Nonnull PsiScopeProcessor processor) {
+        if (!(processor instanceof ResolveProcessor resolveProcessor && !resolveProcessor.isLocalResolve())) {
+            return false;
+        }
+        return (!(place instanceof JSReferenceExpression) ||
+            ((JSReferenceExpression)place).getQualifier() == null ||
+            ((ResolveProcessor)processor).specificallyAskingToResolveQualifiedNames());
+    }
+
+    public static boolean processTopLevelClasses(
+        PsiScopeProcessor processor,
+        ResolveState state,
+        Project project,
+        GlobalSearchScope scope,
+        boolean acceptOnlyClasses,
+        boolean acceptQualifiedElements
+    ) {
+        boolean result = true;
+        final String resolvedName = ((ResolveProcessor)processor).getName();
+
+        if (resolvedName == null) {
+            for (String s : StubIndex.getInstance().getAllKeys(JavaScriptIndexKeys.ELEMENTS_BY_NAME, project)) {
+                for (JSQualifiedNamedElement e : StubIndex.getElements(
+                    JavaScriptIndexKeys.ELEMENTS_BY_NAME,
+                    s,
+                    project,
+                    scope,
+                    JSQualifiedNamedElement.class
+                )) {
+                    if (ARGUMENTS_TYPE_NAME.equals(e.getName())) {
+                        continue;
+                    }
+                    if (acceptOnlyClasses && !(e instanceof JSClass)) {
+                        continue;
+                    }
+
+                    if (!acceptQualifiedElements) {
+                        String qName = e.getQualifiedName();
+                        if (qName != null && qName.indexOf('.') != -1) {
+                            continue;
+                        }
+                    }
+                    result &= processor.execute(e, state);
+                }
+            }
+        }
+        else {
+            for (JSQualifiedNamedElement e : StubIndex.getElements(
+                JavaScriptIndexKeys.ELEMENTS_BY_QNAME,
+                resolvedName,
+                project,
+                scope,
+                JSQualifiedNamedElement.class
+            )) {
+                if (!e.getName().equals(resolvedName)) {
+                    continue;
+                }
+                if (acceptOnlyClasses && !(e instanceof JSClass)) {
+                    continue;
+                }
+                result = processor.execute(e, state);
+                if (!result) {
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    static boolean walkOverStructure(@Nonnull PsiElement context, Processor<PsiNamedElement> processor) {
+        PsiNamedElement parent = PsiTreeUtil.getNonStrictParentOfType(context, JSQualifiedNamedElement.class, PsiFile.class);
+
+        if (parent instanceof JSClass) {
+            PsiElement forcedContext = parent.getUserData(contextKey);
+
+            if (forcedContext instanceof XmlBackedJSClassImpl xmlBackedJSClass && !processor.process(xmlBackedJSClass)) {
+                return false;
+            }
+        }
+
+        while (parent != null) {
+            if (!processor.process(parent)) {
+                return false;
+            }
+
+            if (parent instanceof JSPackageStatement) {
+                break;
+            }
+
+            if (parent instanceof PsiFile) {
+                final PsiElement data = parent.getUserData(contextKey);
+
+                if (data instanceof JSElement) {
+                    parent = PsiTreeUtil.getNonStrictParentOfType(data, JSQualifiedNamedElement.class, PsiFile.class);
+                }
+                else {
+                    break;
+                }
+            }
+            else {
+                parent = PsiTreeUtil.getParentOfType(parent, JSQualifiedNamedElement.class, PsiFile.class);
+            }
+        }
+
+        return true;
+    }
+
+    private static final Key<ParameterizedCachedValue<Set<String>, JSElement>> ourCachedOpenedNsesKey = Key.create("opened.nses");
+
+    private static final UserDataCache<ParameterizedCachedValue<Set<String>, JSElement>, JSElement, Object> ourCachedOpenedNsesCache =
+        new UserDataCache<ParameterizedCachedValue<Set<String>, JSElement>, JSElement, Object>() {
+            @Override
+            protected ParameterizedCachedValue<Set<String>, JSElement> compute(JSElement jsElement, Object p) {
+                return CachedValuesManager.getManager(jsElement.getProject()).createParameterizedCachedValue(
+                    new ParameterizedCachedValueProvider<Set<String>, JSElement>() {
+                        @Override
+                        public CachedValueProvider.Result<Set<String>> compute(JSElement context) {
+                            class MyProcessor extends ResolveProcessor implements Processor<PsiNamedElement> {
+                                Set<String> openedNses;
+
+                                public MyProcessor() {
+                                    super(null);
+                                    putUserData(ResolveProcessor.LOOKING_FOR_USE_NAMESPACES, true);
+                                }
+
+                                @Override
+                                public boolean process(PsiNamedElement psiNamedElement) {
+                                    if (psiNamedElement instanceof JSElement element) {
+                                        processDeclarationsInScope(element, this, ResolveState.initial(), element, element);
+                                    }
+                                    else {
+                                        // TODO: XmlFile ?
+                                    }
+                                    return true;
+                                }
+
+                                @Override
+                                public boolean execute(PsiElement element, ResolveState state) {
+                                    if (!(element instanceof JSUseNamespaceDirective)) {
+                                        return true;
+                                    }
+                                    if (openedNses == null) {
+                                        openedNses = new HashSet<String>();
+                                    }
+                                    openedNses.add(((JSUseNamespaceDirective)element).getNamespaceToBeUsed());
+                                    return true;
+                                }
+                            }
+                            MyProcessor processor = new MyProcessor();
+                            walkOverStructure(context, processor);
+                            return new CachedValueProvider.Result<Set<String>>(processor.openedNses, PsiModificationTracker.EVER_CHANGED);
+                        }
+                    },
+                    false
+                );
+            }
+        };
+
+    public static Set<String> calculateOpenNses(PsiElement place) {
+        final Ref<Set<String>> result = new Ref<>();
+        walkOverStructure(place, new Processor<PsiNamedElement>() {
+            @Override
+            public boolean process(PsiNamedElement psiNamedElement) {
+                if (psiNamedElement instanceof JSElement element) {
+                    result.set(ourCachedOpenedNsesCache.get(ourCachedOpenedNsesKey, element, null).getValue(element));
+                }
+                return false;
+            }
+        });
+        return result.get() != null ? result.get() : Collections.<String>emptySet();
+    }
+
+    public static boolean processGlobalThings(PsiScopeProcessor processor, ResolveState state, PsiElement place, PsiElement context) {
+        boolean result = true;
+        final Project project = context.getProject();
+        final GlobalSearchScope scope = context.getResolveScope();
+
+        if (shouldProcessTopLevelGlobalContext(place, processor)) {
+            //result = processTopPackages((ResolveProcessor) processor, state, project, scope);
+        }
+
+        if (result) {
+            boolean acceptOnlyClasses = place instanceof JSReferenceExpression ? isExprInTypeContext((JSReferenceExpression)place) : false;
+
+            result = processTopLevelClasses(processor, state, project, scope, acceptOnlyClasses, true);
+        }
+        return result;
+    }
+
+    public static
+    @Nullable
+    JSParameter findParameterForUsedArgument(@Nonnull JSExpression mainOccurence, @Nonnull JSArgumentList parent) {
+        int paramIndex = 0;
+
+        for (JSExpression expr : parent.getArguments()) {
+            if (expr == mainOccurence) {
+                break;
+            }
+            paramIndex++;
+        }
+
+        final JSExpression methodExpr = ((JSCallExpression)parent.getParent()).getMethodExpression();
+        if (methodExpr instanceof JSReferenceExpression referenceExpression) {
+            final ResolveResult[] results = referenceExpression.multiResolve(false);
+
+            if (results.length > 0) {
+                final PsiElement element = results[0].getElement();
+
+                if (element instanceof JSFunction function) {
+                    final JSParameterList parameterList = function.getParameterList();
+                    if (parameterList != null) {
+                        final JSParameter[] params = parameterList.getParameters();
+
+                        if (paramIndex < params.length) {
+                            return params[paramIndex];
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public static abstract class JSInjectedFilesVisitor
+        implements PsiLanguageInjectionHost.InjectedPsiVisitor, XmlBackedJSClassImpl.InjectedFileVisitor {
+        @Override
+        public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places) {
+            if (injectedPsi instanceof JSFile jsFile) {
+                process(jsFile);
+            }
+        }
+
+        protected abstract void process(JSFile file);
+
+        @Override
+        public void visit(XmlTag rootTag, JSFile file) {
+            process(file);
+        }
+    }
+
+    @NonNls
+    public static final String OBJECT_CLASS_NAME = "Object";
+
+    private JSResolveUtil() {
+    }
+
+    private static final Key<CachedValue<PsiElement[]>> ourFileElementsValueKey = Key.create("file.elements");
+
+    public static void treeWalkUp(PsiScopeProcessor processor, PsiElement elt, PsiElement lastParent, PsiElement place) {
+        treeWalkUp(processor, elt, lastParent, place, null, null);
+    }
+
+
+    public static void treeWalkUp(
+        PsiScopeProcessor processor,
+        PsiElement elt,
+        PsiElement lastParent,
+        PsiElement place,
+        PsiElement terminatingParent
+    ) {
+        treeWalkUp(processor, elt, lastParent, place, terminatingParent, null);
+    }
+
+    private static void treeWalkUp(
+        final PsiScopeProcessor processor,
+        PsiElement elt,
+        PsiElement lastParent,
+        PsiElement place,
+        PsiElement terminatingParent,
+        PsiElement currentScope
+    ) {
+        if (elt == null) {
+            return;
+        }
+
+        PsiElement parentElement = elt.getContext();
+        if (elt instanceof JSFunction || elt instanceof JSObjectLiteralExpression) {
+            currentScope = elt;
+        }
+
+        if (parentElement instanceof JSDefinitionExpression
+            || (parentElement instanceof JSAssignmentExpression && !(elt instanceof JSFunctionExpression))) {
+            if (elt == terminatingParent) {
+                return;
+            }
+            elt = parentElement.getParent();
+            parentElement = elt.getParent(); // when walking a| = b, start from enclosing statement
+            if (parentElement instanceof JSExpressionStatement) {
+                elt = parentElement;
+                parentElement = parentElement.getParent();
+            }
+            currentScope = elt;
+        }
+        else if (parentElement instanceof JSVariable && currentScope == null) {
+            // when walking from variable init start from enclosing statement (function expr / object literal could reference that could reference
+            // var in this case, better to check for any scope change)
+            currentScope = parentElement;
+            parentElement = parentElement.getParent();
+        }
+
+        final boolean parentIsClass = parentElement instanceof JSClass;
+        int index = -1;
+        PsiElement[] children = getChildren(parentElement);
+
+        if (children != null && children.length > 0) {
+            index = 0;
+            for (PsiElement el : children) {
+                if (el == elt) {
+                    break;
+                }
+                ++index;
+            }
+        }
+
+        boolean finish = false;
+        PsiElement cur = elt;
+
+        do {
+            if (!cur.processDeclarations(processor, ResolveState.initial(), cur == elt ? lastParent : null, place)) {
+                if (processor instanceof ResolveProcessor) {
+                    return;
+                }
+            }
+            if (terminatingParent == cur) {
+                finish = true;
+                break;
+            }
+            if (cur instanceof PsiFile || parentIsClass) {
+                break;
+            }
+            if (cur instanceof JSStatement && parentElement instanceof JSIfStatement) {
+                // Do not try to resolve variables from then branch in else branch.
+                break;
+            }
+
+            if (index == -1) {
+                cur = cur.getPrevSibling();
+            }
+            else {
+                if (index != 0) {
+                    cur = children[--index];
+                }
+                else {
+                    cur = null;
+                }
+            }
+        }
+        while (cur != null);
+
+        final PsiElement func = parentIsClass || finish ? null : processFunctionDeclarations(processor, parentElement);
+        if (func != null) {
+            return;
+        }
+
+        if (elt instanceof PsiFile) {
+            if (elt instanceof XmlFile) {
+                final XmlFile xmlFile = (XmlFile)elt;
+                final XmlDocument document = xmlFile.getDocument();
+                final XmlTag rootTag = document != null ? document.getRootTag() : null;
+                final String rootNs = rootTag != null ? rootTag.getNamespace() : null;
+
+                if (JavaScriptSupportLoader.isMxmlNs(rootNs)) {
+                    processXmlFile(processor, xmlFile, place);
+                }
+                else {
+                    if (rootTag != null && xmlFile.getFileType() == XmlFileType.INSTANCE) { // TODO this is bindows specific
+                        processXmlFile(processor, xmlFile, place);
+                    }
+                }
+            }
+            else if (elt instanceof JSFile) {
+                if (parentElement != null) {
+                    XmlTag tag = PsiTreeUtil.getParentOfType(parentElement, XmlTag.class);
+                    final PsiFile containingFile = parentElement.getContainingFile();
+
+                    while (tag != null) {
+                        if (XmlBackedJSClassImpl.isInlineComponentTag(tag)) {
+                            for (JSVariable var : ourCachedPredefinedVars.get(ourCachedPredefinedVarsKey, (XmlFile)containingFile, null)
+                                .getValue()) {
+                                if (!processor.execute(var, ResolveState.initial())) {
+                                    return;
+                                }
+                            }
+                            JSClass clazz = XmlBackedJSClassImpl.getXmlBackedClass(tag);
+                            clazz.processDeclarations(processor, ResolveState.initial(), clazz, place);
+                            return;
+                        }
+                        tag = PsiTreeUtil.getParentOfType(tag, XmlTag.class);
+                    }
+
+                    parentElement = containingFile;
+                }
+                else {
+                    parentElement = elt.getUserData(contextKey);
+                }
+            }
+            if (!(elt instanceof JSExpressionCodeFragment) && parentElement == null) {
+                return;
+            }
+        }
+
+        if (finish) {
+            return;
+        }
+        treeWalkUp(processor, parentElement, elt, place, terminatingParent, currentScope);
+    }
+
+    private static UserDataCache<CachedValue<List<JSVariable>>, XmlFile, Object> ourCachedPredefinedVars =
+        new UserDataCache<CachedValue<List<JSVariable>>, XmlFile, Object>() {
+            @Override
+            protected CachedValue<List<JSVariable>> compute(final XmlFile xmlFile, Object p) {
+                return CachedValuesManager.getManager(xmlFile.getProject()).createCachedValue(new CachedValueProvider<List<JSVariable>>() {
+                    @Override
+                    public Result<List<JSVariable>> compute() {
+                        SmartList<JSVariable> vars = new SmartList<>();
+                        String qName = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile).getQualifiedName();
+                        vars.add(new ImplicitJSVariableImpl("outerDocument", qName, xmlFile));
+                        vars.add(new ImplicitJSVariableImpl("data", OBJECT_CLASS_NAME, xmlFile));
+                        return new Result<List<JSVariable>>(vars, xmlFile);
+                    }
+                }, false);
+            }
+        };
+
+    private static Key<CachedValue<List<JSVariable>>> ourCachedPredefinedVarsKey = Key.create("ourCachedPredefinedVarsKey");
+
+    public static boolean processXmlFile(final PsiScopeProcessor processor, final XmlFile xmlFile, final PsiElement place) {
+        JSClass clazz = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
+        if (!clazz.processDeclarations(processor, ResolveState.initial(), clazz, place)) {
+            return false;
+        }
+        return true;
+    }
+
+    private static PsiElement[] getChildren(final PsiElement element) {
+        if (!(element instanceof JSFile) && (!(element instanceof JSBlockStatement) || !(element.getParent() instanceof JSNamedElement))) {
+            return null;
+        }
+        CachedValue<PsiElement[]> value = element.getUserData(ourFileElementsValueKey);
+
+        if (value == null) {
+            value = CachedValuesManager.getManager(element.getProject()).createCachedValue(new CachedValueProvider<PsiElement[]>() {
+                @Override
+                public Result<PsiElement[]> compute() {
+                    return new Result<PsiElement[]>(element.getChildren(), element);
+                }
+            }, false);
+            element.putUserData(ourFileElementsValueKey, value);
+        }
+
+        return value.getValue();
+    }
+
+    @Nullable
+    private static PsiElement processFunctionDeclarations(final @Nonnull PsiScopeProcessor processor, final @Nullable PsiElement context) {
+        if (!(context instanceof JSElement)) {
+            return null;
+        }
+        PsiElement[] children = getChildren(context);
+
+        if (context != null) {
+            int index = children != null ? children.length - 1 : -1;
+            PsiElement cur = index >= 0 ? children[index] : context.getLastChild();
+
+            while (cur != null) {
+                if (cur instanceof JSFunction || cur instanceof JSClass) {
+                    if (!processor.execute(cur, ResolveState.initial())) {
+                        if (processor instanceof ResolveProcessor) {
+                            return ((ResolveProcessor)processor).getResult();
+                        }
+                    }
+                }
+
+                if (index == -1) {
+                    cur = cur.getPrevSibling();
+                }
+                else {
+                    if (index != 0) {
+                        cur = children[--index];
+                    }
+                    else {
+                        cur = null;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public static JSClass findDeclaringClass(final JSFunction method) {
+        final Ref<JSClass> lastVisitedClass = new Ref<>();
+        iterateOverridenMethodsUp(
+            method,
+            new Processor<JSClass>() {
+                @Override
+                public boolean process(JSClass jsClass) {
+                    lastVisitedClass.set(jsClass);
+                    return true;
+                }
+            },
+            true
+        );
+
+        Collection<JSClass> visited = new HashSet<>();
+        visitAllImplementedInterfaces(lastVisitedClass.get(), visited, new Processor<JSClass>() {
+            @Override
+            public boolean process(JSClass jsClass) {
+                // hierarchy may contain maximum one interface declaring a certain method
+                JSFunction interfaceMethod = jsClass.findFunctionByNameAndKind(method.getName(), method.getKind());
+                if (interfaceMethod != null) {
+                    // TODO check signature
+                    lastVisitedClass.set(jsClass);
+                    return false;
+                }
+                return true;
+            }
+        });
+
+        return lastVisitedClass.get();
+    }
+
+    /**
+     * @return true if processor said enough
+     */
+    private static boolean visitAllImplementedInterfaces(
+        JSClass clazz,
+        @Nonnull Collection<JSClass> visited,
+        Processor<JSClass> processor
+    ) {
+        if (visited.contains(clazz)) {
+            return true;
+        }
+        if (clazz.isInterface()) {
+            visited.add(clazz);
+            if (!processor.process(clazz)) {
+                return true;
+            }
+        }
+        JSClass[] interfaces = clazz.isInterface() ? clazz.getSuperClasses() : clazz.getImplementedInterfaces();
+        for (JSClass anInterface : interfaces) {
+            if (visitAllImplementedInterfaces(anInterface, visited, processor)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @return true if processor said enough
+     */
+    private static boolean iterateOverridenMethodsUp(JSFunction function, Processor<JSClass> processor, boolean allowDirectParent) {
+        PsiElement clazz = findParent(function);
+        if (!(clazz instanceof JSClass)) {
+            return false;
+        }
+        final PsiElement directParent = clazz;
+
+        while (true) {
+            if ((allowDirectParent || directParent != clazz) && !processor.process((JSClass)clazz)) {
+                return true;
+            }
+
+            JSAttributeList attributeList = function.getAttributeList();
+            if (attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
+                return false;
+            }
+
+            // TODO check signature
+            final JSNamedElement overridenMethod = findOverriddenMethod(function, (JSClass)clazz);
+            if (!(overridenMethod instanceof JSFunction)) {
+                return false;
+            }
+            function = (JSFunction)overridenMethod;
+
+            clazz = findParent(function);
+            if (!(clazz instanceof JSClass)) {
+                return false;
+            }
+        }
+    }
+
+    public static boolean isReferenceTo(final PsiPolyVariantReference reference, final String referencedName, PsiElement _element) {
+        String elementName;
+        if (_element instanceof JSNamedElement namedElement) {
+            elementName = namedElement.getName();
+        }
+        else if (_element instanceof XmlAttributeValue xmlAttributeValue) {
+            elementName = xmlAttributeValue.getValue();
+        }
+        else if (_element instanceof PsiFile file) {
+            elementName = file.getVirtualFile().getNameWithoutExtension();
+        }
+        else if (_element instanceof PsiDirectoryContainer directoryContainer) {
+            elementName = directoryContainer.getName();
+        }
+        else {
+            return false;
+        }
+
+        if (Comparing.equal(referencedName, elementName, true)) {
+            PsiElement element = _element;
+
+            final ResolveResult[] resolveResults = reference.multiResolve(true);
+
+            for (ResolveResult r : resolveResults) {
+                PsiElement resolvedElement = r.getElement();
+
+                if (resolvedElement.isEquivalentTo(element) ||
+                    element.isEquivalentTo(resolvedElement) ||
+                    ((element instanceof JSProperty || element instanceof XmlAttributeValue) &&
+                        resolvedElement != null &&
+                        resolvedElement.getParent() == element)) {
+                    if (reference instanceof JSReferenceExpression referenceExpression
+                        && ((referenceExpression.getParent() == resolvedElement && resolvedElement instanceof JSDefinitionExpression)
+                        || resolvedElement instanceof JSFunctionExpression functionExpression
+                        && functionExpression.getFunction().getNameIdentifier().getNextSibling() == reference)) {
+                        return false; // do not include self to usages
+                    }
+
+                    return true;
+                }
+
+                if (resolvedElement instanceof JSFunctionExpression functionExpression) {
+                    final PsiElement nameIdentifier = functionExpression.getFunction().getNameIdentifier();
+                    if (nameIdentifier != null && nameIdentifier.getNextSibling() == element) {
+                        return true;
+                    }
+                }
+                else if (resolvedElement instanceof JSFunction fun) {
+                    if (fun.isConstructor()) {
+                        if ((element instanceof JSClass && resolvedElement.getParent() == element)
+                            || (element instanceof JSFile && reference.getElement().getParent() != resolvedElement
+                            && isPublicEntityReferenceToJSFile(findParent(resolvedElement), element))) {
+                            return true;
+                        }
+                    }
+                    else if (element instanceof JSFunction anotherFun) {
+                        boolean getProperty;
+
+                        if ((getProperty = fun.isGetProperty()) || fun.isSetProperty()) {
+                            if ((getProperty && anotherFun.isSetProperty()) || (!getProperty && anotherFun.isGetProperty())) {
+                                PsiElement funParent = JSResolveUtil.findParent(fun);
+                                PsiElement parent = JSResolveUtil.findParent(anotherFun);
+                                if (funParent == parent || (parent != null && parent.isEquivalentTo(funParent))) {
+                                    return true;
+                                }
+                            }
+                        }
+                        PsiElement resolvedElementParent = findParent(resolvedElement);
+                        final PsiElement elementParent = findParent(element);
+
+                        if (elementParent instanceof JSClass && resolvedElementParent instanceof JSClass) {
+                            final JSClass anotherClass = (JSClass)elementParent;
+
+                            final Collection<JSClass> visitedInterfaces = new HashSet<>();
+                            return iterateOverridenMethodsUp(
+                                fun,
+                                new Processor<JSClass>() {
+                                    @Override
+                                    public boolean process(JSClass jsClass) {
+                                        if (anotherClass.isInterface()) {
+                                            return !visitAllImplementedInterfaces(jsClass, visitedInterfaces, new Processor<JSClass>() {
+                                                @Override
+                                                public boolean process(JSClass jsClass) {
+                                                    return !jsClass.isEquivalentTo(anotherClass);
+                                                }
+                                            });
+                                        }
+                                        else {
+                                            return !jsClass.isEquivalentTo(anotherClass);
+                                        }
+                                    }
+                                },
+                                anotherClass.isInterface()
+                            );
+                        }
+                    }
+                }
+                else if (resolvedElement instanceof JSClass && element instanceof JSFunction && element.getParent() == resolvedElement) {
+                    return true;
+                }
+
+                if (
+                    (resolvedElement instanceof JSClass
+                        || resolvedElement instanceof JSNamespaceDeclaration
+                        || resolvedElement instanceof JSFunction
+                        || resolvedElement instanceof JSVariable)
+                        && ((element instanceof XmlFile && resolvedElement.getParent().getContainingFile() == element)
+                        || (element instanceof JSFile && reference.getElement().getParent() != resolvedElement
+                        && isPublicEntityReferenceToJSFile(resolvedElement, element)))
+                ) {
+                    return true;
+                }
+
+                if (resolvedElement instanceof JSVariable variable && element instanceof JSFunction function
+                    && fieldIsImplicitAccessorMethod(function, variable)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean fieldIsImplicitAccessorMethod(JSFunction fun, JSVariable var) {
+        if (!fun.isGetProperty() && !fun.isSetProperty()) {
+            return false;
+        }
+        PsiElement funParent = findParent(fun);
+        if (!(funParent instanceof JSClass) || !((JSClass)funParent).isInterface()) {
+            return false;
+        }
+        JSAttributeList attributeList = var.getAttributeList();
+        if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
+            return false;
+        }
+
+        PsiElement parent = findParent(var);
+        if (!(parent instanceof JSClass)) {
+            return false;
+        }
+
+        for (JSClass c : ((JSClass)parent).getImplementedInterfaces()) {
+            if (c == funParent) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean isPublicEntityReferenceToJSFile(PsiElement resolvedElement, PsiElement element) {
+        PsiElement parent = resolvedElement.getParent();
+        if (parent instanceof JSVarStatement) {
+            parent = parent.getParent();
+        }
+        return parent instanceof JSPackageStatement && parent.getParent() == element;
+    }
+
+    private static JSNamedElement findOverriddenMethod(PsiElement resolvedElement, JSClass resolvedElementClass) {
+        final Ref<JSNamedElement> override = new Ref<>();
+
+        iterateType(
+            (JSFunction)resolvedElement,
+            resolvedElementClass,
+            null,
+            new OverrideHandler() {
+                @Override
+                public boolean process(ResolveProcessor processor, PsiElement scope, String className) {
+                    PsiElement result = processor.getResult();
+                    if (result instanceof JSNamedElement namedElement) {
+                        override.set(namedElement);
+                        return false;
+                    }
+                    return true;
+                }
+            }
+        );
+        return override.get();
+    }
+
+    public static boolean checkClassHasParentOfAnotherOne(final JSClass aClass, final JSClass parent, @Nullable Set<JSClass> visited) {
+        if (visited != null && visited.contains(aClass)) {
+            return false;
+        }
+
+        for (JSClass superClazz : aClass.getSuperClasses()) {
+            if (superClazz == parent) {
+                return true;
+            }
+            if (visited == null) {
+                visited = new HashSet<JSClass>();
+            }
+            visited.add(aClass);
+            return checkClassHasParentOfAnotherOne(superClazz, parent, visited);
+        }
+        return false;
+    }
+
+    public static
+    @Nullable
+    JSExpression getRealRefExprQualifier(final JSReferenceExpression expr) {
+        final JSExpression qualifier = ((JSReferenceExpressionImpl)expr).getResolveQualifier();
+        if (qualifier != null) {
+            return qualifier;
+        }
+
+        if (isExprInTypeContext(expr)) {
+            final JSImportedElementResolveResult resolved = JSImportHandlingUtil.resolveTypeNameUsingImports(expr);
+            if (resolved == null) {
+                return expr.getQualifier();
+            }
+
+            return getRealRefExprQualifierFromResult(expr, resolved);
+        }
+
+        return qualifier;
+    }
+
+    public static JSExpression getRealRefExprQualifierFromResult(
+        final JSReferenceExpression expr,
+        final JSImportedElementResolveResult resolved
+    ) {
+        return ((JSReferenceExpression)JSChangeUtil.createExpressionFromText(expr.getProject(), resolved.qualifiedName)).getQualifier();
+    }
+
+    public static String findPackageStatementQualifier(final PsiElement context) {
+        if (context instanceof JSClass jsClass) {
+            final String s = jsClass.getQualifiedName();
+            if (s != null) {
+                final int i = s.lastIndexOf('.');
+                if (i != -1) {
+                    return s.substring(0, i);
+                }
+                else {
+                    return null;
+                }
+            }
+        }
+
+        final JSPackageStatement packageStatement = PsiTreeUtil.getNonStrictParentOfType(context, JSPackageStatement.class);
+
+        if (packageStatement != null) {
+            return packageStatement.getQualifiedName();
+        }
+
+        return null;
+    }
+
+    public static boolean isExprInStrictTypeContext(final JSReferenceExpression expr) {
+        final PsiElement parent = expr.getParent();
+        boolean parentIsVar = parent instanceof JSVariable;
+
+        return ((parentIsVar || parent instanceof JSFunction)
+            && parent.getNode().findChildByType(JSTokenTypes.COLON) != null
+            && (!parentIsVar || ((JSVariable)parent).getInitializer() != expr))
+            || parent instanceof JSAttributeList || parent instanceof JSGenericSignature
+            || parent instanceof JSImportStatement || parent instanceof JSReferenceList;
+    }
+
+    public static boolean isExprInTypeContext(final JSReferenceExpression expr) {
+        final PsiElement parent = expr.getParent();
+
+        return isExprInStrictTypeContext(expr) || parent instanceof JSNewExpression || parent instanceof JSUseNamespaceDirective
+            || (parent instanceof JSBinaryExpression binaryExpression && binaryExpression.getROperand() == expr
+            && (binaryExpression.getOperationSign() == JSTokenTypes.IS_KEYWORD
+            || binaryExpression.getOperationSign() == JSTokenTypes.AS_KEYWORD));
+    }
+
+    @Nullable
+    public static PsiElement findClassByQName(final String link, final @Nonnull PsiElement context) {
+        return findClassByQName(link, context.getProject(), context.getResolveScope());
+    }
+
+    @Nullable
+    public static PsiElement findClassByQName(final String link, @Nonnull GlobalSearchScope scope, @Nonnull Project project) {
+        return findClassByQName(link, project, scope);
+    }
+
+    private static PsiElement findClassByQName(final String link, final Project project, final GlobalSearchScope searchScope) {
+        synchronized (project) {
+            final PsiElement[] result = new PsiElement[1];
+
+            final Collection<JSQualifiedNamedElement> candidates =
+                StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_QNAME, link, project, searchScope, JSQualifiedNamedElement.class);
+            for (JSQualifiedNamedElement clazz : candidates) {
+                if (link.equals(clazz.getQualifiedName())) {
+                    if ("Object".equals(link) && !JavaScriptIndex.ECMASCRIPT_JS2.equals(clazz.getContainingFile()
+                        .getVirtualFile()
+                        .getName()) // object from swf do
+                        // not contain necessary members!
+                    ) {
+                        continue;
+                    }
+                    result[0] = clazz;
+                    break;
+                }
+            }
+
+            if (result[0] == null) {
+                String className = link.substring(link.lastIndexOf('.') + 1);
+                if (className.length() > 0
+                    && (Character.isUpperCase(className.charAt(0)) || Character.isLowerCase(className.charAt(0)))
+                    && !isBuiltInClassName(className)) {
+                    // TODO optimization, remove when packages will be properly handled
+                    result[0] = findClassByQNameViaHelper(link, project, className, searchScope);
+                }
+            }
+
+            return result[0];
+        }
+    }
+
+    private static boolean isBuiltInClassName(final String className) {
+        return OBJECT_CLASS_NAME.equals(className) || "Boolean".equals(className) || "Function".equals(className)
+            || "String".equals(className);
+    }
+
+    public static boolean isPredefinedFile(PsiFile file) {
+        return false;
+    }
+
+    @Nullable
+    private static PsiElement findClassByQNameViaHelper(
+        final String link,
+        final Project project,
+        final String className,
+        final GlobalSearchScope scope
+    ) {
+        for (JSResolveHelper helper : Extensions.getExtensions(JSResolveHelper.EP_NAME)) {
+            PsiElement result = helper.findClassByQName(link, project, className, scope);
+            if (result != null) {
+                return result;
+            }
+        }
+        return null;
+    }
+
+    public static String[] buildNameIdsForQualifier(final JSExpression qualifier) {
+        String[] nameIds = null;
+
+        if (qualifier == null) {
+            nameIds = JSSymbolUtil.buildNameIndexArray(qualifier);
+        }
+        else {
+            ContextResolver resolver = new ContextResolver(qualifier);
+            nameIds = resolver.getQualifierAsNameIndex();
+
+            if (nameIds == null) {
+                nameIds = new String[]{""};
+            }
+        }
+
+        return nameIds;
+    }
+
+    public static JSExpression findClassIdentifier(JSExpression _qualifier) {
+        JSExpression qualifier = _qualifier;
+        if (qualifier instanceof JSReferenceExpression referenceExpression
+            && PROTOTYPE_FIELD_NAME.equals(referenceExpression.getReferencedName())) {
+            qualifier = referenceExpression.getQualifier();
+            if (qualifier == null) {
+                qualifier = _qualifier;
+            }
+        }
+
+        if (qualifier instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() == null) {
+            qualifier = JSSymbolUtil.findReferenceExpressionUsedForClassExtending(referenceExpression);
+        }
+        return qualifier;
+    }
+
+    public static boolean iterateType(
+        final JSFunction node,
+        final PsiElement jsClass,
+        final String typeName,
+        final OverrideHandler handler
+    ) {
+        final Project project = jsClass.getProject();
+
+        if (jsClass instanceof JSClass) {
+            String namespace = null;
+            JSAttributeList attributeList = node.getAttributeList();
+            if (attributeList != null) {
+                namespace = attributeList.getNamespace();
+            }
+            return processOverrides(jsClass, handler, node.getName(), namespace, node);
+        }
+
+        return true;
+    }
+
+    public static boolean processOverrides(
+        final PsiElement jsClass,
+        final OverrideHandler handler,
+        String name,
+        final Object namespace,
+        final PsiElement context
+    ) {
+        JSClass clazz = (JSClass)jsClass;
+        final ResolveProcessor resolveProcessor = new ResolveProcessor(name, context) {
+            {
+                setToProcessHierarchy(true);
+            }
+
+            @Override
+            public boolean execute(final PsiElement element, final ResolveState state) {
+                if (!(element instanceof JSFunction)) {
+                    return true;
+                }
+                JSFunction fun = (JSFunction)element;
+                final JSAttributeList attributeList = fun.getAttributeList();
+                if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE) {
+                    return false;
+                }
+
+                if ((namespace == null && attributeList != null && attributeList.getNamespace() != null)
+                    || (namespace != null && (attributeList == null || !namespace.equals(attributeList.getNamespace())))) {
+                    return true;
+                }
+                return super.execute(element, state);
+            }
+        };
+
+        for (JSClass superClazz : clazz.getSuperClasses()) {
+            if (superClazz == clazz) {
+                break;
+            }
+            final boolean b = superClazz.processDeclarations(resolveProcessor, ResolveState.initial(), superClazz, context);
+
+            if (!b) {
+                final PsiElement element = resolveProcessor.getResult();
+                if (element == null) {
+                    continue;
+                }
+                PsiElement parent = findParent(element);
+
+                if (parent instanceof JSClass parentClass
+                    && !handler.process(resolveProcessor, superClazz, parentClass.getQualifiedName())) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public static String getQNameToStartHierarchySearch(final JSFunction node) {
+        PsiElement parentNode = node.getParent();
+        parentNode = getClassReferenceForXmlFromContext(parentNode);
+
+        if (parentNode instanceof JSClass) {
+            final JSAttributeList attributeList = node.getAttributeList();
+
+            if (attributeList == null ||
+                !attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE) ||
+                attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) ||
+                attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE) {
+                return null;
+            }
+
+            if (parentNode instanceof JSClass jsClass) {
+                return jsClass.getQualifiedName();
+            }
+        }
+        else if (node instanceof JSFunctionExpression
+            && parentNode.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+            final ContextResolver resolver = new ContextResolver(node.getFirstChild());
+            return resolver.getQualifierAsString();
+        }
+        else if (parentNode instanceof JSFile && parentNode.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+            return node.getName();
+        }
+        return null;
+    }
+
+    public static boolean isInPlaceWhereTypeCanBeDuringCompletion(PsiElement expr) {
+        final PsiElement parent = expr.getParent();
+        if (parent instanceof JSArgumentList || (parent instanceof JSVariable variable && variable.getInitializer() == expr)) {
+            return true;
+        }
+        if (parent instanceof JSExpressionStatement) {
+            return expr instanceof JSReferenceExpression referenceExpression ? referenceExpression.getQualifier() == null : true;
+        }
+        return false;
+    }
+
+    public static boolean isPlaceWhereNsCanBe(final PsiElement parent) {
+        final PsiElement grandParent = parent.getParent();
+        return grandParent instanceof JSClass || grandParent instanceof JSPackageStatement
+            || (grandParent instanceof JSFile && grandParent.getContext() == null);
+    }
+
+    @Nullable
+    public static String getTypeFromTagNameInMxml(final @Nullable PsiElement psiElement) {
+        JSClass clazz = getClassFromTagNameInMxml(psiElement);
+        return clazz != null ? clazz.getQualifiedName() : null;
+    }
+
+    public static JSClass getClassFromTagNameInMxml(final PsiElement psiElement) {
+        XmlTag tag = psiElement != null ? PsiTreeUtil.getNonStrictParentOfType(psiElement, XmlTag.class) : null;
+        if (tag != null && (tag.getNamespacePrefix().length() > 0 || JavaScriptSupportLoader.isFlexMxmFile(tag.getContainingFile()))) {
+            if (isScriptContextTag(tag)) {
+                tag = ((XmlFile)tag.getContainingFile()).getDocument().getRootTag();
+            }
+            final XmlElementDescriptor descriptor = tag.getDescriptor();
+
+            if (descriptor != null) {
+                PsiElement decl = descriptor.getDeclaration();
+                if (decl instanceof JSClass jsClass) {
+                    return jsClass;
+                }
+                else if (decl instanceof XmlFile xmlFile) {
+                    return XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
+                }
+            }
+        }
+        return null;
+    }
+
+    private static boolean isScriptContextTag(final XmlTag tag) {
+        final String localName = tag.getLocalName();
+        return "Script".equals(localName)
+            || (!localName.isEmpty() && Character.isLowerCase(localName.charAt(0)) && !"method".equals(localName));
+    }
+
+    public static boolean processMetaAttributesForClass(final PsiElement jsClass, final MetaDataProcessor processor) {
+        return doProcessMetaAttributesForClass(unwrapProxy(jsClass), processor, null, true);
+    }
+
+    private static boolean doProcessMetaAttributesForClass(
+        final PsiElement jsClass,
+        final MetaDataProcessor processor,
+        PsiElement lastParent,
+        boolean forward
+    ) {
+        if (jsClass instanceof JSClass jsClassClass) {
+            if (OBJECT_CLASS_NAME.equals((jsClassClass.getQualifiedName()))) {
+                return true;
+            }
+            final PsiElement[] elements = getStubbedChildren(jsClass.getParent());
+            int ind = elements.length - 1;
+            while (ind >= 0 && elements[ind] != jsClass) {
+                --ind;
+            }
+            --ind;
+
+
+            while (ind >= 0) {
+                final PsiElement current = elements[ind];
+
+                if (current instanceof JSIncludeDirective) {
+                    if (!processIncludeDirective(processor, jsClass, (JSIncludeDirective)current, false)) {
+                        return false;
+                    }
+                    --ind;
+                }
+                else {
+                    break;
+                }
+            }
+
+            final JSAttributeList attributeList = jsClassClass.getAttributeList();
+            if (attributeList != null && !processAttributeList(processor, jsClass, attributeList, true)) {
+                return false;
+            }
+        }
+
+        final PsiElement[] elements = getStubbedChildren(jsClass);
+        Ref<PsiElement> continuePassElement = new Ref<>();
+
+        for (int i = forward ? 0 : elements.length - 1; i < elements.length && i >= 0; i += (forward ? 1 : -1)) {
+            PsiElement el = elements[i];
+
+            if (el instanceof JSIncludeDirective) {
+                if (!processIncludeDirective(processor, lastParent, (JSIncludeDirective)el, forward)) {
+                    return false;
+                }
+            }
+            else if (el instanceof JSAttributeList /*&& lastParent != null*/) {
+                if (!processAttributeList(processor, lastParent, (JSAttributeList)el, forward)) {
+                    return false;
+                }
+            }
+            else {
+                continuePassElement.set(null);
+                if (!processor.handleOtherElement(el, jsClass, continuePassElement)) {
+                    return false;
+                }
+                PsiElement nextEl = continuePassElement.get();
+
+                if (nextEl instanceof JSAttributeListOwner attributeListOwner) {
+                    JSAttributeList attributeList = attributeListOwner.getAttributeList();
+
+                    if (attributeList != null && !processAttributeList(processor, nextEl, attributeList, forward)) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    public static boolean processAttributeList(
+        final MetaDataProcessor processor,
+        final PsiElement el,
+        final JSAttributeList attributeList,
+        boolean forward
+    ) {
+        final PsiElement[] elements = getStubbedChildren(attributeList);
+        for (int i = forward ? 0 : elements.length - 1; i < elements.length && i >= 0; i += (forward ? 1 : -1)) {
+            final PsiElement cur = elements[i];
+
+            if (cur instanceof JSIncludeDirective) {
+                if (!processIncludeDirective(processor, el, (JSIncludeDirective)cur, forward)) {
+                    return false;
+                }
+            }
+            else if (cur instanceof JSAttribute) {
+                if (!processor.process((JSAttribute)cur)) {
+                    return false;
+                }
+            }
+            else if (cur instanceof JSNamedElement) {
+                break;
+            }
+        }
+
+        if (!processor.handleOtherElement(attributeList, el, null)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static boolean processIncludeDirective(
+        final MetaDataProcessor processor,
+        final PsiElement lastParent,
+        final JSIncludeDirective el,
+        boolean forward
+    ) {
+        final PsiFile file = el.resolveFile();
+        return !(file instanceof JSFile) || doProcessMetaAttributesForClass(file, processor, lastParent, forward);
+    }
+
+    public static PsiElement unwrapProxy(PsiElement jsClass) {
+        return jsClass;
+    }
+
+    public static JSDefinitionExpression getDefinitionExpr(JSExpressionStatement exprStatement) {
+        final JSExpression expression = exprStatement.getExpression();
+
+        if (expression instanceof JSAssignmentExpression assignment) {
+            return (JSDefinitionExpression)assignment.getLOperand();
+        }
+        return null;
+    }
+
+    public static boolean processDeclarationsInScope(
+        final JSElement _scope,
+        final PsiScopeProcessor processor,
+        final ResolveState state,
+        final PsiElement lastParent,
+        final PsiElement place
+    ) {
+        JSElement scope = PsiUtilBase.getOriginalElement(_scope, _scope.getClass());
+        if (scope == null) {
+            return true;
+        }
+        String requiredName = null;
+
+        if (processor instanceof ResolveProcessor resolveProcessor) {
+            requiredName = resolveProcessor.getName();
+        }
+
+        boolean result = true;
+        final IntObjectMap<Object> defsMap = ourCachedDefsCache.get(MY_CACHED_STATEMENTS, scope, null).getValue();
+
+        if (requiredName == null) {
+            for (Object value : defsMap.values()) {
+                result = dispatchResolve(processor, state, place, result, value);
+            }
+        }
+        else {
+            final Object defs = defsMap.get(requiredName.hashCode());
+            if (defs != null) {
+                result = dispatchResolve(processor, state, place, result, defs);
+            }
+        }
+
+        return result;
+    }
+
+    private static boolean dispatchResolve(
+        final PsiScopeProcessor processor,
+        final ResolveState state,
+        final PsiElement place,
+        boolean result,
+        final Object o
+    ) {
+        if (o instanceof JSElement[] jsElements) {
+            for (JSElement s : jsElements) {
+                result &= s.processDeclarations(processor, state, null, place);
+            }
+        }
+        else {
+            JSElement s = (JSElement)o;
+            result &= s.processDeclarations(processor, state, null, place);
+        }
+        return result;
+    }
+
+    public static PsiElement getLocalVariableRef(JSFunction function, final JSReferenceExpression expr) {
+        final ResolveProcessor processor = new ResolveProcessor(expr.getReferencedName(), true);
+
+        while (function != null) {
+            final boolean val = function.processDeclarations(processor, ResolveState.initial(), function.getParameterList(), function);
+            if (!val) {
+                return processor.getResult();
+            }
+            function = PsiTreeUtil.getParentOfType(function, JSFunction.class);
+            if (function == null) {
+                break;
+            }
+        }
+        return null;
+    }
+
+    public static class MyResolveResult implements ResolveResult {
+        private final PsiElement myFunction;
+        private final JavaScriptImportStatementBase myImportUsed;
+        private boolean myValidResult;
+
+        public MyResolveResult(final PsiElement function) {
+            this(function, true);
+        }
+
+        public MyResolveResult(final PsiElement function, JSImportStatement importUsed) {
+            this(function, importUsed, true);
+        }
+
+        public MyResolveResult(final PsiElement function, boolean validResult) {
+            this(function, null, validResult);
+        }
+
+        public MyResolveResult(final PsiElement function, JavaScriptImportStatementBase importUsed, boolean validResult) {
+            myFunction = function;
+            myValidResult = validResult;
+            myImportUsed = importUsed;
+        }
+
+        @Override
+        public PsiElement getElement() {
+            return myFunction;
+        }
+
+        @Override
+        public boolean isValidResult() {
+            return myValidResult;
+        }
+
+        public void setValid(final boolean b) {
+            myValidResult = b;
+        }
+
+        public JavaScriptImportStatementBase getImportUsed() {
+            return myImportUsed;
+        }
+    }
+
+    public static Key<PsiElement> contextKey = Key.create("context.key"); // JSElement or XmlElement
+
+    public static class RelevantDefsUserDataCache extends UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> {
+
+        @Override
+        protected CachedValue<IntObjectMap<Object>> compute(final JSElement jsElement, final Object o) {
+            return CachedValuesManager.getManager(jsElement.getProject()).createCachedValue(
+                new CachedValueProvider<IntObjectMap<Object>>() {
+                    @Override
+                    public Result<IntObjectMap<Object>> compute() {
+                        final IntObjectMap<Object> relevantDefs = IntMaps.newIntObjectHashMap();
+                        final MyJSElementVisitor elementVisitor = new MyJSElementVisitor(jsElement, relevantDefs);
+                        elementVisitor.startVisiting(jsElement);
+
+                        return new Result<IntObjectMap<Object>>(relevantDefs, jsElement);
+                    }
+                },
+                false
+            );
+        }
+
+        private static class MyJSElementVisitor extends JSElementVisitor {
+            private HashMap<String, Boolean> checkedVarsToOurStatus;
+            private Set<JSFile> visitedIncludes;
+            private final IntObjectMap<Object> myRelevantDefs;
+            private final JSElement myBase;
+            private JSElement context;
+
+            public MyJSElementVisitor(JSElement base, final IntObjectMap<Object> relevantDefs) {
+                myRelevantDefs = relevantDefs;
+                myBase = base;
+                context = base;
+            }
+
+            private void startVisiting(JSElement jsElement) {
+                PsiElement first = null;
+
+                JSSourceElement[] arrayElementsToScan = null;
+
+                if (jsElement instanceof JSFunction function) {
+                    final JSSourceElement[] body = function.getBody();
+                    if (body.length > 0 && body[0] instanceof JSBlockStatement) {
+                        first = PsiTreeUtil.findChildOfType(body[0], JSStatement.class);
+                    }
+                }
+                else if (jsElement instanceof JSFile) {
+                    if (myBase == context) {
+                        first = jsElement.getFirstChild();
+                    }
+                    else {
+                        arrayElementsToScan = getSourceElements(jsElement);
+                    }
+                }
+                else if (jsElement instanceof JSClass || jsElement instanceof JSPackageStatement) {
+                    arrayElementsToScan = getSourceElements(jsElement);
+                }
+                else {
+                    first = jsElement.getFirstChild();
+                }
+
+                if (arrayElementsToScan != null) {
+                    for (JSSourceElement elt : arrayElementsToScan) {
+                        elt.accept(this);
+                    }
+                }
+                else {
+                    for (PsiElement e = first; e != null; e = e.getNextSibling()) {
+                        if (e instanceof JSSourceElement) {
+                            e.accept(this);
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public void visitJSDefinitionExpression(final JSDefinitionExpression node) {
+                final JSExpression definedExpr = node.getExpression();
+                if (definedExpr instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() == null && false) {
+                    final String s = definedExpr.getText();
+                    if (checkedVarsToOurStatus == null) {
+                        checkedVarsToOurStatus = new HashMap<String, Boolean>(3);
+                    }
+                    Boolean aBoolean = checkedVarsToOurStatus.get(s);
+
+                    if (aBoolean == null) {
+                        final boolean isInjectedFile = isInjectedFile(myBase);
+                        PsiElement element = null;
+
+                        if (myBase instanceof JSFunction || isInjectedFile) {
+                            final ResolveProcessor processor = new ResolveProcessor(s);
+                            final PsiElement baseParent = myBase.getParent();
+                            treeWalkUp(processor, baseParent, baseParent, baseParent);
+                            element = processor.getResult();
+                        }
+
+                        aBoolean = (element == null) ? Boolean.TRUE : Boolean.FALSE;
+                        checkedVarsToOurStatus.put(s, aBoolean);
+                    }
+
+                    if (aBoolean == Boolean.TRUE) {
+                        addRelevantDef(node);
+                    }
+                }
+            }
+
+            @Override
+            public void visitJSVariable(JSVariable node) {
+                addRelevantDef(node);
+            }
+
+            @Override
+            public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
+                final PsiFile _file = includeDirective.resolveFile();
+
+                if (!(_file instanceof JSFile) || myBase.getContainingFile() == _file) {
+                    return;
+                }
+                final JSFile file = (JSFile)_file;
+                if (visitedIncludes != null && visitedIncludes.contains(file)) {
+                    return;
+                }
+                if (visitedIncludes == null) {
+                    visitedIncludes = new HashSet<JSFile>();
+                }
+                visitedIncludes.add(file);
+
+                final JSElement prevContext = context;
+                context = file;
+                context.putUserData(contextKey, myBase);
+                startVisiting(file);
+                context = prevContext;
+            }
+
+            @Override
+            public void visitJSVarStatement(final JSVarStatement node) {
+                for (JSVariable var : node.getVariables()) {
+                    if (!var.isLocal()) {
+                        var.accept(this);
+                    }
+                }
+            }
+
+            @Override
+            public void visitJSParameter(JSParameter node) {
+            }
+
+            @Override
+            public void visitJSFunctionExpression(final JSFunctionExpression node) {
+                // do not go inside other funcs
+            }
+
+            @Override
+            public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node) {
+                // do not go inside other funcs
+            }
+
+            @Override
+            public void visitJSClass(final JSClass aClass) {
+                // do not go inside other funcs
+            }
+
+            @Override
+            public void visitJSPackageStatement(JSPackageStatement packageStatement) {
+                // do not go inside other funcs
+            }
+
+            @Override
+            public void visitJSFunctionDeclaration(final JSFunction node) {
+                addRelevantDef(node);
+            }
+
+            @Override
+            public void visitJSImportStatement(final JSImportStatement importStatement) {
+                // do not expand tree
+            }
+
+            @Override
+            public void visitJSUseNamespaceDirective(final JSUseNamespaceDirective useNamespaceDirective) {
+                final String namespaceToBeUsed = useNamespaceDirective.getNamespaceToBeUsed();
+                if (namespaceToBeUsed != null) {
+                    addNamedElement(useNamespaceDirective, namespaceToBeUsed.hashCode());
+                }
+            }
+
+            private void addRelevantDef(final JSNamedElement node) {
+                final String name = node.getName();
+
+                if (name != null) {
+                    final int key = name.hashCode();
+                    addNamedElement(node, key);
+                }
+            }
+
+            private void addNamedElement(final JSElement node, final int key) {
+                final Object o = myRelevantDefs.get(key);
+
+                if (o == null) {
+                    myRelevantDefs.put(key, node);
+                }
+                else if (o instanceof JSElement element) {
+                    final JSElement[] newO = new JSElement[]{element, node};
+                    myRelevantDefs.put(key, newO);
+                }
+                else {
+                    final JSElement[] oldO = (JSElement[])o;
+                    final JSElement[] newO = new JSElement[oldO.length + 1];
+                    System.arraycopy(oldO, 0, newO, 0, oldO.length);
+                    newO[oldO.length] = node;
+                    myRelevantDefs.put(key, newO);
+                }
+            }
+
+            @Override
+            public void visitElement(final PsiElement element) {
+                element.acceptChildren(this);
+            }
+        }
+    }
+
+    public static class ContextResolver {
+        private JSElement qualifyingExpression;
+        private JSNamedElement parentContainer;
+        private String typeName;
+
+        public ContextResolver(JSExpression expr) {
+            if (expr instanceof JSThisExpression || expr instanceof JSSuperExpression) {
+                // We need to resolve ns mapping for 'this', which function was the constructor of the object
+                resolveContext(expr);
+            }
+            else {
+                qualifyingExpression = expr instanceof JSReferenceExpression referenceExpression
+                    ? JSSymbolUtil.findReferenceExpressionUsedForClassExtending(referenceExpression) : expr;
+            }
+        }
+
+        public ContextResolver(PsiElement element) {
+            resolveContext(element);
+        }
+
+        private void resolveContext(final PsiElement context) {
+            parentContainer = PsiTreeUtil.getParentOfType(context, JSFunction.class, JSClass.class);
+
+            if (parentContainer instanceof JSFunctionExpression) {
+                boolean changedFunctionScope = false;
+
+                while (parentContainer instanceof JSFunctionExpression) {
+                    final PsiElement parentContainerParent = parentContainer.getParent();
+
+                    if (parentContainerParent instanceof JSAssignmentExpression assignment) {
+                        final JSExpression jsExpression = assignment.getLOperand();
+                        final JSElement functionExpressionName =
+                            jsExpression instanceof JSDefinitionExpression definition ? definition.getExpression() : null;
+                        qualifyingExpression = functionExpressionName;
+
+                        if (functionExpressionName instanceof JSReferenceExpression referenceExpression) {
+                            final JSExpression functionExpressionNameQualifier = referenceExpression.getQualifier();
+
+                            if (functionExpressionNameQualifier instanceof JSThisExpression) {
+                                parentContainer = PsiTreeUtil.getParentOfType(functionExpressionName, JSFunction.class);
+                                qualifyingExpression = null;
+                                changedFunctionScope = true;
+                                continue;
+                            }
+                            else if (functionExpressionNameQualifier instanceof JSReferenceExpression functionReferenceExpression) {
+                                final String functionExpressionNameQualifierText = functionReferenceExpression.getReferencedName();
+
+                                if (PROTOTYPE_FIELD_NAME.equals(functionExpressionNameQualifierText)) {
+                                    qualifyingExpression = functionReferenceExpression.getQualifier();
+                                }
+                                else if (!changedFunctionScope) {
+                                    String referencedName;
+
+                                    if (functionReferenceExpression.getQualifier() == null
+                                        && ((referencedName = referenceExpression.getReferencedName()) == null
+                                        || referencedName.isEmpty()
+                                        || !Character.isUpperCase(referencedName.charAt(0)))) {
+                                        qualifyingExpression = functionExpressionNameQualifier;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else if (parentContainerParent instanceof JSProperty) {
+                        final JSElement element = PsiTreeUtil.getParentOfType(
+                            parentContainerParent,
+                            JSVariable.class,
+                            JSAssignmentExpression.class,
+                            JSArgumentList.class
+                        );
+                        if (element instanceof JSVariable) {
+                            qualifyingExpression = element;
+                        }
+                        else if (element instanceof JSAssignmentExpression assignment) {
+                            JSExpression loperand = assignment.getLOperand();
+                            if (loperand != null) {
+                                qualifyingExpression = ((JSDefinitionExpression)loperand).getExpression();
+                            }
+                        }
+                        else if (element instanceof JSArgumentList) {
+                            qualifyingExpression = JSSymbolUtil.findQualifyingExpressionFromArgumentList((JSArgumentList)element);
+                        }
+                    }
+                    else if (parentContainerParent instanceof JSNewExpression) {
+                        final JSElement element = PsiTreeUtil.getParentOfType(
+                            parentContainerParent,
+                            JSVariable.class,
+                            JSAssignmentExpression.class,
+                            JSArgumentList.class
+                        );
+
+                        if (element instanceof JSVariable) {
+                            qualifyingExpression = element;
+                        }
+                        else if (element instanceof JSAssignmentExpression assignment) {
+                            qualifyingExpression = ((JSDefinitionExpression)assignment.getLOperand()).getExpression();
+                        }
+                    }
+                    else if (parentContainerParent instanceof JSReferenceExpression) {
+                        parentContainer = PsiTreeUtil.getParentOfType(parentContainerParent, JSFunction.class);
+                        continue;
+                    }
+                    else if (parentContainer.getName() == null) {
+                        parentContainer = PsiTreeUtil.getParentOfType(parentContainerParent, JSFunction.class);
+                        continue;
+                    }
+
+                    break;
+                }
+
+                if (qualifyingExpression instanceof JSReferenceExpression qualifyingReferenceExpression) {
+                    final String functionExpressionNameQualifierText = qualifyingReferenceExpression.getReferencedName();
+
+                    if (PROTOTYPE_FIELD_NAME.equals(functionExpressionNameQualifierText)) {
+                        qualifyingExpression = qualifyingReferenceExpression.getQualifier();
+                    }
+                    else {
+
+                        qualifyingExpression = JSSymbolUtil.findReferenceExpressionUsedForClassExtending(qualifyingReferenceExpression);
+                    }
+                }
+            }
+
+            PsiElement parentContainerParent = parentContainer != null ? parentContainer.getParent() : null;
+
+            if (parentContainerParent instanceof JSFile) {
+                parentContainerParent = getClassReferenceForXmlFromContext(parentContainerParent);
+            }
+
+            if (parentContainerParent instanceof JSClass) {
+                parentContainer = (JSNamedElement)parentContainerParent;
+            }
+
+            if (parentContainer instanceof JSFunctionExpression && parentContainer.getContainingFile()
+                .getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+                parentContainer = null;
+                qualifyingExpression = null;
+                typeName = OBJECT_CLASS_NAME;
+            }
+        }
+
+        public
+        @Nullable
+        String getQualifierAsString() {
+            String qualifierAsString = getOriginalQualifierAsString();
+            return normalizeQualifier(qualifierAsString);
+        }
+
+        private static String normalizeQualifier(String qualifierAsString) {
+            if ("Window".equals(qualifierAsString) || "Document".equals(qualifierAsString)) {
+                qualifierAsString = StringUtil.decapitalize(qualifierAsString);
+            }
+            return qualifierAsString;
+        }
+
+        private String getOriginalQualifierAsString() {
+            if (qualifyingExpression instanceof JSLiteralExpression) {
+                return StringUtil.stripQuotesAroundValue(qualifyingExpression.getText());
+            }
+            else if (qualifyingExpression instanceof JSReferenceExpression) {
+                return qualifyingExpression.getText();
+            }
+            else if (qualifyingExpression instanceof JSNamedElement) {
+                return qualifyingExpression.getName();
+            }
+            else if (parentContainer instanceof JSQualifiedNamedElement qualifiedNamedElement) {
+                return qualifiedNamedElement.getQualifiedName();
+            }
+
+            return typeName;
+        }
+
+        @Nullable
+        public String[] getQualifierAsNameIndex() {
+            String qualifierAsString = getQualifierAsString();
+            if (qualifierAsString != null) {
+                List<String> list = new ArrayList<>();
+                qualifierAsString = BaseJSSymbolProcessor.addIndexListFromQName(qualifierAsString, qualifyingExpression, list);
+                return ArrayUtil.toStringArray(list);
+            }
+
+            return null;
+        }
+
+        public static String getQualifierOfExprAsString(JSElement expr) {
+            if (expr instanceof JSNamedElement) {
+                return expr.getName();
+            }
+            if (expr instanceof JSReferenceExpression refExpr && PROTOTYPE_FIELD_NAME.equals(refExpr.getReferencedName())) {
+                expr = refExpr.getQualifier();
+            }
+            return normalizeQualifier(StringUtil.stripQuotesAroundValue(expr.getText()));
+        }
+    }
+
+    private static boolean isInjectedFile(PsiElement element) {
+        return element instanceof PsiFile file && (file.getVirtualFile() instanceof LightVirtualFile);
+    }
+
+    @RequiredReadAction
+    public static void processGlobalSymbols(PsiElement target, PsiScopeProcessor processor) {
+        Sdk sdk = ModuleUtilCore.getSdk(target, JavaScriptModuleExtension.class);
+        if (sdk != null) {
+            VirtualFile[] files = sdk.getRootProvider().getFiles(BinariesOrderRootType.getInstance());
+
+            for (VirtualFile file : files) {
+                PsiFile psiFile = PsiManager.getInstance(target.getProject()).findFile(file);
+                if (psiFile instanceof JSFile && !psiFile.processDeclarations(processor, ResolveState.initial(), null, target)) {
+                    return;
+                }
+            }
+        }
+    }
+
+    public interface OverrideHandler {
+        boolean process(ResolveProcessor processor, final PsiElement scope, String className);
+    }
+
+    public interface MetaDataProcessor {
+        boolean process(final @Nonnull JSAttribute jsAttribute);
+
+        boolean handleOtherElement(final PsiElement el, PsiElement context, @Nullable Ref<PsiElement> continuePassElement);
+    }
+
+    public static abstract class CollectMethodsToImplementProcessor extends ResolveProcessor {
+        private final String myName;
+
+        public CollectMethodsToImplementProcessor(final String name, PsiElement context) {
+            super(null, context);
+            myName = name;
+
+            setToSkipClassDeclarationsOnce(true);
+            setToProcessHierarchy(true);
+            setToProcessMembers(false);
+            setTypeContext(true);
+        }
+
+        @Override
+        public boolean execute(final PsiElement element, final ResolveState state) {
+            final ResolveProcessor processor = new ResolveProcessor(myName, place) {
+                @Override
+                public boolean execute(final PsiElement element, final ResolveState state) {
+                    if (element instanceof JSFunction function) {
+                        if (OBJECT_CLASS_NAME.equals(((JSClass)findParent(function)).getQualifiedName()) || function.isConstructor()) {
+                            return true;
+                        }
+                    }
+                    else {
+                        return true;
+                    }
+                    return super.execute(element, state);
+                }
+
+                {
+                    setToProcessHierarchy(true);
+                }
+            };
+            for (JSClass implementedInterface : ((JSClass)element).getImplementedInterfaces()) {
+                if (!implementedInterface.isInterface()) {
+                    continue;
+                }
+                final boolean b =
+                    implementedInterface.processDeclarations(processor, ResolveState.initial(), implementedInterface, implementedInterface);
+
+                if (!b) {
+                    process(processor);
+                    break;
+                }
+            }
+
+            if (myName == null && processor.getResults() != null) {
+                process(processor);
+            }
+            return false;
+        }
+
+        protected abstract boolean process(ResolveProcessor processor);
+    }
+
+    static JSSourceElement[] getSourceElements(final PsiElement owner) {
+        if (owner instanceof JSStubElementImpl jsStubElement) {
+            return (JSSourceElement[])jsStubElement.getStubOrPsiChildren(JSElementTypes.SOURCE_ELEMENTS, JSSourceElement.EMPTY_ARRAY);
+        }
+        else if (owner instanceof JSFile jsFile) {
+            return jsFile.getStatements();
+        }
+        return JSSourceElement.EMPTY_ARRAY;
+    }
+
+    public static PsiElement[] getStubbedChildren(final PsiElement owner) {
+        return getStubbedChildren(owner, ourStubbedFilter);
+    }
+
+    public static PsiElement[] getStubbedChildren(final PsiElement owner, TokenSet filter) {
+        if (owner instanceof JSStubElementImpl) {
+            final JSStubElementImpl element = (JSStubElementImpl)owner;
+            final StubElement stub = element.getStub();
+            if (stub != null) {
+                return stub.getChildrenByType(filter, PsiElement.EMPTY_ARRAY);
+            }
+            return getChildrenFromTokenSet(element.getNode(), filter);
+        }
+        else if (owner instanceof JSFile file) {
+            final StubElement stub = ((JSFileImpl)file).getStub();
+            if (stub != null) {
+                return stub.getChildrenByType(filter, PsiElement.EMPTY_ARRAY);
+            }
+            return getChildrenFromTokenSet(file.getNode(), filter);
+        }
+        return PsiElement.EMPTY_ARRAY;
+    }
+
+    private static PsiElement[] getChildrenFromTokenSet(final ASTNode astNode, TokenSet filter) {
+        final ASTNode[] astNodes = astNode.getChildren(filter);
+        PsiElement[] result = new PsiElement[astNodes.length];
+        for (int i = 0; i < astNodes.length; ++i) {
+            result[i] = astNodes[i].getPsi();
+        }
+        return result;
+    }
+
+    private static final TokenSet ourStubbedFilter = TokenSet.create(
+        JSElementTypes.CLASS,
+        JSElementTypes.VAR_STATEMENT,
+        JSElementTypes.FUNCTION_DECLARATION,
+        JSElementTypes.ATTRIBUTE_LIST,
+        JSElementTypes.INCLUDE_DIRECTIVE,
+        JSElementTypes.ATTRIBUTE,
+        JSElementTypes.PACKAGE_STATEMENT
+    );
+
+    private static class ImplicitJSVariableImpl extends LightElement implements JSVariable {
+        private final PsiFile myContainingFile;
+        private final String myName;
+        private final String myType;
+
+        public ImplicitJSVariableImpl(final String name, String qName, PsiFile containingFile) {
+            super(containingFile.getManager(), JavaScriptSupportLoader.ECMA_SCRIPT_L4.getBaseLanguage());
+            myContainingFile = containingFile;
+            myName = name;
+            myType = qName;
+        }
+
+        @Override
+        public JSAttributeList getAttributeList() {
+            return null;
+        }
+
+        @Override
+        public boolean isValid() {
+            return myContainingFile.isValid();
+        }
+
+        @Override
+        public PsiElement getParent() {
+            return myContainingFile;
+        }
+
+        @Override
+        public PsiFile getContainingFile() {
+            return myContainingFile;
+        }
+
+        @RequiredReadAction
+        @Override
+        public String getText() {
+            return null;
+        }
+
+        @Override
+        public void accept(@Nonnull PsiElementVisitor visitor) {
+            if (visitor instanceof JSElementVisitor elementVisitor) {
+                elementVisitor.visitJSVariable(this);
+            }
+            else {
+                visitor.visitElement(this);
+            }
+        }
+
+        @Override
+        public PsiElement copy() {
+            return new ImplicitJSVariableImpl(myName, myType, myContainingFile);
+        }
+
+        @Override
+        public boolean canNavigate() {
+            return false;
+        }
+
+        @Override
+        public boolean isPhysical() {
+            return false;
+        }
+
+        @Nonnull
+        @Override
+        public ASTNode getNode() {
+            return null;
+        }
+
+        @Override
+        public boolean hasInitializer() {
+            return false;
+        }
+
+        @Override
+        public JSExpression getInitializer() {
+            return null;
+        }
+
+        @Override
+        public String getInitializerText() {
+            return null;
+        }
+
+        @Override
+        public void setInitializer(JSExpression expr) throws IncorrectOperationException {
+        }
+
+        @Nonnull
+        @Override
+        public JavaScriptType getType() {
+            return JavaScriptType.UNKNOWN;
+        }
+
+        @Override
+        public String getTypeString() {
+            return myType;
+        }
+
+        @RequiredReadAction
+        @Override
+        public JavaScriptTypeElement getTypeElement() {
+            return null;
+        }
+
+        @Override
+        public boolean isConst() {
+            return false;
+        }
+
+        @Override
+        public boolean isLocal() {
+            return false;
+        }
+
+        @Override
+        public boolean isDeprecated() {
+            return false;
+        }
+
+        @Override
+        public String getQualifiedName() {
+            return myName;
+        }
+
+        @Override
+        public String getName() {
+            return myName;
+        }
+
+        @Override
+        public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException {
+            throw new IncorrectOperationException();
+        }
+
+        @Override
+        public PsiElement getNameIdentifier() {
+            return null;
+        }
+
+        @Override
+        public String toString() {
+            return "js_implicit_var:" + myName + ", type:" + myType + ", file:" + myContainingFile;
+        }
+
+        @Override
+        public boolean isEquivalentTo(PsiElement another) {
+            return another == this ||
+                (another instanceof ImplicitJSVariableImpl implicitJSVar
+                    && myContainingFile == implicitJSVar.myContainingFile && myName.equals(implicitJSVar.myName));
+        }
+    }
 }

From a7581eb5142d3d010cd7eb00c81e3887d9eea67c Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 28 Jul 2024 21:04:11 +0300
Subject: [PATCH 228/340] Code reformat using IJ4 code style (part 17).

---
 .../psi/resolve/ResolveProcessor.java         | 1380 ++++++++---------
 .../psi/resolve/VariantsProcessor.java        |  850 +++++-----
 .../psi/resolve/WalkUpResolveProcessor.java   |  686 ++++----
 .../stubs/impl/JSAttributeListStubImpl.java   |  175 +--
 .../JSAttributeNameValuePairStubImpl.java     |   27 +-
 .../psi/stubs/impl/JSAttributeStubImpl.java   |   14 +-
 .../psi/stubs/impl/JSClassStubImpl.java       |   53 +-
 .../psi/stubs/impl/JSFunctionStubImpl.java    |  110 +-
 .../stubs/impl/JSImportStatementStubImpl.java |   32 +-
 .../impl/JSIncludeDirectiveStubImpl.java      |   33 +-
 .../psi/stubs/impl/JSNamedObjectStubBase.java |   36 +-
 .../impl/JSNamespaceDeclarationStubImpl.java  |   34 +-
 .../impl/JSPackageStatementStubImpl.java      |   14 +-
 .../stubs/impl/JSParameterListStubImpl.java   |   14 +-
 .../psi/stubs/impl/JSParameterStubImpl.java   |   68 +-
 .../stubs/impl/JSQualifiedObjectStubBase.java |   33 +-
 .../stubs/impl/JSReferenceListStubImpl.java   |   32 +-
 .../impl/JSUseNamespaceDirectiveStubImpl.java |   27 +-
 .../stubs/impl/JSVarStatementStubImpl.java    |   14 +-
 .../stubs/impl/JSVariableStubBaseImpl.java    |   91 +-
 .../psi/stubs/impl/JSVariableStubImpl.java    |   23 +-
 .../javascript/psi/util/JSLookupUtil.java     |  111 +-
 .../lang/javascript/psi/util/JSUtils.java     |  340 ++--
 .../search/JSClassInheritorsProvider.java     |    9 +-
 .../lang/javascript/search/JSClassSearch.java |  445 +++---
 25 files changed, 2138 insertions(+), 2513 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 87e76c17..165090f8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -50,767 +50,621 @@
 /**
  * @author Maxim.Mossienko
  */
-public class ResolveProcessor extends UserDataHolderBase implements PsiScopeProcessor
-{
-	private static final Key<String> ASKING_FOR_QUALIFIED_IMPORT = Key.create("asking.for.import.of.qname");
-	protected static final Key<Boolean> LOOKING_FOR_USE_NAMESPACES = Key.create("looking.for.use.directive");
-
-	private final Set<String> visitedClasses = new HashSet<String>();
-
-	private boolean myToStopOnAssignment;
-	protected final String myName;
-	private PsiElement myResult;
-	private PsiElement myCandidateResult;
-	private List<PsiElement> myResults;
-	private List<JavaScriptImportStatementBase> myImportsUsed;
-	private List<Boolean> myResolveStatus;
-
-	private boolean toProcessHierarchy;
-	private boolean toSkipClassDeclarationOnce;
-	private boolean toProcessMembers = true;
-	private boolean encounteredDynamicClasses;
-	private boolean encounteredDynamicClassesSet;
-	private boolean encounteredFunctionExpression;
-	private boolean processStatics;
-	private boolean acceptPrivateMembers = true;
-	private boolean acceptProtectedMembers = true;
-	private boolean acceptProtectedMembersSet;
-	private boolean allowUnqualifiedStaticsFromInstance;
-
-	private boolean myTypeContext;
-	private boolean encounteredWithStatement;
-	private boolean localResolve;
-	protected final PsiElement place;
-	private String myTypeName;
-	private String myClassScopeTypeName;
-
-	private Set<String> openedNses;
-	private boolean defaultNsIsNotAllowed;
-	private boolean anyNsAllowed;
-	private boolean myAcceptOnlyClasses;
-	private boolean myAcceptOnlyInterfaces;
-
-	public static final Key<JavaScriptImportStatementBase> IMPORT_KEY = Key.create("import.key");
-	private boolean myClassDeclarationStarted;
-	private PsiElement placeTopParent;
-	protected boolean ecma;
-	public static final String AS3_NAMESPACE = "AS3";
-
-	private ResolveHelper myResolveHelper;
-
-	public ResolveProcessor(final String name)
-	{
-		this(name, false);
-	}
-
-	public ResolveProcessor(final String name, boolean toStopOnAssignment)
-	{
-		myName = name;
-		myToStopOnAssignment = toStopOnAssignment;
-		place = null;
-	}
-
-	public ResolveProcessor(final String name, PsiElement _place)
-	{
-		myName = name;
-		place = _place;
-		final boolean b = place instanceof JSReferenceExpression && ((JSReferenceExpression) place).getQualifier() == null;
-		allowUnqualifiedStaticsFromInstance = b;
-
-		if(myName != null && place instanceof JSReferenceExpression)
-		{
-			final ASTNode node = place.getNode().findChildByType(JSTokenTypes.COLON_COLON);
-			String explicitNs = null;
-
-			// TODO: e.g. protected is also ns
-			if(node != null)
-			{
-				final JSExpression expression = ((JSReferenceExpression) place).getQualifier();
-				if(expression instanceof JSReferenceExpression)
-				{
-					anyNsAllowed = ((JSReferenceExpression) expression).resolve() instanceof JSVariable;
-				}
-
-				explicitNs = expression != null ? expression.getText() : null;
-			}
-			else
-			{
-				final JSExpression qualifier = ((JSReferenceExpression) place).getQualifier();
-
-				if(qualifier instanceof JSReferenceExpression && qualifier.getNode().findChildByType(JSTokenTypes.COLON_COLON) != null)
-				{
-					anyNsAllowed = ((JSReferenceExpression) qualifier).resolve() instanceof JSVariable;
-					explicitNs = ((JSReferenceExpression) qualifier).getReferencedName();
-				}
-			}
-
-			if(explicitNs != null && !anyNsAllowed)
-			{
-				openedNses = new HashSet<String>();
-				openedNses.add(explicitNs);
-				defaultNsIsNotAllowed = true;
-			}
-		}
-
-		if(myName == null && place instanceof JSReferenceExpression)
-		{
-			PsiElement parent = place.getParent();
-
-			if(parent instanceof JSReferenceList)
-			{
-				if(parent.getNode().getElementType() == JSElementTypes.EXTENDS_LIST)
-				{
-					final PsiElement element = parent.getParent();
-					if(element instanceof JSClass)
-					{
-						if(((JSClass) element).isInterface())
-						{
-							myAcceptOnlyClasses = false;
-							myAcceptOnlyInterfaces = true;
-						}
-						else
-						{
-							myAcceptOnlyClasses = true;
-							myAcceptOnlyInterfaces = false;
-						}
-					}
-				}
-				else
-				{
-					myAcceptOnlyClasses = false;
-					myAcceptOnlyInterfaces = true;
-				}
-			}
-		}
-
-		ecma = place != null && place.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
-	}
-
-	public PsiElement getResult()
-	{
-		if(myResult == null && myCandidateResult != null)
-		{
-			assert myResults == null;
-			return myCandidateResult;
-		}
-		return myResult;
-	}
-
-	public JavaScriptImportStatementBase getImportUsed()
-	{
-		return myImportsUsed != null ? myImportsUsed.get(0) : null;
-	}
-
-	public List<PsiElement> getResults()
-	{
-		if(myResults == null && myResult == null && myCandidateResult != null)
-		{
-			myResults = new ArrayList<>(1);
-			myResults.add(myCandidateResult);
-		}
-		return myResults;
-	}
-
-	@Override
-	@RequiredReadAction
-	public boolean execute(@Nonnull PsiElement element, ResolveState state)
-	{
-		if((element instanceof JSVariable && !(element instanceof JSParameter)) || element instanceof JSFunction)
-		{
-			final JSAttributeList attributeList = ((JSAttributeListOwner) element).getAttributeList();
-
-			// TODO: we should accept such values during resolve but make them invalid
-			if(!acceptPrivateMembers)
-			{
-				if(attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE)
-				{
-					return true;
-				}
-			}
-
-			if(!acceptProtectedMembers)
-			{
-				if(attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PROTECTED)
-				{
-					return true;
-				}
-			}
-
-			if(myClassDeclarationStarted)
-			{
-				if(processStatics)
-				{
-					if(attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.STATIC))
-					{
-						return true;
-					}
-				}
-				else if(!allowUnqualifiedStaticsFromInstance)
-				{
-					if(attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC))
-					{
-						return true;
-					}
-				}
-			}
-
-			String attributeNs = attributeList != null ? attributeList.getNamespace() : null;
-
-			if(openedNses == null && attributeNs != null)
-			{
-				if(!anyNsAllowed &&
-						place instanceof JSReferenceExpression &&
-						!JSResolveUtil.isExprInTypeContext((JSReferenceExpression) place))
-				{
-					openedNses = JSResolveUtil.calculateOpenNses(place);
-				}
-			}
-
-			if(openedNses != null && !openedNses.contains(attributeNs) && (!AS3_NAMESPACE.equals(attributeNs) || !ecma) // AS3 is opened by default from
-			// compiler settings
-					)
-			{
-				if(attributeNs != null || defaultNsIsNotAllowed)
-				{
-					return true;
-				}
-			}
-		}
-
-		if(myAcceptOnlyClasses || myAcceptOnlyInterfaces)
-		{
-			if(element instanceof JSClass)
-			{
-				final boolean isInterface = ((JSClass) element).isInterface();
-
-				if((myAcceptOnlyClasses && isInterface) || (myAcceptOnlyInterfaces && !isInterface))
-				{
-					return true;
-				}
-			}
-		}
-
-		if(place != null)
-		{
-			if(myResolveHelper == null)
-			{
-				myResolveHelper = ResolveHelper.find(place);
-			}
-
-			if(myResolveHelper.execute(this, element, state))
-			{
-				myCandidateResult = element;
-				return true;
-			}
-		}
-
-		if(place != null && element instanceof JSFunction && !(element instanceof JSFunctionExpression))
-		{
-			final JSFunction function = (JSFunction) element;
-			final PsiElement placeParent = place.getParent();
-
-			if(placeParent instanceof JSDefinitionExpression ||
-					(myName == null && placeParent instanceof JSExpressionStatement /* when complete of setter*/) ||
-					(place instanceof JSFunction && ((JSFunction) place).isSetProperty()))
-			{
-				PsiElement clazz;
-				if(function.isGetProperty() && (myName != null || !(placeParent instanceof JSExpressionStatement) || !((clazz = function.getParent()) instanceof
-						JSClass) ||
-						((JSClass) clazz).findFunctionByNameAndKind(function.getName(), JSFunction.FunctionKind.SETTER) != null))
-				{
-					return true;
-				}
-			}
-			else
-			{
-				if(function.isSetProperty())
-				{
-					return true;
-				}
-			}
-		}
-
-		if(place != null && (place.getParent() instanceof JSNewExpression || place instanceof JSSuperExpression))
-		{
-			if(element instanceof JSClass)
-			{
-				final JSFunction byName = ((JSClass) element).findFunctionByName(((JSClass) element).getName());
-				if(byName != null)
-				{
-					element = byName;
-				}
-			}
-			else if(element instanceof JSFunction &&
-					element.getParent() instanceof JSClass /*TODO: in mxml?*/ &&
-					!((JSFunction) element).isConstructor() &&
-					!((JSFunction) element).isGetProperty())
-			{
-				return true;
-			}
-		}
-		else if(element instanceof JSFunction && ((JSFunction) element).isConstructor() && !(place instanceof JSClass))
-		{
-			return true;
-		}
-
-		if(placeTopParent == null && place != null)
-		{
-			placeTopParent = JSResolveUtil.getTopReferenceExpression(place);
-		}
-		if(placeTopParent instanceof JSReferenceExpression &&
-				JSResolveUtil.isExprInStrictTypeContext((JSReferenceExpression) placeTopParent) &&
-				place != placeTopParent)
-		{
-			if(element instanceof JSVariable || element instanceof JSFunction)
-			{
-				return true;
-			}
-		}
-
-		boolean checkStopOnMatch = false;
-		boolean doStopOnMatch = false;
-
-		PsiElement elementToCheck = element;
-		if(elementToCheck instanceof JSFunctionExpression)
-		{
-			final PsiElement parent = elementToCheck.getParent();
-			if(parent instanceof JSAssignmentExpression)
-			{
-				elementToCheck = ((JSAssignmentExpression) parent).getLOperand();
-			}
-		}
-
-		if(elementToCheck instanceof JSDefinitionExpression)
-		{
-			boolean toProcess = false;
-			final JSExpression expression = ((JSDefinitionExpression) elementToCheck).getExpression();
-
-			if(expression instanceof JSReferenceExpression && ((JSReferenceExpression) expression).getQualifier() == null)
-			{
-				toProcess = true;
-			}
-
-			if(!toProcess)
-			{
-				return true;
-			}
-			checkStopOnMatch = true;
-			doStopOnMatch = myToStopOnAssignment;
-		}
-
-		if(element instanceof PsiNamedElement)
-		{
-			if(myName == null || myName.equals(getName((PsiNamedElement) element)))
-			{
-				element = getElement(element);
-				if(checkStopOnMatch && !doStopOnMatch)
-				{
-					myCandidateResult = element;
-				}
-				else
-				{
-					if(myName != null)
-					{
-						JavaScriptImportStatementBase s = state != null ? state.get(IMPORT_KEY) : null;
-						int previousResultsSize = myResults != null ? myResults.size() : 0;
-
-						s = checkQualifiedNameHasNecessaryImport(element, s, previousResultsSize);
-
-						if(s != null || myImportsUsed != null)
-						{
-							if(myImportsUsed == null)
-							{
-								myImportsUsed = new SmartList<>();
-								for(int i = 0; i < previousResultsSize; ++i)
-								{
-									myImportsUsed.add(null);
-								}
-							}
-
-							myImportsUsed.add(s);
-						}
-					}
-					if(myResults == null)
-					{
-						myResults = new ArrayList<>(1);
-					}
-					myResults.add(element);
-					myResult = element;
-					return myName == null;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	private JavaScriptImportStatementBase checkQualifiedNameHasNecessaryImport(PsiElement element, JavaScriptImportStatementBase s, int previousResultsSize)
-	{
-		if(s == null && (element instanceof JSClass || element instanceof JSFunction || element instanceof JSVariable ||
-				element instanceof JSNamespaceDeclaration))
-		{
-
-			if(placeTopParent instanceof JSReferenceExpression && !(placeTopParent.getParent() instanceof JavaScriptImportStatementBase))
-			{
-				final String qName = ((JSQualifiedNamedElement) element).getQualifiedName();
-
-				if(qName != null && qName.indexOf('.') != -1)
-				{
-					final ResolveProcessor processor = new ResolveProcessor(myName)
-					{
-						@Override
-						public boolean execute(PsiElement element, ResolveState state)
-						{
-							if(element instanceof JSQualifiedNamedElement)
-							{
-								if(!qName.equals(((JSQualifiedNamedElement) element).getQualifiedName()))
-								{
-									return true;
-								}
-							}
-							else
-							{
-								return true;
-							}
-							return super.execute(element, state);
-						}
-					};
-
-					if(!JSUnusedImportsHelper.isSomeNodeThatShouldNotHaveImportsWhenQualified((JSReferenceExpression) placeTopParent, element))
-					{
-						processor.putUserData(ASKING_FOR_QUALIFIED_IMPORT, qName);
-						JSResolveUtil.treeWalkUp(processor, placeTopParent, placeTopParent, place);
-						boolean noImportNoResolve = processor.getResult() == null;
-
-						if(noImportNoResolve)
-						{
-							if(myResolveStatus == null)
-							{
-								myResolveStatus = new SmartList<Boolean>();
-								for(int i = 0; i < previousResultsSize; ++i)
-								{
-									myResolveStatus.add(Boolean.TRUE);
-								}
-							}
-
-							myResolveStatus.add(Boolean.FALSE);
-						}
-						else
-						{
-							final ResolveResult[] resultsAsResolveResults = processor.getResultsAsResolveResults();
-							if(resultsAsResolveResults.length != 0)
-							{
-								s = ((JSResolveUtil.MyResolveResult) resultsAsResolveResults[0]).getImportUsed();
-							}
-						}
-					}
-				}
-			}
-		}
-		return s;
-	}
-
-	private static PsiElement getElement(final PsiElement element)
-	{
-		if(element instanceof XmlTag)
-		{
-			return ((XmlTag) element).getAttribute("name").getValueElement().getChildren()[1];
-		}
-		return element;
-	}
-
-	@Nullable
-	public static String getName(final PsiNamedElement element)
-	{
-		if(element instanceof JSNamedElement)
-		{
-			return element.getName();
-		}
-		return null;
-	}
-
-	@Override
-	public <T> T getHint(@Nonnull Key<T> hintClass)
-	{
-		return null;
-	}
-
-	protected void setTypeName(final String qualifiedName)
-	{
-		myTypeName = qualifiedName;
-	}
-
-	public void configureClassScope(final JSClass jsClass)
-	{
-		if(jsClass != null)
-		{
-			myClassScopeTypeName = jsClass.getQualifiedName();
-		}
-		else
-		{
-			acceptProtectedMembers = false;
-			acceptProtectedMembersSet = true;
-		}
-	}
-
-	@Override
-	public void handleEvent(Event event, Object associated)
-	{
-		if(event == Event.SET_DECLARATION_HOLDER)
-		{
-			if(associated instanceof JSClass)
-			{
-				myClassDeclarationStarted = true;
-				final JSClass jsClass = (JSClass) associated;
-				final String qName = jsClass.getQualifiedName();
-
-				if(!encounteredDynamicClassesSet)
-				{
-					final JSAttributeList attributeList = jsClass.getAttributeList();
-					if(attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC))
-					{
-						encounteredDynamicClasses = true;
-					}
-					encounteredDynamicClassesSet = true;
-				}
-
-				if(acceptPrivateMembers)
-				{
-					acceptPrivateMembers = qName != null && qName.equals(myClassScopeTypeName);
-				}
-
-				if(!acceptProtectedMembersSet)
-				{
-					acceptProtectedMembersSet = true;
-
-					if(myClassScopeTypeName != null)
-					{
-						acceptProtectedMembers = myClassScopeTypeName.equals(qName);
-
-						if(!acceptProtectedMembers)
-						{
-							final PsiElement element = JSClassImpl.findClassFromNamespace(myClassScopeTypeName, place);
-							if(element instanceof JSClass)
-							{
-								final boolean b = element.processDeclarations(new ResolveProcessor(null)
-								{
-									{
-										setTypeContext(true);
-										setToProcessMembers(false);
-										setToProcessHierarchy(true);
-										acceptProtectedMembers = false;
-										setLocalResolve(true);
-									}
-
-									@Override
-									public boolean execute(final PsiElement element, final ResolveState state)
-									{
-										if(!(element instanceof JSClass))
-										{
-											return true;
-										}
-										String classQName = ((JSClass) element).getQualifiedName();
-										return qName == classQName || (qName != null && !qName.equals(classQName));
-									}
-								}, ResolveState.initial(), element, element);
-
-								acceptProtectedMembers = !b;
-							}
-						}
-					}
-				}
-
-				if(processStatics)
-				{
-					if(myTypeName != null && !myTypeName.equals(jsClass.getQualifiedName()) || myTypeName == null && myClassScopeTypeName != null &&
-							!myClassScopeTypeName.equals(jsClass.getQualifiedName()))
-					{
-						processStatics = false;
-					}
-				}
-			}
-			else if(associated instanceof JSAttributeListOwner)
-			{
-				final JSAttributeList attributeList = ((JSAttributeListOwner) associated).getAttributeList();
-
-				if(attributeList != null &&
-						attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) &&
-						(place == null || !(place.getParent() instanceof JSNewExpression)))
-				{
-					processStatics = true;
-				}
-
-				if(associated instanceof JSFunctionExpression)
-				{
-					final PsiElement context = ((PsiElement) associated).getContainingFile().getContext();
-					if(!(context instanceof XmlAttributeValue))
-					{
-						encounteredFunctionExpression = true; // we create anonymous fun exprs for event handlers
-					}
-				}
-			}
-		}
-	}
-
-	public String getName()
-	{
-		return myName;
-	}
-
-	public boolean isToProcessHierarchy()
-	{
-		return toProcessHierarchy;
-	}
-
-	public void setToProcessHierarchy(final boolean toProcessHierarchy)
-	{
-		this.toProcessHierarchy = toProcessHierarchy;
-	}
-
-	public boolean isToSkipClassDeclarationOnce()
-	{
-		return toSkipClassDeclarationOnce;
-	}
-
-	public void setToSkipClassDeclarationsOnce(final boolean toSkipClassDeclarationOnce)
-	{
-		this.toSkipClassDeclarationOnce = toSkipClassDeclarationOnce;
-	}
-
-	public boolean foundAllValidResults()
-	{
-		return !encounteredFunctionExpression; // TODO: with statement too?
-	}
-
-	public void setTypeContext(final boolean b)
-	{
-		myTypeContext = b;
-	}
-
-	public boolean isTypeContext()
-	{
-		return myTypeContext;
-	}
-
-	public ResolveResult[] getResultsAsResolveResults()
-	{
-		final List<PsiElement> processorResults = getResults();
-		if(processorResults == null)
-		{
-			return ResolveResult.EMPTY_ARRAY;
-		}
-		final ResolveResult[] results = new ResolveResult[processorResults.size()];
-
-		for(int i = 0; i < results.length; ++i)
-		{
-			final PsiElement element = processorResults.get(i);
-			results[i] = new JSResolveUtil.MyResolveResult(element, myImportsUsed != null ? myImportsUsed.get(i) : null,
-					myResolveStatus != null ? myResolveStatus.get(i) : true);
-		}
-		return results;
-	}
-
-	public boolean processingEncounteredAbsenceOfTypes()
-	{
-		return encounteredDynamicClasses || encounteredWithStatement || encounteredFunctionExpression;
-	}
-
-	public Object[] getResultsAsObjects()
-	{
-		return getResultsAsObjects(null);
-	}
-
-	@RequiredReadAction
-	public Object[] getResultsAsObjects(String qualifiedNameToSkip)
-	{
-		final List<PsiElement> processorResults = getResults();
-		if(processorResults == null)
-		{
-			return ArrayUtil.EMPTY_OBJECT_ARRAY;
-		}
-		final int numberOfVariants = processorResults.size();
-		final List<Object> objects = new ArrayList<Object>(numberOfVariants);
-		final Set<String> processedCandidateNames = new HashSet<String>(numberOfVariants);
-
-		for(int i = 0; i < numberOfVariants; ++i)
-		{
-			final PsiElement namedElement = processorResults.get(i);
-			final String name = getName((PsiNamedElement) namedElement);
-			if(name == null)
-			{
-				continue;
-			}
-
-			String qName = namedElement instanceof JSQualifiedNamedElement ? ((JSQualifiedNamedElement) namedElement).getQualifiedName() : name;
-
-			if(processedCandidateNames.contains(qName))
-			{
-				continue;
-			}
-			processedCandidateNames.add(qName);
-
-			if(qualifiedNameToSkip != null && qualifiedNameToSkip.equals(qName))
-			{
-				continue;
-			}
-
-			objects.add(JSLookupUtil.createLookupItem(namedElement, name, JSLookupUtil.LookupPriority.HIGHEST));
-		}
-		return ArrayUtil.toObjectArray(objects);
-	}
-
-	public boolean isToProcessMembers()
-	{
-		return toProcessMembers;
-	}
-
-	public void setToProcessMembers(final boolean toProcessMembers)
-	{
-		this.toProcessMembers = toProcessMembers;
-	}
-
-	public boolean checkVisited(String className)
-	{
-		if(visitedClasses.contains(className))
-		{
-			return true;
-		}
-		visitedClasses.add(className);
-		return false;
-	}
-
-	public void setProcessStatics(final boolean processStatics)
-	{
-		this.processStatics = processStatics;
-	}
-
-	public boolean isLocalResolve()
-	{
-		return localResolve;
-	}
-
-	public void setLocalResolve(final boolean localResolve)
-	{
-		this.localResolve = localResolve;
-	}
-
-	public boolean specificallyAskingToResolveQualifiedNames()
-	{
-		return getUserData(ASKING_FOR_QUALIFIED_IMPORT) != null;
-	}
-
-	public String getQualifiedNameToImport()
-	{
-		return getUserData(ASKING_FOR_QUALIFIED_IMPORT);
-	}
-
-	public boolean lookingForUseNamespaces()
-	{
-		return getUserData(LOOKING_FOR_USE_NAMESPACES) != null;
-	}
-
-	public boolean isEncounteredDynamicClasses()
-	{
-		return encounteredDynamicClasses;
-	}
+public class ResolveProcessor extends UserDataHolderBase implements PsiScopeProcessor {
+    private static final Key<String> ASKING_FOR_QUALIFIED_IMPORT = Key.create("asking.for.import.of.qname");
+    protected static final Key<Boolean> LOOKING_FOR_USE_NAMESPACES = Key.create("looking.for.use.directive");
+
+    private final Set<String> visitedClasses = new HashSet<>();
+
+    private boolean myToStopOnAssignment;
+    protected final String myName;
+    private PsiElement myResult;
+    private PsiElement myCandidateResult;
+    private List<PsiElement> myResults;
+    private List<JavaScriptImportStatementBase> myImportsUsed;
+    private List<Boolean> myResolveStatus;
+
+    private boolean toProcessHierarchy;
+    private boolean toSkipClassDeclarationOnce;
+    private boolean toProcessMembers = true;
+    private boolean encounteredDynamicClasses;
+    private boolean encounteredDynamicClassesSet;
+    private boolean encounteredFunctionExpression;
+    private boolean processStatics;
+    private boolean acceptPrivateMembers = true;
+    private boolean acceptProtectedMembers = true;
+    private boolean acceptProtectedMembersSet;
+    private boolean allowUnqualifiedStaticsFromInstance;
+
+    private boolean myTypeContext;
+    private boolean encounteredWithStatement;
+    private boolean localResolve;
+    protected final PsiElement place;
+    private String myTypeName;
+    private String myClassScopeTypeName;
+
+    private Set<String> openedNses;
+    private boolean defaultNsIsNotAllowed;
+    private boolean anyNsAllowed;
+    private boolean myAcceptOnlyClasses;
+    private boolean myAcceptOnlyInterfaces;
+
+    public static final Key<JavaScriptImportStatementBase> IMPORT_KEY = Key.create("import.key");
+    private boolean myClassDeclarationStarted;
+    private PsiElement placeTopParent;
+    protected boolean ecma;
+    public static final String AS3_NAMESPACE = "AS3";
+
+    private ResolveHelper myResolveHelper;
+
+    public ResolveProcessor(final String name) {
+        this(name, false);
+    }
+
+    public ResolveProcessor(final String name, boolean toStopOnAssignment) {
+        myName = name;
+        myToStopOnAssignment = toStopOnAssignment;
+        place = null;
+    }
+
+    public ResolveProcessor(final String name, PsiElement _place) {
+        myName = name;
+        place = _place;
+        final boolean b = place instanceof JSReferenceExpression && ((JSReferenceExpression)place).getQualifier() == null;
+        allowUnqualifiedStaticsFromInstance = b;
+
+        if (myName != null && place instanceof JSReferenceExpression placeRefExpr) {
+            final ASTNode node = place.getNode().findChildByType(JSTokenTypes.COLON_COLON);
+            String explicitNs = null;
+
+            // TODO: e.g. protected is also ns
+            JSExpression qualifier = placeRefExpr.getQualifier();
+            if (node != null) {
+                if (qualifier instanceof JSReferenceExpression qualifierRefExpr) {
+                    anyNsAllowed = qualifierRefExpr.resolve() instanceof JSVariable;
+                }
+
+                explicitNs = qualifier != null ? qualifier.getText() : null;
+            }
+            else if (qualifier instanceof JSReferenceExpression qualifierRefExpr
+                && qualifier.getNode().findChildByType(JSTokenTypes.COLON_COLON) != null) {
+                anyNsAllowed = qualifierRefExpr.resolve() instanceof JSVariable;
+                explicitNs = qualifierRefExpr.getReferencedName();
+            }
+
+            if (explicitNs != null && !anyNsAllowed) {
+                openedNses = new HashSet<>();
+                openedNses.add(explicitNs);
+                defaultNsIsNotAllowed = true;
+            }
+        }
+
+        if (myName == null && place instanceof JSReferenceExpression) {
+            PsiElement parent = place.getParent();
+
+            if (parent instanceof JSReferenceList) {
+                if (parent.getNode().getElementType() == JSElementTypes.EXTENDS_LIST) {
+                    final PsiElement element = parent.getParent();
+                    if (element instanceof JSClass jsClass) {
+                        if (jsClass.isInterface()) {
+                            myAcceptOnlyClasses = false;
+                            myAcceptOnlyInterfaces = true;
+                        }
+                        else {
+                            myAcceptOnlyClasses = true;
+                            myAcceptOnlyInterfaces = false;
+                        }
+                    }
+                }
+                else {
+                    myAcceptOnlyClasses = false;
+                    myAcceptOnlyInterfaces = true;
+                }
+            }
+        }
+
+        ecma = place != null && place.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+    }
+
+    public PsiElement getResult() {
+        if (myResult == null && myCandidateResult != null) {
+            assert myResults == null;
+            return myCandidateResult;
+        }
+        return myResult;
+    }
+
+    public JavaScriptImportStatementBase getImportUsed() {
+        return myImportsUsed != null ? myImportsUsed.get(0) : null;
+    }
+
+    public List<PsiElement> getResults() {
+        if (myResults == null && myResult == null && myCandidateResult != null) {
+            myResults = new ArrayList<>(1);
+            myResults.add(myCandidateResult);
+        }
+        return myResults;
+    }
+
+    @Override
+    @RequiredReadAction
+    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+        if ((element instanceof JSVariable && !(element instanceof JSParameter)) || element instanceof JSFunction) {
+            final JSAttributeList attributeList = ((JSAttributeListOwner)element).getAttributeList();
+
+            // TODO: we should accept such values during resolve but make them invalid
+            if (!acceptPrivateMembers
+                && attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE) {
+                return true;
+            }
+
+            if (!acceptProtectedMembers
+                && attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PROTECTED) {
+                return true;
+            }
+
+            if (myClassDeclarationStarted) {
+                if (processStatics) {
+                    if (attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
+                        return true;
+                    }
+                }
+                else if (!allowUnqualifiedStaticsFromInstance) {
+                    if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
+                        return true;
+                    }
+                }
+            }
+
+            String attributeNs = attributeList != null ? attributeList.getNamespace() : null;
+
+            if (openedNses == null && attributeNs != null && !anyNsAllowed
+                && place instanceof JSReferenceExpression placeRefExpr && !JSResolveUtil.isExprInTypeContext(placeRefExpr)) {
+                openedNses = JSResolveUtil.calculateOpenNses(place);
+            }
+
+            if (openedNses != null && !openedNses.contains(attributeNs) && (!AS3_NAMESPACE.equals(attributeNs) || !ecma) // AS3 is opened by default from
+                // compiler settings
+            ) {
+                if (attributeNs != null || defaultNsIsNotAllowed) {
+                    return true;
+                }
+            }
+        }
+
+        if (myAcceptOnlyClasses || myAcceptOnlyInterfaces) {
+            if (element instanceof JSClass jsClass) {
+                final boolean isInterface = jsClass.isInterface();
+
+                if ((myAcceptOnlyClasses && isInterface) || (myAcceptOnlyInterfaces && !isInterface)) {
+                    return true;
+                }
+            }
+        }
+
+        if (place != null) {
+            if (myResolveHelper == null) {
+                myResolveHelper = ResolveHelper.find(place);
+            }
+
+            if (myResolveHelper.execute(this, element, state)) {
+                myCandidateResult = element;
+                return true;
+            }
+        }
+
+        if (place != null && element instanceof JSFunction function && !(element instanceof JSFunctionExpression)) {
+            final PsiElement placeParent = place.getParent();
+
+            if (placeParent instanceof JSDefinitionExpression
+                || (myName == null && placeParent instanceof JSExpressionStatement /* when complete of setter*/)
+                || (place instanceof JSFunction placeFunction && placeFunction.isSetProperty())) {
+                PsiElement clazz;
+                if (function.isGetProperty()
+                    && (myName != null || !(placeParent instanceof JSExpressionStatement)
+                    || !((clazz = function.getParent()) instanceof JSClass) ||
+                    ((JSClass)clazz).findFunctionByNameAndKind(function.getName(), JSFunction.FunctionKind.SETTER) != null)) {
+                    return true;
+                }
+            }
+            else if (function.isSetProperty()) {
+                return true;
+            }
+        }
+
+        if (place != null && (place.getParent() instanceof JSNewExpression || place instanceof JSSuperExpression)) {
+            if (element instanceof JSClass jsClass) {
+                final JSFunction byName = jsClass.findFunctionByName(jsClass.getName());
+                if (byName != null) {
+                    element = byName;
+                }
+            }
+            else if (element instanceof JSFunction function
+                && element.getParent() instanceof JSClass /*TODO: in mxml?*/
+                && !function.isConstructor() && !function.isGetProperty()) {
+                return true;
+            }
+        }
+        else if (element instanceof JSFunction function && function.isConstructor() && !(place instanceof JSClass)) {
+            return true;
+        }
+
+        if (placeTopParent == null && place != null) {
+            placeTopParent = JSResolveUtil.getTopReferenceExpression(place);
+        }
+        if (placeTopParent instanceof JSReferenceExpression placeTopParentRefExpr
+            && JSResolveUtil.isExprInStrictTypeContext(placeTopParentRefExpr)
+            && place != placeTopParent
+            && (element instanceof JSVariable || element instanceof JSFunction)) {
+            return true;
+        }
+
+        boolean checkStopOnMatch = false;
+        boolean doStopOnMatch = false;
+
+        PsiElement elementToCheck = element;
+        if (elementToCheck instanceof JSFunctionExpression
+            && elementToCheck.getParent() instanceof JSAssignmentExpression assignment) {
+            elementToCheck = assignment.getLOperand();
+        }
+
+        if (elementToCheck instanceof JSDefinitionExpression definition) {
+            boolean toProcess = false;
+
+            if (definition.getExpression() instanceof JSReferenceExpression refExpr && refExpr.getQualifier() == null) {
+                toProcess = true;
+            }
+
+            if (!toProcess) {
+                return true;
+            }
+            checkStopOnMatch = true;
+            doStopOnMatch = myToStopOnAssignment;
+        }
+
+        if (element instanceof PsiNamedElement namedElement && (myName == null || myName.equals(getName(namedElement)))) {
+            element = getElement(element);
+            if (checkStopOnMatch && !doStopOnMatch) {
+                myCandidateResult = element;
+            }
+            else {
+                if (myName != null) {
+                    JavaScriptImportStatementBase s = state != null ? state.get(IMPORT_KEY) : null;
+                    int previousResultsSize = myResults != null ? myResults.size() : 0;
+
+                    s = checkQualifiedNameHasNecessaryImport(element, s, previousResultsSize);
+
+                    if (s != null || myImportsUsed != null) {
+                        if (myImportsUsed == null) {
+                            myImportsUsed = new SmartList<>();
+                            for (int i = 0; i < previousResultsSize; ++i) {
+                                myImportsUsed.add(null);
+                            }
+                        }
+
+                        myImportsUsed.add(s);
+                    }
+                }
+                if (myResults == null) {
+                    myResults = new ArrayList<>(1);
+                }
+                myResults.add(element);
+                myResult = element;
+                return myName == null;
+            }
+        }
+
+        return true;
+    }
+
+    private JavaScriptImportStatementBase checkQualifiedNameHasNecessaryImport(
+        PsiElement element,
+        JavaScriptImportStatementBase s,
+        int previousResultsSize
+    ) {
+        if (s == null && (element instanceof JSClass || element instanceof JSFunction || element instanceof JSVariable
+            || element instanceof JSNamespaceDeclaration)) {
+
+            if (placeTopParent instanceof JSReferenceExpression placeTopParentRefExpr
+                && !(placeTopParent.getParent() instanceof JavaScriptImportStatementBase)) {
+                final String qName = ((JSQualifiedNamedElement)element).getQualifiedName();
+
+                if (qName != null && qName.indexOf('.') != -1) {
+                    final ResolveProcessor processor = new ResolveProcessor(myName) {
+                        @Override
+                        public boolean execute(PsiElement element, ResolveState state) {
+                            if (element instanceof JSQualifiedNamedElement) {
+                                if (!qName.equals(((JSQualifiedNamedElement)element).getQualifiedName())) {
+                                    return true;
+                                }
+                            }
+                            else {
+                                return true;
+                            }
+                            return super.execute(element, state);
+                        }
+                    };
+
+                    if (!JSUnusedImportsHelper.isSomeNodeThatShouldNotHaveImportsWhenQualified(
+                        placeTopParentRefExpr,
+                        element
+                    )) {
+                        processor.putUserData(ASKING_FOR_QUALIFIED_IMPORT, qName);
+                        JSResolveUtil.treeWalkUp(processor, placeTopParent, placeTopParent, place);
+                        boolean noImportNoResolve = processor.getResult() == null;
+
+                        if (noImportNoResolve) {
+                            if (myResolveStatus == null) {
+                                myResolveStatus = new SmartList<Boolean>();
+                                for (int i = 0; i < previousResultsSize; ++i) {
+                                    myResolveStatus.add(Boolean.TRUE);
+                                }
+                            }
+
+                            myResolveStatus.add(Boolean.FALSE);
+                        }
+                        else {
+                            final ResolveResult[] resultsAsResolveResults = processor.getResultsAsResolveResults();
+                            if (resultsAsResolveResults.length != 0) {
+                                s = ((JSResolveUtil.MyResolveResult)resultsAsResolveResults[0]).getImportUsed();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return s;
+    }
+
+    private static PsiElement getElement(final PsiElement element) {
+        return element instanceof XmlTag xmlTag
+            ? xmlTag.getAttribute("name").getValueElement().getChildren()[1]
+            : element;
+        }
+
+    @Nullable
+    public static String getName(final PsiNamedElement element) {
+        return element instanceof JSNamedElement ? element.getName() : null;
+    }
+
+    @Override
+    public <T> T getHint(@Nonnull Key<T> hintClass) {
+        return null;
+    }
+
+    protected void setTypeName(final String qualifiedName) {
+        myTypeName = qualifiedName;
+    }
+
+    public void configureClassScope(final JSClass jsClass) {
+        if (jsClass != null) {
+            myClassScopeTypeName = jsClass.getQualifiedName();
+        }
+        else {
+            acceptProtectedMembers = false;
+            acceptProtectedMembersSet = true;
+        }
+    }
+
+    @Override
+    public void handleEvent(Event event, Object associated) {
+        if (event == Event.SET_DECLARATION_HOLDER) {
+            if (associated instanceof JSClass) {
+                myClassDeclarationStarted = true;
+                final JSClass jsClass = (JSClass)associated;
+                final String qName = jsClass.getQualifiedName();
+
+                if (!encounteredDynamicClassesSet) {
+                    final JSAttributeList attributeList = jsClass.getAttributeList();
+                    if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
+                        encounteredDynamicClasses = true;
+                    }
+                    encounteredDynamicClassesSet = true;
+                }
+
+                if (acceptPrivateMembers) {
+                    acceptPrivateMembers = qName != null && qName.equals(myClassScopeTypeName);
+                }
+
+                if (!acceptProtectedMembersSet) {
+                    acceptProtectedMembersSet = true;
+
+                    if (myClassScopeTypeName != null) {
+                        acceptProtectedMembers = myClassScopeTypeName.equals(qName);
+
+                        if (!acceptProtectedMembers) {
+                            final PsiElement element = JSClassImpl.findClassFromNamespace(myClassScopeTypeName, place);
+                            if (element instanceof JSClass) {
+                                final boolean b = element.processDeclarations(
+                                    new ResolveProcessor(null) {
+                                        {
+                                            setTypeContext(true);
+                                            setToProcessMembers(false);
+                                            setToProcessHierarchy(true);
+                                            acceptProtectedMembers = false;
+                                            setLocalResolve(true);
+                                        }
+
+                                        @Override
+                                        public boolean execute(final PsiElement element, final ResolveState state) {
+                                            if (!(element instanceof JSClass)) {
+                                                return true;
+                                            }
+                                            String classQName = ((JSClass)element).getQualifiedName();
+                                            return qName == classQName || (qName != null && !qName.equals(classQName));
+                                        }
+                                    },
+                                    ResolveState.initial(),
+                                    element,
+                                    element
+                                );
+
+                                acceptProtectedMembers = !b;
+                            }
+                        }
+                    }
+                }
+
+                if (processStatics) {
+                    if (myTypeName != null && !myTypeName.equals(jsClass.getQualifiedName())
+                        || myTypeName == null && myClassScopeTypeName != null &&
+                        !myClassScopeTypeName.equals(jsClass.getQualifiedName())) {
+                        processStatics = false;
+                    }
+                }
+            }
+            else if (associated instanceof JSAttributeListOwner attributeListOwner) {
+                final JSAttributeList attributeList = attributeListOwner.getAttributeList();
+
+                if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
+                    && (place == null || !(place.getParent() instanceof JSNewExpression))) {
+                    processStatics = true;
+                }
+
+                if (associated instanceof JSFunctionExpression functionExpression) {
+                    final PsiElement context = functionExpression.getContainingFile().getContext();
+                    if (!(context instanceof XmlAttributeValue)) {
+                        encounteredFunctionExpression = true; // we create anonymous fun exprs for event handlers
+                    }
+                }
+            }
+        }
+    }
+
+    public String getName() {
+        return myName;
+    }
+
+    public boolean isToProcessHierarchy() {
+        return toProcessHierarchy;
+    }
+
+    public void setToProcessHierarchy(final boolean toProcessHierarchy) {
+        this.toProcessHierarchy = toProcessHierarchy;
+    }
+
+    public boolean isToSkipClassDeclarationOnce() {
+        return toSkipClassDeclarationOnce;
+    }
+
+    public void setToSkipClassDeclarationsOnce(final boolean toSkipClassDeclarationOnce) {
+        this.toSkipClassDeclarationOnce = toSkipClassDeclarationOnce;
+    }
+
+    public boolean foundAllValidResults() {
+        return !encounteredFunctionExpression; // TODO: with statement too?
+    }
+
+    public void setTypeContext(final boolean b) {
+        myTypeContext = b;
+    }
+
+    public boolean isTypeContext() {
+        return myTypeContext;
+    }
+
+    public ResolveResult[] getResultsAsResolveResults() {
+        final List<PsiElement> processorResults = getResults();
+        if (processorResults == null) {
+            return ResolveResult.EMPTY_ARRAY;
+        }
+        final ResolveResult[] results = new ResolveResult[processorResults.size()];
+
+        for (int i = 0; i < results.length; ++i) {
+            final PsiElement element = processorResults.get(i);
+            results[i] = new JSResolveUtil.MyResolveResult(
+                element,
+                myImportsUsed != null ? myImportsUsed.get(i) : null,
+                myResolveStatus != null ? myResolveStatus.get(i) : true
+            );
+        }
+        return results;
+    }
+
+    public boolean processingEncounteredAbsenceOfTypes() {
+        return encounteredDynamicClasses || encounteredWithStatement || encounteredFunctionExpression;
+    }
+
+    public Object[] getResultsAsObjects() {
+        return getResultsAsObjects(null);
+    }
+
+    @RequiredReadAction
+    public Object[] getResultsAsObjects(String qualifiedNameToSkip) {
+        final List<PsiElement> processorResults = getResults();
+        if (processorResults == null) {
+            return ArrayUtil.EMPTY_OBJECT_ARRAY;
+        }
+        final int numberOfVariants = processorResults.size();
+        final List<Object> objects = new ArrayList<>(numberOfVariants);
+        final Set<String> processedCandidateNames = new HashSet<>(numberOfVariants);
+
+        for (int i = 0; i < numberOfVariants; ++i) {
+            final PsiElement namedElement = processorResults.get(i);
+            final String name = getName((PsiNamedElement)namedElement);
+            if (name == null) {
+                continue;
+            }
+
+            String qName = namedElement instanceof JSQualifiedNamedElement qualifiedNamedElement
+                ? qualifiedNamedElement.getQualifiedName()
+                : name;
+
+            if (processedCandidateNames.contains(qName)) {
+                continue;
+            }
+            processedCandidateNames.add(qName);
+
+            if (qualifiedNameToSkip != null && qualifiedNameToSkip.equals(qName)) {
+                continue;
+            }
+
+            objects.add(JSLookupUtil.createLookupItem(namedElement, name, JSLookupUtil.LookupPriority.HIGHEST));
+        }
+        return ArrayUtil.toObjectArray(objects);
+    }
+
+    public boolean isToProcessMembers() {
+        return toProcessMembers;
+    }
+
+    public void setToProcessMembers(final boolean toProcessMembers) {
+        this.toProcessMembers = toProcessMembers;
+    }
+
+    public boolean checkVisited(String className) {
+        if (visitedClasses.contains(className)) {
+            return true;
+        }
+        visitedClasses.add(className);
+        return false;
+    }
+
+    public void setProcessStatics(final boolean processStatics) {
+        this.processStatics = processStatics;
+    }
+
+    public boolean isLocalResolve() {
+        return localResolve;
+    }
+
+    public void setLocalResolve(final boolean localResolve) {
+        this.localResolve = localResolve;
+    }
+
+    public boolean specificallyAskingToResolveQualifiedNames() {
+        return getUserData(ASKING_FOR_QUALIFIED_IMPORT) != null;
+    }
+
+    public String getQualifiedNameToImport() {
+        return getUserData(ASKING_FOR_QUALIFIED_IMPORT);
+    }
+
+    public boolean lookingForUseNamespaces() {
+        return getUserData(LOOKING_FOR_USE_NAMESPACES) != null;
+    }
+
+    public boolean isEncounteredDynamicClasses() {
+        return encounteredDynamicClasses;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index 6c8a0a12..4e0c2a37 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -36,467 +36,391 @@
 /**
  * @author Maxim.Mossienko
  */
-public class VariantsProcessor extends BaseJSSymbolProcessor
-{
-	private Map<String, Object> myNames2CandidatesMap = new HashMap<String, Object>();
-	private int myThisFileNameListCount;
-	private List<Object> myNamesList = new ArrayList<Object>();
-
-	private Map<String, Object> myPartialMatchNamesMap = new HashMap<String, Object>();
-	private Map<String, Object> myPartialMatchNamesMapFromSameFile = new HashMap<String, Object>();
-	//private Set<PsiFile> myTargetFiles;
-	private final boolean hasSomeSmartnessAvailable;
-	private boolean myProcessOnlyTypes;
-
-	private boolean myAddOnlyCompleteMatchesSet;
-
-	@NonNls
-	private static final String OBJECT_CLASS_NAME = "Object";
-
-	public VariantsProcessor(String[] nameIds, PsiFile targetFile, boolean skipDclsInTargetFile, PsiElement context)
-	{
-		super(targetFile.getOriginalFile(), skipDclsInTargetFile, context, nameIds);
-		nameIds = myContextNameIds;
-
-		boolean hasSomeInfoAvailable = nameIds != null && nameIds.length > 0;
-		final List<String[]> possibleNameComponents = new ArrayList<String[]>(1);
-		myCurrentFile = targetFile.getOriginalFile();
-		//myTargetFiles = new HashSet<PsiFile>();
-
-		boolean allTypesResolved = false;
-		boolean doAddContextIds = true;
-
-		final JSClass jsClass = PsiTreeUtil.getParentOfType(context, JSClass.class);
-
-		if(context instanceof JSReferenceExpression)
-		{
-			final JSReferenceExpression refExpr = (JSReferenceExpression) context;
-			JSExpression qualifier = refExpr.getQualifier();
-
-			if(qualifier != null)
-			{
-				if(qualifier instanceof JSThisExpression || qualifier instanceof JSSuperExpression)
-				{
-					if(jsClass != null)
-					{
-						myAddOnlyCompleteMatches = myAddOnlyCompleteMatchesSet = true;
-						updateCanUseOnlyCompleteMatches(jsClass);
-						doAddContextIds = false;
-					}
-					else if(JSResolveUtil.getTypeFromTagNameInMxml(myCurrentFile.getContext()) != null)
-					{
-						myAddOnlyCompleteMatches = myAddOnlyCompleteMatchesSet = true;
-					}
-				}
-
-				final CompletionTypeProcessor processor = new CompletionTypeProcessor(possibleNameComponents);
-				doEvalForExpr(getOriginalQualifier(qualifier), myTargetFile, processor);
-				allTypesResolved = processor.getAllTypesResolved();
-			}
-			else
-			{
-				final PsiElement parent = refExpr.getParent();
-
-				if(parent instanceof JavaScriptImportStatementBase)
-				{
-					myProcessOnlyTypes = true;
-				}
-				else if(JSResolveUtil.isExprInTypeContext(refExpr) || (ecmal4 && JSResolveUtil.isInPlaceWhereTypeCanBeDuringCompletion(refExpr)))
-				{
-					myAddOnlyCompleteMatches = myAddOnlyCompleteMatchesSet = true;
-					myProcessOnlyTypes = true;
-					allTypesResolved = true;
-					addPackageScope(possibleNameComponents, jsClass, refExpr);
-				}
-				else if(jsClass != null)
-				{
-					myAddOnlyCompleteMatches = myAddOnlyCompleteMatchesSet = true;
-					updateCanUseOnlyCompleteMatches(jsClass);
-				}
-			}
-		}
-
-		if(hasSomeInfoAvailable && (!allTypesResolved || (!possibleNameComponents.isEmpty() &&
-				possibleNameComponents.get(0).length == 1 &&
-				"Function".equals(possibleNameComponents.get(0)[0]))))
-		{
-			if(doAddContextIds)
-			{
-				possibleNameComponents.add(nameIds);
-			}
-
-			doIterateTypeHierarchy(nameIds, new HierarchyProcessor()
-			{
-				@Override
-				public boolean processClass(final JSClass clazz)
-				{
-					updateCanUseOnlyCompleteMatchesFromString(clazz.getQualifiedName(), clazz, clazz);
-					buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameComponents);
-					return true;
-				}
-			});
-		}
-
-		String[][] nameIdsArray = new String[possibleNameComponents.size()][];
-		possibleNameComponents.toArray(nameIdsArray);
-
-		hasSomeSmartnessAvailable = nameIdsArray != null && nameIdsArray.length > 0;
-	}
-
-	private void updateCanUseOnlyCompleteMatchesFromString(final String qName, Object source, PsiElement clazz)
-	{
-		final boolean wasSet = myAddOnlyCompleteMatchesSet;
-
-		if(myAddOnlyCompleteMatches || !wasSet)
-		{
-			myAddOnlyCompleteMatchesSet = true;
-			if(qName.equals("*") ||
-					(qName.equals(OBJECT_CLASS_NAME) && (myIteratedTypeName == null ||
-							qName.equals(myIteratedTypeName) ||
-							// skip adding complete matches when context name is qualifier
-							(myContextNameIds != null &&
-									myContextNameIds.length > 0 &&
-									myIteratedTypeName.equals(myContextNameIds[myContextNameIds.length - 1]) &&
-									myContext instanceof JSReferenceExpression &&
-									((JSReferenceExpression) myContext).getQualifier() instanceof JSReferenceExpression))) /* something explicitly marked as Object*/ ||
-					(qName.equals(FUNCTION_TYPE_NAME) && isObjectSourceThatDoesNotGiveExactKnowledgeAboutFunctionType(source)))
-			{
-				myAddOnlyCompleteMatches = false;
-			}
-			else
-			{
-				if(clazz == null)
-				{
-					clazz = JSResolveUtil.findClassByQName(qName, myContext);
-				}
-
-				if(clazz instanceof JSClass)
-				{
-					if(!wasSet)
-					{
-						myAddOnlyCompleteMatches = true;
-					}
-
-					final JSAttributeList attributeList = ((JSClass) clazz).getAttributeList();
-					if(attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC) && !OBJECT_CLASS_NAME.equals(qName))
-					{
-						myAddOnlyCompleteMatches = false;
-					}
-				}
-			}
-		}
-	}
-
-	private static boolean isObjectSourceThatDoesNotGiveExactKnowledgeAboutFunctionType(final Object source)
-	{
-		return source instanceof JSFunctionExpression;
-	}
-
-	private void updateCanUseOnlyCompleteMatches(final JSClass jsClass)
-	{
-		final JSAttributeList attributeList = jsClass != null ? jsClass.getAttributeList() : null;
-		if(attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC))
-		{
-			myAddOnlyCompleteMatches = false;
-		}
-	}
-
-	public void addLocalResults(final List<PsiElement> results)
-	{
-		if(results == null)
-		{
-			return;
-		}
-
-		final Set<String> processedCandidateNames = new HashSet<String>(results.size());
-
-		for(PsiElement e : results)
-		{
-			if(e instanceof PsiNamedElement)
-			{
-				final PsiNamedElement namedElement = (PsiNamedElement) e;
-
-				String name = ResolveProcessor.getName(namedElement);
-				String qName = namedElement instanceof JSQualifiedNamedElement ? ((JSQualifiedNamedElement) namedElement).getQualifiedName() : name;
-
-				if(processedCandidateNames.contains(qName))
-				{
-					continue;
-				}
-				processedCandidateNames.add(qName);
-
-				addCompleteMatch(namedElement, name, false);
-			}
-		}
-	}
-
-	class CompletionTypeProcessor implements TypeProcessor
-	{
-		final List<String[]> possibleNameIds;
-		private PsiElement myUnknownElement;
-
-		CompletionTypeProcessor(List<String[]> _possibleNameIds)
-		{
-			possibleNameIds = _possibleNameIds;
-		}
-
-		@Override
-		public void process(String type, final EvaluateContext context, final PsiElement source)
-		{
-			if(context.visitedTypes.contains(type))
-			{
-				return;
-			}
-			context.visitedTypes.add(type);
-			if(JSTypeEvaluateManager.isArrayType(type))
-			{
-				type = ARRAY_TYPE_NAME;
-			}
-			updateCanUseOnlyCompleteMatchesFromString(type, source, null);
-			type = buildIndexListFromQNameAndCorrectQName(type, source, possibleNameIds);
-			addSupers(type, possibleNameIds, context);
-		}
-
-		@Override
-		public Set<JavaScriptFeature> getFeatures()
-		{
-			return myFeatures;
-		}
-
-		@Override
-		public boolean ecma()
-		{
-			return ecmal4;
-		}
-
-		@Override
-		public void setUnknownElement(PsiElement element)
-		{
-			myUnknownElement = element;
-		}
-
-		public boolean getAllTypesResolved()
-		{
-			return myUnknownElement == null;
-		}
-	}
-
-	private void addSupers(final String type, final List<String[]> possibleNameIds, final EvaluateContext context)
-	{
-		final String iteratedType = myIteratedTypeName;
-		myIteratedTypeName = type;
-		doIterateHierarchy(type, new HierarchyProcessor()
-		{
-			@Override
-			public boolean processClass(final JSClass clazz)
-			{
-				String qname = clazz.getQualifiedName();
-				if(!context.visitedTypes.contains(qname))
-				{
-					context.visitedTypes.add(qname);
-					updateCanUseOnlyCompleteMatchesFromString(qname, clazz, clazz);
-					buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
-				}
-				return true;
-			}
-		});
-
-		myIteratedTypeName = iteratedType;
-	}
-
-	public Object[] getResult()
-	{
-		List<Object> results = new ArrayList<Object>();
-		for(Object o : myNamesList)
-		{
-			results.add(o);
-		}
-
-		for(Object o : myPartialMatchNamesMapFromSameFile.values())
-		{
-			results.add(o);
-		}
-
-		for(Object o : myPartialMatchNamesMap.values())
-		{
-			results.add(o);
-		}
-
-		return ArrayUtil.toObjectArray(results);
-	}
-
-	@Override
-	public boolean execute(PsiElement element, ResolveState state)
-	{
-		if(element instanceof JSNamedElement)
-		{
-			final JSNamedElement namedElement = (JSNamedElement) element;
-
-			addCompleteMatch(namedElement, namedElement.getName());
-		}
-
-		return true;
-	}
-
-	private void doAdd(final String nameId, final PsiElement element)
-	{
-		final String name = nameId != null ? nameId : null;
-
-		boolean seemsToBePrivateSymbol = name != null && name.length() > 0 && name.charAt(0) == '_' && name.length() > 1 && name.charAt(1) != '_';
-		boolean privateSymbol = seemsToBePrivateSymbol;
-
-		if(seemsToBePrivateSymbol)
-		{
-			if(!(myTargetFile instanceof JSFile))
-			{
-				// no interest in html, jsp for private symbols
-				return;
-			}
-
-			if(myContextNameIds == null || myContextNameIds.length == 0)
-			{
-				privateSymbol = false;
-			}
-		}
-
-
-		MatchType matchType = MatchType.COMPLETE;
-
-		if(matchType == MatchType.COMPLETE && !ecmal4 && myProcessOnlyTypes)
-		{
-			if(((name != null && name.length() > 0 && Character.isLowerCase(name.charAt(0))) || seemsToBePrivateSymbol))
-			{
-				matchType = MatchType.PARTIAL;
-			}
-		}
-
-		if(matchType == MatchType.PARTIAL || (privateSymbol && matchType == MatchType.COMPLETE))
-		{
-			addPartialMatch(element, nameId);
-
-		}
-		else if(matchType == MatchType.COMPLETE)
-		{
-			addCompleteMatch(element, nameId);
-		}
-	}
-
-
-	@RequiredReadAction
-	private LookupElement addLookupValue(PsiElement element, final String name, JSLookupUtil.LookupPriority priority)
-	{
-		return JSLookupUtil.createLookupItem(element, name, priority);
-	}
-
-	@Override
-	protected String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression)
-	{
-		return JSResolveUtil.buildNameIdsForQualifier(JSResolveUtil.getRealRefExprQualifier(jsReferenceExpression));
-	}
-
-	@Override
-	protected boolean isFromRelevantFileOrDirectory()
-	{
-		return super.isFromRelevantFileOrDirectory(); // || myTargetFiles.contains(myCurrentFile);
-	}
-
-	private void addCompleteMatch(final PsiElement _element, String nameId)
-	{
-		addCompleteMatch(_element, nameId, true);
-	}
-
-	private void addCompleteMatch(final PsiElement _element, String nameId, boolean doFilterting)
-	{
-		if(!doAdd(_element, nameId, doFilterting))
-		{
-			boolean removedFromPartialNames = false;
-			final Object el = myNames2CandidatesMap.get(nameId);
-
-			if(el != null)
-			{
-				removedFromPartialNames = myPartialMatchNamesMapFromSameFile.remove(nameId) != null || myPartialMatchNamesMap.remove(nameId) != null;
-			}
-			if(!removedFromPartialNames)
-			{
-				return;
-			}
-		}
-
-		PsiElement element = _element;
-
-		if(isFromRelevantFileOrDirectory() && !myAddOnlyCompleteMatches)
-		{
-			final Object o = addLookupValue(element, nameId, JSLookupUtil.LookupPriority.HIGHEST);
-			if(o != null)
-			{
-				myNamesList.add(myThisFileNameListCount++, o);
-			}
-			else
-			{
-				myNames2CandidatesMap.remove(nameId);
-			}
-		}
-		else
-		{
-			final Object o = addLookupValue(element, nameId, JSLookupUtil.LookupPriority.HIGH);
-			if(o != null)
-			{
-				myNamesList.add(o);
-			}
-			else
-			{
-				myNames2CandidatesMap.remove(nameId);
-			}
-		}
-	}
-
-	private boolean doAdd(Object element, String nameId, boolean doFilterting)
-	{
-		if(nameId == null || (doFilterting && myNames2CandidatesMap.get(nameId) != null))
-		{
-			return false;
-		}
-		myNames2CandidatesMap.put(nameId, element);
-		return true;
-	}
-
-	private void addPartialMatch(final PsiElement _element, String nameId)
-	{
-		if(myAddOnlyCompleteMatches)
-		{
-			return;
-		}
-		if(!doAdd(_element, nameId, true))
-		{
-			return;
-		}
-
-		PsiElement element = _element;
-
-		final Map<String, Object> targetNamesMap;
-		final JSLookupUtil.LookupPriority priority;
-
-		if(isFromRelevantFileOrDirectory())
-		{
-			priority = hasSomeSmartnessAvailable ? JSLookupUtil.LookupPriority.HIGHER : JSLookupUtil.LookupPriority.HIGHEST;
-			targetNamesMap = myPartialMatchNamesMapFromSameFile;
-		}
-		else
-		{
-			priority = hasSomeSmartnessAvailable ? JSLookupUtil.LookupPriority.NORMAL : JSLookupUtil.LookupPriority.HIGH;
-
-			targetNamesMap = myPartialMatchNamesMap;
-		}
-
-		final Object o = addLookupValue(element, nameId, priority);
-
-		if(o != null)
-		{
-			targetNamesMap.put(nameId, o);
-		}
-		else
-		{
-			myNames2CandidatesMap.remove(nameId);
-		}
-	}
+public class VariantsProcessor extends BaseJSSymbolProcessor {
+    private Map<String, Object> myNames2CandidatesMap = new HashMap<>();
+    private int myThisFileNameListCount;
+    private List<Object> myNamesList = new ArrayList<>();
+
+    private Map<String, Object> myPartialMatchNamesMap = new HashMap<>();
+    private Map<String, Object> myPartialMatchNamesMapFromSameFile = new HashMap<>();
+    //private Set<PsiFile> myTargetFiles;
+    private final boolean hasSomeSmartnessAvailable;
+    private boolean myProcessOnlyTypes;
+
+    private boolean myAddOnlyCompleteMatchesSet;
+
+    @NonNls
+    private static final String OBJECT_CLASS_NAME = "Object";
+
+    public VariantsProcessor(String[] nameIds, PsiFile targetFile, boolean skipDclsInTargetFile, PsiElement context) {
+        super(targetFile.getOriginalFile(), skipDclsInTargetFile, context, nameIds);
+        nameIds = myContextNameIds;
+
+        boolean hasSomeInfoAvailable = nameIds != null && nameIds.length > 0;
+        final List<String[]> possibleNameComponents = new ArrayList<>(1);
+        myCurrentFile = targetFile.getOriginalFile();
+        //myTargetFiles = new HashSet<PsiFile>();
+
+        boolean allTypesResolved = false;
+        boolean doAddContextIds = true;
+
+        final JSClass jsClass = PsiTreeUtil.getParentOfType(context, JSClass.class);
+
+        if (context instanceof JSReferenceExpression) {
+            final JSReferenceExpression refExpr = (JSReferenceExpression)context;
+            JSExpression qualifier = refExpr.getQualifier();
+
+            if (qualifier != null) {
+                if (qualifier instanceof JSThisExpression || qualifier instanceof JSSuperExpression) {
+                    if (jsClass != null) {
+                        myAddOnlyCompleteMatches = myAddOnlyCompleteMatchesSet = true;
+                        updateCanUseOnlyCompleteMatches(jsClass);
+                        doAddContextIds = false;
+                    }
+                    else if (JSResolveUtil.getTypeFromTagNameInMxml(myCurrentFile.getContext()) != null) {
+                        myAddOnlyCompleteMatches = myAddOnlyCompleteMatchesSet = true;
+                    }
+                }
+
+                final CompletionTypeProcessor processor = new CompletionTypeProcessor(possibleNameComponents);
+                doEvalForExpr(getOriginalQualifier(qualifier), myTargetFile, processor);
+                allTypesResolved = processor.getAllTypesResolved();
+            }
+            else {
+                final PsiElement parent = refExpr.getParent();
+
+                if (parent instanceof JavaScriptImportStatementBase) {
+                    myProcessOnlyTypes = true;
+                }
+                else if (JSResolveUtil.isExprInTypeContext(refExpr)
+                    || (ecmal4 && JSResolveUtil.isInPlaceWhereTypeCanBeDuringCompletion(refExpr))) {
+                    myAddOnlyCompleteMatches = myAddOnlyCompleteMatchesSet = true;
+                    myProcessOnlyTypes = true;
+                    allTypesResolved = true;
+                    addPackageScope(possibleNameComponents, jsClass, refExpr);
+                }
+                else if (jsClass != null) {
+                    myAddOnlyCompleteMatches = myAddOnlyCompleteMatchesSet = true;
+                    updateCanUseOnlyCompleteMatches(jsClass);
+                }
+            }
+        }
+
+        if (hasSomeInfoAvailable && (!allTypesResolved || (!possibleNameComponents.isEmpty()
+            && possibleNameComponents.get(0).length == 1
+            && "Function".equals(possibleNameComponents.get(0)[0])))) {
+            if (doAddContextIds) {
+                possibleNameComponents.add(nameIds);
+            }
+
+            doIterateTypeHierarchy(
+                nameIds,
+                new HierarchyProcessor() {
+                    @Override
+                    public boolean processClass(final JSClass clazz) {
+                        updateCanUseOnlyCompleteMatchesFromString(clazz.getQualifiedName(), clazz, clazz);
+                        buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameComponents);
+                        return true;
+                    }
+                }
+            );
+        }
+
+        String[][] nameIdsArray = new String[possibleNameComponents.size()][];
+        possibleNameComponents.toArray(nameIdsArray);
+
+        hasSomeSmartnessAvailable = nameIdsArray != null && nameIdsArray.length > 0;
+    }
+
+    private void updateCanUseOnlyCompleteMatchesFromString(final String qName, Object source, PsiElement clazz) {
+        final boolean wasSet = myAddOnlyCompleteMatchesSet;
+
+        if (myAddOnlyCompleteMatches || !wasSet) {
+            myAddOnlyCompleteMatchesSet = true;
+            if (qName.equals("*")
+                || (qName.equals(OBJECT_CLASS_NAME) && (myIteratedTypeName == null || qName.equals(myIteratedTypeName)
+                // skip adding complete matches when context name is qualifier
+                || (myContextNameIds != null && myContextNameIds.length > 0
+                && myIteratedTypeName.equals(myContextNameIds[myContextNameIds.length - 1])
+                && myContext instanceof JSReferenceExpression referenceExpression
+                && referenceExpression.getQualifier() instanceof JSReferenceExpression))) /* something explicitly marked as Object*/
+                || (qName.equals(FUNCTION_TYPE_NAME) && isObjectSourceThatDoesNotGiveExactKnowledgeAboutFunctionType(source))) {
+                myAddOnlyCompleteMatches = false;
+            }
+            else {
+                if (clazz == null) {
+                    clazz = JSResolveUtil.findClassByQName(qName, myContext);
+                }
+
+                if (clazz instanceof JSClass jsClass) {
+                    if (!wasSet) {
+                        myAddOnlyCompleteMatches = true;
+                    }
+
+                    final JSAttributeList attributeList = jsClass.getAttributeList();
+                    if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)
+                        && !OBJECT_CLASS_NAME.equals(qName)) {
+                        myAddOnlyCompleteMatches = false;
+                    }
+                }
+            }
+        }
+    }
+
+    private static boolean isObjectSourceThatDoesNotGiveExactKnowledgeAboutFunctionType(final Object source) {
+        return source instanceof JSFunctionExpression;
+    }
+
+    private void updateCanUseOnlyCompleteMatches(final JSClass jsClass) {
+        final JSAttributeList attributeList = jsClass != null ? jsClass.getAttributeList() : null;
+        if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
+            myAddOnlyCompleteMatches = false;
+        }
+    }
+
+    public void addLocalResults(final List<PsiElement> results) {
+        if (results == null) {
+            return;
+        }
+
+        final Set<String> processedCandidateNames = new HashSet<String>(results.size());
+
+        for (PsiElement e : results) {
+            if (e instanceof PsiNamedElement namedElement) {
+                String name = ResolveProcessor.getName(namedElement);
+                String qName = namedElement instanceof JSQualifiedNamedElement qualifiedNamedElement
+                    ? qualifiedNamedElement.getQualifiedName()
+                    : name;
+
+                if (processedCandidateNames.contains(qName)) {
+                    continue;
+                }
+                processedCandidateNames.add(qName);
+
+                addCompleteMatch(namedElement, name, false);
+            }
+        }
+    }
+
+    class CompletionTypeProcessor implements TypeProcessor {
+        final List<String[]> possibleNameIds;
+        private PsiElement myUnknownElement;
+
+        CompletionTypeProcessor(List<String[]> _possibleNameIds) {
+            possibleNameIds = _possibleNameIds;
+        }
+
+        @Override
+        public void process(String type, final EvaluateContext context, final PsiElement source) {
+            if (context.visitedTypes.contains(type)) {
+                return;
+            }
+            context.visitedTypes.add(type);
+            if (JSTypeEvaluateManager.isArrayType(type)) {
+                type = ARRAY_TYPE_NAME;
+            }
+            updateCanUseOnlyCompleteMatchesFromString(type, source, null);
+            type = buildIndexListFromQNameAndCorrectQName(type, source, possibleNameIds);
+            addSupers(type, possibleNameIds, context);
+        }
+
+        @Override
+        public Set<JavaScriptFeature> getFeatures() {
+            return myFeatures;
+        }
+
+        @Override
+        public boolean ecma() {
+            return ecmal4;
+        }
+
+        @Override
+        public void setUnknownElement(PsiElement element) {
+            myUnknownElement = element;
+        }
+
+        public boolean getAllTypesResolved() {
+            return myUnknownElement == null;
+        }
+    }
+
+    private void addSupers(final String type, final List<String[]> possibleNameIds, final EvaluateContext context) {
+        final String iteratedType = myIteratedTypeName;
+        myIteratedTypeName = type;
+        doIterateHierarchy(
+            type,
+            new HierarchyProcessor() {
+                @Override
+                public boolean processClass(final JSClass clazz) {
+                    String qname = clazz.getQualifiedName();
+                    if (!context.visitedTypes.contains(qname)) {
+                        context.visitedTypes.add(qname);
+                        updateCanUseOnlyCompleteMatchesFromString(qname, clazz, clazz);
+                        buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
+                    }
+                    return true;
+                }
+            }
+        );
+
+        myIteratedTypeName = iteratedType;
+    }
+
+    public Object[] getResult() {
+        List<Object> results = new ArrayList<>();
+        for (Object o : myNamesList) {
+            results.add(o);
+        }
+
+        for (Object o : myPartialMatchNamesMapFromSameFile.values()) {
+            results.add(o);
+        }
+
+        for (Object o : myPartialMatchNamesMap.values()) {
+            results.add(o);
+        }
+
+        return ArrayUtil.toObjectArray(results);
+    }
+
+    @Override
+    public boolean execute(PsiElement element, ResolveState state) {
+        if (element instanceof JSNamedElement namedElement) {
+            addCompleteMatch(namedElement, namedElement.getName());
+        }
+
+        return true;
+    }
+
+    private void doAdd(final String nameId, final PsiElement element) {
+        final String name = nameId != null ? nameId : null;
+
+        boolean seemsToBePrivateSymbol =
+            name != null && name.length() > 0 && name.charAt(0) == '_' && name.length() > 1 && name.charAt(1) != '_';
+        boolean privateSymbol = seemsToBePrivateSymbol;
+
+        if (seemsToBePrivateSymbol) {
+            if (!(myTargetFile instanceof JSFile)) {
+                // no interest in html, jsp for private symbols
+                return;
+            }
+
+            if (myContextNameIds == null || myContextNameIds.length == 0) {
+                privateSymbol = false;
+            }
+        }
+
+
+        MatchType matchType = MatchType.COMPLETE;
+
+        if (matchType == MatchType.COMPLETE && !ecmal4 && myProcessOnlyTypes) {
+            if (((name != null && name.length() > 0 && Character.isLowerCase(name.charAt(0))) || seemsToBePrivateSymbol)) {
+                matchType = MatchType.PARTIAL;
+            }
+        }
+
+        if (matchType == MatchType.PARTIAL || (privateSymbol && matchType == MatchType.COMPLETE)) {
+            addPartialMatch(element, nameId);
+
+        }
+        else if (matchType == MatchType.COMPLETE) {
+            addCompleteMatch(element, nameId);
+        }
+    }
+
+    @RequiredReadAction
+    private LookupElement addLookupValue(PsiElement element, final String name, JSLookupUtil.LookupPriority priority) {
+        return JSLookupUtil.createLookupItem(element, name, priority);
+    }
+
+    @Override
+    protected String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression) {
+        return JSResolveUtil.buildNameIdsForQualifier(JSResolveUtil.getRealRefExprQualifier(jsReferenceExpression));
+    }
+
+    @Override
+    protected boolean isFromRelevantFileOrDirectory() {
+        return super.isFromRelevantFileOrDirectory(); // || myTargetFiles.contains(myCurrentFile);
+    }
+
+    private void addCompleteMatch(final PsiElement _element, String nameId) {
+        addCompleteMatch(_element, nameId, true);
+    }
+
+    private void addCompleteMatch(final PsiElement _element, String nameId, boolean doFilterting) {
+        if (!doAdd(_element, nameId, doFilterting)) {
+            boolean removedFromPartialNames = false;
+            final Object el = myNames2CandidatesMap.get(nameId);
+
+            if (el != null) {
+                removedFromPartialNames =
+                    myPartialMatchNamesMapFromSameFile.remove(nameId) != null || myPartialMatchNamesMap.remove(nameId) != null;
+            }
+            if (!removedFromPartialNames) {
+                return;
+            }
+        }
+
+        PsiElement element = _element;
+
+        if (isFromRelevantFileOrDirectory() && !myAddOnlyCompleteMatches) {
+            final Object o = addLookupValue(element, nameId, JSLookupUtil.LookupPriority.HIGHEST);
+            if (o != null) {
+                myNamesList.add(myThisFileNameListCount++, o);
+            }
+            else {
+                myNames2CandidatesMap.remove(nameId);
+            }
+        }
+        else {
+            final Object o = addLookupValue(element, nameId, JSLookupUtil.LookupPriority.HIGH);
+            if (o != null) {
+                myNamesList.add(o);
+            }
+            else {
+                myNames2CandidatesMap.remove(nameId);
+            }
+        }
+    }
+
+    private boolean doAdd(Object element, String nameId, boolean doFilterting) {
+        if (nameId == null || (doFilterting && myNames2CandidatesMap.get(nameId) != null)) {
+            return false;
+        }
+        myNames2CandidatesMap.put(nameId, element);
+        return true;
+    }
+
+    private void addPartialMatch(final PsiElement _element, String nameId) {
+        if (myAddOnlyCompleteMatches) {
+            return;
+        }
+        if (!doAdd(_element, nameId, true)) {
+            return;
+        }
+
+        PsiElement element = _element;
+
+        final Map<String, Object> targetNamesMap;
+        final JSLookupUtil.LookupPriority priority;
+
+        if (isFromRelevantFileOrDirectory()) {
+            priority = hasSomeSmartnessAvailable ? JSLookupUtil.LookupPriority.HIGHER : JSLookupUtil.LookupPriority.HIGHEST;
+            targetNamesMap = myPartialMatchNamesMapFromSameFile;
+        }
+        else {
+            priority = hasSomeSmartnessAvailable ? JSLookupUtil.LookupPriority.NORMAL : JSLookupUtil.LookupPriority.HIGH;
+
+            targetNamesMap = myPartialMatchNamesMap;
+        }
+
+        final Object o = addLookupValue(element, nameId, priority);
+
+        if (o != null) {
+            targetNamesMap.put(nameId, o);
+        }
+        else {
+            myNames2CandidatesMap.remove(nameId);
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
index 10663648..1dd11715 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
@@ -31,6 +31,7 @@
 import consulo.xml.psi.xml.XmlAttributeValue;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -38,374 +39,319 @@
 /**
  * @author Maxim.Mossienko
  */
-public class WalkUpResolveProcessor extends BaseJSSymbolProcessor
-{
-	protected String myReferenceName;
-	protected String[][] myContextIds;
-	private int myFilePartialResultsCount;
-	private List<ResolveResult> myPartialMatchResults;
-	private int myFileCompleteResultsCount;
-	private List<ResolveResult> myCompleteMatchResults;
-
-	private int myBestMatchedContextId = -1;
-	private boolean myCanHaveValidPartialMatches;
-	private boolean embeddedToHtmlAttr;
-	private boolean myInNewExpression;
-
-	public WalkUpResolveProcessor(String referenceName, String[] contextIds, PsiFile targetFile, boolean skipDclsInTargetFile, PsiElement context)
-	{
-		super(targetFile, skipDclsInTargetFile, context, contextIds);
-		contextIds = myContextNameIds;
-
-		myReferenceName = referenceName;
-
-		if(context instanceof JSReferenceExpression)
-		{
-			myInNewExpression = context.getParent() instanceof JSNewExpression;
-
-			final List<String[]> possibleNameIds = new ArrayList<String[]>(1);
-			final JSReferenceExpression refExpr = (JSReferenceExpression) context;
-			final JSExpression originalQualifier = refExpr.getQualifier();
-			final JSExpression qualifier = JSResolveUtil.getRealRefExprQualifier(refExpr);
-
-			final JSClass jsClass = PsiTreeUtil.getParentOfType(context, JSClass.class); // get rid of it!
-			final JSElement file = PsiTreeUtil.getParentOfType(context, JSEmbeddedContentImpl.class, JSFile.class);
-
-			if((file instanceof JSFile && file.getContext() instanceof XmlAttributeValue) || file instanceof JSEmbeddedContentImpl)
-			{
-				embeddedToHtmlAttr = true;
-			}
-
-			boolean haveNotEncounteredDynamics = true;
-			if(qualifier instanceof JSThisExpression ||
-					qualifier instanceof JSSuperExpression ||
-					qualifier == null ||
-					originalQualifier == null)
-			{
-				myDefinitelyNonglobalReference = false;
-
-				if(qualifier instanceof JSThisExpression)
-				{
-					JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(qualifier);
-					final String contextQualifierText = resolver.getQualifierAsString();
-					final PsiElement clazz = contextQualifierText != null ? JSClassImpl.findClassFromNamespace(contextQualifierText, context) : null;
-
-					if(clazz instanceof JSClass)
-					{
-						JSAttributeList attrList;
-
-						if((attrList = ((JSClass) clazz).getAttributeList()) != null)
-						{
-							final boolean clazzIsDynamic = attrList.hasModifier(JSAttributeList.ModifierType.DYNAMIC);
-							if(clazzIsDynamic)
-							{
-								haveNotEncounteredDynamics = false;
-							}
-						}
-
-						buildIndexListFromQNameAndCorrectQName(contextQualifierText, clazz, possibleNameIds);
-					}
-					else
-					{
-						possibleNameIds.add(contextIds);
-					}
-				}
-
-				if(qualifier == null)
-				{
-					final JSImportedElementResolveResult expression = JSImportHandlingUtil.resolveTypeNameUsingImports(refExpr);
-
-					if(expression != null)
-					{
-						possibleNameIds.add(JSResolveUtil.buildNameIdsForQualifier(JSResolveUtil.getRealRefExprQualifierFromResult(refExpr, expression)));
-					}
-					else
-					{
-						addPackageScope(possibleNameIds, jsClass, refExpr);
-					}
-				}
-				else if(originalQualifier == null)
-				{
-					if(refExpr.getNode().getFirstChildNode().getElementType() == JSTokenTypes.AT)
-					{
-						haveNotEncounteredDynamics = false;
-					}
-					possibleNameIds.add(contextIds);
-				}
-
-				if(contextIds != null)
-				{
-					iterateContextIds(contextIds, possibleNameIds, true);
-				}
-				if(originalQualifier == null)
-				{
-					possibleNameIds.add(ArrayUtil.EMPTY_STRING_ARRAY);
-				}
-			}
-			else if(!ecmal4)
-			{
-				VariantsProcessor.doEvalForExpr(qualifier, myTargetFile, new VariantsProcessor.TypeProcessor()
-				{
-					@Override
-					public Set<JavaScriptFeature> getFeatures()
-					{
-						return myFeatures;
-					}
-
-					@Override
-					public void process(@Nonnull String type, @Nonnull final EvaluateContext context, final PsiElement source)
-					{
-						if(context.visitedTypes.contains(type))
-						{
-							return;
-						}
-						context.visitedTypes.add(type);
-
-						if("window".equals(type))
-						{
-							possibleNameIds.add(new String[0]);
-							return;
-						}
-						type = buildIndexListFromQNameAndCorrectQName(type, source, possibleNameIds);
-
-						doIterateHierarchy(type, new HierarchyProcessor()
-						{
-							@Override
-							public boolean processClass(final JSClass clazz)
-							{
-								buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
-								return true;
-							}
-						});
-					}
-
-					@Override
-					public void setUnknownElement(@Nonnull final PsiElement element)
-					{
-					}
-
-					@Override
-					public boolean ecma()
-					{
-						return ecmal4;
-					}
-				});
-			}
-			if(possibleNameIds.size() != 0)
-			{
-				myContextIds = possibleNameIds.toArray(new String[possibleNameIds.size()][]);
-				myAddOnlyCompleteMatches = haveNotEncounteredDynamics;
-				myCanHaveValidPartialMatches = !ecmal4 && !myDefinitelyGlobalReference || !haveNotEncounteredDynamics;
-			}
-			else if(myContextIds == null && contextIds != null)
-			{
-				myContextIds = new String[][]{contextIds};
-			}
-		}
-		else if(contextIds != null)
-		{
-			final List<String[]> possibleNameIds = new ArrayList<String[]>(1);
-			possibleNameIds.add(contextIds);
-			iterateContextIds(contextIds, possibleNameIds, false);
-			myContextIds = possibleNameIds.toArray(new String[possibleNameIds.size()][]);
-		}
-	}
-
-	private void iterateContextIds(final String[] contextIds, final List<String[]> possibleNameIds, final boolean allowObject)
-	{
-		doIterateTypeHierarchy(contextIds, new HierarchyProcessor()
-		{
-			@Override
-			public boolean processClass(final JSClass clazz)
-			{
-				buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
-				return true;
-			}
-		});
-	}
-
-	protected MatchType isAcceptableQualifiedItem(final String nameId, final PsiElement element)
-	{
-		final boolean partialMatch = myReferenceName.equals(nameId);
-
-		if(partialMatch)
-		{
-			int i = -1;
-
-			if(myContextIds != null)
-			{
-				int maxContextScanCount = myBestMatchedContextId == -1 ? myContextIds.length : myBestMatchedContextId + 1;
-
-				for(int currentContextIndex = 0; currentContextIndex < maxContextScanCount; ++currentContextIndex)
-				{
-					final String[] contextIds = myContextIds[currentContextIndex];
-
-					if(i < 0)
-					{
-						if(myBestMatchedContextId == -1)
-						{
-							myBestMatchedContextId = currentContextIndex;
-						}
-						else if(currentContextIndex < myBestMatchedContextId)
-						{
-							myBestMatchedContextId = currentContextIndex;
-							myCompleteMatchResults = null;
-							myFileCompleteResultsCount = 0;
-						}
-						return MatchType.COMPLETE;
-					}
-				}
-			}
-
-			if(i < 0)
-			{
-				return MatchType.COMPLETE;
-			}
-		}
-
-		return partialMatch ? MatchType.PARTIAL : MatchType.NOMATCH;
-	}
-
-	private void doQualifiedCheck(String nameId, final PsiElement element)
-	{
-		final MatchType matchType = isAcceptableQualifiedItem(nameId, element);
-
-		if(matchType == MatchType.PARTIAL)
-		{
-			addPartialResult(element);
-		}
-		else if(matchType == MatchType.COMPLETE)
-		{
-			addCompleteResult(element);
-		}
-	}
-
-	private void addCompleteResult(PsiElement element)
-	{
-		final JSResolveUtil.MyResolveResult o = new JSResolveUtil.MyResolveResult(element);
-		addCompleteResult(o);
-	}
-
-	private void addCompleteResult(ResolveResult o)
-	{
-		if(myCompleteMatchResults == null)
-		{
-			myCompleteMatchResults = new ArrayList<ResolveResult>(1);
-		}
-		if(isFromRelevantFileOrDirectory())
-		{
-			myCompleteMatchResults.add(myFileCompleteResultsCount++, o);
-		}
-		else
-		{
-			myCompleteMatchResults.add(o);
-		}
-	}
-
-	private void addPartialResult(PsiElement element)
-	{
-		if(myPartialMatchResults == null)
-		{
-			myPartialMatchResults = new ArrayList<ResolveResult>(1);
-		}
-		final JSResolveUtil.MyResolveResult o = new JSResolveUtil.MyResolveResult(element, !myAddOnlyCompleteMatches);
-
-		if(isFromRelevantFileOrDirectory())
-		{
-			myPartialMatchResults.add(myFilePartialResultsCount++, o);
-		}
-		else
-		{
-			myPartialMatchResults.add(o);
-		}
-	}
-
-	protected boolean shouldProcessVariable(final String nameId, JSNamedElement var)
-	{
-		return myReferenceName.equals(nameId) && !myDefinitelyNonglobalReference;
-	}
-
-	public ResolveResult[] getResults()
-	{
-		int resultCount = 0;
-		if(myCompleteMatchResults != null)
-		{
-			resultCount += myCompleteMatchResults.size();
-		}
-		final boolean addPartialResults = !myAddOnlyCompleteMatches || (resultCount == 0 && myAllowPartialResults);
-		if(myPartialMatchResults != null && addPartialResults)
-		{
-			resultCount += myPartialMatchResults.size();
-		}
-
-		final ResolveResult[] result = resultCount != 0 ? new ResolveResult[resultCount] : ResolveResult.EMPTY_ARRAY;
-
-		if(myCompleteMatchResults != null)
-		{
-			for(int i = 0; i < myCompleteMatchResults.size(); ++i)
-			{
-				result[i] = myCompleteMatchResults.get(i);
-				assert result[i] != null;
-			}
-		}
-
-		if(myPartialMatchResults != null && addPartialResults)
-		{
-			int offset = myCompleteMatchResults != null ? myCompleteMatchResults.size() : 0;
-			for(int i = 0; i < myPartialMatchResults.size(); ++i)
-			{
-				final JSResolveUtil.MyResolveResult resolveResult = (JSResolveUtil.MyResolveResult) myPartialMatchResults.get(i);
-
-				assert resolveResult != null;
-				result[offset + i] = resolveResult;
-			}
-		}
-
-		return result;
-	}
-
-	@Override
-	protected String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression)
-	{
-		String[] contextNameIds = null;
-		JSExpression qualifier = JSResolveUtil.getRealRefExprQualifier(jsReferenceExpression);
-
-		if(qualifier instanceof JSReferenceExpression)
-		{
-			contextNameIds = JSSymbolUtil.buildNameIndexArray(qualifier);
-		}
-		else if(qualifier instanceof JSThisExpression || qualifier instanceof JSSuperExpression)
-		{
-			contextNameIds = JSResolveUtil.buildNameIdsForQualifier(qualifier);
-		}
-
-		return contextNameIds;
-	}
-
-	public void addLocalResults(final ResolveResult results[])
-	{
-		if(results == null)
-		{
-			return;
-		}
-		for(ResolveResult e : results)
-		{
-			addCompleteResult(e);
-		}
-	}
-
-	public int getCompleteResultCount()
-	{
-		return myCompleteMatchResults == null ? 0 : myCompleteMatchResults.size();
-	}
-
-	@Override
-	public boolean execute(final PsiElement element, final ResolveState state)
-	{
-		if((element instanceof JSNamedElement && myReferenceName.equals(((JSNamedElement) element).getName())) || element == myContext)
-		{
-			addCompleteResult(element);
-		}
-		return true;
-	}
+public class WalkUpResolveProcessor extends BaseJSSymbolProcessor {
+    protected String myReferenceName;
+    protected String[][] myContextIds;
+    private int myFilePartialResultsCount;
+    private List<ResolveResult> myPartialMatchResults;
+    private int myFileCompleteResultsCount;
+    private List<ResolveResult> myCompleteMatchResults;
+
+    private int myBestMatchedContextId = -1;
+    private boolean myCanHaveValidPartialMatches;
+    private boolean embeddedToHtmlAttr;
+    private boolean myInNewExpression;
+
+    public WalkUpResolveProcessor(
+        String referenceName,
+        String[] contextIds,
+        PsiFile targetFile,
+        boolean skipDclsInTargetFile,
+        PsiElement context
+    ) {
+        super(targetFile, skipDclsInTargetFile, context, contextIds);
+        contextIds = myContextNameIds;
+
+        myReferenceName = referenceName;
+
+        if (context instanceof JSReferenceExpression refExpr) {
+            myInNewExpression = context.getParent() instanceof JSNewExpression;
+
+            final List<String[]> possibleNameIds = new ArrayList<>(1);
+            final JSExpression originalQualifier = refExpr.getQualifier();
+            final JSExpression qualifier = JSResolveUtil.getRealRefExprQualifier(refExpr);
+
+            final JSClass jsClass = PsiTreeUtil.getParentOfType(context, JSClass.class); // get rid of it!
+            final JSElement file = PsiTreeUtil.getParentOfType(context, JSEmbeddedContentImpl.class, JSFile.class);
+
+            if ((file instanceof JSFile && file.getContext() instanceof XmlAttributeValue) || file instanceof JSEmbeddedContentImpl) {
+                embeddedToHtmlAttr = true;
+            }
+
+            boolean haveNotEncounteredDynamics = true;
+            if (qualifier instanceof JSThisExpression || qualifier instanceof JSSuperExpression
+                || qualifier == null || originalQualifier == null) {
+                myDefinitelyNonglobalReference = false;
+
+                if (qualifier instanceof JSThisExpression) {
+                    JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(qualifier);
+                    final String contextQualifierText = resolver.getQualifierAsString();
+                    final PsiElement clazz = contextQualifierText != null
+                        ? JSClassImpl.findClassFromNamespace(contextQualifierText, context)
+                        : null;
+
+                    if (clazz instanceof JSClass jsClass1) {
+                        JSAttributeList attrList = jsClass1.getAttributeList();
+
+                        if (attrList != null) {
+                            final boolean clazzIsDynamic = attrList.hasModifier(JSAttributeList.ModifierType.DYNAMIC);
+                            if (clazzIsDynamic) {
+                                haveNotEncounteredDynamics = false;
+                            }
+                        }
+
+                        buildIndexListFromQNameAndCorrectQName(contextQualifierText, clazz, possibleNameIds);
+                    }
+                    else {
+                        possibleNameIds.add(contextIds);
+                    }
+                }
+
+                if (qualifier == null) {
+                    final JSImportedElementResolveResult expression = JSImportHandlingUtil.resolveTypeNameUsingImports(refExpr);
+
+                    if (expression != null) {
+                        possibleNameIds.add(JSResolveUtil.buildNameIdsForQualifier(JSResolveUtil.getRealRefExprQualifierFromResult(
+                            refExpr,
+                            expression
+                        )));
+                    }
+                    else {
+                        addPackageScope(possibleNameIds, jsClass, refExpr);
+                    }
+                }
+                else if (originalQualifier == null) {
+                    if (refExpr.getNode().getFirstChildNode().getElementType() == JSTokenTypes.AT) {
+                        haveNotEncounteredDynamics = false;
+                    }
+                    possibleNameIds.add(contextIds);
+                }
+
+                if (contextIds != null) {
+                    iterateContextIds(contextIds, possibleNameIds, true);
+                }
+                if (originalQualifier == null) {
+                    possibleNameIds.add(ArrayUtil.EMPTY_STRING_ARRAY);
+                }
+            }
+            else if (!ecmal4) {
+                VariantsProcessor.doEvalForExpr(
+                    qualifier,
+                    myTargetFile,
+                    new VariantsProcessor.TypeProcessor() {
+                        @Override
+                        public Set<JavaScriptFeature> getFeatures() {
+                            return myFeatures;
+                        }
+
+                        @Override
+                        public void process(@Nonnull String type, @Nonnull final EvaluateContext context, final PsiElement source) {
+                            if (context.visitedTypes.contains(type)) {
+                                return;
+                            }
+                            context.visitedTypes.add(type);
+
+                            if ("window".equals(type)) {
+                                possibleNameIds.add(new String[0]);
+                                return;
+                            }
+                            type = buildIndexListFromQNameAndCorrectQName(type, source, possibleNameIds);
+
+                            doIterateHierarchy(type, new HierarchyProcessor() {
+                                @Override
+                                public boolean processClass(final JSClass clazz) {
+                                    buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
+                                    return true;
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void setUnknownElement(@Nonnull final PsiElement element) {
+                        }
+
+                        @Override
+                        public boolean ecma() {
+                            return ecmal4;
+                        }
+                    }
+                );
+            }
+            if (possibleNameIds.size() != 0) {
+                myContextIds = possibleNameIds.toArray(new String[possibleNameIds.size()][]);
+                myAddOnlyCompleteMatches = haveNotEncounteredDynamics;
+                myCanHaveValidPartialMatches = !ecmal4 && !myDefinitelyGlobalReference || !haveNotEncounteredDynamics;
+            }
+            else if (myContextIds == null && contextIds != null) {
+                myContextIds = new String[][]{contextIds};
+            }
+        }
+        else if (contextIds != null) {
+            final List<String[]> possibleNameIds = new ArrayList<>(1);
+            possibleNameIds.add(contextIds);
+            iterateContextIds(contextIds, possibleNameIds, false);
+            myContextIds = possibleNameIds.toArray(new String[possibleNameIds.size()][]);
+        }
+    }
+
+    private void iterateContextIds(final String[] contextIds, final List<String[]> possibleNameIds, final boolean allowObject) {
+        doIterateTypeHierarchy(
+            contextIds,
+            new HierarchyProcessor() {
+                @Override
+                public boolean processClass(final JSClass clazz) {
+                    buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
+                    return true;
+                }
+            }
+        );
+    }
+
+    protected MatchType isAcceptableQualifiedItem(final String nameId, final PsiElement element) {
+        final boolean partialMatch = myReferenceName.equals(nameId);
+
+        if (partialMatch) {
+            int i = -1;
+
+            if (myContextIds != null) {
+                int maxContextScanCount = myBestMatchedContextId == -1 ? myContextIds.length : myBestMatchedContextId + 1;
+
+                for (int currentContextIndex = 0; currentContextIndex < maxContextScanCount; ++currentContextIndex) {
+                    final String[] contextIds = myContextIds[currentContextIndex];
+
+                    if (i < 0) {
+                        if (myBestMatchedContextId == -1) {
+                            myBestMatchedContextId = currentContextIndex;
+                        }
+                        else if (currentContextIndex < myBestMatchedContextId) {
+                            myBestMatchedContextId = currentContextIndex;
+                            myCompleteMatchResults = null;
+                            myFileCompleteResultsCount = 0;
+                        }
+                        return MatchType.COMPLETE;
+                    }
+                }
+            }
+
+            if (i < 0) {
+                return MatchType.COMPLETE;
+            }
+        }
+
+        return partialMatch ? MatchType.PARTIAL : MatchType.NOMATCH;
+    }
+
+    private void doQualifiedCheck(String nameId, final PsiElement element) {
+        final MatchType matchType = isAcceptableQualifiedItem(nameId, element);
+
+        if (matchType == MatchType.PARTIAL) {
+            addPartialResult(element);
+        }
+        else if (matchType == MatchType.COMPLETE) {
+            addCompleteResult(element);
+        }
+    }
+
+    private void addCompleteResult(PsiElement element) {
+        final JSResolveUtil.MyResolveResult o = new JSResolveUtil.MyResolveResult(element);
+        addCompleteResult(o);
+    }
+
+    private void addCompleteResult(ResolveResult o) {
+        if (myCompleteMatchResults == null) {
+            myCompleteMatchResults = new ArrayList<ResolveResult>(1);
+        }
+        if (isFromRelevantFileOrDirectory()) {
+            myCompleteMatchResults.add(myFileCompleteResultsCount++, o);
+        }
+        else {
+            myCompleteMatchResults.add(o);
+        }
+    }
+
+    private void addPartialResult(PsiElement element) {
+        if (myPartialMatchResults == null) {
+            myPartialMatchResults = new ArrayList<>(1);
+        }
+        final JSResolveUtil.MyResolveResult o = new JSResolveUtil.MyResolveResult(element, !myAddOnlyCompleteMatches);
+
+        if (isFromRelevantFileOrDirectory()) {
+            myPartialMatchResults.add(myFilePartialResultsCount++, o);
+        }
+        else {
+            myPartialMatchResults.add(o);
+        }
+    }
+
+    protected boolean shouldProcessVariable(final String nameId, JSNamedElement var) {
+        return myReferenceName.equals(nameId) && !myDefinitelyNonglobalReference;
+    }
+
+    public ResolveResult[] getResults() {
+        int resultCount = 0;
+        if (myCompleteMatchResults != null) {
+            resultCount += myCompleteMatchResults.size();
+        }
+        final boolean addPartialResults = !myAddOnlyCompleteMatches || (resultCount == 0 && myAllowPartialResults);
+        if (myPartialMatchResults != null && addPartialResults) {
+            resultCount += myPartialMatchResults.size();
+        }
+
+        final ResolveResult[] result = resultCount != 0 ? new ResolveResult[resultCount] : ResolveResult.EMPTY_ARRAY;
+
+        if (myCompleteMatchResults != null) {
+            for (int i = 0; i < myCompleteMatchResults.size(); ++i) {
+                result[i] = myCompleteMatchResults.get(i);
+                assert result[i] != null;
+            }
+        }
+
+        if (myPartialMatchResults != null && addPartialResults) {
+            int offset = myCompleteMatchResults != null ? myCompleteMatchResults.size() : 0;
+            for (int i = 0; i < myPartialMatchResults.size(); ++i) {
+                final JSResolveUtil.MyResolveResult resolveResult = (JSResolveUtil.MyResolveResult)myPartialMatchResults.get(i);
+
+                assert resolveResult != null;
+                result[offset + i] = resolveResult;
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    protected String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression) {
+        String[] contextNameIds = null;
+        JSExpression qualifier = JSResolveUtil.getRealRefExprQualifier(jsReferenceExpression);
+
+        if (qualifier instanceof JSReferenceExpression) {
+            contextNameIds = JSSymbolUtil.buildNameIndexArray(qualifier);
+        }
+        else if (qualifier instanceof JSThisExpression || qualifier instanceof JSSuperExpression) {
+            contextNameIds = JSResolveUtil.buildNameIdsForQualifier(qualifier);
+        }
+
+        return contextNameIds;
+    }
+
+    public void addLocalResults(final ResolveResult results[]) {
+        if (results == null) {
+            return;
+        }
+        for (ResolveResult e : results) {
+            addCompleteResult(e);
+        }
+    }
+
+    public int getCompleteResultCount() {
+        return myCompleteMatchResults == null ? 0 : myCompleteMatchResults.size();
+    }
+
+    @Override
+    public boolean execute(final PsiElement element, final ResolveState state) {
+        if ((element instanceof JSNamedElement namedElement && myReferenceName.equals(namedElement.getName())) || element == myContext) {
+            addCompleteResult(element);
+        }
+        return true;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
index e4f2e7d9..e945d416 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
@@ -25,114 +25,95 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 11:29:19 PM
+ * Date: Mar 26, 2008
+ * Time: 11:29:19 PM
  */
-public class JSAttributeListStubImpl extends StubBase<JSAttributeList> implements JSAttributeListStub
-{
-	private static final int VISIBILITY_TAG_SHIFT = 0;
-	private static final int VISIBILITY_TAG_MASK = 0x3;
-	private static final int OVERRIDE_PROPERTY_SHIFT = 2;
-	private static final int STATIC_PROPERTY_SHIFT = 3;
-	private static final int DYNAMIC_PROPERTY_SHIFT = 4;
-	private static final int NATIVE_PROPERTY_SHIFT = 5;
-	private static final int FINAL_PROPERTY_SHIFT = 6;
-	private static final int VIRTUAL_PROPERTY_SHIFT = 7;
+public class JSAttributeListStubImpl extends StubBase<JSAttributeList> implements JSAttributeListStub {
+    private static final int VISIBILITY_TAG_SHIFT = 0;
+    private static final int VISIBILITY_TAG_MASK = 0x3;
+    private static final int OVERRIDE_PROPERTY_SHIFT = 2;
+    private static final int STATIC_PROPERTY_SHIFT = 3;
+    private static final int DYNAMIC_PROPERTY_SHIFT = 4;
+    private static final int NATIVE_PROPERTY_SHIFT = 5;
+    private static final int FINAL_PROPERTY_SHIFT = 6;
+    private static final int VIRTUAL_PROPERTY_SHIFT = 7;
 
-	private int myFlags;
-	private String myNamespace;
+    private int myFlags;
+    private String myNamespace;
 
-	public JSAttributeListStubImpl(String namespace, int flags, final StubElement parent, final IStubElementType elementType)
-	{
-		super(parent, elementType);
-		myNamespace = namespace;
-		myFlags = flags;
-	}
+    public JSAttributeListStubImpl(String namespace, int flags, final StubElement parent, final IStubElementType elementType) {
+        super(parent, elementType);
+        myNamespace = namespace;
+        myFlags = flags;
+    }
 
-	@Override
-	public JSAttributeList.AccessType getAccessType()
-	{
-		final int i = (myFlags >> VISIBILITY_TAG_SHIFT) & VISIBILITY_TAG_MASK;
-		return types[i];
-	}
+    @Override
+    public JSAttributeList.AccessType getAccessType() {
+        final int i = (myFlags >> VISIBILITY_TAG_SHIFT) & VISIBILITY_TAG_MASK;
+        return types[i];
+    }
 
-	private static final JSAttributeList.AccessType[] types = JSAttributeList.AccessType.values();
+    private static final JSAttributeList.AccessType[] types = JSAttributeList.AccessType.values();
 
-	@Override
-	public boolean hasModifier(final JSAttributeList.ModifierType modifier)
-	{
-		return ((myFlags >> getFlagShift(modifier)) & 0x1) != 0;
-	}
+    @Override
+    public boolean hasModifier(final JSAttributeList.ModifierType modifier) {
+        return ((myFlags >> getFlagShift(modifier)) & 0x1) != 0;
+    }
 
-	@Override
-	public String getNamespace()
-	{
-		return myNamespace;
-	}
+    @Override
+    public String getNamespace() {
+        return myNamespace;
+    }
 
-	@Override
-	public int getFlags()
-	{
-		return myFlags;
-	}
+    @Override
+    public int getFlags() {
+        return myFlags;
+    }
 
-	public static int getFlags(JSAttributeList attributeList)
-	{
-		final JSAttributeList.AccessType accessType = attributeList.getAccessType();
-		final int ord = accessType.ordinal();
+    public static int getFlags(JSAttributeList attributeList) {
+        final JSAttributeList.AccessType accessType = attributeList.getAccessType();
+        final int ord = accessType.ordinal();
 
-		int flags = (ord << VISIBILITY_TAG_SHIFT);
+        int flags = (ord << VISIBILITY_TAG_SHIFT);
 
-		for(JSAttributeList.ModifierType type : JSAttributeList.ModifierType.values())
-		{
-			flags = setFlag(flags, type, attributeList.hasModifier(type));
-		}
-		return flags;
-	}
+        for (JSAttributeList.ModifierType type : JSAttributeList.ModifierType.values()) {
+            flags = setFlag(flags, type, attributeList.hasModifier(type));
+        }
+        return flags;
+    }
 
-	private static int getFlagShift(final JSAttributeList.ModifierType modifier)
-	{
-		int shift = -1;
-		if(modifier == JSAttributeList.ModifierType.STATIC)
-		{
-			shift = STATIC_PROPERTY_SHIFT;
-		}
-		else if(modifier == JSAttributeList.ModifierType.DYNAMIC)
-		{
-			shift = DYNAMIC_PROPERTY_SHIFT;
-		}
-		else if(modifier == JSAttributeList.ModifierType.OVERRIDE)
-		{
-			shift = OVERRIDE_PROPERTY_SHIFT;
-		}
-		else if(modifier == JSAttributeList.ModifierType.NATIVE)
-		{
-			shift = NATIVE_PROPERTY_SHIFT;
-		}
-		else if(modifier == JSAttributeList.ModifierType.FINAL)
-		{
-			shift = FINAL_PROPERTY_SHIFT;
-		}
-		else if(modifier == JSAttributeList.ModifierType.VIRTUAL)
-		{
-			shift = VIRTUAL_PROPERTY_SHIFT;
-		}
-		if(shift == -1)
-		{
-			throw new IllegalArgumentException("Illegal modifier passed:" + modifier);
-		}
-		return shift;
-	}
+    private static int getFlagShift(final JSAttributeList.ModifierType modifier) {
+        int shift = -1;
+        if (modifier == JSAttributeList.ModifierType.STATIC) {
+            shift = STATIC_PROPERTY_SHIFT;
+        }
+        else if (modifier == JSAttributeList.ModifierType.DYNAMIC) {
+            shift = DYNAMIC_PROPERTY_SHIFT;
+        }
+        else if (modifier == JSAttributeList.ModifierType.OVERRIDE) {
+            shift = OVERRIDE_PROPERTY_SHIFT;
+        }
+        else if (modifier == JSAttributeList.ModifierType.NATIVE) {
+            shift = NATIVE_PROPERTY_SHIFT;
+        }
+        else if (modifier == JSAttributeList.ModifierType.FINAL) {
+            shift = FINAL_PROPERTY_SHIFT;
+        }
+        else if (modifier == JSAttributeList.ModifierType.VIRTUAL) {
+            shift = VIRTUAL_PROPERTY_SHIFT;
+        }
+        if (shift == -1) {
+            throw new IllegalArgumentException("Illegal modifier passed:" + modifier);
+        }
+        return shift;
+    }
 
-	private static int setFlag(int old, final JSAttributeList.ModifierType modifier, boolean value)
-	{
-		if(value)
-		{
-			return old | (1 << getFlagShift(modifier));
-		}
-		else
-		{
-			return old & ~(1 << getFlagShift(modifier));
-		}
-	}
+    private static int setFlag(int old, final JSAttributeList.ModifierType modifier, boolean value) {
+        if (value) {
+            return old | (1 << getFlagShift(modifier));
+        }
+        else {
+            return old & ~(1 << getFlagShift(modifier));
+        }
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
index 329afba5..546e426b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
@@ -24,22 +24,19 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 8:00:52 PM
+ * Date: Jun 6, 2008
+ * Time: 8:00:52 PM
  */
-public class JSAttributeNameValuePairStubImpl extends JSNamedObjectStubBase<JSAttributeNameValuePair> implements JSAttributeNameValuePairStub
-{
-	private String myValue;
+public class JSAttributeNameValuePairStubImpl extends JSNamedObjectStubBase<JSAttributeNameValuePair> implements JSAttributeNameValuePairStub {
+    private String myValue;
 
-	public JSAttributeNameValuePairStubImpl(String name, final String value, final StubElement parentStub)
-	{
-		super(name, 0, parentStub, JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR);
-		myValue = value;
-	}
+    public JSAttributeNameValuePairStubImpl(String name, final String value, final StubElement parentStub) {
+        super(name, 0, parentStub, JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR);
+        myValue = value;
+    }
 
-	@Override
-	public String getValue()
-	{
-		return myValue;
-	}
+    @Override
+    public String getValue() {
+        return myValue;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
index 3763b7bb..ae627430 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
@@ -24,13 +24,11 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 11:29:19 PM
+ * Date: Mar 26, 2008
+ * Time: 11:29:19 PM
  */
-public class JSAttributeStubImpl extends JSNamedObjectStubBase<JSAttribute> implements JSAttributeStub
-{
-	public JSAttributeStubImpl(final String name, int flags, final StubElement parentStub)
-	{
-		super(name, flags, parentStub, JSElementTypes.ATTRIBUTE);
-	}
+public class JSAttributeStubImpl extends JSNamedObjectStubBase<JSAttribute> implements JSAttributeStub {
+    public JSAttributeStubImpl(final String name, int flags, final StubElement parentStub) {
+        super(name, flags, parentStub, JSElementTypes.ATTRIBUTE);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
index 61adbf5a..60534e83 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
@@ -24,37 +24,34 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 7:11:48 PM
+ * Date: Mar 26, 2008
+ * Time: 7:11:48 PM
  */
-public class JSClassStubImpl extends JSQualifiedObjectStubBase<JSClass> implements JSClassStub
-{
-	public static final int INTERFACE_MASK = 1;
-	private static final int DEPRECATED_MASK = 4;
+public class JSClassStubImpl extends JSQualifiedObjectStubBase<JSClass> implements JSClassStub {
+    public static final int INTERFACE_MASK = 1;
+    private static final int DEPRECATED_MASK = 4;
 
-	public JSClassStubImpl(String name,
-			int flags,
-			String qName,
-			final StubElement parentStub,
-			final IStubElementType<JSClassStub, JSClass> elementType)
-	{
-		super(name, flags, qName, parentStub, elementType);
-	}
+    public JSClassStubImpl(
+        String name,
+        int flags,
+        String qName,
+        final StubElement parentStub,
+        final IStubElementType<JSClassStub, JSClass> elementType
+    ) {
+        super(name, flags, qName, parentStub, elementType);
+    }
 
-	public static int getFlags(JSClass jsClass)
-	{
-		return (jsClass.isInterface() ? INTERFACE_MASK : 0) | (jsClass.isDeprecated() ? DEPRECATED_MASK : 0);
-	}
+    public static int getFlags(JSClass jsClass) {
+        return (jsClass.isInterface() ? INTERFACE_MASK : 0) | (jsClass.isDeprecated() ? DEPRECATED_MASK : 0);
+    }
 
-	@Override
-	public boolean isInterface()
-	{
-		return (myFlags & INTERFACE_MASK) != 0;
-	}
+    @Override
+    public boolean isInterface() {
+        return (myFlags & INTERFACE_MASK) != 0;
+    }
 
-	@Override
-	public boolean isDeprecated()
-	{
-		return (myFlags & DEPRECATED_MASK) != 0;
-	}
+    @Override
+    public boolean isDeprecated() {
+        return (myFlags & DEPRECATED_MASK) != 0;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
index e96a1eee..68d35578 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
@@ -24,69 +24,67 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 7:11:48 PM
+ * Date: Mar 26, 2008
+ * Time: 7:11:48 PM
  */
-public class JSFunctionStubImpl extends JSQualifiedObjectStubBase<JSFunction> implements JSFunctionStub
-{
-	private String myReturnType;
-	public static final int GET_PROPERTY_MASK = 1;
-	public static final int SET_PROPERTY_MASK = 2;
-	public static final int CONSTRUCTOR_MASK = 4;
-	private static final int DEPRECATED_MASK = 8;
-	private static final int REFERENCES_ARGUMENTS_MASK = 16;
+public class JSFunctionStubImpl extends JSQualifiedObjectStubBase<JSFunction> implements JSFunctionStub {
+    private String myReturnType;
+    public static final int GET_PROPERTY_MASK = 1;
+    public static final int SET_PROPERTY_MASK = 2;
+    public static final int CONSTRUCTOR_MASK = 4;
+    private static final int DEPRECATED_MASK = 8;
+    private static final int REFERENCES_ARGUMENTS_MASK = 16;
 
-	public JSFunctionStubImpl(final String name,
-			int flags,
-			String qName,
-			String returnType,
-			final StubElement parentStub,
-			final JSStubElementType elementType)
-	{
-		super(name, flags, qName, parentStub, elementType);
-		myReturnType = returnType;
-	}
+    public JSFunctionStubImpl(
+        final String name,
+        int flags,
+        String qName,
+        String returnType,
+        final StubElement parentStub,
+        final JSStubElementType elementType
+    ) {
+        super(name, flags, qName, parentStub, elementType);
+        myReturnType = returnType;
+    }
 
-	public static int buildFlags(final JSFunction clazz)
-	{
-		final int val = clazz.isConstructor() ? CONSTRUCTOR_MASK : clazz.isGetProperty() ? GET_PROPERTY_MASK : clazz.isSetProperty() ? SET_PROPERTY_MASK
-				: 0;
-		return val | (clazz.isDeprecated() ? DEPRECATED_MASK : 0) | (clazz.isReferencesArguments() ? REFERENCES_ARGUMENTS_MASK : 0);
-	}
+    public static int buildFlags(final JSFunction clazz) {
+        final int val = clazz.isConstructor()
+            ? CONSTRUCTOR_MASK
+            : clazz.isGetProperty()
+            ? GET_PROPERTY_MASK
+            : clazz.isSetProperty()
+            ? SET_PROPERTY_MASK
+            : 0;
+        return val | (clazz.isDeprecated() ? DEPRECATED_MASK : 0) | (clazz.isReferencesArguments() ? REFERENCES_ARGUMENTS_MASK : 0);
+    }
 
-	@Override
-	public boolean isGetProperty()
-	{
-		return (myFlags & GET_PROPERTY_MASK) != 0;
-	}
+    @Override
+    public boolean isGetProperty() {
+        return (myFlags & GET_PROPERTY_MASK) != 0;
+    }
 
-	@Override
-	public boolean isSetProperty()
-	{
-		return (myFlags & SET_PROPERTY_MASK) != 0;
-	}
+    @Override
+    public boolean isSetProperty() {
+        return (myFlags & SET_PROPERTY_MASK) != 0;
+    }
 
-	@Override
-	public boolean isConstructor()
-	{
-		return (myFlags & CONSTRUCTOR_MASK) != 0;
-	}
+    @Override
+    public boolean isConstructor() {
+        return (myFlags & CONSTRUCTOR_MASK) != 0;
+    }
 
-	@Override
-	public boolean isDeprecated()
-	{
-		return (myFlags & DEPRECATED_MASK) != 0;
-	}
+    @Override
+    public boolean isDeprecated() {
+        return (myFlags & DEPRECATED_MASK) != 0;
+    }
 
-	@Override
-	public boolean isReferencesArguments()
-	{
-		return (myFlags & REFERENCES_ARGUMENTS_MASK) != 0;
-	}
+    @Override
+    public boolean isReferencesArguments() {
+        return (myFlags & REFERENCES_ARGUMENTS_MASK) != 0;
+    }
 
-	@Override
-	public String getReturnTypeString()
-	{
-		return myReturnType;
-	}
+    @Override
+    public String getReturnTypeString() {
+        return myReturnType;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
index 3f699af4..1fa7d547 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
@@ -25,24 +25,24 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 8:00:52 PM
+ * Date: Jun 6, 2008
+ * Time: 8:00:52 PM
  */
-public class JSImportStatementStubImpl extends StubBase<JSImportStatement> implements JSImportStatementStub
-{
-	private final String myImportText;
+public class JSImportStatementStubImpl extends StubBase<JSImportStatement> implements JSImportStatementStub {
+    private final String myImportText;
 
-	public JSImportStatementStubImpl(final String importText, final StubElement parentStub, final JSStubElementType<JSImportStatementStub,
-			JSImportStatement> type)
-	{
-		super(parentStub, type);
+    public JSImportStatementStubImpl(
+        final String importText,
+        final StubElement parentStub,
+        final JSStubElementType<JSImportStatementStub, JSImportStatement> type
+    ) {
+        super(parentStub, type);
 
-		myImportText = importText;
-	}
+        myImportText = importText;
+    }
 
-	@Override
-	public String getImportText()
-	{
-		return myImportText;
-	}
+    @Override
+    public String getImportText() {
+        return myImportText;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
index d4d8f403..90860a6f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
@@ -25,24 +25,23 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 8:00:52 PM
+ * Date: Jun 6, 2008
+ * Time: 8:00:52 PM
  */
-public class JSIncludeDirectiveStubImpl extends StubBase<JSIncludeDirective> implements JSIncludeDirectiveStub
-{
-	private final String myIncludeText;
+public class JSIncludeDirectiveStubImpl extends StubBase<JSIncludeDirective> implements JSIncludeDirectiveStub {
+    private final String myIncludeText;
 
-	public JSIncludeDirectiveStubImpl(final String includeText,
-			final StubElement parentStub,
-			final JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> type)
-	{
-		super(parentStub, type);
-		myIncludeText = includeText;
-	}
+    public JSIncludeDirectiveStubImpl(
+        final String includeText,
+        final StubElement parentStub,
+        final JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> type
+    ) {
+        super(parentStub, type);
+        myIncludeText = includeText;
+    }
 
-	@Override
-	public String getIncludeText()
-	{
-		return myIncludeText;
-	}
+    @Override
+    public String getIncludeText() {
+        return myIncludeText;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
index 4678ca8d..426a5f74 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
@@ -24,29 +24,25 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 7:11:48 PM
+ * Date: Mar 26, 2008
+ * Time: 7:11:48 PM
  */
-public abstract class JSNamedObjectStubBase<T extends PsiNamedElement> extends StubBase<T>
-{
-	protected final String myName;
-	protected final int myFlags;
+public abstract class JSNamedObjectStubBase<T extends PsiNamedElement> extends StubBase<T> {
+    protected final String myName;
+    protected final int myFlags;
 
-	protected JSNamedObjectStubBase(String name, int flags, final StubElement parent, final IStubElementType elementType)
-	{
-		super(parent, elementType);
+    protected JSNamedObjectStubBase(String name, int flags, final StubElement parent, final IStubElementType elementType) {
+        super(parent, elementType);
 
-		myName = name;
-		myFlags = flags;
-	}
+        myName = name;
+        myFlags = flags;
+    }
 
-	public int getFlags()
-	{
-		return myFlags;
-	}
+    public int getFlags() {
+        return myFlags;
+    }
 
-	public String getName()
-	{
-		return myName;
-	}
+    public String getName() {
+        return myName;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
index a8ca1e75..56ded2a0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamespaceDeclarationStubImpl.java
@@ -24,22 +24,26 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 8:00:52 PM
+ * Date: Jun 6, 2008
+ * Time: 8:00:52 PM
  */
-public class JSNamespaceDeclarationStubImpl extends JSQualifiedObjectStubBase<JSNamespaceDeclaration> implements JSNamespaceDeclarationStub
-{
-	private String myInitialValueString;
+public class JSNamespaceDeclarationStubImpl extends JSQualifiedObjectStubBase<JSNamespaceDeclaration>
+    implements JSNamespaceDeclarationStub {
+    private String myInitialValueString;
 
-	public JSNamespaceDeclarationStubImpl(String name, String qName, String initialValueString, StubElement parent, IStubElementType elementType)
-	{
-		super(name, 0, qName, parent, elementType);
-		myInitialValueString = initialValueString;
-	}
+    public JSNamespaceDeclarationStubImpl(
+        String name,
+        String qName,
+        String initialValueString,
+        StubElement parent,
+        IStubElementType elementType
+    ) {
+        super(name, 0, qName, parent, elementType);
+        myInitialValueString = initialValueString;
+    }
 
-	@Override
-	public String getInitialValueString()
-	{
-		return myInitialValueString;
-	}
+    @Override
+    public String getInitialValueString() {
+        return myInitialValueString;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
index 053c358b..b0be2d63 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSPackageStatementStubImpl.java
@@ -24,13 +24,11 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 8:00:52 PM
+ * Date: Jun 6, 2008
+ * Time: 8:00:52 PM
  */
-public class JSPackageStatementStubImpl extends JSQualifiedObjectStubBase<JSPackageStatement> implements JSPackageStatementStub
-{
-	public JSPackageStatementStubImpl(String name, String qName, StubElement parent, IStubElementType elementType)
-	{
-		super(name, 0, qName, parent, elementType);
-	}
+public class JSPackageStatementStubImpl extends JSQualifiedObjectStubBase<JSPackageStatement> implements JSPackageStatementStub {
+    public JSPackageStatementStubImpl(String name, String qName, StubElement parent, IStubElementType elementType) {
+        super(name, 0, qName, parent, elementType);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
index a9b32d7c..89957dd6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterListStubImpl.java
@@ -25,13 +25,11 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 11:29:19 PM
+ * Date: Mar 26, 2008
+ * Time: 11:29:19 PM
  */
-public class JSParameterListStubImpl extends StubBase<JSParameterList> implements JSParameterListStub
-{
-	public JSParameterListStubImpl(StubElement parent, IStubElementType elementType)
-	{
-		super(parent, elementType);
-	}
+public class JSParameterListStubImpl extends StubBase<JSParameterList> implements JSParameterListStub {
+    public JSParameterListStubImpl(StubElement parent, IStubElementType elementType) {
+        super(parent, elementType);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
index 45a00d67..625c065b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
@@ -24,41 +24,37 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 11:29:19 PM
+ * Date: Mar 26, 2008
+ * Time: 11:29:19 PM
  */
-public class JSParameterStubImpl extends JSVariableStubBaseImpl<JSParameter> implements JSParameterStub
-{
-	public static final int REST_MASK = LAST_USED_MASK << 1;
-	public static final int OPTIONAL_MASK = LAST_USED_MASK << 2;
-
-	public JSParameterStubImpl(String name,
-			int flags,
-			String type,
-			String initial,
-			String qName,
-			StubElement parentStub,
-			IStubElementType elementType)
-	{
-		super(name, flags, type, initial, qName, parentStub, elementType);
-	}
-
-
-	public static int buildFlags(final JSParameter clazz)
-	{
-		final int i = JSVariableStubBaseImpl.buildFlags(clazz);
-		return i | (clazz.isRest() ? REST_MASK : 0) | (clazz.isOptional() ? OPTIONAL_MASK : 0);
-	}
-
-	@Override
-	public boolean isRest()
-	{
-		return (myFlags & REST_MASK) != 0;
-	}
-
-	@Override
-	public boolean isOptional()
-	{
-		return (myFlags & OPTIONAL_MASK) != 0;
-	}
+public class JSParameterStubImpl extends JSVariableStubBaseImpl<JSParameter> implements JSParameterStub {
+    public static final int REST_MASK = LAST_USED_MASK << 1;
+    public static final int OPTIONAL_MASK = LAST_USED_MASK << 2;
+
+    public JSParameterStubImpl(
+        String name,
+        int flags,
+        String type,
+        String initial,
+        String qName,
+        StubElement parentStub,
+        IStubElementType elementType
+    ) {
+        super(name, flags, type, initial, qName, parentStub, elementType);
+    }
+
+    public static int buildFlags(final JSParameter clazz) {
+        final int i = JSVariableStubBaseImpl.buildFlags(clazz);
+        return i | (clazz.isRest() ? REST_MASK : 0) | (clazz.isOptional() ? OPTIONAL_MASK : 0);
+    }
+
+    @Override
+    public boolean isRest() {
+        return (myFlags & REST_MASK) != 0;
+    }
+
+    @Override
+    public boolean isOptional() {
+        return (myFlags & OPTIONAL_MASK) != 0;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
index 39aaeb61..86fd103d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
@@ -24,23 +24,26 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 7:11:48 PM
+ * Date: Mar 26, 2008
+ * Time: 7:11:48 PM
  */
-abstract class JSQualifiedObjectStubBase<T extends JSQualifiedNamedElement> extends JSNamedObjectStubBase<T> implements JSQualifiedStub<T>
-{
-	protected final String myQualifiedName;
+abstract class JSQualifiedObjectStubBase<T extends JSQualifiedNamedElement> extends JSNamedObjectStubBase<T> implements JSQualifiedStub<T> {
+    protected final String myQualifiedName;
 
-	protected JSQualifiedObjectStubBase(String name, int flags, String qName, final StubElement parent, final IStubElementType elementType)
-	{
-		super(name, flags, parent, elementType);
+    protected JSQualifiedObjectStubBase(
+        String name,
+        int flags,
+        String qName,
+        final StubElement parent,
+        final IStubElementType elementType
+    ) {
+        super(name, flags, parent, elementType);
 
-		myQualifiedName = qName;
-	}
+        myQualifiedName = qName;
+    }
 
-	@Override
-	public String getQualifiedName()
-	{
-		return myQualifiedName;
-	}
+    @Override
+    public String getQualifiedName() {
+        return myQualifiedName;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
index 4ba9b59c..9ce9fea9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
@@ -25,23 +25,23 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 8:00:52 PM
+ * Date: Jun 6, 2008
+ * Time: 8:00:52 PM
  */
-public class JSReferenceListStubImpl extends StubBase<JSReferenceList> implements JSReferenceListStub
-{
-	private String[] myRefs;
+public class JSReferenceListStubImpl extends StubBase<JSReferenceList> implements JSReferenceListStub {
+    private String[] myRefs;
 
-	public JSReferenceListStubImpl(final String[] refs, final StubElement parentStub, final JSStubElementType<JSReferenceListStub,
-			JSReferenceList> type)
-	{
-		super(parentStub, type);
-		myRefs = refs;
-	}
+    public JSReferenceListStubImpl(
+        final String[] refs,
+        final StubElement parentStub,
+        final JSStubElementType<JSReferenceListStub, JSReferenceList> type
+    ) {
+        super(parentStub, type);
+        myRefs = refs;
+    }
 
-	@Override
-	public String[] getReferenceTexts()
-	{
-		return myRefs;
-	}
+    @Override
+    public String[] getReferenceTexts() {
+        return myRefs;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
index 69afd05d..eb60c55c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSUseNamespaceDirectiveStubImpl.java
@@ -25,22 +25,19 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 8:00:52 PM
+ * Date: Jun 6, 2008
+ * Time: 8:00:52 PM
  */
-public class JSUseNamespaceDirectiveStubImpl extends StubBase<JSUseNamespaceDirective> implements JSUseNamespaceDirectiveStub
-{
-	private String myNamespaceToUse;
+public class JSUseNamespaceDirectiveStubImpl extends StubBase<JSUseNamespaceDirective> implements JSUseNamespaceDirectiveStub {
+    private String myNamespaceToUse;
 
-	public JSUseNamespaceDirectiveStubImpl(String namespaceToUse, StubElement parent, IStubElementType elementType)
-	{
-		super(parent, elementType);
-		myNamespaceToUse = namespaceToUse;
-	}
+    public JSUseNamespaceDirectiveStubImpl(String namespaceToUse, StubElement parent, IStubElementType elementType) {
+        super(parent, elementType);
+        myNamespaceToUse = namespaceToUse;
+    }
 
-	@Override
-	public String getNamespaceToUse()
-	{
-		return myNamespaceToUse;
-	}
+    @Override
+    public String getNamespaceToUse() {
+        return myNamespaceToUse;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
index 9fb1f69b..10c6233c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVarStatementStubImpl.java
@@ -25,13 +25,11 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 11:29:19 PM
+ * Date: Mar 26, 2008
+ * Time: 11:29:19 PM
  */
-public class JSVarStatementStubImpl extends StubBase<JSVarStatement> implements JSVarStatementStub
-{
-	public JSVarStatementStubImpl(StubElement parent, IStubElementType elementType)
-	{
-		super(parent, elementType);
-	}
+public class JSVarStatementStubImpl extends StubBase<JSVarStatement> implements JSVarStatementStub {
+    public JSVarStatementStubImpl(StubElement parent, IStubElementType elementType) {
+        super(parent, elementType);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
index 898ade13..abf649a4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
@@ -24,58 +24,57 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 11:29:19 PM
+ * Date: Mar 26, 2008
+ * Time: 11:29:19 PM
  */
-public abstract class JSVariableStubBaseImpl<T extends JSVariable> extends JSQualifiedObjectStubBase<T> implements JSVariableStubBase<T>
-{
-	private String myTypeString;
-	private static final int DEPRECATED_MASK = 1;
-	public static final int CONST_MASK = 2;
-	private static final int LOCAL_MASK = 4;
-	static final int LAST_USED_MASK = LOCAL_MASK;
-	private String myInitializerText;
+public abstract class JSVariableStubBaseImpl<T extends JSVariable> extends JSQualifiedObjectStubBase<T> implements JSVariableStubBase<T> {
+    private String myTypeString;
+    private static final int DEPRECATED_MASK = 1;
+    public static final int CONST_MASK = 2;
+    private static final int LOCAL_MASK = 4;
+    static final int LAST_USED_MASK = LOCAL_MASK;
+    private String myInitializerText;
 
-	public JSVariableStubBaseImpl(final String name, int flags, String type, String initial, String qName, final StubElement parentStub,
-			final IStubElementType elementType)
-	{
-		super(name, flags, qName, parentStub, elementType);
-		myTypeString = type;
-		myInitializerText = initial;
-	}
+    public JSVariableStubBaseImpl(
+        final String name,
+        int flags,
+        String type,
+        String initial,
+        String qName,
+        final StubElement parentStub,
+        final IStubElementType elementType
+    ) {
+        super(name, flags, qName, parentStub, elementType);
+        myTypeString = type;
+        myInitializerText = initial;
+    }
 
-	public static int buildFlags(final JSVariable clazz)
-	{
-		return (clazz.isDeprecated() ? DEPRECATED_MASK : 0) | (clazz.isConst() ? CONST_MASK : clazz.isLocal() ? LOCAL_MASK : 0);
-	}
+    public static int buildFlags(final JSVariable clazz) {
+        return (clazz.isDeprecated() ? DEPRECATED_MASK : 0) | (clazz.isConst() ? CONST_MASK : clazz.isLocal() ? LOCAL_MASK : 0);
+    }
 
-	@Override
-	public String getTypeString()
-	{
-		return myTypeString;
-	}
+    @Override
+    public String getTypeString() {
+        return myTypeString;
+    }
 
-	@Override
-	public boolean isDeprecated()
-	{
-		return (myFlags & DEPRECATED_MASK) != 0;
-	}
+    @Override
+    public boolean isDeprecated() {
+        return (myFlags & DEPRECATED_MASK) != 0;
+    }
 
-	@Override
-	public boolean isConst()
-	{
-		return (myFlags & CONST_MASK) != 0;
-	}
+    @Override
+    public boolean isConst() {
+        return (myFlags & CONST_MASK) != 0;
+    }
 
-	@Override
-	public String getInitializerText()
-	{
-		return myInitializerText;
-	}
+    @Override
+    public String getInitializerText() {
+        return myInitializerText;
+    }
 
-	@Override
-	public boolean isLocal()
-	{
-		return (myFlags & LOCAL_MASK) != 0;
-	}
+    @Override
+    public boolean isLocal() {
+        return (myFlags & LOCAL_MASK) != 0;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
index a3745f3f..143dfdda 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubImpl.java
@@ -24,14 +24,19 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 11:29:19 PM
+ * Date: Mar 26, 2008
+ * Time: 11:29:19 PM
  */
-public class JSVariableStubImpl extends JSVariableStubBaseImpl<JSVariable> implements JSVariableStub
-{
-	public JSVariableStubImpl(String name, int flags, String type, String initial, String qName, StubElement parentStub,
-			IStubElementType elementType)
-	{
-		super(name, flags, type, initial, qName, parentStub, elementType);
-	}
+public class JSVariableStubImpl extends JSVariableStubBaseImpl<JSVariable> implements JSVariableStub {
+    public JSVariableStubImpl(
+        String name,
+        int flags,
+        String type,
+        String initial,
+        String qName,
+        StubElement parentStub,
+        IStubElementType elementType
+    ) {
+        super(name, flags, type, initial, qName, parentStub, elementType);
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
index 20ace63f..81704a96 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
@@ -31,67 +31,60 @@
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
-public class JSLookupUtil
-{
-	public static enum LookupPriority
-	{
-		NORMAL,
-		HIGHER,
-		HIGH,
-		HIGHEST
-	}
+public class JSLookupUtil {
+    public static enum LookupPriority {
+        NORMAL,
+        HIGHER,
+        HIGH,
+        HIGHEST
+    }
 
-	@Nullable
-	@RequiredReadAction
-	public static LookupElement createLookupItem(@Nonnull PsiElement value, @Nonnull String name, @Nonnull LookupPriority priority)
-	{
-		LookupElementBuilder builder = LookupElementBuilder.create(name);
-		builder = builder.withIcon(IconDescriptorUpdaters.getIcon(value, Iconable.ICON_FLAG_VISIBILITY));
+    @Nullable
+    @RequiredReadAction
+    public static LookupElement createLookupItem(@Nonnull PsiElement value, @Nonnull String name, @Nonnull LookupPriority priority) {
+        LookupElementBuilder builder = LookupElementBuilder.create(name);
+        builder = builder.withIcon(IconDescriptorUpdaters.getIcon(value, Iconable.ICON_FLAG_VISIBILITY));
 
-		JSFunction function = value instanceof JSFunction ? (JSFunction) value : null;
-		if(value instanceof JSProperty)
-		{
-			JSExpression expression = ((JSProperty) value).getValue();
-			function = expression instanceof JSFunctionExpression ? ((JSFunctionExpression) expression).getFunction()  : null;
-		}
+        JSFunction function = value instanceof JSFunction fun ? fun : null;
+        if (value instanceof JSProperty property) {
+            JSExpression expression = property.getValue();
+            function = expression instanceof JSFunctionExpression functionExpression ? functionExpression.getFunction() : null;
+        }
 
-		if(function != null)
-		{
-			JSParameterList parameterList = function.getParameterList();
-			JSParameter[] jsParameters = parameterList == null ? JSParameter.EMPTY_ARRAY : parameterList.getParameters();
-			builder = builder.withPresentableText(name + "(" + StringUtil.join(jsParameters, jsParameter ->
-			{
-				JavaScriptType type = jsParameter.getType();
-				if(type != JavaScriptType.UNKNOWN)
-				{
-					return type.getPresentableText() + " " + jsParameter.getName();
-				}
-				return jsParameter.getName();
-			}, ", ") + ")");
-			builder = builder.withInsertHandler(ParenthesesInsertHandler.getInstance(jsParameters.length > 0));
-		}
-		else if(value instanceof JSProperty)
-		{
-			JavaScriptType type = ((JSProperty) value).getType();
-			if(type != JavaScriptType.UNKNOWN)
-			{
-				builder = builder.withTypeText(type.getPresentableText());
-			}
-		}
-		else if(value instanceof JSVariable)
-		{
-			JavaScriptType type = ((JSVariable) value).getType();
-			if(type != JavaScriptType.UNKNOWN)
-			{
-				builder = builder.withTypeText(type.getPresentableText());
-			}
-		}
+        if (function != null) {
+            JSParameterList parameterList = function.getParameterList();
+            JSParameter[] jsParameters = parameterList == null ? JSParameter.EMPTY_ARRAY : parameterList.getParameters();
+            builder = builder.withPresentableText(
+                name + "(" + StringUtil.join(
+                    jsParameters,
+                    jsParameter -> {
+                        JavaScriptType type = jsParameter.getType();
+                        if (type != JavaScriptType.UNKNOWN) {
+                            return type.getPresentableText() + " " + jsParameter.getName();
+                        }
+                        return jsParameter.getName();
+                    }, ", "
+                ) + ")"
+			);
+            builder = builder.withInsertHandler(ParenthesesInsertHandler.getInstance(jsParameters.length > 0));
+        }
+        else if (value instanceof JSProperty property) {
+            JavaScriptType type = property.getType();
+            if (type != JavaScriptType.UNKNOWN) {
+                builder = builder.withTypeText(type.getPresentableText());
+            }
+        }
+        else if (value instanceof JSVariable variable) {
+            JavaScriptType type = variable.getType();
+            if (type != JavaScriptType.UNKNOWN) {
+                builder = builder.withTypeText(type.getPresentableText());
+            }
+        }
 
-		//builder = builder.withTailText(value.getContainingFile().getName(), true);
-		if(priority == LookupPriority.NORMAL)
-		{
-			return builder;
-		}
-		return PrioritizedLookupElement.withPriority(builder, priority.ordinal());
-	}
+        //builder = builder.withTailText(value.getContainingFile().getName(), true);
+        if (priority == LookupPriority.NORMAL) {
+            return builder;
+        }
+        return PrioritizedLookupElement.withPriority(builder, priority.ordinal());
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
index b1e52c19..bfb5530c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
@@ -33,196 +33,152 @@
 /**
  * @author max
  */
-public class JSUtils
-{
-	public static boolean isLHSExpression(JSExpression expr)
-	{
-		if(expr instanceof JSDefinitionExpression)
-		{
-			expr = ((JSDefinitionExpression) expr).getExpression();
-		}
-
-		if(expr instanceof JSReferenceExpression)
-		{
-			return true;
-		}
-
-		if(expr instanceof JSParenthesizedExpression)
-		{
-			return isLHSExpression(((JSParenthesizedExpression) expr).getInnerExpression());
-		}
-
-		if(expr instanceof JSIndexedPropertyAccessExpression)
-		{
-			return true;
-		}
-
-		if(expr instanceof JSCallExpression)
-		{
-			return true;
-		}
-
-		if(expr instanceof JSNewExpression)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	public static boolean isNeedParenthesis(JSExpression oldExpr, JSExpression newExpr)
-	{
-		int priority = getExpressionPrecedence(newExpr);
-		final PsiElement parent = oldExpr.getParent();
-		if(!(parent instanceof JSExpression))
-		{
-			return false;
-		}
-		int parentPriority = getExpressionPrecedence((JSExpression) parent);
-		if(priority < parentPriority)
-		{
-			return true;
-		}
-		if(priority == parentPriority && parent instanceof JSBinaryExpression)
-		{
-			final IElementType operationSign = ((JSBinaryExpression) parent).getOperationSign();
-			if(oldExpr != ((JSBinaryExpression) parent).getROperand())
-			{
-				return false;
-			}
-			if(!ASSOC_OPERATIONS.contains(operationSign))
-			{
-				return true;
-			}
-
-			return (((JSBinaryExpression) newExpr).getOperationSign() != operationSign);
-		}
-
-		return false;
-	}
-
-	private static int getExpressionPrecedence(JSExpression expr)
-	{
-		IElementType i = expr.getNode().getElementType();
-		if(i == ASSIGNMENT_EXPRESSION)
-		{
-			return 0;
-		}
-		else if(i == CONDITIONAL_EXPRESSION)
-		{
-			return 1;
-		}
-		else if(i == BINARY_EXPRESSION)
-		{
-			{
-				IElementType opType = ((JSBinaryExpression) expr).getOperationSign();
-				if(opType == OROR)
-				{
-					return 2;
-				}
-				else if(opType == ANDAND)
-				{
-					return 3;
-				}
-				else if(opType == OR)
-				{
-					return 4;
-				}
-				else if(opType == XOR)
-				{
-					return 5;
-				}
-				else if(opType == AND)
-				{
-					return 6;
-				}
-				else if(EQUALITY_OPERATIONS.contains(opType))
-				{
-					return 7;
-				}
-				else if(RELATIONAL_OPERATIONS.contains(opType))
-				{
-					return 8;
-				}
-				else if(SHIFT_OPERATIONS.contains(opType))
-				{
-					return 9;
-				}
-				else if(ADDITIVE_OPERATIONS.contains(opType))
-				{
-					return 10;
-				}
-				else if(MULTIPLICATIVE_OPERATIONS.contains(opType))
-				{
-					return 11;
-				}
-			}
-
-			return 8;
-		}
-		else if(i == PREFIX_EXPRESSION)
-		{
-			return 12;
-		}
-		else if(i == POSTFIX_EXPRESSION)
-		{
-			return 13;
-		}
-
-		return 14;
-	}
-
-	public static PsiElement findStatementAnchor(final JSReferenceExpression referenceExpression, final PsiFile file)
-	{
-		PsiElement anchor = PsiTreeUtil.getParentOfType(referenceExpression, JSStatement.class);
-
-		if(file instanceof XmlFile)
-		{
-			final XmlAttributeValue attributeValue = PsiTreeUtil.getParentOfType(referenceExpression, XmlAttributeValue.class);
-
-			if(attributeValue != null)
-			{
-				XmlFile root = ((XmlFile) file);
-				if(root.getViewProvider() instanceof TemplateLanguageFileViewProvider)
-				{
-					final TemplateLanguageFileViewProvider viewProvider = (TemplateLanguageFileViewProvider) root.getViewProvider();
-					final PsiFile psi = viewProvider.getPsi(viewProvider.getTemplateDataLanguage());
-					if(psi instanceof XmlFile)
-					{
-						root = (XmlFile) psi;
-					}
-				}
-
-				final XmlTag tag = root.getDocument().getRootTag();
-
-				if(tag != null)
-				{
-					final XmlTag headTag = tag.findFirstSubTag("head");
-
-					if(headTag != null)
-					{
-						final XmlTag scriptTag = headTag.findFirstSubTag("script");
-
-						if(scriptTag != null)
-						{
-							PsiElement statementInScript = PsiTreeUtil.getChildOfType(scriptTag, JSStatement.class);
-							if(statementInScript != null)
-							{
-								anchor = statementInScript;
-							}
-							else
-							{
-								final XmlTagChild tagChild = PsiTreeUtil.getChildOfType(scriptTag, XmlTagChild.class);
-								if(tagChild != null)
-								{
-									anchor = tagChild;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return anchor;
-	}
+public class JSUtils {
+    public static boolean isLHSExpression(JSExpression expr) {
+        if (expr instanceof JSDefinitionExpression definition) {
+            expr = definition.getExpression();
+        }
+
+        if (expr instanceof JSReferenceExpression) {
+            return true;
+        }
+
+        if (expr instanceof JSParenthesizedExpression parenthesizedExpression) {
+            return isLHSExpression(parenthesizedExpression.getInnerExpression());
+        }
+
+        if (expr instanceof JSIndexedPropertyAccessExpression) {
+            return true;
+        }
+
+        if (expr instanceof JSCallExpression) {
+            return true;
+        }
+
+        if (expr instanceof JSNewExpression) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public static boolean isNeedParenthesis(JSExpression oldExpr, JSExpression newExpr) {
+        int priority = getExpressionPrecedence(newExpr);
+        final PsiElement parent = oldExpr.getParent();
+        if (!(parent instanceof JSExpression)) {
+            return false;
+        }
+        int parentPriority = getExpressionPrecedence((JSExpression)parent);
+        if (priority < parentPriority) {
+            return true;
+        }
+        if (priority == parentPriority && parent instanceof JSBinaryExpression binaryExpression) {
+            final IElementType operationSign = binaryExpression.getOperationSign();
+            if (oldExpr != binaryExpression.getROperand()) {
+                return false;
+            }
+            if (!ASSOC_OPERATIONS.contains(operationSign)) {
+                return true;
+            }
+
+            return (((JSBinaryExpression)newExpr).getOperationSign() != operationSign);
+        }
+
+        return false;
+    }
+
+    private static int getExpressionPrecedence(JSExpression expr) {
+        IElementType i = expr.getNode().getElementType();
+        if (i == ASSIGNMENT_EXPRESSION) {
+            return 0;
+        }
+        else if (i == CONDITIONAL_EXPRESSION) {
+            return 1;
+        }
+        else if (i == BINARY_EXPRESSION) {
+            IElementType opType = ((JSBinaryExpression)expr).getOperationSign();
+            if (opType == OROR) {
+                return 2;
+            }
+            else if (opType == ANDAND) {
+                return 3;
+            }
+            else if (opType == OR) {
+                return 4;
+            }
+            else if (opType == XOR) {
+                return 5;
+            }
+            else if (opType == AND) {
+                return 6;
+            }
+            else if (EQUALITY_OPERATIONS.contains(opType)) {
+                return 7;
+            }
+            else if (RELATIONAL_OPERATIONS.contains(opType)) {
+                return 8;
+            }
+            else if (SHIFT_OPERATIONS.contains(opType)) {
+                return 9;
+            }
+            else if (ADDITIVE_OPERATIONS.contains(opType)) {
+                return 10;
+            }
+            else if (MULTIPLICATIVE_OPERATIONS.contains(opType)) {
+                return 11;
+            }
+
+            return 8;
+        }
+        else if (i == PREFIX_EXPRESSION) {
+            return 12;
+        }
+        else if (i == POSTFIX_EXPRESSION) {
+            return 13;
+        }
+
+        return 14;
+    }
+
+    public static PsiElement findStatementAnchor(final JSReferenceExpression referenceExpression, final PsiFile file) {
+        PsiElement anchor = PsiTreeUtil.getParentOfType(referenceExpression, JSStatement.class);
+
+        if (file instanceof XmlFile root) {
+            final XmlAttributeValue attributeValue = PsiTreeUtil.getParentOfType(referenceExpression, XmlAttributeValue.class);
+
+            if (attributeValue != null) {
+                if (root.getViewProvider() instanceof TemplateLanguageFileViewProvider) {
+                    final TemplateLanguageFileViewProvider viewProvider = (TemplateLanguageFileViewProvider)root.getViewProvider();
+                    final PsiFile psi = viewProvider.getPsi(viewProvider.getTemplateDataLanguage());
+                    if (psi instanceof XmlFile) {
+                        root = (XmlFile)psi;
+                    }
+                }
+
+                final XmlTag tag = root.getDocument().getRootTag();
+
+                if (tag != null) {
+                    final XmlTag headTag = tag.findFirstSubTag("head");
+
+                    if (headTag != null) {
+                        final XmlTag scriptTag = headTag.findFirstSubTag("script");
+
+                        if (scriptTag != null) {
+                            PsiElement statementInScript = PsiTreeUtil.getChildOfType(scriptTag, JSStatement.class);
+                            if (statementInScript != null) {
+                                anchor = statementInScript;
+                            }
+                            else {
+                                final XmlTagChild tagChild = PsiTreeUtil.getChildOfType(scriptTag, XmlTagChild.class);
+                                if (tagChild != null) {
+                                    anchor = tagChild;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return anchor;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
index 1f7cd240..7ab22286 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassInheritorsProvider.java
@@ -26,11 +26,10 @@
 import java.util.Collection;
 
 @ExtensionAPI(ComponentScope.APPLICATION)
-public interface JSClassInheritorsProvider
-{
-	ExtensionPointName<JSClassInheritorsProvider> EP_NAME = ExtensionPointName.create(JSClassInheritorsProvider.class);
+public interface JSClassInheritorsProvider {
+    ExtensionPointName<JSClassInheritorsProvider> EP_NAME = ExtensionPointName.create(JSClassInheritorsProvider.class);
 
-	Collection<JSClass> getImplementingClasses(String parentName, Project project, GlobalSearchScope scope);
+    Collection<JSClass> getImplementingClasses(String parentName, Project project, GlobalSearchScope scope);
 
-	Collection<JSClass> getExtendingClasses(String parentName, Project project, GlobalSearchScope scope);
+    Collection<JSClass> getExtendingClasses(String parentName, Project project, GlobalSearchScope scope);
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index 4668c622..c008bda3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -32,236 +32,225 @@
 import consulo.project.Project;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-public abstract class JSClassSearch implements QueryExecutor<JSClass, JSClassSearch.SearchParameters>
-{
-	public static class SearchParameters
-	{
-		private final JSClass myClass;
-		private final boolean myCheckDeepInheritance;
-		private final GlobalSearchScope myScope;
-
-		public SearchParameters(final JSClass anClass, final boolean checkDeepInheritance, GlobalSearchScope scope)
-		{
-			myClass = anClass;
-			myCheckDeepInheritance = checkDeepInheritance;
-			myScope = scope;
-		}
-
-		public JSClass getTargetClass()
-		{
-			return myClass;
-		}
-
-		public boolean isCheckDeepInheritance()
-		{
-			return myCheckDeepInheritance;
-		}
-
-		public GlobalSearchScope getScope()
-		{
-			return myScope;
-		}
-	}
-
-	public static Query<JSClass> searchClassInheritors(final JSClass superClass, final boolean checkDeepInheritance)
-	{
-		final SearchParameters parameters = new SearchParameters(superClass, checkDeepInheritance, getUseScope(superClass));
-		return CLASS_INHERITORS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
-	}
-
-	private static GlobalSearchScope getUseScope(JSClass superClass)
-	{
-		SearchScope searchScope = superClass.getUseScope();
-		return (GlobalSearchScope) searchScope;
-	}
-
-	public static Query<JSClass> searchInterfaceImplementations(final JSClass superClass, final boolean checkDeepInheritance)
-	{
-		final SearchParameters parameters = new SearchParameters(superClass, checkDeepInheritance, getUseScope(superClass));
-		return INTERFACE_IMPLEMENTATIONS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
-	}
-
-	// implementation
-	private static final QueryFactory<JSClass, SearchParameters> INTERFACE_IMPLEMENTATIONS_QUERY_FACTORY = new QueryFactory<JSClass,
-			SearchParameters>();
-	private static final QueryFactory<JSClass, SearchParameters> CLASS_INHERITORS_QUERY_FACTORY = new QueryFactory<JSClass, SearchParameters>();
-	private static final JSClassSearch OUR_CLASS_SEARCH_EXECUTOR;
-
-	static
-	{
-		INTERFACE_IMPLEMENTATIONS_QUERY_FACTORY.registerExecutor(new JSClassSearch()
-		{
-			@Override
-			protected StubIndexKey<String, JSReferenceList> getIndexKey()
-			{
-				return JavaScriptIndexKeys.IMPLEMENTED_INDEX;
-			}
-
-			@Override
-			protected JSClass[] getSupers(final JSClass candidate)
-			{
-				return candidate.getImplementedInterfaces();
-			}
-
-			@Override
-			public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull Processor<? super JSClass> consumer)
-			{
-				final Set<JSClass> visited = new HashSet<JSClass>();         // no abstract classes in ActionScript !
-
-				if(queryParameters.isCheckDeepInheritance())
-				{
-					final Processor<? super JSClass> consumerCopy = consumer;
-					consumer = new Processor<JSClass>()
-					{
-						@Override
-						public boolean process(JSClass jsClass)
-						{
-							return consumerCopy.process(jsClass) && OUR_CLASS_SEARCH_EXECUTOR.processDirectInheritors(jsClass, this, false, visited,
-									queryParameters.getScope());
-						}
-					};
-				}
-
-				final Processor<? super JSClass> consumerToUse = consumer;
-				final boolean b = processDirectInheritors(queryParameters.getTargetClass(), consumerToUse, queryParameters.isCheckDeepInheritance(), visited,
-						queryParameters.getScope());
-				if(b)
-				{
-					return searchClassInheritors(queryParameters.getTargetClass(), queryParameters.isCheckDeepInheritance()).forEach(new Processor<JSClass>()
-					{
-						@Override
-						public boolean process(final JSClass jsClass)
-						{
-							return processDirectInheritors(jsClass, consumerToUse, queryParameters.isCheckDeepInheritance(), visited, queryParameters.getScope());
-						}
-					});
-				}
-				return b;
-			}
-
-			@Override
-			protected Collection<JSClass> getInheritors(JSClassInheritorsProvider provider, String parentName, Project project, GlobalSearchScope scope)
-			{
-				return provider.getImplementingClasses(parentName, project, scope);
-			}
-		});
-
-		CLASS_INHERITORS_QUERY_FACTORY.registerExecutor(OUR_CLASS_SEARCH_EXECUTOR = new JSClassSearch()
-		{
-			@Override
-			protected StubIndexKey<String, JSReferenceList> getIndexKey()
-			{
-				return JavaScriptIndexKeys.EXTENDS_INDEX;
-			}
-
-			@Override
-			protected JSClass[] getSupers(final JSClass candidate)
-			{
-				return candidate.getSuperClasses();
-			}
-
-			@Override
-			protected Collection<JSClass> getInheritors(JSClassInheritorsProvider provider, String parentName, Project project, GlobalSearchScope scope)
-			{
-				return provider.getExtendingClasses(parentName, project, scope);
-			}
-
-		});
-	}
-
-	@Override
-	public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull final Processor<? super JSClass> consumer)
-	{
-		return processDirectInheritors(queryParameters.getTargetClass(), consumer, queryParameters.isCheckDeepInheritance(), null,
-				queryParameters.getScope());
-	}
-
-	protected boolean processDirectInheritors(final JSClass superClass, final Processor<? super JSClass> consumer, final boolean checkDeep, Set<JSClass> processed, final GlobalSearchScope scope)
-	{
-		if(processed != null)
-		{
-			if(processed.contains(superClass))
-			{
-				return true;
-			}
-		}
-		else
-		{
-			processed = new HashSet<JSClass>();
-		}
-
-		processed.add(superClass);
-		Project project = superClass.getProject();
-		final String name = superClass.getName();
-		if(name == null)
-		{
-			return true;
-		}
-
-		final Set<JSClass> temp = processed;
-		final Processor<JSClass> processor = new Processor<JSClass>()
-		{
-			@Override
-			public boolean process(JSClass candidate)
-			{
-				final JSClass[] classes = getSupers(candidate);
-				if(classes != null)
-				{
-					for(JSClass superClassCandidate : classes)
-					{
-						if(superClassCandidate.isEquivalentTo(superClass))
-						{
-							if(!consumer.process(candidate))
-							{
-								return false;
-							}
-							if(checkDeep && !processDirectInheritors(candidate, consumer, checkDeep, temp, scope))
-							{
-								return false;
-							}
-						}
-					}
-				}
-
-				return true;
-			}
-		};
-
-		CommonProcessors.CollectProcessor<JSReferenceList> collectProcessor = new CommonProcessors.CollectProcessor<>();
-
-		StubIndex.getInstance().processElements(getIndexKey(), name, project, scope, JSReferenceList.class, collectProcessor);
-
-		for(JSReferenceList referenceList : collectProcessor.getResults())
-		{
-			JSClass parent = (JSClass) referenceList.getParent();
-			if(!processor.process(parent))
-			{
-				return false;
-			}
-		}
-
-		for(JSClassInheritorsProvider provider : Extensions.getExtensions(JSClassInheritorsProvider.EP_NAME))
-		{
-			Collection<JSClass> inheritors = getInheritors(provider, name, project, scope);
-			for(JSClass inheritor : inheritors)
-			{
-				if(!processor.process(inheritor))
-				{
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	protected abstract Collection<JSClass> getInheritors(JSClassInheritorsProvider provider, String parentName, Project project,
-			GlobalSearchScope scope);
-
-	protected abstract StubIndexKey<String, JSReferenceList> getIndexKey();
-
-	protected abstract JSClass[] getSupers(final JSClass candidate);
+public abstract class JSClassSearch implements QueryExecutor<JSClass, JSClassSearch.SearchParameters> {
+    public static class SearchParameters {
+        private final JSClass myClass;
+        private final boolean myCheckDeepInheritance;
+        private final GlobalSearchScope myScope;
+
+        public SearchParameters(final JSClass anClass, final boolean checkDeepInheritance, GlobalSearchScope scope) {
+            myClass = anClass;
+            myCheckDeepInheritance = checkDeepInheritance;
+            myScope = scope;
+        }
+
+        public JSClass getTargetClass() {
+            return myClass;
+        }
+
+        public boolean isCheckDeepInheritance() {
+            return myCheckDeepInheritance;
+        }
+
+        public GlobalSearchScope getScope() {
+            return myScope;
+        }
+    }
+
+    public static Query<JSClass> searchClassInheritors(final JSClass superClass, final boolean checkDeepInheritance) {
+        final SearchParameters parameters = new SearchParameters(superClass, checkDeepInheritance, getUseScope(superClass));
+        return CLASS_INHERITORS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
+    }
+
+    private static GlobalSearchScope getUseScope(JSClass superClass) {
+        SearchScope searchScope = superClass.getUseScope();
+        return (GlobalSearchScope)searchScope;
+    }
+
+    public static Query<JSClass> searchInterfaceImplementations(final JSClass superClass, final boolean checkDeepInheritance) {
+        final SearchParameters parameters = new SearchParameters(superClass, checkDeepInheritance, getUseScope(superClass));
+        return INTERFACE_IMPLEMENTATIONS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
+    }
+
+    // implementation
+    private static final QueryFactory<JSClass, SearchParameters> INTERFACE_IMPLEMENTATIONS_QUERY_FACTORY = new QueryFactory<>();
+    private static final QueryFactory<JSClass, SearchParameters> CLASS_INHERITORS_QUERY_FACTORY = new QueryFactory<>();
+    private static final JSClassSearch OUR_CLASS_SEARCH_EXECUTOR;
+
+    static {
+        INTERFACE_IMPLEMENTATIONS_QUERY_FACTORY.registerExecutor(new JSClassSearch() {
+            @Override
+            protected StubIndexKey<String, JSReferenceList> getIndexKey() {
+                return JavaScriptIndexKeys.IMPLEMENTED_INDEX;
+            }
+
+            @Override
+            protected JSClass[] getSupers(final JSClass candidate) {
+                return candidate.getImplementedInterfaces();
+            }
+
+            @Override
+            public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull Processor<? super JSClass> consumer) {
+                final Set<JSClass> visited = new HashSet<JSClass>();         // no abstract classes in ActionScript !
+
+                if (queryParameters.isCheckDeepInheritance()) {
+                    final Processor<? super JSClass> consumerCopy = consumer;
+                    consumer = new Processor<>() {
+                        @Override
+                        public boolean process(JSClass jsClass) {
+                            return consumerCopy.process(jsClass) && OUR_CLASS_SEARCH_EXECUTOR.processDirectInheritors(
+                                jsClass,
+                                this,
+                                false,
+                                visited,
+                                queryParameters.getScope()
+                            );
+                        }
+                    };
+                }
+
+                final Processor<? super JSClass> consumerToUse = consumer;
+                final boolean b = processDirectInheritors(
+                    queryParameters.getTargetClass(),
+                    consumerToUse,
+                    queryParameters.isCheckDeepInheritance(),
+                    visited,
+                    queryParameters.getScope()
+                );
+                if (b) {
+                    return searchClassInheritors(
+                        queryParameters.getTargetClass(),
+                        queryParameters.isCheckDeepInheritance()
+                    ).forEach(jsClass -> {
+                        return processDirectInheritors(
+                            jsClass,
+                            consumerToUse,
+                            queryParameters.isCheckDeepInheritance(),
+                            visited,
+                            queryParameters.getScope()
+                        );
+                    });
+                }
+                return b;
+            }
+
+            @Override
+            protected Collection<JSClass> getInheritors(
+                JSClassInheritorsProvider provider,
+                String parentName,
+                Project project,
+                GlobalSearchScope scope
+            ) {
+                return provider.getImplementingClasses(parentName, project, scope);
+            }
+        });
+
+        CLASS_INHERITORS_QUERY_FACTORY.registerExecutor(OUR_CLASS_SEARCH_EXECUTOR = new JSClassSearch() {
+            @Override
+            protected StubIndexKey<String, JSReferenceList> getIndexKey() {
+                return JavaScriptIndexKeys.EXTENDS_INDEX;
+            }
+
+            @Override
+            protected JSClass[] getSupers(final JSClass candidate) {
+                return candidate.getSuperClasses();
+            }
+
+            @Override
+            protected Collection<JSClass> getInheritors(
+                JSClassInheritorsProvider provider,
+                String parentName,
+                Project project,
+                GlobalSearchScope scope
+            ) {
+                return provider.getExtendingClasses(parentName, project, scope);
+            }
+
+        });
+    }
+
+    @Override
+    public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull final Processor<? super JSClass> consumer) {
+        return processDirectInheritors(queryParameters.getTargetClass(), consumer, queryParameters.isCheckDeepInheritance(), null,
+            queryParameters.getScope()
+        );
+    }
+
+    protected boolean processDirectInheritors(
+        final JSClass superClass,
+        final Processor<? super JSClass> consumer,
+        final boolean checkDeep,
+        Set<JSClass> processed,
+        final GlobalSearchScope scope
+    ) {
+        if (processed != null) {
+            if (processed.contains(superClass)) {
+                return true;
+            }
+        }
+        else {
+            processed = new HashSet<>();
+        }
+
+        processed.add(superClass);
+        Project project = superClass.getProject();
+        final String name = superClass.getName();
+        if (name == null) {
+            return true;
+        }
+
+        final Set<JSClass> temp = processed;
+        final Processor<JSClass> processor = candidate -> {
+            final JSClass[] classes = getSupers(candidate);
+            if (classes != null) {
+                for (JSClass superClassCandidate : classes) {
+                    if (superClassCandidate.isEquivalentTo(superClass)) {
+                        if (!consumer.process(candidate)) {
+                            return false;
+                        }
+                        if (checkDeep && !processDirectInheritors(candidate, consumer, checkDeep, temp, scope)) {
+                            return false;
+                        }
+                    }
+                }
+            }
+
+            return true;
+        };
+
+        CommonProcessors.CollectProcessor<JSReferenceList> collectProcessor = new CommonProcessors.CollectProcessor<>();
+
+        StubIndex.getInstance().processElements(getIndexKey(), name, project, scope, JSReferenceList.class, collectProcessor);
+
+        for (JSReferenceList referenceList : collectProcessor.getResults()) {
+            JSClass parent = (JSClass)referenceList.getParent();
+            if (!processor.process(parent)) {
+                return false;
+            }
+        }
+
+        for (JSClassInheritorsProvider provider : Extensions.getExtensions(JSClassInheritorsProvider.EP_NAME)) {
+            Collection<JSClass> inheritors = getInheritors(provider, name, project, scope);
+            for (JSClass inheritor : inheritors) {
+                if (!processor.process(inheritor)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    protected abstract Collection<JSClass> getInheritors(
+        JSClassInheritorsProvider provider, String parentName, Project project,
+        GlobalSearchScope scope
+    );
+
+    protected abstract StubIndexKey<String, JSReferenceList> getIndexKey();
+
+    protected abstract JSClass[] getSupers(final JSClass candidate);
 }
\ No newline at end of file

From 1398e8a66c603c1c8ec00129176f6d0cc1d4731a Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 28 Jul 2024 22:01:27 +0300
Subject: [PATCH 229/340] Formatting fix for JSClassSearch.

---
 .../com/intellij/lang/javascript/search/JSClassSearch.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index c008bda3..dff77741 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -246,7 +246,9 @@ protected boolean processDirectInheritors(
     }
 
     protected abstract Collection<JSClass> getInheritors(
-        JSClassInheritorsProvider provider, String parentName, Project project,
+        JSClassInheritorsProvider provider,
+        String parentName,
+        Project project,
         GlobalSearchScope scope
     );
 

From 844c2ea080d8f1199f90f7317b1ad752db1e469c Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 28 Jul 2024 23:44:22 +0300
Subject: [PATCH 230/340] Code reformat using IJ4 code style (part 18).

---
 .../lang/javascript/DialectOptionHolder.java  |  48 +-
 .../lang/javascript/JSDocElementType.java     |  10 +-
 .../lang/javascript/JSDocTokenTypes.java      |  41 +-
 .../lang/javascript/JSElementType.java        |  10 +-
 .../lang/javascript/JSElementTypes.java       | 377 ++++++-----
 .../lang/javascript/JSFlexAdapter.java        |  41 +-
 .../JavaScriptHighlightingLexer.java          | 193 +++---
 .../JavaScriptParsingFlexLexer.java           |  10 +-
 .../JavaScriptStubElementHolder.java          |  25 +-
 .../javascript/JavaScriptSupportLoader.java   | 153 ++---
 .../types/JSAttributeElementType.java         |  67 +-
 .../types/JSAttributeListElementType.java     |  76 +--
 .../types/JSAttributeNameValuePairType.java   |  75 +--
 .../javascript/types/JSClassElementType.java  |  95 ++-
 .../javascript/types/JSFileElementType.java   | 100 ++-
 .../types/JSFunctionElementType.java          |  99 ++-
 .../types/JSImportStatementElementType.java   |  69 +-
 .../types/JSIncludeDirectiveElementType.java  |  69 +-
 .../JSNamespaceDeclarationElementType.java    |  88 ++-
 .../types/JSPackageStatementElementType.java  |  75 +--
 .../types/JSParameterElementType.java         | 102 +--
 .../types/JSParameterListElementType.java     |  64 +-
 .../types/JSReferenceListElementType.java     | 125 ++--
 .../types/JSUseNamespaceDirectiveType.java    |  67 +-
 .../types/JSVarStatementElementType.java      |  74 +--
 .../types/JSVariableElementType.java          | 141 ++--
 .../validation/JSUnusedImportsHelper.java     | 602 ++++++++----------
 27 files changed, 1377 insertions(+), 1519 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java b/base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
index f29bdb57..c885ad25 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
@@ -20,34 +20,30 @@
  * @author Maxim.Mossienko
  */
 @Deprecated
-public final class DialectOptionHolder
-{
-	public static DialectOptionHolder dummy()
-	{
-		return new DialectOptionHolder(false, false);
-	}
+public final class DialectOptionHolder {
+    public static DialectOptionHolder dummy() {
+        return new DialectOptionHolder(false, false);
+    }
 
-	public final boolean isECMAL4Level;
-	public final boolean isJavaScript1_6_OrBetter;
-	public final boolean hasE4X;
-	public final boolean isJavaScript1_7_OrBetter;
-	public final boolean isJavaScript1_8_OrBetter;
-	public final boolean isGwt;
+    public final boolean isECMAL4Level;
+    public final boolean isJavaScript1_6_OrBetter;
+    public final boolean hasE4X;
+    public final boolean isJavaScript1_7_OrBetter;
+    public final boolean isJavaScript1_8_OrBetter;
+    public final boolean isGwt;
 
-	public DialectOptionHolder(boolean _ecma, boolean _gwt)
-	{
-		this(_ecma, _gwt, true);
-	}
+    public DialectOptionHolder(boolean _ecma, boolean _gwt) {
+        this(_ecma, _gwt, true);
+    }
 
-	public DialectOptionHolder(boolean _ecma, boolean _gwt, final boolean _e4x)
-	{
-		isECMAL4Level = _ecma;
-		isGwt = _gwt;
-		isJavaScript1_7_OrBetter = _e4x;
-		isJavaScript1_8_OrBetter = _e4x;
-		isJavaScript1_6_OrBetter = _e4x;
-		hasE4X = _e4x;
+    public DialectOptionHolder(boolean _ecma, boolean _gwt, final boolean _e4x) {
+        isECMAL4Level = _ecma;
+        isGwt = _gwt;
+        isJavaScript1_7_OrBetter = _e4x;
+        isJavaScript1_8_OrBetter = _e4x;
+        isJavaScript1_6_OrBetter = _e4x;
+        hasE4X = _e4x;
 
-		assert !isGwt || !isECMAL4Level;
-	}
+        assert !isGwt || !isECMAL4Level;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
index 356daab4..246dd974 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
@@ -22,10 +22,8 @@
 /**
  * @author yole
  */
-public class JSDocElementType extends JSElementType
-{
-	public JSDocElementType(@Nonnull @NonNls String debugName)
-	{
-		super(debugName);
-	}
+public class JSDocElementType extends JSElementType {
+    public JSDocElementType(@Nonnull @NonNls String debugName) {
+        super(debugName);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
index c21ed65c..f4c61de5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocTokenTypes.java
@@ -23,27 +23,26 @@
 /**
  * @by maxim.mossienko
  */
-public interface JSDocTokenTypes
-{
-	IElementType DOC_COMMENT_START = new JSDocElementType("DOC_COMMENT_START");
-	IElementType DOC_COMMENT_END = new JSDocElementType("DOC_COMMENT_END");
-	IElementType DOC_SPACE = new JSDocElementType("DOC_SPACE");
-	IElementType DOC_REAL_WHITESPACE = TokenType.WHITE_SPACE;
-	IElementType DOC_COMMENT_DATA = new JSDocElementType("DOC_COMMENT_DATA");
-	IElementType DOC_COMMENT_LEADING_ASTERISK = new JSDocElementType("DOC_COMMENT_LEADING_ASTERISK");
-	IElementType DOC_TAG_NAME = new JSDocElementType("DOC_TAG_NAME");
-	IElementType DOC_BAD_CHARACTER = TokenType.BAD_CHARACTER;
-	IElementType DOC_TAG_VALUE = new JSDocElementType("DOC_TAG_VALUE");
+public interface JSDocTokenTypes {
+    IElementType DOC_COMMENT_START = new JSDocElementType("DOC_COMMENT_START");
+    IElementType DOC_COMMENT_END = new JSDocElementType("DOC_COMMENT_END");
+    IElementType DOC_SPACE = new JSDocElementType("DOC_SPACE");
+    IElementType DOC_REAL_WHITESPACE = TokenType.WHITE_SPACE;
+    IElementType DOC_COMMENT_DATA = new JSDocElementType("DOC_COMMENT_DATA");
+    IElementType DOC_COMMENT_LEADING_ASTERISK = new JSDocElementType("DOC_COMMENT_LEADING_ASTERISK");
+    IElementType DOC_TAG_NAME = new JSDocElementType("DOC_TAG_NAME");
+    IElementType DOC_BAD_CHARACTER = TokenType.BAD_CHARACTER;
+    IElementType DOC_TAG_VALUE = new JSDocElementType("DOC_TAG_VALUE");
 
-	TokenSet TOKENS_TO_MERGE = TokenSet.create(DOC_SPACE, DOC_REAL_WHITESPACE);
-	IElementType DOC_TAG = new JSDocElementType("DOC_TAG");
+    TokenSet TOKENS_TO_MERGE = TokenSet.create(DOC_SPACE, DOC_REAL_WHITESPACE);
+    IElementType DOC_TAG = new JSDocElementType("DOC_TAG");
 
-	IElementType DOC_TAG_VALUE_LPAREN = new JSDocElementType("DOC_TAG_VALUE_LPAREN");
-	IElementType DOC_TAG_VALUE_RPAREN = new JSDocElementType("DOC_TAG_VALUE_RPAREN");
-	IElementType DOC_TAG_VALUE_SHARP = new JSDocElementType("DOC_TAG_VALUE_SHARP");
-	IElementType DOC_TAG_VALUE_COMMA = new JSDocElementType("DOC_TAG_VALUE_COMMA");
-	IElementType DOC_TAG_VALUE_LT = new JSDocElementType("DOC_TAG_VALUE_LT");
-	IElementType DOC_TAG_VALUE_GT = new JSDocElementType("DOC_TAG_VALUE_GT");
-	IElementType INLINE_TAG_START = new JSDocElementType("DOC_INLINE_TAG_START");
-	IElementType INLINE_TAG_END = new JSDocElementType("DOC_INLINE_TAG_END");
+    IElementType DOC_TAG_VALUE_LPAREN = new JSDocElementType("DOC_TAG_VALUE_LPAREN");
+    IElementType DOC_TAG_VALUE_RPAREN = new JSDocElementType("DOC_TAG_VALUE_RPAREN");
+    IElementType DOC_TAG_VALUE_SHARP = new JSDocElementType("DOC_TAG_VALUE_SHARP");
+    IElementType DOC_TAG_VALUE_COMMA = new JSDocElementType("DOC_TAG_VALUE_COMMA");
+    IElementType DOC_TAG_VALUE_LT = new JSDocElementType("DOC_TAG_VALUE_LT");
+    IElementType DOC_TAG_VALUE_GT = new JSDocElementType("DOC_TAG_VALUE_GT");
+    IElementType INLINE_TAG_START = new JSDocElementType("DOC_INLINE_TAG_START");
+    IElementType INLINE_TAG_END = new JSDocElementType("DOC_INLINE_TAG_END");
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
index cd76a525..8ae120d2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
@@ -27,10 +27,8 @@
  * Date: Jan 27, 2005
  * Time: 6:38:56 PM
  */
-public class JSElementType extends IElementType
-{
-	public JSElementType(@NonNls @Nonnull String debugName)
-	{
-		super(debugName, JavaScriptLanguage.INSTANCE);
-	}
+public class JSElementType extends IElementType {
+    public JSElementType(@NonNls @Nonnull String debugName) {
+        super(debugName, JavaScriptLanguage.INSTANCE);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index abbd0ca3..13239801 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -54,151 +54,236 @@
  * Date: Jan 28, 2005
  * Time: 12:27:21 AM
  */
-public interface JSElementTypes
-{
-	IStubFileElementType<JSFileStub> FILE = new JSFileElementType(JavaScriptLanguage.INSTANCE);
-
-	IElementType EMBEDDED_CONTENT = new ILazyParseableElementType("EMBEDDED_CONTENT", JavaScriptLanguage.INSTANCE)
-	{
-		@Override
-		@RequiredReadAction
-		protected ASTNode doParseContents(@Nonnull final ASTNode chameleon, @Nonnull final PsiElement psi)
-		{
-			LanguageVersion languageVersion = LanguageVersionUtil.findLanguageVersion(getLanguage(), psi);
-			Project project = psi.getProject();
-			Language languageForParser = getLanguageForParser(psi);
-			PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, languageVersion, chameleon.getChars());
-			PsiParser parser = ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
-			return parser.parse(this, builder, languageVersion).getFirstChildNode();
-		}
-	};
-
-	IElementType EMBEDDED_EXPRESSION = new ElementTypeAsPsiFactory("EMBEDDED_EXPRESSION", JavaScriptLanguage.INSTANCE, JSEmbeddedContentImpl::new);
-
-	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = JSStubElementTypes.FUNCTION_DECLARATION;
-
-	JSStubElementType<JSParameterListStub, JSParameterList> PARAMETER_LIST = JSStubElementTypes.PARAMETER_LIST;
-
-	JSStubElementType<JSParameterStub, JSParameter> FORMAL_PARAMETER = JSStubElementTypes.FORMAL_PARAMETER;
-
-	JSStubElementType<JSVariableStub, JSVariable> VARIABLE = JSStubElementTypes.VARIABLE;
-	IElementType ARGUMENT_LIST = new ElementTypeAsPsiFactory("ARGUMENT_LIST", JavaScriptLanguage.INSTANCE, JSArgumentListImpl::new);
-
-	JSStubElementType<JSAttributeStub, JSAttribute> ATTRIBUTE = JSStubElementTypes.ATTRIBUTE;
-	JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> ATTRIBUTE_NAME_VALUE_PAIR = JSStubElementTypes.ATTRIBUTE_NAME_VALUE_PAIR;
-	JSStubElementType<JSAttributeListStub, JSAttributeList> ATTRIBUTE_LIST = JSStubElementTypes.ATTRIBUTE_LIST;
-	JSStubElementType<JSPackageStatementStub, JSPackageStatement> PACKAGE_STATEMENT = JSStubElementTypes.PACKAGE_STATEMENT;
-
-	@Deprecated
-	JSStubElementType<JSImportStatementStub, JSImportStatement> ES4_IMPORT_STATEMENT = EcmaScript4ElementTypes.IMPORT_STATEMENT;
-
-	JSStubElementType<JSClassStub, JSClass> CLASS = JSStubElementTypes.CLASS;
-	JSStubElementType<JSReferenceListStub, JSReferenceList> EXTENDS_LIST = JSStubElementTypes.EXTENDS_LIST;
-	JSStubElementType<JSReferenceListStub, JSReferenceList> IMPLEMENTS_LIST = JSStubElementTypes.IMPLEMENTS_LIST;
-	JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective> USE_NAMESPACE_DIRECTIVE = JSStubElementTypes.USE_NAMESPACE_DIRECTIVE;
-	JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> INCLUDE_DIRECTIVE = JSStubElementTypes.INCLUDE_DIRECTIVE;
-	JSStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration> NAMESPACE_DECLARATION = JSStubElementTypes.NAMESPACE_DECLARATION;
-	IElementType SUPER_EXPRESSION = new ElementTypeAsPsiFactory("SUPER_EXPRESSION", JavaScriptLanguage.INSTANCE, JSSuperExpressionImpl::new);
-	IElementType GENERIC_SIGNATURE = new ElementTypeAsPsiFactory("GENERIC_SIGNATURE", JavaScriptLanguage.INSTANCE, JSGenericSignatureImpl::new);
-
-	// Statements
-	IElementType BLOCK_STATEMENT = new ElementTypeAsPsiFactory("BLOCK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBlockStatementImpl::new);
-	IElementType LABELED_STATEMENT = new ElementTypeAsPsiFactory("LABELED_STATEMENT", JavaScriptLanguage.INSTANCE, JSLabeledStatementImpl::new);
-	IElementType EXPRESSION_STATEMENT = new ElementTypeAsPsiFactory("EXPRESSION_STATEMENT", JavaScriptLanguage.INSTANCE,
-			JSExpressionStatementImpl::new);
-	IElementType YIELD_STATEMENT = new ElementTypeAsPsiFactory("YIELD_STATEMENT", JavaScriptLanguage.INSTANCE, JSYieldStatementImpl::new);
-	IElementType LET_STATEMENT = new ElementTypeAsPsiFactory("LET_STATEMENT", JavaScriptLanguage.INSTANCE, JSLetStatementImpl::new);
-	JSStubElementType<JSVarStatementStub, JSVarStatement> VAR_STATEMENT = JSStubElementTypes.VAR_STATEMENT;
-	IElementType EMPTY_STATEMENT = new ElementTypeAsPsiFactory("EMPTY_STATEMENT", JavaScriptLanguage.INSTANCE, JSEmptyStatementImpl::new);
-	IElementType IF_STATEMENT = new ElementTypeAsPsiFactory("IF_STATEMENT", JavaScriptLanguage.INSTANCE, JSIfStatementImpl::new);
-	IElementType CONTINUE_STATEMENT = new ElementTypeAsPsiFactory("CONTINUE_STATEMENT", JavaScriptLanguage.INSTANCE, JSContinueStatementImpl::new);
-	IElementType BREAK_STATEMENT = new ElementTypeAsPsiFactory("BREAK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBreakStatementImpl::new);
-	IElementType DESTRUCTURING_ELEMENT = new ElementTypeAsPsiFactory("DESTRUCTURING_ELEMENT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringElementImpl::new);
-	IElementType DESTRUCTURING_PARAMETER = new ElementTypeAsPsiFactory("DESTRUCTURING_PARAMETER", JavaScriptLanguage.INSTANCE, JavaScriptDestructuringParameterImpl::new);
-	IElementType DESTRUCTURING_OBJECT = new ElementTypeAsPsiFactory("DESTRUCTURING_OBJECT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringObjectImpl::new);
-	IElementType DESTRUCTURING_SHORTHANDED_PROPERTY = new ElementTypeAsPsiFactory("DESTRUCTURING_SHORTHANDED_PROPERTY", JavaScriptLanguage.INSTANCE,
-			JavaScriptDestructuringShorthandedPropertyImpl::new);
-	IElementType WITH_STATEMENT = new ElementTypeAsPsiFactory("WITH_STATEMENT", JavaScriptLanguage.INSTANCE, JSWithStatementImpl::new);
-	IElementType RETURN_STATEMENT = new ElementTypeAsPsiFactory("RETURN_STATEMENT", JavaScriptLanguage.INSTANCE, JSReturnStatementImpl::new);
-	IElementType THROW_STATEMENT = new ElementTypeAsPsiFactory("THROW_STATEMENT", JavaScriptLanguage.INSTANCE, JSThrowStatementImpl::new);
-	IElementType TRY_STATEMENT = new ElementTypeAsPsiFactory("TRY_STATEMENT", JavaScriptLanguage.INSTANCE, JSTryStatementImpl::new);
-	IElementType CATCH_BLOCK = new ElementTypeAsPsiFactory("CATCH_BLOCK", JavaScriptLanguage.INSTANCE, JSCatchBlockImpl::new);
-	IElementType CASE_CLAUSE = new ElementTypeAsPsiFactory("CASE_CLAUSE", JavaScriptLanguage.INSTANCE, JSCaseClauseImpl::new);
-	IElementType SWITCH_STATEMENT = new ElementTypeAsPsiFactory("SWITCH_STATEMENT", JavaScriptLanguage.INSTANCE, JSSwitchStatementImpl::new);
-	IElementType FOR_STATEMENT = new ElementTypeAsPsiFactory("FOR_STATEMENT", JavaScriptLanguage.INSTANCE, JSForStatementImpl::new);
-	IElementType FOR_IN_STATEMENT = new ElementTypeAsPsiFactory("FOR_IN_STATEMENT", JavaScriptLanguage.INSTANCE, JSForInStatementImpl::new);
-	IElementType WHILE_STATEMENT = new ElementTypeAsPsiFactory("WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSWhileStatementImpl::new);
-	IElementType DOWHILE_STATEMENT = new ElementTypeAsPsiFactory("DO_WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSDoWhileStatementImpl::new);
-
-	@Deprecated
-	@DeprecationInfo("Use search by class")
-	TokenSet STATEMENTS = TokenSet.create(BLOCK_STATEMENT, LABELED_STATEMENT, VAR_STATEMENT, EMPTY_STATEMENT, IF_STATEMENT, CONTINUE_STATEMENT,
-			BREAK_STATEMENT, WITH_STATEMENT, RETURN_STATEMENT, THROW_STATEMENT, TRY_STATEMENT, SWITCH_STATEMENT, FOR_IN_STATEMENT, FOR_STATEMENT,
-			WHILE_STATEMENT, DOWHILE_STATEMENT, EXPRESSION_STATEMENT, YIELD_STATEMENT, LET_STATEMENT, ES4_IMPORT_STATEMENT, PACKAGE_STATEMENT,
-			USE_NAMESPACE_DIRECTIVE);
-
-	TokenSet SOURCE_ELEMENTS = TokenSet.orSet(STATEMENTS, TokenSet.create(FUNCTION_DECLARATION, CLASS, NAMESPACE_DECLARATION, INCLUDE_DIRECTIVE,
-			USE_NAMESPACE_DIRECTIVE));
-
-	// Expressions
-	IElementType THIS_EXPRESSION = new ElementTypeAsPsiFactory("THIS_EXPRESSION", JavaScriptLanguage.INSTANCE, JSThisExpressionImpl::new);
-	IElementType REFERENCE_EXPRESSION = new ElementTypeAsPsiFactory("REFERENCE_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSReferenceExpressionImpl::new);
-	IElementType LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLiteralExpressionImpl::new);
-	IElementType REGEXP_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("REGEXP_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSRegExpLiteralExpressionImpl::new);
-	IElementType XML_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("XML_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSXmlLiteralExpressionImpl::new);
-	IElementType PARENTHESIZED_EXPRESSION = new ElementTypeAsPsiFactory("PARENTHESIZED_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSParenthesizedExpressionImpl::new);
-	IElementType ARRAY_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("ARRAY_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSArrayLiteralExpressionImpl::new);
-	IElementType PROPERTY = new ElementTypeAsPsiFactory("PROPERTY", JavaScriptLanguage.INSTANCE, JSPropertyImpl::new);
-	IElementType FUNCTION_PROPERTY = new ElementTypeAsPsiFactory("FUNCTION_PROPERTY", JavaScriptLanguage.INSTANCE, JSFunctionPropertyImpl::new);
-	IElementType COMPUTED_NAME = new ElementTypeAsPsiFactory("COMPUTED_NAME", JavaScriptLanguage.INSTANCE, JSComputedNameImpl::new);
-	IElementType OBJECT_LITERAL_EXPRESSION = new ElementTypeAsPsiFactory("OBJECT_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSObjectLiteralExpressionImpl::new);
-	IElementType ASSIGNMENT_EXPRESSION = new ElementTypeAsPsiFactory("ASSIGNMENT_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSAssignmentExpressionImpl::new);
-	IElementType CONDITIONAL_EXPRESSION = new ElementTypeAsPsiFactory("CONDITIONAL_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSConditionalExpressionImpl::new);
-	IElementType CLASS_EXPRESSION = new ElementTypeAsPsiFactory("CLASS_EXPRESSION", JavaScriptLanguage.INSTANCE, JSClassExpressionImpl::new);
-	IElementType BINARY_EXPRESSION = new ElementTypeAsPsiFactory("BINARY_EXPRESSION", JavaScriptLanguage.INSTANCE, JSBinaryExpressionImpl::new);
-	IElementType PREFIX_EXPRESSION = new ElementTypeAsPsiFactory("PREFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPrefixExpressionImpl::new);
-	IElementType POSTFIX_EXPRESSION = new ElementTypeAsPsiFactory("POSTFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPostfixExpressionImpl::new);
-	IElementType LAMBDA_EXPRESSION = new ElementTypeAsPsiFactory("LAMBDA_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptLambdaExpressionImpl::new);
-	IElementType SPREAD_EXPRESSION = new ElementTypeAsPsiFactory("SPREAD_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptSpreadExpressionImpl::new);
-	IElementType COMMA_EXPRESSION = new ElementTypeAsPsiFactory("COMMA_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCommaExpressionImpl::new);
-	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_EXPRESSION = new JSFunctionElementType("FUNCTION_EXPRESSION")
-	{
-		@Override
-		public JSFunction createPsi(@Nonnull JSFunctionStub stub)
-		{
-			return new JSFunctionExpressionImpl(stub, this);
-		}
-
-		@Nonnull
-		@Override
-		public PsiElement createElement(@Nonnull ASTNode astNode)
-		{
-			return new JSFunctionExpressionImpl(astNode);
-		}
-	};
-	IElementType NEW_EXPRESSION = new ElementTypeAsPsiFactory("NEW_EXPRESSION", JavaScriptLanguage.INSTANCE, JSNewExpressionImpl::new);
-
-	IElementType INDEXED_PROPERTY_ACCESS_EXPRESSION = new ElementTypeAsPsiFactory("INDEXED_PROPERTY_ACCESS_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSIndexedPropertyAccessExpressionImpl::new);
-	IElementType CALL_EXPRESSION = new ElementTypeAsPsiFactory("CALL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCallExpressionImpl::new);
-	IElementType DEFINITION_EXPRESSION = new ElementTypeAsPsiFactory("DEFINITION_EXPRESSION", JavaScriptLanguage.INSTANCE,
-			JSDefinitionExpressionImpl::new);
-	IElementType LET_EXPRESSION = new ElementTypeAsPsiFactory("LET_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLetExpressionImpl::new);
-
-	TokenSet PARAMETERS = TokenSet.create(FORMAL_PARAMETER, DESTRUCTURING_PARAMETER);
-
-	@Deprecated
-	@DeprecationInfo("Use search by class")
-	TokenSet EXPRESSIONS = TokenSet.create(THIS_EXPRESSION, REFERENCE_EXPRESSION, LITERAL_EXPRESSION, REGEXP_LITERAL_EXPRESSION, PARENTHESIZED_EXPRESSION,
-			ARRAY_LITERAL_EXPRESSION, OBJECT_LITERAL_EXPRESSION, ASSIGNMENT_EXPRESSION, CONDITIONAL_EXPRESSION, BINARY_EXPRESSION,
-			PREFIX_EXPRESSION, POSTFIX_EXPRESSION, COMMA_EXPRESSION, FUNCTION_EXPRESSION, NEW_EXPRESSION, INDEXED_PROPERTY_ACCESS_EXPRESSION,
-			CALL_EXPRESSION, DEFINITION_EXPRESSION, XML_LITERAL_EXPRESSION, SUPER_EXPRESSION, LET_EXPRESSION);
+public interface JSElementTypes {
+    IStubFileElementType<JSFileStub> FILE = new JSFileElementType(JavaScriptLanguage.INSTANCE);
 
+    IElementType EMBEDDED_CONTENT = new ILazyParseableElementType("EMBEDDED_CONTENT", JavaScriptLanguage.INSTANCE) {
+        @Override
+        @RequiredReadAction
+        protected ASTNode doParseContents(@Nonnull final ASTNode chameleon, @Nonnull final PsiElement psi) {
+            LanguageVersion languageVersion = LanguageVersionUtil.findLanguageVersion(getLanguage(), psi);
+            Project project = psi.getProject();
+            Language languageForParser = getLanguageForParser(psi);
+            PsiBuilder builder = PsiBuilderFactory.getInstance()
+                .createBuilder(project, chameleon, null, languageForParser, languageVersion, chameleon.getChars());
+            PsiParser parser = ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
+            return parser.parse(this, builder, languageVersion).getFirstChildNode();
+        }
+    };
+
+    IElementType EMBEDDED_EXPRESSION =
+        new ElementTypeAsPsiFactory("EMBEDDED_EXPRESSION", JavaScriptLanguage.INSTANCE, JSEmbeddedContentImpl::new);
+
+    JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = JSStubElementTypes.FUNCTION_DECLARATION;
+
+    JSStubElementType<JSParameterListStub, JSParameterList> PARAMETER_LIST = JSStubElementTypes.PARAMETER_LIST;
+
+    JSStubElementType<JSParameterStub, JSParameter> FORMAL_PARAMETER = JSStubElementTypes.FORMAL_PARAMETER;
+
+    JSStubElementType<JSVariableStub, JSVariable> VARIABLE = JSStubElementTypes.VARIABLE;
+    IElementType ARGUMENT_LIST =
+        new ElementTypeAsPsiFactory("ARGUMENT_LIST", JavaScriptLanguage.INSTANCE, JSArgumentListImpl::new);
+
+    JSStubElementType<JSAttributeStub, JSAttribute> ATTRIBUTE = JSStubElementTypes.ATTRIBUTE;
+    JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> ATTRIBUTE_NAME_VALUE_PAIR =
+        JSStubElementTypes.ATTRIBUTE_NAME_VALUE_PAIR;
+    JSStubElementType<JSAttributeListStub, JSAttributeList> ATTRIBUTE_LIST = JSStubElementTypes.ATTRIBUTE_LIST;
+    JSStubElementType<JSPackageStatementStub, JSPackageStatement> PACKAGE_STATEMENT = JSStubElementTypes.PACKAGE_STATEMENT;
+
+    @Deprecated
+    JSStubElementType<JSImportStatementStub, JSImportStatement> ES4_IMPORT_STATEMENT = EcmaScript4ElementTypes.IMPORT_STATEMENT;
+
+    JSStubElementType<JSClassStub, JSClass> CLASS = JSStubElementTypes.CLASS;
+    JSStubElementType<JSReferenceListStub, JSReferenceList> EXTENDS_LIST = JSStubElementTypes.EXTENDS_LIST;
+    JSStubElementType<JSReferenceListStub, JSReferenceList> IMPLEMENTS_LIST = JSStubElementTypes.IMPLEMENTS_LIST;
+    JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective> USE_NAMESPACE_DIRECTIVE =
+        JSStubElementTypes.USE_NAMESPACE_DIRECTIVE;
+    JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> INCLUDE_DIRECTIVE = JSStubElementTypes.INCLUDE_DIRECTIVE;
+    JSStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration> NAMESPACE_DECLARATION = JSStubElementTypes.NAMESPACE_DECLARATION;
+    IElementType SUPER_EXPRESSION =
+        new ElementTypeAsPsiFactory("SUPER_EXPRESSION", JavaScriptLanguage.INSTANCE, JSSuperExpressionImpl::new);
+    IElementType GENERIC_SIGNATURE =
+        new ElementTypeAsPsiFactory("GENERIC_SIGNATURE", JavaScriptLanguage.INSTANCE, JSGenericSignatureImpl::new);
+
+    // Statements
+    IElementType BLOCK_STATEMENT =
+        new ElementTypeAsPsiFactory("BLOCK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBlockStatementImpl::new);
+    IElementType LABELED_STATEMENT =
+        new ElementTypeAsPsiFactory("LABELED_STATEMENT", JavaScriptLanguage.INSTANCE, JSLabeledStatementImpl::new);
+    IElementType EXPRESSION_STATEMENT =
+        new ElementTypeAsPsiFactory("EXPRESSION_STATEMENT", JavaScriptLanguage.INSTANCE, JSExpressionStatementImpl::new);
+    IElementType YIELD_STATEMENT =
+        new ElementTypeAsPsiFactory("YIELD_STATEMENT", JavaScriptLanguage.INSTANCE, JSYieldStatementImpl::new);
+    IElementType LET_STATEMENT =
+        new ElementTypeAsPsiFactory("LET_STATEMENT", JavaScriptLanguage.INSTANCE, JSLetStatementImpl::new);
+    JSStubElementType<JSVarStatementStub, JSVarStatement> VAR_STATEMENT = JSStubElementTypes.VAR_STATEMENT;
+    IElementType EMPTY_STATEMENT =
+        new ElementTypeAsPsiFactory("EMPTY_STATEMENT", JavaScriptLanguage.INSTANCE, JSEmptyStatementImpl::new);
+    IElementType IF_STATEMENT = new ElementTypeAsPsiFactory("IF_STATEMENT", JavaScriptLanguage.INSTANCE, JSIfStatementImpl::new);
+    IElementType CONTINUE_STATEMENT =
+        new ElementTypeAsPsiFactory("CONTINUE_STATEMENT", JavaScriptLanguage.INSTANCE, JSContinueStatementImpl::new);
+    IElementType BREAK_STATEMENT =
+        new ElementTypeAsPsiFactory("BREAK_STATEMENT", JavaScriptLanguage.INSTANCE, JSBreakStatementImpl::new);
+    IElementType DESTRUCTURING_ELEMENT =
+        new ElementTypeAsPsiFactory("DESTRUCTURING_ELEMENT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringElementImpl::new);
+    IElementType DESTRUCTURING_PARAMETER = new ElementTypeAsPsiFactory(
+        "DESTRUCTURING_PARAMETER",
+        JavaScriptLanguage.INSTANCE,
+        JavaScriptDestructuringParameterImpl::new
+    );
+    IElementType DESTRUCTURING_OBJECT =
+        new ElementTypeAsPsiFactory("DESTRUCTURING_OBJECT", JavaScriptLanguage.INSTANCE, JavaSciptDestructuringObjectImpl::new);
+    IElementType DESTRUCTURING_SHORTHANDED_PROPERTY = new ElementTypeAsPsiFactory(
+        "DESTRUCTURING_SHORTHANDED_PROPERTY",
+        JavaScriptLanguage.INSTANCE,
+        JavaScriptDestructuringShorthandedPropertyImpl::new
+    );
+    IElementType WITH_STATEMENT =
+        new ElementTypeAsPsiFactory("WITH_STATEMENT", JavaScriptLanguage.INSTANCE, JSWithStatementImpl::new);
+    IElementType RETURN_STATEMENT =
+        new ElementTypeAsPsiFactory("RETURN_STATEMENT", JavaScriptLanguage.INSTANCE, JSReturnStatementImpl::new);
+    IElementType THROW_STATEMENT =
+        new ElementTypeAsPsiFactory("THROW_STATEMENT", JavaScriptLanguage.INSTANCE, JSThrowStatementImpl::new);
+    IElementType TRY_STATEMENT =
+        new ElementTypeAsPsiFactory("TRY_STATEMENT", JavaScriptLanguage.INSTANCE, JSTryStatementImpl::new);
+    IElementType CATCH_BLOCK = new ElementTypeAsPsiFactory("CATCH_BLOCK", JavaScriptLanguage.INSTANCE, JSCatchBlockImpl::new);
+    IElementType CASE_CLAUSE = new ElementTypeAsPsiFactory("CASE_CLAUSE", JavaScriptLanguage.INSTANCE, JSCaseClauseImpl::new);
+    IElementType SWITCH_STATEMENT =
+        new ElementTypeAsPsiFactory("SWITCH_STATEMENT", JavaScriptLanguage.INSTANCE, JSSwitchStatementImpl::new);
+    IElementType FOR_STATEMENT =
+        new ElementTypeAsPsiFactory("FOR_STATEMENT", JavaScriptLanguage.INSTANCE, JSForStatementImpl::new);
+    IElementType FOR_IN_STATEMENT =
+        new ElementTypeAsPsiFactory("FOR_IN_STATEMENT", JavaScriptLanguage.INSTANCE, JSForInStatementImpl::new);
+    IElementType WHILE_STATEMENT =
+        new ElementTypeAsPsiFactory("WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSWhileStatementImpl::new);
+    IElementType DOWHILE_STATEMENT =
+        new ElementTypeAsPsiFactory("DO_WHILE_STATEMENT", JavaScriptLanguage.INSTANCE, JSDoWhileStatementImpl::new);
+
+    @Deprecated
+    @DeprecationInfo("Use search by class")
+    TokenSet STATEMENTS = TokenSet.create(
+        BLOCK_STATEMENT,
+        LABELED_STATEMENT,
+        VAR_STATEMENT,
+        EMPTY_STATEMENT,
+        IF_STATEMENT,
+        CONTINUE_STATEMENT,
+        BREAK_STATEMENT,
+        WITH_STATEMENT,
+        RETURN_STATEMENT,
+        THROW_STATEMENT,
+        TRY_STATEMENT,
+        SWITCH_STATEMENT,
+        FOR_IN_STATEMENT,
+        FOR_STATEMENT,
+        WHILE_STATEMENT,
+        DOWHILE_STATEMENT,
+        EXPRESSION_STATEMENT,
+        YIELD_STATEMENT,
+        LET_STATEMENT,
+        ES4_IMPORT_STATEMENT,
+        PACKAGE_STATEMENT,
+        USE_NAMESPACE_DIRECTIVE
+    );
+
+    TokenSet SOURCE_ELEMENTS = TokenSet.orSet(
+        STATEMENTS,
+        TokenSet.create(FUNCTION_DECLARATION, CLASS, NAMESPACE_DECLARATION, INCLUDE_DIRECTIVE, USE_NAMESPACE_DIRECTIVE)
+    );
+
+    // Expressions
+    IElementType THIS_EXPRESSION =
+        new ElementTypeAsPsiFactory("THIS_EXPRESSION", JavaScriptLanguage.INSTANCE, JSThisExpressionImpl::new);
+    IElementType REFERENCE_EXPRESSION =
+        new ElementTypeAsPsiFactory("REFERENCE_EXPRESSION", JavaScriptLanguage.INSTANCE, JSReferenceExpressionImpl::new);
+    IElementType LITERAL_EXPRESSION =
+        new ElementTypeAsPsiFactory("LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLiteralExpressionImpl::new);
+    IElementType REGEXP_LITERAL_EXPRESSION =
+        new ElementTypeAsPsiFactory("REGEXP_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSRegExpLiteralExpressionImpl::new);
+    IElementType XML_LITERAL_EXPRESSION =
+        new ElementTypeAsPsiFactory("XML_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSXmlLiteralExpressionImpl::new);
+    IElementType PARENTHESIZED_EXPRESSION =
+        new ElementTypeAsPsiFactory("PARENTHESIZED_EXPRESSION", JavaScriptLanguage.INSTANCE, JSParenthesizedExpressionImpl::new);
+    IElementType ARRAY_LITERAL_EXPRESSION =
+        new ElementTypeAsPsiFactory("ARRAY_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSArrayLiteralExpressionImpl::new);
+    IElementType PROPERTY = new ElementTypeAsPsiFactory("PROPERTY", JavaScriptLanguage.INSTANCE, JSPropertyImpl::new);
+    IElementType FUNCTION_PROPERTY =
+        new ElementTypeAsPsiFactory("FUNCTION_PROPERTY", JavaScriptLanguage.INSTANCE, JSFunctionPropertyImpl::new);
+    IElementType COMPUTED_NAME =
+        new ElementTypeAsPsiFactory("COMPUTED_NAME", JavaScriptLanguage.INSTANCE, JSComputedNameImpl::new);
+    IElementType OBJECT_LITERAL_EXPRESSION =
+        new ElementTypeAsPsiFactory("OBJECT_LITERAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSObjectLiteralExpressionImpl::new);
+    IElementType ASSIGNMENT_EXPRESSION =
+        new ElementTypeAsPsiFactory("ASSIGNMENT_EXPRESSION", JavaScriptLanguage.INSTANCE, JSAssignmentExpressionImpl::new);
+    IElementType CONDITIONAL_EXPRESSION =
+        new ElementTypeAsPsiFactory("CONDITIONAL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSConditionalExpressionImpl::new);
+    IElementType CLASS_EXPRESSION =
+        new ElementTypeAsPsiFactory("CLASS_EXPRESSION", JavaScriptLanguage.INSTANCE, JSClassExpressionImpl::new);
+    IElementType BINARY_EXPRESSION =
+        new ElementTypeAsPsiFactory("BINARY_EXPRESSION", JavaScriptLanguage.INSTANCE, JSBinaryExpressionImpl::new);
+    IElementType PREFIX_EXPRESSION =
+        new ElementTypeAsPsiFactory("PREFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPrefixExpressionImpl::new);
+    IElementType POSTFIX_EXPRESSION =
+        new ElementTypeAsPsiFactory("POSTFIX_EXPRESSION", JavaScriptLanguage.INSTANCE, JSPostfixExpressionImpl::new);
+    IElementType LAMBDA_EXPRESSION =
+        new ElementTypeAsPsiFactory("LAMBDA_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptLambdaExpressionImpl::new);
+    IElementType SPREAD_EXPRESSION =
+        new ElementTypeAsPsiFactory("SPREAD_EXPRESSION", JavaScriptLanguage.INSTANCE, JavaScriptSpreadExpressionImpl::new);
+    IElementType COMMA_EXPRESSION =
+        new ElementTypeAsPsiFactory("COMMA_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCommaExpressionImpl::new);
+    JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_EXPRESSION = new JSFunctionElementType("FUNCTION_EXPRESSION") {
+        @Override
+        public JSFunction createPsi(@Nonnull JSFunctionStub stub) {
+            return new JSFunctionExpressionImpl(stub, this);
+        }
+
+        @Nonnull
+        @Override
+        public PsiElement createElement(@Nonnull ASTNode astNode) {
+            return new JSFunctionExpressionImpl(astNode);
+        }
+    };
+    IElementType NEW_EXPRESSION =
+        new ElementTypeAsPsiFactory("NEW_EXPRESSION", JavaScriptLanguage.INSTANCE, JSNewExpressionImpl::new);
+
+    IElementType INDEXED_PROPERTY_ACCESS_EXPRESSION =
+        new ElementTypeAsPsiFactory(
+            "INDEXED_PROPERTY_ACCESS_EXPRESSION",
+            JavaScriptLanguage.INSTANCE,
+            JSIndexedPropertyAccessExpressionImpl::new
+        );
+    IElementType CALL_EXPRESSION =
+        new ElementTypeAsPsiFactory("CALL_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCallExpressionImpl::new);
+    IElementType DEFINITION_EXPRESSION =
+        new ElementTypeAsPsiFactory("DEFINITION_EXPRESSION", JavaScriptLanguage.INSTANCE, JSDefinitionExpressionImpl::new);
+    IElementType LET_EXPRESSION =
+        new ElementTypeAsPsiFactory("LET_EXPRESSION", JavaScriptLanguage.INSTANCE, JSLetExpressionImpl::new);
+
+    TokenSet PARAMETERS = TokenSet.create(FORMAL_PARAMETER, DESTRUCTURING_PARAMETER);
+
+    @Deprecated
+    @DeprecationInfo("Use search by class")
+    TokenSet EXPRESSIONS = TokenSet.create(
+        THIS_EXPRESSION,
+        REFERENCE_EXPRESSION,
+        LITERAL_EXPRESSION,
+        REGEXP_LITERAL_EXPRESSION,
+        PARENTHESIZED_EXPRESSION,
+        ARRAY_LITERAL_EXPRESSION,
+        OBJECT_LITERAL_EXPRESSION,
+        ASSIGNMENT_EXPRESSION,
+        CONDITIONAL_EXPRESSION,
+        BINARY_EXPRESSION,
+        PREFIX_EXPRESSION,
+        POSTFIX_EXPRESSION,
+        COMMA_EXPRESSION,
+        FUNCTION_EXPRESSION,
+        NEW_EXPRESSION,
+        INDEXED_PROPERTY_ACCESS_EXPRESSION,
+        CALL_EXPRESSION,
+        DEFINITION_EXPRESSION,
+        XML_LITERAL_EXPRESSION,
+        SUPER_EXPRESSION,
+        LET_EXPRESSION
+    );
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
index a2db5938..1cab2e1e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
@@ -21,31 +21,26 @@
 /**
  * @author Maxim.Mossienko
  */
-public class JSFlexAdapter extends FlexAdapter
-{
-	private static final int BASE_STATE_MASK = 0xF;
-	private static final int TAG_COUNT_SHIFT = 4;
+public class JSFlexAdapter extends FlexAdapter {
+    private static final int BASE_STATE_MASK = 0xF;
+    private static final int TAG_COUNT_SHIFT = 4;
 
-	public JSFlexAdapter(boolean highlight, DialectOptionHolder optionHolder)
-	{
-		super(new _JavaScriptLexer(highlight, optionHolder));
-	}
+    public JSFlexAdapter(boolean highlight, DialectOptionHolder optionHolder) {
+        super(new _JavaScriptLexer(highlight, optionHolder));
+    }
 
-	@Override
-	public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState)
-	{
-		super.start(buffer, startOffset, endOffset, initialState & BASE_STATE_MASK);
-		((_JavaScriptLexer) getFlex()).setTagCount(initialState >> TAG_COUNT_SHIFT);
-	}
+    @Override
+    public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState) {
+        super.start(buffer, startOffset, endOffset, initialState & BASE_STATE_MASK);
+        ((_JavaScriptLexer)getFlex()).setTagCount(initialState >> TAG_COUNT_SHIFT);
+    }
 
-	@Override
-	public int getState()
-	{
-		return getStateInternal() + (((_JavaScriptLexer) getFlex()).getTagCount() << TAG_COUNT_SHIFT);
-	}
+    @Override
+    public int getState() {
+        return getStateInternal() + (((_JavaScriptLexer)getFlex()).getTagCount() << TAG_COUNT_SHIFT);
+    }
 
-	protected int getStateInternal()
-	{
-		return super.getState();
-	}
+    protected int getStateInternal() {
+        return super.getState();
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
index 6f283da5..4cecae82 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
@@ -29,105 +29,96 @@
  * To change this template use File | Settings | File Templates.
  */
 @Deprecated
-public class JavaScriptHighlightingLexer extends LayeredLexer
-{
-	public JavaScriptHighlightingLexer(DialectOptionHolder optionHolder)
-	{
-		this(optionHolder, true);
-	}
-
-	private JavaScriptHighlightingLexer(DialectOptionHolder optionHolder, boolean withEmbeddments)
-	{
-		super(new JSFlexAdapter(true, optionHolder));
-
-		if(withEmbeddments)
-		{
-			registerSelfStoppingLayer(new StringLiteralLexer('\"', JSTokenTypes.STRING_LITERAL, true, "/"), new IElementType[]{JSTokenTypes.STRING_LITERAL},
-					IElementType.EMPTY_ARRAY);
-
-			registerSelfStoppingLayer(new JavaScriptHighlightingLexer(optionHolder, false), new IElementType[]{JSTokenTypes.XML_JS_SCRIPT},
-					IElementType.EMPTY_ARRAY);
-
-			registerSelfStoppingLayer(new StringLiteralLexer('\'', JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, true, "/"),
-					new IElementType[]{JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL}, IElementType.EMPTY_ARRAY);
-
-			final LayeredLexer docLexer = new LayeredLexer(new FlexAdapter(new _JSDocLexer(true)));
-			final Lexer lexer = getHtmlHighlightingLexer();
-
-			// Force html highlighting lexer not to return tag content type since it causes token type collision in javascript embedded to html
-			docLexer.registerLayer(new LexerBase()
-			{
-				final IElementType tagContentType = getTagContentTokenType();
-
-
-				@Override
-				public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState)
-				{
-					lexer.start(buffer, startOffset, endOffset, initialState);
-				}
-
-				@Override
-				public int getState()
-				{
-					return lexer.getState();
-				}
-
-				@Override
-				public IElementType getTokenType()
-				{
-					final IElementType tokenType = lexer.getTokenType();
-					if(tokenType == tagContentType)
-					{
-						return JSTokenTypes.JSDOC_TAG_DATA;
-					}
-					return tokenType;
-				}
-
-				@Override
-				public int getTokenStart()
-				{
-					return lexer.getTokenStart();
-				}
-
-				@Override
-				public int getTokenEnd()
-				{
-					return lexer.getTokenEnd();
-				}
-
-				@Override
-				public void advance()
-				{
-					lexer.advance();
-				}
-
-				@Override
-				public CharSequence getBufferSequence()
-				{
-					return lexer.getBufferSequence();
-				}
-
-
-				@Override
-				public int getBufferEnd()
-				{
-					return lexer.getBufferEnd();
-				}
-			}, JSDocTokenTypes.DOC_COMMENT_DATA);
-			registerSelfStoppingLayer(docLexer, new IElementType[]{JSTokenTypes.DOC_COMMENT}, new IElementType[]{JSDocTokenTypes.DOC_COMMENT_END});
-
-		}
-	}
-
-	public static IElementType getTagContentTokenType()
-	{
-		final Lexer highlightingLexer = getHtmlHighlightingLexer();
-		highlightingLexer.start("a", 0, 1, 0);
-		return highlightingLexer.getTokenType();
-	}
-
-	private static Lexer getHtmlHighlightingLexer()
-	{
-		return SyntaxHighlighterFactory.getSyntaxHighlighter(HTMLLanguage.INSTANCE, null, null).getHighlightingLexer();
-	}
+public class JavaScriptHighlightingLexer extends LayeredLexer {
+    public JavaScriptHighlightingLexer(DialectOptionHolder optionHolder) {
+        this(optionHolder, true);
+    }
+
+    private JavaScriptHighlightingLexer(DialectOptionHolder optionHolder, boolean withEmbeddments) {
+        super(new JSFlexAdapter(true, optionHolder));
+
+        if (withEmbeddments) {
+            registerSelfStoppingLayer(new StringLiteralLexer('\"', JSTokenTypes.STRING_LITERAL, true, "/"),
+                new IElementType[]{JSTokenTypes.STRING_LITERAL},
+                IElementType.EMPTY_ARRAY
+            );
+
+            registerSelfStoppingLayer(new JavaScriptHighlightingLexer(optionHolder, false), new IElementType[]{JSTokenTypes.XML_JS_SCRIPT},
+                IElementType.EMPTY_ARRAY
+            );
+
+            registerSelfStoppingLayer(new StringLiteralLexer('\'', JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, true, "/"),
+                new IElementType[]{JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL}, IElementType.EMPTY_ARRAY
+            );
+
+            final LayeredLexer docLexer = new LayeredLexer(new FlexAdapter(new _JSDocLexer(true)));
+            final Lexer lexer = getHtmlHighlightingLexer();
+
+            // Force html highlighting lexer not to return tag content type since it causes token type collision in javascript embedded to html
+            docLexer.registerLayer(new LexerBase() {
+                final IElementType tagContentType = getTagContentTokenType();
+
+
+                @Override
+                public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState) {
+                    lexer.start(buffer, startOffset, endOffset, initialState);
+                }
+
+                @Override
+                public int getState() {
+                    return lexer.getState();
+                }
+
+                @Override
+                public IElementType getTokenType() {
+                    final IElementType tokenType = lexer.getTokenType();
+                    if (tokenType == tagContentType) {
+                        return JSTokenTypes.JSDOC_TAG_DATA;
+                    }
+                    return tokenType;
+                }
+
+                @Override
+                public int getTokenStart() {
+                    return lexer.getTokenStart();
+                }
+
+                @Override
+                public int getTokenEnd() {
+                    return lexer.getTokenEnd();
+                }
+
+                @Override
+                public void advance() {
+                    lexer.advance();
+                }
+
+                @Override
+                public CharSequence getBufferSequence() {
+                    return lexer.getBufferSequence();
+                }
+
+
+                @Override
+                public int getBufferEnd() {
+                    return lexer.getBufferEnd();
+                }
+            }, JSDocTokenTypes.DOC_COMMENT_DATA);
+            registerSelfStoppingLayer(
+                docLexer,
+                new IElementType[]{JSTokenTypes.DOC_COMMENT},
+                new IElementType[]{JSDocTokenTypes.DOC_COMMENT_END}
+            );
+        }
+    }
+
+    public static IElementType getTagContentTokenType() {
+        final Lexer highlightingLexer = getHtmlHighlightingLexer();
+        highlightingLexer.start("a", 0, 1, 0);
+        return highlightingLexer.getTokenType();
+    }
+
+    private static Lexer getHtmlHighlightingLexer() {
+        return SyntaxHighlighterFactory.getSyntaxHighlighter(HTMLLanguage.INSTANCE, null, null).getHighlightingLexer();
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
index 1a1d1a9e..d31a290b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptParsingFlexLexer.java
@@ -19,10 +19,8 @@
 /**
  * @author max
  */
-public class JavaScriptParsingFlexLexer extends JSFlexAdapter
-{
-	public JavaScriptParsingFlexLexer(DialectOptionHolder dialectOptionsHolder)
-	{
-		super(false, dialectOptionsHolder);
-	}
+public class JavaScriptParsingFlexLexer extends JSFlexAdapter {
+    public JavaScriptParsingFlexLexer(DialectOptionHolder dialectOptionsHolder) {
+        super(false, dialectOptionsHolder);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
index f0be63e1..2ccdfcdc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
@@ -14,19 +14,16 @@
  * @since 29-Aug-22
  */
 @ExtensionImpl
-public class JavaScriptStubElementHolder extends StubElementTypeHolder<JSStubElementTypes>
-{
-	@Nullable
-	@Override
-	public String getExternalIdPrefix()
-	{
-		return "js.";
-	}
+public class JavaScriptStubElementHolder extends StubElementTypeHolder<JSStubElementTypes> {
+    @Nullable
+    @Override
+    public String getExternalIdPrefix() {
+        return "js.";
+    }
 
-	@Nonnull
-	@Override
-	public List<ObjectStubSerializerProvider> loadSerializers()
-	{
-		return allFromStaticFields(JSStubElementTypes.class, Field::get);
-	}
+    @Nonnull
+    @Override
+    public List<ObjectStubSerializerProvider> loadSerializers() {
+        return allFromStaticFields(JSStubElementTypes.class, Field::get);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
index 1a63ce68..d6adfe35 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
@@ -31,99 +31,78 @@
  * @by max, maxim.mossienko
  */
 @Deprecated
-public class JavaScriptSupportLoader
-{
-	@Deprecated
-	public static final Language ECMA_SCRIPT_L4 = new Language("ECMA4_DEPRECATED") {};
+public class JavaScriptSupportLoader {
+    @Deprecated
+    public static final Language ECMA_SCRIPT_L4 = new Language("ECMA4_DEPRECATED") {
+    };
 
+    @NonNls
+    public static final String MXML_FILE_EXTENSION_DOT = ".mxml";
+    @NonNls
+    public static final String MXML_FILE_EXTENSION2_DOT = ".mxm";
+    @NonNls
+    public static final String MXML_URI = "http://www.adobe.com/2006/mxml";
+    @NonNls
+    public static final String MXML_URI2 = "http://www.macromedia.com/2003/mxml";
+    @NonNls
+    public static final String MXML_URI3 = "http://ns.adobe.com/mxml/2009";
+    @NonNls
+    public static final String MXML_URI4 = "library://ns.adobe.com/flex/spark";
+    @NonNls
+    public static final String MXML_URI5 = "library://ns.adobe.com/flex/halo";
+    @NonNls
+    public static final String MXML_URI6 = "http://ns.adobe.com/fxg/2008";
+    @NonNls
+    public static final String[] MXML_URIS = {
+        MXML_URI,
+        MXML_URI2,
+        MXML_URI3,
+        MXML_URI4,
+        MXML_URI5,
+        MXML_URI6
+    };
+    @NonNls
+    public static final String BINDOWS_URI = "http://www.bindows.net";
+    @NonNls
+    public static final String ACTION_SCRIPT_CLASS_TEMPLATE_NAME = "ActionScript Class";
+    @NonNls
+    public static final String ACTION_SCRIPT_INTERFACE_TEMPLATE_NAME = "ActionScript Interface";
+    @NonNls
+    public static final String MXML_COMPONENT_TEMPLATE_NAME = "Mxml Component";
 
-	public static final
-	@NonNls
-	String MXML_FILE_EXTENSION_DOT = ".mxml";
-	public static final
-	@NonNls
-	String MXML_FILE_EXTENSION2_DOT = ".mxm";
-	public static final
-	@NonNls
-	String MXML_URI = "http://www.adobe.com/2006/mxml";
-	public static final
-	@NonNls
-	String MXML_URI2 = "http://www.macromedia.com/2003/mxml";
-	public static final
-	@NonNls
-	String MXML_URI3 = "http://ns.adobe.com/mxml/2009";
-	public static final
-	@NonNls
-	String MXML_URI4 = "library://ns.adobe.com/flex/spark";
-	public static final
-	@NonNls
-	String MXML_URI5 = "library://ns.adobe.com/flex/halo";
-	public static final
-	@NonNls
-	String MXML_URI6 = "http://ns.adobe.com/fxg/2008";
-	public static final
-	@NonNls
-	String[] MXML_URIS = {
-			MXML_URI,
-			MXML_URI2,
-			MXML_URI3,
-			MXML_URI4,
-			MXML_URI5,
-			MXML_URI6
-	};
-	public static final
-	@NonNls
-	String BINDOWS_URI = "http://www.bindows.net";
-	@NonNls
-	public static final String ACTION_SCRIPT_CLASS_TEMPLATE_NAME = "ActionScript Class";
-	@NonNls
-	public static final String ACTION_SCRIPT_INTERFACE_TEMPLATE_NAME = "ActionScript Interface";
-	@NonNls
-	public static final String MXML_COMPONENT_TEMPLATE_NAME = "Mxml Component";
+    public static boolean isFlexMxmFile(final PsiFile file) {
+        return file.getFileType() == XmlFileType.INSTANCE && nameHasMxmlExtension(file.getName());
+    }
 
-	public static boolean isFlexMxmFile(final PsiFile file)
-	{
-		return file.getFileType() == XmlFileType.INSTANCE && nameHasMxmlExtension(file.getName());
-	}
+    public static boolean isFlexMxmFile(final VirtualFile file) {
+        return file.getFileType() == XmlFileType.INSTANCE && nameHasMxmlExtension(file.getName());
+    }
 
-	public static boolean isFlexMxmFile(final VirtualFile file)
-	{
-		return file.getFileType() == XmlFileType.INSTANCE && nameHasMxmlExtension(file.getName());
-	}
+    private static boolean nameHasMxmlExtension(final String s) {
+        return s.endsWith(MXML_FILE_EXTENSION_DOT) || s.endsWith(MXML_FILE_EXTENSION2_DOT);
+    }
 
-	private static boolean nameHasMxmlExtension(final String s)
-	{
-		return s.endsWith(MXML_FILE_EXTENSION_DOT) || s.endsWith(MXML_FILE_EXTENSION2_DOT);
-	}
+    public static boolean isFlexMxmFile(String filename) {
+        return FileTypeManager.getInstance().getFileTypeByFileName(filename) == XmlFileType.INSTANCE && nameHasMxmlExtension(filename);
+    }
 
-	public static boolean isFlexMxmFile(String filename)
-	{
-		return FileTypeManager.getInstance().getFileTypeByFileName(filename) == XmlFileType.INSTANCE && nameHasMxmlExtension(filename);
-	}
+    public static boolean isBindowsFile(final PsiElement element) {
+        final PsiFile containingFile = element.getContainingFile();
+        final PsiElement tag = element.getParent().getParent();
+        if (!(tag instanceof XmlTag)) {
+            return false;
+        }
+        if (BINDOWS_URI.equals(((XmlTag)tag).getNamespace())) {
+            return true;
+        }
+        if (!(containingFile instanceof XmlFile)) {
+            return false;
+        }
 
-	public static boolean isBindowsFile(final PsiElement element)
-	{
-		final PsiFile containingFile = element.getContainingFile();
-		final PsiElement tag = element.getParent().getParent();
-		if(!(tag instanceof XmlTag))
-		{
-			return false;
-		}
-		if(BINDOWS_URI.equals(((XmlTag) tag).getNamespace()))
-		{
-			return true;
-		}
-		if(!(containingFile instanceof XmlFile))
-		{
-			return false;
-		}
-
-		return "Application".equals(((XmlFile) containingFile).getDocument().getRootTag().getName());
-	}
-
-	public static boolean isMxmlNs(final String ns)
-	{
-		return ArrayUtil.contains(ns, MXML_URIS);
-	}
+        return "Application".equals(((XmlFile)containingFile).getDocument().getRootTag().getName());
+    }
 
+    public static boolean isMxmlNs(final String ns) {
+        return ArrayUtil.contains(ns, MXML_URIS);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
index 0a9067b2..ef2e5db0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
@@ -36,47 +36,40 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 10:30:20 PM
+ * Date: Mar 25, 2008
+ * Time: 10:30:20 PM
  */
-public class JSAttributeElementType extends JSStubElementType<JSAttributeStub, JSAttribute>
-{
-	public JSAttributeElementType()
-	{
-		super("ATTRIBUTE");
-	}
+public class JSAttributeElementType extends JSStubElementType<JSAttributeStub, JSAttribute> {
+    public JSAttributeElementType() {
+        super("ATTRIBUTE");
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSAttributeImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSAttributeImpl(astNode);
+    }
 
-	@Override
-	public JSAttribute createPsi(@Nonnull JSAttributeStub stub)
-	{
-		return new JSAttributeImpl(stub);
-	}
+    @Override
+    public JSAttribute createPsi(@Nonnull JSAttributeStub stub) {
+        return new JSAttributeImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSAttributeStub createStub(@Nonnull JSAttribute psi, StubElement parentStub)
-	{
-		return new JSAttributeStubImpl(psi.getName(), 0, parentStub);
-	}
+    @RequiredReadAction
+    @Override
+    public JSAttributeStub createStub(@Nonnull JSAttribute psi, StubElement parentStub) {
+        return new JSAttributeStubImpl(psi.getName(), 0, parentStub);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSAttributeStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getName());
-	}
+    @Override
+    public void serialize(@Nonnull JSAttributeStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getName());
+    }
 
-	@Nonnull
-	@Override
-	public JSAttributeStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef name = dataStream.readName();
-		return new JSAttributeStubImpl(StringRef.toString(name), 0, parentStub);
-	}
+    @Nonnull
+    @Override
+    public JSAttributeStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef name = dataStream.readName();
+        return new JSAttributeStubImpl(StringRef.toString(name), 0, parentStub);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
index 2b4e83b9..211e5976 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
@@ -31,55 +31,49 @@
 import consulo.language.psi.stub.StubOutputStream;
 
 import jakarta.annotation.Nonnull;
+
 import java.io.IOException;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 10:30:17 PM
+ * Date: Mar 25, 2008
+ * Time: 10:30:17 PM
  */
-public class JSAttributeListElementType extends JSStubElementType<JSAttributeListStub, JSAttributeList>
-{
-	public JSAttributeListElementType()
-	{
-		super("ATTRIBUTE_LIST");
-	}
+public class JSAttributeListElementType extends JSStubElementType<JSAttributeListStub, JSAttributeList> {
+    public JSAttributeListElementType() {
+        super("ATTRIBUTE_LIST");
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSAttributeListImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSAttributeListImpl(astNode);
+    }
 
-	@Override
-	public JSAttributeList createPsi(@Nonnull JSAttributeListStub stub)
-	{
-		return new JSAttributeListImpl(stub);
-	}
+    @Override
+    public JSAttributeList createPsi(@Nonnull JSAttributeListStub stub) {
+        return new JSAttributeListImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSAttributeListStub createStub(@Nonnull JSAttributeList psi, StubElement parentStub)
-	{
-		String namespace = psi.getNamespace();
-		int flags = JSAttributeListStubImpl.getFlags(psi);
-		return new JSAttributeListStubImpl(namespace, flags, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSAttributeListStub createStub(@Nonnull JSAttributeList psi, StubElement parentStub) {
+        String namespace = psi.getNamespace();
+        int flags = JSAttributeListStubImpl.getFlags(psi);
+        return new JSAttributeListStubImpl(namespace, flags, parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSAttributeListStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getNamespace());
-		dataStream.writeInt(stub.getFlags());
-	}
+    @Override
+    public void serialize(@Nonnull JSAttributeListStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getNamespace());
+        dataStream.writeInt(stub.getFlags());
+    }
 
-	@Nonnull
-	@Override
-	public JSAttributeListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef namespaceRef = dataStream.readName();
-		int i = dataStream.readInt();
-		return new JSAttributeListStubImpl(StringRef.toString(namespaceRef), i, parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSAttributeListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef namespaceRef = dataStream.readName();
+        int i = dataStream.readInt();
+        return new JSAttributeListStubImpl(StringRef.toString(namespaceRef), i, parentStub, this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
index 871a711e..8a7e8da8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
@@ -36,51 +36,44 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 8, 2008
- *         Time: 6:20:05 PM
+ * Date: Jun 8, 2008
+ * Time: 6:20:05 PM
  */
-public class JSAttributeNameValuePairType extends JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair>
-{
-	public JSAttributeNameValuePairType()
-	{
-		super("ATTRIBUTE_NAME_VALUE_PAIR");
-	}
+public class JSAttributeNameValuePairType extends JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> {
+    public JSAttributeNameValuePairType() {
+        super("ATTRIBUTE_NAME_VALUE_PAIR");
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSAttributeNameValuePairImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSAttributeNameValuePairImpl(astNode);
+    }
 
-	@Override
-	public JSAttributeNameValuePair createPsi(@Nonnull JSAttributeNameValuePairStub stub)
-	{
-		return new JSAttributeNameValuePairImpl(stub);
-	}
+    @Override
+    public JSAttributeNameValuePair createPsi(@Nonnull JSAttributeNameValuePairStub stub) {
+        return new JSAttributeNameValuePairImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSAttributeNameValuePairStub createStub(@Nonnull JSAttributeNameValuePair psi, StubElement parentStub)
-	{
-		String name = psi.getName();
-		String simpleValue = psi.getSimpleValue();
-		return new JSAttributeNameValuePairStubImpl(name, simpleValue, parentStub);
-	}
+    @RequiredReadAction
+    @Override
+    public JSAttributeNameValuePairStub createStub(@Nonnull JSAttributeNameValuePair psi, StubElement parentStub) {
+        String name = psi.getName();
+        String simpleValue = psi.getSimpleValue();
+        return new JSAttributeNameValuePairStubImpl(name, simpleValue, parentStub);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSAttributeNameValuePairStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getName());
-		dataStream.writeName(stub.getValue());
-	}
+    @Override
+    public void serialize(@Nonnull JSAttributeNameValuePairStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getName());
+        dataStream.writeName(stub.getValue());
+    }
 
-	@Nonnull
-	@Override
-	public JSAttributeNameValuePairStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef name = dataStream.readName();
-		StringRef value = dataStream.readName();
-		return new JSAttributeNameValuePairStubImpl(StringRef.toString(name), StringRef.toString(value), parentStub);
-	}
+    @Nonnull
+    @Override
+    public JSAttributeNameValuePairStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef name = dataStream.readName();
+        StringRef value = dataStream.readName();
+        return new JSAttributeNameValuePairStubImpl(StringRef.toString(name), StringRef.toString(value), parentStub);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
index d7cc763f..d67a589b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
@@ -40,63 +40,54 @@
  * @author Maxim.Mossienko
  * @since 10:30:14 PM Mar 25, 2008
  */
-public class JSClassElementType extends JSQualifiedStubElementType<JSClassStub, JSClass>
-{
-	public JSClassElementType()
-	{
-		super("CLASS");
-	}
+public class JSClassElementType extends JSQualifiedStubElementType<JSClassStub, JSClass> {
+    public JSClassElementType() {
+        super("CLASS");
+    }
 
-	@Override
-	public void indexStub(@Nonnull JSClassStub stub, @Nonnull IndexSink sink)
-	{
-		super.indexStub(stub, sink);
+    @Override
+    public void indexStub(@Nonnull JSClassStub stub, @Nonnull IndexSink sink) {
+        super.indexStub(stub, sink);
 
-		String name = stub.getName();
-		if(!StringUtil.isEmpty(name))
-		{
-			sink.occurrence(JavaScriptIndexKeys.CLASSES_BY_NAME, name);
-		}
-	}
+        String name = stub.getName();
+        if (!StringUtil.isEmpty(name)) {
+            sink.occurrence(JavaScriptIndexKeys.CLASSES_BY_NAME, name);
+        }
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSClassImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSClassImpl(astNode);
+    }
 
-	@Override
-	public JSClass createPsi(@Nonnull JSClassStub stub)
-	{
-		return new JSClassImpl(stub, this);
-	}
+    @Override
+    public JSClass createPsi(@Nonnull JSClassStub stub) {
+        return new JSClassImpl(stub, this);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSClassStub createStub(@Nonnull JSClass psi, StubElement parentStub)
-	{
-		String name = psi.getName();
-		int flags = JSClassStubImpl.getFlags(psi);
-		String qualifiedName = psi.getQualifiedName();
-		return new JSClassStubImpl(name, flags, qualifiedName, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSClassStub createStub(@Nonnull JSClass psi, StubElement parentStub) {
+        String name = psi.getName();
+        int flags = JSClassStubImpl.getFlags(psi);
+        String qualifiedName = psi.getQualifiedName();
+        return new JSClassStubImpl(name, flags, qualifiedName, parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSClassStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getName());
-		dataStream.writeName(stub.getQualifiedName());
-		dataStream.writeInt(stub.getFlags());
-	}
+    @Override
+    public void serialize(@Nonnull JSClassStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getName());
+        dataStream.writeName(stub.getQualifiedName());
+        dataStream.writeInt(stub.getFlags());
+    }
 
-	@Nonnull
-	@Override
-	public JSClassStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef nameRef = dataStream.readName();
-		StringRef qualifiedRef = dataStream.readName();
-		int flags = dataStream.readInt();
-		return new JSClassStubImpl(StringRef.toString(nameRef), flags, StringRef.toString(qualifiedRef), parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSClassStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef nameRef = dataStream.readName();
+        StringRef qualifiedRef = dataStream.readName();
+        int flags = dataStream.readInt();
+        return new JSClassStubImpl(StringRef.toString(nameRef), flags, StringRef.toString(qualifiedRef), parentStub, this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index 0d637c25..cf1aade1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -26,71 +26,59 @@
 import consulo.language.psi.PsiFile;
 
 import jakarta.annotation.Nonnull;
+
 import java.io.IOException;
 
 /**
  * @author peter
  */
-public class JSFileElementType extends IStubFileElementType<JSFileStub>
-{
-	public JSFileElementType(final Language language)
-	{
-		super(language);
-	}
+public class JSFileElementType extends IStubFileElementType<JSFileStub> {
+    public JSFileElementType(final Language language) {
+        super(language);
+    }
 
-	@Override
-	public void indexStub(@Nonnull final JSFileStub stub, @Nonnull final IndexSink sink)
-	{
-		for(JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList())
-		{
-			javaScriptIndexer.indexFile(stub, sink);
-		}
-	}
+    @Override
+    public void indexStub(@Nonnull final JSFileStub stub, @Nonnull final IndexSink sink) {
+        for (JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList()) {
+            javaScriptIndexer.indexFile(stub, sink);
+        }
+    }
 
-	@Override
-	public StubBuilder getBuilder()
-	{
-		return new DefaultStubBuilder()
-		{
-			@Nonnull
-			@Override
-			protected StubElement createStubForFile(@Nonnull PsiFile file)
-			{
-				if(file instanceof JSFile)
-				{
-					return new JSFileStubImpl((JSFile) file, file.getName());
-				}
-				return super.createStubForFile(file);
-			}
-		};
-	}
+    @Override
+    public StubBuilder getBuilder() {
+        return new DefaultStubBuilder() {
+            @Nonnull
+            @Override
+            protected StubElement createStubForFile(@Nonnull PsiFile file) {
+                return file instanceof JSFile jsFile
+                    ? new JSFileStubImpl(jsFile, file.getName())
+                    : super.createStubForFile(file);
+            }
+        };
+    }
 
-	@Override
-	public void serialize(@Nonnull JSFileStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getName());
-	}
+    @Override
+    public void serialize(@Nonnull JSFileStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getName());
+    }
 
-	@Nonnull
-	@Override
-	public JSFileStub deserialize(@Nonnull final StubInputStream dataStream, final StubElement parentStub) throws IOException
-	{
-		StringRef name = dataStream.readName();
-		return new JSFileStubImpl(null, name);
-	}
+    @Nonnull
+    @Override
+    public JSFileStub deserialize(@Nonnull final StubInputStream dataStream, final StubElement parentStub) throws IOException {
+        StringRef name = dataStream.readName();
+        return new JSFileStubImpl(null, name);
+    }
 
-	@Nonnull
-	@Override
-	public String getExternalId()
-	{
-		return getLanguage() + ":" + toString();
-	}
+    @Nonnull
+    @Override
+    public String getExternalId() {
+        return getLanguage() + ":" + toString();
+    }
 
-	@Override
-	public int getStubVersion()
-	{
-		int[] version = new int[]{47};
-		JavaScriptIndexer.EP_NAME.forEachExtensionSafe(javaScriptIndexer -> version[0] ++);
-		return version[0];
-	}
+    @Override
+    public int getStubVersion() {
+        int[] version = new int[]{47};
+        JavaScriptIndexer.EP_NAME.forEachExtensionSafe(javaScriptIndexer -> version[0]++);
+        return version[0];
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
index 2b057418..9e4ef41b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
@@ -34,63 +34,58 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 10:50:34 PM
+ * Date: Mar 25, 2008
+ * Time: 10:50:34 PM
  */
-public abstract class JSFunctionElementType extends JSQualifiedStubElementType<JSFunctionStub, JSFunction>
-{
-	public JSFunctionElementType(@Nonnull String name)
-	{
-		super(name);
-	}
+public abstract class JSFunctionElementType extends JSQualifiedStubElementType<JSFunctionStub, JSFunction> {
+    public JSFunctionElementType(@Nonnull String name) {
+        super(name);
+    }
 
-	@Override
-	protected boolean doIndexName(JSFunctionStub stub, final String name, final String fqn)
-	{
-		final IStubElementType stubType = stub.getParentStub().getStubType();
+    @Override
+    protected boolean doIndexName(JSFunctionStub stub, final String name, final String fqn) {
+        final IStubElementType stubType = stub.getParentStub().getStubType();
 
-		if(stubType instanceof JSPackageStatementElementType || stubType == null)
-		{
-			return true;
-		}
-		return false;
-	}
+        return stubType instanceof JSPackageStatementElementType || stubType == null;
+    }
 
-	@Override
-	protected boolean doIndexQualifiedName(JSFunctionStub stub, String name, String fqn)
-	{
-		return doIndexName(stub, name, fqn);
-	}
+    @Override
+    protected boolean doIndexQualifiedName(JSFunctionStub stub, String name, String fqn) {
+        return doIndexName(stub, name, fqn);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSFunctionStub createStub(@Nonnull JSFunction psi, StubElement parentStub)
-	{
-		String name = psi.getName();
-		String qualifiedName = psi.getQualifiedName();
-		String returnTypeString = psi.getReturnTypeString();
-		int flags = JSFunctionStubImpl.buildFlags(psi);
-		return new JSFunctionStubImpl(name, flags, qualifiedName, returnTypeString, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSFunctionStub createStub(@Nonnull JSFunction psi, StubElement parentStub) {
+        String name = psi.getName();
+        String qualifiedName = psi.getQualifiedName();
+        String returnTypeString = psi.getReturnTypeString();
+        int flags = JSFunctionStubImpl.buildFlags(psi);
+        return new JSFunctionStubImpl(name, flags, qualifiedName, returnTypeString, parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSFunctionStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getName());
-		dataStream.writeName(stub.getQualifiedName());
-		dataStream.writeName(stub.getReturnTypeString());
-		dataStream.writeVarInt(stub.getFlags());
-	}
+    @Override
+    public void serialize(@Nonnull JSFunctionStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getName());
+        dataStream.writeName(stub.getQualifiedName());
+        dataStream.writeName(stub.getReturnTypeString());
+        dataStream.writeVarInt(stub.getFlags());
+    }
 
-	@Nonnull
-	@Override
-	public JSFunctionStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef nameRef = dataStream.readName();
-		StringRef qualifiedRef = dataStream.readName();
-		StringRef returnTypeRef = dataStream.readName();
-		int flags = dataStream.readVarInt();
-		return new JSFunctionStubImpl(StringRef.toString(nameRef), flags, StringRef.toString(qualifiedRef), StringRef.toString(returnTypeRef),
-				parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSFunctionStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef nameRef = dataStream.readName();
+        StringRef qualifiedRef = dataStream.readName();
+        StringRef returnTypeRef = dataStream.readName();
+        int flags = dataStream.readVarInt();
+        return new JSFunctionStubImpl(
+            StringRef.toString(nameRef),
+            flags,
+            StringRef.toString(qualifiedRef),
+            StringRef.toString(returnTypeRef),
+            parentStub,
+            this
+        );
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
index 16f8ae70..4b1e5ab8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
@@ -36,48 +36,41 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:49:18 PM
+ * Date: Jun 6, 2008
+ * Time: 7:49:18 PM
  */
-public class JSImportStatementElementType extends JSStubElementType<JSImportStatementStub, JSImportStatement>
-{
-	public JSImportStatementElementType()
-	{
-		super("IMPORT_STATEMENT");
-	}
+public class JSImportStatementElementType extends JSStubElementType<JSImportStatementStub, JSImportStatement> {
+    public JSImportStatementElementType() {
+        super("IMPORT_STATEMENT");
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSImportStatementImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSImportStatementImpl(astNode);
+    }
 
-	@Override
-	public JSImportStatement createPsi(@Nonnull JSImportStatementStub stub)
-	{
-		return new JSImportStatementImpl(stub);
-	}
+    @Override
+    public JSImportStatement createPsi(@Nonnull JSImportStatementStub stub) {
+        return new JSImportStatementImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSImportStatementStub createStub(@Nonnull JSImportStatement psi, StubElement parentStub)
-	{
-		String importText = psi.getImportText();
-		return new JSImportStatementStubImpl(importText, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSImportStatementStub createStub(@Nonnull JSImportStatement psi, StubElement parentStub) {
+        String importText = psi.getImportText();
+        return new JSImportStatementStubImpl(importText, parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSImportStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getImportText());
-	}
+    @Override
+    public void serialize(@Nonnull JSImportStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getImportText());
+    }
 
-	@Nonnull
-	@Override
-	public JSImportStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef importText = dataStream.readName();
-		return new JSImportStatementStubImpl(StringRef.toString(importText), parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSImportStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef importText = dataStream.readName();
+        return new JSImportStatementStubImpl(StringRef.toString(importText), parentStub, this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
index ea179899..2fada8f3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
@@ -36,48 +36,41 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 7, 2008
- *         Time: 9:23:54 PM
+ * Date: Jun 7, 2008
+ * Time: 9:23:54 PM
  */
-public class JSIncludeDirectiveElementType extends JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective>
-{
-	public JSIncludeDirectiveElementType()
-	{
-		super("INCLUDE_DIRECTIVE");
-	}
+public class JSIncludeDirectiveElementType extends JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> {
+    public JSIncludeDirectiveElementType() {
+        super("INCLUDE_DIRECTIVE");
+    }
 
-	@Override
-	public void serialize(@Nonnull JSIncludeDirectiveStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getIncludeText());
-	}
+    @Override
+    public void serialize(@Nonnull JSIncludeDirectiveStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getIncludeText());
+    }
 
-	@Nonnull
-	@Override
-	public JSIncludeDirectiveStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef includeText = dataStream.readName();
-		return new JSIncludeDirectiveStubImpl(StringRef.toString(includeText), parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSIncludeDirectiveStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef includeText = dataStream.readName();
+        return new JSIncludeDirectiveStubImpl(StringRef.toString(includeText), parentStub, this);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSIncludeDirectiveStub createStub(@Nonnull JSIncludeDirective psi, StubElement parentStub)
-	{
-		String includeText = psi.getIncludeText();
-		return new JSIncludeDirectiveStubImpl(includeText, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSIncludeDirectiveStub createStub(@Nonnull JSIncludeDirective psi, StubElement parentStub) {
+        String includeText = psi.getIncludeText();
+        return new JSIncludeDirectiveStubImpl(includeText, parentStub, this);
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSIncludeDirectiveImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSIncludeDirectiveImpl(astNode);
+    }
 
-	@Override
-	public JSIncludeDirective createPsi(@Nonnull JSIncludeDirectiveStub stub)
-	{
-		return new JSIncludeDirectiveImpl(stub);
-	}
+    @Override
+    public JSIncludeDirective createPsi(@Nonnull JSIncludeDirectiveStub stub) {
+        return new JSIncludeDirectiveImpl(stub);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
index 83a4d5e3..f8b105a7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
@@ -35,55 +35,53 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:49:06 PM
+ * Date: Jun 6, 2008
+ * Time: 7:49:06 PM
  */
-public class JSNamespaceDeclarationElementType extends JSQualifiedStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration>
-{
-	public JSNamespaceDeclarationElementType()
-	{
-		super("NAMESPACE_DECLARATION");
-	}
+public class JSNamespaceDeclarationElementType extends JSQualifiedStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration> {
+    public JSNamespaceDeclarationElementType() {
+        super("NAMESPACE_DECLARATION");
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSNamespaceDeclarationImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSNamespaceDeclarationImpl(astNode);
+    }
 
-	@Override
-	public JSNamespaceDeclaration createPsi(@Nonnull JSNamespaceDeclarationStub stub)
-	{
-		return new JSNamespaceDeclarationImpl(stub);
-	}
+    @Override
+    public JSNamespaceDeclaration createPsi(@Nonnull JSNamespaceDeclarationStub stub) {
+        return new JSNamespaceDeclarationImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSNamespaceDeclarationStub createStub(@Nonnull JSNamespaceDeclaration psi, StubElement parentStub)
-	{
-		String name = psi.getName();
-		String qualifiedName = psi.getQualifiedName();
-		String initialValueString = psi.getInitialValueString();
-		return new JSNamespaceDeclarationStubImpl(name, qualifiedName, initialValueString, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSNamespaceDeclarationStub createStub(@Nonnull JSNamespaceDeclaration psi, StubElement parentStub) {
+        String name = psi.getName();
+        String qualifiedName = psi.getQualifiedName();
+        String initialValueString = psi.getInitialValueString();
+        return new JSNamespaceDeclarationStubImpl(name, qualifiedName, initialValueString, parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSNamespaceDeclarationStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getName());
-		dataStream.writeName(stub.getQualifiedName());
-		dataStream.writeName(stub.getInitialValueString());
-	}
+    @Override
+    public void serialize(@Nonnull JSNamespaceDeclarationStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getName());
+        dataStream.writeName(stub.getQualifiedName());
+        dataStream.writeName(stub.getInitialValueString());
+    }
 
-	@Nonnull
-	@Override
-	public JSNamespaceDeclarationStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef nameRef = dataStream.readName();
-		StringRef qualifiedRef = dataStream.readName();
-		StringRef initialValueRef = dataStream.readName();
-		return new JSNamespaceDeclarationStubImpl(StringRef.toString(nameRef), StringRef.toString(qualifiedRef),
-				StringRef.toString(initialValueRef), parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSNamespaceDeclarationStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef nameRef = dataStream.readName();
+        StringRef qualifiedRef = dataStream.readName();
+        StringRef initialValueRef = dataStream.readName();
+        return new JSNamespaceDeclarationStubImpl(
+            StringRef.toString(nameRef),
+            StringRef.toString(qualifiedRef),
+            StringRef.toString(initialValueRef),
+            parentStub,
+            this
+        );
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
index 26859e24..0307170b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
@@ -36,51 +36,44 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:49:25 PM
+ * Date: Jun 6, 2008
+ * Time: 7:49:25 PM
  */
-public class JSPackageStatementElementType extends JSStubElementType<JSPackageStatementStub, JSPackageStatement>
-{
-	public JSPackageStatementElementType()
-	{
-		super("PACKAGE_STATEMENT");
-	}
+public class JSPackageStatementElementType extends JSStubElementType<JSPackageStatementStub, JSPackageStatement> {
+    public JSPackageStatementElementType() {
+        super("PACKAGE_STATEMENT");
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSPackageStatementImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSPackageStatementImpl(astNode);
+    }
 
-	@Override
-	public JSPackageStatement createPsi(@Nonnull JSPackageStatementStub stub)
-	{
-		return new JSPackageStatementImpl(stub);
-	}
+    @Override
+    public JSPackageStatement createPsi(@Nonnull JSPackageStatementStub stub) {
+        return new JSPackageStatementImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSPackageStatementStub createStub(@Nonnull JSPackageStatement psi, StubElement parentStub)
-	{
-		String name = psi.getName();
-		String qualifiedName = psi.getQualifiedName();
-		return new JSPackageStatementStubImpl(name, qualifiedName, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSPackageStatementStub createStub(@Nonnull JSPackageStatement psi, StubElement parentStub) {
+        String name = psi.getName();
+        String qualifiedName = psi.getQualifiedName();
+        return new JSPackageStatementStubImpl(name, qualifiedName, parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSPackageStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getName());
-		dataStream.writeName(stub.getQualifiedName());
-	}
+    @Override
+    public void serialize(@Nonnull JSPackageStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getName());
+        dataStream.writeName(stub.getQualifiedName());
+    }
 
-	@Nonnull
-	@Override
-	public JSPackageStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef nameRef = dataStream.readName();
-		StringRef qualifiedRef = dataStream.readName();
-		return new JSPackageStatementStubImpl(StringRef.toString(nameRef), StringRef.toString(qualifiedRef), parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSPackageStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef nameRef = dataStream.readName();
+        StringRef qualifiedRef = dataStream.readName();
+        return new JSPackageStatementStubImpl(StringRef.toString(nameRef), StringRef.toString(qualifiedRef), parentStub, this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
index 38bab215..04ff5e0b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
@@ -35,61 +35,61 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 10:30:07 PM
+ * Date: Mar 25, 2008
+ * Time: 10:30:07 PM
  */
-public class JSParameterElementType extends JSStubElementType<JSParameterStub, JSParameter>
-{
-	public JSParameterElementType()
-	{
-		super("FORMAL_PARAMETER");
-	}
+public class JSParameterElementType extends JSStubElementType<JSParameterStub, JSParameter> {
+    public JSParameterElementType() {
+        super("FORMAL_PARAMETER");
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSParameterImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSParameterImpl(astNode);
+    }
 
-	@Override
-	public JSParameter createPsi(@Nonnull JSParameterStub stub)
-	{
-		return new JSParameterImpl(stub);
-	}
+    @Override
+    public JSParameter createPsi(@Nonnull JSParameterStub stub) {
+        return new JSParameterImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSParameterStub createStub(@Nonnull JSParameter psi, StubElement parentStub)
-	{
-		String name = psi.getName();
-		int flags = JSParameterStubImpl.buildFlags(psi);
-		String typeString = psi.getTypeString();
-		String initializerText = psi.getInitializerText();
-		String qualifiedName = psi.getQualifiedName();
-		return new JSParameterStubImpl(name, flags, typeString, initializerText, qualifiedName, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSParameterStub createStub(@Nonnull JSParameter psi, StubElement parentStub) {
+        String name = psi.getName();
+        int flags = JSParameterStubImpl.buildFlags(psi);
+        String typeString = psi.getTypeString();
+        String initializerText = psi.getInitializerText();
+        String qualifiedName = psi.getQualifiedName();
+        return new JSParameterStubImpl(name, flags, typeString, initializerText, qualifiedName, parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSParameterStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getName());
-		dataStream.writeVarInt(stub.getFlags());
-		dataStream.writeName(stub.getTypeString());
-		dataStream.writeName(stub.getInitializerText());
-		dataStream.writeName(stub.getQualifiedName());
-	}
+    @Override
+    public void serialize(@Nonnull JSParameterStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getName());
+        dataStream.writeVarInt(stub.getFlags());
+        dataStream.writeName(stub.getTypeString());
+        dataStream.writeName(stub.getInitializerText());
+        dataStream.writeName(stub.getQualifiedName());
+    }
 
-	@Nonnull
-	@Override
-	public JSParameterStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef nameRef = dataStream.readName();
-		int flags = dataStream.readVarInt();
-		StringRef typeRef = dataStream.readName();
-		StringRef initializerRef = dataStream.readName();
-		StringRef qualifiedRef = dataStream.readName();
-		return new JSParameterStubImpl(StringRef.toString(nameRef), flags, StringRef.toString(typeRef), StringRef.toString(initializerRef),
-				StringRef.toString(qualifiedRef), parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSParameterStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef nameRef = dataStream.readName();
+        int flags = dataStream.readVarInt();
+        StringRef typeRef = dataStream.readName();
+        StringRef initializerRef = dataStream.readName();
+        StringRef qualifiedRef = dataStream.readName();
+        return new JSParameterStubImpl(
+            StringRef.toString(nameRef),
+            flags,
+            StringRef.toString(typeRef),
+            StringRef.toString(initializerRef),
+            StringRef.toString(qualifiedRef),
+            parentStub,
+            this
+        );
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
index d8484424..58b6d2b3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
@@ -30,50 +30,44 @@
 import consulo.language.psi.stub.StubOutputStream;
 
 import jakarta.annotation.Nonnull;
+
 import java.io.IOException;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 10:30:00 PM
+ * Date: Mar 25, 2008
+ * Time: 10:30:00 PM
  */
-public class JSParameterListElementType extends JSStubElementType<JSParameterListStub, JSParameterList>
-{
-	public JSParameterListElementType()
-	{
-		super("PARAMETER_LIST");
-	}
+public class JSParameterListElementType extends JSStubElementType<JSParameterListStub, JSParameterList> {
+    public JSParameterListElementType() {
+        super("PARAMETER_LIST");
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSParameterListImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSParameterListImpl(astNode);
+    }
 
-	@Override
-	public JSParameterList createPsi(@Nonnull JSParameterListStub stub)
-	{
-		return new JSParameterListImpl(stub);
-	}
+    @Override
+    public JSParameterList createPsi(@Nonnull JSParameterListStub stub) {
+        return new JSParameterListImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSParameterListStub createStub(@Nonnull JSParameterList psi, StubElement parentStub)
-	{
-		return new JSParameterListStubImpl(parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSParameterListStub createStub(@Nonnull JSParameterList psi, StubElement parentStub) {
+        return new JSParameterListStubImpl(parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSParameterListStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
+    @Override
+    public void serialize(@Nonnull JSParameterListStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
 
-	}
+    }
 
-	@Nonnull
-	@Override
-	public JSParameterListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		return new JSParameterListStubImpl(parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSParameterListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        return new JSParameterListStubImpl(parentStub, this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
index 58ec6bbe..72c13075 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
@@ -39,82 +39,67 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:51:24 PM
+ * Date: Jun 6, 2008
+ * Time: 7:51:24 PM
  */
-public class JSReferenceListElementType extends JSStubElementType<JSReferenceListStub, JSReferenceList>
-{
-	public JSReferenceListElementType(@NonNls String name)
-	{
-		super(name);
-	}
+public class JSReferenceListElementType extends JSStubElementType<JSReferenceListStub, JSReferenceList> {
+    public JSReferenceListElementType(@NonNls String name) {
+        super(name);
+    }
 
-	@Override
-	public void indexStub(@Nonnull JSReferenceListStub stub, @Nonnull IndexSink sink)
-	{
-		if(this == JSElementTypes.EXTENDS_LIST)
-		{
-			doIndex(sink, stub, JavaScriptIndexKeys.EXTENDS_INDEX);
-		}
-		else if(this == JSElementTypes.IMPLEMENTS_LIST)
-		{
-			doIndex(sink, stub, JavaScriptIndexKeys.IMPLEMENTED_INDEX);
-		}
-	}
+    @Override
+    public void indexStub(@Nonnull JSReferenceListStub stub, @Nonnull IndexSink sink) {
+        if (this == JSElementTypes.EXTENDS_LIST) {
+            doIndex(sink, stub, JavaScriptIndexKeys.EXTENDS_INDEX);
+        }
+        else if (this == JSElementTypes.IMPLEMENTS_LIST) {
+            doIndex(sink, stub, JavaScriptIndexKeys.IMPLEMENTED_INDEX);
+        }
+    }
 
-	private static void doIndex(IndexSink sink, JSReferenceListStub stub, StubIndexKey<String, JSReferenceList> indexKey)
-	{
-		for(String s : stub.getReferenceTexts())
-		{
-			if(s != null)
-			{
-				sink.occurrence(indexKey, StringUtil.getShortName(s));
-			}
-		}
-	}
+    private static void doIndex(IndexSink sink, JSReferenceListStub stub, StubIndexKey<String, JSReferenceList> indexKey) {
+        for (String s : stub.getReferenceTexts()) {
+            if (s != null) {
+                sink.occurrence(indexKey, StringUtil.getShortName(s));
+            }
+        }
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSReferenceListImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSReferenceListImpl(astNode);
+    }
 
-	@Override
-	public JSReferenceList createPsi(@Nonnull JSReferenceListStub stub)
-	{
-		return new JSReferenceListImpl(stub, this);
-	}
+    @Override
+    public JSReferenceList createPsi(@Nonnull JSReferenceListStub stub) {
+        return new JSReferenceListImpl(stub, this);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSReferenceListStub createStub(@Nonnull JSReferenceList psi, StubElement parentStub)
-	{
-		String[] referenceTexts = psi.getReferenceTexts();
-		return new JSReferenceListStubImpl(referenceTexts, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSReferenceListStub createStub(@Nonnull JSReferenceList psi, StubElement parentStub) {
+        String[] referenceTexts = psi.getReferenceTexts();
+        return new JSReferenceListStubImpl(referenceTexts, parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSReferenceListStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		String[] referenceTexts = stub.getReferenceTexts();
-		dataStream.writeVarInt(referenceTexts.length);
-		for(String referenceText : referenceTexts)
-		{
-			dataStream.writeName(referenceText);
-		}
-	}
+    @Override
+    public void serialize(@Nonnull JSReferenceListStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        String[] referenceTexts = stub.getReferenceTexts();
+        dataStream.writeVarInt(referenceTexts.length);
+        for (String referenceText : referenceTexts) {
+            dataStream.writeName(referenceText);
+        }
+    }
 
-	@Nonnull
-	@Override
-	public JSReferenceListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		int count = dataStream.readVarInt();
-		String[] refs = ArrayUtil.newStringArray(count);
-		for(int i = 0; i < count; i++)
-		{
-			refs[i] = StringRef.toString(dataStream.readName());
-		}
-		return new JSReferenceListStubImpl(refs, parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSReferenceListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        int count = dataStream.readVarInt();
+        String[] refs = ArrayUtil.newStringArray(count);
+        for (int i = 0; i < count; i++) {
+            refs[i] = StringRef.toString(dataStream.readName());
+        }
+        return new JSReferenceListStubImpl(refs, parentStub, this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
index 0993a1fb..c2a325de 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
@@ -36,47 +36,40 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 3, 2008
- *         Time: 9:13:01 PM
+ * Date: Oct 3, 2008
+ * Time: 9:13:01 PM
  */
-public class JSUseNamespaceDirectiveType extends JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective>
-{
-	public JSUseNamespaceDirectiveType()
-	{
-		super("USE_NAMESPACE_DIRECTIVE");
-	}
+public class JSUseNamespaceDirectiveType extends JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective> {
+    public JSUseNamespaceDirectiveType() {
+        super("USE_NAMESPACE_DIRECTIVE");
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSUseNamespaceDirectiveImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSUseNamespaceDirectiveImpl(astNode);
+    }
 
-	@Override
-	public JSUseNamespaceDirective createPsi(@Nonnull JSUseNamespaceDirectiveStub stub)
-	{
-		return new JSUseNamespaceDirectiveImpl(stub);
-	}
+    @Override
+    public JSUseNamespaceDirective createPsi(@Nonnull JSUseNamespaceDirectiveStub stub) {
+        return new JSUseNamespaceDirectiveImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSUseNamespaceDirectiveStub createStub(@Nonnull JSUseNamespaceDirective psi, StubElement parentStub)
-	{
-		return new JSUseNamespaceDirectiveStubImpl(psi.getNamespaceToBeUsed(), parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSUseNamespaceDirectiveStub createStub(@Nonnull JSUseNamespaceDirective psi, StubElement parentStub) {
+        return new JSUseNamespaceDirectiveStubImpl(psi.getNamespaceToBeUsed(), parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSUseNamespaceDirectiveStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getNamespaceToUse());
-	}
+    @Override
+    public void serialize(@Nonnull JSUseNamespaceDirectiveStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getNamespaceToUse());
+    }
 
-	@Nonnull
-	@Override
-	public JSUseNamespaceDirectiveStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef nameRef = dataStream.readName();
-		return new JSUseNamespaceDirectiveStubImpl(StringRef.toString(nameRef), parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSUseNamespaceDirectiveStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef nameRef = dataStream.readName();
+        return new JSUseNamespaceDirectiveStubImpl(StringRef.toString(nameRef), parentStub, this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
index 00359a33..4c60f987 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
@@ -38,53 +38,45 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 8, 2008
- *         Time: 1:50:59 PM
+ * Date: Jun 8, 2008
+ * Time: 1:50:59 PM
  */
-public class JSVarStatementElementType extends JSStubElementType<JSVarStatementStub, JSVarStatement>
-{
-	public JSVarStatementElementType()
-	{
-		super("VAR_STATEMENT");
-	}
+public class JSVarStatementElementType extends JSStubElementType<JSVarStatementStub, JSVarStatement> {
+    public JSVarStatementElementType() {
+        super("VAR_STATEMENT");
+    }
 
-	@Override
-	public boolean shouldCreateStub(ASTNode node)
-	{
-		final PsiElement element = node.getTreeParent().getPsi();
-		return element instanceof JSClass || element instanceof JSPackageStatement || element instanceof JSFile;
-	}
+    @Override
+    public boolean shouldCreateStub(ASTNode node) {
+        final PsiElement element = node.getTreeParent().getPsi();
+        return element instanceof JSClass || element instanceof JSPackageStatement || element instanceof JSFile;
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSVarStatementImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSVarStatementImpl(astNode);
+    }
 
-	@Override
-	public JSVarStatement createPsi(@Nonnull JSVarStatementStub stub)
-	{
-		return new JSVarStatementImpl(stub);
-	}
+    @Override
+    public JSVarStatement createPsi(@Nonnull JSVarStatementStub stub) {
+        return new JSVarStatementImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSVarStatementStub createStub(@Nonnull JSVarStatement psi, StubElement parentStub)
-	{
-		return new JSVarStatementStubImpl(parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSVarStatementStub createStub(@Nonnull JSVarStatement psi, StubElement parentStub) {
+        return new JSVarStatementStubImpl(parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSVarStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
+    @Override
+    public void serialize(@Nonnull JSVarStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
 
-	}
+    }
 
-	@Nonnull
-	@Override
-	public JSVarStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		return new JSVarStatementStubImpl(parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSVarStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        return new JSVarStatementStubImpl(parentStub, this);
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
index fd7564db..5ab1675d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
@@ -39,88 +39,81 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 10:30:10 PM
+ * Date: Mar 25, 2008
+ * Time: 10:30:10 PM
  */
-public class JSVariableElementType extends JSQualifiedStubElementType<JSVariableStub, JSVariable>
-{
-	public JSVariableElementType()
-	{
-		super("VARIABLE");
-	}
+public class JSVariableElementType extends JSQualifiedStubElementType<JSVariableStub, JSVariable> {
+    public JSVariableElementType() {
+        super("VARIABLE");
+    }
 
-	@Override
-	protected boolean doIndexName(JSVariableStub stub, String name, String fqn)
-	{
-		final IStubElementType stubType = stub.getParentStub().getParentStub().getStubType();
+    @Override
+    protected boolean doIndexName(JSVariableStub stub, String name, String fqn) {
+        final IStubElementType stubType = stub.getParentStub().getParentStub().getStubType();
 
-		if(stubType instanceof JSPackageStatementElementType || stubType == null)
-		{
-			return true;
-		}
-		return false;
-	}
+        return stubType instanceof JSPackageStatementElementType || stubType == null;
+    }
 
-	@Override
-	protected boolean doIndexQualifiedName(JSVariableStub stub, String name, String fqn)
-	{
-		return doIndexName(stub, name, fqn);
-	}
+    @Override
+    protected boolean doIndexQualifiedName(JSVariableStub stub, String name, String fqn) {
+        return doIndexName(stub, name, fqn);
+    }
 
-	@Override
-	public boolean shouldCreateStub(final ASTNode node)
-	{
-		final IElementType discriminatingParentType = node.getTreeParent().getTreeParent().getElementType();
-		return discriminatingParentType == JSElementTypes.PACKAGE_STATEMENT ||
-				discriminatingParentType == JSElementTypes.CLASS ||
-				discriminatingParentType instanceof JSFileElementType;
-	}
+    @Override
+    public boolean shouldCreateStub(final ASTNode node) {
+        final IElementType discriminatingParentType = node.getTreeParent().getTreeParent().getElementType();
+        return discriminatingParentType == JSElementTypes.PACKAGE_STATEMENT
+            || discriminatingParentType == JSElementTypes.CLASS
+            || discriminatingParentType instanceof JSFileElementType;
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(@Nonnull ASTNode astNode)
-	{
-		return new JSVariableImpl(astNode);
-	}
+    @Nonnull
+    @Override
+    public PsiElement createElement(@Nonnull ASTNode astNode) {
+        return new JSVariableImpl(astNode);
+    }
 
-	@Override
-	public JSVariable createPsi(@Nonnull JSVariableStub stub)
-	{
-		return new JSVariableImpl(stub);
-	}
+    @Override
+    public JSVariable createPsi(@Nonnull JSVariableStub stub) {
+        return new JSVariableImpl(stub);
+    }
 
-	@RequiredReadAction
-	@Override
-	public JSVariableStub createStub(@Nonnull JSVariable psi, StubElement parentStub)
-	{
-		String name = psi.getName();
-		int flags = JSVariableStubImpl.buildFlags(psi);
-		String typeString = psi.getTypeString();
-		String initializerText = psi.getInitializerText();
-		String qualifiedName = psi.getQualifiedName();
-		return new JSVariableStubImpl(name, flags, typeString, initializerText, qualifiedName, parentStub, this);
-	}
+    @RequiredReadAction
+    @Override
+    public JSVariableStub createStub(@Nonnull JSVariable psi, StubElement parentStub) {
+        String name = psi.getName();
+        int flags = JSVariableStubImpl.buildFlags(psi);
+        String typeString = psi.getTypeString();
+        String initializerText = psi.getInitializerText();
+        String qualifiedName = psi.getQualifiedName();
+        return new JSVariableStubImpl(name, flags, typeString, initializerText, qualifiedName, parentStub, this);
+    }
 
-	@Override
-	public void serialize(@Nonnull JSVariableStub stub, @Nonnull StubOutputStream dataStream) throws IOException
-	{
-		dataStream.writeName(stub.getName());
-		dataStream.writeVarInt(stub.getFlags());
-		dataStream.writeName(stub.getTypeString());
-		dataStream.writeName(stub.getInitializerText());
-		dataStream.writeName(stub.getQualifiedName());
-	}
+    @Override
+    public void serialize(@Nonnull JSVariableStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+        dataStream.writeName(stub.getName());
+        dataStream.writeVarInt(stub.getFlags());
+        dataStream.writeName(stub.getTypeString());
+        dataStream.writeName(stub.getInitializerText());
+        dataStream.writeName(stub.getQualifiedName());
+    }
 
-	@Nonnull
-	@Override
-	public JSVariableStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException
-	{
-		StringRef nameRef = dataStream.readName();
-		int flags = dataStream.readVarInt();
-		StringRef typeRef = dataStream.readName();
-		StringRef initializerRef = dataStream.readName();
-		StringRef qualifiedRef = dataStream.readName();
-		return new JSVariableStubImpl(StringRef.toString(nameRef), flags, StringRef.toString(typeRef), StringRef.toString(initializerRef),
-				StringRef.toString(qualifiedRef), parentStub, this);
-	}
+    @Nonnull
+    @Override
+    public JSVariableStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+        StringRef nameRef = dataStream.readName();
+        int flags = dataStream.readVarInt();
+        StringRef typeRef = dataStream.readName();
+        StringRef initializerRef = dataStream.readName();
+        StringRef qualifiedRef = dataStream.readName();
+        return new JSVariableStubImpl(
+            StringRef.toString(nameRef),
+            flags,
+            StringRef.toString(typeRef),
+            StringRef.toString(initializerRef),
+            StringRef.toString(qualifiedRef),
+            parentStub,
+            this
+        );
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index 4ea66c06..8e5ba59b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -42,338 +42,272 @@
 
 import java.util.*;
 
-public class JSUnusedImportsHelper
-{
-	private final Collection<PsiElement> myElements;
-
-	public static class Results
-	{
-		public final Collection<JSImportStatement> unusedImports;
-		public final Collection<JSImportStatement> allImports;
-		public final Map<JSReferenceExpression, String> fqnsToReplaceWithImport;
-
-		public Results(Map<JSReferenceExpression, String> fqnsToReplaceWithImport, Collection<JSImportStatement> unusedImports,
-				Collection<JSImportStatement> allImports)
-		{
-			this.fqnsToReplaceWithImport = fqnsToReplaceWithImport;
-			this.unusedImports = unusedImports;
-			this.allImports = allImports;
-		}
-	}
-
-	private static final Collection<? extends Class<? extends JSQualifiedNamedElement>> REFERENCED_ELEMENTS_CLASSES = Arrays.asList(JSClass.class,
-			JSNamespaceDeclaration.class, JSFunction.class, JSVariable.class);
-
-	// in Flex 3 for some reason fqn reference to function or variable does not reqiure explicit import statement
-	private static final Collection<? extends Class<? extends JSQualifiedNamedElement>> QUALIFIED_REFERENCE_NEEDS_IMPORT = Arrays.asList(JSClass.class,
-			JSNamespaceDeclaration.class);
-
-	private static final Key<CachedValue<Results>> ourUnusedImportsKey = Key.create("js.unused.imports");
-
-	private final Set<JSImportStatement> unusedImports = new HashSet<JSImportStatement>();
-	private final Collection<JSImportStatement> allImports = new HashSet<JSImportStatement>();
-	private final Set<JSImportStatement> importsUsedAheadOfDefinition = new HashSet<JSImportStatement>();
-	private final Map<JSReferenceExpression, String> fqnsToReplaceWithImport = new HashMap<JSReferenceExpression, String>();
-	private final PsiFile myContainingFile;
-
-	private JSUnusedImportsHelper(PsiFile containingFile, Collection<PsiElement> elements)
-	{
-		myContainingFile = containingFile;
-		myElements = elements;
-	}
-
-	private void registerUnused(final JSImportStatement importStatement)
-	{
-		allImports.add(importStatement);
-
-		final String importText = importStatement.getImportText();
-		if(importText == null)
-		{
-			return;
-		}
-
-		if(importsUsedAheadOfDefinition.contains(importStatement))
-		{
-			return;
-		}
-
-		unusedImports.add(importStatement);
-	}
-
-	private static boolean isInstance(PsiElement element, Collection<? extends Class<?>> classes)
-	{
-		for(Class<?> clazz : classes)
-		{
-			if(clazz.isInstance(element))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private void process(JSReferenceExpression node)
-	{
-		if(node.getQualifier() == null)
-		{
-			String thisPackage = JSResolveUtil.findPackageStatementQualifier(node);
-			registerUsedImportsFromResolveResults(node, thisPackage);
-		}
-		else
-		{
-			registerUsedImportsFromResolveResults(node, null);
-
-			Pair<Boolean, Boolean> replaceStatus = getReplaceStatus(node);
-
-			if(replaceStatus.second)
-			{
-				if(sameContainingFile(node.getContainingFile(), myContainingFile))
-				{
-					fqnsToReplaceWithImport.put(node, node.getText());
-				}
-			}
-		}
-	}
-
-	private void registerUsedImportsFromResolveResults(JSReferenceExpression node, String thisPackage)
-	{
-		for(ResolveResult r : node.multiResolve(false))
-		{
-			// TODO can we get different import statements here?
-			if(r instanceof JSResolveUtil.MyResolveResult)
-			{
-				JavaScriptImportStatementBase importStatement = ((JSResolveUtil.MyResolveResult) r).getImportUsed();
-
-				if(importStatement instanceof JSImportStatement && isInstance(r.getElement(), REFERENCED_ELEMENTS_CLASSES))
-				{
-					String importString = ((JSImportStatement) importStatement).getImportText();
-					String importedPackage = importString.substring(0, importString.lastIndexOf('.'));
-					if(thisPackage == null || !thisPackage.equals(importedPackage))
-					{
-						registerUsed((JSImportStatement) importStatement);
-					}
-				}
-			}
-		}
-	}
-
-	private static boolean sameContainingFile(PsiFile containingFile, PsiFile subjectFile)
-	{
-		return subjectFile instanceof XmlFile ? getContainingFile(containingFile) == subjectFile : containingFile == subjectFile;
-	}
-
-	public static boolean isSomeNodeThatShouldNotHaveImportsWhenQualified(JSReferenceExpression expression, PsiElement element)
-	{
-		Pair<Boolean, Boolean> pair = getReplaceStatus(expression, element);
-		return !pair.first;
-	}
-
-	private static Pair<Boolean, Boolean> getReplaceStatus(JSReferenceExpression node)
-	{
-		return getReplaceStatus(node, null);
-	}
-
-	/**
-	 * @return Pair(needs import statement, can be replaced)
-	 */
-	private static Pair<Boolean, Boolean> getReplaceStatus(JSReferenceExpression node, PsiElement resolve)
-	{
-		if(resolve == null)
-		{
-			resolve = JSResolveUtil.findClassByQName(node.getText(), node);
-		}
-		PsiElement parent = node.getParent();
-		if(parent instanceof JavaScriptImportStatementBase)
-		{
-			return Pair.create(false, false);
-		}
-
-		if(parent instanceof JSExpressionStatement && !(resolve instanceof JSNamespaceDeclaration))
-		{
-			return Pair.create(false, false);
-		}
-
-		// implicit parameter of anonymous event listener
-		if(parent instanceof JSParameter)
-		{
-			JSFunction parentFunctionExpression = PsiTreeUtil.getParentOfType(node, JSFunction.class);
-			if(parentFunctionExpression instanceof JSFunctionExpression)
-			{
-				if(node.getContainingFile().getContext() instanceof XmlAttributeValue || node.getContainingFile().getContext() instanceof XmlText)
-				{
-					return Pair.create(false, false);
-				}
-			}
-		}
-
-		if(parent.getNode().getElementType() == JSElementTypes.EXTENDS_LIST)
-		{
-			if(parent.getParent() instanceof JSClass)
-			{
-				String className = ((JSClass) parent.getParent()).getName();
-				if(StringUtil.isNotEmpty(className) && className.equals(node.getReferencedName()))
-				{
-					return Pair.create(true, false);
-				}
-			}
-		}
-
-		// part of implements list of mxml component
-		if(parent.getNode().getElementType() == JSElementTypes.IMPLEMENTS_LIST)
-		{
-			if(node.getContainingFile().getContext() instanceof XmlAttributeValue)
-			{
-				return Pair.create(false, false);
-			}
-		}
-
-		PsiElement element = resolve;
-		if(element == null || !isInstance(element, REFERENCED_ELEMENTS_CLASSES))
-		{
-			return Pair.create(false, false);
-		}
-
-		return Pair.create(isInstance(element, QUALIFIED_REFERENCE_NEEDS_IMPORT), true);
-	}
-
-	private void registerUsed(JSImportStatement importStatement)
-	{
-		allImports.add(importStatement);
-		if(importStatement.getImportText() == null)
-		{
-			return;
-		}
-
-		if(!unusedImports.remove(importStatement))
-		{
-			importsUsedAheadOfDefinition.add(importStatement);
-		}
-	}
-
-	private Collection<JSImportStatement> filter(Collection<JSImportStatement> original)
-	{
-		Collection<JSImportStatement> result = new ArrayList<JSImportStatement>();
-		for(JSImportStatement importStatement : original)
-		{
-			if(importStatement.isValid() && sameContainingFile(importStatement.getContainingFile(), myContainingFile))
-			{
-				result.add(importStatement);
-			}
-		}
-		return result;
-	}
-
-
-	public static Results getUnusedImports(PsiFile file)
-	{
-		PsiFile containingFile = getContainingFile(file);
-
-		CachedValue<Results> data = containingFile.getUserData(ourUnusedImportsKey);
-		if(data == null)
-		{
-			final PsiFile containingFile1 = containingFile;
-			data = CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider<Results>()
-			{
-				@Override
-				public Result<Results> compute()
-				{
-					final Map<XmlTag, Collection<PsiElement>> allElements = new HashMap<XmlTag, Collection<PsiElement>>();
-					Collection<JSFile> processedFiles = new HashSet<JSFile>();
-					collectElements(null, containingFile1, allElements, processedFiles);
-
-					Results allResults = new Results(new HashMap<JSReferenceExpression, String>(), new ArrayList<JSImportStatement>(),
-							new ArrayList<JSImportStatement>());
-					for(Collection<PsiElement> elements : allElements.values())
-					{
-						Results results = new JSUnusedImportsHelper(containingFile1, elements).getUnusedImports();
-						allResults.fqnsToReplaceWithImport.putAll(results.fqnsToReplaceWithImport);
-						allResults.unusedImports.addAll(results.unusedImports);
-						allResults.allImports.addAll(results.allImports);
-					}
-
-					// TODO explicit depencencies
-					return new Result<Results>(allResults, PsiModificationTracker.MODIFICATION_COUNT);
-				}
-			}, false);
-			containingFile1.putUserData(ourUnusedImportsKey, data);
-		}
-		return data.getValue();
-	}
-
-	private static PsiFile getContainingFile(PsiFile file)
-	{
-		return file.getContext() != null ? file.getContext().getContainingFile() : file;
-	}
-
-	private Results getUnusedImports()
-	{
-		for(PsiElement e : myElements)
-		{
-			if(e instanceof JSImportStatement)
-			{
-				JSImportStatement importStatement = (JSImportStatement) e;
-				registerUnused(importStatement);
-			}
-			else if(e instanceof JSReferenceExpression)
-			{
-				process((JSReferenceExpression) e);
-			}
-		}
-
-		return new Results(fqnsToReplaceWithImport, filter(unusedImports), filter(allImports));
-	}
-
-	private static void collectElements(@Nullable final XmlTag rootTag, final PsiFile file, final Map<XmlTag, Collection<PsiElement>> result,
-										final Collection<JSFile> processedFiles)
-	{
-		if(processedFiles.contains(file))
-		{
-			return;
-		}
-		if(file instanceof JSFile)
-		{
-			processedFiles.add((JSFile) file);
-
-			PsiTreeUtil.processElements(file, new PsiElementProcessor()
-			{
-				@Override
-				public boolean execute(PsiElement element)
-				{
-					if(element instanceof JSIncludeDirective)
-					{
-						PsiFile includedFile = ((JSIncludeDirective) element).resolveFile();
-						// we check processed files before since we may include this file to self and setting context will make cycle
-						if(includedFile instanceof JSFile && !processedFiles.contains((JSFile) includedFile))
-						{
-							includedFile.putUserData(JSResolveUtil.contextKey, element);
-							collectElements(rootTag, includedFile, result, processedFiles);
-						}
-					}
-					else if(element instanceof JSElement && !(element instanceof JSFile))
-					{
-						Collection<PsiElement> elements = result.get(rootTag);
-						if(elements == null)
-						{
-							elements = new ArrayList<PsiElement>();
-							result.put(rootTag, elements);
-						}
-						elements.add(element);
-					}
-					return true;
-				}
-			});
-		}
-		else if(JavaScriptSupportLoader.isFlexMxmFile(file))
-		{
-			XmlBackedJSClassImpl.visitInjectedFiles((XmlFile) file, new XmlBackedJSClassImpl.InjectedFileVisitor()
-			{
-				@Override
-				public void visit(XmlTag rootTag, JSFile jsFile)
-				{
-					collectElements(rootTag, jsFile, result, processedFiles);
-				}
-			});
-		}
-	}
-
+public class JSUnusedImportsHelper {
+    private final Collection<PsiElement> myElements;
+
+    public static class Results {
+        public final Collection<JSImportStatement> unusedImports;
+        public final Collection<JSImportStatement> allImports;
+        public final Map<JSReferenceExpression, String> fqnsToReplaceWithImport;
+
+        public Results(
+            Map<JSReferenceExpression, String> fqnsToReplaceWithImport,
+            Collection<JSImportStatement> unusedImports,
+            Collection<JSImportStatement> allImports
+        ) {
+            this.fqnsToReplaceWithImport = fqnsToReplaceWithImport;
+            this.unusedImports = unusedImports;
+            this.allImports = allImports;
+        }
+    }
+
+    private static final Collection<? extends Class<? extends JSQualifiedNamedElement>> REFERENCED_ELEMENTS_CLASSES =
+        Arrays.asList(JSClass.class, JSNamespaceDeclaration.class, JSFunction.class, JSVariable.class);
+
+    // in Flex 3 for some reason fqn reference to function or variable does not reqiure explicit import statement
+    private static final Collection<? extends Class<? extends JSQualifiedNamedElement>> QUALIFIED_REFERENCE_NEEDS_IMPORT =
+        Arrays.asList(JSClass.class, JSNamespaceDeclaration.class);
+
+    private static final Key<CachedValue<Results>> ourUnusedImportsKey = Key.create("js.unused.imports");
+
+    private final Set<JSImportStatement> unusedImports = new HashSet<>();
+    private final Collection<JSImportStatement> allImports = new HashSet<>();
+    private final Set<JSImportStatement> importsUsedAheadOfDefinition = new HashSet<>();
+    private final Map<JSReferenceExpression, String> fqnsToReplaceWithImport = new HashMap<>();
+    private final PsiFile myContainingFile;
+
+    private JSUnusedImportsHelper(PsiFile containingFile, Collection<PsiElement> elements) {
+        myContainingFile = containingFile;
+        myElements = elements;
+    }
+
+    private void registerUnused(final JSImportStatement importStatement) {
+        allImports.add(importStatement);
+
+        final String importText = importStatement.getImportText();
+        if (importText == null) {
+            return;
+        }
+
+        if (importsUsedAheadOfDefinition.contains(importStatement)) {
+            return;
+        }
+
+        unusedImports.add(importStatement);
+    }
+
+    private static boolean isInstance(PsiElement element, Collection<? extends Class<?>> classes) {
+        for (Class<?> clazz : classes) {
+            if (clazz.isInstance(element)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void process(JSReferenceExpression node) {
+        if (node.getQualifier() == null) {
+            String thisPackage = JSResolveUtil.findPackageStatementQualifier(node);
+            registerUsedImportsFromResolveResults(node, thisPackage);
+        }
+        else {
+            registerUsedImportsFromResolveResults(node, null);
+
+            Pair<Boolean, Boolean> replaceStatus = getReplaceStatus(node);
+
+            if (replaceStatus.second) {
+                if (sameContainingFile(node.getContainingFile(), myContainingFile)) {
+                    fqnsToReplaceWithImport.put(node, node.getText());
+                }
+            }
+        }
+    }
+
+    private void registerUsedImportsFromResolveResults(JSReferenceExpression node, String thisPackage) {
+        for (ResolveResult r : node.multiResolve(false)) {
+            // TODO can we get different import statements here?
+            if (r instanceof JSResolveUtil.MyResolveResult resolveResult
+                && resolveResult.getImportUsed() instanceof JSImportStatement jsImportStatement
+                && isInstance(r.getElement(), REFERENCED_ELEMENTS_CLASSES)) {
+                String importString = jsImportStatement.getImportText();
+                String importedPackage = importString.substring(0, importString.lastIndexOf('.'));
+                if (thisPackage == null || !thisPackage.equals(importedPackage)) {
+                    registerUsed(jsImportStatement);
+                }
+            }
+        }
+    }
+
+    private static boolean sameContainingFile(PsiFile containingFile, PsiFile subjectFile) {
+        return subjectFile instanceof XmlFile ? getContainingFile(containingFile) == subjectFile : containingFile == subjectFile;
+    }
+
+    public static boolean isSomeNodeThatShouldNotHaveImportsWhenQualified(JSReferenceExpression expression, PsiElement element) {
+        Pair<Boolean, Boolean> pair = getReplaceStatus(expression, element);
+        return !pair.first;
+    }
+
+    private static Pair<Boolean, Boolean> getReplaceStatus(JSReferenceExpression node) {
+        return getReplaceStatus(node, null);
+    }
+
+    /**
+     * @return Pair(needs import statement, can be replaced)
+     */
+    private static Pair<Boolean, Boolean> getReplaceStatus(JSReferenceExpression node, PsiElement resolve) {
+        if (resolve == null) {
+            resolve = JSResolveUtil.findClassByQName(node.getText(), node);
+        }
+        PsiElement parent = node.getParent();
+        if (parent instanceof JavaScriptImportStatementBase) {
+            return Pair.create(false, false);
+        }
+
+        if (parent instanceof JSExpressionStatement && !(resolve instanceof JSNamespaceDeclaration)) {
+            return Pair.create(false, false);
+        }
+
+        // implicit parameter of anonymous event listener
+        if (parent instanceof JSParameter) {
+            JSFunction parentFunctionExpression = PsiTreeUtil.getParentOfType(node, JSFunction.class);
+            if (parentFunctionExpression instanceof JSFunctionExpression) {
+                if (node.getContainingFile().getContext() instanceof XmlAttributeValue
+                    || node.getContainingFile().getContext() instanceof XmlText) {
+                    return Pair.create(false, false);
+                }
+            }
+        }
+
+        if (parent.getNode().getElementType() == JSElementTypes.EXTENDS_LIST && parent.getParent() instanceof JSClass jsClass) {
+            String className = jsClass.getName();
+            if (StringUtil.isNotEmpty(className) && className.equals(node.getReferencedName())) {
+                return Pair.create(true, false);
+            }
+        }
+
+        // part of implements list of mxml component
+        if (parent.getNode().getElementType() == JSElementTypes.IMPLEMENTS_LIST
+            && node.getContainingFile().getContext() instanceof XmlAttributeValue) {
+            return Pair.create(false, false);
+        }
+
+        PsiElement element = resolve;
+        if (element == null || !isInstance(element, REFERENCED_ELEMENTS_CLASSES)) {
+            return Pair.create(false, false);
+        }
+
+        return Pair.create(isInstance(element, QUALIFIED_REFERENCE_NEEDS_IMPORT), true);
+    }
+
+    private void registerUsed(JSImportStatement importStatement) {
+        allImports.add(importStatement);
+        if (importStatement.getImportText() == null) {
+            return;
+        }
+
+        if (!unusedImports.remove(importStatement)) {
+            importsUsedAheadOfDefinition.add(importStatement);
+        }
+    }
+
+    private Collection<JSImportStatement> filter(Collection<JSImportStatement> original) {
+        Collection<JSImportStatement> result = new ArrayList<>();
+        for (JSImportStatement importStatement : original) {
+            if (importStatement.isValid() && sameContainingFile(importStatement.getContainingFile(), myContainingFile)) {
+                result.add(importStatement);
+            }
+        }
+        return result;
+    }
+
+    public static Results getUnusedImports(PsiFile file) {
+        PsiFile containingFile = getContainingFile(file);
+
+        CachedValue<Results> data = containingFile.getUserData(ourUnusedImportsKey);
+        if (data == null) {
+            final PsiFile containingFile1 = containingFile;
+            data = CachedValuesManager.getManager(file.getProject()).createCachedValue(
+                () -> {
+                    final Map<XmlTag, Collection<PsiElement>> allElements = new HashMap<>();
+                    Collection<JSFile> processedFiles = new HashSet<>();
+                    collectElements(null, containingFile1, allElements, processedFiles);
+
+                    Results allResults = new Results(new HashMap<>(), new ArrayList<>(), new ArrayList<>());
+                    for (Collection<PsiElement> elements : allElements.values()) {
+                        Results results = new JSUnusedImportsHelper(containingFile1, elements).getUnusedImports();
+                        allResults.fqnsToReplaceWithImport.putAll(results.fqnsToReplaceWithImport);
+                        allResults.unusedImports.addAll(results.unusedImports);
+                        allResults.allImports.addAll(results.allImports);
+                    }
+
+                    // TODO explicit depencencies
+                    return new CachedValueProvider.Result<>(allResults, PsiModificationTracker.MODIFICATION_COUNT);
+                },
+                false
+            );
+            containingFile1.putUserData(ourUnusedImportsKey, data);
+        }
+        return data.getValue();
+    }
+
+    private static PsiFile getContainingFile(PsiFile file) {
+        return file.getContext() != null ? file.getContext().getContainingFile() : file;
+    }
+
+    private Results getUnusedImports() {
+        for (PsiElement e : myElements) {
+            if (e instanceof JSImportStatement) {
+                JSImportStatement importStatement = (JSImportStatement)e;
+                registerUnused(importStatement);
+            }
+            else if (e instanceof JSReferenceExpression) {
+                process((JSReferenceExpression)e);
+            }
+        }
+
+        return new Results(fqnsToReplaceWithImport, filter(unusedImports), filter(allImports));
+    }
+
+    private static void collectElements(
+        @Nullable final XmlTag rootTag,
+        final PsiFile file,
+        final Map<XmlTag, Collection<PsiElement>> result,
+        final Collection<JSFile> processedFiles
+    ) {
+        if (processedFiles.contains(file)) {
+            return;
+        }
+        if (file instanceof JSFile jsFile) {
+            processedFiles.add(jsFile);
+
+            PsiTreeUtil.processElements(
+                file,
+                element -> {
+                    if (element instanceof JSIncludeDirective includeDirective) {
+                        PsiFile includedFile = includeDirective.resolveFile();
+                        // we check processed files before since we may include this file to self and setting context will make cycle
+                        if (includedFile instanceof JSFile includedJsFile && !processedFiles.contains(includedJsFile)) {
+                            includedFile.putUserData(JSResolveUtil.contextKey, element);
+                            collectElements(rootTag, includedFile, result, processedFiles);
+                        }
+                    }
+                    else if (element instanceof JSElement && !(element instanceof JSFile)) {
+                        Collection<PsiElement> elements = result.get(rootTag);
+                        if (elements == null) {
+                            elements = new ArrayList<>();
+                            result.put(rootTag, elements);
+                        }
+                        elements.add(element);
+                    }
+                    return true;
+                }
+            );
+        }
+        else if (JavaScriptSupportLoader.isFlexMxmFile(file)) {
+            XmlBackedJSClassImpl.visitInjectedFiles(
+                (XmlFile)file,
+                (rootTag1, jsFile) -> collectElements(rootTag1, jsFile, result, processedFiles)
+            );
+        }
+    }
 }

From c06addf67f4a02353e8dbb71a71586b453d49178 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Tue, 30 Jul 2024 16:18:11 +0300
Subject: [PATCH 231/340] Code reformat using IJ4 code style (part 19).

---
 .../lang/javascript/JSLanguageInjector.java   | 764 ++++++++--------
 .../lang/javascript/JSStubElementTypes.java   |  69 +-
 .../lang/javascript/JSTokenTypes.java         | 855 +++++++++---------
 .../XmlAttributeValueJSInjector.java          |  14 +-
 .../lang/javascript/XmlTextJSInjector.java    |  14 +-
 .../psi/impl/EcmaScript4ElementTypes.java     |   5 +-
 .../JavaScriptQuickFixFactory.java            |  59 +-
 .../ide/hightlight/JavaScriptHighlighter.java | 185 ++--
 .../JavaScriptSyntaxHighlightFactory.java     |  37 +-
 .../JavaScriptSyntaxHighlightKeys.java        |  75 +-
 .../impl/language/JavaScriptQuoteHandler.java |  82 +-
 .../impl/language/psi/JSComputedNameImpl.java |  30 +-
 .../impl/language/psi/JSElementFactory.java   |  21 +-
 .../impl/language/psi/JSStubElementType.java  |  38 +-
 .../psi/JavaScriptLambdaExpressionImpl.java   | 217 +++--
 .../psi/JavaScriptSpreadExpressionImpl.java   |  52 +-
 .../language/psi/stub/JSFileStubImpl.java     |  43 +-
 .../psi/stub/JavaScriptClassNameIndex.java    |  14 +-
 .../qucikFixes/CreateJSFunctionFixBase.java   | 148 ++-
 .../lang/lexer/JavaScriptFlexAdapter.java     |  41 +-
 .../lang/lexer/JavaScriptFlexLexer.java       |   7 +-
 .../JavaSciptDestructuringElementImpl.java    |  32 +-
 .../JavaSciptDestructuringObjectImpl.java     |  51 +-
 .../JavaScriptDestructuringParameterImpl.java | 312 +++----
 ...tDestructuringShorthandedPropertyImpl.java |  32 +-
 25 files changed, 1529 insertions(+), 1668 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index 1d3dca07..2055a8ab 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -39,397 +39,377 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Apr 28, 2008
- *         Time: 8:40:38 PM
+ * Date: Apr 28, 2008
+ * Time: 8:40:38 PM
  */
-public abstract class JSLanguageInjector implements MultiHostInjector
-{
-	@NonNls
-	private static final String JAVASCRIPT_PREFIX = "javascript:";
-	@NonNls
-	public static final String JSP_URI = "http://java.sun.com/JSP/Page";
-
-	private static final NamedPointer<Language> CSS_LANGUAGE = LanguagePointerUtil.createPointer("CSS");
-
-	@Override
-	public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement host)
-	{
-		if(host instanceof XmlAttributeValue)
-		{
-			final PsiElement attribute = host.getParent();
-			final PsiElement tag = attribute.getParent();
-
-			if(attribute instanceof XmlAttribute && tag instanceof XmlTag)
-			{
-				if(host.getTextLength() == 0)
-				{
-					return;
-				}
-				@NonNls String attrName = ((XmlAttribute) attribute).getName();
-				if(tag instanceof HtmlTag)
-				{
-					attrName = attrName.toLowerCase();
-				}
-
-				if("href".equals(attrName) && ((XmlAttributeValue) host).getValue().startsWith(JAVASCRIPT_PREFIX))
-				{
-					injectJSIntoAttributeValue(registrar, (XmlAttributeValue) host, true);
-				}
-				else if(attrName.startsWith("on"))
-				{
-					final String ns = ((XmlTag) tag).getNamespace();
-					if(JavaScriptSupportLoader.BINDOWS_URI.equals(ns) ||
-							JavaScriptSupportLoader.isBindowsFile(host) ||
-							isMozillaXulOrXblNs(ns))
-					{
-						TextRange range = new TextRange(1, host.getTextLength() - 1);
-						registrar.startInjecting(JavaScriptLanguage.INSTANCE).addPlace(null, null, (PsiLanguageInjectionHost) host,
-								range).doneInjecting();
-					}
-					else
-					{
-						checkMxmlInjection(registrar, host, attribute, tag);
-					}
-				}
-				else if("style".equals(attrName) && isMozillaXulOrXblNs(((XmlTag) tag).getNamespace()) && CSS_LANGUAGE.get() != null)
-				{
-					registrar.startInjecting(CSS_LANGUAGE.get()).addPlace("inline.style {", "}", (PsiLanguageInjectionHost) host, new TextRange(1,
-							host.getTextLength() - 1)).doneInjecting();
-				}
-				else if("implements".equals(attrName) && JavaScriptSupportLoader.isFlexMxmFile(tag.getContainingFile()))
-				{
-					TextRange range = new TextRange(1, host.getTextLength() - 1);
-					registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4).addPlace("class Foo implements ", " {}", (PsiLanguageInjectionHost) host,
-							range).doneInjecting();
-				}
-				else if(attrName.equalsIgnoreCase("dojoType"))
-				{
-					TextRange range = new TextRange(1, host.getTextLength() - 1);
-					registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4).addPlace("var a:", null, (PsiLanguageInjectionHost) host,
-							range).doneInjecting();
-				}
-				else if(attrName.equalsIgnoreCase("djConfig"))
-				{
-					TextRange range = new TextRange(1, host.getTextLength() - 1);
-					registrar.startInjecting(JavaScriptLanguage.INSTANCE).addPlace("a = { ", " }", (PsiLanguageInjectionHost) host,
-							range).doneInjecting();
-				}
-				else
-				{
-					checkMxmlInjection(registrar, host, attribute, tag);
-				}
-			}
-		}
-		else if(host instanceof XmlText)
-		{
-			final PsiElement _tag = host.getParent();
-			if(_tag instanceof XmlTag)
-			{
-				final XmlTag tag = (XmlTag) _tag;
-
-				final @NonNls String localName = tag.getLocalName();
-
-				if("attribute".equals(localName) && JSP_URI.equals(tag.getNamespace()))
-				{
-					@NonNls final String name = tag.getAttributeValue("name");
-					if(name != null && name.startsWith("on"))
-					{
-						Language language = JavaScriptLanguage.INSTANCE;
-						injectToXmlText(registrar, host, language, null, null);
-					}
-				}
-				else if("Style".equals(localName) && JavaScriptSupportLoader.isMxmlNs(tag.getNamespace()) && CSS_LANGUAGE.get() != null)
-				{
-					injectToXmlText(registrar, host, CSS_LANGUAGE.get(), null, null);
-				}
-				else if((("script".equals(localName) && ((tag.getNamespacePrefix().length() > 0 && doInjectTo(tag)) || isMozillaXulOrXblNs(tag.getNamespace()))
-				) ||
-						"Script".equals(localName) ||
-						"Metadata".equals(localName)) && !(tag instanceof HtmlTag))
-				{
-					boolean inject = true;
-					boolean ecma = JavaScriptSupportLoader.isFlexMxmFile(tag.getContainingFile());
-					if(ecma && tag.getAttributeValue("source") != null)
-					{
-						inject = false;
-					}
-					Language language = ecma ? JavaScriptSupportLoader.ECMA_SCRIPT_L4 : JavaScriptLanguage.INSTANCE;
-					if(inject)
-					{
-						injectToXmlText(registrar, host, language, null, null);
-					}
-				}
-				else if(!(tag instanceof HtmlTag) && JavaScriptSupportLoader.isFlexMxmFile(tag.getContainingFile()) && tag.getSubTags().length == 0)
-				{
-					injectInMxmlFile(registrar, host, tag.getDescriptor(), tag);
-				}
-				else
-				{
-					boolean getter;
-					boolean setter = false;
-					boolean field = false;
-					boolean body = false;
-					boolean handler = false;
-					boolean constructor = false;
-
-					if(((getter = "getter".equals(localName)) ||
-							(setter = "setter".equals(localName)) ||
-							(field = "field".equals(localName)) ||
-							(body = "body".equals(localName)) ||
-							(handler = "handler".equals(localName)) ||
-							//(property = ("property".equals(localName) && tag.getSubTags().length == 0)) ||
-							(constructor = "constructor".equals(localName))) && isMozillaXulOrXblNs(tag.getNamespace()))
-					{
-						@NonNls String prefix = null;
-						@NonNls String suffix = null;
-
-						if(getter || setter)
-						{
-							final String name = getNameFromTag(tag.getParentTag(), "property");
-							prefix = "function " + (getter ? "get " : "set ") + name + "(" + (setter ? "val" : "") + ") {";
-							suffix = "}";
-						}
-						else if(body)
-						{
-							final XmlTag parentTag = tag.getParentTag();
-							String name = getNameFromTag(parentTag, "method");
-							String signature = "";
-							for(XmlTag ptag : parentTag.findSubTags("parameter"))
-							{
-								if(signature.length() > 0)
-								{
-									signature += ", ";
-								}
-								signature += ptag.getAttributeValue("name");
-							}
-							prefix = "function " + name + "(" + signature + ") {";
-							suffix = "}";
-						}
-						else if(field)
-						{
-							prefix = "var " + tag.getAttributeValue("name") + " = ";
-						}
-						else if(handler)
-						{
-							prefix = "function " + tag.getAttributeValue("event") + " {";
-							suffix = "}";
-						}
-						else if(constructor)
-						{
-							final XmlTag parentTag = tag.getParentTag();
-							final XmlTag grandParentTag = parentTag != null ? parentTag.getParentTag() : null;
-							prefix = "function " + (grandParentTag != null ? grandParentTag.getAttributeValue("id") : null) + "() {";
-							suffix = "}";
-						}
-
-						injectToXmlText(registrar, host, JavaScriptLanguage.INSTANCE, prefix, suffix);
-					}
-				}
-			}
-		}
-	}
-
-	private boolean doInjectTo(final XmlTag tag)
-	{
-		final XmlTagValue value = tag.getValue();
-		final XmlTagChild[] tagChildren = value.getChildren();
-
-		return tagChildren.length == 1 && (tagChildren[0].getNode().getElementType() == XmlElementType.XML_CDATA || !tagChildren[0].textContains('<'));
-	}
-
-	private static void checkMxmlInjection(final MultiHostRegistrar registrar, final PsiElement host, final PsiElement attribute, final PsiElement _tag)
-	{
-		final PsiFile containingFile = _tag.getContainingFile();
-		if(JavaScriptSupportLoader.isFlexMxmFile(containingFile))
-		{
-			injectInMxmlFile(registrar, host, ((XmlAttribute) attribute).getDescriptor(), (XmlTag) _tag);
-		}
-	}
-
-	private static void injectToXmlText(final MultiHostRegistrar registrar, final PsiElement host, final Language language, final String prefix,
-			final String suffix)
-	{
-		TextRange range = new TextRange(0, host.getTextLength());
-		registrar.startInjecting(language).addPlace(prefix, suffix, (PsiLanguageInjectionHost) host, range).doneInjecting();
-	}
-
-	private static String getNameFromTag(final XmlTag parentTag, final @NonNls String s)
-	{
-		return parentTag != null && s.equals(parentTag.getLocalName()) ? parentTag.getAttributeValue("name") : "";
-	}
-
-	public static boolean isMozillaXulOrXblNs(final @NonNls String ns)
-	{
-		return "http://www.mozilla.org/xbl".equals(ns) || "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul".equals(ns);
-	}
-
-	public static void injectJSIntoAttributeValue(final MultiHostRegistrar registrar, final XmlAttributeValue host, final boolean startsWithPrefix)
-	{
-		final PsiElement[] myChildren = host.getChildren();
-		int valueIndex = myChildren.length - 2;
-		int valueTokenNumber = 1;
-		if(valueIndex < 0)
-		{
-			valueIndex = 0;
-			valueTokenNumber = 0;
-		}
-
-		final PsiElement valueChild = myChildren[valueIndex];
-
-		if(valueChild instanceof XmlToken && ((XmlToken) valueChild).getTokenType() == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
-		{
-			boolean injectFromTheBeginning = valueIndex == valueTokenNumber;
-			if(!injectFromTheBeginning)
-			{
-				// check if well formed el holder
-				boolean wellFormed = true;
-				boolean badlyFormed = false;
-
-				for(int i = valueTokenNumber; i < valueIndex; ++i)
-				{
-					final PsiElement currentElement = myChildren[i];
-
-					if(currentElement instanceof XmlToken && ((XmlToken) currentElement).getTokenType() == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
-					{
-						// ok child
-						continue;
-					}
-					else
-					{
-
-						if(currentElement instanceof OuterLanguageElement)
-						{
-							final String prevText = myChildren[i - 1].getText();
-							final String nextText = myChildren[i + 1].getText();
-
-							if((StringUtil.endsWithChar(prevText, '\"') && StringUtil.startsWithChar(nextText, '\"')) || (StringUtil.endsWithChar(prevText,
-									'\'') && StringUtil.startsWithChar(nextText, '\'')))
-							{
-								// ok child
-								continue;
-							}
-							else if((StringUtil.endsWithChar(prevText, '(') && StringUtil.startsWithChar(nextText, ')')) && currentElement.textContains('<'))
-							{
-								badlyFormed = true;
-							}
-							else if(currentElement.textContains('$'))
-							{
-								final String s = currentElement.getText();
-								if(s.startsWith("${") && s.endsWith("}") && s.length() > 2)
-								{
-									continue;
-								}
-							}
-							else if(currentElement.textContains('%'))
-							{
-								badlyFormed = true;
-							}
-						}
-
-						wellFormed = false;
-						break;
-					}
-				}
-
-				if(badlyFormed)
-				{
-					return;
-				}
-				if(wellFormed)
-				{
-					injectFromTheBeginning = wellFormed;
-				}
-			}
-			TextRange range = new TextRange(injectFromTheBeginning ? valueTokenNumber + (startsWithPrefix ? JAVASCRIPT_PREFIX.length() : 0) : valueChild
-					.getStartOffsetInParent(), host.getTextLength() - valueTokenNumber);
-			Language language = JavaScriptLanguage.INSTANCE;
-			registrar.startInjecting(language).addPlace(null, null, (PsiLanguageInjectionHost) host, range).doneInjecting();
-
-		}
-	}
-
-	private static void injectInMxmlFile(final MultiHostRegistrar registrar, final PsiElement host, final PsiMetaData descriptor, XmlTag tag)
-	{
-		int offset = host instanceof XmlText ? 0 : 1;
-
-		if(descriptor instanceof AnnotationBackedDescriptor && ((XmlElementDescriptorWithCDataContent) descriptor).requiresCdataBracesInContext(tag))
-		{
-			final int length = host.getTextLength();
-			if(length < 2 * offset)
-			{
-				return;
-			}
-			String type = ((AnnotationBackedDescriptor) descriptor).getType();
-			if(type == null)
-			{
-				type = "*";
-			}
-			final @NonNls String prefix = "(function (event:" + type + ") {";
-			final @NonNls String suffix = "})();";
-
-			if(host instanceof XmlText)
-			{
-				injectToXmlText(registrar, host, JavaScriptSupportLoader.ECMA_SCRIPT_L4, prefix, suffix);
-			}
-			else
-			{
-				TextRange range = new TextRange(offset, length - offset);
-
-				registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4).addPlace(prefix, (host instanceof XmlAttributeValue ? "\n" : "") + suffix,
-						(PsiLanguageInjectionHost) host, range).doneInjecting();
-			}
-		}
-		else
-		{
-			final String text = StringUtil.stripQuotesAroundValue(host.getText());
-			int openedBraces = 0;
-			int start = -1;
-			boolean addedSomething = false;
-			boolean quoted = false;
-
-			for(int i = 0; i < text.length(); ++i)
-			{
-				final char ch = text.charAt(i);
-
-				if(quoted)
-				{
-					quoted = false;
-					continue;
-				}
-				if(ch == '\\')
-				{
-					quoted = true;
-				}
-				else if(ch == '{')
-				{
-					if(openedBraces == 0)
-					{
-						start = i + 1;
-					}
-					openedBraces++;
-				}
-				else if(ch == '}')
-				{
-					openedBraces--;
-					if(openedBraces == 0 && start != -1)
-					{
-						registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4).addPlace("(function (){}) (", "\n);", (PsiLanguageInjectionHost) host, new TextRange(offset + start, i + offset)).doneInjecting();
-						addedSomething = true;
-						start = -1;
-					}
-				}
-			}
-
-			if(!addedSomething)
-			{
-				final String trimmedText = text.trim();
-				start = trimmedText.indexOf("@Embed");
-				if(start == 0)
-				{
-					offset += text.indexOf(trimmedText);
-					registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4).addPlace(null, null, (PsiLanguageInjectionHost) host, new TextRange(offset, trimmedText.length() + offset)).doneInjecting();
-				}
-			}
-		}
-	}
+public abstract class JSLanguageInjector implements MultiHostInjector {
+    @NonNls
+    private static final String JAVASCRIPT_PREFIX = "javascript:";
+    @NonNls
+    public static final String JSP_URI = "http://java.sun.com/JSP/Page";
+
+    private static final NamedPointer<Language> CSS_LANGUAGE = LanguagePointerUtil.createPointer("CSS");
+
+    @Override
+    public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement host) {
+        if (host instanceof XmlAttributeValue attributeValue) {
+            final PsiElement attribute = attributeValue.getParent();
+            final PsiElement tag = attribute.getParent();
+
+            if (attribute instanceof XmlAttribute xmlAttribute && tag instanceof XmlTag xmlTag) {
+                if (attributeValue.getTextLength() == 0) {
+                    return;
+                }
+                @NonNls String attrName = xmlAttribute.getName();
+                if (tag instanceof HtmlTag) {
+                    attrName = attrName.toLowerCase();
+                }
+
+                if ("href".equals(attrName) && attributeValue.getValue().startsWith(JAVASCRIPT_PREFIX)) {
+                    injectJSIntoAttributeValue(registrar, attributeValue, true);
+                }
+                else if (attrName.startsWith("on")) {
+                    final String ns = xmlTag.getNamespace();
+                    if (JavaScriptSupportLoader.BINDOWS_URI.equals(ns)
+                        || JavaScriptSupportLoader.isBindowsFile(attributeValue)
+                        || isMozillaXulOrXblNs(ns)) {
+                        TextRange range = new TextRange(1, attributeValue.getTextLength() - 1);
+                        registrar.startInjecting(JavaScriptLanguage.INSTANCE)
+                            .addPlace(null, null, (PsiLanguageInjectionHost)attributeValue, range)
+                            .doneInjecting();
+                    }
+                    else {
+                        checkMxmlInjection(registrar, attributeValue, attribute, tag);
+                    }
+                }
+                else if ("style".equals(attrName) && isMozillaXulOrXblNs(xmlTag.getNamespace()) && CSS_LANGUAGE.get() != null) {
+                    registrar.startInjecting(CSS_LANGUAGE.get())
+                        .addPlace(
+                            "inline.style {",
+                            "}",
+                            (PsiLanguageInjectionHost)attributeValue,
+                            new TextRange(1, attributeValue.getTextLength() - 1)
+                        )
+                        .doneInjecting();
+                }
+                else if ("implements".equals(attrName) && JavaScriptSupportLoader.isFlexMxmFile(tag.getContainingFile())) {
+                    TextRange range = new TextRange(1, attributeValue.getTextLength() - 1);
+                    registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4)
+                        .addPlace("class Foo implements ", " {}", (PsiLanguageInjectionHost)attributeValue, range)
+                        .doneInjecting();
+                }
+                else if (attrName.equalsIgnoreCase("dojoType")) {
+                    TextRange range = new TextRange(1, attributeValue.getTextLength() - 1);
+                    registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4)
+                        .addPlace("var a:", null, (PsiLanguageInjectionHost)attributeValue, range)
+                        .doneInjecting();
+                }
+                else if (attrName.equalsIgnoreCase("djConfig")) {
+                    TextRange range = new TextRange(1, attributeValue.getTextLength() - 1);
+                    registrar.startInjecting(JavaScriptLanguage.INSTANCE)
+                        .addPlace("a = { ", " }", (PsiLanguageInjectionHost)attributeValue, range)
+                        .doneInjecting();
+                }
+                else {
+                    checkMxmlInjection(registrar, attributeValue, attribute, tag);
+                }
+            }
+        }
+        else if (host instanceof XmlText && host.getParent() instanceof XmlTag tag) {
+            final @NonNls String localName = tag.getLocalName();
+
+            if ("attribute".equals(localName) && JSP_URI.equals(tag.getNamespace())) {
+                @NonNls final String name = tag.getAttributeValue("name");
+                if (name != null && name.startsWith("on")) {
+                    Language language = JavaScriptLanguage.INSTANCE;
+                    injectToXmlText(registrar, host, language, null, null);
+                }
+            }
+            else if ("Style".equals(localName) && JavaScriptSupportLoader.isMxmlNs(tag.getNamespace()) && CSS_LANGUAGE.get() != null) {
+                injectToXmlText(registrar, host, CSS_LANGUAGE.get(), null, null);
+            }
+            else if ((("script".equals(localName) && ((tag.getNamespacePrefix().length() > 0 && doInjectTo(tag))
+                || isMozillaXulOrXblNs(tag.getNamespace()))) || "Script".equals(localName) || "Metadata".equals(localName))
+                && !(tag instanceof HtmlTag)) {
+                boolean inject = true;
+                boolean ecma = JavaScriptSupportLoader.isFlexMxmFile(tag.getContainingFile());
+                if (ecma && tag.getAttributeValue("source") != null) {
+                    inject = false;
+                }
+                Language language = ecma ? JavaScriptSupportLoader.ECMA_SCRIPT_L4 : JavaScriptLanguage.INSTANCE;
+                if (inject) {
+                    injectToXmlText(registrar, host, language, null, null);
+                }
+            }
+            else if (!(tag instanceof HtmlTag) && JavaScriptSupportLoader.isFlexMxmFile(tag.getContainingFile())
+                && tag.getSubTags().length == 0) {
+                injectInMxmlFile(registrar, host, tag.getDescriptor(), tag);
+            }
+            else {
+                boolean getter;
+                boolean setter = false;
+                boolean field = false;
+                boolean body = false;
+                boolean handler = false;
+                boolean constructor = false;
+
+                if (((getter = "getter".equals(localName))
+                    || (setter = "setter".equals(localName))
+                    || (field = "field".equals(localName))
+                    || (body = "body".equals(localName))
+                    || (handler = "handler".equals(localName))
+                    //|| (property = ("property".equals(localName) && tag.getSubTags().length == 0))
+                    || (constructor = "constructor".equals(localName)))
+                    && isMozillaXulOrXblNs(tag.getNamespace())) {
+                    @NonNls String prefix = null;
+                    @NonNls String suffix = null;
+
+                    if (getter || setter) {
+                        final String name = getNameFromTag(tag.getParentTag(), "property");
+                        prefix = "function " + (getter ? "get " : "set ") + name + "(" + (setter ? "val" : "") + ") {";
+                        suffix = "}";
+                    }
+                    else if (body) {
+                        final XmlTag parentTag = tag.getParentTag();
+                        String name = getNameFromTag(parentTag, "method");
+                        String signature = "";
+                        for (XmlTag ptag : parentTag.findSubTags("parameter")) {
+                            if (signature.length() > 0) {
+                                signature += ", ";
+                            }
+                            signature += ptag.getAttributeValue("name");
+                        }
+                        prefix = "function " + name + "(" + signature + ") {";
+                        suffix = "}";
+                    }
+                    else if (field) {
+                        prefix = "var " + tag.getAttributeValue("name") + " = ";
+                    }
+                    else if (handler) {
+                        prefix = "function " + tag.getAttributeValue("event") + " {";
+                        suffix = "}";
+                    }
+                    else if (constructor) {
+                        final XmlTag parentTag = tag.getParentTag();
+                        final XmlTag grandParentTag = parentTag != null ? parentTag.getParentTag() : null;
+                        prefix = "function " + (grandParentTag != null ? grandParentTag.getAttributeValue("id") : null) + "() {";
+                        suffix = "}";
+                    }
+
+                    injectToXmlText(registrar, host, JavaScriptLanguage.INSTANCE, prefix, suffix);
+                }
+            }
+        }
+    }
+
+    private boolean doInjectTo(final XmlTag tag) {
+        final XmlTagValue value = tag.getValue();
+        final XmlTagChild[] tagChildren = value.getChildren();
+
+        return tagChildren.length == 1
+            && (tagChildren[0].getNode().getElementType() == XmlElementType.XML_CDATA || !tagChildren[0].textContains('<'));
+    }
+
+    private static void checkMxmlInjection(
+        final MultiHostRegistrar registrar,
+        final PsiElement host,
+        final PsiElement attribute,
+        final PsiElement _tag
+    ) {
+        final PsiFile containingFile = _tag.getContainingFile();
+        if (JavaScriptSupportLoader.isFlexMxmFile(containingFile)) {
+            injectInMxmlFile(registrar, host, ((XmlAttribute)attribute).getDescriptor(), (XmlTag)_tag);
+        }
+    }
+
+    private static void injectToXmlText(
+        final MultiHostRegistrar registrar,
+        final PsiElement host,
+        final Language language,
+        final String prefix,
+        final String suffix
+    ) {
+        TextRange range = new TextRange(0, host.getTextLength());
+        registrar.startInjecting(language).addPlace(prefix, suffix, (PsiLanguageInjectionHost)host, range).doneInjecting();
+    }
+
+    private static String getNameFromTag(final XmlTag parentTag, final @NonNls String s) {
+        return parentTag != null && s.equals(parentTag.getLocalName()) ? parentTag.getAttributeValue("name") : "";
+    }
+
+    public static boolean isMozillaXulOrXblNs(final @NonNls String ns) {
+        return "http://www.mozilla.org/xbl".equals(ns) || "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul".equals(ns);
+    }
+
+    public static void injectJSIntoAttributeValue(
+        final MultiHostRegistrar registrar,
+        final XmlAttributeValue host,
+        final boolean startsWithPrefix
+    ) {
+        final PsiElement[] myChildren = host.getChildren();
+        int valueIndex = myChildren.length - 2;
+        int valueTokenNumber = 1;
+        if (valueIndex < 0) {
+            valueIndex = 0;
+            valueTokenNumber = 0;
+        }
+
+        final PsiElement valueChild = myChildren[valueIndex];
+
+        if (valueChild instanceof XmlToken && ((XmlToken)valueChild).getTokenType() == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN) {
+            boolean injectFromTheBeginning = valueIndex == valueTokenNumber;
+            if (!injectFromTheBeginning) {
+                // check if well formed el holder
+                boolean wellFormed = true;
+                boolean badlyFormed = false;
+
+                for (int i = valueTokenNumber; i < valueIndex; ++i) {
+                    final PsiElement currentElement = myChildren[i];
+
+                    if (currentElement instanceof XmlToken && ((XmlToken)currentElement).getTokenType() == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN) {
+                        // ok child
+                        continue;
+                    }
+                    else {
+                        if (currentElement instanceof OuterLanguageElement) {
+                            final String prevText = myChildren[i - 1].getText();
+                            final String nextText = myChildren[i + 1].getText();
+
+                            if ((StringUtil.endsWithChar(prevText, '\"') && StringUtil.startsWithChar(nextText, '\"'))
+                                || (StringUtil.endsWithChar(prevText, '\'') && StringUtil.startsWithChar(nextText, '\''))) {
+                                // ok child
+                                continue;
+                            }
+                            else if ((StringUtil.endsWithChar(prevText, '(') && StringUtil.startsWithChar(nextText, ')'))
+                                && currentElement.textContains('<')) {
+                                badlyFormed = true;
+                            }
+                            else if (currentElement.textContains('$')) {
+                                final String s = currentElement.getText();
+                                if (s.startsWith("${") && s.endsWith("}") && s.length() > 2) {
+                                    continue;
+                                }
+                            }
+                            else if (currentElement.textContains('%')) {
+                                badlyFormed = true;
+                            }
+                        }
+
+                        wellFormed = false;
+                        break;
+                    }
+                }
+
+                if (badlyFormed) {
+                    return;
+                }
+                if (wellFormed) {
+                    injectFromTheBeginning = wellFormed;
+                }
+            }
+            TextRange range = new TextRange(
+                injectFromTheBeginning
+                    ? valueTokenNumber + (startsWithPrefix ? JAVASCRIPT_PREFIX.length() : 0)
+                    : valueChild.getStartOffsetInParent(),
+                host.getTextLength() - valueTokenNumber
+            );
+            Language language = JavaScriptLanguage.INSTANCE;
+            registrar.startInjecting(language).addPlace(null, null, (PsiLanguageInjectionHost)host, range).doneInjecting();
+        }
+    }
+
+    private static void injectInMxmlFile(
+        final MultiHostRegistrar registrar,
+        final PsiElement host,
+        final PsiMetaData descriptor,
+        XmlTag tag
+    ) {
+        int offset = host instanceof XmlText ? 0 : 1;
+
+        if (descriptor instanceof AnnotationBackedDescriptor annotationBackedDescriptor
+            && annotationBackedDescriptor.requiresCdataBracesInContext(tag)) {
+            final int length = host.getTextLength();
+            if (length < 2 * offset) {
+                return;
+            }
+            String type = ((AnnotationBackedDescriptor)descriptor).getType();
+            if (type == null) {
+                type = "*";
+            }
+            final @NonNls String prefix = "(function (event:" + type + ") {";
+            final @NonNls String suffix = "})();";
+
+            if (host instanceof XmlText) {
+                injectToXmlText(registrar, host, JavaScriptSupportLoader.ECMA_SCRIPT_L4, prefix, suffix);
+            }
+            else {
+                TextRange range = new TextRange(offset, length - offset);
+
+                registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4)
+                    .addPlace(
+                        prefix,
+                        (host instanceof XmlAttributeValue ? "\n" : "") + suffix,
+                        (PsiLanguageInjectionHost)host,
+                        range
+                    )
+                    .doneInjecting();
+            }
+        }
+        else {
+            final String text = StringUtil.stripQuotesAroundValue(host.getText());
+            int openedBraces = 0;
+            int start = -1;
+            boolean addedSomething = false;
+            boolean quoted = false;
+
+            for (int i = 0; i < text.length(); ++i) {
+                final char ch = text.charAt(i);
+
+                if (quoted) {
+                    quoted = false;
+                    continue;
+                }
+                if (ch == '\\') {
+                    quoted = true;
+                }
+                else if (ch == '{') {
+                    if (openedBraces == 0) {
+                        start = i + 1;
+                    }
+                    openedBraces++;
+                }
+                else if (ch == '}') {
+                    openedBraces--;
+                    if (openedBraces == 0 && start != -1) {
+                        registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4)
+                            .addPlace(
+                                "(function (){}) (",
+                                "\n);",
+                                (PsiLanguageInjectionHost)host,
+                                new TextRange(offset + start, i + offset)
+                            )
+                            .doneInjecting();
+                        addedSomething = true;
+                        start = -1;
+                    }
+                }
+            }
+
+            if (!addedSomething) {
+                final String trimmedText = text.trim();
+                start = trimmedText.indexOf("@Embed");
+                if (start == 0) {
+                    offset += text.indexOf(trimmedText);
+                    registrar.startInjecting(JavaScriptSupportLoader.ECMA_SCRIPT_L4)
+                        .addPlace(
+                            null,
+                            null,
+                            (PsiLanguageInjectionHost)host,
+                            new TextRange(offset, trimmedText.length() + offset)
+                        )
+                        .doneInjecting();
+                }
+            }
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
index 5c388303..6e71b179 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
@@ -14,40 +14,37 @@
  * @author VISTALL
  * @since 29-Aug-22
  */
-public interface JSStubElementTypes
-{
-	JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = new JSFunctionElementType("FUNCTION_DECLARATION")
-	{
-		@Override
-		public JSFunction createPsi(@Nonnull JSFunctionStub stub)
-		{
-			return new JSFunctionImpl(stub, this);
-		}
-
-		@Nonnull
-		@Override
-		public PsiElement createElement(@Nonnull ASTNode astNode)
-		{
-			return new JSFunctionImpl(astNode);
-		}
-	};
-	JSStubElementType<JSParameterListStub, JSParameterList> PARAMETER_LIST = new JSParameterListElementType();
-
-	JSStubElementType<JSParameterStub, JSParameter> FORMAL_PARAMETER = new JSParameterElementType();
-
-	JSStubElementType<JSVariableStub, JSVariable> VARIABLE = new JSVariableElementType();
-
-	JSStubElementType<JSAttributeStub, JSAttribute> ATTRIBUTE = new JSAttributeElementType();
-	JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> ATTRIBUTE_NAME_VALUE_PAIR = new JSAttributeNameValuePairType();
-	JSStubElementType<JSAttributeListStub, JSAttributeList> ATTRIBUTE_LIST = new JSAttributeListElementType();
-	JSStubElementType<JSPackageStatementStub, JSPackageStatement> PACKAGE_STATEMENT = new JSPackageStatementElementType();
-
-	JSStubElementType<JSClassStub, JSClass> CLASS = new JSClassElementType();
-	JSStubElementType<JSReferenceListStub, JSReferenceList> EXTENDS_LIST = new JSReferenceListElementType("EXTENDS_LIST");
-	JSStubElementType<JSReferenceListStub, JSReferenceList> IMPLEMENTS_LIST = new JSReferenceListElementType("IMPLEMENTS_LIST");
-	JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective> USE_NAMESPACE_DIRECTIVE = new JSUseNamespaceDirectiveType();
-	JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> INCLUDE_DIRECTIVE = new JSIncludeDirectiveElementType();
-	JSStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration> NAMESPACE_DECLARATION = new JSNamespaceDeclarationElementType();
-
-	JSStubElementType<JSVarStatementStub, JSVarStatement> VAR_STATEMENT = new JSVarStatementElementType();
+public interface JSStubElementTypes {
+    JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = new JSFunctionElementType("FUNCTION_DECLARATION") {
+        @Override
+        public JSFunction createPsi(@Nonnull JSFunctionStub stub) {
+            return new JSFunctionImpl(stub, this);
+        }
+
+        @Nonnull
+        @Override
+        public PsiElement createElement(@Nonnull ASTNode astNode) {
+            return new JSFunctionImpl(astNode);
+        }
+    };
+    JSStubElementType<JSParameterListStub, JSParameterList> PARAMETER_LIST = new JSParameterListElementType();
+
+    JSStubElementType<JSParameterStub, JSParameter> FORMAL_PARAMETER = new JSParameterElementType();
+
+    JSStubElementType<JSVariableStub, JSVariable> VARIABLE = new JSVariableElementType();
+
+    JSStubElementType<JSAttributeStub, JSAttribute> ATTRIBUTE = new JSAttributeElementType();
+    JSStubElementType<JSAttributeNameValuePairStub, JSAttributeNameValuePair> ATTRIBUTE_NAME_VALUE_PAIR =
+        new JSAttributeNameValuePairType();
+    JSStubElementType<JSAttributeListStub, JSAttributeList> ATTRIBUTE_LIST = new JSAttributeListElementType();
+    JSStubElementType<JSPackageStatementStub, JSPackageStatement> PACKAGE_STATEMENT = new JSPackageStatementElementType();
+
+    JSStubElementType<JSClassStub, JSClass> CLASS = new JSClassElementType();
+    JSStubElementType<JSReferenceListStub, JSReferenceList> EXTENDS_LIST = new JSReferenceListElementType("EXTENDS_LIST");
+    JSStubElementType<JSReferenceListStub, JSReferenceList> IMPLEMENTS_LIST = new JSReferenceListElementType("IMPLEMENTS_LIST");
+    JSStubElementType<JSUseNamespaceDirectiveStub, JSUseNamespaceDirective> USE_NAMESPACE_DIRECTIVE = new JSUseNamespaceDirectiveType();
+    JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> INCLUDE_DIRECTIVE = new JSIncludeDirectiveElementType();
+    JSStubElementType<JSNamespaceDeclarationStub, JSNamespaceDeclaration> NAMESPACE_DECLARATION = new JSNamespaceDeclarationElementType();
+
+    JSStubElementType<JSVarStatementStub, JSVarStatement> VAR_STATEMENT = new JSVarStatementElementType();
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 79560473..58ba3407 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -46,438 +46,425 @@
 /**
  * @author max, maxim.mossienko
  */
-public interface JSTokenTypes
-{
-	IElementType IDENTIFIER = new JSElementType("IDENTIFIER");
-	IElementType ANY_IDENTIFIER = new JSElementType("ANY_IDENTIFIER");
-	IElementType ASTERISK = ANY_IDENTIFIER;
-
-	IElementType WHITE_SPACE = TokenType.WHITE_SPACE;
-	IElementType BAD_CHARACTER = TokenType.BAD_CHARACTER;
-
-	IElementType END_OF_LINE_COMMENT = new JSElementType("END_OF_LINE_COMMENT");
-	IElementType C_STYLE_COMMENT = new JSElementType("C_STYLE_COMMENT");
-	@Deprecated
-	@DeprecationInfo("old xml parsing, es4")
-	IElementType XML_STYLE_COMMENT = new JSElementType("XML_STYLE_COMMENT");
-	@Deprecated
-	@DeprecationInfo("old xml parsing, es4")
-	IElementType XML_STYLE_COMMENT_START = new JSElementType("XML_STYLE_COMMENT_START");
-
-	IElementType DOC_COMMENT = new JSChameleonElementType("DOC_COMMENT")
-	{
-		@Override
-		protected void doParse(JavaScriptParsingContext context, PsiBuilder builder)
-		{
-			JSDocParsing.parseJSDoc(builder);
-
-		}
-
-		@Override
-		@Nullable
-		protected Lexer createLexer()
-		{
-			return new MergingLexerAdapter(new FlexAdapter(new _JSDocLexer(false)), JSDocTokenTypes.TOKENS_TO_MERGE);
-		}
-	};
-
-	// Keywords:
-	IElementType BREAK_KEYWORD = new JSElementType("BREAK_KEYWORD");
-	IElementType CASE_KEYWORD = new JSElementType("CASE_KEYWORD");
-	IElementType CATCH_KEYWORD = new JSElementType("CATCH_KEYWORD");
-	IElementType CONST_KEYWORD = new JSElementType("CONST_KEYWORD");
-	IElementType CONTINUE_KEYWORD = new JSElementType("CONTINUE_KEYWORD");
-	IElementType DELETE_KEYWORD = new JSElementType("DELETE_KEYWORD");
-	IElementType DEFAULT_KEYWORD = new JSElementType("DEFAULT_KEYWORD");
-	IElementType DO_KEYWORD = new JSElementType("DO_KEYWORD");
-	IElementType ELSE_KEYWORD = new JSElementType("ELSE_KEYWORD");
-	IElementType FINALLY_KEYWORD = new JSElementType("FINALLY_KEYWORD");
-	IElementType FOR_KEYWORD = new JSElementType("FOR_KEYWORD");
-	IElementType FUNCTION_KEYWORD = new JSElementType("FUNCTION_KEYWORD");
-	IElementType IF_KEYWORD = new JSElementType("IF_KEYWORD");
-	IElementType IN_KEYWORD = new JSElementType("IN_KEYWORD");
-	IElementType INSTANCEOF_KEYWORD = new JSElementType("INSTANCEOF_KEYWORD");
-	IElementType NEW_KEYWORD = new JSElementType("NEW_KEYWORD");
-	IElementType RETURN_KEYWORD = new JSElementType("RETURN_KEYWORD");
-	IElementType SWITCH_KEYWORD = new JSElementType("SWITCH_KEYWORD");
-	IElementType THIS_KEYWORD = new JSElementType("THIS_KEYWORD");
-	IElementType THROW_KEYWORD = new JSElementType("THROW_KEYWORD");
-	IElementType TRY_KEYWORD = new JSElementType("TRY_KEYWORD");
-	IElementType TYPEOF_KEYWORD = new JSElementType("TYPEOF_KEYWORD");
-	IElementType VAR_KEYWORD = new JSElementType("VAR_KEYWORD");
-	IElementType VOID_KEYWORD = new JSElementType("VOID_KEYWORD");
-	IElementType WHILE_KEYWORD = new JSElementType("WHILE_KEYWORD");
-	IElementType WITH_KEYWORD = new JSElementType("WITH_KEYWORD");
-
-	IElementType PACKAGE_KEYWORD = new JSElementType("PACKAGE_KEYWORD"); // package
-	IElementType IMPORT_KEYWORD = new JSElementType("IMPORT_KEYWORD"); // import
-	IElementType CLASS_KEYWORD = new JSElementType("CLASS_KEYWORD"); // class
-	IElementType INTERFACE_KEYWORD = new JSElementType("INTERFACE_KEYWORD"); // interface
-	IElementType FROM_KEYWORD = new JavaScriptContextKeywordElementType("FROM_KEYWORD", "from");
-	IElementType PUBLIC_KEYWORD = new JSElementType("PUBLIC_KEYWORD"); // public
-	IElementType STATIC_KEYWORD = new JavaScriptContextKeywordElementType("STATIC_KEYWORD", "static"); // static
-	IElementType INTERNAL_KEYWORD = new JSElementType("INTERNAL_KEYWORD"); // internal
-	IElementType FINAL_KEYWORD = new JSElementType("FINAL_KEYWORD"); // final
-	IElementType DYNAMIC_KEYWORD = new JSElementType("DYNAMIC_KEYWORD"); // dynamic
-	IElementType NATIVE_KEYWORD = new JSElementType("NATIVE_KEYWORD"); // native
-	IElementType VIRTUAL_KEYWORD = new JSElementType("VIRTUAL_KEYWORD"); // virtual
-
-	IElementType EXPORT_KEYWORD = new JSElementType("EXPORT_KEYWORD"); // export
-	IElementType NAMESPACE_KEYWORD = new JSElementType("NAMESPACE_KEYWORD"); // namespace
-	IElementType EXTENDS_KEYWORD = new JSElementType("EXTENDS_KEYWORD"); // extends
-	IElementType IMPLEMENTS_KEYWORD = new JSElementType("IMPLEMENTS_KEYWORD"); // implements
-	IElementType ENUM_KEYWORD = new JSElementType("ENUM_KEYWORD"); // enum
-	IElementType USE_KEYWORD = new JSElementType("USE_KEYWORD"); // use
-
-	IElementType PRIVATE_KEYWORD = new JSElementType("PRIVATE_KEYWORD"); // private
-	IElementType PROTECTED_KEYWORD = new JSElementType("PROTECTED_KEYWORD"); // protected
-	IElementType OVERRIDE_KEYWORD = new JSElementType("OVERRIDE_KEYWORD"); // override
-	IElementType SUPER_KEYWORD = new JSElementType("SUPER_KEYWORD"); // super
-	IElementType INCLUDE_KEYWORD = new JSElementType("INCLUDE_KEYWORD"); // include
-	IElementType IS_KEYWORD = new JSElementType("IS_KEYWORD"); // is
-	IElementType AS_KEYWORD = new JavaScriptContextKeywordElementType("AS_KEYWORD", "as"); // as
-	IElementType GET_KEYWORD = new JavaScriptContextKeywordElementType("GET_KEYWORD", "get"); // GET
-	IElementType SET_KEYWORD = new JavaScriptContextKeywordElementType("SET_KEYWORD", "set"); // SET
-	IElementType OF_KEYWORD = new JavaScriptContextKeywordElementType("OF_KEYWORD", "of"); // of
-	IElementType EACH_KEYWORD = new JSElementType("EACH_KEYWORD");
-	IElementType INT_KEYWORD = new JSElementType("INT_KEYWORD");
-	IElementType UINT_KEYWORD = new JSElementType("UINT_KEYWORD");
-	IElementType AT = new JSElementType("AT");
-
-	IElementType XML_START_TAG_START = XmlTokenType.XML_START_TAG_START;
-	IElementType XML_START_TAG_LIST = new JSElementType("XML_TAG__LIST_START");
-	IElementType XML_END_TAG_LIST = new JSElementType("XML_TAG__LIST_END");
-	IElementType XML_END_TAG_START = XmlTokenType.XML_END_TAG_START;
-	IElementType XML_EMPTY_TAG_END = XmlTokenType.XML_EMPTY_ELEMENT_END;
-	IElementType XML_NAME = XmlTokenType.XML_NAME;
-	IElementType XML_TAG_NAME = XmlTokenType.XML_TAG_NAME;
-	IElementType XML_ATTR_EQUAL = XmlTokenType.XML_EQ;
-	IElementType XML_TAG_END = XmlTokenType.XML_TAG_END;
-	IElementType XML_ATTR_VALUE = XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN;
-	IElementType XML_ATTR_VALUE_START = XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
-	IElementType XML_ATTR_VALUE_END = XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER;
-	IElementType XML_JS_SCRIPT = new JSChameleonElementType("XML_JS_SCRIPT")
-	{
-		@Override
-		protected void doParse(JavaScriptParsingContext context, PsiBuilder builder)
-		{
-			parseScriptExpression(context, builder);
-		}
-
-		public void parseScriptExpression(JavaScriptParsingContext context, final PsiBuilder builder)
-		{
-			PsiBuilder.Marker root = builder.mark();
-			Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
-			if (builder.getTokenType() != JSTokenTypes.RBRACE)
-			{
-				context.getExpressionParsing().parseExpression(builder);
-			}
-			Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
-
-			while (!builder.eof())
-			{
-				builder.advanceLexer();
-			}
-
-			root.done(JSElementTypes.EMBEDDED_EXPRESSION);
-		}
-	};
-
-	IElementType XML_TAG_CONTENT = new JSElementType("XML_TAG_CONTENT");
-	IElementType XML_ENTITY_REF = new JSElementType("XML_ENTITY_REF");
-	IElementType XML_TAG_WHITE_SPACE = new JSElementType("XML_TAG_WHITESPACE");
-
-	TokenSet XML_TOKENS = TokenSet.create(
-		XML_ATTR_EQUAL,
-		XML_ATTR_VALUE,
-		XML_ATTR_VALUE_END,
-		XML_ATTR_VALUE_START,
-		XML_EMPTY_TAG_END,
-		XML_END_TAG_LIST,
-		XML_END_TAG_START,
-		XML_ENTITY_REF,
-		XML_JS_SCRIPT,
-		XML_NAME,
-		XML_START_TAG_LIST,
-		XML_START_TAG_START,
-		XML_STYLE_COMMENT,
-		XML_TAG_CONTENT,
-		XML_TAG_END,
-		XML_TAG_NAME,
-		XML_TAG_WHITE_SPACE
-	);
-
-	@Deprecated
-	// FIXME [VISTALL] what the heck? maybe old jsp inject support
-	IElementType JSP_TEXT = new JSElementType("JSP_TEXT");
-	IElementType YIELD_KEYWORD = new JSElementType("YIELD_KEYWORD");
-	IElementType LET_KEYWORD = new JSElementType("LET_KEYWORD");
-
-	// Hardcoded literals
-	IElementType TRUE_KEYWORD = new JSElementType("TRUE_KEYWORD");
-	IElementType FALSE_KEYWORD = new JSElementType("FALSE_KEYWORD");
-	IElementType NULL_KEYWORD = new JSElementType("NULL_KEYWORD");
-	IElementType UNDEFINED_KEYWORD = new JSElementType("UNDEFINED_KEYWORD");
-
-	TokenSet JS_KEYWORDS = TokenSet.create(
-		BREAK_KEYWORD,
-		CASE_KEYWORD,
-		CATCH_KEYWORD,
-		CONST_KEYWORD,
-		CONTINUE_KEYWORD,
-		DELETE_KEYWORD,
-		DEFAULT_KEYWORD,
-		DO_KEYWORD,
-		ELSE_KEYWORD,
-		FALSE_KEYWORD,
-		FINALLY_KEYWORD,
-		FOR_KEYWORD,
-		FUNCTION_KEYWORD,
-		IF_KEYWORD,
-		IN_KEYWORD,
-		INSTANCEOF_KEYWORD,
-		LET_KEYWORD,
-		NEW_KEYWORD,
-		NULL_KEYWORD,
-		RETURN_KEYWORD,
-		SWITCH_KEYWORD,
-		THIS_KEYWORD,
-		THROW_KEYWORD,
-		TRUE_KEYWORD,
-		TRY_KEYWORD,
-		TYPEOF_KEYWORD,
-		UNDEFINED_KEYWORD,
-		VAR_KEYWORD,
-		VOID_KEYWORD,
-		WHILE_KEYWORD,
-		WITH_KEYWORD,
-		YIELD_KEYWORD
-	);
-
-	TokenSet JS2_KEYWORDS = TokenSet.create(
-		AS_KEYWORD,
-		CLASS_KEYWORD,
-		DYNAMIC_KEYWORD,
-		EACH_KEYWORD,
-		EXTENDS_KEYWORD,
-		FINAL_KEYWORD,
-		GET_KEYWORD,
-		INTERNAL_KEYWORD,
-		NATIVE_KEYWORD,
-		IMPORT_KEYWORD,
-		INT_KEYWORD,
-		IS_KEYWORD,
-		USE_KEYWORD,
-		NAMESPACE_KEYWORD,
-		OVERRIDE_KEYWORD,
-		INCLUDE_KEYWORD,
-		SET_KEYWORD,
-		SUPER_KEYWORD,
-		UINT_KEYWORD,
-		VIRTUAL_KEYWORD
-	);
-
-	TokenSet ECMASCRIPT6_KEYWORDS = TokenSet.create(EXPORT_KEYWORD, ENUM_KEYWORD, FROM_KEYWORD);
-
-	TokenSet ECMASCRIPT6_STRICT_KEYWORDS = TokenSet.create(
-		IMPLEMENTS_KEYWORD,
-		INTERFACE_KEYWORD,
-		PACKAGE_KEYWORD,
-		PRIVATE_KEYWORD,
-		PROTECTED_KEYWORD,
-		PUBLIC_KEYWORD,
-		STATIC_KEYWORD
-	);
-
-	TokenSet KEYWORDS = TokenSet.orSet(JS_KEYWORDS, JS2_KEYWORDS, ECMASCRIPT6_KEYWORDS);
-
-	// Literals
-	IElementType NUMERIC_LITERAL = new JSElementType("NUMERIC_LITERAL");
-	IElementType STRING_LITERAL = new JSElementType("STRING_LITERAL");
-	IElementType SINGLE_QUOTE_STRING_LITERAL = new JSElementType("SINGLE_QUOTE_STRING_LITERAL");
-	IElementType INTERPOLATION_STRING_LITERAL = new JSElementType("INTERPOLATION_STRING_LITERAL");
-	IElementType REGEXP_LITERAL = new JSElementType("REGEXP_LITERAL");
-
-	// Punctuators
-	IElementType LBRACE = new JSElementType("LBRACE");// {
-	IElementType RBRACE = new JSElementType("RBRACE");// }
-	IElementType LPAR = new JSElementType("LPAR");// (
-	IElementType RPAR = new JSElementType("RPAR");// )
-	IElementType LBRACKET = new JSElementType("LBRACKET");// [
-	IElementType RBRACKET = new JSElementType("RBRACKET");// ]
-	IElementType DOT = new JSElementType("DOT");// .
-	IElementType SEMICOLON = new JSElementType("SEMICOLON");// ;
-	IElementType COMMA = new JSElementType("COMMA");// ,
-
-	IElementType LT = new JSElementType("LT");// <
-	IElementType GT = new JSElementType("GT");// >
-	IElementType LE = new JSElementType("LE");// <=
-	IElementType GE = new JSElementType("GE");// >=
-	IElementType EQEQ = new JSElementType("EQEQ");// ==
-	IElementType NE = new JSElementType("NE");// !=
-	IElementType EQEQEQ = new JSElementType("EQEQEQ");// ===
-	IElementType NEQEQ = new JSElementType("NEQEQ");// !==
-	IElementType PLUS = new JSElementType("PLUS");// +
-	IElementType MINUS = new JSElementType("MINUS");// -
-	IElementType MULT = new JSElementType("MULT");// *
-	IElementType MULTMULT = new JSElementType("MULTMULT");// *
-	IElementType PERC = new JSElementType("PERC");// %
-	IElementType PLUSPLUS = new JSElementType("PLUSPLUS");// ++
-	IElementType MINUSMINUS = new JSElementType("MINUSMINUS");// --
-	IElementType LTLT = new JSElementType("LTLT");// <<
-	IElementType GTGT = new JSElementType("GTGT");// >>
-	IElementType GTGTGT = new JSElementType("GTGTGT");// >>>
-	IElementType AND = new JSElementType("AND");// &
-	IElementType OR = new JSElementType("OR");// |
-	IElementType XOR = new JSElementType("XOR");// ^
-	IElementType EXCL = new JSElementType("EXCL");// !
-	IElementType TILDE = new JSElementType("TILDE");// ~
-	IElementType ANDAND = new JSElementType("ANDAND");// &&
-	IElementType OROR = new JSElementType("OROR");// ||
-	IElementType QUEST = new JSElementType("QUEST");// ?
-	IElementType QUEST_DOT = new JSElementType("QUEST_DOT");// ?
-	IElementType COLON = new JSElementType("COLON");// :
-	IElementType EQ = new JSElementType("EQ");// =
-	IElementType PLUSEQ = new JSElementType("PLUSEQ");// +=
-	IElementType MINUSEQ = new JSElementType("MINUSEQ");// -=
-	IElementType MULTEQ = new JSElementType("MULTEQ");// *=
-	IElementType MULT_MULT_EQ = new JSElementType("MULT_MULT_EQ");// **=
-	IElementType PERCEQ = new JSElementType("PERCEQ");// %=
-	IElementType LTLTEQ = new JSElementType("LTLTEQ");// <<=
-	IElementType GTGTEQ = new JSElementType("GTGTEQ");// >>=
-	IElementType GTGTGTEQ = new JSElementType("GTGTGTEQ");// >>>=
-	IElementType ANDEQ = new JSElementType("ANDEQ");// &=
-	IElementType OREQ = new JSElementType("OREQ");// |=
-	IElementType XOREQ = new JSElementType("XOREQ");// ^=
-	IElementType DIV = new JSElementType("DIV"); // /
-	IElementType DIVEQ = new JSElementType("DIVEQ"); // /=
-	IElementType OR_OR_EQ = new JSElementType("OR_OR_EQ"); // ||=
-	IElementType AND_AND_EQ = new JSElementType("AND_AND_EQ"); // &&=
-	IElementType QUEST_QUEST_EQ = new JSElementType("QUEST_QUEST_EQ"); // ??=
-	IElementType DARROW = new JSElementType("DARROW"); // =>
-
-	IElementType COLON_COLON = new JSElementType("COLON_COLON"); // ::
-	IElementType GWT_FIELD_OR_METHOD = new JSElementType("GWT_FIELD_OR_METHOD"); // ::
-
-	IElementType DOT_DOT = new JSElementType("DOT_DOT"); // ..
-	IElementType DOT_DOT_DOT = new JSElementType("DOT_DOT_DOT"); // ...
-
-	IElementType CDATA_START = new JSElementType("CDATA_START"); // <![CDATA[
-	IElementType CDATA_END = new JSElementType("CDATA_END"); // ]]>
-	IElementType JSDOC_TAG_DATA = new JSElementType("JSDOC_TAG_DATA");
-
-	TokenSet OPERATIONS = TokenSet.create(
-		LT, GT, LE, GE,
-		EQEQ, NE, EQEQEQ, NEQEQ,
-		PLUS, MINUS, MULT, PERC,
-		PLUSPLUS, MINUSMINUS, LTLT,
-		GTGT, GTGTGT, AND, OR, XOR,
-		EXCL, TILDE, ANDAND, OROR,
-		QUEST, COLON, EQ, PLUSEQ,
-		MINUSEQ, MULTEQ, PERCEQ, LTLTEQ,
-		GTGTEQ, GTGTGTEQ, ANDEQ, OREQ,
-		XOREQ, DIV, DIVEQ, MULTMULT,
-		COMMA, IS_KEYWORD, AS_KEYWORD,
-		OR_OR_EQ, AND_AND_EQ, QUEST_QUEST_EQ, MULT_MULT_EQ
-	);
-
-	TokenSet ASSOC_OPERATIONS = TokenSet.create(PLUS, MULT, AND, OR, XOR, OROR, ANDAND);
-
-	TokenSet ASSIGNMENT_OPERATIONS = TokenSet.create(
-		EQ,
-		PLUSEQ,
-		MINUSEQ,
-		MULTEQ,
-		PERCEQ,
-		LTLTEQ,
-		GTGTEQ,
-		GTGTGTEQ,
-		ANDEQ,
-		OREQ,
-		XOREQ,
-		DIVEQ,
-		OR_OR_EQ,
-		AND_AND_EQ,
-		QUEST_QUEST_EQ,
-		MULT_MULT_EQ
-	);
-
-	TokenSet EQUALITY_OPERATIONS = TokenSet.create(EQEQ, NE, EQEQEQ, NEQEQ);
-
-	TokenSet RELATIONAL_OPERATIONS = TokenSet.create(LT, GT, LE, GE, INSTANCEOF_KEYWORD, IN_KEYWORD);
-
-	TokenSet ADDITIVE_OPERATIONS = TokenSet.create(PLUS, MINUS);
-
-	TokenSet MULTIPLICATIVE_OPERATIONS = TokenSet.create(MULT, DIV, PERC, MULTMULT);
-
-	TokenSet SHIFT_OPERATIONS = TokenSet.create(LTLT, GTGT, GTGTGT);
-
-	TokenSet UNARY_OPERATIONS = TokenSet.create(PLUS, MINUS, PLUSPLUS, MINUSMINUS, TILDE, EXCL, TYPEOF_KEYWORD, VOID_KEYWORD, DELETE_KEYWORD);
-
-	TokenSet COMMENTS = TokenSet.create(
-		C_STYLE_COMMENT,
-		CDATA_START,
-		CDATA_END,
-		DOC_COMMENT,
-		END_OF_LINE_COMMENT,
-		JavaScriptHighlightingLexer.getTagContentTokenType(),
-		JSDOC_TAG_DATA,
-		JSP_TEXT,
-		XML_STYLE_COMMENT,
-		XML_STYLE_COMMENT_START,
-		XML_TAG_WHITE_SPACE
-	);
-
-	TokenSet MODIFIERS = TokenSet.create(
-		DYNAMIC_KEYWORD,
-		EXPORT_KEYWORD,
-		FINAL_KEYWORD,
-		INTERNAL_KEYWORD,
-		NATIVE_KEYWORD,
-		OVERRIDE_KEYWORD,
-		PROTECTED_KEYWORD,
-		PRIVATE_KEYWORD,
-		PUBLIC_KEYWORD,
-		STATIC_KEYWORD,
-		VIRTUAL_KEYWORD
-	);
-
-	TokenSet ACCESS_MODIFIERS = TokenSet.create(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD);
-
-	TokenSet GET_SET_TOKEN_SET = TokenSet.create(GET_KEYWORD, SET_KEYWORD);
-
-	@Deprecated
-	TokenSet IDENTIFIER_TOKENS_SET = TokenSet.create(IDENTIFIER);
-
-	abstract class JSChameleonElementType extends ILazyParseableElementType
-	{
-		public JSChameleonElementType(@NonNls String name)
-		{
-			super(name, JavaScriptLanguage.INSTANCE);
-		}
-
-		protected abstract void doParse(JavaScriptParsingContext context, PsiBuilder builder);
-
-		@Override
-		@RequiredReadAction
-		protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElement psi)
-		{
-			final Project project = psi.getProject();
-			final Language languageForParser = getLanguageForParser(psi);
-			final LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
-			final LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
-			final PsiBuilder builder = PsiBuilderFactory.getInstance()
-				.createBuilder(project, chameleon, createLexer(), languageForParser, languageVersion, chameleon.getChars());
-			final JavaScriptParser parser = (JavaScriptParser) ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
-
-			JavaScriptParsingContext parsingContext = parser.createParsingContext();
-			doParse(parsingContext, builder);
-			return builder.getTreeBuilt();
-		}
-
-		protected Lexer createLexer()
-		{
-			return null;
-		}
-	}
+public interface JSTokenTypes {
+    IElementType IDENTIFIER = new JSElementType("IDENTIFIER");
+    IElementType ANY_IDENTIFIER = new JSElementType("ANY_IDENTIFIER");
+    IElementType ASTERISK = ANY_IDENTIFIER;
+
+    IElementType WHITE_SPACE = TokenType.WHITE_SPACE;
+    IElementType BAD_CHARACTER = TokenType.BAD_CHARACTER;
+
+    IElementType END_OF_LINE_COMMENT = new JSElementType("END_OF_LINE_COMMENT");
+    IElementType C_STYLE_COMMENT = new JSElementType("C_STYLE_COMMENT");
+    @Deprecated
+    @DeprecationInfo("old xml parsing, es4")
+    IElementType XML_STYLE_COMMENT = new JSElementType("XML_STYLE_COMMENT");
+    @Deprecated
+    @DeprecationInfo("old xml parsing, es4")
+    IElementType XML_STYLE_COMMENT_START = new JSElementType("XML_STYLE_COMMENT_START");
+
+    IElementType DOC_COMMENT = new JSChameleonElementType("DOC_COMMENT") {
+        @Override
+        protected void doParse(JavaScriptParsingContext context, PsiBuilder builder) {
+            JSDocParsing.parseJSDoc(builder);
+        }
+
+        @Override
+        @Nullable
+        protected Lexer createLexer() {
+            return new MergingLexerAdapter(new FlexAdapter(new _JSDocLexer(false)), JSDocTokenTypes.TOKENS_TO_MERGE);
+        }
+    };
+
+    // Keywords:
+    IElementType BREAK_KEYWORD = new JSElementType("BREAK_KEYWORD");
+    IElementType CASE_KEYWORD = new JSElementType("CASE_KEYWORD");
+    IElementType CATCH_KEYWORD = new JSElementType("CATCH_KEYWORD");
+    IElementType CONST_KEYWORD = new JSElementType("CONST_KEYWORD");
+    IElementType CONTINUE_KEYWORD = new JSElementType("CONTINUE_KEYWORD");
+    IElementType DELETE_KEYWORD = new JSElementType("DELETE_KEYWORD");
+    IElementType DEFAULT_KEYWORD = new JSElementType("DEFAULT_KEYWORD");
+    IElementType DO_KEYWORD = new JSElementType("DO_KEYWORD");
+    IElementType ELSE_KEYWORD = new JSElementType("ELSE_KEYWORD");
+    IElementType FINALLY_KEYWORD = new JSElementType("FINALLY_KEYWORD");
+    IElementType FOR_KEYWORD = new JSElementType("FOR_KEYWORD");
+    IElementType FUNCTION_KEYWORD = new JSElementType("FUNCTION_KEYWORD");
+    IElementType IF_KEYWORD = new JSElementType("IF_KEYWORD");
+    IElementType IN_KEYWORD = new JSElementType("IN_KEYWORD");
+    IElementType INSTANCEOF_KEYWORD = new JSElementType("INSTANCEOF_KEYWORD");
+    IElementType NEW_KEYWORD = new JSElementType("NEW_KEYWORD");
+    IElementType RETURN_KEYWORD = new JSElementType("RETURN_KEYWORD");
+    IElementType SWITCH_KEYWORD = new JSElementType("SWITCH_KEYWORD");
+    IElementType THIS_KEYWORD = new JSElementType("THIS_KEYWORD");
+    IElementType THROW_KEYWORD = new JSElementType("THROW_KEYWORD");
+    IElementType TRY_KEYWORD = new JSElementType("TRY_KEYWORD");
+    IElementType TYPEOF_KEYWORD = new JSElementType("TYPEOF_KEYWORD");
+    IElementType VAR_KEYWORD = new JSElementType("VAR_KEYWORD");
+    IElementType VOID_KEYWORD = new JSElementType("VOID_KEYWORD");
+    IElementType WHILE_KEYWORD = new JSElementType("WHILE_KEYWORD");
+    IElementType WITH_KEYWORD = new JSElementType("WITH_KEYWORD");
+
+    IElementType PACKAGE_KEYWORD = new JSElementType("PACKAGE_KEYWORD"); // package
+    IElementType IMPORT_KEYWORD = new JSElementType("IMPORT_KEYWORD"); // import
+    IElementType CLASS_KEYWORD = new JSElementType("CLASS_KEYWORD"); // class
+    IElementType INTERFACE_KEYWORD = new JSElementType("INTERFACE_KEYWORD"); // interface
+    IElementType FROM_KEYWORD = new JavaScriptContextKeywordElementType("FROM_KEYWORD", "from");
+    IElementType PUBLIC_KEYWORD = new JSElementType("PUBLIC_KEYWORD"); // public
+    IElementType STATIC_KEYWORD = new JavaScriptContextKeywordElementType("STATIC_KEYWORD", "static"); // static
+    IElementType INTERNAL_KEYWORD = new JSElementType("INTERNAL_KEYWORD"); // internal
+    IElementType FINAL_KEYWORD = new JSElementType("FINAL_KEYWORD"); // final
+    IElementType DYNAMIC_KEYWORD = new JSElementType("DYNAMIC_KEYWORD"); // dynamic
+    IElementType NATIVE_KEYWORD = new JSElementType("NATIVE_KEYWORD"); // native
+    IElementType VIRTUAL_KEYWORD = new JSElementType("VIRTUAL_KEYWORD"); // virtual
+
+    IElementType EXPORT_KEYWORD = new JSElementType("EXPORT_KEYWORD"); // export
+    IElementType NAMESPACE_KEYWORD = new JSElementType("NAMESPACE_KEYWORD"); // namespace
+    IElementType EXTENDS_KEYWORD = new JSElementType("EXTENDS_KEYWORD"); // extends
+    IElementType IMPLEMENTS_KEYWORD = new JSElementType("IMPLEMENTS_KEYWORD"); // implements
+    IElementType ENUM_KEYWORD = new JSElementType("ENUM_KEYWORD"); // enum
+    IElementType USE_KEYWORD = new JSElementType("USE_KEYWORD"); // use
+
+    IElementType PRIVATE_KEYWORD = new JSElementType("PRIVATE_KEYWORD"); // private
+    IElementType PROTECTED_KEYWORD = new JSElementType("PROTECTED_KEYWORD"); // protected
+    IElementType OVERRIDE_KEYWORD = new JSElementType("OVERRIDE_KEYWORD"); // override
+    IElementType SUPER_KEYWORD = new JSElementType("SUPER_KEYWORD"); // super
+    IElementType INCLUDE_KEYWORD = new JSElementType("INCLUDE_KEYWORD"); // include
+    IElementType IS_KEYWORD = new JSElementType("IS_KEYWORD"); // is
+    IElementType AS_KEYWORD = new JavaScriptContextKeywordElementType("AS_KEYWORD", "as"); // as
+    IElementType GET_KEYWORD = new JavaScriptContextKeywordElementType("GET_KEYWORD", "get"); // GET
+    IElementType SET_KEYWORD = new JavaScriptContextKeywordElementType("SET_KEYWORD", "set"); // SET
+    IElementType OF_KEYWORD = new JavaScriptContextKeywordElementType("OF_KEYWORD", "of"); // of
+    IElementType EACH_KEYWORD = new JSElementType("EACH_KEYWORD");
+    IElementType INT_KEYWORD = new JSElementType("INT_KEYWORD");
+    IElementType UINT_KEYWORD = new JSElementType("UINT_KEYWORD");
+    IElementType AT = new JSElementType("AT");
+
+    IElementType XML_START_TAG_START = XmlTokenType.XML_START_TAG_START;
+    IElementType XML_START_TAG_LIST = new JSElementType("XML_TAG__LIST_START");
+    IElementType XML_END_TAG_LIST = new JSElementType("XML_TAG__LIST_END");
+    IElementType XML_END_TAG_START = XmlTokenType.XML_END_TAG_START;
+    IElementType XML_EMPTY_TAG_END = XmlTokenType.XML_EMPTY_ELEMENT_END;
+    IElementType XML_NAME = XmlTokenType.XML_NAME;
+    IElementType XML_TAG_NAME = XmlTokenType.XML_TAG_NAME;
+    IElementType XML_ATTR_EQUAL = XmlTokenType.XML_EQ;
+    IElementType XML_TAG_END = XmlTokenType.XML_TAG_END;
+    IElementType XML_ATTR_VALUE = XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN;
+    IElementType XML_ATTR_VALUE_START = XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
+    IElementType XML_ATTR_VALUE_END = XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER;
+    IElementType XML_JS_SCRIPT = new JSChameleonElementType("XML_JS_SCRIPT") {
+        @Override
+        protected void doParse(JavaScriptParsingContext context, PsiBuilder builder) {
+            parseScriptExpression(context, builder);
+        }
+
+        public void parseScriptExpression(JavaScriptParsingContext context, final PsiBuilder builder) {
+            PsiBuilder.Marker root = builder.mark();
+            Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
+            if (builder.getTokenType() != JSTokenTypes.RBRACE) {
+                context.getExpressionParsing().parseExpression(builder);
+            }
+            Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
+
+            while (!builder.eof()) {
+                builder.advanceLexer();
+            }
+
+            root.done(JSElementTypes.EMBEDDED_EXPRESSION);
+        }
+    };
+
+    IElementType XML_TAG_CONTENT = new JSElementType("XML_TAG_CONTENT");
+    IElementType XML_ENTITY_REF = new JSElementType("XML_ENTITY_REF");
+    IElementType XML_TAG_WHITE_SPACE = new JSElementType("XML_TAG_WHITESPACE");
+
+    TokenSet XML_TOKENS = TokenSet.create(
+        XML_ATTR_EQUAL,
+        XML_ATTR_VALUE,
+        XML_ATTR_VALUE_END,
+        XML_ATTR_VALUE_START,
+        XML_EMPTY_TAG_END,
+        XML_END_TAG_LIST,
+        XML_END_TAG_START,
+        XML_ENTITY_REF,
+        XML_JS_SCRIPT,
+        XML_NAME,
+        XML_START_TAG_LIST,
+        XML_START_TAG_START,
+        XML_STYLE_COMMENT,
+        XML_TAG_CONTENT,
+        XML_TAG_END,
+        XML_TAG_NAME,
+        XML_TAG_WHITE_SPACE
+    );
+
+    @Deprecated
+    // FIXME [VISTALL] what the heck? maybe old jsp inject support
+    IElementType JSP_TEXT = new JSElementType("JSP_TEXT");
+    IElementType YIELD_KEYWORD = new JSElementType("YIELD_KEYWORD");
+    IElementType LET_KEYWORD = new JSElementType("LET_KEYWORD");
+
+    // Hardcoded literals
+    IElementType TRUE_KEYWORD = new JSElementType("TRUE_KEYWORD");
+    IElementType FALSE_KEYWORD = new JSElementType("FALSE_KEYWORD");
+    IElementType NULL_KEYWORD = new JSElementType("NULL_KEYWORD");
+    IElementType UNDEFINED_KEYWORD = new JSElementType("UNDEFINED_KEYWORD");
+
+    TokenSet JS_KEYWORDS = TokenSet.create(
+        BREAK_KEYWORD,
+        CASE_KEYWORD,
+        CATCH_KEYWORD,
+        CONST_KEYWORD,
+        CONTINUE_KEYWORD,
+        DELETE_KEYWORD,
+        DEFAULT_KEYWORD,
+        DO_KEYWORD,
+        ELSE_KEYWORD,
+        FALSE_KEYWORD,
+        FINALLY_KEYWORD,
+        FOR_KEYWORD,
+        FUNCTION_KEYWORD,
+        IF_KEYWORD,
+        IN_KEYWORD,
+        INSTANCEOF_KEYWORD,
+        LET_KEYWORD,
+        NEW_KEYWORD,
+        NULL_KEYWORD,
+        RETURN_KEYWORD,
+        SWITCH_KEYWORD,
+        THIS_KEYWORD,
+        THROW_KEYWORD,
+        TRUE_KEYWORD,
+        TRY_KEYWORD,
+        TYPEOF_KEYWORD,
+        UNDEFINED_KEYWORD,
+        VAR_KEYWORD,
+        VOID_KEYWORD,
+        WHILE_KEYWORD,
+        WITH_KEYWORD,
+        YIELD_KEYWORD
+    );
+
+    TokenSet JS2_KEYWORDS = TokenSet.create(
+        AS_KEYWORD,
+        CLASS_KEYWORD,
+        DYNAMIC_KEYWORD,
+        EACH_KEYWORD,
+        EXTENDS_KEYWORD,
+        FINAL_KEYWORD,
+        GET_KEYWORD,
+        INTERNAL_KEYWORD,
+        NATIVE_KEYWORD,
+        IMPORT_KEYWORD,
+        INT_KEYWORD,
+        IS_KEYWORD,
+        USE_KEYWORD,
+        NAMESPACE_KEYWORD,
+        OVERRIDE_KEYWORD,
+        INCLUDE_KEYWORD,
+        SET_KEYWORD,
+        SUPER_KEYWORD,
+        UINT_KEYWORD,
+        VIRTUAL_KEYWORD
+    );
+
+    TokenSet ECMASCRIPT6_KEYWORDS = TokenSet.create(EXPORT_KEYWORD, ENUM_KEYWORD, FROM_KEYWORD);
+
+    TokenSet ECMASCRIPT6_STRICT_KEYWORDS = TokenSet.create(
+        IMPLEMENTS_KEYWORD,
+        INTERFACE_KEYWORD,
+        PACKAGE_KEYWORD,
+        PRIVATE_KEYWORD,
+        PROTECTED_KEYWORD,
+        PUBLIC_KEYWORD,
+        STATIC_KEYWORD
+    );
+
+    TokenSet KEYWORDS = TokenSet.orSet(JS_KEYWORDS, JS2_KEYWORDS, ECMASCRIPT6_KEYWORDS);
+
+    // Literals
+    IElementType NUMERIC_LITERAL = new JSElementType("NUMERIC_LITERAL");
+    IElementType STRING_LITERAL = new JSElementType("STRING_LITERAL");
+    IElementType SINGLE_QUOTE_STRING_LITERAL = new JSElementType("SINGLE_QUOTE_STRING_LITERAL");
+    IElementType INTERPOLATION_STRING_LITERAL = new JSElementType("INTERPOLATION_STRING_LITERAL");
+    IElementType REGEXP_LITERAL = new JSElementType("REGEXP_LITERAL");
+
+    // Punctuators
+    IElementType LBRACE = new JSElementType("LBRACE");// {
+    IElementType RBRACE = new JSElementType("RBRACE");// }
+    IElementType LPAR = new JSElementType("LPAR");// (
+    IElementType RPAR = new JSElementType("RPAR");// )
+    IElementType LBRACKET = new JSElementType("LBRACKET");// [
+    IElementType RBRACKET = new JSElementType("RBRACKET");// ]
+    IElementType DOT = new JSElementType("DOT");// .
+    IElementType SEMICOLON = new JSElementType("SEMICOLON");// ;
+    IElementType COMMA = new JSElementType("COMMA");// ,
+
+    IElementType LT = new JSElementType("LT");// <
+    IElementType GT = new JSElementType("GT");// >
+    IElementType LE = new JSElementType("LE");// <=
+    IElementType GE = new JSElementType("GE");// >=
+    IElementType EQEQ = new JSElementType("EQEQ");// ==
+    IElementType NE = new JSElementType("NE");// !=
+    IElementType EQEQEQ = new JSElementType("EQEQEQ");// ===
+    IElementType NEQEQ = new JSElementType("NEQEQ");// !==
+    IElementType PLUS = new JSElementType("PLUS");// +
+    IElementType MINUS = new JSElementType("MINUS");// -
+    IElementType MULT = new JSElementType("MULT");// *
+    IElementType MULTMULT = new JSElementType("MULTMULT");// *
+    IElementType PERC = new JSElementType("PERC");// %
+    IElementType PLUSPLUS = new JSElementType("PLUSPLUS");// ++
+    IElementType MINUSMINUS = new JSElementType("MINUSMINUS");// --
+    IElementType LTLT = new JSElementType("LTLT");// <<
+    IElementType GTGT = new JSElementType("GTGT");// >>
+    IElementType GTGTGT = new JSElementType("GTGTGT");// >>>
+    IElementType AND = new JSElementType("AND");// &
+    IElementType OR = new JSElementType("OR");// |
+    IElementType XOR = new JSElementType("XOR");// ^
+    IElementType EXCL = new JSElementType("EXCL");// !
+    IElementType TILDE = new JSElementType("TILDE");// ~
+    IElementType ANDAND = new JSElementType("ANDAND");// &&
+    IElementType OROR = new JSElementType("OROR");// ||
+    IElementType QUEST = new JSElementType("QUEST");// ?
+    IElementType QUEST_DOT = new JSElementType("QUEST_DOT");// ?
+    IElementType COLON = new JSElementType("COLON");// :
+    IElementType EQ = new JSElementType("EQ");// =
+    IElementType PLUSEQ = new JSElementType("PLUSEQ");// +=
+    IElementType MINUSEQ = new JSElementType("MINUSEQ");// -=
+    IElementType MULTEQ = new JSElementType("MULTEQ");// *=
+    IElementType MULT_MULT_EQ = new JSElementType("MULT_MULT_EQ");// **=
+    IElementType PERCEQ = new JSElementType("PERCEQ");// %=
+    IElementType LTLTEQ = new JSElementType("LTLTEQ");// <<=
+    IElementType GTGTEQ = new JSElementType("GTGTEQ");// >>=
+    IElementType GTGTGTEQ = new JSElementType("GTGTGTEQ");// >>>=
+    IElementType ANDEQ = new JSElementType("ANDEQ");// &=
+    IElementType OREQ = new JSElementType("OREQ");// |=
+    IElementType XOREQ = new JSElementType("XOREQ");// ^=
+    IElementType DIV = new JSElementType("DIV"); // /
+    IElementType DIVEQ = new JSElementType("DIVEQ"); // /=
+    IElementType OR_OR_EQ = new JSElementType("OR_OR_EQ"); // ||=
+    IElementType AND_AND_EQ = new JSElementType("AND_AND_EQ"); // &&=
+    IElementType QUEST_QUEST_EQ = new JSElementType("QUEST_QUEST_EQ"); // ??=
+    IElementType DARROW = new JSElementType("DARROW"); // =>
+
+    IElementType COLON_COLON = new JSElementType("COLON_COLON"); // ::
+    IElementType GWT_FIELD_OR_METHOD = new JSElementType("GWT_FIELD_OR_METHOD"); // ::
+
+    IElementType DOT_DOT = new JSElementType("DOT_DOT"); // ..
+    IElementType DOT_DOT_DOT = new JSElementType("DOT_DOT_DOT"); // ...
+
+    IElementType CDATA_START = new JSElementType("CDATA_START"); // <![CDATA[
+    IElementType CDATA_END = new JSElementType("CDATA_END"); // ]]>
+    IElementType JSDOC_TAG_DATA = new JSElementType("JSDOC_TAG_DATA");
+
+    TokenSet OPERATIONS = TokenSet.create(
+        LT, GT, LE, GE,
+        EQEQ, NE, EQEQEQ, NEQEQ,
+        PLUS, MINUS, MULT, PERC,
+        PLUSPLUS, MINUSMINUS, LTLT,
+        GTGT, GTGTGT, AND, OR, XOR,
+        EXCL, TILDE, ANDAND, OROR,
+        QUEST, COLON, EQ, PLUSEQ,
+        MINUSEQ, MULTEQ, PERCEQ, LTLTEQ,
+        GTGTEQ, GTGTGTEQ, ANDEQ, OREQ,
+        XOREQ, DIV, DIVEQ, MULTMULT,
+        COMMA, IS_KEYWORD, AS_KEYWORD,
+        OR_OR_EQ, AND_AND_EQ, QUEST_QUEST_EQ, MULT_MULT_EQ
+    );
+
+    TokenSet ASSOC_OPERATIONS = TokenSet.create(PLUS, MULT, AND, OR, XOR, OROR, ANDAND);
+
+    TokenSet ASSIGNMENT_OPERATIONS = TokenSet.create(
+        EQ,
+        PLUSEQ,
+        MINUSEQ,
+        MULTEQ,
+        PERCEQ,
+        LTLTEQ,
+        GTGTEQ,
+        GTGTGTEQ,
+        ANDEQ,
+        OREQ,
+        XOREQ,
+        DIVEQ,
+        OR_OR_EQ,
+        AND_AND_EQ,
+        QUEST_QUEST_EQ,
+        MULT_MULT_EQ
+    );
+
+    TokenSet EQUALITY_OPERATIONS = TokenSet.create(EQEQ, NE, EQEQEQ, NEQEQ);
+
+    TokenSet RELATIONAL_OPERATIONS = TokenSet.create(LT, GT, LE, GE, INSTANCEOF_KEYWORD, IN_KEYWORD);
+
+    TokenSet ADDITIVE_OPERATIONS = TokenSet.create(PLUS, MINUS);
+
+    TokenSet MULTIPLICATIVE_OPERATIONS = TokenSet.create(MULT, DIV, PERC, MULTMULT);
+
+    TokenSet SHIFT_OPERATIONS = TokenSet.create(LTLT, GTGT, GTGTGT);
+
+    TokenSet UNARY_OPERATIONS =
+        TokenSet.create(PLUS, MINUS, PLUSPLUS, MINUSMINUS, TILDE, EXCL, TYPEOF_KEYWORD, VOID_KEYWORD, DELETE_KEYWORD);
+
+    TokenSet COMMENTS = TokenSet.create(
+        C_STYLE_COMMENT,
+        CDATA_START,
+        CDATA_END,
+        DOC_COMMENT,
+        END_OF_LINE_COMMENT,
+        JavaScriptHighlightingLexer.getTagContentTokenType(),
+        JSDOC_TAG_DATA,
+        JSP_TEXT,
+        XML_STYLE_COMMENT,
+        XML_STYLE_COMMENT_START,
+        XML_TAG_WHITE_SPACE
+    );
+
+    TokenSet MODIFIERS = TokenSet.create(
+        DYNAMIC_KEYWORD,
+        EXPORT_KEYWORD,
+        FINAL_KEYWORD,
+        INTERNAL_KEYWORD,
+        NATIVE_KEYWORD,
+        OVERRIDE_KEYWORD,
+        PROTECTED_KEYWORD,
+        PRIVATE_KEYWORD,
+        PUBLIC_KEYWORD,
+        STATIC_KEYWORD,
+        VIRTUAL_KEYWORD
+    );
+
+    TokenSet ACCESS_MODIFIERS = TokenSet.create(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD);
+
+    TokenSet GET_SET_TOKEN_SET = TokenSet.create(GET_KEYWORD, SET_KEYWORD);
+
+    @Deprecated
+    TokenSet IDENTIFIER_TOKENS_SET = TokenSet.create(IDENTIFIER);
+
+    abstract class JSChameleonElementType extends ILazyParseableElementType {
+        public JSChameleonElementType(@NonNls String name) {
+            super(name, JavaScriptLanguage.INSTANCE);
+        }
+
+        protected abstract void doParse(JavaScriptParsingContext context, PsiBuilder builder);
+
+        @Override
+        @RequiredReadAction
+        protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElement psi) {
+            final Project project = psi.getProject();
+            final Language languageForParser = getLanguageForParser(psi);
+            final LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
+            final LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
+            final PsiBuilder builder = PsiBuilderFactory.getInstance()
+                .createBuilder(project, chameleon, createLexer(), languageForParser, languageVersion, chameleon.getChars());
+            final JavaScriptParser parser = (JavaScriptParser)ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
+
+            JavaScriptParsingContext parsingContext = parser.createParsingContext();
+            doParse(parsingContext, builder);
+            return builder.getTreeBuilt();
+        }
+
+        protected Lexer createLexer() {
+            return null;
+        }
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
index b4497929..71e4d4aa 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
@@ -11,12 +11,10 @@
  * @since 29-Aug-22
  */
 @ExtensionImpl
-public class XmlAttributeValueJSInjector extends JSLanguageInjector
-{
-	@Nonnull
-	@Override
-	public Class<? extends PsiElement> getElementClass()
-	{
-		return XmlAttributeValue.class;
-	}
+public class XmlAttributeValueJSInjector extends JSLanguageInjector {
+    @Nonnull
+    @Override
+    public Class<? extends PsiElement> getElementClass() {
+        return XmlAttributeValue.class;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
index 3fd70f3e..5de93482 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
@@ -11,12 +11,10 @@
  * @since 29-Aug-22
  */
 @ExtensionImpl
-public class XmlTextJSInjector extends JSLanguageInjector
-{
-	@Nonnull
-	@Override
-	public Class<? extends PsiElement> getElementClass()
-	{
-		return XmlText.class;
-	}
+public class XmlTextJSInjector extends JSLanguageInjector {
+    @Nonnull
+    @Override
+    public Class<? extends PsiElement> getElementClass() {
+        return XmlText.class;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java b/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java
index 36c939fd..ee996cda 100644
--- a/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java
+++ b/base-impl/src/main/java/consulo/javascript/ecmascript4/psi/impl/EcmaScript4ElementTypes.java
@@ -9,7 +9,6 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public interface EcmaScript4ElementTypes
-{
-	JSStubElementType<JSImportStatementStub, JSImportStatement> IMPORT_STATEMENT = new JSImportStatementElementType();
+public interface EcmaScript4ElementTypes {
+    JSStubElementType<JSImportStatementStub, JSImportStatement> IMPORT_STATEMENT = new JSImportStatementElementType();
 }
diff --git a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
index e33d2bd7..fbf95279 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
@@ -26,43 +26,40 @@
 
 import jakarta.annotation.Nonnull;
 
+import java.util.List;
+
 /**
  * @author VISTALL
  * @since 23.02.2016
  */
 @ExtensionAPI(ComponentScope.APPLICATION)
-public abstract class JavaScriptQuickFixFactory
-{
-	private static final JavaScriptQuickFixFactory ourDefaultImpl = new JavaScriptQuickFixFactory()
-	{
-		@Override
-		public boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version)
-		{
-			return true;
-		}
-	};
+public abstract class JavaScriptQuickFixFactory {
+    private static final JavaScriptQuickFixFactory ourDefaultImpl = new JavaScriptQuickFixFactory() {
+        @Override
+        public boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version) {
+            return true;
+        }
+    };
 
-	@Nonnull
-	public static JavaScriptQuickFixFactory byElement(PsiElement element)
-	{
-		LanguageVersion languageVersion = element.getLanguageVersion();
-		if(languageVersion instanceof BaseJavaScriptLanguageVersion jsVersion)
-		{
-			for(JavaScriptQuickFixFactory factory : element.getProject().getApplication().getExtensionList(JavaScriptQuickFixFactory.class))
-			{
-				if(factory.isMyVersion(jsVersion))
-				{
-					return factory;
-				}
-			}
-		}
-		return ourDefaultImpl;
-	}
+    @Nonnull
+    public static JavaScriptQuickFixFactory byElement(PsiElement element) {
+        LanguageVersion languageVersion = element.getLanguageVersion();
+        if (languageVersion instanceof BaseJavaScriptLanguageVersion jsVersion) {
+            List<JavaScriptQuickFixFactory> extensionList = element.getProject()
+                .getApplication()
+                .getExtensionList(JavaScriptQuickFixFactory.class);
+            for (JavaScriptQuickFixFactory factory : extensionList) {
+                if (factory.isMyVersion(jsVersion)) {
+                    return factory;
+                }
+            }
+        }
+        return ourDefaultImpl;
+    }
 
-	public CreateJSFunctionOrMethodFix createFunctionOrMethodFix(String referenceName, boolean isMethod)
-	{
-		return new CreateJSFunctionOrMethodFix(referenceName, isMethod);
-	}
+    public CreateJSFunctionOrMethodFix createFunctionOrMethodFix(String referenceName, boolean isMethod) {
+        return new CreateJSFunctionOrMethodFix(referenceName, isMethod);
+    }
 
-	public abstract boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version);
+    public abstract boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version);
 }
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
index 584128c8..b76d25e0 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
@@ -36,101 +36,92 @@
  * @author VISTALL
  * @since 12.12.2015
  */
-public class JavaScriptHighlighter extends SyntaxHighlighterBase
-{
-	public static void storeDefaults(MultiMap<IElementType, TextAttributesKey> keys)
-	{
-		TokenSet operations = TokenSet.andNot(JSTokenTypes.OPERATIONS, TokenSet.create(JSTokenTypes.AS_KEYWORD, JSTokenTypes.IS_KEYWORD));
-
-		for(IElementType type : operations.getTypes())
-		{
-			keys.putValue(type, JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN);
-		}
-
-		for(IElementType type : JSTokenTypes.KEYWORDS.getTypes())
-		{
-			keys.putValue(type, JavaScriptSyntaxHighlightKeys.JS_KEYWORD);
-		}
-
-		keys.putValue(StringEscapesTokenTypes.VALID_STRING_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_VALID_STRING_ESCAPE);
-		keys.putValue(StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE);
-		keys.putValue(StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE);
-
-		keys.putValue(JSTokenTypes.NUMERIC_LITERAL, JavaScriptSyntaxHighlightKeys.JS_NUMBER);
-		keys.putValue(JSTokenTypes.STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
-		keys.putValue(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
-		keys.putValue(JSTokenTypes.INTERPOLATION_STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
-		keys.putValue(JSTokenTypes.REGEXP_LITERAL, JavaScriptSyntaxHighlightKeys.JS_REGEXP);
-
-		keys.putValue(JSTokenTypes.LPAR, JavaScriptSyntaxHighlightKeys.JS_PARENTHS);
-		keys.putValue(JSTokenTypes.RPAR, JavaScriptSyntaxHighlightKeys.JS_PARENTHS);
-
-		keys.putValue(JSTokenTypes.LBRACE, JavaScriptSyntaxHighlightKeys.JS_BRACES);
-		keys.putValue(JSTokenTypes.RBRACE, JavaScriptSyntaxHighlightKeys.JS_BRACES);
-
-		keys.putValue(JSTokenTypes.LBRACKET, JavaScriptSyntaxHighlightKeys.JS_BRACKETS);
-		keys.putValue(JSTokenTypes.RBRACKET, JavaScriptSyntaxHighlightKeys.JS_BRACKETS);
-
-		keys.putValue(JSTokenTypes.COMMA, JavaScriptSyntaxHighlightKeys.JS_COMMA);
-		keys.putValue(JSTokenTypes.DOT, JavaScriptSyntaxHighlightKeys.JS_DOT);
-		keys.putValue(JSTokenTypes.SEMICOLON, JavaScriptSyntaxHighlightKeys.JS_SEMICOLON);
-
-		keys.putValue(JSTokenTypes.C_STYLE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT);
-		keys.putValue(JSTokenTypes.XML_STYLE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT);
-		keys.putValue(JSTokenTypes.DOC_COMMENT, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
-		keys.putValue(JSTokenTypes.END_OF_LINE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_LINE_COMMENT);
-		keys.putValue(JSTokenTypes.BAD_CHARACTER, JavaScriptSyntaxHighlightKeys.JS_BAD_CHARACTER);
-
-		keys.putValue(JSDocTokenTypes.DOC_TAG_NAME, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
-		keys.putValue(JSDocTokenTypes.DOC_TAG_NAME, JavaScriptSyntaxHighlightKeys.JS_DOC_TAG);
-
-		IElementType[] javadoc = IElementType.enumerate(type -> type instanceof JSDocElementType);
-
-		for(IElementType type : javadoc)
-		{
-			keys.putValue(type, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
-		}
-
-		keys.putValue(JSTokenTypes.JSDOC_TAG_DATA, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
-
-		for(IElementType type : JSTokenTypes.XML_TOKENS.getTypes())
-		{
-			keys.putValue(type, XmlHighlighterColors.XML_TAG);
-		}
-
-		keys.putValue(JSTokenTypes.XML_TAG_NAME, XmlHighlighterColors.XML_TAG_NAME);
-		keys.putValue(JSTokenTypes.XML_NAME, XmlHighlighterColors.XML_ATTRIBUTE_NAME);
-		keys.putValue(JSTokenTypes.XML_ATTR_VALUE, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys.putValue(JSTokenTypes.XML_ATTR_VALUE_END, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys.putValue(JSTokenTypes.XML_ATTR_VALUE_START, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys.putValue(JSTokenTypes.XML_ATTR_EQUAL, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-		keys.putValue(JSTokenTypes.XML_ENTITY_REF, XmlHighlighterColors.XML_ENTITY_REFERENCE);
-
-		keys.putValue(JSTokenTypes.XML_STYLE_COMMENT, XmlHighlighterColors.XML_COMMENT);
-		keys.putValue(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
-	}
-
-	private final Supplier<Lexer> myFactory;
-	private final MultiMap<IElementType, TextAttributesKey> keys = MultiMap.createLinked();
-
-	public JavaScriptHighlighter(@Nonnull Supplier<Lexer> factory)
-	{
-		myFactory = factory;
-
-		storeDefaults(keys);
-	}
-
-	@Nonnull
-	@Override
-	public Lexer getHighlightingLexer()
-	{
-		return new JavaScriptHighlightingLexer(myFactory);
-	}
-
-	@Override
-	@Nonnull
-	public TextAttributesKey[] getTokenHighlights(IElementType tokenType)
-	{
-		return keys.get(tokenType).toArray(new TextAttributesKey[0]);
-	}
+public class JavaScriptHighlighter extends SyntaxHighlighterBase {
+    public static void storeDefaults(MultiMap<IElementType, TextAttributesKey> keys) {
+        TokenSet operations = TokenSet.andNot(JSTokenTypes.OPERATIONS, TokenSet.create(JSTokenTypes.AS_KEYWORD, JSTokenTypes.IS_KEYWORD));
+
+        for (IElementType type : operations.getTypes()) {
+            keys.putValue(type, JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN);
+        }
+
+        for (IElementType type : JSTokenTypes.KEYWORDS.getTypes()) {
+            keys.putValue(type, JavaScriptSyntaxHighlightKeys.JS_KEYWORD);
+        }
+
+        keys.putValue(StringEscapesTokenTypes.VALID_STRING_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_VALID_STRING_ESCAPE);
+        keys.putValue(StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE);
+        keys.putValue(StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN, JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE);
+
+        keys.putValue(JSTokenTypes.NUMERIC_LITERAL, JavaScriptSyntaxHighlightKeys.JS_NUMBER);
+        keys.putValue(JSTokenTypes.STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
+        keys.putValue(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
+        keys.putValue(JSTokenTypes.INTERPOLATION_STRING_LITERAL, JavaScriptSyntaxHighlightKeys.JS_STRING);
+        keys.putValue(JSTokenTypes.REGEXP_LITERAL, JavaScriptSyntaxHighlightKeys.JS_REGEXP);
+
+        keys.putValue(JSTokenTypes.LPAR, JavaScriptSyntaxHighlightKeys.JS_PARENTHS);
+        keys.putValue(JSTokenTypes.RPAR, JavaScriptSyntaxHighlightKeys.JS_PARENTHS);
+
+        keys.putValue(JSTokenTypes.LBRACE, JavaScriptSyntaxHighlightKeys.JS_BRACES);
+        keys.putValue(JSTokenTypes.RBRACE, JavaScriptSyntaxHighlightKeys.JS_BRACES);
+
+        keys.putValue(JSTokenTypes.LBRACKET, JavaScriptSyntaxHighlightKeys.JS_BRACKETS);
+        keys.putValue(JSTokenTypes.RBRACKET, JavaScriptSyntaxHighlightKeys.JS_BRACKETS);
+
+        keys.putValue(JSTokenTypes.COMMA, JavaScriptSyntaxHighlightKeys.JS_COMMA);
+        keys.putValue(JSTokenTypes.DOT, JavaScriptSyntaxHighlightKeys.JS_DOT);
+        keys.putValue(JSTokenTypes.SEMICOLON, JavaScriptSyntaxHighlightKeys.JS_SEMICOLON);
+
+        keys.putValue(JSTokenTypes.C_STYLE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT);
+        keys.putValue(JSTokenTypes.XML_STYLE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT);
+        keys.putValue(JSTokenTypes.DOC_COMMENT, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
+        keys.putValue(JSTokenTypes.END_OF_LINE_COMMENT, JavaScriptSyntaxHighlightKeys.JS_LINE_COMMENT);
+        keys.putValue(JSTokenTypes.BAD_CHARACTER, JavaScriptSyntaxHighlightKeys.JS_BAD_CHARACTER);
+
+        keys.putValue(JSDocTokenTypes.DOC_TAG_NAME, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
+        keys.putValue(JSDocTokenTypes.DOC_TAG_NAME, JavaScriptSyntaxHighlightKeys.JS_DOC_TAG);
+
+        IElementType[] javadoc = IElementType.enumerate(type -> type instanceof JSDocElementType);
+
+        for (IElementType type : javadoc) {
+            keys.putValue(type, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
+        }
+
+        keys.putValue(JSTokenTypes.JSDOC_TAG_DATA, JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT);
+
+        for (IElementType type : JSTokenTypes.XML_TOKENS.getTypes()) {
+            keys.putValue(type, XmlHighlighterColors.XML_TAG);
+        }
+
+        keys.putValue(JSTokenTypes.XML_TAG_NAME, XmlHighlighterColors.XML_TAG_NAME);
+        keys.putValue(JSTokenTypes.XML_NAME, XmlHighlighterColors.XML_ATTRIBUTE_NAME);
+        keys.putValue(JSTokenTypes.XML_ATTR_VALUE, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        keys.putValue(JSTokenTypes.XML_ATTR_VALUE_END, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        keys.putValue(JSTokenTypes.XML_ATTR_VALUE_START, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        keys.putValue(JSTokenTypes.XML_ATTR_EQUAL, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        keys.putValue(JSTokenTypes.XML_ENTITY_REF, XmlHighlighterColors.XML_ENTITY_REFERENCE);
+
+        keys.putValue(JSTokenTypes.XML_STYLE_COMMENT, XmlHighlighterColors.XML_COMMENT);
+        keys.putValue(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
+    }
+
+    private final Supplier<Lexer> myFactory;
+    private final MultiMap<IElementType, TextAttributesKey> keys = MultiMap.createLinked();
+
+    public JavaScriptHighlighter(@Nonnull Supplier<Lexer> factory) {
+        myFactory = factory;
+
+        storeDefaults(keys);
+    }
+
+    @Nonnull
+    @Override
+    public Lexer getHighlightingLexer() {
+        return new JavaScriptHighlightingLexer(myFactory);
+    }
+
+    @Override
+    @Nonnull
+    public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
+        return keys.get(tokenType).toArray(new TextAttributesKey[0]);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
index 5908868f..817306e6 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
@@ -15,27 +15,22 @@
  * @since 05.03.2015
  */
 @ExtensionImpl
-public class JavaScriptSyntaxHighlightFactory extends LanguageVersionableSyntaxHighlighterFactory
-{
-	public JavaScriptSyntaxHighlightFactory()
-	{
-	}
+public class JavaScriptSyntaxHighlightFactory extends LanguageVersionableSyntaxHighlighterFactory {
+    public JavaScriptSyntaxHighlightFactory() {
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 
-	@Nonnull
-	@Override
-	public SyntaxHighlighter getSyntaxHighlighter(@Nonnull LanguageVersion languageVersion)
-	{
-		if(languageVersion instanceof BaseJavaScriptLanguageVersion)
-		{
-			return ((BaseJavaScriptLanguageVersion) languageVersion).getSyntaxHighlighter();
-		}
-		throw new IllegalArgumentException(languageVersion.toString());
-	}
+    @Nonnull
+    @Override
+    public SyntaxHighlighter getSyntaxHighlighter(@Nonnull LanguageVersion languageVersion) {
+        if (languageVersion instanceof BaseJavaScriptLanguageVersion baseJavaScriptLanguageVersion) {
+            return baseJavaScriptLanguageVersion.getSyntaxHighlighter();
+        }
+        throw new IllegalArgumentException(languageVersion.toString());
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
index 7a70f997..f4a395f3 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightKeys.java
@@ -27,49 +27,64 @@
  * @author VISTALL
  * @since 12.12.2015
  */
-public interface JavaScriptSyntaxHighlightKeys
-{
-	TextAttributesKey JS_KEYWORD = TextAttributesKey.createTextAttributesKey("JS.KEYWORD", DefaultLanguageHighlighterColors.KEYWORD);
+public interface JavaScriptSyntaxHighlightKeys {
+    TextAttributesKey JS_KEYWORD = TextAttributesKey.of("JS.KEYWORD", DefaultLanguageHighlighterColors.KEYWORD);
 
-	TextAttributesKey JS_STRING = TextAttributesKey.createTextAttributesKey("JS.STRING", DefaultLanguageHighlighterColors.STRING);
+    TextAttributesKey JS_STRING = TextAttributesKey.of("JS.STRING", DefaultLanguageHighlighterColors.STRING);
 
-	TextAttributesKey JS_NUMBER = TextAttributesKey.createTextAttributesKey("JS.NUMBER", DefaultLanguageHighlighterColors.NUMBER);
+    TextAttributesKey JS_NUMBER = TextAttributesKey.of("JS.NUMBER", DefaultLanguageHighlighterColors.NUMBER);
 
-	TextAttributesKey JS_REGEXP = TextAttributesKey.createTextAttributesKey("JS.REGEXP", DefaultLanguageHighlighterColors.NUMBER);
+    TextAttributesKey JS_REGEXP = TextAttributesKey.of("JS.REGEXP", DefaultLanguageHighlighterColors.NUMBER);
 
-	TextAttributesKey JS_LINE_COMMENT = TextAttributesKey.createTextAttributesKey("JS.LINE_COMMENT", DefaultLanguageHighlighterColors.LINE_COMMENT);
+    TextAttributesKey JS_LINE_COMMENT = TextAttributesKey.of("JS.LINE_COMMENT", DefaultLanguageHighlighterColors.LINE_COMMENT);
 
-	TextAttributesKey JS_BLOCK_COMMENT = TextAttributesKey.createTextAttributesKey("JS.BLOCK_COMMENT", DefaultLanguageHighlighterColors.BLOCK_COMMENT);
+    TextAttributesKey JS_BLOCK_COMMENT =
+        TextAttributesKey.of("JS.BLOCK_COMMENT", DefaultLanguageHighlighterColors.BLOCK_COMMENT);
 
-	TextAttributesKey JS_DOC_COMMENT = TextAttributesKey.createTextAttributesKey("JS.DOC_COMMENT", DefaultLanguageHighlighterColors.DOC_COMMENT);
+    TextAttributesKey JS_DOC_COMMENT = TextAttributesKey.of("JS.DOC_COMMENT", DefaultLanguageHighlighterColors.DOC_COMMENT);
 
-	TextAttributesKey JS_OPERATION_SIGN = TextAttributesKey.createTextAttributesKey("JS.OPERATION_SIGN", DefaultLanguageHighlighterColors.OPERATION_SIGN);
+    TextAttributesKey JS_OPERATION_SIGN =
+        TextAttributesKey.of("JS.OPERATION_SIGN", DefaultLanguageHighlighterColors.OPERATION_SIGN);
 
-	TextAttributesKey JS_PARENTHS = TextAttributesKey.createTextAttributesKey("JS.PARENTHS", DefaultLanguageHighlighterColors.PARENTHESES);
+    TextAttributesKey JS_PARENTHS = TextAttributesKey.of("JS.PARENTHS", DefaultLanguageHighlighterColors.PARENTHESES);
 
-	TextAttributesKey JS_BRACKETS = TextAttributesKey.createTextAttributesKey("JS.BRACKETS", DefaultLanguageHighlighterColors.BRACKETS);
+    TextAttributesKey JS_BRACKETS = TextAttributesKey.of("JS.BRACKETS", DefaultLanguageHighlighterColors.BRACKETS);
 
-	TextAttributesKey JS_BRACES = TextAttributesKey.createTextAttributesKey("JS.BRACES", DefaultLanguageHighlighterColors.BRACES);
+    TextAttributesKey JS_BRACES = TextAttributesKey.of("JS.BRACES", DefaultLanguageHighlighterColors.BRACES);
 
-	TextAttributesKey JS_COMMA = TextAttributesKey.createTextAttributesKey("JS.COMMA", DefaultLanguageHighlighterColors.COMMA);
+    TextAttributesKey JS_COMMA = TextAttributesKey.of("JS.COMMA", DefaultLanguageHighlighterColors.COMMA);
 
-	TextAttributesKey JS_DOT = TextAttributesKey.createTextAttributesKey("JS.DOT", DefaultLanguageHighlighterColors.DOT);
+    TextAttributesKey JS_DOT = TextAttributesKey.of("JS.DOT", DefaultLanguageHighlighterColors.DOT);
 
-	TextAttributesKey JS_SEMICOLON = TextAttributesKey.createTextAttributesKey("JS.SEMICOLON", DefaultLanguageHighlighterColors.SEMICOLON);
+    TextAttributesKey JS_SEMICOLON = TextAttributesKey.of("JS.SEMICOLON", DefaultLanguageHighlighterColors.SEMICOLON);
 
-	TextAttributesKey JS_BAD_CHARACTER = TextAttributesKey.createTextAttributesKey("JS.BADCHARACTER", HighlighterColors.BAD_CHARACTER);
-	TextAttributesKey JS_DOC_TAG = TextAttributesKey.createTextAttributesKey("JS.DOC_TAG", DefaultLanguageHighlighterColors.DOC_COMMENT_TAG);
-	TextAttributesKey JS_DOC_MARKUP = TextAttributesKey.createTextAttributesKey("JS.DOC_MARKUP", DefaultLanguageHighlighterColors.DOC_COMMENT_MARKUP);
-	TextAttributesKey JS_VALID_STRING_ESCAPE = TextAttributesKey.createTextAttributesKey("JS.VALID_STRING_ESCAPE",DefaultLanguageHighlighterColors.VALID_STRING_ESCAPE);
-	TextAttributesKey JS_INVALID_STRING_ESCAPE = TextAttributesKey.createTextAttributesKey("JS.INVALID_STRING_ESCAPE", DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE);
-	TextAttributesKey JS_LOCAL_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.LOCAL_VARIABLE", DefaultLanguageHighlighterColors.LOCAL_VARIABLE);
-	TextAttributesKey JS_PARAMETER = TextAttributesKey.createTextAttributesKey("JS.PARAMETER", DefaultLanguageHighlighterColors.PARAMETER);
-	TextAttributesKey JS_INSTANCE_MEMBER_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.INSTANCE_MEMBER_VARIABLE", DefaultLanguageHighlighterColors.INSTANCE_FIELD);
-	TextAttributesKey JS_STATIC_MEMBER_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.STATIC_MEMBER_VARIABLE",DefaultLanguageHighlighterColors.STATIC_FIELD);
-	TextAttributesKey JS_GLOBAL_VARIABLE = TextAttributesKey.createTextAttributesKey("JS.GLOBAL_VARIABLE", DefaultLanguageHighlighterColors.STATIC_FIELD);
-	TextAttributesKey JS_GLOBAL_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.GLOBAL_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
-	TextAttributesKey JS_STATIC_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.STATIC_MEMBER_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
-	TextAttributesKey JS_INSTANCE_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey("JS.INSTANCE_MEMBER_FUNCTION", new TextAttributes(new RGBColor(0x7a, 0x7a, 43), StandardColors.WHITE, null, null,0));
+    TextAttributesKey JS_BAD_CHARACTER = TextAttributesKey.of("JS.BADCHARACTER", HighlighterColors.BAD_CHARACTER);
+    TextAttributesKey JS_DOC_TAG = TextAttributesKey.of("JS.DOC_TAG", DefaultLanguageHighlighterColors.DOC_COMMENT_TAG);
+    TextAttributesKey JS_DOC_MARKUP = TextAttributesKey.of("JS.DOC_MARKUP", DefaultLanguageHighlighterColors.DOC_COMMENT_MARKUP);
+    TextAttributesKey JS_VALID_STRING_ESCAPE =
+        TextAttributesKey.of("JS.VALID_STRING_ESCAPE", DefaultLanguageHighlighterColors.VALID_STRING_ESCAPE);
+    TextAttributesKey JS_INVALID_STRING_ESCAPE =
+        TextAttributesKey.of("JS.INVALID_STRING_ESCAPE", DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE);
+    TextAttributesKey JS_LOCAL_VARIABLE =
+        TextAttributesKey.of("JS.LOCAL_VARIABLE", DefaultLanguageHighlighterColors.LOCAL_VARIABLE);
+    TextAttributesKey JS_PARAMETER = TextAttributesKey.of("JS.PARAMETER", DefaultLanguageHighlighterColors.PARAMETER);
+    TextAttributesKey JS_INSTANCE_MEMBER_VARIABLE =
+        TextAttributesKey.of("JS.INSTANCE_MEMBER_VARIABLE", DefaultLanguageHighlighterColors.INSTANCE_FIELD);
+    TextAttributesKey JS_STATIC_MEMBER_VARIABLE =
+        TextAttributesKey.of("JS.STATIC_MEMBER_VARIABLE", DefaultLanguageHighlighterColors.STATIC_FIELD);
+    TextAttributesKey JS_GLOBAL_VARIABLE =
+        TextAttributesKey.of("JS.GLOBAL_VARIABLE", DefaultLanguageHighlighterColors.STATIC_FIELD);
+    TextAttributesKey JS_GLOBAL_FUNCTION =
+        TextAttributesKey.of("JS.GLOBAL_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
+    TextAttributesKey JS_STATIC_MEMBER_FUNCTION =
+        TextAttributesKey.of("JS.STATIC_MEMBER_FUNCTION", DefaultLanguageHighlighterColors.STATIC_METHOD);
+    TextAttributesKey JS_INSTANCE_MEMBER_FUNCTION = TextAttributesKey.createTextAttributesKey(
+        "JS.INSTANCE_MEMBER_FUNCTION",
+        new TextAttributes(new RGBColor(0x7a, 0x7a, 43), StandardColors.WHITE, null, null, 0)
+    );
 
-	TextAttributesKey JS_METADATA = TextAttributesKey.createTextAttributesKey("JS.ATTRIBUTE", new TextAttributes(null, new RGBColor(0xf7, 0xe9, 0xe9), null, null, 0));
+    TextAttributesKey JS_METADATA = TextAttributesKey.createTextAttributesKey(
+        "JS.ATTRIBUTE",
+        new TextAttributes(null, new RGBColor(0xf7, 0xe9, 0xe9), null, null, 0)
+    );
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java b/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
index 62e14714..68f444f7 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
@@ -34,55 +34,47 @@
  * @since 09.12.2015
  */
 @ExtensionImpl
-public class JavaScriptQuoteHandler extends SimpleTokenSetQuoteHandler implements JavaLikeQuoteHandler, FileQuoteHandler
-{
-	public JavaScriptQuoteHandler()
-	{
-		super(JavaScriptTokenSets.STRING_LITERALS);
-	}
+public class JavaScriptQuoteHandler extends SimpleTokenSetQuoteHandler implements JavaLikeQuoteHandler, FileQuoteHandler {
+    public JavaScriptQuoteHandler() {
+        super(JavaScriptTokenSets.STRING_LITERALS);
+    }
 
-	@Override
-	public TokenSet getConcatenatableStringTokenTypes()
-	{
-		return TokenSet.EMPTY;
-	}
+    @Override
+    public TokenSet getConcatenatableStringTokenTypes() {
+        return TokenSet.EMPTY;
+    }
 
-	@Override
-	public String getStringConcatenationOperatorRepresentation()
-	{
-		return "";
-	}
+    @Override
+    public String getStringConcatenationOperatorRepresentation() {
+        return "";
+    }
 
-	@Override
-	public TokenSet getStringTokenTypes()
-	{
-		return myLiteralTokenSet;
-	}
+    @Override
+    public TokenSet getStringTokenTypes() {
+        return myLiteralTokenSet;
+    }
 
-	@Override
-	public boolean isAppropriateElementTypeForLiteral(@Nonnull IElementType tokenType)
-	{
-		return JavaScriptTokenSets.COMMENTS.contains(tokenType) ||
-				tokenType == JSTokenTypes.WHITE_SPACE ||
-				tokenType == JSTokenTypes.SEMICOLON ||
-				tokenType == JSTokenTypes.COMMA ||
-				tokenType == JSTokenTypes.RPAR ||
-				tokenType == JSTokenTypes.RBRACKET ||
-				tokenType == JSTokenTypes.RBRACE ||
-				tokenType == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL ||
-				tokenType == JSTokenTypes.STRING_LITERAL;
-	}
+    @Override
+    public boolean isAppropriateElementTypeForLiteral(@Nonnull IElementType tokenType) {
+        return JavaScriptTokenSets.COMMENTS.contains(tokenType)
+            || tokenType == JSTokenTypes.WHITE_SPACE
+            || tokenType == JSTokenTypes.SEMICOLON
+            || tokenType == JSTokenTypes.COMMA
+            || tokenType == JSTokenTypes.RPAR
+            || tokenType == JSTokenTypes.RBRACKET
+            || tokenType == JSTokenTypes.RBRACE
+            || tokenType == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL
+            || tokenType == JSTokenTypes.STRING_LITERAL;
+    }
 
-	@Override
-	public boolean needParenthesesAroundConcatenation(PsiElement element)
-	{
-		return false;
-	}
+    @Override
+    public boolean needParenthesesAroundConcatenation(PsiElement element) {
+        return false;
+    }
 
-	@Nonnull
-	@Override
-	public FileType getFileType()
-	{
-		return JavaScriptFileType.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public FileType getFileType() {
+        return JavaScriptFileType.INSTANCE;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
index 95505c0a..c4ffeca9 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
@@ -29,23 +29,19 @@
  * @author VISTALL
  * @since 03.03.2016
  */
-public class JSComputedNameImpl extends JSElementImpl implements JSComputedName
-{
-	public JSComputedNameImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class JSComputedNameImpl extends JSElementImpl implements JSComputedName {
+    public JSComputedNameImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@Nullable
-	@Override
-	public JSExpression getExpression()
-	{
-		return findChildByClass(JSExpression.class);
-	}
+    @Nullable
+    @Override
+    public JSExpression getExpression() {
+        return findChildByClass(JSExpression.class);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
index ceabf21d..caf081d8 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
@@ -25,17 +25,14 @@
 /**
  * @author nik
  */
-public class JSElementFactory
-{
-	private JSElementFactory()
-	{
-	}
+public class JSElementFactory {
+    private JSElementFactory() {
+    }
 
-	@Nonnull
-	public static JSFile createExpressionCodeFragment(@Nonnull Project project, CharSequence text, PsiElement context, boolean isPhysical)
-	{
-		JSExpressionCodeFragmentImpl codeFragment = new JSExpressionCodeFragmentImpl(project, "fragment.js", text, isPhysical);
-		codeFragment.setContext(context);
-		return codeFragment;
-	}
+    @Nonnull
+    public static JSFile createExpressionCodeFragment(@Nonnull Project project, CharSequence text, PsiElement context, boolean isPhysical) {
+        JSExpressionCodeFragmentImpl codeFragment = new JSExpressionCodeFragmentImpl(project, "fragment.js", text, isPhysical);
+        codeFragment.setContext(context);
+        return codeFragment;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
index 51bac722..d3a9de95 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
@@ -28,28 +28,24 @@
 
 import jakarta.annotation.Nonnull;
 
-public abstract class JSStubElementType<StubT extends JSStubElement<PsiT>, PsiT extends JSElement> extends IStubElementType<StubT, PsiT> implements IElementTypeAsPsiFactory
-{
-	public JSStubElementType(String debugName)
-	{
-		super(debugName, JavaScriptLanguage.INSTANCE);
-	}
+public abstract class JSStubElementType<StubT extends JSStubElement<PsiT>, PsiT extends JSElement> extends IStubElementType<StubT, PsiT>
+    implements IElementTypeAsPsiFactory {
+    public JSStubElementType(String debugName) {
+        super(debugName, JavaScriptLanguage.INSTANCE);
+    }
 
-	@Override
-	public String toString()
-	{
-		return "js." + super.toString();
-	}
+    @Override
+    public String toString() {
+        return "js." + super.toString();
+    }
 
-	@Override
-	public void indexStub(@Nonnull final StubT stub, @Nonnull final IndexSink sink)
-	{
-	}
+    @Override
+    public void indexStub(@Nonnull final StubT stub, @Nonnull final IndexSink sink) {
+    }
 
-	@Nonnull
-	@Override
-	public String getExternalId()
-	{
-		return toString();
-	}
+    @Nonnull
+    @Override
+    public String getExternalId() {
+        return toString();
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
index ec6393a7..8a8762b0 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
@@ -38,120 +38,105 @@
  * @author VISTALL
  * @since 03.03.2016
  */
-public class JavaScriptLambdaExpressionImpl extends JSExpressionImpl implements JavaScriptLambdaExpression
-{
-	public JavaScriptLambdaExpressionImpl(ASTNode node)
-	{
-		super(node);
-	}
-
-	@Override
-	@RequiredReadAction
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
-	{
-		if(lastParent != null && lastParent.getParent() == this)
-		{
-			final JSParameter[] params = getParameterList().getParameters();
-			for(JSParameter param : params)
-			{
-				if(!processor.execute(param, state))
-				{
-					return false;
-				}
-			}
-
-			boolean b = JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
-			if(b)
-			{
-				processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
-			}
-			return b;
-		}
-
-		return processor.execute(this, state);
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitLambdaExpression(this);
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JSParameterList getParameterList()
-	{
-		return findNotNullChildByClass(JSParameterList.class);
-	}
-
-	@Override
-	public JSSourceElement[] getBody()
-	{
-		final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
-		if(children.length == 0)
-		{
-			return JSSourceElement.EMPTY_ARRAY;
-		}
-		JSSourceElement[] result = new JSSourceElement[children.length];
-		for(int i = 0; i < children.length; i++)
-		{
-			result[i] = (JSSourceElement) children[i].getPsi();
-		}
-		return result;
-	}
-
-	@Nonnull
-	@Override
-	public JavaScriptType getReturnType()
-	{
-		return JavaScriptType.UNKNOWN;
-	}
-
-	@Override
-	public String getReturnTypeString()
-	{
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public JavaScriptTypeElement getReturnTypeElement()
-	{
-		return null;
-	}
-
-	@Override
-	public boolean isDeprecated()
-	{
-		return false;
-	}
-
-	@Nullable
-	@Override
-	public JSAttributeList getAttributeList()
-	{
-		return null;
-	}
-
-	@Override
-	public String getQualifiedName()
-	{
-		return null;
-	}
-
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		return null;
-	}
-
-	@RequiredWriteAction
-	@Override
-	public PsiElement setName(@Nonnull @NonNls String name) throws IncorrectOperationException
-	{
-		return null;
-	}
+public class JavaScriptLambdaExpressionImpl extends JSExpressionImpl implements JavaScriptLambdaExpression {
+    public JavaScriptLambdaExpressionImpl(ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    @RequiredReadAction
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        if (lastParent != null && lastParent.getParent() == this) {
+            final JSParameter[] params = getParameterList().getParameters();
+            for (JSParameter param : params) {
+                if (!processor.execute(param, state)) {
+                    return false;
+                }
+            }
+
+            boolean b = JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
+            if (b) {
+                processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
+            }
+            return b;
+        }
+
+        return processor.execute(this, state);
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitLambdaExpression(this);
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JSParameterList getParameterList() {
+        return findNotNullChildByClass(JSParameterList.class);
+    }
+
+    @Override
+    public JSSourceElement[] getBody() {
+        final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
+        if (children.length == 0) {
+            return JSSourceElement.EMPTY_ARRAY;
+        }
+        JSSourceElement[] result = new JSSourceElement[children.length];
+        for (int i = 0; i < children.length; i++) {
+            result[i] = (JSSourceElement)children[i].getPsi();
+        }
+        return result;
+    }
+
+    @Nonnull
+    @Override
+    public JavaScriptType getReturnType() {
+        return JavaScriptType.UNKNOWN;
+    }
+
+    @Override
+    public String getReturnTypeString() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JavaScriptTypeElement getReturnTypeElement() {
+        return null;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+
+    @Override
+    public String getQualifiedName() {
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        return null;
+    }
+
+    @RequiredWriteAction
+    @Override
+    public PsiElement setName(@Nonnull @NonNls String name) throws IncorrectOperationException {
+        return null;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
index 764d3d8a..899eb54f 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
@@ -14,37 +14,31 @@
  * @author VISTALL
  * @since 2020-01-01
  */
-public class JavaScriptSpreadExpressionImpl extends JSElementImpl implements JSSpreadExpression
-{
-	public JavaScriptSpreadExpressionImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class JavaScriptSpreadExpressionImpl extends JSElementImpl implements JSSpreadExpression {
+    public JavaScriptSpreadExpressionImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	public JSExpression getInnerExpression()
-	{
-		return findNotNullChildByClass(JSExpression.class);
-	}
+    @Override
+    public JSExpression getInnerExpression() {
+        return findNotNullChildByClass(JSExpression.class);
+    }
 
-	@Nonnull
-	@Override
-	public JSExpression replace(JSExpression other)
-	{
-		return this;
-	}
+    @Nonnull
+    @Override
+    public JSExpression replace(JSExpression other) {
+        return this;
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		return JavaScriptType.UNKNOWN;
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        return JavaScriptType.UNKNOWN;
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
index a3bc5ceb..6b07f129 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
@@ -14,32 +14,27 @@
  * @author VISTALL
  * @since 19.07.2015
  */
-public class JSFileStubImpl extends PsiFileStubImpl<JSFile> implements JSFileStub
-{
-	private StringRef myName;
+public class JSFileStubImpl extends PsiFileStubImpl<JSFile> implements JSFileStub {
+    private StringRef myName;
 
-	public JSFileStubImpl(@Nullable JSFile file, @Nonnull String name)
-	{
-		super(file);
-		myName = StringRef.fromString(name);
-	}
+    public JSFileStubImpl(@Nullable JSFile file, @Nonnull String name) {
+        super(file);
+        myName = StringRef.fromString(name);
+    }
 
-	public JSFileStubImpl(@Nullable JSFile file, @Nonnull StringRef name)
-	{
-		super(file);
-		myName = name;
-	}
+    public JSFileStubImpl(@Nullable JSFile file, @Nonnull StringRef name) {
+        super(file);
+        myName = name;
+    }
 
-	@Override
-	public IStubFileElementType getType()
-	{
-		return JSElementTypes.FILE;
-	}
+    @Override
+    public IStubFileElementType getType() {
+        return JSElementTypes.FILE;
+    }
 
-	@Nonnull
-	@Override
-	public String getName()
-	{
-		return StringRef.toString(myName);
-	}
+    @Nonnull
+    @Override
+    public String getName() {
+        return StringRef.toString(myName);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
index d412fabb..fcbe10c6 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
@@ -31,12 +31,10 @@
  * @author VISTALL
  */
 @ExtensionImpl
-public class JavaScriptClassNameIndex extends StringStubIndexExtension<JSClass>
-{
-	@Nonnull
-	@Override
-	public StubIndexKey<String, JSClass> getKey()
-	{
-		return JavaScriptIndexKeys.CLASSES_BY_NAME;
-	}
+public class JavaScriptClassNameIndex extends StringStubIndexExtension<JSClass> {
+    @Nonnull
+    @Override
+    public StubIndexKey<String, JSClass> getKey() {
+        return JavaScriptIndexKeys.CLASSES_BY_NAME;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index e66668a1..ca5acd4e 100644
--- a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -29,85 +29,77 @@
 import consulo.localize.LocalizeValue;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.Set;
 
 /**
-* @author VISTALL
-* @since 24.02.2016
-*/
-public abstract class CreateJSFunctionFixBase extends BaseCreateFix
-{
-	private final LocalizeValue myMessage;
-
-	public CreateJSFunctionFixBase(LocalizeValue message)
-	{
-		myMessage = message;
-	}
-
-	@Override
-	@Nonnull
-	public String getName()
-	{
-		return myMessage.get();
-	}
-
-	@Override
-	@Nonnull
-	public String getFamilyName()
-	{
-		return JavaScriptLocalize.javascriptCreateFunctionIntentionFamily().get();
-	}
-
-	@RequiredReadAction
-	@Override
-  protected void buildTemplate(
-		Template template,
-		JSReferenceExpression referenceExpression,
-		Set<JavaScriptFeature> features,
-		boolean staticContext,
-		PsiFile file,
-		PsiElement anchorParent
-	)
-	{
-		boolean classFeature = features.contains(JavaScriptFeature.CLASS);
-		String referencedName = classFeature ? referenceExpression.getReferencedName() : referenceExpression.getText();
-		BaseCreateFix.addAccessModifier(template, referenceExpression, classFeature, staticContext);
-		writeFunctionAndName(template, referencedName, features);
-		template.addTextSegment("(");
-
-		addParameters(template, referenceExpression, file, features);
-
-		template.addTextSegment(")");
-
-		if(classFeature)
-		{
-			template.addTextSegment(":");
-			addReturnType(template, referenceExpression, file);
-		}
-
-		JSClass clazz = BaseCreateFix.findClass(file, anchorParent);
-		if(clazz == null || !clazz.isInterface())
-		{
-			template.addTextSegment(" {");
-			addBody(template, referenceExpression, file);
-			template.addTextSegment("}");
-		}
-		else
-		{
-			addSemicolonSegment(template, file);
-			template.addEndVariable();
-		}
-	}
-
-	protected void writeFunctionAndName(Template template, String referencedName, Set<JavaScriptFeature> features)
-	{
-		template.addTextSegment("function ");
-		template.addTextSegment(referencedName);
-	}
-
-	protected abstract void addParameters(Template template, JSReferenceExpression refExpr, PsiFile file, Set<JavaScriptFeature> features);
-
-	protected abstract void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile psifile);
-
-	protected abstract void addBody(Template template, JSReferenceExpression refExpr, PsiFile file);
+ * @author VISTALL
+ * @since 24.02.2016
+ */
+public abstract class CreateJSFunctionFixBase extends BaseCreateFix {
+    private final LocalizeValue myMessage;
+
+    public CreateJSFunctionFixBase(LocalizeValue message) {
+        myMessage = message;
+    }
+
+    @Override
+    @Nonnull
+    public String getName() {
+        return myMessage.get();
+    }
+
+    @Override
+    @Nonnull
+    public String getFamilyName() {
+        return JavaScriptLocalize.javascriptCreateFunctionIntentionFamily().get();
+    }
+
+    @RequiredReadAction
+    @Override
+    protected void buildTemplate(
+        Template template,
+        JSReferenceExpression referenceExpression,
+        Set<JavaScriptFeature> features,
+        boolean staticContext,
+        PsiFile file,
+        PsiElement anchorParent
+    ) {
+        boolean classFeature = features.contains(JavaScriptFeature.CLASS);
+        String referencedName = classFeature ? referenceExpression.getReferencedName() : referenceExpression.getText();
+        BaseCreateFix.addAccessModifier(template, referenceExpression, classFeature, staticContext);
+        writeFunctionAndName(template, referencedName, features);
+        template.addTextSegment("(");
+
+        addParameters(template, referenceExpression, file, features);
+
+        template.addTextSegment(")");
+
+        if (classFeature) {
+            template.addTextSegment(":");
+            addReturnType(template, referenceExpression, file);
+        }
+
+        JSClass clazz = BaseCreateFix.findClass(file, anchorParent);
+        if (clazz == null || !clazz.isInterface()) {
+            template.addTextSegment(" {");
+            addBody(template, referenceExpression, file);
+            template.addTextSegment("}");
+        }
+        else {
+            addSemicolonSegment(template, file);
+            template.addEndVariable();
+        }
+    }
+
+    protected void writeFunctionAndName(Template template, String referencedName, Set<JavaScriptFeature> features) {
+        template.addTextSegment("function ");
+        template.addTextSegment(referencedName);
+    }
+
+    protected abstract void addParameters(Template template, JSReferenceExpression refExpr, PsiFile file, Set<JavaScriptFeature> features);
+
+    protected abstract void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile psifile);
+
+    protected abstract void addBody(Template template, JSReferenceExpression refExpr, PsiFile file);
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
index 8aa2278a..6bcdb8a9 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
@@ -22,31 +22,26 @@
 /**
  * @author Maxim.Mossienko
  */
-public class JavaScriptFlexAdapter extends FlexAdapter
-{
-	private static final int BASE_STATE_MASK = 0xF;
-	private static final int TAG_COUNT_SHIFT = 4;
+public class JavaScriptFlexAdapter extends FlexAdapter {
+    private static final int BASE_STATE_MASK = 0xF;
+    private static final int TAG_COUNT_SHIFT = 4;
 
-	public JavaScriptFlexAdapter(FlexLexer lexer)
-	{
-		super(lexer);
-	}
+    public JavaScriptFlexAdapter(FlexLexer lexer) {
+        super(lexer);
+    }
 
-	@Override
-	public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState)
-	{
-		super.start(buffer, startOffset, endOffset, initialState & BASE_STATE_MASK);
-		((JavaScriptFlexLexer) getFlex()).setTagCount(initialState >> TAG_COUNT_SHIFT);
-	}
+    @Override
+    public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState) {
+        super.start(buffer, startOffset, endOffset, initialState & BASE_STATE_MASK);
+        ((JavaScriptFlexLexer)getFlex()).setTagCount(initialState >> TAG_COUNT_SHIFT);
+    }
 
-	@Override
-	public int getState()
-	{
-		return getStateInternal() + (((JavaScriptFlexLexer) getFlex()).getTagCount() << TAG_COUNT_SHIFT);
-	}
+    @Override
+    public int getState() {
+        return getStateInternal() + (((JavaScriptFlexLexer)getFlex()).getTagCount() << TAG_COUNT_SHIFT);
+    }
 
-	protected int getStateInternal()
-	{
-		return super.getState();
-	}
+    protected int getStateInternal() {
+        return super.getState();
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java
index 3539ceff..8491d090 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexLexer.java
@@ -6,9 +6,8 @@
  * @author VISTALL
  * @since 2019-12-05
  */
-public interface JavaScriptFlexLexer extends FlexLexer
-{
-	void setTagCount(int count);
+public interface JavaScriptFlexLexer extends FlexLexer {
+    void setTagCount(int count);
 
-	int getTagCount();
+    int getTagCount();
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
index 16d2f3bf..6d5d5b92 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
@@ -14,24 +14,20 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public class JavaSciptDestructuringElementImpl extends JSElementImpl implements JSDestructuringElement
-{
-	public JavaSciptDestructuringElementImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class JavaSciptDestructuringElementImpl extends JSElementImpl implements JSDestructuringElement {
+    public JavaSciptDestructuringElementImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public JSDestructuringObject getDestructuringObject()
-	{
-		return findChildByClass(JSDestructuringObject.class);
-	}
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSDestructuringObject getDestructuringObject() {
+        return findChildByClass(JSDestructuringObject.class);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
index f0f27403..7c08ab02 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
@@ -9,41 +9,36 @@
 import consulo.language.ast.ASTNode;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.Arrays;
 
 /**
  * @author VISTALL
  * @since 2019-12-14
  */
-public class JavaSciptDestructuringObjectImpl extends JSElementImpl implements JSDestructuringObject
-{
-	public JavaSciptDestructuringObjectImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class JavaSciptDestructuringObjectImpl extends JSElementImpl implements JSDestructuringObject {
+    public JavaSciptDestructuringObjectImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public JSVariable[] getVariables()
-	{
-		JSDestructuringShorthandedProperty[] properties = getProperties();
-		if(properties.length == 0)
-		{
-			return JSVariable.EMPTY_ARRAY;
-		}
-		return Arrays.stream(properties).map(JSDestructuringShorthandedProperty::getVarialbe).toArray(JSVariable[]::new);
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public JSVariable[] getVariables() {
+        JSDestructuringShorthandedProperty[] properties = getProperties();
+        if (properties.length == 0) {
+            return JSVariable.EMPTY_ARRAY;
+        }
+        return Arrays.stream(properties).map(JSDestructuringShorthandedProperty::getVarialbe).toArray(JSVariable[]::new);
+    }
 
-	@Override
-	public JSDestructuringShorthandedProperty[] getProperties()
-	{
-		return findChildrenByClass(JSDestructuringShorthandedProperty.class);
-	}
+    @Override
+    public JSDestructuringShorthandedProperty[] getProperties() {
+        return findChildrenByClass(JSDestructuringShorthandedProperty.class);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
index 1c6c22d3..68b94d72 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
@@ -21,171 +21,149 @@
  * @author VISTALL
  * @since 2019-12-17
  */
-public class JavaScriptDestructuringParameterImpl extends JSElementImpl implements JSDestructuringParameter
-{
-	public JavaScriptDestructuringParameterImpl(ASTNode node)
-	{
-		super(node);
-	}
-
-	@Override
-	@RequiredReadAction
-	public boolean processDeclarations(@Nonnull PsiScopeProcessor processor, @Nonnull ResolveState state, PsiElement lastParent, @Nonnull PsiElement place)
-	{
-		JSDestructuringObject destructuringObject = getDestructuringObject();
-		if(destructuringObject == null)
-		{
-			return true;
-		}
-		for(JSVariable variable : destructuringObject.getVariables())
-		{
-			if(!processor.execute(variable, state))
-			{
-				return false;
-			}
-		}
-		return super.processDeclarations(processor, state, lastParent, place);
-	}
-
-	@Nullable
-	@Override
-	public JSVariableStubBase getStub()
-	{
-		return null;
-	}
-
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
-
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public JSDestructuringObject getDestructuringObject()
-	{
-		return findChildByClass(JSDestructuringObject.class);
-	}
-
-	@Override
-	public JSFunction getDeclaringFunction()
-	{
-		return getStubOrPsiParentOfType(JSFunction.class);
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean isRest()
-	{
-		return false;
-	}
-
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiElement getRestElement()
-	{
-		return null;
-	}
-
-	@Override
-	public boolean isOptional()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean hasInitializer()
-	{
-		return false;
-	}
-
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public JSExpression getInitializer()
-	{
-		return null;
-	}
-
-	@Override
-	public String getInitializerText()
-	{
-		return null;
-	}
-
-	@Override
-	public void setInitializer(JSExpression expr) throws IncorrectOperationException
-	{
-
-	}
-
-	@Nonnull
-	@Override
-	public JavaScriptType getType()
-	{
-		return JavaScriptType.UNKNOWN;
-	}
-
-	@Nullable
-	@Override
-	public String getTypeString()
-	{
-		return null;
-	}
-
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public JavaScriptTypeElement getTypeElement()
-	{
-		return null;
-	}
-
-	@Override
-	public boolean isConst()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean isLocal()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean isDeprecated()
-	{
-		return false;
-	}
-
-	@Nullable
-	@Override
-	public JSAttributeList getAttributeList()
-	{
-		return null;
-	}
-
-	@Override
-	public String getQualifiedName()
-	{
-		return null;
-	}
-
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiElement getNameIdentifier()
-	{
-		return null;
-	}
-
-	@RequiredWriteAction
-	@Override
-	public PsiElement setName(@Nonnull @NonNls String name) throws IncorrectOperationException
-	{
-		return null;
-	}
+public class JavaScriptDestructuringParameterImpl extends JSElementImpl implements JSDestructuringParameter {
+    public JavaScriptDestructuringParameterImpl(ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    @RequiredReadAction
+    public boolean processDeclarations(
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
+    ) {
+        JSDestructuringObject destructuringObject = getDestructuringObject();
+        if (destructuringObject == null) {
+            return true;
+        }
+        for (JSVariable variable : destructuringObject.getVariables()) {
+            if (!processor.execute(variable, state)) {
+                return false;
+            }
+        }
+        return super.processDeclarations(processor, state, lastParent, place);
+    }
+
+    @Nullable
+    @Override
+    public JSVariableStubBase getStub() {
+        return null;
+    }
+
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSDestructuringObject getDestructuringObject() {
+        return findChildByClass(JSDestructuringObject.class);
+    }
+
+    @Override
+    public JSFunction getDeclaringFunction() {
+        return getStubOrPsiParentOfType(JSFunction.class);
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isRest() {
+        return false;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getRestElement() {
+        return null;
+    }
+
+    @Override
+    public boolean isOptional() {
+        return false;
+    }
+
+    @Override
+    public boolean hasInitializer() {
+        return false;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getInitializer() {
+        return null;
+    }
+
+    @Override
+    public String getInitializerText() {
+        return null;
+    }
+
+    @Override
+    public void setInitializer(JSExpression expr) throws IncorrectOperationException {
+
+    }
+
+    @Nonnull
+    @Override
+    public JavaScriptType getType() {
+        return JavaScriptType.UNKNOWN;
+    }
+
+    @Nullable
+    @Override
+    public String getTypeString() {
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JavaScriptTypeElement getTypeElement() {
+        return null;
+    }
+
+    @Override
+    public boolean isConst() {
+        return false;
+    }
+
+    @Override
+    public boolean isLocal() {
+        return false;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+
+    @Override
+    public String getQualifiedName() {
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        return null;
+    }
+
+    @RequiredWriteAction
+    @Override
+    public PsiElement setName(@Nonnull @NonNls String name) throws IncorrectOperationException {
+        return null;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
index 9e5ee051..4c941df1 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
@@ -13,24 +13,20 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public class JavaScriptDestructuringShorthandedPropertyImpl extends JSElementImpl implements JSDestructuringShorthandedProperty
-{
-	public JavaScriptDestructuringShorthandedPropertyImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class JavaScriptDestructuringShorthandedPropertyImpl extends JSElementImpl implements JSDestructuringShorthandedProperty {
+    public JavaScriptDestructuringShorthandedPropertyImpl(ASTNode node) {
+        super(node);
+    }
 
-	@Override
-	protected void accept(@Nonnull JSElementVisitor visitor)
-	{
-		visitor.visitJSElement(this);
-	}
+    @Override
+    protected void accept(@Nonnull JSElementVisitor visitor) {
+        visitor.visitJSElement(this);
+    }
 
-	@Nonnull
-	@RequiredReadAction
-	@Override
-	public JSVariable getVarialbe()
-	{
-		return findNotNullChildByClass(JSVariable.class);
-	}
+    @Nonnull
+    @RequiredReadAction
+    @Override
+    public JSVariable getVarialbe() {
+        return findNotNullChildByClass(JSVariable.class);
+    }
 }

From 5d97421652dd08fc27a4df9f0e10f843a8d944fe Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Wed, 31 Jul 2024 03:35:18 +0300
Subject: [PATCH 232/340] Code reformat using IJ4 code style (part 20).

---
 .../lang/BaseJavaScriptLanguageVersion.java   |   80 +-
 .../lang/JavaScript15LanguageVersion.java     |   75 +-
 .../JavaScriptContextKeywordElementType.java  |   30 +-
 .../javascript/lang/JavaScriptTokenSets.java  |   10 +-
 .../lang/StandardJavaScriptVersionsImpl.java  |   83 +-
 .../lang/parsing/ExpressionParsing.java       | 1832 ++++++++---------
 .../lang/parsing/FunctionParsing.java         |  353 ++--
 .../javascript/lang/parsing/JSXParser.java    |  537 +++--
 .../lang/parsing/JavaScriptParser.java        |   47 +-
 .../lang/parsing/JavaScriptParserBuilder.java |   10 +-
 .../parsing/JavaScriptParsingContext.java     |  104 +-
 .../javascript/lang/parsing/Parsing.java      |  216 +-
 .../lang/parsing/StatementParsing.java        | 1567 +++++++-------
 .../impl/JavaScriptStrictParserBuilder.java   |  185 +-
 .../impl/JSRegExpLiteralExpressionImpl.java   |   12 +-
 .../lang/psi/impl/JavaScriptClassType.java    |   42 +-
 .../BaseJavaScriptElementType.java            |   11 +-
 .../resolve/JavaScriptVersionWithHelper.java  |    7 +-
 .../lang/psi/impl/resolve/ResolveHelper.java  |   57 +-
 .../JSFileViewProviderFactory.java            |   65 +-
 .../types/JSQualifiedStubElementType.java     |   60 +-
 base-impl/src/main/java/module-info.java      |   71 +-
 .../AssignmentResultUsedJSInspection.java     |    9 +-
 ...ignmentToForLoopParameterJSInspection.java |   26 +-
 ...gnmentToFunctionParameterJSInspection.java |   35 +-
 25 files changed, 2498 insertions(+), 3026 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index a1c1435e..d5d79e22 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -10,6 +10,7 @@
 import consulo.language.parser.PsiParser;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -17,56 +18,49 @@
  * @author VISTALL
  * @since 24.08.14
  */
-public abstract class BaseJavaScriptLanguageVersion extends JavaScriptLanguageVersion
-{
-	private static TokenSet ourLiterals = TokenSet.orSet(JavaScriptTokenSets.STRING_LITERALS, TokenSet.create(JSTokenTypes.NUMERIC_LITERAL));
+public abstract class BaseJavaScriptLanguageVersion extends JavaScriptLanguageVersion {
+    private static TokenSet ourLiterals =
+        TokenSet.orSet(JavaScriptTokenSets.STRING_LITERALS, TokenSet.create(JSTokenTypes.NUMERIC_LITERAL));
 
-	private Set<JavaScriptFeature> myFeatures = new LinkedHashSet<>();
+    private Set<JavaScriptFeature> myFeatures = new LinkedHashSet<>();
 
-	public BaseJavaScriptLanguageVersion(String name, String... mimeTypes)
-	{
-		super(name, name, JavaScriptLanguage.INSTANCE, mimeTypes);
-	}
+    public BaseJavaScriptLanguageVersion(String name, String... mimeTypes) {
+        super(name, name, JavaScriptLanguage.INSTANCE, mimeTypes);
+    }
 
-	protected void addFeature(@Nonnull JavaScriptFeature feature)
-	{
-		myFeatures.add(feature);
-	}
+    protected void addFeature(@Nonnull JavaScriptFeature feature) {
+        myFeatures.add(feature);
+    }
 
-	@Nonnull
-	public Set<JavaScriptFeature> getFeatures()
-	{
-		return myFeatures;
-	}
+    @Nonnull
+    public Set<JavaScriptFeature> getFeatures() {
+        return myFeatures;
+    }
 
-	@Nonnull
-	public abstract SyntaxHighlighter getSyntaxHighlighter();
+    @Nonnull
+    public abstract SyntaxHighlighter getSyntaxHighlighter();
 
-	@Nonnull
-	@Override
-	public PsiParser createParser()
-	{
-		return new JavaScriptParser();
-	}
+    @Nonnull
+    @Override
+    public PsiParser createParser() {
+        return new JavaScriptParser();
+    }
 
-	@Nonnull
-	@Override
-	public TokenSet getWhitespaceTokens()
-	{
-		return JavaScriptTokenSets.WHITE_SPACES;
-	}
+    @Nonnull
+    @Override
+    public TokenSet getWhitespaceTokens() {
+        return JavaScriptTokenSets.WHITE_SPACES;
+    }
 
-	@Nonnull
-	@Override
-	public TokenSet getCommentTokens()
-	{
-		return JSTokenTypes.COMMENTS;
-	}
+    @Nonnull
+    @Override
+    public TokenSet getCommentTokens() {
+        return JSTokenTypes.COMMENTS;
+    }
 
-	@Nonnull
-	@Override
-	public TokenSet getStringLiteralElements()
-	{
-		return ourLiterals;
-	}
+    @Nonnull
+    @Override
+    public TokenSet getStringLiteralElements() {
+        return ourLiterals;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
index 35860b36..79efc92b 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -9,6 +9,7 @@
 import consulo.language.lexer.Lexer;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.function.Supplier;
 
 /**
@@ -16,44 +17,38 @@
  * @since 05.03.2015
  */
 @ExtensionImpl
-public class JavaScript15LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion
-{
-	private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript15Lexer();
-
-	@Nonnull
-	public static JavaScript15LanguageVersion getInstance()
-	{
-		return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript15LanguageVersion.class);
-	}
-
-	public JavaScript15LanguageVersion()
-	{
-		super("JAVASCRIPT_1_5");
-	}
-
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "JavaScript 1.5";
-	}
-	@Nonnull
-	@Override
-	public Lexer createLexer()
-	{
-		return ourLexerFactory.get();
-	}
-
-	@Nonnull
-	@Override
-	public SyntaxHighlighter getSyntaxHighlighter()
-	{
-		return new JavaScriptHighlighter(ourLexerFactory);
-	}
-
-	@Override
-	public int getWeight()
-	{
-		return 0;
-	}
+public class JavaScript15LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
+    private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript15Lexer();
+
+    @Nonnull
+    public static JavaScript15LanguageVersion getInstance() {
+        return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript15LanguageVersion.class);
+    }
+
+    public JavaScript15LanguageVersion() {
+        super("JAVASCRIPT_1_5");
+    }
+
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "JavaScript 1.5";
+    }
+
+    @Nonnull
+    @Override
+    public Lexer createLexer() {
+        return ourLexerFactory.get();
+    }
+
+    @Nonnull
+    @Override
+    public SyntaxHighlighter getSyntaxHighlighter() {
+        return new JavaScriptHighlighter(ourLexerFactory);
+    }
+
+    @Override
+    public int getWeight() {
+        return 0;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
index 986ce6d4..e0e18729 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
@@ -12,25 +12,21 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public class JavaScriptContextKeywordElementType extends JSElementType
-{
-	private static final BiMap<String, IElementType> ourCache = HashBiMap.create();
+public class JavaScriptContextKeywordElementType extends JSElementType {
+    private static final BiMap<String, IElementType> ourCache = HashBiMap.create();
 
-	@Nullable
-	public static IElementType getKeywordByText(String text)
-	{
-		return ourCache.get(text);
-	}
+    @Nullable
+    public static IElementType getKeywordByText(String text) {
+        return ourCache.get(text);
+    }
 
-	public static boolean containsKeyword(@Nonnull IElementType e)
-	{
-		return ourCache.inverse().containsKey(e);
-	}
+    public static boolean containsKeyword(@Nonnull IElementType e) {
+        return ourCache.inverse().containsKey(e);
+    }
 
-	public JavaScriptContextKeywordElementType(@Nonnull String id, @Nonnull String keyword)
-	{
-		super(id);
+    public JavaScriptContextKeywordElementType(@Nonnull String id, @Nonnull String keyword) {
+        super(id);
 
-		ourCache.put(keyword, this);
-	}
+        ourCache.put(keyword, this);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
index 295c376b..498b8c96 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptTokenSets.java
@@ -24,11 +24,11 @@
  * @author VISTALL
  * @since 24.08.14
  */
-public interface JavaScriptTokenSets extends JSTokenTypes
-{
-	TokenSet STRING_LITERALS = TokenSet.create(JSTokenTypes.STRING_LITERAL, JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JSTokenTypes.INTERPOLATION_STRING_LITERAL);
+public interface JavaScriptTokenSets extends JSTokenTypes {
+    TokenSet STRING_LITERALS =
+        TokenSet.create(JSTokenTypes.STRING_LITERAL, JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JSTokenTypes.INTERPOLATION_STRING_LITERAL);
 
-	TokenSet WHITE_SPACES = TokenSet.create(JSTokenTypes.WHITE_SPACE);
+    TokenSet WHITE_SPACES = TokenSet.create(JSTokenTypes.WHITE_SPACE);
 
-	TokenSet NAME_TOKEN_TYPES = TokenSet.create(JSElementTypes.REFERENCE_EXPRESSION, JSTokenTypes.IDENTIFIER);
+    TokenSet NAME_TOKEN_TYPES = TokenSet.create(JSElementTypes.REFERENCE_EXPRESSION, JSTokenTypes.IDENTIFIER);
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index 54d16ad7..c136a5df 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -21,55 +21,44 @@
  */
 @Singleton
 @ServiceImpl
-public class StandardJavaScriptVersionsImpl extends StandardJavaScriptVersions
-{
-	@Nonnull
-	public JavaScriptLanguageVersion getDefaultVersion()
-	{
-		LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
-		for(LanguageVersion version : versions)
-		{
-			if(version instanceof DefaultJavaScriptVersion)
-			{
-				return (JavaScriptLanguageVersion) version;
-			}
-		}
-		return JavaScript15LanguageVersion.getInstance();
-	}
+public class StandardJavaScriptVersionsImpl extends StandardJavaScriptVersions {
+    @Nonnull
+    public JavaScriptLanguageVersion getDefaultVersion() {
+        LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
+        for (LanguageVersion version : versions) {
+            if (version instanceof DefaultJavaScriptVersion) {
+                return (JavaScriptLanguageVersion)version;
+            }
+        }
+        return JavaScript15LanguageVersion.getInstance();
+    }
 
-	@Nonnull
-	public List<JavaScriptLanguageVersion> getValidLanguageVersions()
-	{
-		List<JavaScriptLanguageVersion> list = new ArrayList<>();
-		LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
-		for(LanguageVersion version : versions)
-		{
-			if(version instanceof StandardJavaScriptVersion)
-			{
-				list.add((BaseJavaScriptLanguageVersion) version);
-			}
-		}
+    @Nonnull
+    public List<JavaScriptLanguageVersion> getValidLanguageVersions() {
+        List<JavaScriptLanguageVersion> list = new ArrayList<>();
+        LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
+        for (LanguageVersion version : versions) {
+            if (version instanceof StandardJavaScriptVersion) {
+                list.add((BaseJavaScriptLanguageVersion)version);
+            }
+        }
 
-		list.sort((o1, o2) -> StringUtil.naturalCompare(o1.getPresentableName(), o2.getPresentableName()));
-		return list;
-	}
+        list.sort((o1, o2) -> StringUtil.naturalCompare(o1.getPresentableName(), o2.getPresentableName()));
+        return list;
+    }
 
-	@Nonnull
-	public JavaScriptLanguageVersion findVersionById(@Nullable String id)
-	{
-		if(StringUtil.isEmpty(id))
-		{
-			return getDefaultVersion();
-		}
+    @Nonnull
+    public JavaScriptLanguageVersion findVersionById(@Nullable String id) {
+        if (StringUtil.isEmpty(id)) {
+            return getDefaultVersion();
+        }
 
-		LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
-		for(LanguageVersion version : versions)
-		{
-			if(version instanceof StandardJavaScriptVersion && id.equals(version.getId()))
-			{
-				return (BaseJavaScriptLanguageVersion) version;
-			}
-		}
-		return getDefaultVersion();
-	}
+        LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
+        for (LanguageVersion version : versions) {
+            if (version instanceof StandardJavaScriptVersion && id.equals(version.getId())) {
+                return (BaseJavaScriptLanguageVersion)version;
+            }
+        }
+        return getDefaultVersion();
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 7655cd4a..bfbf11d7 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -36,1006 +36,834 @@
  * Date: Jan 28, 2005
  * Time: 1:18:22 PM
  */
-public class ExpressionParsing<C extends JavaScriptParsingContext> extends Parsing<C>
-{
-	private static final Logger LOG = Logger.getInstance(ExpressionParsing.class);
-
-	public static final Key<Boolean> WITHIN_ARRAY_LITERAL_EXPRESSION = Key.create("within.array.literal.expression");
-	public static final Key<Boolean> WITHIN_OBJECT_LITERAL_EXPRESSION = Key.create("within.object.literal.expression");
-
-	private static final TokenSet DOT_SET = TokenSet.create(JSTokenTypes.DOT);
-	private static final TokenSet MEMBER_OPERATOR_SET = TokenSet.create(JSTokenTypes.DOT, JSTokenTypes.COLON_COLON, JSTokenTypes.DOT_DOT, JSTokenTypes.QUEST_DOT);
-
-	private final JSXParser myJSXParser = new JSXParser();
-
-	public ExpressionParsing(C context)
-	{
-		super(context);
-	}
-
-	protected boolean parsePrimaryExpression(PsiBuilder builder)
-	{
-		final IElementType firstToken = builder.getTokenType();
-		if(firstToken == JSTokenTypes.THIS_KEYWORD)
-		{
-			Parsing.buildTokenElement(JSElementTypes.THIS_EXPRESSION, builder);
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.SUPER_KEYWORD)
-		{
-			Parsing.buildTokenElement(JSElementTypes.SUPER_EXPRESSION, builder);
-			return true;
-		}
-		else if(isIdentifierName(builder, firstToken) || firstToken == JSTokenTypes.ANY_IDENTIFIER)
-		{
-			Parsing.buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.REGEXP_LITERAL)
-		{
-			LocalizeValue errorMessage = validateLiteral(builder);
-			Parsing.buildTokenElement(JSElementTypes.REGEXP_LITERAL_EXPRESSION, builder);
-			if(errorMessage != null)
-			{
-				builder.error(errorMessage);
-			}
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.NUMERIC_LITERAL ||
-				firstToken == JSTokenTypes.STRING_LITERAL ||
-				firstToken == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL ||
-				firstToken == JSTokenTypes.INTERPOLATION_STRING_LITERAL ||
-				firstToken == JSTokenTypes.NULL_KEYWORD ||
-				firstToken == JSTokenTypes.UNDEFINED_KEYWORD ||
-				firstToken == JSTokenTypes.FALSE_KEYWORD ||
-				firstToken == JSTokenTypes.TRUE_KEYWORD)
-		{
-			LocalizeValue errorMessage = validateLiteral(builder);
-			Parsing.buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
-			if(errorMessage != null)
-			{
-				builder.error(errorMessage);
-			}
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.LPAR)
-		{
-			parseParenthesizedExpression(builder);
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.LBRACKET)
-		{
-			parseArrayLiteralExpression(builder);
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.LBRACE)
-		{
-			parseObjectLiteralExpression(builder);
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.LET_KEYWORD)
-		{
-			parseLetExpression(builder);
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			getFunctionParsing().parseFunctionExpression(builder);
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.XML_START_TAG_START || firstToken == JSTokenTypes.XML_START_TAG_LIST)
-		{
-			parseTag(builder);
-			return true;
-		}
-		else if(firstToken == JSTokenTypes.AT)
-		{
-			PsiBuilder.Marker marker = builder.mark();
-			builder.advanceLexer();
-
-			if(!builder.eof())
-			{
-				IElementType tokenType = builder.getTokenType();
-				if(tokenType == JSTokenTypes.ANY_IDENTIFIER || isIdentifierToken(builder, tokenType))
-				{
-					builder.advanceLexer();
-				}
-				else if(tokenType == JSTokenTypes.LBRACKET)
-				{
-					builder.advanceLexer();
-					parseExpression(builder);
-					Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
-				}
-				else
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-				}
-			}
-
-			marker.done(JSElementTypes.REFERENCE_EXPRESSION);
-
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	private void parseLetExpression(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker marker = getStatementParsing().parseLetExpressionStart(builder);
-		parseExpression(builder);
-		marker.done(JSElementTypes.LET_EXPRESSION);
-	}
-
-	private void parseTag(final PsiBuilder builder)
-	{
-		myJSXParser.setBuilder(builder);
-
-		myJSXParser.parseTag(false);
-	}
-
-	@Nullable
-	public static LocalizeValue validateLiteral(final PsiBuilder builder)
-	{
-		final IElementType ttype = builder.getTokenType();
-		if(ttype == JSTokenTypes.STRING_LITERAL || ttype == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL)
-		{
-			final String ttext = builder.getTokenText();
-			assert ttext != null;
-
-			if(lastSymbolEscaped(ttext) ||
-					ttext.startsWith("\"") && (!ttext.endsWith("\"") || ttext.length() == 1) ||
-					ttext.startsWith("\'") && (!ttext.endsWith("\'") || ttext.length() == 1))
-			{
-				return JavaScriptLocalize.javascriptParserMessageUnclosedStringLiteral();
-			}
-		}
-
-		return null;
-	}
-
-	private static boolean lastSymbolEscaped(String text)
-	{
-		boolean escapes = false;
-		boolean escaped = true;
-		for(int i = 0; i < text.length(); i++)
-		{
-			char c = text.charAt(i);
-			if(escapes)
-			{
-				escapes = false;
-				escaped = true;
-				continue;
-			}
-			if(c == '\\')
-			{
-				escapes = true;
-			}
-			escaped = false;
-		}
-		return escapes || escaped;
-	}
-
-	public void parseObjectLiteralExpression(final PsiBuilder builder)
-	{
-		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
-		final PsiBuilder.Marker expr = builder.mark();
-		builder.advanceLexer();
-
-		IElementType elementType = builder.getTokenType();
-
-		while(elementType != JSTokenTypes.RBRACE && elementType != null)
-		{
-			parseProperty(builder);
-
-			elementType = builder.getTokenType();
-			if(elementType == JSTokenTypes.RBRACE)
-			{
-				break;
-			}
-			else if(elementType == JSTokenTypes.COMMA)
-			{
-				builder.advanceLexer();
-
-				if(builder.getTokenType() == JSTokenTypes.RBRACE)
-				{
-					break;
-				}
-			}
-			else
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
-			}
-
-			elementType = builder.getTokenType();
-			if(elementType == JSTokenTypes.RBRACE)
-			{
-				builder.error(JavaScriptLocalize.javascriptParserPropertyExpected());
-			}
-			else if(isNotPropertyStart(builder, elementType))
-			{
-				break;
-			}
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
-		expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
-	}
-
-	public boolean isNotPropertyStart(PsiBuilder builder, IElementType elementType)
-	{
-		return !isIdentifierToken(builder, elementType) && !JavaScriptTokenSets.STRING_LITERALS.contains(elementType) && elementType != JSTokenTypes.NUMERIC_LITERAL;
-	}
-
-	protected void parseProperty(final PsiBuilder builder)
-	{
-		final IElementType nameToken = builder.getTokenType();
-		final PsiBuilder.Marker property = builder.mark();
-
-		if(isNotPropertyStart(builder, nameToken))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
-		}
-		builder.advanceLexer();
-
-		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
-
-		builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
-		if(!parseAssignmentExpression(builder))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-		}
-		builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
-
-		property.done(JSElementTypes.PROPERTY);
-	}
-
-	public void parseArrayLiteralExpression(final PsiBuilder builder)
-	{
-		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
-		final PsiBuilder.Marker expr = builder.mark();
-		builder.advanceLexer();
-		boolean commaExpected = false;
-
-		Boolean save = null;
-
-		try
-		{
-			save = builder.getUserData(WITHIN_ARRAY_LITERAL_EXPRESSION);
-			builder.putUserData(WITHIN_ARRAY_LITERAL_EXPRESSION, Boolean.TRUE);
-
-			while(builder.getTokenType() != JSTokenTypes.RBRACKET)
-			{
-				if(commaExpected)
-				{
-					final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
-					if(!b)
-					{
-						break;
-					}
-				}
-
-				while(builder.getTokenType() == JSTokenTypes.COMMA)
-				{
-					builder.advanceLexer();
-				}
-
-				commaExpected = false;
-				if(builder.getTokenType() != JSTokenTypes.RBRACKET)
-				{
-					if(!parseAssignmentExpression(builder))
-					{
-						builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-						break;
-					}
-					else
-					{
-						commaExpected = true;
-					}
-				}
-			}
-			Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
-			expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
-		}
-		finally
-		{
-			builder.putUserData(WITHIN_ARRAY_LITERAL_EXPRESSION, save);
-		}
-	}
-
-	private void parseParenthesizedExpression(final PsiBuilder builder)
-	{
-		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
-		final PsiBuilder.Marker expr = builder.mark();
-		builder.advanceLexer();
-		parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-		expr.done(JSElementTypes.PARENTHESIZED_EXPRESSION);
-	}
-
-	protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax)
-	{
-		return parseMemberExpression(builder, allowCallSyntax, MEMBER_OPERATOR_SET);
-	}
-
-	protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax, TokenSet membersOperatorSet)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		boolean isNew;
-
-		final IElementType type = builder.getTokenType();
-
-		if(type == JSTokenTypes.NEW_KEYWORD)
-		{
-			isNew = true;
-			final boolean isfunction = parseNewExpression(builder);
-
-			if(isfunction)
-			{
-				expr.done(JSElementTypes.NEW_EXPRESSION);
-				if(builder.getTokenType() != JSTokenTypes.LPAR)
-				{
-					return true;
-				}
-				expr = expr.precede();
-				isNew = false;
-			}
-		}
-		else
-		{
-			isNew = false;
-			if(!parsePrimaryExpression(builder))
-			{
-				expr.drop();
-				return false;
-			}
-		}
-
-		boolean currentlyAllowCallSyntax = allowCallSyntax && (type != JSTokenTypes.LBRACE && type != JSTokenTypes.LBRACKET);
-
-		while(true)
-		{
-			IElementType tokenType = builder.getTokenType();
-			if(membersOperatorSet.contains(tokenType))
-			{
-				currentlyAllowCallSyntax = allowCallSyntax;
-				builder.advanceLexer();
-
-				if(builder.getTokenType() == JSTokenTypes.AT)
-				{
-					builder.advanceLexer();
-				}
-
-				tokenType = builder.getTokenType();
-
-				if(tokenType == JSTokenTypes.LBRACKET || tokenType == JSTokenTypes.LPAR)
-				{
-					continue;
-				}
-
-				if(tokenType == JSTokenTypes.ANY_IDENTIFIER || isIdentifierToken(builder, tokenType))
-				{
-					builder.advanceLexer();
-				}
-				else
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName());
-				}
-
-				expr.done(JSElementTypes.REFERENCE_EXPRESSION);
-				expr = expr.precede();
-			}
-			else if(tokenType == JSTokenTypes.LBRACKET)
-			{
-				builder.advanceLexer();
-				parseExpression(builder);
-				Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
-				expr.done(JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION);
-				expr = expr.precede();
-			}
-			else if(currentlyAllowCallSyntax && tokenType == JSTokenTypes.LPAR)
-			{
-				parseArgumentList(builder);
-				expr.done(isNew ? JSElementTypes.NEW_EXPRESSION : JSElementTypes.CALL_EXPRESSION);
-				expr = expr.precede();
-				isNew = false;
-			}
-			else
-			{
-				if(isNew)
-				{
-					expr.done(JSElementTypes.NEW_EXPRESSION);
-				}
-				else
-				{
-					expr.drop();
-				}
-				break;
-			}
-		}
-
-		return true;
-	}
-
-	public boolean parseQualifiedTypeName(PsiBuilder builder)
-	{
-		return parseQualifiedTypeName(builder, false);
-	}
-
-	public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar)
-	{
-		return parseQualifiedTypeName(builder, allowStar, DOT_SET);
-	}
-
-	public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, TokenSet separatorsSet)
-	{
-		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
-		{
-			return false;
-		}
-		PsiBuilder.Marker expr = builder.mark();
-		Parsing.buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
-
-		while(separatorsSet.contains(builder.getTokenType()))
-		{
-			boolean stop = false;
-			builder.advanceLexer();
-
-			final IElementType tokenType = builder.getTokenType();
-			if(tokenType == JSTokenTypes.ANY_IDENTIFIER && allowStar)
-			{
-				builder.advanceLexer();
-				stop = true;
-			}
-			else if(tokenType == JSTokenTypes.DEFAULT_KEYWORD || (tokenType != JSTokenTypes.IDENTIFIER && JSTokenTypes.IDENTIFIER_TOKENS_SET
-					.contains(tokenType)))
-			{
-				builder.advanceLexer(); // TODO: allow any keyword
-			}
-			else
-			{
-				Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName());
-			}
-			expr.done(JSElementTypes.REFERENCE_EXPRESSION);
-			expr = expr.precede();
-
-			if(stop)
-			{
-				break;
-			}
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	protected boolean parseNewExpression(PsiBuilder builder)
-	{
-		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.NEW_KEYWORD);
-		builder.advanceLexer();
-
-		if(builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			getFunctionParsing().parseFunctionExpression(builder);
-			return true;
-		}
-
-		if(!parseMemberExpression(builder, false))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-		}
-		return false;
-	}
-
-	protected void parseArgumentList(final PsiBuilder builder)
-	{
-		ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
-		final PsiBuilder.Marker arglist = builder.mark();
-		builder.advanceLexer();
-		boolean first = true;
-		while(builder.getTokenType() != JSTokenTypes.RPAR)
-		{
-			if(first)
-			{
-				first = false;
-			}
-			else
-			{
-				if(builder.getTokenType() == JSTokenTypes.COMMA)
-				{
-					builder.advanceLexer();
-				}
-				else
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen());
-					break;
-				}
-			}
-			if(!parseAssignmentExpression(builder))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-		arglist.done(JSElementTypes.ARGUMENT_LIST);
-	}
-
-	public void parseExpression(PsiBuilder builder)
-	{
-		if(!parseExpressionOptional(builder))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-		}
-	}
-
-	public boolean parseAssignmentExpressionNoIn(final PsiBuilder builder)
-	{
-		return parseAssignmentExpression(builder, false);
-	}
-
-	public boolean parseAssignmentExpression(final PsiBuilder builder)
-	{
-		return parseAssignmentExpression(builder, true);
-	}
-
-	private boolean parseAssignmentExpression(final PsiBuilder builder, boolean allowIn)
-	{
-		final PsiBuilder.Marker expr = builder.mark();
-
-		if(JSTokenTypes.ASSIGNMENT_OPERATIONS.contains(builder.getTokenType()) && builder.getUserData(WITHIN_OBJECT_LITERAL_EXPRESSION) == null)
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			builder.advanceLexer();
-			if(!parseAssignmentExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
-			return true;
-		}
-
-		final PsiBuilder.Marker definitionExpr = builder.mark();
-		if(!parseConditionalExpression(builder, allowIn))
-		{
-			definitionExpr.drop();
-			expr.drop();
-			return false;
-		}
-
-		if(JSTokenTypes.ASSIGNMENT_OPERATIONS.contains(builder.getTokenType()))
-		{
-			definitionExpr.done(JSElementTypes.DEFINITION_EXPRESSION);
-			builder.advanceLexer();
-			if(!parseAssignmentExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
-		}
-		else
-		{
-			definitionExpr.drop();
-			expr.drop();
-		}
-		return true;
-	}
-
-	private boolean parseConditionalExpression(final PsiBuilder builder, final boolean allowIn)
-	{
-		final PsiBuilder.Marker expr = builder.mark();
-		if(!parseORExpression(builder, allowIn))
-		{
-			expr.drop();
-			return false;
-		}
-
-		final IElementType nextTokenType = builder.getTokenType();
-
-		if(nextTokenType == JSTokenTypes.QUEST)
-		{
-			builder.advanceLexer();
-			if(!parseAssignmentExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
-			if(!parseAssignmentExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.CONDITIONAL_EXPRESSION);
-		}
-		else if(nextTokenType == JSTokenTypes.FOR_KEYWORD && builder.getUserData(WITHIN_ARRAY_LITERAL_EXPRESSION) != null)
-		{
-			getStatementParsing().parseForLoopHeader(builder);      // TODO: make it more clear
-			expr.done(JSElementTypes.CONDITIONAL_EXPRESSION);
-		}
-		else
-		{
-			expr.drop();
-		}
-		return true;
-	}
-
-	private boolean parseORExpression(final PsiBuilder builder, final boolean allowIn)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseANDExpression(builder, allowIn))
-		{
-			expr.drop();
-			return false;
-		}
-
-		while(builder.getTokenType() == JSTokenTypes.OROR)
-		{
-			builder.advanceLexer();
-			if(!parseANDExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseANDExpression(final PsiBuilder builder, final boolean allowIn)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseBitwiseORExpression(builder, allowIn))
-		{
-			expr.drop();
-			return false;
-		}
-
-		while(builder.getTokenType() == JSTokenTypes.ANDAND)
-		{
-			builder.advanceLexer();
-			if(!parseBitwiseORExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseBitwiseORExpression(final PsiBuilder builder, final boolean allowIn)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseBitwiseXORExpression(builder, allowIn))
-		{
-			expr.drop();
-			return false;
-		}
-
-		while(builder.getTokenType() == JSTokenTypes.OR)
-		{
-			builder.advanceLexer();
-			if(!parseBitwiseXORExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseBitwiseXORExpression(final PsiBuilder builder, final boolean allowIn)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseBitwiseANDExpression(builder, allowIn))
-		{
-			expr.drop();
-			return false;
-		}
-
-		while(builder.getTokenType() == JSTokenTypes.XOR)
-		{
-			builder.advanceLexer();
-			if(!parseBitwiseANDExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseBitwiseANDExpression(final PsiBuilder builder, final boolean allowIn)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseEqualityExpression(builder, allowIn))
-		{
-			expr.drop();
-			return false;
-		}
-
-		while(builder.getTokenType() == JSTokenTypes.AND)
-		{
-			builder.advanceLexer();
-			if(!parseEqualityExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseEqualityExpression(final PsiBuilder builder, final boolean allowIn)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseRelationalExpression(builder, allowIn))
-		{
-			expr.drop();
-			return false;
-		}
-
-		while(JSTokenTypes.EQUALITY_OPERATIONS.contains(builder.getTokenType()))
-		{
-			builder.advanceLexer();
-			if(!parseRelationalExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseRelationalExpression(final PsiBuilder builder, final boolean allowIn)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseShiftExpression(builder))
-		{
-			expr.drop();
-			return false;
-		}
-		while(JSTokenTypes.RELATIONAL_OPERATIONS.contains(builder.getTokenType()) && (allowIn || builder.getTokenType() != JSTokenTypes.IN_KEYWORD))
-		{
-			builder.advanceLexer();
-			if(!parseShiftExpression(builder))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseShiftExpression(final PsiBuilder builder)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseAdditiveExpression(builder))
-		{
-			expr.drop();
-			return false;
-		}
-		while(JSTokenTypes.SHIFT_OPERATIONS.contains(builder.getTokenType()))
-		{
-			builder.advanceLexer();
-			if(!parseAdditiveExpression(builder))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseAdditiveExpression(final PsiBuilder builder)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseMultiplicativeExpression(builder))
-		{
-			expr.drop();
-			return false;
-		}
-		while(JSTokenTypes.ADDITIVE_OPERATIONS.contains(builder.getTokenType()))
-		{
-			builder.advanceLexer();
-			if(!parseMultiplicativeExpression(builder))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseIsAsExpression(final PsiBuilder builder)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseUnaryExpression(builder))
-		{
-			expr.drop();
-			return false;
-		}
-
-		while(builder.getTokenType() == JSTokenTypes.AS_KEYWORD || builder.getTokenType() == JSTokenTypes.IS_KEYWORD)
-		{
-			builder.advanceLexer();
-			if(!parseUnaryExpression(builder))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	protected boolean parseMultiplicativeExpression(final PsiBuilder builder)
-	{
-		return parseMultiplicativeExpression(builder, JSTokenTypes.MULTIPLICATIVE_OPERATIONS);
-	}
-
-	protected boolean parseMultiplicativeExpression(final PsiBuilder builder, TokenSet operatorSet)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseIsAsExpression(builder))
-		{
-			expr.drop();
-			return false;
-		}
-
-		while(operatorSet.contains(builder.getTokenType()))
-		{
-			builder.advanceLexer();
-			if(!parseUnaryExpression(builder))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.BINARY_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-		return true;
-	}
-
-	private boolean parseUnaryExpression(final PsiBuilder builder)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		if(JSTokenTypes.UNARY_OPERATIONS.contains(tokenType))
-		{
-			final PsiBuilder.Marker expr = builder.mark();
-			builder.advanceLexer();
-			if(!parseUnaryExpression(builder))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-			expr.done(JSElementTypes.PREFIX_EXPRESSION);
-			return true;
-		}
-		else
-		{
-			return parsePostfixExpression(builder);
-		}
-	}
-
-	private boolean parsePostfixExpression(PsiBuilder builder)
-	{
-		final PsiBuilder.Marker expr = builder.mark();
-		if(!parseMemberExpression(builder, true))
-		{
-			expr.drop();
-			return false;
-		}
-
-		final IElementType tokenType = builder.getTokenType();
-		if(tokenType == JSTokenTypes.PLUSPLUS || tokenType == JSTokenTypes.MINUSMINUS)
-		{
-			builder.advanceLexer();
-			expr.done(JSElementTypes.POSTFIX_EXPRESSION);
-		}
-		else
-		{
-			expr.drop();
-		}
-		return true;
-	}
-
-	public boolean parseExpressionOptional(final PsiBuilder builder)
-	{
-		return parseExpressionOptional(builder, true);
-	}
-
-	public boolean parseExpressionOptionalNoIn(final PsiBuilder builder)
-	{
-		return parseExpressionOptional(builder, false);
-	}
-
-	public boolean parseExpressionOptional(final PsiBuilder builder, final boolean allowIn)
-	{
-		PsiBuilder.Marker expr = builder.mark();
-		if(!parseAssignmentExpression(builder, allowIn))
-		{
-			expr.drop();
-			return false;
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
-		{
-			expr.done(JSElementTypes.DEFINITION_EXPRESSION);
-			return true;
-		}
-
-		while(builder.getTokenType() == JSTokenTypes.COMMA)
-		{
-			builder.advanceLexer();
-			if(!parseAssignmentExpression(builder, allowIn))
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			}
-
-			expr.done(JSElementTypes.COMMA_EXPRESSION);
-			expr = expr.precede();
-		}
-
-		expr.drop();
-
-		return true;
-	}
-
-	public boolean tryParseType(final PsiBuilder builder)
-	{
-		return false;
-	}
-
-	public boolean parseType(final PsiBuilder builder)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		if(JSDocumentationUtils.ourPrimitiveTypeFilter.contains(tokenType))
-		{
-			builder.advanceLexer();
-		}
-		else if(!parseQualifiedTypeName(builder))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
-		}
-		return true;
-	}
-
-	public boolean parseSimpleExpression(final PsiBuilder builder)
-	{
-		if(!parseUnaryExpression(builder))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-			return false;
-		}
-		return true;
-	}
+public class ExpressionParsing<C extends JavaScriptParsingContext> extends Parsing<C> {
+    private static final Logger LOG = Logger.getInstance(ExpressionParsing.class);
+
+    public static final Key<Boolean> WITHIN_ARRAY_LITERAL_EXPRESSION = Key.create("within.array.literal.expression");
+    public static final Key<Boolean> WITHIN_OBJECT_LITERAL_EXPRESSION = Key.create("within.object.literal.expression");
+
+    private static final TokenSet DOT_SET = TokenSet.create(JSTokenTypes.DOT);
+    private static final TokenSet MEMBER_OPERATOR_SET =
+        TokenSet.create(JSTokenTypes.DOT, JSTokenTypes.COLON_COLON, JSTokenTypes.DOT_DOT, JSTokenTypes.QUEST_DOT);
+
+    private final JSXParser myJSXParser = new JSXParser();
+
+    public ExpressionParsing(C context) {
+        super(context);
+    }
+
+    protected boolean parsePrimaryExpression(PsiBuilder builder) {
+        final IElementType firstToken = builder.getTokenType();
+        if (firstToken == JSTokenTypes.THIS_KEYWORD) {
+            Parsing.buildTokenElement(JSElementTypes.THIS_EXPRESSION, builder);
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.SUPER_KEYWORD) {
+            Parsing.buildTokenElement(JSElementTypes.SUPER_EXPRESSION, builder);
+            return true;
+        }
+        else if (isIdentifierName(builder, firstToken) || firstToken == JSTokenTypes.ANY_IDENTIFIER) {
+            Parsing.buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.REGEXP_LITERAL) {
+            LocalizeValue errorMessage = validateLiteral(builder);
+            Parsing.buildTokenElement(JSElementTypes.REGEXP_LITERAL_EXPRESSION, builder);
+            if (errorMessage != null) {
+                builder.error(errorMessage);
+            }
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.NUMERIC_LITERAL
+            || firstToken == JSTokenTypes.STRING_LITERAL
+            || firstToken == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL
+            || firstToken == JSTokenTypes.INTERPOLATION_STRING_LITERAL
+            || firstToken == JSTokenTypes.NULL_KEYWORD
+            || firstToken == JSTokenTypes.UNDEFINED_KEYWORD
+            || firstToken == JSTokenTypes.FALSE_KEYWORD
+            || firstToken == JSTokenTypes.TRUE_KEYWORD) {
+            LocalizeValue errorMessage = validateLiteral(builder);
+            Parsing.buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
+            if (errorMessage != null) {
+                builder.error(errorMessage);
+            }
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.LPAR) {
+            parseParenthesizedExpression(builder);
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.LBRACKET) {
+            parseArrayLiteralExpression(builder);
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.LBRACE) {
+            parseObjectLiteralExpression(builder);
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.LET_KEYWORD) {
+            parseLetExpression(builder);
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.FUNCTION_KEYWORD) {
+            getFunctionParsing().parseFunctionExpression(builder);
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.XML_START_TAG_START || firstToken == JSTokenTypes.XML_START_TAG_LIST) {
+            parseTag(builder);
+            return true;
+        }
+        else if (firstToken == JSTokenTypes.AT) {
+            PsiBuilder.Marker marker = builder.mark();
+            builder.advanceLexer();
+
+            if (!builder.eof()) {
+                IElementType tokenType = builder.getTokenType();
+                if (tokenType == JSTokenTypes.ANY_IDENTIFIER || isIdentifierToken(builder, tokenType)) {
+                    builder.advanceLexer();
+                }
+                else if (tokenType == JSTokenTypes.LBRACKET) {
+                    builder.advanceLexer();
+                    parseExpression(builder);
+                    Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
+                }
+                else {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+                }
+            }
+
+            marker.done(JSElementTypes.REFERENCE_EXPRESSION);
+
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    private void parseLetExpression(final PsiBuilder builder) {
+        final PsiBuilder.Marker marker = getStatementParsing().parseLetExpressionStart(builder);
+        parseExpression(builder);
+        marker.done(JSElementTypes.LET_EXPRESSION);
+    }
+
+    private void parseTag(final PsiBuilder builder) {
+        myJSXParser.setBuilder(builder);
+
+        myJSXParser.parseTag(false);
+    }
+
+    @Nullable
+    public static LocalizeValue validateLiteral(final PsiBuilder builder) {
+        final IElementType ttype = builder.getTokenType();
+        if (ttype == JSTokenTypes.STRING_LITERAL || ttype == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL) {
+            final String ttext = builder.getTokenText();
+            assert ttext != null;
+
+            if (lastSymbolEscaped(ttext) ||
+                ttext.startsWith("\"") && (!ttext.endsWith("\"") || ttext.length() == 1) ||
+                ttext.startsWith("\'") && (!ttext.endsWith("\'") || ttext.length() == 1)) {
+                return JavaScriptLocalize.javascriptParserMessageUnclosedStringLiteral();
+            }
+        }
+
+        return null;
+    }
+
+    private static boolean lastSymbolEscaped(String text) {
+        boolean escapes = false;
+        boolean escaped = true;
+        for (int i = 0; i < text.length(); i++) {
+            char c = text.charAt(i);
+            if (escapes) {
+                escapes = false;
+                escaped = true;
+                continue;
+            }
+            if (c == '\\') {
+                escapes = true;
+            }
+            escaped = false;
+        }
+        return escapes || escaped;
+    }
+
+    public void parseObjectLiteralExpression(final PsiBuilder builder) {
+        ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
+        final PsiBuilder.Marker expr = builder.mark();
+        builder.advanceLexer();
+
+        IElementType elementType = builder.getTokenType();
+
+        while (elementType != JSTokenTypes.RBRACE && elementType != null) {
+            parseProperty(builder);
+
+            elementType = builder.getTokenType();
+            if (elementType == JSTokenTypes.RBRACE) {
+                break;
+            }
+            else if (elementType == JSTokenTypes.COMMA) {
+                builder.advanceLexer();
+
+                if (builder.getTokenType() == JSTokenTypes.RBRACE) {
+                    break;
+                }
+            }
+            else {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
+            }
+
+            elementType = builder.getTokenType();
+            if (elementType == JSTokenTypes.RBRACE) {
+                builder.error(JavaScriptLocalize.javascriptParserPropertyExpected());
+            }
+            else if (isNotPropertyStart(builder, elementType)) {
+                break;
+            }
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
+        expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
+    }
+
+    public boolean isNotPropertyStart(PsiBuilder builder, IElementType elementType) {
+        return !isIdentifierToken(builder, elementType)
+            && !JavaScriptTokenSets.STRING_LITERALS.contains(elementType)
+            && elementType != JSTokenTypes.NUMERIC_LITERAL;
+    }
+
+    protected void parseProperty(final PsiBuilder builder) {
+        final IElementType nameToken = builder.getTokenType();
+        final PsiBuilder.Marker property = builder.mark();
+
+        if (isNotPropertyStart(builder, nameToken)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
+        }
+        builder.advanceLexer();
+
+        Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
+
+        builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, Boolean.TRUE);
+        if (!parseAssignmentExpression(builder)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+        }
+        builder.putUserData(WITHIN_OBJECT_LITERAL_EXPRESSION, null);
+
+        property.done(JSElementTypes.PROPERTY);
+    }
+
+    public void parseArrayLiteralExpression(final PsiBuilder builder) {
+        ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
+        final PsiBuilder.Marker expr = builder.mark();
+        builder.advanceLexer();
+        boolean commaExpected = false;
+
+        Boolean save = null;
+
+        try {
+            save = builder.getUserData(WITHIN_ARRAY_LITERAL_EXPRESSION);
+            builder.putUserData(WITHIN_ARRAY_LITERAL_EXPRESSION, Boolean.TRUE);
+
+            while (builder.getTokenType() != JSTokenTypes.RBRACKET) {
+                if (commaExpected) {
+                    final boolean b =
+                        Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
+                    if (!b) {
+                        break;
+                    }
+                }
+
+                while (builder.getTokenType() == JSTokenTypes.COMMA) {
+                    builder.advanceLexer();
+                }
+
+                commaExpected = false;
+                if (builder.getTokenType() != JSTokenTypes.RBRACKET) {
+                    if (!parseAssignmentExpression(builder)) {
+                        builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+                        break;
+                    }
+                    else {
+                        commaExpected = true;
+                    }
+                }
+            }
+            Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
+            expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
+        }
+        finally {
+            builder.putUserData(WITHIN_ARRAY_LITERAL_EXPRESSION, save);
+        }
+    }
+
+    private void parseParenthesizedExpression(final PsiBuilder builder) {
+        ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
+        final PsiBuilder.Marker expr = builder.mark();
+        builder.advanceLexer();
+        parseExpression(builder);
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+        expr.done(JSElementTypes.PARENTHESIZED_EXPRESSION);
+    }
+
+    protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax) {
+        return parseMemberExpression(builder, allowCallSyntax, MEMBER_OPERATOR_SET);
+    }
+
+    protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyntax, TokenSet membersOperatorSet) {
+        PsiBuilder.Marker expr = builder.mark();
+        boolean isNew;
+
+        final IElementType type = builder.getTokenType();
+
+        if (type == JSTokenTypes.NEW_KEYWORD) {
+            isNew = true;
+            final boolean isfunction = parseNewExpression(builder);
+
+            if (isfunction) {
+                expr.done(JSElementTypes.NEW_EXPRESSION);
+                if (builder.getTokenType() != JSTokenTypes.LPAR) {
+                    return true;
+                }
+                expr = expr.precede();
+                isNew = false;
+            }
+        }
+        else {
+            isNew = false;
+            if (!parsePrimaryExpression(builder)) {
+                expr.drop();
+                return false;
+            }
+        }
+
+        boolean currentlyAllowCallSyntax = allowCallSyntax && (type != JSTokenTypes.LBRACE && type != JSTokenTypes.LBRACKET);
+
+        while (true) {
+            IElementType tokenType = builder.getTokenType();
+            if (membersOperatorSet.contains(tokenType)) {
+                currentlyAllowCallSyntax = allowCallSyntax;
+                builder.advanceLexer();
+
+                if (builder.getTokenType() == JSTokenTypes.AT) {
+                    builder.advanceLexer();
+                }
+
+                tokenType = builder.getTokenType();
+
+                if (tokenType == JSTokenTypes.LBRACKET || tokenType == JSTokenTypes.LPAR) {
+                    continue;
+                }
+
+                if (tokenType == JSTokenTypes.ANY_IDENTIFIER || isIdentifierToken(builder, tokenType)) {
+                    builder.advanceLexer();
+                }
+                else {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedName());
+                }
+
+                expr.done(JSElementTypes.REFERENCE_EXPRESSION);
+                expr = expr.precede();
+            }
+            else if (tokenType == JSTokenTypes.LBRACKET) {
+                builder.advanceLexer();
+                parseExpression(builder);
+                Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
+                expr.done(JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION);
+                expr = expr.precede();
+            }
+            else if (currentlyAllowCallSyntax && tokenType == JSTokenTypes.LPAR) {
+                parseArgumentList(builder);
+                expr.done(isNew ? JSElementTypes.NEW_EXPRESSION : JSElementTypes.CALL_EXPRESSION);
+                expr = expr.precede();
+                isNew = false;
+            }
+            else {
+                if (isNew) {
+                    expr.done(JSElementTypes.NEW_EXPRESSION);
+                }
+                else {
+                    expr.drop();
+                }
+                break;
+            }
+        }
+
+        return true;
+    }
+
+    public boolean parseQualifiedTypeName(PsiBuilder builder) {
+        return parseQualifiedTypeName(builder, false);
+    }
+
+    public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar) {
+        return parseQualifiedTypeName(builder, allowStar, DOT_SET);
+    }
+
+    public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, TokenSet separatorsSet) {
+        if (!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType())) {
+            return false;
+        }
+        PsiBuilder.Marker expr = builder.mark();
+        Parsing.buildTokenElement(JSElementTypes.REFERENCE_EXPRESSION, builder);
+
+        while (separatorsSet.contains(builder.getTokenType())) {
+            boolean stop = false;
+            builder.advanceLexer();
+
+            final IElementType tokenType = builder.getTokenType();
+            if (tokenType == JSTokenTypes.ANY_IDENTIFIER && allowStar) {
+                builder.advanceLexer();
+                stop = true;
+            }
+            else if (tokenType == JSTokenTypes.DEFAULT_KEYWORD
+                || (tokenType != JSTokenTypes.IDENTIFIER && JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(tokenType))) {
+                builder.advanceLexer(); // TODO: allow any keyword
+            }
+            else {
+                Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedName());
+            }
+            expr.done(JSElementTypes.REFERENCE_EXPRESSION);
+            expr = expr.precede();
+
+            if (stop) {
+                break;
+            }
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    protected boolean parseNewExpression(PsiBuilder builder) {
+        ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.NEW_KEYWORD);
+        builder.advanceLexer();
+
+        if (builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD) {
+            getFunctionParsing().parseFunctionExpression(builder);
+            return true;
+        }
+
+        if (!parseMemberExpression(builder, false)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+        }
+        return false;
+    }
+
+    protected void parseArgumentList(final PsiBuilder builder) {
+        ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
+        final PsiBuilder.Marker arglist = builder.mark();
+        builder.advanceLexer();
+        boolean first = true;
+        while (builder.getTokenType() != JSTokenTypes.RPAR) {
+            if (first) {
+                first = false;
+            }
+            else if (builder.getTokenType() == JSTokenTypes.COMMA) {
+                builder.advanceLexer();
+            }
+            else {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen());
+                break;
+            }
+            if (!parseAssignmentExpression(builder)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+        arglist.done(JSElementTypes.ARGUMENT_LIST);
+    }
+
+    public void parseExpression(PsiBuilder builder) {
+        if (!parseExpressionOptional(builder)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+        }
+    }
+
+    public boolean parseAssignmentExpressionNoIn(final PsiBuilder builder) {
+        return parseAssignmentExpression(builder, false);
+    }
+
+    public boolean parseAssignmentExpression(final PsiBuilder builder) {
+        return parseAssignmentExpression(builder, true);
+    }
+
+    private boolean parseAssignmentExpression(final PsiBuilder builder, boolean allowIn) {
+        final PsiBuilder.Marker expr = builder.mark();
+
+        if (JSTokenTypes.ASSIGNMENT_OPERATIONS.contains(builder.getTokenType()) && builder.getUserData(WITHIN_OBJECT_LITERAL_EXPRESSION) == null) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            builder.advanceLexer();
+            if (!parseAssignmentExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
+            return true;
+        }
+
+        final PsiBuilder.Marker definitionExpr = builder.mark();
+        if (!parseConditionalExpression(builder, allowIn)) {
+            definitionExpr.drop();
+            expr.drop();
+            return false;
+        }
+
+        if (JSTokenTypes.ASSIGNMENT_OPERATIONS.contains(builder.getTokenType())) {
+            definitionExpr.done(JSElementTypes.DEFINITION_EXPRESSION);
+            builder.advanceLexer();
+            if (!parseAssignmentExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
+        }
+        else {
+            definitionExpr.drop();
+            expr.drop();
+        }
+        return true;
+    }
+
+    private boolean parseConditionalExpression(final PsiBuilder builder, final boolean allowIn) {
+        final PsiBuilder.Marker expr = builder.mark();
+        if (!parseORExpression(builder, allowIn)) {
+            expr.drop();
+            return false;
+        }
+
+        final IElementType nextTokenType = builder.getTokenType();
+
+        if (nextTokenType == JSTokenTypes.QUEST) {
+            builder.advanceLexer();
+            if (!parseAssignmentExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
+            if (!parseAssignmentExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.CONDITIONAL_EXPRESSION);
+        }
+        else if (nextTokenType == JSTokenTypes.FOR_KEYWORD && builder.getUserData(WITHIN_ARRAY_LITERAL_EXPRESSION) != null) {
+            getStatementParsing().parseForLoopHeader(builder);      // TODO: make it more clear
+            expr.done(JSElementTypes.CONDITIONAL_EXPRESSION);
+        }
+        else {
+            expr.drop();
+        }
+        return true;
+    }
+
+    private boolean parseORExpression(final PsiBuilder builder, final boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseANDExpression(builder, allowIn)) {
+            expr.drop();
+            return false;
+        }
+
+        while (builder.getTokenType() == JSTokenTypes.OROR) {
+            builder.advanceLexer();
+            if (!parseANDExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseANDExpression(final PsiBuilder builder, final boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseBitwiseORExpression(builder, allowIn)) {
+            expr.drop();
+            return false;
+        }
+
+        while (builder.getTokenType() == JSTokenTypes.ANDAND) {
+            builder.advanceLexer();
+            if (!parseBitwiseORExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseBitwiseORExpression(final PsiBuilder builder, final boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseBitwiseXORExpression(builder, allowIn)) {
+            expr.drop();
+            return false;
+        }
+
+        while (builder.getTokenType() == JSTokenTypes.OR) {
+            builder.advanceLexer();
+            if (!parseBitwiseXORExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseBitwiseXORExpression(final PsiBuilder builder, final boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseBitwiseANDExpression(builder, allowIn)) {
+            expr.drop();
+            return false;
+        }
+
+        while (builder.getTokenType() == JSTokenTypes.XOR) {
+            builder.advanceLexer();
+            if (!parseBitwiseANDExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseBitwiseANDExpression(final PsiBuilder builder, final boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseEqualityExpression(builder, allowIn)) {
+            expr.drop();
+            return false;
+        }
+
+        while (builder.getTokenType() == JSTokenTypes.AND) {
+            builder.advanceLexer();
+            if (!parseEqualityExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseEqualityExpression(final PsiBuilder builder, final boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseRelationalExpression(builder, allowIn)) {
+            expr.drop();
+            return false;
+        }
+
+        while (JSTokenTypes.EQUALITY_OPERATIONS.contains(builder.getTokenType())) {
+            builder.advanceLexer();
+            if (!parseRelationalExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseRelationalExpression(final PsiBuilder builder, final boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseShiftExpression(builder)) {
+            expr.drop();
+            return false;
+        }
+        while (JSTokenTypes.RELATIONAL_OPERATIONS.contains(builder.getTokenType())
+            && (allowIn || builder.getTokenType() != JSTokenTypes.IN_KEYWORD)) {
+            builder.advanceLexer();
+            if (!parseShiftExpression(builder)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseShiftExpression(final PsiBuilder builder) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseAdditiveExpression(builder)) {
+            expr.drop();
+            return false;
+        }
+        while (JSTokenTypes.SHIFT_OPERATIONS.contains(builder.getTokenType())) {
+            builder.advanceLexer();
+            if (!parseAdditiveExpression(builder)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseAdditiveExpression(final PsiBuilder builder) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseMultiplicativeExpression(builder)) {
+            expr.drop();
+            return false;
+        }
+        while (JSTokenTypes.ADDITIVE_OPERATIONS.contains(builder.getTokenType())) {
+            builder.advanceLexer();
+            if (!parseMultiplicativeExpression(builder)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseIsAsExpression(final PsiBuilder builder) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseUnaryExpression(builder)) {
+            expr.drop();
+            return false;
+        }
+
+        while (builder.getTokenType() == JSTokenTypes.AS_KEYWORD || builder.getTokenType() == JSTokenTypes.IS_KEYWORD) {
+            builder.advanceLexer();
+            if (!parseUnaryExpression(builder)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    protected boolean parseMultiplicativeExpression(final PsiBuilder builder) {
+        return parseMultiplicativeExpression(builder, JSTokenTypes.MULTIPLICATIVE_OPERATIONS);
+    }
+
+    protected boolean parseMultiplicativeExpression(final PsiBuilder builder, TokenSet operatorSet) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseIsAsExpression(builder)) {
+            expr.drop();
+            return false;
+        }
+
+        while (operatorSet.contains(builder.getTokenType())) {
+            builder.advanceLexer();
+            if (!parseUnaryExpression(builder)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.BINARY_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+        return true;
+    }
+
+    private boolean parseUnaryExpression(final PsiBuilder builder) {
+        final IElementType tokenType = builder.getTokenType();
+        if (JSTokenTypes.UNARY_OPERATIONS.contains(tokenType)) {
+            final PsiBuilder.Marker expr = builder.mark();
+            builder.advanceLexer();
+            if (!parseUnaryExpression(builder)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+            expr.done(JSElementTypes.PREFIX_EXPRESSION);
+            return true;
+        }
+        else {
+            return parsePostfixExpression(builder);
+        }
+    }
+
+    private boolean parsePostfixExpression(PsiBuilder builder) {
+        final PsiBuilder.Marker expr = builder.mark();
+        if (!parseMemberExpression(builder, true)) {
+            expr.drop();
+            return false;
+        }
+
+        final IElementType tokenType = builder.getTokenType();
+        if (tokenType == JSTokenTypes.PLUSPLUS || tokenType == JSTokenTypes.MINUSMINUS) {
+            builder.advanceLexer();
+            expr.done(JSElementTypes.POSTFIX_EXPRESSION);
+        }
+        else {
+            expr.drop();
+        }
+        return true;
+    }
+
+    public boolean parseExpressionOptional(final PsiBuilder builder) {
+        return parseExpressionOptional(builder, true);
+    }
+
+    public boolean parseExpressionOptionalNoIn(final PsiBuilder builder) {
+        return parseExpressionOptional(builder, false);
+    }
+
+    public boolean parseExpressionOptional(final PsiBuilder builder, final boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
+        if (!parseAssignmentExpression(builder, allowIn)) {
+            expr.drop();
+            return false;
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.IN_KEYWORD) {
+            expr.done(JSElementTypes.DEFINITION_EXPRESSION);
+            return true;
+        }
+
+        while (builder.getTokenType() == JSTokenTypes.COMMA) {
+            builder.advanceLexer();
+            if (!parseAssignmentExpression(builder, allowIn)) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            }
+
+            expr.done(JSElementTypes.COMMA_EXPRESSION);
+            expr = expr.precede();
+        }
+
+        expr.drop();
+
+        return true;
+    }
+
+    public boolean tryParseType(final PsiBuilder builder) {
+        return false;
+    }
+
+    public boolean parseType(final PsiBuilder builder) {
+        final IElementType tokenType = builder.getTokenType();
+        if (JSDocumentationUtils.ourPrimitiveTypeFilter.contains(tokenType)) {
+            builder.advanceLexer();
+        }
+        else if (!parseQualifiedTypeName(builder)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
+        }
+        return true;
+    }
+
+    public boolean parseSimpleExpression(final PsiBuilder builder) {
+        if (!parseUnaryExpression(builder)) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index ecdc96e8..86f5b818 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -26,199 +26,162 @@
 /**
  * @author max
  */
-public class FunctionParsing extends Parsing
-{
-	public FunctionParsing(JavaScriptParsingContext context)
-	{
-		super(context);
-	}
-
-	public void parseFunctionExpression(PsiBuilder builder)
-	{
-		parseFunction(builder, true);
-	}
-
-	public void parseFunctionDeclaration(PsiBuilder builder)
-	{
-		parseFunction(builder, false);
-	}
-
-	private void parseFunction(PsiBuilder builder, boolean expressionContext)
-	{
-		parseFunctionNoMarker(builder, expressionContext, builder.mark());
-	}
-
-	public void parseFunctionNoMarker(final PsiBuilder builder, final boolean expressionContext, final @Nonnull PsiBuilder.Marker functionMarker)
-	{
-		if(builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			// function keyword may be ommited in context of get/set property definition
-			builder.advanceLexer();
-		}
-
-		// Function name
-
-		if(!expressionContext)
-		{
-			if(isContextKeyword(builder, JSTokenTypes.GET_KEYWORD))
-			{
-				advanceContextKeyword(builder, JSTokenTypes.GET_KEYWORD);
-			}
-			else if(isContextKeyword(builder, JSTokenTypes.SET_KEYWORD))
-			{
-				advanceContextKeyword(builder, JSTokenTypes.SET_KEYWORD);
-			}
-		}
-
-		if(isIdentifierName(builder, builder.getTokenType()))
-		{
-			getExpressionParsing().parseQualifiedTypeName(builder, false);
-		}
-		else
-		{
-			if(!expressionContext && builder.getTokenType() != JSTokenTypes.LPAR /*get/set as name*/)
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionName());
-			}
-		}
-
-		parseParameterList(builder);
-
-		getExpressionParsing().tryParseType(builder);
-
-		if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
-		{
-			builder.advanceLexer();
-		}
-		else
-		{
-			getStatementParsing().parseFunctionBody(builder);
-		}
-
-		functionMarker.done(expressionContext ? JSElementTypes.FUNCTION_EXPRESSION : JSElementTypes.FUNCTION_DECLARATION);
-	}
-
-	public void parseParameterList(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker parameterList;
-		if(builder.getTokenType() != JSTokenTypes.LPAR)
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-			parameterList = builder.mark(); // To have non-empty parameters list at all the time.
-			parameterList.done(JSElementTypes.PARAMETER_LIST);
-			return;
-		}
-		else
-		{
-			parameterList = builder.mark();
-			builder.advanceLexer();
-		}
-
-		boolean first = true;
-		while(builder.getTokenType() != JSTokenTypes.RPAR)
-		{
-			if(first)
-			{
-				first = false;
-			}
-			else
-			{
-				if(builder.getTokenType() == JSTokenTypes.COMMA)
-				{
-					builder.advanceLexer();
-				}
-				else
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen());
-					break;
-				}
-			}
-
-			parseParameter(builder, null);
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.RPAR)
-		{
-			builder.advanceLexer();
-		}
-
-		parameterList.done(JSElementTypes.PARAMETER_LIST);
-	}
-
-	public void parseParameter(@Nonnull PsiBuilder builder, @Nullable PsiBuilder.Marker parameterMarker)
-	{
-		if(parameterMarker == null)
-		{
-			parameterMarker = builder.mark();
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.DOT_DOT_DOT)
-		{
-			builder.advanceLexer();
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-		{
-			builder.advanceLexer();
-			getExpressionParsing().tryParseType(builder);
-			if(builder.getTokenType() == JSTokenTypes.EQ)
-			{
-				builder.advanceLexer();
-				getExpressionParsing().parseSimpleExpression(builder);
-			}
-			parameterMarker.done(JSElementTypes.FORMAL_PARAMETER);
-		}
-		else if(builder.getTokenType() == JSTokenTypes.LBRACE)
-		{
-			parseDeconstructionParameter(builder, parameterMarker);
-		}
-		else
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFormalParameterName());
-			parameterMarker.drop();
-		}
-	}
-
-	protected void parseDeconstructionParameter(PsiBuilder builder, PsiBuilder.Marker mark)
-	{
-		PsiBuilder.Marker desctructionObjectMarker = builder.mark();
-		builder.advanceLexer();
-
-		boolean first = true;
-		while(!builder.eof())
-		{
-			if(builder.getTokenType() == JSTokenTypes.RBRACE)
-			{
-				break;
-			}
-
-			if(!first)
-			{
-				Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
-			}
-
-			first = false;
-
-			if(isIdentifierToken(builder))
-			{
-				PsiBuilder.Marker propertyMarker = builder.mark();
-				PsiBuilder.Marker varMarker = builder.mark();
-				builder.advanceLexer();
-				varMarker.done(JSElementTypes.FORMAL_PARAMETER);
-				propertyMarker.done(JSElementTypes.DESTRUCTURING_SHORTHANDED_PROPERTY);
-			}
-			else
-			{
-				PsiBuilder.Marker err = builder.mark();
-				builder.advanceLexer();
-				err.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-			}
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
-
-		desctructionObjectMarker.done(JSElementTypes.DESTRUCTURING_OBJECT);
-
-		mark.done(JSElementTypes.DESTRUCTURING_PARAMETER);
-	}
+public class FunctionParsing extends Parsing {
+    public FunctionParsing(JavaScriptParsingContext context) {
+        super(context);
+    }
+
+    public void parseFunctionExpression(PsiBuilder builder) {
+        parseFunction(builder, true);
+    }
+
+    public void parseFunctionDeclaration(PsiBuilder builder) {
+        parseFunction(builder, false);
+    }
+
+    private void parseFunction(PsiBuilder builder, boolean expressionContext) {
+        parseFunctionNoMarker(builder, expressionContext, builder.mark());
+    }
+
+    public void parseFunctionNoMarker(
+        final PsiBuilder builder,
+        final boolean expressionContext,
+        final @Nonnull PsiBuilder.Marker functionMarker
+    ) {
+        if (builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD) {
+            // function keyword may be ommited in context of get/set property definition
+            builder.advanceLexer();
+        }
+
+        // Function name
+
+        if (!expressionContext) {
+            if (isContextKeyword(builder, JSTokenTypes.GET_KEYWORD)) {
+                advanceContextKeyword(builder, JSTokenTypes.GET_KEYWORD);
+            }
+            else if (isContextKeyword(builder, JSTokenTypes.SET_KEYWORD)) {
+                advanceContextKeyword(builder, JSTokenTypes.SET_KEYWORD);
+            }
+        }
+
+        if (isIdentifierName(builder, builder.getTokenType())) {
+            getExpressionParsing().parseQualifiedTypeName(builder, false);
+        }
+        else if (!expressionContext && builder.getTokenType() != JSTokenTypes.LPAR /*get/set as name*/) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFunctionName());
+        }
+
+        parseParameterList(builder);
+
+        getExpressionParsing().tryParseType(builder);
+
+        if (builder.getTokenType() == JSTokenTypes.SEMICOLON) {
+            builder.advanceLexer();
+        }
+        else {
+            getStatementParsing().parseFunctionBody(builder);
+        }
+
+        functionMarker.done(expressionContext ? JSElementTypes.FUNCTION_EXPRESSION : JSElementTypes.FUNCTION_DECLARATION);
+    }
+
+    public void parseParameterList(final PsiBuilder builder) {
+        final PsiBuilder.Marker parameterList;
+        if (builder.getTokenType() != JSTokenTypes.LPAR) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+            parameterList = builder.mark(); // To have non-empty parameters list at all the time.
+            parameterList.done(JSElementTypes.PARAMETER_LIST);
+            return;
+        }
+        else {
+            parameterList = builder.mark();
+            builder.advanceLexer();
+        }
+
+        boolean first = true;
+        while (builder.getTokenType() != JSTokenTypes.RPAR) {
+            if (first) {
+                first = false;
+            }
+            else if (builder.getTokenType() == JSTokenTypes.COMMA) {
+                builder.advanceLexer();
+            }
+            else {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCommaOrRparen());
+                break;
+            }
+
+            parseParameter(builder, null);
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.RPAR) {
+            builder.advanceLexer();
+        }
+
+        parameterList.done(JSElementTypes.PARAMETER_LIST);
+    }
+
+    public void parseParameter(@Nonnull PsiBuilder builder, @Nullable PsiBuilder.Marker parameterMarker) {
+        if (parameterMarker == null) {
+            parameterMarker = builder.mark();
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.DOT_DOT_DOT) {
+            builder.advanceLexer();
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+            builder.advanceLexer();
+            getExpressionParsing().tryParseType(builder);
+            if (builder.getTokenType() == JSTokenTypes.EQ) {
+                builder.advanceLexer();
+                getExpressionParsing().parseSimpleExpression(builder);
+            }
+            parameterMarker.done(JSElementTypes.FORMAL_PARAMETER);
+        }
+        else if (builder.getTokenType() == JSTokenTypes.LBRACE) {
+            parseDeconstructionParameter(builder, parameterMarker);
+        }
+        else {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedFormalParameterName());
+            parameterMarker.drop();
+        }
+    }
+
+    protected void parseDeconstructionParameter(PsiBuilder builder, PsiBuilder.Marker mark) {
+        PsiBuilder.Marker desctructionObjectMarker = builder.mark();
+        builder.advanceLexer();
+
+        boolean first = true;
+        while (!builder.eof()) {
+            if (builder.getTokenType() == JSTokenTypes.RBRACE) {
+                break;
+            }
+
+            if (!first) {
+                Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
+            }
+
+            first = false;
+
+            if (isIdentifierToken(builder)) {
+                PsiBuilder.Marker propertyMarker = builder.mark();
+                PsiBuilder.Marker varMarker = builder.mark();
+                builder.advanceLexer();
+                varMarker.done(JSElementTypes.FORMAL_PARAMETER);
+                propertyMarker.done(JSElementTypes.DESTRUCTURING_SHORTHANDED_PROPERTY);
+            }
+            else {
+                PsiBuilder.Marker err = builder.mark();
+                builder.advanceLexer();
+                err.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+            }
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
+
+        desctructionObjectMarker.done(JSElementTypes.DESTRUCTURING_OBJECT);
+
+        mark.done(JSElementTypes.DESTRUCTURING_PARAMETER);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index 2b20ad3d..ddc48296 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -18,302 +18,247 @@
 
 /**
  * @author VISTALL
- * @see XmlParsing
- * @see HtmlParsing
+ * @see consulo.xml.psi.impl.source.parsing.xml.XmlParsing
+ * @see consulo.xml.lang.html.HtmlParsing
  * @since 2019-12-17
  */
-public class JSXParser
-{
-	private final Stack<String> myTagNamesStack = new Stack<>();
-	private static final int BALANCING_DEPTH_THRESHOLD = 1000;
-
-	private PsiBuilder myBuilder;
-
-	public void setBuilder(PsiBuilder builder)
-	{
-		myBuilder = builder;
-	}
-
-	private PsiBuilder.Marker mark()
-	{
-		return myBuilder.mark();
-	}
-
-	private void advance()
-	{
-		myBuilder.advanceLexer();
-	}
-
-	private IElementType token()
-	{
-		return myBuilder.getTokenType();
-	}
-
-	private void error(LocalizeValue error)
-	{
-		myBuilder.error(error);
-	}
-
-	private boolean eof()
-	{
-		return myBuilder.eof();
-	}
-
-	@Nullable
-	private String parseTagHeader(final boolean multipleRootTagError, final PsiBuilder.Marker tag)
-	{
-		if(multipleRootTagError)
-		{
-			final PsiBuilder.Marker error = mark();
-			advance();
-			error.error(XmlErrorLocalize.xmlParsingMultipleRootTags());
-		}
-		else
-		{
-			advance();
-		}
-
-		final String tagName;
-		if(token() != JSTokenTypes.XML_NAME || myBuilder.rawLookup(-1) == TokenType.WHITE_SPACE)
-		{
-			error(XmlErrorLocalize.xmlParsingTagNameExpected());
-			tagName = "";
-		}
-		else
-		{
-			tagName = myBuilder.getTokenText();
-			assert tagName != null;
-			advance();
-		}
-		myTagNamesStack.push(tagName);
-
-		do
-		{
-			final IElementType tt = token();
-			if(tt == JSTokenTypes.XML_NAME)
-			{
-				parseAttribute();
-			}
-			else if(tt == JSTokenTypes.XML_JS_SCRIPT)
-			{
-				advance();
-			}
-			else
-			{
-				break;
-			}
-		}
-		while(true);
-
-		if(token() == XmlTokenType.XML_EMPTY_ELEMENT_END)
-		{
-			advance();
-			myTagNamesStack.pop();
-			tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
-			return null;
-		}
-
-		if(token() == JSTokenTypes.XML_TAG_END)
-		{
-			advance();
-		}
-		else
-		{
-			error(XmlErrorLocalize.tagStartIsNotClosed());
-			myTagNamesStack.pop();
-			tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
-			return null;
-		}
-
-		if(myTagNamesStack.size() > BALANCING_DEPTH_THRESHOLD)
-		{
-			error(XmlErrorLocalize.wayTooUnbalanced());
-			tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
-			return null;
-		}
-
-		return tagName;
-	}
-
-
-	private void parseAttribute()
-	{
-		assert token() == XmlTokenType.XML_NAME;
-		final PsiBuilder.Marker att = mark();
-		advance();
-		if(token() == XmlTokenType.XML_EQ)
-		{
-			advance();
-			parseAttributeValue();
-		}
-		att.done(XmlElementType.XML_ATTRIBUTE);
-	}
-
-	private void parseAttributeValue()
-	{
-		final PsiBuilder.Marker attValue = mark();
-		if(token() == XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER)
-		{
-			while(true)
-			{
-				final IElementType tt = token();
-				if(tt == null || tt == XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER || tt == XmlTokenType.XML_END_TAG_START || tt == XmlTokenType.XML_EMPTY_ELEMENT_END ||
-						tt == JSTokenTypes.XML_START_TAG_START)
-				{
-					break;
-				}
-
-				if(tt == JSTokenTypes.BAD_CHARACTER)
-				{
-					final PsiBuilder.Marker error = mark();
-					advance();
-					error.error(XmlErrorLocalize.unescapedAmpersandOrNonterminatedCharacterEntityReference());
-				}
-				else
-				{
-					advance();
-				}
-			}
-
-			if(token() == XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER)
-			{
-				advance();
-			}
-			else
-			{
-				error(XmlErrorLocalize.xmlParsingUnclosedAttributeValue());
-			}
-		}
-		else if(token() == JSTokenTypes.XML_JS_SCRIPT)
-		{
-			advance();
-		}
-		else
-		{
-			if(token() != XmlTokenType.XML_TAG_END && token() != XmlTokenType.XML_EMPTY_ELEMENT_END)
-			{
-				advance(); // Single token att value
-			}
-		}
-
-		attValue.done(XmlElementType.XML_ATTRIBUTE_VALUE);
-	}
-
-	public void parseTagContent()
-	{
-		PsiBuilder.Marker xmlText = null;
-		while(true)
-		{
-			final IElementType tt = token();
-			if(tt == null || tt == XmlTokenType.XML_END_TAG_START)
-			{
-				break;
-			}
-
-			if(tt == JSTokenTypes.XML_START_TAG_START)
-			{
-				xmlText = terminateText(xmlText);
-				parseTag(false);
-			}
-			else if(tt == JSTokenTypes.BAD_CHARACTER)
-			{
-				xmlText = startText(xmlText);
-				final PsiBuilder.Marker error = mark();
-				advance();
-				error.error(XmlErrorLocalize.unescapedAmpersandOrNonterminatedCharacterEntityReference());
-			}
-			else if(tt instanceof ICustomParsingType || tt instanceof ILazyParseableElementType)
-			{
-				xmlText = terminateText(xmlText);
-				advance();
-			}
-			else
-			{
-				xmlText = startText(xmlText);
-				advance();
-			}
-		}
-
-		terminateText(xmlText);
-	}
-
-	@Nullable
-	private static PsiBuilder.Marker terminateText(@Nullable PsiBuilder.Marker xmlText)
-	{
-		if(xmlText != null)
-		{
-			xmlText.done(XmlElementType.XML_TEXT);
-		}
-		return null;
-	}
-
-	@Nonnull
-	private PsiBuilder.Marker startText(@Nullable PsiBuilder.Marker xmlText)
-	{
-		if(xmlText == null)
-		{
-			xmlText = mark();
-		}
-		return xmlText;
-	}
-
-	protected void parseTag(boolean multipleRootTagError)
-	{
-		assert token() == JSTokenTypes.XML_START_TAG_START : "Tag start expected";
-		final PsiBuilder.Marker tag = mark();
-
-		final String tagName = parseTagHeader(multipleRootTagError, tag);
-		if(tagName == null)
-		{
-			return;
-		}
-
-		final PsiBuilder.Marker content = mark();
-		parseTagContent();
-
-		if(token() == JSTokenTypes.XML_END_TAG_START)
-		{
-			final PsiBuilder.Marker footer = mark();
-			advance();
-
-			if(token() == JSTokenTypes.XML_NAME)
-			{
-				String endName = myBuilder.getTokenText();
-				if(!tagName.equals(endName) && myTagNamesStack.contains(endName))
-				{
-					footer.rollbackTo();
-					myTagNamesStack.pop();
-					tag.doneBefore(JSElementTypes.XML_LITERAL_EXPRESSION, content, XmlErrorLocalize.namedElementIsNotClosed(tagName));
-					content.drop();
-					return;
-				}
-
-				advance();
-			}
-			footer.drop();
-
-			while(token() != XmlTokenType.XML_TAG_END && token() != XmlTokenType.XML_START_TAG_START && token() != XmlTokenType.XML_END_TAG_START && !eof())
-			{
-				error(XmlErrorLocalize.xmlParsingUnexpectedToken());
-				advance();
-			}
-
-			if(token() == JSTokenTypes.XML_TAG_END)
-			{
-				advance();
-			}
-			else
-			{
-				error(XmlErrorLocalize.xmlParsingClosingTagIsNotDone());
-			}
-		}
-		else
-		{
-			error(XmlErrorLocalize.xmlParsingUnexpectedEndOfFile());
-		}
-
-		content.drop();
-		myTagNamesStack.pop();
-		tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
-	}
+public class JSXParser {
+    private final Stack<String> myTagNamesStack = new Stack<>();
+    private static final int BALANCING_DEPTH_THRESHOLD = 1000;
+
+    private PsiBuilder myBuilder;
+
+    public void setBuilder(PsiBuilder builder) {
+        myBuilder = builder;
+    }
+
+    private PsiBuilder.Marker mark() {
+        return myBuilder.mark();
+    }
+
+    private void advance() {
+        myBuilder.advanceLexer();
+    }
+
+    private IElementType token() {
+        return myBuilder.getTokenType();
+    }
+
+    private void error(LocalizeValue error) {
+        myBuilder.error(error);
+    }
+
+    private boolean eof() {
+        return myBuilder.eof();
+    }
+
+    @Nullable
+    private String parseTagHeader(final boolean multipleRootTagError, final PsiBuilder.Marker tag) {
+        if (multipleRootTagError) {
+            final PsiBuilder.Marker error = mark();
+            advance();
+            error.error(XmlErrorLocalize.xmlParsingMultipleRootTags());
+        }
+        else {
+            advance();
+        }
+
+        final String tagName;
+        if (token() != JSTokenTypes.XML_NAME || myBuilder.rawLookup(-1) == TokenType.WHITE_SPACE) {
+            error(XmlErrorLocalize.xmlParsingTagNameExpected());
+            tagName = "";
+        }
+        else {
+            tagName = myBuilder.getTokenText();
+            assert tagName != null;
+            advance();
+        }
+        myTagNamesStack.push(tagName);
+
+        do {
+            final IElementType tt = token();
+            if (tt == JSTokenTypes.XML_NAME) {
+                parseAttribute();
+            }
+            else if (tt == JSTokenTypes.XML_JS_SCRIPT) {
+                advance();
+            }
+            else {
+                break;
+            }
+        }
+        while (true);
+
+        if (token() == XmlTokenType.XML_EMPTY_ELEMENT_END) {
+            advance();
+            myTagNamesStack.pop();
+            tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
+            return null;
+        }
+
+        if (token() == JSTokenTypes.XML_TAG_END) {
+            advance();
+        }
+        else {
+            error(XmlErrorLocalize.tagStartIsNotClosed());
+            myTagNamesStack.pop();
+            tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
+            return null;
+        }
+
+        if (myTagNamesStack.size() > BALANCING_DEPTH_THRESHOLD) {
+            error(XmlErrorLocalize.wayTooUnbalanced());
+            tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
+            return null;
+        }
+
+        return tagName;
+    }
+
+    private void parseAttribute() {
+        assert token() == XmlTokenType.XML_NAME;
+        final PsiBuilder.Marker att = mark();
+        advance();
+        if (token() == XmlTokenType.XML_EQ) {
+            advance();
+            parseAttributeValue();
+        }
+        att.done(XmlElementType.XML_ATTRIBUTE);
+    }
+
+    private void parseAttributeValue() {
+        final PsiBuilder.Marker attValue = mark();
+        if (token() == XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER) {
+            while (true) {
+                final IElementType tt = token();
+                if (tt == null || tt == XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER || tt == XmlTokenType.XML_END_TAG_START
+                    || tt == XmlTokenType.XML_EMPTY_ELEMENT_END || tt == JSTokenTypes.XML_START_TAG_START) {
+                    break;
+                }
+
+                if (tt == JSTokenTypes.BAD_CHARACTER) {
+                    final PsiBuilder.Marker error = mark();
+                    advance();
+                    error.error(XmlErrorLocalize.unescapedAmpersandOrNonterminatedCharacterEntityReference());
+                }
+                else {
+                    advance();
+                }
+            }
+
+            if (token() == XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER) {
+                advance();
+            }
+            else {
+                error(XmlErrorLocalize.xmlParsingUnclosedAttributeValue());
+            }
+        }
+        else if (token() == JSTokenTypes.XML_JS_SCRIPT) {
+            advance();
+        }
+        else if (token() != XmlTokenType.XML_TAG_END && token() != XmlTokenType.XML_EMPTY_ELEMENT_END) {
+            advance(); // Single token att value
+        }
+
+        attValue.done(XmlElementType.XML_ATTRIBUTE_VALUE);
+    }
+
+    public void parseTagContent() {
+        PsiBuilder.Marker xmlText = null;
+        while (true) {
+            final IElementType tt = token();
+            if (tt == null || tt == XmlTokenType.XML_END_TAG_START) {
+                break;
+            }
+
+            if (tt == JSTokenTypes.XML_START_TAG_START) {
+                xmlText = terminateText(xmlText);
+                parseTag(false);
+            }
+            else if (tt == JSTokenTypes.BAD_CHARACTER) {
+                xmlText = startText(xmlText);
+                final PsiBuilder.Marker error = mark();
+                advance();
+                error.error(XmlErrorLocalize.unescapedAmpersandOrNonterminatedCharacterEntityReference());
+            }
+            else if (tt instanceof ICustomParsingType || tt instanceof ILazyParseableElementType) {
+                xmlText = terminateText(xmlText);
+                advance();
+            }
+            else {
+                xmlText = startText(xmlText);
+                advance();
+            }
+        }
+
+        terminateText(xmlText);
+    }
+
+    @Nullable
+    private static PsiBuilder.Marker terminateText(@Nullable PsiBuilder.Marker xmlText) {
+        if (xmlText != null) {
+            xmlText.done(XmlElementType.XML_TEXT);
+        }
+        return null;
+    }
+
+    @Nonnull
+    private PsiBuilder.Marker startText(@Nullable PsiBuilder.Marker xmlText) {
+        if (xmlText == null) {
+            xmlText = mark();
+        }
+        return xmlText;
+    }
+
+    protected void parseTag(boolean multipleRootTagError) {
+        assert token() == JSTokenTypes.XML_START_TAG_START : "Tag start expected";
+        final PsiBuilder.Marker tag = mark();
+
+        final String tagName = parseTagHeader(multipleRootTagError, tag);
+        if (tagName == null) {
+            return;
+        }
+
+        final PsiBuilder.Marker content = mark();
+        parseTagContent();
+
+        if (token() == JSTokenTypes.XML_END_TAG_START) {
+            final PsiBuilder.Marker footer = mark();
+            advance();
+
+            if (token() == JSTokenTypes.XML_NAME) {
+                String endName = myBuilder.getTokenText();
+                if (!tagName.equals(endName) && myTagNamesStack.contains(endName)) {
+                    footer.rollbackTo();
+                    myTagNamesStack.pop();
+                    tag.doneBefore(JSElementTypes.XML_LITERAL_EXPRESSION, content, XmlErrorLocalize.namedElementIsNotClosed(tagName));
+                    content.drop();
+                    return;
+                }
+
+                advance();
+            }
+            footer.drop();
+
+            while (token() != XmlTokenType.XML_TAG_END && token() != XmlTokenType.XML_START_TAG_START
+                && token() != XmlTokenType.XML_END_TAG_START && !eof()) {
+                error(XmlErrorLocalize.xmlParsingUnexpectedToken());
+                advance();
+            }
+
+            if (token() == JSTokenTypes.XML_TAG_END) {
+                advance();
+            }
+            else {
+                error(XmlErrorLocalize.xmlParsingClosingTagIsNotDone());
+            }
+        }
+        else {
+            error(XmlErrorLocalize.xmlParsingUnexpectedEndOfFile());
+        }
+
+        content.drop();
+        myTagNamesStack.pop();
+        tag.done(JSElementTypes.XML_LITERAL_EXPRESSION);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
index 4e8008b2..a7094490 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
@@ -12,34 +12,29 @@
  * @author VISTALL
  * @since 24.08.14
  */
-public class JavaScriptParser implements PsiParser
-{
-	@Nonnull
-	@Override
-	public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder originalBuilder, @Nonnull LanguageVersion languageVersion)
-	{
-		JavaScriptParsingContext parsingContext = createParsingContext();
+public class JavaScriptParser implements PsiParser {
+    @Nonnull
+    @Override
+    public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder originalBuilder, @Nonnull LanguageVersion languageVersion) {
+        JavaScriptParsingContext parsingContext = createParsingContext();
 
-		JavaScriptParserBuilder builder = createBuilder(originalBuilder);
+        JavaScriptParserBuilder builder = createBuilder(originalBuilder);
 
-		final PsiBuilder.Marker rootMarker = builder.mark();
-		while(!builder.eof())
-		{
-			parsingContext.getStatementParsing().parseSourceElement(builder);
-		}
-		rootMarker.done(root);
-		return builder.getTreeBuilt();
-	}
+        final PsiBuilder.Marker rootMarker = builder.mark();
+        while (!builder.eof()) {
+            parsingContext.getStatementParsing().parseSourceElement(builder);
+        }
+        rootMarker.done(root);
+        return builder.getTreeBuilt();
+    }
 
-	@Nonnull
-	public JavaScriptParserBuilder createBuilder(PsiBuilder builder)
-	{
-		return new JavaScriptParserBuilder(builder);
-	}
+    @Nonnull
+    public JavaScriptParserBuilder createBuilder(PsiBuilder builder) {
+        return new JavaScriptParserBuilder(builder);
+    }
 
-	@Nonnull
-	public JavaScriptParsingContext createParsingContext()
-	{
-		return new JavaScriptParsingContext();
-	}
+    @Nonnull
+    public JavaScriptParsingContext createParsingContext() {
+        return new JavaScriptParsingContext();
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
index 9dce2832..8d95f0fc 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParserBuilder.java
@@ -7,10 +7,8 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public class JavaScriptParserBuilder extends PsiBuilderAdapter
-{
-	public JavaScriptParserBuilder(PsiBuilder delegate)
-	{
-		super(delegate);
-	}
+public class JavaScriptParserBuilder extends PsiBuilderAdapter {
+    public JavaScriptParserBuilder(PsiBuilder delegate) {
+        super(delegate);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
index 0a0dd819..1a726ad2 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
@@ -9,72 +9,60 @@
  * @author VISTALL
  * @since 29.08.13.
  */
-public class JavaScriptParsingContext
-{
-	private final ExpressionParsing myExpressionParsing;
-	private final StatementParsing myStatementParsing;
-	private final FunctionParsing myFunctionParsing;
+public class JavaScriptParsingContext {
+    private final ExpressionParsing myExpressionParsing;
+    private final StatementParsing myStatementParsing;
+    private final FunctionParsing myFunctionParsing;
 
-	public JavaScriptParsingContext()
-	{
-		myExpressionParsing = createExpressionParsing();
-		myStatementParsing = createStatementParsing();
-		myFunctionParsing = createFunctionParsing();
-	}
+    public JavaScriptParsingContext() {
+        myExpressionParsing = createExpressionParsing();
+        myStatementParsing = createStatementParsing();
+        myFunctionParsing = createFunctionParsing();
+    }
 
-	public boolean isIdentifierToken(PsiBuilder builder, IElementType tokenType)
-	{
-		if(isIdentifierName(builder, tokenType))
-		{
-			return true;
-		}
+    public boolean isIdentifierToken(PsiBuilder builder, IElementType tokenType) {
+        if (isIdentifierName(builder, tokenType)) {
+            return true;
+        }
 
-		if(JSTokenTypes.KEYWORDS.contains(tokenType))
-		{
-			builder.remapCurrentToken(JSTokenTypes.IDENTIFIER);
-			return true;
-		}
-		return false;
-	}
+        if (JSTokenTypes.KEYWORDS.contains(tokenType)) {
+            builder.remapCurrentToken(JSTokenTypes.IDENTIFIER);
+            return true;
+        }
+        return false;
+    }
 
-	public boolean isIdentifierName(PsiBuilder builder, IElementType tokenType)
-	{
-		return JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(tokenType);
-	}
+    public boolean isIdentifierName(PsiBuilder builder, IElementType tokenType) {
+        return JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(tokenType);
+    }
 
-	@Nonnull
-	protected FunctionParsing createFunctionParsing()
-	{
-		return new FunctionParsing(this);
-	}
+    @Nonnull
+    protected FunctionParsing createFunctionParsing() {
+        return new FunctionParsing(this);
+    }
 
-	@Nonnull
-	protected StatementParsing createStatementParsing()
-	{
-		return new StatementParsing(this);
-	}
+    @Nonnull
+    protected StatementParsing createStatementParsing() {
+        return new StatementParsing(this);
+    }
 
-	@Nonnull
-	protected ExpressionParsing createExpressionParsing()
-	{
-		return new ExpressionParsing(this);
-	}
+    @Nonnull
+    protected ExpressionParsing createExpressionParsing() {
+        return new ExpressionParsing(this);
+    }
 
-	@Nonnull
-	public FunctionParsing getFunctionParsing()
-	{
-		return myFunctionParsing;
-	}
+    @Nonnull
+    public FunctionParsing getFunctionParsing() {
+        return myFunctionParsing;
+    }
 
-	@Nonnull
-	public ExpressionParsing getExpressionParsing()
-	{
-		return myExpressionParsing;
-	}
+    @Nonnull
+    public ExpressionParsing getExpressionParsing() {
+        return myExpressionParsing;
+    }
 
-	@Nonnull
-	public StatementParsing getStatementParsing()
-	{
-		return myStatementParsing;
-	}
+    @Nonnull
+    public StatementParsing getStatementParsing() {
+        return myStatementParsing;
+    }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index e20f1062..c5669e89 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -32,125 +32,99 @@
  * Date: Jan 28, 2005
  * Time: 7:03:42 PM
  */
-public class Parsing<C extends JavaScriptParsingContext>
-{
-	private C myContext;
-
-	public Parsing(C context)
-	{
-		myContext = context;
-	}
-
-	public boolean isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType)
-	{
-		if (builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-		{
-			IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
-			if (contextKeywordElementType == null)
-			{
-				return false;
-			}
-			if (elementType == contextKeywordElementType)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Nullable
-	public IElementType isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
-	{
-		if (builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-		{
-			IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
-			if (contextKeywordElementType == null)
-			{
-				return null;
-			}
-			if (tokenSet.contains(contextKeywordElementType))
-			{
-				return contextKeywordElementType;
-			}
-		}
-		return null;
-	}
-
-	public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType)
-	{
-		if(isContextKeyword(builder, elementType))
-		{
-			if(builder instanceof JavaScriptStrictParserBuilder)
-			{
-				((JavaScriptStrictParserBuilder) builder).disableNonStrictRemap(builder.getCurrentOffset());
-			}
-			builder.remapCurrentToken(elementType);
-			builder.advanceLexer();
-		}
-	}
-
-	public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet)
-	{
-		IElementType elementType = isContextKeyword(builder, tokenSet);
-		if (elementType != null)
-		{
-			if (builder instanceof JavaScriptStrictParserBuilder strictParserBuilder)
-			{
-				strictParserBuilder.disableNonStrictRemap(builder.getCurrentOffset());
-			}
-			builder.remapCurrentToken(elementType);
-			builder.advanceLexer();
-		}
-	}
-
-	public FunctionParsing getFunctionParsing()
-	{
-		return myContext.getFunctionParsing();
-	}
-
-	public StatementParsing getStatementParsing()
-	{
-		return myContext.getStatementParsing();
-	}
-
-	public ExpressionParsing getExpressionParsing()
-	{
-		return myContext.getExpressionParsing();
-	}
-
-	public static void buildTokenElement(IElementType type, PsiBuilder builder)
-	{
-		final PsiBuilder.Marker marker = builder.mark();
-		builder.advanceLexer();
-		marker.done(type);
-	}
-
-	public static boolean checkMatches(final PsiBuilder builder, final IElementType token, final LocalizeValue message)
-	{
-		if (builder.getTokenType() == token)
-		{
-			builder.advanceLexer();
-			return true;
-		}
-		else
-		{
-			builder.error(message);
-			return false;
-		}
-	}
-
-	public boolean isIdentifierToken(PsiBuilder builder, IElementType tokenType)
-	{
-		return myContext.isIdentifierToken(builder, tokenType);
-	}
-
-	public boolean isIdentifierToken(PsiBuilder builder)
-	{
-		return myContext.isIdentifierName(builder, builder.getTokenType());
-	}
-
-	public boolean isIdentifierName(PsiBuilder builder, IElementType tokenType)
-	{
-		return myContext.isIdentifierName(builder, tokenType);
-	}
+public class Parsing<C extends JavaScriptParsingContext> {
+    private C myContext;
+
+    public Parsing(C context) {
+        myContext = context;
+    }
+
+    public boolean isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType) {
+        if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+            IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
+            if (contextKeywordElementType == null) {
+                return false;
+            }
+            if (elementType == contextKeywordElementType) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Nullable
+    public IElementType isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet) {
+        if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+            IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
+            if (contextKeywordElementType == null) {
+                return null;
+            }
+            if (tokenSet.contains(contextKeywordElementType)) {
+                return contextKeywordElementType;
+            }
+        }
+        return null;
+    }
+
+    public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType) {
+        if (isContextKeyword(builder, elementType)) {
+            if (builder instanceof JavaScriptStrictParserBuilder parserBuilder) {
+                parserBuilder.disableNonStrictRemap(builder.getCurrentOffset());
+            }
+            builder.remapCurrentToken(elementType);
+            builder.advanceLexer();
+        }
+    }
+
+    public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet) {
+        IElementType elementType = isContextKeyword(builder, tokenSet);
+        if (elementType != null) {
+            if (builder instanceof JavaScriptStrictParserBuilder strictParserBuilder) {
+                strictParserBuilder.disableNonStrictRemap(builder.getCurrentOffset());
+            }
+            builder.remapCurrentToken(elementType);
+            builder.advanceLexer();
+        }
+    }
+
+    public FunctionParsing getFunctionParsing() {
+        return myContext.getFunctionParsing();
+    }
+
+    public StatementParsing getStatementParsing() {
+        return myContext.getStatementParsing();
+    }
+
+    public ExpressionParsing getExpressionParsing() {
+        return myContext.getExpressionParsing();
+    }
+
+    public static void buildTokenElement(IElementType type, PsiBuilder builder) {
+        final PsiBuilder.Marker marker = builder.mark();
+        builder.advanceLexer();
+        marker.done(type);
+    }
+
+    public static boolean checkMatches(final PsiBuilder builder, final IElementType token, final LocalizeValue message) {
+        if (builder.getTokenType() == token) {
+            builder.advanceLexer();
+            return true;
+        }
+        else {
+            builder.error(message);
+            return false;
+        }
+    }
+
+    public boolean isIdentifierToken(PsiBuilder builder, IElementType tokenType) {
+        return myContext.isIdentifierToken(builder, tokenType);
+    }
+
+    public boolean isIdentifierToken(PsiBuilder builder) {
+        return myContext.isIdentifierName(builder, builder.getTokenType());
+    }
+
+    public boolean isIdentifierName(PsiBuilder builder, IElementType tokenType) {
+        return myContext.isIdentifierName(builder, tokenType);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 190a687d..a72bb175 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -28,853 +28,722 @@
 /**
  * @author max
  */
-public class StatementParsing extends Parsing
-{
-	private static final Logger LOG = Logger.getInstance(StatementParsing.class);
-
-	public StatementParsing(JavaScriptParsingContext context)
-	{
-		super(context);
-	}
-
-	public void parseSourceElement(PsiBuilder builder)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		if(tokenType == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			getFunctionParsing().parseFunctionDeclaration(builder);
-		}
-		else
-		{
-			parseStatement(builder);
-		}
-	}
-
-	private void parsePackageBodyStatement(PsiBuilder builder)
-	{
-		doParseStatement(builder, true);
-	}
-
-	public void parseStatement(PsiBuilder builder)
-	{
-		doParseStatement(builder, false);
-	}
-
-	protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses)
-	{
-		final IElementType firstToken = builder.getTokenType();
-
-		if(firstToken == null)
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.LBRACE)
-		{
-			parseBlock(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.VAR_KEYWORD ||
-				firstToken == JSTokenTypes.CONST_KEYWORD ||
-				firstToken == JSTokenTypes.LET_KEYWORD)
-		{
-			parseVarStatement(builder, false);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.SEMICOLON)
-		{
-			parseEmptyStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.IF_KEYWORD)
-		{
-			parseIfStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.DO_KEYWORD ||
-				firstToken == JSTokenTypes.WHILE_KEYWORD ||
-				firstToken == JSTokenTypes.FOR_KEYWORD)
-		{
-			parseIterationStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.CONTINUE_KEYWORD)
-		{
-			parseContinueStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.BREAK_KEYWORD)
-		{
-			parseBreakStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.RETURN_KEYWORD)
-		{
-			parseReturnStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.WITH_KEYWORD)
-		{
-			parseWithStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.YIELD_KEYWORD)
-		{
-			parseYieldStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.LET_KEYWORD)
-		{
-			parseLetStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.SWITCH_KEYWORD)
-		{
-			parseSwitchStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.THROW_KEYWORD)
-		{
-			parseThrowStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.TRY_KEYWORD)
-		{
-			parseTryStatement(builder);
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			getFunctionParsing().parseFunctionDeclaration(builder);
-			return;
-		}
-
-		if(doParseStatementSub(builder, canHaveClasses))
-		{
-			return;
-		}
-
-		if(firstToken == JSTokenTypes.IDENTIFIER)
-		{
-			// Try labeled statement:
-			final PsiBuilder.Marker labeledStatement = builder.mark();
-			builder.advanceLexer();
-			if(builder.getTokenType() == JSTokenTypes.COLON)
-			{
-				builder.advanceLexer();
-				parseStatement(builder);
-				labeledStatement.done(JSElementTypes.LABELED_STATEMENT);
-				return;
-			}
-			else
-			{
-				labeledStatement.rollbackTo();
-			}
-		}
-
-		if(firstToken != JSTokenTypes.LBRACE && firstToken != JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			if(parseExpressionStatement(builder))
-			{
-				return;
-			}
-		}
-
-		builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
-		builder.advanceLexer();
-	}
-
-	protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses)
-	{
-		return false;
-	}
-
-	protected boolean parseExpressionStatement(PsiBuilder builder)
-	{
-		// Try expression statement
-		final PsiBuilder.Marker exprStatement = builder.mark();
-		if(getExpressionParsing().parseExpressionOptional(builder))
-		{
-			checkForSemicolon(builder);
-			exprStatement.done(JSElementTypes.EXPRESSION_STATEMENT);
-			return true;
-		}
-		else
-		{
-			exprStatement.drop();
-		}
-		return false;
-	}
-
-	protected void parseYieldStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.YIELD_KEYWORD);
-		final PsiBuilder.Marker marker = builder.mark();
-		builder.advanceLexer();
-
-		getExpressionParsing().parseExpressionOptional(builder);
-		checkForSemicolon(builder);
-		marker.done(JSElementTypes.YIELD_STATEMENT);
-	}
-
-	protected void parseLetStatement(final PsiBuilder builder)
-	{
-		final PsiBuilder.Marker marker = parseLetExpressionStart(builder);
-
-		parseBlock(builder);
-		marker.done(JSElementTypes.LET_STATEMENT);
-	}
-
-	PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LET_KEYWORD);
-		final PsiBuilder.Marker marker = builder.mark();
-		builder.advanceLexer();
-
-		if(builder.getTokenType() == JSTokenTypes.LPAR)
-		{
-			builder.advanceLexer();
-
-			if(getExpressionParsing().parseAssignmentExpression(builder))
-			{
-				while(builder.getTokenType() == JSTokenTypes.COMMA)
-				{
-					builder.advanceLexer();
-					if(!getExpressionParsing().parseAssignmentExpression(builder))
-					{
-						break;
-					}
-				}
-			}
-			Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-		}
-		return marker;
-	}
-
-
-	public void parseIncludeDirective(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
-		final PsiBuilder.Marker useNSStatement = builder.mark();
-		builder.advanceLexer();
-		Parsing.checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral());
-		checkForSemicolon(builder);
-
-		useNSStatement.done(JSElementTypes.INCLUDE_DIRECTIVE);
-	}
-
-	protected void parseTryStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.TRY_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-		builder.advanceLexer();
-		parseBlock(builder);
-
-		while(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD)
-		{
-			parseCatchBlock(builder);
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.FINALLY_KEYWORD)
-		{
-			builder.advanceLexer();
-			parseBlock(builder);
-		}
-
-		statement.done(JSElementTypes.TRY_STATEMENT);
-	}
-
-	private void parseCatchBlock(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
-		final PsiBuilder.Marker block = builder.mark();
-		builder.advanceLexer();
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-
-		final IElementType identifierType = builder.getTokenType();
-
-		if(JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(identifierType))
-		{
-			final PsiBuilder.Marker param = builder.mark();
-			builder.advanceLexer();
-
-			if(!getExpressionParsing().tryParseType(builder))
-			{
-				if(builder.getTokenType() == JSTokenTypes.IF_KEYWORD)
-				{
-					builder.advanceLexer();
-					Parsing.checkMatches(builder, identifierType, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-					Parsing.checkMatches(builder, JSTokenTypes.INSTANCEOF_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedInstanceof());
-					Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-				}
-			}
-			param.done(JSElementTypes.FORMAL_PARAMETER);
-		}
-		else
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedParameterName());
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-
-		parseBlock(builder);
-
-		block.done(JSElementTypes.CATCH_BLOCK);
-	}
-
-	protected void parseThrowStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.THROW_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-		builder.advanceLexer();
-
-		getExpressionParsing().parseExpressionOptional(builder);
-
-		checkForSemicolon(builder);
-		statement.done(JSElementTypes.THROW_STATEMENT);
-	}
-
-	protected void parseSwitchStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.SWITCH_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-		builder.advanceLexer();
-
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-
-		Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
-		while(builder.getTokenType() != JSTokenTypes.RBRACE)
-		{
-			if(builder.eof())
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageUnexpectedEndOfFile());
-				statement.done(JSElementTypes.SWITCH_STATEMENT);
-				return;
-			}
-			parseCaseOrDefaultClause(builder);
-		}
-
-		builder.advanceLexer();
-		statement.done(JSElementTypes.SWITCH_STATEMENT);
-	}
-
-	private void parseCaseOrDefaultClause(final PsiBuilder builder)
-	{
-		final IElementType firstToken = builder.getTokenType();
-		final PsiBuilder.Marker clause = builder.mark();
-		if(firstToken != JSTokenTypes.CASE_KEYWORD && firstToken != JSTokenTypes.DEFAULT_KEYWORD)
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCatchOrDefault());
-		}
-		builder.advanceLexer();
-		if(firstToken == JSTokenTypes.CASE_KEYWORD)
-		{
-			getExpressionParsing().parseExpression(builder);
-		}
-		Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
-		while(true)
-		{
-			IElementType token = builder.getTokenType();
-			if(token == null || token == JSTokenTypes.CASE_KEYWORD || token == JSTokenTypes.DEFAULT_KEYWORD || token == JSTokenTypes.RBRACE)
-			{
-				break;
-			}
-			parseStatement(builder);
-		}
-		clause.done(JSElementTypes.CASE_CLAUSE);
-	}
-
-	protected void parseWithStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.WITH_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-		builder.advanceLexer();
-
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-
-		parseStatement(builder);
-
-		statement.done(JSElementTypes.WITH_STATEMENT);
-	}
-
-	protected void parseReturnStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.RETURN_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-		boolean hasNewLine = hasSemanticLineBeforeNextToken(builder);
-		builder.advanceLexer();
-		if(!hasNewLine)
-		{
-			getExpressionParsing().parseExpressionOptional(builder);
-
-			checkForSemicolon(builder);
-		}
-		statement.done(JSElementTypes.RETURN_STATEMENT);
-	}
-
-	protected void parseBreakStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.BREAK_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-
-		boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
-		builder.advanceLexer();
-
-		if(!hasSemanticLineBeforeNextToken && builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-		{
-			builder.advanceLexer();
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
-		{
-			builder.advanceLexer();
-		}
-
-		statement.done(JSElementTypes.BREAK_STATEMENT);
-	}
-
-	protected void parseContinueStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CONTINUE_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-		boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
-		builder.advanceLexer();
-
-		if(!hasSemanticLineBeforeNextToken && builder.getTokenType() == JSTokenTypes.IDENTIFIER)
-		{
-			builder.advanceLexer();
-		}
-
-		if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
-		{
-			builder.advanceLexer();
-		}
-
-		statement.done(JSElementTypes.CONTINUE_STATEMENT);
-	}
-
-	protected boolean hasSemanticLineBeforeNextToken(final PsiBuilder builder)
-	{
-		IElementType tokenType = builder.getTokenType();
-		if(tokenType == null)
-		{
-			return true;
-		}
-		// force end
-		if(tokenType == JSTokenTypes.RBRACE)
-		{
-			return true;
-		}
-
-		int step = 1;
-		IElementType rawElementType;
-		while((rawElementType = builder.rawLookup(step)) != null)
-		{
-			if(rawElementType == JSTokenTypes.WHITE_SPACE)
-			{
-				int tokenStart = builder.rawTokenTypeStart(step);
-				CharSequence originalText = builder.getOriginalText();
-				for(int i = tokenStart; i < originalText.length(); i++)
-				{
-					char c = originalText.charAt(i);
-					if(c == '\n')
-					{
-						return true;
-					}
-					else if(!Character.isWhitespace(c))
-					{
-						return false;
-					}
-					else
-					{
-						step ++;
-					}
-				}
-			}
-			else
-			{
-				break;
-			}
-		}
-		return false;
-	}
-
-	protected void parseIterationStatement(final PsiBuilder builder)
-	{
-		final IElementType tokenType = builder.getTokenType();
-		if(tokenType == JSTokenTypes.DO_KEYWORD)
-		{
-			parseDoWhileStatement(builder);
-		}
-		else if(tokenType == JSTokenTypes.WHILE_KEYWORD)
-		{
-			parseWhileStatement(builder);
-		}
-		else if(tokenType == JSTokenTypes.FOR_KEYWORD)
-		{
-			parseForStatement(builder);
-		}
-		else
-		{
-			StatementParsing.LOG.error("Unknown iteration statement");
-		}
-	}
-
-	private void parseForStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.FOR_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-		final boolean forin = parseForLoopHeader(builder);
-
-		parseStatement(builder);
-		statement.done(forin ? JSElementTypes.FOR_IN_STATEMENT : JSElementTypes.FOR_STATEMENT);
-	}
-
-	protected boolean parseForLoopHeader(final PsiBuilder builder)
-	{
-		builder.advanceLexer();
-		if(builder.getTokenType() == JSTokenTypes.EACH_KEYWORD)
-		{
-			builder.advanceLexer();
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-		final boolean empty;
-		if(builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD)
-		{
-			parseVarStatement(builder, true);
-			empty = false;
-		}
-		else
-		{
-			empty = !getExpressionParsing().parseExpressionOptional(builder, false);
-		}
-
-		boolean forin = false;
-		if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
-		{
-			builder.advanceLexer();
-			getExpressionParsing().parseExpressionOptional(builder);
-
-			if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
-			{
-				builder.advanceLexer();
-			}
-			else
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon());
-			}
-			getExpressionParsing().parseExpressionOptional(builder);
-		}
-		else if(builder.getTokenType() == JSTokenTypes.IN_KEYWORD)
-		{
-			forin = true;
-			if(empty)
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration());
-			}
-			builder.advanceLexer();
-			getExpressionParsing().parseExpression(builder);
-		}
-		else
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOrSemicolon());
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-		return forin;
-	}
-
-	private void parseWhileStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.WHILE_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-		builder.advanceLexer();
-
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-
-		parseStatement(builder);
-		statement.done(JSElementTypes.WHILE_STATEMENT);
-	}
-
-	private void parseDoWhileStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.DO_KEYWORD);
-		final PsiBuilder.Marker statement = builder.mark();
-		builder.advanceLexer();
-
-		parseStatement(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.WHILE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedWhileKeyword());
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-		getExpressionParsing().parseExpression(builder);
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-		checkForSemicolon(builder);
-
-		statement.done(JSElementTypes.DOWHILE_STATEMENT);
-	}
-
-	protected void parseIfStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.IF_KEYWORD);
-		final PsiBuilder.Marker ifStatement = builder.mark();
-		builder.advanceLexer();
-
-		Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-		getExpressionParsing().parseExpression(builder);
-
-		// handle empty expressions inside
-		while(builder.getTokenType() == JSTokenTypes.OROR || builder.getTokenType() == JSTokenTypes.EQEQ)
-		{
-			builder.advanceLexer();
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
-
-		parseStatement(builder);
-
-		if(builder.getTokenType() == JSTokenTypes.ELSE_KEYWORD)
-		{
-			builder.advanceLexer();
-			parseStatement(builder);
-		}
-
-		ifStatement.done(JSElementTypes.IF_STATEMENT);
-	}
-
-	protected void parseEmptyStatement(final PsiBuilder builder)
-	{
-		StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.SEMICOLON);
-		final PsiBuilder.Marker statement = builder.mark();
-		builder.advanceLexer();
-		statement.done(JSElementTypes.EMPTY_STATEMENT);
-	}
-
-	protected void parseVarStatement(final PsiBuilder builder, final boolean inForInitializationContext)
-	{
-		parseVarStatementWithMarker(builder, inForInitializationContext, builder.mark());
-	}
-
-	protected void parseVarStatementWithMarker(final PsiBuilder builder, final boolean inForInitializationContext, final @Nonnull PsiBuilder.Marker var)
-	{
-		final IElementType declType = builder.getTokenType();
-		LOG.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
-				declType == JSTokenTypes.CONST_KEYWORD ||
-				declType == JSTokenTypes.LET_KEYWORD);
-
-		builder.advanceLexer();
-
-		if(builder.getTokenType() == JSTokenTypes.LBRACE)
-		{
-			parseDeconstructionElement(builder);
-		}
-		else
-		{
-			boolean first = true;
-			while(true)
-			{
-				if(first)
-				{
-					first = false;
-				}
-				else
-				{
-					Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
-				}
-
-				parseVarDeclaration(builder, !inForInitializationContext);
-
-				if(builder.getTokenType() != JSTokenTypes.COMMA)
-				{
-					break;
-				}
-			}
-		}
-
-		if(!inForInitializationContext)
-		{
-			checkForSemicolon(builder);
-		}
-
-		var.done(JSElementTypes.VAR_STATEMENT);
-	}
-
-	protected void parseDeconstructionElement(PsiBuilder builder)
-	{
-		PsiBuilder.Marker mark = builder.mark();
-
-		PsiBuilder.Marker desctructionObjectMarker = builder.mark();
-		builder.advanceLexer();
-
-		boolean first = true;
-		while(!builder.eof())
-		{
-			if(builder.getTokenType() == JSTokenTypes.RBRACE)
-			{
-				break;
-			}
-
-			if(!first)
-			{
-				Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
-			}
-
-			first = false;
-
-			if(isIdentifierToken(builder))
-			{
-				PsiBuilder.Marker propertyMarker = builder.mark();
-				PsiBuilder.Marker varMarker = builder.mark();
-				builder.advanceLexer();
-				varMarker.done(JSElementTypes.VARIABLE);
-				propertyMarker.done(JSElementTypes.DESTRUCTURING_SHORTHANDED_PROPERTY);
-			}
-			else
-			{
-				PsiBuilder.Marker err = builder.mark();
-				builder.advanceLexer();
-				err.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
-			}
-		}
-
-		Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
-
-		desctructionObjectMarker.done(JSElementTypes.DESTRUCTURING_OBJECT);
-
-		parseVarInitializer(builder, false);
-
-		mark.done(JSElementTypes.DESTRUCTURING_ELEMENT);
-	}
-
-	protected void checkForSemicolon(final PsiBuilder builder)
-	{
-		if(builder.getTokenType() == JSTokenTypes.SEMICOLON)
-		{
-			builder.advanceLexer();
-		}
-	}
-
-	protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn)
-	{
-		if(!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType()))
-		{
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName());
-			builder.advanceLexer();
-			return;
-		}
-
-		PsiBuilder.Marker var = builder.mark();
-
-		builder.advanceLexer();
-
-		getExpressionParsing().tryParseType(builder);
-
-		parseVarInitializer(builder, allowIn);
-
-		var.done(JSElementTypes.VARIABLE);
-	}
-
-	protected void parseVarInitializer(PsiBuilder builder, boolean allowIn)
-	{
-		if(builder.getTokenType() == JSTokenTypes.EQ)
-		{
-			builder.advanceLexer();
-			if(allowIn)
-			{
-				if(!getExpressionParsing().parseAssignmentExpression(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-				}
-			}
-			else
-			{
-				if(!getExpressionParsing().parseAssignmentExpressionNoIn(builder))
-				{
-					builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-				}
-			}
-		}
-	}
-
-	public void parseBlock(final PsiBuilder builder)
-	{
-		parseBlockOrFunctionBody(builder, BlockType.BLOCK);
-	}
-
-	public void parseFunctionBody(final PsiBuilder builder)
-	{
-		parseBlockOrFunctionBody(builder, BlockType.FUNCTION_BODY);
-	}
-
-	public enum BlockType
-	{
-		FUNCTION_BODY, BLOCK, PACKAGE_OR_CLASS_BODY
-	}
-
-	protected void parseBlockOrFunctionBody(final PsiBuilder builder, BlockType type)
-	{
-		final PsiBuilder.Marker block = type != BlockType.PACKAGE_OR_CLASS_BODY ? builder.mark() : null;
-		if(builder.getTokenType() != JSTokenTypes.LBRACE)
-		{
-			if(block != null)
-			{
-				block.rollbackTo();
-			}
-			builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
-			return;
-		}
-
-		builder.advanceLexer();
-		while(builder.getTokenType() != JSTokenTypes.RBRACE)
-		{
-			if(builder.eof())
-			{
-				builder.error(JavaScriptLocalize.javascriptParserMessageMissingRbrace());
-				if(block != null)
-				{
-					block.done(JSElementTypes.BLOCK_STATEMENT);
-				}
-				return;
-			}
-
-			if(type == BlockType.FUNCTION_BODY)
-			{
-				parseSourceElement(builder);
-			}
-			else if(type == BlockType.BLOCK)
-			{
-				parseStatement(builder);
-			}
-			else
-			{
-				parsePackageBodyStatement(builder);
-			}
-		}
-
-		builder.advanceLexer();
-		if(block != null)
-		{
-			block.done(JSElementTypes.BLOCK_STATEMENT);
-		}
-	}
+public class StatementParsing extends Parsing {
+    private static final Logger LOG = Logger.getInstance(StatementParsing.class);
+
+    public StatementParsing(JavaScriptParsingContext context) {
+        super(context);
+    }
+
+    public void parseSourceElement(PsiBuilder builder) {
+        final IElementType tokenType = builder.getTokenType();
+        if (tokenType == JSTokenTypes.FUNCTION_KEYWORD) {
+            getFunctionParsing().parseFunctionDeclaration(builder);
+        }
+        else {
+            parseStatement(builder);
+        }
+    }
+
+    private void parsePackageBodyStatement(PsiBuilder builder) {
+        doParseStatement(builder, true);
+    }
+
+    public void parseStatement(PsiBuilder builder) {
+        doParseStatement(builder, false);
+    }
+
+    protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses) {
+        final IElementType firstToken = builder.getTokenType();
+
+        if (firstToken == null) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.LBRACE) {
+            parseBlock(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.VAR_KEYWORD
+            || firstToken == JSTokenTypes.CONST_KEYWORD
+            || firstToken == JSTokenTypes.LET_KEYWORD) {
+            parseVarStatement(builder, false);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.SEMICOLON) {
+            parseEmptyStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.IF_KEYWORD) {
+            parseIfStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.DO_KEYWORD
+            || firstToken == JSTokenTypes.WHILE_KEYWORD
+            || firstToken == JSTokenTypes.FOR_KEYWORD) {
+            parseIterationStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.CONTINUE_KEYWORD) {
+            parseContinueStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.BREAK_KEYWORD) {
+            parseBreakStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.RETURN_KEYWORD) {
+            parseReturnStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.WITH_KEYWORD) {
+            parseWithStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.YIELD_KEYWORD) {
+            parseYieldStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.LET_KEYWORD) {
+            parseLetStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.SWITCH_KEYWORD) {
+            parseSwitchStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.THROW_KEYWORD) {
+            parseThrowStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.TRY_KEYWORD) {
+            parseTryStatement(builder);
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.FUNCTION_KEYWORD) {
+            getFunctionParsing().parseFunctionDeclaration(builder);
+            return;
+        }
+
+        if (doParseStatementSub(builder, canHaveClasses)) {
+            return;
+        }
+
+        if (firstToken == JSTokenTypes.IDENTIFIER) {
+            // Try labeled statement:
+            final PsiBuilder.Marker labeledStatement = builder.mark();
+            builder.advanceLexer();
+            if (builder.getTokenType() == JSTokenTypes.COLON) {
+                builder.advanceLexer();
+                parseStatement(builder);
+                labeledStatement.done(JSElementTypes.LABELED_STATEMENT);
+                return;
+            }
+            else {
+                labeledStatement.rollbackTo();
+            }
+        }
+
+        if (firstToken != JSTokenTypes.LBRACE && firstToken != JSTokenTypes.FUNCTION_KEYWORD && parseExpressionStatement(builder)) {
+            return;
+        }
+
+        builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
+        builder.advanceLexer();
+    }
+
+    protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses) {
+        return false;
+    }
+
+    protected boolean parseExpressionStatement(PsiBuilder builder) {
+        // Try expression statement
+        final PsiBuilder.Marker exprStatement = builder.mark();
+        if (getExpressionParsing().parseExpressionOptional(builder)) {
+            checkForSemicolon(builder);
+            exprStatement.done(JSElementTypes.EXPRESSION_STATEMENT);
+            return true;
+        }
+        else {
+            exprStatement.drop();
+        }
+        return false;
+    }
+
+    protected void parseYieldStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.YIELD_KEYWORD);
+        final PsiBuilder.Marker marker = builder.mark();
+        builder.advanceLexer();
+
+        getExpressionParsing().parseExpressionOptional(builder);
+        checkForSemicolon(builder);
+        marker.done(JSElementTypes.YIELD_STATEMENT);
+    }
+
+    protected void parseLetStatement(final PsiBuilder builder) {
+        final PsiBuilder.Marker marker = parseLetExpressionStart(builder);
+
+        parseBlock(builder);
+        marker.done(JSElementTypes.LET_STATEMENT);
+    }
+
+    PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LET_KEYWORD);
+        final PsiBuilder.Marker marker = builder.mark();
+        builder.advanceLexer();
+
+        if (builder.getTokenType() == JSTokenTypes.LPAR) {
+            builder.advanceLexer();
+
+            if (getExpressionParsing().parseAssignmentExpression(builder)) {
+                while (builder.getTokenType() == JSTokenTypes.COMMA) {
+                    builder.advanceLexer();
+                    if (!getExpressionParsing().parseAssignmentExpression(builder)) {
+                        break;
+                    }
+                }
+            }
+            Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+        }
+        return marker;
+    }
+
+
+    public void parseIncludeDirective(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
+        final PsiBuilder.Marker useNSStatement = builder.mark();
+        builder.advanceLexer();
+        Parsing.checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral());
+        checkForSemicolon(builder);
+
+        useNSStatement.done(JSElementTypes.INCLUDE_DIRECTIVE);
+    }
+
+    protected void parseTryStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.TRY_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+        builder.advanceLexer();
+        parseBlock(builder);
+
+        while (builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD) {
+            parseCatchBlock(builder);
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.FINALLY_KEYWORD) {
+            builder.advanceLexer();
+            parseBlock(builder);
+        }
+
+        statement.done(JSElementTypes.TRY_STATEMENT);
+    }
+
+    private void parseCatchBlock(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
+        final PsiBuilder.Marker block = builder.mark();
+        builder.advanceLexer();
+        Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+
+        final IElementType identifierType = builder.getTokenType();
+
+        if (JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(identifierType)) {
+            final PsiBuilder.Marker param = builder.mark();
+            builder.advanceLexer();
+
+            if (!getExpressionParsing().tryParseType(builder) && builder.getTokenType() == JSTokenTypes.IF_KEYWORD) {
+                builder.advanceLexer();
+                Parsing.checkMatches(builder, identifierType, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+                Parsing.checkMatches(
+                    builder,
+                    JSTokenTypes.INSTANCEOF_KEYWORD,
+                    JavaScriptLocalize.javascriptParserMessageExpectedInstanceof()
+                );
+                Parsing.checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+            }
+            param.done(JSElementTypes.FORMAL_PARAMETER);
+        }
+        else {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedParameterName());
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+
+        parseBlock(builder);
+
+        block.done(JSElementTypes.CATCH_BLOCK);
+    }
+
+    protected void parseThrowStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.THROW_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+        builder.advanceLexer();
+
+        getExpressionParsing().parseExpressionOptional(builder);
+
+        checkForSemicolon(builder);
+        statement.done(JSElementTypes.THROW_STATEMENT);
+    }
+
+    protected void parseSwitchStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.SWITCH_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+        builder.advanceLexer();
+
+        Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+        getExpressionParsing().parseExpression(builder);
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+
+        Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
+        while (builder.getTokenType() != JSTokenTypes.RBRACE) {
+            if (builder.eof()) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageUnexpectedEndOfFile());
+                statement.done(JSElementTypes.SWITCH_STATEMENT);
+                return;
+            }
+            parseCaseOrDefaultClause(builder);
+        }
+
+        builder.advanceLexer();
+        statement.done(JSElementTypes.SWITCH_STATEMENT);
+    }
+
+    private void parseCaseOrDefaultClause(final PsiBuilder builder) {
+        final IElementType firstToken = builder.getTokenType();
+        final PsiBuilder.Marker clause = builder.mark();
+        if (firstToken != JSTokenTypes.CASE_KEYWORD && firstToken != JSTokenTypes.DEFAULT_KEYWORD) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCatchOrDefault());
+        }
+        builder.advanceLexer();
+        if (firstToken == JSTokenTypes.CASE_KEYWORD) {
+            getExpressionParsing().parseExpression(builder);
+        }
+        Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
+        while (true) {
+            IElementType token = builder.getTokenType();
+            if (token == null || token == JSTokenTypes.CASE_KEYWORD || token == JSTokenTypes.DEFAULT_KEYWORD
+                || token == JSTokenTypes.RBRACE) {
+                break;
+            }
+            parseStatement(builder);
+        }
+        clause.done(JSElementTypes.CASE_CLAUSE);
+    }
+
+    protected void parseWithStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.WITH_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+        builder.advanceLexer();
+
+        Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+        getExpressionParsing().parseExpression(builder);
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+
+        parseStatement(builder);
+
+        statement.done(JSElementTypes.WITH_STATEMENT);
+    }
+
+    protected void parseReturnStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.RETURN_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+        boolean hasNewLine = hasSemanticLineBeforeNextToken(builder);
+        builder.advanceLexer();
+        if (!hasNewLine) {
+            getExpressionParsing().parseExpressionOptional(builder);
+
+            checkForSemicolon(builder);
+        }
+        statement.done(JSElementTypes.RETURN_STATEMENT);
+    }
+
+    protected void parseBreakStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.BREAK_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+
+        boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
+        builder.advanceLexer();
+
+        if (!hasSemanticLineBeforeNextToken && builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+            builder.advanceLexer();
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.SEMICOLON) {
+            builder.advanceLexer();
+        }
+
+        statement.done(JSElementTypes.BREAK_STATEMENT);
+    }
+
+    protected void parseContinueStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CONTINUE_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+        boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
+        builder.advanceLexer();
+
+        if (!hasSemanticLineBeforeNextToken && builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
+            builder.advanceLexer();
+        }
+
+        if (builder.getTokenType() == JSTokenTypes.SEMICOLON) {
+            builder.advanceLexer();
+        }
+
+        statement.done(JSElementTypes.CONTINUE_STATEMENT);
+    }
+
+    protected boolean hasSemanticLineBeforeNextToken(final PsiBuilder builder) {
+        IElementType tokenType = builder.getTokenType();
+        if (tokenType == null) {
+            return true;
+        }
+        // force end
+        if (tokenType == JSTokenTypes.RBRACE) {
+            return true;
+        }
+
+        int step = 1;
+        IElementType rawElementType;
+        while ((rawElementType = builder.rawLookup(step)) != null) {
+            if (rawElementType == JSTokenTypes.WHITE_SPACE) {
+                int tokenStart = builder.rawTokenTypeStart(step);
+                CharSequence originalText = builder.getOriginalText();
+                for (int i = tokenStart; i < originalText.length(); i++) {
+                    char c = originalText.charAt(i);
+                    if (c == '\n') {
+                        return true;
+                    }
+                    else if (!Character.isWhitespace(c)) {
+                        return false;
+                    }
+                    else {
+                        step++;
+                    }
+                }
+            }
+            else {
+                break;
+            }
+        }
+        return false;
+    }
+
+    protected void parseIterationStatement(final PsiBuilder builder) {
+        final IElementType tokenType = builder.getTokenType();
+        if (tokenType == JSTokenTypes.DO_KEYWORD) {
+            parseDoWhileStatement(builder);
+        }
+        else if (tokenType == JSTokenTypes.WHILE_KEYWORD) {
+            parseWhileStatement(builder);
+        }
+        else if (tokenType == JSTokenTypes.FOR_KEYWORD) {
+            parseForStatement(builder);
+        }
+        else {
+            StatementParsing.LOG.error("Unknown iteration statement");
+        }
+    }
+
+    private void parseForStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.FOR_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+        final boolean forin = parseForLoopHeader(builder);
+
+        parseStatement(builder);
+        statement.done(forin ? JSElementTypes.FOR_IN_STATEMENT : JSElementTypes.FOR_STATEMENT);
+    }
+
+    protected boolean parseForLoopHeader(final PsiBuilder builder) {
+        builder.advanceLexer();
+        if (builder.getTokenType() == JSTokenTypes.EACH_KEYWORD) {
+            builder.advanceLexer();
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+        final boolean empty;
+        if (builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD) {
+            parseVarStatement(builder, true);
+            empty = false;
+        }
+        else {
+            empty = !getExpressionParsing().parseExpressionOptional(builder, false);
+        }
+
+        boolean forin = false;
+        if (builder.getTokenType() == JSTokenTypes.SEMICOLON) {
+            builder.advanceLexer();
+            getExpressionParsing().parseExpressionOptional(builder);
+
+            if (builder.getTokenType() == JSTokenTypes.SEMICOLON) {
+                builder.advanceLexer();
+            }
+            else {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedSemicolon());
+            }
+            getExpressionParsing().parseExpressionOptional(builder);
+        }
+        else if (builder.getTokenType() == JSTokenTypes.IN_KEYWORD) {
+            forin = true;
+            if (empty) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopLeftHandSideExpressionOrVariableDeclaration());
+            }
+            builder.advanceLexer();
+            getExpressionParsing().parseExpression(builder);
+        }
+        else {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedForloopInOrSemicolon());
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+        return forin;
+    }
+
+    private void parseWhileStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.WHILE_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+        builder.advanceLexer();
+
+        Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+        getExpressionParsing().parseExpression(builder);
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+
+        parseStatement(builder);
+        statement.done(JSElementTypes.WHILE_STATEMENT);
+    }
+
+    private void parseDoWhileStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.DO_KEYWORD);
+        final PsiBuilder.Marker statement = builder.mark();
+        builder.advanceLexer();
+
+        parseStatement(builder);
+        Parsing.checkMatches(builder, JSTokenTypes.WHILE_KEYWORD, JavaScriptLocalize.javascriptParserMessageExpectedWhileKeyword());
+        Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+        getExpressionParsing().parseExpression(builder);
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+        checkForSemicolon(builder);
+
+        statement.done(JSElementTypes.DOWHILE_STATEMENT);
+    }
+
+    protected void parseIfStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.IF_KEYWORD);
+        final PsiBuilder.Marker ifStatement = builder.mark();
+        builder.advanceLexer();
+
+        Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+        getExpressionParsing().parseExpression(builder);
+
+        // handle empty expressions inside
+        while (builder.getTokenType() == JSTokenTypes.OROR || builder.getTokenType() == JSTokenTypes.EQEQ) {
+            builder.advanceLexer();
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
+
+        parseStatement(builder);
+
+        if (builder.getTokenType() == JSTokenTypes.ELSE_KEYWORD) {
+            builder.advanceLexer();
+            parseStatement(builder);
+        }
+
+        ifStatement.done(JSElementTypes.IF_STATEMENT);
+    }
+
+    protected void parseEmptyStatement(final PsiBuilder builder) {
+        StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.SEMICOLON);
+        final PsiBuilder.Marker statement = builder.mark();
+        builder.advanceLexer();
+        statement.done(JSElementTypes.EMPTY_STATEMENT);
+    }
+
+    protected void parseVarStatement(final PsiBuilder builder, final boolean inForInitializationContext) {
+        parseVarStatementWithMarker(builder, inForInitializationContext, builder.mark());
+    }
+
+    protected void parseVarStatementWithMarker(
+        final PsiBuilder builder,
+        final boolean inForInitializationContext,
+        final @Nonnull PsiBuilder.Marker var
+    ) {
+        final IElementType declType = builder.getTokenType();
+        LOG.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
+            declType == JSTokenTypes.CONST_KEYWORD ||
+            declType == JSTokenTypes.LET_KEYWORD);
+
+        builder.advanceLexer();
+
+        if (builder.getTokenType() == JSTokenTypes.LBRACE) {
+            parseDeconstructionElement(builder);
+        }
+        else {
+            boolean first = true;
+            while (true) {
+                if (first) {
+                    first = false;
+                }
+                else {
+                    Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
+                }
+
+                parseVarDeclaration(builder, !inForInitializationContext);
+
+                if (builder.getTokenType() != JSTokenTypes.COMMA) {
+                    break;
+                }
+            }
+        }
+
+        if (!inForInitializationContext) {
+            checkForSemicolon(builder);
+        }
+
+        var.done(JSElementTypes.VAR_STATEMENT);
+    }
+
+    protected void parseDeconstructionElement(PsiBuilder builder) {
+        PsiBuilder.Marker mark = builder.mark();
+
+        PsiBuilder.Marker desctructionObjectMarker = builder.mark();
+        builder.advanceLexer();
+
+        boolean first = true;
+        while (!builder.eof()) {
+            if (builder.getTokenType() == JSTokenTypes.RBRACE) {
+                break;
+            }
+
+            if (!first) {
+                Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
+            }
+
+            first = false;
+
+            if (isIdentifierToken(builder)) {
+                PsiBuilder.Marker propertyMarker = builder.mark();
+                PsiBuilder.Marker varMarker = builder.mark();
+                builder.advanceLexer();
+                varMarker.done(JSElementTypes.VARIABLE);
+                propertyMarker.done(JSElementTypes.DESTRUCTURING_SHORTHANDED_PROPERTY);
+            }
+            else {
+                PsiBuilder.Marker err = builder.mark();
+                builder.advanceLexer();
+                err.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifier());
+            }
+        }
+
+        Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
+
+        desctructionObjectMarker.done(JSElementTypes.DESTRUCTURING_OBJECT);
+
+        parseVarInitializer(builder, false);
+
+        mark.done(JSElementTypes.DESTRUCTURING_ELEMENT);
+    }
+
+    protected void checkForSemicolon(final PsiBuilder builder) {
+        if (builder.getTokenType() == JSTokenTypes.SEMICOLON) {
+            builder.advanceLexer();
+        }
+    }
+
+    protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn) {
+        if (!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType())) {
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName());
+            builder.advanceLexer();
+            return;
+        }
+
+        PsiBuilder.Marker var = builder.mark();
+
+        builder.advanceLexer();
+
+        getExpressionParsing().tryParseType(builder);
+
+        parseVarInitializer(builder, allowIn);
+
+        var.done(JSElementTypes.VARIABLE);
+    }
+
+    protected void parseVarInitializer(PsiBuilder builder, boolean allowIn) {
+        if (builder.getTokenType() == JSTokenTypes.EQ) {
+            builder.advanceLexer();
+            if (allowIn) {
+                if (!getExpressionParsing().parseAssignmentExpression(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+                }
+            }
+            else {
+                if (!getExpressionParsing().parseAssignmentExpressionNoIn(builder)) {
+                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
+                }
+            }
+        }
+    }
+
+    public void parseBlock(final PsiBuilder builder) {
+        parseBlockOrFunctionBody(builder, BlockType.BLOCK);
+    }
+
+    public void parseFunctionBody(final PsiBuilder builder) {
+        parseBlockOrFunctionBody(builder, BlockType.FUNCTION_BODY);
+    }
+
+    public enum BlockType {
+        FUNCTION_BODY,
+        BLOCK,
+        PACKAGE_OR_CLASS_BODY
+    }
+
+    protected void parseBlockOrFunctionBody(final PsiBuilder builder, BlockType type) {
+        final PsiBuilder.Marker block = type != BlockType.PACKAGE_OR_CLASS_BODY ? builder.mark() : null;
+        if (builder.getTokenType() != JSTokenTypes.LBRACE) {
+            if (block != null) {
+                block.rollbackTo();
+            }
+            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
+            return;
+        }
+
+        builder.advanceLexer();
+        while (builder.getTokenType() != JSTokenTypes.RBRACE) {
+            if (builder.eof()) {
+                builder.error(JavaScriptLocalize.javascriptParserMessageMissingRbrace());
+                if (block != null) {
+                    block.done(JSElementTypes.BLOCK_STATEMENT);
+                }
+                return;
+            }
+
+            if (type == BlockType.FUNCTION_BODY) {
+                parseSourceElement(builder);
+            }
+            else if (type == BlockType.BLOCK) {
+                parseStatement(builder);
+            }
+            else {
+                parsePackageBodyStatement(builder);
+            }
+        }
+
+        builder.advanceLexer();
+        if (block != null) {
+            block.done(JSElementTypes.BLOCK_STATEMENT);
+        }
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
index b689d58f..23d27f2f 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
@@ -11,6 +11,7 @@
 import consulo.util.lang.ThreeState;
 
 import jakarta.annotation.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,105 +19,87 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public class JavaScriptStrictParserBuilder extends JavaScriptParserBuilder
-{
-	private static final int ourExpectedStringSize = JavaScriptConstants.USE_STRICT.length() + 2; // '' or ""
-
-	private ThreeState myStrictState = ThreeState.UNSURE;
-
-	private Map<IElementType, ThreeState> myStrictKeywords = new HashMap<IElementType, ThreeState>();
-
-	private int[] myDisableNonStrictRemap = ArrayUtil.EMPTY_INT_ARRAY;
-
-	public JavaScriptStrictParserBuilder(PsiBuilder delegate)
-	{
-		super(delegate);
-	}
-
-	public void onlyInStrictMode(IElementType elementType)
-	{
-		myStrictKeywords.put(elementType, ThreeState.YES);
-	}
-
-	public void disableNonStrictRemap(int offset)
-	{
-		myDisableNonStrictRemap = ArrayUtil.append(myDisableNonStrictRemap, offset);
-	}
-
-	@Nullable
-	@Override
-	public IElementType getTokenType()
-	{
-		checkStrictMode();
-		IElementType tokenType = super.getTokenType();
-		ThreeState threeState = myStrictKeywords.get(tokenType);
-		if(threeState != null)
-		{
-			if(threeState == myStrictState)
-			{
-				return tokenType;
-			}
-			else
-			{
-				int currentOffset = getCurrentOffset();
-				if(ArrayUtil.indexOf(myDisableNonStrictRemap, currentOffset) != -1)
-				{
-					return tokenType;
-				}
-
-				return JSTokenTypes.IDENTIFIER;
-			}
-		}
-		return tokenType;
-	}
-
-	@Override
-	public void advanceLexer()
-	{
-		IElementType tokenType = getTokenType();
-
-		IElementType originalTokenType = super.getTokenType();
-
-		if(tokenType != originalTokenType)
-		{
-			remapCurrentToken(tokenType);
-		}
-
-		super.advanceLexer();
-	}
-
-	public boolean isStrictMode()
-	{
-		return myStrictState == ThreeState.YES;
-	}
-
-	private void checkStrictMode()
-	{
-		if(myStrictState != ThreeState.UNSURE)
-		{
-			return;
-		}
-
-		IElementType tokenType = super.getTokenType();
-		if(JavaScriptTokenSets.STRING_LITERALS.contains(tokenType))
-		{
-			String tokenText = getTokenText();
-			if(tokenText == null)
-			{
-				return;
-			}
-
-			int length = tokenText.length();
-			if(ourExpectedStringSize == length)
-			{
-				String stringContent = StringUtil.unquoteString(tokenText);
-				if(JavaScriptConstants.USE_STRICT.equals(stringContent))
-				{
-					myStrictState = ThreeState.YES;
-					return;
-				}
-			}
-		}
-		myStrictState = ThreeState.NO;
-	}
+public class JavaScriptStrictParserBuilder extends JavaScriptParserBuilder {
+    private static final int ourExpectedStringSize = JavaScriptConstants.USE_STRICT.length() + 2; // '' or ""
+
+    private ThreeState myStrictState = ThreeState.UNSURE;
+
+    private Map<IElementType, ThreeState> myStrictKeywords = new HashMap<>();
+
+    private int[] myDisableNonStrictRemap = ArrayUtil.EMPTY_INT_ARRAY;
+
+    public JavaScriptStrictParserBuilder(PsiBuilder delegate) {
+        super(delegate);
+    }
+
+    public void onlyInStrictMode(IElementType elementType) {
+        myStrictKeywords.put(elementType, ThreeState.YES);
+    }
+
+    public void disableNonStrictRemap(int offset) {
+        myDisableNonStrictRemap = ArrayUtil.append(myDisableNonStrictRemap, offset);
+    }
+
+    @Nullable
+    @Override
+    public IElementType getTokenType() {
+        checkStrictMode();
+        IElementType tokenType = super.getTokenType();
+        ThreeState threeState = myStrictKeywords.get(tokenType);
+        if (threeState != null) {
+            if (threeState == myStrictState) {
+                return tokenType;
+            }
+            else {
+                int currentOffset = getCurrentOffset();
+                if (ArrayUtil.indexOf(myDisableNonStrictRemap, currentOffset) != -1) {
+                    return tokenType;
+                }
+
+                return JSTokenTypes.IDENTIFIER;
+            }
+        }
+        return tokenType;
+    }
+
+    @Override
+    public void advanceLexer() {
+        IElementType tokenType = getTokenType();
+
+        IElementType originalTokenType = super.getTokenType();
+
+        if (tokenType != originalTokenType) {
+            remapCurrentToken(tokenType);
+        }
+
+        super.advanceLexer();
+    }
+
+    public boolean isStrictMode() {
+        return myStrictState == ThreeState.YES;
+    }
+
+    private void checkStrictMode() {
+        if (myStrictState != ThreeState.UNSURE) {
+            return;
+        }
+
+        IElementType tokenType = super.getTokenType();
+        if (JavaScriptTokenSets.STRING_LITERALS.contains(tokenType)) {
+            String tokenText = getTokenText();
+            if (tokenText == null) {
+                return;
+            }
+
+            int length = tokenText.length();
+            if (ourExpectedStringSize == length) {
+                String stringContent = StringUtil.unquoteString(tokenText);
+                if (JavaScriptConstants.USE_STRICT.equals(stringContent)) {
+                    myStrictState = ThreeState.YES;
+                    return;
+                }
+            }
+        }
+        myStrictState = ThreeState.NO;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java
index f31d1b72..d532d8b0 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JSRegExpLiteralExpressionImpl.java
@@ -5,16 +5,14 @@
 
 /**
  * Own implementation for RegExp literal for correct registration RegExpLanguageHost.
- *
+ * <p>
  * String literal with regexp will have own RegExp host
  *
  * @author VISTALL
  * @since 21/12/2021
  */
-public class JSRegExpLiteralExpressionImpl extends JSLiteralExpressionImpl
-{
-	public JSRegExpLiteralExpressionImpl(ASTNode node)
-	{
-		super(node);
-	}
+public class JSRegExpLiteralExpressionImpl extends JSLiteralExpressionImpl {
+    public JSRegExpLiteralExpressionImpl(ASTNode node) {
+        super(node);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
index 60d19030..b8d2fc05 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
@@ -28,32 +28,24 @@
  * @author VISTALL
  * @since 23.02.2016
  */
-public class JavaScriptClassType implements JavaScriptType
-{
-	private JSClass myClass;
+public class JavaScriptClassType implements JavaScriptType {
+    private JSClass myClass;
 
-	public JavaScriptClassType(JSClass aClass)
-	{
-		myClass = aClass;
-	}
+    public JavaScriptClassType(JSClass aClass) {
+        myClass = aClass;
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public String getPresentableText()
-	{
-		String name = myClass.getName();
-		if(name == null)
-		{
-			return "<anonymous class>";
-		}
-		return name;
-	}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public String getPresentableText() {
+        String name = myClass.getName();
+        return name == null ? "<anonymous class>" : name;
+    }
 
-	@Nullable
-	@Override
-	public PsiElement getTargetElement()
-	{
-		return myClass;
-	}
+    @Nullable
+    @Override
+    public PsiElement getTargetElement() {
+        return myClass;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
index f6129e71..7b2fcb06 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
@@ -25,10 +25,9 @@
  * @author VISTALL
  * @since 01.03.2016
  */
-public abstract class BaseJavaScriptElementType<S extends JSStubElement<P>, P extends JavaScriptTypeElement> extends JSStubElementType<S, P>
-{
-	public BaseJavaScriptElementType(@NonNls String debugName)
-	{
-		super(debugName);
-	}
+public abstract class BaseJavaScriptElementType<S extends JSStubElement<P>, P extends JavaScriptTypeElement>
+    extends JSStubElementType<S, P> {
+    public BaseJavaScriptElementType(@NonNls String debugName) {
+        super(debugName);
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
index 059755f7..2611c0be 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
@@ -6,8 +6,7 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public interface JavaScriptVersionWithHelper
-{
-	@Nonnull
-	ResolveHelper getHelper();
+public interface JavaScriptVersionWithHelper {
+    @Nonnull
+    ResolveHelper getHelper();
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
index 7a3c2fc9..845f878b 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
@@ -16,37 +16,28 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public abstract class ResolveHelper
-{
-	private static final ResolveHelper DEFAULT = new ResolveHelper()
-	{
-	};
-
-	public static ResolveHelper find(PsiElement element)
-	{
-		LanguageVersion languageVersion = element.getLanguageVersion();
-		if(languageVersion instanceof JavaScriptVersionWithHelper)
-		{
-			return ((JavaScriptVersionWithHelper) languageVersion).getHelper();
-		}
-
-		return DEFAULT;
-	}
-
-	@Nullable
-	public JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String referencedName, PsiNamedElement parent)
-	{
-		return null;
-	}
-
-	public boolean execute(ResolveProcessor resolveProcessor, PsiElement element, ResolveState state)
-	{
-		return false;
-	}
-
-	@RequiredReadAction
-	public boolean isResolveTo(JSReferenceExpressionImpl expression, PsiElement element)
-	{
-		return false;
-	}
+public abstract class ResolveHelper {
+    private static final ResolveHelper DEFAULT = new ResolveHelper() {
+    };
+
+    public static ResolveHelper find(PsiElement element) {
+        LanguageVersion languageVersion = element.getLanguageVersion();
+        return languageVersion instanceof JavaScriptVersionWithHelper javaScriptVersionWithHelper
+            ? javaScriptVersionWithHelper.getHelper()
+            : DEFAULT;
+    }
+
+    @Nullable
+    public JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String referencedName, PsiNamedElement parent) {
+        return null;
+    }
+
+    public boolean execute(ResolveProcessor resolveProcessor, PsiElement element, ResolveState state) {
+        return false;
+    }
+
+    @RequiredReadAction
+    public boolean isResolveTo(JSReferenceExpressionImpl expression, PsiElement element) {
+        return false;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
index ef37e6e6..aab1014a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
@@ -19,38 +19,41 @@
  * @since 2019-12-17
  */
 @ExtensionImpl
-public class JSFileViewProviderFactory implements LanguageFileViewProviderFactory
-{
-	private static class JSFileViewProvider extends SingleRootFileViewProvider
-	{
-		private JSFileViewProvider(@Nonnull PsiManager manager, @Nonnull VirtualFile virtualFile, boolean eventSystemEnabled, @Nonnull Language language)
-		{
-			super(manager, virtualFile, eventSystemEnabled, language);
-		}
+public class JSFileViewProviderFactory implements LanguageFileViewProviderFactory {
+    private static class JSFileViewProvider extends SingleRootFileViewProvider {
+        private JSFileViewProvider(
+            @Nonnull PsiManager manager,
+            @Nonnull VirtualFile virtualFile,
+            boolean eventSystemEnabled,
+            @Nonnull Language language
+        ) {
+            super(manager, virtualFile, eventSystemEnabled, language);
+        }
 
-		@Override
-		@RequiredReadAction
-		public PsiElement findElementAt(int offset, @Nonnull Class<? extends Language> lang)
-		{
-			PsiElement elementAt = findElementAt(offset);
-			if(elementAt != null && ReflectionUtil.isAssignable(lang, elementAt.getLanguage().getClass()))
-			{
-				return elementAt;
-			}
-			return null;
-		}
-	}
+        @Override
+        @RequiredReadAction
+        public PsiElement findElementAt(int offset, @Nonnull Class<? extends Language> lang) {
+            PsiElement elementAt = findElementAt(offset);
+            if (elementAt != null && ReflectionUtil.isAssignable(lang, elementAt.getLanguage().getClass())) {
+                return elementAt;
+            }
+            return null;
+        }
+    }
 
-	@Override
-	public FileViewProvider createFileViewProvider(@Nonnull VirtualFile virtualFile, Language language, @Nonnull PsiManager psiManager, boolean eventSystemEnabled)
-	{
-		return new JSFileViewProvider(psiManager, virtualFile, eventSystemEnabled, language);
-	}
+    @Override
+    public FileViewProvider createFileViewProvider(
+        @Nonnull VirtualFile virtualFile,
+        Language language,
+        @Nonnull PsiManager psiManager,
+        boolean eventSystemEnabled
+    ) {
+        return new JSFileViewProvider(psiManager, virtualFile, eventSystemEnabled, language);
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
index c454c269..ac741347 100644
--- a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
@@ -29,37 +29,31 @@
  * @author VISTALL
  * @since 03.05.2015
  */
-public abstract class JSQualifiedStubElementType<StubT extends JSQualifiedStub<PsiT>, PsiT extends JSQualifiedNamedElement> extends JSStubElementType<StubT, PsiT>
-{
-	public JSQualifiedStubElementType(@NonNls String debugName)
-	{
-		super(debugName);
-	}
-
-	@Override
-	public void indexStub(@Nonnull StubT stub, @Nonnull IndexSink sink)
-	{
-		final String name = stub.getName();
-		final String fqn = stub.getQualifiedName();
-
-		if(name != null && doIndexName(stub, name, fqn))
-		{
-			sink.occurrence(JavaScriptIndexKeys.ELEMENTS_BY_NAME, name);
-		}
-
-		if(fqn != null && doIndexQualifiedName(stub, name, fqn))
-		{
-			sink.occurrence(JavaScriptIndexKeys.ELEMENTS_BY_QNAME, fqn);
-		}
-	}
-
-	protected boolean doIndexQualifiedName(StubT stub, final String name, final String fqn)
-	{
-		return true;
-	}
-
-	protected boolean doIndexName(StubT stub, final String name, final String fqn)
-	{
-		return true;
-	}
+public abstract class JSQualifiedStubElementType<StubT extends JSQualifiedStub<PsiT>, PsiT extends JSQualifiedNamedElement>
+    extends JSStubElementType<StubT, PsiT> {
+    public JSQualifiedStubElementType(@NonNls String debugName) {
+        super(debugName);
+    }
+
+    @Override
+    public void indexStub(@Nonnull StubT stub, @Nonnull IndexSink sink) {
+        final String name = stub.getName();
+        final String fqn = stub.getQualifiedName();
+
+        if (name != null && doIndexName(stub, name, fqn)) {
+            sink.occurrence(JavaScriptIndexKeys.ELEMENTS_BY_NAME, name);
+        }
+
+        if (fqn != null && doIndexQualifiedName(stub, name, fqn)) {
+            sink.occurrence(JavaScriptIndexKeys.ELEMENTS_BY_QNAME, fqn);
+        }
+    }
+
+    protected boolean doIndexQualifiedName(StubT stub, final String name, final String fqn) {
+        return true;
+    }
+
+    protected boolean doIndexName(StubT stub, final String name, final String fqn) {
+        return true;
+    }
 }
diff --git a/base-impl/src/main/java/module-info.java b/base-impl/src/main/java/module-info.java
index 4d9ef8fc..dc987e32 100644
--- a/base-impl/src/main/java/module-info.java
+++ b/base-impl/src/main/java/module-info.java
@@ -2,42 +2,41 @@
  * @author VISTALL
  * @since 23-Aug-22
  */
-open module consulo.javascript.base.impl
-{
-	requires transitive consulo.javascript.base.api;
+open module consulo.javascript.base.impl {
+    requires transitive consulo.javascript.base.api;
 
-	requires com.google.common;
-	requires com.intellij.xml;
+    requires com.google.common;
+    requires com.intellij.xml;
 
-	exports com.intellij.javascript.documentation;
-	exports com.intellij.lang.javascript;
-	exports com.intellij.lang.javascript.flex;
-	exports com.intellij.lang.javascript.highlighting;
-	exports com.intellij.lang.javascript.index;
-	exports com.intellij.lang.javascript.inspections.qucikFixes;
-	exports com.intellij.lang.javascript.parsing;
-	exports com.intellij.lang.javascript.psi.impl;
-	exports com.intellij.lang.javascript.psi.impl.reference;
-	exports com.intellij.lang.javascript.psi.resolve;
-	exports com.intellij.lang.javascript.psi.stubs.impl;
-	exports com.intellij.lang.javascript.psi.util;
-	exports com.intellij.lang.javascript.search;
-	exports com.intellij.lang.javascript.types;
-	exports com.intellij.lang.javascript.validation;
-	exports consulo.javascript.ecmascript4.psi.impl;
-	exports consulo.javascript.ide.codeInsight;
-	exports consulo.javascript.ide.hightlight;
-	exports consulo.javascript.inspections.qucikFixes;
-	exports consulo.javascript.lang;
-	exports consulo.javascript.lang.lexer;
-	exports consulo.javascript.lang.parsing;
-	exports consulo.javascript.lang.parsing.impl;
-	exports consulo.javascript.lang.psi.impl;
-	exports consulo.javascript.lang.psi.impl.elementType;
-	exports consulo.javascript.lang.psi.impl.resolve;
-	exports consulo.javascript.lang.viewProvider;
-	exports consulo.javascript.impl.language.psi;
-	exports consulo.javascript.impl.language.psi.stub;
-	exports consulo.javascript.impl.language;
-	exports consulo.javascript.types;
+    exports com.intellij.javascript.documentation;
+    exports com.intellij.lang.javascript;
+    exports com.intellij.lang.javascript.flex;
+    exports com.intellij.lang.javascript.highlighting;
+    exports com.intellij.lang.javascript.index;
+    exports com.intellij.lang.javascript.inspections.qucikFixes;
+    exports com.intellij.lang.javascript.parsing;
+    exports com.intellij.lang.javascript.psi.impl;
+    exports com.intellij.lang.javascript.psi.impl.reference;
+    exports com.intellij.lang.javascript.psi.resolve;
+    exports com.intellij.lang.javascript.psi.stubs.impl;
+    exports com.intellij.lang.javascript.psi.util;
+    exports com.intellij.lang.javascript.search;
+    exports com.intellij.lang.javascript.types;
+    exports com.intellij.lang.javascript.validation;
+    exports consulo.javascript.ecmascript4.psi.impl;
+    exports consulo.javascript.ide.codeInsight;
+    exports consulo.javascript.ide.hightlight;
+    exports consulo.javascript.impl.language.psi;
+    exports consulo.javascript.impl.language.psi.stub;
+    exports consulo.javascript.impl.language;
+    exports consulo.javascript.inspections.qucikFixes;
+    exports consulo.javascript.lang;
+    exports consulo.javascript.lang.lexer;
+    exports consulo.javascript.lang.parsing;
+    exports consulo.javascript.lang.parsing.impl;
+    exports consulo.javascript.lang.psi.impl;
+    exports consulo.javascript.lang.psi.impl.elementType;
+    exports consulo.javascript.lang.psi.impl.resolve;
+    exports consulo.javascript.lang.viewProvider;
+    exports consulo.javascript.types;
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
index 92f8c41d..8c42c676 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
@@ -45,11 +45,10 @@ public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpre
             if (parent == null) {
                 return;
             }
-            if (parent instanceof JSForStatement ||
-                    parent instanceof JSForInStatement ||
-                    parent instanceof JSExpressionStatement ||
-                    parent instanceof JSCommaExpression)
-            {
+            if (parent instanceof JSForStatement
+                || parent instanceof JSForInStatement
+                || parent instanceof JSExpressionStatement
+                || parent instanceof JSCommaExpression) {
                 return;
             }
             registerError(jsAssignmentExpression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
index a00b8b22..b9adedf3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
@@ -51,11 +51,12 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expressi
             checkForForeachLoopParam(lhs);
         }
 
-        @Override public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        @Override
+        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             final IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
-                    !JSTokenTypes.MINUSMINUS.equals(sign)) {
+                !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
             final JSExpression operand = expression.getExpression();
@@ -66,11 +67,11 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expressi
             checkForForeachLoopParam(operand);
         }
 
-        @Override public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
+        @Override
+        public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
             super.visitJSPostfixExpression(expression);
             final IElementType sign = expression.getOperationSign();
-            if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
-                    !JSTokenTypes.MINUSMINUS.equals(sign)) {
+            if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
             final JSExpression operand = expression.getExpression();
@@ -85,24 +86,23 @@ private void checkForForLoopParam(JSExpression expression) {
             if (!(expression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression ref = (JSReferenceExpression) expression;
+            final JSReferenceExpression ref = (JSReferenceExpression)expression;
             final PsiElement element = ref.resolve();
             if (!(element instanceof JSVariable)) {
                 return;
             }
-            final JSVariable variable = (JSVariable) element;
-            if(!(variable.getParent() instanceof JSVarStatement))
-            {
+            final JSVariable variable = (JSVariable)element;
+            if (!(variable.getParent() instanceof JSVarStatement)) {
                 return;
             }
-            final JSVarStatement decl = (JSVarStatement) variable.getParent();
+            final JSVarStatement decl = (JSVarStatement)variable.getParent();
             if (decl == null) {
                 return;
             }
             if (!(decl.getParent() instanceof JSForStatement)) {
                 return;
             }
-            final JSForStatement forStatement = (JSForStatement) decl.getParent();
+            final JSForStatement forStatement = (JSForStatement)decl.getParent();
             assert forStatement != null;
             if (!isInForStatementBody(expression, forStatement)) {
                 return;
@@ -114,12 +114,12 @@ private void checkForForeachLoopParam(JSExpression expression) {
             if (!(expression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression ref = (JSReferenceExpression) expression;
+            final JSReferenceExpression ref = (JSReferenceExpression)expression;
             final PsiElement element = ref.resolve();
             if (!(element instanceof JSVariable)) {
                 return;
             }
-            final JSVariable parameter = (JSVariable) element;
+            final JSVariable parameter = (JSVariable)element;
             final PsiElement JSVarStatement = parameter.getParent();
             if (!(JSVarStatement.getParent() instanceof JSForInStatement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
index 22c5cbbf..07727a87 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
@@ -51,8 +51,7 @@ public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpre
         public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             final IElementType sign = expression.getOperationSign();
-            if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
-                    !JSTokenTypes.MINUSMINUS.equals(sign)) {
+            if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
             final JSExpression operand = expression.getExpression();
@@ -63,8 +62,7 @@ public void visitJSPrefixExpression(JSPrefixExpression expression) {
         public void visitJSPostfixExpression(JSPostfixExpression jsPostfixExpression) {
             super.visitJSPostfixExpression(jsPostfixExpression);
             final IElementType sign = jsPostfixExpression.getOperationSign();
-            if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
-                    !JSTokenTypes.MINUSMINUS.equals(sign)) {
+            if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
             final JSExpression operand = jsPostfixExpression.getExpression();
@@ -72,30 +70,13 @@ public void visitJSPostfixExpression(JSPostfixExpression jsPostfixExpression) {
         }
 
         private void checkOperand(JSExpression operand) {
-            if (operand == null) {
-                return;
-            }
-            if (operand instanceof JSDefinitionExpression definitionExpression) {
-                final JSExpression definiend = definitionExpression.getExpression();
-                if (definiend instanceof JSReferenceExpression referenceExpression) {
-                    final PsiElement referent = referenceExpression.resolve();
-                    if (referent == null) {
-                        return;
-                    }
-                    if (!(referent instanceof JSParameter)) {
-                        return;
-                    }
-                    registerError(operand);
-                }
+            if (operand instanceof JSDefinitionExpression definitionExpression
+                && definitionExpression.getExpression() instanceof JSReferenceExpression referenceExpression
+                && referenceExpression.resolve() instanceof JSParameter) {
+                registerError(operand);
             }
-            if (operand instanceof JSReferenceExpression referenceExpression) {
-                final PsiElement referent = referenceExpression.resolve();
-                if (referent == null) {
-                    return;
-                }
-                if (!(referent instanceof JSParameter)) {
-                    return;
-                }
+            if (operand instanceof JSReferenceExpression referenceExpression
+                && referenceExpression.resolve() instanceof JSParameter) {
                 registerError(operand);
             }
         }

From 9ee5065557413656d485957393695ba12149b505 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 1 Aug 2024 00:24:29 +0300
Subject: [PATCH 233/340] Code reformat using IJ4 code style (part 21).

---
 .../bitwise/IncompatibleMaskJSInspection.java |  29 +-
 ...ointlessBitwiseExpressionJSInspection.java | 446 ++++++++----------
 ...essBitwiseExpressionJSInspectionState.java |  44 +-
 .../bitwise/ShiftOutOfRangeJSInspection.java  |  10 +-
 .../bugs/DivideByZeroJSInspection.java        |  22 +-
 ...ityComparisonWithCoercionJSInspection.java | 178 +++----
 ...tCircuitBooleanExpressionJSInspection.java |   2 +-
 .../sixrr/inspectjs/bugs/RecursionUtils.java  | 371 ++++++---------
 .../inspectjs/bugs/RecursionVisitor.java      |   9 +-
 ...extLabelInSwitchStatementJSInspection.java |   2 +-
 .../AnonymousFunctionJSInspection.java        |  17 +-
 .../confusing/BlockStatementJSInspection.java |  15 +-
 .../ConditionalExpressionJSInspection.java    |  72 ++-
 ...usingFloatingPointLiteralJSInspection.java |  43 +-
 .../ConfusingPlusesOrMinusesJSInspection.java |  11 +-
 .../DynamicallyGeneratedCodeJSInspection.java |  10 +-
 .../EmptyStatementBodyJSInspection.java       | 291 +++++-------
 .../EmptyStatementBodyJSInspectionState.java  |  44 +-
 ...rementDecrementResultUsedJSInspection.java |  20 +-
 .../confusing/MagicNumberJSInspection.java    |  18 +-
 ...atedConditionalExpressionJSInspection.java |   6 +-
 .../NegatedIfStatementJSInspection.java       |   8 +-
 .../confusing/NestedFunctionJSInspection.java | 109 ++---
 .../NestedFunctionJSInspectionState.java      |  44 +-
 intentions/pom.xml                            | 106 ++---
 25 files changed, 880 insertions(+), 1047 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
index 006b58fe..4c1d36a8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
@@ -39,11 +39,12 @@ public String getGroupDisplayName() {
     @Override
     @Nonnull
     public String buildErrorString(Object state, Object... args) {
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression) args[0];
+        final JSBinaryExpression binaryExpression = (JSBinaryExpression)args[0];
         final IElementType tokenType = binaryExpression.getOperationSign();
         if (JSTokenTypes.EQEQ.equals(tokenType)) {
             return InspectionJSLocalize.incompatibleMaskOperationProblemDescriptorAlwaysFalse().get();
-        } else {
+        }
+        else {
             return InspectionJSLocalize.incompatibleMaskOperationProblemDescriptorAlwaysTrue().get();
         }
     }
@@ -76,11 +77,12 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
                 return;
             }
             if (isConstantMask(strippedLhs) && ExpressionUtil.isConstantExpression(strippedRhs)) {
-                if (isIncompatibleMask((JSBinaryExpression) strippedLhs, strippedRhs)) {
+                if (isIncompatibleMask((JSBinaryExpression)strippedLhs, strippedRhs)) {
                     registerError(expression, expression);
                 }
-            } else if (isConstantMask(strippedRhs) && ExpressionUtil.isConstantExpression(strippedLhs)) {
-                if (isIncompatibleMask((JSBinaryExpression) strippedRhs, strippedLhs)) {
+            }
+            else if (isConstantMask(strippedRhs) && ExpressionUtil.isConstantExpression(strippedLhs)) {
+                if (isIncompatibleMask((JSBinaryExpression)strippedRhs, strippedLhs)) {
                     registerError(expression, expression);
                 }
             }
@@ -89,28 +91,29 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
         private static boolean isIncompatibleMask(JSBinaryExpression maskExpression, JSExpression constantExpression) {
             final IElementType tokenType = maskExpression.getOperationSign();
             final Object constantValue = ExpressionUtil.computeConstantExpression(constantExpression);
-            if (!(constantValue instanceof Integer)){
+            if (!(constantValue instanceof Integer)) {
                 return false;
             }
-            final int constantLongValue = (Integer) constantValue;
+            final int constantLongValue = (Integer)constantValue;
             final JSExpression maskRhs = maskExpression.getROperand();
             final JSExpression maskLhs = maskExpression.getLOperand();
             final int constantMaskValue;
             if (ExpressionUtil.isConstantExpression(maskRhs)) {
                 final Object rhsValue =
-                        ExpressionUtil.computeConstantExpression(maskRhs);
+                    ExpressionUtil.computeConstantExpression(maskRhs);
                 if (!(rhsValue instanceof Integer)) {
                     return false; // Might indeed be the case with "null" literal
                     // whoes constant value evaluates to null. Check out (a|null) case.
                 }
-                constantMaskValue = (Integer) rhsValue;
-            } else {
+                constantMaskValue = (Integer)rhsValue;
+            }
+            else {
                 final Object lhsValue =
-                        ExpressionUtil.computeConstantExpression(maskLhs);
+                    ExpressionUtil.computeConstantExpression(maskLhs);
                 if (!(lhsValue instanceof Integer)) {
                     return false;
                 }
-                constantMaskValue = (Integer) lhsValue;
+                constantMaskValue = (Integer)lhsValue;
             }
 
             if (JSTokenTypes.OR.equals(tokenType)) {
@@ -133,7 +136,7 @@ private static boolean isConstantMask(JSExpression expression) {
             if (!(expression instanceof JSBinaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
             final IElementType tokenType = binaryExpression.getOperationSign();
             if (!JSTokenTypes.OR.equals(tokenType) && !JSTokenTypes.AND.equals(tokenType)) {
                 return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index 5908c4f1..b7f817af 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -24,251 +24,203 @@
 import java.util.Set;
 
 @ExtensionImpl
-public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection
-{
-	static final Set<IElementType> bitwiseTokens = new HashSet<>(6);
-
-	static
-	{
-		bitwiseTokens.add(JSTokenTypes.AND);
-		bitwiseTokens.add(JSTokenTypes.OR);
-		bitwiseTokens.add(JSTokenTypes.XOR);
-		bitwiseTokens.add(JSTokenTypes.LTLT);
-		bitwiseTokens.add(JSTokenTypes.GTGT);
-		bitwiseTokens.add(JSTokenTypes.GTGTGT);
-	}
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.pointlessBitwiseExpressionDisplayName().get();
-	}
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.BITWISE_GROUP_NAME.get();
-	}
-
-	@RequiredReadAction
-	@Override
-	@Nonnull
-	public String buildErrorString(Object state, Object... args)
-	{
-		final String replacementExpression = calculateReplacementExpression((JSExpression) args[0], (PointlessBitwiseExpressionJSInspectionState) state);
-		return InspectionJSLocalize.pointlessBitwiseExpressionProblemDescriptor(replacementExpression).get();
-	}
-
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return true;
-	}
-
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new PointlessBitwiseExpressionJSInspectionState();
-	}
-
-	@RequiredReadAction
-	String calculateReplacementExpression(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state)
-	{
-		final JSBinaryExpression exp = (JSBinaryExpression) expression;
-		final JSExpression lhs = exp.getLOperand();
-		final JSExpression rhs = exp.getROperand();
-		final IElementType tokenType = exp.getOperationSign();
-		assert rhs != null;
-		if(tokenType.equals(JSTokenTypes.AND))
-		{
-			if(isZero(lhs, state) || isAllOnes(rhs, state))
-			{
-				return lhs.getText();
-			}
-			else
-			{
-				return rhs.getText();
-			}
-		}
-		else if(tokenType.equals(JSTokenTypes.OR))
-		{
-			if(isZero(lhs, state) || isAllOnes(rhs, state))
-			{
-				return rhs.getText();
-			}
-			else
-			{
-				return lhs.getText();
-			}
-		}
-		else if(tokenType.equals(JSTokenTypes.XOR))
-		{
-			if(isAllOnes(lhs, state))
-			{
-				return '~' + rhs.getText();
-			}
-			else if(isAllOnes(rhs, state))
-			{
-				return '~' + lhs.getText();
-			}
-			else if(isZero(rhs, state))
-			{
-				return lhs.getText();
-			}
-			else
-			{
-				return rhs.getText();
-			}
-		}
-		else if(tokenType.equals(JSTokenTypes.LTLT) ||
-				tokenType.equals(JSTokenTypes.GTGT) ||
-				tokenType.equals(JSTokenTypes.GTGTGT))
-		{
-			return lhs.getText();
-		}
-		else
-		{
-			return "";
-		}
-	}
-
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new PointlessBitwiseVisitor();
-	}
-
-	@Override
-	public InspectionJSFix buildFix(PsiElement location, Object state)
-	{
-		return new PointlessBitwiseFix(state);
-	}
-
-	private class PointlessBitwiseFix extends InspectionJSFix
-	{
-		private final PointlessBitwiseExpressionJSInspectionState myState;
-
-		public PointlessBitwiseFix(Object state)
-		{
-			myState = (PointlessBitwiseExpressionJSInspectionState) state;
-		}
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return InspectionJSLocalize.pointlessBitwiseExpressionSimplifyQuickfix().get();
-		}
-
-		@Override
-		@RequiredReadAction
-		public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException
-		{
-			final JSExpression expression = (JSExpression) descriptor.getPsiElement();
-			final String newExpression = calculateReplacementExpression(expression, myState);
-			replaceExpression(expression, newExpression);
-		}
-	}
-
-	private class PointlessBitwiseVisitor extends BaseInspectionVisitor<PointlessBitwiseExpressionJSInspectionState>
-	{
-		@Override
-		@RequiredReadAction
-		public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression)
-		{
-			super.visitJSBinaryExpression(expression);
-			final IElementType sign = expression.getOperationSign();
-			if(!bitwiseTokens.contains(sign))
-			{
-				return;
-			}
-
-			final JSExpression rhs = expression.getROperand();
-			if(rhs == null)
-			{
-				return;
-			}
-
-			final JSExpression lhs = expression.getLOperand();
-
-			final boolean isPointless;
-			if(JSTokenTypes.AND.equals(sign))
-			{
-				isPointless = andExpressionIsPointless(lhs, rhs);
-			}
-			else if(JSTokenTypes.OR.equals(sign))
-			{
-				isPointless = orExpressionIsPointless(lhs, rhs);
-			}
-			else if(JSTokenTypes.XOR.equals(sign))
-			{
-				isPointless = xorExpressionIsPointless(lhs, rhs);
-			}
-			else if(JSTokenTypes.LTLT.equals(sign) ||
-					JSTokenTypes.GTGT.equals(sign) ||
-					JSTokenTypes.GTGTGT.equals(sign))
-			{
-				isPointless = shiftExpressionIsPointless(rhs);
-			}
-			else
-			{
-				isPointless = false;
-			}
-			if(isPointless)
-			{
-				registerError(expression, expression);
-			}
-		}
-
-		private boolean andExpressionIsPointless(JSExpression lhs,
-												 JSExpression rhs)
-		{
-			return isZero(lhs, myState) || isZero(rhs, myState)
-					|| isAllOnes(lhs, myState) || isAllOnes(rhs, myState);
-		}
-
-		private boolean orExpressionIsPointless(JSExpression lhs,
-												JSExpression rhs)
-		{
-			return isZero(lhs, myState) || isZero(rhs, myState)
-					|| isAllOnes(lhs, myState) || isAllOnes(rhs, myState);
-		}
-
-		private boolean xorExpressionIsPointless(JSExpression lhs,
-												 JSExpression rhs)
-		{
-			return isZero(lhs, myState) || isZero(rhs, myState)
-					|| isAllOnes(lhs, myState) || isAllOnes(rhs, myState);
-		}
-
-		private boolean shiftExpressionIsPointless(JSExpression rhs
-		)
-		{
-			return isZero(rhs, myState);
-		}
-	}
-
-	private boolean isZero(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state)
-	{
-		if(state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression))
-		{
-			return false;
-		}
-		final Object value =
-				ExpressionUtil.computeConstantExpression(expression);
-		return value instanceof Integer && (Integer) value == 0;
-	}
-
-	private boolean isAllOnes(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state)
-	{
-		if (state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression))
-		{
-			return false;
-		}
-		final Object value = ExpressionUtil.computeConstantExpression(expression);
-		return value instanceof Integer intValue && intValue == 0xffffffff;
-	}
+public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection {
+    static final Set<IElementType> bitwiseTokens = new HashSet<>(6);
+
+    static {
+        bitwiseTokens.add(JSTokenTypes.AND);
+        bitwiseTokens.add(JSTokenTypes.OR);
+        bitwiseTokens.add(JSTokenTypes.XOR);
+        bitwiseTokens.add(JSTokenTypes.LTLT);
+        bitwiseTokens.add(JSTokenTypes.GTGT);
+        bitwiseTokens.add(JSTokenTypes.GTGTGT);
+    }
+
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.pointlessBitwiseExpressionDisplayName().get();
+    }
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.BITWISE_GROUP_NAME.get();
+    }
+
+    @RequiredReadAction
+    @Override
+    @Nonnull
+    public String buildErrorString(Object state, Object... args) {
+        final String replacementExpression =
+            calculateReplacementExpression((JSExpression)args[0], (PointlessBitwiseExpressionJSInspectionState)state);
+        return InspectionJSLocalize.pointlessBitwiseExpressionProblemDescriptor(replacementExpression).get();
+    }
+
+    @Override
+    public boolean isEnabledByDefault() {
+        return true;
+    }
+
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new PointlessBitwiseExpressionJSInspectionState();
+    }
+
+    @RequiredReadAction
+    String calculateReplacementExpression(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state) {
+        final JSBinaryExpression exp = (JSBinaryExpression)expression;
+        final JSExpression lhs = exp.getLOperand();
+        final JSExpression rhs = exp.getROperand();
+        final IElementType tokenType = exp.getOperationSign();
+        assert rhs != null;
+        if (tokenType.equals(JSTokenTypes.AND)) {
+            if (isZero(lhs, state) || isAllOnes(rhs, state)) {
+                return lhs.getText();
+            }
+            else {
+                return rhs.getText();
+            }
+        }
+        else if (tokenType.equals(JSTokenTypes.OR)) {
+            if (isZero(lhs, state) || isAllOnes(rhs, state)) {
+                return rhs.getText();
+            }
+            else {
+                return lhs.getText();
+            }
+        }
+        else if (tokenType.equals(JSTokenTypes.XOR)) {
+            if (isAllOnes(lhs, state)) {
+                return '~' + rhs.getText();
+            }
+            else if (isAllOnes(rhs, state)) {
+                return '~' + lhs.getText();
+            }
+            else if (isZero(rhs, state)) {
+                return lhs.getText();
+            }
+            else {
+                return rhs.getText();
+            }
+        }
+        else if (tokenType.equals(JSTokenTypes.LTLT) ||
+            tokenType.equals(JSTokenTypes.GTGT) ||
+            tokenType.equals(JSTokenTypes.GTGTGT)) {
+            return lhs.getText();
+        }
+        else {
+            return "";
+        }
+    }
+
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new PointlessBitwiseVisitor();
+    }
+
+    @Override
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
+        return new PointlessBitwiseFix(state);
+    }
+
+    private class PointlessBitwiseFix extends InspectionJSFix {
+        private final PointlessBitwiseExpressionJSInspectionState myState;
+
+        public PointlessBitwiseFix(Object state) {
+            myState = (PointlessBitwiseExpressionJSInspectionState)state;
+        }
+
+        @Override
+        @Nonnull
+        public String getName() {
+            return InspectionJSLocalize.pointlessBitwiseExpressionSimplifyQuickfix().get();
+        }
+
+        @Override
+        @RequiredReadAction
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final JSExpression expression = (JSExpression)descriptor.getPsiElement();
+            final String newExpression = calculateReplacementExpression(expression, myState);
+            replaceExpression(expression, newExpression);
+        }
+    }
+
+    private class PointlessBitwiseVisitor extends BaseInspectionVisitor<PointlessBitwiseExpressionJSInspectionState> {
+        @Override
+        @RequiredReadAction
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+            super.visitJSBinaryExpression(expression);
+            final IElementType sign = expression.getOperationSign();
+            if (!bitwiseTokens.contains(sign)) {
+                return;
+            }
+
+            final JSExpression rhs = expression.getROperand();
+            if (rhs == null) {
+                return;
+            }
+
+            final JSExpression lhs = expression.getLOperand();
+
+            final boolean isPointless;
+            if (JSTokenTypes.AND.equals(sign)) {
+                isPointless = andExpressionIsPointless(lhs, rhs);
+            }
+            else if (JSTokenTypes.OR.equals(sign)) {
+                isPointless = orExpressionIsPointless(lhs, rhs);
+            }
+            else if (JSTokenTypes.XOR.equals(sign)) {
+                isPointless = xorExpressionIsPointless(lhs, rhs);
+            }
+            else if (JSTokenTypes.LTLT.equals(sign) ||
+                JSTokenTypes.GTGT.equals(sign) ||
+                JSTokenTypes.GTGTGT.equals(sign)) {
+                isPointless = shiftExpressionIsPointless(rhs);
+            }
+            else {
+                isPointless = false;
+            }
+            if (isPointless) {
+                registerError(expression, expression);
+            }
+        }
+
+        private boolean andExpressionIsPointless(JSExpression lhs, JSExpression rhs) {
+            return isZero(lhs, myState) || isZero(rhs, myState)
+                || isAllOnes(lhs, myState) || isAllOnes(rhs, myState);
+        }
+
+        private boolean orExpressionIsPointless(JSExpression lhs, JSExpression rhs) {
+            return isZero(lhs, myState) || isZero(rhs, myState)
+                || isAllOnes(lhs, myState) || isAllOnes(rhs, myState);
+        }
+
+        private boolean xorExpressionIsPointless(JSExpression lhs, JSExpression rhs) {
+            return isZero(lhs, myState) || isZero(rhs, myState)
+                || isAllOnes(lhs, myState) || isAllOnes(rhs, myState);
+        }
+
+        private boolean shiftExpressionIsPointless(JSExpression rhs) {
+            return isZero(rhs, myState);
+        }
+    }
+
+    private boolean isZero(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state) {
+        if (state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression)) {
+            return false;
+        }
+        final Object value =
+            ExpressionUtil.computeConstantExpression(expression);
+        return value instanceof Integer && (Integer)value == 0;
+    }
+
+    private boolean isAllOnes(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state) {
+        if (state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression)) {
+            return false;
+        }
+        final Object value = ExpressionUtil.computeConstantExpression(expression);
+        return value instanceof Integer intValue && intValue == 0xffffffff;
+    }
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
index 575e6047..cce1aa1a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
@@ -13,29 +13,29 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class PointlessBitwiseExpressionJSInspectionState implements InspectionToolState<PointlessBitwiseExpressionJSInspectionState>
-{
-	public boolean m_ignoreExpressionsContainingConstants = false;
+public class PointlessBitwiseExpressionJSInspectionState implements InspectionToolState<PointlessBitwiseExpressionJSInspectionState> {
+    public boolean m_ignoreExpressionsContainingConstants = false;
 
-	@Nullable
-	@Override
-	public UnnamedConfigurable createConfigurable()
-	{
-		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
-		builder.checkBox(InspectionJSLocalize.pointlessBitwiseExpressionIgnoreOption(), () -> m_ignoreExpressionsContainingConstants, b -> m_ignoreExpressionsContainingConstants = b);
-		return builder.buildUnnamed();
-	}
+    @Nullable
+    @Override
+    public UnnamedConfigurable createConfigurable() {
+        ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+        builder.checkBox(
+            InspectionJSLocalize.pointlessBitwiseExpressionIgnoreOption(),
+            () -> m_ignoreExpressionsContainingConstants,
+            b -> m_ignoreExpressionsContainingConstants = b
+        );
+        return builder.buildUnnamed();
+    }
 
-	@Nullable
-	@Override
-	public PointlessBitwiseExpressionJSInspectionState getState()
-	{
-		return this;
-	}
+    @Nullable
+    @Override
+    public PointlessBitwiseExpressionJSInspectionState getState() {
+        return this;
+    }
 
-	@Override
-	public void loadState(PointlessBitwiseExpressionJSInspectionState state)
-	{
-		XmlSerializerUtil.copyBean(state, this);
-	}
+    @Override
+    public void loadState(PointlessBitwiseExpressionJSInspectionState state) {
+        XmlSerializerUtil.copyBean(state, this);
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index f0bbf392..82465591 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -31,7 +31,7 @@ public String getGroupDisplayName() {
     @Override
     @Nonnull
     public String buildErrorString(Object state, Object... args) {
-        final Integer value = (Integer) args[0];
+        final Integer value = (Integer)args[0];
         return value > 0
             ? InspectionJSLocalize.shiftOperationByInappropriateConstantProblemDescriptorTooLarge().get()
             : InspectionJSLocalize.shiftOperationByInappropriateConstantProblemDescriptorNegative().get();
@@ -52,10 +52,8 @@ private static class ShiftOutOfRange extends BaseInspectionVisitor {
         public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final IElementType tokenType = expression.getOperationSign();
-            if (tokenType == null ||
-                  ( !tokenType.equals(JSTokenTypes.LTLT) &&
-                    !tokenType.equals(JSTokenTypes.GTGT) &&
-                    !tokenType.equals(JSTokenTypes.GTGTGT) )) {
+            if (tokenType == null || (!JSTokenTypes.LTLT.equals(tokenType)
+                && !JSTokenTypes.GTGT.equals(tokenType) && !JSTokenTypes.GTGTGT.equals(tokenType))) {
                 return;
             }
             final JSExpression rhs = expression.getROperand();
@@ -69,7 +67,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             if (!(valueObject instanceof Integer)) {
                 return;
             }
-            final int value = (Integer) valueObject;
+            final int value = (Integer)valueObject;
             if (value < 0 || value > 31) {
                 registerError(expression, value);
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index 327a6223..5c52f92f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -56,11 +56,10 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             }
             final IElementType tokenType = expression.getOperationSign();
             if (!JSTokenTypes.DIV.equals(tokenType) &&
-                    !JSTokenTypes.PERC.equals(tokenType)) {
+                !JSTokenTypes.PERC.equals(tokenType)) {
                 return;
             }
-            if(!isZero(rhs))
-            {
+            if (!isZero(rhs)) {
                 return;
             }
             registerError(expression);
@@ -75,7 +74,7 @@ public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
             }
             final IElementType tokenType = expression.getOperationSign();
             if (!JSTokenTypes.DIVEQ.equals(tokenType)
-                    && !JSTokenTypes.PERCEQ.equals(tokenType)) {
+                && !JSTokenTypes.PERCEQ.equals(tokenType)) {
                 return;
             }
             if (!isZero(rhs)) {
@@ -86,13 +85,12 @@ public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
     }
 
     private static boolean isZero(JSExpression expression) {
-        @NonNls
-        final String text = expression.getText();
-        return "0".equals(text) ||
-                "0x0".equals(text) ||
-                "0X0".equals(text) ||
-                "0.0".equals(text) ||
-                "0L".equals(text) ||
-                "0l".equals(text);
+        @NonNls final String text = expression.getText();
+        return "0".equals(text)
+            || "0x0".equals(text)
+            || "0X0".equals(text)
+            || "0.0".equals(text)
+            || "0L".equals(text)
+            || "0l".equals(text);
     }
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index be684bd7..6a266764 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -20,106 +20,106 @@
 
 @ExtensionImpl
 public class EqualityComparisonWithCoercionJSInspection extends JavaScriptInspection {
-	@Override
-	@Nonnull
-	public String getID() {
-		return "EqualityComparisonWithCoercionJS";
-	}
+    @Override
+    @Nonnull
+    public String getID() {
+        return "EqualityComparisonWithCoercionJS";
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName() {
-		return InspectionJSLocalize.equalityComparisonWithCoercionDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.equalityComparisonWithCoercionDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName() {
-		return JSGroupNames.BUGS_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.BUGS_GROUP_NAME.get();
+    }
 
-	@RequiredReadAction
-	@Override
-	@Nonnull
-	protected String buildErrorString(Object state, Object... args) {
-		return InspectionJSLocalize.equalityComparisonWithCoercionErrorString().get();
-	}
+    @RequiredReadAction
+    @Override
+    @Nonnull
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.equalityComparisonWithCoercionErrorString().get();
+    }
 
-	@Override
-	protected InspectionJSFix buildFix(PsiElement location, Object state) {
-		final JSBinaryExpression expression = (JSBinaryExpression) location;
-		final IElementType sign = expression.getOperationSign();
-		if (JSTokenTypes.EQEQ == sign) {
-			return new EqualityComparisonWithCoercionFix("===");
-		} else if (JSTokenTypes.NE == sign) {
-			return new EqualityComparisonWithCoercionFix("!==");
-		}
-		return null;
-	}
+    @Override
+    protected InspectionJSFix buildFix(PsiElement location, Object state) {
+        final JSBinaryExpression expression = (JSBinaryExpression)location;
+        final IElementType sign = expression.getOperationSign();
+        if (JSTokenTypes.EQEQ == sign) {
+            return new EqualityComparisonWithCoercionFix("===");
+        }
+        else if (JSTokenTypes.NE == sign) {
+            return new EqualityComparisonWithCoercionFix("!==");
+        }
+        return null;
+    }
 
-	private static class EqualityComparisonWithCoercionFix extends InspectionJSFix {
-		private final String sign;
+    private static class EqualityComparisonWithCoercionFix extends InspectionJSFix {
+        private final String sign;
 
-		public EqualityComparisonWithCoercionFix(String sign) {
-			this.sign = sign;
-		}
+        public EqualityComparisonWithCoercionFix(String sign) {
+            this.sign = sign;
+        }
 
-		@Override
-		@Nonnull
-		public String getName() {
-			return InspectionJSLocalize.equalityComparisonWithCoercionFix(sign).get();
-		}
+        @Override
+        @Nonnull
+        public String getName() {
+            return InspectionJSLocalize.equalityComparisonWithCoercionFix(sign).get();
+        }
 
-		@Override
-		protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-			final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
-			final JSExpression lhs = expression.getLOperand();
-			final JSExpression rhs = expression.getROperand();
-			replaceExpression(expression, lhs.getText() + sign + rhs.getText());
-		}
-	}
+        @Override
+        protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
+            final JSExpression lhs = expression.getLOperand();
+            final JSExpression rhs = expression.getROperand();
+            replaceExpression(expression, lhs.getText() + sign + rhs.getText());
+        }
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor() {
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
         return new EqualityComparisonWithCoercionVisitor();
     }
 
-	private static class EqualityComparisonWithCoercionVisitor extends BaseInspectionVisitor {
-		@Override
-		public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
-			super.visitJSBinaryExpression(expression);
-			final JSExpression lhs = expression.getLOperand();
-			if (lhs == null) {
-				return;
-			}
-			final JSExpression rhs = expression.getROperand();
-			if (rhs == null) {
-				return;
-			}
-			final IElementType tokenType = expression.getOperationSign();
-			if (!JSTokenTypes.EQEQ.equals(tokenType) && !JSTokenTypes.NE.equals(tokenType)) {
-				return;
-			}
-			if(!mayCauseCoercion(rhs) &&!mayCauseCoercion(lhs)) {
-				return;
-			}
-			registerError(expression);
-		}
-	}
+    private static class EqualityComparisonWithCoercionVisitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+            super.visitJSBinaryExpression(expression);
+            final JSExpression lhs = expression.getLOperand();
+            if (lhs == null) {
+                return;
+            }
+            final JSExpression rhs = expression.getROperand();
+            if (rhs == null) {
+                return;
+            }
+            final IElementType tokenType = expression.getOperationSign();
+            if (!JSTokenTypes.EQEQ.equals(tokenType) && !JSTokenTypes.NE.equals(tokenType)) {
+                return;
+            }
+            if (!mayCauseCoercion(rhs) && !mayCauseCoercion(lhs)) {
+                return;
+            }
+            registerError(expression);
+        }
+    }
 
-	private static boolean mayCauseCoercion(JSExpression expression) {
-		@NonNls
-		final String text = expression.getText();
-		return "0".equals(text) ||
-			"0x0".equals(text) ||
-			"0X0".equals(text) ||
-			"0.0".equals(text) ||
-			"0L".equals(text) ||
-			"0l".equals(text) ||
-			"null".equals(text) ||
-			"undefined".equals(text) ||
-			"true".equals(text) ||
-			"false".equals(text) ||
-			"''".equals(text);
-	}
+    private static boolean mayCauseCoercion(JSExpression expression) {
+        @NonNls final String text = expression.getText();
+        return "0".equals(text)
+            || "0x0".equals(text)
+            || "0X0".equals(text)
+            || "0.0".equals(text)
+            || "0L".equals(text)
+            || "0l".equals(text)
+            || "null".equals(text)
+            || "undefined".equals(text)
+            || "true".equals(text)
+            || "false".equals(text)
+            || "''".equals(text);
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index 9731fe8e..4767dbe9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -53,7 +53,7 @@ public String getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
+            final JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
             final JSExpression lhs = expression.getLOperand();
             final JSExpression rhs = expression.getROperand();
             final IElementType operationSign = expression.getOperationSign();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
index e9e754fc..40a40537 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
@@ -9,75 +9,65 @@
 import consulo.language.psi.PsiElement;
 
 public class RecursionUtils {
-
     private RecursionUtils() {
         super();
     }
 
-    public static boolean statementMayReturnBeforeRecursing(
-            JSStatement statement, JSFunction function) {
+    public static boolean statementMayReturnBeforeRecursing(JSStatement statement, JSFunction function) {
         if (statement == null) {
             return true;
         }
-        if (statement instanceof JSBreakStatement ||
-                statement instanceof JSContinueStatement ||
-                statement instanceof JSThrowStatement ||
-                statement instanceof JSExpressionStatement ||
-                statement instanceof JSEmptyStatement ||
-                statement instanceof JSVarStatement) {
+        if (statement instanceof JSBreakStatement
+            || statement instanceof JSContinueStatement
+            || statement instanceof JSThrowStatement
+            || statement instanceof JSExpressionStatement
+            || statement instanceof JSEmptyStatement
+            || statement instanceof JSVarStatement) {
             return false;
-        } else if (statement instanceof JSReturnStatement) {
-            final JSReturnStatement returnStatement =
-                    (JSReturnStatement) statement;
+        }
+        else if (statement instanceof JSReturnStatement returnStatement) {
             final JSExpression returnValue = returnStatement.getExpression();
-            if (returnValue != null) {
-                if (expressionDefinitelyRecurses(returnValue, function)) {
-                    return false;
-                }
-            }
-            return true;
-        } else if (statement instanceof JSForStatement) {
-            return forStatementMayReturnBeforeRecursing(
-                    (JSForStatement) statement, function);
-        } else if (statement instanceof JSForInStatement) {
-            return foreachStatementMayReturnBeforeRecursing(
-                    (JSForInStatement) statement, function);
-        } else if (statement instanceof JSWhileStatement) {
-            return whileStatementMayReturnBeforeRecursing(
-                    (JSWhileStatement) statement, function);
-        } else if (statement instanceof JSDoWhileStatement) {
-            return doWhileStatementMayReturnBeforeRecursing(
-                    (JSDoWhileStatement) statement, function);
-        } else if (statement instanceof JSBlockStatement) {
-            final JSBlockStatement blockStatement =
-                    (JSBlockStatement) statement;
+            return returnValue == null || !expressionDefinitelyRecurses(returnValue, function);
+        }
+        else if (statement instanceof JSForStatement forStatement) {
+            return forStatementMayReturnBeforeRecursing(forStatement, function);
+        }
+        else if (statement instanceof JSForInStatement forInStatement) {
+            return foreachStatementMayReturnBeforeRecursing(forInStatement, function);
+        }
+        else if (statement instanceof JSWhileStatement whileStatement) {
+            return whileStatementMayReturnBeforeRecursing(whileStatement, function);
+        }
+        else if (statement instanceof JSDoWhileStatement doWhileStatement) {
+            return doWhileStatementMayReturnBeforeRecursing(doWhileStatement, function);
+        }
+        else if (statement instanceof JSBlockStatement blockStatement) {
             return codeBlockMayReturnBeforeRecursing(blockStatement, function, false);
-        } else if (statement instanceof JSLabeledStatement) {
-            return labeledStatementMayReturnBeforeRecursing(
-                    (JSLabeledStatement) statement, function);
-        } else if (statement instanceof JSIfStatement) {
-            return ifStatementMayReturnBeforeRecursing(
-                    (JSIfStatement) statement, function);
-        } else if (statement instanceof JSTryStatement) {
-            return tryStatementMayReturnBeforeRecursing(
-                    (JSTryStatement) statement, function);
-        } else if (statement instanceof JSSwitchStatement) {
-            return switchStatementMayReturnBeforeRecursing(
-                    (JSSwitchStatement) statement, function);
-        } else {
+        }
+        else if (statement instanceof JSLabeledStatement labeledStatement) {
+            return labeledStatementMayReturnBeforeRecursing(labeledStatement, function);
+        }
+        else if (statement instanceof JSIfStatement ifStatement) {
+            return ifStatementMayReturnBeforeRecursing(ifStatement, function);
+        }
+        else if (statement instanceof JSTryStatement tryStatement) {
+            return tryStatementMayReturnBeforeRecursing(tryStatement, function);
+        }
+        else if (statement instanceof JSSwitchStatement switchStatement) {
+            return switchStatementMayReturnBeforeRecursing(switchStatement, function);
+        }
+        else {
             // unknown statement type
             return true;
         }
     }
 
-    private static boolean doWhileStatementMayReturnBeforeRecursing(
-            JSDoWhileStatement loopStatement, JSFunction function) {
+    private static boolean doWhileStatementMayReturnBeforeRecursing(JSDoWhileStatement loopStatement, JSFunction function) {
         final JSStatement body = loopStatement.getBody();
         return statementMayReturnBeforeRecursing(body, function);
     }
 
-    private static boolean whileStatementMayReturnBeforeRecursing(
-            JSWhileStatement loopStatement, JSFunction function) {
+    private static boolean whileStatementMayReturnBeforeRecursing(JSWhileStatement loopStatement, JSFunction function) {
         final JSExpression test = loopStatement.getCondition();
         if (expressionDefinitelyRecurses(test, function)) {
             return false;
@@ -86,8 +76,7 @@ private static boolean whileStatementMayReturnBeforeRecursing(
         return statementMayReturnBeforeRecursing(body, function);
     }
 
-    private static boolean forStatementMayReturnBeforeRecursing(
-            JSForStatement loopStatement, JSFunction function) {
+    private static boolean forStatementMayReturnBeforeRecursing(JSForStatement loopStatement, JSFunction function) {
         final JSExpression initialization = loopStatement.getInitialization();
 
         if (expressionDefinitelyRecurses(initialization, function)) {
@@ -101,8 +90,7 @@ private static boolean forStatementMayReturnBeforeRecursing(
         return statementMayReturnBeforeRecursing(body, function);
     }
 
-    private static boolean foreachStatementMayReturnBeforeRecursing(
-            JSForInStatement loopStatement, JSFunction function) {
+    private static boolean foreachStatementMayReturnBeforeRecursing(JSForInStatement loopStatement, JSFunction function) {
         final JSExpression test = loopStatement.getCollectionExpression();
         if (expressionDefinitelyRecurses(test, function)) {
             return false;
@@ -111,9 +99,7 @@ private static boolean foreachStatementMayReturnBeforeRecursing(
         return statementMayReturnBeforeRecursing(body, function);
     }
 
-    private static boolean switchStatementMayReturnBeforeRecursing(
-            JSSwitchStatement switchStatement, JSFunction function) {
-
+    private static boolean switchStatementMayReturnBeforeRecursing(JSSwitchStatement switchStatement, JSFunction function) {
         final JSCaseClause[] clauses = switchStatement.getCaseClauses();
         if (clauses == null) {
             return true;
@@ -130,8 +116,7 @@ private static boolean switchStatementMayReturnBeforeRecursing(
         return false;
     }
 
-    private static boolean tryStatementMayReturnBeforeRecursing(
-            JSTryStatement tryStatement, JSFunction function) {
+    private static boolean tryStatementMayReturnBeforeRecursing(JSTryStatement tryStatement, JSFunction function) {
         final JSStatement finallyBlock = tryStatement.getFinallyStatement();
         if (finallyBlock != null) {
             if (statementMayReturnBeforeRecursing(finallyBlock, function)) {
@@ -153,8 +138,7 @@ private static boolean tryStatementMayReturnBeforeRecursing(
         return statementMayReturnBeforeRecursing(catchBlockStatement, function);
     }
 
-    private static boolean ifStatementMayReturnBeforeRecursing(
-            JSIfStatement ifStatement, JSFunction function) {
+    private static boolean ifStatementMayReturnBeforeRecursing(JSIfStatement ifStatement, JSFunction function) {
         final JSExpression test = ifStatement.getCondition();
         if (expressionDefinitelyRecurses(test, function)) {
             return false;
@@ -164,18 +148,15 @@ private static boolean ifStatementMayReturnBeforeRecursing(
             return true;
         }
         final JSStatement elseBranch = ifStatement.getElse();
-        return elseBranch != null &&
-                statementMayReturnBeforeRecursing(elseBranch, function);
+        return elseBranch != null && statementMayReturnBeforeRecursing(elseBranch, function);
     }
 
-    private static boolean labeledStatementMayReturnBeforeRecursing(
-            JSLabeledStatement labeledStatement, JSFunction function) {
+    private static boolean labeledStatementMayReturnBeforeRecursing(JSLabeledStatement labeledStatement, JSFunction function) {
         final JSStatement statement = labeledStatement.getStatement();
         return statementMayReturnBeforeRecursing(statement, function);
     }
 
-    private static boolean codeBlockMayReturnBeforeRecursing(
-            JSBlockStatement block, JSFunction function, boolean endsInImplicitReturn) {
+    private static boolean codeBlockMayReturnBeforeRecursing(JSBlockStatement block, JSFunction function, boolean endsInImplicitReturn) {
         if (block == null) {
             return true;
         }
@@ -197,83 +178,67 @@ public static boolean functionMayRecurse(@Nonnull JSFunction function) {
         return recursionVisitor.isRecursive();
     }
 
-    private static boolean expressionDefinitelyRecurses(JSExpression exp,
-                                                        JSFunction function) {
+    private static boolean expressionDefinitelyRecurses(JSExpression exp, JSFunction function) {
         if (exp == null) {
             return false;
         }
-        if (exp instanceof JSCallExpression) {
-            return functionCallExpressionDefinitelyRecurses(
-                    (JSCallExpression) exp, function);
+        if (exp instanceof JSCallExpression callExpression) {
+            return functionCallExpressionDefinitelyRecurses(callExpression, function);
         }
-        if (exp instanceof JSAssignmentExpression) {
-            return assignmentExpressionDefinitelyRecurses(
-                    (JSAssignmentExpression) exp, function);
+        if (exp instanceof JSAssignmentExpression assignmentExpression) {
+            return assignmentExpressionDefinitelyRecurses(assignmentExpression, function);
         }
-        if (exp instanceof JSArrayLiteralExpression) {
-            return arrayInitializerExpressionDefinitelyRecurses(
-                    (JSArrayLiteralExpression) exp, function);
+        if (exp instanceof JSArrayLiteralExpression arrayLiteralExpression) {
+            return arrayInitializerExpressionDefinitelyRecurses(arrayLiteralExpression, function);
         }
-        if (exp instanceof JSPrefixExpression) {
-            return prefixExpressionDefinitelyRecurses(
-                    (JSPrefixExpression) exp, function);
+        if (exp instanceof JSPrefixExpression prefixExpression) {
+            return prefixExpressionDefinitelyRecurses(prefixExpression, function);
         }
-        if (exp instanceof JSPostfixExpression) {
-            return postfixExpressionDefinitelyRecurses(
-                    (JSPostfixExpression) exp, function);
+        if (exp instanceof JSPostfixExpression postfixExpression) {
+            return postfixExpressionDefinitelyRecurses(postfixExpression, function);
         }
-        if (exp instanceof JSBinaryExpression) {
-            return binaryExpressionDefinitelyRecurses(
-                    (JSBinaryExpression) exp, function);
+        if (exp instanceof JSBinaryExpression binaryExpression) {
+            return binaryExpressionDefinitelyRecurses(binaryExpression, function);
         }
-        if (exp instanceof JSConditionalExpression) {
-            return conditionalExpressionDefinitelyRecurses(
-                    (JSConditionalExpression) exp, function);
+        if (exp instanceof JSConditionalExpression conditionalExpression) {
+            return conditionalExpressionDefinitelyRecurses(conditionalExpression, function);
         }
-        if (exp instanceof JSParenthesizedExpression) {
-            return parenthesizedExpressionDefinitelyRecurses(
-                    (JSParenthesizedExpression) exp, function);
+        if (exp instanceof JSParenthesizedExpression parenthesizedExpression) {
+            return parenthesizedExpressionDefinitelyRecurses(parenthesizedExpression, function);
         }
-        if (exp instanceof JSReferenceExpression) {
-            return referenceExpressionDefinitelyRecurses(
-                    (JSReferenceExpression) exp, function);
+        if (exp instanceof JSReferenceExpression referenceExpression) {
+            return referenceExpressionDefinitelyRecurses(referenceExpression, function);
         }
-        if (exp instanceof JSLiteralExpression ||
-                exp instanceof JSThisExpression) {
+        if (exp instanceof JSLiteralExpression || exp instanceof JSThisExpression) {
             return false;
         }
         return false;
     }
 
-    private static boolean conditionalExpressionDefinitelyRecurses(
-            JSConditionalExpression expression, JSFunction function) {
+    private static boolean conditionalExpressionDefinitelyRecurses(JSConditionalExpression expression, JSFunction function) {
         final JSExpression condExpression = expression.getCondition();
         if (expressionDefinitelyRecurses(condExpression, function)) {
             return true;
         }
         final JSExpression thenExpression = expression.getThen();
         final JSExpression elseExpression = expression.getElse();
-        return expressionDefinitelyRecurses(thenExpression, function)
-                && expressionDefinitelyRecurses(elseExpression, function);
+        return expressionDefinitelyRecurses(thenExpression, function) && expressionDefinitelyRecurses(elseExpression, function);
     }
 
-    private static boolean binaryExpressionDefinitelyRecurses(
-            JSBinaryExpression expression, JSFunction function) {
+    private static boolean binaryExpressionDefinitelyRecurses(JSBinaryExpression expression, JSFunction function) {
         final JSExpression lhs = expression.getLOperand();
         if (expressionDefinitelyRecurses(lhs, function)) {
             return true;
         }
         final IElementType tokenType = expression.getOperationSign();
-        if (JSTokenTypes.ANDAND.equals(tokenType) ||
-                JSTokenTypes.OROR.equals(tokenType)) {
+        if (JSTokenTypes.ANDAND.equals(tokenType) || JSTokenTypes.OROR.equals(tokenType)) {
             return false;
         }
         final JSExpression rhs = expression.getROperand();
         return expressionDefinitelyRecurses(rhs, function);
     }
 
-    private static boolean arrayInitializerExpressionDefinitelyRecurses(
-            JSArrayLiteralExpression expression, JSFunction function) {
+    private static boolean arrayInitializerExpressionDefinitelyRecurses(JSArrayLiteralExpression expression, JSFunction function) {
         final JSExpression[] initializers = expression.getExpressions();
         for (final JSExpression initializer : initializers) {
             if (expressionDefinitelyRecurses(initializer, function)) {
@@ -283,56 +248,41 @@ private static boolean arrayInitializerExpressionDefinitelyRecurses(
         return false;
     }
 
-    private static boolean prefixExpressionDefinitelyRecurses(
-            JSPrefixExpression expression, JSFunction function) {
+    private static boolean prefixExpressionDefinitelyRecurses(JSPrefixExpression expression, JSFunction function) {
         final JSExpression operand = expression.getExpression();
         return expressionDefinitelyRecurses(operand, function);
     }
 
-    private static boolean postfixExpressionDefinitelyRecurses(
-            JSPostfixExpression expression, JSFunction function) {
+    private static boolean postfixExpressionDefinitelyRecurses(JSPostfixExpression expression, JSFunction function) {
         final JSExpression operand = expression.getExpression();
         return expressionDefinitelyRecurses(operand, function);
     }
 
-    private static boolean parenthesizedExpressionDefinitelyRecurses(
-            JSParenthesizedExpression expression, JSFunction function) {
+    private static boolean parenthesizedExpressionDefinitelyRecurses(JSParenthesizedExpression expression, JSFunction function) {
         final JSExpression innerExpression = expression.getInnerExpression();
         return expressionDefinitelyRecurses(innerExpression, function);
     }
 
-    private static boolean referenceExpressionDefinitelyRecurses(
-            JSReferenceExpression expression, JSFunction function) {
-
-        final JSExpression qualifierExpression =
-                expression.getQualifier();
-        return qualifierExpression != null &&
-                expressionDefinitelyRecurses(qualifierExpression, function);
+    private static boolean referenceExpressionDefinitelyRecurses(JSReferenceExpression expression, JSFunction function) {
+        final JSExpression qualifierExpression = expression.getQualifier();
+        return qualifierExpression != null && expressionDefinitelyRecurses(qualifierExpression, function);
     }
 
-    private static boolean assignmentExpressionDefinitelyRecurses(
-            JSAssignmentExpression assignmentExpression, JSFunction function) {
+    private static boolean assignmentExpressionDefinitelyRecurses(JSAssignmentExpression assignmentExpression, JSFunction function) {
         final JSExpression rhs = assignmentExpression.getROperand();
         final JSExpression lhs = assignmentExpression.getLOperand();
-        return expressionDefinitelyRecurses(rhs, function) ||
-                expressionDefinitelyRecurses(lhs, function);
+        return expressionDefinitelyRecurses(rhs, function) || expressionDefinitelyRecurses(lhs, function);
     }
 
 
-    private static boolean functionCallExpressionDefinitelyRecurses(
-            JSCallExpression exp, JSFunction function) {
-        final JSExpression functionExpression =
-                exp.getMethodExpression();
-        if(functionExpression instanceof JSReferenceExpression)
-        {
-            final JSReferenceExpression reference = (JSReferenceExpression) functionExpression;
+    private static boolean functionCallExpressionDefinitelyRecurses(JSCallExpression exp, JSFunction function) {
+        final JSExpression functionExpression = exp.getMethodExpression();
+        if (functionExpression instanceof JSReferenceExpression reference) {
             final PsiElement referent = reference.resolve();
-            if(referent!=null && referent.equals(function))
-            {
+            if (referent != null && referent.equals(function)) {
                 return true;
             }
-            final JSExpression qualifier =
-                    reference.getQualifier();
+            final JSExpression qualifier = reference.getQualifier();
             if (qualifier == null || qualifier instanceof JSThisExpression) {
                 return reference.getText().equals(function.getName());
             }
@@ -342,7 +292,7 @@ private static boolean functionCallExpressionDefinitelyRecurses(
             return true;
         }
         final JSArgumentList argumentList = exp.getArgumentList();
-        final JSExpression[] args = argumentList != null ? argumentList.getArguments(): JSExpression.EMPTY_ARRAY;
+        final JSExpression[] args = argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
         for (final JSExpression arg : args) {
             if (expressionDefinitelyRecurses(arg, function)) {
                 return true;
@@ -351,27 +301,22 @@ private static boolean functionCallExpressionDefinitelyRecurses(
         return false;
     }
 
-    private static boolean statementDefinitelyRecurses(JSStatement statement,
-                                                       JSFunction function) {
+    private static boolean statementDefinitelyRecurses(JSStatement statement, JSFunction function) {
         if (statement == null) {
             return false;
         }
         if (statement instanceof JSBreakStatement ||
-                statement instanceof JSContinueStatement ||
-                statement instanceof JSThrowStatement ||
-                statement instanceof JSEmptyStatement) {
+            statement instanceof JSContinueStatement ||
+            statement instanceof JSThrowStatement ||
+            statement instanceof JSEmptyStatement) {
             return false;
-        } else if (statement instanceof JSExpressionStatement) {
-            final JSExpressionStatement expressionStatement =
-                    (JSExpressionStatement) statement;
-            final JSExpression expression =
-                    expressionStatement.getExpression();
+        }
+        else if (statement instanceof JSExpressionStatement expressionStatement) {
+            final JSExpression expression = expressionStatement.getExpression();
             return expressionDefinitelyRecurses(expression, function);
-        } else if (statement instanceof JSVarStatement) {
-            final JSVarStatement declaration =
-                    (JSVarStatement) statement;
-            final JSVariable[] declaredElements =
-                    declaration.getVariables();
+        }
+        else if (statement instanceof JSVarStatement declaration) {
+            final JSVariable[] declaredElements = declaration.getVariables();
             for (final JSVariable variable : declaredElements) {
                 final JSExpression initializer = variable.getInitializer();
                 if (expressionDefinitelyRecurses(initializer, function)) {
@@ -379,56 +324,50 @@ private static boolean statementDefinitelyRecurses(JSStatement statement,
                 }
             }
             return false;
-        } else if (statement instanceof JSReturnStatement) {
-            final JSReturnStatement returnStatement =
-                    (JSReturnStatement) statement;
+        }
+        else if (statement instanceof JSReturnStatement returnStatement) {
             final JSExpression returnValue = returnStatement.getExpression();
-            if (returnValue != null) {
-                if (expressionDefinitelyRecurses(returnValue, function)) {
-                    return true;
-                }
-            }
-            return false;
-        } else if (statement instanceof JSForStatement) {
-            return forStatementDefinitelyRecurses((JSForStatement)
-                    statement, function);
-        } else if (statement instanceof JSForInStatement) {
-            return foreachStatementDefinitelyRecurses(
-                    (JSForInStatement) statement, function);
-        } else if (statement instanceof JSWhileStatement) {
-            return whileStatementDefinitelyRecurses(
-                    (JSWhileStatement) statement, function);
-        } else if (statement instanceof JSDoWhileStatement) {
-            return doWhileStatementDefinitelyRecurses(
-                    (JSDoWhileStatement) statement, function);
-        } else if (statement instanceof JSBlockStatement) {
-            return codeBlockDefinitelyRecurses((JSBlockStatement) statement, function);
-        } else if (statement instanceof JSLabeledStatement) {
-            return labeledStatementDefinitelyRecurses(
-                    (JSLabeledStatement) statement, function);
-        } else if (statement instanceof JSIfStatement) {
-            return ifStatementDefinitelyRecurses(
-                    (JSIfStatement) statement, function);
-        } else if (statement instanceof JSTryStatement) {
-            return tryStatementDefinitelyRecurses(
-                    (JSTryStatement) statement, function);
-        } else if (statement instanceof JSSwitchStatement) {
-            return switchStatementDefinitelyRecurses(
-                    (JSSwitchStatement) statement, function);
-        } else {
+            return returnValue != null && expressionDefinitelyRecurses(returnValue, function);
+        }
+        else if (statement instanceof JSForStatement forStatement) {
+            return forStatementDefinitelyRecurses(forStatement, function);
+        }
+        else if (statement instanceof JSForInStatement forInStatement) {
+            return foreachStatementDefinitelyRecurses(forInStatement, function);
+        }
+        else if (statement instanceof JSWhileStatement whileStatement) {
+            return whileStatementDefinitelyRecurses(whileStatement, function);
+        }
+        else if (statement instanceof JSDoWhileStatement doWhileStatement) {
+            return doWhileStatementDefinitelyRecurses(doWhileStatement, function);
+        }
+        else if (statement instanceof JSBlockStatement blockStatement) {
+            return codeBlockDefinitelyRecurses(blockStatement, function);
+        }
+        else if (statement instanceof JSLabeledStatement labeledStatement) {
+            return labeledStatementDefinitelyRecurses(labeledStatement, function);
+        }
+        else if (statement instanceof JSIfStatement ifStatement) {
+            return ifStatementDefinitelyRecurses(ifStatement, function);
+        }
+        else if (statement instanceof JSTryStatement tryStatement) {
+            return tryStatementDefinitelyRecurses(tryStatement, function);
+        }
+        else if (statement instanceof JSSwitchStatement switchStatement) {
+            return switchStatementDefinitelyRecurses(switchStatement, function);
+        }
+        else {
             // unknown statement type
             return false;
         }
     }
 
-    private static boolean switchStatementDefinitelyRecurses(
-            JSSwitchStatement switchStatement, JSFunction function) {
+    private static boolean switchStatementDefinitelyRecurses(JSSwitchStatement switchStatement, JSFunction function) {
         final JSExpression switchExpression = switchStatement.getSwitchExpression();
         return expressionDefinitelyRecurses(switchExpression, function);
     }
 
-    private static boolean tryStatementDefinitelyRecurses(
-            JSTryStatement tryStatement, JSFunction function) {
+    private static boolean tryStatementDefinitelyRecurses(JSTryStatement tryStatement, JSFunction function) {
         final JSStatement tryBlock = tryStatement.getStatement();
         if (statementDefinitelyRecurses(tryBlock, function)) {
             return true;
@@ -437,8 +376,7 @@ private static boolean tryStatementDefinitelyRecurses(
         return statementDefinitelyRecurses(finallyBlock, function);
     }
 
-    private static boolean codeBlockDefinitelyRecurses(JSBlockStatement block,
-                                                       JSFunction function) {
+    private static boolean codeBlockDefinitelyRecurses(JSBlockStatement block, JSFunction function) {
         if (block == null) {
             return false;
         }
@@ -446,30 +384,27 @@ private static boolean codeBlockDefinitelyRecurses(JSBlockStatement block,
         for (final JSStatement statement : statements) {
             if (statementDefinitelyRecurses(statement, function)) {
                 return true;
-            } else if (statementMayReturnBeforeRecursing(statement, function)) {
-              return false;
+            }
+            else if (statementMayReturnBeforeRecursing(statement, function)) {
+                return false;
             }
         }
         return false;
     }
 
-    private static boolean ifStatementDefinitelyRecurses(
-            JSIfStatement ifStatement, JSFunction function) {
+    private static boolean ifStatementDefinitelyRecurses(JSIfStatement ifStatement, JSFunction function) {
         final JSExpression condition = ifStatement.getCondition();
         if (expressionDefinitelyRecurses(condition, function)) {
             return true;
         }
         final JSStatement thenBranch = ifStatement.getThen();
         final JSStatement elseBranch = ifStatement.getElse();
-        if (thenBranch == null || elseBranch == null) {
-            return false;
-        }
-        return statementDefinitelyRecurses(thenBranch, function) &&
-                statementDefinitelyRecurses(elseBranch, function);
+        return thenBranch != null && elseBranch != null
+            && statementDefinitelyRecurses(thenBranch, function)
+            && statementDefinitelyRecurses(elseBranch, function);
     }
 
-    private static boolean forStatementDefinitelyRecurses(
-            JSForStatement forStatement, JSFunction function) {
+    private static boolean forStatementDefinitelyRecurses(JSForStatement forStatement, JSFunction function) {
         final JSExpression initialization = forStatement.getInitialization();
         if (expressionDefinitelyRecurses(initialization, function)) {
             return true;
@@ -485,15 +420,12 @@ private static boolean forStatementDefinitelyRecurses(
         return false;
     }
 
-    private static boolean foreachStatementDefinitelyRecurses(
-            JSForInStatement foreachStatement, JSFunction function) {
+    private static boolean foreachStatementDefinitelyRecurses(JSForInStatement foreachStatement, JSFunction function) {
         final JSExpression iteration = foreachStatement.getCollectionExpression();
         return expressionDefinitelyRecurses(iteration, function);
     }
 
-    private static boolean whileStatementDefinitelyRecurses(
-            JSWhileStatement whileStatement, JSFunction function) {
-
+    private static boolean whileStatementDefinitelyRecurses(JSWhileStatement whileStatement, JSFunction function) {
         final JSExpression condition = whileStatement.getCondition();
         if (expressionDefinitelyRecurses(condition, function)) {
             return true;
@@ -505,9 +437,7 @@ private static boolean whileStatementDefinitelyRecurses(
         return false;
     }
 
-    private static boolean doWhileStatementDefinitelyRecurses(
-            JSDoWhileStatement doWhileStatement, JSFunction function) {
-
+    private static boolean doWhileStatementDefinitelyRecurses(JSDoWhileStatement doWhileStatement, JSFunction function) {
         final JSStatement body = doWhileStatement.getBody();
         if (statementDefinitelyRecurses(body, function)) {
             return true;
@@ -516,26 +446,19 @@ private static boolean doWhileStatementDefinitelyRecurses(
         return expressionDefinitelyRecurses(condition, function);
     }
 
-    private static boolean labeledStatementDefinitelyRecurses(
-            JSLabeledStatement labeledStatement, JSFunction function) {
+    private static boolean labeledStatementDefinitelyRecurses(JSLabeledStatement labeledStatement, JSFunction function) {
         final JSStatement body = labeledStatement.getStatement();
         return statementDefinitelyRecurses(body, function);
     }
 
-    public static boolean functionDefinitelyRecurses(
-            @Nonnull JSFunction function) {
+    public static boolean functionDefinitelyRecurses(@Nonnull JSFunction function) {
         final JSSourceElement[] body = function.getBody();
         if (body == null) {
             return false;
         }
         for (JSSourceElement jsSourceElement : body) {
-            if(jsSourceElement instanceof JSStatement)
-            {
-                final JSStatement statement = (JSStatement) jsSourceElement;
-                if(statementDefinitelyRecurses(statement, function))
-                {
-                    return true;
-                }
+            if (jsSourceElement instanceof JSStatement statement && statementDefinitelyRecurses(statement, function)) {
+                return true;
             }
         }
         return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
index ed863a03..9b699424 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
@@ -17,14 +17,15 @@ public RecursionVisitor(@Nonnull JSFunction function) {
         functionName = function.getName();
     }
 
-    @Override public void visitElement(@Nonnull PsiElement element) {
+    @Override
+    public void visitElement(@Nonnull PsiElement element) {
         if (!recursive) {
             super.visitElement(element);
         }
     }
 
-    @Override public void visitJSCallExpression(
-            @Nonnull JSCallExpression call) {
+    @Override
+    public void visitJSCallExpression(@Nonnull JSCallExpression call) {
         if (recursive) {
             return;
         }
@@ -32,7 +33,7 @@ public RecursionVisitor(@Nonnull JSFunction function) {
         final JSExpression methodExpression = call.getMethodExpression();
 
         // method expression could be e.g. a["1"]
-        if (!(methodExpression instanceof JSReferenceExpression)){
+        if (!(methodExpression instanceof JSReferenceExpression)) {
             return;
         }
         final JSReferenceExpression functionExpression = (JSReferenceExpression)methodExpression;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index 7aeeff5d..79a5777a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -56,7 +56,7 @@ private void checkForLabel(JSStatement statement) {
             if (!(statement instanceof JSLabeledStatement)) {
                 return;
             }
-            final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
+            final JSLabeledStatement labeledStatement = (JSLabeledStatement)statement;
             final PsiElement label = labeledStatement.getLabelIdentifier();
             registerError(label);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index bd7ad3c9..99c35a13 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -14,39 +14,38 @@
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
-public class AnonymousFunctionJSInspection extends JavaScriptInspection{
+public class AnonymousFunctionJSInspection extends JavaScriptInspection {
     @Override
     @Nonnull
-    public String getDisplayName(){
+    public String getDisplayName() {
         return InspectionJSLocalize.anonymousFunctionDisplayName().get();
     }
 
     @Override
     @Nonnull
-    public String getGroupDisplayName(){
+    public String getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME.get();
     }
 
     @RequiredReadAction
     @Override
     @Nullable
-    protected String buildErrorString(Object state, Object... args){
+    protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.anonymousFunctionErrorString().get();
     }
 
     @Override
-    public BaseInspectionVisitor buildVisitor(){
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
-    private static class Visitor extends BaseInspectionVisitor{
+    private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSFunctionExpression(JSFunctionExpression jsFunctionExpression){
+        public void visitJSFunctionExpression(JSFunctionExpression jsFunctionExpression) {
             super.visitJSFunctionExpression(jsFunctionExpression);
             final JSFunction function = jsFunctionExpression.getFunction();
             final PsiElement identifier = function.getNameIdentifier();
-            if(identifier == null ||
-                    PsiTreeUtil.isAncestor(function, identifier, true)){
+            if (identifier == null || PsiTreeUtil.isAncestor(function, identifier, true)) {
                 return;
             }
             registerError(function.getFirstChild());
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index 739d817f..3d7d3981 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -42,14 +42,13 @@ private static class Visitor extends BaseInspectionVisitor {
         public void visitJSBlock(JSBlockStatement jsBlockStatement) {
             super.visitJSBlock(jsBlockStatement);
             final PsiElement parent = jsBlockStatement.getParent();
-            if(parent instanceof JSIfStatement||
-                    parent instanceof JSLoopStatement ||
-                    parent instanceof JSWithStatement ||
-                    parent instanceof JSSwitchStatement ||
-                    parent instanceof JSTryStatement ||
-                    parent instanceof JSCatchBlock||
-                    parent instanceof JSFunction)
-            {
+            if (parent instanceof JSIfStatement
+                || parent instanceof JSLoopStatement
+                || parent instanceof JSWithStatement
+                || parent instanceof JSSwitchStatement
+                || parent instanceof JSTryStatement
+                || parent instanceof JSCatchBlock
+                || parent instanceof JSFunction) {
                 return;
             }
             registerStatementError(jsBlockStatement);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index b5b176d4..9382e806 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -11,49 +11,41 @@
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
-public class ConditionalExpressionJSInspection extends JavaScriptInspection
-{
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return false;
-	}
+public class ConditionalExpressionJSInspection extends JavaScriptInspection {
+    @Override
+    public boolean isEnabledByDefault() {
+        return false;
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.conditionalExpressionDisplayName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.conditionalExpressionDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.CONFUSING_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    }
 
-	@RequiredReadAction
-	@Override
-	@Nullable
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.conditionalExpressionErrorString().get();
-	}
+    @RequiredReadAction
+    @Override
+    @Nullable
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.conditionalExpressionErrorString().get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private static class Visitor extends BaseInspectionVisitor
-	{
-		@Override
-		public void visitJSConditionalExpression(JSConditionalExpression jsConditionalExpression)
-		{
-			super.visitJSConditionalExpression(jsConditionalExpression);
-			registerError(jsConditionalExpression);
-		}
-	}
+    private static class Visitor extends BaseInspectionVisitor {
+        @Override
+        public void visitJSConditionalExpression(JSConditionalExpression jsConditionalExpression) {
+            super.visitJSConditionalExpression(jsConditionalExpression);
+            registerError(jsConditionalExpression);
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index c30c9fbd..ebf96143 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -58,7 +58,7 @@ public String getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSExpression literalExpression = (JSExpression) descriptor.getPsiElement();
+            final JSExpression literalExpression = (JSExpression)descriptor.getPsiElement();
             final String text = literalExpression.getText();
             final String newText = getCanonicalForm(text);
             replaceExpression(literalExpression, newText);
@@ -67,43 +67,50 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
         private static String getCanonicalForm(String text) {
             final String suffix;
             final String prefix;
-            if (text.indexOf((int) 'e') > 0) {
-                final int breakPoint = text.indexOf((int) 'e');
+            if (text.indexOf((int)'e') > 0) {
+                final int breakPoint = text.indexOf((int)'e');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
-            } else if (text.indexOf((int) 'E') > 0) {
-                final int breakPoint = text.indexOf((int) 'E');
+            }
+            else if (text.indexOf((int)'E') > 0) {
+                final int breakPoint = text.indexOf((int)'E');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
-            } else if (text.indexOf((int) 'f') > 0) {
-                final int breakPoint = text.indexOf((int) 'f');
+            }
+            else if (text.indexOf((int)'f') > 0) {
+                final int breakPoint = text.indexOf((int)'f');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
-            } else if (text.indexOf((int) 'F') > 0) {
-                final int breakPoint = text.indexOf((int) 'F');
+            }
+            else if (text.indexOf((int)'F') > 0) {
+                final int breakPoint = text.indexOf((int)'F');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
-            } else if (text.indexOf((int) 'd') > 0) {
-                final int breakPoint = text.indexOf((int) 'd');
+            }
+            else if (text.indexOf((int)'d') > 0) {
+                final int breakPoint = text.indexOf((int)'d');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
-            } else if (text.indexOf((int) 'D') > 0) {
-                final int breakPoint = text.indexOf((int) 'D');
+            }
+            else if (text.indexOf((int)'D') > 0) {
+                final int breakPoint = text.indexOf((int)'D');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
-            } else {
+            }
+            else {
                 suffix = "";
                 prefix = text;
             }
-            final int indexPoint = prefix.indexOf((int) '.');
+            final int indexPoint = prefix.indexOf((int)'.');
             if (indexPoint < 0) {
                 return prefix + ".0" + suffix;
-            } else if (indexPoint == 0) {
+            }
+            else if (indexPoint == 0) {
                 return '0' + prefix + suffix;
-            } else {
+            }
+            else {
                 return prefix + '0' + suffix;
             }
-
         }
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index 65c1031e..100ea9b8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -42,8 +42,8 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
-        @Override public void visitJSBinaryExpression(JSBinaryExpression jsBinaryExpression) {
+        @Override
+        public void visitJSBinaryExpression(JSBinaryExpression jsBinaryExpression) {
             super.visitJSBinaryExpression(jsBinaryExpression);
             final IElementType sign = jsBinaryExpression.getOperationSign();
             if (!JSTokenTypes.PLUS.equals(sign) && !JSTokenTypes.MINUS.equals(sign)) {
@@ -58,7 +58,7 @@ private static class Visitor extends BaseInspectionVisitor {
                 return;
             }
             if (lhs instanceof JSPostfixExpression) {
-                final JSPostfixExpression postfixExpression = (JSPostfixExpression) lhs;
+                final JSPostfixExpression postfixExpression = (JSPostfixExpression)lhs;
                 final IElementType innerSign = postfixExpression.getOperationSign();
                 if (matches(sign, innerSign)) {
                     registerError(jsBinaryExpression);
@@ -66,7 +66,7 @@ private static class Visitor extends BaseInspectionVisitor {
                 }
             }
             if (rhs instanceof JSPrefixExpression) {
-                final JSPrefixExpression postfixExpression = (JSPrefixExpression) rhs;
+                final JSPrefixExpression postfixExpression = (JSPrefixExpression)rhs;
                 final IElementType innerSign = postfixExpression.getOperationSign();
                 if (matches(sign, innerSign)) {
                     registerError(jsBinaryExpression);
@@ -77,7 +77,8 @@ private static class Visitor extends BaseInspectionVisitor {
         private static boolean matches(IElementType sign, IElementType innerSign) {
             if (JSTokenTypes.PLUS.equals(sign)) {
                 return JSTokenTypes.PLUSPLUS.equals(innerSign);
-            } else {
+            }
+            else {
                 return JSTokenTypes.MINUSMINUS.equals(innerSign);
             }
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 6ba53895..69dc1d8b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -47,13 +47,14 @@ public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             final JSExpression methodExpression;
             try {
                 methodExpression = jsCallExpression.getMethodExpression();
-            } catch (Exception e) {
+            }
+            catch (Exception e) {
                 return; //catching an intelliJ CCE
             }
             if (!(methodExpression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression referenceExpression = (JSReferenceExpression) methodExpression;
+            final JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
             final JSExpression qualifier = referenceExpression.getQualifier();
 
             @NonNls final String methodName = referenceExpression.getReferencedName();
@@ -69,13 +70,14 @@ public void visitJSNewExpression(JSNewExpression jsNewExpression) {
             final JSExpression methodExpression;
             try {
                 methodExpression = jsNewExpression.getMethodExpression();
-            } catch (Exception e) {
+            }
+            catch (Exception e) {
                 return; //catching an intelliJ CCE
             }
             if (!(methodExpression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression referenceExpression = (JSReferenceExpression) methodExpression;
+            final JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
             final JSExpression qualifier = referenceExpression.getQualifier();
 
             if (qualifier != null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index cd394f19..f09b3b0b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -11,166 +11,135 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class EmptyStatementBodyJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getID()
-	{
-		return "StatementWithEmptyBodyJS";
-	}
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.statementWithEmptyBodyDisplayName().get();
-	}
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.CONFUSING_GROUP_NAME.get();
-	}
-
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return true;
-	}
-
-	@RequiredReadAction
-	@Override
-	public String buildErrorString(Object state, Object... args)
-	{
-		return args[0] instanceof JSIfStatement
-			? InspectionJSLocalize.statementHasEmptyBranchErrorString().get()
-			: InspectionJSLocalize.statementHasEmptyBodyErrorString().get();
-	}
-
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new EmptyStatementBodyJSInspectionState();
-	}
-
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new EmptyStatementVisitor();
-	}
-
-	private class EmptyStatementVisitor extends BaseInspectionVisitor<EmptyStatementBodyJSInspectionState>
-	{
-		@Override
-		public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement)
-		{
-			super.visitJSDoWhileStatement(statement);
-
-			final JSStatement body = statement.getBody();
-			if(body == null)
-			{
-				return;
-			}
-			if(!isEmpty(body))
-			{
-				return;
-			}
-			registerStatementError(statement, statement);
-		}
-
-		@Override
-		public void visitJSWhileStatement(@Nonnull JSWhileStatement statement)
-		{
-			super.visitJSWhileStatement(statement);
-
-			final JSStatement body = statement.getBody();
-			if(body == null)
-			{
-				return;
-			}
-			if(!isEmpty(body))
-			{
-				return;
-			}
-			registerStatementError(statement, statement);
-		}
-
-		@Override
-		public void visitJSForStatement(@Nonnull JSForStatement statement)
-		{
-			super.visitJSForStatement(statement);
-
-			final JSStatement body = statement.getBody();
-			if(body == null)
-			{
-				return;
-			}
-			if(!isEmpty(body))
-			{
-				return;
-			}
-			registerStatementError(statement, statement);
-		}
-
-		@Override
-		public void visitJSForInStatement(@Nonnull JSForInStatement statement)
-		{
-			super.visitJSForInStatement(statement);
-
-			final JSStatement body = statement.getBody();
-			if(body == null)
-			{
-				return;
-			}
-			if(!isEmpty(body))
-			{
-				return;
-			}
-			registerStatementError(statement, statement);
-		}
-
-		@Override
-		public void visitJSIfStatement(@Nonnull JSIfStatement statement)
-		{
-			super.visitJSIfStatement(statement);
-
-			final JSStatement thenBranch = statement.getThen();
-			if(thenBranch != null)
-			{
-				if(isEmpty(thenBranch))
-				{
-					registerStatementError(statement, statement);
-					return;
-				}
-			}
-			final JSStatement elseBranch = statement.getElse();
-
-			if(elseBranch != null)
-			{
-				if(isEmpty(elseBranch))
-				{
-					registerStatementError(statement, statement);
-				}
-			}
-		}
-
-		private boolean isEmpty(JSElement body)
-		{
-			if(body instanceof JSEmptyStatement)
-			{
-				return true;
-			}
-			else if(myState.m_reportEmptyBlocks && body instanceof JSBlockStatement)
-			{
-				final JSBlockStatement block = (JSBlockStatement) body;
-				final JSStatement[] statements = block.getStatements();
-				return statements.length == 0;
-			}
-			return false;
-		}
-	}
+public class EmptyStatementBodyJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getID() {
+        return "StatementWithEmptyBodyJS";
+    }
+
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.statementWithEmptyBodyDisplayName().get();
+    }
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    }
+
+    @Override
+    public boolean isEnabledByDefault() {
+        return true;
+    }
+
+    @RequiredReadAction
+    @Override
+    public String buildErrorString(Object state, Object... args) {
+        return args[0] instanceof JSIfStatement
+            ? InspectionJSLocalize.statementHasEmptyBranchErrorString().get()
+            : InspectionJSLocalize.statementHasEmptyBodyErrorString().get();
+    }
+
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new EmptyStatementBodyJSInspectionState();
+    }
+
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new EmptyStatementVisitor();
+    }
+
+    private class EmptyStatementVisitor extends BaseInspectionVisitor<EmptyStatementBodyJSInspectionState> {
+        @Override
+        public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+            super.visitJSDoWhileStatement(statement);
+
+            final JSStatement body = statement.getBody();
+            if (body == null) {
+                return;
+            }
+            if (!isEmpty(body)) {
+                return;
+            }
+            registerStatementError(statement, statement);
+        }
+
+        @Override
+        public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+            super.visitJSWhileStatement(statement);
+
+            final JSStatement body = statement.getBody();
+            if (body == null) {
+                return;
+            }
+            if (!isEmpty(body)) {
+                return;
+            }
+            registerStatementError(statement, statement);
+        }
+
+        @Override
+        public void visitJSForStatement(@Nonnull JSForStatement statement) {
+            super.visitJSForStatement(statement);
+
+            final JSStatement body = statement.getBody();
+            if (body == null) {
+                return;
+            }
+            if (!isEmpty(body)) {
+                return;
+            }
+            registerStatementError(statement, statement);
+        }
+
+        @Override
+        public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+            super.visitJSForInStatement(statement);
+
+            final JSStatement body = statement.getBody();
+            if (body == null) {
+                return;
+            }
+            if (!isEmpty(body)) {
+                return;
+            }
+            registerStatementError(statement, statement);
+        }
+
+        @Override
+        public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+            super.visitJSIfStatement(statement);
+
+            final JSStatement thenBranch = statement.getThen();
+            if (thenBranch != null) {
+                if (isEmpty(thenBranch)) {
+                    registerStatementError(statement, statement);
+                    return;
+                }
+            }
+            final JSStatement elseBranch = statement.getElse();
+
+            if (elseBranch != null && isEmpty(elseBranch)) {
+                registerStatementError(statement, statement);
+            }
+        }
+
+        private boolean isEmpty(JSElement body) {
+            if (body instanceof JSEmptyStatement) {
+                return true;
+            }
+            else if (myState.m_reportEmptyBlocks && body instanceof JSBlockStatement) {
+                final JSBlockStatement block = (JSBlockStatement)body;
+                final JSStatement[] statements = block.getStatements();
+                return statements.length == 0;
+            }
+            return false;
+        }
+    }
 }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
index fcd796d6..f582848e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
@@ -13,29 +13,29 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class EmptyStatementBodyJSInspectionState implements InspectionToolState<EmptyStatementBodyJSInspectionState>
-{
-	public boolean m_reportEmptyBlocks = false;
+public class EmptyStatementBodyJSInspectionState implements InspectionToolState<EmptyStatementBodyJSInspectionState> {
+    public boolean m_reportEmptyBlocks = false;
 
-	@Nullable
-	@Override
-	public UnnamedConfigurable createConfigurable()
-	{
-		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
-		builder.checkBox(InspectionJSLocalize.includeStatementBodiesThatAreEmptyCodeBlocksParameter(), () -> m_reportEmptyBlocks, b -> m_reportEmptyBlocks = b);
-		return builder.buildUnnamed();
-	}
+    @Nullable
+    @Override
+    public UnnamedConfigurable createConfigurable() {
+        ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+        builder.checkBox(
+            InspectionJSLocalize.includeStatementBodiesThatAreEmptyCodeBlocksParameter(),
+            () -> m_reportEmptyBlocks,
+            b -> m_reportEmptyBlocks = b
+        );
+        return builder.buildUnnamed();
+    }
 
-	@Nullable
-	@Override
-	public EmptyStatementBodyJSInspectionState getState()
-	{
-		return this;
-	}
+    @Nullable
+    @Override
+    public EmptyStatementBodyJSInspectionState getState() {
+        return this;
+    }
 
-	@Override
-	public void loadState(EmptyStatementBodyJSInspectionState state)
-	{
-		XmlSerializerUtil.copyBean(state, this);
-	}
+    @Override
+    public void loadState(EmptyStatementBodyJSInspectionState state) {
+        XmlSerializerUtil.copyBean(state, this);
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index 096e8cbb..b8b9715b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -35,12 +35,13 @@ protected String buildErrorString(Object state, Object... args) {
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSPrefixExpression(JSPrefixExpression expression) {
+        @Override
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             final IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
@@ -51,15 +52,16 @@ private static class Visitor extends BaseInspectionVisitor {
             }
 
             if (parent instanceof JSExpressionStatement
-                    || parent instanceof JSForInStatement
-                    || parent instanceof JSForStatement
-                    || parent instanceof JSCommaExpression) {
+                || parent instanceof JSForInStatement
+                || parent instanceof JSForStatement
+                || parent instanceof JSCommaExpression) {
                 return;
             }
             registerError(expression);
         }
 
-        @Override public void visitJSPostfixExpression(JSPostfixExpression jsPostfixExpression) {
+        @Override
+        public void visitJSPostfixExpression(JSPostfixExpression jsPostfixExpression) {
             final IElementType sign = jsPostfixExpression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
@@ -69,9 +71,9 @@ private static class Visitor extends BaseInspectionVisitor {
                 return;
             }
             if (parent instanceof JSExpressionStatement
-                    ||parent instanceof JSForInStatement
-                    ||parent instanceof JSForStatement
-                    || parent instanceof JSCommaExpression) {
+                || parent instanceof JSForInStatement
+                || parent instanceof JSForStatement
+                || parent instanceof JSCommaExpression) {
                 return;
             }
             registerError(jsPostfixExpression);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index b7e669be..3c9cae8b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -21,11 +21,11 @@
 public class MagicNumberJSInspection extends JavaScriptInspection {
     @NonNls
     private static final String[] s_specialCaseLiteralArray = new String[]{
-      "0", "1", "2", "3", "4",
-      "5", "6", "7", "8", "9",
-      "10", "0L", "1L", "2L", "0l",
-      "1l", "2l", "0.0", "1.0", "0.0F",
-      "1.0F", "0.0f", "1.0f"
+        "0", "1", "2", "3", "4",
+        "5", "6", "7", "8", "9",
+        "10", "0L", "1L", "2L", "0l",
+        "1l", "2l", "0.0", "1.0", "0.0F",
+        "1.0F", "0.0f", "1.0f"
     };
 
     /**
@@ -77,19 +77,19 @@ public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression expressi
             final PsiElement parent = expression.getParent();
             if (parent instanceof JSPrefixExpression) {
                 registerError(parent);
-            } else {
+            }
+            else {
                 registerError(expression);
             }
         }
     }
 
     private static boolean isNumeric(String text) {
-        if (text.isEmpty())
-        {
+        if (text.isEmpty()) {
             return false;
         }
         final char firstChar = text.charAt(0);
-        return Character.isDigit(firstChar)|| firstChar == '.';
+        return Character.isDigit(firstChar) || firstChar == '.';
     }
 
     private static boolean isDeclaredConstant(JSLiteralExpression expression) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index 11b3e6de..ce88c93a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -58,7 +58,7 @@ public String getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSConditionalExpression exp = (JSConditionalExpression) descriptor.getPsiElement();
+            final JSConditionalExpression exp = (JSConditionalExpression)descriptor.getPsiElement();
             assert exp != null;
             final JSExpression elseBranch = exp.getElse();
             final JSExpression thenBranch = exp.getThen();
@@ -92,9 +92,9 @@ private boolean isNotEquals(JSExpression expression) {
             if (!(expression instanceof JSBinaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
             final IElementType sign = binaryExpression.getOperationSign();
-            return JSTokenTypes.NE.equals(sign) ||JSTokenTypes.NEQEQ.equals(sign);
+            return JSTokenTypes.NE.equals(sign) || JSTokenTypes.NEQEQ.equals(sign);
         }
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index bf061fe3..2e960e83 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -48,7 +48,7 @@ protected String buildErrorString(Object state, Object... args) {
     }
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
     }
 
@@ -67,7 +67,7 @@ public String getName() {
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
             final PsiElement ifToken = descriptor.getPsiElement();
-            final JSIfStatement ifStatement = (JSIfStatement) ifToken.getParent();
+            final JSIfStatement ifStatement = (JSIfStatement)ifToken.getParent();
             assert ifStatement != null;
             final JSStatement elseBranch = ifStatement.getElse();
             final JSStatement thenBranch = ifStatement.getThen();
@@ -76,7 +76,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
             String elseText = elseBranch.getText();
             final PsiElement lastChild = elseBranch.getLastChild();
             if (lastChild instanceof PsiComment) {
-                final PsiComment comment = (PsiComment) lastChild;
+                final PsiComment comment = (PsiComment)lastChild;
                 final IElementType tokenType = comment.getTokenType();
                 if (JSTokenTypes.END_OF_LINE_COMMENT.equals(tokenType)) {
                     elseText += '\n';
@@ -114,7 +114,7 @@ private boolean isNotEquals(JSExpression expression) {
             if (!(expression instanceof JSBinaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
             final IElementType sign = binaryExpression.getOperationSign();
             return JSTokenTypes.NE.equals(sign) || JSTokenTypes.NEQEQ.equals(sign);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index 14f2a4ea..8e0dbdf5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -15,71 +15,58 @@
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
-public class NestedFunctionJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.nestedFunctionDisplayName().get();
-	}
+public class NestedFunctionJSInspection extends JavaScriptInspection {
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return InspectionJSLocalize.nestedFunctionDisplayName().get();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.CONFUSING_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    }
 
-	@RequiredReadAction
-	@Override
-	@Nullable
-	protected String buildErrorString(Object state, Object... args)
-	{
-		final JSFunction function = (JSFunction) ((PsiElement) args[0]).getParent();
-		if (functionHasIdentifier(function))
-		{
-			return InspectionJSLocalize.nestedFunctionErrorString().get();
-		}
-		return InspectionJSLocalize.nestedAnonymousFunctionErrorString().get();
-	}
+    @RequiredReadAction
+    @Override
+    @Nullable
+    protected String buildErrorString(Object state, Object... args) {
+        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        if (functionHasIdentifier(function)) {
+            return InspectionJSLocalize.nestedFunctionErrorString().get();
+        }
+        return InspectionJSLocalize.nestedAnonymousFunctionErrorString().get();
+    }
 
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new NestedFunctionJSInspectionState();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new NestedFunctionJSInspectionState();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    private class Visitor extends BaseInspectionVisitor<NestedFunctionJSInspectionState> {
+        @Override
+        public void visitJSFunctionDeclaration(JSFunction function) {
+            super.visitJSFunctionDeclaration(function);
+            if (!myState.m_includeAnonymousFunctions && function.getName() == null) {
+                return;
+            }
+            final JSFunction containingFunction = PsiTreeUtil.getParentOfType(function, JSFunction.class, true);
+            if (containingFunction == null) {
+                return;
+            }
+            registerFunctionError(function);
+        }
 
-	private class Visitor extends BaseInspectionVisitor<NestedFunctionJSInspectionState>
-	{
-		@Override
-		public void visitJSFunctionDeclaration(JSFunction function)
-		{
-			super.visitJSFunctionDeclaration(function);
-			if(!myState.m_includeAnonymousFunctions && function.getName() == null)
-			{
-				return;
-			}
-			final JSFunction containingFunction = PsiTreeUtil.getParentOfType(function, JSFunction.class, true);
-			if(containingFunction == null)
-			{
-				return;
-			}
-			registerFunctionError(function);
-		}
-
-		@Override
-		public void visitJSFunctionExpression(final JSFunctionExpression node)
-		{
-			visitJSFunctionDeclaration(node.getFunction());
-		}
-	}
+        @Override
+        public void visitJSFunctionExpression(final JSFunctionExpression node) {
+            visitJSFunctionDeclaration(node.getFunction());
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
index b971f656..c90fcd28 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
@@ -12,29 +12,29 @@
  * @author VISTALL
  * @since 13/03/2023
  */
-public class NestedFunctionJSInspectionState implements InspectionToolState<NestedFunctionJSInspectionState>
-{
-	public boolean m_includeAnonymousFunctions = false;
+public class NestedFunctionJSInspectionState implements InspectionToolState<NestedFunctionJSInspectionState> {
+    public boolean m_includeAnonymousFunctions = false;
 
-	@Nullable
-	@Override
-	public UnnamedConfigurable createConfigurable()
-	{
-		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
-		builder.checkBox(InspectionJSLocalize.includeAnonymousFunctionsParameter(), () -> m_includeAnonymousFunctions, b -> m_includeAnonymousFunctions = b);
-		return builder.buildUnnamed();
-	}
+    @Nullable
+    @Override
+    public UnnamedConfigurable createConfigurable() {
+        ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
+        builder.checkBox(
+            InspectionJSLocalize.includeAnonymousFunctionsParameter(),
+            () -> m_includeAnonymousFunctions,
+            b -> m_includeAnonymousFunctions = b
+        );
+        return builder.buildUnnamed();
+    }
 
-	@Nullable
-	@Override
-	public NestedFunctionJSInspectionState getState()
-	{
-		return this;
-	}
+    @Nullable
+    @Override
+    public NestedFunctionJSInspectionState getState() {
+        return this;
+    }
 
-	@Override
-	public void loadState(NestedFunctionJSInspectionState state)
-	{
-		XmlSerializerUtil.copyBean(state, this);
-	}
+    @Override
+    public void loadState(NestedFunctionJSInspectionState state) {
+        XmlSerializerUtil.copyBean(state, this);
+    }
 }
diff --git a/intentions/pom.xml b/intentions/pom.xml
index deac49a9..ab35b940 100644
--- a/intentions/pom.xml
+++ b/intentions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  - Copyright 2013-2017 consulo.io
+  - Copyright 2013-2024 consulo.io
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -15,61 +15,61 @@
   - limitations under the License.
   -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.ide-api-provided</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-intentions</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript-intentions</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.io/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>interval:60</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>consulo.maven</groupId>
-				<artifactId>maven-consulo-plugin</artifactId>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate-localize</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>consulo.maven</groupId>
+                <artifactId>maven-consulo-plugin</artifactId>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate-localize</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-base.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file

From 21a058ee5224d50d9300f34fb0e4f32533db249b Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 6 Sep 2024 11:43:07 +0300
Subject: [PATCH 234/340] Code reformat of validation package using IJ4 code
 style.

---
 .../impl/validation/BaseCreateMethodsFix.java |  451 ++--
 .../impl/validation/ImplementMethodsFix.java  |   86 +-
 .../ImplementedMethodProcessor.java           |  290 +--
 .../impl/validation/JSAnnotatingVisitor.java  | 2299 +++++++++--------
 .../impl/validation/JSAnnotatorFactory.java   |   25 +-
 5 files changed, 1557 insertions(+), 1594 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
index 85ba6f7c..d4076a1a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
@@ -51,253 +51,208 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 17, 2008
- *         Time: 9:39:02 PM
+ * Date: Jul 17, 2008
+ * Time: 9:39:02 PM
  */
-public abstract class BaseCreateMethodsFix<T extends JSNamedElement & JSAttributeListOwner>
-{
-	private final Set<T> elementsToProcess = new LinkedHashSet<T>();
-	protected final JSClass myJsClass;
-	protected PsiElement anchor;
-
-	public BaseCreateMethodsFix(final JSClass jsClass)
-	{
-		myJsClass = jsClass;
-	}
-
-	public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
-	{
-		evalAnchor(editor, file);
-		for(T e : getElementsToProcess())
-		{
-			anchor = doAddOneMethod(project, buildFunctionText(e), anchor);
-		}
-	}
-
-	protected void evalAnchor(final Editor editor, final PsiFile file)
-	{
-		anchor = null;
-		final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
-		PsiElement parent;
-
-		if(at != null && ((parent = at.getParent()) == myJsClass || (parent instanceof JSFile && myJsClass.getParent().getContainingFile() == parent
-				.getContext().getContainingFile())))
-		{
-			final ASTNode atNode = at.getNode();
-			if(atNode.getElementType() == JSTokenTypes.RBRACE)
-			{
-				return;
-			}
-
-			for(ASTNode node = atNode; node != null; node = node.getTreeNext())
-			{
-				if(node.getElementType() == JSTokenTypes.LBRACE)
-				{
-					return;
-				}
-			}
-			anchor = at;
-		}
-	}
-
-	protected PsiElement doAddOneMethod(final Project project, final String functionText, PsiElement anchor) throws IncorrectOperationException
-	{
-		if(functionText != null && functionText.length() > 0)
-		{
-			PsiElement element = JSChangeUtil.createJSTreeFromText(project, functionText).getPsi();
-			if(element instanceof PsiWhiteSpace)
-			{
-				element = element.getNextSibling();
-			}
-
-			boolean defaultAdd = true;
-
-			if(anchor != null && anchor.isValid())
-			{
-				String anchorText;
-
-				if(!(anchor instanceof PsiWhiteSpace) || ((anchorText = anchor.getText()).indexOf("<![CDATA[") == -1 && anchorText.indexOf("]]>") == -1))
-				{
-					defaultAdd = false;
-					anchor = anchor.getParent().addAfter(element, anchor);
-				}
-			}
-
-			if(defaultAdd)
-			{
-				anchor = myJsClass.add(element);
-			}
-		}
-
-		return anchor;
-	}
-
-	public String buildFunctionText(final T fun)
-	{
-		final JSAttributeList attributeList = fun.getAttributeList();
-		String attrText = attributeList != null ? attributeList.getText() : "";
-
-		attrText = buildFunctionAttrText(attrText, attributeList, fun);
-
-		final JSFunction function = fun instanceof JSFunction ? (JSFunction) fun : null;
-		final JSVariable var = fun instanceof JSVariable ? (JSVariable) fun : null;
-		assert var != null || function != null;
-
-		final JSParameterList parameterList = (function != null) ? function.getParameterList() : null;
-		final String typeString = importType(function != null ? function.getReturnTypeString() : var.getTypeString(), fun);
-		@NonNls String functionText = attrText;
-		if(functionText.length() > 0)
-		{
-			functionText += " ";
-		}
-		functionText += "function ";
-
-		functionText += buildFunctionKind(fun);
-
-		functionText += buildName(fun) + " " + buildParameterList(parameterList, fun);
-		if(typeString != null)
-		{
-			functionText += ":" + buildReturnType(typeString);
-		}
-
-		functionText += buildFunctionBodyText(typeString, parameterList, fun);
-		return functionText;
-	}
-
-	protected
-	@NonNls
-	String buildReturnType(final String typeString)
-	{
-		return typeString;
-	}
-
-	protected String importType(final String s, T fun)
-	{
-		if(s == null)
-		{
-			return null;
-		}
-		if(fun instanceof JSFunction)
-		{
-			final String resolvedTypeName = JSImportHandlingUtil.resolveTypeName(s, fun);
-
-			if(!resolvedTypeName.equals(s))
-			{
-				ImportUtils.doImport(myJsClass, resolvedTypeName);
-			}
-		}
-		return s;
-	}
-
-	protected String buildParameterList(final JSParameterList parameterList, final T fun)
-	{
-		if(parameterList != null)
-		{
-			for(JSParameter param : parameterList.getParameters())
-			{
-				final String s = param.getTypeString();
-				if(s != null)
-				{
-					importType(s, fun);
-				}
-			}
-		}
-		return (parameterList != null ? parameterList.getText() : "()");
-	}
-
-	protected String buildName(final T fun)
-	{
-		return fun.getName();
-	}
-
-	protected
-	@NonNls
-	String buildFunctionKind(final T fun)
-	{
-		if(fun instanceof JSFunction)
-		{
-			final JSFunction function = (JSFunction) fun;
-			if(function.isGetProperty())
-			{
-				return "get ";
-			}
-			else if(function.isSetProperty())
-			{
-				return "set ";
-			}
-		}
-		return "";
-	}
-
-	protected
-	@NonNls
-	String buildFunctionBodyText(@NonNls String retType, final JSParameterList parameterList, final T func)
-	{
-		return " {}";
-	}
-
-	protected
-	@NonNls
-	String buildFunctionAttrText(@NonNls String attrText, final JSAttributeList attributeList, final T function)
-	{
-		attrText = attrText.replace("native", "").trim();
-		return attrText;
-	}
-
-	public void addElementToProcess(final T function)
-	{
-		elementsToProcess.add(function);
-	}
-
-	public void addElementsToProcessFrom(final Collection<JSNamedElementNode> selectedElements)
-	{
-		for(JSNamedElementNode el : selectedElements)
-		{
-			addElementToProcess((T) el.getPsiElement());
-		}
-	}
-
-	public Set<T> getElementsToProcess()
-	{
-		final T[] objects = (T[]) elementsToProcess.toArray(new JSNamedElement[elementsToProcess.size()]);
-		final Comparator<T> tComparator = new Comparator<T>()
-		{
-			@Override
-			public int compare(final T o1, final T o2)
-			{
-				return o1.getTextOffset() - o2.getTextOffset();
-			}
-		};
-
-		final int size = elementsToProcess.size();
-		final LinkedHashSet<T> result = new LinkedHashSet<T>(size);
-		final List<T> objectsFromSameFile = new ArrayList<T>();
-		PsiFile containingFile = null;
-
-		for(int i = 0; i < size; ++i)
-		{
-			final T object = objects[i];
-			final PsiFile currentContainingFile = object.getContainingFile();
-
-			if(currentContainingFile != containingFile)
-			{
-				if(containingFile != null)
-				{
-					Collections.sort(objectsFromSameFile, tComparator);
-					result.addAll(objectsFromSameFile);
-					objectsFromSameFile.clear();
-				}
-				containingFile = currentContainingFile;
-			}
-
-			objectsFromSameFile.add(object);
-		}
-
-		Collections.sort(objectsFromSameFile, tComparator);
-		result.addAll(objectsFromSameFile);
-
-		elementsToProcess.clear();
-		elementsToProcess.addAll(result);
-		return elementsToProcess;
-	}
+public abstract class BaseCreateMethodsFix<T extends JSNamedElement & JSAttributeListOwner> {
+    private final Set<T> elementsToProcess = new LinkedHashSet<>();
+    protected final JSClass myJsClass;
+    protected PsiElement anchor;
+
+    public BaseCreateMethodsFix(final JSClass jsClass) {
+        myJsClass = jsClass;
+    }
+
+    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
+        evalAnchor(editor, file);
+        for (T e : getElementsToProcess()) {
+            anchor = doAddOneMethod(project, buildFunctionText(e), anchor);
+        }
+    }
+
+    protected void evalAnchor(final Editor editor, final PsiFile file) {
+        anchor = null;
+        final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
+        PsiElement parent;
+
+        if (at != null && ((parent = at.getParent()) == myJsClass || (parent instanceof JSFile && myJsClass.getParent()
+            .getContainingFile() == parent
+            .getContext().getContainingFile()))) {
+            final ASTNode atNode = at.getNode();
+            if (atNode.getElementType() == JSTokenTypes.RBRACE) {
+                return;
+            }
+
+            for (ASTNode node = atNode; node != null; node = node.getTreeNext()) {
+                if (node.getElementType() == JSTokenTypes.LBRACE) {
+                    return;
+                }
+            }
+            anchor = at;
+        }
+    }
+
+    protected PsiElement doAddOneMethod(final Project project, final String functionText, PsiElement anchor)
+        throws IncorrectOperationException {
+        if (functionText != null && functionText.length() > 0) {
+            PsiElement element = JSChangeUtil.createJSTreeFromText(project, functionText).getPsi();
+            if (element instanceof PsiWhiteSpace) {
+                element = element.getNextSibling();
+            }
+
+            boolean defaultAdd = true;
+
+            if (anchor != null && anchor.isValid()) {
+                String anchorText;
+
+                if (!(anchor instanceof PsiWhiteSpace)
+                    || ((anchorText = anchor.getText()).indexOf("<![CDATA[") == -1 && anchorText.indexOf("]]>") == -1)) {
+                    defaultAdd = false;
+                    anchor = anchor.getParent().addAfter(element, anchor);
+                }
+            }
+
+            if (defaultAdd) {
+                anchor = myJsClass.add(element);
+            }
+        }
+
+        return anchor;
+    }
+
+    public String buildFunctionText(final T fun) {
+        final JSAttributeList attributeList = fun.getAttributeList();
+        String attrText = attributeList != null ? attributeList.getText() : "";
+
+        attrText = buildFunctionAttrText(attrText, attributeList, fun);
+
+        final JSFunction function = fun instanceof JSFunction ? (JSFunction)fun : null;
+        final JSVariable var = fun instanceof JSVariable ? (JSVariable)fun : null;
+        assert var != null || function != null;
+
+        final JSParameterList parameterList = (function != null) ? function.getParameterList() : null;
+        final String typeString = importType(function != null ? function.getReturnTypeString() : var.getTypeString(), fun);
+        @NonNls String functionText = attrText;
+        if (functionText.length() > 0) {
+            functionText += " ";
+        }
+        functionText += "function ";
+
+        functionText += buildFunctionKind(fun);
+
+        functionText += buildName(fun) + " " + buildParameterList(parameterList, fun);
+        if (typeString != null) {
+            functionText += ":" + buildReturnType(typeString);
+        }
+
+        functionText += buildFunctionBodyText(typeString, parameterList, fun);
+        return functionText;
+    }
+
+    protected
+    @NonNls
+    String buildReturnType(final String typeString) {
+        return typeString;
+    }
+
+    protected String importType(final String s, T fun) {
+        if (s == null) {
+            return null;
+        }
+        if (fun instanceof JSFunction) {
+            final String resolvedTypeName = JSImportHandlingUtil.resolveTypeName(s, fun);
+
+            if (!resolvedTypeName.equals(s)) {
+                ImportUtils.doImport(myJsClass, resolvedTypeName);
+            }
+        }
+        return s;
+    }
+
+    protected String buildParameterList(final JSParameterList parameterList, final T fun) {
+        if (parameterList != null) {
+            for (JSParameter param : parameterList.getParameters()) {
+                final String s = param.getTypeString();
+                if (s != null) {
+                    importType(s, fun);
+                }
+            }
+        }
+        return (parameterList != null ? parameterList.getText() : "()");
+    }
+
+    protected String buildName(final T fun) {
+        return fun.getName();
+    }
+
+    protected
+    @NonNls
+    String buildFunctionKind(final T fun) {
+        if (fun instanceof JSFunction) {
+            final JSFunction function = (JSFunction)fun;
+            if (function.isGetProperty()) {
+                return "get ";
+            }
+            else if (function.isSetProperty()) {
+                return "set ";
+            }
+        }
+        return "";
+    }
+
+    protected
+    @NonNls
+    String buildFunctionBodyText(@NonNls String retType, final JSParameterList parameterList, final T func) {
+        return " {}";
+    }
+
+    protected
+    @NonNls
+    String buildFunctionAttrText(@NonNls String attrText, final JSAttributeList attributeList, final T function) {
+        attrText = attrText.replace("native", "").trim();
+        return attrText;
+    }
+
+    public void addElementToProcess(final T function) {
+        elementsToProcess.add(function);
+    }
+
+    public void addElementsToProcessFrom(final Collection<JSNamedElementNode> selectedElements) {
+        for (JSNamedElementNode el : selectedElements) {
+            addElementToProcess((T)el.getPsiElement());
+        }
+    }
+
+    public Set<T> getElementsToProcess() {
+        final T[] objects = (T[])elementsToProcess.toArray(new JSNamedElement[elementsToProcess.size()]);
+        final Comparator<T> tComparator = (o1, o2) -> o1.getTextOffset() - o2.getTextOffset();
+
+        final int size = elementsToProcess.size();
+        final LinkedHashSet<T> result = new LinkedHashSet<>(size);
+        final List<T> objectsFromSameFile = new ArrayList<>();
+        PsiFile containingFile = null;
+
+        for (int i = 0; i < size; ++i) {
+            final T object = objects[i];
+            final PsiFile currentContainingFile = object.getContainingFile();
+
+            if (currentContainingFile != containingFile) {
+                if (containingFile != null) {
+                    Collections.sort(objectsFromSameFile, tComparator);
+                    result.addAll(objectsFromSameFile);
+                    objectsFromSameFile.clear();
+                }
+                containingFile = currentContainingFile;
+            }
+
+            objectsFromSameFile.add(object);
+        }
+
+        Collections.sort(objectsFromSameFile, tComparator);
+        result.addAll(objectsFromSameFile);
+
+        elementsToProcess.clear();
+        elementsToProcess.addAll(result);
+        return elementsToProcess;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
index ae32dc65..cce7e54e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
@@ -35,56 +35,56 @@
  * Time: 9:39:02 PM
  */
 public class ImplementMethodsFix extends BaseCreateMethodsFix<JSFunction> implements SyntheticIntentionAction {
-  public ImplementMethodsFix(final JSClass jsClass) {
-    super(jsClass);
-  }
-
-  @Override
-  @Nonnull
-  public String getText() {
-    return JavaScriptLocalize.javascriptFixImplementMethods().get();
-  }
+    public ImplementMethodsFix(final JSClass jsClass) {
+        super(jsClass);
+    }
 
-  @Override
-  public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
-    return myJsClass.isValid();
-  }
+    @Override
+    @Nonnull
+    public String getText() {
+        return JavaScriptLocalize.javascriptFixImplementMethods().get();
+    }
 
-  @Override
-  protected
-  @NonNls
-  String buildFunctionAttrText(@NonNls String attrText, final JSAttributeList attributeList, final JSFunction function) {
-    attrText = super.buildFunctionAttrText(attrText, attributeList, function);
-    if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
-      attrText = "public";
+    @Override
+    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+        return myJsClass.isValid();
     }
-    return attrText;
-  }
 
-  @Override
-  protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func) {
-    @NonNls String s = "{\n";
-    if (retType != null && !"void".equals(retType)) {
-      s += "return " + defaultValueOfType(retType) + JSChangeUtil.getSemicolon(func.getProject()) + "\n";
+    @Override
+    protected
+    @NonNls
+    String buildFunctionAttrText(@NonNls String attrText, final JSAttributeList attributeList, final JSFunction function) {
+        attrText = super.buildFunctionAttrText(attrText, attributeList, function);
+        if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
+            attrText = "public";
+        }
+        return attrText;
     }
-    s += "}";
-    return s;
-  }
 
-  private static
-  @NonNls
-  String defaultValueOfType(final @NonNls String retType) {
-    if ("int".equals(retType) || "uint".equals(retType) || "Number".equals(retType)) {
-      return "0";
+    @Override
+    protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func) {
+        @NonNls String s = "{\n";
+        if (retType != null && !"void".equals(retType)) {
+            s += "return " + defaultValueOfType(retType) + JSChangeUtil.getSemicolon(func.getProject()) + "\n";
+        }
+        s += "}";
+        return s;
     }
-    if ("Boolean".equals(retType)) {
-      return "false";
+
+    private static
+    @NonNls
+    String defaultValueOfType(final @NonNls String retType) {
+        if ("int".equals(retType) || "uint".equals(retType) || "Number".equals(retType)) {
+            return "0";
+        }
+        if ("Boolean".equals(retType)) {
+            return "false";
+        }
+        return "null";
     }
-    return "null";
-  }
 
-  @Override
-  public boolean startInWriteAction() {
-    return true;
-  }
+    @Override
+    public boolean startInWriteAction() {
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
index 0ed4ceda..bb6238d9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
@@ -32,161 +32,139 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 17, 2008
- *         Time: 9:50:49 PM
+ * Date: Jul 17, 2008
+ * Time: 9:50:49 PM
  */
-public abstract class ImplementedMethodProcessor extends JSResolveUtil.CollectMethodsToImplementProcessor
-{
-	protected final JSClass myJsClass;
-
-	public ImplementedMethodProcessor(final JSClass jsClass)
-	{
-		super(null, null);
-		myJsClass = jsClass;
-	}
-
-	@Override
-	protected boolean process(final ResolveProcessor processor)
-	{
-		Map<String, Object> functions = null;
-
-		for(PsiElement _function : processor.getResults())
-		{
-			if(!(_function instanceof JSFunction))
-			{
-				continue;
-			}
-			final JSFunction function = (JSFunction) _function;
-			final String name = function.getName();
-
-			if(functions == null)
-			{
-				functions = collectAllVisibleClassFunctions(myJsClass, null, new Function<JSFunction, Boolean>()
-				{
-					@Override
-					public Boolean apply(final JSFunction jsFunction)
-					{
-						final JSAttributeList attributeList = jsFunction.getAttributeList();
-						PsiElement parentClass = JSResolveUtil.findParent(jsFunction);
-						if((attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) && myJsClass != parentClass)
-						{
-							return Boolean.FALSE;
-						}
-						return Boolean.TRUE;
-					}
-				});
-			}
-
-			JSFunction o = findFunctionWithTheSameKind(functions, function, name);
-
-			if(o == null)
-			{
-				if(function.isGetProperty() || function.isSetProperty())
-				{
-					JSVariable var = myJsClass.findFieldByName(name);
-					if(var != null)
-					{
-						JSAttributeList attributeList = var.getAttributeList();
-						if(attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC)
-						{
-							continue; // implicit get and set methods
-						}
-					}
-				}
-				addNonimplementedFunction(function);
-			}
-			else
-			{
-				addImplementedFunction(function, o);
-			}
-		}
-		return true;
-	}
-
-	protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction)
-	{
-	}
-
-	public static JSFunction findFunctionWithTheSameKind(final Map<String, Object> functions, final JSFunction function, final String name)
-	{
-		Object o = functions.get(name);
-		if(o instanceof JSFunction && ((JSFunction) o).getKind() != function.getKind())
-		{
-			o = null;
-		}
-		else if(o instanceof JSFunction[])
-		{
-			final JSFunction[] jsFunctions = (JSFunction[]) o;
-			o = null;
-			for(JSFunction fun : jsFunctions)
-			{
-				if(fun.getKind() == function.getKind())
-				{
-					o = fun;
-					break;
-				}
-			}
-		}
-		return (JSFunction) o;
-	}
-
-	public static Map<String, Object> collectAllVisibleClassFunctions(JSClass jsClass, Map<String, Object> _functions,
-			final @Nullable Function<JSFunction, Boolean> filter)
-	{
-		final Map<String, Object> functions = _functions != null ? _functions : new LinkedHashMap<String, Object>();
-		jsClass.processDeclarations(new ResolveProcessor(null)
-		{
-			{
-				setToProcessHierarchy(true);
-				setLocalResolve(true);
-			}
-
-			@Override
-			public boolean execute(final PsiElement element, final ResolveState state)
-			{
-				if(element instanceof JSFunction)
-				{
-					final JSFunction function = (JSFunction) element;
-					if(function.isConstructor())
-					{
-						return true; // SWC stubs have constructor methods :(
-					}
-
-					final JSAttributeList attributeList = function.getAttributeList();
-					if(attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE)
-					{
-						return true;
-					}
-
-					Boolean filterValue;
-					if(filter != null && (filterValue = filter.apply(function)) != null && !filterValue.booleanValue())
-					{
-						return true;
-					}
-					final String s = function.getName();
-					final Object function1 = functions.get(s);
-
-					if(function1 == null)
-					{
-						functions.put(s, function);
-					}
-					else if(function1 instanceof JSFunction)
-					{
-						final JSFunction function2 = (JSFunction) function1;
-						if(findFunctionWithTheSameKind(functions, function, s) == null)
-						{
-							functions.put(s, new JSFunction[]{
-									function2,
-									function
-							});
-						}
-					}
-				}
-				return true;
-			}
-		}, ResolveState.initial(), jsClass, jsClass);
-		return functions;
-	}
-
-	protected abstract void addNonimplementedFunction(final JSFunction function);
+public abstract class ImplementedMethodProcessor extends JSResolveUtil.CollectMethodsToImplementProcessor {
+    protected final JSClass myJsClass;
+
+    public ImplementedMethodProcessor(final JSClass jsClass) {
+        super(null, null);
+        myJsClass = jsClass;
+    }
+
+    @Override
+    protected boolean process(final ResolveProcessor processor) {
+        Map<String, Object> functions = null;
+
+        for (PsiElement _function : processor.getResults()) {
+            if (!(_function instanceof JSFunction)) {
+                continue;
+            }
+            final JSFunction function = (JSFunction)_function;
+            final String name = function.getName();
+
+            if (functions == null) {
+                functions = collectAllVisibleClassFunctions(
+                    myJsClass,
+                    null,
+                    jsFunction -> {
+                        final JSAttributeList attributeList = jsFunction.getAttributeList();
+                        PsiElement parentClass = JSResolveUtil.findParent(jsFunction);
+                        if ((attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC)
+                            && myJsClass != parentClass) {
+                            return Boolean.FALSE;
+                        }
+                        return Boolean.TRUE;
+                    }
+                );
+            }
+
+            JSFunction o = findFunctionWithTheSameKind(functions, function, name);
+
+            if (o == null) {
+                if (function.isGetProperty() || function.isSetProperty()) {
+                    JSVariable var = myJsClass.findFieldByName(name);
+                    if (var != null) {
+                        JSAttributeList attributeList = var.getAttributeList();
+                        if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC) {
+                            continue; // implicit get and set methods
+                        }
+                    }
+                }
+                addNonimplementedFunction(function);
+            }
+            else {
+                addImplementedFunction(function, o);
+            }
+        }
+        return true;
+    }
+
+    protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction) {
+    }
+
+    public static JSFunction findFunctionWithTheSameKind(
+        final Map<String, Object> functions,
+        final JSFunction function,
+        final String name
+    ) {
+        Object o = functions.get(name);
+        if (o instanceof JSFunction && ((JSFunction)o).getKind() != function.getKind()) {
+            o = null;
+        }
+        else if (o instanceof JSFunction[]) {
+            final JSFunction[] jsFunctions = (JSFunction[])o;
+            o = null;
+            for (JSFunction fun : jsFunctions) {
+                if (fun.getKind() == function.getKind()) {
+                    o = fun;
+                    break;
+                }
+            }
+        }
+        return (JSFunction)o;
+    }
+
+    public static Map<String, Object> collectAllVisibleClassFunctions(
+        JSClass jsClass, Map<String, Object> _functions,
+        final @Nullable Function<JSFunction, Boolean> filter
+    ) {
+        final Map<String, Object> functions = _functions != null ? _functions : new LinkedHashMap<>();
+        jsClass.processDeclarations(new ResolveProcessor(null) {
+            {
+                setToProcessHierarchy(true);
+                setLocalResolve(true);
+            }
+
+            @Override
+            public boolean execute(final PsiElement element, final ResolveState state) {
+                if (element instanceof JSFunction) {
+                    final JSFunction function = (JSFunction)element;
+                    if (function.isConstructor()) {
+                        return true; // SWC stubs have constructor methods :(
+                    }
+
+                    final JSAttributeList attributeList = function.getAttributeList();
+                    if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE) {
+                        return true;
+                    }
+
+                    Boolean filterValue;
+                    if (filter != null && (filterValue = filter.apply(function)) != null && !filterValue.booleanValue()) {
+                        return true;
+                    }
+                    final String s = function.getName();
+                    final Object function1 = functions.get(s);
+
+                    if (function1 == null) {
+                        functions.put(s, function);
+                    }
+                    else if (function1 instanceof JSFunction) {
+                        final JSFunction function2 = (JSFunction)function1;
+                        if (findFunctionWithTheSameKind(functions, function, s) == null) {
+                            functions.put(s, new JSFunction[]{
+                                function2,
+                                function
+                            });
+                        }
+                    }
+                }
+                return true;
+            }
+        }, ResolveState.initial(), jsClass, jsClass);
+        return functions;
+    }
+
+    protected abstract void addNonimplementedFunction(final JSFunction function);
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index 7e675836..5131091a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -57,980 +57,1011 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.*;
 
 /**
  * @by max, maxim.mossienko
  */
 public class JSAnnotatingVisitor extends JSElementVisitor implements Annotator {
-  private AnnotationHolder myHolder;
-
-  @Override
-  public synchronized void annotate(PsiElement psiElement, AnnotationHolder holder) {
-    myHolder = holder;
-    psiElement.accept(this);
-    myHolder = null;
-  }
-
-  @Override
-  public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair) {
-    checkReferences(attributeNameValuePair, HighlightSeverity.ERROR);
-  }
-
-  @Override
-  public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
-    checkReferences(includeDirective, HighlightSeverity.ERROR);
-  }
-
-  @Override
-  public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
-    checkReferences(node, HighlightSeverity.ERROR);
-  }
-
-  @RequiredReadAction
-  private void checkReferences(final PsiElement includeDirective, HighlightSeverity kind) {
-    for (PsiReference ref : includeDirective.getReferences()) {
-      if (!ref.isSoft() && hasBadResolve(ref)) {
-        final TextRange elementRange = ref.getElement().getTextRange();
-        final TextRange textRange = ref.getRangeInElement();
-
-        final TextRange range = new TextRange(
-          elementRange.getStartOffset() + textRange.getStartOffset(),
-          elementRange.getStartOffset() + textRange.getEndOffset()
-        );
-        final LocalizeValue value = ((EmptyResolveMessageProvider) ref).buildUnresolvedMessage(ref.getCanonicalText());
-        AnnotationBuilder builder = myHolder.newAnnotation(kind, value);
-        builder = builder.range(range);
-
-        if (ref instanceof LocalQuickFixProvider localQuickFixProvider) {
-          for (LocalQuickFix fix : localQuickFixProvider.getQuickFixes()) {
-            if (fix instanceof IntentionAction intentionAction) {
-               builder = builder.withFix(intentionAction);
-            }
-          }
-        }
-        builder.create();
-      }
-    }
-  }
+    private AnnotationHolder myHolder;
 
-  private boolean hasBadResolve(final PsiReference ref) {
-    if (ref instanceof PsiPolyVariantReference psiPolyVariantReference) {
-      return psiPolyVariantReference.multiResolve(false).length == 0;
+    @Override
+    public synchronized void annotate(PsiElement psiElement, AnnotationHolder holder) {
+        myHolder = holder;
+        psiElement.accept(this);
+        myHolder = null;
     }
-    return ref.resolve() == null;
-  }
-
-  @Override
-  public void visitJSCallExpression(final JSCallExpression node) {
-    final JSExpression methodExpression = node.getMethodExpression();
 
-    if (methodExpression instanceof JSLiteralExpression) {
-      myHolder.createErrorAnnotation(methodExpression, JavaScriptLocalize.javascriptParserMessageExpectedFunctionName().get());
-    }
-  }
-
-  @Override
-  public void visitJSDocTagValue(final JSDocTagValue tagValue) {
-    checkReferences(tagValue, HighlightSeverity.WARNING);
-  }
-
-  @Override
-  public void visitJSDocTag(final JSDocTag tagValue) {
-    checkReferences(tagValue, HighlightSeverity.WARNING);
-  }
-
-  @Override
-  public void visitJSReferenceList(final JSReferenceList referenceList) {
-    final JSClass jsClass = (JSClass)referenceList.getParent();
-    if (JSResolveUtil.isArtificialClassUsedForReferenceList(jsClass)) {
-      return; // implements="MyInterface" in mxml has artificial class created
+    @Override
+    public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair) {
+        checkReferences(attributeNameValuePair, HighlightSeverity.ERROR);
     }
 
-    final boolean withinExtends = jsClass.getExtendsList() == referenceList;
-    final boolean withinImplements = jsClass.getImplementsList() == referenceList;
+    @Override
+    public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
+        checkReferences(includeDirective, HighlightSeverity.ERROR);
+    }
 
-    if (withinImplements && jsClass.isInterface()) {
-      myHolder.createErrorAnnotation(referenceList,
-        JavaScriptLocalize.javascriptValidationMessageImplementsForInterfaceNotAllowed().get()
-      );
-      return;
+    @Override
+    public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
+        checkReferences(node, HighlightSeverity.ERROR);
     }
 
-    final Map<String, JSReferenceExpression> nameToExprMap = new HashMap<String, JSReferenceExpression>();
+    @RequiredReadAction
+    private void checkReferences(final PsiElement includeDirective, HighlightSeverity kind) {
+        for (PsiReference ref : includeDirective.getReferences()) {
+            if (!ref.isSoft() && hasBadResolve(ref)) {
+                final TextRange elementRange = ref.getElement().getTextRange();
+                final TextRange textRange = ref.getRangeInElement();
 
-    final JSReferenceExpression[] referenceExpressions = referenceList.getExpressions();
-    if (referenceExpressions != null) {
-      for (JSReferenceExpression expr : referenceExpressions) {
-        final String s = expr.getReferencedName();
-        if (s != null) {
-          nameToExprMap.put(s, expr);
+                final TextRange range = new TextRange(
+                    elementRange.getStartOffset() + textRange.getStartOffset(),
+                    elementRange.getStartOffset() + textRange.getEndOffset()
+                );
+                final LocalizeValue value = ((EmptyResolveMessageProvider)ref).buildUnresolvedMessage(ref.getCanonicalText());
+                AnnotationBuilder builder = myHolder.newAnnotation(kind, value);
+                builder = builder.range(range);
+
+                if (ref instanceof LocalQuickFixProvider localQuickFixProvider) {
+                    for (LocalQuickFix fix : localQuickFixProvider.getQuickFixes()) {
+                        if (fix instanceof IntentionAction intentionAction) {
+                            builder = builder.withFix(intentionAction);
+                        }
+                    }
+                }
+                builder.create();
+            }
         }
-      }
     }
 
-    for (JSClass clazz : referenceList.getReferencedClasses()) {
-      final boolean b = clazz.isInterface();
-      final JSReferenceExpression expr = nameToExprMap.get(clazz.getName());
-
-      if (!b && withinImplements) {
-        myHolder.createErrorAnnotation(expr, JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere().get());
-      }
-      else if (withinExtends && b != jsClass.isInterface()) {
-        myHolder.createErrorAnnotation(
-          expr,
-          !b
-            ? JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere().get()
-            : JavaScriptLocalize.javascriptValidationMessageClassNameExpectedHere().get()
-        );
-      }
-      if (clazz == jsClass) {
-        myHolder.createErrorAnnotation(expr, JavaScriptLocalize.javascriptValidationMessageCircularDependency().get())
-          .registerFix(new RemoveASTNodeFix(referenceList.getNode(), JavaScriptLocalize.javascriptFixRemoveCircularDependency()));
-      }
+    private boolean hasBadResolve(final PsiReference ref) {
+        if (ref instanceof PsiPolyVariantReference psiPolyVariantReference) {
+            return psiPolyVariantReference.multiResolve(false).length == 0;
+        }
+        return ref.resolve() == null;
     }
 
-    if (withinImplements) {
-      checkImplementedMethods(jsClass, new SimpleErrorReportingClient());
+    @Override
+    public void visitJSCallExpression(final JSCallExpression node) {
+        final JSExpression methodExpression = node.getMethodExpression();
+
+        if (methodExpression instanceof JSLiteralExpression) {
+            myHolder.createErrorAnnotation(methodExpression, JavaScriptLocalize.javascriptParserMessageExpectedFunctionName().get());
+        }
     }
-  }
 
-  public interface ErrorReportingClient {
-    enum ProblemKind {
-      ERROR,
-      WARNING
+    @Override
+    public void visitJSDocTagValue(final JSDocTagValue tagValue) {
+        checkReferences(tagValue, HighlightSeverity.WARNING);
     }
 
-    void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
+    @Override
+    public void visitJSDocTag(final JSDocTag tagValue) {
+        checkReferences(tagValue, HighlightSeverity.WARNING);
+    }
 
-    void reportError(final PsiElement nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
-  }
+    @Override
+    public void visitJSReferenceList(final JSReferenceList referenceList) {
+        final JSClass jsClass = (JSClass)referenceList.getParent();
+        if (JSResolveUtil.isArtificialClassUsedForReferenceList(jsClass)) {
+            return; // implements="MyInterface" in mxml has artificial class created
+        }
 
-  public static void checkImplementedMethods(final JSClass jsClass, final ErrorReportingClient reportingClient) {
-    final JSResolveUtil.CollectMethodsToImplementProcessor implementedMethodProcessor = new ImplementedMethodProcessor(jsClass) {
-      ImplementMethodsFix implementMethodsFix = null;
+        final boolean withinExtends = jsClass.getExtendsList() == referenceList;
+        final boolean withinImplements = jsClass.getImplementsList() == referenceList;
 
-      @Override
-      protected void addNonimplementedFunction(final JSFunction function) {
-        final PsiElement node = myJsClass.getNameIdentifier();
-        if (node == null) {
-          return;
-        }
-        if (implementMethodsFix == null) {
-          implementMethodsFix = new ImplementMethodsFix(myJsClass);
-        }
-        implementMethodsFix.addElementToProcess(function);
-        reportingClient.reportError(
-          node,
-          JavaScriptLocalize.javascriptValidationMessageInterfaceMethodNotImplemented(
-            function.getName(),
-            ((JSClass)JSResolveUtil.findParent(function)).getQualifiedName()
-          ).get(),
-          ErrorReportingClient.ProblemKind.ERROR,
-          implementMethodsFix
-        );
-      }
-
-      @Override
-      protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction) {
-        final JSAttributeList attributeList = implementationFunction.getAttributeList();
-        if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
-          final ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
-          reportingClient.reportError(
-            node,
-            JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidAccessModifier().get(),
-            ErrorReportingClient.ProblemKind.ERROR,
-            null
-            // TODO: quickfix
-          );
+        if (withinImplements && jsClass.isInterface()) {
+            myHolder.createErrorAnnotation(
+                referenceList,
+                JavaScriptLocalize.javascriptValidationMessageImplementsForInterfaceNotAllowed().get()
+            );
+            return;
         }
 
-        final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(implementationFunction, interfaceFunction);
+        final Map<String, JSReferenceExpression> nameToExprMap = new HashMap<String, JSReferenceExpression>();
 
-        if (incompatibleSignature != SignatureMatchResult.COMPATIBLE_SIGNATURE) {
-          PsiElement parent = JSResolveUtil.findParent(implementationFunction);
-          if (parent instanceof JSFile) {
-            parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
-          }
+        final JSReferenceExpression[] referenceExpressions = referenceList.getExpressions();
+        if (referenceExpressions != null) {
+            for (JSReferenceExpression expr : referenceExpressions) {
+                final String s = expr.getReferencedName();
+                if (s != null) {
+                    nameToExprMap.put(s, expr);
+                }
+            }
+        }
 
-          if (parent != myJsClass) {
-            // some parent incorrectly implements method from our interface
-            addNonimplementedFunction(interfaceFunction);
-            return;
-          }
+        for (JSClass clazz : referenceList.getReferencedClasses()) {
+            final boolean b = clazz.isInterface();
+            final JSReferenceExpression expr = nameToExprMap.get(clazz.getName());
 
-          if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
-            final JSParameterList parameterList = implementationFunction.getParameterList();
-            final JSParameterList expectedParameterList = interfaceFunction.getParameterList();
-            reportingClient.reportError(
-              parameterList.getNode(),
-              JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature(
-                expectedParameterList != null ? expectedParameterList.getText() : "()"
-              ).get(),
-              ErrorReportingClient.ProblemKind.ERROR,
-              null
-            );  // TODO: quickfix
-          }
-          else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
-            PsiElement implementationReturnTypeExpr = implementationFunction.getReturnTypeElement();
-            PsiElement interfaceReturnTypeExpr = interfaceFunction.getReturnTypeElement();
-            reportingClient.reportError(
-              implementationReturnTypeExpr != null ? implementationReturnTypeExpr : implementationFunction.getNameIdentifier(),
-              JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature2(
-                interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"
-              ).get(),
-              ErrorReportingClient.ProblemKind.ERROR,
-              null
-            );  // TODO: quickfix
-          }
+            if (!b && withinImplements) {
+                myHolder.createErrorAnnotation(expr, JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere().get());
+            }
+            else if (withinExtends && b != jsClass.isInterface()) {
+                myHolder.createErrorAnnotation(
+                    expr,
+                    !b
+                        ? JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere().get()
+                        : JavaScriptLocalize.javascriptValidationMessageClassNameExpectedHere().get()
+                );
+            }
+            if (clazz == jsClass) {
+                myHolder.createErrorAnnotation(expr, JavaScriptLocalize.javascriptValidationMessageCircularDependency().get())
+                    .registerFix(new RemoveASTNodeFix(referenceList.getNode(), JavaScriptLocalize.javascriptFixRemoveCircularDependency()));
+            }
+        }
+
+        if (withinImplements) {
+            checkImplementedMethods(jsClass, new SimpleErrorReportingClient());
         }
-      }
-    };
-    JSResolveUtil.processInterfaceMethods(jsClass, implementedMethodProcessor);
-  }
-
-  private static ASTNode findElementForAccessModifierError(final @Nonnull JSFunction o, final JSAttributeList attributeList) {
-    if (attributeList != null) {
-      final PsiElement accessTypeElement = attributeList.findAccessTypeElement();
-      if (accessTypeElement != null) {
-        return accessTypeElement.getNode();
-      }
     }
-    PsiElement nameIdentifier = o.getNameIdentifier();
-    return nameIdentifier == null ? null : nameIdentifier.getNode();
-  }
 
-  @Override
-  public void visitJSAttributeList(JSAttributeList attributeList) {
-    PsiElement parentForCheckingNsOrAccessModifier = null;
+    public interface ErrorReportingClient {
+        enum ProblemKind {
+            ERROR,
+            WARNING
+        }
 
-    PsiElement namespaceElement = attributeList.getNamespaceElement();
-    PsiElement accessTypeElement = attributeList.findAccessTypeElement();
-    PsiElement namespaceOrAccessModifierElement = namespaceElement;
+        void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
+
+        void reportError(final PsiElement nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
+    }
+
+    public static void checkImplementedMethods(final JSClass jsClass, final ErrorReportingClient reportingClient) {
+        final JSResolveUtil.CollectMethodsToImplementProcessor implementedMethodProcessor = new ImplementedMethodProcessor(jsClass) {
+            ImplementMethodsFix implementMethodsFix = null;
+
+            @Override
+            protected void addNonimplementedFunction(final JSFunction function) {
+                final PsiElement node = myJsClass.getNameIdentifier();
+                if (node == null) {
+                    return;
+                }
+                if (implementMethodsFix == null) {
+                    implementMethodsFix = new ImplementMethodsFix(myJsClass);
+                }
+                implementMethodsFix.addElementToProcess(function);
+                reportingClient.reportError(
+                    node,
+                    JavaScriptLocalize.javascriptValidationMessageInterfaceMethodNotImplemented(
+                        function.getName(),
+                        ((JSClass)JSResolveUtil.findParent(function)).getQualifiedName()
+                    ).get(),
+                    ErrorReportingClient.ProblemKind.ERROR,
+                    implementMethodsFix
+                );
+            }
 
-    if (namespaceOrAccessModifierElement == null) {
-      namespaceOrAccessModifierElement = accessTypeElement;
-    }
-    else if (accessTypeElement != null) {
-      myHolder.createErrorAnnotation(
-          namespaceOrAccessModifierElement,
-          JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier().get()
-        )
-        .registerFix(new RemoveASTNodeFix(
-          namespaceOrAccessModifierElement.getNode(),
-          JavaScriptLocalize.javascriptFixRemoveNamespaceReference()
-        ));
-
-      myHolder.createErrorAnnotation(
-          accessTypeElement,
-          JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier().get()
-        )
-        .registerFix(new RemoveASTNodeFix(accessTypeElement.getNode(), JavaScriptLocalize.javascriptFixRemoveNamespaceReference()));
+            @Override
+            protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction) {
+                final JSAttributeList attributeList = implementationFunction.getAttributeList();
+                if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
+                    final ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
+                    reportingClient.reportError(
+                        node,
+                        JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidAccessModifier().get(),
+                        ErrorReportingClient.ProblemKind.ERROR,
+                        null
+                        // TODO: quickfix
+                    );
+                }
+
+                final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(implementationFunction, interfaceFunction);
+
+                if (incompatibleSignature != SignatureMatchResult.COMPATIBLE_SIGNATURE) {
+                    PsiElement parent = JSResolveUtil.findParent(implementationFunction);
+                    if (parent instanceof JSFile) {
+                        parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+                    }
+
+                    if (parent != myJsClass) {
+                        // some parent incorrectly implements method from our interface
+                        addNonimplementedFunction(interfaceFunction);
+                        return;
+                    }
+
+                    if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
+                        final JSParameterList parameterList = implementationFunction.getParameterList();
+                        final JSParameterList expectedParameterList = interfaceFunction.getParameterList();
+                        reportingClient.reportError(
+                            parameterList.getNode(),
+                            JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature(
+                                expectedParameterList != null ? expectedParameterList.getText() : "()"
+                            ).get(),
+                            ErrorReportingClient.ProblemKind.ERROR,
+                            null
+                        );  // TODO: quickfix
+                    }
+                    else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
+                        PsiElement implementationReturnTypeExpr = implementationFunction.getReturnTypeElement();
+                        PsiElement interfaceReturnTypeExpr = interfaceFunction.getReturnTypeElement();
+                        reportingClient.reportError(
+                            implementationReturnTypeExpr != null
+                                ? implementationReturnTypeExpr
+                                : implementationFunction.getNameIdentifier(),
+                            JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature2(
+                                interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"
+                            ).get(),
+                            ErrorReportingClient.ProblemKind.ERROR,
+                            null
+                        );  // TODO: quickfix
+                    }
+                }
+            }
+        };
+        JSResolveUtil.processInterfaceMethods(jsClass, implementedMethodProcessor);
     }
 
-    if (namespaceOrAccessModifierElement != null) {
-      parentForCheckingNsOrAccessModifier = JSResolveUtil.findParent(attributeList.getParent());
-      if (!(parentForCheckingNsOrAccessModifier instanceof JSClass)) {
-        String typeElementText;
-        boolean nodeUnderPackage;
-
-        if (((!(nodeUnderPackage = (parentForCheckingNsOrAccessModifier instanceof JSPackageStatement))
-          && (!(parentForCheckingNsOrAccessModifier instanceof JSFile)
-          || attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL))
-          || (!"public".equals(typeElementText = namespaceOrAccessModifierElement.getText()))
-          && !"internal".equals(typeElementText))) {
-          boolean nsRef = namespaceOrAccessModifierElement instanceof JSReferenceExpression;
-          myHolder.createErrorAnnotation(
-              namespaceOrAccessModifierElement,
-              nodeUnderPackage ?
-                JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForPackageMembers().get()
-                : nsRef
-                ? JavaScriptLocalize.javascriptValidationMessageNamespaceAllowedOnlyForClassMembers().get()
-                : JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForClassMembers().get()
-            )
-            .registerFix(new RemoveASTNodeFix(
-              namespaceOrAccessModifierElement.getNode(),
-              nsRef ? JavaScriptLocalize.javascriptFixRemoveNamespaceReference() : JavaScriptLocalize.javascriptFixRemoveAccessModifier()
-            ));
-        }
-      }
-      else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
-        if (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL
-          || attributeList.getNode().findChildByType(JSTokenTypes.INTERNAL_KEYWORD) != null
-        ) {
-          final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.ACCESS_MODIFIERS);
-          final Annotation annotation = myHolder.createErrorAnnotation(
-            astNode,
-            JavaScriptLocalize.javascriptValidationMessageInterfaceMembersCannotHaveAccessModifiers().get()
-          );
-
-          annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveAccessModifier()));
-        }
-      }
+    private static ASTNode findElementForAccessModifierError(final @Nonnull JSFunction o, final JSAttributeList attributeList) {
+        if (attributeList != null) {
+            final PsiElement accessTypeElement = attributeList.findAccessTypeElement();
+            if (accessTypeElement != null) {
+                return accessTypeElement.getNode();
+            }
+        }
+        PsiElement nameIdentifier = o.getNameIdentifier();
+        return nameIdentifier == null ? null : nameIdentifier.getNode();
     }
-  }
 
-  @Override
-  public void visitJSReferenceExpression(final JSReferenceExpression node) {
-    final PsiElement parent = node.getParent();
+    @Override
+    public void visitJSAttributeList(JSAttributeList attributeList) {
+        PsiElement parentForCheckingNsOrAccessModifier = null;
 
-    if (parent instanceof JSNamedElement namedElement) {
-      final PsiElement nameIdentifier = namedElement.getNameIdentifier();
+        PsiElement namespaceElement = attributeList.getNamespaceElement();
+        PsiElement accessTypeElement = attributeList.findAccessTypeElement();
+        PsiElement namespaceOrAccessModifierElement = namespaceElement;
 
-      if (nameIdentifier != null && nameIdentifier == node) {
-        if (parent instanceof JSPackageStatement packageStatement) {
-          checkPackageStatement(packageStatement);
+        if (namespaceOrAccessModifierElement == null) {
+            namespaceOrAccessModifierElement = accessTypeElement;
         }
-        else if (!(parent instanceof JSImportStatement) && parent.getParent() instanceof JSPackageStatement) {
-          checkNamedObjectIsInCorrespondingFile(namedElement);
+        else if (accessTypeElement != null) {
+            myHolder.createErrorAnnotation(
+                    namespaceOrAccessModifierElement,
+                    JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier().get()
+                )
+                .registerFix(new RemoveASTNodeFix(
+                    namespaceOrAccessModifierElement.getNode(),
+                    JavaScriptLocalize.javascriptFixRemoveNamespaceReference()
+                ));
+
+            myHolder.createErrorAnnotation(
+                    accessTypeElement,
+                    JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier().get()
+                )
+                .registerFix(new RemoveASTNodeFix(accessTypeElement.getNode(), JavaScriptLocalize.javascriptFixRemoveNamespaceReference()));
         }
-        else if (parent instanceof JSFunction function) {
-          if (function.isConstructor()) {
-            final JSClass clazz;
-            if (parent.getParent() instanceof JSClass jsClass) {
-              clazz = jsClass;
+
+        if (namespaceOrAccessModifierElement != null) {
+            parentForCheckingNsOrAccessModifier = JSResolveUtil.findParent(attributeList.getParent());
+            if (!(parentForCheckingNsOrAccessModifier instanceof JSClass)) {
+                String typeElementText;
+                boolean nodeUnderPackage;
+
+                if (((!(nodeUnderPackage = (parentForCheckingNsOrAccessModifier instanceof JSPackageStatement))
+                    && (!(parentForCheckingNsOrAccessModifier instanceof JSFile)
+                    || attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL))
+                    || (!"public".equals(typeElementText = namespaceOrAccessModifierElement.getText()))
+                    && !"internal".equals(typeElementText))) {
+                    boolean nsRef = namespaceOrAccessModifierElement instanceof JSReferenceExpression;
+                    myHolder.createErrorAnnotation(
+                            namespaceOrAccessModifierElement,
+                            nodeUnderPackage ?
+                                JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForPackageMembers().get()
+                                : nsRef
+                                ? JavaScriptLocalize.javascriptValidationMessageNamespaceAllowedOnlyForClassMembers().get()
+                                : JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForClassMembers().get()
+                        )
+                        .registerFix(new RemoveASTNodeFix(
+                            namespaceOrAccessModifierElement.getNode(),
+                            nsRef
+                                ? JavaScriptLocalize.javascriptFixRemoveNamespaceReference()
+                                : JavaScriptLocalize.javascriptFixRemoveAccessModifier()
+                        ));
+                }
             }
-            else {
-              assert parent.getParent() instanceof JSFile;
-              clazz = JSResolveUtil.getXmlBackedClass((JSFile)parent.getParent());
-              assert clazz != null;
+            else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
+                if (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL
+                    || attributeList.getNode().findChildByType(JSTokenTypes.INTERNAL_KEYWORD) != null
+                ) {
+                    final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.ACCESS_MODIFIERS);
+                    final Annotation annotation = myHolder.createErrorAnnotation(
+                        astNode,
+                        JavaScriptLocalize.javascriptValidationMessageInterfaceMembersCannotHaveAccessModifiers().get()
+                    );
+
+                    annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveAccessModifier()));
+                }
             }
+        }
+    }
 
-            checkMissedSuperCall(node, function, clazz);
-          }
-          else if (function.isSetProperty()) {
-            String typeString = function.getReturnTypeString();
-
-            if (typeString != null && !"void".equals(typeString)) {
-              // TODO: fix!
-              myHolder.createErrorAnnotation(
-                function.getReturnTypeElement(),
-                JavaScriptLocalize.javascriptValidationMessageSetMethodShouldBeVoidOrWithoutType().get()
-              );
+    @Override
+    public void visitJSReferenceExpression(final JSReferenceExpression node) {
+        final PsiElement parent = node.getParent();
+
+        if (parent instanceof JSNamedElement namedElement) {
+            final PsiElement nameIdentifier = namedElement.getNameIdentifier();
+
+            if (nameIdentifier != null && nameIdentifier == node) {
+                if (parent instanceof JSPackageStatement packageStatement) {
+                    checkPackageStatement(packageStatement);
+                }
+                else if (!(parent instanceof JSImportStatement) && parent.getParent() instanceof JSPackageStatement) {
+                    checkNamedObjectIsInCorrespondingFile(namedElement);
+                }
+                else if (parent instanceof JSFunction function) {
+                    if (function.isConstructor()) {
+                        final JSClass clazz;
+                        if (parent.getParent() instanceof JSClass jsClass) {
+                            clazz = jsClass;
+                        }
+                        else {
+                            assert parent.getParent() instanceof JSFile;
+                            clazz = JSResolveUtil.getXmlBackedClass((JSFile)parent.getParent());
+                            assert clazz != null;
+                        }
+
+                        checkMissedSuperCall(node, function, clazz);
+                    }
+                    else if (function.isSetProperty()) {
+                        String typeString = function.getReturnTypeString();
+
+                        if (typeString != null && !"void".equals(typeString)) {
+                            // TODO: fix!
+                            myHolder.createErrorAnnotation(
+                                function.getReturnTypeElement(),
+                                JavaScriptLocalize.javascriptValidationMessageSetMethodShouldBeVoidOrWithoutType().get()
+                            );
+                        }
+
+                        JSParameterList parameterList = function.getParameterList();
+                        if (parameterList != null && parameterList.getParameters().length != 1) {
+                            // TODO: fix!
+                            myHolder.createErrorAnnotation(
+                                parameterList,
+                                JavaScriptLocalize.javascriptValidationMessageSetMethodShouldHaveOneParameter().get()
+                            );
+                        }
+                    }
+                    else if (function.isGetProperty()) {
+                        String typeString = function.getReturnTypeString();
+
+                        if (typeString == null || "void".equals(typeString)) {
+                            // TODO: fix!
+                            myHolder.createErrorAnnotation(
+                                typeString != null ? function.getReturnTypeElement() : nameIdentifier,
+                                JavaScriptLocalize
+                                    .javascriptValidationMessageGetMethodShouldBeValidType(typeString != null ? typeString : "empty").get()
+                            );
+                        }
+
+                        JSParameterList parameterList = function.getParameterList();
+                        if (parameterList != null && parameterList.getParameters().length != 0) {
+                            // TODO: fix!
+                            myHolder.createErrorAnnotation(
+                                parameterList,
+                                JavaScriptLocalize.javascriptValidationMessageGetMethodShouldHaveNoParameter().get()
+                            );
+                        }
+                    }
+                }
+
+                if (parent instanceof JSClass jsClass) {
+                    final JSFunction constructor = jsClass.findFunctionByName(jsClass.getName());
+                    if (constructor == null) {
+                        checkMissedSuperCall(node, constructor, jsClass);
+                    }
+
+                    PsiElement clazzParent = jsClass.getParent();
+                    if (!(clazzParent instanceof JSPackageStatement || clazzParent instanceof JSFile)) {
+                        myHolder.createErrorAnnotation(
+                            node,
+                            JavaScriptLocalize.javascriptValidationMessageNestedClassesAreNotAllowed().get()
+                        );
+                    }
+                }
             }
+        }
 
-            JSParameterList parameterList = function.getParameterList();
-            if (parameterList != null && parameterList.getParameters().length != 1) {
-              // TODO: fix!
-              myHolder.createErrorAnnotation(
-                parameterList,
-                JavaScriptLocalize.javascriptValidationMessageSetMethodShouldHaveOneParameter().get()
-              );
+        if (node.getQualifier() == null && !(parent instanceof JSCallExpression) && "arguments".equals(node.getText())) {
+            JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
+            if (fun == null) {
+                myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageArgumentsOutOfFunction().get());
             }
-          }
-          else if (function.isGetProperty()) {
-            String typeString = function.getReturnTypeString();
-
-            if (typeString == null || "void".equals(typeString)) {
-              // TODO: fix!
-              myHolder.createErrorAnnotation(
-                typeString != null ? function.getReturnTypeElement() : nameIdentifier,
-                JavaScriptLocalize.javascriptValidationMessageGetMethodShouldBeValidType(typeString != null ? typeString : "empty").get()
-              );
+            else {
+                JSParameterList parameterList = fun.getParameterList();
+                if (parameterList != null) {
+                    for (JSParameter p : parameterList.getParameters()) {
+                        if (p.isRest()) {
+                            myHolder.createErrorAnnotation(
+                                node,
+                                JavaScriptLocalize.javascriptValidationMessageArgumentsWithRestParameter().get()
+                            );
+                        }
+                    }
+                }
             }
+        }
+    }
 
-            JSParameterList parameterList = function.getParameterList();
-            if (parameterList != null && parameterList.getParameters().length != 0) {
-              // TODO: fix!
-              myHolder.createErrorAnnotation(
-                parameterList,
-                JavaScriptLocalize.javascriptValidationMessageGetMethodShouldHaveNoParameter().get()
-              );
-            }
-          }
+    private void checkMissedSuperCall(JSReferenceExpression node, JSFunction constructor, JSClass jsClass) {
+        if (jsClass.isInterface()) {
+            return;
         }
+        JSFunction nontrivialSuperClassConstructor = getNontrivialSuperClassConstructor(jsClass);
 
-        if (parent instanceof JSClass jsClass) {
-          final JSFunction constructor = jsClass.findFunctionByName(jsClass.getName());
-          if (constructor == null) {
-            checkMissedSuperCall(node, constructor, jsClass);
-          }
+        if (nontrivialSuperClassConstructor != null) {
+            Annotation annotation = null;
 
-          PsiElement clazzParent = jsClass.getParent();
-          if (!(clazzParent instanceof JSPackageStatement || clazzParent instanceof JSFile)) {
-            myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageNestedClassesAreNotAllowed().get());
-          }
+            if (!hasSuperConstructorCall(constructor)) {
+                annotation =
+                    myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageMissedSuperConstructorCall().get());
+            }
+
+            if (annotation != null) {
+                if (constructor == null) {
+                    annotation.registerFix(new AddConstructorAndSuperInvokationFix(node, nontrivialSuperClassConstructor));
+                }
+                else {
+                    annotation.registerFix(new AddSuperInvokationFix(node, nontrivialSuperClassConstructor));
+                }
+            }
         }
-      }
     }
 
-    if (node.getQualifier() == null && !(parent instanceof JSCallExpression) && "arguments".equals(node.getText())) {
-      JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
-      if (fun == null) {
-        myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageArgumentsOutOfFunction().get());
-      }
-      else {
-        JSParameterList parameterList = fun.getParameterList();
-        if (parameterList != null) {
-          for (JSParameter p : parameterList.getParameters()) {
-            if (p.isRest()) {
-              myHolder.createErrorAnnotation(
-                node,
-                JavaScriptLocalize.javascriptValidationMessageArgumentsWithRestParameter().get()
-              );
+    private boolean hasSuperConstructorCall(JSFunction jsFunction) {
+        if (jsFunction == null) {
+            return false;
+        }
+        final JSSourceElement[] body = (jsFunction).getBody();
+        final JSStatement[] statements = body.length > 0 ? ((JSBlockStatement)body[0]).getStatements() : JSStatement.EMPTY;
+
+        for (JSStatement st : statements) {
+            if (st instanceof JSExpressionStatement expressionStatement
+                && expressionStatement.getExpression() instanceof JSCallExpression callExpression
+                && callExpression.getMethodExpression() instanceof JSSuperExpression) {
+                return true;
             }
-          }
         }
-      }
-    }
-  }
 
-  private void checkMissedSuperCall(JSReferenceExpression node, JSFunction constructor, JSClass jsClass) {
-    if (jsClass.isInterface()) {
-      return;
+        return false;
     }
-    JSFunction nontrivialSuperClassConstructor = getNontrivialSuperClassConstructor(jsClass);
 
-    if (nontrivialSuperClassConstructor != null) {
-      Annotation annotation = null;
+    public static JSFunction getNontrivialSuperClassConstructor(JSClass clazz) {
+        final JSClass[] classes = clazz.getSuperClasses();
 
-      if (!hasSuperConstructorCall(constructor)) {
-        annotation =
-          myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageMissedSuperConstructorCall().get());
-      }
+        if (classes.length > 0) {
+            final JSFunction constructor = classes[0].findFunctionByName(classes[0].getName());
 
-      if (annotation != null) {
-        if (constructor == null) {
-          annotation.registerFix(new AddConstructorAndSuperInvokationFix(node, nontrivialSuperClassConstructor));
-        }
-        else {
-          annotation.registerFix(new AddSuperInvokationFix(node, nontrivialSuperClassConstructor));
+            if (constructor != null) {
+                final JSParameter[] jsParameters = constructor.getParameterList().getParameters();
+                boolean hasRequiredParameters = false;
+                for (JSParameter p : jsParameters) {
+                    if (!p.isRest() && !p.hasInitializer()) {
+                        hasRequiredParameters = true;
+                        break;
+                    }
+                }
+                return hasRequiredParameters ? constructor : null;
+            }
         }
-      }
-    }
-  }
 
-  private boolean hasSuperConstructorCall(JSFunction jsFunction) {
-    if (jsFunction == null) {
-      return false;
+        return null;
     }
-    final JSSourceElement[] body = (jsFunction).getBody();
-    final JSStatement[] statements = body.length > 0 ? ((JSBlockStatement)body[0]).getStatements() : JSStatement.EMPTY;
 
-    for (JSStatement st : statements) {
-      if (st instanceof JSExpressionStatement expressionStatement
-        && expressionStatement.getExpression() instanceof JSCallExpression callExpression
-        && callExpression.getMethodExpression() instanceof JSSuperExpression) {
-        return true;
-      }
-    }
-
-    return false;
-  }
+    @Override
+    public void visitJSParameterList(JSParameterList node) {
+        boolean foundRest = false;
+        boolean initializerPresent = false;
 
-  public static JSFunction getNontrivialSuperClassConstructor(JSClass clazz) {
-    final JSClass[] classes = clazz.getSuperClasses();
+        for (JSParameter parameter : node.getParameters()) {
+            JSExpression initializer = parameter.getInitializer();
+            boolean hasInitializer = initializer != null;
 
-    if (classes.length > 0) {
-      final JSFunction constructor = classes[0].findFunctionByName(classes[0].getName());
+            if (hasInitializer && !initializerPresent) {
+                initializerPresent = true;
+            }
+            else if (!hasInitializer && initializerPresent && !parameter.isRest()) {
+                myHolder.createErrorAnnotation(
+                        parameter,
+                        JavaScriptLocalize.javascriptValidationMessageParameterShouldBeInitialized().get()
+                    )
+                    .registerFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
+            }
+            else if (hasInitializer && parameter.isRest()) {
+                myHolder.createErrorAnnotation(
+                        parameter,
+                        JavaScriptLocalize.javascriptValidationMessageRestParameterShouldNotBeInitialized().get()
+                    )
+                    .registerFix(new RemoveASTNodeFix(
+                        JavaScriptLocalize.javascriptFixRemoveInitializer(),
+                        getNodesBefore(initializer, JSTokenTypes.EQ)
+                    ));
+            }
 
-      if (constructor != null) {
-        final JSParameter[] jsParameters = constructor.getParameterList().getParameters();
-        boolean hasRequiredParameters = false;
-        for (JSParameter p : jsParameters) {
-          if (!p.isRest() && !p.hasInitializer()) {
-            hasRequiredParameters = true;
-            break;
-          }
+            if (parameter.isRest() && !foundRest) {
+                foundRest = true;
+                PsiElement typeElement = parameter.getTypeElement();
+                if (typeElement != null && !"Array".equals(typeElement.getText())) {
+                    myHolder.createErrorAnnotation(
+                            typeElement,
+                            JavaScriptLocalize.javascriptValidationMessageUnexpectedTypeForRestParameter().get()
+                        )
+                        .registerFix(new RemoveASTNodeFix(
+                            JavaScriptLocalize.javascriptFixRemoveTypeReference(),
+                            getNodesBefore(typeElement, JSTokenTypes.COLON)
+                        ));
+                }
+            }
+            else if (foundRest) {
+                myHolder.createErrorAnnotation(
+                        parameter,
+                        JavaScriptLocalize.javascriptValidationMessageParameterIsNotAllowedAfterRestParameter().get()
+                    )
+                    .registerFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
+            }
         }
-        return hasRequiredParameters ? constructor : null;
-      }
-    }
-
-    return null;
-  }
-
-  @Override
-  public void visitJSParameterList(JSParameterList node) {
-    boolean foundRest = false;
-    boolean initializerPresent = false;
-
-    for (JSParameter parameter : node.getParameters()) {
-      JSExpression initializer = parameter.getInitializer();
-      boolean hasInitializer = initializer != null;
-
-      if (hasInitializer && !initializerPresent) {
-        initializerPresent = true;
-      }
-      else if (!hasInitializer && initializerPresent && !parameter.isRest()) {
-        myHolder.createErrorAnnotation(parameter, JavaScriptLocalize.javascriptValidationMessageParameterShouldBeInitialized().get())
-          .registerFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
-      }
-      else if (hasInitializer && parameter.isRest()) {
-        myHolder.createErrorAnnotation(
-          parameter,
-            JavaScriptLocalize.javascriptValidationMessageRestParameterShouldNotBeInitialized().get()
-          )
-          .registerFix(new RemoveASTNodeFix(
-            JavaScriptLocalize.javascriptFixRemoveInitializer(),
-            getNodesBefore(initializer, JSTokenTypes.EQ)
-          ));
-      }
-
-      if (parameter.isRest() && !foundRest) {
-        foundRest = true;
-        PsiElement typeElement = parameter.getTypeElement();
-        if (typeElement != null && !"Array".equals(typeElement.getText())) {
-          myHolder.createErrorAnnotation(
-              typeElement,
-              JavaScriptLocalize.javascriptValidationMessageUnexpectedTypeForRestParameter().get()
-            )
-            .registerFix(new RemoveASTNodeFix(
-              JavaScriptLocalize.javascriptFixRemoveTypeReference(),
-              getNodesBefore(typeElement, JSTokenTypes.COLON)
-            ));
-        }
-      }
-      else if (foundRest) {
-        myHolder.createErrorAnnotation(
-            parameter,
-            JavaScriptLocalize.javascriptValidationMessageParameterIsNotAllowedAfterRestParameter().get()
-          )
-          .registerFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
-      }
     }
-  }
 
-  private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq) {
-    List<ASTNode> nodes = new ArrayList<>();
-    PsiElement element = initializer.getPrevSibling();
-    PsiElement lastElement = element;
+    private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq) {
+        List<ASTNode> nodes = new ArrayList<>();
+        PsiElement element = initializer.getPrevSibling();
+        PsiElement lastElement = element;
 
-    if (element instanceof PsiWhiteSpace) {
-      nodes.add(element.getNode());
-      lastElement = element.getPrevSibling();
-    }
+        if (element instanceof PsiWhiteSpace) {
+            nodes.add(element.getNode());
+            lastElement = element.getPrevSibling();
+        }
 
-    if (lastElement != null && lastElement.getNode().getElementType() == eq) {
-      nodes.add(lastElement.getNode());
-    }
+        if (lastElement != null && lastElement.getNode().getElementType() == eq) {
+            nodes.add(lastElement.getNode());
+        }
 
-    nodes.add(initializer.getNode());
-    return nodes.toArray(new ASTNode[nodes.size()]);
-  }
-
-  @Override
-  public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
-    for (PsiElement el = packageStatement.getPrevSibling(); el != null; el = el.getPrevSibling()) {
-      if (!(el instanceof PsiWhiteSpace || el instanceof PsiComment)) {
-        myHolder.createErrorAnnotation(
-          packageStatement.getFirstChild().getNode(),
-          JavaScriptLocalize.javascriptValidationMessagePackageShouldbeFirstStatement().get()
-        );
-        break;
-      }
-    }
-    final PsiElement node = packageStatement.getNameIdentifier();
-    if (node == null) {
-      checkPackageStatement(packageStatement);
+        nodes.add(initializer.getNode());
+        return nodes.toArray(new ASTNode[nodes.size()]);
     }
-  }
 
-  @Override
-  public void visitJSAssignmentExpression(final JSAssignmentExpression expression) {
-    JSExpression lExpr = expression.getLOperand();
-    if (lExpr == null) {
-      return;
-    }
-    if (lExpr instanceof JSDefinitionExpression definitionExpression) {
-      lExpr = definitionExpression.getExpression();
+    @Override
+    public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
+        for (PsiElement el = packageStatement.getPrevSibling(); el != null; el = el.getPrevSibling()) {
+            if (!(el instanceof PsiWhiteSpace || el instanceof PsiComment)) {
+                myHolder.createErrorAnnotation(
+                    packageStatement.getFirstChild().getNode(),
+                    JavaScriptLocalize.javascriptValidationMessagePackageShouldbeFirstStatement().get()
+                );
+                break;
+            }
+        }
+        final PsiElement node = packageStatement.getNameIdentifier();
+        if (node == null) {
+            checkPackageStatement(packageStatement);
+        }
     }
 
-    if (lExpr instanceof JSReferenceExpression lRefExpr) {
-      PsiElement resolved = lRefExpr.resolve();
-      if (resolved instanceof JSVariable variable && variable.isConst()) {
-        myHolder.createErrorAnnotation(lExpr, JavaScriptLocalize.javascriptValidationMessageAssignmentToConst().get());
-      }
-    }
+    @Override
+    public void visitJSAssignmentExpression(final JSAssignmentExpression expression) {
+        JSExpression lExpr = expression.getLOperand();
+        if (lExpr == null) {
+            return;
+        }
+        if (lExpr instanceof JSDefinitionExpression definitionExpression) {
+            lExpr = definitionExpression.getExpression();
+        }
 
-    if (!JSUtils.isLHSExpression(lExpr)) {
-      myHolder.createErrorAnnotation(lExpr, JavaScriptLocalize.javascriptValidationMessageMustBeLvalue().get());
-    }
-  }
-
-  @Override
-  public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
-    final PsiElement lastChild = node.getLastChild();
-    PsiElement child = lastChild != null ? lastChild.getPrevSibling() : null;
-    if (child instanceof PsiWhiteSpace) {
-      child = child.getPrevSibling();
-    }
-    ASTNode childNode;
+        if (lExpr instanceof JSReferenceExpression lRefExpr) {
+            PsiElement resolved = lRefExpr.resolve();
+            if (resolved instanceof JSVariable variable && variable.isConst()) {
+                myHolder.createErrorAnnotation(lExpr, JavaScriptLocalize.javascriptValidationMessageAssignmentToConst().get());
+            }
+        }
 
-    if (child != null && (childNode = child.getNode()) != null && childNode.getElementType() == JSTokenTypes.COMMA) {
-      final Annotation annotation =
-        myHolder.createWarningAnnotation(child, JavaScriptLocalize.javascriptValidationMessageUnneededComma().get());
-      annotation.registerFix(new RemoveASTNodeFix(childNode, JavaScriptLocalize.javascriptValidationMessageRemoveUnneededCommaFix()));
+        if (!JSUtils.isLHSExpression(lExpr)) {
+            myHolder.createErrorAnnotation(lExpr, JavaScriptLocalize.javascriptValidationMessageMustBeLvalue().get());
+        }
     }
-  }
-
-  @Override
-  public void visitJSTryStatement(final JSTryStatement node) {
-    final JSCatchBlock[] blocks = node.getAllCatchBlocks();
-
-    if (blocks.length > 1) {
-      final Set<String> typeToCatch = new HashSet<>();
 
-      for (JSCatchBlock block : blocks) {
-        final JSParameter p = block.getParameter();
-        if (p == null) {
-          continue;
+    @Override
+    public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
+        final PsiElement lastChild = node.getLastChild();
+        PsiElement child = lastChild != null ? lastChild.getPrevSibling() : null;
+        if (child instanceof PsiWhiteSpace) {
+            child = child.getPrevSibling();
         }
+        ASTNode childNode;
 
-        String s = p.getTypeString();
-        if (s == null) {
-          s = "";
+        if (child != null && (childNode = child.getNode()) != null && childNode.getElementType() == JSTokenTypes.COMMA) {
+            final Annotation annotation =
+                myHolder.createWarningAnnotation(child, JavaScriptLocalize.javascriptValidationMessageUnneededComma().get());
+            annotation.registerFix(new RemoveASTNodeFix(childNode, JavaScriptLocalize.javascriptValidationMessageRemoveUnneededCommaFix()));
         }
+    }
 
-        if (typeToCatch.contains(s)) {
-          final Annotation annotation =
-            myHolder.createErrorAnnotation(block, JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlock().get());
-          annotation.registerFix(new RemoveASTNodeFix(
-            block.getNode(),
-            JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlockFix()
-          ));
-        }
-        else {
-          typeToCatch.add(s);
+    @Override
+    public void visitJSTryStatement(final JSTryStatement node) {
+        final JSCatchBlock[] blocks = node.getAllCatchBlocks();
+
+        if (blocks.length > 1) {
+            final Set<String> typeToCatch = new HashSet<>();
+
+            for (JSCatchBlock block : blocks) {
+                final JSParameter p = block.getParameter();
+                if (p == null) {
+                    continue;
+                }
+
+                String s = p.getTypeString();
+                if (s == null) {
+                    s = "";
+                }
+
+                if (typeToCatch.contains(s)) {
+                    final Annotation annotation =
+                        myHolder.createErrorAnnotation(block, JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlock().get());
+                    annotation.registerFix(new RemoveASTNodeFix(
+                        block.getNode(),
+                        JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlockFix()
+                    ));
+                }
+                else {
+                    typeToCatch.add(s);
+                }
+            }
         }
-      }
-    }
-  }
-
-  @Override
-  public void visitJSVariable(final JSVariable var) {
-    if (var.isConst() && var.getInitializer() == null) {
-      if (var.getParent() instanceof JSVarStatement varStatement && varStatement.getParent() instanceof JSForInStatement) {
-        return;
-      }
-
-      JSAttributeList attributeList = var.getAttributeList();
-      if (attributeList == null || attributeList.getAttributesByName("Embed").length == 0) {
-        myHolder.createWarningAnnotation(
-          var,
-          JavaScriptLocalize.javascriptValidationMessageConstVariableWithoutInitializer().get()
-        );
-      }
     }
 
-    if (var.getParent().getParent() instanceof JSPackageStatement) {
-      checkNamedObjectIsInCorrespondingFile(var);
-    }
-  }
+    @Override
+    public void visitJSVariable(final JSVariable var) {
+        if (var.isConst() && var.getInitializer() == null) {
+            if (var.getParent() instanceof JSVarStatement varStatement && varStatement.getParent() instanceof JSForInStatement) {
+                return;
+            }
 
-  @Override
-  public void visitJSContinueStatement(final JSContinueStatement node) {
-    if (node.getStatementToContinue() == null) {
-      myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageContinueWithoutTarget().get());
-    }
-  }
+            JSAttributeList attributeList = var.getAttributeList();
+            if (attributeList == null || attributeList.getAttributesByName("Embed").length == 0) {
+                myHolder.createWarningAnnotation(
+                    var,
+                    JavaScriptLocalize.javascriptValidationMessageConstVariableWithoutInitializer().get()
+                );
+            }
+        }
 
-  @Override
-  public void visitJSBreakStatement(final JSBreakStatement node) {
-    if (node.getStatementToBreak() == null) {
-      myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageBreakWithoutTarget().get());
-    }
-  }
-
-  @Override
-  public void visitJSThisExpression(final JSThisExpression node) {
-    checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageThisReferencedFromStaticContext());
-  }
-
-  private void checkClassReferenceInStaticContext(
-    final JSExpression node,
-    LocalizeValue message
-  ) {
-    PsiElement element = PsiTreeUtil.getParentOfType(
-      node,
-      JSFunction.class,
-      JSFile.class,
-      JSClass.class,
-      JSObjectLiteralExpression.class,
-      XmlTagChild.class
-    );
-
-    if (element instanceof JSFunction function) {
-      final JSAttributeList attributeList = function.getAttributeList();
-      if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
-        myHolder.createErrorAnnotation(node, message.get());
-        return;
-      }
+        if (var.getParent().getParent() instanceof JSPackageStatement) {
+            checkNamedObjectIsInCorrespondingFile(var);
+        }
     }
 
-    if (!(node instanceof JSSuperExpression)) {
-      return;
+    @Override
+    public void visitJSContinueStatement(final JSContinueStatement node) {
+        if (node.getStatementToContinue() == null) {
+            myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageContinueWithoutTarget().get());
+        }
     }
 
-    PsiElement elementParent = element != null ? element.getParent() : null;
-    if (element == null || !(elementParent instanceof JSClass || elementParent instanceof JSFile && elementParent.getContext() != null)) {
-      myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageSuperReferencedWithoutClassInstanceContext().get());
-    }
-  }
-
-  @Override
-  public void visitJSSuperExpression(final JSSuperExpression node) {
-    checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageSuperReferencedFromStaticContext());
-  }
-
-  @Override
-  public void visitJSFunctionDeclaration(final JSFunction node) {
-    final PsiElement nameIdentifier = node.getNameIdentifier();
-    if (nameIdentifier == null) {
-      return;
+    @Override
+    public void visitJSBreakStatement(final JSBreakStatement node) {
+        if (node.getStatementToBreak() == null) {
+            myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageBreakWithoutTarget().get());
+        }
     }
-    PsiElement parent = node.getParent();
 
-    if (parent instanceof JSFile file) {
-      parent = JSResolveUtil.getClassReferenceForXmlFromContext(file);
+    @Override
+    public void visitJSThisExpression(final JSThisExpression node) {
+        checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageThisReferencedFromStaticContext());
+    }
 
-      if (parent instanceof JSClass jsClass && node.getName().equals(jsClass.getName())
-        && JavaScriptSupportLoader.isFlexMxmFile(parent.getContainingFile())) {
-        final Annotation annotation = myHolder.createErrorAnnotation(
-          nameIdentifier,
-          JavaScriptLocalize.javascriptValidationMessageConstructorInMxmlIsNotAllowed().get()
+    private void checkClassReferenceInStaticContext(
+        final JSExpression node,
+        LocalizeValue message
+    ) {
+        PsiElement element = PsiTreeUtil.getParentOfType(
+            node,
+            JSFunction.class,
+            JSFile.class,
+            JSClass.class,
+            JSObjectLiteralExpression.class,
+            XmlTagChild.class
         );
 
-        annotation.registerFix(new RemoveASTNodeFix(node.getNode(), JavaScriptLocalize.javascriptFixRemoveConstructor()));
-      }
+        if (element instanceof JSFunction function) {
+            final JSAttributeList attributeList = function.getAttributeList();
+            if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
+                myHolder.createErrorAnnotation(node, message.get());
+                return;
+            }
+        }
+
+        if (!(node instanceof JSSuperExpression)) {
+            return;
+        }
+
+        PsiElement elementParent = element != null ? element.getParent() : null;
+        if (element == null
+            || !(elementParent instanceof JSClass || elementParent instanceof JSFile && elementParent.getContext() != null)) {
+            myHolder.createErrorAnnotation(
+                node,
+                JavaScriptLocalize.javascriptValidationMessageSuperReferencedWithoutClassInstanceContext().get()
+            );
+        }
     }
 
-    if (parent instanceof JSPackageStatement) {
-      checkNamedObjectIsInCorrespondingFile(node);
+    @Override
+    public void visitJSSuperExpression(final JSSuperExpression node) {
+        checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageSuperReferencedFromStaticContext());
     }
 
-    if (parent instanceof JSClass clazz && !node.isConstructor()) {
-      final JSAttributeList attributeList = node.getAttributeList();
+    @Override
+    public void visitJSFunctionDeclaration(final JSFunction node) {
+        final PsiElement nameIdentifier = node.getNameIdentifier();
+        if (nameIdentifier == null) {
+            return;
+        }
+        PsiElement parent = node.getParent();
 
-      if (attributeList == null || (!attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) && (attributeList.getAccessType() != JSAttributeList
-        .AccessType.PRIVATE || attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)))) {
-        final String qName = clazz.getQualifiedName();
-        final boolean hasOverride = attributeList != null ? attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE) : false;
+        if (parent instanceof JSFile file) {
+            parent = JSResolveUtil.getClassReferenceForXmlFromContext(file);
 
-        final Ref<JSFunction> set = new Ref<>();
-        boolean b = JSResolveUtil.iterateType(node, parent, qName, (processor, scope, className) -> {
-            if (qName == className || (qName != null && qName.equals(className))) {
-              return true;
-            }
-            set.set((JSFunction)processor.getResult());
-            if ("Object".equals(className)) {
-              if (hasOverride && !attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)) { /*native modifier is written always*/
-                final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
+            if (parent instanceof JSClass jsClass && node.getName().equals(jsClass.getName())
+                && JavaScriptSupportLoader.isFlexMxmFile(parent.getContainingFile())) {
                 final Annotation annotation = myHolder.createErrorAnnotation(
-                  astNode,
-                  JavaScriptLocalize.javascriptValidationMessageFunctionOverrideForObjectMethod().get()
+                    nameIdentifier,
+                    JavaScriptLocalize.javascriptValidationMessageConstructorInMxmlIsNotAllowed().get()
                 );
 
-                annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
-              }
-              return false;
+                annotation.registerFix(new RemoveASTNodeFix(node.getNode(), JavaScriptLocalize.javascriptFixRemoveConstructor()));
             }
-            else if (!hasOverride) {
-              final Annotation annotation = myHolder.createErrorAnnotation(
-                nameIdentifier,
-                JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutOverrideModifier(className).get()
-              );
-
-              annotation.registerFix(new AddOverrideIntentionAction(node));
-            }
-            return false;
-          });
-
-        if (b && hasOverride) {
-          final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
-          final Annotation annotation = myHolder.createErrorAnnotation(
-            astNode,
-            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutParentMethod().get()
-          );
-
-          annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
-        }
-
-        if (!b && hasOverride) {
-          final JSFunction override = set.get();
-          final JSAttributeList overrideAttrList = override.getAttributeList();
-          String overrideNs = null;
-
-          if ((overrideAttrList == null && (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL)) ||
-            (overrideAttrList != null && attributeList.getAccessType() != overrideAttrList.getAccessType()) ||
-            overrideAttrList != null && (overrideNs =
-              overrideAttrList.getNamespace()) != null && !overrideNs.equals(attributeList.getNamespace())) {
-            final Annotation annotation1 = myHolder.createErrorAnnotation(
-              findElementForAccessModifierError(node, attributeList),
-              JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleAccessModifier(
-                overrideNs != null ? overrideNs : (
-                  overrideAttrList != null
-                    ? overrideAttrList.getAccessType().toString()
-                    : JSAttributeList.AccessType.PACKAGE_LOCAL.toString()
-                ).toLowerCase()
-              ).get()
-            );
+        }
 
-            // TODO: quickfix
-            //annotation.registerFix(
-            //    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
-            //);
-          }
+        if (parent instanceof JSPackageStatement) {
+            checkNamedObjectIsInCorrespondingFile(node);
+        }
 
-          final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(node, override);
+        if (parent instanceof JSClass clazz && !node.isConstructor()) {
+            final JSAttributeList attributeList = node.getAttributeList();
+
+            if (attributeList == null || (!attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
+                && (attributeList.getAccessType() != JSAttributeList.AccessType.PRIVATE
+                || attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)))) {
+                final String qName = clazz.getQualifiedName();
+                final boolean hasOverride =
+                    attributeList != null ? attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE) : false;
+
+                final Ref<JSFunction> set = new Ref<>();
+                boolean b = JSResolveUtil.iterateType(node, parent, qName, (processor, scope, className) -> {
+                    if (qName == className || (qName != null && qName.equals(className))) {
+                        return true;
+                    }
+                    set.set((JSFunction)processor.getResult());
+                    if ("Object".equals(className)) {
+                        if (hasOverride && !attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)) { /*native modifier is written always*/
+                            final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
+                            final Annotation annotation = myHolder.createErrorAnnotation(
+                                astNode,
+                                JavaScriptLocalize.javascriptValidationMessageFunctionOverrideForObjectMethod().get()
+                            );
+
+                            annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
+                        }
+                        return false;
+                    }
+                    else if (!hasOverride) {
+                        final Annotation annotation = myHolder.createErrorAnnotation(
+                            nameIdentifier,
+                            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutOverrideModifier(className).get()
+                        );
+
+                        annotation.registerFix(new AddOverrideIntentionAction(node));
+                    }
+                    return false;
+                });
+
+                if (b && hasOverride) {
+                    final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
+                    final Annotation annotation = myHolder.createErrorAnnotation(
+                        astNode,
+                        JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutParentMethod().get()
+                    );
+
+                    annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
+                }
+
+                if (!b && hasOverride) {
+                    final JSFunction override = set.get();
+                    final JSAttributeList overrideAttrList = override.getAttributeList();
+                    String overrideNs = null;
+
+                    if ((overrideAttrList == null && (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL)) ||
+                        (overrideAttrList != null && attributeList.getAccessType() != overrideAttrList.getAccessType()) ||
+                        overrideAttrList != null && (overrideNs =
+                            overrideAttrList.getNamespace()) != null && !overrideNs.equals(attributeList.getNamespace())) {
+                        final Annotation annotation1 = myHolder.createErrorAnnotation(
+                            findElementForAccessModifierError(node, attributeList),
+                            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleAccessModifier(
+                                overrideNs != null ? overrideNs : (
+                                    overrideAttrList != null
+                                        ? overrideAttrList.getAccessType()
+                                        : JSAttributeList.AccessType.PACKAGE_LOCAL
+                                ).toString().toLowerCase()
+                            ).get()
+                        );
+
+                        // TODO: quickfix
+                        //annotation.registerFix(
+                        //    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
+                        //);
+                    }
+
+                    final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(node, override);
+
+                    if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
+                        final JSParameterList nodeParameterList = node.getParameterList();
+                        final JSParameterList overrideParameterList = override.getParameterList();
+
+                        final Annotation annotation = myHolder.createErrorAnnotation(
+                            nodeParameterList != null ? nodeParameterList : node.getNameIdentifier(),
+                            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature(
+                                overrideParameterList != null ? overrideParameterList.getText() : "()"
+                            ).get()
+                        );
+
+                        // TODO: quickfix
+                        //annotation.registerFix(
+                        //    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
+                        //);
+                    }
+                    else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
+                        PsiElement returnTypeExpr = node.getReturnTypeElement();
+                        PsiElement overrideReturnTypeExpr = override.getReturnTypeElement();
+                        final Annotation annotation = myHolder.createErrorAnnotation(
+                            returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier(),
+                            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature2(
+                                overrideReturnTypeExpr != null ? overrideReturnTypeExpr.getText() : "*"
+                            ).get()
+                        );
+
+                        // TODO: quickfix
+                        //annotation.registerFix(
+                        //    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
+                        //);
+                    }
+                }
+            }
+        }
+    }
 
-          if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
-            final JSParameterList nodeParameterList = node.getParameterList();
-            final JSParameterList overrideParameterList = override.getParameterList();
+    enum SignatureMatchResult {
+        PARAMETERS_DIFFERS,
+        RETURN_TYPE_DIFFERS,
+        COMPATIBLE_SIGNATURE
+    }
+
+    private static SignatureMatchResult checkCompatibleSignature(final JSFunction fun, final JSFunction override) {
+        JSParameterList nodeParameterList = fun.getParameterList();
+        JSParameterList overrideParameterList = override.getParameterList();
+        final JSParameter[] parameters = nodeParameterList != null ? nodeParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
+        final JSParameter[] overrideParameters =
+            overrideParameterList != null ? overrideParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
+
+        SignatureMatchResult result =
+            parameters.length != overrideParameters.length ? SignatureMatchResult.PARAMETERS_DIFFERS : SignatureMatchResult
+                .COMPATIBLE_SIGNATURE;
+
+        if (result == SignatureMatchResult.COMPATIBLE_SIGNATURE) {
+            for (int i = 0; i < parameters.length; ++i) {
+                if (!compatibleType(
+                    overrideParameters[i].getTypeString(),
+                    parameters[i].getTypeString(),
+                    overrideParameterList,
+                    nodeParameterList
+                ) || overrideParameters[i].hasInitializer() != parameters[i].hasInitializer()) {
+                    result = SignatureMatchResult.PARAMETERS_DIFFERS;
+                    break;
+                }
+            }
+        }
 
-            final Annotation annotation = myHolder.createErrorAnnotation(
-              nodeParameterList != null ? nodeParameterList : node.getNameIdentifier(),
-              JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature(
-                overrideParameterList != null ? overrideParameterList.getText() : "()"
-              ).get()
-            );
+        if (result == SignatureMatchResult.COMPATIBLE_SIGNATURE) {
+            if (!compatibleType(override.getReturnTypeString(), fun.getReturnTypeString(), override, fun)) {
+                result = SignatureMatchResult.RETURN_TYPE_DIFFERS;
+            }
+        }
+        return result;
+    }
 
-            // TODO: quickfix
-            //annotation.registerFix(
-            //    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
-            //);
-          }
-          else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
-            PsiElement returnTypeExpr = node.getReturnTypeElement();
-            PsiElement overrideReturnTypeExpr = override.getReturnTypeElement();
-            final Annotation annotation = myHolder.createErrorAnnotation(
-              returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier(),
-              JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature2(
-                overrideReturnTypeExpr != null ? overrideReturnTypeExpr.getText() : "*"
-              ).get()
-            );
+    private static boolean compatibleType(
+        String overrideParameterType,
+        String parameterType,
+        PsiElement overrideContext,
+        PsiElement funContext
+    ) {
+        // TODO: This should be more accurate
+        if (overrideParameterType != null && !overrideParameterType.equals(parameterType)) {
+            parameterType = JSImportHandlingUtil.resolveTypeName(parameterType, funContext);
+            overrideParameterType = JSImportHandlingUtil.resolveTypeName(overrideParameterType, overrideContext);
 
-            // TODO: quickfix
-            //annotation.registerFix(
-            //    new RemoveASTNodeFix(astNode,"javascript.fix.remove.override.modifier")
-            //);
-          }
+            return overrideParameterType.equals(parameterType);
+        }
+        else if (overrideParameterType == null && parameterType != null && !"*".equals(parameterType)) {
+            return false;
         }
-      }
-    }
-  }
-
-  enum SignatureMatchResult {
-    PARAMETERS_DIFFERS,
-    RETURN_TYPE_DIFFERS,
-    COMPATIBLE_SIGNATURE
-  }
-
-  private static SignatureMatchResult checkCompatibleSignature(final JSFunction fun, final JSFunction override) {
-    JSParameterList nodeParameterList = fun.getParameterList();
-    JSParameterList overrideParameterList = override.getParameterList();
-    final JSParameter[] parameters = nodeParameterList != null ? nodeParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
-    final JSParameter[] overrideParameters =
-      overrideParameterList != null ? overrideParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
-
-    SignatureMatchResult result =
-      parameters.length != overrideParameters.length ? SignatureMatchResult.PARAMETERS_DIFFERS : SignatureMatchResult
-        .COMPATIBLE_SIGNATURE;
-
-    if (result == SignatureMatchResult.COMPATIBLE_SIGNATURE) {
-      for (int i = 0; i < parameters.length; ++i) {
-        if (!compatibleType(overrideParameters[i].getTypeString(), parameters[i].getTypeString(), overrideParameterList,
-                            nodeParameterList) || overrideParameters[i].hasInitializer() != parameters[i].hasInitializer()) {
-          result = SignatureMatchResult.PARAMETERS_DIFFERS;
-          break;
-        }
-      }
-    }
 
-    if (result == SignatureMatchResult.COMPATIBLE_SIGNATURE) {
-      if (!compatibleType(override.getReturnTypeString(), fun.getReturnTypeString(), override, fun)) {
-        result = SignatureMatchResult.RETURN_TYPE_DIFFERS;
-      }
-    }
-    return result;
-  }
-
-  private static boolean compatibleType(String overrideParameterType,
-                                        String parameterType,
-                                        PsiElement overrideContext,
-                                        PsiElement funContext) {
-    // TODO: This should be more accurate
-    if (overrideParameterType != null && !overrideParameterType.equals(parameterType)) {
-      parameterType = JSImportHandlingUtil.resolveTypeName(parameterType, funContext);
-      overrideParameterType = JSImportHandlingUtil.resolveTypeName(overrideParameterType, overrideContext);
-
-      return overrideParameterType.equals(parameterType);
-    }
-    else if (overrideParameterType == null && parameterType != null && !"*".equals(parameterType)) {
-      return false;
+        return true;
     }
 
-    return true;
-  }
-
-  @Override
-  public void visitJSReturnStatement(final JSReturnStatement node) {
-    final PsiElement element = PsiTreeUtil.getParentOfType(
-      node,
-      JSFunction.class,
-      XmlTagChild.class,
-      XmlAttributeValue.class,
-      JSFile.class,
-      JavaScriptLambdaExpression.class
-    );
-    if ((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost))
-      || (element instanceof XmlTagChild && !(element.getParent() instanceof XmlAttributeValue))) {
-      myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageReturnOutsideFunctionDefinition().get());
-    }
+    @Override
+    public void visitJSReturnStatement(final JSReturnStatement node) {
+        final PsiElement element = PsiTreeUtil.getParentOfType(
+            node,
+            JSFunction.class,
+            XmlTagChild.class,
+            XmlAttributeValue.class,
+            JSFile.class,
+            JavaScriptLambdaExpression.class
+        );
+        if ((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost))
+            || (element instanceof XmlTagChild && !(element.getParent() instanceof XmlAttributeValue))) {
+            myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageReturnOutsideFunctionDefinition().get());
+        }
 
-    if (element instanceof JSFunction function) {
-      final @NonNls String typeString = function.getReturnTypeString();
-      if (typeString != null && !"void".equals(typeString) && node.getExpression() == null) {
-        myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageReturnValueOfTypeIsRequired(typeString).get());
-      }
-    }
-  }
-
-  @Override
-  public void visitJSLabeledStatement(final JSLabeledStatement node) {
-    final String label = node.getLabel();
-    if (label != null) {
-      PsiElement run = node.getParent();
-      while (run != null) {
-        if (run instanceof JSLabeledStatement labeledStatement) {
-          if (label.equals(labeledStatement.getLabel())) {
-            myHolder.createErrorAnnotation(node.getLabelIdentifier(), JavaScriptLocalize.javascriptValidationMessageDuplicateLabel().get());
-            break;
-          }
+        if (element instanceof JSFunction function) {
+            final @NonNls String typeString = function.getReturnTypeString();
+            if (typeString != null && !"void".equals(typeString) && node.getExpression() == null) {
+                myHolder.createErrorAnnotation(
+                    node,
+                    JavaScriptLocalize.javascriptValidationMessageReturnValueOfTypeIsRequired(typeString).get()
+                );
+            }
         }
+    }
 
-        if (run instanceof JSFunction) {
-          break;
+    @Override
+    public void visitJSLabeledStatement(final JSLabeledStatement node) {
+        final String label = node.getLabel();
+        if (label != null) {
+            PsiElement run = node.getParent();
+            while (run != null) {
+                if (run instanceof JSLabeledStatement labeledStatement) {
+                    if (label.equals(labeledStatement.getLabel())) {
+                        myHolder.createErrorAnnotation(
+                            node.getLabelIdentifier(),
+                            JavaScriptLocalize.javascriptValidationMessageDuplicateLabel().get()
+                        );
+                        break;
+                    }
+                }
+
+                if (run instanceof JSFunction) {
+                    break;
+                }
+                run = run.getParent();
+            }
         }
-        run = run.getParent();
-      }
     }
-  }
 
-  private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass) {
-    final PsiFile containingFile = aClass.getContainingFile();
+    private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass) {
+        final PsiFile containingFile = aClass.getContainingFile();
 
-    if (containingFile.getContext() != null) {
-      return;
-    }
-    final VirtualFile file = containingFile.getVirtualFile();
-
-    if (file != null && !file.getNameWithoutExtension().equals(aClass.getName())) {
-      final PsiElement node = aClass.getNameIdentifier();
-
-      if (node != null) {
-        final String name = aClass.getName();
-        String nameWithExtension = name + "." + file.getExtension();
-        final LocalizeValue message = aClass instanceof JSClass
-          ? JavaScriptLocalize.javascriptValidationMessageClassShouldBeInFile(name, nameWithExtension)
-          : aClass instanceof JSNamespaceDeclaration
-          ? JavaScriptLocalize.javascriptValidationMessageNamespaceShouldBeInFile(name, nameWithExtension)
-          : aClass instanceof JSVariable
-          ? JavaScriptLocalize.javascriptValidationMessageVariableShouldBeInFile(name, nameWithExtension)
-          : JavaScriptLocalize.javascriptValidationMessageFunctionShouldBeInFile(name, nameWithExtension);
-        final Annotation annotation = myHolder.createErrorAnnotation(node, message.get());
-
-        annotation.registerFix(new RenameFileFix(nameWithExtension));
+        if (containingFile.getContext() != null) {
+            return;
+        }
+        final VirtualFile file = containingFile.getVirtualFile();
+
+        if (file != null && !file.getNameWithoutExtension().equals(aClass.getName())) {
+            final PsiElement node = aClass.getNameIdentifier();
+
+            if (node != null) {
+                final String name = aClass.getName();
+                String nameWithExtension = name + "." + file.getExtension();
+                final LocalizeValue message = aClass instanceof JSClass
+                    ? JavaScriptLocalize.javascriptValidationMessageClassShouldBeInFile(name, nameWithExtension)
+                    : aClass instanceof JSNamespaceDeclaration
+                    ? JavaScriptLocalize.javascriptValidationMessageNamespaceShouldBeInFile(name, nameWithExtension)
+                    : aClass instanceof JSVariable
+                    ? JavaScriptLocalize.javascriptValidationMessageVariableShouldBeInFile(name, nameWithExtension)
+                    : JavaScriptLocalize.javascriptValidationMessageFunctionShouldBeInFile(name, nameWithExtension);
+                final Annotation annotation = myHolder.createErrorAnnotation(node, message.get());
+
+                annotation.registerFix(new RenameFileFix(nameWithExtension));
     /*annotation.registerFix(new RenamePublicClassFix(aClass) {
           final String text;
           final String familyName;
@@ -1052,353 +1083,355 @@ public String getFamilyName() {
             return familyName;
           }
         }); */
-      }
+            }
+        }
+
+        checkFileUnderSourceRoot(aClass, new SimpleErrorReportingClient());
     }
 
-    checkFileUnderSourceRoot(aClass, new SimpleErrorReportingClient());
-  }
+    private String getTerm(String message) {
+        String term = message.substring(0, message.indexOf(' '));
+        return term;
+    }
 
-  private String getTerm(String message) {
-    String term = message.substring(0, message.indexOf(' '));
-    return term;
-  }
+    public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorReportingClient client) {
+        PsiElement nameIdentifier = aClass.getNameIdentifier();
+        if (nameIdentifier == null) {
+            nameIdentifier = aClass.getFirstChild();
+        }
 
-  public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorReportingClient client) {
-    PsiElement nameIdentifier = aClass.getNameIdentifier();
-    if (nameIdentifier == null) {
-      nameIdentifier = aClass.getFirstChild();
+        final PsiFile containingFile = aClass.getContainingFile();
+        final VirtualFile file = containingFile.getVirtualFile();
+        if (file == null) {
+            return;
+        }
+        final VirtualFile rootForFile =
+            ProjectRootManager.getInstance(containingFile.getProject()).getFileIndex().getSourceRootForFile(file);
+
+        if (rootForFile == null) {
+            client.reportError(
+                nameIdentifier.getNode(),
+                JavaScriptLocalize.javascriptValidationMessageFileShouldBeUnderSourceRoot().get(),
+                ErrorReportingClient.ProblemKind.WARNING,
+                null
+            );
+        }
     }
 
-    final PsiFile containingFile = aClass.getContainingFile();
-    final VirtualFile file = containingFile.getVirtualFile();
-    if (file == null) {
-      return;
-    }
-    final VirtualFile rootForFile = ProjectRootManager.getInstance(containingFile.getProject()).getFileIndex().getSourceRootForFile(file);
-
-    if (rootForFile == null) {
-      client.reportError(
-        nameIdentifier.getNode(),
-        JavaScriptLocalize.javascriptValidationMessageFileShouldBeUnderSourceRoot().get(),
-        ErrorReportingClient.ProblemKind.WARNING,
-        null
-      );
+    private void checkPackageStatement(final JSPackageStatement packageStatement) {
+        final String s = packageStatement.getQualifiedName();
+
+        final PsiFile containingFile = packageStatement.getContainingFile();
+        final String expected = JSResolveUtil.getExpectedPackageNameFromFile(
+            containingFile.getVirtualFile(),
+            containingFile.getProject(),
+            true
+        );
+
+        if (expected != null && ((s == null && expected.length() != 0) || (s != null && !expected.equals(s)))) {
+            final PsiElement nameIdentifier = packageStatement.getNameIdentifier();
+            final Annotation annotation = myHolder.createErrorAnnotation(
+                nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild(),
+                JavaScriptLocalize.javascriptValidationMessageIncorrectPackageName(s, expected).get()
+            );
+            annotation.registerFix(new SyntheticIntentionAction() {
+                @Override
+                @Nonnull
+                public String getText() {
+                    return JavaScriptLocalize.javascriptFixPackageName(expected).get();
+                }
+
+                @Override
+                public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+                    return packageStatement.isValid();
+                }
+
+                @Override
+                public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
+                    throws IncorrectOperationException {
+                    JSPackageStatementImpl.doChangeName(project, packageStatement, expected);
+                }
+
+                @Override
+                public boolean startInWriteAction() {
+                    return true;
+                }
+            });
+        }
+
+        final Set<JSNamedElement> elements = new HashSet<>();
+
+        for (JSSourceElement statement : packageStatement.getStatements()) {
+            if (statement instanceof JSNamedElement namedElement && !(statement instanceof JSImportStatement)) {
+                elements.add(namedElement);
+            }
+        }
+
+        if (elements.size() > 1) {
+            for (JSNamedElement el : elements) {
+                final PsiElement nameIdentifier = el.getNameIdentifier();
+                myHolder.createErrorAnnotation(
+                        nameIdentifier != null ? nameIdentifier : el.getFirstChild(),
+                        JavaScriptLocalize.javascriptValidationMessageMoreThanOneExternallyVisibleSymbol().get()
+                    )
+                    .registerFix(new RemoveASTNodeFix(el.getNode(), JavaScriptLocalize.javascriptFixRemoveExternallyVisibleSymbol()));
+            }
+        }
+
+        checkFileUnderSourceRoot(packageStatement, new SimpleErrorReportingClient());
     }
-  }
-
-  private void checkPackageStatement(final JSPackageStatement packageStatement) {
-    final String s = packageStatement.getQualifiedName();
-
-    final PsiFile containingFile = packageStatement.getContainingFile();
-    final String expected = JSResolveUtil.getExpectedPackageNameFromFile(
-      containingFile.getVirtualFile(),
-      containingFile.getProject(),
-      true
-    );
-
-    if (expected != null && ((s == null && expected.length() != 0) || (s != null && !expected.equals(s)))) {
-      final PsiElement nameIdentifier = packageStatement.getNameIdentifier();
-      final Annotation annotation = myHolder.createErrorAnnotation(
-        nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild(),
-        JavaScriptLocalize.javascriptValidationMessageIncorrectPackageName(s, expected).get()
-      );
-      annotation.registerFix(new SyntheticIntentionAction() {
+
+    public static class RemoveASTNodeFix implements SyntheticIntentionAction, LocalQuickFix {
+        private final ASTNode[] myAstNodes;
+        private final LocalizeValue myProp;
+
+        public RemoveASTNodeFix(final ASTNode astNode, LocalizeValue prop) {
+            this(prop, astNode);
+        }
+
+        public RemoveASTNodeFix(LocalizeValue prop, final ASTNode... astNodes) {
+            myProp = prop;
+            myAstNodes = astNodes;
+        }
+
         @Override
         @Nonnull
         public String getText() {
-          return JavaScriptLocalize.javascriptFixPackageName(expected).get();
+            return myProp.get();
         }
 
         @Override
-        public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
-          return packageStatement.isValid();
+        @Nonnull
+        public String getName() {
+            return getText();
         }
 
         @Override
-        public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
-          JSPackageStatementImpl.doChangeName(project, packageStatement, expected);
+        @Nonnull
+        public String getFamilyName() {
+            return getText();
         }
 
         @Override
-        public boolean startInWriteAction() {
-          return true;
+        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+            invoke(project, null, descriptor.getPsiElement().getContainingFile());
         }
-      });
-    }
-
-    final Set<JSNamedElement> elements = new HashSet<>();
-
-    for (JSSourceElement statement : packageStatement.getStatements()) {
-      if (statement instanceof JSNamedElement namedElement && !(statement instanceof JSImportStatement)) {
-        elements.add(namedElement);
-      }
-    }
 
-    if (elements.size() > 1) {
-      for (JSNamedElement el : elements) {
-        final PsiElement nameIdentifier = el.getNameIdentifier();
-        myHolder.createErrorAnnotation(
-            nameIdentifier != null ? nameIdentifier : el.getFirstChild(),
-            JavaScriptLocalize.javascriptValidationMessageMoreThanOneExternallyVisibleSymbol().get()
-          )
-          .registerFix(new RemoveASTNodeFix(el.getNode(), JavaScriptLocalize.javascriptFixRemoveExternallyVisibleSymbol()));
-      }
-    }
+        @Override
+        public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+            for (ASTNode astNode : myAstNodes) {
+                if (!astNode.getPsi().isValid()) {
+                    return false;
+                }
+            }
 
-    checkFileUnderSourceRoot(packageStatement, new SimpleErrorReportingClient());
-  }
+            return true;
+        }
 
-  public static class RemoveASTNodeFix implements SyntheticIntentionAction, LocalQuickFix {
-    private final ASTNode[] myAstNodes;
-    private final LocalizeValue myProp;
+        @Override
+        public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
+            if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+                return;
+            }
+            for (ASTNode astNode : myAstNodes) {
+                if (astNode.getPsi().isValid()) {
+                    astNode.getPsi().delete();
+                }
+            }
+        }
 
-    public RemoveASTNodeFix(final ASTNode astNode, LocalizeValue prop) {
-      this(prop, astNode);
+        @Override
+        public boolean startInWriteAction() {
+            return true;
+        }
     }
 
-    public RemoveASTNodeFix(LocalizeValue prop, final ASTNode... astNodes) {
-      myProp = prop;
-      myAstNodes = astNodes;
-    }
+    private static class AddOverrideIntentionAction implements SyntheticIntentionAction {
+        private final JSFunction myNode;
 
-    @Override
-    @Nonnull
-    public String getText() {
-      return myProp.get();
-    }
+        public AddOverrideIntentionAction(final JSFunction node) {
+            myNode = node;
+        }
 
-    @Override
-    @Nonnull
-    public String getName() {
-      return getText();
-    }
+        @Override
+        @Nonnull
+        public String getText() {
+            return JavaScriptLocalize.javascriptFixAddOverrideModifier().get();
+        }
 
-    @Override
-    @Nonnull
-    public String getFamilyName() {
-      return getText();
-    }
+        @Override
+        public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+            return myNode.isValid();
+        }
 
-    @Override
-    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
-      invoke(project, null, descriptor.getPsiElement().getContainingFile());
-    }
+        @Override
+        public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
+            if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+                return;
+            }
+            final ASTNode fromText = JSChangeUtil.createJSTreeFromText(project, "override class A {}");
+            final JSAttributeList jsAttributeList = myNode.getAttributeList();
+            final JSAttributeList createdAttrList = ((JSClass)fromText.getPsi()).getAttributeList();
 
-    @Override
-    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
-      for (ASTNode astNode : myAstNodes) {
-        if (!astNode.getPsi().isValid()) {
-          return false;
+            if (jsAttributeList != null) {
+                jsAttributeList.add(createdAttrList.getFirstChild());
+            }
+            else {
+                myNode.addBefore(createdAttrList, myNode.getFirstChild());
+            }
         }
-      }
 
-      return true;
-    }
-
-    @Override
-    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
-      if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
-        return;
-      }
-      for (ASTNode astNode : myAstNodes) {
-        if (astNode.getPsi().isValid()) {
-          astNode.getPsi().delete();
-        }
-      }
+        @Override
+        public boolean startInWriteAction() {
+            return true;
+        }
     }
 
-    @Override
-    public boolean startInWriteAction() {
-      return true;
-    }
-  }
+    private class SimpleErrorReportingClient implements ErrorReportingClient {
+        @Override
+        public void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix) {
+            final Annotation annotation = kind == ProblemKind.ERROR
+                ? myHolder.createErrorAnnotation(nameIdentifier, s)
+                : myHolder.createWarningAnnotation(nameIdentifier, s);
 
-  private static class AddOverrideIntentionAction implements SyntheticIntentionAction {
-    private final JSFunction myNode;
+            if (implementMethodsFix != null) {
+                annotation.registerFix(implementMethodsFix);
+            }
+        }
 
-    public AddOverrideIntentionAction(final JSFunction node) {
-      myNode = node;
+        @Override
+        public void reportError(PsiElement nameIdentifier, String s, ProblemKind kind, IntentionAction implementMethodsFix) {
+            final Annotation annotation = kind == ProblemKind.ERROR
+                ? myHolder.createErrorAnnotation(nameIdentifier, s)
+                : myHolder.createWarningAnnotation(nameIdentifier, s);
+            if (implementMethodsFix != null) {
+                annotation.registerFix(implementMethodsFix);
+            }
+        }
     }
 
-    @Override
-    @Nonnull
-    public String getText() {
-      return JavaScriptLocalize.javascriptFixAddOverrideModifier().get();
-    }
+    private static class AddSuperInvokationFix implements SyntheticIntentionAction {
+        private final JSReferenceExpression node;
+        private final JSFunction superConstructor;
 
-    @Override
-    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
-      return myNode.isValid();
-    }
+        public AddSuperInvokationFix(JSReferenceExpression node, JSFunction superConstructor) {
+            this.node = node;
+            this.superConstructor = superConstructor;
+        }
 
-    @Override
-    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
-      if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
-        return;
-      }
-      final ASTNode fromText = JSChangeUtil.createJSTreeFromText(project, "override class A {}");
-      final JSAttributeList jsAttributeList = myNode.getAttributeList();
-      final JSAttributeList createdAttrList = ((JSClass)fromText.getPsi()).getAttributeList();
-
-      if (jsAttributeList != null) {
-        jsAttributeList.add(createdAttrList.getFirstChild());
-      }
-      else {
-        myNode.addBefore(createdAttrList, myNode.getFirstChild());
-      }
-    }
+        @Override
+        @Nonnull
+        public String getText() {
+            return JavaScriptLocalize.javascriptFixCreateInvokeSuper().get();
+        }
 
-    @Override
-    public boolean startInWriteAction() {
-      return true;
-    }
-  }
+        @Override
+        public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+            return superConstructor.isValid() && node.isValid();
+        }
 
-  private class SimpleErrorReportingClient implements ErrorReportingClient {
-    @Override
-    public void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix) {
-      final Annotation annotation = kind == ProblemKind.ERROR
-        ? myHolder.createErrorAnnotation(nameIdentifier, s)
-        : myHolder.createWarningAnnotation(nameIdentifier, s);
-
-      if (implementMethodsFix != null) {
-        annotation.registerFix(implementMethodsFix);
-      }
-    }
+        @Override
+        public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+            if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+                return;
+            }
+            Template t = TemplateManager.getInstance(project).createTemplate("", "");
+            t.setToReformat(true);
+
+            t.addTextSegment("super(");
+            boolean first = true;
+            for (JSParameter p : superConstructor.getParameterList().getParameters()) {
+                if (p.isRest()) {
+                    break;
+                }
+                if (!first) {
+                    t.addTextSegment(", ");
+                }
+                first = false;
+                MacroCallNode node = new MacroCallNode(new CompleteMacro());
+                t.addVariable(p.getName(), node, node, true);
+            }
+            t.addTextSegment(")");
+            String s = JSChangeUtil.getSemicolon(project);
+            if (s.length() > 0) {
+                t.addTextSegment(s);
+            }
 
-    @Override
-    public void reportError(PsiElement nameIdentifier, String s, ProblemKind kind, IntentionAction implementMethodsFix) {
-      final Annotation annotation = kind == ProblemKind.ERROR
-        ? myHolder.createErrorAnnotation(nameIdentifier, s)
-        : myHolder.createWarningAnnotation(nameIdentifier, s);
-      if (implementMethodsFix != null) {
-        annotation.registerFix(implementMethodsFix);
-      }
-    }
-  }
+            JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
+            JSSourceElement[] body = fun != null ? fun.getBody() : JSSourceElement.EMPTY_ARRAY;
 
-  private static class AddSuperInvokationFix implements SyntheticIntentionAction {
-    private final JSReferenceExpression node;
-    private final JSFunction superConstructor;
+            if (body.length > 0 && body[0] instanceof JSBlockStatement blockStatement) {
+                PsiElement firstChild = blockStatement.getFirstChild();
+                editor.getCaretModel().moveToOffset(firstChild.getTextRange().getEndOffset());
+                TemplateManager.getInstance(project).startTemplate(editor, t);
+            }
+        }
 
-    public AddSuperInvokationFix(JSReferenceExpression node, JSFunction superConstructor) {
-      this.node = node;
-      this.superConstructor = superConstructor;
+        @Override
+        public boolean startInWriteAction() {
+            return false;
+        }
     }
 
-    @Override
-    @Nonnull
-    public String getText() {
-      return JavaScriptLocalize.javascriptFixCreateInvokeSuper().get();
-    }
+    private static class AddConstructorAndSuperInvokationFix implements SyntheticIntentionAction {
+        private final JSReferenceExpression node;
+        private final JSFunction superConstructor;
 
-    @Override
-    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
-      return superConstructor.isValid() && node.isValid();
-    }
+        AddConstructorAndSuperInvokationFix(JSReferenceExpression _node, JSFunction _superCall) {
+            node = _node;
+            superConstructor = _superCall;
+        }
 
-    @Override
-    public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
-      if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
-        return;
-      }
-      Template t = TemplateManager.getInstance(project).createTemplate("", "");
-      t.setToReformat(true);
-
-      t.addTextSegment("super(");
-      boolean first = true;
-      for (JSParameter p : superConstructor.getParameterList().getParameters()) {
-        if (p.isRest()) {
-          break;
-        }
-        if (!first) {
-          t.addTextSegment(", ");
-        }
-        first = false;
-        MacroCallNode node = new MacroCallNode(new CompleteMacro());
-        t.addVariable(p.getName(), node, node, true);
-      }
-      t.addTextSegment(")");
-      String s = JSChangeUtil.getSemicolon(project);
-      if (s.length() > 0) {
-        t.addTextSegment(s);
-      }
-
-      JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
-      JSSourceElement[] body = fun != null ? fun.getBody() : JSSourceElement.EMPTY_ARRAY;
-
-      if (body.length > 0 && body[0] instanceof JSBlockStatement blockStatement) {
-        PsiElement firstChild = blockStatement.getFirstChild();
-        editor.getCaretModel().moveToOffset(firstChild.getTextRange().getEndOffset());
-        TemplateManager.getInstance(project).startTemplate(editor, t);
-      }
-    }
+        @Override
+        @Nonnull
+        public String getText() {
+            return JavaScriptLocalize.javascriptFixCreateConstructorInvokeSuper().get();
+        }
 
-    @Override
-    public boolean startInWriteAction() {
-      return false;
-    }
-  }
+        @Override
+        public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+            return node.isValid() && superConstructor.isValid();
+        }
 
-  private static class AddConstructorAndSuperInvokationFix implements SyntheticIntentionAction {
-    private final JSReferenceExpression node;
-    private final JSFunction superConstructor;
+        @Override
+        public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+            if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+                return;
+            }
+            final JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
+            if (jsClass == null) {
+                return;
+            }
+            final JSAttributeList attributeList = jsClass.getAttributeList();
+            String fun = "";
 
-    AddConstructorAndSuperInvokationFix(JSReferenceExpression _node, JSFunction _superCall) {
-      node = _node;
-      superConstructor = _superCall;
-    }
+            if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC) {
+                fun += "public ";
+            }
 
-    @Override
-    @Nonnull
-    public String getText() {
-      return JavaScriptLocalize.javascriptFixCreateConstructorInvokeSuper().get();
-    }
+            fun += "function ";
 
-    @Override
-    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
-      return node.isValid() && superConstructor.isValid();
-    }
+            final JSParameterList parameterList = superConstructor.getParameterList();
+            fun += jsClass.getName() + parameterList.getText() + "{\n";
+            fun += "super(";
+            int i = 0;
 
-    @Override
-    public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
-      if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
-        return;
-      }
-      final JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
-      if (jsClass == null) {
-        return;
-      }
-      final JSAttributeList attributeList = jsClass.getAttributeList();
-      String fun = "";
-
-      if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC) {
-        fun += "public ";
-      }
-
-      fun += "function ";
-
-      final JSParameterList parameterList = superConstructor.getParameterList();
-      fun += jsClass.getName() + parameterList.getText() + "{\n";
-      fun += "super(";
-      int i = 0;
-
-      for (JSParameter p : parameterList.getParameters()) {
-        if (i != 0) {
-          fun += ",";
-        }
-        ++i;
-        fun += p.getName();
-      }
-      fun += ")" + JSChangeUtil.getSemicolon(project);
-      fun += "\n}";
-
-      jsClass.add(JSChangeUtil.createJSTreeFromText(project, fun).getPsi());
-    }
+            for (JSParameter p : parameterList.getParameters()) {
+                if (i != 0) {
+                    fun += ",";
+                }
+                ++i;
+                fun += p.getName();
+            }
+            fun += ")" + JSChangeUtil.getSemicolon(project);
+            fun += "\n}";
 
-    @Override
-    public boolean startInWriteAction() {
-      return true;
+            jsClass.add(JSChangeUtil.createJSTreeFromText(project, fun).getPsi());
+        }
+
+        @Override
+        public boolean startInWriteAction() {
+            return true;
+        }
     }
-  }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
index be889e39..dea1c82f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
@@ -14,19 +14,16 @@
  * @since 29-Aug-22
  */
 @ExtensionImpl
-public class JSAnnotatorFactory implements AnnotatorFactory
-{
-	@Nullable
-	@Override
-	public Annotator createAnnotator()
-	{
-		return new JSAnnotatingVisitor();
-	}
+public class JSAnnotatorFactory implements AnnotatorFactory {
+    @Nullable
+    @Override
+    public Annotator createAnnotator() {
+        return new JSAnnotatingVisitor();
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }

From 6cec3660c84e95ee4ef0bfd402cad220208d9918 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 8 Sep 2024 00:37:04 +0300
Subject: [PATCH 235/340] Code reformat of "generation" package using IJ4 code
 style.

---
 .../impl/generation/BaseJSGenerateAction.java |  81 +-
 .../generation/BaseJSGenerateHandler.java     | 239 +++---
 .../impl/generation/JSNamedElementNode.java   | 139 ++--
 .../JavaScriptGenerateAccessorHandler.java    | 700 ++++++++----------
 .../JavaScriptGenerateConstructorAction.java  |  16 +-
 .../JavaScriptGenerateGetAccessorAction.java  |  16 +-
 ...avaScriptGenerateGetSetAccessorAction.java |  17 +-
 .../JavaScriptGenerateSetAccessorAction.java  |  16 +-
 .../JavaScriptGenerateToStringAction.java     |  16 +-
 .../JavaScriptImplementMethodsHandler.java    |  44 +-
 .../JavaScriptOverrideMethodsHandler.java     | 154 ++--
 .../impl/generation/OverrideMethodsFix.java   | 126 ++--
 12 files changed, 712 insertions(+), 852 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
index 49571634..afd0be70 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
@@ -32,58 +32,49 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 19, 2008
- *         Time: 7:04:37 PM
+ * Date: Jul 19, 2008
+ * Time: 7:04:37 PM
  */
-abstract class BaseJSGenerateAction extends AnAction
-{
-	@Override
-	public void actionPerformed(final AnActionEvent e)
-	{
-		Editor editor = e.getData(PlatformDataKeys.EDITOR);
-		PsiFile psifile = e.getData(LangDataKeys.PSI_FILE);
-		Project project = e.getData(PlatformDataKeys.PROJECT);
+abstract class BaseJSGenerateAction extends AnAction {
+    @Override
+    public void actionPerformed(final AnActionEvent e) {
+        Editor editor = e.getData(PlatformDataKeys.EDITOR);
+        PsiFile psifile = e.getData(LangDataKeys.PSI_FILE);
+        Project project = e.getData(PlatformDataKeys.PROJECT);
 
-		final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE);
-		if(JavaScriptSupportLoader.isFlexMxmFile(file))
-		{
-			editor = BaseCodeInsightAction.getInjectedEditor(project, editor);
-			psifile = PsiUtilBase.getPsiFileInEditor(editor, project);
-		}
+        final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE);
+        if (JavaScriptSupportLoader.isFlexMxmFile(file)) {
+            editor = BaseCodeInsightAction.getInjectedEditor(project, editor);
+            psifile = PsiUtilBase.getPsiFileInEditor(editor, project);
+        }
 
-		new JavaScriptGenerateAccessorHandler(getGenerationMode()).invoke(project, editor, psifile);
-	}
+        new JavaScriptGenerateAccessorHandler(getGenerationMode()).invoke(project, editor, psifile);
+    }
 
-	protected abstract
-	@Nonnull
-	JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode();
+    @Nonnull
+    protected abstract JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode();
 
-	@Override
-	public void update(final AnActionEvent e)
-	{
-		final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE);
+    @Override
+    public void update(final AnActionEvent e) {
+        final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE);
 
-		boolean status = false;
+        boolean status = false;
 
-		if(file != null)
-		{
-			if(file.getFileType() == JavaScriptFileType.INSTANCE)
-			{
-				final Editor editor = e.getData(PlatformDataKeys.EDITOR);
-				final PsiFile psifile = e.getData(LangDataKeys.PSI_FILE);
+        if (file != null) {
+            if (file.getFileType() == JavaScriptFileType.INSTANCE) {
+                final Editor editor = e.getData(PlatformDataKeys.EDITOR);
+                final PsiFile psifile = e.getData(LangDataKeys.PSI_FILE);
 
-				if(editor != null && psifile != null)
-				{
-					status = psifile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
-				}
-			}
-			else if(JavaScriptSupportLoader.isFlexMxmFile(file))
-			{
-				status = true;
-			}
-		}
+                if (editor != null && psifile != null) {
+                    status = psifile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+                }
+            }
+            else if (JavaScriptSupportLoader.isFlexMxmFile(file)) {
+                status = true;
+            }
+        }
 
-		e.getPresentation().setEnabled(status);
-		e.getPresentation().setVisible(status);
-	}
+        e.getPresentation().setEnabled(status);
+        e.getPresentation().setVisible(status);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
index 539eca69..4ee1927c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
@@ -39,138 +39,119 @@
 import consulo.undoRedo.CommandProcessor;
 
 import jakarta.annotation.Nonnull;
+
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-abstract class BaseJSGenerateHandler implements LanguageCodeInsightActionHandler
-{
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
-
-	@Override
-	public void invoke(final Project project, final Editor editor, final PsiFile file)
-	{
-		JSClass clazz = findClass(file, editor);
-
-		if(clazz == null)
-		{
-			return;
-		}
-
-		final Collection<JSNamedElementNode> candidates = new ArrayList<JSNamedElementNode>();
-		collectCandidates(clazz, candidates);
-
-		MemberChooserBuilder<JSNamedElementNode> builder = MemberChooserBuilder.create(candidates.toArray(new JSNamedElementNode[candidates.size()]));
-		if(canHaveEmptySelectedElements())
-		{
-			builder.withEmptySelection();
-		}
-
-		builder.withTitle(getTitle());
-		builder.showAsync(project, dataHolder ->
-		{
-			List data = dataHolder.getUserData(ClassMember.KEY_OF_LIST);
-
-			run(clazz, data, project, editor, file);
-		});
-	}
-
-	private void run(JSClass clazz, Collection<JSNamedElementNode> selectedElements, Project project, Editor editor, PsiFile file)
-	{
-		final JSClass jsClass = clazz;
-		final Collection<JSNamedElementNode> selectedElements1 = selectedElements;
-		Runnable runnable = new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				ApplicationManager.getApplication().runWriteAction(new Runnable()
-				{
-					@Override
-					public void run()
-					{
-						try
-						{
-							final BaseCreateMethodsFix createMethodsFix = createFix(jsClass);
-							createMethodsFix.addElementsToProcessFrom(selectedElements1);
-							createMethodsFix.invoke(project, editor, file);
-						}
-						catch(IncorrectOperationException ex)
-						{
-							Logger.getInstance(getClass().getName()).error(ex);
-						}
-					}
-				});
-			}
-		};
-
-		CommandProcessor processor = CommandProcessor.getInstance();
-		if(processor.hasCurrentCommand())
-		{
-			processor.executeCommand(project, runnable, getClass().getName(), null);
-		}
-		else
-		{
-			runnable.run();
-		}
-	}
-
-	protected void appendOwnOptions(List<JComponent> jComponentList)
-	{
-	}
-
-	protected boolean canHaveEmptySelectedElements()
-	{
-		return false;
-	}
-
-	static JSClass findClass(PsiFile file, Editor editor)
-	{
-		final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
-		if(at == null)
-		{
-			return null;
-		}
-
-		JSClass clazz = PsiTreeUtil.getParentOfType(at, JSClass.class);
-		if(clazz == null)
-		{
-			final PsiFile containingFile = at.getContainingFile();
-			final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(containingFile);
-			if(element instanceof JSClass)
-			{
-				clazz = (JSClass) element;
-			}
-		}
-		else if(JSResolveUtil.isArtificialClassUsedForReferenceList(clazz))
-		{
-			clazz = null;
-		}
-
-		return clazz;
-	}
-
-	protected abstract LocalizeValue getTitle();
-
-	protected abstract BaseCreateMethodsFix createFix(JSClass clazz);
-
-	protected abstract void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates);
-
-	@Override
-	public boolean startInWriteAction()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean isValidFor(final Editor editor, final PsiFile file)
-	{
-		return true;
-	}
+abstract class BaseJSGenerateHandler implements LanguageCodeInsightActionHandler {
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
+
+    @Override
+    public void invoke(final Project project, final Editor editor, final PsiFile file) {
+        JSClass clazz = findClass(file, editor);
+
+        if (clazz == null) {
+            return;
+        }
+
+        final Collection<JSNamedElementNode> candidates = new ArrayList<>();
+        collectCandidates(clazz, candidates);
+
+        MemberChooserBuilder<JSNamedElementNode> builder =
+            MemberChooserBuilder.create(candidates.toArray(new JSNamedElementNode[candidates.size()]));
+        if (canHaveEmptySelectedElements()) {
+            builder.withEmptySelection();
+        }
+
+        builder.withTitle(getTitle());
+        builder.showAsync(
+            project,
+            dataHolder -> {
+                List data = dataHolder.getUserData(ClassMember.KEY_OF_LIST);
+
+                run(clazz, data, project, editor, file);
+            }
+        );
+    }
+
+    private void run(JSClass clazz, Collection<JSNamedElementNode> selectedElements, Project project, Editor editor, PsiFile file) {
+        final JSClass jsClass = clazz;
+        final Collection<JSNamedElementNode> selectedElements1 = selectedElements;
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                ApplicationManager.getApplication().runWriteAction(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            final BaseCreateMethodsFix createMethodsFix = createFix(jsClass);
+                            createMethodsFix.addElementsToProcessFrom(selectedElements1);
+                            createMethodsFix.invoke(project, editor, file);
+                        }
+                        catch (IncorrectOperationException ex) {
+                            Logger.getInstance(getClass().getName()).error(ex);
+                        }
+                    }
+                });
+            }
+        };
+
+        CommandProcessor processor = CommandProcessor.getInstance();
+        if (processor.hasCurrentCommand()) {
+            processor.executeCommand(project, runnable, getClass().getName(), null);
+        }
+        else {
+            runnable.run();
+        }
+    }
+
+    protected void appendOwnOptions(List<JComponent> jComponentList) {
+    }
+
+    protected boolean canHaveEmptySelectedElements() {
+        return false;
+    }
+
+    static JSClass findClass(PsiFile file, Editor editor) {
+        final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
+        if (at == null) {
+            return null;
+        }
+
+        JSClass clazz = PsiTreeUtil.getParentOfType(at, JSClass.class);
+        if (clazz == null) {
+            final PsiFile containingFile = at.getContainingFile();
+            final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(containingFile);
+            if (element instanceof JSClass) {
+                clazz = (JSClass)element;
+            }
+        }
+        else if (JSResolveUtil.isArtificialClassUsedForReferenceList(clazz)) {
+            clazz = null;
+        }
+
+        return clazz;
+    }
+
+    protected abstract LocalizeValue getTitle();
+
+    protected abstract BaseCreateMethodsFix createFix(JSClass clazz);
+
+    protected abstract void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates);
+
+    @Override
+    public boolean startInWriteAction() {
+        return false;
+    }
+
+    @Override
+    public boolean isValidFor(final Editor editor, final PsiFile file) {
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
index 8c498b1a..b1eb09da 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
@@ -33,91 +33,74 @@
  * Date: Jul 17, 2008
  * Time: 8:55:57 PM
  */
-public class JSNamedElementNode extends PsiElementMemberChooserObject implements ClassMember
-{
-	public JSNamedElementNode(JSNamedElement node)
-	{
-		super(node, buildTextFor(node), buildIcon(node));
-	}
+public class JSNamedElementNode extends PsiElementMemberChooserObject implements ClassMember {
+    public JSNamedElementNode(JSNamedElement node) {
+        super(node, buildTextFor(node), buildIcon(node));
+    }
 
-	private static Image buildIcon(final JSNamedElement node)
-	{
-		Image icon = IconDescriptorUpdaters.getIcon(node, 0);
+    private static Image buildIcon(final JSNamedElement node) {
+        Image icon = IconDescriptorUpdaters.getIcon(node, 0);
 
-		if(node instanceof JSFunction)
-		{
-			final JSFunction function = (JSFunction) node;
-			final Image accessIcon;
+        if (node instanceof JSFunction) {
+            final JSFunction function = (JSFunction)node;
+            final Image accessIcon;
 
-			if(function.isGetProperty())
-			{
-				accessIcon = AllIcons.Nodes.Read_access;
-			}
-			else if(function.isSetProperty())
-			{
-				accessIcon = AllIcons.Nodes.Write_access;
-			}
-			else
-			{
-				accessIcon = null;
-			}
+            if (function.isGetProperty()) {
+                accessIcon = AllIcons.Nodes.Read_access;
+            }
+            else if (function.isSetProperty()) {
+                accessIcon = AllIcons.Nodes.Write_access;
+            }
+            else {
+                accessIcon = null;
+            }
 
-			if(accessIcon != null)
-			{
-				icon = ImageEffects.appendRight(icon, accessIcon);
-			}
-		}
-		return icon;
-	}
+            if (accessIcon != null) {
+                icon = ImageEffects.appendRight(icon, accessIcon);
+            }
+        }
+        return icon;
+    }
 
-	private static String buildTextFor(final JSNamedElement node)
-	{
-		String text = node.getName();
+    private static String buildTextFor(final JSNamedElement node) {
+        String text = node.getName();
 
-		if(node instanceof JSFunction)
-		{
-			final JSFunction function = (JSFunction) node;
-			text += "(";
-			final JSParameterList parameterList = function.getParameterList();
+        if (node instanceof JSFunction) {
+            final JSFunction function = (JSFunction)node;
+            text += "(";
+            final JSParameterList parameterList = function.getParameterList();
 
-			if(parameterList != null)
-			{
-				boolean first = true;
-				for(JSParameter p : parameterList.getParameters())
-				{
-					if(!first)
-					{
-						text += ", ";
-					}
-					first = false;
-					text += JSParameterInfoHandler.getSignatureForParameter(p, false);
-				}
-			}
+            if (parameterList != null) {
+                boolean first = true;
+                for (JSParameter p : parameterList.getParameters()) {
+                    if (!first) {
+                        text += ", ";
+                    }
+                    first = false;
+                    text += JSParameterInfoHandler.getSignatureForParameter(p, false);
+                }
+            }
 
-			text += ")";
-			final String typeString = function.getReturnTypeString();
-			if(typeString != null)
-			{
-				text += ":" + typeString;
-			}
-		}
-		else if(node instanceof JSVariable)
-		{
-			final JSVariable var = (JSVariable) node;
-			final String typeString = var.getTypeString();
-			if(typeString != null)
-			{
-				text += ":" + typeString;
-			}
-		}
-		return text;
-	}
+            text += ")";
+            final String typeString = function.getReturnTypeString();
+            if (typeString != null) {
+                text += ":" + typeString;
+            }
+        }
+        else if (node instanceof JSVariable) {
+            final JSVariable var = (JSVariable)node;
+            final String typeString = var.getTypeString();
+            if (typeString != null) {
+                text += ":" + typeString;
+            }
+        }
+        return text;
+    }
 
-	@Override
-	public MemberChooserObject getParentNodeDelegate()
-	{
-		final PsiElement element = getPsiElement();
-		PsiElement parent = JSResolveUtil.findParent(element);
-		return new JSNamedElementNode((JSNamedElement) parent);
-	}
+    @Override
+    public MemberChooserObject getParentNodeDelegate() {
+        final PsiElement element = getPsiElement();
+        PsiElement parent = JSResolveUtil.findParent(element);
+        return new JSNamedElementNode((JSNamedElement)parent);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
index 17d30834..a2de0331 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
@@ -38,6 +38,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import javax.swing.*;
 import java.util.*;
 
@@ -46,377 +47,332 @@
  * Date: Jul 19, 2008
  * Time: 1:11:10 AM
  */
-class JavaScriptGenerateAccessorHandler extends BaseJSGenerateHandler
-{
-	private GenerationMode mode;
-	private JCheckBox myCreateBindableProperties;
-
-	static enum GenerationMode
-	{
-		GETTERS,
-		SETTERS,
-		GETTERS_AND_SETTERS,
-		CONSTRUCTOR,
-		TOSTRING
-	}
-
-	JavaScriptGenerateAccessorHandler(GenerationMode _mode)
-	{
-		mode = _mode;
-	}
-
-	@Override
-	protected LocalizeValue getTitle()
-	{
-		return mode == GenerationMode.GETTERS
-			? JavaScriptLocalize.generateGetterFieldsChooserTitle()
-			: mode == GenerationMode.SETTERS
-			? JavaScriptLocalize.generateSetterFieldsChooserTitle()
-			: mode == GenerationMode.GETTERS_AND_SETTERS
-			? JavaScriptLocalize.generateGetterSetterChooserTitle()
-			: mode == GenerationMode.TOSTRING
-			? JavaScriptLocalize.generateToStringChooserTitle()
-			: JavaScriptLocalize.generateConstructorFieldsChooserTitle();
-	}
-
-	@Override
-	protected void appendOwnOptions(List<JComponent> jComponentList)
-	{
-		super.appendOwnOptions(jComponentList);
-		if(mode == GenerationMode.GETTERS || mode == GenerationMode.GETTERS_AND_SETTERS || mode == GenerationMode.SETTERS)
-		{
-			if(!ApplicationManager.getApplication().isUnitTestMode())
-			{
-				myCreateBindableProperties = new NonFocusableCheckBox(JavaScriptLocalize.generateGetterFieldsBindableProperties().get());
-				jComponentList.add(myCreateBindableProperties);
-			}
-		}
-	}
-
-	@Override
-	protected BaseCreateMethodsFix createFix(final JSClass jsClass)
-	{
-		if(mode == GenerationMode.GETTERS_AND_SETTERS)
-		{
-			return new BaseCreateMethodsFix<JSVariable>(jsClass)
-			{
-				private boolean toCreateBindableProperties = myCreateBindableProperties != null ? myCreateBindableProperties.isSelected() : ApplicationManager
-						.getApplication().isUnitTestMode();
-				final MyBaseCreateMethodsFix generateGetterFix = new MyBaseCreateMethodsFix(GenerationMode.GETTERS, jsClass, toCreateBindableProperties);
-				final MyBaseCreateMethodsFix generateSetterFix = new MyBaseCreateMethodsFix(GenerationMode.SETTERS, jsClass, toCreateBindableProperties);
-
-				@Override
-				public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
-				{
-					evalAnchor(editor, file);
-
-					for(JSVariable e : getElementsToProcess())
-					{
-						anchor = doAddOneMethod(project, generateGetterFix.buildFunctionText(e), anchor);
-						anchor = doAddOneMethod(project, generateSetterFix.buildFunctionText(e), anchor);
-					}
-				}
-			};
-		}
-		else if(mode == GenerationMode.CONSTRUCTOR)
-		{
-			return new BaseCreateMethodsFix<JSVariable>(jsClass)
-			{
-				@Override
-				public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
-				{
-					final JSCodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(project).getCustomSettings(JSCodeStyleSettings.class);
-					evalAnchor(editor, file);
-					@NonNls String functionText = "public function " + jsClass.getName() + "(";
-					@NonNls String initialization = "";
-					boolean first = true;
-					final String semicolon = JSChangeUtil.getSemicolon(project);
-
-					Set<JSVariable> toProcess = getElementsToProcess();
-					Iterator<JSVariable> variableIterator = toProcess.iterator();
-					boolean hadSuperClassConstructorInitializationBefore = false;
-
-					while(variableIterator.hasNext())
-					{
-						JSVariable var = variableIterator.next();
-						if(!first)
-						{
-							functionText += ", ";
-						}
-
-						first = false;
-
-						final String name = var.getName();
-						String parameterName = transformVarNameToAccessorName(name, codeStyleSettings);
-
-						final String typeString = var.getTypeString();
-						functionText += parameterName + (typeString != null ? ":" + typeString : "");
-
-						if(JSResolveUtil.findParent(var) == jsClass)
-						{
-							if(hadSuperClassConstructorInitializationBefore)
-							{
-								initialization += ")" + semicolon + "\n";
-								hadSuperClassConstructorInitializationBefore = false;
-							}
-							initialization += (parameterName.equals(name) ? "this." : "") + name + " = " + parameterName + semicolon + "\n";
-						}
-						else
-						{
-							if(hadSuperClassConstructorInitializationBefore)
-							{
-								initialization += ", ";
-							}
-							else
-							{
-								initialization += "super(";
-							}
-							initialization += parameterName;
-							hadSuperClassConstructorInitializationBefore = true;
-						}
-					}
-
-					if(hadSuperClassConstructorInitializationBefore)
-					{
-						initialization += ")" + semicolon + "\n";
-					}
-					functionText += ") {\n";
-					functionText += initialization;
-					functionText += "}";
-					doAddOneMethod(project, functionText, anchor);
-				}
-
-				@Override
-				public Set<JSVariable> getElementsToProcess()
-				{
-					LinkedHashSet<JSVariable> vars = new LinkedHashSet<JSVariable>();
-					JSFunction nontrivialSuperClassConstructor = JSAnnotatingVisitor.getNontrivialSuperClassConstructor(jsClass);
-
-					if(nontrivialSuperClassConstructor != null)
-					{
-						vars.addAll(Arrays.asList(nontrivialSuperClassConstructor.getParameterList().getParameters()));
-					}
-					vars.addAll(super.getElementsToProcess());
-					return vars;
-				}
-			};
-		}
-		else if(mode == GenerationMode.TOSTRING)
-		{
-			return new BaseCreateMethodsFix<JSVariable>(jsClass)
-			{
-				@Override
-				public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException
-				{
-					evalAnchor(editor, file);
-
-					final boolean[] needOverride = new boolean[1];
-					JSResolveUtil.processOverrides(jsClass, new JSResolveUtil.OverrideHandler()
-					{
-						@Override
-						public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className)
-						{
-							needOverride[0] = !"Object".equals(className);
-							return false;
-						}
-					}, "toString", null, myJsClass);
-
-					@NonNls String functionText = "public " + (needOverride[0] ? "override " : "") + "function toString():String {\nreturn " +
-							(needOverride[0] ? "super.toString() + \"" : "\"" + jsClass.getName()) + "{";
-					final String semicolon = JSChangeUtil.getSemicolon(project);
-
-					boolean first = true;
-
-					for(JSVariable var : getElementsToProcess())
-					{
-						if(!first)
-						{
-							functionText += " + \",";
-						}
-						first = false;
-
-						functionText += var.getName() + "=\" + String(" + var.getName() + ")";
-					}
-
-					functionText += "+\"}\"" + semicolon + "\n}";
-					doAddOneMethod(project, functionText, anchor);
-				}
-			};
-		}
-
-		return new MyBaseCreateMethodsFix(mode, jsClass, myCreateBindableProperties != null ? myCreateBindableProperties.isSelected() : false);
-	}
-
-
-	@Override
-	protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates)
-	{
-		final LinkedHashMap<String, JSNamedElement> candidatesMap = new LinkedHashMap<String, JSNamedElement>();
-		final JSCodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(clazz.getProject()).getCustomSettings(JSCodeStyleSettings
-				.class);
-		final ResolveProcessor processor = new ResolveProcessor(null)
-		{
-			{
-				setToProcessMembers(true);
-				setToProcessHierarchy(false);
-				setLocalResolve(true);
-			}
-
-			@Override
-			public boolean execute(final PsiElement element, final ResolveState state)
-			{
-				final JSNamedElement namedElement = (JSNamedElement) element;
-				if(!(element instanceof JSVariable))
-				{
-					if(element instanceof JSFunction)
-					{
-						final JSFunction function = (JSFunction) element;
-						if(mode == GenerationMode.GETTERS && function.isGetProperty() || mode == GenerationMode.SETTERS && function.isSetProperty())
-						{
-							candidatesMap.put(function.getName(), function);
-						}
-
-					}
-					return true;
-				}
-				else if(((JSVariable) element).isConst())
-				{
-					return true;
-				}
-
-				final String name = namedElement.getName();
-				final String accessorName = transformVarNameToAccessorName(name, codeStyleSettings);
-				if(/*!name.equals(accessorName) &&*/ !candidatesMap.containsKey(accessorName))
-				{
-					candidatesMap.put(accessorName, namedElement);
-				}
-				return true;
-			}
-		};
-
-		clazz.processDeclarations(processor, ResolveState.initial(), clazz, clazz);
-		for(JSNamedElement n : candidatesMap.values())
-		{
-			if(n instanceof JSVariable)
-			{
-				candidates.add(new JSNamedElementNode(n));
-			}
-		}
-	}
-
-	private static class MyBaseCreateMethodsFix extends BaseCreateMethodsFix<JSVariable>
-	{
-		private GenerationMode myMode;
-		private JSCodeStyleSettings codeStyleSettings;
-		private boolean bindableProperties;
-		private static final String PARAMETER_NAME = "value";
-
-		public MyBaseCreateMethodsFix(final GenerationMode mode, final JSClass jsClass, boolean _bindableProperties)
-		{
-			super(jsClass);
-			this.myMode = mode;
-			codeStyleSettings = CodeStyleSettingsManager.getSettings(jsClass.getProject()).getCustomSettings(JSCodeStyleSettings.class);
-			bindableProperties = _bindableProperties;
-		}
-
-		@Override
-		protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSVariable func)
-		{
-			final String semicolon = codeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT ? ";" : "";
-			String varName = func.getName();
-			if(myMode == GenerationMode.SETTERS)
-			{
-				String checkNeedEvent = "";
-				String dispatchEvent = "";
-				if(bindableProperties)
-				{
-					String eventName = getEventName(transformVarNameToAccessorName(varName, codeStyleSettings));
-					dispatchEvent = "\ndispatchEvent(new Event(\"" + eventName + "\"))" + semicolon;
-					checkNeedEvent = "if(" + varName + "==" + PARAMETER_NAME + ") return" + semicolon + "\n";
-				}
-				return "{\n" + checkNeedEvent + varName + "=" + PARAMETER_NAME + semicolon + dispatchEvent + "\n}";
-			}
-			else if(myMode == GenerationMode.GETTERS)
-			{
-				return "{\nreturn " + varName + semicolon + "\n}";
-			}
-			return " {}";
-		}
-
-		@Override
-		protected String buildFunctionAttrText(final String attrText, final JSAttributeList attributeList, final JSVariable function)
-		{
-			String baseText = "public" + (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) ? " static" : "");
-
-			if(bindableProperties && myMode == GenerationMode.GETTERS)
-			{
-				baseText = "[Bindable(event=\"" + getEventName(transformVarNameToAccessorName(function.getName(), codeStyleSettings)) + "\")]\n" + baseText;
-			}
-
-			return baseText;
-		}
-
-		private static String getEventName(String name)
-		{
-			return name + "Changed";
-		}
-
-		@Override
-		protected String buildFunctionKind(final JSVariable fun)
-		{
-			if(myMode == GenerationMode.GETTERS)
-			{
-				return "get ";
-			}
-			if(myMode == GenerationMode.SETTERS)
-			{
-				return "set ";
-			}
-			return super.buildFunctionKind(fun);
-		}
-
-		@Override
-		protected String buildReturnType(final String typeString)
-		{
-			if(myMode == GenerationMode.SETTERS)
-			{
-				return "void";
-			}
-			return super.buildReturnType(typeString);
-		}
-
-		@Override
-		protected String buildName(final JSVariable fun)
-		{
-			return transformVarNameToAccessorName(super.buildName(fun), codeStyleSettings);
-		}
-
-		@Override
-		protected String buildParameterList(final JSParameterList parameterList, final JSVariable fun)
-		{
-			if(myMode == GenerationMode.SETTERS)
-			{
-				final String s = fun.getTypeString();
-				return "(" + PARAMETER_NAME + (s != null ? ":" + s : "") + ")";
-			}
-			return (parameterList != null ? parameterList.getText() : "()");
-		}
-	}
-
-	private static String transformVarNameToAccessorName(String s, final JSCodeStyleSettings codeStyleSettings)
-	{
-		if(StringUtil.startsWith(s, codeStyleSettings.FIELD_PREFIX))
-		{
-			s = s.substring(codeStyleSettings.FIELD_PREFIX.length());
-		}
-		s = codeStyleSettings.PROPERTY_PREFIX + s;
-		return s;
-	}
-
-	@Override
-	protected boolean canHaveEmptySelectedElements()
-	{
-		return mode == GenerationMode.CONSTRUCTOR;
-	}
+class JavaScriptGenerateAccessorHandler extends BaseJSGenerateHandler {
+    private GenerationMode mode;
+    private JCheckBox myCreateBindableProperties;
+
+    static enum GenerationMode {
+        GETTERS,
+        SETTERS,
+        GETTERS_AND_SETTERS,
+        CONSTRUCTOR,
+        TOSTRING
+    }
+
+    JavaScriptGenerateAccessorHandler(GenerationMode _mode) {
+        mode = _mode;
+    }
+
+    @Override
+    protected LocalizeValue getTitle() {
+        return mode == GenerationMode.GETTERS
+            ? JavaScriptLocalize.generateGetterFieldsChooserTitle()
+            : mode == GenerationMode.SETTERS
+            ? JavaScriptLocalize.generateSetterFieldsChooserTitle()
+            : mode == GenerationMode.GETTERS_AND_SETTERS
+            ? JavaScriptLocalize.generateGetterSetterChooserTitle()
+            : mode == GenerationMode.TOSTRING
+            ? JavaScriptLocalize.generateToStringChooserTitle()
+            : JavaScriptLocalize.generateConstructorFieldsChooserTitle();
+    }
+
+    @Override
+    protected void appendOwnOptions(List<JComponent> jComponentList) {
+        super.appendOwnOptions(jComponentList);
+        if (mode == GenerationMode.GETTERS || mode == GenerationMode.GETTERS_AND_SETTERS || mode == GenerationMode.SETTERS) {
+            if (!ApplicationManager.getApplication().isUnitTestMode()) {
+                myCreateBindableProperties = new NonFocusableCheckBox(JavaScriptLocalize.generateGetterFieldsBindableProperties().get());
+                jComponentList.add(myCreateBindableProperties);
+            }
+        }
+    }
+
+    @Override
+    protected BaseCreateMethodsFix createFix(final JSClass jsClass) {
+        if (mode == GenerationMode.GETTERS_AND_SETTERS) {
+            return new BaseCreateMethodsFix<JSVariable>(jsClass) {
+                private boolean toCreateBindableProperties = myCreateBindableProperties != null
+                    ? myCreateBindableProperties.isSelected()
+                    : ApplicationManager.getApplication().isUnitTestMode();
+                final MyBaseCreateMethodsFix generateGetterFix =
+                    new MyBaseCreateMethodsFix(GenerationMode.GETTERS, jsClass, toCreateBindableProperties);
+                final MyBaseCreateMethodsFix generateSetterFix =
+                    new MyBaseCreateMethodsFix(GenerationMode.SETTERS, jsClass, toCreateBindableProperties);
+
+                @Override
+                public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
+                    throws IncorrectOperationException {
+                    evalAnchor(editor, file);
+
+                    for (JSVariable e : getElementsToProcess()) {
+                        anchor = doAddOneMethod(project, generateGetterFix.buildFunctionText(e), anchor);
+                        anchor = doAddOneMethod(project, generateSetterFix.buildFunctionText(e), anchor);
+                    }
+                }
+            };
+        }
+        else if (mode == GenerationMode.CONSTRUCTOR) {
+            return new BaseCreateMethodsFix<JSVariable>(jsClass) {
+                @Override
+                public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
+                    throws IncorrectOperationException {
+                    final JSCodeStyleSettings codeStyleSettings =
+                        CodeStyleSettingsManager.getSettings(project).getCustomSettings(JSCodeStyleSettings.class);
+                    evalAnchor(editor, file);
+                    @NonNls String functionText = "public function " + jsClass.getName() + "(";
+                    @NonNls String initialization = "";
+                    boolean first = true;
+                    final String semicolon = JSChangeUtil.getSemicolon(project);
+
+                    Set<JSVariable> toProcess = getElementsToProcess();
+                    Iterator<JSVariable> variableIterator = toProcess.iterator();
+                    boolean hadSuperClassConstructorInitializationBefore = false;
+
+                    while (variableIterator.hasNext()) {
+                        JSVariable var = variableIterator.next();
+                        if (!first) {
+                            functionText += ", ";
+                        }
+
+                        first = false;
+
+                        final String name = var.getName();
+                        String parameterName = transformVarNameToAccessorName(name, codeStyleSettings);
+
+                        final String typeString = var.getTypeString();
+                        functionText += parameterName + (typeString != null ? ":" + typeString : "");
+
+                        if (JSResolveUtil.findParent(var) == jsClass) {
+                            if (hadSuperClassConstructorInitializationBefore) {
+                                initialization += ")" + semicolon + "\n";
+                                hadSuperClassConstructorInitializationBefore = false;
+                            }
+                            initialization += (parameterName.equals(name) ? "this." : "") + name + " = " + parameterName + semicolon + "\n";
+                        }
+                        else {
+                            if (hadSuperClassConstructorInitializationBefore) {
+                                initialization += ", ";
+                            }
+                            else {
+                                initialization += "super(";
+                            }
+                            initialization += parameterName;
+                            hadSuperClassConstructorInitializationBefore = true;
+                        }
+                    }
+
+                    if (hadSuperClassConstructorInitializationBefore) {
+                        initialization += ")" + semicolon + "\n";
+                    }
+                    functionText += ") {\n";
+                    functionText += initialization;
+                    functionText += "}";
+                    doAddOneMethod(project, functionText, anchor);
+                }
+
+                @Override
+                public Set<JSVariable> getElementsToProcess() {
+                    LinkedHashSet<JSVariable> vars = new LinkedHashSet<JSVariable>();
+                    JSFunction nontrivialSuperClassConstructor = JSAnnotatingVisitor.getNontrivialSuperClassConstructor(jsClass);
+
+                    if (nontrivialSuperClassConstructor != null) {
+                        vars.addAll(Arrays.asList(nontrivialSuperClassConstructor.getParameterList().getParameters()));
+                    }
+                    vars.addAll(super.getElementsToProcess());
+                    return vars;
+                }
+            };
+        }
+        else if (mode == GenerationMode.TOSTRING) {
+            return new BaseCreateMethodsFix<JSVariable>(jsClass) {
+                @Override
+                public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
+                    throws IncorrectOperationException {
+                    evalAnchor(editor, file);
+
+                    final boolean[] needOverride = new boolean[1];
+                    JSResolveUtil.processOverrides(
+                        jsClass,
+                        (processor, scope, className) -> {
+                            needOverride[0] = !"Object".equals(className);
+                            return false;
+                        }, "toString", null, myJsClass
+                    );
+
+                    @NonNls String functionText =
+                        "public " + (needOverride[0] ? "override " : "") + "function toString():String {\nreturn " +
+                            (needOverride[0] ? "super.toString() + \"" : "\"" + jsClass.getName()) + "{";
+                    final String semicolon = JSChangeUtil.getSemicolon(project);
+
+                    boolean first = true;
+
+                    for (JSVariable var : getElementsToProcess()) {
+                        if (!first) {
+                            functionText += " + \",";
+                        }
+                        first = false;
+
+                        functionText += var.getName() + "=\" + String(" + var.getName() + ")";
+                    }
+
+                    functionText += "+\"}\"" + semicolon + "\n}";
+                    doAddOneMethod(project, functionText, anchor);
+                }
+            };
+        }
+
+        return new MyBaseCreateMethodsFix(
+            mode,
+            jsClass,
+            myCreateBindableProperties != null ? myCreateBindableProperties.isSelected() : false
+        );
+    }
+
+
+    @Override
+    protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates) {
+        final LinkedHashMap<String, JSNamedElement> candidatesMap = new LinkedHashMap<>();
+        final JSCodeStyleSettings codeStyleSettings =
+            CodeStyleSettingsManager.getSettings(clazz.getProject()).getCustomSettings(JSCodeStyleSettings.class);
+        final ResolveProcessor processor = new ResolveProcessor(null) {
+            {
+                setToProcessMembers(true);
+                setToProcessHierarchy(false);
+                setLocalResolve(true);
+            }
+
+            @Override
+            public boolean execute(final PsiElement element, final ResolveState state) {
+                final JSNamedElement namedElement = (JSNamedElement)element;
+                if (!(element instanceof JSVariable)) {
+                    if (element instanceof JSFunction) {
+                        final JSFunction function = (JSFunction)element;
+                        if (mode == GenerationMode.GETTERS && function.isGetProperty()
+                            || mode == GenerationMode.SETTERS && function.isSetProperty()) {
+                            candidatesMap.put(function.getName(), function);
+                        }
+
+                    }
+                    return true;
+                }
+                else if (((JSVariable)element).isConst()) {
+                    return true;
+                }
+
+                final String name = namedElement.getName();
+                final String accessorName = transformVarNameToAccessorName(name, codeStyleSettings);
+                if (/*!name.equals(accessorName) &&*/ !candidatesMap.containsKey(accessorName)) {
+                    candidatesMap.put(accessorName, namedElement);
+                }
+                return true;
+            }
+        };
+
+        clazz.processDeclarations(processor, ResolveState.initial(), clazz, clazz);
+        for (JSNamedElement n : candidatesMap.values()) {
+            if (n instanceof JSVariable) {
+                candidates.add(new JSNamedElementNode(n));
+            }
+        }
+    }
+
+    private static class MyBaseCreateMethodsFix extends BaseCreateMethodsFix<JSVariable> {
+        private GenerationMode myMode;
+        private JSCodeStyleSettings codeStyleSettings;
+        private boolean bindableProperties;
+        private static final String PARAMETER_NAME = "value";
+
+        public MyBaseCreateMethodsFix(final GenerationMode mode, final JSClass jsClass, boolean _bindableProperties) {
+            super(jsClass);
+            this.myMode = mode;
+            codeStyleSettings = CodeStyleSettingsManager.getSettings(jsClass.getProject()).getCustomSettings(JSCodeStyleSettings.class);
+            bindableProperties = _bindableProperties;
+        }
+
+        @Override
+        protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSVariable func) {
+            final String semicolon = codeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT ? ";" : "";
+            String varName = func.getName();
+            if (myMode == GenerationMode.SETTERS) {
+                String checkNeedEvent = "";
+                String dispatchEvent = "";
+                if (bindableProperties) {
+                    String eventName = getEventName(transformVarNameToAccessorName(varName, codeStyleSettings));
+                    dispatchEvent = "\ndispatchEvent(new Event(\"" + eventName + "\"))" + semicolon;
+                    checkNeedEvent = "if(" + varName + "==" + PARAMETER_NAME + ") return" + semicolon + "\n";
+                }
+                return "{\n" + checkNeedEvent + varName + "=" + PARAMETER_NAME + semicolon + dispatchEvent + "\n}";
+            }
+            else if (myMode == GenerationMode.GETTERS) {
+                return "{\nreturn " + varName + semicolon + "\n}";
+            }
+            return " {}";
+        }
+
+        @Override
+        protected String buildFunctionAttrText(final String attrText, final JSAttributeList attributeList, final JSVariable function) {
+            String baseText =
+                "public" + (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) ? " static" : "");
+
+            if (bindableProperties && myMode == GenerationMode.GETTERS) {
+                baseText = "[Bindable(event=\"" + getEventName(transformVarNameToAccessorName(
+                    function.getName(),
+                    codeStyleSettings
+                )) + "\")]\n" + baseText;
+            }
+
+            return baseText;
+        }
+
+        private static String getEventName(String name) {
+            return name + "Changed";
+        }
+
+        @Override
+        protected String buildFunctionKind(final JSVariable fun) {
+            if (myMode == GenerationMode.GETTERS) {
+                return "get ";
+            }
+            if (myMode == GenerationMode.SETTERS) {
+                return "set ";
+            }
+            return super.buildFunctionKind(fun);
+        }
+
+        @Override
+        protected String buildReturnType(final String typeString) {
+            if (myMode == GenerationMode.SETTERS) {
+                return "void";
+            }
+            return super.buildReturnType(typeString);
+        }
+
+        @Override
+        protected String buildName(final JSVariable fun) {
+            return transformVarNameToAccessorName(super.buildName(fun), codeStyleSettings);
+        }
+
+        @Override
+        protected String buildParameterList(final JSParameterList parameterList, final JSVariable fun) {
+            if (myMode == GenerationMode.SETTERS) {
+                final String s = fun.getTypeString();
+                return "(" + PARAMETER_NAME + (s != null ? ":" + s : "") + ")";
+            }
+            return (parameterList != null ? parameterList.getText() : "()");
+        }
+    }
+
+    private static String transformVarNameToAccessorName(String s, final JSCodeStyleSettings codeStyleSettings) {
+        if (StringUtil.startsWith(s, codeStyleSettings.FIELD_PREFIX)) {
+            s = s.substring(codeStyleSettings.FIELD_PREFIX.length());
+        }
+        s = codeStyleSettings.PROPERTY_PREFIX + s;
+        return s;
+    }
+
+    @Override
+    protected boolean canHaveEmptySelectedElements() {
+        return mode == GenerationMode.CONSTRUCTOR;
+    }
 }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
index b785ad13..7a424ee7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
@@ -18,14 +18,12 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 19, 2008
- *         Time: 1:01:05 AM
+ * Date: Jul 19, 2008
+ * Time: 1:01:05 AM
  */
-public class JavaScriptGenerateConstructorAction extends BaseJSGenerateAction
-{
-	@Override
-	protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode()
-	{
-		return JavaScriptGenerateAccessorHandler.GenerationMode.CONSTRUCTOR;
-	}
+public class JavaScriptGenerateConstructorAction extends BaseJSGenerateAction {
+    @Override
+    protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
+        return JavaScriptGenerateAccessorHandler.GenerationMode.CONSTRUCTOR;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
index a8f9a99c..d4d181ed 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
@@ -18,14 +18,12 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 19, 2008
- *         Time: 1:01:05 AM
+ * Date: Jul 19, 2008
+ * Time: 1:01:05 AM
  */
-public class JavaScriptGenerateGetAccessorAction extends BaseJSGenerateAction
-{
-	@Override
-	protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode()
-	{
-		return JavaScriptGenerateAccessorHandler.GenerationMode.GETTERS;
-	}
+public class JavaScriptGenerateGetAccessorAction extends BaseJSGenerateAction {
+    @Override
+    protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
+        return JavaScriptGenerateAccessorHandler.GenerationMode.GETTERS;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
index 7f5a2ad9..0dd3d615 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
@@ -18,15 +18,12 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 19, 2008
- *         Time: 1:01:05 AM
+ * Date: Jul 19, 2008
+ * Time: 1:01:05 AM
  */
-public class JavaScriptGenerateGetSetAccessorAction extends BaseJSGenerateAction
-{
-
-	@Override
-	protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode()
-	{
-		return JavaScriptGenerateAccessorHandler.GenerationMode.GETTERS_AND_SETTERS;
-	}
+public class JavaScriptGenerateGetSetAccessorAction extends BaseJSGenerateAction {
+    @Override
+    protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
+        return JavaScriptGenerateAccessorHandler.GenerationMode.GETTERS_AND_SETTERS;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
index 84270251..c0ccc294 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
@@ -18,14 +18,12 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 19, 2008
- *         Time: 1:01:05 AM
+ * Date: Jul 19, 2008
+ * Time: 1:01:05 AM
  */
-public class JavaScriptGenerateSetAccessorAction extends BaseJSGenerateAction
-{
-	@Override
-	protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode()
-	{
-		return JavaScriptGenerateAccessorHandler.GenerationMode.SETTERS;
-	}
+public class JavaScriptGenerateSetAccessorAction extends BaseJSGenerateAction {
+    @Override
+    protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
+        return JavaScriptGenerateAccessorHandler.GenerationMode.SETTERS;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
index e2647571..ac9758c9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
@@ -18,14 +18,12 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 19, 2008
- *         Time: 1:01:05 AM
+ * Date: Jul 19, 2008
+ * Time: 1:01:05 AM
  */
-public class JavaScriptGenerateToStringAction extends BaseJSGenerateAction
-{
-	@Override
-	protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode()
-	{
-		return JavaScriptGenerateAccessorHandler.GenerationMode.TOSTRING;
-	}
+public class JavaScriptGenerateToStringAction extends BaseJSGenerateAction {
+    @Override
+    protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
+        return JavaScriptGenerateAccessorHandler.GenerationMode.TOSTRING;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
index d0152e12..e199605c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
@@ -33,32 +33,26 @@
 import java.util.Collection;
 
 @ExtensionImpl
-public class JavaScriptImplementMethodsHandler extends BaseJSGenerateHandler implements ImplementMethodHandler
-{
-	@Override
-	protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates)
-	{
-		ImplementedMethodProcessor processor = new ImplementedMethodProcessor(clazz)
-		{
-			@Override
-			protected void addNonimplementedFunction(final JSFunction function)
-			{
-				candidates.add(new JSNamedElementNode(function));
-			}
-		};
+public class JavaScriptImplementMethodsHandler extends BaseJSGenerateHandler implements ImplementMethodHandler {
+    @Override
+    protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates) {
+        ImplementedMethodProcessor processor = new ImplementedMethodProcessor(clazz) {
+            @Override
+            protected void addNonimplementedFunction(final JSFunction function) {
+                candidates.add(new JSNamedElementNode(function));
+            }
+        };
 
-		JSResolveUtil.processInterfaceMethods(clazz, processor);
-	}
+        JSResolveUtil.processInterfaceMethods(clazz, processor);
+    }
 
-	@Override
-  protected LocalizeValue getTitle()
-	{
-		return JavaScriptLocalize.methodsToImplementChooserTitle();
-  }
+    @Override
+    protected LocalizeValue getTitle() {
+        return JavaScriptLocalize.methodsToImplementChooserTitle();
+    }
 
-  @Override
-	protected BaseCreateMethodsFix createFix(final JSClass clazz)
-	{
-		return new ImplementMethodsFix(clazz);
-	}
+    @Override
+    protected BaseCreateMethodsFix createFix(final JSClass clazz) {
+        return new ImplementMethodsFix(clazz);
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
index aa889eba..0ec89d4b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
@@ -37,98 +37,80 @@
 import java.util.function.Function;
 
 @ExtensionImpl
-public class JavaScriptOverrideMethodsHandler extends BaseJSGenerateHandler implements OverrideMethodHandler
-{
-	@Override
-	protected LocalizeValue getTitle()
-	{
-		return JavaScriptLocalize.methodsToOverrideChooserTitle();
-	}
+public class JavaScriptOverrideMethodsHandler extends BaseJSGenerateHandler implements OverrideMethodHandler {
+    @Override
+    protected LocalizeValue getTitle() {
+        return JavaScriptLocalize.methodsToOverrideChooserTitle();
+    }
 
-  @Override
-	protected BaseCreateMethodsFix createFix(final JSClass clazz)
-	{
-		return new OverrideMethodsFix(clazz);
-	}
+    @Override
+    protected BaseCreateMethodsFix createFix(final JSClass clazz) {
+        return new OverrideMethodsFix(clazz);
+    }
 
-	@Override
-	protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates)
-	{
-		Map<String, Object> _functionsToOverride = null;
-		final Function<JSFunction, Boolean> functionFilter = new Function<JSFunction, Boolean>()
-		{
-			@Override
-			public Boolean apply(final JSFunction function)
-			{
-				final JSAttributeList attributeList = function.getAttributeList();
+    @Override
+    protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates) {
+        Map<String, Object> _functionsToOverride = null;
+        final Function<JSFunction, Boolean> functionFilter = new Function<JSFunction, Boolean>() {
+            @Override
+            public Boolean apply(final JSFunction function) {
+                final JSAttributeList attributeList = function.getAttributeList();
 
-				if(attributeList != null && (attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) || attributeList.hasModifier(JSAttributeList
-						.ModifierType.FINAL)))
-				{
-					return Boolean.FALSE;
-				}
-				return Boolean.TRUE;
-			}
-		};
+                if (attributeList != null && (attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
+                    || attributeList.hasModifier(JSAttributeList.ModifierType.FINAL))) {
+                    return Boolean.FALSE;
+                }
+                return Boolean.TRUE;
+            }
+        };
 
-		for(JSClass superClazz : clazz.getSuperClasses())
-		{
-			_functionsToOverride = ImplementedMethodProcessor.collectAllVisibleClassFunctions(superClazz, _functionsToOverride, functionFilter);
-		}
+        for (JSClass superClazz : clazz.getSuperClasses()) {
+            _functionsToOverride =
+                ImplementedMethodProcessor.collectAllVisibleClassFunctions(superClazz, _functionsToOverride, functionFilter);
+        }
 
-		final Map<String, Object> functionsToOverride = _functionsToOverride;
-		final ResolveProcessor collectOwnFunctions = new ResolveProcessor(null, clazz)
-		{
-			{
-				setToProcessMembers(true);
-				setToProcessHierarchy(false);
-			}
+        final Map<String, Object> functionsToOverride = _functionsToOverride;
+        final ResolveProcessor collectOwnFunctions = new ResolveProcessor(null, clazz) {
+            {
+                setToProcessMembers(true);
+                setToProcessHierarchy(false);
+            }
 
-			@Override
-			public boolean execute(final PsiElement element, final ResolveState state)
-			{
-				if(element instanceof JSFunction)
-				{
-					final JSFunction function = (JSFunction) element;
-					if(function.isConstructor() || functionsToOverride == null)
-					{
-						return true;
-					}
-					final String funName = function.getName();
-					final Object o = functionsToOverride.get(funName);
-					if(o instanceof JSFunction && ((JSFunction) o).getKind() == function.getKind())
-					{
-						functionsToOverride.remove(funName);
-					}
-					else if(o instanceof JSFunction[])
-					{
-						JSFunction[] functions = (JSFunction[]) o;
-						functionsToOverride.put(funName, functions[0].getKind() == function.getKind() ? functions[1] : functions[0]);
-					}
-				}
-				return true;
-			}
-		};
+            @Override
+            public boolean execute(final PsiElement element, final ResolveState state) {
+                if (element instanceof JSFunction) {
+                    final JSFunction function = (JSFunction)element;
+                    if (function.isConstructor() || functionsToOverride == null) {
+                        return true;
+                    }
+                    final String funName = function.getName();
+                    final Object o = functionsToOverride.get(funName);
+                    if (o instanceof JSFunction && ((JSFunction)o).getKind() == function.getKind()) {
+                        functionsToOverride.remove(funName);
+                    }
+                    else if (o instanceof JSFunction[]) {
+                        JSFunction[] functions = (JSFunction[])o;
+                        functionsToOverride.put(funName, functions[0].getKind() == function.getKind() ? functions[1] : functions[0]);
+                    }
+                }
+                return true;
+            }
+        };
 
-		clazz.processDeclarations(collectOwnFunctions, ResolveState.initial(), clazz, clazz);
+        clazz.processDeclarations(collectOwnFunctions, ResolveState.initial(), clazz, clazz);
 
-		if(functionsToOverride != null)
-		{
-			for(Map.Entry<String, Object> entry : functionsToOverride.entrySet())
-			{
-				final Object value = entry.getValue();
-				if(value instanceof JSFunction[])
-				{
-					for(JSFunction function : (JSFunction[]) value)
-					{
-						candidates.add(new JSNamedElementNode(function));
-					}
-				}
-				else
-				{
-					candidates.add(new JSNamedElementNode((JSFunction) value));
-				}
-			}
-		}
-	}
+        if (functionsToOverride != null) {
+            for (Map.Entry<String, Object> entry : functionsToOverride.entrySet()) {
+                final Object value = entry.getValue();
+                if (value instanceof JSFunction[]) {
+                    for (JSFunction function : (JSFunction[])value) {
+                        candidates.add(new JSNamedElementNode(function));
+                    }
+                }
+                else {
+                    candidates.add(new JSNamedElementNode((JSFunction)value));
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
index a7b8bee4..bdd49eab 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
@@ -29,84 +29,68 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 17, 2008
- *         Time: 9:39:02 PM
+ * Date: Jul 17, 2008
+ * Time: 9:39:02 PM
  */
-public class OverrideMethodsFix extends BaseCreateMethodsFix<JSFunction>
-{
-	public OverrideMethodsFix(final JSClass jsClass)
-	{
-		super(jsClass);
-	}
+public class OverrideMethodsFix extends BaseCreateMethodsFix<JSFunction> {
+    public OverrideMethodsFix(final JSClass jsClass) {
+        super(jsClass);
+    }
 
-	@Override
-	protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func)
-	{
-		@NonNls String functionText = "";
-		functionText += "{\n";
+    @Override
+    protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func) {
+        @NonNls String functionText = "";
+        functionText += "{\n";
 
-		if(!"void".equals(retType))
-		{
-			functionText += "  return";
-		}
-		else
-		{
-			functionText += " ";
-		}
+        if (!"void".equals(retType)) {
+            functionText += "  return";
+        }
+        else {
+            functionText += " ";
+        }
 
-		functionText += " super." + func.getName();
+        functionText += " super." + func.getName();
 
-		if(func.isGetProperty())
-		{
+        if (func.isGetProperty()) {
+        }
+        else if (func.isSetProperty()) {
+            functionText += " = " + parameterList.getParameters()[0].getName();
+        }
+        else {
+            functionText += "(";
+            boolean first = true;
+            for (JSParameter param : parameterList.getParameters()) {
+                if (!first) {
+                    functionText += ",";
+                }
+                first = false;
+                functionText += param.getName();
+            }
+            functionText += ")";
+        }
 
-		}
-		else if(func.isSetProperty())
-		{
-			functionText += " = " + parameterList.getParameters()[0].getName();
-		}
-		else
-		{
-			functionText += "(";
-			boolean first = true;
-			for(JSParameter param : parameterList.getParameters())
-			{
-				if(!first)
-				{
-					functionText += ",";
-				}
-				first = false;
-				functionText += param.getName();
-			}
-			functionText += ")";
-		}
+        functionText += JSChangeUtil.getSemicolon(func.getProject()) + "\n}";
+        return functionText;
+    }
 
-		functionText += JSChangeUtil.getSemicolon(func.getProject()) + "\n}";
-		return functionText;
-	}
+    @Override
+    protected String buildFunctionAttrText(String attrText, final JSAttributeList attributeList, final JSFunction function) {
+        attrText = super.buildFunctionAttrText(attrText, attributeList, function);
+        final PsiElement element = JSResolveUtil.findParent(function);
+        if (attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
 
-	@Override
-	protected String buildFunctionAttrText(String attrText, final JSAttributeList attributeList, final JSFunction function)
-	{
-		attrText = super.buildFunctionAttrText(attrText, attributeList, function);
-		final PsiElement element = JSResolveUtil.findParent(function);
-		if(attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE))
-		{
+            if (element instanceof JSClass && !"Object".equals(((JSClass)element).getQualifiedName())) {
+                final PsiElement typeElement = attributeList != null ? attributeList.findAccessTypeElement() : null;
+                if (typeElement == null) {
+                    attrText += " override";
+                }
+                else {
+                    final int index = attrText.indexOf(typeElement.getText());
+                    attrText = attrText.substring(0, index) + ((index > 0) ? " " : "") + "override " + attrText.substring(index);
+                }
+            }
+        }
 
-			if(element instanceof JSClass && !"Object".equals(((JSClass) element).getQualifiedName()))
-			{
-				final PsiElement typeElement = attributeList != null ? attributeList.findAccessTypeElement() : null;
-				if(typeElement == null)
-				{
-					attrText += " override";
-				}
-				else
-				{
-					final int index = attrText.indexOf(typeElement.getText());
-					attrText = attrText.substring(0, index) + ((index > 0) ? " " : "") + "override " + attrText.substring(index);
-				}
-			}
-		}
-
-		return attrText;
-	}
+        return attrText;
+    }
 }

From f2050c9ee9ad653d00cebfc262716cde678c8cda Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 8 Sep 2024 21:56:52 +0300
Subject: [PATCH 236/340] Refactoring to reduce number of inspection warnings.

---
 .../impl/generation/BaseJSGenerateAction.java |   6 +-
 .../generation/BaseJSGenerateHandler.java     |  15 +-
 .../impl/generation/JSNamedElementNode.java   |  33 +-
 .../JavaScriptGenerateAccessorHandler.java    | 127 ++--
 .../JavaScriptGenerateConstructorAction.java  |   6 +-
 .../JavaScriptGenerateGetAccessorAction.java  |   6 +-
 ...avaScriptGenerateGetSetAccessorAction.java |   6 +-
 .../JavaScriptGenerateSetAccessorAction.java  |   6 +-
 .../JavaScriptGenerateToStringAction.java     |   6 +-
 .../JavaScriptImplementMethodsHandler.java    |   2 +
 .../JavaScriptOverrideMethodsHandler.java     |  35 +-
 .../impl/generation/OverrideMethodsFix.java   |  42 +-
 .../impl/validation/BaseCreateMethodsFix.java |  67 +-
 .../impl/validation/ImplementMethodsFix.java  |  38 +-
 .../ImplementedMethodProcessor.java           |  95 ++-
 .../impl/validation/JSAnnotatingVisitor.java  | 671 +++++++++---------
 .../impl/validation/JSAnnotatorFactory.java   |   2 +-
 17 files changed, 605 insertions(+), 558 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
index afd0be70..f924a331 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
@@ -25,6 +25,7 @@
 import consulo.language.editor.util.PsiUtilBase;
 import consulo.language.psi.PsiFile;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.action.AnAction;
 import consulo.ui.ex.action.AnActionEvent;
 import consulo.virtualFileSystem.VirtualFile;
@@ -32,11 +33,11 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 19, 2008
- * Time: 7:04:37 PM
+ * @since 2008-07-19
  */
 abstract class BaseJSGenerateAction extends AnAction {
     @Override
+    @RequiredUIAccess
     public void actionPerformed(final AnActionEvent e) {
         Editor editor = e.getData(PlatformDataKeys.EDITOR);
         PsiFile psifile = e.getData(LangDataKeys.PSI_FILE);
@@ -55,6 +56,7 @@ public void actionPerformed(final AnActionEvent e) {
     protected abstract JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode();
 
     @Override
+    @RequiredUIAccess
     public void update(final AnActionEvent e) {
         final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
index 4ee1927c..a6e8bec7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
@@ -22,7 +22,7 @@
 import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import consulo.application.ApplicationManager;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.codeEditor.Editor;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
@@ -36,8 +36,8 @@
 import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.undoRedo.CommandProcessor;
-
 import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
@@ -53,7 +53,8 @@ public Language getLanguage() {
     }
 
     @Override
-    public void invoke(final Project project, final Editor editor, final PsiFile file) {
+    @RequiredUIAccess
+    public void invoke(@Nonnull final Project project, @Nonnull final Editor editor, @Nonnull final PsiFile file) {
         JSClass clazz = findClass(file, editor);
 
         if (clazz == null) {
@@ -85,8 +86,9 @@ private void run(JSClass clazz, Collection<JSNamedElementNode> selectedElements,
         final Collection<JSNamedElementNode> selectedElements1 = selectedElements;
         Runnable runnable = new Runnable() {
             @Override
+            @RequiredUIAccess
             public void run() {
-                ApplicationManager.getApplication().runWriteAction(new Runnable() {
+                project.getApplication().runWriteAction(new Runnable() {
                     @Override
                     public void run() {
                         try {
@@ -118,6 +120,7 @@ protected boolean canHaveEmptySelectedElements() {
         return false;
     }
 
+    @RequiredReadAction
     static JSClass findClass(PsiFile file, Editor editor) {
         final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
         if (at == null) {
@@ -128,8 +131,8 @@ static JSClass findClass(PsiFile file, Editor editor) {
         if (clazz == null) {
             final PsiFile containingFile = at.getContainingFile();
             final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(containingFile);
-            if (element instanceof JSClass) {
-                clazz = (JSClass)element;
+            if (element instanceof JSClass jsClass) {
+                clazz = jsClass;
             }
         }
         else if (JSResolveUtil.isArtificialClassUsedForReferenceList(clazz)) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
index b1eb09da..d21646af 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
@@ -19,6 +19,7 @@
 import com.intellij.javascript.JSParameterInfoHandler;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.application.AllIcons;
 import consulo.language.editor.generation.ClassMember;
 import consulo.language.editor.generation.MemberChooserObject;
@@ -30,19 +31,19 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 17, 2008
- * Time: 8:55:57 PM
+ * @since 2008-07-17
  */
 public class JSNamedElementNode extends PsiElementMemberChooserObject implements ClassMember {
+    @RequiredReadAction
     public JSNamedElementNode(JSNamedElement node) {
         super(node, buildTextFor(node), buildIcon(node));
     }
 
+    @RequiredReadAction
     private static Image buildIcon(final JSNamedElement node) {
         Image icon = IconDescriptorUpdaters.getIcon(node, 0);
 
-        if (node instanceof JSFunction) {
-            final JSFunction function = (JSFunction)node;
+        if (node instanceof JSFunction function) {
             final Image accessIcon;
 
             if (function.isGetProperty()) {
@@ -62,42 +63,42 @@ else if (function.isSetProperty()) {
         return icon;
     }
 
+    @RequiredReadAction
     private static String buildTextFor(final JSNamedElement node) {
-        String text = node.getName();
+        StringBuilder text = new StringBuilder(node.getName());
 
-        if (node instanceof JSFunction) {
-            final JSFunction function = (JSFunction)node;
-            text += "(";
+        if (node instanceof JSFunction function) {
+            text.append("(");
             final JSParameterList parameterList = function.getParameterList();
 
             if (parameterList != null) {
                 boolean first = true;
                 for (JSParameter p : parameterList.getParameters()) {
                     if (!first) {
-                        text += ", ";
+                        text.append(", ");
                     }
                     first = false;
-                    text += JSParameterInfoHandler.getSignatureForParameter(p, false);
+                    text.append(JSParameterInfoHandler.getSignatureForParameter(p, false));
                 }
             }
 
-            text += ")";
+            text.append(")");
             final String typeString = function.getReturnTypeString();
             if (typeString != null) {
-                text += ":" + typeString;
+                text.append(":").append(typeString);
             }
         }
-        else if (node instanceof JSVariable) {
-            final JSVariable var = (JSVariable)node;
+        else if (node instanceof JSVariable var) {
             final String typeString = var.getTypeString();
             if (typeString != null) {
-                text += ":" + typeString;
+                text.append(":").append(typeString);
             }
         }
-        return text;
+        return text.toString();
     }
 
     @Override
+    @RequiredReadAction
     public MemberChooserObject getParentNodeDelegate() {
         final PsiElement element = getPsiElement();
         PsiElement parent = JSResolveUtil.findParent(element);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
index a2de0331..b28ebcb2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
@@ -23,7 +23,8 @@
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import consulo.application.ApplicationManager;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.application.Application;
 import consulo.codeEditor.Editor;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.codeStyle.CodeStyleSettingsManager;
@@ -33,10 +34,9 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.NonFocusableCheckBox;
 import consulo.util.lang.StringUtil;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
@@ -44,8 +44,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 19, 2008
- * Time: 1:11:10 AM
+ * @since 2008-07-19
  */
 class JavaScriptGenerateAccessorHandler extends BaseJSGenerateHandler {
     private GenerationMode mode;
@@ -80,7 +79,7 @@ protected LocalizeValue getTitle() {
     protected void appendOwnOptions(List<JComponent> jComponentList) {
         super.appendOwnOptions(jComponentList);
         if (mode == GenerationMode.GETTERS || mode == GenerationMode.GETTERS_AND_SETTERS || mode == GenerationMode.SETTERS) {
-            if (!ApplicationManager.getApplication().isUnitTestMode()) {
+            if (!Application.get().isUnitTestMode()) {
                 myCreateBindableProperties = new NonFocusableCheckBox(JavaScriptLocalize.generateGetterFieldsBindableProperties().get());
                 jComponentList.add(myCreateBindableProperties);
             }
@@ -93,13 +92,14 @@ protected BaseCreateMethodsFix createFix(final JSClass jsClass) {
             return new BaseCreateMethodsFix<JSVariable>(jsClass) {
                 private boolean toCreateBindableProperties = myCreateBindableProperties != null
                     ? myCreateBindableProperties.isSelected()
-                    : ApplicationManager.getApplication().isUnitTestMode();
+                    : jsClass.getApplication().isUnitTestMode();
                 final MyBaseCreateMethodsFix generateGetterFix =
                     new MyBaseCreateMethodsFix(GenerationMode.GETTERS, jsClass, toCreateBindableProperties);
                 final MyBaseCreateMethodsFix generateSetterFix =
                     new MyBaseCreateMethodsFix(GenerationMode.SETTERS, jsClass, toCreateBindableProperties);
 
                 @Override
+                @RequiredUIAccess
                 public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
                     throws IncorrectOperationException {
                     evalAnchor(editor, file);
@@ -114,13 +114,14 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
         else if (mode == GenerationMode.CONSTRUCTOR) {
             return new BaseCreateMethodsFix<JSVariable>(jsClass) {
                 @Override
+                @RequiredUIAccess
                 public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
                     throws IncorrectOperationException {
                     final JSCodeStyleSettings codeStyleSettings =
                         CodeStyleSettingsManager.getSettings(project).getCustomSettings(JSCodeStyleSettings.class);
                     evalAnchor(editor, file);
-                    @NonNls String functionText = "public function " + jsClass.getName() + "(";
-                    @NonNls String initialization = "";
+                    StringBuilder functionText = new StringBuilder("public function ").append(jsClass.getName()).append("(");
+                    StringBuilder initialization = new StringBuilder();
                     boolean first = true;
                     final String semicolon = JSChangeUtil.getSemicolon(project);
 
@@ -131,7 +132,7 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
                     while (variableIterator.hasNext()) {
                         JSVariable var = variableIterator.next();
                         if (!first) {
-                            functionText += ", ";
+                            functionText.append(", ");
                         }
 
                         first = false;
@@ -140,39 +141,45 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
                         String parameterName = transformVarNameToAccessorName(name, codeStyleSettings);
 
                         final String typeString = var.getTypeString();
-                        functionText += parameterName + (typeString != null ? ":" + typeString : "");
+                        functionText.append(parameterName).append(typeString != null ? ":" + typeString : "");
 
                         if (JSResolveUtil.findParent(var) == jsClass) {
                             if (hadSuperClassConstructorInitializationBefore) {
-                                initialization += ")" + semicolon + "\n";
+                                initialization.append(")").append(semicolon).append("\n");
                                 hadSuperClassConstructorInitializationBefore = false;
                             }
-                            initialization += (parameterName.equals(name) ? "this." : "") + name + " = " + parameterName + semicolon + "\n";
+                            initialization.append(parameterName.equals(name) ? "this." : "")
+                                .append(name)
+                                .append(" = ")
+                                .append(parameterName)
+                                .append(semicolon)
+                                .append("\n");
                         }
                         else {
                             if (hadSuperClassConstructorInitializationBefore) {
-                                initialization += ", ";
+                                initialization.append(", ");
                             }
                             else {
-                                initialization += "super(";
+                                initialization.append("super(");
                             }
-                            initialization += parameterName;
+                            initialization.append(parameterName);
                             hadSuperClassConstructorInitializationBefore = true;
                         }
                     }
 
                     if (hadSuperClassConstructorInitializationBefore) {
-                        initialization += ")" + semicolon + "\n";
+                        initialization.append(")").append(semicolon).append("\n");
                     }
-                    functionText += ") {\n";
-                    functionText += initialization;
-                    functionText += "}";
-                    doAddOneMethod(project, functionText, anchor);
+                    functionText.append(") {\n")
+                        .append(initialization)
+                        .append("}");
+                    doAddOneMethod(project, functionText.toString(), anchor);
                 }
 
                 @Override
+                @RequiredReadAction
                 public Set<JSVariable> getElementsToProcess() {
-                    LinkedHashSet<JSVariable> vars = new LinkedHashSet<JSVariable>();
+                    LinkedHashSet<JSVariable> vars = new LinkedHashSet<>();
                     JSFunction nontrivialSuperClassConstructor = JSAnnotatingVisitor.getNontrivialSuperClassConstructor(jsClass);
 
                     if (nontrivialSuperClassConstructor != null) {
@@ -186,6 +193,7 @@ public Set<JSVariable> getElementsToProcess() {
         else if (mode == GenerationMode.TOSTRING) {
             return new BaseCreateMethodsFix<JSVariable>(jsClass) {
                 @Override
+                @RequiredUIAccess
                 public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
                     throws IncorrectOperationException {
                     evalAnchor(editor, file);
@@ -199,24 +207,26 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
                         }, "toString", null, myJsClass
                     );
 
-                    @NonNls String functionText =
-                        "public " + (needOverride[0] ? "override " : "") + "function toString():String {\nreturn " +
-                            (needOverride[0] ? "super.toString() + \"" : "\"" + jsClass.getName()) + "{";
+                    StringBuilder functionText = new StringBuilder().append("public ")
+                        .append(needOverride[0] ? "override " : "")
+                        .append("function toString():String {\nreturn ")
+                        .append(needOverride[0] ? "super.toString() + \"" : "\"" + jsClass.getName())
+                        .append("{");
                     final String semicolon = JSChangeUtil.getSemicolon(project);
 
                     boolean first = true;
 
                     for (JSVariable var : getElementsToProcess()) {
                         if (!first) {
-                            functionText += " + \",";
+                            functionText.append(" + \",");
                         }
                         first = false;
 
-                        functionText += var.getName() + "=\" + String(" + var.getName() + ")";
+                        functionText.append(var.getName()).append("=\" + String(").append(var.getName()).append(")");
                     }
 
-                    functionText += "+\"}\"" + semicolon + "\n}";
-                    doAddOneMethod(project, functionText, anchor);
+                    functionText.append("+\"}\"").append(semicolon).append("\n}");
+                    doAddOneMethod(project, functionText.toString(), anchor);
                 }
             };
         }
@@ -224,12 +234,12 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
         return new MyBaseCreateMethodsFix(
             mode,
             jsClass,
-            myCreateBindableProperties != null ? myCreateBindableProperties.isSelected() : false
+            myCreateBindableProperties != null && myCreateBindableProperties.isSelected()
         );
     }
 
-
     @Override
+    @RequiredReadAction
     protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates) {
         final LinkedHashMap<String, JSNamedElement> candidatesMap = new LinkedHashMap<>();
         final JSCodeStyleSettings codeStyleSettings =
@@ -242,27 +252,22 @@ protected void collectCandidates(final JSClass clazz, final Collection<JSNamedEl
             }
 
             @Override
-            public boolean execute(final PsiElement element, final ResolveState state) {
-                final JSNamedElement namedElement = (JSNamedElement)element;
-                if (!(element instanceof JSVariable)) {
-                    if (element instanceof JSFunction) {
-                        final JSFunction function = (JSFunction)element;
-                        if (mode == GenerationMode.GETTERS && function.isGetProperty()
-                            || mode == GenerationMode.SETTERS && function.isSetProperty()) {
-                            candidatesMap.put(function.getName(), function);
-                        }
-
+            @RequiredReadAction
+            public boolean execute(@Nonnull final PsiElement element, final ResolveState state) {
+                if (element instanceof JSVariable variable) {
+                    if (variable.isConst()) {
+                        return true;
+                    }
+                    final String name = variable.getName();
+                    final String accessorName = transformVarNameToAccessorName(name, codeStyleSettings);
+                    if (/*!name.equals(accessorName) &&*/ !candidatesMap.containsKey(accessorName)) {
+                        candidatesMap.put(accessorName, variable);
                     }
-                    return true;
-                }
-                else if (((JSVariable)element).isConst()) {
-                    return true;
                 }
-
-                final String name = namedElement.getName();
-                final String accessorName = transformVarNameToAccessorName(name, codeStyleSettings);
-                if (/*!name.equals(accessorName) &&*/ !candidatesMap.containsKey(accessorName)) {
-                    candidatesMap.put(accessorName, namedElement);
+                else if (element instanceof JSFunction function
+                    && (mode == GenerationMode.GETTERS && function.isGetProperty()
+                    || mode == GenerationMode.SETTERS && function.isSetProperty())) {
+                    candidatesMap.put(function.getName(), function);
                 }
                 return true;
             }
@@ -290,6 +295,7 @@ public MyBaseCreateMethodsFix(final GenerationMode mode, final JSClass jsClass,
         }
 
         @Override
+        @RequiredReadAction
         protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSVariable func) {
             final String semicolon = codeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT ? ";" : "";
             String varName = func.getName();
@@ -310,18 +316,23 @@ else if (myMode == GenerationMode.GETTERS) {
         }
 
         @Override
+        @RequiredReadAction
         protected String buildFunctionAttrText(final String attrText, final JSAttributeList attributeList, final JSVariable function) {
-            String baseText =
-                "public" + (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) ? " static" : "");
+            StringBuilder baseText = new StringBuilder();
 
             if (bindableProperties && myMode == GenerationMode.GETTERS) {
-                baseText = "[Bindable(event=\"" + getEventName(transformVarNameToAccessorName(
+                baseText.append("[Bindable(event=\"").append(getEventName(transformVarNameToAccessorName(
                     function.getName(),
                     codeStyleSettings
-                )) + "\")]\n" + baseText;
+                ))).append("\")]\n");
+            }
+
+            baseText.append("public");
+            if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
+                baseText.append(" static");
             }
 
-            return baseText;
+            return baseText.toString();
         }
 
         private static String getEventName(String name) {
@@ -329,6 +340,7 @@ private static String getEventName(String name) {
         }
 
         @Override
+        @RequiredReadAction
         protected String buildFunctionKind(final JSVariable fun) {
             if (myMode == GenerationMode.GETTERS) {
                 return "get ";
@@ -348,11 +360,13 @@ protected String buildReturnType(final String typeString) {
         }
 
         @Override
+        @RequiredReadAction
         protected String buildName(final JSVariable fun) {
             return transformVarNameToAccessorName(super.buildName(fun), codeStyleSettings);
         }
 
         @Override
+        @RequiredReadAction
         protected String buildParameterList(final JSParameterList parameterList, final JSVariable fun) {
             if (myMode == GenerationMode.SETTERS) {
                 final String s = fun.getTypeString();
@@ -366,8 +380,7 @@ private static String transformVarNameToAccessorName(String s, final JSCodeStyle
         if (StringUtil.startsWith(s, codeStyleSettings.FIELD_PREFIX)) {
             s = s.substring(codeStyleSettings.FIELD_PREFIX.length());
         }
-        s = codeStyleSettings.PROPERTY_PREFIX + s;
-        return s;
+        return codeStyleSettings.PROPERTY_PREFIX + s;
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
index 7a424ee7..2310a447 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
@@ -16,12 +16,14 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
+import jakarta.annotation.Nonnull;
+
 /**
  * @author Maxim.Mossienko
- * Date: Jul 19, 2008
- * Time: 1:01:05 AM
+ * @since 2008-07-19
  */
 public class JavaScriptGenerateConstructorAction extends BaseJSGenerateAction {
+    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.CONSTRUCTOR;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
index d4d181ed..f14bc809 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
@@ -16,12 +16,14 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
+import jakarta.annotation.Nonnull;
+
 /**
  * @author Maxim.Mossienko
- * Date: Jul 19, 2008
- * Time: 1:01:05 AM
+ * @since 2008-07-19
  */
 public class JavaScriptGenerateGetAccessorAction extends BaseJSGenerateAction {
+    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.GETTERS;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
index 0dd3d615..024faa37 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
@@ -16,12 +16,14 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
+import jakarta.annotation.Nonnull;
+
 /**
  * @author Maxim.Mossienko
- * Date: Jul 19, 2008
- * Time: 1:01:05 AM
+ * @since 2008-07-19
  */
 public class JavaScriptGenerateGetSetAccessorAction extends BaseJSGenerateAction {
+    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.GETTERS_AND_SETTERS;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
index c0ccc294..1b16e1b3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
@@ -16,12 +16,14 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
+import jakarta.annotation.Nonnull;
+
 /**
  * @author Maxim.Mossienko
- * Date: Jul 19, 2008
- * Time: 1:01:05 AM
+ * @since 2008-07-19
  */
 public class JavaScriptGenerateSetAccessorAction extends BaseJSGenerateAction {
+    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.SETTERS;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
index ac9758c9..f3a3b958 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
@@ -16,12 +16,14 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
+import jakarta.annotation.Nonnull;
+
 /**
  * @author Maxim.Mossienko
- * Date: Jul 19, 2008
- * Time: 1:01:05 AM
+ * @since 2008-07-19
  */
 public class JavaScriptGenerateToStringAction extends BaseJSGenerateAction {
+    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.TOSTRING;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
index e199605c..e9b2b7e6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
@@ -25,6 +25,7 @@
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.generation.ImplementMethodHandler;
@@ -38,6 +39,7 @@ public class JavaScriptImplementMethodsHandler extends BaseJSGenerateHandler imp
     protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates) {
         ImplementedMethodProcessor processor = new ImplementedMethodProcessor(clazz) {
             @Override
+            @RequiredReadAction
             protected void addNonimplementedFunction(final JSFunction function) {
                 candidates.add(new JSNamedElementNode(function));
             }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
index 0ec89d4b..26c7d771 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
@@ -25,12 +25,14 @@
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.generation.OverrideMethodHandler;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.localize.LocalizeValue;
+import jakarta.annotation.Nonnull;
 
 import java.util.Collection;
 import java.util.Map;
@@ -49,19 +51,17 @@ protected BaseCreateMethodsFix createFix(final JSClass clazz) {
     }
 
     @Override
+    @RequiredReadAction
     protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates) {
         Map<String, Object> _functionsToOverride = null;
-        final Function<JSFunction, Boolean> functionFilter = new Function<JSFunction, Boolean>() {
-            @Override
-            public Boolean apply(final JSFunction function) {
-                final JSAttributeList attributeList = function.getAttributeList();
+        final Function<JSFunction, Boolean> functionFilter = function -> {
+            final JSAttributeList attributeList = function.getAttributeList();
 
-                if (attributeList != null && (attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
-                    || attributeList.hasModifier(JSAttributeList.ModifierType.FINAL))) {
-                    return Boolean.FALSE;
-                }
-                return Boolean.TRUE;
+            if (attributeList != null && (attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
+                || attributeList.hasModifier(JSAttributeList.ModifierType.FINAL))) {
+                return Boolean.FALSE;
             }
+            return Boolean.TRUE;
         };
 
         for (JSClass superClazz : clazz.getSuperClasses()) {
@@ -77,20 +77,19 @@ public Boolean apply(final JSFunction function) {
             }
 
             @Override
-            public boolean execute(final PsiElement element, final ResolveState state) {
-                if (element instanceof JSFunction) {
-                    final JSFunction function = (JSFunction)element;
+            @RequiredReadAction
+            public boolean execute(@Nonnull final PsiElement element, final ResolveState state) {
+                if (element instanceof JSFunction function) {
                     if (function.isConstructor() || functionsToOverride == null) {
                         return true;
                     }
                     final String funName = function.getName();
                     final Object o = functionsToOverride.get(funName);
-                    if (o instanceof JSFunction && ((JSFunction)o).getKind() == function.getKind()) {
+                    if (o instanceof JSFunction oFun && oFun.getKind() == function.getKind()) {
                         functionsToOverride.remove(funName);
                     }
-                    else if (o instanceof JSFunction[]) {
-                        JSFunction[] functions = (JSFunction[])o;
-                        functionsToOverride.put(funName, functions[0].getKind() == function.getKind() ? functions[1] : functions[0]);
+                    else if (o instanceof JSFunction[] oFuns) {
+                        functionsToOverride.put(funName, oFuns[0].getKind() == function.getKind() ? oFuns[1] : oFuns[0]);
                     }
                 }
                 return true;
@@ -102,8 +101,8 @@ else if (o instanceof JSFunction[]) {
         if (functionsToOverride != null) {
             for (Map.Entry<String, Object> entry : functionsToOverride.entrySet()) {
                 final Object value = entry.getValue();
-                if (value instanceof JSFunction[]) {
-                    for (JSFunction function : (JSFunction[])value) {
+                if (value instanceof JSFunction[] functions) {
+                    for (JSFunction function : functions) {
                         candidates.add(new JSNamedElementNode(function));
                     }
                 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
index bdd49eab..1d42b7f3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
@@ -16,21 +16,16 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
-import org.jetbrains.annotations.NonNls;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSParameterList;
+import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import com.intellij.lang.javascript.impl.validation.BaseCreateMethodsFix;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 17, 2008
- * Time: 9:39:02 PM
+ * @since 2008-07-17
  */
 public class OverrideMethodsFix extends BaseCreateMethodsFix<JSFunction> {
     public OverrideMethodsFix(final JSClass jsClass) {
@@ -38,48 +33,49 @@ public OverrideMethodsFix(final JSClass jsClass) {
     }
 
     @Override
+    @RequiredReadAction
     protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func) {
-        @NonNls String functionText = "";
-        functionText += "{\n";
+        StringBuilder functionText = new StringBuilder();
+        functionText.append("{\n");
 
         if (!"void".equals(retType)) {
-            functionText += "  return";
+            functionText.append("  return");
         }
         else {
-            functionText += " ";
+            functionText.append(" ");
         }
 
-        functionText += " super." + func.getName();
+        functionText.append(" super.").append(func.getName());
 
         if (func.isGetProperty()) {
         }
         else if (func.isSetProperty()) {
-            functionText += " = " + parameterList.getParameters()[0].getName();
+            functionText.append(" = ").append(parameterList.getParameters()[0].getName());
         }
         else {
-            functionText += "(";
+            functionText.append("(");
             boolean first = true;
             for (JSParameter param : parameterList.getParameters()) {
                 if (!first) {
-                    functionText += ",";
+                    functionText.append(",");
                 }
                 first = false;
-                functionText += param.getName();
+                functionText.append(param.getName());
             }
-            functionText += ")";
+            functionText.append(")");
         }
 
-        functionText += JSChangeUtil.getSemicolon(func.getProject()) + "\n}";
-        return functionText;
+        functionText.append(JSChangeUtil.getSemicolon(func.getProject())).append("\n}");
+        return functionText.toString();
     }
 
     @Override
+    @RequiredReadAction
     protected String buildFunctionAttrText(String attrText, final JSAttributeList attributeList, final JSFunction function) {
         attrText = super.buildFunctionAttrText(attrText, attributeList, function);
         final PsiElement element = JSResolveUtil.findParent(function);
         if (attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
-
-            if (element instanceof JSClass && !"Object".equals(((JSClass)element).getQualifiedName())) {
+            if (element instanceof JSClass jsClass && !"Object".equals(jsClass.getQualifiedName())) {
                 final PsiElement typeElement = attributeList != null ? attributeList.findAccessTypeElement() : null;
                 if (typeElement == null) {
                     attrText += " override";
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
index d4076a1a..c748e778 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
@@ -24,8 +24,10 @@
 import java.util.List;
 import java.util.Set;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.util.IncorrectOperationException;
+import consulo.util.lang.StringUtil;
 import org.jetbrains.annotations.NonNls;
 import jakarta.annotation.Nonnull;
 
@@ -51,8 +53,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 17, 2008
- * Time: 9:39:02 PM
+ * @since 2008-07-17
  */
 public abstract class BaseCreateMethodsFix<T extends JSNamedElement & JSAttributeListOwner> {
     private final Set<T> elementsToProcess = new LinkedHashSet<>();
@@ -70,14 +71,14 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
         }
     }
 
+    @RequiredReadAction
     protected void evalAnchor(final Editor editor, final PsiFile file) {
         anchor = null;
         final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
-        PsiElement parent;
+        PsiElement parent = at != null ? at.getParent() : null;
 
-        if (at != null && ((parent = at.getParent()) == myJsClass || (parent instanceof JSFile && myJsClass.getParent()
-            .getContainingFile() == parent
-            .getContext().getContainingFile()))) {
+        if (parent == myJsClass || (parent instanceof JSFile
+            && myJsClass.getParent().getContainingFile() == parent.getContext().getContainingFile())) {
             final ASTNode atNode = at.getNode();
             if (atNode.getElementType() == JSTokenTypes.RBRACE) {
                 return;
@@ -92,9 +93,10 @@ protected void evalAnchor(final Editor editor, final PsiFile file) {
         }
     }
 
+    @RequiredReadAction
     protected PsiElement doAddOneMethod(final Project project, final String functionText, PsiElement anchor)
         throws IncorrectOperationException {
-        if (functionText != null && functionText.length() > 0) {
+        if (StringUtil.isNotEmpty(functionText)) {
             PsiElement element = JSChangeUtil.createJSTreeFromText(project, functionText).getPsi();
             if (element instanceof PsiWhiteSpace) {
                 element = element.getNextSibling();
@@ -103,10 +105,9 @@ protected PsiElement doAddOneMethod(final Project project, final String function
             boolean defaultAdd = true;
 
             if (anchor != null && anchor.isValid()) {
-                String anchorText;
+                String anchorText = anchor instanceof PsiWhiteSpace ? anchor.getText() : "";
 
-                if (!(anchor instanceof PsiWhiteSpace)
-                    || ((anchorText = anchor.getText()).indexOf("<![CDATA[") == -1 && anchorText.indexOf("]]>") == -1)) {
+                if (!anchorText.contains("<![CDATA[") && !anchorText.contains("]]>")) {
                     defaultAdd = false;
                     anchor = anchor.getParent().addAfter(element, anchor);
                 }
@@ -120,33 +121,34 @@ protected PsiElement doAddOneMethod(final Project project, final String function
         return anchor;
     }
 
+    @RequiredReadAction
     public String buildFunctionText(final T fun) {
         final JSAttributeList attributeList = fun.getAttributeList();
         String attrText = attributeList != null ? attributeList.getText() : "";
 
         attrText = buildFunctionAttrText(attrText, attributeList, fun);
 
-        final JSFunction function = fun instanceof JSFunction ? (JSFunction)fun : null;
-        final JSVariable var = fun instanceof JSVariable ? (JSVariable)fun : null;
+        final JSFunction function = fun instanceof JSFunction jsFun ? jsFun : null;
+        final JSVariable var = fun instanceof JSVariable jsVar ? jsVar : null;
         assert var != null || function != null;
 
         final JSParameterList parameterList = (function != null) ? function.getParameterList() : null;
         final String typeString = importType(function != null ? function.getReturnTypeString() : var.getTypeString(), fun);
-        @NonNls String functionText = attrText;
-        if (functionText.length() > 0) {
-            functionText += " ";
+        StringBuilder functionText = new StringBuilder(attrText);
+        if (!functionText.isEmpty()) {
+            functionText.append(" ");
         }
-        functionText += "function ";
+        functionText.append("function ");
 
-        functionText += buildFunctionKind(fun);
+        functionText.append(buildFunctionKind(fun));
 
-        functionText += buildName(fun) + " " + buildParameterList(parameterList, fun);
+        functionText.append(buildName(fun)).append(" ").append(buildParameterList(parameterList, fun));
         if (typeString != null) {
-            functionText += ":" + buildReturnType(typeString);
+            functionText.append(":").append(buildReturnType(typeString));
         }
 
-        functionText += buildFunctionBodyText(typeString, parameterList, fun);
-        return functionText;
+        functionText.append(buildFunctionBodyText(typeString, parameterList, fun));
+        return functionText.toString();
     }
 
     protected
@@ -169,6 +171,7 @@ protected String importType(final String s, T fun) {
         return s;
     }
 
+    @RequiredReadAction
     protected String buildParameterList(final JSParameterList parameterList, final T fun) {
         if (parameterList != null) {
             for (JSParameter param : parameterList.getParameters()) {
@@ -181,15 +184,14 @@ protected String buildParameterList(final JSParameterList parameterList, final T
         return (parameterList != null ? parameterList.getText() : "()");
     }
 
+    @RequiredReadAction
     protected String buildName(final T fun) {
         return fun.getName();
     }
 
-    protected
-    @NonNls
-    String buildFunctionKind(final T fun) {
-        if (fun instanceof JSFunction) {
-            final JSFunction function = (JSFunction)fun;
+    @RequiredReadAction
+    protected String buildFunctionKind(final T fun) {
+        if (fun instanceof JSFunction function) {
             if (function.isGetProperty()) {
                 return "get ";
             }
@@ -200,29 +202,26 @@ else if (function.isSetProperty()) {
         return "";
     }
 
-    protected
-    @NonNls
-    String buildFunctionBodyText(@NonNls String retType, final JSParameterList parameterList, final T func) {
+    protected String buildFunctionBodyText(String retType, final JSParameterList parameterList, final T func) {
         return " {}";
     }
 
-    protected
-    @NonNls
-    String buildFunctionAttrText(@NonNls String attrText, final JSAttributeList attributeList, final T function) {
-        attrText = attrText.replace("native", "").trim();
-        return attrText;
+    protected String buildFunctionAttrText(String attrText, final JSAttributeList attributeList, final T function) {
+        return attrText.replace("native", "").trim();
     }
 
     public void addElementToProcess(final T function) {
         elementsToProcess.add(function);
     }
 
+    @SuppressWarnings("unchecked")
     public void addElementsToProcessFrom(final Collection<JSNamedElementNode> selectedElements) {
         for (JSNamedElementNode el : selectedElements) {
             addElementToProcess((T)el.getPsiElement());
         }
     }
 
+    @SuppressWarnings("unchecked")
     public Set<T> getElementsToProcess() {
         final T[] objects = (T[])elementsToProcess.toArray(new JSNamedElement[elementsToProcess.size()]);
         final Comparator<T> tComparator = (o1, o2) -> o1.getTextOffset() - o2.getTextOffset();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
index cce7e54e..ffaaf52d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
@@ -31,8 +31,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 17, 2008
- * Time: 9:39:02 PM
+ * @since 2008-07-17
  */
 public class ImplementMethodsFix extends BaseCreateMethodsFix<JSFunction> implements SyntheticIntentionAction {
     public ImplementMethodsFix(final JSClass jsClass) {
@@ -51,36 +50,27 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
     }
 
     @Override
-    protected
-    @NonNls
-    String buildFunctionAttrText(@NonNls String attrText, final JSAttributeList attributeList, final JSFunction function) {
-        attrText = super.buildFunctionAttrText(attrText, attributeList, function);
-        if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
-            attrText = "public";
-        }
-        return attrText;
+    protected String buildFunctionAttrText(String attrText, final JSAttributeList attributeList, final JSFunction function) {
+        return attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC
+            ? "public"
+            : super.buildFunctionAttrText(attrText, attributeList, function);
     }
 
     @Override
     protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func) {
-        @NonNls String s = "{\n";
+        StringBuilder s = new StringBuilder("{\n");
         if (retType != null && !"void".equals(retType)) {
-            s += "return " + defaultValueOfType(retType) + JSChangeUtil.getSemicolon(func.getProject()) + "\n";
+            s.append("return ").append(defaultValueOfType(retType)).append(JSChangeUtil.getSemicolon(func.getProject())).append("\n");
         }
-        s += "}";
-        return s;
+        return s.append("}").toString();
     }
 
-    private static
-    @NonNls
-    String defaultValueOfType(final @NonNls String retType) {
-        if ("int".equals(retType) || "uint".equals(retType) || "Number".equals(retType)) {
-            return "0";
-        }
-        if ("Boolean".equals(retType)) {
-            return "false";
-        }
-        return "null";
+    private static String defaultValueOfType(final String retType) {
+        return switch (retType) {
+            case "int", "uint", "Number" -> "0";
+            case "Boolean" -> "false";
+            default -> "null";
+        };
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
index bb6238d9..75963498 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
 import jakarta.annotation.Nullable;
@@ -32,8 +33,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 17, 2008
- * Time: 9:50:49 PM
+ * @since 2008-07-17
  */
 public abstract class ImplementedMethodProcessor extends JSResolveUtil.CollectMethodsToImplementProcessor {
     protected final JSClass myJsClass;
@@ -48,10 +48,9 @@ protected boolean process(final ResolveProcessor processor) {
         Map<String, Object> functions = null;
 
         for (PsiElement _function : processor.getResults()) {
-            if (!(_function instanceof JSFunction)) {
+            if (!(_function instanceof JSFunction function)) {
                 continue;
             }
-            final JSFunction function = (JSFunction)_function;
             final String name = function.getName();
 
             if (functions == null) {
@@ -94,75 +93,75 @@ protected boolean process(final ResolveProcessor processor) {
     protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction) {
     }
 
+    @RequiredReadAction
     public static JSFunction findFunctionWithTheSameKind(
         final Map<String, Object> functions,
         final JSFunction function,
         final String name
     ) {
         Object o = functions.get(name);
-        if (o instanceof JSFunction && ((JSFunction)o).getKind() != function.getKind()) {
-            o = null;
+        if (o instanceof JSFunction fun) {
+            return fun.getKind() == function.getKind() ? fun : null;
         }
-        else if (o instanceof JSFunction[]) {
-            final JSFunction[] jsFunctions = (JSFunction[])o;
-            o = null;
+        else if (o instanceof JSFunction[] jsFunctions) {
             for (JSFunction fun : jsFunctions) {
                 if (fun.getKind() == function.getKind()) {
-                    o = fun;
-                    break;
+                    return fun;
                 }
             }
         }
-        return (JSFunction)o;
+        return null;
     }
 
     public static Map<String, Object> collectAllVisibleClassFunctions(
-        JSClass jsClass, Map<String, Object> _functions,
+        JSClass jsClass,
+        Map<String, Object> _functions,
         final @Nullable Function<JSFunction, Boolean> filter
     ) {
         final Map<String, Object> functions = _functions != null ? _functions : new LinkedHashMap<>();
-        jsClass.processDeclarations(new ResolveProcessor(null) {
-            {
-                setToProcessHierarchy(true);
-                setLocalResolve(true);
-            }
+        jsClass.processDeclarations(
+            new ResolveProcessor(null) {
+                {
+                    setToProcessHierarchy(true);
+                    setLocalResolve(true);
+                }
 
-            @Override
-            public boolean execute(final PsiElement element, final ResolveState state) {
-                if (element instanceof JSFunction) {
-                    final JSFunction function = (JSFunction)element;
-                    if (function.isConstructor()) {
-                        return true; // SWC stubs have constructor methods :(
-                    }
+                @Override
+                @RequiredReadAction
+                public boolean execute(final PsiElement element, final ResolveState state) {
+                    if (element instanceof JSFunction function) {
+                        if (function.isConstructor()) {
+                            return true; // SWC stubs have constructor methods :(
+                        }
 
-                    final JSAttributeList attributeList = function.getAttributeList();
-                    if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE) {
-                        return true;
-                    }
+                        final JSAttributeList attributeList = function.getAttributeList();
+                        if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE) {
+                            return true;
+                        }
 
-                    Boolean filterValue;
-                    if (filter != null && (filterValue = filter.apply(function)) != null && !filterValue.booleanValue()) {
-                        return true;
-                    }
-                    final String s = function.getName();
-                    final Object function1 = functions.get(s);
+                        Boolean filterValue = filter != null ? filter.apply(function) : null;
+                        if (filterValue != null && !filterValue) {
+                            return true;
+                        }
+                        final String s = function.getName();
+                        final Object function1 = functions.get(s);
 
-                    if (function1 == null) {
-                        functions.put(s, function);
-                    }
-                    else if (function1 instanceof JSFunction) {
-                        final JSFunction function2 = (JSFunction)function1;
-                        if (findFunctionWithTheSameKind(functions, function, s) == null) {
-                            functions.put(s, new JSFunction[]{
-                                function2,
-                                function
-                            });
+                        if (function1 == null) {
+                            functions.put(s, function);
+                        }
+                        else if (function1 instanceof JSFunction function2) {
+                            if (findFunctionWithTheSameKind(functions, function, s) == null) {
+                                functions.put(s, new JSFunction[]{function2, function});
+                            }
                         }
                     }
+                    return true;
                 }
-                return true;
-            }
-        }, ResolveState.initial(), jsClass, jsClass);
+            },
+            ResolveState.initial(),
+            jsClass,
+            jsClass
+        );
         return functions;
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index 5131091a..d4364824 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -50,12 +50,11 @@
 import consulo.localize.LocalizeValue;
 import consulo.module.content.ProjectRootManager;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.util.lang.ref.Ref;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTagChild;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.*;
@@ -67,23 +66,26 @@ public class JSAnnotatingVisitor extends JSElementVisitor implements Annotator {
     private AnnotationHolder myHolder;
 
     @Override
-    public synchronized void annotate(PsiElement psiElement, AnnotationHolder holder) {
+    public synchronized void annotate(PsiElement psiElement, @Nonnull AnnotationHolder holder) {
         myHolder = holder;
         psiElement.accept(this);
         myHolder = null;
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair) {
         checkReferences(attributeNameValuePair, HighlightSeverity.ERROR);
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
         checkReferences(includeDirective, HighlightSeverity.ERROR);
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
         checkReferences(node, HighlightSeverity.ERROR);
     }
@@ -115,33 +117,38 @@ private void checkReferences(final PsiElement includeDirective, HighlightSeverit
         }
     }
 
+    @RequiredReadAction
     private boolean hasBadResolve(final PsiReference ref) {
-        if (ref instanceof PsiPolyVariantReference psiPolyVariantReference) {
-            return psiPolyVariantReference.multiResolve(false).length == 0;
-        }
-        return ref.resolve() == null;
+        return ref instanceof PsiPolyVariantReference psiPolyVariantReference
+            ? psiPolyVariantReference.multiResolve(false).length == 0
+            : ref.resolve() == null;
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSCallExpression(final JSCallExpression node) {
         final JSExpression methodExpression = node.getMethodExpression();
 
         if (methodExpression instanceof JSLiteralExpression) {
-            myHolder.createErrorAnnotation(methodExpression, JavaScriptLocalize.javascriptParserMessageExpectedFunctionName().get());
+            myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptParserMessageExpectedFunctionName())
+                .range(methodExpression);
         }
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSDocTagValue(final JSDocTagValue tagValue) {
         checkReferences(tagValue, HighlightSeverity.WARNING);
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSDocTag(final JSDocTag tagValue) {
         checkReferences(tagValue, HighlightSeverity.WARNING);
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSReferenceList(final JSReferenceList referenceList) {
         final JSClass jsClass = (JSClass)referenceList.getParent();
         if (JSResolveUtil.isArtificialClassUsedForReferenceList(jsClass)) {
@@ -152,14 +159,15 @@ public void visitJSReferenceList(final JSReferenceList referenceList) {
         final boolean withinImplements = jsClass.getImplementsList() == referenceList;
 
         if (withinImplements && jsClass.isInterface()) {
-            myHolder.createErrorAnnotation(
-                referenceList,
-                JavaScriptLocalize.javascriptValidationMessageImplementsForInterfaceNotAllowed().get()
-            );
+            myHolder.newAnnotation(
+                    HighlightSeverity.ERROR,
+                    JavaScriptLocalize.javascriptValidationMessageImplementsForInterfaceNotAllowed()
+                )
+                .range(referenceList);
             return;
         }
 
-        final Map<String, JSReferenceExpression> nameToExprMap = new HashMap<String, JSReferenceExpression>();
+        final Map<String, JSReferenceExpression> nameToExprMap = new HashMap<>();
 
         final JSReferenceExpression[] referenceExpressions = referenceList.getExpressions();
         if (referenceExpressions != null) {
@@ -172,23 +180,26 @@ public void visitJSReferenceList(final JSReferenceList referenceList) {
         }
 
         for (JSClass clazz : referenceList.getReferencedClasses()) {
-            final boolean b = clazz.isInterface();
+            final boolean isInterface = clazz.isInterface();
             final JSReferenceExpression expr = nameToExprMap.get(clazz.getName());
 
-            if (!b && withinImplements) {
-                myHolder.createErrorAnnotation(expr, JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere().get());
+            if (!isInterface && withinImplements) {
+                myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere())
+                    .range(expr);
             }
-            else if (withinExtends && b != jsClass.isInterface()) {
-                myHolder.createErrorAnnotation(
-                    expr,
-                    !b
-                        ? JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere().get()
-                        : JavaScriptLocalize.javascriptValidationMessageClassNameExpectedHere().get()
-                );
+            else if (withinExtends && isInterface != jsClass.isInterface()) {
+                myHolder.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        isInterface
+                            ? JavaScriptLocalize.javascriptValidationMessageClassNameExpectedHere()
+                            : JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere()
+                    )
+                    .range(expr);
             }
             if (clazz == jsClass) {
-                myHolder.createErrorAnnotation(expr, JavaScriptLocalize.javascriptValidationMessageCircularDependency().get())
-                    .registerFix(new RemoveASTNodeFix(referenceList.getNode(), JavaScriptLocalize.javascriptFixRemoveCircularDependency()));
+                myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageCircularDependency())
+                    .range(expr)
+                    .withFix(new RemoveASTNodeFix(referenceList.getNode(), JavaScriptLocalize.javascriptFixRemoveCircularDependency()));
             }
         }
 
@@ -198,14 +209,7 @@ else if (withinExtends && b != jsClass.isInterface()) {
     }
 
     public interface ErrorReportingClient {
-        enum ProblemKind {
-            ERROR,
-            WARNING
-        }
-
-        void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
-
-        void reportError(final PsiElement nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix);
+        AnnotationBuilder newAnnotation(@Nonnull HighlightSeverity severity, @Nonnull LocalizeValue message);
     }
 
     public static void checkImplementedMethods(final JSClass jsClass, final ErrorReportingClient reportingClient) {
@@ -213,6 +217,7 @@ public static void checkImplementedMethods(final JSClass jsClass, final ErrorRep
             ImplementMethodsFix implementMethodsFix = null;
 
             @Override
+            @RequiredReadAction
             protected void addNonimplementedFunction(final JSFunction function) {
                 final PsiElement node = myJsClass.getNameIdentifier();
                 if (node == null) {
@@ -222,29 +227,27 @@ protected void addNonimplementedFunction(final JSFunction function) {
                     implementMethodsFix = new ImplementMethodsFix(myJsClass);
                 }
                 implementMethodsFix.addElementToProcess(function);
-                reportingClient.reportError(
-                    node,
-                    JavaScriptLocalize.javascriptValidationMessageInterfaceMethodNotImplemented(
-                        function.getName(),
-                        ((JSClass)JSResolveUtil.findParent(function)).getQualifiedName()
-                    ).get(),
-                    ErrorReportingClient.ProblemKind.ERROR,
-                    implementMethodsFix
-                );
+                reportingClient.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        JavaScriptLocalize.javascriptValidationMessageInterfaceMethodNotImplemented(
+                            function.getName(),
+                            ((JSClass)JSResolveUtil.findParent(function)).getQualifiedName()
+                        )
+                    )
+                    .range(node)
+                    .withFix(implementMethodsFix);
             }
 
             @Override
+            @RequiredReadAction
             protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction) {
                 final JSAttributeList attributeList = implementationFunction.getAttributeList();
                 if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
                     final ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
-                    reportingClient.reportError(
-                        node,
-                        JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidAccessModifier().get(),
-                        ErrorReportingClient.ProblemKind.ERROR,
-                        null
-                        // TODO: quickfix
-                    );
+                    reportingClient.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidAccessModifier()
+                    ).range(node); // TODO: quickfix
                 }
 
                 final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(implementationFunction, interfaceFunction);
@@ -264,28 +267,26 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
                     if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
                         final JSParameterList parameterList = implementationFunction.getParameterList();
                         final JSParameterList expectedParameterList = interfaceFunction.getParameterList();
-                        reportingClient.reportError(
-                            parameterList.getNode(),
+                        reportingClient.newAnnotation(
+                            HighlightSeverity.ERROR,
                             JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature(
                                 expectedParameterList != null ? expectedParameterList.getText() : "()"
-                            ).get(),
-                            ErrorReportingClient.ProblemKind.ERROR,
-                            null
-                        );  // TODO: quickfix
+                            )
+                        ).range(parameterList.getNode()); // TODO: quickfix
                     }
                     else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
                         PsiElement implementationReturnTypeExpr = implementationFunction.getReturnTypeElement();
                         PsiElement interfaceReturnTypeExpr = interfaceFunction.getReturnTypeElement();
-                        reportingClient.reportError(
-                            implementationReturnTypeExpr != null
-                                ? implementationReturnTypeExpr
-                                : implementationFunction.getNameIdentifier(),
+                        reportingClient.newAnnotation(
+                            HighlightSeverity.ERROR,
                             JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature2(
                                 interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"
-                            ).get(),
-                            ErrorReportingClient.ProblemKind.ERROR,
-                            null
-                        );  // TODO: quickfix
+                            )
+                        ).range(
+                            implementationReturnTypeExpr != null
+                                ? implementationReturnTypeExpr
+                                : implementationFunction.getNameIdentifier()
+                        ); // TODO: quickfix
                     }
                 }
             }
@@ -305,6 +306,7 @@ private static ASTNode findElementForAccessModifierError(final @Nonnull JSFuncti
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSAttributeList(JSAttributeList attributeList) {
         PsiElement parentForCheckingNsOrAccessModifier = null;
 
@@ -316,20 +318,22 @@ public void visitJSAttributeList(JSAttributeList attributeList) {
             namespaceOrAccessModifierElement = accessTypeElement;
         }
         else if (accessTypeElement != null) {
-            myHolder.createErrorAnnotation(
-                    namespaceOrAccessModifierElement,
-                    JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier().get()
+            myHolder.newAnnotation(
+                    HighlightSeverity.ERROR,
+                    JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier()
                 )
-                .registerFix(new RemoveASTNodeFix(
+                .range(namespaceOrAccessModifierElement)
+                .withFix(new RemoveASTNodeFix(
                     namespaceOrAccessModifierElement.getNode(),
                     JavaScriptLocalize.javascriptFixRemoveNamespaceReference()
                 ));
 
-            myHolder.createErrorAnnotation(
-                    accessTypeElement,
-                    JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier().get()
+            myHolder.newAnnotation(
+                    HighlightSeverity.ERROR,
+                    JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier()
                 )
-                .registerFix(new RemoveASTNodeFix(accessTypeElement.getNode(), JavaScriptLocalize.javascriptFixRemoveNamespaceReference()));
+                .range(accessTypeElement)
+                .withFix(new RemoveASTNodeFix(accessTypeElement.getNode(), JavaScriptLocalize.javascriptFixRemoveNamespaceReference()));
         }
 
         if (namespaceOrAccessModifierElement != null) {
@@ -344,15 +348,16 @@ else if (accessTypeElement != null) {
                     || (!"public".equals(typeElementText = namespaceOrAccessModifierElement.getText()))
                     && !"internal".equals(typeElementText))) {
                     boolean nsRef = namespaceOrAccessModifierElement instanceof JSReferenceExpression;
-                    myHolder.createErrorAnnotation(
-                            namespaceOrAccessModifierElement,
+                    myHolder.newAnnotation(
+                            HighlightSeverity.ERROR,
                             nodeUnderPackage ?
-                                JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForPackageMembers().get()
+                                JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForPackageMembers()
                                 : nsRef
-                                ? JavaScriptLocalize.javascriptValidationMessageNamespaceAllowedOnlyForClassMembers().get()
-                                : JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForClassMembers().get()
+                                ? JavaScriptLocalize.javascriptValidationMessageNamespaceAllowedOnlyForClassMembers()
+                                : JavaScriptLocalize.javascriptValidationMessageAccessModifierAllowedOnlyForClassMembers()
                         )
-                        .registerFix(new RemoveASTNodeFix(
+                        .range(namespaceOrAccessModifierElement)
+                        .withFix(new RemoveASTNodeFix(
                             namespaceOrAccessModifierElement.getNode(),
                             nsRef
                                 ? JavaScriptLocalize.javascriptFixRemoveNamespaceReference()
@@ -365,18 +370,19 @@ else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
                     || attributeList.getNode().findChildByType(JSTokenTypes.INTERNAL_KEYWORD) != null
                 ) {
                     final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.ACCESS_MODIFIERS);
-                    final Annotation annotation = myHolder.createErrorAnnotation(
-                        astNode,
-                        JavaScriptLocalize.javascriptValidationMessageInterfaceMembersCannotHaveAccessModifiers().get()
-                    );
-
-                    annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveAccessModifier()));
+                    myHolder.newAnnotation(
+                            HighlightSeverity.ERROR,
+                            JavaScriptLocalize.javascriptValidationMessageInterfaceMembersCannotHaveAccessModifiers()
+                        )
+                        .range(astNode)
+                        .withFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveAccessModifier()));
                 }
             }
         }
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSReferenceExpression(final JSReferenceExpression node) {
         final PsiElement parent = node.getParent();
 
@@ -409,19 +415,21 @@ else if (function.isSetProperty()) {
 
                         if (typeString != null && !"void".equals(typeString)) {
                             // TODO: fix!
-                            myHolder.createErrorAnnotation(
-                                function.getReturnTypeElement(),
-                                JavaScriptLocalize.javascriptValidationMessageSetMethodShouldBeVoidOrWithoutType().get()
-                            );
+                            myHolder.newAnnotation(
+                                    HighlightSeverity.ERROR,
+                                    JavaScriptLocalize.javascriptValidationMessageSetMethodShouldBeVoidOrWithoutType()
+                                )
+                                .range(function.getReturnTypeElement());
                         }
 
                         JSParameterList parameterList = function.getParameterList();
                         if (parameterList != null && parameterList.getParameters().length != 1) {
                             // TODO: fix!
-                            myHolder.createErrorAnnotation(
-                                parameterList,
-                                JavaScriptLocalize.javascriptValidationMessageSetMethodShouldHaveOneParameter().get()
-                            );
+                            myHolder.newAnnotation(
+                                    HighlightSeverity.ERROR,
+                                    JavaScriptLocalize.javascriptValidationMessageSetMethodShouldHaveOneParameter()
+                                )
+                                .range(parameterList);
                         }
                     }
                     else if (function.isGetProperty()) {
@@ -429,20 +437,23 @@ else if (function.isGetProperty()) {
 
                         if (typeString == null || "void".equals(typeString)) {
                             // TODO: fix!
-                            myHolder.createErrorAnnotation(
-                                typeString != null ? function.getReturnTypeElement() : nameIdentifier,
-                                JavaScriptLocalize
-                                    .javascriptValidationMessageGetMethodShouldBeValidType(typeString != null ? typeString : "empty").get()
-                            );
+                            myHolder.newAnnotation(
+                                    HighlightSeverity.ERROR,
+                                    JavaScriptLocalize.javascriptValidationMessageGetMethodShouldBeValidType(
+                                        typeString != null ? typeString : "empty"
+                                    )
+                                )
+                                .range(typeString != null ? function.getReturnTypeElement() : nameIdentifier);
                         }
 
                         JSParameterList parameterList = function.getParameterList();
                         if (parameterList != null && parameterList.getParameters().length != 0) {
                             // TODO: fix!
-                            myHolder.createErrorAnnotation(
-                                parameterList,
-                                JavaScriptLocalize.javascriptValidationMessageGetMethodShouldHaveNoParameter().get()
-                            );
+                            myHolder.newAnnotation(
+                                    HighlightSeverity.ERROR,
+                                    JavaScriptLocalize.javascriptValidationMessageGetMethodShouldHaveNoParameter()
+                                )
+                                .range(parameterList);
                         }
                     }
                 }
@@ -455,10 +466,11 @@ else if (function.isGetProperty()) {
 
                     PsiElement clazzParent = jsClass.getParent();
                     if (!(clazzParent instanceof JSPackageStatement || clazzParent instanceof JSFile)) {
-                        myHolder.createErrorAnnotation(
-                            node,
-                            JavaScriptLocalize.javascriptValidationMessageNestedClassesAreNotAllowed().get()
-                        );
+                        myHolder.newAnnotation(
+                                HighlightSeverity.ERROR,
+                                JavaScriptLocalize.javascriptValidationMessageNestedClassesAreNotAllowed()
+                            )
+                            .range(node);
                     }
                 }
             }
@@ -467,17 +479,19 @@ else if (function.isGetProperty()) {
         if (node.getQualifier() == null && !(parent instanceof JSCallExpression) && "arguments".equals(node.getText())) {
             JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
             if (fun == null) {
-                myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageArgumentsOutOfFunction().get());
+                myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageArgumentsOutOfFunction())
+                    .range(node);
             }
             else {
                 JSParameterList parameterList = fun.getParameterList();
                 if (parameterList != null) {
                     for (JSParameter p : parameterList.getParameters()) {
                         if (p.isRest()) {
-                            myHolder.createErrorAnnotation(
-                                node,
-                                JavaScriptLocalize.javascriptValidationMessageArgumentsWithRestParameter().get()
-                            );
+                            myHolder.newAnnotation(
+                                    HighlightSeverity.ERROR,
+                                    JavaScriptLocalize.javascriptValidationMessageArgumentsWithRestParameter()
+                                )
+                                .range(node);
                         }
                     }
                 }
@@ -485,31 +499,28 @@ else if (function.isGetProperty()) {
         }
     }
 
+    @RequiredReadAction
     private void checkMissedSuperCall(JSReferenceExpression node, JSFunction constructor, JSClass jsClass) {
         if (jsClass.isInterface()) {
             return;
         }
         JSFunction nontrivialSuperClassConstructor = getNontrivialSuperClassConstructor(jsClass);
 
-        if (nontrivialSuperClassConstructor != null) {
-            Annotation annotation = null;
-
-            if (!hasSuperConstructorCall(constructor)) {
-                annotation =
-                    myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageMissedSuperConstructorCall().get());
-            }
-
-            if (annotation != null) {
-                if (constructor == null) {
-                    annotation.registerFix(new AddConstructorAndSuperInvokationFix(node, nontrivialSuperClassConstructor));
-                }
-                else {
-                    annotation.registerFix(new AddSuperInvokationFix(node, nontrivialSuperClassConstructor));
-                }
-            }
+        if (nontrivialSuperClassConstructor != null && !hasSuperConstructorCall(constructor)) {
+            myHolder.newAnnotation(
+                    HighlightSeverity.ERROR,
+                    JavaScriptLocalize.javascriptValidationMessageMissedSuperConstructorCall()
+                )
+                .range(node)
+                .withFix(
+                    constructor == null
+                        ? new AddConstructorAndSuperInvokationFix(node, nontrivialSuperClassConstructor)
+                        : new AddSuperInvokationFix(node, nontrivialSuperClassConstructor)
+                );
         }
     }
 
+    @RequiredReadAction
     private boolean hasSuperConstructorCall(JSFunction jsFunction) {
         if (jsFunction == null) {
             return false;
@@ -528,6 +539,7 @@ private boolean hasSuperConstructorCall(JSFunction jsFunction) {
         return false;
     }
 
+    @RequiredReadAction
     public static JSFunction getNontrivialSuperClassConstructor(JSClass clazz) {
         final JSClass[] classes = clazz.getSuperClasses();
 
@@ -551,6 +563,7 @@ public static JSFunction getNontrivialSuperClassConstructor(JSClass clazz) {
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSParameterList(JSParameterList node) {
         boolean foundRest = false;
         boolean initializerPresent = false;
@@ -563,18 +576,20 @@ public void visitJSParameterList(JSParameterList node) {
                 initializerPresent = true;
             }
             else if (!hasInitializer && initializerPresent && !parameter.isRest()) {
-                myHolder.createErrorAnnotation(
-                        parameter,
-                        JavaScriptLocalize.javascriptValidationMessageParameterShouldBeInitialized().get()
+                myHolder.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        JavaScriptLocalize.javascriptValidationMessageParameterShouldBeInitialized()
                     )
-                    .registerFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
+                    .range(parameter)
+                    .withFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
             }
             else if (hasInitializer && parameter.isRest()) {
-                myHolder.createErrorAnnotation(
-                        parameter,
-                        JavaScriptLocalize.javascriptValidationMessageRestParameterShouldNotBeInitialized().get()
+                myHolder.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        JavaScriptLocalize.javascriptValidationMessageRestParameterShouldNotBeInitialized()
                     )
-                    .registerFix(new RemoveASTNodeFix(
+                    .range(parameter)
+                    .withFix(new RemoveASTNodeFix(
                         JavaScriptLocalize.javascriptFixRemoveInitializer(),
                         getNodesBefore(initializer, JSTokenTypes.EQ)
                     ));
@@ -584,26 +599,29 @@ else if (hasInitializer && parameter.isRest()) {
                 foundRest = true;
                 PsiElement typeElement = parameter.getTypeElement();
                 if (typeElement != null && !"Array".equals(typeElement.getText())) {
-                    myHolder.createErrorAnnotation(
-                            typeElement,
-                            JavaScriptLocalize.javascriptValidationMessageUnexpectedTypeForRestParameter().get()
+                    myHolder.newAnnotation(
+                            HighlightSeverity.ERROR,
+                            JavaScriptLocalize.javascriptValidationMessageUnexpectedTypeForRestParameter()
                         )
-                        .registerFix(new RemoveASTNodeFix(
+                        .range(typeElement)
+                        .withFix(new RemoveASTNodeFix(
                             JavaScriptLocalize.javascriptFixRemoveTypeReference(),
                             getNodesBefore(typeElement, JSTokenTypes.COLON)
                         ));
                 }
             }
             else if (foundRest) {
-                myHolder.createErrorAnnotation(
-                        parameter,
-                        JavaScriptLocalize.javascriptValidationMessageParameterIsNotAllowedAfterRestParameter().get()
+                myHolder.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        JavaScriptLocalize.javascriptValidationMessageParameterIsNotAllowedAfterRestParameter()
                     )
-                    .registerFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
+                    .range(parameter)
+                    .withFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
             }
         }
     }
 
+    @RequiredReadAction
     private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq) {
         List<ASTNode> nodes = new ArrayList<>();
         PsiElement element = initializer.getPrevSibling();
@@ -623,13 +641,15 @@ private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq)
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
         for (PsiElement el = packageStatement.getPrevSibling(); el != null; el = el.getPrevSibling()) {
             if (!(el instanceof PsiWhiteSpace || el instanceof PsiComment)) {
-                myHolder.createErrorAnnotation(
-                    packageStatement.getFirstChild().getNode(),
-                    JavaScriptLocalize.javascriptValidationMessagePackageShouldbeFirstStatement().get()
-                );
+                myHolder.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        JavaScriptLocalize.javascriptValidationMessagePackageShouldbeFirstStatement()
+                    )
+                    .range(packageStatement.getFirstChild().getNode());
                 break;
             }
         }
@@ -640,6 +660,7 @@ public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSAssignmentExpression(final JSAssignmentExpression expression) {
         JSExpression lExpr = expression.getLOperand();
         if (lExpr == null) {
@@ -652,16 +673,19 @@ public void visitJSAssignmentExpression(final JSAssignmentExpression expression)
         if (lExpr instanceof JSReferenceExpression lRefExpr) {
             PsiElement resolved = lRefExpr.resolve();
             if (resolved instanceof JSVariable variable && variable.isConst()) {
-                myHolder.createErrorAnnotation(lExpr, JavaScriptLocalize.javascriptValidationMessageAssignmentToConst().get());
+                myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageAssignmentToConst())
+                    .range(lExpr);
             }
         }
 
         if (!JSUtils.isLHSExpression(lExpr)) {
-            myHolder.createErrorAnnotation(lExpr, JavaScriptLocalize.javascriptValidationMessageMustBeLvalue().get());
+            myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageMustBeLvalue())
+                .range(lExpr);
         }
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
         final PsiElement lastChild = node.getLastChild();
         PsiElement child = lastChild != null ? lastChild.getPrevSibling() : null;
@@ -671,13 +695,14 @@ public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
         ASTNode childNode;
 
         if (child != null && (childNode = child.getNode()) != null && childNode.getElementType() == JSTokenTypes.COMMA) {
-            final Annotation annotation =
-                myHolder.createWarningAnnotation(child, JavaScriptLocalize.javascriptValidationMessageUnneededComma().get());
-            annotation.registerFix(new RemoveASTNodeFix(childNode, JavaScriptLocalize.javascriptValidationMessageRemoveUnneededCommaFix()));
+            myHolder.newAnnotation(HighlightSeverity.WARNING, JavaScriptLocalize.javascriptValidationMessageUnneededComma())
+                .range(child)
+                .withFix(new RemoveASTNodeFix(childNode, JavaScriptLocalize.javascriptValidationMessageRemoveUnneededCommaFix()));
         }
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSTryStatement(final JSTryStatement node) {
         final JSCatchBlock[] blocks = node.getAllCatchBlocks();
 
@@ -696,12 +721,12 @@ public void visitJSTryStatement(final JSTryStatement node) {
                 }
 
                 if (typeToCatch.contains(s)) {
-                    final Annotation annotation =
-                        myHolder.createErrorAnnotation(block, JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlock().get());
-                    annotation.registerFix(new RemoveASTNodeFix(
-                        block.getNode(),
-                        JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlockFix()
-                    ));
+                    myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlock())
+                        .range(block)
+                        .withFix(new RemoveASTNodeFix(
+                            block.getNode(),
+                            JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlockFix()
+                        ));
                 }
                 else {
                     typeToCatch.add(s);
@@ -711,6 +736,7 @@ public void visitJSTryStatement(final JSTryStatement node) {
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSVariable(final JSVariable var) {
         if (var.isConst() && var.getInitializer() == null) {
             if (var.getParent() instanceof JSVarStatement varStatement && varStatement.getParent() instanceof JSForInStatement) {
@@ -719,10 +745,11 @@ public void visitJSVariable(final JSVariable var) {
 
             JSAttributeList attributeList = var.getAttributeList();
             if (attributeList == null || attributeList.getAttributesByName("Embed").length == 0) {
-                myHolder.createWarningAnnotation(
-                    var,
-                    JavaScriptLocalize.javascriptValidationMessageConstVariableWithoutInitializer().get()
-                );
+                myHolder.newAnnotation(
+                        HighlightSeverity.WARNING,
+                        JavaScriptLocalize.javascriptValidationMessageConstVariableWithoutInitializer()
+                    )
+                    .range(var);
             }
         }
 
@@ -732,28 +759,32 @@ public void visitJSVariable(final JSVariable var) {
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSContinueStatement(final JSContinueStatement node) {
         if (node.getStatementToContinue() == null) {
-            myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageContinueWithoutTarget().get());
+            myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageContinueWithoutTarget())
+                .range(node);
         }
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSBreakStatement(final JSBreakStatement node) {
         if (node.getStatementToBreak() == null) {
-            myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageBreakWithoutTarget().get());
+            myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageBreakWithoutTarget())
+                .range(node);
         }
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSThisExpression(final JSThisExpression node) {
         checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageThisReferencedFromStaticContext());
     }
 
-    private void checkClassReferenceInStaticContext(
-        final JSExpression node,
-        LocalizeValue message
-    ) {
+    @RequiredReadAction
+    @SuppressWarnings("unchecked")
+    private void checkClassReferenceInStaticContext(final JSExpression node, LocalizeValue message) {
         PsiElement element = PsiTreeUtil.getParentOfType(
             node,
             JSFunction.class,
@@ -766,7 +797,8 @@ private void checkClassReferenceInStaticContext(
         if (element instanceof JSFunction function) {
             final JSAttributeList attributeList = function.getAttributeList();
             if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
-                myHolder.createErrorAnnotation(node, message.get());
+                myHolder.newAnnotation(HighlightSeverity.ERROR, message)
+                    .range(node);
                 return;
             }
         }
@@ -778,19 +810,22 @@ private void checkClassReferenceInStaticContext(
         PsiElement elementParent = element != null ? element.getParent() : null;
         if (element == null
             || !(elementParent instanceof JSClass || elementParent instanceof JSFile && elementParent.getContext() != null)) {
-            myHolder.createErrorAnnotation(
-                node,
-                JavaScriptLocalize.javascriptValidationMessageSuperReferencedWithoutClassInstanceContext().get()
-            );
+            myHolder.newAnnotation(
+                    HighlightSeverity.ERROR,
+                    JavaScriptLocalize.javascriptValidationMessageSuperReferencedWithoutClassInstanceContext()
+                )
+                .range(node);
         }
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSSuperExpression(final JSSuperExpression node) {
         checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageSuperReferencedFromStaticContext());
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSFunctionDeclaration(final JSFunction node) {
         final PsiElement nameIdentifier = node.getNameIdentifier();
         if (nameIdentifier == null) {
@@ -803,12 +838,12 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
 
             if (parent instanceof JSClass jsClass && node.getName().equals(jsClass.getName())
                 && JavaScriptSupportLoader.isFlexMxmFile(parent.getContainingFile())) {
-                final Annotation annotation = myHolder.createErrorAnnotation(
-                    nameIdentifier,
-                    JavaScriptLocalize.javascriptValidationMessageConstructorInMxmlIsNotAllowed().get()
-                );
-
-                annotation.registerFix(new RemoveASTNodeFix(node.getNode(), JavaScriptLocalize.javascriptFixRemoveConstructor()));
+                myHolder.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        JavaScriptLocalize.javascriptValidationMessageConstructorInMxmlIsNotAllowed()
+                    )
+                    .range(nameIdentifier)
+                    .withFix(new RemoveASTNodeFix(node.getNode(), JavaScriptLocalize.javascriptFixRemoveConstructor()));
             }
         }
 
@@ -823,46 +858,53 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
                 && (attributeList.getAccessType() != JSAttributeList.AccessType.PRIVATE
                 || attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)))) {
                 final String qName = clazz.getQualifiedName();
-                final boolean hasOverride =
-                    attributeList != null ? attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE) : false;
+                final boolean hasOverride = attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE);
 
                 final Ref<JSFunction> set = new Ref<>();
-                boolean b = JSResolveUtil.iterateType(node, parent, qName, (processor, scope, className) -> {
-                    if (qName == className || (qName != null && qName.equals(className))) {
-                        return true;
-                    }
-                    set.set((JSFunction)processor.getResult());
-                    if ("Object".equals(className)) {
-                        if (hasOverride && !attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)) { /*native modifier is written always*/
-                            final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
-                            final Annotation annotation = myHolder.createErrorAnnotation(
-                                astNode,
-                                JavaScriptLocalize.javascriptValidationMessageFunctionOverrideForObjectMethod().get()
-                            );
-
-                            annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
+                boolean b = JSResolveUtil.iterateType(
+                    node,
+                    parent,
+                    qName,
+                    (processor, scope, className) -> {
+                        if (qName == className || (qName != null && qName.equals(className))) {
+                            return true;
+                        }
+                        set.set((JSFunction)processor.getResult());
+                        if ("Object".equals(className)) {
+                            /*native modifier is written always*/
+                            if (hasOverride && !attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)) {
+                                final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
+                                //noinspection RequiredXAction
+                                myHolder.newAnnotation(
+                                        HighlightSeverity.ERROR,
+                                        JavaScriptLocalize.javascriptValidationMessageFunctionOverrideForObjectMethod()
+                                    )
+                                    .range(astNode)
+                                    .withFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
+                            }
+                            return false;
+                        }
+                        else if (!hasOverride) {
+                            //noinspection RequiredXAction
+                            myHolder.newAnnotation(
+                                    HighlightSeverity.ERROR,
+                                    JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutOverrideModifier(className)
+                                )
+                                .range(nameIdentifier)
+                                .withFix(new AddOverrideIntentionAction(node));
                         }
                         return false;
                     }
-                    else if (!hasOverride) {
-                        final Annotation annotation = myHolder.createErrorAnnotation(
-                            nameIdentifier,
-                            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutOverrideModifier(className).get()
-                        );
-
-                        annotation.registerFix(new AddOverrideIntentionAction(node));
-                    }
-                    return false;
-                });
+                );
 
                 if (b && hasOverride) {
                     final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
-                    final Annotation annotation = myHolder.createErrorAnnotation(
-                        astNode,
-                        JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutParentMethod().get()
-                    );
-
-                    annotation.registerFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
+                    myHolder.newAnnotation(
+                            HighlightSeverity.ERROR,
+                            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutParentMethod()
+                        )
+                        .range(astNode)
+                        .withFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
                 }
 
                 if (!b && hasOverride) {
@@ -870,20 +912,20 @@ else if (!hasOverride) {
                     final JSAttributeList overrideAttrList = override.getAttributeList();
                     String overrideNs = null;
 
-                    if ((overrideAttrList == null && (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL)) ||
-                        (overrideAttrList != null && attributeList.getAccessType() != overrideAttrList.getAccessType()) ||
-                        overrideAttrList != null && (overrideNs =
-                            overrideAttrList.getNamespace()) != null && !overrideNs.equals(attributeList.getNamespace())) {
-                        final Annotation annotation1 = myHolder.createErrorAnnotation(
-                            findElementForAccessModifierError(node, attributeList),
-                            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleAccessModifier(
-                                overrideNs != null ? overrideNs : (
-                                    overrideAttrList != null
-                                        ? overrideAttrList.getAccessType()
-                                        : JSAttributeList.AccessType.PACKAGE_LOCAL
-                                ).toString().toLowerCase()
-                            ).get()
-                        );
+                    if ((overrideAttrList == null && (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL))
+                        || (overrideAttrList != null && attributeList.getAccessType() != overrideAttrList.getAccessType())
+                        || overrideAttrList != null
+                            && (overrideNs = overrideAttrList.getNamespace()) != null && !overrideNs.equals(attributeList.getNamespace())) {
+                        String accessType = overrideNs != null ? overrideNs : (
+                            overrideAttrList != null
+                                ? overrideAttrList.getAccessType()
+                                : JSAttributeList.AccessType.PACKAGE_LOCAL
+                        ).toString().toLowerCase();
+                        myHolder.newAnnotation(
+                                HighlightSeverity.ERROR,
+                                JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleAccessModifier(accessType)
+                            )
+                            .range(findElementForAccessModifierError(node, attributeList));
 
                         // TODO: quickfix
                         //annotation.registerFix(
@@ -897,12 +939,12 @@ else if (!hasOverride) {
                         final JSParameterList nodeParameterList = node.getParameterList();
                         final JSParameterList overrideParameterList = override.getParameterList();
 
-                        final Annotation annotation = myHolder.createErrorAnnotation(
-                            nodeParameterList != null ? nodeParameterList : node.getNameIdentifier(),
-                            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature(
-                                overrideParameterList != null ? overrideParameterList.getText() : "()"
-                            ).get()
-                        );
+                        String params = overrideParameterList != null ? overrideParameterList.getText() : "()";
+                        myHolder.newAnnotation(
+                                HighlightSeverity.ERROR,
+                                JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature(params)
+                            )
+                            .range(nodeParameterList != null ? nodeParameterList : node.getNameIdentifier());
 
                         // TODO: quickfix
                         //annotation.registerFix(
@@ -912,12 +954,12 @@ else if (!hasOverride) {
                     else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
                         PsiElement returnTypeExpr = node.getReturnTypeElement();
                         PsiElement overrideReturnTypeExpr = override.getReturnTypeElement();
-                        final Annotation annotation = myHolder.createErrorAnnotation(
-                            returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier(),
-                            JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature2(
-                                overrideReturnTypeExpr != null ? overrideReturnTypeExpr.getText() : "*"
-                            ).get()
-                        );
+                        String retType = overrideReturnTypeExpr != null ? overrideReturnTypeExpr.getText() : "*";
+                        myHolder.newAnnotation(
+                                HighlightSeverity.ERROR,
+                                JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature2(retType)
+                            )
+                            .range(returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier());
 
                         // TODO: quickfix
                         //annotation.registerFix(
@@ -935,16 +977,18 @@ enum SignatureMatchResult {
         COMPATIBLE_SIGNATURE
     }
 
+    @RequiredReadAction
     private static SignatureMatchResult checkCompatibleSignature(final JSFunction fun, final JSFunction override) {
         JSParameterList nodeParameterList = fun.getParameterList();
         JSParameterList overrideParameterList = override.getParameterList();
         final JSParameter[] parameters = nodeParameterList != null ? nodeParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
-        final JSParameter[] overrideParameters =
-            overrideParameterList != null ? overrideParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
+        final JSParameter[] overrideParameters = overrideParameterList != null
+            ? overrideParameterList.getParameters()
+            : JSParameter.EMPTY_ARRAY;
 
-        SignatureMatchResult result =
-            parameters.length != overrideParameters.length ? SignatureMatchResult.PARAMETERS_DIFFERS : SignatureMatchResult
-                .COMPATIBLE_SIGNATURE;
+        SignatureMatchResult result = parameters.length != overrideParameters.length
+            ? SignatureMatchResult.PARAMETERS_DIFFERS
+            : SignatureMatchResult.COMPATIBLE_SIGNATURE;
 
         if (result == SignatureMatchResult.COMPATIBLE_SIGNATURE) {
             for (int i = 0; i < parameters.length; ++i) {
@@ -960,10 +1004,9 @@ private static SignatureMatchResult checkCompatibleSignature(final JSFunction fu
             }
         }
 
-        if (result == SignatureMatchResult.COMPATIBLE_SIGNATURE) {
-            if (!compatibleType(override.getReturnTypeString(), fun.getReturnTypeString(), override, fun)) {
-                result = SignatureMatchResult.RETURN_TYPE_DIFFERS;
-            }
+        if (result == SignatureMatchResult.COMPATIBLE_SIGNATURE
+            && !compatibleType(override.getReturnTypeString(), fun.getReturnTypeString(), override, fun)) {
+            result = SignatureMatchResult.RETURN_TYPE_DIFFERS;
         }
         return result;
     }
@@ -989,6 +1032,8 @@ else if (overrideParameterType == null && parameterType != null && !"*".equals(p
     }
 
     @Override
+    @RequiredReadAction
+    @SuppressWarnings("unchecked")
     public void visitJSReturnStatement(final JSReturnStatement node) {
         final PsiElement element = PsiTreeUtil.getParentOfType(
             node,
@@ -1000,21 +1045,24 @@ public void visitJSReturnStatement(final JSReturnStatement node) {
         );
         if ((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost))
             || (element instanceof XmlTagChild && !(element.getParent() instanceof XmlAttributeValue))) {
-            myHolder.createErrorAnnotation(node, JavaScriptLocalize.javascriptValidationMessageReturnOutsideFunctionDefinition().get());
+            myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageReturnOutsideFunctionDefinition())
+                .range(node);
         }
 
         if (element instanceof JSFunction function) {
-            final @NonNls String typeString = function.getReturnTypeString();
+            final String typeString = function.getReturnTypeString();
             if (typeString != null && !"void".equals(typeString) && node.getExpression() == null) {
-                myHolder.createErrorAnnotation(
-                    node,
-                    JavaScriptLocalize.javascriptValidationMessageReturnValueOfTypeIsRequired(typeString).get()
-                );
+                myHolder.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        JavaScriptLocalize.javascriptValidationMessageReturnValueOfTypeIsRequired(typeString)
+                    )
+                    .range(node);
             }
         }
     }
 
     @Override
+    @RequiredReadAction
     public void visitJSLabeledStatement(final JSLabeledStatement node) {
         final String label = node.getLabel();
         if (label != null) {
@@ -1022,10 +1070,8 @@ public void visitJSLabeledStatement(final JSLabeledStatement node) {
             while (run != null) {
                 if (run instanceof JSLabeledStatement labeledStatement) {
                     if (label.equals(labeledStatement.getLabel())) {
-                        myHolder.createErrorAnnotation(
-                            node.getLabelIdentifier(),
-                            JavaScriptLocalize.javascriptValidationMessageDuplicateLabel().get()
-                        );
+                        myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageDuplicateLabel())
+                            .range(node.getNameIdentifier());
                         break;
                     }
                 }
@@ -1038,6 +1084,7 @@ public void visitJSLabeledStatement(final JSLabeledStatement node) {
         }
     }
 
+    @RequiredReadAction
     private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass) {
         final PsiFile containingFile = aClass.getContainingFile();
 
@@ -1059,9 +1106,9 @@ private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass)
                     : aClass instanceof JSVariable
                     ? JavaScriptLocalize.javascriptValidationMessageVariableShouldBeInFile(name, nameWithExtension)
                     : JavaScriptLocalize.javascriptValidationMessageFunctionShouldBeInFile(name, nameWithExtension);
-                final Annotation annotation = myHolder.createErrorAnnotation(node, message.get());
-
-                annotation.registerFix(new RenameFileFix(nameWithExtension));
+                myHolder.newAnnotation(HighlightSeverity.ERROR, message)
+                    .range(node)
+                    .withFix(new RenameFileFix(nameWithExtension));
     /*annotation.registerFix(new RenamePublicClassFix(aClass) {
           final String text;
           final String familyName;
@@ -1094,6 +1141,7 @@ private String getTerm(String message) {
         return term;
     }
 
+    @RequiredReadAction
     public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorReportingClient client) {
         PsiElement nameIdentifier = aClass.getNameIdentifier();
         if (nameIdentifier == null) {
@@ -1109,15 +1157,12 @@ public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorRe
             ProjectRootManager.getInstance(containingFile.getProject()).getFileIndex().getSourceRootForFile(file);
 
         if (rootForFile == null) {
-            client.reportError(
-                nameIdentifier.getNode(),
-                JavaScriptLocalize.javascriptValidationMessageFileShouldBeUnderSourceRoot().get(),
-                ErrorReportingClient.ProblemKind.WARNING,
-                null
-            );
+            client.newAnnotation(HighlightSeverity.WARNING, JavaScriptLocalize.javascriptValidationMessageFileShouldBeUnderSourceRoot())
+                .range(nameIdentifier.getNode());
         }
     }
 
+    @RequiredReadAction
     private void checkPackageStatement(final JSPackageStatement packageStatement) {
         final String s = packageStatement.getQualifiedName();
 
@@ -1130,33 +1175,31 @@ private void checkPackageStatement(final JSPackageStatement packageStatement) {
 
         if (expected != null && ((s == null && expected.length() != 0) || (s != null && !expected.equals(s)))) {
             final PsiElement nameIdentifier = packageStatement.getNameIdentifier();
-            final Annotation annotation = myHolder.createErrorAnnotation(
-                nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild(),
-                JavaScriptLocalize.javascriptValidationMessageIncorrectPackageName(s, expected).get()
-            );
-            annotation.registerFix(new SyntheticIntentionAction() {
-                @Override
-                @Nonnull
-                public String getText() {
-                    return JavaScriptLocalize.javascriptFixPackageName(expected).get();
-                }
+            myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageIncorrectPackageName(s, expected))
+                .range(nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild())
+                .withFix(new SyntheticIntentionAction() {
+                    @Nonnull
+                    @Override
+                    public String getText() {
+                        return JavaScriptLocalize.javascriptFixPackageName(expected).get();
+                    }
 
-                @Override
-                public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
-                    return packageStatement.isValid();
-                }
+                    @Override
+                    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+                        return packageStatement.isValid();
+                    }
 
-                @Override
-                public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
-                    throws IncorrectOperationException {
-                    JSPackageStatementImpl.doChangeName(project, packageStatement, expected);
-                }
+                    @Override
+                    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
+                        throws IncorrectOperationException {
+                        JSPackageStatementImpl.doChangeName(project, packageStatement, expected);
+                    }
 
-                @Override
-                public boolean startInWriteAction() {
-                    return true;
-                }
-            });
+                    @Override
+                    public boolean startInWriteAction() {
+                        return true;
+                    }
+                });
         }
 
         final Set<JSNamedElement> elements = new HashSet<>();
@@ -1170,11 +1213,12 @@ public boolean startInWriteAction() {
         if (elements.size() > 1) {
             for (JSNamedElement el : elements) {
                 final PsiElement nameIdentifier = el.getNameIdentifier();
-                myHolder.createErrorAnnotation(
-                        nameIdentifier != null ? nameIdentifier : el.getFirstChild(),
-                        JavaScriptLocalize.javascriptValidationMessageMoreThanOneExternallyVisibleSymbol().get()
+                myHolder.newAnnotation(
+                        HighlightSeverity.ERROR,
+                        JavaScriptLocalize.javascriptValidationMessageMoreThanOneExternallyVisibleSymbol()
                     )
-                    .registerFix(new RemoveASTNodeFix(el.getNode(), JavaScriptLocalize.javascriptFixRemoveExternallyVisibleSymbol()));
+                    .range(nameIdentifier != null ? nameIdentifier : el.getFirstChild())
+                    .withFix(new RemoveASTNodeFix(el.getNode(), JavaScriptLocalize.javascriptFixRemoveExternallyVisibleSymbol()));
             }
         }
 
@@ -1213,6 +1257,7 @@ public String getFamilyName() {
         }
 
         @Override
+        @RequiredUIAccess
         public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
             invoke(project, null, descriptor.getPsiElement().getContainingFile());
         }
@@ -1229,6 +1274,7 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
         }
 
         @Override
+        @RequiredUIAccess
         public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
@@ -1265,6 +1311,7 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
         }
 
         @Override
+        @RequiredUIAccess
         public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
@@ -1289,24 +1336,8 @@ public boolean startInWriteAction() {
 
     private class SimpleErrorReportingClient implements ErrorReportingClient {
         @Override
-        public void reportError(final ASTNode nameIdentifier, final String s, ProblemKind kind, final IntentionAction implementMethodsFix) {
-            final Annotation annotation = kind == ProblemKind.ERROR
-                ? myHolder.createErrorAnnotation(nameIdentifier, s)
-                : myHolder.createWarningAnnotation(nameIdentifier, s);
-
-            if (implementMethodsFix != null) {
-                annotation.registerFix(implementMethodsFix);
-            }
-        }
-
-        @Override
-        public void reportError(PsiElement nameIdentifier, String s, ProblemKind kind, IntentionAction implementMethodsFix) {
-            final Annotation annotation = kind == ProblemKind.ERROR
-                ? myHolder.createErrorAnnotation(nameIdentifier, s)
-                : myHolder.createWarningAnnotation(nameIdentifier, s);
-            if (implementMethodsFix != null) {
-                annotation.registerFix(implementMethodsFix);
-            }
+        public AnnotationBuilder newAnnotation(@Nonnull HighlightSeverity severity, @Nonnull LocalizeValue message) {
+            return myHolder.newAnnotation(severity, message);
         }
     }
 
@@ -1331,6 +1362,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
         }
 
         @Override
+        @RequiredUIAccess
         public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
@@ -1394,6 +1426,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
         }
 
         @Override
+        @RequiredUIAccess
         public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
@@ -1403,30 +1436,30 @@ public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws
                 return;
             }
             final JSAttributeList attributeList = jsClass.getAttributeList();
-            String fun = "";
+            StringBuilder fun = new StringBuilder();
 
             if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC) {
-                fun += "public ";
+                fun.append("public ");
             }
 
-            fun += "function ";
+            fun.append("function ");
 
             final JSParameterList parameterList = superConstructor.getParameterList();
-            fun += jsClass.getName() + parameterList.getText() + "{\n";
-            fun += "super(";
+            fun.append(jsClass.getName()).append(parameterList.getText()).append("{\n");
+            fun.append("super(");
             int i = 0;
 
             for (JSParameter p : parameterList.getParameters()) {
                 if (i != 0) {
-                    fun += ",";
+                    fun.append(",");
                 }
                 ++i;
-                fun += p.getName();
+                fun.append(p.getName());
             }
-            fun += ")" + JSChangeUtil.getSemicolon(project);
-            fun += "\n}";
+            fun.append(")").append(JSChangeUtil.getSemicolon(project));
+            fun.append("\n}");
 
-            jsClass.add(JSChangeUtil.createJSTreeFromText(project, fun).getPsi());
+            jsClass.add(JSChangeUtil.createJSTreeFromText(project, fun.toString()).getPsi());
         }
 
         @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
index dea1c82f..656c9df2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
@@ -11,7 +11,7 @@
 
 /**
  * @author VISTALL
- * @since 29-Aug-22
+ * @since 2022-08-29
  */
 @ExtensionImpl
 public class JSAnnotatorFactory implements AnnotatorFactory {

From b9d87e4155c29ba060d80d8a293db2713a6c6d45 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 8 Sep 2024 22:25:33 +0300
Subject: [PATCH 237/340] newAnnotation() creation must be finished with
 .create().

---
 .../impl/validation/JSAnnotatingVisitor.java  | 175 +++++++++++-------
 1 file changed, 113 insertions(+), 62 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index d4364824..df992780 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -102,8 +102,8 @@ private void checkReferences(final PsiElement includeDirective, HighlightSeverit
                     elementRange.getStartOffset() + textRange.getEndOffset()
                 );
                 final LocalizeValue value = ((EmptyResolveMessageProvider)ref).buildUnresolvedMessage(ref.getCanonicalText());
-                AnnotationBuilder builder = myHolder.newAnnotation(kind, value);
-                builder = builder.range(range);
+                AnnotationBuilder builder = myHolder.newAnnotation(kind, value)
+                    .range(range);
 
                 if (ref instanceof LocalQuickFixProvider localQuickFixProvider) {
                     for (LocalQuickFix fix : localQuickFixProvider.getQuickFixes()) {
@@ -131,7 +131,8 @@ public void visitJSCallExpression(final JSCallExpression node) {
 
         if (methodExpression instanceof JSLiteralExpression) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptParserMessageExpectedFunctionName())
-                .range(methodExpression);
+                .range(methodExpression)
+                .create();
         }
     }
 
@@ -163,7 +164,8 @@ public void visitJSReferenceList(final JSReferenceList referenceList) {
                     HighlightSeverity.ERROR,
                     JavaScriptLocalize.javascriptValidationMessageImplementsForInterfaceNotAllowed()
                 )
-                .range(referenceList);
+                .range(referenceList)
+                .create();
             return;
         }
 
@@ -185,7 +187,8 @@ public void visitJSReferenceList(final JSReferenceList referenceList) {
 
             if (!isInterface && withinImplements) {
                 myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere())
-                    .range(expr);
+                    .range(expr)
+                    .create();
             }
             else if (withinExtends && isInterface != jsClass.isInterface()) {
                 myHolder.newAnnotation(
@@ -194,12 +197,14 @@ else if (withinExtends && isInterface != jsClass.isInterface()) {
                             ? JavaScriptLocalize.javascriptValidationMessageClassNameExpectedHere()
                             : JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere()
                     )
-                    .range(expr);
+                    .range(expr)
+                    .create();
             }
             if (clazz == jsClass) {
                 myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageCircularDependency())
                     .range(expr)
-                    .withFix(new RemoveASTNodeFix(referenceList.getNode(), JavaScriptLocalize.javascriptFixRemoveCircularDependency()));
+                    .withFix(new RemoveASTNodeFix(referenceList.getNode(), JavaScriptLocalize.javascriptFixRemoveCircularDependency()))
+                    .create();
             }
         }
 
@@ -235,7 +240,8 @@ protected void addNonimplementedFunction(final JSFunction function) {
                         )
                     )
                     .range(node)
-                    .withFix(implementMethodsFix);
+                    .withFix(implementMethodsFix)
+                    .create();
             }
 
             @Override
@@ -245,9 +251,11 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
                 if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
                     final ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
                     reportingClient.newAnnotation(
-                        HighlightSeverity.ERROR,
-                        JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidAccessModifier()
-                    ).range(node); // TODO: quickfix
+                            HighlightSeverity.ERROR,
+                            JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidAccessModifier()
+                        )
+                        .range(node)
+                        .create(); // TODO: quickfix
                 }
 
                 final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(implementationFunction, interfaceFunction);
@@ -268,25 +276,29 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
                         final JSParameterList parameterList = implementationFunction.getParameterList();
                         final JSParameterList expectedParameterList = interfaceFunction.getParameterList();
                         reportingClient.newAnnotation(
-                            HighlightSeverity.ERROR,
-                            JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature(
-                                expectedParameterList != null ? expectedParameterList.getText() : "()"
+                                HighlightSeverity.ERROR,
+                                JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature(
+                                    expectedParameterList != null ? expectedParameterList.getText() : "()"
+                                )
                             )
-                        ).range(parameterList.getNode()); // TODO: quickfix
+                            .range(parameterList.getNode())
+                            .create(); // TODO: quickfix
                     }
                     else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
                         PsiElement implementationReturnTypeExpr = implementationFunction.getReturnTypeElement();
                         PsiElement interfaceReturnTypeExpr = interfaceFunction.getReturnTypeElement();
                         reportingClient.newAnnotation(
-                            HighlightSeverity.ERROR,
-                            JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature2(
-                                interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"
+                                HighlightSeverity.ERROR,
+                                JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature2(
+                                    interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"
+                                )
                             )
-                        ).range(
-                            implementationReturnTypeExpr != null
-                                ? implementationReturnTypeExpr
-                                : implementationFunction.getNameIdentifier()
-                        ); // TODO: quickfix
+                            .range(
+                                implementationReturnTypeExpr != null
+                                    ? implementationReturnTypeExpr
+                                    : implementationFunction.getNameIdentifier()
+                            )
+                            .create(); // TODO: quickfix
                     }
                 }
             }
@@ -326,14 +338,16 @@ else if (accessTypeElement != null) {
                 .withFix(new RemoveASTNodeFix(
                     namespaceOrAccessModifierElement.getNode(),
                     JavaScriptLocalize.javascriptFixRemoveNamespaceReference()
-                ));
+                ))
+                .create();
 
             myHolder.newAnnotation(
                     HighlightSeverity.ERROR,
                     JavaScriptLocalize.javascriptValidationMessageUseNamespaceReferenceOrAccessModifier()
                 )
                 .range(accessTypeElement)
-                .withFix(new RemoveASTNodeFix(accessTypeElement.getNode(), JavaScriptLocalize.javascriptFixRemoveNamespaceReference()));
+                .withFix(new RemoveASTNodeFix(accessTypeElement.getNode(), JavaScriptLocalize.javascriptFixRemoveNamespaceReference()))
+                .create();
         }
 
         if (namespaceOrAccessModifierElement != null) {
@@ -362,7 +376,8 @@ else if (accessTypeElement != null) {
                             nsRef
                                 ? JavaScriptLocalize.javascriptFixRemoveNamespaceReference()
                                 : JavaScriptLocalize.javascriptFixRemoveAccessModifier()
-                        ));
+                        ))
+                        .create();
                 }
             }
             else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
@@ -375,7 +390,8 @@ else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
                             JavaScriptLocalize.javascriptValidationMessageInterfaceMembersCannotHaveAccessModifiers()
                         )
                         .range(astNode)
-                        .withFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveAccessModifier()));
+                        .withFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveAccessModifier()))
+                        .create();
                 }
             }
         }
@@ -419,7 +435,8 @@ else if (function.isSetProperty()) {
                                     HighlightSeverity.ERROR,
                                     JavaScriptLocalize.javascriptValidationMessageSetMethodShouldBeVoidOrWithoutType()
                                 )
-                                .range(function.getReturnTypeElement());
+                                .range(function.getReturnTypeElement())
+                                .create();
                         }
 
                         JSParameterList parameterList = function.getParameterList();
@@ -429,7 +446,8 @@ else if (function.isSetProperty()) {
                                     HighlightSeverity.ERROR,
                                     JavaScriptLocalize.javascriptValidationMessageSetMethodShouldHaveOneParameter()
                                 )
-                                .range(parameterList);
+                                .range(parameterList)
+                                .create();
                         }
                     }
                     else if (function.isGetProperty()) {
@@ -443,7 +461,8 @@ else if (function.isGetProperty()) {
                                         typeString != null ? typeString : "empty"
                                     )
                                 )
-                                .range(typeString != null ? function.getReturnTypeElement() : nameIdentifier);
+                                .range(typeString != null ? function.getReturnTypeElement() : nameIdentifier)
+                                .create();
                         }
 
                         JSParameterList parameterList = function.getParameterList();
@@ -453,7 +472,8 @@ else if (function.isGetProperty()) {
                                     HighlightSeverity.ERROR,
                                     JavaScriptLocalize.javascriptValidationMessageGetMethodShouldHaveNoParameter()
                                 )
-                                .range(parameterList);
+                                .range(parameterList)
+                                .create();
                         }
                     }
                 }
@@ -470,7 +490,8 @@ else if (function.isGetProperty()) {
                                 HighlightSeverity.ERROR,
                                 JavaScriptLocalize.javascriptValidationMessageNestedClassesAreNotAllowed()
                             )
-                            .range(node);
+                            .range(node)
+                            .create();
                     }
                 }
             }
@@ -480,7 +501,8 @@ else if (function.isGetProperty()) {
             JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
             if (fun == null) {
                 myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageArgumentsOutOfFunction())
-                    .range(node);
+                    .range(node)
+                    .create();
             }
             else {
                 JSParameterList parameterList = fun.getParameterList();
@@ -516,7 +538,8 @@ private void checkMissedSuperCall(JSReferenceExpression node, JSFunction constru
                     constructor == null
                         ? new AddConstructorAndSuperInvokationFix(node, nontrivialSuperClassConstructor)
                         : new AddSuperInvokationFix(node, nontrivialSuperClassConstructor)
-                );
+                )
+                .create();
         }
     }
 
@@ -581,7 +604,8 @@ else if (!hasInitializer && initializerPresent && !parameter.isRest()) {
                         JavaScriptLocalize.javascriptValidationMessageParameterShouldBeInitialized()
                     )
                     .range(parameter)
-                    .withFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
+                    .withFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()))
+                    .create();
             }
             else if (hasInitializer && parameter.isRest()) {
                 myHolder.newAnnotation(
@@ -592,7 +616,8 @@ else if (hasInitializer && parameter.isRest()) {
                     .withFix(new RemoveASTNodeFix(
                         JavaScriptLocalize.javascriptFixRemoveInitializer(),
                         getNodesBefore(initializer, JSTokenTypes.EQ)
-                    ));
+                    ))
+                    .create();
             }
 
             if (parameter.isRest() && !foundRest) {
@@ -607,7 +632,8 @@ else if (hasInitializer && parameter.isRest()) {
                         .withFix(new RemoveASTNodeFix(
                             JavaScriptLocalize.javascriptFixRemoveTypeReference(),
                             getNodesBefore(typeElement, JSTokenTypes.COLON)
-                        ));
+                        ))
+                        .create();
                 }
             }
             else if (foundRest) {
@@ -616,7 +642,8 @@ else if (foundRest) {
                         JavaScriptLocalize.javascriptValidationMessageParameterIsNotAllowedAfterRestParameter()
                     )
                     .range(parameter)
-                    .withFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()));
+                    .withFix(new RemoveASTNodeFix(parameter.getNode(), JavaScriptLocalize.javascriptFixRemoveParameter()))
+                    .create();
             }
         }
     }
@@ -649,7 +676,8 @@ public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
                         HighlightSeverity.ERROR,
                         JavaScriptLocalize.javascriptValidationMessagePackageShouldbeFirstStatement()
                     )
-                    .range(packageStatement.getFirstChild().getNode());
+                    .range(packageStatement.getFirstChild().getNode())
+                    .create();
                 break;
             }
         }
@@ -674,13 +702,15 @@ public void visitJSAssignmentExpression(final JSAssignmentExpression expression)
             PsiElement resolved = lRefExpr.resolve();
             if (resolved instanceof JSVariable variable && variable.isConst()) {
                 myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageAssignmentToConst())
-                    .range(lExpr);
+                    .range(lExpr)
+                    .create();
             }
         }
 
         if (!JSUtils.isLHSExpression(lExpr)) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageMustBeLvalue())
-                .range(lExpr);
+                .range(lExpr)
+                .create();
         }
     }
 
@@ -697,7 +727,8 @@ public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
         if (child != null && (childNode = child.getNode()) != null && childNode.getElementType() == JSTokenTypes.COMMA) {
             myHolder.newAnnotation(HighlightSeverity.WARNING, JavaScriptLocalize.javascriptValidationMessageUnneededComma())
                 .range(child)
-                .withFix(new RemoveASTNodeFix(childNode, JavaScriptLocalize.javascriptValidationMessageRemoveUnneededCommaFix()));
+                .withFix(new RemoveASTNodeFix(childNode, JavaScriptLocalize.javascriptValidationMessageRemoveUnneededCommaFix()))
+                .create();
         }
     }
 
@@ -726,7 +757,8 @@ public void visitJSTryStatement(final JSTryStatement node) {
                         .withFix(new RemoveASTNodeFix(
                             block.getNode(),
                             JavaScriptLocalize.javascriptValidationMessageDuplicatedCatchBlockFix()
-                        ));
+                        ))
+                        .create();
                 }
                 else {
                     typeToCatch.add(s);
@@ -749,7 +781,8 @@ public void visitJSVariable(final JSVariable var) {
                         HighlightSeverity.WARNING,
                         JavaScriptLocalize.javascriptValidationMessageConstVariableWithoutInitializer()
                     )
-                    .range(var);
+                    .range(var)
+                    .create();
             }
         }
 
@@ -763,7 +796,8 @@ public void visitJSVariable(final JSVariable var) {
     public void visitJSContinueStatement(final JSContinueStatement node) {
         if (node.getStatementToContinue() == null) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageContinueWithoutTarget())
-                .range(node);
+                .range(node)
+                .create();
         }
     }
 
@@ -772,7 +806,8 @@ public void visitJSContinueStatement(final JSContinueStatement node) {
     public void visitJSBreakStatement(final JSBreakStatement node) {
         if (node.getStatementToBreak() == null) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageBreakWithoutTarget())
-                .range(node);
+                .range(node)
+                .create();
         }
     }
 
@@ -798,7 +833,8 @@ private void checkClassReferenceInStaticContext(final JSExpression node, Localiz
             final JSAttributeList attributeList = function.getAttributeList();
             if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
                 myHolder.newAnnotation(HighlightSeverity.ERROR, message)
-                    .range(node);
+                    .range(node)
+                    .create();
                 return;
             }
         }
@@ -814,7 +850,8 @@ private void checkClassReferenceInStaticContext(final JSExpression node, Localiz
                     HighlightSeverity.ERROR,
                     JavaScriptLocalize.javascriptValidationMessageSuperReferencedWithoutClassInstanceContext()
                 )
-                .range(node);
+                .range(node)
+                .create();
         }
     }
 
@@ -843,7 +880,8 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
                         JavaScriptLocalize.javascriptValidationMessageConstructorInMxmlIsNotAllowed()
                     )
                     .range(nameIdentifier)
-                    .withFix(new RemoveASTNodeFix(node.getNode(), JavaScriptLocalize.javascriptFixRemoveConstructor()));
+                    .withFix(new RemoveASTNodeFix(node.getNode(), JavaScriptLocalize.javascriptFixRemoveConstructor()))
+                    .create();
             }
         }
 
@@ -880,7 +918,8 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
                                         JavaScriptLocalize.javascriptValidationMessageFunctionOverrideForObjectMethod()
                                     )
                                     .range(astNode)
-                                    .withFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
+                                    .withFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()))
+                                    .create();
                             }
                             return false;
                         }
@@ -891,7 +930,8 @@ else if (!hasOverride) {
                                     JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutOverrideModifier(className)
                                 )
                                 .range(nameIdentifier)
-                                .withFix(new AddOverrideIntentionAction(node));
+                                .withFix(new AddOverrideIntentionAction(node))
+                                .create();
                         }
                         return false;
                     }
@@ -904,7 +944,8 @@ else if (!hasOverride) {
                             JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutParentMethod()
                         )
                         .range(astNode)
-                        .withFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()));
+                        .withFix(new RemoveASTNodeFix(astNode, JavaScriptLocalize.javascriptFixRemoveOverrideModifier()))
+                        .create();
                 }
 
                 if (!b && hasOverride) {
@@ -925,7 +966,8 @@ else if (!hasOverride) {
                                 HighlightSeverity.ERROR,
                                 JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleAccessModifier(accessType)
                             )
-                            .range(findElementForAccessModifierError(node, attributeList));
+                            .range(findElementForAccessModifierError(node, attributeList))
+                            .create();
 
                         // TODO: quickfix
                         //annotation.registerFix(
@@ -944,7 +986,8 @@ else if (!hasOverride) {
                                 HighlightSeverity.ERROR,
                                 JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature(params)
                             )
-                            .range(nodeParameterList != null ? nodeParameterList : node.getNameIdentifier());
+                            .range(nodeParameterList != null ? nodeParameterList : node.getNameIdentifier())
+                            .create();
 
                         // TODO: quickfix
                         //annotation.registerFix(
@@ -959,7 +1002,8 @@ else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
                                 HighlightSeverity.ERROR,
                                 JavaScriptLocalize.javascriptValidationMessageFunctionOverrideIncompatibleSignature2(retType)
                             )
-                            .range(returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier());
+                            .range(returnTypeExpr != null ? returnTypeExpr : node.getNameIdentifier())
+                            .create();
 
                         // TODO: quickfix
                         //annotation.registerFix(
@@ -1046,7 +1090,8 @@ public void visitJSReturnStatement(final JSReturnStatement node) {
         if ((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost))
             || (element instanceof XmlTagChild && !(element.getParent() instanceof XmlAttributeValue))) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageReturnOutsideFunctionDefinition())
-                .range(node);
+                .range(node)
+                .create();
         }
 
         if (element instanceof JSFunction function) {
@@ -1056,7 +1101,8 @@ public void visitJSReturnStatement(final JSReturnStatement node) {
                         HighlightSeverity.ERROR,
                         JavaScriptLocalize.javascriptValidationMessageReturnValueOfTypeIsRequired(typeString)
                     )
-                    .range(node);
+                    .range(node)
+                    .create();
             }
         }
     }
@@ -1071,7 +1117,8 @@ public void visitJSLabeledStatement(final JSLabeledStatement node) {
                 if (run instanceof JSLabeledStatement labeledStatement) {
                     if (label.equals(labeledStatement.getLabel())) {
                         myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageDuplicateLabel())
-                            .range(node.getNameIdentifier());
+                            .range(node.getNameIdentifier())
+                            .create();
                         break;
                     }
                 }
@@ -1108,7 +1155,8 @@ private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass)
                     : JavaScriptLocalize.javascriptValidationMessageFunctionShouldBeInFile(name, nameWithExtension);
                 myHolder.newAnnotation(HighlightSeverity.ERROR, message)
                     .range(node)
-                    .withFix(new RenameFileFix(nameWithExtension));
+                    .withFix(new RenameFileFix(nameWithExtension))
+                    .create();
     /*annotation.registerFix(new RenamePublicClassFix(aClass) {
           final String text;
           final String familyName;
@@ -1158,7 +1206,8 @@ public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorRe
 
         if (rootForFile == null) {
             client.newAnnotation(HighlightSeverity.WARNING, JavaScriptLocalize.javascriptValidationMessageFileShouldBeUnderSourceRoot())
-                .range(nameIdentifier.getNode());
+                .range(nameIdentifier.getNode())
+                .create();
         }
     }
 
@@ -1199,7 +1248,8 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
                     public boolean startInWriteAction() {
                         return true;
                     }
-                });
+                })
+                .create();
         }
 
         final Set<JSNamedElement> elements = new HashSet<>();
@@ -1218,7 +1268,8 @@ public boolean startInWriteAction() {
                         JavaScriptLocalize.javascriptValidationMessageMoreThanOneExternallyVisibleSymbol()
                     )
                     .range(nameIdentifier != null ? nameIdentifier : el.getFirstChild())
-                    .withFix(new RemoveASTNodeFix(el.getNode(), JavaScriptLocalize.javascriptFixRemoveExternallyVisibleSymbol()));
+                    .withFix(new RemoveASTNodeFix(el.getNode(), JavaScriptLocalize.javascriptFixRemoveExternallyVisibleSymbol()))
+                    .create();
             }
         }
 

From c7aff794fb0fc373091a765a6866262ca7b4cfa0 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 8 Sep 2024 22:51:52 +0300
Subject: [PATCH 238/340] Replacing ErrorReportingClient with AnnotationHolder.

---
 .../impl/validation/JSAnnotatingVisitor.java  | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index df992780..f8042216 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -209,15 +209,11 @@ else if (withinExtends && isInterface != jsClass.isInterface()) {
         }
 
         if (withinImplements) {
-            checkImplementedMethods(jsClass, new SimpleErrorReportingClient());
+            checkImplementedMethods(jsClass, myHolder);
         }
     }
 
-    public interface ErrorReportingClient {
-        AnnotationBuilder newAnnotation(@Nonnull HighlightSeverity severity, @Nonnull LocalizeValue message);
-    }
-
-    public static void checkImplementedMethods(final JSClass jsClass, final ErrorReportingClient reportingClient) {
+    public static void checkImplementedMethods(final JSClass jsClass, final AnnotationHolder holder) {
         final JSResolveUtil.CollectMethodsToImplementProcessor implementedMethodProcessor = new ImplementedMethodProcessor(jsClass) {
             ImplementMethodsFix implementMethodsFix = null;
 
@@ -232,7 +228,7 @@ protected void addNonimplementedFunction(final JSFunction function) {
                     implementMethodsFix = new ImplementMethodsFix(myJsClass);
                 }
                 implementMethodsFix.addElementToProcess(function);
-                reportingClient.newAnnotation(
+                holder.newAnnotation(
                         HighlightSeverity.ERROR,
                         JavaScriptLocalize.javascriptValidationMessageInterfaceMethodNotImplemented(
                             function.getName(),
@@ -250,7 +246,7 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
                 final JSAttributeList attributeList = implementationFunction.getAttributeList();
                 if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
                     final ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
-                    reportingClient.newAnnotation(
+                    holder.newAnnotation(
                             HighlightSeverity.ERROR,
                             JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidAccessModifier()
                         )
@@ -275,7 +271,7 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
                     if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
                         final JSParameterList parameterList = implementationFunction.getParameterList();
                         final JSParameterList expectedParameterList = interfaceFunction.getParameterList();
-                        reportingClient.newAnnotation(
+                        holder.newAnnotation(
                                 HighlightSeverity.ERROR,
                                 JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature(
                                     expectedParameterList != null ? expectedParameterList.getText() : "()"
@@ -287,7 +283,7 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
                     else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
                         PsiElement implementationReturnTypeExpr = implementationFunction.getReturnTypeElement();
                         PsiElement interfaceReturnTypeExpr = interfaceFunction.getReturnTypeElement();
-                        reportingClient.newAnnotation(
+                        holder.newAnnotation(
                                 HighlightSeverity.ERROR,
                                 JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature2(
                                     interfaceReturnTypeExpr != null ? interfaceReturnTypeExpr.getText() : "*"
@@ -1181,7 +1177,7 @@ public String getFamilyName() {
             }
         }
 
-        checkFileUnderSourceRoot(aClass, new SimpleErrorReportingClient());
+        checkFileUnderSourceRoot(aClass, myHolder);
     }
 
     private String getTerm(String message) {
@@ -1190,7 +1186,7 @@ private String getTerm(String message) {
     }
 
     @RequiredReadAction
-    public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorReportingClient client) {
+    public static void checkFileUnderSourceRoot(final JSNamedElement aClass, AnnotationHolder holder) {
         PsiElement nameIdentifier = aClass.getNameIdentifier();
         if (nameIdentifier == null) {
             nameIdentifier = aClass.getFirstChild();
@@ -1205,7 +1201,7 @@ public static void checkFileUnderSourceRoot(final JSNamedElement aClass, ErrorRe
             ProjectRootManager.getInstance(containingFile.getProject()).getFileIndex().getSourceRootForFile(file);
 
         if (rootForFile == null) {
-            client.newAnnotation(HighlightSeverity.WARNING, JavaScriptLocalize.javascriptValidationMessageFileShouldBeUnderSourceRoot())
+            holder.newAnnotation(HighlightSeverity.WARNING, JavaScriptLocalize.javascriptValidationMessageFileShouldBeUnderSourceRoot())
                 .range(nameIdentifier.getNode())
                 .create();
         }
@@ -1273,7 +1269,7 @@ public boolean startInWriteAction() {
             }
         }
 
-        checkFileUnderSourceRoot(packageStatement, new SimpleErrorReportingClient());
+        checkFileUnderSourceRoot(packageStatement, myHolder);
     }
 
     public static class RemoveASTNodeFix implements SyntheticIntentionAction, LocalQuickFix {
@@ -1385,13 +1381,6 @@ public boolean startInWriteAction() {
         }
     }
 
-    private class SimpleErrorReportingClient implements ErrorReportingClient {
-        @Override
-        public AnnotationBuilder newAnnotation(@Nonnull HighlightSeverity severity, @Nonnull LocalizeValue message) {
-            return myHolder.newAnnotation(severity, message);
-        }
-    }
-
     private static class AddSuperInvokationFix implements SyntheticIntentionAction {
         private final JSReferenceExpression node;
         private final JSFunction superConstructor;

From 3f859ff100d959ddc0057906aa98c0c2105fa9f5 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 12 Sep 2024 17:54:33 +0400
Subject: [PATCH 239/340] fix listeners api

---
 ...ByAnotherPsiElementEditorNotification.java | 33 ++++++-------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index ad70357b..6ee8c95f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -32,16 +32,11 @@
 import consulo.language.psi.PsiModificationTracker;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import consulo.ui.Component;
-import consulo.ui.annotation.RequiredUIAccess;
-import consulo.ui.event.UIEvent;
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.VirtualFile;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
@@ -98,19 +93,15 @@ public EditorNotificationBuilder buildNotification(
             panel.withText(LocalizeValue.localizeTODO(StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) + " model description is available for this file"));
             panel.withAction(
                 LocalizeValue.localizeTODO("Choose " + myProvider.getPsiElementName()),
-                new Consumer<>() {
-                    @Override
-                    @RequiredUIAccess
-                    public void accept(UIEvent<Component> uiEvent) {
-                        T chooseElement = myProvider.chooseElement(myProject);
-                        if (chooseElement == null) {
-                            return;
-                        }
+                e -> {
+                    T chooseElement = myProvider.chooseElement(myProject);
+                    if (chooseElement == null) {
+                        return;
+                    }
 
-                        DescriptionByAnotherPsiElementService.getInstance(myProject).registerFile(file, chooseElement, myProvider);
+                    DescriptionByAnotherPsiElementService.getInstance(myProject).registerFile(file, chooseElement, myProvider);
 
-                        wantUpdate(psiFile);
-                    }
+                    wantUpdate(psiFile);
                 }
             );
             return panel;
@@ -124,13 +115,9 @@ public void accept(UIEvent<Component> uiEvent) {
             ));
             panel.withAction(
                 LocalizeValue.localizeTODO("Cancel"),
-                new Consumer<>() {
-                    @Override
-                    @RequiredUIAccess
-                    public void accept(UIEvent<Component> uiEvent) {
-                        if (DescriptionByAnotherPsiElementService.getInstance(myProject).removeFile(file)) {
-                            wantUpdate(psiFile);
-                        }
+                e -> {
+                    if(DescriptionByAnotherPsiElementService.getInstance(myProject).removeFile(file)) {
+                        wantUpdate(psiFile);
                     }
                 }
             );

From 45891aa43502cf8f0d20a39dcbaa0897534484bd Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 16 Sep 2024 19:17:46 +0400
Subject: [PATCH 240/340] context fix

---
 .../impl/JavaScriptCodeContextType.java       | 95 ++++++++-----------
 1 file changed, 42 insertions(+), 53 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
index 38f2381c..a4353e10 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
@@ -19,83 +19,72 @@
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.language.JavaScriptFileType;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.Language;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.editor.highlight.SyntaxHighlighterFactory;
-import consulo.language.editor.template.context.TemplateContextType;
+import consulo.language.editor.template.context.BaseTemplateContextType;
+import consulo.language.editor.template.context.TemplateActionContext;
 import consulo.language.inject.InjectedLanguageManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiLanguageInjectionHost;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.ref.Ref;
-import consulo.virtualFileSystem.fileType.FileType;
 import consulo.xml.lang.xml.XMLLanguage;
 import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Apr 14, 2008
- *         Time: 6:01:09 PM
+ * Date: Apr 14, 2008
+ * Time: 6:01:09 PM
  */
 @ExtensionImpl
-public class JavaScriptCodeContextType extends TemplateContextType
-{
-	private static final String JAVA_SCRIPT = "JAVA_SCRIPT";
+public class JavaScriptCodeContextType extends BaseTemplateContextType {
+    private static final String JAVA_SCRIPT = "JAVA_SCRIPT";
 
-	public JavaScriptCodeContextType()
-	{
-		super(JAVA_SCRIPT, JavaScriptLocalize.javascriptTemplateContextType().get());
-	}
+    public JavaScriptCodeContextType() {
+        super(JAVA_SCRIPT, JavaScriptLocalize.javascriptTemplateContextType());
+    }
 
-	@Override
-	public boolean isInContext(@Nonnull final PsiFile file, final int offset)
-	{
-		PsiElement at = file.findElementAt(offset);
-		if(at == null && offset == file.getTextLength())
-		{
-			at = file.findElementAt(offset - 1);
-		}
-		Language language = at != null ? at.getParent().getLanguage() : null;
+    @Override
+    @RequiredReadAction
+    public boolean isInContext(@Nonnull TemplateActionContext context) {
+        PsiFile file = context.getFile();
+        int offset = context.getStartOffset();
+        
+        PsiElement at = file.findElementAt(offset);
+        if (at == null && offset == file.getTextLength()) {
+            at = file.findElementAt(offset - 1);
+        }
+        Language language = at != null ? at.getParent().getLanguage() : null;
 
-		if(language instanceof XMLLanguage)
-		{
-			final PsiLanguageInjectionHost host = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class, false);
+        if (language instanceof XMLLanguage) {
+            final PsiLanguageInjectionHost host = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class, false);
 
-			if(host != null)
-			{
-				final Ref<Boolean> hasJsInjection = new Ref<Boolean>(Boolean.FALSE);
+            if (host != null) {
+                final Ref<Boolean> hasJsInjection = new Ref<>(Boolean.FALSE);
 
-				InjectedLanguageManager.getInstance(at.getProject()).enumerate(host, new JSResolveUtil.JSInjectedFilesVisitor()
-				{
-					@Override
-					protected void process(final JSFile file)
-					{
-						hasJsInjection.set(Boolean.TRUE);
-					}
-				});
+                InjectedLanguageManager.getInstance(at.getProject()).enumerate(host, new JSResolveUtil.JSInjectedFilesVisitor() {
+                    @Override
+                    protected void process(final JSFile file) {
+                        hasJsInjection.set(Boolean.TRUE);
+                    }
+                });
 
-				if(hasJsInjection.get())
-				{
-					language = JavaScriptLanguage.INSTANCE;
-				}
-			}
-		}
-		return language != null && language.isKindOf(JavaScriptLanguage.INSTANCE);
-	}
+                if (hasJsInjection.get()) {
+                    language = JavaScriptLanguage.INSTANCE;
+                }
+            }
+        }
+        return language != null && language.isKindOf(JavaScriptLanguage.INSTANCE);
+    }
 
-	public boolean isInContext(@Nonnull final FileType fileType)
-	{
-		return fileType instanceof JavaScriptFileType;
-	}
-
-	@Override
-	public SyntaxHighlighter createHighlighter()
-	{
-		return SyntaxHighlighterFactory.getSyntaxHighlighter(JavaScriptSupportLoader.ECMA_SCRIPT_L4, null, null);
-	}
+    @Override
+    public SyntaxHighlighter createHighlighter() {
+        return SyntaxHighlighterFactory.getSyntaxHighlighter(JavaScriptSupportLoader.ECMA_SCRIPT_L4, null, null);
+    }
 }

From 356ed0a3a1c40cae703309356741fdb8f74b3cad Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 12 Nov 2024 22:28:41 +0400
Subject: [PATCH 241/340] drop usage deprecated methods

---
 .../lang/JavaScriptLanguageVersionPusher.java | 284 ++++++++----------
 1 file changed, 127 insertions(+), 157 deletions(-)

diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
index 6984f3b8..2606e88a 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
@@ -1,9 +1,8 @@
 package consulo.javascript.impl.lang;
 
-import consulo.javascript.language.JavaScriptFileType;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.component.messagebus.MessageBus;
+import consulo.javascript.language.JavaScriptFileType;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.language.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
@@ -19,7 +18,6 @@
 import consulo.util.lang.ObjectUtil;
 import consulo.virtualFileSystem.FileAttribute;
 import consulo.virtualFileSystem.VirtualFile;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -34,158 +32,130 @@
  * @since 2020-06-14
  */
 @ExtensionImpl
-public class JavaScriptLanguageVersionPusher implements FilePropertyPusher<LanguageVersion>
-{
-	private static final FileAttribute ourFileAttribute = new FileAttribute("javascript-version", 2, false);
-
-	private static final Key<Set<String>> ourChangedModulesKey = Key.create("javascript-change-marker");
-
-	@Override
-	public void initExtra(@Nonnull Project project, @Nonnull MessageBus messageBus)
-	{
-		project.getMessageBus().connect().subscribe(ModuleExtensionChangeListener.class, (oldExtension, newExtension) ->
-		{
-			if(oldExtension instanceof JavaScriptModuleExtension && newExtension instanceof JavaScriptModuleExtension)
-			{
-				if(((JavaScriptModuleExtension) oldExtension).getLanguageVersion() != ((JavaScriptModuleExtension) newExtension).getLanguageVersion())
-				{
-					addChanged(project, newExtension);
-				}
-			}
-		});
-	}
-
-	private void addChanged(Project project, ModuleExtension<?> newExtension)
-	{
-		Set<String> changedModules = project.getUserData(ourChangedModulesKey);
-		if(changedModules == null)
-		{
-			changedModules = new HashSet<>();
-		}
-
-		project.putUserData(ourChangedModulesKey, changedModules);
-
-		changedModules.add(newExtension.getModule().getName());
-	}
-
-	@Nonnull
-	@Override
-	public Key<LanguageVersion> getFileDataKey()
-	{
-		return LanguageVersion.KEY;
-	}
-
-	@Override
-	public boolean pushDirectoriesOnly()
-	{
-		return false;
-	}
-
-	@Nonnull
-	@Override
-	public LanguageVersion getDefaultValue()
-	{
-		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
-	}
-
-	@Nullable
-	@Override
-	@RequiredReadAction
-	public LanguageVersion getImmediateValue(@Nonnull Project project, @Nullable VirtualFile virtualFile)
-	{
-		if(virtualFile == null)
-		{
-			return getDefaultValue();
-		}
-
-		Module moduleForFile = ModuleUtilCore.findModuleForFile(virtualFile, project);
-		return moduleForFile == null ? getDefaultValue() : getImmediateValue(moduleForFile);
-	}
-
-	@Nullable
-	@Override
-	@RequiredReadAction
-	public LanguageVersion getImmediateValue(@Nonnull Module module)
-	{
-		JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
-		if(extension != null)
-		{
-			return extension.getLanguageVersion();
-		}
-		return getDefaultValue();
-	}
-
-	@Override
-	public boolean acceptsFile(@Nonnull VirtualFile virtualFile)
-	{
-		return virtualFile.getFileType() == JavaScriptFileType.INSTANCE;
-	}
-
-	@Override
-	public boolean acceptsDirectory(@Nonnull VirtualFile virtualFile, @Nonnull Project project)
-	{
-		return false;
-	}
-
-	@Override
-	public void persistAttribute(@Nonnull Project project, @Nonnull VirtualFile virtualFile, @Nonnull LanguageVersion newAttribute) throws IOException
-	{
-		DataInputStream inputStream = ourFileAttribute.readAttribute(virtualFile);
-		if(inputStream != null)
-		{
-			try
-			{
-				LanguageVersion oldAttribute = read(inputStream);
-				if(oldAttribute.equals(newAttribute) && oldAttribute != getDefaultValue())
-				{
-					return;
-				}
-			}
-			catch(IOException e)
-			{
-				inputStream.close();
-			}
-		}
-
-		if(newAttribute != getDefaultValue() || inputStream != null)
-		{
-			try (DataOutputStream oStream = ourFileAttribute.writeAttribute(virtualFile))
-			{
-				write(newAttribute, oStream);
-			}
-
-			PushedFilePropertiesUpdater.getInstance(project).filePropertiesChanged(virtualFile, file -> true);
-		}
-	}
-
-	@Override
-	public void afterRootsChanged(@Nonnull Project project)
-	{
-		Set<String> changedModules = project.getUserData(ourChangedModulesKey);
-		if(changedModules == null)
-		{
-			return;
-		}
-
-		project.putUserData(ourChangedModulesKey, null);
-
-		if(!changedModules.isEmpty())
-		{
-			PushedFilePropertiesUpdater.getInstance(project).pushAll(this);
-		}
-	}
-
-	@Nonnull
-	private LanguageVersion read(DataInputStream stream) throws IOException
-	{
-		String id = stream.readUTF();
-		LanguageVersion version = JavaScriptLanguage.INSTANCE.getVersionById(id);
-		return ObjectUtil.notNull(version, getDefaultValue());
-
-	}
-
-	private void write(LanguageVersion jsVersion, DataOutputStream stream) throws IOException
-	{
-		stream.writeUTF(jsVersion.getId());
-	}
+public class JavaScriptLanguageVersionPusher implements FilePropertyPusher<LanguageVersion> {
+    private static final FileAttribute ourFileAttribute = new FileAttribute("javascript-version", 2, false);
+
+    private static final Key<Set<String>> ourChangedModulesKey = Key.create("javascript-change-marker");
+
+    @Override
+    public void initExtra(@Nonnull Project project) {
+        project.getMessageBus().connect().subscribe(ModuleExtensionChangeListener.class, (oldExtension, newExtension) -> {
+            if (oldExtension instanceof JavaScriptModuleExtension && newExtension instanceof JavaScriptModuleExtension) {
+                if (((JavaScriptModuleExtension) oldExtension).getLanguageVersion() != ((JavaScriptModuleExtension) newExtension).getLanguageVersion()) {
+                    addChanged(project, newExtension);
+                }
+            }
+        });
+    }
+
+    private void addChanged(Project project, ModuleExtension<?> newExtension) {
+        Set<String> changedModules = project.getUserData(ourChangedModulesKey);
+        if (changedModules == null) {
+            changedModules = new HashSet<>();
+        }
+
+        project.putUserData(ourChangedModulesKey, changedModules);
+
+        changedModules.add(newExtension.getModule().getName());
+    }
+
+    @Nonnull
+    @Override
+    public Key<LanguageVersion> getFileDataKey() {
+        return LanguageVersion.KEY;
+    }
+
+    @Override
+    public boolean pushDirectoriesOnly() {
+        return false;
+    }
+
+    @Nonnull
+    @Override
+    public LanguageVersion getDefaultValue() {
+        return StandardJavaScriptVersions.getInstance().getDefaultVersion();
+    }
+
+    @Nullable
+    @Override
+    @RequiredReadAction
+    public LanguageVersion getImmediateValue(@Nonnull Project project, @Nullable VirtualFile virtualFile) {
+        if (virtualFile == null) {
+            return getDefaultValue();
+        }
+
+        Module moduleForFile = ModuleUtilCore.findModuleForFile(virtualFile, project);
+        return moduleForFile == null ? getDefaultValue() : getImmediateValue(moduleForFile);
+    }
+
+    @Nullable
+    @Override
+    @RequiredReadAction
+    public LanguageVersion getImmediateValue(@Nonnull Module module) {
+        JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
+        if (extension != null) {
+            return extension.getLanguageVersion();
+        }
+        return getDefaultValue();
+    }
+
+    @Override
+    public boolean acceptsFile(@Nonnull VirtualFile file, @Nonnull Project project) {
+        return file.getFileType() == JavaScriptFileType.INSTANCE;
+    }
+
+    @Override
+    public boolean acceptsDirectory(@Nonnull VirtualFile virtualFile, @Nonnull Project project) {
+        return false;
+    }
+
+    @Override
+    public void persistAttribute(@Nonnull Project project, @Nonnull VirtualFile virtualFile, @Nonnull LanguageVersion newAttribute) throws IOException {
+        DataInputStream inputStream = ourFileAttribute.readAttribute(virtualFile);
+        if (inputStream != null) {
+            try {
+                LanguageVersion oldAttribute = read(inputStream);
+                if (oldAttribute.equals(newAttribute) && oldAttribute != getDefaultValue()) {
+                    return;
+                }
+            }
+            catch (IOException e) {
+                inputStream.close();
+            }
+        }
+
+        if (newAttribute != getDefaultValue() || inputStream != null) {
+            try (DataOutputStream oStream = ourFileAttribute.writeAttribute(virtualFile)) {
+                write(newAttribute, oStream);
+            }
+
+            PushedFilePropertiesUpdater.getInstance(project).filePropertiesChanged(virtualFile, file -> true);
+        }
+    }
+
+    @Override
+    public void afterRootsChanged(@Nonnull Project project) {
+        Set<String> changedModules = project.getUserData(ourChangedModulesKey);
+        if (changedModules == null) {
+            return;
+        }
+
+        project.putUserData(ourChangedModulesKey, null);
+
+        if (!changedModules.isEmpty()) {
+            PushedFilePropertiesUpdater.getInstance(project).pushAll(this);
+        }
+    }
+
+    @Nonnull
+    private LanguageVersion read(DataInputStream stream) throws IOException {
+        String id = stream.readUTF();
+        LanguageVersion version = JavaScriptLanguage.INSTANCE.getVersionById(id);
+        return ObjectUtil.notNull(version, getDefaultValue());
+
+    }
+
+    private void write(LanguageVersion jsVersion, DataOutputStream stream) throws IOException {
+        stream.writeUTF(jsVersion.getId());
+    }
 }

From cec51abe0d06e836ba5e92fcf81aaf94c2daceb3 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 25 Nov 2024 15:29:26 +0400
Subject: [PATCH 242/340] fix generic

---
 .../ClientJavaScriptModuleExtensionPanel.java      | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index 5675fdfc..a56d4e46 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -16,17 +16,13 @@
 
 package consulo.javascript.client.module.extension;
 
-import consulo.language.version.LanguageVersion;
-import consulo.ui.ex.awt.*;
-import consulo.ui.ex.awt.CollectionComboBoxModel;
-import consulo.ui.ex.awt.ColoredListCellRenderer;
-import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptLanguageVersion;
 import consulo.javascript.language.StandardJavaScriptVersions;
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
-import consulo.ui.ex.awt.LabeledComponent;
-
+import consulo.language.version.LanguageVersion;
+import consulo.ui.ex.awt.*;
 import jakarta.annotation.Nonnull;
+
 import javax.swing.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -57,10 +53,10 @@ public void itemStateChanged(ItemEvent e)
 				}
 			}
 		});
-		languageVersionComboBox.setRenderer(new ColoredListCellRenderer<BaseJavaScriptLanguageVersion>()
+		languageVersionComboBox.setRenderer(new ColoredListCellRenderer<>()
 		{
 			@Override
-			protected void customizeCellRenderer(@Nonnull JList list, BaseJavaScriptLanguageVersion value, int index, boolean selected, boolean hasFocus)
+			protected void customizeCellRenderer(@Nonnull JList list, JavaScriptLanguageVersion value, int index, boolean selected, boolean hasFocus)
 			{
 				append(value.getPresentableName());
 			}

From 243d908d99705005f147ece3c26b9d0426b2a2d0 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 2 Dec 2024 15:45:58 +0400
Subject: [PATCH 243/340] update icons

---
 .../as.svg                                    |  7 ++++++
 .../javaScript.svg                            |  9 ++++++++
 .../javaScriptModule.svg                      |  9 ++++++++
 .../json.svg                                  | 14 +++++------
 .../jsx.svg                                   |  8 +++++++
 .../typeScript.svg                            |  8 +++++++
 .../as.svg                                    | 15 +++++-------
 .../javaScript.svg                            | 17 +++++++-------
 .../javaScriptModule.svg                      | 14 ++++++-----
 .../json.svg                                  | 14 +++++------
 .../jsx.svg                                   | 23 ++++++-------------
 .../typeScript.svg                            | 21 ++++++-----------
 12 files changed, 89 insertions(+), 70 deletions(-)
 create mode 100644 base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/as.svg
 create mode 100644 base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/javaScript.svg
 create mode 100644 base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg
 create mode 100644 base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/jsx.svg
 create mode 100644 base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/typeScript.svg

diff --git a/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/as.svg b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/as.svg
new file mode 100644
index 00000000..54fb344d
--- /dev/null
+++ b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/as.svg
@@ -0,0 +1,7 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2.54077 13L4.46077 2.50001H6.27577L8.23327 13H6.80077L5.46577 4.77251L5.36827 4.07501L5.27077 4.77251L4.01077 13H2.54077ZM3.65077 10.2775V9.10001H7.01077V10.2775H3.65077Z"
+          fill="#DB5C5C"/>
+    <path d="M10.943 13.18C10.398 13.18 9.9455 13.065 9.5855 12.835C9.2255 12.605 8.9555 12.2575 8.7755 11.7925C8.6005 11.3275 8.513 10.7325 8.513 10.0075H9.9455C9.9455 10.4475 9.9805 10.81 10.0505 11.095C10.1255 11.38 10.238 11.5925 10.388 11.7325C10.538 11.8675 10.728 11.935 10.958 11.935C11.173 11.935 11.3505 11.87 11.4905 11.74C11.6305 11.61 11.733 11.415 11.798 11.155C11.868 10.89 11.903 10.55 11.903 10.135C11.903 9.69001 11.838 9.33251 11.708 9.06251C11.583 8.78751 11.3855 8.57751 11.1155 8.43251L10.2755 8.02751C9.9155 7.83251 9.618 7.60501 9.383 7.34501C9.153 7.08501 8.9805 6.78251 8.8655 6.43751C8.7555 6.09251 8.7005 5.69751 8.7005 5.25251C8.7005 4.58751 8.7805 4.03751 8.9405 3.60251C9.1005 3.16751 9.343 2.84501 9.668 2.63501C9.993 2.42501 10.403 2.32001 10.898 2.32001C11.398 2.32001 11.813 2.42751 12.143 2.64251C12.473 2.85251 12.7205 3.17251 12.8855 3.60251C13.0505 4.03251 13.1355 4.58501 13.1405 5.26001H11.708C11.708 4.87001 11.678 4.55251 11.618 4.30751C11.558 4.05751 11.4705 3.87251 11.3555 3.75251C11.2405 3.62751 11.093 3.56501 10.913 3.56501C10.643 3.56501 10.443 3.70001 10.313 3.97001C10.183 4.23501 10.118 4.65501 10.118 5.23001C10.118 5.60501 10.1805 5.91251 10.3055 6.15251C10.4305 6.39251 10.623 6.58501 10.883 6.73001L11.768 7.16501C12.123 7.35501 12.4155 7.58751 12.6455 7.86251C12.8755 8.13251 13.048 8.45251 13.163 8.82251C13.278 9.19251 13.3355 9.61751 13.3355 10.0975C13.3355 10.7975 13.248 11.375 13.073 11.83C12.898 12.285 12.633 12.625 12.278 12.85C11.923 13.07 11.478 13.18 10.943 13.18Z"
+          fill="#DB5C5C"/>
+</svg>
diff --git a/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/javaScript.svg b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/javaScript.svg
new file mode 100644
index 00000000..86f91868
--- /dev/null
+++ b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/javaScript.svg
@@ -0,0 +1,9 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14 4C14 2.89543 13.1046 2 12 2H4C2.89543 2 2 2.89543 2 4V12C2 13.1046 2.89543 14 4 14H12C13.1046 14 14 13.1046 14 12V4Z"
+          fill="#F2C55C"/>
+    <path d="M9.55434 11.8593C9.88209 12.0132 10.2583 12.0901 10.6829 12.0901C11.1047 12.0901 11.4795 12.0117 11.8073 11.855C12.135 11.6982 12.3901 11.4831 12.5725 11.2095C12.7549 10.933 12.8461 10.6238 12.8461 10.2818C12.8461 9.99963 12.7834 9.73315 12.658 9.48235C12.5326 9.23155 12.3545 9.02208 12.1236 8.85393C11.8956 8.68578 11.6348 8.57605 11.3413 8.52475L10.3452 8.3623C10.1429 8.3281 9.97899 8.24118 9.85359 8.10153C9.72819 7.95903 9.66549 7.79088 9.66549 7.59708C9.66549 7.43178 9.70824 7.28643 9.79374 7.16103C9.87924 7.03563 9.99894 6.93873 10.1528 6.87033C10.3067 6.80193 10.4849 6.76773 10.6872 6.76773C10.8896 6.76773 11.0677 6.80335 11.2216 6.8746C11.3755 6.94585 11.4952 7.04703 11.5807 7.17813C11.6662 7.30638 11.7089 7.45173 11.7089 7.61418H12.7221C12.7193 7.28073 12.6309 6.98433 12.4571 6.72498C12.2832 6.46563 12.041 6.26328 11.7303 6.11793C11.4225 5.97258 11.0705 5.8999 10.6744 5.8999C10.2868 5.8999 9.93909 5.97543 9.63129 6.12648C9.32349 6.27468 9.08266 6.4813 8.90881 6.74635C8.73781 7.00855 8.65231 7.30495 8.65231 7.63555C8.65231 7.912 8.70931 8.16708 8.82331 8.40078C8.94016 8.63163 9.10546 8.824 9.31921 8.9779C9.53296 9.1318 9.78519 9.2344 10.0759 9.2857L11.0891 9.4567C11.3114 9.49375 11.4895 9.5935 11.6234 9.75595C11.7574 9.91555 11.8244 10.1065 11.8244 10.3288C11.8244 10.5055 11.7773 10.6623 11.6833 10.7991C11.5921 10.933 11.461 11.037 11.29 11.1111C11.119 11.1852 10.9209 11.2223 10.6958 11.2223C10.4649 11.2223 10.2597 11.1824 10.0802 11.1026C9.90346 11.0199 9.76524 10.9045 9.66549 10.7563C9.56574 10.6081 9.51586 10.44 9.51586 10.2519H8.50269C8.50554 10.611 8.59959 10.9302 8.78484 11.2095C8.97009 11.4859 9.22659 11.7025 9.55434 11.8593Z"
+          fill="#1E1F22"/>
+    <path d="M5.22179 11H4.21289V12H5.32012C5.64787 12 5.93857 11.9316 6.19222 11.7948C6.44587 11.6551 6.64394 11.4613 6.78644 11.2134C6.92894 10.9654 7.00019 10.6804 7.00019 10.3584L7.00024 6H5.99989L5.99984 10.222C5.99984 10.3759 5.96707 10.5127 5.90152 10.6324C5.83882 10.7492 5.74762 10.8404 5.62792 10.906C5.51107 10.9687 5.37569 11 5.22179 11Z"
+          fill="#1E1F22"/>
+</svg>
diff --git a/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg
new file mode 100644
index 00000000..86f91868
--- /dev/null
+++ b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg
@@ -0,0 +1,9 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14 4C14 2.89543 13.1046 2 12 2H4C2.89543 2 2 2.89543 2 4V12C2 13.1046 2.89543 14 4 14H12C13.1046 14 14 13.1046 14 12V4Z"
+          fill="#F2C55C"/>
+    <path d="M9.55434 11.8593C9.88209 12.0132 10.2583 12.0901 10.6829 12.0901C11.1047 12.0901 11.4795 12.0117 11.8073 11.855C12.135 11.6982 12.3901 11.4831 12.5725 11.2095C12.7549 10.933 12.8461 10.6238 12.8461 10.2818C12.8461 9.99963 12.7834 9.73315 12.658 9.48235C12.5326 9.23155 12.3545 9.02208 12.1236 8.85393C11.8956 8.68578 11.6348 8.57605 11.3413 8.52475L10.3452 8.3623C10.1429 8.3281 9.97899 8.24118 9.85359 8.10153C9.72819 7.95903 9.66549 7.79088 9.66549 7.59708C9.66549 7.43178 9.70824 7.28643 9.79374 7.16103C9.87924 7.03563 9.99894 6.93873 10.1528 6.87033C10.3067 6.80193 10.4849 6.76773 10.6872 6.76773C10.8896 6.76773 11.0677 6.80335 11.2216 6.8746C11.3755 6.94585 11.4952 7.04703 11.5807 7.17813C11.6662 7.30638 11.7089 7.45173 11.7089 7.61418H12.7221C12.7193 7.28073 12.6309 6.98433 12.4571 6.72498C12.2832 6.46563 12.041 6.26328 11.7303 6.11793C11.4225 5.97258 11.0705 5.8999 10.6744 5.8999C10.2868 5.8999 9.93909 5.97543 9.63129 6.12648C9.32349 6.27468 9.08266 6.4813 8.90881 6.74635C8.73781 7.00855 8.65231 7.30495 8.65231 7.63555C8.65231 7.912 8.70931 8.16708 8.82331 8.40078C8.94016 8.63163 9.10546 8.824 9.31921 8.9779C9.53296 9.1318 9.78519 9.2344 10.0759 9.2857L11.0891 9.4567C11.3114 9.49375 11.4895 9.5935 11.6234 9.75595C11.7574 9.91555 11.8244 10.1065 11.8244 10.3288C11.8244 10.5055 11.7773 10.6623 11.6833 10.7991C11.5921 10.933 11.461 11.037 11.29 11.1111C11.119 11.1852 10.9209 11.2223 10.6958 11.2223C10.4649 11.2223 10.2597 11.1824 10.0802 11.1026C9.90346 11.0199 9.76524 10.9045 9.66549 10.7563C9.56574 10.6081 9.51586 10.44 9.51586 10.2519H8.50269C8.50554 10.611 8.59959 10.9302 8.78484 11.2095C8.97009 11.4859 9.22659 11.7025 9.55434 11.8593Z"
+          fill="#1E1F22"/>
+    <path d="M5.22179 11H4.21289V12H5.32012C5.64787 12 5.93857 11.9316 6.19222 11.7948C6.44587 11.6551 6.64394 11.4613 6.78644 11.2134C6.92894 10.9654 7.00019 10.6804 7.00019 10.3584L7.00024 6H5.99989L5.99984 10.222C5.99984 10.3759 5.96707 10.5127 5.90152 10.6324C5.83882 10.7492 5.74762 10.8404 5.62792 10.906C5.51107 10.9687 5.37569 11 5.22179 11Z"
+          fill="#1E1F22"/>
+</svg>
diff --git a/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/json.svg b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/json.svg
index 48be129a..7507cc4e 100644
--- a/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/json.svg
+++ b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/json.svg
@@ -1,9 +1,7 @@
-<!-- Copyright 2000-2021 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. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#9AA7B0" d="M8.416 13.8965C8.416 13.7395 8.437 13.3185 8.437 13.1395 8.437 12.3195 8.127 11.9835 7.269 11.9835L7 11.9835 7 11.0155 7.269 11.0155C8.127 11.0155 8.437 10.6685 8.437 9.8485 8.437 9.6695 8.416 9.2505 8.416 9.0915 8.416 8.0195 8.882 7.3465 10.765 7.0005L10.981 7.8405C9.74 8.1885 9.575 8.5135 9.575 9.2815 9.575 9.4925 9.596 9.8385 9.596 10.0595 9.596 10.8795 9.203 11.2785 8.52 11.5005 9.213 11.7305 9.596 12.1205 9.596 12.9405 9.596 13.1615 9.575 13.5075 9.575 13.7185 9.575 14.4855 9.74 14.8115 10.981 15.1585L10.765 16.0005C8.882 15.6525 8.416 14.9795 8.416 13.8965M12.0186 15.1582C13.2596 14.8112 13.4246 14.4852 13.4246 13.7192 13.4246 13.5082 13.4046 13.1612 13.4046 12.9402 13.4046 12.1202 13.7966 11.7202 14.4796 11.5002 13.7876 11.2682 13.4046 10.8802 13.4046 10.0592 13.4046 9.8392 13.4246 9.4922 13.4246 9.2812 13.4246 8.5132 13.2596 8.1882 12.0186 7.8412L12.2356 7.0002C14.1186 7.3462 14.5836 8.0192 14.5836 9.0922 14.5836 9.2502 14.5626 9.6702 14.5626 9.8482 14.5626 10.6692 14.8726 11.0152 15.7316 11.0152L15.9996 11.0152 15.9996 11.9832 15.7316 11.9832C14.8726 11.9832 14.5626 12.3192 14.5626 13.1392 14.5626 13.3182 14.5836 13.7392 14.5836 13.8962 14.5836 14.9792 14.1186 15.6522 12.2356 16.0002L12.0186 15.1582z"/>
-    <polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
-    <path fill="#9AA7B0" fill-opacity=".8" d="M10.5957,12.9404 C10.5957,13.0624 10.5847,13.9504 10.5907,13.9754 C10.5907,13.9744 10.5927,13.9734 10.5927,13.9734 C10.6227,13.9734 11.4997,14.2654 11.4997,14.2654 C11.4997,14.2654 12.3717,13.9764 12.4247,13.9404 C12.4177,13.9274 12.4047,13.0624 12.4047,12.9404 C12.4047,12.4914 12.4937,11.9654 12.8087,11.5034 C12.5397,11.1134 12.4047,10.6304 12.4047,10.0594 C12.4047,9.9374 12.4147,9.0494 12.4087,9.0244 C12.4087,9.0254 12.4077,9.0254 12.4077,9.0254 C12.3767,9.0254 11.4997,8.7344 11.4997,8.7344 C11.4997,8.7344 10.6277,9.0234 10.5747,9.0584 C10.5817,9.0724 10.5957,9.9374 10.5957,10.0594 C10.5957,10.5084 10.5057,11.0334 10.1917,11.4964 C10.4597,11.8854 10.5957,12.3684 10.5957,12.9404"/>
-    <path fill="#9AA7B0" fill-opacity=".8" d="M7.416,13.8965 C7.416,13.8125 7.435,13.0285 7.432,12.9905 C7.392,12.9865 6,12.9835 6,12.9835 L6,10.0155 C6,10.0155 7.391,10.0125 7.431,10.0075 C7.435,9.9685 7.416,9.1765 7.416,9.0915 C7.416,6.8825 9.108,6.2885 10.584,6.0165 L11.5,5.8475 L12.416,6.0165 C12.608,6.0515 12.805,6.0935 13,6.1425 L13,1.0005 L8,1.0005 L8,6.0005 L3,6.0005 L3,15.0005 L7.609,15.0005 C7.496,14.6815 7.416,14.3285 7.416,13.8965"/>
-  </g>
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3.98755 9.77751C3.99755 9.39251 3.87005 9.08501 3.60505 8.85501C3.34005 8.62501 2.98255 8.51001 2.53255 8.51001H2V7.43001H2.53255C2.98255 7.43001 3.34005 7.31501 3.60505 7.08501C3.87005 6.85501 3.99755 6.54751 3.98755 6.16251L3.95755 4.58C3.94755 4.06 4.05505 3.605 4.28005 3.215C4.51005 2.825 4.83755 2.525 5.26255 2.315C5.68755 2.105 6.18755 2 6.76255 2H7.5V3.005H6.77005C6.25005 3.005 5.83755 3.15 5.53255 3.44C5.23255 3.725 5.08505 4.1125 5.09005 4.6025L5.12005 6.17001C5.13005 6.68001 4.99255 7.09751 4.70755 7.42251C4.42255 7.74251 4.03755 7.92001 3.55255 7.95501C4.03755 8.04501 4.42255 8.25501 4.70755 8.58501C4.99255 8.91001 5.13005 9.30501 5.12005 9.77001L5.09005 11.5475C5.08005 11.9875 5.21255 12.3375 5.48755 12.5975C5.76755 12.8625 6.14505 12.995 6.62005 12.995H7.5V14H6.61255C6.07755 14 5.60755 13.9 5.20255 13.7C4.80255 13.505 4.49255 13.2225 4.27255 12.8525C4.05755 12.4875 3.95255 12.06 3.95755 11.57L3.98755 9.77751Z"
+          fill="#B589EC"/>
+    <path d="M12.0145 9.77751C12.0045 9.39251 12.132 9.08501 12.397 8.85501C12.662 8.62501 13.0195 8.51001 13.4695 8.51001H14V7.43001H13.4695C13.0195 7.43001 12.662 7.31501 12.397 7.08501C12.132 6.85501 12.0045 6.54751 12.0145 6.16251L12.0445 4.58C12.0545 4.06 11.9445 3.605 11.7145 3.215C11.4895 2.825 11.1645 2.525 10.7395 2.315C10.3145 2.105 9.81455 2 9.23955 2H8.5V3.005H9.23205C9.75205 3.005 10.162 3.15 10.462 3.44C10.767 3.725 10.917 4.1125 10.912 4.6025L10.882 6.17001C10.872 6.68001 11.0095 7.09751 11.2945 7.42251C11.5795 7.74251 11.9645 7.92001 12.4495 7.95501C11.9645 8.04501 11.5795 8.25501 11.2945 8.58501C11.0095 8.91001 10.872 9.30501 10.882 9.77001L10.912 11.5475C10.922 11.9875 10.787 12.3375 10.507 12.5975C10.232 12.8625 9.85705 12.995 9.38205 12.995H8.5V14H9.38955C9.92455 14 10.392 13.9 10.792 13.7C11.197 13.505 11.507 13.2225 11.722 12.8525C11.942 12.4875 12.0495 12.06 12.0445 11.57L12.0145 9.77751Z"
+          fill="#B589EC"/>
 </svg>
diff --git a/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/jsx.svg b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/jsx.svg
new file mode 100644
index 00000000..37505479
--- /dev/null
+++ b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/jsx.svg
@@ -0,0 +1,8 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M8 9.00002C8.55229 9.00002 9 8.55231 9 8.00002C9 7.44774 8.55229 7.00002 8 7.00002C7.44772 7.00002 7 7.44774 7 8.00002C7 8.55231 7.44772 9.00002 8 9.00002Z"
+          fill="#D6AE58"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M11.4999 1.93786C12.3545 2.43124 12.5569 3.83167 12.1725 5.59099C13.8883 6.13774 15 7.01324 15 8.00002C15 8.98677 13.8884 9.86226 12.1726 10.409C12.557 12.1684 12.3546 13.5688 11.5001 14.0622C10.6455 14.5556 9.33146 14.0306 8.00002 12.818C6.66856 14.0306 5.35451 14.5556 4.49993 14.0622C3.64536 13.5688 3.44298 12.1684 3.8274 10.409C2.1116 9.86226 1 8.98677 1 8.00002C1 7.01324 2.11166 6.13774 3.82753 5.59098C3.44312 3.83165 3.64551 2.43121 4.50007 1.93783C5.35462 1.44445 6.66861 1.96938 8.00002 3.18193C9.33141 1.9694 10.6454 1.44449 11.4999 1.93786ZM11.0001 13.1962C10.9342 13.2342 10.7832 13.2847 10.4662 13.202C10.1434 13.1178 9.72408 12.9111 9.23687 12.5466C9.06346 12.4168 8.88653 12.2709 8.70764 12.1097C9.03843 11.7483 9.36541 11.3477 9.68168 10.9129C10.2164 10.8564 10.727 10.7735 11.2054 10.6677C11.2556 10.9032 11.2935 11.1294 11.3191 11.3444C11.3912 11.9486 11.3606 12.4151 11.2721 12.7367C11.1852 13.0526 11.0659 13.1581 11.0001 13.1962ZM8.35159 10.9963C8.23473 11.1372 8.1174 11.2723 8.00001 11.4016C7.88263 11.2723 7.76529 11.1372 7.64843 10.9963C7.76489 10.9988 7.88211 11 8 11C8.1179 11 8.23512 10.9988 8.35159 10.9963ZM10.946 9.70083C10.7753 9.73787 10.5995 9.77192 10.419 9.80271C10.4793 9.70306 10.5391 9.60216 10.598 9.50004C10.657 9.39786 10.7146 9.29565 10.7707 9.19347C10.8343 9.36519 10.8927 9.53447 10.946 9.70083ZM9.73198 9.00004C9.92585 8.66424 10.1023 8.32984 10.2615 7.99988C10.1024 7.67 9.92593 7.3357 9.73212 7C9.53829 6.66427 9.33698 6.34429 9.13083 6.04153C8.76552 6.01437 8.38771 6.00002 8 6.00002C7.6123 6.00002 7.2345 6.01437 6.8692 6.04153C6.66305 6.34429 6.46172 6.66429 6.26788 7.00004C6.07407 7.33572 5.89763 7.67001 5.73853 7.99988C5.89767 8.32984 6.07415 8.66422 6.26802 9C6.46186 9.33575 6.66318 9.65575 6.86934 9.95852C7.23459 9.98567 7.61235 10 8 10C8.38766 10 8.76542 9.98567 9.13068 9.95852C9.33683 9.65576 9.53815 9.33577 9.73198 9.00004ZM10.5981 6.5C10.6571 6.60208 10.7146 6.70419 10.7707 6.80627C10.8342 6.63465 10.8926 6.46545 10.9459 6.29918C10.7752 6.26216 10.5995 6.22813 10.4191 6.19736C10.4795 6.297 10.5392 6.39789 10.5981 6.5ZM9.68183 5.08717C10.2165 5.14368 10.7269 5.22652 11.2053 5.3323C11.2554 5.09682 11.2933 4.87067 11.319 4.65566C11.391 4.05148 11.3604 3.58499 11.272 3.2633C11.1851 2.94743 11.0658 2.84191 10.9999 2.80389C10.9341 2.76586 10.783 2.71529 10.466 2.798C10.1432 2.88223 9.72394 3.08899 9.23673 3.45349C9.06338 3.58318 8.88649 3.72905 8.70765 3.89019C9.03849 4.25162 9.36551 4.65233 9.68183 5.08717ZM11.3635 7.99986C11.5819 7.50859 11.7654 7.0251 11.9129 6.55794C12.142 6.63227 12.3568 6.71254 12.5558 6.79785C13.1151 7.03753 13.5038 7.29725 13.7382 7.53472C13.9683 7.76789 14 7.92397 14 8.00002C14 8.07607 13.9683 8.23215 13.7382 8.46532C13.5038 8.70279 13.1151 8.96251 12.5558 9.2022C12.3568 9.28749 12.142 9.36774 11.913 9.44205C11.7654 8.97482 11.5819 8.49123 11.3635 7.99986ZM6.31835 10.9129C5.78359 10.8564 5.27303 10.7735 4.7946 10.6677C4.74444 10.9032 4.70655 11.1294 4.6809 11.3444C4.60884 11.9486 4.63942 12.4151 4.72789 12.7368C4.81476 13.0526 4.93407 13.1582 4.99993 13.1962C5.06579 13.2342 5.21683 13.2848 5.53381 13.2021C5.85665 13.1179 6.27592 12.9111 6.76313 12.5466C6.93655 12.4169 7.11349 12.2709 7.29239 12.1097C6.9616 11.7483 6.63462 11.3477 6.31835 10.9129ZM5.22931 9.19347C5.16573 9.36519 5.1073 9.53447 5.05403 9.70083C5.22474 9.73788 5.40056 9.77192 5.58106 9.80271C5.52067 9.70306 5.46096 9.60214 5.40199 9.5C5.34301 9.39784 5.28544 9.29563 5.22931 9.19347ZM4.08697 9.44206C4.23456 8.97482 4.41809 8.49124 4.63653 7.99987C4.41814 7.50859 4.23466 7.0251 4.08709 6.55794C3.85805 6.63227 3.64322 6.71254 3.44417 6.79785C2.8849 7.03753 2.4962 7.29725 2.26184 7.53472C2.03173 7.76789 2 7.92397 2 8.00002C2 8.07607 2.03173 8.23215 2.26184 8.46532C2.4962 8.70279 2.8849 8.96251 3.44417 9.2022C3.64319 9.28749 3.85797 9.36775 4.08697 9.44206ZM5.40186 6.50004C5.34293 6.60211 5.28542 6.70421 5.22934 6.80627C5.16579 6.63465 5.1074 6.46546 5.05416 6.29918C5.22478 6.26216 5.4005 6.22813 5.58091 6.19735C5.52052 6.297 5.46082 6.39791 5.40186 6.50004ZM8 5.00002C7.88206 5.00002 7.7648 5.00127 7.64829 5.00374C7.7652 4.86283 7.88259 4.7276 8.00002 4.5983C8.11745 4.7276 8.23483 4.86283 8.35174 5.00375C8.23522 5.00127 8.11795 5.00002 8 5.00002ZM6.3182 5.08717C6.63452 4.65233 6.96154 4.25161 7.29238 3.89019C7.11353 3.72903 6.93664 3.58315 6.76327 3.45345C6.27606 3.08896 5.85678 2.88219 5.53395 2.79796C5.21696 2.71526 5.06593 2.76583 5.00007 2.80385C4.93421 2.84188 4.8149 2.94739 4.72803 3.26326C4.63956 3.58496 4.60898 4.05145 4.68104 4.65563C4.70668 4.87064 4.74457 5.0968 4.79472 5.3323C5.27308 5.22652 5.78354 5.14368 6.3182 5.08717Z"
+          fill="#D6AE58"/>
+</svg>
diff --git a/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/typeScript.svg b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/typeScript.svg
new file mode 100644
index 00000000..6495f933
--- /dev/null
+++ b/base-api/src/main/resources/ICON-LIB/dark/consulo.javascript.JavaScriptIconGroup/typeScript.svg
@@ -0,0 +1,8 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14 4C14 2.89543 13.1046 2 12 2H4C2.89543 2 2 2.89543 2 4V12C2 13.1046 2.89543 14 4 14H12C13.1046 14 14 13.1046 14 12V4Z"
+          fill="#548AF7"/>
+    <path d="M3.13501 5.99999H7.87171V6.99999H6V12H5V6.99999H3.13501V5.99999Z" fill="white"/>
+    <path d="M10.6833 12.0902C10.2587 12.0902 9.8825 12.0133 9.55475 11.8594C9.227 11.7026 8.9705 11.486 8.78525 11.2096C8.6 10.9303 8.50595 10.6111 8.5031 10.252H9.51627C9.51627 10.4401 9.56615 10.6082 9.6659 10.7564C9.76565 10.9046 9.90387 11.02 10.0806 11.1027C10.2601 11.1825 10.4653 11.2224 10.6962 11.2224C10.9213 11.2224 11.1194 11.1853 11.2904 11.1112C11.4614 11.0371 11.5925 10.9331 11.6837 10.7992C11.7777 10.6624 11.8248 10.5056 11.8248 10.3289C11.8248 10.1066 11.7578 9.91567 11.6238 9.75607C11.4899 9.59362 11.3118 9.49387 11.0895 9.45682L10.0763 9.28582C9.7856 9.23452 9.53337 9.13192 9.31962 8.97802C9.10587 8.82412 8.94057 8.63175 8.82372 8.4009C8.70972 8.1672 8.65272 7.91212 8.65272 7.63567C8.65272 7.30507 8.73822 7.00867 8.90922 6.74647C9.08307 6.48142 9.3239 6.2748 9.6317 6.1266C9.9395 5.97555 10.2872 5.90002 10.6748 5.90002C11.0709 5.90002 11.4229 5.9727 11.7307 6.11805C12.0414 6.2634 12.2836 6.46575 12.4575 6.7251C12.6313 6.98445 12.7197 7.28085 12.7225 7.6143H11.7093C11.7093 7.45185 11.6666 7.3065 11.5811 7.17825C11.4956 7.04715 11.3759 6.94597 11.222 6.87472C11.0681 6.80347 10.89 6.76785 10.6876 6.76785C10.4853 6.76785 10.3071 6.80205 10.1532 6.87045C9.99935 6.93885 9.87965 7.03575 9.79415 7.16115C9.70865 7.28655 9.6659 7.4319 9.6659 7.5972C9.6659 7.791 9.7286 7.95915 9.854 8.10165C9.9794 8.2413 10.1433 8.32822 10.3456 8.36242L11.3417 8.52487C11.6352 8.57617 11.896 8.6859 12.124 8.85405C12.3549 9.0222 12.533 9.23167 12.6584 9.48247C12.7838 9.73327 12.8465 9.99975 12.8465 10.2819C12.8465 10.6239 12.7553 10.9331 12.5729 11.2096C12.3905 11.4832 12.1354 11.6983 11.8077 11.8551C11.4799 12.0118 11.1051 12.0902 10.6833 12.0902Z"
+          fill="white"/>
+</svg>
diff --git a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/as.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/as.svg
index a4afa938..8bf2482d 100644
--- a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/as.svg
+++ b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/as.svg
@@ -1,10 +1,7 @@
-<!-- Copyright 2000-2021 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. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
-    <polygon fill="#9AA7B0" fill-opacity=".8" points="8 1 8 6 3 6 3 8 13 8 13 1"/>
-    <polygon fill="#F26522" fill-opacity=".7" points="1 16 16 16 16 9 1 9"/>
-    <path fill="#231F20" fill-opacity=".7" d="M3.15,3 L2.49612121,1.4 L1.85,3 L3.15,3 Z M2.109,0 L2.89,0 L5,5 L3.9,5 L3.4,4 L1.6,4 L1.1,5 L0,5 L2.109,0 Z" transform="translate(2 10)"/>
-    <path fill="#231F20" fill-opacity=".7" d="M0.972767969,1.50152588 C0.972767969,1.13305664 1.284,1 1.845,1 C1.85033333,1 2.23533333,1 3,1 L3,0 C2.26266667,0 1.88266667,0 1.86,0 C0.778,0 0,0.45916748 0,1.45 C0,2.31452637 0.419555664,2.69049072 1.47125244,2.91607666 C2.24158869,3.08131157 2.496155,3.22862939 2.496155,3.548 C2.496155,3.86737061 2.13842773,4 1.47125244,4 C1.46058577,4 1.07016829,4 0.3,4 L0.3,5 C1.07550163,5 1.46591911,5 1.47125244,5 C3.5,5 3.5,4 3.5,3.548 C3.5,2.91607666 3.02026367,2.42071533 2.15869141,2.14685059 C1.29711914,1.87298584 0.972767969,1.86999512 0.972767969,1.50152588 Z" transform="translate(8 10)"/>
-  </g>
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2.54077 13L4.46077 2.50001H6.27577L8.23327 13H6.80077L5.46577 4.77251L5.36827 4.07501L5.27077 4.77251L4.01077 13H2.54077ZM3.65077 10.2775V9.10001H7.01077V10.2775H3.65077Z"
+          fill="#DB3B4B"/>
+    <path d="M10.943 13.18C10.398 13.18 9.9455 13.065 9.5855 12.835C9.2255 12.605 8.9555 12.2575 8.7755 11.7925C8.6005 11.3275 8.513 10.7325 8.513 10.0075H9.9455C9.9455 10.4475 9.9805 10.81 10.0505 11.095C10.1255 11.38 10.238 11.5925 10.388 11.7325C10.538 11.8675 10.728 11.935 10.958 11.935C11.173 11.935 11.3505 11.87 11.4905 11.74C11.6305 11.61 11.733 11.415 11.798 11.155C11.868 10.89 11.903 10.55 11.903 10.135C11.903 9.69001 11.838 9.33251 11.708 9.06251C11.583 8.78751 11.3855 8.57751 11.1155 8.43251L10.2755 8.02751C9.9155 7.83251 9.618 7.60501 9.383 7.34501C9.153 7.08501 8.9805 6.78251 8.8655 6.43751C8.7555 6.09251 8.7005 5.69751 8.7005 5.25251C8.7005 4.58751 8.7805 4.03751 8.9405 3.60251C9.1005 3.16751 9.343 2.84501 9.668 2.63501C9.993 2.42501 10.403 2.32001 10.898 2.32001C11.398 2.32001 11.813 2.42751 12.143 2.64251C12.473 2.85251 12.7205 3.17251 12.8855 3.60251C13.0505 4.03251 13.1355 4.58501 13.1405 5.26001H11.708C11.708 4.87001 11.678 4.55251 11.618 4.30751C11.558 4.05751 11.4705 3.87251 11.3555 3.75251C11.2405 3.62751 11.093 3.56501 10.913 3.56501C10.643 3.56501 10.443 3.70001 10.313 3.97001C10.183 4.23501 10.118 4.65501 10.118 5.23001C10.118 5.60501 10.1805 5.91251 10.3055 6.15251C10.4305 6.39251 10.623 6.58501 10.883 6.73001L11.768 7.16501C12.123 7.35501 12.4155 7.58751 12.6455 7.86251C12.8755 8.13251 13.048 8.45251 13.163 8.82251C13.278 9.19251 13.3355 9.61751 13.3355 10.0975C13.3355 10.7975 13.248 11.375 13.073 11.83C12.898 12.285 12.633 12.625 12.278 12.85C11.923 13.07 11.478 13.18 10.943 13.18Z"
+          fill="#DB3B4B"/>
 </svg>
diff --git a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScript.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScript.svg
index 0d8fa6fb..cf626328 100644
--- a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScript.svg
+++ b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScript.svg
@@ -1,10 +1,9 @@
-<!-- Copyright 2000-2021 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. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#F4AF3D" fill-opacity=".7" points="1 16 16 16 16 9 1 9"/>
-    <polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
-    <polygon fill="#9AA7B0" fill-opacity=".8" points="8 1 8 6 3 6 3 8 13 8 13 1"/>
-    <path fill="#231F20" fill-opacity=".7" d="M1.39509277,3.58770752 C1.62440186,3.83789062 1.83782861,4 2.28682861,4 C2.81318359,4 3,3.58770752 3,3.29760742 L3,0 L4,0 L4,3.58770752 C4,4.31964111 3.32670898,5 2.45,5 C1.629,5 1.15,4.76264111 0.8,4.31964111 L1.39509277,3.58770752 Z" transform="translate(1 10)"/>
-    <path fill="#231F20" fill-opacity=".7" d="M0.972767969,1.50152588 C0.972767969,1.13305664 1.284,1 1.845,1 C1.85033333,1 2.23533333,1 3,1 L3,0 C2.26266667,0 1.88266667,0 1.86,0 C0.778,0 0,0.45916748 0,1.45 C0,2.31452637 0.419555664,2.69049072 1.47125244,2.91607666 C2.24158869,3.08131157 2.496155,3.22862939 2.496155,3.548 C2.496155,3.86737061 2.13842773,4 1.47125244,4 C1.46058577,4 1.07016829,4 0.3,4 L0.3,5 C1.07550163,5 1.46591911,5 1.47125244,5 C3.5,5 3.5,4 3.5,3.548 C3.5,2.91607666 3.02026367,2.42071533 2.15869141,2.14685059 C1.29711914,1.87298584 0.972767969,1.86999512 0.972767969,1.50152588 Z" transform="translate(6 10)"/>
-  </g>
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14 4C14 2.89543 13.1046 2 12 2H4C2.89543 2 2 2.89543 2 4V12C2 13.1046 2.89543 14 4 14H12C13.1046 14 14 13.1046 14 12V4Z"
+          fill="#FFAF0F"/>
+    <path d="M9.55434 11.8593C9.88209 12.0132 10.2583 12.0901 10.6829 12.0901C11.1047 12.0901 11.4795 12.0117 11.8073 11.855C12.135 11.6982 12.3901 11.4831 12.5725 11.2095C12.7549 10.933 12.8461 10.6238 12.8461 10.2818C12.8461 9.99963 12.7834 9.73315 12.658 9.48235C12.5326 9.23155 12.3545 9.02208 12.1236 8.85393C11.8956 8.68578 11.6348 8.57605 11.3413 8.52475L10.3452 8.3623C10.1429 8.3281 9.97899 8.24118 9.85359 8.10153C9.72819 7.95903 9.66549 7.79088 9.66549 7.59708C9.66549 7.43178 9.70824 7.28643 9.79374 7.16103C9.87924 7.03563 9.99894 6.93873 10.1528 6.87033C10.3067 6.80193 10.4849 6.76773 10.6872 6.76773C10.8896 6.76773 11.0677 6.80335 11.2216 6.8746C11.3755 6.94585 11.4952 7.04703 11.5807 7.17813C11.6662 7.30638 11.7089 7.45173 11.7089 7.61418H12.7221C12.7193 7.28073 12.6309 6.98433 12.4571 6.72498C12.2832 6.46563 12.041 6.26328 11.7303 6.11793C11.4225 5.97258 11.0705 5.8999 10.6744 5.8999C10.2868 5.8999 9.93909 5.97543 9.63129 6.12648C9.32349 6.27468 9.08266 6.4813 8.90881 6.74635C8.73781 7.00855 8.65231 7.30495 8.65231 7.63555C8.65231 7.912 8.70931 8.16708 8.82331 8.40078C8.94016 8.63163 9.10546 8.824 9.31921 8.9779C9.53296 9.1318 9.78519 9.2344 10.0759 9.2857L11.0891 9.4567C11.3114 9.49375 11.4895 9.5935 11.6234 9.75595C11.7574 9.91555 11.8244 10.1065 11.8244 10.3288C11.8244 10.5055 11.7773 10.6623 11.6833 10.7991C11.5921 10.933 11.461 11.037 11.29 11.1111C11.119 11.1852 10.9209 11.2223 10.6958 11.2223C10.4649 11.2223 10.2597 11.1824 10.0802 11.1026C9.90346 11.0199 9.76524 10.9045 9.66549 10.7563C9.56574 10.6081 9.51586 10.44 9.51586 10.2519H8.50269C8.50554 10.611 8.59959 10.9302 8.78484 11.2095C8.97009 11.4859 9.22659 11.7025 9.55434 11.8593Z"
+          fill="black"/>
+    <path d="M5.22179 11H4.21289V12H5.32012C5.64787 12 5.93857 11.9316 6.19222 11.7948C6.44587 11.6551 6.64394 11.4613 6.78644 11.2134C6.92894 10.9654 7.00019 10.6804 7.00019 10.3584L7.00024 6H5.99989L5.99984 10.222C5.99984 10.3759 5.96707 10.5127 5.90152 10.6324C5.83882 10.7492 5.74762 10.8404 5.62792 10.906C5.51107 10.9687 5.37569 11 5.22179 11Z"
+          fill="black"/>
 </svg>
diff --git a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg
index fc6ba53d..cf626328 100644
--- a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg
+++ b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/javaScriptModule.svg
@@ -1,7 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g fill="none" fill-rule="evenodd">
-    <rect width="14" height="14" x="1" y="1" fill="#f7df1e" fill-opacity=".6"/>
-    <path fill="#231F20" fill-opacity=".7" d="M2.09263916,5.02279053 C2.43660278,5.37304688 2.75674292,5.6 3.43024292,5.6 C4.21977539,5.6 4.5,5.02279053 4.5,4.61665039 L4.5,0 L6,0 L6,5.02279053 C6,6.04749756 4.99006348,7 3.675,7 C2.4435,7 1.725,6.66769756 1.2,6.04749756 L2.09263916,5.02279053 Z" transform="translate(2 7)"/>
-    <path fill="#231F20" fill-opacity=".7" d="M1.45915195,2.10213623 C1.45915195,1.5862793 1.926,1.4 2.7675,1.4 C2.7755,1.4 3.353,1.4 4.5,1.4 L4.5,0 C3.394,0 2.824,0 2.79,0 C1.167,0 0,0.642834473 0,2.03 C0,3.24033691 0.629333496,3.76668701 2.20687866,4.08250732 C3.36238304,4.3138362 3.7442325,4.52008115 3.7442325,4.9672 C3.7442325,5.41431885 3.2076416,5.6 2.20687866,5.6 C2.19087866,5.6 1.60525244,5.6 0.45,5.6 L0.45,7 C1.61325244,7 2.19887866,7 2.20687866,7 C5.25,7 5.25,5.6 5.25,4.9672 C5.25,4.08250732 4.53039551,3.38900146 3.23803711,3.00559082 C1.94567871,2.62218018 1.45915195,2.61799316 1.45915195,2.10213623 Z" transform="translate(9 7)"/>
-  </g>
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14 4C14 2.89543 13.1046 2 12 2H4C2.89543 2 2 2.89543 2 4V12C2 13.1046 2.89543 14 4 14H12C13.1046 14 14 13.1046 14 12V4Z"
+          fill="#FFAF0F"/>
+    <path d="M9.55434 11.8593C9.88209 12.0132 10.2583 12.0901 10.6829 12.0901C11.1047 12.0901 11.4795 12.0117 11.8073 11.855C12.135 11.6982 12.3901 11.4831 12.5725 11.2095C12.7549 10.933 12.8461 10.6238 12.8461 10.2818C12.8461 9.99963 12.7834 9.73315 12.658 9.48235C12.5326 9.23155 12.3545 9.02208 12.1236 8.85393C11.8956 8.68578 11.6348 8.57605 11.3413 8.52475L10.3452 8.3623C10.1429 8.3281 9.97899 8.24118 9.85359 8.10153C9.72819 7.95903 9.66549 7.79088 9.66549 7.59708C9.66549 7.43178 9.70824 7.28643 9.79374 7.16103C9.87924 7.03563 9.99894 6.93873 10.1528 6.87033C10.3067 6.80193 10.4849 6.76773 10.6872 6.76773C10.8896 6.76773 11.0677 6.80335 11.2216 6.8746C11.3755 6.94585 11.4952 7.04703 11.5807 7.17813C11.6662 7.30638 11.7089 7.45173 11.7089 7.61418H12.7221C12.7193 7.28073 12.6309 6.98433 12.4571 6.72498C12.2832 6.46563 12.041 6.26328 11.7303 6.11793C11.4225 5.97258 11.0705 5.8999 10.6744 5.8999C10.2868 5.8999 9.93909 5.97543 9.63129 6.12648C9.32349 6.27468 9.08266 6.4813 8.90881 6.74635C8.73781 7.00855 8.65231 7.30495 8.65231 7.63555C8.65231 7.912 8.70931 8.16708 8.82331 8.40078C8.94016 8.63163 9.10546 8.824 9.31921 8.9779C9.53296 9.1318 9.78519 9.2344 10.0759 9.2857L11.0891 9.4567C11.3114 9.49375 11.4895 9.5935 11.6234 9.75595C11.7574 9.91555 11.8244 10.1065 11.8244 10.3288C11.8244 10.5055 11.7773 10.6623 11.6833 10.7991C11.5921 10.933 11.461 11.037 11.29 11.1111C11.119 11.1852 10.9209 11.2223 10.6958 11.2223C10.4649 11.2223 10.2597 11.1824 10.0802 11.1026C9.90346 11.0199 9.76524 10.9045 9.66549 10.7563C9.56574 10.6081 9.51586 10.44 9.51586 10.2519H8.50269C8.50554 10.611 8.59959 10.9302 8.78484 11.2095C8.97009 11.4859 9.22659 11.7025 9.55434 11.8593Z"
+          fill="black"/>
+    <path d="M5.22179 11H4.21289V12H5.32012C5.64787 12 5.93857 11.9316 6.19222 11.7948C6.44587 11.6551 6.64394 11.4613 6.78644 11.2134C6.92894 10.9654 7.00019 10.6804 7.00019 10.3584L7.00024 6H5.99989L5.99984 10.222C5.99984 10.3759 5.96707 10.5127 5.90152 10.6324C5.83882 10.7492 5.74762 10.8404 5.62792 10.906C5.51107 10.9687 5.37569 11 5.22179 11Z"
+          fill="black"/>
 </svg>
diff --git a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/json.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/json.svg
index 9898855a..d9ca60d9 100644
--- a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/json.svg
+++ b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/json.svg
@@ -1,9 +1,7 @@
-<!-- Copyright 2000-2021 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. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#231F20" fill-opacity=".7" d="M8.416 13.8965C8.416 13.7395 8.437 13.3185 8.437 13.1395 8.437 12.3195 8.127 11.9835 7.269 11.9835L7 11.9835 7 11.0155 7.269 11.0155C8.127 11.0155 8.437 10.6685 8.437 9.8485 8.437 9.6695 8.416 9.2505 8.416 9.0915 8.416 8.0195 8.882 7.3465 10.765 7.0005L10.981 7.8405C9.74 8.1885 9.575 8.5135 9.575 9.2815 9.575 9.4925 9.596 9.8385 9.596 10.0595 9.596 10.8795 9.203 11.2785 8.52 11.5005 9.213 11.7305 9.596 12.1205 9.596 12.9405 9.596 13.1615 9.575 13.5075 9.575 13.7185 9.575 14.4855 9.74 14.8115 10.981 15.1585L10.765 16.0005C8.882 15.6525 8.416 14.9795 8.416 13.8965M12.0186 15.1582C13.2596 14.8112 13.4246 14.4852 13.4246 13.7192 13.4246 13.5082 13.4046 13.1612 13.4046 12.9402 13.4046 12.1202 13.7966 11.7202 14.4796 11.5002 13.7876 11.2682 13.4046 10.8802 13.4046 10.0592 13.4046 9.8392 13.4246 9.4922 13.4246 9.2812 13.4246 8.5132 13.2596 8.1882 12.0186 7.8412L12.2356 7.0002C14.1186 7.3462 14.5836 8.0192 14.5836 9.0922 14.5836 9.2502 14.5626 9.6702 14.5626 9.8482 14.5626 10.6692 14.8726 11.0152 15.7316 11.0152L15.9996 11.0152 15.9996 11.9832 15.7316 11.9832C14.8726 11.9832 14.5626 12.3192 14.5626 13.1392 14.5626 13.3182 14.5836 13.7392 14.5836 13.8962 14.5836 14.9792 14.1186 15.6522 12.2356 16.0002L12.0186 15.1582z"/>
-    <polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
-    <path fill="#9AA7B0" fill-opacity=".8" d="M10.5957,12.9404 C10.5957,13.0624 10.5847,13.9504 10.5907,13.9754 C10.5907,13.9744 10.5927,13.9734 10.5927,13.9734 C10.6227,13.9734 11.4997,14.2654 11.4997,14.2654 C11.4997,14.2654 12.3717,13.9764 12.4247,13.9404 C12.4177,13.9274 12.4047,13.0624 12.4047,12.9404 C12.4047,12.4914 12.4937,11.9654 12.8087,11.5034 C12.5397,11.1134 12.4047,10.6304 12.4047,10.0594 C12.4047,9.9374 12.4147,9.0494 12.4087,9.0244 C12.4087,9.0254 12.4077,9.0254 12.4077,9.0254 C12.3767,9.0254 11.4997,8.7344 11.4997,8.7344 C11.4997,8.7344 10.6277,9.0234 10.5747,9.0584 C10.5817,9.0724 10.5957,9.9374 10.5957,10.0594 C10.5957,10.5084 10.5057,11.0334 10.1917,11.4964 C10.4597,11.8854 10.5957,12.3684 10.5957,12.9404"/>
-    <path fill="#9AA7B0" fill-opacity=".8" d="M7.416,13.8965 C7.416,13.8125 7.435,13.0285 7.432,12.9905 C7.392,12.9865 6,12.9835 6,12.9835 L6,10.0155 C6,10.0155 7.391,10.0125 7.431,10.0075 C7.435,9.9685 7.416,9.1765 7.416,9.0915 C7.416,6.8825 9.108,6.2885 10.584,6.0165 L11.5,5.8475 L12.416,6.0165 C12.608,6.0515 12.805,6.0935 13,6.1425 L13,1.0005 L8,1.0005 L8,6.0005 L3,6.0005 L3,15.0005 L7.609,15.0005 C7.496,14.6815 7.416,14.3285 7.416,13.8965"/>
-  </g>
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3.98755 9.77751C3.99755 9.39251 3.87005 9.08501 3.60505 8.85501C3.34005 8.62501 2.98255 8.51001 2.53255 8.51001H2V7.43001H2.53255C2.98255 7.43001 3.34005 7.31501 3.60505 7.08501C3.87005 6.85501 3.99755 6.54751 3.98755 6.16251L3.95755 4.58C3.94755 4.06 4.05505 3.605 4.28005 3.215C4.51005 2.825 4.83755 2.525 5.26255 2.315C5.68755 2.105 6.18755 2 6.76255 2H7.5V3.005H6.77005C6.25005 3.005 5.83755 3.15 5.53255 3.44C5.23255 3.725 5.08505 4.1125 5.09005 4.6025L5.12005 6.17001C5.13005 6.68001 4.99255 7.09751 4.70755 7.42251C4.42255 7.74251 4.03755 7.92001 3.55255 7.95501C4.03755 8.04501 4.42255 8.25501 4.70755 8.58501C4.99255 8.91001 5.13005 9.30501 5.12005 9.77001L5.09005 11.5475C5.08005 11.9875 5.21255 12.3375 5.48755 12.5975C5.76755 12.8625 6.14505 12.995 6.62005 12.995H7.5V14H6.61255C6.07755 14 5.60755 13.9 5.20255 13.7C4.80255 13.505 4.49255 13.2225 4.27255 12.8525C4.05755 12.4875 3.95255 12.06 3.95755 11.57L3.98755 9.77751Z"
+          fill="#834DF0"/>
+    <path d="M12.0145 9.77751C12.0045 9.39251 12.132 9.08501 12.397 8.85501C12.662 8.62501 13.0195 8.51001 13.4695 8.51001H14V7.43001H13.4695C13.0195 7.43001 12.662 7.31501 12.397 7.08501C12.132 6.85501 12.0045 6.54751 12.0145 6.16251L12.0445 4.58C12.0545 4.06 11.9445 3.605 11.7145 3.215C11.4895 2.825 11.1645 2.525 10.7395 2.315C10.3145 2.105 9.81455 2 9.23955 2H8.5V3.005H9.23205C9.75205 3.005 10.162 3.15 10.462 3.44C10.767 3.725 10.917 4.1125 10.912 4.6025L10.882 6.17001C10.872 6.68001 11.0095 7.09751 11.2945 7.42251C11.5795 7.74251 11.9645 7.92001 12.4495 7.95501C11.9645 8.04501 11.5795 8.25501 11.2945 8.58501C11.0095 8.91001 10.872 9.30501 10.882 9.77001L10.912 11.5475C10.922 11.9875 10.787 12.3375 10.507 12.5975C10.232 12.8625 9.85705 12.995 9.38205 12.995H8.5V14H9.38955C9.92455 14 10.392 13.9 10.792 13.7C11.197 13.505 11.507 13.2225 11.722 12.8525C11.942 12.4875 12.0495 12.06 12.0445 11.57L12.0145 9.77751Z"
+          fill="#834DF0"/>
 </svg>
diff --git a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/jsx.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/jsx.svg
index 81e10aad..3fdeb21a 100644
--- a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/jsx.svg
+++ b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/jsx.svg
@@ -1,17 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#F4AF3D" fill-opacity="0.7" points="1,16 16,16 16,9 1,9 	"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="7,1 3,5 7,5 	"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="8,1 8,6 3,6 3,8 13,8 13,1 	"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" d="M2.4,13.6C2.6,13.8,2.8,14,3.3,14
-		C3.8,14,4,13.6,4,13.3V10h1v3.6C5,14.3,4.3,15,3.5,15c-0.8,0-1.3-0.2-1.7-0.7L2.4,13.6z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" d="M7,11.5C7,11.1,7.3,11,7.8,11c0,0,0.4,0,1.2,0
-		v-1c-0.7,0-1.1,0-1.1,0C6.8,10,6,10.5,6,11.4c0,0.9,0.4,1.2,1.5,1.5c0.8,0.2,1,0.3,1,0.6c0,0.3-0.4,0.5-1,0.5c0,0-0.4,0-1.2,0v1
-		c0.8,0,1.2,0,1.2,0c2,0,2-1,2-1.5c0-0.6-0.5-1.1-1.3-1.4S7,11.9,7,11.5z"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" points="14.5,10 12.9,12.4 14.5,15 13.3,15 
-		12.3,13.1 11.2,15 10,15 11.6,12.4 10,10 11.2,10 12.3,11.8 13.3,10 	"/>
-</g>
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M8 9.00002C8.55229 9.00002 9 8.55231 9 8.00002C9 7.44774 8.55229 7.00002 8 7.00002C7.44772 7.00002 7 7.44774 7 8.00002C7 8.55231 7.44772 9.00002 8 9.00002Z"
+          fill="#C27D04"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M11.4999 1.93786C12.3545 2.43124 12.5569 3.83167 12.1725 5.59099C13.8883 6.13774 15 7.01324 15 8.00002C15 8.98677 13.8884 9.86226 12.1726 10.409C12.557 12.1684 12.3546 13.5688 11.5001 14.0622C10.6455 14.5556 9.33146 14.0306 8.00002 12.818C6.66856 14.0306 5.35451 14.5556 4.49993 14.0622C3.64536 13.5688 3.44298 12.1684 3.8274 10.409C2.1116 9.86226 1 8.98677 1 8.00002C1 7.01324 2.11166 6.13774 3.82753 5.59098C3.44312 3.83165 3.64551 2.43121 4.50007 1.93783C5.35462 1.44445 6.66861 1.96938 8.00002 3.18193C9.33141 1.9694 10.6454 1.44449 11.4999 1.93786ZM11.0001 13.1962C10.9342 13.2342 10.7832 13.2847 10.4662 13.202C10.1434 13.1178 9.72408 12.9111 9.23687 12.5466C9.06346 12.4168 8.88653 12.2709 8.70764 12.1097C9.03843 11.7483 9.36541 11.3477 9.68168 10.9129C10.2164 10.8564 10.727 10.7735 11.2054 10.6677C11.2556 10.9032 11.2935 11.1294 11.3191 11.3444C11.3912 11.9486 11.3606 12.4151 11.2721 12.7367C11.1852 13.0526 11.0659 13.1581 11.0001 13.1962ZM8.35159 10.9963C8.23473 11.1372 8.1174 11.2723 8.00001 11.4016C7.88263 11.2723 7.76529 11.1372 7.64843 10.9963C7.76489 10.9988 7.88211 11 8 11C8.1179 11 8.23512 10.9988 8.35159 10.9963ZM10.946 9.70083C10.7753 9.73787 10.5995 9.77192 10.419 9.80271C10.4793 9.70306 10.5391 9.60216 10.598 9.50004C10.657 9.39786 10.7146 9.29565 10.7707 9.19347C10.8343 9.36519 10.8927 9.53447 10.946 9.70083ZM9.73198 9.00004C9.92585 8.66424 10.1023 8.32984 10.2615 7.99988C10.1024 7.67 9.92593 7.3357 9.73212 7C9.53829 6.66427 9.33698 6.34429 9.13083 6.04153C8.76552 6.01437 8.38771 6.00002 8 6.00002C7.6123 6.00002 7.2345 6.01437 6.8692 6.04153C6.66305 6.34429 6.46172 6.66429 6.26788 7.00004C6.07407 7.33572 5.89763 7.67001 5.73853 7.99988C5.89767 8.32984 6.07415 8.66422 6.26802 9C6.46186 9.33575 6.66318 9.65575 6.86934 9.95852C7.23459 9.98567 7.61235 10 8 10C8.38766 10 8.76542 9.98567 9.13068 9.95852C9.33683 9.65576 9.53815 9.33577 9.73198 9.00004ZM10.5981 6.5C10.6571 6.60208 10.7146 6.70419 10.7707 6.80627C10.8342 6.63465 10.8926 6.46545 10.9459 6.29918C10.7752 6.26216 10.5995 6.22813 10.4191 6.19736C10.4795 6.297 10.5392 6.39789 10.5981 6.5ZM9.68183 5.08717C10.2165 5.14368 10.7269 5.22652 11.2053 5.3323C11.2554 5.09682 11.2933 4.87067 11.319 4.65566C11.391 4.05148 11.3604 3.58499 11.272 3.2633C11.1851 2.94743 11.0658 2.84191 10.9999 2.80389C10.9341 2.76586 10.783 2.71529 10.466 2.798C10.1432 2.88223 9.72394 3.08899 9.23673 3.45349C9.06338 3.58318 8.88649 3.72905 8.70765 3.89019C9.03849 4.25162 9.36551 4.65233 9.68183 5.08717ZM11.3635 7.99986C11.5819 7.50859 11.7654 7.0251 11.9129 6.55794C12.142 6.63227 12.3568 6.71254 12.5558 6.79785C13.1151 7.03753 13.5038 7.29725 13.7382 7.53472C13.9683 7.76789 14 7.92397 14 8.00002C14 8.07607 13.9683 8.23215 13.7382 8.46532C13.5038 8.70279 13.1151 8.96251 12.5558 9.2022C12.3568 9.28749 12.142 9.36774 11.913 9.44205C11.7654 8.97482 11.5819 8.49123 11.3635 7.99986ZM6.31835 10.9129C5.78359 10.8564 5.27303 10.7735 4.7946 10.6677C4.74444 10.9032 4.70655 11.1294 4.6809 11.3444C4.60884 11.9486 4.63942 12.4151 4.72789 12.7368C4.81476 13.0526 4.93407 13.1582 4.99993 13.1962C5.06579 13.2342 5.21683 13.2848 5.53381 13.2021C5.85665 13.1179 6.27592 12.9111 6.76313 12.5466C6.93655 12.4169 7.11349 12.2709 7.29239 12.1097C6.9616 11.7483 6.63462 11.3477 6.31835 10.9129ZM5.22931 9.19347C5.16573 9.36519 5.1073 9.53447 5.05403 9.70083C5.22474 9.73788 5.40056 9.77192 5.58106 9.80271C5.52067 9.70306 5.46096 9.60214 5.40199 9.5C5.34301 9.39784 5.28544 9.29563 5.22931 9.19347ZM4.08697 9.44206C4.23456 8.97482 4.41809 8.49124 4.63653 7.99987C4.41814 7.50859 4.23466 7.0251 4.08709 6.55794C3.85805 6.63227 3.64322 6.71254 3.44417 6.79785C2.8849 7.03753 2.4962 7.29725 2.26184 7.53472C2.03173 7.76789 2 7.92397 2 8.00002C2 8.07607 2.03173 8.23215 2.26184 8.46532C2.4962 8.70279 2.8849 8.96251 3.44417 9.2022C3.64319 9.28749 3.85797 9.36775 4.08697 9.44206ZM5.40186 6.50004C5.34293 6.60211 5.28542 6.70421 5.22934 6.80627C5.16579 6.63465 5.1074 6.46546 5.05416 6.29918C5.22478 6.26216 5.4005 6.22813 5.58091 6.19735C5.52052 6.297 5.46082 6.39791 5.40186 6.50004ZM8 5.00002C7.88206 5.00002 7.7648 5.00127 7.64829 5.00374C7.7652 4.86283 7.88259 4.7276 8.00002 4.5983C8.11745 4.7276 8.23483 4.86283 8.35174 5.00375C8.23522 5.00127 8.11795 5.00002 8 5.00002ZM6.3182 5.08717C6.63452 4.65233 6.96154 4.25161 7.29238 3.89019C7.11353 3.72903 6.93664 3.58315 6.76327 3.45345C6.27606 3.08896 5.85678 2.88219 5.53395 2.79796C5.21696 2.71526 5.06593 2.76583 5.00007 2.80385C4.93421 2.84188 4.8149 2.94739 4.72803 3.26326C4.63956 3.58496 4.60898 4.05145 4.68104 4.65563C4.70668 4.87064 4.74457 5.0968 4.79472 5.3323C5.27308 5.22652 5.78354 5.14368 6.3182 5.08717Z"
+          fill="#C27D04"/>
 </svg>
diff --git a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/typeScript.svg b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/typeScript.svg
index 05c1e277..71acf1a7 100644
--- a/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/typeScript.svg
+++ b/base-api/src/main/resources/ICON-LIB/light/consulo.javascript.JavaScriptIconGroup/typeScript.svg
@@ -1,15 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#F4AF3D" fill-opacity="0.7" points="1,16 16,16 16,9 1,9 	"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="7,1 3,5 7,5 	"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#9AA7B0" fill-opacity="0.8" points="8,1 8,6 3,6 3,8 13,8 13,1 	"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" points="3,11 1.5,11 1.5,10 5.5,10 5.5,11 
-		4,11 4,15 3,15 	"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#231F20" fill-opacity="0.7" d="M7,11.5C7,11.1,7.3,11,7.8,11c0,0,0.4,0,1.2,0
-		v-1c-0.7,0-1.1,0-1.1,0C6.8,10,6,10.5,6,11.4c0,0.9,0.4,1.2,1.5,1.5c0.8,0.2,1,0.3,1,0.6c0,0.3-0.4,0.5-1,0.5c0,0-0.4,0-1.2,0v1
-		c0.8,0,1.2,0,1.2,0c2,0,2-1,2-1.5c0-0.6-0.5-1.1-1.3-1.4S7,11.9,7,11.5z"/>
-</g>
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14 4C14 2.89543 13.1046 2 12 2H4C2.89543 2 2 2.89543 2 4V12C2 13.1046 2.89543 14 4 14H12C13.1046 14 14 13.1046 14 12V4Z"
+          fill="#3574F0"/>
+    <path d="M3.13501 5.99999H7.87171V6.99999H6V12H5V6.99999H3.13501V5.99999Z" fill="white"/>
+    <path d="M10.6833 12.0902C10.2587 12.0902 9.8825 12.0133 9.55475 11.8594C9.227 11.7026 8.9705 11.486 8.78525 11.2096C8.6 10.9303 8.50595 10.6111 8.5031 10.252H9.51627C9.51627 10.4401 9.56615 10.6082 9.6659 10.7564C9.76565 10.9046 9.90387 11.02 10.0806 11.1027C10.2601 11.1825 10.4653 11.2224 10.6962 11.2224C10.9213 11.2224 11.1194 11.1853 11.2904 11.1112C11.4614 11.0371 11.5925 10.9331 11.6837 10.7992C11.7777 10.6624 11.8248 10.5056 11.8248 10.3289C11.8248 10.1066 11.7578 9.91567 11.6238 9.75607C11.4899 9.59362 11.3118 9.49387 11.0895 9.45682L10.0763 9.28582C9.7856 9.23452 9.53337 9.13192 9.31962 8.97802C9.10587 8.82412 8.94057 8.63175 8.82372 8.4009C8.70972 8.1672 8.65272 7.91212 8.65272 7.63567C8.65272 7.30507 8.73822 7.00867 8.90922 6.74647C9.08307 6.48142 9.3239 6.2748 9.6317 6.1266C9.9395 5.97555 10.2872 5.90002 10.6748 5.90002C11.0709 5.90002 11.4229 5.9727 11.7307 6.11805C12.0414 6.2634 12.2836 6.46575 12.4575 6.7251C12.6313 6.98445 12.7197 7.28085 12.7225 7.6143H11.7093C11.7093 7.45185 11.6666 7.3065 11.5811 7.17825C11.4956 7.04715 11.3759 6.94597 11.222 6.87472C11.0681 6.80347 10.89 6.76785 10.6876 6.76785C10.4853 6.76785 10.3071 6.80205 10.1532 6.87045C9.99935 6.93885 9.87965 7.03575 9.79415 7.16115C9.70865 7.28655 9.6659 7.4319 9.6659 7.5972C9.6659 7.791 9.7286 7.95915 9.854 8.10165C9.9794 8.2413 10.1433 8.32822 10.3456 8.36242L11.3417 8.52487C11.6352 8.57617 11.896 8.6859 12.124 8.85405C12.3549 9.0222 12.533 9.23167 12.6584 9.48247C12.7838 9.73327 12.8465 9.99975 12.8465 10.2819C12.8465 10.6239 12.7553 10.9331 12.5729 11.2096C12.3905 11.4832 12.1354 11.6983 11.8077 11.8551C11.4799 12.0118 11.1051 12.0902 10.6833 12.0902Z"
+          fill="white"/>
 </svg>

From b8e3993ba644a7c40a38a89892d002af950195a7 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 4 Dec 2024 17:06:00 +0400
Subject: [PATCH 244/340] do not use index in dumb mode

---
 .../intellij/lang/javascript/psi/resolve/JSResolveUtil.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index c31b7f6d..876a91bb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -67,6 +67,7 @@
 import consulo.module.Module;
 import consulo.module.content.ProjectFileIndex;
 import consulo.module.content.ProjectRootManager;
+import consulo.project.DumbService;
 import consulo.project.Project;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.collection.SmartList;
@@ -1428,6 +1429,10 @@ public static PsiElement findClassByQName(final String link, @Nonnull GlobalSear
 
     private static PsiElement findClassByQName(final String link, final Project project, final GlobalSearchScope searchScope) {
         synchronized (project) {
+            if (DumbService.isDumb(project)) {
+                return null;
+            }
+
             final PsiElement[] result = new PsiElement[1];
 
             final Collection<JSQualifiedNamedElement> candidates =

From 2749ad5373619a4c860b3e741add045c24f6d528 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 5 Dec 2024 00:12:02 +0400
Subject: [PATCH 245/340] debug icons fixed

---
 .../run/debug/v8/V8BaseDebugProcess.java      | 437 ++++++++----------
 .../run/debug/v8/V8BaseVariableValue.java     | 261 +++++------
 .../javascript/run/debug/v8/V8StackFrame.java | 176 +++----
 .../javascript/run/debug/v8/V8WatchValue.java |  41 +-
 4 files changed, 411 insertions(+), 504 deletions(-)

diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
index 33adb147..80059353 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
@@ -16,7 +16,6 @@
 
 package consulo.javascript.run.debug.v8;
 
-import consulo.application.AllIcons;
 import consulo.application.Application;
 import consulo.execution.ExecutionResult;
 import consulo.execution.debug.*;
@@ -26,6 +25,7 @@
 import consulo.execution.debug.breakpoint.XLineBreakpoint;
 import consulo.execution.debug.evaluation.XDebuggerEditorsProvider;
 import consulo.execution.debug.frame.XSuspendContext;
+import consulo.execution.debug.icon.ExecutionDebugIconGroup;
 import consulo.execution.debug.localize.XDebuggerLocalize;
 import consulo.execution.debug.ui.XDebugTabLayouter;
 import consulo.execution.ui.ExecutionConsole;
@@ -39,14 +39,13 @@
 import consulo.ui.ex.awt.UIUtil;
 import consulo.ui.ex.content.Content;
 import consulo.virtualFileSystem.VirtualFile;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.chromium.sdk.Breakpoint;
 import org.chromium.sdk.DebugContext;
 import org.chromium.sdk.JavascriptVm;
 import org.chromium.sdk.Script;
 
-import jakarta.annotation.Nonnull;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -55,242 +54,198 @@
  * @author VISTALL
  * @since 2020-06-16
  */
-public abstract class V8BaseDebugProcess<V extends JavascriptVm> extends XDebugProcess
-{
-	protected V myVm;
-
-	private final ExecutionResult myResult;
-	private DebugContext myCurrentDebugContext;
-	private JavaScriptListPanel<Script> myScriptListPanel;
-
-	private final XBreakpointManager myXBreakpointManager;
-
-	private Map<Breakpoint, XLineBreakpoint> myBreakpoints = new HashMap<>();
-
-	public V8BaseDebugProcess(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException
-	{
-		super(session);
-		myScriptListPanel = new JavaScriptListPanel<Script>(session.getProject())
-		{
-			@Nullable
-			@Override
-			public VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen)
-			{
-				return V8ScriptUtil.toVirtualFile(value, toOpen);
-			}
-		};
-		myResult = result;
-		myXBreakpointManager = XDebuggerManager.getInstance(getSession().getProject()).getBreakpointManager();
-		getSession().setPauseActionSupported(true);
-	}
-
-	@Nullable
-	@Override
-	protected ProcessHandler doGetProcessHandler()
-	{
-		return myResult.getProcessHandler();
-	}
-
-	@Override
-	public boolean checkCanPerformCommands()
-	{
-		return myVm != null && myVm.isAttached();
-	}
-
-	@Nonnull
-	@Override
-	public XDebuggerEditorsProvider getEditorsProvider()
-	{
-		return JavaScriptEditorsProvider.INSTANCE;
-	}
-
-	@Nonnull
-	@Override
-	public ExecutionConsole createConsole()
-	{
-		return myResult.getExecutionConsole();
-	}
-
-	@Override
-	public boolean checkCanInitBreakpoints()
-	{
-		return false;
-	}
-
-	@Nonnull
-	@Override
-	public XBreakpointHandler<?>[] getBreakpointHandlers()
-	{
-		return new XBreakpointHandler[]{
-				new XBreakpointHandler<XLineBreakpoint<XBreakpointProperties>>(JavaScriptLineBreakpointType.class)
-				{
-					@Override
-					public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint)
-					{
-						String presentableFilePath = lineBreakpoint.getPresentableFilePath();
-						int line = lineBreakpoint.getLine();
-						XExpression conditionExpression = lineBreakpoint.getConditionExpression();
-						String expression = conditionExpression == null ? null : conditionExpression.getExpression();
-						myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), line, Breakpoint.EMPTY_VALUE, true, expression, new JavascriptVm.BreakpointCallback()
-						{
-							@Override
-							public void success(Breakpoint breakpoint)
-							{
-								myBreakpoints.put(breakpoint, lineBreakpoint);
-								myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, AllIcons.Debugger.Db_verified_breakpoint, null);
-							}
-
-							@Override
-							public void failure(String s)
-							{
-								myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, AllIcons.Debugger.Db_invalid_breakpoint, s);
-							}
-						}, null);
-					}
-
-					@Override
-					public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint, boolean b)
-					{
-						String presentableFilePath = breakpoint.getPresentableFilePath();
-						myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), breakpoint.getLine(), Breakpoint.EMPTY_VALUE, false, null, null, null);
-					}
-				}
-		};
-	}
-
-	@Override
-	public void startPausing()
-	{
-		myVm.suspend(new JavascriptVm.SuspendCallback()
-		{
-			@Override
-			public void success()
-			{
-				//
-			}
-
-			@Override
-			public void failure(Exception e)
-			{
-
-			}
-		});
-	}
-
-	@Override
-	public void startStepOver(@Nullable XSuspendContext context)
-	{
-		if(myCurrentDebugContext != null)
-		{
-			myCurrentDebugContext.continueVm(DebugContext.StepAction.OVER, 0, null, null);
-		}
-	}
-
-	@Override
-	public void startStepInto(@Nullable XSuspendContext context)
-	{
-		if(myCurrentDebugContext != null)
-		{
-			myCurrentDebugContext.continueVm(DebugContext.StepAction.IN, 0, null, null);
-		}
-	}
-
-	@Override
-	public void startStepOut(@Nullable XSuspendContext context)
-	{
-		if(myCurrentDebugContext != null)
-		{
-			myCurrentDebugContext.continueVm(DebugContext.StepAction.OUT, 0, null, null);
-		}
-	}
-
-	@Override
-	public void stop()
-	{
-		myVm.detach();
-		myBreakpoints.clear();
-
-		Application.get().runReadAction(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				Collection<? extends XLineBreakpoint<XBreakpointProperties>> breakpoints = myXBreakpointManager.getBreakpoints(JavaScriptLineBreakpointType
-						.class);
-				for(XLineBreakpoint<XBreakpointProperties> breakpoint : breakpoints)
-				{
-					myXBreakpointManager.updateBreakpointPresentation(breakpoint, null, null);
-				}
-			}
-		});
-	}
-
-	@Override
-	public void resume(@Nullable XSuspendContext context)
-	{
-		DebugContext currentDebugContext = myCurrentDebugContext;
-		if(currentDebugContext == null)
-		{
-			return;
-		}
-		currentDebugContext.continueVm(DebugContext.StepAction.CONTINUE, 0, null, null);
-	}
-
-	@Override
-	public void runToPosition(@Nonnull XSourcePosition position, @Nullable XSuspendContext context)
-	{
-	}
-
-	@Nonnull
-	@Override
-	public XDebugTabLayouter createTabLayouter()
-	{
-		return new XDebugTabLayouter()
-		{
-			@Override
-			public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui)
-			{
-				Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIconGroup.javascript(), null);
-				content.setCloseable(false);
-
-				ui.addContent(content);
-			}
-		};
-	}
-
-	@Override
-	public String getCurrentStateMessage()
-	{
-		if (myVm == null)
-		{
-			return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
-		}
-		else
-		{
-			if (myVm.isAttached())
-			{
-				return "Attached";
-			}
-			else
-			{
-				return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
-			}
-		}
-	}
-
-	public void addScript(final Script script)
-	{
-		UIUtil.invokeLaterIfNeeded(() -> myScriptListPanel.add(script));
-	}
-
-	@Nullable
-	public XLineBreakpoint<?> getXBreakpointByVmBreakpoint(Breakpoint breakpoint)
-	{
-		return myBreakpoints.get(breakpoint);
-	}
-
-	public void setCurrentDebugContext(DebugContext debugContext)
-	{
-		myCurrentDebugContext = debugContext;
-	}
+public abstract class V8BaseDebugProcess<V extends JavascriptVm> extends XDebugProcess {
+    protected V myVm;
+
+    private final ExecutionResult myResult;
+    private DebugContext myCurrentDebugContext;
+    private JavaScriptListPanel<Script> myScriptListPanel;
+
+    private final XBreakpointManager myXBreakpointManager;
+
+    private Map<Breakpoint, XLineBreakpoint> myBreakpoints = new HashMap<>();
+
+    public V8BaseDebugProcess(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException {
+        super(session);
+        myScriptListPanel = new JavaScriptListPanel<Script>(session.getProject()) {
+            @Nullable
+            @Override
+            public VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen) {
+                return V8ScriptUtil.toVirtualFile(value, toOpen);
+            }
+        };
+        myResult = result;
+        myXBreakpointManager = XDebuggerManager.getInstance(getSession().getProject()).getBreakpointManager();
+        getSession().setPauseActionSupported(true);
+    }
+
+    @Nullable
+    @Override
+    protected ProcessHandler doGetProcessHandler() {
+        return myResult.getProcessHandler();
+    }
+
+    @Override
+    public boolean checkCanPerformCommands() {
+        return myVm != null && myVm.isAttached();
+    }
+
+    @Nonnull
+    @Override
+    public XDebuggerEditorsProvider getEditorsProvider() {
+        return JavaScriptEditorsProvider.INSTANCE;
+    }
+
+    @Nonnull
+    @Override
+    public ExecutionConsole createConsole() {
+        return myResult.getExecutionConsole();
+    }
+
+    @Override
+    public boolean checkCanInitBreakpoints() {
+        return false;
+    }
+
+    @Nonnull
+    @Override
+    public XBreakpointHandler<?>[] getBreakpointHandlers() {
+        return new XBreakpointHandler[]{
+            new XBreakpointHandler<XLineBreakpoint<XBreakpointProperties>>(JavaScriptLineBreakpointType.class) {
+                @Override
+                public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint) {
+                    String presentableFilePath = lineBreakpoint.getPresentableFilePath();
+                    int line = lineBreakpoint.getLine();
+                    XExpression conditionExpression = lineBreakpoint.getConditionExpression();
+                    String expression = conditionExpression == null ? null : conditionExpression.getExpression();
+                    myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), line, Breakpoint.EMPTY_VALUE, true, expression, new JavascriptVm.BreakpointCallback() {
+                        @Override
+                        public void success(Breakpoint breakpoint) {
+                            myBreakpoints.put(breakpoint, lineBreakpoint);
+                            myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, ExecutionDebugIconGroup.breakpointBreakpointvalid(), null);
+                        }
+
+                        @Override
+                        public void failure(String s) {
+                            myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, ExecutionDebugIconGroup.breakpointBreakpointinvalid(), s);
+                        }
+                    }, null);
+                }
+
+                @Override
+                public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint, boolean b) {
+                    String presentableFilePath = breakpoint.getPresentableFilePath();
+                    myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), breakpoint.getLine(), Breakpoint.EMPTY_VALUE, false, null, null, null);
+                }
+            }
+        };
+    }
+
+    @Override
+    public void startPausing() {
+        myVm.suspend(new JavascriptVm.SuspendCallback() {
+            @Override
+            public void success() {
+                //
+            }
+
+            @Override
+            public void failure(Exception e) {
+
+            }
+        });
+    }
+
+    @Override
+    public void startStepOver(@Nullable XSuspendContext context) {
+        if (myCurrentDebugContext != null) {
+            myCurrentDebugContext.continueVm(DebugContext.StepAction.OVER, 0, null, null);
+        }
+    }
+
+    @Override
+    public void startStepInto(@Nullable XSuspendContext context) {
+        if (myCurrentDebugContext != null) {
+            myCurrentDebugContext.continueVm(DebugContext.StepAction.IN, 0, null, null);
+        }
+    }
+
+    @Override
+    public void startStepOut(@Nullable XSuspendContext context) {
+        if (myCurrentDebugContext != null) {
+            myCurrentDebugContext.continueVm(DebugContext.StepAction.OUT, 0, null, null);
+        }
+    }
+
+    @Override
+    public void stop() {
+        myVm.detach();
+        myBreakpoints.clear();
+
+        Application.get().runReadAction(new Runnable() {
+            @Override
+            public void run() {
+                Collection<? extends XLineBreakpoint<XBreakpointProperties>> breakpoints = myXBreakpointManager.getBreakpoints(JavaScriptLineBreakpointType
+                    .class);
+                for (XLineBreakpoint<XBreakpointProperties> breakpoint : breakpoints) {
+                    myXBreakpointManager.updateBreakpointPresentation(breakpoint, null, null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void resume(@Nullable XSuspendContext context) {
+        DebugContext currentDebugContext = myCurrentDebugContext;
+        if (currentDebugContext == null) {
+            return;
+        }
+        currentDebugContext.continueVm(DebugContext.StepAction.CONTINUE, 0, null, null);
+    }
+
+    @Override
+    public void runToPosition(@Nonnull XSourcePosition position, @Nullable XSuspendContext context) {
+    }
+
+    @Nonnull
+    @Override
+    public XDebugTabLayouter createTabLayouter() {
+        return new XDebugTabLayouter() {
+            @Override
+            public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui) {
+                Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIconGroup.javascript(), null);
+                content.setCloseable(false);
+
+                ui.addContent(content);
+            }
+        };
+    }
+
+    @Override
+    public String getCurrentStateMessage() {
+        if (myVm == null) {
+            return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
+        }
+        else {
+            if (myVm.isAttached()) {
+                return "Attached";
+            }
+            else {
+                return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
+            }
+        }
+    }
+
+    public void addScript(final Script script) {
+        UIUtil.invokeLaterIfNeeded(() -> myScriptListPanel.add(script));
+    }
+
+    @Nullable
+    public XLineBreakpoint<?> getXBreakpointByVmBreakpoint(Breakpoint breakpoint) {
+        return myBreakpoints.get(breakpoint);
+    }
+
+    public void setCurrentDebugContext(DebugContext debugContext) {
+        myCurrentDebugContext = debugContext;
+    }
 }
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
index f2fc8792..25d17828 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
@@ -16,165 +16,144 @@
 
 package consulo.javascript.run.debug.v8;
 
-import consulo.application.AllIcons;
 import consulo.execution.debug.frame.*;
 import consulo.execution.debug.frame.presentation.XValuePresentation;
+import consulo.execution.debug.icon.ExecutionDebugIconGroup;
 import consulo.ui.image.Image;
-import org.chromium.sdk.*;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import org.chromium.sdk.*;
+
 import java.util.Collection;
 
 /**
  * @author VISTALL
  * @since 20.03.14
  */
-public abstract class V8BaseVariableValue extends XNamedValue
-{
-	@Nonnull
-	protected final JsEvaluateContext myEvaluateContext;
+public abstract class V8BaseVariableValue extends XNamedValue {
+    @Nonnull
+    protected final JsEvaluateContext myEvaluateContext;
 
-	protected V8BaseVariableValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull String name)
-	{
-		super(name);
-		myEvaluateContext = evaluateContext;
-	}
+    protected V8BaseVariableValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull String name) {
+        super(name);
+        myEvaluateContext = evaluateContext;
+    }
 
-	@Nonnull
-	protected abstract JsValue getValue();
+    @Nonnull
+    protected abstract JsValue getValue();
 
-	@Override
-	public void computeChildren(@Nonnull XCompositeNode node)
-	{
-		XValueChildrenList valueChildrenList = new XValueChildrenList();
+    @Override
+    public void computeChildren(@Nonnull XCompositeNode node) {
+        XValueChildrenList valueChildrenList = new XValueChildrenList();
 
-		JsValue value = getValue();
-		if(value instanceof JsArray)
-		{
-			long length = ((JsArray) value).getLength();
-			for(int i = 0; i < length; i++)
-			{
-				V8VariableValue.addValue(valueChildrenList, myEvaluateContext, ((JsArray) value).get(i));
-			}
-		}
-		else if(value instanceof JsObject)
-		{
-			Collection<? extends JsVariable> properties = ((JsObject) value).getProperties();
-			for(JsVariable property : properties)
-			{
-				V8VariableValue.addValue(valueChildrenList, myEvaluateContext, property);
-			}
-		}
-		node.addChildren(valueChildrenList, true);
-	}
+        JsValue value = getValue();
+        if (value instanceof JsArray) {
+            long length = ((JsArray) value).getLength();
+            for (int i = 0; i < length; i++) {
+                V8VariableValue.addValue(valueChildrenList, myEvaluateContext, ((JsArray) value).get(i));
+            }
+        }
+        else if (value instanceof JsObject) {
+            Collection<? extends JsVariable> properties = ((JsObject) value).getProperties();
+            for (JsVariable property : properties) {
+                V8VariableValue.addValue(valueChildrenList, myEvaluateContext, property);
+            }
+        }
+        node.addChildren(valueChildrenList, true);
+    }
 
-	@Nonnull
-	protected Image getIconForValue(JsValue value, JsValue.Type valueType)
-	{
-		if(value instanceof JsArray)
-		{
-			return AllIcons.Debugger.Db_array;
-		}
-		switch(valueType)
-		{
-			case TYPE_NUMBER:
-			case TYPE_NULL:
-			case TYPE_REGEXP:
-			case TYPE_UNDEFINED:
-			case TYPE_BOOLEAN:
-			case TYPE_STRING:
-				return AllIcons.Debugger.Db_primitive;
-		}
-		return AllIcons.Debugger.Value;
-	}
+    @Nonnull
+    protected Image getIconForValue(JsValue value, JsValue.Type valueType) {
+        if (value instanceof JsArray) {
+            return ExecutionDebugIconGroup.nodeArray();
+        }
+        switch (valueType) {
+            case TYPE_NUMBER:
+            case TYPE_NULL:
+            case TYPE_REGEXP:
+            case TYPE_UNDEFINED:
+            case TYPE_BOOLEAN:
+            case TYPE_STRING:
+                return ExecutionDebugIconGroup.nodePrimitive();
+        }
+        return ExecutionDebugIconGroup.nodeValue();
+    }
 
-	private static boolean canHaveChildren(JsValue value, JsValue.Type valueType)
-	{
-		if(value instanceof JsArray)
-		{
-			return ((JsArray) value).getLength() > 0;
-		}
-		switch(valueType)
-		{
-			case TYPE_NUMBER:
-			case TYPE_NULL:
-			case TYPE_REGEXP:
-			case TYPE_UNDEFINED:
-			case TYPE_STRING:
-			case TYPE_BOOLEAN:
-				return false;
-		}
-		return true;
-	}
+    private static boolean canHaveChildren(JsValue value, JsValue.Type valueType) {
+        if (value instanceof JsArray) {
+            return ((JsArray) value).getLength() > 0;
+        }
+        switch (valueType) {
+            case TYPE_NUMBER:
+            case TYPE_NULL:
+            case TYPE_REGEXP:
+            case TYPE_UNDEFINED:
+            case TYPE_STRING:
+            case TYPE_BOOLEAN:
+                return false;
+        }
+        return true;
+    }
 
-	@Override
-	public void computePresentation(@Nonnull XValueNode valueNode, @Nonnull XValuePlace xValuePlace)
-	{
-		final JsValue value = getValue();
-		final JsValue.Type valueType = value.getType();
+    @Override
+    public void computePresentation(@Nonnull XValueNode valueNode, @Nonnull XValuePlace xValuePlace) {
+        final JsValue value = getValue();
+        final JsValue.Type valueType = value.getType();
 
-		valueNode.setPresentation(getIconForValue(value, valueType), new XValuePresentation()
-		{
-			@Nullable
-			@Override
-			public String getType()
-			{
-				switch(valueType)
-				{
-					case TYPE_NUMBER:
-					case TYPE_STRING:
-					case TYPE_NULL:
-					case TYPE_DATE:
-					case TYPE_REGEXP:
-					case TYPE_UNDEFINED:
-					case TYPE_BOOLEAN:
-						return null;
-					default:
-						if(value instanceof JsArray)
-						{
-							return ((JsArray) value).getClassName() + "[" + ((JsArray) value).getLength() + "]";
-						}
-						else if(value instanceof JsObject)
-						{
-							return ((JsObject) value).getClassName();
-						}
-						return null;
-				}
-			}
+        valueNode.setPresentation(getIconForValue(value, valueType), new XValuePresentation() {
+            @Nullable
+            @Override
+            public String getType() {
+                switch (valueType) {
+                    case TYPE_NUMBER:
+                    case TYPE_STRING:
+                    case TYPE_NULL:
+                    case TYPE_DATE:
+                    case TYPE_REGEXP:
+                    case TYPE_UNDEFINED:
+                    case TYPE_BOOLEAN:
+                        return null;
+                    default:
+                        if (value instanceof JsArray) {
+                            return ((JsArray) value).getClassName() + "[" + ((JsArray) value).getLength() + "]";
+                        }
+                        else if (value instanceof JsObject) {
+                            return ((JsObject) value).getClassName();
+                        }
+                        return null;
+                }
+            }
 
-			@Override
-			public void renderValue(@Nonnull XValueTextRenderer textRenderer)
-			{
-				switch(value.getType())
-				{
-					case TYPE_NUMBER:
-						textRenderer.renderValue(value.getValueString());
-						break;
-					case TYPE_STRING:
-						textRenderer.renderStringValue(value.getValueString());
-						break;
-					case TYPE_FUNCTION:
-						break;
-					case TYPE_BOOLEAN:
-						textRenderer.renderValue(value.getValueString());
-						break;
-					case TYPE_ERROR:
-						break;
-					case TYPE_REGEXP:
-						textRenderer.renderStringValue(value.getValueString());
-						break;
-					case TYPE_DATE:
-						textRenderer.renderValue(value.getValueString());
-						break;
-					case TYPE_UNDEFINED:
-						textRenderer.renderValue("undefined");
-						break;
-					case TYPE_NULL:
-						textRenderer.renderValue("null");
-						break;
-				}
-			}
-		}, canHaveChildren(value, valueType));
-	}
+            @Override
+            public void renderValue(@Nonnull XValueTextRenderer textRenderer) {
+                switch (value.getType()) {
+                    case TYPE_NUMBER:
+                        textRenderer.renderValue(value.getValueString());
+                        break;
+                    case TYPE_STRING:
+                        textRenderer.renderStringValue(value.getValueString());
+                        break;
+                    case TYPE_FUNCTION:
+                        break;
+                    case TYPE_BOOLEAN:
+                        textRenderer.renderValue(value.getValueString());
+                        break;
+                    case TYPE_ERROR:
+                        break;
+                    case TYPE_REGEXP:
+                        textRenderer.renderStringValue(value.getValueString());
+                        break;
+                    case TYPE_DATE:
+                        textRenderer.renderValue(value.getValueString());
+                        break;
+                    case TYPE_UNDEFINED:
+                        textRenderer.renderValue("undefined");
+                        break;
+                    case TYPE_NULL:
+                        textRenderer.renderValue("null");
+                        break;
+                }
+            }
+        }, canHaveChildren(value, valueType));
+    }
 }
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
index 1ddb7998..b4699719 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
@@ -26,9 +26,9 @@
 import consulo.ui.ex.ColoredTextContainer;
 import consulo.ui.ex.SimpleTextAttributes;
 import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.chromium.sdk.*;
 
-import jakarta.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 
@@ -36,113 +36,91 @@
  * @author VISTALL
  * @since 20.03.14
  */
-public class V8StackFrame extends XStackFrame
-{
-	private final CallFrame myCallFrame;
+public class V8StackFrame extends XStackFrame {
+    private final CallFrame myCallFrame;
 
-	public V8StackFrame(CallFrame callFrame)
-	{
-		myCallFrame = callFrame;
-	}
+    public V8StackFrame(CallFrame callFrame) {
+        myCallFrame = callFrame;
+    }
 
-	@Nullable
-	@Override
-	public XDebuggerEvaluator getEvaluator()
-	{
-		return new XDebuggerEvaluator()
-		{
-			@Override
-			public void evaluate(@Nonnull final String expression, @Nonnull final XEvaluationCallback callback, @Nullable XSourcePosition expressionPosition)
-			{
-				final JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
-				evaluateContext.evaluateSync(expression, Collections.<String, JsValue>emptyMap(), new JsEvaluateContext.EvaluateCallback()
-				{
-					@Override
-					public void success(JsEvaluateContext.ResultOrException e)
-					{
-						JsValue result = e.getResult() == null ? e.getException() : e.getResult();
-						if(result != null)
-						{
-							callback.evaluated(new V8WatchValue(evaluateContext, expression, result));
-						}
-						else
-						{
-							callback.errorOccurred("bad expression");
-						}
-					}
+    @Nullable
+    @Override
+    public XDebuggerEvaluator getEvaluator() {
+        return new XDebuggerEvaluator() {
+            @Override
+            public void evaluate(@Nonnull final String expression, @Nonnull final XEvaluationCallback callback, @Nullable XSourcePosition expressionPosition) {
+                final JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
+                evaluateContext.evaluateSync(expression, Collections.<String, JsValue>emptyMap(), new JsEvaluateContext.EvaluateCallback() {
+                    @Override
+                    public void success(JsEvaluateContext.ResultOrException e) {
+                        JsValue result = e.getResult() == null ? e.getException() : e.getResult();
+                        if (result != null) {
+                            callback.evaluated(new V8WatchValue(evaluateContext, expression, result));
+                        }
+                        else {
+                            callback.errorOccurred("bad expression");
+                        }
+                    }
 
-					@Override
-					public void failure(Exception e)
-					{
-						callback.errorOccurred(e.getMessage());
-					}
-				});
-			}
+                    @Override
+                    public void failure(Exception e) {
+                        callback.errorOccurred(e.getMessage());
+                    }
+                });
+            }
 
-			@Override
-			public boolean isCodeFragmentEvaluationSupported()
-			{
-				return false;
-			}
-		};
-	}
+            @Override
+            public boolean isCodeFragmentEvaluationSupported() {
+                return false;
+            }
+        };
+    }
 
-	@Override
-	public void computeChildren(@Nonnull XCompositeNode node)
-	{
-		JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
-		List<? extends JsScope> variableScopes = myCallFrame.getVariableScopes();
+    @Override
+    public void computeChildren(@Nonnull XCompositeNode node) {
+        JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
+        List<? extends JsScope> variableScopes = myCallFrame.getVariableScopes();
 
-		XValueChildrenList valueChildrenList = new XValueChildrenList();
+        XValueChildrenList valueChildrenList = new XValueChildrenList();
 
-		for(JsScope variableScope : variableScopes)
-		{
-			switch(variableScope.getType())
-			{
-				case LOCAL:
-					JsScope.Declarative declarative = variableScope.asDeclarativeScope();
-					if(declarative == null)
-					{
-						break;
-					}
-					for(JsVariable jsVariable : declarative.getVariables())
-					{
-						V8VariableValue.addValue(valueChildrenList, evaluateContext, jsVariable);
-					}
-					break;
-			}
-		}
-		node.addChildren(valueChildrenList, true);
-	}
+        for (JsScope variableScope : variableScopes) {
+            switch (variableScope.getType()) {
+                case LOCAL:
+                    JsScope.Declarative declarative = variableScope.asDeclarativeScope();
+                    if (declarative == null) {
+                        break;
+                    }
+                    for (JsVariable jsVariable : declarative.getVariables()) {
+                        V8VariableValue.addValue(valueChildrenList, evaluateContext, jsVariable);
+                    }
+                    break;
+            }
+        }
+        node.addChildren(valueChildrenList, true);
+    }
 
-	@Override
-	public void customizePresentation(ColoredTextContainer component)
-	{
-		TextStreamPosition statementStartPosition = myCallFrame.getStatementStartPosition();
+    @Override
+    public void customizePresentation(ColoredTextContainer component) {
+        TextStreamPosition statementStartPosition = myCallFrame.getStatementStartPosition();
 
-		XSourcePosition position = getSourcePosition();
-		if(position != null)
-		{
-			component.append(position.getFile().getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
-		}
-		else
-		{
-			component.append(myCallFrame.getScript().getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
-		}
+        XSourcePosition position = getSourcePosition();
+        if (position != null) {
+            component.append(position.getFile().getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
+        }
+        else {
+            component.append(myCallFrame.getScript().getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
+        }
 
-		component.append(":" + (statementStartPosition.getLine() + 1), SimpleTextAttributes.REGULAR_ATTRIBUTES);
-		component.setIcon(PlatformIconGroup.debuggerFrame());
-	}
+        component.append(":" + (statementStartPosition.getLine() + 1), SimpleTextAttributes.REGULAR_ATTRIBUTES);
+    }
 
-	@Override
-	@Nullable
-	public XSourcePosition getSourcePosition()
-	{
-		TextStreamPosition statementStartPosition = myCallFrame.getStatementStartPosition();
-		if(myCallFrame.getScript().getName() == null)
-		{
-			return null;
-		}
-		return XDebuggerUtil.getInstance().createPosition(V8ScriptUtil.toVirtualFile(myCallFrame.getScript(), true), statementStartPosition.getLine());
-	}
+    @Override
+    @Nullable
+    public XSourcePosition getSourcePosition() {
+        TextStreamPosition statementStartPosition = myCallFrame.getStatementStartPosition();
+        if (myCallFrame.getScript().getName() == null) {
+            return null;
+        }
+        return XDebuggerUtil.getInstance().createPosition(V8ScriptUtil.toVirtualFile(myCallFrame.getScript(), true), statementStartPosition.getLine());
+    }
 }
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
index fb9b4d1b..3014c12f 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
@@ -16,38 +16,33 @@
 
 package consulo.javascript.run.debug.v8;
 
-import consulo.application.AllIcons;
+import consulo.execution.debug.icon.ExecutionDebugIconGroup;
 import consulo.ui.image.Image;
+import jakarta.annotation.Nonnull;
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsValue;
 
-import jakarta.annotation.Nonnull;
-
 /**
  * @author VISTALL
  * @since 05.12.2015
  */
-public class V8WatchValue extends V8BaseVariableValue
-{
-	private JsValue myValue;
+public class V8WatchValue extends V8BaseVariableValue {
+    private JsValue myValue;
 
-	public V8WatchValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull String text, @Nonnull JsValue value)
-	{
-		super(evaluateContext, text);
-		myValue = value;
-	}
+    public V8WatchValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull String text, @Nonnull JsValue value) {
+        super(evaluateContext, text);
+        myValue = value;
+    }
 
-	@Nonnull
-	@Override
-	protected Image getIconForValue(JsValue value, JsValue.Type valueType)
-	{
-		return AllIcons.Debugger.Watch;
-	}
+    @Nonnull
+    @Override
+    protected Image getIconForValue(JsValue value, JsValue.Type valueType) {
+        return ExecutionDebugIconGroup.nodeWatch();
+    }
 
-	@Nonnull
-	@Override
-	protected JsValue getValue()
-	{
-		return myValue;
-	}
+    @Nonnull
+    @Override
+    protected JsValue getValue() {
+        return myValue;
+    }
 }

From 3f5618ab23d11d1f15169a6855d06418ae6e3a77 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 17 Dec 2024 15:42:47 +0400
Subject: [PATCH 246/340] drop reference search which do nothing

---
 .../search/JSReferencesSearchExecutor.java    | 73 -------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java
deleted file mode 100644
index b1f96176..00000000
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSReferencesSearchExecutor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2000-2005 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.
- */
-
-package com.intellij.lang.javascript.impl.search;
-
-import consulo.annotation.component.ExtensionImpl;
-import consulo.application.ReadAction;
-import consulo.application.util.function.Processor;
-import consulo.javascript.language.JavaScriptFileType;
-import consulo.javascript.language.JavaScriptLanguage;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiFile;
-import consulo.language.psi.PsiNamedElement;
-import consulo.language.psi.PsiReference;
-import consulo.language.psi.scope.GlobalSearchScope;
-import consulo.language.psi.scope.LocalSearchScope;
-import consulo.language.psi.search.PsiSearchHelper;
-import consulo.language.psi.search.ReferencesSearch;
-import consulo.language.psi.search.ReferencesSearchQueryExecutor;
-
-/**
- * @author Maxim.Mossienko
- *         Date: Apr 28, 2008
- *         Time: 8:34:20 PM
- */
-@ExtensionImpl
-public class JSReferencesSearchExecutor implements ReferencesSearchQueryExecutor
-{
-	@Override
-	public boolean execute(final ReferencesSearch.SearchParameters queryParameters, final Processor<? super PsiReference> consumer)
-	{
-		final PsiElement sourceElement = queryParameters.getElementToSearch();
-
-		if(sourceElement instanceof PsiNamedElement &&
-				sourceElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE) &&
-				queryParameters.getScope() instanceof GlobalSearchScope &&
-				!(sourceElement.getUseScope() instanceof LocalSearchScope))
-		{
-			final String s = ReadAction.compute(() -> ((PsiNamedElement) sourceElement).getName());
-			if(s == null)
-			{
-				return true;
-			}
-			PsiSearchHelper.SERVICE.getInstance(sourceElement.getProject()).processAllFilesWithWordInLiterals(s, GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.projectScope
-					(sourceElement.getProject()), JavaScriptFileType.INSTANCE), new Processor<PsiFile>()
-			{
-				@Override
-				public boolean process(final PsiFile psiFile)
-				{
-					/*if(psiFile.getLanguage() == JavaScriptSupportLoader.JSON)
-					{
-						ReferencesSearch.search(sourceElement, new LocalSearchScope(psiFile)).forEach(consumer);
-					}         */
-					return true;
-				}
-			});
-		}
-		return true;
-	}
-}

From 67eee5105db57790981c48da6753723defb28093 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 29 Dec 2024 06:23:42 +0300
Subject: [PATCH 247/340] JavaDoc @author/@since.

---
 .../lang/javascript/impl/inspections/JSInspection.java     | 5 ++---
 .../javascript/impl/search/JSDeclarationRangeHandler.java  | 3 +--
 .../impl/surroundWith/JSStatementSurrounder.java           | 7 ++-----
 .../impl/surroundWith/JSStatementsSurroundDescriptor.java  | 5 ++---
 .../impl/surroundWith/JSWithBlockSurrounder.java           | 7 ++-----
 .../impl/surroundWith/JSWithDoWhileSurrounder.java         | 7 ++-----
 .../javascript/impl/surroundWith/JSWithForSurrounder.java  | 7 ++-----
 .../impl/surroundWith/JSWithIfElseSurrounder.java          | 7 ++-----
 .../javascript/impl/surroundWith/JSWithIfSurrounder.java   | 7 ++-----
 .../impl/surroundWith/JSWithParenthesesSurrounder.java     | 7 ++-----
 .../impl/surroundWith/JSWithTryCatchFinallySurrounder.java | 7 ++-----
 .../impl/surroundWith/JSWithTryCatchSurrounder.java        | 7 ++-----
 .../impl/surroundWith/JSWithTryFinallySurrounder.java      | 7 ++-----
 .../impl/surroundWith/JSWithWhileSurrounder.java           | 7 ++-----
 14 files changed, 27 insertions(+), 63 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
index 3db30641..b27a2a98 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
@@ -36,9 +36,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * User: Maxim.Mossienko
- * Date: Apr 18, 2006
- * Time: 7:34:46 PM
+ * @author Maxim.Mossienko
+ * @since 2006-08-18
  */
 public abstract class JSInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
index 1e746881..5f6a662d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
@@ -26,8 +26,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Apr 28, 2008
- * Time: 8:36:19 PM
+ * @since 2008-04-28
  */
 @ExtensionImpl
 public class JSDeclarationRangeHandler implements DeclarationRangeHandler<JSNamedElement>
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
index b3944fd6..7cff56ec 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
@@ -32,11 +32,8 @@
 import consulo.language.psi.PsiElement;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 16:50:58
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public abstract class JSStatementSurrounder implements Surrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
index a9023d2a..4fbfa002 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
@@ -37,9 +37,8 @@
 import java.util.List;
 
 /**
- * User: yole
- * Date: 12.07.2005
- * Time: 14:14:55
+ * @author yole
+ * @since 2005-07-12
  */
 @ExtensionImpl
 public class JSStatementsSurroundDescriptor implements SurroundDescriptor
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
index 43a566f0..e7d8acb1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
@@ -22,11 +22,8 @@
 import consulo.language.psi.PsiElement;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 14:15:25
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithBlockSurrounder extends JSStatementSurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
index 22edc648..1a387200 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
@@ -24,11 +24,8 @@
 import consulo.project.Project;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 18:07:02
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithDoWhileSurrounder extends JSStatementSurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
index d90c76d5..63d1223b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
@@ -27,11 +27,8 @@
 import consulo.project.Project;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 18:29:38
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithForSurrounder extends JSStatementSurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
index 06e4d222..9c71d351 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
@@ -21,11 +21,8 @@
 import consulo.project.Project;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 17:48:14
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithIfElseSurrounder extends JSWithIfSurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
index 194d9007..dd3492e8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
@@ -25,11 +25,8 @@
 import org.jetbrains.annotations.NonNls;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 16:33:55
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithIfSurrounder extends JSStatementSurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
index caf7926d..267b0e15 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
@@ -31,11 +31,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 12:47:49
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithParenthesesSurrounder implements Surrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
index fd8b5bd8..5ce9d2d9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -29,11 +29,8 @@
 import org.jetbrains.annotations.NonNls;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 19:21:52
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithTryCatchFinallySurrounder extends JSStatementSurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
index 2e9853eb..c5f918d6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
@@ -21,11 +21,8 @@
 import consulo.project.Project;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 19:29:10
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithTryCatchSurrounder extends JSWithTryCatchFinallySurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
index f5c5484e..79caef66 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
@@ -21,11 +21,8 @@
 import consulo.project.Project;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 19:24:26
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithTryFinallySurrounder extends JSWithTryCatchFinallySurrounder
 {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
index 01aa5755..aa269fb2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
@@ -24,11 +24,8 @@
 import consulo.project.Project;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 18:03:50
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithWhileSurrounder extends JSStatementSurrounder
 {

From 89747b287104ba7aff696c5a0d7aafbaca467b49 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 29 Dec 2024 06:24:57 +0300
Subject: [PATCH 248/340] Some code reformat.

---
 .../lang/javascript/impl/JSNodeVisitor.java   | 850 ++++++++----------
 .../impl/JSSmartEnterProcessor.java           | 262 +++---
 .../impl/JavaScriptTargetElementUtilEx.java   |  36 +-
 .../javascript/impl/JavascriptCommenter.java  | 156 ++--
 4 files changed, 580 insertions(+), 724 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java
index b9c93c9d..990c8836 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java
@@ -23,485 +23,375 @@
 import consulo.language.ast.IElementType;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Feb 1, 2005
- * Time: 7:13:40 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-02-01
  */
-public abstract class JSNodeVisitor
-{
-	public final void visit(ASTNode node)
-	{
-		final IElementType type = node.getElementType();
-		if(type instanceof JSFileElementType)
-		{
-			visitFile(node);
-		}
-		else if(type == JSElementTypes.FUNCTION_DECLARATION)
-		{
-			visitFunctionDeclaration(node);
-		}
-		else if(type == JSElementTypes.PARAMETER_LIST)
-		{
-			visitParameterList(node);
-		}
-		else if(type == JSElementTypes.VARIABLE)
-		{
-			visitVariable(node);
-		}
-		else if(type == JSElementTypes.FORMAL_PARAMETER)
-		{
-			visitParameter(node);
-		}
-		else if(type == JSElementTypes.ARGUMENT_LIST)
-		{
-			visitArgumentList(node);
-		}
-		else if(type == JSElementTypes.BLOCK_STATEMENT)
-		{
-			visitBlock(node);
-		}
-		else if(type == JSElementTypes.LABELED_STATEMENT)
-		{
-			visitLabeledStatement(node);
-		}
-		else if(type == JSElementTypes.EXPRESSION_STATEMENT)
-		{
-			visitExpressionStatement(node);
-		}
-		else if(type == JSElementTypes.VAR_STATEMENT)
-		{
-			visitVarStatement(node);
-		}
-		else if(type == JSElementTypes.EMPTY_STATEMENT)
-		{
-			visitEmptyStatement(node);
-		}
-		else if(type == JSElementTypes.IF_STATEMENT)
-		{
-			visitIfStatement(node);
-		}
-		else if(type == JSElementTypes.CONTINUE_STATEMENT)
-		{
-			visitContinueStatement(node);
-		}
-		else if(type == JSElementTypes.BREAK_STATEMENT)
-		{
-			visitBreakStatement(node);
-		}
-		else if(type == JSElementTypes.WITH_STATEMENT)
-		{
-			visitWithStatement(node);
-		}
-		else if(type == JSElementTypes.RETURN_STATEMENT)
-		{
-			visitReturnStatement(node);
-		}
-		else if(type == JSElementTypes.THROW_STATEMENT)
-		{
-			visitThrowStatement(node);
-		}
-		else if(type == JSElementTypes.TRY_STATEMENT)
-		{
-			visitTryStatement(node);
-		}
-		else if(type == JSElementTypes.CATCH_BLOCK)
-		{
-			visitCatchBlock(node);
-		}
-		else if(type == JSElementTypes.SWITCH_STATEMENT)
-		{
-			visitSwitchStatement(node);
-		}
-		else if(type == JSElementTypes.CASE_CLAUSE)
-		{
-			visitCaseClause(node);
-		}
-		else if(type == JSElementTypes.WHILE_STATEMENT)
-		{
-			visitWhileStatement(node);
-		}
-		else if(type == JSElementTypes.DOWHILE_STATEMENT)
-		{
-			visitDoWhileStatement(node);
-		}
-		else if(type == JSElementTypes.FOR_STATEMENT)
-		{
-			visitForStatement(node);
-		}
-		else if(type == JSElementTypes.FOR_IN_STATEMENT)
-		{
-			visitForInStatement(node);
-		}
-		else if(type == JSElementTypes.THIS_EXPRESSION)
-		{
-			visitThisExpression(node);
-		}
-		else if(type == JSElementTypes.LITERAL_EXPRESSION)
-		{
-			visitLiteralExpression(node);
-		}
-		else if(type == JSElementTypes.REGEXP_LITERAL_EXPRESSION)
-		{
-			visitLiteralExpression(node);
-		}
-		else if(type == JSElementTypes.REFERENCE_EXPRESSION)
-		{
-			visitReferenceExpression(node);
-		}
-		else if(type == JSElementTypes.PARENTHESIZED_EXPRESSION)
-		{
-			visitParenthesizedExpression(node);
-		}
-		else if(type == JSElementTypes.ARRAY_LITERAL_EXPRESSION)
-		{
-			visitArrayLiteralExpression(node);
-		}
-		else if(type == JSElementTypes.OBJECT_LITERAL_EXPRESSION)
-		{
-			visitObjectLiteralExpression(node);
-		}
-		else if(type == JSElementTypes.PROPERTY)
-		{
-			visitProperty(node);
-		}
-		else if(type == JSElementTypes.BINARY_EXPRESSION)
-		{
-			visitBinaryExpression(node);
-		}
-		else if(type == JSElementTypes.ASSIGNMENT_EXPRESSION)
-		{
-			visitAssignmentExpression(node);
-		}
-		else if(type == JSElementTypes.COMMA_EXPRESSION)
-		{
-			visitCommaExpression(node);
-		}
-		else if(type == JSElementTypes.CONDITIONAL_EXPRESSION)
-		{
-			visitConditionalExpression(node);
-		}
-		else if(type == JSElementTypes.POSTFIX_EXPRESSION)
-		{
-			visitPostfixExpression(node);
-		}
-		else if(type == JSElementTypes.PREFIX_EXPRESSION)
-		{
-			visitPrefixExpression(node);
-		}
-		else if(type == JSElementTypes.FUNCTION_EXPRESSION)
-		{
-			visitFunctionExpression(node);
-		}
-		else if(type == JSElementTypes.NEW_EXPRESSION)
-		{
-			visitNewExpression(node);
-		}
-		else if(type == JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION)
-		{
-			visitIndexedPropertyAccessExpression(node);
-		}
-		else if(type == JSElementTypes.ATTRIBUTE_LIST)
-		{
-			visitAttributeList(node);
-		}
-		else if(type == JSElementTypes.CALL_EXPRESSION)
-		{
-			visitCallExpression(node);
-		}
-		else if(type == JSTokenTypes.C_STYLE_COMMENT)
-		{
-			visitComment(node);
-		}
-		else if(type == JSTokenTypes.DOC_COMMENT)
-		{
-			visitDocComment(node);
-		}
-		else if(type == JSElementTypes.EMBEDDED_CONTENT)
-		{
-			visitEmbeddedContent(node);
-		}
-		else if(type == JSElementTypes.PACKAGE_STATEMENT)
-		{
-			visitPackageStatement(node);
-		}
-		else if(type == JSElementTypes.CLASS)
-		{
-			visitClass(node);
-		}
-		else if(type == JSElementTypes.XML_LITERAL_EXPRESSION)
-		{
-			visitXmlLiteralExpression(node);
-		}
-		else
-		{
-			visitElement(node);
-		}
-	}
-
-	public void visitXmlLiteralExpression(ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitAttributeList(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitPackageStatement(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitClass(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitFile(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitCallExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitIndexedPropertyAccessExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitNewExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitFunctionExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitPrefixExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitPostfixExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitConditionalExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitCommaExpression(final ASTNode node)
-	{
-		visitBinaryExpression(node);
-	}
-
-	public void visitAssignmentExpression(final ASTNode node)
-	{
-		visitBinaryExpression(node);
-	}
-
-	public void visitBinaryExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitProperty(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitObjectLiteralExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitArrayLiteralExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitParenthesizedExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitReferenceExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitLiteralExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitThisExpression(final ASTNode node)
-	{
-		visitExpression(node);
-	}
-
-	public void visitForInStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitForStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitDoWhileStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitWhileStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitCaseClause(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitSwitchStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitCatchBlock(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitTryStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitThrowStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitReturnStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitWithStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitBreakStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitContinueStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitIfStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitEmptyStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitVarStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitExpressionStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitLabeledStatement(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitBlock(final ASTNode node)
-	{
-		visitStatement(node);
-	}
-
-	public void visitArgumentList(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitParameter(final ASTNode node)
-	{
-		visitVariable(node);
-	}
-
-	public void visitVariable(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitParameterList(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitEmbeddedContent(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitElement(final ASTNode node)
-	{
-
-	}
-
-	public void visitSourceElement(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitFunctionDeclaration(final ASTNode node)
-	{
-		visitSourceElement(node);
-	}
-
-	public void visitStatement(final ASTNode node)
-	{
-		visitSourceElement(node);
-	}
-
-	public void visitExpression(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitDocComment(final ASTNode node)
-	{
-		visitElement(node);
-	}
-
-	public void visitComment(final ASTNode node)
-	{
-		visitElement(node);
-	}
+public abstract class JSNodeVisitor {
+    public final void visit(ASTNode node) {
+        final IElementType type = node.getElementType();
+        if (type instanceof JSFileElementType) {
+            visitFile(node);
+        }
+        else if (type == JSElementTypes.FUNCTION_DECLARATION) {
+            visitFunctionDeclaration(node);
+        }
+        else if (type == JSElementTypes.PARAMETER_LIST) {
+            visitParameterList(node);
+        }
+        else if (type == JSElementTypes.VARIABLE) {
+            visitVariable(node);
+        }
+        else if (type == JSElementTypes.FORMAL_PARAMETER) {
+            visitParameter(node);
+        }
+        else if (type == JSElementTypes.ARGUMENT_LIST) {
+            visitArgumentList(node);
+        }
+        else if (type == JSElementTypes.BLOCK_STATEMENT) {
+            visitBlock(node);
+        }
+        else if (type == JSElementTypes.LABELED_STATEMENT) {
+            visitLabeledStatement(node);
+        }
+        else if (type == JSElementTypes.EXPRESSION_STATEMENT) {
+            visitExpressionStatement(node);
+        }
+        else if (type == JSElementTypes.VAR_STATEMENT) {
+            visitVarStatement(node);
+        }
+        else if (type == JSElementTypes.EMPTY_STATEMENT) {
+            visitEmptyStatement(node);
+        }
+        else if (type == JSElementTypes.IF_STATEMENT) {
+            visitIfStatement(node);
+        }
+        else if (type == JSElementTypes.CONTINUE_STATEMENT) {
+            visitContinueStatement(node);
+        }
+        else if (type == JSElementTypes.BREAK_STATEMENT) {
+            visitBreakStatement(node);
+        }
+        else if (type == JSElementTypes.WITH_STATEMENT) {
+            visitWithStatement(node);
+        }
+        else if (type == JSElementTypes.RETURN_STATEMENT) {
+            visitReturnStatement(node);
+        }
+        else if (type == JSElementTypes.THROW_STATEMENT) {
+            visitThrowStatement(node);
+        }
+        else if (type == JSElementTypes.TRY_STATEMENT) {
+            visitTryStatement(node);
+        }
+        else if (type == JSElementTypes.CATCH_BLOCK) {
+            visitCatchBlock(node);
+        }
+        else if (type == JSElementTypes.SWITCH_STATEMENT) {
+            visitSwitchStatement(node);
+        }
+        else if (type == JSElementTypes.CASE_CLAUSE) {
+            visitCaseClause(node);
+        }
+        else if (type == JSElementTypes.WHILE_STATEMENT) {
+            visitWhileStatement(node);
+        }
+        else if (type == JSElementTypes.DOWHILE_STATEMENT) {
+            visitDoWhileStatement(node);
+        }
+        else if (type == JSElementTypes.FOR_STATEMENT) {
+            visitForStatement(node);
+        }
+        else if (type == JSElementTypes.FOR_IN_STATEMENT) {
+            visitForInStatement(node);
+        }
+        else if (type == JSElementTypes.THIS_EXPRESSION) {
+            visitThisExpression(node);
+        }
+        else if (type == JSElementTypes.LITERAL_EXPRESSION) {
+            visitLiteralExpression(node);
+        }
+        else if (type == JSElementTypes.REGEXP_LITERAL_EXPRESSION) {
+            visitLiteralExpression(node);
+        }
+        else if (type == JSElementTypes.REFERENCE_EXPRESSION) {
+            visitReferenceExpression(node);
+        }
+        else if (type == JSElementTypes.PARENTHESIZED_EXPRESSION) {
+            visitParenthesizedExpression(node);
+        }
+        else if (type == JSElementTypes.ARRAY_LITERAL_EXPRESSION) {
+            visitArrayLiteralExpression(node);
+        }
+        else if (type == JSElementTypes.OBJECT_LITERAL_EXPRESSION) {
+            visitObjectLiteralExpression(node);
+        }
+        else if (type == JSElementTypes.PROPERTY) {
+            visitProperty(node);
+        }
+        else if (type == JSElementTypes.BINARY_EXPRESSION) {
+            visitBinaryExpression(node);
+        }
+        else if (type == JSElementTypes.ASSIGNMENT_EXPRESSION) {
+            visitAssignmentExpression(node);
+        }
+        else if (type == JSElementTypes.COMMA_EXPRESSION) {
+            visitCommaExpression(node);
+        }
+        else if (type == JSElementTypes.CONDITIONAL_EXPRESSION) {
+            visitConditionalExpression(node);
+        }
+        else if (type == JSElementTypes.POSTFIX_EXPRESSION) {
+            visitPostfixExpression(node);
+        }
+        else if (type == JSElementTypes.PREFIX_EXPRESSION) {
+            visitPrefixExpression(node);
+        }
+        else if (type == JSElementTypes.FUNCTION_EXPRESSION) {
+            visitFunctionExpression(node);
+        }
+        else if (type == JSElementTypes.NEW_EXPRESSION) {
+            visitNewExpression(node);
+        }
+        else if (type == JSElementTypes.INDEXED_PROPERTY_ACCESS_EXPRESSION) {
+            visitIndexedPropertyAccessExpression(node);
+        }
+        else if (type == JSElementTypes.ATTRIBUTE_LIST) {
+            visitAttributeList(node);
+        }
+        else if (type == JSElementTypes.CALL_EXPRESSION) {
+            visitCallExpression(node);
+        }
+        else if (type == JSTokenTypes.C_STYLE_COMMENT) {
+            visitComment(node);
+        }
+        else if (type == JSTokenTypes.DOC_COMMENT) {
+            visitDocComment(node);
+        }
+        else if (type == JSElementTypes.EMBEDDED_CONTENT) {
+            visitEmbeddedContent(node);
+        }
+        else if (type == JSElementTypes.PACKAGE_STATEMENT) {
+            visitPackageStatement(node);
+        }
+        else if (type == JSElementTypes.CLASS) {
+            visitClass(node);
+        }
+        else if (type == JSElementTypes.XML_LITERAL_EXPRESSION) {
+            visitXmlLiteralExpression(node);
+        }
+        else {
+            visitElement(node);
+        }
+    }
+
+    public void visitXmlLiteralExpression(ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitAttributeList(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitPackageStatement(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitClass(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitFile(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitCallExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitIndexedPropertyAccessExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitNewExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitFunctionExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitPrefixExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitPostfixExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitConditionalExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitCommaExpression(final ASTNode node) {
+        visitBinaryExpression(node);
+    }
+
+    public void visitAssignmentExpression(final ASTNode node) {
+        visitBinaryExpression(node);
+    }
+
+    public void visitBinaryExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitProperty(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitObjectLiteralExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitArrayLiteralExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitParenthesizedExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitReferenceExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitLiteralExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitThisExpression(final ASTNode node) {
+        visitExpression(node);
+    }
+
+    public void visitForInStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitForStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitDoWhileStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitWhileStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitCaseClause(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitSwitchStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitCatchBlock(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitTryStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitThrowStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitReturnStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitWithStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitBreakStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitContinueStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitIfStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitEmptyStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitVarStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitExpressionStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitLabeledStatement(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitBlock(final ASTNode node) {
+        visitStatement(node);
+    }
+
+    public void visitArgumentList(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitParameter(final ASTNode node) {
+        visitVariable(node);
+    }
+
+    public void visitVariable(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitParameterList(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitEmbeddedContent(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitElement(final ASTNode node) {
+    }
+
+    public void visitSourceElement(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitFunctionDeclaration(final ASTNode node) {
+        visitSourceElement(node);
+    }
+
+    public void visitStatement(final ASTNode node) {
+        visitSourceElement(node);
+    }
+
+    public void visitExpression(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitDocComment(final ASTNode node) {
+        visitElement(node);
+    }
+
+    public void visitComment(final ASTNode node) {
+        visitElement(node);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
index e029cc97..a9a810f9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
@@ -29,150 +29,136 @@
 import consulo.language.editor.action.SmartEnterProcessor;
 import consulo.language.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 25, 2008
- *         Time: 11:38:15 PM
+ * @since 2008-07-25
  */
 @ExtensionImpl
-public class JSSmartEnterProcessor extends SmartEnterProcessor
-{
-	@Override
-	@RequiredReadAction
-	public boolean process(@Nonnull final Project project, @Nonnull final Editor editor, @Nonnull final PsiFile psiFile)
-	{
-		int offset = editor.getCaretModel().getOffset();
-		PsiElement at = psiFile.findElementAt(offset);
-		if(at == null && offset > 0)
-		{
-			at = psiFile.findElementAt(offset - 1);
-		}
-		if(at == null)
-		{
-			return false;
-		}
-
-		PsiElement element = at instanceof PsiWhiteSpace ? PsiTreeUtil.prevLeaf(at) : at;
-
-		if(element != null && !(element instanceof PsiErrorElement))
-		{
-			final PsiElement nextMeaningfulElement = evalMeaningfulElement(at, true);
-			if(nextMeaningfulElement instanceof PsiErrorElement)
-			{
-				element = nextMeaningfulElement;
-				offset = element.getTextOffset();
-			}
-		}
-
-		JSStatement statement = PsiTreeUtil.getParentOfType(element, JSStatement.class);
-
-		if(!(element instanceof PsiErrorElement) && statement != null && statement.getLastChild().getNode().getElementType() != JSTokenTypes.SEMICOLON)
-		{
-			offset = statement.getTextRange().getEndOffset();
-			String semicolon = JSChangeUtil.getSemicolon(project);
-			int shiftOffset = semicolon.length();
-
-			if(element.getParent() instanceof JSReferenceExpression && PsiTreeUtil.lastChild(statement).getNode().getElementType() != JSTokenTypes.RPAR)
-			{
-				ResolveResult[] results = ((JSReferenceExpression) element.getParent()).multiResolve(true);
-
-				if(results.length > 0)
-				{
-					if(results[0].getElement() instanceof JSFunction)
-					{
-						semicolon = "()" + semicolon;
-						shiftOffset = semicolon.length();
-
-						if(((JSFunction) results[0].getElement()).getParameterList().getParameters().length > 0)
-						{
-							shiftOffset = 1;
-						}
-					}
-				}
-			}
-			if(!semicolon.isEmpty())
-			{
-				insertCommitReformat(project, editor, psiFile, offset, semicolon, shiftOffset, false);
-				return true;
-			}
-		}
-
-		final PsiElement prevMeaningfulElement = evalMeaningfulElement(element, false);
-		String errorDescription = null;
-		if(element != null && !(element instanceof PsiErrorElement) && prevMeaningfulElement != null)
-		{
-			element = prevMeaningfulElement;
-		}
-
-		if (element instanceof PsiErrorElement && (JavaScriptLocalize.javascriptParserMessageExpectedLbrace().get().equals(errorDescription = (
-				(PsiErrorElement) element).getErrorDescription()) || JavaScriptLocalize.javascriptParserMessageExpectedStatement().get().equals(errorDescription)))
-		{
-			String semicolon = "";
-
-			if(element.getParent() instanceof JSFunctionExpression)
-			{
-				final JSElement base = PsiTreeUtil.getParentOfType(element, JSArgumentList.class, JSIndexedPropertyAccessExpression.class, JSStatement.class);
-				if(base instanceof JSStatement && base.getLastChild().getNode().getElementType() != JSTokenTypes.SEMICOLON)
-				{
-					semicolon = JSChangeUtil.getSemicolon(project);
-				}
-			}
-			insertCommitReformat(project, editor, psiFile, offset, "{\n\n}" + semicolon, 2, true);
-			return true;
-		}
-		else if (JavaScriptLocalize.javascriptParserMessageExpectedLparen().get().equals(errorDescription) 
-			|| JavaScriptLocalize.javascriptParserMessageExpectedFunctionName().get().equals(errorDescription))
-		{
-			insertCommitReformat(project, editor, psiFile, offset, "()", 1, false);
-			return true;
-		}
-		return false;
-	}
-
-	@RequiredReadAction
-	private void insertCommitReformat(final Project project, final Editor editor, final PsiFile psiFile, final int offset, final String str,
-									  final int shiftOffset, boolean adjustLineIndent)
-	{
-		editor.getDocument().insertString(offset, str);
-		editor.getCaretModel().moveToOffset(offset + shiftOffset);
-		commit(editor);
-
-		PsiElement at = psiFile.findElementAt(offset + shiftOffset - 1);
-		final PsiElement parentOfType = PsiTreeUtil.getParentOfType(at, JSStatement.class, JSFunction.class, JSClass.class, JSFile.class);
-
-		reformat(parentOfType);
-		if(adjustLineIndent)
-		{
-			CodeStyleManager.getInstance(project).adjustLineIndent(psiFile, editor.getCaretModel().getOffset());
-		}
-	}
-
-	private static PsiElement evalMeaningfulElement(final PsiElement element, boolean forward)
-	{
-		if(element == null)
-		{
-			return null;
-		}
-		PsiElement prev = forward ? PsiTreeUtil.nextLeaf(element) : PsiTreeUtil.prevLeaf(element);
-		if(prev == null)
-		{
-			return null;
-		}
-		if(prev instanceof PsiWhiteSpace)
-		{
-			prev = forward ? PsiTreeUtil.nextLeaf(prev) : PsiTreeUtil.prevLeaf(prev);
-		}
-		return prev;
-	}
-
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JSSmartEnterProcessor extends SmartEnterProcessor {
+    @Override
+    @RequiredReadAction
+    public boolean process(@Nonnull final Project project, @Nonnull final Editor editor, @Nonnull final PsiFile psiFile) {
+        int offset = editor.getCaretModel().getOffset();
+        PsiElement at = psiFile.findElementAt(offset);
+        if (at == null && offset > 0) {
+            at = psiFile.findElementAt(offset - 1);
+        }
+        if (at == null) {
+            return false;
+        }
+
+        PsiElement element = at instanceof PsiWhiteSpace ? PsiTreeUtil.prevLeaf(at) : at;
+
+        if (element != null && !(element instanceof PsiErrorElement)) {
+            final PsiElement nextMeaningfulElement = evalMeaningfulElement(at, true);
+            if (nextMeaningfulElement instanceof PsiErrorElement) {
+                element = nextMeaningfulElement;
+                offset = element.getTextOffset();
+            }
+        }
+
+        JSStatement statement = PsiTreeUtil.getParentOfType(element, JSStatement.class);
+
+        if (!(element instanceof PsiErrorElement) && statement != null
+            && statement.getLastChild().getNode().getElementType() != JSTokenTypes.SEMICOLON) {
+            offset = statement.getTextRange().getEndOffset();
+            String semicolon = JSChangeUtil.getSemicolon(project);
+            int shiftOffset = semicolon.length();
+
+            if (element.getParent() instanceof JSReferenceExpression refExpr
+                && PsiTreeUtil.lastChild(statement).getNode().getElementType() != JSTokenTypes.RPAR) {
+                ResolveResult[] results = refExpr.multiResolve(true);
+
+                if (results.length > 0 && results[0].getElement() instanceof JSFunction function) {
+                    semicolon = "()" + semicolon;
+                    shiftOffset = semicolon.length();
+
+                    if (function.getParameterList().getParameters().length > 0) {
+                        shiftOffset = 1;
+                    }
+                }
+            }
+            if (!semicolon.isEmpty()) {
+                insertCommitReformat(project, editor, psiFile, offset, semicolon, shiftOffset, false);
+                return true;
+            }
+        }
+
+        final PsiElement prevMeaningfulElement = evalMeaningfulElement(element, false);
+        if (element != null && !(element instanceof PsiErrorElement) && prevMeaningfulElement != null) {
+            element = prevMeaningfulElement;
+        }
+
+        LocalizeValue errorDescription = element instanceof PsiErrorElement errorElement ? errorElement.getErrorDescriptionValue() : null;
+        if (JavaScriptLocalize.javascriptParserMessageExpectedLbrace().equals(errorDescription)
+            || JavaScriptLocalize.javascriptParserMessageExpectedStatement().equals(errorDescription)) {
+            String semicolon = "";
+
+            if (element.getParent() instanceof JSFunctionExpression) {
+                @SuppressWarnings("unchecked")
+                final JSElement base =
+                    PsiTreeUtil.getParentOfType(element, JSArgumentList.class, JSIndexedPropertyAccessExpression.class, JSStatement.class);
+                if (base instanceof JSStatement && base.getLastChild().getNode().getElementType() != JSTokenTypes.SEMICOLON) {
+                    semicolon = JSChangeUtil.getSemicolon(project);
+                }
+            }
+            insertCommitReformat(project, editor, psiFile, offset, "{\n\n}" + semicolon, 2, true);
+            return true;
+        }
+        else if (JavaScriptLocalize.javascriptParserMessageExpectedLparen().equals(errorDescription)
+            || JavaScriptLocalize.javascriptParserMessageExpectedFunctionName().equals(errorDescription)) {
+            insertCommitReformat(project, editor, psiFile, offset, "()", 1, false);
+            return true;
+        }
+        return false;
+    }
+
+    @RequiredReadAction
+    private void insertCommitReformat(
+        final Project project,
+        final Editor editor,
+        final PsiFile psiFile,
+        final int offset,
+        final String str,
+        final int shiftOffset,
+        boolean adjustLineIndent
+    ) {
+        editor.getDocument().insertString(offset, str);
+        editor.getCaretModel().moveToOffset(offset + shiftOffset);
+        commit(editor);
+
+        PsiElement at = psiFile.findElementAt(offset + shiftOffset - 1);
+        @SuppressWarnings("unchecked")
+        final PsiElement parentOfType = PsiTreeUtil.getParentOfType(at, JSStatement.class, JSFunction.class, JSClass.class, JSFile.class);
+
+        reformat(parentOfType);
+        if (adjustLineIndent) {
+            CodeStyleManager.getInstance(project).adjustLineIndent(psiFile, editor.getCaretModel().getOffset());
+        }
+    }
+
+    private static PsiElement evalMeaningfulElement(final PsiElement element, boolean forward) {
+        if (element == null) {
+            return null;
+        }
+        PsiElement prev = forward ? PsiTreeUtil.nextLeaf(element) : PsiTreeUtil.prevLeaf(element);
+        if (prev == null) {
+            return null;
+        }
+        if (prev instanceof PsiWhiteSpace) {
+            prev = forward ? PsiTreeUtil.nextLeaf(prev) : PsiTreeUtil.prevLeaf(prev);
+        }
+        return prev;
+    }
+
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
index d27d081a..5ed820e6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
@@ -26,27 +26,21 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 13, 2008
- *         Time: 3:53:42 PM
+ * @since 2008-10-13
  */
 @ExtensionImpl
-public class JavaScriptTargetElementUtilEx implements TargetElementUtilExtender
-{
-	@Override
-	public boolean includeSelfInGotoImplementation(@Nonnull final PsiElement element)
-	{
-		if(element instanceof JSFunction)
-		{
-			final PsiElement parent = JSResolveUtil.findParent(element);
-			if(parent instanceof JSClass && ((JSClass) parent).isInterface())
-			{
-				return false;
-			}
-		}
-		else if(element instanceof JSClass)
-		{
-			return false;
-		}
-		return true;
-	}
+public class JavaScriptTargetElementUtilEx implements TargetElementUtilExtender {
+    @Override
+    public boolean includeSelfInGotoImplementation(@Nonnull final PsiElement element) {
+        if (element instanceof JSFunction) {
+            final PsiElement parent = JSResolveUtil.findParent(element);
+            if (parent instanceof JSClass jsClass && jsClass.isInterface()) {
+                return false;
+            }
+        }
+        else if (element instanceof JSClass) {
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
index ea5879ff..3c4f5828 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
@@ -31,89 +31,75 @@
  * @author max
  */
 @ExtensionImpl
-public class JavascriptCommenter implements CodeDocumentationAwareCommenter
-{
-	@Override
-	public String getLineCommentPrefix()
-	{
-		return "//";
-	}
-
-	@Override
-	public String getBlockCommentPrefix()
-	{
-		return "/*";
-	}
-
-	@Override
-	public String getBlockCommentSuffix()
-	{
-		return "*/";
-	}
-
-	@Nullable
-	@Override
-	public String getCommentedBlockCommentPrefix()
-	{
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public String getCommentedBlockCommentSuffix()
-	{
-		return null;
-	}
-
-	@Override
-	@Nullable
-	public IElementType getLineCommentTokenType()
-	{
-		return JSTokenTypes.END_OF_LINE_COMMENT;
-	}
-
-	@Override
-	@Nullable
-	public IElementType getBlockCommentTokenType()
-	{
-		return JSTokenTypes.C_STYLE_COMMENT;
-	}
-
-	@Override
-	public String getDocumentationCommentPrefix()
-	{
-		return "/**";
-	}
-
-	@Override
-	public String getDocumentationCommentLinePrefix()
-	{
-		return "*";
-	}
-
-	@Override
-	public String getDocumentationCommentSuffix()
-	{
-		return "*/";
-	}
-
-	@Override
-	public boolean isDocumentationComment(final PsiComment element)
-	{
-		return element.getTokenType() == JSTokenTypes.DOC_COMMENT;
-	}
-
-	@Override
-	@Nullable
-	public IElementType getDocumentationCommentTokenType()
-	{
-		return JSTokenTypes.DOC_COMMENT;
-	}
-
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JavascriptCommenter implements CodeDocumentationAwareCommenter {
+    @Override
+    public String getLineCommentPrefix() {
+        return "//";
+    }
+
+    @Override
+    public String getBlockCommentPrefix() {
+        return "/*";
+    }
+
+    @Override
+    public String getBlockCommentSuffix() {
+        return "*/";
+    }
+
+    @Nullable
+    @Override
+    public String getCommentedBlockCommentPrefix() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getCommentedBlockCommentSuffix() {
+        return null;
+    }
+
+    @Override
+    @Nullable
+    public IElementType getLineCommentTokenType() {
+        return JSTokenTypes.END_OF_LINE_COMMENT;
+    }
+
+    @Override
+    @Nullable
+    public IElementType getBlockCommentTokenType() {
+        return JSTokenTypes.C_STYLE_COMMENT;
+    }
+
+    @Override
+    public String getDocumentationCommentPrefix() {
+        return "/**";
+    }
+
+    @Override
+    public String getDocumentationCommentLinePrefix() {
+        return "*";
+    }
+
+    @Override
+    public String getDocumentationCommentSuffix() {
+        return "*/";
+    }
+
+    @Override
+    public boolean isDocumentationComment(final PsiComment element) {
+        return element.getTokenType() == JSTokenTypes.DOC_COMMENT;
+    }
+
+    @Override
+    @Nullable
+    public IElementType getDocumentationCommentTokenType() {
+        return JSTokenTypes.DOC_COMMENT;
+    }
+
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }

From c366780424b0b5ba96bfd907a8e9f50c85c2ecaf Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 30 Dec 2024 06:03:35 +0300
Subject: [PATCH 249/340] Fixing JS browser objects definitions in
 dist/sdk/clientAny.

---
 plugin/src/main/dist/sdk/clientAny/AJAX.js    |   34 +-
 plugin/src/main/dist/sdk/clientAny/DHTML.js   | 1648 +++++++++--------
 plugin/src/main/dist/sdk/clientAny/DOMCore.js |  470 ++---
 .../src/main/dist/sdk/clientAny/DOMEvents.js  |  175 +-
 .../sdk/clientAny/DOMTraversalAndRange.js     |  112 +-
 .../src/main/dist/sdk/clientAny/DOMXPath.js   |   72 +-
 6 files changed, 1300 insertions(+), 1211 deletions(-)

diff --git a/plugin/src/main/dist/sdk/clientAny/AJAX.js b/plugin/src/main/dist/sdk/clientAny/AJAX.js
index e5af177a..558b2cd0 100644
--- a/plugin/src/main/dist/sdk/clientAny/AJAX.js
+++ b/plugin/src/main/dist/sdk/clientAny/AJAX.js
@@ -1,22 +1,20 @@
-window.ActiveXObject = function() {};//XMLHttpRequest
-window.XmlHttpRequest = function() {};//XMLHttpRequest
-window.prototype = new Object();
+window.ActiveXObject = function () {}; //XMLHttpRequest
+window.XmlHttpRequest = function () {}; //XMLHttpRequest
 
 var XMLHttpRequest = {
-	onreadystatechange: function () {}
+    abort: function () {}, //Object
+    constructor: 0, //Object
+    getAllResponseHeaders: function () {}, //String
+    getResponseHeader: function (headerName) {}, //String
+    readyState: 0, //Number
+    responseText: 0, //String
+    responseXML: 0, //String
+    onreadystatechange: function () {},
+    open: function (method, url, async, username, password) {}, //Object
+    overrideMimeType: function (mimeType) {}, //Gecko,Object
+    send: function (content) {}, //void
+    setRequestHeader: function (label, value) {}, //void
+    statusText: 0, //String
+    status: 0, //Number
 };
-XMLHttpRequest.constructor = 0;//Object
-XMLHttpRequest.readyState = 0;//Number
-XMLHttpRequest.responseText = 0;//String
-XMLHttpRequest.statusText = 0;//String
-XMLHttpRequest.status = 0;//Number
-XMLHttpRequest.responseXML = 0;//String
-XMLHttpRequest.abort = function() {};//Object
-XMLHttpRequest.getAllResponseHeaders = function() {};//String
-XMLHttpRequest.getResponseHeader = function(headerName) {};//String
-XMLHttpRequest.overrideMimeType = function(mimeType) {};//Gecko,Object
-XMLHttpRequest.open = function(method,url,async,username,password) {};//Object
-XMLHttpRequest.send = function(content) {};//void
-XMLHttpRequest.setRequestHeader = function(label,value) {};//void
-
 XMLHttpRequest.prototype = new Object();
diff --git a/plugin/src/main/dist/sdk/clientAny/DHTML.js b/plugin/src/main/dist/sdk/clientAny/DHTML.js
index eb9d5d0b..9a9e72de 100644
--- a/plugin/src/main/dist/sdk/clientAny/DHTML.js
+++ b/plugin/src/main/dist/sdk/clientAny/DHTML.js
@@ -1,868 +1,922 @@
-Object.__defineGetter__ = function(propertyName,func) {};//Gecko,Object
-Object.__defineSetter__ = function(propertyName,func) {};//Gecko,Object
-Object.__lookupGetter__ = function(propertyName) {};//Gecko,Function
-Object.__lookupSetter__ = function(propertyName) {};//Gecko,Function
-Object.__proto__ = function(propertyName) {};//Gecko,Function
-
-Image = function() {};
-Image.constructor = 0;//Object
-Image.naturalWidth = 0;//Gecko,Object
-Image.naturalHeight = 0;//Gecko,Object
+__defineGetter__ = function (propertyName, func) {}; //Gecko,Object
+__defineSetter__ = function (propertyName, func) {}; //Gecko,Object
+__lookupGetter__ = function (propertyName) {}; //Gecko,Function
+__lookupSetter__ = function (propertyName) {}; //Gecko,Function
+__proto__ = function (propertyName) {}; //Gecko,Function
+
+var Image = function () {};
 Image.prototype = new HTMLImageElement();
+Image.constructor = 0; //Object
+Image.naturalWidth = 0; //Gecko,Object
+Image.naturalHeight = 0; //Gecko,Object
+
+var Navigator = {
+    appCodeName: 0, //String
+    appName: 0, //String
+    appVersion: 0, //String
+    javaEnabled: function () {}, //Boolean
+    language: 0, //String
+    mimeTypes: 0, //Array
+    platform: 0, //Array
+    plugins: 0, //String
+    preference: function (prefName, prefValue) {}, //String
+    product: 0, //String
+    systemLanguage: 0, //IE,String
+    taintEnabled: function () {}, //Boolean
+    userAgent: 0, //String
+    userLanguage: 0, //IE,String
+};
+
+var Screen = {
+    availHeight: 0, //Number
+    availWidth: 0, //Number
+    colorDepth: 0, //Number
+    height: 0, //Number
+    pixelDepth: 0, //Number
+    width: 0, //Number
+};
+
+var location = {
+    href: 0, //String
+    hash: 0, //String
+    host: 0, //String
+    hostname: 0, //String
+    pathname: 0, //String
+    port: 0, //String
+    protocol: 0, //String
+    reload() {}, //void
+    replace(url) {}, //void
+    search: 0, //String
+    target: 0, //String
+};
 
-Navigator.userAgent = 0;//String
-Navigator.product = 0;//String
-Navigator.appVersion = 0;//String
-Navigator.appName = 0;//String
-Navigator.appCodeName = 0;//String
-Navigator.language = 0;//String
-Navigator.systemLanguage = 0;//IE,String
-Navigator.userLanguage = 0;//IE,String
-Navigator.mimeTypes = 0;//Array
-Navigator.platform = 0;//Array
-Navigator.plugins = 0;//String
-Navigator = {};
-Navigator.taintEnabled = function() {};//Boolean
-Navigator.javaEnabled = function() {};//Boolean
-Navigator.preference = function(prefName,prefValue) {};//String
-Navigator.prototype = new Object();
-
-Screen.width = 0;//Number
-Screen.height = 0;//Number
-Screen.availHeight = 0;//Number
-Screen.availWidth = 0;//Number
-Screen.pixelDepth = 0;//Number
-Screen.colorDepth = 0;//Number
-Screen = {};
-Screen.prototype = new Object();
-
-location.href = 0;//String
-location.hash = 0;//String
-location.port = 0;//String
-location.host = 0;//String
-location.hostname = 0;//String
-location.pathname = 0;//String
-location.protocol = 0;//String
-location.port = 0;//String
-location.search = 0;//String
-location.target = 0;//String
-location = {};
-location.reload = function() {};//void
-location.replace = function(url) {};//void
-location.prototype = new Object();
-
-XSLTProcessor = function() {};
-XSLTProcessor.constructor = 0;//Gecko,Object
-XSLTProcessor.importStylesheet = function(domNode) {};//Gecko,Object
-XSLTProcessor.transformToDocument = function(domNode) {};//Gecko,Document
-XSLTProcessor.transformToFragment = function(domToBeTransformed,ownerDocument) {};//Gecko,DocumentFragment
+var XSLTProcessor = function () {};
 XSLTProcessor.prototype = new Object();
+XSLTProcessor.constructor = 0; //Gecko,Object
+XSLTProcessor.importStylesheet = function (domNode) {}; //Gecko,Object
+XSLTProcessor.transformToDocument = function (domNode) {}; //Gecko,Document
+XSLTProcessor.transformToFragment = function (domToBeTransformed, ownerDocument) {}; //Gecko,DocumentFragment
 
-DOMParser = function() {};
-DOMParser.constructor = 0;//Gecko,Object
-DOMParser.parseFromString = function(stringToParse,contentType) {};//Gecko,Document
+var DOMParser = function () {};
 DOMParser.prototype = new Object();
+DOMParser.constructor = 0; //Gecko,Object
+DOMParser.parseFromString = function (stringToParse, contentType) {}; //Gecko,Document
 
-XMLSerializer = function() {};
-XMLSerializer.constructor = 0;//Gecko,Object
-XMLSerializer.serializeToStream = function(domNode,stream,encoding) {};//Gecko,Object
-XMLSerializer.serializeToString = function(domNode) {};//Gecko,String
+var XMLSerializer = function () {};
 XMLSerializer.prototype = new Object();
+XMLSerializer.constructor = 0; //Gecko,Object
+XMLSerializer.serializeToStream = function (domNode, stream, encoding) {}; //Gecko,Object
+XMLSerializer.serializeToString = function (domNode) {}; //Gecko,String
+
+var Event = {
+    altKey: 0, //Boolean
+    button: 0, //Boolean
+    cancelBubble: 0, //IE,Boolean
+    charCode: 0, //Gecko,String
+    clientX: 0, //Number
+    clientY: 0, //Number
+    ctrlKey: 0, //Boolean
+    data: 0, //Object[]
+    height: 0, //Number
+    fromElement: 0, //IE,Object
+    keyCode: 0, //Number
+    layerX: 0, //Gecko,Number
+    layerY: 0, //Gecko,Number
+    modifiers: 0, //Number
+    offsetX: 0, //IE,Number
+    offsetY: 0, //IE,Number
+    pageX: 0, //Number
+    pageY: 0, //Number
+    repeat: 0, //IE,Boolean
+    returnValue: 0, //IE,Boolean
+    screenX: 0, //Number
+    screenY: 0, //Number
+    shiftKey: 0, //Boolean
+    srcElement: 0, //IE,Object
+    toElement: 0, //IE,Object
+    type: 0, //String
+    wheelDelta: 0, //IE,Number
+    which: 0, //Object
+    width: 0, //Number
+    x: 0, //IE,Number
+    y: 0, //IE,Number
+    // deprecated
+    ABORT: 0, //Gecko,String,deprecated
+    BLUR: 0, //Gecko,String,deprecated
+    CLICK: 0, //Gecko,String,deprecated
+    CHANGE: 0, //Gecko,String,deprecated
+    DBLCLICK: 0, //Gecko,String,deprecated
+    DRAGDROP: 0, //Gecko,String,deprecated
+    ERROR: 0, //Gecko,String,deprecated
+    FOCUS: 0, //Gecko,String,deprecated
+    KEYDOWN: 0, //Gecko,String,deprecated
+    KEYPRESS: 0, //Gecko,String,deprecated
+    KEYUP: 0, //Gecko,String,deprecated
+    LOAD: 0, //Gecko,String,deprecated
+    MOUSEDOWN: 0, //Gecko,String,deprecated
+    MOUSEMOVE: 0, //Gecko,String,deprecated
+    MOUSEOUT: 0, //Gecko,String,deprecated
+    MOUSEOVER: 0, //Gecko,String,deprecated
+    MOUSEUP: 0, //Gecko,String,deprecated
+    MOVE: 0, //Gecko,String,deprecated
+    RESET: 0, //Gecko,String,deprecated
+    RESIZE: 0, //Gecko,String,deprecated
+    SELECT: 0, //Gecko,String,deprecated
+    SUBMIT: 0, //Gecko,String,deprecated
+    UNLOAD: 0, //Gecko,String,deprecated
+};
+
+var Selection = {
+    addRange: function (range) {}, //Gecko,void
+    anchorNode: 0, //Gecko,Node
+    anchorOffset: 0, //Gecko,Number
+    clear: function () {}, //IE,Boolean
+    collapse: function (parentNode, offset) {}, //Gecko,void
+    collapseToStart: function () {}, //Gecko,void
+    collapseToEnd: function () {}, //Gecko,void
+    containsNode: function (node, partlyContained) {}, //Gecko,Boolean
+    createRange: function () {}, //IE,TextRange
+    empty: function () {}, //IE,Boolean
+    extend: function (parentNode, offset) {}, //Gecko,void
+    focusNode: 0, //Gecko,Node
+    focusOffset: 0, //Gecko,Number
+    getRangeAt: function (index) {}, //Gecko,Range
+    isCollapsed: 0, //Gecko,Boolean
+    rangeCount: 0, //Gecko,Number
+    removeRange: function (range) {}, //Gecko,void
+    removeAllRanges: function () {}, //Gecko,void
+    selectAllChildren: function (parentNode) {}, //Gecko,void
+    type: 0, //IE,Object
+};
+
+var TextRange = {
+    boundingHeight: 0, //IE,Number
+    boundingLeft: 0, //IE,Number
+    boundingTop: 0, //IE,Number
+    boundingWidth: 0, //IE,Number
+    collapse: function (start) {}, //IE,void
+    compareEndPoint: function (type, range) {}, //IE,void
+    compareEndPoints: function (sType, oRange) {}, //IE,Number
+    duplicate: function () {}, //IE,TextRange
+    expand: function (unit) {}, //IE,void
+    htmlText: 0, //IE,String
+    inRange: function (other) {}, //IE,boolean
+    isEqual: function (other) {}, //IE,boolean
+    move: function (unit, count) {}, //IE,void
+    moveEnd: function (unit, count) {}, //IE,void
+    moveStart: function (unit, count) {}, //IE,void
+    moveToElementText: function (element) {}, //IE,void
+    offsetLeft: 0, //IE,Number
+    offsetTop: 0, //IE,Number
+    parentElement: function () {}, //IE,Node
+    pasteHTML: function (htmlText) {}, //IE,void
+    scrollIntoView: function (start) {}, //IE,void
+    select: function () {}, //IE,void
+    setEndPoint: function (type, range) {}, //IE,void
+    text: 0, //IE,String
+};
+
+var document = {
+    all: 0, //IE,All
+    execCommand: function (sCommand, bUserInterface, vValue) {}, //IE,Boolean
+    namespaces: 0, //IE,Array
+    selection: 0, //IE,Selection
+    styleSheets: 0 //Stylesheet[]
+};
+
+var CssRule = {
+    selectorText: 0, //String
+};
+
+var Stylesheet = {
+    addRule: function (selector, style) {}, //IE,void
+    cssRules: 0, //Gecko,CssRule[]
+    deleteRule: function (index) {}, //Gecko,void
+    insertRule: function (ruleText, index) {}, //Gecko,void
+    owningElement: 0, //IE,HtmlElement
+    removeRule: function (index) {}, //IE,void
+    rules: 0, //IE,CssRule[]
+};
+
+var MozillaSideBar = {
+    addPanel: function (title, url, param3) {}, //Gecko,void
+};
+
+var IEExternal = {
+    AddFavorite: function (title, url) {}, //IE,void
+};
 
-Event.data = 0;//Object[]
-Event.height = 0;//Number
-Event.x = 0;//IE,Number
-Event.screenX = 0;//Number
-Event.clientX = 0;//Number
-Event.offsetX = 0;//IE,Number
-Event.layerX = 0;//Gecko,Number
-Event.fromElement = 0;//IE,Object
-Event.wheelDelta = 0;//IE,Number
-Event.repeat = 0;//IE,Boolean
-Event.pageX = 0;//Number
-Event.y = 0;//IE,Number
-Event.screenY = 0;//Number
-Event.clientY = 0;//Number
-Event.offsetY = 0;//IE,Number
-Event.layerY = 0;//Gecko,Number
-Event.pageY = 0;//Number
-Event.width = 0;//Number
-Event.modifiers = 0;//Number
-Event.keyCode = 0;//Number
-Event.type = 0;//String
-Event.which = 0;//Object
-Event.srcElement = 0;//IE,Object
-Event.toElement = 0;//IE,Object
-Event.cancelBubble = 0;//IE,Boolean
-Event.returnValue = 0;//IE,Boolean
-Event.altKey = 0;//Boolean
-Event.ctrlKey = 0;//Boolean
-Event.shiftKey = 0;//Boolean
-Event.button = 0;//Boolean
-Event.charCode = 0;//Gecko,String
-Event.ABORT = 0;//Gecko,String,deprecated
-Event.BLUR = 0;//Gecko,String,deprecated
-Event.CLICK = 0;//Gecko,String,deprecated
-Event.CHANGE = 0;//Gecko,String,deprecated
-Event.DBLCLICK = 0;//Gecko,String,deprecated
-Event.DRAGDROP = 0;//Gecko,String,deprecated
-Event.ERROR = 0;//Gecko,String,deprecated
-Event.FOCUS = 0;//Gecko,String,deprecated
-Event.KEYDOWN = 0;//Gecko,String,deprecated
-Event.KEYPRESS = 0;//Gecko,String,deprecated
-Event.KEYUP = 0;//Gecko,String,deprecated
-Event.LOAD = 0;//Gecko,String,deprecated
-Event.MOUSEDOWN = 0;//Gecko,String,deprecated
-Event.MOUSEMOVE = 0;//Gecko,String,deprecated
-Event.MOUSEOUT = 0;//Gecko,String,deprecated
-Event.MOUSEOVER = 0;//Gecko,String,deprecated
-Event.MOUSEUP = 0;//Gecko,String,deprecated
-Event.MOVE = 0;//Gecko,String,deprecated
-Event.RESET = 0;//Gecko,String,deprecated
-Event.RESIZE = 0;//Gecko,String,deprecated
-Event.SELECT = 0;//Gecko,String,deprecated
-Event.SUBMIT = 0;//Gecko,String,deprecated
-Event.UNLOAD = 0;//Gecko,String,deprecated
-Event = {};
-Event.prototype = new Object();
-
-Selection.anchorNode = 0;//Gecko,Node
-Selection.anchorOffset = 0;//Gecko,Number
-Selection.focusNode = 0;//Gecko,Node
-Selection.focusOffset = 0;//Gecko,Number
-Selection.isCollapsed = 0;//Gecko,Boolean
-Selection.rangeCount = 0;//Gecko,Number
-Selection.type = 0;//IE,Object
-Selection = {};
-Selection.getRangeAt = function(index) {};//Gecko,Range
-Selection.collapse = function(parentNode,offset) {};//Gecko,void
-Selection.extend = function(parentNode,offset) {};//Gecko,void
-Selection.collapseToStart = function() {};//Gecko,void
-Selection.collapseToEnd = function() {};//Gecko,void
-Selection.selectAllChildren = function(parentNode) {};//Gecko,void
-Selection.addRange = function(range) {};//Gecko,void
-Selection.removeRange = function(range) {};//Gecko,void
-Selection.removeAllRanges = function() {};//Gecko,void
-Selection.containsNode = function(node,partlyContained) {};//Gecko,Boolean
-Selection.clear = function() {};//IE,Boolean
-Selection.empty = function() {};//IE,Boolean
-Selection.createRange = function() {};//IE,TextRange
-Selection.prototype = new Object();
-
-TextRange.htmlText = 0;//IE,String
-TextRange.text = 0;//IE,String
-TextRange.boundingWidth = 0;//IE,Number
-TextRange.boundingHeight = 0;//IE,Number
-TextRange.boundingLeft = 0;//IE,Number
-TextRange.offsetLeft = 0;//IE,Number
-TextRange.boundingTop = 0;//IE,Number
-TextRange.offsetTop = 0;//IE,Number
-TextRange = {};
-TextRange.collapse = function(start) {};//IE,void
-TextRange.expand = function(unit) {};//IE,void
-TextRange.duplicate = function() {};//IE,TextRange
-TextRange.select = function() {};//IE,void
-TextRange.parentElement = function() {};//IE,Node
-TextRange.inRange = function(other) {};//IE,boolean
-TextRange.isEqual = function(other) {};//IE,boolean
-TextRange.scrollIntoView = function(start) {};//IE,void
-TextRange.setEndPoint = function(type,range) {};//IE,void
-TextRange.compareEndPoint = function(type,range) {};//IE,void
-TextRange.move = function(unit,count) {};//IE,void
-TextRange.moveStart = function(unit,count) {};//IE,void
-TextRange.moveEnd = function(unit,count) {};//IE,void
-TextRange.pasteHTML = function(htmlText) {};//IE,void
-TextRange.moveToElementText = function(element) {};//IE,void
-TextRange.compareEndPoints = function(sType,oRange) {};//IE,Number
-TextRange.prototype = new Object();
-
-document.selection = 0;//IE,Selection
-document.namespaces = 0;//IE,Array
-document.all = 0;//IE,All
-document.styleSheets = 0;//Stylesheet[]
-document = {};
-document.execCommand = function(sCommand,bUserInterface,vValue) {};//IE,Boolean
-document.prototype = new Object();
-
-CssRule.selectorText = 0;//String
-CssRule = {};
-CssRule.prototype = new Object();
-
-Stylesheet.cssRules = 0;//Gecko,CssRule[]
-Stylesheet.rules = 0;//IE,CssRule[]
-Stylesheet.owningElement = 0;//IE,HtmlElement
-Stylesheet = {};
-Stylesheet.addRule = function(selector,style) {};//IE,void
-Stylesheet.insertRule = function(ruleText,index) {};//Gecko,void
-Stylesheet.removeRule = function(index) {};//IE,void
-Stylesheet.deleteRule = function(index) {};//Gecko,void
-Stylesheet.prototype = new Object();
-
-MozillaSideBar.addPanel = function(title,url,param3) {};//Gecko,void
-MozillaSideBar.prototype = new Object();
-
-IEExternal.AddFavorite = function(title,url) {};//IE,void
-IEExternal.prototype = new Object();
-
-history.back = function() {};//void
-history.forward = function() {};//void
-history.go = function(count) {};//void
-history.prototype = new Object();
-
-window.document = 0;//HTMLDocument
-window.event = 0;//Event
-window.navigator = 0;//Navigator
-window.screen = 0;//Screen
-window.location = 0;//Location
-window.frameElement = 0;//Object
-window.opener = 0;//window
-window.window = 0;//window
-window.parent = 0;//window
-window.top = 0;//window
-window.self = 0;//Object
-window.frames = 0;//Array
-window.innerHeight = 0;//Number
-window.innerWidth = 0;//Number
-window.outerHeight = 0;//Number
-window.outerWidth = 0;//Number
-window.screenLeft = 0;//IE,Number
-window.screenTop = 0;//IE,Number
-window.scrollX = 0;//Number
-window.scrollY = 0;//Number
-window.pageXOffset = 0;//Number
-window.pageYOffset = 0;//Number
-window.scrollMaxX = 0;//Number
-window.scrollMaxY = 0;//Number
-window.status = 0;//String
-window.defaultStatus = 0;//String
-window.toolbar = 0;//Object
-window.menubar = 0;//Object
-window.scrollbars = 0;//Object
-window.directories = 0;//Object
-window.history = 0;//history
-window.sidebar = 0;//Gecko,MozillaSideBar
-window.external = 0;//IE,IEExternal
-window.opera = 0;//Opera,Boolean
-window = {};
-window.getSelection = function() {};//Gecko,Selection
-window.print = function() {};//void
-window.alert = function(sMesssage) {};//Object
-window.confirm = function(sMesssage) {};//Object
-window.prompt = function(sMessage,sDefaultValue) {};//Object
-window.clearInterval = function(intervalId) {};//Object
-window.clearTimeout = function(intervalId) {};//Object
-window.setInterval = function(vCode,iMillis) {};//Number
-window.setTimeout = function(vCode,iMillis) {};//Number
-window.captureEvents = function(eventType) {};//Gecko,void,deprecated
-window.releaseEvents = function(eventType) {};//Gecko,void,deprecated
-window.routeEvent = function(event) {};//Gecko,void,deprecated
-window.preventBubble = function(event) {};//Gecko,void,deprecated
-window.GetObject = function(classOrPath,class) {};//IE,Object,deprecated
-window.ScriptEngine = function() {};//IE,String
-window.ScriptEngineBuildVersion = function() {};//IE,String
-window.ScriptEngineMajorVersion = function() {};//IE,String
-window.ScriptEngineMinorVersion = function() {};//IE,String
-window.scrollTo = function(x,y) {};//Object
-window.scrollBy = function(xDelta,yDelta) {};//Object
-window.moveTo = function(x,y) {};//Object
-window.moveBy = function(xDelta,yDelta) {};//Object
-window.resizeTo = function(width,height) {};//Object
-window.resizeBy = function(widthDelta,heightDelta) {};//Object
-window.getComputedStyle = function(element,pseudoElt) {};//Gecko,style
-window.showModalDialog = function(sUrl,vArguments,sFeatures) {};//IE,style
-window.attachEvent = function(type,listener) {};//IE,Object
-window.detachEvent = function(type,listener) {};//IE,Object
-window.addEventListener = function(type,listener,useCapture) {};//Gecko,Object
-window.removeEventListener = function(type,listener,useCapture) {};//Gecko,Object
-window.execScript = function(sScript) {};//IE,Object
-window.CollectGarbage = function() {};//IE,Object
-window.prototype = new Object();
-
-window = 0;//window
-escape = function() {};//Object,deprecated
-unescape = function() {};//Object,deprecated
-
-HTMLCollection.length = 0;//Number
-HTMLCollection = {};
-HTMLCollection.item = function(index) {};//Node
-HTMLCollection.namedItem = function(name) {};//Node
-HTMLCollection.prototype = new Object();
-
-HTMLOptionsCollection.length = 0;//Number
-HTMLOptionsCollection = {};
-HTMLOptionsCollection.item = function(index) {};//Node
-HTMLOptionsCollection.namedItem = function(name) {};//Node
-HTMLOptionsCollection.prototype = new Object();
-
-HTMLDocument.title = 0;//String
-HTMLDocument.referrer = 0;//String
-HTMLDocument.domain = 0;//String
-HTMLDocument.URL = 0;//String
-HTMLDocument.body = 0;//HTMLElement
-HTMLDocument.images = 0;//HTMLCollection
-HTMLDocument.applets = 0;//HTMLCollection
-HTMLDocument.links = 0;//HTMLCollection
-HTMLDocument.forms = 0;//HTMLCollection
-HTMLDocument.anchors = 0;//HTMLCollection
-HTMLDocument.cookie = 0;//HTMLCollection
-HTMLDocument.defaultView = 0;//Gecko,DocumentView
-HTMLDocument.activeElement = 0;//IE,DocumentView
-HTMLDocument.compatMode = 0;//String
-HTMLDocument.parentWindow = 0;//IE,window
-HTMLDocument.commandDispatcher = 0;//Gecko,CommandDispatcher
-HTMLDocument = {};
-HTMLDocument.open = function() {};//Object
-HTMLDocument.close = function() {};//Object
-HTMLDocument.write = function(text) {};//Object
-HTMLDocument.writeln = function(text) {};//Object
-HTMLDocument.getElementsByName = function(elementName) {};//NodeList
-HTMLDocument.getElementsByClassName = function(className) {};//Gecko,NodeList
-HTMLDocument.createStyleSheet = function() {};//IE,Stylesheet
-HTMLDocument.getBoxObjectFor = function(element) {};//Gecko,Node
-HTMLDocument.querySelectorAll = function(string) {};//Gecko,NodeList
-HTMLDocument.querySelector = function(string) {};//Gecko,Node
-HTMLDocument.getAnonymousNodes = function(node) {};//Gecko,Node[]
-HTMLDocument.getAnonymousElementByAttribute = function(node,attrName,attrValue) {};//Gecko,NodeList
-HTMLDocument.elementFromPoint = function(iX,iY) {};//IE,HTMLElement
-HTMLDocument.createEventObject = function(oExistingEvent) {};//IE,Even
+var history = {
+    back: function () {}, //void
+    forward: function () {}, //void
+    go: function (count) {}, //void
+};
+
+var window = {
+    addEventListener: function (type, listener, useCapture) {}, //Gecko,Object
+    alert: function (sMesssage) {}, //Object
+    attachEvent: function (type, listener) {}, //IE,Object
+    captureEvents: function (eventType) {}, //Gecko,void,deprecated
+    clearInterval: function (intervalId) {}, //Object
+    clearTimeout: function (intervalId) {}, //Object
+    CollectGarbage: function () {}, //IE,Object
+    confirm: function (sMesssage) {}, //Object
+    defaultStatus: 0, //String
+    detachEvent: function (type, listener) {}, //IE,Object
+    directories: 0, //Object
+    document: 0, //HTMLDocument
+    external: 0, //IE,IEExternal
+    event: 0, //Event
+    execScript: function (sScript) {}, //IE,Object
+    frameElement: 0, //Object
+    frames: 0, //Array
+    getComputedStyle: function (element, pseudoElt) {}, //Gecko,style
+    GetObject: function (classOrPath, clazz) {}, //IE,Object,deprecated
+    getSelection: function () {}, //Gecko,Selection
+    history: 0, //history
+    innerHeight: 0, //Number
+    innerWidth: 0, //Number
+    location: 0, //Location
+    menubar: 0, //Object
+    moveBy: function (xDelta, yDelta) {}, //Object
+    moveTo: function (x, y) {}, //Object
+    navigator: 0, //Navigator
+    opener: 0, //window
+    opera: 0, //Opera,Boolean
+    outerHeight: 0, //Number
+    outerWidth: 0, //Number
+    pageXOffset: 0, //Number
+    pageYOffset: 0, //Number
+    parent: 0, //window
+    preventBubble: function (event) {}, //Gecko,void,deprecated
+    print: function () {}, //void
+    prompt: function (sMessage, sDefaultValue) {}, //Object
+    releaseEvents: function (eventType) {}, //Gecko,void,deprecated
+    removeEventListener: function (type, listener, useCapture) {}, //Gecko,Object
+    resizeBy: function (widthDelta, heightDelta) {}, //Object
+    resizeTo: function (width, height) {}, //Object
+    routeEvent: function (event) {}, //Gecko,void,deprecated
+    screen: 0, //Screen
+    screenLeft: 0, //IE,Number
+    screenTop: 0, //IE,Number
+    ScriptEngine: function () {}, //IE,String
+    ScriptEngineBuildVersion: function () {}, //IE,String
+    ScriptEngineMajorVersion: function () {}, //IE,String
+    ScriptEngineMinorVersion: function () {}, //IE,String
+    scrollbars: 0, //Object
+    scrollBy: function (xDelta, yDelta) {}, //Object
+    scrollMaxX: 0, //Number
+    scrollMaxY: 0, //Number
+    scrollTo: function (x, y) {}, //Object
+    scrollX: 0, //Number
+    scrollY: 0, //Number
+    self: 0, //Object
+    setInterval: function (vCode, iMillis) {}, //Number
+    setTimeout: function (vCode, iMillis) {}, //Number
+    showModalDialog: function (sUrl, vArguments, sFeatures) {}, //IE,style
+    sidebar: 0, //Gecko,MozillaSideBar
+    status: 0, //String
+    toolbar: 0, //Object
+    top: 0, //window
+    window: 0, //window
+};
+
+var escape = function () {}; //Object,deprecated
+var unescape = function () {}; //Object,deprecated
+
+var HTMLCollection = {
+    length: 0, //Number
+    item: function (index) {}, //Node
+    namedItem: function (name) {}, //Node
+};
+
+var HTMLOptionsCollection = {
+    item: function (index) {}, //Node
+    length: 0, //Number
+    namedItem: function (name) {}, //Node
+};
+
+var HTMLDocument = {
+    activeElement: 0, //IE,DocumentView
+    anchors: 0, //HTMLCollection
+    applets: 0, //HTMLCollection
+    body: 0, //HTMLElement
+    close: function () {}, //Object
+    commandDispatcher: 0, //Gecko,CommandDispatcher
+    compatMode: 0, //String
+    cookie: 0, //HTMLCollection
+    createEventObject: function (oExistingEvent) {}, //IE,Even
+    createStyleSheet: function () {}, //IE,Stylesheet
+    defaultView: 0, //Gecko,DocumentView
+    domain: 0, //String
+    elementFromPoint: function (iX, iY) {}, //IE,HTMLElement
+    forms: 0, //HTMLCollection
+    getAnonymousElementByAttribute: function (node, attrName, attrValue) {}, //Gecko,NodeList
+    getAnonymousNodes: function (node) {}, //Gecko,Node[]
+    getBoxObjectFor: function (element) {}, //Gecko,Node
+    getElementsByName: function (elementName) {}, //NodeList
+    getElementsByClassName: function (className) {}, //Gecko,NodeList
+    images: 0, //HTMLCollection
+    links: 0, //HTMLCollection
+    open: function () {}, //Object
+    parentWindow: 0, //IE,window
+    querySelector: function (string) {}, //Gecko,Node
+    querySelectorAll: function (string) {}, //Gecko,NodeList
+    referrer: 0, //String
+    title: 0, //String
+    URL: 0, //String
+    write: function (text) {}, //Object
+    writeln: function (text) {}, //Object
+};
 HTMLDocument.prototype = new Document();
 
-CommandDispatcher.focusedElement = 0;//Gecko,HTMLElement
-CommandDispatcher = {};
-CommandDispatcher.prototype = new Object();
-
-DocumentView.getComputedStyle = function(element,type) {};//Gecko,CssStyle
-DocumentView.prototype = new Object();
-
-CssStyle.getPropertyValue = function(propertyName) {};//Gecko,String
-CssStyle.prototype = new Object();
-
-HTMLElement.id = 0;//String
-HTMLElement.title = 0;//String
-HTMLElement.lang = 0;//String
-HTMLElement.dir = 0;//String
-HTMLElement.className = 0;//String
-HTMLElement.children = 0;//IE,HTMLElement[]
-HTMLElement.style = 0;//style
-HTMLElement.clientWidth = 0;//Number
-HTMLElement.clientHeight = 0;//Number
-HTMLElement.clientTop = 0;//Number
-HTMLElement.clientLeft = 0;//Number
-HTMLElement.innerHTML = 0;//String
-HTMLElement.innerText = 0;//IE,String
-HTMLElement.offsetWidth = 0;//Number
-HTMLElement.offsetHeight = 0;//Number
-HTMLElement.offsetTop = 0;//Number
-HTMLElement.offsetLeft = 0;//Number
-HTMLElement.offsetParent = 0;//Number
-HTMLElement.scrollWidth = 0;//Number
-HTMLElement.scrollHeight = 0;//Number
-HTMLElement.scrollTop = 0;//Number
-HTMLElement.scrollLeft = 0;//Number
-HTMLElement.stylesheet = 0;//Stylesheet
-HTMLElement.currentStyle = 0;//IE,IEElementStyle
-HTMLElement.runtimeStyle = 0;//IE,IEElementStyle
-HTMLElement.filters = 0;//IE,Array
-HTMLElement.boxObject = 0;//Gecko,HTMLElement
-HTMLElement.propertyName = 0;//IE,String
-HTMLElement.isDisabled = 0;//IE,Boolean
-HTMLElement = {};
-HTMLElement.insertAdjacentHTML = function(position,htmlContent) {};//IE,Object
-HTMLElement.insertAdjacentText = function(position,textContent) {};//IE,Object
-HTMLElement.attachEvent = function(type,listener) {};//IE,Object
-HTMLElement.detachEvent = function(type,listener) {};//IE,Object
-HTMLElement.fireEvent = function(type,event) {};//IE,Object
-HTMLElement.addBehavior = function(sUrl) {};//IE,Number
-HTMLElement.removeBehavior = function(sID) {};//IE,Boolean
-HTMLElement.getBoundingClientRect = function() {};//IE,TextRange
-HTMLElement.showPopup = function() {};//Gecko,Object
-HTMLElement.hidePopup = function() {};//Gecko,Object
-HTMLElement.setCapture = function(bContainerCapture) {};//IE,Object
-HTMLElement.releaseCapture = function() {};//IE,Object
-HTMLElement.clearAttributes = function() {};//IE,Object
-HTMLElement.mergeAttributes = function(oSource,bPreserve) {};//IE,Object
-var HTMLElement = {
-	onblur: function () {},
-	onclick: function () {},
-	ondblclick: function () {},
-	onfocus: function () {},
-	onkeydown: function () {},
-	onkeyup: function () {},
-	onmouseup: function () {},
-	onmousedown: function () {},
-	onmouseout: function () {},
-	onmouseover: function () {},
-	onmousemove: function () {},
-	onresize: function () {}
+var CommandDispatcher = {
+    focusedElement: 0, //Gecko,HTMLElement
 };
-HTMLElement.prototype = new Element();
 
-IEElementStyle.hasLayout = 0;//IE,Boolean
-IEElementStyle = {};
-IEElementStyle.prototype = new style();
+var DocumentView = {
+    getComputedStyle: function (element, type) {}, //Gecko,CssStyle
+};
 
-HTMLHtmlElement.version = 0;//String
-HTMLHtmlElement = {};
-HTMLHtmlElement.prototype = new HTMLElement();
+var CssStyle = {
+    getPropertyValue: function (propertyName) {}, //Gecko,String
+};
 
-HTMLHeadElement.profile = 0;//String
-HTMLHeadElement = {};
-HTMLHeadElement.prototype = new HTMLElement();
+var HTMLElement = {
+    addBehavior: function (sUrl) {}, //IE,Number
+    attachEvent: function (type, listener) {}, //IE,Object
+    boxObject: 0, //Gecko,HTMLElement
+    children: 0, //IE,HTMLElement[]
+    className: 0, //String
+    clearAttributes: function () {}, //IE,Object
+    clientHeight: 0, //Number
+    clientLeft: 0, //Number
+    clientTop: 0, //Number
+    clientWidth: 0, //Number
+    currentStyle: 0, //IE,IEElementStyle
+    detachEvent: function (type, listener) {}, //IE,Object
+    dir: 0, //String
+    filters: 0, //IE,Array
+    fireEvent: function (type, event) {}, //IE,Object
+    getBoundingClientRect: function () {}, //IE,TextRange
+    hidePopup: function () {}, //Gecko,Object
+    id: 0, //String
+    innerHTML: 0, //String
+    innerText: 0, //IE,String
+    insertAdjacentHTML: function (position, htmlContent) {}, //IE,Object
+    insertAdjacentText: function (position, textContent) {}, //IE,Object
+    isDisabled: 0, //IE,Boolean
+    lang: 0, //String
+    mergeAttributes: function (oSource, bPreserve) {}, //IE,Object
+    offsetHeight: 0, //Number
+    offsetLeft: 0, //Number
+    offsetParent: 0, //Number
+    offsetTop: 0, //Number
+    offsetWidth: 0, //Number
+    onblur: function () {},
+    onclick: function () {},
+    ondblclick: function () {},
+    onfocus: function () {},
+    onkeydown: function () {},
+    onkeyup: function () {},
+    onmouseup: function () {},
+    onmousedown: function () {},
+    onmouseout: function () {},
+    onmouseover: function () {},
+    onmousemove: function () {},
+    onresize: function () {},
+    propertyName: 0, //IE,String
+    releaseCapture: function () {}, //IE,Object
+    removeBehavior: function (sID) {}, //IE,Boolean
+    runtimeStyle: 0, //IE,IEElementStyle
+    setCapture: function (bContainerCapture) {}, //IE,Object
+    scrollWidth: 0, //Number
+    scrollHeight: 0, //Number
+    scrollTop: 0, //Number
+    scrollLeft: 0, //Number
+    showPopup: function () {}, //Gecko,Object
+    style: 0, //style
+    stylesheet: 0, //Stylesheet
+    title: 0, //String
+};
+HTMLElement.prototype = new Element();
 
-HTMLLinkElement.disabled = 0;//Boolean
-HTMLLinkElement.charset = 0;//String
-HTMLLinkElement.href = 0;//String
-HTMLLinkElement.hreflang = 0;//String
-HTMLLinkElement.media = 0;//String
-HTMLLinkElement.rel = 0;//String
-HTMLLinkElement.rev = 0;//String
-HTMLLinkElement.target = 0;//String
-HTMLLinkElement.type = 0;//String
-HTMLLinkElement = {};
-HTMLLinkElement.prototype = new HTMLElement();
+var HTMLAnchorElement = {
+    accessKey: 0, //String
+    charset: 0, //String
+    coords: 0, //String
+    blur: function () {}, //Object
+    focus: function () {}, //Object
+    href: 0, //String
+    hreflang: 0, //String
+    name: 0, //String
+    rel: 0, //String
+    rev: 0, //String
+    shape: 0, //String
+    tabIndex: 0, //Number
+    target: 0, //String
+    type: 0, //String
+};
+HTMLAnchorElement.prototype = new HTMLElement();
 
-HTMLTitleElement.text = 0;//String
-HTMLTitleElement = {};
-HTMLTitleElement.prototype = new HTMLElement();
+var HTMLAppletElement = {
+    align: 0, //String
+    alt: 0, //String
+    archive: 0, //String
+    code: 0, //String
+    codeBase: 0, //String
+    height: 0, //String
+    hspace: 0, //Number
+    name: 0, //String
+    object: 0, //String
+    vspace: 0, //Number
+    width: 0, //String
+};
+HTMLAppletElement.prototype = new HTMLElement();
 
-HTMLMetaElement.content = 0;//String
-HTMLMetaElement.httpEquiv = 0;//String
-HTMLMetaElement.name = 0;//String
-HTMLMetaElement.scheme = 0;//String
-HTMLMetaElement = {};
-HTMLMetaElement.prototype = new HTMLElement();
+var HTMLAreaElement = {
+    accessKey: 0, //String
+    alt: 0, //String
+    coords: 0, //String
+    href: 0, //String
+    noHref: 0, //Boolean
+    shape: 0, //String
+    tabIndex: 0, //Number
+    target: 0, //String
+};
+HTMLAreaElement.prototype = new HTMLElement();
 
-HTMLBaseElement.href = 0;//String
-HTMLBaseElement.target = 0;//String
-HTMLBaseElement = {};
+var HTMLBaseElement = {
+    href: 0, //String
+    target: 0, //String
+};
 HTMLBaseElement.prototype = new HTMLElement();
 
-HTMLIsIndexElement.form = 0;//HTMLFormElement
-HTMLIsIndexElement.prompt = 0;//String
-HTMLIsIndexElement = {};
-HTMLIsIndexElement.prototype = new HTMLElement();
-
-HTMLStyleElement.disabled = 0;//Boolean
-HTMLStyleElement.media = 0;//String
-HTMLStyleElement.type = 0;//String
-HTMLStyleElement.styleSheet = 0;//IE,Stylesheet
-HTMLStyleElement = {};
-HTMLStyleElement.prototype = new HTMLElement();
+var HTMLBaseFontElement = {
+    color: 0, //String
+    face: 0, //String
+    size: 0, //Number
+};
+HTMLBaseFontElement.prototype = new HTMLElement();
 
-HTMLBodyElement.aLink = 0;//String
-HTMLBodyElement.background = 0;//String
-HTMLBodyElement.bgColor = 0;//String
-HTMLBodyElement.link = 0;//String
-HTMLBodyElement.text = 0;//String
-HTMLBodyElement.vLink = 0;//String
-HTMLBodyElement = {};
 var HTMLBodyElement = {
-	onload: function () {},
-	onunload: function () {}
+    aLink: 0, //String
+    background: 0, //String
+    bgColor: 0, //String
+    link: 0, //String
+    onload: function () {},
+    onunload: function () {},
+    text: 0, //String
+    vLink: 0 //String
 };
 HTMLBodyElement.prototype = new HTMLElement();
 
-HTMLFormElement.elements = 0;//HTMLCollection
-HTMLFormElement.length = 0;//Number
-HTMLFormElement.name = 0;//String
-HTMLFormElement.acceptCharset = 0;//String
-HTMLFormElement.action = 0;//String
-HTMLFormElement.enctype = 0;//String
-HTMLFormElement.method = 0;//String
-HTMLFormElement.target = 0;//String
-HTMLFormElement = {};
-HTMLFormElement.submit = function() {};//Object
-HTMLFormElement.reset = function() {};//Object
-HTMLFormElement.prototype = new Object();
-
-HTMLSelectElement.type = 0;//String
-HTMLSelectElement.selectedIndex = 0;//Number
-HTMLSelectElement.value = 0;//String
-HTMLSelectElement.length = 0;//Number
-HTMLSelectElement.form = 0;//HTMLFormElement
-HTMLSelectElement.options = 0;//HTMLOptionsCollection
-HTMLSelectElement.disabled = 0;//Boolean
-HTMLSelectElement.multiple = 0;//Boolean
-HTMLSelectElement.name = 0;//String
-HTMLSelectElement.size = 0;//Number
-HTMLSelectElement.tabIndex = 0;//Number
-HTMLSelectElement = {};
-HTMLSelectElement.add = function(element,before) {};//Object
-HTMLSelectElement.remove = function(index) {};//Object
-HTMLSelectElement.blur = function() {};//Object
-HTMLSelectElement.focus = function() {};//Object
-HTMLSelectElement.prototype = new HTMLElement();
+var HTMLBRElement = {
+    clear: 0 //String
+};
+HTMLBRElement.prototype = new HTMLElement();
 
-HTMLOptGroupElement.disabled = 0;//Boolean
-HTMLOptGroupElement.label = 0;//String
-HTMLOptGroupElement = {};
-HTMLOptGroupElement.prototype = new HTMLElement();
+var HTMLButtonElement = {
+    accessKey: 0, //String
+    disabled: 0, //Boolean
+    form: 0, //HTMLFormElement
+    name: 0, //String
+    tabIndex: 0, //Number
+    type: 0, //String
+    value: 0, //String
+};
+HTMLButtonElement.prototype = new HTMLElement();
 
-HTMLOptionElement.form = 0;//HTMLFormElement
-HTMLOptionElement.defaultSelected = 0;//Boolean
-HTMLOptionElement.text = 0;//String
-HTMLOptionElement.index = 0;//Number
-HTMLOptionElement.disabled = 0;//Boolean
-HTMLOptionElement.label = 0;//String
-HTMLOptionElement.selected = 0;//Boolean
-HTMLOptionElement.value = 0;//String
-HTMLOptionElement = {};
-HTMLOptionElement.prototype = new HTMLElement();
+var HTMLDirectoryElement = {
+    compact: 0, //Boolean
+};
+HTMLDirectoryElement.prototype = new HTMLElement();
 
-HTMLInputElement.defaultValue = 0;//String
-HTMLInputElement.defaultChecked = 0;//Boolean
-HTMLInputElement.form = 0;//HTMLFormElement
-HTMLInputElement.accept = 0;//String
-HTMLInputElement.accessKey = 0;//String
-HTMLInputElement.align = 0;//String
-HTMLInputElement.alt = 0;//String
-HTMLInputElement.checked = 0;//Boolean
-HTMLInputElement.disabled = 0;//Boolean
-HTMLInputElement.maxLength = 0;//Number
-HTMLInputElement.name = 0;//String
-HTMLInputElement.readOnly = 0;//Boolean
-HTMLInputElement.size = 0;//Number
-HTMLInputElement.src = 0;//String
-HTMLInputElement.tabIndex = 0;//Number
-HTMLInputElement.type = 0;//String
-HTMLInputElement.useMap = 0;//String
-HTMLInputElement.value = 0;//String
-HTMLInputElement = {};
-HTMLInputElement.blur = function() {};//Object
-HTMLInputElement.focus = function() {};//Object
-HTMLInputElement.select = function() {};//Object
-HTMLInputElement.click = function() {};//Object
-HTMLInputElement.setSelectionRange = function(start,end) {};//Gecko,Object
-HTMLInputElement.createTextRange = function() {};//IE,TextRange
-HTMLInputElement.prototype = new HTMLElement();
+var HTMLDivElement = {
+    align: 0, //String
+};
+HTMLDivElement.prototype = new HTMLElement();
 
-HTMLTextAreaElement.defaultValue = 0;//String
-HTMLTextAreaElement.form = 0;//HTMLFormElement
-HTMLTextAreaElement.accessKey = 0;//String
-HTMLTextAreaElement.cols = 0;//Number
-HTMLTextAreaElement.disabled = 0;//Boolean
-HTMLTextAreaElement.name = 0;//String
-HTMLTextAreaElement.readOnly = 0;//Boolean
-HTMLTextAreaElement.rows = 0;//Number
-HTMLTextAreaElement.tabIndex = 0;//Number
-HTMLTextAreaElement.type = 0;//String
-HTMLTextAreaElement.value = 0;//String
-HTMLTextAreaElement = {};
-HTMLTextAreaElement.blur = function() {};//Object
-HTMLTextAreaElement.focus = function() {};//Object
-HTMLTextAreaElement.select = function() {};//Object
-HTMLTextAreaElement.prototype = new HTMLElement();
+var HTMLDListElement = {
+    compact: 0, //Boolean
+};
+HTMLDListElement.prototype = new HTMLElement();
 
-HTMLButtonElement.form = 0;//HTMLFormElement
-HTMLButtonElement.accessKey = 0;//String
-HTMLButtonElement.disabled = 0;//Boolean
-HTMLButtonElement.name = 0;//String
-HTMLButtonElement.tabIndex = 0;//Number
-HTMLButtonElement.type = 0;//String
-HTMLButtonElement.value = 0;//String
-HTMLButtonElement = {};
-HTMLButtonElement.prototype = new HTMLElement();
+var HTMLFieldSetElement = {
+    form: 0, //HTMLFormElement
+};
+HTMLFieldSetElement.prototype = new HTMLElement();
 
-HTMLLabelElement.form = 0;//HTMLFormElement
-HTMLLabelElement.accessKey = 0;//String
-HTMLLabelElement.htmlFor = 0;//
-HTMLLabelElement = {};
-HTMLLabelElement.prototype = new HTMLElement();
+var HTMLFontElement = {
+    color: 0, //String
+    face: 0, //String
+    size: 0, //String
+};
+HTMLFontElement.prototype = new HTMLElement();
 
-HTMLFieldSetElement.form = 0;//HTMLFormElement
-HTMLFieldSetElement = {};
-HTMLFieldSetElement.prototype = new HTMLElement();
+var HTMLFormElement = {
+    acceptCharset: 0, //String
+    action: 0, //String
+    elements: 0, //HTMLCollection
+    enctype: 0, //String
+    length: 0, //Number
+    method: 0, //String
+    name: 0, //String
+    reset: function () {}, //Object
+    submit: function () {}, //Object
+    target: 0, //String
+};
 
-HTMLLegendElement.form = 0;//HTMLFormElement
-HTMLLegendElement.accessKey = 0;//String
-HTMLLegendElement.align = 0;//String
-HTMLLegendElement = {};
-HTMLLegendElement.prototype = new HTMLElement();
+var HTMLFrameElement = {
+    contentDocument: 0, //Gecko,Document
+    frameBorder: 0, //String
+    longDesc: 0, //String
+    marginHeight: 0, //String
+    marginWidth: 0, //String
+    name: 0, //String
+    noResize: 0, //Boolean
+    scrolling: 0, //String
+    src: 0, //String
+};
+HTMLFrameElement.prototype = new HTMLElement();
 
-HTMLUListElement.compact = 0;//Boolean
-HTMLUListElement.type = 0;//String
-HTMLUListElement = {};
-HTMLUListElement.prototype = new HTMLElement();
+var HTMLFrameSetElement = {
+    cols: 0, //String
+    rows: 0, //String
+};
+HTMLFrameSetElement.prototype = new HTMLElement();
 
-HTMLOListElement.compact = 0;//Boolean
-HTMLOListElement.start = 0;//Number
-HTMLOListElement.type = 0;//String
-HTMLOListElement = {};
-HTMLOListElement.prototype = new HTMLElement();
+var HTMLHeadElement = {
+    profile: 0, //String
+};
+HTMLHeadElement.prototype = new HTMLElement();
 
-HTMLDListElement.compact = 0;//Boolean
-HTMLDListElement = {};
-HTMLDListElement.prototype = new HTMLElement();
+var HTMLHeadingElement = {
+    align: 0, //String
+};
+HTMLHeadingElement.prototype = new HTMLElement();
 
-HTMLDirectoryElement.compact = 0;//Boolean
-HTMLDirectoryElement = {};
-HTMLDirectoryElement.prototype = new HTMLElement();
+var HTMLHtmlElement = {
+    version: 0, //String
+};
+HTMLHtmlElement.prototype = new HTMLElement();
 
-HTMLMenuElement.compact = 0;//Boolean
-HTMLMenuElement = {};
-HTMLMenuElement.prototype = new HTMLElement();
+var HTMLInputElement = {
+    accept: 0, //String
+    accessKey: 0, //String
+    align: 0, //String
+    alt: 0, //String
+    blur: function () {}, //Object
+    checked: 0, //Boolean
+    click: function () {}, //Object
+    createTextRange: function () {}, //IE,TextRange
+    defaultChecked: 0, //Boolean
+    defaultValue: 0, //String
+    disabled: 0, //Boolean
+    focus: function () {}, //Object
+    form: 0, //HTMLFormElement
+    maxLength: 0, //Number
+    name: 0, //String
+    readOnly: 0, //Boolean
+    select: function () {}, //Object
+    setSelectionRange: function (start, end) {}, //Gecko,Object
+    size: 0, //Number
+    src: 0, //String
+    tabIndex: 0, //Number
+    type: 0, //String
+    useMap: 0, //String
+    value: 0, //String
+};
+HTMLInputElement.prototype = new HTMLElement();
 
-HTMLLIElement.type = 0;//String
-HTMLLIElement.value = 0;//Number
-HTMLLIElement = {};
-HTMLLIElement.prototype = new HTMLElement();
+var HTMLIsIndexElement = {
+    form: 0, //HTMLFormElement
+    prompt: 0, //String
+};
+HTMLIsIndexElement.prototype = new HTMLElement();
 
-HTMLDivElement.align = 0;//String
-HTMLDivElement = {};
-HTMLDivElement.prototype = new HTMLElement();
+var HTMLHRElement = {
+    align: 0, //String
+    noShade: 0, //Boolean
+    size: 0, //String
+    width: 0, //String
+};
+HTMLHRElement.prototype = new HTMLElement();
 
-HTMLParagraphElement.align = 0;//String
-HTMLParagraphElement = {};
-HTMLParagraphElement.prototype = new HTMLElement();
+var HTMLIFrameElement = {
+    align: 0, //String
+    contentDocument: 0, //Document
+    contentWindow: 0, //window
+    frameBorder: 0, //String
+    height: 0, //String
+    longDesc: 0, //String
+    marginHeight: 0, //String
+    marginWidth: 0, //String
+    name: 0, //String
+    scrolling: 0, //String
+    src: 0, //String
+    width: 0, //String
+};
+HTMLIFrameElement.prototype = new HTMLElement();
 
-HTMLHeadingElement.align = 0;//String
-HTMLHeadingElement = {};
-HTMLHeadingElement.prototype = new HTMLElement();
+var HTMLImageElement = {
+    align: 0, //String
+    alt: 0, //String
+    border: 0, //String
+    height: 0, //Number
+    hspace: 0, //Number
+    isMap: 0, //Boolean
+    longDesc: 0, //String
+    name: 0, //String
+    src: 0, //String
+    useMap: 0, //String
+    vspace: 0, //Number
+    width: 0, //Number
+};
+HTMLImageElement.prototype = new HTMLElement();
 
-HTMLQuoteElement.cite = 0;//String
-HTMLQuoteElement = {};
-HTMLQuoteElement.prototype = new HTMLElement();
+var HTMLLabelElement = {
+    accessKey: 0, //String
+    form: 0, //HTMLFormElement
+    htmlFor: 0, //
+};
+HTMLLabelElement.prototype = new HTMLElement();
 
-HTMLPreElement.width = 0;//Number
-HTMLPreElement = {};
-HTMLPreElement.prototype = new HTMLElement();
+var HTMLLegendElement = {
+    accessKey: 0, //String
+    align: 0, //String
+    form: 0, //HTMLFormElement
+};
+HTMLLegendElement.prototype = new HTMLElement();
 
-HTMLBRElement.clear = 0;//String
-HTMLBRElement = {};
-HTMLBRElement.prototype = new HTMLElement();
+var HTMLLIElement = {
+    type: 0, //String
+    value: 0, //Number
+};
+HTMLLIElement.prototype = new HTMLElement();
 
-HTMLBaseFontElement.color = 0;//String
-HTMLBaseFontElement.face = 0;//String
-HTMLBaseFontElement.size = 0;//Number
-HTMLBaseFontElement = {};
-HTMLBaseFontElement.prototype = new HTMLElement();
+var HTMLLinkElement = {
+    charset: 0, //String
+    disabled: 0, //Boolean
+    href: 0, //String
+    hreflang: 0, //String
+    media: 0, //String
+    rel: 0, //String
+    rev: 0, //String
+    target: 0, //String
+    type: 0, //String
+};
+HTMLLinkElement.prototype = new HTMLElement();
 
-HTMLFontElement.color = 0;//String
-HTMLFontElement.face = 0;//String
-HTMLFontElement.size = 0;//String
-HTMLFontElement = {};
-HTMLFontElement.prototype = new HTMLElement();
+var HTMLMapElement = {
+    areas: 0, //HTMLCollection
+    name: 0, //String
+};
+HTMLMapElement.prototype = new HTMLElement();
 
-HTMLHRElement.align = 0;//String
-HTMLHRElement.noShade = 0;//Boolean
-HTMLHRElement.size = 0;//String
-HTMLHRElement.width = 0;//String
-HTMLHRElement = {};
-HTMLHRElement.prototype = new HTMLElement();
+var HTMLMenuElement = {
+    compact: 0, //Boolean
+};
+HTMLMenuElement.prototype = new HTMLElement();
 
-HTMLModElement.cite = 0;//String
-HTMLModElement.dateTime = 0;//String
-HTMLModElement = {};
+var HTMLMetaElement = {
+    content: 0, //String
+    httpEquiv: 0, //String
+    name: 0, //String
+    scheme: 0, //String
+};
+HTMLMetaElement.prototype = new HTMLElement();
+
+var HTMLModElement = {
+    cite: 0, //String
+    dateTime: 0, //String
+};
 HTMLModElement.prototype = new HTMLElement();
 
-HTMLAnchorElement.accessKey = 0;//String
-HTMLAnchorElement.charset = 0;//String
-HTMLAnchorElement.coords = 0;//String
-HTMLAnchorElement.href = 0;//String
-HTMLAnchorElement.hreflang = 0;//String
-HTMLAnchorElement.name = 0;//String
-HTMLAnchorElement.rel = 0;//String
-HTMLAnchorElement.rev = 0;//String
-HTMLAnchorElement.shape = 0;//String
-HTMLAnchorElement.tabIndex = 0;//Number
-HTMLAnchorElement.target = 0;//String
-HTMLAnchorElement.type = 0;//String
-HTMLAnchorElement = {};
-HTMLAnchorElement.blur = function() {};//Object
-HTMLAnchorElement.focus = function() {};//Object
-HTMLAnchorElement.prototype = new HTMLElement();
+var HTMLObjectElement = {
+    align: 0, //String
+    archive: 0, //String
+    border: 0, //String
+    code: 0, //String
+    codeBase: 0, //String
+    codeType: 0, //String
+    contentDocument: 0, //Document
+    data: 0, //String
+    declare: 0, //Boolean
+    form: 0, //HTMLFormElement
+    height: 0, //String
+    hspace: 0, //Number
+    name: 0, //String
+    standby: 0, //String
+    tabIndex: 0, //Number
+    type: 0, //String
+    useMap: 0, //String
+    vspace: 0, //Number
+    width: 0, //String
+};
+HTMLObjectElement.prototype = new HTMLElement();
 
-HTMLImageElement.name = 0;//String
-HTMLImageElement.align = 0;//String
-HTMLImageElement.alt = 0;//String
-HTMLImageElement.border = 0;//String
-HTMLImageElement.height = 0;//Number
-HTMLImageElement.hspace = 0;//Number
-HTMLImageElement.isMap = 0;//Boolean
-HTMLImageElement.longDesc = 0;//String
-HTMLImageElement.src = 0;//String
-HTMLImageElement.useMap = 0;//String
-HTMLImageElement.vspace = 0;//Number
-HTMLImageElement.width = 0;//Number
-HTMLImageElement = {};
-HTMLImageElement.prototype = new HTMLElement();
+var HTMLOListElement = {
+    compact: 0, //Boolean
+    start: 0, //Number
+    type: 0, //String
+};
+HTMLOListElement.prototype = new HTMLElement();
 
-HTMLObjectElement.form = 0;//HTMLFormElement
-HTMLObjectElement.code = 0;//String
-HTMLObjectElement.align = 0;//String
-HTMLObjectElement.archive = 0;//String
-HTMLObjectElement.border = 0;//String
-HTMLObjectElement.codeBase = 0;//String
-HTMLObjectElement.codeType = 0;//String
-HTMLObjectElement.data = 0;//String
-HTMLObjectElement.declare = 0;//Boolean
-HTMLObjectElement.height = 0;//String
-HTMLObjectElement.hspace = 0;//Number
-HTMLObjectElement.name = 0;//String
-HTMLObjectElement.standby = 0;//String
-HTMLObjectElement.tabIndex = 0;//Number
-HTMLObjectElement.type = 0;//String
-HTMLObjectElement.useMap = 0;//String
-HTMLObjectElement.vspace = 0;//Number
-HTMLObjectElement.width = 0;//String
-HTMLObjectElement.contentDocument = 0;//Document
-HTMLObjectElement = {};
-HTMLObjectElement.prototype = new HTMLElement();
+var HTMLOptGroupElement = {
+    disabled: 0, //Boolean
+    label: 0, //String
+};
+HTMLOptGroupElement.prototype = new HTMLElement();
 
-HTMLParamElement.name = 0;//String
-HTMLParamElement.type = 0;//String
-HTMLParamElement.value = 0;//String
-HTMLParamElement.valueType = 0;//String
-HTMLParamElement = {};
-HTMLParamElement.prototype = new HTMLElement();
+var HTMLOptionElement = {
+    defaultSelected: 0, //Boolean
+    disabled: 0, //Boolean
+    text: 0, //String
+    form: 0, //HTMLFormElement
+    index: 0, //Number
+    label: 0, //String
+    selected: 0, //Boolean
+    value: 0, //String
+};
+HTMLOptionElement.prototype = new HTMLElement();
 
-HTMLAppletElement.align = 0;//String
-HTMLAppletElement.alt = 0;//String
-HTMLAppletElement.archive = 0;//String
-HTMLAppletElement.code = 0;//String
-HTMLAppletElement.codeBase = 0;//String
-HTMLAppletElement.height = 0;//String
-HTMLAppletElement.hspace = 0;//Number
-HTMLAppletElement.name = 0;//String
-HTMLAppletElement.object = 0;//String
-HTMLAppletElement.vspace = 0;//Number
-HTMLAppletElement.width = 0;//String
-HTMLAppletElement = {};
-HTMLAppletElement.prototype = new HTMLElement();
+var HTMLParagraphElement = {
+    align: 0, //String
+};
+HTMLParagraphElement.prototype = new HTMLElement();
 
-HTMLMapElement.areas = 0;//HTMLCollection
-HTMLMapElement.name = 0;//String
-HTMLMapElement = {};
-HTMLMapElement.prototype = new HTMLElement();
+var HTMLParamElement = {
+    name: 0, //String
+    type: 0, //String
+    value: 0, //String
+    valueType: 0, //String
+};
+HTMLParamElement.prototype = new HTMLElement();
 
-HTMLAreaElement.accessKey = 0;//String
-HTMLAreaElement.alt = 0;//String
-HTMLAreaElement.coords = 0;//String
-HTMLAreaElement.href = 0;//String
-HTMLAreaElement.noHref = 0;//Boolean
-HTMLAreaElement.shape = 0;//String
-HTMLAreaElement.tabIndex = 0;//Number
-HTMLAreaElement.target = 0;//String
-HTMLAreaElement = {};
-HTMLAreaElement.prototype = new HTMLElement();
+var HTMLPreElement = {
+    width: 0, //Number
+};
+HTMLPreElement.prototype = new HTMLElement();
 
-HTMLScriptElement.text = 0;//String
-HTMLScriptElement.htmlFor = 0;//String
-HTMLScriptElement.event = 0;//String
-HTMLScriptElement.charset = 0;//String
-HTMLScriptElement.defer = 0;//Boolean
-HTMLScriptElement.src = 0;//String
-HTMLScriptElement.type = 0;//String
-HTMLScriptElement = {};
+var HTMLQuoteElement = {
+    cite: 0, //String
+};
+HTMLQuoteElement.prototype = new HTMLElement();
+
+var HTMLScriptElement = {
+    charset: 0, //String
+    defer: 0, //Boolean
+    event: 0, //String
+    htmlFor: 0, //String
+    src: 0, //String
+    text: 0, //String
+    type: 0, //String
+};
 HTMLScriptElement.prototype = new HTMLElement();
 
-HTMLTableElement.caption = 0;//HTMLTableCaptionElement
-HTMLTableElement.tHead = 0;//HTMLTableSectionElement
-HTMLTableElement.tFoot = 0;//HTMLTableSectionElement
-HTMLTableElement.rows = 0;//HTMLCollection
-HTMLTableElement.tBodies = 0;//HTMLCollection
-HTMLTableElement.align = 0;//String
-HTMLTableElement.bgColor = 0;//String
-HTMLTableElement.border = 0;//String
-HTMLTableElement.cellPadding = 0;//String
-HTMLTableElement.cellSpacing = 0;//String
-HTMLTableElement.frame = 0;//String
-HTMLTableElement.rules = 0;//String
-HTMLTableElement.summary = 0;//String
-HTMLTableElement.width = 0;//String
-HTMLTableElement = {};
-HTMLTableElement.createTHead = function() {};//HTMLElement
-HTMLTableElement.deleteTHead = function() {};//Object
-HTMLTableElement.createTFoot = function() {};//HTMLElement
-HTMLTableElement.deleteTFoot = function() {};//Object
-HTMLTableElement.createCaption = function() {};//HTMLElement
-HTMLTableElement.deleteCaption = function() {};//Object
-HTMLTableElement.insertRow = function(index) {};//HTMLElement
-HTMLTableElement.deleteRow = function(index) {};//Object
-HTMLTableElement.prototype = new HTMLElement();
+var HTMLSelectElement = {
+    add: function (element, before) {}, //Object
+    blur: function () {}, //Object
+    disabled: 0, //Boolean
+    focus: function () {}, //Object
+    form: 0, //HTMLFormElement
+    length: 0, //Number
+    multiple: 0, //Boolean
+    name: 0, //String
+    options: 0, //HTMLOptionsCollection
+    remove: function (index) {}, //Object
+    selectedIndex: 0, //Number
+    size: 0, //Number
+    tabIndex: 0, //Number
+    type: 0, //String
+    value: 0, //String
+};
+HTMLSelectElement.prototype = new HTMLElement();
 
-HTMLTableCaptionElement.align = 0;//String
-HTMLTableCaptionElement = {};
+var HTMLStyleElement = {
+    disabled: 0, //Boolean
+    media: 0, //String
+    type: 0, //String
+    styleSheet: 0, //IE,Stylesheet
+};
+HTMLStyleElement.prototype = new HTMLElement();
+
+var HTMLTableCaptionElement = {
+    align: 0, //String
+};
 HTMLTableCaptionElement.prototype = new HTMLElement();
 
-HTMLTableColElement.align = 0;//String
-HTMLTableColElement.ch = 0;//String
-HTMLTableColElement.chOff = 0;//String
-HTMLTableColElement.span = 0;//Number
-HTMLTableColElement.vAlign = 0;//String
-HTMLTableColElement.width = 0;//String
-HTMLTableColElement = {};
+var HTMLTableColElement = {
+    align: 0, //String
+    ch: 0, //String
+    chOff: 0, //String
+    span: 0, //Number
+    vAlign: 0, //String
+    width: 0, //String
+};
 HTMLTableColElement.prototype = new HTMLElement();
 
-HTMLTableSectionElement.align = 0;//String
-HTMLTableSectionElement.ch = 0;//String
-HTMLTableSectionElement.chOff = 0;//String
-HTMLTableSectionElement.vAlign = 0;//String
-HTMLTableSectionElement.rows = 0;//HTMLCollection
-HTMLTableSectionElement = {};
-HTMLTableSectionElement.insertRow = function(index) {};//HTMLElement
-HTMLTableSectionElement.deleteRow = function(index) {};//Object
-HTMLTableSectionElement.prototype = new HTMLElement();
+var HTMLTableCellElement = {
+    abbr: 0, //String
+    align: 0, //String
+    axis: 0, //String
+    bgColor: 0, //String
+    cellIndex: 0, //Number
+    ch: 0, //String
+    chOff: 0, //String
+    colSpan: 0, //Number
+    headers: 0, //String
+    height: 0, //String
+    noWrap: 0, //Boolean
+    rowSpan: 0, //Number
+    scope: 0, //String
+    vAlign: 0, //String
+    width: 0, //String
+};
+HTMLTableCellElement.prototype = new HTMLElement();
+
+var HTMLTableElement = {
+    align: 0, //String
+    bgColor: 0, //String
+    border: 0, //String
+    caption: 0, //HTMLTableCaptionElement
+    cellPadding: 0, //String
+    cellSpacing: 0, //String
+    createCaption: function () {}, //HTMLElement
+    createTFoot: function () {}, //HTMLElement
+    createTHead: function () {}, //HTMLElement
+    deleteCaption: function () {}, //Object
+    deleteRow: function (index) {}, //Object
+    deleteTHead: function () {}, //Object
+    deleteTFoot: function () {}, //Object
+    frame: 0, //String
+    insertRow: function (index) {}, //HTMLElement
+    rows: 0, //HTMLCollection
+    rules: 0, //String
+    summary: 0, //String
+    tBodies: 0, //HTMLCollection
+    tHead: 0, //HTMLTableSectionElement
+    tFoot: 0, //HTMLTableSectionElement
+    width: 0, //String
+};
+HTMLTableElement.prototype = new HTMLElement();
 
-HTMLTableRowElement.rowIndex = 0;//Number
-HTMLTableRowElement.sectionRowIndex = 0;//Number
-HTMLTableRowElement.cells = 0;//HTMLCollection
-HTMLTableRowElement.align = 0;//String
-HTMLTableRowElement.bgColor = 0;//String
-HTMLTableRowElement.ch = 0;//String
-HTMLTableRowElement.chOff = 0;//String
-HTMLTableRowElement.vAlign = 0;//String
-HTMLTableRowElement = {};
-HTMLTableRowElement.insertCell = function(index) {};//HTMLElement
-HTMLTableRowElement.deleteCell = function(index) {};//Object
+var HTMLTableRowElement = {
+    align: 0, //String
+    bgColor: 0, //String
+    cells: 0, //HTMLCollection
+    ch: 0, //String
+    chOff: 0, //String
+    deleteCell: function (index) {}, //Object
+    insertCell: function (index) {}, //HTMLElement
+    rowIndex: 0, //Number
+    sectionRowIndex: 0, //Number
+    vAlign: 0, //String
+};
 HTMLTableRowElement.prototype = new HTMLElement();
 
-HTMLTableCellElement.cellIndex = 0;//Number
-HTMLTableCellElement.abbr = 0;//String
-HTMLTableCellElement.align = 0;//String
-HTMLTableCellElement.axis = 0;//String
-HTMLTableCellElement.bgColor = 0;//String
-HTMLTableCellElement.ch = 0;//String
-HTMLTableCellElement.chOff = 0;//String
-HTMLTableCellElement.colSpan = 0;//Number
-HTMLTableCellElement.headers = 0;//String
-HTMLTableCellElement.height = 0;//String
-HTMLTableCellElement.noWrap = 0;//Boolean
-HTMLTableCellElement.rowSpan = 0;//Number
-HTMLTableCellElement.scope = 0;//String
-HTMLTableCellElement.vAlign = 0;//String
-HTMLTableCellElement.width = 0;//String
-HTMLTableCellElement = {};
-HTMLTableCellElement.prototype = new HTMLElement();
+var HTMLTableSectionElement = {
+    align: 0, //String
+    ch: 0, //String
+    chOff: 0, //String
+    deleteRow: function (index) {}, //Object
+    insertRow: function (index) {}, //HTMLElement
+    rows: 0, //HTMLCollection
+    vAlign: 0, //String
+};
+HTMLTableSectionElement.prototype = new HTMLElement();
 
-HTMLFrameSetElement.cols = 0;//String
-HTMLFrameSetElement.rows = 0;//String
-HTMLFrameSetElement = {};
-HTMLFrameSetElement.prototype = new HTMLElement();
+var HTMLTextAreaElement = {
+    accessKey: 0, //String
+    blur: function () {}, //Object
+    cols: 0, //Number
+    defaultValue: 0, //String
+    disabled: 0, //Boolean
+    focus: function () {}, //Object
+    form: 0, //HTMLFormElement
+    name: 0, //String
+    readOnly: 0, //Boolean
+    rows: 0, //Number
+    select: function () {}, //Object
+    tabIndex: 0, //Number
+    type: 0, //String
+    value: 0, //String
+};
+HTMLTextAreaElement.prototype = new HTMLElement();
 
-HTMLFrameElement.frameBorder = 0;//String
-HTMLFrameElement.longDesc = 0;//String
-HTMLFrameElement.marginHeight = 0;//String
-HTMLFrameElement.marginWidth = 0;//String
-HTMLFrameElement.name = 0;//String
-HTMLFrameElement.noResize = 0;//Boolean
-HTMLFrameElement.scrolling = 0;//String
-HTMLFrameElement.src = 0;//String
-HTMLFrameElement.contentDocument = 0;//Gecko,Document
-HTMLFrameElement = {};
-HTMLFrameElement.prototype = new HTMLElement();
+var HTMLTitleElement = {
+    text: 0, //String
+};
+HTMLTitleElement.prototype = new HTMLElement();
 
-HTMLIFrameElement.align = 0;//String
-HTMLIFrameElement.frameBorder = 0;//String
-HTMLIFrameElement.height = 0;//String
-HTMLIFrameElement.longDesc = 0;//String
-HTMLIFrameElement.marginHeight = 0;//String
-HTMLIFrameElement.marginWidth = 0;//String
-HTMLIFrameElement.name = 0;//String
-HTMLIFrameElement.scrolling = 0;//String
-HTMLIFrameElement.src = 0;//String
-HTMLIFrameElement.width = 0;//String
-HTMLIFrameElement.contentDocument = 0;//Document
-HTMLIFrameElement.contentWindow = 0;//window
-HTMLIFrameElement = {};
-HTMLIFrameElement.prototype = new HTMLElement();
+var HTMLUListElement = {
+    compact: 0, //Boolean
+    type: 0, //String
+};
+HTMLUListElement.prototype = new HTMLElement();
+
+var IEElementStyle = {
+    hasLayout: 0, //IE,Boolean
+};
+IEElementStyle.prototype = new style();
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMCore.js b/plugin/src/main/dist/sdk/clientAny/DOMCore.js
index 8b9c4a8c..01569250 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMCore.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMCore.js
@@ -1,253 +1,271 @@
-DOMImplementationRegistry.getDOMImplementation = function(features) {};//Object
-DOMImplementationRegistry.getDOMImplementationList = function(features) {};//Object
-DOMImplementationRegistry.prototype = new Object();
-
-DOMException.code = 0;//Number
-DOMException = {};
-DOMException.prototype = new Object();
-
-DOMStringList.length = 0;//Number
-DOMStringList = {};
-DOMStringList.item = function(index) {};//String
-DOMStringList.contains = function(str) {};//Boolean
-DOMStringList.prototype = new Object();
-
-NameList.length = 0;//Number
-NameList = {};
-NameList.getName = function(index) {};//String
-NameList.getNamespaceURI = function(index) {};//String
-NameList.contains = function(str) {};//Boolean
-NameList.containsNS = function(namespaceURI,name) {};//Boolean
-NameList.prototype = new Object();
-
-DOMImplementationList.length = 0;//Number
-DOMImplementationList = {};
-DOMImplementationList.item = function(index) {};//DOMImplementation
-DOMImplementationList.prototype = new Object();
-
-DOMImplementationSource.getDOMImplementation = function(features) {};//DOMImplementation
-DOMImplementationSource.getDOMImplementationList = function(features) {};//DOMImplementationList
-DOMImplementationSource.prototype = new Object();
-
-DOMImplementation.hasFeature = function(feature,version) {};//Boolean
-DOMImplementation.createDocumentType = function(qualifiedName,publicId,systemId) {};//DocumentType
-DOMImplementation.createDocument = function(namespaceURI,qualifiedName,doctype) {};//Document
-DOMImplementation.getFeature = function(feature,version) {};//Object
-DOMImplementation.prototype = new Object();
+var DOMImplementationRegistry = {
+    getDOMImplementation: function (features) {}, //Object
+    getDOMImplementationList: function (features) {}, //Object
+};
 
+var DOMException = {
+    code: 0, //Number
+};
+
+var DOMStringList = {
+    contains: function (str) {}, //Boolean
+    item: function (index) {}, //String
+    length: 0, //Number
+};
+
+var NameList = {
+    contains: function (str) {}, //Boolean
+    containsNS: function (namespaceURI,name) {}, //Boolean
+    getName: function (index) {}, //String
+    getNamespaceURI: function (index) {}, //String
+    length: 0, //Number
+};
+
+var DOMImplementationList = {
+    item: function (index) {}, //DOMImplementation
+    length: 0, //Number
+};
+
+var DOMImplementationSource = {
+    getDOMImplementation: function (features) {}, //DOMImplementation
+    getDOMImplementationList: function (features) {}, //DOMImplementationList
+};
+
+var DOMImplementation = {
+    createDocument: function (namespaceURI,qualifiedName,doctype) {}, //Document
+    createDocumentType: function (qualifiedName,publicId,systemId) {}, //DocumentType
+    getFeature: function (feature,version) {}, //Object
+    hasFeature: function (feature,version) {}, //Boolean
+};
+
+var DocumentFragment = {};
 DocumentFragment.prototype = new Node();
 
-Document.doctype = 0;//DocumentType
-Document.implementation = 0;//DOMImplementation
-Document.documentElement = 0;//Element
-Document.inputEncoding = 0;//String
-Document.xmlEncoding = 0;//String
-Document.xmlStandalone = 0;//Boolean
-Document.xmlVersion = 0;//String
-Document.strictErrorChecking = 0;//Boolean
-Document.documentURI = 0;//String
-Document.domConfig = 0;//DOMConfiguration
-Document.parseError = 0;//IE,IXMLDOMParseError
-Document = {};
-Document.createElement = function(tagName) {};//Element
-Document.createDocumentFragment = function() {};//DocumentFragment
-Document.createTextNode = function(data) {};//Text
-Document.createComment = function(data) {};//Comment
-Document.createCDATASection = function(data) {};//CDATASection
-Document.createProcessingInstruction = function(target,data) {};//ProcessingInstruction
-Document.createAttribute = function(name) {};//Attr
-Document.createEntityReference = function(name) {};//EntityReference
-Document.getElementsByTagName = function(tagname) {};//NodeList
-Document.importNode = function(importedNode,deep) {};//Node
-Document.createElementNS = function(namespaceURI,qualifiedName) {};//Element
-Document.createAttributeNS = function(namespaceURI,qualifiedName) {};//Attr
-Document.getElementsByTagNameNS = function(namespaceURI,localName) {};//NodeList
-Document.getElementById = function(elementId) {};//Element
-Document.adoptNode = function(source) {};//Node
-Document.normalizeDocument = function() {};//Object
-Document.renameNode = function(n,namespaceURI,qualifiedName) {};//Node
-Document.load = function(filename) {};//IE,Object
-Document.loadXML = function(xmlString) {};//IE,Object
-Document.save = function(filename) {};//IE,Object
-Document.setProperty = function(name,value) {};//IE,Object
-Document.selectSingleNode = function(xpathExpression) {};//IE,Object
-Document.selectNodes = function(xpathExpression) {};//IE,Object
+var Document = {
+    adoptNode: function (source) {}, //Node
+    createAttribute: function (name) {}, //Attr
+    createAttributeNS: function (namespaceURI, qualifiedName) {}, //Attr
+    createCDATASection: function (data) {}, //CDATASection
+    createComment: function (data) {}, //Comment
+    createDocumentFragment: function () {}, //DocumentFragment
+    createElement: function (tagName) {}, //Element
+    createElementNS: function (namespaceURI,qualifiedName) {}, //Element
+    createProcessingInstruction: function (target,data) {}, //ProcessingInstruction
+    createTextNode: function (data) {}, //Text
+    createEntityReference: function (name) {}, //EntityReference
+    doctype: 0, //DocumentType
+    documentElement: 0, //Element
+    documentURI: 0, //String
+    domConfig: 0, //DOMConfiguration
+    getElementById: function (elementId) {}, //Element
+    getElementsByTagName: function (tagname) {}, //NodeList
+    getElementsByTagNameNS: function (namespaceURI,localName) {}, //NodeList
+    implementation: 0, //DOMImplementation
+    importNode: function (importedNode,deep) {}, //Node
+    inputEncoding: 0, //String
+    parseError: 0, //IE,IXMLDOMParseError
+    load: function (filename) {}, //IE,Object
+    loadXML: function (xmlString) {}, //IE,Object
+    normalizeDocument: function () {}, //Object
+    renameNode: function (n,namespaceURI,qualifiedName) {}, //Node
+    save: function (filename) {}, //IE,Object
+    setProperty: function (name,value) {}, //IE,Object
+    selectSingleNode: function (xpathExpression) {}, //IE,Object
+    selectNodes: function (xpathExpression) {}, //IE,Object
+    strictErrorChecking: 0, //Boolean
+    xmlEncoding: 0, //String
+    xmlStandalone: 0, //Boolean
+    xmlVersion: 0, //String
+};
 Document.prototype = new Node();
 
-IXMLDOMParseError.reason = 0;//IE,String
-IXMLDOMParseError.errorCode = 0;//IE,Number
-IXMLDOMParseError = {};
-IXMLDOMParseError.prototype = new Object();
-
-Node.nodeName = 0;//String
-Node.nodeValue = 0;//String
-Node.nodeType = 0;//Number
-Node.parentNode = 0;//Node
-Node.childNodes = 0;//NodeList
-Node.firstChild = 0;//Node
-Node.lastChild = 0;//Node
-Node.previousSibling = 0;//Node
-Node.nextSibling = 0;//Node
-Node.attributes = 0;//NamedNodeMap
-Node.ownerDocument = 0;//Document
-Node.namespaceURI = 0;//String
-Node.prefix = 0;//String
-Node.localName = 0;//String
-Node.baseURI = 0;//String
-Node.textContent = 0;//String
-Node = {};
-Node.insertBefore = function(newChild,refChild) {};//Node
-Node.replaceChild = function(newChild,refChild) {};//Node
-Node.removeChild = function(oldChild) {};//Node
-Node.appendChild = function(newChild) {};//Node
-Node.hasChildNodes = function() {};//Boolean
-Node.cloneNode = function(deep) {};//Node
-Node.normalize = function() {};//Object
-Node.isSupported = function(feature,version) {};//Boolean
-Node.hasAttributes = function() {};//Boolean
-Node.compareDocumentPosition = function(other) {};//Node
-Node.isSameNode = function(other) {};//Boolean
-Node.lookupPrefix = function(namespaceURI) {};//String
-Node.isDefaultNamespace = function(namespaceURI) {};//String
-Node.lookupNamespaceURI = function(prefix) {};//String
-Node.isEqualNode = function(arg) {};//Boolean
-Node.getFeature = function(feature,version) {};//Object
-Node.setUserData = function(key,data,handler) {};//Object
-Node.getUserData = function(key) {};//Object
-Node.prototype = new Object();
-
-NodeList.length = 0;//Number
-NodeList = {};
-NodeList.item = function(index) {};//Node
-NodeList.prototype = new Object();
-
-NamedNodeMap.length = 0;//Number
-NamedNodeMap = {};
-NamedNodeMap.getNamedItem = function(name) {};//Node
-NamedNodeMap.setNamedItem = function(arg) {};//Node
-NamedNodeMap.removeNamedItem = function(name) {};//Node
-NamedNodeMap.item = function(index) {};//Node
-NamedNodeMap.getNamedItemNS = function(namespaceURI,localName) {};//Node
-NamedNodeMap.setNamedItemNS = function(arg) {};//Node
-NamedNodeMap.removeNamedItemNS = function(namespaceURI,localName) {};//Node
-NamedNodeMap.prototype = new Object();
-
-CharacterData.data = 0;//String
-CharacterData.length = 0;//Number
-CharacterData = {};
-CharacterData.substringData = function(offset,count) {};//String
-CharacterData.appendData = function(arg) {};//Object
-CharacterData.insertData = function(offset,arg) {};//Object
-CharacterData.deleteData = function(offset,count) {};//Object
-CharacterData.replaceData = function(offset,count,arg) {};//Object
+var IXMLDOMParseError = {
+    errorCode: 0, //IE,Number
+    reason: 0, //IE,String
+};
+
+var Node = {
+    nodeName: 0, //String
+    nodeValue: 0, //String
+    nodeType: 0, //Number
+    parentNode: 0, //Node
+    childNodes: 0, //NodeList
+    firstChild: 0, //Node
+    lastChild: 0, //Node
+    previousSibling: 0, //Node
+    nextSibling: 0, //Node
+    attributes: 0, //NamedNodeMap
+    ownerDocument: 0, //Document
+    namespaceURI: 0, //String
+    prefix: 0, //String
+    localName: 0, //String
+    baseURI: 0, //String
+    textContent: 0, //String
+    insertBefore: function (newChild,refChild) {}, //Node
+    replaceChild: function (newChild,refChild) {}, //Node
+    removeChild: function (oldChild) {}, //Node
+    appendChild: function (newChild) {}, //Node
+    hasChildNodes: function () {}, //Boolean
+    cloneNode: function (deep) {}, //Node
+    normalize: function () {}, //Object
+    isSupported: function (feature,version) {}, //Boolean
+    hasAttributes: function () {}, //Boolean
+    compareDocumentPosition: function (other) {}, //Node
+    isSameNode: function (other) {}, //Boolean
+    lookupPrefix: function (namespaceURI) {}, //String
+    isDefaultNamespace: function (namespaceURI) {}, //String
+    lookupNamespaceURI: function (prefix) {}, //String
+    isEqualNode: function (arg) {}, //Boolean
+    getFeature: function (feature,version) {}, //Object
+    setUserData: function (key,data,handler) {}, //Object
+    getUserData: function (key) {}, //Object
+};
+
+var NodeList = {
+    length: 0, //Number
+    item: function (index) {}, //Node
+};
+
+var NamedNodeMap = {
+    length: 0, //Number
+    getNamedItem: function (name) {}, //Node
+    setNamedItem: function (arg) {}, //Node
+    removeNamedItem: function (name) {}, //Node
+    item: function (index) {}, //Node
+    getNamedItemNS: function (namespaceURI, localName) {}, //Node
+    setNamedItemNS: function (arg) {}, //Node
+    removeNamedItemNS: function (namespaceURI, localName) {}, //Node
+};
+
+var CharacterData = {
+    data: 0, //String
+    length: 0, //Number
+    substringData: function (offset,count) {}, //String
+    appendData: function (arg) {}, //Object
+    insertData: function (offset,arg) {}, //Object
+    deleteData: function (offset,count) {}, //Object
+    replaceData: function (offset,count,arg) {}, //Object
+};
 CharacterData.prototype = new Node();
 
-Attr.name = 0;//String
-Attr.specified = 0;//Boolean
-Attr.value = 0;//String
-Attr.ownerElement = 0;//Element
-Attr.schemaTypeInfo = 0;//TypeInfo
-Attr.isId = 0;//Boolean
-Attr = {};
+var Attr = {
+    name: 0, //String
+    specified: 0, //Boolean
+    value: 0, //String
+    ownerElement: 0, //Element
+    schemaTypeInfo: 0, //TypeInfo
+    isId: 0, //Boolean
+};
 Attr.prototype = new Node();
 
-Element.tagName = 0;//String
-Element.schemaTypeInfo = 0;//TypeInfo
-Element = {};
-Element.getAttribute = function(name) {};//String
-Element.setAttribute = function(name,value) {};//Object
-Element.removeAttribute = function(name) {};//Object
-Element.getAttributeNode = function(name) {};//Attr
-Element.setAttributeNode = function(newAttr) {};//Attr
-Element.removeAttributeNode = function(oldAttr) {};//Attr
-Element.getElementsByTagName = function(name) {};//NodeList
-Element.getAttributeNS = function(namespaceURI,localName) {};//String
-Element.setAttributeNS = function(namespaceURI,qualifiedName,value) {};//Object
-Element.removeAttributeNS = function(namespaceURI,localName) {};//Object
-Element.getAttributeNodeNS = function(namespaceURI,localName) {};//Object
-Element.setAttributeNodeNS = function(newAttr) {};//Object
-Element.getElementsByTagNameNS = function(namespaceURI,localName) {};//NodeList
-Element.hasAttribute = function(name) {};//Boolean
-Element.hasAttributeNS = function(namespaceURI,localName) {};//Boolean
-Element.setIdAttribute = function(name,isId) {};//Object
-Element.setIdAttributeNS = function(namespaceURI,localName,isId) {};//Object
-Element.setIdAttributeNode = function(idAttr,isId) {};//Object
+var Element = {
+    getAttribute: function (name) {}, //String
+    getAttributeNode: function (name) {}, //Attr
+    getAttributeNodeNS: function (namespaceURI,localName) {}, //Object
+    getAttributeNS: function (namespaceURI, localName) {}, //String
+    getElementsByTagName: function (name) {}, //NodeList
+    getElementsByTagNameNS: function (namespaceURI, localName) {}, //NodeList
+    hasAttribute: function (name) {}, //Boolean
+    hasAttributeNS: function (namespaceURI, localName) {}, //Boolean
+    removeAttribute: function (name) {}, //Object
+    removeAttributeNode: function (oldAttr) {}, //Attr
+    removeAttributeNS: function (namespaceURI,localName) {}, //Object
+    schemaTypeInfo: 0, //TypeInfo
+    setAttribute: function (name,value) {}, //Object
+    setAttributeNode: function (newAttr) {}, //Attr
+    setAttributeNodeNS: function (newAttr) {}, //Object
+    setAttributeNS: function (namespaceURI, qualifiedName, value) {}, //Object
+    setIdAttribute: function (name, isId) {}, //Object
+    setIdAttributeNode: function (idAttr, isId) {}, //Object
+    setIdAttributeNS: function (namespaceURI, localName, isId) {}, //Object
+    tagName: 0, //String
+};
 Element.prototype = new Node();
 
-Text.isElementContentWhitespace = 0;//Boolean
-Text.wholeText = 0;//String
-Text = {};
-Text.splitText = function(offset) {};//Text
-Text.replaceWholeText = function(content) {};//Text
+var Text = {
+    isElementContentWhitespace: 0, //Boolean
+    replaceWholeText: function (content) {}, //Text
+    splitText: function (offset) {}, //Text
+    wholeText: 0, //String
+};
 Text.prototype = new CharacterData();
 
+var Comment = {};
 Comment.prototype = new CharacterData();
 
-TypeInfo.typeName = 0;//String
-TypeInfo.typeNamespace = 0;//String
-TypeInfo = {};
-TypeInfo.isDerivedFrom = function(typeNamespaceArg,typeNameArg,derivationMethod) {};//Boolean
-TypeInfo.prototype = new Object();
-
-UserDataHandler.handle = function(param1,param2,param3,param4,param5) {};//Object
-UserDataHandler.prototype = new Object();
-
-DOMError.severity = 0;//Number
-DOMError.message = 0;//String
-DOMError.type = 0;//String
-DOMError.relatedException = 0;//Object
-DOMError.relatedData = 0;//Object
-DOMError.location = 0;//DOMLocator
-DOMError = {};
-DOMError.prototype = new Object();
-
-DOMErrorHandler.handler = function(error) {};//Boolean
-DOMErrorHandler.prototype = new Object();
-
-DOMLocator.lineNumber = 0;//Number
-DOMLocator.columnNumber = 0;//Number
-DOMLocator.byteOffset = 0;//Number
-DOMLocator.utf16Offset = 0;//Number
-DOMLocator.relatedNode = 0;//Node
-DOMLocator.uri = 0;//String
-DOMLocator = {};
-DOMLocator.prototype = new Object();
-
-DOMConfiguration.parameterNames = 0;//DOMStringList
-DOMConfiguration = {};
-DOMConfiguration.setParameter = function(name,value) {};//Object
-DOMConfiguration.getParameter = function(name) {};//Object
-DOMConfiguration.canSetParameter = function(name,value) {};//Boolean
-DOMConfiguration.prototype = new Object();
+var TypeInfo = {
+    isDerivedFrom: function (typeNamespaceArg,typeNameArg,derivationMethod) {}, //Boolean
+    typeName: 0, //String
+    typeNamespace: 0, //String
+};
+
+var UserDataHandler = {
+    handle: function (param1, param2, param3, param4, param5) {}, //Object
+};
+
+var DOMError = {
+    location: 0, //DOMLocator
+    message: 0, //String
+    relatedData: 0, //Object
+    relatedException: 0, //Object
+    severity: 0, //Number
+    type: 0, //String
+};
+
+var DOMErrorHandler = {
+    handler: function (error) {}, //Boolean
+};
+
+var DOMLocator = {
+    byteOffset: 0, //Number
+    columnNumber: 0, //Number
+    lineNumber: 0, //Number
+    relatedNode: 0, //Node
+    uri: 0, //String
+    utf16Offset: 0, //Number
+};
+
+var DOMConfiguration = {
+    canSetParameter: function (name, value) {}, //Boolean
+    getParameter: function (name) {}, //Object
+    parameterNames: 0, //DOMStringList
+    setParameter: function (name, value) {}, //Object
+};
 
+var CDATASection = {};
 CDATASection.prototype = new Text();
 
-DocumentType.name = 0;//String
-DocumentType.entities = 0;//NamedNodeMap
-DocumentType.notations = 0;//NamedNodeMap
-DocumentType.publicId = 0;//String
-DocumentType.systemId = 0;//String
-DocumentType.internalSubset = 0;//String
-DocumentType = {};
+var DocumentType = {
+    entities: 0, //NamedNodeMap
+    internalSubset: 0, //String
+    name: 0, //String
+    notations: 0, //NamedNodeMap
+    publicId: 0, //String
+    systemId: 0, //String
+};
 DocumentType.prototype = new Node();
 
-Notation.publicId = 0;//String
-Notation.systemId = 0;//String
-Notation = {};
+var Notation = {
+    publicId: 0, //String
+    systemId: 0, //String
+};
 Notation.prototype = new Node();
 
-Entity.publicId = 0;//String
-Entity.systemId = 0;//String
-Entity.notationName = 0;//String
-Entity.inputEncoding = 0;//String
-Entity.xmlEncoding = 0;//String
-Entity.xmlVersion = 0;//String
-Entity = {};
+var Entity = {
+    inputEncoding: 0, //String
+    notationName: 0, //String
+    publicId: 0, //String
+    systemId: 0, //String
+    xmlEncoding: 0, //String
+    xmlVersion: 0, //String
+};
 Entity.prototype = new Node();
 
+var EntityReference = {};
 EntityReference.prototype = new Node();
 
-ProcessingInstruction.target = 0;//String
-ProcessingInstruction.data = 0;//String
-ProcessingInstruction = {};
+var ProcessingInstruction = {
+    data: 0, //String
+    target: 0, //String
+};
 ProcessingInstruction.prototype = new Node();
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMEvents.js b/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
index 42afa09f..0f4d3bd1 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
@@ -1,100 +1,111 @@
-Event.type = 0;//Gecko,String
-Event.target = 0;//Gecko,EventTarget
-Event.currentTarget = 0;//Gecko,EventTarget
-Event.eventPhase = 0;//Gecko,Number
-Event.bubbles = 0;//Gecko,Boolean
-Event.cancelable = 0;//Gecko,Boolean
-Event.timeStamp = 0;//Gecko,Number
-Event.namespaceURI = 0;//Gecko,String
-Event = {};
-Event.stopPropagation = function() {};//Gecko,Object
-Event.preventDefault = function() {};//Gecko,Object
-Event.initEvent = function(eventTypeArg,canBubbleArg,cancelableArg) {};//Gecko,Object
-Event.isCustom = function() {};//Gecko,Boolean
-Event.stopImmediatePropagation = function() {};//Gecko,Object
-Event.isDefaultPrevented = function() {};//Gecko,Boolean
-Event.initEventNS = function(namespaceURIArg,eventTypeArg,canBubbleArg,cancelableArg) {};//Gecko,Object
-Event.prototype = new Object();
+var Event = {
+    currentTarget: 0, //Gecko,EventTarget
+    bubbles: 0, //Gecko,Boolean
+    cancelable: 0, //Gecko,Boolean
+    eventPhase: 0, //Gecko,Number
+    initEvent: function (eventTypeArg, canBubbleArg, cancelableArg) {}, //Gecko,Object
+    initEventNS: function (namespaceURIArg, eventTypeArg, canBubbleArg, cancelableArg) {}, //Gecko,Object
+    isCustom: function () {}, //Gecko,Boolean
+    isDefaultPrevented: function () {}, //Gecko,Boolean
+    namespaceURI: 0, //Gecko,String
+    preventDefault: function () {}, //Gecko,Object
+    stopImmediatePropagation: function () {}, //Gecko,Object
+    stopPropagation: function () {}, //Gecko,Object
+    target: 0, //Gecko,EventTarget
+    timeStamp: 0, //Gecko,Number
+    type: 0, //Gecko,String
+};
 
-EventTarget.addEventListener = function(type,listener,useCapture) {};//Gecko,Object
-EventTarget.removeEventListener = function(type,listener,useCapture) {};//Gecko,Object
-EventTarget.dispatchEvent = function(evt) {};//Gecko,Boolean
-EventTarget.addEventListenerNS = function(namespaceURI,type,listener,useCapture,evtGroup) {};//Gecko,Object
-EventTarget.removeEventListenerNS = function(namespaceURI,type,listener,useCapture) {};//Gecko,Object
-EventTarget.willTriggerNS = function(namespaceURI,type) {};//Gecko,Boolean
-EventTarget.hasEventListenerNS = function(namespaceURI,type) {};//Gecko,Boolean
-EventTarget.prototype = new Object();
+var EventTarget = {
+    addEventListener: function (type,listener,useCapture) {}, //Gecko,Object
+    addEventListenerNS: function (namespaceURI, type, listener, useCapture, evtGroup) {}, //Gecko,Object
+    dispatchEvent: function (evt) {}, //Gecko,Boolean
+    hasEventListenerNS: function (namespaceURI, type) {}, //Gecko,Boolean
+    removeEventListener: function (type,listener,useCapture) {}, //Gecko,Object
+    removeEventListenerNS: function (namespaceURI, type, listener, useCapture) {}, //Gecko,Object
+    willTriggerNS: function (namespaceURI, type) {}, //Gecko,Boolean
+};
 
-EventListener.handleEvent = function(evt) {};//Gecko,Object
-EventListener.prototype = new Object();
+var EventListener = {
+    handleEvent: function (evt) {}, //Gecko,Object
+};
 
-EventException.code = 0;//Gecko,Number
-EventException = {};
-EventException.prototype = new Object();
+var EventException = {
+    code: 0, //Gecko,Number
+};
 
-DocumentEvent.createEvent = function(eventType) {};//Gecko,Event
-DocumentEvent.canDispatch = function(namespaceURI,type) {};//Gecko,String
-DocumentEvent.prototype = new Object();
+var DocumentEvent = {
+    canDispatch: function (namespaceURI, type) {}, //Gecko,String
+    createEvent: function (eventType) {}, //Gecko,Event
+};
 
-CustomEvent.setDispatchState = function(target,phase) {};//Gecko,Object
-CustomEvent.isPropagationStopped = function() {};//Gecko,Boolean
-CustomEvent.isImmediatePropagationStopped = function() {};//Gecko,Boolean
+var CustomEvent = {
+    isImmediatePropagationStopped: function () {}, //Gecko,Boolean
+    isPropagationStopped: function () {}, //Gecko,Boolean
+    setDispatchState: function (target, phase) {}, //Gecko,Object
+};
 CustomEvent.prototype = new Event();
 
-UIEvent.view = 0;//Gecko,AbstractView
-UIEvent.detail = 0;//Gecko,Number
-UIEvent = {};
-UIEvent.initUIEvent = function(typeArg,canBubbleArg,cancelableArg,viewArg,detailArg) {};//Gecko,Object
-UIEvent.initUIEventNS = function(namespaceURI,typeArg,canBubbleArg,cancelableArg,viewArg,detailArg) {};//Gecko,Object
+var UIEvent = {
+    detail: 0, //Gecko,Number
+    initUIEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, detailArg) {}, //Gecko,Object
+    initUIEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, detailArg) {}, //Gecko,Object
+    view: 0, //Gecko,AbstractView
+};
 UIEvent.prototype = new Event();
 
-TextEvent.data = 0;//Gecko,String
-TextEvent = {};
-TextEvent.initTextEvent = function(typeArg,canBubbleArg,cancelableArg,viewArg,dataArg) {};//Gecko,Object
-TextEvent.initTextEventNS = function(namespaceURI,typeArg,canBubbleArg,cancelableArg,viewArg,dataArg) {};//Gecko,Object
+var TextEvent = {
+    data: 0, //Gecko,String
+    initTextEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, dataArg) {}, //Gecko,Object
+    initTextEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, dataArg) {}, //Gecko,Object
+};
 TextEvent.prototype = new UIEvent();
 
-MouseEvent.screenX = 0;//Gecko,Number
-MouseEvent.screenY = 0;//Gecko,Number
-MouseEvent.clientX = 0;//Gecko,Number
-MouseEvent.clientY = 0;//Gecko,Number
-MouseEvent.ctrlKey = 0;//Gecko,Boolean
-MouseEvent.shiftKey = 0;//Gecko,Boolean
-MouseEvent.altKey = 0;//Gecko,Boolean
-MouseEvent.metaKey = 0;//Gecko,Boolean
-MouseEvent.button = 0;//Gecko,Number
-MouseEvent.relatedTarget = 0;//Gecko,EventTarget
-MouseEvent = {};
-MouseEvent.getModifierState = function(keyIdentifierArg) {};//Gecko,Boolean
-MouseEvent.initMouseEvent = function(typeArg,canBubbleArg,cancelableArg,viewArg,detailArg,screenXArg,screenYArg,clientXArg,clientYArg,ctrlKeyArg,altKeyArg,shiftKeyArg,metaKeyArg,buttonArg,relatedTargetArg) {};//Gecko,Object
-MouseEvent.initMouseEventNS = function(namespaceURI,typeArg,canBubbleArg,cancelableArg,viewArg,detailArg,screenXArg,screenYArg,clientXArg,clientYArg,ctrlKeyArg,altKeyArg,shiftKeyArg,metaKeyArg,buttonArg,relatedTargetArg) {};//Gecko,Object
+var MouseEvent = {
+    altKey: 0, //Gecko,Boolean
+    button: 0, //Gecko,Number
+    clientX: 0, //Gecko,Number
+    clientY: 0, //Gecko,Number
+    ctrlKey: 0, //Gecko,Boolean
+    getModifierState: function (keyIdentifierArg) {}, //Gecko,Boolean
+    initMouseEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg) {}, //Gecko,Object
+    initMouseEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg) {}, //Gecko,Object
+    metaKey: 0, //Gecko,Boolean
+    screenX: 0, //Gecko,Number
+    screenY: 0, //Gecko,Number
+    shiftKey: 0, //Gecko,Boolean
+    relatedTarget: 0, //Gecko,EventTarget
+};
 MouseEvent.prototype = new UIEvent();
 
-KeyboardEvent.keyIdentifier = 0;//Gecko,String
-KeyboardEvent.keyLocation = 0;//Gecko,Number
-KeyboardEvent.ctrlKey = 0;//Gecko,Boolean
-KeyboardEvent.shiftKey = 0;//Gecko,Boolean
-KeyboardEvent.altKey = 0;//Gecko,Boolean
-KeyboardEvent.metaKey = 0;//Gecko,Boolean
-KeyboardEvent = {};
-KeyboardEvent.getModifierState = function(keyIdentifierArg) {};//Gecko,Boolean
-KeyboardEvent.initKeyboardEvent = function(typeArg,canBubbleArg,cancelableArg,viewArg,keyIdentifierArg,keyLocationArg,modifiersList) {};//Gecko,Object
-KeyboardEvent.initKeyboardEventNS = function(namespaceURI,typeArg,canBubbleArg,cancelableArg,viewArg,keyIdentifierArg,keyLocationArg,modifiersList) {};//Gecko,Object
+var KeyboardEvent = {
+    altKey: 0, //Gecko,Boolean
+    ctrlKey: 0, //Gecko,Boolean
+    getModifierState: function (keyIdentifierArg) {}, //Gecko,Boolean
+    initKeyboardEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, keyIdentifierArg, keyLocationArg, modifiersList) {}, //Gecko,Object
+    initKeyboardEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, keyIdentifierArg, keyLocationArg, modifiersList) {}, //Gecko,Object
+    keyIdentifier: 0, //Gecko,String
+    keyLocation: 0, //Gecko,Number
+    metaKey: 0, //Gecko,Boolean
+    shiftKey: 0, //Gecko,Boolean
+};
 KeyboardEvent.prototype = new UIEvent();
 
-MutationEvent.relatedNode = 0;//Gecko,Node
-MutationEvent.prevValue = 0;//Gecko,String
-MutationEvent.newValue = 0;//Gecko,String
-MutationEvent.attrName = 0;//Gecko,String
-MutationEvent.attrChange = 0;//Gecko,Number
-MutationEvent = {};
-MutationEvent.initMutationEvent = function(typeArg,canBubbleArg,cancelableArg,relatedNodeArg,prevValueArg,newValueArg,attrNameArg,attrChangeArg) {};//Gecko,Object
-MutationEvent.initMutationEventNS = function(namespaceURI,typeArg,canBubbleArg,cancelableArg,relatedNodeArg,prevValueArg,newValueArg,attrNameArg,attrChangeArg) {};//Gecko,Object
+var MutationEvent = {
+    attrChange: 0, //Gecko,Number
+    attrName: 0, //Gecko,String
+    initMutationEvent: function (typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevValueArg, newValueArg, attrNameArg, attrChangeArg) {}, //Gecko,Object
+    initMutationEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevValueArg, newValueArg, attrNameArg, attrChangeArg) {}, //Gecko,Object
+    newValue: 0, //Gecko,String
+    prevValue: 0, //Gecko,String
+    relatedNode: 0, //Gecko,Node
+};
 MutationEvent.prototype = new UIEvent();
 
-MutationNameEvent.prevNamespaceURI = 0;//Gecko,String
-MutationNameEvent.prevNodeName = 0;//Gecko,String
-MutationNameEvent = {};
-MutationNameEvent.initMutationNameEvent = function(typeArg,canBubbleArg,cancelableArg,relatedNodeArg,prevNamespaceURIArg,prevNodeNameArg) {};//Gecko,Object
-MutationNameEvent.initMutationNameEventNS = function(namespaceURI,typeArg,canBubbleArg,cancelableArg,relatedNodeArg,prevNamespaceURIArg,prevNodeNameArg) {};//Gecko,Object
+var MutationNameEvent = {
+    initMutationNameEvent: function (typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevNamespaceURIArg, prevNodeNameArg) {}, //Gecko,Object
+    initMutationNameEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevNamespaceURIArg, prevNodeNameArg) {}, //Gecko,Object
+    prevNamespaceURI: 0, //Gecko,String
+    prevNodeName: 0, //Gecko,String
+};
 MutationNameEvent.prototype = new MutationEvent();
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js b/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
index 68cd2ae2..170dad4f 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
@@ -1,60 +1,64 @@
-NodeIterator.root = 0;//Node
-NodeIterator.whatToShow = 0;//Number
-NodeIterator.filter = 0;//NodeFilter
-NodeIterator.expandEntityReferences = 0;//Boolean
-NodeIterator = {};
-NodeIterator.nextNode = function() {};//Node
-NodeIterator.previousNode = function() {};//Node
-NodeIterator.detach = function() {};//Object
-NodeIterator.prototype = new Object();
+var NodeIterator = {
+    detach: function () {}, //Object
+    expandEntityReferences: 0, //Boolean
+    filter: 0, //NodeFilter
+    nextNode: function () {}, //Node
+    previousNode: function () {}, //Node
+    root: 0, //Node
+    whatToShow: 0, //Number
+};
 
-NodeFilter.NodeFilter = function(param) {};//Number
-NodeFilter.prototype = new Object();
+var NodeFilter = {
+    NodeFilter: function (param) {}, //Number
+};
 
-TreeWalker.parentNode = function() {};//Node
-TreeWalker.firstChild = function() {};//Node
-TreeWalker.lastChild = function() {};//Node
-TreeWalker.previousSibling = function() {};//Node
-TreeWalker.nextSibling = function() {};//Node
-TreeWalker.previousNode = function() {};//Node
-TreeWalker.nextNode = function() {};//Node
-TreeWalker.prototype = new Object();
+var TreeWalker = {
+    firstChild: function () {}, //Node
+    lastChild: function () {}, //Node
+    nextNode: function () {}, //Node
+    nextSibling: function () {}, //Node
+    parentNode: function () {}, //Node
+    previousNode: function () {}, //Node
+    previousSibling: function () {}, //Node
+};
 
-DocumentTraversal.createNodeIterator = function(root,whatToShow,filter,entityReferenceExpansion) {};//NodeIterator
-DocumentTraversal.createTreeWalker = function(root,whatToShow,filter,entityReferenceExpansion) {};//TreeWalker
-DocumentTraversal.prototype = new Object();
+var DocumentTraversal = {
+    createNodeIterator: function (root, whatToShow, filter, entityReferenceExpansion) {}, //NodeIterator
+    createTreeWalker: function (root, whatToShow, filter, entityReferenceExpansion) {}, //TreeWalker
+};
 
-Range.startContainer = 0;//Node
-Range.startOffset = 0;//long
-Range.endContainer = 0;//Node
-Range.endOffset = 0;//long
-Range.collapsed = 0;//Boolean
-Range.commonAncestorContainer = 0;//Node
-Range = {};
-Range.setStart = function(refNode,offset) {};//Object
-Range.setEnd = function(refNode,offset) {};//Object
-Range.setStartBefore = function(refNode) {};//Object
-Range.setStartAfter = function(refNode) {};//Object
-Range.setEndBefore = function(refNode) {};//Object
-Range.setEndAfter = function(refNode) {};//Object
-Range.collapse = function(toStart) {};//Object
-Range.selectNode = function(refNode) {};//Object
-Range.selectNodeContents = function(refNode) {};//Object
-Range.compareBoundaryPoints = function(how,sourceRange) {};//short
-Range.deleteContents = function() {};//Object
-Range.extractContents = function() {};//DocumentFragment
-Range.cloneContents = function() {};//DocumentFragment
-Range.insertNode = function(newNode) {};//Object
-Range.surroundContents = function(newParent) {};//Object
-Range.cloneRange = function() {};//Range
-Range.toString = function() {};//String
-Range.detach = function() {};//Object
-Range.createContextualFragment = function(tagString) {};//Gecko,Object
-Range.prototype = new Object();
+var Range = {
+    cloneContents: function () {}, //DocumentFragment
+    cloneRange: function () {}, //Range
+    collapse: function (toStart) {}, //Object
+    collapsed: 0, //Boolean
+    commonAncestorContainer: 0, //Node
+    compareBoundaryPoints: function (how,sourceRange) {}, //short
+    createContextualFragment: function (tagString) {}, //Gecko,Object
+    deleteContents: function () {}, //Object
+    detach: function () {}, //Object
+    endContainer: 0, //Node
+    endOffset: 0, //long
+    extractContents: function () {}, //DocumentFragment
+    insertNode: function (newNode) {}, //Object
+    selectNode: function (refNode) {}, //Object
+    selectNodeContents: function (refNode) {}, //Object
+    setEnd: function (refNode,offset) {}, //Object
+    setEndAfter: function (refNode) {}, //Object
+    setEndBefore: function (refNode) {}, //Object
+    setStart: function (refNode, offset) {}, //Object
+    setStartAfter: function (refNode) {}, //Object
+    setStartBefore: function (refNode) {}, //Object
+    startContainer: 0, //Node
+    startOffset: 0, //long
+    surroundContents: function (newParent) {}, //Object
+    toString: function () {}, //String
+};
 
-DocumentRange.createRange = function() {};//Range
-DocumentRange.prototype = new Object();
+var DocumentRange = {
+    createRange: function () {}, //Range
+};
 
-RangeException.code = 0;//Number
-RangeException = {};
-RangeException.prototype = new Object();
+var RangeException = {
+    code: 0, //Number
+};
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMXPath.js b/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
index 0deec4e7..8e949045 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
@@ -1,40 +1,44 @@
-XPathException.code = 0;//Gecko,Number
-XPathException = {};
-XPathException.prototype = new Object();
+var XPathException = {
+    code: 0, //Gecko,Number
+};
 
-XPathEvaluator.createExpression = function(expression,resolver) {};//Gecko,XPathExpression
-XPathEvaluator.createNSResolver = function(nodeResolver) {};//Gecko,XPathNSResolver
-XPathEvaluator.evaluate = function(expression,contextNode,resolver,type,result) {};//Gecko,Object
-XPathEvaluator.prototype = new Object();
+var XPathEvaluator = {
+    createExpression: function (expression, resolver) {}, //Gecko,XPathExpression
+    createNSResolver: function (nodeResolver) {}, //Gecko,XPathNSResolver
+    evaluate: function (expression, contextNode, resolver, type, result) {}, //Gecko,Object
+};
 
-XPathExpression.evaluate = function(contextNode,type,result) {};//Gecko,Object
-XPathExpression.prototype = new Object();
+var XPathExpression = {
+    evaluate: function (contextNode, type, result) {}, //Gecko,Object
+};
 
-XPathNSResolver.lookupNamespaceURI = function(prefix) {};//Gecko,String
-XPathNSResolver.prototype = new Object();
+var XPathNSResolver = {
+    lookupNamespaceURI: function (prefix) {}, //Gecko,String
+};
 
-XPathResult.resultType = 0;//Gecko,Number
-XPathResult.numberValue = 0;//Gecko,Number
-XPathResult.stringValue = 0;//Gecko,String
-XPathResult.booleanValue = 0;//Gecko,Boolean
-XPathResult.singleNodeValue = 0;//Gecko,Node
-XPathResult.invalidIteratorState = 0;//Gecko,Boolean
-XPathResult.snapshotLength = 0;//Gecko,Number
-XPathResult.ORDERED_NODE_SNAPSHOT_TYPE = 0;//Gecko,Number
-XPathResult.ORDERED_NODE_ITERATOR_TYPE = 0;//Gecko,Number
-XPathResult.ANY_TYPE = 0;//Gecko,Number
-XPathResult.BOOLEAN_TYPE = 0;//Gecko,Number
-XPathResult.NUMBER_TYPE = 0;//Gecko,Number
-XPathResult.STRING_TYPE = 0;//Gecko,Number
-XPathResult.FIRST_ORDERED_NODE_TYPE = 0;//Gecko,Number
-XPathResult.ANY_UNORDERED_NODE_TYPE = 0;//Gecko,Number
-XPathResult.UNORDERED_NODE_ITERATOR_TYPE = 0;//Gecko,Number
-XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE = 0;//Gecko,Number
-XPathResult = {};
-XPathResult.iterateNext = function() {};//Gecko,Node
-XPathResult.snapshotItem = function(index) {};//Gecko,Node
-XPathResult.prototype = new Object();
+var XPathResult = {
+    ANY_TYPE: 0, //Gecko,Number
+    ANY_UNORDERED_NODE_TYPE: 0, //Gecko,Number
+    BOOLEAN_TYPE: 0, //Gecko,Number
+    booleanValue: 0, //Gecko,Boolean
+    FIRST_ORDERED_NODE_TYPE: 0, //Gecko,Number
+    invalidIteratorState: 0, //Gecko,Boolean
+    iterateNext: function () {}, //Gecko,Node
+    NUMBER_TYPE: 0, //Gecko,Number
+    numberValue: 0, //Gecko,Number
+    ORDERED_NODE_ITERATOR_TYPE: 0, //Gecko,Number
+    ORDERED_NODE_SNAPSHOT_TYPE: 0, //Gecko,Number
+    resultType: 0, //Gecko,Number
+    singleNodeValue: 0, //Gecko,Node
+    snapshotItem: function (index) {}, //Gecko,Node
+    snapshotLength: 0, //Gecko,Number
+    STRING_TYPE: 0, //Gecko,Number
+    stringValue: 0, //Gecko,String
+    UNORDERED_NODE_ITERATOR_TYPE: 0, //Gecko,Number
+    UNORDERED_NODE_SNAPSHOT_TYPE: 0, //Gecko,Number
+};
 
-XPathNamespace.ownerElement = 0;//Gecko,Element
-XPathNamespace = {};
+var XPathNamespace = {
+    ownerElement: 0, //Gecko,Element
+};
 XPathNamespace.prototype = new Node();

From cc66b13d7c6a1b6e58c6623c465de0f44b818d4c Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 30 Dec 2024 17:48:45 +0300
Subject: [PATCH 250/340] Adding primitive type information in
 dist/sdk/clientAny.

---
 plugin/src/main/dist/sdk/clientAny/AJAX.js    |  12 +-
 plugin/src/main/dist/sdk/clientAny/DHTML.js   | 932 +++++++++---------
 plugin/src/main/dist/sdk/clientAny/DOMCore.js | 178 ++--
 .../src/main/dist/sdk/clientAny/DOMEvents.js  |  66 +-
 .../sdk/clientAny/DOMTraversalAndRange.js     |  22 +-
 .../src/main/dist/sdk/clientAny/DOMXPath.js   |  38 +-
 6 files changed, 624 insertions(+), 624 deletions(-)

diff --git a/plugin/src/main/dist/sdk/clientAny/AJAX.js b/plugin/src/main/dist/sdk/clientAny/AJAX.js
index 558b2cd0..5e44e337 100644
--- a/plugin/src/main/dist/sdk/clientAny/AJAX.js
+++ b/plugin/src/main/dist/sdk/clientAny/AJAX.js
@@ -3,18 +3,18 @@ window.XmlHttpRequest = function () {}; //XMLHttpRequest
 
 var XMLHttpRequest = {
     abort: function () {}, //Object
-    constructor: 0, //Object
+    constructor: {},
     getAllResponseHeaders: function () {}, //String
     getResponseHeader: function (headerName) {}, //String
-    readyState: 0, //Number
-    responseText: 0, //String
-    responseXML: 0, //String
+    readyState: 0,
+    responseText: "",
+    responseXML: "",
     onreadystatechange: function () {},
     open: function (method, url, async, username, password) {}, //Object
     overrideMimeType: function (mimeType) {}, //Gecko,Object
     send: function (content) {}, //void
     setRequestHeader: function (label, value) {}, //void
-    statusText: 0, //String
-    status: 0, //Number
+    statusText: "",
+    status: 0,
 };
 XMLHttpRequest.prototype = new Object();
diff --git a/plugin/src/main/dist/sdk/clientAny/DHTML.js b/plugin/src/main/dist/sdk/clientAny/DHTML.js
index 9a9e72de..c4dc70a2 100644
--- a/plugin/src/main/dist/sdk/clientAny/DHTML.js
+++ b/plugin/src/main/dist/sdk/clientAny/DHTML.js
@@ -6,60 +6,60 @@ __proto__ = function (propertyName) {}; //Gecko,Function
 
 var Image = function () {};
 Image.prototype = new HTMLImageElement();
-Image.constructor = 0; //Object
-Image.naturalWidth = 0; //Gecko,Object
-Image.naturalHeight = 0; //Gecko,Object
+Image.constructor = {};
+Image.naturalWidth = {}; //Gecko
+Image.naturalHeight = {}; //Gecko
 
 var Navigator = {
-    appCodeName: 0, //String
-    appName: 0, //String
-    appVersion: 0, //String
+    appCodeName: "",
+    appName: "",
+    appVersion: "",
     javaEnabled: function () {}, //Boolean
-    language: 0, //String
-    mimeTypes: 0, //Array
-    platform: 0, //Array
-    plugins: 0, //String
+    language: "",
+    mimeTypes: [],
+    platform: [],
+    plugins: "",
     preference: function (prefName, prefValue) {}, //String
-    product: 0, //String
-    systemLanguage: 0, //IE,String
+    product: "",
+    systemLanguage: "", //IE
     taintEnabled: function () {}, //Boolean
-    userAgent: 0, //String
-    userLanguage: 0, //IE,String
+    userAgent: "",
+    userLanguage: "", //IE
 };
 
 var Screen = {
-    availHeight: 0, //Number
-    availWidth: 0, //Number
-    colorDepth: 0, //Number
-    height: 0, //Number
-    pixelDepth: 0, //Number
-    width: 0, //Number
+    availHeight: 0,
+    availWidth: 0,
+    colorDepth: 0,
+    height: 0,
+    pixelDepth: 0,
+    width: 0,
 };
 
 var location = {
-    href: 0, //String
-    hash: 0, //String
-    host: 0, //String
-    hostname: 0, //String
-    pathname: 0, //String
-    port: 0, //String
-    protocol: 0, //String
-    reload() {}, //void
-    replace(url) {}, //void
-    search: 0, //String
-    target: 0, //String
+    href: "",
+    hash: "",
+    host: "",
+    hostname: "",
+    pathname: "",
+    port: "",
+    protocol: "",
+    reload: function () {}, //void
+    replace: function (url) {}, //void
+    search: "",
+    target: "",
 };
 
 var XSLTProcessor = function () {};
 XSLTProcessor.prototype = new Object();
-XSLTProcessor.constructor = 0; //Gecko,Object
+XSLTProcessor.constructor = {}; //Gecko
 XSLTProcessor.importStylesheet = function (domNode) {}; //Gecko,Object
 XSLTProcessor.transformToDocument = function (domNode) {}; //Gecko,Document
 XSLTProcessor.transformToFragment = function (domToBeTransformed, ownerDocument) {}; //Gecko,DocumentFragment
 
 var DOMParser = function () {};
 DOMParser.prototype = new Object();
-DOMParser.constructor = 0; //Gecko,Object
+DOMParser.constructor = {}; //Gecko
 DOMParser.parseFromString = function (stringToParse, contentType) {}; //Gecko,Document
 
 var XMLSerializer = function () {};
@@ -69,67 +69,67 @@ XMLSerializer.serializeToStream = function (domNode, stream, encoding) {}; //Gec
 XMLSerializer.serializeToString = function (domNode) {}; //Gecko,String
 
 var Event = {
-    altKey: 0, //Boolean
-    button: 0, //Boolean
-    cancelBubble: 0, //IE,Boolean
-    charCode: 0, //Gecko,String
-    clientX: 0, //Number
-    clientY: 0, //Number
-    ctrlKey: 0, //Boolean
-    data: 0, //Object[]
-    height: 0, //Number
-    fromElement: 0, //IE,Object
-    keyCode: 0, //Number
-    layerX: 0, //Gecko,Number
-    layerY: 0, //Gecko,Number
-    modifiers: 0, //Number
-    offsetX: 0, //IE,Number
-    offsetY: 0, //IE,Number
-    pageX: 0, //Number
-    pageY: 0, //Number
-    repeat: 0, //IE,Boolean
-    returnValue: 0, //IE,Boolean
-    screenX: 0, //Number
-    screenY: 0, //Number
-    shiftKey: 0, //Boolean
-    srcElement: 0, //IE,Object
-    toElement: 0, //IE,Object
-    type: 0, //String
-    wheelDelta: 0, //IE,Number
-    which: 0, //Object
-    width: 0, //Number
-    x: 0, //IE,Number
-    y: 0, //IE,Number
+    altKey: false,
+    button: false,
+    cancelBubble: false, //IE
+    charCode: "", //Gecko
+    clientX: 0,
+    clientY: 0,
+    ctrlKey: false,
+    data: {},
+    height: 0,
+    fromElement: {}, //IE
+    keyCode: 0,
+    layerX: 0, //Gecko
+    layerY: 0, //Gecko
+    modifiers: 0,
+    offsetX: 0, //IE
+    offsetY: 0, //IE
+    pageX: 0,
+    pageY: 0,
+    repeat: false, //IE
+    returnValue: false, //IE
+    screenX: 0,
+    screenY: 0,
+    shiftKey: false,
+    srcElement: {}, //IE
+    toElement: {}, //IE
+    type: "",
+    wheelDelta: 0, //IE
+    which: {},
+    width: 0,
+    x: 0, //IE
+    y: 0, //IE
     // deprecated
-    ABORT: 0, //Gecko,String,deprecated
-    BLUR: 0, //Gecko,String,deprecated
-    CLICK: 0, //Gecko,String,deprecated
-    CHANGE: 0, //Gecko,String,deprecated
-    DBLCLICK: 0, //Gecko,String,deprecated
-    DRAGDROP: 0, //Gecko,String,deprecated
-    ERROR: 0, //Gecko,String,deprecated
-    FOCUS: 0, //Gecko,String,deprecated
-    KEYDOWN: 0, //Gecko,String,deprecated
-    KEYPRESS: 0, //Gecko,String,deprecated
-    KEYUP: 0, //Gecko,String,deprecated
-    LOAD: 0, //Gecko,String,deprecated
-    MOUSEDOWN: 0, //Gecko,String,deprecated
-    MOUSEMOVE: 0, //Gecko,String,deprecated
-    MOUSEOUT: 0, //Gecko,String,deprecated
-    MOUSEOVER: 0, //Gecko,String,deprecated
-    MOUSEUP: 0, //Gecko,String,deprecated
-    MOVE: 0, //Gecko,String,deprecated
-    RESET: 0, //Gecko,String,deprecated
-    RESIZE: 0, //Gecko,String,deprecated
-    SELECT: 0, //Gecko,String,deprecated
-    SUBMIT: 0, //Gecko,String,deprecated
-    UNLOAD: 0, //Gecko,String,deprecated
+    ABORT: "", //Gecko,deprecated
+    BLUR: "", //Gecko,deprecated
+    CLICK: "", //Gecko,deprecated
+    CHANGE: "", //Gecko,deprecated
+    DBLCLICK: "", //Gecko,deprecated
+    DRAGDROP: "", //Gecko,deprecated
+    ERROR: "", //Gecko,deprecated
+    FOCUS: "", //Gecko,deprecated
+    KEYDOWN: "", //Gecko,deprecated
+    KEYPRESS: "", //Gecko,deprecated
+    KEYUP: "", //Gecko,deprecated
+    LOAD: "", //Gecko,deprecated
+    MOUSEDOWN: "", //Gecko,deprecated
+    MOUSEMOVE: "", //Gecko,deprecated
+    MOUSEOUT: "", //Gecko,deprecated
+    MOUSEOVER: "", //Gecko,deprecated
+    MOUSEUP: "", //Gecko,deprecated
+    MOVE: "", //Gecko,deprecated
+    RESET: "", //Gecko,deprecated
+    RESIZE: "", //Gecko,deprecated
+    SELECT: "", //Gecko,deprecated
+    SUBMIT: "", //Gecko,deprecated
+    UNLOAD: "", //Gecko,deprecated
 };
 
 var Selection = {
     addRange: function (range) {}, //Gecko,void
-    anchorNode: 0, //Gecko,Node
-    anchorOffset: 0, //Gecko,Number
+    anchorNode: {}, //Gecko,Node
+    anchorOffset: 0, //Gecko
     clear: function () {}, //IE,Boolean
     collapse: function (parentNode, offset) {}, //Gecko,void
     collapseToStart: function () {}, //Gecko,void
@@ -138,62 +138,62 @@ var Selection = {
     createRange: function () {}, //IE,TextRange
     empty: function () {}, //IE,Boolean
     extend: function (parentNode, offset) {}, //Gecko,void
-    focusNode: 0, //Gecko,Node
-    focusOffset: 0, //Gecko,Number
+    focusNode: {}, //Gecko,Node
+    focusOffset: 0, //Gecko
     getRangeAt: function (index) {}, //Gecko,Range
-    isCollapsed: 0, //Gecko,Boolean
-    rangeCount: 0, //Gecko,Number
+    isCollapsed: false, //Gecko
+    rangeCount: 0, //Gecko
     removeRange: function (range) {}, //Gecko,void
     removeAllRanges: function () {}, //Gecko,void
     selectAllChildren: function (parentNode) {}, //Gecko,void
-    type: 0, //IE,Object
+    type: {}, //IE
 };
 
 var TextRange = {
-    boundingHeight: 0, //IE,Number
-    boundingLeft: 0, //IE,Number
-    boundingTop: 0, //IE,Number
-    boundingWidth: 0, //IE,Number
+    boundingHeight: 0, //IE
+    boundingLeft: 0, //IE
+    boundingTop: 0, //IE
+    boundingWidth: 0, //IE
     collapse: function (start) {}, //IE,void
     compareEndPoint: function (type, range) {}, //IE,void
     compareEndPoints: function (sType, oRange) {}, //IE,Number
     duplicate: function () {}, //IE,TextRange
     expand: function (unit) {}, //IE,void
-    htmlText: 0, //IE,String
+    htmlText: "", //IE
     inRange: function (other) {}, //IE,boolean
     isEqual: function (other) {}, //IE,boolean
     move: function (unit, count) {}, //IE,void
     moveEnd: function (unit, count) {}, //IE,void
     moveStart: function (unit, count) {}, //IE,void
     moveToElementText: function (element) {}, //IE,void
-    offsetLeft: 0, //IE,Number
-    offsetTop: 0, //IE,Number
+    offsetLeft: 0, //IE
+    offsetTop: 0, //IE
     parentElement: function () {}, //IE,Node
     pasteHTML: function (htmlText) {}, //IE,void
     scrollIntoView: function (start) {}, //IE,void
     select: function () {}, //IE,void
     setEndPoint: function (type, range) {}, //IE,void
-    text: 0, //IE,String
+    text: "", //IE
 };
 
 var document = {
     all: 0, //IE,All
     execCommand: function (sCommand, bUserInterface, vValue) {}, //IE,Boolean
-    namespaces: 0, //IE,Array
-    selection: 0, //IE,Selection
-    styleSheets: 0 //Stylesheet[]
+    namespaces: [], //IE
+    selection: {}, //IE,Selection
+    styleSheets: [], //Stylesheet[]
 };
 
 var CssRule = {
-    selectorText: 0, //String
+    selectorText: "",
 };
 
 var Stylesheet = {
     addRule: function (selector, style) {}, //IE,void
-    cssRules: 0, //Gecko,CssRule[]
+    cssRules: [], //Gecko,CssRule[]
     deleteRule: function (index) {}, //Gecko,void
     insertRule: function (ruleText, index) {}, //Gecko,void
-    owningElement: 0, //IE,HtmlElement
+    owningElement: {}, //IE,HtmlElement
     removeRule: function (index) {}, //IE,void
     rules: 0, //IE,CssRule[]
 };
@@ -221,33 +221,33 @@ var window = {
     clearTimeout: function (intervalId) {}, //Object
     CollectGarbage: function () {}, //IE,Object
     confirm: function (sMesssage) {}, //Object
-    defaultStatus: 0, //String
+    defaultStatus: "",
     detachEvent: function (type, listener) {}, //IE,Object
-    directories: 0, //Object
-    document: 0, //HTMLDocument
-    external: 0, //IE,IEExternal
-    event: 0, //Event
+    directories: {},
+    document: {}, //HTMLDocument
+    external: {}, //IE,IEExternal
+    event: {}, //Event
     execScript: function (sScript) {}, //IE,Object
-    frameElement: 0, //Object
-    frames: 0, //Array
+    frameElement: {},
+    frames: [],
     getComputedStyle: function (element, pseudoElt) {}, //Gecko,style
     GetObject: function (classOrPath, clazz) {}, //IE,Object,deprecated
     getSelection: function () {}, //Gecko,Selection
-    history: 0, //history
-    innerHeight: 0, //Number
-    innerWidth: 0, //Number
-    location: 0, //Location
-    menubar: 0, //Object
+    history: {}, //history
+    innerHeight: 0,
+    innerWidth: 0,
+    location: {}, //Location
+    menubar: {},
     moveBy: function (xDelta, yDelta) {}, //Object
     moveTo: function (x, y) {}, //Object
-    navigator: 0, //Navigator
-    opener: 0, //window
-    opera: 0, //Opera,Boolean
-    outerHeight: 0, //Number
-    outerWidth: 0, //Number
-    pageXOffset: 0, //Number
-    pageYOffset: 0, //Number
-    parent: 0, //window
+    navigator: {}, //Navigator
+    opener: {}, //window
+    opera: false, //Opera
+    outerHeight: 0,
+    outerWidth: 0,
+    pageXOffset: 0,
+    pageYOffset: 0,
+    parent: {}, //window
     preventBubble: function (event) {}, //Gecko,void,deprecated
     print: function () {}, //void
     prompt: function (sMessage, sDefaultValue) {}, //Object
@@ -256,27 +256,27 @@ var window = {
     resizeBy: function (widthDelta, heightDelta) {}, //Object
     resizeTo: function (width, height) {}, //Object
     routeEvent: function (event) {}, //Gecko,void,deprecated
-    screen: 0, //Screen
-    screenLeft: 0, //IE,Number
-    screenTop: 0, //IE,Number
+    screen: {}, //Screen
+    screenLeft: 0, //IE
+    screenTop: 0, //IE
     ScriptEngine: function () {}, //IE,String
     ScriptEngineBuildVersion: function () {}, //IE,String
     ScriptEngineMajorVersion: function () {}, //IE,String
     ScriptEngineMinorVersion: function () {}, //IE,String
-    scrollbars: 0, //Object
+    scrollbars: {},
     scrollBy: function (xDelta, yDelta) {}, //Object
-    scrollMaxX: 0, //Number
-    scrollMaxY: 0, //Number
+    scrollMaxX: 0,
+    scrollMaxY: 0,
     scrollTo: function (x, y) {}, //Object
-    scrollX: 0, //Number
-    scrollY: 0, //Number
-    self: 0, //Object
+    scrollX: 0,
+    scrollY: 0,
+    self: {},
     setInterval: function (vCode, iMillis) {}, //Number
     setTimeout: function (vCode, iMillis) {}, //Number
     showModalDialog: function (sUrl, vArguments, sFeatures) {}, //IE,style
-    sidebar: 0, //Gecko,MozillaSideBar
-    status: 0, //String
-    toolbar: 0, //Object
+    sidebar: {}, //Gecko,MozillaSideBar
+    status: "",
+    toolbar: {},
     top: 0, //window
     window: 0, //window
 };
@@ -285,53 +285,53 @@ var escape = function () {}; //Object,deprecated
 var unescape = function () {}; //Object,deprecated
 
 var HTMLCollection = {
-    length: 0, //Number
+    length: 0,
     item: function (index) {}, //Node
     namedItem: function (name) {}, //Node
 };
 
 var HTMLOptionsCollection = {
     item: function (index) {}, //Node
-    length: 0, //Number
+    length: 0,
     namedItem: function (name) {}, //Node
 };
 
 var HTMLDocument = {
-    activeElement: 0, //IE,DocumentView
-    anchors: 0, //HTMLCollection
-    applets: 0, //HTMLCollection
-    body: 0, //HTMLElement
+    activeElement: {}, //IE,DocumentView
+    anchors: {}, //HTMLCollection
+    applets: {}, //HTMLCollection
+    body: {}, //HTMLElement
     close: function () {}, //Object
-    commandDispatcher: 0, //Gecko,CommandDispatcher
-    compatMode: 0, //String
-    cookie: 0, //HTMLCollection
+    commandDispatcher: {}, //Gecko,CommandDispatcher
+    compatMode: "",
+    cookie: {}, //HTMLCollection
     createEventObject: function (oExistingEvent) {}, //IE,Even
     createStyleSheet: function () {}, //IE,Stylesheet
-    defaultView: 0, //Gecko,DocumentView
-    domain: 0, //String
+    defaultView: {}, //Gecko,DocumentView
+    domain: "",
     elementFromPoint: function (iX, iY) {}, //IE,HTMLElement
-    forms: 0, //HTMLCollection
+    forms: {}, //HTMLCollection
     getAnonymousElementByAttribute: function (node, attrName, attrValue) {}, //Gecko,NodeList
     getAnonymousNodes: function (node) {}, //Gecko,Node[]
     getBoxObjectFor: function (element) {}, //Gecko,Node
     getElementsByName: function (elementName) {}, //NodeList
     getElementsByClassName: function (className) {}, //Gecko,NodeList
-    images: 0, //HTMLCollection
-    links: 0, //HTMLCollection
+    images: {}, //HTMLCollection
+    links: {}, //HTMLCollection
     open: function () {}, //Object
-    parentWindow: 0, //IE,window
+    parentWindow: {}, //IE,window
     querySelector: function (string) {}, //Gecko,Node
     querySelectorAll: function (string) {}, //Gecko,NodeList
-    referrer: 0, //String
-    title: 0, //String
-    URL: 0, //String
-    write: function (text) {}, //Object
-    writeln: function (text) {}, //Object
+    referrer: "",
+    title: "",
+    URL: "",
+    write: function (text) {},
+    writeln: function (text) {},
 };
 HTMLDocument.prototype = new Document();
 
 var CommandDispatcher = {
-    focusedElement: 0, //Gecko,HTMLElement
+    focusedElement: {}, //Gecko,HTMLElement
 };
 
 var DocumentView = {
@@ -345,34 +345,34 @@ var CssStyle = {
 var HTMLElement = {
     addBehavior: function (sUrl) {}, //IE,Number
     attachEvent: function (type, listener) {}, //IE,Object
-    boxObject: 0, //Gecko,HTMLElement
-    children: 0, //IE,HTMLElement[]
-    className: 0, //String
+    boxObject: {}, //Gecko,HTMLElement
+    children: [], //IE,HTMLElement[]
+    className: "",
     clearAttributes: function () {}, //IE,Object
-    clientHeight: 0, //Number
-    clientLeft: 0, //Number
-    clientTop: 0, //Number
-    clientWidth: 0, //Number
-    currentStyle: 0, //IE,IEElementStyle
+    clientHeight: 0,
+    clientLeft: 0,
+    clientTop: 0,
+    clientWidth: 0,
+    currentStyle: {}, //IE,IEElementStyle
     detachEvent: function (type, listener) {}, //IE,Object
-    dir: 0, //String
-    filters: 0, //IE,Array
+    dir: "",
+    filters: [], //IE
     fireEvent: function (type, event) {}, //IE,Object
     getBoundingClientRect: function () {}, //IE,TextRange
     hidePopup: function () {}, //Gecko,Object
-    id: 0, //String
-    innerHTML: 0, //String
-    innerText: 0, //IE,String
+    id: "",
+    innerHTML: "",
+    innerText: "", //IE
     insertAdjacentHTML: function (position, htmlContent) {}, //IE,Object
     insertAdjacentText: function (position, textContent) {}, //IE,Object
-    isDisabled: 0, //IE,Boolean
-    lang: 0, //String
+    isDisabled: false, //IE
+    lang: "",
     mergeAttributes: function (oSource, bPreserve) {}, //IE,Object
-    offsetHeight: 0, //Number
-    offsetLeft: 0, //Number
-    offsetParent: 0, //Number
-    offsetTop: 0, //Number
-    offsetWidth: 0, //Number
+    offsetHeight: 0,
+    offsetLeft: 0,
+    offsetParent: 0,
+    offsetTop: 0,
+    offsetWidth: 0,
     onblur: function () {},
     onclick: function () {},
     ondblclick: function () {},
@@ -385,464 +385,464 @@ var HTMLElement = {
     onmouseover: function () {},
     onmousemove: function () {},
     onresize: function () {},
-    propertyName: 0, //IE,String
+    propertyName: "", //IE
     releaseCapture: function () {}, //IE,Object
     removeBehavior: function (sID) {}, //IE,Boolean
-    runtimeStyle: 0, //IE,IEElementStyle
+    runtimeStyle: {}, //IE,IEElementStyle
     setCapture: function (bContainerCapture) {}, //IE,Object
-    scrollWidth: 0, //Number
-    scrollHeight: 0, //Number
-    scrollTop: 0, //Number
-    scrollLeft: 0, //Number
+    scrollWidth: 0,
+    scrollHeight: 0,
+    scrollTop: 0,
+    scrollLeft: 0,
     showPopup: function () {}, //Gecko,Object
     style: 0, //style
     stylesheet: 0, //Stylesheet
-    title: 0, //String
+    title: "",
 };
 HTMLElement.prototype = new Element();
 
 var HTMLAnchorElement = {
-    accessKey: 0, //String
-    charset: 0, //String
-    coords: 0, //String
+    accessKey: "",
+    charset: "",
+    coords: "",
     blur: function () {}, //Object
     focus: function () {}, //Object
-    href: 0, //String
-    hreflang: 0, //String
-    name: 0, //String
-    rel: 0, //String
-    rev: 0, //String
-    shape: 0, //String
-    tabIndex: 0, //Number
-    target: 0, //String
-    type: 0, //String
+    href: "",
+    hreflang: "",
+    name: "",
+    rel: "",
+    rev: "",
+    shape: "",
+    tabIndex: 0,
+    target: "",
+    type: "",
 };
 HTMLAnchorElement.prototype = new HTMLElement();
 
 var HTMLAppletElement = {
-    align: 0, //String
-    alt: 0, //String
-    archive: 0, //String
-    code: 0, //String
-    codeBase: 0, //String
-    height: 0, //String
-    hspace: 0, //Number
-    name: 0, //String
-    object: 0, //String
-    vspace: 0, //Number
-    width: 0, //String
+    align: "",
+    alt: "",
+    archive: "",
+    code: "",
+    codeBase: "",
+    height: "",
+    hspace: 0,
+    name: "",
+    object: "",
+    vspace: 0,
+    width: "",
 };
 HTMLAppletElement.prototype = new HTMLElement();
 
 var HTMLAreaElement = {
-    accessKey: 0, //String
-    alt: 0, //String
-    coords: 0, //String
-    href: 0, //String
-    noHref: 0, //Boolean
-    shape: 0, //String
-    tabIndex: 0, //Number
-    target: 0, //String
+    accessKey: "",
+    alt: "",
+    coords: "",
+    href: "",
+    noHref: false,
+    shape: "",
+    tabIndex: 0,
+    target: "",
 };
 HTMLAreaElement.prototype = new HTMLElement();
 
 var HTMLBaseElement = {
-    href: 0, //String
-    target: 0, //String
+    href: "",
+    target: "",
 };
 HTMLBaseElement.prototype = new HTMLElement();
 
 var HTMLBaseFontElement = {
-    color: 0, //String
-    face: 0, //String
-    size: 0, //Number
+    color: "",
+    face: "",
+    size: 0,
 };
 HTMLBaseFontElement.prototype = new HTMLElement();
 
 var HTMLBodyElement = {
-    aLink: 0, //String
-    background: 0, //String
-    bgColor: 0, //String
-    link: 0, //String
+    aLink: "",
+    background: "",
+    bgColor: "",
+    link: "",
     onload: function () {},
     onunload: function () {},
-    text: 0, //String
-    vLink: 0 //String
+    text: "",
+    vLink: "",
 };
 HTMLBodyElement.prototype = new HTMLElement();
 
 var HTMLBRElement = {
-    clear: 0 //String
+    clear: "",
 };
 HTMLBRElement.prototype = new HTMLElement();
 
 var HTMLButtonElement = {
-    accessKey: 0, //String
-    disabled: 0, //Boolean
-    form: 0, //HTMLFormElement
-    name: 0, //String
-    tabIndex: 0, //Number
-    type: 0, //String
-    value: 0, //String
+    accessKey: "",
+    disabled: false,
+    form: {}, //HTMLFormElement
+    name: "",
+    tabIndex: 0,
+    type: "",
+    value: "",
 };
 HTMLButtonElement.prototype = new HTMLElement();
 
 var HTMLDirectoryElement = {
-    compact: 0, //Boolean
+    compact: false,
 };
 HTMLDirectoryElement.prototype = new HTMLElement();
 
 var HTMLDivElement = {
-    align: 0, //String
+    align: "",
 };
 HTMLDivElement.prototype = new HTMLElement();
 
 var HTMLDListElement = {
-    compact: 0, //Boolean
+    compact: false,
 };
 HTMLDListElement.prototype = new HTMLElement();
 
 var HTMLFieldSetElement = {
-    form: 0, //HTMLFormElement
+    form: {}, //HTMLFormElement
 };
 HTMLFieldSetElement.prototype = new HTMLElement();
 
 var HTMLFontElement = {
-    color: 0, //String
-    face: 0, //String
-    size: 0, //String
+    color: "",
+    face: "",
+    size: "",
 };
 HTMLFontElement.prototype = new HTMLElement();
 
 var HTMLFormElement = {
-    acceptCharset: 0, //String
-    action: 0, //String
-    elements: 0, //HTMLCollection
-    enctype: 0, //String
-    length: 0, //Number
-    method: 0, //String
-    name: 0, //String
+    acceptCharset: "",
+    action: "",
+    elements: {}, //HTMLCollection
+    enctype: "",
+    length: 0,
+    method: "",
+    name: "",
     reset: function () {}, //Object
     submit: function () {}, //Object
-    target: 0, //String
+    target: "",
 };
 
 var HTMLFrameElement = {
-    contentDocument: 0, //Gecko,Document
-    frameBorder: 0, //String
-    longDesc: 0, //String
-    marginHeight: 0, //String
-    marginWidth: 0, //String
-    name: 0, //String
-    noResize: 0, //Boolean
-    scrolling: 0, //String
-    src: 0, //String
+    contentDocument: {}, //Gecko,Document
+    frameBorder: "",
+    longDesc: "",
+    marginHeight: "",
+    marginWidth: "",
+    name: "",
+    noResize: false,
+    scrolling: "",
+    src: "",
 };
 HTMLFrameElement.prototype = new HTMLElement();
 
 var HTMLFrameSetElement = {
-    cols: 0, //String
-    rows: 0, //String
+    cols: "",
+    rows: "",
 };
 HTMLFrameSetElement.prototype = new HTMLElement();
 
 var HTMLHeadElement = {
-    profile: 0, //String
+    profile: "",
 };
 HTMLHeadElement.prototype = new HTMLElement();
 
 var HTMLHeadingElement = {
-    align: 0, //String
+    align: "",
 };
 HTMLHeadingElement.prototype = new HTMLElement();
 
 var HTMLHtmlElement = {
-    version: 0, //String
+    version: "",
 };
 HTMLHtmlElement.prototype = new HTMLElement();
 
 var HTMLInputElement = {
-    accept: 0, //String
-    accessKey: 0, //String
-    align: 0, //String
-    alt: 0, //String
+    accept: "",
+    accessKey: "",
+    align: "",
+    alt: "",
     blur: function () {}, //Object
-    checked: 0, //Boolean
+    checked: false,
     click: function () {}, //Object
     createTextRange: function () {}, //IE,TextRange
-    defaultChecked: 0, //Boolean
-    defaultValue: 0, //String
-    disabled: 0, //Boolean
+    defaultChecked: false,
+    defaultValue: "",
+    disabled: false,
     focus: function () {}, //Object
-    form: 0, //HTMLFormElement
-    maxLength: 0, //Number
-    name: 0, //String
-    readOnly: 0, //Boolean
+    form: {}, //HTMLFormElement
+    maxLength: 0,
+    name: "",
+    readOnly: false,
     select: function () {}, //Object
     setSelectionRange: function (start, end) {}, //Gecko,Object
-    size: 0, //Number
-    src: 0, //String
-    tabIndex: 0, //Number
-    type: 0, //String
-    useMap: 0, //String
-    value: 0, //String
+    size: 0,
+    src: "",
+    tabIndex: 0,
+    type: "",
+    useMap: "",
+    value: "",
 };
 HTMLInputElement.prototype = new HTMLElement();
 
 var HTMLIsIndexElement = {
-    form: 0, //HTMLFormElement
-    prompt: 0, //String
+    form: {}, //HTMLFormElement
+    prompt: "",
 };
 HTMLIsIndexElement.prototype = new HTMLElement();
 
 var HTMLHRElement = {
-    align: 0, //String
-    noShade: 0, //Boolean
-    size: 0, //String
-    width: 0, //String
+    align: "",
+    noShade: false,
+    size: "",
+    width: "",
 };
 HTMLHRElement.prototype = new HTMLElement();
 
 var HTMLIFrameElement = {
-    align: 0, //String
-    contentDocument: 0, //Document
-    contentWindow: 0, //window
-    frameBorder: 0, //String
-    height: 0, //String
-    longDesc: 0, //String
-    marginHeight: 0, //String
-    marginWidth: 0, //String
-    name: 0, //String
-    scrolling: 0, //String
-    src: 0, //String
-    width: 0, //String
+    align: "",
+    contentDocument: {}, //Document
+    contentWindow: {}, //window
+    frameBorder: "",
+    height: "",
+    longDesc: "",
+    marginHeight: "",
+    marginWidth: "",
+    name: "",
+    scrolling: "",
+    src: "",
+    width: "",
 };
 HTMLIFrameElement.prototype = new HTMLElement();
 
 var HTMLImageElement = {
-    align: 0, //String
-    alt: 0, //String
-    border: 0, //String
-    height: 0, //Number
-    hspace: 0, //Number
-    isMap: 0, //Boolean
-    longDesc: 0, //String
-    name: 0, //String
-    src: 0, //String
-    useMap: 0, //String
-    vspace: 0, //Number
-    width: 0, //Number
+    align: "",
+    alt: "",
+    border: "",
+    height: 0,
+    hspace: 0,
+    isMap: false,
+    longDesc: "",
+    name: "",
+    src: "",
+    useMap: "",
+    vspace: 0,
+    width: 0,
 };
 HTMLImageElement.prototype = new HTMLElement();
 
 var HTMLLabelElement = {
-    accessKey: 0, //String
-    form: 0, //HTMLFormElement
-    htmlFor: 0, //
+    accessKey: "",
+    form: {}, //HTMLFormElement
+    htmlFor: 0,
 };
 HTMLLabelElement.prototype = new HTMLElement();
 
 var HTMLLegendElement = {
-    accessKey: 0, //String
-    align: 0, //String
-    form: 0, //HTMLFormElement
+    accessKey: "",
+    align: "",
+    form: {}, //HTMLFormElement
 };
 HTMLLegendElement.prototype = new HTMLElement();
 
 var HTMLLIElement = {
-    type: 0, //String
-    value: 0, //Number
+    type: "",
+    value: 0,
 };
 HTMLLIElement.prototype = new HTMLElement();
 
 var HTMLLinkElement = {
-    charset: 0, //String
-    disabled: 0, //Boolean
-    href: 0, //String
-    hreflang: 0, //String
-    media: 0, //String
-    rel: 0, //String
-    rev: 0, //String
-    target: 0, //String
-    type: 0, //String
+    charset: "",
+    disabled: false,
+    href: "",
+    hreflang: "",
+    media: "",
+    rel: "",
+    rev: "",
+    target: "",
+    type: "",
 };
 HTMLLinkElement.prototype = new HTMLElement();
 
 var HTMLMapElement = {
-    areas: 0, //HTMLCollection
-    name: 0, //String
+    areas: {}, //HTMLCollection
+    name: "",
 };
 HTMLMapElement.prototype = new HTMLElement();
 
 var HTMLMenuElement = {
-    compact: 0, //Boolean
+    compact: false,
 };
 HTMLMenuElement.prototype = new HTMLElement();
 
 var HTMLMetaElement = {
-    content: 0, //String
-    httpEquiv: 0, //String
-    name: 0, //String
-    scheme: 0, //String
+    content: "",
+    httpEquiv: "",
+    name: "",
+    scheme: "",
 };
 HTMLMetaElement.prototype = new HTMLElement();
 
 var HTMLModElement = {
-    cite: 0, //String
-    dateTime: 0, //String
+    cite: "",
+    dateTime: "",
 };
 HTMLModElement.prototype = new HTMLElement();
 
 var HTMLObjectElement = {
-    align: 0, //String
-    archive: 0, //String
-    border: 0, //String
-    code: 0, //String
-    codeBase: 0, //String
-    codeType: 0, //String
-    contentDocument: 0, //Document
-    data: 0, //String
-    declare: 0, //Boolean
-    form: 0, //HTMLFormElement
-    height: 0, //String
-    hspace: 0, //Number
-    name: 0, //String
-    standby: 0, //String
-    tabIndex: 0, //Number
-    type: 0, //String
-    useMap: 0, //String
-    vspace: 0, //Number
-    width: 0, //String
+    align: "",
+    archive: "",
+    border: "",
+    code: "",
+    codeBase: "",
+    codeType: "",
+    contentDocument: {}, //Document
+    data: "",
+    declare: false,
+    form: {}, //HTMLFormElement
+    height: "",
+    hspace: 0,
+    name: "",
+    standby: "",
+    tabIndex: 0,
+    type: "",
+    useMap: "",
+    vspace: 0,
+    width: "",
 };
 HTMLObjectElement.prototype = new HTMLElement();
 
 var HTMLOListElement = {
-    compact: 0, //Boolean
-    start: 0, //Number
-    type: 0, //String
+    compact: false,
+    start: 0,
+    type: "",
 };
 HTMLOListElement.prototype = new HTMLElement();
 
 var HTMLOptGroupElement = {
-    disabled: 0, //Boolean
-    label: 0, //String
+    disabled: false,
+    label: "",
 };
 HTMLOptGroupElement.prototype = new HTMLElement();
 
 var HTMLOptionElement = {
-    defaultSelected: 0, //Boolean
-    disabled: 0, //Boolean
-    text: 0, //String
-    form: 0, //HTMLFormElement
-    index: 0, //Number
-    label: 0, //String
-    selected: 0, //Boolean
-    value: 0, //String
+    defaultSelected: false,
+    disabled: false,
+    text: "",
+    form: {}, //HTMLFormElement
+    index: 0,
+    label: "",
+    selected: false,
+    value: "",
 };
 HTMLOptionElement.prototype = new HTMLElement();
 
 var HTMLParagraphElement = {
-    align: 0, //String
+    align: "",
 };
 HTMLParagraphElement.prototype = new HTMLElement();
 
 var HTMLParamElement = {
-    name: 0, //String
-    type: 0, //String
-    value: 0, //String
-    valueType: 0, //String
+    name: "",
+    type: "",
+    value: "",
+    valueType: "",
 };
 HTMLParamElement.prototype = new HTMLElement();
 
 var HTMLPreElement = {
-    width: 0, //Number
+    width: 0,
 };
 HTMLPreElement.prototype = new HTMLElement();
 
 var HTMLQuoteElement = {
-    cite: 0, //String
+    cite: "",
 };
 HTMLQuoteElement.prototype = new HTMLElement();
 
 var HTMLScriptElement = {
-    charset: 0, //String
-    defer: 0, //Boolean
-    event: 0, //String
-    htmlFor: 0, //String
-    src: 0, //String
-    text: 0, //String
-    type: 0, //String
+    charset: "",
+    defer: false,
+    event: "",
+    htmlFor: "",
+    src: "",
+    text: "",
+    type: "",
 };
 HTMLScriptElement.prototype = new HTMLElement();
 
 var HTMLSelectElement = {
     add: function (element, before) {}, //Object
     blur: function () {}, //Object
-    disabled: 0, //Boolean
+    disabled: false,
     focus: function () {}, //Object
-    form: 0, //HTMLFormElement
-    length: 0, //Number
-    multiple: 0, //Boolean
-    name: 0, //String
-    options: 0, //HTMLOptionsCollection
+    form: {}, //HTMLFormElement
+    length: 0,
+    multiple: false,
+    name: "",
+    options: {}, //HTMLOptionsCollection
     remove: function (index) {}, //Object
-    selectedIndex: 0, //Number
-    size: 0, //Number
-    tabIndex: 0, //Number
-    type: 0, //String
-    value: 0, //String
+    selectedIndex: 0,
+    size: 0,
+    tabIndex: 0,
+    type: "",
+    value: "",
 };
 HTMLSelectElement.prototype = new HTMLElement();
 
 var HTMLStyleElement = {
-    disabled: 0, //Boolean
-    media: 0, //String
-    type: 0, //String
-    styleSheet: 0, //IE,Stylesheet
+    disabled: false,
+    media: "",
+    type: "",
+    styleSheet: {}, //IE,Stylesheet
 };
 HTMLStyleElement.prototype = new HTMLElement();
 
 var HTMLTableCaptionElement = {
-    align: 0, //String
+    align: "",
 };
 HTMLTableCaptionElement.prototype = new HTMLElement();
 
 var HTMLTableColElement = {
-    align: 0, //String
-    ch: 0, //String
-    chOff: 0, //String
-    span: 0, //Number
-    vAlign: 0, //String
-    width: 0, //String
+    align: "",
+    ch: "",
+    chOff: "",
+    span: 0,
+    vAlign: "",
+    width: "",
 };
 HTMLTableColElement.prototype = new HTMLElement();
 
 var HTMLTableCellElement = {
-    abbr: 0, //String
-    align: 0, //String
-    axis: 0, //String
-    bgColor: 0, //String
-    cellIndex: 0, //Number
-    ch: 0, //String
-    chOff: 0, //String
-    colSpan: 0, //Number
-    headers: 0, //String
-    height: 0, //String
-    noWrap: 0, //Boolean
-    rowSpan: 0, //Number
-    scope: 0, //String
-    vAlign: 0, //String
-    width: 0, //String
+    abbr: "",
+    align: "",
+    axis: "",
+    bgColor: "",
+    cellIndex: 0,
+    ch: "",
+    chOff: "",
+    colSpan: 0,
+    headers: "",
+    height: "",
+    noWrap: false,
+    rowSpan: 0,
+    scope: "",
+    vAlign: "",
+    width: "",
 };
 HTMLTableCellElement.prototype = new HTMLElement();
 
 var HTMLTableElement = {
-    align: 0, //String
-    bgColor: 0, //String
-    border: 0, //String
-    caption: 0, //HTMLTableCaptionElement
-    cellPadding: 0, //String
-    cellSpacing: 0, //String
+    align: "",
+    bgColor: "",
+    border: "",
+    caption: {}, //HTMLTableCaptionElement
+    cellPadding: "",
+    cellSpacing: "",
     createCaption: function () {}, //HTMLElement
     createTFoot: function () {}, //HTMLElement
     createTHead: function () {}, //HTMLElement
@@ -850,73 +850,73 @@ var HTMLTableElement = {
     deleteRow: function (index) {}, //Object
     deleteTHead: function () {}, //Object
     deleteTFoot: function () {}, //Object
-    frame: 0, //String
+    frame: "",
     insertRow: function (index) {}, //HTMLElement
-    rows: 0, //HTMLCollection
-    rules: 0, //String
-    summary: 0, //String
-    tBodies: 0, //HTMLCollection
-    tHead: 0, //HTMLTableSectionElement
-    tFoot: 0, //HTMLTableSectionElement
-    width: 0, //String
+    rows: {}, //HTMLCollection
+    rules: "",
+    summary: "",
+    tBodies: {}, //HTMLCollection
+    tHead: {}, //HTMLTableSectionElement
+    tFoot: {}, //HTMLTableSectionElement
+    width: "",
 };
 HTMLTableElement.prototype = new HTMLElement();
 
 var HTMLTableRowElement = {
-    align: 0, //String
-    bgColor: 0, //String
-    cells: 0, //HTMLCollection
-    ch: 0, //String
-    chOff: 0, //String
+    align: "",
+    bgColor: "",
+    cells: {}, //HTMLCollection
+    ch: "",
+    chOff: "",
     deleteCell: function (index) {}, //Object
     insertCell: function (index) {}, //HTMLElement
-    rowIndex: 0, //Number
-    sectionRowIndex: 0, //Number
-    vAlign: 0, //String
+    rowIndex: 0,
+    sectionRowIndex: 0,
+    vAlign: "",
 };
 HTMLTableRowElement.prototype = new HTMLElement();
 
 var HTMLTableSectionElement = {
-    align: 0, //String
-    ch: 0, //String
-    chOff: 0, //String
+    align: "",
+    ch: "",
+    chOff: "",
     deleteRow: function (index) {}, //Object
     insertRow: function (index) {}, //HTMLElement
-    rows: 0, //HTMLCollection
-    vAlign: 0, //String
+    rows: {}, //HTMLCollection
+    vAlign: "",
 };
 HTMLTableSectionElement.prototype = new HTMLElement();
 
 var HTMLTextAreaElement = {
-    accessKey: 0, //String
+    accessKey: "",
     blur: function () {}, //Object
-    cols: 0, //Number
-    defaultValue: 0, //String
-    disabled: 0, //Boolean
+    cols: 0,
+    defaultValue: "",
+    disabled: false,
     focus: function () {}, //Object
-    form: 0, //HTMLFormElement
-    name: 0, //String
-    readOnly: 0, //Boolean
-    rows: 0, //Number
+    form: {}, //HTMLFormElement
+    name: "",
+    readOnly: false,
+    rows: 0,
     select: function () {}, //Object
-    tabIndex: 0, //Number
-    type: 0, //String
-    value: 0, //String
+    tabIndex: 0,
+    type: "",
+    value: "",
 };
 HTMLTextAreaElement.prototype = new HTMLElement();
 
 var HTMLTitleElement = {
-    text: 0, //String
+    text: "",
 };
 HTMLTitleElement.prototype = new HTMLElement();
 
 var HTMLUListElement = {
-    compact: 0, //Boolean
-    type: 0, //String
+    compact: false,
+    type: "",
 };
 HTMLUListElement.prototype = new HTMLElement();
 
 var IEElementStyle = {
-    hasLayout: 0, //IE,Boolean
+    hasLayout: false, //IE
 };
 IEElementStyle.prototype = new style();
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMCore.js b/plugin/src/main/dist/sdk/clientAny/DOMCore.js
index 01569250..d9ca3d82 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMCore.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMCore.js
@@ -4,13 +4,13 @@ var DOMImplementationRegistry = {
 };
 
 var DOMException = {
-    code: 0, //Number
+    code: 0,
 };
 
 var DOMStringList = {
     contains: function (str) {}, //Boolean
     item: function (index) {}, //String
-    length: 0, //Number
+    length: 0,
 };
 
 var NameList = {
@@ -18,12 +18,12 @@ var NameList = {
     containsNS: function (namespaceURI,name) {}, //Boolean
     getName: function (index) {}, //String
     getNamespaceURI: function (index) {}, //String
-    length: 0, //Number
+    length: 0,
 };
 
 var DOMImplementationList = {
     item: function (index) {}, //DOMImplementation
-    length: 0, //Number
+    length: 0,
 };
 
 var DOMImplementationSource = {
@@ -53,17 +53,17 @@ var Document = {
     createProcessingInstruction: function (target,data) {}, //ProcessingInstruction
     createTextNode: function (data) {}, //Text
     createEntityReference: function (name) {}, //EntityReference
-    doctype: 0, //DocumentType
-    documentElement: 0, //Element
-    documentURI: 0, //String
-    domConfig: 0, //DOMConfiguration
+    doctype: {}, //DocumentType
+    documentElement: {}, //Element
+    documentURI: "",
+    domConfig: {}, //DOMConfiguration
     getElementById: function (elementId) {}, //Element
     getElementsByTagName: function (tagname) {}, //NodeList
     getElementsByTagNameNS: function (namespaceURI,localName) {}, //NodeList
-    implementation: 0, //DOMImplementation
+    implementation: {}, //DOMImplementation
     importNode: function (importedNode,deep) {}, //Node
-    inputEncoding: 0, //String
-    parseError: 0, //IE,IXMLDOMParseError
+    inputEncoding: "",
+    parseError: {}, //IE,IXMLDOMParseError
     load: function (filename) {}, //IE,Object
     loadXML: function (xmlString) {}, //IE,Object
     normalizeDocument: function () {}, //Object
@@ -72,62 +72,62 @@ var Document = {
     setProperty: function (name,value) {}, //IE,Object
     selectSingleNode: function (xpathExpression) {}, //IE,Object
     selectNodes: function (xpathExpression) {}, //IE,Object
-    strictErrorChecking: 0, //Boolean
-    xmlEncoding: 0, //String
-    xmlStandalone: 0, //Boolean
-    xmlVersion: 0, //String
+    strictErrorChecking: false,
+    xmlEncoding: "",
+    xmlStandalone: false,
+    xmlVersion: "",
 };
 Document.prototype = new Node();
 
 var IXMLDOMParseError = {
-    errorCode: 0, //IE,Number
-    reason: 0, //IE,String
+    errorCode: 0, //IE
+    reason: "", //IE
 };
 
 var Node = {
-    nodeName: 0, //String
-    nodeValue: 0, //String
-    nodeType: 0, //Number
-    parentNode: 0, //Node
-    childNodes: 0, //NodeList
-    firstChild: 0, //Node
-    lastChild: 0, //Node
-    previousSibling: 0, //Node
-    nextSibling: 0, //Node
-    attributes: 0, //NamedNodeMap
-    ownerDocument: 0, //Document
-    namespaceURI: 0, //String
-    prefix: 0, //String
-    localName: 0, //String
-    baseURI: 0, //String
-    textContent: 0, //String
-    insertBefore: function (newChild,refChild) {}, //Node
-    replaceChild: function (newChild,refChild) {}, //Node
-    removeChild: function (oldChild) {}, //Node
     appendChild: function (newChild) {}, //Node
-    hasChildNodes: function () {}, //Boolean
+    attributes: {}, //NamedNodeMap
+    baseURI: "",
+    childNodes: {}, //NodeList
     cloneNode: function (deep) {}, //Node
-    normalize: function () {}, //Object
-    isSupported: function (feature,version) {}, //Boolean
-    hasAttributes: function () {}, //Boolean
     compareDocumentPosition: function (other) {}, //Node
-    isSameNode: function (other) {}, //Boolean
-    lookupPrefix: function (namespaceURI) {}, //String
+    firstChild: {}, //Node
+    getFeature: function (feature,version) {}, //Object
+    getUserData: function (key) {}, //Object
+    hasAttributes: function () {}, //Boolean
+    hasChildNodes: function () {}, //Boolean
     isDefaultNamespace: function (namespaceURI) {}, //String
-    lookupNamespaceURI: function (prefix) {}, //String
     isEqualNode: function (arg) {}, //Boolean
-    getFeature: function (feature,version) {}, //Object
+    isSameNode: function (other) {}, //Boolean
+    isSupported: function (feature,version) {}, //Boolean
+    lookupNamespaceURI: function (prefix) {}, //String
+    lookupPrefix: function (namespaceURI) {}, //String
+    insertBefore: function (newChild,refChild) {}, //Node
+    lastChild: {}, //Node
+    localName: "",
+    nodeName: "",
+    nodeValue: "",
+    nodeType: 0,
+    namespaceURI: "",
+    nextSibling: {}, //Node
+    normalize: function () {}, //Object
+    ownerDocument: {}, //Document
+    parentNode: {}, //Node
+    prefix: "",
+    previousSibling: {}, //Node
+    replaceChild: function (newChild,refChild) {}, //Node
+    removeChild: function (oldChild) {}, //Node
     setUserData: function (key,data,handler) {}, //Object
-    getUserData: function (key) {}, //Object
+    textContent: "",
 };
 
 var NodeList = {
-    length: 0, //Number
+    length: 0,
     item: function (index) {}, //Node
 };
 
 var NamedNodeMap = {
-    length: 0, //Number
+    length: 0,
     getNamedItem: function (name) {}, //Node
     setNamedItem: function (arg) {}, //Node
     removeNamedItem: function (name) {}, //Node
@@ -138,8 +138,8 @@ var NamedNodeMap = {
 };
 
 var CharacterData = {
-    data: 0, //String
-    length: 0, //Number
+    data: "",
+    length: 0,
     substringData: function (offset,count) {}, //String
     appendData: function (arg) {}, //Object
     insertData: function (offset,arg) {}, //Object
@@ -149,12 +149,12 @@ var CharacterData = {
 CharacterData.prototype = new Node();
 
 var Attr = {
-    name: 0, //String
-    specified: 0, //Boolean
-    value: 0, //String
-    ownerElement: 0, //Element
-    schemaTypeInfo: 0, //TypeInfo
-    isId: 0, //Boolean
+    name: "",
+    specified: false,
+    value: "",
+    ownerElement: {}, //Element
+    schemaTypeInfo: {}, //TypeInfo
+    isId: false,
 };
 Attr.prototype = new Node();
 
@@ -170,7 +170,7 @@ var Element = {
     removeAttribute: function (name) {}, //Object
     removeAttributeNode: function (oldAttr) {}, //Attr
     removeAttributeNS: function (namespaceURI,localName) {}, //Object
-    schemaTypeInfo: 0, //TypeInfo
+    schemaTypeInfo: {}, //TypeInfo
     setAttribute: function (name,value) {}, //Object
     setAttributeNode: function (newAttr) {}, //Attr
     setAttributeNodeNS: function (newAttr) {}, //Object
@@ -178,15 +178,15 @@ var Element = {
     setIdAttribute: function (name, isId) {}, //Object
     setIdAttributeNode: function (idAttr, isId) {}, //Object
     setIdAttributeNS: function (namespaceURI, localName, isId) {}, //Object
-    tagName: 0, //String
+    tagName: "",
 };
 Element.prototype = new Node();
 
 var Text = {
-    isElementContentWhitespace: 0, //Boolean
+    isElementContentWhitespace: false,
     replaceWholeText: function (content) {}, //Text
     splitText: function (offset) {}, //Text
-    wholeText: 0, //String
+    wholeText: "",
 };
 Text.prototype = new CharacterData();
 
@@ -194,9 +194,9 @@ var Comment = {};
 Comment.prototype = new CharacterData();
 
 var TypeInfo = {
-    isDerivedFrom: function (typeNamespaceArg,typeNameArg,derivationMethod) {}, //Boolean
-    typeName: 0, //String
-    typeNamespace: 0, //String
+    isDerivedFrom: function (typeNamespaceArg, typeNameArg, derivationMethod) {}, //Boolean
+    typeName: "",
+    typeNamespace: "",
 };
 
 var UserDataHandler = {
@@ -204,12 +204,12 @@ var UserDataHandler = {
 };
 
 var DOMError = {
-    location: 0, //DOMLocator
-    message: 0, //String
-    relatedData: 0, //Object
-    relatedException: 0, //Object
-    severity: 0, //Number
-    type: 0, //String
+    location: {}, //DOMLocator
+    message: "",
+    relatedData: {}, //Object
+    relatedException: {}, //Object
+    severity: 0,
+    type: "",
 };
 
 var DOMErrorHandler = {
@@ -217,12 +217,12 @@ var DOMErrorHandler = {
 };
 
 var DOMLocator = {
-    byteOffset: 0, //Number
-    columnNumber: 0, //Number
-    lineNumber: 0, //Number
+    byteOffset: 0,
+    columnNumber: 0,
+    lineNumber: 0,
     relatedNode: 0, //Node
-    uri: 0, //String
-    utf16Offset: 0, //Number
+    uri: "",
+    utf16Offset: 0,
 };
 
 var DOMConfiguration = {
@@ -236,28 +236,28 @@ var CDATASection = {};
 CDATASection.prototype = new Text();
 
 var DocumentType = {
-    entities: 0, //NamedNodeMap
-    internalSubset: 0, //String
-    name: 0, //String
-    notations: 0, //NamedNodeMap
-    publicId: 0, //String
-    systemId: 0, //String
+    entities: {}, //NamedNodeMap
+    internalSubset: "",
+    name: "",
+    notations: {}, //NamedNodeMap
+    publicId: "",
+    systemId: "",
 };
 DocumentType.prototype = new Node();
 
 var Notation = {
-    publicId: 0, //String
-    systemId: 0, //String
+    publicId: "",
+    systemId: "",
 };
 Notation.prototype = new Node();
 
 var Entity = {
-    inputEncoding: 0, //String
-    notationName: 0, //String
-    publicId: 0, //String
-    systemId: 0, //String
-    xmlEncoding: 0, //String
-    xmlVersion: 0, //String
+    inputEncoding: "",
+    notationName: "",
+    publicId: "",
+    systemId: "",
+    xmlEncoding: "",
+    xmlVersion: "",
 };
 Entity.prototype = new Node();
 
@@ -265,7 +265,7 @@ var EntityReference = {};
 EntityReference.prototype = new Node();
 
 var ProcessingInstruction = {
-    data: 0, //String
-    target: 0, //String
+    data: "",
+    target: "",
 };
 ProcessingInstruction.prototype = new Node();
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMEvents.js b/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
index 0f4d3bd1..b77a1c78 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
@@ -1,19 +1,19 @@
 var Event = {
     currentTarget: 0, //Gecko,EventTarget
-    bubbles: 0, //Gecko,Boolean
-    cancelable: 0, //Gecko,Boolean
-    eventPhase: 0, //Gecko,Number
+    bubbles: false, //Gecko
+    cancelable: false, //Gecko
+    eventPhase: 0, //Gecko
     initEvent: function (eventTypeArg, canBubbleArg, cancelableArg) {}, //Gecko,Object
     initEventNS: function (namespaceURIArg, eventTypeArg, canBubbleArg, cancelableArg) {}, //Gecko,Object
     isCustom: function () {}, //Gecko,Boolean
     isDefaultPrevented: function () {}, //Gecko,Boolean
-    namespaceURI: 0, //Gecko,String
+    namespaceURI: "", //Gecko
     preventDefault: function () {}, //Gecko,Object
     stopImmediatePropagation: function () {}, //Gecko,Object
     stopPropagation: function () {}, //Gecko,Object
     target: 0, //Gecko,EventTarget
-    timeStamp: 0, //Gecko,Number
-    type: 0, //Gecko,String
+    timeStamp: 0, //Gecko
+    type: "", //Gecko
 };
 
 var EventTarget = {
@@ -31,7 +31,7 @@ var EventListener = {
 };
 
 var EventException = {
-    code: 0, //Gecko,Number
+    code: 0, //Gecko
 };
 
 var DocumentEvent = {
@@ -47,65 +47,65 @@ var CustomEvent = {
 CustomEvent.prototype = new Event();
 
 var UIEvent = {
-    detail: 0, //Gecko,Number
+    detail: 0, //Gecko
     initUIEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, detailArg) {}, //Gecko,Object
     initUIEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, detailArg) {}, //Gecko,Object
-    view: 0, //Gecko,AbstractView
+    view: {}, //Gecko,AbstractView
 };
 UIEvent.prototype = new Event();
 
 var TextEvent = {
-    data: 0, //Gecko,String
+    data: "", //Gecko
     initTextEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, dataArg) {}, //Gecko,Object
     initTextEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, dataArg) {}, //Gecko,Object
 };
 TextEvent.prototype = new UIEvent();
 
 var MouseEvent = {
-    altKey: 0, //Gecko,Boolean
-    button: 0, //Gecko,Number
-    clientX: 0, //Gecko,Number
-    clientY: 0, //Gecko,Number
-    ctrlKey: 0, //Gecko,Boolean
+    altKey: false, //Gecko
+    button: 0, //Gecko
+    clientX: 0, //Gecko
+    clientY: 0, //Gecko
+    ctrlKey: false, //Gecko
     getModifierState: function (keyIdentifierArg) {}, //Gecko,Boolean
     initMouseEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg) {}, //Gecko,Object
     initMouseEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg) {}, //Gecko,Object
-    metaKey: 0, //Gecko,Boolean
-    screenX: 0, //Gecko,Number
-    screenY: 0, //Gecko,Number
-    shiftKey: 0, //Gecko,Boolean
-    relatedTarget: 0, //Gecko,EventTarget
+    metaKey: false, //Gecko
+    screenX: 0, //Gecko
+    screenY: 0, //Gecko
+    shiftKey: false, //Gecko
+    relatedTarget: {}, //Gecko,EventTarget
 };
 MouseEvent.prototype = new UIEvent();
 
 var KeyboardEvent = {
-    altKey: 0, //Gecko,Boolean
-    ctrlKey: 0, //Gecko,Boolean
+    altKey: false, //Gecko
+    ctrlKey: false, //Gecko
     getModifierState: function (keyIdentifierArg) {}, //Gecko,Boolean
     initKeyboardEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, keyIdentifierArg, keyLocationArg, modifiersList) {}, //Gecko,Object
     initKeyboardEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, keyIdentifierArg, keyLocationArg, modifiersList) {}, //Gecko,Object
-    keyIdentifier: 0, //Gecko,String
-    keyLocation: 0, //Gecko,Number
-    metaKey: 0, //Gecko,Boolean
-    shiftKey: 0, //Gecko,Boolean
+    keyIdentifier: "", //Gecko
+    keyLocation: 0, //Gecko
+    metaKey: false, //Gecko
+    shiftKey: false, //Gecko
 };
 KeyboardEvent.prototype = new UIEvent();
 
 var MutationEvent = {
-    attrChange: 0, //Gecko,Number
-    attrName: 0, //Gecko,String
+    attrChange: 0, //Gecko
+    attrName: "", //Gecko
     initMutationEvent: function (typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevValueArg, newValueArg, attrNameArg, attrChangeArg) {}, //Gecko,Object
     initMutationEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevValueArg, newValueArg, attrNameArg, attrChangeArg) {}, //Gecko,Object
-    newValue: 0, //Gecko,String
-    prevValue: 0, //Gecko,String
-    relatedNode: 0, //Gecko,Node
+    newValue: "", //Gecko
+    prevValue: "", //Gecko
+    relatedNode: {}, //Gecko,Node
 };
 MutationEvent.prototype = new UIEvent();
 
 var MutationNameEvent = {
     initMutationNameEvent: function (typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevNamespaceURIArg, prevNodeNameArg) {}, //Gecko,Object
     initMutationNameEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevNamespaceURIArg, prevNodeNameArg) {}, //Gecko,Object
-    prevNamespaceURI: 0, //Gecko,String
-    prevNodeName: 0, //Gecko,String
+    prevNamespaceURI: "", //Gecko
+    prevNodeName: "", //Gecko
 };
 MutationNameEvent.prototype = new MutationEvent();
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js b/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
index 170dad4f..a9bd71b5 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
@@ -1,11 +1,11 @@
 var NodeIterator = {
     detach: function () {}, //Object
-    expandEntityReferences: 0, //Boolean
-    filter: 0, //NodeFilter
+    expandEntityReferences: false,
+    filter: {}, //NodeFilter
     nextNode: function () {}, //Node
     previousNode: function () {}, //Node
-    root: 0, //Node
-    whatToShow: 0, //Number
+    root: {}, //Node
+    whatToShow: 0,
 };
 
 var NodeFilter = {
@@ -31,14 +31,14 @@ var Range = {
     cloneContents: function () {}, //DocumentFragment
     cloneRange: function () {}, //Range
     collapse: function (toStart) {}, //Object
-    collapsed: 0, //Boolean
-    commonAncestorContainer: 0, //Node
+    collapsed: false,
+    commonAncestorContainer: {}, //Node
     compareBoundaryPoints: function (how,sourceRange) {}, //short
     createContextualFragment: function (tagString) {}, //Gecko,Object
     deleteContents: function () {}, //Object
     detach: function () {}, //Object
-    endContainer: 0, //Node
-    endOffset: 0, //long
+    endContainer: {}, //Node
+    endOffset: 0,
     extractContents: function () {}, //DocumentFragment
     insertNode: function (newNode) {}, //Object
     selectNode: function (refNode) {}, //Object
@@ -49,8 +49,8 @@ var Range = {
     setStart: function (refNode, offset) {}, //Object
     setStartAfter: function (refNode) {}, //Object
     setStartBefore: function (refNode) {}, //Object
-    startContainer: 0, //Node
-    startOffset: 0, //long
+    startContainer: {}, //Node
+    startOffset: 0,
     surroundContents: function (newParent) {}, //Object
     toString: function () {}, //String
 };
@@ -60,5 +60,5 @@ var DocumentRange = {
 };
 
 var RangeException = {
-    code: 0, //Number
+    code: 0,
 };
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMXPath.js b/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
index 8e949045..0e199350 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
@@ -1,5 +1,5 @@
 var XPathException = {
-    code: 0, //Gecko,Number
+    code: 0, //Gecko
 };
 
 var XPathEvaluator = {
@@ -17,28 +17,28 @@ var XPathNSResolver = {
 };
 
 var XPathResult = {
-    ANY_TYPE: 0, //Gecko,Number
-    ANY_UNORDERED_NODE_TYPE: 0, //Gecko,Number
-    BOOLEAN_TYPE: 0, //Gecko,Number
-    booleanValue: 0, //Gecko,Boolean
-    FIRST_ORDERED_NODE_TYPE: 0, //Gecko,Number
-    invalidIteratorState: 0, //Gecko,Boolean
+    ANY_TYPE: 0, //Gecko
+    ANY_UNORDERED_NODE_TYPE: 0, //Gecko
+    BOOLEAN_TYPE: 0, //Gecko
+    booleanValue: false, //Gecko
+    FIRST_ORDERED_NODE_TYPE: 0, //Gecko
+    invalidIteratorState: false, //Gecko
     iterateNext: function () {}, //Gecko,Node
-    NUMBER_TYPE: 0, //Gecko,Number
-    numberValue: 0, //Gecko,Number
-    ORDERED_NODE_ITERATOR_TYPE: 0, //Gecko,Number
-    ORDERED_NODE_SNAPSHOT_TYPE: 0, //Gecko,Number
-    resultType: 0, //Gecko,Number
-    singleNodeValue: 0, //Gecko,Node
+    NUMBER_TYPE: 0, //Gecko
+    numberValue: 0, //Gecko
+    ORDERED_NODE_ITERATOR_TYPE: 0, //Gecko
+    ORDERED_NODE_SNAPSHOT_TYPE: 0, //Gecko
+    resultType: 0, //Gecko
+    singleNodeValue: {}, //Gecko,Node
     snapshotItem: function (index) {}, //Gecko,Node
-    snapshotLength: 0, //Gecko,Number
-    STRING_TYPE: 0, //Gecko,Number
-    stringValue: 0, //Gecko,String
-    UNORDERED_NODE_ITERATOR_TYPE: 0, //Gecko,Number
-    UNORDERED_NODE_SNAPSHOT_TYPE: 0, //Gecko,Number
+    snapshotLength: 0, //Gecko
+    STRING_TYPE: 0, //Gecko
+    stringValue: "", //Gecko
+    UNORDERED_NODE_ITERATOR_TYPE: 0, //Gecko
+    UNORDERED_NODE_SNAPSHOT_TYPE: 0, //Gecko
 };
 
 var XPathNamespace = {
-    ownerElement: 0, //Gecko,Element
+    ownerElement: {}, //Gecko,Element
 };
 XPathNamespace.prototype = new Node();

From 23e5b7fd5d5e2c2970f646dac10c4d3818543c4a Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Tue, 31 Dec 2024 02:54:41 +0300
Subject: [PATCH 251/340] Adding function return primitive type information in
 dist/sdk/clientAny.

---
 plugin/src/main/dist/sdk/clientAny/AJAX.js    |  17 +-
 plugin/src/main/dist/sdk/clientAny/DHTML.js   | 298 +++++++++---------
 plugin/src/main/dist/sdk/clientAny/DOMCore.js | 178 +++++------
 .../src/main/dist/sdk/clientAny/DOMEvents.js  |  72 ++---
 .../sdk/clientAny/DOMTraversalAndRange.js     |  66 ++--
 .../src/main/dist/sdk/clientAny/DOMXPath.js   |  14 +-
 6 files changed, 322 insertions(+), 323 deletions(-)

diff --git a/plugin/src/main/dist/sdk/clientAny/AJAX.js b/plugin/src/main/dist/sdk/clientAny/AJAX.js
index 5e44e337..bee9584d 100644
--- a/plugin/src/main/dist/sdk/clientAny/AJAX.js
+++ b/plugin/src/main/dist/sdk/clientAny/AJAX.js
@@ -1,20 +1,19 @@
-window.ActiveXObject = function () {}; //XMLHttpRequest
-window.XmlHttpRequest = function () {}; //XMLHttpRequest
+window.ActiveXObject = function () { return {}; }; //XMLHttpRequest
+window.XmlHttpRequest = function () { return {}; }; //XMLHttpRequest
 
 var XMLHttpRequest = {
     abort: function () {}, //Object
     constructor: {},
-    getAllResponseHeaders: function () {}, //String
-    getResponseHeader: function (headerName) {}, //String
+    getAllResponseHeaders: function () { return ""; },
+    getResponseHeader: function (headerName) { return ""; },
     readyState: 0,
     responseText: "",
     responseXML: "",
     onreadystatechange: function () {},
-    open: function (method, url, async, username, password) {}, //Object
-    overrideMimeType: function (mimeType) {}, //Gecko,Object
-    send: function (content) {}, //void
-    setRequestHeader: function (label, value) {}, //void
+    open: function (method, url, async, username, password) { return {}; },
+    overrideMimeType: function (mimeType) { return {}; }, //Gecko
+    send: function (content) {},
+    setRequestHeader: function (label, value) {},
     statusText: "",
     status: 0,
 };
-XMLHttpRequest.prototype = new Object();
diff --git a/plugin/src/main/dist/sdk/clientAny/DHTML.js b/plugin/src/main/dist/sdk/clientAny/DHTML.js
index c4dc70a2..60651c8c 100644
--- a/plugin/src/main/dist/sdk/clientAny/DHTML.js
+++ b/plugin/src/main/dist/sdk/clientAny/DHTML.js
@@ -1,8 +1,8 @@
-__defineGetter__ = function (propertyName, func) {}; //Gecko,Object
-__defineSetter__ = function (propertyName, func) {}; //Gecko,Object
-__lookupGetter__ = function (propertyName) {}; //Gecko,Function
-__lookupSetter__ = function (propertyName) {}; //Gecko,Function
-__proto__ = function (propertyName) {}; //Gecko,Function
+__defineGetter__ = function (propertyName, func) { return {}; }; //Gecko
+__defineSetter__ = function (propertyName, func) { return {}; }; //Gecko
+__lookupGetter__ = function (propertyName) { return {}; }; //Gecko,Function
+__lookupSetter__ = function (propertyName) { return {}; }; //Gecko,Function
+__proto__ = function (propertyName) { return {}; }; //Gecko,Function
 
 var Image = function () {};
 Image.prototype = new HTMLImageElement();
@@ -14,15 +14,15 @@ var Navigator = {
     appCodeName: "",
     appName: "",
     appVersion: "",
-    javaEnabled: function () {}, //Boolean
+    javaEnabled: function () { return false; },
     language: "",
     mimeTypes: [],
     platform: [],
     plugins: "",
-    preference: function (prefName, prefValue) {}, //String
+    preference: function (prefName, prefValue) { return ""; },
     product: "",
     systemLanguage: "", //IE
-    taintEnabled: function () {}, //Boolean
+    taintEnabled: function () { return false; },
     userAgent: "",
     userLanguage: "", //IE
 };
@@ -44,8 +44,8 @@ var location = {
     pathname: "",
     port: "",
     protocol: "",
-    reload: function () {}, //void
-    replace: function (url) {}, //void
+    reload: function () {},
+    replace: function (url) {},
     search: "",
     target: "",
 };
@@ -53,20 +53,20 @@ var location = {
 var XSLTProcessor = function () {};
 XSLTProcessor.prototype = new Object();
 XSLTProcessor.constructor = {}; //Gecko
-XSLTProcessor.importStylesheet = function (domNode) {}; //Gecko,Object
-XSLTProcessor.transformToDocument = function (domNode) {}; //Gecko,Document
-XSLTProcessor.transformToFragment = function (domToBeTransformed, ownerDocument) {}; //Gecko,DocumentFragment
+XSLTProcessor.importStylesheet = function (domNode) { return {}; }; //Gecko
+XSLTProcessor.transformToDocument = function (domNode) { return {}; }; //Gecko,Document
+XSLTProcessor.transformToFragment = function (domToBeTransformed, ownerDocument) { return {}; }; //Gecko,DocumentFragment
 
 var DOMParser = function () {};
 DOMParser.prototype = new Object();
 DOMParser.constructor = {}; //Gecko
-DOMParser.parseFromString = function (stringToParse, contentType) {}; //Gecko,Document
+DOMParser.parseFromString = function (stringToParse, contentType) { return {}; }; //Gecko,Document
 
 var XMLSerializer = function () {};
 XMLSerializer.prototype = new Object();
 XMLSerializer.constructor = 0; //Gecko,Object
-XMLSerializer.serializeToStream = function (domNode, stream, encoding) {}; //Gecko,Object
-XMLSerializer.serializeToString = function (domNode) {}; //Gecko,String
+XMLSerializer.serializeToStream = function (domNode, stream, encoding) { return {}; }; //Gecko
+XMLSerializer.serializeToString = function (domNode) { return ""; }; //Gecko
 
 var Event = {
     altKey: false,
@@ -131,21 +131,21 @@ var Selection = {
     anchorNode: {}, //Gecko,Node
     anchorOffset: 0, //Gecko
     clear: function () {}, //IE,Boolean
-    collapse: function (parentNode, offset) {}, //Gecko,void
-    collapseToStart: function () {}, //Gecko,void
-    collapseToEnd: function () {}, //Gecko,void
-    containsNode: function (node, partlyContained) {}, //Gecko,Boolean
-    createRange: function () {}, //IE,TextRange
-    empty: function () {}, //IE,Boolean
-    extend: function (parentNode, offset) {}, //Gecko,void
+    collapse: function (parentNode, offset) {}, //Gecko
+    collapseToStart: function () {}, //Gecko
+    collapseToEnd: function () {}, //Gecko
+    containsNode: function (node, partlyContained) { return false; }, //Gecko
+    createRange: function () { return {}; }, //IE,TextRange
+    empty: function () { return true; }, //IE
+    extend: function (parentNode, offset) {}, //Gecko
     focusNode: {}, //Gecko,Node
     focusOffset: 0, //Gecko
-    getRangeAt: function (index) {}, //Gecko,Range
+    getRangeAt: function (index) { return {}; }, //Gecko,Range
     isCollapsed: false, //Gecko
     rangeCount: 0, //Gecko
-    removeRange: function (range) {}, //Gecko,void
-    removeAllRanges: function () {}, //Gecko,void
-    selectAllChildren: function (parentNode) {}, //Gecko,void
+    removeRange: function (range) {}, //Gecko
+    removeAllRanges: function () {}, //Gecko
+    selectAllChildren: function (parentNode) {}, //Gecko
     type: {}, //IE
 };
 
@@ -155,30 +155,30 @@ var TextRange = {
     boundingTop: 0, //IE
     boundingWidth: 0, //IE
     collapse: function (start) {}, //IE,void
-    compareEndPoint: function (type, range) {}, //IE,void
-    compareEndPoints: function (sType, oRange) {}, //IE,Number
-    duplicate: function () {}, //IE,TextRange
-    expand: function (unit) {}, //IE,void
+    compareEndPoint: function (type, range) {}, //IE
+    compareEndPoints: function (sType, oRange) { return 0; }, //IE
+    duplicate: function () { return {}; }, //IE,TextRange
+    expand: function (unit) {}, //IE
     htmlText: "", //IE
-    inRange: function (other) {}, //IE,boolean
-    isEqual: function (other) {}, //IE,boolean
-    move: function (unit, count) {}, //IE,void
-    moveEnd: function (unit, count) {}, //IE,void
-    moveStart: function (unit, count) {}, //IE,void
-    moveToElementText: function (element) {}, //IE,void
+    inRange: function (other) { return false; }, //IE
+    isEqual: function (other) { return false; }, //IE
+    move: function (unit, count) {}, //IE
+    moveEnd: function (unit, count) {}, //IE
+    moveStart: function (unit, count) {}, //IE
+    moveToElementText: function (element) {}, //IE
     offsetLeft: 0, //IE
     offsetTop: 0, //IE
-    parentElement: function () {}, //IE,Node
-    pasteHTML: function (htmlText) {}, //IE,void
-    scrollIntoView: function (start) {}, //IE,void
-    select: function () {}, //IE,void
-    setEndPoint: function (type, range) {}, //IE,void
+    parentElement: function () { return {}; }, //IE,Node
+    pasteHTML: function (htmlText) {}, //IE
+    scrollIntoView: function (start) {}, //IE
+    select: function () {}, //IE
+    setEndPoint: function (type, range) {}, //IE
     text: "", //IE
 };
 
 var document = {
     all: 0, //IE,All
-    execCommand: function (sCommand, bUserInterface, vValue) {}, //IE,Boolean
+    execCommand: function (sCommand, bUserInterface, vValue) { return false; }, //IE
     namespaces: [], //IE
     selection: {}, //IE,Selection
     styleSheets: [], //Stylesheet[]
@@ -189,57 +189,57 @@ var CssRule = {
 };
 
 var Stylesheet = {
-    addRule: function (selector, style) {}, //IE,void
+    addRule: function (selector, style) {}, //IE
     cssRules: [], //Gecko,CssRule[]
-    deleteRule: function (index) {}, //Gecko,void
-    insertRule: function (ruleText, index) {}, //Gecko,void
+    deleteRule: function (index) {}, //Gecko
+    insertRule: function (ruleText, index) {}, //Gecko
     owningElement: {}, //IE,HtmlElement
-    removeRule: function (index) {}, //IE,void
+    removeRule: function (index) {}, //IE
     rules: 0, //IE,CssRule[]
 };
 
 var MozillaSideBar = {
-    addPanel: function (title, url, param3) {}, //Gecko,void
+    addPanel: function (title, url, param3) {}, //Gecko
 };
 
 var IEExternal = {
-    AddFavorite: function (title, url) {}, //IE,void
+    AddFavorite: function (title, url) {}, //IE
 };
 
 var history = {
-    back: function () {}, //void
-    forward: function () {}, //void
-    go: function (count) {}, //void
+    back: function () {},
+    forward: function () {},
+    go: function (count) {},
 };
 
 var window = {
-    addEventListener: function (type, listener, useCapture) {}, //Gecko,Object
-    alert: function (sMesssage) {}, //Object
-    attachEvent: function (type, listener) {}, //IE,Object
-    captureEvents: function (eventType) {}, //Gecko,void,deprecated
-    clearInterval: function (intervalId) {}, //Object
-    clearTimeout: function (intervalId) {}, //Object
-    CollectGarbage: function () {}, //IE,Object
-    confirm: function (sMesssage) {}, //Object
+    addEventListener: function (type, listener, useCapture) { return {}; }, //Gecko
+    alert: function (sMesssage) { return {}; },
+    attachEvent: function (type, listener) { return {}; }, //IE
+    captureEvents: function (eventType) {}, //Gecko,deprecated
+    clearInterval: function (intervalId) { return {}; },
+    clearTimeout: function (intervalId) { return {}; },
+    CollectGarbage: function () { return {}; }, //IE
+    confirm: function (sMesssage) { return {}; },
     defaultStatus: "",
-    detachEvent: function (type, listener) {}, //IE,Object
+    detachEvent: function (type, listener) { return {}; }, //IE
     directories: {},
     document: {}, //HTMLDocument
     external: {}, //IE,IEExternal
     event: {}, //Event
-    execScript: function (sScript) {}, //IE,Object
+    execScript: function (sScript) { return {}; }, //IE
     frameElement: {},
     frames: [],
-    getComputedStyle: function (element, pseudoElt) {}, //Gecko,style
-    GetObject: function (classOrPath, clazz) {}, //IE,Object,deprecated
-    getSelection: function () {}, //Gecko,Selection
+    getComputedStyle: function (element, pseudoElt) { return {}; }, //Gecko,style
+    GetObject: function (classOrPath, clazz) { return {}; }, //IE,deprecated
+    getSelection: function () { return {}; }, //Gecko,Selection
     history: {}, //history
     innerHeight: 0,
     innerWidth: 0,
     location: {}, //Location
     menubar: {},
-    moveBy: function (xDelta, yDelta) {}, //Object
-    moveTo: function (x, y) {}, //Object
+    moveBy: function (xDelta, yDelta) { return {}; },
+    moveTo: function (x, y) { return {}; },
     navigator: {}, //Navigator
     opener: {}, //window
     opera: false, //Opera
@@ -248,52 +248,52 @@ var window = {
     pageXOffset: 0,
     pageYOffset: 0,
     parent: {}, //window
-    preventBubble: function (event) {}, //Gecko,void,deprecated
-    print: function () {}, //void
-    prompt: function (sMessage, sDefaultValue) {}, //Object
-    releaseEvents: function (eventType) {}, //Gecko,void,deprecated
-    removeEventListener: function (type, listener, useCapture) {}, //Gecko,Object
-    resizeBy: function (widthDelta, heightDelta) {}, //Object
-    resizeTo: function (width, height) {}, //Object
-    routeEvent: function (event) {}, //Gecko,void,deprecated
+    preventBubble: function (event) {}, //Gecko,deprecated
+    print: function () {},
+    prompt: function (sMessage, sDefaultValue) { return {}; },
+    releaseEvents: function (eventType) {}, //Gecko,deprecated
+    removeEventListener: function (type, listener, useCapture) { return {}; }, //Gecko
+    resizeBy: function (widthDelta, heightDelta) { return {}; },
+    resizeTo: function (width, height) { return {}; },
+    routeEvent: function (event) {}, //Gecko,deprecated
     screen: {}, //Screen
     screenLeft: 0, //IE
     screenTop: 0, //IE
-    ScriptEngine: function () {}, //IE,String
-    ScriptEngineBuildVersion: function () {}, //IE,String
-    ScriptEngineMajorVersion: function () {}, //IE,String
-    ScriptEngineMinorVersion: function () {}, //IE,String
+    ScriptEngine: function () { return ""; }, //IE
+    ScriptEngineBuildVersion: function () { return ""; }, //IE
+    ScriptEngineMajorVersion: function () { return ""; }, //IE
+    ScriptEngineMinorVersion: function () { return ""; }, //IE
     scrollbars: {},
-    scrollBy: function (xDelta, yDelta) {}, //Object
+    scrollBy: function (xDelta, yDelta) { return {}; },
     scrollMaxX: 0,
     scrollMaxY: 0,
-    scrollTo: function (x, y) {}, //Object
+    scrollTo: function (x, y) { return {}; },
     scrollX: 0,
     scrollY: 0,
     self: {},
-    setInterval: function (vCode, iMillis) {}, //Number
-    setTimeout: function (vCode, iMillis) {}, //Number
-    showModalDialog: function (sUrl, vArguments, sFeatures) {}, //IE,style
+    setInterval: function (vCode, iMillis) { return 0; },
+    setTimeout: function (vCode, iMillis) { return 0; },
+    showModalDialog: function (sUrl, vArguments, sFeatures) { return {}; }, //IE,style
     sidebar: {}, //Gecko,MozillaSideBar
     status: "",
     toolbar: {},
-    top: 0, //window
-    window: 0, //window
+    top: {}, //window
+    window: {}, //window
 };
 
-var escape = function () {}; //Object,deprecated
-var unescape = function () {}; //Object,deprecated
+var escape = function () { return {}; }; //deprecated
+var unescape = function () { return {}; }; //deprecated
 
 var HTMLCollection = {
     length: 0,
-    item: function (index) {}, //Node
-    namedItem: function (name) {}, //Node
+    item: function (index) { return {}; }, //Node
+    namedItem: function (name) { return {}; }, //Node
 };
 
 var HTMLOptionsCollection = {
-    item: function (index) {}, //Node
+    item: function (index) { return {}; }, //Node
     length: 0,
-    namedItem: function (name) {}, //Node
+    namedItem: function (name) { return {}; }, //Node
 };
 
 var HTMLDocument = {
@@ -301,27 +301,27 @@ var HTMLDocument = {
     anchors: {}, //HTMLCollection
     applets: {}, //HTMLCollection
     body: {}, //HTMLElement
-    close: function () {}, //Object
+    close: function () { return {}; },
     commandDispatcher: {}, //Gecko,CommandDispatcher
     compatMode: "",
     cookie: {}, //HTMLCollection
-    createEventObject: function (oExistingEvent) {}, //IE,Even
-    createStyleSheet: function () {}, //IE,Stylesheet
+    createEventObject: function (oExistingEvent) { return {}; }, //IE,Event
+    createStyleSheet: function () { return {}; }, //IE,Stylesheet
     defaultView: {}, //Gecko,DocumentView
     domain: "",
-    elementFromPoint: function (iX, iY) {}, //IE,HTMLElement
+    elementFromPoint: function (iX, iY) { return {}; }, //IE,HTMLElement
     forms: {}, //HTMLCollection
-    getAnonymousElementByAttribute: function (node, attrName, attrValue) {}, //Gecko,NodeList
-    getAnonymousNodes: function (node) {}, //Gecko,Node[]
-    getBoxObjectFor: function (element) {}, //Gecko,Node
-    getElementsByName: function (elementName) {}, //NodeList
-    getElementsByClassName: function (className) {}, //Gecko,NodeList
+    getAnonymousElementByAttribute: function (node, attrName, attrValue) { return {}; }, //Gecko,NodeList
+    getAnonymousNodes: function (node) { return []; }, //Gecko,Node[]
+    getBoxObjectFor: function (element) { return {}; }, //Gecko,Node
+    getElementsByName: function (elementName) { return {}; }, //NodeList
+    getElementsByClassName: function (className) { return {}; }, //Gecko,NodeList
     images: {}, //HTMLCollection
     links: {}, //HTMLCollection
-    open: function () {}, //Object
+    open: function () { return {}; },
     parentWindow: {}, //IE,window
-    querySelector: function (string) {}, //Gecko,Node
-    querySelectorAll: function (string) {}, //Gecko,NodeList
+    querySelector: function (string) { return {}; }, //Gecko,Node
+    querySelectorAll: function (string) { return {}; }, //Gecko,NodeList
     referrer: "",
     title: "",
     URL: "",
@@ -335,39 +335,39 @@ var CommandDispatcher = {
 };
 
 var DocumentView = {
-    getComputedStyle: function (element, type) {}, //Gecko,CssStyle
+    getComputedStyle: function (element, type) { return {}; }, //Gecko,CssStyle
 };
 
 var CssStyle = {
-    getPropertyValue: function (propertyName) {}, //Gecko,String
+    getPropertyValue: function (propertyName) { return {}; }, //Gecko,String
 };
 
 var HTMLElement = {
-    addBehavior: function (sUrl) {}, //IE,Number
-    attachEvent: function (type, listener) {}, //IE,Object
+    addBehavior: function (sUrl) { return 0; }, //IE
+    attachEvent: function (type, listener) { return {}; }, //IE
     boxObject: {}, //Gecko,HTMLElement
     children: [], //IE,HTMLElement[]
     className: "",
-    clearAttributes: function () {}, //IE,Object
+    clearAttributes: function () { return {}; }, //IE
     clientHeight: 0,
     clientLeft: 0,
     clientTop: 0,
     clientWidth: 0,
     currentStyle: {}, //IE,IEElementStyle
-    detachEvent: function (type, listener) {}, //IE,Object
+    detachEvent: function (type, listener) { return {}; }, //IE
     dir: "",
     filters: [], //IE
-    fireEvent: function (type, event) {}, //IE,Object
+    fireEvent: function (type, event) { return {}; }, //IE
     getBoundingClientRect: function () {}, //IE,TextRange
     hidePopup: function () {}, //Gecko,Object
     id: "",
     innerHTML: "",
     innerText: "", //IE
-    insertAdjacentHTML: function (position, htmlContent) {}, //IE,Object
-    insertAdjacentText: function (position, textContent) {}, //IE,Object
+    insertAdjacentHTML: function (position, htmlContent) { return {}; }, //IE
+    insertAdjacentText: function (position, textContent) { return {}; }, //IE
     isDisabled: false, //IE
     lang: "",
-    mergeAttributes: function (oSource, bPreserve) {}, //IE,Object
+    mergeAttributes: function (oSource, bPreserve) { return {}; }, //IE
     offsetHeight: 0,
     offsetLeft: 0,
     offsetParent: 0,
@@ -386,17 +386,17 @@ var HTMLElement = {
     onmousemove: function () {},
     onresize: function () {},
     propertyName: "", //IE
-    releaseCapture: function () {}, //IE,Object
-    removeBehavior: function (sID) {}, //IE,Boolean
+    releaseCapture: function () { return {}; }, //IE
+    removeBehavior: function (sID) { return false; }, //IE
     runtimeStyle: {}, //IE,IEElementStyle
-    setCapture: function (bContainerCapture) {}, //IE,Object
+    setCapture: function (bContainerCapture) { return {}; }, //IE
     scrollWidth: 0,
     scrollHeight: 0,
     scrollTop: 0,
     scrollLeft: 0,
-    showPopup: function () {}, //Gecko,Object
-    style: 0, //style
-    stylesheet: 0, //Stylesheet
+    showPopup: function () { return {}; }, //Gecko
+    style: {}, //style
+    stylesheet: {}, //Stylesheet
     title: "",
 };
 HTMLElement.prototype = new Element();
@@ -405,8 +405,8 @@ var HTMLAnchorElement = {
     accessKey: "",
     charset: "",
     coords: "",
-    blur: function () {}, //Object
-    focus: function () {}, //Object
+    blur: function () { return {}; },
+    focus: function () { return {}; },
     href: "",
     hreflang: "",
     name: "",
@@ -522,8 +522,8 @@ var HTMLFormElement = {
     length: 0,
     method: "",
     name: "",
-    reset: function () {}, //Object
-    submit: function () {}, //Object
+    reset: function () { return {}; },
+    submit: function () { return {}; },
     target: "",
 };
 
@@ -566,20 +566,20 @@ var HTMLInputElement = {
     accessKey: "",
     align: "",
     alt: "",
-    blur: function () {}, //Object
+    blur: function () { return {}; },
     checked: false,
-    click: function () {}, //Object
-    createTextRange: function () {}, //IE,TextRange
+    click: function () { return {}; },
+    createTextRange: function () { return {}; }, //IE,TextRange
     defaultChecked: false,
     defaultValue: "",
     disabled: false,
-    focus: function () {}, //Object
+    focus: function () { return {}; },
     form: {}, //HTMLFormElement
     maxLength: 0,
     name: "",
     readOnly: false,
-    select: function () {}, //Object
-    setSelectionRange: function (start, end) {}, //Gecko,Object
+    select: function () { return {}; },
+    setSelectionRange: function (start, end) { return {}; }, //Gecko
     size: 0,
     src: "",
     tabIndex: 0,
@@ -776,16 +776,16 @@ var HTMLScriptElement = {
 HTMLScriptElement.prototype = new HTMLElement();
 
 var HTMLSelectElement = {
-    add: function (element, before) {}, //Object
-    blur: function () {}, //Object
+    add: function (element, before) { return {}; },
+    blur: function () { return {}; },
     disabled: false,
-    focus: function () {}, //Object
+    focus: function () { return {}; },
     form: {}, //HTMLFormElement
     length: 0,
     multiple: false,
     name: "",
     options: {}, //HTMLOptionsCollection
-    remove: function (index) {}, //Object
+    remove: function (index) { return {}; },
     selectedIndex: 0,
     size: 0,
     tabIndex: 0,
@@ -843,15 +843,15 @@ var HTMLTableElement = {
     caption: {}, //HTMLTableCaptionElement
     cellPadding: "",
     cellSpacing: "",
-    createCaption: function () {}, //HTMLElement
-    createTFoot: function () {}, //HTMLElement
-    createTHead: function () {}, //HTMLElement
-    deleteCaption: function () {}, //Object
-    deleteRow: function (index) {}, //Object
-    deleteTHead: function () {}, //Object
-    deleteTFoot: function () {}, //Object
+    createCaption: function () { return {}; }, //HTMLElement
+    createTFoot: function () { return {}; }, //HTMLElement
+    createTHead: function () { return {}; }, //HTMLElement
+    deleteCaption: function () { return {}; },
+    deleteRow: function (index) { return {}; },
+    deleteTHead: function () { return {}; },
+    deleteTFoot: function () { return {}; },
     frame: "",
-    insertRow: function (index) {}, //HTMLElement
+    insertRow: function (index) { return {}; }, //HTMLElement
     rows: {}, //HTMLCollection
     rules: "",
     summary: "",
@@ -868,8 +868,8 @@ var HTMLTableRowElement = {
     cells: {}, //HTMLCollection
     ch: "",
     chOff: "",
-    deleteCell: function (index) {}, //Object
-    insertCell: function (index) {}, //HTMLElement
+    deleteCell: function (index) { return {}; },
+    insertCell: function (index) { return {}; }, //HTMLElement
     rowIndex: 0,
     sectionRowIndex: 0,
     vAlign: "",
@@ -880,8 +880,8 @@ var HTMLTableSectionElement = {
     align: "",
     ch: "",
     chOff: "",
-    deleteRow: function (index) {}, //Object
-    insertRow: function (index) {}, //HTMLElement
+    deleteRow: function (index) { return {}; },
+    insertRow: function (index) { return {}; }, //HTMLElement
     rows: {}, //HTMLCollection
     vAlign: "",
 };
@@ -889,16 +889,16 @@ HTMLTableSectionElement.prototype = new HTMLElement();
 
 var HTMLTextAreaElement = {
     accessKey: "",
-    blur: function () {}, //Object
+    blur: function () { return {}; },
     cols: 0,
     defaultValue: "",
     disabled: false,
-    focus: function () {}, //Object
+    focus: function () { return {}; },
     form: {}, //HTMLFormElement
     name: "",
     readOnly: false,
     rows: 0,
-    select: function () {}, //Object
+    select: function () { return {}; },
     tabIndex: 0,
     type: "",
     value: "",
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMCore.js b/plugin/src/main/dist/sdk/clientAny/DOMCore.js
index d9ca3d82..84bae637 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMCore.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMCore.js
@@ -1,6 +1,6 @@
 var DOMImplementationRegistry = {
-    getDOMImplementation: function (features) {}, //Object
-    getDOMImplementationList: function (features) {}, //Object
+    getDOMImplementation: function (features) { return {}; },
+    getDOMImplementationList: function (features) { return {}; },
 };
 
 var DOMException = {
@@ -8,16 +8,16 @@ var DOMException = {
 };
 
 var DOMStringList = {
-    contains: function (str) {}, //Boolean
-    item: function (index) {}, //String
+    contains: function (str) { return false; },
+    item: function (index) { return ""; },
     length: 0,
 };
 
 var NameList = {
-    contains: function (str) {}, //Boolean
-    containsNS: function (namespaceURI,name) {}, //Boolean
-    getName: function (index) {}, //String
-    getNamespaceURI: function (index) {}, //String
+    contains: function (str) { return false; },
+    containsNS: function (namespaceURI, name) { return false; },
+    getName: function (index) { return ""; },
+    getNamespaceURI: function (index) { return ""; },
     length: 0,
 };
 
@@ -27,51 +27,51 @@ var DOMImplementationList = {
 };
 
 var DOMImplementationSource = {
-    getDOMImplementation: function (features) {}, //DOMImplementation
-    getDOMImplementationList: function (features) {}, //DOMImplementationList
+    getDOMImplementation: function (features) { return {}; }, //DOMImplementation
+    getDOMImplementationList: function (features) { return {}; }, //DOMImplementationList
 };
 
 var DOMImplementation = {
-    createDocument: function (namespaceURI,qualifiedName,doctype) {}, //Document
-    createDocumentType: function (qualifiedName,publicId,systemId) {}, //DocumentType
-    getFeature: function (feature,version) {}, //Object
-    hasFeature: function (feature,version) {}, //Boolean
+    createDocument: function (namespaceURI, qualifiedName, doctype) { return {}; }, //Document
+    createDocumentType: function (qualifiedName, publicId, systemId) { return {}; }, //DocumentType
+    getFeature: function (feature, version) { return {}; },
+    hasFeature: function (feature, version) { return false; },
 };
 
 var DocumentFragment = {};
 DocumentFragment.prototype = new Node();
 
 var Document = {
-    adoptNode: function (source) {}, //Node
-    createAttribute: function (name) {}, //Attr
-    createAttributeNS: function (namespaceURI, qualifiedName) {}, //Attr
-    createCDATASection: function (data) {}, //CDATASection
-    createComment: function (data) {}, //Comment
-    createDocumentFragment: function () {}, //DocumentFragment
-    createElement: function (tagName) {}, //Element
-    createElementNS: function (namespaceURI,qualifiedName) {}, //Element
-    createProcessingInstruction: function (target,data) {}, //ProcessingInstruction
-    createTextNode: function (data) {}, //Text
-    createEntityReference: function (name) {}, //EntityReference
+    adoptNode: function (source) { return {}; }, //Node
+    createAttribute: function (name) { return {}; }, //Attr
+    createAttributeNS: function (namespaceURI, qualifiedName) { return {}; }, //Attr
+    createCDATASection: function (data) { return {}; }, //CDATASection
+    createComment: function (data) { return {}; }, //Comment
+    createDocumentFragment: function () { return {}; }, //DocumentFragment
+    createElement: function (tagName) { return {}; }, //Element
+    createElementNS: function (namespaceURI, qualifiedName) { return {}; }, //Element
+    createProcessingInstruction: function (target, data) { return {}; }, //ProcessingInstruction
+    createTextNode: function (data) { return {}; }, //Text
+    createEntityReference: function (name) { return {}; }, //EntityReference
     doctype: {}, //DocumentType
     documentElement: {}, //Element
     documentURI: "",
     domConfig: {}, //DOMConfiguration
-    getElementById: function (elementId) {}, //Element
-    getElementsByTagName: function (tagname) {}, //NodeList
-    getElementsByTagNameNS: function (namespaceURI,localName) {}, //NodeList
+    getElementById: function (elementId) { return {}; }, //Element
+    getElementsByTagName: function (tagname) { return {}; }, //NodeList
+    getElementsByTagNameNS: function (namespaceURI, localName) { return {}; }, //NodeList
     implementation: {}, //DOMImplementation
-    importNode: function (importedNode,deep) {}, //Node
+    importNode: function (importedNode, deep) { return {}; }, //Node
     inputEncoding: "",
     parseError: {}, //IE,IXMLDOMParseError
-    load: function (filename) {}, //IE,Object
-    loadXML: function (xmlString) {}, //IE,Object
-    normalizeDocument: function () {}, //Object
-    renameNode: function (n,namespaceURI,qualifiedName) {}, //Node
-    save: function (filename) {}, //IE,Object
-    setProperty: function (name,value) {}, //IE,Object
-    selectSingleNode: function (xpathExpression) {}, //IE,Object
-    selectNodes: function (xpathExpression) {}, //IE,Object
+    load: function (filename) { return {}; }, //IE
+    loadXML: function (xmlString) { return {}; }, //IE
+    normalizeDocument: function () { return {}; },
+    renameNode: function (n, namespaceURI, qualifiedName) { return {}; }, //Node
+    save: function (filename) { return {}; }, //IE
+    setProperty: function (name, value) { return {}; }, //IE
+    selectSingleNode: function (xpathExpression) { return {}; }, //IE
+    selectNodes: function (xpathExpression) { return {}; }, //IE
     strictErrorChecking: false,
     xmlEncoding: "",
     xmlStandalone: false,
@@ -92,17 +92,17 @@ var Node = {
     cloneNode: function (deep) {}, //Node
     compareDocumentPosition: function (other) {}, //Node
     firstChild: {}, //Node
-    getFeature: function (feature,version) {}, //Object
-    getUserData: function (key) {}, //Object
-    hasAttributes: function () {}, //Boolean
-    hasChildNodes: function () {}, //Boolean
-    isDefaultNamespace: function (namespaceURI) {}, //String
-    isEqualNode: function (arg) {}, //Boolean
-    isSameNode: function (other) {}, //Boolean
-    isSupported: function (feature,version) {}, //Boolean
-    lookupNamespaceURI: function (prefix) {}, //String
-    lookupPrefix: function (namespaceURI) {}, //String
-    insertBefore: function (newChild,refChild) {}, //Node
+    getFeature: function (feature, version) { return {}; },
+    getUserData: function (key) { return {}; },
+    hasAttributes: function () { return false; },
+    hasChildNodes: function () { return false; },
+    isDefaultNamespace: function (namespaceURI) { return ""; },
+    isEqualNode: function (arg) { return false; },
+    isSameNode: function (other) { return false; },
+    isSupported: function (feature, version) { return false; },
+    lookupNamespaceURI: function (prefix) { return ""; },
+    lookupPrefix: function (namespaceURI) { return ""; },
+    insertBefore: function (newChild, refChild) { return {}; }, //Node
     lastChild: {}, //Node
     localName: "",
     nodeName: "",
@@ -110,14 +110,14 @@ var Node = {
     nodeType: 0,
     namespaceURI: "",
     nextSibling: {}, //Node
-    normalize: function () {}, //Object
+    normalize: function () { return {}; },
     ownerDocument: {}, //Document
     parentNode: {}, //Node
     prefix: "",
     previousSibling: {}, //Node
-    replaceChild: function (newChild,refChild) {}, //Node
-    removeChild: function (oldChild) {}, //Node
-    setUserData: function (key,data,handler) {}, //Object
+    replaceChild: function (newChild, refChild) { return {}; }, //Node
+    removeChild: function (oldChild) { return {}; }, //Node
+    setUserData: function (key, data, handler) { return {}; },
     textContent: "",
 };
 
@@ -128,23 +128,23 @@ var NodeList = {
 
 var NamedNodeMap = {
     length: 0,
-    getNamedItem: function (name) {}, //Node
-    setNamedItem: function (arg) {}, //Node
-    removeNamedItem: function (name) {}, //Node
-    item: function (index) {}, //Node
-    getNamedItemNS: function (namespaceURI, localName) {}, //Node
-    setNamedItemNS: function (arg) {}, //Node
-    removeNamedItemNS: function (namespaceURI, localName) {}, //Node
+    getNamedItem: function (name) { return {}; }, //Node
+    setNamedItem: function (arg) { return {}; }, //Node
+    removeNamedItem: function (name) { return {}; }, //Node
+    item: function (index) { return {}; }, //Node
+    getNamedItemNS: function (namespaceURI, localName) { return {}; }, //Node
+    setNamedItemNS: function (arg) { return {}; }, //Node
+    removeNamedItemNS: function (namespaceURI, localName) { return {}; }, //Node
 };
 
 var CharacterData = {
     data: "",
     length: 0,
-    substringData: function (offset,count) {}, //String
-    appendData: function (arg) {}, //Object
-    insertData: function (offset,arg) {}, //Object
-    deleteData: function (offset,count) {}, //Object
-    replaceData: function (offset,count,arg) {}, //Object
+    substringData: function (offset,count) { return ""; },
+    appendData: function (arg) { return {}; },
+    insertData: function (offset,arg) { return {}; },
+    deleteData: function (offset,count) { return {}; },
+    replaceData: function (offset,count,arg) { return {}; },
 };
 CharacterData.prototype = new Node();
 
@@ -159,33 +159,33 @@ var Attr = {
 Attr.prototype = new Node();
 
 var Element = {
-    getAttribute: function (name) {}, //String
-    getAttributeNode: function (name) {}, //Attr
-    getAttributeNodeNS: function (namespaceURI,localName) {}, //Object
-    getAttributeNS: function (namespaceURI, localName) {}, //String
-    getElementsByTagName: function (name) {}, //NodeList
-    getElementsByTagNameNS: function (namespaceURI, localName) {}, //NodeList
-    hasAttribute: function (name) {}, //Boolean
-    hasAttributeNS: function (namespaceURI, localName) {}, //Boolean
-    removeAttribute: function (name) {}, //Object
+    getAttribute: function (name) { return ""; },
+    getAttributeNode: function (name) { return {}; }, //Attr
+    getAttributeNodeNS: function (namespaceURI, localName) { return {}; },
+    getAttributeNS: function (namespaceURI, localName) { return ""; },
+    getElementsByTagName: function (name) { return {}; }, //NodeList
+    getElementsByTagNameNS: function (namespaceURI, localName) { return {}; }, //NodeList
+    hasAttribute: function (name) { return false; },
+    hasAttributeNS: function (namespaceURI, localName) { return false; },
+    removeAttribute: function (name) { return {}; },
     removeAttributeNode: function (oldAttr) {}, //Attr
-    removeAttributeNS: function (namespaceURI,localName) {}, //Object
+    removeAttributeNS: function (namespaceURI, localName) { return {}; },
     schemaTypeInfo: {}, //TypeInfo
-    setAttribute: function (name,value) {}, //Object
-    setAttributeNode: function (newAttr) {}, //Attr
-    setAttributeNodeNS: function (newAttr) {}, //Object
-    setAttributeNS: function (namespaceURI, qualifiedName, value) {}, //Object
-    setIdAttribute: function (name, isId) {}, //Object
-    setIdAttributeNode: function (idAttr, isId) {}, //Object
-    setIdAttributeNS: function (namespaceURI, localName, isId) {}, //Object
+    setAttribute: function (name,value) { return {}; },
+    setAttributeNode: function (newAttr) { return {}; }, //Attr
+    setAttributeNodeNS: function (newAttr) { return {}; },
+    setAttributeNS: function (namespaceURI, qualifiedName, value) { return {}; },
+    setIdAttribute: function (name, isId) { return {}; },
+    setIdAttributeNode: function (idAttr, isId) { return {}; },
+    setIdAttributeNS: function (namespaceURI, localName, isId) { return {}; },
     tagName: "",
 };
 Element.prototype = new Node();
 
 var Text = {
     isElementContentWhitespace: false,
-    replaceWholeText: function (content) {}, //Text
-    splitText: function (offset) {}, //Text
+    replaceWholeText: function (content) { return {}; }, //Text
+    splitText: function (offset) { return {}; }, //Text
     wholeText: "",
 };
 Text.prototype = new CharacterData();
@@ -194,13 +194,13 @@ var Comment = {};
 Comment.prototype = new CharacterData();
 
 var TypeInfo = {
-    isDerivedFrom: function (typeNamespaceArg, typeNameArg, derivationMethod) {}, //Boolean
+    isDerivedFrom: function (typeNamespaceArg, typeNameArg, derivationMethod) { return false; },
     typeName: "",
     typeNamespace: "",
 };
 
 var UserDataHandler = {
-    handle: function (param1, param2, param3, param4, param5) {}, //Object
+    handle: function (param1, param2, param3, param4, param5) { return {}; },
 };
 
 var DOMError = {
@@ -213,7 +213,7 @@ var DOMError = {
 };
 
 var DOMErrorHandler = {
-    handler: function (error) {}, //Boolean
+    handler: function (error) { return false; },
 };
 
 var DOMLocator = {
@@ -226,10 +226,10 @@ var DOMLocator = {
 };
 
 var DOMConfiguration = {
-    canSetParameter: function (name, value) {}, //Boolean
-    getParameter: function (name) {}, //Object
+    canSetParameter: function (name, value) { return false; },
+    getParameter: function (name) { return {}; },
     parameterNames: 0, //DOMStringList
-    setParameter: function (name, value) {}, //Object
+    setParameter: function (name, value) { return {}; },
 };
 
 var CDATASection = {};
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMEvents.js b/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
index b77a1c78..157cea18 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMEvents.js
@@ -1,33 +1,33 @@
 var Event = {
-    currentTarget: 0, //Gecko,EventTarget
+    currentTarget: {}, //Gecko,EventTarget
     bubbles: false, //Gecko
     cancelable: false, //Gecko
     eventPhase: 0, //Gecko
-    initEvent: function (eventTypeArg, canBubbleArg, cancelableArg) {}, //Gecko,Object
-    initEventNS: function (namespaceURIArg, eventTypeArg, canBubbleArg, cancelableArg) {}, //Gecko,Object
-    isCustom: function () {}, //Gecko,Boolean
-    isDefaultPrevented: function () {}, //Gecko,Boolean
+    initEvent: function (eventTypeArg, canBubbleArg, cancelableArg) { return {}; }, //Gecko
+    initEventNS: function (namespaceURIArg, eventTypeArg, canBubbleArg, cancelableArg) { return {}; }, //Gecko
+    isCustom: function () { return false; }, //Gecko
+    isDefaultPrevented: function () { return false; }, //Gecko
     namespaceURI: "", //Gecko
-    preventDefault: function () {}, //Gecko,Object
-    stopImmediatePropagation: function () {}, //Gecko,Object
-    stopPropagation: function () {}, //Gecko,Object
-    target: 0, //Gecko,EventTarget
+    preventDefault: function () { return {}; }, //Gecko
+    stopImmediatePropagation: function () { return {}; }, //Gecko
+    stopPropagation: function () { return {}; }, //Gecko
+    target: {}, //Gecko,EventTarget
     timeStamp: 0, //Gecko
     type: "", //Gecko
 };
 
 var EventTarget = {
-    addEventListener: function (type,listener,useCapture) {}, //Gecko,Object
-    addEventListenerNS: function (namespaceURI, type, listener, useCapture, evtGroup) {}, //Gecko,Object
-    dispatchEvent: function (evt) {}, //Gecko,Boolean
-    hasEventListenerNS: function (namespaceURI, type) {}, //Gecko,Boolean
-    removeEventListener: function (type,listener,useCapture) {}, //Gecko,Object
-    removeEventListenerNS: function (namespaceURI, type, listener, useCapture) {}, //Gecko,Object
-    willTriggerNS: function (namespaceURI, type) {}, //Gecko,Boolean
+    addEventListener: function (type,listener,useCapture) { return {}; }, //Gecko
+    addEventListenerNS: function (namespaceURI, type, listener, useCapture, evtGroup) { return {}; }, //Gecko
+    dispatchEvent: function (evt) { return false; }, //Gecko
+    hasEventListenerNS: function (namespaceURI, type) { return false; }, //Gecko
+    removeEventListener: function (type,listener,useCapture) { return {}; }, //Gecko
+    removeEventListenerNS: function (namespaceURI, type, listener, useCapture) { return {}; }, //Gecko
+    willTriggerNS: function (namespaceURI, type) { return false; }, //Gecko
 };
 
 var EventListener = {
-    handleEvent: function (evt) {}, //Gecko,Object
+    handleEvent: function (evt) { return {}; }, //Gecko
 };
 
 var EventException = {
@@ -35,29 +35,29 @@ var EventException = {
 };
 
 var DocumentEvent = {
-    canDispatch: function (namespaceURI, type) {}, //Gecko,String
-    createEvent: function (eventType) {}, //Gecko,Event
+    canDispatch: function (namespaceURI, type) { return ""; }, //Gecko
+    createEvent: function (eventType) { return {}; }, //Gecko,Event
 };
 
 var CustomEvent = {
-    isImmediatePropagationStopped: function () {}, //Gecko,Boolean
-    isPropagationStopped: function () {}, //Gecko,Boolean
-    setDispatchState: function (target, phase) {}, //Gecko,Object
+    isImmediatePropagationStopped: function () { return false; }, //Gecko
+    isPropagationStopped: function () { return false; }, //Gecko
+    setDispatchState: function (target, phase) { return {}; }, //Gecko
 };
 CustomEvent.prototype = new Event();
 
 var UIEvent = {
     detail: 0, //Gecko
-    initUIEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, detailArg) {}, //Gecko,Object
-    initUIEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, detailArg) {}, //Gecko,Object
+    initUIEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, detailArg) { return {}; }, //Gecko
+    initUIEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, detailArg) { return {}; }, //Gecko
     view: {}, //Gecko,AbstractView
 };
 UIEvent.prototype = new Event();
 
 var TextEvent = {
     data: "", //Gecko
-    initTextEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, dataArg) {}, //Gecko,Object
-    initTextEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, dataArg) {}, //Gecko,Object
+    initTextEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, dataArg) { return {}; }, //Gecko
+    initTextEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, dataArg) { return {}; }, //Gecko
 };
 TextEvent.prototype = new UIEvent();
 
@@ -67,9 +67,9 @@ var MouseEvent = {
     clientX: 0, //Gecko
     clientY: 0, //Gecko
     ctrlKey: false, //Gecko
-    getModifierState: function (keyIdentifierArg) {}, //Gecko,Boolean
-    initMouseEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg) {}, //Gecko,Object
-    initMouseEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg) {}, //Gecko,Object
+    getModifierState: function (keyIdentifierArg) { return false; }, //Gecko
+    initMouseEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg) { return {}; }, //Gecko
+    initMouseEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg) { return {}; }, //Gecko
     metaKey: false, //Gecko
     screenX: 0, //Gecko
     screenY: 0, //Gecko
@@ -81,9 +81,9 @@ MouseEvent.prototype = new UIEvent();
 var KeyboardEvent = {
     altKey: false, //Gecko
     ctrlKey: false, //Gecko
-    getModifierState: function (keyIdentifierArg) {}, //Gecko,Boolean
-    initKeyboardEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, keyIdentifierArg, keyLocationArg, modifiersList) {}, //Gecko,Object
-    initKeyboardEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, keyIdentifierArg, keyLocationArg, modifiersList) {}, //Gecko,Object
+    getModifierState: function (keyIdentifierArg) { return false; }, //Gecko
+    initKeyboardEvent: function (typeArg, canBubbleArg, cancelableArg, viewArg, keyIdentifierArg, keyLocationArg, modifiersList) { return {}; }, //Gecko
+    initKeyboardEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, viewArg, keyIdentifierArg, keyLocationArg, modifiersList) { return {}; }, //Gecko
     keyIdentifier: "", //Gecko
     keyLocation: 0, //Gecko
     metaKey: false, //Gecko
@@ -94,8 +94,8 @@ KeyboardEvent.prototype = new UIEvent();
 var MutationEvent = {
     attrChange: 0, //Gecko
     attrName: "", //Gecko
-    initMutationEvent: function (typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevValueArg, newValueArg, attrNameArg, attrChangeArg) {}, //Gecko,Object
-    initMutationEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevValueArg, newValueArg, attrNameArg, attrChangeArg) {}, //Gecko,Object
+    initMutationEvent: function (typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevValueArg, newValueArg, attrNameArg, attrChangeArg) { return {}; }, //Gecko
+    initMutationEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevValueArg, newValueArg, attrNameArg, attrChangeArg) { return {}; }, //Gecko
     newValue: "", //Gecko
     prevValue: "", //Gecko
     relatedNode: {}, //Gecko,Node
@@ -103,8 +103,8 @@ var MutationEvent = {
 MutationEvent.prototype = new UIEvent();
 
 var MutationNameEvent = {
-    initMutationNameEvent: function (typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevNamespaceURIArg, prevNodeNameArg) {}, //Gecko,Object
-    initMutationNameEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevNamespaceURIArg, prevNodeNameArg) {}, //Gecko,Object
+    initMutationNameEvent: function (typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevNamespaceURIArg, prevNodeNameArg) { return {}; }, //Gecko
+    initMutationNameEventNS: function (namespaceURI, typeArg, canBubbleArg, cancelableArg, relatedNodeArg, prevNamespaceURIArg, prevNodeNameArg) { return {}; }, //Gecko
     prevNamespaceURI: "", //Gecko
     prevNodeName: "", //Gecko
 };
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js b/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
index a9bd71b5..3b4d4e53 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMTraversalAndRange.js
@@ -1,62 +1,62 @@
 var NodeIterator = {
-    detach: function () {}, //Object
+    detach: function () { return {}; },
     expandEntityReferences: false,
     filter: {}, //NodeFilter
-    nextNode: function () {}, //Node
-    previousNode: function () {}, //Node
+    nextNode: function () { return {}; }, //Node
+    previousNode: function () { return {}; }, //Node
     root: {}, //Node
     whatToShow: 0,
 };
 
 var NodeFilter = {
-    NodeFilter: function (param) {}, //Number
+    NodeFilter: function (param) { return 0; },
 };
 
 var TreeWalker = {
-    firstChild: function () {}, //Node
-    lastChild: function () {}, //Node
-    nextNode: function () {}, //Node
-    nextSibling: function () {}, //Node
-    parentNode: function () {}, //Node
-    previousNode: function () {}, //Node
-    previousSibling: function () {}, //Node
+    firstChild: function () { return {}; }, //Node
+    lastChild: function () { return {}; }, //Node
+    nextNode: function () { return {}; }, //Node
+    nextSibling: function () { return {}; }, //Node
+    parentNode: function () { return {}; }, //Node
+    previousNode: function () { return {}; }, //Node
+    previousSibling: function () { return {}; }, //Node
 };
 
 var DocumentTraversal = {
-    createNodeIterator: function (root, whatToShow, filter, entityReferenceExpansion) {}, //NodeIterator
-    createTreeWalker: function (root, whatToShow, filter, entityReferenceExpansion) {}, //TreeWalker
+    createNodeIterator: function (root, whatToShow, filter, entityReferenceExpansion) { return {}; }, //NodeIterator
+    createTreeWalker: function (root, whatToShow, filter, entityReferenceExpansion) { return {}; }, //TreeWalker
 };
 
 var Range = {
-    cloneContents: function () {}, //DocumentFragment
-    cloneRange: function () {}, //Range
-    collapse: function (toStart) {}, //Object
+    cloneContents: function () { return {}; }, //DocumentFragment
+    cloneRange: function () { return {}; }, //Range
+    collapse: function (toStart) { return {}; },
     collapsed: false,
     commonAncestorContainer: {}, //Node
-    compareBoundaryPoints: function (how,sourceRange) {}, //short
-    createContextualFragment: function (tagString) {}, //Gecko,Object
-    deleteContents: function () {}, //Object
-    detach: function () {}, //Object
+    compareBoundaryPoints: function (how, sourceRange) { return 0; },
+    createContextualFragment: function (tagString) { return {}; }, //Gecko
+    deleteContents: function () { return {}; },
+    detach: function () { return {}; },
     endContainer: {}, //Node
     endOffset: 0,
-    extractContents: function () {}, //DocumentFragment
-    insertNode: function (newNode) {}, //Object
-    selectNode: function (refNode) {}, //Object
-    selectNodeContents: function (refNode) {}, //Object
-    setEnd: function (refNode,offset) {}, //Object
-    setEndAfter: function (refNode) {}, //Object
-    setEndBefore: function (refNode) {}, //Object
-    setStart: function (refNode, offset) {}, //Object
-    setStartAfter: function (refNode) {}, //Object
-    setStartBefore: function (refNode) {}, //Object
+    extractContents: function () { return {}; }, //DocumentFragment
+    insertNode: function (newNode) { return {}; },
+    selectNode: function (refNode) { return {}; },
+    selectNodeContents: function (refNode) { return {}; },
+    setEnd: function (refNode,offset) { return {}; },
+    setEndAfter: function (refNode) { return {}; },
+    setEndBefore: function (refNode) { return {}; },
+    setStart: function (refNode, offset) { return {}; },
+    setStartAfter: function (refNode) { return {}; },
+    setStartBefore: function (refNode) { return {}; },
     startContainer: {}, //Node
     startOffset: 0,
-    surroundContents: function (newParent) {}, //Object
-    toString: function () {}, //String
+    surroundContents: function (newParent) { return {}; },
+    toString: function () { return ""; },
 };
 
 var DocumentRange = {
-    createRange: function () {}, //Range
+    createRange: function () { return {}; }, //Range
 };
 
 var RangeException = {
diff --git a/plugin/src/main/dist/sdk/clientAny/DOMXPath.js b/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
index 0e199350..94f70458 100644
--- a/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
+++ b/plugin/src/main/dist/sdk/clientAny/DOMXPath.js
@@ -3,17 +3,17 @@ var XPathException = {
 };
 
 var XPathEvaluator = {
-    createExpression: function (expression, resolver) {}, //Gecko,XPathExpression
-    createNSResolver: function (nodeResolver) {}, //Gecko,XPathNSResolver
-    evaluate: function (expression, contextNode, resolver, type, result) {}, //Gecko,Object
+    createExpression: function (expression, resolver) { return {}; }, //Gecko,XPathExpression
+    createNSResolver: function (nodeResolver) { return {}; }, //Gecko,XPathNSResolver
+    evaluate: function (expression, contextNode, resolver, type, result) { return {}; }, //Gecko
 };
 
 var XPathExpression = {
-    evaluate: function (contextNode, type, result) {}, //Gecko,Object
+    evaluate: function (contextNode, type, result) { return {}; }, //Gecko
 };
 
 var XPathNSResolver = {
-    lookupNamespaceURI: function (prefix) {}, //Gecko,String
+    lookupNamespaceURI: function (prefix) { return ""; }, //Gecko
 };
 
 var XPathResult = {
@@ -23,14 +23,14 @@ var XPathResult = {
     booleanValue: false, //Gecko
     FIRST_ORDERED_NODE_TYPE: 0, //Gecko
     invalidIteratorState: false, //Gecko
-    iterateNext: function () {}, //Gecko,Node
+    iterateNext: function () { return {}; }, //Gecko,Node
     NUMBER_TYPE: 0, //Gecko
     numberValue: 0, //Gecko
     ORDERED_NODE_ITERATOR_TYPE: 0, //Gecko
     ORDERED_NODE_SNAPSHOT_TYPE: 0, //Gecko
     resultType: 0, //Gecko
     singleNodeValue: {}, //Gecko,Node
-    snapshotItem: function (index) {}, //Gecko,Node
+    snapshotItem: function (index) { return {}; }, //Gecko,Node
     snapshotLength: 0, //Gecko
     STRING_TYPE: 0, //Gecko
     stringValue: "", //Gecko

From fc1a4642c1a393ecdff0b4eb02e584ecf68134a0 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 31 Dec 2024 14:26:16 +0400
Subject: [PATCH 252/340] npe fix

---
 ...ImportECMAScriptClassOrFunctionAction.java | 486 ++++++++----------
 1 file changed, 222 insertions(+), 264 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
index b513e007..d04ec5de 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -47,9 +47,10 @@
 import consulo.undoRedo.CommandProcessor;
 import consulo.util.collection.Sets;
 import consulo.util.collection.SmartList;
+import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -59,269 +60,226 @@
  * Date: Apr 25, 2008
  * Time: 8:36:38 PM
  */
-public class AddImportECMAScriptClassOrFunctionAction implements HintAction, QuestionAction, LocalQuickFix
-{
-	private final PsiPolyVariantReference myReference;
-	private Editor myEditor;
-	private boolean isAvailable;
-	private boolean isAvailableCalculated;
-	private long modificationCount = -1;
-	private String calculatedClass;
-	@NonNls
-	private static final String HAS_MORE_SUFFIX = ", ...";
-	private boolean isFunction;
-
-	public AddImportECMAScriptClassOrFunctionAction(Editor editor, final PsiPolyVariantReference psiReference)
-	{
-		myReference = psiReference;
-		myEditor = editor;
-	}
-
-	@Override
-	public boolean showHint(final Editor editor)
-	{
-		myEditor = editor;
-		final PsiElement element = myReference.getElement();
-		TextRange textRange = InjectedLanguageManager.getInstance(element.getProject()).injectedToHost(element, element.getTextRange());
-		HintManager.getInstance().showQuestionHint(editor, getText(), textRange.getStartOffset(), textRange.getEndOffset(), this);
-		return true;
-	}
-
-	@Override
-	@Nonnull
-	public String getText()
-	{
-		return isFunction 
-			? JavaScriptLocalize.flexImportFunction(calculatedClass).get() 
-			: JavaScriptLocalize.flexImportClass(calculatedClass).get();
-	}
-
-	@Override
-	@Nonnull
-	public String getName()
-	{
-		return getText();
-	}
-
-	@Override
-	@Nonnull
-	public String getFamilyName()
-	{
-		return getText();
-	}
-
-	@Override
-	public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
-	{
-		invoke(project, myEditor, descriptor.getPsiElement().getContainingFile());
-	}
-
-	@Override
-	public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file)
-	{
-		if (!myReference.getElement().isValid())
-		{
-			return false;
-		}
-		final long modL = myReference.getElement().getManager().getModificationTracker().getModificationCount();
-
-		if (!isAvailableCalculated || modL != modificationCount)
-		{
-			final ResolveResult[] results = myReference.multiResolve(false);
-			boolean hasValidResult = false;
-
-			for (ResolveResult r : results)
-			{
-				if (r.isValidResult())
-				{
-					hasValidResult = true;
-					break;
-				}
-			}
-
-			if (!hasValidResult)
-			{
-				final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
-
-				isAvailableCalculated = true;
-				isAvailable = candidates.size() > 0;
-				if (isAvailable)
-				{
-					final JSQualifiedNamedElement element = candidates.iterator().next();
-					calculatedClass = element.getQualifiedName();
-					isFunction = element instanceof JSFunction;
-					if (candidates.size() > 1)
-					{
-						calculatedClass += HAS_MORE_SUFFIX;
-					}
-				}
-				else
-				{
-					calculatedClass = "";
-				}
-			}
-			else
-			{
-				isAvailableCalculated = true;
-				isAvailable = false;
-			}
-
-			modificationCount = modL;
-		}
-
-		return isAvailable;
-	}
-
-	private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile file)
-	{
-		final Collection<JSQualifiedNamedElement> candidates;
-
-		if (myReference instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() == null)
-		{
-			Collection<JSQualifiedNamedElement> c = getCandidates(editor, file, myReference.getCanonicalText());
-			filterDefaultPackage(c);
-			candidates = Sets.newHashSet(c, JSPsiImplUtils.QUALIFIED_NAME_HASHING_STRATEGY);
-		}
-		else
-		{
-			JSQualifiedNamedElement invalidResult = null;
-
-			for (ResolveResult r : myReference.multiResolve(false))
-			{
-				PsiElement element = r.getElement();
-				if (element instanceof JSQualifiedNamedElement)
-				{
-					invalidResult = (JSQualifiedNamedElement) element;
-				}
-			}
-			if (invalidResult != null)
-			{
-				candidates = new SmartList<JSQualifiedNamedElement>();
-				candidates.add(invalidResult);
-			}
-			else
-			{
-				candidates = Collections.emptyList();
-			}
-		}
-		return candidates;
-	}
-
-	public static Collection<JSQualifiedNamedElement> getCandidates(final Editor editor, final PsiFile file, final String name)
-	{
-		final Module element = ModuleUtilCore.findModuleForPsiElement(file);
-		if (element != null)
-		{
-			return JSResolveUtil.findElementsByName(
-				name,
-				editor.getProject(),
-				GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(element, false)
-			);
-		}
-		else
-		{
-			return Collections.emptyList();
-		}
-	}
-
-	@Override
-	public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
-	{
-		final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
-
-		if (candidates.size() > 0)
-		{
-			if (candidates.size() > 1)
-			{
-				JBPopup popup = PopupNavigationUtil.getPsiElementPopup(
-					candidates.toArray(new JSQualifiedNamedElement[candidates.size()]),
-					new PsiElementListCellRenderer<>()
-					{
-						@Override
-						public String getElementText(final JSQualifiedNamedElement element)
-						{
-							return element.getName();
-						}
-
-						@Override
-						protected String getContainerText(final JSQualifiedNamedElement element, final String name)
-						{
-							final String qName = element.getQualifiedName();
-							final String elementName = element.getName();
-							String s = qName.equals(elementName) ? "" : qName.substring(0, qName.length() - elementName.length() - 1);
-							if ("".equals(s))
-							{
-								s = element.getContainingFile().getName();
-							}
-							return "( " + s + " )";
-						}
-
-						@Override
-						protected int getIconFlags()
-						{
-							return 0;
-						}
-					},
-					JavaScriptLocalize.chooseClassTitle().get(),
-					new PsiElementProcessor<>()
-					{
-						@Override
-						public boolean execute(final JSQualifiedNamedElement element)
-						{
-							CommandProcessor.getInstance().executeCommand(
-								project,
-								() -> doImport(editor, element.getQualifiedName()),
-								getClass().getName(),
-								this
-							);
-
-							return false;
-						}
-					}
-				);
-
-				EditorPopupHelper.getInstance().showPopupInBestPositionFor(editor, popup);
-			}
-			else
-			{
-				doImport(editor, candidates.iterator().next().getQualifiedName());
-			}
-		}
-	}
-
-	private void doImport(final Editor editor, final String qName)
-	{
-		ApplicationManager.getApplication().runWriteAction(() -> {
-			final PsiElement element = myReference.getElement();
-			ImportUtils.doImport(element, qName);
-		});
-	}
-
-	@Override
-	public boolean startInWriteAction()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean execute()
-	{
-		final PsiFile containingFile = myReference.getElement().getContainingFile();
-		invoke(containingFile.getProject(), myEditor, containingFile);
-
-		return true;
-	}
-
-	private static void filterDefaultPackage(Collection<JSQualifiedNamedElement> candidates)
-	{
-		for (Iterator<JSQualifiedNamedElement> i = candidates.iterator(); i.hasNext(); )
-		{
-			if (!i.next().getQualifiedName().contains("."))
-			{
-				i.remove();
-			}
-		}
-	}
+public class AddImportECMAScriptClassOrFunctionAction implements HintAction, QuestionAction, LocalQuickFix {
+    private final PsiPolyVariantReference myReference;
+    private Editor myEditor;
+    private boolean isAvailable;
+    private boolean isAvailableCalculated;
+    private long modificationCount = -1;
+    private String calculatedClass;
+    @NonNls
+    private static final String HAS_MORE_SUFFIX = ", ...";
+    private boolean isFunction;
+
+    public AddImportECMAScriptClassOrFunctionAction(Editor editor, final PsiPolyVariantReference psiReference) {
+        myReference = psiReference;
+        myEditor = editor;
+    }
+
+    @Override
+    public boolean showHint(final Editor editor) {
+        myEditor = editor;
+        final PsiElement element = myReference.getElement();
+        TextRange textRange = InjectedLanguageManager.getInstance(element.getProject()).injectedToHost(element, element.getTextRange());
+        HintManager.getInstance().showQuestionHint(editor, getText(), textRange.getStartOffset(), textRange.getEndOffset(), this);
+        return true;
+    }
+
+    @Override
+    @Nonnull
+    public String getText() {
+        String className = StringUtil.notNullize(calculatedClass);
+        return isFunction
+            ? JavaScriptLocalize.flexImportFunction(className).get()
+            : JavaScriptLocalize.flexImportClass(className).get();
+    }
+
+    @Override
+    @Nonnull
+    public String getName() {
+        return getText();
+    }
+
+    @Override
+    @Nonnull
+    public String getFamilyName() {
+        return getText();
+    }
+
+    @Override
+    public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
+        invoke(project, myEditor, descriptor.getPsiElement().getContainingFile());
+    }
+
+    @Override
+    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+        if (!myReference.getElement().isValid()) {
+            return false;
+        }
+        final long modL = myReference.getElement().getManager().getModificationTracker().getModificationCount();
+
+        if (!isAvailableCalculated || modL != modificationCount) {
+            final ResolveResult[] results = myReference.multiResolve(false);
+            boolean hasValidResult = false;
+
+            for (ResolveResult r : results) {
+                if (r.isValidResult()) {
+                    hasValidResult = true;
+                    break;
+                }
+            }
+
+            if (!hasValidResult) {
+                final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
+
+                isAvailableCalculated = true;
+                isAvailable = candidates.size() > 0;
+                if (isAvailable) {
+                    final JSQualifiedNamedElement element = candidates.iterator().next();
+                    calculatedClass = element.getQualifiedName();
+                    isFunction = element instanceof JSFunction;
+                    if (candidates.size() > 1) {
+                        calculatedClass += HAS_MORE_SUFFIX;
+                    }
+                }
+                else {
+                    calculatedClass = "";
+                }
+            }
+            else {
+                isAvailableCalculated = true;
+                isAvailable = false;
+            }
+
+            modificationCount = modL;
+        }
+
+        return isAvailable;
+    }
+
+    private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile file) {
+        final Collection<JSQualifiedNamedElement> candidates;
+
+        if (myReference instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() == null) {
+            Collection<JSQualifiedNamedElement> c = getCandidates(editor, file, myReference.getCanonicalText());
+            filterDefaultPackage(c);
+            candidates = Sets.newHashSet(c, JSPsiImplUtils.QUALIFIED_NAME_HASHING_STRATEGY);
+        }
+        else {
+            JSQualifiedNamedElement invalidResult = null;
+
+            for (ResolveResult r : myReference.multiResolve(false)) {
+                PsiElement element = r.getElement();
+                if (element instanceof JSQualifiedNamedElement) {
+                    invalidResult = (JSQualifiedNamedElement) element;
+                }
+            }
+            if (invalidResult != null) {
+                candidates = new SmartList<JSQualifiedNamedElement>();
+                candidates.add(invalidResult);
+            }
+            else {
+                candidates = Collections.emptyList();
+            }
+        }
+        return candidates;
+    }
+
+    public static Collection<JSQualifiedNamedElement> getCandidates(final Editor editor, final PsiFile file, final String name) {
+        final Module element = ModuleUtilCore.findModuleForPsiElement(file);
+        if (element != null) {
+            return JSResolveUtil.findElementsByName(
+                name,
+                editor.getProject(),
+                GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(element, false)
+            );
+        }
+        else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+        final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
+
+        if (candidates.size() > 0) {
+            if (candidates.size() > 1) {
+                JBPopup popup = PopupNavigationUtil.getPsiElementPopup(
+                    candidates.toArray(new JSQualifiedNamedElement[candidates.size()]),
+                    new PsiElementListCellRenderer<>() {
+                        @Override
+                        public String getElementText(final JSQualifiedNamedElement element) {
+                            return element.getName();
+                        }
+
+                        @Override
+                        protected String getContainerText(final JSQualifiedNamedElement element, final String name) {
+                            final String qName = element.getQualifiedName();
+                            final String elementName = element.getName();
+                            String s = qName.equals(elementName) ? "" : qName.substring(0, qName.length() - elementName.length() - 1);
+                            if ("".equals(s)) {
+                                s = element.getContainingFile().getName();
+                            }
+                            return "( " + s + " )";
+                        }
+
+                        @Override
+                        protected int getIconFlags() {
+                            return 0;
+                        }
+                    },
+                    JavaScriptLocalize.chooseClassTitle().get(),
+                    new PsiElementProcessor<>() {
+                        @Override
+                        public boolean execute(final JSQualifiedNamedElement element) {
+                            CommandProcessor.getInstance().executeCommand(
+                                project,
+                                () -> doImport(editor, element.getQualifiedName()),
+                                getClass().getName(),
+                                this
+                            );
+
+                            return false;
+                        }
+                    }
+                );
+
+                EditorPopupHelper.getInstance().showPopupInBestPositionFor(editor, popup);
+            }
+            else {
+                doImport(editor, candidates.iterator().next().getQualifiedName());
+            }
+        }
+    }
+
+    private void doImport(final Editor editor, final String qName) {
+        ApplicationManager.getApplication().runWriteAction(() -> {
+            final PsiElement element = myReference.getElement();
+            ImportUtils.doImport(element, qName);
+        });
+    }
+
+    @Override
+    public boolean startInWriteAction() {
+        return false;
+    }
+
+    @Override
+    public boolean execute() {
+        final PsiFile containingFile = myReference.getElement().getContainingFile();
+        invoke(containingFile.getProject(), myEditor, containingFile);
+
+        return true;
+    }
+
+    private static void filterDefaultPackage(Collection<JSQualifiedNamedElement> candidates) {
+        for (Iterator<JSQualifiedNamedElement> i = candidates.iterator(); i.hasNext(); ) {
+            if (!i.next().getQualifiedName().contains(".")) {
+                i.remove();
+            }
+        }
+    }
 
 
 }

From dc8f156c0ec5c71b1441106487401762748b4259 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 31 Dec 2024 16:52:05 +0400
Subject: [PATCH 253/340] better completion for qualified refs with new sdk

---
 .../language/psi/JavaScriptType.java          | 43 ++++++-------
 .../psi/impl/JSNewExpressionImpl.java         | 22 ++++---
 .../psi/impl/JSVariableBaseImpl.java          | 26 ++++----
 .../psi/impl}/JavaScriptSimpleType.java       | 64 +++++++++----------
 .../psi/resolve/BaseJSSymbolProcessor.java    |  7 ++
 plugin/src/main/java/module-info.java         |  1 -
 6 files changed, 84 insertions(+), 79 deletions(-)
 rename {plugin/src/main/java/consulo/javascript/impl/lang/psi => base-impl/src/main/java/com/intellij/lang/javascript/psi/impl}/JavaScriptSimpleType.java (55%)

diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
index a729fdc2..5d0ed059 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
@@ -18,7 +18,6 @@
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -26,30 +25,26 @@
  * @author VISTALL
  * @since 13.12.2015
  */
-public interface JavaScriptType
-{
-	JavaScriptType UNKNOWN = new JavaScriptType()
-	{
-		@RequiredReadAction
-		@Nonnull
-		@Override
-		public String getPresentableText()
-		{
-			return "?";
-		}
+public interface JavaScriptType {
+    JavaScriptType UNKNOWN = new JavaScriptType() {
+        @RequiredReadAction
+        @Nonnull
+        @Override
+        public String getPresentableText() {
+            return "?";
+        }
 
-		@Nullable
-		@Override
-		public PsiElement getTargetElement()
-		{
-			return null;
-		}
-	};
+        @Nullable
+        @Override
+        public PsiElement getTargetElement() {
+            return null;
+        }
+    };
 
-	@Nonnull
-	@RequiredReadAction
-	String getPresentableText();
+    @Nonnull
+    @RequiredReadAction
+    String getPresentableText();
 
-	@Nullable
-	PsiElement getTargetElement();
+    @Nullable
+    PsiElement getTargetElement();
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index 60cd6afc..9374b6fd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -16,14 +16,13 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.*;
-import consulo.language.psi.PsiElement;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.lang.psi.impl.JavaScriptClassType;
-
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
 import jakarta.annotation.Nonnull;
 
 /**
@@ -44,10 +43,17 @@ public JSNewExpressionImpl(final ASTNode node) {
     public JavaScriptType getType() {
         JSExpression methodExpression = getMethodExpression();
 
-        return methodExpression instanceof JSReferenceExpression referenceExpression
-            && referenceExpression.resolve() instanceof JSClass jsClass
-            ? new JavaScriptClassType(jsClass)
-            : super.getType();
+        if (methodExpression instanceof JSReferenceExpression referenceExpression) {
+            PsiElement element = referenceExpression.resolve();
+            if (element instanceof JSClass jsClass) {
+                return new JavaScriptClassType(jsClass);
+            }
+
+            if (element instanceof JSVariable jsVar) {
+                return jsVar.getType();
+            }
+        }
+        return super.getType();
     }
 
     @Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index a11e06da..23faf150 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -17,28 +17,28 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import consulo.application.util.RecursionManager;
-import consulo.application.util.function.Computable;
-import consulo.content.scope.SearchScope;
-import consulo.javascript.impl.language.psi.JSStubElementType;
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
-import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
-import consulo.language.util.IncorrectOperationException;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.application.util.RecursionManager;
+import consulo.content.scope.SearchScope;
+import consulo.javascript.impl.language.psi.JSStubElementType;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
-
+import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 
+import java.util.function.Supplier;
+
 /**
  * Created by IntelliJ IDEA.
  * User: max
@@ -127,10 +127,14 @@ public void setInitializer(JSExpression expr) throws IncorrectOperationException
     public JavaScriptType getType() {
         final JSExpression initializer = getInitializer();
         if (initializer != null) {
-            JavaScriptType javaScriptType = RecursionManager.doPreventingRecursion(this, false, new Computable<JavaScriptType>() {
+            if (initializer instanceof JSObjectLiteralExpression lit) {
+                return new JavaScriptSimpleType(getName(), lit);
+            }
+            
+            JavaScriptType javaScriptType = RecursionManager.doPreventingRecursion(this, false, new Supplier<JavaScriptType>() {
                 @Override
                 @RequiredReadAction
-                public JavaScriptType compute() {
+                public JavaScriptType get() {
                     return initializer.getType();
                 }
             });
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java
similarity index 55%
rename from plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java
rename to base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java
index bd077848..3a816e02 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/psi/JavaScriptSimpleType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java
@@ -14,48 +14,42 @@
  * limitations under the License.
  */
 
-package consulo.javascript.impl.lang.psi;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+package com.intellij.lang.javascript.psi.impl;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
  * @since 13.12.2015
  */
-public class JavaScriptSimpleType implements JavaScriptType
-{
-	private String myReferenceName;
-	private PsiElement myElement;
-
-	public JavaScriptSimpleType(@Nonnull String referenceName, @Nullable PsiElement element)
-	{
-		myReferenceName = referenceName;
-		myElement = element;
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public String getPresentableText()
-	{
-		return myReferenceName;
-	}
-
-	@Nullable
-	@Override
-	public PsiElement getTargetElement()
-	{
-		return myElement;
-	}
-
-	@Override
-	public String toString()
-	{
-		return "JavaScriptSimpleType: " + myReferenceName;
-	}
+public class JavaScriptSimpleType implements JavaScriptType {
+    private String myReferenceName;
+    private PsiElement myElement;
+
+    public JavaScriptSimpleType(@Nonnull String referenceName, @Nullable PsiElement element) {
+        myReferenceName = referenceName;
+        myElement = element;
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public String getPresentableText() {
+        return myReferenceName;
+    }
+
+    @Nullable
+    @Override
+    public PsiElement getTargetElement() {
+        return myElement;
+    }
+
+    @Override
+    public String toString() {
+        return "JavaScriptSimpleType: " + myReferenceName;
+    }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index 36eec98e..708ead64 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -25,6 +25,7 @@
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.language.JavaScriptVersionUtil;
+import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 import consulo.language.inject.InjectedLanguageManager;
@@ -612,6 +613,12 @@ else if (rawQualifier instanceof JSSuperExpression) {
         else if (rawQualifier != null) {
             typeProcessor.setUnknownElement(rawQualifier);
         }
+
+        JavaScriptType type = rawQualifier.getType();
+        PsiElement targetElement = type.getTargetElement();
+        if (targetElement instanceof JSExpression jsTarget) {
+            doEvalForExpr(jsTarget, typeProcessor, context);
+        }
     }
 
     private static boolean isSomeFunctionCall(JSExpression rawqualifier, String parameterType) {
diff --git a/plugin/src/main/java/module-info.java b/plugin/src/main/java/module-info.java
index 1c88e8d9..c4d9dd24 100644
--- a/plugin/src/main/java/module-info.java
+++ b/plugin/src/main/java/module-info.java
@@ -46,7 +46,6 @@
 	exports consulo.javascript.impl.ide.navigationToolbar;
 	exports consulo.javascript.impl.lang;
 	exports consulo.javascript.impl.lang.navigation;
-	exports consulo.javascript.impl.lang.psi;
 	exports consulo.javascript.impl.psi.impl.reference;
 	exports com.intellij.lang.javascript.impl.validation;
 }
\ No newline at end of file

From 7f030c74fe61b10cfbd65fc7f3fe5c320bb2fb9f Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 4 Jan 2025 19:02:03 +0400
Subject: [PATCH 254/340] npe fix

---
 .../lang/javascript/psi/resolve/BaseJSSymbolProcessor.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index 708ead64..c29d2b05 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -614,8 +614,8 @@ else if (rawQualifier != null) {
             typeProcessor.setUnknownElement(rawQualifier);
         }
 
-        JavaScriptType type = rawQualifier.getType();
-        PsiElement targetElement = type.getTargetElement();
+        JavaScriptType type = rawQualifier == null ? null : rawQualifier.getType();
+        PsiElement targetElement = type == null ? null : type.getTargetElement();
         if (targetElement instanceof JSExpression jsTarget) {
             doEvalForExpr(jsTarget, typeProcessor, context);
         }

From 37191c89e5c75e5efe043f038600c6750385e9d1 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 6 Jan 2025 13:43:44 +0400
Subject: [PATCH 255/340] fix compile

---
 .../lang/javascript/impl/structureView/JSSuperGrouper.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
index 075719f0..a6d76e1c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
@@ -116,7 +116,7 @@ public ActionPresentation getPresentation()
     return new ActionPresentationData(
 			IdeLocalize.actionStructureviewGroupMethodsByDefiningType().get(),
 			null,
-			PlatformIconGroup.generalImplementingmethod()
+			PlatformIconGroup.gutterImplementingmethod()
 		);
 	}
 

From e27ebdf0990ccd3be2d00b8c21f9b64bca30c0da Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 11 Jan 2025 18:32:38 +0300
Subject: [PATCH 256/340] Reformatting com.intellij.lang.javascript.psi.

---
 .../lang/javascript/psi/JSArgumentList.java   |   5 +-
 .../psi/JSArrayLiteralExpression.java         |  13 +-
 .../psi/JSAssignmentExpression.java           |   3 +-
 .../lang/javascript/psi/JSAttribute.java      |  31 +-
 .../lang/javascript/psi/JSAttributeList.java  |  47 +-
 .../javascript/psi/JSAttributeListOwner.java  |   7 +-
 .../psi/JSAttributeNameValuePair.java         |  11 +-
 .../javascript/psi/JSBinaryExpression.java    |  26 +-
 .../lang/javascript/psi/JSBlockStatement.java |   5 +-
 .../lang/javascript/psi/JSBreakStatement.java |   7 +-
 .../lang/javascript/psi/JSCallExpression.java |   7 +-
 .../lang/javascript/psi/JSCaseClause.java     |   9 +-
 .../lang/javascript/psi/JSCatchBlock.java     |   9 +-
 .../intellij/lang/javascript/psi/JSClass.java |  33 +-
 .../javascript/psi/JSClassExpression.java     |   9 +-
 .../javascript/psi/JSCommaExpression.java     |   3 +-
 .../psi/JSConditionalExpression.java          |   9 +-
 .../javascript/psi/JSContinueStatement.java   |   7 +-
 .../psi/JSDefinitionExpression.java           |   5 +-
 .../psi/JSDestructuringElement.java           |  22 +-
 .../javascript/psi/JSDestructuringObject.java |  11 +-
 .../psi/JSDestructuringParameter.java         |   9 +-
 .../JSDestructuringShorthandedProperty.java   |   9 +-
 .../javascript/psi/JSDoWhileStatement.java    |   5 +-
 .../lang/javascript/psi/JSDocComment.java     |   5 +-
 .../lang/javascript/psi/JSDocTag.java         |   9 +-
 .../lang/javascript/psi/JSDocTagValue.java    |   4 +-
 .../lang/javascript/psi/JSElement.java        |   3 +-
 .../lang/javascript/psi/JSElementVisitor.java | 593 ++++++++----------
 .../lang/javascript/psi/JSEmptyStatement.java |   3 +-
 .../lang/javascript/psi/JSExpression.java     |  19 +-
 .../psi/JSExpressionCodeFragment.java         |   3 +-
 .../javascript/psi/JSExpressionStatement.java |   9 +-
 .../intellij/lang/javascript/psi/JSFile.java  |   7 +-
 .../lang/javascript/psi/JSForInStatement.java |  11 +-
 .../lang/javascript/psi/JSForStatement.java   |  11 +-
 .../lang/javascript/psi/JSFunction.java       | 134 ++--
 .../javascript/psi/JSFunctionExpression.java  |  12 +-
 .../javascript/psi/JSFunctionProperty.java    |   3 +-
 .../javascript/psi/JSGenericSignature.java    |   3 +-
 .../lang/javascript/psi/JSIfStatement.java    |  15 +-
 .../javascript/psi/JSImportStatement.java     |   7 +-
 .../javascript/psi/JSIncludeDirective.java    |   7 +-
 .../JSIndexedPropertyAccessExpression.java    |   7 +-
 .../javascript/psi/JSLabeledStatement.java    |  15 +-
 .../lang/javascript/psi/JSLetExpression.java  |   5 +-
 .../lang/javascript/psi/JSLetStatement.java   |   7 +-
 .../javascript/psi/JSLiteralExpression.java   |   3 +-
 .../lang/javascript/psi/JSLoopStatement.java  |   5 +-
 .../lang/javascript/psi/JSNamedElement.java   |   3 +-
 .../psi/JSNamespaceDeclaration.java           |   9 +-
 .../lang/javascript/psi/JSNewExpression.java  |   3 +-
 .../psi/JSObjectLiteralExpression.java        |   5 +-
 .../javascript/psi/JSPackageStatement.java    |   7 +-
 .../lang/javascript/psi/JSParameter.java      |  21 +-
 .../lang/javascript/psi/JSParameterList.java  |   9 +-
 .../psi/JSParenthesizedExpression.java        |   5 +-
 .../javascript/psi/JSPostfixExpression.java   |   9 +-
 .../javascript/psi/JSPrefixExpression.java    |  19 +-
 .../lang/javascript/psi/JSProperty.java       |  27 +-
 .../psi/JSQualifiedNamedElement.java          |   5 +-
 .../javascript/psi/JSReferenceExpression.java |  17 +-
 .../lang/javascript/psi/JSReferenceList.java  |  21 +-
 .../javascript/psi/JSReturnStatement.java     |   5 +-
 .../lang/javascript/psi/JSSourceElement.java  |   5 +-
 .../javascript/psi/JSSpreadExpression.java    |   5 +-
 .../lang/javascript/psi/JSStatement.java      |  11 +-
 .../javascript/psi/JSSuperExpression.java     |   3 +-
 .../javascript/psi/JSSuppressionHolder.java   |   3 +-
 .../javascript/psi/JSSwitchStatement.java     |   7 +-
 .../lang/javascript/psi/JSThisExpression.java |   3 +-
 .../lang/javascript/psi/JSThrowStatement.java |   5 +-
 .../lang/javascript/psi/JSTryStatement.java   |  19 +-
 .../psi/JSUseNamespaceDirective.java          |   5 +-
 .../lang/javascript/psi/JSVarStatement.java   |  13 +-
 .../lang/javascript/psi/JSVariable.java       |  43 +-
 .../lang/javascript/psi/JSWhileStatement.java |   5 +-
 .../lang/javascript/psi/JSWithStatement.java  |   7 +-
 .../lang/javascript/psi/JSYieldStatement.java |   7 +-
 .../psi/stubs/JSAttributeListStub.java        |  15 +-
 .../stubs/JSAttributeNameValuePairStub.java   |  13 +-
 .../javascript/psi/stubs/JSAttributeStub.java |   7 +-
 .../javascript/psi/stubs/JSClassStub.java     |  11 +-
 .../javascript/psi/stubs/JSFunctionStub.java  |  19 +-
 .../psi/stubs/JSImportStatementStub.java      |   9 +-
 .../psi/stubs/JSIncludeDirectiveStub.java     |   9 +-
 .../psi/stubs/JSNamespaceDeclarationStub.java |   9 +-
 .../psi/stubs/JSPackageStatementStub.java     |   7 +-
 .../psi/stubs/JSParameterListStub.java        |   7 +-
 .../javascript/psi/stubs/JSParameterStub.java |  11 +-
 .../javascript/psi/stubs/JSQualifiedStub.java |  11 +-
 .../psi/stubs/JSReferenceListStub.java        |   9 +-
 .../javascript/psi/stubs/JSStubElement.java   |   8 +-
 .../stubs/JSUseNamespaceDirectiveStub.java    |   9 +-
 .../psi/stubs/JSVarStatementStub.java         |   7 +-
 .../javascript/psi/stubs/JSVariableStub.java  |   7 +-
 .../psi/stubs/JSVariableStubBase.java         |  17 +-
 97 files changed, 760 insertions(+), 933 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
index ebca9251..564efbaf 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
@@ -23,7 +23,6 @@
  * Time: 7:44:58 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSArgumentList extends JSElement
-{
-	JSExpression[] getArguments();
+public interface JSArgumentList extends JSElement {
+    JSExpression[] getArguments();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
index 94b251b8..15de56ed 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
@@ -23,11 +23,10 @@
  * Time: 7:30:55 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSArrayLiteralExpression extends JSExpression
-{
-	/**
-	 * @return nulls stand in the returned array for skipped values. This for [,1,] array of 3 elements to be returned with first and last
-	 *         elements nulled
-	 */
-	JSExpression[] getExpressions();
+public interface JSArrayLiteralExpression extends JSExpression {
+    /**
+     * @return nulls stand in the returned array for skipped values. This for [,1,] array of 3 elements to be returned with first and last
+     * elements nulled
+     */
+    JSExpression[] getExpressions();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
index 604c8590..d7b81f06 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
@@ -23,6 +23,5 @@
  * Time: 7:40:31 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSAssignmentExpression extends JSBinaryExpression
-{
+public interface JSAssignmentExpression extends JSBinaryExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
index 90045a16..942472a3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
@@ -23,26 +23,23 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * @author  Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
-public interface JSAttribute extends JSElement, PsiNamedElement, StubBasedPsiElement<JSAttributeStub>
-{
-	public static final JSAttribute[] EMPTY_ARRAY = new JSAttribute[0];
+public interface JSAttribute extends JSElement, PsiNamedElement, StubBasedPsiElement<JSAttributeStub> {
+    public static final JSAttribute[] EMPTY_ARRAY = new JSAttribute[0];
 
-	public static ArrayFactory<JSAttribute> ARRAY_FACTORY = new ArrayFactory<JSAttribute>()
-	{
-		@Nonnull
-		@Override
-		public JSAttribute[] create(int count)
-		{
-			return count == 0 ? EMPTY_ARRAY : new JSAttribute[count];
-		}
-	};
+    public static ArrayFactory<JSAttribute> ARRAY_FACTORY = new ArrayFactory<JSAttribute>() {
+        @Nonnull
+        @Override
+        public JSAttribute[] create(int count) {
+            return count == 0 ? EMPTY_ARRAY : new JSAttribute[count];
+        }
+    };
 
-	@Override
-	String getName();
+    @Override
+    String getName();
 
-	JSAttributeNameValuePair[] getValues();
+    JSAttributeNameValuePair[] getValues();
 
-	JSAttributeNameValuePair getValueByName(String name);
+    JSAttributeNameValuePair getValueByName(String name);
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
index 554757f6..56ab6f7c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
@@ -26,33 +26,38 @@
 /**
  * @author Maxim.Mossienko
  */
-public interface JSAttributeList extends JSElement, StubBasedPsiElement<JSAttributeListStub>
-{
-	@Nullable
-	String getNamespace();
+public interface JSAttributeList extends JSElement, StubBasedPsiElement<JSAttributeListStub> {
+    @Nullable
+    String getNamespace();
 
-	@Nullable
-	JSReferenceExpression getNamespaceElement();
+    @Nullable
+    JSReferenceExpression getNamespaceElement();
 
-	JSAttribute[] getAttributes();
+    JSAttribute[] getAttributes();
 
-	@Nonnull
-	JSAttribute[] getAttributesByName(@Nonnull String name);
+    @Nonnull
+    JSAttribute[] getAttributesByName(@Nonnull String name);
 
-	enum AccessType
-	{
-		PACKAGE_LOCAL, PUBLIC, PRIVATE, PROTECTED;
-	}
+    enum AccessType {
+        PACKAGE_LOCAL,
+        PUBLIC,
+        PRIVATE,
+        PROTECTED
+    }
 
-	AccessType getAccessType();
+    AccessType getAccessType();
 
-	@Nullable
-	PsiElement findAccessTypeElement();
+    @Nullable
+    PsiElement findAccessTypeElement();
 
-	enum ModifierType
-	{
-		DYNAMIC, NATIVE, OVERRIDE, STATIC, FINAL, VIRTUAL
-	}
+    enum ModifierType {
+        DYNAMIC,
+        NATIVE,
+        OVERRIDE,
+        STATIC,
+        FINAL,
+        VIRTUAL
+    }
 
-	boolean hasModifier(ModifierType modifier);
+    boolean hasModifier(ModifierType modifier);
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
index 297c7fd0..9cadd6d3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
@@ -23,8 +23,7 @@
 /**
  * @by Maxim.Mossienko
  */
-public interface JSAttributeListOwner extends PsiElement
-{
-	@Nullable
-	JSAttributeList getAttributeList();
+public interface JSAttributeListOwner extends PsiElement {
+    @Nullable
+    JSAttributeList getAttributeList();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
index a1f0998e..717f4fa1 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
@@ -24,12 +24,11 @@
 /**
  * @by Maxim.Mossienko
  */
-public interface JSAttributeNameValuePair extends JSElement, PsiNamedElement, StubBasedPsiElement<JSAttributeNameValuePairStub>
-{
-	JSAttributeNameValuePair[] EMPTY_ARRAY = new JSAttributeNameValuePair[0];
+public interface JSAttributeNameValuePair extends JSElement, PsiNamedElement, StubBasedPsiElement<JSAttributeNameValuePairStub> {
+    JSAttributeNameValuePair[] EMPTY_ARRAY = new JSAttributeNameValuePair[0];
 
-	JSExpression getValue();
+    JSExpression getValue();
 
-	@Nullable
-	String getSimpleValue();
+    @Nullable
+    String getSimpleValue();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
index a4866968..e455c6ab 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
@@ -28,21 +28,19 @@
  * Time: 6:49:21 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSBinaryExpression extends JSExpression
-{
-	JSExpression getLOperand();
+public interface JSBinaryExpression extends JSExpression {
+    JSExpression getLOperand();
 
-	JSExpression getROperand();
+    JSExpression getROperand();
 
-	@Nullable
-	@RequiredReadAction
-	default IElementType getOperationSign()
-	{
-		PsiElement element = getOperationElement();
-		return element != null ? element.getNode().getElementType() : null;
-	}
+    @Nullable
+    @RequiredReadAction
+    default IElementType getOperationSign() {
+        PsiElement element = getOperationElement();
+        return element != null ? element.getNode().getElementType() : null;
+    }
 
-	@Nullable
-	@RequiredReadAction
-	PsiElement getOperationElement();
+    @Nullable
+    @RequiredReadAction
+    PsiElement getOperationElement();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
index 13075ffb..834e7235 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
@@ -23,7 +23,6 @@
  * Time: 6:51:45 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSBlockStatement extends JSStatement
-{
-	JSStatement[] getStatements();
+public interface JSBlockStatement extends JSStatement {
+    JSStatement[] getStatements();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
index a02fb1da..93d23fc7 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
@@ -23,9 +23,8 @@
  * Time: 6:58:10 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSBreakStatement extends JSStatement
-{
-	String getLabel();
+public interface JSBreakStatement extends JSStatement {
+    String getLabel();
 
-	JSStatement getStatementToBreak();
+    JSStatement getStatementToBreak();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
index 8d55ea46..de053d68 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
@@ -23,9 +23,8 @@
  * Time: 7:46:07 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSCallExpression extends JSExpression
-{
-	JSExpression getMethodExpression();
+public interface JSCallExpression extends JSExpression {
+    JSExpression getMethodExpression();
 
-	JSArgumentList getArgumentList();
+    JSArgumentList getArgumentList();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
index 317ac8bb..b7641b89 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
@@ -23,11 +23,10 @@
  * Time: 7:16:36 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSCaseClause extends JSElement
-{
-	boolean isDefault();
+public interface JSCaseClause extends JSElement {
+    boolean isDefault();
 
-	JSExpression getCaseExpression();
+    JSExpression getCaseExpression();
 
-	JSStatement[] getStatements();
+    JSStatement[] getStatements();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
index a740a994..7f6b47b3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
@@ -23,11 +23,10 @@
  * Time: 7:04:04 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSCatchBlock extends JSElement
-{
-	JSCatchBlock[] EMPTY_ARRAY = new JSCatchBlock[0];
+public interface JSCatchBlock extends JSElement {
+    JSCatchBlock[] EMPTY_ARRAY = new JSCatchBlock[0];
 
-	JSParameter getParameter();
+    JSParameter getParameter();
 
-	JSStatement getStatement();
+    JSStatement getStatement();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
index 3fc3b0ef..34090226 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
@@ -24,33 +24,32 @@
 /**
  * @by Maxim.Mossienko
  */
-public interface JSClass extends JSQualifiedNamedElement, JSSourceElement, JSAttributeListOwner, Navigatable, StubBasedPsiElement<JSClassStub>
-{
-	JSClass[] EMPTY_ARRAY = new JSClass[0];
+public interface JSClass extends JSQualifiedNamedElement, JSSourceElement, JSAttributeListOwner, Navigatable, StubBasedPsiElement<JSClassStub> {
+    JSClass[] EMPTY_ARRAY = new JSClass[0];
 
-	@Nullable
-	JSReferenceList getExtendsList();
+    @Nullable
+    JSReferenceList getExtendsList();
 
-	@Nullable
-	JSReferenceList getImplementsList();
+    @Nullable
+    JSReferenceList getImplementsList();
 
-	boolean isInterface();
+    boolean isInterface();
 
-	JSClass[] getSuperClasses();
+    JSClass[] getSuperClasses();
 
-	JSFunction[] getFunctions();
+    JSFunction[] getFunctions();
 
-	JSVariable[] getFields();
+    JSVariable[] getFields();
 
-	JSFunction findFunctionByName(final String name);
+    JSFunction findFunctionByName(final String name);
 
-	JSFunction findFunctionByNameAndKind(final String name, JSFunction.FunctionKind kind);
+    JSFunction findFunctionByNameAndKind(final String name, JSFunction.FunctionKind kind);
 
-	JSVariable findFieldByName(final String name);
+    JSVariable findFieldByName(final String name);
 
-	JSClass[] getSupers();
+    JSClass[] getSupers();
 
-	JSClass[] getImplementedInterfaces();
+    JSClass[] getImplementedInterfaces();
 
-	boolean isDeprecated();
+    boolean isDeprecated();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
index 85f83eb3..899d71ed 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
@@ -8,9 +8,8 @@
  * @author VISTALL
  * @since 11/12/2021
  */
-public interface JSClassExpression extends JSExpression
-{
-	@Nonnull
-	@RequiredReadAction
-	JSClass getClassElement();
+public interface JSClassExpression extends JSExpression {
+    @Nonnull
+    @RequiredReadAction
+    JSClass getClassElement();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
index c22fc23d..bd22bcc4 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
@@ -23,6 +23,5 @@
  * Time: 7:42:26 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSCommaExpression extends JSBinaryExpression
-{
+public interface JSCommaExpression extends JSBinaryExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
index 44c01c43..96c8377b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
@@ -23,11 +23,10 @@
  * Time: 7:40:54 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSConditionalExpression extends JSExpression
-{
-	JSExpression getCondition();
+public interface JSConditionalExpression extends JSExpression {
+    JSExpression getCondition();
 
-	JSExpression getThen();
+    JSExpression getThen();
 
-	JSExpression getElse();
+    JSExpression getElse();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
index 12033b67..91736e37 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
@@ -23,9 +23,8 @@
  * Time: 6:58:10 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSContinueStatement extends JSStatement
-{
-	String getLabel();
+public interface JSContinueStatement extends JSStatement {
+    String getLabel();
 
-	JSStatement getStatementToContinue();
+    JSStatement getStatementToContinue();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
index 25740607..d4c1ed57 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
@@ -23,7 +23,6 @@
  * Time: 6:37:59 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSDefinitionExpression extends JSExpression, JSNamedElement
-{
-	JSExpression getExpression();
+public interface JSDefinitionExpression extends JSExpression, JSNamedElement {
+    JSExpression getExpression();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
index b58f43ee..e672c092 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
@@ -9,17 +9,15 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public interface JSDestructuringElement extends JSElement
-{
-	@Nonnull
-	@RequiredReadAction
-	default JSVariable[] getVariables()
-	{
-		JSDestructuringObject object = getDestructuringObject();
-		return object == null ? JSVariable.EMPTY_ARRAY : object.getVariables();
-	}
+public interface JSDestructuringElement extends JSElement {
+    @Nonnull
+    @RequiredReadAction
+    default JSVariable[] getVariables() {
+        JSDestructuringObject object = getDestructuringObject();
+        return object == null ? JSVariable.EMPTY_ARRAY : object.getVariables();
+    }
 
-	@Nullable
-	@RequiredReadAction
-	JSDestructuringObject getDestructuringObject();
+    @Nullable
+    @RequiredReadAction
+    JSDestructuringObject getDestructuringObject();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
index 5eb47f73..56b3e92a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
@@ -8,11 +8,10 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public interface JSDestructuringObject extends JSElement
-{
-	@Nonnull
-	@RequiredReadAction
-	JSVariable[] getVariables();
+public interface JSDestructuringObject extends JSElement {
+    @Nonnull
+    @RequiredReadAction
+    JSVariable[] getVariables();
 
-	JSDestructuringShorthandedProperty[] getProperties();
+    JSDestructuringShorthandedProperty[] getProperties();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
index 966345b4..2fb35bed 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
@@ -7,9 +7,8 @@
  * @author VISTALL
  * @since 2019-12-17
  */
-public interface JSDestructuringParameter extends JSParameter
-{
-	@RequiredReadAction
-	@Nullable
-	JSDestructuringObject getDestructuringObject();
+public interface JSDestructuringParameter extends JSParameter {
+    @RequiredReadAction
+    @Nullable
+    JSDestructuringObject getDestructuringObject();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
index 60c491f7..913eb0e0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
@@ -7,9 +7,8 @@
  * @author VISTALL
  * @since 2019-12-14
  */
-public interface JSDestructuringShorthandedProperty extends JSElement
-{
-	@RequiredReadAction
-	@Nonnull
-	JSVariable getVarialbe();
+public interface JSDestructuringShorthandedProperty extends JSElement {
+    @RequiredReadAction
+    @Nonnull
+    JSVariable getVarialbe();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
index 00f82e16..4abc2ce7 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
@@ -23,7 +23,6 @@
  * Time: 7:25:34 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSDoWhileStatement extends JSLoopStatement
-{
-	JSExpression getCondition();
+public interface JSDoWhileStatement extends JSLoopStatement {
+    JSExpression getCondition();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
index 7647a5ad..7cf291c6 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
@@ -18,7 +18,6 @@
 
 import consulo.language.psi.PsiComment;
 
-public interface JSDocComment extends PsiComment, JSElement
-{
-	JSDocTag[] getTags();
+public interface JSDocComment extends PsiComment, JSElement {
+    JSDocTag[] getTags();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
index d80a0c93..858b322f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
@@ -19,10 +19,9 @@
 import jakarta.annotation.Nullable;
 import consulo.language.psi.PsiNamedElement;
 
-public interface JSDocTag extends PsiNamedElement, JSElement
-{
-	JSDocTag[] EMPTY_ARRAY = new JSDocTag[0];
+public interface JSDocTag extends PsiNamedElement, JSElement {
+    JSDocTag[] EMPTY_ARRAY = new JSDocTag[0];
 
-	@Nullable
-	JSDocTagValue getValue();
+    @Nullable
+    JSDocTagValue getValue();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java
index 7aa3a68f..a2d2df3c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTagValue.java
@@ -16,7 +16,5 @@
 
 package com.intellij.lang.javascript.psi;
 
-public interface JSDocTagValue extends JSElement
-{
-
+public interface JSDocTagValue extends JSElement {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
index 0057fb5a..157e44a4 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
@@ -22,6 +22,5 @@
  * @author max
  * @since 2:30:26 PM Feb 3, 2005
  */
-public interface JSElement extends NavigatablePsiElement
-{
+public interface JSElement extends NavigatablePsiElement {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
index 431c5a53..676bd01e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
@@ -27,334 +27,267 @@
  * Time: 2:25:12 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JSElementVisitor extends PsiElementVisitor
-{
-	public void visitJSCallExpression(final JSCallExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSIndexedPropertyAccessExpression(final JSIndexedPropertyAccessExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSNewExpression(final JSNewExpression node)
-	{
-		visitJSCallExpression(node);
-	}
-
-	public void visitJSFunctionExpression(final JSFunctionExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSPrefixExpression(final JSPrefixExpression expression)
-	{
-		visitJSExpression(expression);
-	}
-
-	public void visitJSPostfixExpression(final JSPostfixExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSConditionalExpression(final JSConditionalExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSCommaExpression(final JSCommaExpression node)
-	{
-		visitJSBinaryExpression(node);
-	}
-
-	public void visitJSAssignmentExpression(final JSAssignmentExpression node)
-	{
-		visitJSBinaryExpression(node);
-	}
-
-	public void visitJSBinaryExpression(final JSBinaryExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSProperty(final JSProperty node)
-	{
-		visitJSElement(node);
-	}
-
-	public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSParenthesizedExpression(final JSParenthesizedExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSReferenceExpression(final JSReferenceExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSDefinitionExpression(final JSDefinitionExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSLiteralExpression(final JSSimpleLiteralExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSThisExpression(final JSThisExpression node)
-	{
-		visitJSExpression(node);
-	}
-
-	public void visitJSForInStatement(final JSForInStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSForStatement(final JSForStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSDoWhileStatement(final JSDoWhileStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSWhileStatement(final JSWhileStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSCaseClause(final JSCaseClause node)
-	{
-		visitJSElement(node);
-	}
-
-	public void visitJSSwitchStatement(final JSSwitchStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSCatchBlock(final JSCatchBlock node)
-	{
-		visitJSElement(node);
-	}
-
-	public void visitJSTryStatement(final JSTryStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSThrowStatement(final JSThrowStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSReturnStatement(final JSReturnStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSWithStatement(final JSWithStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSBreakStatement(final JSBreakStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSContinueStatement(final JSContinueStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSIfStatement(final JSIfStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSEmptyStatement(final JSEmptyStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSVarStatement(final JSVarStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSExpressionStatement(final JSExpressionStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSLabeledStatement(final JSLabeledStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSBlock(final JSBlockStatement node)
-	{
-		visitJSStatement(node);
-	}
-
-	public void visitJSArgumentList(final JSArgumentList node)
-	{
-		visitJSElement(node);
-	}
-
-	public void visitJSParameter(final JSParameter parameter)
-	{
-		visitJSVariable(parameter);
-	}
-
-	public void visitJSVariable(final JSVariable node)
-	{
-		visitJSElement(node);
-	}
-
-	public void visitJSParameterList(final JSParameterList node)
-	{
-		visitJSElement(node);
-	}
-
-	public void visitJSElement(final JSElement node)
-	{
-		visitElement(node);
-	}
-
-	public void visitJSSourceElement(final JSElement node)
-	{
-		visitJSElement(node);
-	}
-
-	public void visitJSFunctionDeclaration(final JSFunction node)
-	{
-		visitJSSourceElement(node);
-	}
-
-	public void visitJSStatement(final JSStatement node)
-	{
-		visitJSSourceElement(node);
-	}
-
-	public void visitJSExpression(final JSExpression node)
-	{
-		visitJSElement(node);
-	}
-
-	public void visitJSAttributeList(final JSAttributeList attributeList)
-	{
-		visitJSElement(attributeList);
-	}
-
-	public void visitJSPackageStatement(final JSPackageStatement packageStatement)
-	{
-		visitJSStatement(packageStatement);
-	}
-
-	public void visitJSImportStatement(final JSImportStatement importStatement)
-	{
-		visitJSStatement(importStatement);
-	}
-
-	public void visitJSUseNamespaceDirective(final JSUseNamespaceDirective useNamespaceDirective)
-	{
-		visitJSStatement(useNamespaceDirective);
-	}
-
-	public void visitJSNamespaceDeclaration(final JSNamespaceDeclaration namespaceDeclaration)
-	{
-		visitJSStatement(namespaceDeclaration);
-	}
-
-	public void visitJSClass(final JSClass aClass)
-	{
-		visitJSElement(aClass);
-	}
-
-	public void visitJSClassExpression(final JSClassExpression expression)
-	{
-		visitJSExpression(expression);
-	}
-
-	public void visitJSReferenceList(final JSReferenceList referenceList)
-	{
-		visitJSElement(referenceList);
-	}
-
-	public void visitJSSuperExpression(final JSSuperExpression superExpression)
-	{
-		visitJSExpression(superExpression);
-	}
-
-	public void visitJSIncludeDirective(final JSIncludeDirective includeDirective)
-	{
-		visitJSStatement(includeDirective);
-	}
-
-	public void visitJSAttribute(final JSAttribute jsAttribute)
-	{
-		visitJSElement(jsAttribute);
-	}
-
-	public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair)
-	{
-	}
-
-	public void visitJSYieldStatement(final JSYieldStatement statement)
-	{
-		visitJSStatement(statement);
-	}
-
-	public void visitJSLetStatement(final JSLetStatement statement)
-	{
-		visitJSStatement(statement);
-	}
-
-	public void visitJSLetExpression(final JSLetExpression expression)
-	{
-		visitJSExpression(expression);
-	}
-
-	public void visitJSGenericSignature(final JSGenericSignature signature)
-	{
-		visitJSElement(signature);
-	}
-
-	public void visitJSDocTagValue(final JSDocTagValue tagValue)
-	{
-		visitJSElement(tagValue);
-	}
-
-	public void visitJSDocTag(final JSDocTag docTag)
-	{
-		visitJSElement(docTag);
-	}
-
-	public void visitJSDocComment(final JSDocComment docComment)
-	{
-		visitComment(docComment);
-	}
-
-	public void visitLambdaExpression(JavaScriptLambdaExpression expression)
-	{
-		visitJSExpression(expression);
-	}
+public class JSElementVisitor extends PsiElementVisitor {
+    public void visitJSCallExpression(final JSCallExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSIndexedPropertyAccessExpression(final JSIndexedPropertyAccessExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSNewExpression(final JSNewExpression node) {
+        visitJSCallExpression(node);
+    }
+
+    public void visitJSFunctionExpression(final JSFunctionExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSPrefixExpression(final JSPrefixExpression expression) {
+        visitJSExpression(expression);
+    }
+
+    public void visitJSPostfixExpression(final JSPostfixExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSConditionalExpression(final JSConditionalExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSCommaExpression(final JSCommaExpression node) {
+        visitJSBinaryExpression(node);
+    }
+
+    public void visitJSAssignmentExpression(final JSAssignmentExpression node) {
+        visitJSBinaryExpression(node);
+    }
+
+    public void visitJSBinaryExpression(final JSBinaryExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSProperty(final JSProperty node) {
+        visitJSElement(node);
+    }
+
+    public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSParenthesizedExpression(final JSParenthesizedExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSReferenceExpression(final JSReferenceExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSDefinitionExpression(final JSDefinitionExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSLiteralExpression(final JSSimpleLiteralExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSThisExpression(final JSThisExpression node) {
+        visitJSExpression(node);
+    }
+
+    public void visitJSForInStatement(final JSForInStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSForStatement(final JSForStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSDoWhileStatement(final JSDoWhileStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSWhileStatement(final JSWhileStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSCaseClause(final JSCaseClause node) {
+        visitJSElement(node);
+    }
+
+    public void visitJSSwitchStatement(final JSSwitchStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSCatchBlock(final JSCatchBlock node) {
+        visitJSElement(node);
+    }
+
+    public void visitJSTryStatement(final JSTryStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSThrowStatement(final JSThrowStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSReturnStatement(final JSReturnStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSWithStatement(final JSWithStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSBreakStatement(final JSBreakStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSContinueStatement(final JSContinueStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSIfStatement(final JSIfStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSEmptyStatement(final JSEmptyStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSVarStatement(final JSVarStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSExpressionStatement(final JSExpressionStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSLabeledStatement(final JSLabeledStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSBlock(final JSBlockStatement node) {
+        visitJSStatement(node);
+    }
+
+    public void visitJSArgumentList(final JSArgumentList node) {
+        visitJSElement(node);
+    }
+
+    public void visitJSParameter(final JSParameter parameter) {
+        visitJSVariable(parameter);
+    }
+
+    public void visitJSVariable(final JSVariable node) {
+        visitJSElement(node);
+    }
+
+    public void visitJSParameterList(final JSParameterList node) {
+        visitJSElement(node);
+    }
+
+    public void visitJSElement(final JSElement node) {
+        visitElement(node);
+    }
+
+    public void visitJSSourceElement(final JSElement node) {
+        visitJSElement(node);
+    }
+
+    public void visitJSFunctionDeclaration(final JSFunction node) {
+        visitJSSourceElement(node);
+    }
+
+    public void visitJSStatement(final JSStatement node) {
+        visitJSSourceElement(node);
+    }
+
+    public void visitJSExpression(final JSExpression node) {
+        visitJSElement(node);
+    }
+
+    public void visitJSAttributeList(final JSAttributeList attributeList) {
+        visitJSElement(attributeList);
+    }
+
+    public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
+        visitJSStatement(packageStatement);
+    }
+
+    public void visitJSImportStatement(final JSImportStatement importStatement) {
+        visitJSStatement(importStatement);
+    }
+
+    public void visitJSUseNamespaceDirective(final JSUseNamespaceDirective useNamespaceDirective) {
+        visitJSStatement(useNamespaceDirective);
+    }
+
+    public void visitJSNamespaceDeclaration(final JSNamespaceDeclaration namespaceDeclaration) {
+        visitJSStatement(namespaceDeclaration);
+    }
+
+    public void visitJSClass(final JSClass aClass) {
+        visitJSElement(aClass);
+    }
+
+    public void visitJSClassExpression(final JSClassExpression expression) {
+        visitJSExpression(expression);
+    }
+
+    public void visitJSReferenceList(final JSReferenceList referenceList) {
+        visitJSElement(referenceList);
+    }
+
+    public void visitJSSuperExpression(final JSSuperExpression superExpression) {
+        visitJSExpression(superExpression);
+    }
+
+    public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
+        visitJSStatement(includeDirective);
+    }
+
+    public void visitJSAttribute(final JSAttribute jsAttribute) {
+        visitJSElement(jsAttribute);
+    }
+
+    public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair) {
+    }
+
+    public void visitJSYieldStatement(final JSYieldStatement statement) {
+        visitJSStatement(statement);
+    }
+
+    public void visitJSLetStatement(final JSLetStatement statement) {
+        visitJSStatement(statement);
+    }
+
+    public void visitJSLetExpression(final JSLetExpression expression) {
+        visitJSExpression(expression);
+    }
+
+    public void visitJSGenericSignature(final JSGenericSignature signature) {
+        visitJSElement(signature);
+    }
+
+    public void visitJSDocTagValue(final JSDocTagValue tagValue) {
+        visitJSElement(tagValue);
+    }
+
+    public void visitJSDocTag(final JSDocTag docTag) {
+        visitJSElement(docTag);
+    }
+
+    public void visitJSDocComment(final JSDocComment docComment) {
+        visitComment(docComment);
+    }
+
+    public void visitLambdaExpression(JavaScriptLambdaExpression expression) {
+        visitJSExpression(expression);
+    }
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
index 000e3a3e..fa77a3fb 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
@@ -23,6 +23,5 @@
  * Time: 6:56:36 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSEmptyStatement extends JSStatement
-{
+public interface JSEmptyStatement extends JSStatement {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
index 555f08d6..71135e68 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
@@ -24,18 +24,17 @@
 
 /**
  * @author max
- * @since  6:46:19 PM Jan 30, 2005
+ * @since 6:46:19 PM Jan 30, 2005
  */
-public interface JSExpression extends JSElement
-{
-	JSExpression[] EMPTY_ARRAY = new JSExpression[0];
+public interface JSExpression extends JSElement {
+    JSExpression[] EMPTY_ARRAY = new JSExpression[0];
 
-	ArrayFactory<JSExpression> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSExpression[count];
+    ArrayFactory<JSExpression> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSExpression[count];
 
-	@Nonnull
-	JSExpression replace(JSExpression other);
+    @Nonnull
+    JSExpression replace(JSExpression other);
 
-	@Nonnull
-	@RequiredReadAction
-	JavaScriptType getType();
+    @Nonnull
+    @RequiredReadAction
+    JavaScriptType getType();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java
index 4fdff8fe..2802a77e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionCodeFragment.java
@@ -19,6 +19,5 @@
 /**
  * @author nik
  */
-public interface JSExpressionCodeFragment extends JSFile
-{
+public interface JSExpressionCodeFragment extends JSFile {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
index ed188cac..6a51ada7 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
@@ -24,9 +24,8 @@
  * Date: Jan 30, 2005
  * Time: 9:27:17 PM
  */
-public interface JSExpressionStatement extends JSStatement
-{
-	@Nullable
-	@RequiredReadAction
-	JSExpression getExpression();
+public interface JSExpressionStatement extends JSStatement {
+    @Nullable
+    @RequiredReadAction
+    JSExpression getExpression();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
index 90322d0f..86a9cc6c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
@@ -22,9 +22,8 @@
 /**
  * @author nik
  */
-public interface JSFile extends PsiFile, JSElement
-{
-	StubBasedPsiElement findStubbedElementAtOffset(final int offset, final Class<? extends StubBasedPsiElement> clazz);
+public interface JSFile extends PsiFile, JSElement {
+    StubBasedPsiElement findStubbedElementAtOffset(final int offset, final Class<? extends StubBasedPsiElement> clazz);
 
-	JSSourceElement[] getStatements();
+    JSSourceElement[] getStatements();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
index d63cc70d..b57a50c7 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
@@ -23,13 +23,12 @@
  * Time: 7:20:55 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSForInStatement extends JSLoopStatement
-{
-	JSVarStatement getDeclarationStatement();
+public interface JSForInStatement extends JSLoopStatement {
+    JSVarStatement getDeclarationStatement();
 
-	JSExpression getVariableExpression();
+    JSExpression getVariableExpression();
 
-	JSExpression getCollectionExpression();
+    JSExpression getCollectionExpression();
 
-	boolean isForEach();
+    boolean isForEach();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
index 3417572c..54c49c7d 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
@@ -23,13 +23,12 @@
  * Time: 7:21:49 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSForStatement extends JSLoopStatement
-{
-	JSVarStatement getVarDeclaration();
+public interface JSForStatement extends JSLoopStatement {
+    JSVarStatement getVarDeclaration();
 
-	JSExpression getInitialization();
+    JSExpression getInitialization();
 
-	JSExpression getCondition();
+    JSExpression getCondition();
 
-	JSExpression getUpdate();
+    JSExpression getUpdate();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index 87a14d0c..8443d296 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -27,76 +27,66 @@
 /**
  * @author max
  */
-public interface JSFunction extends JSQualifiedNamedElement, JSSourceElement, JSAttributeListOwner
-{
-	public static final JSFunction[] EMPTY_ARRAY = new JSFunction[0];
-
-	public static ArrayFactory<JSFunction> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSFunction[count];
-
-	@Nullable
-	@RequiredReadAction
-	JSParameterList getParameterList();
-
-	JSSourceElement[] getBody();
-
-	@RequiredReadAction
-	default boolean isGetProperty()
-	{
-		return false;
-	}
-
-	@RequiredReadAction
-	default boolean isSetProperty()
-	{
-		return false;
-	}
-
-	@RequiredReadAction
-	default boolean isConstructor()
-	{
-		return false;
-	}
-
-	@Nonnull
-	JavaScriptType getReturnType();
-
-	String getReturnTypeString();
-
-	@Nullable
-	JavaScriptTypeElement getReturnTypeElement();
-
-	enum FunctionKind
-	{
-		GETTER,
-		SETTER,
-		CONSTRUCTOR,
-		SIMPLE
-	}
-
-	@Nonnull
-	@RequiredReadAction
-	default FunctionKind getKind()
-	{
-		if(isGetProperty())
-		{
-			return FunctionKind.GETTER;
-		}
-		if(isSetProperty())
-		{
-			return FunctionKind.SETTER;
-		}
-		if(isConstructor())
-		{
-			return FunctionKind.CONSTRUCTOR;
-		}
-		return FunctionKind.SIMPLE;
-	}
-
-
-	boolean isDeprecated();
-
-	default boolean isReferencesArguments()
-	{
-		return false;
-	}
+public interface JSFunction extends JSQualifiedNamedElement, JSSourceElement, JSAttributeListOwner {
+    public static final JSFunction[] EMPTY_ARRAY = new JSFunction[0];
+
+    public static ArrayFactory<JSFunction> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSFunction[count];
+
+    @Nullable
+    @RequiredReadAction
+    JSParameterList getParameterList();
+
+    JSSourceElement[] getBody();
+
+    @RequiredReadAction
+    default boolean isGetProperty() {
+        return false;
+    }
+
+    @RequiredReadAction
+    default boolean isSetProperty() {
+        return false;
+    }
+
+    @RequiredReadAction
+    default boolean isConstructor() {
+        return false;
+    }
+
+    @Nonnull
+    JavaScriptType getReturnType();
+
+    String getReturnTypeString();
+
+    @Nullable
+    JavaScriptTypeElement getReturnTypeElement();
+
+    enum FunctionKind {
+        GETTER,
+        SETTER,
+        CONSTRUCTOR,
+        SIMPLE
+    }
+
+    @Nonnull
+    @RequiredReadAction
+    default FunctionKind getKind() {
+        if (isGetProperty()) {
+            return FunctionKind.GETTER;
+        }
+        if (isSetProperty()) {
+            return FunctionKind.SETTER;
+        }
+        if (isConstructor()) {
+            return FunctionKind.CONSTRUCTOR;
+        }
+        return FunctionKind.SIMPLE;
+    }
+
+
+    boolean isDeprecated();
+
+    default boolean isReferencesArguments() {
+        return false;
+    }
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
index ddb02c62..6a1c1a64 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
@@ -22,11 +22,9 @@
  * @author max
  * @since 7:42:48 PM Jan 30, 2005
  */
-public interface JSFunctionExpression extends JSFunction, JSExpression
-{
-	@Nonnull
-	default JSFunction getFunction()
-	{
-		return this;
-	}
+public interface JSFunctionExpression extends JSFunction, JSExpression {
+    @Nonnull
+    default JSFunction getFunction() {
+        return this;
+    }
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java
index b5dee996..452fa1f1 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java
@@ -4,6 +4,5 @@
  * @author VISTALL
  * @since 19/12/2021
  */
-public interface JSFunctionProperty extends JSProperty, JSFunction
-{
+public interface JSFunctionProperty extends JSProperty, JSFunction {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
index 715a57cd..8121a2c9 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
@@ -19,6 +19,5 @@
 /**
  * @by Maxim.Mossienko
  */
-public interface JSGenericSignature extends JSElement
-{
+public interface JSGenericSignature extends JSElement {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
index c3dd31d1..af1c2f3e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
@@ -23,17 +23,16 @@
  * Time: 6:56:53 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSIfStatement extends JSStatement
-{
-	JSExpression getCondition();
+public interface JSIfStatement extends JSStatement {
+    JSExpression getCondition();
 
-	JSStatement getThen();
+    JSStatement getThen();
 
-	JSStatement getElse();
+    JSStatement getElse();
 
-	void setThen(JSStatement statement);
+    void setThen(JSStatement statement);
 
-	void setElse(JSStatement statement);
+    void setElse(JSStatement statement);
 
-	void setCondition(JSExpression expr);
+    void setCondition(JSExpression expr);
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
index c72e83f5..b4081f35 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
@@ -23,12 +23,11 @@
 
 /**
  * @by Maxim.Mossienko
- *
+ * <p>
  * EcmaScript 4 implementation
  */
 @Deprecated
 @DeprecationInfo("We need rename it")
-public interface JSImportStatement extends JSStatement, StubBasedPsiElement<JSImportStatementStub>, JavaScriptImportStatementBase
-{
-	String getImportText();
+public interface JSImportStatement extends JSStatement, StubBasedPsiElement<JSImportStatementStub>, JavaScriptImportStatementBase {
+    String getImportText();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
index ac89c7b5..77afe74a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
@@ -23,9 +23,8 @@
 /**
  * @by Maxim.Mossienko
  */
-public interface JSIncludeDirective extends JSStatement, StubBasedPsiElement<JSIncludeDirectiveStub>
-{
-	String getIncludeText();
+public interface JSIncludeDirective extends JSStatement, StubBasedPsiElement<JSIncludeDirectiveStub> {
+    String getIncludeText();
 
-	PsiFile resolveFile();
+    PsiFile resolveFile();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
index 1e347eb4..86902196 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
@@ -23,9 +23,8 @@
  * Time: 7:45:31 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSIndexedPropertyAccessExpression extends JSExpression
-{
-	JSExpression getQualifier();
+public interface JSIndexedPropertyAccessExpression extends JSExpression {
+    JSExpression getQualifier();
 
-	JSExpression getIndexExpression();
+    JSExpression getIndexExpression();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
index 366347cf..5cf2bf9c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
@@ -27,15 +27,14 @@
  * Time: 6:52:43 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSLabeledStatement extends JSStatement, PsiNameIdentifierOwner
-{
-	String getLabel();
+public interface JSLabeledStatement extends JSStatement, PsiNameIdentifierOwner {
+    String getLabel();
 
-	@Deprecated
-	@DeprecationInfo("Use #getNameIdentifier()")
-	PsiElement getLabelIdentifier();
+    @Deprecated
+    @DeprecationInfo("Use #getNameIdentifier()")
+    PsiElement getLabelIdentifier();
 
-	JSStatement getStatement();
+    JSStatement getStatement();
 
-	JSStatement unlabel();
+    JSStatement unlabel();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
index 0cf12dbe..111e5bcf 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
@@ -23,7 +23,6 @@
  * Time: 6:37:59 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSLetExpression extends JSExpression
-{
-	JSExpression getExpression();
+public interface JSLetExpression extends JSExpression {
+    JSExpression getExpression();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java
index 4a44a60a..22d73429 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetStatement.java
@@ -19,9 +19,8 @@
 /**
  * @author maxim
  */
-public interface JSLetStatement extends JSStatement
-{
-	JSExpression[] getExpressions();
+public interface JSLetStatement extends JSStatement {
+    JSExpression[] getExpressions();
 
-	JSBlockStatement getBody();
+    JSBlockStatement getBody();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
index 42e11d5f..cab692fd 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
@@ -20,6 +20,5 @@
  * @author max
  * @since 7:29:31 PM Jan 30, 2005
  */
-public interface JSLiteralExpression extends JSExpression
-{
+public interface JSLiteralExpression extends JSExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
index 7906359f..a15ac2b9 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
@@ -23,7 +23,6 @@
  * Time: 7:22:13 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSLoopStatement extends JSStatement
-{
-	JSStatement getBody();
+public interface JSLoopStatement extends JSStatement {
+    JSStatement getBody();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
index 177b4a7f..52c050d8 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamedElement.java
@@ -23,6 +23,5 @@
 /**
  * @author ven
  */
-public interface JSNamedElement extends PsiNamedElement, JSElement, NavigationItem, PsiNameIdentifierOwner
-{
+public interface JSNamedElement extends PsiNamedElement, JSElement, NavigationItem, PsiNameIdentifierOwner {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
index 21bd6091..9361fda1 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
@@ -24,10 +24,9 @@
  * @by Maxim.Mossienko
  */
 public interface JSNamespaceDeclaration extends JSStatement, JSQualifiedNamedElement, JSAttributeListOwner,
-		StubBasedPsiElement<JSNamespaceDeclarationStub>
-{
-	@Nullable
-	String getInitialValueString();
+    StubBasedPsiElement<JSNamespaceDeclarationStub> {
+    @Nullable
+    String getInitialValueString();
 
-	boolean isDeprecated();
+    boolean isDeprecated();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
index 7d466de8..d5e92efa 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
@@ -23,6 +23,5 @@
  * Time: 7:44:26 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSNewExpression extends JSCallExpression
-{
+public interface JSNewExpression extends JSCallExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
index d51939fe..2552d442 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
@@ -23,7 +23,6 @@
  * Time: 7:38:54 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSObjectLiteralExpression extends JSExpression
-{
-	JSProperty[] getProperties();
+public interface JSObjectLiteralExpression extends JSExpression {
+    JSProperty[] getProperties();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
index 67915d20..8ca502b5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
@@ -22,9 +22,8 @@
 /**
  * @by Maxim.Mossienko
  */
-public interface JSPackageStatement extends JSStatement, JSQualifiedNamedElement, StubBasedPsiElement<JSPackageStatementStub>
-{
-	JSSourceElement[] getStatements();
+public interface JSPackageStatement extends JSStatement, JSQualifiedNamedElement, StubBasedPsiElement<JSPackageStatementStub> {
+    JSSourceElement[] getStatements();
 
-	void setQualifiedName(final String expectedPackageNameFromFile);
+    void setQualifiedName(final String expectedPackageNameFromFile);
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
index cdb3b272..97c415e3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
@@ -26,20 +26,19 @@
  * Date: Jan 30, 2005
  * Time: 6:43:02 PM
  */
-public interface JSParameter extends JSVariable
-{
-	JSParameter[] EMPTY_ARRAY = new JSParameter[0];
+public interface JSParameter extends JSVariable {
+    JSParameter[] EMPTY_ARRAY = new JSParameter[0];
 
-	ArrayFactory<JSParameter> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSParameter[count];
+    ArrayFactory<JSParameter> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSParameter[count];
 
-	JSFunction getDeclaringFunction();
+    JSFunction getDeclaringFunction();
 
-	@RequiredReadAction
-	boolean isRest();
+    @RequiredReadAction
+    boolean isRest();
 
-	@Nullable
-	@RequiredReadAction
-	PsiElement getRestElement();
+    @Nullable
+    @RequiredReadAction
+    PsiElement getRestElement();
 
-	boolean isOptional();
+    boolean isOptional();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
index 25b316af..f2baa3f2 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
@@ -21,10 +21,9 @@
 
 /**
  * @author max
- *         Date: Jan 30, 2005
- *         Time: 6:42:10 PM
+ * Date: Jan 30, 2005
+ * Time: 6:42:10 PM
  */
-public interface JSParameterList extends JSElement, StubBasedPsiElement<JSParameterListStub>
-{
-	JSParameter[] getParameters();
+public interface JSParameterList extends JSElement, StubBasedPsiElement<JSParameterListStub> {
+    JSParameter[] getParameters();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
index e9fd5342..7ae3b68a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
@@ -23,7 +23,6 @@
  * Time: 7:30:30 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSParenthesizedExpression extends JSExpression
-{
-	JSExpression getInnerExpression();
+public interface JSParenthesizedExpression extends JSExpression {
+    JSExpression getInnerExpression();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
index ddc386b6..28bcb399 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
@@ -26,10 +26,9 @@
  * Time: 7:41:36 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSPostfixExpression extends JSExpression
-{
-	@Nullable
-	JSExpression getExpression();
+public interface JSPostfixExpression extends JSExpression {
+    @Nullable
+    JSExpression getExpression();
 
-	IElementType getOperationSign();
+    IElementType getOperationSign();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
index 2c3199d2..427be979 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
@@ -28,16 +28,15 @@
  * Time: 7:41:36 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSPrefixExpression extends JSExpression
-{
-	@Nullable
-	JSExpression getExpression();
+public interface JSPrefixExpression extends JSExpression {
+    @Nullable
+    JSExpression getExpression();
 
-	@Nullable
-	@RequiredReadAction
-	IElementType getOperationSign();
+    @Nullable
+    @RequiredReadAction
+    IElementType getOperationSign();
 
-	@RequiredReadAction
-	@Nullable
-	PsiElement getOperatorElement();
+    @RequiredReadAction
+    @Nullable
+    PsiElement getOperatorElement();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
index 071ecb8f..4699a506 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
@@ -29,21 +29,20 @@
  * @author max
  * @since 7:39:29 PM Jan 30, 2005
  */
-public interface JSProperty extends JSNamedElement
-{
-	@Nullable
-	@RequiredReadAction
-	JSExpression getValue();
+public interface JSProperty extends JSNamedElement {
+    @Nullable
+    @RequiredReadAction
+    JSExpression getValue();
 
-	@Nullable
-	@RequiredReadAction
-	PsiElement getColonElement();
+    @Nullable
+    @RequiredReadAction
+    PsiElement getColonElement();
 
-	@Nullable
-	@RequiredReadAction
-	JSComputedName getComputedName();
+    @Nullable
+    @RequiredReadAction
+    JSComputedName getComputedName();
 
-	@Nonnull
-	@RequiredReadAction
-	JavaScriptType getType();
+    @Nonnull
+    @RequiredReadAction
+    JavaScriptType getType();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
index 79631775..8765e153 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
@@ -19,7 +19,6 @@
 /**
  * @author ven
  */
-public interface JSQualifiedNamedElement extends JSNamedElement
-{
-	String getQualifiedName();
+public interface JSQualifiedNamedElement extends JSNamedElement {
+    String getQualifiedName();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
index ecfc17ba..f83a3ff2 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
@@ -25,16 +25,15 @@
  * @author max
  * @since 7:26:32 PM Jan 30, 2005
  */
-public interface JSReferenceExpression extends JSExpression, PsiPolyVariantReference
-{
-	@Nullable
-	JSExpression getQualifier();
+public interface JSReferenceExpression extends JSExpression, PsiPolyVariantReference {
+    @Nullable
+    JSExpression getQualifier();
 
-	@Nullable
-	String getReferencedName();
+    @Nullable
+    String getReferencedName();
 
-	@Nullable
-	PsiElement getReferenceNameElement();
+    @Nullable
+    PsiElement getReferenceNameElement();
 
-	boolean shouldCheckReferences();
+    boolean shouldCheckReferences();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
index 3b9c68b7..ed264aa2 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
@@ -25,17 +25,16 @@
 /**
  * @author Maxim.Mossienko
  */
-public interface JSReferenceList extends JSElement, StubBasedPsiElement<JSReferenceListStub>
-{
-	@RequiredReadAction
-	@Nonnull
-	JSReferenceExpression[] getExpressions();
+public interface JSReferenceList extends JSElement, StubBasedPsiElement<JSReferenceListStub> {
+    @RequiredReadAction
+    @Nonnull
+    JSReferenceExpression[] getExpressions();
 
-	@RequiredReadAction
-	@Nonnull
-	String[] getReferenceTexts();
+    @RequiredReadAction
+    @Nonnull
+    String[] getReferenceTexts();
 
-	@RequiredReadAction
-	@Nonnull
-	JSClass[] getReferencedClasses();
+    @RequiredReadAction
+    @Nonnull
+    JSClass[] getReferencedClasses();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
index 394db5fd..4ab01026 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
@@ -23,7 +23,6 @@
  * Time: 7:01:41 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSReturnStatement extends JSStatement
-{
-	JSExpression getExpression();
+public interface JSReturnStatement extends JSStatement {
+    JSExpression getExpression();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java
index e732522b..9cb9d947 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSourceElement.java
@@ -19,7 +19,6 @@
 /**
  * @author ven
  */
-public interface JSSourceElement extends JSElement
-{
-	JSSourceElement[] EMPTY_ARRAY = new JSSourceElement[0];
+public interface JSSourceElement extends JSElement {
+    JSSourceElement[] EMPTY_ARRAY = new JSSourceElement[0];
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSpreadExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSpreadExpression.java
index 9645b902..e704de9f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSpreadExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSpreadExpression.java
@@ -4,7 +4,6 @@
  * @author VISTALL
  * @since 2020-01-01
  */
-public interface JSSpreadExpression extends JSExpression
-{
-	JSExpression getInnerExpression();
+public interface JSSpreadExpression extends JSExpression {
+    JSExpression getInnerExpression();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
index 032ba45c..0a56c085 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
@@ -25,13 +25,12 @@
  * Time: 6:48:51 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSStatement extends JSSourceElement
-{
-	JSStatement[] EMPTY = new JSStatement[0];
+public interface JSStatement extends JSSourceElement {
+    JSStatement[] EMPTY = new JSStatement[0];
 
-	JSStatement addStatementBefore(JSStatement toAdd) throws IncorrectOperationException;
+    JSStatement addStatementBefore(JSStatement toAdd) throws IncorrectOperationException;
 
-	JSStatement addStatementAfter(JSStatement toAdd) throws IncorrectOperationException;
+    JSStatement addStatementAfter(JSStatement toAdd) throws IncorrectOperationException;
 
-	JSStatement replace(JSStatement with);
+    JSStatement replace(JSStatement with);
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
index e53f6fb4..d78a5b0e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
@@ -19,6 +19,5 @@
 /**
  * @by Maxim.Mossienko
  */
-public interface JSSuperExpression extends JSExpression
-{
+public interface JSSuperExpression extends JSExpression {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
index 1ea1c297..d85b6c03 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuppressionHolder.java
@@ -23,6 +23,5 @@
  *
  * @author yole
  */
-public interface JSSuppressionHolder extends PsiElement
-{
+public interface JSSuppressionHolder extends PsiElement {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
index d2a9b3a0..38d5915f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
@@ -23,9 +23,8 @@
  * Time: 7:06:18 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSSwitchStatement extends JSStatement
-{
-	JSExpression getSwitchExpression();
+public interface JSSwitchStatement extends JSStatement {
+    JSExpression getSwitchExpression();
 
-	JSCaseClause[] getCaseClauses();
+    JSCaseClause[] getCaseClauses();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
index a6ac795d..67c3b0fc 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
@@ -23,6 +23,5 @@
  * Time: 7:28:55 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSThisExpression extends JSExpression
-{
+public interface JSThisExpression extends JSExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
index 705859ae..0b5d3314 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
@@ -23,7 +23,6 @@
  * Time: 7:02:11 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSThrowStatement extends JSStatement
-{
-	JSExpression getExpression();
+public interface JSThrowStatement extends JSStatement {
+    JSExpression getExpression();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
index 0e0300a5..0093e2ea 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
@@ -26,17 +26,16 @@
  * Time: 7:03:06 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSTryStatement extends JSStatement
-{
-	JSStatement getStatement();
+public interface JSTryStatement extends JSStatement {
+    JSStatement getStatement();
 
-	@Nonnull
-	JSCatchBlock[] getAllCatchBlocks();
+    @Nonnull
+    JSCatchBlock[] getAllCatchBlocks();
 
-	@Deprecated
-	@Nullable
-	JSCatchBlock getCatchBlock();
+    @Deprecated
+    @Nullable
+    JSCatchBlock getCatchBlock();
 
-	@Nullable
-	JSStatement getFinallyStatement();
+    @Nullable
+    JSStatement getFinallyStatement();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
index e8b4d3fe..50546d5b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
@@ -22,7 +22,6 @@
 /**
  * @by Maxim.Mossienko
  */
-public interface JSUseNamespaceDirective extends JSStatement, StubBasedPsiElement<JSUseNamespaceDirectiveStub>
-{
-	String getNamespaceToBeUsed();
+public interface JSUseNamespaceDirective extends JSStatement, StubBasedPsiElement<JSUseNamespaceDirectiveStub> {
+    String getNamespaceToBeUsed();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
index a74fc00e..4fdaa0ff 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
@@ -28,13 +28,12 @@
  * Time: 6:55:04 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSVarStatement extends JSStatement, StubBasedPsiElement<JSVarStatementStub>
-{
-	JSVariable[] getVariables();
+public interface JSVarStatement extends JSStatement, StubBasedPsiElement<JSVarStatementStub> {
+    JSVariable[] getVariables();
 
-	@Nullable
-	@RequiredReadAction
-	JSDestructuringElement getDestructuringElement();
+    @Nullable
+    @RequiredReadAction
+    JSDestructuringElement getDestructuringElement();
 
-	void declareVariable(String name, JSExpression initializer);
+    void declareVariable(String name, JSExpression initializer);
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index af6ea26e..dfc09d7e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -26,37 +26,36 @@
 
 /**
  * @author max
- *         Date: Jan 30, 2005
- *         Time: 6:43:42 PM
+ * Date: Jan 30, 2005
+ * Time: 6:43:42 PM
  */
-public interface JSVariable extends JSQualifiedNamedElement, JSAttributeListOwner
-{
-	JSVariable[] EMPTY_ARRAY = new JSVariable[0];
+public interface JSVariable extends JSQualifiedNamedElement, JSAttributeListOwner {
+    JSVariable[] EMPTY_ARRAY = new JSVariable[0];
 
-	boolean hasInitializer();
+    boolean hasInitializer();
 
-	@RequiredReadAction
-	@Nullable
-	JSExpression getInitializer();
+    @RequiredReadAction
+    @Nullable
+    JSExpression getInitializer();
 
-	String getInitializerText();
+    String getInitializerText();
 
-	void setInitializer(JSExpression expr) throws IncorrectOperationException;
+    void setInitializer(JSExpression expr) throws IncorrectOperationException;
 
-	@Nonnull
-	JavaScriptType getType();
+    @Nonnull
+    JavaScriptType getType();
 
-	@Nullable
-	@Deprecated
-	String getTypeString();
+    @Nullable
+    @Deprecated
+    String getTypeString();
 
-	@Nullable
-	@RequiredReadAction
-	JavaScriptTypeElement getTypeElement();
+    @Nullable
+    @RequiredReadAction
+    JavaScriptTypeElement getTypeElement();
 
-	boolean isConst();
+    boolean isConst();
 
-	boolean isLocal();
+    boolean isLocal();
 
-	boolean isDeprecated();
+    boolean isDeprecated();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
index 358af431..ab8e801a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
@@ -23,7 +23,6 @@
  * Time: 7:25:13 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSWhileStatement extends JSLoopStatement
-{
-	JSExpression getCondition();
+public interface JSWhileStatement extends JSLoopStatement {
+    JSExpression getCondition();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
index fedd0246..cd57794d 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
@@ -23,9 +23,8 @@
  * Time: 7:01:01 PM
  * To change this template use File | Settings | File Templates.
  */
-public interface JSWithStatement extends JSStatement
-{
-	JSExpression getExpression();
+public interface JSWithStatement extends JSStatement {
+    JSExpression getExpression();
 
-	JSStatement getStatement();
+    JSStatement getStatement();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
index 572f2a7f..63791adb 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
@@ -23,8 +23,7 @@
  * Date: Jan 30, 2005
  * Time: 9:27:17 PM
  */
-public interface JSYieldStatement extends JSStatement
-{
-	@Nullable
-	JSExpression getExpression();
+public interface JSYieldStatement extends JSStatement {
+    @Nullable
+    JSExpression getExpression();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
index 4ce4f77c..62717ff6 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
@@ -21,16 +21,15 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 4:00:16 PM
+ * Date: Mar 25, 2008
+ * Time: 4:00:16 PM
  */
-public interface JSAttributeListStub extends StubElement<JSAttributeList>, JSStubElement<JSAttributeList>
-{
-	JSAttributeList.AccessType getAccessType();
+public interface JSAttributeListStub extends StubElement<JSAttributeList>, JSStubElement<JSAttributeList> {
+    JSAttributeList.AccessType getAccessType();
 
-	boolean hasModifier(final JSAttributeList.ModifierType modifier);
+    boolean hasModifier(final JSAttributeList.ModifierType modifier);
 
-	String getNamespace();
+    String getNamespace();
 
-	int getFlags();
+    int getFlags();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
index d757cd9e..846fa987 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
@@ -22,13 +22,12 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:52:57 PM
+ * Date: Jun 6, 2008
+ * Time: 7:52:57 PM
  */
-public interface JSAttributeNameValuePairStub extends JSStubElement<JSAttributeNameValuePair>, StubElement<JSAttributeNameValuePair>
-{
-	@Nullable
-	String getValue();
+public interface JSAttributeNameValuePairStub extends JSStubElement<JSAttributeNameValuePair>, StubElement<JSAttributeNameValuePair> {
+    @Nullable
+    String getValue();
 
-	String getName();
+    String getName();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
index 75ec2498..7208cfe9 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
@@ -21,9 +21,8 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 4:00:16 PM
+ * Date: Mar 25, 2008
+ * Time: 4:00:16 PM
  */
-public interface JSAttributeStub extends JSStubElement<JSAttribute>, NamedStub<JSAttribute>
-{
+public interface JSAttributeStub extends JSStubElement<JSAttribute>, NamedStub<JSAttribute> {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
index 3e439ba3..b888d2cd 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
@@ -20,12 +20,11 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 4:00:16 PM
+ * Date: Mar 25, 2008
+ * Time: 4:00:16 PM
  */
-public interface JSClassStub extends JSStubElement<JSClass>, JSQualifiedStub<JSClass>
-{
-	boolean isInterface();
+public interface JSClassStub extends JSStubElement<JSClass>, JSQualifiedStub<JSClass> {
+    boolean isInterface();
 
-	boolean isDeprecated();
+    boolean isDeprecated();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
index 4d657fd5..51ae4e1d 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
@@ -20,20 +20,19 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 4:00:16 PM
+ * Date: Mar 25, 2008
+ * Time: 4:00:16 PM
  */
-public interface JSFunctionStub extends JSStubElement<JSFunction>, JSQualifiedStub<JSFunction>
-{
-	String getReturnTypeString();
+public interface JSFunctionStub extends JSStubElement<JSFunction>, JSQualifiedStub<JSFunction> {
+    String getReturnTypeString();
 
-	boolean isGetProperty();
+    boolean isGetProperty();
 
-	boolean isSetProperty();
+    boolean isSetProperty();
 
-	boolean isConstructor();
+    boolean isConstructor();
 
-	boolean isDeprecated();
+    boolean isDeprecated();
 
-	boolean isReferencesArguments();
+    boolean isReferencesArguments();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
index 0d2b74bf..b2b46c09 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
@@ -21,10 +21,9 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:52:44 PM
+ * Date: Jun 6, 2008
+ * Time: 7:52:44 PM
  */
-public interface JSImportStatementStub extends JSStubElement<JSImportStatement>, StubElement<JSImportStatement>
-{
-	String getImportText();
+public interface JSImportStatementStub extends JSStubElement<JSImportStatement>, StubElement<JSImportStatement> {
+    String getImportText();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
index ec6f07e3..4f0f1f6f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
@@ -21,10 +21,9 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:52:57 PM
+ * Date: Jun 6, 2008
+ * Time: 7:52:57 PM
  */
-public interface JSIncludeDirectiveStub extends JSStubElement<JSIncludeDirective>, StubElement<JSIncludeDirective>
-{
-	String getIncludeText();
+public interface JSIncludeDirectiveStub extends JSStubElement<JSIncludeDirective>, StubElement<JSIncludeDirective> {
+    String getIncludeText();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
index 0c8fa342..6f1666f8 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
@@ -20,10 +20,9 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:52:57 PM
+ * Date: Jun 6, 2008
+ * Time: 7:52:57 PM
  */
-public interface JSNamespaceDeclarationStub extends JSStubElement<JSNamespaceDeclaration>, JSQualifiedStub<JSNamespaceDeclaration>
-{
-	String getInitialValueString();
+public interface JSNamespaceDeclarationStub extends JSStubElement<JSNamespaceDeclaration>, JSQualifiedStub<JSNamespaceDeclaration> {
+    String getInitialValueString();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
index 8021c5e1..1caf3b38 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
@@ -20,9 +20,8 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:52:30 PM
+ * Date: Jun 6, 2008
+ * Time: 7:52:30 PM
  */
-public interface JSPackageStatementStub extends JSStubElement<JSPackageStatement>, JSQualifiedStub<JSPackageStatement>
-{
+public interface JSPackageStatementStub extends JSStubElement<JSPackageStatement>, JSQualifiedStub<JSPackageStatement> {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
index 4558cb2c..a9831313 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
@@ -20,9 +20,8 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 4:00:16 PM
+ * Date: Mar 25, 2008
+ * Time: 4:00:16 PM
  */
-public interface JSParameterListStub extends JSStubElement<JSParameterList>
-{
+public interface JSParameterListStub extends JSStubElement<JSParameterList> {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
index 69562997..7cbcbdb9 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
@@ -20,12 +20,11 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 4:00:16 PM
+ * Date: Mar 25, 2008
+ * Time: 4:00:16 PM
  */
-public interface JSParameterStub extends JSVariableStubBase<JSParameter>
-{
-	boolean isRest();
+public interface JSParameterStub extends JSVariableStubBase<JSParameter> {
+    boolean isRest();
 
-	boolean isOptional();
+    boolean isOptional();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
index 7dcc5be5..4d47474a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
@@ -21,12 +21,11 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 30, 2008
- *         Time: 9:30:52 PM
+ * Date: Jul 30, 2008
+ * Time: 9:30:52 PM
  */
-public interface JSQualifiedStub<T extends JSQualifiedNamedElement> extends NamedStub<T>, JSStubElement<T>
-{
-	String getQualifiedName();
+public interface JSQualifiedStub<T extends JSQualifiedNamedElement> extends NamedStub<T>, JSStubElement<T> {
+    String getQualifiedName();
 
-	int getFlags();
+    int getFlags();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
index a281cc83..55972d9e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
@@ -21,10 +21,9 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:52:51 PM
+ * Date: Jun 6, 2008
+ * Time: 7:52:51 PM
  */
-public interface JSReferenceListStub extends JSStubElement<JSReferenceList>, StubElement<JSReferenceList>
-{
-	String[] getReferenceTexts();
+public interface JSReferenceListStub extends JSStubElement<JSReferenceList>, StubElement<JSReferenceList> {
+    String[] getReferenceTexts();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
index 6ca330de..0cc370ab 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
@@ -21,10 +21,8 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 26, 2008
- *         Time: 9:39:31 PM
+ * Date: Mar 26, 2008
+ * Time: 9:39:31 PM
  */
-public interface JSStubElement<T extends JSElement> extends StubElement<T>
-{
-
+public interface JSStubElement<T extends JSElement> extends StubElement<T> {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
index 99714fcb..853a9917 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
@@ -21,10 +21,9 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 6, 2008
- *         Time: 7:52:51 PM
+ * Date: Jun 6, 2008
+ * Time: 7:52:51 PM
  */
-public interface JSUseNamespaceDirectiveStub extends JSStubElement<JSUseNamespaceDirective>, StubElement<JSUseNamespaceDirective>
-{
-	String getNamespaceToUse();
+public interface JSUseNamespaceDirectiveStub extends JSStubElement<JSUseNamespaceDirective>, StubElement<JSUseNamespaceDirective> {
+    String getNamespaceToUse();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
index d9caa2bf..0e3f44e0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
@@ -20,9 +20,8 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 8, 2008
- *         Time: 1:51:29 PM
+ * Date: Jun 8, 2008
+ * Time: 1:51:29 PM
  */
-public interface JSVarStatementStub extends JSStubElement<JSVarStatement>
-{
+public interface JSVarStatementStub extends JSStubElement<JSVarStatement> {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
index 1d562726..7790bfeb 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
@@ -20,9 +20,8 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 4:00:16 PM
+ * Date: Mar 25, 2008
+ * Time: 4:00:16 PM
  */
-public interface JSVariableStub extends JSVariableStubBase<JSVariable>
-{
+public interface JSVariableStub extends JSVariableStubBase<JSVariable> {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
index d23181a3..261cff1d 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
@@ -20,18 +20,17 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 25, 2008
- *         Time: 4:00:16 PM
+ * Date: Mar 25, 2008
+ * Time: 4:00:16 PM
  */
-public interface JSVariableStubBase<T extends JSVariable> extends JSQualifiedStub<T>, JSStubElement<T>
-{
-	String getTypeString();
+public interface JSVariableStubBase<T extends JSVariable> extends JSQualifiedStub<T>, JSStubElement<T> {
+    String getTypeString();
 
-	boolean isDeprecated();
+    boolean isDeprecated();
 
-	boolean isConst();
+    boolean isConst();
 
-	String getInitializerText();
+    String getInitializerText();
 
-	boolean isLocal();
+    boolean isLocal();
 }
\ No newline at end of file

From 4c428f4b62f4cfeb7c7cc253577445edece2d385 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 11 Jan 2025 22:36:43 +0300
Subject: [PATCH 257/340] Refactoring com.intellij.lang.javascript.psi.

---
 .../com/intellij/lang/javascript/psi/JSArgumentList.java | 7 ++-----
 .../lang/javascript/psi/JSArrayLiteralExpression.java    | 7 ++-----
 .../lang/javascript/psi/JSAssignmentExpression.java      | 7 ++-----
 .../com/intellij/lang/javascript/psi/JSAttribute.java    | 6 ++++--
 .../lang/javascript/psi/JSAttributeListOwner.java        | 2 +-
 .../lang/javascript/psi/JSAttributeNameValuePair.java    | 2 +-
 .../intellij/lang/javascript/psi/JSBinaryExpression.java | 7 ++-----
 .../intellij/lang/javascript/psi/JSBlockStatement.java   | 7 ++-----
 .../intellij/lang/javascript/psi/JSBreakStatement.java   | 7 ++-----
 .../intellij/lang/javascript/psi/JSCallExpression.java   | 7 ++-----
 .../com/intellij/lang/javascript/psi/JSCaseClause.java   | 7 ++-----
 .../com/intellij/lang/javascript/psi/JSCatchBlock.java   | 7 ++-----
 .../java/com/intellij/lang/javascript/psi/JSClass.java   | 2 +-
 .../intellij/lang/javascript/psi/JSClassExpression.java  | 2 +-
 .../intellij/lang/javascript/psi/JSCommaExpression.java  | 7 ++-----
 .../lang/javascript/psi/JSConditionalExpression.java     | 7 ++-----
 .../lang/javascript/psi/JSContinueStatement.java         | 7 ++-----
 .../lang/javascript/psi/JSDefinitionExpression.java      | 7 ++-----
 .../lang/javascript/psi/JSDestructuringParameter.java    | 2 +-
 .../psi/JSDestructuringShorthandedProperty.java          | 4 ++--
 .../intellij/lang/javascript/psi/JSDoWhileStatement.java | 7 ++-----
 .../java/com/intellij/lang/javascript/psi/JSElement.java | 2 +-
 .../intellij/lang/javascript/psi/JSElementVisitor.java   | 7 ++-----
 .../intellij/lang/javascript/psi/JSEmptyStatement.java   | 7 ++-----
 .../com/intellij/lang/javascript/psi/JSExpression.java   | 2 +-
 .../lang/javascript/psi/JSExpressionStatement.java       | 5 ++---
 .../intellij/lang/javascript/psi/JSForInStatement.java   | 7 ++-----
 .../com/intellij/lang/javascript/psi/JSForStatement.java | 7 ++-----
 .../lang/javascript/psi/JSFunctionExpression.java        | 2 +-
 .../intellij/lang/javascript/psi/JSFunctionProperty.java | 2 +-
 .../intellij/lang/javascript/psi/JSGenericSignature.java | 2 +-
 .../com/intellij/lang/javascript/psi/JSIfStatement.java  | 7 ++-----
 .../intellij/lang/javascript/psi/JSImportStatement.java  | 4 ++--
 .../intellij/lang/javascript/psi/JSIncludeDirective.java | 2 +-
 .../psi/JSIndexedPropertyAccessExpression.java           | 7 ++-----
 .../intellij/lang/javascript/psi/JSLabeledStatement.java | 7 ++-----
 .../intellij/lang/javascript/psi/JSLetExpression.java    | 7 ++-----
 .../lang/javascript/psi/JSLiteralExpression.java         | 2 +-
 .../intellij/lang/javascript/psi/JSLoopStatement.java    | 7 ++-----
 .../lang/javascript/psi/JSNamespaceDeclaration.java      | 7 ++++---
 .../intellij/lang/javascript/psi/JSNewExpression.java    | 7 ++-----
 .../lang/javascript/psi/JSObjectLiteralExpression.java   | 7 ++-----
 .../intellij/lang/javascript/psi/JSPackageStatement.java | 2 +-
 .../com/intellij/lang/javascript/psi/JSParameter.java    | 5 ++---
 .../intellij/lang/javascript/psi/JSParameterList.java    | 3 +--
 .../lang/javascript/psi/JSParenthesizedExpression.java   | 7 ++-----
 .../lang/javascript/psi/JSPostfixExpression.java         | 7 ++-----
 .../intellij/lang/javascript/psi/JSPrefixExpression.java | 9 +++------
 .../com/intellij/lang/javascript/psi/JSProperty.java     | 2 +-
 .../lang/javascript/psi/JSReferenceExpression.java       | 2 +-
 .../intellij/lang/javascript/psi/JSReferenceList.java    | 6 +++---
 .../intellij/lang/javascript/psi/JSReturnStatement.java  | 7 ++-----
 .../com/intellij/lang/javascript/psi/JSStatement.java    | 7 ++-----
 .../intellij/lang/javascript/psi/JSSuperExpression.java  | 2 +-
 .../intellij/lang/javascript/psi/JSSwitchStatement.java  | 7 ++-----
 .../intellij/lang/javascript/psi/JSThisExpression.java   | 7 ++-----
 .../intellij/lang/javascript/psi/JSThrowStatement.java   | 7 ++-----
 .../com/intellij/lang/javascript/psi/JSTryStatement.java | 7 ++-----
 .../lang/javascript/psi/JSUseNamespaceDirective.java     | 2 +-
 .../com/intellij/lang/javascript/psi/JSVarStatement.java | 7 ++-----
 .../com/intellij/lang/javascript/psi/JSVariable.java     | 3 +--
 .../intellij/lang/javascript/psi/JSWhileStatement.java   | 7 ++-----
 .../intellij/lang/javascript/psi/JSWithStatement.java    | 7 ++-----
 .../intellij/lang/javascript/psi/JSYieldStatement.java   | 5 ++---
 .../lang/javascript/psi/stubs/JSAttributeListStub.java   | 3 +--
 .../psi/stubs/JSAttributeNameValuePairStub.java          | 3 +--
 .../lang/javascript/psi/stubs/JSAttributeStub.java       | 3 +--
 .../intellij/lang/javascript/psi/stubs/JSClassStub.java  | 3 +--
 .../lang/javascript/psi/stubs/JSFunctionStub.java        | 3 +--
 .../lang/javascript/psi/stubs/JSImportStatementStub.java | 3 +--
 .../javascript/psi/stubs/JSIncludeDirectiveStub.java     | 3 +--
 .../javascript/psi/stubs/JSNamespaceDeclarationStub.java | 3 +--
 .../javascript/psi/stubs/JSPackageStatementStub.java     | 3 +--
 .../lang/javascript/psi/stubs/JSParameterListStub.java   | 3 +--
 .../lang/javascript/psi/stubs/JSParameterStub.java       | 3 +--
 .../lang/javascript/psi/stubs/JSQualifiedStub.java       | 3 +--
 .../lang/javascript/psi/stubs/JSReferenceListStub.java   | 3 +--
 .../lang/javascript/psi/stubs/JSStubElement.java         | 3 +--
 .../psi/stubs/JSUseNamespaceDirectiveStub.java           | 3 +--
 .../lang/javascript/psi/stubs/JSVarStatementStub.java    | 3 +--
 .../lang/javascript/psi/stubs/JSVariableStub.java        | 3 +--
 .../lang/javascript/psi/stubs/JSVariableStubBase.java    | 3 +--
 82 files changed, 133 insertions(+), 264 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
index 564efbaf..1257b8b0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArgumentList.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:44:58 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSArgumentList extends JSElement {
     JSExpression[] getArguments();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
index 15de56ed..66abf008 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:30:55 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSArrayLiteralExpression extends JSExpression {
     /**
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
index d7b81f06..147515af 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAssignmentExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:40:31 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSAssignmentExpression extends JSBinaryExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
index 942472a3..697dfcf5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.StubBasedPsiElement;
 import consulo.util.collection.ArrayFactory;
@@ -26,9 +27,9 @@
  * @author Maxim.Mossienko
  */
 public interface JSAttribute extends JSElement, PsiNamedElement, StubBasedPsiElement<JSAttributeStub> {
-    public static final JSAttribute[] EMPTY_ARRAY = new JSAttribute[0];
+    JSAttribute[] EMPTY_ARRAY = new JSAttribute[0];
 
-    public static ArrayFactory<JSAttribute> ARRAY_FACTORY = new ArrayFactory<JSAttribute>() {
+    ArrayFactory<JSAttribute> ARRAY_FACTORY = new ArrayFactory<>() {
         @Nonnull
         @Override
         public JSAttribute[] create(int count) {
@@ -37,6 +38,7 @@ public JSAttribute[] create(int count) {
     };
 
     @Override
+    @RequiredReadAction
     String getName();
 
     JSAttributeNameValuePair[] getValues();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
index 9cadd6d3..cf325a78 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
@@ -21,7 +21,7 @@
 import jakarta.annotation.Nullable;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public interface JSAttributeListOwner extends PsiElement {
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
index 717f4fa1..b6767f87 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
@@ -22,7 +22,7 @@
 import consulo.language.psi.StubBasedPsiElement;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public interface JSAttributeNameValuePair extends JSElement, PsiNamedElement, StubBasedPsiElement<JSAttributeNameValuePairStub> {
     JSAttributeNameValuePair[] EMPTY_ARRAY = new JSAttributeNameValuePair[0];
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
index e455c6ab..1deb474d 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
@@ -22,11 +22,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:49:21 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSBinaryExpression extends JSExpression {
     JSExpression getLOperand();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
index 834e7235..f7a142f5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBlockStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:51:45 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSBlockStatement extends JSStatement {
     JSStatement[] getStatements();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
index 93d23fc7..2039167a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:58:10 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSBreakStatement extends JSStatement {
     String getLabel();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
index de053d68..c3c4432d 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:46:07 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSCallExpression extends JSExpression {
     JSExpression getMethodExpression();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
index b7641b89..21f30835 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:16:36 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSCaseClause extends JSElement {
     boolean isDefault();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
index 7f6b47b3..28e3a812 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:04:04 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSCatchBlock extends JSElement {
     JSCatchBlock[] EMPTY_ARRAY = new JSCatchBlock[0];
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
index 34090226..efa23325 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
@@ -22,7 +22,7 @@
 import consulo.navigation.Navigatable;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public interface JSClass extends JSQualifiedNamedElement, JSSourceElement, JSAttributeListOwner, Navigatable, StubBasedPsiElement<JSClassStub> {
     JSClass[] EMPTY_ARRAY = new JSClass[0];
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
index 899d71ed..7b971391 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
@@ -6,7 +6,7 @@
 
 /**
  * @author VISTALL
- * @since 11/12/2021
+ * @since 2021-12-11
  */
 public interface JSClassExpression extends JSExpression {
     @Nonnull
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
index bd22bcc4..c1bcfd29 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCommaExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:42:26 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSCommaExpression extends JSBinaryExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
index 96c8377b..5b2eb3cf 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:40:54 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSConditionalExpression extends JSExpression {
     JSExpression getCondition();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
index 91736e37..90e81898 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:58:10 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSContinueStatement extends JSStatement {
     String getLabel();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
index d4c1ed57..ebbe5147 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDefinitionExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: maxim.mossienko
- * Date: Dec 14, 2005
- * Time: 6:37:59 PM
- * To change this template use File | Settings | File Templates.
+ * @author maxim.mossienko
+ * @since 2005-12-14
  */
 public interface JSDefinitionExpression extends JSExpression, JSNamedElement {
     JSExpression getExpression();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
index 2fb35bed..d2618005 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
@@ -8,7 +8,7 @@
  * @since 2019-12-17
  */
 public interface JSDestructuringParameter extends JSParameter {
-    @RequiredReadAction
     @Nullable
+    @RequiredReadAction
     JSDestructuringObject getDestructuringObject();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
index 913eb0e0..1b48d22e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
@@ -8,7 +8,7 @@
  * @since 2019-12-14
  */
 public interface JSDestructuringShorthandedProperty extends JSElement {
-    @RequiredReadAction
     @Nonnull
-    JSVariable getVarialbe();
+    @RequiredReadAction
+    JSVariable getVariable();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
index 4abc2ce7..c5bc10ae 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDoWhileStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:25:34 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSDoWhileStatement extends JSLoopStatement {
     JSExpression getCondition();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
index 157e44a4..89c2da37 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElement.java
@@ -20,7 +20,7 @@
 
 /**
  * @author max
- * @since 2:30:26 PM Feb 3, 2005
+ * @since 2005-02-03
  */
 public interface JSElement extends NavigatablePsiElement {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
index 676bd01e..9e0c9eb3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
@@ -21,11 +21,8 @@
 import consulo.language.psi.PsiElementVisitor;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Feb 3, 2005
- * Time: 2:25:12 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-02-03
  */
 public class JSElementVisitor extends PsiElementVisitor {
     public void visitJSCallExpression(final JSCallExpression node) {
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
index fa77a3fb..0c0a57f9 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSEmptyStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:56:36 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSEmptyStatement extends JSStatement {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
index 71135e68..717fdbf0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
@@ -24,7 +24,7 @@
 
 /**
  * @author max
- * @since 6:46:19 PM Jan 30, 2005
+ * @since 2005-01-30
  */
 public interface JSExpression extends JSElement {
     JSExpression[] EMPTY_ARRAY = new JSExpression[0];
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
index 6a51ada7..2fd6b943 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
@@ -20,9 +20,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:27:17 PM
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSExpressionStatement extends JSStatement {
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
index b57a50c7..292e3fde 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:20:55 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSForInStatement extends JSLoopStatement {
     JSVarStatement getDeclarationStatement();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
index 54c49c7d..e4896067 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:21:49 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSForStatement extends JSLoopStatement {
     JSVarStatement getVarDeclaration();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
index 6a1c1a64..8d6bc703 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
@@ -20,7 +20,7 @@
 
 /**
  * @author max
- * @since 7:42:48 PM Jan 30, 2005
+ * @since 2005-01-30
  */
 public interface JSFunctionExpression extends JSFunction, JSExpression {
     @Nonnull
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java
index 452fa1f1..e58eb63c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionProperty.java
@@ -2,7 +2,7 @@
 
 /**
  * @author VISTALL
- * @since 19/12/2021
+ * @since 2021-12-19
  */
 public interface JSFunctionProperty extends JSProperty, JSFunction {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
index 8121a2c9..617f0b6e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSGenericSignature.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public interface JSGenericSignature extends JSElement {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
index af1c2f3e..fabe9159 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:56:53 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSIfStatement extends JSStatement {
     JSExpression getCondition();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
index b4081f35..4d4a7209 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
@@ -22,9 +22,9 @@
 import consulo.language.psi.StubBasedPsiElement;
 
 /**
- * @by Maxim.Mossienko
- * <p>
  * EcmaScript 4 implementation
+ *
+ * @author Maxim.Mossienko
  */
 @Deprecated
 @DeprecationInfo("We need rename it")
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
index 77afe74a..66dd7537 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
@@ -21,7 +21,7 @@
 import consulo.language.psi.StubBasedPsiElement;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public interface JSIncludeDirective extends JSStatement, StubBasedPsiElement<JSIncludeDirectiveStub> {
     String getIncludeText();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
index 86902196..78ba3a0b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:45:31 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSIndexedPropertyAccessExpression extends JSExpression {
     JSExpression getQualifier();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
index 5cf2bf9c..dca855f7 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
@@ -21,11 +21,8 @@
 import consulo.annotation.DeprecationInfo;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:52:43 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSLabeledStatement extends JSStatement, PsiNameIdentifierOwner {
     String getLabel();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
index 111e5bcf..355fee29 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLetExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: maxim.mossienko
- * Date: Dec 14, 2005
- * Time: 6:37:59 PM
- * To change this template use File | Settings | File Templates.
+ * @author maxim.mossienko
+ * @since 2005-12-14
  */
 public interface JSLetExpression extends JSExpression {
     JSExpression getExpression();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
index cab692fd..d3ecf075 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLiteralExpression.java
@@ -18,7 +18,7 @@
 
 /**
  * @author max
- * @since 7:29:31 PM Jan 30, 2005
+ * @since 2005-01-30
  */
 public interface JSLiteralExpression extends JSExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
index a15ac2b9..a842b55c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:22:13 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSLoopStatement extends JSStatement {
     JSStatement getBody();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
index 9361fda1..f8bd8cda 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
@@ -21,10 +21,11 @@
 import jakarta.annotation.Nullable;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
-public interface JSNamespaceDeclaration extends JSStatement, JSQualifiedNamedElement, JSAttributeListOwner,
-    StubBasedPsiElement<JSNamespaceDeclarationStub> {
+public interface JSNamespaceDeclaration
+    extends JSStatement, JSQualifiedNamedElement, JSAttributeListOwner, StubBasedPsiElement<JSNamespaceDeclarationStub> {
+
     @Nullable
     String getInitialValueString();
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
index d5e92efa..d2426405 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNewExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:44:26 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSNewExpression extends JSCallExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
index 2552d442..64dc260e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSObjectLiteralExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:38:54 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSObjectLiteralExpression extends JSExpression {
     JSProperty[] getProperties();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
index 8ca502b5..be246160 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
@@ -20,7 +20,7 @@
 import consulo.language.psi.StubBasedPsiElement;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public interface JSPackageStatement extends JSStatement, JSQualifiedNamedElement, StubBasedPsiElement<JSPackageStatementStub> {
     JSSourceElement[] getStatements();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
index 97c415e3..e4551b72 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
@@ -22,9 +22,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:43:02 PM
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSParameter extends JSVariable {
     JSParameter[] EMPTY_ARRAY = new JSParameter[0];
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
index f2baa3f2..d6ffcb89 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameterList.java
@@ -21,8 +21,7 @@
 
 /**
  * @author max
- * Date: Jan 30, 2005
- * Time: 6:42:10 PM
+ * @since 2005-01-30
  */
 public interface JSParameterList extends JSElement, StubBasedPsiElement<JSParameterListStub> {
     JSParameter[] getParameters();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
index 7ae3b68a..44fe2b9d 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParenthesizedExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:30:30 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSParenthesizedExpression extends JSExpression {
     JSExpression getInnerExpression();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
index 28bcb399..3bec6450 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
@@ -20,11 +20,8 @@
 import consulo.language.ast.IElementType;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:41:36 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSPostfixExpression extends JSExpression {
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
index 427be979..804f4c98 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
@@ -22,11 +22,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:41:36 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSPrefixExpression extends JSExpression {
     @Nullable
@@ -36,7 +33,7 @@ public interface JSPrefixExpression extends JSExpression {
     @RequiredReadAction
     IElementType getOperationSign();
 
-    @RequiredReadAction
     @Nullable
+    @RequiredReadAction
     PsiElement getOperatorElement();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
index 4699a506..8a2858c4 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
@@ -27,7 +27,7 @@
 
 /**
  * @author max
- * @since 7:39:29 PM Jan 30, 2005
+ * @since 2005-01-30
  */
 public interface JSProperty extends JSNamedElement {
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
index f83a3ff2..0c43a695 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
@@ -23,7 +23,7 @@
 
 /**
  * @author max
- * @since 7:26:32 PM Jan 30, 2005
+ * @since 2005-01-30
  */
 public interface JSReferenceExpression extends JSExpression, PsiPolyVariantReference {
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
index ed264aa2..765577a4 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
@@ -26,15 +26,15 @@
  * @author Maxim.Mossienko
  */
 public interface JSReferenceList extends JSElement, StubBasedPsiElement<JSReferenceListStub> {
-    @RequiredReadAction
     @Nonnull
+    @RequiredReadAction
     JSReferenceExpression[] getExpressions();
 
-    @RequiredReadAction
     @Nonnull
+    @RequiredReadAction
     String[] getReferenceTexts();
 
-    @RequiredReadAction
     @Nonnull
+    @RequiredReadAction
     JSClass[] getReferencedClasses();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
index 4ab01026..13c306f0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReturnStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:01:41 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSReturnStatement extends JSStatement {
     JSExpression getExpression();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
index 0a56c085..3cd19249 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
@@ -19,11 +19,8 @@
 import consulo.language.util.IncorrectOperationException;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:48:51 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSStatement extends JSSourceElement {
     JSStatement[] EMPTY = new JSStatement[0];
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
index d78a5b0e..e7f47e5a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSuperExpression.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public interface JSSuperExpression extends JSExpression {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
index 38d5915f..68aa4d33 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSSwitchStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:06:18 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSSwitchStatement extends JSStatement {
     JSExpression getSwitchExpression();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
index 67c3b0fc..7cae6897 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThisExpression.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:28:55 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSThisExpression extends JSExpression {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
index 0b5d3314..d4dbb1c3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSThrowStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:02:11 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSThrowStatement extends JSStatement {
     JSExpression getExpression();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
index 0093e2ea..8d8c1f7c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
@@ -20,11 +20,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:03:06 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSTryStatement extends JSStatement {
     JSStatement getStatement();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
index 50546d5b..24c42cfa 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
@@ -20,7 +20,7 @@
 import consulo.language.psi.StubBasedPsiElement;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public interface JSUseNamespaceDirective extends JSStatement, StubBasedPsiElement<JSUseNamespaceDirectiveStub> {
     String getNamespaceToBeUsed();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
index 4fdaa0ff..33209cdd 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
@@ -22,11 +22,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 6:55:04 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSVarStatement extends JSStatement, StubBasedPsiElement<JSVarStatementStub> {
     JSVariable[] getVariables();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index dfc09d7e..b5e8c804 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -26,8 +26,7 @@
 
 /**
  * @author max
- * Date: Jan 30, 2005
- * Time: 6:43:42 PM
+ * @since 2005-01-30
  */
 public interface JSVariable extends JSQualifiedNamedElement, JSAttributeListOwner {
     JSVariable[] EMPTY_ARRAY = new JSVariable[0];
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
index ab8e801a..986f7e13 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWhileStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:25:13 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSWhileStatement extends JSLoopStatement {
     JSExpression getCondition();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
index cd57794d..a9ed2b3b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSWithStatement.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.psi;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 7:01:01 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public interface JSWithStatement extends JSStatement {
     JSExpression getExpression();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
index 63791adb..ae7463a0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
@@ -19,9 +19,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:27:17 PM
+ * @author Maxim.Mossienko
+ * @since 2005-01-30
  */
 public interface JSYieldStatement extends JSStatement {
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
index 62717ff6..f0b68dbd 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 25, 2008
- * Time: 4:00:16 PM
+ * @since 2008-03-25
  */
 public interface JSAttributeListStub extends StubElement<JSAttributeList>, JSStubElement<JSAttributeList> {
     JSAttributeList.AccessType getAccessType();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
index 846fa987..18b51cfa 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
@@ -22,8 +22,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 6, 2008
- * Time: 7:52:57 PM
+ * @since 2008-06-06
  */
 public interface JSAttributeNameValuePairStub extends JSStubElement<JSAttributeNameValuePair>, StubElement<JSAttributeNameValuePair> {
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
index 7208cfe9..e757e32c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeStub.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 25, 2008
- * Time: 4:00:16 PM
+ * @since 2008-03-25
  */
 public interface JSAttributeStub extends JSStubElement<JSAttribute>, NamedStub<JSAttribute> {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
index b888d2cd..41c8861b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSClassStub.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 25, 2008
- * Time: 4:00:16 PM
+ * @since 2008-03-25
  */
 public interface JSClassStub extends JSStubElement<JSClass>, JSQualifiedStub<JSClass> {
     boolean isInterface();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
index 51ae4e1d..52e388c2 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSFunctionStub.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 25, 2008
- * Time: 4:00:16 PM
+ * @since 2008-03-25
  */
 public interface JSFunctionStub extends JSStubElement<JSFunction>, JSQualifiedStub<JSFunction> {
     String getReturnTypeString();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
index b2b46c09..171f941e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSImportStatementStub.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 6, 2008
- * Time: 7:52:44 PM
+ * @since 2008-06-06
  */
 public interface JSImportStatementStub extends JSStubElement<JSImportStatement>, StubElement<JSImportStatement> {
     String getImportText();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
index 4f0f1f6f..6954fef0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSIncludeDirectiveStub.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 6, 2008
- * Time: 7:52:57 PM
+ * @since 2008-06-06
  */
 public interface JSIncludeDirectiveStub extends JSStubElement<JSIncludeDirective>, StubElement<JSIncludeDirective> {
     String getIncludeText();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
index 6f1666f8..762a22a5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSNamespaceDeclarationStub.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 6, 2008
- * Time: 7:52:57 PM
+ * @since 2008-06-06
  */
 public interface JSNamespaceDeclarationStub extends JSStubElement<JSNamespaceDeclaration>, JSQualifiedStub<JSNamespaceDeclaration> {
     String getInitialValueString();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
index 1caf3b38..79237ac0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSPackageStatementStub.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 6, 2008
- * Time: 7:52:30 PM
+ * @since 2008-06-06
  */
 public interface JSPackageStatementStub extends JSStubElement<JSPackageStatement>, JSQualifiedStub<JSPackageStatement> {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
index a9831313..50fadd94 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterListStub.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 25, 2008
- * Time: 4:00:16 PM
+ * @since 2008-03-25
  */
 public interface JSParameterListStub extends JSStubElement<JSParameterList> {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
index 7cbcbdb9..afb9ed81 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSParameterStub.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 25, 2008
- * Time: 4:00:16 PM
+ * @since 2008-03-25
  */
 public interface JSParameterStub extends JSVariableStubBase<JSParameter> {
     boolean isRest();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
index 4d47474a..eb018dab 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSQualifiedStub.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 30, 2008
- * Time: 9:30:52 PM
+ * @since 2008-07-30
  */
 public interface JSQualifiedStub<T extends JSQualifiedNamedElement> extends NamedStub<T>, JSStubElement<T> {
     String getQualifiedName();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
index 55972d9e..83973abd 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSReferenceListStub.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 6, 2008
- * Time: 7:52:51 PM
+ * @since 2008-06-06
  */
 public interface JSReferenceListStub extends JSStubElement<JSReferenceList>, StubElement<JSReferenceList> {
     String[] getReferenceTexts();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
index 0cc370ab..5b2b9f90 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSStubElement.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 26, 2008
- * Time: 9:39:31 PM
+ * @since 2008-03-26
  */
 public interface JSStubElement<T extends JSElement> extends StubElement<T> {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
index 853a9917..25c4327b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSUseNamespaceDirectiveStub.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 6, 2008
- * Time: 7:52:51 PM
+ * @since 2008-06-06
  */
 public interface JSUseNamespaceDirectiveStub extends JSStubElement<JSUseNamespaceDirective>, StubElement<JSUseNamespaceDirective> {
     String getNamespaceToUse();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
index 0e3f44e0..bc5d729a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVarStatementStub.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 8, 2008
- * Time: 1:51:29 PM
+ * @since 2008-06-08
  */
 public interface JSVarStatementStub extends JSStubElement<JSVarStatement> {
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
index 7790bfeb..ff736696 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStub.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 25, 2008
- * Time: 4:00:16 PM
+ * @since 2008-03-25
  */
 public interface JSVariableStub extends JSVariableStubBase<JSVariable> {
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
index 261cff1d..552c705a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSVariableStubBase.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 25, 2008
- * Time: 4:00:16 PM
+ * @since 2008-03-25
  */
 public interface JSVariableStubBase<T extends JSVariable> extends JSQualifiedStub<T>, JSStubElement<T> {
     String getTypeString();

From b07daba658cfab977faa66184b21c3548f24cad4 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 04:11:53 +0300
Subject: [PATCH 258/340] Refactoring psi impl (first part).

---
 .../psi/JSArrayLiteralExpression.java         |   3 +
 .../lang/javascript/psi/JSAttributeList.java  |   7 +
 .../psi/JSAttributeNameValuePair.java         |   3 +
 .../javascript/psi/JSBinaryExpression.java    |   2 +
 .../lang/javascript/psi/JSBreakStatement.java |   4 +
 .../lang/javascript/psi/JSCallExpression.java |   3 +
 .../lang/javascript/psi/JSCaseClause.java     |   4 +
 .../lang/javascript/psi/JSCatchBlock.java     |   3 +
 .../intellij/lang/javascript/psi/JSClass.java |   6 +-
 .../psi/JSConditionalExpression.java          |   5 +
 .../javascript/psi/JSContinueStatement.java   |   3 +
 .../lang/javascript/psi/JSDocComment.java     |   2 +
 .../lang/javascript/psi/JSElementVisitor.java | 133 ++++++------
 .../intellij/lang/javascript/psi/JSFile.java  |   2 +-
 .../lang/javascript/psi/JSForInStatement.java |   4 +
 .../lang/javascript/psi/JSForStatement.java   |   6 +
 .../lang/javascript/psi/JSFunction.java       |   5 +-
 .../lang/javascript/psi/JSIfStatement.java    |   3 +
 .../javascript/psi/JSImportStatement.java     |   4 +-
 .../javascript/psi/JSIncludeDirective.java    |   3 +
 .../JSIndexedPropertyAccessExpression.java    |   4 +
 .../javascript/psi/JSLabeledStatement.java    |   3 +
 .../lang/javascript/psi/JSLoopStatement.java  |   3 +
 .../javascript/psi/JSPackageStatement.java    |   4 +-
 .../javascript/psi/JSPostfixExpression.java   |   2 +
 .../psi/JSQualifiedNamedElement.java          |   3 +
 .../lang/javascript/psi/JSStatement.java      |   4 +
 .../lang/javascript/psi/JSTryStatement.java   |   5 +
 .../psi/JSUseNamespaceDirective.java          |   2 +
 .../lang/javascript/psi/JSVarStatement.java   |   1 +
 .../lang/javascript/psi/JSVariable.java       |   1 +
 .../psi/stubs/JSAttributeListStub.java        |   2 +-
 .../JSDocumentationProvider.java              | 191 +++++++++--------
 .../javascript/flex/XmlBackedJSClassImpl.java | 193 ++++++++++--------
 .../psi/impl/JSArgumentListImpl.java          |   7 +-
 .../impl/JSArrayLiteralExpressionImpl.java    |  13 +-
 .../psi/impl/JSAssignmentExpressionImpl.java  |   9 +-
 .../javascript/psi/impl/JSAttributeImpl.java  |  63 +++---
 .../psi/impl/JSAttributeListImpl.java         |  92 ++++-----
 .../impl/JSAttributeNameValuePairImpl.java    |  55 +++--
 .../psi/impl/JSBinaryExpressionImpl.java      |  32 +--
 .../psi/impl/JSBlockStatementImpl.java        |  18 +-
 .../psi/impl/JSBreakStatementImpl.java        |  11 +-
 .../psi/impl/JavaScriptSimpleType.java        |   2 +-
 .../reference/JSPropertyNameReference.java    |   6 +-
 45 files changed, 521 insertions(+), 410 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
index 66abf008..f2cd42bc 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSArrayLiteralExpression.java
@@ -16,6 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
@@ -25,5 +27,6 @@ public interface JSArrayLiteralExpression extends JSExpression {
      * @return nulls stand in the returned array for skipped values. This for [,1,] array of 3 elements to be returned with first and last
      * elements nulled
      */
+    @RequiredReadAction
     JSExpression[] getExpressions();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
index 56ab6f7c..a2aae4cf 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
 import jakarta.annotation.Nullable;
 
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
@@ -28,14 +29,17 @@
  */
 public interface JSAttributeList extends JSElement, StubBasedPsiElement<JSAttributeListStub> {
     @Nullable
+    @RequiredReadAction
     String getNamespace();
 
     @Nullable
+    @RequiredReadAction
     JSReferenceExpression getNamespaceElement();
 
     JSAttribute[] getAttributes();
 
     @Nonnull
+    @RequiredReadAction
     JSAttribute[] getAttributesByName(@Nonnull String name);
 
     enum AccessType {
@@ -45,9 +49,11 @@ enum AccessType {
         PROTECTED
     }
 
+    @RequiredReadAction
     AccessType getAccessType();
 
     @Nullable
+    @RequiredReadAction
     PsiElement findAccessTypeElement();
 
     enum ModifierType {
@@ -59,5 +65,6 @@ enum ModifierType {
         VIRTUAL
     }
 
+    @RequiredReadAction
     boolean hasModifier(ModifierType modifier);
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
index b6767f87..b2147f49 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
 import jakarta.annotation.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
 import consulo.language.psi.PsiNamedElement;
@@ -27,8 +28,10 @@
 public interface JSAttributeNameValuePair extends JSElement, PsiNamedElement, StubBasedPsiElement<JSAttributeNameValuePairStub> {
     JSAttributeNameValuePair[] EMPTY_ARRAY = new JSAttributeNameValuePair[0];
 
+    @RequiredReadAction
     JSExpression getValue();
 
     @Nullable
+    @RequiredReadAction
     String getSimpleValue();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
index 1deb474d..a13a2643 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
@@ -26,8 +26,10 @@
  * @since 2005-01-30
  */
 public interface JSBinaryExpression extends JSExpression {
+    @RequiredReadAction
     JSExpression getLOperand();
 
+    @RequiredReadAction
     JSExpression getROperand();
 
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
index 2039167a..23c3ab44 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBreakStatement.java
@@ -16,12 +16,16 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
  */
 public interface JSBreakStatement extends JSStatement {
+    @RequiredReadAction
     String getLabel();
 
+    @RequiredReadAction
     JSStatement getStatementToBreak();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
index c3c4432d..7c7c4311 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCallExpression.java
@@ -16,6 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
@@ -23,5 +25,6 @@
 public interface JSCallExpression extends JSExpression {
     JSExpression getMethodExpression();
 
+    @RequiredReadAction
     JSArgumentList getArgumentList();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
index 21f30835..00dde4dc 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCaseClause.java
@@ -16,13 +16,17 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
  */
 public interface JSCaseClause extends JSElement {
+    @RequiredReadAction
     boolean isDefault();
 
+    @RequiredReadAction
     JSExpression getCaseExpression();
 
     JSStatement[] getStatements();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
index 28e3a812..be01f5c8 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSCatchBlock.java
@@ -16,6 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
@@ -23,6 +25,7 @@
 public interface JSCatchBlock extends JSElement {
     JSCatchBlock[] EMPTY_ARRAY = new JSCatchBlock[0];
 
+    @RequiredReadAction
     JSParameter getParameter();
 
     JSStatement getStatement();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
index efa23325..3d98321f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
@@ -41,11 +41,11 @@ public interface JSClass extends JSQualifiedNamedElement, JSSourceElement, JSAtt
 
     JSVariable[] getFields();
 
-    JSFunction findFunctionByName(final String name);
+    JSFunction findFunctionByName(String name);
 
-    JSFunction findFunctionByNameAndKind(final String name, JSFunction.FunctionKind kind);
+    JSFunction findFunctionByNameAndKind(String name, JSFunction.FunctionKind kind);
 
-    JSVariable findFieldByName(final String name);
+    JSVariable findFieldByName(String name);
 
     JSClass[] getSupers();
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
index 5b2eb3cf..ee9f3b7c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSConditionalExpression.java
@@ -16,14 +16,19 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
  */
 public interface JSConditionalExpression extends JSExpression {
+    @RequiredReadAction
     JSExpression getCondition();
 
+    @RequiredReadAction
     JSExpression getThen();
 
+    @RequiredReadAction
     JSExpression getElse();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
index 90e81898..48b6a567 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSContinueStatement.java
@@ -16,6 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
@@ -23,5 +25,6 @@
 public interface JSContinueStatement extends JSStatement {
     String getLabel();
 
+    @RequiredReadAction
     JSStatement getStatementToContinue();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
index 7cf291c6..5062a699 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocComment.java
@@ -16,8 +16,10 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiComment;
 
 public interface JSDocComment extends PsiComment, JSElement {
+    @RequiredReadAction
     JSDocTag[] getTags();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
index 9e0c9eb3..0c781bee 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
@@ -19,272 +19,273 @@
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
 import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author max
  * @since 2005-02-03
  */
 public class JSElementVisitor extends PsiElementVisitor {
-    public void visitJSCallExpression(final JSCallExpression node) {
+    public void visitJSCallExpression(@Nonnull JSCallExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSIndexedPropertyAccessExpression(final JSIndexedPropertyAccessExpression node) {
+    public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAccessExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSNewExpression(final JSNewExpression node) {
+    public void visitJSNewExpression(@Nonnull JSNewExpression node) {
         visitJSCallExpression(node);
     }
 
-    public void visitJSFunctionExpression(final JSFunctionExpression node) {
+    public void visitJSFunctionExpression(@Nonnull JSFunctionExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSPrefixExpression(final JSPrefixExpression expression) {
+    public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
         visitJSExpression(expression);
     }
 
-    public void visitJSPostfixExpression(final JSPostfixExpression node) {
+    public void visitJSPostfixExpression(@Nonnull JSPostfixExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSConditionalExpression(final JSConditionalExpression node) {
+    public void visitJSConditionalExpression(@Nonnull JSConditionalExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSCommaExpression(final JSCommaExpression node) {
+    public void visitJSCommaExpression(@Nonnull JSCommaExpression node) {
         visitJSBinaryExpression(node);
     }
 
-    public void visitJSAssignmentExpression(final JSAssignmentExpression node) {
+    public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression node) {
         visitJSBinaryExpression(node);
     }
 
-    public void visitJSBinaryExpression(final JSBinaryExpression node) {
+    public void visitJSBinaryExpression(@Nonnull JSBinaryExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSProperty(final JSProperty node) {
+    public void visitJSProperty(@Nonnull JSProperty node) {
         visitJSElement(node);
     }
 
-    public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node) {
+    public void visitJSObjectLiteralExpression(@Nonnull JSObjectLiteralExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
+    public void visitJSArrayLiteralExpression(@Nonnull JSArrayLiteralExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSParenthesizedExpression(final JSParenthesizedExpression node) {
+    public void visitJSParenthesizedExpression(@Nonnull JSParenthesizedExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSReferenceExpression(final JSReferenceExpression node) {
+    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSDefinitionExpression(final JSDefinitionExpression node) {
+    public void visitJSDefinitionExpression(@Nonnull JSDefinitionExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSLiteralExpression(final JSSimpleLiteralExpression node) {
+    public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSThisExpression(final JSThisExpression node) {
+    public void visitJSThisExpression(@Nonnull JSThisExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSForInStatement(final JSForInStatement node) {
+    public void visitJSForInStatement(@Nonnull JSForInStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSForStatement(final JSForStatement node) {
+    public void visitJSForStatement(@Nonnull JSForStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSDoWhileStatement(final JSDoWhileStatement node) {
+    public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSWhileStatement(final JSWhileStatement node) {
+    public void visitJSWhileStatement(@Nonnull JSWhileStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSCaseClause(final JSCaseClause node) {
+    public void visitJSCaseClause(@Nonnull JSCaseClause node) {
         visitJSElement(node);
     }
 
-    public void visitJSSwitchStatement(final JSSwitchStatement node) {
+    public void visitJSSwitchStatement(@Nonnull JSSwitchStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSCatchBlock(final JSCatchBlock node) {
+    public void visitJSCatchBlock(@Nonnull JSCatchBlock node) {
         visitJSElement(node);
     }
 
-    public void visitJSTryStatement(final JSTryStatement node) {
+    public void visitJSTryStatement(@Nonnull JSTryStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSThrowStatement(final JSThrowStatement node) {
+    public void visitJSThrowStatement(@Nonnull JSThrowStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSReturnStatement(final JSReturnStatement node) {
+    public void visitJSReturnStatement(@Nonnull JSReturnStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSWithStatement(final JSWithStatement node) {
+    public void visitJSWithStatement(@Nonnull JSWithStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSBreakStatement(final JSBreakStatement node) {
+    public void visitJSBreakStatement(@Nonnull JSBreakStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSContinueStatement(final JSContinueStatement node) {
+    public void visitJSContinueStatement(@Nonnull JSContinueStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSIfStatement(final JSIfStatement node) {
+    public void visitJSIfStatement(@Nonnull JSIfStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSEmptyStatement(final JSEmptyStatement node) {
+    public void visitJSEmptyStatement(@Nonnull JSEmptyStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSVarStatement(final JSVarStatement node) {
+    public void visitJSVarStatement(@Nonnull JSVarStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSExpressionStatement(final JSExpressionStatement node) {
+    public void visitJSExpressionStatement(@Nonnull JSExpressionStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSLabeledStatement(final JSLabeledStatement node) {
+    public void visitJSLabeledStatement(@Nonnull JSLabeledStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSBlock(final JSBlockStatement node) {
+    public void visitJSBlock(@Nonnull JSBlockStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSArgumentList(final JSArgumentList node) {
+    public void visitJSArgumentList(@Nonnull JSArgumentList node) {
         visitJSElement(node);
     }
 
-    public void visitJSParameter(final JSParameter parameter) {
+    public void visitJSParameter(@Nonnull JSParameter parameter) {
         visitJSVariable(parameter);
     }
 
-    public void visitJSVariable(final JSVariable node) {
+    public void visitJSVariable(@Nonnull JSVariable node) {
         visitJSElement(node);
     }
 
-    public void visitJSParameterList(final JSParameterList node) {
+    public void visitJSParameterList(@Nonnull JSParameterList node) {
         visitJSElement(node);
     }
 
-    public void visitJSElement(final JSElement node) {
+    public void visitJSElement(@Nonnull JSElement node) {
         visitElement(node);
     }
 
-    public void visitJSSourceElement(final JSElement node) {
+    public void visitJSSourceElement(@Nonnull JSElement node) {
         visitJSElement(node);
     }
 
-    public void visitJSFunctionDeclaration(final JSFunction node) {
+    public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
         visitJSSourceElement(node);
     }
 
-    public void visitJSStatement(final JSStatement node) {
+    public void visitJSStatement(@Nonnull JSStatement node) {
         visitJSSourceElement(node);
     }
 
-    public void visitJSExpression(final JSExpression node) {
+    public void visitJSExpression(@Nonnull JSExpression node) {
         visitJSElement(node);
     }
 
-    public void visitJSAttributeList(final JSAttributeList attributeList) {
+    public void visitJSAttributeList(@Nonnull JSAttributeList attributeList) {
         visitJSElement(attributeList);
     }
 
-    public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
+    public void visitJSPackageStatement(@Nonnull JSPackageStatement packageStatement) {
         visitJSStatement(packageStatement);
     }
 
-    public void visitJSImportStatement(final JSImportStatement importStatement) {
+    public void visitJSImportStatement(@Nonnull JSImportStatement importStatement) {
         visitJSStatement(importStatement);
     }
 
-    public void visitJSUseNamespaceDirective(final JSUseNamespaceDirective useNamespaceDirective) {
+    public void visitJSUseNamespaceDirective(@Nonnull JSUseNamespaceDirective useNamespaceDirective) {
         visitJSStatement(useNamespaceDirective);
     }
 
-    public void visitJSNamespaceDeclaration(final JSNamespaceDeclaration namespaceDeclaration) {
+    public void visitJSNamespaceDeclaration(@Nonnull JSNamespaceDeclaration namespaceDeclaration) {
         visitJSStatement(namespaceDeclaration);
     }
 
-    public void visitJSClass(final JSClass aClass) {
+    public void visitJSClass(@Nonnull JSClass aClass) {
         visitJSElement(aClass);
     }
 
-    public void visitJSClassExpression(final JSClassExpression expression) {
+    public void visitJSClassExpression(@Nonnull JSClassExpression expression) {
         visitJSExpression(expression);
     }
 
-    public void visitJSReferenceList(final JSReferenceList referenceList) {
+    public void visitJSReferenceList(@Nonnull JSReferenceList referenceList) {
         visitJSElement(referenceList);
     }
 
-    public void visitJSSuperExpression(final JSSuperExpression superExpression) {
+    public void visitJSSuperExpression(@Nonnull JSSuperExpression superExpression) {
         visitJSExpression(superExpression);
     }
 
-    public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
+    public void visitJSIncludeDirective(@Nonnull JSIncludeDirective includeDirective) {
         visitJSStatement(includeDirective);
     }
 
-    public void visitJSAttribute(final JSAttribute jsAttribute) {
+    public void visitJSAttribute(@Nonnull JSAttribute jsAttribute) {
         visitJSElement(jsAttribute);
     }
 
-    public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair) {
+    public void visitJSAttributeNameValuePair(@Nonnull JSAttributeNameValuePair attributeNameValuePair) {
     }
 
-    public void visitJSYieldStatement(final JSYieldStatement statement) {
+    public void visitJSYieldStatement(@Nonnull JSYieldStatement statement) {
         visitJSStatement(statement);
     }
 
-    public void visitJSLetStatement(final JSLetStatement statement) {
+    public void visitJSLetStatement(@Nonnull JSLetStatement statement) {
         visitJSStatement(statement);
     }
 
-    public void visitJSLetExpression(final JSLetExpression expression) {
+    public void visitJSLetExpression(@Nonnull JSLetExpression expression) {
         visitJSExpression(expression);
     }
 
-    public void visitJSGenericSignature(final JSGenericSignature signature) {
+    public void visitJSGenericSignature(@Nonnull JSGenericSignature signature) {
         visitJSElement(signature);
     }
 
-    public void visitJSDocTagValue(final JSDocTagValue tagValue) {
+    public void visitJSDocTagValue(@Nonnull JSDocTagValue tagValue) {
         visitJSElement(tagValue);
     }
 
-    public void visitJSDocTag(final JSDocTag docTag) {
+    public void visitJSDocTag(@Nonnull JSDocTag docTag) {
         visitJSElement(docTag);
     }
 
-    public void visitJSDocComment(final JSDocComment docComment) {
+    public void visitJSDocComment(@Nonnull JSDocComment docComment) {
         visitComment(docComment);
     }
 
-    public void visitLambdaExpression(JavaScriptLambdaExpression expression) {
+    public void visitLambdaExpression(@Nonnull JavaScriptLambdaExpression expression) {
         visitJSExpression(expression);
     }
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
index 86a9cc6c..eade95fd 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFile.java
@@ -23,7 +23,7 @@
  * @author nik
  */
 public interface JSFile extends PsiFile, JSElement {
-    StubBasedPsiElement findStubbedElementAtOffset(final int offset, final Class<? extends StubBasedPsiElement> clazz);
+    StubBasedPsiElement findStubbedElementAtOffset(int offset, Class<? extends StubBasedPsiElement> clazz);
 
     JSSourceElement[] getStatements();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
index 292e3fde..dc6085fc 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForInStatement.java
@@ -16,6 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
@@ -23,8 +25,10 @@
 public interface JSForInStatement extends JSLoopStatement {
     JSVarStatement getDeclarationStatement();
 
+    @RequiredReadAction
     JSExpression getVariableExpression();
 
+    @RequiredReadAction
     JSExpression getCollectionExpression();
 
     boolean isForEach();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
index e4896067..65b3ac36 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSForStatement.java
@@ -16,16 +16,22 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
  */
 public interface JSForStatement extends JSLoopStatement {
+    @RequiredReadAction
     JSVarStatement getVarDeclaration();
 
+    @RequiredReadAction
     JSExpression getInitialization();
 
+    @RequiredReadAction
     JSExpression getCondition();
 
+    @RequiredReadAction
     JSExpression getUpdate();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index 8443d296..a12519e9 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -28,14 +28,15 @@
  * @author max
  */
 public interface JSFunction extends JSQualifiedNamedElement, JSSourceElement, JSAttributeListOwner {
-    public static final JSFunction[] EMPTY_ARRAY = new JSFunction[0];
+    JSFunction[] EMPTY_ARRAY = new JSFunction[0];
 
-    public static ArrayFactory<JSFunction> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSFunction[count];
+    ArrayFactory<JSFunction> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSFunction[count];
 
     @Nullable
     @RequiredReadAction
     JSParameterList getParameterList();
 
+    @RequiredReadAction
     JSSourceElement[] getBody();
 
     @RequiredReadAction
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
index fabe9159..7f797b5a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIfStatement.java
@@ -16,6 +16,8 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
@@ -25,6 +27,7 @@ public interface JSIfStatement extends JSStatement {
 
     JSStatement getThen();
 
+    @RequiredReadAction
     JSStatement getElse();
 
     void setThen(JSStatement statement);
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
index 4d4a7209..41886a1b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSImportStatement.java
@@ -18,6 +18,7 @@
 
 import com.intellij.lang.javascript.psi.stubs.JSImportStatementStub;
 import consulo.annotation.DeprecationInfo;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
 import consulo.language.psi.StubBasedPsiElement;
 
@@ -27,7 +28,8 @@
  * @author Maxim.Mossienko
  */
 @Deprecated
-@DeprecationInfo("We need rename it")
+@DeprecationInfo("We need to rename it")
 public interface JSImportStatement extends JSStatement, StubBasedPsiElement<JSImportStatementStub>, JavaScriptImportStatementBase {
+    @RequiredReadAction
     String getImportText();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
index 66dd7537..a11c9112 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIncludeDirective.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSIncludeDirectiveStub;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.StubBasedPsiElement;
 
@@ -24,7 +25,9 @@
  * @author Maxim.Mossienko
  */
 public interface JSIncludeDirective extends JSStatement, StubBasedPsiElement<JSIncludeDirectiveStub> {
+    @RequiredReadAction
     String getIncludeText();
 
+    @RequiredReadAction
     PsiFile resolveFile();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
index 78ba3a0b..a560c161 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSIndexedPropertyAccessExpression.java
@@ -16,12 +16,16 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
  */
 public interface JSIndexedPropertyAccessExpression extends JSExpression {
+    @RequiredReadAction
     JSExpression getQualifier();
 
+    @RequiredReadAction
     JSExpression getIndexExpression();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
index dca855f7..1820b3e8 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLabeledStatement.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiNameIdentifierOwner;
 import consulo.annotation.DeprecationInfo;
@@ -25,10 +26,12 @@
  * @since 2005-01-30
  */
 public interface JSLabeledStatement extends JSStatement, PsiNameIdentifierOwner {
+    @RequiredReadAction
     String getLabel();
 
     @Deprecated
     @DeprecationInfo("Use #getNameIdentifier()")
+    @RequiredReadAction
     PsiElement getLabelIdentifier();
 
     JSStatement getStatement();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
index a842b55c..e385e68d 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSLoopStatement.java
@@ -16,10 +16,13 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author max
  * @since 2005-01-30
  */
 public interface JSLoopStatement extends JSStatement {
+    @RequiredReadAction
     JSStatement getBody();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
index be246160..c1cd7fe9 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPackageStatement.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSPackageStatementStub;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.psi.StubBasedPsiElement;
 
 /**
@@ -25,5 +26,6 @@
 public interface JSPackageStatement extends JSStatement, JSQualifiedNamedElement, StubBasedPsiElement<JSPackageStatementStub> {
     JSSourceElement[] getStatements();
 
-    void setQualifiedName(final String expectedPackageNameFromFile);
+    @RequiredWriteAction
+    void setQualifiedName(String expectedPackageNameFromFile);
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
index 3bec6450..324e2090 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
 import jakarta.annotation.Nullable;
 import consulo.language.ast.IElementType;
 
@@ -27,5 +28,6 @@ public interface JSPostfixExpression extends JSExpression {
     @Nullable
     JSExpression getExpression();
 
+    @RequiredReadAction
     IElementType getOperationSign();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
index 8765e153..c58a74a5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSQualifiedNamedElement.java
@@ -16,9 +16,12 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
+
 /**
  * @author ven
  */
 public interface JSQualifiedNamedElement extends JSNamedElement {
+    @RequiredReadAction
     String getQualifiedName();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
index 3cd19249..21355407 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSStatement.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.util.IncorrectOperationException;
 
 /**
@@ -25,9 +26,12 @@
 public interface JSStatement extends JSSourceElement {
     JSStatement[] EMPTY = new JSStatement[0];
 
+    @RequiredWriteAction
     JSStatement addStatementBefore(JSStatement toAdd) throws IncorrectOperationException;
 
+    @RequiredWriteAction
     JSStatement addStatementAfter(JSStatement toAdd) throws IncorrectOperationException;
 
+    @RequiredWriteAction
     JSStatement replace(JSStatement with);
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
index 8d8c1f7c..d30a4597 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
+import consulo.annotation.access.RequiredReadAction;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -24,15 +25,19 @@
  * @since 2005-01-30
  */
 public interface JSTryStatement extends JSStatement {
+    @RequiredReadAction
     JSStatement getStatement();
 
     @Nonnull
+    @RequiredReadAction
     JSCatchBlock[] getAllCatchBlocks();
 
     @Deprecated
     @Nullable
+    @RequiredReadAction
     JSCatchBlock getCatchBlock();
 
     @Nullable
+    @RequiredReadAction
     JSStatement getFinallyStatement();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
index 24c42cfa..c63bba9b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSUseNamespaceDirective.java
@@ -17,11 +17,13 @@
 package com.intellij.lang.javascript.psi;
 
 import com.intellij.lang.javascript.psi.stubs.JSUseNamespaceDirectiveStub;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.StubBasedPsiElement;
 
 /**
  * @author Maxim.Mossienko
  */
 public interface JSUseNamespaceDirective extends JSStatement, StubBasedPsiElement<JSUseNamespaceDirectiveStub> {
+    @RequiredReadAction
     String getNamespaceToBeUsed();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
index 33209cdd..5292b603 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
@@ -26,6 +26,7 @@
  * @since 2005-01-30
  */
 public interface JSVarStatement extends JSStatement, StubBasedPsiElement<JSVarStatementStub> {
+    @RequiredReadAction
     JSVariable[] getVariables();
 
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index b5e8c804..e183f311 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -37,6 +37,7 @@ public interface JSVariable extends JSQualifiedNamedElement, JSAttributeListOwne
     @Nullable
     JSExpression getInitializer();
 
+    @RequiredReadAction
     String getInitializerText();
 
     void setInitializer(JSExpression expr) throws IncorrectOperationException;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
index f0b68dbd..67edae06 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeListStub.java
@@ -26,7 +26,7 @@
 public interface JSAttributeListStub extends StubElement<JSAttributeList>, JSStubElement<JSAttributeList> {
     JSAttributeList.AccessType getAccessType();
 
-    boolean hasModifier(final JSAttributeList.ModifierType modifier);
+    boolean hasModifier(JSAttributeList.ModifierType modifier);
 
     String getNamespace();
 
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 6c49e34b..0c3699f1 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -40,6 +40,7 @@
 import consulo.util.lang.Pair;
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import consulo.xml.psi.xml.XmlToken;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -53,28 +54,23 @@
 import java.util.Map;
 
 /**
- * User: Maxim.Mossienko
- * Date: Nov 4, 2005
- * Time: 5:04:28 PM
+ * @author Maxim.Mossienko
+ * @since 2005-11-04
  */
 @ExtensionImpl
 public class JSDocumentationProvider implements CodeDocumentationProvider, LanguageDocumentationProvider {
     private DocumentationProvider cssProvider;
-    @NonNls
     private static final String OBJECT_NAME = "Object";
     protected static final String SEE_PLAIN_TEXT_CHARS = "\t \"-\\/<>*";
 
-    @NonNls
     protected static final String PACKAGE = "package";
-    @NonNls
     protected static final String HTML_EXTENSION = ".html";
-    @NonNls
     protected static final String PACKAGE_FILE = PACKAGE + HTML_EXTENSION;
 
     protected static final Map<String, String> DOCUMENTED_ATTRIBUTES;
 
     static {
-        DOCUMENTED_ATTRIBUTES = new HashMap<String, String>();
+        DOCUMENTED_ATTRIBUTES = new HashMap<>();
         DOCUMENTED_ATTRIBUTES.put("Event", "event:");
         DOCUMENTED_ATTRIBUTES.put("Style", "style:");
         DOCUMENTED_ATTRIBUTES.put("Effect", "effect:");
@@ -89,7 +85,9 @@ private DocumentationProvider getCssProvider(Project project) throws Exception {
         return cssProvider;
     }
 
+    @Override
     @Nullable
+    @RequiredReadAction
     public String getQuickNavigateInfo(PsiElement element, PsiElement element2) {
         if (element instanceof JSFunction) {
             final JSFunction function = (JSFunction)element;
@@ -120,6 +118,7 @@ else if (element instanceof JSNamespaceDeclaration namespaceDeclaration) {
         return null;
     }
 
+    @RequiredReadAction
     private static String createQuickNavigateForAnnotationDerived(final PsiElement element) {
         final JSAttributeNameValuePair valuePair = (JSAttributeNameValuePair)element;
         final JSAttribute parent = (JSAttribute)valuePair.getParent();
@@ -131,6 +130,7 @@ private static String createQuickNavigateForAnnotationDerived(final PsiElement e
     }
 
     @Nullable
+    @RequiredReadAction
     private static String createQuickNavigateForFunction(final JSFunction function) {
         final PsiElement parent = JSResolveUtil.findParent(function);
         final StringBuilder result = new StringBuilder();
@@ -185,12 +185,13 @@ private static String createQuickNavigateForFunction(final JSFunction function)
         return result.toString();
     }
 
+    @RequiredReadAction
     private static void appendParentInfo(final PsiElement parent, final StringBuilder builder, PsiNamedElement element) {
-        if (parent instanceof JSClass) {
-            builder.append(((JSClass)parent).getQualifiedName()).append("\n");
+        if (parent instanceof JSClass jsClass) {
+            builder.append(jsClass.getQualifiedName()).append("\n");
         }
-        else if (parent instanceof JSPackageStatement) {
-            builder.append(((JSPackageStatement)parent).getQualifiedName()).append("\n");
+        else if (parent instanceof JSPackageStatement packageStatement) {
+            builder.append(packageStatement.getQualifiedName()).append("\n");
         }
         else if (parent instanceof JSFile) {
             if (parent.getContext() != null) {
@@ -259,9 +260,9 @@ private static void appendVarType(final JSVariable variable, final StringBuilder
         }
     }
 
-    private static
     @Nullable
-    String createQuickNavigateForClazz(final JSClass jsClass) {
+    @RequiredReadAction
+    private static String createQuickNavigateForClazz(final JSClass jsClass) {
         final String qName = jsClass.getQualifiedName();
         if (qName == null) {
             return null;
@@ -273,12 +274,7 @@ String createQuickNavigateForClazz(final JSClass jsClass) {
         }
 
         appendAttrList(jsClass, result);
-        if (jsClass.isInterface()) {
-            result.append("interface");
-        }
-        else {
-            result.append("class");
-        }
+        result.append(jsClass.isInterface() ? "interface" : "class");
 
         final String name = jsClass.getName();
         result.append(" ").append(name);
@@ -299,9 +295,8 @@ String createQuickNavigateForClazz(final JSClass jsClass) {
         return result.toString();
     }
 
-    private static
     @Nullable
-    String createQuickNavigateForNamespace(final JSNamespaceDeclaration ns) {
+    private static String createQuickNavigateForNamespace(JSNamespaceDeclaration ns) {
         final String qName = ns.getQualifiedName();
         if (qName == null) {
             return null;
@@ -324,7 +319,7 @@ String createQuickNavigateForNamespace(final JSNamespaceDeclaration ns) {
         return result.toString();
     }
 
-
+    @RequiredReadAction
     private static void appendAttrList(final JSAttributeListOwner jsClass, final StringBuilder result) {
         final JSAttributeList attributeList = jsClass.getAttributeList();
         if (attributeList != null) {
@@ -357,9 +352,9 @@ private static void appendAttrList(final JSAttributeListOwner jsClass, final Str
         }
     }
 
-    private static
     @Nullable
-    String generateReferenceTargetList(final @Nullable JSReferenceList implementsList, @Nonnull String packageName) {
+    @RequiredReadAction
+    private static String generateReferenceTargetList(final @Nullable JSReferenceList implementsList, @Nonnull String packageName) {
         if (implementsList == null) {
             return null;
         }
@@ -398,25 +393,25 @@ public List<String> getUrlFor(PsiElement element, PsiElement originalElement) {
                     return Collections.singletonList((String)o);
                 }
             }
-            catch (Exception e) {
+            catch (Exception ignored) {
             }
         }
         return null;
     }
 
     @Override
+    @RequiredReadAction
     public String generateDoc(PsiElement _element, PsiElement originalElement) {
-        if (_element instanceof JSReferenceExpression) {
+        if (_element instanceof JSReferenceExpression expression) {
             StringBuilder buffer = null;
 
             // ambigious reference
-            final JSReferenceExpression expression = (JSReferenceExpression)_element;
             for (ResolveResult r : expression.multiResolve(false)) {
                 if (buffer == null) {
                     buffer = new StringBuilder();
                 }
-                final PsiElement element = r.getElement();
-                final ItemPresentation presentation = ((NavigationItem)element).getPresentation();
+                PsiElement element = r.getElement();
+                ItemPresentation presentation = ((NavigationItem)element).getPresentation();
 
                 JSDocumentationUtils.appendHyperLinkToElement(
                     element,
@@ -476,50 +471,48 @@ public String generateDoc(PsiElement _element, PsiElement originalElement) {
                     return (String)o;
                 }
             }
-            catch (Exception e) {
+            catch (Exception ignored) {
             }
         }
 
         return null;
     }
 
+    @RequiredReadAction
     private static PsiElement findTargetElement(final PsiElement _element, PsiElement element) {
-        if (_element instanceof JSDefinitionExpression) {
-            final PsiElement parentElement = _element.getParent();
-
-            if (parentElement instanceof JSAssignmentExpression assignment) {
-                final JSExpression rOperand = assignment.getROperand();
-                element = rOperand instanceof JSFunctionExpression ? rOperand : _element;
+        if (_element instanceof JSDefinitionExpression definition) {
+            if (definition.getParent() instanceof JSAssignmentExpression assignment) {
+                JSExpression rOperand = assignment.getROperand();
+                element = rOperand instanceof JSFunctionExpression ? rOperand : definition;
             }
         }
-        else if (_element instanceof JSFunctionExpression) {
-            element = _element;
+        else if (_element instanceof JSFunctionExpression function) {
+            element = function;
         }
         else if (_element instanceof JSProperty property) {
-            final JSExpression expression = property.getValue();
-
-            if (expression instanceof JSFunction) {
-                element = expression;
+            if (property.getValue() instanceof JSFunction function) {
+                element = function;
             }
         }
-        else if (_element instanceof JSVariable) {
-            if (_element instanceof JSParameter) {
-                return PsiTreeUtil.getParentOfType(_element, JSFunction.class);
+        else if (_element instanceof JSVariable variable) {
+            if (variable instanceof JSParameter parameter) {
+                return PsiTreeUtil.getParentOfType(parameter, JSFunction.class);
             }
-            element = _element;
+            element = variable;
         }
-        else if (_element instanceof JSAttributeNameValuePair) {
-            return _element;
+        else if (_element instanceof JSAttributeNameValuePair nameValuePair) {
+            return nameValuePair;
         }
         return element;
     }
 
+    @RequiredReadAction
     private static PsiElement findFirstDocComment(PsiElement docComment) {
         if (docComment.getNode().getElementType() == JSTokenTypes.END_OF_LINE_COMMENT) {
             while (true) {
                 PsiElement prev = docComment.getPrevSibling();
-                if (prev instanceof PsiWhiteSpace) {
-                    prev = prev.getPrevSibling();
+                if (prev instanceof PsiWhiteSpace whiteSpace) {
+                    prev = whiteSpace.getPrevSibling();
                 }
                 if (prev == null) {
                     break;
@@ -534,28 +527,28 @@ private static PsiElement findFirstDocComment(PsiElement docComment) {
     }
 
     private static String findPossibleCssName(PsiElement _element) {
-        if (_element instanceof JSDefinitionExpression definitionExpression) {
-            final JSExpression expression = definitionExpression.getExpression();
+        if (_element instanceof JSDefinitionExpression definition) {
+            final JSExpression expression = definition.getExpression();
 
-            if (expression instanceof JSReferenceExpression referenceExpression) {
-                final String text = referenceExpression.getReferencedName();
+            if (expression instanceof JSReferenceExpression reference) {
+                String text = reference.getReferencedName();
                 if (text == null) {
                     return null;
                 }
-                final StringBuffer buf = new StringBuffer(text.length());
+                StringBuilder sb = new StringBuilder(text.length());
 
                 for (int i = 0; i < text.length(); ++i) {
                     final char ch = text.charAt(i);
 
                     if (Character.isUpperCase(ch)) {
-                        buf.append('-').append(Character.toLowerCase(ch));
+                        sb.append('-').append(Character.toLowerCase(ch));
                     }
                     else {
-                        buf.append(ch);
+                        sb.append(ch);
                     }
                 }
 
-                return buf.toString();
+                return sb.toString();
             }
         }
         return null;
@@ -563,28 +556,29 @@ private static String findPossibleCssName(PsiElement _element) {
 
     @Override
     public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) {
-        final PsiElement psiElement = findElementForWhichPreviousCommentWillBeSearched(object);
+        PsiElement psiElement = findElementForWhichPreviousCommentWillBeSearched(object);
         if (psiElement != null && JSDocumentationUtils.findDocComment(psiElement) != null) {
             return psiElement;
         }
-        if (object instanceof PsiElement) {
-            return (PsiElement)object;
+        if (object instanceof PsiElement objPsiElement) {
+            return objPsiElement;
         }
         return null;
     }
 
+    @RequiredReadAction
     public static PsiElement findElementForWhichPreviousCommentWillBeSearched(Object object) {
         if (object instanceof JSFunction function) {
             PsiElement psiElement = function;
             PsiElement parent = psiElement.getParent();
-            if (parent instanceof JSNewExpression) {
-                parent = parent.getParent();
+            if (parent instanceof JSNewExpression newExpr) {
+                parent = newExpr.getParent();
             }
-            if (parent instanceof JSProperty) {
-                psiElement = parent;
+            if (parent instanceof JSProperty property) {
+                psiElement = property;
             }
-            else if (parent instanceof JSAssignmentExpression) {
-                psiElement = parent.getParent();
+            else if (parent instanceof JSAssignmentExpression assignment) {
+                psiElement = assignment.getParent();
             }
 
             if (function.isSetProperty() || function.isGetProperty()) {
@@ -594,7 +588,7 @@ else if (parent instanceof JSAssignmentExpression) {
                             String name = prevFunction.getName();
 
                             if (name != null && name.equals(function.getName()) && (
-                                (prevFunction.isGetProperty() && function.isSetProperty())
+                                prevFunction.isGetProperty() && function.isSetProperty()
                                     || prevFunction.isSetProperty() && function.isGetProperty()
                             )) {
                                 PsiElement doc = JSDocumentationUtils.findDocComment(prevFunction);
@@ -618,38 +612,35 @@ else if (object instanceof PsiElement psiElement) {
                 return parent.getParent();
             }
             else if (parent instanceof JSVarStatement) {
-                final PsiElement firstChild = parent.getFirstChild();
-                if (firstChild instanceof JSAttributeList) {
-                    if (JSDocumentationUtils.findDocComment((PsiElement)object) != null) {
-                        return (PsiElement)object;
-                    }
+                if (parent.getFirstChild() instanceof JSAttributeList && JSDocumentationUtils.findDocComment(psiElement) != null) {
+                    return psiElement;
                 }
                 return parent;
             }
-            else if (parent instanceof JSAttribute) {
-                final PsiElement grandParent = parent.getParent();
-                if (grandParent.getFirstChild() == parent) {
-                    final PsiElement element = grandParent.getParent();
-                    if (element instanceof JSFile) {
-                        return grandParent;
+            else if (parent instanceof JSAttribute attribute) {
+                PsiElement attrParent = attribute.getParent();
+                if (attrParent.getFirstChild() == attribute) {
+                    PsiElement attrGrandParent = attrParent.getParent();
+                    if (attrGrandParent instanceof JSFile) {
+                        return attrParent;
                     }
-                    return element;
+                    return attrGrandParent;
                 }
-                return parent;
+                return attribute;
             }
             else if (parent instanceof JSSuppressionHolder) {
                 return parent;
             }
             else {
-                return (PsiElement)object;
+                return psiElement;
             }
         }
 
         return null;
     }
 
-    @Override
     @Nullable
+    @Override
     public PsiElement getDocumentationElementForLink(final PsiManager psiManager, String link, final PsiElement context) {
         return getDocumentationElementForLinkStatic(psiManager, link, context);
     }
@@ -729,10 +720,12 @@ else if (attributeType != null) {
     }
 
     @Nullable
+    @RequiredReadAction
     protected static JSAttributeNameValuePair findNamedAttribute(JSClass clazz, final String type, final String name) {
-        final Ref<JSAttributeNameValuePair> attribute = new Ref<JSAttributeNameValuePair>();
+        SimpleReference<JSAttributeNameValuePair> attribute = new SimpleReference<>();
         JSResolveUtil.processMetaAttributesForClass(clazz, new JSResolveUtil.MetaDataProcessor() {
             @Override
+            @RequiredReadAction
             public boolean process(@Nonnull JSAttribute jsAttribute) {
                 if (type.equals(jsAttribute.getName())) {
                     final JSAttributeNameValuePair jsAttributeNameValuePair = jsAttribute.getValueByName("name");
@@ -745,7 +738,7 @@ public boolean process(@Nonnull JSAttribute jsAttribute) {
             }
 
             @Override
-            public boolean handleOtherElement(PsiElement el, PsiElement context, @Nullable Ref<PsiElement> continuePassElement) {
+            public boolean handleOtherElement(PsiElement el, PsiElement context, @Nullable SimpleReference<PsiElement> continuePassElement) {
                 return true;
             }
         });
@@ -768,8 +761,8 @@ private static PsiElement findMethod(JSClass jsClass, String name) {
         return result;
     }
 
-    @Override
     @Nullable
+    @Override
     public PsiComment findExistingDocComment(PsiComment contextElement) {
         return contextElement;
     }
@@ -780,8 +773,9 @@ public Pair<PsiElement, PsiComment> parseContext(@Nonnull PsiElement element) {
         return null;
     }
 
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     public String generateDocumentationContentStub(PsiComment contextComment) {
         for (PsiElement el = contextComment.getParent(); el != null; el = el.getNextSibling()) {
             if (el instanceof JSProperty property) {
@@ -792,16 +786,16 @@ public String generateDocumentationContentStub(PsiComment contextComment) {
             else if (el instanceof JSFunction function) {
                 return doGenerateDoc(function);
             }
-            else if (el instanceof JSExpressionStatement expressionStatement) {
-                if (expressionStatement.getExpression() instanceof JSAssignmentExpression assignmentExpression
-                    && assignmentExpression.getROperand() instanceof JSFunctionExpression functionExpression) {
-                    return doGenerateDoc(functionExpression.getFunction());
+            else if (el instanceof JSExpressionStatement expression) {
+                if (expression.getExpression() instanceof JSAssignmentExpression assignment
+                    && assignment.getROperand() instanceof JSFunctionExpression functionExpr) {
+                    return doGenerateDoc(functionExpr.getFunction());
                 }
             }
             else if (el instanceof JSVarStatement varStatement) {
                 JSVariable[] variables = varStatement.getVariables();
-                if (variables.length > 0 && variables[0].getInitializer() instanceof JSFunctionExpression functionExpression) {
-                    return doGenerateDoc(functionExpression.getFunction());
+                if (variables.length > 0 && variables[0].getInitializer() instanceof JSFunctionExpression functionExpr) {
+                    return doGenerateDoc(functionExpr.getFunction());
                 }
                 break;
             }
@@ -809,6 +803,7 @@ else if (el instanceof JSVarStatement varStatement) {
         return null;
     }
 
+    @RequiredReadAction
     private static String doGenerateDoc(final JSFunction function) {
         StringBuilder builder = new StringBuilder();
         final JSParameterList parameterList = function.getParameterList();
@@ -839,6 +834,7 @@ private static String doGenerateDoc(final JSFunction function) {
     }
 
     @Nullable
+    @RequiredReadAction
     protected static String getSeeAlsoLinkResolved(PsiElement originElement, String link) {
         JSQualifiedNamedElement qualifiedElement = findParentQualifiedElement(originElement);
         if (qualifiedElement == null) {
@@ -902,12 +898,13 @@ else if (StringUtil.startsWithChar(link, '#')) {
     }
 
     @Nullable
+    @RequiredReadAction
     protected static JSQualifiedNamedElement findParentQualifiedElement(PsiElement element) {
         if (element instanceof JSClass jsClass) {
             return jsClass;
         }
         if (element instanceof JSFunction || element instanceof JSVariable) {
-            final PsiElement parent = JSResolveUtil.findParent(element);
+            PsiElement parent = JSResolveUtil.findParent(element);
             if (parent instanceof JSClass jsClass) {
                 return jsClass;
             }
@@ -920,8 +917,8 @@ else if (parent instanceof JSFile) {
         if (element instanceof JSAttribute jsAttribute) {
             attribute = jsAttribute;
         }
-        else if (element instanceof JSAttributeNameValuePair) {
-            attribute = (JSAttribute)element.getParent();
+        else if (element instanceof JSAttributeNameValuePair nameValuePair) {
+            attribute = (JSAttribute)nameValuePair.getParent();
         }
 
         if (attribute != null && DOCUMENTED_ATTRIBUTES.containsKey(attribute.getName())) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index ed8982e9..306b36db 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -26,11 +26,16 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.xml.XmlElementDescriptor;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.application.util.*;
 import consulo.language.ast.ASTNode;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.inject.InjectedLanguageManager;
-import consulo.language.psi.*;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiReference;
+import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.resolve.PsiElementProcessor;
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
@@ -40,10 +45,8 @@
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.XmlRecursiveElementVisitor;
 import consulo.xml.psi.xml.*;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import java.util.*;
 
@@ -51,9 +54,7 @@
  * @author Maxim.Mossienko
  */
 public class XmlBackedJSClassImpl extends JSClassBase implements JSClass {
-    @NonNls
     public static final String COMPONENT_TAG_NAME = "Component";
-    @NonNls
     public static final String CLASS_NAME_ATTRIBUTE_NAME = "className";
 
     private volatile JSReferenceList myExtendsList;
@@ -63,12 +64,13 @@ public XmlBackedJSClassImpl(XmlTag tag) {
         super(tag.getNode());
     }
 
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     public JSReferenceList getExtendsList() {
         JSReferenceList refList = myExtendsList;
         if (refList == null) {
-            final XmlTag rootTag = getParent();
+            XmlTag rootTag = getParent();
             refList = createReferenceList(rootTag.getLocalName());
             refList.getParent().putUserData(JSResolveUtil.contextKey, this);
             myExtendsList = refList;
@@ -76,34 +78,40 @@ public JSReferenceList getExtendsList() {
         return refList;
     }
 
-    private JSReferenceList createReferenceList(final String s) {
-        final JSClass element = (JSClass)JSChangeUtil.createJSTreeFromText(getProject(), "class C extends " + s + " {}").getPsi();
+    @RequiredReadAction
+    private JSReferenceList createReferenceList(String s) {
+        JSClass element = (JSClass)JSChangeUtil.createJSTreeFromText(getProject(), "class C extends " + s + " {}").getPsi();
         return element.getExtendsList();
     }
 
     @Override
+    @RequiredReadAction
     public int getTextOffset() {
         return 0;
     }
 
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     public JSReferenceList getImplementsList() {
         JSReferenceList refList = myImplementsList;
 
         if (refList == null) {
-            final XmlTag rootTag = getParent();
+            XmlTag rootTag = getParent();
             myImplementsList = refList = createReferenceList(rootTag != null ? rootTag.getAttributeValue("implements") : null);
         }
         return refList;
     }
 
+    @Nonnull
     @Override
+    @RequiredReadAction
     public PsiElement getNavigationElement() {
         return getParent();
     }
 
     @Override
+    @RequiredReadAction
     public String getName() {
         XmlTag parent = getParent();
         if (isInlineComponentTag(parent)) {
@@ -112,7 +120,7 @@ public String getName() {
                 return explicitName;
             }
         }
-        final PsiFile psi = parent.getContainingFile();
+        PsiFile psi = parent.getContainingFile();
         VirtualFile file = psi.getVirtualFile();
         if (file == null && psi.getOriginalFile() != null) {
             file = psi.getOriginalFile().getVirtualFile();
@@ -121,19 +129,21 @@ public String getName() {
     }
 
     @Nullable
+    @RequiredReadAction
     public String getExplicitName() {
         XmlTag parent = getParent();
         return parent.getAttributeValue(CLASS_NAME_ATTRIBUTE_NAME, parent.getNamespace());
     }
 
     @Override
+    @RequiredReadAction
     public String getQualifiedName() {
-        final String name = getName();
+        String name = getName();
         if (name == null) {
             return null;
         }
-        final PsiFile containingFile = getNode().getPsi().getContainingFile();
-        final String expectedPackageNameFromFile = JSResolveUtil.getExpectedPackageNameFromFile(containingFile.getVirtualFile(),
+        PsiFile containingFile = getNode().getPsi().getContainingFile();
+        String expectedPackageNameFromFile = JSResolveUtil.getExpectedPackageNameFromFile(containingFile.getVirtualFile(),
             containingFile.getProject(), true
         );
         if (expectedPackageNameFromFile != null && expectedPackageNameFromFile.length() > 0) {
@@ -155,13 +165,15 @@ public boolean isDeprecated() {
 
     @Nullable
     @Override
+    @RequiredReadAction
     public PsiElement getNameIdentifier() {
         return getParent();
     }
 
     @Override
-    public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException {
-        final int i = name.lastIndexOf('.');
+    @RequiredWriteAction
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+        int i = name.lastIndexOf('.');
         if (i != -1) {
             name = name.substring(0, i);
         }
@@ -177,10 +189,10 @@ public JSAttributeList getAttributeList() {
 
     @Override
     protected boolean processMembers(
-        final PsiScopeProcessor processor,
-        final ResolveState substitutor,
-        final PsiElement lastParent,
-        final PsiElement place
+        PsiScopeProcessor processor,
+        ResolveState substitutor,
+        PsiElement lastParent,
+        PsiElement place
     ) {
         for (JSFile file : ourCachedScripts.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue()) {
             if (!file.processDeclarations(processor, ResolveState.initial(), null, place)) {
@@ -191,11 +203,12 @@ protected boolean processMembers(
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull final PsiScopeProcessor processor,
-        @Nonnull final ResolveState substitutor,
-        final PsiElement lastParent,
-        @Nonnull final PsiElement place
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState substitutor,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
     ) {
         boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
 
@@ -210,10 +223,10 @@ public boolean processDeclarations(
         return b;
     }
 
-    public boolean doImportFromScripts(final PsiScopeProcessor processor, final PsiElement place) {
+    public boolean doImportFromScripts(PsiScopeProcessor processor, PsiElement place) {
         PsiElement context = place.getContainingFile().getContext();
-        if (context instanceof XmlText) {
-            context = context.getParent();
+        if (context instanceof XmlText xmlText) {
+            context = xmlText.getParent();
         }
 
         boolean notResolvingTypeViaImport = !(place instanceof JSFile);
@@ -282,17 +295,16 @@ public boolean processComponentNames(ResolveProcessor processor) {
     private static final Key<CachedValue<JSFile[]>> CACHED_SCRIPTS_KEY = Key.create("cached.scripts");
     private static final Key<CachedValue<Map<String, String>>> OUR_CACHED_SHORT_COMPONENTS_REF_KEY = Key.create("cached.component.refs");
 
-    @NonNls
     private static final String SCRIPT_TAG_NAME = "Script";
 
     private static final UserDataCache<CachedValue<JSFile[]>, XmlTag, Object> ourCachedScripts =
         new UserDataCache<>() {
             @Override
-            protected CachedValue<JSFile[]> compute(final XmlTag tag, final Object p) {
+            protected CachedValue<JSFile[]> compute(XmlTag tag, Object p) {
                 return CachedValuesManager.getManager(tag.getProject()).createCachedValue(
                     () -> {
-                        final List<JSFile> injectedFiles = new ArrayList<JSFile>(2);
-                        final List<PsiElement> dependencies = new ArrayList<PsiElement>();
+                        List<JSFile> injectedFiles = new ArrayList<>(2);
+                        List<PsiElement> dependencies = new ArrayList<>();
                         dependencies.add(tag);
                         new InjectedScriptsVisitor(
                             tag,
@@ -322,22 +334,21 @@ protected CachedValue<Map<String, String>> compute(final XmlFile file, final Obj
                     new CachedValueProvider<Map<String, String>>() {
                         @Override
                         public Result<Map<String, String>> compute() {
-                            final Map<String, String> cachedComponentImports = new HashMap<>();
-                            final List<PsiFile> dependencies = new ArrayList<>();
+                            Map<String, String> cachedComponentImports = new HashMap<>();
+                            List<PsiFile> dependencies = new ArrayList<>();
                             dependencies.add(file);
 
                             file.acceptChildren(new XmlRecursiveElementVisitor() {
                                 @Override
+                                @RequiredReadAction
                                 public void visitXmlTag(XmlTag tag) {
                                     XmlElementDescriptor descriptor = tag.getDescriptor();
                                     if (descriptor != null) {
                                         PsiElement declaration = descriptor.getDeclaration();
-                                        if (declaration instanceof XmlFile) {
-                                            declaration = XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)declaration);
+                                        if (declaration instanceof XmlFile xmlFile) {
+                                            declaration = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
                                         }
-                                        if (declaration instanceof JSClass) {
-                                            JSClass jsClass = (JSClass)declaration;
-
+                                        if (declaration instanceof JSClass jsClass) {
                                             cachedComponentImports.put(jsClass.getName(), jsClass.getQualifiedName());
                                             dependencies.add(declaration.getContainingFile());
                                         }
@@ -354,15 +365,16 @@ public void visitXmlTag(XmlTag tag) {
         };
 
 
-    public static boolean doProcessAllTags(final XmlTag rootTag) {
+    public static boolean doProcessAllTags(XmlTag rootTag) {
         return JSLanguageInjector.isMozillaXulOrXblNs(rootTag != null ? rootTag.getNamespace() : null);
     }
 
-    public static boolean doProcessAllTags(final XmlFile file) {
+    public static boolean doProcessAllTags(XmlFile file) {
         return doProcessAllTags(getRootTag(file));
     }
 
     @Override
+    @RequiredReadAction
     public boolean isValid() {
         return getNode().getPsi().isValid();
     }
@@ -370,18 +382,18 @@ public boolean isValid() {
     private static Key<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>> ourArtificialPsiKey = Key.create("xml.backed.class");
 
     @Nullable
-    public static JSClass getXmlBackedClass(final XmlFile xmlFile) {
-        final XmlTag rootTag = getRootTag(xmlFile);
+    public static JSClass getXmlBackedClass(XmlFile xmlFile) {
+        XmlTag rootTag = getRootTag(xmlFile);
         return rootTag != null ? getXmlBackedClass(rootTag) : null;
     }
 
     @Nullable
     private static XmlTag getRootTag(XmlFile xmlFile) {
-        final XmlDocument document = xmlFile.getDocument();
+        XmlDocument document = xmlFile.getDocument();
         return document != null ? document.getRootTag() : null;
     }
 
-    public static XmlBackedJSClassImpl getXmlBackedClass(final XmlTag tag) {
+    public static XmlBackedJSClassImpl getXmlBackedClass(XmlTag tag) {
         return myCachedClassCache.get(ourArtificialPsiKey, tag, null).getValue(tag);
     }
 
@@ -390,7 +402,7 @@ public static Collection<JSClass> getClasses(XmlFile file) {
         if (rootTag == null) {
             return Collections.emptyList();
         }
-        final Collection<JSClass> result = new ArrayList<>();
+        Collection<JSClass> result = new ArrayList<>();
         result.add(getXmlBackedClass(rootTag));
         result.addAll(getChildInlineComponents(rootTag, true));
         return result;
@@ -411,41 +423,43 @@ public static XmlBackedJSClassImpl getContainingComponent(XmlElement element) {
         return getXmlBackedClass((XmlTag)element);
     }
 
-    private static final UserDataCache<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>, XmlTag,
-        Object> myCachedClassCache = new UserDataCache<>() {
-        @Override
-        protected ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag> compute(final XmlTag tag, final Object p) {
-            return CachedValuesManager.getManager(tag.getProject()).createParameterizedCachedValue(
-                (ParameterizedCachedValueProvider<XmlBackedJSClassImpl, XmlTag>)tag1 ->
-                    new CachedValueProvider.Result<>(new XmlBackedJSClassImpl(tag1), tag1),
-                false
-            );
-        }
-    };
+    private static final UserDataCache<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>, XmlTag, Object> myCachedClassCache =
+        new UserDataCache<>() {
+            @Override
+            protected ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag> compute(final XmlTag tag, final Object p) {
+                return CachedValuesManager.getManager(tag.getProject()).createParameterizedCachedValue(
+                    (ParameterizedCachedValueProvider<XmlBackedJSClassImpl, XmlTag>)tag1 ->
+                        new CachedValueProvider.Result<>(new XmlBackedJSClassImpl(tag1), tag1),
+                    false
+                );
+            }
+        };
 
     @Override
+    @RequiredReadAction
     public XmlTag getParent() {
         return (XmlTag)getNode().getPsi();
     }
 
     @Override
-    public boolean isEquivalentTo(final PsiElement element2) {
+    public boolean isEquivalentTo(PsiElement element2) {
         return this == element2
             || element2 == getContainingFile()
             || (element2 instanceof XmlBackedJSClassImpl && getContainingFile() == element2.getContainingFile());
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
         if (element instanceof JSFunction || element instanceof JSVarStatement) {
-            final JSFile jsFile = createOrGetFirstScriptTag();
+            JSFile jsFile = createOrGetFirstScriptTag();
 
             if (jsFile != null) {
-                final PsiElement child = jsFile.getLastChild();
+                PsiElement child = jsFile.getLastChild();
 
                 String text;
-                if (child instanceof PsiWhiteSpace && (text = child.getText()).indexOf("]]>") != -1) {
-                    int cdataAt = 0;
+                if (child instanceof PsiWhiteSpace whiteSpace && (text = whiteSpace.getText()).indexOf("]]>") != -1) {
+                    int cdataAt;
                     String marker = "<![CDATA[";
 
                     if ((cdataAt = text.indexOf(marker)) == -1) {
@@ -473,8 +487,9 @@ public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationExce
         return super.add(element);
     }
 
+    @RequiredReadAction
     public JSFile createScriptTag() throws IncorrectOperationException {
-        final XmlTag rootTag = getParent();
+        XmlTag rootTag = getParent();
 
         if (rootTag != null) {
             String ns = findScriptNs(rootTag);
@@ -500,7 +515,8 @@ public static String findScriptNs(XmlTag rootTag) {
     }
 
     @Override
-    public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException {
+    @RequiredWriteAction
+    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (anchor == null) {
             return add(element);
         }
@@ -508,6 +524,7 @@ public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement
     }
 
     @Nullable
+    @RequiredReadAction
     public JSFile findFirstScriptTag() {
         JSFile[] value = ourCachedScripts.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue();
         if (value.length > 0) {
@@ -516,6 +533,7 @@ public JSFile findFirstScriptTag() {
         return null;
     }
 
+    @RequiredReadAction
     public JSFile createOrGetFirstScriptTag() throws IncorrectOperationException {
         JSFile jsFile = findFirstScriptTag();
 
@@ -531,22 +549,22 @@ public static XmlTag[] findMxmlSubTags(XmlTag tag, String scriptTagName) {
         return tag.findSubTags(scriptTagName, ns);
     }
 
-    public static void visitInjectedFiles(XmlFile file, final InjectedFileVisitor visitor) {
+    public static void visitInjectedFiles(XmlFile file, InjectedFileVisitor visitor) {
         new InjectedScriptsVisitor(getRootTag(file), true, true, true, visitor).go();
     }
 
     public static boolean isInlineComponentTag(XmlTag tag) {
-        return COMPONENT_TAG_NAME.equals(tag.getLocalName()) &&
-            JavaScriptSupportLoader.isMxmlNs(tag.getNamespace()) &&
-            !(tag.getParent() instanceof XmlDocument);
+        return COMPONENT_TAG_NAME.equals(tag.getLocalName())
+            && JavaScriptSupportLoader.isMxmlNs(tag.getNamespace())
+            && !(tag.getParent() instanceof XmlDocument);
     }
 
-    public static Collection<XmlBackedJSClassImpl> getChildInlineComponents(XmlTag rootTag, final boolean recursive) {
-        final Collection<XmlBackedJSClassImpl> result = new ArrayList<>();
+    public static Collection<XmlBackedJSClassImpl> getChildInlineComponents(XmlTag rootTag, boolean recursive) {
+        Collection<XmlBackedJSClassImpl> result = new ArrayList<>();
         rootTag.processElements(
             new PsiElementProcessor() {
                 @Override
-                public boolean execute(PsiElement element) {
+                public boolean execute(@Nonnull PsiElement element) {
                     if (element instanceof XmlTag tag) {
                         if (isInlineComponentTag(tag)) {
                             result.add(getXmlBackedClass(tag));
@@ -596,29 +614,28 @@ public void go() {
         }
 
         @Override
-        public boolean execute(final PsiElement element) {
-            if (element instanceof XmlTag) {
-                final XmlTag tag = (XmlTag)element;
-
+        @RequiredReadAction
+        public boolean execute(@Nonnull PsiElement element) {
+            if (element instanceof XmlTag tag) {
                 if (myVisitAllTags || SCRIPT_TAG_NAME.equals(tag.getLocalName())) {
-                    final String srcLocation = tag.getAttributeValue("source");
+                    String srcLocation = tag.getAttributeValue("source");
                     if (srcLocation != null) {
                         PsiReference ref = findFileReference(tag.getAttribute("source").getValueElement());
-                        if (ref != null) {
-                            final PsiElement psiElement = ref.resolve();
-                            if (psiElement instanceof JSFile) {
-                                psiElement.putUserData(JSResolveUtil.contextKey, tag);
-                                myVisitor.visit(myRootTag, (JSFile)psiElement);
-                            }
+                        if (ref != null && ref.resolve() instanceof JSFile jsFile) {
+                            jsFile.putUserData(JSResolveUtil.contextKey, tag);
+                            myVisitor.visit(myRootTag, jsFile);
                         }
                     }
                     else {
-                        JSResolveUtil.processInjectedFileForTag(tag, new JSResolveUtil.JSInjectedFilesVisitor() {
-                            @Override
-                            protected void process(final JSFile file) {
-                                myVisitor.visit(myRootTag, file);
+                        JSResolveUtil.processInjectedFileForTag(
+                            tag,
+                            new JSResolveUtil.JSInjectedFilesVisitor() {
+                                @Override
+                                protected void process(JSFile file) {
+                                    myVisitor.visit(myRootTag, file);
+                                }
                             }
-                        });
+                        );
                     }
                 }
                 if (isInlineComponentTag(tag)) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
index 49a33183..9863dda9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
@@ -27,12 +27,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:15:02 PM
+ * @author max
+ * @since 2005-01-30
  */
 public class JSArgumentListImpl extends JSElementImpl implements JSArgumentList {
-    public JSArgumentListImpl(final ASTNode node) {
+    public JSArgumentListImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
index 824f5f61..6b8860bb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 
@@ -29,24 +30,22 @@
 import java.util.List;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:32:23 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSArrayLiteralExpressionImpl extends JSExpressionImpl implements JSArrayLiteralExpression {
-    public JSArrayLiteralExpressionImpl(final ASTNode node) {
+    public JSArrayLiteralExpressionImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression[] getExpressions() {
         List<JSExpression> result = new ArrayList<>();
         ASTNode child = getNode().getFirstChildNode();
         boolean wasExpression = false;
         while (child != null) {
-            final IElementType type = child.getElementType();
+            IElementType type = child.getElementType();
             if (child.getPsi() instanceof JSExpression jsExpression) {
                 result.add(jsExpression);
                 wasExpression = true;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
index c6e609d1..50485990 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
@@ -23,14 +23,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:41:42 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSAssignmentExpressionImpl extends JSBinaryExpressionImpl implements JSAssignmentExpression {
-    public JSAssignmentExpressionImpl(final ASTNode node) {
+    public JSAssignmentExpressionImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index b4faca39..14f08cd2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -16,31 +16,30 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttribute;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.EmptyResolveMessageProvider;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 import consulo.language.util.IncorrectOperationException;
-import consulo.language.psi.EmptyResolveMessageProvider;
 import consulo.localize.LocalizeValue;
 import consulo.util.collection.ArrayUtil;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public class JSAttributeImpl extends JSStubElementImpl<JSAttributeStub> implements JSAttribute {
     private PsiReference[] myReferences;
     private static
-    @NonNls
     String[] myPossibleMetaData = new String[]{
         "AccessibilityClass",
         "ArrayElementType",
@@ -64,11 +63,11 @@ public class JSAttributeImpl extends JSStubElementImpl<JSAttributeStub> implemen
         "Transient"
     };
 
-    public JSAttributeImpl(final ASTNode node) {
+    public JSAttributeImpl(ASTNode node) {
         super(node);
     }
 
-    public JSAttributeImpl(final JSAttributeStub node) {
+    public JSAttributeImpl(JSAttributeStub node) {
         super(node, JSElementTypes.ATTRIBUTE);
     }
 
@@ -78,17 +77,19 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public String getName() {
-        final JSAttributeStub attributeStub = getStub();
+        JSAttributeStub attributeStub = getStub();
         if (attributeStub != null) {
             return attributeStub.getName();
         }
-        final ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
         return node != null ? node.getText() : null;
     }
 
     @Override
-    public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException {
+    @RequiredWriteAction
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
         throw new IncorrectOperationException();
     }
 
@@ -98,9 +99,9 @@ public JSAttributeNameValuePair[] getValues() {
     }
 
     @Override
-    public JSAttributeNameValuePair getValueByName(final String name) {
+    public JSAttributeNameValuePair getValueByName(String name) {
         for (JSAttributeNameValuePair p : getValues()) {
-            final String pName = p.getName();
+            String pName = p.getName();
 
             if ((name != null && name.equals(pName)) || (name == null && name == pName)) {
                 return p;
@@ -109,17 +110,19 @@ public JSAttributeNameValuePair getValueByName(final String name) {
         return null;
     }
 
+    @Nonnull
     @Override
+    @RequiredReadAction
     public PsiReference[] getReferences() {
         if (myReferences == null) {
-            final ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+            ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
 
             if (node == null) {
                 myReferences = PsiReference.EMPTY_ARRAY;
             }
             else {
-                final int startOffsetInParent = node.getPsi().getStartOffsetInParent();
-                final TextRange range = new TextRange(startOffsetInParent, startOffsetInParent + node.getTextLength());
+                int startOffsetInParent = node.getPsi().getStartOffsetInParent();
+                TextRange range = new TextRange(startOffsetInParent, startOffsetInParent + node.getTextLength());
 
                 myReferences = new PsiReference[]{new AttrNameReference(range)};
             }
@@ -131,56 +134,68 @@ public PsiReference[] getReferences() {
     private class AttrNameReference implements PsiReference, EmptyResolveMessageProvider {
         private final TextRange myRange;
 
-        public AttrNameReference(final TextRange range) {
+        public AttrNameReference(TextRange range) {
             myRange = range;
         }
 
         @Override
+        @RequiredReadAction
         public PsiElement getElement() {
             return JSAttributeImpl.this;
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public TextRange getRangeInElement() {
             return myRange;
         }
 
         @Override
+        @RequiredReadAction
         public PsiElement resolve() {
-            final String s = getCanonicalText();
+            String s = getCanonicalText();
             return ArrayUtil.indexOf(myPossibleMetaData, s) >= 0 ? JSAttributeImpl.this : null;
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public String getCanonicalText() {
             return getName();
         }
 
         @Override
-        public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException {
+        @RequiredWriteAction
+        public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
             return null;
         }
 
         @Override
-        public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException {
+        @RequiredWriteAction
+        public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
             return null;
         }
 
         @Override
-        public boolean isReferenceTo(final PsiElement element) {
-            if (element instanceof JSAttribute) {
-                final String name = getName();
-                return name != null && name.equals(((JSAttribute)element).getName());
+        @RequiredReadAction
+        public boolean isReferenceTo(PsiElement element) {
+            if (element instanceof JSAttribute attribute) {
+                String name = getName();
+                return name != null && name.equals(attribute.getName());
             }
             return false;
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public Object[] getVariants() {
             return myPossibleMetaData;
         }
 
         @Override
+        @RequiredReadAction
         public boolean isSoft() {
             return true;
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
index 436c0ca5..bab021f9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
@@ -16,6 +16,8 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -34,23 +36,31 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Maxim.Mossienko
  */
 public class JSAttributeListImpl extends JSStubElementImpl<JSAttributeListStub> implements JSAttributeList {
-    private static final TokenSet ourModifiersTypeSet = TokenSet.create(
+    private static final TokenSet OUR_MODIFIERS_TYPE_SET = TokenSet.create(
         JSTokenTypes.PUBLIC_KEYWORD,
         JSTokenTypes.PRIVATE_KEYWORD,
         JSTokenTypes.PROTECTED_KEYWORD,
         JSTokenTypes.INTERNAL_KEYWORD
     );
 
-    public JSAttributeListImpl(final ASTNode node) {
+    private static final Map<IElementType, AccessType> ACCESS_TYPE_MAP = Map.of(
+        JSTokenTypes.PUBLIC_KEYWORD, AccessType.PUBLIC,
+        JSTokenTypes.PROTECTED_KEYWORD, AccessType.PROTECTED,
+        JSTokenTypes.PRIVATE_KEYWORD, AccessType.PRIVATE,
+        JSTokenTypes.INTERNAL_KEYWORD, AccessType.PACKAGE_LOCAL
+    );
+
+    public JSAttributeListImpl(ASTNode node) {
         super(node);
     }
 
-    public JSAttributeListImpl(final JSAttributeListStub stub) {
+    public JSAttributeListImpl(JSAttributeListStub stub) {
         super(stub, JSElementTypes.ATTRIBUTE_LIST);
     }
 
@@ -59,20 +69,22 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
         visitor.visitJSAttributeList(this);
     }
 
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     public String getNamespace() {
-        final JSAttributeListStub attributeListStub = getStub();
+        JSAttributeListStub attributeListStub = getStub();
         if (attributeListStub != null) {
             return attributeListStub.getNamespace();
         }
-        final JSReferenceExpression namespaceElement = getNamespaceElement();
+        JSReferenceExpression namespaceElement = getNamespaceElement();
         return namespaceElement != null ? namespaceElement.getText() : null;
     }
 
     @Override
+    @RequiredReadAction
     public JSReferenceExpression getNamespaceElement() {
-        final ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
+        ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
         return node != null ? (JSReferenceExpression)node.getPsi() : null;
     }
 
@@ -83,7 +95,8 @@ public JSAttribute[] getAttributes() {
 
     @Nonnull
     @Override
-    public JSAttribute[] getAttributesByName(final @Nonnull String name) {
+    @RequiredReadAction
+    public JSAttribute[] getAttributesByName(@Nonnull String name) {
         List<JSAttribute> attributes = null;
         for (JSAttribute attr : getAttributes()) {
             if (name.equals(attr.getName())) {
@@ -97,70 +110,47 @@ public JSAttribute[] getAttributesByName(final @Nonnull String name) {
     }
 
     @Override
+    @RequiredReadAction
     public AccessType getAccessType() {
-        final JSAttributeListStub stub = getStub();
+        JSAttributeListStub stub = getStub();
         if (stub != null) {
             return stub.getAccessType();
         }
 
-        final ASTNode node = getNode().findChildByType(ourModifiersTypeSet);
-        if (node != null) {
-            final IElementType nodeType = node.getElementType();
-            if (nodeType == JSTokenTypes.PUBLIC_KEYWORD) {
-                return AccessType.PUBLIC;
-            }
-            if (nodeType == JSTokenTypes.PROTECTED_KEYWORD) {
-                return AccessType.PROTECTED;
-            }
-            if (nodeType == JSTokenTypes.PRIVATE_KEYWORD) {
-                return AccessType.PRIVATE;
-            }
-            if (nodeType == JSTokenTypes.INTERNAL_KEYWORD) {
-                return AccessType.PACKAGE_LOCAL;
-            }
-        }
-        return AccessType.PACKAGE_LOCAL;
+        ASTNode node = getNode().findChildByType(OUR_MODIFIERS_TYPE_SET);
+        return ACCESS_TYPE_MAP.getOrDefault(node != null ? node.getElementType() : null, AccessType.PACKAGE_LOCAL);
     }
 
     @Override
+    @RequiredReadAction
     public PsiElement findAccessTypeElement() {
-        final ASTNode modifier = getNode().findChildByType(ourModifiersTypeSet);
+        ASTNode modifier = getNode().findChildByType(OUR_MODIFIERS_TYPE_SET);
         return modifier != null ? modifier.getPsi() : null;
     }
 
     @Override
-    public boolean hasModifier(final ModifierType modifier) {
-        final JSAttributeListStub stub = getStub();
+    @RequiredReadAction
+    public boolean hasModifier(ModifierType modifier) {
+        JSAttributeListStub stub = getStub();
         if (stub != null) {
             return stub.hasModifier(modifier);
         }
 
-        IElementType type = null;
-        switch (modifier) {
-            case DYNAMIC:
-                type = JSTokenTypes.DYNAMIC_KEYWORD;
-                break;
-            case OVERRIDE:
-                type = JSTokenTypes.OVERRIDE_KEYWORD;
-                break;
-            case NATIVE:
-                type = JSTokenTypes.NATIVE_KEYWORD;
-                break;
-            case STATIC:
-                type = JSTokenTypes.STATIC_KEYWORD;
-                break;
-            case FINAL:
-                type = JSTokenTypes.FINAL_KEYWORD;
-                break;
-            case VIRTUAL:
-                type = JSTokenTypes.VIRTUAL_KEYWORD;
-                break;
-        }
+        IElementType type = switch (modifier) {
+            case DYNAMIC -> JSTokenTypes.DYNAMIC_KEYWORD;
+            case OVERRIDE -> JSTokenTypes.OVERRIDE_KEYWORD;
+            case NATIVE -> JSTokenTypes.NATIVE_KEYWORD;
+            case STATIC -> JSTokenTypes.STATIC_KEYWORD;
+            case FINAL -> JSTokenTypes.FINAL_KEYWORD;
+            case VIRTUAL -> JSTokenTypes.VIRTUAL_KEYWORD;
+            default -> null;
+        };
         return type != null && getNode().findChildByType(type) != null;
     }
 
     @Override
-    public PsiElement add(@Nonnull final PsiElement element) throws IncorrectOperationException {
+    @RequiredWriteAction
+    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
         if (element.getNode().getElementType() == JSTokenTypes.OVERRIDE_KEYWORD) {
             return JSChangeUtil.doDoAddBefore(this, element, getFirstChild());
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
index 6c16a82e..1be66e9a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttribute;
@@ -24,28 +23,27 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
-import consulo.language.psi.PsiReference;
-import consulo.language.util.IncorrectOperationException;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiReference;
+import consulo.language.util.IncorrectOperationException;
 import consulo.util.lang.StringUtil;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public class JSAttributeNameValuePairImpl extends JSStubElementImpl<JSAttributeNameValuePairStub> implements JSAttributeNameValuePair {
     private JSReferenceSet myReferenceSet;
-    @NonNls
     private static final String EMBED_ANNOTATION_NAME = "Embed";
 
-    public JSAttributeNameValuePairImpl(final ASTNode node) {
+    public JSAttributeNameValuePairImpl(ASTNode node) {
         super(node);
     }
 
-    public JSAttributeNameValuePairImpl(final JSAttributeNameValuePairStub node) {
+    public JSAttributeNameValuePairImpl(JSAttributeNameValuePairStub node) {
         super(node, JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR);
     }
 
@@ -55,44 +53,50 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public String getName() {
-        final JSAttributeNameValuePairStub stub = getStub();
+        JSAttributeNameValuePairStub stub = getStub();
         if (stub != null) {
             return stub.getName();
         }
-        final ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        ASTNode node = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
         return node != null ? node.getText() : null;
     }
 
     @Override
-    public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException {
+    @RequiredReadAction
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
         throw new IncorrectOperationException();
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getValue() {
-        final ASTNode astNode = findValueNode();
+        ASTNode astNode = findValueNode();
         return astNode != null ? (JSExpression)astNode.getPsi() : null;
     }
 
     @Override
+    @RequiredReadAction
     public String getSimpleValue() {
-        final JSAttributeNameValuePairStub stub = getStub();
+        JSAttributeNameValuePairStub stub = getStub();
         if (stub != null) {
             return stub.getValue();
         }
-        final ASTNode expression = findValueNode();
+        ASTNode expression = findValueNode();
         return expression != null ? StringUtil.stripQuotesAroundValue(expression.getText()) : null;
     }
 
+    @RequiredReadAction
     private ASTNode findValueNode() {
         return getNode().findChildByType(JavaScriptTokenSets.STRING_LITERALS);
     }
 
     @Override
     @Nonnull
+    @RequiredReadAction
     public PsiReference[] getReferences() {
-        final @NonNls String name = getName();
+        String name = getName();
 
         if ("source".equals(name)) {
             return getPathRefsCheckingParent();
@@ -106,8 +110,9 @@ else if (name == null) {
         return PsiReference.EMPTY_ARRAY;
     }
 
+    @RequiredReadAction
     private PsiReference[] getClassRefs() {
-        final ASTNode valueNode = findValueNode();
+        ASTNode valueNode = findValueNode();
 
         if (valueNode != null) {
             if (myReferenceSet == null) {
@@ -119,8 +124,9 @@ private PsiReference[] getClassRefs() {
         return PsiReference.EMPTY_ARRAY;
     }
 
+    @RequiredReadAction
     private PsiReference[] getDefaultPropertyRefs() {
-        final @NonNls String parentName = ((JSAttribute)getParent()).getName();
+        String parentName = ((JSAttribute)getParent()).getName();
 
         if ("HostComponent".equals(parentName) || "ArrayElementType".equals(parentName)) {
             return getClassRefs();
@@ -130,7 +136,7 @@ private PsiReference[] getDefaultPropertyRefs() {
             return getPathRefs();
         }
         if ("DefaultProperty".equals(parentName)) {
-            final ASTNode valueNode = findValueNode();
+            ASTNode valueNode = findValueNode();
             if (valueNode != null) {
                 if (myReferenceSet == null) {
                     myReferenceSet = new JSReferenceSet(this, false);
@@ -143,8 +149,9 @@ private PsiReference[] getDefaultPropertyRefs() {
         return PsiReference.EMPTY_ARRAY;
     }
 
+    @RequiredReadAction
     private PsiReference[] getPathRefsCheckingParent() {
-        final @NonNls String parentName = ((JSAttribute)getParent()).getName();
+        String parentName = ((JSAttribute)getParent()).getName();
 
         if (!EMBED_ANNOTATION_NAME.equals(parentName)) {
             return PsiReference.EMPTY_ARRAY;
@@ -152,11 +159,15 @@ private PsiReference[] getPathRefsCheckingParent() {
         return getPathRefs();
     }
 
+    @RequiredReadAction
     private PsiReference[] getPathRefs() {
-        final ASTNode valueNode = findValueNode();
+        ASTNode valueNode = findValueNode();
 
         if (valueNode != null) {
-            return ReferenceSupport.getFileRefs(this, valueNode.getPsi(), valueNode.getPsi().getStartOffsetInParent() + 1,
+            return ReferenceSupport.getFileRefs(
+                this,
+                valueNode.getPsi(),
+                valueNode.getPsi().getStartOffsetInParent() + 1,
                 ReferenceSupport.LookupOptions.EMBEDDED_ASSET
             );
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
index 3b26c27c..ce95d814 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
@@ -34,24 +34,22 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:41:42 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSBinaryExpressionImpl extends JSExpressionImpl implements JSBinaryExpression {
     private static final TokenSet BINARY_OPERATIONS = TokenSet.orSet(JSTokenTypes.OPERATIONS, JSTokenTypes.RELATIONAL_OPERATIONS);
     private static final TokenSet BINARY_OPERATIONS_WITH_DEFS = TokenSet.create(JSTokenTypes.COMMA, JSTokenTypes.EQ);
 
-    public JSBinaryExpressionImpl(final ASTNode node) {
+    public JSBinaryExpressionImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getLOperand() {
-        final ASTNode astNode = getNode();
-        final JSExpression firstExpression = PsiTreeUtil.findChildOfType(astNode.getPsi(), JSExpression.class);
+        ASTNode astNode = getNode();
+        JSExpression firstExpression = PsiTreeUtil.findChildOfType(astNode.getPsi(), JSExpression.class);
         if (firstExpression != null && astNode.findChildByType(BINARY_OPERATIONS, firstExpression.getNode()) == null) {
             return null; // =a
         }
@@ -59,17 +57,18 @@ public JSExpression getLOperand() {
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getROperand() {
-        final ASTNode myNode = getNode();
-        final ASTNode secondExpression = myNode.findChildByType(JSElementTypes.EXPRESSIONS, myNode.findChildByType(BINARY_OPERATIONS));
+        ASTNode myNode = getNode();
+        ASTNode secondExpression = myNode.findChildByType(JSElementTypes.EXPRESSIONS, myNode.findChildByType(BINARY_OPERATIONS));
         return secondExpression != null ? (JSExpression)secondExpression.getPsi() : null;
     }
 
-    @RequiredReadAction
     @Nullable
     @Override
+    @RequiredReadAction
     public PsiElement getOperationElement() {
-        final ASTNode operationASTNode = getNode().findChildByType(BINARY_OPERATIONS);
+        ASTNode operationASTNode = getNode().findChildByType(BINARY_OPERATIONS);
         return operationASTNode != null ? operationASTNode.getPsi() : null;
     }
 
@@ -79,21 +78,22 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
         @Nonnull PsiScopeProcessor processor,
         @Nonnull ResolveState state,
         PsiElement lastParent,
         @Nonnull PsiElement place
     ) {
-        final IElementType operationType = getOperationSign();
+        IElementType operationType = getOperationSign();
 
         if (BINARY_OPERATIONS_WITH_DEFS.contains(operationType)) {
-            final JSExpression loperand = getLOperand();
-            final JSExpression roperand = getROperand();
+            JSExpression loperand = getLOperand();
+            JSExpression roperand = getROperand();
 
             if (loperand != null) {
                 return loperand.processDeclarations(processor, state, lastParent, place)
-                    && (roperand != null ? roperand.processDeclarations(processor, state, lastParent, place) : true);
+                    && (roperand == null || roperand.processDeclarations(processor, state, lastParent, place));
             }
         }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
index ee598323..3d1e4da7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
@@ -21,22 +21,19 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:17:15 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSBlockStatementImpl extends JSStatementImpl implements JSBlockStatement {
-    public JSBlockStatementImpl(final ASTNode node) {
+    public JSBlockStatementImpl(ASTNode node) {
         super(node);
     }
 
@@ -55,11 +52,12 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
-    public PsiElement add(@Nonnull final PsiElement element) throws IncorrectOperationException {
-        if (element instanceof JSStatement) {
+    @RequiredWriteAction
+    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
+        if (element instanceof JSStatement statement) {
             ASTNode node = getNode().findChildByType(JSTokenTypes.RBRACE);
             if (node != null) {
-                PsiElement psiElement = super.addAfter(element, node.getTreePrev().getPsi());
+                PsiElement psiElement = super.addAfter(statement, node.getTreePrev().getPsi());
                 CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), psiElement.getNode());
                 return psiElement;
             }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
index 85339e3b..ce33bbba 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
@@ -16,20 +16,18 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:52:04 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSBreakStatementImpl extends JSStatementWithLabelReferenceImpl implements JSBreakStatement {
-    public JSBreakStatementImpl(final ASTNode node) {
+    public JSBreakStatementImpl(ASTNode node) {
         super(node);
     }
 
@@ -39,6 +37,7 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public JSStatement getStatementToBreak() {
         String label = getLabel();
         if (label == null) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java
index 3a816e02..52cb8d41 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java
@@ -24,7 +24,7 @@
 
 /**
  * @author VISTALL
- * @since 13.12.2015
+ * @since 2015-12-13
  */
 public class JavaScriptSimpleType implements JavaScriptType {
     private String myReferenceName;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
index 0ab54e57..4f967f5f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
@@ -52,7 +52,7 @@ public PsiElement getElement() {
     @RequiredReadAction
     public TextRange getRangeInElement() {
         int quotesDelta = myNameIdentifier.getNode().getElementType() == JSTokenTypes.STRING_LITERAL ? 1 : 0;
-        final int startOffsetInParent = myNameIdentifier.getStartOffsetInParent();
+        int startOffsetInParent = myNameIdentifier.getStartOffsetInParent();
         int startOffset = startOffsetInParent + quotesDelta;
         int endOffset = startOffsetInParent + myNameIdentifier.getTextLength() - quotesDelta;
         if (endOffset <= startOffset) {
@@ -88,7 +88,7 @@ public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOpe
     @Override
     @RequiredReadAction
     public boolean isReferenceTo(PsiElement element) {
-        final PsiElement element2 = resolve();
+        PsiElement element2 = resolve();
         boolean proxyExpanded = false;
 
         if (element instanceof JSDefinitionExpression definition
@@ -106,7 +106,7 @@ public boolean isReferenceTo(PsiElement element) {
     @Override
     @RequiredReadAction
     public Object[] getVariants() {
-        final VariantsProcessor processor =
+        VariantsProcessor processor =
             new VariantsProcessor(null, myProperty.getContainingFile(), false, myProperty);
 
         JSResolveUtil.processGlobalSymbols(myProperty, processor);

From f1a8b1b947d5926ec3711d8ea1952728ccc598e6 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 13:00:34 +0300
Subject: [PATCH 259/340] Partially refactoring resolve and parsing.impl.

---
 .../JSSmartCompletionVariantsHandler.java     |   66 +-
 .../javascript/psi/resolve/JSResolveUtil.java | 1006 +++++++++--------
 .../JavaSciptDestructuringObjectImpl.java     |    4 +-
 .../JavaScriptDestructuringParameterImpl.java |    1 +
 ...tDestructuringShorthandedPropertyImpl.java |    4 +-
 5 files changed, 544 insertions(+), 537 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
index eb5426ca..6d140991 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.psi.util.JSLookupUtil;
 import com.intellij.lang.javascript.search.JSClassSearch;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.application.util.query.Query;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.ResolveResult;
@@ -30,10 +31,9 @@
 import consulo.project.Project;
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
@@ -43,23 +43,23 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jan 25, 2008
- * Time: 12:40:48 AM
+ * @since 2008-01-25
  */
 public class JSSmartCompletionVariantsHandler {
-    static Object[] getSmartVariants(final @Nonnull PsiElement expr, final boolean ecma) {
-        final PsiElement parent = expr.getParent();
+    @RequiredReadAction
+    static Object[] getSmartVariants(@Nonnull PsiElement expr, boolean ecma) {
+        PsiElement parent = expr.getParent();
 
         if (parent instanceof JSArgumentList argumentList && argumentList.getArguments()[0] == expr && ecma
             && ((JSReferenceExpression)expr).getQualifier() == null) {
-            final JSExpression calledExpr = ((JSCallExpression)parent.getParent()).getMethodExpression();
+            JSExpression calledExpr = ((JSCallExpression)parent.getParent()).getMethodExpression();
 
             if (calledExpr instanceof JSReferenceExpression expression) {
-                final @NonNls String s = expression.getReferencedName();
+                String s = expression.getReferencedName();
 
                 if ("addEventListener".equals(s) || "removeEventListener".equals(s)) {
-                    final List<Object> variants = new ArrayList<Object>();
-                    final MyEventSubclassesProcessor subclassesProcessor = new MyEventSubclassesProcessor(expr, variants);
+                    List<Object> variants = new ArrayList<>();
+                    MyEventSubclassesProcessor subclassesProcessor = new MyEventSubclassesProcessor(expr, variants);
                     subclassesProcessor.findAcceptableVariants(expression, parent.getProject());
                     if (variants.size() > 0) {
                         return variants.toArray(new Object[variants.size()]);
@@ -78,7 +78,7 @@ private static class MyEventSubclassesProcessor extends ResolveProcessor impleme
         private final Map<String, JSVariable> myCandidatesMap = new HashMap<>();
         private boolean findAcceptableEvents;
 
-        public MyEventSubclassesProcessor(final PsiElement expr, final List<Object> variants) {
+        public MyEventSubclassesProcessor(PsiElement expr, List<Object> variants) {
             super(null);
             myExpr = expr;
             myVariants = variants;
@@ -86,48 +86,50 @@ public MyEventSubclassesProcessor(final PsiElement expr, final List<Object> vari
             setToProcessHierarchy(true);
         }
 
-        public boolean process(final JSClass clazz) {
+        public boolean process(JSClass clazz) {
             clazz.processDeclarations(this, state, clazz, clazz);
 
             return true;
         }
 
         @Override
-        public boolean execute(final PsiElement element, final ResolveState state) {
+        @RequiredReadAction
+        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
             if (element instanceof JSVariable variable) {
-                final JSAttributeList attributeList = variable.getAttributeList();
+                JSAttributeList attributeList = variable.getAttributeList();
 
                 if (attributeList != null
                     && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC
                     && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
                     && "String".equals(variable.getTypeString())) {
-                    final String s = variable.getInitializerText();
+                    String s = variable.getInitializerText();
                     if (s != null && StringUtil.startsWith(s, "\"") && StringUtil.endsWith(s, "\"")) {
                         myCandidatesMap.put(StringUtil.stripQuotesAroundValue(s), variable);
                     }
                 }
             }
 
-            if (findAcceptableEvents && element instanceof JSClass) {
-                JSResolveUtil.processMetaAttributesForClass(element, this);
+            if (findAcceptableEvents && element instanceof JSClass jsClass) {
+                JSResolveUtil.processMetaAttributesForClass(jsClass, this);
             }
 
             return true;
         }
 
-        public void findAcceptableVariants(JSReferenceExpression expression, final Project project) {
+        @RequiredReadAction
+        public void findAcceptableVariants(JSReferenceExpression expression, Project project) {
             PsiElement clazz = JSResolveUtil.findClassByQName("flash.events.Event", expression.getResolveScope(), project);
             clazz = JSResolveUtil.unwrapProxy(clazz);
             if (!(clazz instanceof JSClass)) {
                 return;
             }
-            final Query<JSClass> query = JSClassSearch.searchClassInheritors((JSClass)clazz, true);
+            Query<JSClass> query = JSClassSearch.searchClassInheritors((JSClass)clazz, true);
 
             for (JSClass extendedClass : query.findAll()) {
                 process(extendedClass);
             }
 
-            final JSExpression qualifier = expression.getQualifier();
+            JSExpression qualifier = expression.getQualifier();
 
             JSClass clazzToProcess = null;
 
@@ -135,23 +137,23 @@ public void findAcceptableVariants(JSReferenceExpression expression, final Proje
                 clazzToProcess = PsiTreeUtil.getParentOfType(qualifier, JSClass.class);
             }
             else if (qualifier instanceof JSReferenceExpression referenceExpression) {
-                final ResolveResult[] results = referenceExpression.multiResolve(false);
+                ResolveResult[] results = referenceExpression.multiResolve(false);
                 if (results.length > 0 && results[0].getElement() instanceof JSClass jsClass) {
                     clazzToProcess = jsClass;
                 }
             }
 
             if (clazzToProcess == null) {
-                final PsiElement context = expression.getContainingFile().getContext();
+                PsiElement context = expression.getContainingFile().getContext();
                 clazzToProcess = JSResolveUtil.getClassFromTagNameInMxml(context);
                 if (clazzToProcess == null && context != null) {
                     XmlFile file = PsiTreeUtil.getParentOfType(context, XmlFile.class);
                     if (file != null) {
-                        final XmlTag rootTag = file.getDocument().getRootTag();
-                        final XmlTag[] tags = rootTag != null
+                        XmlTag rootTag = file.getDocument().getRootTag();
+                        XmlTag[] tags = rootTag != null
                             ? XmlBackedJSClassImpl.findMxmlSubTags(rootTag, "Metadata")
                             : XmlTag.EMPTY;
-                        final MyJSInjectedFilesVisitor injectedFilesVisitor = new MyJSInjectedFilesVisitor();
+                        MyJSInjectedFilesVisitor injectedFilesVisitor = new MyJSInjectedFilesVisitor();
 
                         for (XmlTag tag : tags) {
                             JSResolveUtil.processInjectedFileForTag(tag, injectedFilesVisitor);
@@ -170,13 +172,14 @@ else if (qualifier instanceof JSReferenceExpression referenceExpression) {
         }
 
         @Override
-        public boolean process(final @Nonnull JSAttribute jsAttribute) {
+        @RequiredReadAction
+        public boolean process(@Nonnull JSAttribute jsAttribute) {
             if ("Event".equals(jsAttribute.getName())) {
-                final JSAttributeNameValuePair eventName = jsAttribute.getValueByName("name");
+                JSAttributeNameValuePair eventName = jsAttribute.getValueByName("name");
 
                 if (eventName != null) {
-                    final String value = eventName.getSimpleValue();
-                    final JSVariable variable = myCandidatesMap.get(value);
+                    String value = eventName.getSimpleValue();
+                    JSVariable variable = myCandidatesMap.get(value);
 
                     if (variable != null) {
                         myCandidatesMap.remove(value);
@@ -193,13 +196,14 @@ public boolean process(final @Nonnull JSAttribute jsAttribute) {
         }
 
         @Override
-        public boolean handleOtherElement(final PsiElement el, final PsiElement context, final Ref<PsiElement> continuePassElement) {
+        public boolean handleOtherElement(PsiElement el, PsiElement context, SimpleReference<PsiElement> continuePassElement) {
             return true;
         }
 
         private class MyJSInjectedFilesVisitor extends JSResolveUtil.JSInjectedFilesVisitor {
             @Override
-            protected void process(final JSFile file) {
+            @RequiredReadAction
+            protected void process(JSFile file) {
                 for (PsiElement element : file.getChildren()) {
                     if (element instanceof JSAttributeList attributeList) {
                         JSResolveUtil.processAttributeList(MyEventSubclassesProcessor.this, null, attributeList, true);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 876a91bb..d0b46376 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -33,6 +33,7 @@
 import com.intellij.lang.javascript.psi.impl.JSStubElementImpl;
 import com.intellij.xml.XmlElementDescriptor;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.application.util.*;
 import consulo.application.util.function.Processor;
 import consulo.component.extension.Extensions;
@@ -76,13 +77,11 @@
 import consulo.util.dataholder.Key;
 import consulo.util.lang.Comparing;
 import consulo.util.lang.StringUtil;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.util.VirtualFileUtil;
 import consulo.xml.ide.highlighter.XmlFileType;
 import consulo.xml.psi.xml.*;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -93,34 +92,32 @@
  */
 public class JSResolveUtil {
     private static final Key<CachedValue<IntObjectMap<Object>>> MY_CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
-    private static UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> ourCachedDefsCache =
+    private static final UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> OUR_CACHED_DEFS_CACHE =
         new RelevantDefsUserDataCache();
-    @NonNls
     public static final String PROTOTYPE_FIELD_NAME = "prototype";
 
-    @NonNls
     private static final String ARRAY_TYPE_NAME = "Array";
-    @NonNls
     private static final String ARGUMENTS_TYPE_NAME = "Arguments";
 
     public static final String COMMENT_DELIMITERS = "|/";
 
-    public static void processInjectedFileForTag(final @Nonnull XmlTag tag, @Nonnull JSInjectedFilesVisitor visitor) {
+    public static void processInjectedFileForTag(@Nonnull XmlTag tag, @Nonnull JSInjectedFilesVisitor visitor) {
         InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(tag.getProject());
 
         for (XmlTagChild child : tag.getValue().getChildren()) {
-            if (child instanceof XmlText) {
-                injectedLanguageManager.enumerate(child, visitor);
+            if (child instanceof XmlText xmlText) {
+                injectedLanguageManager.enumerate(xmlText, visitor);
             }
         }
     }
 
-    public static String findPackageForMxml(final PsiElement expression) {
+    @RequiredReadAction
+    public static String findPackageForMxml(PsiElement expression) {
         String s = null;
-        final PsiFile containingFile = expression.getContainingFile();
+        PsiFile containingFile = expression.getContainingFile();
 
         if (containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 && containingFile.getContext() != null) {
-            final PsiFile contextContainigFile = containingFile.getContext().getContainingFile();
+            PsiFile contextContainigFile = containingFile.getContext().getContainingFile();
             VirtualFile file = contextContainigFile.getVirtualFile();
             if (file == null && contextContainigFile.getOriginalFile() != null) {
                 file = contextContainigFile.getOriginalFile().getVirtualFile();
@@ -132,12 +129,12 @@ public static String findPackageForMxml(final PsiElement expression) {
     }
 
     public static String getExpectedPackageNameFromFile(VirtualFile file, Project project, boolean allowEvaluationFromContextRoot) {
-        final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex();
-        final Module moduleForFile = file != null ? projectFileIndex.getModuleForFile(file) : null;
+        ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex();
+        Module moduleForFile = file != null ? projectFileIndex.getModuleForFile(file) : null;
 
         if (moduleForFile != null) {
-            if (file instanceof VirtualFileWindow) {
-                file = ((VirtualFileWindow)file).getDelegate();
+            if (file instanceof VirtualFileWindow virtualFileWindow) {
+                file = virtualFileWindow.getDelegate();
             }
             VirtualFile rootForFile = projectFileIndex.getSourceRootForFile(file);
             if (rootForFile == null && allowEvaluationFromContextRoot) {
@@ -151,23 +148,24 @@ public static String getExpectedPackageNameFromFile(VirtualFile file, Project pr
         return null;
     }
 
-    public static void processInterfaceMethods(final JSClass clazz, final CollectMethodsToImplementProcessor implementedMethodProcessor) {
+    public static void processInterfaceMethods(JSClass clazz, CollectMethodsToImplementProcessor implementedMethodProcessor) {
         clazz.processDeclarations(implementedMethodProcessor, ResolveState.initial(), clazz, clazz);
     }
 
-    public static String getExpressionType(final JSExpression expression, final PsiFile containingFile) {
+    @RequiredReadAction
+    public static String getExpressionType(JSExpression expression, PsiFile containingFile) {
         String type = getQualifiedExpressionType(expression, containingFile);
 
         return getShortenedType(type, expression);
     }
 
-    public static String getShortenedType(String type, final PsiElement context) {
+    public static String getShortenedType(String type, PsiElement context) {
         if (type == null) {
             type = "*";
         }
         else {
             String shortName = getShortTypeName(type);
-            final String expr = JSImportHandlingUtil.resolveTypeName(shortName, context);
+            String expr = JSImportHandlingUtil.resolveTypeName(shortName, context);
             if (expr != null && !expr.equals(shortName)) {
                 type = shortName;
             }
@@ -175,11 +173,12 @@ public static String getShortenedType(String type, final PsiElement context) {
         return type;
     }
 
-    public static String getQualifiedExpressionType(final JSExpression expression, final PsiFile containingFile) {
+    @RequiredReadAction
+    public static String getQualifiedExpressionType(JSExpression expression, PsiFile containingFile) {
         String type = null;
 
         if (expression != null) {
-            final BaseJSSymbolProcessor.SimpleTypeProcessor processor =
+            BaseJSSymbolProcessor.SimpleTypeProcessor processor =
                 new BaseJSSymbolProcessor.SimpleTypeProcessor(JavaScriptVersionUtil.getFeatures(expression));
             BaseJSSymbolProcessor.doEvalForExpr(expression, containingFile, processor);
             type = processor.getType();
@@ -191,11 +190,11 @@ public static String getQualifiedExpressionType(final JSExpression expression, f
     private static String getShortTypeName(String type) {
         String str = type;
 
-        final int i = str.indexOf('<');
+        int i = str.indexOf('<');
         String signature = null;
 
         if (i != -1) {
-            final int index = str.lastIndexOf('.', i);
+            int index = str.lastIndexOf('.', i);
             if (index == -1) {
                 return type;
             }
@@ -203,7 +202,7 @@ private static String getShortTypeName(String type) {
             str = str.substring(0, index);
         }
 
-        final int i2 = str.lastIndexOf('.');
+        int i2 = str.lastIndexOf('.');
         if (i2 != -1) {
             str = str.substring(i2 + 1);
         }
@@ -213,23 +212,24 @@ private static String getShortTypeName(String type) {
 
     // TODO remove this method, call generic one processing includes as well (like findParent())
     public static PsiElement getClassReferenceForXmlFromContext(PsiElement parent) {
-        final PsiElement context = parent != null ? parent.getContext() : null;
-        if (context instanceof XmlElement && context.getContainingFile() instanceof XmlFile) {
-            return XmlBackedJSClassImpl.getContainingComponent((XmlElement)context);
+        if (parent != null && parent.getContext() instanceof XmlElement xmlElement
+            && xmlElement.getContainingFile() instanceof XmlFile) {
+            return XmlBackedJSClassImpl.getContainingComponent(xmlElement);
         }
         return parent;
     }
 
     @Nullable
-    public static XmlBackedJSClassImpl getXmlBackedClass(final JSFile injectedJsFile) {
-        final PsiElement context = injectedJsFile.getContext();
+    public static XmlBackedJSClassImpl getXmlBackedClass(JSFile injectedJsFile) {
+        PsiElement context = injectedJsFile.getContext();
         if (context instanceof XmlAttributeValue || context instanceof XmlText) {
             return XmlBackedJSClassImpl.getContainingComponent((XmlElement)context);
         }
         return null;
     }
 
-    public static <T extends JSNamedElement & JSAttributeListOwner> SearchScope findUseScope(final T jsVariableBase) {
+    @RequiredReadAction
+    public static <T extends JSNamedElement & JSAttributeListOwner> SearchScope findUseScope(T jsVariableBase) {
         PsiElement element = PsiTreeUtil.getParentOfType(
             jsVariableBase,
             JSFunction.class,
@@ -240,10 +240,10 @@ public static <T extends JSNamedElement & JSAttributeListOwner> SearchScope find
         );
         PsiElement scopeElement = element;
 
-        if (element instanceof JSFile) {
-            final PsiElement xmlFromContext = getClassReferenceForXmlFromContext(element);
+        if (element instanceof JSFile jsFile) {
+            PsiElement xmlFromContext = getClassReferenceForXmlFromContext(jsFile);
 
-            if (xmlFromContext != element) {
+            if (xmlFromContext != jsFile) {
                 element = xmlFromContext;
                 scopeElement = element.getContainingFile();
             }
@@ -253,19 +253,16 @@ public static <T extends JSNamedElement & JSAttributeListOwner> SearchScope find
         }
 
         if (element != null) {
-            if (element instanceof JSFunction) {
-                final PsiElement elt =
-                    JSDocumentationUtils.findDocComment(JSDocumentationProvider.findElementForWhichPreviousCommentWillBeSearched(element));
-                if (elt instanceof PsiComment) {
-                    return new LocalSearchScope(new PsiElement[]{
-                        elt,
-                        element
-                    });
+            if (element instanceof JSFunction function) {
+                PsiElement elt =
+                    JSDocumentationUtils.findDocComment(JSDocumentationProvider.findElementForWhichPreviousCommentWillBeSearched(function));
+                if (elt instanceof PsiComment comment) {
+                    return new LocalSearchScope(new PsiElement[]{comment, function});
                 }
             }
 
             if (element instanceof JSClass) {
-                final JSAttributeList attributeList = jsVariableBase.getAttributeList();
+                JSAttributeList attributeList = jsVariableBase.getAttributeList();
 
                 if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PRIVATE) {
                     return ((JSStubElementImpl)jsVariableBase).getDefaultUseScope();
@@ -276,7 +273,8 @@ public static <T extends JSNamedElement & JSAttributeListOwner> SearchScope find
         return ((JSStubElementImpl)jsVariableBase).getDefaultUseScope();
     }
 
-    public static final boolean isAssignableType(@NonNls final String expectedType, @NonNls String type, PsiElement context) {
+    @RequiredReadAction
+    public static boolean isAssignableType(String expectedType, String type, PsiElement context) {
         if ((expectedType != null && hasMultipleOccurenceDelimiters(expectedType))
             || (type != null && hasMultipleOccurenceDelimiters(type))) {
             StringTokenizer expectedTypeIterator = new StringTokenizer(expectedType != null ? expectedType : "", COMMENT_DELIMITERS);
@@ -302,7 +300,7 @@ public static final boolean isAssignableType(@NonNls final String expectedType,
             return true;
         }
 
-        final boolean nonecma = context.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+        boolean nonecma = context.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4;
 
         if ("Number".equals(expectedType) && ("int".equals(type) || "uint".equals(type)
             || (("Boolean".equals(type) || "String".equals(type)) && nonecma))) {
@@ -342,7 +340,7 @@ public static final boolean isAssignableType(@NonNls final String expectedType,
         if ("void".equals(type)) {
             return false;
         }
-        final PsiElement typeClass = type != null ? unwrapProxy(findClassByQName(type, context)) : null;
+        PsiElement typeClass = type != null ? unwrapProxy(findClassByQName(type, context)) : null;
 
         if (!(typeClass instanceof JSClass)) {
             return true;
@@ -358,15 +356,15 @@ public static final boolean isAssignableType(@NonNls final String expectedType,
                 }
 
                 @Override
-                public boolean execute(final PsiElement element, final ResolveState state) {
-                    if (!(element instanceof JSClass)) {
+                @RequiredReadAction
+                public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                    if (!(element instanceof JSClass jsClass)) {
                         return true;
                     }
-                    final JSClass clazz = (JSClass)element;
-                    boolean sameType = clazz.getQualifiedName().equals(expectedType);
+                    boolean sameType = jsClass.getQualifiedName().equals(expectedType);
 
                     if (!sameType) {
-                        for (JSClass implementedClazz : clazz.getImplementedInterfaces()) {
+                        for (JSClass implementedClazz : jsClass.getImplementedInterfaces()) {
                             sameType =
                                 !implementedClazz.processDeclarations(this, ResolveState.initial(), implementedClazz, implementedClazz);
                             if (sameType) {
@@ -390,7 +388,7 @@ public boolean execute(final PsiElement element, final ResolveState state) {
     }
 
     private static boolean hasMultipleOccurenceDelimiters(String expectedType) {
-        final String commentDelimiters = COMMENT_DELIMITERS;
+        String commentDelimiters = COMMENT_DELIMITERS;
 
         for (int i = 0; i < commentDelimiters.length(); ++i) {
             if (expectedType.indexOf(commentDelimiters.charAt(i)) != -1) {
@@ -400,6 +398,7 @@ private static boolean hasMultipleOccurenceDelimiters(String expectedType) {
         return false;
     }
 
+    @RequiredReadAction
     private static boolean isImplicitCastPossible(JSClass typeClass, String expectedType) {
         // TODO: move to flex support plugin
         if (expectedType.equals("flash.events.IEventDispatcher")) {
@@ -411,7 +410,7 @@ private static boolean isImplicitCastPossible(JSClass typeClass, String expected
         return false;
     }
 
-    public static PsiElement getTopReferenceParent(final PsiElement parent) {
+    public static PsiElement getTopReferenceParent(PsiElement parent) {
         PsiElement currentParent = parent;
         for (; currentParent instanceof JSReferenceExpression; currentParent = currentParent.getParent()) {
             ;
@@ -419,7 +418,7 @@ public static PsiElement getTopReferenceParent(final PsiElement parent) {
         return currentParent;
     }
 
-    public static PsiElement getTopReferenceExpression(final @Nonnull PsiElement parent) {
+    public static PsiElement getTopReferenceExpression(@Nonnull PsiElement parent) {
         PsiElement element = parent;
 
         for (PsiElement currentParent = parent.getParent(); currentParent instanceof JSReferenceExpression;
@@ -429,19 +428,20 @@ public static PsiElement getTopReferenceExpression(final @Nonnull PsiElement par
         return element;
     }
 
-    public static boolean isSelfReference(final PsiElement currentParent, PsiElement elt) {
+    @RequiredReadAction
+    public static boolean isSelfReference(PsiElement currentParent, PsiElement elt) {
         return currentParent instanceof JSPackageStatement || currentParent instanceof JSNamespaceDeclaration
             || (currentParent instanceof JSVariable variable && variable.getNameIdentifier() == elt)
             || (currentParent instanceof JSFunction function && function.getNameIdentifier() == elt)
             || currentParent instanceof JSClass;
     }
 
-    public static PsiElement findParent(final PsiElement element) {
-        PsiElement parent = element instanceof JSVariable ? element.getParent().getParent() : element.getParent();
+    public static PsiElement findParent(PsiElement element) {
+        PsiElement parent = element instanceof JSVariable variable ? variable.getParent().getParent() : element.getParent();
         return parent instanceof JSFile jsFile ? findParentClass(jsFile) : parent;
     }
 
-    private static PsiElement findParentClass(final JSFile file) {
+    private static PsiElement findParentClass(JSFile file) {
         JSClass xmlBackedClass = getXmlBackedClass(file);
         if (xmlBackedClass != null) {
             return xmlBackedClass;
@@ -451,20 +451,21 @@ private static PsiElement findParentClass(final JSFile file) {
         if (forcedContext != null && !forcedContext.isValid()) {
             forcedContext = null;
         }
-        if (forcedContext instanceof JSClass) {
-            return forcedContext;
+
+        if (forcedContext instanceof JSClass jsClass) {
+            return jsClass;
         }
 
-        if (forcedContext instanceof JSFile) {
-            return findParentClass((JSFile)forcedContext);
+        if (forcedContext instanceof JSFile jsFile) {
+            return findParentClass(jsFile);
         }
 
-        if (forcedContext instanceof PsiFile && JavaScriptSupportLoader.isFlexMxmFile((PsiFile)forcedContext)) {
-            return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)forcedContext);
+        if (forcedContext instanceof XmlFile xmlFile && JavaScriptSupportLoader.isFlexMxmFile(xmlFile)) {
+            return XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
         }
 
-        if (forcedContext instanceof XmlElement) {
-            PsiFile containingFile = forcedContext.getContainingFile();
+        if (forcedContext instanceof XmlElement xmlElement) {
+            PsiFile containingFile = xmlElement.getContainingFile();
             if (JavaScriptSupportLoader.isFlexMxmFile(containingFile)) {
                 return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)containingFile);
             }
@@ -481,29 +482,29 @@ private static PsiElement findParentClass(final JSFile file) {
 
     @Nullable
     public static JSClass getClassOfContext(PsiElement node) {
-        final JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
+        JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
         if (jsClass != null) {
             return jsClass;
         }
         else {
-            final PsiElement context = getClassReferenceForXmlFromContext(node.getContainingFile());
-            if (context instanceof JSClass) {
-                return (JSClass)context;
+            PsiElement context = getClassReferenceForXmlFromContext(node.getContainingFile());
+            if (context instanceof JSClass contextClass) {
+                return contextClass;
             }
         }
 
         return null;
     }
 
-    public static
     @Nullable
-    JSClass findClassOfQualifier(final JSExpression qualifier, final PsiFile containingFile) {
-        final String s = getQualifiedExpressionType(qualifier, containingFile);
-        final PsiElement qName = s != null ? unwrapProxy(findClassByQName(s, containingFile)) : null;
+    @RequiredReadAction
+    public static JSClass findClassOfQualifier(JSExpression qualifier, PsiFile containingFile) {
+        String s = getQualifiedExpressionType(qualifier, containingFile);
+        PsiElement qName = s != null ? unwrapProxy(findClassByQName(s, containingFile)) : null;
         return qName instanceof JSClass jsClass ? jsClass : null;
     }
 
-    public static boolean referenceExpressionShouldBeQualified(final JSReferenceExpression contextExpr) {
+    public static boolean referenceExpressionShouldBeQualified(JSReferenceExpression contextExpr) {
         PsiElement parent = contextExpr.getParent();
         return parent instanceof JSImportStatement
             || (parent instanceof JSReferenceList && contextExpr.getContainingFile().getContext() != null);
@@ -513,8 +514,9 @@ public static boolean isArtificialClassUsedForReferenceList(JSClass clazz) {
         return clazz.getContainingFile().getContext() != null;
     }
 
+    @RequiredReadAction
     public static Collection<JSQualifiedNamedElement> findElementsByName(String name, Project project, GlobalSearchScope scope) {
-        final Set<JSQualifiedNamedElement> result = new HashSet<>();
+        Set<JSQualifiedNamedElement> result = new HashSet<>();
         Collection<JSQualifiedNamedElement> jsQualifiedNamedElements =
             StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_NAME, name, project, scope, JSQualifiedNamedElement.class);
 
@@ -528,11 +530,11 @@ public static Collection<JSQualifiedNamedElement> findElementsByName(String name
         files.addAll(FileBasedIndex.getInstance()
             .getContainingFiles(FilenameIndex.NAME, name + JavaScriptSupportLoader.MXML_FILE_EXTENSION2_DOT, scope));
 
-        for (final VirtualFile file : files) {
+        for (VirtualFile file : files) {
             if (!file.isValid()) {
                 continue;
             }
-            final PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
+            PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
             if (psiFile != null) {
                 result.add(XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)psiFile));
             }
@@ -540,19 +542,21 @@ public static Collection<JSQualifiedNamedElement> findElementsByName(String name
         return result;
     }
 
+    @RequiredReadAction
     public static boolean isNewResolveAndCompletion(PsiFile psiFile) {
         return psiFile.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4) || JavaScriptSupportLoader.isFlexMxmFile(psiFile);
     }
 
-    public static String getTypeFromSetAccessor(final JSNamedElement jsNamedElement) {
+    @RequiredReadAction
+    public static String getTypeFromSetAccessor(JSNamedElement jsNamedElement) {
         if (!(jsNamedElement instanceof JSFunction function && function.isSetProperty())) {
             return null;
         }
-        final JSParameterList jsParameterList = ((JSFunction)jsNamedElement).getParameterList();
+        JSParameterList jsParameterList = function.getParameterList();
         if (jsParameterList == null) {
             return null;
         }
-        final JSParameter[] jsParameters = jsParameterList.getParameters();
+        JSParameter[] jsParameters = jsParameterList.getParameters();
         if (jsParameters == null || jsParameters.length != 1) {
             return null;
         }
@@ -564,7 +568,7 @@ public static boolean shouldProcessTopLevelGlobalContext(@Nonnull PsiElement pla
 
         return shouldProcessImports(place, processor) && (
             !((placeParent = place.getParent()) instanceof JSCallExpression)
-                || (place instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() != null
+                || (place instanceof JSReferenceExpression refExpr && refExpr.getQualifier() != null
                 && ((ResolveProcessor)processor).specificallyAskingToResolveQualifiedNames())
                 || placeParent instanceof JSNewExpression);
     }
@@ -573,11 +577,11 @@ public static boolean shouldProcessImports(@Nonnull PsiElement place, @Nonnull P
         if (!(processor instanceof ResolveProcessor resolveProcessor && !resolveProcessor.isLocalResolve())) {
             return false;
         }
-        return (!(place instanceof JSReferenceExpression) ||
-            ((JSReferenceExpression)place).getQualifier() == null ||
-            ((ResolveProcessor)processor).specificallyAskingToResolveQualifiedNames());
+        return !(place instanceof JSReferenceExpression refExpr && refExpr.getQualifier() != null)
+            || resolveProcessor.specificallyAskingToResolveQualifiedNames();
     }
 
+    @RequiredReadAction
     public static boolean processTopLevelClasses(
         PsiScopeProcessor processor,
         ResolveState state,
@@ -587,7 +591,7 @@ public static boolean processTopLevelClasses(
         boolean acceptQualifiedElements
     ) {
         boolean result = true;
-        final String resolvedName = ((ResolveProcessor)processor).getName();
+        String resolvedName = ((ResolveProcessor)processor).getName();
 
         if (resolvedName == null) {
             for (String s : StubIndex.getInstance().getAllKeys(JavaScriptIndexKeys.ELEMENTS_BY_NAME, project)) {
@@ -641,8 +645,8 @@ public static boolean processTopLevelClasses(
     static boolean walkOverStructure(@Nonnull PsiElement context, Processor<PsiNamedElement> processor) {
         PsiNamedElement parent = PsiTreeUtil.getNonStrictParentOfType(context, JSQualifiedNamedElement.class, PsiFile.class);
 
-        if (parent instanceof JSClass) {
-            PsiElement forcedContext = parent.getUserData(contextKey);
+        if (parent instanceof JSClass jsClass) {
+            PsiElement forcedContext = jsClass.getUserData(contextKey);
 
             if (forcedContext instanceof XmlBackedJSClassImpl xmlBackedJSClass && !processor.process(xmlBackedJSClass)) {
                 return false;
@@ -658,11 +662,11 @@ static boolean walkOverStructure(@Nonnull PsiElement context, Processor<PsiNamed
                 break;
             }
 
-            if (parent instanceof PsiFile) {
-                final PsiElement data = parent.getUserData(contextKey);
+            if (parent instanceof PsiFile file) {
+                PsiElement data = file.getUserData(contextKey);
 
-                if (data instanceof JSElement) {
-                    parent = PsiTreeUtil.getNonStrictParentOfType(data, JSQualifiedNamedElement.class, PsiFile.class);
+                if (data instanceof JSElement jsElement) {
+                    parent = PsiTreeUtil.getNonStrictParentOfType(jsElement, JSQualifiedNamedElement.class, PsiFile.class);
                 }
                 else {
                     break;
@@ -679,7 +683,7 @@ static boolean walkOverStructure(@Nonnull PsiElement context, Processor<PsiNamed
     private static final Key<ParameterizedCachedValue<Set<String>, JSElement>> ourCachedOpenedNsesKey = Key.create("opened.nses");
 
     private static final UserDataCache<ParameterizedCachedValue<Set<String>, JSElement>, JSElement, Object> ourCachedOpenedNsesCache =
-        new UserDataCache<ParameterizedCachedValue<Set<String>, JSElement>, JSElement, Object>() {
+        new UserDataCache<>() {
             @Override
             protected ParameterizedCachedValue<Set<String>, JSElement> compute(JSElement jsElement, Object p) {
                 return CachedValuesManager.getManager(jsElement.getProject()).createParameterizedCachedValue(
@@ -706,12 +710,13 @@ public boolean process(PsiNamedElement psiNamedElement) {
                                 }
 
                                 @Override
-                                public boolean execute(PsiElement element, ResolveState state) {
+                                @RequiredReadAction
+                                public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                                     if (!(element instanceof JSUseNamespaceDirective)) {
                                         return true;
                                     }
                                     if (openedNses == null) {
-                                        openedNses = new HashSet<String>();
+                                        openedNses = new HashSet<>();
                                     }
                                     openedNses.add(((JSUseNamespaceDirective)element).getNamespaceToBeUsed());
                                     return true;
@@ -719,7 +724,7 @@ public boolean execute(PsiElement element, ResolveState state) {
                             }
                             MyProcessor processor = new MyProcessor();
                             walkOverStructure(context, processor);
-                            return new CachedValueProvider.Result<Set<String>>(processor.openedNses, PsiModificationTracker.EVER_CHANGED);
+                            return new CachedValueProvider.Result<>(processor.openedNses, PsiModificationTracker.EVER_CHANGED);
                         }
                     },
                     false
@@ -728,39 +733,40 @@ public boolean execute(PsiElement element, ResolveState state) {
         };
 
     public static Set<String> calculateOpenNses(PsiElement place) {
-        final Ref<Set<String>> result = new Ref<>();
-        walkOverStructure(place, new Processor<PsiNamedElement>() {
-            @Override
-            public boolean process(PsiNamedElement psiNamedElement) {
+        SimpleReference<Set<String>> result = new SimpleReference<>();
+        walkOverStructure(
+            place,
+            psiNamedElement -> {
                 if (psiNamedElement instanceof JSElement element) {
                     result.set(ourCachedOpenedNsesCache.get(ourCachedOpenedNsesKey, element, null).getValue(element));
                 }
                 return false;
             }
-        });
+        );
         return result.get() != null ? result.get() : Collections.<String>emptySet();
     }
 
+    @RequiredReadAction
     public static boolean processGlobalThings(PsiScopeProcessor processor, ResolveState state, PsiElement place, PsiElement context) {
         boolean result = true;
-        final Project project = context.getProject();
-        final GlobalSearchScope scope = context.getResolveScope();
+        Project project = context.getProject();
+        GlobalSearchScope scope = context.getResolveScope();
 
         if (shouldProcessTopLevelGlobalContext(place, processor)) {
             //result = processTopPackages((ResolveProcessor) processor, state, project, scope);
         }
 
         if (result) {
-            boolean acceptOnlyClasses = place instanceof JSReferenceExpression ? isExprInTypeContext((JSReferenceExpression)place) : false;
+            boolean acceptOnlyClasses = place instanceof JSReferenceExpression refExpr && isExprInTypeContext(refExpr);
 
             result = processTopLevelClasses(processor, state, project, scope, acceptOnlyClasses, true);
         }
         return result;
     }
 
-    public static
     @Nullable
-    JSParameter findParameterForUsedArgument(@Nonnull JSExpression mainOccurence, @Nonnull JSArgumentList parent) {
+    @RequiredReadAction
+    public static JSParameter findParameterForUsedArgument(@Nonnull JSExpression mainOccurence, @Nonnull JSArgumentList parent) {
         int paramIndex = 0;
 
         for (JSExpression expr : parent.getArguments()) {
@@ -770,21 +776,17 @@ JSParameter findParameterForUsedArgument(@Nonnull JSExpression mainOccurence, @N
             paramIndex++;
         }
 
-        final JSExpression methodExpr = ((JSCallExpression)parent.getParent()).getMethodExpression();
-        if (methodExpr instanceof JSReferenceExpression referenceExpression) {
-            final ResolveResult[] results = referenceExpression.multiResolve(false);
+        JSExpression methodExpr = ((JSCallExpression)parent.getParent()).getMethodExpression();
+        if (methodExpr instanceof JSReferenceExpression refExpr) {
+            ResolveResult[] results = refExpr.multiResolve(false);
 
-            if (results.length > 0) {
-                final PsiElement element = results[0].getElement();
+            if (results.length > 0 && results[0].getElement() instanceof JSFunction function) {
+                JSParameterList parameterList = function.getParameterList();
+                if (parameterList != null) {
+                    JSParameter[] params = parameterList.getParameters();
 
-                if (element instanceof JSFunction function) {
-                    final JSParameterList parameterList = function.getParameterList();
-                    if (parameterList != null) {
-                        final JSParameter[] params = parameterList.getParameters();
-
-                        if (paramIndex < params.length) {
-                            return params[paramIndex];
-                        }
+                    if (paramIndex < params.length) {
+                        return params[paramIndex];
                     }
                 }
             }
@@ -795,7 +797,8 @@ JSParameter findParameterForUsedArgument(@Nonnull JSExpression mainOccurence, @N
     public static abstract class JSInjectedFilesVisitor
         implements PsiLanguageInjectionHost.InjectedPsiVisitor, XmlBackedJSClassImpl.InjectedFileVisitor {
         @Override
-        public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places) {
+        @RequiredReadAction
+        public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places) {
             if (injectedPsi instanceof JSFile jsFile) {
                 process(jsFile);
             }
@@ -809,7 +812,6 @@ public void visit(XmlTag rootTag, JSFile file) {
         }
     }
 
-    @NonNls
     public static final String OBJECT_CLASS_NAME = "Object";
 
     private JSResolveUtil() {
@@ -817,11 +819,12 @@ private JSResolveUtil() {
 
     private static final Key<CachedValue<PsiElement[]>> ourFileElementsValueKey = Key.create("file.elements");
 
+    @RequiredReadAction
     public static void treeWalkUp(PsiScopeProcessor processor, PsiElement elt, PsiElement lastParent, PsiElement place) {
         treeWalkUp(processor, elt, lastParent, place, null, null);
     }
 
-
+    @RequiredReadAction
     public static void treeWalkUp(
         PsiScopeProcessor processor,
         PsiElement elt,
@@ -832,8 +835,9 @@ public static void treeWalkUp(
         treeWalkUp(processor, elt, lastParent, place, terminatingParent, null);
     }
 
+    @RequiredReadAction
     private static void treeWalkUp(
-        final PsiScopeProcessor processor,
+        PsiScopeProcessor processor,
         PsiElement elt,
         PsiElement lastParent,
         PsiElement place,
@@ -856,20 +860,20 @@ private static void treeWalkUp(
             }
             elt = parentElement.getParent();
             parentElement = elt.getParent(); // when walking a| = b, start from enclosing statement
-            if (parentElement instanceof JSExpressionStatement) {
-                elt = parentElement;
-                parentElement = parentElement.getParent();
+            if (parentElement instanceof JSExpressionStatement expr) {
+                elt = expr;
+                parentElement = expr.getParent();
             }
             currentScope = elt;
         }
-        else if (parentElement instanceof JSVariable && currentScope == null) {
+        else if (parentElement instanceof JSVariable variable && currentScope == null) {
             // when walking from variable init start from enclosing statement (function expr / object literal could reference that could reference
             // var in this case, better to check for any scope change)
-            currentScope = parentElement;
-            parentElement = parentElement.getParent();
+            currentScope = variable;
+            parentElement = variable.getParent();
         }
 
-        final boolean parentIsClass = parentElement instanceof JSClass;
+        boolean parentIsClass = parentElement instanceof JSClass;
         int index = -1;
         PsiElement[] children = getChildren(parentElement);
 
@@ -907,42 +911,37 @@ else if (parentElement instanceof JSVariable && currentScope == null) {
             if (index == -1) {
                 cur = cur.getPrevSibling();
             }
+            else if (index != 0) {
+                cur = children[--index];
+            }
             else {
-                if (index != 0) {
-                    cur = children[--index];
-                }
-                else {
-                    cur = null;
-                }
+                cur = null;
             }
         }
         while (cur != null);
 
-        final PsiElement func = parentIsClass || finish ? null : processFunctionDeclarations(processor, parentElement);
+        PsiElement func = parentIsClass || finish ? null : processFunctionDeclarations(processor, parentElement);
         if (func != null) {
             return;
         }
 
         if (elt instanceof PsiFile) {
-            if (elt instanceof XmlFile) {
-                final XmlFile xmlFile = (XmlFile)elt;
-                final XmlDocument document = xmlFile.getDocument();
-                final XmlTag rootTag = document != null ? document.getRootTag() : null;
-                final String rootNs = rootTag != null ? rootTag.getNamespace() : null;
+            if (elt instanceof XmlFile xmlFile) {
+                XmlDocument document = xmlFile.getDocument();
+                XmlTag rootTag = document != null ? document.getRootTag() : null;
+                String rootNs = rootTag != null ? rootTag.getNamespace() : null;
 
                 if (JavaScriptSupportLoader.isMxmlNs(rootNs)) {
                     processXmlFile(processor, xmlFile, place);
                 }
-                else {
-                    if (rootTag != null && xmlFile.getFileType() == XmlFileType.INSTANCE) { // TODO this is bindows specific
-                        processXmlFile(processor, xmlFile, place);
-                    }
+                else if (rootTag != null && xmlFile.getFileType() == XmlFileType.INSTANCE) { // TODO this is bindows specific
+                    processXmlFile(processor, xmlFile, place);
                 }
             }
-            else if (elt instanceof JSFile) {
+            else if (elt instanceof JSFile jsFile) {
                 if (parentElement != null) {
                     XmlTag tag = PsiTreeUtil.getParentOfType(parentElement, XmlTag.class);
-                    final PsiFile containingFile = parentElement.getContainingFile();
+                    PsiFile containingFile = parentElement.getContainingFile();
 
                     while (tag != null) {
                         if (XmlBackedJSClassImpl.isInlineComponentTag(tag)) {
@@ -962,7 +961,7 @@ else if (elt instanceof JSFile) {
                     parentElement = containingFile;
                 }
                 else {
-                    parentElement = elt.getUserData(contextKey);
+                    parentElement = jsFile.getUserData(contextKey);
                 }
             }
             if (!(elt instanceof JSExpressionCodeFragment) && parentElement == null) {
@@ -977,45 +976,39 @@ else if (elt instanceof JSFile) {
     }
 
     private static UserDataCache<CachedValue<List<JSVariable>>, XmlFile, Object> ourCachedPredefinedVars =
-        new UserDataCache<CachedValue<List<JSVariable>>, XmlFile, Object>() {
+        new UserDataCache<>() {
             @Override
+            @RequiredReadAction
             protected CachedValue<List<JSVariable>> compute(final XmlFile xmlFile, Object p) {
-                return CachedValuesManager.getManager(xmlFile.getProject()).createCachedValue(new CachedValueProvider<List<JSVariable>>() {
-                    @Override
-                    public Result<List<JSVariable>> compute() {
+                return CachedValuesManager.getManager(xmlFile.getProject()).createCachedValue(
+                    () -> {
                         SmartList<JSVariable> vars = new SmartList<>();
                         String qName = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile).getQualifiedName();
                         vars.add(new ImplicitJSVariableImpl("outerDocument", qName, xmlFile));
                         vars.add(new ImplicitJSVariableImpl("data", OBJECT_CLASS_NAME, xmlFile));
-                        return new Result<List<JSVariable>>(vars, xmlFile);
-                    }
-                }, false);
+                        return new CachedValueProvider.Result<List<JSVariable>>(vars, xmlFile);
+                    },
+                    false
+                );
             }
         };
 
     private static Key<CachedValue<List<JSVariable>>> ourCachedPredefinedVarsKey = Key.create("ourCachedPredefinedVarsKey");
 
-    public static boolean processXmlFile(final PsiScopeProcessor processor, final XmlFile xmlFile, final PsiElement place) {
+    public static boolean processXmlFile(PsiScopeProcessor processor, XmlFile xmlFile, PsiElement place) {
         JSClass clazz = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
-        if (!clazz.processDeclarations(processor, ResolveState.initial(), clazz, place)) {
-            return false;
-        }
-        return true;
+        return clazz.processDeclarations(processor, ResolveState.initial(), clazz, place);
     }
 
-    private static PsiElement[] getChildren(final PsiElement element) {
-        if (!(element instanceof JSFile) && (!(element instanceof JSBlockStatement) || !(element.getParent() instanceof JSNamedElement))) {
+    private static PsiElement[] getChildren(PsiElement element) {
+        if (!(element instanceof JSFile) && !(element instanceof JSBlockStatement block && block.getParent() instanceof JSNamedElement)) {
             return null;
         }
         CachedValue<PsiElement[]> value = element.getUserData(ourFileElementsValueKey);
 
         if (value == null) {
-            value = CachedValuesManager.getManager(element.getProject()).createCachedValue(new CachedValueProvider<PsiElement[]>() {
-                @Override
-                public Result<PsiElement[]> compute() {
-                    return new Result<PsiElement[]>(element.getChildren(), element);
-                }
-            }, false);
+            value = CachedValuesManager.getManager(element.getProject())
+                .createCachedValue(() -> new CachedValueProvider.Result<>(element.getChildren(), element), false);
             element.putUserData(ourFileElementsValueKey, value);
         }
 
@@ -1023,7 +1016,8 @@ public Result<PsiElement[]> compute() {
     }
 
     @Nullable
-    private static PsiElement processFunctionDeclarations(final @Nonnull PsiScopeProcessor processor, final @Nullable PsiElement context) {
+    @RequiredReadAction
+    private static PsiElement processFunctionDeclarations(@Nonnull PsiScopeProcessor processor, @Nullable PsiElement context) {
         if (!(context instanceof JSElement)) {
             return null;
         }
@@ -1034,48 +1028,43 @@ private static PsiElement processFunctionDeclarations(final @Nonnull PsiScopePro
             PsiElement cur = index >= 0 ? children[index] : context.getLastChild();
 
             while (cur != null) {
-                if (cur instanceof JSFunction || cur instanceof JSClass) {
-                    if (!processor.execute(cur, ResolveState.initial())) {
-                        if (processor instanceof ResolveProcessor) {
-                            return ((ResolveProcessor)processor).getResult();
-                        }
-                    }
+                if ((cur instanceof JSFunction || cur instanceof JSClass)
+                    && !processor.execute(cur, ResolveState.initial())
+                    && processor instanceof ResolveProcessor resolveProcessor) {
+                    return resolveProcessor.getResult();
                 }
 
                 if (index == -1) {
                     cur = cur.getPrevSibling();
                 }
+                else if (index != 0) {
+                    cur = children[--index];
+                }
                 else {
-                    if (index != 0) {
-                        cur = children[--index];
-                    }
-                    else {
-                        cur = null;
-                    }
+                    cur = null;
                 }
             }
         }
         return null;
     }
 
-    public static JSClass findDeclaringClass(final JSFunction method) {
-        final Ref<JSClass> lastVisitedClass = new Ref<>();
+    @RequiredReadAction
+    public static JSClass findDeclaringClass(JSFunction method) {
+        SimpleReference<JSClass> lastVisitedClass = new SimpleReference<>();
         iterateOverridenMethodsUp(
             method,
-            new Processor<JSClass>() {
-                @Override
-                public boolean process(JSClass jsClass) {
-                    lastVisitedClass.set(jsClass);
-                    return true;
-                }
+            jsClass -> {
+                lastVisitedClass.set(jsClass);
+                return true;
             },
             true
         );
 
         Collection<JSClass> visited = new HashSet<>();
-        visitAllImplementedInterfaces(lastVisitedClass.get(), visited, new Processor<JSClass>() {
-            @Override
-            public boolean process(JSClass jsClass) {
+        visitAllImplementedInterfaces(
+            lastVisitedClass.get(),
+            visited,
+            jsClass -> {
                 // hierarchy may contain maximum one interface declaring a certain method
                 JSFunction interfaceMethod = jsClass.findFunctionByNameAndKind(method.getName(), method.getKind());
                 if (interfaceMethod != null) {
@@ -1085,7 +1074,7 @@ public boolean process(JSClass jsClass) {
                 }
                 return true;
             }
-        });
+        );
 
         return lastVisitedClass.get();
     }
@@ -1119,12 +1108,13 @@ private static boolean visitAllImplementedInterfaces(
     /**
      * @return true if processor said enough
      */
+    @RequiredReadAction
     private static boolean iterateOverridenMethodsUp(JSFunction function, Processor<JSClass> processor, boolean allowDirectParent) {
         PsiElement clazz = findParent(function);
         if (!(clazz instanceof JSClass)) {
             return false;
         }
-        final PsiElement directParent = clazz;
+        PsiElement directParent = clazz;
 
         while (true) {
             if ((allowDirectParent || directParent != clazz) && !processor.process((JSClass)clazz)) {
@@ -1137,7 +1127,7 @@ private static boolean iterateOverridenMethodsUp(JSFunction function, Processor<
             }
 
             // TODO check signature
-            final JSNamedElement overridenMethod = findOverriddenMethod(function, (JSClass)clazz);
+            JSNamedElement overridenMethod = findOverriddenMethod(function, (JSClass)clazz);
             if (!(overridenMethod instanceof JSFunction)) {
                 return false;
             }
@@ -1150,7 +1140,8 @@ private static boolean iterateOverridenMethodsUp(JSFunction function, Processor<
         }
     }
 
-    public static boolean isReferenceTo(final PsiPolyVariantReference reference, final String referencedName, PsiElement _element) {
+    @RequiredReadAction
+    public static boolean isReferenceTo(PsiPolyVariantReference reference, String referencedName, PsiElement _element) {
         String elementName;
         if (_element instanceof JSNamedElement namedElement) {
             elementName = namedElement.getName();
@@ -1171,20 +1162,21 @@ else if (_element instanceof PsiDirectoryContainer directoryContainer) {
         if (Comparing.equal(referencedName, elementName, true)) {
             PsiElement element = _element;
 
-            final ResolveResult[] resolveResults = reference.multiResolve(true);
+            ResolveResult[] resolveResults = reference.multiResolve(true);
 
             for (ResolveResult r : resolveResults) {
                 PsiElement resolvedElement = r.getElement();
 
                 if (resolvedElement.isEquivalentTo(element) ||
                     element.isEquivalentTo(resolvedElement) ||
-                    ((element instanceof JSProperty || element instanceof XmlAttributeValue) &&
-                        resolvedElement != null &&
-                        resolvedElement.getParent() == element)) {
+                    ((element instanceof JSProperty || element instanceof XmlAttributeValue)
+                        && resolvedElement != null
+                        && resolvedElement.getParent() == element)) {
+
                     if (reference instanceof JSReferenceExpression referenceExpression
                         && ((referenceExpression.getParent() == resolvedElement && resolvedElement instanceof JSDefinitionExpression)
-                        || resolvedElement instanceof JSFunctionExpression functionExpression
-                        && functionExpression.getFunction().getNameIdentifier().getNextSibling() == reference)) {
+                        || resolvedElement instanceof JSFunctionExpression functionExpr
+                        && functionExpr.getFunction().getNameIdentifier().getNextSibling() == reference)) {
                         return false; // do not include self to usages
                     }
 
@@ -1192,16 +1184,16 @@ else if (_element instanceof PsiDirectoryContainer directoryContainer) {
                 }
 
                 if (resolvedElement instanceof JSFunctionExpression functionExpression) {
-                    final PsiElement nameIdentifier = functionExpression.getFunction().getNameIdentifier();
+                    PsiElement nameIdentifier = functionExpression.getFunction().getNameIdentifier();
                     if (nameIdentifier != null && nameIdentifier.getNextSibling() == element) {
                         return true;
                     }
                 }
                 else if (resolvedElement instanceof JSFunction fun) {
                     if (fun.isConstructor()) {
-                        if ((element instanceof JSClass && resolvedElement.getParent() == element)
-                            || (element instanceof JSFile && reference.getElement().getParent() != resolvedElement
-                            && isPublicEntityReferenceToJSFile(findParent(resolvedElement), element))) {
+                        if ((element instanceof JSClass jsClass && resolvedElement.getParent() == jsClass)
+                            || (element instanceof JSFile jsFile && reference.getElement().getParent() != resolvedElement
+                            && isPublicEntityReferenceToJSFile(findParent(resolvedElement), jsFile))) {
                             return true;
                         }
                     }
@@ -1218,28 +1210,22 @@ else if (element instanceof JSFunction anotherFun) {
                             }
                         }
                         PsiElement resolvedElementParent = findParent(resolvedElement);
-                        final PsiElement elementParent = findParent(element);
-
-                        if (elementParent instanceof JSClass && resolvedElementParent instanceof JSClass) {
-                            final JSClass anotherClass = (JSClass)elementParent;
+                        PsiElement elementParent = findParent(element);
 
-                            final Collection<JSClass> visitedInterfaces = new HashSet<>();
+                        if (elementParent instanceof JSClass anotherClass && resolvedElementParent instanceof JSClass) {
+                            Collection<JSClass> visitedInterfaces = new HashSet<>();
                             return iterateOverridenMethodsUp(
                                 fun,
-                                new Processor<JSClass>() {
-                                    @Override
-                                    public boolean process(JSClass jsClass) {
-                                        if (anotherClass.isInterface()) {
-                                            return !visitAllImplementedInterfaces(jsClass, visitedInterfaces, new Processor<JSClass>() {
-                                                @Override
-                                                public boolean process(JSClass jsClass) {
-                                                    return !jsClass.isEquivalentTo(anotherClass);
-                                                }
-                                            });
-                                        }
-                                        else {
-                                            return !jsClass.isEquivalentTo(anotherClass);
-                                        }
+                                jsClass -> {
+                                    if (anotherClass.isInterface()) {
+                                        return !visitAllImplementedInterfaces(
+                                            jsClass,
+                                            visitedInterfaces,
+                                            jsClass1 -> !jsClass1.isEquivalentTo(anotherClass)
+                                        );
+                                    }
+                                    else {
+                                        return !jsClass.isEquivalentTo(anotherClass);
                                     }
                                 },
                                 anotherClass.isInterface()
@@ -1247,7 +1233,9 @@ public boolean process(JSClass jsClass) {
                         }
                     }
                 }
-                else if (resolvedElement instanceof JSClass && element instanceof JSFunction && element.getParent() == resolvedElement) {
+                else if (resolvedElement instanceof JSClass jsClass
+                    && element instanceof JSFunction function
+                    && function.getParent() == jsClass) {
                     return true;
                 }
 
@@ -1256,9 +1244,9 @@ else if (resolvedElement instanceof JSClass && element instanceof JSFunction &&
                         || resolvedElement instanceof JSNamespaceDeclaration
                         || resolvedElement instanceof JSFunction
                         || resolvedElement instanceof JSVariable)
-                        && ((element instanceof XmlFile && resolvedElement.getParent().getContainingFile() == element)
-                        || (element instanceof JSFile && reference.getElement().getParent() != resolvedElement
-                        && isPublicEntityReferenceToJSFile(resolvedElement, element)))
+                        && ((element instanceof XmlFile xmlFile && resolvedElement.getParent().getContainingFile() == xmlFile)
+                        || (element instanceof JSFile jsFile && reference.getElement().getParent() != resolvedElement
+                        && isPublicEntityReferenceToJSFile(resolvedElement, jsFile)))
                 ) {
                     return true;
                 }
@@ -1272,12 +1260,13 @@ && fieldIsImplicitAccessorMethod(function, variable)) {
         return false;
     }
 
+    @RequiredReadAction
     private static boolean fieldIsImplicitAccessorMethod(JSFunction fun, JSVariable var) {
         if (!fun.isGetProperty() && !fun.isSetProperty()) {
             return false;
         }
         PsiElement funParent = findParent(fun);
-        if (!(funParent instanceof JSClass) || !((JSClass)funParent).isInterface()) {
+        if (!(funParent instanceof JSClass jsClass && jsClass.isInterface())) {
             return false;
         }
         JSAttributeList attributeList = var.getAttributeList();
@@ -1285,51 +1274,45 @@ private static boolean fieldIsImplicitAccessorMethod(JSFunction fun, JSVariable
             return false;
         }
 
-        PsiElement parent = findParent(var);
-        if (!(parent instanceof JSClass)) {
-            return false;
-        }
-
-        for (JSClass c : ((JSClass)parent).getImplementedInterfaces()) {
-            if (c == funParent) {
-                return true;
+        if (findParent(var) instanceof JSClass varParentClass) {
+            for (JSClass c : varParentClass.getImplementedInterfaces()) {
+                if (c == funParent) {
+                    return true;
+                }
             }
         }
-
         return false;
     }
 
     private static boolean isPublicEntityReferenceToJSFile(PsiElement resolvedElement, PsiElement element) {
         PsiElement parent = resolvedElement.getParent();
-        if (parent instanceof JSVarStatement) {
-            parent = parent.getParent();
+        if (parent instanceof JSVarStatement varStatement) {
+            parent = varStatement.getParent();
         }
-        return parent instanceof JSPackageStatement && parent.getParent() == element;
+        return parent instanceof JSPackageStatement packageStatement && packageStatement.getParent() == element;
     }
 
+    @RequiredReadAction
     private static JSNamedElement findOverriddenMethod(PsiElement resolvedElement, JSClass resolvedElementClass) {
-        final Ref<JSNamedElement> override = new Ref<>();
+        SimpleReference<JSNamedElement> override = new SimpleReference<>();
 
         iterateType(
             (JSFunction)resolvedElement,
             resolvedElementClass,
             null,
-            new OverrideHandler() {
-                @Override
-                public boolean process(ResolveProcessor processor, PsiElement scope, String className) {
-                    PsiElement result = processor.getResult();
-                    if (result instanceof JSNamedElement namedElement) {
-                        override.set(namedElement);
-                        return false;
-                    }
-                    return true;
+            (processor, scope, className) -> {
+                PsiElement result = processor.getResult();
+                if (result instanceof JSNamedElement namedElement) {
+                    override.set(namedElement);
+                    return false;
                 }
+                return true;
             }
         );
         return override.get();
     }
 
-    public static boolean checkClassHasParentOfAnotherOne(final JSClass aClass, final JSClass parent, @Nullable Set<JSClass> visited) {
+    public static boolean checkClassHasParentOfAnotherOne(JSClass aClass, JSClass parent, @Nullable Set<JSClass> visited) {
         if (visited != null && visited.contains(aClass)) {
             return false;
         }
@@ -1339,7 +1322,7 @@ public static boolean checkClassHasParentOfAnotherOne(final JSClass aClass, fina
                 return true;
             }
             if (visited == null) {
-                visited = new HashSet<JSClass>();
+                visited = new HashSet<>();
             }
             visited.add(aClass);
             return checkClassHasParentOfAnotherOne(superClazz, parent, visited);
@@ -1347,16 +1330,16 @@ public static boolean checkClassHasParentOfAnotherOne(final JSClass aClass, fina
         return false;
     }
 
-    public static
     @Nullable
-    JSExpression getRealRefExprQualifier(final JSReferenceExpression expr) {
-        final JSExpression qualifier = ((JSReferenceExpressionImpl)expr).getResolveQualifier();
+    @RequiredReadAction
+    public static JSExpression getRealRefExprQualifier(JSReferenceExpression expr) {
+        JSExpression qualifier = ((JSReferenceExpressionImpl)expr).getResolveQualifier();
         if (qualifier != null) {
             return qualifier;
         }
 
         if (isExprInTypeContext(expr)) {
-            final JSImportedElementResolveResult resolved = JSImportHandlingUtil.resolveTypeNameUsingImports(expr);
+            JSImportedElementResolveResult resolved = JSImportHandlingUtil.resolveTypeNameUsingImports(expr);
             if (resolved == null) {
                 return expr.getQualifier();
             }
@@ -1367,28 +1350,25 @@ JSExpression getRealRefExprQualifier(final JSReferenceExpression expr) {
         return qualifier;
     }
 
+    @RequiredReadAction
     public static JSExpression getRealRefExprQualifierFromResult(
-        final JSReferenceExpression expr,
-        final JSImportedElementResolveResult resolved
+        JSReferenceExpression expr,
+        JSImportedElementResolveResult resolved
     ) {
         return ((JSReferenceExpression)JSChangeUtil.createExpressionFromText(expr.getProject(), resolved.qualifiedName)).getQualifier();
     }
 
-    public static String findPackageStatementQualifier(final PsiElement context) {
+    @RequiredReadAction
+    public static String findPackageStatementQualifier(PsiElement context) {
         if (context instanceof JSClass jsClass) {
-            final String s = jsClass.getQualifiedName();
+            String s = jsClass.getQualifiedName();
             if (s != null) {
-                final int i = s.lastIndexOf('.');
-                if (i != -1) {
-                    return s.substring(0, i);
-                }
-                else {
-                    return null;
-                }
+                int i = s.lastIndexOf('.');
+                return i != -1 ? s.substring(0, i) : null;
             }
         }
 
-        final JSPackageStatement packageStatement = PsiTreeUtil.getNonStrictParentOfType(context, JSPackageStatement.class);
+        JSPackageStatement packageStatement = PsiTreeUtil.getNonStrictParentOfType(context, JSPackageStatement.class);
 
         if (packageStatement != null) {
             return packageStatement.getQualifiedName();
@@ -1397,8 +1377,9 @@ public static String findPackageStatementQualifier(final PsiElement context) {
         return null;
     }
 
-    public static boolean isExprInStrictTypeContext(final JSReferenceExpression expr) {
-        final PsiElement parent = expr.getParent();
+    @RequiredReadAction
+    public static boolean isExprInStrictTypeContext(JSReferenceExpression expr) {
+        PsiElement parent = expr.getParent();
         boolean parentIsVar = parent instanceof JSVariable;
 
         return ((parentIsVar || parent instanceof JSFunction)
@@ -1408,8 +1389,9 @@ public static boolean isExprInStrictTypeContext(final JSReferenceExpression expr
             || parent instanceof JSImportStatement || parent instanceof JSReferenceList;
     }
 
-    public static boolean isExprInTypeContext(final JSReferenceExpression expr) {
-        final PsiElement parent = expr.getParent();
+    @RequiredReadAction
+    public static boolean isExprInTypeContext(JSReferenceExpression expr) {
+        PsiElement parent = expr.getParent();
 
         return isExprInStrictTypeContext(expr) || parent instanceof JSNewExpression || parent instanceof JSUseNamespaceDirective
             || (parent instanceof JSBinaryExpression binaryExpression && binaryExpression.getROperand() == expr
@@ -1418,30 +1400,32 @@ public static boolean isExprInTypeContext(final JSReferenceExpression expr) {
     }
 
     @Nullable
-    public static PsiElement findClassByQName(final String link, final @Nonnull PsiElement context) {
+    @RequiredReadAction
+    public static PsiElement findClassByQName(String link, @Nonnull PsiElement context) {
         return findClassByQName(link, context.getProject(), context.getResolveScope());
     }
 
     @Nullable
-    public static PsiElement findClassByQName(final String link, @Nonnull GlobalSearchScope scope, @Nonnull Project project) {
+    @RequiredReadAction
+    public static PsiElement findClassByQName(String link, @Nonnull GlobalSearchScope scope, @Nonnull Project project) {
         return findClassByQName(link, project, scope);
     }
 
-    private static PsiElement findClassByQName(final String link, final Project project, final GlobalSearchScope searchScope) {
+    @RequiredReadAction
+    private static PsiElement findClassByQName(String link, final Project project, GlobalSearchScope searchScope) {
         synchronized (project) {
             if (DumbService.isDumb(project)) {
                 return null;
             }
 
-            final PsiElement[] result = new PsiElement[1];
+            PsiElement[] result = new PsiElement[1];
 
-            final Collection<JSQualifiedNamedElement> candidates =
+            Collection<JSQualifiedNamedElement> candidates =
                 StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_QNAME, link, project, searchScope, JSQualifiedNamedElement.class);
             for (JSQualifiedNamedElement clazz : candidates) {
                 if (link.equals(clazz.getQualifiedName())) {
-                    if ("Object".equals(link) && !JavaScriptIndex.ECMASCRIPT_JS2.equals(clazz.getContainingFile()
-                        .getVirtualFile()
-                        .getName()) // object from swf do
+                    if ("Object".equals(link)
+                        && !JavaScriptIndex.ECMASCRIPT_JS2.equals(clazz.getContainingFile().getVirtualFile().getName()) // object from swf do
                         // not contain necessary members!
                     ) {
                         continue;
@@ -1465,8 +1449,10 @@ private static PsiElement findClassByQName(final String link, final Project proj
         }
     }
 
-    private static boolean isBuiltInClassName(final String className) {
-        return OBJECT_CLASS_NAME.equals(className) || "Boolean".equals(className) || "Function".equals(className)
+    private static boolean isBuiltInClassName(String className) {
+        return OBJECT_CLASS_NAME.equals(className)
+            || "Boolean".equals(className)
+            || "Function".equals(className)
             || "String".equals(className);
     }
 
@@ -1476,10 +1462,10 @@ public static boolean isPredefinedFile(PsiFile file) {
 
     @Nullable
     private static PsiElement findClassByQNameViaHelper(
-        final String link,
-        final Project project,
-        final String className,
-        final GlobalSearchScope scope
+        String link,
+        Project project,
+        String className,
+        GlobalSearchScope scope
     ) {
         for (JSResolveHelper helper : Extensions.getExtensions(JSResolveHelper.EP_NAME)) {
             PsiElement result = helper.findClassByQName(link, project, className, scope);
@@ -1490,8 +1476,9 @@ private static PsiElement findClassByQNameViaHelper(
         return null;
     }
 
-    public static String[] buildNameIdsForQualifier(final JSExpression qualifier) {
-        String[] nameIds = null;
+    @RequiredReadAction
+    public static String[] buildNameIdsForQualifier(JSExpression qualifier) {
+        String[] nameIds;
 
         if (qualifier == null) {
             nameIds = JSSymbolUtil.buildNameIndexArray(qualifier);
@@ -1524,14 +1511,8 @@ public static JSExpression findClassIdentifier(JSExpression _qualifier) {
         return qualifier;
     }
 
-    public static boolean iterateType(
-        final JSFunction node,
-        final PsiElement jsClass,
-        final String typeName,
-        final OverrideHandler handler
-    ) {
-        final Project project = jsClass.getProject();
-
+    @RequiredReadAction
+    public static boolean iterateType(JSFunction node, PsiElement jsClass, String typeName, OverrideHandler handler) {
         if (jsClass instanceof JSClass) {
             String namespace = null;
             JSAttributeList attributeList = node.getAttributeList();
@@ -1544,26 +1525,28 @@ public static boolean iterateType(
         return true;
     }
 
+    @RequiredReadAction
     public static boolean processOverrides(
-        final PsiElement jsClass,
-        final OverrideHandler handler,
+        PsiElement jsClass,
+        OverrideHandler handler,
         String name,
-        final Object namespace,
-        final PsiElement context
+        Object namespace,
+        PsiElement context
     ) {
         JSClass clazz = (JSClass)jsClass;
-        final ResolveProcessor resolveProcessor = new ResolveProcessor(name, context) {
+        ResolveProcessor resolveProcessor = new ResolveProcessor(name, context) {
             {
                 setToProcessHierarchy(true);
             }
 
             @Override
-            public boolean execute(final PsiElement element, final ResolveState state) {
+            @RequiredReadAction
+            public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                 if (!(element instanceof JSFunction)) {
                     return true;
                 }
                 JSFunction fun = (JSFunction)element;
-                final JSAttributeList attributeList = fun.getAttributeList();
+                JSAttributeList attributeList = fun.getAttributeList();
                 if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE) {
                     return false;
                 }
@@ -1580,10 +1563,10 @@ public boolean execute(final PsiElement element, final ResolveState state) {
             if (superClazz == clazz) {
                 break;
             }
-            final boolean b = superClazz.processDeclarations(resolveProcessor, ResolveState.initial(), superClazz, context);
+            boolean b = superClazz.processDeclarations(resolveProcessor, ResolveState.initial(), superClazz, context);
 
             if (!b) {
-                final PsiElement element = resolveProcessor.getResult();
+                PsiElement element = resolveProcessor.getResult();
                 if (element == null) {
                     continue;
                 }
@@ -1599,12 +1582,13 @@ public boolean execute(final PsiElement element, final ResolveState state) {
         return true;
     }
 
-    public static String getQNameToStartHierarchySearch(final JSFunction node) {
+    @RequiredReadAction
+    public static String getQNameToStartHierarchySearch(JSFunction node) {
         PsiElement parentNode = node.getParent();
         parentNode = getClassReferenceForXmlFromContext(parentNode);
 
         if (parentNode instanceof JSClass) {
-            final JSAttributeList attributeList = node.getAttributeList();
+            JSAttributeList attributeList = node.getAttributeList();
 
             if (attributeList == null ||
                 !attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE) ||
@@ -1617,47 +1601,47 @@ public static String getQNameToStartHierarchySearch(final JSFunction node) {
                 return jsClass.getQualifiedName();
             }
         }
-        else if (node instanceof JSFunctionExpression
+        else if (node instanceof JSFunctionExpression functionExpr
             && parentNode.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
-            final ContextResolver resolver = new ContextResolver(node.getFirstChild());
+            ContextResolver resolver = new ContextResolver(functionExpr.getFirstChild());
             return resolver.getQualifierAsString();
         }
-        else if (parentNode instanceof JSFile && parentNode.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+        else if (parentNode instanceof JSFile jsFile && jsFile.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
             return node.getName();
         }
         return null;
     }
 
+    @RequiredReadAction
     public static boolean isInPlaceWhereTypeCanBeDuringCompletion(PsiElement expr) {
-        final PsiElement parent = expr.getParent();
+        PsiElement parent = expr.getParent();
         if (parent instanceof JSArgumentList || (parent instanceof JSVariable variable && variable.getInitializer() == expr)) {
             return true;
         }
-        if (parent instanceof JSExpressionStatement) {
-            return expr instanceof JSReferenceExpression referenceExpression ? referenceExpression.getQualifier() == null : true;
-        }
-        return false;
+        return parent instanceof JSExpressionStatement
+            && !(expr instanceof JSReferenceExpression refExpr && refExpr.getQualifier() != null);
     }
 
-    public static boolean isPlaceWhereNsCanBe(final PsiElement parent) {
-        final PsiElement grandParent = parent.getParent();
+    public static boolean isPlaceWhereNsCanBe(PsiElement parent) {
+        PsiElement grandParent = parent.getParent();
         return grandParent instanceof JSClass || grandParent instanceof JSPackageStatement
-            || (grandParent instanceof JSFile && grandParent.getContext() == null);
+            || (grandParent instanceof JSFile jsFile && jsFile.getContext() == null);
     }
 
     @Nullable
-    public static String getTypeFromTagNameInMxml(final @Nullable PsiElement psiElement) {
+    @RequiredReadAction
+    public static String getTypeFromTagNameInMxml(@Nullable PsiElement psiElement) {
         JSClass clazz = getClassFromTagNameInMxml(psiElement);
         return clazz != null ? clazz.getQualifiedName() : null;
     }
 
-    public static JSClass getClassFromTagNameInMxml(final PsiElement psiElement) {
+    public static JSClass getClassFromTagNameInMxml(PsiElement psiElement) {
         XmlTag tag = psiElement != null ? PsiTreeUtil.getNonStrictParentOfType(psiElement, XmlTag.class) : null;
         if (tag != null && (tag.getNamespacePrefix().length() > 0 || JavaScriptSupportLoader.isFlexMxmFile(tag.getContainingFile()))) {
             if (isScriptContextTag(tag)) {
                 tag = ((XmlFile)tag.getContainingFile()).getDocument().getRootTag();
             }
-            final XmlElementDescriptor descriptor = tag.getDescriptor();
+            XmlElementDescriptor descriptor = tag.getDescriptor();
 
             if (descriptor != null) {
                 PsiElement decl = descriptor.getDeclaration();
@@ -1672,19 +1656,21 @@ else if (decl instanceof XmlFile xmlFile) {
         return null;
     }
 
-    private static boolean isScriptContextTag(final XmlTag tag) {
-        final String localName = tag.getLocalName();
+    private static boolean isScriptContextTag(XmlTag tag) {
+        String localName = tag.getLocalName();
         return "Script".equals(localName)
             || (!localName.isEmpty() && Character.isLowerCase(localName.charAt(0)) && !"method".equals(localName));
     }
 
-    public static boolean processMetaAttributesForClass(final PsiElement jsClass, final MetaDataProcessor processor) {
+    @RequiredReadAction
+    public static boolean processMetaAttributesForClass(PsiElement jsClass, MetaDataProcessor processor) {
         return doProcessMetaAttributesForClass(unwrapProxy(jsClass), processor, null, true);
     }
 
+    @RequiredReadAction
     private static boolean doProcessMetaAttributesForClass(
-        final PsiElement jsClass,
-        final MetaDataProcessor processor,
+        PsiElement jsClass,
+        MetaDataProcessor processor,
         PsiElement lastParent,
         boolean forward
     ) {
@@ -1692,7 +1678,7 @@ private static boolean doProcessMetaAttributesForClass(
             if (OBJECT_CLASS_NAME.equals((jsClassClass.getQualifiedName()))) {
                 return true;
             }
-            final PsiElement[] elements = getStubbedChildren(jsClass.getParent());
+            PsiElement[] elements = getStubbedChildren(jsClass.getParent());
             int ind = elements.length - 1;
             while (ind >= 0 && elements[ind] != jsClass) {
                 --ind;
@@ -1701,10 +1687,10 @@ private static boolean doProcessMetaAttributesForClass(
 
 
             while (ind >= 0) {
-                final PsiElement current = elements[ind];
+                PsiElement current = elements[ind];
 
-                if (current instanceof JSIncludeDirective) {
-                    if (!processIncludeDirective(processor, jsClass, (JSIncludeDirective)current, false)) {
+                if (current instanceof JSIncludeDirective includeDirective) {
+                    if (!processIncludeDirective(processor, jsClass, includeDirective, false)) {
                         return false;
                     }
                     --ind;
@@ -1714,25 +1700,25 @@ private static boolean doProcessMetaAttributesForClass(
                 }
             }
 
-            final JSAttributeList attributeList = jsClassClass.getAttributeList();
+            JSAttributeList attributeList = jsClassClass.getAttributeList();
             if (attributeList != null && !processAttributeList(processor, jsClass, attributeList, true)) {
                 return false;
             }
         }
 
-        final PsiElement[] elements = getStubbedChildren(jsClass);
-        Ref<PsiElement> continuePassElement = new Ref<>();
+        PsiElement[] elements = getStubbedChildren(jsClass);
+        SimpleReference<PsiElement> continuePassElement = new SimpleReference<>();
 
         for (int i = forward ? 0 : elements.length - 1; i < elements.length && i >= 0; i += (forward ? 1 : -1)) {
             PsiElement el = elements[i];
 
-            if (el instanceof JSIncludeDirective) {
-                if (!processIncludeDirective(processor, lastParent, (JSIncludeDirective)el, forward)) {
+            if (el instanceof JSIncludeDirective includeDirective) {
+                if (!processIncludeDirective(processor, lastParent, includeDirective, forward)) {
                     return false;
                 }
             }
-            else if (el instanceof JSAttributeList /*&& lastParent != null*/) {
-                if (!processAttributeList(processor, lastParent, (JSAttributeList)el, forward)) {
+            else if (el instanceof JSAttributeList attributeList /*&& lastParent != null*/) {
+                if (!processAttributeList(processor, lastParent, attributeList, forward)) {
                     return false;
                 }
             }
@@ -1755,23 +1741,24 @@ else if (el instanceof JSAttributeList /*&& lastParent != null*/) {
         return true;
     }
 
+    @RequiredReadAction
     public static boolean processAttributeList(
-        final MetaDataProcessor processor,
-        final PsiElement el,
-        final JSAttributeList attributeList,
+        MetaDataProcessor processor,
+        PsiElement el,
+        JSAttributeList attributeList,
         boolean forward
     ) {
-        final PsiElement[] elements = getStubbedChildren(attributeList);
+        PsiElement[] elements = getStubbedChildren(attributeList);
         for (int i = forward ? 0 : elements.length - 1; i < elements.length && i >= 0; i += (forward ? 1 : -1)) {
-            final PsiElement cur = elements[i];
+            PsiElement cur = elements[i];
 
-            if (cur instanceof JSIncludeDirective) {
-                if (!processIncludeDirective(processor, el, (JSIncludeDirective)cur, forward)) {
+            if (cur instanceof JSIncludeDirective includeDirective) {
+                if (!processIncludeDirective(processor, el, includeDirective, forward)) {
                     return false;
                 }
             }
-            else if (cur instanceof JSAttribute) {
-                if (!processor.process((JSAttribute)cur)) {
+            else if (cur instanceof JSAttribute attribute) {
+                if (!processor.process(attribute)) {
                     return false;
                 }
             }
@@ -1780,20 +1767,17 @@ else if (cur instanceof JSNamedElement) {
             }
         }
 
-        if (!processor.handleOtherElement(attributeList, el, null)) {
-            return false;
-        }
-
-        return true;
+        return processor.handleOtherElement(attributeList, el, null);
     }
 
+    @RequiredReadAction
     private static boolean processIncludeDirective(
-        final MetaDataProcessor processor,
-        final PsiElement lastParent,
-        final JSIncludeDirective el,
+        MetaDataProcessor processor,
+        PsiElement lastParent,
+        JSIncludeDirective el,
         boolean forward
     ) {
-        final PsiFile file = el.resolveFile();
+        PsiFile file = el.resolveFile();
         return !(file instanceof JSFile) || doProcessMetaAttributesForClass(file, processor, lastParent, forward);
     }
 
@@ -1801,21 +1785,19 @@ public static PsiElement unwrapProxy(PsiElement jsClass) {
         return jsClass;
     }
 
+    @RequiredReadAction
     public static JSDefinitionExpression getDefinitionExpr(JSExpressionStatement exprStatement) {
-        final JSExpression expression = exprStatement.getExpression();
+        JSExpression expression = exprStatement.getExpression();
 
-        if (expression instanceof JSAssignmentExpression assignment) {
-            return (JSDefinitionExpression)assignment.getLOperand();
-        }
-        return null;
+        return expression instanceof JSAssignmentExpression assignment ? (JSDefinitionExpression)assignment.getLOperand() : null;
     }
 
     public static boolean processDeclarationsInScope(
-        final JSElement _scope,
-        final PsiScopeProcessor processor,
-        final ResolveState state,
-        final PsiElement lastParent,
-        final PsiElement place
+        JSElement _scope,
+        PsiScopeProcessor processor,
+        ResolveState state,
+        PsiElement lastParent,
+        PsiElement place
     ) {
         JSElement scope = PsiUtilBase.getOriginalElement(_scope, _scope.getClass());
         if (scope == null) {
@@ -1828,7 +1810,7 @@ public static boolean processDeclarationsInScope(
         }
 
         boolean result = true;
-        final IntObjectMap<Object> defsMap = ourCachedDefsCache.get(MY_CACHED_STATEMENTS, scope, null).getValue();
+        IntObjectMap<Object> defsMap = OUR_CACHED_DEFS_CACHE.get(MY_CACHED_STATEMENTS, scope, null).getValue();
 
         if (requiredName == null) {
             for (Object value : defsMap.values()) {
@@ -1836,7 +1818,7 @@ public static boolean processDeclarationsInScope(
             }
         }
         else {
-            final Object defs = defsMap.get(requiredName.hashCode());
+            Object defs = defsMap.get(requiredName.hashCode());
             if (defs != null) {
                 result = dispatchResolve(processor, state, place, result, defs);
             }
@@ -1846,11 +1828,11 @@ public static boolean processDeclarationsInScope(
     }
 
     private static boolean dispatchResolve(
-        final PsiScopeProcessor processor,
-        final ResolveState state,
-        final PsiElement place,
+        PsiScopeProcessor processor,
+        ResolveState state,
+        PsiElement place,
         boolean result,
-        final Object o
+        Object o
     ) {
         if (o instanceof JSElement[] jsElements) {
             for (JSElement s : jsElements) {
@@ -1864,11 +1846,12 @@ private static boolean dispatchResolve(
         return result;
     }
 
-    public static PsiElement getLocalVariableRef(JSFunction function, final JSReferenceExpression expr) {
-        final ResolveProcessor processor = new ResolveProcessor(expr.getReferencedName(), true);
+    @RequiredReadAction
+    public static PsiElement getLocalVariableRef(JSFunction function, JSReferenceExpression expr) {
+        ResolveProcessor processor = new ResolveProcessor(expr.getReferencedName(), true);
 
         while (function != null) {
-            final boolean val = function.processDeclarations(processor, ResolveState.initial(), function.getParameterList(), function);
+            boolean val = function.processDeclarations(processor, ResolveState.initial(), function.getParameterList(), function);
             if (!val) {
                 return processor.getResult();
             }
@@ -1885,19 +1868,19 @@ public static class MyResolveResult implements ResolveResult {
         private final JavaScriptImportStatementBase myImportUsed;
         private boolean myValidResult;
 
-        public MyResolveResult(final PsiElement function) {
+        public MyResolveResult(PsiElement function) {
             this(function, true);
         }
 
-        public MyResolveResult(final PsiElement function, JSImportStatement importUsed) {
+        public MyResolveResult(PsiElement function, JSImportStatement importUsed) {
             this(function, importUsed, true);
         }
 
-        public MyResolveResult(final PsiElement function, boolean validResult) {
+        public MyResolveResult(PsiElement function, boolean validResult) {
             this(function, null, validResult);
         }
 
-        public MyResolveResult(final PsiElement function, JavaScriptImportStatementBase importUsed, boolean validResult) {
+        public MyResolveResult(PsiElement function, JavaScriptImportStatementBase importUsed, boolean validResult) {
             myFunction = function;
             myValidResult = validResult;
             myImportUsed = importUsed;
@@ -1913,7 +1896,7 @@ public boolean isValidResult() {
             return myValidResult;
         }
 
-        public void setValid(final boolean b) {
+        public void setValid(boolean b) {
             myValidResult = b;
         }
 
@@ -1929,15 +1912,12 @@ public static class RelevantDefsUserDataCache extends UserDataCache<CachedValue<
         @Override
         protected CachedValue<IntObjectMap<Object>> compute(final JSElement jsElement, final Object o) {
             return CachedValuesManager.getManager(jsElement.getProject()).createCachedValue(
-                new CachedValueProvider<IntObjectMap<Object>>() {
-                    @Override
-                    public Result<IntObjectMap<Object>> compute() {
-                        final IntObjectMap<Object> relevantDefs = IntMaps.newIntObjectHashMap();
-                        final MyJSElementVisitor elementVisitor = new MyJSElementVisitor(jsElement, relevantDefs);
-                        elementVisitor.startVisiting(jsElement);
-
-                        return new Result<IntObjectMap<Object>>(relevantDefs, jsElement);
-                    }
+                () -> {
+                    IntObjectMap<Object> relevantDefs = IntMaps.newIntObjectHashMap();
+                    MyJSElementVisitor elementVisitor = new MyJSElementVisitor(jsElement, relevantDefs);
+                    elementVisitor.startVisiting(jsElement);
+
+                    return new CachedValueProvider.Result<>(relevantDefs, jsElement);
                 },
                 false
             );
@@ -1950,29 +1930,30 @@ private static class MyJSElementVisitor extends JSElementVisitor {
             private final JSElement myBase;
             private JSElement context;
 
-            public MyJSElementVisitor(JSElement base, final IntObjectMap<Object> relevantDefs) {
+            public MyJSElementVisitor(JSElement base, IntObjectMap<Object> relevantDefs) {
                 myRelevantDefs = relevantDefs;
                 myBase = base;
                 context = base;
             }
 
+            @RequiredReadAction
             private void startVisiting(JSElement jsElement) {
                 PsiElement first = null;
 
                 JSSourceElement[] arrayElementsToScan = null;
 
                 if (jsElement instanceof JSFunction function) {
-                    final JSSourceElement[] body = function.getBody();
-                    if (body.length > 0 && body[0] instanceof JSBlockStatement) {
-                        first = PsiTreeUtil.findChildOfType(body[0], JSStatement.class);
+                    JSSourceElement[] body = function.getBody();
+                    if (body.length > 0 && body[0] instanceof JSBlockStatement block) {
+                        first = PsiTreeUtil.findChildOfType(block, JSStatement.class);
                     }
                 }
-                else if (jsElement instanceof JSFile) {
+                else if (jsElement instanceof JSFile jsFile) {
                     if (myBase == context) {
-                        first = jsElement.getFirstChild();
+                        first = jsFile.getFirstChild();
                     }
                     else {
-                        arrayElementsToScan = getSourceElements(jsElement);
+                        arrayElementsToScan = getSourceElements(jsFile);
                     }
                 }
                 else if (jsElement instanceof JSClass || jsElement instanceof JSPackageStatement) {
@@ -1989,30 +1970,30 @@ else if (jsElement instanceof JSClass || jsElement instanceof JSPackageStatement
                 }
                 else {
                     for (PsiElement e = first; e != null; e = e.getNextSibling()) {
-                        if (e instanceof JSSourceElement) {
-                            e.accept(this);
+                        if (e instanceof JSSourceElement sourceElement) {
+                            sourceElement.accept(this);
                         }
                     }
                 }
             }
 
             @Override
-            public void visitJSDefinitionExpression(final JSDefinitionExpression node) {
-                final JSExpression definedExpr = node.getExpression();
-                if (definedExpr instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() == null && false) {
-                    final String s = definedExpr.getText();
+            @RequiredReadAction
+            public void visitJSDefinitionExpression(JSDefinitionExpression node) {
+                if (node.getExpression() instanceof JSReferenceExpression refExpr && refExpr.getQualifier() == null && false) {
+                    String s = refExpr.getText();
                     if (checkedVarsToOurStatus == null) {
-                        checkedVarsToOurStatus = new HashMap<String, Boolean>(3);
+                        checkedVarsToOurStatus = new HashMap<>(3);
                     }
                     Boolean aBoolean = checkedVarsToOurStatus.get(s);
 
                     if (aBoolean == null) {
-                        final boolean isInjectedFile = isInjectedFile(myBase);
+                        boolean isInjectedFile = isInjectedFile(myBase);
                         PsiElement element = null;
 
                         if (myBase instanceof JSFunction || isInjectedFile) {
-                            final ResolveProcessor processor = new ResolveProcessor(s);
-                            final PsiElement baseParent = myBase.getParent();
+                            ResolveProcessor processor = new ResolveProcessor(s);
+                            PsiElement baseParent = myBase.getParent();
                             treeWalkUp(processor, baseParent, baseParent, baseParent);
                             element = processor.getResult();
                         }
@@ -2028,27 +2009,29 @@ public void visitJSDefinitionExpression(final JSDefinitionExpression node) {
             }
 
             @Override
+            @RequiredReadAction
             public void visitJSVariable(JSVariable node) {
                 addRelevantDef(node);
             }
 
             @Override
-            public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
-                final PsiFile _file = includeDirective.resolveFile();
+            @RequiredReadAction
+            public void visitJSIncludeDirective(JSIncludeDirective includeDirective) {
+                PsiFile _file = includeDirective.resolveFile();
 
                 if (!(_file instanceof JSFile) || myBase.getContainingFile() == _file) {
                     return;
                 }
-                final JSFile file = (JSFile)_file;
+                JSFile file = (JSFile)_file;
                 if (visitedIncludes != null && visitedIncludes.contains(file)) {
                     return;
                 }
                 if (visitedIncludes == null) {
-                    visitedIncludes = new HashSet<JSFile>();
+                    visitedIncludes = new HashSet<>();
                 }
                 visitedIncludes.add(file);
 
-                final JSElement prevContext = context;
+                JSElement prevContext = context;
                 context = file;
                 context.putUserData(contextKey, myBase);
                 startVisiting(file);
@@ -2056,7 +2039,7 @@ public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
             }
 
             @Override
-            public void visitJSVarStatement(final JSVarStatement node) {
+            public void visitJSVarStatement(JSVarStatement node) {
                 for (JSVariable var : node.getVariables()) {
                     if (!var.isLocal()) {
                         var.accept(this);
@@ -2069,17 +2052,17 @@ public void visitJSParameter(JSParameter node) {
             }
 
             @Override
-            public void visitJSFunctionExpression(final JSFunctionExpression node) {
+            public void visitJSFunctionExpression(JSFunctionExpression node) {
                 // do not go inside other funcs
             }
 
             @Override
-            public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node) {
+            public void visitJSObjectLiteralExpression(JSObjectLiteralExpression node) {
                 // do not go inside other funcs
             }
 
             @Override
-            public void visitJSClass(final JSClass aClass) {
+            public void visitJSClass(JSClass aClass) {
                 // do not go inside other funcs
             }
 
@@ -2089,45 +2072,48 @@ public void visitJSPackageStatement(JSPackageStatement packageStatement) {
             }
 
             @Override
-            public void visitJSFunctionDeclaration(final JSFunction node) {
+            @RequiredReadAction
+            public void visitJSFunctionDeclaration(JSFunction node) {
                 addRelevantDef(node);
             }
 
             @Override
-            public void visitJSImportStatement(final JSImportStatement importStatement) {
+            public void visitJSImportStatement(JSImportStatement importStatement) {
                 // do not expand tree
             }
 
             @Override
-            public void visitJSUseNamespaceDirective(final JSUseNamespaceDirective useNamespaceDirective) {
-                final String namespaceToBeUsed = useNamespaceDirective.getNamespaceToBeUsed();
+            @RequiredReadAction
+            public void visitJSUseNamespaceDirective(JSUseNamespaceDirective useNamespaceDirective) {
+                String namespaceToBeUsed = useNamespaceDirective.getNamespaceToBeUsed();
                 if (namespaceToBeUsed != null) {
                     addNamedElement(useNamespaceDirective, namespaceToBeUsed.hashCode());
                 }
             }
 
-            private void addRelevantDef(final JSNamedElement node) {
-                final String name = node.getName();
+            @RequiredReadAction
+            private void addRelevantDef(JSNamedElement node) {
+                String name = node.getName();
 
                 if (name != null) {
-                    final int key = name.hashCode();
+                    int key = name.hashCode();
                     addNamedElement(node, key);
                 }
             }
 
-            private void addNamedElement(final JSElement node, final int key) {
-                final Object o = myRelevantDefs.get(key);
+            private void addNamedElement(JSElement node, int key) {
+                Object o = myRelevantDefs.get(key);
 
                 if (o == null) {
                     myRelevantDefs.put(key, node);
                 }
                 else if (o instanceof JSElement element) {
-                    final JSElement[] newO = new JSElement[]{element, node};
+                    JSElement[] newO = new JSElement[]{element, node};
                     myRelevantDefs.put(key, newO);
                 }
                 else {
-                    final JSElement[] oldO = (JSElement[])o;
-                    final JSElement[] newO = new JSElement[oldO.length + 1];
+                    JSElement[] oldO = (JSElement[])o;
+                    JSElement[] newO = new JSElement[oldO.length + 1];
                     System.arraycopy(oldO, 0, newO, 0, oldO.length);
                     newO[oldO.length] = node;
                     myRelevantDefs.put(key, newO);
@@ -2135,7 +2121,7 @@ else if (o instanceof JSElement element) {
             }
 
             @Override
-            public void visitElement(final PsiElement element) {
+            public void visitElement(PsiElement element) {
                 element.acceptChildren(this);
             }
         }
@@ -2146,6 +2132,7 @@ public static class ContextResolver {
         private JSNamedElement parentContainer;
         private String typeName;
 
+        @RequiredReadAction
         public ContextResolver(JSExpression expr) {
             if (expr instanceof JSThisExpression || expr instanceof JSSuperExpression) {
                 // We need to resolve ns mapping for 'this', which function was the constructor of the object
@@ -2157,62 +2144,64 @@ public ContextResolver(JSExpression expr) {
             }
         }
 
+        @RequiredReadAction
         public ContextResolver(PsiElement element) {
             resolveContext(element);
         }
 
-        private void resolveContext(final PsiElement context) {
+        @RequiredReadAction
+        private void resolveContext(PsiElement context) {
             parentContainer = PsiTreeUtil.getParentOfType(context, JSFunction.class, JSClass.class);
 
             if (parentContainer instanceof JSFunctionExpression) {
                 boolean changedFunctionScope = false;
 
-                while (parentContainer instanceof JSFunctionExpression) {
-                    final PsiElement parentContainerParent = parentContainer.getParent();
+                while (parentContainer instanceof JSFunctionExpression functionExpr) {
+                    PsiElement functionExprParent = functionExpr.getParent();
 
-                    if (parentContainerParent instanceof JSAssignmentExpression assignment) {
-                        final JSExpression jsExpression = assignment.getLOperand();
-                        final JSElement functionExpressionName =
+                    if (functionExprParent instanceof JSAssignmentExpression assignment) {
+                        JSExpression jsExpression = assignment.getLOperand();
+                        JSElement functionExprName =
                             jsExpression instanceof JSDefinitionExpression definition ? definition.getExpression() : null;
-                        qualifyingExpression = functionExpressionName;
+                        qualifyingExpression = functionExprName;
 
-                        if (functionExpressionName instanceof JSReferenceExpression referenceExpression) {
-                            final JSExpression functionExpressionNameQualifier = referenceExpression.getQualifier();
+                        if (functionExprName instanceof JSReferenceExpression refExpr) {
+                            JSExpression functionExprNameQualifier = refExpr.getQualifier();
 
-                            if (functionExpressionNameQualifier instanceof JSThisExpression) {
-                                parentContainer = PsiTreeUtil.getParentOfType(functionExpressionName, JSFunction.class);
+                            if (functionExprNameQualifier instanceof JSThisExpression) {
+                                parentContainer = PsiTreeUtil.getParentOfType(functionExprName, JSFunction.class);
                                 qualifyingExpression = null;
                                 changedFunctionScope = true;
                                 continue;
                             }
-                            else if (functionExpressionNameQualifier instanceof JSReferenceExpression functionReferenceExpression) {
-                                final String functionExpressionNameQualifierText = functionReferenceExpression.getReferencedName();
+                            else if (functionExprNameQualifier instanceof JSReferenceExpression functionRefExpr) {
+                                String functionExpressionNameQualifierText = functionRefExpr.getReferencedName();
 
                                 if (PROTOTYPE_FIELD_NAME.equals(functionExpressionNameQualifierText)) {
-                                    qualifyingExpression = functionReferenceExpression.getQualifier();
+                                    qualifyingExpression = functionRefExpr.getQualifier();
                                 }
                                 else if (!changedFunctionScope) {
                                     String referencedName;
 
-                                    if (functionReferenceExpression.getQualifier() == null
-                                        && ((referencedName = referenceExpression.getReferencedName()) == null
+                                    if (functionRefExpr.getQualifier() == null
+                                        && ((referencedName = refExpr.getReferencedName()) == null
                                         || referencedName.isEmpty()
                                         || !Character.isUpperCase(referencedName.charAt(0)))) {
-                                        qualifyingExpression = functionExpressionNameQualifier;
+                                        qualifyingExpression = functionExprNameQualifier;
                                     }
                                 }
                             }
                         }
                     }
-                    else if (parentContainerParent instanceof JSProperty) {
-                        final JSElement element = PsiTreeUtil.getParentOfType(
-                            parentContainerParent,
+                    else if (functionExprParent instanceof JSProperty property) {
+                        JSElement element = PsiTreeUtil.getParentOfType(
+                            property,
                             JSVariable.class,
                             JSAssignmentExpression.class,
                             JSArgumentList.class
                         );
-                        if (element instanceof JSVariable) {
-                            qualifyingExpression = element;
+                        if (element instanceof JSVariable variable) {
+                            qualifyingExpression = variable;
                         }
                         else if (element instanceof JSAssignmentExpression assignment) {
                             JSExpression loperand = assignment.getLOperand();
@@ -2220,31 +2209,31 @@ else if (element instanceof JSAssignmentExpression assignment) {
                                 qualifyingExpression = ((JSDefinitionExpression)loperand).getExpression();
                             }
                         }
-                        else if (element instanceof JSArgumentList) {
-                            qualifyingExpression = JSSymbolUtil.findQualifyingExpressionFromArgumentList((JSArgumentList)element);
+                        else if (element instanceof JSArgumentList argumentList) {
+                            qualifyingExpression = JSSymbolUtil.findQualifyingExpressionFromArgumentList(argumentList);
                         }
                     }
-                    else if (parentContainerParent instanceof JSNewExpression) {
-                        final JSElement element = PsiTreeUtil.getParentOfType(
-                            parentContainerParent,
+                    else if (functionExprParent instanceof JSNewExpression newExpression) {
+                        JSElement element = PsiTreeUtil.getParentOfType(
+                            newExpression,
                             JSVariable.class,
                             JSAssignmentExpression.class,
                             JSArgumentList.class
                         );
 
-                        if (element instanceof JSVariable) {
-                            qualifyingExpression = element;
+                        if (element instanceof JSVariable variable) {
+                            qualifyingExpression = variable;
                         }
                         else if (element instanceof JSAssignmentExpression assignment) {
                             qualifyingExpression = ((JSDefinitionExpression)assignment.getLOperand()).getExpression();
                         }
                     }
-                    else if (parentContainerParent instanceof JSReferenceExpression) {
-                        parentContainer = PsiTreeUtil.getParentOfType(parentContainerParent, JSFunction.class);
+                    else if (functionExprParent instanceof JSReferenceExpression functionRefExpr) {
+                        parentContainer = PsiTreeUtil.getParentOfType(functionRefExpr, JSFunction.class);
                         continue;
                     }
                     else if (parentContainer.getName() == null) {
-                        parentContainer = PsiTreeUtil.getParentOfType(parentContainerParent, JSFunction.class);
+                        parentContainer = PsiTreeUtil.getParentOfType(functionExprParent, JSFunction.class);
                         continue;
                     }
 
@@ -2252,7 +2241,7 @@ else if (parentContainer.getName() == null) {
                 }
 
                 if (qualifyingExpression instanceof JSReferenceExpression qualifyingReferenceExpression) {
-                    final String functionExpressionNameQualifierText = qualifyingReferenceExpression.getReferencedName();
+                    String functionExpressionNameQualifierText = qualifyingReferenceExpression.getReferencedName();
 
                     if (PROTOTYPE_FIELD_NAME.equals(functionExpressionNameQualifierText)) {
                         qualifyingExpression = qualifyingReferenceExpression.getQualifier();
@@ -2266,25 +2255,25 @@ else if (parentContainer.getName() == null) {
 
             PsiElement parentContainerParent = parentContainer != null ? parentContainer.getParent() : null;
 
-            if (parentContainerParent instanceof JSFile) {
-                parentContainerParent = getClassReferenceForXmlFromContext(parentContainerParent);
+            if (parentContainerParent instanceof JSFile jsFile) {
+                parentContainerParent = getClassReferenceForXmlFromContext(jsFile);
             }
 
-            if (parentContainerParent instanceof JSClass) {
-                parentContainer = (JSNamedElement)parentContainerParent;
+            if (parentContainerParent instanceof JSClass jsClass) {
+                parentContainer = jsClass;
             }
 
-            if (parentContainer instanceof JSFunctionExpression && parentContainer.getContainingFile()
-                .getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+            if (parentContainer instanceof JSFunctionExpression
+                && parentContainer.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
                 parentContainer = null;
                 qualifyingExpression = null;
                 typeName = OBJECT_CLASS_NAME;
             }
         }
 
-        public
         @Nullable
-        String getQualifierAsString() {
+        @RequiredReadAction
+        public String getQualifierAsString() {
             String qualifierAsString = getOriginalQualifierAsString();
             return normalizeQualifier(qualifierAsString);
         }
@@ -2296,15 +2285,16 @@ private static String normalizeQualifier(String qualifierAsString) {
             return qualifierAsString;
         }
 
+        @RequiredReadAction
         private String getOriginalQualifierAsString() {
-            if (qualifyingExpression instanceof JSLiteralExpression) {
-                return StringUtil.stripQuotesAroundValue(qualifyingExpression.getText());
+            if (qualifyingExpression instanceof JSLiteralExpression literal) {
+                return StringUtil.stripQuotesAroundValue(literal.getText());
             }
-            else if (qualifyingExpression instanceof JSReferenceExpression) {
-                return qualifyingExpression.getText();
+            else if (qualifyingExpression instanceof JSReferenceExpression refExpr) {
+                return refExpr.getText();
             }
-            else if (qualifyingExpression instanceof JSNamedElement) {
-                return qualifyingExpression.getName();
+            else if (qualifyingExpression instanceof JSNamedElement namedElement) {
+                return namedElement.getName();
             }
             else if (parentContainer instanceof JSQualifiedNamedElement qualifiedNamedElement) {
                 return qualifiedNamedElement.getQualifiedName();
@@ -2325,9 +2315,10 @@ public String[] getQualifierAsNameIndex() {
             return null;
         }
 
+        @RequiredReadAction
         public static String getQualifierOfExprAsString(JSElement expr) {
-            if (expr instanceof JSNamedElement) {
-                return expr.getName();
+            if (expr instanceof JSNamedElement namedElement) {
+                return namedElement.getName();
             }
             if (expr instanceof JSReferenceExpression refExpr && PROTOTYPE_FIELD_NAME.equals(refExpr.getReferencedName())) {
                 expr = refExpr.getQualifier();
@@ -2337,7 +2328,7 @@ public static String getQualifierOfExprAsString(JSElement expr) {
     }
 
     private static boolean isInjectedFile(PsiElement element) {
-        return element instanceof PsiFile file && (file.getVirtualFile() instanceof LightVirtualFile);
+        return element instanceof PsiFile file && file.getVirtualFile() instanceof LightVirtualFile;
     }
 
     @RequiredReadAction
@@ -2348,7 +2339,8 @@ public static void processGlobalSymbols(PsiElement target, PsiScopeProcessor pro
 
             for (VirtualFile file : files) {
                 PsiFile psiFile = PsiManager.getInstance(target.getProject()).findFile(file);
-                if (psiFile instanceof JSFile && !psiFile.processDeclarations(processor, ResolveState.initial(), null, target)) {
+                if (psiFile instanceof JSFile jsFile
+                    && !jsFile.processDeclarations(processor, ResolveState.initial(), null, target)) {
                     return;
                 }
             }
@@ -2356,19 +2348,20 @@ public static void processGlobalSymbols(PsiElement target, PsiScopeProcessor pro
     }
 
     public interface OverrideHandler {
-        boolean process(ResolveProcessor processor, final PsiElement scope, String className);
+        boolean process(ResolveProcessor processor, PsiElement scope, String className);
     }
 
     public interface MetaDataProcessor {
-        boolean process(final @Nonnull JSAttribute jsAttribute);
+        @RequiredReadAction
+        boolean process(@Nonnull JSAttribute jsAttribute);
 
-        boolean handleOtherElement(final PsiElement el, PsiElement context, @Nullable Ref<PsiElement> continuePassElement);
+        boolean handleOtherElement(PsiElement el, PsiElement context, @Nullable SimpleReference<PsiElement> continuePassElement);
     }
 
     public static abstract class CollectMethodsToImplementProcessor extends ResolveProcessor {
         private final String myName;
 
-        public CollectMethodsToImplementProcessor(final String name, PsiElement context) {
+        public CollectMethodsToImplementProcessor(String name, PsiElement context) {
             super(null, context);
             myName = name;
 
@@ -2379,10 +2372,12 @@ public CollectMethodsToImplementProcessor(final String name, PsiElement context)
         }
 
         @Override
-        public boolean execute(final PsiElement element, final ResolveState state) {
-            final ResolveProcessor processor = new ResolveProcessor(myName, place) {
+        @RequiredReadAction
+        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+            ResolveProcessor processor = new ResolveProcessor(myName, place) {
                 @Override
-                public boolean execute(final PsiElement element, final ResolveState state) {
+                @RequiredReadAction
+                public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                     if (element instanceof JSFunction function) {
                         if (OBJECT_CLASS_NAME.equals(((JSClass)findParent(function)).getQualifiedName()) || function.isConstructor()) {
                             return true;
@@ -2402,7 +2397,7 @@ public boolean execute(final PsiElement element, final ResolveState state) {
                 if (!implementedInterface.isInterface()) {
                     continue;
                 }
-                final boolean b =
+                boolean b =
                     implementedInterface.processDeclarations(processor, ResolveState.initial(), implementedInterface, implementedInterface);
 
                 if (!b) {
@@ -2420,7 +2415,7 @@ public boolean execute(final PsiElement element, final ResolveState state) {
         protected abstract boolean process(ResolveProcessor processor);
     }
 
-    static JSSourceElement[] getSourceElements(final PsiElement owner) {
+    static JSSourceElement[] getSourceElements(PsiElement owner) {
         if (owner instanceof JSStubElementImpl jsStubElement) {
             return (JSSourceElement[])jsStubElement.getStubOrPsiChildren(JSElementTypes.SOURCE_ELEMENTS, JSSourceElement.EMPTY_ARRAY);
         }
@@ -2430,21 +2425,22 @@ else if (owner instanceof JSFile jsFile) {
         return JSSourceElement.EMPTY_ARRAY;
     }
 
-    public static PsiElement[] getStubbedChildren(final PsiElement owner) {
+    @RequiredReadAction
+    public static PsiElement[] getStubbedChildren(PsiElement owner) {
         return getStubbedChildren(owner, ourStubbedFilter);
     }
 
-    public static PsiElement[] getStubbedChildren(final PsiElement owner, TokenSet filter) {
-        if (owner instanceof JSStubElementImpl) {
-            final JSStubElementImpl element = (JSStubElementImpl)owner;
-            final StubElement stub = element.getStub();
+    @RequiredReadAction
+    public static PsiElement[] getStubbedChildren(PsiElement owner, TokenSet filter) {
+        if (owner instanceof JSStubElementImpl stubElement) {
+            StubElement stub = stubElement.getStub();
             if (stub != null) {
                 return stub.getChildrenByType(filter, PsiElement.EMPTY_ARRAY);
             }
-            return getChildrenFromTokenSet(element.getNode(), filter);
+            return getChildrenFromTokenSet(stubElement.getNode(), filter);
         }
         else if (owner instanceof JSFile file) {
-            final StubElement stub = ((JSFileImpl)file).getStub();
+            StubElement stub = ((JSFileImpl)file).getStub();
             if (stub != null) {
                 return stub.getChildrenByType(filter, PsiElement.EMPTY_ARRAY);
             }
@@ -2453,8 +2449,8 @@ else if (owner instanceof JSFile file) {
         return PsiElement.EMPTY_ARRAY;
     }
 
-    private static PsiElement[] getChildrenFromTokenSet(final ASTNode astNode, TokenSet filter) {
-        final ASTNode[] astNodes = astNode.getChildren(filter);
+    private static PsiElement[] getChildrenFromTokenSet(ASTNode astNode, TokenSet filter) {
+        ASTNode[] astNodes = astNode.getChildren(filter);
         PsiElement[] result = new PsiElement[astNodes.length];
         for (int i = 0; i < astNodes.length; ++i) {
             result[i] = astNodes[i].getPsi();
@@ -2477,7 +2473,7 @@ private static class ImplicitJSVariableImpl extends LightElement implements JSVa
         private final String myName;
         private final String myType;
 
-        public ImplicitJSVariableImpl(final String name, String qName, PsiFile containingFile) {
+        public ImplicitJSVariableImpl(String name, String qName, PsiFile containingFile) {
             super(containingFile.getManager(), JavaScriptSupportLoader.ECMA_SCRIPT_L4.getBaseLanguage());
             myContainingFile = containingFile;
             myName = name;
@@ -2547,11 +2543,13 @@ public boolean hasInitializer() {
         }
 
         @Override
+        @RequiredReadAction
         public JSExpression getInitializer() {
             return null;
         }
 
         @Override
+        @RequiredReadAction
         public String getInitializerText() {
             return null;
         }
@@ -2593,21 +2591,25 @@ public boolean isDeprecated() {
         }
 
         @Override
+        @RequiredReadAction
         public String getQualifiedName() {
             return myName;
         }
 
         @Override
+        @RequiredReadAction
         public String getName() {
             return myName;
         }
 
         @Override
-        public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException {
+        @RequiredWriteAction
+        public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
             throw new IncorrectOperationException();
         }
 
         @Override
+        @RequiredReadAction
         public PsiElement getNameIdentifier() {
             return null;
         }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
index 7c08ab02..40e4bf4a 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
@@ -26,15 +26,15 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public JSVariable[] getVariables() {
         JSDestructuringShorthandedProperty[] properties = getProperties();
         if (properties.length == 0) {
             return JSVariable.EMPTY_ARRAY;
         }
-        return Arrays.stream(properties).map(JSDestructuringShorthandedProperty::getVarialbe).toArray(JSVariable[]::new);
+        return Arrays.stream(properties).map(JSDestructuringShorthandedProperty::getVariable).toArray(JSVariable[]::new);
     }
 
     @Override
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
index 68b94d72..09e6ec25 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
@@ -150,6 +150,7 @@ public JSAttributeList getAttributeList() {
     }
 
     @Override
+    @RequiredReadAction
     public String getQualifiedName() {
         return null;
     }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
index 4c941df1..84df1b61 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
@@ -24,9 +24,9 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Nonnull
-    @RequiredReadAction
     @Override
-    public JSVariable getVarialbe() {
+    @RequiredReadAction
+    public JSVariable getVariable() {
         return findNotNullChildByClass(JSVariable.class);
     }
 }

From 36765fdbf9b633526b9e1635000b440789908e1e Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 13:53:09 +0300
Subject: [PATCH 260/340] Fixing constant field names.

---
 .../intellij/lang/javascript/psi/impl/JSAttributeImpl.java | 7 +++----
 .../lang/javascript/psi/impl/JSAttributeListImpl.java      | 6 +++---
 .../lang/javascript/psi/resolve/JSResolveUtil.java         | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index 14f08cd2..d5d8a3c1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -39,8 +39,7 @@
  */
 public class JSAttributeImpl extends JSStubElementImpl<JSAttributeStub> implements JSAttribute {
     private PsiReference[] myReferences;
-    private static
-    String[] myPossibleMetaData = new String[]{
+    private static final String[] POSSIBLE_META_DATA = new String[]{
         "AccessibilityClass",
         "ArrayElementType",
         "Bindable",
@@ -155,7 +154,7 @@ public TextRange getRangeInElement() {
         @RequiredReadAction
         public PsiElement resolve() {
             String s = getCanonicalText();
-            return ArrayUtil.indexOf(myPossibleMetaData, s) >= 0 ? JSAttributeImpl.this : null;
+            return ArrayUtil.indexOf(POSSIBLE_META_DATA, s) >= 0 ? JSAttributeImpl.this : null;
         }
 
         @Nonnull
@@ -191,7 +190,7 @@ public boolean isReferenceTo(PsiElement element) {
         @Override
         @RequiredReadAction
         public Object[] getVariants() {
-            return myPossibleMetaData;
+            return POSSIBLE_META_DATA;
         }
 
         @Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
index bab021f9..5e4c23e8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
@@ -42,7 +42,7 @@
  * @author Maxim.Mossienko
  */
 public class JSAttributeListImpl extends JSStubElementImpl<JSAttributeListStub> implements JSAttributeList {
-    private static final TokenSet OUR_MODIFIERS_TYPE_SET = TokenSet.create(
+    private static final TokenSet MODIFIERS_TYPE_SET = TokenSet.create(
         JSTokenTypes.PUBLIC_KEYWORD,
         JSTokenTypes.PRIVATE_KEYWORD,
         JSTokenTypes.PROTECTED_KEYWORD,
@@ -117,14 +117,14 @@ public AccessType getAccessType() {
             return stub.getAccessType();
         }
 
-        ASTNode node = getNode().findChildByType(OUR_MODIFIERS_TYPE_SET);
+        ASTNode node = getNode().findChildByType(MODIFIERS_TYPE_SET);
         return ACCESS_TYPE_MAP.getOrDefault(node != null ? node.getElementType() : null, AccessType.PACKAGE_LOCAL);
     }
 
     @Override
     @RequiredReadAction
     public PsiElement findAccessTypeElement() {
-        ASTNode modifier = getNode().findChildByType(OUR_MODIFIERS_TYPE_SET);
+        ASTNode modifier = getNode().findChildByType(MODIFIERS_TYPE_SET);
         return modifier != null ? modifier.getPsi() : null;
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index d0b46376..d1a8124a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -91,8 +91,8 @@
  * @author max, maxim.mossienko
  */
 public class JSResolveUtil {
-    private static final Key<CachedValue<IntObjectMap<Object>>> MY_CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
-    private static final UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> OUR_CACHED_DEFS_CACHE =
+    private static final Key<CachedValue<IntObjectMap<Object>>> CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
+    private static final UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> CACHED_DEFS_CACHE =
         new RelevantDefsUserDataCache();
     public static final String PROTOTYPE_FIELD_NAME = "prototype";
 
@@ -1810,7 +1810,7 @@ public static boolean processDeclarationsInScope(
         }
 
         boolean result = true;
-        IntObjectMap<Object> defsMap = OUR_CACHED_DEFS_CACHE.get(MY_CACHED_STATEMENTS, scope, null).getValue();
+        IntObjectMap<Object> defsMap = CACHED_DEFS_CACHE.get(CACHED_STATEMENTS, scope, null).getValue();
 
         if (requiredName == null) {
             for (Object value : defsMap.values()) {

From b03a8abad804c87ccc2c2efa08a7f0d263fe68d4 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 14:26:30 +0300
Subject: [PATCH 261/340] Refactoring psi impl (second part).

---
 .../psi/impl/JSCallExpressionImpl.java        |  11 +-
 .../javascript/psi/impl/JSCaseClauseImpl.java |  12 +-
 .../javascript/psi/impl/JSCatchBlockImpl.java |  18 +-
 .../javascript/psi/impl/JSChangeUtil.java     | 147 ++++++------
 .../lang/javascript/psi/impl/JSClassBase.java | 165 +++++++------
 .../psi/impl/JSClassExpressionImpl.java       |   6 +-
 .../lang/javascript/psi/impl/JSClassImpl.java |  98 ++++----
 .../psi/impl/JSCommaExpressionImpl.java       |   9 +-
 .../psi/impl/JSConditionalExpressionImpl.java |  19 +-
 .../psi/impl/JSContinueStatementImpl.java     |  11 +-
 .../psi/impl/JSDefinitionExpressionImpl.java  |  35 +--
 .../psi/impl/JSDoWhileStatementImpl.java      |  11 +-
 .../javascript/psi/impl/JSDocCommentImpl.java |  14 +-
 .../javascript/psi/impl/JSDocTagImpl.java     | 115 ++++-----
 .../psi/impl/JSDocTagValueImpl.java           |  18 +-
 .../javascript/psi/impl/JSElementImpl.java    |   4 +-
 .../psi/impl/JSEmbeddedContentImpl.java       |  23 +-
 .../psi/impl/JSEmptyStatementImpl.java        |   9 +-
 .../impl/JSExpressionCodeFragmentImpl.java    |   9 +-
 .../javascript/psi/impl/JSExpressionImpl.java |   7 +-
 .../psi/impl/JSExpressionStatementImpl.java   |  18 +-
 .../lang/javascript/psi/impl/JSFileImpl.java  |  31 +--
 .../psi/impl/JSForInStatementImpl.java        |  29 +--
 .../psi/impl/JSForStatementImpl.java          |  15 +-
 .../psi/impl/JSFunctionBaseImpl.java          |  69 +++---
 .../psi/impl/JSFunctionExpressionImpl.java    |  56 ++---
 .../javascript/psi/impl/JSFunctionImpl.java   |  44 ++--
 .../psi/impl/JSFunctionPropertyImpl.java      |   6 +-
 .../psi/impl/JSGenericSignatureImpl.java      |   2 +-
 .../psi/impl/JSIfStatementImpl.java           |  17 +-
 .../psi/impl/JSImportStatementImpl.java       |  20 +-
 .../psi/impl/JSIncludeDirectiveImpl.java      |  24 +-
 ...JSIndexedPropertyAccessExpressionImpl.java |  16 +-
 .../psi/impl/JSLabeledStatementImpl.java      |  16 +-
 .../psi/impl/JSLetExpressionImpl.java         |   8 +-
 .../psi/impl/JSLetStatementImpl.java          |   2 +-
 .../psi/impl/JSLiteralExpressionImpl.java     |  11 +-
 .../psi/impl/JSNamespaceDeclarationImpl.java  |  44 ++--
 .../psi/impl/JSNewExpressionImpl.java         |  14 +-
 .../impl/JSObjectLiteralExpressionImpl.java   |  18 +-
 .../psi/impl/JSPackageStatementImpl.java      |  61 ++---
 .../javascript/psi/impl/JSParameterImpl.java  |  39 ++-
 .../psi/impl/JSParameterListImpl.java         |  11 +-
 .../impl/JSParenthesizedExpressionImpl.java   |   7 +-
 .../psi/impl/JSPostfixExpressionImpl.java     |  12 +-
 .../psi/impl/JSPrefixExpressionImpl.java      |   9 +-
 .../javascript/psi/impl/JSPropertyImpl.java   |  21 +-
 .../javascript/psi/impl/JSPsiImplUtils.java   | 123 +++++-----
 .../psi/impl/JSReferenceExpressionImpl.java   | 222 +++++++++---------
 .../psi/impl/JSReferenceListImpl.java         |  36 ++-
 50 files changed, 885 insertions(+), 857 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
index 329acb6c..f6bab133 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSArgumentList;
@@ -26,14 +27,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 31, 2005
- * Time: 12:02:38 AM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-31
  */
 public class JSCallExpressionImpl extends JSExpressionImpl implements JSCallExpression {
-    public JSCallExpressionImpl(final ASTNode node) {
+    public JSCallExpressionImpl(ASTNode node) {
         super(node);
     }
 
@@ -43,6 +41,7 @@ public JSExpression getMethodExpression() {
     }
 
     @Override
+    @RequiredReadAction
     public JSArgumentList getArgumentList() {
         ASTNode node = getNode().findChildByType(JSElementTypes.ARGUMENT_LIST);
         return node != null ? (JSArgumentList)node.getPsi() : null;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
index d59cd6f6..25c89e04 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
@@ -21,27 +21,27 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 10:11:23 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSCaseClauseImpl extends JSElementImpl implements JSCaseClause {
-    public JSCaseClauseImpl(final ASTNode node) {
+    public JSCaseClauseImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public boolean isDefault() {
         return getNode().findChildByType(JSTokenTypes.DEFAULT_KEYWORD) != null;
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getCaseExpression() {
         return isDefault() ? null : findChildByClass(JSExpression.class);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
index 66d7c7a8..81655477 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSParameter;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.PsiScopeProcessor;
@@ -30,20 +31,18 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 10:06:09 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSCatchBlockImpl extends JSElementImpl implements JSCatchBlock {
-    public JSCatchBlockImpl(final ASTNode node) {
+    public JSCatchBlockImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public JSParameter getParameter() {
-        final ASTNode node = getNode().findChildByType(JSElementTypes.FORMAL_PARAMETER);
+        ASTNode node = getNode().findChildByType(JSElementTypes.FORMAL_PARAMETER);
         return node != null ? (JSParameter)node.getPsi() : null;
     }
 
@@ -58,6 +57,7 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
         @Nonnull PsiScopeProcessor processor,
         @Nonnull ResolveState state,
@@ -65,7 +65,7 @@ public boolean processDeclarations(
         @Nonnull PsiElement place
     ) {
         if (lastParent != null) {
-            final JSParameter param = getParameter();
+            JSParameter param = getParameter();
             if (param != null) {
                 return processor.execute(param, state);
             }
@@ -76,7 +76,7 @@ public boolean processDeclarations(
 
     @Override
     public void delete() throws IncorrectOperationException {
-        final ASTNode astNode = getNode();
+        ASTNode astNode = getNode();
         astNode.getTreeParent().removeChild(astNode);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
index a626f6f1..33aff1e0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
@@ -20,6 +20,8 @@
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSUtils;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.language.ast.ASTNode;
@@ -38,16 +40,14 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 31, 2005
- * Time: 7:56:28 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-31
  */
 public class JSChangeUtil {
     private JSChangeUtil() {
     }
 
+    @RequiredReadAction
     public static ASTNode createNameIdentifier(Project project, String name, IElementType type) {
         if (JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(type)) {
             return createNameIdentifier(project, name);
@@ -60,73 +60,78 @@ else if (JavaScriptTokenSets.STRING_LITERALS.contains(type) && !StringUtil.isQuo
         }
     }
 
+    @RequiredReadAction
     public static ASTNode createNameIdentifier(Project project, String name) {
-        final JSExpressionStatement expressionStatement = (JSExpressionStatement)createJSTreeFromTextImpl(project, name + ";");
-        final JSReferenceExpressionImpl refExpression = (JSReferenceExpressionImpl)expressionStatement.getFirstChild();
+        JSExpressionStatement expression = (JSExpressionStatement)createJSTreeFromTextImpl(project, name + ";");
+        JSReferenceExpressionImpl refExpr = (JSReferenceExpressionImpl)expression.getFirstChild();
 
-        return refExpression.getNode().getFirstChildNode();
+        return refExpr.getNode().getFirstChildNode();
     }
 
     @Nonnull
+    @RequiredReadAction
     public static JSExpression createExpressionFromText(Project project, @NonNls String text) {
         text = "{\n" + text + "\n}";
         PsiElement element = createJSTreeFromTextImpl(project, text);
         assert element instanceof JSBlockStatement : "\"" + text + "\" was not parsed as BlockStatement";
         element = ((JSBlockStatement)element).getStatements()[0];
-        final JSExpressionStatement expressionStatement = (JSExpressionStatement)element;
+        JSExpressionStatement expressionStatement = (JSExpressionStatement)element;
         return (JSExpression)expressionStatement.getFirstChild();
     }
 
-
-    public static ASTNode createStatementFromText(Project project, @NonNls String text) {
-        final PsiElement element = createJSTreeFromTextImpl(project, text);
-        final JSSourceElement stmt = element instanceof JSSourceElement ? (JSSourceElement)element : null;
+    @RequiredReadAction
+    public static ASTNode createStatementFromText(Project project, String text) {
+        PsiElement element = createJSTreeFromTextImpl(project, text);
+        JSSourceElement stmt = element instanceof JSSourceElement sourceElement ? sourceElement : null;
         return stmt != null ? stmt.getNode() : null;
     }
 
     @Nullable
-    private static PsiElement createJSTreeFromTextImpl(Project project, @NonNls String text) {
-        final PsiFile dummyFile;
-        dummyFile = PsiFileFactory.getInstance(project).createFileFromText("dummy.js", JavaScriptLanguage.INSTANCE, text);
+    @RequiredReadAction
+    private static PsiElement createJSTreeFromTextImpl(Project project, String text) {
+        PsiFile dummyFile =
+            PsiFileFactory.getInstance(project).createFileFromText("dummy.js", JavaScriptLanguage.INSTANCE, text);
 
         return dummyFile.getFirstChild();
     }
 
-    public static ASTNode createJSTreeFromText(Project project, @NonNls String text) {
-        final PsiElement element = createJSTreeFromTextImpl(project, text);
-        if (element != null) {
-            return element.getNode();
-        }
-        return null;
+    @RequiredReadAction
+    public static ASTNode createJSTreeFromText(Project project, String text) {
+        PsiElement element = createJSTreeFromTextImpl(project, text);
+        return element != null ? element.getNode() : null;
     }
 
+    @RequiredWriteAction
     public static JSExpression replaceExpression(JSExpression oldExpr, JSExpression newExpr) {
         if (JSUtils.isNeedParenthesis(oldExpr, newExpr)) {
             ASTNode parenthesized = createExpressionFromText(oldExpr.getProject(), "(a)").getNode();
-            final JSParenthesizedExpression parenthPsi = (JSParenthesizedExpression)parenthesized.getPsi();
+            JSParenthesizedExpression parenthPsi = (JSParenthesizedExpression)parenthesized.getPsi();
             parenthesized.replaceChild(parenthPsi.getInnerExpression().getNode(), newExpr.getNode().copyElement());
             oldExpr.getParent().getNode().replaceChild(oldExpr.getNode(), parenthesized);
             return parenthPsi;
         }
         else {
-            final ASTNode newNode = newExpr.getNode().copyElement();
+            ASTNode newNode = newExpr.getNode().copyElement();
             oldExpr.getParent().getNode().replaceChild(oldExpr.getNode(), newNode);
             return (JSExpression)newNode.getPsi();
         }
     }
 
+    @RequiredWriteAction
     public static JSStatement replaceStatement(JSStatement oldStatement, JSStatement newStatement) {
-        final ASTNode newNode = newStatement.getNode().copyElement();
+        ASTNode newNode = newStatement.getNode().copyElement();
         oldStatement.getParent().getNode().replaceChild(oldStatement.getNode(), newNode);
         return (JSStatement)newNode.getPsi();
     }
 
+    @RequiredWriteAction
     public static void doIdentifierReplacement(PsiElement parent, PsiElement identifier, String name) {
-        final ASTNode nameElement = JSChangeUtil.createNameIdentifier(parent.getProject(), name);
+        ASTNode nameElement = JSChangeUtil.createNameIdentifier(parent.getProject(), name);
         parent.getNode().replaceChild(identifier.getNode(), nameElement);
     }
 
-    public static PsiElement doAddBefore(final PsiElement jsElement, final PsiElement element, final PsiElement anchor)
+    @RequiredWriteAction
+    public static PsiElement doAddBefore(PsiElement jsElement, PsiElement element, PsiElement anchor)
         throws IncorrectOperationException {
         if (!JSChangeUtil.isStatementOrComment(element) && !(element instanceof PsiWhiteSpace)) {
             throw new UnsupportedOperationException("js statement or whitespace expected");
@@ -135,35 +140,36 @@ public static PsiElement doAddBefore(final PsiElement jsElement, final PsiElemen
         return doDoAddBefore(jsElement, element, anchor);
     }
 
-    public static PsiElement doDoAddBefore(final PsiElement jsElement, final PsiElement element, final PsiElement anchor)
-        throws IncorrectOperationException {
-        final ASTNode elementNode = element.getNode();
+    @RequiredWriteAction
+    public static PsiElement doDoAddBefore(PsiElement jsElement, PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        ASTNode elementNode = element.getNode();
         if (elementNode == null) {
             throw new IncorrectOperationException("node should not be null");
         }
         ASTNode copiedElementNode = elementNode.copyElement();
-        final ASTNode parentNode = jsElement.getNode();
+        ASTNode parentNode = jsElement.getNode();
         ASTNode anchorNode = anchor != null ? anchor.getNode() : null;
 
         anchorNode = insertWhitespaceIfNeeded(anchorNode, elementNode, parentNode, anchorNode);
 
         parentNode.addChild(copiedElementNode, anchorNode != null ? anchorNode : null);
-        if (copiedElementNode.getPsi() instanceof PsiComment && parentNode.getPsi().isPhysical()) { // HACK !
+        if (copiedElementNode.getPsi() instanceof PsiComment comment && parentNode.getPsi().isPhysical()) { // HACK !
             CodeStyleManager.getInstance(element.getProject()).reformatNewlyAddedElement(parentNode, copiedElementNode);
         }
 
         return copiedElementNode.getPsi();
     }
 
+    @RequiredWriteAction
     private static ASTNode insertWhitespaceIfNeeded(
         ASTNode anchorNode,
-        final ASTNode elementNode,
-        final ASTNode parentNode,
-        final ASTNode insertionPlaceNode
+        ASTNode elementNode,
+        ASTNode parentNode,
+        ASTNode insertionPlaceNode
     ) throws IncorrectOperationException {
         ParserDefinition parserDef = ParserDefinition.forLanguage(parentNode.getPsi().getLanguage());
-        final TokenSet comments = parserDef.getCommentTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
-        final TokenSet whitespaces = parserDef.getWhitespaceTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
+        TokenSet comments = parserDef.getCommentTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
+        TokenSet whitespaces = parserDef.getWhitespaceTokens(parentNode.getPsi().getLanguage().getVersions()[0]);
 
         if (anchorNode != null
             && (!whitespaces.contains(anchorNode.getElementType()) && !whitespaces.contains(elementNode.getElementType())
@@ -177,7 +183,7 @@ private static ASTNode insertWhitespaceIfNeeded(
                 commentString = "\n";
             }
 
-            final ASTNode wsNode =
+            ASTNode wsNode =
                 PsiParserFacade.SERVICE.getInstance(parentNode.getPsi().getProject()).createWhiteSpaceFromText(commentString).getNode();
             parentNode.addChild(wsNode, insertionPlaceNode);
             anchorNode = wsNode;
@@ -185,16 +191,19 @@ private static ASTNode insertWhitespaceIfNeeded(
         return anchorNode;
     }
 
-    public static boolean isStatementContainer(final PsiElement jsElement) {
-        return jsElement instanceof JSBlockStatement || jsElement instanceof JSEmbeddedContentImpl
-            || jsElement instanceof JSClass || jsElement instanceof JSPackageStatement;
+    public static boolean isStatementContainer(PsiElement jsElement) {
+        return jsElement instanceof JSBlockStatement
+            || jsElement instanceof JSEmbeddedContentImpl
+            || jsElement instanceof JSClass
+            || jsElement instanceof JSPackageStatement;
     }
 
-    public static boolean isStatementOrComment(final PsiElement jsElement) {
+    public static boolean isStatementOrComment(PsiElement jsElement) {
         return jsElement instanceof JSSourceElement || jsElement instanceof PsiComment;
     }
 
-    public static PsiElement doAddAfter(final PsiElement jsElement, final PsiElement element, final PsiElement anchor)
+    @RequiredWriteAction
+    public static PsiElement doAddAfter(PsiElement jsElement, PsiElement element, PsiElement anchor)
         throws IncorrectOperationException {
         if (!JSChangeUtil.isStatementOrComment(element) && !(element instanceof PsiWhiteSpace)) {
             throw new UnsupportedOperationException("js statement or whitespace expected");
@@ -203,14 +212,14 @@ public static PsiElement doAddAfter(final PsiElement jsElement, final PsiElement
         return doDoAddAfter(jsElement, element, anchor);
     }
 
-    public static PsiElement doDoAddAfter(final PsiElement jsElement, final PsiElement element, final PsiElement anchor)
-        throws IncorrectOperationException {
-        final ASTNode parentNode = jsElement.getNode();
-        final ASTNode node = element.getNode();
+    @RequiredWriteAction
+    public static PsiElement doDoAddAfter(PsiElement jsElement, PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        ASTNode parentNode = jsElement.getNode();
+        ASTNode node = element.getNode();
         ASTNode anchorNode = anchor != null ? anchor.getNode() : parentNode.getLastChildNode();
         anchorNode = insertWhitespaceIfNeeded(anchorNode, node, parentNode, anchorNode != null ? anchorNode.getTreeNext() : null);
 
-        final ASTNode nodeCopy = node.copyElement();
+        ASTNode nodeCopy = node.copyElement();
 
         if (anchor == null) {
             parentNode.addChild(nodeCopy);
@@ -219,15 +228,16 @@ public static PsiElement doDoAddAfter(final PsiElement jsElement, final PsiEleme
             parentNode.addChild(nodeCopy, anchorNode.getTreeNext());
         }
 
-        final ASTNode nextAfter = nodeCopy.getTreeNext();
+        ASTNode nextAfter = nodeCopy.getTreeNext();
         insertWhitespaceIfNeeded(nextAfter, node, parentNode, nextAfter);
 
         return nodeCopy.getPsi();
     }
 
-    public static PsiElement doAddRangeBefore(PsiElement parent, PsiElement first, final PsiElement last, final PsiElement anchor)
+    @RequiredWriteAction
+    public static PsiElement doAddRangeBefore(PsiElement parent, PsiElement first, PsiElement last, PsiElement anchor)
         throws IncorrectOperationException {
-        final PsiElement resultElement;
+        PsiElement resultElement;
         PsiElement psiElement = resultElement = doAddBefore(parent, first, anchor);
 
         while (first != last) {
@@ -241,9 +251,10 @@ public static PsiElement doAddRangeBefore(PsiElement parent, PsiElement first, f
         return resultElement;
     }
 
-    public static PsiElement doAddRangeAfter(final PsiElement jsElement, PsiElement first, final PsiElement last, final PsiElement anchor)
+    @RequiredWriteAction
+    public static PsiElement doAddRangeAfter(PsiElement jsElement, PsiElement first, PsiElement last, PsiElement anchor)
         throws IncorrectOperationException {
-        final PsiElement resultElement;
+        PsiElement resultElement;
         PsiElement psiElement = resultElement = doAddAfter(jsElement, first, anchor);
 
         while (first != last) {
@@ -257,11 +268,12 @@ public static PsiElement doAddRangeAfter(final PsiElement jsElement, PsiElement
         return resultElement;
     }
 
-    public static boolean isBlockStatementContainer(final JSElement jsElement) {
+    public static boolean isBlockStatementContainer(JSElement jsElement) {
         return jsElement instanceof JSIfStatement || jsElement instanceof JSLoopStatement;
     }
 
-    public static PsiElement blockDoAddRangeBefore(final PsiElement first, final PsiElement last, final @Nonnull PsiElement anchor)
+    @RequiredWriteAction
+    public static PsiElement blockDoAddRangeBefore(PsiElement first, PsiElement last, @Nonnull PsiElement anchor)
         throws IncorrectOperationException {
         BlockAddContext addContext = new BlockAddContext(anchor) {
             @Override
@@ -273,7 +285,8 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
         return addContext.doAddElement(first, last);
     }
 
-    public static PsiElement blockDoAddRangeAfter(final PsiElement first, final PsiElement last, final @Nonnull PsiElement anchor)
+    @RequiredWriteAction
+    public static PsiElement blockDoAddRangeAfter(PsiElement first, PsiElement last, @Nonnull PsiElement anchor)
         throws IncorrectOperationException {
         BlockAddContext addContext = new BlockAddContext(anchor) {
             @Override
@@ -285,8 +298,8 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
         return addContext.doAddElement(first, last);
     }
 
-    public static PsiElement blockDoAddAfter(final PsiElement element, final @Nonnull PsiElement anchor)
-        throws IncorrectOperationException {
+    @RequiredWriteAction
+    public static PsiElement blockDoAddAfter(PsiElement element, @Nonnull PsiElement anchor) throws IncorrectOperationException {
         BlockAddContext addContext = new BlockAddContext(anchor) {
             @Override
             PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException {
@@ -297,8 +310,8 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
         return addContext.doAddElement(element);
     }
 
-    public static PsiElement blockDoAddBefore(final PsiElement element, final @Nonnull PsiElement anchor)
-        throws IncorrectOperationException {
+    @RequiredWriteAction
+    public static PsiElement blockDoAddBefore(PsiElement element, @Nonnull PsiElement anchor) throws IncorrectOperationException {
         BlockAddContext addContext = new BlockAddContext(anchor) {
             @Override
             PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException {
@@ -309,7 +322,7 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
         return addContext.doAddElement(element);
     }
 
-    public static String getSemicolon(final Project project) {
+    public static String getSemicolon(Project project) {
         return CodeStyleSettingsManager.getInstance(project).getCurrentSettings().getCustomSettings(JSCodeStyleSettings.class)
             .USE_SEMICOLON_AFTER_STATEMENT ? ";" : "";
     }
@@ -318,12 +331,13 @@ abstract static class BlockAddContext {
         final JSBlockStatement newlyAddedBlock;
         final PsiElement codeBlockAnchor;
 
-        BlockAddContext(final @Nonnull PsiElement _anchor) throws IncorrectOperationException {
-            final ASTNode codeBlockNode = JSChangeUtil.createStatementFromText(_anchor.getProject(), "{ a }");
+        @RequiredWriteAction
+        BlockAddContext(@Nonnull PsiElement _anchor) throws IncorrectOperationException {
+            ASTNode codeBlockNode = JSChangeUtil.createStatementFromText(_anchor.getProject(), "{ a }");
 
-            newlyAddedBlock = (JSBlockStatement)_anchor.replace((JSBlockStatement)codeBlockNode.getPsi());
+            newlyAddedBlock = (JSBlockStatement)_anchor.replace(codeBlockNode.getPsi());
 
-            final JSStatement artificiallyAddedBlockAnchor = newlyAddedBlock.getStatements()[0];
+            JSStatement artificiallyAddedBlockAnchor = newlyAddedBlock.getStatements()[0];
             codeBlockAnchor = newlyAddedBlock.addBefore(_anchor, artificiallyAddedBlockAnchor);
             artificiallyAddedBlockAnchor.delete();
         }
@@ -331,7 +345,8 @@ abstract static class BlockAddContext {
         abstract PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException;
     }
 
-    static void removeRangeWithRemovalOfCommas(final ASTNode myNode, final ASTNode parent) {
+    @RequiredWriteAction
+    static void removeRangeWithRemovalOfCommas(ASTNode myNode, ASTNode parent) {
         ASTNode from = myNode, to = myNode.getTreeNext();
         boolean seenComma = false;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index 197a048b..e0b3116d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -22,7 +22,11 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
-import consulo.application.util.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.application.util.CachedValueProvider;
+import consulo.application.util.CachedValuesManager;
+import consulo.application.util.ParameterizedCachedValue;
+import consulo.application.util.UserDataCache;
 import consulo.javascript.impl.language.psi.JSStubElementType;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
@@ -35,7 +39,6 @@
 import consulo.util.collection.ArrayFactory;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.dataholder.Key;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -45,20 +48,21 @@
  * @author Maxim.Mossienko
  */
 public abstract class JSClassBase extends JSStubElementImpl<JSClassStub> implements JSClass {
-    private volatile Map<String, Object> myName2FunctionMap;
-    private volatile Map<String, JSVariable> myName2FieldsMap;
-    private static Key<ParameterizedCachedValue<List<JSClass>, Object>> ourImplementsListCacheKey = Key.create("implements.list.cache");
-    private static Key<ParameterizedCachedValue<List<JSClass>, Object>> ourExtendsListCacheKey = Key.create("implements.list.cache");
-    private static UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> ourImplementsListCache =
+    private static final Key<ParameterizedCachedValue<List<JSClass>, Object>> IMPLEMENTS_LIST_CACHE_KEY = Key.create("implements.list.cache");
+    private static final Key<ParameterizedCachedValue<List<JSClass>, Object>> EXTENDS_LIST_CACHE_KEY = Key.create("implements.list.cache");
+    private static final UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> IMPLEMENTS_LIST_CACHE =
         new ClassesUserDataCache();
-    private static UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> ourExtendsListCache =
+    private static final UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> EXTENDS_LIST_CACHE =
         new ExtendsClassesUserDataCache();
 
-    protected JSClassBase(final ASTNode node) {
+    private volatile Map<String, Object> myName2FunctionMap;
+    private volatile Map<String, JSVariable> myName2FieldsMap;
+
+    protected JSClassBase(ASTNode node) {
         super(node);
     }
 
-    public JSClassBase(final JSClassStub stub, final JSStubElementType<JSClassStub, JSClass> aClass) {
+    public JSClassBase(JSClassStub stub, JSStubElementType<JSClassStub, JSClass> aClass) {
         super(stub, aClass);
     }
 
@@ -76,7 +80,7 @@ public void subtreeChanged() {
 
     @Override
     protected Object clone() {
-        final JSClassBase o = (JSClassBase)super.clone();
+        JSClassBase o = (JSClassBase)super.clone();
         o.dropCaches();
         return o;
     }
@@ -89,8 +93,9 @@ private void dropCaches() {
     }
 
     @Override
+    @RequiredReadAction
     public JSFunction[] getFunctions() {
-        final JSClassStub classStub = getStub();
+        JSClassStub classStub = getStub();
         if (classStub != null) {
             return getStubChildrenByType(classStub, JSElementTypes.FUNCTION_DECLARATION, JSFunction.ARRAY_FACTORY);
         }
@@ -99,7 +104,7 @@ public JSFunction[] getFunctions() {
             processDeclarations(
                 new PsiScopeProcessor() {
                     @Override
-                    public boolean execute(final PsiElement element, final ResolveState state) {
+                    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                         if (element instanceof JSFunction function) {
                             functions.add(function);
                         }
@@ -107,12 +112,12 @@ public boolean execute(final PsiElement element, final ResolveState state) {
                     }
 
                     @Override
-                    public <T> T getHint(final Key<T> hintClass) {
+                    public <T> T getHint(@Nonnull Key<T> hintClass) {
                         return null;
                     }
 
                     @Override
-                    public void handleEvent(final Event event, final Object associated) {
+                    public void handleEvent(Event event, Object associated) {
                     }
                 },
                 ResolveState.initial(),
@@ -124,12 +129,13 @@ public void handleEvent(final Event event, final Object associated) {
     }
 
     @Override
+    @RequiredReadAction
     public JSFunction findFunctionByName(String functionName) {
         if (functionName == null) {
             return null;
         }
-        final Map<String, Object> name2FunctionMap = initFunctions();
-        final Object o = name2FunctionMap.get(functionName);
+        Map<String, Object> name2FunctionMap = initFunctions();
+        Object o = name2FunctionMap.get(functionName);
         if (o instanceof JSFunction function) {
             return function;
         }
@@ -140,12 +146,13 @@ else if (o instanceof JSFunction[] functions) {
     }
 
     @Override
+    @RequiredReadAction
     public JSVariable[] getFields() {
-        final JSClassStub classStub = getStub();
+        JSClassStub classStub = getStub();
         final List<JSVariable> vars = new ArrayList<>(3);
 
         if (classStub != null) {
-            for (JSVarStatement var : getStubChildrenByType(classStub, JSElementTypes.VAR_STATEMENT, count -> new JSVarStatement[count])) {
+            for (JSVarStatement var : getStubChildrenByType(classStub, JSElementTypes.VAR_STATEMENT, JSVarStatement[]::new)) {
                 vars.addAll(Arrays.asList(var.getVariables()));
             }
         }
@@ -153,7 +160,7 @@ public JSVariable[] getFields() {
             processDeclarations(
                 new PsiScopeProcessor() {
                     @Override
-                    public boolean execute(final PsiElement element, final ResolveState state) {
+                    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                         if (element instanceof JSVariable variable) {
                             vars.add(variable);
                         }
@@ -161,12 +168,12 @@ public boolean execute(final PsiElement element, final ResolveState state) {
                     }
 
                     @Override
-                    public <T> T getHint(final Key<T> hintClass) {
+                    public <T> T getHint(@Nonnull Key<T> hintClass) {
                         return null;
                     }
 
                     @Override
-                    public void handleEvent(final Event event, final Object associated) {
+                    public void handleEvent(Event event, Object associated) {
                     }
                 },
                 ResolveState.initial(),
@@ -178,13 +185,14 @@ public void handleEvent(final Event event, final Object associated) {
     }
 
     @Override
+    @RequiredReadAction
     public JSVariable findFieldByName(String name) {
         return initFields().get(name);
     }
 
-    private
     @Nonnull
-    Map<String, JSVariable> initFields() {
+    @RequiredReadAction
+    private Map<String, JSVariable> initFields() {
         Map<String, JSVariable> name2FieldsMap = myName2FieldsMap;
 
         if (name2FieldsMap == null) {
@@ -195,7 +203,7 @@ Map<String, JSVariable> initFields() {
                     name2FieldsMap = new HashMap<>();
 
                     for (JSVariable variable : getFields()) {
-                        final String name = variable.getName();
+                        String name = variable.getName();
 
                         if (name != null) {
                             name2FieldsMap.put(name, variable);
@@ -208,9 +216,9 @@ Map<String, JSVariable> initFields() {
         return name2FieldsMap;
     }
 
-    private
     @Nonnull
-    Map<String, Object> initFunctions() {
+    @RequiredReadAction
+    private Map<String, Object> initFunctions() {
         Map<String, Object> name2FunctionMap = myName2FunctionMap;
 
         if (name2FunctionMap == null) {
@@ -221,10 +229,10 @@ Map<String, Object> initFunctions() {
                     name2FunctionMap = new HashMap<>();
 
                     for (JSFunction function : getFunctions()) {
-                        final String name = function.getName();
+                        String name = function.getName();
 
                         if (name != null) {
-                            final Object o = name2FunctionMap.get(name);
+                            Object o = name2FunctionMap.get(name);
                             if (o == null) {
                                 name2FunctionMap.put(name, function);
                             }
@@ -244,19 +252,19 @@ else if (o instanceof JSFunction[] sameNameFunctions) {
     }
 
     @Override
-    public JSFunction findFunctionByNameAndKind(final String name, JSFunction.FunctionKind kind) {
+    @RequiredReadAction
+    public JSFunction findFunctionByNameAndKind(String name, JSFunction.FunctionKind kind) {
         if (name == null) {
             return null;
         }
         Map<String, Object> name2FunctionMap = initFunctions();
-        final Object o = name2FunctionMap.get(name);
+        Object o = name2FunctionMap.get(name);
 
-        if (o instanceof JSFunction) {
-            final JSFunction function = (JSFunction)o;
+        if (o instanceof JSFunction function) {
             return function.getKind() == kind ? function : null;
         }
-        else if (o instanceof JSFunction[]) {
-            for (JSFunction fun : (JSFunction[])o) {
+        else if (o instanceof JSFunction[] functions) {
+            for (JSFunction fun : functions) {
                 if (fun.getKind() == kind) {
                     return fun;
                 }
@@ -272,26 +280,27 @@ public JSClass[] getSupers() {
         return superClasses.toArray(new JSClass[superClasses.size()]);
     }
 
-    private List<JSClass> getClassesFromReferenceList(final @Nullable JSReferenceList extendsList, @Nonnull IElementType type) {
-        final PsiElement element = extendsList != null ? extendsList : this;
+    private List<JSClass> getClassesFromReferenceList(@Nullable JSReferenceList extendsList, @Nonnull IElementType type) {
+        PsiElement element = extendsList != null ? extendsList : this;
 
         if (type == JSElementTypes.EXTENDS_LIST) {
-            return ourExtendsListCache.get(ourExtendsListCacheKey, this, extendsList).getValue(element);
+            return EXTENDS_LIST_CACHE.get(EXTENDS_LIST_CACHE_KEY, this, extendsList).getValue(element);
         }
         else {
-            return ourImplementsListCache.get(ourImplementsListCacheKey, this, extendsList).getValue(element);
+            return IMPLEMENTS_LIST_CACHE.get(IMPLEMENTS_LIST_CACHE_KEY, this, extendsList).getValue(element);
         }
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull final PsiScopeProcessor processor,
-        @Nonnull final ResolveState substitutor,
-        final PsiElement lastParent,
-        @Nonnull final PsiElement place
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState substitutor,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
     ) {
-        final ResolveProcessor resolveProcessor = processor instanceof ResolveProcessor rProcessor ? rProcessor : null;
-        final boolean toProcessClass = resolveProcessor != null && resolveProcessor.isTypeContext();
+        ResolveProcessor resolveProcessor = processor instanceof ResolveProcessor rProcessor ? rProcessor : null;
+        boolean toProcessClass = resolveProcessor != null && resolveProcessor.isTypeContext();
 
         if (toProcessClass) {
             if (!processor.execute(this, null)) {
@@ -304,7 +313,7 @@ public boolean processDeclarations(
         }
 
         processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
-        final boolean toProcessMembers = resolveProcessor == null
+        boolean toProcessMembers = resolveProcessor == null
             || !resolveProcessor.isToSkipClassDeclarationOnce() && resolveProcessor.isToProcessMembers();
         if (toProcessMembers) {
             if (!processMembers(processor, substitutor, lastParent, place)) {
@@ -315,9 +324,9 @@ public boolean processDeclarations(
             resolveProcessor.setToSkipClassDeclarationsOnce(false);
         }
 
-        final boolean toProcessInHierarchy = processor instanceof ResolveProcessor rProcessor && rProcessor.isToProcessHierarchy();
+        boolean toProcessInHierarchy = resolveProcessor != null && resolveProcessor.isToProcessHierarchy();
 
-        if (!toProcessInHierarchy || ((ResolveProcessor)processor).checkVisited(getQualifiedName())) {
+        if (!toProcessInHierarchy || resolveProcessor.checkVisited(getQualifiedName())) {
             return true;
         }
 
@@ -331,46 +340,44 @@ public boolean processDeclarations(
     }
 
     protected abstract boolean processMembers(
-        final PsiScopeProcessor processor,
-        final ResolveState substitutor,
-        final PsiElement lastParent,
-        final PsiElement place
+        PsiScopeProcessor processor,
+        ResolveState substitutor,
+        PsiElement lastParent,
+        PsiElement place
     );
 
     @Override
     public JSClass[] getSuperClasses() {
-        final JSReferenceList extendsList = getExtendsList();
-        final List<JSClass> supers = getClassesFromReferenceList(extendsList, JSElementTypes.EXTENDS_LIST);
+        JSReferenceList extendsList = getExtendsList();
+        List<JSClass> supers = getClassesFromReferenceList(extendsList, JSElementTypes.EXTENDS_LIST);
         return supers.toArray(new JSClass[supers.size()]);
     }
 
-    public static PsiElement findClassFromNamespace(final String qname, PsiElement context) {
-        PsiElement realClazz = null;
-        final PsiElement clazz = JSResolveUtil.findClassByQName(qname, context);
-
-        realClazz = clazz;
-        return realClazz;
+    @RequiredReadAction
+    public static PsiElement findClassFromNamespace(String qName, PsiElement context) {
+        return JSResolveUtil.findClassByQName(qName, context);
     }
 
     @Override
     public JSClass[] getImplementedInterfaces() {
-        final JSReferenceList implementsList = getImplementsList();
+        JSReferenceList implementsList = getImplementsList();
         if (implementsList == null) {
             return JSClass.EMPTY_ARRAY;
         }
-        final List<JSClass> classes = getClassesFromReferenceList(implementsList, JSElementTypes.IMPLEMENTS_LIST);
+        List<JSClass> classes = getClassesFromReferenceList(implementsList, JSElementTypes.IMPLEMENTS_LIST);
         return classes.toArray(new JSClass[classes.size()]);
     }
 
     private static class ExtendsClassesUserDataCache extends ClassesUserDataCache {
         @Override
-        protected List<JSClass> doCompute(final Object extendsList) {
+        @RequiredReadAction
+        protected List<JSClass> doCompute(Object extendsList) {
             if (extendsList instanceof JSClass jsClass) {
-                final ArrayList<JSClass> supers = new ArrayList<>(1);
+                ArrayList<JSClass> supers = new ArrayList<>(1);
                 if (!"Object".equals(jsClass.getQualifiedName())) {
-                    final PsiElement element = findClassFromNamespace("Object", jsClass);
-                    if (element instanceof JSClass) {
-                        supers.add((JSClass)element);
+                    PsiElement element = findClassFromNamespace("Object", jsClass);
+                    if (element instanceof JSClass elementClass) {
+                        supers.add(elementClass);
                     }
                 }
 
@@ -382,24 +389,25 @@ protected List<JSClass> doCompute(final Object extendsList) {
 
     private static class ClassesUserDataCache extends UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> {
         @Override
-        protected ParameterizedCachedValue<List<JSClass>, Object> compute(final JSClassBase jsClassBase, final Object p) {
+        protected ParameterizedCachedValue<List<JSClass>, Object> compute(JSClassBase jsClassBase, Object p) {
             return CachedValuesManager.getManager(jsClassBase.getProject()).createParameterizedCachedValue(
                 list -> new CachedValueProvider.Result<>(doCompute(list), PsiModificationTracker.MODIFICATION_COUNT),
                 false
             );
         }
 
-        protected List<JSClass> doCompute(final Object object) {
+        @RequiredReadAction
+        protected List<JSClass> doCompute(Object object) {
             if (object instanceof JSClass) {
                 return Collections.emptyList();
             }
 
-            final ArrayList<JSClass> supers = new ArrayList<>(1);
-            final JSReferenceList extendsList = (JSReferenceList)object;
+            ArrayList<JSClass> supers = new ArrayList<>(1);
+            JSReferenceList extendsList = (JSReferenceList)object;
 
             for (String refText : extendsList.getReferenceTexts()) {
                 refText = JSImportHandlingUtil.resolveTypeName(refText, extendsList.getParent());
-                final PsiElement element = findClassFromNamespace(refText, extendsList.getParent());
+                PsiElement element = findClassFromNamespace(refText, extendsList.getParent());
                 if (element instanceof JSClass jsClass) {
                     supers.add(jsClass);
                 }
@@ -408,7 +416,7 @@ protected List<JSClass> doCompute(final Object object) {
         }
     }
 
-    private static <E extends PsiElement> E[] getStubChildrenByType(JSClassStub stub, final IElementType elementType, ArrayFactory<E> f) {
+    private static <E extends PsiElement> E[] getStubChildrenByType(JSClassStub stub, IElementType elementType, ArrayFactory<E> f) {
         assert JSElementTypes.INCLUDE_DIRECTIVE != elementType;
 
         ArrayList<E> result = new ArrayList<>(Arrays.asList(stub.getChildrenByType(elementType, f)));
@@ -417,18 +425,19 @@ private static <E extends PsiElement> E[] getStubChildrenByType(JSClassStub stub
         TokenSet filter = TokenSet.create(JSElementTypes.INCLUDE_DIRECTIVE, elementType);
         for (JSIncludeDirective include : includes) {
             PsiFile file = include.resolveFile();
-            if (file instanceof JSFile) {
-                process(filter, (JSFile)file, result, visited);
+            if (file instanceof JSFile jsFile) {
+                process(filter, jsFile, result, visited);
             }
         }
         return result.toArray(f.create(result.size()));
     }
 
+    @SuppressWarnings("unchecked")
     private static <E extends PsiElement> void process(
         TokenSet filter,
-        final JSFile file,
-        final ArrayList<E> result,
-        final Collection<JSFile> visited
+        JSFile file,
+        ArrayList<E> result,
+        Collection<JSFile> visited
     ) {
         if (visited.contains(file)) {
             return;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
index 156381da..e934fa45 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
@@ -12,7 +12,7 @@
 
 /**
  * @author VISTALL
- * @since 11/12/2021
+ * @since 2021-12-11
  */
 public class JSClassExpressionImpl extends JSExpressionImpl implements JSClassExpression {
     public JSClassExpressionImpl(ASTNode node) {
@@ -24,16 +24,16 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
         visitor.visitJSExpression(this);
     }
 
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public JSClass getClassElement() {
         return findNotNullChildByClass(JSClass.class);
     }
 
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public JavaScriptType getType() {
         return new JavaScriptClassType(getClassElement());
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
index 96012d61..5d86428d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
@@ -16,41 +16,34 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import jakarta.annotation.Nonnull;
-
-import consulo.language.psi.PsiElement;
-import org.jetbrains.annotations.NonNls;
 import com.intellij.javascript.documentation.JSDocumentationUtils;
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import com.intellij.lang.javascript.psi.JSReferenceList;
-import consulo.javascript.impl.language.psi.JSStubElementType;
-import com.intellij.lang.javascript.psi.JSSuppressionHolder;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
-import consulo.language.psi.resolve.ResolveState;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.javascript.impl.language.psi.JSStubElementType;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.language.ast.ASTNode;
 import consulo.language.codeStyle.CodeStyleManager;
+import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.PsiScopeProcessor;
+import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptTokenSets;
+import jakarta.annotation.Nonnull;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public class JSClassImpl extends JSClassBase implements JSSuppressionHolder {
-    public JSClassImpl(final ASTNode node) {
+    public JSClassImpl(ASTNode node) {
         super(node);
     }
 
-    public JSClassImpl(final JSClassStub stub, JSStubElementType<JSClassStub, JSClass> elementType) {
+    public JSClassImpl(JSClassStub stub, JSStubElementType<JSClassStub, JSClass> elementType) {
         super(stub, elementType);
     }
 
@@ -69,7 +62,7 @@ public JSAttributeList getAttributeList() {
     @Override
     @RequiredReadAction
     public String getName() {
-        final JSClassStub classStub = getStub();
+        JSClassStub classStub = getStub();
         if (classStub != null) {
             return classStub.getName();
         }
@@ -85,14 +78,14 @@ else if (nameIdentifier != null) {
     }
 
     @Override
-    @RequiredReadAction
-    public PsiElement setName(@NonNls @Nonnull String newName) throws IncorrectOperationException {
+    @RequiredWriteAction
+    public PsiElement setName(@Nonnull String newName) throws IncorrectOperationException {
         newName = newName.substring(newName.lastIndexOf('.') + 1);
-        final String oldName = getName();
+        String oldName = getName();
         if (newName.equals(oldName)) {
             return this;
         }
-        final JSFunction constructor = findFunctionByName(oldName);
+        JSFunction constructor = findFunctionByName(oldName);
 
         PsiElement nameIdentifier = getNameIdentifier();
         assert nameIdentifier != null;
@@ -124,55 +117,43 @@ public JSReferenceList getImplementsList() {
     }
 
     @Override
-    public
-    @NonNls
-    String getQualifiedName() {
-        final JSClassStub classStub = getStub();
-        if (classStub != null) {
-            return classStub.getQualifiedName();
-        }
-        return JSPsiImplUtils.getQName(this);
+    @RequiredReadAction
+    public String getQualifiedName() {
+        JSClassStub classStub = getStub();
+        return classStub != null ? classStub.getQualifiedName() : JSPsiImplUtils.getQName(this);
     }
 
     @Override
+    @RequiredReadAction
     public boolean isInterface() {
-        final JSClassStub classStub = getStub();
-        if (classStub != null) {
-            return classStub.isInterface();
-        }
-        return getNode().findChildByType(JSTokenTypes.INTERFACE_KEYWORD) != null;
+        JSClassStub classStub = getStub();
+        return classStub != null ? classStub.isInterface() : getNode().findChildByType(JSTokenTypes.INTERFACE_KEYWORD) != null;
     }
 
     @Override
+    @RequiredWriteAction
     public void delete() throws IncorrectOperationException {
         getNode().getTreeParent().removeChild(getNode());
     }
 
     @Override
     public boolean isDeprecated() {
-        final JSClassStub stub = getStub();
-        if (stub != null) {
-            return stub.isDeprecated();
-        }
-        return JSDocumentationUtils.calculateDeprecated(this);
+        JSClassStub stub = getStub();
+        return stub != null ? stub.isDeprecated() : JSDocumentationUtils.calculateDeprecated(this);
     }
 
     @Override
-    protected boolean processMembers(
-        final PsiScopeProcessor processor,
-        final ResolveState substitutor,
-        final PsiElement lastParent,
-        final PsiElement place
-    ) {
+    protected boolean processMembers(PsiScopeProcessor processor, ResolveState substitutor, PsiElement lastParent, PsiElement place) {
         return JSResolveUtil.processDeclarationsInScope(this, processor, substitutor, lastParent, place);
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull final PsiScopeProcessor processor,
-        @Nonnull final ResolveState substitutor,
-        final PsiElement lastParent,
-        @Nonnull final PsiElement place
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState substitutor,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
     ) {
         boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
 
@@ -183,7 +164,8 @@ public boolean processDeclarations(
     }
 
     @Override
-    public PsiElement addAfter(@Nonnull final PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    @RequiredWriteAction
+    public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (anchor == null) {
             ASTNode node = getNode().findChildByType(JSTokenTypes.RBRACE);
             if (node != null) {
@@ -193,19 +175,21 @@ public PsiElement addAfter(@Nonnull final PsiElement element, PsiElement anchor)
             }
         }
 
-        final PsiElement psiElement = super.addAfter(element, anchor);
+        PsiElement psiElement = super.addAfter(element, anchor);
         CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), psiElement.getNode());
         return psiElement;
     }
 
     @Override
-    public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException {
-        final PsiElement superElement = super.addBefore(element, anchor);
+    @RequiredWriteAction
+    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        PsiElement superElement = super.addBefore(element, anchor);
         CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), superElement.getNode());
         return superElement;
     }
 
     @Override
+    @RequiredReadAction
     public boolean isEquivalentTo(PsiElement another) {
         return super.isEquivalentTo(another)
             || (another instanceof JSFile file
@@ -214,7 +198,9 @@ public boolean isEquivalentTo(PsiElement another) {
             || JSPsiImplUtils.isTheSameClass(another, this);
     }
 
+    @Nonnull
     @Override
+    @RequiredReadAction
     public PsiElement getNavigationElement() {
         return JSPsiImplUtils.findTopLevelNavigatableElement(this);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
index cf2d32f2..cfd6fd3c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
@@ -22,14 +22,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:41:42 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSCommaExpressionImpl extends JSBinaryExpressionImpl implements JSCommaExpression {
-    public JSCommaExpressionImpl(final ASTNode node) {
+    public JSCommaExpressionImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
index 9ed843b9..aba3db4e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -27,22 +28,20 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:47:35 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSConditionalExpressionImpl extends JSExpressionImpl implements JSConditionalExpression {
-    public JSConditionalExpressionImpl(final ASTNode node) {
+    public JSConditionalExpressionImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getCondition() {
         ASTNode child = getNode().getFirstChildNode();
         while (child != null) {
-            final IElementType type = child.getElementType();
+            IElementType type = child.getElementType();
             if (type == JSTokenTypes.QUEST) {
                 return null;
             }
@@ -55,11 +54,12 @@ public JSExpression getCondition() {
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getThen() {
         boolean questPassed = false;
         ASTNode child = getNode().getFirstChildNode();
         while (child != null) {
-            final IElementType type = child.getElementType();
+            IElementType type = child.getElementType();
             if (type == JSTokenTypes.QUEST) {
                 questPassed = true;
             }
@@ -76,12 +76,13 @@ public JSExpression getThen() {
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getElse() {
         boolean questPassed = false;
         boolean colonPassed = false;
         ASTNode child = getNode().getFirstChildNode();
         while (child != null) {
-            final IElementType type = child.getElementType();
+            IElementType type = child.getElementType();
             if (type == JSTokenTypes.QUEST) {
                 questPassed = true;
             }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
index 5c73e04a..72e9f1da 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
@@ -17,24 +17,23 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.util.PsiTreeUtil;
 
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:52:04 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSContinueStatementImpl extends JSStatementWithLabelReferenceImpl implements JSContinueStatement {
-    public JSContinueStatementImpl(final ASTNode node) {
+    public JSContinueStatementImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public JSStatement getStatementToContinue() {
         String label = getLabel();
         if (label == null) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
index 5b221561..1ad69372 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
@@ -17,6 +17,8 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.resolve.PsiScopeProcessor;
@@ -26,14 +28,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: maxim.mossienko
- * Date: Dec 14, 2005
- * Time: 6:40:04 PM
- * To change this template use File | Settings | File Templates.
+ * @author maxim.mossienko
+ * @since 2005-12-14
  */
 public class JSDefinitionExpressionImpl extends JSExpressionImpl implements JSDefinitionExpression {
-    public JSDefinitionExpressionImpl(final ASTNode node) {
+    public JSDefinitionExpressionImpl(ASTNode node) {
         super(node);
     }
 
@@ -43,6 +42,7 @@ public JSExpression getExpression() {
     }
 
     @Override
+    @RequiredReadAction
     public String getName() {
         return getExpression() instanceof JSReferenceExpression referenceExpression
             ? referenceExpression.getReferencedName()
@@ -50,6 +50,7 @@ public String getName() {
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
         return getExpression() instanceof JSReferenceExpressionImpl referenceExpression
             ? referenceExpression.handleElementRenameInternal(name)
@@ -68,27 +69,26 @@ public boolean processDeclarations(
         PsiElement lastParent,
         @Nonnull PsiElement place
     ) {
-        return lastParent == null ? processor.execute(this, state) : true;
+        return lastParent != null || processor.execute(this, state);
     }
 
     @Override
+    @RequiredWriteAction
     public void delete() throws IncorrectOperationException {
-        final PsiElement parent = getParent();
+        if (getParent() instanceof JSAssignmentExpression assignment) {
+            PsiElement assignmentParent = assignment.getParent();
 
-        if (parent instanceof JSAssignmentExpression assignment) {
-            final PsiElement grandParent = parent.getParent();
-
-            if (grandParent instanceof JSStatement) {
-                grandParent.delete();
+            if (assignmentParent instanceof JSStatement statement) {
+                statement.delete();
                 return;
             }
-            else if (grandParent instanceof JSBinaryExpression binaryExpression) {
+            else if (assignmentParent instanceof JSBinaryExpression binaryExpression) {
                 binaryExpression.getROperand().replace(assignment.getROperand());
                 return;
             }
-            else if (grandParent instanceof JSVariable variable) {
-                final JSExpression initializerExpression = variable.getInitializer();
-                initializerExpression.replace(assignment.getROperand());
+            else if (assignmentParent instanceof JSVariable variable) {
+                JSExpression initializer = variable.getInitializer();
+                initializer.replace(assignment.getROperand());
                 return;
             }
         }
@@ -96,6 +96,7 @@ else if (grandParent instanceof JSVariable variable) {
     }
 
     @Override
+    @RequiredReadAction
     public PsiElement getNameIdentifier() {
         return null;
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
index ba80efb1..e1bbd0a5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
@@ -20,18 +20,16 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 10:15:13 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSDoWhileStatementImpl extends JSStatementImpl implements JSDoWhileStatement {
-    public JSDoWhileStatementImpl(final ASTNode node) {
+    public JSDoWhileStatementImpl(ASTNode node) {
         super(node);
     }
 
@@ -41,6 +39,7 @@ public JSExpression getCondition() {
     }
 
     @Override
+    @RequiredReadAction
     public JSStatement getBody() {
         return findChildByClass(JSStatement.class);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
index 50aa04f7..865d2b80 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
@@ -20,17 +20,18 @@
 import com.intellij.lang.javascript.psi.JSDocComment;
 import com.intellij.lang.javascript.psi.JSDocTag;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.IElementType;
-import consulo.language.psi.PsiElement;
 import consulo.language.ast.ASTNode;
 import jakarta.annotation.Nonnull;
 
 public class JSDocCommentImpl extends JSElementImpl implements JSDocComment {
-    public JSDocCommentImpl(final ASTNode node) {
+    public JSDocCommentImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public IElementType getTokenType() {
         return getNode().getElementType();
     }
@@ -41,11 +42,10 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public JSDocTag[] getTags() {
-        final PsiElement firstChild = getFirstChild();
-        if (firstChild instanceof JSDocComment docComment) {
-            return docComment.getTags();
-        }
-        return findChildrenByType(JSDocTokenTypes.DOC_TAG, JSDocTag.class);
+        return getFirstChild() instanceof JSDocComment docComment
+            ? docComment.getTags()
+            : findChildrenByType(JSDocTokenTypes.DOC_TAG, JSDocTag.class);
     }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index e4570ed9..44acae55 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -19,6 +19,8 @@
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSLookupUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
@@ -29,24 +31,25 @@
 import consulo.localize.LocalizeValue;
 import consulo.util.collection.ArrayUtil;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 public class JSDocTagImpl extends JSElementImpl implements JSDocTag {
     private volatile PsiReference[] myRefs;
     private volatile long myModificationCount = -1;
 
-    public JSDocTagImpl(final ASTNode node) {
+    public JSDocTagImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public String getName() {
-        final PsiElement element = findChildByType(JSDocTokenTypes.DOC_TAG_NAME);
+        PsiElement element = findChildByType(JSDocTokenTypes.DOC_TAG_NAME);
         return element != null ? element.getText().substring(1) : null;
     }
 
     @Override
-    public PsiElement setName(@NonNls @Nonnull final String name) throws IncorrectOperationException {
+    @RequiredWriteAction
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
         throw new IncorrectOperationException();
     }
 
@@ -62,15 +65,16 @@ public JSDocTagValue getValue() {
 
     @Nonnull
     @Override
+    @RequiredReadAction
     public PsiReference[] getReferences() {
-        final long count = getManager().getModificationTracker().getModificationCount();
+        long count = getManager().getModificationTracker().getModificationCount();
 
         if (count != myModificationCount) {
-            final @NonNls String name = getName();
+            String name = getName();
             PsiReference[] result = PsiReference.EMPTY_ARRAY;
 
             if ("param".equals(name)) {
-                final PsiElement data = findChildByType(JSDocTokenTypes.DOC_COMMENT_DATA);
+                PsiElement data = findChildByType(JSDocTokenTypes.DOC_COMMENT_DATA);
                 if (data != null) {
                     result = new PsiReference[]{new ParamReference(this)};
                 }
@@ -87,18 +91,18 @@ private static class ParamReference implements PsiReference, EmptyResolveMessage
         private PsiElement myJsDocTagValue;
         private TextRange myRange;
 
-        public ParamReference(final JSDocTagImpl elt) {
+        public ParamReference(JSDocTagImpl elt) {
             reset(elt);
         }
 
-        private void reset(final JSDocTagImpl elt) {
+        private void reset(JSDocTagImpl elt) {
             myJsDocTagValue = elt.findChildByType(JSDocTokenTypes.DOC_COMMENT_DATA);
             int offsetInParent = myJsDocTagValue.getStartOffsetInParent();
             int textLength;
 
             if (myJsDocTagValue.textContains('[')) {
-                final String text = myJsDocTagValue.getText();
-                final int at = text.indexOf('[');
+                String text = myJsDocTagValue.getText();
+                int at = text.indexOf('[');
                 offsetInParent += at + 1;
 
                 // @param [name] | //@param[name="something"] | [obj.prop2(='somestring')?]
@@ -122,52 +126,59 @@ private void reset(final JSDocTagImpl elt) {
             else if (myJsDocTagValue.textContains('=')) {
                 textLength = myJsDocTagValue.getText().indexOf('='); // @param name=""
             }
+            else if (myJsDocTagValue.textContains('.')) { //@param userInfo.email
+                textLength = myJsDocTagValue.getText().indexOf('.');
+            }
             else {
-                if (myJsDocTagValue.textContains('.')) { //@param userInfo.email
-                    textLength = myJsDocTagValue.getText().indexOf('.');
-                }
-                else {
-                    textLength = myJsDocTagValue.getTextLength();
-                }
+                textLength = myJsDocTagValue.getTextLength();
             }
             myRange = new TextRange(offsetInParent, offsetInParent + textLength);
         }
 
         @Override
+        @RequiredReadAction
         public PsiElement getElement() {
             return myJsDocTagValue.getParent();
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public TextRange getRangeInElement() {
             return myRange;
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public String getCanonicalText() {
-            final int offsetInText = myRange.getStartOffset() - myJsDocTagValue.getStartOffsetInParent();
+            int offsetInText = myRange.getStartOffset() - myJsDocTagValue.getStartOffsetInParent();
             return myJsDocTagValue.getText().substring(offsetInText, offsetInText + myRange.getLength());
         }
 
         @Override
-        public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException {
+        @RequiredWriteAction
+        public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
             JSDocTag jsDocTag = (JSDocTag)myJsDocTagValue.getParent();
-            final ElementManipulator<JSDocTag> manipulator = ElementManipulators.getManipulator(jsDocTag);
+            ElementManipulator<JSDocTag> manipulator = ElementManipulators.getManipulator(jsDocTag);
             jsDocTag = manipulator.handleContentChange(jsDocTag, myRange, newElementName);
             reset((JSDocTagImpl)jsDocTag);
             return myJsDocTagValue;
         }
 
         @Override
-        public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException {
+        @RequiredWriteAction
+        public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
             return null;
         }
 
         @Override
-        public boolean isReferenceTo(final PsiElement element) {
+        @RequiredReadAction
+        public boolean isReferenceTo(PsiElement element) {
             return element.isEquivalentTo(resolve());
         }
 
+        @RequiredReadAction
         private static JSParameterList findParameterList(PsiElement elt) {
             if (elt == null) {
                 return null;
@@ -176,33 +187,31 @@ private static JSParameterList findParameterList(PsiElement elt) {
             if (psiComment == null) {
                 return null;
             }
-            final PsiElement parent = psiComment.getParent();
-            if (parent instanceof PsiComment) {
-                psiComment = (PsiComment)parent;
+            PsiElement parent = psiComment.getParent();
+            if (parent instanceof PsiComment comment) {
+                psiComment = comment;
             }
 
             PsiElement next = psiComment.getNextSibling();
-            if (next instanceof PsiWhiteSpace) {
-                next = next.getNextSibling();
+            if (next instanceof PsiWhiteSpace whiteSpace) {
+                next = whiteSpace.getNextSibling();
             }
-            if (next instanceof PsiComment) {
-                next = next.getNextSibling();
-                if (next instanceof PsiWhiteSpace) {
-                    next = next.getNextSibling();
+            if (next instanceof PsiComment comment) {
+                next = comment.getNextSibling();
+                if (next instanceof PsiWhiteSpace whiteSpace) {
+                    next = whiteSpace.getNextSibling();
                 }
             }
 
             if (next instanceof JSExpressionStatement expressionStatement) {
-                final JSExpression expression = expressionStatement.getExpression();
-
-                if (expression instanceof JSAssignmentExpression assignment) {
+                if (expressionStatement.getExpression() instanceof JSAssignmentExpression assignment) {
                     JSExpression roperand = assignment.getROperand();
                     if (roperand instanceof JSNewExpression newExpression) {
                         roperand = newExpression.getMethodExpression();
                     }
 
-                    if (roperand instanceof JSFunctionExpression) {
-                        next = roperand;
+                    if (roperand instanceof JSFunctionExpression functionExpr) {
+                        next = functionExpr;
                     }
                 }
             }
@@ -211,23 +220,16 @@ else if (next instanceof JSProperty property) {
             }
             else if (next instanceof JSVarStatement varStatement) {
                 JSVariable[] variables = varStatement.getVariables();
-                if (variables.length > 0) {
-                    JSExpression initializer = variables[0].getInitializer();
-                    if (initializer instanceof JSFunctionExpression) {
-                        next = initializer;
-                    }
+                if (variables.length > 0 && variables[0].getInitializer() instanceof JSFunctionExpression functionExpr) {
+                    next = functionExpr;
                 }
             }
             else if (next != null) {
-                if (next instanceof JSVariable variable) {
-                    JSExpression expression = variable.getInitializer();
-                    if (expression instanceof JSFunctionExpression) {
-                        next = expression;
-                    }
+                if (next instanceof JSVariable variable && variable.getInitializer() instanceof JSFunctionExpression functionExpr) {
+                    next = functionExpr;
                 }
-                PsiElement nextParent = next.getParent();
-                if (nextParent instanceof JSFunction) {
-                    next = nextParent;
+                if (next.getParent() instanceof JSFunction function) {
+                    next = function;
                 }
             }
             if (next instanceof JSFunction function) {
@@ -238,11 +240,12 @@ else if (next != null) {
         }
 
         @Override
+        @RequiredReadAction
         public PsiElement resolve() {
-            final JSParameterList parameterList = findParameterList(getElement());
+            JSParameterList parameterList = findParameterList(getElement());
 
             if (parameterList != null) {
-                final String name = getCanonicalText();
+                String name = getCanonicalText();
                 for (JSParameter param : parameterList.getParameters()) {
                     if (name.equals(param.getName())) {
                         return param;
@@ -253,14 +256,16 @@ public PsiElement resolve() {
             return null;
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public Object[] getVariants() {
-            final PsiElement elt = getElement();
-            final JSParameterList parameterList = findParameterList(PsiUtilBase.getOriginalElement(elt, elt.getClass()));
+            PsiElement elt = getElement();
+            JSParameterList parameterList = findParameterList(PsiUtilBase.getOriginalElement(elt, elt.getClass()));
 
             if (parameterList != null) {
-                final JSParameter[] parameters = parameterList.getParameters();
-                final Object[] result = new Object[parameters.length];
+                JSParameter[] parameters = parameterList.getParameters();
+                Object[] result = new Object[parameters.length];
 
                 for (int i = 0; i < parameters.length; ++i) {
                     result[i] = JSLookupUtil.createLookupItem(parameters[i], parameters[i].getName(), JSLookupUtil.LookupPriority.HIGHEST);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
index b8059ac3..23eae001 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
@@ -19,34 +19,34 @@
 import com.intellij.lang.javascript.psi.JSDocTagValue;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.PsiReference;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.text.StringTokenizer;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 public class JSDocTagValueImpl extends JSElementImpl implements JSDocTagValue {
     private volatile PsiReference[] myRefs;
     private volatile long myModificationCount = -1;
 
-    public JSDocTagValueImpl(final ASTNode node) {
+    public JSDocTagValueImpl(ASTNode node) {
         super(node);
     }
 
     @Nonnull
     @Override
+    @RequiredReadAction
     public PsiReference[] getReferences() {
-        final long count = getManager().getModificationTracker().getModificationCount();
+        long count = getManager().getModificationTracker().getModificationCount();
 
         if (count != myModificationCount) {
-            final @NonNls String name = ((PsiNamedElement)getParent()).getName();
+            String name = ((PsiNamedElement)getParent()).getName();
             PsiReference[] result = PsiReference.EMPTY_ARRAY;
 
             if (name != null) {
-                @NonNls String text = getText();
+                String text = getText();
 
                 boolean soft = false;
 
@@ -81,9 +81,9 @@ else if ("returns".equals(name)) {
                     text = text.substring(0, text.length() - 1);
                 }
 
-                final StringTokenizer tokenizer = new StringTokenizer(text, JSResolveUtil.COMMENT_DELIMITERS);
+                StringTokenizer tokenizer = new StringTokenizer(text, JSResolveUtil.COMMENT_DELIMITERS);
                 while (tokenizer.hasMoreElements()) {
-                    @NonNls String textFragment = tokenizer.nextElement();
+                    String textFragment = tokenizer.nextElement();
                     int localOffset = offset + tokenizer.getCurrentPosition() - textFragment.length();
                     if (textFragment.endsWith("[]")) {
                         textFragment = textFragment.substring(0, textFragment.length() - 2);
@@ -94,7 +94,7 @@ else if ("returns".equals(name)) {
                     }
 
                     if (!"void".equals(textFragment)) {
-                        final JSReferenceSet set =
+                        JSReferenceSet set =
                             new JSReferenceSet(this, textFragment, localOffset, soft, false, false);
                         result = ArrayUtil.mergeArrays(result, set.getReferences(), PsiReference.ARRAY_FACTORY);
                     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
index bc1df5a3..b12fe804 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSElementImpl.java
@@ -21,10 +21,10 @@
 
 /**
  * @author max
- * @since Jan 30, 2005 8:23:10 PM
+ * @since 2005-01-30
  */
 public abstract class JSElementImpl extends JSStubElementImpl<StubElement> {
-    public JSElementImpl(final ASTNode node) {
+    public JSElementImpl(ASTNode node) {
         super(node);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
index b93ba72a..75f03772 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
@@ -19,6 +19,8 @@
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
@@ -32,14 +34,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 31, 2005
- * Time: 12:02:38 AM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-31
  */
 public class JSEmbeddedContentImpl extends JSElementImpl implements XmlTagChild {
-    public JSEmbeddedContentImpl(final ASTNode node) {
+    public JSEmbeddedContentImpl(ASTNode node) {
         super(node);
     }
 
@@ -50,19 +49,21 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
 
     @Override
     public XmlTag getParentTag() {
-        final PsiElement parent = getParent();
+        PsiElement parent = getParent();
         return parent instanceof XmlTag parentTag ? parentTag : null;
     }
 
     @Override
+    @RequiredReadAction
     public XmlTagChild getNextSiblingInTag() {
         PsiElement nextSibling = getNextSibling();
         return nextSibling instanceof XmlTagChild tagChild ? tagChild : null;
     }
 
     @Override
+    @RequiredReadAction
     public XmlTagChild getPrevSiblingInTag() {
-        final PsiElement prevSibling = getPrevSibling();
+        PsiElement prevSibling = getPrevSibling();
         return prevSibling instanceof XmlTagChild tagChild ? tagChild : null;
     }
 
@@ -83,9 +84,10 @@ public boolean processDeclarations(
     }
 
     @Override
+    @RequiredReadAction
     public String toString() {
         String s = super.toString();
-        final IElementType type = getNode().getElementType();
+        IElementType type = getNode().getElementType();
         if (type != JSElementTypes.EMBEDDED_CONTENT) {
             s += ":" + type;
         }
@@ -93,8 +95,9 @@ public String toString() {
     }
 
     @Override
+    @RequiredWriteAction
     public void delete() throws IncorrectOperationException {
-        final ASTNode astNode = getNode();
+        ASTNode astNode = getNode();
         astNode.getTreeParent().removeChild(astNode);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
index a0685b35..3e1691b4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
@@ -22,14 +22,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:48:05 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSEmptyStatementImpl extends JSStatementImpl implements JSEmptyStatement {
-    public JSEmptyStatementImpl(final ASTNode node) {
+    public JSEmptyStatementImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
index 849c3d82..d6b753f1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.lang.javascript.psi.JSExpressionCodeFragment;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.file.FileTypeManager;
 import consulo.language.file.FileViewProvider;
 import consulo.language.file.light.LightVirtualFile;
@@ -49,8 +50,9 @@ public JSExpressionCodeFragmentImpl(Project project, @NonNls String name, CharSe
 
     //todo[nik] extract these methods from PsiCodeFragmentImpl?
     @Override
+    @RequiredReadAction
     protected JSExpressionCodeFragmentImpl clone() {
-        final JSExpressionCodeFragmentImpl clone = (JSExpressionCodeFragmentImpl)cloneImpl((FileElement)calcTreeElement().clone());
+        JSExpressionCodeFragmentImpl clone = (JSExpressionCodeFragmentImpl)cloneImpl((FileElement)calcTreeElement().clone());
         clone.myPhysical = false;
         clone.myOriginalFile = this;
         SingleRootFileViewProvider cloneViewProvider =
@@ -73,10 +75,7 @@ public FileViewProvider getViewProvider() {
 
     @Override
     public boolean isValid() {
-		if (!super.isValid() || myContext != null && !myContext.isValid()) {
-            return false;
-		}
-        return true;
+        return super.isValid() && myContext == null || myContext.isValid();
     }
 
     @Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
index 733a59da..4f50f921 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
@@ -18,6 +18,7 @@
 
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.ast.ASTNode;
 import jakarta.annotation.Nonnull;
@@ -26,18 +27,20 @@
  * @author ven
  */
 public abstract class JSExpressionImpl extends JSElementImpl implements JSExpression {
-    public JSExpressionImpl(final ASTNode node) {
+    public JSExpressionImpl(ASTNode node) {
         super(node);
     }
 
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public JavaScriptType getType() {
         return JavaScriptType.UNKNOWN;
     }
 
+    @Nonnull
     @Override
+    @RequiredWriteAction
     public JSExpression replace(JSExpression newExpr) {
         return JSChangeUtil.replaceExpression(this, newExpr);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index 54af43bc..28125ffd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -31,14 +31,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:26:39 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSExpressionStatementImpl extends JSStatementImpl implements JSExpressionStatement {
-    public JSExpressionStatementImpl(final ASTNode node) {
+    public JSExpressionStatementImpl(ASTNode node) {
         super(node);
     }
 
@@ -54,14 +51,15 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
         @Nonnull PsiScopeProcessor processor,
-		@Nonnull ResolveState state,
-		PsiElement lastParent,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
         @Nonnull PsiElement place
     ) {
         if (lastParent == null) {
-            final JSExpression expression = getExpression();
+            JSExpression expression = getExpression();
             if (expression != null) {
                 return expression.processDeclarations(processor, state, lastParent, place);
             }
@@ -74,6 +72,7 @@ public boolean processDeclarations(
     public ItemPresentation getPresentation() {
         return new ItemPresentation() {
             @Override
+            @RequiredReadAction
             public String getPresentableText() {
                 return getText();
             }
@@ -84,6 +83,7 @@ public String getLocationString() {
             }
 
             @Override
+            @RequiredReadAction
             public Image getIcon() {
                 return IconDescriptorUpdaters.getIcon(JSExpressionStatementImpl.this, 0);
             }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
index 36890bcd..92837d37 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
@@ -18,6 +18,7 @@
 
 import java.util.List;
 
+import consulo.annotation.access.RequiredReadAction;
 import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSElementTypes;
@@ -40,11 +41,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 28, 2005
- * Time: 12:25:04 AM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-28
  */
 public class JSFileImpl extends PsiFileBase implements JSFile {
     public JSFileImpl(FileViewProvider fileViewProvider) {
@@ -52,14 +50,16 @@ public JSFileImpl(FileViewProvider fileViewProvider) {
     }
 
     @Override
+    @RequiredReadAction
     public String toString() {
         return "JSFile:" + getName();
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull final PsiScopeProcessor processor,
-        @Nonnull final ResolveState state,
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
         @Nullable PsiElement lastParent,
         @Nonnull PsiElement place
     ) {
@@ -74,9 +74,9 @@ public boolean processDeclarations(
                     result = JSImportHandlingUtil.tryResolveImports(processor, this, place);
                 }
 
-                if (result &&
-                    JSResolveUtil.isNewResolveAndCompletion(this) &&
-                    (JSResolveUtil.shouldProcessImports(place, processor))) {
+                if (result
+                    && JSResolveUtil.isNewResolveAndCompletion(this)
+                    && JSResolveUtil.shouldProcessImports(place, processor)) {
                     result = JSResolveUtil.processGlobalThings(processor, state, place, this);
                 }
             }
@@ -143,14 +143,15 @@ public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationExce
     }
 
     @Override
-    public StubBasedPsiElement findStubbedElementAtOffset(final int offset, final Class<? extends StubBasedPsiElement> clazz) {
-        final StubElement stub = getStub();
+    @RequiredReadAction
+    public StubBasedPsiElement findStubbedElementAtOffset(int offset, Class<? extends StubBasedPsiElement> clazz) {
+        StubElement stub = getStub();
 
         if (stub != null) {
-            final List<StubElement> children = stub.getChildrenStubs();
+            List<StubElement> children = stub.getChildrenStubs();
 
             for (StubElement child : children) {
-                final PsiElement psi = child.getPsi();
+                PsiElement psi = child.getPsi();
 
                 if (psi.getTextRange().getStartOffset() == offset && clazz.isInstance(psi)) {
                     return (StubBasedPsiElement)psi;
@@ -162,7 +163,7 @@ public StubBasedPsiElement findStubbedElementAtOffset(final int offset, final Cl
 
     @Override
     public JSSourceElement[] getStatements() {
-        final StubElement stub = getStub();
+        StubElement stub = getStub();
         if (stub != null) {
             return (JSSourceElement[])stub.getChildrenByType(JSElementTypes.SOURCE_ELEMENTS, JSSourceElement.EMPTY_ARRAY);
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
index b3cb69b1..809fcb4f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
@@ -28,15 +28,13 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:20:30 PM
+ * @author max
+ * @since 2005-01-30
  */
 public class JSForInStatementImpl extends JSStatementImpl implements JSForInStatement {
-    private static final TokenSet ourSeparatorElementType = TokenSet.create(JSTokenTypes.IN_KEYWORD, JSTokenTypes.OF_KEYWORD);
+    private static final TokenSet SEPARATOR_ELEMENT_TYPE = TokenSet.create(JSTokenTypes.IN_KEYWORD, JSTokenTypes.OF_KEYWORD);
 
-    public JSForInStatementImpl(final ASTNode node) {
+    public JSForInStatementImpl(ASTNode node) {
         super(node);
     }
 
@@ -46,14 +44,15 @@ public JSVarStatement getDeclarationStatement() {
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getVariableExpression() {
         ASTNode child = getNode().getFirstChildNode();
         while (child != null) {
-            if (ourSeparatorElementType.contains(child.getElementType())) {
+            if (SEPARATOR_ELEMENT_TYPE.contains(child.getElementType())) {
                 return null;
             }
-            if (child.getPsi() instanceof JSExpression) {
-                return (JSExpression)child.getPsi();
+            if (child.getPsi() instanceof JSExpression expression) {
+                return expression;
             }
             child = child.getTreeNext();
         }
@@ -61,15 +60,16 @@ public JSExpression getVariableExpression() {
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getCollectionExpression() {
         ASTNode child = getNode().getFirstChildNode();
         boolean inPassed = false;
         while (child != null) {
-            if (ourSeparatorElementType.contains(child.getElementType())) {
+            if (SEPARATOR_ELEMENT_TYPE.contains(child.getElementType())) {
                 inPassed = true;
             }
-            if (inPassed && child.getPsi() instanceof JSExpression) {
-                return (JSExpression)child.getPsi();
+            if (inPassed && child.getPsi() instanceof JSExpression expression) {
+                return expression;
             }
             child = child.getTreeNext();
         }
@@ -84,6 +84,7 @@ public boolean isForEach() {
     }
 
     @Override
+    @RequiredReadAction
     public JSStatement getBody() {
         ASTNode child = getNode().getFirstChildNode();
         boolean passedRParen = false;
@@ -108,12 +109,12 @@ public boolean processDeclarations(
         @Nonnull PsiElement place
     ) {
         if (lastParent != null) {
-            final JSVarStatement statement = getDeclarationStatement();
+            JSVarStatement statement = getDeclarationStatement();
             if (statement != null) {
                 return statement.processDeclarations(processor, state, lastParent, place);
             }
             else {
-                final JSExpression expression = getVariableExpression();
+                JSExpression expression = getVariableExpression();
                 if (expression != null && !processor.execute(expression, null)) {
                     return false;
                 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
index b4aa54e0..09454ef8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -30,17 +31,19 @@
  * @author max
  */
 public class JSForStatementImpl extends JSStatementImpl implements JSForStatement {
-    public JSForStatementImpl(final ASTNode node) {
+    public JSForStatementImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public JSVarStatement getVarDeclaration() {
-        final ASTNode node = getNode().findChildByType(JSElementTypes.VAR_STATEMENT);
+        ASTNode node = getNode().findChildByType(JSElementTypes.VAR_STATEMENT);
         return (JSVarStatement)(node != null ? node.getPsi() : null);
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getInitialization() {
         ASTNode child = getNode().getFirstChildNode();
         while (child != null) {
@@ -56,6 +59,7 @@ public JSExpression getInitialization() {
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getCondition() {
         ASTNode child = getNode().getFirstChildNode();
         int semicolonCount = 0;
@@ -75,6 +79,7 @@ else if (semicolonCount == 1 && JSElementTypes.EXPRESSIONS.contains(child.getEle
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getUpdate() {
         ASTNode child = getNode().getFirstChildNode();
         int semicolonCount = 0;
@@ -91,6 +96,7 @@ else if (semicolonCount == 2 && JSElementTypes.EXPRESSIONS.contains(child.getEle
     }
 
     @Override
+    @RequiredReadAction
     public JSStatement getBody() {
         ASTNode child = getNode().getFirstChildNode();
         boolean passedRParen = false;
@@ -108,6 +114,7 @@ else if (passedRParen && child.getPsi() instanceof JSStatement statement) {
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
         @Nonnull PsiScopeProcessor processor,
         @Nonnull ResolveState state,
@@ -115,12 +122,12 @@ public boolean processDeclarations(
         @Nonnull PsiElement place
     ) {
         if (lastParent != null) {
-            final JSVarStatement statement = getVarDeclaration();
+            JSVarStatement statement = getVarDeclaration();
             if (statement != null) {
                 return statement.processDeclarations(processor, state, lastParent, place);
             }
             else {
-                final JSExpression initialization = getInitialization();
+                JSExpression initialization = getInitialization();
                 if (initialization != null) {
                     return initialization.processDeclarations(processor, state, null, place);
                 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index e6115231..6cf4fcb4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -23,6 +23,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSFunctionStub;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.resolve.PsiScopeProcessor;
@@ -38,20 +39,18 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 8:25:27 PM
+ * @author max
+ * @since 2005-01-30
  */
 abstract class JSFunctionBaseImpl<T extends JSFunctionStub, T2 extends JSFunction> extends JSStubElementImpl<T> implements JSFunction {
     private boolean referencesArgumentsCalculated;
     private boolean referencesArguments;
 
-    public JSFunctionBaseImpl(final ASTNode node) {
+    public JSFunctionBaseImpl(ASTNode node) {
         super(node);
     }
 
-    public JSFunctionBaseImpl(final T stub, IStubElementType type) {
+    public JSFunctionBaseImpl(T stub, IStubElementType type) {
         super(stub, type);
     }
 
@@ -69,8 +68,9 @@ public JSParameterList getParameterList() {
     }
 
     @Override
+    @RequiredReadAction
     public JSSourceElement[] getBody() {
-        final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
+        ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
         if (children.length == 0) {
             return JSSourceElement.EMPTY_ARRAY;
         }
@@ -88,8 +88,9 @@ public JavaScriptType getReturnType() {
     }
 
     @Override
+    @RequiredReadAction
     public String getReturnTypeString() {
-        final T stub = getStub();
+        T stub = getStub();
         if (stub != null) {
             return stub.getReturnTypeString();
         }
@@ -97,38 +98,36 @@ public String getReturnTypeString() {
     }
 
     @Override
+    @RequiredReadAction
     public JavaScriptTypeElement getReturnTypeElement() {
         return JSPsiImplUtils.findTypeElement(this);
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
-        final ASTNode newNameElement = createNameIdentifier(name);
-        final ASTNode nameIdentifier = getNameIdentifier().getNode();
+        ASTNode newNameElement = createNameIdentifier(name);
+        ASTNode nameIdentifier = getNameIdentifier().getNode();
         nameIdentifier.getTreeParent().replaceChild(nameIdentifier, newNameElement);
         return this;
     }
 
-    protected ASTNode createNameIdentifier(final String name) {
+    @RequiredReadAction
+    protected ASTNode createNameIdentifier(String name) {
         return JSChangeUtil.createExpressionFromText(getProject(), name).getNode();
     }
 
     @Override
     @RequiredReadAction
     public String getName() {
-        final JSFunctionStub stub = getStub();
+        JSFunctionStub stub = getStub();
         if (stub != null) {
             return stub.getName();
         }
-        final PsiElement name = getNameIdentifier();
+        PsiElement name = getNameIdentifier();
 
         if (name != null) {
-            if (name instanceof JSReferenceExpression) {
-                return ((JSReferenceExpression)name).getReferencedName();
-            }
-            else {
-                return name.getText();
-            }
+            return name instanceof JSReferenceExpression nameRefExpr ? nameRefExpr.getReferencedName() : name.getText();
         }
         return null;
     }
@@ -145,11 +144,12 @@ private static ASTNode advance(ASTNode astNode) {
     @RequiredReadAction
     @Override
     public int getTextOffset() {
-        final PsiElement name = getNameIdentifier();
+        PsiElement name = getNameIdentifier();
         return name != null ? name.getTextOffset() : super.getTextOffset();
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
         @Nonnull PsiScopeProcessor processor,
         @Nonnull ResolveState state,
@@ -164,7 +164,7 @@ public boolean processDeclarations(
                 }
             }
 
-            final JSParameter[] params = getParameterList().getParameters();
+            JSParameter[] params = getParameterList().getParameters();
             for (JSParameter param : params) {
                 if (!param.processDeclarations(processor, state, lastParent, place)) {
                     return false;
@@ -182,26 +182,25 @@ public boolean processDeclarations(
     }
 
     @Override
-    public PsiElement addBefore(@Nonnull final PsiElement element, final PsiElement anchor) throws IncorrectOperationException {
-        if (anchor == getFirstChild() && element instanceof JSAttributeList
+    @RequiredWriteAction
+    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+        if (anchor == getFirstChild() && element instanceof JSAttributeList attributeList
             && anchor.getNode().getElementType() == JSTokenTypes.FUNCTION_KEYWORD) {
-            return JSChangeUtil.doDoAddBefore(this, element, anchor);
+            return JSChangeUtil.doDoAddBefore(this, attributeList, anchor);
         }
         return super.addBefore(element, anchor);
     }
 
     @Override
     public boolean isDeprecated() {
-        final T stub = getStub();
-        if (stub != null) {
-            return stub.isDeprecated();
-        }
-        return JSDocumentationUtils.calculateDeprecated(this);
+        T stub = getStub();
+        return stub != null ? stub.isDeprecated() : JSDocumentationUtils.calculateDeprecated(this);
     }
 
     @Override
+    @RequiredReadAction
     public boolean isReferencesArguments() {
-        final T stub = getStub();
+        T stub = getStub();
         if (stub != null) {
             return stub.isReferencesArguments();
         }
@@ -211,7 +210,8 @@ public boolean isReferencesArguments() {
                 boolean continueVisiting = true;
 
                 @Override
-                public void visitJSReferenceExpression(final JSReferenceExpression node) {
+                @RequiredReadAction
+                public void visitJSReferenceExpression(JSReferenceExpression node) {
                     if (isInJS(node) && node.getQualifier() == null && "arguments".equals(node.getText())) {
                         referencesArguments = true;
                         continueVisiting = false;
@@ -221,7 +221,7 @@ public void visitJSReferenceExpression(final JSReferenceExpression node) {
                 }
 
                 @Override
-                public void visitJSElement(final JSElement node) {
+                public void visitJSElement(JSElement node) {
                     if (continueVisiting) {
                         node.acceptChildren(this);
                     }
@@ -234,8 +234,9 @@ public void visitJSElement(final JSElement node) {
         return referencesArguments;
     }
 
-    private static boolean isInJS(final JSReferenceExpression node) {
-        final PsiElement parent = node.getParent();
+    @RequiredReadAction
+    private static boolean isInJS(JSReferenceExpression node) {
+        PsiElement parent = node.getParent();
         return parent == null || parent.getLanguage() instanceof JavaScriptLanguage;
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index a83c668b..7d0e61f7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
@@ -29,18 +30,15 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:55:33 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSFunctionExpressionImpl extends JSFunctionBaseImpl<JSFunctionStub, JSFunctionExpression> implements JSFunctionExpression {
-    public JSFunctionExpressionImpl(final ASTNode node) {
+    public JSFunctionExpressionImpl(ASTNode node) {
         super(node);
     }
 
-    public JSFunctionExpressionImpl(final JSFunctionStub stub, IStubElementType type) {
+    public JSFunctionExpressionImpl(JSFunctionStub stub, IStubElementType type) {
         super(stub, type);
     }
 
@@ -50,18 +48,21 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
-    protected ASTNode createNameIdentifier(final String name) {
+    @RequiredReadAction
+    protected ASTNode createNameIdentifier(String name) {
         return JSChangeUtil.createNameIdentifier(getProject(), name);
     }
 
+    @Nonnull
     @Override
+    @RequiredWriteAction
     public JSExpression replace(JSExpression newExpr) {
         return JSChangeUtil.replaceExpression(this, newExpr);
     }
 
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public JavaScriptType getType() {
         return JavaScriptType.UNKNOWN;
     }
@@ -71,16 +72,16 @@ public JSAttributeList getAttributeList() {
         return null;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public int getTextOffset() {
-        final PsiElement name = getNameIdentifier();
+        PsiElement name = getNameIdentifier();
         return name != null ? name.getTextOffset() : super.getTextOffset();
     }
 
     @Override
     public void delete() throws IncorrectOperationException {
-        final PsiElement parent = getParent();
+        PsiElement parent = getParent();
         if (parent instanceof JSAssignmentExpression assignment) {
             assignment.getLOperand().delete();
             return;
@@ -88,25 +89,26 @@ public void delete() throws IncorrectOperationException {
         super.delete();
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public boolean isGetProperty() {
         return false;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public boolean isSetProperty() {
         return false;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public boolean isConstructor() {
         return false;
     }
 
     @Override
+    @RequiredReadAction
     public String getQualifiedName() {
         return getName();
     }
@@ -114,33 +116,33 @@ public String getQualifiedName() {
     @RequiredReadAction
     @Override
     public PsiElement getNameIdentifier() {
-        final ASTNode treeParent = getNode().getTreeParent();
+        ASTNode treeParent = getNode().getTreeParent();
         PsiElement psi = treeParent != null ? treeParent.getPsi() : null;
-        if (psi instanceof JSCallExpression) {
-            psi = psi.getParent();
+        if (psi instanceof JSCallExpression call) {
+            psi = call.getParent();
         }
         if (psi instanceof JSAssignmentExpression assignment) {
-            final JSExpression jsExpression = assignment.getLOperand();
-            final JSExpression lOperand = jsExpression instanceof JSDefinitionExpression definition ? definition.getExpression() : null;
+            JSExpression jsExpression = assignment.getLOperand();
+            JSExpression lOperand = jsExpression instanceof JSDefinitionExpression definition ? definition.getExpression() : null;
 
-            if (lOperand instanceof JSReferenceExpression) {
-                ASTNode childByType = lOperand.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
+            if (lOperand instanceof JSReferenceExpression refExpr) {
+                ASTNode childByType = refExpr.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
                 return childByType != null ? childByType.getPsi() : null;
             }
         }
-        else if (psi instanceof JSProperty) {
-            ASTNode childByType = psi.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
+        else if (psi instanceof JSProperty property) {
+            ASTNode childByType = property.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
             return childByType != null ? childByType.getPsi() : null;
         }
         else {
-            final PsiElement node = super.getNameIdentifier();
+            PsiElement node = super.getNameIdentifier();
 
             if (node != null) {
                 return node;
             }
 
-            if (psi instanceof JSVariable) {
-                ASTNode childByType = psi.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
+            if (psi instanceof JSVariable variable) {
+                ASTNode childByType = variable.getNode().findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET);
                 return childByType != null ? childByType.getPsi() : null;
             }
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
index 1e478b96..eed6ebbe 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.content.scope.SearchScope;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -32,48 +33,46 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 8:25:27 PM
+ * @author max
+ * @since 2005-01-30
  */
 public class JSFunctionImpl extends JSFunctionBaseImpl<JSFunctionStub, JSFunction> implements JSSuppressionHolder {
-    public JSFunctionImpl(final ASTNode node) {
+    public JSFunctionImpl(ASTNode node) {
         super(node);
     }
 
-    public JSFunctionImpl(final JSFunctionStub stub, IStubElementType type) {
+    public JSFunctionImpl(JSFunctionStub stub, IStubElementType type) {
         super(stub, type);
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public boolean isGetProperty() {
-        final JSFunctionStub stub = getStub();
+        JSFunctionStub stub = getStub();
         if (stub != null) {
             return stub.isGetProperty();
         }
         return findChildByType(JSTokenTypes.GET_KEYWORD) != null;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public boolean isSetProperty() {
-        final JSFunctionStub stub = getStub();
+        JSFunctionStub stub = getStub();
         if (stub != null) {
             return stub.isGetProperty();
         }
         return findChildByType(JSTokenTypes.SET_KEYWORD) != null;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public boolean isConstructor() {
-        final JSFunctionStub stub = getStub();
+        JSFunctionStub stub = getStub();
         if (stub != null) {
             return stub.isConstructor();
         }
-        final PsiElement parent = JSResolveUtil.findParent(this);
+        PsiElement parent = JSResolveUtil.findParent(this);
         return parent instanceof JSClass && Comparing.equal("constructor", getName(), true);
     }
 
@@ -88,17 +87,19 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredWriteAction
     public void delete() throws IncorrectOperationException {
         getNode().getTreeParent().removeChild(getNode());
     }
 
     @Override
+    @RequiredReadAction
     public String getQualifiedName() {
-        final JSFunctionStub jsFunctionStub = getStub();
+        JSFunctionStub jsFunctionStub = getStub();
         if (jsFunctionStub != null) {
             return jsFunctionStub.getQualifiedName();
         }
-        final PsiElement parent = JSResolveUtil.findParent(this);
+        PsiElement parent = JSResolveUtil.findParent(this);
 
         if (parent instanceof JSFile || parent instanceof JSPackageStatement) {
             return JSPsiImplUtils.getQName(this);
@@ -108,8 +109,9 @@ public String getQualifiedName() {
         }
     }
 
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public SearchScope getUseScope() {
         if (isConstructor()) {
             return super.getUseScope();
@@ -117,13 +119,14 @@ public SearchScope getUseScope() {
         return JSResolveUtil.findUseScope(this);
     }
 
+    @Nonnull
     @Override
+    @RequiredReadAction
     public PsiElement getNavigationElement() {
-        PsiElement parent = getParent();
-        if (parent instanceof JSClass) {
-            PsiElement parentOriginalElement = parent.getNavigationElement();
+        if (getParent() instanceof JSClass jsClass) {
+            PsiElement parentOriginalElement = jsClass.getNavigationElement();
 
-            if (parentOriginalElement != parent) {
+            if (parentOriginalElement != jsClass) {
                 JSFunction functionByNameAndKind = ((JSClass)parentOriginalElement).findFunctionByNameAndKind(getName(), getKind());
                 return functionByNameAndKind != null ? functionByNameAndKind : this;
             }
@@ -132,6 +135,7 @@ public PsiElement getNavigationElement() {
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
         String oldName = getName();
         PsiElement element = super.setName(name);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
index 800a8f87..988906f4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
@@ -16,7 +16,7 @@
 
 /**
  * @author VISTALL
- * @since 19/12/2021
+ * @since 2021-12-19
  */
 public class JSFunctionPropertyImpl extends JSPropertyImpl implements JSFunctionProperty {
     public JSFunctionPropertyImpl(ASTNode node) {
@@ -43,8 +43,9 @@ public JSParameterList getParameterList() {
     }
 
     @Override
+    @RequiredReadAction
     public JSSourceElement[] getBody() {
-        final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
+        ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
         if (children.length == 0) {
             return JSSourceElement.EMPTY_ARRAY;
         }
@@ -84,6 +85,7 @@ public JSAttributeList getAttributeList() {
     }
 
     @Override
+    @RequiredReadAction
     public String getQualifiedName() {
         return null;
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
index d51bccda..c398fb18 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
@@ -23,7 +23,7 @@
 import jakarta.annotation.Nonnull;
 
 public class JSGenericSignatureImpl extends JSElementImpl implements JSGenericSignature {
-    public JSGenericSignatureImpl(final ASTNode node) {
+    public JSGenericSignatureImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
index e7761c2c..dd465852 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -26,14 +27,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:49:01 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSIfStatementImpl extends JSStatementImpl implements JSIfStatement {
-    public JSIfStatementImpl(final ASTNode node) {
+    public JSIfStatementImpl(ASTNode node) {
         super(node);
     }
 
@@ -48,10 +46,11 @@ public JSStatement getThen() {
     }
 
     @Override
+    @RequiredReadAction
     public JSStatement getElse() {
-        final ASTNode myNode = getNode();
-        final ASTNode elseNode = myNode.findChildByType(JSTokenTypes.ELSE_KEYWORD);
-        final ASTNode node = elseNode != null ? myNode.findChildByType(JSElementTypes.STATEMENTS, elseNode) : null;
+        ASTNode myNode = getNode();
+        ASTNode elseNode = myNode.findChildByType(JSTokenTypes.ELSE_KEYWORD);
+        ASTNode node = elseNode != null ? myNode.findChildByType(JSElementTypes.STATEMENTS, elseNode) : null;
         return node != null ? (JSStatement)node.getPsi() : null;
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
index 7ee749ec..e0303e1a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -28,14 +29,14 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public class JSImportStatementImpl extends JSStubbedStatementImpl<JSImportStatementStub> implements JSImportStatement {
-    public JSImportStatementImpl(final ASTNode node) {
+    public JSImportStatementImpl(ASTNode node) {
         super(node);
     }
 
-    public JSImportStatementImpl(final JSImportStatementStub stub) {
+    public JSImportStatementImpl(JSImportStatementStub stub) {
         super(stub, JSElementTypes.ES4_IMPORT_STATEMENT);
     }
 
@@ -46,21 +47,22 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull final PsiScopeProcessor processor,
-        @Nonnull final ResolveState state,
-        final PsiElement lastParent,
-        @Nonnull final PsiElement place
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
     ) {
         return true;
     }
 
     @Override
+    @RequiredReadAction
     public String getImportText() {
-        final JSImportStatementStub stub = getStub();
+        JSImportStatementStub stub = getStub();
         if (stub != null) {
             return stub.getImportText();
         }
-        final ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
+        ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
         return node != null ? node.getText() : null;
     }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
index ea501190..ebbee666 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSIncludeDirective;
 import com.intellij.lang.javascript.psi.stubs.JSIncludeDirectiveStub;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.application.util.SystemInfo;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.language.ast.ASTNode;
@@ -31,14 +32,14 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public class JSIncludeDirectiveImpl extends JSStubbedStatementImpl<JSIncludeDirectiveStub> implements JSIncludeDirective {
-    public JSIncludeDirectiveImpl(final ASTNode node) {
+    public JSIncludeDirectiveImpl(ASTNode node) {
         super(node);
     }
 
-    public JSIncludeDirectiveImpl(final JSIncludeDirectiveStub stub) {
+    public JSIncludeDirectiveImpl(JSIncludeDirectiveStub stub) {
         super(stub, JSElementTypes.INCLUDE_DIRECTIVE);
     }
 
@@ -47,8 +48,9 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
         visitor.visitJSIncludeDirective(this);
     }
 
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public PsiReference[] getReferences() {
         ASTNode node = getIncludedFileNode();
 
@@ -64,28 +66,31 @@ public PsiReference[] getReferences() {
         return PsiReference.EMPTY_ARRAY;
     }
 
+    @RequiredReadAction
     private ASTNode getIncludedFileNode() {
         return getNode().findChildByType(JavaScriptTokenSets.STRING_LITERALS);
     }
 
     @Override
+    @RequiredReadAction
     public String getIncludeText() {
-        final JSIncludeDirectiveStub stub = getStub();
+        JSIncludeDirectiveStub stub = getStub();
         if (stub != null) {
             return stub.getIncludeText();
         }
-        final ASTNode astNode = getIncludedFileNode();
+        ASTNode astNode = getIncludedFileNode();
 
         return astNode != null ? StringUtil.stripQuotesAroundValue(astNode.getText()) : null;
     }
 
     @Override
+    @RequiredReadAction
     public PsiFile resolveFile() {
-        final String includeText = getIncludeText();
+        String includeText = getIncludeText();
         if (includeText == null) {
             return null;
         }
-        final FileReference[] references = new FileReferenceSet(
+        FileReference[] references = new FileReferenceSet(
             includeText,
             this,
             0,
@@ -94,6 +99,7 @@ public PsiFile resolveFile() {
         ).getAllReferences();
 
         return references != null && references.length > 0 && references[references.length - 1].resolve() instanceof PsiFile file
-            ? file : null;
+            ? file
+            : null;
     }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
index f7b95a9c..bbf2c2cd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -25,22 +26,20 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:59:36 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSIndexedPropertyAccessExpressionImpl extends JSExpressionImpl implements JSIndexedPropertyAccessExpression {
-    public JSIndexedPropertyAccessExpressionImpl(final ASTNode node) {
+    public JSIndexedPropertyAccessExpressionImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getQualifier() {
         ASTNode child = getNode().getFirstChildNode();
         while (child != null) {
-            final IElementType type = child.getElementType();
+            IElementType type = child.getElementType();
             if (type == JSTokenTypes.LBRACKET) {
                 return null;
             }
@@ -53,11 +52,12 @@ public JSExpression getQualifier() {
     }
 
     @Override
+    @RequiredReadAction
     public JSExpression getIndexExpression() {
         ASTNode child = getNode().getFirstChildNode();
         boolean bracketPassed = false;
         while (child != null) {
-            final IElementType type = child.getElementType();
+            IElementType type = child.getElementType();
             if (type == JSTokenTypes.LBRACKET) {
                 bracketPassed = true;
             }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
index c97380ef..3ebf274c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
@@ -21,6 +21,8 @@
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.util.IncorrectOperationException;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
@@ -28,23 +30,22 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:20:04 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSLabeledStatementImpl extends JSStatementImpl implements JSLabeledStatement, JSNamedElement {
-    public JSLabeledStatementImpl(final ASTNode node) {
+    public JSLabeledStatementImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public String getLabel() {
         return getNameIdentifier().getText();
     }
 
     @Override
+    @RequiredReadAction
     public PsiElement getLabelIdentifier() {
         return getNameIdentifier();
     }
@@ -69,17 +70,20 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public String getName() {
         return getLabel();
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
         JSChangeUtil.doIdentifierReplacement(this, getLabelIdentifier(), name);
         return this;
     }
 
     @Override
+    @RequiredReadAction
     public PsiElement getNameIdentifier() {
         return findChildByType(JSTokenTypes.IDENTIFIER);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
index a390a2b5..cf82c557 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
@@ -24,13 +24,11 @@
 
 /**
  * Created by IntelliJ IDEA.
- * User: maxim.mossienko
- * Date: Dec 14, 2005
- * Time: 6:40:04 PM
- * To change this template use File | Settings | File Templates.
+ * @author maxim.mossienko
+ * @since 2005-12-14
  */
 public class JSLetExpressionImpl extends JSExpressionImpl implements JSLetExpression {
-    public JSLetExpressionImpl(final ASTNode node) {
+    public JSLetExpressionImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
index 4e1f57a2..f111a911 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
@@ -28,7 +28,7 @@
  * @author maxim
  */
 public class JSLetStatementImpl extends JSStatementImpl implements JSLetStatement {
-    public JSLetStatementImpl(final ASTNode node) {
+    public JSLetStatementImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index f3e18e86..5f324282 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.language.psi.JavaScriptPrimitiveType;
 import consulo.javascript.language.psi.JavaScriptType;
@@ -34,13 +35,13 @@
 
 /**
  * @author max
- * @since 11:24:42 PM Jan 30, 2005
+ * @since 2005-01-30
  */
 public class JSLiteralExpressionImpl extends JSExpressionImpl implements JSSimpleLiteralExpression, PsiLanguageInjectionHost {
     private volatile JSReferenceSet myReferenceSet;
     private volatile long myModCount;
 
-    public JSLiteralExpressionImpl(final ASTNode node) {
+    public JSLiteralExpressionImpl(ASTNode node) {
         super(node);
     }
 
@@ -76,8 +77,9 @@ else if (JavaScriptTokenSets.STRING_LITERALS.contains(literalElementType)) {
         return super.getType();
     }
 
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public PsiReference[] getReferences() {
         JSReferenceSet referenceSet = myReferenceSet;
 
@@ -92,7 +94,7 @@ public PsiReference[] getReferences() {
             }
         }
         else {
-            final long count = getManager().getModificationTracker().getModificationCount();
+            long count = getManager().getModificationTracker().getModificationCount();
 
             if (count != myModCount) {
                 synchronized (this) {
@@ -118,6 +120,7 @@ public boolean isValidHost() {
     }
 
     @Override
+    @RequiredWriteAction
     public PsiLanguageInjectionHost updateText(@Nonnull String text) {
         JSExpression expressionFromText = JSChangeUtil.createExpressionFromText(getProject(), text);
         return (PsiLanguageInjectionHost)replace(expressionFromText);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
index b38e1f3c..0b500e08 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
@@ -16,31 +16,31 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSNamespaceDeclaration;
 import com.intellij.lang.javascript.psi.stubs.JSNamespaceDeclarationStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
-import consulo.javascript.lang.JavaScriptTokenSets;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public class JSNamespaceDeclarationImpl extends JSStubbedStatementImpl<JSNamespaceDeclarationStub> implements JSNamespaceDeclaration {
-    public JSNamespaceDeclarationImpl(final ASTNode node) {
+    public JSNamespaceDeclarationImpl(ASTNode node) {
         super(node);
     }
 
-    public JSNamespaceDeclarationImpl(final JSNamespaceDeclarationStub node) {
+    public JSNamespaceDeclarationImpl(JSNamespaceDeclarationStub node) {
         super(node, JSElementTypes.NAMESPACE_DECLARATION);
     }
 
@@ -55,8 +55,9 @@ public JSAttributeList getAttributeList() {
     }
 
     @Override
-    public PsiElement setName(@NonNls @Nonnull String newName) throws IncorrectOperationException {
-        final String oldName = getName();
+    @RequiredWriteAction
+    public PsiElement setName(@Nonnull String newName) throws IncorrectOperationException {
+        String oldName = getName();
         if (newName.equals(oldName)) {
             return this;
         }
@@ -68,24 +69,27 @@ public PsiElement setName(@NonNls @Nonnull String newName) throws IncorrectOpera
     }
 
     @Override
+    @RequiredReadAction
     public String getName() {
-        final JSNamespaceDeclarationStub stub = getStub();
+        JSNamespaceDeclarationStub stub = getStub();
         if (stub != null) {
             return stub.getName();
         }
-        final PsiElement node = getNameIdentifier();
+        PsiElement node = getNameIdentifier();
         return node != null ? node.getText() : null;
     }
 
     @Override
+    @RequiredReadAction
     public int getTextOffset() {
-        final PsiElement node = getNameIdentifier();
+        PsiElement node = getNameIdentifier();
         return node == null ? super.getTextOffset() : node.getTextOffset();
     }
 
     @Override
+    @RequiredReadAction
     public String getQualifiedName() {
-        final JSNamespaceDeclarationStub stub = getStub();
+        JSNamespaceDeclarationStub stub = getStub();
         if (stub != null) {
             return stub.getQualifiedName();
         }
@@ -93,17 +97,19 @@ public String getQualifiedName() {
     }
 
     @Override
+    @RequiredReadAction
     public PsiElement getNameIdentifier() {
         return findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
     }
 
     @Override
+    @RequiredReadAction
     public String getInitialValueString() {
-        final JSNamespaceDeclarationStub stub = getStub();
+        JSNamespaceDeclarationStub stub = getStub();
         if (stub != null) {
             return stub.getInitialValueString();
         }
-        final ASTNode anchor = getNode().findChildByType(JSTokenTypes.EQ);
+        ASTNode anchor = getNode().findChildByType(JSTokenTypes.EQ);
 
         if (anchor != null) {
             ASTNode node = anchor.getTreeNext();
@@ -126,10 +132,10 @@ public boolean isDeprecated() {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull final PsiScopeProcessor processor,
-        @Nonnull final ResolveState state,
-        final PsiElement lastParent,
-        @Nonnull final PsiElement place
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
     ) {
         return processor.execute(lastParent, state);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index 9374b6fd..55243527 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -26,20 +26,17 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:57:36 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSNewExpressionImpl extends JSExpressionImpl implements JSNewExpression {
-    public JSNewExpressionImpl(final ASTNode node) {
+    public JSNewExpressionImpl(ASTNode node) {
         super(node);
     }
 
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public JavaScriptType getType() {
         JSExpression methodExpression = getMethodExpression();
 
@@ -62,8 +59,9 @@ public JSExpression getMethodExpression() {
     }
 
     @Override
+    @RequiredReadAction
     public JSArgumentList getArgumentList() {
-        final ASTNode node = getNode().findChildByType(JSElementTypes.ARGUMENT_LIST);
+        ASTNode node = getNode().findChildByType(JSElementTypes.ARGUMENT_LIST);
         return node != null ? (JSArgumentList)node.getPsi() : null;
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
index a26e17e5..900a5757 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
@@ -27,13 +27,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:36:30 PM
+ * @author max
+ * @since 2005-01-30
  */
 public class JSObjectLiteralExpressionImpl extends JSExpressionImpl implements JSObjectLiteralExpression {
-    public JSObjectLiteralExpressionImpl(final ASTNode node) {
+    public JSObjectLiteralExpressionImpl(ASTNode node) {
         super(node);
     }
 
@@ -49,15 +47,15 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull final PsiScopeProcessor processor,
-        @Nonnull final ResolveState state,
-        final PsiElement lastParent,
-        @Nonnull final PsiElement place
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
     ) {
         if (lastParent == null || !(place instanceof JSProperty)) {
             return true;
         }
-        final JSProperty[] props = getProperties();
+        JSProperty[] props = getProperties();
 
         for (JSProperty property : props) {
             if (!processor.execute(property, state)) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
index 9f2b5c0f..6da72905 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
@@ -25,30 +25,30 @@
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSPackageStatementStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.language.ast.ASTNode;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.resolve.PsiScopeProcessor;
-import consulo.language.util.IncorrectOperationException;
-import consulo.language.ast.ASTNode;
 import consulo.language.psi.resolve.ResolveState;
+import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 import consulo.virtualFileSystem.VirtualFile;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import java.io.IOException;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public class JSPackageStatementImpl extends JSStubbedStatementImpl<JSPackageStatementStub> implements JSPackageStatement {
-    public JSPackageStatementImpl(final ASTNode node) {
+    public JSPackageStatementImpl(ASTNode node) {
         super(node);
     }
 
-    public JSPackageStatementImpl(final JSPackageStatementStub stub) {
+    public JSPackageStatementImpl(JSPackageStatementStub stub) {
         super(stub, JSElementTypes.PACKAGE_STATEMENT);
     }
 
@@ -58,12 +58,13 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public String getName() {
-        final JSPackageStatementStub stub = getStub();
+        JSPackageStatementStub stub = getStub();
         if (stub != null) {
             return stub.getName();
         }
-        final PsiElement node = getNameIdentifier();
+        PsiElement node = getNameIdentifier();
         if (node != null) {
             return ((JSReferenceExpression)node).getReferencedName();
         }
@@ -71,17 +72,15 @@ public String getName() {
     }
 
     @Override
+    @RequiredReadAction
     public String getQualifiedName() {
-        final JSPackageStatementStub stub = getStub();
+        JSPackageStatementStub stub = getStub();
         if (stub != null) {
             return stub.getQualifiedName();
         }
 
-        final PsiElement node = getNameIdentifier();
-        if (node != null) {
-            return node.getText();
-        }
-        return null;
+        PsiElement node = getNameIdentifier();
+        return node != null ? node.getText() : null;
     }
 
     @Override
@@ -90,12 +89,14 @@ public JSSourceElement[] getStatements() {
     }
 
     @Override
-    public void setQualifiedName(final String expectedPackageNameFromFile) {
+    @RequiredWriteAction
+    public void setQualifiedName(String expectedPackageNameFromFile) {
         doChangeName(getProject(), this, expectedPackageNameFromFile);
     }
 
     @Override
-    public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperationException {
+    @RequiredWriteAction
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
         VirtualFile virtualFile = getContainingFile().getVirtualFile();
         String expectedPackageNameFromFile =
             JSResolveUtil.getExpectedPackageNameFromFile(virtualFile, getProject(), false);
@@ -121,24 +122,26 @@ public PsiElement setName(@NonNls @Nonnull String name) throws IncorrectOperatio
 
     @Override
     public boolean processDeclarations(
-        @Nonnull final PsiScopeProcessor processor,
-        @Nonnull final ResolveState substitutor,
-        final PsiElement lastParent,
-        @Nonnull final PsiElement place
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState substitutor,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
     ) {
         return !(lastParent != null && lastParent.getParent() == this)
             || JSImportHandlingUtil.tryResolveImports(processor, this, place);
     }
 
     @Override
+    @RequiredReadAction
     public PsiElement getNameIdentifier() {
         return findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
-            final PsiElement insertedElement = JSChangeUtil.doAddBefore(this, element, anchor);
+            PsiElement insertedElement = JSChangeUtil.doAddBefore(this, element, anchor);
             CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), insertedElement.getNode());
             return insertedElement;
         }
@@ -146,25 +149,27 @@ public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) thro
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
-            final PsiElement insertedElement = JSChangeUtil.doAddAfter(this, element, anchor);
+            PsiElement insertedElement = JSChangeUtil.doAddAfter(this, element, anchor);
             CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), insertedElement.getNode());
             return insertedElement;
         }
         return super.addAfter(element, anchor);
     }
 
-    public static void doChangeName(final Project project, final JSPackageStatement packageStatement, final String expected) {
+    @RequiredWriteAction
+    public static void doChangeName(Project project, JSPackageStatement packageStatement, String expected) {
         if (expected == null) {
             return;
         }
-        final PsiElement node = packageStatement.getNameIdentifier();
-        final ASTNode parent = packageStatement.getNode();
+        PsiElement node = packageStatement.getNameIdentifier();
+        ASTNode parent = packageStatement.getNode();
 
         if (expected.length() == 0) {
             if (node != null) {
-                final ASTNode treeNext = node.getNode().getTreeNext();
+                ASTNode treeNext = node.getNode().getTreeNext();
                 parent.removeChild(node.getNode());
                 if (treeNext.getPsi() instanceof PsiWhiteSpace) {
                     parent.removeChild(treeNext);
@@ -172,7 +177,7 @@ public static void doChangeName(final Project project, final JSPackageStatement
             }
         }
         else {
-            final ASTNode child = JSChangeUtil.createExpressionFromText(project, expected).getNode();
+            ASTNode child = JSChangeUtil.createExpressionFromText(project, expected).getNode();
             if (node != null) {
                 parent.replaceChild(node.getNode(), child);
             }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index 11638b0a..80501d68 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.psi.impl;
 
 import com.intellij.javascript.documentation.JSDocumentationUtils;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -35,22 +36,20 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:12:51 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSParameterImpl extends JSVariableBaseImpl<JSParameterStub, JSParameter> implements JSParameter {
-    public JSParameterImpl(final ASTNode node) {
+    public JSParameterImpl(ASTNode node) {
         super(node);
     }
 
-    public JSParameterImpl(final JSParameterStub stub) {
+    public JSParameterImpl(JSParameterStub stub) {
         super(stub, JSElementTypes.FORMAL_PARAMETER);
     }
 
     @Override
+    @RequiredReadAction
     public JSFunction getDeclaringFunction() {
         return (JSFunction)getNode().getTreeParent().getTreeParent().getPsi();
     }
@@ -58,11 +57,8 @@ public JSFunction getDeclaringFunction() {
     @Override
     @RequiredReadAction
     public boolean isRest() {
-        final JSParameterStub parameterStub = getStub();
-        if (parameterStub != null) {
-            return parameterStub.isRest();
-        }
-        return getRestElement() != null;
+        JSParameterStub parameterStub = getStub();
+        return parameterStub != null ? parameterStub.isRest() : getRestElement() != null;
     }
 
     @Nullable
@@ -73,16 +69,13 @@ public PsiElement getRestElement() {
     }
 
     @Override
+    @RequiredReadAction
     public boolean isOptional() {
-        final JSParameterStub parameterStub = getStub();
+        JSParameterStub parameterStub = getStub();
         if (parameterStub != null) {
             return parameterStub.isOptional();
         }
-        if (getInitializer() != null) {
-            return true;
-        }
-
-        return JSDocumentationUtils.findOptionalStatusFromComments(this);
+        return getInitializer() != null || JSDocumentationUtils.findOptionalStatusFromComments(this);
     }
 
     @Override
@@ -96,9 +89,10 @@ public JSAttributeList getAttributeList() {
     }
 
     @Override
+    @RequiredWriteAction
     public void delete() throws IncorrectOperationException {
-        final ASTNode myNode = getNode();
-        final ASTNode parent = myNode.getTreeParent();
+        ASTNode myNode = getNode();
+        ASTNode parent = myNode.getTreeParent();
 
         if (parent.getElementType() == JSElementTypes.PARAMETER_LIST) {
             JSChangeUtil.removeRangeWithRemovalOfCommas(myNode, parent);
@@ -109,12 +103,13 @@ public void delete() throws IncorrectOperationException {
     }
 
     @Override
+    @RequiredReadAction
     protected String doGetType() {
         String s = super.doGetType();
 
         if (s == null) {
-            final ASTNode astNode = getNode();
-            final ASTNode anchor = astNode.findChildByType(JSTokenTypes.INSTANCEOF_KEYWORD);
+            ASTNode astNode = getNode();
+            ASTNode anchor = astNode.findChildByType(JSTokenTypes.INSTANCEOF_KEYWORD);
 
             if (anchor != null) {
                 ASTNode type = astNode.findChildByType(JSTokenTypes.IDENTIFIER_TOKENS_SET, anchor);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
index ac3aa147..3108d08b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
@@ -26,18 +26,15 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 8:41:53 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSParameterListImpl extends JSStubElementImpl<JSParameterListStub> implements JSParameterList {
-    public JSParameterListImpl(final ASTNode node) {
+    public JSParameterListImpl(ASTNode node) {
         super(node);
     }
 
-    public JSParameterListImpl(final JSParameterListStub stub) {
+    public JSParameterListImpl(JSParameterListStub stub) {
         super(stub, JSElementTypes.PARAMETER_LIST);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
index 99cd3108..0604a6b5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
@@ -23,12 +23,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:30:44 PM
+ * @author max
+ * @since 2005-01-30
  */
 public class JSParenthesizedExpressionImpl extends JSExpressionImpl implements JSParenthesizedExpression {
-    public JSParenthesizedExpressionImpl(final ASTNode node) {
+    public JSParenthesizedExpressionImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index a2336f0d..faf52c14 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -28,18 +28,17 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:52:13 PM
+ * @author max
+ * @since 2005-01-30
  */
 public class JSPostfixExpressionImpl extends JSExpressionImpl implements JSPostfixExpression {
-    public JSPostfixExpressionImpl(final ASTNode node) {
+    public JSPostfixExpressionImpl(ASTNode node) {
         super(node);
     }
 
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public JavaScriptType getType() {
         JSExpression expression = getExpression();
         return expression == null ? JavaScriptType.UNKNOWN : expression.getType();
@@ -51,8 +50,9 @@ public JSExpression getExpression() {
     }
 
     @Override
+    @RequiredReadAction
     public IElementType getOperationSign() {
-        final ASTNode[] nodes = getNode().getChildren(JSTokenTypes.OPERATIONS);
+        ASTNode[] nodes = getNode().getChildren(JSTokenTypes.OPERATIONS);
         return nodes.length == 1 ? nodes[0].getElementType() : null;
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index a08d72e9..1ad0a8ff 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -30,14 +30,11 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:52:13 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSPrefixExpressionImpl extends JSExpressionImpl implements JSPrefixExpression {
-    public JSPrefixExpressionImpl(final ASTNode node) {
+    public JSPrefixExpressionImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index cf71751c..eba657a0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.application.util.CachedValueProvider;
 import consulo.javascript.lang.JavaScriptTokenSets;
 import consulo.javascript.language.psi.JavaScriptType;
@@ -45,7 +46,7 @@ public class JSPropertyImpl extends JSElementImpl implements JSProperty {
     private static TokenSet IDENTIFIER_TOKENS_SET =
         TokenSet.orSet(TokenSet.create(JSTokenTypes.NUMERIC_LITERAL, JSTokenTypes.IDENTIFIER), JavaScriptTokenSets.STRING_LITERALS);
 
-    public JSPropertyImpl(final ASTNode node) {
+    public JSPropertyImpl(ASTNode node) {
         super(node);
     }
 
@@ -83,18 +84,16 @@ private PsiReference[] buildReferences() {
     @Override
     @RequiredReadAction
     public String getName() {
-        final PsiElement nameIdentifier = getNameIdentifier();
-        if (nameIdentifier != null) {
-            return StringUtil.stripQuotesAroundValue(nameIdentifier.getText());
-        }
-        return null;
+        PsiElement nameIdentifier = getNameIdentifier();
+        return nameIdentifier != null ? StringUtil.stripQuotesAroundValue(nameIdentifier.getText()) : null;
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
-        final PsiElement nameNode = getNameIdentifier();
+        PsiElement nameNode = getNameIdentifier();
         assert nameNode != null;
-        final ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), name, nameNode.getNode().getElementType());
+        ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), name, nameNode.getNode().getElementType());
         getNode().replaceChild(nameNode.getNode(), nameElement);
         return this;
     }
@@ -138,14 +137,14 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     @RequiredReadAction
     @Override
     public int getTextOffset() {
-        final PsiElement name = getNameIdentifier();
+        PsiElement name = getNameIdentifier();
         return name != null ? name.getTextOffset() : super.getTextOffset();
     }
 
     @Override
-    @RequiredReadAction
+    @RequiredWriteAction
     public void delete() throws IncorrectOperationException {
-        final ASTNode myNode = getNode();
+        ASTNode myNode = getNode();
         JSChangeUtil.removeRangeWithRemovalOfCommas(myNode, myNode.getTreeParent());
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 28ba6890..7aca2c90 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -22,9 +22,10 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.content.base.SourcesOrderRootType;
-import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.javascript.lang.psi.impl.elementType.BaseJavaScriptElementType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.javascript.psi.JavaScriptImportStatementBase;
 import consulo.language.ast.ASTNode;
@@ -41,30 +42,25 @@
 import consulo.project.DumbService;
 import consulo.project.Project;
 import consulo.util.collection.HashingStrategy;
-import consulo.util.lang.Comparing;
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.xml.XmlFile;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 8, 2008
- * Time: 3:23:37 PM
+ * @since 2008-06-08
  */
 public class JSPsiImplUtils {
-    @NonNls
     private static final String ARRAY_TYPE_NAME = "Array";
-    @NonNls
     private static final String ARRAY_ELEMENT_TYPE_ANNOTATION_NAME = "ArrayElementType";
 
     @Nullable
@@ -100,18 +96,14 @@ private static <T> T findChildrenByClass(@Nonnull PsiElement element, Class<T> a
 
     @Deprecated
     public static ASTNode getTypeExpressionFromDeclaration(JSNamedElement element) {
-        final ASTNode myNode = element.getNode();
-        final ASTNode node = myNode != null ? myNode.findChildByType(JSTokenTypes.COLON) : null;
-        String s = null;
-
-        if (node != null) {
-            return myNode.findChildByType(JSDocumentationUtils.ourTypeFilter, node);
-        }
+        ASTNode myNode = element.getNode();
+        ASTNode node = myNode != null ? myNode.findChildByType(JSTokenTypes.COLON) : null;
 
-        return null;
+        return node != null ? myNode.findChildByType(JSDocumentationUtils.ourTypeFilter, node) : null;
     }
 
     @Deprecated
+    @RequiredReadAction
     public static String getTypeFromDeclaration(JSNamedElement element) {
         ASTNode typeExpr = getTypeExpressionFromDeclaration(element);
 
@@ -119,15 +111,15 @@ public static String getTypeFromDeclaration(JSNamedElement element) {
         if (typeExpr != null) {
             s = typeExpr.getText();
         }
-        else if (element instanceof JSParameter && ((JSParameter)element).isRest()) {
+        else if (element instanceof JSParameter parameter && parameter.isRest()) {
             s = ARRAY_TYPE_NAME;
         }
 
         if (ARRAY_TYPE_NAME.equals(s)) {
-            final PsiComment psiComment = typeExpr != null ? PsiTreeUtil.getPrevSiblingOfType(typeExpr.getPsi(), PsiComment.class) : null;
+            PsiComment psiComment = typeExpr != null ? PsiTreeUtil.getPrevSiblingOfType(typeExpr.getPsi(), PsiComment.class) : null;
 
             if (psiComment != null) {
-                final String elementType = JSDocumentationUtils.unwrapCommentDelimiters(psiComment.getText()).trim();
+                String elementType = JSDocumentationUtils.unwrapCommentDelimiters(psiComment.getText()).trim();
 
                 if (elementType.length() > 0) {
                     return s + "[" + elementType;
@@ -135,7 +127,7 @@ else if (element instanceof JSParameter && ((JSParameter)element).isRest()) {
             }
 
             if (element instanceof JSAttributeListOwner attributeListOwner) {
-                final JSAttributeList attributeList = attributeListOwner.getAttributeList();
+                JSAttributeList attributeList = attributeListOwner.getAttributeList();
 
                 if (attributeList != null) {
                     String type = getArrayElementTypeFromAnnotation(attributeList);
@@ -151,12 +143,14 @@ else if (element instanceof JSParameter && ((JSParameter)element).isRest()) {
     }
 
     @Nullable
+    @RequiredReadAction
     public static String getArrayElementTypeFromAnnotation(JSAttributeList attributeList) {
         return getTypeFromAnnotationParameter(attributeList, ARRAY_ELEMENT_TYPE_ANNOTATION_NAME, null);
     }
 
+    @RequiredReadAction
     public static String getType(JSNamedElement element) {
-        final String typeFromDeclaration = getTypeFromDeclaration(element);
+        String typeFromDeclaration = getTypeFromDeclaration(element);
         if (typeFromDeclaration != null) {
             return typeFromDeclaration;
         }
@@ -164,24 +158,24 @@ public static String getType(JSNamedElement element) {
         return JSDocumentationUtils.findTypeFromComments(element);
     }
 
-    public static void updateFileName(
-        JSQualifiedNamedElement jsClassBase,
-        final String newName,
-        final String oldName
-    ) throws IncorrectOperationException {
-        final PsiFile containingFile = jsClassBase.getContainingFile();
+    @RequiredWriteAction
+    public static void updateFileName(JSQualifiedNamedElement jsClassBase, String newName, String oldName)
+        throws IncorrectOperationException {
+
+        PsiFile containingFile = jsClassBase.getContainingFile();
 
         if (containingFile.getContext() == null) {
-            final VirtualFile virtualFile = containingFile.getVirtualFile();
+            VirtualFile virtualFile = containingFile.getVirtualFile();
 
             if (virtualFile != null && virtualFile.getNameWithoutExtension().equals(oldName)) {
-                final String s = containingFile.getName();
+                String s = containingFile.getName();
                 containingFile.setName(newName + "." + s.substring(s.lastIndexOf('.') + 1));
             }
         }
     }
 
     @Nullable
+    @RequiredReadAction
     public static JSPackageStatement findPackageStatement(JSFile file) {
         JSPackageStatement packageStatement = null;
 
@@ -195,6 +189,7 @@ public static JSPackageStatement findPackageStatement(JSFile file) {
     }
 
     @Nonnull
+    @RequiredReadAction
     static PsiElement findTopLevelNavigatableElement(@Nonnull JSQualifiedNamedElement jsClass) {
         PsiElement sourceElement = findTopLevelNavigatableElementWithSource(jsClass, null);
         if (sourceElement != null) {
@@ -204,6 +199,7 @@ static PsiElement findTopLevelNavigatableElement(@Nonnull JSQualifiedNamedElemen
     }
 
     @Nullable
+    @RequiredReadAction
     public static PsiElement findTopLevelNavigatableElementWithSource(
         @Nonnull JSQualifiedNamedElement jsClass,
         @Nullable Consumer<JSQualifiedNamedElement> candidatesConsumer
@@ -222,8 +218,8 @@ public static PsiElement findTopLevelNavigatableElementWithSource(
         }
 
         GlobalSearchScope searchScope = jsClass.getResolveScope();
-        final String qName = jsClass.getQualifiedName();
-        final Collection<JSQualifiedNamedElement> candidates = StubIndex.getElements(
+        String qName = jsClass.getQualifiedName();
+        Collection<JSQualifiedNamedElement> candidates = StubIndex.getElements(
             JavaScriptIndexKeys.ELEMENTS_BY_QNAME,
             qName,
             jsClass.getProject(),
@@ -254,6 +250,7 @@ public static PsiElement findTopLevelNavigatableElementWithSource(
     }
 
     @Nullable
+    @RequiredReadAction
     private static PsiElement findSourceElement(JSQualifiedNamedElement jsClass) {
         PsiFile containingFile = jsClass.getContainingFile();
         if (containingFile == null) {
@@ -266,7 +263,7 @@ private static PsiElement findSourceElement(JSQualifiedNamedElement jsClass) {
             return null;
         }
 
-        final List<OrderEntry> orderEntries = projectFileIndex.getOrderEntriesForFile(vFile);
+        List<OrderEntry> orderEntries = projectFileIndex.getOrderEntriesForFile(vFile);
 
         String qName = jsClass.getQualifiedName();
         String baseSourceName = jsClass.getName();
@@ -286,8 +283,8 @@ private static PsiElement findSourceElement(JSQualifiedNamedElement jsClass) {
                 if (source != null) {
                     PsiFile psiSource = jsClass.getManager().findFile(source);
 
-                    if (psiSource instanceof JSFile) {
-                        JSPackageStatement statement = findPackageStatement((JSFile)psiSource);
+                    if (psiSource instanceof JSFile jsFile) {
+                        JSPackageStatement statement = findPackageStatement(jsFile);
 
                         if (statement != null) {
                             for (JSSourceElement el : statement.getStatements()) {
@@ -306,8 +303,8 @@ private static PsiElement findSourceElement(JSQualifiedNamedElement jsClass) {
                     }
                     if (source != null) {
                         PsiFile psiSource = jsClass.getManager().findFile(source);
-                        if (psiSource instanceof XmlFile) {
-                            return XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)psiSource);
+                        if (psiSource instanceof XmlFile xmlFile) {
+                            return XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
                         }
                     }
                 }
@@ -316,17 +313,18 @@ private static PsiElement findSourceElement(JSQualifiedNamedElement jsClass) {
         return null;
     }
 
-    static String getQName(final JSNamedElement element) {
-        final PsiElement node = element.getNameIdentifier();
-        final String name = node != null ? node.getText() : null;
+    @RequiredReadAction
+    static String getQName(JSNamedElement element) {
+        PsiElement node = element.getNameIdentifier();
+        String name = node != null ? node.getText() : null;
         PsiElement responsibleParent = element.getParent();
 
-        if (responsibleParent instanceof JSVarStatement) {
-            responsibleParent = responsibleParent.getParent();
+        if (responsibleParent instanceof JSVarStatement varStatement) {
+            responsibleParent = varStatement.getParent();
         }
 
         if (responsibleParent instanceof JSPackageStatement packageStatement && name != null) {
-            final String packageName = packageStatement.getQualifiedName();
+            String packageName = packageStatement.getQualifiedName();
             if (!StringUtil.isEmpty(packageName)) {
                 return packageName.concat(".").concat(name);
             }
@@ -335,15 +333,16 @@ static String getQName(final JSNamedElement element) {
     }
 
     @Nullable
+    @RequiredReadAction
     public static String getTypeFromAnnotationParameter(
         @Nonnull JSAttributeList attributeList,
         @Nonnull String annotationName,
         @Nullable String annotationParameter
     ) {
         String arrayType = null;
-        final JSAttribute[] byName = attributeList.getAttributesByName(annotationName);
+        JSAttribute[] byName = attributeList.getAttributesByName(annotationName);
         if (byName.length > 0) {
-            final JSAttributeNameValuePair jsAttributeNameValuePair = byName[0].getValueByName(annotationParameter);
+            JSAttributeNameValuePair jsAttributeNameValuePair = byName[0].getValueByName(annotationParameter);
             arrayType = jsAttributeNameValuePair != null ? jsAttributeNameValuePair.getSimpleValue() : null;
         }
         return arrayType;
@@ -352,12 +351,13 @@ public static String getTypeFromAnnotationParameter(
     /**
      * @see <code>QUALIFIED_NAME_HASHING_STRATEGY</code>
      */
-    static boolean isTheSameClass(final PsiElement typeSource, final JSClass jsClass) {
+    @RequiredReadAction
+    static boolean isTheSameClass(PsiElement typeSource, JSClass jsClass) {
         if (typeSource == jsClass) {
             return true;
         }
-        if (typeSource instanceof JSClass && jsClass != null) {
-            final String qName = ((JSClass)typeSource).getQualifiedName();
+        if (typeSource instanceof JSClass typeSourceClass && jsClass != null) {
+            String qName = typeSourceClass.getQualifiedName();
             return qName != null && qName.equals(jsClass.getQualifiedName());
         }
         return false;
@@ -365,13 +365,15 @@ static boolean isTheSameClass(final PsiElement typeSource, final JSClass jsClass
 
     public static final HashingStrategy<JSQualifiedNamedElement> QUALIFIED_NAME_HASHING_STRATEGY = new HashingStrategy<>() {
         @Override
-        public int hashCode(final JSQualifiedNamedElement object) {
+        @RequiredReadAction
+        public int hashCode(JSQualifiedNamedElement object) {
             return object == null || object.getQualifiedName() == null ? 0 : object.getQualifiedName().hashCode();
         }
 
         @Override
-        public boolean equals(final JSQualifiedNamedElement o1, final JSQualifiedNamedElement o2) {
-            return Comparing.equal(o1.getQualifiedName(), o2.getQualifiedName());
+        @RequiredReadAction
+        public boolean equals(JSQualifiedNamedElement o1, JSQualifiedNamedElement o2) {
+            return Objects.equals(o1.getQualifiedName(), o2.getQualifiedName());
         }
     };
 
@@ -383,6 +385,7 @@ static void doRenameParentDirectoryIfNeeded(VirtualFile file, String name, Objec
     }
 
     @Nullable
+    @RequiredReadAction
     static String getQNameForMove(@Nonnull PsiElement targetElement, PsiElement elementToBind) {
         String qName = null;
         Project project = targetElement.getProject();
@@ -397,18 +400,16 @@ static String getQNameForMove(@Nonnull PsiElement targetElement, PsiElement elem
 
             String packageName = JSResolveUtil.getExpectedPackageNameFromFile(elementToBindFile, project, false);
 
-            if (targetElement instanceof JSReferenceExpression) {
-                JSExpression qualifier = ((JSReferenceExpression)targetElement).getQualifier();
+            if (targetElement instanceof JSReferenceExpression targetRefExpr) {
+                JSExpression qualifier = targetRefExpr.getQualifier();
                 String targetElementPackageName = qualifier != null
                     ? qualifier.getText()
-                    : JSResolveUtil.getExpectedPackageNameFromFile(targetElement.getContainingFile().getVirtualFile(), project, false);
+                    : JSResolveUtil.getExpectedPackageNameFromFile(targetRefExpr.getContainingFile().getVirtualFile(), project, false);
                 if (!differentPackageName(targetElementPackageName, packageName)) {
                     return null;
                 }
-                if (qualifier == null) {
-                    if (!(targetElement.getParent() instanceof JavaScriptImportStatementBase)) {
-                        return null;
-                    }
+                if (qualifier == null && !(targetRefExpr.getParent() instanceof JavaScriptImportStatementBase)) {
+                    return null;
                 }
             }
 
@@ -423,14 +424,14 @@ else if (elementToBind instanceof PsiDirectoryContainer directoryContainer) {
         return qName;
     }
 
-    public static boolean differentPackageName(final String s, final String expectedPackageNameFromFile) {
-        final boolean sIsEmpty = isEmpty(s);
-        final boolean expectedIsEmpty = isEmpty(expectedPackageNameFromFile);
+    public static boolean differentPackageName(String s, String expectedPackageNameFromFile) {
+        boolean sIsEmpty = isEmpty(s);
+        boolean expectedIsEmpty = isEmpty(expectedPackageNameFromFile);
 
         return (sIsEmpty && !expectedIsEmpty) || (!sIsEmpty && (expectedIsEmpty || !s.equals(expectedPackageNameFromFile)));
     }
 
-    public static boolean isEmpty(final String expectedPackageNameFromFile) {
+    public static boolean isEmpty(String expectedPackageNameFromFile) {
         return expectedPackageNameFromFile == null || expectedPackageNameFromFile.isEmpty();
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 349492fc..aedafc52 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -21,12 +21,13 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.*;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.document.util.TextRange;
+import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.language.JavaScriptVersionUtil;
 import consulo.javascript.language.psi.JavaScriptType;
-import consulo.javascript.lang.psi.impl.resolve.ResolveHelper;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.TokenSet;
 import consulo.language.editor.refactoring.NamesValidator;
@@ -39,7 +40,6 @@
 import consulo.util.collection.ArrayUtil;
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlToken;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -49,7 +49,7 @@ public class JSReferenceExpressionImpl extends JSExpressionImpl implements JSRef
     private static final TokenSet IDENTIFIER_TOKENS_SET =
         TokenSet.orSet(JSTokenTypes.IDENTIFIER_TOKENS_SET, TokenSet.create(JSTokenTypes.ANY_IDENTIFIER));
 
-    public JSReferenceExpressionImpl(final ASTNode node) {
+    public JSReferenceExpressionImpl(ASTNode node) {
         super(node);
     }
 
@@ -71,15 +71,14 @@ else if (resolvedElement instanceof JSFunction function) {
     @Nullable
     @RequiredReadAction
     public JSExpression getQualifier() {
-        PsiElement firstChild = getFirstChild();
-        return firstChild instanceof JSExpression ? (JSExpression)firstChild : null;
+        return getFirstChild() instanceof JSExpression expression ? expression : null;
     }
 
     @Override
     @Nullable
     @RequiredReadAction
     public String getReferencedName() {
-        final PsiElement nameElement = getNameElement();
+        PsiElement nameElement = getNameElement();
         return nameElement != null ? nameElement.getText() : null;
     }
 
@@ -87,7 +86,7 @@ public String getReferencedName() {
     @Nullable
     @RequiredReadAction
     public PsiElement getReferenceNameElement() {
-        final PsiElement element = getNameElement();
+        PsiElement element = getNameElement();
         return element != null ? element : null;
     }
 
@@ -124,8 +123,9 @@ private PsiElement getNameElement() {
     }
 
     @Override
+    @RequiredReadAction
     public PsiElement resolve() {
-        final ResolveResult[] resolveResults = multiResolve(true);
+        ResolveResult[] resolveResults = multiResolve(true);
 
         return resolveResults.length == 0 || resolveResults.length > 1 ? null : resolveResults[0].getElement();
     }
@@ -138,22 +138,23 @@ public String getCanonicalText() {
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
         return this;
     }
 
-    @RequiredReadAction
+    @RequiredWriteAction
     PsiElement handleElementRenameInternal(String newElementName) throws IncorrectOperationException {
-        final int i = newElementName.lastIndexOf('.');
+        int i = newElementName.lastIndexOf('.');
         if (i != -1) {
             newElementName = newElementName.substring(0, i);
         }
         if (!NamesValidator.forLanguage(JavaScriptLanguage.INSTANCE).isIdentifier(newElementName, null)) {
             throw new IncorrectOperationException("Invalid javascript element name:" + newElementName);
         }
-        final PsiElement parent = getParent();
+        PsiElement parent = getParent();
         if (parent instanceof JSClass || parent instanceof JSFunction) {
-            final PsiElement node = ((JSNamedElement)parent).getNameIdentifier();
+            PsiElement node = ((JSNamedElement)parent).getNameIdentifier();
             if (node != null && node == this) {
                 return this; // JSNamedElement.setName will care of things
             }
@@ -165,15 +166,13 @@ PsiElement handleElementRenameInternal(String newElementName) throws IncorrectOp
     @Override
     @RequiredReadAction
     public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement parent = getParent();
+        PsiElement parent = getParent();
 
         if (parent instanceof JSClass || parent instanceof JSNamespaceDeclaration || parent instanceof JSFunction) {
-            final PsiElement node = ((JSNamedElement)parent).getNameIdentifier();
+            PsiElement node = ((JSNamedElement)parent).getNameIdentifier();
 
-            if (node != null && node == this) {
-                if (parent == element || element instanceof PsiFile) {
-                    return this; // JSNamedElement.setName will care of things
-                }
+            if (node != null && node == this && (parent == element || element instanceof PsiFile)) {
+                return this; // JSNamedElement.setName will care of things
             }
         }
 
@@ -193,13 +192,13 @@ public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOpe
             }
         }
 
-        final ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), newName);
+        ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), newName);
         getNode().replaceChild(getNameElement().getNode(), nameElement);
         return this;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public boolean isReferenceTo(PsiElement element) {
         ResolveHelper helper = ResolveHelper.find(this);
         if (helper.isResolveTo(this, element)) {
@@ -211,58 +210,50 @@ public boolean isReferenceTo(PsiElement element) {
             return true;
         }
 
-//		if(element instanceof PsiNamedElement || element instanceof XmlAttributeValue)
-//		{
-//			final String referencedName = getReferencedName();
+//        if (element instanceof PsiNamedElement || element instanceof XmlAttributeValue) {
+//            String referencedName = getReferencedName();
 //
-//			if(referencedName != null)
-//			{
-//				if(element instanceof JSDefinitionExpression && referencedName.equals(((JSDefinitionExpression) element).getName()))
-//				{
-//					final JSExpression expression = ((JSDefinitionExpression) element).getExpression();
-//					if(expression instanceof JSReferenceExpression)
-//					{
-//						final JSReferenceExpression jsReferenceExpression = (JSReferenceExpression) expression;
-//						final JSExpression qualifier = jsReferenceExpression.getQualifier();
-//						final JSExpression myQualifier = getQualifier();
+//            if (referencedName != null) {
+//                if (element instanceof JSDefinitionExpression definition && referencedName.equals(definition.getName())) {
+//                    if (definition.getExpression() instanceof JSReferenceExpression jsReferenceExpression) {
+//                        JSExpression qualifier = jsReferenceExpression.getQualifier();
+//                        JSExpression myQualifier = getQualifier();
 //
-//						return (myQualifier != null || (qualifier == myQualifier || "window".equals(qualifier.getText())));
-//					}
-//					else
-//					{
-//						return true;
-//					}
-//				}
-//				else if(element instanceof JSProperty && referencedName.equals(((JSProperty) element).getName()))
-//				{
-//					if(getQualifier() != null)
-//					{
-//						return true; // TODO: check for type of element to be the same
-//					}
-//					//return false;
-//				}
-//			}
-//			return JSResolveUtil.isReferenceTo(this, referencedName, element);
-//		}
+//                        return (myQualifier != null || (qualifier == myQualifier || "window".equals(qualifier.getText())));
+//                    }
+//                    else {
+//                        return true;
+//                    }
+//                }
+//                else if (element instanceof JSProperty property && referencedName.equals(property.getName())) {
+//                    if (getQualifier() != null) {
+//                        return true; // TODO: check for type of element to be the same
+//                    }
+//                    //return false;
+//                }
+//            }
+//            return JSResolveUtil.isReferenceTo(this, referencedName, element);
+//        }
         return false;
     }
 
+    @RequiredReadAction
     private void doProcessLocalDeclarations(
-        final JSExpression qualifier,
-        final ResolveProcessor processor,
+        JSExpression qualifier,
+        ResolveProcessor processor,
         Set<JavaScriptFeature> features,
         boolean completion
     ) {
-        final JSClass jsClass = findEnclosingClass(this);
+        JSClass jsClass = findEnclosingClass(this);
         processor.configureClassScope(jsClass);
 
-        final boolean inTypeContext = JSResolveUtil.isExprInTypeContext(this);
-        final boolean whereTypeCanBe = inTypeContext
+        boolean inTypeContext = JSResolveUtil.isExprInTypeContext(this);
+        boolean whereTypeCanBe = inTypeContext
             || (completion && features.contains(JavaScriptFeature.CLASS) && JSResolveUtil.isInPlaceWhereTypeCanBeDuringCompletion(this));
         PsiElement elToProcess = this;
         PsiElement scopeToStopAt = null;
 
-        final PsiElement parent = getParent();
+        PsiElement parent = getParent();
         boolean strictClassOffset = JSResolveUtil.getTopReferenceParent(parent) instanceof JSImportStatement;
         boolean toProcessMembers = !strictClassOffset;
 
@@ -272,7 +263,7 @@ private void doProcessLocalDeclarations(
             if (jsClass == null) {
                 if (qualifier instanceof JSThisExpression) {
                     if (features.contains(JavaScriptFeature.CLASS)) {
-                        final JSFunction nearestFunction = PsiTreeUtil.getParentOfType(this, JSFunction.class);
+                        JSFunction nearestFunction = PsiTreeUtil.getParentOfType(this, JSFunction.class);
                         elToProcess = nearestFunction != null ? nearestFunction : this;
                     }
                     else {
@@ -292,11 +283,11 @@ else if (whereTypeCanBe) {
                 if (!(parent instanceof JSNewExpression || parent instanceof JSAttributeList || parent instanceof JSBinaryExpression)) {
                     toProcessMembers = false;
                     // get function since it can have imports
-                    final JSFunction nearestFunction = PsiTreeUtil.getParentOfType(this, JSFunction.class);
+                    JSFunction nearestFunction = PsiTreeUtil.getParentOfType(this, JSFunction.class);
                     elToProcess = nearestFunction != null ? nearestFunction.getFirstChild() : jsClass;
                 }
             }
-            else if (parent instanceof JSExpressionStatement && JSResolveUtil.isPlaceWhereNsCanBe(parent)) {
+            else if (parent instanceof JSExpressionStatement expression && JSResolveUtil.isPlaceWhereNsCanBe(expression)) {
                 toProcessMembers = false;
                 elToProcess = null;
             }
@@ -335,14 +326,13 @@ else if (parent instanceof JSExpressionStatement && JSResolveUtil.isPlaceWhereNs
         }
     }
 
-    private static
     @Nullable
-    JSClass findEnclosingClass(PsiElement elt) {
+    private static JSClass findEnclosingClass(PsiElement elt) {
         JSClass jsClass = PsiTreeUtil.getParentOfType(elt, JSClass.class);
         if (jsClass == null && elt != null) {
-            final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(elt.getContainingFile());
-            if (element instanceof JSClass) {
-                jsClass = (JSClass)element;
+            PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(elt.getContainingFile());
+            if (element instanceof JSClass jsClassClass) {
+                jsClass = jsClassClass;
             }
         }
         return jsClass;
@@ -352,14 +342,14 @@ JSClass findEnclosingClass(PsiElement elt) {
     @Override
     @RequiredReadAction
     public Object[] getVariants() {
-        final PsiFile containingFile = getContainingFile();
+        PsiFile containingFile = getContainingFile();
         Set<JavaScriptFeature> features = JavaScriptVersionUtil.getFeatures(this);
-        final boolean classFeature = features.contains(JavaScriptFeature.CLASS);
+        boolean classFeature = features.contains(JavaScriptFeature.CLASS);
         Object[] smartVariants = JSSmartCompletionVariantsHandler.getSmartVariants(this, classFeature);
         if (smartVariants != null) {
             return smartVariants;
         }
-        final JSExpression qualifier = getResolveQualifier();
+        JSExpression qualifier = getResolveQualifier();
 
         if (qualifier == null) {
             if (JSResolveUtil.isSelfReference(getParent(), this)) { // Prevent Rulezz to appear
@@ -369,7 +359,7 @@ public Object[] getVariants() {
             ResolveProcessor localProcessor = new ResolveProcessor(null, this);
 
             doProcessLocalDeclarations(qualifier, localProcessor, features, true);
-            final VariantsProcessor processor = new VariantsProcessor(null, containingFile, false, this);
+            VariantsProcessor processor = new VariantsProcessor(null, containingFile, false, this);
 
             processor.addLocalResults(localProcessor.getResults());
 
@@ -378,7 +368,7 @@ public Object[] getVariants() {
             return processor.getResult();
         }
         else {
-            final MyTypeProcessor processor = new MyTypeProcessor(null, features, this);
+            MyTypeProcessor processor = new MyTypeProcessor(null, features, this);
             BaseJSSymbolProcessor.doEvalForExpr(BaseJSSymbolProcessor.getOriginalQualifier(qualifier), containingFile, processor);
 
             if (processor.resolved == MyTypeProcessor.TypeResolveState.Resolved ||
@@ -387,8 +377,8 @@ public Object[] getVariants() {
                 String qualifiedNameToSkip = null;
                 if (JSResolveUtil.isSelfReference(getParent(), this)) {
                     PsiElement originalParent = PsiUtilBase.getOriginalElement(getParent(), JSQualifiedNamedElement.class);
-                    if (originalParent instanceof JSQualifiedNamedElement) {
-                        qualifiedNameToSkip = ((JSQualifiedNamedElement)originalParent).getQualifiedName();
+                    if (originalParent instanceof JSQualifiedNamedElement qualifiedNamedElement) {
+                        qualifiedNameToSkip = qualifiedNamedElement.getQualifiedName();
                     }
                 }
                 return processor.getResultsAsObjects(qualifiedNameToSkip);
@@ -403,9 +393,10 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
         visitor.visitJSReferenceExpression(this);
     }
 
-    @Override
     @Nonnull
-    public ResolveResult[] multiResolve(final boolean incompleteCode) {
+    @Override
+    @RequiredReadAction
+    public ResolveResult[] multiResolve(boolean incompleteCode) {
         return ResolveCache.getInstance(getContainingFile().getProject())
             .resolveWithCaching(this, MyResolver.INSTANCE, true, incompleteCode);
     }
@@ -424,25 +415,24 @@ public ResolveResult[] resolve(@Nonnull JSReferenceExpressionImpl referenceExpre
     @RequiredReadAction
     private ResolveResult[] doResolve() {
         PsiFile containingFile = getContainingFile();
-        final String referencedName = getReferencedName();
+        String referencedName = getReferencedName();
         if (referencedName == null) {
             return ResolveResult.EMPTY_ARRAY;
         }
 
-        final PsiElement parent = getParent();
-        final JSExpression qualifier = getResolveQualifier();
+        PsiElement parent = getParent();
+        JSExpression qualifier = getResolveQualifier();
         Set<JavaScriptFeature> features = JavaScriptVersionUtil.getFeatures(this);
-        final boolean classFeature = features.contains(JavaScriptFeature.CLASS);
+        boolean classFeature = features.contains(JavaScriptFeature.CLASS);
 
-        final boolean localResolve = qualifier == null;
-        final boolean parentIsDefinition = parent instanceof JSDefinitionExpression;
+        boolean localResolve = qualifier == null;
+        boolean parentIsDefinition = parent instanceof JSDefinitionExpression;
 
         // Handle self references
         PsiElement currentParent = JSResolveUtil.getTopReferenceParent(parent);
-        if (JSResolveUtil.isSelfReference(currentParent, this)) {
-            if (!(currentParent instanceof JSPackageStatement) || parent == currentParent) {
-                return new ResolveResult[]{new JSResolveUtil.MyResolveResult(currentParent)};
-            }
+        if (JSResolveUtil.isSelfReference(currentParent, this)
+            && (!(currentParent instanceof JSPackageStatement) || parent == currentParent)) {
+            return new ResolveResult[]{new JSResolveUtil.MyResolveResult(currentParent)};
         }
 
         JSExpression realQualifier = getQualifier();
@@ -460,11 +450,11 @@ private ResolveResult[] doResolve() {
         if (qualifier == null) {
             localProcessor = new ResolveProcessor(referencedName, this);
 
-            final boolean canResolveAllLocally = !parentIsDefinition || !classFeature;
+            boolean canResolveAllLocally = !parentIsDefinition || !classFeature;
             doProcessLocalDeclarations(realQualifier, localProcessor, features, false);
 
             if (canResolveAllLocally) {
-                final PsiElement jsElement = localProcessor.getResult();
+                PsiElement jsElement = localProcessor.getResult();
 
                 if (jsElement != null || (qualifier != null && classFeature && localProcessor.foundAllValidResults())) {
                     return localProcessor.getResultsAsResolveResults();
@@ -482,7 +472,7 @@ private ResolveResult[] doResolve() {
             );
         }
         else {
-            final MyTypeProcessor processor = new MyTypeProcessor(referencedName, features, this);
+            MyTypeProcessor processor = new MyTypeProcessor(referencedName, features, this);
             BaseJSSymbolProcessor.doEvalForExpr(qualifier, containingFile, processor);
 
             if (processor.resolved == MyTypeProcessor.TypeResolveState.PrefixUnknown && classFeature) {
@@ -500,53 +490,53 @@ private ResolveResult[] doResolve() {
         }
     }
 
+    @RequiredReadAction
     private boolean isE4XAttributeReference(JSExpression realQualifier) {
         return getNode().findChildByType(JSTokenTypes.AT) != null
             || (realQualifier != null && realQualifier.getNode().findChildByType(JSTokenTypes.AT) != null);
     }
 
     @Nullable
+    @RequiredReadAction
     public JSExpression getResolveQualifier() {
-        final JSExpression qualifier = getQualifier();
+        JSExpression qualifier = getQualifier();
 
         if (qualifier instanceof JSReferenceExpression) {
-            final ASTNode astNode = getNode();
+            ASTNode astNode = getNode();
             ASTNode selection = astNode.getTreeNext();
             // TODO:this is not accurate
             if (selection != null && selection.getElementType() == JSTokenTypes.COLON_COLON) {
                 return null;
             }
 
-            final ASTNode nsSelection = astNode.findChildByType(JSTokenTypes.COLON_COLON);
+            ASTNode nsSelection = astNode.findChildByType(JSTokenTypes.COLON_COLON);
             if (nsSelection != null) {
                 return ((JSReferenceExpressionImpl)qualifier).getResolveQualifier();
             }
         }
         else if (qualifier == null) {
-            final ASTNode node = getNode().getFirstChildNode();
+            ASTNode node = getNode().getFirstChildNode();
 
             if (node.getElementType() == JSTokenTypes.AT) {
                 PsiElement parent = getParent();
-                if (parent instanceof JSBinaryExpression && parent.getParent().getParent() instanceof JSCallExpression call) {
+                if (parent instanceof JSBinaryExpression binary && binary.getParent().getParent() instanceof JSCallExpression call) {
                     parent = call.getMethodExpression();
                 }
-                if (parent instanceof JSExpression expression) {
-                    return expression;
-                }
-                return null;
+                return parent instanceof JSExpression expression ? expression : null;
             }
         }
         return qualifier;
     }
 
+    @RequiredReadAction
     private ResolveResult[] doOldResolve(
-        final PsiFile containingFile,
-        final String referencedName,
-        final PsiElement parent,
-        final JSExpression qualifier,
-        final boolean ecma,
-        final boolean localResolve,
-        final boolean parentIsDefinition,
+        PsiFile containingFile,
+        String referencedName,
+        PsiElement parent,
+        JSExpression qualifier,
+        boolean ecma,
+        boolean localResolve,
+        boolean parentIsDefinition,
         ResolveProcessor localProcessor
     ) {
         if (parentIsDefinition && ((ecma && !localResolve) || (!ecma && qualifier != null))) {
@@ -561,7 +551,7 @@ private ResolveResult[] doOldResolve(
             // Fallback for finding some assignment in global scope
         }
 
-        final WalkUpResolveProcessor processor =
+        WalkUpResolveProcessor processor =
             new WalkUpResolveProcessor(referencedName, null, containingFile, false, this);
 
         if (localProcessor != null) {
@@ -580,7 +570,7 @@ public boolean shouldCheckReferences() {
     private static class MyTypeProcessor extends ResolveProcessor implements BaseJSSymbolProcessor.TypeProcessor {
         private final Set<JavaScriptFeature> myFeatures;
 
-        public MyTypeProcessor(String referenceName, final Set<JavaScriptFeature> features, PsiElement _place) {
+        public MyTypeProcessor(String referenceName, Set<JavaScriptFeature> features, PsiElement _place) {
             super(referenceName, _place);
             myFeatures = features;
             setToProcessHierarchy(true);
@@ -603,7 +593,8 @@ public Set<JavaScriptFeature> getFeatures() {
         }
 
         @Override
-        public void process(String type, @Nonnull final BaseJSSymbolProcessor.EvaluateContext evaluateContext, PsiElement source) {
+        @RequiredReadAction
+        public void process(@Nonnull String type, @Nonnull BaseJSSymbolProcessor.EvaluateContext evaluateContext, PsiElement source) {
             if (evaluateContext.visitedTypes.contains(type)) {
                 return;
             }
@@ -624,22 +615,22 @@ public void process(String type, @Nonnull final BaseJSSymbolProcessor.EvaluateCo
 
             setProcessStatics(false);
 
-            final PsiElement placeParent = place.getParent();
+            PsiElement placeParent = place.getParent();
             boolean setTypeContext = placeParent instanceof JSReferenceList;
-            final PsiElement clazz = source != null && (source instanceof JSClass || source instanceof XmlFile)
+            PsiElement clazz = source != null && (source instanceof JSClass || source instanceof XmlFile)
                 ? source
                 : JSClassImpl.findClassFromNamespace(type, place);
 
             if (clazz instanceof JSClass jsClass) {
-                final boolean statics = ecma() && JSPsiImplUtils.isTheSameClass(typeSource, jsClass)
+                boolean statics = ecma() && JSPsiImplUtils.isTheSameClass(typeSource, jsClass)
                     && !(((JSReferenceExpression)place).getQualifier() instanceof JSCallExpression);
                 setProcessStatics(statics);
                 if (statics) {
                     setTypeName(jsClass.getQualifiedName());
                 }
 
-                final boolean saveSetTypeContext = isTypeContext();
-                final boolean saveToProcessMembers = isToProcessMembers();
+                boolean saveSetTypeContext = isTypeContext();
+                boolean saveToProcessMembers = isToProcessMembers();
 
                 if (setTypeContext) {
                     setTypeContext(setTypeContext);
@@ -647,12 +638,12 @@ public void process(String type, @Nonnull final BaseJSSymbolProcessor.EvaluateCo
                 }
 
                 try {
-                    final boolean b = clazz.processDeclarations(this, ResolveState.initial(), clazz, place);
+                    boolean b = clazz.processDeclarations(this, ResolveState.initial(), clazz, place);
                     if (!b) {
                         resolved = TypeResolveState.Resolved;
                     }
                     else if (ecma()) {
-                        final JSAttributeList attrList = jsClass.getAttributeList();
+                        JSAttributeList attrList = jsClass.getAttributeList();
                         if (attrList == null || !attrList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
                             resolved = TypeResolveState.Resolved;
                         }
@@ -671,7 +662,8 @@ else if (ecma()) {
         }
 
         @Override
-        public boolean execute(PsiElement element, ResolveState state) {
+        @RequiredReadAction
+        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
             boolean b = super.execute(element, state);
             if (ecma() && getResult() != null) {
                 resolved = MyTypeProcessor.TypeResolveState.Resolved;
@@ -685,7 +677,7 @@ public boolean ecma() {
         }
 
         @Override
-        public void setUnknownElement(@Nonnull final PsiElement element) {
+        public void setUnknownElement(@Nonnull PsiElement element) {
             if (!(element instanceof XmlToken)) {
                 boolean currentIsNotResolved =
                     element == BaseJSSymbolProcessor.getOriginalQualifier(((JSReferenceExpression)place).getQualifier());
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index 50fafeb3..75a99596 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -19,16 +19,14 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.stub.IStubElementType;
-import consulo.language.psi.stub.StubIndex;
-import consulo.util.collection.ArrayUtil;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.stub.StubIndex;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
-
+import consulo.util.collection.ArrayUtil;
 import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
@@ -38,11 +36,11 @@
  * @author Maxim.Mossienko
  */
 public class JSReferenceListImpl extends JSStubElementImpl<JSReferenceListStub> implements JSReferenceList {
-    public JSReferenceListImpl(final ASTNode node) {
+    public JSReferenceListImpl(ASTNode node) {
         super(node);
     }
 
-    public JSReferenceListImpl(final JSReferenceListStub stub, IStubElementType stubElementType) {
+    public JSReferenceListImpl(JSReferenceListStub stub, IStubElementType stubElementType) {
         super(stub, stubElementType);
     }
 
@@ -62,17 +60,17 @@ public JSReferenceExpression[] getExpressions() {
     @Override
     @RequiredReadAction
     public String[] getReferenceTexts() {
-        final JSReferenceListStub stub = getStub();
+        JSReferenceListStub stub = getStub();
         if (stub != null) {
             return stub.getReferenceTexts();
         }
 
-        final JSReferenceExpression[] referenceExpressions = getExpressions();
+        JSReferenceExpression[] referenceExpressions = getExpressions();
         if (referenceExpressions.length == 0) {
             return ArrayUtil.EMPTY_STRING_ARRAY;
         }
         int count = referenceExpressions.length;
-        final String[] result = ArrayUtil.newStringArray(count);
+        String[] result = ArrayUtil.newStringArray(count);
 
         for (int i = 0; i < count; ++i) {
             result[i] = referenceExpressions[i].getText();
@@ -81,24 +79,24 @@ public String[] getReferenceTexts() {
     }
 
     @Nonnull
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public JSClass[] getReferencedClasses() {
-        @NonNls String[] texts = getReferenceTexts();
+        String[] texts = getReferenceTexts();
 
         if (texts.length == 0) {
             return JSClass.EMPTY_ARRAY;
         }
 
-        final Project project = getProject();
-        final ArrayList<JSClass> supers = new ArrayList<>(1);
+        Project project = getProject();
+        ArrayList<JSClass> supers = new ArrayList<>(1);
 
         for (String text : texts) {
-            final int index = supers.size();
+            int index = supers.size();
 
             text = JSImportHandlingUtil.resolveTypeName(text, this);
 
-            final Collection<JSQualifiedNamedElement> candidates = StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_QNAME,
+            Collection<JSQualifiedNamedElement> candidates = StubIndex.getElements(JavaScriptIndexKeys.ELEMENTS_BY_QNAME,
                 text,
                 project,
                 getResolveScope(),
@@ -108,7 +106,7 @@ public JSClass[] getReferencedClasses() {
                 if (!(_clazz instanceof JSClass)) {
                     continue;
                 }
-                final JSClass clazz = (JSClass)_clazz;
+                JSClass clazz = (JSClass)_clazz;
 
                 if (text.equals(clazz.getQualifiedName())) {
                     if (clazz.canNavigate()) {
@@ -121,7 +119,7 @@ public JSClass[] getReferencedClasses() {
             }
 
             if (candidates.size() == 0) {
-                final PsiElement element = JSClassImpl.findClassFromNamespace(text, this);
+                PsiElement element = JSClassImpl.findClassFromNamespace(text, this);
                 if (element instanceof JSClass jsClass) {
                     supers.add(jsClass);
                 }

From 1f3023bdde9643ad5ec3c76bf21d66b93b07b83a Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 15:28:49 +0300
Subject: [PATCH 262/340] Support for new RegExp flags. Flag 'd', hasIndices
 (ES13/ES2022). Flas 's', dotAll (ES9/ES2018). Flag 'u', unicode (ES6/ES2015).
 Flag 'v', unicodeSets (ES13/ES2024). Flag 'y', sticky (ES6/ES2015).

---
 .../src/main/java/com/intellij/lang/javascript/JavaScript.flex  | 2 +-
 .../consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
index a2725d27..2f062db9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
@@ -62,7 +62,7 @@ DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
 ESCAPE_SEQUENCE=\\[^\r\n]
 GROUP = "[" [^\]]* "]"
 
-REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimx\u]*)?
+REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[dgimsuvy]*)?
 ALPHA=[:letter:]
 DIGIT=[0-9]
 XML_NAME=({ALPHA}|"_")({ALPHA}|{DIGIT}|"_"|"."|"-")*(":"({ALPHA}|"_")?({ALPHA}|{DIGIT}|"_"|"."|"-")*)?
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex
index 8631686d..6357c9d9 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/lexer/ecmascript6.flex
@@ -67,7 +67,7 @@ DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
 ESCAPE_SEQUENCE=\\[^\r\n]
 GROUP = "[" [^\]]* "]"
 
-REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimxu]*)?
+REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimsuy]*)?
 INTERPOLATION_STRING_LITERAL="`" [^"`"]* "`"
 
 ALPHA=[:letter:]

From 701559fb9e7591f58c9132cc4c2e767ce9b82434 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 18:22:43 +0300
Subject: [PATCH 263/340] Refactoring psi impl and resolve (third part).

---
 .../javascript/flex/XmlBackedJSClassImpl.java |  88 +++++-----
 .../javascript/psi/impl/JSReferenceSet.java   | 141 ++++++++-------
 .../psi/impl/JSReturnStatementImpl.java       |   7 +-
 .../javascript/psi/impl/JSStatementImpl.java  |   2 +-
 .../JSStatementWithLabelReferenceImpl.java    |  46 +++--
 .../psi/impl/JSStubElementImpl.java           |  29 +--
 .../psi/impl/JSStubbedStatementImpl.java      |  19 +-
 .../psi/impl/JSSuperExpressionImpl.java       |  50 ++++--
 .../psi/impl/JSSwitchStatementImpl.java       |   9 +-
 .../psi/impl/JSThisExpressionImpl.java        |   9 +-
 .../psi/impl/JSThrowStatementImpl.java        |   9 +-
 .../psi/impl/JSTryStatementImpl.java          |  31 ++--
 .../psi/impl/JSUseNamespaceDirectiveImpl.java |  22 +--
 .../psi/impl/JSVarStatementImpl.java          |  17 +-
 .../psi/impl/JSVariableBaseImpl.java          | 107 ++++++------
 .../javascript/psi/impl/JSVariableImpl.java   |  23 +--
 .../psi/impl/JSWhileStatementImpl.java        |   9 +-
 .../psi/impl/JSWithStatementImpl.java         |   9 +-
 .../psi/impl/JSXmlLiteralExpressionImpl.java  |  44 +++--
 .../psi/impl/JSYieldStatementImpl.java        |   2 +-
 .../javascript/psi/impl/ReferenceSupport.java |  69 ++++----
 .../psi/resolve/BaseJSSymbolProcessor.java    | 165 ++++++++----------
 .../psi/resolve/CompletionProcessor.java      |   2 +-
 .../psi/resolve/JSImportHandlingUtil.java     |  18 +-
 .../JSImportedElementResolveResult.java       |   3 +-
 .../psi/resolve/ResolveProcessor.java         |  48 ++---
 .../psi/resolve/VariantsProcessor.java        |  46 ++---
 .../psi/resolve/WalkUpResolveProcessor.java   |  29 +--
 .../lang/javascript/search/JSClassSearch.java |  53 +++---
 .../psi/JavaScriptLambdaExpressionImpl.java   |   9 +-
 30 files changed, 570 insertions(+), 545 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index 306b36db..e61cd9bf 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -188,13 +188,14 @@ public JSAttributeList getAttributeList() {
     }
 
     @Override
+    @RequiredReadAction
     protected boolean processMembers(
         PsiScopeProcessor processor,
         ResolveState substitutor,
         PsiElement lastParent,
         PsiElement place
     ) {
-        for (JSFile file : ourCachedScripts.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue()) {
+        for (JSFile file : CACHED_SCRIPTS.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue()) {
             if (!file.processDeclarations(processor, ResolveState.initial(), null, place)) {
                 return false;
             }
@@ -223,6 +224,7 @@ public boolean processDeclarations(
         return b;
     }
 
+    @RequiredReadAction
     public boolean doImportFromScripts(PsiScopeProcessor processor, PsiElement place) {
         PsiElement context = place.getContainingFile().getContext();
         if (context instanceof XmlText xmlText) {
@@ -241,7 +243,7 @@ public boolean doImportFromScripts(PsiScopeProcessor processor, PsiElement place
             boolean adequatePlace = false;
 
             XmlTag parent = getParent();
-            JSFile[] files = ourCachedScripts.get(CACHED_SCRIPTS_KEY, parent, null).getValue();
+            JSFile[] files = CACHED_SCRIPTS.get(CACHED_SCRIPTS_KEY, parent, null).getValue();
             for (JSFile file : files) {
                 if (JSImportHandlingUtil.isAdequatePlaceForImport(file, place)) {
                     if (useImports && JSImportHandlingUtil.importClass(processor, file)) {
@@ -251,26 +253,20 @@ public boolean doImportFromScripts(PsiScopeProcessor processor, PsiElement place
                 }
             }
 
-            if (adequatePlace && processor instanceof ResolveProcessor resolveProcessor) {
-                if (!processComponentNames(resolveProcessor)) {
-                    return false;
-                }
-            }
-        }
-
-        if (processor instanceof ResolveProcessor && JSResolveUtil.shouldProcessTopLevelGlobalContext(place, processor)
-            && notResolvingTypeViaImport) {
-            if (!JSResolveUtil.processGlobalThings(processor, ResolveState.initial(), place, this)) {
+            if (adequatePlace && processor instanceof ResolveProcessor resolveProcessor && !processComponentNames(resolveProcessor)) {
                 return false;
             }
         }
-        return true;
+
+        return !(processor instanceof ResolveProcessor) || !JSResolveUtil.shouldProcessTopLevelGlobalContext(place, processor)
+            || !notResolvingTypeViaImport || JSResolveUtil.processGlobalThings(processor, ResolveState.initial(), place, this);
     }
 
+    @RequiredReadAction
     public boolean processComponentNames(ResolveProcessor processor) {
         String s = processor.getName();
         Map<String, String> value =
-            myCachedComponentImportsCache.get(OUR_CACHED_SHORT_COMPONENTS_REF_KEY, (XmlFile)getContainingFile(), null).getValue();
+            CACHED_COMPONENT_IMPORTS_CACHE.get(CACHED_SHORT_COMPONENTS_REF_KEY, (XmlFile)getContainingFile(), null).getValue();
 
         if (s != null) {
             String qName = value.get(s);
@@ -293,41 +289,40 @@ public boolean processComponentNames(ResolveProcessor processor) {
     }
 
     private static final Key<CachedValue<JSFile[]>> CACHED_SCRIPTS_KEY = Key.create("cached.scripts");
-    private static final Key<CachedValue<Map<String, String>>> OUR_CACHED_SHORT_COMPONENTS_REF_KEY = Key.create("cached.component.refs");
+    private static final Key<CachedValue<Map<String, String>>> CACHED_SHORT_COMPONENTS_REF_KEY = Key.create("cached.component.refs");
 
     private static final String SCRIPT_TAG_NAME = "Script";
 
-    private static final UserDataCache<CachedValue<JSFile[]>, XmlTag, Object> ourCachedScripts =
-        new UserDataCache<>() {
-            @Override
-            protected CachedValue<JSFile[]> compute(XmlTag tag, Object p) {
-                return CachedValuesManager.getManager(tag.getProject()).createCachedValue(
-                    () -> {
-                        List<JSFile> injectedFiles = new ArrayList<>(2);
-                        List<PsiElement> dependencies = new ArrayList<>();
-                        dependencies.add(tag);
-                        new InjectedScriptsVisitor(
-                            tag,
-                            doProcessAllTags(tag),
-                            false,
-                            false,
-                            (rootTag, file) -> {
-                                injectedFiles.add(file);
-                                dependencies.add(file);
-                            }
-                        ).go();
-                        return new CachedValueProvider.Result<>(
-                            injectedFiles.toArray(new JSFile[injectedFiles.size()]),
-                            dependencies.toArray()
-                        );
-                    },
-                    false
-                );
-            }
-        };
+    private static final UserDataCache<CachedValue<JSFile[]>, XmlTag, Object> CACHED_SCRIPTS = new UserDataCache<>() {
+        @Override
+        protected CachedValue<JSFile[]> compute(XmlTag tag, Object p) {
+            return CachedValuesManager.getManager(tag.getProject()).createCachedValue(
+                () -> {
+                    List<JSFile> injectedFiles = new ArrayList<>(2);
+                    List<PsiElement> dependencies = new ArrayList<>();
+                    dependencies.add(tag);
+                    new InjectedScriptsVisitor(
+                        tag,
+                        doProcessAllTags(tag),
+                        false,
+                        false,
+                        (rootTag, file) -> {
+                            injectedFiles.add(file);
+                            dependencies.add(file);
+                        }
+                    ).go();
+                    return new CachedValueProvider.Result<>(
+                        injectedFiles.toArray(new JSFile[injectedFiles.size()]),
+                        dependencies.toArray()
+                    );
+                },
+                false
+            );
+        }
+    };
 
-    private static final UserDataCache<CachedValue<Map<String, String>>, XmlFile, Object> myCachedComponentImportsCache = new
-        UserDataCache<>() {
+    private static final UserDataCache<CachedValue<Map<String, String>>, XmlFile, Object> CACHED_COMPONENT_IMPORTS_CACHE =
+        new UserDataCache<>() {
             @Override
             protected CachedValue<Map<String, String>> compute(final XmlFile file, final Object p) {
                 return CachedValuesManager.getManager(file.getProject()).createCachedValue(
@@ -364,7 +359,6 @@ public void visitXmlTag(XmlTag tag) {
             }
         };
 
-
     public static boolean doProcessAllTags(XmlTag rootTag) {
         return JSLanguageInjector.isMozillaXulOrXblNs(rootTag != null ? rootTag.getNamespace() : null);
     }
@@ -526,7 +520,7 @@ public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) thro
     @Nullable
     @RequiredReadAction
     public JSFile findFirstScriptTag() {
-        JSFile[] value = ourCachedScripts.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue();
+        JSFile[] value = CACHED_SCRIPTS.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue();
         if (value.length > 0) {
             return value[0];
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index 41e40846..79e6f10d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.*;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
@@ -33,8 +34,6 @@
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.StringUtil;
 import consulo.xml.psi.xml.*;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -55,11 +54,11 @@ public class JSReferenceSet {
     private final boolean onlyFqns;
     private boolean myOnlyDefaultPackage;
 
-    public JSReferenceSet(final PsiElement element, String text, int offset, boolean soft) {
+    public JSReferenceSet(PsiElement element, String text, int offset, boolean soft) {
         this(element, text, offset, soft, false, false);
     }
 
-    public JSReferenceSet(final PsiElement element, String text, int offset, boolean soft, boolean _onlyPackages, boolean _onlyFqns) {
+    public JSReferenceSet(PsiElement element, String text, int offset, boolean soft, boolean _onlyPackages, boolean _onlyFqns) {
         this.element = element;
         isSoft = soft;
         myReferenceText = text;
@@ -68,14 +67,14 @@ public JSReferenceSet(final PsiElement element, String text, int offset, boolean
         onlyFqns = _onlyFqns;
     }
 
-    public JSReferenceSet(final PsiElement element, boolean soft) {
+    public JSReferenceSet(PsiElement element, boolean soft) {
         this.element = element;
         isSoft = soft;
         onlyPackages = false;
         onlyFqns = false;
     }
 
-    public JSReferenceSet(final PsiElement element) {
+    public JSReferenceSet(PsiElement element) {
         this(element, true);
     }
 
@@ -95,7 +94,7 @@ public void update(String text, int offset) {
             myReferences = PsiReference.EMPTY_ARRAY;
         }
         else {
-            final PsiReference[] list = reparse(StringUtil.stripQuotesAroundValue(text), offset + 1);
+            PsiReference[] list = reparse(StringUtil.stripQuotesAroundValue(text), offset + 1);
             myReferenceText = text;
             myReferences = list;
         }
@@ -112,7 +111,7 @@ private PsiReference[] reparse(String value, int offset) {
         int dotPos = findSeparatorPosition(value, lastPos);
 
         while (dotPos != -1) {
-            final String s = value.substring(lastPos, dotPos).trim();
+            String s = value.substring(lastPos, dotPos).trim();
 
             if (s.length() > 0) {
                 refs.add(new MyPsiReference(s, offset + lastPos, false));
@@ -124,12 +123,12 @@ private PsiReference[] reparse(String value, int offset) {
 
         int end = value.length();
 
-        final int lpar = value.indexOf('(', lastPos);
+        int lpar = value.indexOf('(', lastPos);
         if (lpar != -1) {
             end = lpar;
         }
 
-        final String s = value.substring(lastPos, end).trim();
+        String s = value.substring(lastPos, end).trim();
 
         if (s.length() > 0) {
             refs.add(new MyPsiReference(s, offset + lastPos, lastPos > 0 && value.charAt(lastPos - 1) == '#'));
@@ -138,7 +137,7 @@ private PsiReference[] reparse(String value, int offset) {
         return refs.toArray(new PsiReference[refs.size()]);
     }
 
-    private static int findSeparatorPosition(final String s, int fromIndex) {
+    private static int findSeparatorPosition(String s, int fromIndex) {
         int pos = s.indexOf('.', fromIndex);
         // no more than one ':' and '#' symbol after last '.'
         if (pos == -1 && s.indexOf(":") >= fromIndex) {
@@ -155,41 +154,46 @@ public boolean isSoft() {
     }
 
     private class MyPsiReference implements PsiPolyVariantReference, EmptyResolveMessageProvider {
-        private
-        @NonNls
-        String myText;
+        private String myText;
         private int myOffset;
         private boolean myMethodRef;
 
-        MyPsiReference(final String s, final int i, boolean methodRef) {
+        MyPsiReference(String s, int i, boolean methodRef) {
             myText = s;
             myOffset = i;
             myMethodRef = methodRef;
         }
 
         @Override
+        @RequiredReadAction
         public PsiElement getElement() {
             return element;
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public TextRange getRangeInElement() {
             return new TextRange(myOffset, myOffset + myText.length());
         }
 
-        @Override
         @Nullable
+        @Override
+        @RequiredReadAction
         public PsiElement resolve() {
-            final ResolveResult[] resolveResults = multiResolve(false);
+            ResolveResult[] resolveResults = multiResolve(false);
             return resolveResults.length == 1 ? resolveResults[0].getElement() : null;
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public String getCanonicalText() {
             return myText;
         }
 
         @Override
+        @RequiredWriteAction
         public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
             int i = newElementName.lastIndexOf('.');
             if (i != -1) {
@@ -199,6 +203,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
         }
 
         @Override
+        @RequiredWriteAction
         public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
             String qName = JSPsiImplUtils.getQNameForMove(getElement(), element);
             if (qName != null) {
@@ -212,16 +217,17 @@ public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOpe
         }
 
         @Override
+        @RequiredReadAction
         public boolean isReferenceTo(PsiElement element) {
-            if (element instanceof PsiNamedElement || element instanceof XmlAttributeValue) {
-                return JSResolveUtil.isReferenceTo(this, myText, element);
-            }
-            return false;
+            return (element instanceof PsiNamedElement || element instanceof XmlAttributeValue)
+                && JSResolveUtil.isReferenceTo(this, myText, element);
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public Object[] getVariants() {
-            final PsiFile containingFile = element.getContainingFile();
+            PsiFile containingFile = element.getContainingFile();
             ResolveProcessor processor = null;
 
             if (isNewResolveAndCompletion(containingFile)) {
@@ -233,9 +239,10 @@ public Object[] getVariants() {
             return getOldVariants(containingFile, processor);
         }
 
+        @RequiredReadAction
         private Object[] getOldVariants(PsiFile containingFile, ResolveProcessor localProcessor) {
-            final List<String> contextIds = fillContextIds();
-            final VariantsProcessor processor =
+            List<String> contextIds = fillContextIds();
+            VariantsProcessor processor =
                 new VariantsProcessor(contextIds != null ? ArrayUtil.toStringArray(contextIds) : null, containingFile, false, element);
 
             processor.setAddOnlyCompleteMatches(contextIds != null || !(element instanceof JSLiteralExpression));
@@ -244,7 +251,7 @@ private Object[] getOldVariants(PsiFile containingFile, ResolveProcessor localPr
             }
             //JSResolveUtil.processGlobalSymbols(containingFile, processor);
 
-            final PsiElement context = containingFile.getContext();
+            PsiElement context = containingFile.getContext();
             if (context != null) {
                 JSResolveUtil.treeWalkUp(processor, containingFile, containingFile, element);
             }
@@ -253,10 +260,11 @@ private Object[] getOldVariants(PsiFile containingFile, ResolveProcessor localPr
         }
 
         @Nullable
+        @RequiredReadAction
         private List<String> fillContextIds() {
             List<String> contextIds = null;
             PsiReference prevContextReference = null;
-            for (final PsiReference ref : myReferences) {
+            for (PsiReference ref : myReferences) {
                 if (ref == this) {
                     break;
                 }
@@ -271,21 +279,21 @@ private List<String> fillContextIds() {
                 PsiElement elt = findNearestClass();
 
                 if (elt instanceof JSClass jsClass && !(getElement() instanceof JSLiteralExpression)) {
-                    final String qName = jsClass.getQualifiedName();
+                    String qName = jsClass.getQualifiedName();
                     BaseJSSymbolProcessor.addIndexListFromQName(qName, elt, contextIds = new ArrayList<>());
                 }
             }
             else if (contextIds != null) {
                 PsiElement psiElement = JSResolveUtil.unwrapProxy(prevContextReference.resolve());
 
-                if (psiElement instanceof XmlToken) {
-                    final BaseJSSymbolProcessor.TagContextBuilder builder =
-                        new BaseJSSymbolProcessor.TagContextBuilder(psiElement, BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME);
+                if (psiElement instanceof XmlToken xmlToken) {
+                    BaseJSSymbolProcessor.TagContextBuilder builder =
+                        new BaseJSSymbolProcessor.TagContextBuilder(xmlToken, BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME);
                     psiElement = builder.element;
                 }
                 if (psiElement instanceof JSClass jsClass) {
-                    final String qName = jsClass.getQualifiedName();
-                    BaseJSSymbolProcessor.addIndexListFromQName(qName, psiElement, contextIds = new ArrayList<>());
+                    String qName = jsClass.getQualifiedName();
+                    BaseJSSymbolProcessor.addIndexListFromQName(qName, jsClass, contextIds = new ArrayList<>());
                 }
             }
 
@@ -293,6 +301,7 @@ else if (contextIds != null) {
         }
 
         @Override
+        @RequiredReadAction
         public boolean isSoft() {
             return JSReferenceSet.this.isSoft();
         }
@@ -300,7 +309,7 @@ public boolean isSoft() {
         @Override
         @Nonnull
         @RequiredReadAction
-        public ResolveResult[] multiResolve(final boolean incompleteCode) {
+        public ResolveResult[] multiResolve(boolean incompleteCode) {
             PsiFile containingFile = element.getContainingFile();
             if (containingFile == null) {
                 return ResolveResult.EMPTY_ARRAY;
@@ -309,6 +318,7 @@ public ResolveResult[] multiResolve(final boolean incompleteCode) {
                 .resolveWithCaching(this, MyResolver.INSTANCE, true, incompleteCode, containingFile);
         }
 
+        @RequiredReadAction
         private ResolveResult[] doResolve(PsiFile psiFile) {
             if ("int".equals(myText) ||
                 "uint".equals(myText) ||
@@ -329,9 +339,11 @@ private boolean isNewResolveAndCompletion(PsiFile psiFile) {
             return JSResolveUtil.isNewResolveAndCompletion(psiFile) || onlyFqns;
         }
 
+        @RequiredReadAction
         private ResolveProcessor doProcess(PsiFile psiFile, String text) {
             ResolveProcessor processor = new ResolveProcessor(text) {
                 @Override
+                @RequiredReadAction
                 public boolean execute(PsiElement element, ResolveState state) {
                     if (onlyPackages) {
                         return false;
@@ -339,8 +351,8 @@ public boolean execute(PsiElement element, ResolveState state) {
                     if (onlyFqns) {
                         return true;
                     }
-                    if (myOnlyDefaultPackage && element instanceof JSQualifiedNamedElement) {
-                        String qName = ((JSQualifiedNamedElement)element).getQualifiedName();
+                    if (myOnlyDefaultPackage && element instanceof JSQualifiedNamedElement qualifiedNamedElement) {
+                        String qName = qualifiedNamedElement.getQualifiedName();
                         if (qName != null && !StringUtil.isEmpty(StringUtil.getPackageName(qName))) {
                             return true;
                         }
@@ -358,18 +370,18 @@ public boolean execute(PsiElement element, ResolveState state) {
                 PsiElement elt = findNearestClass();
 
                 if (myOffset > 0) {
-                    if (elt instanceof JSClass && !(element instanceof JSLiteralExpression)) {
+                    if (elt instanceof JSClass jsClass && !(element instanceof JSLiteralExpression)) {
                         processor.setToProcessHierarchy(true);
                         processor.setTypeContext(true);
-                        if (!elt.processDeclarations(processor, ResolveState.initial(), elt, elt)) {
+                        if (!jsClass.processDeclarations(processor, ResolveState.initial(), jsClass, jsClass)) {
                             return processor;
                         }
                     }
                 }
-                else if (elt instanceof JSClass) {
+                else if (elt instanceof JSClass jsClass) {
                     processor.setTypeContext(true);
                     processor.setToProcessMembers(false);
-                    if (!elt.processDeclarations(processor, ResolveState.initial(), elt, elt)) {
+                    if (!jsClass.processDeclarations(processor, ResolveState.initial(), jsClass, jsClass)) {
                         return processor;
                     }
                 }
@@ -378,11 +390,9 @@ else if (elt instanceof JSClass) {
             else {
                 PsiElement psiElement = JSResolveUtil.unwrapProxy(myReferences[i - 1].resolve());
 
-                if (psiElement instanceof XmlToken) {
-                    final BaseJSSymbolProcessor.TagContextBuilder builder = new BaseJSSymbolProcessor.TagContextBuilder(
-                        psiElement,
-                        BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME
-                    );
+                if (psiElement instanceof XmlToken xmlToken) {
+                    BaseJSSymbolProcessor.TagContextBuilder builder =
+                        new BaseJSSymbolProcessor.TagContextBuilder(xmlToken, BaseJSSymbolProcessor.HTML_ELEMENT_TYPE_NAME);
                     psiElement = builder.element;
                 }
                 if (psiElement != null) {
@@ -393,13 +403,13 @@ else if (elt instanceof JSClass) {
                 }
             }
 
-            if (psiFile instanceof XmlFile && !JavaScriptSupportLoader.isFlexMxmFile(psiFile)) {
+            if (psiFile instanceof XmlFile xmlFile && !JavaScriptSupportLoader.isFlexMxmFile(xmlFile)) {
                 // TODO: short names during completion should be
                 JSResolveUtil.processTopLevelClasses(
                     processor,
                     ResolveState.initial(),
-                    psiFile.getProject(),
-                    psiFile.getResolveScope(),
+                    xmlFile.getProject(),
+                    xmlFile.getResolveScope(),
                     onlyFqns,
                     false
                 );
@@ -407,6 +417,7 @@ else if (elt instanceof JSClass) {
             return processor;
         }
 
+        @RequiredReadAction
         private PsiElement findNearestClass() {
             PsiElement elt = element;
             PsiElement parent;
@@ -426,30 +437,28 @@ private PsiElement findNearestClass() {
 
             if (elt != null && !(elt instanceof JSClass)) {
                 elt = elt.getNextSibling();
-                if (elt instanceof PsiWhiteSpace) {
-                    elt = elt.getNextSibling();
+                if (elt instanceof PsiWhiteSpace whiteSpace) {
+                    elt = whiteSpace.getNextSibling();
                 }
             }
             return elt;
         }
 
+        @RequiredReadAction
         private ResolveResult[] doOldResolve(PsiFile psiFile) {
             if ("*".equals(myText)) {
                 return new ResolveResult[]{new JSResolveUtil.MyResolveResult(element)};
             }
-            final List<String> contextIds = fillContextIds();
+            List<String> contextIds = fillContextIds();
 
             String text = myText;
 
-            if (getElement() instanceof JSDocTagValue) {
-                if (myReferences.length == 1 &&
-                    myReferences[myReferences.length - 1] == this &&
-                    !myMethodRef) {
-                    text = StringUtil.capitalize(text);
-                }
+            if (getElement() instanceof JSDocTagValue
+                && myReferences.length == 1 && myReferences[myReferences.length - 1] == this && !myMethodRef) {
+                text = StringUtil.capitalize(text);
             }
 
-            final WalkUpResolveProcessor processor = new WalkUpResolveProcessor(
+            WalkUpResolveProcessor processor = new WalkUpResolveProcessor(
                 text,
                 contextIds != null ? ArrayUtil.toStringArray(contextIds) : null,
                 psiFile,
@@ -459,9 +468,9 @@ private ResolveResult[] doOldResolve(PsiFile psiFile) {
 
             processor.setAddOnlyCompleteMatches(contextIds != null || !(element instanceof JSLiteralExpression));
             //JSResolveUtil.processGlobalSymbols(psiFile, processor);
-            final StringBuilder b = new StringBuilder();
+            StringBuilder b = new StringBuilder();
 
-            for (final PsiReference ref : myReferences) {
+            for (PsiReference ref : myReferences) {
                 if (b.length() > 0) {
                     b.append('.');
                 }
@@ -470,9 +479,9 @@ private ResolveResult[] doOldResolve(PsiFile psiFile) {
                     break;
                 }
             }
-            final String str = b.toString();
+            String str = b.toString();
 
-            final PsiElement context = psiFile.getContext();
+            PsiElement context = psiFile.getContext();
             if (context != null && str.indexOf('.') == -1) {
                 JSResolveUtil.treeWalkUp(processor, psiFile, psiFile, element);
             }
@@ -493,11 +502,13 @@ static class MyResolver implements ResolveCache.PolyVariantContextResolver<MyPsi
 
         @Nonnull
         @Override
+        @RequiredReadAction
         public ResolveResult[] resolve(@Nonnull MyPsiReference ref, @Nonnull PsiFile containingFile, boolean incompleteCode) {
             return ref.doResolve(containingFile);
         }
     }
 
+    @RequiredReadAction
     private static PsiElement handleContentChange(PsiElement elt, TextRange range, String newElementName) {
         if (elt instanceof XmlTag || elt instanceof XmlAttributeValue) {
             int i = newElementName.indexOf('.');
@@ -510,24 +521,24 @@ private static PsiElement handleContentChange(PsiElement elt, TextRange range, S
         String myReferenceText = elt.getText();
         String newLiteralText =
             myReferenceText.substring(0, range.getStartOffset()) + newElementName + myReferenceText.substring(range.getEndOffset());
-        final ASTNode expressionFromText;
+        ASTNode expressionFromText;
 
         Project project = elt.getProject();
         if (elt instanceof JSExpression) {
             expressionFromText = JSChangeUtil.createExpressionFromText(project, newLiteralText).getNode();
         }
         else if (elt instanceof JSAttributeNameValuePair) {
-            final PsiElement element = JSChangeUtil.createJSTreeFromText(project, "[XXX(" + newLiteralText + ")]").getPsi();
+            PsiElement element = JSChangeUtil.createJSTreeFromText(project, "[XXX(" + newLiteralText + ")]").getPsi();
             expressionFromText = ((JSAttribute)element.getFirstChild()).getValues()[0].getNode();
         }
         else {
             assert elt instanceof JSDocTagValue;
-            final PsiElement tag = JSChangeUtil.createJSTreeFromText(project, "/** @see " + newLiteralText + " */").getPsi();
+            PsiElement tag = JSChangeUtil.createJSTreeFromText(project, "/** @see " + newLiteralText + " */").getPsi();
             expressionFromText = ((JSDocTag)tag.getFirstChild().getChildren()[0]).getValue().getNode();
         }
 
         if (expressionFromText.getPsi().getClass() == elt.getClass()) {
-            final ASTNode astNode = elt.getNode();
+            ASTNode astNode = elt.getNode();
             astNode.replaceChild(astNode.getFirstChildNode(), expressionFromText.getFirstChildNode());
         }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
index 419650ae..86b170e8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
@@ -23,12 +23,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:57:08 PM
+ * @author max
+ * @since 2005-01-30
  */
 public class JSReturnStatementImpl extends JSStatementImpl implements JSReturnStatement {
-    public JSReturnStatementImpl(final ASTNode node) {
+    public JSReturnStatementImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
index ca9cc5f4..857e12d1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementImpl.java
@@ -22,7 +22,7 @@
  * @author ven
  */
 public abstract class JSStatementImpl extends JSStubbedStatementImpl {
-    public JSStatementImpl(final ASTNode node) {
+    public JSStatementImpl(ASTNode node) {
         super(node);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
index 0665b920..3a826e53 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
@@ -19,6 +19,8 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSLabeledStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.document.util.TextRange;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
@@ -34,32 +36,31 @@
 import java.util.List;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:52:04 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 abstract class JSStatementWithLabelReferenceImpl extends JSStatementImpl {
     private PsiReference[] myReferences;
     private String myReferencesText;
 
-    protected JSStatementWithLabelReferenceImpl(final ASTNode node) {
+    protected JSStatementWithLabelReferenceImpl(ASTNode node) {
         super(node);
     }
 
+    @RequiredReadAction
     public String getLabel() {
-        final ASTNode label = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        ASTNode label = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
         return label != null ? label.getText() : null;
     }
 
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public PsiReference[] getReferences() {
-        final String text = getText();
+        String text = getText();
 
         if (!text.equals(myReferencesText) || myReferences == null) {
-            final ASTNode label = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+            ASTNode label = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
             if (label != null) {
                 myReferences = new PsiReference[]{new JSStatementWithLabelReferenceImpl.LabelReference(label.getPsi())};
             }
@@ -79,26 +80,31 @@ private class LabelReference implements PsiReference {
         }
 
         @Override
+        @RequiredReadAction
         public PsiElement getElement() {
             return JSStatementWithLabelReferenceImpl.this;
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public TextRange getRangeInElement() {
-            final int startOffsetInParent = labelNode.getStartOffsetInParent();
+            int startOffsetInParent = labelNode.getStartOffsetInParent();
             return new TextRange(startOffsetInParent, startOffsetInParent + labelNode.getTextLength());
         }
 
         @Override
         @Nullable
+        @RequiredReadAction
         public PsiElement resolve() {
-            final PsiElement[] result = new PsiElement[1];
+            PsiElement[] result = new PsiElement[1];
 
             processElements(new PsiElementProcessor<>() {
                 private final String label = getCanonicalText();
 
                 @Override
-                public boolean execute(final JSLabeledStatement element) {
+                @RequiredReadAction
+                public boolean execute(@Nonnull JSLabeledStatement element) {
                     if (label.equals(element.getLabel())) {
                         result[0] = element;
                         return false;
@@ -110,28 +116,35 @@ public boolean execute(final JSLabeledStatement element) {
             return result[0];
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public String getCanonicalText() {
             return labelNode.getText();
         }
 
         @Override
+        @RequiredWriteAction
         public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
             JSChangeUtil.doIdentifierReplacement(getElement(), labelNode, newElementName);
             return getElement();
         }
 
         @Override
+        @RequiredWriteAction
         public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
             return null;
         }
 
         @Override
+        @RequiredReadAction
         public boolean isReferenceTo(PsiElement element) {
             return getManager().areElementsEquivalent(resolve(), element);
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public Object[] getVariants() {
             final List<String> labels = new ArrayList<>(1);
             processElements(element -> {
@@ -144,10 +157,8 @@ public Object[] getVariants() {
         private void processElements(PsiElementProcessor<JSLabeledStatement> processor) {
             PsiElement run = getParent();
             while (run != null) {
-                if (run instanceof JSLabeledStatement) {
-                    if (!processor.execute((JSLabeledStatement)run)) {
-                        return;
-                    }
+                if (run instanceof JSLabeledStatement labeledStatement && !processor.execute(labeledStatement)) {
+                    return;
                 }
 
                 if (run instanceof JSFunction) {
@@ -158,6 +169,7 @@ private void processElements(PsiElementProcessor<JSLabeledStatement> processor)
         }
 
         @Override
+        @RequiredReadAction
         public boolean isSoft() {
             return false;
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
index e8f51204..e7644816 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
@@ -20,6 +20,8 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSNamedElement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.content.scope.SearchScope;
 import consulo.language.ast.ASTNode;
 import consulo.language.impl.psi.stub.StubBasedPsiElementBase;
@@ -34,18 +36,17 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * User: max
- * Date: Jan 30, 2005
- * Time: 8:23:10 PM
+ * @author max
+ * @since 2005-01-30
  */
 public abstract class JSStubElementImpl<T extends StubElement> extends StubBasedPsiElementBase<T> implements JSElement {
     public static Key<NavigationItem> ORIGINAL_ELEMENT = Key.create("ORIGINAL_NAMED_ELEMENT");
 
-    public JSStubElementImpl(final ASTNode node) {
+    public JSStubElementImpl(ASTNode node) {
         super(node);
     }
 
-    public JSStubElementImpl(final T t, IStubElementType type) {
+    public JSStubElementImpl(T t, IStubElementType type) {
         super(t, type);
     }
 
@@ -68,16 +69,14 @@ public SearchScope getDefaultUseScope() {
     @Override
     public ItemPresentation getPresentation() {
         if (this instanceof JSNamedElement namedThis) {
-            final NavigationItem element = getUserData(ORIGINAL_ELEMENT);
-            if (element == null) {
-                return new JSItemPresentation(namedThis);
-            }
-            return element.getPresentation();
+            NavigationItem element = getUserData(ORIGINAL_ELEMENT);
+            return element == null ? new JSItemPresentation(namedThis) : element.getPresentation();
         }
         return null;
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
             if (JSChangeUtil.isStatementContainer(this)) {
@@ -92,6 +91,7 @@ else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
             if (JSChangeUtil.isStatementContainer(this)) {
@@ -105,6 +105,7 @@ else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement addRangeBefore(@Nonnull PsiElement first, @Nonnull PsiElement last, PsiElement anchor)
         throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(first)) {
@@ -119,6 +120,7 @@ else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(first)) {
             if (JSChangeUtil.isStatementContainer(this)) {
@@ -133,19 +135,22 @@ else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
         return addAfter(element, null);
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOperationException {
         return addRangeAfter(first, last, null);
     }
 
     @Override
+    @RequiredReadAction
     public PsiElement replace(@Nonnull PsiElement newElement) throws IncorrectOperationException {
-        final ASTNode myNode = getNode();
-        final ASTNode result = newElement.getNode().copyElement();
+        ASTNode myNode = getNode();
+        ASTNode result = newElement.getNode().copyElement();
         myNode.getTreeParent().replaceChild(myNode, result);
         return result.getPsi();
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
index 66805e1f..d91acb1e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubbedStatementImpl.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSSuppressionHolder;
 import com.intellij.lang.javascript.types.JSFileElementType;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 import consulo.language.codeStyle.CodeStyleManager;
@@ -31,27 +32,30 @@
  * @author ven
  */
 abstract class JSStubbedStatementImpl<T extends StubElement> extends JSStubElementImpl<T> implements JSStatement, JSSuppressionHolder {
-    JSStubbedStatementImpl(final ASTNode node) {
+    JSStubbedStatementImpl(ASTNode node) {
         super(node);
     }
 
-    JSStubbedStatementImpl(final T t, IStubElementType type) {
+    JSStubbedStatementImpl(T t, IStubElementType type) {
         super(t, type);
     }
 
     @Override
+    @RequiredWriteAction
     public JSStatement addStatementBefore(JSStatement toAdd) throws IncorrectOperationException {
         return addStatementImpl(toAdd, true);
     }
 
     @Override
+    @RequiredWriteAction
     public JSStatement addStatementAfter(JSStatement toAdd) throws IncorrectOperationException {
         return addStatementImpl(toAdd, false);
     }
 
     //TODO: [lesya] the formatter stuff definitely needs more intelligence
-    private JSStatement addStatementImpl(final JSStatement toAdd, final boolean before) throws IncorrectOperationException {
-        final ASTNode treeParent = getNode().getTreeParent();
+    @RequiredWriteAction
+    private JSStatement addStatementImpl(JSStatement toAdd, boolean before) throws IncorrectOperationException {
+        ASTNode treeParent = getNode().getTreeParent();
 
         IElementType elementType = treeParent.getElementType();
         if (elementType != JSElementTypes.BLOCK_STATEMENT
@@ -66,24 +70,25 @@ private JSStatement addStatementImpl(final JSStatement toAdd, final boolean befo
             }
         }
         else {
-            final ASTNode copy = toAdd.getNode().copyElement();
+            ASTNode copy = toAdd.getNode().copyElement();
             addChildAndReformat(treeParent, copy, before ? getNode() : getNode().getTreeNext());
             return (JSStatement)copy.getPsi();
         }
     }
 
-    private void addChildAndReformat(final ASTNode block, final ASTNode addedElement, final ASTNode anchorBefore)
-        throws IncorrectOperationException {
+    private void addChildAndReformat(ASTNode block, ASTNode addedElement, ASTNode anchorBefore) throws IncorrectOperationException {
         block.addChild(addedElement, anchorBefore);
         CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(block, addedElement);
     }
 
     @Override
+    @RequiredWriteAction
     public JSStatement replace(JSStatement newStatement) {
         return JSChangeUtil.replaceStatement(this, newStatement);
     }
 
     @Override
+    @RequiredWriteAction
     public void delete() throws IncorrectOperationException {
         getNode().getTreeParent().removeChild(getNode());
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
index f5651132..0c89e2d8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
@@ -19,6 +19,8 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -33,13 +35,11 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:24:42 PM
+ * @author max
+ * @since 2005-01-30
  */
 public class JSSuperExpressionImpl extends JSExpressionImpl implements JSSuperExpression {
-    public JSSuperExpressionImpl(final ASTNode node) {
+    public JSSuperExpressionImpl(ASTNode node) {
         super(node);
     }
 
@@ -59,24 +59,27 @@ public PsiReference[] getReferences() {
         PsiReference[] refs = {
             new PsiReference() {
                 @Override
+                @RequiredReadAction
                 public PsiElement getElement() {
                     return JSSuperExpressionImpl.this;
                 }
 
+                @Nonnull
                 @Override
+                @RequiredReadAction
                 public TextRange getRangeInElement() {
                     return new TextRange(0, getTextLength());
                 }
 
-                @Override
                 @Nullable
+                @Override
+                @RequiredReadAction
                 public PsiElement resolve() {
-                    final PsiElement element = findClass();
+                    PsiElement element = findClass();
 
-                    if (getElement().getParent() instanceof JSCallExpression && element instanceof JSClass) {
-                        final JSClass clazz = (JSClass)element;
-                        final ResolveProcessor processor = new ResolveProcessor(clazz.getName(), JSSuperExpressionImpl.this);
-                        element.processDeclarations(processor, ResolveState.initial(), clazz, getElement());
+                    if (getElement().getParent() instanceof JSCallExpression && element instanceof JSClass jsClass) {
+                        ResolveProcessor processor = new ResolveProcessor(jsClass.getName(), JSSuperExpressionImpl.this);
+                        element.processDeclarations(processor, ResolveState.initial(), jsClass, getElement());
                         if (processor.getResult() != null) {
                             return processor.getResult();
                         }
@@ -85,21 +88,22 @@ public PsiElement resolve() {
                     return element;
                 }
 
+                @RequiredReadAction
                 private PsiElement findClass() {
-                    final JSClass jsClass = PsiTreeUtil.getParentOfType(getElement(), JSClass.class);
+                    JSClass jsClass = PsiTreeUtil.getParentOfType(getElement(), JSClass.class);
 
                     if (jsClass != null) {
-                        final JSReferenceList extendsList = jsClass.getExtendsList();
+                        JSReferenceList extendsList = jsClass.getExtendsList();
                         if (extendsList != null) {
-                            final JSReferenceExpression[] referenceExpressions = extendsList.getExpressions();
+                            JSReferenceExpression[] referenceExpressions = extendsList.getExpressions();
                             if (referenceExpressions != null && referenceExpressions.length > 0) {
-                                final ResolveResult[] results = referenceExpressions[0].multiResolve(false);
+                                ResolveResult[] results = referenceExpressions[0].multiResolve(false);
                                 return results.length > 0 ? results[0].getElement() : null;
                             }
                         }
                     }
                     else {
-                        final JSFile jsFile = PsiTreeUtil.getParentOfType(getElement(), JSFile.class);
+                        JSFile jsFile = PsiTreeUtil.getParentOfType(getElement(), JSFile.class);
 
                         if (jsFile != null) {
                             return JSResolveUtil.getClassReferenceForXmlFromContext(jsFile);
@@ -108,32 +112,40 @@ private PsiElement findClass() {
                     return null;
                 }
 
+                @Nonnull
                 @Override
+                @RequiredReadAction
                 public String getCanonicalText() {
                     return getText();
                 }
 
                 @Override
-                public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException {
+                @RequiredWriteAction
+                public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
                     return null;
                 }
 
                 @Override
-                public PsiElement bindToElement(@Nonnull final PsiElement element) throws IncorrectOperationException {
+                @RequiredWriteAction
+                public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
                     return null;
                 }
 
                 @Override
-                public boolean isReferenceTo(final PsiElement element) {
+                @RequiredReadAction
+                public boolean isReferenceTo(PsiElement element) {
                     return false;
                 }
 
+                @Nonnull
                 @Override
+                @RequiredReadAction
                 public Object[] getVariants() {
                     return ArrayUtil.EMPTY_OBJECT_ARRAY;
                 }
 
                 @Override
+                @RequiredReadAction
                 public boolean isSoft() {
                     return true;
                 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
index 4591c2c4..d8dcd6ef 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
@@ -26,16 +26,13 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 10:08:20 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSSwitchStatementImpl extends JSStatementImpl implements JSSwitchStatement {
     private static final TokenSet CASE_CLAUSE_FILTER = TokenSet.create(JSElementTypes.CASE_CLAUSE);
 
-    public JSSwitchStatementImpl(final ASTNode node) {
+    public JSSwitchStatementImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
index 1c7ecb31..66777356 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
@@ -23,14 +23,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 11:24:42 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSThisExpressionImpl extends JSExpressionImpl implements JSThisExpression {
-    public JSThisExpressionImpl(final ASTNode node) {
+    public JSThisExpressionImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
index 052cd3e3..3aaf49f5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
@@ -23,14 +23,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:57:08 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSThrowStatementImpl extends JSStatementImpl implements JSThrowStatement {
-    public JSThrowStatementImpl(final ASTNode node) {
+    public JSThrowStatementImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
index 8f997a4b..8e6da9f5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -30,26 +31,24 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:59:44 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSTryStatementImpl extends JSStatementImpl implements JSTryStatement {
-    private static TokenSet ourCatchesTypeSet = TokenSet.create(JSElementTypes.CATCH_BLOCK);
+    private static final TokenSet CATCHES_TYPE_SET = TokenSet.create(JSElementTypes.CATCH_BLOCK);
 
-    public JSTryStatementImpl(final ASTNode node) {
+    public JSTryStatementImpl(ASTNode node) {
         super(node);
     }
 
     @Override
+    @RequiredReadAction
     public JSStatement getStatement() {
         ASTNode child = getNode().getFirstChildNode();
         while (child != null) {
-            final IElementType type = child.getElementType();
-            if (child.getPsi() instanceof JSStatement) {
-                return (JSStatement)child.getPsi();
+            IElementType type = child.getElementType();
+            if (child.getPsi() instanceof JSStatement statement) {
+                return statement;
             }
             if (type == JSTokenTypes.FINALLY_KEYWORD) {
                 break;
@@ -61,27 +60,31 @@ public JSStatement getStatement() {
 
     @Override
     @Nullable
+    @RequiredReadAction
     public JSCatchBlock getCatchBlock() {
-        final ASTNode catchChild = getNode().findChildByType(JSElementTypes.CATCH_BLOCK);
+        ASTNode catchChild = getNode().findChildByType(JSElementTypes.CATCH_BLOCK);
         if (catchChild == null) {
             return null;
         }
         return (JSCatchBlock)catchChild.getPsi();
     }
 
+    @Nonnull
     @Override
+    @RequiredReadAction
     public JSCatchBlock[] getAllCatchBlocks() {
         return findChildrenByClass(JSCatchBlock.class);
     }
 
     @Override
+    @RequiredReadAction
     public JSStatement getFinallyStatement() {
         ASTNode child = getNode().getFirstChildNode();
         boolean foundFinally = false;
         while (child != null) {
-            final IElementType type = child.getElementType();
-            if (foundFinally && child.getPsi() instanceof JSStatement) {
-                return (JSStatement)child.getPsi();
+            IElementType type = child.getElementType();
+            if (foundFinally && child.getPsi() instanceof JSStatement statement) {
+                return statement;
             }
             if (type == JSTokenTypes.FINALLY_KEYWORD) {
                 foundFinally = true;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
index a140f430..7cf92043 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -29,14 +30,14 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public class JSUseNamespaceDirectiveImpl extends JSStubbedStatementImpl<JSUseNamespaceDirectiveStub> implements JSUseNamespaceDirective {
-    public JSUseNamespaceDirectiveImpl(final ASTNode node) {
+    public JSUseNamespaceDirectiveImpl(ASTNode node) {
         super(node);
     }
 
-    public JSUseNamespaceDirectiveImpl(final JSUseNamespaceDirectiveStub stub) {
+    public JSUseNamespaceDirectiveImpl(JSUseNamespaceDirectiveStub stub) {
         super(stub, JSElementTypes.USE_NAMESPACE_DIRECTIVE);
     }
 
@@ -46,25 +47,24 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public String getNamespaceToBeUsed() {
-        final JSUseNamespaceDirectiveStub stub = getStub();
+        JSUseNamespaceDirectiveStub stub = getStub();
         if (stub != null) {
             return stub.getNamespaceToUse();
         }
-        final ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
+        ASTNode node = getNode().findChildByType(JSElementTypes.REFERENCE_EXPRESSION);
         return node != null ? node.getText() : null;
     }
 
     @Override
     public boolean processDeclarations(
         @Nonnull PsiScopeProcessor processor,
-		@Nonnull ResolveState state,
-		PsiElement lastParent,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
         @Nonnull PsiElement place
     ) {
-        if (processor instanceof ResolveProcessor resolveProcessor && resolveProcessor.lookingForUseNamespaces()) {
-            return processor.execute(this, state);
-        }
-        return true;
+        return !(processor instanceof ResolveProcessor resolveProcessor && resolveProcessor.lookingForUseNamespaces())
+            || processor.execute(this, state);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
index 0ddd589f..8d313d9e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
@@ -29,22 +29,20 @@
 import jakarta.annotation.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:35:47 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSVarStatementImpl extends JSStubbedStatementImpl<JSVarStatementStub> implements JSVarStatement {
-    public JSVarStatementImpl(final ASTNode node) {
+    public JSVarStatementImpl(ASTNode node) {
         super(node);
     }
 
-    public JSVarStatementImpl(final JSVarStatementStub node) {
+    public JSVarStatementImpl(JSVarStatementStub node) {
         super(node, JSElementTypes.VAR_STATEMENT);
     }
 
     @Override
+    @RequiredReadAction
     public JSVariable[] getVariables() {
         JSDestructuringElement destructuringElement = getDestructuringElement();
         if (destructuringElement != null) {
@@ -53,9 +51,9 @@ public JSVariable[] getVariables() {
         return getStubOrPsiChildren(JSElementTypes.VARIABLE, JSVariable.EMPTY_ARRAY);
     }
 
-    @RequiredReadAction
     @Nullable
     @Override
+    @RequiredReadAction
     public JSDestructuringElement getDestructuringElement() {
         return findChildByClass(JSDestructuringElement.class);
     }
@@ -71,13 +69,14 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     }
 
     @Override
+    @RequiredReadAction
     public boolean processDeclarations(
         @Nonnull PsiScopeProcessor processor,
         @Nonnull ResolveState state,
         PsiElement lastParent,
         @Nonnull PsiElement place
     ) {
-        final JSVariable[] vars = getVariables();
+        JSVariable[] vars = getVariables();
 
         for (JSVariable var : vars) {
             if (lastParent != null && lastParent.getParent() == var) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index 23faf150..4779bf23 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -23,6 +23,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStubBase;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.application.util.RecursionManager;
 import consulo.content.scope.SearchScope;
 import consulo.javascript.impl.language.psi.JSStubElementType;
@@ -40,11 +41,8 @@
 import java.util.function.Supplier;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 8:47:58 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSVariableBaseImpl<T extends JSVariableStubBase<T2>, T2 extends JSVariable>
     extends JSStubElementImpl<T> implements JSVariable {
@@ -52,17 +50,18 @@ protected JSVariableBaseImpl(ASTNode node) {
         super(node);
     }
 
-    protected JSVariableBaseImpl(final T stub, final JSStubElementType<T, T2> elementType) {
+    protected JSVariableBaseImpl(T stub, JSStubElementType<T, T2> elementType) {
         super(stub, elementType);
     }
 
     @Override
+    @RequiredReadAction
     public boolean hasInitializer() {
         return getInitializerText() != null;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public JSExpression getInitializer() {
         PsiElement element = findChildByType(JSTokenTypes.EQ);
         if (element == null) {
@@ -78,43 +77,45 @@ public JSExpression getInitializer() {
     }
 
     @Override
+    @RequiredReadAction
     public String getInitializerText() {
-        final T stub = getStub();
+        T stub = getStub();
         if (stub != null) {
             return stub.getInitializerText();
         }
 
-        final JSExpression expression = getInitializer();
+        JSExpression expression = getInitializer();
         return expression != null ? expression.getText() : null;
     }
 
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public SearchScope getUseScope() {
         return JSResolveUtil.findUseScope(this);
     }
 
     @Override
+    @RequiredReadAction
     public String getName() {
-        final T stub = getStub();
+        T stub = getStub();
         if (stub != null) {
             return stub.getName();
         }
-        final PsiElement name = getNameIdentifier();
+        PsiElement name = getNameIdentifier();
 
-        if (name instanceof JSReferenceExpression referenceExpression) {
-            return referenceExpression.getReferencedName();
+        if (name instanceof JSReferenceExpression refExpr) {
+            return refExpr.getReferencedName();
         }
         return name != null ? name.getText() : "";
     }
 
     @Override
     public JSAttributeList getAttributeList() {
-        PsiElement parent = getParent();
-        if (!(parent instanceof JSVarStatement)) {
-            return null;
+        if (getParent() instanceof JSVarStatement varStatement) {
+            return ((JSVarStatementImpl)varStatement).getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
         }
-        return ((JSVarStatementImpl)getParent()).getStubOrPsiChild(JSElementTypes.ATTRIBUTE_LIST);
+        return null;
     }
 
     @Override
@@ -124,32 +125,35 @@ public void setInitializer(JSExpression expr) throws IncorrectOperationException
 
     @Nonnull
     @Override
+    @RequiredReadAction
     public JavaScriptType getType() {
-        final JSExpression initializer = getInitializer();
+        JSExpression initializer = getInitializer();
         if (initializer != null) {
             if (initializer instanceof JSObjectLiteralExpression lit) {
                 return new JavaScriptSimpleType(getName(), lit);
             }
             
-            JavaScriptType javaScriptType = RecursionManager.doPreventingRecursion(this, false, new Supplier<JavaScriptType>() {
-                @Override
-                @RequiredReadAction
-                public JavaScriptType get() {
-                    return initializer.getType();
+            JavaScriptType javaScriptType = RecursionManager.doPreventingRecursion(
+                this,
+                false,
+                new Supplier<JavaScriptType>() {
+                    @Override
+                    @RequiredReadAction
+                    public JavaScriptType get() {
+                        return initializer.getType();
+                    }
                 }
-            });
+            );
             return javaScriptType == null ? JavaScriptType.UNKNOWN : javaScriptType;
         }
         return JavaScriptType.UNKNOWN;
     }
 
     @Override
+    @RequiredReadAction
     public String getTypeString() {
-        final T stub = getStub();
-        if (stub != null) {
-            return stub.getTypeString();
-        }
-        return doGetType();
+        T stub = getStub();
+        return stub != null ? stub.getTypeString() : doGetType();
     }
 
     @RequiredReadAction
@@ -158,17 +162,19 @@ public JavaScriptTypeElement getTypeElement() {
         return JSPsiImplUtils.findTypeElement(this);
     }
 
+    @RequiredReadAction
     protected String doGetType() {
         return JSPsiImplUtils.getType(this);
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
-        final PsiElement nameNode = getNameIdentifier();
+        PsiElement nameNode = getNameIdentifier();
         if (nameNode == null) {
             return this;
         }
-        final ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), name);
+        ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), name);
         getNode().replaceChild(nameNode.getNode(), nameElement);
         return this;
     }
@@ -181,17 +187,18 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
     @RequiredReadAction
     @Override
     public int getTextOffset() {
-        final PsiElement name = getNameIdentifier();
+        PsiElement name = getNameIdentifier();
         return name != null ? name.getTextOffset() : super.getTextOffset();
     }
 
     @Override
+    @RequiredReadAction
     public boolean isConst() {
-        final T stub = getStub();
+        T stub = getStub();
         if (stub != null) {
             return stub.isConst();
         }
-        final ASTNode parent = getNode().getTreeParent();
+        ASTNode parent = getNode().getTreeParent();
 
         if (parent.getElementType() == JSElementTypes.VAR_STATEMENT) {
             ASTNode node = parent.getFirstChildNode();
@@ -211,19 +218,20 @@ public boolean isConst() {
     }
 
     @Override
+    @RequiredReadAction
     public boolean isLocal() {
-        final T stub = getStub();
+        T stub = getStub();
         if (stub != null) {
             return stub.isLocal();
         }
-        final ASTNode parent = getNode().getTreeParent();
+        ASTNode parent = getNode().getTreeParent();
         return parent.getElementType() == JSElementTypes.VAR_STATEMENT
             && parent.getFirstChildNode().getElementType() == JSTokenTypes.LET_KEYWORD;
     }
 
     @Override
     public boolean isDeprecated() {
-        final T stub = getStub();
+        T stub = getStub();
         if (stub != null) {
             return stub.isDeprecated();
         }
@@ -231,12 +239,13 @@ public boolean isDeprecated() {
     }
 
     @Override
+    @RequiredWriteAction
     public void delete() throws IncorrectOperationException {
-        final ASTNode myNode = getNode();
-        final ASTNode parent = myNode.getTreeParent();
+        ASTNode myNode = getNode();
+        ASTNode parent = myNode.getTreeParent();
 
         if (parent.getElementType() == JSElementTypes.VAR_STATEMENT) {
-            final JSVariable[] jsVariables = ((JSVarStatement)parent.getPsi()).getVariables();
+            JSVariable[] jsVariables = ((JSVarStatement)parent.getPsi()).getVariables();
 
             if (jsVariables.length == 1) {
                 parent.getPsi().delete();
@@ -252,10 +261,10 @@ public void delete() throws IncorrectOperationException {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull final PsiScopeProcessor processor,
-        @Nonnull final ResolveState state,
-        final PsiElement lastParent,
-        @Nonnull final PsiElement place
+        @Nonnull PsiScopeProcessor processor,
+        @Nonnull ResolveState state,
+        PsiElement lastParent,
+        @Nonnull PsiElement place
     ) {
         if (lastParent != null && lastParent.getParent() == this) {
             processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
@@ -264,12 +273,10 @@ public boolean processDeclarations(
     }
 
     @Override
+    @RequiredReadAction
     public String getQualifiedName() {
-        final T stub = getStub();
-        if (stub != null) {
-            return stub.getQualifiedName();
-        }
-        return JSPsiImplUtils.getQName(this);
+        T stub = getStub();
+        return stub != null ? stub.getQualifiedName() : JSPsiImplUtils.getQName(this);
     }
 
     @Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
index ba78ab6f..3b0ade94 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
@@ -21,34 +21,34 @@
 import com.intellij.lang.javascript.psi.JSPackageStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.stubs.JSVariableStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.ast.ASTNode;
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 8:47:58 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSVariableImpl extends JSVariableBaseImpl<JSVariableStub, JSVariable> {
-    public JSVariableImpl(final ASTNode node) {
+    public JSVariableImpl(ASTNode node) {
         super(node);
     }
 
-    public JSVariableImpl(final JSVariableStub stub) {
+    public JSVariableImpl(JSVariableStub stub) {
         super(stub, JSElementTypes.VARIABLE);
     }
 
+    @Nonnull
     @Override
+    @RequiredReadAction
     public PsiElement getNavigationElement() {
-        PsiElement parent = getParent().getParent();
-        if (parent instanceof JSClass) {
-            PsiElement parentOriginalElement = parent.getNavigationElement();
+        if (getParent().getParent() instanceof JSClass jsClass) {
+            PsiElement parentOriginalElement = jsClass.getNavigationElement();
 
-            if (parentOriginalElement != parent) {
+            if (parentOriginalElement != jsClass) {
                 JSVariable jsVariable = ((JSClass)parentOriginalElement).findFieldByName(getName());
                 return jsVariable != null ? jsVariable : this;
             }
@@ -57,6 +57,7 @@ public PsiElement getNavigationElement() {
     }
 
     @Override
+    @RequiredWriteAction
     public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
         String oldName = getName();
         PsiElement element = super.setName(name);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
index 8634f9e5..a6fc239f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -25,12 +26,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * User: max
- * Date: Jan 30, 2005
- * Time: 10:15:13 PM
+ * @author max
+ * @since 2005-01-30
  */
 public class JSWhileStatementImpl extends JSStatementImpl implements JSWhileStatement {
-    public JSWhileStatementImpl(final ASTNode node) {
+    public JSWhileStatementImpl(ASTNode node) {
         super(node);
     }
 
@@ -40,6 +40,7 @@ public JSExpression getCondition() {
     }
 
     @Override
+    @RequiredReadAction
     public JSStatement getBody() {
         return findChildByClass(JSStatement.class);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
index 97271ecc..890faccd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
@@ -24,14 +24,11 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 30, 2005
- * Time: 9:54:56 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-30
  */
 public class JSWithStatementImpl extends JSStatementImpl implements JSWithStatement {
-    public JSWithStatementImpl(final ASTNode node) {
+    public JSWithStatementImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index f9c7ecff..d6b1df99 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -32,8 +32,6 @@
 import consulo.language.psi.resolve.PsiElementProcessor;
 import consulo.language.util.IncorrectOperationException;
 import consulo.xml.psi.xml.*;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -51,13 +49,16 @@ protected LightXmlValue(PsiManager manager, Language language) {
             super(manager, language);
         }
 
+        @Nonnull
         @Override
+        @RequiredReadAction
         public TextRange getTextRange() {
             return TextRange.EMPTY_RANGE;
         }
 
         @Nonnull
         @Override
+        @RequiredReadAction
         public XmlTagChild[] getChildren() {
             return XmlTagChild.EMPTY_ARRAY;
         }
@@ -100,7 +101,7 @@ public boolean hasCDATA() {
         }
     }
 
-    public JSXmlLiteralExpressionImpl(final ASTNode node) {
+    public JSXmlLiteralExpressionImpl(ASTNode node) {
         super(node);
     }
 
@@ -133,6 +134,7 @@ protected void accept(@Nonnull JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
+    @Nonnull
     @Override
     @RequiredReadAction
     public String getName() {
@@ -142,7 +144,7 @@ public String getName() {
 
     @RequiredWriteAction
     @Override
-    public PsiElement setName(@Nonnull @NonNls String s) throws IncorrectOperationException {
+    public PsiElement setName(@Nonnull String s) throws IncorrectOperationException {
         return null;
     }
 
@@ -154,6 +156,7 @@ public String getNamespace() {
 
     @Nonnull
     @Override
+    @RequiredReadAction
     public String getLocalName() {
         return getName();
     }
@@ -172,46 +175,41 @@ public XmlAttribute[] getAttributes() {
 
     @Nullable
     @Override
-    public XmlAttribute getAttribute(@NonNls String name, @NonNls String namespace) {
+    public XmlAttribute getAttribute(String name, String namespace) {
         return null;
     }
 
     @Nullable
     @Override
-    public XmlAttribute getAttribute(@NonNls String qname) {
+    public XmlAttribute getAttribute(String qname) {
         return null;
     }
 
     @Nullable
     @Override
-    public String getAttributeValue(@NonNls String name, @NonNls String namespace) {
+    public String getAttributeValue(String name, String namespace) {
         return null;
     }
 
     @Nullable
     @Override
-    public String getAttributeValue(@NonNls String qname) {
+    public String getAttributeValue(String qname) {
         return null;
     }
 
     @Override
-    public XmlAttribute setAttribute(@NonNls String name, @NonNls String namespace, @NonNls String value)
+    public XmlAttribute setAttribute(String name, String namespace, String value)
         throws IncorrectOperationException {
         return null;
     }
 
     @Override
-    public XmlAttribute setAttribute(@NonNls String qname, @NonNls String value) throws IncorrectOperationException {
+    public XmlAttribute setAttribute(String qname, String value) throws IncorrectOperationException {
         return null;
     }
 
     @Override
-    public XmlTag createChildTag(
-        @NonNls String localName,
-        @NonNls String namespace,
-        @Nullable @NonNls String bodyText,
-        boolean enforceNamespacesDeep
-    ) {
+    public XmlTag createChildTag(String localName, String namespace, @Nullable String bodyText, boolean enforceNamespacesDeep) {
         return null;
     }
 
@@ -228,19 +226,19 @@ public XmlTag[] getSubTags() {
 
     @Nonnull
     @Override
-    public XmlTag[] findSubTags(@NonNls String qname) {
+    public XmlTag[] findSubTags(String qname) {
         return new XmlTag[0];
     }
 
     @Nonnull
     @Override
-    public XmlTag[] findSubTags(@NonNls String localName, @Nullable String namespace) {
+    public XmlTag[] findSubTags(String localName, @Nullable String namespace) {
         return new XmlTag[0];
     }
 
     @Nullable
     @Override
-    public XmlTag findFirstSubTag(@NonNls String qname) {
+    public XmlTag findFirstSubTag(String qname) {
         return null;
     }
 
@@ -252,13 +250,13 @@ public String getNamespacePrefix() {
 
     @Nonnull
     @Override
-    public String getNamespaceByPrefix(@NonNls String prefix) {
+    public String getNamespaceByPrefix(String prefix) {
         return "";
     }
 
     @Nullable
     @Override
-    public String getPrefixByNamespace(@NonNls String namespace) {
+    public String getPrefixByNamespace(String namespace) {
         return null;
     }
 
@@ -292,7 +290,7 @@ public XmlTagValue getValue() {
 
     @Nullable
     @Override
-    public XmlNSDescriptor getNSDescriptor(@NonNls String namespace, boolean strict) {
+    public XmlNSDescriptor getNSDescriptor(String namespace, boolean strict) {
         return null;
     }
 
@@ -308,7 +306,7 @@ public void collapseIfEmpty() {
 
     @Nullable
     @Override
-    public String getSubTagText(@NonNls String qname) {
+    public String getSubTagText(String qname) {
         return null;
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
index 3d631dfa..97410bc5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
@@ -27,7 +27,7 @@
  * @author maxim
  */
 public class JSYieldStatementImpl extends JSStatementImpl implements JSYieldStatement {
-    public JSYieldStatementImpl(final ASTNode node) {
+    public JSYieldStatementImpl(ASTNode node) {
         super(node);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
index 534acd84..91aa0016 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.application.util.SystemInfo;
 import consulo.content.base.BinariesOrderRootType;
 import consulo.language.psi.*;
@@ -27,6 +28,7 @@
 import consulo.module.content.ProjectRootManager;
 import consulo.module.content.layer.orderEntry.OrderEntry;
 import consulo.module.content.layer.orderEntry.OrderEntryWithTracking;
+import consulo.platform.Platform;
 import consulo.project.Project;
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.LocalFileSystem;
@@ -38,27 +40,19 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
 
 /**
- * Created by IntelliJ IDEA.
- * User: Maxim.Mossienko
- * Date: 08.04.2009
- * Time: 20:48:38
- * To change this template use File | Settings | File Templates.
+ * @author Maxim.Mossienko
+ * @since 2009-04-08
  */
 public class ReferenceSupport {
-    public static PsiReference[] getFileRefs(
-        final PsiElement elt,
-        final PsiElement valueNode,
-        final int offset,
-        final LookupOptions lookupOptions
-    ) {
+    @RequiredReadAction
+    public static PsiReference[] getFileRefs(PsiElement elt, PsiElement valueNode, int offset, LookupOptions lookupOptions) {
         String str = StringUtil.stripQuotesAroundValue(valueNode.getText());
         return getFileRefs(elt, offset, str, lookupOptions);
     }
 
-    public static PsiReference[] getFileRefs(final PsiElement elt, final int offset, String str, final LookupOptions lookupOptions) {
+    public static PsiReference[] getFileRefs(PsiElement elt, int offset, String str, LookupOptions lookupOptions) {
         if (lookupOptions.IGNORE_TEXT_ARTER_HASH) {
             int hashIndex = str.indexOf('#');
             if (hashIndex != -1) {
@@ -66,24 +60,24 @@ public static PsiReference[] getFileRefs(final PsiElement elt, final int offset,
             }
         }
 
-        final FileReferenceSet base = new FileReferenceSet(str, elt, offset, null, SystemInfo.isFileSystemCaseSensitive);
+        FileReferenceSet base = new FileReferenceSet(str, elt, offset, null, SystemInfo.isFileSystemCaseSensitive);
 
-        final boolean lookForAbsolutePath = lookupOptions.ABSOLUTE && new File(str).isAbsolute();
-        final boolean startsWithSlash = str.startsWith("/");
+        boolean lookForAbsolutePath = lookupOptions.ABSOLUTE && new File(str).isAbsolute();
+        boolean startsWithSlash = str.startsWith("/");
 
         base.addCustomization(
             FileReferenceSet.DEFAULT_PATH_EVALUATOR_OPTION,
             psiFile -> {
-                final PsiElement context = psiFile.getContext();
-                if (context instanceof PsiLanguageInjectionHost) {
-                    psiFile = context.getContainingFile();
+                PsiElement context = psiFile.getContext();
+                if (context instanceof PsiLanguageInjectionHost languageInjectionHost) {
+                    psiFile = languageInjectionHost.getContainingFile();
                 }
                 PsiFile originalFile = psiFile.getOriginalFile();
                 if (originalFile != null) {
                     psiFile = originalFile;
                 }
 
-                final List<VirtualFile> dirs = new ArrayList<>();
+                List<VirtualFile> dirs = new ArrayList<>();
 
                 // paths relative to file should not start with slash
                 if (lookupOptions.RELATIVE_TO_FILE && !startsWithSlash) {
@@ -107,11 +101,11 @@ public static PsiReference[] getFileRefs(final PsiElement elt, final int offset,
                     appendSdkAndLibraryClassRoots(dirs, psiFile);
                 }
 
-                final Collection<PsiFileSystemItem> result = new ArrayList<>();
-                final PsiManager psiManager = PsiManager.getInstance(psiFile.getProject());
-                for (final VirtualFile dir : dirs) {
+                Collection<PsiFileSystemItem> result = new ArrayList<>();
+                PsiManager psiManager = PsiManager.getInstance(psiFile.getProject());
+                for (VirtualFile dir : dirs) {
                     if (dir != null) {
-                        final PsiDirectory psiDir = psiManager.findDirectory(dir);
+                        PsiDirectory psiDir = psiManager.findDirectory(dir);
                         if (psiDir != null) {
                             result.add(psiDir);
                         }
@@ -123,29 +117,29 @@ public static PsiReference[] getFileRefs(final PsiElement elt, final int offset,
         return base.getAllReferences();
     }
 
-    private static void appendFileLocation(final List<VirtualFile> dirs, final PsiFile psiFile) {
-        final VirtualFile file = psiFile.getVirtualFile();
+    private static void appendFileLocation(List<VirtualFile> dirs, PsiFile psiFile) {
+        VirtualFile file = psiFile.getVirtualFile();
         if (file != null) {
             dirs.add(file.getParent());
         }
     }
 
-    private static void appendSourceRoots(final Collection<VirtualFile> dirs, final PsiFile psiFile) {
-        final VirtualFile file = psiFile.getVirtualFile();
+    private static void appendSourceRoots(Collection<VirtualFile> dirs, PsiFile psiFile) {
+        VirtualFile file = psiFile.getVirtualFile();
         if (file == null) {
             return;
         }
-        final Project project = psiFile.getProject();
-        final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
-        final Module module = index.getModuleForFile(file);
+        Project project = psiFile.getProject();
+        ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
+        Module module = index.getModuleForFile(file);
         if (module != null && index.getSourceRootForFile(file) != null) {
             dirs.addAll(Arrays.asList(ModuleRootManager.getInstance(module).getSourceRoots()));
         }
     }
 
-    private static void appendFileSystemRoot(final Collection<VirtualFile> dirs, final Project project) {
-        final VirtualFile fileSystemRoot;
-        if (SystemInfo.isWindows) {
+    private static void appendFileSystemRoot(Collection<VirtualFile> dirs, Project project) {
+        VirtualFile fileSystemRoot;
+        if (Platform.current().os().isWindows()) {
             fileSystemRoot = ManagingFS.getInstance().findRoot("", LocalFileSystem.getInstance());
         }
         else {
@@ -154,11 +148,12 @@ private static void appendFileSystemRoot(final Collection<VirtualFile> dirs, fin
         dirs.add(fileSystemRoot);
     }
 
+    @RequiredReadAction
     private static void appendSdkAndLibraryClassRoots(List<VirtualFile> dirs, PsiFile psiFile) {
-        final Module module = ModuleUtilCore.findModuleForPsiElement(psiFile);
+        Module module = ModuleUtilCore.findModuleForPsiElement(psiFile);
         if (module != null) {
-            final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
-            for (final OrderEntry orderEntry : orderEntries) {
+            OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
+            for (OrderEntry orderEntry : orderEntries) {
                 if (orderEntry instanceof OrderEntryWithTracking) {
                     dirs.addAll(Arrays.asList(orderEntry.getFiles(BinariesOrderRootType.getInstance())));
                 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index c29d2b05..ec9f0a91 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -21,9 +21,10 @@
 import com.intellij.lang.javascript.index.JSSymbolUtil;
 import com.intellij.lang.javascript.index.JSTypeEvaluateManager;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
-import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.lang.JavaScriptTokenSets;
+import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptVersionUtil;
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.ast.ASTNode;
@@ -43,8 +44,6 @@
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlToken;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
@@ -72,27 +71,16 @@ abstract public class BaseJSSymbolProcessor implements PsiScopeProcessor {
     protected boolean myAddOnlyCompleteMatches;
     protected boolean myAllowPartialResults = true;
 
-    @NonNls
     private static final String ANY_TYPE = "*";
-    @NonNls
     public static final String ARRAY_TYPE_NAME = "Array";
-    @NonNls
     public static final String STRING_TYPE_NAME = "String";
-    @NonNls
     public static final String REG_EXP_TYPE_NAME = "RegExp";
-    @NonNls
     public static final String XML_TYPE_NAME = "XML";
-    @NonNls
     public static final String XML_LIST_TYPE_NAME = "XMLList";
-    @NonNls
     public static final String NUMBER_TYPE_NAME = "Number";
-    @NonNls
     public static final String FUNCTION_TYPE_NAME = "Function";
-    @NonNls
     public static final String HTML_ELEMENT_TYPE_NAME = "HTMLElement";
-    @NonNls
     private static final String INT_TYPE = "int";
-    @NonNls
     private static final String BOOLEAN_TYPE_NAME = "Boolean";
     protected String myIteratedTypeName;
 
@@ -156,8 +144,9 @@ protected boolean isFromRelevantFileOrDirectory() {
         //);
     }
 
-    private static ThreadLocal<EvaluateContext> contextHolder = new ThreadLocal<EvaluateContext>();
+    private static ThreadLocal<EvaluateContext> contextHolder = new ThreadLocal<>();
 
+    @RequiredReadAction
     public static void doEvalForExpr(JSExpression rawqualifier, final PsiFile myTargetFile, TypeProcessor typeProcessor) {
         EvaluateContext context = contextHolder.get();
         boolean contextHolderInitialized = false;
@@ -187,6 +176,7 @@ else if (context.isAlreadyProcessingItem(rawqualifier)) {
         }
     }
 
+    @RequiredReadAction
     public static JSExpression getOriginalQualifier(JSExpression rawQualifier) {
         if (rawQualifier instanceof JSReferenceExpression qualifier) {
             final TextRange textRange = qualifier.getTextRange();
@@ -253,6 +243,7 @@ else if (rawQualifier instanceof JSCallExpression call) {
         return rawQualifier;
     }
 
+    @RequiredReadAction
     private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeProcessor, EvaluateContext context) {
         if (rawQualifier instanceof JSDefinitionExpression definition) {
             rawQualifier = definition.getExpression();
@@ -263,7 +254,7 @@ private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeP
             if (methodExpr != null) {
                 String text = methodExpr.getText();
                 if (methodExpr instanceof JSReferenceExpression && typeProcessor.ecma()) {
-                    final SimpleTypeProcessor processor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+                    SimpleTypeProcessor processor = new SimpleTypeProcessor(typeProcessor.getFeatures());
                     doEvalForExpr(methodExpr, context.targetFile, processor);
 
                     if (processor.type != null && !"*".equals(processor.type)) {
@@ -284,8 +275,8 @@ private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeP
 
             if (qualifier != null && "prototype".equals(qualifier.getReferencedName())) {
                 final JSExpression expression = qualifier.getQualifier();
-                if (expression instanceof JSReferenceExpression) {
-                    qualifier = (JSReferenceExpression)expression;
+                if (expression instanceof JSReferenceExpression refExpr) {
+                    qualifier = refExpr;
                     wasPrototype = true;
                 }
             }
@@ -317,16 +308,15 @@ private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeP
                     String type = psiElement instanceof JSNamedElement ? null : null;
 
                     if (type == null) {
-                        if (psiElement instanceof JSVariable) {
-                            final JSVariable jsVariable = (JSVariable)psiElement;
+                        if (psiElement instanceof JSVariable jsVariable) {
                             String parameterType = jsVariable.getTypeString();
 
                             if (isSomeFunctionCall(rawQualifier, parameterType)) {
                                 parameterType = ANY_TYPE;
 
                                 if (jsVariable.hasInitializer()
-                                    && jsVariable.getInitializer() instanceof JSFunctionExpression functionExpression) {
-                                    String typeString = functionExpression.getFunction().getReturnTypeString();
+                                    && jsVariable.getInitializer() instanceof JSFunctionExpression functionExpr) {
+                                    String typeString = functionExpr.getFunction().getReturnTypeString();
                                     if (isValidType(typeString)) {
                                         parameterType = typeString;
                                     }
@@ -397,10 +387,10 @@ else if (psiElement instanceof JSDefinitionExpression) {
                                     addTypeFromDefExpr(typeProcessor, context, psiElement);
                                 }
                             }
-                            else if (psiElement instanceof XmlToken) {
+                            else if (psiElement instanceof XmlToken xmlToken) {
                                 hasSomeType = true;
 
-                                final TagContextBuilder builder = new TagContextBuilder(psiElement, HTML_ELEMENT_TYPE_NAME);
+                                final TagContextBuilder builder = new TagContextBuilder(xmlToken, HTML_ELEMENT_TYPE_NAME);
                                 final PsiElement element = builder.element;
                                 final String typeName = builder.typeName;
 
@@ -410,12 +400,12 @@ else if (psiElement instanceof XmlToken) {
 
                                 addType(typeName, typeProcessor, context, element);
                             }
-                            else if (psiElement instanceof JSNamedElement) {
-                                if (psiElement instanceof JSFunction function) {
+                            else if (psiElement instanceof JSNamedElement namedElement) {
+                                if (namedElement instanceof JSFunction function) {
                                     final boolean inCall = rawQualifier.getParent() instanceof JSCallExpression;
 
                                     if (!inCall && (!function.isGetProperty() && !function.isSetProperty())) {
-                                        addType(FUNCTION_TYPE_NAME, typeProcessor, context, psiElement);
+                                        addType(FUNCTION_TYPE_NAME, typeProcessor, context, function);
                                         hasSomeType = true;
                                         if (wasPrototype) {
                                             final String name = function.getName();
@@ -451,7 +441,7 @@ else if (function.isConstructor()) {
                                             hasSomeType = true;
                                         }
                                         else {
-                                            addQNameFromElementAsType(typeProcessor, context, psiElement, false);
+                                            addQNameFromElementAsType(typeProcessor, context, function, false);
                                         }
                                     }
                                 }
@@ -460,18 +450,18 @@ else if (function.isConstructor()) {
                                     boolean passSource = false;
 
                                     if (!hasTypeKnowledge || wasPrototype) {
-                                        addQNameFromElementAsType(typeProcessor, context, psiElement, passSource);
+                                        addQNameFromElementAsType(typeProcessor, context, namedElement, passSource);
                                     }
                                 }
                             }
-                            else if (psiElement instanceof JSLiteralExpression) {
-                                getTypeFromConstant((JSExpression)psiElement, typeProcessor, context);
+                            else if (psiElement instanceof JSLiteralExpression literal) {
+                                getTypeFromConstant(literal, typeProcessor, context);
                                 hasSomeType = true;
                             }
-                            else if (psiElement instanceof JSExpressionStatement) {
-                                final String s = JSDocumentationUtils.findType(psiElement);
-                                if (isValidType(s)) {
-                                    addType(JSImportHandlingUtil.resolveTypeName(s, psiElement), typeProcessor, context, null);
+                            else if (psiElement instanceof JSExpressionStatement expression) {
+                                String exprType = JSDocumentationUtils.findType(expression);
+                                if (isValidType(exprType)) {
+                                    addType(JSImportHandlingUtil.resolveTypeName(exprType, expression), typeProcessor, context, null);
                                     hasSomeType = true;
                                 }
                             }
@@ -494,9 +484,7 @@ else if (!context.visitedTypes.contains(type)) {
             JSReferenceExpression localQualifier = qualifier;
 
             while (true) {
-                JSExpression expression = localQualifier.getQualifier();
-
-                if (expression instanceof JSCallExpression call) {
+                if (localQualifier.getQualifier() instanceof JSCallExpression call) {
                     JSExpression methodExpression = call.getMethodExpression();
 
                     if (methodExpression instanceof JSReferenceExpression referenceExpression) {
@@ -518,10 +506,10 @@ else if ("getComponentById".equals(qualifier.getReferencedName())) {
                 tryAddBindowsType(qualifier, typeProcessor, context);
             }
         }
-        else if (rawQualifier instanceof JSBinaryExpression binaryExpression) {
-            final IElementType sign = binaryExpression.getOperationSign();
-            final JSExpression rOperand = binaryExpression.getROperand();
-            final JSExpression lOperand = binaryExpression.getLOperand();
+        else if (rawQualifier instanceof JSBinaryExpression binaryExpr) {
+            IElementType sign = binaryExpr.getOperationSign();
+            JSExpression rOperand = binaryExpr.getROperand();
+            JSExpression lOperand = binaryExpr.getLOperand();
 
             if (rOperand != null) {
                 if (sign == JSTokenTypes.AS_KEYWORD) {
@@ -562,19 +550,19 @@ else if (sign == JSTokenTypes.EQ) {
                 }
             }
         }
-        else if (rawQualifier instanceof JSLiteralExpression) {
-            getTypeFromConstant(rawQualifier, typeProcessor, context);
+        else if (rawQualifier instanceof JSLiteralExpression literal) {
+            getTypeFromConstant(literal, typeProcessor, context);
         }
-        else if (rawQualifier instanceof JSArrayLiteralExpression) {
-            addType(ARRAY_TYPE_NAME, typeProcessor, context, rawQualifier);
+        else if (rawQualifier instanceof JSArrayLiteralExpression arrayLiteral) {
+            addType(ARRAY_TYPE_NAME, typeProcessor, context, arrayLiteral);
             if (typeProcessor instanceof ResolveProcessor resolveProcessor) {
-                resolveProcessor.execute(rawQualifier, ResolveState.initial());
+                resolveProcessor.execute(arrayLiteral, ResolveState.initial());
             }
         }
-        else if (rawQualifier instanceof JSIndexedPropertyAccessExpression propertyAccessExpression) {
+        else if (rawQualifier instanceof JSIndexedPropertyAccessExpression propertyAccess) {
             final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
 
-            doEvalForExpr(propertyAccessExpression.getQualifier(), lprocessor, context);
+            doEvalForExpr(propertyAccess.getQualifier(), lprocessor, context);
 
             if (lprocessor.result instanceof JSArrayLiteralExpression arrayLiteral && typeProcessor instanceof ResolveProcessor) {
                 for (JSExpression expr : arrayLiteral.getExpressions()) {
@@ -584,25 +572,25 @@ else if (rawQualifier instanceof JSIndexedPropertyAccessExpression propertyAcces
                 }
             }
 
-            addComponentTypeFromProcessor(rawQualifier, typeProcessor, context, lprocessor);
+            addComponentTypeFromProcessor(propertyAccess, typeProcessor, context, lprocessor);
         }
-        else if (rawQualifier instanceof JSObjectLiteralExpression && typeProcessor instanceof ResolveProcessor) {
-            addTypeFromObjectLiteralExpression(rawQualifier, typeProcessor);
+        else if (rawQualifier instanceof JSObjectLiteralExpression objectLiteral && typeProcessor instanceof ResolveProcessor) {
+            addTypeFromObjectLiteralExpression(objectLiteral, typeProcessor);
         }
-        else if (rawQualifier instanceof JSParenthesizedExpression parenthesizedExpression) {
-            doEvalForExpr(parenthesizedExpression.getInnerExpression(), typeProcessor, context);
+        else if (rawQualifier instanceof JSParenthesizedExpression parenthesized) {
+            doEvalForExpr(parenthesized.getInnerExpression(), typeProcessor, context);
         }
-        else if (rawQualifier instanceof JSThisExpression) {
-            final JSClass jsClass = JSResolveUtil.getClassOfContext(rawQualifier);
+        else if (rawQualifier instanceof JSThisExpression thisExpr) {
+            JSClass jsClass = JSResolveUtil.getClassOfContext(thisExpr);
             if (jsClass != null) {
                 addType(jsClass.getQualifiedName(), typeProcessor, context, jsClass);
             }
             else {
-                typeProcessor.setUnknownElement(rawQualifier);
+                typeProcessor.setUnknownElement(thisExpr);
             }
         }
-        else if (rawQualifier instanceof JSSuperExpression) {
-            final JSClass jsClass = JSResolveUtil.getClassOfContext(rawQualifier);
+        else if (rawQualifier instanceof JSSuperExpression superExpr) {
+            JSClass jsClass = JSResolveUtil.getClassOfContext(superExpr);
             if (jsClass != null) {
                 final JSClass[] classes = jsClass.getSuperClasses();
                 if (classes.length > 0) {
@@ -625,6 +613,7 @@ private static boolean isSomeFunctionCall(JSExpression rawqualifier, String para
         return FUNCTION_TYPE_NAME.equals(parameterType) && rawqualifier.getParent() instanceof JSCallExpression;
     }
 
+    @RequiredReadAction
     private static void addQNameFromElementAsType(
         TypeProcessor typeProcessor,
         EvaluateContext context,
@@ -644,6 +633,7 @@ private static void addQNameFromElementAsType(
         addType(name, typeProcessor, context, passSource ? psiElement : null);
     }
 
+    @RequiredReadAction
     private static String evalComponentTypeFromArrayExpression(
         JSExpression rawqualifier,
         TypeProcessor typeProcessor,
@@ -699,26 +689,23 @@ private static boolean findDef(
         return false;
     }
 
-    private static void tryAddBindowsType(
-        final JSReferenceExpression qualifier,
-        final TypeProcessor typeProcessor,
-        final EvaluateContext context
-    ) {
-        final PsiElement element = qualifier.getParent();
-        if (!(element instanceof JSCallExpression)) {
+    @RequiredReadAction
+    private static void tryAddBindowsType(JSReferenceExpression qualifier, TypeProcessor typeProcessor, EvaluateContext context) {
+        PsiElement element = qualifier.getParent();
+        if (!(element instanceof JSCallExpression call)) {
             return;
         }
-        final JSArgumentList argumentList = ((JSCallExpression)element).getArgumentList();
+        JSArgumentList argumentList = call.getArgumentList();
         if (argumentList == null) {
             return;
         }
-        final JSExpression[] expressions = argumentList.getArguments();
+        JSExpression[] expressions = argumentList.getArguments();
         if (expressions.length == 0 || !(expressions[0] instanceof JSLiteralExpression)) {
             return;
         }
 
-        final String val = StringUtil.stripQuotesAroundValue(expressions[0].getText());
-        final PsiElement contextElement = qualifier.getContainingFile().getContext();
+        String val = StringUtil.stripQuotesAroundValue(expressions[0].getText());
+        PsiElement contextElement = qualifier.getContainingFile().getContext();
 
         if (contextElement != null) {
             final PsiFile containingFile = contextElement.getContainingFile();
@@ -728,24 +715,28 @@ private static void tryAddBindowsType(
         }
     }
 
+    @RequiredReadAction
     private static boolean isBindowsXml(final PsiFile containingFile) {
         return containingFile.getName().endsWith(".xml") && containingFile instanceof XmlFile;
     }
 
-    private static void addTypeFromObjectLiteralExpression(final JSExpression rawqualifier, final TypeProcessor typeProcessor) {
-        final JSProperty[] properties = ((JSObjectLiteralExpression)rawqualifier).getProperties();
+    private static void addTypeFromObjectLiteralExpression(JSExpression rawQualifier, TypeProcessor typeProcessor) {
+        JSProperty[] properties = ((JSObjectLiteralExpression)rawQualifier).getProperties();
 
-        final boolean b = properties.length > 0
-            ? rawqualifier.processDeclarations((ResolveProcessor)typeProcessor, ResolveState.initial(), properties[0], properties[0])
-            : true;
+        boolean b = properties.length <= 0 || rawQualifier.processDeclarations(
+            (ResolveProcessor)typeProcessor,
+            ResolveState.initial(),
+            properties[0],
+            properties[0]
+        );
         if (b) {
-            typeProcessor.setUnknownElement(rawqualifier);
+            typeProcessor.setUnknownElement(rawQualifier);
         }
     }
 
-    private static void addTypeFromDefExpr(final TypeProcessor typeProcessor, final EvaluateContext context, final PsiElement psiElement) {
-        final String type;
-        type = psiElement.getText();
+    @RequiredReadAction
+    private static void addTypeFromDefExpr(TypeProcessor typeProcessor, EvaluateContext context, PsiElement psiElement) {
+        String type = psiElement.getText();
 
         if (!context.visitedTypes.contains(type)) {
             context.visitedTypes.add(type);
@@ -925,13 +916,9 @@ protected void doIterateHierarchy(final String typeName, final HierarchyProcesso
                         }
 
                         @Override
-                        public boolean execute(final PsiElement element, final ResolveState state) {
-                            if (element instanceof JSClass) {
-                                if (!processor.processClass((JSClass)element)) {
-                                    return false;
-                                }
-                            }
-                            return true;
+                        @RequiredReadAction
+                        public boolean execute(@Nonnull PsiElement element, final ResolveState state) {
+                            return !(element instanceof JSClass jsClass && !processor.processClass(jsClass));
                         }
                     },
                     ResolveState.initial(),
@@ -939,12 +926,9 @@ public boolean execute(final PsiElement element, final ResolveState state) {
                     clazz
                 );
             }
-
-            return;
         }
     }
 
-
     public static class EvaluateContext {
         public final PsiFile targetFile;
         public final Set<String> visitedTypes = new HashSet<>();
@@ -1025,7 +1009,8 @@ public boolean ecma() {
         }
 
         @Override
-        public boolean execute(final PsiElement element, final ResolveState state) {
+        @RequiredReadAction
+        public boolean execute(@Nonnull PsiElement element, final ResolveState state) {
             result = element;
             return true;
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
index 1f98e9e1..7e032ce5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/CompletionProcessor.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi.resolve;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 public class CompletionProcessor extends ResolveProcessor {
     private boolean myInVarDcl;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index 893332b3..c672acb8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -55,15 +55,15 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 29, 2008
- * Time: 6:52:42 PM
+ * @since 2008-07-29
  */
 public class JSImportHandlingUtil {
-    public static final Key<CachedValue<Map<String, Object>>> ourImportListCache = Key.create("js.import.list.cache");
-    public static final UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object> myImportListCache = new ImportListDataCache();
-    public static final Key<CachedValue<Map<String, JSImportedElementResolveResult>>> ourImportResolveCache =
+    public static final Key<CachedValue<Map<String, Object>>> IMPORT_LIST_CACHE_KEY = Key.create("js.import.list.cache");
+    public static final UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object> IMPORT_LIST_CACHE = new ImportListDataCache();
+    public static final Key<CachedValue<Map<String, JSImportedElementResolveResult>>> IMPORT_RESOLVE_CACHE_KEY =
         Key.create("js.import.resolve");
-    public static final UserDataCache<CachedValue<Map<String, JSImportedElementResolveResult>>, PsiElement, Object> myImportResolveCache =
+    public static final UserDataCache<CachedValue<Map<String, JSImportedElementResolveResult>>, PsiElement, Object>
+        IMPORT_RESOLVE_CACHE =
         new UserDataCache<>() {
             @Override
             protected CachedValue<Map<String, JSImportedElementResolveResult>> compute(final PsiElement psiElement, final Object p) {
@@ -238,7 +238,7 @@ JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String
             }
         }
 
-        final Map<String, JSImportedElementResolveResult> map = myImportResolveCache.get(ourImportResolveCache, parent, null).getValue();
+        final Map<String, JSImportedElementResolveResult> map = IMPORT_RESOLVE_CACHE.get(IMPORT_RESOLVE_CACHE_KEY, parent, null).getValue();
         JSImportedElementResolveResult result = map.get(referencedName);
 
         if (result == null) {
@@ -253,7 +253,7 @@ private static JSImportedElementResolveResult resolveTypeNameUsingImportsInner(
         final String referencedName,
         final PsiNamedElement parent
     ) {
-        final Map<String, Object> value = myImportListCache.get(ourImportListCache, parent, null).getValue();
+        final Map<String, Object> value = IMPORT_LIST_CACHE.get(IMPORT_LIST_CACHE_KEY, parent, null).getValue();
         JSImportedElementResolveResult expression = FlexImportSupport.tryFindInMap(referencedName, parent, value);
         if (expression != null) {
             return expression;
@@ -359,7 +359,7 @@ public static boolean importClass(final PsiScopeProcessor processor, final PsiNa
 
         if (s != null) {
             if (resolveProcessor.specificallyAskingToResolveQualifiedNames()) {
-                final Map<String, Object> value = myImportListCache.get(ourImportListCache, parent, null).getValue();
+                final Map<String, Object> value = IMPORT_LIST_CACHE.get(IMPORT_LIST_CACHE_KEY, parent, null).getValue();
                 JSImportedElementResolveResult resolveResult =
                     FlexImportSupport.tryFindInMap(s, parent, value, resolveProcessor.getQualifiedNameToImport());
                 if (dispatchResult(resolveResult, processor)) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
index 42e426da..97421ed4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 29, 2008
- * Time: 8:04:55 PM
+ * @since 2008-07-29
  */
 public class JSImportedElementResolveResult {
     public final String qualifiedName;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 165090f8..0f64fb11 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -209,10 +209,9 @@ public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                         return true;
                     }
                 }
-                else if (!allowUnqualifiedStaticsFromInstance) {
-                    if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
-                        return true;
-                    }
+                else if (!allowUnqualifiedStaticsFromInstance && attributeList != null
+                    && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
+                    return true;
                 }
             }
 
@@ -223,8 +222,9 @@ else if (!allowUnqualifiedStaticsFromInstance) {
                 openedNses = JSResolveUtil.calculateOpenNses(place);
             }
 
-            if (openedNses != null && !openedNses.contains(attributeNs) && (!AS3_NAMESPACE.equals(attributeNs) || !ecma) // AS3 is opened by default from
-                // compiler settings
+            if (openedNses != null
+                && !openedNses.contains(attributeNs)
+                && (!AS3_NAMESPACE.equals(attributeNs) || !ecma) // AS3 is opened by default from compiler settings
             ) {
                 if (attributeNs != null || defaultNsIsNotAllowed) {
                     return true;
@@ -259,11 +259,10 @@ else if (!allowUnqualifiedStaticsFromInstance) {
             if (placeParent instanceof JSDefinitionExpression
                 || (myName == null && placeParent instanceof JSExpressionStatement /* when complete of setter*/)
                 || (place instanceof JSFunction placeFunction && placeFunction.isSetProperty())) {
-                PsiElement clazz;
-                if (function.isGetProperty()
-                    && (myName != null || !(placeParent instanceof JSExpressionStatement)
-                    || !((clazz = function.getParent()) instanceof JSClass) ||
-                    ((JSClass)clazz).findFunctionByNameAndKind(function.getName(), JSFunction.FunctionKind.SETTER) != null)) {
+                if (function.isGetProperty() && (myName != null
+                    || !(placeParent instanceof JSExpressionStatement)
+                    || !(function.getParent() instanceof JSClass jsClass
+                    && jsClass.findFunctionByNameAndKind(function.getName(), JSFunction.FunctionKind.SETTER) == null))) {
                     return true;
                 }
             }
@@ -372,9 +371,10 @@ private JavaScriptImportStatementBase checkQualifiedNameHasNecessaryImport(
                 if (qName != null && qName.indexOf('.') != -1) {
                     final ResolveProcessor processor = new ResolveProcessor(myName) {
                         @Override
-                        public boolean execute(PsiElement element, ResolveState state) {
-                            if (element instanceof JSQualifiedNamedElement) {
-                                if (!qName.equals(((JSQualifiedNamedElement)element).getQualifiedName())) {
+                        @RequiredReadAction
+                        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                            if (element instanceof JSQualifiedNamedElement qualifiedNamedElement) {
+                                if (!qName.equals(qualifiedNamedElement.getQualifiedName())) {
                                     return true;
                                 }
                             }
@@ -385,17 +385,14 @@ public boolean execute(PsiElement element, ResolveState state) {
                         }
                     };
 
-                    if (!JSUnusedImportsHelper.isSomeNodeThatShouldNotHaveImportsWhenQualified(
-                        placeTopParentRefExpr,
-                        element
-                    )) {
+                    if (!JSUnusedImportsHelper.isSomeNodeThatShouldNotHaveImportsWhenQualified(placeTopParentRefExpr, element)) {
                         processor.putUserData(ASKING_FOR_QUALIFIED_IMPORT, qName);
                         JSResolveUtil.treeWalkUp(processor, placeTopParent, placeTopParent, place);
                         boolean noImportNoResolve = processor.getResult() == null;
 
                         if (noImportNoResolve) {
                             if (myResolveStatus == null) {
-                                myResolveStatus = new SmartList<Boolean>();
+                                myResolveStatus = new SmartList<>();
                                 for (int i = 0; i < previousResultsSize; ++i) {
                                     myResolveStatus.add(Boolean.TRUE);
                                 }
@@ -416,14 +413,16 @@ public boolean execute(PsiElement element, ResolveState state) {
         return s;
     }
 
+    @RequiredReadAction
     private static PsiElement getElement(final PsiElement element) {
         return element instanceof XmlTag xmlTag
             ? xmlTag.getAttribute("name").getValueElement().getChildren()[1]
             : element;
-        }
+    }
 
     @Nullable
-    public static String getName(final PsiNamedElement element) {
+    @RequiredReadAction
+    public static String getName(PsiNamedElement element) {
         return element instanceof JSNamedElement ? element.getName() : null;
     }
 
@@ -486,11 +485,12 @@ public void handleEvent(Event event, Object associated) {
                                         }
 
                                         @Override
-                                        public boolean execute(final PsiElement element, final ResolveState state) {
-                                            if (!(element instanceof JSClass)) {
+                                        @RequiredReadAction
+                                        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                                            if (!(element instanceof JSClass jsClass)) {
                                                 return true;
                                             }
-                                            String classQName = ((JSClass)element).getQualifiedName();
+                                            String classQName = jsClass.getQualifiedName();
                                             return qName == classQName || (qName != null && !qName.equals(classQName));
                                         }
                                     },
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index 4e0c2a37..e5213079 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -29,7 +29,7 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.collection.ArrayUtil;
-import org.jetbrains.annotations.NonNls;
+import jakarta.annotation.Nonnull;
 
 import java.util.*;
 
@@ -49,9 +49,9 @@ public class VariantsProcessor extends BaseJSSymbolProcessor {
 
     private boolean myAddOnlyCompleteMatchesSet;
 
-    @NonNls
     private static final String OBJECT_CLASS_NAME = "Object";
 
+    @RequiredReadAction
     public VariantsProcessor(String[] nameIds, PsiFile targetFile, boolean skipDclsInTargetFile, PsiElement context) {
         super(targetFile.getOriginalFile(), skipDclsInTargetFile, context, nameIds);
         nameIds = myContextNameIds;
@@ -115,13 +115,10 @@ else if (jsClass != null) {
 
             doIterateTypeHierarchy(
                 nameIds,
-                new HierarchyProcessor() {
-                    @Override
-                    public boolean processClass(final JSClass clazz) {
-                        updateCanUseOnlyCompleteMatchesFromString(clazz.getQualifiedName(), clazz, clazz);
-                        buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameComponents);
-                        return true;
-                    }
+                clazz -> {
+                    updateCanUseOnlyCompleteMatchesFromString(clazz.getQualifiedName(), clazz, clazz);
+                    buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameComponents);
+                    return true;
                 }
             );
         }
@@ -132,6 +129,7 @@ public boolean processClass(final JSClass clazz) {
         hasSomeSmartnessAvailable = nameIdsArray != null && nameIdsArray.length > 0;
     }
 
+    @RequiredReadAction
     private void updateCanUseOnlyCompleteMatchesFromString(final String qName, Object source, PsiElement clazz) {
         final boolean wasSet = myAddOnlyCompleteMatchesSet;
 
@@ -171,6 +169,7 @@ private static boolean isObjectSourceThatDoesNotGiveExactKnowledgeAboutFunctionT
         return source instanceof JSFunctionExpression;
     }
 
+    @RequiredReadAction
     private void updateCanUseOnlyCompleteMatches(final JSClass jsClass) {
         final JSAttributeList attributeList = jsClass != null ? jsClass.getAttributeList() : null;
         if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
@@ -178,12 +177,13 @@ private void updateCanUseOnlyCompleteMatches(final JSClass jsClass) {
         }
     }
 
+    @RequiredReadAction
     public void addLocalResults(final List<PsiElement> results) {
         if (results == null) {
             return;
         }
 
-        final Set<String> processedCandidateNames = new HashSet<String>(results.size());
+        final Set<String> processedCandidateNames = new HashSet<>(results.size());
 
         for (PsiElement e : results) {
             if (e instanceof PsiNamedElement namedElement) {
@@ -211,7 +211,8 @@ class CompletionTypeProcessor implements TypeProcessor {
         }
 
         @Override
-        public void process(String type, final EvaluateContext context, final PsiElement source) {
+        @RequiredReadAction
+        public void process(@Nonnull String type, EvaluateContext context, PsiElement source) {
             if (context.visitedTypes.contains(type)) {
                 return;
             }
@@ -235,7 +236,7 @@ public boolean ecma() {
         }
 
         @Override
-        public void setUnknownElement(PsiElement element) {
+        public void setUnknownElement(@Nonnull PsiElement element) {
             myUnknownElement = element;
         }
 
@@ -249,17 +250,14 @@ private void addSupers(final String type, final List<String[]> possibleNameIds,
         myIteratedTypeName = type;
         doIterateHierarchy(
             type,
-            new HierarchyProcessor() {
-                @Override
-                public boolean processClass(final JSClass clazz) {
-                    String qname = clazz.getQualifiedName();
-                    if (!context.visitedTypes.contains(qname)) {
-                        context.visitedTypes.add(qname);
-                        updateCanUseOnlyCompleteMatchesFromString(qname, clazz, clazz);
-                        buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
-                    }
-                    return true;
+            clazz -> {
+                String qname = clazz.getQualifiedName();
+                if (!context.visitedTypes.contains(qname)) {
+                    context.visitedTypes.add(qname);
+                    updateCanUseOnlyCompleteMatchesFromString(qname, clazz, clazz);
+                    buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
                 }
+                return true;
             }
         );
 
@@ -284,7 +282,8 @@ public Object[] getResult() {
     }
 
     @Override
-    public boolean execute(PsiElement element, ResolveState state) {
+    @RequiredReadAction
+    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
         if (element instanceof JSNamedElement namedElement) {
             addCompleteMatch(namedElement, namedElement.getName());
         }
@@ -334,6 +333,7 @@ private LookupElement addLookupValue(PsiElement element, final String name, JSLo
     }
 
     @Override
+    @RequiredReadAction
     protected String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression) {
         return JSResolveUtil.buildNameIdsForQualifier(JSResolveUtil.getRealRefExprQualifier(jsReferenceExpression));
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
index 1dd11715..3548cd81 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -52,6 +53,7 @@ public class WalkUpResolveProcessor extends BaseJSSymbolProcessor {
     private boolean embeddedToHtmlAttr;
     private boolean myInNewExpression;
 
+    @RequiredReadAction
     public WalkUpResolveProcessor(
         String referenceName,
         String[] contextIds,
@@ -157,13 +159,13 @@ public void process(@Nonnull String type, @Nonnull final EvaluateContext context
                             }
                             type = buildIndexListFromQNameAndCorrectQName(type, source, possibleNameIds);
 
-                            doIterateHierarchy(type, new HierarchyProcessor() {
-                                @Override
-                                public boolean processClass(final JSClass clazz) {
+                            doIterateHierarchy(
+                                type,
+                                clazz -> {
                                     buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
                                     return true;
                                 }
-                            });
+                            );
                         }
 
                         @Override
@@ -197,17 +199,14 @@ else if (contextIds != null) {
     private void iterateContextIds(final String[] contextIds, final List<String[]> possibleNameIds, final boolean allowObject) {
         doIterateTypeHierarchy(
             contextIds,
-            new HierarchyProcessor() {
-                @Override
-                public boolean processClass(final JSClass clazz) {
-                    buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
-                    return true;
-                }
+            clazz -> {
+                buildIndexListFromQNameAndCorrectQName(clazz.getQualifiedName(), clazz, possibleNameIds);
+                return true;
             }
         );
     }
 
-    protected MatchType isAcceptableQualifiedItem(final String nameId, final PsiElement element) {
+    protected MatchType isAcceptableQualifiedItem(String nameId, PsiElement element) {
         final boolean partialMatch = myReferenceName.equals(nameId);
 
         if (partialMatch) {
@@ -259,7 +258,7 @@ private void addCompleteResult(PsiElement element) {
 
     private void addCompleteResult(ResolveResult o) {
         if (myCompleteMatchResults == null) {
-            myCompleteMatchResults = new ArrayList<ResolveResult>(1);
+            myCompleteMatchResults = new ArrayList<>(1);
         }
         if (isFromRelevantFileOrDirectory()) {
             myCompleteMatchResults.add(myFileCompleteResultsCount++, o);
@@ -283,7 +282,7 @@ private void addPartialResult(PsiElement element) {
         }
     }
 
-    protected boolean shouldProcessVariable(final String nameId, JSNamedElement var) {
+    protected boolean shouldProcessVariable(String nameId, JSNamedElement var) {
         return myReferenceName.equals(nameId) && !myDefinitelyNonglobalReference;
     }
 
@@ -320,6 +319,7 @@ public ResolveResult[] getResults() {
     }
 
     @Override
+    @RequiredReadAction
     protected String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression) {
         String[] contextNameIds = null;
         JSExpression qualifier = JSResolveUtil.getRealRefExprQualifier(jsReferenceExpression);
@@ -348,7 +348,8 @@ public int getCompleteResultCount() {
     }
 
     @Override
-    public boolean execute(final PsiElement element, final ResolveState state) {
+    @RequiredReadAction
+    public boolean execute(@Nonnull PsiElement element, final ResolveState state) {
         if ((element instanceof JSNamedElement namedElement && myReferenceName.equals(namedElement.getName())) || element == myContext) {
             addCompleteResult(element);
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index dff77741..2e3eeb2c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -18,6 +18,7 @@
 
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSReferenceList;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.application.util.function.CommonProcessors;
 import consulo.application.util.function.Processor;
 import consulo.application.util.query.Query;
@@ -43,7 +44,7 @@ public static class SearchParameters {
         private final boolean myCheckDeepInheritance;
         private final GlobalSearchScope myScope;
 
-        public SearchParameters(final JSClass anClass, final boolean checkDeepInheritance, GlobalSearchScope scope) {
+        public SearchParameters(JSClass anClass, boolean checkDeepInheritance, GlobalSearchScope scope) {
             myClass = anClass;
             myCheckDeepInheritance = checkDeepInheritance;
             myScope = scope;
@@ -62,8 +63,8 @@ public GlobalSearchScope getScope() {
         }
     }
 
-    public static Query<JSClass> searchClassInheritors(final JSClass superClass, final boolean checkDeepInheritance) {
-        final SearchParameters parameters = new SearchParameters(superClass, checkDeepInheritance, getUseScope(superClass));
+    public static Query<JSClass> searchClassInheritors(JSClass superClass, boolean checkDeepInheritance) {
+        SearchParameters parameters = new SearchParameters(superClass, checkDeepInheritance, getUseScope(superClass));
         return CLASS_INHERITORS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
     }
 
@@ -72,15 +73,15 @@ private static GlobalSearchScope getUseScope(JSClass superClass) {
         return (GlobalSearchScope)searchScope;
     }
 
-    public static Query<JSClass> searchInterfaceImplementations(final JSClass superClass, final boolean checkDeepInheritance) {
-        final SearchParameters parameters = new SearchParameters(superClass, checkDeepInheritance, getUseScope(superClass));
+    public static Query<JSClass> searchInterfaceImplementations(JSClass superClass, boolean checkDeepInheritance) {
+        SearchParameters parameters = new SearchParameters(superClass, checkDeepInheritance, getUseScope(superClass));
         return INTERFACE_IMPLEMENTATIONS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
     }
 
     // implementation
     private static final QueryFactory<JSClass, SearchParameters> INTERFACE_IMPLEMENTATIONS_QUERY_FACTORY = new QueryFactory<>();
     private static final QueryFactory<JSClass, SearchParameters> CLASS_INHERITORS_QUERY_FACTORY = new QueryFactory<>();
-    private static final JSClassSearch OUR_CLASS_SEARCH_EXECUTOR;
+    private static final JSClassSearch CLASS_SEARCH_EXECUTOR;
 
     static {
         INTERFACE_IMPLEMENTATIONS_QUERY_FACTORY.registerExecutor(new JSClassSearch() {
@@ -90,20 +91,22 @@ protected StubIndexKey<String, JSReferenceList> getIndexKey() {
             }
 
             @Override
-            protected JSClass[] getSupers(final JSClass candidate) {
+            protected JSClass[] getSupers(JSClass candidate) {
                 return candidate.getImplementedInterfaces();
             }
 
             @Override
-            public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull Processor<? super JSClass> consumer) {
-                final Set<JSClass> visited = new HashSet<JSClass>();         // no abstract classes in ActionScript !
+            @RequiredReadAction
+            public boolean execute(@Nonnull SearchParameters queryParameters, @Nonnull Processor<? super JSClass> consumer) {
+                final Set<JSClass> visited = new HashSet<>();         // no abstract classes in ActionScript !
 
                 if (queryParameters.isCheckDeepInheritance()) {
-                    final Processor<? super JSClass> consumerCopy = consumer;
+                    Processor<? super JSClass> consumerCopy = consumer;
                     consumer = new Processor<>() {
                         @Override
+                        @RequiredReadAction
                         public boolean process(JSClass jsClass) {
-                            return consumerCopy.process(jsClass) && OUR_CLASS_SEARCH_EXECUTOR.processDirectInheritors(
+                            return consumerCopy.process(jsClass) && CLASS_SEARCH_EXECUTOR.processDirectInheritors(
                                 jsClass,
                                 this,
                                 false,
@@ -114,8 +117,8 @@ public boolean process(JSClass jsClass) {
                     };
                 }
 
-                final Processor<? super JSClass> consumerToUse = consumer;
-                final boolean b = processDirectInheritors(
+                Processor<? super JSClass> consumerToUse = consumer;
+                boolean b = processDirectInheritors(
                     queryParameters.getTargetClass(),
                     consumerToUse,
                     queryParameters.isCheckDeepInheritance(),
@@ -150,14 +153,14 @@ protected Collection<JSClass> getInheritors(
             }
         });
 
-        CLASS_INHERITORS_QUERY_FACTORY.registerExecutor(OUR_CLASS_SEARCH_EXECUTOR = new JSClassSearch() {
+        CLASS_INHERITORS_QUERY_FACTORY.registerExecutor(CLASS_SEARCH_EXECUTOR = new JSClassSearch() {
             @Override
             protected StubIndexKey<String, JSReferenceList> getIndexKey() {
                 return JavaScriptIndexKeys.EXTENDS_INDEX;
             }
 
             @Override
-            protected JSClass[] getSupers(final JSClass candidate) {
+            protected JSClass[] getSupers(JSClass candidate) {
                 return candidate.getSuperClasses();
             }
 
@@ -175,12 +178,18 @@ protected Collection<JSClass> getInheritors(
     }
 
     @Override
-    public boolean execute(@Nonnull final SearchParameters queryParameters, @Nonnull final Processor<? super JSClass> consumer) {
-        return processDirectInheritors(queryParameters.getTargetClass(), consumer, queryParameters.isCheckDeepInheritance(), null,
+    @RequiredReadAction
+    public boolean execute(@Nonnull SearchParameters queryParameters, @Nonnull Processor<? super JSClass> consumer) {
+        return processDirectInheritors(
+            queryParameters.getTargetClass(),
+            consumer,
+            queryParameters.isCheckDeepInheritance(),
+            null,
             queryParameters.getScope()
         );
     }
 
+    @RequiredReadAction
     protected boolean processDirectInheritors(
         final JSClass superClass,
         final Processor<? super JSClass> consumer,
@@ -199,14 +208,14 @@ protected boolean processDirectInheritors(
 
         processed.add(superClass);
         Project project = superClass.getProject();
-        final String name = superClass.getName();
+        String name = superClass.getName();
         if (name == null) {
             return true;
         }
 
-        final Set<JSClass> temp = processed;
-        final Processor<JSClass> processor = candidate -> {
-            final JSClass[] classes = getSupers(candidate);
+        Set<JSClass> temp = processed;
+        Processor<JSClass> processor = candidate -> {
+            JSClass[] classes = getSupers(candidate);
             if (classes != null) {
                 for (JSClass superClassCandidate : classes) {
                     if (superClassCandidate.isEquivalentTo(superClass)) {
@@ -254,5 +263,5 @@ protected abstract Collection<JSClass> getInheritors(
 
     protected abstract StubIndexKey<String, JSReferenceList> getIndexKey();
 
-    protected abstract JSClass[] getSupers(final JSClass candidate);
+    protected abstract JSClass[] getSupers(JSClass candidate);
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
index 8a8762b0..6096157e 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
@@ -32,7 +32,6 @@
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author VISTALL
@@ -52,7 +51,7 @@ public boolean processDeclarations(
         @Nonnull PsiElement place
     ) {
         if (lastParent != null && lastParent.getParent() == this) {
-            final JSParameter[] params = getParameterList().getParameters();
+            JSParameter[] params = getParameterList().getParameters();
             for (JSParameter param : params) {
                 if (!processor.execute(param, state)) {
                     return false;
@@ -82,8 +81,9 @@ public JSParameterList getParameterList() {
     }
 
     @Override
+    @RequiredReadAction
     public JSSourceElement[] getBody() {
-        final ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
+        ASTNode[] children = getNode().getChildren(JSElementTypes.SOURCE_ELEMENTS);
         if (children.length == 0) {
             return JSSourceElement.EMPTY_ARRAY;
         }
@@ -123,6 +123,7 @@ public JSAttributeList getAttributeList() {
     }
 
     @Override
+    @RequiredReadAction
     public String getQualifiedName() {
         return null;
     }
@@ -136,7 +137,7 @@ public PsiElement getNameIdentifier() {
 
     @RequiredWriteAction
     @Override
-    public PsiElement setName(@Nonnull @NonNls String name) throws IncorrectOperationException {
+    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
         return null;
     }
 }

From bf7aafbcbdd63bbe91f8382edca3ad0165a7e8b2 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 19:02:36 +0300
Subject: [PATCH 264/340] Reformatting the rest of consulo-javascript module.

---
 .../formatter/JSCodeStyleSettings.java        | 26 +++---
 .../JavaScriptKeywordCompletionExtender.java  |  7 +-
 .../javascript/index/JavaScriptIndexer.java   | 17 ++--
 .../internal/DefaultJavaScriptVersion.java    |  5 +-
 .../language/JavaScriptConstants.java         |  5 +-
 .../language/JavaScriptFeature.java           | 39 ++++-----
 .../language/JavaScriptFileType.java          | 83 +++++++++----------
 .../JavaScriptFileTypeWithVersion.java        |  9 +-
 .../language/JavaScriptLanguage.java          | 64 +++++++-------
 .../language/JavaScriptLanguageVersion.java   | 24 +++---
 .../language/JavaScriptVersionUtil.java       | 20 ++---
 .../language/StandardJavaScriptVersion.java   | 18 ++--
 .../language/StandardJavaScriptVersions.java  | 25 +++---
 .../language/psi/JavaScriptPrimitiveType.java | 65 +++++++--------
 .../language/psi/JavaScriptTypeElement.java   |  7 +-
 .../stub/JSImplementedInterfacesIndex.java    | 14 ++--
 .../language/psi/stub/JSNameIndex.java        | 14 ++--
 .../psi/stub/JSQualifiedElementIndex.java     | 14 ++--
 .../language/psi/stub/JSSuperClassIndex.java  | 14 ++--
 .../psi/stub/JavaScriptIndexKeys.java         | 13 ++-
 .../extension/JavaScriptModuleExtension.java  |  7 +-
 .../JavaScriptMutableModuleExtension.java     |  5 +-
 .../javascript/psi/JSComputedName.java        |  7 +-
 .../psi/JSSimpleLiteralExpression.java        |  9 +-
 .../psi/JavaScriptImportStatementBase.java    |  3 +-
 .../psi/JavaScriptLambdaExpression.java       |  3 +-
 .../JSPropertyNameReferenceProvider.java      | 11 ++-
 .../javascript/psi/stubs/JSFileStub.java      |  7 +-
 base-api/src/main/java/module-info.java       | 32 +++----
 29 files changed, 255 insertions(+), 312 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java b/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
index bc71236b..bfed45b3 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
@@ -21,21 +21,19 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 12, 2008
- *         Time: 10:25:17 PM
+ * Date: Mar 12, 2008
+ * Time: 10:25:17 PM
  */
-public class JSCodeStyleSettings extends CustomCodeStyleSettings
-{
-	public int INDENT_PACKAGE_CHILDREN = DO_NOT_INDENT;
-	public boolean USE_SEMICOLON_AFTER_STATEMENT = true;
-	public String FIELD_PREFIX = "_";
-	public String PROPERTY_PREFIX = "";
+public class JSCodeStyleSettings extends CustomCodeStyleSettings {
+    public int INDENT_PACKAGE_CHILDREN = DO_NOT_INDENT;
+    public boolean USE_SEMICOLON_AFTER_STATEMENT = true;
+    public String FIELD_PREFIX = "_";
+    public String PROPERTY_PREFIX = "";
 
-	public static final int DO_NOT_INDENT = 0;
-	public static final int INDENT = 1;
+    public static final int DO_NOT_INDENT = 0;
+    public static final int INDENT = 1;
 
-	public JSCodeStyleSettings(CodeStyleSettings container)
-	{
-		super("JSCodeStyleSettings", container);
-	}
+    public JSCodeStyleSettings(CodeStyleSettings container) {
+        super("JSCodeStyleSettings", container);
+    }
 }
diff --git a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
index afb75a91..8425e016 100644
--- a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
+++ b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
@@ -14,9 +14,8 @@
  * @since 2019-12-17
  */
 @ExtensionAPI(ComponentScope.APPLICATION)
-public interface JavaScriptKeywordCompletionExtender
-{
-	ExtensionPointName<JavaScriptKeywordCompletionExtender> EP_NAME = ExtensionPointName.create(JavaScriptKeywordCompletionExtender.class);
+public interface JavaScriptKeywordCompletionExtender {
+    ExtensionPointName<JavaScriptKeywordCompletionExtender> EP_NAME = ExtensionPointName.create(JavaScriptKeywordCompletionExtender.class);
 
-	void fillCompletion(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result);
+    void fillCompletion(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result);
 }
diff --git a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
index cc8cf1ed..a0c8ea3e 100644
--- a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
+++ b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
@@ -12,16 +12,13 @@
  * @since 19.07.2015
  */
 @ExtensionAPI(ComponentScope.APPLICATION)
-public abstract class JavaScriptIndexer
-{
-	public static final ExtensionPointName<JavaScriptIndexer> EP_NAME = ExtensionPointName.create(JavaScriptIndexer.class);
+public abstract class JavaScriptIndexer {
+    public static final ExtensionPointName<JavaScriptIndexer> EP_NAME = ExtensionPointName.create(JavaScriptIndexer.class);
 
-	public void indexFile(@Nonnull JSFileStub fileStub, @Nonnull final IndexSink sink)
-	{
-	}
+    public void indexFile(@Nonnull JSFileStub fileStub, @Nonnull final IndexSink sink) {
+    }
 
-	public int getVersion()
-	{
-		return 0;
-	}
+    public int getVersion() {
+        return 0;
+    }
 }
diff --git a/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java b/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java
index bcd97441..73c18617 100644
--- a/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java
+++ b/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java
@@ -2,10 +2,9 @@
 
 /**
  * Marker for default javascript file version if not selected
- * 
+ *
  * @author VISTALL
  * @since 31/08/2023
  */
-public interface DefaultJavaScriptVersion
-{
+public interface DefaultJavaScriptVersion {
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java
index 2362dcdb..198434cc 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java
@@ -4,7 +4,6 @@
  * @author VISTALL
  * @since 15.02.2016
  */
-public interface JavaScriptConstants
-{
-	String USE_STRICT = "use strict";
+public interface JavaScriptConstants {
+    String USE_STRICT = "use strict";
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
index 185ebb03..fdb95933 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
@@ -22,28 +22,25 @@
  * @author VISTALL
  * @since 23.02.2016
  */
-public enum JavaScriptFeature
-{
-	CLASS("Classes"),
-	OCTAL_LITERAL("Octal literals"),
-	BINARY_LITERAL("Binary literals"),
-	PARAMETER_DEFAULT_VALUE("Default parameter values"),
-	REST_PARAMETER("Rest parameters"),
-	SPREAD_OPERATOR("Spread operator"),
-	OPTIONAL_CHAINING_OPERATOR("Optional chaining operator"),
-	FUNCTION_PROPERTY("Function property"),
-	EXPONENTIATION_OPERATOR("Exponentiation operator");
+public enum JavaScriptFeature {
+    CLASS("Classes"),
+    OCTAL_LITERAL("Octal literals"),
+    BINARY_LITERAL("Binary literals"),
+    PARAMETER_DEFAULT_VALUE("Default parameter values"),
+    REST_PARAMETER("Rest parameters"),
+    SPREAD_OPERATOR("Spread operator"),
+    OPTIONAL_CHAINING_OPERATOR("Optional chaining operator"),
+    FUNCTION_PROPERTY("Function property"),
+    EXPONENTIATION_OPERATOR("Exponentiation operator");
 
-	private String myName;
+    private String myName;
 
-	JavaScriptFeature(String name)
-	{
-		myName = name;
-	}
+    JavaScriptFeature(String name) {
+        myName = name;
+    }
 
-	@Nonnull
-	public String getName()
-	{
-		return myName;
-	}
+    @Nonnull
+    public String getName() {
+        return myName;
+    }
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
index 18a0eec0..81d8d4b7 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
@@ -36,57 +36,48 @@
  * Date: Jan 27, 2005
  * Time: 6:02:59 PM
  */
-public class JavaScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion
-{
-	public static final JavaScriptFileType INSTANCE = new JavaScriptFileType();
+public class JavaScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion {
+    public static final JavaScriptFileType INSTANCE = new JavaScriptFileType();
 
-	public JavaScriptFileType()
-	{
-		super(JavaScriptLanguage.INSTANCE);
-	}
+    public JavaScriptFileType() {
+        super(JavaScriptLanguage.INSTANCE);
+    }
 
-	@Override
-	@Nonnull
-	public String getId()
-	{
-		return "JavaScript";
-	}
+    @Override
+    @Nonnull
+    public String getId() {
+        return "JavaScript";
+    }
 
-	@Override
-	@Nonnull
-	public LocalizeValue getDescription()
-	{
-		return JavaScriptLocalize.javascriptFiletypeDescription();
-	}
+    @Override
+    @Nonnull
+    public LocalizeValue getDescription() {
+        return JavaScriptLocalize.javascriptFiletypeDescription();
+    }
 
-	@Override
-	@Nonnull
-	public String getDefaultExtension()
-	{
-		return "js";
-	}
+    @Override
+    @Nonnull
+    public String getDefaultExtension() {
+        return "js";
+    }
 
-	@Override
-	public Image getIcon()
-	{
-		return JavaScriptIconGroup.javascript();
-	}
+    @Override
+    public Image getIcon() {
+        return JavaScriptIconGroup.javascript();
+    }
 
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile)
-	{
-		if(module == null)
-		{
-			return StandardJavaScriptVersions.getInstance().getDefaultVersion();
-		}
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
+        if (module == null) {
+            return StandardJavaScriptVersions.getInstance().getDefaultVersion();
+        }
 
-		JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
-		if(extension != null)
-		{
-			return extension.getLanguageVersion();
-		}
-		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
-	}
+        JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
+        if (extension != null) {
+            return extension.getLanguageVersion();
+        }
+        return StandardJavaScriptVersions.getInstance().getDefaultVersion();
+    }
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
index ad558768..3bea0f9f 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
@@ -28,9 +28,8 @@
  * @author VISTALL
  * @since 11.12.2015
  */
-public interface JavaScriptFileTypeWithVersion
-{
-	@Nonnull
-	@RequiredReadAction
-	LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile);
+public interface JavaScriptFileTypeWithVersion {
+    @Nonnull
+    @RequiredReadAction
+    LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile);
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
index e92a7c2b..13b0a121 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
@@ -22,6 +22,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,47 +30,40 @@
  * @author VISTALL
  * @since 05.12.2015
  */
-public class JavaScriptLanguage extends Language
-{
-	public static final JavaScriptLanguage INSTANCE = new JavaScriptLanguage();
+public class JavaScriptLanguage extends Language {
+    public static final JavaScriptLanguage INSTANCE = new JavaScriptLanguage();
 
-	private Map<String, LanguageVersion> myVersionsById = new HashMap<>();
+    private Map<String, LanguageVersion> myVersionsById = new HashMap<>();
 
-	public JavaScriptLanguage()
-	{
-		super("JavaScript", "text/javascript", "application/javascript");
-	}
+    public JavaScriptLanguage() {
+        super("JavaScript", "text/javascript", "application/javascript");
+    }
 
-	@Nullable
-	public LanguageVersion getVersionById(@Nonnull String id)
-	{
-		Map<String, LanguageVersion> oldMap = myVersionsById;
-		if(oldMap == null)
-		{
-			Map<String, LanguageVersion> newMap = new HashMap<>();
-			for(LanguageVersion version : getVersions())
-			{
-				newMap.put(version.getId(), version);
-			}
+    @Nullable
+    public LanguageVersion getVersionById(@Nonnull String id) {
+        Map<String, LanguageVersion> oldMap = myVersionsById;
+        if (oldMap == null) {
+            Map<String, LanguageVersion> newMap = new HashMap<>();
+            for (LanguageVersion version : getVersions()) {
+                newMap.put(version.getId(), version);
+            }
 
-			myVersionsById = newMap;
+            myVersionsById = newMap;
 
-			return newMap.get(id);
-		}
+            return newMap.get(id);
+        }
 
-		return oldMap.get(id);
-	}
+        return oldMap.get(id);
+    }
 
-	@Nullable
-	@Override
-	public LanguageFileType getAssociatedFileType()
-	{
-		return JavaScriptFileType.INSTANCE;
-	}
+    @Nullable
+    @Override
+    public LanguageFileType getAssociatedFileType() {
+        return JavaScriptFileType.INSTANCE;
+    }
 
-	@Override
-	public boolean isCaseSensitive()
-	{
-		return true;
-	}
+    @Override
+    public boolean isCaseSensitive() {
+        return true;
+    }
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
index bc3308bb..62d3ce7f 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
@@ -5,25 +5,23 @@
 import consulo.language.version.LanguageVersionWithParsing;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.Set;
 
 /**
  * @author VISTALL
  * @since 23-Dec-17
  */
-public abstract class JavaScriptLanguageVersion extends LanguageVersion implements LanguageVersionWithParsing
-{
-	public JavaScriptLanguageVersion(@Nonnull String id, @Nonnull String name, @Nonnull Language language, String... mimeTypes)
-	{
-		super(id, name, language, mimeTypes);
-	}
+public abstract class JavaScriptLanguageVersion extends LanguageVersion implements LanguageVersionWithParsing {
+    public JavaScriptLanguageVersion(@Nonnull String id, @Nonnull String name, @Nonnull Language language, String... mimeTypes) {
+        super(id, name, language, mimeTypes);
+    }
 
-	@Nonnull
-	public abstract Set<JavaScriptFeature> getFeatures();
+    @Nonnull
+    public abstract Set<JavaScriptFeature> getFeatures();
 
-	@Nonnull
-	public String getPresentableName()
-	{
-		return getName();
-	}
+    @Nonnull
+    public String getPresentableName() {
+        return getName();
+    }
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
index c053e592..e54ac86e 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
@@ -20,6 +20,7 @@
 import consulo.language.version.LanguageVersion;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.Collections;
 import java.util.Set;
 
@@ -27,16 +28,13 @@
  * @author VISTALL
  * @since 23.02.2016
  */
-public class JavaScriptVersionUtil
-{
-	public static boolean containsFeature(@Nonnull PsiElement element, @Nonnull JavaScriptFeature feature)
-	{
-		return getFeatures(element).contains(feature);
-	}
+public class JavaScriptVersionUtil {
+    public static boolean containsFeature(@Nonnull PsiElement element, @Nonnull JavaScriptFeature feature) {
+        return getFeatures(element).contains(feature);
+    }
 
-	public static Set<JavaScriptFeature> getFeatures(@Nonnull PsiElement element)
-	{
-		LanguageVersion languageVersion = element.getLanguageVersion();
-		return languageVersion instanceof JavaScriptLanguageVersion ? ((JavaScriptLanguageVersion) languageVersion).getFeatures() : Collections.<JavaScriptFeature>emptySet();
-	}
+    public static Set<JavaScriptFeature> getFeatures(@Nonnull PsiElement element) {
+        LanguageVersion languageVersion = element.getLanguageVersion();
+        return languageVersion instanceof JavaScriptLanguageVersion ? ((JavaScriptLanguageVersion)languageVersion).getFeatures() : Collections.<JavaScriptFeature>emptySet();
+    }
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java
index 4ddfe95a..a01c7e8d 100644
--- a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java
@@ -3,14 +3,12 @@
 /**
  * Marker for javascript version which can be selected inside combobox for module
  *
-* @author VISTALL
-* @since 31/08/2023
-*/
-public interface StandardJavaScriptVersion
-{
-	@Deprecated
-	default int getWeight()
-	{
-		return 0;
-	}
+ * @author VISTALL
+ * @since 31/08/2023
+ */
+public interface StandardJavaScriptVersion {
+    @Deprecated
+    default int getWeight() {
+        return 0;
+    }
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
index 8edd1f39..1cdd1088 100644
--- a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
@@ -22,6 +22,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.List;
 
 /**
@@ -29,21 +30,19 @@
  * @since 11.12.2015
  */
 @ServiceAPI(ComponentScope.APPLICATION)
-public abstract class StandardJavaScriptVersions
-{
+public abstract class StandardJavaScriptVersions {
 
-	@Nonnull
-	public static StandardJavaScriptVersions getInstance()
-	{
-		return ServiceManager.getService(StandardJavaScriptVersions.class);
-	}
+    @Nonnull
+    public static StandardJavaScriptVersions getInstance() {
+        return ServiceManager.getService(StandardJavaScriptVersions.class);
+    }
 
-	@Nonnull
-	public abstract JavaScriptLanguageVersion getDefaultVersion();
+    @Nonnull
+    public abstract JavaScriptLanguageVersion getDefaultVersion();
 
-	@Nonnull
-	public abstract List<JavaScriptLanguageVersion> getValidLanguageVersions();
+    @Nonnull
+    public abstract List<JavaScriptLanguageVersion> getValidLanguageVersions();
 
-	@Nonnull
-	public abstract JavaScriptLanguageVersion findVersionById(@Nullable String id);
+    @Nonnull
+    public abstract JavaScriptLanguageVersion findVersionById(@Nullable String id);
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
index 3fed4841..77f1b4f6 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
@@ -25,39 +25,34 @@
  * @author VISTALL
  * @since 13.12.2015
  */
-public class JavaScriptPrimitiveType implements JavaScriptType
-{
-	public static final JavaScriptPrimitiveType BOOL = new JavaScriptPrimitiveType("Boolean");
-	public static final JavaScriptPrimitiveType STRING = new JavaScriptPrimitiveType("String");
-	public static final JavaScriptPrimitiveType NUMBER = new JavaScriptPrimitiveType("Number");
-	public static final JavaScriptPrimitiveType REGEXP = new JavaScriptPrimitiveType("Regexp");
-	public static final JavaScriptPrimitiveType NULL = new JavaScriptPrimitiveType("null");
-
-	private String myName;
-
-	public JavaScriptPrimitiveType(String name)
-	{
-		myName = name;
-	}
-
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public String getPresentableText()
-	{
-		return myName;
-	}
-
-	@Nullable
-	@Override
-	public PsiElement getTargetElement()
-	{
-		return null;
-	}
-
-	@Override
-	public String toString()
-	{
-		return "JavaScriptPrimitiveType: " + myName;
-	}
+public class JavaScriptPrimitiveType implements JavaScriptType {
+    public static final JavaScriptPrimitiveType BOOL = new JavaScriptPrimitiveType("Boolean");
+    public static final JavaScriptPrimitiveType STRING = new JavaScriptPrimitiveType("String");
+    public static final JavaScriptPrimitiveType NUMBER = new JavaScriptPrimitiveType("Number");
+    public static final JavaScriptPrimitiveType REGEXP = new JavaScriptPrimitiveType("Regexp");
+    public static final JavaScriptPrimitiveType NULL = new JavaScriptPrimitiveType("null");
+
+    private String myName;
+
+    public JavaScriptPrimitiveType(String name) {
+        myName = name;
+    }
+
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public String getPresentableText() {
+        return myName;
+    }
+
+    @Nullable
+    @Override
+    public PsiElement getTargetElement() {
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return "JavaScriptPrimitiveType: " + myName;
+    }
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
index bc26717d..6e6aa557 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
@@ -23,8 +23,7 @@
  * @author VISTALL
  * @since 29.02.2016
  */
-public interface JavaScriptTypeElement extends JSElement
-{
-	@Nonnull
-	JavaScriptType getType();
+public interface JavaScriptTypeElement extends JSElement {
+    @Nonnull
+    JavaScriptType getType();
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
index 0c17c51d..6bafd932 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
@@ -24,12 +24,10 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JSImplementedInterfacesIndex extends StringStubIndexExtension<JSReferenceList>
-{
-	@Nonnull
-	@Override
-	public StubIndexKey<String, JSReferenceList> getKey()
-	{
-		return JavaScriptIndexKeys.IMPLEMENTED_INDEX;
-	}
+public class JSImplementedInterfacesIndex extends StringStubIndexExtension<JSReferenceList> {
+    @Nonnull
+    @Override
+    public StubIndexKey<String, JSReferenceList> getKey() {
+        return JavaScriptIndexKeys.IMPLEMENTED_INDEX;
+    }
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
index 9facfe99..4ae07b1c 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
@@ -27,12 +27,10 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JSNameIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
-{
-	@Nonnull
-	@Override
-	public StubIndexKey<String, JSQualifiedNamedElement> getKey()
-	{
-		return JavaScriptIndexKeys.ELEMENTS_BY_NAME;
-	}
+public class JSNameIndex extends StringStubIndexExtension<JSQualifiedNamedElement> {
+    @Nonnull
+    @Override
+    public StubIndexKey<String, JSQualifiedNamedElement> getKey() {
+        return JavaScriptIndexKeys.ELEMENTS_BY_NAME;
+    }
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
index dc609ec2..248c122b 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
@@ -26,12 +26,10 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JSQualifiedElementIndex extends StringStubIndexExtension<JSQualifiedNamedElement>
-{
-	@Nonnull
-	@Override
-	public StubIndexKey<String, JSQualifiedNamedElement> getKey()
-	{
-		return JavaScriptIndexKeys.ELEMENTS_BY_QNAME;
-	}
+public class JSQualifiedElementIndex extends StringStubIndexExtension<JSQualifiedNamedElement> {
+    @Nonnull
+    @Override
+    public StubIndexKey<String, JSQualifiedNamedElement> getKey() {
+        return JavaScriptIndexKeys.ELEMENTS_BY_QNAME;
+    }
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
index 81ef425f..e8840c49 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
@@ -23,12 +23,10 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JSSuperClassIndex extends StringStubIndexExtension<JSReferenceList>
-{
-	@Nonnull
-	@Override
-	public StubIndexKey<String, JSReferenceList> getKey()
-	{
-		return JavaScriptIndexKeys.EXTENDS_INDEX;
-	}
+public class JSSuperClassIndex extends StringStubIndexExtension<JSReferenceList> {
+    @Nonnull
+    @Override
+    public StubIndexKey<String, JSReferenceList> getKey() {
+        return JavaScriptIndexKeys.EXTENDS_INDEX;
+    }
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java
index 6e77c901..38474232 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java
@@ -25,12 +25,11 @@
  * @author VISTALL
  * @since 05.12.2015
  */
-public interface JavaScriptIndexKeys
-{
-	StubIndexKey<String, JSClass> CLASSES_BY_NAME = StubIndexKey.createIndexKey("js.class.shortName");
-	StubIndexKey<String, JSQualifiedNamedElement> ELEMENTS_BY_NAME = StubIndexKey.createIndexKey("js.qualified.shortName");
-	StubIndexKey<String, JSQualifiedNamedElement> ELEMENTS_BY_QNAME = StubIndexKey.createIndexKey("js.element.qualifiedName");
+public interface JavaScriptIndexKeys {
+    StubIndexKey<String, JSClass> CLASSES_BY_NAME = StubIndexKey.createIndexKey("js.class.shortName");
+    StubIndexKey<String, JSQualifiedNamedElement> ELEMENTS_BY_NAME = StubIndexKey.createIndexKey("js.qualified.shortName");
+    StubIndexKey<String, JSQualifiedNamedElement> ELEMENTS_BY_QNAME = StubIndexKey.createIndexKey("js.element.qualifiedName");
 
-	StubIndexKey<String, JSReferenceList> EXTENDS_INDEX = StubIndexKey.createIndexKey("JS.class.super");
-	StubIndexKey<String, JSReferenceList> IMPLEMENTED_INDEX = StubIndexKey.createIndexKey("JS.class.implements");
+    StubIndexKey<String, JSReferenceList> EXTENDS_INDEX = StubIndexKey.createIndexKey("JS.class.super");
+    StubIndexKey<String, JSReferenceList> IMPLEMENTED_INDEX = StubIndexKey.createIndexKey("JS.class.implements");
 }
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
index 472eb47c..ce2b9c7a 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
@@ -8,8 +8,7 @@
  * @author VISTALL
  * @since 29.06.14
  */
-public interface JavaScriptModuleExtension<T extends JavaScriptModuleExtension<T>> extends ModuleExtensionWithSdk<T>
-{
-	@Nonnull
-	LanguageVersion getLanguageVersion();
+public interface JavaScriptModuleExtension<T extends JavaScriptModuleExtension<T>> extends ModuleExtensionWithSdk<T> {
+    @Nonnull
+    LanguageVersion getLanguageVersion();
 }
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
index 0a1d7ab7..6d560179 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
@@ -24,7 +24,6 @@
  * @author VISTALL
  * @since 12.12.2015
  */
-public interface JavaScriptMutableModuleExtension<T extends JavaScriptModuleExtension<T>> extends JavaScriptModuleExtension<T>, MutableModuleExtensionWithSdk<T>
-{
-	void setLanguageVersion(@Nonnull LanguageVersion languageVersion);
+public interface JavaScriptMutableModuleExtension<T extends JavaScriptModuleExtension<T>> extends JavaScriptModuleExtension<T>, MutableModuleExtensionWithSdk<T> {
+    void setLanguageVersion(@Nonnull LanguageVersion languageVersion);
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
index c15004d5..cb683d13 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
@@ -25,8 +25,7 @@
  * @author VISTALL
  * @since 03.03.2016
  */
-public interface JSComputedName extends JSElement
-{
-	@Nullable
-	JSExpression getExpression();
+public interface JSComputedName extends JSElement {
+    @Nullable
+    JSExpression getExpression();
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
index 886d3030..5fdd2d36 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
@@ -26,9 +26,8 @@
  * @author VISTALL
  * @since 11.12.2015
  */
-public interface JSSimpleLiteralExpression extends JSLiteralExpression
-{
-	@Nonnull
-	@RequiredReadAction
-	IElementType getLiteralElementType();
+public interface JSSimpleLiteralExpression extends JSLiteralExpression {
+    @Nonnull
+    @RequiredReadAction
+    IElementType getLiteralElementType();
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java b/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java
index c777a749..243d1f97 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java
@@ -8,6 +8,5 @@
  *
  * Base interface for all imports in at js implementation. Affect folding
  */
-public interface JavaScriptImportStatementBase extends JSStatement
-{
+public interface JavaScriptImportStatementBase extends JSStatement {
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
index ba6e1477..385a472b 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
@@ -22,6 +22,5 @@
  * @author VISTALL
  * @since 03.03.2016
  */
-public interface JavaScriptLambdaExpression extends JSFunctionExpression
-{
+public interface JavaScriptLambdaExpression extends JSFunctionExpression {
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index 48763677..0da095a0 100644
--- a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -32,11 +32,10 @@
  * @since 02.12.2015
  */
 @ExtensionAPI(ComponentScope.APPLICATION)
-public interface JSPropertyNameReferenceProvider
-{
-	ExtensionPointName<JSPropertyNameReferenceProvider> EP_NAME = ExtensionPointName.create(JSPropertyNameReferenceProvider.class);
+public interface JSPropertyNameReferenceProvider {
+    ExtensionPointName<JSPropertyNameReferenceProvider> EP_NAME = ExtensionPointName.create(JSPropertyNameReferenceProvider.class);
 
-	@Nullable
-	@RequiredReadAction
-	PsiReference getReference(@Nonnull JSProperty property);
+    @Nullable
+    @RequiredReadAction
+    PsiReference getReference(@Nonnull JSProperty property);
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
index a20d02ef..ae460555 100644
--- a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
+++ b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
@@ -9,8 +9,7 @@
  * @author VISTALL
  * @since 19.07.2015
  */
-public interface JSFileStub extends PsiFileStub<JSFile>
-{
-	@Nonnull
-	String getName();
+public interface JSFileStub extends PsiFileStub<JSFile> {
+    @Nonnull
+    String getName();
 }
diff --git a/base-api/src/main/java/module-info.java b/base-api/src/main/java/module-info.java
index 824b484d..461685dd 100644
--- a/base-api/src/main/java/module-info.java
+++ b/base-api/src/main/java/module-info.java
@@ -4,23 +4,23 @@
  */
 open module consulo.javascript.base.api
 {
-	requires transitive consulo.ide.api;
+    requires transitive consulo.ide.api;
 
-	exports com.intellij.lang.javascript.formatter;
-	exports com.intellij.lang.javascript.psi;
-	exports com.intellij.lang.javascript.psi.stubs;
+    exports com.intellij.lang.javascript.formatter;
+    exports com.intellij.lang.javascript.psi;
+    exports com.intellij.lang.javascript.psi.stubs;
 
-	exports consulo.javascript.icon;
-	exports consulo.javascript.ide.completion;
-	exports consulo.javascript.index;
-	exports consulo.javascript.language;
-	exports consulo.javascript.language.psi;
-	exports consulo.javascript.localize;
-	exports consulo.javascript.module.extension;
-	exports consulo.javascript.psi;
-	exports consulo.javascript.psi.impl.reference;
-	exports consulo.javascript.language.psi.stub;
-	exports consulo.javascript.psi.stubs;
+    exports consulo.javascript.icon;
+    exports consulo.javascript.ide.completion;
+    exports consulo.javascript.index;
+    exports consulo.javascript.language;
+    exports consulo.javascript.language.psi;
+    exports consulo.javascript.localize;
+    exports consulo.javascript.module.extension;
+    exports consulo.javascript.psi;
+    exports consulo.javascript.psi.impl.reference;
+    exports consulo.javascript.language.psi.stub;
+    exports consulo.javascript.psi.stubs;
 
-	exports consulo.javascript.internal to consulo.javascript.ecmascript.impl, consulo.javascript.base.impl;
+    exports consulo.javascript.internal to consulo.javascript.ecmascript.impl, consulo.javascript.base.impl;
 }
\ No newline at end of file

From 541b97ddf88032c5cb8594cd3067b533642a0c56 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 20:22:04 +0300
Subject: [PATCH 265/340] Reformatting inspections.

---
 .../impl/inspections/CreateClassDialog.java   |   99 +-
 .../CreateClassOrInterfaceAction.java         |  188 ++-
 .../JSDeprecatedSymbolsInspection.java        |   92 +-
 .../JSDuplicatedDeclarationInspection.java    |  363 +++--
 .../impl/inspections/JSInspection.java        |   84 +-
 .../JSUndeclaredVariableInspection.java       |  414 +++---
 .../JSUnresolvedFunctionInspection.java       | 1229 ++++++++---------
 .../JSUnresolvedVariableInspection.java       |  843 ++++++-----
 .../JSUntypedDeclarationInspection.java       |  302 ++--
 .../JSUnusedLocalSymbolsInspection.java       |  765 +++++-----
 10 files changed, 2017 insertions(+), 2362 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
index 869b4e3c..dda34560 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
@@ -31,67 +31,58 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jun 9, 2008
- *         Time: 7:36:22 PM
+ * Date: Jun 9, 2008
+ * Time: 7:36:22 PM
  */
-class CreateClassDialog extends DialogWrapper
-{
-	private JPanel myPanel;
-	private JTextField myPackageName;
-	private JLabel myClassName;
+class CreateClassDialog extends DialogWrapper {
+    private JPanel myPanel;
+    private JTextField myPackageName;
+    private JLabel myClassName;
 
-	protected CreateClassDialog(final Project project, String className, String packageName, boolean isInterface)
-	{
-		super(project, false);
+    protected CreateClassDialog(final Project project, String className, String packageName, boolean isInterface) {
+        super(project, false);
 
-		setTitle(isInterface ? JavaScriptLocalize.createInterfaceDialogTitle() : JavaScriptLocalize.createClassDialogTitle());
-		setModal(true);
+        setTitle(isInterface ? JavaScriptLocalize.createInterfaceDialogTitle() : JavaScriptLocalize.createClassDialogTitle());
+        setModal(true);
 
-		myPackageName.getDocument().addDocumentListener(new DocumentAdapter()
-		{
-			@Override
-			protected void textChanged(final DocumentEvent e)
-			{
-				String text = getPackageName();
-				boolean enabled;
-				if(text.length() == 0)
-				{
-					enabled = true;
-				}
-				else
-				{
-					ASTNode node = JSChangeUtil.createJSTreeFromText(project, text);
-					PsiElement elt;
-					enabled = node != null &&
-							(elt = node.getPsi()) instanceof JSExpressionStatement &&
-							(elt = ((JSExpressionStatement) elt).getExpression()) instanceof JSReferenceExpression &&
-							((JSReferenceExpression) elt).getReferencedName() != null &&
-							elt.textMatches(text);
-				}
-				getOKAction().setEnabled(enabled);
-			}
-		});
+        myPackageName.getDocument().addDocumentListener(new DocumentAdapter() {
+            @Override
+            protected void textChanged(final DocumentEvent e) {
+                String text = getPackageName();
+                boolean enabled;
+                if (text.length() == 0) {
+                    enabled = true;
+                }
+                else {
+                    ASTNode node = JSChangeUtil.createJSTreeFromText(project, text);
+                    PsiElement elt;
+                    enabled = node != null &&
+                        (elt = node.getPsi()) instanceof JSExpressionStatement &&
+                        (elt = ((JSExpressionStatement)elt).getExpression()) instanceof JSReferenceExpression &&
+                        ((JSReferenceExpression)elt).getReferencedName() != null &&
+                        elt.textMatches(text);
+                }
+                getOKAction().setEnabled(enabled);
+            }
+        });
 
-		myClassName.setText(className);
-		myPackageName.setText(packageName);
+        myClassName.setText(className);
+        myPackageName.setText(packageName);
 
-		init();
-	}
+        init();
+    }
 
-	@Override
-	protected JComponent createCenterPanel()
-	{
-		return myPanel;
-	}
+    @Override
+    protected JComponent createCenterPanel() {
+        return myPanel;
+    }
 
-	@Override
-	public JComponent getPreferredFocusedComponent()
-	{
-		return myPackageName;
-	}
+    @Override
+    public JComponent getPreferredFocusedComponent() {
+        return myPackageName;
+    }
 
-	String getPackageName()
-	{
-		return myPackageName.getText();
-	}
+    String getPackageName() {
+        return myPackageName.getText();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
index 643b000f..b3a80625 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
@@ -43,6 +43,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.Properties;
 
 /**
@@ -52,116 +53,99 @@
  * Time: 14:01:34
  * To change this template use File | Settings | File Templates.
  */
-class CreateClassOrInterfaceAction implements LocalQuickFix
-{
-	private final String classNameToCreate;
-	private final JSReferenceExpression myContext;
-	private String packageName;
-	private final boolean myIsInterface;
+class CreateClassOrInterfaceAction implements LocalQuickFix {
+    private final String classNameToCreate;
+    private final JSReferenceExpression myContext;
+    private String packageName;
+    private final boolean myIsInterface;
 
-	public CreateClassOrInterfaceAction(JSReferenceExpression context, boolean isInterface)
-	{
-		classNameToCreate = context.getReferencedName();
-		myContext = context;
-		myIsInterface = isInterface;
-	}
+    public CreateClassOrInterfaceAction(JSReferenceExpression context, boolean isInterface) {
+        classNameToCreate = context.getReferencedName();
+        myContext = context;
+        myIsInterface = isInterface;
+    }
 
-	@Override
-	@Nonnull
-	public String getName()
-	{
-		return myIsInterface 
-			? JavaScriptLocalize.javascriptCreateInterfaceIntentionName(classNameToCreate).get() 
-			: JavaScriptLocalize.javascriptCreateClassIntentionName(classNameToCreate).get();
-	}
+    @Override
+    @Nonnull
+    public String getName() {
+        return myIsInterface
+            ? JavaScriptLocalize.javascriptCreateInterfaceIntentionName(classNameToCreate).get()
+            : JavaScriptLocalize.javascriptCreateClassIntentionName(classNameToCreate).get();
+    }
 
-	@Override
-	@Nonnull
-	public String getFamilyName()
-	{
-		return getName();
-	}
+    @Override
+    @Nonnull
+    public String getFamilyName() {
+        return getName();
+    }
 
-	@Override
-	public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
-	{
-		PsiFile contextFile = myContext.getContainingFile();
-		final PsiElement context = contextFile.getContext();
-		if (context != null)
-		{
-			contextFile = context.getContainingFile();
-		}
+    @Override
+    public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
+        PsiFile contextFile = myContext.getContainingFile();
+        final PsiElement context = contextFile.getContext();
+        if (context != null) {
+            contextFile = context.getContainingFile();
+        }
 
-		packageName = JSResolveUtil.getExpectedPackageNameFromFile(contextFile.getVirtualFile(), project, false);
+        packageName = JSResolveUtil.getExpectedPackageNameFromFile(contextFile.getVirtualFile(), project, false);
 
-		if (!ApplicationManager.getApplication().isUnitTestMode())
-		{
-			final CreateClassDialog dialog = new CreateClassDialog(project, classNameToCreate, packageName, myIsInterface);
-			dialog.show();
-			if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE)
-			{
-				return;
-			}
-			packageName = dialog.getPackageName().trim();
-		}
-		else
-		{
-			packageName = "foo";
-		}
+        if (!ApplicationManager.getApplication().isUnitTestMode()) {
+            final CreateClassDialog dialog = new CreateClassDialog(project, classNameToCreate, packageName, myIsInterface);
+            dialog.show();
+            if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
+                return;
+            }
+            packageName = dialog.getPackageName().trim();
+        }
+        else {
+            packageName = "foo";
+        }
 
-		final PsiFile contextFile1 = contextFile;
-		ApplicationManager.getApplication().runWriteAction(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				try
-				{
-					final FileTemplate template = FileTemplateManager.getInstance().getTemplate(
-						myIsInterface
-							? JavaScriptSupportLoader.ACTION_SCRIPT_INTERFACE_TEMPLATE_NAME
-							: JavaScriptSupportLoader.ACTION_SCRIPT_CLASS_TEMPLATE_NAME
-					);
-					@NonNls final String fileName = classNameToCreate + ".as";
-					final Properties props = new Properties();
-					props.setProperty(FileTemplate.ATTRIBUTE_NAME, classNameToCreate);
-					final Module element = ModuleUtilCore.findModuleForPsiElement(contextFile1);
-					VirtualFile base = ModuleRootManager.getInstance(element).getSourceRoots()[0];
-					VirtualFile relativeFile = VirtualFileUtil.findRelativeFile(packageName, base);
+        final PsiFile contextFile1 = contextFile;
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    final FileTemplate template = FileTemplateManager.getInstance().getTemplate(
+                        myIsInterface
+                            ? JavaScriptSupportLoader.ACTION_SCRIPT_INTERFACE_TEMPLATE_NAME
+                            : JavaScriptSupportLoader.ACTION_SCRIPT_CLASS_TEMPLATE_NAME
+                    );
+                    @NonNls final String fileName = classNameToCreate + ".as";
+                    final Properties props = new Properties();
+                    props.setProperty(FileTemplate.ATTRIBUTE_NAME, classNameToCreate);
+                    final Module element = ModuleUtilCore.findModuleForPsiElement(contextFile1);
+                    VirtualFile base = ModuleRootManager.getInstance(element).getSourceRoots()[0];
+                    VirtualFile relativeFile = VirtualFileUtil.findRelativeFile(packageName, base);
 
-					if (relativeFile == null)
-					{
-						relativeFile = base;
-						StringTokenizer tokenizer = new StringTokenizer(packageName, ".");
-						while (tokenizer.hasMoreTokens())
-						{
-							String nextNameSegment = tokenizer.nextToken();
-							VirtualFile next = relativeFile.findChild(nextNameSegment);
-							if (next == null)
-							{
-								next = relativeFile.createChildDirectory(this, nextNameSegment);
-							}
-							relativeFile = next;
-						}
-					}
+                    if (relativeFile == null) {
+                        relativeFile = base;
+                        StringTokenizer tokenizer = new StringTokenizer(packageName, ".");
+                        while (tokenizer.hasMoreTokens()) {
+                            String nextNameSegment = tokenizer.nextToken();
+                            VirtualFile next = relativeFile.findChild(nextNameSegment);
+                            if (next == null) {
+                                next = relativeFile.createChildDirectory(this, nextNameSegment);
+                            }
+                            relativeFile = next;
+                        }
+                    }
 
-					assert relativeFile != null;
-					props.setProperty(FileTemplate.ATTRIBUTE_PACKAGE_NAME, packageName);
-					final PsiDirectory psiDirectory = PsiManager.getInstance(project).findDirectory(relativeFile);
-					assert psiDirectory != null;
-					FileTemplateUtil.createFromTemplate(template, fileName, props, psiDirectory);
+                    assert relativeFile != null;
+                    props.setProperty(FileTemplate.ATTRIBUTE_PACKAGE_NAME, packageName);
+                    final PsiDirectory psiDirectory = PsiManager.getInstance(project).findDirectory(relativeFile);
+                    assert psiDirectory != null;
+                    FileTemplateUtil.createFromTemplate(template, fileName, props, psiDirectory);
 
-					String contextPackage = JSResolveUtil.findPackageStatementQualifier(myContext);
-					if (packageName != null && !packageName.equals(contextPackage) && packageName.length() > 0)
-					{
-						ImportUtils.doImport(myContext, packageName + "." + classNameToCreate);
-					}
-				}
-				catch (Exception e)
-				{
-					Logger.getInstance(getClass().getName()).error(e);
-				}
-			}
-		});
-	}
+                    String contextPackage = JSResolveUtil.findPackageStatementQualifier(myContext);
+                    if (packageName != null && !packageName.equals(contextPackage) && packageName.length() > 0) {
+                        ImportUtils.doImport(myContext, packageName + "." + classNameToCreate);
+                    }
+                }
+                catch (Exception e) {
+                    Logger.getInstance(getClass().getName()).error(e);
+                }
+            }
+        });
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
index c1136623..de077812 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
@@ -35,59 +35,49 @@
  * @by Maxim.Mossienko
  */
 @ExtensionImpl
-public class JSDeprecatedSymbolsInspection extends JSInspection
-{
-	@NonNls
-	private static final String SHORT_NAME = "JSDeprecatedSymbols";
+public class JSDeprecatedSymbolsInspection extends JSInspection {
+    @NonNls
+    private static final String SHORT_NAME = "JSDeprecatedSymbols";
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return "General";
-	}
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return "General";
+    }
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return JavaScriptLocalize.jsDeprecatedSymbolsInspectionName().get();
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return JavaScriptLocalize.jsDeprecatedSymbolsInspectionName().get();
+    }
 
-	@Override
-	@Nonnull
-	@NonNls
-	public String getShortName()
-	{
-		return SHORT_NAME;
-	}
+    @Override
+    @Nonnull
+    @NonNls
+    public String getShortName() {
+        return SHORT_NAME;
+    }
 
-	@Override
-	protected JSElementVisitor createVisitor(final ProblemsHolder holder)
-	{
-		return new JSElementVisitor()
-		{
-			@Override
-			public void visitJSReferenceExpression(final JSReferenceExpression node)
-			{
-				for(ResolveResult r : node.multiResolve(false))
-				{
-					final PsiElement element = r.getElement();
-					if((element instanceof JSDefinitionExpression && element.getParent() instanceof JSAssignmentExpression) || element == node.getParent())
-					{
-						continue;
-					}
-					if(JSDocumentationUtils.isDeprecated(element))
-					{
-						holder.registerProblem(
-							node.getReferenceNameElement(),
-							JavaScriptLocalize.javascriptDeprecatedSymbolUsedNameMessage().get(),
-							ProblemHighlightType.LIKE_DEPRECATED
-						);
-						break;
-					}
-				}
-			}
-		};
-	}
+    @Override
+    protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+                for (ResolveResult r : node.multiResolve(false)) {
+                    final PsiElement element = r.getElement();
+                    if ((element instanceof JSDefinitionExpression && element.getParent() instanceof JSAssignmentExpression) || element == node.getParent()) {
+                        continue;
+                    }
+                    if (JSDocumentationUtils.isDeprecated(element)) {
+                        holder.registerProblem(
+                            node.getReferenceNameElement(),
+                            JavaScriptLocalize.javascriptDeprecatedSymbolUsedNameMessage().get(),
+                            ProblemHighlightType.LIKE_DEPRECATED
+                        );
+                        break;
+                    }
+                }
+            }
+        };
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
index c93b066e..df798c6d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
@@ -41,201 +41,170 @@
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
-public class JSDuplicatedDeclarationInspection extends JSInspection
-{
-	@NonNls
-	private static final String SHORT_NAME = "JSDuplicatedDeclaration";
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return "General";
-	}
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return JavaScriptLocalize.jsDuplicatedDeclarationInspectionName().get();
-	}
-
-	@Override
-	@Nonnull
-	@NonNls
-	public String getShortName()
-	{
-		return SHORT_NAME;
-	}
-
-	@Override
-	protected JSElementVisitor createVisitor(final ProblemsHolder holder)
-	{
-		return new JSElementVisitor()
-		{
-			@Override
-			public void visitJSClass(final JSClass node)
-			{
-				final String name = node.getName();
-				if(name == null)
-				{
-					return;
-				}
-				final PsiElement nameIdentifier = node.getNameIdentifier();
-
-				checkForDuplicateDeclaration(name, node, nameIdentifier);
-			}
-
-			@Override
-			public void visitJSFunctionDeclaration(final JSFunction node)
-			{
-				final String name = node.getName();
-				if(name == null)
-				{
-					return;
-				}
-				final PsiElement nameIdentifier = node.getNameIdentifier();
-
-				checkForDuplicateDeclaration(name, node, nameIdentifier);
-			}
-
-			private void checkForDuplicateDeclaration(final String name, final PsiElement decl, final PsiElement nameIdentifier)
-			{
-				PsiElement scope = PsiTreeUtil.getParentOfType(decl, JSFunction.class, JSFile.class, JSEmbeddedContentImpl.class, JSClass.class,
-						JSObjectLiteralExpression.class, JSPackageStatement.class, PsiFile.class);
-				if(scope instanceof JSPackageStatement)
-				{
-					return; // dedicated inspection
-				}
-				final PsiElement originalScope = scope;
-				if(scope instanceof JSFile && scope.getContext() != null)
-				{
-					scope = scope.getContext().getContainingFile();
-				}
-
-				final ResolveProcessor processor = new ResolveProcessor(name, scope)
-				{
-					@Override
-					public boolean execute(PsiElement element, ResolveState state)
-					{
-						if(element == decl)
-						{
-							return true;
-						}
-						//if (!decl.getClass().isInstance(element)) return true;
-						if(decl instanceof JSParameter && decl.getParent() != element.getParent())
-						{
-							return false;
-						}
-
-						if(element instanceof JSFunction && decl instanceof JSFunction)
-						{
-							final JSFunction declFunction = (JSFunction) decl;
-							final JSFunction elementFunction = (JSFunction) element;
-							if((declFunction.isGetProperty() && elementFunction.isSetProperty()) || (declFunction.isSetProperty() && elementFunction.isGetProperty()))
-							{
-								return true;
-							}
-						}
-						if(element instanceof JSFunction &&
-								decl instanceof JSClass && element.getParent() == decl)
-						{
-							return true;
-						}
-
-						if(element instanceof JSAttributeListOwner && decl instanceof JSAttributeListOwner)
-						{
-							JSAttributeList attrList = ((JSAttributeListOwner) element).getAttributeList();
-							JSAttributeList attrList2 = ((JSAttributeListOwner) decl).getAttributeList();
-
-							if(attrList != null && attrList2 != null)
-							{
-								final String ns = attrList.getNamespace();
-								final String ns2 = attrList2.getNamespace();
-
-								if((ns != null && !ns.equals(ns2)) ||
-										ns2 != null && !ns2.equals(ns) ||
-										(ns != null && ns2 != null))
-								{
-									return true;
-								}
-							}
-							else if((attrList != null && attrList.getNamespace() != null) || (attrList2 != null && attrList2.getNamespace() != null))
-							{
-								return true;
-							}
-
-							final boolean notStatic2 = attrList2 == null || !attrList2.hasModifier(JSAttributeList.ModifierType.STATIC);
-							final boolean notStatic = attrList == null || !attrList.hasModifier(JSAttributeList.ModifierType.STATIC);
-							if((notStatic2 && !notStatic) || (notStatic && !notStatic2))
-							{
-								return true;
-							}
-						}
-						return super.execute(element, state);
-					}
-				};
-
-				PsiElement parent = JSResolveUtil.findParent(decl);
-				if(parent instanceof JSClass)
-				{
-					processor.configureClassScope((JSClass) parent);
-				}
-
-				if(decl instanceof JSFunction || decl instanceof JSVariable)
-				{
-					JSAttributeList attrList = ((JSAttributeListOwner) decl).getAttributeList();
-					processor.setProcessStatics(attrList != null && attrList.hasModifier(JSAttributeList.ModifierType.STATIC));
-				}
-
-				processor.setLocalResolve(true);
-				JSResolveUtil.treeWalkUp(processor, decl, null, decl, scope);
-
-				if(processor.getResult() != null && processor.getResult() != scope)
-				{
-					holder.registerProblem(
-						nameIdentifier,
-						JavaScriptLocalize.javascriptValidationMessageDuplicateDeclaration().get(),
-						originalScope.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4
-							? ProblemHighlightType.ERROR : ProblemHighlightType.GENERIC_ERROR_OR_WARNING
-					);
-				}
-			}
-
-			@Override
-			public void visitJSProperty(final JSProperty node)
-			{
-				final String name = node.getName();
-				if(name == null)
-				{
-					return;
-				}
-				checkForDuplicateDeclaration(name, node, node.getNameIdentifier());
-			}
-
-			@Override
-			public void visitJSVariable(final JSVariable var)
-			{
-				final PsiElement nameIdentifier = var.getNameIdentifier();
-				final PsiElement next = nameIdentifier != null ? nameIdentifier.getNextSibling() : null;
-				final String name = nameIdentifier != null ? nameIdentifier.getText() : null;
-
-				// Actully skip outer language elements
-				if(name != null && (next == null ||
-						PsiUtilCore.getElementType(next) instanceof JSElementType ||
-						next instanceof PsiWhiteSpace))
-				{
-					checkForDuplicateDeclaration(name, var, nameIdentifier);
-				}
-			}
-
-		};
-	}
-
-	@Override
-	@Nonnull
-	public HighlightDisplayLevel getDefaultLevel()
-	{
-		return HighlightDisplayLevel.WARNING;
-	}
+public class JSDuplicatedDeclarationInspection extends JSInspection {
+    @NonNls
+    private static final String SHORT_NAME = "JSDuplicatedDeclaration";
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return "General";
+    }
+
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return JavaScriptLocalize.jsDuplicatedDeclarationInspectionName().get();
+    }
+
+    @Override
+    @Nonnull
+    @NonNls
+    public String getShortName() {
+        return SHORT_NAME;
+    }
+
+    @Override
+    protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSClass(final JSClass node) {
+                final String name = node.getName();
+                if (name == null) {
+                    return;
+                }
+                final PsiElement nameIdentifier = node.getNameIdentifier();
+
+                checkForDuplicateDeclaration(name, node, nameIdentifier);
+            }
+
+            @Override
+            public void visitJSFunctionDeclaration(final JSFunction node) {
+                final String name = node.getName();
+                if (name == null) {
+                    return;
+                }
+                final PsiElement nameIdentifier = node.getNameIdentifier();
+
+                checkForDuplicateDeclaration(name, node, nameIdentifier);
+            }
+
+            private void checkForDuplicateDeclaration(final String name, final PsiElement decl, final PsiElement nameIdentifier) {
+                PsiElement scope =
+                    PsiTreeUtil.getParentOfType(decl, JSFunction.class, JSFile.class, JSEmbeddedContentImpl.class, JSClass.class,
+                        JSObjectLiteralExpression.class, JSPackageStatement.class, PsiFile.class
+                    );
+                if (scope instanceof JSPackageStatement) {
+                    return; // dedicated inspection
+                }
+                final PsiElement originalScope = scope;
+                if (scope instanceof JSFile && scope.getContext() != null) {
+                    scope = scope.getContext().getContainingFile();
+                }
+
+                final ResolveProcessor processor = new ResolveProcessor(name, scope) {
+                    @Override
+                    public boolean execute(PsiElement element, ResolveState state) {
+                        if (element == decl) {
+                            return true;
+                        }
+                        //if (!decl.getClass().isInstance(element)) return true;
+                        if (decl instanceof JSParameter && decl.getParent() != element.getParent()) {
+                            return false;
+                        }
+
+                        if (element instanceof JSFunction && decl instanceof JSFunction) {
+                            final JSFunction declFunction = (JSFunction)decl;
+                            final JSFunction elementFunction = (JSFunction)element;
+                            if ((declFunction.isGetProperty() && elementFunction.isSetProperty()) || (declFunction.isSetProperty() && elementFunction.isGetProperty())) {
+                                return true;
+                            }
+                        }
+                        if (element instanceof JSFunction &&
+                            decl instanceof JSClass && element.getParent() == decl) {
+                            return true;
+                        }
+
+                        if (element instanceof JSAttributeListOwner && decl instanceof JSAttributeListOwner) {
+                            JSAttributeList attrList = ((JSAttributeListOwner)element).getAttributeList();
+                            JSAttributeList attrList2 = ((JSAttributeListOwner)decl).getAttributeList();
+
+                            if (attrList != null && attrList2 != null) {
+                                final String ns = attrList.getNamespace();
+                                final String ns2 = attrList2.getNamespace();
+
+                                if ((ns != null && !ns.equals(ns2)) ||
+                                    ns2 != null && !ns2.equals(ns) ||
+                                    (ns != null && ns2 != null)) {
+                                    return true;
+                                }
+                            }
+                            else if ((attrList != null && attrList.getNamespace() != null) || (attrList2 != null && attrList2.getNamespace() != null)) {
+                                return true;
+                            }
+
+                            final boolean notStatic2 = attrList2 == null || !attrList2.hasModifier(JSAttributeList.ModifierType.STATIC);
+                            final boolean notStatic = attrList == null || !attrList.hasModifier(JSAttributeList.ModifierType.STATIC);
+                            if ((notStatic2 && !notStatic) || (notStatic && !notStatic2)) {
+                                return true;
+                            }
+                        }
+                        return super.execute(element, state);
+                    }
+                };
+
+                PsiElement parent = JSResolveUtil.findParent(decl);
+                if (parent instanceof JSClass) {
+                    processor.configureClassScope((JSClass)parent);
+                }
+
+                if (decl instanceof JSFunction || decl instanceof JSVariable) {
+                    JSAttributeList attrList = ((JSAttributeListOwner)decl).getAttributeList();
+                    processor.setProcessStatics(attrList != null && attrList.hasModifier(JSAttributeList.ModifierType.STATIC));
+                }
+
+                processor.setLocalResolve(true);
+                JSResolveUtil.treeWalkUp(processor, decl, null, decl, scope);
+
+                if (processor.getResult() != null && processor.getResult() != scope) {
+                    holder.registerProblem(
+                        nameIdentifier,
+                        JavaScriptLocalize.javascriptValidationMessageDuplicateDeclaration().get(),
+                        originalScope.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4
+                            ? ProblemHighlightType.ERROR : ProblemHighlightType.GENERIC_ERROR_OR_WARNING
+                    );
+                }
+            }
+
+            @Override
+            public void visitJSProperty(final JSProperty node) {
+                final String name = node.getName();
+                if (name == null) {
+                    return;
+                }
+                checkForDuplicateDeclaration(name, node, node.getNameIdentifier());
+            }
+
+            @Override
+            public void visitJSVariable(final JSVariable var) {
+                final PsiElement nameIdentifier = var.getNameIdentifier();
+                final PsiElement next = nameIdentifier != null ? nameIdentifier.getNextSibling() : null;
+                final String name = nameIdentifier != null ? nameIdentifier.getText() : null;
+
+                // Actully skip outer language elements
+                if (name != null && (next == null ||
+                    PsiUtilCore.getElementType(next) instanceof JSElementType ||
+                    next instanceof PsiWhiteSpace)) {
+                    checkForDuplicateDeclaration(name, var, nameIdentifier);
+                }
+            }
+
+        };
+    }
+
+    @Override
+    @Nonnull
+    public HighlightDisplayLevel getDefaultLevel() {
+        return HighlightDisplayLevel.WARNING;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
index b27a2a98..33d7757c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
@@ -39,58 +39,50 @@
  * @author Maxim.Mossienko
  * @since 2006-08-18
  */
-public abstract class JSInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool
-{
-	protected boolean myOnTheFly;
+public abstract class JSInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool {
+    protected boolean myOnTheFly;
 
-	protected abstract JSElementVisitor createVisitor(final ProblemsHolder holder);
+    protected abstract JSElementVisitor createVisitor(final ProblemsHolder holder);
 
-	@Override
-	@Nonnull
-	public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder holder, boolean isOnTheFly)
-	{
-		myOnTheFly = isOnTheFly;
-		return createVisitor(holder);
-	}
+    @Override
+    @Nonnull
+    public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder holder, boolean isOnTheFly) {
+        myOnTheFly = isOnTheFly;
+        return createVisitor(holder);
+    }
 
-	@Override
-	public boolean isEnabledByDefault()
-	{
-		return true;
-	}
+    @Override
+    public boolean isEnabledByDefault() {
+        return true;
+    }
 
-	@Nullable
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nullable
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 
-	@Override
-	@Nonnull
-	public HighlightDisplayLevel getDefaultLevel()
-	{
-		return HighlightDisplayLevel.WEAK_WARNING;
-	}
+    @Override
+    @Nonnull
+    public HighlightDisplayLevel getDefaultLevel() {
+        return HighlightDisplayLevel.WEAK_WARNING;
+    }
 
-	@Override
-	public PsiNamedElement getProblemElement(final PsiElement psiElement)
-	{
-		return PsiTreeUtil.getNonStrictParentOfType(psiElement, JSNamedElement.class);
-	}
+    @Override
+    public PsiNamedElement getProblemElement(final PsiElement psiElement) {
+        return PsiTreeUtil.getNonStrictParentOfType(psiElement, JSNamedElement.class);
+    }
 
-	@Override
-	@Nullable
-	public SuppressIntentionAction[] getSuppressActions(final PsiElement element)
-	{
-		return new SuppressIntentionAction[]{
-	/*  new AddNoInspectionCommentFix(HighlightDisplayKey.find(getShortName()), JSSuppressionHolder.class),*/
-		};
-	}
+    @Override
+    @Nullable
+    public SuppressIntentionAction[] getSuppressActions(final PsiElement element) {
+        return new SuppressIntentionAction[]{
+            /*  new AddNoInspectionCommentFix(HighlightDisplayKey.find(getShortName()), JSSuppressionHolder.class),*/
+        };
+    }
 
-	@Override
-	public boolean isSuppressedFor(final PsiElement element)
-	{
-		return SuppressionUtil.isSuppressedInStatement(element, getID(), JSSuppressionHolder.class);
-	}
+    @Override
+    public boolean isSuppressedFor(final PsiElement element) {
+        return SuppressionUtil.isSuppressedInStatement(element, getID(), JSSuppressionHolder.class);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
index 4433cefa..ea38b220 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
@@ -39,6 +39,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.LinkedList;
 import java.util.List;
 
@@ -46,229 +47,192 @@
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
-public class JSUndeclaredVariableInspection extends JSInspection
-{
-	@NonNls
-	public static final String SHORT_NAME = "JSUndeclaredVariable";
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return "General";
-	}
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return JavaScriptLocalize.jsUndeclaredVariableInspectionName().get();
-	}
-
-	@Override
-	@Nonnull
-	@NonNls
-	public String getShortName()
-	{
-		return SHORT_NAME;
-	}
-
-	@Override
-	protected JSElementVisitor createVisitor(final ProblemsHolder holder)
-	{
-		return new JSElementVisitor()
-		{
-			@Override
-			public void visitJSReferenceExpression(final JSReferenceExpression node)
-			{
-				final PsiElement parentElement = node.getParent();
-
-				if(!(parentElement instanceof JSCallExpression) && node.shouldCheckReferences() && node.getQualifier() == null && parentElement instanceof
-						JSDefinitionExpression)
-				{
-					final JSSourceElement element = PsiTreeUtil.getParentOfType(node, JSWithStatement.class, JSFunction.class);
-
-					if(!(element instanceof JSWithStatement))
-					{
-						boolean varReferenceWithoutVar = true;
-						final ResolveResult[] resolveResults = node.multiResolve(false);
-
-						for(ResolveResult r : resolveResults)
-						{
-							final PsiElement resolveResult = r.getElement();
-							if(resolveResult instanceof JSVariable ||
-									resolveResult instanceof JSFunction)
-							{
-								varReferenceWithoutVar = false;
-								break;
-							}
-						}
-
-						if(varReferenceWithoutVar)
-						{
-							final PsiElement nameIdentifier = node.getReferenceNameElement();
-
-							if(nameIdentifier != null)
-							{
-								final List<LocalQuickFix> fixes = new LinkedList<LocalQuickFix>();
-
-								if(myOnTheFly)
-								{
-									fixes.add(new DeclareJSVariableIntentionAction(node));
-								}
-
-								holder.registerProblem(
-									nameIdentifier,
-									JavaScriptLocalize.javascriptUndeclaredVariableNameMessage(node.getReferencedName()).get(),
-									ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-									!fixes.isEmpty() ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null
-								);
-							}
-						}
-					}
-				}
-				super.visitJSReferenceExpression(node);
-			}
-		};
-	}
-
-	private static boolean isImplicitlyDeclared(final JSReferenceExpression node, final PsiElement parentElement)
-	{
-		if(parentElement instanceof JSForInStatement)
-		{
-			final JSExpression varExpression = ((JSForInStatement) parentElement).getVariableExpression();
-
-			return PsiTreeUtil.findCommonParent(varExpression, node) == varExpression;
-		}
-		else if(parentElement instanceof JSForStatement)
-		{
-			final JSExpression varExpression = ((JSForStatement) parentElement).getInitialization();
-
-			return PsiTreeUtil.findCommonParent(varExpression, node) == varExpression;
-		}
-		return false;
-	}
-
-	private static class DeclareJSVariableIntentionAction implements LocalQuickFix
-	{
-		private final JSReferenceExpression myReferenceExpression;
-		@NonNls
-		private static final String VAR_STATEMENT_START = "var ";
-		private final PsiFile myFile;
-
-		DeclareJSVariableIntentionAction(JSReferenceExpression expression)
-		{
-			myReferenceExpression = expression;
-			myFile = expression.getContainingFile();
-		}
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return JavaScriptLocalize.javascriptDeclareVariableIntentionName(myReferenceExpression.getReferencedName()).get();
-		}
-
-		@Override
-		@Nonnull
-		public String getFamilyName()
-		{
-			return JavaScriptLocalize.javascriptCreateVariableIntentionFamily().get();
-		}
-
-		@Override
-		public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor)
-		{
-			if(!FileModificationService.getInstance().prepareFileForWrite(myFile))
-			{
-				return;
-			}
-
-			PsiElement anchor = JSUtils.findStatementAnchor(myReferenceExpression, myFile);
-			boolean implicitlyDeclared = isImplicitlyDeclared(myReferenceExpression, anchor);
-
-			if(implicitlyDeclared)
-			{
-				anchor = myReferenceExpression;
-				final JSStatement statement = PsiTreeUtil.getParentOfType(anchor, JSForStatement.class, JSStatement.class);
-
-				if(statement instanceof JSForStatement)
-				{
-					final JSExpression initialization = ((JSForStatement) statement).getInitialization();
-
-					if(initialization instanceof JSBinaryExpression && ((JSBinaryExpression) initialization).getOperationSign() == JSTokenTypes.COMMA)
-					{
-						anchor = ((JSAssignmentExpression) ((JSBinaryExpression) initialization).getLOperand()).getLOperand();
-					}
-				}
-			}
-
-			if(anchor != null)
-			{
-				boolean anchorChanged = false;
-
-				if(!implicitlyDeclared)
-				{
-					PsiElement parent = anchor.getParent();
-
-					while(parent instanceof JSBlockStatement || parent instanceof JSIfStatement || parent instanceof JSLoopStatement)
-					{
-						PsiElement newAnchor = parent.getParent();
-
-						if(newAnchor instanceof JSIfStatement || newAnchor instanceof JSWithStatement || newAnchor instanceof JSLoopStatement ||
-								newAnchor instanceof JSTryStatement || newAnchor instanceof JSSwitchStatement)
-						{
-							anchor = newAnchor;
-							parent = anchor.getParent();
-							anchorChanged = true;
-						}
-						else if(newAnchor instanceof JSFile)
-						{
-							anchor = parent;
-							anchorChanged = true;
-							break;
-						}
-						else
-						{
-							break;
-						}
-					}
-				}
-
-				final TextRange textRange = anchor.getTextRange();
-				final int startOffset = textRange.getStartOffset();
-				@NonNls StringBuilder builder = new StringBuilder();
-				builder.append(VAR_STATEMENT_START);
-
-				if(anchor instanceof JSExpressionStatement)
-				{
-					JSExpression expr = ((JSExpressionStatement) anchor).getExpression();
-					if(expr instanceof JSAssignmentExpression && ((JSAssignmentExpression) expr).getOperationSign() != JSTokenTypes.EQ)
-					{
-						anchorChanged = true;
-					}
-				}
-
-				if((anchorChanged || !(anchor instanceof JSExpressionStatement)) && !implicitlyDeclared)
-				{
-					// var statement should be inserted completely
-					builder.append(myReferenceExpression.getReferencedName()).append(";\n");
-				}
-
-				Document document = PsiDocumentManager.getInstance(project).getDocument(myFile);
-				document.replaceString(startOffset, startOffset, builder);
-				PsiDocumentManager.getInstance(project).commitDocument(document);
-
-				try
-				{
-					CodeStyleManager.getInstance(project).reformatText(myFile, startOffset, textRange.getEndOffset() + builder.length());
-				}
-				catch(IncorrectOperationException e)
-				{
-					e.printStackTrace();
-				}
-				myFile.navigate(true);
-			}
-		}
-	}
+public class JSUndeclaredVariableInspection extends JSInspection {
+    @NonNls
+    public static final String SHORT_NAME = "JSUndeclaredVariable";
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return "General";
+    }
+
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return JavaScriptLocalize.jsUndeclaredVariableInspectionName().get();
+    }
+
+    @Override
+    @Nonnull
+    @NonNls
+    public String getShortName() {
+        return SHORT_NAME;
+    }
+
+    @Override
+    protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+                final PsiElement parentElement = node.getParent();
+
+                if (!(parentElement instanceof JSCallExpression) && node.shouldCheckReferences() && node.getQualifier() == null && parentElement instanceof
+                    JSDefinitionExpression) {
+                    final JSSourceElement element = PsiTreeUtil.getParentOfType(node, JSWithStatement.class, JSFunction.class);
+
+                    if (!(element instanceof JSWithStatement)) {
+                        boolean varReferenceWithoutVar = true;
+                        final ResolveResult[] resolveResults = node.multiResolve(false);
+
+                        for (ResolveResult r : resolveResults) {
+                            final PsiElement resolveResult = r.getElement();
+                            if (resolveResult instanceof JSVariable ||
+                                resolveResult instanceof JSFunction) {
+                                varReferenceWithoutVar = false;
+                                break;
+                            }
+                        }
+
+                        if (varReferenceWithoutVar) {
+                            final PsiElement nameIdentifier = node.getReferenceNameElement();
+
+                            if (nameIdentifier != null) {
+                                final List<LocalQuickFix> fixes = new LinkedList<LocalQuickFix>();
+
+                                if (myOnTheFly) {
+                                    fixes.add(new DeclareJSVariableIntentionAction(node));
+                                }
+
+                                holder.registerProblem(
+                                    nameIdentifier,
+                                    JavaScriptLocalize.javascriptUndeclaredVariableNameMessage(node.getReferencedName()).get(),
+                                    ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+                                    !fixes.isEmpty() ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null
+                                );
+                            }
+                        }
+                    }
+                }
+                super.visitJSReferenceExpression(node);
+            }
+        };
+    }
+
+    private static boolean isImplicitlyDeclared(final JSReferenceExpression node, final PsiElement parentElement) {
+        if (parentElement instanceof JSForInStatement) {
+            final JSExpression varExpression = ((JSForInStatement)parentElement).getVariableExpression();
+
+            return PsiTreeUtil.findCommonParent(varExpression, node) == varExpression;
+        }
+        else if (parentElement instanceof JSForStatement) {
+            final JSExpression varExpression = ((JSForStatement)parentElement).getInitialization();
+
+            return PsiTreeUtil.findCommonParent(varExpression, node) == varExpression;
+        }
+        return false;
+    }
+
+    private static class DeclareJSVariableIntentionAction implements LocalQuickFix {
+        private final JSReferenceExpression myReferenceExpression;
+        @NonNls
+        private static final String VAR_STATEMENT_START = "var ";
+        private final PsiFile myFile;
+
+        DeclareJSVariableIntentionAction(JSReferenceExpression expression) {
+            myReferenceExpression = expression;
+            myFile = expression.getContainingFile();
+        }
+
+        @Override
+        @Nonnull
+        public String getName() {
+            return JavaScriptLocalize.javascriptDeclareVariableIntentionName(myReferenceExpression.getReferencedName()).get();
+        }
+
+        @Override
+        @Nonnull
+        public String getFamilyName() {
+            return JavaScriptLocalize.javascriptCreateVariableIntentionFamily().get();
+        }
+
+        @Override
+        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+            if (!FileModificationService.getInstance().prepareFileForWrite(myFile)) {
+                return;
+            }
+
+            PsiElement anchor = JSUtils.findStatementAnchor(myReferenceExpression, myFile);
+            boolean implicitlyDeclared = isImplicitlyDeclared(myReferenceExpression, anchor);
+
+            if (implicitlyDeclared) {
+                anchor = myReferenceExpression;
+                final JSStatement statement = PsiTreeUtil.getParentOfType(anchor, JSForStatement.class, JSStatement.class);
+
+                if (statement instanceof JSForStatement) {
+                    final JSExpression initialization = ((JSForStatement)statement).getInitialization();
+
+                    if (initialization instanceof JSBinaryExpression && ((JSBinaryExpression)initialization).getOperationSign() == JSTokenTypes.COMMA) {
+                        anchor = ((JSAssignmentExpression)((JSBinaryExpression)initialization).getLOperand()).getLOperand();
+                    }
+                }
+            }
+
+            if (anchor != null) {
+                boolean anchorChanged = false;
+
+                if (!implicitlyDeclared) {
+                    PsiElement parent = anchor.getParent();
+
+                    while (parent instanceof JSBlockStatement || parent instanceof JSIfStatement || parent instanceof JSLoopStatement) {
+                        PsiElement newAnchor = parent.getParent();
+
+                        if (newAnchor instanceof JSIfStatement || newAnchor instanceof JSWithStatement || newAnchor instanceof JSLoopStatement ||
+                            newAnchor instanceof JSTryStatement || newAnchor instanceof JSSwitchStatement) {
+                            anchor = newAnchor;
+                            parent = anchor.getParent();
+                            anchorChanged = true;
+                        }
+                        else if (newAnchor instanceof JSFile) {
+                            anchor = parent;
+                            anchorChanged = true;
+                            break;
+                        }
+                        else {
+                            break;
+                        }
+                    }
+                }
+
+                final TextRange textRange = anchor.getTextRange();
+                final int startOffset = textRange.getStartOffset();
+                @NonNls StringBuilder builder = new StringBuilder();
+                builder.append(VAR_STATEMENT_START);
+
+                if (anchor instanceof JSExpressionStatement) {
+                    JSExpression expr = ((JSExpressionStatement)anchor).getExpression();
+                    if (expr instanceof JSAssignmentExpression && ((JSAssignmentExpression)expr).getOperationSign() != JSTokenTypes.EQ) {
+                        anchorChanged = true;
+                    }
+                }
+
+                if ((anchorChanged || !(anchor instanceof JSExpressionStatement)) && !implicitlyDeclared) {
+                    // var statement should be inserted completely
+                    builder.append(myReferenceExpression.getReferencedName()).append(";\n");
+                }
+
+                Document document = PsiDocumentManager.getInstance(project).getDocument(myFile);
+                document.replaceString(startOffset, startOffset, builder);
+                PsiDocumentManager.getInstance(project).commitDocument(document);
+
+                try {
+                    CodeStyleManager.getInstance(project).reformatText(myFile, startOffset, textRange.getEndOffset() + builder.length());
+                }
+                catch (IncorrectOperationException e) {
+                    e.printStackTrace();
+                }
+                myFile.navigate(true);
+            }
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
index cdff7322..2018dbed 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
@@ -59,667 +59,570 @@
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
-public class JSUnresolvedFunctionInspection extends JSInspection
-{
-	@NonNls
-	private static final String SHORT_NAME = "JSUnresolvedFunction";
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return "General";
-	}
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return JavaScriptLocalize.jsUnresolvedFunctionInspectionName().get();
-	}
-
-	@Override
-	@Nonnull
-	@NonNls
-	public String getShortName()
-	{
-		return SHORT_NAME;
-	}
-
-	@Override
-	protected JSElementVisitor createVisitor(final ProblemsHolder holder)
-	{
-		return new JSElementVisitor()
-		{
-			@Override
-			public void visitJSCallExpression(final JSCallExpression node)
-			{
-				final JSExpression methodExpression = node.getMethodExpression();
-
-				if (methodExpression instanceof JSReferenceExpression referenceExpression)
-				{
-					final ResolveResult[] resolveResults = referenceExpression.multiResolve(false);
-
-					boolean noCompleteResolve = true;
-
-					boolean inNewExpression = node instanceof JSNewExpression;
-					for(ResolveResult r : resolveResults)
-					{
-						if(r.isValidResult())
-						{
-							noCompleteResolve = false;
-
-							PsiElement element = r.getElement();
-
-							if (element instanceof JSVariable variable)
-							{
-								String typeText = variable.getTypeString();
-
-								if(typeText != null && !"*".equals(typeText))
-								{
-									if(!allowMemberReference(inNewExpression, typeText))
-									{
-										holder.registerProblem(
-											referenceExpression.getReferenceNameElement(),
-											JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction().get(),
-											getHighlightTypeForTypeOrSignatureProblem(node)
-										);
-									}
-								}
-							}
-							else if (element instanceof JSFunction function && function.isGetProperty())
-							{
-								String typeText = function.getReturnTypeString();
-
-								if(!allowMemberReference(inNewExpression, typeText))
-								{
-									JSArgumentList argumentList = node.getArgumentList();
-									LocalQuickFix fixes[] = LocalQuickFix.EMPTY_ARRAY;
-
-									if(argumentList != null)
-									{
-										fixes = new LocalQuickFix[]{
-											new JSAnnotatingVisitor.RemoveASTNodeFix(
-												argumentList.getNode(),
-												JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction2Fix()
-											)
-										};
-									}
-
-									holder.registerProblem(
-										((JSReferenceExpression) methodExpression).getReferenceNameElement(),
-										JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction2().get(),
-										getHighlightTypeForTypeOrSignatureProblem(node),
-										fixes
-									);
-								}
-							}
-							break;
-						}
-					}
-					JavaScriptQuickFixFactory javaScriptQuickFixFactory = JavaScriptQuickFixFactory.byElement(referenceExpression);
-
-					if(resolveResults.length == 0 || noCompleteResolve)
-					{
-						final JSExpression qualifier = referenceExpression.getQualifier();
-						final List<LocalQuickFix> quickFixes = new LinkedList<LocalQuickFix>();
-						final String refName = referenceExpression.getReferencedName();
-
-						if(myOnTheFly && ((qualifier == null || qualifier instanceof JSThisExpression) || JSUtils.isLHSExpression(qualifier)))
-						{
-							if(methodExpression.getParent() instanceof JSCallExpression)
-							{
-								boolean simpleJs = !JavaScriptVersionUtil.containsFeature(referenceExpression, JavaScriptFeature.CLASS);
-
-								if(!inNewExpression || simpleJs)
-								{
-									quickFixes.add(javaScriptQuickFixFactory.createFunctionOrMethodFix(refName, true));
-								}
-
-								if(qualifier == null)
-								{
-									if(simpleJs)
-									{
-										quickFixes.add(javaScriptQuickFixFactory.createFunctionOrMethodFix(refName, false));
-									}
-									else
-									{
-										quickFixes.add(new AddImportECMAScriptClassOrFunctionAction(null, referenceExpression));
-										if(inNewExpression)
-										{
-											quickFixes.add(new CreateClassOrInterfaceAction(referenceExpression, false));
-										}
-									}
-								}
-							}
-						}
-
-						final PsiElement referenceNameElement = referenceExpression.getReferenceNameElement();
-
-						if(referenceNameElement != null)
-						{
-							holder.registerProblem(
-								referenceNameElement,
-								inNewExpression
-									? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(refName).get()
-									: JavaScriptLocalize.javascriptUnresolvedFunctionNameMessage(refName).get(),
-								getUnresolveReferenceHighlightType(qualifier, node),
-									quickFixes.size() > 0 ? quickFixes.toArray(new LocalQuickFix[quickFixes.size()]) : null
-							);
-						}
-					}
-					else
-					{
-						PsiElement element = resolveResults[0].getElement();
-
-						if (inNewExpression && element instanceof JSClass jsClass && jsClass.isInterface())
-						{
-							final PsiElement referenceNameElement = referenceExpression.getReferenceNameElement();
-
-							holder.registerProblem(
-								referenceNameElement,
-								JavaScriptLocalize.javascriptInterfaceCanNotBeInstantiatedMessage().get(),
-								getUnresolveReferenceHighlightType(referenceExpression.getQualifier(), node)
-							);
-						}
-						else
-						{
-							checkFunction(node, element, holder);
-						}
-					}
-				}
-				else if(methodExpression instanceof JSSuperExpression)
-				{
-					final PsiElement element = (methodExpression.getReference()).resolve();
-
-					if(element != null)
-					{
-						checkFunction(node, element, holder);
-					}
-				}
-				else if (methodExpression instanceof JSNewExpression newExpression)
-				{
-					JSExpression methodExpr = newExpression.getMethodExpression();
-
-					if (methodExpr instanceof JSReferenceExpression referenceExpression)
-					{
-						ResolveResult[] results = referenceExpression.multiResolve(false);
-						PsiElement elt;
-
-						if(results.length > 0 && ((elt = results[0].getElement()) instanceof JSFunction && ((JSFunction) elt).isConstructor() || elt instanceof
-								JSClass))
-						{
-							holder.registerProblem(
-								methodExpression,
-								JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction().get(),
-								getUnresolveReferenceHighlightType(null, node)
-							);
-						}
-					}
-				}
-
-				super.visitJSCallExpression(node);
-			}
-
-			@Override
-			public void visitJSAssignmentExpression(final JSAssignmentExpression node)
-			{
-				final JSExpression lOperand = node.getLOperand();
-				if(lOperand == null)
-				{
-					return;
-				}
-				final JSExpression rOperand = node.getROperand();
-				if(rOperand == null)
-				{
-					return;
-				}
-
-				final PsiFile containingFile = node.getContainingFile();
-				if(containingFile.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-				{
-					return;
-				}
-				String expressionType = null;
-
-				if(lOperand instanceof JSDefinitionExpression)
-				{
-					JSExpression expression = ((JSDefinitionExpression) lOperand).getExpression();
-					if(expression instanceof JSReferenceExpression)
-					{
-						PsiElement resolve = JSResolveUtil.unwrapProxy(((JSReferenceExpression) expression).resolve());
-
-						if(resolve instanceof JSNamedElement)
-						{
-							expressionType = JSResolveUtil.getTypeFromSetAccessor((JSNamedElement) resolve);
-							if(expressionType != null)
-							{
-								expressionType = JSImportHandlingUtil.resolveTypeName(expressionType, resolve);
-							}
-						}
-					}
-				}
-
-				if(expressionType == null)
-				{
-					expressionType = JSResolveUtil.getQualifiedExpressionType(lOperand, containingFile);
-				}
-				checkExpressionIsAssignableToType(
-					rOperand,
-					expressionType,
-					holder,
-					containingFile,
-					JavaScriptLocalize::javascriptAssignedExpressionTypeMismatch
-				);
-			}
-
-			@Override
-			public void visitJSReturnStatement(final JSReturnStatement node)
-			{
-				final JSExpression expression = node.getExpression();
-				if(expression == null)
-				{
-					return;
-				}
-
-				final JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
-				if(fun == null)
-				{
-					return; // TODO: complain about it
-				}
-				final String typeString = fun.getReturnTypeString();
-				if(typeString == null)
-				{
-					return;
-				}
-				final PsiFile containingFile = fun.getContainingFile();
-				if(containingFile.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-				{
-					return;
-				}
-
-				checkExpressionIsAssignableToType(
-					expression,
-					JSImportHandlingUtil.resolveTypeName(typeString, fun),
-					holder,
-					containingFile,
-					JavaScriptLocalize::javascriptReturnedExpressionTypeMismatch
-				);
-			}
-
-			@Override
-			public void visitJSVariable(final JSVariable node)
-			{
-				final JSExpression initializer = node.getInitializer();
-				if(initializer == null)
-				{
-					return;
-				}
-				checkExpressionIsAssignableToVariable(
-					node,
-					initializer,
-					holder,
-					node.getContainingFile(),
-					JavaScriptLocalize::javascriptInitializerTypeMismatch
-				);
-			}
-
-			@Override
-			public void visitJSBinaryExpression(JSBinaryExpression node)
-			{
-				IElementType sign = node.getOperationSign();
-
-				if(sign == JSTokenTypes.AS_KEYWORD || sign == JSTokenTypes.IS_KEYWORD)
-				{
-					JSExpression rOperand = node.getROperand();
-
-					if(rOperand instanceof JSReferenceExpression)
-					{
-						ResolveResult[] results = ((JSReferenceExpression) rOperand).multiResolve(false);
-
-						if(results.length > 0 && results[0].getElement() instanceof JSVariable)
-						{
-							checkTypeIs(rOperand, rOperand, holder, "Class");
-						}
-					}
-				}
-			}
-
-			@Override
-			public void visitJSForInStatement(JSForInStatement node)
-			{
-				if(!node.isForEach())
-				{
-					JSVarStatement statement = node.getDeclarationStatement();
-
-					if(statement != null)
-					{
-						String expressionType = JSResolveUtil.getQualifiedExpressionType(node.getCollectionExpression(), node.getContainingFile());
-						boolean isDictionary = "flash.utils.Dictionary".equals(expressionType);
-
-						for(JSVariable var : statement.getVariables())
-						{
-							PsiElement typeElement = var.getTypeElement();
-							String typeElementText;
-
-							if(typeElement != null &&
-									"Array".equals(expressionType) &&
-									("Object".equals(typeElementText = typeElement.getText()) || "*".equals(typeElementText)))
-							{
-								holder.registerProblem(
-									typeElement,
-									JavaScriptLocalize.javascriptIncorrectArrayTypeInForin().get(),
-									ProblemHighlightType.GENERIC_ERROR_OR_WARNING
-								);
-								continue;
-							}
-
-							if(isDictionary && typeElement != null && "Object".equals(typeElement.getText()))
-							{
-								continue;
-							}
-							checkTypeIs(typeElement, typeElement, holder, "XMLList".equals(expressionType) ? "XML" : "String");
-						}
-					}
-				}
-			}
-		};
-	}
-
-	private static boolean allowMemberReference(boolean inNewExpression, String typeText)
-	{
-		return ("Class".equals(typeText) && inNewExpression) || "Function".equals(typeText);
-	}
-
-	private static void checkTypeIs(PsiElement type, PsiElement node, ProblemsHolder holder, String typeName)
-	{
-		if (type instanceof JSReferenceExpression referenceExpression)
-		{
-			String expressionType = JSResolveUtil.getQualifiedExpressionType(referenceExpression, referenceExpression.getContainingFile());
-			if (!typeName.equals(expressionType))
-			{
-				holder.registerProblem(
-					node,
-					JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, expressionType).get(),
-					getHighlightTypeForTypeOrSignatureProblem(node)
-				);
-			}
-		}
-		else if(type != null)
-		{
-			holder.registerProblem(
-				node,
-				JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, type.getText()).get(),
-				getHighlightTypeForTypeOrSignatureProblem(node)
-			);
-		}
-	}
-
-	private static void checkTypeIs(JSExpression rOperand, PsiElement node, ProblemsHolder holder, String typeName)
-	{
-		String expressionType = JSResolveUtil.getQualifiedExpressionType(rOperand, rOperand.getContainingFile());
-		if(!typeName.equals(expressionType))
-		{
-			holder.registerProblem(
-				node,
-				JavaScriptLocalize.javascriptBinaryOperandTypeMismatch(typeName, expressionType).get(),
-				getHighlightTypeForTypeOrSignatureProblem(node)
-			);
-		}
-	}
-
-	static ProblemHighlightType getUnresolveReferenceHighlightType(final @Nullable JSExpression qualifier, @Nonnull JSExpression node)
-	{
-		JSClass jsClass;
-
-		final PsiFile containingFile = node.getContainingFile();
-		if(qualifier != null)
-		{
-			jsClass = JSResolveUtil.findClassOfQualifier(qualifier, containingFile);
-
-			if (jsClass == null && qualifier instanceof JSReferenceExpression referenceExpression)
-			{
-				ResolveResult[] results = referenceExpression.multiResolve(false);
-
-				if(results.length != 0)
-				{
-					PsiElement resultElement = results[0].getElement();
-					String type = null;
-
-					if (resultElement instanceof JSVariable variable)
-					{
-						type = variable.getTypeString();
-					}
-					else if (resultElement instanceof JSFunction function)
-					{
-						type = function.getReturnTypeString();
-					}
-
-					if("*".equals(type))
-					{
-						return ProblemHighlightType.LIKE_UNKNOWN_SYMBOL;
-					}
-					jsClass = JSResolveUtil.getClassOfContext(resultElement);
-				}
-			}
-		}
-		else
-		{
-			jsClass = JSResolveUtil.getClassOfContext(node);
-		}
-
-		final boolean ecmaL4File = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
-
-		if(jsClass != null && ecmaL4File &&
-				(!(jsClass instanceof XmlBackedJSClassImpl) || jsClass.getContainingFile().getFileType() == XmlFileType.INSTANCE))
-		{
-			final JSAttributeList attributeList = jsClass.getAttributeList();
-			if(attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC))
-			{
-				return ProblemHighlightType.ERROR;
-			}
-		}
-
-		if(ecmaL4File && jsClass == null && node.getParent() instanceof JSReferenceList)
-		{
-			return ProblemHighlightType.ERROR;
-		}
-		return ProblemHighlightType.LIKE_UNKNOWN_SYMBOL;
-	}
-
-	private static void checkFunction(final JSCallExpression node, final PsiElement element, final ProblemsHolder holder)
-	{
-		if (element instanceof JSFunction function)
-		{
-			if(!function.isGetProperty() || !"Function".equals(function.getReturnTypeString()))
-			{
-				final JSParameterList parameterList = function.getParameterList();
-
-				if(parameterList != null)
-				{
-					checkCallParameters(node, parameterList.getParameters(), function.isReferencesArguments(), holder);
-				}
-			}
-		}
-		else if(element instanceof JSClass)
-		{
-			if(node instanceof JSNewExpression || node.getMethodExpression() instanceof JSSuperExpression)
-			{
-				checkCallParameters(node, JSParameter.EMPTY_ARRAY, false, holder);
-			}
-			else
-			{
-				JSArgumentList argumentList = node.getArgumentList();
-				if(argumentList == null || argumentList.getArguments().length != 1)
-				{
-					holder.registerProblem(
-						argumentList != null ? argumentList : node,
-						JavaScriptLocalize.javascriptInvalidNumberOfParameters("one").get(),
-						getHighlightTypeForTypeOrSignatureProblem(node)
-					);
-				}
-			}
-		}
-	}
-
-	private static void checkCallParameters(final JSCallExpression node, final JSParameter[] parameters, boolean functionReferencesArguments,
-			final ProblemsHolder holder)
-	{
-		final JSArgumentList argumentList = node.getArgumentList();
-		final JSExpression[] expressions = argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
-
-		boolean lastIsRest = false;
-		int minParameterLength = 0;
-		int maxParameterLength = parameters.length;
-
-		for(int i = 0; i < parameters.length; ++i)
-		{
-			final JSParameter parameter = parameters[i];
-			if(parameter.isOptional())
-			{
-				break;
-			}
-
-			if(i == parameters.length - 1 && parameter.isRest())
-			{
-				lastIsRest = true;
-				maxParameterLength = Integer.MAX_VALUE;
-				break;
-			}
-			minParameterLength++;
-		}
-
-		if(!lastIsRest && parameters.length > 0 && parameters[parameters.length - 1].isRest())
-		{
-			lastIsRest = true;
-			maxParameterLength = Integer.MAX_VALUE;
-		}
-
-		if ((expressions.length < minParameterLength || expressions.length > maxParameterLength) && !functionReferencesArguments)
-		{
-			final String s = (lastIsRest ? minParameterLength + " or more " : String.valueOf(minParameterLength) +
-				(minParameterLength != maxParameterLength ? ".." + maxParameterLength : ""));
-			holder.registerProblem(
-				argumentList != null ? argumentList : node,
-				JavaScriptLocalize.javascriptInvalidNumberOfParameters(s).get(),
-				getHighlightTypeForTypeOrSignatureProblem(node)
-			);
-		}
-		else
-		{
-			int i = 0;
-			final PsiFile containingFile = node.getContainingFile();
-
-			for(JSParameter p : parameters)
-			{
-				if(i == expressions.length)
-				{
-					break;
-				}
-				if(p.isRest())
-				{
-					break;
-				}
-				checkExpressionIsAssignableToVariable(p, expressions[i], holder, containingFile, JavaScriptLocalize::javascriptArgumentTypeMismatch);
-				++i;
-			}
-		}
-	}
-
-	private static void checkExpressionIsAssignableToVariable(
-		final JSVariable p,
-		JSExpression expr,
-		final ProblemsHolder holder,
-		final PsiFile containingFile,
-		final BiFunction<Object, Object, LocalizeValue> messageGenerator
-	)
-	{
-		final String parameterTypeResolved = JSImportHandlingUtil.resolveTypeName(p.getTypeString(), p);
-		checkExpressionIsAssignableToType(
-			expr,
-			parameterTypeResolved,
-			holder,
-			containingFile,
-			messageGenerator
-		);
-	}
-
-	private static void checkExpressionIsAssignableToType(
-		final JSExpression expr,
-		final String type,
-		final ProblemsHolder holder,
-		final PsiFile containingFile,
-		final BiFunction<Object, Object, LocalizeValue> messageGenerator
-	)
-	{
-		if("*".equals(type) || type == null)
-		{
-			return; // optimization
-		}
-		final String expressionType = JSResolveUtil.getQualifiedExpressionType(expr, containingFile);
-
-		if(!JSResolveUtil.isAssignableType(type, expressionType, containingFile))
-		{
-      holder.registerProblem(
-      	expr,
-				messageGenerator.apply(type, expressionType).get(),
-				getHighlightTypeForTypeOrSignatureProblem(expr),
-				new JSInsertCastFix(type)
-			);
-		}
-	}
-
-	private static ProblemHighlightType getHighlightTypeForTypeOrSignatureProblem(@Nonnull PsiElement node)
-	{
-		if(node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-		{
-			return ProblemHighlightType.GENERIC_ERROR;
-		}
-		return ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
-	}
-
-	private static class JSInsertCastFix implements LocalQuickFix
-	{
-		private final String type;
-
-		public JSInsertCastFix(final String type)
-		{
-			this.type = type;
-		}
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return JavaScriptLocalize.javascriptInsertCastFix().get();
-		}
-
-		@Override
-		@Nonnull
-		public String getFamilyName()
-		{
-			return getName();
-		}
-
-		@Override
-		public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
-		{
-			final PsiElement element = descriptor.getPsiElement();
-			final Editor editor = BaseCreateFix.getEditor(project, element.getContainingFile());
-			if(editor == null)
-			{
-				return;
-			}
-
-			final String shortenedType = JSResolveUtil.getShortenedType(this.type, element);
-			final TemplateManager templateManager = TemplateManager.getInstance(project);
-			Template template = templateManager.createTemplate("", "", shortenedType + "($SELECTION$)");
-			template.setToReformat(true);
-
-			final int offset = element.getTextOffset();
-			editor.getSelectionModel().setSelection(offset, offset + element.getTextLength());
-			editor.getCaretModel().moveToOffset(offset);
-			templateManager.startTemplate(editor, element.getText(), template);
-		}
-	}
+public class JSUnresolvedFunctionInspection extends JSInspection {
+    @NonNls
+    private static final String SHORT_NAME = "JSUnresolvedFunction";
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return "General";
+    }
+
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return JavaScriptLocalize.jsUnresolvedFunctionInspectionName().get();
+    }
+
+    @Override
+    @Nonnull
+    @NonNls
+    public String getShortName() {
+        return SHORT_NAME;
+    }
+
+    @Override
+    protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSCallExpression(final JSCallExpression node) {
+                final JSExpression methodExpression = node.getMethodExpression();
+
+                if (methodExpression instanceof JSReferenceExpression referenceExpression) {
+                    final ResolveResult[] resolveResults = referenceExpression.multiResolve(false);
+
+                    boolean noCompleteResolve = true;
+
+                    boolean inNewExpression = node instanceof JSNewExpression;
+                    for (ResolveResult r : resolveResults) {
+                        if (r.isValidResult()) {
+                            noCompleteResolve = false;
+
+                            PsiElement element = r.getElement();
+
+                            if (element instanceof JSVariable variable) {
+                                String typeText = variable.getTypeString();
+
+                                if (typeText != null && !"*".equals(typeText)) {
+                                    if (!allowMemberReference(inNewExpression, typeText)) {
+                                        holder.registerProblem(
+                                            referenceExpression.getReferenceNameElement(),
+                                            JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction().get(),
+                                            getHighlightTypeForTypeOrSignatureProblem(node)
+                                        );
+                                    }
+                                }
+                            }
+                            else if (element instanceof JSFunction function && function.isGetProperty()) {
+                                String typeText = function.getReturnTypeString();
+
+                                if (!allowMemberReference(inNewExpression, typeText)) {
+                                    JSArgumentList argumentList = node.getArgumentList();
+                                    LocalQuickFix fixes[] = LocalQuickFix.EMPTY_ARRAY;
+
+                                    if (argumentList != null) {
+                                        fixes = new LocalQuickFix[]{
+                                            new JSAnnotatingVisitor.RemoveASTNodeFix(
+                                                argumentList.getNode(),
+                                                JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction2Fix()
+                                            )
+                                        };
+                                    }
+
+                                    holder.registerProblem(
+                                        ((JSReferenceExpression)methodExpression).getReferenceNameElement(),
+                                        JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction2().get(),
+                                        getHighlightTypeForTypeOrSignatureProblem(node),
+                                        fixes
+                                    );
+                                }
+                            }
+                            break;
+                        }
+                    }
+                    JavaScriptQuickFixFactory javaScriptQuickFixFactory = JavaScriptQuickFixFactory.byElement(referenceExpression);
+
+                    if (resolveResults.length == 0 || noCompleteResolve) {
+                        final JSExpression qualifier = referenceExpression.getQualifier();
+                        final List<LocalQuickFix> quickFixes = new LinkedList<LocalQuickFix>();
+                        final String refName = referenceExpression.getReferencedName();
+
+                        if (myOnTheFly && ((qualifier == null || qualifier instanceof JSThisExpression) || JSUtils.isLHSExpression(qualifier))) {
+                            if (methodExpression.getParent() instanceof JSCallExpression) {
+                                boolean simpleJs = !JavaScriptVersionUtil.containsFeature(referenceExpression, JavaScriptFeature.CLASS);
+
+                                if (!inNewExpression || simpleJs) {
+                                    quickFixes.add(javaScriptQuickFixFactory.createFunctionOrMethodFix(refName, true));
+                                }
+
+                                if (qualifier == null) {
+                                    if (simpleJs) {
+                                        quickFixes.add(javaScriptQuickFixFactory.createFunctionOrMethodFix(refName, false));
+                                    }
+                                    else {
+                                        quickFixes.add(new AddImportECMAScriptClassOrFunctionAction(null, referenceExpression));
+                                        if (inNewExpression) {
+                                            quickFixes.add(new CreateClassOrInterfaceAction(referenceExpression, false));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        final PsiElement referenceNameElement = referenceExpression.getReferenceNameElement();
+
+                        if (referenceNameElement != null) {
+                            holder.registerProblem(
+                                referenceNameElement,
+                                inNewExpression
+                                    ? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(refName).get()
+                                    : JavaScriptLocalize.javascriptUnresolvedFunctionNameMessage(refName).get(),
+                                getUnresolveReferenceHighlightType(qualifier, node),
+                                quickFixes.size() > 0 ? quickFixes.toArray(new LocalQuickFix[quickFixes.size()]) : null
+                            );
+                        }
+                    }
+                    else {
+                        PsiElement element = resolveResults[0].getElement();
+
+                        if (inNewExpression && element instanceof JSClass jsClass && jsClass.isInterface()) {
+                            final PsiElement referenceNameElement = referenceExpression.getReferenceNameElement();
+
+                            holder.registerProblem(
+                                referenceNameElement,
+                                JavaScriptLocalize.javascriptInterfaceCanNotBeInstantiatedMessage().get(),
+                                getUnresolveReferenceHighlightType(referenceExpression.getQualifier(), node)
+                            );
+                        }
+                        else {
+                            checkFunction(node, element, holder);
+                        }
+                    }
+                }
+                else if (methodExpression instanceof JSSuperExpression) {
+                    final PsiElement element = (methodExpression.getReference()).resolve();
+
+                    if (element != null) {
+                        checkFunction(node, element, holder);
+                    }
+                }
+                else if (methodExpression instanceof JSNewExpression newExpression) {
+                    JSExpression methodExpr = newExpression.getMethodExpression();
+
+                    if (methodExpr instanceof JSReferenceExpression referenceExpression) {
+                        ResolveResult[] results = referenceExpression.multiResolve(false);
+                        PsiElement elt;
+
+                        if (results.length > 0 && ((elt =
+                            results[0].getElement()) instanceof JSFunction && ((JSFunction)elt).isConstructor() || elt instanceof
+                            JSClass)) {
+                            holder.registerProblem(
+                                methodExpression,
+                                JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction().get(),
+                                getUnresolveReferenceHighlightType(null, node)
+                            );
+                        }
+                    }
+                }
+
+                super.visitJSCallExpression(node);
+            }
+
+            @Override
+            public void visitJSAssignmentExpression(final JSAssignmentExpression node) {
+                final JSExpression lOperand = node.getLOperand();
+                if (lOperand == null) {
+                    return;
+                }
+                final JSExpression rOperand = node.getROperand();
+                if (rOperand == null) {
+                    return;
+                }
+
+                final PsiFile containingFile = node.getContainingFile();
+                if (containingFile.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+                    return;
+                }
+                String expressionType = null;
+
+                if (lOperand instanceof JSDefinitionExpression) {
+                    JSExpression expression = ((JSDefinitionExpression)lOperand).getExpression();
+                    if (expression instanceof JSReferenceExpression) {
+                        PsiElement resolve = JSResolveUtil.unwrapProxy(((JSReferenceExpression)expression).resolve());
+
+                        if (resolve instanceof JSNamedElement) {
+                            expressionType = JSResolveUtil.getTypeFromSetAccessor((JSNamedElement)resolve);
+                            if (expressionType != null) {
+                                expressionType = JSImportHandlingUtil.resolveTypeName(expressionType, resolve);
+                            }
+                        }
+                    }
+                }
+
+                if (expressionType == null) {
+                    expressionType = JSResolveUtil.getQualifiedExpressionType(lOperand, containingFile);
+                }
+                checkExpressionIsAssignableToType(
+                    rOperand,
+                    expressionType,
+                    holder,
+                    containingFile,
+                    JavaScriptLocalize::javascriptAssignedExpressionTypeMismatch
+                );
+            }
+
+            @Override
+            public void visitJSReturnStatement(final JSReturnStatement node) {
+                final JSExpression expression = node.getExpression();
+                if (expression == null) {
+                    return;
+                }
+
+                final JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
+                if (fun == null) {
+                    return; // TODO: complain about it
+                }
+                final String typeString = fun.getReturnTypeString();
+                if (typeString == null) {
+                    return;
+                }
+                final PsiFile containingFile = fun.getContainingFile();
+                if (containingFile.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+                    return;
+                }
+
+                checkExpressionIsAssignableToType(
+                    expression,
+                    JSImportHandlingUtil.resolveTypeName(typeString, fun),
+                    holder,
+                    containingFile,
+                    JavaScriptLocalize::javascriptReturnedExpressionTypeMismatch
+                );
+            }
+
+            @Override
+            public void visitJSVariable(final JSVariable node) {
+                final JSExpression initializer = node.getInitializer();
+                if (initializer == null) {
+                    return;
+                }
+                checkExpressionIsAssignableToVariable(
+                    node,
+                    initializer,
+                    holder,
+                    node.getContainingFile(),
+                    JavaScriptLocalize::javascriptInitializerTypeMismatch
+                );
+            }
+
+            @Override
+            public void visitJSBinaryExpression(JSBinaryExpression node) {
+                IElementType sign = node.getOperationSign();
+
+                if (sign == JSTokenTypes.AS_KEYWORD || sign == JSTokenTypes.IS_KEYWORD) {
+                    JSExpression rOperand = node.getROperand();
+
+                    if (rOperand instanceof JSReferenceExpression) {
+                        ResolveResult[] results = ((JSReferenceExpression)rOperand).multiResolve(false);
+
+                        if (results.length > 0 && results[0].getElement() instanceof JSVariable) {
+                            checkTypeIs(rOperand, rOperand, holder, "Class");
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public void visitJSForInStatement(JSForInStatement node) {
+                if (!node.isForEach()) {
+                    JSVarStatement statement = node.getDeclarationStatement();
+
+                    if (statement != null) {
+                        String expressionType =
+                            JSResolveUtil.getQualifiedExpressionType(node.getCollectionExpression(), node.getContainingFile());
+                        boolean isDictionary = "flash.utils.Dictionary".equals(expressionType);
+
+                        for (JSVariable var : statement.getVariables()) {
+                            PsiElement typeElement = var.getTypeElement();
+                            String typeElementText;
+
+                            if (typeElement != null &&
+                                "Array".equals(expressionType) &&
+                                ("Object".equals(typeElementText = typeElement.getText()) || "*".equals(typeElementText))) {
+                                holder.registerProblem(
+                                    typeElement,
+                                    JavaScriptLocalize.javascriptIncorrectArrayTypeInForin().get(),
+                                    ProblemHighlightType.GENERIC_ERROR_OR_WARNING
+                                );
+                                continue;
+                            }
+
+                            if (isDictionary && typeElement != null && "Object".equals(typeElement.getText())) {
+                                continue;
+                            }
+                            checkTypeIs(typeElement, typeElement, holder, "XMLList".equals(expressionType) ? "XML" : "String");
+                        }
+                    }
+                }
+            }
+        };
+    }
+
+    private static boolean allowMemberReference(boolean inNewExpression, String typeText) {
+        return ("Class".equals(typeText) && inNewExpression) || "Function".equals(typeText);
+    }
+
+    private static void checkTypeIs(PsiElement type, PsiElement node, ProblemsHolder holder, String typeName) {
+        if (type instanceof JSReferenceExpression referenceExpression) {
+            String expressionType = JSResolveUtil.getQualifiedExpressionType(referenceExpression, referenceExpression.getContainingFile());
+            if (!typeName.equals(expressionType)) {
+                holder.registerProblem(
+                    node,
+                    JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, expressionType).get(),
+                    getHighlightTypeForTypeOrSignatureProblem(node)
+                );
+            }
+        }
+        else if (type != null) {
+            holder.registerProblem(
+                node,
+                JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, type.getText()).get(),
+                getHighlightTypeForTypeOrSignatureProblem(node)
+            );
+        }
+    }
+
+    private static void checkTypeIs(JSExpression rOperand, PsiElement node, ProblemsHolder holder, String typeName) {
+        String expressionType = JSResolveUtil.getQualifiedExpressionType(rOperand, rOperand.getContainingFile());
+        if (!typeName.equals(expressionType)) {
+            holder.registerProblem(
+                node,
+                JavaScriptLocalize.javascriptBinaryOperandTypeMismatch(typeName, expressionType).get(),
+                getHighlightTypeForTypeOrSignatureProblem(node)
+            );
+        }
+    }
+
+    static ProblemHighlightType getUnresolveReferenceHighlightType(final @Nullable JSExpression qualifier, @Nonnull JSExpression node) {
+        JSClass jsClass;
+
+        final PsiFile containingFile = node.getContainingFile();
+        if (qualifier != null) {
+            jsClass = JSResolveUtil.findClassOfQualifier(qualifier, containingFile);
+
+            if (jsClass == null && qualifier instanceof JSReferenceExpression referenceExpression) {
+                ResolveResult[] results = referenceExpression.multiResolve(false);
+
+                if (results.length != 0) {
+                    PsiElement resultElement = results[0].getElement();
+                    String type = null;
+
+                    if (resultElement instanceof JSVariable variable) {
+                        type = variable.getTypeString();
+                    }
+                    else if (resultElement instanceof JSFunction function) {
+                        type = function.getReturnTypeString();
+                    }
+
+                    if ("*".equals(type)) {
+                        return ProblemHighlightType.LIKE_UNKNOWN_SYMBOL;
+                    }
+                    jsClass = JSResolveUtil.getClassOfContext(resultElement);
+                }
+            }
+        }
+        else {
+            jsClass = JSResolveUtil.getClassOfContext(node);
+        }
+
+        final boolean ecmaL4File = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+
+        if (jsClass != null && ecmaL4File &&
+            (!(jsClass instanceof XmlBackedJSClassImpl) || jsClass.getContainingFile().getFileType() == XmlFileType.INSTANCE)) {
+            final JSAttributeList attributeList = jsClass.getAttributeList();
+            if (attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
+                return ProblemHighlightType.ERROR;
+            }
+        }
+
+        if (ecmaL4File && jsClass == null && node.getParent() instanceof JSReferenceList) {
+            return ProblemHighlightType.ERROR;
+        }
+        return ProblemHighlightType.LIKE_UNKNOWN_SYMBOL;
+    }
+
+    private static void checkFunction(final JSCallExpression node, final PsiElement element, final ProblemsHolder holder) {
+        if (element instanceof JSFunction function) {
+            if (!function.isGetProperty() || !"Function".equals(function.getReturnTypeString())) {
+                final JSParameterList parameterList = function.getParameterList();
+
+                if (parameterList != null) {
+                    checkCallParameters(node, parameterList.getParameters(), function.isReferencesArguments(), holder);
+                }
+            }
+        }
+        else if (element instanceof JSClass) {
+            if (node instanceof JSNewExpression || node.getMethodExpression() instanceof JSSuperExpression) {
+                checkCallParameters(node, JSParameter.EMPTY_ARRAY, false, holder);
+            }
+            else {
+                JSArgumentList argumentList = node.getArgumentList();
+                if (argumentList == null || argumentList.getArguments().length != 1) {
+                    holder.registerProblem(
+                        argumentList != null ? argumentList : node,
+                        JavaScriptLocalize.javascriptInvalidNumberOfParameters("one").get(),
+                        getHighlightTypeForTypeOrSignatureProblem(node)
+                    );
+                }
+            }
+        }
+    }
+
+    private static void checkCallParameters(
+        final JSCallExpression node, final JSParameter[] parameters, boolean functionReferencesArguments,
+        final ProblemsHolder holder
+    ) {
+        final JSArgumentList argumentList = node.getArgumentList();
+        final JSExpression[] expressions = argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
+
+        boolean lastIsRest = false;
+        int minParameterLength = 0;
+        int maxParameterLength = parameters.length;
+
+        for (int i = 0; i < parameters.length; ++i) {
+            final JSParameter parameter = parameters[i];
+            if (parameter.isOptional()) {
+                break;
+            }
+
+            if (i == parameters.length - 1 && parameter.isRest()) {
+                lastIsRest = true;
+                maxParameterLength = Integer.MAX_VALUE;
+                break;
+            }
+            minParameterLength++;
+        }
+
+        if (!lastIsRest && parameters.length > 0 && parameters[parameters.length - 1].isRest()) {
+            lastIsRest = true;
+            maxParameterLength = Integer.MAX_VALUE;
+        }
+
+        if ((expressions.length < minParameterLength || expressions.length > maxParameterLength) && !functionReferencesArguments) {
+            final String s = (lastIsRest ? minParameterLength + " or more " : String.valueOf(minParameterLength) +
+                (minParameterLength != maxParameterLength ? ".." + maxParameterLength : ""));
+            holder.registerProblem(
+                argumentList != null ? argumentList : node,
+                JavaScriptLocalize.javascriptInvalidNumberOfParameters(s).get(),
+                getHighlightTypeForTypeOrSignatureProblem(node)
+            );
+        }
+        else {
+            int i = 0;
+            final PsiFile containingFile = node.getContainingFile();
+
+            for (JSParameter p : parameters) {
+                if (i == expressions.length) {
+                    break;
+                }
+                if (p.isRest()) {
+                    break;
+                }
+                checkExpressionIsAssignableToVariable(
+                    p,
+                    expressions[i],
+                    holder,
+                    containingFile,
+                    JavaScriptLocalize::javascriptArgumentTypeMismatch
+                );
+                ++i;
+            }
+        }
+    }
+
+    private static void checkExpressionIsAssignableToVariable(
+        final JSVariable p,
+        JSExpression expr,
+        final ProblemsHolder holder,
+        final PsiFile containingFile,
+        final BiFunction<Object, Object, LocalizeValue> messageGenerator
+    ) {
+        final String parameterTypeResolved = JSImportHandlingUtil.resolveTypeName(p.getTypeString(), p);
+        checkExpressionIsAssignableToType(
+            expr,
+            parameterTypeResolved,
+            holder,
+            containingFile,
+            messageGenerator
+        );
+    }
+
+    private static void checkExpressionIsAssignableToType(
+        final JSExpression expr,
+        final String type,
+        final ProblemsHolder holder,
+        final PsiFile containingFile,
+        final BiFunction<Object, Object, LocalizeValue> messageGenerator
+    ) {
+        if ("*".equals(type) || type == null) {
+            return; // optimization
+        }
+        final String expressionType = JSResolveUtil.getQualifiedExpressionType(expr, containingFile);
+
+        if (!JSResolveUtil.isAssignableType(type, expressionType, containingFile)) {
+            holder.registerProblem(
+                expr,
+                messageGenerator.apply(type, expressionType).get(),
+                getHighlightTypeForTypeOrSignatureProblem(expr),
+                new JSInsertCastFix(type)
+            );
+        }
+    }
+
+    private static ProblemHighlightType getHighlightTypeForTypeOrSignatureProblem(@Nonnull PsiElement node) {
+        if (node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+            return ProblemHighlightType.GENERIC_ERROR;
+        }
+        return ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
+    }
+
+    private static class JSInsertCastFix implements LocalQuickFix {
+        private final String type;
+
+        public JSInsertCastFix(final String type) {
+            this.type = type;
+        }
+
+        @Override
+        @Nonnull
+        public String getName() {
+            return JavaScriptLocalize.javascriptInsertCastFix().get();
+        }
+
+        @Override
+        @Nonnull
+        public String getFamilyName() {
+            return getName();
+        }
+
+        @Override
+        public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
+            final PsiElement element = descriptor.getPsiElement();
+            final Editor editor = BaseCreateFix.getEditor(project, element.getContainingFile());
+            if (editor == null) {
+                return;
+            }
+
+            final String shortenedType = JSResolveUtil.getShortenedType(this.type, element);
+            final TemplateManager templateManager = TemplateManager.getInstance(project);
+            Template template = templateManager.createTemplate("", "", shortenedType + "($SELECTION$)");
+            template.setToReformat(true);
+
+            final int offset = element.getTextOffset();
+            editor.getSelectionModel().setSelection(offset, offset + element.getTextLength());
+            editor.getCaretModel().moveToOffset(offset);
+            templateManager.startTemplate(editor, element.getText(), template);
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
index 1318b365..94dceb46 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
@@ -50,451 +50,400 @@
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
-public class JSUnresolvedVariableInspection extends JSInspection
-{
-	@NonNls
-	private static final String SHORT_NAME = "JSUnresolvedVariable";
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return "General";
-	}
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return JavaScriptLocalize.jsUnresolvedVariableInspectionName().get();
-	}
-
-	@Override
-	@Nonnull
-	@NonNls
-	public String getShortName()
-	{
-		return SHORT_NAME;
-	}
-
-	@Override
-	protected JSElementVisitor createVisitor(final ProblemsHolder holder)
-	{
-		return new JSElementVisitor()
-		{
-			@Override
-			public void visitJSReferenceExpression(final JSReferenceExpression node)
-			{
-				final PsiElement parentElement = node.getParent();
-
-				if(node.shouldCheckReferences() && !(parentElement instanceof JSCallExpression))
-				{
-					final ResolveResult[] resolveResults = node.multiResolve(false);
-					boolean emptyResolve = resolveResults.length == 0;
-					boolean noCompleteResolve = true;
-
-					for(ResolveResult r : resolveResults)
-					{
-						if(r.isValidResult())
-						{
-							noCompleteResolve = false;
-							break;
-						}
-					}
-
-					if(emptyResolve || noCompleteResolve)
-					{
-						final PsiElement nameIdentifier = node.getReferenceNameElement();
-
-						if(nameIdentifier != null)
-						{
-							final List<LocalQuickFix> fixes = new LinkedList<LocalQuickFix>();
-							final JSExpression qualifier = node.getQualifier();
-
-							if(myOnTheFly)
-							{
-								final PsiFile containingFile = node.getContainingFile();
-								final boolean ecma = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
-
-								if((qualifier == null ||
-										JSUtils.isLHSExpression(qualifier) ||
-										qualifier instanceof JSThisExpression) && (!(parentElement instanceof JSDefinitionExpression) || ecma))
-								{
-									final String referencedName = node.getReferencedName();
-									boolean isField = qualifier != null;
-									JSClass contextClass = null;
-
-									if(!isField && ecma)
-									{
-										contextClass = JSResolveUtil.getClassOfContext(node);
-										if(contextClass != null)
-										{
-											isField = true;
-										}
-									}
-
-									if(!JSResolveUtil.isExprInTypeContext(node))
-									{
-										if(node.getParent() instanceof JSArgumentList)
-										{
-											fixes.add(new CreateJSFunctionOrMethodFix(referencedName, !(qualifier == null || (qualifier instanceof
-													JSThisExpression && ecma)))
-											{
-												@Override
-												protected void addParameters(Template template, JSReferenceExpression referenceExpression, PsiFile file, Set<JavaScriptFeature> features)
-												{
-													JSExpression method = ((JSCallExpression) referenceExpression.getParent().getParent()).getMethodExpression();
-													if(method instanceof JSReferenceExpression && "bindSetter".equals(((JSReferenceExpression) method).getReferencedName()))
-													{
-														MyExpression expression = new MyExpression("value");
-														template.addVariable("value", expression, expression, false);
-														if(ecma)
-														{
-															template.addTextSegment(":int");
-														}
-													}
-												}
-
-												@Override
-												protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile file)
-												{
-													template.addTextSegment("void");
-												}
-											});
-										}
-
-										boolean suggestCreateVar = true;
-
-										JSClass targetClass = contextClass;
-
-										if(qualifier instanceof JSReferenceExpression)
-										{
-											final JSClass clazz = JSResolveUtil.findClassOfQualifier(qualifier, containingFile);
-											if(clazz != null)
-											{
-												targetClass = clazz;
-											}
-										}
-
-										if(targetClass != null)
-										{
-											suggestCreateVar = !targetClass.isInterface();
-										}
-
-										if(suggestCreateVar)
-										{
-											fixes.add(new CreateJSVariableIntentionAction(referencedName, isField, false));
-
-											if(ecma)
-											{
-												fixes.add(new CreateJSVariableIntentionAction(referencedName, isField, true));
-											}
-										}
-
-										if(ecma)
-										{
-											boolean getter = !(node.getParent() instanceof JSDefinitionExpression);
-											String invokedName = nameIdentifier.getText();
-											fixes.add(new CreateJSPropertyAccessorIntentionAction(invokedName, getter));
-											JSCallExpression expression = PsiTreeUtil.getParentOfType(node, JSCallExpression.class);
-
-											if(expression != null)
-											{
-												final JSExpression methodExpression = expression.getMethodExpression();
-
-												if(methodExpression instanceof JSReferenceExpression)
-												{
-													final String methodName = ((JSReferenceExpression) methodExpression).getReferencedName();
-
-													if("addEventListener".equals(methodName) || "removeEventListener".equals(methodName))
-													{
-														final JSArgumentList argumentList = expression.getArgumentList();
-														final JSExpression[] params = argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
-
-														if(params.length >= 2 && params[0] instanceof JSReferenceExpression)
-														{
-															final JSExpression eventNameQualifier = ((JSReferenceExpression) params[0]).getQualifier();
-															if(eventNameQualifier != null)
-															{
-																fixes.add(new CreateJSEventMethod(invokedName, eventNameQualifier));
-															}
-														}
-													}
-												}
-											}
-										}
-									}
-									if(qualifier != null && !ecma)
-									{
-										fixes.add(new CreateJSNamespaceIntentionAction(referencedName));
-									}
-
-									if(ecma)
-									{
-										if(qualifier == null)
-										{
-											fixes.add(new AddImportECMAScriptClassOrFunctionAction(null, node));
-											fixes.add(new CreateClassOrInterfaceAction(node, false));
-											fixes.add(new CreateClassOrInterfaceAction(node, true));
-										}
-										else
-										{
-											fixes.add(new AddImportECMAScriptClassOrFunctionAction(null, node));
-										}
-									}
-								}
-							}
-
-							final LocalizeValue message = node.getQualifier() == null
-								? JSResolveUtil.isExprInTypeContext(node)
-								? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(node.getReferencedName())
-								: JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage(node.getReferencedName())
-								: JavaScriptLocalize.javascriptUnresolvedVariableNameMessage(node.getReferencedName());
-
-							holder.registerProblem(
-								nameIdentifier,
-								message.get(),
-								JSUnresolvedFunctionInspection.getUnresolveReferenceHighlightType(qualifier, node),
-								fixes.size() > 0 ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null
-							);
-						}
-					}
-				}
-				super.visitJSReferenceExpression(node);
-			}
-		};
-	}
-
-	private abstract static class BaseCreateJSVariableIntentionAction extends BaseCreateFix
-	{
-		protected final String myReferencedName;
-
-		BaseCreateJSVariableIntentionAction(String referencedName)
-		{
-			myReferencedName = referencedName;
-		}
-
-		@Override
-		@Nonnull
-		public String getFamilyName()
-		{
-			return JavaScriptLocalize.javascriptCreateVariableIntentionFamily().get();
-		}
-	}
-
-	private static class CreateJSNamespaceIntentionAction extends BaseCreateJSVariableIntentionAction
-	{
-		CreateJSNamespaceIntentionAction(String referencedName)
-		{
-			super(referencedName);
-		}
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return JavaScriptLocalize.javascriptCreateNamespaceIntentionName(myReferencedName).get();
-		}
-
-		@RequiredReadAction
-		@Override
-		protected void buildTemplate(final Template template, final JSReferenceExpression referenceExpression, final Set<JavaScriptFeature> features, boolean staticContext,
-									 final PsiFile file, final PsiElement anchorParent)
-		{
-			template.addTextSegment("/** @namespace ");
-			template.addTextSegment(referenceExpression.getText() + " */");
-			template.addEndVariable();
-		}
-	}
-
-	private static class CreateJSVariableIntentionAction extends BaseCreateJSVariableIntentionAction
-	{
-		@NonNls
-		private static final String VAR_STATEMENT_START = "var ";
-		@NonNls
-		private static final String CONSTANT_STATEMENT_START = "const ";
-		private boolean isField;
-		private boolean isConstant;
-
-		CreateJSVariableIntentionAction(String referencedName, boolean isField, boolean isConstant)
-		{
-			super(referencedName);
-			this.isField = isField;
-			this.isConstant = isConstant;
-		}
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return isField
-				? isConstant
-				? JavaScriptLocalize.javascriptCreateConstantFieldIntentionName(myReferencedName).get()
-				: JavaScriptLocalize.javascriptCreatePropertyIntentionName(myReferencedName).get()
-				: isConstant
-				? JavaScriptLocalize.javascriptCreateConstantIntentionName(myReferencedName).get()
-				: JavaScriptLocalize.javascriptCreateVariableIntentionName(myReferencedName).get();
-		}
-
-		@RequiredReadAction
-		@Override
-    protected void buildTemplate(
-			final Template template,
-			final JSReferenceExpression referenceExpression,
-			final Set<JavaScriptFeature> features,
-			boolean staticContext,
-			final PsiFile file,
-			final PsiElement anchorParent
-		)
-		{
-			boolean classFeature = features.contains(JavaScriptFeature.CLASS);
-
-			final JSExpression qualifier = addAccessModifier(template, referenceExpression, classFeature, staticContext);
-			if(qualifier == null || classFeature)
-			{
-				template.addTextSegment(isConstant ? CONSTANT_STATEMENT_START : VAR_STATEMENT_START);
-			}
-
-			template.addTextSegment(classFeature ? referenceExpression.getReferencedName() : referenceExpression.getText());
-			template.addEndVariable();
-			if(classFeature)
-			{
-				template.addTextSegment(":");
-			}
-			else
-			{
-				template.addTextSegment(" = ");
-			}
-
-			if(classFeature)
-			{
-				guessTypeAndAddTemplateVariable(template, referenceExpression, file);
-				if(isConstant)
-				{
-					template.addTextSegment(" = ");
-					addCompletionVar(template);
-				}
-			}
-			else
-			{
-				addCompletionVar(template);
-			}
-			addSemicolonSegment(template, file);
-		}
-
-	}
-
-	private static class CreateJSPropertyAccessorIntentionAction extends CreateJSFunctionFixBase
-	{
-		private final boolean myIsGetter;
-
-		public CreateJSPropertyAccessorIntentionAction(String name, boolean getter)
-		{
-			super(
-				getter
-					? JavaScriptLocalize.javascriptCreateGetPropertyIntentionName(name)
-					: JavaScriptLocalize.javascriptCreateSetPropertyIntentionName(name)
-			);
-			myIsGetter = getter;
-		}
-
-		@Override
-		protected void writeFunctionAndName(Template template, String referencedName, Set<JavaScriptFeature> features)
-		{
-			template.addTextSegment("function ");
-			template.addTextSegment(myIsGetter ? "get " : "set ");
-			template.addTextSegment(referencedName);
-		}
-
-		@Override
-		protected void addParameters(Template template, JSReferenceExpression refExpr, PsiFile file, Set<JavaScriptFeature> features)
-		{
-			if(!myIsGetter)
-			{
-				template.addTextSegment(refExpr.getReferencedName() + ":");
-				guessTypeAndAddTemplateVariable(template, refExpr, file);
-			}
-		}
-
-		@Override
-		protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile file)
-		{
-			if(myIsGetter)
-			{
-				guessTypeAndAddTemplateVariable(template, referenceExpression, file);
-			}
-			else
-			{
-				template.addTextSegment("void");
-			}
-		}
-
-		@Override
-		protected void addBody(Template template, JSReferenceExpression refExpr, PsiFile file)
-		{
-			String varName = refExpr.getReferencedName();
-			String paramName = varName;
-			JSCodeStyleSettings settings = CodeStyleSettingsManager.getInstance(file.getProject()).getCurrentSettings().getCustomSettings(JSCodeStyleSettings
-					.class);
-			varName = settings.FIELD_PREFIX + varName;
-
-			if(varName.equals(paramName))
-			{
-				varName = StringUtil.fixVariableNameDerivedFromPropertyName(varName);
-			}
-
-			if(myIsGetter)
-			{
-				template.addTextSegment("return ");
-
-				addVarName(template, varName);
-				template.addEndVariable();
-			}
-			else
-			{
-				addVarName(template, varName);
-				template.addEndVariable();
-				template.addTextSegment(" = " + paramName);
-			}
-			addSemicolonSegment(template, file);
-		}
-
-		private static void addVarName(Template template, String varName)
-		{
-			MyExpression expression = new MyExpression(varName);
-			template.addVariable("name", expression, expression, true);
-		}
-
-	}
-
-	private static class CreateJSEventMethod extends CreateJSFunctionFixBase
-	{
-		private JSExpression myEventQualifier;
-
-		public CreateJSEventMethod(String invokedName, JSExpression eventNameQualifier)
-		{
-			super(JavaScriptLocalize.javascriptCreateEventHandlerIntentionName(invokedName));
-			myEventQualifier = eventNameQualifier;
-		}
-
-
-		@Override
-		protected void addParameters(Template template, JSReferenceExpression refExpr, PsiFile file, Set<JavaScriptFeature> features)
-		{
-			template.addTextSegment("event:");
-			template.addTextSegment(myEventQualifier.getText());
-		}
-
-		@Override
-		protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile psifile)
-		{
-			template.addTextSegment("void");
-		}
-
-		@Override
-		protected void addBody(Template template, JSReferenceExpression refExpr, PsiFile file)
-		{
-			template.addEndVariable();
-		}
-	}
+public class JSUnresolvedVariableInspection extends JSInspection {
+    @NonNls
+    private static final String SHORT_NAME = "JSUnresolvedVariable";
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return "General";
+    }
+
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return JavaScriptLocalize.jsUnresolvedVariableInspectionName().get();
+    }
+
+    @Override
+    @Nonnull
+    @NonNls
+    public String getShortName() {
+        return SHORT_NAME;
+    }
+
+    @Override
+    protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+                final PsiElement parentElement = node.getParent();
+
+                if (node.shouldCheckReferences() && !(parentElement instanceof JSCallExpression)) {
+                    final ResolveResult[] resolveResults = node.multiResolve(false);
+                    boolean emptyResolve = resolveResults.length == 0;
+                    boolean noCompleteResolve = true;
+
+                    for (ResolveResult r : resolveResults) {
+                        if (r.isValidResult()) {
+                            noCompleteResolve = false;
+                            break;
+                        }
+                    }
+
+                    if (emptyResolve || noCompleteResolve) {
+                        final PsiElement nameIdentifier = node.getReferenceNameElement();
+
+                        if (nameIdentifier != null) {
+                            final List<LocalQuickFix> fixes = new LinkedList<LocalQuickFix>();
+                            final JSExpression qualifier = node.getQualifier();
+
+                            if (myOnTheFly) {
+                                final PsiFile containingFile = node.getContainingFile();
+                                final boolean ecma = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+
+                                if ((qualifier == null ||
+                                    JSUtils.isLHSExpression(qualifier) ||
+                                    qualifier instanceof JSThisExpression) && (!(parentElement instanceof JSDefinitionExpression) || ecma)) {
+                                    final String referencedName = node.getReferencedName();
+                                    boolean isField = qualifier != null;
+                                    JSClass contextClass = null;
+
+                                    if (!isField && ecma) {
+                                        contextClass = JSResolveUtil.getClassOfContext(node);
+                                        if (contextClass != null) {
+                                            isField = true;
+                                        }
+                                    }
+
+                                    if (!JSResolveUtil.isExprInTypeContext(node)) {
+                                        if (node.getParent() instanceof JSArgumentList) {
+                                            fixes.add(new CreateJSFunctionOrMethodFix(
+                                                referencedName,
+                                                !(qualifier == null || (qualifier instanceof
+                                                    JSThisExpression && ecma))
+                                            ) {
+                                                @Override
+                                                protected void addParameters(
+                                                    Template template,
+                                                    JSReferenceExpression referenceExpression,
+                                                    PsiFile file,
+                                                    Set<JavaScriptFeature> features
+                                                ) {
+                                                    JSExpression method = ((JSCallExpression)referenceExpression.getParent()
+                                                        .getParent()).getMethodExpression();
+                                                    if (method instanceof JSReferenceExpression && "bindSetter".equals(((JSReferenceExpression)method).getReferencedName())) {
+                                                        MyExpression expression = new MyExpression("value");
+                                                        template.addVariable("value", expression, expression, false);
+                                                        if (ecma) {
+                                                            template.addTextSegment(":int");
+                                                        }
+                                                    }
+                                                }
+
+                                                @Override
+                                                protected void addReturnType(
+                                                    Template template,
+                                                    JSReferenceExpression referenceExpression,
+                                                    PsiFile file
+                                                ) {
+                                                    template.addTextSegment("void");
+                                                }
+                                            });
+                                        }
+
+                                        boolean suggestCreateVar = true;
+
+                                        JSClass targetClass = contextClass;
+
+                                        if (qualifier instanceof JSReferenceExpression) {
+                                            final JSClass clazz = JSResolveUtil.findClassOfQualifier(qualifier, containingFile);
+                                            if (clazz != null) {
+                                                targetClass = clazz;
+                                            }
+                                        }
+
+                                        if (targetClass != null) {
+                                            suggestCreateVar = !targetClass.isInterface();
+                                        }
+
+                                        if (suggestCreateVar) {
+                                            fixes.add(new CreateJSVariableIntentionAction(referencedName, isField, false));
+
+                                            if (ecma) {
+                                                fixes.add(new CreateJSVariableIntentionAction(referencedName, isField, true));
+                                            }
+                                        }
+
+                                        if (ecma) {
+                                            boolean getter = !(node.getParent() instanceof JSDefinitionExpression);
+                                            String invokedName = nameIdentifier.getText();
+                                            fixes.add(new CreateJSPropertyAccessorIntentionAction(invokedName, getter));
+                                            JSCallExpression expression = PsiTreeUtil.getParentOfType(node, JSCallExpression.class);
+
+                                            if (expression != null) {
+                                                final JSExpression methodExpression = expression.getMethodExpression();
+
+                                                if (methodExpression instanceof JSReferenceExpression) {
+                                                    final String methodName = ((JSReferenceExpression)methodExpression).getReferencedName();
+
+                                                    if ("addEventListener".equals(methodName) || "removeEventListener".equals(methodName)) {
+                                                        final JSArgumentList argumentList = expression.getArgumentList();
+                                                        final JSExpression[] params =
+                                                            argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
+
+                                                        if (params.length >= 2 && params[0] instanceof JSReferenceExpression) {
+                                                            final JSExpression eventNameQualifier =
+                                                                ((JSReferenceExpression)params[0]).getQualifier();
+                                                            if (eventNameQualifier != null) {
+                                                                fixes.add(new CreateJSEventMethod(invokedName, eventNameQualifier));
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    if (qualifier != null && !ecma) {
+                                        fixes.add(new CreateJSNamespaceIntentionAction(referencedName));
+                                    }
+
+                                    if (ecma) {
+                                        if (qualifier == null) {
+                                            fixes.add(new AddImportECMAScriptClassOrFunctionAction(null, node));
+                                            fixes.add(new CreateClassOrInterfaceAction(node, false));
+                                            fixes.add(new CreateClassOrInterfaceAction(node, true));
+                                        }
+                                        else {
+                                            fixes.add(new AddImportECMAScriptClassOrFunctionAction(null, node));
+                                        }
+                                    }
+                                }
+                            }
+
+                            final LocalizeValue message = node.getQualifier() == null
+                                ? JSResolveUtil.isExprInTypeContext(node)
+                                ? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(node.getReferencedName())
+                                : JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage(node.getReferencedName())
+                                : JavaScriptLocalize.javascriptUnresolvedVariableNameMessage(node.getReferencedName());
+
+                            holder.registerProblem(
+                                nameIdentifier,
+                                message.get(),
+                                JSUnresolvedFunctionInspection.getUnresolveReferenceHighlightType(qualifier, node),
+                                fixes.size() > 0 ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null
+                            );
+                        }
+                    }
+                }
+                super.visitJSReferenceExpression(node);
+            }
+        };
+    }
+
+    private abstract static class BaseCreateJSVariableIntentionAction extends BaseCreateFix {
+        protected final String myReferencedName;
+
+        BaseCreateJSVariableIntentionAction(String referencedName) {
+            myReferencedName = referencedName;
+        }
+
+        @Override
+        @Nonnull
+        public String getFamilyName() {
+            return JavaScriptLocalize.javascriptCreateVariableIntentionFamily().get();
+        }
+    }
+
+    private static class CreateJSNamespaceIntentionAction extends BaseCreateJSVariableIntentionAction {
+        CreateJSNamespaceIntentionAction(String referencedName) {
+            super(referencedName);
+        }
+
+        @Override
+        @Nonnull
+        public String getName() {
+            return JavaScriptLocalize.javascriptCreateNamespaceIntentionName(myReferencedName).get();
+        }
+
+        @RequiredReadAction
+        @Override
+        protected void buildTemplate(
+            final Template template,
+            final JSReferenceExpression referenceExpression,
+            final Set<JavaScriptFeature> features,
+            boolean staticContext,
+            final PsiFile file,
+            final PsiElement anchorParent
+        ) {
+            template.addTextSegment("/** @namespace ");
+            template.addTextSegment(referenceExpression.getText() + " */");
+            template.addEndVariable();
+        }
+    }
+
+    private static class CreateJSVariableIntentionAction extends BaseCreateJSVariableIntentionAction {
+        @NonNls
+        private static final String VAR_STATEMENT_START = "var ";
+        @NonNls
+        private static final String CONSTANT_STATEMENT_START = "const ";
+        private boolean isField;
+        private boolean isConstant;
+
+        CreateJSVariableIntentionAction(String referencedName, boolean isField, boolean isConstant) {
+            super(referencedName);
+            this.isField = isField;
+            this.isConstant = isConstant;
+        }
+
+        @Override
+        @Nonnull
+        public String getName() {
+            return isField
+                ? isConstant
+                ? JavaScriptLocalize.javascriptCreateConstantFieldIntentionName(myReferencedName).get()
+                : JavaScriptLocalize.javascriptCreatePropertyIntentionName(myReferencedName).get()
+                : isConstant
+                ? JavaScriptLocalize.javascriptCreateConstantIntentionName(myReferencedName).get()
+                : JavaScriptLocalize.javascriptCreateVariableIntentionName(myReferencedName).get();
+        }
+
+        @RequiredReadAction
+        @Override
+        protected void buildTemplate(
+            final Template template,
+            final JSReferenceExpression referenceExpression,
+            final Set<JavaScriptFeature> features,
+            boolean staticContext,
+            final PsiFile file,
+            final PsiElement anchorParent
+        ) {
+            boolean classFeature = features.contains(JavaScriptFeature.CLASS);
+
+            final JSExpression qualifier = addAccessModifier(template, referenceExpression, classFeature, staticContext);
+            if (qualifier == null || classFeature) {
+                template.addTextSegment(isConstant ? CONSTANT_STATEMENT_START : VAR_STATEMENT_START);
+            }
+
+            template.addTextSegment(classFeature ? referenceExpression.getReferencedName() : referenceExpression.getText());
+            template.addEndVariable();
+            if (classFeature) {
+                template.addTextSegment(":");
+            }
+            else {
+                template.addTextSegment(" = ");
+            }
+
+            if (classFeature) {
+                guessTypeAndAddTemplateVariable(template, referenceExpression, file);
+                if (isConstant) {
+                    template.addTextSegment(" = ");
+                    addCompletionVar(template);
+                }
+            }
+            else {
+                addCompletionVar(template);
+            }
+            addSemicolonSegment(template, file);
+        }
+
+    }
+
+    private static class CreateJSPropertyAccessorIntentionAction extends CreateJSFunctionFixBase {
+        private final boolean myIsGetter;
+
+        public CreateJSPropertyAccessorIntentionAction(String name, boolean getter) {
+            super(
+                getter
+                    ? JavaScriptLocalize.javascriptCreateGetPropertyIntentionName(name)
+                    : JavaScriptLocalize.javascriptCreateSetPropertyIntentionName(name)
+            );
+            myIsGetter = getter;
+        }
+
+        @Override
+        protected void writeFunctionAndName(Template template, String referencedName, Set<JavaScriptFeature> features) {
+            template.addTextSegment("function ");
+            template.addTextSegment(myIsGetter ? "get " : "set ");
+            template.addTextSegment(referencedName);
+        }
+
+        @Override
+        protected void addParameters(Template template, JSReferenceExpression refExpr, PsiFile file, Set<JavaScriptFeature> features) {
+            if (!myIsGetter) {
+                template.addTextSegment(refExpr.getReferencedName() + ":");
+                guessTypeAndAddTemplateVariable(template, refExpr, file);
+            }
+        }
+
+        @Override
+        protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile file) {
+            if (myIsGetter) {
+                guessTypeAndAddTemplateVariable(template, referenceExpression, file);
+            }
+            else {
+                template.addTextSegment("void");
+            }
+        }
+
+        @Override
+        protected void addBody(Template template, JSReferenceExpression refExpr, PsiFile file) {
+            String varName = refExpr.getReferencedName();
+            String paramName = varName;
+            JSCodeStyleSettings settings =
+                CodeStyleSettingsManager.getInstance(file.getProject()).getCurrentSettings().getCustomSettings(JSCodeStyleSettings
+                    .class);
+            varName = settings.FIELD_PREFIX + varName;
+
+            if (varName.equals(paramName)) {
+                varName = StringUtil.fixVariableNameDerivedFromPropertyName(varName);
+            }
+
+            if (myIsGetter) {
+                template.addTextSegment("return ");
+
+                addVarName(template, varName);
+                template.addEndVariable();
+            }
+            else {
+                addVarName(template, varName);
+                template.addEndVariable();
+                template.addTextSegment(" = " + paramName);
+            }
+            addSemicolonSegment(template, file);
+        }
+
+        private static void addVarName(Template template, String varName) {
+            MyExpression expression = new MyExpression(varName);
+            template.addVariable("name", expression, expression, true);
+        }
+
+    }
+
+    private static class CreateJSEventMethod extends CreateJSFunctionFixBase {
+        private JSExpression myEventQualifier;
+
+        public CreateJSEventMethod(String invokedName, JSExpression eventNameQualifier) {
+            super(JavaScriptLocalize.javascriptCreateEventHandlerIntentionName(invokedName));
+            myEventQualifier = eventNameQualifier;
+        }
+
+
+        @Override
+        protected void addParameters(Template template, JSReferenceExpression refExpr, PsiFile file, Set<JavaScriptFeature> features) {
+            template.addTextSegment("event:");
+            template.addTextSegment(myEventQualifier.getText());
+        }
+
+        @Override
+        protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile psifile) {
+            template.addTextSegment("void");
+        }
+
+        @Override
+        protected void addBody(Template template, JSReferenceExpression refExpr, PsiFile file) {
+            template.addEndVariable();
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
index fd9ad07d..a68d42d8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
@@ -45,166 +45,156 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.Collections;
 
 /**
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
-public class JSUntypedDeclarationInspection extends JSInspection
-{
-	@NonNls
-	public static final String SHORT_NAME = "JSUntypedDeclaration";
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return "General";
-	}
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return JavaScriptLocalize.jsUntypedDeclarationInspectionName().get();
-	}
-
-	@Nonnull
-	@Override
-	public HighlightDisplayLevel getDefaultLevel()
-	{
-		return HighlightDisplayLevel.WARNING;
-	}
-
-	@Override
-	@Nonnull
-	@NonNls
-	public String getShortName()
-	{
-		return SHORT_NAME;
-	}
-
-	@Override
-	protected JSElementVisitor createVisitor(final ProblemsHolder holder)
-	{
-		return new JSElementVisitor()
-		{
-			@Override
-			public void visitJSVariable(final JSVariable node)
-			{
-				process(node, holder);
-			}
-
-			@Override
-			public void visitJSFunctionExpression(final JSFunctionExpression node)
-			{
-				process(node.getFunction(), holder);
-			}
-
-			@Override
-			public void visitJSFunctionDeclaration(final JSFunction node)
-			{
-				if(node.isConstructor() || node.isSetProperty())
-				{
-					return;
-				}
-				process(node, holder);
-			}
-		};
-	}
-
-	private static void process(final JSNamedElement node, final ProblemsHolder holder)
-	{
-		if(node.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-		{
-			return;
-		}
-		PsiElement nameIdentifier = node.getNameIdentifier();
-
-		if(nameIdentifier != null &&
-				JSPsiImplUtils.getTypeFromDeclaration(node) == null &&
-				(!(node instanceof JSParameter) || !((JSParameter) node).isRest()))
-		{
-			LocalizeValue description = node instanceof JSFunction
-				? JavaScriptLocalize.jsUntypedFunctionProblem(nameIdentifier.getText())
-				: JavaScriptLocalize.jsUntypedVariableProblem(nameIdentifier.getText());
-			holder.registerProblem(
-				nameIdentifier, 
-				description.get(),
-				ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-				new AddTypeToDclFix()
-			);
-		}
-	}
-
-	private static class AddTypeToDclFix implements LocalQuickFix
-	{
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return JavaScriptLocalize.jsUntypedDeclarationProblemAddtypeFix().get();
-		}
-
-		@Override
-		@Nonnull
-		public String getFamilyName()
-		{
-			return getName();
-		}
-
-		@Override
-		public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
-		{
-			PsiElement anchor = descriptor.getPsiElement();
-			PsiFile containingFile = anchor.getContainingFile();
-			if(!FileModificationService.getInstance().prepareFileForWrite(containingFile))
-			{
-				return;
-			}
-
-			if(anchor.getParent() instanceof JSFunction)
-			{
-				anchor = ((JSFunction) anchor.getParent()).getParameterList();
-			}
-
-			OpenFileDescriptor openDescriptor = OpenFileDescriptorFactory.getInstance(project).builder(containingFile.getVirtualFile()).offset(anchor.getTextRange().getEndOffset()).build();
-			openDescriptor.navigate(true);
-			Editor textEditor = FileEditorManager.getInstance(project).getSelectedTextEditor();
-			TemplateManager templateManager = TemplateManager.getInstance(project);
-
-			Template t = templateManager.createTemplate("", "");
-			t.addTextSegment(":");
-			boolean hasDetectedTypeFromUsage = false;
-			final PsiElement anchorParent = anchor.getParent();
-
-			if(anchorParent instanceof JSVariable)
-			{
-				final JSExpression expression = ((JSVariable) anchorParent).getInitializer();
-
-				if(expression != null)
-				{
-					BaseCreateFix.guessExprTypeAndAddSuchVariable(expression, t, "a", containingFile, Collections.singleton(JavaScriptFeature.CLASS));
-					hasDetectedTypeFromUsage = true;
-				}
-			}
-
-			if(!hasDetectedTypeFromUsage)
-			{
-				String defaultValue = "uint";
-				if(ApplicationManager.getApplication().isUnitTestMode())
-				{
-					t.addTextSegment(defaultValue);
-				}
-				else
-				{
-					t.addVariable("a", new MacroCallNode(MacroFactory.createMacro("complete")), new BaseCreateFix.MyExpression(defaultValue), true);
-				}
-			}
-
-			templateManager.startTemplate(textEditor, t);
-		}
-	}
+public class JSUntypedDeclarationInspection extends JSInspection {
+    @NonNls
+    public static final String SHORT_NAME = "JSUntypedDeclaration";
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return "General";
+    }
+
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return JavaScriptLocalize.jsUntypedDeclarationInspectionName().get();
+    }
+
+    @Nonnull
+    @Override
+    public HighlightDisplayLevel getDefaultLevel() {
+        return HighlightDisplayLevel.WARNING;
+    }
+
+    @Override
+    @Nonnull
+    @NonNls
+    public String getShortName() {
+        return SHORT_NAME;
+    }
+
+    @Override
+    protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSVariable(final JSVariable node) {
+                process(node, holder);
+            }
+
+            @Override
+            public void visitJSFunctionExpression(final JSFunctionExpression node) {
+                process(node.getFunction(), holder);
+            }
+
+            @Override
+            public void visitJSFunctionDeclaration(final JSFunction node) {
+                if (node.isConstructor() || node.isSetProperty()) {
+                    return;
+                }
+                process(node, holder);
+            }
+        };
+    }
+
+    private static void process(final JSNamedElement node, final ProblemsHolder holder) {
+        if (node.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+            return;
+        }
+        PsiElement nameIdentifier = node.getNameIdentifier();
+
+        if (nameIdentifier != null &&
+            JSPsiImplUtils.getTypeFromDeclaration(node) == null &&
+            (!(node instanceof JSParameter) || !((JSParameter)node).isRest())) {
+            LocalizeValue description = node instanceof JSFunction
+                ? JavaScriptLocalize.jsUntypedFunctionProblem(nameIdentifier.getText())
+                : JavaScriptLocalize.jsUntypedVariableProblem(nameIdentifier.getText());
+            holder.registerProblem(
+                nameIdentifier,
+                description.get(),
+                ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+                new AddTypeToDclFix()
+            );
+        }
+    }
+
+    private static class AddTypeToDclFix implements LocalQuickFix {
+
+        @Override
+        @Nonnull
+        public String getName() {
+            return JavaScriptLocalize.jsUntypedDeclarationProblemAddtypeFix().get();
+        }
+
+        @Override
+        @Nonnull
+        public String getFamilyName() {
+            return getName();
+        }
+
+        @Override
+        public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
+            PsiElement anchor = descriptor.getPsiElement();
+            PsiFile containingFile = anchor.getContainingFile();
+            if (!FileModificationService.getInstance().prepareFileForWrite(containingFile)) {
+                return;
+            }
+
+            if (anchor.getParent() instanceof JSFunction) {
+                anchor = ((JSFunction)anchor.getParent()).getParameterList();
+            }
+
+            OpenFileDescriptor openDescriptor = OpenFileDescriptorFactory.getInstance(project)
+                .builder(containingFile.getVirtualFile())
+                .offset(anchor.getTextRange().getEndOffset())
+                .build();
+            openDescriptor.navigate(true);
+            Editor textEditor = FileEditorManager.getInstance(project).getSelectedTextEditor();
+            TemplateManager templateManager = TemplateManager.getInstance(project);
+
+            Template t = templateManager.createTemplate("", "");
+            t.addTextSegment(":");
+            boolean hasDetectedTypeFromUsage = false;
+            final PsiElement anchorParent = anchor.getParent();
+
+            if (anchorParent instanceof JSVariable) {
+                final JSExpression expression = ((JSVariable)anchorParent).getInitializer();
+
+                if (expression != null) {
+                    BaseCreateFix.guessExprTypeAndAddSuchVariable(
+                        expression,
+                        t,
+                        "a",
+                        containingFile,
+                        Collections.singleton(JavaScriptFeature.CLASS)
+                    );
+                    hasDetectedTypeFromUsage = true;
+                }
+            }
+
+            if (!hasDetectedTypeFromUsage) {
+                String defaultValue = "uint";
+                if (ApplicationManager.getApplication().isUnitTestMode()) {
+                    t.addTextSegment(defaultValue);
+                }
+                else {
+                    t.addVariable(
+                        "a",
+                        new MacroCallNode(MacroFactory.createMacro("complete")),
+                        new BaseCreateFix.MyExpression(defaultValue),
+                        true
+                    );
+                }
+            }
+
+            templateManager.startTemplate(textEditor, t);
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
index e02dc46c..6999fb54 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
@@ -45,6 +45,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.BitSet;
 import java.util.Collections;
 import java.util.HashSet;
@@ -54,425 +55,347 @@
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
-public class JSUnusedLocalSymbolsInspection extends JSInspection
-{
-	private static final Logger LOG = Logger.getInstance("JSUnusedLocalSymbols");
-	@NonNls
-	public static final String SHORT_NAME = "JSUnusedLocalSymbols";
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return "General";
-	}
-
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return JavaScriptLocalize.jsUnusedLocalSymbolInspectionName().get();
-	}
-
-	@Override
-	@Nonnull
-	@NonNls
-	public String getShortName()
-	{
-		return SHORT_NAME;
-	}
-
-	private static final Key<Set<PsiElement>> ourUnusedLocalDeclarationsSetKey = Key.create("js unused local dcls key");
-	private static final Key<Set<PsiElement>> ourUsedLocalDeclarationsSetKey = Key.create("js used local functions key");
-
-	@Override
-	protected JSElementVisitor createVisitor(final ProblemsHolder holder)
-	{
-		return new JSElementVisitor()
-		{
-			@Override
-			public void visitJSVariable(final JSVariable node)
-			{
-				handleLocalDeclaration(node);
-			}
-
-			@Override
-			public void visitJSParameterList(final JSParameterList node)
-			{
-				PsiElement parent = node.getParent();
-				final Set<PsiElement> set = parent.getUserData(ourUnusedLocalDeclarationsSetKey);
-
-				if(set == null)
-				{
-					parent.putUserData(ourUnusedLocalDeclarationsSetKey, Collections.synchronizedSet(new HashSet<PsiElement>(3)));
-				}
-				else if(node.getParameters().length == 0)
-				{
-					set.clear();
-				}
-			}
-
-			@Override
-			public void visitFile(final PsiFile file)
-			{
-				final Set<PsiElement> set = file.getUserData(ourUnusedLocalDeclarationsSetKey);
-				if(set != null)
-				{
-					set.clear();
-				}
-			}
-
-			@Override
-			public void visitJSParameter(final JSParameter node)
-			{
-				final PsiElement scopeNode = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSCatchBlock.class);
-
-				if(scopeNode == null || scopeNode instanceof JSCatchBlock)
-				{
-					return;
-				}
-				// TODO: calculate more accurately right here (we depend in this place for slow marker pass to finish before)
-				if(scopeNode.getUserData(JavaScriptLineMarkerProvider.ourParticipatesInHierarchyKey) != null)
-				{
-					return;
-				}
-				if(scopeNode instanceof JSFunction)
-				{
-					JSAttributeList attributeList = ((JSFunction) scopeNode).getAttributeList();
-					if(attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE))
-					{
-						return;
-					}
-				}
-
-				final Set<PsiElement> unusedParametersSet;
-				final PsiElement parameterList = node.getParent();
-
-				if(parameterList.getNode().findChildByType(JSElementTypes.FORMAL_PARAMETER) == node.getNode())
-				{
-					unusedParametersSet = Collections.synchronizedSet(new HashSet<PsiElement>(3));
-					scopeNode.putUserData(ourUnusedLocalDeclarationsSetKey, unusedParametersSet);
-				}
-				else
-				{
-					unusedParametersSet = scopeNode.getUserData(ourUnusedLocalDeclarationsSetKey);
-					if(unusedParametersSet == null)
-					{
-						return;
-					}
-				}
-				unusedParametersSet.add(node);
-			}
-
-			@Override
-			public void visitJSReferenceExpression(final JSReferenceExpression node)
-			{
-				if(node.getParent() instanceof JSFunction)
-				{
-					return;
-				}
-				if(node.getQualifier() == null)
-				{
-					if("arguments".equals(node.getText()))
-					{
-						JSFunction function = PsiTreeUtil.getParentOfType(node, JSFunction.class);
-						if(function == null)
-						{
-							return;
-						}
-						Set<PsiElement> unusedParametersSet = function.getUserData(ourUnusedLocalDeclarationsSetKey);
-						if(unusedParametersSet == null)
-						{
-							return;
-						}
-						for(JSParameter p : function.getParameterList().getParameters())
-						{
-							unusedParametersSet.remove(p);
-						}
-						return;
-					}
-
-					ResolveResult[] results = node.multiResolve(false);
-
-					for(ResolveResult r : results)
-					{
-						final PsiElement element = r.getElement();
-
-						if(element instanceof JSVariable || (element instanceof JSFunction && isSupportedFunction((JSFunction) element)))
-						{
-							assert !(element instanceof JSFunctionExpression);
-							PsiElement scopeHandler = PsiTreeUtil.getParentOfType(element, JSFunction.class);
-
-							if(scopeHandler != null)
-							{
-								Set<PsiElement> unusedParametersSet = scopeHandler.getUserData(ourUnusedLocalDeclarationsSetKey);
-
-								if(unusedParametersSet != null)
-								{
-									final boolean removed = unusedParametersSet.remove(element);
-
-									if(!removed)
-									{
-										Set<PsiElement> set = scopeHandler.getUserData(ourUsedLocalDeclarationsSetKey);
-										if(set == null)
-										{
-											set = new HashSet<PsiElement>(3);
-											scopeHandler.putUserData(ourUsedLocalDeclarationsSetKey, set);
-										}
-										set.add(element);
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			@Override
-			public void visitJSFunctionExpression(final JSFunctionExpression node)
-			{
-				visitJSFunctionDeclaration((JSFunction) node);
-			}
-
-			@Override
-			public void visitJSFunctionDeclaration(final JSFunction node)
-			{
-				processDeclarationHost(node, holder);
-				handleLocalDeclaration(node);
-			}
-		};
-	}
-
-	private static boolean isSupportedFunction(final JSFunction element)
-	{
-		return !(element instanceof JSFunctionExpression || element.getParent() instanceof JSProperty);
-	}
-
-	private static void processDeclarationHost(final PsiElement node, final ProblemsHolder holder)
-	{
-		Set<PsiElement> unusedDeclarationsSet = node.getUserData(ourUnusedLocalDeclarationsSetKey);
-		if(unusedDeclarationsSet == null || node instanceof JSFunction && ((JSFunction) node).getBody().length == 0)
-		{
-			return;
-		}
-
-		try
-		{
-			unusedDeclarationsSet = new HashSet<PsiElement>(unusedDeclarationsSet);
-
-			final int nonCounted = -2;
-			int lastUsedParameterIndex = nonCounted;
-			ObjectIntMap<JSParameter> parameterIndexMap = null;
-
-			for(final PsiElement p : unusedDeclarationsSet)
-			{
-				if(!p.isValid())
-				{
-					continue;
-				}
-				final LocalizeValue message;
-				final @Nonnull PsiElement highlightedElement;
-
-				if (p instanceof JSParameter parameter)
-				{
-					// There are cases of predefined sinatures for which we are not interested in reported unused parameters
-					final boolean ecma = node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
-					if(ecma && node instanceof JSFunctionExpression)
-					{
-						continue; // do not report unused parameters
-					}
-					else if (ecma && node instanceof JSFunction function)
-					{
-						final JSParameter[] params = function.getParameterList().getParameters();
-
-						if(params.length == 1)
-						{
-							@NonNls String type = parameter.getTypeString();
-							if(type != null)
-							{
-								type = JSImportHandlingUtil.resolveTypeName(type, p);
-							}
-
-							if(type != null)
-							{
-								String eventType = "flash.events.Event";
-								if(eventType.equals(type))
-								{
-									continue;
-								}
-								final PsiElement clazz = JSClassImpl.findClassFromNamespace(type, node);
-
-								if(clazz instanceof JSClass)
-								{
-									final ResolveProcessor processor = new ResolveProcessor(eventType)
-									{
-										{
-											setTypeContext(true);
-											setToProcessMembers(false);
-											setToProcessHierarchy(true);
-										}
-
-										@Override
-										public boolean execute(final PsiElement element, final ResolveState state)
-										{
-											return !(element instanceof JSClass jsClass && myName.equals(jsClass.getQualifiedName()));
-										}
-									};
-									processor.setLocalResolve(true);
-									final boolean b = clazz.processDeclarations(processor, ResolveState.initial(), clazz, clazz);
-									if(!b)
-									{
-										continue;
-									}
-								}
-							}
-						}
-					}
-
-					final JSParameter[] params = ((JSFunction) node).getParameterList().getParameters();
-
-					if(lastUsedParameterIndex == nonCounted)
-					{
-						BitSet unusedSet = new BitSet(params.length);
-						parameterIndexMap = ObjectMaps.newObjectIntHashMap();
-						for(int i = 0; i < params.length; ++i)
-						{
-							parameterIndexMap.putInt(params[i], i);
-						}
-
-						for(PsiElement param : unusedDeclarationsSet)
-						{
-							if(!(param instanceof JSParameter))
-							{
-								continue;
-							}
-							unusedSet.set(parameterIndexMap.getInt((JSParameter) param));
-						}
-
-						lastUsedParameterIndex = -1;
-
-						for(int i = params.length - 1; i >= 0; --i)
-						{
-							if(!unusedSet.get(i))
-							{
-								lastUsedParameterIndex = i;
-								break;
-							}
-						}
-					}
-
-					if (parameterIndexMap.getInt(parameter) < lastUsedParameterIndex)
-					{
-						continue; // no sense to report unused symbol before used since it will change signature
-					}
-
-					message = JavaScriptLocalize.jsUnusedParameter();
-					highlightedElement = parameter.getNameIdentifier();
-				}
-				else if (p instanceof JSFunction function)
-				{
-					final PsiElement nameIdentifier = function.getNameIdentifier();
-					if (nameIdentifier == null)
-					{
-						continue;
-					}
-					highlightedElement = nameIdentifier;
-					message = JavaScriptLocalize.jsUnusedFunctionDeclaration();
-				}
-				else
-				{
-					highlightedElement = ((JSVariable) p).getNameIdentifier();
-					message = JavaScriptLocalize.jsUnusedLocalVariable();
-				}
-
-				if(p.getParent() instanceof JSCatchBlock)
-				{
-					holder.registerProblem(
-						highlightedElement,
-						message.get(),
-						ProblemHighlightType.LIKE_UNUSED_SYMBOL
-					);
-				}
-				else
-				{
-					holder.registerProblem(
-						highlightedElement,
-						message.get(),
-						ProblemHighlightType.LIKE_UNUSED_SYMBOL,
-						new RemoveElementLocalQuickFix()
-					);
-				}
-			}
-		}
-		finally
-		{
-			node.putUserData(ourUnusedLocalDeclarationsSetKey, null);
-		}
-	}
-
-	private static void handleLocalDeclaration(final JSNamedElement node)
-	{
-		if (node instanceof JSFunction function && !isSupportedFunction(function))
-		{
-			return;
-		}
-		final PsiElement scopeNode = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSCatchBlock.class);
-		if(scopeNode == null)
-		{
-			return;
-		}
-		final Set<PsiElement> unusedParametersSet = scopeNode.getUserData(ourUnusedLocalDeclarationsSetKey);
-		final Set<PsiElement> usedSet = scopeNode.getUserData(ourUsedLocalDeclarationsSetKey);
-		if(usedSet != null && usedSet.contains(node))
-		{
-			return;
-		}
-		if(unusedParametersSet == null)
-		{
-			return;
-		}
-		unusedParametersSet.add(node);
-	}
-
-	@Override
-	@Nonnull
-	public HighlightDisplayLevel getDefaultLevel()
-	{
-		return HighlightDisplayLevel.WARNING;
-	}
-
-	private static class RemoveElementLocalQuickFix implements LocalQuickFix
-	{
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return JavaScriptLocalize.jsUnusedSymbolRemove().get();
-		}
-
-		@Override
-		@Nonnull
-		public String getFamilyName()
-		{
-			return getName();
-		}
-
-		@Override
-		public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor)
-		{
-			try
-			{
-				PsiElement element = descriptor.getPsiElement();
-				if(!(element instanceof JSNamedElement))
-				{
-					element = element.getParent();
-				}
-				element.delete();
-			}
-			catch(IncorrectOperationException e)
-			{
-				LOG.error(e);
-			}
-		}
-	}
+public class JSUnusedLocalSymbolsInspection extends JSInspection {
+    private static final Logger LOG = Logger.getInstance("JSUnusedLocalSymbols");
+    @NonNls
+    public static final String SHORT_NAME = "JSUnusedLocalSymbols";
+
+    @Override
+    @Nonnull
+    public String getGroupDisplayName() {
+        return "General";
+    }
+
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return JavaScriptLocalize.jsUnusedLocalSymbolInspectionName().get();
+    }
+
+    @Override
+    @Nonnull
+    @NonNls
+    public String getShortName() {
+        return SHORT_NAME;
+    }
+
+    private static final Key<Set<PsiElement>> ourUnusedLocalDeclarationsSetKey = Key.create("js unused local dcls key");
+    private static final Key<Set<PsiElement>> ourUsedLocalDeclarationsSetKey = Key.create("js used local functions key");
+
+    @Override
+    protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSVariable(final JSVariable node) {
+                handleLocalDeclaration(node);
+            }
+
+            @Override
+            public void visitJSParameterList(final JSParameterList node) {
+                PsiElement parent = node.getParent();
+                final Set<PsiElement> set = parent.getUserData(ourUnusedLocalDeclarationsSetKey);
+
+                if (set == null) {
+                    parent.putUserData(ourUnusedLocalDeclarationsSetKey, Collections.synchronizedSet(new HashSet<PsiElement>(3)));
+                }
+                else if (node.getParameters().length == 0) {
+                    set.clear();
+                }
+            }
+
+            @Override
+            public void visitFile(final PsiFile file) {
+                final Set<PsiElement> set = file.getUserData(ourUnusedLocalDeclarationsSetKey);
+                if (set != null) {
+                    set.clear();
+                }
+            }
+
+            @Override
+            public void visitJSParameter(final JSParameter node) {
+                final PsiElement scopeNode = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSCatchBlock.class);
+
+                if (scopeNode == null || scopeNode instanceof JSCatchBlock) {
+                    return;
+                }
+                // TODO: calculate more accurately right here (we depend in this place for slow marker pass to finish before)
+                if (scopeNode.getUserData(JavaScriptLineMarkerProvider.ourParticipatesInHierarchyKey) != null) {
+                    return;
+                }
+                if (scopeNode instanceof JSFunction) {
+                    JSAttributeList attributeList = ((JSFunction)scopeNode).getAttributeList();
+                    if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
+                        return;
+                    }
+                }
+
+                final Set<PsiElement> unusedParametersSet;
+                final PsiElement parameterList = node.getParent();
+
+                if (parameterList.getNode().findChildByType(JSElementTypes.FORMAL_PARAMETER) == node.getNode()) {
+                    unusedParametersSet = Collections.synchronizedSet(new HashSet<PsiElement>(3));
+                    scopeNode.putUserData(ourUnusedLocalDeclarationsSetKey, unusedParametersSet);
+                }
+                else {
+                    unusedParametersSet = scopeNode.getUserData(ourUnusedLocalDeclarationsSetKey);
+                    if (unusedParametersSet == null) {
+                        return;
+                    }
+                }
+                unusedParametersSet.add(node);
+            }
+
+            @Override
+            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+                if (node.getParent() instanceof JSFunction) {
+                    return;
+                }
+                if (node.getQualifier() == null) {
+                    if ("arguments".equals(node.getText())) {
+                        JSFunction function = PsiTreeUtil.getParentOfType(node, JSFunction.class);
+                        if (function == null) {
+                            return;
+                        }
+                        Set<PsiElement> unusedParametersSet = function.getUserData(ourUnusedLocalDeclarationsSetKey);
+                        if (unusedParametersSet == null) {
+                            return;
+                        }
+                        for (JSParameter p : function.getParameterList().getParameters()) {
+                            unusedParametersSet.remove(p);
+                        }
+                        return;
+                    }
+
+                    ResolveResult[] results = node.multiResolve(false);
+
+                    for (ResolveResult r : results) {
+                        final PsiElement element = r.getElement();
+
+                        if (element instanceof JSVariable || (element instanceof JSFunction && isSupportedFunction((JSFunction)element))) {
+                            assert !(element instanceof JSFunctionExpression);
+                            PsiElement scopeHandler = PsiTreeUtil.getParentOfType(element, JSFunction.class);
+
+                            if (scopeHandler != null) {
+                                Set<PsiElement> unusedParametersSet = scopeHandler.getUserData(ourUnusedLocalDeclarationsSetKey);
+
+                                if (unusedParametersSet != null) {
+                                    final boolean removed = unusedParametersSet.remove(element);
+
+                                    if (!removed) {
+                                        Set<PsiElement> set = scopeHandler.getUserData(ourUsedLocalDeclarationsSetKey);
+                                        if (set == null) {
+                                            set = new HashSet<PsiElement>(3);
+                                            scopeHandler.putUserData(ourUsedLocalDeclarationsSetKey, set);
+                                        }
+                                        set.add(element);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public void visitJSFunctionExpression(final JSFunctionExpression node) {
+                visitJSFunctionDeclaration((JSFunction)node);
+            }
+
+            @Override
+            public void visitJSFunctionDeclaration(final JSFunction node) {
+                processDeclarationHost(node, holder);
+                handleLocalDeclaration(node);
+            }
+        };
+    }
+
+    private static boolean isSupportedFunction(final JSFunction element) {
+        return !(element instanceof JSFunctionExpression || element.getParent() instanceof JSProperty);
+    }
+
+    private static void processDeclarationHost(final PsiElement node, final ProblemsHolder holder) {
+        Set<PsiElement> unusedDeclarationsSet = node.getUserData(ourUnusedLocalDeclarationsSetKey);
+        if (unusedDeclarationsSet == null || node instanceof JSFunction && ((JSFunction)node).getBody().length == 0) {
+            return;
+        }
+
+        try {
+            unusedDeclarationsSet = new HashSet<PsiElement>(unusedDeclarationsSet);
+
+            final int nonCounted = -2;
+            int lastUsedParameterIndex = nonCounted;
+            ObjectIntMap<JSParameter> parameterIndexMap = null;
+
+            for (final PsiElement p : unusedDeclarationsSet) {
+                if (!p.isValid()) {
+                    continue;
+                }
+                final LocalizeValue message;
+                final @Nonnull PsiElement highlightedElement;
+
+                if (p instanceof JSParameter parameter) {
+                    // There are cases of predefined sinatures for which we are not interested in reported unused parameters
+                    final boolean ecma = node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+                    if (ecma && node instanceof JSFunctionExpression) {
+                        continue; // do not report unused parameters
+                    }
+                    else if (ecma && node instanceof JSFunction function) {
+                        final JSParameter[] params = function.getParameterList().getParameters();
+
+                        if (params.length == 1) {
+                            @NonNls String type = parameter.getTypeString();
+                            if (type != null) {
+                                type = JSImportHandlingUtil.resolveTypeName(type, p);
+                            }
+
+                            if (type != null) {
+                                String eventType = "flash.events.Event";
+                                if (eventType.equals(type)) {
+                                    continue;
+                                }
+                                final PsiElement clazz = JSClassImpl.findClassFromNamespace(type, node);
+
+                                if (clazz instanceof JSClass) {
+                                    final ResolveProcessor processor = new ResolveProcessor(eventType) {
+                                        {
+                                            setTypeContext(true);
+                                            setToProcessMembers(false);
+                                            setToProcessHierarchy(true);
+                                        }
+
+                                        @Override
+                                        public boolean execute(final PsiElement element, final ResolveState state) {
+                                            return !(element instanceof JSClass jsClass && myName.equals(jsClass.getQualifiedName()));
+                                        }
+                                    };
+                                    processor.setLocalResolve(true);
+                                    final boolean b = clazz.processDeclarations(processor, ResolveState.initial(), clazz, clazz);
+                                    if (!b) {
+                                        continue;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    final JSParameter[] params = ((JSFunction)node).getParameterList().getParameters();
+
+                    if (lastUsedParameterIndex == nonCounted) {
+                        BitSet unusedSet = new BitSet(params.length);
+                        parameterIndexMap = ObjectMaps.newObjectIntHashMap();
+                        for (int i = 0; i < params.length; ++i) {
+                            parameterIndexMap.putInt(params[i], i);
+                        }
+
+                        for (PsiElement param : unusedDeclarationsSet) {
+                            if (!(param instanceof JSParameter)) {
+                                continue;
+                            }
+                            unusedSet.set(parameterIndexMap.getInt((JSParameter)param));
+                        }
+
+                        lastUsedParameterIndex = -1;
+
+                        for (int i = params.length - 1; i >= 0; --i) {
+                            if (!unusedSet.get(i)) {
+                                lastUsedParameterIndex = i;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (parameterIndexMap.getInt(parameter) < lastUsedParameterIndex) {
+                        continue; // no sense to report unused symbol before used since it will change signature
+                    }
+
+                    message = JavaScriptLocalize.jsUnusedParameter();
+                    highlightedElement = parameter.getNameIdentifier();
+                }
+                else if (p instanceof JSFunction function) {
+                    final PsiElement nameIdentifier = function.getNameIdentifier();
+                    if (nameIdentifier == null) {
+                        continue;
+                    }
+                    highlightedElement = nameIdentifier;
+                    message = JavaScriptLocalize.jsUnusedFunctionDeclaration();
+                }
+                else {
+                    highlightedElement = ((JSVariable)p).getNameIdentifier();
+                    message = JavaScriptLocalize.jsUnusedLocalVariable();
+                }
+
+                if (p.getParent() instanceof JSCatchBlock) {
+                    holder.registerProblem(
+                        highlightedElement,
+                        message.get(),
+                        ProblemHighlightType.LIKE_UNUSED_SYMBOL
+                    );
+                }
+                else {
+                    holder.registerProblem(
+                        highlightedElement,
+                        message.get(),
+                        ProblemHighlightType.LIKE_UNUSED_SYMBOL,
+                        new RemoveElementLocalQuickFix()
+                    );
+                }
+            }
+        }
+        finally {
+            node.putUserData(ourUnusedLocalDeclarationsSetKey, null);
+        }
+    }
+
+    private static void handleLocalDeclaration(final JSNamedElement node) {
+        if (node instanceof JSFunction function && !isSupportedFunction(function)) {
+            return;
+        }
+        final PsiElement scopeNode = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSCatchBlock.class);
+        if (scopeNode == null) {
+            return;
+        }
+        final Set<PsiElement> unusedParametersSet = scopeNode.getUserData(ourUnusedLocalDeclarationsSetKey);
+        final Set<PsiElement> usedSet = scopeNode.getUserData(ourUsedLocalDeclarationsSetKey);
+        if (usedSet != null && usedSet.contains(node)) {
+            return;
+        }
+        if (unusedParametersSet == null) {
+            return;
+        }
+        unusedParametersSet.add(node);
+    }
+
+    @Override
+    @Nonnull
+    public HighlightDisplayLevel getDefaultLevel() {
+        return HighlightDisplayLevel.WARNING;
+    }
+
+    private static class RemoveElementLocalQuickFix implements LocalQuickFix {
+        @Override
+        @Nonnull
+        public String getName() {
+            return JavaScriptLocalize.jsUnusedSymbolRemove().get();
+        }
+
+        @Override
+        @Nonnull
+        public String getFamilyName() {
+            return getName();
+        }
+
+        @Override
+        public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
+            try {
+                PsiElement element = descriptor.getPsiElement();
+                if (!(element instanceof JSNamedElement)) {
+                    element = element.getParent();
+                }
+                element.delete();
+            }
+            catch (IncorrectOperationException e) {
+                LOG.error(e);
+            }
+        }
+    }
 }
\ No newline at end of file

From 65d0bf52147d5bbc85a5b24470cf8b1002421cc4 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 22:12:02 +0300
Subject: [PATCH 266/340] Refactoring base-api module.

---
 .../lang/javascript/formatter/JSCodeStyleSettings.java    | 3 +--
 .../java/consulo/javascript/index/JavaScriptIndexer.java  | 2 +-
 .../javascript/internal/DefaultJavaScriptVersion.java     | 2 +-
 .../consulo/javascript/language/JavaScriptConstants.java  | 2 +-
 .../consulo/javascript/language/JavaScriptFeature.java    | 2 +-
 .../consulo/javascript/language/JavaScriptFileType.java   | 8 ++++----
 .../language/JavaScriptFileTypeWithVersion.java           | 2 +-
 .../consulo/javascript/language/JavaScriptLanguage.java   | 2 +-
 .../javascript/language/JavaScriptLanguageVersion.java    | 2 +-
 .../javascript/language/JavaScriptVersionUtil.java        | 5 ++++-
 .../javascript/language/StandardJavaScriptVersion.java    | 2 +-
 .../javascript/language/StandardJavaScriptVersions.java   | 2 +-
 .../javascript/language/psi/JavaScriptPrimitiveType.java  | 4 ++--
 .../consulo/javascript/language/psi/JavaScriptType.java   | 4 ++--
 .../javascript/language/psi/JavaScriptTypeElement.java    | 2 +-
 .../javascript/language/psi/stub/JavaScriptIndexKeys.java | 2 +-
 .../module/extension/JavaScriptModuleExtension.java       | 2 +-
 .../extension/JavaScriptMutableModuleExtension.java       | 2 +-
 .../main/java/consulo/javascript/psi/JSComputedName.java  | 2 +-
 .../consulo/javascript/psi/JSSimpleLiteralExpression.java | 2 +-
 .../javascript/psi/JavaScriptImportStatementBase.java     | 4 ++--
 .../javascript/psi/JavaScriptLambdaExpression.java        | 2 +-
 .../impl/reference/JSPropertyNameReferenceProvider.java   | 2 +-
 .../java/consulo/javascript/psi/stubs/JSFileStub.java     | 2 +-
 base-api/src/main/java/module-info.java                   | 8 +++++---
 25 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java b/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
index bfed45b3..b33c1586 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/formatter/JSCodeStyleSettings.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 12, 2008
- * Time: 10:25:17 PM
+ * @since 2008-03-12
  */
 public class JSCodeStyleSettings extends CustomCodeStyleSettings {
     public int INDENT_PACKAGE_CHILDREN = DO_NOT_INDENT;
diff --git a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
index a0c8ea3e..e2c5226c 100644
--- a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
+++ b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
@@ -9,7 +9,7 @@
 
 /**
  * @author VISTALL
- * @since 19.07.2015
+ * @since 2015-07-19
  */
 @ExtensionAPI(ComponentScope.APPLICATION)
 public abstract class JavaScriptIndexer {
diff --git a/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java b/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java
index 73c18617..f970121f 100644
--- a/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java
+++ b/base-api/src/main/java/consulo/javascript/internal/DefaultJavaScriptVersion.java
@@ -4,7 +4,7 @@
  * Marker for default javascript file version if not selected
  *
  * @author VISTALL
- * @since 31/08/2023
+ * @since 2023-08-31
  */
 public interface DefaultJavaScriptVersion {
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java
index 198434cc..5df5c68b 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptConstants.java
@@ -2,7 +2,7 @@
 
 /**
  * @author VISTALL
- * @since 15.02.2016
+ * @since 2016-02-15
  */
 public interface JavaScriptConstants {
     String USE_STRICT = "use strict";
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
index fdb95933..439be46b 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
@@ -20,7 +20,7 @@
 
 /**
  * @author VISTALL
- * @since 23.02.2016
+ * @since 2016-02-23
  */
 public enum JavaScriptFeature {
     CLASS("Classes"),
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
index 81d8d4b7..0f1ca167 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
@@ -32,9 +32,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * User: max
- * Date: Jan 27, 2005
- * Time: 6:02:59 PM
+ * @author max
+ * @since 2005-01-27
  */
 public class JavaScriptFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion {
     public static final JavaScriptFileType INSTANCE = new JavaScriptFileType();
@@ -61,14 +60,15 @@ public String getDefaultExtension() {
         return "js";
     }
 
+    @Nonnull
     @Override
     public Image getIcon() {
         return JavaScriptIconGroup.javascript();
     }
 
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
         if (module == null) {
             return StandardJavaScriptVersions.getInstance().getDefaultVersion();
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
index 3bea0f9f..e6a74307 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
@@ -26,7 +26,7 @@
 
 /**
  * @author VISTALL
- * @since 11.12.2015
+ * @since 2015-12-11
  */
 public interface JavaScriptFileTypeWithVersion {
     @Nonnull
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
index 13b0a121..cbaac2a5 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
@@ -28,7 +28,7 @@
 
 /**
  * @author VISTALL
- * @since 05.12.2015
+ * @since 2015-12-05
  */
 public class JavaScriptLanguage extends Language {
     public static final JavaScriptLanguage INSTANCE = new JavaScriptLanguage();
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
index 62d3ce7f..ac37a2bd 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
@@ -10,7 +10,7 @@
 
 /**
  * @author VISTALL
- * @since 23-Dec-17
+ * @since 2017-12-23
  */
 public abstract class JavaScriptLanguageVersion extends LanguageVersion implements LanguageVersionWithParsing {
     public JavaScriptLanguageVersion(@Nonnull String id, @Nonnull String name, @Nonnull Language language, String... mimeTypes) {
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
index e54ac86e..bb09748a 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
@@ -16,6 +16,7 @@
 
 package consulo.javascript.language;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.version.LanguageVersion;
 
@@ -26,13 +27,15 @@
 
 /**
  * @author VISTALL
- * @since 23.02.2016
+ * @since 2016-02-23
  */
 public class JavaScriptVersionUtil {
+    @RequiredReadAction
     public static boolean containsFeature(@Nonnull PsiElement element, @Nonnull JavaScriptFeature feature) {
         return getFeatures(element).contains(feature);
     }
 
+    @RequiredReadAction
     public static Set<JavaScriptFeature> getFeatures(@Nonnull PsiElement element) {
         LanguageVersion languageVersion = element.getLanguageVersion();
         return languageVersion instanceof JavaScriptLanguageVersion ? ((JavaScriptLanguageVersion)languageVersion).getFeatures() : Collections.<JavaScriptFeature>emptySet();
diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java
index a01c7e8d..f1ef0473 100644
--- a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersion.java
@@ -4,7 +4,7 @@
  * Marker for javascript version which can be selected inside combobox for module
  *
  * @author VISTALL
- * @since 31/08/2023
+ * @since 2023-08-31
  */
 public interface StandardJavaScriptVersion {
     @Deprecated
diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
index 1cdd1088..af7a6ede 100644
--- a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
@@ -27,7 +27,7 @@
 
 /**
  * @author VISTALL
- * @since 11.12.2015
+ * @since 2015-12-11
  */
 @ServiceAPI(ComponentScope.APPLICATION)
 public abstract class StandardJavaScriptVersions {
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
index 77f1b4f6..046180f9 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
@@ -23,7 +23,7 @@
 
 /**
  * @author VISTALL
- * @since 13.12.2015
+ * @since 2015-12-13
  */
 public class JavaScriptPrimitiveType implements JavaScriptType {
     public static final JavaScriptPrimitiveType BOOL = new JavaScriptPrimitiveType("Boolean");
@@ -38,9 +38,9 @@ public JavaScriptPrimitiveType(String name) {
         myName = name;
     }
 
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public String getPresentableText() {
         return myName;
     }
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
index 5d0ed059..3b1bc07c 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
@@ -23,13 +23,13 @@
 
 /**
  * @author VISTALL
- * @since 13.12.2015
+ * @since 2015-12-13
  */
 public interface JavaScriptType {
     JavaScriptType UNKNOWN = new JavaScriptType() {
-        @RequiredReadAction
         @Nonnull
         @Override
+        @RequiredReadAction
         public String getPresentableText() {
             return "?";
         }
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
index 6e6aa557..dc7da63f 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
@@ -21,7 +21,7 @@
 
 /**
  * @author VISTALL
- * @since 29.02.2016
+ * @since 2016-02-29
  */
 public interface JavaScriptTypeElement extends JSElement {
     @Nonnull
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java
index 38474232..635ddb86 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JavaScriptIndexKeys.java
@@ -23,7 +23,7 @@
 
 /**
  * @author VISTALL
- * @since 05.12.2015
+ * @since 2015-12-05
  */
 public interface JavaScriptIndexKeys {
     StubIndexKey<String, JSClass> CLASSES_BY_NAME = StubIndexKey.createIndexKey("js.class.shortName");
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
index ce2b9c7a..db766505 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
@@ -6,7 +6,7 @@
 
 /**
  * @author VISTALL
- * @since 29.06.14
+ * @since 2014-06-29
  */
 public interface JavaScriptModuleExtension<T extends JavaScriptModuleExtension<T>> extends ModuleExtensionWithSdk<T> {
     @Nonnull
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
index 6d560179..752ecbff 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
@@ -22,7 +22,7 @@
 
 /**
  * @author VISTALL
- * @since 12.12.2015
+ * @since 2015-12-12
  */
 public interface JavaScriptMutableModuleExtension<T extends JavaScriptModuleExtension<T>> extends JavaScriptModuleExtension<T>, MutableModuleExtensionWithSdk<T> {
     void setLanguageVersion(@Nonnull LanguageVersion languageVersion);
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
index cb683d13..c70dde79 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
@@ -23,7 +23,7 @@
 
 /**
  * @author VISTALL
- * @since 03.03.2016
+ * @since 2016-03-03
  */
 public interface JSComputedName extends JSElement {
     @Nullable
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
index 5fdd2d36..ab5d457f 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
@@ -24,7 +24,7 @@
 
 /**
  * @author VISTALL
- * @since 11.12.2015
+ * @since 2015-12-11
  */
 public interface JSSimpleLiteralExpression extends JSLiteralExpression {
     @Nonnull
diff --git a/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java b/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java
index 243d1f97..77bdf304 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JavaScriptImportStatementBase.java
@@ -3,10 +3,10 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 
 /**
+ * Base interface for all imports in at js implementation. Affects folding.
+ *
  * @author VISTALL
  * @since 2019-12-14
- *
- * Base interface for all imports in at js implementation. Affect folding
  */
 public interface JavaScriptImportStatementBase extends JSStatement {
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
index 385a472b..58cfbc2d 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JavaScriptLambdaExpression.java
@@ -20,7 +20,7 @@
 
 /**
  * @author VISTALL
- * @since 03.03.2016
+ * @since 2016-03-03
  */
 public interface JavaScriptLambdaExpression extends JSFunctionExpression {
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index 0da095a0..5fdf53db 100644
--- a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -29,7 +29,7 @@
 
 /**
  * @author VISTALL
- * @since 02.12.2015
+ * @since 2015-12-02
  */
 @ExtensionAPI(ComponentScope.APPLICATION)
 public interface JSPropertyNameReferenceProvider {
diff --git a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
index ae460555..59d08d1d 100644
--- a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
+++ b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
@@ -7,7 +7,7 @@
 
 /**
  * @author VISTALL
- * @since 19.07.2015
+ * @since 2015-07-19
  */
 public interface JSFileStub extends PsiFileStub<JSFile> {
     @Nonnull
diff --git a/base-api/src/main/java/module-info.java b/base-api/src/main/java/module-info.java
index 461685dd..0a8a9b01 100644
--- a/base-api/src/main/java/module-info.java
+++ b/base-api/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 /**
  * @author VISTALL
- * @since 23-Aug-22
+ * @since 2022-08-23
  */
 open module consulo.javascript.base.api
 {
@@ -15,12 +15,14 @@
     exports consulo.javascript.index;
     exports consulo.javascript.language;
     exports consulo.javascript.language.psi;
+    exports consulo.javascript.language.psi.stub;
     exports consulo.javascript.localize;
     exports consulo.javascript.module.extension;
     exports consulo.javascript.psi;
     exports consulo.javascript.psi.impl.reference;
-    exports consulo.javascript.language.psi.stub;
     exports consulo.javascript.psi.stubs;
 
-    exports consulo.javascript.internal to consulo.javascript.ecmascript.impl, consulo.javascript.base.impl;
+    exports consulo.javascript.internal to
+        consulo.javascript.base.impl,
+        consulo.javascript.ecmascript.impl;
 }
\ No newline at end of file

From b18d8f0a7abd6d56faf50e357c43fe6c112b39da Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 22:13:47 +0300
Subject: [PATCH 267/340] Refactoring base-impl module.

---
 .../documentation/JSDocumentationBuilder.java |  38 +-
 .../JSDocumentationProcessor.java             |   6 +-
 .../JSDocumentationProvider.java              | 157 +++---
 .../documentation/JSDocumentationUtils.java   | 495 +++++++++---------
 .../javascript/flex/FlexImportSupport.java    |  76 ++-
 .../lang/javascript/flex/JSResolveHelper.java |   8 +-
 .../javascript/flex/XmlBackedJSClassImpl.java |  60 +--
 .../highlighting/JSHighlighter.java           |  97 ++--
 .../JavaScriptHighlightingLexer.java          |   4 +-
 .../javascript/index/JSItemPresentation.java  |  28 +-
 .../lang/javascript/index/JSSymbolUtil.java   | 143 +++--
 .../inspections/qucikFixes/BaseCreateFix.java |  91 ++--
 .../CreateJSFunctionOrMethodFix.java          |   2 +
 .../javascript/psi/impl/JSPsiImplUtils.java   |   2 +-
 14 files changed, 599 insertions(+), 608 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
index 642fc700..b246fc8b 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
@@ -24,6 +24,7 @@
 
 import com.intellij.lang.javascript.index.JSSymbolUtil;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.editor.localize.CodeInsightLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.util.io.URLUtil;
@@ -75,9 +76,9 @@ private static class ParameterInfo extends SymbolInfo {
     private int myNewLinesPendingCount;
     private boolean seenPre;
     private boolean seenSeeAlso;
-    @NonNls
     private static final String BR_DELIMITER = "<BR>\n";
 
+    @RequiredReadAction
     JSDocumentationBuilder(PsiElement element, PsiElement _contextElement) {
         myElement = element;
         contextElement = _contextElement;
@@ -119,7 +120,7 @@ else if (element instanceof JSNamedElement namedElement) {
         result = generationInfo.description;
     }
 
-    private void doAppend(final @NonNls String str) {
+    private void doAppend(String str) {
         while (myNewLinesPendingCount > 0) {
             result.append(seenPre ? "\n" : BR_DELIMITER);
             --myNewLinesPendingCount;
@@ -164,7 +165,7 @@ public boolean onCommentLine(@Nonnull String line) {
             return true;
         }
 
-        if (line.indexOf("<pre>") != -1) {
+        if (line.contains("<pre>")) {
             seenPre = true;
         }
 
@@ -188,7 +189,7 @@ public boolean onCommentLine(@Nonnull String line) {
         doAppend(line);
         myNewLinesPendingCount = parametersStarted && !parametersEnded ? 0 : 1;
 
-        if (line.indexOf("</pre>") != -1) {
+        if (line.contains("</pre>")) {
             seenPre = false;
         }
         return true;
@@ -258,7 +259,7 @@ else if (seenSeeAlso) {
                 myEventsStarted = true;
                 result.append("<DL><DT><b>Events:</b></DT><DD>");
             }
-            result.append("Event <code>" + matchName + "</code> -" + remainingLineContent);
+            result.append("Event <code>").append(matchName).append("</code> -").append(remainingLineContent);
             return true;
         }
         else if (myEventsStarted) {
@@ -267,7 +268,7 @@ else if (myEventsStarted) {
         }
 
         if (metaDocType == MetaDocType.NOTE) {
-            result.append("\n<p><b>Note:</b> " + remainingLineContent);
+            result.append("\n<p><b>Note:</b> ").append(remainingLineContent);
             return true;
         }
 
@@ -391,6 +392,7 @@ else if (metaDocType == MetaDocType.RETURN) {
         return true;
     }
 
+    @RequiredReadAction
     private String getSeeAlsoLink(String remainingLineContent) {
         if (URLUtil.isAbsoluteURL(remainingLineContent)) {
             return remainingLineContent;
@@ -424,6 +426,7 @@ private String appendCurrentOrDefaultValue(String remainingLineContent, boolean
         return remainingLineContent;
     }
 
+    @RequiredReadAction
     String getDoc() {
         if (seenSeeAlso) {
             seenSeeAlso = false;
@@ -504,27 +507,26 @@ public String getParameterDoc(final String name) {
         return null;
     }
 
-
+    @RequiredReadAction
     private void startFunction(JSFunction function) {
-        @NonNls String functionName = function.getName();
-        final PsiElement parent = function.getParent();
+        String functionName = function.getName();
+        PsiElement parent = function.getParent();
 
-        if (parent instanceof JSAssignmentExpression) {
-            final String unqualifiedFunctionName = functionName;
-            JSExpression expression = ((JSDefinitionExpression)((JSAssignmentExpression)parent).getLOperand()).getExpression();
+        if (parent instanceof JSAssignmentExpression assignment) {
+            String unqualifiedFunctionName = functionName;
+            JSExpression expression = ((JSDefinitionExpression)assignment.getLOperand()).getExpression();
             functionName = null;
 
-            if (expression instanceof JSReferenceExpression) {
-                final JSExpression qualifierExpression = ((JSReferenceExpression)expression).getQualifier();
-                if (qualifierExpression instanceof JSReferenceExpression) {
-                    expression = JSSymbolUtil.findReferenceExpressionUsedForClassExtending((JSReferenceExpression)qualifierExpression);
-                    functionName = expression.getText() + "." + unqualifiedFunctionName;
-                }
+            if (expression instanceof JSReferenceExpression refExpr
+                && refExpr.getQualifier() instanceof JSReferenceExpression qualifierRefExpr) {
+                expression = JSSymbolUtil.findReferenceExpressionUsedForClassExtending(qualifierRefExpr);
+                functionName = expression.getText() + "." + unqualifiedFunctionName;
             }
 
             if (functionName == null) {
                 functionName = expression.getText();
             }
+
             if (generationInfo.namespace != null && functionName.equals(generationInfo.namespace + "." + unqualifiedFunctionName)) {
                 generationInfo.namespace = null;
             }
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
index b7f303bd..c79a645b 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
@@ -58,9 +58,9 @@ enum MetaDocType {
     boolean onPatternMatch(
         @Nonnull MetaDocType type,
         @Nullable String matchName,
-        @Nullable final String matchValue,
+        @Nullable String matchValue,
         @Nullable String remainingLineContent,
-        @Nonnull final String line,
-        final String patternMatched
+        @Nonnull String line,
+        String patternMatched
     );
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 0c3699f1..d47e3897 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -39,12 +39,10 @@
 import consulo.project.Project;
 import consulo.util.lang.Pair;
 import consulo.util.lang.StringUtil;
-import consulo.util.lang.ref.Ref;
 import consulo.util.lang.ref.SimpleReference;
 import consulo.xml.psi.xml.XmlToken;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
 
 import java.io.File;
 import java.lang.reflect.Method;
@@ -65,7 +63,7 @@ public class JSDocumentationProvider implements CodeDocumentationProvider, Langu
 
     protected static final String PACKAGE = "package";
     protected static final String HTML_EXTENSION = ".html";
-    protected static final String PACKAGE_FILE = PACKAGE + HTML_EXTENSION;
+    protected static String PACKAGE_FILE = PACKAGE + HTML_EXTENSION;
 
     protected static final Map<String, String> DOCUMENTED_ATTRIBUTES;
 
@@ -78,7 +76,7 @@ public class JSDocumentationProvider implements CodeDocumentationProvider, Langu
 
     private DocumentationProvider getCssProvider(Project project) throws Exception {
         if (cssProvider == null) {
-            final Class<?> aClass = Class.forName("com.intellij.psi.css.impl.util.CssDocumentationProvider");
+            Class<?> aClass = Class.forName("com.intellij.psi.css.impl.util.CssDocumentationProvider");
             cssProvider = (DocumentationProvider)aClass.getConstructor(new Class[]{}).newInstance(new Object[]{});
         }
 
@@ -89,11 +87,8 @@ private DocumentationProvider getCssProvider(Project project) throws Exception {
     @Nullable
     @RequiredReadAction
     public String getQuickNavigateInfo(PsiElement element, PsiElement element2) {
-        if (element instanceof JSFunction) {
-            final JSFunction function = (JSFunction)element;
-            final PsiElement parent = element.getParent();
-
-            if (function.isConstructor() && parent instanceof JSClass jsClass) {
+        if (element instanceof JSFunction function) {
+            if (function.isConstructor() && function.getParent() instanceof JSClass jsClass) {
                 return createQuickNavigateForClazz(jsClass);
             }
             return createQuickNavigateForFunction(function);
@@ -104,12 +99,12 @@ else if (element instanceof JSClass jsClass) {
         else if (element instanceof JSVariable variable) {
             return createQuickNavigateForVariable(variable);
         }
-        else if (element instanceof JSAttributeNameValuePair) {
-            return createQuickNavigateForAnnotationDerived(element);
+        else if (element instanceof JSAttributeNameValuePair attributeNameValuePair) {
+            return createQuickNavigateForAnnotationDerived(attributeNameValuePair);
         }
-        else if (element instanceof XmlToken) {
-            BaseJSSymbolProcessor.TagContextBuilder builder = new BaseJSSymbolProcessor.TagContextBuilder(element, "XmlTag");
-            return StringUtil.stripQuotesAroundValue(element.getText()) + ":" + builder.typeName;
+        else if (element instanceof XmlToken xmlToken) {
+            BaseJSSymbolProcessor.TagContextBuilder builder = new BaseJSSymbolProcessor.TagContextBuilder(xmlToken, "XmlTag");
+            return StringUtil.stripQuotesAroundValue(xmlToken.getText()) + ":" + builder.typeName;
         }
         else if (element instanceof JSNamespaceDeclaration namespaceDeclaration) {
             return createQuickNavigateForNamespace(namespaceDeclaration);
@@ -119,11 +114,11 @@ else if (element instanceof JSNamespaceDeclaration namespaceDeclaration) {
     }
 
     @RequiredReadAction
-    private static String createQuickNavigateForAnnotationDerived(final PsiElement element) {
-        final JSAttributeNameValuePair valuePair = (JSAttributeNameValuePair)element;
-        final JSAttribute parent = (JSAttribute)valuePair.getParent();
-        final StringBuilder builder = new StringBuilder();
-        final JSClass clazz = PsiTreeUtil.getParentOfType(valuePair, JSClass.class);
+    private static String createQuickNavigateForAnnotationDerived(PsiElement element) {
+        JSAttributeNameValuePair valuePair = (JSAttributeNameValuePair)element;
+        JSAttribute parent = (JSAttribute)valuePair.getParent();
+        StringBuilder builder = new StringBuilder();
+        JSClass clazz = PsiTreeUtil.getParentOfType(valuePair, JSClass.class);
         appendParentInfo(clazz != null ? clazz : parent.getContainingFile(), builder, parent);
         builder.append(parent.getName()).append(" ").append(valuePair.getSimpleValue());
         return builder.toString();
@@ -131,25 +126,25 @@ private static String createQuickNavigateForAnnotationDerived(final PsiElement e
 
     @Nullable
     @RequiredReadAction
-    private static String createQuickNavigateForFunction(final JSFunction function) {
-        final PsiElement parent = JSResolveUtil.findParent(function);
-        final StringBuilder result = new StringBuilder();
+    private static String createQuickNavigateForFunction(JSFunction function) {
+        PsiElement parent = JSResolveUtil.findParent(function);
+        StringBuilder result = new StringBuilder();
 
         appendParentInfo(parent, result, function);
 
         appendAttrList(function, result);
-        final boolean get = function.isGetProperty();
-        final boolean set = function.isSetProperty();
+        boolean get = function.isGetProperty();
+        boolean set = function.isSetProperty();
 
         result.append(get || set ? "property " : "function ");
         result.append(function.getName());
 
         if (!get && !set) {
             result.append('(');
-            final JSParameterList jsParameterList = function.getParameterList();
+            JSParameterList jsParameterList = function.getParameterList();
 
             if (jsParameterList != null) {
-                final int start = result.length();
+                int start = result.length();
 
                 for (JSParameter p : jsParameterList.getParameters()) {
                     if (start != result.length()) {
@@ -169,10 +164,10 @@ private static String createQuickNavigateForFunction(final JSFunction function)
             varType = JSImportHandlingUtil.resolveTypeName(function.getReturnTypeString(), function);
         }
         else {
-            final JSParameterList jsParameterList = function.getParameterList();
+            JSParameterList jsParameterList = function.getParameterList();
 
             if (jsParameterList != null) {
-                final JSParameter[] jsParameters = jsParameterList.getParameters();
+                JSParameter[] jsParameters = jsParameterList.getParameters();
                 if (jsParameters != null && jsParameters.length > 0) {
                     varType = JSImportHandlingUtil.resolveTypeName(jsParameters[0].getTypeString(), function);
                 }
@@ -186,7 +181,7 @@ private static String createQuickNavigateForFunction(final JSFunction function)
     }
 
     @RequiredReadAction
-    private static void appendParentInfo(final PsiElement parent, final StringBuilder builder, PsiNamedElement element) {
+    private static void appendParentInfo(PsiElement parent, StringBuilder builder, PsiNamedElement element) {
         if (parent instanceof JSClass jsClass) {
             builder.append(jsClass.getQualifiedName()).append("\n");
         }
@@ -195,7 +190,7 @@ else if (parent instanceof JSPackageStatement packageStatement) {
         }
         else if (parent instanceof JSFile) {
             if (parent.getContext() != null) {
-                final String mxmlPackage = JSResolveUtil.findPackageForMxml(parent);
+                String mxmlPackage = JSResolveUtil.findPackageForMxml(parent);
                 if (mxmlPackage != null) {
                     builder.append(mxmlPackage)
                         .append(mxmlPackage.length() > 0 ? "." : "")
@@ -209,7 +204,7 @@ else if (parent instanceof JSFile) {
                 if (element instanceof JSNamedElement namedElement) {
                     PsiElement node = namedElement.getNameIdentifier();
                     if (node != null) {
-                        final String s = node.getText();
+                        String s = node.getText();
                         int i = s.lastIndexOf('.');
                         if (i != -1) {
                             builder.append(s.substring(0, i)).append("\n");
@@ -226,9 +221,9 @@ else if (parent instanceof JSFile) {
 
     @Nullable
     @RequiredReadAction
-    private static String createQuickNavigateForVariable(final JSVariable variable) {
-        final PsiElement parent = JSResolveUtil.findParent(variable);
-        final StringBuilder result = new StringBuilder();
+    private static String createQuickNavigateForVariable(JSVariable variable) {
+        PsiElement parent = JSResolveUtil.findParent(variable);
+        StringBuilder result = new StringBuilder();
 
         appendParentInfo(parent, result, variable);
 
@@ -253,8 +248,8 @@ else if (initializer instanceof JSObjectLiteralExpression) {
         return result.toString();
     }
 
-    private static void appendVarType(final JSVariable variable, final StringBuilder builder) {
-        final String varType = variable.getTypeString();
+    private static void appendVarType(JSVariable variable, StringBuilder builder) {
+        String varType = variable.getTypeString();
         if (varType != null) {
             builder.append(':').append(varType);
         }
@@ -262,8 +257,8 @@ private static void appendVarType(final JSVariable variable, final StringBuilder
 
     @Nullable
     @RequiredReadAction
-    private static String createQuickNavigateForClazz(final JSClass jsClass) {
-        final String qName = jsClass.getQualifiedName();
+    private static String createQuickNavigateForClazz(JSClass jsClass) {
+        String qName = jsClass.getQualifiedName();
         if (qName == null) {
             return null;
         }
@@ -276,7 +271,7 @@ private static String createQuickNavigateForClazz(final JSClass jsClass) {
         appendAttrList(jsClass, result);
         result.append(jsClass.isInterface() ? "interface" : "class");
 
-        final String name = jsClass.getName();
+        String name = jsClass.getName();
         result.append(" ").append(name);
 
         String s = generateReferenceTargetList(jsClass.getExtendsList(), packageName);
@@ -296,8 +291,9 @@ private static String createQuickNavigateForClazz(final JSClass jsClass) {
     }
 
     @Nullable
+    @RequiredReadAction
     private static String createQuickNavigateForNamespace(JSNamespaceDeclaration ns) {
-        final String qName = ns.getQualifiedName();
+        String qName = ns.getQualifiedName();
         if (qName == null) {
             return null;
         }
@@ -309,8 +305,7 @@ private static String createQuickNavigateForNamespace(JSNamespaceDeclaration ns)
 
         result.append("namespace");
 
-        final String name = ns.getName();
-        result.append(" ").append(name);
+        result.append(" ").append(ns.getName());
 
         String s = ns.getInitialValueString();
         if (s != null) {
@@ -320,8 +315,8 @@ private static String createQuickNavigateForNamespace(JSNamespaceDeclaration ns)
     }
 
     @RequiredReadAction
-    private static void appendAttrList(final JSAttributeListOwner jsClass, final StringBuilder result) {
-        final JSAttributeList attributeList = jsClass.getAttributeList();
+    private static void appendAttrList(JSAttributeListOwner jsClass, StringBuilder result) {
+        JSAttributeList attributeList = jsClass.getAttributeList();
         if (attributeList != null) {
             if (attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
                 result.append("override ");
@@ -354,13 +349,13 @@ private static void appendAttrList(final JSAttributeListOwner jsClass, final Str
 
     @Nullable
     @RequiredReadAction
-    private static String generateReferenceTargetList(final @Nullable JSReferenceList implementsList, @Nonnull String packageName) {
+    private static String generateReferenceTargetList(@Nullable JSReferenceList implementsList, @Nonnull String packageName) {
         if (implementsList == null) {
             return null;
         }
         StringBuilder result = null;
 
-        final String[] referenceExpressionTexts = implementsList.getReferenceTexts();
+        String[] referenceExpressionTexts = implementsList.getReferenceTexts();
 
         for (String refExprText : referenceExpressionTexts) {
             refExprText = JSImportHandlingUtil.resolveTypeName(refExprText, implementsList);
@@ -371,7 +366,7 @@ private static String generateReferenceTargetList(final @Nullable JSReferenceLis
                 result.append(",");
             }
 
-            final String referencedPackageName = StringUtil.getPackageName(refExprText);
+            String referencedPackageName = StringUtil.getPackageName(refExprText);
             result.append(referencedPackageName.equals(packageName)
                 ? refExprText.substring(refExprText.lastIndexOf('.') + 1)
                 : refExprText);
@@ -385,9 +380,9 @@ public List<String> getUrlFor(PsiElement element, PsiElement originalElement) {
 
         if (possibleCssName != null) {
             try {
-                final DocumentationProvider documentationProvider = getCssProvider(element.getProject());
-                final Method method = documentationProvider.getClass().getMethod("getUrlFor", new Class[]{String.class});
-                final Object o = method.invoke(null, new Object[]{possibleCssName});
+                DocumentationProvider documentationProvider = getCssProvider(element.getProject());
+                Method method = documentationProvider.getClass().getMethod("getUrlFor", new Class[]{String.class});
+                Object o = method.invoke(null, new Object[]{possibleCssName});
 
                 if (o instanceof String) {
                     return Collections.singletonList((String)o);
@@ -428,7 +423,7 @@ public String generateDoc(PsiElement _element, PsiElement originalElement) {
         _element = _element.getNavigationElement();
         PsiElement element = findElementForWhichPreviousCommentWillBeSearched(_element);
 
-        final boolean parameterDoc = element instanceof JSParameter;
+        boolean parameterDoc = element instanceof JSParameter;
         if (parameterDoc) {
             element = findElementForWhichPreviousCommentWillBeSearched(PsiTreeUtil.getParentOfType(element, JSFunction.class));
         }
@@ -440,7 +435,7 @@ public String generateDoc(PsiElement _element, PsiElement originalElement) {
             if (docComment != null) {
                 docComment = findFirstDocComment(docComment);
                 element = findTargetElement(_element, element);
-                final JSDocumentationBuilder builder = new JSDocumentationBuilder(element, originalElement);
+                JSDocumentationBuilder builder = new JSDocumentationBuilder(element, originalElement);
                 JSDocumentationUtils.processDocumentationTextFromComment(docComment.getNode(), builder);
 
                 return parameterDoc ? builder.getParameterDoc(((JSParameter)_element).getName()) : builder.getDoc();
@@ -452,7 +447,7 @@ public String generateDoc(PsiElement _element, PsiElement originalElement) {
                 ASTNode initialComment = JSDocumentationUtils.findLeadingCommentInFunctionBody(element);
 
                 if (initialComment != null) {
-                    final JSDocumentationBuilder builder = new JSDocumentationBuilder(element, originalElement);
+                    JSDocumentationBuilder builder = new JSDocumentationBuilder(element, originalElement);
                     JSDocumentationUtils.processDocumentationTextFromComment(initialComment, builder);
                     return builder.getDoc();
                 }
@@ -462,10 +457,10 @@ public String generateDoc(PsiElement _element, PsiElement originalElement) {
         String possibleCssName = findPossibleCssName(_element);
         if (possibleCssName != null) {
             try {
-                final DocumentationProvider documentationProvider = getCssProvider(_element.getProject());
-                final Method declaredMethod =
+                DocumentationProvider documentationProvider = getCssProvider(_element.getProject());
+                Method declaredMethod =
                     documentationProvider.getClass().getDeclaredMethod("generateDoc", String.class, PsiElement.class);
-                final Object o = declaredMethod.invoke(null, possibleCssName, null);
+                Object o = declaredMethod.invoke(null, possibleCssName, null);
 
                 if (o instanceof String) {
                     return (String)o;
@@ -479,7 +474,7 @@ public String generateDoc(PsiElement _element, PsiElement originalElement) {
     }
 
     @RequiredReadAction
-    private static PsiElement findTargetElement(final PsiElement _element, PsiElement element) {
+    private static PsiElement findTargetElement(PsiElement _element, PsiElement element) {
         if (_element instanceof JSDefinitionExpression definition) {
             if (definition.getParent() instanceof JSAssignmentExpression assignment) {
                 JSExpression rOperand = assignment.getROperand();
@@ -528,7 +523,7 @@ private static PsiElement findFirstDocComment(PsiElement docComment) {
 
     private static String findPossibleCssName(PsiElement _element) {
         if (_element instanceof JSDefinitionExpression definition) {
-            final JSExpression expression = definition.getExpression();
+            JSExpression expression = definition.getExpression();
 
             if (expression instanceof JSReferenceExpression reference) {
                 String text = reference.getReferencedName();
@@ -538,7 +533,7 @@ private static String findPossibleCssName(PsiElement _element) {
                 StringBuilder sb = new StringBuilder(text.length());
 
                 for (int i = 0; i < text.length(); ++i) {
-                    final char ch = text.charAt(i);
+                    char ch = text.charAt(i);
 
                     if (Character.isUpperCase(ch)) {
                         sb.append('-').append(Character.toLowerCase(ch));
@@ -607,15 +602,15 @@ else if (object instanceof JSProperty || object instanceof JSStatement || object
             return (PsiElement)object;
         }
         else if (object instanceof PsiElement psiElement) {
-            final PsiElement parent = psiElement.getParent();
-            if (parent instanceof JSAssignmentExpression) {
-                return parent.getParent();
+            PsiElement parent = psiElement.getParent();
+            if (parent instanceof JSAssignmentExpression assignment) {
+                return assignment.getParent();
             }
-            else if (parent instanceof JSVarStatement) {
-                if (parent.getFirstChild() instanceof JSAttributeList && JSDocumentationUtils.findDocComment(psiElement) != null) {
+            else if (parent instanceof JSVarStatement varStatement) {
+                if (varStatement.getFirstChild() instanceof JSAttributeList && JSDocumentationUtils.findDocComment(psiElement) != null) {
                     return psiElement;
                 }
-                return parent;
+                return varStatement;
             }
             else if (parent instanceof JSAttribute attribute) {
                 PsiElement attrParent = attribute.getParent();
@@ -628,8 +623,8 @@ else if (parent instanceof JSAttribute attribute) {
                 }
                 return attribute;
             }
-            else if (parent instanceof JSSuppressionHolder) {
-                return parent;
+            else if (parent instanceof JSSuppressionHolder suppressionHolder) {
+                return suppressionHolder;
             }
             else {
                 return psiElement;
@@ -641,18 +636,18 @@ else if (parent instanceof JSSuppressionHolder) {
 
     @Nullable
     @Override
-    public PsiElement getDocumentationElementForLink(final PsiManager psiManager, String link, final PsiElement context) {
+    public PsiElement getDocumentationElementForLink(PsiManager psiManager, String link, PsiElement context) {
         return getDocumentationElementForLinkStatic(psiManager, link, context);
     }
 
     @Nullable
-    private static PsiElement getDocumentationElementForLinkStatic(final PsiManager psiManager, String link, @Nonnull PsiElement context) {
-        final int delimiterIndex = link.lastIndexOf(':');
+    private static PsiElement getDocumentationElementForLinkStatic(PsiManager psiManager, String link, @Nonnull PsiElement context) {
+        int delimiterIndex = link.lastIndexOf(':');
 
         String attributeType = null;
         String attributeName = null;
         for (Map.Entry<String, String> e : DOCUMENTED_ATTRIBUTES.entrySet()) {
-            final String pattern = "." + e.getValue();
+            String pattern = "." + e.getValue();
             if (link.contains(pattern)) {
                 attributeType = e.getKey();
                 attributeName = link.substring(link.indexOf(pattern) + pattern.length());
@@ -661,7 +656,7 @@ private static PsiElement getDocumentationElementForLinkStatic(final PsiManager
             }
         }
         if (delimiterIndex != -1 && attributeType == null) {
-            final int delimiterIndex2 = link.lastIndexOf(':', delimiterIndex - 1);
+            int delimiterIndex2 = link.lastIndexOf(':', delimiterIndex - 1);
             String fileName = link.substring(0, delimiterIndex2).replace(File.separatorChar, '/');
             String name = link.substring(delimiterIndex2 + 1, delimiterIndex);
             int offset = Integer.parseInt(link.substring(delimiterIndex + 1));
@@ -721,14 +716,14 @@ else if (attributeType != null) {
 
     @Nullable
     @RequiredReadAction
-    protected static JSAttributeNameValuePair findNamedAttribute(JSClass clazz, final String type, final String name) {
+    protected static JSAttributeNameValuePair findNamedAttribute(JSClass clazz, String type, String name) {
         SimpleReference<JSAttributeNameValuePair> attribute = new SimpleReference<>();
         JSResolveUtil.processMetaAttributesForClass(clazz, new JSResolveUtil.MetaDataProcessor() {
             @Override
             @RequiredReadAction
             public boolean process(@Nonnull JSAttribute jsAttribute) {
                 if (type.equals(jsAttribute.getName())) {
-                    final JSAttributeNameValuePair jsAttributeNameValuePair = jsAttribute.getValueByName("name");
+                    JSAttributeNameValuePair jsAttributeNameValuePair = jsAttribute.getValueByName("name");
                     if (jsAttributeNameValuePair != null && name.equals(jsAttributeNameValuePair.getSimpleValue())) {
                         attribute.set(jsAttributeNameValuePair);
                         return false;
@@ -804,11 +799,11 @@ else if (el instanceof JSVarStatement varStatement) {
     }
 
     @RequiredReadAction
-    private static String doGenerateDoc(final JSFunction function) {
+    private static String doGenerateDoc(JSFunction function) {
         StringBuilder builder = new StringBuilder();
-        final JSParameterList parameterList = function.getParameterList();
-        final PsiFile containingFile = function.getContainingFile();
-        final boolean ecma = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+        JSParameterList parameterList = function.getParameterList();
+        PsiFile containingFile = function.getContainingFile();
+        boolean ecma = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
 
         if (parameterList != null) {
             for (JSParameter parameter : parameterList.getParameters()) {
@@ -841,7 +836,7 @@ protected static String getSeeAlsoLinkResolved(PsiElement originElement, String
             return null;
         }
         String linkToResolve = getLinkToResolve(qualifiedElement, link);
-        final PsiElement resolvedElement = getDocumentationElementForLinkStatic(originElement.getManager(), linkToResolve, originElement);
+        PsiElement resolvedElement = getDocumentationElementForLinkStatic(originElement.getManager(), linkToResolve, originElement);
         if (resolvedElement != null) {
             return linkToResolve;
         }
@@ -866,7 +861,7 @@ else if (StringUtil.startsWithChar(link, '#')) {
             String linkFile = link.contains("#") ? link.substring(0, link.lastIndexOf('#')) : link;
             String linkAnchor = link.contains("#") ? link.substring(link.lastIndexOf('#') + 1) : null;
 
-            final String qname;
+            String qname;
             if (StringUtil.endsWithIgnoreCase(linkFile, HTML_EXTENSION)) {
                 String prefix = StringUtil.getPackageName(originQname);
                 while (linkFile.startsWith("../")) {
@@ -922,7 +917,7 @@ else if (element instanceof JSAttributeNameValuePair nameValuePair) {
         }
 
         if (attribute != null && DOCUMENTED_ATTRIBUTES.containsKey(attribute.getName())) {
-            final JSClass jsClass = PsiTreeUtil.getParentOfType(element, JSClass.class);
+            JSClass jsClass = PsiTreeUtil.getParentOfType(element, JSClass.class);
             if (jsClass != null) {
                 return jsClass;
             }
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
index 1ccad5fe..aace368b 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
@@ -26,6 +26,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 import consulo.language.ast.TokenSet;
@@ -34,9 +35,7 @@
 import consulo.language.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.StringUtil;
-import consulo.util.lang.ref.Ref;
-import org.jetbrains.annotations.NonNls;
-
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -48,135 +47,108 @@
 import java.util.regex.Pattern;
 
 public class JSDocumentationUtils {
-    @NonNls
-    private static final Pattern ourDojoParametersPattern = Pattern.compile("^\\s*(\\w+):(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocParametersPattern =
-        Pattern.compile("^\\s*@param\\s*(?:\\{([^\\}]+)\\}\\s*)?(\\w+)?(?:\\s:\\s(\\S+))?(?:\\s*\\[(\\w+)(?:\\.(\\w+))?" +
-            "(?:=([^\\]]*))?\\])?(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocEventPattern = Pattern.compile("^\\s*@event\\s*(\\w+)(?:\\s:\\s(\\S+))?(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocRemarkPattern = Pattern.compile("^\\s*@remarks (.*)$");
-    @NonNls
-    private static final Pattern ourJSDocMethodPattern = Pattern.compile("^\\s*@method\\s*(\\w+)(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocClassPattern = Pattern.compile("^\\s*@class\\s*(\\w+(?:\\.\\w+)*)(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocDeprecatedPattern = Pattern.compile("^\\s*@deprecated\\s*(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocConstructorPattern = Pattern.compile("^\\s*@constructor$");
-    @NonNls
-    private static final Pattern ourJSDocFinalPattern = Pattern.compile("^\\s*@final$");
-    @NonNls
-    private static final Pattern ourJSDocPrivatePattern = Pattern.compile("^\\s*@private$");
-    @NonNls
-    private static final Pattern ourJSDocPublicPattern = Pattern.compile("^\\s*@public$");
-    @NonNls
-    private static final Pattern ourJSDocProtectedPattern = Pattern.compile("^\\s*@protected$");
-    @NonNls
-    private static final Pattern ourJSDocOptionalPattern = Pattern.compile("^\\s*@optional(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocStaticPattern = Pattern.compile("^\\s*@static$");
-    @NonNls
-    private static final Pattern ourJSDocSeePattern = Pattern.compile("^\\s*@see (.*)$");
-    @NonNls
-    private static final Pattern ourJSDocDescriptionPattern = Pattern.compile("^\\s*@description\\s*(.+)$");
-    @NonNls
-    private static final Pattern ourJSDocReturnPattern =
+    private static final Pattern DOJO_PARAMETERS_PATTERN = Pattern.compile("^\\s*(\\w+):(.*)$");
+    private static final Pattern JS_DOC_PARAMETERS_PATTERN = Pattern.compile(
+        "^\\s*@param\\s*(?:\\{([^}]+)}\\s*)?(\\w+)?(?:\\s:\\s(\\S+))?(?:\\s*\\[(\\w+)(?:\\.(\\w+))?(?:=([^\\]]*))?])?(.*)$"
+    );
+    private static final Pattern JS_DOC_EVENT_PATTERN = Pattern.compile("^\\s*@event\\s*(\\w+)(?:\\s:\\s(\\S+))?(.*)$");
+    private static final Pattern JS_DOC_REMARK_PATTERN = Pattern.compile("^\\s*@remarks (.*)$");
+    private static final Pattern JS_DOC_METHOD_PATTERN = Pattern.compile("^\\s*@method\\s*(\\w+)(.*)$");
+    private static final Pattern JS_DOC_CLASS_PATTERN = Pattern.compile("^\\s*@class\\s*(\\w+(?:\\.\\w+)*)(.*)$");
+    private static final Pattern JS_DOC_DEPRECATED_PATTERN = Pattern.compile("^\\s*@deprecated\\s*(.*)$");
+    private static final Pattern JS_DOC_CONSTRUCTOR_PATTERN = Pattern.compile("^\\s*@constructor$");
+    private static final Pattern JS_DOC_FINAL_PATTERN = Pattern.compile("^\\s*@final$");
+    private static final Pattern JS_DOC_PRIVATE_PATTERN = Pattern.compile("^\\s*@private$");
+    private static final Pattern JS_DOC_PUBLIC_PATTERN = Pattern.compile("^\\s*@public$");
+    private static final Pattern JS_DOC_PROTECTED_PATTERN = Pattern.compile("^\\s*@protected$");
+    private static final Pattern JS_DOC_OPTIONAL_PATTERN = Pattern.compile("^\\s*@optional(.*)$");
+    private static final Pattern JS_DOC_STATIC_PATTERN = Pattern.compile("^\\s*@static$");
+    private static final Pattern JS_DOC_SEE_PATTERN = Pattern.compile("^\\s*@see (.*)$");
+    private static final Pattern JS_DOC_DESCRIPTION_PATTERN = Pattern.compile("^\\s*@description\\s*(.+)$");
+    private static final Pattern JS_DOC_RETURN_PATTERN =
         Pattern.compile("^\\s*@return(?:s)?\\s*(?:(?:\\{|:)?\\s*([^\\s\\}]+)\\s*\\}?\\s*)?(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocNamespacePattern = Pattern.compile("^\\s*@namespace\\s*([\\w\\.]+)(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocPropertyPattern = Pattern.compile("^\\s*@property\\s*(\\w+)(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocTypePattern = Pattern.compile("^\\s*@type\\s*\\{?([^\\s\\}]+)\\}?(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocRequiresPattern = Pattern.compile("^\\s*@requires\\s*(\\S+)(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocDefaultPattern = Pattern.compile("^\\s*@default\\s*(.*)$");
-    @NonNls
-    private static final Pattern ourJSDocExtendsPattern = Pattern.compile("^\\s*@extends\\s*(.*)$");
-    @NonNls
-    private static final Map<Pattern, String> patternToHintMap = new HashMap<>();
-    @NonNls
-    private static final Map<Pattern, JSDocumentationProcessor.MetaDocType> patternToMetaDocTypeMap = new HashMap<>();
+    private static final Pattern JS_DOC_NAMESPACE_PATTERN = Pattern.compile("^\\s*@namespace\\s*([\\w\\.]+)(.*)$");
+    private static final Pattern JS_DOC_PROPERTY_PATTERN = Pattern.compile("^\\s*@property\\s*(\\w+)(.*)$");
+    private static final Pattern JS_DOC_TYPE_PATTERN = Pattern.compile("^\\s*@type\\s*\\{?([^\\s\\}]+)\\}?(.*)$");
+    private static final Pattern JS_DOC_REQUIRES_PATTERN = Pattern.compile("^\\s*@requires\\s*(\\S+)(.*)$");
+    private static final Pattern JS_DOC_DEFAULT_PATTERN = Pattern.compile("^\\s*@default\\s*(.*)$");
+    private static final Pattern JS_DOC_EXTENDS_PATTERN = Pattern.compile("^\\s*@extends\\s*(.*)$");
+    private static final Map<Pattern, String> PATTERN_TO_HINT_MAP = new HashMap<>();
+    private static final Map<Pattern, JSDocumentationProcessor.MetaDocType> PATTERN_TO_META_DOC_TYPE_MAP = new HashMap<>();
 
     static {
-        patternToHintMap.put(ourDojoParametersPattern, ":");
-        patternToMetaDocTypeMap.put(ourDojoParametersPattern, JSDocumentationProcessor.MetaDocType.PARAMETER);
-        patternToHintMap.put(ourJSDocParametersPattern, "@pa");
-        patternToMetaDocTypeMap.put(ourJSDocParametersPattern, JSDocumentationProcessor.MetaDocType.PARAMETER);
+        PATTERN_TO_HINT_MAP.put(DOJO_PARAMETERS_PATTERN, ":");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(DOJO_PARAMETERS_PATTERN, JSDocumentationProcessor.MetaDocType.PARAMETER);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_PARAMETERS_PATTERN, "@pa");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_PARAMETERS_PATTERN, JSDocumentationProcessor.MetaDocType.PARAMETER);
 
-        patternToHintMap.put(ourJSDocMethodPattern, "@m");
-        patternToMetaDocTypeMap.put(ourJSDocMethodPattern, JSDocumentationProcessor.MetaDocType.METHOD);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_METHOD_PATTERN, "@m");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_METHOD_PATTERN, JSDocumentationProcessor.MetaDocType.METHOD);
 
-        patternToHintMap.put(ourJSDocOptionalPattern, "@o");
-        patternToMetaDocTypeMap.put(ourJSDocOptionalPattern, JSDocumentationProcessor.MetaDocType.OPTIONAL_PARAMETERS);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_OPTIONAL_PATTERN, "@o");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_OPTIONAL_PATTERN, JSDocumentationProcessor.MetaDocType.OPTIONAL_PARAMETERS);
 
-        patternToHintMap.put(ourJSDocEventPattern, "@ev");
-        patternToMetaDocTypeMap.put(ourJSDocEventPattern, JSDocumentationProcessor.MetaDocType.EVENT);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_EVENT_PATTERN, "@ev");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_EVENT_PATTERN, JSDocumentationProcessor.MetaDocType.EVENT);
 
-        patternToHintMap.put(ourJSDocExtendsPattern, "@ex");
-        patternToMetaDocTypeMap.put(ourJSDocExtendsPattern, JSDocumentationProcessor.MetaDocType.EXTENDS);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_EXTENDS_PATTERN, "@ex");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_EXTENDS_PATTERN, JSDocumentationProcessor.MetaDocType.EXTENDS);
 
-        patternToHintMap.put(ourJSDocRemarkPattern, "@rem");
-        patternToMetaDocTypeMap.put(ourJSDocRemarkPattern, JSDocumentationProcessor.MetaDocType.NOTE);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_REMARK_PATTERN, "@rem");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_REMARK_PATTERN, JSDocumentationProcessor.MetaDocType.NOTE);
 
-        patternToHintMap.put(ourJSDocReturnPattern, "@ret");
-        patternToMetaDocTypeMap.put(ourJSDocReturnPattern, JSDocumentationProcessor.MetaDocType.RETURN);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_RETURN_PATTERN, "@ret");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_RETURN_PATTERN, JSDocumentationProcessor.MetaDocType.RETURN);
 
-        patternToHintMap.put(ourJSDocPublicPattern, "@pu");
-        patternToMetaDocTypeMap.put(ourJSDocPublicPattern, JSDocumentationProcessor.MetaDocType.PUBLIC);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_PUBLIC_PATTERN, "@pu");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_PUBLIC_PATTERN, JSDocumentationProcessor.MetaDocType.PUBLIC);
 
-        patternToHintMap.put(ourJSDocProtectedPattern, "@prot");
-        patternToMetaDocTypeMap.put(ourJSDocProtectedPattern, JSDocumentationProcessor.MetaDocType.PROTECTED);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_PROTECTED_PATTERN, "@prot");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_PROTECTED_PATTERN, JSDocumentationProcessor.MetaDocType.PROTECTED);
 
-        patternToHintMap.put(ourJSDocStaticPattern, "@st");
-        patternToMetaDocTypeMap.put(ourJSDocStaticPattern, JSDocumentationProcessor.MetaDocType.STATIC);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_STATIC_PATTERN, "@st");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_STATIC_PATTERN, JSDocumentationProcessor.MetaDocType.STATIC);
 
-        patternToHintMap.put(ourJSDocSeePattern, "@se");
-        patternToMetaDocTypeMap.put(ourJSDocSeePattern, JSDocumentationProcessor.MetaDocType.SEE);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_SEE_PATTERN, "@se");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_SEE_PATTERN, JSDocumentationProcessor.MetaDocType.SEE);
 
-        patternToHintMap.put(ourJSDocDescriptionPattern, "@des");
-        patternToMetaDocTypeMap.put(ourJSDocDescriptionPattern, JSDocumentationProcessor.MetaDocType.DESCRIPTION);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_DESCRIPTION_PATTERN, "@des");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_DESCRIPTION_PATTERN, JSDocumentationProcessor.MetaDocType.DESCRIPTION);
 
-        patternToHintMap.put(ourJSDocDeprecatedPattern, "@dep");
-        patternToMetaDocTypeMap.put(ourJSDocDeprecatedPattern, JSDocumentationProcessor.MetaDocType.DEPRECATED);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_DEPRECATED_PATTERN, "@dep");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_DEPRECATED_PATTERN, JSDocumentationProcessor.MetaDocType.DEPRECATED);
 
-        patternToHintMap.put(ourJSDocConstructorPattern, "@co");
+        PATTERN_TO_HINT_MAP.put(JS_DOC_CONSTRUCTOR_PATTERN, "@co");
 
-        patternToMetaDocTypeMap.put(ourJSDocConstructorPattern, JSDocumentationProcessor.MetaDocType.CONSTRUCTOR);
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_CONSTRUCTOR_PATTERN, JSDocumentationProcessor.MetaDocType.CONSTRUCTOR);
 
-        patternToHintMap.put(ourJSDocClassPattern, "@cl");
-        patternToMetaDocTypeMap.put(ourJSDocClassPattern, JSDocumentationProcessor.MetaDocType.CLASS);
-        patternToHintMap.put(ourJSDocPrivatePattern, "@pri");
-        patternToMetaDocTypeMap.put(ourJSDocPrivatePattern, JSDocumentationProcessor.MetaDocType.PRIVATE);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_CLASS_PATTERN, "@cl");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_CLASS_PATTERN, JSDocumentationProcessor.MetaDocType.CLASS);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_PRIVATE_PATTERN, "@pri");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_PRIVATE_PATTERN, JSDocumentationProcessor.MetaDocType.PRIVATE);
 
-        patternToHintMap.put(ourJSDocNamespacePattern, "@n");
-        patternToMetaDocTypeMap.put(ourJSDocNamespacePattern, JSDocumentationProcessor.MetaDocType.NAMESPACE);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_NAMESPACE_PATTERN, "@n");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_NAMESPACE_PATTERN, JSDocumentationProcessor.MetaDocType.NAMESPACE);
 
-        patternToHintMap.put(ourJSDocPropertyPattern, "@prop");
-        patternToHintMap.put(ourJSDocTypePattern, "@t");
-        patternToMetaDocTypeMap.put(ourJSDocTypePattern, JSDocumentationProcessor.MetaDocType.TYPE);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_PROPERTY_PATTERN, "@prop");
+        PATTERN_TO_HINT_MAP.put(JS_DOC_TYPE_PATTERN, "@t");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_TYPE_PATTERN, JSDocumentationProcessor.MetaDocType.TYPE);
 
-        patternToHintMap.put(ourJSDocFinalPattern, "@f");
-        patternToMetaDocTypeMap.put(ourJSDocFinalPattern, JSDocumentationProcessor.MetaDocType.FINAL);
-        patternToHintMap.put(ourJSDocRequiresPattern, "@req");
-        patternToMetaDocTypeMap.put(ourJSDocRequiresPattern, JSDocumentationProcessor.MetaDocType.REQUIRES);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_FINAL_PATTERN, "@f");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_FINAL_PATTERN, JSDocumentationProcessor.MetaDocType.FINAL);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_REQUIRES_PATTERN, "@req");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_REQUIRES_PATTERN, JSDocumentationProcessor.MetaDocType.REQUIRES);
 
-        patternToHintMap.put(ourJSDocDefaultPattern, "@def");
-        patternToMetaDocTypeMap.put(ourJSDocDefaultPattern, JSDocumentationProcessor.MetaDocType.DEFAULT);
+        PATTERN_TO_HINT_MAP.put(JS_DOC_DEFAULT_PATTERN, "@def");
+        PATTERN_TO_META_DOC_TYPE_MAP.put(JS_DOC_DEFAULT_PATTERN, JSDocumentationProcessor.MetaDocType.DEFAULT);
     }
 
-    private static final
-    @NonNls
-    Map<Pattern, String> prefixToPatternToHintMap = new HashMap<Pattern, String>();
+    private static final Map<Pattern, String> prefixToPatternToHintMap = new HashMap<>();
 
     static {
         prefixToPatternToHintMap.put(Pattern.compile("^\\s*description:(.*)$"), "descr");
 
-        prefixToPatternToHintMap.put(Pattern.compile("^ summary(?:\\:)?(.*)$"), "summ");
+        prefixToPatternToHintMap.put(Pattern.compile("^ summary(?::)?(.*)$"), "summ");
 
         prefixToPatternToHintMap.put(Pattern.compile("^\\s*\\*(?:\\*)?(.*)$"), "*");
 
@@ -252,7 +224,7 @@ public String nextElement() {
             String commentText = s.replace('\t', ' ');
 
             for (Map.Entry<Pattern, String> entry : prefixToPatternToHintMap.entrySet()) {
-                final Matcher matcher = commentText.indexOf(entry.getValue()) != -1 ? entry.getKey().matcher(commentText) : null;
+                final Matcher matcher = commentText.contains(entry.getValue()) ? entry.getKey().matcher(commentText) : null;
                 if (matcher == null) {
                     continue;
                 }
@@ -265,14 +237,14 @@ public String nextElement() {
 
             boolean matchedSomething = false;
 
-            for (Map.Entry<Pattern, String> entry : patternToHintMap.entrySet()) {
-                final Matcher matcher = commentText.indexOf(entry.getValue()) != -1 ? entry.getKey().matcher(commentText) : null;
+            for (Map.Entry<Pattern, String> entry : PATTERN_TO_HINT_MAP.entrySet()) {
+                final Matcher matcher = commentText.contains(entry.getValue()) ? entry.getKey().matcher(commentText) : null;
                 if (matcher == null) {
                     continue;
                 }
 
                 if (matcher.matches()) {
-                    final JSDocumentationProcessor.MetaDocType docType = patternToMetaDocTypeMap.get(entry.getKey());
+                    final JSDocumentationProcessor.MetaDocType docType = PATTERN_TO_META_DOC_TYPE_MAP.get(entry.getKey());
                     if (docType != null) {
                         final int groupCount = matcher.groupCount();
                         String remainingLineContent = groupCount > 0 ? matcher.group(groupCount) : null;
@@ -287,7 +259,7 @@ public String nextElement() {
                         final int groupForFieldName = 5;
                         String fieldName = null;
 
-                        if (groupCount == 7 && entry.getKey() == ourJSDocParametersPattern) {
+                        if (groupCount == 7 && entry.getKey() == JS_DOC_PARAMETERS_PATTERN) {
                             String paramNameInBracket = matcher.group(4);
 
                             if (paramNameInBracket != null) {
@@ -326,10 +298,8 @@ public String nextElement() {
                                 break;
                             }
                         }
-                        else {
-                            if (!processor.onPatternMatch(docType, matchName, matchValue, remainingLineContent, commentText, matched)) {
-                                break;
-                            }
+                        else if (!processor.onPatternMatch(docType, matchName, matchValue, remainingLineContent, commentText, matched)) {
+                            break;
                         }
                         if (reportAboutOptionalParameter) {
                             if (!processor.onPatternMatch(
@@ -382,10 +352,9 @@ else if (text.startsWith("/*") || text.startsWith("//")) {
         return text;
     }
 
-    static
     @Nullable
-    ASTNode findTrailingCommentInFunctionBody(final @Nonnull JSFunction function) {
-        final ASTNode block = function.getNode().findChildByType(JSElementTypes.BLOCK_STATEMENT);
+    static ASTNode findTrailingCommentInFunctionBody(@Nonnull JSFunction function) {
+        ASTNode block = function.getNode().findChildByType(JSElementTypes.BLOCK_STATEMENT);
         if (block == null) {
             return null;
         }
@@ -401,17 +370,16 @@ else if (prev.getPsi() instanceof JSStatement) {
         return null;
     }
 
-    static
     @Nullable
-    ASTNode findLeadingCommentInFunctionBody(final @Nonnull PsiElement element) {
-        final ASTNode functionNode = element.getNode();
-        final ASTNode block = functionNode.findChildByType(JSElementTypes.BLOCK_STATEMENT);
+    static ASTNode findLeadingCommentInFunctionBody(@Nonnull PsiElement element) {
+        ASTNode functionNode = element.getNode();
+        ASTNode block = functionNode.findChildByType(JSElementTypes.BLOCK_STATEMENT);
         if (block == null) {
             return null;
         }
 
         for (ASTNode node = block.getFirstChildNode().getTreeNext(); node != null; node = node.getTreeNext()) {
-            final IElementType nodeType = node.getElementType();
+            IElementType nodeType = node.getElementType();
 
             if (nodeType != TokenType.WHITE_SPACE) {
                 if (JSTokenTypes.COMMENTS.contains(nodeType)) {
@@ -424,28 +392,30 @@ ASTNode findLeadingCommentInFunctionBody(final @Nonnull PsiElement element) {
         return null;
     }
 
+    @RequiredReadAction
     public static PsiElement findDocComment(PsiElement element) {
         return findDocComment(element, null);
     }
 
+    @RequiredReadAction
     public static PsiElement findDocComment(PsiElement element, PsiElement context) {
         PsiElement docComment = null;
         boolean skippedExprStatementOnce = false;
 
         if (element instanceof JSAttributeListOwner jsClass && context == null) {
-            final JSAttributeList attributeList = jsClass.getAttributeList();
+            JSAttributeList attributeList = jsClass.getAttributeList();
             PsiElement anchor = null;
 
             if (attributeList != null) {
                 for (ASTNode currentNode = attributeList.getNode().getLastChildNode(); currentNode != null;
                      currentNode = currentNode.getTreePrev()) {
-                    final IElementType nodeType = currentNode.getElementType();
+                    IElementType nodeType = currentNode.getElementType();
 
                     if (!JSTokenTypes.MODIFIERS.contains(nodeType)
                         && nodeType != JSTokenTypes.WHITE_SPACE
                         && nodeType != JSElementTypes.REFERENCE_EXPRESSION // namespace
                     ) {
-                        final ASTNode nextNode = currentNode.getTreeNext();
+                        ASTNode nextNode = currentNode.getTreeNext();
                         if (nextNode != null) {
                             anchor = nextNode.getPsi();
                         }
@@ -509,68 +479,79 @@ else if (shouldSkipPrevExprStatement &&
         return docComment;
     }
 
-    private static
     @Nullable
-    String getPropertyNameFromExprStatement(@Nonnull PsiElement element) {
+    @RequiredReadAction
+    private static String getPropertyNameFromExprStatement(@Nonnull PsiElement element) {
         String propName = null;
 
         if (element instanceof JSExpressionStatement expressionStatement
-            && expressionStatement.getExpression() instanceof JSAssignmentExpression assignmentExpression
-            && assignmentExpression.getROperand() instanceof JSFunctionExpression functionExpression) {
-            String name = functionExpression.getName();
-            if (name != null && (StringUtil.startsWith(name, "get") || (StringUtil.startsWith(name, "set")))) {
+            && expressionStatement.getExpression() instanceof JSAssignmentExpression assignment
+            && assignment.getROperand() instanceof JSFunctionExpression functionExpr) {
+            String name = functionExpr.getName();
+            if (name != null && (StringUtil.startsWith(name, "get") || StringUtil.startsWith(name, "set"))) {
                 propName = name.substring(3);
             }
         }
         return propName;
     }
 
-    private static String findTypeFromParameter(final JSVariable parameter, final PsiElement docComment) {
+    private static String findTypeFromParameter(JSVariable parameter, PsiElement docComment) {
         if (docComment != null) {
-            final String[] detectedType = new String[1];
-
-            processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor() {
-                final String name = parameter.getName();
-                final boolean isparameter = parameter instanceof JSParameter;
+            String[] detectedType = new String[1];
 
-                @Override
-                public boolean needsPlainCommentData() {
-                    return false;
-                }
-
-                @Override
-                public boolean onCommentLine(@Nonnull final String line) {
-                    return true;
-                }
+            processDocumentationTextFromComment(
+                docComment.getNode(),
+                new JSDocumentationProcessor() {
+                    String name = parameter.getName();
+                    boolean isparameter = parameter instanceof JSParameter;
 
-                @Override
-                public boolean onPatternMatch(
-                    @Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-                    @Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched
-                ) {
-                    if (isparameter && type == MetaDocType.PARAMETER && matchName != null && matchName.equals(name)) {
-                        detectedType[0] = matchValue;
+                    @Override
+                    public boolean needsPlainCommentData() {
                         return false;
                     }
-                    else if (type == MetaDocType.TYPE) {
-                        detectedType[0] = matchName;
-                        return false;
+
+                    @Override
+                    public boolean onCommentLine(@Nonnull String line) {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean onPatternMatch(
+                        @Nonnull MetaDocType type,
+                        @Nullable String matchName,
+                        @Nullable String matchValue,
+                        @Nullable String remainingLineContent,
+                        @Nonnull String line,
+                        String patternMatched
+                    ) {
+                        if (isparameter && type == MetaDocType.PARAMETER && matchName != null && matchName.equals(name)) {
+                            detectedType[0] = matchValue;
+                            return false;
+                        }
+                        else if (type == MetaDocType.TYPE) {
+                            detectedType[0] = matchName;
+                            return false;
+                        }
+                        return true;
                     }
-                    return true;
                 }
-            });
+            );
 
             return detectedType[0];
         }
         return null;
     }
 
-    public static final TokenSet ourPrimitiveTypeFilter = TokenSet.create(JSTokenTypes.INT_KEYWORD, JSTokenTypes.UINT_KEYWORD,
-        JSTokenTypes.VOID_KEYWORD, JSTokenTypes.ANY_IDENTIFIER
+    public static final TokenSet PRIMITIVE_TYPE_FILTER = TokenSet.create(
+        JSTokenTypes.INT_KEYWORD,
+        JSTokenTypes.UINT_KEYWORD,
+        JSTokenTypes.VOID_KEYWORD,
+        JSTokenTypes.ANY_IDENTIFIER
     );
-    public static final TokenSet ourTypeFilter =
-        TokenSet.orSet(TokenSet.create(JSElementTypes.REFERENCE_EXPRESSION), ourPrimitiveTypeFilter);
+    public static final TokenSet TYPE_FILTER =
+        TokenSet.orSet(TokenSet.create(JSElementTypes.REFERENCE_EXPRESSION), PRIMITIVE_TYPE_FILTER);
 
+    @RequiredReadAction
     private static String findDocForAnchor(final PsiElement _anchor, final JSDocumentationProcessor.MetaDocType... expectedTypes) {
         PsiElement anchor = _anchor;
         if (_anchor instanceof JSExpression) {
@@ -578,50 +559,57 @@ private static String findDocForAnchor(final PsiElement _anchor, final JSDocumen
         }
 
         if (anchor != null) {
-            final PsiElement docComment = findDocComment(anchor);
+            PsiElement docComment = findDocComment(anchor);
 
             if (docComment != null) {
-                final Ref<String> detectedType = new Ref<>();
-
-                final PsiElement anchor1 = anchor;
-                processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor() {
-                    @Override
-                    public boolean needsPlainCommentData() {
-                        return false;
-                    }
+                final SimpleReference<String> detectedType = new SimpleReference<>();
+
+                processDocumentationTextFromComment(
+                    docComment.getNode(),
+                    new JSDocumentationProcessor() {
+                        @Override
+                        public boolean needsPlainCommentData() {
+                            return false;
+                        }
 
-                    @Override
-                    public boolean onCommentLine(@Nonnull final String line) {
-                        return true;
-                    }
+                        @Override
+                        public boolean onCommentLine(@Nonnull final String line) {
+                            return true;
+                        }
 
-                    @Override
-                    public boolean onPatternMatch(
-                        @Nonnull final MetaDocType type, @Nullable final String matchName, @Nullable final String matchValue,
-                        @Nullable final String remainingLineContent, @Nonnull final String line, final String patternMatched
-                    ) {
-                        for (MetaDocType expectedType : expectedTypes) {
-                            if (type == expectedType) {
-                                if (type == MetaDocType.TYPE && _anchor instanceof JSFunction function) {
-                                    final JSParameterList jsParameterList = function.getParameterList();
-                                    if (jsParameterList != null && jsParameterList.getParameters().length > 0) {
-                                        return true;
+                        @Override
+                        @RequiredReadAction
+                        public boolean onPatternMatch(
+                            @Nonnull MetaDocType type,
+                            @Nullable String matchName,
+                            @Nullable String matchValue,
+                            @Nullable String remainingLineContent,
+                            @Nonnull String line,
+                            String patternMatched
+                        ) {
+                            for (MetaDocType expectedType : expectedTypes) {
+                                if (type == expectedType) {
+                                    if (type == MetaDocType.TYPE && _anchor instanceof JSFunction function) {
+                                        final JSParameterList jsParameterList = function.getParameterList();
+                                        if (jsParameterList != null && jsParameterList.getParameters().length > 0) {
+                                            return true;
+                                        }
+                                        if (_anchor.getParent() instanceof JSProperty) {
+                                            return true;
+                                        }
                                     }
-                                    if (_anchor.getParent() instanceof JSProperty) {
-                                        return true;
+                                    else if (type == MetaDocType.RETURN) {
+                                        //if (!isOurDocComment()) return true;
                                     }
-                                }
-                                else if (type == MetaDocType.RETURN) {
-                                    //if (!isOurDocComment()) return true;
-                                }
 
-                                detectedType.set(matchName);
-                                return false;
+                                    detectedType.set(matchName);
+                                    return false;
+                                }
                             }
+                            return true;
                         }
-                        return true;
                     }
-                });
+                );
 
                 return detectedType.get();
             }
@@ -629,10 +617,12 @@ else if (type == MetaDocType.RETURN) {
         return null;
     }
 
+    @RequiredReadAction
     public static String findType(final PsiElement def) {
         return findDocForAnchor(def, JSDocumentationProcessor.MetaDocType.TYPE);
     }
 
+    @RequiredReadAction
     public static boolean isDeprecated(PsiElement element) {
         if (element instanceof JSClass jsClass) {
             return jsClass.isDeprecated();
@@ -650,6 +640,7 @@ else if (element instanceof JSNamespaceDeclaration namespaceDeclaration) {
         return calculateDeprecated(element);
     }
 
+    @RequiredReadAction
     public static boolean calculateDeprecated(PsiElement element) {
         if (element instanceof JSExpression) {
             element = PsiTreeUtil.getParentOfType(element, JSStatement.class, JSProperty.class);
@@ -659,33 +650,36 @@ public static boolean calculateDeprecated(PsiElement element) {
         if (docComment != null) {
             final boolean[] deprecatedStatus = new boolean[1];
 
-            processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor() {
-                @Override
-                public boolean needsPlainCommentData() {
-                    return false;
-                }
+            processDocumentationTextFromComment(
+                docComment.getNode(),
+                new JSDocumentationProcessor() {
+                    @Override
+                    public boolean needsPlainCommentData() {
+                        return false;
+                    }
 
-                @Override
-                public boolean onCommentLine(@Nonnull final String line) {
-                    return true;
-                }
+                    @Override
+                    public boolean onCommentLine(@Nonnull final String line) {
+                        return true;
+                    }
 
-                @Override
-                public boolean onPatternMatch(
-                    @Nonnull final MetaDocType type,
-                    @Nullable final String matchName,
-                    @Nullable final String matchValue,
-                    @Nullable final String remainingLineContent,
-                    @Nonnull final String line,
-                    final String patternMatched
-                ) {
-                    if (type == MetaDocType.DEPRECATED) {
-                        deprecatedStatus[0] = true;
-                        return false;
+                    @Override
+                    public boolean onPatternMatch(
+                        @Nonnull MetaDocType type,
+                        @Nullable String matchName,
+                        @Nullable String matchValue,
+                        @Nullable String remainingLineContent,
+                        @Nonnull String line,
+                        String patternMatched
+                    ) {
+                        if (type == MetaDocType.DEPRECATED) {
+                            deprecatedStatus[0] = true;
+                            return false;
+                        }
+                        return true;
                     }
-                    return true;
                 }
-            });
+            );
 
             return deprecatedStatus[0];
         }
@@ -695,9 +689,9 @@ public boolean onPatternMatch(
     public static void appendHyperLinkToElement(
         @Nullable PsiElement element,
         String elementName,
-        final StringBuilder buffer,
-        final String presentableName,
-        final @Nullable String presentableFileName
+        StringBuilder buffer,
+        String presentableName,
+        @Nullable String presentableFileName
     ) {
         final PsiFile containingFile = element != null ? element.getContainingFile() : null;
         String fileName = containingFile == null
@@ -715,6 +709,7 @@ public static void appendHyperLinkToElement(
         );
     }
 
+    @RequiredReadAction
     private static String evaluateTypeFromParameter(final JSParameter parameter) {
         String s = evaluateTypeFromVariable(parameter);
 
@@ -725,6 +720,7 @@ private static String evaluateTypeFromParameter(final JSParameter parameter) {
         return s;
     }
 
+    @RequiredReadAction
     private static PsiElement findFunctionComment(JSParameter parameter) {
         PsiElement anchor = PsiTreeUtil.getParentOfType(parameter, JSFunction.class);
 
@@ -738,6 +734,7 @@ private static PsiElement findFunctionComment(JSParameter parameter) {
         return null;
     }
 
+    @RequiredReadAction
     private static String evaluateTypeFromFunction(final JSFunction function) {
         final ASTNode lastCommentInFunctionBody = findTrailingCommentInFunctionBody(function);
 
@@ -752,6 +749,7 @@ private static String evaluateTypeFromFunction(final JSFunction function) {
         return typeString;
     }
 
+    @RequiredReadAction
     private static String evaluateTypeFromVariable(final JSVariable variable) {
         PsiElement prevSibling = variable.getFirstChild();
         if (prevSibling != null && prevSibling.getNode().getElementType() == JSTokenTypes.IDENTIFIER) {
@@ -787,6 +785,7 @@ private static String evaluateTypeFromVariable(final JSVariable variable) {
         return null;
     }
 
+    @RequiredReadAction
     public static String findTypeFromComments(final JSNamedElement element) {
         if (element instanceof JSParameter parameter) {
             return evaluateTypeFromParameter(parameter);
@@ -809,6 +808,7 @@ public static boolean isSymbolReference(String content) {
         return text.indexOf('.') != -1 || text.indexOf('#') != -1;
     }
 
+    @RequiredReadAction
     public static boolean findOptionalStatusFromComments(final JSParameter parameter) {
         PsiElement docComment = findFunctionComment(parameter);
         if (docComment == null) {
@@ -817,36 +817,39 @@ public static boolean findOptionalStatusFromComments(final JSParameter parameter
 
         final boolean[] detectedType = new boolean[1];
 
-        processDocumentationTextFromComment(docComment.getNode(), new JSDocumentationProcessor() {
-            final String name = parameter.getName();
-
-            @Override
-            public boolean needsPlainCommentData() {
-                return false;
-            }
-
-            @Override
-            public boolean onCommentLine(@Nonnull final String line) {
-                return true;
-            }
+        processDocumentationTextFromComment(
+            docComment.getNode(),
+            new JSDocumentationProcessor() {
+                final String name = parameter.getName();
 
-            @Override
-            public boolean onPatternMatch(
-                @Nonnull final MetaDocType type,
-                @Nullable final String matchName,
-                @Nullable final String matchValue,
-                @Nullable final String remainingLineContent,
-                @Nonnull final String line,
-                final String patternMatched
-            ) {
-                if (type == MetaDocType.OPTIONAL_PARAMETERS && matchName != null && matchName.equals(name) && matchValue == null) {
-                    detectedType[0] = true;
+                @Override
+                public boolean needsPlainCommentData() {
                     return false;
                 }
 
-                return true;
+                @Override
+                public boolean onCommentLine(@Nonnull String line) {
+                    return true;
+                }
+
+                @Override
+                public boolean onPatternMatch(
+                    @Nonnull MetaDocType type,
+                    @Nullable String matchName,
+                    @Nullable String matchValue,
+                    @Nullable String remainingLineContent,
+                    @Nonnull String line,
+                    String patternMatched
+                ) {
+                    if (type == MetaDocType.OPTIONAL_PARAMETERS && matchName != null && matchName.equals(name) && matchValue == null) {
+                        detectedType[0] = true;
+                        return false;
+                    }
+
+                    return true;
+                }
             }
-        });
+        );
 
         return detectedType[0];
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
index 1dad91a4..8abcc576 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
@@ -20,10 +20,10 @@
 import com.intellij.lang.javascript.psi.JSImportStatement;
 import com.intellij.lang.javascript.psi.resolve.JSImportedElementResolveResult;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiNamedElement;
 import consulo.util.collection.ArrayUtil;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
@@ -35,9 +35,7 @@
  */
 public class FlexImportSupport {
     // flex2.compiler.mxml.lang.StandardDefs
-    private static
-    @NonNls
-    String[] standardMxmlImports = new String[]{
+    private static final String[] STANDARD_MXML_IMPORTS = new String[]{
         "mx.styles.*",
         "mx.binding.*",
         "mx.core.mx_internal",
@@ -49,9 +47,7 @@ public class FlexImportSupport {
         "mx.core.DeferredInstanceFromFunction",
     };
 
-    private static
-    @NonNls
-    String[] airOnlyImplicitImports = new String[]{
+    private static final String[] AIR_ONLY_IMPLICIT_IMPORTS = new String[]{
         "flash.data.*",
         "flash.desktop.*",
         "flash.filesystem.*",
@@ -59,9 +55,7 @@ public class FlexImportSupport {
         "flash.html.script.*"
     };
 
-    private static
-    @NonNls
-    String[] implicitImports = new String[]{
+    private static final String[] IMPLICIT_IMPORTS = new String[]{
         "flash.accessibility.*",
         "flash.debugger.*",
         "flash.display.*",
@@ -81,57 +75,57 @@ public class FlexImportSupport {
         "flash.xml.*"
     };
 
-    private static final Map<String, Object> implicitImportListMap = new HashMap<String, Object>();
-    private static final Map<String, Object> mxmlImportListMap = new HashMap<String, Object>();
+    private static final Map<String, Object> IMPLICIT_IMPORT_LIST_MAP = new HashMap<>();
+    private static final Map<String, Object> MXML_IMPORT_LIST_MAP = new HashMap<>();
 
     static {
-        fillMapFromImportsArray(implicitImports, implicitImportListMap);
-        fillMapFromImportsArray(standardMxmlImports, mxmlImportListMap);
+        fillMapFromImportsArray(IMPLICIT_IMPORTS, IMPLICIT_IMPORT_LIST_MAP);
+        fillMapFromImportsArray(STANDARD_MXML_IMPORTS, MXML_IMPORT_LIST_MAP);
     }
 
-    private static void fillMapFromImportsArray(final String[] strings, final Map<String, Object> map) {
+    @RequiredReadAction
+    private static void fillMapFromImportsArray(String[] strings, Map<String, Object> map) {
         for (String s : strings) {
             doAppendToMap(map, s);
         }
     }
 
-    public static void appendToMap(final Map<String, Object> map, final JSImportStatement importStatement) {
+    @RequiredReadAction
+    public static void appendToMap(Map<String, Object> map, JSImportStatement importStatement) {
         doAppendToMap(map, importStatement);
     }
 
-    private static void doAppendToMap(final Map<String, Object> map, final Object stringOrStatement) {
+    @RequiredReadAction
+    private static void doAppendToMap(Map<String, Object> map, Object stringOrStatement) {
         String s = stringOrStatement instanceof String string ? string : ((JSImportStatement)stringOrStatement).getImportText();
 
-        final int index = s.lastIndexOf('.');
+        int index = s.lastIndexOf('.');
         if (index == -1) {
             return; // nothing to import, global symbol
         }
-        final String key = s.substring(index + 1);
-        final Object o = map.get(key);
+        String key = s.substring(index + 1);
+        Object o = map.get(key);
 
         if (o == null) {
             map.put(key, stringOrStatement);
         }
-        else if (o instanceof Object[]) {
-            map.put(key, ArrayUtil.append((Object[])o, stringOrStatement));
+        else if (o instanceof Object[] objects) {
+            map.put(key, ArrayUtil.append(objects, stringOrStatement));
         }
         else {
-            map.put(key, new Object[]{
-                stringOrStatement,
-                o
-            });
+            map.put(key, new Object[]{stringOrStatement, o});
         }
     }
 
     public static JSImportedElementResolveResult resolveTypeNameUsingImplicitImports(@Nonnull String referenceName, @Nonnull JSFile file) {
-        final PsiElement context = file.getContext();
+        PsiElement context = file.getContext();
 
         if (context != null) {
-            JSImportedElementResolveResult expression = tryFindInMap(referenceName, file, implicitImportListMap, null);
+            JSImportedElementResolveResult expression = tryFindInMap(referenceName, file, IMPLICIT_IMPORT_LIST_MAP, null);
             if (expression != null) {
                 return expression;
             }
-            expression = tryFindInMap(referenceName, file, mxmlImportListMap, null);
+            expression = tryFindInMap(referenceName, file, MXML_IMPORT_LIST_MAP, null);
             if (expression != null) {
                 return expression;
             }
@@ -139,11 +133,10 @@ public static JSImportedElementResolveResult resolveTypeNameUsingImplicitImports
         return null;
     }
 
-
     public static JSImportedElementResolveResult tryFindInMap(
-        final String referenceName,
-        final PsiNamedElement file,
-        final Map<String, Object> map,
+        String referenceName,
+        PsiNamedElement file,
+        Map<String, Object> map,
         String qName
     ) {
         JSImportedElementResolveResult resolveResult = tryEntry(map.get(referenceName), referenceName, file, qName);
@@ -154,9 +147,9 @@ public static JSImportedElementResolveResult tryFindInMap(
     }
 
     public static JSImportedElementResolveResult tryFindInMap(
-        final String referenceName,
-        final PsiNamedElement file,
-        final Map<String, Object> map
+        String referenceName,
+        PsiNamedElement file,
+        Map<String, Object> map
     ) {
         return tryFindInMap(referenceName, file, map, null);
     }
@@ -165,8 +158,8 @@ private static JSImportedElementResolveResult tryEntry(Object entry, String refe
         if (entry == null) {
             return null;
         }
-        else if (entry instanceof Object[]) {
-            for (Object entryItem : (Object[])entry) {
+        else if (entry instanceof Object[] entryItems) {
+            for (Object entryItem : entryItems) {
                 JSImportedElementResolveResult expression = tryFindClass(referenceName, file, entryItem, qName);
                 if (expression != null) {
                     return expression;
@@ -179,10 +172,11 @@ else if (entry instanceof Object[]) {
         }
     }
 
+    @RequiredReadAction
     private static JSImportedElementResolveResult tryFindClass(
-        final String referenceName,
-        final PsiNamedElement file,
-        final Object entry,
+        String referenceName,
+        PsiNamedElement file,
+        Object entry,
         String qName
     ) {
         String importString = entry instanceof String string ? string : ((JSImportStatement)entry).getImportText();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
index c8489903..94ea4f99 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
@@ -41,14 +41,14 @@ public interface JSResolveHelper {
 
     // TODO: drop module
     @Nullable
-    PsiElement findClassByQName(final String link, final Project project, final String className, GlobalSearchScope scope);
+    PsiElement findClassByQName(String link, Project project, String className, GlobalSearchScope scope);
 
-    void importClass(final PsiScopeProcessor processor, final PsiNamedElement file, final String packageQualifierText);
+    void importClass(PsiScopeProcessor processor, PsiNamedElement file, String packageQualifierText);
 
     boolean processPackage(
-        final String packageQualifierText,
+        String packageQualifierText,
         String resolvedName,
-        final Processor<VirtualFile> processor,
+        Processor<VirtualFile> processor,
         GlobalSearchScope globalSearchScope,
         Project project
     );
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index e61cd9bf..4eadc096 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -254,13 +254,13 @@ public boolean doImportFromScripts(PsiScopeProcessor processor, PsiElement place
             }
 
             if (adequatePlace && processor instanceof ResolveProcessor resolveProcessor && !processComponentNames(resolveProcessor)) {
-                return false;
+                    return false;
+                }
             }
-        }
 
         return !(processor instanceof ResolveProcessor) || !JSResolveUtil.shouldProcessTopLevelGlobalContext(place, processor)
             || !notResolvingTypeViaImport || JSResolveUtil.processGlobalThings(processor, ResolveState.initial(), place, this);
-    }
+            }
 
     @RequiredReadAction
     public boolean processComponentNames(ResolveProcessor processor) {
@@ -294,32 +294,32 @@ public boolean processComponentNames(ResolveProcessor processor) {
     private static final String SCRIPT_TAG_NAME = "Script";
 
     private static final UserDataCache<CachedValue<JSFile[]>, XmlTag, Object> CACHED_SCRIPTS = new UserDataCache<>() {
-        @Override
-        protected CachedValue<JSFile[]> compute(XmlTag tag, Object p) {
-            return CachedValuesManager.getManager(tag.getProject()).createCachedValue(
-                () -> {
-                    List<JSFile> injectedFiles = new ArrayList<>(2);
-                    List<PsiElement> dependencies = new ArrayList<>();
-                    dependencies.add(tag);
-                    new InjectedScriptsVisitor(
-                        tag,
-                        doProcessAllTags(tag),
-                        false,
-                        false,
-                        (rootTag, file) -> {
-                            injectedFiles.add(file);
-                            dependencies.add(file);
-                        }
-                    ).go();
-                    return new CachedValueProvider.Result<>(
-                        injectedFiles.toArray(new JSFile[injectedFiles.size()]),
-                        dependencies.toArray()
-                    );
-                },
-                false
-            );
-        }
-    };
+            @Override
+            protected CachedValue<JSFile[]> compute(XmlTag tag, Object p) {
+                return CachedValuesManager.getManager(tag.getProject()).createCachedValue(
+                    () -> {
+                        List<JSFile> injectedFiles = new ArrayList<>(2);
+                        List<PsiElement> dependencies = new ArrayList<>();
+                        dependencies.add(tag);
+                        new InjectedScriptsVisitor(
+                            tag,
+                            doProcessAllTags(tag),
+                            false,
+                            false,
+                            (rootTag, file) -> {
+                                injectedFiles.add(file);
+                                dependencies.add(file);
+                            }
+                        ).go();
+                        return new CachedValueProvider.Result<>(
+                            injectedFiles.toArray(new JSFile[injectedFiles.size()]),
+                            dependencies.toArray()
+                        );
+                    },
+                    false
+                );
+            }
+        };
 
     private static final UserDataCache<CachedValue<Map<String, String>>, XmlFile, Object> CACHED_COMPONENT_IMPORTS_CACHE =
         new UserDataCache<>() {
@@ -420,7 +420,7 @@ public static XmlBackedJSClassImpl getContainingComponent(XmlElement element) {
     private static final UserDataCache<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>, XmlTag, Object> myCachedClassCache =
         new UserDataCache<>() {
             @Override
-            protected ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag> compute(final XmlTag tag, final Object p) {
+            protected ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag> compute(XmlTag tag, Object p) {
                 return CachedValuesManager.getManager(tag.getProject()).createParameterizedCachedValue(
                     (ParameterizedCachedValueProvider<XmlBackedJSClassImpl, XmlTag>)tag1 ->
                         new CachedValueProvider.Result<>(new XmlBackedJSClassImpl(tag1), tag1),
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
index 1650fbbc..c39bef90 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
@@ -31,98 +31,95 @@
 import java.util.Map;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 27, 2005
- * Time: 11:22:04 PM
+ * @author max
+ * @since 2005-01-27
  */
 @Deprecated
 public class JSHighlighter extends SyntaxHighlighterBase implements JavaScriptSyntaxHighlightKeys {
-    private static Map<IElementType, TextAttributesKey> keys1;
-    private static Map<IElementType, TextAttributesKey> keys2;
+    private static final Map<IElementType, TextAttributesKey> KEYS_1;
+    private static final Map<IElementType, TextAttributesKey> KEYS_2;
     private final DialectOptionHolder myDialectOptionsHolder;
 
     public JSHighlighter(DialectOptionHolder dialectOptionsHolder) {
         myDialectOptionsHolder = dialectOptionsHolder;
     }
 
-    @Override
     @Nonnull
+    @Override
     public Lexer getHighlightingLexer() {
         return new JavaScriptHighlightingLexer(myDialectOptionsHolder);
     }
 
-
     static {
-        keys1 = new HashMap<>();
-        keys2 = new HashMap<>();
+        KEYS_1 = new HashMap<>();
+        KEYS_2 = new HashMap<>();
 
         SyntaxHighlighterBase.fillMap(
-            keys1,
+            KEYS_1,
             JSTokenTypes.OPERATIONS,
             JS_OPERATION_SIGN
         ); // we do need init OPERATIONS before KEYWORDS because has some
         // OPERATIONS to be KEYWORDS (is, as)
-        fillMap(keys1, JSTokenTypes.KEYWORDS, JS_KEYWORD);
+        fillMap(KEYS_1, JSTokenTypes.KEYWORDS, JS_KEYWORD);
 
-        keys1.put(StringEscapesTokenTypes.VALID_STRING_ESCAPE_TOKEN, JS_VALID_STRING_ESCAPE);
-        keys1.put(StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN, JS_INVALID_STRING_ESCAPE);
-        keys1.put(StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN, JS_INVALID_STRING_ESCAPE);
+        KEYS_1.put(StringEscapesTokenTypes.VALID_STRING_ESCAPE_TOKEN, JS_VALID_STRING_ESCAPE);
+        KEYS_1.put(StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN, JS_INVALID_STRING_ESCAPE);
+        KEYS_1.put(StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN, JS_INVALID_STRING_ESCAPE);
 
-        keys1.put(JSTokenTypes.NUMERIC_LITERAL, JS_NUMBER);
-        keys1.put(JSTokenTypes.STRING_LITERAL, JS_STRING);
-        keys1.put(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JS_STRING);
-        keys1.put(JSTokenTypes.REGEXP_LITERAL, JS_REGEXP);
+        KEYS_1.put(JSTokenTypes.NUMERIC_LITERAL, JS_NUMBER);
+        KEYS_1.put(JSTokenTypes.STRING_LITERAL, JS_STRING);
+        KEYS_1.put(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL, JS_STRING);
+        KEYS_1.put(JSTokenTypes.REGEXP_LITERAL, JS_REGEXP);
 
-        keys1.put(JSTokenTypes.LPAR, JS_PARENTHS);
-        keys1.put(JSTokenTypes.RPAR, JS_PARENTHS);
+        KEYS_1.put(JSTokenTypes.LPAR, JS_PARENTHS);
+        KEYS_1.put(JSTokenTypes.RPAR, JS_PARENTHS);
 
-        keys1.put(JSTokenTypes.LBRACE, JS_BRACES);
-        keys1.put(JSTokenTypes.RBRACE, JS_BRACES);
+        KEYS_1.put(JSTokenTypes.LBRACE, JS_BRACES);
+        KEYS_1.put(JSTokenTypes.RBRACE, JS_BRACES);
 
-        keys1.put(JSTokenTypes.LBRACKET, JS_BRACKETS);
-        keys1.put(JSTokenTypes.RBRACKET, JS_BRACKETS);
+        KEYS_1.put(JSTokenTypes.LBRACKET, JS_BRACKETS);
+        KEYS_1.put(JSTokenTypes.RBRACKET, JS_BRACKETS);
 
-        keys1.put(JSTokenTypes.COMMA, JS_COMMA);
-        keys1.put(JSTokenTypes.DOT, JS_DOT);
-        keys1.put(JSTokenTypes.SEMICOLON, JS_SEMICOLON);
+        KEYS_1.put(JSTokenTypes.COMMA, JS_COMMA);
+        KEYS_1.put(JSTokenTypes.DOT, JS_DOT);
+        KEYS_1.put(JSTokenTypes.SEMICOLON, JS_SEMICOLON);
 
-        keys1.put(JSTokenTypes.C_STYLE_COMMENT, JS_BLOCK_COMMENT);
-        keys1.put(JSTokenTypes.XML_STYLE_COMMENT, JS_BLOCK_COMMENT);
-        keys1.put(JSTokenTypes.DOC_COMMENT, JS_DOC_COMMENT);
-        keys1.put(JSTokenTypes.END_OF_LINE_COMMENT, JS_LINE_COMMENT);
-        keys1.put(JSTokenTypes.BAD_CHARACTER, JS_BAD_CHARACTER);
+        KEYS_1.put(JSTokenTypes.C_STYLE_COMMENT, JS_BLOCK_COMMENT);
+        KEYS_1.put(JSTokenTypes.XML_STYLE_COMMENT, JS_BLOCK_COMMENT);
+        KEYS_1.put(JSTokenTypes.DOC_COMMENT, JS_DOC_COMMENT);
+        KEYS_1.put(JSTokenTypes.END_OF_LINE_COMMENT, JS_LINE_COMMENT);
+        KEYS_1.put(JSTokenTypes.BAD_CHARACTER, JS_BAD_CHARACTER);
 
-        keys1.put(JSDocTokenTypes.DOC_TAG_NAME, JS_DOC_COMMENT);
-        keys2.put(JSDocTokenTypes.DOC_TAG_NAME, JS_DOC_TAG);
+        KEYS_1.put(JSDocTokenTypes.DOC_TAG_NAME, JS_DOC_COMMENT);
+        KEYS_2.put(JSDocTokenTypes.DOC_TAG_NAME, JS_DOC_TAG);
 
         IElementType[] javadoc = IElementType.enumerate(type -> type instanceof JSDocElementType);
 
         for (IElementType type : javadoc) {
-            keys1.put(type, JS_DOC_COMMENT);
+            KEYS_1.put(type, JS_DOC_COMMENT);
         }
 
-        keys1.put(JSTokenTypes.JSDOC_TAG_DATA, JS_DOC_COMMENT);
+        KEYS_1.put(JSTokenTypes.JSDOC_TAG_DATA, JS_DOC_COMMENT);
 
         for (IElementType type : JSTokenTypes.XML_TOKENS.getTypes()) {
-            keys1.put(type, XmlHighlighterColors.XML_TAG);
+            KEYS_1.put(type, XmlHighlighterColors.XML_TAG);
         }
 
-        keys2.put(JSTokenTypes.XML_TAG_NAME, XmlHighlighterColors.XML_TAG_NAME);
-        keys2.put(JSTokenTypes.XML_NAME, XmlHighlighterColors.XML_ATTRIBUTE_NAME);
-        keys2.put(JSTokenTypes.XML_ATTR_VALUE, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-        keys2.put(JSTokenTypes.XML_ATTR_VALUE_END, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-        keys2.put(JSTokenTypes.XML_ATTR_VALUE_START, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-        keys2.put(JSTokenTypes.XML_ATTR_EQUAL, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
-        keys2.put(JSTokenTypes.XML_ENTITY_REF, XmlHighlighterColors.XML_ENTITY_REFERENCE);
+        KEYS_2.put(JSTokenTypes.XML_TAG_NAME, XmlHighlighterColors.XML_TAG_NAME);
+        KEYS_2.put(JSTokenTypes.XML_NAME, XmlHighlighterColors.XML_ATTRIBUTE_NAME);
+        KEYS_2.put(JSTokenTypes.XML_ATTR_VALUE, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        KEYS_2.put(JSTokenTypes.XML_ATTR_VALUE_END, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        KEYS_2.put(JSTokenTypes.XML_ATTR_VALUE_START, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        KEYS_2.put(JSTokenTypes.XML_ATTR_EQUAL, XmlHighlighterColors.XML_ATTRIBUTE_VALUE);
+        KEYS_2.put(JSTokenTypes.XML_ENTITY_REF, XmlHighlighterColors.XML_ENTITY_REFERENCE);
 
-        keys1.put(JSTokenTypes.XML_STYLE_COMMENT, XmlHighlighterColors.XML_COMMENT);
-        keys1.put(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
+        KEYS_1.put(JSTokenTypes.XML_STYLE_COMMENT, XmlHighlighterColors.XML_COMMENT);
+        KEYS_1.put(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
     }
 
-    @Override
     @Nonnull
-    public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
-        return pack(keys1.get(tokenType), keys2.get(tokenType));
+    @Override
+    public TextAttributesKey[] getTokenHighlights(@Nonnull IElementType tokenType) {
+        return pack(KEYS_1.get(tokenType), KEYS_2.get(tokenType));
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
index f524df6d..9a52047e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
@@ -29,7 +29,7 @@
 
 /**
  * @author max
- * @since 12:13:05 AM Feb 15, 2005
+ * @since 2005-02-15
  */
 public class JavaScriptHighlightingLexer extends LayeredLexer {
     public JavaScriptHighlightingLexer(Supplier<Lexer> baseLexerFactory) {
@@ -120,7 +120,7 @@ public int getBufferEnd() {
     }
 
     public static IElementType getTagContentTokenType() {
-        final Lexer highlightingLexer = getHtmlHighlightingLexer();
+        Lexer highlightingLexer = getHtmlHighlightingLexer();
         highlightingLexer.start("a", 0, 1, 0);
         return highlightingLexer.getTokenType();
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index f2c24579..78645637 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -21,9 +21,9 @@
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.component.util.Iconable;
 import consulo.language.icon.IconDescriptorUpdaters;
-import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.navigation.ItemPresentation;
 import consulo.ui.annotation.RequiredUIAccess;
@@ -32,7 +32,7 @@
 
 /**
  * @author Maxim.Mossienko
- * @since 9:55:49 PM Apr 7, 2006
+ * @since 2006-04-07
  */
 public class JSItemPresentation implements ItemPresentation {
     private JSNamedElement myElement;
@@ -46,27 +46,26 @@ public String getPresentableText() {
         return myElement.getName();
     }
 
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     public String getLocationString() {
         final PsiFile psiFile = myElement.getContainingFile();
         if (myElement instanceof JSVariable || myElement instanceof JSFunction) {
-            PsiElement possibleClazz = JSResolveUtil.findParent(myElement);
-
-            if (possibleClazz instanceof JSClass) {
-                final StringBuilder presentation = new StringBuilder();
+            if (JSResolveUtil.findParent(myElement) instanceof JSClass possibleJsClass) {
+                StringBuilder presentation = new StringBuilder();
 
-                presentation.append(((JSClass)possibleClazz).getQualifiedName());
+                presentation.append(possibleJsClass.getQualifiedName());
                 presentation.append('(').append(getFileName(psiFile)).append(')');
                 return presentation.toString();
             }
         }
-        else if (myElement instanceof JSClass) {
-            final String s = ((JSClass)myElement).getQualifiedName();
-            final int i = s.lastIndexOf('.');
+        else if (myElement instanceof JSClass jsClass) {
+            String s = jsClass.getQualifiedName();
+            int i = s.lastIndexOf('.');
 
             if (i != -1) {
-                final StringBuilder presentation = new StringBuilder();
+                StringBuilder presentation = new StringBuilder();
 
                 presentation.append(s.substring(0, i));
                 presentation.append('(').append(getFileName(psiFile)).append(')');
@@ -76,8 +75,9 @@ else if (myElement instanceof JSClass) {
         return getFileName(psiFile);
     }
 
-    private static String getFileName(final PsiFile psiFile) {
-        final String s = psiFile.getName();
+    @RequiredReadAction
+    private static String getFileName(PsiFile psiFile) {
+        String s = psiFile.getName();
         if (JSResolveUtil.isPredefinedFile(psiFile)) {
             return s.substring(s.lastIndexOf('/') + 1);
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
index 0b737f85..8c5d5f08 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
@@ -21,8 +21,6 @@
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
@@ -31,17 +29,13 @@
 import java.util.Set;
 
 /**
- * @by maxim.mossienko, yole
+ * @author maxim.mossienko, yole
  */
 public class JSSymbolUtil {
-    @NonNls
     private static final String PROTOTYPE_FIELD_NAME = "prototype";
-    @NonNls
     private static final String J_QUERY_VAR_NAME = "jQuery";
-    @NonNls
     private static final String FN_FUN_NAME = "fn";
 
-
     private static JSElement findNameComponent(JSElement expr) {
         if (expr instanceof JSReferenceExpression) {
             return expr;
@@ -52,28 +46,27 @@ private static JSElement findNameComponent(JSElement expr) {
             if (expr instanceof JSReferenceExpression) {
                 return expr;
             }
-            else if (expr instanceof JSAssignmentExpression) {
-                final JSExpression _lOperand = ((JSAssignmentExpression)expr).getLOperand();
+            else if (expr instanceof JSAssignmentExpression assignment) {
+                JSExpression _lOperand = assignment.getLOperand();
                 if (!(_lOperand instanceof JSDefinitionExpression)) {
                     break;
                 }
-                final JSExpression lOperand = ((JSDefinitionExpression)_lOperand).getExpression();
+                JSExpression lOperand = ((JSDefinitionExpression)_lOperand).getExpression();
 
-                if (lOperand instanceof JSReferenceExpression) {
-                    expr = lOperand;
+                if (lOperand instanceof JSReferenceExpression refExpr) {
+                    expr = refExpr;
                     continue;
                 }
                 else {
                     break;
                 }
             }
-            else if (expr instanceof JSVariable) {
-                return expr;
+            else if (expr instanceof JSVariable variable) {
+                return variable;
             }
-            else if (expr instanceof JSCallExpression) {
-                final JSExpression method = ((JSCallExpression)expr).getMethodExpression();
-                if (method instanceof JSReferenceExpression) {
-                    return method;
+            else if (expr instanceof JSCallExpression call) {
+                if (call.getMethodExpression() instanceof JSReferenceExpression methodRefExpr) {
+                    return methodRefExpr;
                 }
             }
             else {
@@ -81,7 +74,7 @@ else if (expr instanceof JSCallExpression) {
             }
 
             if (current != null) {
-                final PsiElement parent = current.getParent();
+                PsiElement parent = current.getParent();
                 if (!(parent instanceof JSElement)) {
                     break;
                 }
@@ -95,41 +88,43 @@ else if (expr instanceof JSCallExpression) {
         return null;
     }
 
-    public static String[] buildNameIndexArray(final JSElement _expr) {
+    public static String[] buildNameIndexArray(JSElement _expr) {
         final List<String> nameComponents = new ArrayList<>();
 
         JSElement nameComponent = findNameComponent(_expr);
         JSReferenceExpression expr = null;
 
-        if (nameComponent instanceof JSVariable) {
-            String varName = nameComponent.getName();
+        if (nameComponent instanceof JSVariable variable) {
+            String varName = variable.getName();
             if (varName != null) {
                 nameComponents.add(varName);
             }
         }
-        else if (nameComponent instanceof JSReferenceExpression) {
-            expr = (JSReferenceExpression)nameComponent;
+        else if (nameComponent instanceof JSReferenceExpression nameRefExpr) {
+            expr = nameRefExpr;
         }
 
         if (expr != null) {
             final JSReferenceExpression expr1 = expr;
-            visitReferenceExpressionComponentsInRootFirstOrder(expr, new ReferenceExpressionProcessor() {
-
-                @Override
-                public void processExpression(JSReferenceExpression expr) {
-                    nameComponents.add(expr.getReferencedName());
-                }
+            visitReferenceExpressionComponentsInRootFirstOrder(
+                expr,
+                new ReferenceExpressionProcessor() {
+                    @Override
+                    public void processExpression(JSReferenceExpression expr) {
+                        nameComponents.add(expr.getReferencedName());
+                    }
 
-                @Override
-                public void processUnresolvedThis() {
-                    nameComponents.add("");
-                }
+                    @Override
+                    public void processUnresolvedThis() {
+                        nameComponents.add("");
+                    }
 
-                @Override
-                public boolean isTopLevel(final JSReferenceExpression expression) {
-                    return expr1 == expression;
+                    @Override
+                    public boolean isTopLevel(final JSReferenceExpression expression) {
+                        return expr1 == expression;
+                    }
                 }
-            });
+            );
         }
 
         return nameComponents.toArray(new String[nameComponents.size()]);
@@ -140,10 +135,9 @@ interface ReferenceExpressionProcessor {
 
         void processUnresolvedThis();
 
-        boolean isTopLevel(final JSReferenceExpression expression);
+        boolean isTopLevel(JSReferenceExpression expression);
     }
 
-
     private static void visitReferenceExpressionComponentsInRootFirstOrder(
         JSReferenceExpression expr,
         ReferenceExpressionProcessor processor
@@ -166,14 +160,14 @@ private static void visitReferenceExpressionComponentsInRootFirstOrder(
             processor.processUnresolvedThis();
         }
 
-        final String refName = expr.getReferencedName();
+        String refName = expr.getReferencedName();
 
         if (refName != null && (!refName.equals(PROTOTYPE_FIELD_NAME) || processor.isTopLevel(expr))) {
             processor.processExpression(expr);
         }
     }
 
-    private static JSReferenceExpression evaluateInitializedPrototype(final JSExpression initializer) {
+    private static JSReferenceExpression evaluateInitializedPrototype(JSExpression initializer) {
         JSReferenceExpression initializedPrototype = null;
 
         if (initializer instanceof JSReferenceExpression initializerRefExpr
@@ -197,9 +191,9 @@ private static JSReferenceExpression findReferenceExpressionUsedForClassExtendin
         @Nullable Set<String> visited
     ) {
         JSReferenceExpression originalExpr = lOperand;
-        final ResolveProcessor processor = new ResolveProcessor(lOperand.getText(), true);
+        ResolveProcessor processor = new ResolveProcessor(lOperand.getText(), true);
         processor.setLocalResolve(true);
-        final PsiElement parent = lOperand.getParent();
+        PsiElement parent = lOperand.getParent();
         JSResolveUtil.treeWalkUp(processor, lOperand, parent, lOperand);
 
         PsiElement jsElement = processor.getResult();
@@ -208,8 +202,8 @@ private static JSReferenceExpression findReferenceExpressionUsedForClassExtendin
         }
 
         if (jsElement instanceof JSVariable variable) {
-            final JSExpression initialization = variable.getInitializer();
-            final JSReferenceExpression expression = initialization != null ? evaluateInitializedPrototype(initialization) : null;
+            JSExpression initialization = variable.getInitializer();
+            JSReferenceExpression expression = initialization != null ? evaluateInitializedPrototype(initialization) : null;
 
             if (expression != null) {
                 lOperand = expression;
@@ -219,7 +213,7 @@ else if (initialization instanceof JSReferenceExpression initializationRefExpr)
             }
         }
         else {
-            final PsiElement parentJsElement = jsElement != null ? jsElement.getParent() : null;
+            PsiElement parentJsElement = jsElement != null ? jsElement.getParent() : null;
 
             // new expression also could mean something extension !
             if (jsElement instanceof JSDefinitionExpression
@@ -227,10 +221,10 @@ else if (initialization instanceof JSReferenceExpression initializationRefExpr)
                 JSExpression rOperand = parentAssignExpr.getROperand();
 
                 if (rOperand instanceof JSCallExpression callExpression && !(rOperand instanceof JSNewExpression)) {
-                    final JSArgumentList list = callExpression.getArgumentList();
+                    JSArgumentList list = callExpression.getArgumentList();
 
                     if (list != null) {
-                        final JSExpression[] jsExpressions = list.getArguments();
+                        JSExpression[] jsExpressions = list.getArguments();
 
                         if (jsExpressions.length >= 2
                             && jsExpressions[0] instanceof JSReferenceExpression
@@ -240,7 +234,7 @@ else if (initialization instanceof JSReferenceExpression initializationRefExpr)
                     }
                 }
                 else if (rOperand instanceof JSReferenceExpression rOperandRefExpr) {
-                    final JSReferenceExpression expression = evaluateInitializedPrototype(rOperand);
+                    JSReferenceExpression expression = evaluateInitializedPrototype(rOperand);
                     lOperand = expression != null ? expression : rOperandRefExpr;
                 }
             }
@@ -248,7 +242,7 @@ else if (rOperand instanceof JSReferenceExpression rOperandRefExpr) {
         return lOperand != originalExpr ? replaceLocalVars(lOperand, visited) : lOperand;
     }
 
-    private static JSReferenceExpression replaceLocalVars(final JSReferenceExpression expression, @Nullable Set<String> visited) {
+    private static JSReferenceExpression replaceLocalVars(JSReferenceExpression expression, @Nullable Set<String> visited) {
         JSReferenceExpression expr = expression;
         JSExpression qualifier = expr.getQualifier();
 
@@ -263,10 +257,10 @@ private static JSReferenceExpression replaceLocalVars(final JSReferenceExpressio
         }
 
         if (qualifier == null) {
-            final PsiElement ref = JSResolveUtil.getLocalVariableRef(func, expr);
+            PsiElement ref = JSResolveUtil.getLocalVariableRef(func, expr);
 
             if (ref instanceof JSVariable variable && !(ref instanceof JSParameter)) {
-                final JSExpression initializer = variable.getInitializer();
+                JSExpression initializer = variable.getInitializer();
 
                 if (initializer instanceof JSReferenceExpression initializerRefExpr) {
                     return replaceExpression(expression, expr, initializerRefExpr);
@@ -275,7 +269,7 @@ else if (expr != expression) {
                     if (visited == null) {
                         visited = new HashSet<>();
                     }
-                    final String replaced = expr.getText();
+                    String replaced = expr.getText();
 
                     if (!visited.contains(replaced)) {
                         visited.add(replaced);
@@ -291,16 +285,16 @@ else if (expr != expression) {
     }
 
     private static JSReferenceExpression replaceExpression(
-        final JSReferenceExpression expression,
-        final JSReferenceExpression what,
-        final JSReferenceExpression by
+        JSReferenceExpression expression,
+        JSReferenceExpression what,
+        JSReferenceExpression by
     ) {
         if (expression == what) {
             return by;
         }
         int offsetOfExprInExpression = what.getTextOffset() - expression.getTextOffset();
-        final JSReferenceExpression copyOfExpr = (JSReferenceExpression)expression.copy();
-        final JSReferenceExpression expressionToReplace = PsiTreeUtil.getParentOfType(
+        JSReferenceExpression copyOfExpr = (JSReferenceExpression)expression.copy();
+        JSReferenceExpression expressionToReplace = PsiTreeUtil.getParentOfType(
             copyOfExpr.findElementAt(offsetOfExprInExpression),
             JSReferenceExpression.class
         );
@@ -308,9 +302,9 @@ private static JSReferenceExpression replaceExpression(
         return copyOfExpr;
     }
 
-    public static JSElement findQualifyingExpressionFromArgumentList(final JSArgumentList parent) {
+    public static JSElement findQualifyingExpressionFromArgumentList(JSArgumentList parent) {
         PsiElement firstParent = parent.getParent();
-        final PsiElement grandParent = firstParent.getParent();
+        PsiElement grandParent = firstParent.getParent();
 
         if (grandParent instanceof JSVariable variable) {
             return variable;
@@ -323,40 +317,41 @@ public static JSElement findQualifyingExpressionFromArgumentList(final JSArgumen
                 return assignedTo;
             }
         }
-        if (grandParent instanceof JSExpressionStatement && firstParent instanceof JSCallExpression call) {
-            JSExpression methodExpression = call.getMethodExpression();
-            String methodName = methodExpression instanceof JSReferenceExpression methodRefExpr ? methodRefExpr.getReferencedName() : null;
+        if (grandParent instanceof JSExpressionStatement
+            && firstParent instanceof JSCallExpression call
+            && call.getMethodExpression() instanceof JSReferenceExpression methodRefExpr) {
+
+            String methodName = methodRefExpr.getReferencedName();
 
             if ("each".equals(methodName) || "extend".equals(methodName)) {
-                JSExpression expression = ((JSReferenceExpression)methodExpression).getQualifier();
+                JSExpression expression = methodRefExpr.getQualifier();
 
-                if (expression instanceof JSReferenceExpression qualifierExpr) {
-                    if (FN_FUN_NAME.equals(qualifierExpr.getReferencedName())) {
-                        expression = qualifierExpr.getQualifier();
-                    }
+                if (expression instanceof JSReferenceExpression qualifierRefExpr
+                    && FN_FUN_NAME.equals(qualifierRefExpr.getReferencedName())) {
+                    expression = qualifierRefExpr.getQualifier();
                 }
+
                 if (expression != null && J_QUERY_VAR_NAME.equals(expression.getText())) {
                     return expression;
                 }
             }
             else if ("implement".equals(methodName)) {
-                JSExpression qualifier = ((JSReferenceExpression)methodExpression).getQualifier();
-                if (qualifier instanceof JSReferenceExpression && parent.getArguments().length == 1) {
-                    return qualifier;
+                if (methodRefExpr.getQualifier() instanceof JSReferenceExpression qualifierRefExpr && parent.getArguments().length == 1) {
+                    return qualifierRefExpr;
                 }
             }
         }
 
         JSExpression[] jsExpressions = parent.getArguments();
         for (int i = 0; i < jsExpressions.length; ++i) {
-            final JSExpression expr = jsExpressions[i];
+            JSExpression expr = jsExpressions[i];
 
             if (expr instanceof JSReferenceExpression
                 || (expr instanceof JSLiteralExpression && !expr.textContains(' ') && expr.getTextLength() < 100)) {
                 return expr;
             }
             else if (expr instanceof JSCallExpression call) {
-                final JSArgumentList argumentList = call.getArgumentList();
+                JSArgumentList argumentList = call.getArgumentList();
                 if (argumentList != null) {
                     jsExpressions = argumentList.getArguments();
                     i = -1;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index 9746a0e4..4f1abc69 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -22,7 +22,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.util.JSUtils;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.application.ApplicationManager;
+import consulo.application.Application;
 import consulo.codeEditor.Editor;
 import consulo.document.Document;
 import consulo.document.util.TextRange;
@@ -46,7 +46,6 @@
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlText;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -63,13 +62,13 @@ public abstract class BaseCreateFix implements LocalQuickFix {
     @Override
     @RequiredReadAction
     public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
-        final PsiElement psiElement = descriptor.getPsiElement();
+        PsiElement psiElement = descriptor.getPsiElement();
         PsiFile file = psiElement.getContainingFile();
         PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
         Set<JavaScriptFeature> features = JavaScriptVersionUtil.getFeatures(psiElement);
 
         JSReferenceExpression referenceExpression = (JSReferenceExpression)psiElement.getParent();
-        final JSExpression qualifier = referenceExpression.getQualifier();
+        JSExpression qualifier = referenceExpression.getQualifier();
         PsiElement predefinedAnchor = null;
 
         boolean classFeature = features.contains(JavaScriptFeature.CLASS);
@@ -83,7 +82,7 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri
                 if (type instanceof XmlBackedJSClassImpl) {
                     type = type.getParent().getContainingFile();
                 }
-                final PsiElement element = JSResolveUtil.unwrapProxy(type);
+                PsiElement element = JSResolveUtil.unwrapProxy(type);
 
                 if (element instanceof JSClass) {
                     file = type.getContainingFile();
@@ -121,7 +120,7 @@ else if (element instanceof XmlFile) {
 
             XmlFile contextFile = null;
             if (anchorParent instanceof JSFile && anchorParent.getContext() != null) {
-                final PsiElement context = anchorParent.getContext();
+                PsiElement context = anchorParent.getContext();
                 if (context instanceof XmlAttributeValue
                     || context instanceof XmlText && !(SCRIPT_TAG_NAME.equals(((XmlTag)context.getParent()).getLocalName()))) {
                     contextFile = (XmlFile)context.getContainingFile();
@@ -132,7 +131,7 @@ else if (realFile instanceof XmlFile xmlFile) {
             }
 
             if (contextFile != null) {
-                final XmlTag rootTag = contextFile.getDocument().getRootTag();
+                XmlTag rootTag = contextFile.getDocument().getRootTag();
                 JSClass jsClass = XmlBackedJSClassImpl.getXmlBackedClass(rootTag);
                 JSFile jsFile = ((XmlBackedJSClassImpl)jsClass).findFirstScriptTag();
 
@@ -157,7 +156,7 @@ else if (realFile instanceof XmlFile xmlFile) {
         }
 
         if (anchor != null) {
-            final TemplateManager templateManager = TemplateManager.getInstance(project);
+            TemplateManager templateManager = TemplateManager.getInstance(project);
             Template template = templateManager.createTemplate("", "");
 
             if (prefix.length() > 0) {
@@ -219,12 +218,12 @@ else if (realFile instanceof XmlFile xmlFile) {
                 insertAtEnd = true;
             }
 
-            final TextRange anchorRange = anchor.getTextRange();
+            TextRange anchorRange = anchor.getTextRange();
             int offset = insertAtEnd ? anchorRange.getEndOffset() : anchorRange.getStartOffset();
 
             if (file != realFile || file instanceof XmlFile) {
-                final PsiFile anchorContainingFile = anchor.getContainingFile();
-                final PsiElement anchorFileContext = anchorContainingFile.getContext();
+                PsiFile anchorContainingFile = anchor.getContainingFile();
+                PsiElement anchorFileContext = anchorContainingFile.getContext();
 
                 if (anchorFileContext != null) {
                     if (anchorFileContext instanceof XmlText xmlText) {
@@ -244,7 +243,7 @@ else if (realFile instanceof XmlFile xmlFile) {
     }
 
     @Nullable
-    public static Editor getEditor(final Project project, final PsiFile realFile) {
+    public static Editor getEditor(Project project, PsiFile realFile) {
         if (!FileModificationService.getInstance().prepareFileForWrite(realFile)) {
             return null;
         }
@@ -255,7 +254,7 @@ public static Editor getEditor(final Project project, final PsiFile realFile) {
 
     @RequiredReadAction
     protected abstract void buildTemplate(
-        final Template template,
+        Template template,
         JSReferenceExpression referenceExpression,
         Set<JavaScriptFeature> features,
         boolean staticContext,
@@ -263,13 +262,14 @@ protected abstract void buildTemplate(
         PsiElement anchorParent
     );
 
-    private static String getTypeOfValue(final JSExpression passedParameterValue, final PsiFile file, Set<JavaScriptFeature> features) {
-        final PsiElement type = getType(passedParameterValue, file, features);
+    @RequiredReadAction
+    private static String getTypeOfValue(JSExpression passedParameterValue, PsiFile file, Set<JavaScriptFeature> features) {
+        PsiElement type = getType(passedParameterValue, file, features);
         return type != null ? type instanceof JSClass jsClass ? jsClass.getQualifiedName() : ((PsiNamedElement)type).getName() : ANY_TYPE;
     }
 
     @RequiredReadAction
-    static PsiElement getType(final JSExpression passedParameterValue, final PsiFile file, Set<JavaScriptFeature> features) {
+    static PsiElement getType(JSExpression passedParameterValue, PsiFile file, Set<JavaScriptFeature> features) {
         if (passedParameterValue instanceof JSReferenceExpression) {
             JavaScriptType type = passedParameterValue.getType();
 
@@ -282,15 +282,15 @@ static PsiElement getType(final JSExpression passedParameterValue, final PsiFile
     }
 
     protected static JSExpression addAccessModifier(
-        final Template template,
-        final JSReferenceExpression referenceExpression,
-        final boolean ecma,
+        Template template,
+        JSReferenceExpression referenceExpression,
+        boolean ecma,
         boolean staticContext
     ) {
-        final JSExpression qualifier = referenceExpression.getQualifier();
+        JSExpression qualifier = referenceExpression.getQualifier();
 
         if (ecma) {
-            if ((qualifier == null || qualifier instanceof JSThisExpression)) {
+            if (qualifier == null || qualifier instanceof JSThisExpression) {
                 template.addTextSegment("private ");
             }
             if (staticContext) {
@@ -302,36 +302,38 @@ protected static JSExpression addAccessModifier(
 
     private int uniqueCounter;
 
-    protected void addCompletionVar(final Template template) {
-        final Expression paramTypeExpr = new MacroCallNode(MacroFactory.createMacro("complete"));
+    protected void addCompletionVar(Template template) {
+        Expression paramTypeExpr = new MacroCallNode(MacroFactory.createMacro("complete"));
         template.addVariable("__Type" + (uniqueCounter++), paramTypeExpr, paramTypeExpr, true);
     }
 
-    protected void addSemicolonSegment(final Template template, final PsiFile file) {
-        final String semicolon = JSChangeUtil.getSemicolon(file.getProject());
+    protected void addSemicolonSegment(Template template, PsiFile file) {
+        String semicolon = JSChangeUtil.getSemicolon(file.getProject());
         if (semicolon.length() > 0) {
             template.addTextSegment(semicolon);
         }
     }
 
+    @RequiredReadAction
     public static void guessExprTypeAndAddSuchVariable(
-        final JSExpression passedParameterValue,
-        final Template template,
-        final String var1,
-        final PsiFile file,
-        final Set<JavaScriptFeature> features
+        JSExpression passedParameterValue,
+        Template template,
+        String var1,
+        PsiFile file,
+        Set<JavaScriptFeature> features
     ) {
         String type = getTypeOfValue(passedParameterValue, file, features);
 
-        if (ApplicationManager.getApplication().isUnitTestMode()) {
+        if (Application.get().isUnitTestMode()) {
             template.addTextSegment(type);
         }
         else {
-            final MyExpression paramTypeExpr = new MyExpression(type);
+            MyExpression paramTypeExpr = new MyExpression(type);
             template.addVariable(var1 + "Type", paramTypeExpr, paramTypeExpr, true);
         }
     }
 
+    @RequiredReadAction
     protected void guessTypeAndAddTemplateVariable(Template template, JSExpression referenceExpression, PsiFile file) {
         String type = null;
         PsiElement elementForWhichExprTypeToEvaluate = null;
@@ -343,18 +345,16 @@ protected void guessTypeAndAddTemplateVariable(Template template, JSExpression r
             parent = parent.getParent();
         }
 
-        if (parent instanceof JSDefinitionExpression) {
-            PsiElement grandParent = parent.getParent();
-
-            if (grandParent instanceof JSAssignmentExpression assignment) {
+        if (parent instanceof JSDefinitionExpression definition) {
+            if (definition.getParent() instanceof JSAssignmentExpression assignment) {
                 elementForWhichExprTypeToEvaluate = assignment.getROperand();
             }
         }
         else if (parent instanceof JSReturnStatement) {
-            final JSFunction fun = PsiTreeUtil.getParentOfType(referenceExpression, JSFunction.class);
+            JSFunction fun = PsiTreeUtil.getParentOfType(referenceExpression, JSFunction.class);
 
             if (fun != null) {
-                final String typeString = fun.getReturnTypeString();
+                String typeString = fun.getReturnTypeString();
 
                 if (typeString != null) {
                     type = typeString;
@@ -384,7 +384,8 @@ else if (parent instanceof JSAssignmentExpression assignment) {
         }
 
         String expressionType = elementForWhichExprTypeToEvaluate instanceof JSExpression expression
-            ? JSResolveUtil.getExpressionType(expression, file) : null;
+            ? JSResolveUtil.getExpressionType(expression, file)
+            : null;
         if (expressionType != null && !expressionType.equals("*")) {
             type = expressionType;
         }
@@ -398,17 +399,19 @@ else if (parent instanceof JSAssignmentExpression assignment) {
     }
 
     @Nullable
-    protected static JSClass findClass(PsiFile file, final PsiElement anchorParent) {
-        return anchorParent instanceof JSClass jsClass ? jsClass
-            : file instanceof JSFile jsFile ? JSResolveUtil.getXmlBackedClass(jsFile)
+    protected static JSClass findClass(PsiFile file, PsiElement anchorParent) {
+        return anchorParent instanceof JSClass jsClass
+            ? jsClass
+            : file instanceof JSFile jsFile
+            ? JSResolveUtil.getXmlBackedClass(jsFile)
             : null;
     }
 
     public static class MyExpression extends Expression {
-        TextResult result;
+        private TextResult result;
         private final String myVar1;
 
-        public MyExpression(final String var1) {
+        public MyExpression(String var1) {
             myVar1 = var1;
             result = new TextResult(myVar1);
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index e2f59f3a..ebe1f0a2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -57,6 +57,7 @@ protected void writeFunctionAndName(Template template, String createdMethodName,
     }
 
     @Override
+    @RequiredReadAction
     protected void addParameters(
         Template template,
         JSReferenceExpression referenceExpression,
@@ -95,6 +96,7 @@ protected void addParameters(
     }
 
     @Override
+    @RequiredReadAction
     protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile file) {
         guessTypeAndAddTemplateVariable(template, referenceExpression, file);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 7aca2c90..6227bcf3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -99,7 +99,7 @@ public static ASTNode getTypeExpressionFromDeclaration(JSNamedElement element) {
         ASTNode myNode = element.getNode();
         ASTNode node = myNode != null ? myNode.findChildByType(JSTokenTypes.COLON) : null;
 
-        return node != null ? myNode.findChildByType(JSDocumentationUtils.ourTypeFilter, node) : null;
+        return node != null ? myNode.findChildByType(JSDocumentationUtils.TYPE_FILTER, node) : null;
     }
 
     @Deprecated

From e988a97517e2cb70839400c7b09fb415668e7e47 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 22:14:17 +0300
Subject: [PATCH 268/340] Refactoring inspections.

---
 .../impl/inspections/CreateClassDialog.java   |  21 +-
 .../CreateClassOrInterfaceAction.java         |  33 +-
 .../JSDeprecatedSymbolsInspection.java        |  30 +-
 .../JSDuplicatedDeclarationInspection.java    | 117 ++++---
 .../impl/inspections/JSInspection.java        |  14 +-
 .../JSUndeclaredVariableInspection.java       | 101 +++---
 .../JSUnresolvedFunctionInspection.java       | 317 +++++++++---------
 .../JSUnresolvedVariableInspection.java       | 114 ++++---
 .../JSUntypedDeclarationInspection.java       |  57 ++--
 .../JSUnusedLocalSymbolsInspection.java       | 153 ++++-----
 10 files changed, 471 insertions(+), 486 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
index dda34560..d3dbd880 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassDialog.java
@@ -19,10 +19,11 @@
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
-import consulo.language.psi.PsiElement;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.ui.ex.awt.event.DocumentAdapter;
 
@@ -31,8 +32,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jun 9, 2008
- * Time: 7:36:22 PM
+ * @since 2008-06-09
  */
 class CreateClassDialog extends DialogWrapper {
     private JPanel myPanel;
@@ -47,7 +47,8 @@ protected CreateClassDialog(final Project project, String className, String pack
 
         myPackageName.getDocument().addDocumentListener(new DocumentAdapter() {
             @Override
-            protected void textChanged(final DocumentEvent e) {
+            @RequiredReadAction
+            protected void textChanged(DocumentEvent e) {
                 String text = getPackageName();
                 boolean enabled;
                 if (text.length() == 0) {
@@ -55,12 +56,11 @@ protected void textChanged(final DocumentEvent e) {
                 }
                 else {
                     ASTNode node = JSChangeUtil.createJSTreeFromText(project, text);
-                    PsiElement elt;
-                    enabled = node != null &&
-                        (elt = node.getPsi()) instanceof JSExpressionStatement &&
-                        (elt = ((JSExpressionStatement)elt).getExpression()) instanceof JSReferenceExpression &&
-                        ((JSReferenceExpression)elt).getReferencedName() != null &&
-                        elt.textMatches(text);
+                    enabled = node != null
+                        && node.getPsi() instanceof JSExpressionStatement expressionStatement
+                        && expressionStatement.getExpression() instanceof JSReferenceExpression refExpr
+                        && refExpr.getReferencedName() != null
+                        && refExpr.textMatches(text);
                 }
                 getOKAction().setEnabled(enabled);
             }
@@ -78,6 +78,7 @@ protected JComponent createCenterPanel() {
     }
 
     @Override
+    @RequiredUIAccess
     public JComponent getPreferredFocusedComponent() {
         return myPackageName;
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
index b3a80625..ff20b657 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
@@ -20,7 +20,7 @@
 import com.intellij.lang.javascript.impl.flex.ImportUtils;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import consulo.application.ApplicationManager;
+import consulo.application.Application;
 import consulo.fileTemplate.FileTemplate;
 import consulo.fileTemplate.FileTemplateManager;
 import consulo.fileTemplate.FileTemplateUtil;
@@ -36,22 +36,18 @@
 import consulo.module.Module;
 import consulo.module.content.ModuleRootManager;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.util.lang.text.StringTokenizer;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.util.VirtualFileUtil;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.Properties;
 
 /**
- * Created by IntelliJ IDEA.
- * User: Maxim.Mossienko
- * Date: 11.02.2009
- * Time: 14:01:34
- * To change this template use File | Settings | File Templates.
+ * @author Maxim.Mossienko
+ * @since 2009-02-11
  */
 class CreateClassOrInterfaceAction implements LocalQuickFix {
     private final String classNameToCreate;
@@ -80,17 +76,18 @@ public String getFamilyName() {
     }
 
     @Override
-    public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
+    @RequiredUIAccess
+    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
         PsiFile contextFile = myContext.getContainingFile();
-        final PsiElement context = contextFile.getContext();
+        PsiElement context = contextFile.getContext();
         if (context != null) {
             contextFile = context.getContainingFile();
         }
 
         packageName = JSResolveUtil.getExpectedPackageNameFromFile(contextFile.getVirtualFile(), project, false);
 
-        if (!ApplicationManager.getApplication().isUnitTestMode()) {
-            final CreateClassDialog dialog = new CreateClassDialog(project, classNameToCreate, packageName, myIsInterface);
+        if (!Application.get().isUnitTestMode()) {
+            CreateClassDialog dialog = new CreateClassDialog(project, classNameToCreate, packageName, myIsInterface);
             dialog.show();
             if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
                 return;
@@ -102,19 +99,19 @@ public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescr
         }
 
         final PsiFile contextFile1 = contextFile;
-        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        Application.get().runWriteAction(new Runnable() {
             @Override
             public void run() {
                 try {
-                    final FileTemplate template = FileTemplateManager.getInstance().getTemplate(
+                    FileTemplate template = FileTemplateManager.getInstance().getTemplate(
                         myIsInterface
                             ? JavaScriptSupportLoader.ACTION_SCRIPT_INTERFACE_TEMPLATE_NAME
                             : JavaScriptSupportLoader.ACTION_SCRIPT_CLASS_TEMPLATE_NAME
                     );
-                    @NonNls final String fileName = classNameToCreate + ".as";
-                    final Properties props = new Properties();
+                    String fileName = classNameToCreate + ".as";
+                    Properties props = new Properties();
                     props.setProperty(FileTemplate.ATTRIBUTE_NAME, classNameToCreate);
-                    final Module element = ModuleUtilCore.findModuleForPsiElement(contextFile1);
+                    Module element = ModuleUtilCore.findModuleForPsiElement(contextFile1);
                     VirtualFile base = ModuleRootManager.getInstance(element).getSourceRoots()[0];
                     VirtualFile relativeFile = VirtualFileUtil.findRelativeFile(packageName, base);
 
@@ -133,7 +130,7 @@ public void run() {
 
                     assert relativeFile != null;
                     props.setProperty(FileTemplate.ATTRIBUTE_PACKAGE_NAME, packageName);
-                    final PsiDirectory psiDirectory = PsiManager.getInstance(project).findDirectory(relativeFile);
+                    PsiDirectory psiDirectory = PsiManager.getInstance(project).findDirectory(relativeFile);
                     assert psiDirectory != null;
                     FileTemplateUtil.createFromTemplate(template, fileName, props, psiDirectory);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
index de077812..1a425404 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
@@ -21,39 +21,36 @@
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.editor.inspection.ProblemsHolder;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.ResolveResult;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 /**
- * @by Maxim.Mossienko
+ * @author Maxim.Mossienko
  */
 @ExtensionImpl
 public class JSDeprecatedSymbolsInspection extends JSInspection {
-    @NonNls
     private static final String SHORT_NAME = "JSDeprecatedSymbols";
 
-    @Override
     @Nonnull
+    @Override
     public String getGroupDisplayName() {
         return "General";
     }
 
-    @Override
     @Nonnull
+    @Override
     public String getDisplayName() {
         return JavaScriptLocalize.jsDeprecatedSymbolsInspectionName().get();
     }
 
-    @Override
     @Nonnull
-    @NonNls
+    @Override
     public String getShortName() {
         return SHORT_NAME;
     }
@@ -62,18 +59,19 @@ public String getShortName() {
     protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
-            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+            @RequiredReadAction
+            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
                 for (ResolveResult r : node.multiResolve(false)) {
-                    final PsiElement element = r.getElement();
-                    if ((element instanceof JSDefinitionExpression && element.getParent() instanceof JSAssignmentExpression) || element == node.getParent()) {
+                    PsiElement element = r.getElement();
+                    if (element instanceof JSDefinitionExpression definition && definition.getParent() instanceof JSAssignmentExpression
+                        || element == node.getParent()) {
                         continue;
                     }
                     if (JSDocumentationUtils.isDeprecated(element)) {
-                        holder.registerProblem(
-                            node.getReferenceNameElement(),
-                            JavaScriptLocalize.javascriptDeprecatedSymbolUsedNameMessage().get(),
-                            ProblemHighlightType.LIKE_DEPRECATED
-                        );
+                        holder.newProblem(JavaScriptLocalize.javascriptDeprecatedSymbolUsedNameMessage())
+                            .range(node.getReferenceNameElement())
+                            .highlightType(ProblemHighlightType.LIKE_DEPRECATED)
+                            .create();
                         break;
                     }
                 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
index df798c6d..be739b32 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.inspection.ProblemHighlightType;
@@ -33,7 +34,6 @@
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
@@ -42,24 +42,22 @@
  */
 @ExtensionImpl
 public class JSDuplicatedDeclarationInspection extends JSInspection {
-    @NonNls
     private static final String SHORT_NAME = "JSDuplicatedDeclaration";
 
-    @Override
     @Nonnull
+    @Override
     public String getGroupDisplayName() {
         return "General";
     }
 
-    @Override
     @Nonnull
+    @Override
     public String getDisplayName() {
         return JavaScriptLocalize.jsDuplicatedDeclarationInspectionName().get();
     }
 
-    @Override
     @Nonnull
-    @NonNls
+    @Override
     public String getShortName() {
         return SHORT_NAME;
     }
@@ -68,43 +66,53 @@ public String getShortName() {
     protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
-            public void visitJSClass(final JSClass node) {
-                final String name = node.getName();
+            @RequiredReadAction
+            public void visitJSClass(@Nonnull JSClass node) {
+                String name = node.getName();
                 if (name == null) {
                     return;
                 }
-                final PsiElement nameIdentifier = node.getNameIdentifier();
+                PsiElement nameIdentifier = node.getNameIdentifier();
 
                 checkForDuplicateDeclaration(name, node, nameIdentifier);
             }
 
             @Override
-            public void visitJSFunctionDeclaration(final JSFunction node) {
-                final String name = node.getName();
+            @RequiredReadAction
+            public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
+                String name = node.getName();
                 if (name == null) {
                     return;
                 }
-                final PsiElement nameIdentifier = node.getNameIdentifier();
+                PsiElement nameIdentifier = node.getNameIdentifier();
 
                 checkForDuplicateDeclaration(name, node, nameIdentifier);
             }
 
-            private void checkForDuplicateDeclaration(final String name, final PsiElement decl, final PsiElement nameIdentifier) {
-                PsiElement scope =
-                    PsiTreeUtil.getParentOfType(decl, JSFunction.class, JSFile.class, JSEmbeddedContentImpl.class, JSClass.class,
-                        JSObjectLiteralExpression.class, JSPackageStatement.class, PsiFile.class
-                    );
+            @RequiredReadAction
+            private void checkForDuplicateDeclaration(String name, PsiElement decl, PsiElement nameIdentifier) {
+                PsiElement scope = PsiTreeUtil.getParentOfType(
+                    decl,
+                    JSFunction.class,
+                    JSFile.class,
+                    JSEmbeddedContentImpl.class,
+                    JSClass.class,
+                    JSObjectLiteralExpression.class,
+                    JSPackageStatement.class,
+                    PsiFile.class
+                );
                 if (scope instanceof JSPackageStatement) {
                     return; // dedicated inspection
                 }
-                final PsiElement originalScope = scope;
+                PsiElement originalScope = scope;
                 if (scope instanceof JSFile && scope.getContext() != null) {
                     scope = scope.getContext().getContainingFile();
                 }
 
-                final ResolveProcessor processor = new ResolveProcessor(name, scope) {
+                ResolveProcessor processor = new ResolveProcessor(name, scope) {
                     @Override
-                    public boolean execute(PsiElement element, ResolveState state) {
+                    @RequiredReadAction
+                    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                         if (element == decl) {
                             return true;
                         }
@@ -113,25 +121,24 @@ public boolean execute(PsiElement element, ResolveState state) {
                             return false;
                         }
 
-                        if (element instanceof JSFunction && decl instanceof JSFunction) {
-                            final JSFunction declFunction = (JSFunction)decl;
-                            final JSFunction elementFunction = (JSFunction)element;
-                            if ((declFunction.isGetProperty() && elementFunction.isSetProperty()) || (declFunction.isSetProperty() && elementFunction.isGetProperty())) {
+                        if (element instanceof JSFunction elementFunction && decl instanceof JSFunction declFunction) {
+                            if ((declFunction.isGetProperty() && elementFunction.isSetProperty())
+                                || (declFunction.isSetProperty() && elementFunction.isGetProperty())) {
                                 return true;
                             }
                         }
-                        if (element instanceof JSFunction &&
-                            decl instanceof JSClass && element.getParent() == decl) {
+                        if (element instanceof JSFunction function && decl instanceof JSClass jsClass && function.getParent() == jsClass) {
                             return true;
                         }
 
-                        if (element instanceof JSAttributeListOwner && decl instanceof JSAttributeListOwner) {
-                            JSAttributeList attrList = ((JSAttributeListOwner)element).getAttributeList();
-                            JSAttributeList attrList2 = ((JSAttributeListOwner)decl).getAttributeList();
+                        if (element instanceof JSAttributeListOwner elementAttrListOwner
+                            && decl instanceof JSAttributeListOwner declAttrListOwner) {
+                            JSAttributeList attrList = elementAttrListOwner.getAttributeList();
+                            JSAttributeList attrList2 = declAttrListOwner.getAttributeList();
 
                             if (attrList != null && attrList2 != null) {
-                                final String ns = attrList.getNamespace();
-                                final String ns2 = attrList2.getNamespace();
+                                String ns = attrList.getNamespace();
+                                String ns2 = attrList2.getNamespace();
 
                                 if ((ns != null && !ns.equals(ns2)) ||
                                     ns2 != null && !ns2.equals(ns) ||
@@ -139,12 +146,13 @@ public boolean execute(PsiElement element, ResolveState state) {
                                     return true;
                                 }
                             }
-                            else if ((attrList != null && attrList.getNamespace() != null) || (attrList2 != null && attrList2.getNamespace() != null)) {
+                            else if ((attrList != null && attrList.getNamespace() != null)
+                                || (attrList2 != null && attrList2.getNamespace() != null)) {
                                 return true;
                             }
 
-                            final boolean notStatic2 = attrList2 == null || !attrList2.hasModifier(JSAttributeList.ModifierType.STATIC);
-                            final boolean notStatic = attrList == null || !attrList.hasModifier(JSAttributeList.ModifierType.STATIC);
+                            boolean notStatic2 = attrList2 == null || !attrList2.hasModifier(JSAttributeList.ModifierType.STATIC);
+                            boolean notStatic = attrList == null || !attrList.hasModifier(JSAttributeList.ModifierType.STATIC);
                             if ((notStatic2 && !notStatic) || (notStatic && !notStatic2)) {
                                 return true;
                             }
@@ -154,11 +162,11 @@ else if ((attrList != null && attrList.getNamespace() != null) || (attrList2 !=
                 };
 
                 PsiElement parent = JSResolveUtil.findParent(decl);
-                if (parent instanceof JSClass) {
-                    processor.configureClassScope((JSClass)parent);
+                if (parent instanceof JSClass jsClass) {
+                    processor.configureClassScope(jsClass);
                 }
 
-                if (decl instanceof JSFunction || decl instanceof JSVariable) {
+                if (decl instanceof JSFunction function || decl instanceof JSVariable) {
                     JSAttributeList attrList = ((JSAttributeListOwner)decl).getAttributeList();
                     processor.setProcessStatics(attrList != null && attrList.hasModifier(JSAttributeList.ModifierType.STATIC));
                 }
@@ -167,18 +175,21 @@ else if ((attrList != null && attrList.getNamespace() != null) || (attrList2 !=
                 JSResolveUtil.treeWalkUp(processor, decl, null, decl, scope);
 
                 if (processor.getResult() != null && processor.getResult() != scope) {
-                    holder.registerProblem(
-                        nameIdentifier,
-                        JavaScriptLocalize.javascriptValidationMessageDuplicateDeclaration().get(),
-                        originalScope.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4
-                            ? ProblemHighlightType.ERROR : ProblemHighlightType.GENERIC_ERROR_OR_WARNING
-                    );
+                    holder.newProblem(JavaScriptLocalize.javascriptValidationMessageDuplicateDeclaration())
+                        .range(nameIdentifier)
+                        .highlightType(
+                            originalScope.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4
+                                ? ProblemHighlightType.ERROR
+                                : ProblemHighlightType.GENERIC_ERROR_OR_WARNING
+                        )
+                        .create();
                 }
             }
 
             @Override
-            public void visitJSProperty(final JSProperty node) {
-                final String name = node.getName();
+            @RequiredReadAction
+            public void visitJSProperty(@Nonnull JSProperty node) {
+                String name = node.getName();
                 if (name == null) {
                     return;
                 }
@@ -186,19 +197,19 @@ public void visitJSProperty(final JSProperty node) {
             }
 
             @Override
-            public void visitJSVariable(final JSVariable var) {
-                final PsiElement nameIdentifier = var.getNameIdentifier();
-                final PsiElement next = nameIdentifier != null ? nameIdentifier.getNextSibling() : null;
-                final String name = nameIdentifier != null ? nameIdentifier.getText() : null;
+            @RequiredReadAction
+            public void visitJSVariable(@Nonnull JSVariable var) {
+                PsiElement nameIdentifier = var.getNameIdentifier();
+                PsiElement next = nameIdentifier != null ? nameIdentifier.getNextSibling() : null;
+                String name = nameIdentifier != null ? nameIdentifier.getText() : null;
 
                 // Actully skip outer language elements
-                if (name != null && (next == null ||
-                    PsiUtilCore.getElementType(next) instanceof JSElementType ||
-                    next instanceof PsiWhiteSpace)) {
+                if (name != null && (next == null
+                    || PsiUtilCore.getElementType(next) instanceof JSElementType
+                    || next instanceof PsiWhiteSpace)) {
                     checkForDuplicateDeclaration(name, var, nameIdentifier);
                 }
             }
-
         };
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
index 33d7757c..3e304617 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
@@ -42,10 +42,10 @@
 public abstract class JSInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool {
     protected boolean myOnTheFly;
 
-    protected abstract JSElementVisitor createVisitor(final ProblemsHolder holder);
+    protected abstract JSElementVisitor createVisitor(ProblemsHolder holder);
 
-    @Override
     @Nonnull
+    @Override
     public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder holder, boolean isOnTheFly) {
         myOnTheFly = isOnTheFly;
         return createVisitor(holder);
@@ -62,27 +62,27 @@ public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
     }
 
-    @Override
     @Nonnull
+    @Override
     public HighlightDisplayLevel getDefaultLevel() {
         return HighlightDisplayLevel.WEAK_WARNING;
     }
 
     @Override
-    public PsiNamedElement getProblemElement(final PsiElement psiElement) {
+    public PsiNamedElement getProblemElement(PsiElement psiElement) {
         return PsiTreeUtil.getNonStrictParentOfType(psiElement, JSNamedElement.class);
     }
 
+    @Nonnull
     @Override
-    @Nullable
-    public SuppressIntentionAction[] getSuppressActions(final PsiElement element) {
+    public SuppressIntentionAction[] getSuppressActions(PsiElement element) {
         return new SuppressIntentionAction[]{
             /*  new AddNoInspectionCommentFix(HighlightDisplayKey.find(getShortName()), JSSuppressionHolder.class),*/
         };
     }
 
     @Override
-    public boolean isSuppressedFor(final PsiElement element) {
+    public boolean isSuppressedFor(@Nonnull PsiElement element) {
         return SuppressionUtil.isSuppressedInStatement(element, getID(), JSSuppressionHolder.class);
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
index ea38b220..0d7032fb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
@@ -19,16 +19,14 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.util.JSUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.document.Document;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.FileModificationService;
-import consulo.language.editor.inspection.LocalQuickFix;
-import consulo.language.editor.inspection.ProblemDescriptor;
-import consulo.language.editor.inspection.ProblemHighlightType;
-import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.inspection.*;
 import consulo.language.psi.PsiDocumentManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -36,36 +34,30 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * @author Maxim.Mossienko
  */
 @ExtensionImpl
 public class JSUndeclaredVariableInspection extends JSInspection {
-    @NonNls
     public static final String SHORT_NAME = "JSUndeclaredVariable";
 
-    @Override
     @Nonnull
+    @Override
     public String getGroupDisplayName() {
         return "General";
     }
 
-    @Override
     @Nonnull
+    @Override
     public String getDisplayName() {
         return JavaScriptLocalize.jsUndeclaredVariableInspectionName().get();
     }
 
-    @Override
     @Nonnull
-    @NonNls
+    @Override
     public String getShortName() {
         return SHORT_NAME;
     }
@@ -74,42 +66,40 @@ public String getShortName() {
     protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
-            public void visitJSReferenceExpression(final JSReferenceExpression node) {
-                final PsiElement parentElement = node.getParent();
+            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
+                PsiElement parentElement = node.getParent();
 
-                if (!(parentElement instanceof JSCallExpression) && node.shouldCheckReferences() && node.getQualifier() == null && parentElement instanceof
-                    JSDefinitionExpression) {
-                    final JSSourceElement element = PsiTreeUtil.getParentOfType(node, JSWithStatement.class, JSFunction.class);
+                if (!(parentElement instanceof JSCallExpression) && node.shouldCheckReferences()
+                    && node.getQualifier() == null && parentElement instanceof JSDefinitionExpression) {
+                    JSSourceElement element = PsiTreeUtil.getParentOfType(node, JSWithStatement.class, JSFunction.class);
 
                     if (!(element instanceof JSWithStatement)) {
                         boolean varReferenceWithoutVar = true;
-                        final ResolveResult[] resolveResults = node.multiResolve(false);
+                        ResolveResult[] resolveResults = node.multiResolve(false);
 
                         for (ResolveResult r : resolveResults) {
-                            final PsiElement resolveResult = r.getElement();
-                            if (resolveResult instanceof JSVariable ||
-                                resolveResult instanceof JSFunction) {
+                            PsiElement resolveResult = r.getElement();
+                            if (resolveResult instanceof JSVariable
+                                || resolveResult instanceof JSFunction) {
                                 varReferenceWithoutVar = false;
                                 break;
                             }
                         }
 
                         if (varReferenceWithoutVar) {
-                            final PsiElement nameIdentifier = node.getReferenceNameElement();
+                            PsiElement nameIdentifier = node.getReferenceNameElement();
 
                             if (nameIdentifier != null) {
-                                final List<LocalQuickFix> fixes = new LinkedList<LocalQuickFix>();
+                                ProblemBuilder problemBuilder =
+                                    holder.newProblem(JavaScriptLocalize.javascriptUndeclaredVariableNameMessage(node.getReferencedName()))
+                                        .range(nameIdentifier)
+                                        .highlightType(ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
 
                                 if (myOnTheFly) {
-                                    fixes.add(new DeclareJSVariableIntentionAction(node));
+                                    problemBuilder.withFixes(new DeclareJSVariableIntentionAction(node));
                                 }
 
-                                holder.registerProblem(
-                                    nameIdentifier,
-                                    JavaScriptLocalize.javascriptUndeclaredVariableNameMessage(node.getReferencedName()).get(),
-                                    ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                                    !fixes.isEmpty() ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null
-                                );
+                                problemBuilder.create();
                             }
                         }
                     }
@@ -119,14 +109,15 @@ public void visitJSReferenceExpression(final JSReferenceExpression node) {
         };
     }
 
-    private static boolean isImplicitlyDeclared(final JSReferenceExpression node, final PsiElement parentElement) {
-        if (parentElement instanceof JSForInStatement) {
-            final JSExpression varExpression = ((JSForInStatement)parentElement).getVariableExpression();
+    @RequiredReadAction
+    private static boolean isImplicitlyDeclared(JSReferenceExpression node, PsiElement parentElement) {
+        if (parentElement instanceof JSForInStatement forInStatement) {
+            JSExpression varExpression = forInStatement.getVariableExpression();
 
             return PsiTreeUtil.findCommonParent(varExpression, node) == varExpression;
         }
-        else if (parentElement instanceof JSForStatement) {
-            final JSExpression varExpression = ((JSForStatement)parentElement).getInitialization();
+        else if (parentElement instanceof JSForStatement forStatement) {
+            JSExpression varExpression = forStatement.getInitialization();
 
             return PsiTreeUtil.findCommonParent(varExpression, node) == varExpression;
         }
@@ -135,7 +126,6 @@ else if (parentElement instanceof JSForStatement) {
 
     private static class DeclareJSVariableIntentionAction implements LocalQuickFix {
         private final JSReferenceExpression myReferenceExpression;
-        @NonNls
         private static final String VAR_STATEMENT_START = "var ";
         private final PsiFile myFile;
 
@@ -144,19 +134,20 @@ private static class DeclareJSVariableIntentionAction implements LocalQuickFix {
             myFile = expression.getContainingFile();
         }
 
-        @Override
         @Nonnull
+        @Override
         public String getName() {
             return JavaScriptLocalize.javascriptDeclareVariableIntentionName(myReferenceExpression.getReferencedName()).get();
         }
 
-        @Override
         @Nonnull
+        @Override
         public String getFamilyName() {
             return JavaScriptLocalize.javascriptCreateVariableIntentionFamily().get();
         }
 
         @Override
+        @RequiredReadAction
         public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
             if (!FileModificationService.getInstance().prepareFileForWrite(myFile)) {
                 return;
@@ -167,13 +158,13 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri
 
             if (implicitlyDeclared) {
                 anchor = myReferenceExpression;
-                final JSStatement statement = PsiTreeUtil.getParentOfType(anchor, JSForStatement.class, JSStatement.class);
+                JSStatement statement = PsiTreeUtil.getParentOfType(anchor, JSForStatement.class, JSStatement.class);
 
-                if (statement instanceof JSForStatement) {
-                    final JSExpression initialization = ((JSForStatement)statement).getInitialization();
+                if (statement instanceof JSForStatement forStatement) {
+                    JSExpression initialization = forStatement.getInitialization();
 
-                    if (initialization instanceof JSBinaryExpression && ((JSBinaryExpression)initialization).getOperationSign() == JSTokenTypes.COMMA) {
-                        anchor = ((JSAssignmentExpression)((JSBinaryExpression)initialization).getLOperand()).getLOperand();
+                    if (initialization instanceof JSBinaryExpression binary && binary.getOperationSign() == JSTokenTypes.COMMA) {
+                        anchor = ((JSAssignmentExpression)binary.getLOperand()).getLOperand();
                     }
                 }
             }
@@ -187,8 +178,11 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri
                     while (parent instanceof JSBlockStatement || parent instanceof JSIfStatement || parent instanceof JSLoopStatement) {
                         PsiElement newAnchor = parent.getParent();
 
-                        if (newAnchor instanceof JSIfStatement || newAnchor instanceof JSWithStatement || newAnchor instanceof JSLoopStatement ||
-                            newAnchor instanceof JSTryStatement || newAnchor instanceof JSSwitchStatement) {
+                        if (newAnchor instanceof JSIfStatement
+                            || newAnchor instanceof JSWithStatement
+                            || newAnchor instanceof JSLoopStatement
+                            || newAnchor instanceof JSTryStatement
+                            || newAnchor instanceof JSSwitchStatement) {
                             anchor = newAnchor;
                             parent = anchor.getParent();
                             anchorChanged = true;
@@ -204,16 +198,15 @@ else if (newAnchor instanceof JSFile) {
                     }
                 }
 
-                final TextRange textRange = anchor.getTextRange();
-                final int startOffset = textRange.getStartOffset();
-                @NonNls StringBuilder builder = new StringBuilder();
+                TextRange textRange = anchor.getTextRange();
+                int startOffset = textRange.getStartOffset();
+                StringBuilder builder = new StringBuilder();
                 builder.append(VAR_STATEMENT_START);
 
-                if (anchor instanceof JSExpressionStatement) {
-                    JSExpression expr = ((JSExpressionStatement)anchor).getExpression();
-                    if (expr instanceof JSAssignmentExpression && ((JSAssignmentExpression)expr).getOperationSign() != JSTokenTypes.EQ) {
-                        anchorChanged = true;
-                    }
+                if (anchor instanceof JSExpressionStatement expressionStatement
+                    && expressionStatement.getExpression() instanceof JSAssignmentExpression assignment
+                    && assignment.getOperationSign() != JSTokenTypes.EQ) {
+                    anchorChanged = true;
                 }
 
                 if ((anchorChanged || !(anchor instanceof JSExpressionStatement)) && !implicitlyDeclared) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
index 2018dbed..9043095b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
@@ -26,6 +26,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.util.JSUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.codeEditor.Editor;
 import consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory;
@@ -46,12 +47,10 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.xml.ide.highlighter.XmlFileType;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiFunction;
 
@@ -60,24 +59,22 @@
  */
 @ExtensionImpl
 public class JSUnresolvedFunctionInspection extends JSInspection {
-    @NonNls
     private static final String SHORT_NAME = "JSUnresolvedFunction";
 
-    @Override
     @Nonnull
+    @Override
     public String getGroupDisplayName() {
         return "General";
     }
 
-    @Override
     @Nonnull
+    @Override
     public String getDisplayName() {
         return JavaScriptLocalize.jsUnresolvedFunctionInspectionName().get();
     }
 
-    @Override
     @Nonnull
-    @NonNls
+    @Override
     public String getShortName() {
         return SHORT_NAME;
     }
@@ -86,11 +83,10 @@ public String getShortName() {
     protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
-            public void visitJSCallExpression(final JSCallExpression node) {
-                final JSExpression methodExpression = node.getMethodExpression();
-
-                if (methodExpression instanceof JSReferenceExpression referenceExpression) {
-                    final ResolveResult[] resolveResults = referenceExpression.multiResolve(false);
+            @RequiredReadAction
+            public void visitJSCallExpression(@Nonnull JSCallExpression node) {
+                if (node.getMethodExpression() instanceof JSReferenceExpression methodRefExpr) {
+                    ResolveResult[] resolveResults = methodRefExpr.multiResolve(false);
 
                     boolean noCompleteResolve = true;
 
@@ -104,14 +100,11 @@ public void visitJSCallExpression(final JSCallExpression node) {
                             if (element instanceof JSVariable variable) {
                                 String typeText = variable.getTypeString();
 
-                                if (typeText != null && !"*".equals(typeText)) {
-                                    if (!allowMemberReference(inNewExpression, typeText)) {
-                                        holder.registerProblem(
-                                            referenceExpression.getReferenceNameElement(),
-                                            JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction().get(),
-                                            getHighlightTypeForTypeOrSignatureProblem(node)
-                                        );
-                                    }
+                                if (typeText != null && !"*".equals(typeText) && !allowMemberReference(inNewExpression, typeText)) {
+                                    holder.newProblem(JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction())
+                                        .range(methodRefExpr.getReferenceNameElement())
+                                        .highlightType(getHighlightTypeForTypeOrSignatureProblem(node))
+                                        .create();
                                 }
                             }
                             else if (element instanceof JSFunction function && function.isGetProperty()) {
@@ -130,27 +123,27 @@ else if (element instanceof JSFunction function && function.isGetProperty()) {
                                         };
                                     }
 
-                                    holder.registerProblem(
-                                        ((JSReferenceExpression)methodExpression).getReferenceNameElement(),
-                                        JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction2().get(),
-                                        getHighlightTypeForTypeOrSignatureProblem(node),
-                                        fixes
-                                    );
+                                    holder.newProblem(JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction2())
+                                        .range(methodRefExpr.getReferenceNameElement())
+                                        .highlightType(getHighlightTypeForTypeOrSignatureProblem(node))
+                                        .withFixes(fixes)
+                                        .create();
                                 }
                             }
                             break;
                         }
                     }
-                    JavaScriptQuickFixFactory javaScriptQuickFixFactory = JavaScriptQuickFixFactory.byElement(referenceExpression);
+                    JavaScriptQuickFixFactory javaScriptQuickFixFactory = JavaScriptQuickFixFactory.byElement(methodRefExpr);
 
                     if (resolveResults.length == 0 || noCompleteResolve) {
-                        final JSExpression qualifier = referenceExpression.getQualifier();
-                        final List<LocalQuickFix> quickFixes = new LinkedList<LocalQuickFix>();
-                        final String refName = referenceExpression.getReferencedName();
+                        JSExpression qualifier = methodRefExpr.getQualifier();
+                        List<LocalQuickFix> quickFixes = new ArrayList<>();
+                        String refName = methodRefExpr.getReferencedName();
 
-                        if (myOnTheFly && ((qualifier == null || qualifier instanceof JSThisExpression) || JSUtils.isLHSExpression(qualifier))) {
-                            if (methodExpression.getParent() instanceof JSCallExpression) {
-                                boolean simpleJs = !JavaScriptVersionUtil.containsFeature(referenceExpression, JavaScriptFeature.CLASS);
+                        if (myOnTheFly && ((qualifier == null || qualifier instanceof JSThisExpression)
+                            || JSUtils.isLHSExpression(qualifier))) {
+                            if (node.getMethodExpression().getParent() instanceof JSCallExpression) {
+                                boolean simpleJs = !JavaScriptVersionUtil.containsFeature(methodRefExpr, JavaScriptFeature.CLASS);
 
                                 if (!inNewExpression || simpleJs) {
                                     quickFixes.add(javaScriptQuickFixFactory.createFunctionOrMethodFix(refName, true));
@@ -161,67 +154,61 @@ else if (element instanceof JSFunction function && function.isGetProperty()) {
                                         quickFixes.add(javaScriptQuickFixFactory.createFunctionOrMethodFix(refName, false));
                                     }
                                     else {
-                                        quickFixes.add(new AddImportECMAScriptClassOrFunctionAction(null, referenceExpression));
+                                        quickFixes.add(new AddImportECMAScriptClassOrFunctionAction(null, methodRefExpr));
                                         if (inNewExpression) {
-                                            quickFixes.add(new CreateClassOrInterfaceAction(referenceExpression, false));
+                                            quickFixes.add(new CreateClassOrInterfaceAction(methodRefExpr, false));
                                         }
                                     }
                                 }
                             }
                         }
 
-                        final PsiElement referenceNameElement = referenceExpression.getReferenceNameElement();
+                        PsiElement referenceNameElement = methodRefExpr.getReferenceNameElement();
 
                         if (referenceNameElement != null) {
-                            holder.registerProblem(
-                                referenceNameElement,
-                                inNewExpression
-                                    ? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(refName).get()
-                                    : JavaScriptLocalize.javascriptUnresolvedFunctionNameMessage(refName).get(),
-                                getUnresolveReferenceHighlightType(qualifier, node),
-                                quickFixes.size() > 0 ? quickFixes.toArray(new LocalQuickFix[quickFixes.size()]) : null
-                            );
+                            holder.newProblem(
+                                    inNewExpression
+                                        ? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(refName)
+                                        : JavaScriptLocalize.javascriptUnresolvedFunctionNameMessage(refName)
+                                )
+                                .range(referenceNameElement)
+                                .highlightType(getUnresolveReferenceHighlightType(qualifier, node))
+                                .withFixes(quickFixes.size() > 0 ? quickFixes.toArray(new LocalQuickFix[quickFixes.size()]) : null)
+                                .create();
                         }
                     }
                     else {
                         PsiElement element = resolveResults[0].getElement();
 
                         if (inNewExpression && element instanceof JSClass jsClass && jsClass.isInterface()) {
-                            final PsiElement referenceNameElement = referenceExpression.getReferenceNameElement();
-
-                            holder.registerProblem(
-                                referenceNameElement,
-                                JavaScriptLocalize.javascriptInterfaceCanNotBeInstantiatedMessage().get(),
-                                getUnresolveReferenceHighlightType(referenceExpression.getQualifier(), node)
-                            );
+                            holder.newProblem(JavaScriptLocalize.javascriptInterfaceCanNotBeInstantiatedMessage())
+                                .range(methodRefExpr.getReferenceNameElement())
+                                .highlightType(getUnresolveReferenceHighlightType(methodRefExpr.getQualifier(), node))
+                                .create();
                         }
                         else {
                             checkFunction(node, element, holder);
                         }
                     }
                 }
-                else if (methodExpression instanceof JSSuperExpression) {
-                    final PsiElement element = (methodExpression.getReference()).resolve();
+                else if (node.getMethodExpression() instanceof JSSuperExpression superExpression) {
+                    PsiElement element = superExpression.getReference().resolve();
 
                     if (element != null) {
                         checkFunction(node, element, holder);
                     }
                 }
-                else if (methodExpression instanceof JSNewExpression newExpression) {
-                    JSExpression methodExpr = newExpression.getMethodExpression();
-
-                    if (methodExpr instanceof JSReferenceExpression referenceExpression) {
-                        ResolveResult[] results = referenceExpression.multiResolve(false);
-                        PsiElement elt;
-
-                        if (results.length > 0 && ((elt =
-                            results[0].getElement()) instanceof JSFunction && ((JSFunction)elt).isConstructor() || elt instanceof
-                            JSClass)) {
-                            holder.registerProblem(
-                                methodExpression,
-                                JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction().get(),
-                                getUnresolveReferenceHighlightType(null, node)
-                            );
+                else if (node.getMethodExpression() instanceof JSNewExpression newExpression) {
+                    if (newExpression.getMethodExpression() instanceof JSReferenceExpression methodRefExpr) {
+                        ResolveResult[] results = methodRefExpr.multiResolve(false);
+                        PsiElement element = results.length > 0 ? results[0].getElement() : null;
+                        if (element instanceof JSFunction function && function.isConstructor()
+                            || element instanceof JSClass) {
+
+                            holder.newProblem(JavaScriptLocalize.javascriptTermDoesNotEvaluateToFunction())
+                                .range(node.getMethodExpression())
+                                .highlightType(getUnresolveReferenceHighlightType(null, node))
+                                .create();
                         }
                     }
                 }
@@ -230,33 +217,31 @@ else if (methodExpression instanceof JSNewExpression newExpression) {
             }
 
             @Override
-            public void visitJSAssignmentExpression(final JSAssignmentExpression node) {
-                final JSExpression lOperand = node.getLOperand();
+            @RequiredReadAction
+            public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression node) {
+                JSExpression lOperand = node.getLOperand();
                 if (lOperand == null) {
                     return;
                 }
-                final JSExpression rOperand = node.getROperand();
+
+                JSExpression rOperand = node.getROperand();
                 if (rOperand == null) {
                     return;
                 }
 
-                final PsiFile containingFile = node.getContainingFile();
+                PsiFile containingFile = node.getContainingFile();
                 if (containingFile.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
                     return;
                 }
                 String expressionType = null;
 
-                if (lOperand instanceof JSDefinitionExpression) {
-                    JSExpression expression = ((JSDefinitionExpression)lOperand).getExpression();
-                    if (expression instanceof JSReferenceExpression) {
-                        PsiElement resolve = JSResolveUtil.unwrapProxy(((JSReferenceExpression)expression).resolve());
+                if (lOperand instanceof JSDefinitionExpression definition
+                    && definition.getExpression() instanceof JSReferenceExpression refExpr
+                    && JSResolveUtil.unwrapProxy(refExpr.resolve()) instanceof JSNamedElement namedElement) {
 
-                        if (resolve instanceof JSNamedElement) {
-                            expressionType = JSResolveUtil.getTypeFromSetAccessor((JSNamedElement)resolve);
-                            if (expressionType != null) {
-                                expressionType = JSImportHandlingUtil.resolveTypeName(expressionType, resolve);
-                            }
-                        }
+                    expressionType = JSResolveUtil.getTypeFromSetAccessor(namedElement);
+                    if (expressionType != null) {
+                        expressionType = JSImportHandlingUtil.resolveTypeName(expressionType, namedElement);
                     }
                 }
 
@@ -273,21 +258,22 @@ public void visitJSAssignmentExpression(final JSAssignmentExpression node) {
             }
 
             @Override
-            public void visitJSReturnStatement(final JSReturnStatement node) {
-                final JSExpression expression = node.getExpression();
+            @RequiredReadAction
+            public void visitJSReturnStatement(@Nonnull JSReturnStatement node) {
+                JSExpression expression = node.getExpression();
                 if (expression == null) {
                     return;
                 }
 
-                final JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
+                JSFunction fun = PsiTreeUtil.getParentOfType(node, JSFunction.class);
                 if (fun == null) {
                     return; // TODO: complain about it
                 }
-                final String typeString = fun.getReturnTypeString();
+                String typeString = fun.getReturnTypeString();
                 if (typeString == null) {
                     return;
                 }
-                final PsiFile containingFile = fun.getContainingFile();
+                PsiFile containingFile = fun.getContainingFile();
                 if (containingFile.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
                     return;
                 }
@@ -302,8 +288,9 @@ public void visitJSReturnStatement(final JSReturnStatement node) {
             }
 
             @Override
-            public void visitJSVariable(final JSVariable node) {
-                final JSExpression initializer = node.getInitializer();
+            @RequiredReadAction
+            public void visitJSVariable(@Nonnull JSVariable node) {
+                JSExpression initializer = node.getInitializer();
                 if (initializer == null) {
                     return;
                 }
@@ -317,24 +304,24 @@ public void visitJSVariable(final JSVariable node) {
             }
 
             @Override
-            public void visitJSBinaryExpression(JSBinaryExpression node) {
+            @RequiredReadAction
+            public void visitJSBinaryExpression(@Nonnull JSBinaryExpression node) {
                 IElementType sign = node.getOperationSign();
 
                 if (sign == JSTokenTypes.AS_KEYWORD || sign == JSTokenTypes.IS_KEYWORD) {
-                    JSExpression rOperand = node.getROperand();
-
-                    if (rOperand instanceof JSReferenceExpression) {
-                        ResolveResult[] results = ((JSReferenceExpression)rOperand).multiResolve(false);
+                    if (node.getROperand() instanceof JSReferenceExpression refExpr) {
+                        ResolveResult[] results = refExpr.multiResolve(false);
 
                         if (results.length > 0 && results[0].getElement() instanceof JSVariable) {
-                            checkTypeIs(rOperand, rOperand, holder, "Class");
+                            checkTypeIs(refExpr, refExpr, holder, "Class");
                         }
                     }
                 }
             }
 
             @Override
-            public void visitJSForInStatement(JSForInStatement node) {
+            @RequiredReadAction
+            public void visitJSForInStatement(@Nonnull JSForInStatement node) {
                 if (!node.isForEach()) {
                     JSVarStatement statement = node.getDeclarationStatement();
 
@@ -347,14 +334,13 @@ public void visitJSForInStatement(JSForInStatement node) {
                             PsiElement typeElement = var.getTypeElement();
                             String typeElementText;
 
-                            if (typeElement != null &&
-                                "Array".equals(expressionType) &&
-                                ("Object".equals(typeElementText = typeElement.getText()) || "*".equals(typeElementText))) {
-                                holder.registerProblem(
-                                    typeElement,
-                                    JavaScriptLocalize.javascriptIncorrectArrayTypeInForin().get(),
-                                    ProblemHighlightType.GENERIC_ERROR_OR_WARNING
-                                );
+                            if (typeElement != null
+                                && "Array".equals(expressionType)
+                                && ("Object".equals(typeElementText = typeElement.getText()) || "*".equals(typeElementText))) {
+                                holder.newProblem(JavaScriptLocalize.javascriptIncorrectArrayTypeInForin())
+                                    .range(typeElement)
+                                    .highlightType(ProblemHighlightType.GENERIC_ERROR_OR_WARNING)
+                                    .create();
                                 continue;
                             }
 
@@ -373,26 +359,26 @@ private static boolean allowMemberReference(boolean inNewExpression, String type
         return ("Class".equals(typeText) && inNewExpression) || "Function".equals(typeText);
     }
 
+    @RequiredReadAction
     private static void checkTypeIs(PsiElement type, PsiElement node, ProblemsHolder holder, String typeName) {
-        if (type instanceof JSReferenceExpression referenceExpression) {
-            String expressionType = JSResolveUtil.getQualifiedExpressionType(referenceExpression, referenceExpression.getContainingFile());
+        if (type instanceof JSReferenceExpression refExpr) {
+            String expressionType = JSResolveUtil.getQualifiedExpressionType(refExpr, refExpr.getContainingFile());
             if (!typeName.equals(expressionType)) {
-                holder.registerProblem(
-                    node,
-                    JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, expressionType).get(),
-                    getHighlightTypeForTypeOrSignatureProblem(node)
-                );
+                holder.newProblem(JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, expressionType))
+                    .range(node)
+                    .highlightType(getHighlightTypeForTypeOrSignatureProblem(node))
+                    .create();
             }
         }
         else if (type != null) {
-            holder.registerProblem(
-                node,
-                JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, type.getText()).get(),
-                getHighlightTypeForTypeOrSignatureProblem(node)
-            );
+            holder.newProblem(JavaScriptLocalize.javascriptIncorrectVariableTypeMismatch(typeName, type.getText()))
+                .range(node)
+                .highlightType(getHighlightTypeForTypeOrSignatureProblem(node))
+                .create();
         }
     }
 
+    @RequiredReadAction
     private static void checkTypeIs(JSExpression rOperand, PsiElement node, ProblemsHolder holder, String typeName) {
         String expressionType = JSResolveUtil.getQualifiedExpressionType(rOperand, rOperand.getContainingFile());
         if (!typeName.equals(expressionType)) {
@@ -404,10 +390,11 @@ private static void checkTypeIs(JSExpression rOperand, PsiElement node, Problems
         }
     }
 
-    static ProblemHighlightType getUnresolveReferenceHighlightType(final @Nullable JSExpression qualifier, @Nonnull JSExpression node) {
+    @RequiredReadAction
+    static ProblemHighlightType getUnresolveReferenceHighlightType(@Nullable JSExpression qualifier, @Nonnull JSExpression node) {
         JSClass jsClass;
 
-        final PsiFile containingFile = node.getContainingFile();
+        PsiFile containingFile = node.getContainingFile();
         if (qualifier != null) {
             jsClass = JSResolveUtil.findClassOfQualifier(qualifier, containingFile);
 
@@ -436,11 +423,11 @@ else if (resultElement instanceof JSFunction function) {
             jsClass = JSResolveUtil.getClassOfContext(node);
         }
 
-        final boolean ecmaL4File = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+        boolean ecmaL4File = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
 
-        if (jsClass != null && ecmaL4File &&
-            (!(jsClass instanceof XmlBackedJSClassImpl) || jsClass.getContainingFile().getFileType() == XmlFileType.INSTANCE)) {
-            final JSAttributeList attributeList = jsClass.getAttributeList();
+        if (jsClass != null && ecmaL4File
+            && (!(jsClass instanceof XmlBackedJSClassImpl) || jsClass.getContainingFile().getFileType() == XmlFileType.INSTANCE)) {
+            JSAttributeList attributeList = jsClass.getAttributeList();
             if (attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
                 return ProblemHighlightType.ERROR;
             }
@@ -452,10 +439,11 @@ else if (resultElement instanceof JSFunction function) {
         return ProblemHighlightType.LIKE_UNKNOWN_SYMBOL;
     }
 
-    private static void checkFunction(final JSCallExpression node, final PsiElement element, final ProblemsHolder holder) {
+    @RequiredReadAction
+    private static void checkFunction(JSCallExpression node, PsiElement element, ProblemsHolder holder) {
         if (element instanceof JSFunction function) {
             if (!function.isGetProperty() || !"Function".equals(function.getReturnTypeString())) {
-                final JSParameterList parameterList = function.getParameterList();
+                JSParameterList parameterList = function.getParameterList();
 
                 if (parameterList != null) {
                     checkCallParameters(node, parameterList.getParameters(), function.isReferencesArguments(), holder);
@@ -469,29 +457,31 @@ else if (element instanceof JSClass) {
             else {
                 JSArgumentList argumentList = node.getArgumentList();
                 if (argumentList == null || argumentList.getArguments().length != 1) {
-                    holder.registerProblem(
-                        argumentList != null ? argumentList : node,
-                        JavaScriptLocalize.javascriptInvalidNumberOfParameters("one").get(),
-                        getHighlightTypeForTypeOrSignatureProblem(node)
-                    );
+                    holder.newProblem(JavaScriptLocalize.javascriptInvalidNumberOfParameters("one"))
+                        .range(argumentList != null ? argumentList : node)
+                        .highlightType(getHighlightTypeForTypeOrSignatureProblem(node))
+                        .create();
                 }
             }
         }
     }
 
+    @RequiredReadAction
     private static void checkCallParameters(
-        final JSCallExpression node, final JSParameter[] parameters, boolean functionReferencesArguments,
-        final ProblemsHolder holder
+        JSCallExpression node,
+        JSParameter[] parameters,
+        boolean functionReferencesArguments,
+        ProblemsHolder holder
     ) {
-        final JSArgumentList argumentList = node.getArgumentList();
-        final JSExpression[] expressions = argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
+        JSArgumentList argumentList = node.getArgumentList();
+        JSExpression[] expressions = argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
 
         boolean lastIsRest = false;
         int minParameterLength = 0;
         int maxParameterLength = parameters.length;
 
         for (int i = 0; i < parameters.length; ++i) {
-            final JSParameter parameter = parameters[i];
+            JSParameter parameter = parameters[i];
             if (parameter.isOptional()) {
                 break;
             }
@@ -510,7 +500,7 @@ private static void checkCallParameters(
         }
 
         if ((expressions.length < minParameterLength || expressions.length > maxParameterLength) && !functionReferencesArguments) {
-            final String s = (lastIsRest ? minParameterLength + " or more " : String.valueOf(minParameterLength) +
+            String s = (lastIsRest ? minParameterLength + " or more " : String.valueOf(minParameterLength) +
                 (minParameterLength != maxParameterLength ? ".." + maxParameterLength : ""));
             holder.registerProblem(
                 argumentList != null ? argumentList : node,
@@ -520,7 +510,7 @@ private static void checkCallParameters(
         }
         else {
             int i = 0;
-            final PsiFile containingFile = node.getContainingFile();
+            PsiFile containingFile = node.getContainingFile();
 
             for (JSParameter p : parameters) {
                 if (i == expressions.length) {
@@ -541,14 +531,15 @@ private static void checkCallParameters(
         }
     }
 
+    @RequiredReadAction
     private static void checkExpressionIsAssignableToVariable(
-        final JSVariable p,
+        JSVariable p,
         JSExpression expr,
-        final ProblemsHolder holder,
-        final PsiFile containingFile,
-        final BiFunction<Object, Object, LocalizeValue> messageGenerator
+        ProblemsHolder holder,
+        PsiFile containingFile,
+        BiFunction<Object, Object, LocalizeValue> messageGenerator
     ) {
-        final String parameterTypeResolved = JSImportHandlingUtil.resolveTypeName(p.getTypeString(), p);
+        String parameterTypeResolved = JSImportHandlingUtil.resolveTypeName(p.getTypeString(), p);
         checkExpressionIsAssignableToType(
             expr,
             parameterTypeResolved,
@@ -558,28 +549,29 @@ private static void checkExpressionIsAssignableToVariable(
         );
     }
 
+    @RequiredReadAction
     private static void checkExpressionIsAssignableToType(
-        final JSExpression expr,
-        final String type,
-        final ProblemsHolder holder,
-        final PsiFile containingFile,
-        final BiFunction<Object, Object, LocalizeValue> messageGenerator
+        JSExpression expr,
+        String type,
+        ProblemsHolder holder,
+        PsiFile containingFile,
+        BiFunction<Object, Object, LocalizeValue> messageGenerator
     ) {
         if ("*".equals(type) || type == null) {
             return; // optimization
         }
-        final String expressionType = JSResolveUtil.getQualifiedExpressionType(expr, containingFile);
+        String expressionType = JSResolveUtil.getQualifiedExpressionType(expr, containingFile);
 
         if (!JSResolveUtil.isAssignableType(type, expressionType, containingFile)) {
-            holder.registerProblem(
-                expr,
-                messageGenerator.apply(type, expressionType).get(),
-                getHighlightTypeForTypeOrSignatureProblem(expr),
-                new JSInsertCastFix(type)
-            );
+            holder.newProblem(messageGenerator.apply(type, expressionType))
+                .range(expr)
+                .highlightType(getHighlightTypeForTypeOrSignatureProblem(expr))
+                .withFix(new JSInsertCastFix(type))
+                .create();
         }
     }
 
+    @RequiredReadAction
     private static ProblemHighlightType getHighlightTypeForTypeOrSignatureProblem(@Nonnull PsiElement node) {
         if (node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
             return ProblemHighlightType.GENERIC_ERROR;
@@ -590,7 +582,7 @@ private static ProblemHighlightType getHighlightTypeForTypeOrSignatureProblem(@N
     private static class JSInsertCastFix implements LocalQuickFix {
         private final String type;
 
-        public JSInsertCastFix(final String type) {
+        public JSInsertCastFix(String type) {
             this.type = type;
         }
 
@@ -607,19 +599,20 @@ public String getFamilyName() {
         }
 
         @Override
-        public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
-            final PsiElement element = descriptor.getPsiElement();
-            final Editor editor = BaseCreateFix.getEditor(project, element.getContainingFile());
+        @RequiredReadAction
+        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+            PsiElement element = descriptor.getPsiElement();
+            Editor editor = BaseCreateFix.getEditor(project, element.getContainingFile());
             if (editor == null) {
                 return;
             }
 
-            final String shortenedType = JSResolveUtil.getShortenedType(this.type, element);
-            final TemplateManager templateManager = TemplateManager.getInstance(project);
+            String shortenedType = JSResolveUtil.getShortenedType(this.type, element);
+            TemplateManager templateManager = TemplateManager.getInstance(project);
             Template template = templateManager.createTemplate("", "", shortenedType + "($SELECTION$)");
             template.setToReformat(true);
 
-            final int offset = element.getTextOffset();
+            int offset = element.getTextOffset();
             editor.getSelectionModel().setSelection(offset, offset + element.getTextLength());
             editor.getCaretModel().moveToOffset(offset);
             templateManager.startTemplate(editor, element.getText(), template);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
index 94dceb46..1765e1ac 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
@@ -37,10 +37,8 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.util.PsiTreeUtil;
-import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -51,24 +49,22 @@
  */
 @ExtensionImpl
 public class JSUnresolvedVariableInspection extends JSInspection {
-    @NonNls
     private static final String SHORT_NAME = "JSUnresolvedVariable";
 
-    @Override
     @Nonnull
+    @Override
     public String getGroupDisplayName() {
         return "General";
     }
 
-    @Override
     @Nonnull
+    @Override
     public String getDisplayName() {
         return JavaScriptLocalize.jsUnresolvedVariableInspectionName().get();
     }
 
-    @Override
     @Nonnull
-    @NonNls
+    @Override
     public String getShortName() {
         return SHORT_NAME;
     }
@@ -77,11 +73,12 @@ public String getShortName() {
     protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
-            public void visitJSReferenceExpression(final JSReferenceExpression node) {
-                final PsiElement parentElement = node.getParent();
+            @RequiredReadAction
+            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
+                PsiElement parentElement = node.getParent();
 
                 if (node.shouldCheckReferences() && !(parentElement instanceof JSCallExpression)) {
-                    final ResolveResult[] resolveResults = node.multiResolve(false);
+                    ResolveResult[] resolveResults = node.multiResolve(false);
                     boolean emptyResolve = resolveResults.length == 0;
                     boolean noCompleteResolve = true;
 
@@ -93,20 +90,19 @@ public void visitJSReferenceExpression(final JSReferenceExpression node) {
                     }
 
                     if (emptyResolve || noCompleteResolve) {
-                        final PsiElement nameIdentifier = node.getReferenceNameElement();
+                        PsiElement nameIdentifier = node.getReferenceNameElement();
 
                         if (nameIdentifier != null) {
-                            final List<LocalQuickFix> fixes = new LinkedList<LocalQuickFix>();
-                            final JSExpression qualifier = node.getQualifier();
+                            List<LocalQuickFix> fixes = new LinkedList<>();
+                            JSExpression qualifier = node.getQualifier();
 
                             if (myOnTheFly) {
-                                final PsiFile containingFile = node.getContainingFile();
-                                final boolean ecma = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+                                PsiFile containingFile = node.getContainingFile();
+                                boolean ecma = containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
 
-                                if ((qualifier == null ||
-                                    JSUtils.isLHSExpression(qualifier) ||
-                                    qualifier instanceof JSThisExpression) && (!(parentElement instanceof JSDefinitionExpression) || ecma)) {
-                                    final String referencedName = node.getReferencedName();
+                                if ((qualifier == null || JSUtils.isLHSExpression(qualifier) || qualifier instanceof JSThisExpression)
+                                    && (!(parentElement instanceof JSDefinitionExpression) || ecma)) {
+                                    String referencedName = node.getReferencedName();
                                     boolean isField = qualifier != null;
                                     JSClass contextClass = null;
 
@@ -121,19 +117,20 @@ public void visitJSReferenceExpression(final JSReferenceExpression node) {
                                         if (node.getParent() instanceof JSArgumentList) {
                                             fixes.add(new CreateJSFunctionOrMethodFix(
                                                 referencedName,
-                                                !(qualifier == null || (qualifier instanceof
-                                                    JSThisExpression && ecma))
+                                                !(qualifier == null || (qualifier instanceof JSThisExpression && ecma))
                                             ) {
                                                 @Override
+                                                @RequiredReadAction
                                                 protected void addParameters(
                                                     Template template,
                                                     JSReferenceExpression referenceExpression,
                                                     PsiFile file,
                                                     Set<JavaScriptFeature> features
                                                 ) {
-                                                    JSExpression method = ((JSCallExpression)referenceExpression.getParent()
-                                                        .getParent()).getMethodExpression();
-                                                    if (method instanceof JSReferenceExpression && "bindSetter".equals(((JSReferenceExpression)method).getReferencedName())) {
+                                                    JSCallExpression call = (JSCallExpression)referenceExpression.getParent().getParent();
+                                                    JSExpression method = call.getMethodExpression();
+                                                    if (method instanceof JSReferenceExpression methodRefExpr
+                                                        && "bindSetter".equals(methodRefExpr.getReferencedName())) {
                                                         MyExpression expression = new MyExpression("value");
                                                         template.addVariable("value", expression, expression, false);
                                                         if (ecma) {
@@ -143,6 +140,7 @@ protected void addParameters(
                                                 }
 
                                                 @Override
+                                                @RequiredReadAction
                                                 protected void addReturnType(
                                                     Template template,
                                                     JSReferenceExpression referenceExpression,
@@ -158,7 +156,7 @@ protected void addReturnType(
                                         JSClass targetClass = contextClass;
 
                                         if (qualifier instanceof JSReferenceExpression) {
-                                            final JSClass clazz = JSResolveUtil.findClassOfQualifier(qualifier, containingFile);
+                                            JSClass clazz = JSResolveUtil.findClassOfQualifier(qualifier, containingFile);
                                             if (clazz != null) {
                                                 targetClass = clazz;
                                             }
@@ -183,19 +181,18 @@ protected void addReturnType(
                                             JSCallExpression expression = PsiTreeUtil.getParentOfType(node, JSCallExpression.class);
 
                                             if (expression != null) {
-                                                final JSExpression methodExpression = expression.getMethodExpression();
+                                                JSExpression methodExpression = expression.getMethodExpression();
 
-                                                if (methodExpression instanceof JSReferenceExpression) {
-                                                    final String methodName = ((JSReferenceExpression)methodExpression).getReferencedName();
+                                                if (methodExpression instanceof JSReferenceExpression methodRefExpr) {
+                                                    String methodName = methodRefExpr.getReferencedName();
 
                                                     if ("addEventListener".equals(methodName) || "removeEventListener".equals(methodName)) {
-                                                        final JSArgumentList argumentList = expression.getArgumentList();
-                                                        final JSExpression[] params =
+                                                        JSArgumentList argumentList = expression.getArgumentList();
+                                                        JSExpression[] params =
                                                             argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
 
-                                                        if (params.length >= 2 && params[0] instanceof JSReferenceExpression) {
-                                                            final JSExpression eventNameQualifier =
-                                                                ((JSReferenceExpression)params[0]).getQualifier();
+                                                        if (params.length >= 2 && params[0] instanceof JSReferenceExpression paramRefExpr) {
+                                                            JSExpression eventNameQualifier = paramRefExpr.getQualifier();
                                                             if (eventNameQualifier != null) {
                                                                 fixes.add(new CreateJSEventMethod(invokedName, eventNameQualifier));
                                                             }
@@ -222,18 +219,17 @@ protected void addReturnType(
                                 }
                             }
 
-                            final LocalizeValue message = node.getQualifier() == null
-                                ? JSResolveUtil.isExprInTypeContext(node)
-                                ? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(node.getReferencedName())
-                                : JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage(node.getReferencedName())
-                                : JavaScriptLocalize.javascriptUnresolvedVariableNameMessage(node.getReferencedName());
-
-                            holder.registerProblem(
-                                nameIdentifier,
-                                message.get(),
-                                JSUnresolvedFunctionInspection.getUnresolveReferenceHighlightType(qualifier, node),
-                                fixes.size() > 0 ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null
-                            );
+                            holder.newProblem(
+                                    node.getQualifier() == null
+                                        ? JSResolveUtil.isExprInTypeContext(node)
+                                        ? JavaScriptLocalize.javascriptUnresolvedTypeNameMessage(node.getReferencedName())
+                                        : JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage(node.getReferencedName())
+                                        : JavaScriptLocalize.javascriptUnresolvedVariableNameMessage(node.getReferencedName())
+                                )
+                                .range(nameIdentifier)
+                                .highlightType(JSUnresolvedFunctionInspection.getUnresolveReferenceHighlightType(qualifier, node))
+                                .withFixes(fixes.size() > 0 ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null)
+                                .create();
                         }
                     }
                 }
@@ -270,12 +266,12 @@ public String getName() {
         @RequiredReadAction
         @Override
         protected void buildTemplate(
-            final Template template,
-            final JSReferenceExpression referenceExpression,
-            final Set<JavaScriptFeature> features,
+            Template template,
+            JSReferenceExpression referenceExpression,
+            Set<JavaScriptFeature> features,
             boolean staticContext,
-            final PsiFile file,
-            final PsiElement anchorParent
+            PsiFile file,
+            PsiElement anchorParent
         ) {
             template.addTextSegment("/** @namespace ");
             template.addTextSegment(referenceExpression.getText() + " */");
@@ -284,9 +280,7 @@ protected void buildTemplate(
     }
 
     private static class CreateJSVariableIntentionAction extends BaseCreateJSVariableIntentionAction {
-        @NonNls
         private static final String VAR_STATEMENT_START = "var ";
-        @NonNls
         private static final String CONSTANT_STATEMENT_START = "const ";
         private boolean isField;
         private boolean isConstant;
@@ -312,16 +306,16 @@ public String getName() {
         @RequiredReadAction
         @Override
         protected void buildTemplate(
-            final Template template,
-            final JSReferenceExpression referenceExpression,
-            final Set<JavaScriptFeature> features,
+            Template template,
+            JSReferenceExpression referenceExpression,
+            Set<JavaScriptFeature> features,
             boolean staticContext,
-            final PsiFile file,
-            final PsiElement anchorParent
+            PsiFile file,
+            PsiElement anchorParent
         ) {
             boolean classFeature = features.contains(JavaScriptFeature.CLASS);
 
-            final JSExpression qualifier = addAccessModifier(template, referenceExpression, classFeature, staticContext);
+            JSExpression qualifier = addAccessModifier(template, referenceExpression, classFeature, staticContext);
             if (qualifier == null || classFeature) {
                 template.addTextSegment(isConstant ? CONSTANT_STATEMENT_START : VAR_STATEMENT_START);
             }
@@ -370,6 +364,7 @@ protected void writeFunctionAndName(Template template, String referencedName, Se
         }
 
         @Override
+        @RequiredReadAction
         protected void addParameters(Template template, JSReferenceExpression refExpr, PsiFile file, Set<JavaScriptFeature> features) {
             if (!myIsGetter) {
                 template.addTextSegment(refExpr.getReferencedName() + ":");
@@ -378,6 +373,7 @@ protected void addParameters(Template template, JSReferenceExpression refExpr, P
         }
 
         @Override
+        @RequiredReadAction
         protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile file) {
             if (myIsGetter) {
                 guessTypeAndAddTemplateVariable(template, referenceExpression, file);
@@ -431,12 +427,14 @@ public CreateJSEventMethod(String invokedName, JSExpression eventNameQualifier)
 
 
         @Override
+        @RequiredReadAction
         protected void addParameters(Template template, JSReferenceExpression refExpr, PsiFile file, Set<JavaScriptFeature> features) {
             template.addTextSegment("event:");
             template.addTextSegment(myEventQualifier.getText());
         }
 
         @Override
+        @RequiredReadAction
         protected void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile psifile) {
             template.addTextSegment("void");
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
index a68d42d8..5663e8d1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
@@ -20,8 +20,9 @@
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSPsiImplUtils;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.application.ApplicationManager;
+import consulo.application.Application;
 import consulo.codeEditor.Editor;
 import consulo.fileEditor.FileEditorManager;
 import consulo.javascript.language.JavaScriptFeature;
@@ -42,8 +43,6 @@
 import consulo.navigation.OpenFileDescriptor;
 import consulo.navigation.OpenFileDescriptorFactory;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.Collections;
@@ -53,17 +52,16 @@
  */
 @ExtensionImpl
 public class JSUntypedDeclarationInspection extends JSInspection {
-    @NonNls
     public static final String SHORT_NAME = "JSUntypedDeclaration";
 
-    @Override
     @Nonnull
+    @Override
     public String getGroupDisplayName() {
         return "General";
     }
 
-    @Override
     @Nonnull
+    @Override
     public String getDisplayName() {
         return JavaScriptLocalize.jsUntypedDeclarationInspectionName().get();
     }
@@ -76,7 +74,6 @@ public HighlightDisplayLevel getDefaultLevel() {
 
     @Override
     @Nonnull
-    @NonNls
     public String getShortName() {
         return SHORT_NAME;
     }
@@ -85,17 +82,20 @@ public String getShortName() {
     protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
-            public void visitJSVariable(final JSVariable node) {
+            @RequiredReadAction
+            public void visitJSVariable(@Nonnull JSVariable node) {
                 process(node, holder);
             }
 
             @Override
-            public void visitJSFunctionExpression(final JSFunctionExpression node) {
+            @RequiredReadAction
+            public void visitJSFunctionExpression(@Nonnull JSFunctionExpression node) {
                 process(node.getFunction(), holder);
             }
 
             @Override
-            public void visitJSFunctionDeclaration(final JSFunction node) {
+            @RequiredReadAction
+            public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
                 if (node.isConstructor() || node.isSetProperty()) {
                     return;
                 }
@@ -104,7 +104,8 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
         };
     }
 
-    private static void process(final JSNamedElement node, final ProblemsHolder holder) {
+    @RequiredReadAction
+    private static void process(JSNamedElement node, ProblemsHolder holder) {
         if (node.getContainingFile().getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
             return;
         }
@@ -112,43 +113,43 @@ private static void process(final JSNamedElement node, final ProblemsHolder hold
 
         if (nameIdentifier != null &&
             JSPsiImplUtils.getTypeFromDeclaration(node) == null &&
-            (!(node instanceof JSParameter) || !((JSParameter)node).isRest())) {
+            !(node instanceof JSParameter parameter && parameter.isRest())) {
             LocalizeValue description = node instanceof JSFunction
                 ? JavaScriptLocalize.jsUntypedFunctionProblem(nameIdentifier.getText())
                 : JavaScriptLocalize.jsUntypedVariableProblem(nameIdentifier.getText());
-            holder.registerProblem(
-                nameIdentifier,
-                description.get(),
-                ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                new AddTypeToDclFix()
-            );
+
+            holder.newProblem(description)
+                .range(nameIdentifier)
+                .highlightType(ProblemHighlightType.GENERIC_ERROR_OR_WARNING)
+                .withFix(new AddTypeToDclFix())
+                .create();
         }
     }
 
     private static class AddTypeToDclFix implements LocalQuickFix {
-
-        @Override
         @Nonnull
+        @Override
         public String getName() {
             return JavaScriptLocalize.jsUntypedDeclarationProblemAddtypeFix().get();
         }
 
-        @Override
         @Nonnull
+        @Override
         public String getFamilyName() {
             return getName();
         }
 
         @Override
-        public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
+        @RequiredReadAction
+        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
             PsiElement anchor = descriptor.getPsiElement();
             PsiFile containingFile = anchor.getContainingFile();
             if (!FileModificationService.getInstance().prepareFileForWrite(containingFile)) {
                 return;
             }
 
-            if (anchor.getParent() instanceof JSFunction) {
-                anchor = ((JSFunction)anchor.getParent()).getParameterList();
+            if (anchor.getParent() instanceof JSFunction function) {
+                anchor = function.getParameterList();
             }
 
             OpenFileDescriptor openDescriptor = OpenFileDescriptorFactory.getInstance(project)
@@ -162,10 +163,10 @@ public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescr
             Template t = templateManager.createTemplate("", "");
             t.addTextSegment(":");
             boolean hasDetectedTypeFromUsage = false;
-            final PsiElement anchorParent = anchor.getParent();
+            PsiElement anchorParent = anchor.getParent();
 
-            if (anchorParent instanceof JSVariable) {
-                final JSExpression expression = ((JSVariable)anchorParent).getInitializer();
+            if (anchorParent instanceof JSVariable variable) {
+                JSExpression expression = variable.getInitializer();
 
                 if (expression != null) {
                     BaseCreateFix.guessExprTypeAndAddSuchVariable(
@@ -181,7 +182,7 @@ public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescr
 
             if (!hasDetectedTypeFromUsage) {
                 String defaultValue = "uint";
-                if (ApplicationManager.getApplication().isUnitTestMode()) {
+                if (Application.get().isUnitTestMode()) {
                     t.addTextSegment(defaultValue);
                 }
                 else {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
index 6999fb54..d3d0d5d4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
@@ -23,12 +23,10 @@
 import com.intellij.lang.javascript.psi.impl.JSClassImpl;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
-import consulo.language.editor.inspection.LocalQuickFix;
-import consulo.language.editor.inspection.ProblemDescriptor;
-import consulo.language.editor.inspection.ProblemHighlightType;
-import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.inspection.*;
 import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -42,8 +40,6 @@
 import consulo.util.collection.primitive.objects.ObjectIntMap;
 import consulo.util.collection.primitive.objects.ObjectMaps;
 import consulo.util.dataholder.Key;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.BitSet;
@@ -57,46 +53,44 @@
 @ExtensionImpl
 public class JSUnusedLocalSymbolsInspection extends JSInspection {
     private static final Logger LOG = Logger.getInstance("JSUnusedLocalSymbols");
-    @NonNls
     public static final String SHORT_NAME = "JSUnusedLocalSymbols";
 
-    @Override
     @Nonnull
+    @Override
     public String getGroupDisplayName() {
         return "General";
     }
 
-    @Override
     @Nonnull
+    @Override
     public String getDisplayName() {
         return JavaScriptLocalize.jsUnusedLocalSymbolInspectionName().get();
     }
 
-    @Override
     @Nonnull
-    @NonNls
+    @Override
     public String getShortName() {
         return SHORT_NAME;
     }
 
-    private static final Key<Set<PsiElement>> ourUnusedLocalDeclarationsSetKey = Key.create("js unused local dcls key");
-    private static final Key<Set<PsiElement>> ourUsedLocalDeclarationsSetKey = Key.create("js used local functions key");
+    private static final Key<Set<PsiElement>> UNUSED_LOCAL_DECLARATIONS_SET_KEY = Key.create("js unused local dcls key");
+    private static final Key<Set<PsiElement>> USED_LOCAL_DECLARATIONS_SET_KEY = Key.create("js used local functions key");
 
     @Override
     protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
-            public void visitJSVariable(final JSVariable node) {
+            public void visitJSVariable(@Nonnull JSVariable node) {
                 handleLocalDeclaration(node);
             }
 
             @Override
-            public void visitJSParameterList(final JSParameterList node) {
+            public void visitJSParameterList(@Nonnull JSParameterList node) {
                 PsiElement parent = node.getParent();
-                final Set<PsiElement> set = parent.getUserData(ourUnusedLocalDeclarationsSetKey);
+                Set<PsiElement> set = parent.getUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY);
 
                 if (set == null) {
-                    parent.putUserData(ourUnusedLocalDeclarationsSetKey, Collections.synchronizedSet(new HashSet<PsiElement>(3)));
+                    parent.putUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY, Collections.synchronizedSet(new HashSet<>(3)));
                 }
                 else if (node.getParameters().length == 0) {
                     set.clear();
@@ -104,16 +98,17 @@ else if (node.getParameters().length == 0) {
             }
 
             @Override
-            public void visitFile(final PsiFile file) {
-                final Set<PsiElement> set = file.getUserData(ourUnusedLocalDeclarationsSetKey);
+            public void visitFile(PsiFile file) {
+                Set<PsiElement> set = file.getUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY);
                 if (set != null) {
                     set.clear();
                 }
             }
 
             @Override
-            public void visitJSParameter(final JSParameter node) {
-                final PsiElement scopeNode = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSCatchBlock.class);
+            @RequiredReadAction
+            public void visitJSParameter(@Nonnull JSParameter node) {
+                PsiElement scopeNode = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSCatchBlock.class);
 
                 if (scopeNode == null || scopeNode instanceof JSCatchBlock) {
                     return;
@@ -122,22 +117,23 @@ public void visitJSParameter(final JSParameter node) {
                 if (scopeNode.getUserData(JavaScriptLineMarkerProvider.ourParticipatesInHierarchyKey) != null) {
                     return;
                 }
-                if (scopeNode instanceof JSFunction) {
-                    JSAttributeList attributeList = ((JSFunction)scopeNode).getAttributeList();
+
+                if (scopeNode instanceof JSFunction function) {
+                    JSAttributeList attributeList = function.getAttributeList();
                     if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
                         return;
                     }
                 }
 
-                final Set<PsiElement> unusedParametersSet;
-                final PsiElement parameterList = node.getParent();
+                Set<PsiElement> unusedParametersSet;
+                PsiElement parameterList = node.getParent();
 
                 if (parameterList.getNode().findChildByType(JSElementTypes.FORMAL_PARAMETER) == node.getNode()) {
                     unusedParametersSet = Collections.synchronizedSet(new HashSet<PsiElement>(3));
-                    scopeNode.putUserData(ourUnusedLocalDeclarationsSetKey, unusedParametersSet);
+                    scopeNode.putUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY, unusedParametersSet);
                 }
                 else {
-                    unusedParametersSet = scopeNode.getUserData(ourUnusedLocalDeclarationsSetKey);
+                    unusedParametersSet = scopeNode.getUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY);
                     if (unusedParametersSet == null) {
                         return;
                     }
@@ -146,7 +142,8 @@ public void visitJSParameter(final JSParameter node) {
             }
 
             @Override
-            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+            @RequiredReadAction
+            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
                 if (node.getParent() instanceof JSFunction) {
                     return;
                 }
@@ -156,7 +153,7 @@ public void visitJSReferenceExpression(final JSReferenceExpression node) {
                         if (function == null) {
                             return;
                         }
-                        Set<PsiElement> unusedParametersSet = function.getUserData(ourUnusedLocalDeclarationsSetKey);
+                        Set<PsiElement> unusedParametersSet = function.getUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY);
                         if (unusedParametersSet == null) {
                             return;
                         }
@@ -169,23 +166,23 @@ public void visitJSReferenceExpression(final JSReferenceExpression node) {
                     ResolveResult[] results = node.multiResolve(false);
 
                     for (ResolveResult r : results) {
-                        final PsiElement element = r.getElement();
+                        PsiElement element = r.getElement();
 
-                        if (element instanceof JSVariable || (element instanceof JSFunction && isSupportedFunction((JSFunction)element))) {
+                        if (element instanceof JSVariable || (element instanceof JSFunction function && isSupportedFunction(function))) {
                             assert !(element instanceof JSFunctionExpression);
                             PsiElement scopeHandler = PsiTreeUtil.getParentOfType(element, JSFunction.class);
 
                             if (scopeHandler != null) {
-                                Set<PsiElement> unusedParametersSet = scopeHandler.getUserData(ourUnusedLocalDeclarationsSetKey);
+                                Set<PsiElement> unusedParametersSet = scopeHandler.getUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY);
 
                                 if (unusedParametersSet != null) {
-                                    final boolean removed = unusedParametersSet.remove(element);
+                                    boolean removed = unusedParametersSet.remove(element);
 
                                     if (!removed) {
-                                        Set<PsiElement> set = scopeHandler.getUserData(ourUsedLocalDeclarationsSetKey);
+                                        Set<PsiElement> set = scopeHandler.getUserData(USED_LOCAL_DECLARATIONS_SET_KEY);
                                         if (set == null) {
-                                            set = new HashSet<PsiElement>(3);
-                                            scopeHandler.putUserData(ourUsedLocalDeclarationsSetKey, set);
+                                            set = new HashSet<>(3);
+                                            scopeHandler.putUserData(USED_LOCAL_DECLARATIONS_SET_KEY, set);
                                         }
                                         set.add(element);
                                     }
@@ -197,53 +194,56 @@ public void visitJSReferenceExpression(final JSReferenceExpression node) {
             }
 
             @Override
-            public void visitJSFunctionExpression(final JSFunctionExpression node) {
-                visitJSFunctionDeclaration((JSFunction)node);
+            @RequiredReadAction
+            public void visitJSFunctionExpression(@Nonnull JSFunctionExpression node) {
+                visitJSFunctionDeclaration(node);
             }
 
             @Override
-            public void visitJSFunctionDeclaration(final JSFunction node) {
+            @RequiredReadAction
+            public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
                 processDeclarationHost(node, holder);
                 handleLocalDeclaration(node);
             }
         };
     }
 
-    private static boolean isSupportedFunction(final JSFunction element) {
+    private static boolean isSupportedFunction(JSFunction element) {
         return !(element instanceof JSFunctionExpression || element.getParent() instanceof JSProperty);
     }
 
-    private static void processDeclarationHost(final PsiElement node, final ProblemsHolder holder) {
-        Set<PsiElement> unusedDeclarationsSet = node.getUserData(ourUnusedLocalDeclarationsSetKey);
-        if (unusedDeclarationsSet == null || node instanceof JSFunction && ((JSFunction)node).getBody().length == 0) {
+    @RequiredReadAction
+    private static void processDeclarationHost(PsiElement node, ProblemsHolder holder) {
+        Set<PsiElement> unusedDeclarationsSet = node.getUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY);
+        if (unusedDeclarationsSet == null || node instanceof JSFunction function && function.getBody().length == 0) {
             return;
         }
 
         try {
-            unusedDeclarationsSet = new HashSet<PsiElement>(unusedDeclarationsSet);
+            unusedDeclarationsSet = new HashSet<>(unusedDeclarationsSet);
 
-            final int nonCounted = -2;
+            int nonCounted = -2;
             int lastUsedParameterIndex = nonCounted;
             ObjectIntMap<JSParameter> parameterIndexMap = null;
 
-            for (final PsiElement p : unusedDeclarationsSet) {
+            for (PsiElement p : unusedDeclarationsSet) {
                 if (!p.isValid()) {
                     continue;
                 }
-                final LocalizeValue message;
-                final @Nonnull PsiElement highlightedElement;
+                LocalizeValue message;
+                @Nonnull PsiElement highlightedElement;
 
                 if (p instanceof JSParameter parameter) {
                     // There are cases of predefined sinatures for which we are not interested in reported unused parameters
-                    final boolean ecma = node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+                    boolean ecma = node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
                     if (ecma && node instanceof JSFunctionExpression) {
                         continue; // do not report unused parameters
                     }
                     else if (ecma && node instanceof JSFunction function) {
-                        final JSParameter[] params = function.getParameterList().getParameters();
+                        JSParameter[] params = function.getParameterList().getParameters();
 
                         if (params.length == 1) {
-                            @NonNls String type = parameter.getTypeString();
+                            String type = parameter.getTypeString();
                             if (type != null) {
                                 type = JSImportHandlingUtil.resolveTypeName(type, p);
                             }
@@ -253,10 +253,9 @@ else if (ecma && node instanceof JSFunction function) {
                                 if (eventType.equals(type)) {
                                     continue;
                                 }
-                                final PsiElement clazz = JSClassImpl.findClassFromNamespace(type, node);
 
-                                if (clazz instanceof JSClass) {
-                                    final ResolveProcessor processor = new ResolveProcessor(eventType) {
+                                if (JSClassImpl.findClassFromNamespace(type, node) instanceof JSClass jsClass) {
+                                    ResolveProcessor processor = new ResolveProcessor(eventType) {
                                         {
                                             setTypeContext(true);
                                             setToProcessMembers(false);
@@ -264,12 +263,13 @@ else if (ecma && node instanceof JSFunction function) {
                                         }
 
                                         @Override
-                                        public boolean execute(final PsiElement element, final ResolveState state) {
+                                        @RequiredReadAction
+                                        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                                             return !(element instanceof JSClass jsClass && myName.equals(jsClass.getQualifiedName()));
                                         }
                                     };
                                     processor.setLocalResolve(true);
-                                    final boolean b = clazz.processDeclarations(processor, ResolveState.initial(), clazz, clazz);
+                                    boolean b = jsClass.processDeclarations(processor, ResolveState.initial(), jsClass, jsClass);
                                     if (!b) {
                                         continue;
                                     }
@@ -278,7 +278,7 @@ public boolean execute(final PsiElement element, final ResolveState state) {
                         }
                     }
 
-                    final JSParameter[] params = ((JSFunction)node).getParameterList().getParameters();
+                    JSParameter[] params = ((JSFunction)node).getParameterList().getParameters();
 
                     if (lastUsedParameterIndex == nonCounted) {
                         BitSet unusedSet = new BitSet(params.length);
@@ -312,7 +312,7 @@ public boolean execute(final PsiElement element, final ResolveState state) {
                     highlightedElement = parameter.getNameIdentifier();
                 }
                 else if (p instanceof JSFunction function) {
-                    final PsiElement nameIdentifier = function.getNameIdentifier();
+                    PsiElement nameIdentifier = function.getNameIdentifier();
                     if (nameIdentifier == null) {
                         continue;
                     }
@@ -324,38 +324,30 @@ else if (p instanceof JSFunction function) {
                     message = JavaScriptLocalize.jsUnusedLocalVariable();
                 }
 
-                if (p.getParent() instanceof JSCatchBlock) {
-                    holder.registerProblem(
-                        highlightedElement,
-                        message.get(),
-                        ProblemHighlightType.LIKE_UNUSED_SYMBOL
-                    );
-                }
-                else {
-                    holder.registerProblem(
-                        highlightedElement,
-                        message.get(),
-                        ProblemHighlightType.LIKE_UNUSED_SYMBOL,
-                        new RemoveElementLocalQuickFix()
-                    );
+                ProblemBuilder problemBuilder = holder.newProblem(message)
+                    .range(highlightedElement)
+                    .highlightType(ProblemHighlightType.LIKE_UNUSED_SYMBOL);
+                if (!(p.getParent() instanceof JSCatchBlock)) {
+                    problemBuilder.withFix(new RemoveElementLocalQuickFix());
                 }
+                problemBuilder.create();
             }
         }
         finally {
-            node.putUserData(ourUnusedLocalDeclarationsSetKey, null);
+            node.putUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY, null);
         }
     }
 
-    private static void handleLocalDeclaration(final JSNamedElement node) {
+    private static void handleLocalDeclaration(JSNamedElement node) {
         if (node instanceof JSFunction function && !isSupportedFunction(function)) {
             return;
         }
-        final PsiElement scopeNode = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSCatchBlock.class);
+        PsiElement scopeNode = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSCatchBlock.class);
         if (scopeNode == null) {
             return;
         }
-        final Set<PsiElement> unusedParametersSet = scopeNode.getUserData(ourUnusedLocalDeclarationsSetKey);
-        final Set<PsiElement> usedSet = scopeNode.getUserData(ourUsedLocalDeclarationsSetKey);
+        Set<PsiElement> unusedParametersSet = scopeNode.getUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY);
+        Set<PsiElement> usedSet = scopeNode.getUserData(USED_LOCAL_DECLARATIONS_SET_KEY);
         if (usedSet != null && usedSet.contains(node)) {
             return;
         }
@@ -372,20 +364,21 @@ public HighlightDisplayLevel getDefaultLevel() {
     }
 
     private static class RemoveElementLocalQuickFix implements LocalQuickFix {
-        @Override
         @Nonnull
+        @Override
         public String getName() {
             return JavaScriptLocalize.jsUnusedSymbolRemove().get();
         }
 
-        @Override
         @Nonnull
+        @Override
         public String getFamilyName() {
             return getName();
         }
 
         @Override
-        public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
+        @RequiredReadAction
+        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
             try {
                 PsiElement element = descriptor.getPsiElement();
                 if (!(element instanceof JSNamedElement)) {

From 7b0106a3167427b50598304e0700213ebe95119b Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 12 Jan 2025 22:14:46 +0300
Subject: [PATCH 269/340] Refactoring some classes from base-impl module.

---
 .../inspections/qucikFixes/CreateJSFunctionFixBase.java    | 4 +++-
 .../consulo/javascript/lang/parsing/ExpressionParsing.java | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index ca5acd4e..9ec0c147 100644
--- a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -34,7 +34,7 @@
 
 /**
  * @author VISTALL
- * @since 24.02.2016
+ * @since 2016-02-24
  */
 public abstract class CreateJSFunctionFixBase extends BaseCreateFix {
     private final LocalizeValue myMessage;
@@ -97,8 +97,10 @@ protected void writeFunctionAndName(Template template, String referencedName, Se
         template.addTextSegment(referencedName);
     }
 
+    @RequiredReadAction
     protected abstract void addParameters(Template template, JSReferenceExpression refExpr, PsiFile file, Set<JavaScriptFeature> features);
 
+    @RequiredReadAction
     protected abstract void addReturnType(Template template, JSReferenceExpression referenceExpression, PsiFile psifile);
 
     protected abstract void addBody(Template template, JSReferenceExpression refExpr, PsiFile file);
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index bfbf11d7..0e3bc8d8 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -32,9 +32,8 @@
 
 
 /**
- * User: max
- * Date: Jan 28, 2005
- * Time: 1:18:22 PM
+ * @author max
+ * @since 2005-01-28
  */
 public class ExpressionParsing<C extends JavaScriptParsingContext> extends Parsing<C> {
     private static final Logger LOG = Logger.getInstance(ExpressionParsing.class);
@@ -850,7 +849,7 @@ public boolean tryParseType(final PsiBuilder builder) {
 
     public boolean parseType(final PsiBuilder builder) {
         final IElementType tokenType = builder.getTokenType();
-        if (JSDocumentationUtils.ourPrimitiveTypeFilter.contains(tokenType)) {
+        if (JSDocumentationUtils.PRIMITIVE_TYPE_FILTER.contains(tokenType)) {
             builder.advanceLexer();
         }
         else if (!parseQualifiedTypeName(builder)) {

From 31f1821a7f238d1b7a8deb4237390dc5b2804f9d Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 13 Jan 2025 01:03:05 +0300
Subject: [PATCH 270/340] Fixing NullPointer in JSAttributeListImpl.

---
 .../javascript/psi/impl/JSAttributeListImpl.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
index 5e4c23e8..1aee060a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
@@ -16,9 +16,6 @@
 
 package com.intellij.lang.javascript.psi.impl;
 
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.access.RequiredWriteAction;
-import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSAttribute;
@@ -26,12 +23,14 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
 import consulo.language.ast.TokenSet;
 import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
 import consulo.language.util.IncorrectOperationException;
 import jakarta.annotation.Nonnull;
-
 import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
@@ -118,7 +117,10 @@ public AccessType getAccessType() {
         }
 
         ASTNode node = getNode().findChildByType(MODIFIERS_TYPE_SET);
-        return ACCESS_TYPE_MAP.getOrDefault(node != null ? node.getElementType() : null, AccessType.PACKAGE_LOCAL);
+        if (node == null) {
+            return AccessType.PACKAGE_LOCAL;
+        }
+        return ACCESS_TYPE_MAP.getOrDefault(node.getElementType(), AccessType.PACKAGE_LOCAL);
     }
 
     @Override

From 785f279cb6807d5e14452ab6b6855eab6c945e9c Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Mon, 13 Jan 2025 12:49:58 +0300
Subject: [PATCH 271/340] Reformatting the rest of classes in
 consulo-javascript module.

---
 .../lang/parsing/ExpressionParsing.java       |   34 +-
 .../impl/flex/ECMAScriptImportOptimizer.java  |  560 ++++---
 .../javascript/impl/flex/ImportUtils.java     |  614 ++++----
 .../impl/flex/importer/LabelInfo.java         |   27 +-
 .../impl/flex/importer/MemberInfo.java        |   58 +-
 .../impl/flex/importer/MetaData.java          |    9 +-
 .../impl/flex/importer/MethodInfo.java        |  472 +++---
 .../impl/flex/importer/Multiname.java         |  112 +-
 .../impl/flex/importer/SlotInfo.java          |   57 +-
 .../javascript/impl/flex/importer/Swf.java    |  758 +++++----
 .../javascript/impl/flex/importer/Traits.java |   66 +-
 .../folding/JavaScriptFoldingBuilder.java     |  326 ++--
 .../impl/formatter/JSCodeStylePanel.java      |  263 ++--
 .../JSCodeStyleSettingsProvider.java          |   38 +-
 .../impl/formatter/JSFormattingModel.java     |   61 +-
 .../impl/formatter/JSSpacingProcessor.java    | 1350 ++++++++---------
 .../JavaScriptIndentOptionsProvider.java      |   50 +-
 .../JavascriptFormattingModelBuilder.java     |   36 +-
 .../impl/formatter/blocks/JSBlock.java        |  356 ++---
 .../formatter/blocks/JSDocCommentBlock.java   |  121 +-
 .../formatter/blocks/SubBlockVisitor.java     |  692 ++++-----
 .../impl/highlighting/JSBraceMatcher.java     |   46 +-
 .../JavaScriptColorsAndFontsPage.java         |  197 +--
 .../JavaScriptHighlightVisitor.java           |  657 ++++----
 .../JavaScriptHighlightVisitorFactory.java    |   23 +-
 .../JavaScriptLineMarkerProvider.java         |  861 +++++------
 .../impl/index/predefined/Marker.java         |    3 +-
 .../JavaScriptGotoSuperHandler.java           |  182 +--
 .../JavaScriptSymbolContributor.java          |   68 +-
 .../refactoring/BaseIntroduceSettings.java    |    9 +-
 .../BasicJavascriptNamesValidator.java        |   21 +-
 .../JSBaseClassBasedIntroduceDialog.java      |  118 +-
 .../refactoring/JSBaseIntroduceDialog.java    |  522 +++----
 .../refactoring/JSBaseIntroduceHandler.java   |  797 +++++-----
 .../impl/refactoring/JSNamesValidator.java    |   41 +-
 .../JavascriptRefactoringSupportProvider.java |   79 +-
 .../JSExtractFunctionDialog.java              |   48 +-
 .../JSExtractFunctionHandler.java             |   85 +-
 .../JSExtractFunctionSettings.java            |    5 +-
 .../JSIntroduceConstantDialog.java            |  113 +-
 .../JSIntroduceConstantHandler.java           |  192 ++-
 .../JSIntroduceConstantSettings.java          |    5 +-
 .../JSIntroduceFieldDialog.java               |  296 ++--
 .../JSIntroduceFieldHandler.java              |  223 ++-
 .../JSIntroduceFieldSettings.java             |   16 +-
 .../JSIntroduceVariableDialog.java            |  160 +-
 .../JSIntroduceVariableHandler.java           |   43 +-
 .../introduceVariable/Settings.java           |   14 +-
 .../search/JSDeclarationRangeHandler.java     |   35 +-
 .../search/JSDefinitionsSearchExecutor.java   |  117 +-
 .../impl/search/JSFunctionsSearch.java        |  163 +-
 .../search/JSGotoTargetRendererProvider.java  |   59 +-
 .../JSStructureItemPresentation.java          |  229 ++-
 .../JSStructureViewBuilderFactory.java        |   46 +-
 .../structureView/JSStructureViewElement.java |  763 +++++-----
 .../structureView/JSStructureViewModel.java   |  651 ++++----
 .../impl/structureView/JSSuperGroup.java      |   72 +-
 .../impl/structureView/JSSuperGrouper.java    |  171 +--
 .../JSExpressionSurroundDescriptor.java       |  101 +-
 .../surroundWith/JSStatementSurrounder.java   |   59 +-
 .../JSStatementsSurroundDescriptor.java       |  267 ++--
 .../surroundWith/JSWithBlockSurrounder.java   |   41 +-
 .../surroundWith/JSWithDoWhileSurrounder.java |   43 +-
 .../surroundWith/JSWithForSurrounder.java     |   66 +-
 .../JSWithFunctionExpressionSurrounder.java   |   66 +-
 .../JSWithFunctionSurrounder.java             |   49 +-
 .../surroundWith/JSWithIfElseSurrounder.java  |   21 +-
 .../impl/surroundWith/JSWithIfSurrounder.java |   51 +-
 .../JSWithParenthesesSurrounder.java          |   42 +-
 .../JSWithTryCatchFinallySurrounder.java      |   81 +-
 .../JSWithTryCatchSurrounder.java             |   21 +-
 .../JSWithTryFinallySurrounder.java           |   21 +-
 .../surroundWith/JSWithWhileSurrounder.java   |   43 +-
 .../surroundWith/JSWithWithSurrounder.java    |   49 +-
 .../impl/JavaScriptIconDescriptorUpdater.java |  277 ++--
 .../UpdateJavaScriptFileCopyright.java        |   70 +-
 ...UpdateJavaScriptFileCopyrightProvider.java |   51 +-
 .../JavaScriptFindUsagesHandlerFactory.java   |   26 +-
 .../JavaScriptCodeStyleConfigurable.java      |   28 +-
 .../formatter/JavaScriptCodeStylePanel.java   |   21 +-
 ...riptLanguageCodeStyleSettingsProvider.java |  186 ++-
 .../JavaScriptEmbeddedTokenHighlighter.java   |   18 +-
 .../JavaScriptHtmlScriptContentProvider.java  |   34 +-
 .../actions/JavaScriptCreateFileAction.java   |  110 +-
 .../JavaScriptFileTemplateContributor.java    |   12 +-
 ...avaScriptKeywordCompletionContributor.java |   93 +-
 .../JavaScriptSkipAutopopupInStrings.java     |   14 +-
 .../ide/completion/SpaceInsertHandler.java    |   23 +-
 .../JavaScriptNavBarModelExtension.java       |   27 +-
 .../impl/lang/JavaScriptFileTypeFactory.java  |   12 +-
 .../lang/JavaScriptLanguageVersionPusher.java |   14 +-
 .../JavaScriptLanguageVersionResolver.java    |   78 +-
 .../lang/JavaScriptParsingDefinition.java     |   83 +-
 .../JavaScriptClassContributor.java           |   47 +-
 ...efaultJSPropertyNameReferenceProvider.java |   20 +-
 plugin/src/main/java/module-info.java         |   83 +-
 .../JavaScriptRegExpLiteralLanguageHost.java  |  126 +-
 .../JavaScriptRegexpMultiHostInjector.java    |   47 +-
 regexp-impl/src/main/java/module-info.java    |    7 +-
 99 files changed, 7322 insertions(+), 8396 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index 0e3bc8d8..e3df93bb 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -44,6 +44,16 @@ public class ExpressionParsing<C extends JavaScriptParsingContext> extends Parsi
     private static final TokenSet DOT_SET = TokenSet.create(JSTokenTypes.DOT);
     private static final TokenSet MEMBER_OPERATOR_SET =
         TokenSet.create(JSTokenTypes.DOT, JSTokenTypes.COLON_COLON, JSTokenTypes.DOT_DOT, JSTokenTypes.QUEST_DOT);
+    private static final TokenSet LITERAL_SET = TokenSet.create(
+        JSTokenTypes.NUMERIC_LITERAL,
+        JSTokenTypes.STRING_LITERAL,
+        JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL,
+        JSTokenTypes.INTERPOLATION_STRING_LITERAL,
+        JSTokenTypes.NULL_KEYWORD,
+        JSTokenTypes.UNDEFINED_KEYWORD,
+        JSTokenTypes.FALSE_KEYWORD,
+        JSTokenTypes.TRUE_KEYWORD
+    );
 
     private final JSXParser myJSXParser = new JSXParser();
 
@@ -52,7 +62,7 @@ public ExpressionParsing(C context) {
     }
 
     protected boolean parsePrimaryExpression(PsiBuilder builder) {
-        final IElementType firstToken = builder.getTokenType();
+        IElementType firstToken = builder.getTokenType();
         if (firstToken == JSTokenTypes.THIS_KEYWORD) {
             Parsing.buildTokenElement(JSElementTypes.THIS_EXPRESSION, builder);
             return true;
@@ -73,14 +83,7 @@ else if (firstToken == JSTokenTypes.REGEXP_LITERAL) {
             }
             return true;
         }
-        else if (firstToken == JSTokenTypes.NUMERIC_LITERAL
-            || firstToken == JSTokenTypes.STRING_LITERAL
-            || firstToken == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL
-            || firstToken == JSTokenTypes.INTERPOLATION_STRING_LITERAL
-            || firstToken == JSTokenTypes.NULL_KEYWORD
-            || firstToken == JSTokenTypes.UNDEFINED_KEYWORD
-            || firstToken == JSTokenTypes.FALSE_KEYWORD
-            || firstToken == JSTokenTypes.TRUE_KEYWORD) {
+        else if (LITERAL_SET.contains(firstToken)) {
             LocalizeValue errorMessage = validateLiteral(builder);
             Parsing.buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
             if (errorMessage != null) {
@@ -295,9 +298,9 @@ public void parseArrayLiteralExpression(final PsiBuilder builder) {
         }
     }
 
-    private void parseParenthesizedExpression(final PsiBuilder builder) {
+    private void parseParenthesizedExpression(PsiBuilder builder) {
         ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
-        final PsiBuilder.Marker expr = builder.mark();
+        PsiBuilder.Marker expr = builder.mark();
         builder.advanceLexer();
         parseExpression(builder);
         Parsing.checkMatches(builder, JSTokenTypes.RPAR, JavaScriptLocalize.javascriptParserMessageExpectedRparen());
@@ -312,11 +315,11 @@ protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyn
         PsiBuilder.Marker expr = builder.mark();
         boolean isNew;
 
-        final IElementType type = builder.getTokenType();
+        IElementType type = builder.getTokenType();
 
         if (type == JSTokenTypes.NEW_KEYWORD) {
             isNew = true;
-            final boolean isfunction = parseNewExpression(builder);
+            boolean isfunction = parseNewExpression(builder);
 
             if (isfunction) {
                 expr.done(JSElementTypes.NEW_EXPRESSION);
@@ -399,7 +402,7 @@ public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar) {
     }
 
     public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, TokenSet separatorsSet) {
-        if (!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType())) {
+        if (JSTokenTypes.IDENTIFIER != builder.getTokenType()) {
             return false;
         }
         PsiBuilder.Marker expr = builder.mark();
@@ -414,8 +417,7 @@ public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, Tok
                 builder.advanceLexer();
                 stop = true;
             }
-            else if (tokenType == JSTokenTypes.DEFAULT_KEYWORD
-                || (tokenType != JSTokenTypes.IDENTIFIER && JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(tokenType))) {
+            else if (tokenType == JSTokenTypes.DEFAULT_KEYWORD) {
                 builder.advanceLexer(); // TODO: allow any keyword
             }
             else {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
index 4f7a827a..e6f3001d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
@@ -38,308 +38,272 @@
 import consulo.util.lang.Pair;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.*;
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 23, 2008
- *         Time: 12:10:44 AM
+ * Date: Jul 23, 2008
+ * Time: 12:10:44 AM
  */
 @ExtensionImpl
-public class ECMAScriptImportOptimizer implements ImportOptimizer
-{
-	@Override
-	public boolean supports(PsiFile file)
-	{
-		return file.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 || JavaScriptSupportLoader.isFlexMxmFile(file);
-	}
-
-	@Override
-	@Nonnull
-	public Runnable processFile(final PsiFile file)
-	{
-		if(!FileModificationService.getInstance().prepareFileForWrite(file))
-		{
-			return EmptyRunnable.INSTANCE;
-		}
-
-		return new Runnable()
-		{
-			@Override
-			@RequiredReadAction
-			public void run()
-			{
-				final JSUnusedImportsHelper.Results unusedImportsResults = JSUnusedImportsHelper.getUnusedImports(file);
-
-				MultiMap<JSElement, String> importsByHolder = new MultiMap<JSElement, String>()
-				{
-					@Override
-					protected Collection<String> createCollection()
-					{
-						return new HashSet<String>();
-					}
-				};
-
-				Project project = file.getProject();
-				final SmartPointerManager pointerManager = SmartPointerManager.getInstance(project);
-				final List<SmartPsiElementPointer> oldImportsPointers = new ArrayList<SmartPsiElementPointer>(unusedImportsResults.allImports.size());
-				for(JSImportStatement anImport : unusedImportsResults.allImports)
-				{
-					oldImportsPointers.add(pointerManager.createSmartPsiElementPointer(anImport));
-					if(unusedImportsResults.unusedImports.contains(anImport))
-					{
-						continue;
-					}
-
-					JSElement importHolder = ImportUtils.getImportHolder(anImport, JSFunction.class, JSPackageStatement.class, JSFile.class);
-					assert importHolder != null : "Import holder not found for " + anImport.getText();
-					importsByHolder.putValue(importHolder, anImport.getImportText());
-				}
-
-				final List<SmartPsiElementPointer> replaceWithShortName = new ArrayList<SmartPsiElementPointer>();
-				for(Map.Entry<JSReferenceExpression, String> e : unusedImportsResults.fqnsToReplaceWithImport.entrySet())
-				{
-					final Collection<String> importsInScope;
-					final Collection<String> importsInEnclosingScope;
-					final JSElement importHolder;
-
-					JSElement enclosingFunction = ImportUtils.getImportHolder(e.getKey(), JSFunction.class);
-					JSElement enclosingPackage = ImportUtils.getImportHolder(e.getKey(), JSPackageStatement.class);
-
-					if(enclosingFunction != null && !importsByHolder.get(enclosingFunction).isEmpty())
-					{
-						importHolder = enclosingFunction;
-						importsInScope = importsByHolder.get(enclosingFunction);
-						importsInEnclosingScope = importsByHolder.get(enclosingPackage);
-					}
-					else if(enclosingPackage != null)
-					{
-						importHolder = enclosingPackage;
-						importsInScope = importsByHolder.get(enclosingPackage);
-						importsInEnclosingScope = Collections.emptyList();
-					}
-					else
-					{
-						importHolder = ImportUtils.getImportHolder(e.getKey(), JSFile.class);
-						importsInScope = importsByHolder.get(importHolder);
-						importsInEnclosingScope = Collections.emptyList();
-					}
-
-					String fqn = e.getValue();
-
-					ResolveResult resolve = resolveUsingImports(importsInScope, fqn, file);
-					ResolveResult implicitResolve = resolveUsingImports(importsInEnclosingScope, fqn, file);
-
-					if(resolve == ResolveResult.None && implicitResolve == ResolveResult.None)
-					{
-						importsByHolder.putValue(importHolder, fqn);
-						replaceWithShortName.add(pointerManager.createSmartPsiElementPointer(e.getKey()));
-					}
-					else if((resolve == ResolveResult.ThisOne || resolve == ResolveResult.None) && (implicitResolve == ResolveResult.ThisOne || implicitResolve ==
-							ResolveResult.None))
-					{
-						replaceWithShortName.add(pointerManager.createSmartPsiElementPointer(e.getKey()));
-					}
-				}
-
-				final Collection<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>> importsByHolderPointer = new
-						ArrayList<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>>(importsByHolder.size());
-				for(JSElement holder : importsByHolder.keySet())
-				{
-					importsByHolderPointer.add(Pair.create(pointerManager.createSmartPsiElementPointer(holder), importsByHolder.get(holder)));
-				}
-
-				for(Pair<SmartPsiElementPointer<JSElement>, Collection<String>> entry : importsByHolderPointer)
-				{
-					JSElement holder = entry.getFirst().getElement();
-					assert holder != null && holder.isValid();
-
-					Pair<PsiElement, Boolean> defaultInsertionPlace = ImportUtils.getImportInsertionPlace(holder);
-					boolean before = defaultInsertionPlace.second;
-					PsiElement insertionPlace = defaultInsertionPlace.first;
-
-					PsiElement earlyImport = ImportUtils.findEarlyImport(before ? insertionPlace : insertionPlace.getNextSibling());
-					Pair<PsiElement, PsiElement> elementToDelete = null;
-					if(earlyImport != null)
-					{
-						for(PsiElement e = (before ? insertionPlace : insertionPlace.getNextSibling()); e != earlyImport; e = e.getNextSibling())
-						{
-							if(!(e instanceof PsiWhiteSpace))
-							{
-								break;
-							}
-						}
-						insertionPlace = earlyImport;
-						before = true;
-						PsiElement deleteTo = earlyImport;
-						while(deleteTo.getNextSibling() instanceof PsiWhiteSpace || deleteTo.getNextSibling() instanceof JSImportStatement)
-						{
-							deleteTo = deleteTo.getNextSibling();
-						}
-						elementToDelete = Pair.create(insertionPlace, deleteTo);
-					}
-					else if(before && insertionPlace instanceof PsiWhiteSpace)
-					{
-						insertionPlace = insertionPlace.replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
-					}
-					else if(insertionPlace.getNextSibling() instanceof PsiWhiteSpace)
-					{
-						insertionPlace.getNextSibling().replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
-					}
-
-					String importBlock = ImportUtils.createImportBlock(project, entry.getSecond());
-					PsiElement newImports = PsiFileFactory.getInstance(project).createFileFromText("dummy.js", JavaScriptLanguage.INSTANCE, importBlock);
-
-					PsiElement firstAdded;
-					if(before)
-					{
-						firstAdded = insertionPlace.getParent().addRangeBefore(newImports.getFirstChild(), newImports.getLastChild(), insertionPlace);
-					}
-					else
-					{
-						firstAdded = insertionPlace.getParent().addRangeAfter(newImports.getFirstChild(), newImports.getLastChild(), insertionPlace);
-					}
-
-					if(elementToDelete != null)
-					{
-						deleteRange(elementToDelete.first, elementToDelete.second);
-					}
-
-					PsiElement lastAdded = firstAdded;
-					final String lastImportText = newImports.getLastChild().getText();
-					while(!lastImportText.equals(lastAdded.getText()))
-					{
-						lastAdded = lastAdded.getNextSibling();
-					}
-
-					PsiElement formatFrom = firstAdded.getPrevSibling() instanceof PsiWhiteSpace ? firstAdded.getPrevSibling() : firstAdded;
-					PsiElement formatTo = lastAdded.getNextSibling() instanceof PsiWhiteSpace ? lastAdded.getNextSibling() : lastAdded;
-
-					PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
-
-					TextRange textRange = InjectedLanguageManager.getInstance(file.getProject()).injectedToHost(firstAdded, firstAdded.getTextRange());
-					CodeStyleManager.getInstance(project).reformatText(realFile, textRange.getStartOffset(), textRange.getEndOffset());
-				}
-
-				for(SmartPsiElementPointer pointer : oldImportsPointers)
-				{
-					final JSImportStatement statement = (JSImportStatement) pointer.getElement();
-					if(statement != null)
-					{
-						deleteImport(statement);
-					}
-				}
-
-				for(SmartPsiElementPointer pointer : replaceWithShortName)
-				{
-					final JSReferenceExpression fqn = (JSReferenceExpression) pointer.getElement();
-					if(fqn == null || !fqn.isValid())
-					{
-						continue;
-					}
-					String name = fqn.getReferencedName().substring(fqn.getReferencedName().lastIndexOf('.') + 1);
-					fqn.replace(JSChangeUtil.createExpressionFromText(project, name));
-				}
-			}
-		};
-	}
-
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
-
-	private enum ResolveResult
-	{
-		None, ThisOne, OtherOne
-	}
-
-	private static ResolveResult resolveUsingImports(Collection<String> imports, String fqnToCheck, PsiElement context)
-	{
-		String shortName = fqnToCheck.substring(fqnToCheck.lastIndexOf('.') + 1);
-		String firstOneResolved = null;
-		for(String anImport : imports)
-		{
-			String name = anImport.substring(anImport.lastIndexOf('.') + 1);
-			String resolvedFqn = null;
-			if(name.equals(shortName))
-			{
-				resolvedFqn = anImport;
-			}
-			else if("*".equals(name))
-			{
-				String qualifier = anImport.substring(0, anImport.lastIndexOf('.'));
-				if(JSResolveUtil.findClassByQName(qualifier + "." + shortName, context) != null)
-				{
-					resolvedFqn = qualifier + "." + shortName;
-				}
-			}
-			if(resolvedFqn != null)
-			{
-				if(firstOneResolved == null)
-				{
-					firstOneResolved = resolvedFqn;
-				}
-				else
-				{
-					assert !firstOneResolved.equals(resolvedFqn);
-					return ResolveResult.OtherOne;
-				}
-			}
-		}
-
-		if(firstOneResolved == null)
-		{
-			return ResolveResult.None;
-		}
-		else
-		{
-			return fqnToCheck.equals(firstOneResolved) ? ResolveResult.ThisOne : ResolveResult.OtherOne;
-		}
-	}
-
-	private static void deleteImport(final JSImportStatement anImport)
-	{
-		if(!anImport.isValid())
-		{
-			return;
-		}
-		PsiElement nextSibling = anImport.getNextSibling();
-		if(nextSibling instanceof PsiWhiteSpace)
-		{
-			// remove with the following whitespace
-			String whitespace = nextSibling.getText();
-			if(whitespace.contains("]]>"))
-			{
-				nextSibling.replace(JSChangeUtil.createJSTreeFromText(anImport.getProject(), "]]>").getPsi());
-			}
-			// don't remove trailing line break if it is an injection suffix
-			else if(nextSibling.getNextSibling() == null || nextSibling.getNextSibling().getNode().getElementType() != JSTokenTypes.RBRACE ||
-					!(nextSibling.getParent() instanceof JSBlockStatement) ||
-					!ImportUtils.isAnonymousEventHandler((JSBlockStatement) nextSibling.getParent()))
-			{
-				nextSibling.delete();
-			}
-		}
-		anImport.delete();
-	}
-
-	private static void deleteRange(PsiElement first, PsiElement last)
-	{
-		PsiElement e = first;
-		while(true)
-		{
-			PsiElement next = e.getNextSibling();
-			e.delete();
-			if(e == last)
-			{
-				break;
-			}
-			assert next != null;
-			e = next;
-		}
-	}
-
+public class ECMAScriptImportOptimizer implements ImportOptimizer {
+    @Override
+    public boolean supports(PsiFile file) {
+        return file.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 || JavaScriptSupportLoader.isFlexMxmFile(file);
+    }
+
+    @Override
+    @Nonnull
+    public Runnable processFile(final PsiFile file) {
+        if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+            return EmptyRunnable.INSTANCE;
+        }
+
+        return new Runnable() {
+            @Override
+            @RequiredReadAction
+            public void run() {
+                final JSUnusedImportsHelper.Results unusedImportsResults = JSUnusedImportsHelper.getUnusedImports(file);
+
+                MultiMap<JSElement, String> importsByHolder = new MultiMap<JSElement, String>() {
+                    @Override
+                    protected Collection<String> createCollection() {
+                        return new HashSet<String>();
+                    }
+                };
+
+                Project project = file.getProject();
+                final SmartPointerManager pointerManager = SmartPointerManager.getInstance(project);
+                final List<SmartPsiElementPointer> oldImportsPointers =
+                    new ArrayList<SmartPsiElementPointer>(unusedImportsResults.allImports.size());
+                for (JSImportStatement anImport : unusedImportsResults.allImports) {
+                    oldImportsPointers.add(pointerManager.createSmartPsiElementPointer(anImport));
+                    if (unusedImportsResults.unusedImports.contains(anImport)) {
+                        continue;
+                    }
+
+                    JSElement importHolder =
+                        ImportUtils.getImportHolder(anImport, JSFunction.class, JSPackageStatement.class, JSFile.class);
+                    assert importHolder != null : "Import holder not found for " + anImport.getText();
+                    importsByHolder.putValue(importHolder, anImport.getImportText());
+                }
+
+                final List<SmartPsiElementPointer> replaceWithShortName = new ArrayList<SmartPsiElementPointer>();
+                for (Map.Entry<JSReferenceExpression, String> e : unusedImportsResults.fqnsToReplaceWithImport.entrySet()) {
+                    final Collection<String> importsInScope;
+                    final Collection<String> importsInEnclosingScope;
+                    final JSElement importHolder;
+
+                    JSElement enclosingFunction = ImportUtils.getImportHolder(e.getKey(), JSFunction.class);
+                    JSElement enclosingPackage = ImportUtils.getImportHolder(e.getKey(), JSPackageStatement.class);
+
+                    if (enclosingFunction != null && !importsByHolder.get(enclosingFunction).isEmpty()) {
+                        importHolder = enclosingFunction;
+                        importsInScope = importsByHolder.get(enclosingFunction);
+                        importsInEnclosingScope = importsByHolder.get(enclosingPackage);
+                    }
+                    else if (enclosingPackage != null) {
+                        importHolder = enclosingPackage;
+                        importsInScope = importsByHolder.get(enclosingPackage);
+                        importsInEnclosingScope = Collections.emptyList();
+                    }
+                    else {
+                        importHolder = ImportUtils.getImportHolder(e.getKey(), JSFile.class);
+                        importsInScope = importsByHolder.get(importHolder);
+                        importsInEnclosingScope = Collections.emptyList();
+                    }
+
+                    String fqn = e.getValue();
+
+                    ResolveResult resolve = resolveUsingImports(importsInScope, fqn, file);
+                    ResolveResult implicitResolve = resolveUsingImports(importsInEnclosingScope, fqn, file);
+
+                    if (resolve == ResolveResult.None && implicitResolve == ResolveResult.None) {
+                        importsByHolder.putValue(importHolder, fqn);
+                        replaceWithShortName.add(pointerManager.createSmartPsiElementPointer(e.getKey()));
+                    }
+                    else if ((resolve == ResolveResult.ThisOne || resolve == ResolveResult.None)
+                        && (implicitResolve == ResolveResult.ThisOne || implicitResolve == ResolveResult.None)) {
+                        replaceWithShortName.add(pointerManager.createSmartPsiElementPointer(e.getKey()));
+                    }
+                }
+
+                final Collection<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>> importsByHolderPointer =
+                    new ArrayList<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>>(importsByHolder.size());
+                for (JSElement holder : importsByHolder.keySet()) {
+                    importsByHolderPointer.add(Pair.create(
+                        pointerManager.createSmartPsiElementPointer(holder),
+                        importsByHolder.get(holder)
+                    ));
+                }
+
+                for (Pair<SmartPsiElementPointer<JSElement>, Collection<String>> entry : importsByHolderPointer) {
+                    JSElement holder = entry.getFirst().getElement();
+                    assert holder != null && holder.isValid();
+
+                    Pair<PsiElement, Boolean> defaultInsertionPlace = ImportUtils.getImportInsertionPlace(holder);
+                    boolean before = defaultInsertionPlace.second;
+                    PsiElement insertionPlace = defaultInsertionPlace.first;
+
+                    PsiElement earlyImport = ImportUtils.findEarlyImport(before ? insertionPlace : insertionPlace.getNextSibling());
+                    Pair<PsiElement, PsiElement> elementToDelete = null;
+                    if (earlyImport != null) {
+                        for (PsiElement e = (before ? insertionPlace : insertionPlace.getNextSibling()); e != earlyImport;
+                             e = e.getNextSibling()) {
+                            if (!(e instanceof PsiWhiteSpace)) {
+                                break;
+                            }
+                        }
+                        insertionPlace = earlyImport;
+                        before = true;
+                        PsiElement deleteTo = earlyImport;
+                        while (deleteTo.getNextSibling() instanceof PsiWhiteSpace
+                            || deleteTo.getNextSibling() instanceof JSImportStatement) {
+                            deleteTo = deleteTo.getNextSibling();
+                        }
+                        elementToDelete = Pair.create(insertionPlace, deleteTo);
+                    }
+                    else if (before && insertionPlace instanceof PsiWhiteSpace) {
+                        insertionPlace =
+                            insertionPlace.replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
+                    }
+                    else if (insertionPlace.getNextSibling() instanceof PsiWhiteSpace) {
+                        insertionPlace.getNextSibling()
+                            .replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
+                    }
+
+                    String importBlock = ImportUtils.createImportBlock(project, entry.getSecond());
+                    PsiElement newImports =
+                        PsiFileFactory.getInstance(project).createFileFromText("dummy.js", JavaScriptLanguage.INSTANCE, importBlock);
+
+                    PsiElement firstAdded;
+                    if (before) {
+                        firstAdded = insertionPlace.getParent()
+                            .addRangeBefore(newImports.getFirstChild(), newImports.getLastChild(), insertionPlace);
+                    }
+                    else {
+                        firstAdded =
+                            insertionPlace.getParent().addRangeAfter(newImports.getFirstChild(), newImports.getLastChild(), insertionPlace);
+                    }
+
+                    if (elementToDelete != null) {
+                        deleteRange(elementToDelete.first, elementToDelete.second);
+                    }
+
+                    PsiElement lastAdded = firstAdded;
+                    final String lastImportText = newImports.getLastChild().getText();
+                    while (!lastImportText.equals(lastAdded.getText())) {
+                        lastAdded = lastAdded.getNextSibling();
+                    }
+
+                    PsiElement formatFrom = firstAdded.getPrevSibling() instanceof PsiWhiteSpace ? firstAdded.getPrevSibling() : firstAdded;
+                    PsiElement formatTo = lastAdded.getNextSibling() instanceof PsiWhiteSpace ? lastAdded.getNextSibling() : lastAdded;
+
+                    PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
+
+                    TextRange textRange =
+                        InjectedLanguageManager.getInstance(file.getProject()).injectedToHost(firstAdded, firstAdded.getTextRange());
+                    CodeStyleManager.getInstance(project).reformatText(realFile, textRange.getStartOffset(), textRange.getEndOffset());
+                }
+
+                for (SmartPsiElementPointer pointer : oldImportsPointers) {
+                    final JSImportStatement statement = (JSImportStatement)pointer.getElement();
+                    if (statement != null) {
+                        deleteImport(statement);
+                    }
+                }
+
+                for (SmartPsiElementPointer pointer : replaceWithShortName) {
+                    final JSReferenceExpression fqn = (JSReferenceExpression)pointer.getElement();
+                    if (fqn == null || !fqn.isValid()) {
+                        continue;
+                    }
+                    String name = fqn.getReferencedName().substring(fqn.getReferencedName().lastIndexOf('.') + 1);
+                    fqn.replace(JSChangeUtil.createExpressionFromText(project, name));
+                }
+            }
+        };
+    }
+
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
+
+    private enum ResolveResult {
+        None,
+        ThisOne,
+        OtherOne
+    }
+
+    private static ResolveResult resolveUsingImports(Collection<String> imports, String fqnToCheck, PsiElement context) {
+        String shortName = fqnToCheck.substring(fqnToCheck.lastIndexOf('.') + 1);
+        String firstOneResolved = null;
+        for (String anImport : imports) {
+            String name = anImport.substring(anImport.lastIndexOf('.') + 1);
+            String resolvedFqn = null;
+            if (name.equals(shortName)) {
+                resolvedFqn = anImport;
+            }
+            else if ("*".equals(name)) {
+                String qualifier = anImport.substring(0, anImport.lastIndexOf('.'));
+                if (JSResolveUtil.findClassByQName(qualifier + "." + shortName, context) != null) {
+                    resolvedFqn = qualifier + "." + shortName;
+                }
+            }
+            if (resolvedFqn != null) {
+                if (firstOneResolved == null) {
+                    firstOneResolved = resolvedFqn;
+                }
+                else {
+                    assert !firstOneResolved.equals(resolvedFqn);
+                    return ResolveResult.OtherOne;
+                }
+            }
+        }
+
+        if (firstOneResolved == null) {
+            return ResolveResult.None;
+        }
+        else {
+            return fqnToCheck.equals(firstOneResolved) ? ResolveResult.ThisOne : ResolveResult.OtherOne;
+        }
+    }
+
+    private static void deleteImport(final JSImportStatement anImport) {
+        if (!anImport.isValid()) {
+            return;
+        }
+        PsiElement nextSibling = anImport.getNextSibling();
+        if (nextSibling instanceof PsiWhiteSpace) {
+            // remove with the following whitespace
+            String whitespace = nextSibling.getText();
+            if (whitespace.contains("]]>")) {
+                nextSibling.replace(JSChangeUtil.createJSTreeFromText(anImport.getProject(), "]]>").getPsi());
+            }
+            // don't remove trailing line break if it is an injection suffix
+            else if (nextSibling.getNextSibling() == null
+                || nextSibling.getNextSibling().getNode().getElementType() != JSTokenTypes.RBRACE
+                || !(nextSibling.getParent() instanceof JSBlockStatement)
+                || !ImportUtils.isAnonymousEventHandler((JSBlockStatement)nextSibling.getParent())) {
+                nextSibling.delete();
+            }
+        }
+        anImport.delete();
+    }
+
+    private static void deleteRange(PsiElement first, PsiElement last) {
+        PsiElement e = first;
+        while (true) {
+            PsiElement next = e.getNextSibling();
+            e.delete();
+            if (e == last) {
+                break;
+            }
+            assert next != null;
+            e = next;
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
index 204c0203..9aa6a080 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
@@ -44,343 +44,289 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.*;
 
 /**
  * @author Maxim.Mossienko
- *         Date: May 3, 2008
- *         Time: 8:35:33 PM
+ * Date: May 3, 2008
+ * Time: 8:35:33 PM
  */
-public class ImportUtils
-{
-	@NonNls
-	private static final String CDATA = "<![CDATA[";
-	@NonNls
-	private static final String SCRIPT_TAG_NAME = "Script";
-
-	private static final List<Class<? extends JSElement>> ANONYMOUS_EVENT_LISTENER_CLASSES = Arrays.asList(JSBlockStatement.class,
-			JSFunctionExpression.class, JSParenthesizedExpression.class, JSCallExpression.class, JSExpressionStatement.class, JSFile.class);
-
-	@Nullable
-	private static PsiElement findLBrace(final JSElement holder)
-	{
-		for(PsiElement child = holder.getFirstChild(); child != null; child = child.getNextSibling())
-		{
-			if(child.getNode().getElementType() == JSTokenTypes.LBRACE)
-			{
-				return child;
-			}
-		}
-		return null;
-	}
-
-	private static PsiElement specifyInsertionPlace(PsiElement insertBefore, String fqn)
-	{
-		JSImportStatement earlyImport = findEarlyImport(insertBefore);
-		if(earlyImport == null)
-		{
-			return insertBefore;
-		}
-
-		while(compareImports(fqn, earlyImport.getImportText()) > 0)
-		{
-			if(earlyImport.getNextSibling() instanceof JSImportStatement)
-			{
-				earlyImport = (JSImportStatement) earlyImport.getNextSibling();
-			}
-			else if(earlyImport.getNextSibling() instanceof PsiWhiteSpace && earlyImport.getNextSibling().getNextSibling() instanceof JSImportStatement)
-			{
-				earlyImport = (JSImportStatement) earlyImport.getNextSibling().getNextSibling();
-			}
-			else
-			{
-				return earlyImport.getNextSibling();
-			}
-		}
-		return earlyImport;
-	}
-
-	public static void doImport(@Nonnull PsiElement subject, final @Nonnull String fqn)
-	{
-		assert fqn.contains(".") : "Qualified name belongs to default package: " + fqn;
-
-		if(!FileModificationService.getInstance().prepareFileForWrite(subject.getContainingFile()))
-		{
-			return;
-		}
-		Project project = subject.getProject();
-
-		final JSReferenceExpression refExpr = PsiTreeUtil.getNonStrictParentOfType(subject, JSReferenceExpression.class);
-		if(refExpr != null && JSResolveUtil.referenceExpressionShouldBeQualified(refExpr))
-		{
-			refExpr.replace(JSChangeUtil.createExpressionFromText(project, fqn)); // TODO should commit corresponding document before?
-			return;
-		}
-
-		JSElement importHolder = getImportHolder(subject, JSPackageStatement.class, JSFile.class);
-		if(importHolder == null)
-		{ // importHolder is null when completing js2 class name from js code
-			return;
-		}
-
-		PsiFile file = importHolder.getContainingFile();
-		Document document = PsiDocumentManager.getInstance(project).getDocument(file);
-		PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document);
-
-		String textToInsert = createImportBlock(project, Collections.singletonList(fqn));
-
-		Pair<PsiElement, Boolean/*before*/> insertionPlace = getImportInsertionPlace(importHolder);
-		if(!insertionPlace.second && insertionPlace.first.getNextSibling() != null)
-		{
-			insertionPlace = Pair.create(insertionPlace.first.getNextSibling(), true);
-		}
-
-		final int offset;
-		final String prefix;
-		final String suffix;
-		if(insertionPlace.second)
-		{
-			PsiElement insertBefore = specifyInsertionPlace(insertionPlace.first, fqn);
-			offset = insertBefore.getTextRange().getStartOffset();
-			prefix = (insertBefore.getPrevSibling() == null && file.getContext() == null) || insertBefore.getPrevSibling() instanceof PsiWhiteSpace ? "" :
-					"\n";
-			suffix = insertBefore instanceof PsiWhiteSpace ? "" : " ";
-		}
-		else
-		{
-			offset = insertionPlace.first.getTextRange().getEndOffset();
-			prefix = insertionPlace.first instanceof PsiWhiteSpace ? "" : "\n";
-			suffix = "";
-		}
-
-		document.insertString(offset, prefix + textToInsert + suffix);
-		PsiDocumentManager.getInstance(project).commitDocument(document);
-
-		PsiElement inserted = file.findElementAt(offset);
-		if(prefix.length() > 0)
-		{
-			if(inserted.getNextSibling() instanceof JSImportStatement)
-			{
-				inserted = inserted.getNextSibling();
-			}
-		}
-		else
-		{
-			JSImportStatement importStatement = PsiTreeUtil.getParentOfType(inserted, JSImportStatement.class);
-			if(importStatement != null)
-			{
-				inserted = importStatement;
-			}
-		}
-		PsiElement formatFrom = inserted.getPrevSibling() instanceof PsiWhiteSpace ? inserted.getPrevSibling() : inserted;
-		PsiElement formatTo = inserted.getNextSibling() instanceof PsiWhiteSpace ? inserted.getNextSibling() : inserted;
-
-		PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
-		final TextRange injectionOffset = InjectedLanguageManager.getInstance(project).injectedToHost(inserted, inserted.getTextRange());
-
-		CodeStyleManager.getInstance(project).reformatText(realFile, injectionOffset.getStartOffset() + formatFrom.getTextRange().getStartOffset(),
-				injectionOffset.getEndOffset() + formatTo.getTextRange().getEndOffset());
-	}
-
-	private static JSElement getAnonymousEventHandlerBody(JSFile injectedFile)
-	{
-		// TODO more elegant way?!
-		if(injectedFile.getFirstChild() instanceof JSExpressionStatement)
-		{
-			JSExpressionStatement expressionStatement = (JSExpressionStatement) injectedFile.getFirstChild();
-			if(expressionStatement.getExpression() instanceof JSCallExpression)
-			{
-				JSCallExpression callExpression = (JSCallExpression) expressionStatement.getExpression();
-				if(callExpression.getMethodExpression() instanceof JSParenthesizedExpression)
-				{
-					JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) callExpression.getMethodExpression();
-					if(parenthesizedExpression.getInnerExpression() instanceof JSFunctionExpression)
-					{
-						JSFunctionExpression functionExpression = (JSFunctionExpression) parenthesizedExpression.getInnerExpression();
-						JSFunction function = functionExpression.getFunction();
-						if(function.getBody().length > 0)
-						{
-							return function.getBody()[0];
-						}
-					}
-				}
-			}
-		}
-		assert false : "Couldn't find anonymous event handler body: " + injectedFile;
-		return null;
-	}
-
-	private static boolean isAnonymousEventHandlerTag(JSFile jsFile)
-	{
-		PsiElement context = jsFile.getContext();
-		return context instanceof XmlText && !SCRIPT_TAG_NAME.equals(((XmlTag) context.getParent()).getLocalName());
-	}
-
-	private static boolean isAnonymousEventHandlerAttribute(JSFile jsFile)
-	{
-		PsiElement context = jsFile.getContext();
-		return context instanceof XmlAttributeValue;
-	}
-
-	public static boolean isAnonymousEventHandler(JSBlockStatement block)
-	{
-		JSFile file = (JSFile) iterateUp(block, ANONYMOUS_EVENT_LISTENER_CLASSES);
-		return file != null && (isAnonymousEventHandlerTag(file) || isAnonymousEventHandlerAttribute(file));
-	}
-
-	@Nullable
-	private static PsiElement iterateUp(PsiElement element, List<Class<? extends JSElement>> classes)
-	{
-		Iterator<Class<? extends JSElement>> i = classes.iterator();
-		while(i.hasNext())
-		{
-			if(element == null || !i.next().isInstance(element))
-			{
-				return null;
-			}
-			if(i.hasNext())
-			{
-				element = element.getParent();
-			}
-		}
-		return element;
-	}
-
-	@Nullable
-	private static JSElement getImportHolderFromXmlBackedClass(final XmlBackedJSClassImpl jsClass)
-	{
-		try
-		{
-			return jsClass.createOrGetFirstScriptTag();
-		}
-		catch(IncorrectOperationException ex)
-		{
-			Logger.getInstance(ImportUtils.class.getName()).error(ex);
-		}
-		return null;
-	}
-
-
-	private static int compareImports(String qname1, String qname2)
-	{
-		// TODO keep certain classes at the top
-		return Comparing.compare(qname1, qname2);
-	}
-
-	public static Pair<PsiElement, Boolean /*before*/> getImportInsertionPlace(JSElement holder)
-	{
-		PsiElement insertionPlace;
-		final boolean before;
-		if(holder instanceof JSPackageStatement)
-		{
-			insertionPlace = findLBrace(holder);
-			assert insertionPlace != null : "LBrace not found";
-			before = false;
-		}
-		else if(holder instanceof JSFunction)
-		{
-			final JSBlockStatement block = PsiTreeUtil.getChildOfType(holder, JSBlockStatement.class);
-			assert block != null : "Function block not found";
-			insertionPlace = findLBrace(block);
-			before = false;
-		}
-		else
-		{ //JSFile
-			if(isAnonymousEventHandlerTag((JSFile) holder))
-			{
-				holder = getAnonymousEventHandlerBody((JSFile) holder);
-				insertionPlace = findLBrace(holder);
-				if(hasCDATA(insertionPlace.getNextSibling()))
-				{
-					insertionPlace = insertionPlace.getNextSibling();
-				}
-				before = false;
-			}
-			else
-			{
-				JSPackageStatement aPackage = PsiTreeUtil.getChildOfType(holder, JSPackageStatement.class);
-				if(aPackage != null)
-				{
-					insertionPlace = aPackage;
-					before = false;
-				}
-				else
-				{
-					insertionPlace = holder.getFirstChild();
-					before = !hasCDATA(insertionPlace);
-				}
-			}
-		}
-		return Pair.create(insertionPlace, before);
-	}
-
-	private static boolean hasCDATA(@Nullable PsiElement element)
-	{
-		return element instanceof PsiWhiteSpace && element.getText().contains(CDATA);
-	}
-
-	@Nullable
-	public static JSElement getImportHolder(PsiElement origin, Class<? extends JSElement>... classes)
-	{
-		if(origin instanceof XmlBackedJSClassImpl)
-		{
-			return getImportHolderFromXmlBackedClass((XmlBackedJSClassImpl) origin);
-		}
-
-		JSElement importHolder = PsiTreeUtil.getParentOfType(origin, classes);
-		if(importHolder instanceof JSFunctionExpression && (isAnonymousEventHandlerTag((JSFile) importHolder.getContainingFile()) ||
-				isAnonymousEventHandlerAttribute((JSFile) importHolder.getContainingFile())))
-		{
-			importHolder = ArrayUtil.contains(JSFile.class, classes) ? (JSElement) importHolder.getContainingFile() : null;
-		}
-
-		if(importHolder instanceof JSFile)
-		{
-			if(isAnonymousEventHandlerAttribute((JSFile) importHolder))
-			{
-				XmlBackedJSClassImpl jsClass = JSResolveUtil.getXmlBackedClass((JSFile) importHolder);
-				assert jsClass != null;
-				importHolder = getImportHolderFromXmlBackedClass(jsClass);
-			}
-		}
-		return importHolder;
-	}
-
-	public static String createImportBlock(Project project, Collection<String> fqns)
-	{
-		List<String> sorted = new ArrayList<String>(fqns);
-		Collections.sort(sorted, new Comparator<String>()
-		{
-			@Override
-			public int compare(final String o1, final String o2)
-			{
-				return compareImports(o1, o2);
-			}
-		});
-
-		final String semicolon = JSChangeUtil.getSemicolon(project);
-		StringBuilder s = new StringBuilder();
-		for(String fqn : sorted)
-		{
-			s.append("import ").append(fqn).append(semicolon);
-		}
-		return s.toString();
-	}
-
-	@Nullable
-	public static JSImportStatement findEarlyImport(@Nullable PsiElement startFrom)
-	{
-		for(PsiElement element = startFrom; element != null; element = element.getNextSibling())
-		{
-			if(element instanceof JSImportStatement)
-			{
-				return (JSImportStatement) element;
-			}
-			if(element instanceof JSClass || element instanceof JSStatement || element instanceof JSFunction)
-			{
-				break;
-			}
-		}
-		return null;
-	}
+public class ImportUtils {
+    @NonNls
+    private static final String CDATA = "<![CDATA[";
+    @NonNls
+    private static final String SCRIPT_TAG_NAME = "Script";
+
+    private static final List<Class<? extends JSElement>> ANONYMOUS_EVENT_LISTENER_CLASSES = Arrays.asList(JSBlockStatement.class,
+        JSFunctionExpression.class, JSParenthesizedExpression.class, JSCallExpression.class, JSExpressionStatement.class, JSFile.class
+    );
+
+    @Nullable
+    private static PsiElement findLBrace(final JSElement holder) {
+        for (PsiElement child = holder.getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child.getNode().getElementType() == JSTokenTypes.LBRACE) {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    private static PsiElement specifyInsertionPlace(PsiElement insertBefore, String fqn) {
+        JSImportStatement earlyImport = findEarlyImport(insertBefore);
+        if (earlyImport == null) {
+            return insertBefore;
+        }
+
+        while (compareImports(fqn, earlyImport.getImportText()) > 0) {
+            if (earlyImport.getNextSibling() instanceof JSImportStatement) {
+                earlyImport = (JSImportStatement)earlyImport.getNextSibling();
+            }
+            else if (earlyImport.getNextSibling() instanceof PsiWhiteSpace && earlyImport.getNextSibling()
+                .getNextSibling() instanceof JSImportStatement) {
+                earlyImport = (JSImportStatement)earlyImport.getNextSibling().getNextSibling();
+            }
+            else {
+                return earlyImport.getNextSibling();
+            }
+        }
+        return earlyImport;
+    }
+
+    public static void doImport(@Nonnull PsiElement subject, final @Nonnull String fqn) {
+        assert fqn.contains(".") : "Qualified name belongs to default package: " + fqn;
+
+        if (!FileModificationService.getInstance().prepareFileForWrite(subject.getContainingFile())) {
+            return;
+        }
+        Project project = subject.getProject();
+
+        final JSReferenceExpression refExpr = PsiTreeUtil.getNonStrictParentOfType(subject, JSReferenceExpression.class);
+        if (refExpr != null && JSResolveUtil.referenceExpressionShouldBeQualified(refExpr)) {
+            refExpr.replace(JSChangeUtil.createExpressionFromText(project, fqn)); // TODO should commit corresponding document before?
+            return;
+        }
+
+        JSElement importHolder = getImportHolder(subject, JSPackageStatement.class, JSFile.class);
+        if (importHolder == null) { // importHolder is null when completing js2 class name from js code
+            return;
+        }
+
+        PsiFile file = importHolder.getContainingFile();
+        Document document = PsiDocumentManager.getInstance(project).getDocument(file);
+        PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document);
+
+        String textToInsert = createImportBlock(project, Collections.singletonList(fqn));
+
+        Pair<PsiElement, Boolean/*before*/> insertionPlace = getImportInsertionPlace(importHolder);
+        if (!insertionPlace.second && insertionPlace.first.getNextSibling() != null) {
+            insertionPlace = Pair.create(insertionPlace.first.getNextSibling(), true);
+        }
+
+        final int offset;
+        final String prefix;
+        final String suffix;
+        if (insertionPlace.second) {
+            PsiElement insertBefore = specifyInsertionPlace(insertionPlace.first, fqn);
+            offset = insertBefore.getTextRange().getStartOffset();
+            prefix =
+                (insertBefore.getPrevSibling() == null && file.getContext() == null) || insertBefore.getPrevSibling() instanceof PsiWhiteSpace ? "" :
+                    "\n";
+            suffix = insertBefore instanceof PsiWhiteSpace ? "" : " ";
+        }
+        else {
+            offset = insertionPlace.first.getTextRange().getEndOffset();
+            prefix = insertionPlace.first instanceof PsiWhiteSpace ? "" : "\n";
+            suffix = "";
+        }
+
+        document.insertString(offset, prefix + textToInsert + suffix);
+        PsiDocumentManager.getInstance(project).commitDocument(document);
+
+        PsiElement inserted = file.findElementAt(offset);
+        if (prefix.length() > 0) {
+            if (inserted.getNextSibling() instanceof JSImportStatement) {
+                inserted = inserted.getNextSibling();
+            }
+        }
+        else {
+            JSImportStatement importStatement = PsiTreeUtil.getParentOfType(inserted, JSImportStatement.class);
+            if (importStatement != null) {
+                inserted = importStatement;
+            }
+        }
+        PsiElement formatFrom = inserted.getPrevSibling() instanceof PsiWhiteSpace ? inserted.getPrevSibling() : inserted;
+        PsiElement formatTo = inserted.getNextSibling() instanceof PsiWhiteSpace ? inserted.getNextSibling() : inserted;
+
+        PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
+        final TextRange injectionOffset = InjectedLanguageManager.getInstance(project).injectedToHost(inserted, inserted.getTextRange());
+
+        CodeStyleManager.getInstance(project)
+            .reformatText(realFile, injectionOffset.getStartOffset() + formatFrom.getTextRange().getStartOffset(),
+                injectionOffset.getEndOffset() + formatTo.getTextRange().getEndOffset()
+            );
+    }
+
+    private static JSElement getAnonymousEventHandlerBody(JSFile injectedFile) {
+        // TODO more elegant way?!
+        if (injectedFile.getFirstChild() instanceof JSExpressionStatement) {
+            JSExpressionStatement expressionStatement = (JSExpressionStatement)injectedFile.getFirstChild();
+            if (expressionStatement.getExpression() instanceof JSCallExpression) {
+                JSCallExpression callExpression = (JSCallExpression)expressionStatement.getExpression();
+                if (callExpression.getMethodExpression() instanceof JSParenthesizedExpression) {
+                    JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression)callExpression.getMethodExpression();
+                    if (parenthesizedExpression.getInnerExpression() instanceof JSFunctionExpression) {
+                        JSFunctionExpression functionExpression = (JSFunctionExpression)parenthesizedExpression.getInnerExpression();
+                        JSFunction function = functionExpression.getFunction();
+                        if (function.getBody().length > 0) {
+                            return function.getBody()[0];
+                        }
+                    }
+                }
+            }
+        }
+        assert false : "Couldn't find anonymous event handler body: " + injectedFile;
+        return null;
+    }
+
+    private static boolean isAnonymousEventHandlerTag(JSFile jsFile) {
+        PsiElement context = jsFile.getContext();
+        return context instanceof XmlText && !SCRIPT_TAG_NAME.equals(((XmlTag)context.getParent()).getLocalName());
+    }
+
+    private static boolean isAnonymousEventHandlerAttribute(JSFile jsFile) {
+        PsiElement context = jsFile.getContext();
+        return context instanceof XmlAttributeValue;
+    }
+
+    public static boolean isAnonymousEventHandler(JSBlockStatement block) {
+        JSFile file = (JSFile)iterateUp(block, ANONYMOUS_EVENT_LISTENER_CLASSES);
+        return file != null && (isAnonymousEventHandlerTag(file) || isAnonymousEventHandlerAttribute(file));
+    }
+
+    @Nullable
+    private static PsiElement iterateUp(PsiElement element, List<Class<? extends JSElement>> classes) {
+        Iterator<Class<? extends JSElement>> i = classes.iterator();
+        while (i.hasNext()) {
+            if (element == null || !i.next().isInstance(element)) {
+                return null;
+            }
+            if (i.hasNext()) {
+                element = element.getParent();
+            }
+        }
+        return element;
+    }
+
+    @Nullable
+    private static JSElement getImportHolderFromXmlBackedClass(final XmlBackedJSClassImpl jsClass) {
+        try {
+            return jsClass.createOrGetFirstScriptTag();
+        }
+        catch (IncorrectOperationException ex) {
+            Logger.getInstance(ImportUtils.class.getName()).error(ex);
+        }
+        return null;
+    }
+
+
+    private static int compareImports(String qname1, String qname2) {
+        // TODO keep certain classes at the top
+        return Comparing.compare(qname1, qname2);
+    }
+
+    public static Pair<PsiElement, Boolean /*before*/> getImportInsertionPlace(JSElement holder) {
+        PsiElement insertionPlace;
+        final boolean before;
+        if (holder instanceof JSPackageStatement) {
+            insertionPlace = findLBrace(holder);
+            assert insertionPlace != null : "LBrace not found";
+            before = false;
+        }
+        else if (holder instanceof JSFunction) {
+            final JSBlockStatement block = PsiTreeUtil.getChildOfType(holder, JSBlockStatement.class);
+            assert block != null : "Function block not found";
+            insertionPlace = findLBrace(block);
+            before = false;
+        }
+        else { //JSFile
+            if (isAnonymousEventHandlerTag((JSFile)holder)) {
+                holder = getAnonymousEventHandlerBody((JSFile)holder);
+                insertionPlace = findLBrace(holder);
+                if (hasCDATA(insertionPlace.getNextSibling())) {
+                    insertionPlace = insertionPlace.getNextSibling();
+                }
+                before = false;
+            }
+            else {
+                JSPackageStatement aPackage = PsiTreeUtil.getChildOfType(holder, JSPackageStatement.class);
+                if (aPackage != null) {
+                    insertionPlace = aPackage;
+                    before = false;
+                }
+                else {
+                    insertionPlace = holder.getFirstChild();
+                    before = !hasCDATA(insertionPlace);
+                }
+            }
+        }
+        return Pair.create(insertionPlace, before);
+    }
+
+    private static boolean hasCDATA(@Nullable PsiElement element) {
+        return element instanceof PsiWhiteSpace && element.getText().contains(CDATA);
+    }
+
+    @Nullable
+    public static JSElement getImportHolder(PsiElement origin, Class<? extends JSElement>... classes) {
+        if (origin instanceof XmlBackedJSClassImpl) {
+            return getImportHolderFromXmlBackedClass((XmlBackedJSClassImpl)origin);
+        }
+
+        JSElement importHolder = PsiTreeUtil.getParentOfType(origin, classes);
+        if (importHolder instanceof JSFunctionExpression && (isAnonymousEventHandlerTag((JSFile)importHolder.getContainingFile()) ||
+            isAnonymousEventHandlerAttribute((JSFile)importHolder.getContainingFile()))) {
+            importHolder = ArrayUtil.contains(JSFile.class, classes) ? (JSElement)importHolder.getContainingFile() : null;
+        }
+
+        if (importHolder instanceof JSFile && isAnonymousEventHandlerAttribute((JSFile)importHolder)) {
+            XmlBackedJSClassImpl jsClass = JSResolveUtil.getXmlBackedClass((JSFile)importHolder);
+            assert jsClass != null;
+            importHolder = getImportHolderFromXmlBackedClass(jsClass);
+        }
+        return importHolder;
+    }
+
+    public static String createImportBlock(Project project, Collection<String> fqns) {
+        List<String> sorted = new ArrayList<String>(fqns);
+        Collections.sort(
+            sorted,
+            new Comparator<String>() {
+                @Override
+                public int compare(final String o1, final String o2) {
+                    return compareImports(o1, o2);
+                }
+            }
+        );
+
+        final String semicolon = JSChangeUtil.getSemicolon(project);
+        StringBuilder s = new StringBuilder();
+        for (String fqn : sorted) {
+            s.append("import ").append(fqn).append(semicolon);
+        }
+        return s.toString();
+    }
+
+    @Nullable
+    public static JSImportStatement findEarlyImport(@Nullable PsiElement startFrom) {
+        for (PsiElement element = startFrom; element != null; element = element.getNextSibling()) {
+            if (element instanceof JSImportStatement) {
+                return (JSImportStatement)element;
+            }
+            if (element instanceof JSClass || element instanceof JSStatement || element instanceof JSFunction) {
+                break;
+            }
+        }
+        return null;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java
index 06e3c7fb..76d15adb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java
@@ -20,21 +20,18 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:00:45 PM
+ * Date: Oct 20, 2008
+ * Time: 7:00:45 PM
  */
-class LabelInfo extends LinkedHashMap<Integer, String>
-{
-	int count;
+class LabelInfo extends LinkedHashMap<Integer, String> {
+    int count;
 
-	String labelFor(int target)
-	{
-		if(containsKey(target))
-		{
-			return get(target);
-		}
-		final String s = "L" + (++count);
-		put(target, s);
-		return s;
-	}
+    String labelFor(int target) {
+        if (containsKey(target)) {
+            return get(target);
+        }
+        final String s = "L" + (++count);
+        put(target, s);
+        return s;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
index 8f985a8f..38737b61 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
@@ -20,40 +20,34 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:00:39 PM
+ * Date: Oct 20, 2008
+ * Time: 7:00:39 PM
  */
-abstract class MemberInfo
-{
-	Traits parentTraits;
-	int id;
-	int kind;
-	Multiname name;
-	MetaData[] metadata;
-	boolean isOverride;
-	boolean isPublic;
-	boolean isFinal;
+abstract class MemberInfo {
+    Traits parentTraits;
+    int id;
+    int kind;
+    Multiname name;
+    MetaData[] metadata;
+    boolean isOverride;
+    boolean isPublic;
+    boolean isFinal;
 
-	abstract void dump(Abc abc, String indent, String attr, final @Nonnull FlexByteCodeInformationProcessor processor);
+    abstract void dump(Abc abc, String indent, String attr, final @Nonnull FlexByteCodeInformationProcessor processor);
 
-	protected void dumpMetaData(String indent, final @Nonnull FlexByteCodeInformationProcessor processor)
-	{
-		if(metadata != null)
-		{
-			for(MetaData md : metadata)
-			{
-				if(processor.doDumpMetaData(md))
-				{
-					processor.append(indent);
-					processor.processMetadata(md);
-					processor.append("\n");
-				}
-			}
-		}
-	}
+    protected void dumpMetaData(String indent, final @Nonnull FlexByteCodeInformationProcessor processor) {
+        if (metadata != null) {
+            for (MetaData md : metadata) {
+                if (processor.doDumpMetaData(md)) {
+                    processor.append(indent);
+                    processor.processMetadata(md);
+                    processor.append("\n");
+                }
+            }
+        }
+    }
 
-	String getParentName()
-	{
-		return parentTraits != null ? parentTraits.getClassName() : null;
-	}
+    String getParentName() {
+        return parentTraits != null ? parentTraits.getClassName() : null;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java
index 13edac7a..7f0f2496 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java
@@ -20,10 +20,9 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:00:50 PM
+ * Date: Oct 20, 2008
+ * Time: 7:00:50 PM
  */
-class MetaData extends LinkedHashMap<String, String>
-{
-	String name;
+class MetaData extends LinkedHashMap<String, String> {
+    String name;
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java
index cfe00ebb..be026f7b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java
@@ -20,250 +20,234 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:00:56 PM
+ * Date: Oct 20, 2008
+ * Time: 7:00:56 PM
  */
-class MethodInfo extends MemberInfo
-{
-	int flags;
-	String debugName;
-	Multiname paramTypes[];
-	String paramNames[];
-	Multiname optionalValues[];
-	Multiname returnType;
-	int local_count;
-	int max_scope;
-	int max_stack;
-	int code_length;
-	ByteBuffer code;
-	Traits activation;
-	boolean anon;
-
-	@Override
-	void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProcessor processor)
-	{
-		if(!processor.doDumpMember(this))
-		{
-			return;
-		}
-
-		processor.processFunction(this, false, abc, indent, attr);
-	}
-
-	protected void dumpCode(Abc abc, String indent, FlexByteCodeInformationProcessor processor)
-	{
-		processor.append(indent + "{\n");
-		String oldindent = indent;
-		indent += TAB;
-
-		if((flags & NEED_ACTIVATION) != 0)
-		{
-			processor.append(indent + "activation {\n");
-			activation.dump(abc, indent + TAB, "", processor);
-			processor.append(indent + "}\n");
-		}
-		processor.append(indent +
-				"// local_count=" +
-				local_count +
-				" max_scope=" +
-				max_scope +
-				" max_stack=" +
-				max_stack +
-				" code_len=" +
-				code.bytesSize() +
-				"\n");
-		code.setPosition(0);
-		LabelInfo labels = new LabelInfo();
-
-		while(!code.eof())
-		{
-			int start = code.getPosition();
-			int opcode = code.readUnsignedByte();
-
-			if(opcode == OP_label || (labels.containsKey(start)))
-			{
-				processor.append(indent + "\n");
-				processor.append(indent + labels.labelFor(start) + ": \n");
-			}
-
-			String str = indent + start;
-			processor.append(str);
-			for(int i = str.length(); i < 12; ++i)
-			{
-				processor.append(" ");
-			}
-
-			processor.append(opNames[opcode]);
-			processor.append(opNames[opcode].length() < 8 ? "\t\t" : "\t");
-
-			switch(opcode)
-			{
-				case OP_debugfile:
-				case OP_pushstring:
-					processor.append('"' + abc.strings[readU32()].replaceAll("/\n/g", "\\n").replaceAll("/\t/g", "\\t") + '"');
-					break;
-				case OP_pushnamespace:
-					processor.append(abc.namespaces[readU32()]);
-					break;
-				case OP_pushint:
-					int i = abc.ints[readU32()];
-					processor.append(i + "\t// 0x" + Integer.toString(i, 16));
-					break;
-				case OP_pushuint:
-					int u = abc.uints[readU32()];
-					processor.append(u + "\t// 0x" + Integer.toString(u, 16));
-					break;
-				case OP_pushdouble:
-					processor.append(abc.doubles[readU32()].toString());
-					break;
-				case OP_getsuper:
-				case OP_setsuper:
-				case OP_getproperty:
-				case OP_initproperty:
-				case OP_setproperty:
-				case OP_getlex:
-				case OP_findpropstrict:
-				case OP_findproperty:
-				case OP_finddef:
-				case OP_deleteproperty:
-				case OP_istype:
-				case OP_coerce:
-				case OP_astype:
-				case OP_getdescendants:
-					processor.append(abc.names[readU32()].toString());
-					break;
-				case OP_constructprop:
-				case OP_callproperty:
-				case OP_callproplex:
-				case OP_callsuper:
-				case OP_callsupervoid:
-				case OP_callpropvoid:
-					processor.append(abc.names[readU32()].toString());
-					processor.append(" (" + readU32() + ")");
-					break;
-				case OP_newfunction:
-				{
-					int method_id = readU32();
-					processor.processFunction(abc.methods[method_id], true, abc, "", "");
-					abc.methods[method_id].anon = true;
-					break;
-				}
-				case OP_callstatic:
-					processor.processFunction(abc.methods[readU32()], true, abc, "", "");
-					processor.append(" (" + readU32() + ")");
-					break;
-				case OP_newclass:
-					processor.append(abc.instances[readU32()].toString());
-					break;
-				case OP_lookupswitch:
-					int pos = start;
-					int target = pos + readS24();
-					int maxindex = readU32();
-					processor.append("default:" + labels.labelFor(target)); // target + "("+(target-pos)+")"
-					processor.append(" maxcase:" + maxindex);
-					for(i = 0; i <= maxindex; i++)
-					{
-						target = pos + readS24();
-						processor.append(" " + labels.labelFor(target)); // target + "("+(target-pos)+")"
-					}
-					break;
-				case OP_jump:
-				case OP_iftrue:
-				case OP_iffalse:
-				case OP_ifeq:
-				case OP_ifne:
-				case OP_ifge:
-				case OP_ifnge:
-				case OP_ifgt:
-				case OP_ifngt:
-				case OP_ifle:
-				case OP_ifnle:
-				case OP_iflt:
-				case OP_ifnlt:
-				case OP_ifstricteq:
-				case OP_ifstrictne:
-					int offset = readS24();
-					target = code.getPosition() + offset;
-					//s += target + " ("+offset+")"
-					processor.append(labels.labelFor(target));
-					if(!(labels.containsKey(code.getPosition())))
-					{
-						processor.append("\n");
-					}
-					break;
-				case OP_inclocal:
-				case OP_declocal:
-				case OP_inclocal_i:
-				case OP_declocal_i:
-				case OP_getlocal:
-				case OP_kill:
-				case OP_setlocal:
-				case OP_debugline:
-				case OP_getglobalslot:
-				case OP_getslot:
-				case OP_setglobalslot:
-				case OP_setslot:
-				case OP_pushshort:
-				case OP_newcatch:
-					processor.append("" + readU32());
-					break;
-				case OP_debug:
-					processor.append("" + code.readUnsignedByte());
-					processor.append(" " + readU32());
-					processor.append(" " + code.readUnsignedByte());
-					processor.append(" " + readU32());
-					break;
-				case OP_newobject:
-					processor.append("{" + readU32() + "}");
-					break;
-				case OP_newarray:
-					processor.append("[" + readU32() + "]");
-					break;
-				case OP_call:
-				case OP_construct:
-				case OP_constructsuper:
-					processor.append("(" + readU32() + ")");
-					break;
-				case OP_pushbyte:
-				case OP_getscopeobject:
-					processor.append("" + code.readByte());
-					break;
-				case OP_hasnext2:
-					processor.append(readU32() + " " + readU32());
-				default:
-		  /*if (opNames[opcode] == ("0x"+opcode.toString(16).toUpperCase()))
+class MethodInfo extends MemberInfo {
+    int flags;
+    String debugName;
+    Multiname paramTypes[];
+    String paramNames[];
+    Multiname optionalValues[];
+    Multiname returnType;
+    int local_count;
+    int max_scope;
+    int max_stack;
+    int code_length;
+    ByteBuffer code;
+    Traits activation;
+    boolean anon;
+
+    @Override
+    void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProcessor processor) {
+        if (!processor.doDumpMember(this)) {
+            return;
+        }
+
+        processor.processFunction(this, false, abc, indent, attr);
+    }
+
+    protected void dumpCode(Abc abc, String indent, FlexByteCodeInformationProcessor processor) {
+        processor.append(indent + "{\n");
+        String oldindent = indent;
+        indent += TAB;
+
+        if ((flags & NEED_ACTIVATION) != 0) {
+            processor.append(indent + "activation {\n");
+            activation.dump(abc, indent + TAB, "", processor);
+            processor.append(indent + "}\n");
+        }
+        processor.append(indent +
+            "// local_count=" +
+            local_count +
+            " max_scope=" +
+            max_scope +
+            " max_stack=" +
+            max_stack +
+            " code_len=" +
+            code.bytesSize() +
+            "\n");
+        code.setPosition(0);
+        LabelInfo labels = new LabelInfo();
+
+        while (!code.eof()) {
+            int start = code.getPosition();
+            int opcode = code.readUnsignedByte();
+
+            if (opcode == OP_label || (labels.containsKey(start))) {
+                processor.append(indent + "\n");
+                processor.append(indent + labels.labelFor(start) + ": \n");
+            }
+
+            String str = indent + start;
+            processor.append(str);
+            for (int i = str.length(); i < 12; ++i) {
+                processor.append(" ");
+            }
+
+            processor.append(opNames[opcode]);
+            processor.append(opNames[opcode].length() < 8 ? "\t\t" : "\t");
+
+            switch (opcode) {
+                case OP_debugfile:
+                case OP_pushstring:
+                    processor.append('"' + abc.strings[readU32()].replaceAll("/\n/g", "\\n").replaceAll("/\t/g", "\\t") + '"');
+                    break;
+                case OP_pushnamespace:
+                    processor.append(abc.namespaces[readU32()]);
+                    break;
+                case OP_pushint:
+                    int i = abc.ints[readU32()];
+                    processor.append(i + "\t// 0x" + Integer.toString(i, 16));
+                    break;
+                case OP_pushuint:
+                    int u = abc.uints[readU32()];
+                    processor.append(u + "\t// 0x" + Integer.toString(u, 16));
+                    break;
+                case OP_pushdouble:
+                    processor.append(abc.doubles[readU32()].toString());
+                    break;
+                case OP_getsuper:
+                case OP_setsuper:
+                case OP_getproperty:
+                case OP_initproperty:
+                case OP_setproperty:
+                case OP_getlex:
+                case OP_findpropstrict:
+                case OP_findproperty:
+                case OP_finddef:
+                case OP_deleteproperty:
+                case OP_istype:
+                case OP_coerce:
+                case OP_astype:
+                case OP_getdescendants:
+                    processor.append(abc.names[readU32()].toString());
+                    break;
+                case OP_constructprop:
+                case OP_callproperty:
+                case OP_callproplex:
+                case OP_callsuper:
+                case OP_callsupervoid:
+                case OP_callpropvoid:
+                    processor.append(abc.names[readU32()].toString());
+                    processor.append(" (" + readU32() + ")");
+                    break;
+                case OP_newfunction: {
+                    int method_id = readU32();
+                    processor.processFunction(abc.methods[method_id], true, abc, "", "");
+                    abc.methods[method_id].anon = true;
+                    break;
+                }
+                case OP_callstatic:
+                    processor.processFunction(abc.methods[readU32()], true, abc, "", "");
+                    processor.append(" (" + readU32() + ")");
+                    break;
+                case OP_newclass:
+                    processor.append(abc.instances[readU32()].toString());
+                    break;
+                case OP_lookupswitch:
+                    int pos = start;
+                    int target = pos + readS24();
+                    int maxindex = readU32();
+                    processor.append("default:" + labels.labelFor(target)); // target + "("+(target-pos)+")"
+                    processor.append(" maxcase:" + maxindex);
+                    for (i = 0; i <= maxindex; i++) {
+                        target = pos + readS24();
+                        processor.append(" " + labels.labelFor(target)); // target + "("+(target-pos)+")"
+                    }
+                    break;
+                case OP_jump:
+                case OP_iftrue:
+                case OP_iffalse:
+                case OP_ifeq:
+                case OP_ifne:
+                case OP_ifge:
+                case OP_ifnge:
+                case OP_ifgt:
+                case OP_ifngt:
+                case OP_ifle:
+                case OP_ifnle:
+                case OP_iflt:
+                case OP_ifnlt:
+                case OP_ifstricteq:
+                case OP_ifstrictne:
+                    int offset = readS24();
+                    target = code.getPosition() + offset;
+                    //s += target + " ("+offset+")"
+                    processor.append(labels.labelFor(target));
+                    if (!(labels.containsKey(code.getPosition()))) {
+                        processor.append("\n");
+                    }
+                    break;
+                case OP_inclocal:
+                case OP_declocal:
+                case OP_inclocal_i:
+                case OP_declocal_i:
+                case OP_getlocal:
+                case OP_kill:
+                case OP_setlocal:
+                case OP_debugline:
+                case OP_getglobalslot:
+                case OP_getslot:
+                case OP_setglobalslot:
+                case OP_setslot:
+                case OP_pushshort:
+                case OP_newcatch:
+                    processor.append("" + readU32());
+                    break;
+                case OP_debug:
+                    processor.append("" + code.readUnsignedByte());
+                    processor.append(" " + readU32());
+                    processor.append(" " + code.readUnsignedByte());
+                    processor.append(" " + readU32());
+                    break;
+                case OP_newobject:
+                    processor.append("{" + readU32() + "}");
+                    break;
+                case OP_newarray:
+                    processor.append("[" + readU32() + "]");
+                    break;
+                case OP_call:
+                case OP_construct:
+                case OP_constructsuper:
+                    processor.append("(" + readU32() + ")");
+                    break;
+                case OP_pushbyte:
+                case OP_getscopeobject:
+                    processor.append("" + code.readByte());
+                    break;
+                case OP_hasnext2:
+                    processor.append(readU32() + " " + readU32());
+                default:
+          /*if (opNames[opcode] == ("0x"+opcode.toString(16).toUpperCase()))
       s += " UNKNOWN OPCODE"*/
-					break;
-			}
-
-			int size = code.getPosition() - start;
-			abc.totalSize += size;
-			abc.opSizes[opcode] += size;
-			processor.append("\n");
-		}
-		processor.append(oldindent + "}\n");
-	}
-
-	int readU32()
-	{
-		return code.readU32();
-	}
-
-	int readS24()
-	{
-		int b = code.readUnsignedByte();
-		b |= code.readUnsignedByte() << 8;
-		b |= code.readByte() << 16;
-		return b;
-	}
-
-	boolean isGetMethod()
-	{
-		return traitKinds[kind].indexOf(" get") != -1;
-	}
-
-	boolean isSetMethod()
-	{
-		return traitKinds[kind].indexOf(" set") != -1;
-	}
+                    break;
+            }
+
+            int size = code.getPosition() - start;
+            abc.totalSize += size;
+            abc.opSizes[opcode] += size;
+            processor.append("\n");
+        }
+        processor.append(oldindent + "}\n");
+    }
+
+    int readU32() {
+        return code.readU32();
+    }
+
+    int readS24() {
+        int b = code.readUnsignedByte();
+        b |= code.readUnsignedByte() << 8;
+        b |= code.readByte() << 16;
+        return b;
+    }
+
+    boolean isGetMethod() {
+        return traitKinds[kind].indexOf(" get") != -1;
+    }
+
+    boolean isSetMethod() {
+        return traitKinds[kind].indexOf(" set") != -1;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java
index ce9577d1..a32003f1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java
@@ -18,75 +18,65 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:03:18 PM
+ * Date: Oct 20, 2008
+ * Time: 7:03:18 PM
  */
-class Multiname
-{
-	String[] nsset;
-	String name;
+class Multiname {
+    String[] nsset;
+    String name;
 
-	Multiname(String[] nsset, String name)
-	{
-		this.nsset = nsset;
-		this.name = name;
-	}
+    Multiname(String[] nsset, String name) {
+        this.nsset = nsset;
+        this.name = name;
+    }
 
-	@Override
-	public String toString()
-	{
-		String s = "";
-		if(hasNotEmptyNs())
-		{
-			s += nsset[0] + "::";
-		}
-		s += name;
+    @Override
+    public String toString() {
+        String s = "";
+        if (hasNotEmptyNs()) {
+            s += nsset[0] + "::";
+        }
+        s += name;
 
-		return s;
-	}
+        return s;
+    }
 
-	boolean hasNotEmptyNs()
-	{
-		return nsset != null && nsset.length > 0 && nsset[0] != null && nsset[0].length() > 0;
-	}
+    boolean hasNotEmptyNs() {
+        return nsset != null && nsset.length > 0 && nsset[0] != null && nsset[0].length() > 0;
+    }
 
-	public boolean hasNamespace()
-	{
-		return hasNotEmptyNs() && (nsset[0].startsWith("http://") || nsset[0].equals("private") || nsset[0].equals("__AS3__.vec") ||
-				nsset[0].indexOf('$') != -1 || nsset[0].indexOf("/private:") != -1);
-	}
+    public boolean hasNamespace() {
+        return hasNotEmptyNs() && (nsset[0].startsWith("http://") || nsset[0].equals("private") || nsset[0].equals("__AS3__.vec") ||
+            nsset[0].indexOf('$') != -1 || nsset[0].indexOf("/private:") != -1);
+    }
 
-	public String getNsName()
-	{
-		// TODO: would be nice to pickup namespace var names automatically
-		return nsset[0].equals("http://adobe.com/AS3/2006/builtin") ? "AS3" : nsset[0].equals("http://www.adobe.com/2006/flex/mx/internal") ?
-				"mx_internal" : nsset[0].equals("__AS3__.vec") ? "__AS3__$vec" : nsset[0].equals("http://www.adobe.com/2008/actionscript/Flash10/") ? "flash10"
-				: nsset[0].equals("http://www.adobe.com/2006/actionscript/flash/objectproxy") ? "object_proxy" : nsset[0].equals("http://www.adobe" +
-				".com/2006/actionscript/flash/proxy") ? "flash_proxy" : getValidNsName();
-	}
+    public String getNsName() {
+        // TODO: would be nice to pickup namespace var names automatically
+        return nsset[0].equals("http://adobe.com/AS3/2006/builtin") ? "AS3" : nsset[0].equals("http://www.adobe.com/2006/flex/mx/internal") ?
+            "mx_internal" : nsset[0].equals("__AS3__.vec") ? "__AS3__$vec" : nsset[0].equals(
+            "http://www.adobe.com/2008/actionscript/Flash10/") ? "flash10"
+            : nsset[0].equals("http://www.adobe.com/2006/actionscript/flash/objectproxy") ? "object_proxy" : nsset[0].equals(
+            "http://www.adobe" +
+                ".com/2006/actionscript/flash/proxy") ? "flash_proxy" : getValidNsName();
+    }
 
-	public String getValidNsName()
-	{
-		return makeIdentifier(nsset[0]);
-	}
+    public String getValidNsName() {
+        return makeIdentifier(nsset[0]);
+    }
 
-	private static String makeIdentifier(String s)
-	{
-		StringBuilder builder = new StringBuilder(s.length());
-		for(int i = 0; i < s.length(); ++i)
-		{
-			char ch = s.charAt(i);
-			if(!Character.isJavaIdentifierPart(ch))
-			{
-				ch = '_';
-			}
-			builder.append(ch);
-		}
-		return builder.toString();
-	}
+    private static String makeIdentifier(String s) {
+        StringBuilder builder = new StringBuilder(s.length());
+        for (int i = 0; i < s.length(); ++i) {
+            char ch = s.charAt(i);
+            if (!Character.isJavaIdentifierPart(ch)) {
+                ch = '_';
+            }
+            builder.append(ch);
+        }
+        return builder.toString();
+    }
 
-	public boolean isStarReference()
-	{
-		return "*".equals(name);
-	}
+    public boolean isStarReference() {
+        return "*".equals(name);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java
index b99711fa..4fbf3d5e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java
@@ -18,42 +18,35 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:01:03 PM
+ * Date: Oct 20, 2008
+ * Time: 7:01:03 PM
  */
-class SlotInfo extends MemberInfo
-{
-	Multiname type;
-	Object value;
+class SlotInfo extends MemberInfo {
+    Multiname type;
+    Object value;
 
-	@Override
-	void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProcessor processor)
-	{
-		if(!processor.doDumpMember(this))
-		{
-			return;
-		}
+    @Override
+    void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProcessor processor) {
+        if (!processor.doDumpMember(this)) {
+            return;
+        }
 
-		if(kind == Abc.TRAIT_Const || kind == Abc.TRAIT_Slot)
-		{
-			processor.processVariable(this, indent, attr);
-			return;
-		}
+        if (kind == Abc.TRAIT_Const || kind == Abc.TRAIT_Slot) {
+            processor.processVariable(this, indent, attr);
+            return;
+        }
 
-		processor.processClass(this, abc, attr, indent);
-	}
+        processor.processClass(this, abc, attr, indent);
+    }
 
-	boolean isInterfaceClass()
-	{
-		if(!(value instanceof Traits))
-		{
-			return false;
-		}
-		return (((Traits) value).itraits.flags & Abc.CLASS_FLAG_interface) != 0;
-	}
+    boolean isInterfaceClass() {
+        if (!(value instanceof Traits)) {
+            return false;
+        }
+        return (((Traits)value).itraits.flags & Abc.CLASS_FLAG_interface) != 0;
+    }
 
-	public boolean isConst()
-	{
-		return Abc.traitKinds[kind].indexOf("const") != -1;
-	}
+    public boolean isConst() {
+        return Abc.traitKinds[kind].indexOf("const") != -1;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java
index ce407aa2..1ede8c29 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java
@@ -20,394 +20,374 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:01:59 PM
+ * Date: Oct 20, 2008
+ * Time: 7:01:59 PM
  */
-class Swf
-{
-	private static class Rect
-	{
-		int nBits;
-		int xMin, xMax;
-		int yMin, yMax;
-
-		@Override
-		public
-		@NonNls
-		String toString()
-		{
-			return "[Rect " + xMin + " " + yMin + " " + xMax + " " + yMax + "]";
-		}
-	}
-
-	private FlexByteCodeInformationProcessor processor;
-	private int bitPos;
-	private int bitBuf;
-
-	private ByteBuffer data;
-
-	private static final int stagDoABC = 72;   // embedded .abc (AVM+) bytecode
-	private static final int stagDoABC2 = 82;   // revised ABC version with a name
-
-	private static final
-	@NonNls
-	String[] tagNames = {
-			"End",
-			// 00
-			"ShowFrame",
-			// 01
-			"DefineShape",
-			// 02
-			"FreeCharacter",
-			// 03
-			"PlaceObject",
-			// 04
-			"RemoveObject",
-			// 05
-			"DefineBits",
-			// 06
-			"DefineButton",
-			// 07
-			"JPEGTables",
-			// 08
-			"SetBackgroundColor",
-			// 09
-
-			"DefineFont",
-			// 10
-			"DefineText",
-			// 11
-			"DoAction",
-			// 12
-			"DefineFontInfo",
-			// 13
-
-			"DefineSound",
-			// 14
-			"StartSound",
-			// 15
-			"StopSound",
-			// 16
-
-			"DefineButtonSound",
-			// 17
-
-			"SoundStreamHead",
-			// 18
-			"SoundStreamBlock",
-			// 19
-
-			"DefineBitsLossless",
-			// 20
-			"DefineBitsJPEG2",
-			// 21
-
-			"DefineShape2",
-			// 22
-			"DefineButtonCxform",
-			// 23
-
-			"Protect",
-			// 24
-
-			"PathsArePostScript",
-			// 25
-
-			"PlaceObject2",
-			// 26
-			"27 (invalid)",
-			// 27
-			"RemoveObject2",
-			// 28
-
-			"SyncFrame",
-			// 29
-			"30 (invalid)",
-			// 30
-			"FreeAll",
-			// 31
-
-			"DefineShape3",
-			// 32
-			"DefineText2",
-			// 33
-			"DefineButton2",
-			// 34
-			"DefineBitsJPEG3",
-			// 35
-			"DefineBitsLossless2",
-			// 36
-			"DefineEditText",
-			// 37
-
-			"DefineVideo",
-			// 38
-
-			"DefineSprite",
-			// 39
-			"NameCharacter",
-			// 40
-			"ProductInfo",
-			// 41
-			"DefineTextFormat",
-			// 42
-			"FrameLabel",
-			// 43
-			"DefineBehavior",
-			// 44
-			"SoundStreamHead2",
-			// 45
-			"DefineMorphShape",
-			// 46
-			"FrameTag",
-			// 47
-			"DefineFont2",
-			// 48
-			"GenCommand",
-			// 49
-			"DefineCommandObj",
-			// 50
-			"CharacterSet",
-			// 51
-			"FontRef",
-			// 52
-
-			"DefineFunction",
-			// 53
-			"PlaceFunction",
-			// 54
-
-			"GenTagObject",
-			// 55
-
-			"ExportAssets",
-			// 56
-			"ImportAssets",
-			// 57
-
-			"EnableDebugger",
-			// 58
-
-			"DoInitAction",
-			// 59
-			"DefineVideoStream",
-			// 60
-			"VideoFrame",
-			// 61
-
-			"DefineFontInfo2",
-			// 62
-			"DebugID",
-			// 63
-			"EnableDebugger2",
-			// 64
-			"ScriptLimits",
-			// 65
-
-			"SetTabIndex",
-			// 66
-
-			"DefineShape4",
-			// 67
-			"68 (invalid)",
-			// 68
-
-			"FileAttributes",
-			// 69
-
-			"PlaceObject3",
-			// 70
-			"ImportAssets2",
-			// 71
-
-			"DoABC",
-			// 72
-			"DefineFontAlignZones",
-			// 73
-			"CSMTextSettings",
-			// 74
-			"DefineFont3",
-			// 75
-			"SymbolClass",
-			// 76
-			"Metadata",
-			// 77
-			"ScalingGrid",
-			// 78
-			"79 (invalid)",
-			// 79
-			"80 (invalid)",
-			// 80
-			"81 (invalid)",
-			// 81
-			"DoABC2",
-			// 82
-			"DefineShape4",
-			// 83
-			"DefineMorphShape2",
-			// 84
-			"85 (invalid)",
-			// 85
-			"DefineSceneAndFrameLabelData",
-			// 86
-			"DefineBinaryData",
-			// 87
-			"DefineFontName",
-			// 88
-			"89 (unknown)  ",
-			// 89
-			"90 (unknown)  ",
-			// 90
-			"DefineFont4",
-			// 91
-			"(invalid)"
-			// end
-	};
-
-
-	public Swf(final ByteBuffer _data, final FlexByteCodeInformationProcessor _processor)
-	{
-		data = _data;
-		processor = _processor;
-
-		final Rect rect = decodeRect();
-		final int rate = data.readUnsignedByte() << 8 | data.readUnsignedByte();
-		final int count = data.readUnsignedShort();
-
-		processor.dumpStat("size " + rect + "\n");
-		processor.dumpStat("frame rate " + rate + "\n");
-		processor.dumpStat("frame count " + count + "\n");
-
-		decodeTags();
-	}
-
-	private void decodeTags()
-	{
-		int type, h, length;
-
-		while(data.getPosition() < data.bytesSize())
-		{
-			type = (h = data.readUnsignedShort()) >> 6;
-
-			if(((length = h & 0x3F) == 0x3F))
-			{
-				length = data.readInt();
-			}
-
-			processor.dumpStat((type < tagNames.length ? tagNames[type] : "undefined") + " " + length + "b " + ((int) 100f * length / data.bytesSize()) +
-					"%\n");
-
-			switch(type)
-			{
-				case 0:
-					return;
-				case stagDoABC2:
-					int pos1 = data.getPosition();
-					data.readInt();
-					final String abcName = readString();
-					processor.dumpStat("\nabc name " + abcName + "\n");
-					length -= (data.getPosition() - pos1);
-					// fall through
-				case stagDoABC:
-					ByteBuffer data2 = new ByteBuffer();
-					data2.setLittleEndian();
-					data.readBytes(data2, length);
-					new Abc(data2, processor).dump(processor.getAbcInSwfIndent());
-					processor.append("\n");
-					break;
-				default:
-					data.incPosition(length);
-			}
-		}
-	}
-
-	private String readString()
-	{
-		String s = "";
-		int c;
-
-		while((c = data.readUnsignedByte()) != 0)
-		{
-			s += (char) c;
-		}
-
-		return s;
-	}
-
-	private void syncBits()
-	{
-		bitPos = 0;
-	}
-
-	private Rect decodeRect()
-
-	{
-		syncBits();
-
-		Rect rect = new Rect();
-
-		int nBits = readUBits(5);
-		rect.xMin = readSBits(nBits);
-		rect.xMax = readSBits(nBits);
-		rect.yMin = readSBits(nBits);
-		rect.yMax = readSBits(nBits);
-
-		return rect;
-	}
-
-	int readSBits(int numBits)
-	{
-		if(numBits > 32)
-		{
-			throw new Error("Number of bits > 32");
-		}
-
-		int num = readUBits(numBits);
-		int shift = 32 - numBits;
-		// sign extension
-		num = (num << shift) >> shift;
-		return num;
-	}
-
-	int readUBits(int numBits)
-	{
-		if(numBits == 0)
-		{
-			return 0;
-		}
-
-		int bitsLeft = numBits;
-		int result = 0;
-
-		if(bitPos == 0) //no value in the buffer - read a byte
-		{
-			bitBuf = data.readUnsignedByte();
-			bitPos = 8;
-		}
-
-		while(true)
-		{
-			int shift = bitsLeft - bitPos;
-			if(shift > 0)
-			{
-				// Consume the entire buffer
-				result |= bitBuf << shift;
-				bitsLeft -= bitPos;
-
-				// Get the next byte from the input stream
-				bitBuf = data.readUnsignedByte();
-				bitPos = 8;
-			}
-			else
-			{
-				// Consume a portion of the buffer
-				result |= bitBuf >> -shift;
-				bitPos -= bitsLeft;
-				bitBuf &= 0xff >> (8 - bitPos); // mask off the consumed bits
-
-				//                if (sb.append) System.out.sb.appendln("  read"+numBits+" " + result);
-				return result;
-			}
-		}
-	}
+class Swf {
+    private static class Rect {
+        int nBits;
+        int xMin, xMax;
+        int yMin, yMax;
+
+        @Override
+        public
+        @NonNls
+        String toString() {
+            return "[Rect " + xMin + " " + yMin + " " + xMax + " " + yMax + "]";
+        }
+    }
+
+    private FlexByteCodeInformationProcessor processor;
+    private int bitPos;
+    private int bitBuf;
+
+    private ByteBuffer data;
+
+    private static final int stagDoABC = 72;   // embedded .abc (AVM+) bytecode
+    private static final int stagDoABC2 = 82;   // revised ABC version with a name
+
+    private static final
+    @NonNls
+    String[] tagNames = {
+        "End",
+        // 00
+        "ShowFrame",
+        // 01
+        "DefineShape",
+        // 02
+        "FreeCharacter",
+        // 03
+        "PlaceObject",
+        // 04
+        "RemoveObject",
+        // 05
+        "DefineBits",
+        // 06
+        "DefineButton",
+        // 07
+        "JPEGTables",
+        // 08
+        "SetBackgroundColor",
+        // 09
+
+        "DefineFont",
+        // 10
+        "DefineText",
+        // 11
+        "DoAction",
+        // 12
+        "DefineFontInfo",
+        // 13
+
+        "DefineSound",
+        // 14
+        "StartSound",
+        // 15
+        "StopSound",
+        // 16
+
+        "DefineButtonSound",
+        // 17
+
+        "SoundStreamHead",
+        // 18
+        "SoundStreamBlock",
+        // 19
+
+        "DefineBitsLossless",
+        // 20
+        "DefineBitsJPEG2",
+        // 21
+
+        "DefineShape2",
+        // 22
+        "DefineButtonCxform",
+        // 23
+
+        "Protect",
+        // 24
+
+        "PathsArePostScript",
+        // 25
+
+        "PlaceObject2",
+        // 26
+        "27 (invalid)",
+        // 27
+        "RemoveObject2",
+        // 28
+
+        "SyncFrame",
+        // 29
+        "30 (invalid)",
+        // 30
+        "FreeAll",
+        // 31
+
+        "DefineShape3",
+        // 32
+        "DefineText2",
+        // 33
+        "DefineButton2",
+        // 34
+        "DefineBitsJPEG3",
+        // 35
+        "DefineBitsLossless2",
+        // 36
+        "DefineEditText",
+        // 37
+
+        "DefineVideo",
+        // 38
+
+        "DefineSprite",
+        // 39
+        "NameCharacter",
+        // 40
+        "ProductInfo",
+        // 41
+        "DefineTextFormat",
+        // 42
+        "FrameLabel",
+        // 43
+        "DefineBehavior",
+        // 44
+        "SoundStreamHead2",
+        // 45
+        "DefineMorphShape",
+        // 46
+        "FrameTag",
+        // 47
+        "DefineFont2",
+        // 48
+        "GenCommand",
+        // 49
+        "DefineCommandObj",
+        // 50
+        "CharacterSet",
+        // 51
+        "FontRef",
+        // 52
+
+        "DefineFunction",
+        // 53
+        "PlaceFunction",
+        // 54
+
+        "GenTagObject",
+        // 55
+
+        "ExportAssets",
+        // 56
+        "ImportAssets",
+        // 57
+
+        "EnableDebugger",
+        // 58
+
+        "DoInitAction",
+        // 59
+        "DefineVideoStream",
+        // 60
+        "VideoFrame",
+        // 61
+
+        "DefineFontInfo2",
+        // 62
+        "DebugID",
+        // 63
+        "EnableDebugger2",
+        // 64
+        "ScriptLimits",
+        // 65
+
+        "SetTabIndex",
+        // 66
+
+        "DefineShape4",
+        // 67
+        "68 (invalid)",
+        // 68
+
+        "FileAttributes",
+        // 69
+
+        "PlaceObject3",
+        // 70
+        "ImportAssets2",
+        // 71
+
+        "DoABC",
+        // 72
+        "DefineFontAlignZones",
+        // 73
+        "CSMTextSettings",
+        // 74
+        "DefineFont3",
+        // 75
+        "SymbolClass",
+        // 76
+        "Metadata",
+        // 77
+        "ScalingGrid",
+        // 78
+        "79 (invalid)",
+        // 79
+        "80 (invalid)",
+        // 80
+        "81 (invalid)",
+        // 81
+        "DoABC2",
+        // 82
+        "DefineShape4",
+        // 83
+        "DefineMorphShape2",
+        // 84
+        "85 (invalid)",
+        // 85
+        "DefineSceneAndFrameLabelData",
+        // 86
+        "DefineBinaryData",
+        // 87
+        "DefineFontName",
+        // 88
+        "89 (unknown)  ",
+        // 89
+        "90 (unknown)  ",
+        // 90
+        "DefineFont4",
+        // 91
+        "(invalid)"
+        // end
+    };
+
+
+    public Swf(final ByteBuffer _data, final FlexByteCodeInformationProcessor _processor) {
+        data = _data;
+        processor = _processor;
+
+        final Rect rect = decodeRect();
+        final int rate = data.readUnsignedByte() << 8 | data.readUnsignedByte();
+        final int count = data.readUnsignedShort();
+
+        processor.dumpStat("size " + rect + "\n");
+        processor.dumpStat("frame rate " + rate + "\n");
+        processor.dumpStat("frame count " + count + "\n");
+
+        decodeTags();
+    }
+
+    private void decodeTags() {
+        int type, h, length;
+
+        while (data.getPosition() < data.bytesSize()) {
+            type = (h = data.readUnsignedShort()) >> 6;
+
+            if (((length = h & 0x3F) == 0x3F)) {
+                length = data.readInt();
+            }
+
+            processor.dumpStat((type < tagNames.length ? tagNames[type] : "undefined") + " " + length + "b " + ((int)100f * length / data.bytesSize()) +
+                "%\n");
+
+            switch (type) {
+                case 0:
+                    return;
+                case stagDoABC2:
+                    int pos1 = data.getPosition();
+                    data.readInt();
+                    final String abcName = readString();
+                    processor.dumpStat("\nabc name " + abcName + "\n");
+                    length -= (data.getPosition() - pos1);
+                    // fall through
+                case stagDoABC:
+                    ByteBuffer data2 = new ByteBuffer();
+                    data2.setLittleEndian();
+                    data.readBytes(data2, length);
+                    new Abc(data2, processor).dump(processor.getAbcInSwfIndent());
+                    processor.append("\n");
+                    break;
+                default:
+                    data.incPosition(length);
+            }
+        }
+    }
+
+    private String readString() {
+        String s = "";
+        int c;
+
+        while ((c = data.readUnsignedByte()) != 0) {
+            s += (char)c;
+        }
+
+        return s;
+    }
+
+    private void syncBits() {
+        bitPos = 0;
+    }
+
+    private Rect decodeRect() {
+        syncBits();
+
+        Rect rect = new Rect();
+
+        int nBits = readUBits(5);
+        rect.xMin = readSBits(nBits);
+        rect.xMax = readSBits(nBits);
+        rect.yMin = readSBits(nBits);
+        rect.yMax = readSBits(nBits);
+
+        return rect;
+    }
+
+    int readSBits(int numBits) {
+        if (numBits > 32) {
+            throw new Error("Number of bits > 32");
+        }
+
+        int num = readUBits(numBits);
+        int shift = 32 - numBits;
+        // sign extension
+        num = (num << shift) >> shift;
+        return num;
+    }
+
+    int readUBits(int numBits) {
+        if (numBits == 0) {
+            return 0;
+        }
+
+        int bitsLeft = numBits;
+        int result = 0;
+
+        if (bitPos == 0) //no value in the buffer - read a byte
+        {
+            bitBuf = data.readUnsignedByte();
+            bitPos = 8;
+        }
+
+        while (true) {
+            int shift = bitsLeft - bitPos;
+            if (shift > 0) {
+                // Consume the entire buffer
+                result |= bitBuf << shift;
+                bitsLeft -= bitPos;
+
+                // Get the next byte from the input stream
+                bitBuf = data.readUnsignedByte();
+                bitPos = 8;
+            }
+            else {
+                // Consume a portion of the buffer
+                result |= bitBuf >> -shift;
+                bitPos -= bitsLeft;
+                bitBuf &= 0xff >> (8 - bitPos); // mask off the consumed bits
+
+                //                if (sb.append) System.out.sb.appendln("  read"+numBits+" " + result);
+                return result;
+            }
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java
index ca4f3dff..5b31f74b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java
@@ -21,44 +21,38 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Oct 20, 2008
- *         Time: 7:01:09 PM
+ * Date: Oct 20, 2008
+ * Time: 7:01:09 PM
  */
-class Traits
-{
-	Object name;
-	MethodInfo init;
-	Traits itraits;
-	Multiname base;
-	int flags;
-	String protectedNs;
-	Multiname interfaces[];
-	Map<String, MemberInfo> names = new LinkedHashMap<String, MemberInfo>();
-	Map<Integer, SlotInfo> slots = new LinkedHashMap<Integer, SlotInfo>();
-	Map<Integer, MethodInfo> methods = new LinkedHashMap<Integer, MethodInfo>();
-	Map<Integer, MemberInfo> members = new LinkedHashMap<Integer, MemberInfo>();
+class Traits {
+    Object name;
+    MethodInfo init;
+    Traits itraits;
+    Multiname base;
+    int flags;
+    String protectedNs;
+    Multiname interfaces[];
+    Map<String, MemberInfo> names = new LinkedHashMap<String, MemberInfo>();
+    Map<Integer, SlotInfo> slots = new LinkedHashMap<Integer, SlotInfo>();
+    Map<Integer, MethodInfo> methods = new LinkedHashMap<Integer, MethodInfo>();
+    Map<Integer, MemberInfo> members = new LinkedHashMap<Integer, MemberInfo>();
 
-	@Override
-	public String toString()
-	{
-		return name.toString();
-	}
+    @Override
+    public String toString() {
+        return name.toString();
+    }
 
-	public void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProcessor processor)
-	{
-		for(MemberInfo m : members.values())
-		{
-			m.dump(abc, indent, attr, processor);
-		}
-	}
+    public void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProcessor processor) {
+        for (MemberInfo m : members.values()) {
+            m.dump(abc, indent, attr, processor);
+        }
+    }
 
-	String getClassName()
-	{
-		final String s = name.toString();
-		if(s.endsWith(Abc.$))
-		{
-			return s.substring(0, s.length() - 1);
-		}
-		return s;
-	}
+    String getClassName() {
+        final String s = name.toString();
+        if (s.endsWith(Abc.$)) {
+            return s.substring(0, s.length() - 1);
+        }
+        return s;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
index 675d06b9..9b3e2bf0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
@@ -37,6 +37,7 @@
 import consulo.language.psi.PsiWhiteSpace;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -44,179 +45,154 @@
  * @author max
  */
 @ExtensionImpl
-public class JavaScriptFoldingBuilder implements FoldingBuilder
-{
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public FoldingDescriptor[] buildFoldRegions(@Nonnull ASTNode node, @Nonnull Document document)
-	{
-		List<FoldingDescriptor> descriptors = new ArrayList<>();
-		appendDescriptors(node, document, descriptors);
-		return descriptors.toArray(new FoldingDescriptor[descriptors.size()]);
-	}
-
-	@RequiredReadAction
-	private static ASTNode appendDescriptors(final ASTNode node, final Document document, final List<FoldingDescriptor> descriptors)
-	{
-		final IElementType type = node.getElementType();
-		if(type == JSElementTypes.BLOCK_STATEMENT ||
-				type == JSElementTypes.OBJECT_LITERAL_EXPRESSION ||
-				type == JSElementTypes.ARRAY_LITERAL_EXPRESSION ||
-				type == JSElementTypes.XML_LITERAL_EXPRESSION)
-		{
-			TextRange textRange = node.getTextRange();
-			if(textRange.getEndOffset() < document.getTextLength() && document.getLineNumber(textRange.getStartOffset()) != document.getLineNumber(textRange
-					.getEndOffset()))
-			{
-				addDescriptorForNode(node, descriptors);
-			}
-		}
-		else if(type == JSTokenTypes.DOC_COMMENT)
-		{
-			addDescriptorForNode(node, descriptors);
-		}
-		else if(type == JSTokenTypes.C_STYLE_COMMENT)
-		{
-			addDescriptorForNode(node, descriptors);
-		}
-		else if(type == JSTokenTypes.END_OF_LINE_COMMENT)
-		{
-			return collapseConsequentNodesOfSpecifiedType(node, descriptors, JSTokenTypes.END_OF_LINE_COMMENT);
-		}
-		else if(node.getPsi() instanceof JavaScriptImportStatementBase)
-		{
-			return collapseConsequentNodesOfSpecifiedType(node, descriptors, PsiUtilCore.getElementType(node));
-		}
-		else if(type == JSElementTypes.CLASS || type == JSElementTypes.PACKAGE_STATEMENT)
-		{
-			ASTNode lbrace = node.findChildByType(JSTokenTypes.LBRACE);
-
-			if(lbrace != null)
-			{
-				addDescriptorForRange(node, descriptors, new TextRange(lbrace.getStartOffset(), node.getTextRange().getEndOffset()));
-			}
-		}
-
-		if(type instanceof JSFileElementType)
-		{
-			// expand chameleon
-			node.getPsi().getFirstChild();
-		}
-
-		ASTNode child = node.getFirstChildNode();
-		while(child != null)
-		{
-			child = appendDescriptors(child, document, descriptors).getTreeNext();
-		}
-
-		return node;
-	}
-
-	private static void addDescriptorForRange(ASTNode node, List<FoldingDescriptor> descriptors, TextRange range)
-	{
-		if(range.getLength() > 1)
-		{
-			descriptors.add(new FoldingDescriptor(node, range));
-		}
-	}
-
-	private static void addDescriptorForNode(ASTNode node, List<FoldingDescriptor> descriptors)
-	{
-		TextRange range = node.getTextRange();
-		addDescriptorForRange(node, descriptors, range);
-	}
-
-	@RequiredReadAction
-	private static ASTNode collapseConsequentNodesOfSpecifiedType(final ASTNode node, final List<FoldingDescriptor> descriptors, final IElementType endOfLineComment)
-	{
-		PsiElement lastEoLComment = node.getPsi();
-		PsiElement current = lastEoLComment.getNextSibling();
-
-		while(current != null)
-		{
-			if(!(current instanceof PsiWhiteSpace))
-			{
-				break;
-			}
-			current = current.getNextSibling();
-			if(current != null && current.getNode().getElementType() == endOfLineComment)
-			{
-				lastEoLComment = current;
-				current = current.getNextSibling();
-			}
-		}
-
-		if(lastEoLComment != node)
-		{
-			addDescriptorForRange(node, descriptors, new TextRange(node.getStartOffset(), lastEoLComment.getTextOffset() + lastEoLComment.getTextLength()));
-			return lastEoLComment.getNode();
-		}
-		else
-		{
-			return node;
-		}
-	}
-
-	@RequiredReadAction
-	@Override
-	public String getPlaceholderText(ASTNode node)
-	{
-		final IElementType type = node.getElementType();
-		if(type == JSTokenTypes.DOC_COMMENT)
-		{
-			return "/**...*/";
-		}
-		else if(type == JSTokenTypes.C_STYLE_COMMENT)
-		{
-			return "/*...*/";
-		}
-		else if(type == JSTokenTypes.END_OF_LINE_COMMENT)
-		{
-			return "//...";
-		}
-		else if(node.getPsi() instanceof JavaScriptImportStatementBase)
-		{
-			return "import ...";
-		}
-		else if(type == JSElementTypes.BLOCK_STATEMENT ||
-				type == JSElementTypes.OBJECT_LITERAL_EXPRESSION ||
-				type == JSElementTypes.CLASS ||
-				type == JSElementTypes.PACKAGE_STATEMENT)
-		{
-			return "{...}";
-		}
-		else if(type == JSElementTypes.ARRAY_LITERAL_EXPRESSION)
-		{
-			return "[...]";
-		}
-		else if(type == JSElementTypes.XML_LITERAL_EXPRESSION)
-		{
-			return "<xml/>";
-		}
-		return null;
-	}
-
-	@RequiredReadAction
-	@Override
-	public boolean isCollapsedByDefault(ASTNode node)
-	{
-		if(node.getTreeParent().getElementType() instanceof JSFileElementType && node.getTreePrev() == null &&
-				node.getPsi() instanceof PsiComment)
-		{
-			return CodeFoldingSettings.getInstance().COLLAPSE_FILE_HEADER;
-		}
-		if(node.getPsi() instanceof JavaScriptImportStatementBase)
-		{
-			return CodeFoldingSettings.getInstance().COLLAPSE_IMPORTS;
-		}
-		return CodeFoldingSettings.getInstance().COLLAPSE_DOC_COMMENTS && node.getElementType() == JSTokenTypes.DOC_COMMENT;
-	}
-
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JavaScriptFoldingBuilder implements FoldingBuilder {
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public FoldingDescriptor[] buildFoldRegions(@Nonnull ASTNode node, @Nonnull Document document) {
+        List<FoldingDescriptor> descriptors = new ArrayList<>();
+        appendDescriptors(node, document, descriptors);
+        return descriptors.toArray(new FoldingDescriptor[descriptors.size()]);
+    }
+
+    @RequiredReadAction
+    private static ASTNode appendDescriptors(final ASTNode node, final Document document, final List<FoldingDescriptor> descriptors) {
+        final IElementType type = node.getElementType();
+        if (type == JSElementTypes.BLOCK_STATEMENT
+            || type == JSElementTypes.OBJECT_LITERAL_EXPRESSION
+            || type == JSElementTypes.ARRAY_LITERAL_EXPRESSION
+            || type == JSElementTypes.XML_LITERAL_EXPRESSION) {
+            TextRange textRange = node.getTextRange();
+            if (textRange.getEndOffset() < document.getTextLength()
+                && document.getLineNumber(textRange.getStartOffset()) != document.getLineNumber(textRange.getEndOffset())) {
+                addDescriptorForNode(node, descriptors);
+            }
+        }
+        else if (type == JSTokenTypes.DOC_COMMENT) {
+            addDescriptorForNode(node, descriptors);
+        }
+        else if (type == JSTokenTypes.C_STYLE_COMMENT) {
+            addDescriptorForNode(node, descriptors);
+        }
+        else if (type == JSTokenTypes.END_OF_LINE_COMMENT) {
+            return collapseConsequentNodesOfSpecifiedType(node, descriptors, JSTokenTypes.END_OF_LINE_COMMENT);
+        }
+        else if (node.getPsi() instanceof JavaScriptImportStatementBase) {
+            return collapseConsequentNodesOfSpecifiedType(node, descriptors, PsiUtilCore.getElementType(node));
+        }
+        else if (type == JSElementTypes.CLASS || type == JSElementTypes.PACKAGE_STATEMENT) {
+            ASTNode lbrace = node.findChildByType(JSTokenTypes.LBRACE);
+
+            if (lbrace != null) {
+                addDescriptorForRange(node, descriptors, new TextRange(lbrace.getStartOffset(), node.getTextRange().getEndOffset()));
+            }
+        }
+
+        if (type instanceof JSFileElementType) {
+            // expand chameleon
+            node.getPsi().getFirstChild();
+        }
+
+        ASTNode child = node.getFirstChildNode();
+        while (child != null) {
+            child = appendDescriptors(child, document, descriptors).getTreeNext();
+        }
+
+        return node;
+    }
+
+    private static void addDescriptorForRange(ASTNode node, List<FoldingDescriptor> descriptors, TextRange range) {
+        if (range.getLength() > 1) {
+            descriptors.add(new FoldingDescriptor(node, range));
+        }
+    }
+
+    private static void addDescriptorForNode(ASTNode node, List<FoldingDescriptor> descriptors) {
+        TextRange range = node.getTextRange();
+        addDescriptorForRange(node, descriptors, range);
+    }
+
+    @RequiredReadAction
+    private static ASTNode collapseConsequentNodesOfSpecifiedType(
+        final ASTNode node,
+        final List<FoldingDescriptor> descriptors,
+        final IElementType endOfLineComment
+    ) {
+        PsiElement lastEoLComment = node.getPsi();
+        PsiElement current = lastEoLComment.getNextSibling();
+
+        while (current != null) {
+            if (!(current instanceof PsiWhiteSpace)) {
+                break;
+            }
+            current = current.getNextSibling();
+            if (current != null && current.getNode().getElementType() == endOfLineComment) {
+                lastEoLComment = current;
+                current = current.getNextSibling();
+            }
+        }
+
+        if (lastEoLComment != node) {
+            addDescriptorForRange(
+                node,
+                descriptors,
+                new TextRange(node.getStartOffset(), lastEoLComment.getTextOffset() + lastEoLComment.getTextLength())
+            );
+            return lastEoLComment.getNode();
+        }
+        else {
+            return node;
+        }
+    }
+
+    @RequiredReadAction
+    @Override
+    public String getPlaceholderText(ASTNode node) {
+        final IElementType type = node.getElementType();
+        if (type == JSTokenTypes.DOC_COMMENT) {
+            return "/**...*/";
+        }
+        else if (type == JSTokenTypes.C_STYLE_COMMENT) {
+            return "/*...*/";
+        }
+        else if (type == JSTokenTypes.END_OF_LINE_COMMENT) {
+            return "//...";
+        }
+        else if (node.getPsi() instanceof JavaScriptImportStatementBase) {
+            return "import ...";
+        }
+        else if (type == JSElementTypes.BLOCK_STATEMENT
+            || type == JSElementTypes.OBJECT_LITERAL_EXPRESSION
+            || type == JSElementTypes.CLASS
+            || type == JSElementTypes.PACKAGE_STATEMENT) {
+            return "{...}";
+        }
+        else if (type == JSElementTypes.ARRAY_LITERAL_EXPRESSION) {
+            return "[...]";
+        }
+        else if (type == JSElementTypes.XML_LITERAL_EXPRESSION) {
+            return "<xml/>";
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isCollapsedByDefault(ASTNode node) {
+        if (node.getTreeParent().getElementType() instanceof JSFileElementType
+            && node.getTreePrev() == null
+            && node.getPsi() instanceof PsiComment) {
+            return CodeFoldingSettings.getInstance().COLLAPSE_FILE_HEADER;
+        }
+        if (node.getPsi() instanceof JavaScriptImportStatementBase) {
+            return CodeFoldingSettings.getInstance().COLLAPSE_IMPORTS;
+        }
+        return CodeFoldingSettings.getInstance().COLLAPSE_DOC_COMMENTS && node.getElementType() == JSTokenTypes.DOC_COMMENT;
+    }
+
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
index 78b197a6..8184e5c4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
@@ -30,6 +30,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import java.awt.event.ItemEvent;
@@ -37,144 +38,128 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 12, 2008
- *         Time: 10:39:21 PM
+ * Date: Mar 12, 2008
+ * Time: 10:39:21 PM
  */
-public class JSCodeStylePanel extends CodeStyleAbstractPanel
-{
-	private JPanel myPanel;
-	private JCheckBox myIndentPackageChildren;
-	private JPanel myPreviewPanel;
-	private JTextField myFieldPrefixTextField;
-	private JTextField myPropertyPrefixTextField;
-	private JCheckBox myUseSemicolon;
-	private boolean myInsideUpdate = false;
-
-	public JSCodeStylePanel(final CodeStyleSettings settings)
-	{
-		super(settings);
-
-		installPreviewPanel(myPreviewPanel);
-		addPanelToWatch(myPanel);
-
-		myUseSemicolon.addItemListener(new ItemListener()
-		{
-			@Override
-			public void itemStateChanged(final ItemEvent e)
-			{
-				if(!myInsideUpdate)
-				{
-					//updatePreviewEditor();
-					somethingChanged();
-				}
-			}
-		});
-
-		final DocumentAdapter adapter = new DocumentAdapter()
-		{
-			@Override
-			protected void textChanged(final DocumentEvent e)
-			{
-				if(!myInsideUpdate)
-				{
-					//updatePreviewEditor();
-					somethingChanged();
-				}
-			}
-		};
-
-		myFieldPrefixTextField.getDocument().addDocumentListener(adapter);
-		myPropertyPrefixTextField.getDocument().addDocumentListener(adapter);
-	}
-
-	@Override
-	protected EditorHighlighter createHighlighter(final EditorColorsScheme scheme)
-	{
-		return EditorHighlighterFactory.getInstance().createEditorHighlighter(new LightVirtualFile("a.as"), scheme, null);
-	}
-
-	@Override
-	protected int getRightMargin()
-	{
-		return 60;
-	}
-
-	@Override
-	protected void prepareForReformat(final PsiFile psiFile)
-	{
-	}
-
-	@Override
-	@Nonnull
-	protected FileType getFileType()
-	{
-		return JavaScriptFileType.INSTANCE;
-	}
-
-	@Override
-	protected String getPreviewText()
-	{
-		final JSCodeStyleSettings jsCodeStyleSettings = getSettings().getCustomSettings(JSCodeStyleSettings.class);
-		@NonNls String baseName = "field";
-		@NonNls String propertyName = (myPropertyPrefixTextField != null ? myPropertyPrefixTextField.getText() : jsCodeStyleSettings.PROPERTY_PREFIX) +
-				baseName;
-		@NonNls String varName = (myFieldPrefixTextField != null ? myFieldPrefixTextField.getText() : jsCodeStyleSettings.FIELD_PREFIX) + baseName;
-		@NonNls String semiColon = (myUseSemicolon != null ? myUseSemicolon.isSelected() : jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT) ? ";" : "";
-
-		return "package aaa {\nclass XXX {\n" +
-				"private var " + varName + semiColon + "\n" +
-				"function get " + propertyName + "() {\nreturn " + varName + semiColon + "\n" +
-				"}\n}\n}";
-	}
-
-	@Override
-	public void apply(final CodeStyleSettings settings)
-	{
-		final JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
-		jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN = myIndentPackageChildren.isSelected() ? JSCodeStyleSettings.INDENT : JSCodeStyleSettings
-				.DO_NOT_INDENT;
-		jsCodeStyleSettings.FIELD_PREFIX = myFieldPrefixTextField.getText();
-		jsCodeStyleSettings.PROPERTY_PREFIX = myPropertyPrefixTextField.getText();
-		jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT = myUseSemicolon.isSelected();
-	}
-
-	@Override
-	public boolean isModified(final CodeStyleSettings settings)
-	{
-		final JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
-		return (jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT) != myIndentPackageChildren.isSelected() ||
-				!jsCodeStyleSettings.FIELD_PREFIX.equals(myFieldPrefixTextField.getText()) ||
-				!jsCodeStyleSettings.PROPERTY_PREFIX.equals(myPropertyPrefixTextField.getText()) ||
-				jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT != (myUseSemicolon.isSelected());
-	}
-
-	@Override
-	public JComponent getPanel()
-	{
-		return myPanel;
-	}
-
-	@Override
-	protected void resetImpl(final CodeStyleSettings settings)
-	{
-		try
-		{
-			myInsideUpdate = true;
-			final JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
-			myIndentPackageChildren.setSelected(jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT);
-			myFieldPrefixTextField.setText(jsCodeStyleSettings.FIELD_PREFIX);
-			myPropertyPrefixTextField.setText(jsCodeStyleSettings.PROPERTY_PREFIX);
-			myUseSemicolon.setSelected(jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT);
-		}
-		finally
-		{
-			myInsideUpdate = false;
-		}
-	}
-
-	@Override
-	protected String getFileTypeExtension(final FileType fileType)
-	{
-		return "js2";
-	}
+public class JSCodeStylePanel extends CodeStyleAbstractPanel {
+    private JPanel myPanel;
+    private JCheckBox myIndentPackageChildren;
+    private JPanel myPreviewPanel;
+    private JTextField myFieldPrefixTextField;
+    private JTextField myPropertyPrefixTextField;
+    private JCheckBox myUseSemicolon;
+    private boolean myInsideUpdate = false;
+
+    public JSCodeStylePanel(final CodeStyleSettings settings) {
+        super(settings);
+
+        installPreviewPanel(myPreviewPanel);
+        addPanelToWatch(myPanel);
+
+        myUseSemicolon.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(final ItemEvent e) {
+                if (!myInsideUpdate) {
+                    //updatePreviewEditor();
+                    somethingChanged();
+                }
+            }
+        });
+
+        final DocumentAdapter adapter = new DocumentAdapter() {
+            @Override
+            protected void textChanged(final DocumentEvent e) {
+                if (!myInsideUpdate) {
+                    //updatePreviewEditor();
+                    somethingChanged();
+                }
+            }
+        };
+
+        myFieldPrefixTextField.getDocument().addDocumentListener(adapter);
+        myPropertyPrefixTextField.getDocument().addDocumentListener(adapter);
+    }
+
+    @Override
+    protected EditorHighlighter createHighlighter(final EditorColorsScheme scheme) {
+        return EditorHighlighterFactory.getInstance().createEditorHighlighter(new LightVirtualFile("a.as"), scheme, null);
+    }
+
+    @Override
+    protected int getRightMargin() {
+        return 60;
+    }
+
+    @Override
+    protected void prepareForReformat(final PsiFile psiFile) {
+    }
+
+    @Override
+    @Nonnull
+    protected FileType getFileType() {
+        return JavaScriptFileType.INSTANCE;
+    }
+
+    @Override
+    protected String getPreviewText() {
+        final JSCodeStyleSettings jsCodeStyleSettings = getSettings().getCustomSettings(JSCodeStyleSettings.class);
+        @NonNls String baseName = "field";
+        @NonNls String propertyName =
+            (myPropertyPrefixTextField != null ? myPropertyPrefixTextField.getText() : jsCodeStyleSettings.PROPERTY_PREFIX) +
+                baseName;
+        @NonNls String varName =
+            (myFieldPrefixTextField != null ? myFieldPrefixTextField.getText() : jsCodeStyleSettings.FIELD_PREFIX) + baseName;
+        @NonNls String semiColon =
+            (myUseSemicolon != null ? myUseSemicolon.isSelected() : jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT) ? ";" : "";
+
+        return "package aaa {\nclass XXX {\n" +
+            "private var " + varName + semiColon + "\n" +
+            "function get " + propertyName + "() {\nreturn " + varName + semiColon + "\n" +
+            "}\n}\n}";
+    }
+
+    @Override
+    public void apply(final CodeStyleSettings settings) {
+        final JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
+        jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN =
+            myIndentPackageChildren.isSelected() ? JSCodeStyleSettings.INDENT : JSCodeStyleSettings
+                .DO_NOT_INDENT;
+        jsCodeStyleSettings.FIELD_PREFIX = myFieldPrefixTextField.getText();
+        jsCodeStyleSettings.PROPERTY_PREFIX = myPropertyPrefixTextField.getText();
+        jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT = myUseSemicolon.isSelected();
+    }
+
+    @Override
+    public boolean isModified(final CodeStyleSettings settings) {
+        final JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
+        return (jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT) != myIndentPackageChildren.isSelected() ||
+            !jsCodeStyleSettings.FIELD_PREFIX.equals(myFieldPrefixTextField.getText()) ||
+            !jsCodeStyleSettings.PROPERTY_PREFIX.equals(myPropertyPrefixTextField.getText()) ||
+            jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT != (myUseSemicolon.isSelected());
+    }
+
+    @Override
+    public JComponent getPanel() {
+        return myPanel;
+    }
+
+    @Override
+    protected void resetImpl(final CodeStyleSettings settings) {
+        try {
+            myInsideUpdate = true;
+            final JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
+            myIndentPackageChildren.setSelected(jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT);
+            myFieldPrefixTextField.setText(jsCodeStyleSettings.FIELD_PREFIX);
+            myPropertyPrefixTextField.setText(jsCodeStyleSettings.PROPERTY_PREFIX);
+            myUseSemicolon.setSelected(jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT);
+        }
+        finally {
+            myInsideUpdate = false;
+        }
+    }
+
+    @Override
+    protected String getFileTypeExtension(final FileType fileType) {
+        return "js2";
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
index fcadded6..26225fe1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
@@ -30,29 +30,25 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Mar 12, 2008
- *         Time: 10:32:33 PM
+ * Date: Mar 12, 2008
+ * Time: 10:32:33 PM
  */
 @ExtensionImpl
-public class JSCodeStyleSettingsProvider extends CodeStyleSettingsProvider
-{
-	@Override
-	public CustomCodeStyleSettings createCustomSettings(final CodeStyleSettings settings)
-	{
-		return new JSCodeStyleSettings(settings);
-	}
+public class JSCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
+    @Override
+    public CustomCodeStyleSettings createCustomSettings(final CodeStyleSettings settings) {
+        return new JSCodeStyleSettings(settings);
+    }
 
-	@Nullable
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nullable
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 
-	@Override
-	@Nonnull
-	public Configurable createSettingsPage(final CodeStyleSettings settings, final CodeStyleSettings originalSettings)
-	{
-		return new JavaScriptCodeStyleConfigurable(settings, originalSettings);
-	}
+    @Override
+    @Nonnull
+    public Configurable createSettingsPage(final CodeStyleSettings settings, final CodeStyleSettings originalSettings) {
+        return new JavaScriptCodeStyleConfigurable(settings, originalSettings);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
index 9266d98d..662442fb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
@@ -29,44 +29,37 @@
 /**
  * @author ven
  */
-public class JSFormattingModel implements FormattingModel
-{
-	private FormattingModel myModel;
+public class JSFormattingModel implements FormattingModel {
+    private FormattingModel myModel;
 
-	public JSFormattingModel(final PsiFile file, CodeStyleSettings settings, final Block rootBlock)
-	{
-		myModel = FormattingModelProvider.createFormattingModelForPsiFile(file, rootBlock, settings);
-	}
+    public JSFormattingModel(final PsiFile file, CodeStyleSettings settings, final Block rootBlock) {
+        myModel = FormattingModelProvider.createFormattingModelForPsiFile(file, rootBlock, settings);
+    }
 
-	@Override
-	@Nonnull
-	public Block getRootBlock()
-	{
-		return myModel.getRootBlock();
-	}
+    @Override
+    @Nonnull
+    public Block getRootBlock() {
+        return myModel.getRootBlock();
+    }
 
-	@Override
-	@Nonnull
-	public FormattingDocumentModel getDocumentModel()
-	{
-		return myModel.getDocumentModel();
-	}
+    @Override
+    @Nonnull
+    public FormattingDocumentModel getDocumentModel() {
+        return myModel.getDocumentModel();
+    }
 
-	@Override
-	public TextRange replaceWhiteSpace(TextRange textRange, String whiteSpace)
-	{
-		return myModel.replaceWhiteSpace(textRange, whiteSpace);
-	}
+    @Override
+    public TextRange replaceWhiteSpace(TextRange textRange, String whiteSpace) {
+        return myModel.replaceWhiteSpace(textRange, whiteSpace);
+    }
 
-	@Override
-	public TextRange shiftIndentInsideRange(ASTNode node, TextRange range, int indent)
-	{
-		return myModel.shiftIndentInsideRange(node, range, indent);
-	}
+    @Override
+    public TextRange shiftIndentInsideRange(ASTNode node, TextRange range, int indent) {
+        return myModel.shiftIndentInsideRange(node, range, indent);
+    }
 
-	@Override
-	public void commitChanges()
-	{
-		myModel.commitChanges();
-	}
+    @Override
+    public void commitChanges() {
+        myModel.commitChanges();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
index 39a4c720..176d312d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
@@ -37,715 +37,643 @@
 /**
  * @author ven
  */
-public class JSSpacingProcessor extends JSNodeVisitor
-{
-	private ASTNode myParent;
-	private ASTNode myChild1;
-	private ASTNode myChild2;
-	private final CommonCodeStyleSettings mySettings;
-	private Spacing myResult;
-	private final IElementType type1;
-	private final IElementType type2;
-
-	public JSSpacingProcessor(final ASTNode parent, final ASTNode child1, final ASTNode child2, final CommonCodeStyleSettings settings)
-	{
-		myParent = parent;
-		myChild1 = child1;
-		myChild2 = child2;
-		mySettings = settings;
-		type1 = child1.getElementType();
-		type2 = child2.getElementType();
-		visit(parent);
-	}
-
-	public Spacing getResult()
-	{
-		return myResult;
-	}
-
-	@Override
-	public void visitObjectLiteralExpression(final ASTNode node)
-	{
-		if(((type1 == JSTokenTypes.LBRACE && type2 != JSTokenTypes.RBRACE) ||
-				type1 == JSTokenTypes.COMMA ||
-				(type1 != JSTokenTypes.LBRACE && type2 == JSTokenTypes.RBRACE)) && shouldFormatObjectLiteralExpression())
-		{
-			myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-		}
-	}
-
-	private boolean shouldFormatObjectLiteralExpression()
-	{
-		IElementType grandParentType = myParent.getTreeParent().getElementType();
-		if(grandParentType == JSElementTypes.ARRAY_LITERAL_EXPRESSION)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	public void visitArrayLiteralExpression(final ASTNode node)
-	{
-		if(((type1 == JSTokenTypes.LBRACKET && type2 != JSTokenTypes.RBRACKET) ||
-				type1 == JSTokenTypes.COMMA ||
-				(type1 != JSTokenTypes.LBRACKET && type2 == JSTokenTypes.RBRACKET)) && shouldFormatArrayLiteralExpression())
-		{
-			myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-		}
-	}
-
-	private boolean shouldFormatArrayLiteralExpression()
-	{
-		JSExpression jsExpression = PsiTreeUtil.findChildOfType(myParent.getPsi(), JSExpression.class);
-		if(jsExpression != null)
-		{
-			IElementType type = PsiUtilCore.getElementType(jsExpression);
-			return type == JSElementTypes.ARRAY_LITERAL_EXPRESSION || type == JSElementTypes.OBJECT_LITERAL_EXPRESSION;
-		}
-		return false;
-	}
-
-	@Override
-	public void visitXmlLiteralExpression(ASTNode node)
-	{
-		if((type2 == JSElementTypes.XML_LITERAL_EXPRESSION ||
-				type1 == JSTokenTypes.XML_START_TAG_LIST && type2 != JSTokenTypes.XML_END_TAG_LIST ||
-				type1 == JSElementTypes.XML_LITERAL_EXPRESSION) && shouldFormatXmlLiteralExpression())
-		{
-			myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-		}
-	}
-
-	private boolean shouldFormatXmlLiteralExpression()
-	{
-		return true;
-	}
-
-	@Override
-	public void visitAttributeList(final ASTNode node)
-	{
-		if(type1 == JSElementTypes.ATTRIBUTE || type2 == JSElementTypes.ATTRIBUTE)
-		{
-			myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-		}
-		else
-		{
-			myResult = Spacing.createSpacing(1, 1, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-		}
-	}
-
-	@Override
-	public void visitEmbeddedContent(final ASTNode node)
-	{
-		if(type2 == JSTokenTypes.END_OF_LINE_COMMENT)
-		{
-			myResult = Spacing.createSpacing(0, Integer.MAX_VALUE, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-		}
-		else if(JSElementTypes.SOURCE_ELEMENTS.contains(type1) ||
-				JSElementTypes.SOURCE_ELEMENTS.contains(type2) && type1 != JSTokenTypes.DOT ||
-				type2 == JSTokenTypes.RBRACE)
-		{
-			myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-		}
-	}
-
-	@Override
-	public void visitParameterList(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.LPAR && type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(false);
-		}
-		else if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(mySettings.SPACE_WITHIN_METHOD_PARENTHESES);
-		}
-		else if(type1 == JSTokenTypes.COMMA)
-		{
-			setSingleSpace(mySettings.SPACE_AFTER_COMMA);
-		}
-		else if(type2 == JSTokenTypes.COMMA)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_COMMA);
-		}
-	}
-
-	@Override
-	public void visitPackageStatement(final ASTNode node)
-	{
-		if(shouldMakeLBraceOnNextLine())
-		{
-			myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-			return;
-		}
-		processBlock(node);
-	}
-
-	@Override
-	public void visitClass(final ASTNode node)
-	{
-		if(shouldMakeLBraceOnNextLine())
-		{
-			myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-			return;
-		}
-		processBlock(node);
-	}
-
-	private boolean shouldMakeLBraceOnNextLine()
-	{
-		return type2 == JSTokenTypes.LBRACE && mySettings.CLASS_BRACE_STYLE == CodeStyleSettings.NEXT_LINE;
-	}
-
-	@Override
-	public void visitBlock(final ASTNode node)
-	{
-		processBlock(node);
-	}
-
-	private void processBlock(final ASTNode node)
-	{
-		if(JSElementTypes.SOURCE_ELEMENTS.contains(type1) || JSElementTypes.SOURCE_ELEMENTS.contains(type2) ||
-				type2 == JSTokenTypes.RBRACE)
-		{
-			if(isInjectedJSHack(type1, type2) ||
-					isInjectedJSHack(type2, type1) ||
-					(type2 == JSTokenTypes.END_OF_LINE_COMMENT && isInlineEndOfLineCommentOnLeft() && type1 != JSElementTypes.ES4_IMPORT_STATEMENT))
-			{
-				myResult = Spacing.getReadOnlySpacing();
-			}
-			else
-			{
-				final boolean keepOneLine = myParent.getPsi() instanceof JSFunction ? mySettings.KEEP_SIMPLE_METHODS_IN_ONE_LINE : mySettings
-						.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE;
-
-				if(keepOneLine && (type1 == JSTokenTypes.LBRACE || type2 == JSTokenTypes.RBRACE))
-				{
-					myResult = Spacing.createDependentLFSpacing(0, 1, node.getTextRange(), mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-				}
-				else
-				{
-					if((JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT != type2 && JSTokenTypes.RBRACE != type2) || (JSElementTypes
-							.ES4_IMPORT_STATEMENT != type1 && JSTokenTypes.LBRACE != type1 && JSElementTypes.ES4_IMPORT_STATEMENT == type2))
-					{
-						myResult = Spacing.createSpacing(0, 0, 2, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-					}
-					else if(JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT == type2)
-					{
-						myResult = getSpacingBetweenImports();
-					}
-					else
-					{
-						if(shouldPlaceExtraLinesAroundMethod())
-						{
-							myResult = Spacing.createSpacing(0, 0, 1 + mySettings.BLANK_LINES_AROUND_METHOD, mySettings.KEEP_LINE_BREAKS,
-									mySettings.KEEP_BLANK_LINES_IN_CODE);
-						}
-						else
-						{
-							myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private boolean shouldPlaceExtraLinesAroundMethod()
-	{
-		return (type1 == JSElementTypes.FUNCTION_DECLARATION && type2 != JSTokenTypes.RBRACE) || (type1 == JSElementTypes.VAR_STATEMENT && type2 ==
-				JSElementTypes.FUNCTION_DECLARATION);
-	}
-
-	private Spacing getSpacingBetweenImports()
-	{
-		String fqn1 = ((JSImportStatement) myChild1.getPsi()).getImportText();
-		String fqn2 = ((JSImportStatement) myChild2.getPsi()).getImportText();
-		String rootPackage1 = fqn1 != null && fqn1.contains(".") ? fqn1.substring(0, fqn1.indexOf(".")) : null;
-		String rootPackage2 = fqn2 != null && fqn2.contains(".") ? fqn2.substring(0, fqn2.indexOf(".")) : null;
-		boolean lineBreak = rootPackage1 != null && rootPackage2 != null && !rootPackage1.equals(rootPackage2);
-		return Spacing.createSpacing(0, 0, lineBreak ? 2 : 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-	}
-
-	private static boolean isInjectedJSHack(final IElementType type1, final IElementType type2)
-	{
-		// Following code attempts NOT to reformat '@xxx:bbb.ccc' in var initializers
-		return type1 == JSTokenTypes.BAD_CHARACTER && JSElementTypes.SOURCE_ELEMENTS.contains(type2);
-	}
-
-	@Override
-	public void visitFile(final ASTNode node)
-	{
-		if(JSElementTypes.SOURCE_ELEMENTS.contains(type1) || JSElementTypes.SOURCE_ELEMENTS.contains(type2))
-		{
-			if(type2 == JSTokenTypes.END_OF_LINE_COMMENT && isInlineEndOfLineCommentOnLeft() && type1 != JSElementTypes.ES4_IMPORT_STATEMENT)
-			{
-				myResult = Spacing.getReadOnlySpacing();
-			}
-			else
-			{
-				if((JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT != type2) || (JSElementTypes.ES4_IMPORT_STATEMENT != type1 &&
-						JSElementTypes.ES4_IMPORT_STATEMENT == type2))
-				{
-					myResult = Spacing.createSpacing(0, 0, 2, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-				}
-				else if(JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT == type2)
-				{
-					myResult = getSpacingBetweenImports();
-				}
-				else
-				{
-					if(shouldPlaceExtraLinesAroundMethod() && node.getPsi().getContext() instanceof XmlText)
-					{
-						myResult = Spacing.createSpacing(0, 0, 1 + mySettings.BLANK_LINES_AROUND_METHOD, mySettings.KEEP_LINE_BREAKS,
-								mySettings.KEEP_BLANK_LINES_IN_CODE);
-					}
-					else
-					{
-						myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-					}
-				}
-			}
-		}
-	}
-
-	private boolean isInlineEndOfLineCommentOnLeft()
-	{
-		final ASTNode prev = myChild2.getTreePrev();
-		if(prev == myChild1)
-		{
-			return true;
-		}
-		if(prev != null && prev.getPsi() instanceof PsiWhiteSpace)
-		{
-			return !prev.textContains('\n');
-		}
-		return false;
-	}
-
-	@Override
-	public void visitFunctionDeclaration(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.FUNCTION_KEYWORD && type2 == JSElementTypes.REFERENCE_EXPRESSION)
-		{
-			setSingleSpace(true);
-		}
-		else if(type1 == JSElementTypes.REFERENCE_EXPRESSION && type2 == JSElementTypes.PARAMETER_LIST)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_METHOD_PARENTHESES);
-		}
-		else if(type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			setBraceSpace(mySettings.SPACE_BEFORE_METHOD_LBRACE, mySettings.METHOD_BRACE_STYLE, myChild1.getTextRange());
-		}
-		else if(type1 == JSElementTypes.ATTRIBUTE_LIST && type2 == JSTokenTypes.FUNCTION_KEYWORD)
-		{
-			setSingleSpace(true);
-		}
-	}
-
-
-	@Override
-	public void visitFunctionExpression(final ASTNode node)
-	{
-		visitFunctionDeclaration(node);
-	}
-
-	@Override
-	public void visitReferenceExpression(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.NEW_KEYWORD)
-		{
-			setSingleSpace(true);
-		}
-		else
-		{
-			setSingleSpace(false); // a.b should not have spaces before and after dot
-		}
-	}
-
-	@Override
-	public void visitDocComment(final ASTNode node)
-	{
-		//myResult = Spacing.createKeepingFirstColumnSpacing(0, Integer.MAX_VALUE, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-	}
-
-	@Override
-	public void visitIfStatement(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.IF_KEYWORD && type2 == JSTokenTypes.LPAR)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_IF_PARENTHESES);
-		}
-		else if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(mySettings.SPACE_WITHIN_IF_PARENTHESES);
-		}
-		else if(type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
-			setBraceSpace(mySettings.SPACE_BEFORE_IF_LBRACE, mySettings.BRACE_STYLE, dependentRange);
-		}
-		else if(type2 == JSTokenTypes.ELSE_KEYWORD)
-		{
-			setLineBreakSpace(mySettings.ELSE_ON_NEW_LINE);
-		}
-		else if(type1 == JSTokenTypes.ELSE_KEYWORD && type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			setBraceSpace(mySettings.SPACE_BEFORE_ELSE_LBRACE, mySettings.BRACE_STYLE, null);
-		}
-	}
-
-	@Override
-	public void visitCallExpression(final ASTNode node)
-	{
-		if(type2 == JSElementTypes.ARGUMENT_LIST)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_METHOD_CALL_PARENTHESES);
-		}
-	}
-
-	@Override
-	public void visitNewExpression(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.NEW_KEYWORD)
-		{
-			setSingleSpace(true);
-		}
-		else if(type2 == JSElementTypes.ARGUMENT_LIST)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_METHOD_CALL_PARENTHESES);
-		}
-	}
-
-	@Override
-	public void visitForStatement(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.SEMICOLON)
-		{
-			setSingleSpace(true);
-		}
-		else if(type2 == JSTokenTypes.SEMICOLON)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_SEMICOLON);
-		}
-
-		if(type1 == JSTokenTypes.FOR_KEYWORD && type2 == JSTokenTypes.LPAR)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_FOR_PARENTHESES);
-		}
-		else if(type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
-			setBraceSpace(mySettings.SPACE_BEFORE_FOR_LBRACE, mySettings.BRACE_STYLE, dependentRange);
-		}
-		else if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(mySettings.SPACE_WITHIN_FOR_PARENTHESES);
-		}
-	}
-
-	@Override
-	public void visitDoWhileStatement(final ASTNode node)
-	{
-		if(type2 == JSTokenTypes.WHILE_KEYWORD)
-		{
-			if(mySettings.WHILE_ON_NEW_LINE)
-			{
-				myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-			}
-			else
-			{
-				myResult = Spacing.createSpacing(1, 1, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-			}
-		}
-		else if(type2 == JSTokenTypes.LPAR)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_WHILE_PARENTHESES);
-		}
-		else if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(mySettings.SPACE_WITHIN_WHILE_PARENTHESES);
-		}
-
-		if(type1 == JSTokenTypes.DO_KEYWORD && type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			setBraceSpace(true, mySettings.BRACE_STYLE, null);
-		}
-	}
-
-	@Override
-	public void visitForInStatement(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.VAR_KEYWORD || type2 == JSTokenTypes.VAR_KEYWORD)
-		{
-			setSingleSpace(true);
-		}
-		else if(type1 == JSTokenTypes.FOR_KEYWORD && type2 == JSTokenTypes.LPAR)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_FOR_PARENTHESES);
-		}
-		else if(type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
-			setBraceSpace(mySettings.SPACE_BEFORE_FOR_LBRACE, mySettings.BRACE_STYLE, dependentRange);
-		}
-		else if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(mySettings.SPACE_WITHIN_FOR_PARENTHESES);
-		}
-	}
-
-	@Override
-	public void visitWhileStatement(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.WHILE_KEYWORD && type2 == JSTokenTypes.LPAR)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_WHILE_PARENTHESES);
-		}
-		else if(type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
-			setBraceSpace(mySettings.SPACE_BEFORE_WHILE_LBRACE, mySettings.BRACE_STYLE, dependentRange);
-		}
-		else if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(mySettings.SPACE_WITHIN_WHILE_PARENTHESES);
-		}
-	}
-
-	@Override
-	public void visitWithStatement(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.WITH_KEYWORD && type2 == JSTokenTypes.LPAR)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_WHILE_PARENTHESES);
-		}
-		else if(type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
-			setBraceSpace(mySettings.SPACE_BEFORE_WHILE_LBRACE, mySettings.BRACE_STYLE, dependentRange);
-		}
-		else if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(mySettings.SPACE_WITHIN_WHILE_PARENTHESES);
-		}
-	}
-
-	public static TokenSet NOT_A_PACKAGE_CONTENT = TokenSet.create(JSTokenTypes.PACKAGE_KEYWORD, JSElementTypes.REFERENCE_EXPRESSION,
-			JSTokenTypes.LBRACE, JSTokenTypes.RBRACE);
-
-	@Override
-	public void visitTryStatement(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.TRY_KEYWORD && type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			setBraceSpace(mySettings.SPACE_BEFORE_TRY_LBRACE, mySettings.BRACE_STYLE, null);
-		}
-		else if(type2 == JSElementTypes.CATCH_BLOCK)
-		{
-			setLineBreakSpace(mySettings.CATCH_ON_NEW_LINE);
-		}
-		else if(type2 == JSTokenTypes.FINALLY_KEYWORD)
-		{
-			setLineBreakSpace(mySettings.FINALLY_ON_NEW_LINE);
-		}
-		else if(type1 == JSTokenTypes.FINALLY_KEYWORD)
-		{
-			setBraceSpace(mySettings.SPACE_BEFORE_FINALLY_LBRACE, mySettings.BRACE_STYLE, null);
-		}
-	}
-
-	@Override
-	public void visitCatchBlock(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(mySettings.SPACE_WITHIN_CATCH_PARENTHESES);
-		}
-
-		if(type1 == JSTokenTypes.CATCH_KEYWORD && type2 == JSTokenTypes.LPAR)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_CATCH_PARENTHESES);
-		}
-
-		if(type2 == JSElementTypes.BLOCK_STATEMENT)
-		{
-			TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild2.getTextRange().getStartOffset());
-			setBraceSpace(mySettings.SPACE_BEFORE_CATCH_LBRACE, mySettings.BRACE_STYLE, dependentRange);
-		}
-	}
-
-	@Override
-	public void visitSwitchStatement(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.SWITCH_KEYWORD && type2 == JSTokenTypes.LPAR)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_SWITCH_PARENTHESES);
-		}
-		else if(type1 == JSTokenTypes.RPAR)
-		{
-			TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
-			setBraceSpace(mySettings.SPACE_BEFORE_SWITCH_LBRACE, mySettings.BRACE_STYLE, dependentRange);
-		}
-		else if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(mySettings.SPACE_WITHIN_SWITCH_PARENTHESES);
-		}
-	}
-
-	@Override
-	public void visitArgumentList(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR)
-		{
-			setSingleSpace(false);
-		}
-		else if(type1 == JSTokenTypes.COMMA)
-		{
-			setSingleSpace(mySettings.SPACE_AFTER_COMMA);
-		}
-		else if(type2 == JSTokenTypes.COMMA)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_COMMA);
-		}
-	}
-
-	@Override
-	public void visitStatement(final ASTNode node)
-	{
-		if(type2 == JSTokenTypes.SEMICOLON)
-		{
-			setSingleSpace(false);
-		}
-	}
-
-	@Override
-	public void visitVarStatement(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.VAR_KEYWORD)
-		{
-			setSingleSpace(true);
-		}
-	}
-
-	@Override
-	public void visitVariable(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.EQ || type2 == JSTokenTypes.EQ)
-		{ // Initializer
-			setSingleSpace(mySettings.SPACE_AROUND_ASSIGNMENT_OPERATORS);
-		}
-	}
-
-	@Override
-	public void visitBinaryExpression(final ASTNode node)
-	{
-		IElementType opSign = null;
-		if(JSTokenTypes.OPERATIONS.contains(type1))
-		{
-			opSign = type1;
-		}
-		else if(JSTokenTypes.OPERATIONS.contains(type2))
-		{
-			opSign = type2;
-		}
-
-		if(opSign != null)
-		{
-			setSingleSpace(getSpaceAroundOption(opSign));
-		}
-	}
-
-	@Override
-	public void visitConditionalExpression(final ASTNode node)
-	{
-		if(type1 == JSTokenTypes.QUEST)
-		{
-			setSingleSpace(mySettings.SPACE_AFTER_QUEST);
-		}
-		else if(type2 == JSTokenTypes.QUEST)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_QUEST);
-		}
-		else if(type1 == JSTokenTypes.COLON)
-		{
-			setSingleSpace(mySettings.SPACE_AFTER_COLON);
-		}
-		else if(type2 == JSTokenTypes.COLON)
-		{
-			setSingleSpace(mySettings.SPACE_BEFORE_COLON);
-		}
-	}
-
-	private boolean getSpaceAroundOption(final IElementType opSign)
-	{
-		boolean option = false;
-		if(JSTokenTypes.ADDITIVE_OPERATIONS.contains(opSign))
-		{
-			option = mySettings.SPACE_AROUND_ADDITIVE_OPERATORS;
-		}
-		else if(JSTokenTypes.MULTIPLICATIVE_OPERATIONS.contains(opSign))
-		{
-			option = mySettings.SPACE_AROUND_MULTIPLICATIVE_OPERATORS;
-		}
-		else if(JSTokenTypes.ASSIGNMENT_OPERATIONS.contains(opSign))
-		{
-			option = mySettings.SPACE_AROUND_ASSIGNMENT_OPERATORS;
-		}
-		else if(JSTokenTypes.EQUALITY_OPERATIONS.contains(opSign))
-		{
-			option = mySettings.SPACE_AROUND_EQUALITY_OPERATORS;
-		}
-		else if(JSTokenTypes.RELATIONAL_OPERATIONS.contains(opSign))
-		{
-			option = mySettings.SPACE_AROUND_RELATIONAL_OPERATORS;
-		}
-		else if(JSTokenTypes.SHIFT_OPERATIONS.contains(opSign))
-		{
-			option = mySettings.SPACE_AROUND_BITWISE_OPERATORS;
-		}
-		else if(opSign == JSTokenTypes.ANDAND || opSign == JSTokenTypes.OROR)
-		{
-			option = mySettings.SPACE_AROUND_LOGICAL_OPERATORS;
-		}
-		else if(opSign == JSTokenTypes.OR || opSign == JSTokenTypes.AND || opSign == JSTokenTypes.XOR)
-		{
-			option = mySettings.SPACE_AROUND_BITWISE_OPERATORS;
-		}
-		else if(opSign == JSTokenTypes.IS_KEYWORD || opSign == JSTokenTypes.AS_KEYWORD)
-		{
-			option = true;
-		}
-		return option;
-	}
-
-	private void setSingleSpace(boolean needSpace)
-	{
-		final int spaces = needSpace ? 1 : 0;
-		myResult = Spacing.createSpacing(spaces, spaces, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-	}
-
-	private void setBraceSpace(boolean needSpaceSetting, int braceStyleSetting, TextRange textRange)
-	{
-		int spaces = needSpaceSetting ? 1 : 0;
-		if(braceStyleSetting == CodeStyleSettings.NEXT_LINE_IF_WRAPPED && textRange != null)
-		{
-			myResult = Spacing.createDependentLFSpacing(spaces, spaces, textRange, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-		}
-		else
-		{
-			int lineBreaks = braceStyleSetting == CodeStyleSettings.END_OF_LINE ? 0 : 1;
-			myResult = Spacing.createSpacing(spaces, spaces, lineBreaks, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-		}
-	}
-
-	private void setLineBreakSpace(final boolean needLineBreak)
-	{
-		final int breaks = needLineBreak || myChild1.getElementType() == JSTokenTypes.END_OF_LINE_COMMENT ? 1 : 0;
-		myResult = Spacing.createSpacing(1, 1, breaks, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
-	}
-
+public class JSSpacingProcessor extends JSNodeVisitor {
+    private ASTNode myParent;
+    private ASTNode myChild1;
+    private ASTNode myChild2;
+    private final CommonCodeStyleSettings mySettings;
+    private Spacing myResult;
+    private final IElementType type1;
+    private final IElementType type2;
+
+    public JSSpacingProcessor(final ASTNode parent, final ASTNode child1, final ASTNode child2, final CommonCodeStyleSettings settings) {
+        myParent = parent;
+        myChild1 = child1;
+        myChild2 = child2;
+        mySettings = settings;
+        type1 = child1.getElementType();
+        type2 = child2.getElementType();
+        visit(parent);
+    }
+
+    public Spacing getResult() {
+        return myResult;
+    }
+
+    @Override
+    public void visitObjectLiteralExpression(final ASTNode node) {
+        if (((type1 == JSTokenTypes.LBRACE && type2 != JSTokenTypes.RBRACE)
+            || type1 == JSTokenTypes.COMMA
+            || (type1 != JSTokenTypes.LBRACE && type2 == JSTokenTypes.RBRACE))
+            && shouldFormatObjectLiteralExpression()) {
+            myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+        }
+    }
+
+    private boolean shouldFormatObjectLiteralExpression() {
+        IElementType grandParentType = myParent.getTreeParent().getElementType();
+        if (grandParentType == JSElementTypes.ARRAY_LITERAL_EXPRESSION) {
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public void visitArrayLiteralExpression(final ASTNode node) {
+        if (((type1 == JSTokenTypes.LBRACKET && type2 != JSTokenTypes.RBRACKET)
+            || type1 == JSTokenTypes.COMMA
+            || (type1 != JSTokenTypes.LBRACKET && type2 == JSTokenTypes.RBRACKET))
+            && shouldFormatArrayLiteralExpression()) {
+            myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+        }
+    }
+
+    private boolean shouldFormatArrayLiteralExpression() {
+        JSExpression jsExpression = PsiTreeUtil.findChildOfType(myParent.getPsi(), JSExpression.class);
+        if (jsExpression != null) {
+            IElementType type = PsiUtilCore.getElementType(jsExpression);
+            return type == JSElementTypes.ARRAY_LITERAL_EXPRESSION || type == JSElementTypes.OBJECT_LITERAL_EXPRESSION;
+        }
+        return false;
+    }
+
+    @Override
+    public void visitXmlLiteralExpression(ASTNode node) {
+        if ((type2 == JSElementTypes.XML_LITERAL_EXPRESSION
+            || type1 == JSTokenTypes.XML_START_TAG_LIST && type2 != JSTokenTypes.XML_END_TAG_LIST
+            || type1 == JSElementTypes.XML_LITERAL_EXPRESSION)
+            && shouldFormatXmlLiteralExpression()) {
+            myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+        }
+    }
+
+    private boolean shouldFormatXmlLiteralExpression() {
+        return true;
+    }
+
+    @Override
+    public void visitAttributeList(final ASTNode node) {
+        if (type1 == JSElementTypes.ATTRIBUTE || type2 == JSElementTypes.ATTRIBUTE) {
+            myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+        }
+        else {
+            myResult = Spacing.createSpacing(1, 1, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+        }
+    }
+
+    @Override
+    public void visitEmbeddedContent(final ASTNode node) {
+        if (type2 == JSTokenTypes.END_OF_LINE_COMMENT) {
+            myResult = Spacing.createSpacing(0, Integer.MAX_VALUE, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+        }
+        else if (JSElementTypes.SOURCE_ELEMENTS.contains(type1)
+            || JSElementTypes.SOURCE_ELEMENTS.contains(type2) && type1 != JSTokenTypes.DOT
+            || type2 == JSTokenTypes.RBRACE) {
+            myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+        }
+    }
+
+    @Override
+    public void visitParameterList(final ASTNode node) {
+        if (type1 == JSTokenTypes.LPAR && type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(false);
+        }
+        else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(mySettings.SPACE_WITHIN_METHOD_PARENTHESES);
+        }
+        else if (type1 == JSTokenTypes.COMMA) {
+            setSingleSpace(mySettings.SPACE_AFTER_COMMA);
+        }
+        else if (type2 == JSTokenTypes.COMMA) {
+            setSingleSpace(mySettings.SPACE_BEFORE_COMMA);
+        }
+    }
+
+    @Override
+    public void visitPackageStatement(final ASTNode node) {
+        if (shouldMakeLBraceOnNextLine()) {
+            myResult = Spacing.createSpacing(
+                0,
+                0,
+                1,
+                mySettings.KEEP_LINE_BREAKS,
+                mySettings.KEEP_BLANK_LINES_IN_CODE
+            );
+            return;
+        }
+        processBlock(node);
+    }
+
+    @Override
+    public void visitClass(final ASTNode node) {
+        if (shouldMakeLBraceOnNextLine()) {
+            myResult = Spacing.createSpacing(
+                0,
+                0,
+                1,
+                mySettings.KEEP_LINE_BREAKS,
+                mySettings.KEEP_BLANK_LINES_IN_CODE
+            );
+            return;
+        }
+        processBlock(node);
+    }
+
+    private boolean shouldMakeLBraceOnNextLine() {
+        return type2 == JSTokenTypes.LBRACE && mySettings.CLASS_BRACE_STYLE == CodeStyleSettings.NEXT_LINE;
+    }
+
+    @Override
+    public void visitBlock(final ASTNode node) {
+        processBlock(node);
+    }
+
+    private void processBlock(final ASTNode node) {
+        if (JSElementTypes.SOURCE_ELEMENTS.contains(type1) || JSElementTypes.SOURCE_ELEMENTS.contains(type2) ||
+            type2 == JSTokenTypes.RBRACE) {
+            if (isInjectedJSHack(type1, type2) || isInjectedJSHack(type2, type1)
+                || (type2 == JSTokenTypes.END_OF_LINE_COMMENT
+                && isInlineEndOfLineCommentOnLeft() && type1 != JSElementTypes.ES4_IMPORT_STATEMENT)) {
+                myResult = Spacing.getReadOnlySpacing();
+            }
+            else {
+                final boolean keepOneLine = myParent.getPsi() instanceof JSFunction
+                    ? mySettings.KEEP_SIMPLE_METHODS_IN_ONE_LINE
+                    : mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE;
+
+                if (keepOneLine && (type1 == JSTokenTypes.LBRACE || type2 == JSTokenTypes.RBRACE)) {
+                    myResult = Spacing.createDependentLFSpacing(0,
+                        1,
+                        node.getTextRange(),
+                        mySettings.KEEP_LINE_BREAKS,
+                        mySettings.KEEP_BLANK_LINES_IN_CODE
+                    );
+                }
+                else if ((JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT != type2
+                    && JSTokenTypes.RBRACE != type2)
+                    || (JSElementTypes.ES4_IMPORT_STATEMENT != type1 && JSTokenTypes.LBRACE != type1
+                    && JSElementTypes.ES4_IMPORT_STATEMENT == type2)) {
+                    myResult = Spacing.createSpacing(
+                        0,
+                        0,
+                        2,
+                        mySettings.KEEP_LINE_BREAKS,
+                        mySettings.KEEP_BLANK_LINES_IN_CODE
+                    );
+                }
+                else if (JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT == type2) {
+                    myResult = getSpacingBetweenImports();
+                }
+                else if (shouldPlaceExtraLinesAroundMethod()) {
+                    myResult = Spacing.createSpacing(
+                        0,
+                        0,
+                        1 + mySettings.BLANK_LINES_AROUND_METHOD,
+                        mySettings.KEEP_LINE_BREAKS,
+                        mySettings.KEEP_BLANK_LINES_IN_CODE
+                    );
+                }
+                else {
+                    myResult = Spacing.createSpacing(
+                        0,
+                        0,
+                        1,
+                        mySettings.KEEP_LINE_BREAKS,
+                        mySettings.KEEP_BLANK_LINES_IN_CODE
+                    );
+                }
+            }
+        }
+    }
+
+    private boolean shouldPlaceExtraLinesAroundMethod() {
+        return (type1 == JSElementTypes.FUNCTION_DECLARATION && type2 != JSTokenTypes.RBRACE)
+            || (type1 == JSElementTypes.VAR_STATEMENT && type2 == JSElementTypes.FUNCTION_DECLARATION);
+    }
+
+    private Spacing getSpacingBetweenImports() {
+        String fqn1 = ((JSImportStatement)myChild1.getPsi()).getImportText();
+        String fqn2 = ((JSImportStatement)myChild2.getPsi()).getImportText();
+        String rootPackage1 = fqn1 != null && fqn1.contains(".") ? fqn1.substring(0, fqn1.indexOf(".")) : null;
+        String rootPackage2 = fqn2 != null && fqn2.contains(".") ? fqn2.substring(0, fqn2.indexOf(".")) : null;
+        boolean lineBreak = rootPackage1 != null && rootPackage2 != null && !rootPackage1.equals(rootPackage2);
+        return Spacing.createSpacing(
+            0,
+            0,
+            lineBreak ? 2 : 1,
+            mySettings.KEEP_LINE_BREAKS,
+            mySettings.KEEP_BLANK_LINES_IN_CODE
+        );
+    }
+
+    private static boolean isInjectedJSHack(final IElementType type1, final IElementType type2) {
+        // Following code attempts NOT to reformat '@xxx:bbb.ccc' in var initializers
+        return type1 == JSTokenTypes.BAD_CHARACTER && JSElementTypes.SOURCE_ELEMENTS.contains(type2);
+    }
+
+    @Override
+    public void visitFile(final ASTNode node) {
+        if (JSElementTypes.SOURCE_ELEMENTS.contains(type1) || JSElementTypes.SOURCE_ELEMENTS.contains(type2)) {
+            if (type2 == JSTokenTypes.END_OF_LINE_COMMENT
+                && isInlineEndOfLineCommentOnLeft()
+                && type1 != JSElementTypes.ES4_IMPORT_STATEMENT) {
+                myResult = Spacing.getReadOnlySpacing();
+            }
+            else if ((JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT != type2)
+                || (JSElementTypes.ES4_IMPORT_STATEMENT != type1 && JSElementTypes.ES4_IMPORT_STATEMENT == type2)) {
+                myResult = Spacing.createSpacing(
+                    0,
+                    0,
+                    2,
+                    mySettings.KEEP_LINE_BREAKS,
+                    mySettings.KEEP_BLANK_LINES_IN_CODE
+                );
+            }
+            else if (JSElementTypes.ES4_IMPORT_STATEMENT == type1 && JSElementTypes.ES4_IMPORT_STATEMENT == type2) {
+                myResult = getSpacingBetweenImports();
+            }
+            else if (shouldPlaceExtraLinesAroundMethod() && node.getPsi().getContext() instanceof XmlText) {
+                myResult = Spacing.createSpacing(
+                    0,
+                    0,
+                    1 + mySettings.BLANK_LINES_AROUND_METHOD,
+                    mySettings.KEEP_LINE_BREAKS,
+                    mySettings.KEEP_BLANK_LINES_IN_CODE
+                );
+            }
+            else {
+                myResult = Spacing.createSpacing(
+                    0,
+                    0,
+                    1,
+                    mySettings.KEEP_LINE_BREAKS,
+                    mySettings.KEEP_BLANK_LINES_IN_CODE
+                );
+            }
+        }
+    }
+
+    private boolean isInlineEndOfLineCommentOnLeft() {
+        final ASTNode prev = myChild2.getTreePrev();
+        if (prev == myChild1) {
+            return true;
+        }
+        if (prev != null && prev.getPsi() instanceof PsiWhiteSpace) {
+            return !prev.textContains('\n');
+        }
+        return false;
+    }
+
+    @Override
+    public void visitFunctionDeclaration(final ASTNode node) {
+        if (type1 == JSTokenTypes.FUNCTION_KEYWORD && type2 == JSElementTypes.REFERENCE_EXPRESSION) {
+            setSingleSpace(true);
+        }
+        else if (type1 == JSElementTypes.REFERENCE_EXPRESSION && type2 == JSElementTypes.PARAMETER_LIST) {
+            setSingleSpace(mySettings.SPACE_BEFORE_METHOD_PARENTHESES);
+        }
+        else if (type2 == JSElementTypes.BLOCK_STATEMENT) {
+            setBraceSpace(mySettings.SPACE_BEFORE_METHOD_LBRACE, mySettings.METHOD_BRACE_STYLE, myChild1.getTextRange());
+        }
+        else if (type1 == JSElementTypes.ATTRIBUTE_LIST && type2 == JSTokenTypes.FUNCTION_KEYWORD) {
+            setSingleSpace(true);
+        }
+    }
+
+    @Override
+    public void visitFunctionExpression(final ASTNode node) {
+        visitFunctionDeclaration(node);
+    }
+
+    @Override
+    public void visitReferenceExpression(final ASTNode node) {
+        if (type1 == JSTokenTypes.NEW_KEYWORD) {
+            setSingleSpace(true);
+        }
+        else {
+            setSingleSpace(false); // a.b should not have spaces before and after dot
+        }
+    }
+
+    @Override
+    public void visitDocComment(final ASTNode node) {
+        //myResult = Spacing.createKeepingFirstColumnSpacing(
+        //    0,
+        //    Integer.MAX_VALUE,
+        //    mySettings.KEEP_LINE_BREAKS,
+        //    mySettings.KEEP_BLANK_LINES_IN_CODE
+        //);
+    }
+
+    @Override
+    public void visitIfStatement(final ASTNode node) {
+        if (type1 == JSTokenTypes.IF_KEYWORD && type2 == JSTokenTypes.LPAR) {
+            setSingleSpace(mySettings.SPACE_BEFORE_IF_PARENTHESES);
+        }
+        else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(mySettings.SPACE_WITHIN_IF_PARENTHESES);
+        }
+        else if (type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT) {
+            TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
+            setBraceSpace(mySettings.SPACE_BEFORE_IF_LBRACE, mySettings.BRACE_STYLE, dependentRange);
+        }
+        else if (type2 == JSTokenTypes.ELSE_KEYWORD) {
+            setLineBreakSpace(mySettings.ELSE_ON_NEW_LINE);
+        }
+        else if (type1 == JSTokenTypes.ELSE_KEYWORD && type2 == JSElementTypes.BLOCK_STATEMENT) {
+            setBraceSpace(mySettings.SPACE_BEFORE_ELSE_LBRACE, mySettings.BRACE_STYLE, null);
+        }
+    }
+
+    @Override
+    public void visitCallExpression(final ASTNode node) {
+        if (type2 == JSElementTypes.ARGUMENT_LIST) {
+            setSingleSpace(mySettings.SPACE_BEFORE_METHOD_CALL_PARENTHESES);
+        }
+    }
+
+    @Override
+    public void visitNewExpression(final ASTNode node) {
+        if (type1 == JSTokenTypes.NEW_KEYWORD) {
+            setSingleSpace(true);
+        }
+        else if (type2 == JSElementTypes.ARGUMENT_LIST) {
+            setSingleSpace(mySettings.SPACE_BEFORE_METHOD_CALL_PARENTHESES);
+        }
+    }
+
+    @Override
+    public void visitForStatement(final ASTNode node) {
+        if (type1 == JSTokenTypes.SEMICOLON) {
+            setSingleSpace(true);
+        }
+        else if (type2 == JSTokenTypes.SEMICOLON) {
+            setSingleSpace(mySettings.SPACE_BEFORE_SEMICOLON);
+        }
+
+        if (type1 == JSTokenTypes.FOR_KEYWORD && type2 == JSTokenTypes.LPAR) {
+            setSingleSpace(mySettings.SPACE_BEFORE_FOR_PARENTHESES);
+        }
+        else if (type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT) {
+            TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
+            setBraceSpace(mySettings.SPACE_BEFORE_FOR_LBRACE, mySettings.BRACE_STYLE, dependentRange);
+        }
+        else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(mySettings.SPACE_WITHIN_FOR_PARENTHESES);
+        }
+    }
+
+    @Override
+    public void visitDoWhileStatement(final ASTNode node) {
+        if (type2 == JSTokenTypes.WHILE_KEYWORD) {
+            if (mySettings.WHILE_ON_NEW_LINE) {
+                myResult = Spacing.createSpacing(
+                    0,
+                    0,
+                    1,
+                    mySettings.KEEP_LINE_BREAKS,
+                    mySettings.KEEP_BLANK_LINES_IN_CODE
+                );
+            }
+            else {
+                myResult = Spacing.createSpacing(
+                    1,
+                    1,
+                    0,
+                    mySettings.KEEP_LINE_BREAKS,
+                    mySettings.KEEP_BLANK_LINES_IN_CODE
+                );
+            }
+        }
+        else if (type2 == JSTokenTypes.LPAR) {
+            setSingleSpace(mySettings.SPACE_BEFORE_WHILE_PARENTHESES);
+        }
+        else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(mySettings.SPACE_WITHIN_WHILE_PARENTHESES);
+        }
+
+        if (type1 == JSTokenTypes.DO_KEYWORD && type2 == JSElementTypes.BLOCK_STATEMENT) {
+            setBraceSpace(true, mySettings.BRACE_STYLE, null);
+        }
+    }
+
+    @Override
+    public void visitForInStatement(final ASTNode node) {
+        if (type1 == JSTokenTypes.VAR_KEYWORD || type2 == JSTokenTypes.VAR_KEYWORD) {
+            setSingleSpace(true);
+        }
+        else if (type1 == JSTokenTypes.FOR_KEYWORD && type2 == JSTokenTypes.LPAR) {
+            setSingleSpace(mySettings.SPACE_BEFORE_FOR_PARENTHESES);
+        }
+        else if (type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT) {
+            TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
+            setBraceSpace(mySettings.SPACE_BEFORE_FOR_LBRACE, mySettings.BRACE_STYLE, dependentRange);
+        }
+        else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(mySettings.SPACE_WITHIN_FOR_PARENTHESES);
+        }
+    }
+
+    @Override
+    public void visitWhileStatement(final ASTNode node) {
+        if (type1 == JSTokenTypes.WHILE_KEYWORD && type2 == JSTokenTypes.LPAR) {
+            setSingleSpace(mySettings.SPACE_BEFORE_WHILE_PARENTHESES);
+        }
+        else if (type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT) {
+            TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
+            setBraceSpace(mySettings.SPACE_BEFORE_WHILE_LBRACE, mySettings.BRACE_STYLE, dependentRange);
+        }
+        else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(mySettings.SPACE_WITHIN_WHILE_PARENTHESES);
+        }
+    }
+
+    @Override
+    public void visitWithStatement(final ASTNode node) {
+        if (type1 == JSTokenTypes.WITH_KEYWORD && type2 == JSTokenTypes.LPAR) {
+            setSingleSpace(mySettings.SPACE_BEFORE_WHILE_PARENTHESES);
+        }
+        else if (type1 == JSTokenTypes.RPAR && type2 == JSElementTypes.BLOCK_STATEMENT) {
+            TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
+            setBraceSpace(mySettings.SPACE_BEFORE_WHILE_LBRACE, mySettings.BRACE_STYLE, dependentRange);
+        }
+        else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(mySettings.SPACE_WITHIN_WHILE_PARENTHESES);
+        }
+    }
+
+    public static TokenSet NOT_A_PACKAGE_CONTENT = TokenSet.create(JSTokenTypes.PACKAGE_KEYWORD, JSElementTypes.REFERENCE_EXPRESSION,
+        JSTokenTypes.LBRACE, JSTokenTypes.RBRACE
+    );
+
+    @Override
+    public void visitTryStatement(final ASTNode node) {
+        if (type1 == JSTokenTypes.TRY_KEYWORD && type2 == JSElementTypes.BLOCK_STATEMENT) {
+            setBraceSpace(mySettings.SPACE_BEFORE_TRY_LBRACE, mySettings.BRACE_STYLE, null);
+        }
+        else if (type2 == JSElementTypes.CATCH_BLOCK) {
+            setLineBreakSpace(mySettings.CATCH_ON_NEW_LINE);
+        }
+        else if (type2 == JSTokenTypes.FINALLY_KEYWORD) {
+            setLineBreakSpace(mySettings.FINALLY_ON_NEW_LINE);
+        }
+        else if (type1 == JSTokenTypes.FINALLY_KEYWORD) {
+            setBraceSpace(mySettings.SPACE_BEFORE_FINALLY_LBRACE, mySettings.BRACE_STYLE, null);
+        }
+    }
+
+    @Override
+    public void visitCatchBlock(final ASTNode node) {
+        if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(mySettings.SPACE_WITHIN_CATCH_PARENTHESES);
+        }
+
+        if (type1 == JSTokenTypes.CATCH_KEYWORD && type2 == JSTokenTypes.LPAR) {
+            setSingleSpace(mySettings.SPACE_BEFORE_CATCH_PARENTHESES);
+        }
+
+        if (type2 == JSElementTypes.BLOCK_STATEMENT) {
+            TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild2.getTextRange().getStartOffset());
+            setBraceSpace(mySettings.SPACE_BEFORE_CATCH_LBRACE, mySettings.BRACE_STYLE, dependentRange);
+        }
+    }
+
+    @Override
+    public void visitSwitchStatement(final ASTNode node) {
+        if (type1 == JSTokenTypes.SWITCH_KEYWORD && type2 == JSTokenTypes.LPAR) {
+            setSingleSpace(mySettings.SPACE_BEFORE_SWITCH_PARENTHESES);
+        }
+        else if (type1 == JSTokenTypes.RPAR) {
+            TextRange dependentRange = new TextRange(myParent.getStartOffset(), myChild1.getTextRange().getEndOffset());
+            setBraceSpace(mySettings.SPACE_BEFORE_SWITCH_LBRACE, mySettings.BRACE_STYLE, dependentRange);
+        }
+        else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(mySettings.SPACE_WITHIN_SWITCH_PARENTHESES);
+        }
+    }
+
+    @Override
+    public void visitArgumentList(final ASTNode node) {
+        if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
+            setSingleSpace(false);
+        }
+        else if (type1 == JSTokenTypes.COMMA) {
+            setSingleSpace(mySettings.SPACE_AFTER_COMMA);
+        }
+        else if (type2 == JSTokenTypes.COMMA) {
+            setSingleSpace(mySettings.SPACE_BEFORE_COMMA);
+        }
+    }
+
+    @Override
+    public void visitStatement(final ASTNode node) {
+        if (type2 == JSTokenTypes.SEMICOLON) {
+            setSingleSpace(false);
+        }
+    }
+
+    @Override
+    public void visitVarStatement(final ASTNode node) {
+        if (type1 == JSTokenTypes.VAR_KEYWORD) {
+            setSingleSpace(true);
+        }
+    }
+
+    @Override
+    public void visitVariable(final ASTNode node) {
+        if (type1 == JSTokenTypes.EQ || type2 == JSTokenTypes.EQ) { // Initializer
+            setSingleSpace(mySettings.SPACE_AROUND_ASSIGNMENT_OPERATORS);
+        }
+    }
+
+    @Override
+    public void visitBinaryExpression(final ASTNode node) {
+        IElementType opSign = null;
+        if (JSTokenTypes.OPERATIONS.contains(type1)) {
+            opSign = type1;
+        }
+        else if (JSTokenTypes.OPERATIONS.contains(type2)) {
+            opSign = type2;
+        }
+
+        if (opSign != null) {
+            setSingleSpace(getSpaceAroundOption(opSign));
+        }
+    }
+
+    @Override
+    public void visitConditionalExpression(final ASTNode node) {
+        if (type1 == JSTokenTypes.QUEST) {
+            setSingleSpace(mySettings.SPACE_AFTER_QUEST);
+        }
+        else if (type2 == JSTokenTypes.QUEST) {
+            setSingleSpace(mySettings.SPACE_BEFORE_QUEST);
+        }
+        else if (type1 == JSTokenTypes.COLON) {
+            setSingleSpace(mySettings.SPACE_AFTER_COLON);
+        }
+        else if (type2 == JSTokenTypes.COLON) {
+            setSingleSpace(mySettings.SPACE_BEFORE_COLON);
+        }
+    }
+
+    private boolean getSpaceAroundOption(final IElementType opSign) {
+        boolean option = false;
+        if (JSTokenTypes.ADDITIVE_OPERATIONS.contains(opSign)) {
+            option = mySettings.SPACE_AROUND_ADDITIVE_OPERATORS;
+        }
+        else if (JSTokenTypes.MULTIPLICATIVE_OPERATIONS.contains(opSign)) {
+            option = mySettings.SPACE_AROUND_MULTIPLICATIVE_OPERATORS;
+        }
+        else if (JSTokenTypes.ASSIGNMENT_OPERATIONS.contains(opSign)) {
+            option = mySettings.SPACE_AROUND_ASSIGNMENT_OPERATORS;
+        }
+        else if (JSTokenTypes.EQUALITY_OPERATIONS.contains(opSign)) {
+            option = mySettings.SPACE_AROUND_EQUALITY_OPERATORS;
+        }
+        else if (JSTokenTypes.RELATIONAL_OPERATIONS.contains(opSign)) {
+            option = mySettings.SPACE_AROUND_RELATIONAL_OPERATORS;
+        }
+        else if (JSTokenTypes.SHIFT_OPERATIONS.contains(opSign)) {
+            option = mySettings.SPACE_AROUND_BITWISE_OPERATORS;
+        }
+        else if (opSign == JSTokenTypes.ANDAND || opSign == JSTokenTypes.OROR) {
+            option = mySettings.SPACE_AROUND_LOGICAL_OPERATORS;
+        }
+        else if (opSign == JSTokenTypes.OR || opSign == JSTokenTypes.AND || opSign == JSTokenTypes.XOR) {
+            option = mySettings.SPACE_AROUND_BITWISE_OPERATORS;
+        }
+        else if (opSign == JSTokenTypes.IS_KEYWORD || opSign == JSTokenTypes.AS_KEYWORD) {
+            option = true;
+        }
+        return option;
+    }
+
+    private void setSingleSpace(boolean needSpace) {
+        final int spaces = needSpace ? 1 : 0;
+        myResult = Spacing.createSpacing(spaces, spaces, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+    }
+
+    private void setBraceSpace(boolean needSpaceSetting, int braceStyleSetting, TextRange textRange) {
+        int spaces = needSpaceSetting ? 1 : 0;
+        if (braceStyleSetting == CodeStyleSettings.NEXT_LINE_IF_WRAPPED && textRange != null) {
+            myResult = Spacing.createDependentLFSpacing(
+                spaces,
+                spaces,
+                textRange,
+                mySettings.KEEP_LINE_BREAKS,
+                mySettings.KEEP_BLANK_LINES_IN_CODE
+            );
+        }
+        else {
+            int lineBreaks = braceStyleSetting == CodeStyleSettings.END_OF_LINE ? 0 : 1;
+            myResult = Spacing.createSpacing(spaces, spaces, lineBreaks, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+        }
+    }
+
+    private void setLineBreakSpace(final boolean needLineBreak) {
+        final int breaks = needLineBreak || myChild1.getElementType() == JSTokenTypes.END_OF_LINE_COMMENT ? 1 : 0;
+        myResult = Spacing.createSpacing(1, 1, breaks, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
index de4f6919..40a96eea 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
@@ -29,36 +29,30 @@
  * @author yole
  */
 @ExtensionImpl
-public class JavaScriptIndentOptionsProvider implements FileTypeIndentOptionsProvider
-{
-	@Override
-	public CodeStyleSettings.IndentOptions createIndentOptions()
-	{
-		return new CodeStyleSettings.IndentOptions();
-	}
+public class JavaScriptIndentOptionsProvider implements FileTypeIndentOptionsProvider {
+    @Override
+    public CodeStyleSettings.IndentOptions createIndentOptions() {
+        return new CodeStyleSettings.IndentOptions();
+    }
 
-	@Override
-	public FileType getFileType()
-	{
-		return JavaScriptFileType.INSTANCE;
-	}
+    @Override
+    public FileType getFileType() {
+        return JavaScriptFileType.INSTANCE;
+    }
 
-	@Override
-	public IndentOptionsEditor createOptionsEditor()
-	{
-		return new SmartIndentOptionsEditor();
-	}
+    @Override
+    public IndentOptionsEditor createOptionsEditor() {
+        return new SmartIndentOptionsEditor();
+    }
 
-	@Override
-	public String getPreviewText()
-	{
-		return "function a() {\n" +
-				"    alert(\"test\");\n" +
-				"}";
-	}
+    @Override
+    public String getPreviewText() {
+        return "function a() {\n" +
+            "    alert(\"test\");\n" +
+            "}";
+    }
 
-	@Override
-	public void prepareForReformat(final PsiFile psiFile)
-	{
-	}
+    @Override
+    public void prepareForReformat(final PsiFile psiFile) {
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
index a518c1d0..4e93fb4d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
@@ -31,27 +31,27 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JavascriptFormattingModelBuilder implements FormattingModelBuilder
-{
-	@Nonnull
-	public FormattingModel createModel(@Nonnull FormattingContext formattingContext)
-	{
-		PsiElement element = formattingContext.getPsiElement();
+public class JavascriptFormattingModelBuilder implements FormattingModelBuilder {
+    @Nonnull
+    public FormattingModel createModel(@Nonnull FormattingContext formattingContext) {
+        PsiElement element = formattingContext.getPsiElement();
 
-		CodeStyleSettings settings = formattingContext.getCodeStyleSettings();
+        CodeStyleSettings settings = formattingContext.getCodeStyleSettings();
 
-		final PsiFile psiFile = element.getContainingFile();
+        final PsiFile psiFile = element.getContainingFile();
 
-		CommonCodeStyleSettings commonSettings = settings.getCommonSettings(JavaScriptLanguage.INSTANCE);
+        CommonCodeStyleSettings commonSettings = settings.getCommonSettings(JavaScriptLanguage.INSTANCE);
 
-		return new JSFormattingModel(psiFile, settings, new JSBlock(psiFile instanceof JSFile ? psiFile.getNode() : element.getNode(), null, null, null, commonSettings));
+        return new JSFormattingModel(
+            psiFile,
+            settings,
+            new JSBlock(psiFile instanceof JSFile ? psiFile.getNode() : element.getNode(), null, null, null, commonSettings)
+        );
+    }
 
-	}
-
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
index 0aff8bda..7addfa96 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
@@ -30,199 +30,175 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.List;
 
 /**
  * @author ven
  */
-public class JSBlock implements Block
-{
-	private ASTNode myNode;
-
-	private final CommonCodeStyleSettings mySettings;
-
-	private Alignment myAlignment;
-	private Indent myIndent;
-	private Wrap myWrap;
-	private List<Block> mySubBlocks = null;
-
-	public JSBlock(final ASTNode node, final Alignment alignment, final Indent indent, final Wrap wrap, final CommonCodeStyleSettings settings)
-	{
-		myAlignment = alignment;
-		myIndent = indent;
-		myNode = node;
-		myWrap = wrap;
-		mySettings = settings;
-	}
-
-	public ASTNode getNode()
-	{
-		return myNode;
-	}
-
-	@Override
-	@Nonnull
-	public TextRange getTextRange()
-	{
-		return myNode.getTextRange();
-	}
-
-	@Override
-	@Nonnull
-	public List<Block> getSubBlocks()
-	{
-		if(mySubBlocks == null)
-		{
-			SubBlockVisitor visitor = new SubBlockVisitor(getSettings());
-			visitor.visit(myNode);
-			mySubBlocks = visitor.getBlocks();
-		}
-		return mySubBlocks;
-	}
-
-	@Override
-	@Nullable
-	public Wrap getWrap()
-	{
-		return myWrap;
-	}
-
-	@Override
-	@Nullable
-	public Indent getIndent()
-	{
-		return myIndent;
-	}
-
-	@Override
-	@Nullable
-	public Alignment getAlignment()
-	{
-		return myAlignment;
-	}
-
-	@Override
-	@Nullable
-	public Spacing getSpacing(Block child1, Block child2)
-	{
-		if(child1 instanceof JSDocCommentBlock || child2 instanceof JSDocCommentBlock || child1 == null)
-		{
-			return null;
-		}
-		return new JSSpacingProcessor(getNode(), ((JSBlock) child1).getNode(), ((JSBlock) child2).getNode(), mySettings).getResult();
-	}
-
-	@Override
-	@Nonnull
-	public ChildAttributes getChildAttributes(final int newChildIndex)
-	{
-		Indent indent = null;
-		final IElementType blockElementType = myNode.getElementType();
-
-		if(blockElementType == JSTokenTypes.DOC_COMMENT)
-		{
-			return new ChildAttributes(Indent.getSpaceIndent(1), null);
-		}
-
-		if(blockElementType == JSElementTypes.PACKAGE_STATEMENT)
-		{
-			final JSCodeStyleSettings customSettings = CodeStyleSettingsManager.getSettings(myNode.getPsi().getProject()).getCustomSettings
-					(JSCodeStyleSettings.class);
-			if(customSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT)
-			{
-				indent = Indent.getNormalIndent();
-			}
-			else
-			{
-				indent = Indent.getNoneIndent();
-			}
-		}
-		else if(blockElementType == JSElementTypes.BLOCK_STATEMENT ||
-				blockElementType == JSElementTypes.CLASS ||
-				blockElementType == JSElementTypes.OBJECT_LITERAL_EXPRESSION)
-		{
-			indent = Indent.getNormalIndent();
-		}
-		else if(blockElementType instanceof JSFileElementType || blockElementType == JSElementTypes.EMBEDDED_CONTENT)
-		{
-			indent = Indent.getNoneIndent();
-		}
-		else if(JSElementTypes.SOURCE_ELEMENTS.contains(blockElementType) ||
-				blockElementType == JSElementTypes.FUNCTION_EXPRESSION ||
-				blockElementType == JSElementTypes.ATTRIBUTE_LIST)
-		{
-			indent = Indent.getNoneIndent();
-		}
-
-		Alignment alignment = null;
-		final List<Block> subBlocks = getSubBlocks();
-		for(int i = 0; i < newChildIndex; i++)
-		{
-			if(i == subBlocks.size())
-			{
-				break;
-			}
-			final Alignment childAlignment = subBlocks.get(i).getAlignment();
-			if(childAlignment != null)
-			{
-				alignment = childAlignment;
-				break;
-			}
-		}
-
-		// in for loops, alignment is required only for items within parentheses
-		if(blockElementType == JSElementTypes.FOR_STATEMENT || blockElementType == JSElementTypes.FOR_IN_STATEMENT)
-		{
-			for(int i = 0; i < newChildIndex; i++)
-			{
-				if(((JSBlock) subBlocks.get(i)).getNode().getElementType() == JSTokenTypes.RPAR)
-				{
-					alignment = null;
-					break;
-				}
-			}
-		}
-
-		return new ChildAttributes(indent, alignment);
-	}
-
-	@Override
-	public boolean isIncomplete()
-	{
-		return isIncomplete(myNode);
-	}
-
-	private boolean isIncomplete(ASTNode node)
-	{
-		node.getPsi().getFirstChild(); // expand chameleon
-		ASTNode lastChild = node.getLastChildNode();
-		while(lastChild != null && lastChild.getPsi() instanceof PsiWhiteSpace)
-		{
-			lastChild = lastChild.getTreePrev();
-		}
-		if(lastChild == null)
-		{
-			return false;
-		}
-		if(lastChild.getPsi() instanceof PsiErrorElement)
-		{
-			return true;
-		}
-		return isIncomplete(lastChild);
-	}
-
-	public CommonCodeStyleSettings getSettings()
-	{
-		return mySettings;
-	}
-
-	@Override
-	public boolean isLeaf()
-	{
-		if(myNode.getElementType() == JSTokenTypes.DOC_COMMENT)
-		{
-			return false;
-		}
-		return myNode.getFirstChildNode() == null;
-	}
+public class JSBlock implements Block {
+    private ASTNode myNode;
+
+    private final CommonCodeStyleSettings mySettings;
+
+    private Alignment myAlignment;
+    private Indent myIndent;
+    private Wrap myWrap;
+    private List<Block> mySubBlocks = null;
+
+    public JSBlock(
+        final ASTNode node,
+        final Alignment alignment,
+        final Indent indent,
+        final Wrap wrap,
+        final CommonCodeStyleSettings settings
+    ) {
+        myAlignment = alignment;
+        myIndent = indent;
+        myNode = node;
+        myWrap = wrap;
+        mySettings = settings;
+    }
+
+    public ASTNode getNode() {
+        return myNode;
+    }
+
+    @Override
+    @Nonnull
+    public TextRange getTextRange() {
+        return myNode.getTextRange();
+    }
+
+    @Override
+    @Nonnull
+    public List<Block> getSubBlocks() {
+        if (mySubBlocks == null) {
+            SubBlockVisitor visitor = new SubBlockVisitor(getSettings());
+            visitor.visit(myNode);
+            mySubBlocks = visitor.getBlocks();
+        }
+        return mySubBlocks;
+    }
+
+    @Override
+    @Nullable
+    public Wrap getWrap() {
+        return myWrap;
+    }
+
+    @Override
+    @Nullable
+    public Indent getIndent() {
+        return myIndent;
+    }
+
+    @Override
+    @Nullable
+    public Alignment getAlignment() {
+        return myAlignment;
+    }
+
+    @Override
+    @Nullable
+    public Spacing getSpacing(Block child1, Block child2) {
+        if (child1 instanceof JSDocCommentBlock || child2 instanceof JSDocCommentBlock || child1 == null) {
+            return null;
+        }
+        return new JSSpacingProcessor(getNode(), ((JSBlock)child1).getNode(), ((JSBlock)child2).getNode(), mySettings).getResult();
+    }
+
+    @Override
+    @Nonnull
+    public ChildAttributes getChildAttributes(final int newChildIndex) {
+        Indent indent = null;
+        final IElementType blockElementType = myNode.getElementType();
+
+        if (blockElementType == JSTokenTypes.DOC_COMMENT) {
+            return new ChildAttributes(Indent.getSpaceIndent(1), null);
+        }
+
+        if (blockElementType == JSElementTypes.PACKAGE_STATEMENT) {
+            final JSCodeStyleSettings customSettings =
+                CodeStyleSettingsManager.getSettings(myNode.getPsi().getProject()).getCustomSettings(JSCodeStyleSettings.class);
+            if (customSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT) {
+                indent = Indent.getNormalIndent();
+            }
+            else {
+                indent = Indent.getNoneIndent();
+            }
+        }
+        else if (blockElementType == JSElementTypes.BLOCK_STATEMENT
+            || blockElementType == JSElementTypes.CLASS
+            || blockElementType == JSElementTypes.OBJECT_LITERAL_EXPRESSION) {
+            indent = Indent.getNormalIndent();
+        }
+        else if (blockElementType instanceof JSFileElementType || blockElementType == JSElementTypes.EMBEDDED_CONTENT) {
+            indent = Indent.getNoneIndent();
+        }
+        else if (JSElementTypes.SOURCE_ELEMENTS.contains(blockElementType)
+            || blockElementType == JSElementTypes.FUNCTION_EXPRESSION
+            || blockElementType == JSElementTypes.ATTRIBUTE_LIST) {
+            indent = Indent.getNoneIndent();
+        }
+
+        Alignment alignment = null;
+        final List<Block> subBlocks = getSubBlocks();
+        for (int i = 0; i < newChildIndex; i++) {
+            if (i == subBlocks.size()) {
+                break;
+            }
+            final Alignment childAlignment = subBlocks.get(i).getAlignment();
+            if (childAlignment != null) {
+                alignment = childAlignment;
+                break;
+            }
+        }
+
+        // in for loops, alignment is required only for items within parentheses
+        if (blockElementType == JSElementTypes.FOR_STATEMENT || blockElementType == JSElementTypes.FOR_IN_STATEMENT) {
+            for (int i = 0; i < newChildIndex; i++) {
+                if (((JSBlock)subBlocks.get(i)).getNode().getElementType() == JSTokenTypes.RPAR) {
+                    alignment = null;
+                    break;
+                }
+            }
+        }
+
+        return new ChildAttributes(indent, alignment);
+    }
+
+    @Override
+    public boolean isIncomplete() {
+        return isIncomplete(myNode);
+    }
+
+    private boolean isIncomplete(ASTNode node) {
+        node.getPsi().getFirstChild(); // expand chameleon
+        ASTNode lastChild = node.getLastChildNode();
+        while (lastChild != null && lastChild.getPsi() instanceof PsiWhiteSpace) {
+            lastChild = lastChild.getTreePrev();
+        }
+
+        if (lastChild == null) {
+            return false;
+        }
+
+        if (lastChild.getPsi() instanceof PsiErrorElement) {
+            return true;
+        }
+        return isIncomplete(lastChild);
+    }
+
+    public CommonCodeStyleSettings getSettings() {
+        return mySettings;
+    }
+
+    @Override
+    public boolean isLeaf() {
+        if (myNode.getElementType() == JSTokenTypes.DOC_COMMENT) {
+            return false;
+        }
+        return myNode.getFirstChildNode() == null;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
index 237900e2..22f4af2d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
@@ -33,80 +33,69 @@
 /**
  * @author yole
  */
-public class JSDocCommentBlock implements Block
-{
-	private ASTNode myNode;
-	private int myStartOffset;
-	private int myEndOffset;
-	private Indent myIndent;
-	private static final List<Block> EMPTY_BLOCK_LIST = new ArrayList<Block>();
+public class JSDocCommentBlock implements Block {
+    private ASTNode myNode;
+    private int myStartOffset;
+    private int myEndOffset;
+    private Indent myIndent;
+    private static final List<Block> EMPTY_BLOCK_LIST = new ArrayList<Block>();
 
-	public JSDocCommentBlock(final ASTNode node, final int startOffset, final int endOffset, final Indent indent)
-	{
-		myNode = node;
-		myStartOffset = startOffset;
-		myEndOffset = endOffset;
-		myIndent = indent;
-	}
+    public JSDocCommentBlock(final ASTNode node, final int startOffset, final int endOffset, final Indent indent) {
+        myNode = node;
+        myStartOffset = startOffset;
+        myEndOffset = endOffset;
+        myIndent = indent;
+    }
 
-	@Override
-	@Nonnull
-	public TextRange getTextRange()
-	{
-		return new TextRange(myNode.getStartOffset() + myStartOffset, myNode.getStartOffset() + myEndOffset);
-	}
+    @Override
+    @Nonnull
+    public TextRange getTextRange() {
+        return new TextRange(myNode.getStartOffset() + myStartOffset, myNode.getStartOffset() + myEndOffset);
+    }
 
-	@Override
-	@Nonnull
-	public List<Block> getSubBlocks()
-	{
-		return EMPTY_BLOCK_LIST;
-	}
+    @Override
+    @Nonnull
+    public List<Block> getSubBlocks() {
+        return EMPTY_BLOCK_LIST;
+    }
 
-	@Override
-	@Nullable
-	public Wrap getWrap()
-	{
-		return null;
-	}
+    @Override
+    @Nullable
+    public Wrap getWrap() {
+        return null;
+    }
 
-	@Override
-	@Nullable
-	public Indent getIndent()
-	{
-		return myIndent;
-	}
+    @Override
+    @Nullable
+    public Indent getIndent() {
+        return myIndent;
+    }
 
-	@Override
-	@Nullable
-	public Alignment getAlignment()
-	{
-		return null;
-	}
+    @Override
+    @Nullable
+    public Alignment getAlignment() {
+        return null;
+    }
 
-	@Override
-	@Nullable
-	public Spacing getSpacing(Block child1, Block child2)
-	{
-		return null;
-	}
+    @Override
+    @Nullable
+    public Spacing getSpacing(Block child1, Block child2) {
+        return null;
+    }
 
-	@Override
-	@Nonnull
-	public ChildAttributes getChildAttributes(final int newChildIndex)
-	{
-		return null;
-	}
+    @Override
+    @Nonnull
+    public ChildAttributes getChildAttributes(final int newChildIndex) {
+        return null;
+    }
 
-	@Override
-	public boolean isIncomplete()
-	{
-		return false;
-	}
+    @Override
+    public boolean isIncomplete() {
+        return false;
+    }
 
-	@Override
-	public boolean isLeaf()
-	{
-		return true;
-	}
+    @Override
+    public boolean isLeaf() {
+        return true;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
index e00e940f..89afd838 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
@@ -37,386 +37,314 @@
 /**
  * @author ven
  */
-public class SubBlockVisitor extends JSNodeVisitor
-{
-	private final List<Block> myBlocks = new ArrayList<>();
-	private final CommonCodeStyleSettings mySettings;
-
-	public SubBlockVisitor(CommonCodeStyleSettings settings)
-	{
-		mySettings = settings;
-	}
-
-	public List<Block> getBlocks()
-	{
-		return myBlocks;
-	}
-
-	@Override
-	@RequiredReadAction
-	public void visitElement(final ASTNode node)
-	{
-		Alignment alignment = getDefaultAlignment(node);
-
-		PsiElement elt = node.getPsi().getFirstChild(); // expand chameleon
-
-		while(elt != null)
-		{
-			final ASTNode child = elt.getNode();
-			assert child != null;
-
-			if(child.getElementType() != JSTokenTypes.WHITE_SPACE && child.getTextRange().getLength() > 0)
-			{
-				Wrap wrap = getWrap(node, child);
-				Alignment childAlignment = alignmentProjection(alignment, node, child);
-				Indent childIndent = getIndent(node, child);
-				myBlocks.add(new JSBlock(child, childAlignment, childIndent, wrap, mySettings));
-			}
-
-			elt = elt.getNextSibling(); // expand chameleon
-		}
-	}
-
-
-	@Override
-	public void visitDocComment(final ASTNode node)
-	{
-		final ASTNode child = node.getFirstChildNode();
-		if(child != null && child.getElementType() == JSTokenTypes.DOC_COMMENT)
-		{
-			visit(child);
-		}
-		else
-		{
-			super.visitDocComment(node);
-		}
-	}
-
-	@Override
-	public void visitComment(final ASTNode node)
-	{
-		buildCommentBlocks(node);
-	}
-
-	private void buildCommentBlocks(final ASTNode node)
-	{
-		String commentText = node.getText();
-		int pos = 0;
-		while(pos < commentText.length())
-		{
-			int nextPos = commentText.indexOf('\n', pos);
-			if(nextPos < 0)
-			{
-				nextPos = commentText.length();
-			}
-
-			if(pos != nextPos)
-			{
-				final Indent childIndent = (pos == 0) ? Indent.getNoneIndent() : Indent.getSpaceIndent(1);
-				myBlocks.add(new JSDocCommentBlock(node, pos, nextPos, childIndent));
-			}
-			pos = nextPos + 1;
-			while(pos < commentText.length() && (commentText.charAt(pos) == ' ' ||
-					commentText.charAt(pos) == '\t' ||
-					commentText.charAt(pos) == '\n'))
-			{
-				pos++;
-			}
-		}
-	}
-
-	@Nullable
-	static Alignment getDefaultAlignment(final ASTNode node)
-	{
-		if(node.getElementType() == JSElementTypes.FOR_STATEMENT ||
-				node.getElementType() == JSElementTypes.PARAMETER_LIST ||
-				node.getElementType() == JSElementTypes.BINARY_EXPRESSION ||
-				node.getElementType() == JSElementTypes.ASSIGNMENT_EXPRESSION ||
-				node.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION)
-		{
-			return Alignment.createAlignment();
-		}
-
-		return null;
-	}
-
-	@Nullable
-	private Indent getIndent(final ASTNode node, final ASTNode child)
-	{
-		final IElementType nodeElementType = node.getElementType();
-
-		if(nodeElementType instanceof JSFileElementType || nodeElementType == JSElementTypes.EMBEDDED_CONTENT)
-		{
-			return Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSTokenTypes.DOC_COMMENT)
-		{
-			final ASTNode treePrev = child.getTreePrev();
-			if(treePrev != null && treePrev.getPsi() instanceof PsiWhiteSpace && treePrev.getText().indexOf("\n") != -1)
-			{
-				return Indent.getSpaceIndent(1);
-			}
-			return Indent.getNoneIndent();
-		}
-
-		final IElementType childElementType = child.getElementType();
-
-		if(nodeElementType == JSElementTypes.PACKAGE_STATEMENT && !JSSpacingProcessor.NOT_A_PACKAGE_CONTENT.contains(childElementType))
-		{
-			final JSCodeStyleSettings customSettings = CodeStyleSettingsManager.getSettings(node.getPsi().getProject()).getCustomSettings(JSCodeStyleSettings
-					.class);
-			if(customSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT)
-			{
-				return Indent.getNormalIndent();
-			}
-			return Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.ATTRIBUTE_LIST)
-		{
-			return Indent.getNoneIndent();
-		}
-
-		if(childElementType == JSElementTypes.BLOCK_STATEMENT)
-		{
-			if(nodeElementType == JSElementTypes.FUNCTION_DECLARATION && (mySettings.METHOD_BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED || mySettings
-					.METHOD_BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED2))
-			{
-				return Indent.getNormalIndent();
-			}
-			if(mySettings.BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED || mySettings.BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED2)
-			{
-				return Indent.getNormalIndent();
-			}
-			return Indent.getNoneIndent();
-		}
-
-		if(childElementType == JSElementTypes.CATCH_BLOCK)
-		{
-			return Indent.getNoneIndent();
-		}
-
-		if(childElementType == JSElementTypes.CASE_CLAUSE)
-		{
-			return mySettings.INDENT_CASE_FROM_SWITCH ? Indent.getNormalIndent() : Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.CASE_CLAUSE)
-		{
-			if(child.getPsi() instanceof JSStatement || JSTokenTypes.COMMENTS.contains(childElementType))
-			{
-				return Indent.getNormalIndent();
-			}
-			return Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.SWITCH_STATEMENT && (childElementType == JSTokenTypes.LBRACE || childElementType == JSTokenTypes.RBRACE))
-		{
-			return Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.IF_STATEMENT)
-		{
-			return Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.WITH_STATEMENT && JSElementTypes.SOURCE_ELEMENTS.contains(childElementType))
-		{
-			return Indent.getNormalIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.DOWHILE_STATEMENT && childElementType == JSTokenTypes.WHILE_KEYWORD)
-		{
-			return Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.TRY_STATEMENT && childElementType == JSTokenTypes.FINALLY_KEYWORD)
-		{
-			return Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.BLOCK_STATEMENT ||
-				nodeElementType == JSElementTypes.CLASS ||
-				nodeElementType == JSElementTypes.PACKAGE_STATEMENT)
-		{
-			final ASTNode parent = node.getTreeParent();
-			if(parent != null && parent.getElementType() == JSElementTypes.FUNCTION_DECLARATION &&
-					mySettings.METHOD_BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED)
-			{
-				return Indent.getNoneIndent();
-			}
-			if(mySettings.BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED)
-			{
-				return Indent.getNoneIndent();
-			}
-			if(JSElementTypes.SOURCE_ELEMENTS.contains(childElementType) || JSTokenTypes.COMMENTS.contains(childElementType))
-			{
-				return Indent.getNormalIndent();
-			}
-			return Indent.getNoneIndent();
-		}
-		else if(node.getPsi() instanceof JSLoopStatement)
-		{
-			if(child.getPsi() == ((JSLoopStatement) node.getPsi()).getBody())
-			{
-				if(childElementType == JSElementTypes.BLOCK_STATEMENT)
-				{
-					return Indent.getNoneIndent();
-				}
-				else
-				{
-					return Indent.getNormalIndent();
-				}
-			}
-		}
-
-		if(JSTokenTypes.COMMENTS.contains(childElementType))
-		{
-			return Indent.getNormalIndent();
-		}
-		if(childElementType == JSElementTypes.OBJECT_LITERAL_EXPRESSION)
-		{
-			return nodeElementType == JSElementTypes.ARRAY_LITERAL_EXPRESSION ? Indent.getNormalIndent() : Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.XML_LITERAL_EXPRESSION)
-		{
-			return childElementType == JSElementTypes.XML_LITERAL_EXPRESSION ? Indent.getNormalIndent() : Indent.getNoneIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.ARRAY_LITERAL_EXPRESSION)
-		{
-			if(childElementType == JSTokenTypes.LBRACKET || childElementType == JSTokenTypes.RBRACKET)
-			{
-				return Indent.getNoneIndent();
-			}
-			return Indent.getNormalIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.EMBEDDED_EXPRESSION)
-		{
-			if(childElementType == JSTokenTypes.LBRACE || childElementType == JSTokenTypes.RBRACE)
-			{
-				return Indent.getNoneIndent();
-			}
-			return Indent.getNormalIndent();
-		}
-
-		if(nodeElementType == JSElementTypes.OBJECT_LITERAL_EXPRESSION)
-		{
-			if(childElementType == JSTokenTypes.LBRACE || childElementType == JSTokenTypes.RBRACE)
-			{
-				return Indent.getNoneIndent();
-			}
-			return Indent.getNormalIndent();
-		}
-		return null;
-	}
-
-	@Nullable
-	private static Alignment alignmentProjection(final Alignment defaultAlignment, final ASTNode parent, final ASTNode child)
-	{
-		if(parent.getElementType() == JSElementTypes.FOR_STATEMENT && (JSElementTypes.EXPRESSIONS.contains(child.getElementType()) || child.getElementType
-				() == JSElementTypes.VAR_STATEMENT))
-		{
-			return defaultAlignment;
-		}
-		else if(parent.getElementType() == JSElementTypes.PARAMETER_LIST && child.getElementType() == JSElementTypes.FORMAL_PARAMETER)
-		{
-			return defaultAlignment;
-		}
-		else if(parent.getPsi() instanceof JSBinaryExpression && JSElementTypes.EXPRESSIONS.contains(child.getElementType()))
-		{
-			return defaultAlignment;
-		}
-		else if(parent.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION && JSElementTypes.EXPRESSIONS.contains(child.getElementType()))
-		{
-			return defaultAlignment;
-		}
-
-		return null;
-	}
-
-	@Nullable
-	private Wrap getWrap(final ASTNode node, final ASTNode child)
-	{
-		WrapType wrapType = null;
-		if(node.getElementType() == JSElementTypes.ASSIGNMENT_EXPRESSION)
-		{
-			final JSAssignmentExpression assignment = (JSAssignmentExpression) node.getPsi();
-			if(child.getElementType() == assignment.getOperationSign() && mySettings.PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE || child.getPsi() == assignment
-					.getROperand() && !mySettings.PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE)
-			{
-				wrapType = WrapType.byLegacyRepresentation(mySettings.ASSIGNMENT_WRAP);
-			}
-		}
-		else if(node.getElementType() == JSElementTypes.BINARY_EXPRESSION)
-		{
-			final JSBinaryExpression binary = (JSBinaryExpression) node.getPsi();
-			if(child.getElementType() == binary.getOperationSign() && mySettings.BINARY_OPERATION_SIGN_ON_NEXT_LINE || child.getPsi() == binary.getROperand()
-					&& !mySettings.BINARY_OPERATION_SIGN_ON_NEXT_LINE)
-			{
-				wrapType = WrapType.byLegacyRepresentation(mySettings.BINARY_OPERATION_WRAP);
-			}
-		}
-		else if(node.getElementType() == JSElementTypes.PARENTHESIZED_EXPRESSION)
-		{
-			if(child == node.findChildByType(JSTokenTypes.LPAR) && mySettings.PARENTHESES_EXPRESSION_LPAREN_WRAP)
-			{
-				wrapType = WrapType.NORMAL;
-			}
-			else if(child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.PARENTHESES_EXPRESSION_RPAREN_WRAP)
-			{
-				wrapType = WrapType.ALWAYS;
-			}
-		}
-		else if(node.getElementType() == JSElementTypes.ARRAY_LITERAL_EXPRESSION)
-		{
-			if(child == node.findChildByType(JSTokenTypes.LBRACE) && mySettings.ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE)
-			{
-				wrapType = WrapType.NORMAL;
-			}
-			else if(child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE)
-			{
-				wrapType = WrapType.ALWAYS;
-			}
-		}
-		else if(node.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION)
-		{
-			final IElementType elementType = child.getElementType();
-			if((mySettings.TERNARY_OPERATION_SIGNS_ON_NEXT_LINE && (elementType == JSTokenTypes.QUEST || elementType == JSTokenTypes.COLON)) || (!mySettings
-					.TERNARY_OPERATION_SIGNS_ON_NEXT_LINE && child.getPsi() instanceof JSExpression))
-			{
-				wrapType = WrapType.byLegacyRepresentation(mySettings.TERNARY_OPERATION_WRAP);
-			}
-		}
-		else if(node.getElementType() == JSElementTypes.CALL_EXPRESSION)
-		{
-			if(child == node.findChildByType(JSTokenTypes.LPAR) && mySettings.CALL_PARAMETERS_LPAREN_ON_NEXT_LINE)
-			{
-				wrapType = WrapType.NORMAL;
-			}
-			else if(child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.CALL_PARAMETERS_RPAREN_ON_NEXT_LINE)
-			{
-				wrapType = WrapType.ALWAYS;
-			}
-		}
-		else if(node.getElementType() == JSElementTypes.PARAMETER_LIST)
-		{
-			if(child.getElementType() == JSElementTypes.FORMAL_PARAMETER)
-			{
-				wrapType = WrapType.byLegacyRepresentation(mySettings.METHOD_PARAMETERS_WRAP);
-			}
-		}
-		else if(node.getElementType() == JSElementTypes.FOR_STATEMENT || node.getElementType() == JSElementTypes.FOR_IN_STATEMENT)
-		{
-			if(JSElementTypes.EXPRESSIONS.contains(child.getElementType()))
-			{
-				wrapType = WrapType.byLegacyRepresentation(mySettings.FOR_STATEMENT_WRAP);
-			}
-		}
-
-		return wrapType == null ? null : Wrap.createWrap(wrapType, false);
-	}
+public class SubBlockVisitor extends JSNodeVisitor {
+    private final List<Block> myBlocks = new ArrayList<>();
+    private final CommonCodeStyleSettings mySettings;
+
+    public SubBlockVisitor(CommonCodeStyleSettings settings) {
+        mySettings = settings;
+    }
+
+    public List<Block> getBlocks() {
+        return myBlocks;
+    }
+
+    @Override
+    @RequiredReadAction
+    public void visitElement(final ASTNode node) {
+        Alignment alignment = getDefaultAlignment(node);
+
+        PsiElement elt = node.getPsi().getFirstChild(); // expand chameleon
+
+        while (elt != null) {
+            final ASTNode child = elt.getNode();
+            assert child != null;
+
+            if (child.getElementType() != JSTokenTypes.WHITE_SPACE && child.getTextRange().getLength() > 0) {
+                Wrap wrap = getWrap(node, child);
+                Alignment childAlignment = alignmentProjection(alignment, node, child);
+                Indent childIndent = getIndent(node, child);
+                myBlocks.add(new JSBlock(child, childAlignment, childIndent, wrap, mySettings));
+            }
+
+            elt = elt.getNextSibling(); // expand chameleon
+        }
+    }
+
+
+    @Override
+    public void visitDocComment(final ASTNode node) {
+        final ASTNode child = node.getFirstChildNode();
+        if (child != null && child.getElementType() == JSTokenTypes.DOC_COMMENT) {
+            visit(child);
+        }
+        else {
+            super.visitDocComment(node);
+        }
+    }
+
+    @Override
+    public void visitComment(final ASTNode node) {
+        buildCommentBlocks(node);
+    }
+
+    private void buildCommentBlocks(final ASTNode node) {
+        String commentText = node.getText();
+        int pos = 0;
+        while (pos < commentText.length()) {
+            int nextPos = commentText.indexOf('\n', pos);
+            if (nextPos < 0) {
+                nextPos = commentText.length();
+            }
+
+            if (pos != nextPos) {
+                final Indent childIndent = (pos == 0) ? Indent.getNoneIndent() : Indent.getSpaceIndent(1);
+                myBlocks.add(new JSDocCommentBlock(node, pos, nextPos, childIndent));
+            }
+            pos = nextPos + 1;
+            while (pos < commentText.length() && (commentText.charAt(pos) == ' ' ||
+                commentText.charAt(pos) == '\t' ||
+                commentText.charAt(pos) == '\n')) {
+                pos++;
+            }
+        }
+    }
+
+    @Nullable
+    static Alignment getDefaultAlignment(final ASTNode node) {
+        if (node.getElementType() == JSElementTypes.FOR_STATEMENT
+            || node.getElementType() == JSElementTypes.PARAMETER_LIST
+            || node.getElementType() == JSElementTypes.BINARY_EXPRESSION
+            || node.getElementType() == JSElementTypes.ASSIGNMENT_EXPRESSION
+            || node.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION) {
+            return Alignment.createAlignment();
+        }
+
+        return null;
+    }
+
+    @Nullable
+    private Indent getIndent(final ASTNode node, final ASTNode child) {
+        final IElementType nodeElementType = node.getElementType();
+
+        if (nodeElementType instanceof JSFileElementType || nodeElementType == JSElementTypes.EMBEDDED_CONTENT) {
+            return Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSTokenTypes.DOC_COMMENT) {
+            final ASTNode treePrev = child.getTreePrev();
+            if (treePrev != null && treePrev.getPsi() instanceof PsiWhiteSpace && treePrev.getText().indexOf("\n") != -1) {
+                return Indent.getSpaceIndent(1);
+            }
+            return Indent.getNoneIndent();
+        }
+
+        final IElementType childElementType = child.getElementType();
+
+        if (nodeElementType == JSElementTypes.PACKAGE_STATEMENT && !JSSpacingProcessor.NOT_A_PACKAGE_CONTENT.contains(childElementType)) {
+            final JSCodeStyleSettings customSettings =
+                CodeStyleSettingsManager.getSettings(node.getPsi().getProject()).getCustomSettings(JSCodeStyleSettings.class);
+            if (customSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT) {
+                return Indent.getNormalIndent();
+            }
+            return Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.ATTRIBUTE_LIST) {
+            return Indent.getNoneIndent();
+        }
+
+        if (childElementType == JSElementTypes.BLOCK_STATEMENT) {
+            if (nodeElementType == JSElementTypes.FUNCTION_DECLARATION
+                && (mySettings.METHOD_BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED
+                || mySettings.METHOD_BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED2)) {
+                return Indent.getNormalIndent();
+            }
+            if (mySettings.BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED
+                || mySettings.BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED2) {
+                return Indent.getNormalIndent();
+            }
+            return Indent.getNoneIndent();
+        }
+
+        if (childElementType == JSElementTypes.CATCH_BLOCK) {
+            return Indent.getNoneIndent();
+        }
+
+        if (childElementType == JSElementTypes.CASE_CLAUSE) {
+            return mySettings.INDENT_CASE_FROM_SWITCH ? Indent.getNormalIndent() : Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.CASE_CLAUSE) {
+            if (child.getPsi() instanceof JSStatement || JSTokenTypes.COMMENTS.contains(childElementType)) {
+                return Indent.getNormalIndent();
+            }
+            return Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.SWITCH_STATEMENT
+            && (childElementType == JSTokenTypes.LBRACE || childElementType == JSTokenTypes.RBRACE)) {
+            return Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.IF_STATEMENT) {
+            return Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.WITH_STATEMENT && JSElementTypes.SOURCE_ELEMENTS.contains(childElementType)) {
+            return Indent.getNormalIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.DOWHILE_STATEMENT && childElementType == JSTokenTypes.WHILE_KEYWORD) {
+            return Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.TRY_STATEMENT && childElementType == JSTokenTypes.FINALLY_KEYWORD) {
+            return Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.BLOCK_STATEMENT ||
+            nodeElementType == JSElementTypes.CLASS ||
+            nodeElementType == JSElementTypes.PACKAGE_STATEMENT) {
+            final ASTNode parent = node.getTreeParent();
+            if (parent != null && parent.getElementType() == JSElementTypes.FUNCTION_DECLARATION &&
+                mySettings.METHOD_BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED) {
+                return Indent.getNoneIndent();
+            }
+            if (mySettings.BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED) {
+                return Indent.getNoneIndent();
+            }
+            if (JSElementTypes.SOURCE_ELEMENTS.contains(childElementType) || JSTokenTypes.COMMENTS.contains(childElementType)) {
+                return Indent.getNormalIndent();
+            }
+            return Indent.getNoneIndent();
+        }
+        else if (node.getPsi() instanceof JSLoopStatement) {
+            if (child.getPsi() == ((JSLoopStatement)node.getPsi()).getBody()) {
+                if (childElementType == JSElementTypes.BLOCK_STATEMENT) {
+                    return Indent.getNoneIndent();
+                }
+                else {
+                    return Indent.getNormalIndent();
+                }
+            }
+        }
+
+        if (JSTokenTypes.COMMENTS.contains(childElementType)) {
+            return Indent.getNormalIndent();
+        }
+        if (childElementType == JSElementTypes.OBJECT_LITERAL_EXPRESSION) {
+            return nodeElementType == JSElementTypes.ARRAY_LITERAL_EXPRESSION ? Indent.getNormalIndent() : Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.XML_LITERAL_EXPRESSION) {
+            return childElementType == JSElementTypes.XML_LITERAL_EXPRESSION ? Indent.getNormalIndent() : Indent.getNoneIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.ARRAY_LITERAL_EXPRESSION) {
+            if (childElementType == JSTokenTypes.LBRACKET || childElementType == JSTokenTypes.RBRACKET) {
+                return Indent.getNoneIndent();
+            }
+            return Indent.getNormalIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.EMBEDDED_EXPRESSION) {
+            if (childElementType == JSTokenTypes.LBRACE || childElementType == JSTokenTypes.RBRACE) {
+                return Indent.getNoneIndent();
+            }
+            return Indent.getNormalIndent();
+        }
+
+        if (nodeElementType == JSElementTypes.OBJECT_LITERAL_EXPRESSION) {
+            if (childElementType == JSTokenTypes.LBRACE || childElementType == JSTokenTypes.RBRACE) {
+                return Indent.getNoneIndent();
+            }
+            return Indent.getNormalIndent();
+        }
+        return null;
+    }
+
+    @Nullable
+    private static Alignment alignmentProjection(final Alignment defaultAlignment, final ASTNode parent, final ASTNode child) {
+        if (parent.getElementType() == JSElementTypes.FOR_STATEMENT
+            && (JSElementTypes.EXPRESSIONS.contains(child.getElementType())
+            || child.getElementType() == JSElementTypes.VAR_STATEMENT)) {
+            return defaultAlignment;
+        }
+        else if (parent.getElementType() == JSElementTypes.PARAMETER_LIST && child.getElementType() == JSElementTypes.FORMAL_PARAMETER) {
+            return defaultAlignment;
+        }
+        else if (parent.getPsi() instanceof JSBinaryExpression && JSElementTypes.EXPRESSIONS.contains(child.getElementType())) {
+            return defaultAlignment;
+        }
+        else if (parent.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION
+            && JSElementTypes.EXPRESSIONS.contains(child.getElementType())) {
+            return defaultAlignment;
+        }
+
+        return null;
+    }
+
+    @Nullable
+    private Wrap getWrap(final ASTNode node, final ASTNode child) {
+        WrapType wrapType = null;
+        if (node.getElementType() == JSElementTypes.ASSIGNMENT_EXPRESSION) {
+            final JSAssignmentExpression assignment = (JSAssignmentExpression)node.getPsi();
+            if (child.getElementType() == assignment.getOperationSign() && mySettings.PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE
+                || child.getPsi() == assignment.getROperand() && !mySettings.PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE) {
+                wrapType = WrapType.byLegacyRepresentation(mySettings.ASSIGNMENT_WRAP);
+            }
+        }
+        else if (node.getElementType() == JSElementTypes.BINARY_EXPRESSION) {
+            final JSBinaryExpression binary = (JSBinaryExpression)node.getPsi();
+            if (child.getElementType() == binary.getOperationSign() && mySettings.BINARY_OPERATION_SIGN_ON_NEXT_LINE
+                || child.getPsi() == binary.getROperand() && !mySettings.BINARY_OPERATION_SIGN_ON_NEXT_LINE) {
+                wrapType = WrapType.byLegacyRepresentation(mySettings.BINARY_OPERATION_WRAP);
+            }
+        }
+        else if (node.getElementType() == JSElementTypes.PARENTHESIZED_EXPRESSION) {
+            if (child == node.findChildByType(JSTokenTypes.LPAR) && mySettings.PARENTHESES_EXPRESSION_LPAREN_WRAP) {
+                wrapType = WrapType.NORMAL;
+            }
+            else if (child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.PARENTHESES_EXPRESSION_RPAREN_WRAP) {
+                wrapType = WrapType.ALWAYS;
+            }
+        }
+        else if (node.getElementType() == JSElementTypes.ARRAY_LITERAL_EXPRESSION) {
+            if (child == node.findChildByType(JSTokenTypes.LBRACE) && mySettings.ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE) {
+                wrapType = WrapType.NORMAL;
+            }
+            else if (child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE) {
+                wrapType = WrapType.ALWAYS;
+            }
+        }
+        else if (node.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION) {
+            final IElementType elementType = child.getElementType();
+            if ((mySettings.TERNARY_OPERATION_SIGNS_ON_NEXT_LINE
+                && (elementType == JSTokenTypes.QUEST || elementType == JSTokenTypes.COLON))
+                || (!mySettings.TERNARY_OPERATION_SIGNS_ON_NEXT_LINE && child.getPsi() instanceof JSExpression)) {
+                wrapType = WrapType.byLegacyRepresentation(mySettings.TERNARY_OPERATION_WRAP);
+            }
+        }
+        else if (node.getElementType() == JSElementTypes.CALL_EXPRESSION) {
+            if (child == node.findChildByType(JSTokenTypes.LPAR) && mySettings.CALL_PARAMETERS_LPAREN_ON_NEXT_LINE) {
+                wrapType = WrapType.NORMAL;
+            }
+            else if (child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.CALL_PARAMETERS_RPAREN_ON_NEXT_LINE) {
+                wrapType = WrapType.ALWAYS;
+            }
+        }
+        else if (node.getElementType() == JSElementTypes.PARAMETER_LIST) {
+            if (child.getElementType() == JSElementTypes.FORMAL_PARAMETER) {
+                wrapType = WrapType.byLegacyRepresentation(mySettings.METHOD_PARAMETERS_WRAP);
+            }
+        }
+        else if (node.getElementType() == JSElementTypes.FOR_STATEMENT || node.getElementType() == JSElementTypes.FOR_IN_STATEMENT) {
+            if (JSElementTypes.EXPRESSIONS.contains(child.getElementType())) {
+                wrapType = WrapType.byLegacyRepresentation(mySettings.FOR_STATEMENT_WRAP);
+            }
+        }
+
+        return wrapType == null ? null : Wrap.createWrap(wrapType, false);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
index 3e804004..b14a5ac2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
@@ -33,32 +33,28 @@
  * Time: 12:10:44 PM
  */
 @ExtensionImpl
-public class JSBraceMatcher implements PairedBraceMatcher
-{
-	private static final BracePair[] PAIRS = new BracePair[]{
-			new BracePair(JSTokenTypes.LPAR, JSTokenTypes.RPAR, false),
-			new BracePair(JSTokenTypes.LBRACKET, JSTokenTypes.RBRACKET, false),
-			new BracePair(JSTokenTypes.LBRACE, JSTokenTypes.RBRACE, true)
-	};
+public class JSBraceMatcher implements PairedBraceMatcher {
+    private static final BracePair[] PAIRS = new BracePair[]{
+        new BracePair(JSTokenTypes.LPAR, JSTokenTypes.RPAR, false),
+        new BracePair(JSTokenTypes.LBRACKET, JSTokenTypes.RBRACKET, false),
+        new BracePair(JSTokenTypes.LBRACE, JSTokenTypes.RBRACE, true)
+    };
 
-	@Override
-	public BracePair[] getPairs()
-	{
-		return PAIRS;
-	}
+    @Override
+    public BracePair[] getPairs() {
+        return PAIRS;
+    }
 
-	@Override
-	public boolean isPairedBracesAllowedBeforeType(@Nonnull final IElementType lbraceType, @Nullable final IElementType tokenType)
-	{
-		return JSTokenTypes.WHITE_SPACE == tokenType || JSTokenTypes.COMMENTS.contains(tokenType) || tokenType == JSTokenTypes.SEMICOLON || tokenType ==
-				JSTokenTypes.COMMA || tokenType == JSTokenTypes.RPAR || tokenType == JSTokenTypes.RBRACKET || tokenType == JSTokenTypes.RBRACE || null ==
-				tokenType;
-	}
+    @Override
+    public boolean isPairedBracesAllowedBeforeType(@Nonnull final IElementType lbraceType, @Nullable final IElementType tokenType) {
+        return JSTokenTypes.WHITE_SPACE == tokenType || JSTokenTypes.COMMENTS.contains(tokenType) || tokenType == JSTokenTypes.SEMICOLON || tokenType ==
+            JSTokenTypes.COMMA || tokenType == JSTokenTypes.RPAR || tokenType == JSTokenTypes.RBRACKET || tokenType == JSTokenTypes.RBRACE || null ==
+            tokenType;
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
index 05b881d6..97b3c457 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
@@ -28,6 +28,7 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,106 +38,116 @@
  * Time: 10:12:13 PM
  */
 @ExtensionImpl
-public class JavaScriptColorsAndFontsPage implements ColorSettingsPage
-{
-	private static final AttributesDescriptor[] ATTRS;
+public class JavaScriptColorsAndFontsPage implements ColorSettingsPage {
+    private static final AttributesDescriptor[] ATTRS;
 
-	@NonNls
-	private static Map<String, TextAttributesKey> ADDITIONAL_HIGHLIGHT_DESCRIPTORS = new HashMap<String, TextAttributesKey>();
+    @NonNls
+    private static Map<String, TextAttributesKey> ADDITIONAL_HIGHLIGHT_DESCRIPTORS = new HashMap<String, TextAttributesKey>();
 
-	static
-	{
-		ATTRS = new AttributesDescriptor[]{
-				new AttributesDescriptor(JavaScriptLocalize.javascriptKeyword(), JavaScriptSyntaxHighlightKeys.JS_KEYWORD),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptString(), JavaScriptSyntaxHighlightKeys.JS_STRING),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptValidStringEscape(), JavaScriptSyntaxHighlightKeys.JS_VALID_STRING_ESCAPE),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptInvalidStringEscape(), JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptNumber(), JavaScriptSyntaxHighlightKeys.JS_NUMBER),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptRegexp(), JavaScriptSyntaxHighlightKeys.JS_REGEXP),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptLinecomment(), JavaScriptSyntaxHighlightKeys.JS_LINE_COMMENT),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptBlockcomment(), JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptDoccomment(), JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptOperation(), JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptParens(), JavaScriptSyntaxHighlightKeys.JS_PARENTHS),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptBrackets(), JavaScriptSyntaxHighlightKeys.JS_BRACKETS),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptBraces(), JavaScriptSyntaxHighlightKeys.JS_BRACES),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptComma(), JavaScriptSyntaxHighlightKeys.JS_COMMA),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptDot(), JavaScriptSyntaxHighlightKeys.JS_DOT),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptSemicolon(), JavaScriptSyntaxHighlightKeys.JS_SEMICOLON),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptBadcharacter(), JavaScriptSyntaxHighlightKeys.JS_BAD_CHARACTER),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptDocmarkup(), JavaScriptSyntaxHighlightKeys.JS_DOC_MARKUP),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptDoctag(), JavaScriptSyntaxHighlightKeys.JS_DOC_TAG),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptParameter(), JavaScriptSyntaxHighlightKeys.JS_PARAMETER),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptLocalVariable(), JavaScriptSyntaxHighlightKeys.JS_LOCAL_VARIABLE),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptGlobalVariable(), JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptGlobalFunction(), JavaScriptSyntaxHighlightKeys.JS_GLOBAL_FUNCTION),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptInstanceMemberFunction(), JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptStaticMemberFunction(), JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_FUNCTION),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptStaticMemberVariable(), JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_VARIABLE),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptInstanceMemberVariable(), JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE),
-				new AttributesDescriptor(JavaScriptLocalize.javascriptMetadata(), JavaScriptSyntaxHighlightKeys.JS_METADATA),
-		};
-		ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("local_variable", JavaScriptSyntaxHighlightKeys.JS_LOCAL_VARIABLE);
-		ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("global_variable", JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE);
-		ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("instance_variable", JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE);
-		ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("instance_method", JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION);
-		ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("global_function", JavaScriptSyntaxHighlightKeys.JS_GLOBAL_FUNCTION);
-		ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("parameter", JavaScriptSyntaxHighlightKeys.JS_PARAMETER);
-	}
+    static {
+        ATTRS = new AttributesDescriptor[]{
+            new AttributesDescriptor(JavaScriptLocalize.javascriptKeyword(), JavaScriptSyntaxHighlightKeys.JS_KEYWORD),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptString(), JavaScriptSyntaxHighlightKeys.JS_STRING),
+            new AttributesDescriptor(
+                JavaScriptLocalize.javascriptValidStringEscape(),
+                JavaScriptSyntaxHighlightKeys.JS_VALID_STRING_ESCAPE
+            ),
+            new AttributesDescriptor(
+                JavaScriptLocalize.javascriptInvalidStringEscape(),
+                JavaScriptSyntaxHighlightKeys.JS_INVALID_STRING_ESCAPE
+            ),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptNumber(), JavaScriptSyntaxHighlightKeys.JS_NUMBER),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptRegexp(), JavaScriptSyntaxHighlightKeys.JS_REGEXP),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptLinecomment(), JavaScriptSyntaxHighlightKeys.JS_LINE_COMMENT),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptBlockcomment(), JavaScriptSyntaxHighlightKeys.JS_BLOCK_COMMENT),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptDoccomment(), JavaScriptSyntaxHighlightKeys.JS_DOC_COMMENT),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptOperation(), JavaScriptSyntaxHighlightKeys.JS_OPERATION_SIGN),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptParens(), JavaScriptSyntaxHighlightKeys.JS_PARENTHS),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptBrackets(), JavaScriptSyntaxHighlightKeys.JS_BRACKETS),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptBraces(), JavaScriptSyntaxHighlightKeys.JS_BRACES),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptComma(), JavaScriptSyntaxHighlightKeys.JS_COMMA),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptDot(), JavaScriptSyntaxHighlightKeys.JS_DOT),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptSemicolon(), JavaScriptSyntaxHighlightKeys.JS_SEMICOLON),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptBadcharacter(), JavaScriptSyntaxHighlightKeys.JS_BAD_CHARACTER),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptDocmarkup(), JavaScriptSyntaxHighlightKeys.JS_DOC_MARKUP),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptDoctag(), JavaScriptSyntaxHighlightKeys.JS_DOC_TAG),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptParameter(), JavaScriptSyntaxHighlightKeys.JS_PARAMETER),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptLocalVariable(), JavaScriptSyntaxHighlightKeys.JS_LOCAL_VARIABLE),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptGlobalVariable(), JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptGlobalFunction(), JavaScriptSyntaxHighlightKeys.JS_GLOBAL_FUNCTION),
+            new AttributesDescriptor(
+                JavaScriptLocalize.javascriptInstanceMemberFunction(),
+                JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION
+            ),
+            new AttributesDescriptor(
+                JavaScriptLocalize.javascriptStaticMemberFunction(),
+                JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_FUNCTION
+            ),
+            new AttributesDescriptor(
+                JavaScriptLocalize.javascriptStaticMemberVariable(),
+                JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_VARIABLE
+            ),
+            new AttributesDescriptor(
+                JavaScriptLocalize.javascriptInstanceMemberVariable(),
+                JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE
+            ),
+            new AttributesDescriptor(JavaScriptLocalize.javascriptMetadata(), JavaScriptSyntaxHighlightKeys.JS_METADATA),
+        };
+        ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("local_variable", JavaScriptSyntaxHighlightKeys.JS_LOCAL_VARIABLE);
+        ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("global_variable", JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE);
+        ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("instance_variable", JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE);
+        ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("instance_method", JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION);
+        ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("global_function", JavaScriptSyntaxHighlightKeys.JS_GLOBAL_FUNCTION);
+        ADDITIONAL_HIGHLIGHT_DESCRIPTORS.put("parameter", JavaScriptSyntaxHighlightKeys.JS_PARAMETER);
+    }
 
 
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return "JavaScript";
-	}
+    @Override
+    @Nonnull
+    public String getDisplayName() {
+        return "JavaScript";
+    }
 
-	@Override
-	@Nonnull
-	public AttributesDescriptor[] getAttributeDescriptors()
-	{
-		return ATTRS;
-	}
+    @Override
+    @Nonnull
+    public AttributesDescriptor[] getAttributeDescriptors() {
+        return ATTRS;
+    }
 
-	@Override
-	@Nonnull
-	public ColorDescriptor[] getColorDescriptors()
-	{
-		return ColorDescriptor.EMPTY_ARRAY;
-	}
+    @Override
+    @Nonnull
+    public ColorDescriptor[] getColorDescriptors() {
+        return ColorDescriptor.EMPTY_ARRAY;
+    }
 
-	@Override
-	@Nonnull
-	public SyntaxHighlighter getHighlighter()
-	{
-		return JavaScript15LanguageVersion.getInstance().getSyntaxHighlighter();
-	}
+    @Override
+    @Nonnull
+    public SyntaxHighlighter getHighlighter() {
+        return JavaScript15LanguageVersion.getInstance().getSyntaxHighlighter();
+    }
 
-	@Override
-	@Nonnull
-	public String getDemoText()
-	{
-		return "var <global_variable>globalVar</global_variable>;\n" +
-				"/**\n" +
-				" * Constructor for <code>AjaxRequest</code> class\n" +
-				" * @param url the url for the request<p/>\n" +
-				" */\n" +
-				"function <global_function>AjaxRequest</global_function>(<parameter>url</parameter>) {\n" +
-				"  var <local_variable>urls</local_variable> = [ \"www.cnn.com\", 5, <global_variable>globalVar</global_variable>];\n" +
-				"  this.<instance_variable>request</instance_variable> = new <global_function>XMLHttpRequest</global_function>();\n" +
-				"  <parameter>url</parameter> = <parameter>url</parameter>.replace(/^\\s*(.*)/, \"$1\"); // skip leading whitespace\n" +
-				"  /* check the url to be in urls */\n" +
-				"  var <local_variable>a</local_variable> = \"\\u1111\\z\\n\\u11\";\n" +
-				"  this.<instance_method>foo</instance_method> = new function() {};\n" +
-				"  <instance_method>foo</instance_method>();\n" +
-				"  #\n" +
-				"}";
-	}
+    @Override
+    @Nonnull
+    public String getDemoText() {
+        return "var <global_variable>globalVar</global_variable>;\n" +
+            "/**\n" +
+            " * Constructor for <code>AjaxRequest</code> class\n" +
+            " * @param url the url for the request<p/>\n" +
+            " */\n" +
+            "function <global_function>AjaxRequest</global_function>(<parameter>url</parameter>) {\n" +
+            "  var <local_variable>urls</local_variable> = [ \"www.cnn.com\", 5, <global_variable>globalVar</global_variable>];\n" +
+            "  this.<instance_variable>request</instance_variable> = new <global_function>XMLHttpRequest</global_function>();\n" +
+            "  <parameter>url</parameter> = <parameter>url</parameter>.replace(/^\\s*(.*)/, \"$1\"); // skip leading whitespace\n" +
+            "  /* check the url to be in urls */\n" +
+            "  var <local_variable>a</local_variable> = \"\\u1111\\z\\n\\u11\";\n" +
+            "  this.<instance_method>foo</instance_method> = new function() {};\n" +
+            "  <instance_method>foo</instance_method>();\n" +
+            "  #\n" +
+            "}";
+    }
 
-	@Override
-	public Map<String, TextAttributesKey> getAdditionalHighlightingTagToDescriptorMap()
-	{
-		return ADDITIONAL_HIGHLIGHT_DESCRIPTORS;
-	}
+    @Override
+    public Map<String, TextAttributesKey> getAdditionalHighlightingTagToDescriptorMap() {
+        return ADDITIONAL_HIGHLIGHT_DESCRIPTORS;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
index 0f2b72b2..dc8fd4e9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
@@ -41,348 +41,317 @@
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
-public class JavaScriptHighlightVisitor extends JSElementVisitor implements HighlightVisitor
-{
-	private HighlightInfoHolder myHighlightInfoHolder;
-
-	@Override
-	@RequiredReadAction
-	public void visitJSBinaryExpression(JSBinaryExpression node)
-	{
-		super.visitJSBinaryExpression(node);
-
-		IElementType operationSign = node.getOperationSign();
-		if(operationSign == JSTokenTypes.MULTMULT)
-		{
-			reportFeatureUsage(node.getOperationElement(), JavaScriptFeature.EXPONENTIATION_OPERATOR);
-		}
-	}
-
-	@Override
-	@RequiredReadAction
-	public void visitJSAssignmentExpression(JSAssignmentExpression node)
-	{
-		super.visitJSAssignmentExpression(node);
-
-		IElementType operationSign = node.getOperationSign();
-		if(operationSign == JSTokenTypes.MULT_MULT_EQ)
-		{
-			reportFeatureUsage(node.getOperationElement(), JavaScriptFeature.EXPONENTIATION_OPERATOR);
-		}
-	}
-
-	@Override
-	@RequiredReadAction
-	public void visitElement(PsiElement element)
-	{
-		super.visitElement(element);
-
-		PsiElement parent = element.getParent();
-		IElementType elementType = PsiUtilCore.getElementType(element);
-		if((JavaScriptTokenSets.STRING_LITERALS.contains(elementType) || elementType == JSTokenTypes.IDENTIFIER) && parent instanceof JSProperty && ((JSProperty) parent).getNameIdentifier() ==
-				element)
-		{
-			highlightPropertyName((JSProperty) parent, element);
-		}
-		else if(elementType == JSTokenTypes.IDENTIFIER)
-		{
-			addElementHighlight(parent, element);
-		}
-		else if(JavaScriptContextKeywordElementType.containsKeyword(elementType))
-		{
-			myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).textAttributes(JavaScriptSyntaxHighlightKeys.JS_KEYWORD).range(element).create());
-		}
-	}
-
-	@Override
-	public void visitJSProperty(JSProperty node)
-	{
-		super.visitJSProperty(node);
-
-		if(node instanceof JSFunction)
-		{
-			reportFeatureUsage(node.getNameIdentifier(), JavaScriptFeature.FUNCTION_PROPERTY);
-		}
-	}
-
-	@Override
-	@RequiredReadAction
-	public void visitJSLiteralExpression(JSSimpleLiteralExpression node)
-	{
-		super.visitJSLiteralExpression(node);
-		if(node.getLiteralElementType() == JSTokenTypes.NUMERIC_LITERAL)
-		{
-			String text = node.getText();
-			if(StringUtil.startsWithIgnoreCase(text, "0o"))
-			{
-				reportFeatureUsage(node, JavaScriptFeature.OCTAL_LITERAL);
-			}
-			else if(StringUtil.startsWithIgnoreCase(text, "0b"))
-			{
-				reportFeatureUsage(node, JavaScriptFeature.BINARY_LITERAL);
-			}
-		}
-	}
-
-	@RequiredReadAction
-	private void highlightPropertyName(@Nonnull JSProperty property, @Nonnull PsiElement nameIdentifier)
-	{
-		final JSExpression expression = property.getValue();
-		TextAttributesKey type;
-
-		if(expression instanceof JSFunctionExpression)
-		{
-			type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION;
-		}
-		else
-		{
-			type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
-		}
-		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).needsUpdateOnTyping(false).range(nameIdentifier).textAttributes(type).create());
-	}
-
-	@Override
-	@RequiredReadAction
-	public void visitJSAttribute(JSAttribute jsAttribute)
-	{
-		super.visitJSAttribute(jsAttribute);
-
-		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).needsUpdateOnTyping(false).range(jsAttribute).textAttributes(JavaScriptSyntaxHighlightKeys
-				.JS_METADATA).create());
-	}
-
-	@Override
-	@RequiredReadAction
-	public void visitJSParameter(JSParameter parameter)
-	{
-		super.visitJSParameter(parameter);
-
-		JSExpression initializer = parameter.getInitializer();
-		if(initializer != null)
-		{
-			reportFeatureUsage(initializer, JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
-		}
-
-		PsiElement restElement = parameter.getRestElement();
-		if(restElement != null)
-		{
-			reportFeatureUsage(restElement, JavaScriptFeature.REST_PARAMETER);
-		}
-	}
-
-	@Override
-	@RequiredReadAction
-	public void visitJSReferenceExpression(JSReferenceExpression element)
-	{
-		super.visitJSReferenceExpression(element);
-
-		PsiElement parent = element.getParent();
-
-		if(parent instanceof PsiNameIdentifierOwner && ((PsiNameIdentifierOwner) parent).getNameIdentifier() == element)
-		{
-			return;
-		}
-
-		final ResolveResult[] results = element.multiResolve(false);
-
-		PsiElement validResult = null;
-		for(ResolveResult result : results)
-		{
-			if(result.isValidResult())
-			{
-				validResult = result.getElement();
-				break;
-			}
-		}
-
-		if(validResult == null)
-		{
-			return;
-		}
-
-		PsiElement referenceNameElement = element.getReferenceNameElement();
-		if(referenceNameElement == null)
-		{
-			return;
-		}
-		addElementHighlight(validResult, referenceNameElement);
-	}
-
-	@Override
-	@RequiredReadAction
-	public void visitJSPrefixExpression(JSPrefixExpression expression)
-	{
-		super.visitJSPrefixExpression(expression);
-
-		if(expression.getOperationSign() == JSTokenTypes.DOT_DOT_DOT)
-		{
-			PsiElement operatorElement = expression.getOperatorElement();
-			assert operatorElement != null;
-			reportFeatureUsage(operatorElement, JavaScriptFeature.SPREAD_OPERATOR);
-		}
-	}
-
-	@RequiredReadAction
-	private void addElementHighlight(@Nonnull PsiElement resolvedElement, @Nonnull PsiElement targetForHighlight)
-	{
-		boolean isStatic = false;
-		boolean isMethod = false;
-		boolean isFunction = false;
-		boolean isField = false;
-		TextAttributesKey type = null;
-
-		if(resolvedElement instanceof JSAttributeListOwner)
-		{
-			if(resolvedElement instanceof JSClass)
-			{
-				type = DefaultLanguageHighlighterColors.CLASS_NAME;
-			}
-			else
-			{
-				final JSAttributeList attributeList = ((JSAttributeListOwner) resolvedElement).getAttributeList();
-
-				if(attributeList != null)
-				{
-					isStatic = attributeList.hasModifier(JSAttributeList.ModifierType.STATIC);
-				}
-
-				isMethod = resolvedElement instanceof JSFunction;
-				if(isMethod && !isClass(resolvedElement.getParent()))
-				{
-					isMethod = false;
-					isFunction = true;
-				}
-			}
-		}
-		else if(resolvedElement instanceof JSDefinitionExpression)
-		{
-			final PsiElement parent = resolvedElement.getParent();
-			if(parent instanceof JSAssignmentExpression)
-			{
-				final JSExpression jsExpression = ((JSAssignmentExpression) parent).getROperand();
-				if(jsExpression instanceof JSFunctionExpression)
-				{
-					isMethod = true;
-				}
-				else
-				{
-					isField = true;
-				}
-			}
-		}
-		else if(resolvedElement instanceof JSProperty)
-		{
-			final JSExpression expression = ((JSProperty) resolvedElement).getValue();
-
-			if(expression instanceof JSFunctionExpression)
-			{
-				isMethod = true;
-			}
-			else
-			{
-				isField = true;
-			}
-		}
-
-		if(isMethod)
-		{
-			if(isStatic)
-			{
-				type = JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_FUNCTION;
-			}
-			else
-			{
-				type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION;
-			}
-		}
-		else if(isFunction)
-		{
-			type = JavaScriptSyntaxHighlightKeys.JS_GLOBAL_FUNCTION;
-		}
-		else if(isField)
-		{
-			type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
-		}
-
-		if(type == null)
-		{
-			if(resolvedElement instanceof JSVariable)
-			{
-				myHighlightInfoHolder.add(buildHighlightForVariable(resolvedElement, targetForHighlight));
-			}
-			return;
-		}
-
-		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).needsUpdateOnTyping(false).range(targetForHighlight).textAttributes(type).create());
-	}
-
-	@Nullable
-	@RequiredReadAction
-	private static HighlightInfo buildHighlightForVariable(@Nonnull final PsiElement element, @Nonnull final PsiElement markerAddTo)
-	{
-		TextAttributesKey type;
-
-		if(element instanceof JSParameter)
-		{
-			type = JavaScriptSyntaxHighlightKeys.JS_PARAMETER;
-		}
-		else
-		{
-			if(isClass(element.getParent().getParent()))
-			{
-				final JSAttributeList attributeList = ((JSAttributeListOwner) element).getAttributeList();
-				final boolean isStatic = attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC);
-				type = isStatic ? JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_VARIABLE : JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
-			}
-			else
-			{
-				if(PsiTreeUtil.getParentOfType(element, JSFunction.class) != null)
-				{
-					type = JavaScriptSyntaxHighlightKeys.JS_LOCAL_VARIABLE;
-				}
-				else
-				{
-					type = JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE;
-				}
-			}
-		}
-
-		if(type == null)
-		{
-			return null;
-		}
-
-		return HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(markerAddTo).needsUpdateOnTyping(false).textAttributes(type).create();
-	}
-
-	private void reportFeatureUsage(@Nonnull PsiElement element, @Nonnull JavaScriptFeature javaScriptFeature)
-	{
-		if(JavaScriptVersionUtil.containsFeature(element, javaScriptFeature))
-		{
-			return;
-		}
-
-		LocalizeValue message = JavaScriptLocalize.thisFeatureIsNotSupportedByCurrentLanguage(javaScriptFeature.getName());
-
-		myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(element).descriptionAndTooltip(message).create());
-	}
-
-	@Override
-	public void visit(@Nonnull PsiElement element)
-	{
-		element.acceptChildren(this);
-	}
-
-	@Override
-	public boolean analyze(@Nonnull PsiFile psiFile, boolean b, @Nonnull HighlightInfoHolder highlightInfoHolder, @Nonnull Runnable runnable)
-	{
-		myHighlightInfoHolder = highlightInfoHolder;
-		runnable.run();
-		return true;
-	}
-
-	private static boolean isClass(final PsiElement element)
-	{
-		return element instanceof JSClass || element instanceof JSFile && element.getContext() != null;
-	}
+public class JavaScriptHighlightVisitor extends JSElementVisitor implements HighlightVisitor {
+    private HighlightInfoHolder myHighlightInfoHolder;
+
+    @Override
+    @RequiredReadAction
+    public void visitJSBinaryExpression(JSBinaryExpression node) {
+        super.visitJSBinaryExpression(node);
+
+        IElementType operationSign = node.getOperationSign();
+        if (operationSign == JSTokenTypes.MULTMULT) {
+            reportFeatureUsage(node.getOperationElement(), JavaScriptFeature.EXPONENTIATION_OPERATOR);
+        }
+    }
+
+    @Override
+    @RequiredReadAction
+    public void visitJSAssignmentExpression(JSAssignmentExpression node) {
+        super.visitJSAssignmentExpression(node);
+
+        IElementType operationSign = node.getOperationSign();
+        if (operationSign == JSTokenTypes.MULT_MULT_EQ) {
+            reportFeatureUsage(node.getOperationElement(), JavaScriptFeature.EXPONENTIATION_OPERATOR);
+        }
+    }
+
+    @Override
+    @RequiredReadAction
+    public void visitElement(PsiElement element) {
+        super.visitElement(element);
+
+        PsiElement parent = element.getParent();
+        IElementType elementType = PsiUtilCore.getElementType(element);
+        if ((JavaScriptTokenSets.STRING_LITERALS.contains(elementType) || elementType == JSTokenTypes.IDENTIFIER)
+            && parent instanceof JSProperty && ((JSProperty)parent).getNameIdentifier() == element) {
+            highlightPropertyName((JSProperty)parent, element);
+        }
+        else if (elementType == JSTokenTypes.IDENTIFIER) {
+            addElementHighlight(parent, element);
+        }
+        else if (JavaScriptContextKeywordElementType.containsKeyword(elementType)) {
+            myHighlightInfoHolder.add(
+                HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION)
+                    .textAttributes(JavaScriptSyntaxHighlightKeys.JS_KEYWORD)
+                    .range(element)
+                    .create()
+            );
+        }
+    }
+
+    @Override
+    public void visitJSProperty(JSProperty node) {
+        super.visitJSProperty(node);
+
+        if (node instanceof JSFunction) {
+            reportFeatureUsage(node.getNameIdentifier(), JavaScriptFeature.FUNCTION_PROPERTY);
+        }
+    }
+
+    @Override
+    @RequiredReadAction
+    public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
+        super.visitJSLiteralExpression(node);
+        if (node.getLiteralElementType() == JSTokenTypes.NUMERIC_LITERAL) {
+            String text = node.getText();
+            if (StringUtil.startsWithIgnoreCase(text, "0o")) {
+                reportFeatureUsage(node, JavaScriptFeature.OCTAL_LITERAL);
+            }
+            else if (StringUtil.startsWithIgnoreCase(text, "0b")) {
+                reportFeatureUsage(node, JavaScriptFeature.BINARY_LITERAL);
+            }
+        }
+    }
+
+    @RequiredReadAction
+    private void highlightPropertyName(@Nonnull JSProperty property, @Nonnull PsiElement nameIdentifier) {
+        final JSExpression expression = property.getValue();
+        TextAttributesKey type;
+
+        if (expression instanceof JSFunctionExpression) {
+            type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION;
+        }
+        else {
+            type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
+        }
+        myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION)
+            .needsUpdateOnTyping(false)
+            .range(nameIdentifier)
+            .textAttributes(type)
+            .create());
+    }
+
+    @Override
+    @RequiredReadAction
+    public void visitJSAttribute(JSAttribute jsAttribute) {
+        super.visitJSAttribute(jsAttribute);
+
+        myHighlightInfoHolder.add(
+            HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION)
+                .needsUpdateOnTyping(false)
+                .range(jsAttribute)
+                .textAttributes(JavaScriptSyntaxHighlightKeys.JS_METADATA)
+                .create()
+        );
+    }
+
+    @Override
+    @RequiredReadAction
+    public void visitJSParameter(JSParameter parameter) {
+        super.visitJSParameter(parameter);
+
+        JSExpression initializer = parameter.getInitializer();
+        if (initializer != null) {
+            reportFeatureUsage(initializer, JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
+        }
+
+        PsiElement restElement = parameter.getRestElement();
+        if (restElement != null) {
+            reportFeatureUsage(restElement, JavaScriptFeature.REST_PARAMETER);
+        }
+    }
+
+    @Override
+    @RequiredReadAction
+    public void visitJSReferenceExpression(JSReferenceExpression element) {
+        super.visitJSReferenceExpression(element);
+
+        PsiElement parent = element.getParent();
+
+        if (parent instanceof PsiNameIdentifierOwner && ((PsiNameIdentifierOwner)parent).getNameIdentifier() == element) {
+            return;
+        }
+
+        final ResolveResult[] results = element.multiResolve(false);
+
+        PsiElement validResult = null;
+        for (ResolveResult result : results) {
+            if (result.isValidResult()) {
+                validResult = result.getElement();
+                break;
+            }
+        }
+
+        if (validResult == null) {
+            return;
+        }
+
+        PsiElement referenceNameElement = element.getReferenceNameElement();
+        if (referenceNameElement == null) {
+            return;
+        }
+        addElementHighlight(validResult, referenceNameElement);
+    }
+
+    @Override
+    @RequiredReadAction
+    public void visitJSPrefixExpression(JSPrefixExpression expression) {
+        super.visitJSPrefixExpression(expression);
+
+        if (expression.getOperationSign() == JSTokenTypes.DOT_DOT_DOT) {
+            PsiElement operatorElement = expression.getOperatorElement();
+            assert operatorElement != null;
+            reportFeatureUsage(operatorElement, JavaScriptFeature.SPREAD_OPERATOR);
+        }
+    }
+
+    @RequiredReadAction
+    private void addElementHighlight(@Nonnull PsiElement resolvedElement, @Nonnull PsiElement targetForHighlight) {
+        boolean isStatic = false;
+        boolean isMethod = false;
+        boolean isFunction = false;
+        boolean isField = false;
+        TextAttributesKey type = null;
+
+        if (resolvedElement instanceof JSAttributeListOwner) {
+            if (resolvedElement instanceof JSClass) {
+                type = DefaultLanguageHighlighterColors.CLASS_NAME;
+            }
+            else {
+                final JSAttributeList attributeList = ((JSAttributeListOwner)resolvedElement).getAttributeList();
+
+                if (attributeList != null) {
+                    isStatic = attributeList.hasModifier(JSAttributeList.ModifierType.STATIC);
+                }
+
+                isMethod = resolvedElement instanceof JSFunction;
+                if (isMethod && !isClass(resolvedElement.getParent())) {
+                    isMethod = false;
+                    isFunction = true;
+                }
+            }
+        }
+        else if (resolvedElement instanceof JSDefinitionExpression) {
+            final PsiElement parent = resolvedElement.getParent();
+            if (parent instanceof JSAssignmentExpression) {
+                final JSExpression jsExpression = ((JSAssignmentExpression)parent).getROperand();
+                if (jsExpression instanceof JSFunctionExpression) {
+                    isMethod = true;
+                }
+                else {
+                    isField = true;
+                }
+            }
+        }
+        else if (resolvedElement instanceof JSProperty) {
+            final JSExpression expression = ((JSProperty)resolvedElement).getValue();
+
+            if (expression instanceof JSFunctionExpression) {
+                isMethod = true;
+            }
+            else {
+                isField = true;
+            }
+        }
+
+        if (isMethod) {
+            if (isStatic) {
+                type = JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_FUNCTION;
+            }
+            else {
+                type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION;
+            }
+        }
+        else if (isFunction) {
+            type = JavaScriptSyntaxHighlightKeys.JS_GLOBAL_FUNCTION;
+        }
+        else if (isField) {
+            type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
+        }
+
+        if (type == null) {
+            if (resolvedElement instanceof JSVariable) {
+                myHighlightInfoHolder.add(buildHighlightForVariable(resolvedElement, targetForHighlight));
+            }
+            return;
+        }
+
+        myHighlightInfoHolder.add(
+            HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION)
+                .needsUpdateOnTyping(false)
+                .range(targetForHighlight)
+                .textAttributes(type)
+                .create()
+        );
+    }
+
+    @Nullable
+    @RequiredReadAction
+    private static HighlightInfo buildHighlightForVariable(@Nonnull final PsiElement element, @Nonnull final PsiElement markerAddTo) {
+        TextAttributesKey type;
+
+        if (element instanceof JSParameter) {
+            type = JavaScriptSyntaxHighlightKeys.JS_PARAMETER;
+        }
+        else if (isClass(element.getParent().getParent())) {
+            final JSAttributeList attributeList = ((JSAttributeListOwner)element).getAttributeList();
+            final boolean isStatic = attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC);
+            type = isStatic
+                ? JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_VARIABLE
+                : JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
+        }
+        else if (PsiTreeUtil.getParentOfType(element, JSFunction.class) != null) {
+            type = JavaScriptSyntaxHighlightKeys.JS_LOCAL_VARIABLE;
+        }
+        else {
+            type = JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE;
+        }
+
+        if (type == null) {
+            return null;
+        }
+
+        return HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION)
+            .range(markerAddTo)
+            .needsUpdateOnTyping(false)
+            .textAttributes(type)
+            .create();
+    }
+
+    private void reportFeatureUsage(@Nonnull PsiElement element, @Nonnull JavaScriptFeature javaScriptFeature) {
+        if (JavaScriptVersionUtil.containsFeature(element, javaScriptFeature)) {
+            return;
+        }
+
+        LocalizeValue message = JavaScriptLocalize.thisFeatureIsNotSupportedByCurrentLanguage(javaScriptFeature.getName());
+
+        myHighlightInfoHolder.add(
+            HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
+                .range(element)
+                .descriptionAndTooltip(message)
+                .create()
+        );
+    }
+
+    @Override
+    public void visit(@Nonnull PsiElement element) {
+        element.acceptChildren(this);
+    }
+
+    @Override
+    public boolean analyze(
+        @Nonnull PsiFile psiFile,
+        boolean b,
+        @Nonnull HighlightInfoHolder highlightInfoHolder,
+        @Nonnull Runnable runnable
+    ) {
+        myHighlightInfoHolder = highlightInfoHolder;
+        runnable.run();
+        return true;
+    }
+
+    private static boolean isClass(final PsiElement element) {
+        return element instanceof JSClass || element instanceof JSFile && element.getContext() != null;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
index 91204479..7c024ead 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
@@ -13,18 +13,15 @@
  * @since 25/03/2023
  */
 @ExtensionImpl
-public class JavaScriptHighlightVisitorFactory implements HighlightVisitorFactory
-{
-	@Override
-	public boolean suitableForFile(@Nonnull PsiFile psiFile)
-	{
-		return psiFile instanceof JSFile;
-	}
+public class JavaScriptHighlightVisitorFactory implements HighlightVisitorFactory {
+    @Override
+    public boolean suitableForFile(@Nonnull PsiFile psiFile) {
+        return psiFile instanceof JSFile;
+    }
 
-	@Nonnull
-	@Override
-	public HighlightVisitor createVisitor()
-	{
-		return new JavaScriptHighlightVisitor();
-	}
+    @Nonnull
+    @Override
+    public HighlightVisitor createVisitor() {
+        return new JavaScriptHighlightVisitor();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
index 3f8f956b..a1eeeef7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
@@ -46,6 +46,7 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.awt.event.MouseEvent;
 import java.util.*;
 import java.util.function.Function;
@@ -56,450 +57,418 @@
  * Time: 11:43:47 PM
  */
 @ExtensionImpl
-public class JavaScriptLineMarkerProvider implements LineMarkerProvider
-{
-	private static final String OVERRIDES_METHOD_IN = "overrides method in ";
-
-	private static final Function<JSClass, String> ourClassInheritorsTooltipProvider = clazz -> "Has subclasses";
-
-	private static final Function<JSClass, String> ourImplementedInterfacesTooltipProvider = clazz -> "Has implementations";
-
-	private static final Function<JSFunction, String> ourOverriddenFunctionsTooltipProvider = psiElement -> "Is overridden";
-
-	private static final Function<JSFunction, String> ourImplementingFunctionsTooltipProvider = psiElement -> "Is implemented";
-
-	private static final BasicGutterIconNavigationHandler<JSClass> ourClassInheritorsNavHandler = new BasicGutterIconNavigationHandler<JSClass>()
-	{
-		@Override
-		protected String getTitle(final JSClass elt)
-		{
-			return "Choose Subclass of " + elt.getName();
-		}
-
-		@Override
-		protected Query<JSClass> search(final JSClass elt)
-		{
-			return JSClassSearch.searchClassInheritors(elt, true);
-		}
-	};
-
-	private static final BasicGutterIconNavigationHandler<JSClass> ourInterfaceImplementationsNavHandler = new
-			BasicGutterIconNavigationHandler<JSClass>()
-			{
-				@Override
-				protected String getTitle(final JSClass elt)
-				{
-					return "Choose Implementation of " + elt.getName();
-				}
-
-				@Override
-				protected Query<JSClass> search(final JSClass elt)
-				{
-					return JSClassSearch.searchInterfaceImplementations(elt, true);
-				}
-			};
-
-	private static final BasicGutterIconNavigationHandler<JSFunction> ourOverriddenFunctionsNavHandler = new
-			BasicGutterIconNavigationHandler<JSFunction>()
-			{
-				@Override
-				protected String getTitle(final JSFunction elt)
-				{
-					return "Choose Overriden Function of " + elt.getName();
-				}
-
-				@Override
-				protected Query<JSFunction> search(final JSFunction elt)
-				{
-					return doFindOverridenFunctionStatic(elt);
-				}
-			};
-	private final boolean myUnitTestMode = ApplicationManager.getApplication().isUnitTestMode();
-
-
-	public static Query<JSFunction> doFindOverridenFunctionStatic(final JSFunction elt)
-	{
-		PsiElement parent = JSResolveUtil.findParent(elt);
-		if(parent instanceof JSClass)
-		{
-			return JSFunctionsSearch.searchOverridingFunctions(elt, true);
-		}
-		final String qName = JSResolveUtil.getQNameToStartHierarchySearch(elt);
-		if(qName != null)
-		{
-			final ArrayList<JSFunction> result = new ArrayList<>();
-
-			return new CollectionQuery<>(result);
-		}
-
-		return new CollectionQuery<>(Collections.<JSFunction>emptyList());
-	}
-
-	private static final BasicGutterIconNavigationHandler<JSFunction> ourImplementingFunctionsNavHandler = new
-			BasicGutterIconNavigationHandler<JSFunction>()
-			{
-				@Override
-				protected String getTitle(final JSFunction elt)
-				{
-					return "Choose Implementation of " + elt.getName();
-				}
-
-				@Override
-				protected Query<JSFunction> search(final JSFunction elt)
-				{
-					return JSFunctionsSearch.searchImplementingFunctions(elt, true);
-				}
-			};
-
-	public static Key<Boolean> ourParticipatesInHierarchyKey = Key.create("js.named.item.participates.in.hierarchy");
-
-	@Override
-	public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element)
-	{
-		if(element instanceof JSFunction)
-		{
-			final JSFunction function = (JSFunction) element;
-			function.putUserData(ourParticipatesInHierarchyKey, null);
-			if(function.getNameIdentifier() == null)
-			{
-				return null;
-			}
-			final String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
-
-			if(qName != null)
-			{
-				PsiElement parentNode = element.getParent();
-				if(parentNode instanceof JSFile)
-				{
-					JSClass xmlBackedClass = JSResolveUtil.getXmlBackedClass((JSFile) parentNode);
-					if(xmlBackedClass != null)
-					{
-						parentNode = xmlBackedClass;
-					}
-				}
-
-				if(element instanceof JSFunctionExpression)
-				{
-					parentNode = element.getContainingFile();
-				}
-
-				final MyOverrideHandler overrideHandler = new MyOverrideHandler();
-				final String typeName = parentNode instanceof JSClass ? ((JSClass) parentNode).getQualifiedName() : qName;
-				JSResolveUtil.iterateType(function, parentNode, typeName, overrideHandler);
-
-				if(overrideHandler.className != null)
-				{
-					final PsiElement parentNode1 = parentNode;
-					function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
-
-					return new LineMarkerInfo<>(function, function.getNameIdentifier().getTextRange().getStartOffset(), AllIcons.Gutter.OverridingMethod,
-							Pass.UPDATE_ALL, psiElement -> OVERRIDES_METHOD_IN + overrideHandler.className, new GutterIconNavigationHandler<JSFunction>()
-					{
-						@Override
-						public void navigate(final MouseEvent e, final JSFunction elt)
-						{
-							final Set<NavigationItem> results = new HashSet<>();
-							JSResolveUtil.iterateType(function, parentNode1, typeName, new JSResolveUtil.OverrideHandler()
-							{
-								@Override
-								public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className)
-								{
-									for(PsiElement e : processor.getResults())
-									{
-										results.add((NavigationItem) e);
-									}
-									return true;
-								}
-							});
-
-							if(results.size() == 1)
-							{
-								results.iterator().next().navigate(true);
-							}
-							else if(results.size() > 1)
-							{
-								PopupNavigationUtil.getPsiElementPopup(results.toArray(new PsiElement[results.size()]), "Choose super class or interface").show(new RelativePoint
-										(e));
-							}
-						}
-					}
-					);
-				}
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @Nonnull final Collection<LineMarkerInfo> result)
-	{
-		final Map<String, Set<JSFunction>> jsFunctionsToProcess = new HashMap<>();
-		final Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new HashMap<>();
-
-		for(final PsiElement el : elements)
-		{
-			ProgressManager.getInstance().checkCanceled();
-
-			if(el instanceof JSFunction)
-			{
-				final JSFunction function = (JSFunction) el;
-				if(isNotApplicableForOverride(function))
-				{
-					continue;
-				}
-
-				PsiElement parent = function.getParent();
-				if(parent instanceof JSFile)
-				{
-					parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
-				}
-
-				if(parent instanceof JSClass)
-				{
-					final JSClass clazz = (JSClass) parent;
-
-					Set<JSFunction> functions = jsMethodsToProcess.get(clazz);
-					if(functions == null)
-					{
-						functions = new HashSet<>();
-						jsMethodsToProcess.put(clazz, functions);
-					}
-
-					functions.add(function);
-				}
-				else if(parent instanceof JSFile || function instanceof JSFunctionExpression)
-				{
-					final String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
-					if(qName != null)
-					{
-						Set<JSFunction> functions = jsFunctionsToProcess.get(qName);
-
-						if(functions == null)
-						{
-							functions = new HashSet<>();
-							jsFunctionsToProcess.put(qName, functions);
-						}
-
-						functions.add(function);
-					}
-				}
-			}
-			else if(el instanceof JSClass)
-			{
-				final JSClass clazz = (JSClass) el;
-				if(!jsMethodsToProcess.containsKey(clazz))
-				{
-					jsMethodsToProcess.put(clazz, null);
-				}
-			}
-		}
-
-		for(Map.Entry<JSClass, Set<JSFunction>> entry : jsMethodsToProcess.entrySet())
-		{
-			ProgressManager.getInstance().checkCanceled();
-			final JSClass clazz = entry.getKey();
-			final Set<JSFunction> methods = entry.getValue();
-
-			Query<JSClass> classQuery = JSClassSearch.searchClassInheritors(clazz, methods != null);
-
-			classQuery.forEach(new Processor<JSClass>()
-			{
-				boolean addedClassMarker;
-				final Set<JSFunction> methodsClone = methods == null || clazz.isInterface() ? null : new HashSet<>(methods);
-
-				@Override
-				public boolean process(final JSClass jsClass)
-				{
-					if(!addedClassMarker)
-					{
-						result.add(new LineMarkerInfo<>(clazz, clazz.getTextOffset(), AllIcons.Gutter.OverridenMethod, Pass.LINE_MARKERS,
-								ourClassInheritorsTooltipProvider, ourClassInheritorsNavHandler));
-						addedClassMarker = true;
-					}
-
-					if(methodsClone != null)
-					{
-						for(final Iterator<JSFunction> functionIterator = methodsClone.iterator(); functionIterator.hasNext(); )
-						{
-							final JSFunction function = functionIterator.next();
-
-							final JSFunction byName = jsClass.findFunctionByNameAndKind(function.getName(), function.getKind());
-							if(byName != null && !isNotApplicableForOverride(byName))
-							{
-								// TODO: more correct check for override
-								function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
-								result.add(new LineMarkerInfo<>(function, function.getTextOffset(), AllIcons.Gutter.OverridenMethod, Pass.LINE_MARKERS,
-										ourOverriddenFunctionsTooltipProvider, ourOverriddenFunctionsNavHandler));
-								functionIterator.remove();
-							}
-						}
-					}
-					return methodsClone != null && !methodsClone.isEmpty();
-				}
-			});
-
-
-			if(clazz.isInterface())
-			{
-				classQuery = JSClassSearch.searchInterfaceImplementations(clazz, false);
-
-				if(classQuery.findFirst() != null)
-				{
-					result.add(new LineMarkerInfo<>(clazz, clazz.getTextOffset(), AllIcons.Gutter.ImplementedMethod, Pass.LINE_MARKERS,
-							ourImplementedInterfacesTooltipProvider, ourInterfaceImplementationsNavHandler));
-				}
-			}
-
-			if(methods == null)
-			{
-				continue;
-			}
-
-			for(final JSFunction function : methods)
-			{
-
-				if(clazz.isInterface())
-				{
-					final Query<JSFunction> query = JSFunctionsSearch.searchImplementingFunctions(function, false);
-					if(query.findFirst() != null)
-					{
-						function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
-						result.add(new LineMarkerInfo<>(function, function.getTextOffset(), AllIcons.Gutter.ImplementedMethod, Pass.LINE_MARKERS,
-								ourImplementingFunctionsTooltipProvider, ourImplementingFunctionsNavHandler));
-					}
-				}
-				else
-				{
-					final JSAttributeList attributeList = function.getAttributeList();
-					if(attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE))
-					{
-						continue;
-					}
-
-					final JSFunction implementedFunction = findImplementedFunction(function);
-					if(implementedFunction != null)
-					{
-						function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
-
-						result.add(new LineMarkerInfo<>(function, function.getTextOffset(), AllIcons.Gutter.ImplementingMethod, Pass.LINE_MARKERS,
-								jsFunction -> "Implementation of " + jsFunction.getName() + " in " + ((NavigationItem) implementedFunction.getParent()).getName(), new
-								GutterIconNavigationHandler<JSFunction>()
-						{
-							@Override
-							public void navigate(final MouseEvent e, final JSFunction elt)
-							{
-								final JSFunction implementedFunction = findImplementedFunction(elt);
-								if(implementedFunction != null)
-								{
-									implementedFunction.navigate(true);
-								}
-							}
-						}
-						));
-					}
-				}
-			}
-		}
-	}
-
-	private static boolean isClass(final PsiElement element)
-	{
-		if(element instanceof JSClass)
-		{
-			return true;
-		}
-		if(element instanceof JSFile && element.getContext() != null)
-		{
-			return true;
-		}
-		return false;
-	}
-
-	@Nullable
-	private static JSFunction findImplementedFunction(JSFunction implementingFunction)
-	{
-		PsiElement clazz = implementingFunction.getParent();
-		if(!(clazz instanceof JSClass))
-		{
-			clazz = JSResolveUtil.getClassReferenceForXmlFromContext(clazz);
-		}
-		if(!(clazz instanceof JSClass))
-		{
-			return null;
-		}
-		final Ref<JSFunction> result = new Ref<>();
-		JSResolveUtil.processInterfaceMethods((JSClass) clazz, new JSResolveUtil.CollectMethodsToImplementProcessor(implementingFunction.getName(),
-				implementingFunction)
-		{
-			@Override
-			protected boolean process(final ResolveProcessor processor)
-			{
-				result.set((JSFunction) processor.getResult());
-				return false;
-			}
-		});
-		return result.get();
-	}
-
-	private static boolean isNotApplicableForOverride(final JSFunction function)
-	{
-		final JSAttributeList attributeList = function.getAttributeList();
-
-		return function.isConstructor() || (attributeList != null && (attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE ||
-				attributeList.hasModifier(JSAttributeList.ModifierType.STATIC) ||
-				attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)));
-	}
-
-	static class MyOverrideHandler implements JSResolveUtil.OverrideHandler
-	{
-		String className;
-
-		@Override
-		public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className)
-		{
-			this.className = className;
-			return true;
-		}
-	}
-
-	private abstract static class BasicGutterIconNavigationHandler<T extends PsiElement> implements GutterIconNavigationHandler<T>
-	{
-		@Override
-		public void navigate(final MouseEvent e, final T elt)
-		{
-			final List<NavigatablePsiElement> navElements = new ArrayList<>();
-			Query<T> elementQuery = search(elt);
-			if(elementQuery == null)
-			{
-				return;
-			}
-			elementQuery.forEach(new Processor<T>()
-			{
-				@Override
-				public boolean process(final T psiElement)
-				{
-					if(psiElement instanceof NavigatablePsiElement)
-					{
-						navElements.add((NavigatablePsiElement) psiElement);
-					}
-					return true;
-				}
-			});
-			final NavigatablePsiElement[] methods = navElements.toArray(new NavigatablePsiElement[navElements.size()]);
-			PsiElementListNavigator.openTargets(e, methods, getTitle(elt), "", new DefaultPsiElementCellRenderer());
-		}
-
-		protected abstract String getTitle(T elt);
-
-		@Nullable
-		protected abstract Query<T> search(T elt);
-	}
-
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JavaScriptLineMarkerProvider implements LineMarkerProvider {
+    private static final String OVERRIDES_METHOD_IN = "overrides method in ";
+
+    private static final Function<JSClass, String> ourClassInheritorsTooltipProvider = clazz -> "Has subclasses";
+
+    private static final Function<JSClass, String> ourImplementedInterfacesTooltipProvider = clazz -> "Has implementations";
+
+    private static final Function<JSFunction, String> ourOverriddenFunctionsTooltipProvider = psiElement -> "Is overridden";
+
+    private static final Function<JSFunction, String> ourImplementingFunctionsTooltipProvider = psiElement -> "Is implemented";
+
+    private static final BasicGutterIconNavigationHandler<JSClass> ourClassInheritorsNavHandler =
+        new BasicGutterIconNavigationHandler<JSClass>() {
+            @Override
+            protected String getTitle(final JSClass elt) {
+                return "Choose Subclass of " + elt.getName();
+            }
+
+            @Override
+            protected Query<JSClass> search(final JSClass elt) {
+                return JSClassSearch.searchClassInheritors(elt, true);
+            }
+        };
+
+    private static final BasicGutterIconNavigationHandler<JSClass> ourInterfaceImplementationsNavHandler = new
+        BasicGutterIconNavigationHandler<JSClass>() {
+            @Override
+            protected String getTitle(final JSClass elt) {
+                return "Choose Implementation of " + elt.getName();
+            }
+
+            @Override
+            protected Query<JSClass> search(final JSClass elt) {
+                return JSClassSearch.searchInterfaceImplementations(elt, true);
+            }
+        };
+
+    private static final BasicGutterIconNavigationHandler<JSFunction> ourOverriddenFunctionsNavHandler = new
+        BasicGutterIconNavigationHandler<JSFunction>() {
+            @Override
+            protected String getTitle(final JSFunction elt) {
+                return "Choose Overriden Function of " + elt.getName();
+            }
+
+            @Override
+            protected Query<JSFunction> search(final JSFunction elt) {
+                return doFindOverridenFunctionStatic(elt);
+            }
+        };
+    private final boolean myUnitTestMode = ApplicationManager.getApplication().isUnitTestMode();
+
+
+    public static Query<JSFunction> doFindOverridenFunctionStatic(final JSFunction elt) {
+        PsiElement parent = JSResolveUtil.findParent(elt);
+        if (parent instanceof JSClass) {
+            return JSFunctionsSearch.searchOverridingFunctions(elt, true);
+        }
+        final String qName = JSResolveUtil.getQNameToStartHierarchySearch(elt);
+        if (qName != null) {
+            final ArrayList<JSFunction> result = new ArrayList<>();
+
+            return new CollectionQuery<>(result);
+        }
+
+        return new CollectionQuery<>(Collections.<JSFunction>emptyList());
+    }
+
+    private static final BasicGutterIconNavigationHandler<JSFunction> ourImplementingFunctionsNavHandler = new
+        BasicGutterIconNavigationHandler<JSFunction>() {
+            @Override
+            protected String getTitle(final JSFunction elt) {
+                return "Choose Implementation of " + elt.getName();
+            }
+
+            @Override
+            protected Query<JSFunction> search(final JSFunction elt) {
+                return JSFunctionsSearch.searchImplementingFunctions(elt, true);
+            }
+        };
+
+    public static Key<Boolean> ourParticipatesInHierarchyKey = Key.create("js.named.item.participates.in.hierarchy");
+
+    @Override
+    public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element) {
+        if (element instanceof JSFunction) {
+            final JSFunction function = (JSFunction)element;
+            function.putUserData(ourParticipatesInHierarchyKey, null);
+            if (function.getNameIdentifier() == null) {
+                return null;
+            }
+            final String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
+
+            if (qName != null) {
+                PsiElement parentNode = element.getParent();
+                if (parentNode instanceof JSFile) {
+                    JSClass xmlBackedClass = JSResolveUtil.getXmlBackedClass((JSFile)parentNode);
+                    if (xmlBackedClass != null) {
+                        parentNode = xmlBackedClass;
+                    }
+                }
+
+                if (element instanceof JSFunctionExpression) {
+                    parentNode = element.getContainingFile();
+                }
+
+                final MyOverrideHandler overrideHandler = new MyOverrideHandler();
+                final String typeName = parentNode instanceof JSClass ? ((JSClass)parentNode).getQualifiedName() : qName;
+                JSResolveUtil.iterateType(function, parentNode, typeName, overrideHandler);
+
+                if (overrideHandler.className != null) {
+                    final PsiElement parentNode1 = parentNode;
+                    function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
+
+                    return new LineMarkerInfo<>(
+                        function,
+                        function.getNameIdentifier().getTextRange().getStartOffset(),
+                        AllIcons.Gutter.OverridingMethod,
+                        Pass.UPDATE_ALL,
+                        psiElement -> OVERRIDES_METHOD_IN + overrideHandler.className,
+                        new GutterIconNavigationHandler<JSFunction>() {
+                            @Override
+                            public void navigate(final MouseEvent e, final JSFunction elt) {
+                                final Set<NavigationItem> results = new HashSet<>();
+                                JSResolveUtil.iterateType(
+                                    function,
+                                    parentNode1,
+                                    typeName,
+                                    new JSResolveUtil.OverrideHandler() {
+                                        @Override
+                                        public boolean process(
+                                            final ResolveProcessor processor,
+                                            final PsiElement scope,
+                                            final String className
+                                        ) {
+                                            for (PsiElement e : processor.getResults()) {
+                                                results.add((NavigationItem)e);
+                                            }
+                                            return true;
+                                        }
+                                    }
+                                );
+
+                                if (results.size() == 1) {
+                                    results.iterator().next().navigate(true);
+                                }
+                                else if (results.size() > 1) {
+                                    PopupNavigationUtil.getPsiElementPopup(
+                                        results.toArray(new PsiElement[results.size()]),
+                                        "Choose super class or interface"
+                                    ).show(new RelativePoint(e));
+                                }
+                            }
+                        }
+                    );
+                }
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @Nonnull final Collection<LineMarkerInfo> result) {
+        final Map<String, Set<JSFunction>> jsFunctionsToProcess = new HashMap<>();
+        final Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new HashMap<>();
+
+        for (final PsiElement el : elements) {
+            ProgressManager.getInstance().checkCanceled();
+
+            if (el instanceof JSFunction) {
+                final JSFunction function = (JSFunction)el;
+                if (isNotApplicableForOverride(function)) {
+                    continue;
+                }
+
+                PsiElement parent = function.getParent();
+                if (parent instanceof JSFile) {
+                    parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+                }
+
+                if (parent instanceof JSClass) {
+                    final JSClass clazz = (JSClass)parent;
+
+                    Set<JSFunction> functions = jsMethodsToProcess.get(clazz);
+                    if (functions == null) {
+                        functions = new HashSet<>();
+                        jsMethodsToProcess.put(clazz, functions);
+                    }
+
+                    functions.add(function);
+                }
+                else if (parent instanceof JSFile || function instanceof JSFunctionExpression) {
+                    final String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
+                    if (qName != null) {
+                        Set<JSFunction> functions = jsFunctionsToProcess.get(qName);
+
+                        if (functions == null) {
+                            functions = new HashSet<>();
+                            jsFunctionsToProcess.put(qName, functions);
+                        }
+
+                        functions.add(function);
+                    }
+                }
+            }
+            else if (el instanceof JSClass) {
+                final JSClass clazz = (JSClass)el;
+                if (!jsMethodsToProcess.containsKey(clazz)) {
+                    jsMethodsToProcess.put(clazz, null);
+                }
+            }
+        }
+
+        for (Map.Entry<JSClass, Set<JSFunction>> entry : jsMethodsToProcess.entrySet()) {
+            ProgressManager.getInstance().checkCanceled();
+            final JSClass clazz = entry.getKey();
+            final Set<JSFunction> methods = entry.getValue();
+
+            Query<JSClass> classQuery = JSClassSearch.searchClassInheritors(clazz, methods != null);
+
+            classQuery.forEach(new Processor<JSClass>() {
+                boolean addedClassMarker;
+                final Set<JSFunction> methodsClone = methods == null || clazz.isInterface() ? null : new HashSet<>(methods);
+
+                @Override
+                public boolean process(final JSClass jsClass) {
+                    if (!addedClassMarker) {
+                        result.add(new LineMarkerInfo<>(
+                            clazz,
+                            clazz.getTextOffset(),
+                            AllIcons.Gutter.OverridenMethod,
+                            Pass.LINE_MARKERS,
+                            ourClassInheritorsTooltipProvider,
+                            ourClassInheritorsNavHandler
+                        ));
+                        addedClassMarker = true;
+                    }
+
+                    if (methodsClone != null) {
+                        for (final Iterator<JSFunction> functionIterator = methodsClone.iterator(); functionIterator.hasNext(); ) {
+                            final JSFunction function = functionIterator.next();
+
+                            final JSFunction byName = jsClass.findFunctionByNameAndKind(function.getName(), function.getKind());
+                            if (byName != null && !isNotApplicableForOverride(byName)) {
+                                // TODO: more correct check for override
+                                function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
+                                result.add(new LineMarkerInfo<>(
+                                    function,
+                                    function.getTextOffset(),
+                                    AllIcons.Gutter.OverridenMethod,
+                                    Pass.LINE_MARKERS,
+                                    ourOverriddenFunctionsTooltipProvider,
+                                    ourOverriddenFunctionsNavHandler
+                                ));
+                                functionIterator.remove();
+                            }
+                        }
+                    }
+                    return methodsClone != null && !methodsClone.isEmpty();
+                }
+            });
+
+
+            if (clazz.isInterface()) {
+                classQuery = JSClassSearch.searchInterfaceImplementations(clazz, false);
+
+                if (classQuery.findFirst() != null) {
+                    result.add(new LineMarkerInfo<>(
+                        clazz,
+                        clazz.getTextOffset(),
+                        AllIcons.Gutter.ImplementedMethod,
+                        Pass.LINE_MARKERS,
+                        ourImplementedInterfacesTooltipProvider,
+                        ourInterfaceImplementationsNavHandler
+                    ));
+                }
+            }
+
+            if (methods == null) {
+                continue;
+            }
+
+            for (final JSFunction function : methods) {
+                if (clazz.isInterface()) {
+                    final Query<JSFunction> query = JSFunctionsSearch.searchImplementingFunctions(function, false);
+                    if (query.findFirst() != null) {
+                        function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
+                        result.add(new LineMarkerInfo<>(
+                            function,
+                            function.getTextOffset(),
+                            AllIcons.Gutter.ImplementedMethod,
+                            Pass.LINE_MARKERS,
+                            ourImplementingFunctionsTooltipProvider,
+                            ourImplementingFunctionsNavHandler
+                        ));
+                    }
+                }
+                else {
+                    final JSAttributeList attributeList = function.getAttributeList();
+                    if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
+                        continue;
+                    }
+
+                    final JSFunction implementedFunction = findImplementedFunction(function);
+                    if (implementedFunction != null) {
+                        function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
+
+                        result.add(new LineMarkerInfo<>(
+                            function,
+                            function.getTextOffset(),
+                            AllIcons.Gutter.ImplementingMethod,
+                            Pass.LINE_MARKERS,
+                            jsFunction -> "Implementation of " + jsFunction.getName() + " in " +
+                                ((NavigationItem)implementedFunction.getParent()).getName(),
+                            new GutterIconNavigationHandler<JSFunction>() {
+                                @Override
+                                public void navigate(final MouseEvent e, final JSFunction elt) {
+                                    final JSFunction implementedFunction = findImplementedFunction(elt);
+                                    if (implementedFunction != null) {
+                                        implementedFunction.navigate(true);
+                                    }
+                                }
+                            }
+                        ));
+                    }
+                }
+            }
+        }
+    }
+
+    private static boolean isClass(final PsiElement element) {
+        if (element instanceof JSClass) {
+            return true;
+        }
+        if (element instanceof JSFile && element.getContext() != null) {
+            return true;
+        }
+        return false;
+    }
+
+    @Nullable
+    private static JSFunction findImplementedFunction(JSFunction implementingFunction) {
+        PsiElement clazz = implementingFunction.getParent();
+        if (!(clazz instanceof JSClass)) {
+            clazz = JSResolveUtil.getClassReferenceForXmlFromContext(clazz);
+        }
+        if (!(clazz instanceof JSClass)) {
+            return null;
+        }
+        final Ref<JSFunction> result = new Ref<>();
+        JSResolveUtil.processInterfaceMethods((JSClass)clazz, new JSResolveUtil.CollectMethodsToImplementProcessor(
+            implementingFunction.getName(),
+            implementingFunction
+        ) {
+            @Override
+            protected boolean process(final ResolveProcessor processor) {
+                result.set((JSFunction)processor.getResult());
+                return false;
+            }
+        });
+        return result.get();
+    }
+
+    private static boolean isNotApplicableForOverride(final JSFunction function) {
+        final JSAttributeList attributeList = function.getAttributeList();
+
+        return function.isConstructor() || (attributeList != null
+            && (attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE
+            || attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
+            || attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)));
+    }
+
+    static class MyOverrideHandler implements JSResolveUtil.OverrideHandler {
+        String className;
+
+        @Override
+        public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className) {
+            this.className = className;
+            return true;
+        }
+    }
+
+    private abstract static class BasicGutterIconNavigationHandler<T extends PsiElement> implements GutterIconNavigationHandler<T> {
+        @Override
+        public void navigate(final MouseEvent e, final T elt) {
+            final List<NavigatablePsiElement> navElements = new ArrayList<>();
+            Query<T> elementQuery = search(elt);
+            if (elementQuery == null) {
+                return;
+            }
+            elementQuery.forEach(new Processor<T>() {
+                @Override
+                public boolean process(final T psiElement) {
+                    if (psiElement instanceof NavigatablePsiElement) {
+                        navElements.add((NavigatablePsiElement)psiElement);
+                    }
+                    return true;
+                }
+            });
+            final NavigatablePsiElement[] methods = navElements.toArray(new NavigatablePsiElement[navElements.size()]);
+            PsiElementListNavigator.openTargets(e, methods, getTitle(elt), "", new DefaultPsiElementCellRenderer());
+        }
+
+        protected abstract String getTitle(T elt);
+
+        @Nullable
+        protected abstract Query<T> search(T elt);
+    }
+
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java
index 188d0423..f3a84c6b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java
@@ -23,6 +23,5 @@
  * Time: 8:09:53 PM
  * To change this template use File | Settings | File Templates.
  */
-public class Marker
-{
+public class Marker {
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
index 90e1d7b8..1d9e7b55 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
@@ -38,114 +38,96 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JavaScriptGotoSuperHandler implements GotoSuperActionHander
-{
-	@Override
-	public void invoke(final Project project, final Editor editor, final PsiFile file)
-	{
-		final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
-		if(at == null)
-		{
-			return;
-		}
-		JSNamedElement namedElement = PsiTreeUtil.getParentOfType(at, JSNamedElement.class);
-		PsiElement parent = namedElement != null ? namedElement.getParent() : null;
+public class JavaScriptGotoSuperHandler implements GotoSuperActionHander {
+    @Override
+    public void invoke(final Project project, final Editor editor, final PsiFile file) {
+        final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
+        if (at == null) {
+            return;
+        }
+        JSNamedElement namedElement = PsiTreeUtil.getParentOfType(at, JSNamedElement.class);
+        PsiElement parent = namedElement != null ? namedElement.getParent() : null;
 
-		if(namedElement instanceof JSDefinitionExpression)
-		{
-			if(parent instanceof JSAssignmentExpression)
-			{
-				PsiElement rOperand = ((JSAssignmentExpression) parent).getROperand();
-				if(rOperand instanceof JSFunctionExpression)
-				{
-					namedElement = (JSNamedElement) rOperand;
-				}
-			}
-		}
+        if (namedElement instanceof JSDefinitionExpression && parent instanceof JSAssignmentExpression) {
+            PsiElement rOperand = ((JSAssignmentExpression)parent).getROperand();
+            if (rOperand instanceof JSFunctionExpression) {
+                namedElement = (JSNamedElement)rOperand;
+            }
+        }
 
-		if(namedElement instanceof JSFunction)
-		{
-			final JSFunction function = (JSFunction) namedElement;
-			final String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
+        if (namedElement instanceof JSFunction) {
+            final JSFunction function = (JSFunction)namedElement;
+            final String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
 
-			if(qName != null)
-			{
-				if(parent instanceof JSFile)
-				{
-					JSClass xmlBackedClass = JSResolveUtil.getXmlBackedClass((JSFile) parent);
-					if(xmlBackedClass != null)
-					{
-						parent = xmlBackedClass;
-					}
-				}
-				boolean result = JSResolveUtil.iterateType(function, parent instanceof JSClass ? parent : parent.getContainingFile(), qName,
-						new JSResolveUtil.OverrideHandler()
-				{
-					@Override
-					public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className)
-					{
-						((NavigationItem) processor.getResult()).navigate(true);
-						return false;
-					}
-				});
+            if (qName != null) {
+                if (parent instanceof JSFile) {
+                    JSClass xmlBackedClass = JSResolveUtil.getXmlBackedClass((JSFile)parent);
+                    if (xmlBackedClass != null) {
+                        parent = xmlBackedClass;
+                    }
+                }
+                boolean result = JSResolveUtil.iterateType(
+                    function,
+                    parent instanceof JSClass ? parent : parent.getContainingFile(),
+                    qName,
+                    new JSResolveUtil.OverrideHandler() {
+                        @Override
+                        public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className) {
+                            ((NavigationItem)processor.getResult()).navigate(true);
+                            return false;
+                        }
+                    }
+                );
 
-				if(!result)
-				{
-					return;
-				}
-			}
+                if (!result) {
+                    return;
+                }
+            }
 
-			if(parent instanceof JSClass)
-			{
-				JSResolveUtil.processInterfaceMethods((JSClass) parent, new JSResolveUtil.CollectMethodsToImplementProcessor(function.getName(), function)
-				{
-					@Override
-					protected boolean process(final ResolveProcessor processor)
-					{
-						((NavigationItem) processor.getResult()).navigate(true);
-						return true;
-					}
-				});
-			}
-		}
-		else if(namedElement instanceof JSClass)
-		{
-			final JSClass clazz = (JSClass) namedElement;
-			final JSClass[] classes = clazz.getSupers();
+            if (parent instanceof JSClass) {
+                JSResolveUtil.processInterfaceMethods(
+                    (JSClass)parent,
+                    new JSResolveUtil.CollectMethodsToImplementProcessor(function.getName(), function) {
+                        @Override
+                        protected boolean process(final ResolveProcessor processor) {
+                            ((NavigationItem)processor.getResult()).navigate(true);
+                            return true;
+                        }
+                    }
+                );
+            }
+        }
+        else if (namedElement instanceof JSClass) {
+            final JSClass clazz = (JSClass)namedElement;
+            final JSClass[] classes = clazz.getSupers();
 
-			if(classes.length == 0)
-			{
-				return;
-			}
-			if(classes.length == 1)
-			{
-				classes[0].navigate(true);
-			}
-			else
-			{
-				JBPopup psiElementPopup = PopupNavigationUtil.getPsiElementPopup(classes, "Choose super class or interface");
+            if (classes.length == 0) {
+                return;
+            }
+            if (classes.length == 1) {
+                classes[0].navigate(true);
+            }
+            else {
+                JBPopup psiElementPopup = PopupNavigationUtil.getPsiElementPopup(classes, "Choose super class or interface");
 
-				EditorPopupHelper.getInstance().showPopupInBestPositionFor(editor, psiElementPopup);
-			}
-		}
-	}
+                EditorPopupHelper.getInstance().showPopupInBestPositionFor(editor, psiElementPopup);
+            }
+        }
+    }
 
-	@Override
-	public boolean startInWriteAction()
-	{
-		return false;
-	}
+    @Override
+    public boolean startInWriteAction() {
+        return false;
+    }
 
-	@Override
-	public boolean isValidFor(final Editor editor, final PsiFile file)
-	{
-		return true;
-	}
+    @Override
+    public boolean isValidFor(final Editor editor, final PsiFile file) {
+        return true;
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
index 3ead17b8..ef87fc29 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
@@ -36,48 +36,50 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.Collection;
 
 /**
  * @author maxim
  */
 @ExtensionImpl
-public class JavaScriptSymbolContributor implements GotoSymbolContributor
-{
-	@Override
-	public void processNames(@Nonnull Processor<String> processor, @Nonnull SearchScope searchScope, @Nullable IdFilter idFilter)
-	{
-		StubIndex.getInstance().processAllKeys(JavaScriptIndexKeys.ELEMENTS_BY_NAME, processor, (GlobalSearchScope) searchScope, idFilter);
+public class JavaScriptSymbolContributor implements GotoSymbolContributor {
+    @Override
+    public void processNames(@Nonnull Processor<String> processor, @Nonnull SearchScope searchScope, @Nullable IdFilter idFilter) {
+        StubIndex.getInstance().processAllKeys(JavaScriptIndexKeys.ELEMENTS_BY_NAME, processor, (GlobalSearchScope)searchScope, idFilter);
 
-		FileBasedIndex.getInstance().processAllKeys(FilenameIndex.NAME, new Processor<String>()
-		{
-			@Override
-			public boolean process(String s)
-			{
-				if(JavaScriptSupportLoader.isFlexMxmFile(s))
-				{
-					return processor.process(FileUtil.getNameWithoutExtension(s));
-				}
-				return true;
-			}
-		}, searchScope, idFilter);
-	}
+        FileBasedIndex.getInstance().processAllKeys(
+            FilenameIndex.NAME,
+            new Processor<String>() {
+                @Override
+                public boolean process(String s) {
+                    if (JavaScriptSupportLoader.isFlexMxmFile(s)) {
+                        return processor.process(FileUtil.getNameWithoutExtension(s));
+                    }
+                    return true;
+                }
+            },
+            searchScope,
+            idFilter
+        );
+    }
 
-	@Override
-	public void processElementsWithName(@Nonnull String name, @Nonnull Processor<NavigationItem> processor, @Nonnull FindSymbolParameters findSymbolParameters)
-	{
-		Project project = findSymbolParameters.getProject();
+    @Override
+    public void processElementsWithName(
+        @Nonnull String name,
+        @Nonnull Processor<NavigationItem> processor,
+        @Nonnull FindSymbolParameters findSymbolParameters
+    ) {
+        Project project = findSymbolParameters.getProject();
 
-		GlobalSearchScope scope = (GlobalSearchScope) findSymbolParameters.getSearchScope();
+        GlobalSearchScope scope = (GlobalSearchScope)findSymbolParameters.getSearchScope();
 
-		Collection<JSQualifiedNamedElement> result = JSResolveUtil.findElementsByName(name, project, scope);
+        Collection<JSQualifiedNamedElement> result = JSResolveUtil.findElementsByName(name, project, scope);
 
-		for(JSQualifiedNamedElement element : result)
-		{
-			if(!processor.process(element))
-			{
-				break;
-			}
-		}
-	}
+        for (JSQualifiedNamedElement element : result) {
+            if (!processor.process(element)) {
+                break;
+            }
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BaseIntroduceSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BaseIntroduceSettings.java
index 383007dd..d74986cb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BaseIntroduceSettings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BaseIntroduceSettings.java
@@ -19,11 +19,10 @@
 /**
  * @author ven
  */
-public interface BaseIntroduceSettings
-{
-	boolean isReplaceAllOccurences();
+public interface BaseIntroduceSettings {
+    boolean isReplaceAllOccurences();
 
-	String getVariableName();
+    String getVariableName();
 
-	String getVariableType();
+    String getVariableType();
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
index 1eb1bb04..6a76f98a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
@@ -26,17 +26,14 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class BasicJavascriptNamesValidator extends JSNamesValidator
-{
-	public BasicJavascriptNamesValidator()
-	{
-		super(DialectOptionHolder.dummy());
-	}
+public class BasicJavascriptNamesValidator extends JSNamesValidator {
+    public BasicJavascriptNamesValidator() {
+        super(DialectOptionHolder.dummy());
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
index 45f7c8d6..efbc9d22 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
@@ -27,78 +27,66 @@
 /**
  * @author ven
  */
-public abstract class JSBaseClassBasedIntroduceDialog extends JSBaseIntroduceDialog
-{
-	private static JSAttributeList.AccessType lastType;
+public abstract class JSBaseClassBasedIntroduceDialog extends JSBaseIntroduceDialog {
+    private static JSAttributeList.AccessType lastType;
 
-	protected JSBaseClassBasedIntroduceDialog(
-		final Project project,
-		final JSExpression[] occurences,
-		final JSExpression mainOccurence,
-		LocalizeValue title
-	)
-	{
-		super(project, occurences, mainOccurence, title);
-	}
+    protected JSBaseClassBasedIntroduceDialog(
+        final Project project,
+        final JSExpression[] occurences,
+        final JSExpression mainOccurence,
+        LocalizeValue title
+    ) {
+        super(project, occurences, mainOccurence, title);
+    }
 
-	@Override
-	protected void doInit()
-	{
-		super.doInit();
+    @Override
+    protected void doInit() {
+        super.doInit();
 
-		final ButtonGroup group = new ButtonGroup();
-		group.add(getPrivateRadioButton());
-		group.add(getPublicRadioButton());
-		group.add(getPackageLocalRadioButton());
-		group.add(getProtectedRadioButton());
+        final ButtonGroup group = new ButtonGroup();
+        group.add(getPrivateRadioButton());
+        group.add(getPublicRadioButton());
+        group.add(getPackageLocalRadioButton());
+        group.add(getProtectedRadioButton());
 
-		if(lastType == JSAttributeList.AccessType.PRIVATE || lastType == null)
-		{
-			getPrivateRadioButton().setSelected(true);
-		}
-		else if(lastType == JSAttributeList.AccessType.PROTECTED)
-		{
-			getProtectedRadioButton().setSelected(true);
-		}
-		else if(lastType == JSAttributeList.AccessType.PACKAGE_LOCAL)
-		{
-			getPackageLocalRadioButton().setSelected(true);
-		}
-		else if(lastType == JSAttributeList.AccessType.PUBLIC)
-		{
-			getPublicRadioButton().setSelected(true);
-		}
-	}
+        if (lastType == JSAttributeList.AccessType.PRIVATE || lastType == null) {
+            getPrivateRadioButton().setSelected(true);
+        }
+        else if (lastType == JSAttributeList.AccessType.PROTECTED) {
+            getProtectedRadioButton().setSelected(true);
+        }
+        else if (lastType == JSAttributeList.AccessType.PACKAGE_LOCAL) {
+            getPackageLocalRadioButton().setSelected(true);
+        }
+        else if (lastType == JSAttributeList.AccessType.PUBLIC) {
+            getPublicRadioButton().setSelected(true);
+        }
+    }
 
-	public JSAttributeList.AccessType getAccessType()
-	{
-		JSAttributeList.AccessType type = null;
-		if(getPublicRadioButton().isSelected())
-		{
-			type = JSAttributeList.AccessType.PUBLIC;
-		}
-		if(getPrivateRadioButton().isSelected())
-		{
-			type = JSAttributeList.AccessType.PRIVATE;
-		}
-		if(getPackageLocalRadioButton().isSelected())
-		{
-			type = JSAttributeList.AccessType.PACKAGE_LOCAL;
-		}
-		if(getProtectedRadioButton().isSelected())
-		{
-			type = JSAttributeList.AccessType.PROTECTED;
-		}
-		assert type != null;
-		lastType = type;
-		return type;
-	}
+    public JSAttributeList.AccessType getAccessType() {
+        JSAttributeList.AccessType type = null;
+        if (getPublicRadioButton().isSelected()) {
+            type = JSAttributeList.AccessType.PUBLIC;
+        }
+        if (getPrivateRadioButton().isSelected()) {
+            type = JSAttributeList.AccessType.PRIVATE;
+        }
+        if (getPackageLocalRadioButton().isSelected()) {
+            type = JSAttributeList.AccessType.PACKAGE_LOCAL;
+        }
+        if (getProtectedRadioButton().isSelected()) {
+            type = JSAttributeList.AccessType.PROTECTED;
+        }
+        assert type != null;
+        lastType = type;
+        return type;
+    }
 
-	protected abstract JRadioButton getPrivateRadioButton();
+    protected abstract JRadioButton getPrivateRadioButton();
 
-	protected abstract JRadioButton getPublicRadioButton();
+    protected abstract JRadioButton getPublicRadioButton();
 
-	protected abstract JRadioButton getProtectedRadioButton();
+    protected abstract JRadioButton getProtectedRadioButton();
 
-	protected abstract JRadioButton getPackageLocalRadioButton();
+    protected abstract JRadioButton getPackageLocalRadioButton();
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
index 468aab80..3afb64ba 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
@@ -46,288 +46,242 @@
 /**
  * @author ven
  */
-public abstract class JSBaseIntroduceDialog extends DialogWrapper implements BaseIntroduceSettings
-{
-	private final Project myProject;
-	private final JSExpression[] myOccurences;
-	protected final JSExpression myMainOccurence;
-
-	private Alarm myAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
-
-	protected JSBaseIntroduceDialog(
-		final Project project,
-		final JSExpression[] occurences,
-		final JSExpression mainOccurence,
-		LocalizeValue title
-	)
-	{
-		super(project, false);
-
-		myProject = project;
-		myOccurences = occurences;
-		myMainOccurence = mainOccurence;
-		setTitle(title);
-	}
-
-	protected void doInit()
-	{
-		JCheckBox replaceAllCheckBox = getReplaceAllCheckBox();
-		if(myOccurences.length > 1)
-		{
-			replaceAllCheckBox.setText(JavaScriptLocalize.javascriptIntroduceVariableReplaceAllOccurrences(myOccurences.length).get());
-		}
-		else
-		{
-			replaceAllCheckBox.setVisible(false);
-		}
-
-		final JTextField nameField = getNameField();
-		nameField.setText(suggestCandidateName(myMainOccurence));
-		nameField.selectAll();
-
-		nameField.addKeyListener(new KeyAdapter()
-		{
-			@Override
-			public void keyPressed(KeyEvent e)
-			{
-				initiateValidation();
-			}
-		});
-
-		replaceAllCheckBox.setFocusable(false);
-
-		final JComboBox typeField = getVarTypeField();
-
-		final List<String> possibleTypes = new ArrayList<String>();
-		final String type = JSResolveUtil.getExpressionType(myMainOccurence, myMainOccurence.getContainingFile());
-		possibleTypes.add(type);
-
-		typeField.setModel(new DefaultComboBoxModel(possibleTypes.toArray(new Object[possibleTypes.size()])));
-
-		init();
-
-		SwingUtilities.invokeLater(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				initiateValidation();
-			}
-		});
-	}
-
-	protected String suggestCandidateName(JSExpression mainOccurence)
-	{
-		final String s = evaluateCandidate(mainOccurence);
-		return s != null ? s.replace('.', '_') : null;
-	}
-
-	private static String evaluateCandidate(JSExpression mainOccurence)
-	{
-		if(mainOccurence instanceof JSCallExpression)
-		{
-			mainOccurence = ((JSCallExpression) mainOccurence).getMethodExpression();
-		}
-
-		if(mainOccurence instanceof JSReferenceExpression)
-		{
-			final ResolveResult[] results = ((JSReferenceExpression) mainOccurence).multiResolve(false);
-
-			if(results.length > 0)
-			{
-				final PsiElement element = results[0].getElement();
-
-				if(element instanceof JSFunction)
-				{
-					String typeString = ((JSFunction) element).getReturnTypeString();
-					if(isValidIdentifier(typeString, mainOccurence))
-					{
-						return typeString;
-					}
-					return ((JSFunction) element).getName();
-				}
-				else if(element instanceof JSVariable)
-				{
-					String typeString = ((JSVariable) element).getTypeString();
-					if(isValidIdentifier(typeString, mainOccurence))
-					{
-						return typeString;
-					}
-					return typeString;
-				}
-			}
-
-			return ((JSReferenceExpression) mainOccurence).getReferencedName();
-		}
-		else if(mainOccurence.getParent() instanceof JSArgumentList)
-		{
-			JSParameter param = JSResolveUtil.findParameterForUsedArgument(mainOccurence, (JSArgumentList) mainOccurence.getParent());
-			if(param != null)
-			{
-				return param.getName();
-			}
-		}
-
-		return JSResolveUtil.getExpressionType(mainOccurence, mainOccurence.getContainingFile());
-	}
-
-	private static boolean isValidIdentifier(String typeString, PsiElement context)
-	{
-		if(typeString == null)
-		{
-			return false;
-		}
-		Language language = context.getContainingFile().getLanguage();
-		return NamesValidator.forLanguage(language).isIdentifier(typeString, context.getProject());
-	}
-
-	protected abstract JTextField getNameField();
-
-	protected abstract JPanel getPanel();
-
-	protected abstract JCheckBox getReplaceAllCheckBox();
-
-	private void initiateValidation()
-	{
-		myAlarm.cancelAllRequests();
-		myAlarm.addRequest(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				final String nameCandidate = getNameField().getText();
-				setOKActionEnabled(nameCandidate.length() != 0 && isValidName(nameCandidate));
-			}
-		}, 100, Application.get().getCurrentModalityState());
-	}
-
-	@Override
-	public JComponent getPreferredFocusedComponent()
-	{
-		return getNameField();
-	}
-
-	@Override
-	protected JComponent createCenterPanel()
-	{
-		return getPanel();
-	}
-
-	@Override
-	protected void doOKAction()
-	{
-		final String name = getVariableName();
-		if(name.length() == 0 || !isValidName(name))
-		{
-			Messages.showErrorDialog(
-				myProject,
-				JavaScriptLocalize.javascriptIntroduceVariableInvalidName().get(),
-				JavaScriptLocalize.javascriptIntroduceVariableTitle().get()
-			);
-			getNameField().requestFocus();
-			return;
-		}
-
-		if(!checkConflicts(name))
-		{
-			return;
-		}
-
-		super.doOKAction();
-	}
-
-	private boolean checkConflicts(final String name)
-	{
-		PsiElement tmp = isReplaceAllOccurences() ? PsiTreeUtil.findCommonParent(myOccurences) : myMainOccurence;
-		assert tmp != null;
-		JSElement scope = PsiTreeUtil.getNonStrictParentOfType(tmp, JSBlockStatement.class, JSFile.class, JSEmbeddedContentImpl.class);
-		assert scope != null;
-
-		final Ref<JSNamedElement> existing = new Ref<JSNamedElement>();
-		scope.accept(new JSElementVisitor()
-		{
-			@Override
-			public void visitJSElement(final JSElement node)
-			{
-				if(existing.isNull())
-				{
-					node.acceptChildren(this);
-				}
-			}
-
-			@Override
-			public void visitJSVariable(final JSVariable node)
-			{
-				if(name.equals(node.getName()))
-				{
-					existing.set(node);
-				}
-				super.visitJSVariable(node);
-			}
-
-			@Override
-			public void visitJSFunctionDeclaration(final JSFunction node)
-			{
-				if(name.equals(node.getName()))
-				{
-					existing.set(node);
-				}
-				super.visitJSFunctionDeclaration(node);
-			}
-		});
-
-		if(existing.isNull())
-		{
-			final ResolveProcessor processor = new ResolveProcessor(name);
-			JSResolveUtil.treeWalkUp(processor, scope, null, scope);
-			final PsiElement resolved = processor.getResult();
-			if(resolved instanceof JSNamedElement)
-			{
-				existing.set((JSNamedElement) resolved);
-			}
-		}
-
-		if(!existing.isNull())
-		{
-			return showConflictsDialog(existing.get(), name);
-		}
-
-		return true;
-	}
-
-	private boolean showConflictsDialog(final JSNamedElement existing, final String name)
-	{
-		final LocalizeValue message = existing instanceof JSFunction
-			? JavaScriptLocalize.javascriptIntroduceVariableFunctionAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name))
-			: JavaScriptLocalize.javascriptIntroduceVariableVariableAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name));
-		final ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, message.get());
-		conflictsDialog.show();
-		return conflictsDialog.isOK();
-	}
-
-	@Override
-	public boolean isReplaceAllOccurences()
-	{
-		return getReplaceAllCheckBox().isSelected();
-	}
-
-	@Override
-	public String getVariableName()
-	{
-		return getNameField().getText().trim();
-	}
-
-	@Override
-	public String getVariableType()
-	{
-		return (String) getVarTypeField().getSelectedItem();
-	}
-
-	private boolean isValidName(final String name)
-	{
-		final PsiFile containingFile = myMainOccurence.getContainingFile();
-		return NamesValidator.forLanguage(containingFile.getLanguage()).isIdentifier(name, myProject);
-	}
-
-	public abstract JComboBox getVarTypeField();
+public abstract class JSBaseIntroduceDialog extends DialogWrapper implements BaseIntroduceSettings {
+    private final Project myProject;
+    private final JSExpression[] myOccurences;
+    protected final JSExpression myMainOccurence;
+
+    private Alarm myAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
+
+    protected JSBaseIntroduceDialog(
+        final Project project,
+        final JSExpression[] occurences,
+        final JSExpression mainOccurence,
+        LocalizeValue title
+    ) {
+        super(project, false);
+
+        myProject = project;
+        myOccurences = occurences;
+        myMainOccurence = mainOccurence;
+        setTitle(title);
+    }
+
+    protected void doInit() {
+        JCheckBox replaceAllCheckBox = getReplaceAllCheckBox();
+        if (myOccurences.length > 1) {
+            replaceAllCheckBox.setText(JavaScriptLocalize.javascriptIntroduceVariableReplaceAllOccurrences(myOccurences.length).get());
+        }
+        else {
+            replaceAllCheckBox.setVisible(false);
+        }
+
+        final JTextField nameField = getNameField();
+        nameField.setText(suggestCandidateName(myMainOccurence));
+        nameField.selectAll();
+
+        nameField.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                initiateValidation();
+            }
+        });
+
+        replaceAllCheckBox.setFocusable(false);
+
+        final JComboBox typeField = getVarTypeField();
+
+        final List<String> possibleTypes = new ArrayList<String>();
+        final String type = JSResolveUtil.getExpressionType(myMainOccurence, myMainOccurence.getContainingFile());
+        possibleTypes.add(type);
+
+        typeField.setModel(new DefaultComboBoxModel(possibleTypes.toArray(new Object[possibleTypes.size()])));
+
+        init();
+
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                initiateValidation();
+            }
+        });
+    }
+
+    protected String suggestCandidateName(JSExpression mainOccurence) {
+        final String s = evaluateCandidate(mainOccurence);
+        return s != null ? s.replace('.', '_') : null;
+    }
+
+    private static String evaluateCandidate(JSExpression mainOccurence) {
+        if (mainOccurence instanceof JSCallExpression) {
+            mainOccurence = ((JSCallExpression)mainOccurence).getMethodExpression();
+        }
+
+        if (mainOccurence instanceof JSReferenceExpression) {
+            final ResolveResult[] results = ((JSReferenceExpression)mainOccurence).multiResolve(false);
+
+            if (results.length > 0) {
+                final PsiElement element = results[0].getElement();
+
+                if (element instanceof JSFunction) {
+                    String typeString = ((JSFunction)element).getReturnTypeString();
+                    if (isValidIdentifier(typeString, mainOccurence)) {
+                        return typeString;
+                    }
+                    return ((JSFunction)element).getName();
+                }
+                else if (element instanceof JSVariable) {
+                    String typeString = ((JSVariable)element).getTypeString();
+                    if (isValidIdentifier(typeString, mainOccurence)) {
+                        return typeString;
+                    }
+                    return typeString;
+                }
+            }
+
+            return ((JSReferenceExpression)mainOccurence).getReferencedName();
+        }
+        else if (mainOccurence.getParent() instanceof JSArgumentList) {
+            JSParameter param = JSResolveUtil.findParameterForUsedArgument(mainOccurence, (JSArgumentList)mainOccurence.getParent());
+            if (param != null) {
+                return param.getName();
+            }
+        }
+
+        return JSResolveUtil.getExpressionType(mainOccurence, mainOccurence.getContainingFile());
+    }
+
+    private static boolean isValidIdentifier(String typeString, PsiElement context) {
+        if (typeString == null) {
+            return false;
+        }
+        Language language = context.getContainingFile().getLanguage();
+        return NamesValidator.forLanguage(language).isIdentifier(typeString, context.getProject());
+    }
+
+    protected abstract JTextField getNameField();
+
+    protected abstract JPanel getPanel();
+
+    protected abstract JCheckBox getReplaceAllCheckBox();
+
+    private void initiateValidation() {
+        myAlarm.cancelAllRequests();
+        myAlarm.addRequest(new Runnable() {
+            @Override
+            public void run() {
+                final String nameCandidate = getNameField().getText();
+                setOKActionEnabled(nameCandidate.length() != 0 && isValidName(nameCandidate));
+            }
+        }, 100, Application.get().getCurrentModalityState());
+    }
+
+    @Override
+    public JComponent getPreferredFocusedComponent() {
+        return getNameField();
+    }
+
+    @Override
+    protected JComponent createCenterPanel() {
+        return getPanel();
+    }
+
+    @Override
+    protected void doOKAction() {
+        final String name = getVariableName();
+        if (name.length() == 0 || !isValidName(name)) {
+            Messages.showErrorDialog(
+                myProject,
+                JavaScriptLocalize.javascriptIntroduceVariableInvalidName().get(),
+                JavaScriptLocalize.javascriptIntroduceVariableTitle().get()
+            );
+            getNameField().requestFocus();
+            return;
+        }
+
+        if (!checkConflicts(name)) {
+            return;
+        }
+
+        super.doOKAction();
+    }
+
+    private boolean checkConflicts(final String name) {
+        PsiElement tmp = isReplaceAllOccurences() ? PsiTreeUtil.findCommonParent(myOccurences) : myMainOccurence;
+        assert tmp != null;
+        JSElement scope = PsiTreeUtil.getNonStrictParentOfType(tmp, JSBlockStatement.class, JSFile.class, JSEmbeddedContentImpl.class);
+        assert scope != null;
+
+        final Ref<JSNamedElement> existing = new Ref<JSNamedElement>();
+        scope.accept(new JSElementVisitor() {
+            @Override
+            public void visitJSElement(final JSElement node) {
+                if (existing.isNull()) {
+                    node.acceptChildren(this);
+                }
+            }
+
+            @Override
+            public void visitJSVariable(final JSVariable node) {
+                if (name.equals(node.getName())) {
+                    existing.set(node);
+                }
+                super.visitJSVariable(node);
+            }
+
+            @Override
+            public void visitJSFunctionDeclaration(final JSFunction node) {
+                if (name.equals(node.getName())) {
+                    existing.set(node);
+                }
+                super.visitJSFunctionDeclaration(node);
+            }
+        });
+
+        if (existing.isNull()) {
+            final ResolveProcessor processor = new ResolveProcessor(name);
+            JSResolveUtil.treeWalkUp(processor, scope, null, scope);
+            final PsiElement resolved = processor.getResult();
+            if (resolved instanceof JSNamedElement) {
+                existing.set((JSNamedElement)resolved);
+            }
+        }
+
+        if (!existing.isNull()) {
+            return showConflictsDialog(existing.get(), name);
+        }
+
+        return true;
+    }
+
+    private boolean showConflictsDialog(final JSNamedElement existing, final String name) {
+        final LocalizeValue message = existing instanceof JSFunction
+            ? JavaScriptLocalize.javascriptIntroduceVariableFunctionAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name))
+            : JavaScriptLocalize.javascriptIntroduceVariableVariableAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name));
+        final ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, message.get());
+        conflictsDialog.show();
+        return conflictsDialog.isOK();
+    }
+
+    @Override
+    public boolean isReplaceAllOccurences() {
+        return getReplaceAllCheckBox().isSelected();
+    }
+
+    @Override
+    public String getVariableName() {
+        return getNameField().getText().trim();
+    }
+
+    @Override
+    public String getVariableType() {
+        return (String)getVarTypeField().getSelectedItem();
+    }
+
+    private boolean isValidName(final String name) {
+        final PsiFile containingFile = myMainOccurence.getContainingFile();
+        return NamesValidator.forLanguage(containingFile.getLanguage()).isIdentifier(name, myProject);
+    }
+
+    public abstract JComboBox getVarTypeField();
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
index 93f366ff..e60c5d41 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
@@ -56,432 +56,373 @@
 /**
  * @author ven
  */
-public abstract class JSBaseIntroduceHandler<T extends JSElement, S extends BaseIntroduceSettings, D extends JSBaseIntroduceDialog> implements
-		RefactoringActionHandler
-{
-	protected static final Logger LOG = Logger.getInstance("#com.intellij.lang.javascript.refactoring.JSBaseIntroduceHandler");
-
-	protected static JSExpression findExpressionInRange(PsiFile file, int startOffset, int endOffset)
-	{
-		PsiElement element1 = file.findElementAt(startOffset);
-		PsiElement element2 = file.findElementAt(endOffset - 1);
-		if(element1 instanceof PsiWhiteSpace)
-		{
-			startOffset = element1.getTextRange().getEndOffset();
-		}
-		if(element2 instanceof PsiWhiteSpace)
-		{
-			endOffset = element2.getTextRange().getStartOffset();
-		}
-
-		JSExpression expression = PsiTreeUtil.findElementOfClassAtRange(file, startOffset, endOffset, JSExpression.class);
-		int expressionEnd;
-		PsiElement sibling;
-
-		if(expression == null || (expressionEnd = expression.getTextRange().getEndOffset()) != endOffset && (expressionEnd != endOffset - 1 ||
-				(sibling = expression.getNextSibling()) == null ||
-				sibling.getNode().getElementType() != JSTokenTypes.SEMICOLON))
-		{
-			return null;
-		}
-
-		if(expression instanceof JSReferenceExpression && expression.getParent() instanceof JSCallExpression)
-		{
-			return null;
-		}
-		/*if(file.getLanguage() == JavaScriptSupportLoader.JSON)
-		{
-			expression = null; // there is no vars in json
-		}*/
-		return expression;
-	}
-
-	protected static JSExpression unparenthesize(JSExpression expression)
-	{
-		while(expression instanceof JSParenthesizedExpression)
-		{
-			expression = ((JSParenthesizedExpression) expression).getInnerExpression();
-		}
-
-		return expression;
-	}
-
-	public static JSExpression[] findExpressionOccurrences(JSElement scope, JSExpression expr)
-	{
-		List<JSExpression> array = new ArrayList<JSExpression>();
-		addExpressionOccurrences(unparenthesize(expr), array, scope);
-		return array.toArray(new JSExpression[array.size()]);
-	}
-
-	protected static void addExpressionOccurrences(JSExpression expr, List<JSExpression> array, PsiElement scope)
-	{
-		PsiElement[] children = scope.getChildren();
-
-		for(PsiElement child : children)
-		{
-			if(child instanceof JSExpression)
-			{
-				final JSExpression childExpression = unparenthesize((JSExpression) child);
-
-				if(childExpression != null &&
-						PsiEquivalenceUtil.areElementsEquivalent(childExpression, expr) &&
-						!JSResolveUtil.isSelfReference(scope, child))
-				{
-					array.add((JSExpression) child);
-					continue;
-				}
-			}
-			if(!(child instanceof JSFunction))
-			{
-				addExpressionOccurrences(expr, array, child);
-			}
-		}
-	}
-
-	@Override
-	public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file, DataContext dataContext)
-	{
-		if(!editor.getSelectionModel().hasSelection())
-		{
-			editor.getSelectionModel().selectLineAtCaret();
-		}
-		int start = editor.getSelectionModel().getSelectionStart();
-		int end = editor.getSelectionModel().getSelectionEnd();
-
-		final JSExpression expression = findIntroducedExpression(file, start, end, editor);
-		if(expression == null)
-		{
-			return;
-		}
-
-		if(!CommonRefactoringUtil.checkReadOnlyStatus(project, file))
-		{
-			return;
-		}
-
-		editor.getSelectionModel().removeSelection();
-		JSElement scope = findIntroducedScope(expression);
-		LOG.assertTrue(scope != null);
-		final JSExpression[] occurrences = findExpressionOccurrences(scope, expression);
-		final S settings = getSettings(project, editor, expression, occurrences);
-		if(settings == null)
-		{
-			return;
-		}
-
-		CommandProcessor.getInstance().executeCommand(
-			project,
-			() -> ApplicationManager.getApplication().runWriteAction(
-				() -> doRefactoring(project, editor, new BaseIntroduceContext<>(expression, occurrences, settings))
-			),
-			getRefactoringName(),
-			null
-		);
-	}
-
-	protected static final class BaseIntroduceContext<S>
-	{
-		public final S settings;
-		final JSExpression[] occurences;
-		public final JSExpression expression;
-
-		public BaseIntroduceContext(JSExpression _mainoccurence, final JSExpression[] _occurences, S _settings)
-		{
-			occurences = _occurences;
-			expression = _mainoccurence;
-			settings = _settings;
-		}
-	}
-
-	protected JSElement findIntroducedScope(final JSExpression expression)
-	{
-		return PsiTreeUtil.getParentOfType(expression, JSFunction.class, JSFile.class, JSEmbeddedContentImpl.class);
-	}
-
-	protected abstract String getRefactoringName();
-
-	protected abstract LocalizeValue getCannotIntroduceMessage();
-
-	@Nullable
-	protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor)
-	{
-		final JSExpression expression = findExpressionInRange(file, start, end);
-		if(expression == null)
-		{
-			CommonRefactoringUtil.showErrorHint(
-				file.getProject(),
-				editor,
-				getCannotIntroduceMessage().get(),
-				getRefactoringName(),
-				null
-			);
-		}
-		return expression;
-	}
-
-	@Nullable
-	protected S getSettings(Project project, Editor editor, JSExpression expression, final JSExpression[] occurrences)
-	{
-		ArrayList<RangeHighlighter> highlighters = null;
-		if(occurrences.length > 1)
-		{
-			highlighters = highlightOccurences(project, editor, occurrences);
-		}
-
-		final D dialog = createDialog(project, expression, occurrences);
-		dialog.show();
-		if(highlighters != null)
-		{
-			for(RangeHighlighter highlighter : highlighters)
-			{
-				HighlightManager.getInstance(project).removeSegmentHighlighter(editor, highlighter);
-			}
-		}
-
-		if(dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE)
-		{
-			return null;
-		}
-
-		return createSettings(dialog);
-	}
-
-	protected S createSettings(final D dialog)
-	{
-		return (S) dialog;
-	}
-
-	protected abstract D createDialog(final Project project, final JSExpression expression, final JSExpression[] occurrences);
-
-	private void doRefactoring(final Project project, final Editor editor, BaseIntroduceContext<S> introduceContext)
-	{
-		final S settings = introduceContext.settings;
-		JSExpression expression = introduceContext.expression;
-		final JSExpression[] occurrences = introduceContext.occurences;
-
-		final boolean replaceAllOccurences = settings.isReplaceAllOccurences();
-		@NonNls String varDeclText = getDeclText(settings);
-		final PsiFile containingFile = expression.getContainingFile();
-		final boolean ecma = false;
-		if(ecma)
-		{
-			String type = settings.getVariableType();
-			if(type == null)
-			{
-				type = JSResolveUtil.getExpressionType(expression, containingFile);
-			}
-			varDeclText += ":" + type;
-		}
-
-		try
-		{
-			T anchorStatement = findAnchor(introduceContext, replaceAllOccurences);
-			JSVarStatement declaration = prepareDeclaration(varDeclText, introduceContext, project);
-
-			LOG.assertTrue(anchorStatement != null);
-
-			boolean replacedOriginal = false;
-
-			if(anchorStatement == expression.getParent() && anchorStatement instanceof JSExpressionStatement)
-			{
-				declaration = (JSVarStatement) anchorStatement.replace(declaration);
-				editor.getCaretModel().moveToOffset(declaration.getTextRange().getEndOffset());
-				replacedOriginal = true;
-			}
-			else
-			{
-				JSExpression oldExpression = expression;
-				final TextRange expressionTextRange = expression.getTextRange();
-				final TextRange statementTextRange = anchorStatement.getTextRange();
-
-				RangeMarker marker = editor.getDocument().createRangeMarker(expressionTextRange);
-
-				// Adding declaration to anchorStatement may invalidate original expression so we need to find it in new tree
-				final T jsStatement = addStatementBefore(anchorStatement, declaration);
-
-				if(!expression.isValid())
-				{
-					final T newAnchorStatement = (T) PsiTreeUtil.getNextSiblingOfType(jsStatement, anchorStatement.getClass());
-					final int relativeOffset = marker.getStartOffset() - statementTextRange.getStartOffset();
-					JSExpression newExpression = PsiTreeUtil.getParentOfType(newAnchorStatement.findElementAt(relativeOffset), oldExpression.getClass());
-
-					if(newExpression == null)
-					{
-						assert false : "Could not find " + oldExpression.getClass() + " in " + newAnchorStatement.getText() + " with offset " + marker
-								.getStartOffset();
-					}
-
-					while(newExpression.getTextRange().getLength() != expressionTextRange.getLength())
-					{
-						JSExpression candidateExpression = PsiTreeUtil.getParentOfType(newExpression, oldExpression.getClass());
-						if(candidateExpression == null)
-						{
-							break;
-						}
-						if(candidateExpression.getTextRange().getStartOffset() - newAnchorStatement.getTextRange().getStartOffset() != marker.getStartOffset())
-						{
-							break;
-						}
-						newExpression = candidateExpression;
-					}
-
-					for(int i = 0; i < occurrences.length; ++i)
-					{
-						if(occurrences[i] == oldExpression)
-						{
-							occurrences[i] = newExpression;
-							break;
-						}
-					}
-
-					expression = newExpression;
-				}
-			}
-
-			final JSExpression refExpr = JSChangeUtil.createExpressionFromText(project, settings.getVariableName());
-			if(replaceAllOccurences)
-			{
-				List<JSExpression> toHighight = new ArrayList<>();
-				for(JSExpression occurence : occurrences)
-				{
-					if(occurence != expression || !replacedOriginal)
-					{
-						toHighight.add(occurence.replace(refExpr));
-					}
-					else
-					{
-						toHighight.add(declaration.getVariables()[0].getInitializer());
-					}
-				}
-
-				highlightOccurences(project, editor, toHighight.toArray(new JSExpression[toHighight.size()]));
-			}
-			else if(!replacedOriginal)
-			{
-				expression.replace(refExpr);
-			}
-		}
-		catch(IncorrectOperationException e)
-		{
-			LOG.error(e);
-		}
-	}
-
-	protected JSVarStatement prepareDeclaration(final String varDeclText, BaseIntroduceContext<S> context, final Project project)
-		throws IncorrectOperationException
-	{
-		JSVarStatement declaration = (JSVarStatement) JSChangeUtil.createStatementFromText(
-			project,
-			varDeclText + " = 0" + JSChangeUtil.getSemicolon(project)
-		).getPsi();
-		declaration.getVariables()[0].getInitializer().replace(context.expression);
-		return declaration;
-	}
-
-	@NonNls
-	protected String getDeclText(S settings)
-	{
-		return "var " + settings.getVariableName();
-	}
-
-	protected T addStatementBefore(final T anchorStatement, final JSVarStatement declaration) throws IncorrectOperationException
-	{
-		return (T) ((JSStatement) anchorStatement).addStatementBefore(declaration);
-	}
-
-	protected T findAnchor(final BaseIntroduceContext<S> context, final boolean replaceAllOccurences)
-	{
-		JSStatement anchorStatement = replaceAllOccurences ? getAnchorToInsert(context.occurences) : PsiTreeUtil.getParentOfType(context.expression,
-				JSStatement.class);
-		if(anchorStatement instanceof JSVarStatement &&
-				anchorStatement.getParent() instanceof JSStatement &&
-				!(anchorStatement.getParent() instanceof JSBlockStatement))
-		{
-			anchorStatement = (JSStatement) anchorStatement.getParent();
-		}
-		return (T) anchorStatement;
-	}
-
-	private static ArrayList<RangeHighlighter> highlightOccurences(Project project, Editor editor, JSExpression[] occurences)
-	{
-		HighlightManager highlightManager = HighlightManager.getInstance(project);
-		EditorColorsManager colorsManager = EditorColorsManager.getInstance();
-		TextAttributes attributes = colorsManager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
-		ArrayList<RangeHighlighter> result = new ArrayList<>();
-		highlightManager.addOccurrenceHighlights(editor, occurences, attributes, true, result);
-		WindowManager.getInstance().getStatusBar(project).setInfo(RefactoringLocalize.pressEscapeToRemoveTheHighlighting().get());
-		return result;
-	}
-
-	private static JSStatement getAnchorToInsert(final JSExpression[] expressions)
-	{
-		JSElement place = expressions[0];
-		next:
-		do
-		{
-			JSStatement statement = PsiTreeUtil.getParentOfType(place, JSStatement.class); //this is the first expression textually
-			LOG.assertTrue(statement != null);
-
-			final PsiElement parent = statement.getParent();
-			for(JSExpression expression : expressions)
-			{
-				if(!PsiTreeUtil.isAncestor(parent, expression, true))
-				{
-					place = statement;
-					continue next;
-				}
-			}
-
-			return statement;
-		}
-		while(true);
-	}
-
-	protected static JSElement findClassAnchor(final PsiElement expression)
-	{
-		PsiElement nearestParent = PsiTreeUtil.getParentOfType(expression, JSVarStatement.class, JSFunction.class);
-		while(nearestParent != null)
-		{
-			final PsiElement nextParent = PsiTreeUtil.getParentOfType(nearestParent, JSVarStatement.class, JSFunction.class);
-			if(nextParent == null)
-			{
-				break;
-			}
-			nearestParent = nextParent;
-		}
-
-		if(nearestParent != null)
-		{
-			return (JSElement) nearestParent;
-		}
-
-		JSElement parent = PsiTreeUtil.getParentOfType(expression, JSFile.class, JSClass.class);
-
-		if (parent instanceof JSFile)
-		{
-			final PsiElement classRef = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
-			if (classRef instanceof JSClass jsClass)
-			{
-				parent = jsClass;
-			}
-		}
-
-		return parent;
-	}
-
-	protected static JSElement addToClassAnchor(final JSElement anchorStatement, final JSVarStatement declaration) throws IncorrectOperationException
-	{
-		if(!(anchorStatement instanceof JSClass))
-		{
-			final JSElement element = findClassAnchor(anchorStatement);
-			return (JSElement) element.addBefore(declaration, anchorStatement);
-		}
-		return (JSElement) anchorStatement.add(declaration);
-	}
-
-	@Override
-	public void invoke(@Nonnull Project project, @Nonnull PsiElement[] elements, DataContext dataContext)
-	{
-		throw new RuntimeException("Not implemented");
-	}
+public abstract class JSBaseIntroduceHandler<T extends JSElement, S extends BaseIntroduceSettings, D extends JSBaseIntroduceDialog>
+    implements RefactoringActionHandler {
+
+    protected static final Logger LOG = Logger.getInstance("#com.intellij.lang.javascript.refactoring.JSBaseIntroduceHandler");
+
+    protected static JSExpression findExpressionInRange(PsiFile file, int startOffset, int endOffset) {
+        PsiElement element1 = file.findElementAt(startOffset);
+        PsiElement element2 = file.findElementAt(endOffset - 1);
+        if (element1 instanceof PsiWhiteSpace) {
+            startOffset = element1.getTextRange().getEndOffset();
+        }
+        if (element2 instanceof PsiWhiteSpace) {
+            endOffset = element2.getTextRange().getStartOffset();
+        }
+
+        JSExpression expression = PsiTreeUtil.findElementOfClassAtRange(file, startOffset, endOffset, JSExpression.class);
+        int expressionEnd;
+        PsiElement sibling;
+
+        if (expression == null || (expressionEnd =
+            expression.getTextRange().getEndOffset()) != endOffset && (expressionEnd != endOffset - 1 ||
+            (sibling = expression.getNextSibling()) == null ||
+            sibling.getNode().getElementType() != JSTokenTypes.SEMICOLON)) {
+            return null;
+        }
+
+        if (expression instanceof JSReferenceExpression && expression.getParent() instanceof JSCallExpression) {
+            return null;
+        }
+        /*if (file.getLanguage() == JavaScriptSupportLoader.JSON) {
+            expression = null; // there is no vars in json
+        }*/
+        return expression;
+    }
+
+    protected static JSExpression unparenthesize(JSExpression expression) {
+        while (expression instanceof JSParenthesizedExpression) {
+            expression = ((JSParenthesizedExpression)expression).getInnerExpression();
+        }
+
+        return expression;
+    }
+
+    public static JSExpression[] findExpressionOccurrences(JSElement scope, JSExpression expr) {
+        List<JSExpression> array = new ArrayList<JSExpression>();
+        addExpressionOccurrences(unparenthesize(expr), array, scope);
+        return array.toArray(new JSExpression[array.size()]);
+    }
+
+    protected static void addExpressionOccurrences(JSExpression expr, List<JSExpression> array, PsiElement scope) {
+        PsiElement[] children = scope.getChildren();
+
+        for (PsiElement child : children) {
+            if (child instanceof JSExpression) {
+                final JSExpression childExpression = unparenthesize((JSExpression)child);
+
+                if (childExpression != null
+                    && PsiEquivalenceUtil.areElementsEquivalent(childExpression, expr)
+                    && !JSResolveUtil.isSelfReference(scope, child)) {
+                    array.add((JSExpression)child);
+                    continue;
+                }
+            }
+
+            if (!(child instanceof JSFunction)) {
+                addExpressionOccurrences(expr, array, child);
+            }
+        }
+    }
+
+    @Override
+    public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file, DataContext dataContext) {
+        if (!editor.getSelectionModel().hasSelection()) {
+            editor.getSelectionModel().selectLineAtCaret();
+        }
+        int start = editor.getSelectionModel().getSelectionStart();
+        int end = editor.getSelectionModel().getSelectionEnd();
+
+        final JSExpression expression = findIntroducedExpression(file, start, end, editor);
+        if (expression == null) {
+            return;
+        }
+
+        if (!CommonRefactoringUtil.checkReadOnlyStatus(project, file)) {
+            return;
+        }
+
+        editor.getSelectionModel().removeSelection();
+        JSElement scope = findIntroducedScope(expression);
+        LOG.assertTrue(scope != null);
+        final JSExpression[] occurrences = findExpressionOccurrences(scope, expression);
+        final S settings = getSettings(project, editor, expression, occurrences);
+        if (settings == null) {
+            return;
+        }
+
+        CommandProcessor.getInstance().executeCommand(
+            project,
+            () -> ApplicationManager.getApplication().runWriteAction(
+                () -> doRefactoring(project, editor, new BaseIntroduceContext<>(expression, occurrences, settings))
+            ),
+            getRefactoringName(),
+            null
+        );
+    }
+
+    protected static final class BaseIntroduceContext<S> {
+        public final S settings;
+        final JSExpression[] occurences;
+        public final JSExpression expression;
+
+        public BaseIntroduceContext(JSExpression _mainoccurence, final JSExpression[] _occurences, S _settings) {
+            occurences = _occurences;
+            expression = _mainoccurence;
+            settings = _settings;
+        }
+    }
+
+    protected JSElement findIntroducedScope(final JSExpression expression) {
+        return PsiTreeUtil.getParentOfType(expression, JSFunction.class, JSFile.class, JSEmbeddedContentImpl.class);
+    }
+
+    protected abstract String getRefactoringName();
+
+    protected abstract LocalizeValue getCannotIntroduceMessage();
+
+    @Nullable
+    protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor) {
+        final JSExpression expression = findExpressionInRange(file, start, end);
+        if (expression == null) {
+            CommonRefactoringUtil.showErrorHint(
+                file.getProject(),
+                editor,
+                getCannotIntroduceMessage().get(),
+                getRefactoringName(),
+                null
+            );
+        }
+        return expression;
+    }
+
+    @Nullable
+    protected S getSettings(Project project, Editor editor, JSExpression expression, final JSExpression[] occurrences) {
+        ArrayList<RangeHighlighter> highlighters = null;
+        if (occurrences.length > 1) {
+            highlighters = highlightOccurences(project, editor, occurrences);
+        }
+
+        final D dialog = createDialog(project, expression, occurrences);
+        dialog.show();
+        if (highlighters != null) {
+            for (RangeHighlighter highlighter : highlighters) {
+                HighlightManager.getInstance(project).removeSegmentHighlighter(editor, highlighter);
+            }
+        }
+
+        if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
+            return null;
+        }
+
+        return createSettings(dialog);
+    }
+
+    protected S createSettings(final D dialog) {
+        return (S)dialog;
+    }
+
+    protected abstract D createDialog(final Project project, final JSExpression expression, final JSExpression[] occurrences);
+
+    private void doRefactoring(final Project project, final Editor editor, BaseIntroduceContext<S> introduceContext) {
+        final S settings = introduceContext.settings;
+        JSExpression expression = introduceContext.expression;
+        final JSExpression[] occurrences = introduceContext.occurences;
+
+        final boolean replaceAllOccurences = settings.isReplaceAllOccurences();
+        @NonNls String varDeclText = getDeclText(settings);
+        final PsiFile containingFile = expression.getContainingFile();
+        final boolean ecma = false;
+        if (ecma) {
+            String type = settings.getVariableType();
+            if (type == null) {
+                type = JSResolveUtil.getExpressionType(expression, containingFile);
+            }
+            varDeclText += ":" + type;
+        }
+
+        try {
+            T anchorStatement = findAnchor(introduceContext, replaceAllOccurences);
+            JSVarStatement declaration = prepareDeclaration(varDeclText, introduceContext, project);
+
+            LOG.assertTrue(anchorStatement != null);
+
+            boolean replacedOriginal = false;
+
+            if (anchorStatement == expression.getParent() && anchorStatement instanceof JSExpressionStatement) {
+                declaration = (JSVarStatement)anchorStatement.replace(declaration);
+                editor.getCaretModel().moveToOffset(declaration.getTextRange().getEndOffset());
+                replacedOriginal = true;
+            }
+            else {
+                JSExpression oldExpression = expression;
+                final TextRange expressionTextRange = expression.getTextRange();
+                final TextRange statementTextRange = anchorStatement.getTextRange();
+
+                RangeMarker marker = editor.getDocument().createRangeMarker(expressionTextRange);
+
+                // Adding declaration to anchorStatement may invalidate original expression so we need to find it in new tree
+                final T jsStatement = addStatementBefore(anchorStatement, declaration);
+
+                if (!expression.isValid()) {
+                    final T newAnchorStatement = (T)PsiTreeUtil.getNextSiblingOfType(jsStatement, anchorStatement.getClass());
+                    final int relativeOffset = marker.getStartOffset() - statementTextRange.getStartOffset();
+                    JSExpression newExpression =
+                        PsiTreeUtil.getParentOfType(newAnchorStatement.findElementAt(relativeOffset), oldExpression.getClass());
+
+                    if (newExpression == null) {
+                        assert false : "Could not find " + oldExpression.getClass() + " in " + newAnchorStatement.getText() + " with offset " + marker
+                            .getStartOffset();
+                    }
+
+                    while (newExpression.getTextRange().getLength() != expressionTextRange.getLength()) {
+                        JSExpression candidateExpression = PsiTreeUtil.getParentOfType(newExpression, oldExpression.getClass());
+                        if (candidateExpression == null) {
+                            break;
+                        }
+                        if (candidateExpression.getTextRange().getStartOffset() - newAnchorStatement.getTextRange()
+                            .getStartOffset() != marker.getStartOffset()) {
+                            break;
+                        }
+                        newExpression = candidateExpression;
+                    }
+
+                    for (int i = 0; i < occurrences.length; ++i) {
+                        if (occurrences[i] == oldExpression) {
+                            occurrences[i] = newExpression;
+                            break;
+                        }
+                    }
+
+                    expression = newExpression;
+                }
+            }
+
+            final JSExpression refExpr = JSChangeUtil.createExpressionFromText(project, settings.getVariableName());
+            if (replaceAllOccurences) {
+                List<JSExpression> toHighight = new ArrayList<>();
+                for (JSExpression occurence : occurrences) {
+                    if (occurence != expression || !replacedOriginal) {
+                        toHighight.add(occurence.replace(refExpr));
+                    }
+                    else {
+                        toHighight.add(declaration.getVariables()[0].getInitializer());
+                    }
+                }
+
+                highlightOccurences(project, editor, toHighight.toArray(new JSExpression[toHighight.size()]));
+            }
+            else if (!replacedOriginal) {
+                expression.replace(refExpr);
+            }
+        }
+        catch (IncorrectOperationException e) {
+            LOG.error(e);
+        }
+    }
+
+    protected JSVarStatement prepareDeclaration(final String varDeclText, BaseIntroduceContext<S> context, final Project project)
+        throws IncorrectOperationException {
+        JSVarStatement declaration = (JSVarStatement)JSChangeUtil.createStatementFromText(
+            project,
+            varDeclText + " = 0" + JSChangeUtil.getSemicolon(project)
+        ).getPsi();
+        declaration.getVariables()[0].getInitializer().replace(context.expression);
+        return declaration;
+    }
+
+    @NonNls
+    protected String getDeclText(S settings) {
+        return "var " + settings.getVariableName();
+    }
+
+    protected T addStatementBefore(final T anchorStatement, final JSVarStatement declaration) throws IncorrectOperationException {
+        return (T)((JSStatement)anchorStatement).addStatementBefore(declaration);
+    }
+
+    protected T findAnchor(final BaseIntroduceContext<S> context, final boolean replaceAllOccurences) {
+        JSStatement anchorStatement = replaceAllOccurences ? getAnchorToInsert(context.occurences) : PsiTreeUtil.getParentOfType(
+            context.expression,
+            JSStatement.class
+        );
+        if (anchorStatement instanceof JSVarStatement &&
+            anchorStatement.getParent() instanceof JSStatement &&
+            !(anchorStatement.getParent() instanceof JSBlockStatement)) {
+            anchorStatement = (JSStatement)anchorStatement.getParent();
+        }
+        return (T)anchorStatement;
+    }
+
+    private static ArrayList<RangeHighlighter> highlightOccurences(Project project, Editor editor, JSExpression[] occurences) {
+        HighlightManager highlightManager = HighlightManager.getInstance(project);
+        EditorColorsManager colorsManager = EditorColorsManager.getInstance();
+        TextAttributes attributes = colorsManager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
+        ArrayList<RangeHighlighter> result = new ArrayList<>();
+        highlightManager.addOccurrenceHighlights(editor, occurences, attributes, true, result);
+        WindowManager.getInstance().getStatusBar(project).setInfo(RefactoringLocalize.pressEscapeToRemoveTheHighlighting().get());
+        return result;
+    }
+
+    private static JSStatement getAnchorToInsert(final JSExpression[] expressions) {
+        JSElement place = expressions[0];
+        next:
+        do {
+            JSStatement statement = PsiTreeUtil.getParentOfType(place, JSStatement.class); //this is the first expression textually
+            LOG.assertTrue(statement != null);
+
+            final PsiElement parent = statement.getParent();
+            for (JSExpression expression : expressions) {
+                if (!PsiTreeUtil.isAncestor(parent, expression, true)) {
+                    place = statement;
+                    continue next;
+                }
+            }
+
+            return statement;
+        }
+        while (true);
+    }
+
+    protected static JSElement findClassAnchor(final PsiElement expression) {
+        PsiElement nearestParent = PsiTreeUtil.getParentOfType(expression, JSVarStatement.class, JSFunction.class);
+        while (nearestParent != null) {
+            final PsiElement nextParent = PsiTreeUtil.getParentOfType(nearestParent, JSVarStatement.class, JSFunction.class);
+            if (nextParent == null) {
+                break;
+            }
+            nearestParent = nextParent;
+        }
+
+        if (nearestParent != null) {
+            return (JSElement)nearestParent;
+        }
+
+        JSElement parent = PsiTreeUtil.getParentOfType(expression, JSFile.class, JSClass.class);
+
+        if (parent instanceof JSFile) {
+            final PsiElement classRef = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+            if (classRef instanceof JSClass jsClass) {
+                parent = jsClass;
+            }
+        }
+
+        return parent;
+    }
+
+    protected static JSElement addToClassAnchor(
+        final JSElement anchorStatement,
+        final JSVarStatement declaration
+    ) throws IncorrectOperationException {
+        if (!(anchorStatement instanceof JSClass)) {
+            final JSElement element = findClassAnchor(anchorStatement);
+            return (JSElement)element.addBefore(declaration, anchorStatement);
+        }
+        return (JSElement)anchorStatement.add(declaration);
+    }
+
+    @Override
+    public void invoke(@Nonnull Project project, @Nonnull PsiElement[] elements, DataContext dataContext) {
+        throw new RuntimeException("Not implemented");
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java
index c11d846e..86d9beb1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java
@@ -30,31 +30,26 @@
  * Time: 8:28:35 PM
  * To change this template use File | Settings | File Templates.
  */
-abstract class JSNamesValidator implements NamesValidator
-{
-	protected final Lexer myLexer;
+abstract class JSNamesValidator implements NamesValidator {
+    protected final Lexer myLexer;
 
-	JSNamesValidator(DialectOptionHolder optionHolder)
-	{
-		myLexer = createLexer(optionHolder);
-	}
+    JSNamesValidator(DialectOptionHolder optionHolder) {
+        myLexer = createLexer(optionHolder);
+    }
 
-	protected Lexer createLexer(final DialectOptionHolder optionHolder)
-	{
-		return new JSFlexAdapter(false, optionHolder);
-	}
+    protected Lexer createLexer(final DialectOptionHolder optionHolder) {
+        return new JSFlexAdapter(false, optionHolder);
+    }
 
-	@Override
-	public synchronized boolean isKeyword(String name, Project project)
-	{
-		myLexer.start(name, 0, name.length(), 0);
-		return JSTokenTypes.KEYWORDS.contains(myLexer.getTokenType()) && myLexer.getTokenEnd() == name.length();
-	}
+    @Override
+    public synchronized boolean isKeyword(String name, Project project) {
+        myLexer.start(name, 0, name.length(), 0);
+        return JSTokenTypes.KEYWORDS.contains(myLexer.getTokenType()) && myLexer.getTokenEnd() == name.length();
+    }
 
-	@Override
-	public synchronized boolean isIdentifier(String name, Project project)
-	{
-		myLexer.start(name, 0, name.length(), 0);
-		return JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(myLexer.getTokenType()) && myLexer.getTokenEnd() == name.length();
-	}
+    @Override
+    public synchronized boolean isIdentifier(String name, Project project) {
+        myLexer.start(name, 0, name.length(), 0);
+        return JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(myLexer.getTokenType()) && myLexer.getTokenEnd() == name.length();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
index 0f153d79..ba1980db 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
@@ -35,53 +35,48 @@
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
-public class JavascriptRefactoringSupportProvider extends RefactoringSupportProvider
-{
-	@Override
-	public boolean isSafeDeleteAvailable(PsiElement element)
-	{
-		boolean simpleElement = element instanceof JSFunction || element instanceof JSVariable || element instanceof JSDefinitionExpression ||
-				element instanceof JSProperty || element instanceof JSClass;
+public class JavascriptRefactoringSupportProvider extends RefactoringSupportProvider {
+    @Override
+    public boolean isSafeDeleteAvailable(PsiElement element) {
+        boolean simpleElement = element instanceof JSFunction
+            || element instanceof JSVariable
+            || element instanceof JSDefinitionExpression
+            || element instanceof JSProperty
+            || element instanceof JSClass;
 
-		return simpleElement && ((JSNamedElement) element).getName() != null;
-	}
+        return simpleElement && ((JSNamedElement)element).getName() != null;
+    }
 
-	@Override
-	@Nullable
-	public RefactoringActionHandler getIntroduceVariableHandler()
-	{
-		return new JSIntroduceVariableHandler();
-	}
+    @Override
+    @Nullable
+    public RefactoringActionHandler getIntroduceVariableHandler() {
+        return new JSIntroduceVariableHandler();
+    }
 
-	@Override                                                                                
-	@Nullable
-	public RefactoringActionHandler getExtractMethodHandler()
-	{
-		return new JSExtractFunctionHandler();
-	}
+    @Override
+    @Nullable
+    public RefactoringActionHandler getExtractMethodHandler() {
+        return new JSExtractFunctionHandler();
+    }
 
-	@Override
-	public RefactoringActionHandler getIntroduceConstantHandler()
-	{
-		return new JSIntroduceConstantHandler();
-	}
+    @Override
+    public RefactoringActionHandler getIntroduceConstantHandler() {
+        return new JSIntroduceConstantHandler();
+    }
 
-	@Override
-	public RefactoringActionHandler getIntroduceFieldHandler()
-	{
-		return new JSIntroduceFieldHandler();
-	}
+    @Override
+    public RefactoringActionHandler getIntroduceFieldHandler() {
+        return new JSIntroduceFieldHandler();
+    }
 
-	@Override
-	public boolean isInplaceRenameAvailable(PsiElement element, PsiElement context)
-	{
-		return element instanceof JSNamedElement && element.getUseScope() instanceof LocalSearchScope;
-	}
+    @Override
+    public boolean isInplaceRenameAvailable(PsiElement element, PsiElement context) {
+        return element instanceof JSNamedElement && element.getUseScope() instanceof LocalSearchScope;
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
index 0999ea77..c69295ec 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
@@ -23,31 +23,27 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Aug 9, 2008
- *         Time: 9:22:10 AM
+ * Date: Aug 9, 2008
+ * Time: 9:22:10 AM
  */
-public class JSExtractFunctionDialog extends DialogWrapper implements JSExtractFunctionSettings
-{
-	private JPanel myPanel;
-	private JTextField myFunctionName;
-
-	JSExtractFunctionDialog()
-	{
-		super(false);
-
-		setTitle(JavaScriptLocalize.javascriptExtractMethodTitle());
-		init();
-	}
-
-	@Override
-	protected JComponent createCenterPanel()
-	{
-		return myPanel;
-	}
-
-	@Override
-	public String getMethodName()
-	{
-		return myFunctionName.getText();
-	}
+public class JSExtractFunctionDialog extends DialogWrapper implements JSExtractFunctionSettings {
+    private JPanel myPanel;
+    private JTextField myFunctionName;
+
+    JSExtractFunctionDialog() {
+        super(false);
+
+        setTitle(JavaScriptLocalize.javascriptExtractMethodTitle());
+        init();
+    }
+
+    @Override
+    protected JComponent createCenterPanel() {
+        return myPanel;
+    }
+
+    @Override
+    public String getMethodName() {
+        return myFunctionName.getText();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
index 2bd40121..15089216 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
@@ -31,58 +31,49 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: May 29, 2008
- *         Time: 8:19:48 PM
+ * Date: May 29, 2008
+ * Time: 8:19:48 PM
  */
-public class JSExtractFunctionHandler implements RefactoringActionHandler
-{
-	@Override
-	public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file, DataContext dataContext)
-	{
-		if(!editor.getSelectionModel().hasSelection())
-		{
-			editor.getSelectionModel().selectLineAtCaret();
-		}
-		int start = editor.getSelectionModel().getSelectionStart();
-		int end = editor.getSelectionModel().getSelectionEnd();
+public class JSExtractFunctionHandler implements RefactoringActionHandler {
+    @Override
+    public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file, DataContext dataContext) {
+        if (!editor.getSelectionModel().hasSelection()) {
+            editor.getSelectionModel().selectLineAtCaret();
+        }
+        int start = editor.getSelectionModel().getSelectionStart();
+        int end = editor.getSelectionModel().getSelectionEnd();
 
-		if(!CommonRefactoringUtil.checkReadOnlyStatus(project, file))
-		{
-			return;
-		}
+        if (!CommonRefactoringUtil.checkReadOnlyStatus(project, file)) {
+            return;
+        }
 
-		final JSExtractFunctionSettings settings = getSettings(project, editor);
-		if(settings == null)
-		{
-			return;
-		}
+        final JSExtractFunctionSettings settings = getSettings(project, editor);
+        if (settings == null) {
+            return;
+        }
 
-		CommandProcessor.getInstance().executeCommand(
-			project,
-			() -> project.getApplication().runWriteAction(() -> doRefactoring(project, editor, settings)),
-			JavaScriptLocalize.javascriptExtractMethodTitle().get(),
-			null
-		);
-	}
+        CommandProcessor.getInstance().executeCommand(
+            project,
+            () -> project.getApplication().runWriteAction(() -> doRefactoring(project, editor, settings)),
+            JavaScriptLocalize.javascriptExtractMethodTitle().get(),
+            null
+        );
+    }
 
-	protected JSExtractFunctionSettings getSettings(final Project project, final Editor editor)
-	{
-		final JSExtractFunctionDialog dialog = new JSExtractFunctionDialog();
-		dialog.show();
-		if(dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE)
-		{
-			return null;
-		}
-		return dialog;
-	}
+    protected JSExtractFunctionSettings getSettings(final Project project, final Editor editor) {
+        final JSExtractFunctionDialog dialog = new JSExtractFunctionDialog();
+        dialog.show();
+        if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
+            return null;
+        }
+        return dialog;
+    }
 
-	private void doRefactoring(final Project project, final Editor editor, final JSExtractFunctionSettings settings)
-	{
-	}
+    private void doRefactoring(final Project project, final Editor editor, final JSExtractFunctionSettings settings) {
+    }
 
-	@Override
-	public void invoke(@Nonnull final Project project, @Nonnull final PsiElement[] elements, final DataContext dataContext)
-	{
-		throw new UnsupportedOperationException();
-	}
+    @Override
+    public void invoke(@Nonnull final Project project, @Nonnull final PsiElement[] elements, final DataContext dataContext) {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionSettings.java
index 510cc659..65d507ff 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionSettings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionSettings.java
@@ -19,7 +19,6 @@
 /**
  * @author ven
  */
-public interface JSExtractFunctionSettings
-{
-	String getMethodName();
+public interface JSExtractFunctionSettings {
+    String getMethodName();
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
index 099ebf16..1d560f59 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
@@ -25,78 +25,67 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 24, 2008
- *         Time: 8:48:34 PM
+ * Date: Jul 24, 2008
+ * Time: 8:48:34 PM
  */
-class JSIntroduceConstantDialog extends JSBaseClassBasedIntroduceDialog implements JSIntroduceConstantSettings
-{
-	private JTextField myNameField;
-	private JCheckBox myReplaceAllCheckBox;
-	private JPanel myPanel;
-	private JRadioButton myPrivate;
-	private JRadioButton myProtected;
-	private JRadioButton myPackageLocal;
-	private JRadioButton myPublic;
-	private JComboBox myVarType;
+class JSIntroduceConstantDialog extends JSBaseClassBasedIntroduceDialog implements JSIntroduceConstantSettings {
+    private JTextField myNameField;
+    private JCheckBox myReplaceAllCheckBox;
+    private JPanel myPanel;
+    private JRadioButton myPrivate;
+    private JRadioButton myProtected;
+    private JRadioButton myPackageLocal;
+    private JRadioButton myPublic;
+    private JComboBox myVarType;
 
-	protected JSIntroduceConstantDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence)
-	{
-		super(project, occurences, mainOccurence, JavaScriptLocalize.javascriptIntroduceConstantTitle());
+    protected JSIntroduceConstantDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence) {
+        super(project, occurences, mainOccurence, JavaScriptLocalize.javascriptIntroduceConstantTitle());
 
-		doInit();
-	}
+        doInit();
+    }
 
-	@Override
-	protected JRadioButton getPrivateRadioButton()
-	{
-		return myPrivate;
-	}
+    @Override
+    protected JRadioButton getPrivateRadioButton() {
+        return myPrivate;
+    }
 
-	@Override
-	protected JRadioButton getPublicRadioButton()
-	{
-		return myPublic;
-	}
+    @Override
+    protected JRadioButton getPublicRadioButton() {
+        return myPublic;
+    }
 
-	@Override
-	protected JRadioButton getProtectedRadioButton()
-	{
-		return myProtected;
-	}
+    @Override
+    protected JRadioButton getProtectedRadioButton() {
+        return myProtected;
+    }
 
-	@Override
-	protected JRadioButton getPackageLocalRadioButton()
-	{
-		return myPackageLocal;
-	}
+    @Override
+    protected JRadioButton getPackageLocalRadioButton() {
+        return myPackageLocal;
+    }
 
-	@Override
-	protected JTextField getNameField()
-	{
-		return myNameField;
-	}
+    @Override
+    protected JTextField getNameField() {
+        return myNameField;
+    }
 
-	@Override
-	protected JPanel getPanel()
-	{
-		return myPanel;
-	}
+    @Override
+    protected JPanel getPanel() {
+        return myPanel;
+    }
 
-	@Override
-	protected JCheckBox getReplaceAllCheckBox()
-	{
-		return myReplaceAllCheckBox;
-	}
+    @Override
+    protected JCheckBox getReplaceAllCheckBox() {
+        return myReplaceAllCheckBox;
+    }
 
-	@Override
-	public JComboBox getVarTypeField()
-	{
-		return myVarType;
-	}
+    @Override
+    public JComboBox getVarTypeField() {
+        return myVarType;
+    }
 
-	@Override
-	protected String suggestCandidateName(final JSExpression mainOccurence)
-	{
-		return super.suggestCandidateName(mainOccurence).toUpperCase();
-	}
+    @Override
+    protected String suggestCandidateName(final JSExpression mainOccurence) {
+        return super.suggestCandidateName(mainOccurence).toUpperCase();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
index 6f88c1a2..fb6a6e44 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
@@ -32,119 +32,107 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: May 29, 2008
- *         Time: 8:20:03 PM
+ * Date: May 29, 2008
+ * Time: 8:20:03 PM
  */
-public class JSIntroduceConstantHandler extends JSBaseIntroduceHandler<JSElement, JSIntroduceConstantSettings, JSIntroduceConstantDialog>
-{
-	@Override
-	protected String getRefactoringName()
-	{
-		return JavaScriptLocalize.javascriptIntroduceConstantTitle().get();
-	}
+public class JSIntroduceConstantHandler extends JSBaseIntroduceHandler<JSElement, JSIntroduceConstantSettings, JSIntroduceConstantDialog> {
+    @Override
+    protected String getRefactoringName() {
+        return JavaScriptLocalize.javascriptIntroduceConstantTitle().get();
+    }
 
-	@Override
-	protected LocalizeValue getCannotIntroduceMessage()
-	{
-		return JavaScriptLocalize.javascriptIntroduceConstantErrorNoExpressionSelected();
-	}
+    @Override
+    protected LocalizeValue getCannotIntroduceMessage() {
+        return JavaScriptLocalize.javascriptIntroduceConstantErrorNoExpressionSelected();
+    }
 
-	@Override
-	protected JSIntroduceConstantDialog createDialog(final Project project, final JSExpression expression, final JSExpression[] occurrences)
-	{
-		return new JSIntroduceConstantDialog(project, occurrences, expression);
-	}
+    @Override
+    protected JSIntroduceConstantDialog createDialog(
+        final Project project,
+        final JSExpression expression,
+        final JSExpression[] occurrences
+    ) {
+        return new JSIntroduceConstantDialog(project, occurrences, expression);
+    }
 
-	@Override
-	protected String getDeclText(final JSIntroduceConstantSettings settings)
-	{
-		@NonNls String baseDeclText = "static const " + settings.getVariableName();
-		final JSAttributeList.AccessType type = settings.getAccessType();
-		if (type != JSAttributeList.AccessType.PACKAGE_LOCAL)
-		{
-			baseDeclText = type.toString().toLowerCase() + " " + baseDeclText;
-		}
+    @Override
+    protected String getDeclText(final JSIntroduceConstantSettings settings) {
+        @NonNls String baseDeclText = "static const " + settings.getVariableName();
+        final JSAttributeList.AccessType type = settings.getAccessType();
+        if (type != JSAttributeList.AccessType.PACKAGE_LOCAL) {
+            baseDeclText = type.toString().toLowerCase() + " " + baseDeclText;
+        }
 
-		return baseDeclText;
-	}
+        return baseDeclText;
+    }
 
-	@Override
-	protected JSElement findAnchor(final BaseIntroduceContext<JSIntroduceConstantSettings> context, final boolean replaceAllOccurences)
-	{
-		return findClassAnchor(context.expression);
-	}
+    @Override
+    protected JSElement findAnchor(final BaseIntroduceContext<JSIntroduceConstantSettings> context, final boolean replaceAllOccurences) {
+        return findClassAnchor(context.expression);
+    }
 
-	@Override
-	protected JSElement addStatementBefore(final JSElement anchorStatement, final JSVarStatement declaration) throws IncorrectOperationException
-	{
-		return addToClassAnchor(anchorStatement, declaration);
-	}
+    @Override
+    protected JSElement addStatementBefore(
+        final JSElement anchorStatement,
+        final JSVarStatement declaration
+    ) throws IncorrectOperationException {
+        return addToClassAnchor(anchorStatement, declaration);
+    }
 
-	@Override
-	protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor)
-	{
-		if (file.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-		{
-			CommonRefactoringUtil.showErrorHint(
-				file.getProject(),
-				editor,
-				JavaScriptLocalize.javascriptIntroduceConstantErrorNotAvailableInJavascriptCode().get(),
-				getRefactoringName(),
-				null
-			);
-			return null;
-		}
+    @Override
+    protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor) {
+        if (file.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+            CommonRefactoringUtil.showErrorHint(
+                file.getProject(),
+                editor,
+                JavaScriptLocalize.javascriptIntroduceConstantErrorNotAvailableInJavascriptCode().get(),
+                getRefactoringName(),
+                null
+            );
+            return null;
+        }
 
-		final JSExpression expression = super.findIntroducedExpression(file, start, end, editor);
-		if(expression == null)
-		{
-			return null;
-		}
+        final JSExpression expression = super.findIntroducedExpression(file, start, end, editor);
+        if (expression == null) {
+            return null;
+        }
 
-		final Ref<Boolean> hasAccesibilityProblem = new Ref<Boolean>();
-		expression.accept(new JSElementVisitor()
-		{
-			@Override
-			public void visitJSReferenceExpression(final JSReferenceExpression node)
-			{
-				if(node.getQualifier() == null)
-				{
-					final PsiElement element = node.resolve();
+        final Ref<Boolean> hasAccesibilityProblem = new Ref<Boolean>();
+        expression.accept(new JSElementVisitor() {
+            @Override
+            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+                if (node.getQualifier() == null) {
+                    final PsiElement element = node.resolve();
 
-					if(element instanceof JSAttributeListOwner && !(element instanceof JSClass))
-					{
-						final JSAttributeList attributeList = ((JSAttributeListOwner) element).getAttributeList();
-						if(attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.STATIC))
-						{
-							hasAccesibilityProblem.set(Boolean.TRUE);
-						}
-					}
-					else if(element == null)
-					{
-						hasAccesibilityProblem.set(Boolean.TRUE);
-					}
-				}
-				super.visitJSReferenceExpression(node);
-			}
+                    if (element instanceof JSAttributeListOwner && !(element instanceof JSClass)) {
+                        final JSAttributeList attributeList = ((JSAttributeListOwner)element).getAttributeList();
+                        if (attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
+                            hasAccesibilityProblem.set(Boolean.TRUE);
+                        }
+                    }
+                    else if (element == null) {
+                        hasAccesibilityProblem.set(Boolean.TRUE);
+                    }
+                }
+                super.visitJSReferenceExpression(node);
+            }
 
-			@Override
-			public void visitJSElement(final JSElement node)
-			{
-				node.acceptChildren(this);
-			}
-		});
+            @Override
+            public void visitJSElement(final JSElement node) {
+                node.acceptChildren(this);
+            }
+        });
 
-		if(Boolean.TRUE.equals(hasAccesibilityProblem.get()))
-		{
-			CommonRefactoringUtil.showErrorHint(
-				file.getProject(),
-				editor,
-				JavaScriptLocalize.javascriptIntroduceConstantErrorNotConstantExpressionSelected().get(),
-				getRefactoringName(),
-				null
-			);
-			return null;
-		}
-		return expression;
-	}
+        if (Boolean.TRUE.equals(hasAccesibilityProblem.get())) {
+            CommonRefactoringUtil.showErrorHint(
+                file.getProject(),
+                editor,
+                JavaScriptLocalize.javascriptIntroduceConstantErrorNotConstantExpressionSelected().get(),
+                getRefactoringName(),
+                null
+            );
+            return null;
+        }
+        return expression;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantSettings.java
index 90e29353..90fbf723 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantSettings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantSettings.java
@@ -22,7 +22,6 @@
 /**
  * @author ven
  */
-public interface JSIntroduceConstantSettings extends BaseIntroduceSettings
-{
-	JSAttributeList.AccessType getAccessType();
+public interface JSIntroduceConstantSettings extends BaseIntroduceSettings {
+    JSAttributeList.AccessType getAccessType();
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
index 0c1004f8..22f7cefd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
@@ -31,168 +31,138 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 24, 2008
- *         Time: 8:46:13 PM
+ * Date: Jul 24, 2008
+ * Time: 8:46:13 PM
  */
-class JSIntroduceFieldDialog extends JSBaseClassBasedIntroduceDialog implements JSIntroduceFieldSettings
-{
-	private JCheckBox myReplaceAllCheckBox;
-	private JTextField myNameField;
-	private JPanel myPanel;
-	private JRadioButton myPublic;
-	private JRadioButton myPackageLocal;
-	private JRadioButton myProtected;
-	private JRadioButton myPrivate;
-	private JComboBox myVarType;
-
-	private JRadioButton myFieldDeclaration;
-	private JRadioButton myCurrentMethod;
-	private JRadioButton myConstructor;
-
-	private static InitializationPlace lastInitializationPlace = InitializationPlace.FieldDeclaration;
-
-	public JSIntroduceFieldDialog(final Project project, final JSExpression[] occurrences, final JSExpression expression)
-	{
-		super(project, occurrences, expression, JavaScriptLocalize.javascriptIntroduceFieldTitle());
-		doInit();
-	}
-
-	@Override
-	protected void doInit()
-	{
-		super.doInit();
-
-		final Ref<Boolean> localContextDependent = new Ref<Boolean>();
-		myMainOccurence.accept(new JSElementVisitor()
-		{
-			@Override
-			public void visitJSReferenceExpression(final JSReferenceExpression node)
-			{
-				if(node.getQualifier() == null)
-				{
-					final ResolveResult[] results = node.multiResolve(true);
-					if(results.length == 0)
-					{
-						localContextDependent.set(Boolean.TRUE);
-					}
-					else
-					{
-						final PsiElement element = results[0].getElement();
-						if(element instanceof JSVariable && !(element.getParent().getParent() instanceof JSClass))
-						{
-							localContextDependent.set(Boolean.TRUE);
-						}
-					}
-				}
-				super.visitJSReferenceExpression(node);
-			}
-
-			@Override
-			public void visitJSElement(final JSElement node)
-			{
-				node.acceptChildren(this);
-			}
-		});
-
-		if(Boolean.TRUE.equals(localContextDependent.get()))
-		{
-			myConstructor.setEnabled(false);
-			myFieldDeclaration.setEnabled(false);
-			myCurrentMethod.setSelected(true);
-		}
-		else
-		{
-			if(lastInitializationPlace == InitializationPlace.Constructor)
-			{
-				myConstructor.setSelected(true);
-			}
-			else if(lastInitializationPlace == InitializationPlace.CurrentMethod)
-			{
-				myCurrentMethod.setSelected(true);
-			}
-			else
-			{
-				myFieldDeclaration.setSelected(true);
-			}
-		}
-	}
-
-	@Override
-	protected JTextField getNameField()
-	{
-		return myNameField;
-	}
-
-	@Override
-	protected JPanel getPanel()
-	{
-		return myPanel;
-	}
-
-	@Override
-	protected JCheckBox getReplaceAllCheckBox()
-	{
-		return myReplaceAllCheckBox;
-	}
-
-	@Override
-	public JComboBox getVarTypeField()
-	{
-		return myVarType;
-	}
-
-	@Override
-	protected JRadioButton getPrivateRadioButton()
-	{
-		return myPrivate;
-	}
-
-	@Override
-	protected JRadioButton getPublicRadioButton()
-	{
-		return myPublic;
-	}
-
-	@Override
-	protected JRadioButton getProtectedRadioButton()
-	{
-		return myProtected;
-	}
-
-	@Override
-	protected JRadioButton getPackageLocalRadioButton()
-	{
-		return myPackageLocal;
-	}
-
-	@Override
-	public InitializationPlace getInitializationPlace()
-	{
-		return myFieldDeclaration.isSelected() ? InitializationPlace.FieldDeclaration : myCurrentMethod.isSelected() ? InitializationPlace.CurrentMethod :
-				InitializationPlace.Constructor;
-	}
-
-	@Override
-	protected void doOKAction()
-	{
-		super.doOKAction();
-		lastInitializationPlace = getInitializationPlace();
-	}
-
-	@Override
-	protected String suggestCandidateName(final JSExpression mainOccurence)
-	{
-		final String s = super.suggestCandidateName(mainOccurence);
-		final JSCodeStyleSettings jsCodeStyleSettings = CodeStyleSettingsManager.getSettings(mainOccurence.getProject()).getCustomSettings
-				(JSCodeStyleSettings.class);
-		if(jsCodeStyleSettings.FIELD_PREFIX.length() > 0)
-		{
-			return jsCodeStyleSettings.FIELD_PREFIX + s;
-		}
-		if(s.length() > 0)
-		{
-			return StringUtil.decapitalize(s);
-		}
-		return s;
-	}
+class JSIntroduceFieldDialog extends JSBaseClassBasedIntroduceDialog implements JSIntroduceFieldSettings {
+    private JCheckBox myReplaceAllCheckBox;
+    private JTextField myNameField;
+    private JPanel myPanel;
+    private JRadioButton myPublic;
+    private JRadioButton myPackageLocal;
+    private JRadioButton myProtected;
+    private JRadioButton myPrivate;
+    private JComboBox myVarType;
+
+    private JRadioButton myFieldDeclaration;
+    private JRadioButton myCurrentMethod;
+    private JRadioButton myConstructor;
+
+    private static InitializationPlace lastInitializationPlace = InitializationPlace.FieldDeclaration;
+
+    public JSIntroduceFieldDialog(final Project project, final JSExpression[] occurrences, final JSExpression expression) {
+        super(project, occurrences, expression, JavaScriptLocalize.javascriptIntroduceFieldTitle());
+        doInit();
+    }
+
+    @Override
+    protected void doInit() {
+        super.doInit();
+
+        final Ref<Boolean> localContextDependent = new Ref<Boolean>();
+        myMainOccurence.accept(new JSElementVisitor() {
+            @Override
+            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+                if (node.getQualifier() == null) {
+                    final ResolveResult[] results = node.multiResolve(true);
+                    if (results.length == 0) {
+                        localContextDependent.set(Boolean.TRUE);
+                    }
+                    else {
+                        final PsiElement element = results[0].getElement();
+                        if (element instanceof JSVariable && !(element.getParent().getParent() instanceof JSClass)) {
+                            localContextDependent.set(Boolean.TRUE);
+                        }
+                    }
+                }
+                super.visitJSReferenceExpression(node);
+            }
+
+            @Override
+            public void visitJSElement(final JSElement node) {
+                node.acceptChildren(this);
+            }
+        });
+
+        if (Boolean.TRUE.equals(localContextDependent.get())) {
+            myConstructor.setEnabled(false);
+            myFieldDeclaration.setEnabled(false);
+            myCurrentMethod.setSelected(true);
+        }
+        else if (lastInitializationPlace == InitializationPlace.Constructor) {
+            myConstructor.setSelected(true);
+        }
+        else if (lastInitializationPlace == InitializationPlace.CurrentMethod) {
+            myCurrentMethod.setSelected(true);
+        }
+        else {
+            myFieldDeclaration.setSelected(true);
+        }
+    }
+
+    @Override
+    protected JTextField getNameField() {
+        return myNameField;
+    }
+
+    @Override
+    protected JPanel getPanel() {
+        return myPanel;
+    }
+
+    @Override
+    protected JCheckBox getReplaceAllCheckBox() {
+        return myReplaceAllCheckBox;
+    }
+
+    @Override
+    public JComboBox getVarTypeField() {
+        return myVarType;
+    }
+
+    @Override
+    protected JRadioButton getPrivateRadioButton() {
+        return myPrivate;
+    }
+
+    @Override
+    protected JRadioButton getPublicRadioButton() {
+        return myPublic;
+    }
+
+    @Override
+    protected JRadioButton getProtectedRadioButton() {
+        return myProtected;
+    }
+
+    @Override
+    protected JRadioButton getPackageLocalRadioButton() {
+        return myPackageLocal;
+    }
+
+    @Override
+    public InitializationPlace getInitializationPlace() {
+        return myFieldDeclaration.isSelected() ? InitializationPlace.FieldDeclaration : myCurrentMethod.isSelected() ? InitializationPlace.CurrentMethod :
+            InitializationPlace.Constructor;
+    }
+
+    @Override
+    protected void doOKAction() {
+        super.doOKAction();
+        lastInitializationPlace = getInitializationPlace();
+    }
+
+    @Override
+    protected String suggestCandidateName(final JSExpression mainOccurence) {
+        final String s = super.suggestCandidateName(mainOccurence);
+        final JSCodeStyleSettings jsCodeStyleSettings = CodeStyleSettingsManager.getSettings(mainOccurence.getProject()).getCustomSettings
+            (JSCodeStyleSettings.class);
+        if (jsCodeStyleSettings.FIELD_PREFIX.length() > 0) {
+            return jsCodeStyleSettings.FIELD_PREFIX + s;
+        }
+        if (s.length() > 0) {
+            return StringUtil.decapitalize(s);
+        }
+        return s;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
index 466a89c2..0440d94c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
@@ -36,121 +36,112 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: May 29, 2008
- *         Time: 8:20:03 PM
+ * Date: May 29, 2008
+ * Time: 8:20:03 PM
  */
-public class JSIntroduceFieldHandler extends JSBaseIntroduceHandler<JSElement, JSIntroduceFieldSettings, JSIntroduceFieldDialog>
-{
-	@Override
-	protected String getRefactoringName()
-	{
-		return JavaScriptLocalize.javascriptIntroduceFieldTitle().get();
-	}
-
-	@Override
-	protected LocalizeValue getCannotIntroduceMessage() {
-		return JavaScriptLocalize.javascriptIntroduceFieldErrorNoExpressionSelected();
-	}
-
-	@Override
-	protected JSIntroduceFieldDialog createDialog(final Project project, final JSExpression expression, final JSExpression[] occurrences)
-	{
-		return new JSIntroduceFieldDialog(project, occurrences, expression);
-	}
-
-	@Override
-	protected JSElement findAnchor(final BaseIntroduceContext<JSIntroduceFieldSettings> context, final boolean replaceAllOccurences)
-	{
-		return findClassAnchor(context.expression);
-	}
-
-	@Override
-	protected JSElement addStatementBefore(final JSElement anchorStatement, final JSVarStatement declaration) throws IncorrectOperationException
-	{
-		return addToClassAnchor(anchorStatement, declaration);
-	}
-
-	@Override
-	protected String getDeclText(final JSIntroduceFieldSettings settings)
-	{
-		@NonNls String baseDeclText = super.getDeclText(settings);
-		final JSAttributeList.AccessType type = settings.getAccessType();
-		if(type != JSAttributeList.AccessType.PACKAGE_LOCAL)
-		{
-			baseDeclText = type.toString().toLowerCase() + " " + baseDeclText;
-		}
-
-		return baseDeclText;
-	}
-
-	@Override
-	protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor)
-	{
-		if(file.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-		{
-			CommonRefactoringUtil.showErrorHint(
-				file.getProject(),
-				editor,
-				JavaScriptLocalize.javascriptIntroduceFieldErrorNotAvailableInJavascriptCode().get(),
-				getRefactoringName(),
-				null
-			);
-			return null;
-		}
-
-		return super.findIntroducedExpression(file, start, end, editor);
-	}
-
-	@Override
-	protected JSVarStatement prepareDeclaration(final String varDeclText, BaseIntroduceContext<JSIntroduceFieldSettings> context, final Project project) throws IncorrectOperationException
-	{
-		final JSIntroduceFieldSettings.InitializationPlace place = context.settings.getInitializationPlace();
-
-		if(place == JSIntroduceFieldSettings.InitializationPlace.FieldDeclaration)
-		{
-			return super.prepareDeclaration(varDeclText, context, project);
-		}
-		else
-		{
-			final String assignmentText = context.settings.getVariableName() + "=" + context.expression.getText() + JSChangeUtil.getSemicolon(project);
-			final PsiElement psiToInsert = JSChangeUtil.createStatementFromText(project, assignmentText).getPsi();
-
-			if(place == JSIntroduceFieldSettings.InitializationPlace.CurrentMethod)
-			{
-				final JSElement element = super.findAnchor(context, context.settings.isReplaceAllOccurences());
-				final PsiElement parent = element.getParent();
-				final PsiElement addedElement = parent.addBefore(psiToInsert, element);
-				CodeStyleManager.getInstance(project).reformatNewlyAddedElement(parent.getNode(), addedElement.getNode());
-			}
-			else
-			{
-				PsiElement parent = PsiTreeUtil.getParentOfType(context.expression, JSClass.class, JSFile.class);
-				if(parent instanceof JSFile)
-				{
-					final PsiFile containingFile = parent.getContext().getContainingFile();
-					assert containingFile instanceof XmlFile;
-					parent = XmlBackedJSClassImpl.getXmlBackedClass((XmlFile) containingFile);
-				}
-
-				assert parent instanceof JSClass;
-				final JSClass clazz = (JSClass) parent;
-				JSFunction fun = clazz.findFunctionByName(clazz.getName());
-
-				if(fun == null)
-				{
-					@NonNls String constr = "function " + clazz.getName() + "() {}";
-					if(clazz.getAttributeList() != null && clazz.getAttributeList().getAccessType() == JSAttributeList.AccessType.PUBLIC)
-					{
-						constr = "public " + constr;
-					}
-
-					fun = (JSFunction) clazz.add(JSChangeUtil.createJSTreeFromText(project, constr).getPsi());
-				}
-
-				fun.getBody()[0].add(psiToInsert);
-			}
-
-			return (JSVarStatement) JSChangeUtil.createStatementFromText(project, varDeclText + JSChangeUtil.getSemicolon(project)).getPsi();
-		}
-	}
+public class JSIntroduceFieldHandler extends JSBaseIntroduceHandler<JSElement, JSIntroduceFieldSettings, JSIntroduceFieldDialog> {
+    @Override
+    protected String getRefactoringName() {
+        return JavaScriptLocalize.javascriptIntroduceFieldTitle().get();
+    }
+
+    @Override
+    protected LocalizeValue getCannotIntroduceMessage() {
+        return JavaScriptLocalize.javascriptIntroduceFieldErrorNoExpressionSelected();
+    }
+
+    @Override
+    protected JSIntroduceFieldDialog createDialog(final Project project, final JSExpression expression, final JSExpression[] occurrences) {
+        return new JSIntroduceFieldDialog(project, occurrences, expression);
+    }
+
+    @Override
+    protected JSElement findAnchor(final BaseIntroduceContext<JSIntroduceFieldSettings> context, final boolean replaceAllOccurences) {
+        return findClassAnchor(context.expression);
+    }
+
+    @Override
+    protected JSElement addStatementBefore(
+        final JSElement anchorStatement,
+        final JSVarStatement declaration
+    ) throws IncorrectOperationException {
+        return addToClassAnchor(anchorStatement, declaration);
+    }
+
+    @Override
+    protected String getDeclText(final JSIntroduceFieldSettings settings) {
+        @NonNls String baseDeclText = super.getDeclText(settings);
+        final JSAttributeList.AccessType type = settings.getAccessType();
+        if (type != JSAttributeList.AccessType.PACKAGE_LOCAL) {
+            baseDeclText = type.toString().toLowerCase() + " " + baseDeclText;
+        }
+
+        return baseDeclText;
+    }
+
+    @Override
+    protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor) {
+        if (file.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+            CommonRefactoringUtil.showErrorHint(
+                file.getProject(),
+                editor,
+                JavaScriptLocalize.javascriptIntroduceFieldErrorNotAvailableInJavascriptCode().get(),
+                getRefactoringName(),
+                null
+            );
+            return null;
+        }
+
+        return super.findIntroducedExpression(file, start, end, editor);
+    }
+
+    @Override
+    protected JSVarStatement prepareDeclaration(
+        final String varDeclText,
+        BaseIntroduceContext<JSIntroduceFieldSettings> context,
+        final Project project
+    ) throws IncorrectOperationException {
+        final JSIntroduceFieldSettings.InitializationPlace place = context.settings.getInitializationPlace();
+
+        if (place == JSIntroduceFieldSettings.InitializationPlace.FieldDeclaration) {
+            return super.prepareDeclaration(varDeclText, context, project);
+        }
+        else {
+            final String assignmentText =
+                context.settings.getVariableName() + "=" + context.expression.getText() + JSChangeUtil.getSemicolon(project);
+            final PsiElement psiToInsert = JSChangeUtil.createStatementFromText(project, assignmentText).getPsi();
+
+            if (place == JSIntroduceFieldSettings.InitializationPlace.CurrentMethod) {
+                final JSElement element = super.findAnchor(context, context.settings.isReplaceAllOccurences());
+                final PsiElement parent = element.getParent();
+                final PsiElement addedElement = parent.addBefore(psiToInsert, element);
+                CodeStyleManager.getInstance(project).reformatNewlyAddedElement(parent.getNode(), addedElement.getNode());
+            }
+            else {
+                PsiElement parent = PsiTreeUtil.getParentOfType(context.expression, JSClass.class, JSFile.class);
+                if (parent instanceof JSFile) {
+                    final PsiFile containingFile = parent.getContext().getContainingFile();
+                    assert containingFile instanceof XmlFile;
+                    parent = XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)containingFile);
+                }
+
+                assert parent instanceof JSClass;
+                final JSClass clazz = (JSClass)parent;
+                JSFunction fun = clazz.findFunctionByName(clazz.getName());
+
+                if (fun == null) {
+                    @NonNls String constr = "function " + clazz.getName() + "() {}";
+                    if (clazz.getAttributeList() != null && clazz.getAttributeList().getAccessType() == JSAttributeList.AccessType.PUBLIC) {
+                        constr = "public " + constr;
+                    }
+
+                    fun = (JSFunction)clazz.add(JSChangeUtil.createJSTreeFromText(project, constr).getPsi());
+                }
+
+                fun.getBody()[0].add(psiToInsert);
+            }
+
+            return (JSVarStatement)JSChangeUtil.createStatementFromText(project, varDeclText + JSChangeUtil.getSemicolon(project)).getPsi();
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldSettings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldSettings.java
index f86bd5e6..28a31ee1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldSettings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldSettings.java
@@ -22,14 +22,14 @@
 /**
  * @author ven
  */
-public interface JSIntroduceFieldSettings extends BaseIntroduceSettings
-{
-	JSAttributeList.AccessType getAccessType();
+public interface JSIntroduceFieldSettings extends BaseIntroduceSettings {
+    JSAttributeList.AccessType getAccessType();
 
-	enum InitializationPlace
-	{
-		CurrentMethod, FieldDeclaration, Constructor
-	}
+    enum InitializationPlace {
+        CurrentMethod,
+        FieldDeclaration,
+        Constructor
+    }
 
-	InitializationPlace getInitializationPlace();
+    InitializationPlace getInitializationPlace();
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
index b666c57d..81f2e46b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
@@ -27,88 +27,80 @@
 /**
  * @author ven
  */
-public class JSIntroduceVariableDialog extends JSBaseIntroduceDialog implements Settings
-{
-	private JCheckBox myReplaceAllCheckBox;
-	private JTextField myNameField;
-	private JPanel myPanel;
-
-	private JRadioButton myIntroduceLocalVariable;
-	private JRadioButton myIntroduceConstant;
-	private JRadioButton myIntroduceVariable;
-	private JComboBox myVarType;
-	private JLabel myVariableTypeLabel;
-
-	private static IntroducedVarType ourLastIntroduceType = IntroducedVarType.VAR;
-	private IntroducedVarType myIntroducedVarType;
-
-	protected JSIntroduceVariableDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence)
-	{
-		super(project, occurences, mainOccurence, JavaScriptLocalize.javascriptIntroduceVariableTitle());
-
-		if(ourLastIntroduceType == Settings.IntroducedVarType.CONST)
-		{
-			myIntroduceConstant.setSelected(true);
-		}
-		else if(ourLastIntroduceType == Settings.IntroducedVarType.LET)
-		{
-			myIntroduceLocalVariable.setSelected(true);
-		}
-		else if(ourLastIntroduceType == Settings.IntroducedVarType.VAR)
-		{
-			myIntroduceVariable.setSelected(true);
-		}
-
-		doInit();
-	}
-
-	@Override
-	protected JTextField getNameField()
-	{
-		return myNameField;
-	}
-
-	@Override
-	protected JPanel getPanel()
-	{
-		return myPanel;
-	}
-
-	@Override
-	protected JCheckBox getReplaceAllCheckBox()
-	{
-		return myReplaceAllCheckBox;
-	}
-
-	@Override
-	protected void doOKAction()
-	{
-		super.doOKAction();
-
-		if(!isShowing())
-		{
-			myIntroducedVarType = myIntroduceConstant.isSelected() ? Settings.IntroducedVarType.CONST : myIntroduceLocalVariable.isSelected() ? Settings
-					.IntroducedVarType.LET : myIntroduceVariable.isSelected() ? Settings.IntroducedVarType.VAR : Settings.IntroducedVarType.VAR;
-
-			ourLastIntroduceType = myIntroducedVarType;
-		}
-	}
-
-	@Override
-	public JComboBox getVarTypeField()
-	{
-		return myVarType;
-	}
-
-	@Override
-	public IntroducedVarType getIntroducedVarType()
-	{
-		return myIntroducedVarType;
-	}
-
-	@Override
-	protected String suggestCandidateName(final JSExpression mainOccurence)
-	{
-		return StringUtil.decapitalize(super.suggestCandidateName(mainOccurence));
-	}
+public class JSIntroduceVariableDialog extends JSBaseIntroduceDialog implements Settings {
+    private JCheckBox myReplaceAllCheckBox;
+    private JTextField myNameField;
+    private JPanel myPanel;
+
+    private JRadioButton myIntroduceLocalVariable;
+    private JRadioButton myIntroduceConstant;
+    private JRadioButton myIntroduceVariable;
+    private JComboBox myVarType;
+    private JLabel myVariableTypeLabel;
+
+    private static IntroducedVarType ourLastIntroduceType = IntroducedVarType.VAR;
+    private IntroducedVarType myIntroducedVarType;
+
+    protected JSIntroduceVariableDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence) {
+        super(project, occurences, mainOccurence, JavaScriptLocalize.javascriptIntroduceVariableTitle());
+
+        if (ourLastIntroduceType == Settings.IntroducedVarType.CONST) {
+            myIntroduceConstant.setSelected(true);
+        }
+        else if (ourLastIntroduceType == Settings.IntroducedVarType.LET) {
+            myIntroduceLocalVariable.setSelected(true);
+        }
+        else if (ourLastIntroduceType == Settings.IntroducedVarType.VAR) {
+            myIntroduceVariable.setSelected(true);
+        }
+
+        doInit();
+    }
+
+    @Override
+    protected JTextField getNameField() {
+        return myNameField;
+    }
+
+    @Override
+    protected JPanel getPanel() {
+        return myPanel;
+    }
+
+    @Override
+    protected JCheckBox getReplaceAllCheckBox() {
+        return myReplaceAllCheckBox;
+    }
+
+    @Override
+    protected void doOKAction() {
+        super.doOKAction();
+
+        if (!isShowing()) {
+            myIntroducedVarType = myIntroduceConstant.isSelected()
+                ? Settings.IntroducedVarType.CONST
+                : myIntroduceLocalVariable.isSelected()
+                ? Settings.IntroducedVarType.LET
+                : myIntroduceVariable.isSelected()
+                ? Settings.IntroducedVarType.VAR
+                : Settings.IntroducedVarType.VAR;
+
+            ourLastIntroduceType = myIntroducedVarType;
+        }
+    }
+
+    @Override
+    public JComboBox getVarTypeField() {
+        return myVarType;
+    }
+
+    @Override
+    public IntroducedVarType getIntroducedVarType() {
+        return myIntroducedVarType;
+    }
+
+    @Override
+    protected String suggestCandidateName(final JSExpression mainOccurence) {
+        return StringUtil.decapitalize(super.suggestCandidateName(mainOccurence));
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
index 7377bd06..657e4707 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
@@ -26,29 +26,28 @@
 /**
  * @author ven
  */
-public class JSIntroduceVariableHandler extends JSBaseIntroduceHandler<JSStatement, Settings, JSIntroduceVariableDialog>
-{
-	@Override
-	protected String getRefactoringName()
-	{
-		return JavaScriptLocalize.javascriptIntroduceVariableTitle().get();
-	}
+public class JSIntroduceVariableHandler extends JSBaseIntroduceHandler<JSStatement, Settings, JSIntroduceVariableDialog> {
+    @Override
+    protected String getRefactoringName() {
+        return JavaScriptLocalize.javascriptIntroduceVariableTitle().get();
+    }
 
-	@Override
-	protected LocalizeValue getCannotIntroduceMessage()
-	{
-		return JavaScriptLocalize.javascriptIntroduceVariableErrorNoExpressionSelected();
-	}
+    @Override
+    protected LocalizeValue getCannotIntroduceMessage() {
+        return JavaScriptLocalize.javascriptIntroduceVariableErrorNoExpressionSelected();
+    }
 
-	@Override
-	protected String getDeclText(Settings settings)
-	{
-		return settings.getIntroducedVarType().toString().toLowerCase() + " " + settings.getVariableName();
-	}
+    @Override
+    protected String getDeclText(Settings settings) {
+        return settings.getIntroducedVarType().toString().toLowerCase() + " " + settings.getVariableName();
+    }
 
-	@Override
-	protected JSIntroduceVariableDialog createDialog(final Project project, final JSExpression expression, final JSExpression[] occurrences)
-	{
-		return new JSIntroduceVariableDialog(project, occurrences, expression);
-	}
+    @Override
+    protected JSIntroduceVariableDialog createDialog(
+        final Project project,
+        final JSExpression expression,
+        final JSExpression[] occurrences
+    ) {
+        return new JSIntroduceVariableDialog(project, occurrences, expression);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/Settings.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/Settings.java
index 6da63a20..6499fe7f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/Settings.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/Settings.java
@@ -21,12 +21,12 @@
 /**
  * @author ven
  */
-public interface Settings extends BaseIntroduceSettings
-{
-	enum IntroducedVarType
-	{
-		VAR, CONST, LET
-	}
+public interface Settings extends BaseIntroduceSettings {
+    enum IntroducedVarType {
+        VAR,
+        CONST,
+        LET
+    }
 
-	IntroducedVarType getIntroducedVarType();
+    IntroducedVarType getIntroducedVarType();
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
index 5f6a662d..2871ba11 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
@@ -29,25 +29,22 @@
  * @since 2008-04-28
  */
 @ExtensionImpl
-public class JSDeclarationRangeHandler implements DeclarationRangeHandler<JSNamedElement>
-{
-	@Nonnull
-	@Override
-	public Class<JSNamedElement> getElementClass()
-	{
-		return JSNamedElement.class;
-	}
+public class JSDeclarationRangeHandler implements DeclarationRangeHandler<JSNamedElement> {
+    @Nonnull
+    @Override
+    public Class<JSNamedElement> getElementClass() {
+        return JSNamedElement.class;
+    }
 
-	@Override
-	@Nonnull
-	public TextRange getDeclarationRange(@Nonnull JSNamedElement namedElement)
-	{
-		final TextRange textRange = namedElement.getTextRange();
-		final PsiElement nameIdentifier = namedElement.getNameIdentifier();
-		final TextRange nameIdentifierRange = nameIdentifier != null ? nameIdentifier.getTextRange() : null;
-		int startOffset = nameIdentifierRange != null ? nameIdentifierRange.getStartOffset() : textRange.getStartOffset();
-		int endOffset = nameIdentifierRange != null ? nameIdentifierRange.getEndOffset() : textRange.getEndOffset();
+    @Override
+    @Nonnull
+    public TextRange getDeclarationRange(@Nonnull JSNamedElement namedElement) {
+        final TextRange textRange = namedElement.getTextRange();
+        final PsiElement nameIdentifier = namedElement.getNameIdentifier();
+        final TextRange nameIdentifierRange = nameIdentifier != null ? nameIdentifier.getTextRange() : null;
+        int startOffset = nameIdentifierRange != null ? nameIdentifierRange.getStartOffset() : textRange.getStartOffset();
+        int endOffset = nameIdentifierRange != null ? nameIdentifierRange.getEndOffset() : textRange.getEndOffset();
 
-		return new TextRange(startOffset, endOffset);
-	}
+        return new TextRange(startOffset, endOffset);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
index 2e8e59b3..2dd89ac1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
@@ -37,77 +37,66 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Apr 28, 2008
- *         Time: 8:34:30 PM
+ * Date: Apr 28, 2008
+ * Time: 8:34:30 PM
  */
 @ExtensionImpl
-public class JSDefinitionsSearchExecutor implements DefinitionsScopedSearchExecutor
-{
-	@Override
-	public boolean execute(@Nonnull final DefinitionsScopedSearch.SearchParameters parameters, @Nonnull final Processor<? super PsiElement> consumer)
-	{
-		final PsiElement sourceElement = parameters.getElement();
-		if(sourceElement instanceof PsiNamedElement && sourceElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE))
-		{
-			ReferencesSearch.search(sourceElement, GlobalSearchScope.projectScope(sourceElement.getProject())).forEach(t -> {
-				if (t instanceof JSReferenceExpression referenceExpression)
-				{
-					final PsiElement parent = referenceExpression.getParent();
-					final ResolveResult[] resolveResults = referenceExpression.multiResolve(true);
+public class JSDefinitionsSearchExecutor implements DefinitionsScopedSearchExecutor {
+    @Override
+    public boolean execute(
+        @Nonnull final DefinitionsScopedSearch.SearchParameters parameters,
+        @Nonnull final Processor<? super PsiElement> consumer
+    ) {
+        final PsiElement sourceElement = parameters.getElement();
+        if (sourceElement instanceof PsiNamedElement && sourceElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE)) {
+            ReferencesSearch.search(sourceElement, GlobalSearchScope.projectScope(sourceElement.getProject())).forEach(t -> {
+                if (t instanceof JSReferenceExpression referenceExpression) {
+                    final PsiElement parent = referenceExpression.getParent();
+                    final ResolveResult[] resolveResults = referenceExpression.multiResolve(true);
 
-					for (ResolveResult r : resolveResults)
-					{
-						PsiElement psiElement = r.getElement();
+                    for (ResolveResult r : resolveResults) {
+                        PsiElement psiElement = r.getElement();
 
-						if (psiElement != null &&
-								!JavaScriptIndex.isFromPredefinedFile(psiElement.getContainingFile()) &&
-								sourceElement != psiElement)
-						{
-							if (psiElement instanceof JSFunction fun && sourceElement instanceof JSFunction sourceFun)
-							{
-								if ((sourceFun.isGetProperty() && fun.isSetProperty()) || (sourceFun.isSetProperty() && fun.isGetProperty()))
-								{
-									return true;
-								}
-							}
+                        if (psiElement != null &&
+                            !JavaScriptIndex.isFromPredefinedFile(psiElement.getContainingFile()) &&
+                            sourceElement != psiElement) {
+                            if (psiElement instanceof JSFunction fun && sourceElement instanceof JSFunction sourceFun) {
+                                if ((sourceFun.isGetProperty() && fun.isSetProperty()) || (sourceFun.isSetProperty() && fun.isGetProperty())) {
+                                    return true;
+                                }
+                            }
 
-							if ((psiElement != sourceElement || !(psiElement instanceof JSClass)) && !consumer.process(psiElement))
-							{
-								return false;
-							}
-						}
-					}
+                            if ((psiElement != sourceElement || !(psiElement instanceof JSClass)) && !consumer.process(psiElement)) {
+                                return false;
+                            }
+                        }
+                    }
 
-					if (!(parent instanceof JSDefinitionExpression))
-					{
-						return false;
-					}
-				}
-				return true;
-			});
+                    if (!(parent instanceof JSDefinitionExpression)) {
+                        return false;
+                    }
+                }
+                return true;
+            });
 
-			if (sourceElement instanceof JSClass clazz)
-			{
-				final Processor<JSClass> delegatingProcessor = jsClass -> consumer.process(jsClass);
-				JSClassSearch.searchClassInheritors(clazz, true).forEach(delegatingProcessor);
+            if (sourceElement instanceof JSClass clazz) {
+                final Processor<JSClass> delegatingProcessor = jsClass -> consumer.process(jsClass);
+                JSClassSearch.searchClassInheritors(clazz, true).forEach(delegatingProcessor);
 
-				if (clazz.isInterface())
-				{
-					JSClassSearch.searchInterfaceImplementations(clazz, true).forEach(delegatingProcessor);
-				}
-			}
-			else if (sourceElement instanceof JSFunction baseFunction)
-			{
-				final Processor<JSFunction> delegatingProcessor = jsFunction -> consumer.process(jsFunction);
-				JSFunctionsSearch.searchOverridingFunctions(baseFunction, true).forEach(delegatingProcessor);
+                if (clazz.isInterface()) {
+                    JSClassSearch.searchInterfaceImplementations(clazz, true).forEach(delegatingProcessor);
+                }
+            }
+            else if (sourceElement instanceof JSFunction baseFunction) {
+                final Processor<JSFunction> delegatingProcessor = jsFunction -> consumer.process(jsFunction);
+                JSFunctionsSearch.searchOverridingFunctions(baseFunction, true).forEach(delegatingProcessor);
 
-				final PsiElement parent = baseFunction.getParent();
-				if (parent instanceof JSClass jsClass && jsClass.isInterface())
-				{
-					JSFunctionsSearch.searchImplementingFunctions(baseFunction, true).forEach(delegatingProcessor);
-				}
-			}
-		}
-		return true;
-	}
+                final PsiElement parent = baseFunction.getParent();
+                if (parent instanceof JSClass jsClass && jsClass.isInterface()) {
+                    JSFunctionsSearch.searchImplementingFunctions(baseFunction, true).forEach(delegatingProcessor);
+                }
+            }
+        }
+        return true;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
index 3d02c5ec..f7df2064 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
@@ -26,93 +26,78 @@
 import consulo.application.util.query.QueryFactory;
 import consulo.language.psi.PsiElement;
 
-public abstract class JSFunctionsSearch implements QueryExecutor<JSFunction, JSFunctionsSearch.SearchParameters>
-{
-	public static class SearchParameters
-	{
-		private JSFunction myBaseFunction;
-		private boolean myCheckDeepInheritance;
-
-		public SearchParameters(final JSFunction baseFunction, final boolean checkDeepInheritance)
-		{
-			myBaseFunction = baseFunction;
-			myCheckDeepInheritance = checkDeepInheritance;
-		}
-
-		public JSFunction getBaseFunction()
-		{
-			return myBaseFunction;
-		}
-
-		public boolean isCheckDeepInheritance()
-		{
-			return myCheckDeepInheritance;
-		}
-	}
-
-	public static Query<JSFunction> searchOverridingFunctions(final JSFunction baseFunction, final boolean checkDeepInheritance)
-	{
-		final SearchParameters parameters = new SearchParameters(baseFunction, checkDeepInheritance);
-		return OVERRIDDEN_FUNCTIONS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
-	}
-
-	public static Query<JSFunction> searchImplementingFunctions(final JSFunction baseFunction, final boolean checkDeepInheritance)
-	{
-		final SearchParameters parameters = new SearchParameters(baseFunction, checkDeepInheritance);
-		return IMPLEMENTING_FUNCTIONS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
-	}
-
-	private static QueryFactory<JSFunction, SearchParameters> OVERRIDDEN_FUNCTIONS_QUERY_FACTORY = new QueryFactory<JSFunction, SearchParameters>();
-	private static QueryFactory<JSFunction, SearchParameters> IMPLEMENTING_FUNCTIONS_QUERY_FACTORY = new QueryFactory<JSFunction, SearchParameters>();
-
-	static
-	{
-		OVERRIDDEN_FUNCTIONS_QUERY_FACTORY.registerExecutor(new JSFunctionsSearch()
-		{
-			@Override
-			protected Query<JSClass> makeQuery(final SearchParameters queryParameters, final PsiElement parent)
-			{
-				return JSClassSearch.searchClassInheritors((JSClass) parent, queryParameters.isCheckDeepInheritance());
-			}
-		});
-
-		IMPLEMENTING_FUNCTIONS_QUERY_FACTORY.registerExecutor(new ImplementingFunctionsSearch());
-	}
-
-	@Override
-	public boolean execute(final SearchParameters queryParameters, final Processor<? super JSFunction> consumer)
-	{
-		final JSFunction baseFunction = queryParameters.getBaseFunction();
-		PsiElement clazz = JSResolveUtil.findParent(baseFunction);
-
-		if(!(clazz instanceof JSClass))
-		{
-			return true;
-		}
-
-		return makeQuery(queryParameters, clazz).forEach(new Processor<JSClass>()
-		{
-			@Override
-			public boolean process(final JSClass jsClass)
-			{
-				JSFunction function = jsClass.findFunctionByNameAndKind(baseFunction.getName(), baseFunction.getKind());
-				if(function != null)
-				{
-					return consumer.process(function);
-				}
-				return true;
-			}
-		});
-	}
-
-	protected abstract Query<JSClass> makeQuery(final SearchParameters queryParameters, final PsiElement parent);
-
-	private static class ImplementingFunctionsSearch extends JSFunctionsSearch
-	{
-		@Override
-		protected Query<JSClass> makeQuery(final SearchParameters queryParameters, final PsiElement parent)
-		{
-			return JSClassSearch.searchInterfaceImplementations((JSClass) parent, true);
-		}
-	}
+public abstract class JSFunctionsSearch implements QueryExecutor<JSFunction, JSFunctionsSearch.SearchParameters> {
+    public static class SearchParameters {
+        private JSFunction myBaseFunction;
+        private boolean myCheckDeepInheritance;
+
+        public SearchParameters(final JSFunction baseFunction, final boolean checkDeepInheritance) {
+            myBaseFunction = baseFunction;
+            myCheckDeepInheritance = checkDeepInheritance;
+        }
+
+        public JSFunction getBaseFunction() {
+            return myBaseFunction;
+        }
+
+        public boolean isCheckDeepInheritance() {
+            return myCheckDeepInheritance;
+        }
+    }
+
+    public static Query<JSFunction> searchOverridingFunctions(final JSFunction baseFunction, final boolean checkDeepInheritance) {
+        final SearchParameters parameters = new SearchParameters(baseFunction, checkDeepInheritance);
+        return OVERRIDDEN_FUNCTIONS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
+    }
+
+    public static Query<JSFunction> searchImplementingFunctions(final JSFunction baseFunction, final boolean checkDeepInheritance) {
+        final SearchParameters parameters = new SearchParameters(baseFunction, checkDeepInheritance);
+        return IMPLEMENTING_FUNCTIONS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
+    }
+
+    private static QueryFactory<JSFunction, SearchParameters> OVERRIDDEN_FUNCTIONS_QUERY_FACTORY =
+        new QueryFactory<JSFunction, SearchParameters>();
+    private static QueryFactory<JSFunction, SearchParameters> IMPLEMENTING_FUNCTIONS_QUERY_FACTORY =
+        new QueryFactory<JSFunction, SearchParameters>();
+
+    static {
+        OVERRIDDEN_FUNCTIONS_QUERY_FACTORY.registerExecutor(new JSFunctionsSearch() {
+            @Override
+            protected Query<JSClass> makeQuery(final SearchParameters queryParameters, final PsiElement parent) {
+                return JSClassSearch.searchClassInheritors((JSClass)parent, queryParameters.isCheckDeepInheritance());
+            }
+        });
+
+        IMPLEMENTING_FUNCTIONS_QUERY_FACTORY.registerExecutor(new ImplementingFunctionsSearch());
+    }
+
+    @Override
+    public boolean execute(final SearchParameters queryParameters, final Processor<? super JSFunction> consumer) {
+        final JSFunction baseFunction = queryParameters.getBaseFunction();
+        PsiElement clazz = JSResolveUtil.findParent(baseFunction);
+
+        if (!(clazz instanceof JSClass)) {
+            return true;
+        }
+
+        return makeQuery(queryParameters, clazz).forEach(new Processor<JSClass>() {
+            @Override
+            public boolean process(final JSClass jsClass) {
+                JSFunction function = jsClass.findFunctionByNameAndKind(baseFunction.getName(), baseFunction.getKind());
+                if (function != null) {
+                    return consumer.process(function);
+                }
+                return true;
+            }
+        });
+    }
+
+    protected abstract Query<JSClass> makeQuery(final SearchParameters queryParameters, final PsiElement parent);
+
+    private static class ImplementingFunctionsSearch extends JSFunctionsSearch {
+        @Override
+        protected Query<JSClass> makeQuery(final SearchParameters queryParameters, final PsiElement parent) {
+            return JSClassSearch.searchInterfaceImplementations((JSClass)parent, true);
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
index 9c4e0dbc..c3f10c20 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
@@ -27,43 +27,36 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Apr 28, 2008
- *         Time: 8:14:14 PM
+ * Date: Apr 28, 2008
+ * Time: 8:14:14 PM
  */
 @ExtensionImpl
-public class JSGotoTargetRendererProvider implements GotoTargetRendererProvider
-{
-	static class JSClassListCellRenderer extends PsiElementListCellRenderer<JSNamedElement>
-	{
-		@Override
-		public String getElementText(final JSNamedElement element)
-		{
-			return element.getName();
-		}
+public class JSGotoTargetRendererProvider implements GotoTargetRendererProvider {
+    static class JSClassListCellRenderer extends PsiElementListCellRenderer<JSNamedElement> {
+        @Override
+        public String getElementText(final JSNamedElement element) {
+            return element.getName();
+        }
 
-		@Override
-		protected String getContainerText(final JSNamedElement element, final String name)
-		{
-			final ItemPresentation presentation = ((NavigationItem) element).getPresentation();
-			return presentation != null ? presentation.getLocationString() : null;
-		}
+        @Override
+        protected String getContainerText(final JSNamedElement element, final String name) {
+            final ItemPresentation presentation = ((NavigationItem)element).getPresentation();
+            return presentation != null ? presentation.getLocationString() : null;
+        }
 
-		@Override
-		protected int getIconFlags()
-		{
-			return 0;
-		}
-	}
+        @Override
+        protected int getIconFlags() {
+            return 0;
+        }
+    }
 
-	@Nullable
-	@Override
-	public PsiElementListCellRenderer getRenderer(PsiElement element)
-	{
-		if(!(element instanceof JSNamedElement))
-		{
-			return null;
-		}
+    @Nullable
+    @Override
+    public PsiElementListCellRenderer getRenderer(PsiElement element) {
+        if (!(element instanceof JSNamedElement)) {
+            return null;
+        }
 
-		return new JSClassListCellRenderer();
-	}
+        return new JSClassListCellRenderer();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
index ae9b4c7e..90b11892 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
@@ -28,132 +28,107 @@
 
 /**
  * @author Maxim.Mossienko
- *         Date: Jul 23, 2008
- *         Time: 6:54:27 PM
+ * Date: Jul 23, 2008
+ * Time: 6:54:27 PM
  */
-public class JSStructureItemPresentation extends JSStructureViewElement.JSStructureItemPresentationBase
-{
-	public JSStructureItemPresentation(final JSStructureViewElement jsStructureViewElement)
-	{
-		super(jsStructureViewElement);
-	}
-
-	@Override
-	@RequiredReadAction
-	public String getPresentableText()
-	{
-		PsiElement psiElement = element.getUpToDateElement();
-		if(psiElement == null || !psiElement.isValid())
-		{
-			return "*invalid*";
-		}
-
-		return getName(psiElement);
-	}
-
-	@RequiredReadAction
-	public static String getName(@Nonnull PsiElement psiElement)
-	{
-		if(psiElement instanceof JSObjectLiteralExpression)
-		{
-			if (psiElement.getParent() instanceof JSAssignmentExpression assignmentExpression)
-			{
-				final JSExpression expression = ((JSDefinitionExpression) assignmentExpression.getLOperand()).getExpression();
-				return JSResolveUtil.findClassIdentifier(expression).getText();
-			}
-			else
-			{
-				return JavaScriptLocalize.javascriptLanguageTermPrototype().get();
-			}
-		}
-
-		if (psiElement instanceof JSDefinitionExpression definitionExpression)
-		{
-			psiElement = definitionExpression.getExpression();
-		}
-
-		if (psiElement instanceof JSReferenceExpression expression)
-		{
-			String s = expression.getReferencedName();
-
-			if(JSResolveUtil.PROTOTYPE_FIELD_NAME.equals(s))
-			{
-				final JSExpression jsExpression = expression.getQualifier();
-				if (jsExpression instanceof JSReferenceExpression referenceExpression)
-				{
-					s = referenceExpression.getReferencedName();
-				}
-			}
-			return s;
-		}
-
-		if(!(psiElement instanceof PsiNamedElement))
-		{
-			return psiElement.getText();
-		}
-
-		String name = ((PsiNamedElement) psiElement).getName();
-
-		if (psiElement instanceof JSProperty property)
-		{
-			psiElement = property.getValue();
-		}
-
-		if(psiElement instanceof JSFunction)
-		{
-			if(name == null)
-			{
-				name = "<anonymous>";
-			}
-			name += "(";
-			JSParameterList parameterList = ((JSFunction) psiElement).getParameterList();
-			if(parameterList != null)
-			{
-				for(JSParameter p : parameterList.getParameters())
-				{
-					if(!name.endsWith("("))
-					{
-						name += ", ";
-					}
-					name += p.getName();
-					final String variableType = p.getTypeString();
-					if(variableType != null)
-					{
-						name += ":" + variableType;
-					}
-				}
-			}
-			name += ")";
-
-			final String type = ((JSFunction) psiElement).getReturnTypeString();
-			if(type != null)
-			{
-				name += ":" + type;
-			}
-		}
-
-		if (name == null && psiElement.getParent() instanceof JSAssignmentExpression assignmentExpression)
-		{
-			JSExpression lOperand = ((JSDefinitionExpression) assignmentExpression.getLOperand()).getExpression();
-			lOperand = JSResolveUtil.findClassIdentifier(lOperand);
-			if (lOperand instanceof JSReferenceExpression referenceExpression)
-			{
-				return referenceExpression.getReferencedName();
-			}
-			return lOperand.getText();
-		}
-		return name;
-	}
-
-	@Override
-	@RequiredReadAction
-	public Image getIcon()
-	{
-		final PsiElement psiElement = this.element.getRealElement();
-		if(!psiElement.isValid())
-		{
-			return null;
-		}
-		return IconDescriptorUpdaters.getIcon(psiElement, 0);
-	}
+public class JSStructureItemPresentation extends JSStructureViewElement.JSStructureItemPresentationBase {
+    public JSStructureItemPresentation(final JSStructureViewElement jsStructureViewElement) {
+        super(jsStructureViewElement);
+    }
+
+    @Override
+    @RequiredReadAction
+    public String getPresentableText() {
+        PsiElement psiElement = element.getUpToDateElement();
+        if (psiElement == null || !psiElement.isValid()) {
+            return "*invalid*";
+        }
+
+        return getName(psiElement);
+    }
+
+    @RequiredReadAction
+    public static String getName(@Nonnull PsiElement psiElement) {
+        if (psiElement instanceof JSObjectLiteralExpression) {
+            if (psiElement.getParent() instanceof JSAssignmentExpression assignmentExpression) {
+                final JSExpression expression = ((JSDefinitionExpression)assignmentExpression.getLOperand()).getExpression();
+                return JSResolveUtil.findClassIdentifier(expression).getText();
+            }
+            else {
+                return JavaScriptLocalize.javascriptLanguageTermPrototype().get();
+            }
+        }
+
+        if (psiElement instanceof JSDefinitionExpression definitionExpression) {
+            psiElement = definitionExpression.getExpression();
+        }
+
+        if (psiElement instanceof JSReferenceExpression expression) {
+            String s = expression.getReferencedName();
+
+            if (JSResolveUtil.PROTOTYPE_FIELD_NAME.equals(s)) {
+                final JSExpression jsExpression = expression.getQualifier();
+                if (jsExpression instanceof JSReferenceExpression referenceExpression) {
+                    s = referenceExpression.getReferencedName();
+                }
+            }
+            return s;
+        }
+
+        if (!(psiElement instanceof PsiNamedElement)) {
+            return psiElement.getText();
+        }
+
+        String name = ((PsiNamedElement)psiElement).getName();
+
+        if (psiElement instanceof JSProperty property) {
+            psiElement = property.getValue();
+        }
+
+        if (psiElement instanceof JSFunction) {
+            if (name == null) {
+                name = "<anonymous>";
+            }
+            name += "(";
+            JSParameterList parameterList = ((JSFunction)psiElement).getParameterList();
+            if (parameterList != null) {
+                for (JSParameter p : parameterList.getParameters()) {
+                    if (!name.endsWith("(")) {
+                        name += ", ";
+                    }
+                    name += p.getName();
+                    final String variableType = p.getTypeString();
+                    if (variableType != null) {
+                        name += ":" + variableType;
+                    }
+                }
+            }
+            name += ")";
+
+            final String type = ((JSFunction)psiElement).getReturnTypeString();
+            if (type != null) {
+                name += ":" + type;
+            }
+        }
+
+        if (name == null && psiElement.getParent() instanceof JSAssignmentExpression assignmentExpression) {
+            JSExpression lOperand = ((JSDefinitionExpression)assignmentExpression.getLOperand()).getExpression();
+            lOperand = JSResolveUtil.findClassIdentifier(lOperand);
+            if (lOperand instanceof JSReferenceExpression referenceExpression) {
+                return referenceExpression.getReferencedName();
+            }
+            return lOperand.getText();
+        }
+        return name;
+    }
+
+    @Override
+    @RequiredReadAction
+    public Image getIcon() {
+        final PsiElement psiElement = this.element.getRealElement();
+        if (!psiElement.isValid()) {
+            return null;
+        }
+        return IconDescriptorUpdaters.getIcon(psiElement, 0);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
index fa676c23..e0c6677b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
@@ -31,32 +31,26 @@
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class JSStructureViewBuilderFactory implements PsiStructureViewFactory
-{
-	@Override
-	public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile)
-	{
-		return new TreeBasedStructureViewBuilder()
-		{
-			@Override
-			@Nonnull
-			public StructureViewModel createStructureViewModel(Editor editor)
-			{
-				return new JSStructureViewModel(psiFile);
-			}
+public class JSStructureViewBuilderFactory implements PsiStructureViewFactory {
+    @Override
+    public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+        return new TreeBasedStructureViewBuilder() {
+            @Override
+            @Nonnull
+            public StructureViewModel createStructureViewModel(Editor editor) {
+                return new JSStructureViewModel(psiFile);
+            }
 
-			@Override
-			public boolean isRootNodeShown()
-			{
-				return false;
-			}
-		};
-	}
+            @Override
+            public boolean isRootNodeShown() {
+                return false;
+            }
+        };
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
index 52fb4034..afe01ee2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
@@ -32,424 +32,357 @@
 import consulo.util.collection.primitive.ints.IntObjectMap;
 
 import jakarta.annotation.Nullable;
+
 import java.util.*;
 
 /**
  * @author max
  */
-public class JSStructureViewElement implements StructureViewTreeElement
-{
-	protected PsiElement myElement;
-	private boolean myInherited;
-
-	public JSStructureViewElement(final PsiElement element)
-	{
-		myElement = element;
-	}
-
-	@Override
-	public PsiElement getValue()
-	{
-		return myElement;
-	}
-
-	PsiElement getRealElement()
-	{
-		return myElement;
-	}
-
-	@Override
-	public void navigate(boolean requestFocus)
-	{
-		((Navigatable) myElement).navigate(requestFocus);
-	}
-
-	@Override
-	public boolean canNavigate()
-	{
-		return ((Navigatable) myElement).canNavigate();
-	}
-
-	@Override
-	public boolean canNavigateToSource()
-	{
-		return canNavigate();
-	}
-
-	@Override
-	public StructureViewTreeElement[] getChildren()
-	{
-		final PsiElement element = getUpToDateElement();
-		// since we use proxies for StructureViewElement then real element may invalidate due to structural change
-		if(element == null)
-		{
-			return EMPTY_ARRAY;
-		}
-
-		final Set<String> referencedNamedIds = new HashSet<String>();
-
-
-		List<StructureViewTreeElement> children = collectMyElements(referencedNamedIds);
-
-		ArrayList<StructureViewTreeElement> elementsFromSupers = null;
-
-		if(element instanceof JSClass)
-		{
-			for(JSClass clazz : ((JSClass) element).getSuperClasses())
-			{
-				final StructureViewTreeElement[] structureViewTreeElements = createStructureViewElement(clazz).getChildren();
-
-				if(elementsFromSupers == null)
-				{
-					elementsFromSupers = new ArrayList<StructureViewTreeElement>(structureViewTreeElements.length);
-				}
-				else
-				{
-					elementsFromSupers.ensureCapacity(elementsFromSupers.size() + structureViewTreeElements.length);
-				}
-
-				for(StructureViewTreeElement e : structureViewTreeElements)
-				{
-					if(!isVisible((PsiElement) e.getValue(), element))
-					{
-						continue;
-					}
-					// TODO CSS styles can also be inherited, so we better show them
-					// This can't be done until 'inherited' property is elevated up to StructureViewTreeElement interface
-					if(!(e instanceof JSStructureViewElement))
-					{
-						continue;
-					}
-					((JSStructureViewElement) e).setInherited(true);
-					elementsFromSupers.add(e);
-				}
-			}
-		}
-
-
-		Collections.sort(children, new Comparator<StructureViewTreeElement>()
-		{
-			@Override
-			public int compare(final StructureViewTreeElement _o1, final StructureViewTreeElement _o2)
-			{
-				PsiElement e = getPsiElement(_o1);
-				PsiElement e2 = getPsiElement(_o2);
-
-				TextRange t1 = InjectedLanguageManager.getInstance(e.getProject()).injectedToHost(e, e.getTextRange());
-				TextRange t2 = InjectedLanguageManager.getInstance(e.getProject()).injectedToHost(e, e.getTextRange());
-				final int offset = e.getTextOffset() + t1.getStartOffset();
-				final int offset2 = e2.getTextOffset() + t2.getStartOffset();
-
-				return offset - offset2;
-			}
-		});
-
-		if(elementsFromSupers != null)
-		{
-			Map<String, JSFunction> functionsByNames = new HashMap<String, JSFunction>();
-			for(StructureViewTreeElement child : children)
-			{
-				PsiElement el = getPsiElementResolveProxy(child);
-				if(el instanceof JSFunction)
-				{
-					JSFunction function = (JSFunction) el;
-					functionsByNames.put(function.getName(), function);
-				}
-			}
-
-			for(StructureViewTreeElement superTreeElement : elementsFromSupers)
-			{
-				PsiElement superElement = getPsiElementResolveProxy(superTreeElement);
-				boolean addSuperElement = true;
-				if(superElement instanceof JSFunction)
-				{
-					JSFunction superFunction = (JSFunction) superElement;
-					JSFunction function = functionsByNames.get(superFunction.getName());
-					if(function != null)
-					{
-						// TODO check signature
-						addSuperElement = false;
-					}
-				}
-
-				if(addSuperElement)
-				{
-					children.add(superTreeElement);
-				}
-			}
-		}
-		return children.toArray(new StructureViewTreeElement[children.size()]);
-	}
-
-	protected JSStructureViewElement createStructureViewElement(PsiElement element)
-	{
-		return new JSStructureViewElement(element);
-	}
-
-	private static PsiElement getPsiElement(StructureViewTreeElement element)
-	{
-		PsiElement e;
-		if(element instanceof JSStructureViewElement)
-		{
-			final JSStructureViewElement o1 = (JSStructureViewElement) element;
-			e = o1.myElement;
-		}
-		else
-		{
-			e = (PsiElement) element.getValue();
-		}
-		return e;
-	}
-
-	public static PsiElement getPsiElementResolveProxy(StructureViewTreeElement element)
-	{
-		return getPsiElement(element);
-	}
-
-
-	protected List<StructureViewTreeElement> collectMyElements(final Set<String> referencedNamedIds)
-	{
-		final IntObjectMap<PsiElement> offset2Element = IntMaps.newIntObjectHashMap();
-
-		collectChildrenFromElement(myElement, referencedNamedIds, offset2Element);
-
-		final List<StructureViewTreeElement> children = new ArrayList<StructureViewTreeElement>(offset2Element.size());
-		offset2Element.forEach((textOffset, element) -> children.add(createStructureViewElement(element)));
-		return children;
-	}
-
-	private static boolean isVisible(PsiElement namedElement, final PsiElement element)
-	{
-		if(namedElement instanceof JSAttributeListOwner)
-		{
-			final JSAttributeListOwner attributeListOwner = (JSAttributeListOwner) namedElement;
-			final JSAttributeList attributeList = attributeListOwner.getAttributeList();
-
-			if(attributeList != null)
-			{
-				final JSAttributeList.AccessType type = attributeList.getAccessType();
-
-				if(type == JSAttributeList.AccessType.PACKAGE_LOCAL)
-				{
-					final JSPackageStatement packageStatement = PsiTreeUtil.getParentOfType(namedElement, JSPackageStatement.class);
-					final JSPackageStatement packageStatement2 = PsiTreeUtil.getParentOfType(element, JSPackageStatement.class);
-					String packageQName;
-
-					return packageStatement == packageStatement2 || (packageStatement != null &&
-							packageStatement2 != null &&
-							(packageQName = packageStatement.getQualifiedName()) != null &&
-							packageQName.equals(packageStatement2.getQualifiedName()));
-				}
-				return type != JSAttributeList.AccessType.PRIVATE;
-			}
-		}
-		return true;
-	}
-
-	private static void collectChildrenFromElement(final PsiElement element, final Set<String> referencedNamedIds, final IntObjectMap<PsiElement> offset2Element)
-	{
-		element.acceptChildren(new JSElementVisitor()
-		{
-			Set<PsiFile> visited;
-			PsiElement context = element;
-
-			@Override
-			public void visitElement(PsiElement element)
-			{
-				if(element instanceof JSNamedElement &&
-						((JSNamedElement) element).getName() != null &&
-						!(element instanceof JSDefinitionExpression) &&
-						!(element instanceof JSLabeledStatement) &&
-						!(element instanceof JSPackageStatement) &&
-						!(element instanceof JavaScriptImportStatementBase))
-				{
-					if(!(element instanceof JSFunction) || !(element.getParent() instanceof JSProperty))
-					{
-						addElement(element);
-					}
-					else
-					{
-						element.acceptChildren(this);
-					}
-				}
-				else
-				{
-					element.acceptChildren(this);
-				}
-			}
-
-			@Override
-			public void visitJSParameter(final JSParameter node)
-			{
-				// Do not add parameters to structure view
-			}
-
-			@Override
-			public void visitJSIncludeDirective(final JSIncludeDirective includeDirective)
-			{
-				final PsiFile file = includeDirective.resolveFile();
-				if(file instanceof JSFile)
-				{
-					if(visited != null && visited.contains(file))
-					{
-						return;
-					}
-					if(visited == null)
-					{
-						visited = new HashSet<PsiFile>();
-					}
-					visited.add(file);
-
-					final PsiElement prevContext = context;
-					context = file;
-					context.putUserData(JSResolveUtil.contextKey, element);
-					file.acceptChildren(this);
-					context = prevContext;
-				}
-			}
-
-			@Override
-			public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node)
-			{
-				final PsiElement parent = node.getParent();
-				if(parent instanceof JSVariable ||
-						parent instanceof JSProperty ||
-						parent instanceof JSFile ||
-						parent instanceof JSReturnStatement ||
-						parent instanceof JSAssignmentExpression)
-				{
-					node.acceptChildren(this);
-					return;
-				}
-				if(parent instanceof JSArgumentList)
-				{
-					final JSElement expression = JSSymbolUtil.findQualifyingExpressionFromArgumentList((JSArgumentList) parent);
-					if(expression != null)
-					{
-						return;
-					}
-				}
-				if(node.getProperties().length > 0)
-				{
-					addElement(node);
-				}
-			}
-
-			@Override
-			public void visitJSVariable(final JSVariable node)
-			{
-				if(element instanceof JSFunction)
-				{
-					return;
-				}
-				super.visitJSVariable(node);
-			}
-
-			@Override
-			public void visitJSAssignmentExpression(final JSAssignmentExpression node)
-			{
-				JSExpression rOperand = node.getROperand();
-				final JSExpression lOperand = node.getLOperand();
-
-				final boolean outsideFunction = PsiTreeUtil.getParentOfType(node, JSFunction.class) == null;
-				if(!outsideFunction)
-				{
-					return;
-				}
-
-				if(rOperand instanceof JSCallExpression)
-				{
-					rOperand = ((JSCallExpression) rOperand).getMethodExpression();
-				}
-
-				if(rOperand instanceof JSFunction)
-				{
-					JSExpression qualifier = null;
-					final JSExpression operand = ((JSDefinitionExpression) lOperand).getExpression();
-
-					if(operand instanceof JSReferenceExpression)
-					{
-						qualifier = ((JSReferenceExpression) operand).getQualifier();
-					}
-					if((qualifier == null || qualifier instanceof JSThisExpression))
-					{
-						addElement(rOperand);
-					}
-				}
-				else if(lOperand != null)
-				{
-					final JSExpression operand = ((JSDefinitionExpression) lOperand).getExpression();
-					if(operand instanceof JSReferenceExpression && ((JSReferenceExpression) operand).getQualifier() instanceof JSThisExpression)
-					{
-						final PsiElement resolved = ((JSReferenceExpression) operand).resolve();
-						if(resolved == lOperand)
-						{
-							addElement(lOperand);
-						}
-					}
-					//super.visitJSAssignmentExpression(node);
-				}
-			}
-
-			private void addElement(final PsiElement lOperand)
-			{
-				if(lOperand instanceof JSNamedElement)
-				{
-					final String namedId = ((JSNamedElement) lOperand).getName();
-					if(referencedNamedIds.contains(namedId))
-					{
-						return;
-					}
-					referencedNamedIds.add(namedId);
-				}
-				offset2Element.put(lOperand.getTextOffset(), lOperand);
-			}
-		});
-	}
-
-	@Override
-	public ItemPresentation getPresentation()
-	{
-		return new JSStructureItemPresentation(this);
-	}
-
-	public boolean isInherited()
-	{
-		return myInherited;
-	}
-
-	private void setInherited(boolean b)
-	{
-		myInherited = b;
-	}
-
-	public
-	@Nullable
-	PsiElement getUpToDateElement()
-	{
-		boolean isValid = myElement.isValid();
-
-		if(!isValid)
-		{
-			return null;
-		}
-
-		return myElement;
-	}
-
-	static abstract class JSStructureItemPresentationBase implements ItemPresentation
-	{
-		final protected JSStructureViewElement element;
-
-		JSStructureItemPresentationBase(JSStructureViewElement _element)
-		{
-			element = _element;
-		}
-
-		@Override
-		public String getLocationString()
-		{
-			return null;
-		}
-	}
+public class JSStructureViewElement implements StructureViewTreeElement {
+    protected PsiElement myElement;
+    private boolean myInherited;
+
+    public JSStructureViewElement(final PsiElement element) {
+        myElement = element;
+    }
+
+    @Override
+    public PsiElement getValue() {
+        return myElement;
+    }
+
+    PsiElement getRealElement() {
+        return myElement;
+    }
+
+    @Override
+    public void navigate(boolean requestFocus) {
+        ((Navigatable)myElement).navigate(requestFocus);
+    }
+
+    @Override
+    public boolean canNavigate() {
+        return ((Navigatable)myElement).canNavigate();
+    }
+
+    @Override
+    public boolean canNavigateToSource() {
+        return canNavigate();
+    }
+
+    @Override
+    public StructureViewTreeElement[] getChildren() {
+        final PsiElement element = getUpToDateElement();
+        // since we use proxies for StructureViewElement then real element may invalidate due to structural change
+        if (element == null) {
+            return EMPTY_ARRAY;
+        }
+
+        final Set<String> referencedNamedIds = new HashSet<String>();
+
+
+        List<StructureViewTreeElement> children = collectMyElements(referencedNamedIds);
+
+        ArrayList<StructureViewTreeElement> elementsFromSupers = null;
+
+        if (element instanceof JSClass) {
+            for (JSClass clazz : ((JSClass)element).getSuperClasses()) {
+                final StructureViewTreeElement[] structureViewTreeElements = createStructureViewElement(clazz).getChildren();
+
+                if (elementsFromSupers == null) {
+                    elementsFromSupers = new ArrayList<StructureViewTreeElement>(structureViewTreeElements.length);
+                }
+                else {
+                    elementsFromSupers.ensureCapacity(elementsFromSupers.size() + structureViewTreeElements.length);
+                }
+
+                for (StructureViewTreeElement e : structureViewTreeElements) {
+                    if (!isVisible((PsiElement)e.getValue(), element)) {
+                        continue;
+                    }
+                    // TODO CSS styles can also be inherited, so we better show them
+                    // This can't be done until 'inherited' property is elevated up to StructureViewTreeElement interface
+                    if (!(e instanceof JSStructureViewElement)) {
+                        continue;
+                    }
+                    ((JSStructureViewElement)e).setInherited(true);
+                    elementsFromSupers.add(e);
+                }
+            }
+        }
+
+
+        Collections.sort(children, new Comparator<StructureViewTreeElement>() {
+            @Override
+            public int compare(final StructureViewTreeElement _o1, final StructureViewTreeElement _o2) {
+                PsiElement e = getPsiElement(_o1);
+                PsiElement e2 = getPsiElement(_o2);
+
+                TextRange t1 = InjectedLanguageManager.getInstance(e.getProject()).injectedToHost(e, e.getTextRange());
+                TextRange t2 = InjectedLanguageManager.getInstance(e.getProject()).injectedToHost(e, e.getTextRange());
+                final int offset = e.getTextOffset() + t1.getStartOffset();
+                final int offset2 = e2.getTextOffset() + t2.getStartOffset();
+
+                return offset - offset2;
+            }
+        });
+
+        if (elementsFromSupers != null) {
+            Map<String, JSFunction> functionsByNames = new HashMap<String, JSFunction>();
+            for (StructureViewTreeElement child : children) {
+                PsiElement el = getPsiElementResolveProxy(child);
+                if (el instanceof JSFunction) {
+                    JSFunction function = (JSFunction)el;
+                    functionsByNames.put(function.getName(), function);
+                }
+            }
+
+            for (StructureViewTreeElement superTreeElement : elementsFromSupers) {
+                PsiElement superElement = getPsiElementResolveProxy(superTreeElement);
+                boolean addSuperElement = true;
+                if (superElement instanceof JSFunction) {
+                    JSFunction superFunction = (JSFunction)superElement;
+                    JSFunction function = functionsByNames.get(superFunction.getName());
+                    if (function != null) {
+                        // TODO check signature
+                        addSuperElement = false;
+                    }
+                }
+
+                if (addSuperElement) {
+                    children.add(superTreeElement);
+                }
+            }
+        }
+        return children.toArray(new StructureViewTreeElement[children.size()]);
+    }
+
+    protected JSStructureViewElement createStructureViewElement(PsiElement element) {
+        return new JSStructureViewElement(element);
+    }
+
+    private static PsiElement getPsiElement(StructureViewTreeElement element) {
+        PsiElement e;
+        if (element instanceof JSStructureViewElement) {
+            final JSStructureViewElement o1 = (JSStructureViewElement)element;
+            e = o1.myElement;
+        }
+        else {
+            e = (PsiElement)element.getValue();
+        }
+        return e;
+    }
+
+    public static PsiElement getPsiElementResolveProxy(StructureViewTreeElement element) {
+        return getPsiElement(element);
+    }
+
+
+    protected List<StructureViewTreeElement> collectMyElements(final Set<String> referencedNamedIds) {
+        final IntObjectMap<PsiElement> offset2Element = IntMaps.newIntObjectHashMap();
+
+        collectChildrenFromElement(myElement, referencedNamedIds, offset2Element);
+
+        final List<StructureViewTreeElement> children = new ArrayList<StructureViewTreeElement>(offset2Element.size());
+        offset2Element.forEach((textOffset, element) -> children.add(createStructureViewElement(element)));
+        return children;
+    }
+
+    private static boolean isVisible(PsiElement namedElement, final PsiElement element) {
+        if (namedElement instanceof JSAttributeListOwner) {
+            final JSAttributeListOwner attributeListOwner = (JSAttributeListOwner)namedElement;
+            final JSAttributeList attributeList = attributeListOwner.getAttributeList();
+
+            if (attributeList != null) {
+                final JSAttributeList.AccessType type = attributeList.getAccessType();
+
+                if (type == JSAttributeList.AccessType.PACKAGE_LOCAL) {
+                    final JSPackageStatement packageStatement = PsiTreeUtil.getParentOfType(namedElement, JSPackageStatement.class);
+                    final JSPackageStatement packageStatement2 = PsiTreeUtil.getParentOfType(element, JSPackageStatement.class);
+                    String packageQName;
+
+                    return packageStatement == packageStatement2 || (packageStatement != null &&
+                        packageStatement2 != null &&
+                        (packageQName = packageStatement.getQualifiedName()) != null &&
+                        packageQName.equals(packageStatement2.getQualifiedName()));
+                }
+                return type != JSAttributeList.AccessType.PRIVATE;
+            }
+        }
+        return true;
+    }
+
+    private static void collectChildrenFromElement(
+        final PsiElement element,
+        final Set<String> referencedNamedIds,
+        final IntObjectMap<PsiElement> offset2Element
+    ) {
+        element.acceptChildren(new JSElementVisitor() {
+            Set<PsiFile> visited;
+            PsiElement context = element;
+
+            @Override
+            public void visitElement(PsiElement element) {
+                if (element instanceof JSNamedElement
+                    && ((JSNamedElement)element).getName() != null
+                    && !(element instanceof JSDefinitionExpression)
+                    && !(element instanceof JSLabeledStatement)
+                    && !(element instanceof JSPackageStatement)
+                    && !(element instanceof JavaScriptImportStatementBase)) {
+                    if (!(element instanceof JSFunction) || !(element.getParent() instanceof JSProperty)) {
+                        addElement(element);
+                    }
+                    else {
+                        element.acceptChildren(this);
+                    }
+                }
+                else {
+                    element.acceptChildren(this);
+                }
+            }
+
+            @Override
+            public void visitJSParameter(final JSParameter node) {
+                // Do not add parameters to structure view
+            }
+
+            @Override
+            public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
+                final PsiFile file = includeDirective.resolveFile();
+                if (file instanceof JSFile) {
+                    if (visited != null && visited.contains(file)) {
+                        return;
+                    }
+                    if (visited == null) {
+                        visited = new HashSet<PsiFile>();
+                    }
+                    visited.add(file);
+
+                    final PsiElement prevContext = context;
+                    context = file;
+                    context.putUserData(JSResolveUtil.contextKey, element);
+                    file.acceptChildren(this);
+                    context = prevContext;
+                }
+            }
+
+            @Override
+            public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node) {
+                final PsiElement parent = node.getParent();
+                if (parent instanceof JSVariable
+                    || parent instanceof JSProperty
+                    || parent instanceof JSFile
+                    || parent instanceof JSReturnStatement
+                    || parent instanceof JSAssignmentExpression) {
+                    node.acceptChildren(this);
+                    return;
+                }
+                if (parent instanceof JSArgumentList) {
+                    final JSElement expression = JSSymbolUtil.findQualifyingExpressionFromArgumentList((JSArgumentList)parent);
+                    if (expression != null) {
+                        return;
+                    }
+                }
+
+                if (node.getProperties().length > 0) {
+                    addElement(node);
+                }
+            }
+
+            @Override
+            public void visitJSVariable(final JSVariable node) {
+                if (element instanceof JSFunction) {
+                    return;
+                }
+                super.visitJSVariable(node);
+            }
+
+            @Override
+            public void visitJSAssignmentExpression(final JSAssignmentExpression node) {
+                JSExpression rOperand = node.getROperand();
+                final JSExpression lOperand = node.getLOperand();
+
+                final boolean outsideFunction = PsiTreeUtil.getParentOfType(node, JSFunction.class) == null;
+                if (!outsideFunction) {
+                    return;
+                }
+
+                if (rOperand instanceof JSCallExpression) {
+                    rOperand = ((JSCallExpression)rOperand).getMethodExpression();
+                }
+
+                if (rOperand instanceof JSFunction) {
+                    JSExpression qualifier = null;
+                    final JSExpression operand = ((JSDefinitionExpression)lOperand).getExpression();
+
+                    if (operand instanceof JSReferenceExpression) {
+                        qualifier = ((JSReferenceExpression)operand).getQualifier();
+                    }
+
+                    if ((qualifier == null || qualifier instanceof JSThisExpression)) {
+                        addElement(rOperand);
+                    }
+                }
+                else if (lOperand != null) {
+                    final JSExpression operand = ((JSDefinitionExpression)lOperand).getExpression();
+                    if (operand instanceof JSReferenceExpression && ((JSReferenceExpression)operand).getQualifier() instanceof JSThisExpression) {
+                        final PsiElement resolved = ((JSReferenceExpression)operand).resolve();
+                        if (resolved == lOperand) {
+                            addElement(lOperand);
+                        }
+                    }
+                    //super.visitJSAssignmentExpression(node);
+                }
+            }
+
+            private void addElement(final PsiElement lOperand) {
+                if (lOperand instanceof JSNamedElement) {
+                    final String namedId = ((JSNamedElement)lOperand).getName();
+                    if (referencedNamedIds.contains(namedId)) {
+                        return;
+                    }
+                    referencedNamedIds.add(namedId);
+                }
+                offset2Element.put(lOperand.getTextOffset(), lOperand);
+            }
+        });
+    }
+
+    @Override
+    public ItemPresentation getPresentation() {
+        return new JSStructureItemPresentation(this);
+    }
+
+    public boolean isInherited() {
+        return myInherited;
+    }
+
+    private void setInherited(boolean b) {
+        myInherited = b;
+    }
+
+    public
+    @Nullable
+    PsiElement getUpToDateElement() {
+        boolean isValid = myElement.isValid();
+
+        if (!isValid) {
+            return null;
+        }
+
+        return myElement;
+    }
+
+    static abstract class JSStructureItemPresentationBase implements ItemPresentation {
+        final protected JSStructureViewElement element;
+
+        JSStructureItemPresentationBase(JSStructureViewElement _element) {
+            element = _element;
+        }
+
+        @Override
+        public String getLocationString() {
+            return null;
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
index 8b5a7384..d82f7a40 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
@@ -36,359 +36,312 @@
 import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.Comparator;
 import java.util.List;
 
 /**
  * @by max, maxim
  */
-public class JSStructureViewModel extends TextEditorBasedStructureViewModel
-{
-	private PsiElement myRoot;
-	private Filter[] myFilters = new Filter[]{
-			ourFieldsFilter,
-			ourInheritedFilter
-	};
-
-	@NonNls
-	private static final String ID = "KIND";
-	private static Sorter ourKindSorter = new Sorter()
-	{
-		private Comparator myComparator = new Comparator()
-		{
-			@Override
-			public int compare(final Object o, final Object o2)
-			{
-				return getWeight(o) - getWeight(o2);
-			}
-
-			private int getWeight(final Object s)
-			{
-				if(s instanceof JSSuperGroup)
-				{
-					return 5;
-				}
-				Object o = ((StructureViewTreeElement) s).getValue();
-
-				if(o instanceof JSProperty)
-				{
-					JSElement propertyValue = ((JSProperty) o).getValue();
-					if(propertyValue instanceof JSFunction)
-					{
-						o = propertyValue;
-					}
-				}
-
-				if(o instanceof JSClass)
-				{
-					return 7;
-				}
-				return 30;
-			}
-		};
-
-		@Override
-		public Comparator getComparator()
-		{
-			return myComparator;
-		}
-
-		@Override
-		public boolean isVisible()
-		{
-			return false;
-		}
-
-		@Override
-		@Nonnull
-		public ActionPresentation getPresentation()
-		{
-			return null; // will not be shown
-		}
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return ID;
-		}
-	};
-
-	private Sorter[] mySorters = new Sorter[]{
-			ourKindSorter,
-			Sorter.ALPHA_SORTER
-	};
-
-	private static Filter ourFieldsFilter = new Filter()
-	{
-		@NonNls
-		public static final String ID = "SHOW_FIELDS";
-
-		@Override
-		public boolean isVisible(TreeElement treeNode)
-		{
-			if(!(treeNode instanceof JSStructureViewElement))
-			{
-				return true;
-			}
-			final PsiElement element = ((JSStructureViewElement) treeNode).getRealElement();
-
-			if(element instanceof JSClass)
-			{
-				return true;
-			}
-
-			return element instanceof JSFunction ||
-					(element instanceof JSProperty && ((JSProperty) element).getValue() instanceof JSFunction) ||
-					element instanceof JSObjectLiteralExpression;
-		}
-
-		@Override
-		public boolean isReverted()
-		{
-			return true;
-		}
-
-		@Override
-		@Nonnull
-		public ActionPresentation getPresentation()
-		{
-			return new ActionPresentationData(IdeLocalize.actionStructureviewShowFields().get(), null, AllIcons.Nodes.Variable);
-		}
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return ID;
-		}
-	};
-
-	private static final Filter ourInheritedFilter = new FileStructureFilter()
-	{
-		@NonNls
-		public static final String ID = "SHOW_INHERITED";
-
-		@Override
-		public boolean isVisible(TreeElement treeNode)
-		{
-			if(treeNode instanceof JSStructureViewElement)
-			{
-				return !((JSStructureViewElement) treeNode).isInherited();
-			}
-			else
-			{
-				return true;
-			}
-		}
-
-		@Override
-		@Nonnull
-		public ActionPresentation getPresentation()
-		{
-      return new ActionPresentationData(
-				IdeLocalize.actionStructureviewShowInherited().get(),
-				null,
-				PlatformIconGroup.hierarchySupertypes()
-			);
-		}
-
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return ID;
-		}
-
-		@Override
-		public boolean isReverted()
-		{
-			return true;
-		}
-
-		@Override
-		public String getCheckBoxText()
-		{
-			return IdeLocalize.fileStructureToggleShowInherited().get();
-		}
-
-		@Override
-		public Shortcut[] getShortcut()
-		{
-			return KeymapManager.getInstance().getActiveKeymap().getShortcuts("FileStructurePopup");
-		}
-	};
-
-	private static Grouper myInheritedGrouper = new JSSuperGrouper();
-
-	private Grouper[] myGroupers = new Grouper[]{
-			myInheritedGrouper
-	};
-	private final Class[] myClasses = new Class[]{
-			JSFunction.class,
-			JSVariable.class,
-			JSDefinitionExpression.class,
-			JSClass.class,
-			JSProperty.class
-	};
-
-	public JSStructureViewModel(final PsiElement root)
-	{
-		super(root.getContainingFile());
-		myRoot = root;
-	}
-
-	public JSStructureViewModel(PsiElement root, final Editor editor)
-	{
-		super(editor);
-		myRoot = root;
-	}
-
-	@Override
-	@Nonnull
-	public StructureViewTreeElement getRoot()
-	{
-		return new JSStructureViewElement(myRoot);
-	}
-
-	@Override
-	@Nonnull
-	public Grouper[] getGroupers()
-	{
-		return myGroupers;
-	}
-
-	@Override
-	@Nonnull
-	public Sorter[] getSorters()
-	{
-		return mySorters;
-	}
-
-	@Override
-	@Nonnull
-	public Filter[] getFilters()
-	{
-		return myFilters;
-	}
-
-	@Override
-	protected boolean isSuitable(final PsiElement element)
-	{
-		return super.isSuitable(element) && (!(element instanceof JSVariable) || PsiTreeUtil.getParentOfType(element, JSFunction.class) == null);
-	}
-
-	@Override
-	public Object getCurrentEditorElement()
-	{
-		Object editorElement = super.getCurrentEditorElement();
-
-		final PsiFile file = getPsiFile();
-		if(editorElement == null && !(file instanceof JSFile))
-		{
-			final int offset = getEditor().getCaretModel().getOffset();
-			final PsiElement at = file.findElementAt(offset);
-			final PsiLanguageInjectionHost injectionHost = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class);
-
-			if(injectionHost != null)
-			{
-				final Ref<PsiElement> ref = new Ref<PsiElement>();
-				InjectedLanguageManager.getInstance(file.getProject()).enumerate(injectionHost, new PsiLanguageInjectionHost.InjectedPsiVisitor()
-				{
-					@Override
-					public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
-					{
-						final PsiLanguageInjectionHost.Shred shred = places.get(0);
-						final int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
-						final int offsetInInjected = offset - injectedStart;
-
-						ref.set(injectedPsi.findElementAt(offsetInInjected));
-					}
-				});
-
-				final PsiElement element = ref.get();
-				if(element != null)
-				{
-					editorElement = findAcceptableElement(element);
-					return editorElement;
-				}
-			}
-		}
-
-		if(editorElement instanceof JSDefinitionExpression)
-		{
-			final PsiElement element = ((PsiElement) editorElement).getParent();
-
-			if(element instanceof JSAssignmentExpression)
-			{
-				final JSExpression roperand = ((JSAssignmentExpression) element).getROperand();
-				if(roperand instanceof JSFunctionExpression)
-				{
-					editorElement = roperand;
-				}
-			}
-		}
-
-		if(editorElement instanceof JSNamedElement)
-		{
-			final PsiFile containingFile = ((PsiElement) editorElement).getContainingFile();
-			final PsiElement context = containingFile.getContext();
-			final int offset = ((PsiElement) editorElement).getTextOffset();
-			final PsiElement element;
-
-			if(context != null)
-			{
-				element = JavaScriptIndex.findSymbolWithNameAndOffsetInEntry(((JSNamedElement) editorElement).getName(), offset);
-			}
-			else
-			{
-				element = JavaScriptIndex.findSymbolByFileAndNameAndOffset(containingFile.getVirtualFile().getPath(), ((JSNamedElement) editorElement).getName(),
-						offset);
-			}
-			if(element != null)
-			{
-				editorElement = element;
-			}
-		}
-		return editorElement;
-	}
-
-	@Override
-	protected PsiFile getPsiFile()
-	{
-		return myRoot.getContainingFile();
-	}
-
-	@Override
-	@Nonnull
-	protected Class[] getSuitableClasses()
-	{
-		return myClasses;
-	}
-
-	public void setFilters(final Filter[] filters)
-	{
-		myFilters = filters;
-	}
-
-	public void setGroupers(final Grouper[] groupers)
-	{
-		myGroupers = groupers;
-	}
-
-	public void setSorters(final Sorter[] sorters)
-	{
-		mySorters = sorters;
-	}
-
-	@Override
-	public boolean shouldEnterElement(final Object element)
-	{
-		return shouldEnterElementStatic(element);
-	}
-
-	public static boolean shouldEnterElementStatic(final Object element)
-	{
-		return element instanceof JSClass;
-	}
+public class JSStructureViewModel extends TextEditorBasedStructureViewModel {
+    private PsiElement myRoot;
+    private Filter[] myFilters = new Filter[]{
+        ourFieldsFilter,
+        ourInheritedFilter
+    };
+
+    @NonNls
+    private static final String ID = "KIND";
+    private static Sorter ourKindSorter = new Sorter() {
+        private Comparator myComparator = new Comparator() {
+            @Override
+            public int compare(final Object o, final Object o2) {
+                return getWeight(o) - getWeight(o2);
+            }
+
+            private int getWeight(final Object s) {
+                if (s instanceof JSSuperGroup) {
+                    return 5;
+                }
+                Object o = ((StructureViewTreeElement)s).getValue();
+
+                if (o instanceof JSProperty) {
+                    JSElement propertyValue = ((JSProperty)o).getValue();
+                    if (propertyValue instanceof JSFunction) {
+                        o = propertyValue;
+                    }
+                }
+
+                if (o instanceof JSClass) {
+                    return 7;
+                }
+                return 30;
+            }
+        };
+
+        @Override
+        public Comparator getComparator() {
+            return myComparator;
+        }
+
+        @Override
+        public boolean isVisible() {
+            return false;
+        }
+
+        @Override
+        @Nonnull
+        public ActionPresentation getPresentation() {
+            return null; // will not be shown
+        }
+
+        @Override
+        @Nonnull
+        public String getName() {
+            return ID;
+        }
+    };
+
+    private Sorter[] mySorters = new Sorter[]{
+        ourKindSorter,
+        Sorter.ALPHA_SORTER
+    };
+
+    private static Filter ourFieldsFilter = new Filter() {
+        @NonNls
+        public static final String ID = "SHOW_FIELDS";
+
+        @Override
+        public boolean isVisible(TreeElement treeNode) {
+            if (!(treeNode instanceof JSStructureViewElement)) {
+                return true;
+            }
+            final PsiElement element = ((JSStructureViewElement)treeNode).getRealElement();
+
+            if (element instanceof JSClass) {
+                return true;
+            }
+
+            return element instanceof JSFunction ||
+                (element instanceof JSProperty && ((JSProperty)element).getValue() instanceof JSFunction) ||
+                element instanceof JSObjectLiteralExpression;
+        }
+
+        @Override
+        public boolean isReverted() {
+            return true;
+        }
+
+        @Override
+        @Nonnull
+        public ActionPresentation getPresentation() {
+            return new ActionPresentationData(IdeLocalize.actionStructureviewShowFields().get(), null, AllIcons.Nodes.Variable);
+        }
+
+        @Override
+        @Nonnull
+        public String getName() {
+            return ID;
+        }
+    };
+
+    private static final Filter ourInheritedFilter = new FileStructureFilter() {
+        @NonNls
+        public static final String ID = "SHOW_INHERITED";
+
+        @Override
+        public boolean isVisible(TreeElement treeNode) {
+            if (treeNode instanceof JSStructureViewElement) {
+                return !((JSStructureViewElement)treeNode).isInherited();
+            }
+            else {
+                return true;
+            }
+        }
+
+        @Override
+        @Nonnull
+        public ActionPresentation getPresentation() {
+            return new ActionPresentationData(
+                IdeLocalize.actionStructureviewShowInherited().get(),
+                null,
+                PlatformIconGroup.hierarchySupertypes()
+            );
+        }
+
+        @Override
+        @Nonnull
+        public String getName() {
+            return ID;
+        }
+
+        @Override
+        public boolean isReverted() {
+            return true;
+        }
+
+        @Override
+        public String getCheckBoxText() {
+            return IdeLocalize.fileStructureToggleShowInherited().get();
+        }
+
+        @Override
+        public Shortcut[] getShortcut() {
+            return KeymapManager.getInstance().getActiveKeymap().getShortcuts("FileStructurePopup");
+        }
+    };
+
+    private static Grouper myInheritedGrouper = new JSSuperGrouper();
+
+    private Grouper[] myGroupers = new Grouper[]{
+        myInheritedGrouper
+    };
+    private final Class[] myClasses = new Class[]{
+        JSFunction.class,
+        JSVariable.class,
+        JSDefinitionExpression.class,
+        JSClass.class,
+        JSProperty.class
+    };
+
+    public JSStructureViewModel(final PsiElement root) {
+        super(root.getContainingFile());
+        myRoot = root;
+    }
+
+    public JSStructureViewModel(PsiElement root, final Editor editor) {
+        super(editor);
+        myRoot = root;
+    }
+
+    @Override
+    @Nonnull
+    public StructureViewTreeElement getRoot() {
+        return new JSStructureViewElement(myRoot);
+    }
+
+    @Override
+    @Nonnull
+    public Grouper[] getGroupers() {
+        return myGroupers;
+    }
+
+    @Override
+    @Nonnull
+    public Sorter[] getSorters() {
+        return mySorters;
+    }
+
+    @Override
+    @Nonnull
+    public Filter[] getFilters() {
+        return myFilters;
+    }
+
+    @Override
+    protected boolean isSuitable(final PsiElement element) {
+        return super.isSuitable(element)
+            && (!(element instanceof JSVariable) || PsiTreeUtil.getParentOfType(element, JSFunction.class) == null);
+    }
+
+    @Override
+    public Object getCurrentEditorElement() {
+        Object editorElement = super.getCurrentEditorElement();
+
+        final PsiFile file = getPsiFile();
+        if (editorElement == null && !(file instanceof JSFile)) {
+            final int offset = getEditor().getCaretModel().getOffset();
+            final PsiElement at = file.findElementAt(offset);
+            final PsiLanguageInjectionHost injectionHost = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class);
+
+            if (injectionHost != null) {
+                final Ref<PsiElement> ref = new Ref<PsiElement>();
+                InjectedLanguageManager.getInstance(file.getProject()).enumerate(
+                    injectionHost,
+                    new PsiLanguageInjectionHost.InjectedPsiVisitor() {
+                        @Override
+                        public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places) {
+                            final PsiLanguageInjectionHost.Shred shred = places.get(0);
+                            final int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
+                            final int offsetInInjected = offset - injectedStart;
+
+                            ref.set(injectedPsi.findElementAt(offsetInInjected));
+                        }
+                    }
+                );
+
+                final PsiElement element = ref.get();
+                if (element != null) {
+                    editorElement = findAcceptableElement(element);
+                    return editorElement;
+                }
+            }
+        }
+
+        if (editorElement instanceof JSDefinitionExpression) {
+            final PsiElement element = ((PsiElement)editorElement).getParent();
+
+            if (element instanceof JSAssignmentExpression) {
+                final JSExpression roperand = ((JSAssignmentExpression)element).getROperand();
+                if (roperand instanceof JSFunctionExpression) {
+                    editorElement = roperand;
+                }
+            }
+        }
+
+        if (editorElement instanceof JSNamedElement) {
+            final PsiFile containingFile = ((PsiElement)editorElement).getContainingFile();
+            final PsiElement context = containingFile.getContext();
+            final int offset = ((PsiElement)editorElement).getTextOffset();
+            final PsiElement element;
+
+            if (context != null) {
+                element = JavaScriptIndex.findSymbolWithNameAndOffsetInEntry(((JSNamedElement)editorElement).getName(), offset);
+            }
+            else {
+                element = JavaScriptIndex.findSymbolByFileAndNameAndOffset(
+                    containingFile.getVirtualFile().getPath(),
+                    ((JSNamedElement)editorElement).getName(),
+                    offset
+                );
+            }
+
+            if (element != null) {
+                editorElement = element;
+            }
+        }
+        return editorElement;
+    }
+
+    @Override
+    protected PsiFile getPsiFile() {
+        return myRoot.getContainingFile();
+    }
+
+    @Override
+    @Nonnull
+    protected Class[] getSuitableClasses() {
+        return myClasses;
+    }
+
+    public void setFilters(final Filter[] filters) {
+        myFilters = filters;
+    }
+
+    public void setGroupers(final Grouper[] groupers) {
+        myGroupers = groupers;
+    }
+
+    public void setSorters(final Sorter[] sorters) {
+        mySorters = sorters;
+    }
+
+    @Override
+    public boolean shouldEnterElement(final Object element) {
+        return shouldEnterElementStatic(element);
+    }
+
+    public static boolean shouldEnterElementStatic(final Object element) {
+        return element instanceof JSClass;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
index 05e7b8d8..47151a44 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
@@ -30,51 +30,43 @@
 /**
  * @author Maxim.Mossienko
  */
-public class JSSuperGroup implements Group, ItemPresentation
-{
-	private final String myName;
-	private final List<TreeElement> myChildren;
+public class JSSuperGroup implements Group, ItemPresentation {
+    private final String myName;
+    private final List<TreeElement> myChildren;
 
-	public JSSuperGroup(final String name)
-	{
-		myName = name;
-		myChildren = new ArrayList<TreeElement>();
-	}
+    public JSSuperGroup(final String name) {
+        myName = name;
+        myChildren = new ArrayList<TreeElement>();
+    }
 
-	@Override
-	public ItemPresentation getPresentation()
-	{
-		return this;
-	}
+    @Override
+    public ItemPresentation getPresentation() {
+        return this;
+    }
 
-	@Override
-	public Collection<TreeElement> getChildren()
-	{
-		return myChildren;
-	}
+    @Override
+    public Collection<TreeElement> getChildren() {
+        return myChildren;
+    }
 
-	@Override
-	public String getPresentableText()
-	{
-		return myName;
-	}
+    @Override
+    public String getPresentableText() {
+        return myName;
+    }
 
-	@Override
-	@Nullable
-	public String getLocationString()
-	{
-		return null;
-	}
+    @Override
+    @Nullable
+    public String getLocationString() {
+        return null;
+    }
 
-	@Override
-	@Nullable
-	public Image getIcon()
-	{
-		return AllIcons.General.InheritedMethod;
-	}
+    @Override
+    @Nullable
+    public Image getIcon() {
+        return AllIcons.General.InheritedMethod;
+    }
 
-	void addChild(TreeElement element)
-	{
-		myChildren.add(element);
-	}
+    void addChild(TreeElement element) {
+        myChildren.add(element);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
index a6d76e1c..e779c2ca 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
@@ -37,106 +37,91 @@
 /**
  * @author Maxim.Mossienko
  */
-class JSSuperGrouper implements Grouper
-{
-	@NonNls
-	private static final String SHOW_CLASSES = "SHOW_CLASSES";
+class JSSuperGrouper implements Grouper {
+    @NonNls
+    private static final String SHOW_CLASSES = "SHOW_CLASSES";
 
-	@Override
-	@Nonnull
-	public Collection<Group> group(final Object parent, final Collection<TreeElement> children)
-	{
-		if (isParentGrouped((AbstractTreeNode) parent))
-		{
-			return Collections.emptyList();
-		}
-		final Map<String, Group> groups = new HashMap<>();
+    @Override
+    @Nonnull
+    public Collection<Group> group(final Object parent, final Collection<TreeElement> children) {
+        if (isParentGrouped((AbstractTreeNode)parent)) {
+            return Collections.emptyList();
+        }
+        final Map<String, Group> groups = new HashMap<>();
 
-		for (TreeElement _child : children)
-		{
-			if (!(_child instanceof JSStructureViewElement))
-			{
-				continue;
-			}
-			JSStructureViewElement child = (JSStructureViewElement) _child;
-			final PsiElement value = child.getValue();
+        for (TreeElement _child : children) {
+            if (!(_child instanceof JSStructureViewElement)) {
+                continue;
+            }
+            JSStructureViewElement child = (JSStructureViewElement)_child;
+            final PsiElement value = child.getValue();
 
-			if (value instanceof JSVariable)
-			{
-				if (!child.isInherited())
-				{
-					continue;
-				}
-				PsiElement parentElement = value.getParent();
-				if (parentElement instanceof JSVarStatement)
-				{
-					parentElement = parentElement.getParent();
-				}
-				if (parentElement instanceof JSClass jsClass)
-				{
-					addGroup(groups, _child, jsClass.getQualifiedName());
-				}
-			}
-			else if (value instanceof JSFunction)
-			{
-				processFunction((JSStructureViewElement) ((AbstractTreeNode) parent).getValue(), groups, _child, value);
-			}
-		}
-		return groups.values();
-	}
+            if (value instanceof JSVariable) {
+                if (!child.isInherited()) {
+                    continue;
+                }
+                PsiElement parentElement = value.getParent();
+                if (parentElement instanceof JSVarStatement) {
+                    parentElement = parentElement.getParent();
+                }
+                if (parentElement instanceof JSClass jsClass) {
+                    addGroup(groups, _child, jsClass.getQualifiedName());
+                }
+            }
+            else if (value instanceof JSFunction) {
+                processFunction((JSStructureViewElement)((AbstractTreeNode)parent).getValue(), groups, _child, value);
+            }
+        }
+        return groups.values();
+    }
 
-	private static void processFunction(JSStructureViewElement parentElement, Map<String, Group> groups, TreeElement _child, PsiElement value)
-	{
-		final PsiElement element = JSStructureViewElement.getPsiElementResolveProxy(parentElement);
-		if (element instanceof JSClass parentClass)
-		{
-			JSClass declaringClass = JSResolveUtil.findDeclaringClass((JSFunction) value);
-			if (parentClass != declaringClass)
-			{
-				addGroup(groups, _child, declaringClass.getQualifiedName());
-			}
-		}
-	}
+    private static void processFunction(
+        JSStructureViewElement parentElement,
+        Map<String, Group> groups,
+        TreeElement _child,
+        PsiElement value
+    ) {
+        final PsiElement element = JSStructureViewElement.getPsiElementResolveProxy(parentElement);
+        if (element instanceof JSClass parentClass) {
+            JSClass declaringClass = JSResolveUtil.findDeclaringClass((JSFunction)value);
+            if (parentClass != declaringClass) {
+                addGroup(groups, _child, declaringClass.getQualifiedName());
+            }
+        }
+    }
 
-	private static void addGroup(final Map<String, Group> groups, final TreeElement _child, final String qName)
-	{
-		JSSuperGroup group = (JSSuperGroup) groups.get(qName);
-		if (group == null)
-		{
-			groups.put(qName, group = new JSSuperGroup(qName));
-		}
+    private static void addGroup(final Map<String, Group> groups, final TreeElement _child, final String qName) {
+        JSSuperGroup group = (JSSuperGroup)groups.get(qName);
+        if (group == null) {
+            groups.put(qName, group = new JSSuperGroup(qName));
+        }
 
-		group.addChild(_child);
-	}
+        group.addChild(_child);
+    }
 
-	@Override
-	@Nonnull
-	public ActionPresentation getPresentation()
-	{
-    return new ActionPresentationData(
-			IdeLocalize.actionStructureviewGroupMethodsByDefiningType().get(),
-			null,
-			PlatformIconGroup.gutterImplementingmethod()
-		);
-	}
+    @Override
+    @Nonnull
+    public ActionPresentation getPresentation() {
+        return new ActionPresentationData(
+            IdeLocalize.actionStructureviewGroupMethodsByDefiningType().get(),
+            null,
+            PlatformIconGroup.gutterImplementingmethod()
+        );
+    }
 
-	@Override
-	@Nonnull
-	public String getName()
-	{
-		return SHOW_CLASSES;
-	}
+    @Override
+    @Nonnull
+    public String getName() {
+        return SHOW_CLASSES;
+    }
 
-	private static boolean isParentGrouped(AbstractTreeNode parent)
-	{
-		while (parent != null)
-		{
-			if (parent.getValue() instanceof JSSuperGroup)
-			{
-				return true;
-			}
-			parent = (AbstractTreeNode) parent.getParent();
-		}
-		return false;
-	}
+    private static boolean isParentGrouped(AbstractTreeNode parent) {
+        while (parent != null) {
+            if (parent.getValue() instanceof JSSuperGroup) {
+                return true;
+            }
+            parent = (AbstractTreeNode)parent.getParent();
+        }
+        return false;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
index 75908cbe..c4f9b9ac 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
@@ -36,65 +36,54 @@
  * Time: 12:46:24
  */
 @ExtensionImpl
-public class JSExpressionSurroundDescriptor implements SurroundDescriptor
-{
-	private static final Surrounder[] SURROUNDERS = {
-			new JSWithParenthesesSurrounder()
-	};
+public class JSExpressionSurroundDescriptor implements SurroundDescriptor {
+    private static final Surrounder[] SURROUNDERS = {
+        new JSWithParenthesesSurrounder()
+    };
 
-	@Override
-	@Nonnull
-	public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset)
-	{
-		final JSExpression expr = findExpressionInRange(file, startOffset, endOffset);
-		if(expr == null)
-		{
-			return PsiElement.EMPTY_ARRAY;
-		}
-		return new PsiElement[]{expr};
-	}
+    @Override
+    @Nonnull
+    public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
+        final JSExpression expr = findExpressionInRange(file, startOffset, endOffset);
+        if (expr == null) {
+            return PsiElement.EMPTY_ARRAY;
+        }
+        return new PsiElement[]{expr};
+    }
 
-	@Override
-	@Nonnull
-	public Surrounder[] getSurrounders()
-	{
-		return SURROUNDERS;
-	}
+    @Override
+    @Nonnull
+    public Surrounder[] getSurrounders() {
+        return SURROUNDERS;
+    }
 
-	@Override
-	public boolean isExclusive()
-	{
-		return false;
-	}
+    @Override
+    public boolean isExclusive() {
+        return false;
+    }
 
-	private static JSExpression findExpressionInRange(PsiFile file, int startOffset, int endOffset)
-	{
-		PsiElement element1 = file.findElementAt(startOffset);
-		PsiElement element2 = file.findElementAt(endOffset - 1);
-		if(element1 instanceof PsiWhiteSpace)
-		{
-			startOffset = element1.getTextRange().getEndOffset();
-		}
-		if(element2 instanceof PsiWhiteSpace)
-		{
-			endOffset = element2.getTextRange().getStartOffset();
-		}
-		JSExpression expression = PsiTreeUtil.findElementOfClassAtRange(file, startOffset, endOffset, JSExpression.class);
-		if(expression == null || expression.getTextRange().getEndOffset() != endOffset)
-		{
-			return null;
-		}
-		if(expression instanceof JSReferenceExpression && expression.getParent() instanceof JSCallExpression)
-		{
-			return null;
-		}
-		return expression;
-	}
+    private static JSExpression findExpressionInRange(PsiFile file, int startOffset, int endOffset) {
+        PsiElement element1 = file.findElementAt(startOffset);
+        PsiElement element2 = file.findElementAt(endOffset - 1);
+        if (element1 instanceof PsiWhiteSpace) {
+            startOffset = element1.getTextRange().getEndOffset();
+        }
+        if (element2 instanceof PsiWhiteSpace) {
+            endOffset = element2.getTextRange().getStartOffset();
+        }
+        JSExpression expression = PsiTreeUtil.findElementOfClassAtRange(file, startOffset, endOffset, JSExpression.class);
+        if (expression == null || expression.getTextRange().getEndOffset() != endOffset) {
+            return null;
+        }
+        if (expression instanceof JSReferenceExpression && expression.getParent() instanceof JSCallExpression) {
+            return null;
+        }
+        return expression;
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
index 7cff56ec..f70002a6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
@@ -35,45 +35,40 @@
  * @author yole
  * @since 2005-07-12
  */
-public abstract class JSStatementSurrounder implements Surrounder
-{
-	@Override
-	public boolean isApplicable(@Nonnull PsiElement[] elements)
-	{
-		return true;
-	}
+public abstract class JSStatementSurrounder implements Surrounder {
+    @Override
+    public boolean isApplicable(@Nonnull PsiElement[] elements) {
+        return true;
+    }
 
-	@Override
-	@Nullable
-	public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements) throws
-			IncorrectOperationException
-	{
-		ASTNode node = JSChangeUtil.createStatementFromText(project, getStatementTemplate(project, elements[0]));
+    @Override
+    @Nullable
+    public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements)
+        throws IncorrectOperationException {
+        ASTNode node = JSChangeUtil.createStatementFromText(project, getStatementTemplate(project, elements[0]));
 
-		PsiElement container = elements[0].getParent();
-		container.getNode().addChild(node, elements[0].getNode());
-		final ASTNode insertBeforeNode = getInsertBeforeNode(node);
+        PsiElement container = elements[0].getParent();
+        container.getNode().addChild(node, elements[0].getNode());
+        final ASTNode insertBeforeNode = getInsertBeforeNode(node);
 
-		for(int i = 0; i < elements.length; i++)
-		{
-			final ASTNode childNode = elements[i].getNode();
-			final ASTNode childNodeCopy = childNode.copyElement();
+        for (int i = 0; i < elements.length; i++) {
+            final ASTNode childNode = elements[i].getNode();
+            final ASTNode childNodeCopy = childNode.copyElement();
 
-			container.getNode().removeChild(childNode);
-			insertBeforeNode.getTreeParent().addChild(childNodeCopy, insertBeforeNode);
-		}
+            container.getNode().removeChild(childNode);
+            insertBeforeNode.getTreeParent().addChild(childNodeCopy, insertBeforeNode);
+        }
 
-		final CodeStyleManager csManager = CodeStyleManager.getInstance(project);
-		csManager.reformat(node.getPsi());
+        final CodeStyleManager csManager = CodeStyleManager.getInstance(project);
+        csManager.reformat(node.getPsi());
 
-		return getSurroundSelectionRange(node);
-	}
+        return getSurroundSelectionRange(node);
+    }
 
-	protected abstract
-	@NonNls
-	String getStatementTemplate(final Project project, PsiElement context);
+    @NonNls
+    protected abstract String getStatementTemplate(final Project project, PsiElement context);
 
-	protected abstract ASTNode getInsertBeforeNode(final ASTNode statementNode);
+    protected abstract ASTNode getInsertBeforeNode(final ASTNode statementNode);
 
-	protected abstract TextRange getSurroundSelectionRange(final ASTNode statementNode);
+    protected abstract TextRange getSurroundSelectionRange(final ASTNode statementNode);
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
index 4fbfa002..533fe40a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
@@ -33,6 +33,7 @@
 import consulo.language.psi.util.PsiTreeUtil;
 
 import jakarta.annotation.Nonnull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,149 +42,125 @@
  * @since 2005-07-12
  */
 @ExtensionImpl
-public class JSStatementsSurroundDescriptor implements SurroundDescriptor
-{
-	private static final Surrounder[] SURROUNDERS = {
-			new JSWithBlockSurrounder(),
-			new JSWithIfSurrounder(),
-			new JSWithIfElseSurrounder(),
-			new JSWithWhileSurrounder(),
-			new JSWithDoWhileSurrounder(),
-			new JSWithForSurrounder(),
-			new JSWithTryCatchSurrounder(),
-			new JSWithTryFinallySurrounder(),
-			new JSWithTryCatchFinallySurrounder(),
-			new JSWithWithSurrounder(),
-			new JSWithFunctionSurrounder(),
-			new JSWithFunctionExpressionSurrounder(),
-	};
-
-	@Override
-	@Nonnull
-	public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset)
-	{
-		final PsiElement[] statements = findStatementsInRange(file, startOffset, endOffset);
-		if(statements == null)
-		{
-			return PsiElement.EMPTY_ARRAY;
-		}
-		return statements;
-	}
-
-	@Override
-	@Nonnull
-	public Surrounder[] getSurrounders()
-	{
-		return SURROUNDERS;
-	}
-
-	@Override
-	public boolean isExclusive()
-	{
-		return false;
-	}
-
-	private PsiElement[] findStatementsInRange(PsiFile file, int startOffset, int endOffset)
-	{
-		PsiElement element1 = file.findElementAt(startOffset);
-		PsiElement element2 = file.findElementAt(endOffset - 1);
-		if(element1 instanceof PsiWhiteSpace)
-		{
-			startOffset = element1.getTextRange().getEndOffset();
-			element1 = file.findElementAt(startOffset);
-		}
-		if(element2 instanceof PsiWhiteSpace)
-		{
-			endOffset = element2.getTextRange().getStartOffset();
-			element2 = file.findElementAt(endOffset - 1);
-		}
-		if(element1 == null || element2 == null)
-		{
-			return null;
-		}
-
-		final JSStatement statement = PsiTreeUtil.getParentOfType(element1, JSStatement.class);
-		final JSStatement statement2 = PsiTreeUtil.getParentOfType(element2, JSStatement.class);
-
-		PsiElement parent = PsiTreeUtil.findCommonParent(element1, element2);
-		while(true)
-		{
-			if(parent instanceof JSBlockStatement || ((parent instanceof JSEmbeddedContentImpl || parent instanceof JSFile) && (statement != null &&
-					statement2 != null && PsiTreeUtil.isAncestor(parent, statement, false) && PsiTreeUtil.isAncestor(parent, statement2, false))))
-			{
-				break;
-			}
-			if(parent instanceof JSStatement)
-			{
-				parent = parent.getParent();
-				break;
-			}
-			if(parent instanceof PsiFile)
-			{
-				return null;
-			}
-			parent = parent.getParent();
-		}
-
-
-		while(!element1.getParent().equals(parent))
-		{
-			element1 = element1.getParent();
-		}
-		if(startOffset != element1.getTextRange().getStartOffset())
-		{
-			return null;
-		}
-
-		while(!element2.getParent().equals(parent))
-		{
-			element2 = element2.getParent();
-		}
-		if(endOffset != element2.getTextRange().getEndOffset())
-		{
-			return null;
-		}
-
-		final ASTNode[] astNodes = parent.getNode().getChildren(null);
-		List<PsiElement> children = new ArrayList<PsiElement>(astNodes.length);
-		for(ASTNode node : astNodes)
-		{
-			children.add(node.getPsi());
-		}
-
-		ArrayList<PsiElement> array = new ArrayList<PsiElement>();
-		boolean flag = false;
-		for(PsiElement child : children)
-		{
-			if(child.equals(element1))
-			{
-				flag = true;
-			}
-			if(flag /*&& !(child instanceof PsiWhiteSpace)*/)
-			{
-				array.add(child);
-			}
-			if(child.equals(element2))
-			{
-				break;
-			}
-		}
-
-		for(PsiElement element : array)
-		{
-			if(!(element instanceof JSStatement || element instanceof PsiWhiteSpace || element instanceof PsiComment))
-			{
-				return null;
-			}
-		}
-
-		return array.toArray(new PsiElement[array.size()]);
-	}
-
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JSStatementsSurroundDescriptor implements SurroundDescriptor {
+    private static final Surrounder[] SURROUNDERS = {
+        new JSWithBlockSurrounder(),
+        new JSWithIfSurrounder(),
+        new JSWithIfElseSurrounder(),
+        new JSWithWhileSurrounder(),
+        new JSWithDoWhileSurrounder(),
+        new JSWithForSurrounder(),
+        new JSWithTryCatchSurrounder(),
+        new JSWithTryFinallySurrounder(),
+        new JSWithTryCatchFinallySurrounder(),
+        new JSWithWithSurrounder(),
+        new JSWithFunctionSurrounder(),
+        new JSWithFunctionExpressionSurrounder(),
+    };
+
+    @Override
+    @Nonnull
+    public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
+        final PsiElement[] statements = findStatementsInRange(file, startOffset, endOffset);
+        if (statements == null) {
+            return PsiElement.EMPTY_ARRAY;
+        }
+        return statements;
+    }
+
+    @Override
+    @Nonnull
+    public Surrounder[] getSurrounders() {
+        return SURROUNDERS;
+    }
+
+    @Override
+    public boolean isExclusive() {
+        return false;
+    }
+
+    private PsiElement[] findStatementsInRange(PsiFile file, int startOffset, int endOffset) {
+        PsiElement element1 = file.findElementAt(startOffset);
+        PsiElement element2 = file.findElementAt(endOffset - 1);
+        if (element1 instanceof PsiWhiteSpace) {
+            startOffset = element1.getTextRange().getEndOffset();
+            element1 = file.findElementAt(startOffset);
+        }
+        if (element2 instanceof PsiWhiteSpace) {
+            endOffset = element2.getTextRange().getStartOffset();
+            element2 = file.findElementAt(endOffset - 1);
+        }
+        if (element1 == null || element2 == null) {
+            return null;
+        }
+
+        final JSStatement statement = PsiTreeUtil.getParentOfType(element1, JSStatement.class);
+        final JSStatement statement2 = PsiTreeUtil.getParentOfType(element2, JSStatement.class);
+
+        PsiElement parent = PsiTreeUtil.findCommonParent(element1, element2);
+        while (true) {
+            if (parent instanceof JSBlockStatement || ((parent instanceof JSEmbeddedContentImpl || parent instanceof JSFile)
+                && (statement != null && statement2 != null && PsiTreeUtil.isAncestor(parent, statement, false)
+                && PsiTreeUtil.isAncestor(parent, statement2, false)))) {
+                break;
+            }
+            if (parent instanceof JSStatement) {
+                parent = parent.getParent();
+                break;
+            }
+            if (parent instanceof PsiFile) {
+                return null;
+            }
+            parent = parent.getParent();
+        }
+
+
+        while (!element1.getParent().equals(parent)) {
+            element1 = element1.getParent();
+        }
+        if (startOffset != element1.getTextRange().getStartOffset()) {
+            return null;
+        }
+
+        while (!element2.getParent().equals(parent)) {
+            element2 = element2.getParent();
+        }
+        if (endOffset != element2.getTextRange().getEndOffset()) {
+            return null;
+        }
+
+        final ASTNode[] astNodes = parent.getNode().getChildren(null);
+        List<PsiElement> children = new ArrayList<PsiElement>(astNodes.length);
+        for (ASTNode node : astNodes) {
+            children.add(node.getPsi());
+        }
+
+        ArrayList<PsiElement> array = new ArrayList<PsiElement>();
+        boolean flag = false;
+        for (PsiElement child : children) {
+            if (child.equals(element1)) {
+                flag = true;
+            }
+            if (flag /*&& !(child instanceof PsiWhiteSpace)*/) {
+                array.add(child);
+            }
+            if (child.equals(element2)) {
+                break;
+            }
+        }
+
+        for (PsiElement element : array) {
+            if (!(element instanceof JSStatement || element instanceof PsiWhiteSpace || element instanceof PsiComment)) {
+                return null;
+            }
+        }
+
+        return array.toArray(new PsiElement[array.size()]);
+    }
+
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
index e7d8acb1..e8a61738 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
@@ -25,30 +25,25 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithBlockSurrounder extends JSStatementSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return "{ }";
-	}
+public class JSWithBlockSurrounder extends JSStatementSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return "{ }";
+    }
 
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "{ }";
-	}
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "{ }";
+    }
 
-	@Override
-	protected ASTNode getInsertBeforeNode(final ASTNode statementNode)
-	{
-		return statementNode.getLastChildNode();
-	}
+    @Override
+    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+        return statementNode.getLastChildNode();
+    }
 
-	@Override
-	protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
-	{
-		int endOffset = statementNode.getTextRange().getEndOffset();
-		return new TextRange(endOffset, endOffset);
-	}
+    @Override
+    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+        int endOffset = statementNode.getTextRange().getEndOffset();
+        return new TextRange(endOffset, endOffset);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
index 1a387200..3deb26ef 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
@@ -27,31 +27,26 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithDoWhileSurrounder extends JSStatementSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithDoWhile().get();
-	}
+public class JSWithDoWhileSurrounder extends JSStatementSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithDoWhile().get();
+    }
 
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "do { } while (true);";
-	}
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "do { } while (true);";
+    }
 
-	@Override
-	protected ASTNode getInsertBeforeNode(final ASTNode statementNode)
-	{
-		JSDoWhileStatement stmt = (JSDoWhileStatement) statementNode.getPsi();
-		return stmt.getBody().getLastChild().getNode();
-	}
+    @Override
+    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+        JSDoWhileStatement stmt = (JSDoWhileStatement)statementNode.getPsi();
+        return stmt.getBody().getLastChild().getNode();
+    }
 
-	@Override
-	protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
-	{
-		JSDoWhileStatement stmt = (JSDoWhileStatement) statementNode.getPsi();
-		return stmt.getCondition().getTextRange();
-	}
+    @Override
+    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+        JSDoWhileStatement stmt = (JSDoWhileStatement)statementNode.getPsi();
+        return stmt.getCondition().getTextRange();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
index 63d1223b..ec2cb53c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
@@ -30,44 +30,36 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithForSurrounder extends JSStatementSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithFor().get();
-	}
+public class JSWithForSurrounder extends JSStatementSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithFor().get();
+    }
 
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "for(i=0; i<1; i++) { }";
-	}
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "for(i=0; i<1; i++) { }";
+    }
 
-	@Override
-	protected ASTNode getInsertBeforeNode(final ASTNode statementNode)
-	{
-		JSForStatement forStatement = (JSForStatement) statementNode.getPsi();
-		return forStatement.getBody().getLastChild().getNode();
-	}
+    @Override
+    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+        JSForStatement forStatement = (JSForStatement)statementNode.getPsi();
+        return forStatement.getBody().getLastChild().getNode();
+    }
 
-	@Override
-	protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
-	{
-		for(ASTNode childNode : statementNode.getChildren(null))
-		{
-			if(childNode.getElementType() == JSTokenTypes.SEMICOLON ||
-					childNode.getPsi() instanceof PsiWhiteSpace ||
-					childNode.getPsi() instanceof JSExpression)
-			{
-				statementNode.removeChild(childNode);
-			}
-			else if(childNode.getElementType() == JSTokenTypes.RPAR)
-			{
-				int offset = childNode.getStartOffset();
-				return new TextRange(offset, offset);
-			}
-		}
-		return null;
-	}
+    @Override
+    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+        for (ASTNode childNode : statementNode.getChildren(null)) {
+            if (childNode.getElementType() == JSTokenTypes.SEMICOLON ||
+                childNode.getPsi() instanceof PsiWhiteSpace ||
+                childNode.getPsi() instanceof JSExpression) {
+                statementNode.removeChild(childNode);
+            }
+            else if (childNode.getElementType() == JSTokenTypes.RPAR) {
+                int offset = childNode.getStartOffset();
+                return new TextRange(offset, offset);
+            }
+        }
+        return null;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
index fd0c4258..1f648288 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
@@ -26,40 +26,34 @@
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 
-public class JSWithFunctionExpressionSurrounder extends JSStatementSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithFunctionExpression().get();
-	}
-
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "aaa = function () { }" + JSChangeUtil.getSemicolon(project);
-	}
-
-	@Override
-	protected ASTNode getInsertBeforeNode(final ASTNode statementNode)
-	{
-		JSFunctionExpression stmt = getFunctionExpr(statementNode);
-		return stmt.getBody()[0].getLastChild().getNode();
-	}
-
-	private static JSFunctionExpression getFunctionExpr(final ASTNode statementNode)
-	{
-		return (JSFunctionExpression) ((JSAssignmentExpression) ((JSExpressionStatement) statementNode.getPsi()).getExpression()).getROperand();
-	}
-
-	@Override
-	protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
-	{
-		JSFunctionExpression stmt = getFunctionExpr(statementNode);
-		ASTNode conditionNode = stmt.getNameIdentifier().getNode();
-		int offset = conditionNode.getStartOffset();
-		stmt.getParent().getNode().removeChild(conditionNode);
-
-		return new TextRange(offset, offset);
-	}
+public class JSWithFunctionExpressionSurrounder extends JSStatementSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithFunctionExpression().get();
+    }
+
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "aaa = function () { }" + JSChangeUtil.getSemicolon(project);
+    }
+
+    @Override
+    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+        JSFunctionExpression stmt = getFunctionExpr(statementNode);
+        return stmt.getBody()[0].getLastChild().getNode();
+    }
+
+    private static JSFunctionExpression getFunctionExpr(final ASTNode statementNode) {
+        return (JSFunctionExpression)((JSAssignmentExpression)((JSExpressionStatement)statementNode.getPsi()).getExpression()).getROperand();
+    }
+
+    @Override
+    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+        JSFunctionExpression stmt = getFunctionExpr(statementNode);
+        ASTNode conditionNode = stmt.getNameIdentifier().getNode();
+        int offset = conditionNode.getStartOffset();
+        stmt.getParent().getNode().removeChild(conditionNode);
+
+        return new TextRange(offset, offset);
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
index 713c9d12..3d15810b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
@@ -23,35 +23,30 @@
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 
-public class JSWithFunctionSurrounder extends JSStatementSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithFunction().get();
-	}
+public class JSWithFunctionSurrounder extends JSStatementSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithFunction().get();
+    }
 
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "function $name$() { }";
-	}
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "function $name$() { }";
+    }
 
-	@Override
-	protected ASTNode getInsertBeforeNode(final ASTNode statementNode)
-	{
-		JSFunction stmt = (JSFunction) statementNode.getPsi();
-		return stmt.getBody()[0].getLastChild().getNode();
-	}
+    @Override
+    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+        JSFunction stmt = (JSFunction)statementNode.getPsi();
+        return stmt.getBody()[0].getLastChild().getNode();
+    }
 
-	@Override
-	protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
-	{
-		JSFunction stmt = (JSFunction) statementNode.getPsi();
-		ASTNode conditionNode = stmt.getNameIdentifier().getNode();
-		int offset = conditionNode.getStartOffset();
-		stmt.getNode().removeChild(conditionNode);
+    @Override
+    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+        JSFunction stmt = (JSFunction)statementNode.getPsi();
+        ASTNode conditionNode = stmt.getNameIdentifier().getNode();
+        int offset = conditionNode.getStartOffset();
+        stmt.getNode().removeChild(conditionNode);
 
-		return new TextRange(offset, offset);
-	}
+        return new TextRange(offset, offset);
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
index 9c71d351..edf1dc8d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
@@ -24,17 +24,14 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithIfElseSurrounder extends JSWithIfSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithIfElse().get();
-	}
+public class JSWithIfElseSurrounder extends JSWithIfSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithIfElse().get();
+    }
 
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "if (a) { } else { }";
-	}
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "if (a) { } else { }";
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
index dd3492e8..d5e4a826 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
@@ -28,36 +28,31 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithIfSurrounder extends JSStatementSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithIf().get();
-	}
+public class JSWithIfSurrounder extends JSStatementSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithIf().get();
+    }
 
-	@Override
-	@NonNls
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "if(a) { }";
-	}
+    @Override
+    @NonNls
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "if(a) { }";
+    }
 
-	@Override
-	protected ASTNode getInsertBeforeNode(final ASTNode statementNode)
-	{
-		JSIfStatement stmt = (JSIfStatement) statementNode.getPsi();
-		return stmt.getThen().getNode().getLastChildNode();
-	}
+    @Override
+    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+        JSIfStatement stmt = (JSIfStatement)statementNode.getPsi();
+        return stmt.getThen().getNode().getLastChildNode();
+    }
 
-	@Override
-	protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
-	{
-		JSIfStatement stmt = (JSIfStatement) statementNode.getPsi();
-		ASTNode conditionNode = stmt.getCondition().getNode();
-		int offset = conditionNode.getStartOffset();
-		stmt.getNode().removeChild(conditionNode);
+    @Override
+    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+        JSIfStatement stmt = (JSIfStatement)statementNode.getPsi();
+        ASTNode conditionNode = stmt.getCondition().getNode();
+        int offset = conditionNode.getStartOffset();
+        stmt.getNode().removeChild(conditionNode);
 
-		return new TextRange(offset, offset);
-	}
+        return new TextRange(offset, offset);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
index 267b0e15..5ed80841 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
@@ -34,29 +34,25 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithParenthesesSurrounder implements Surrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithParenthesis().get();
-	}
+public class JSWithParenthesesSurrounder implements Surrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithParenthesis().get();
+    }
 
-	@Override
-	public boolean isApplicable(@Nonnull PsiElement[] elements)
-	{
-		return true;
-	}
+    @Override
+    public boolean isApplicable(@Nonnull PsiElement[] elements) {
+        return true;
+    }
 
-	@Override
-	@Nullable
-	public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements) throws
-			IncorrectOperationException
-	{
-		JSExpression expr = (JSExpression) elements[0];
-		ASTNode parenthExprNode = JSChangeUtil.createExpressionFromText(project, "(" + expr.getText() + ")").getNode();
-		expr.getNode().getTreeParent().replaceChild(expr.getNode(), parenthExprNode);
-		int offset = parenthExprNode.getTextRange().getEndOffset();
-		return new TextRange(offset, offset);
-	}
+    @Override
+    @Nullable
+    public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements)
+        throws IncorrectOperationException {
+        JSExpression expr = (JSExpression)elements[0];
+        ASTNode parenthExprNode = JSChangeUtil.createExpressionFromText(project, "(" + expr.getText() + ")").getNode();
+        expr.getNode().getTreeParent().replaceChild(expr.getNode(), parenthExprNode);
+        int offset = parenthExprNode.getTextRange().getEndOffset();
+        return new TextRange(offset, offset);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
index 5ce9d2d9..64ee1929 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -32,53 +32,44 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithTryCatchFinallySurrounder extends JSStatementSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithTryCatchFinally().get();
-	}
+public class JSWithTryCatchFinallySurrounder extends JSStatementSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithTryCatchFinally().get();
+    }
 
-	@Override
-	@NonNls
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "try { } catch(e" + getExceptionVarTypeBasedOnContext(context) + ") { } finally { }";
-	}
+    @Override
+    @NonNls
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "try { } catch(e" + getExceptionVarTypeBasedOnContext(context) + ") { } finally { }";
+    }
 
-	protected static String getExceptionVarTypeBasedOnContext(@Nonnull PsiElement context)
-	{
-		if(context.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4)
-		{
-			return ":Error";
-		}
-		return "";
-	}
+    protected static String getExceptionVarTypeBasedOnContext(@Nonnull PsiElement context) {
+        if (context.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
+            return ":Error";
+        }
+        return "";
+    }
 
-	@Override
-	protected ASTNode getInsertBeforeNode(final ASTNode statementNode)
-	{
-		JSTryStatement stmt = (JSTryStatement) statementNode.getPsi();
-		return stmt.getStatement().getLastChild().getNode();
-	}
+    @Override
+    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+        JSTryStatement stmt = (JSTryStatement)statementNode.getPsi();
+        return stmt.getStatement().getLastChild().getNode();
+    }
 
-	@Override
-	protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
-	{
-		JSTryStatement stmt = (JSTryStatement) statementNode.getPsi();
-		final JSCatchBlock catchBlock = stmt.getCatchBlock();
-		if(catchBlock != null)
-		{
-			int offset = catchBlock.getStatement().getFirstChild().getNode().getStartOffset() + 1;
-			return new TextRange(offset, offset);
-		}
-		final JSStatement finallyStmt = stmt.getFinallyStatement();
-		if(finallyStmt != null)
-		{
-			int offset = finallyStmt.getFirstChild().getNode().getStartOffset() + 1;
-			return new TextRange(offset, offset);
-		}
-		return null;
-	}
+    @Override
+    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+        JSTryStatement stmt = (JSTryStatement)statementNode.getPsi();
+        final JSCatchBlock catchBlock = stmt.getCatchBlock();
+        if (catchBlock != null) {
+            int offset = catchBlock.getStatement().getFirstChild().getNode().getStartOffset() + 1;
+            return new TextRange(offset, offset);
+        }
+        final JSStatement finallyStmt = stmt.getFinallyStatement();
+        if (finallyStmt != null) {
+            int offset = finallyStmt.getFirstChild().getNode().getStartOffset() + 1;
+            return new TextRange(offset, offset);
+        }
+        return null;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
index c5f918d6..44397c6b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
@@ -24,17 +24,14 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithTryCatchSurrounder extends JSWithTryCatchFinallySurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithTryCatch().get();
-	}
+public class JSWithTryCatchSurrounder extends JSWithTryCatchFinallySurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithTryCatch().get();
+    }
 
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "try { } catch(e" + getExceptionVarTypeBasedOnContext(context) + ") { }";
-	}
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "try { } catch(e" + getExceptionVarTypeBasedOnContext(context) + ") { }";
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
index 79caef66..9c56f549 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
@@ -24,17 +24,14 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithTryFinallySurrounder extends JSWithTryCatchFinallySurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithTryFinally().get();
-	}
+public class JSWithTryFinallySurrounder extends JSWithTryCatchFinallySurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithTryFinally().get();
+    }
 
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "try { } finally { }";
-	}
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "try { } finally { }";
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
index aa269fb2..f7b1a6ac 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
@@ -27,31 +27,26 @@
  * @author yole
  * @since 2005-07-12
  */
-public class JSWithWhileSurrounder extends JSStatementSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithWhile().get();
-	}
+public class JSWithWhileSurrounder extends JSStatementSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithWhile().get();
+    }
 
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "while(true) { }";
-	}
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "while(true) { }";
+    }
 
-	@Override
-	protected ASTNode getInsertBeforeNode(ASTNode statementNode)
-	{
-		JSWhileStatement stmt = (JSWhileStatement) statementNode.getPsi();
-		return stmt.getBody().getLastChild().getNode();
-	}
+    @Override
+    protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
+        JSWhileStatement stmt = (JSWhileStatement)statementNode.getPsi();
+        return stmt.getBody().getLastChild().getNode();
+    }
 
-	@Override
-	protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
-	{
-		JSWhileStatement stmt = (JSWhileStatement) statementNode.getPsi();
-		return stmt.getCondition().getTextRange();
-	}
+    @Override
+    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+        JSWhileStatement stmt = (JSWhileStatement)statementNode.getPsi();
+        return stmt.getCondition().getTextRange();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
index b0b00fb8..2f1b2044 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
@@ -30,35 +30,30 @@
  * Time: 19:34:54
  * To change this template use File | Settings | File Templates.
  */
-public class JSWithWithSurrounder extends JSStatementSurrounder
-{
-	@Override
-	public String getTemplateDescription()
-	{
-		return JavaScriptLocalize.javascriptSurroundWithWith().get();
-	}
+public class JSWithWithSurrounder extends JSStatementSurrounder {
+    @Override
+    public String getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithWith().get();
+    }
 
-	@Override
-	protected String getStatementTemplate(final Project project, PsiElement context)
-	{
-		return "with(a) { }";
-	}
+    @Override
+    protected String getStatementTemplate(final Project project, PsiElement context) {
+        return "with(a) { }";
+    }
 
-	@Override
-	protected ASTNode getInsertBeforeNode(final ASTNode statementNode)
-	{
-		JSWithStatement stmt = (JSWithStatement) statementNode.getPsi();
-		return stmt.getStatement().getLastChild().getNode();
-	}
+    @Override
+    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+        JSWithStatement stmt = (JSWithStatement)statementNode.getPsi();
+        return stmt.getStatement().getLastChild().getNode();
+    }
 
-	@Override
-	protected TextRange getSurroundSelectionRange(final ASTNode statementNode)
-	{
-		JSWithStatement stmt = (JSWithStatement) statementNode.getPsi();
-		ASTNode conditionNode = stmt.getExpression().getNode();
-		int offset = conditionNode.getStartOffset();
-		stmt.getNode().removeChild(conditionNode);
+    @Override
+    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+        JSWithStatement stmt = (JSWithStatement)statementNode.getPsi();
+        ASTNode conditionNode = stmt.getExpression().getNode();
+        int offset = conditionNode.getStartOffset();
+        stmt.getNode().removeChild(conditionNode);
 
-		return new TextRange(offset, offset);
-	}
+        return new TextRange(offset, offset);
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
index e121fbd7..3b40f86a 100644
--- a/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
+++ b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
@@ -37,175 +37,130 @@
  * @since 05.12.2015
  */
 @ExtensionImpl
-public class JavaScriptIconDescriptorUpdater implements IconDescriptorUpdater
-{
-	@RequiredReadAction
-	@Override
-	public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiElement element, int flags)
-	{
-		if(element instanceof JSProperty)
-		{
-			if(element instanceof JSFunction && ((JSFunction) element).isGetProperty())
-			{
-				iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertyread());
-			}
-			else if(element instanceof JSFunction && ((JSFunction) element).isSetProperty())
-			{
-				iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertywrite());
-			}
-			else
-			{
-				iconDescriptor.setMainIcon(AllIcons.Nodes.Property);
-			}
+public class JavaScriptIconDescriptorUpdater implements IconDescriptorUpdater {
+    @RequiredReadAction
+    @Override
+    public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiElement element, int flags) {
+        if (element instanceof JSProperty) {
+            if (element instanceof JSFunction && ((JSFunction)element).isGetProperty()) {
+                iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertyread());
+            }
+            else if (element instanceof JSFunction && ((JSFunction)element).isSetProperty()) {
+                iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertywrite());
+            }
+            else {
+                iconDescriptor.setMainIcon(AllIcons.Nodes.Property);
+            }
 
-			JSExpression value = ((JSProperty) element).getValue();
-			if(value instanceof JSFunctionExpression)
-			{
-				iconDescriptor.setMainIcon(AllIcons.Nodes.Function);
-			}
+            JSExpression value = ((JSProperty)element).getValue();
+            if (value instanceof JSFunctionExpression) {
+                iconDescriptor.setMainIcon(AllIcons.Nodes.Function);
+            }
 
-			if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-			{
-				iconDescriptor.setRightIcon(AllIcons.Nodes.C_public);
-			}
-		}
-		else if(element instanceof JSClass)
-		{
-			final JSAttributeList attributeList = ((JSClass) element).getAttributeList();
+            if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                iconDescriptor.setRightIcon(AllIcons.Nodes.C_public);
+            }
+        }
+        else if (element instanceof JSClass) {
+            final JSAttributeList attributeList = ((JSClass)element).getAttributeList();
 
-			iconDescriptor.setMainIcon(((JSClass) element).isInterface() ? AllIcons.Nodes.Interface : AllIcons.Nodes.Class);
-			addStaticAndFinalIcons(iconDescriptor, attributeList);
+            iconDescriptor.setMainIcon(((JSClass)element).isInterface() ? AllIcons.Nodes.Interface : AllIcons.Nodes.Class);
+            addStaticAndFinalIcons(iconDescriptor, attributeList);
 
-			if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-			{
-				final JSAttributeList.AccessType accessType = attributeList != null ? attributeList.getAccessType() : JSAttributeList.AccessType.PACKAGE_LOCAL;
-				iconDescriptor.setRightIcon(getAccessIcon(accessType));
-			}
-		}
-		else if(element instanceof JSParameter)
-		{
-			iconDescriptor.setMainIcon(AllIcons.Nodes.Parameter);
-			if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-			{
-				iconDescriptor.setRightIcon(AllIcons.Nodes.C_plocal);
-			}
-		}
-		else if(element instanceof JSVariable)
-		{
-			iconDescriptor.setMainIcon(AllIcons.Nodes.Variable);
+            if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                final JSAttributeList.AccessType accessType =
+                    attributeList != null ? attributeList.getAccessType() : JSAttributeList.AccessType.PACKAGE_LOCAL;
+                iconDescriptor.setRightIcon(getAccessIcon(accessType));
+            }
+        }
+        else if (element instanceof JSParameter) {
+            iconDescriptor.setMainIcon(AllIcons.Nodes.Parameter);
+            if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                iconDescriptor.setRightIcon(AllIcons.Nodes.C_plocal);
+            }
+        }
+        else if (element instanceof JSVariable) {
+            iconDescriptor.setMainIcon(AllIcons.Nodes.Variable);
 
-			final PsiElement grandParent = JSResolveUtil.findParent(element);
+            final PsiElement grandParent = JSResolveUtil.findParent(element);
 
-			if(grandParent instanceof JSClass)
-			{
-				final JSAttributeList attributeList = ((JSVariable) element).getAttributeList();
-				if(attributeList != null)
-				{
-					addStaticAndFinalIcons(iconDescriptor, attributeList);
+            if (grandParent instanceof JSClass) {
+                final JSAttributeList attributeList = ((JSVariable)element).getAttributeList();
+                if (attributeList != null) {
+                    addStaticAndFinalIcons(iconDescriptor, attributeList);
 
-					if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-					{
-						iconDescriptor.setRightIcon(getAccessIcon(attributeList.getAccessType()));
-					}
-				}
-				else
-				{
-					if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-					{
-						iconDescriptor.setRightIcon(getAccessIcon(JSAttributeList.AccessType.PUBLIC));
-					}
-				}
-			}
-			else if(grandParent instanceof JSBlockStatement || grandParent instanceof JSLoopStatement)
-			{
-				if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-				{
-					iconDescriptor.setRightIcon(AllIcons.Nodes.C_private);
-				}
-			}
-			else
-			{
-				if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-				{
-					iconDescriptor.setRightIcon(AllIcons.Nodes.C_public);
-				}
-			}
-		}
-		else if(element instanceof JSNamespaceDeclaration)
-		{
-			iconDescriptor.setMainIcon(AllIcons.Nodes.Package);
-		}
-		else if(element instanceof JSFunction)
-		{
-			iconDescriptor.setMainIcon(AllIcons.Nodes.Function);
+                    if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                        iconDescriptor.setRightIcon(getAccessIcon(attributeList.getAccessType()));
+                    }
+                }
+                else if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                    iconDescriptor.setRightIcon(getAccessIcon(JSAttributeList.AccessType.PUBLIC));
+                }
+            }
+            else if (grandParent instanceof JSBlockStatement || grandParent instanceof JSLoopStatement) {
+                if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                    iconDescriptor.setRightIcon(AllIcons.Nodes.C_private);
+                }
+            }
+            else if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                iconDescriptor.setRightIcon(AllIcons.Nodes.C_public);
+            }
+        }
+        else if (element instanceof JSNamespaceDeclaration) {
+            iconDescriptor.setMainIcon(AllIcons.Nodes.Package);
+        }
+        else if (element instanceof JSFunction) {
+            iconDescriptor.setMainIcon(AllIcons.Nodes.Function);
 
-			final PsiElement parent = JSResolveUtil.findParent(element);
-			if(parent instanceof JSBlockStatement)
-			{
-				if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-				{
-					iconDescriptor.setRightIcon(AllIcons.Nodes.C_private);
-				}
-			}
-			else if(parent instanceof JSClass)
-			{
-				final JSAttributeList attributeList = ((JSFunction) element).getAttributeList();
-				if(attributeList != null)
-				{
-					addStaticAndFinalIcons(iconDescriptor, attributeList);
-					if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-					{
-						iconDescriptor.setRightIcon(getAccessIcon(attributeList.getAccessType()));
-					}
-				}
-				else
-				{
-					if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-					{
-						iconDescriptor.setRightIcon(getAccessIcon(JSAttributeList.AccessType.PUBLIC));
-					}
-				}
-			}
-			else
-			{
-				if(BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY))
-				{
-					iconDescriptor.setRightIcon(getAccessIcon(JSAttributeList.AccessType.PUBLIC));
-				}
-			}
-		}
-	}
+            final PsiElement parent = JSResolveUtil.findParent(element);
+            if (parent instanceof JSBlockStatement) {
+                if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                    iconDescriptor.setRightIcon(AllIcons.Nodes.C_private);
+                }
+            }
+            else if (parent instanceof JSClass) {
+                final JSAttributeList attributeList = ((JSFunction)element).getAttributeList();
+                if (attributeList != null) {
+                    addStaticAndFinalIcons(iconDescriptor, attributeList);
+                    if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                        iconDescriptor.setRightIcon(getAccessIcon(attributeList.getAccessType()));
+                    }
+                }
+                else if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                    iconDescriptor.setRightIcon(getAccessIcon(JSAttributeList.AccessType.PUBLIC));
+                }
+            }
+            else if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
+                iconDescriptor.setRightIcon(getAccessIcon(JSAttributeList.AccessType.PUBLIC));
+            }
+        }
+    }
 
-	@Nullable
-	public Image getAccessIcon(JSAttributeList.AccessType accessType)
-	{
-		switch(accessType)
-		{
-			case PUBLIC:
-				return AllIcons.Nodes.C_public;
-			case PRIVATE:
-				return AllIcons.Nodes.C_private;
-			case PROTECTED:
-				return AllIcons.Nodes.C_protected;
-			case PACKAGE_LOCAL:
-				return AllIcons.Nodes.C_plocal;
-		}
-		return null;
-	}
+    @Nullable
+    public Image getAccessIcon(JSAttributeList.AccessType accessType) {
+        switch (accessType) {
+            case PUBLIC:
+                return AllIcons.Nodes.C_public;
+            case PRIVATE:
+                return AllIcons.Nodes.C_private;
+            case PROTECTED:
+                return AllIcons.Nodes.C_protected;
+            case PACKAGE_LOCAL:
+                return AllIcons.Nodes.C_plocal;
+        }
+        return null;
+    }
 
-	private static void addStaticAndFinalIcons(IconDescriptor iconDescriptor, JSAttributeList attrList)
-	{
-		if(attrList == null)
-		{
-			return;
-		}
-		if(attrList.hasModifier(JSAttributeList.ModifierType.STATIC) || attrList.hasModifier(JSAttributeList.ModifierType.DYNAMIC))   // dynamic?
-		{
-			iconDescriptor.addLayerIcon(AllIcons.Nodes.StaticMark);
-		}
-		if(attrList.hasModifier(JSAttributeList.ModifierType.FINAL))
-		{
-			iconDescriptor.addLayerIcon(AllIcons.Nodes.FinalMark);
-		}
-	}
+    private static void addStaticAndFinalIcons(IconDescriptor iconDescriptor, JSAttributeList attrList) {
+        if (attrList == null) {
+            return;
+        }
+        if (attrList.hasModifier(JSAttributeList.ModifierType.STATIC) || attrList.hasModifier(JSAttributeList.ModifierType.DYNAMIC))   // dynamic?
+        {
+            iconDescriptor.addLayerIcon(AllIcons.Nodes.StaticMark);
+        }
+        if (attrList.hasModifier(JSAttributeList.ModifierType.FINAL)) {
+            iconDescriptor.addLayerIcon(AllIcons.Nodes.FinalMark);
+        }
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
index 752e7313..b7dcfa0d 100644
--- a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
+++ b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
@@ -25,46 +25,36 @@
 import consulo.language.psi.PsiWhiteSpace;
 import jakarta.annotation.Nonnull;
 
-public class UpdateJavaScriptFileCopyright extends UpdatePsiFileCopyright<CopyrightFileConfig>
-{
-	public UpdateJavaScriptFileCopyright(@Nonnull PsiFile psiFile, @Nonnull CopyrightProfile copyrightProfile)
-	{
-		super(psiFile, copyrightProfile);
-	}
+public class UpdateJavaScriptFileCopyright extends UpdatePsiFileCopyright<CopyrightFileConfig> {
+    public UpdateJavaScriptFileCopyright(@Nonnull PsiFile psiFile, @Nonnull CopyrightProfile copyrightProfile) {
+        super(psiFile, copyrightProfile);
+    }
 
-	protected void scanFile()
-	{
-		PsiElement first = getFile().getFirstChild();
-		if(first != null)
-		{
-			final PsiElement child = first.getFirstChild();
-			if(child instanceof PsiComment)
-			{
-				first = child;
-			}
-		}
-		PsiElement last = first;
-		PsiElement next = first;
-		while(next != null)
-		{
-			if(next instanceof PsiComment || next instanceof PsiWhiteSpace)
-			{
-				next = getNextSibling(next);
-			}
-			else
-			{
-				break;
-			}
-			last = next;
-		}
+    protected void scanFile() {
+        PsiElement first = getFile().getFirstChild();
+        if (first != null) {
+            final PsiElement child = first.getFirstChild();
+            if (child instanceof PsiComment) {
+                first = child;
+            }
+        }
+        PsiElement last = first;
+        PsiElement next = first;
+        while (next != null) {
+            if (next instanceof PsiComment || next instanceof PsiWhiteSpace) {
+                next = getNextSibling(next);
+            }
+            else {
+                break;
+            }
+            last = next;
+        }
 
-		if(first != null)
-		{
-			checkComments(first, last, true);
-		}
-		else
-		{
-			checkComments(null, null, true);
-		}
-	}
+        if (first != null) {
+            checkComments(first, last, true);
+        }
+        else {
+            checkComments(null, null, true);
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
index 2d08111a..585a489c 100644
--- a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
@@ -18,33 +18,32 @@
  * @since 16.02.2015
  */
 @ExtensionImpl
-public class UpdateJavaScriptFileCopyrightProvider extends UpdateCopyrightsProvider<CopyrightFileConfig>
-{
-	@Nonnull
-	@Override
-	public FileType getFileType()
-	{
-		return JavaScriptFileType.INSTANCE;
-	}
+public class UpdateJavaScriptFileCopyrightProvider extends UpdateCopyrightsProvider<CopyrightFileConfig> {
+    @Nonnull
+    @Override
+    public FileType getFileType() {
+        return JavaScriptFileType.INSTANCE;
+    }
 
-	@Nonnull
-	@Override
-	public UpdatePsiFileCopyright<CopyrightFileConfig> createInstance(@Nonnull PsiFile file, @Nonnull CopyrightProfile copyrightProfile)
-	{
-		return new UpdateJavaScriptFileCopyright(file, copyrightProfile);
-	}
+    @Nonnull
+    @Override
+    public UpdatePsiFileCopyright<CopyrightFileConfig> createInstance(@Nonnull PsiFile file, @Nonnull CopyrightProfile copyrightProfile) {
+        return new UpdateJavaScriptFileCopyright(file, copyrightProfile);
+    }
 
-	@Nonnull
-	@Override
-	public CopyrightFileConfig createDefaultOptions()
-	{
-		return new CopyrightFileConfig();
-	}
+    @Nonnull
+    @Override
+    public CopyrightFileConfig createDefaultOptions() {
+        return new CopyrightFileConfig();
+    }
 
-	@Nonnull
-	@Override
-	public TemplateCommentPanel createConfigurable(@Nonnull Project project, @Nonnull TemplateCommentPanel parentPane, @Nonnull FileType fileType)
-	{
-		return new TemplateCommentPanel(fileType, parentPane, project);
-	}
+    @Nonnull
+    @Override
+    public TemplateCommentPanel createConfigurable(
+        @Nonnull Project project,
+        @Nonnull TemplateCommentPanel parentPane,
+        @Nonnull FileType fileType
+    ) {
+        return new TemplateCommentPanel(fileType, parentPane, project);
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java b/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
index 4ce94cc9..820a60f0 100644
--- a/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
+++ b/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
@@ -14,21 +14,17 @@
  * @since 2019-12-16
  */
 @ExtensionImpl
-public class JavaScriptFindUsagesHandlerFactory extends FindUsagesHandlerFactory
-{
-	@Override
-	public boolean canFindUsages(@Nonnull PsiElement element)
-	{
-		return element instanceof JSDefinitionExpression;
-	}
+public class JavaScriptFindUsagesHandlerFactory extends FindUsagesHandlerFactory {
+    @Override
+    public boolean canFindUsages(@Nonnull PsiElement element) {
+        return element instanceof JSDefinitionExpression;
+    }
 
-	@Nullable
-	@Override
-	public FindUsagesHandler createFindUsagesHandler(@Nonnull PsiElement element, boolean forHighlightUsages)
-	{
-		return new FindUsagesHandler(element)
-		{
+    @Nullable
+    @Override
+    public FindUsagesHandler createFindUsagesHandler(@Nonnull PsiElement element, boolean forHighlightUsages) {
+        return new FindUsagesHandler(element) {
 
-		};
-	}
+        };
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
index 7af99a38..63d90bed 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
@@ -10,22 +10,18 @@
  * @author VISTALL
  * @since 16.02.2015
  */
-public class JavaScriptCodeStyleConfigurable extends CodeStyleAbstractConfigurable
-{
-	public JavaScriptCodeStyleConfigurable(@Nonnull CodeStyleSettings settings, CodeStyleSettings cloneSettings)
-	{
-		super(settings, cloneSettings, "JavaScript");
-	}
+public class JavaScriptCodeStyleConfigurable extends CodeStyleAbstractConfigurable {
+    public JavaScriptCodeStyleConfigurable(@Nonnull CodeStyleSettings settings, CodeStyleSettings cloneSettings) {
+        super(settings, cloneSettings, "JavaScript");
+    }
 
-	@Override
-	protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings)
-	{
-		return new JavaScriptCodeStylePanel(getCurrentSettings(), settings);
-	}
+    @Override
+    protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) {
+        return new JavaScriptCodeStylePanel(getCurrentSettings(), settings);
+    }
 
-	@Override
-	public String getHelpTopic()
-	{
-		return "reference.settingsdialog.codestyle.javascript";
-	}
+    @Override
+    public String getHelpTopic() {
+        return "reference.settingsdialog.codestyle.javascript";
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStylePanel.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStylePanel.java
index 1ef0d456..85492813 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStylePanel.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStylePanel.java
@@ -9,17 +9,14 @@
  * @author VISTALL
  * @since 16.02.2015
  */
-public class JavaScriptCodeStylePanel extends TabbedLanguageCodeStylePanel
-{
-	public JavaScriptCodeStylePanel(CodeStyleSettings currentSettings, CodeStyleSettings cloneSettings)
-	{
-		super(JavaScriptLanguage.INSTANCE, currentSettings, cloneSettings);
-	}
+public class JavaScriptCodeStylePanel extends TabbedLanguageCodeStylePanel {
+    public JavaScriptCodeStylePanel(CodeStyleSettings currentSettings, CodeStyleSettings cloneSettings) {
+        super(JavaScriptLanguage.INSTANCE, currentSettings, cloneSettings);
+    }
 
-	@Override
-	protected void initTabs(CodeStyleSettings settings)
-	{
-		super.initTabs(settings);
-		addTab(new JSCodeStylePanel(settings));
-	}
+    @Override
+    protected void initTabs(CodeStyleSettings settings) {
+        super.initTabs(settings);
+        addTab(new JSCodeStylePanel(settings));
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index e94004bf..3242968a 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -11,6 +11,7 @@
 import consulo.util.io.FileUtil;
 
 import jakarta.annotation.Nonnull;
+
 import java.io.IOException;
 
 /**
@@ -18,83 +19,124 @@
  * @since 16.02.2015
  */
 @ExtensionImpl
-public class JavaScriptLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider
-{
-	@Override
-	public IndentOptionsEditor getIndentOptionsEditor()
-	{
-		return new SmartIndentOptionsEditor();
-	}
+public class JavaScriptLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider {
+    @Override
+    public IndentOptionsEditor getIndentOptionsEditor() {
+        return new SmartIndentOptionsEditor();
+    }
 
-	@Override
-	public CommonCodeStyleSettings getDefaultCommonSettings()
-	{
-		CommonCodeStyleSettings defaultSettings = new CommonCodeStyleSettings(getLanguage());
-		CommonCodeStyleSettings.IndentOptions indentOptions = defaultSettings.initIndentOptions();
-		indentOptions.INDENT_SIZE = 2;
-		indentOptions.CONTINUATION_INDENT_SIZE = 4;
-		indentOptions.TAB_SIZE = 2;
+    @Override
+    public CommonCodeStyleSettings getDefaultCommonSettings() {
+        CommonCodeStyleSettings defaultSettings = new CommonCodeStyleSettings(getLanguage());
+        CommonCodeStyleSettings.IndentOptions indentOptions = defaultSettings.initIndentOptions();
+        indentOptions.INDENT_SIZE = 2;
+        indentOptions.CONTINUATION_INDENT_SIZE = 4;
+        indentOptions.TAB_SIZE = 2;
 
-		defaultSettings.KEEP_LINE_BREAKS = false;
+        defaultSettings.KEEP_LINE_BREAKS = false;
 
-		return defaultSettings;
-	}
+        return defaultSettings;
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 
-	@Override
-	public void customizeSettings(@Nonnull CodeStyleSettingsCustomizable consumer, @Nonnull SettingsType settingsType)
-	{
-		if(settingsType == SettingsType.SPACING_SETTINGS)
-		{
-			consumer.showStandardOptions("SPACE_BEFORE_METHOD_CALL_PARENTHESES", "SPACE_BEFORE_METHOD_PARENTHESES", "SPACE_BEFORE_IF_PARENTHESES",
-					"SPACE_BEFORE_WHILE_PARENTHESES", "SPACE_BEFORE_FOR_PARENTHESES", "SPACE_BEFORE_CATCH_PARENTHESES",
-					"SPACE_BEFORE_SWITCH_PARENTHESES", "SPACE_AROUND_ASSIGNMENT_OPERATORS", "SPACE_AROUND_LOGICAL_OPERATORS",
-					"SPACE_AROUND_EQUALITY_OPERATORS", "SPACE_AROUND_RELATIONAL_OPERATORS", "SPACE_AROUND_ADDITIVE_OPERATORS",
-					"SPACE_AROUND_MULTIPLICATIVE_OPERATORS", "SPACE_AROUND_SHIFT_OPERATORS", "SPACE_BEFORE_CLASS_LBRACE",
-					"SPACE_BEFORE_METHOD_LBRACE", "SPACE_BEFORE_IF_LBRACE", "SPACE_BEFORE_ELSE_LBRACE", "SPACE_BEFORE_WHILE_LBRACE",
-					"SPACE_BEFORE_FOR_LBRACE", "SPACE_BEFORE_SWITCH_LBRACE", "SPACE_BEFORE_TRY_LBRACE", "SPACE_BEFORE_CATCH_LBRACE",
-					"SPACE_BEFORE_WHILE_KEYWORD", "SPACE_BEFORE_ELSE_KEYWORD", "SPACE_BEFORE_CATCH_KEYWORD", "SPACE_WITHIN_METHOD_CALL_PARENTHESES",
-					"SPACE_WITHIN_METHOD_PARENTHESES", "SPACE_WITHIN_IF_PARENTHESES", "SPACE_WITHIN_WHILE_PARENTHESES",
-					"SPACE_WITHIN_FOR_PARENTHESES", "SPACE_WITHIN_CATCH_PARENTHESES", "SPACE_WITHIN_SWITCH_PARENTHESES", "SPACE_BEFORE_QUEST",
-					"SPACE_AFTER_QUEST", "SPACE_BEFORE_COLON", "SPACE_AFTER_COLON", "SPACE_AFTER_COMMA", "SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS",
-					"SPACE_BEFORE_COMMA", "SPACE_AROUND_UNARY_OPERATOR", "SPACE_WITHIN_BRACKETS", "SPACE_BEFORE_METHOD_PARENTHESES");
-		}
-		else if(settingsType == SettingsType.BLANK_LINES_SETTINGS)
-		{
-			consumer.showStandardOptions("KEEP_BLANK_LINES_IN_CODE");
-		}
-		else if(settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS)
-		{
-			consumer.showStandardOptions("KEEP_LINE_BREAKS", "KEEP_FIRST_COLUMN_COMMENT", "BRACE_STYLE", "CLASS_BRACE_STYLE", "METHOD_BRACE_STYLE",
-					"CALL_PARAMETERS_WRAP", "CALL_PARAMETERS_LPAREN_ON_NEXT_LINE", "CALL_PARAMETERS_RPAREN_ON_NEXT_LINE", "METHOD_PARAMETERS_WRAP",
-					"METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE", "METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE", "ELSE_ON_NEW_LINE", "WHILE_ON_NEW_LINE",
-					"CATCH_ON_NEW_LINE", "ALIGN_MULTILINE_PARAMETERS", "ALIGN_MULTILINE_PARAMETERS_IN_CALLS", "ALIGN_MULTILINE_BINARY_OPERATION",
-					"BINARY_OPERATION_WRAP", "BINARY_OPERATION_SIGN_ON_NEXT_LINE", "TERNARY_OPERATION_WRAP", "TERNARY_OPERATION_SIGNS_ON_NEXT_LINE",
-					"PARENTHESES_EXPRESSION_LPAREN_WRAP", "PARENTHESES_EXPRESSION_RPAREN_WRAP", "ALIGN_MULTILINE_TERNARY_OPERATION");
-		}
-	}
+    @Override
+    public void customizeSettings(@Nonnull CodeStyleSettingsCustomizable consumer, @Nonnull SettingsType settingsType) {
+        if (settingsType == SettingsType.SPACING_SETTINGS) {
+            consumer.showStandardOptions(
+                "SPACE_BEFORE_METHOD_CALL_PARENTHESES",
+                "SPACE_BEFORE_METHOD_PARENTHESES",
+                "SPACE_BEFORE_IF_PARENTHESES",
+                "SPACE_BEFORE_WHILE_PARENTHESES",
+                "SPACE_BEFORE_FOR_PARENTHESES",
+                "SPACE_BEFORE_CATCH_PARENTHESES",
+                "SPACE_BEFORE_SWITCH_PARENTHESES",
+                "SPACE_AROUND_ASSIGNMENT_OPERATORS",
+                "SPACE_AROUND_LOGICAL_OPERATORS",
+                "SPACE_AROUND_EQUALITY_OPERATORS",
+                "SPACE_AROUND_RELATIONAL_OPERATORS",
+                "SPACE_AROUND_ADDITIVE_OPERATORS",
+                "SPACE_AROUND_MULTIPLICATIVE_OPERATORS",
+                "SPACE_AROUND_SHIFT_OPERATORS",
+                "SPACE_BEFORE_CLASS_LBRACE",
+                "SPACE_BEFORE_METHOD_LBRACE",
+                "SPACE_BEFORE_IF_LBRACE",
+                "SPACE_BEFORE_ELSE_LBRACE",
+                "SPACE_BEFORE_WHILE_LBRACE",
+                "SPACE_BEFORE_FOR_LBRACE",
+                "SPACE_BEFORE_SWITCH_LBRACE",
+                "SPACE_BEFORE_TRY_LBRACE",
+                "SPACE_BEFORE_CATCH_LBRACE",
+                "SPACE_BEFORE_WHILE_KEYWORD",
+                "SPACE_BEFORE_ELSE_KEYWORD",
+                "SPACE_BEFORE_CATCH_KEYWORD",
+                "SPACE_WITHIN_METHOD_CALL_PARENTHESES",
+                "SPACE_WITHIN_METHOD_PARENTHESES",
+                "SPACE_WITHIN_IF_PARENTHESES",
+                "SPACE_WITHIN_WHILE_PARENTHESES",
+                "SPACE_WITHIN_FOR_PARENTHESES",
+                "SPACE_WITHIN_CATCH_PARENTHESES",
+                "SPACE_WITHIN_SWITCH_PARENTHESES",
+                "SPACE_BEFORE_QUEST",
+                "SPACE_AFTER_QUEST",
+                "SPACE_BEFORE_COLON",
+                "SPACE_AFTER_COLON",
+                "SPACE_AFTER_COMMA",
+                "SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS",
+                "SPACE_BEFORE_COMMA",
+                "SPACE_AROUND_UNARY_OPERATOR",
+                "SPACE_WITHIN_BRACKETS",
+                "SPACE_BEFORE_METHOD_PARENTHESES"
+            );
+        }
+        else if (settingsType == SettingsType.BLANK_LINES_SETTINGS) {
+            consumer.showStandardOptions("KEEP_BLANK_LINES_IN_CODE");
+        }
+        else if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) {
+            consumer.showStandardOptions(
+                "KEEP_LINE_BREAKS",
+                "KEEP_FIRST_COLUMN_COMMENT",
+                "BRACE_STYLE",
+                "CLASS_BRACE_STYLE",
+                "METHOD_BRACE_STYLE",
+                "CALL_PARAMETERS_WRAP",
+                "CALL_PARAMETERS_LPAREN_ON_NEXT_LINE",
+                "CALL_PARAMETERS_RPAREN_ON_NEXT_LINE",
+                "METHOD_PARAMETERS_WRAP",
+                "METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE",
+                "METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE",
+                "ELSE_ON_NEW_LINE",
+                "WHILE_ON_NEW_LINE",
+                "CATCH_ON_NEW_LINE",
+                "ALIGN_MULTILINE_PARAMETERS",
+                "ALIGN_MULTILINE_PARAMETERS_IN_CALLS",
+                "ALIGN_MULTILINE_BINARY_OPERATION",
+                "BINARY_OPERATION_WRAP",
+                "BINARY_OPERATION_SIGN_ON_NEXT_LINE",
+                "TERNARY_OPERATION_WRAP",
+                "TERNARY_OPERATION_SIGNS_ON_NEXT_LINE",
+                "PARENTHESES_EXPRESSION_LPAREN_WRAP",
+                "PARENTHESES_EXPRESSION_RPAREN_WRAP",
+                "ALIGN_MULTILINE_TERNARY_OPERATION"
+            );
+        }
+    }
 
-	@Override
-	public String getCodeSample(@Nonnull SettingsType settingsType)
-	{
-		return loadPreview("codeStyle.txt");
-	}
+    @Override
+    public String getCodeSample(@Nonnull SettingsType settingsType) {
+        return loadPreview("codeStyle.txt");
+    }
 
-	private static String loadPreview(String file)
-	{
-		try
-		{
-			return FileUtil.loadTextAndClose(JavaScriptLanguageCodeStyleSettingsProvider.class.getResourceAsStream("/codeStyle/" + file));
-		}
-		catch(IOException e)
-		{
-			throw new Error(e);
-		}
-	}
+    private static String loadPreview(String file) {
+        try {
+            return FileUtil.loadTextAndClose(JavaScriptLanguageCodeStyleSettingsProvider.class.getResourceAsStream("/codeStyle/" + file));
+        }
+        catch (IOException e) {
+            throw new Error(e);
+        }
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
index 8eea8195..5e515c57 100644
--- a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
@@ -14,14 +14,12 @@
  * @since 2024-04-19
  */
 @ExtensionImpl
-public class JavaScriptEmbeddedTokenHighlighter implements EmbeddedTokenHighlighter
-{
-	@Nonnull
-	@Override
-	public MultiMap<IElementType, TextAttributesKey> getEmbeddedTokenAttributes(@Nonnull XMLLanguage language)
-	{
-		MultiMap<IElementType, TextAttributesKey> keys = MultiMap.createLinked();
-		JavaScriptHighlighter.storeDefaults(keys);
-		return keys;
-	}
+public class JavaScriptEmbeddedTokenHighlighter implements EmbeddedTokenHighlighter {
+    @Nonnull
+    @Override
+    public MultiMap<IElementType, TextAttributesKey> getEmbeddedTokenAttributes(@Nonnull XMLLanguage language) {
+        MultiMap<IElementType, TextAttributesKey> keys = MultiMap.createLinked();
+        JavaScriptHighlighter.storeDefaults(keys);
+        return keys;
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
index a1b03520..66a6f987 100644
--- a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
@@ -17,25 +17,21 @@
  * @since 2024-04-19
  */
 @ExtensionImpl
-public class JavaScriptHtmlScriptContentProvider implements HtmlScriptContentProvider
-{
-	@Override
-	public IElementType getScriptElementType()
-	{
-		return JSElementTypes.EMBEDDED_CONTENT;
-	}
+public class JavaScriptHtmlScriptContentProvider implements HtmlScriptContentProvider {
+    @Override
+    public IElementType getScriptElementType() {
+        return JSElementTypes.EMBEDDED_CONTENT;
+    }
 
-	@Nullable
-	@Override
-	public Lexer getHighlightingLexer()
-	{
-		return new JavaScript15Lexer();
-	}
+    @Nullable
+    @Override
+    public Lexer getHighlightingLexer() {
+        return new JavaScript15Lexer();
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
index a970fc86..94aba41c 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
@@ -23,72 +23,62 @@
  * @author VISTALL
  * @since 06.12.2015
  */
-public class JavaScriptCreateFileAction extends CreateFileFromTemplateAction
-{
-	public JavaScriptCreateFileAction()
-	{
-		super(
-			JavaScriptLocalize.actionJavascriptFileText(),
-			JavaScriptLocalize.actionJavascriptFileText(),
-			JavaScriptFileType.INSTANCE.getIcon()
-		);
-	}
+public class JavaScriptCreateFileAction extends CreateFileFromTemplateAction {
+    public JavaScriptCreateFileAction() {
+        super(
+            JavaScriptLocalize.actionJavascriptFileText(),
+            JavaScriptLocalize.actionJavascriptFileText(),
+            JavaScriptFileType.INSTANCE.getIcon()
+        );
+    }
 
-	@Override
-	@RequiredUIAccess
-	protected boolean isAvailable(DataContext dataContext)
-	{
-		if(!super.isAvailable(dataContext))
-		{
-			return false;
-		}
-		Module module = findModule(dataContext);
-		return module != null && ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class) != null;
-	}
+    @Override
+    @RequiredUIAccess
+    protected boolean isAvailable(DataContext dataContext) {
+        if (!super.isAvailable(dataContext)) {
+            return false;
+        }
+        Module module = findModule(dataContext);
+        return module != null && ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class) != null;
+    }
 
-	@Nullable
-	@Override
-	protected FileType getFileTypeForModuleResolve()
-	{
-		return JavaScriptFileType.INSTANCE;
-	}
+    @Nullable
+    @Override
+    protected FileType getFileTypeForModuleResolve() {
+        return JavaScriptFileType.INSTANCE;
+    }
 
-	@RequiredReadAction
-	private static Module findModule(DataContext dataContext)
-	{
-		Project project = dataContext.getData(CommonDataKeys.PROJECT);
-		assert project != null;
-		final IdeView view = dataContext.getData(IdeView.KEY);
-		if(view == null)
-		{
-			return null;
-		}
+    @RequiredReadAction
+    private static Module findModule(DataContext dataContext) {
+        Project project = dataContext.getData(CommonDataKeys.PROJECT);
+        assert project != null;
+        final IdeView view = dataContext.getData(IdeView.KEY);
+        if (view == null) {
+            return null;
+        }
 
-		final PsiDirectory directory = view.getOrChooseDirectory();
-		if(directory == null)
-		{
-			return null;
-		}
+        final PsiDirectory directory = view.getOrChooseDirectory();
+        if (directory == null) {
+            return null;
+        }
 
-		Module resolvedModule = NewFileModuleResolver.resolveModule(directory.getProject(), directory.getVirtualFile(), JavaScriptFileType.INSTANCE);
-		if(resolvedModule != null)
-		{
-			return resolvedModule;
-		}
-		return dataContext.getData(Module.KEY);
-	}
+        Module resolvedModule =
+            NewFileModuleResolver.resolveModule(directory.getProject(), directory.getVirtualFile(), JavaScriptFileType.INSTANCE);
+        if (resolvedModule != null) {
+            return resolvedModule;
+        }
+        return dataContext.getData(Module.KEY);
+    }
 
-	@Override
-	protected void buildDialog(Project project, PsiDirectory directory, CreateFileFromTemplateDialog.Builder builder)
-	{
-		builder.setTitle("Create JavaScript File");
+    @Override
+    protected void buildDialog(Project project, PsiDirectory directory, CreateFileFromTemplateDialog.Builder builder) {
+        builder.setTitle("Create JavaScript File");
 
-		builder.addKind("Empty File", JavaScriptFileType.INSTANCE.getIcon(), "JavaScriptFile");
-	}
+        builder.addKind("Empty File", JavaScriptFileType.INSTANCE.getIcon(), "JavaScriptFile");
+    }
 
-	@Override
-	protected String getActionName(PsiDirectory directory, String newName, String templateName)
-	{
-		return "Create JavaScript File";
-	}
+    @Override
+    protected String getActionName(PsiDirectory directory, String newName, String templateName) {
+        return "Create JavaScript File";
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
index db5ada54..9c216013 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
@@ -10,11 +10,9 @@
  * @since 29-Aug-22
  */
 @ExtensionImpl
-public class JavaScriptFileTemplateContributor implements FileTemplateContributor
-{
-	@Override
-	public void register(@Nonnull FileTemplateRegistrator fileTemplateRegistrator)
-	{
-		fileTemplateRegistrator.registerInternalTemplate("JavaScriptFile");
-	}
+public class JavaScriptFileTemplateContributor implements FileTemplateContributor {
+    @Override
+    public void register(@Nonnull FileTemplateRegistrator fileTemplateRegistrator) {
+        fileTemplateRegistrator.registerInternalTemplate("JavaScriptFile");
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
index 0d4202db..adad88a8 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -37,58 +37,57 @@
  * @since 20.12.2015
  */
 @ExtensionImpl
-public class JavaScriptKeywordCompletionContributor extends CompletionContributor
-{
-	public JavaScriptKeywordCompletionContributor()
-	{
-		extend(CompletionType.BASIC, StandardPatterns.psiElement().withParent(JSReferenceExpression.class), new CompletionProvider()
-		{
-			@RequiredReadAction
-			@Override
-			public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
-			{
-				PsiElement position = parameters.getPosition();
-				JSReferenceExpression parent = (JSReferenceExpression) position.getParent();
-				if(parent.getQualifier() != null)
-				{
-					return;
-				}
+public class JavaScriptKeywordCompletionContributor extends CompletionContributor {
+    public JavaScriptKeywordCompletionContributor() {
+        extend(
+            CompletionType.BASIC,
+            StandardPatterns.psiElement().withParent(JSReferenceExpression.class),
+            new CompletionProvider() {
+                @RequiredReadAction
+                @Override
+                public void addCompletions(
+                    @Nonnull CompletionParameters parameters,
+                    ProcessingContext context,
+                    @Nonnull CompletionResultSet result
+                ) {
+                    PsiElement position = parameters.getPosition();
+                    JSReferenceExpression parent = (JSReferenceExpression)position.getParent();
+                    if (parent.getQualifier() != null) {
+                        return;
+                    }
 
-				boolean parentIsStatement = parent.getParent() instanceof JSExpressionStatement;
+                    boolean parentIsStatement = parent.getParent() instanceof JSExpressionStatement;
 
-				LookupElementBuilder functionKeyword = LookupElementBuilder.create("function");
-				functionKeyword = functionKeyword.bold();
-				if(parentIsStatement)
-				{
-					functionKeyword = functionKeyword.withInsertHandler(SpaceInsertHandler.INSTANCE);
-				}
-				else
-				{
-					functionKeyword = functionKeyword.withInsertHandler(ParenthesesInsertHandler.getInstance(false));
-					functionKeyword = functionKeyword.withPresentableText("function()");
-				}
+                    LookupElementBuilder functionKeyword = LookupElementBuilder.create("function");
+                    functionKeyword = functionKeyword.bold();
+                    if (parentIsStatement) {
+                        functionKeyword = functionKeyword.withInsertHandler(SpaceInsertHandler.INSTANCE);
+                    }
+                    else {
+                        functionKeyword = functionKeyword.withInsertHandler(ParenthesesInsertHandler.getInstance(false));
+                        functionKeyword = functionKeyword.withPresentableText("function()");
+                    }
 
-				result.addElement(functionKeyword);
+                    result.addElement(functionKeyword);
 
-				result.addElement(LookupElementBuilder.create("var").withInsertHandler(SpaceInsertHandler.INSTANCE).bold());
-				result.addElement(LookupElementBuilder.create("const").withInsertHandler(SpaceInsertHandler.INSTANCE).bold());
+                    result.addElement(LookupElementBuilder.create("var").withInsertHandler(SpaceInsertHandler.INSTANCE).bold());
+                    result.addElement(LookupElementBuilder.create("const").withInsertHandler(SpaceInsertHandler.INSTANCE).bold());
 
-				result.addElement(LookupElementBuilder.create("if").bold());
-				result.addElement(LookupElementBuilder.create("for").bold());
-				result.addElement(LookupElementBuilder.create("return").bold());
+                    result.addElement(LookupElementBuilder.create("if").bold());
+                    result.addElement(LookupElementBuilder.create("for").bold());
+                    result.addElement(LookupElementBuilder.create("return").bold());
 
-				for(JavaScriptKeywordCompletionExtender extender : JavaScriptKeywordCompletionExtender.EP_NAME.getExtensionList())
-				{
-					extender.fillCompletion(parameters, context, result);
-				}
-			}
-		});
-	}
+                    for (JavaScriptKeywordCompletionExtender extender : JavaScriptKeywordCompletionExtender.EP_NAME.getExtensionList()) {
+                        extender.fillCompletion(parameters, context, result);
+                    }
+                }
+            }
+        );
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
index 3aa22d1c..2d72af51 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
@@ -12,12 +12,10 @@
  * @since 29-Aug-22
  */
 @ExtensionImpl
-public class JavaScriptSkipAutopopupInStrings extends SkipAutopopupInStrings
-{
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JavaScriptSkipAutopopupInStrings extends SkipAutopopupInStrings {
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/SpaceInsertHandler.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/SpaceInsertHandler.java
index cbea4f2f..0923166b 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/completion/SpaceInsertHandler.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/SpaceInsertHandler.java
@@ -25,18 +25,15 @@
  * @author VISTALL
  * @since 20.12.2015
  */
-public class SpaceInsertHandler implements InsertHandler<LookupElement>
-{
-	public static final SpaceInsertHandler INSTANCE = new SpaceInsertHandler();
+public class SpaceInsertHandler implements InsertHandler<LookupElement> {
+    public static final SpaceInsertHandler INSTANCE = new SpaceInsertHandler();
 
-	@Override
-	public void handleInsert(InsertionContext context, LookupElement item)
-	{
-		if(context.getCompletionChar() != ' ')
-		{
-			int tailOffset = context.getTailOffset();
-			TailType.insertChar(context.getEditor(), tailOffset, ' ');
-			context.getEditor().getCaretModel().moveToOffset(tailOffset + 1);
-		}
-	}
+    @Override
+    public void handleInsert(InsertionContext context, LookupElement item) {
+        if (context.getCompletionChar() != ' ') {
+            int tailOffset = context.getTailOffset();
+            TailType.insertChar(context.getEditor(), tailOffset, ' ');
+            context.getEditor().getCaretModel().moveToOffset(tailOffset + 1);
+        }
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java b/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
index 38e217ae..5426ea5c 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
@@ -16,20 +16,17 @@
  * @since 17/01/2021
  */
 @ExtensionImpl
-public class JavaScriptNavBarModelExtension extends StructureAwareNavBarModelExtension
-{
-	@Nonnull
-	@Override
-	protected Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JavaScriptNavBarModelExtension extends StructureAwareNavBarModelExtension {
+    @Nonnull
+    @Override
+    protected Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 
-	@Nullable
-	@Override
-	@RequiredReadAction
-	public String getPresentableText(Object object)
-	{
-		return object instanceof PsiElement ? JSStructureItemPresentation.getName((PsiElement) object) : null;
-	}
+    @Nullable
+    @Override
+    @RequiredReadAction
+    public String getPresentableText(Object object) {
+        return object instanceof PsiElement ? JSStructureItemPresentation.getName((PsiElement)object) : null;
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
index cad8e12c..5e3500e9 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
@@ -28,11 +28,9 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScriptFileTypeFactory extends FileTypeFactory
-{
-	@Override
-	public void createFileTypes(@Nonnull FileTypeConsumer consumer)
-	{
-		consumer.consume(JavaScriptFileType.INSTANCE);
-	}
+public class JavaScriptFileTypeFactory extends FileTypeFactory {
+    @Override
+    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
+        consumer.consume(JavaScriptFileType.INSTANCE);
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
index 2606e88a..993ede74 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
@@ -39,9 +39,11 @@ public class JavaScriptLanguageVersionPusher implements FilePropertyPusher<Langu
 
     @Override
     public void initExtra(@Nonnull Project project) {
-        project.getMessageBus().connect().subscribe(ModuleExtensionChangeListener.class, (oldExtension, newExtension) -> {
-            if (oldExtension instanceof JavaScriptModuleExtension && newExtension instanceof JavaScriptModuleExtension) {
-                if (((JavaScriptModuleExtension) oldExtension).getLanguageVersion() != ((JavaScriptModuleExtension) newExtension).getLanguageVersion()) {
+        project.getMessageBus().connect().subscribe(
+            ModuleExtensionChangeListener.class,
+            (oldExtension, newExtension) -> {
+            if (oldExtension instanceof JavaScriptModuleExtension oldJsExtension && newExtension instanceof JavaScriptModuleExtension newJsExtension) {
+                if (((JavaScriptModuleExtension)oldExtension).getLanguageVersion() != ((JavaScriptModuleExtension)newExtension).getLanguageVersion()) {
                     addChanged(project, newExtension);
                 }
             }
@@ -110,7 +112,11 @@ public boolean acceptsDirectory(@Nonnull VirtualFile virtualFile, @Nonnull Proje
     }
 
     @Override
-    public void persistAttribute(@Nonnull Project project, @Nonnull VirtualFile virtualFile, @Nonnull LanguageVersion newAttribute) throws IOException {
+    public void persistAttribute(
+        @Nonnull Project project,
+        @Nonnull VirtualFile virtualFile,
+        @Nonnull LanguageVersion newAttribute
+    ) throws IOException {
         DataInputStream inputStream = ourFileAttribute.readAttribute(virtualFile);
         if (inputStream != null) {
             try {
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
index 0832af44..ddfd5c6d 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
@@ -40,52 +40,44 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScriptLanguageVersionResolver implements LanguageVersionResolver
-{
-	@RequiredReadAction
-	@Nonnull
-	@Override
-	public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable PsiElement element)
-	{
-		PsiFile containingFile = element == null ? null : element.getContainingFile();
-		if(containingFile == null)
-		{
-			return StandardJavaScriptVersions.getInstance().getDefaultVersion();
-		}
-		FileType fileType = containingFile.getFileType();
-		if(fileType instanceof JavaScriptFileTypeWithVersion)
-		{
-			Module module = element.getModule();
-			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(module, element.getContainingFile().getVirtualFile());
-		}
+public class JavaScriptLanguageVersionResolver implements LanguageVersionResolver {
+    @RequiredReadAction
+    @Nonnull
+    @Override
+    public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable PsiElement element) {
+        PsiFile containingFile = element == null ? null : element.getContainingFile();
+        if (containingFile == null) {
+            return StandardJavaScriptVersions.getInstance().getDefaultVersion();
+        }
+        FileType fileType = containingFile.getFileType();
+        if (fileType instanceof JavaScriptFileTypeWithVersion) {
+            Module module = element.getModule();
+            return ((JavaScriptFileTypeWithVersion)fileType).getLanguageVersion(module, element.getContainingFile().getVirtualFile());
+        }
 
-		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
-	}
+        return StandardJavaScriptVersions.getInstance().getDefaultVersion();
+    }
 
-	@Nonnull
-	@RequiredReadAction
-	@Override
-	public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable Project project, @Nullable VirtualFile virtualFile)
-	{
-		if(project == null || virtualFile == null)
-		{
-			return StandardJavaScriptVersions.getInstance().getDefaultVersion();
-		}
+    @Nonnull
+    @RequiredReadAction
+    @Override
+    public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable Project project, @Nullable VirtualFile virtualFile) {
+        if (project == null || virtualFile == null) {
+            return StandardJavaScriptVersions.getInstance().getDefaultVersion();
+        }
 
-		FileType fileType = virtualFile.getFileType();
-		if(fileType instanceof JavaScriptFileTypeWithVersion)
-		{
-			Module module = ModuleUtilCore.findModuleForFile(virtualFile, project);
-			return ((JavaScriptFileTypeWithVersion) fileType).getLanguageVersion(module, virtualFile);
-		}
+        FileType fileType = virtualFile.getFileType();
+        if (fileType instanceof JavaScriptFileTypeWithVersion) {
+            Module module = ModuleUtilCore.findModuleForFile(virtualFile, project);
+            return ((JavaScriptFileTypeWithVersion)fileType).getLanguageVersion(module, virtualFile);
+        }
 
-		return StandardJavaScriptVersions.getInstance().getDefaultVersion();
-	}
+        return StandardJavaScriptVersions.getInstance().getDefaultVersion();
+    }
 
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
index 3fc68a65..8969acfa 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
@@ -41,56 +41,47 @@
  * @since 24.08.14
  */
 @ExtensionImpl
-public class JavaScriptParsingDefinition extends LanguageVersionableParserDefinition
-{
-	@Nonnull
-	@Override
-	public Language getLanguage()
-	{
-		return JavaScriptLanguage.INSTANCE;
-	}
+public class JavaScriptParsingDefinition extends LanguageVersionableParserDefinition {
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return JavaScriptLanguage.INSTANCE;
+    }
 
-	@Nonnull
-	@Override
-	public IFileElementType getFileNodeType()
-	{
-		return JSElementTypes.FILE;
-	}
+    @Nonnull
+    @Override
+    public IFileElementType getFileNodeType() {
+        return JSElementTypes.FILE;
+    }
 
-	@Nonnull
-	@Override
-	public PsiElement createElement(ASTNode node)
-	{
-		final IElementType type = node.getElementType();
+    @Nonnull
+    @Override
+    public PsiElement createElement(ASTNode node) {
+        final IElementType type = node.getElementType();
 
-		if(type == JSElementTypes.EMBEDDED_CONTENT)
-		{
-			return new JSEmbeddedContentImpl(node);
-		}
-		else if(type == JSTokenTypes.XML_JS_SCRIPT)
-		{
-			return new JSEmbeddedContentImpl(node);
-		}
-		else if(type == JSTokenTypes.DOC_COMMENT)
-		{
-			return new JSDocCommentImpl(node);
-		}
+        if (type == JSElementTypes.EMBEDDED_CONTENT) {
+            return new JSEmbeddedContentImpl(node);
+        }
+        else if (type == JSTokenTypes.XML_JS_SCRIPT) {
+            return new JSEmbeddedContentImpl(node);
+        }
+        else if (type == JSTokenTypes.DOC_COMMENT) {
+            return new JSDocCommentImpl(node);
+        }
 
-		return new ASTWrapperPsiElement(node);
-	}
+        return new ASTWrapperPsiElement(node);
+    }
 
-	@Override
-	public PsiFile createFile(FileViewProvider fileViewProvider)
-	{
-		return new JSFileImpl(fileViewProvider);
-	}
+    @Override
+    public PsiFile createFile(FileViewProvider fileViewProvider) {
+        return new JSFileImpl(fileViewProvider);
+    }
 
-	@Nonnull
-	@Override
-	public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right)
-	{
-		PsiElement leftPsi = left.getPsi();
-		final Lexer lexer = createLexer(leftPsi.getLanguageVersion());
-		return LanguageUtil.canStickTokensTogetherByLexer(left, right, lexer);
-	}
+    @Nonnull
+    @Override
+    public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
+        PsiElement leftPsi = left.getPsi();
+        final Lexer lexer = createLexer(leftPsi.getLanguageVersion());
+        return LanguageUtil.canStickTokensTogetherByLexer(left, right, lexer);
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
index d2eaefee..6848bff8 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
@@ -38,27 +38,32 @@
  * @author VISTALL
  */
 @ExtensionImpl
-public class JavaScriptClassContributor implements GotoClassOrTypeContributor
-{
-	@Override
-	public void processNames(@Nonnull Processor<String> processor, @Nonnull SearchScope searchScope, @Nullable IdFilter idFilter)
-	{
-		StubIndex.getInstance().processAllKeys(JavaScriptIndexKeys.CLASSES_BY_NAME, processor, (GlobalSearchScope) searchScope, idFilter);
-	}
+public class JavaScriptClassContributor implements GotoClassOrTypeContributor {
+    @Override
+    public void processNames(@Nonnull Processor<String> processor, @Nonnull SearchScope searchScope, @Nullable IdFilter idFilter) {
+        StubIndex.getInstance().processAllKeys(JavaScriptIndexKeys.CLASSES_BY_NAME, processor, (GlobalSearchScope)searchScope, idFilter);
+    }
 
-	@Override
-	public void processElementsWithName(@Nonnull String name, @Nonnull Processor<NavigationItem> processor, @Nonnull FindSymbolParameters findSymbolParameters)
-	{
-		Project project = findSymbolParameters.getProject();
-		Collection<JSClass> elements = StubIndex.getElements(JavaScriptIndexKeys.CLASSES_BY_NAME, name, project, GlobalSearchScope.allScope(project), findSymbolParameters.getIdFilter(), JSClass
-				.class);
+    @Override
+    public void processElementsWithName(
+        @Nonnull String name,
+        @Nonnull Processor<NavigationItem> processor,
+        @Nonnull FindSymbolParameters findSymbolParameters
+    ) {
+        Project project = findSymbolParameters.getProject();
+        Collection<JSClass> elements = StubIndex.getElements(
+            JavaScriptIndexKeys.CLASSES_BY_NAME,
+            name,
+            project,
+            GlobalSearchScope.allScope(project),
+            findSymbolParameters.getIdFilter(),
+            JSClass.class
+        );
 
-		for(JSClass element : elements)
-		{
-			if(!processor.process(element))
-			{
-				break;
-			}
-		}
-	}
+        for (JSClass element : elements) {
+            if (!processor.process(element)) {
+                break;
+            }
+        }
+    }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
index 61a95b1b..001fda5f 100644
--- a/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
@@ -33,15 +33,13 @@
  * @since 02.12.2015
  */
 @ExtensionImpl(id = "default", order = "last")
-public class DefaultJSPropertyNameReferenceProvider implements JSPropertyNameReferenceProvider
-{
-	@RequiredReadAction
-	@Nullable
-	@Override
-	public PsiReference getReference(@Nonnull JSProperty property)
-	{
-		PsiElement nameIdentifier = property.getNameIdentifier();
-		assert nameIdentifier != null;
-		return new JSPropertyNameReference(property, nameIdentifier);
-	}
+public class DefaultJSPropertyNameReferenceProvider implements JSPropertyNameReferenceProvider {
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiReference getReference(@Nonnull JSProperty property) {
+        PsiElement nameIdentifier = property.getNameIdentifier();
+        assert nameIdentifier != null;
+        return new JSPropertyNameReference(property, nameIdentifier);
+    }
 }
diff --git a/plugin/src/main/java/module-info.java b/plugin/src/main/java/module-info.java
index c4d9dd24..25b52a99 100644
--- a/plugin/src/main/java/module-info.java
+++ b/plugin/src/main/java/module-info.java
@@ -2,50 +2,49 @@
  * @author VISTALL
  * @since 23-Aug-22
  */
-open module consulo.javascript
-{
-	requires transitive consulo.javascript.base.api;
-	requires transitive consulo.javascript.base.impl;
+open module consulo.javascript {
+    requires transitive consulo.javascript.base.api;
+    requires transitive consulo.javascript.base.impl;
 
-	requires consulo.language.editor.impl;
+    requires consulo.language.editor.impl;
 
-	requires com.intellij.xml;
+    requires com.intellij.xml;
 
-	// TODO remove in future
-	requires java.desktop;
-	requires forms.rt;
+    // TODO remove in future
+    requires java.desktop;
+    requires forms.rt;
 
-	exports com.intellij.javascript;
-	exports com.intellij.javascript.manipulators;
-	exports com.intellij.lang.javascript.impl;
-	exports com.intellij.lang.javascript.impl.findUsages;
-	exports com.intellij.lang.javascript.impl.flex;
-	exports com.intellij.lang.javascript.impl.flex.importer;
-	exports com.intellij.lang.javascript.impl.folding;
-	exports com.intellij.lang.javascript.impl.formatter;
-	exports com.intellij.lang.javascript.impl.formatter.blocks;
-	exports com.intellij.lang.javascript.impl.generation;
-	exports com.intellij.lang.javascript.impl.highlighting;
-	exports com.intellij.lang.javascript.impl.index.predefined;
-	exports com.intellij.lang.javascript.impl.inspections;
-	exports com.intellij.lang.javascript.impl.navigation;
-	exports com.intellij.lang.javascript.impl.refactoring;
-	exports com.intellij.lang.javascript.impl.refactoring.extractMethod;
-	exports com.intellij.lang.javascript.impl.refactoring.introduceConstant;
-	exports com.intellij.lang.javascript.impl.refactoring.introduceField;
-	exports com.intellij.lang.javascript.impl.refactoring.introduceVariable;
-	exports com.intellij.lang.javascript.impl.search;
-	exports com.intellij.lang.javascript.impl.structureView;
-	exports com.intellij.lang.javascript.impl.surroundWith;
-	exports consulo.javascript.impl;
-	exports consulo.javascript.impl.copyright;
-	exports consulo.javascript.impl.findUsages;
-	exports consulo.javascript.impl.formatter;
-	exports consulo.javascript.impl.ide.actions;
-	exports consulo.javascript.impl.ide.completion;
-	exports consulo.javascript.impl.ide.navigationToolbar;
-	exports consulo.javascript.impl.lang;
-	exports consulo.javascript.impl.lang.navigation;
-	exports consulo.javascript.impl.psi.impl.reference;
-	exports com.intellij.lang.javascript.impl.validation;
+    exports com.intellij.javascript;
+    exports com.intellij.javascript.manipulators;
+    exports com.intellij.lang.javascript.impl;
+    exports com.intellij.lang.javascript.impl.findUsages;
+    exports com.intellij.lang.javascript.impl.flex;
+    exports com.intellij.lang.javascript.impl.flex.importer;
+    exports com.intellij.lang.javascript.impl.folding;
+    exports com.intellij.lang.javascript.impl.formatter;
+    exports com.intellij.lang.javascript.impl.formatter.blocks;
+    exports com.intellij.lang.javascript.impl.generation;
+    exports com.intellij.lang.javascript.impl.highlighting;
+    exports com.intellij.lang.javascript.impl.index.predefined;
+    exports com.intellij.lang.javascript.impl.inspections;
+    exports com.intellij.lang.javascript.impl.navigation;
+    exports com.intellij.lang.javascript.impl.refactoring;
+    exports com.intellij.lang.javascript.impl.refactoring.extractMethod;
+    exports com.intellij.lang.javascript.impl.refactoring.introduceConstant;
+    exports com.intellij.lang.javascript.impl.refactoring.introduceField;
+    exports com.intellij.lang.javascript.impl.refactoring.introduceVariable;
+    exports com.intellij.lang.javascript.impl.search;
+    exports com.intellij.lang.javascript.impl.structureView;
+    exports com.intellij.lang.javascript.impl.surroundWith;
+    exports consulo.javascript.impl;
+    exports consulo.javascript.impl.copyright;
+    exports consulo.javascript.impl.findUsages;
+    exports consulo.javascript.impl.formatter;
+    exports consulo.javascript.impl.ide.actions;
+    exports consulo.javascript.impl.ide.completion;
+    exports consulo.javascript.impl.ide.navigationToolbar;
+    exports consulo.javascript.impl.lang;
+    exports consulo.javascript.impl.lang.navigation;
+    exports consulo.javascript.impl.psi.impl.reference;
+    exports com.intellij.lang.javascript.impl.validation;
 }
\ No newline at end of file
diff --git a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
index ca822653..de39f74e 100644
--- a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
+++ b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
@@ -16,85 +16,71 @@
  * @since 21/12/2021
  */
 @ExtensionImpl
-public class JavaScriptRegExpLiteralLanguageHost implements RegExpLanguageHost
-{
-	@Nonnull
-	@Override
-	public Class getHostClass()
-	{
-		return JSRegExpLiteralExpressionImpl.class;
-	}
+public class JavaScriptRegExpLiteralLanguageHost implements RegExpLanguageHost {
+    @Nonnull
+    @Override
+    public Class getHostClass() {
+        return JSRegExpLiteralExpressionImpl.class;
+    }
 
-	@Override
-	public boolean characterNeedsEscaping(char c)
-	{
-		if(c == '/')
-		{
-			return true;
-		}
-		return false;
-	}
+    @Override
+    public boolean characterNeedsEscaping(char c) {
+        if (c == '/') {
+            return true;
+        }
+        return false;
+    }
 
-	@Override
-	public boolean supportsPerl5EmbeddedComments()
-	{
-		return false;
-	}
+    @Override
+    public boolean supportsPerl5EmbeddedComments() {
+        return false;
+    }
 
-	@Override
-	public boolean supportsPossessiveQuantifiers()
-	{
-		return false;
-	}
+    @Override
+    public boolean supportsPossessiveQuantifiers() {
+        return false;
+    }
 
-	@Override
-	public boolean supportsPythonConditionalRefs()
-	{
-		return false;
-	}
+    @Override
+    public boolean supportsPythonConditionalRefs() {
+        return false;
+    }
 
-	@Override
-	public boolean supportsNamedGroupSyntax(RegExpGroup group)
-	{
-		return false;
-	}
+    @Override
+    public boolean supportsNamedGroupSyntax(RegExpGroup group) {
+        return false;
+    }
 
-	@Override
-	public boolean supportsNamedGroupRefSyntax(RegExpNamedGroupRef ref)
-	{
-		return false;
-	}
+    @Override
+    public boolean supportsNamedGroupRefSyntax(RegExpNamedGroupRef ref) {
+        return false;
+    }
 
-	@Override
-	public boolean supportsExtendedHexCharacter(RegExpChar regExpChar)
-	{
-		return false;
-	}
+    @Override
+    public boolean supportsExtendedHexCharacter(RegExpChar regExpChar) {
+        return false;
+    }
 
-	@Override
-	public boolean isValidCategory(@Nonnull String category)
-	{
-		return DefaultRegExpPropertiesProvider.getInstance().isValidCategory(category);
-	}
+    @Override
+    public boolean isValidCategory(@Nonnull String category) {
+        return DefaultRegExpPropertiesProvider.getInstance().isValidCategory(category);
+    }
 
-	@Nonnull
-	@Override
-	public String[][] getAllKnownProperties()
-	{
-		return DefaultRegExpPropertiesProvider.getInstance().getAllKnownProperties();
-	}
+    @Nonnull
+    @Override
+    public String[][] getAllKnownProperties() {
+        return DefaultRegExpPropertiesProvider.getInstance().getAllKnownProperties();
+    }
 
-	@Nullable
-	@Override
-	public String getPropertyDescription(@Nullable String name)
-	{
-		return DefaultRegExpPropertiesProvider.getInstance().getPropertyDescription(name);
-	}
+    @Nullable
+    @Override
+    public String getPropertyDescription(@Nullable String name) {
+        return DefaultRegExpPropertiesProvider.getInstance().getPropertyDescription(name);
+    }
 
-	@Nonnull
-	@Override
-	public String[][] getKnownCharacterClasses()
-	{
-		return DefaultRegExpPropertiesProvider.getInstance().getKnownCharacterClasses();
-	}
+    @Nonnull
+    @Override
+    public String[][] getKnownCharacterClasses() {
+        return DefaultRegExpPropertiesProvider.getInstance().getKnownCharacterClasses();
+    }
 }
diff --git a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
index 44606933..ad1f4108 100644
--- a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
+++ b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
@@ -33,32 +33,29 @@
  * @since 11.12.2015
  */
 @ExtensionImpl
-public class JavaScriptRegexpMultiHostInjector implements MultiHostInjector
-{
-	@Nonnull
-	@Override
-	public Class<? extends PsiElement> getElementClass()
-	{
-		return JSRegExpLiteralExpressionImpl.class;
-	}
+public class JavaScriptRegexpMultiHostInjector implements MultiHostInjector {
+    @Nonnull
+    @Override
+    public Class<? extends PsiElement> getElementClass() {
+        return JSRegExpLiteralExpressionImpl.class;
+    }
 
-	@Override
-	@RequiredReadAction
-	public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement context)
-	{
-		if(context instanceof JSRegExpLiteralExpressionImpl)
-		{
-			String text = context.getText();
+    @Override
+    @RequiredReadAction
+    public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement context) {
+        if (context instanceof JSRegExpLiteralExpressionImpl) {
+            String text = context.getText();
 
-			// ignore flags for regexp
-			int lastIndex = text.lastIndexOf('/');
-			// empty regexp
-			if(lastIndex == 0)
-			{
-				return;
-			}
+            // ignore flags for regexp
+            int lastIndex = text.lastIndexOf('/');
+            // empty regexp
+            if (lastIndex == 0) {
+                return;
+            }
 
-			registrar.startInjecting(RegExpLanguage.INSTANCE).addPlace(null, null, (PsiLanguageInjectionHost) context, new TextRange(1, lastIndex)).doneInjecting();
-		}
-	}
+            registrar.startInjecting(RegExpLanguage.INSTANCE)
+                .addPlace(null, null, (PsiLanguageInjectionHost)context, new TextRange(1, lastIndex))
+                .doneInjecting();
+        }
+    }
 }
diff --git a/regexp-impl/src/main/java/module-info.java b/regexp-impl/src/main/java/module-info.java
index 27b41292..f02a05fa 100644
--- a/regexp-impl/src/main/java/module-info.java
+++ b/regexp-impl/src/main/java/module-info.java
@@ -2,8 +2,7 @@
  * @author VISTALL
  * @since 18-Sep-22
  */
-module consulo.javascript.regexp.impl
-{
-	requires com.intellij.regexp;
-	requires consulo.javascript.base.impl;
+module consulo.javascript.regexp.impl {
+    requires com.intellij.regexp;
+    requires consulo.javascript.base.impl;
 }
\ No newline at end of file

From b879cc5ad3083c551e24f44971991a45130a11a9 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Tue, 14 Jan 2025 03:10:55 +0300
Subject: [PATCH 272/340] Refactoring the rest of classes in consulo-javascript
 module (part 1).

---
 .../findUsages/JSReadWriteAccessDetector.java |  17 +-
 .../impl/findUsages/JSWordsScanner.java       |   7 +-
 .../JavaScriptClassGroupRuleProvider.java     |   2 +-
 .../JavaScriptFindUsagesProvider.java         |   5 +-
 .../JavaScriptFunctionGroupRuleProvider.java  |   2 +-
 .../JavaScriptGroupRuleProviderBase.java      |  44 +--
 ...ImportECMAScriptClassOrFunctionAction.java |  63 +++--
 .../impl/flex/ECMAScriptImportOptimizer.java  |  66 +++--
 .../javascript/impl/flex/ImportUtils.java     | 167 ++++++-----
 .../flex/importer/AS3InterfaceDumper.java     |  56 ++--
 .../flex/importer/AS3InterfaceStubDumper.java | 175 ++++++------
 .../javascript/impl/flex/importer/Abc.java    |  71 ++---
 .../impl/flex/importer/AbcDumper.java         |  29 +-
 .../flex/importer/AbstractDumpProcessor.java  |  43 ++-
 .../impl/flex/importer/ByteBuffer.java        |  17 +-
 .../FlexByteCodeInformationProcessor.java     |  22 +-
 .../impl/flex/importer/FlexImporter.java      |  35 +--
 .../impl/flex/importer/LabelInfo.java         |   5 +-
 .../impl/flex/importer/MemberInfo.java        |   7 +-
 .../impl/flex/importer/MetaData.java          |   3 +-
 .../impl/flex/importer/MethodInfo.java        |   9 +-
 .../impl/flex/importer/Multiname.java         |   5 +-
 .../impl/flex/importer/SlotInfo.java          |  12 +-
 .../javascript/impl/flex/importer/Swf.java    |  34 +--
 .../javascript/impl/flex/importer/Traits.java |  15 +-
 .../folding/JavaScriptFoldingBuilder.java     |  14 +-
 .../impl/formatter/JSCodeStylePanel.java      |  70 +++--
 .../JSCodeStyleSettingsProvider.java          |   7 +-
 .../impl/formatter/JSFormattingModel.java     |   2 +-
 .../impl/formatter/JSSpacingProcessor.java    | 146 ++++++----
 .../JavaScriptIndentOptionsProvider.java      |   4 +-
 .../JavascriptFormattingModelBuilder.java     |  11 +-
 .../impl/formatter/blocks/JSBlock.java        |  33 +--
 .../formatter/blocks/JSDocCommentBlock.java   |  38 ++-
 .../formatter/blocks/SubBlockVisitor.java     |  74 +++--
 .../impl/generation/BaseJSGenerateAction.java |  10 +-
 .../generation/BaseJSGenerateHandler.java     |  43 +--
 .../impl/generation/JSNamedElementNode.java   |  20 +-
 .../JavaScriptGenerateAccessorHandler.java    |  65 +++--
 .../JavaScriptImplementMethodsHandler.java    |   6 +-
 .../JavaScriptOverrideMethodsHandler.java     |  18 +-
 .../impl/generation/OverrideMethodsFix.java   |  12 +-
 .../impl/highlighting/JSBraceMatcher.java     |  18 +-
 .../JavaScriptColorsAndFontsPage.java         |  10 +-
 .../JavaScriptHighlightVisitor.java           |  97 +++----
 .../JavaScriptHighlightVisitorFactory.java    |   2 +-
 .../JavaScriptLineMarkerProvider.java         | 266 ++++++++----------
 .../impl/index/predefined/Marker.java         |   7 +-
 .../JSExtractFunctionDialog.java              |   3 +-
 .../JSExtractFunctionHandler.java             |  30 +-
 50 files changed, 934 insertions(+), 983 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
index 588f8b22..7c403bec 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSReadWriteAccessDetector.java
@@ -23,6 +23,7 @@
 import com.intellij.lang.javascript.psi.JSPostfixExpression;
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import com.intellij.lang.javascript.psi.JSVariable;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.highlight.ReadWriteAccessDetector;
@@ -30,13 +31,13 @@
 import consulo.language.psi.PsiReference;
 
 /**
- * User: Maxim.Mossienko
- * Date: 15.04.2009
- * Time: 21:51:25
+ * @author Maxim.Mossienko
+ * @since 2009-04-15
  */
 @ExtensionImpl
 public class JSReadWriteAccessDetector extends ReadWriteAccessDetector {
     @Override
+    @RequiredReadAction
     public boolean isReadWriteAccessible(PsiElement element) {
         return element instanceof JSVariable
             || (element instanceof JSFunction function && (function.isGetProperty() || function.isSetProperty()))
@@ -44,22 +45,24 @@ public boolean isReadWriteAccessible(PsiElement element) {
     }
 
     @Override
+    @RequiredReadAction
     public boolean isDeclarationWriteAccess(PsiElement element) {
         return (element instanceof JSVariable variable && variable.getInitializer() != null);
     }
 
     @Override
+    @RequiredReadAction
     public Access getReferenceAccess(PsiElement referencedElement, PsiReference reference) {
         return getExpressionAccess(reference.getElement());
     }
 
     @Override
+    @RequiredReadAction
     public Access getExpressionAccess(PsiElement expression) {
         expression = expression.getParent();
-        if (expression instanceof JSDefinitionExpression) {
-            PsiElement grandParent = expression.getParent();
-            if (expression.getParent() instanceof JSAssignmentExpression assignmentExpression
-                && assignmentExpression.getOperationSign() == JSTokenTypes.EQ) {
+        if (expression instanceof JSDefinitionExpression definition) {
+            if (definition.getParent() instanceof JSAssignmentExpression assignment
+                && assignment.getOperationSign() == JSTokenTypes.EQ) {
                 return Access.Write;
             }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java
index cce7bde8..b26a1f68 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JSWordsScanner.java
@@ -23,11 +23,8 @@
 import consulo.language.cacheBuilder.DefaultWordsScanner;
 
 /**
- * Created by IntelliJ IDEA.
- * User: max
- * Date: Jan 31, 2005
- * Time: 9:34:58 PM
- * To change this template use File | Settings | File Templates.
+ * @author max
+ * @since 2005-01-31
  */
 public class JSWordsScanner extends DefaultWordsScanner {
     public JSWordsScanner() {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
index da683da4..58d08e6e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
@@ -35,7 +35,7 @@ protected Class<? extends JSNamedElement> getUsageClass() {
     }
 
     @Override
-    protected UsageGroup createUsageGroup(final JSClass clazz) {
+    protected UsageGroup createUsageGroup(JSClass clazz) {
         return new ClassUsageGroup(clazz);
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
index 1a37cd57..93a87a93 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
@@ -31,9 +31,8 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * User: max
- * Date: Feb 14, 2005
- * Time: 6:44:02 PM
+ * @author max
+ * @since 2005-02-14
  */
 @ExtensionImpl
 public class JavaScriptFindUsagesProvider implements FindUsagesProvider {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
index f600e83b..4f37ea46 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
@@ -34,7 +34,7 @@ protected Class<? extends JSNamedElement> getUsageClass() {
     }
 
     @Override
-    protected UsageGroup createUsageGroup(final JSFunction jsFunction) {
+    protected UsageGroup createUsageGroup(JSFunction jsFunction) {
         return new FunctionUsageGroup(jsFunction);
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
index 0ec9b64f..19158a11 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.findUsages;
 
 import com.intellij.lang.javascript.psi.JSNamedElement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.dataContext.DataSink;
 import consulo.dataContext.TypeSafeDataProvider;
 import consulo.language.editor.LangDataKeys;
@@ -46,20 +47,22 @@
  * @author Maxim.Mossienko
  */
 abstract class JavaScriptGroupRuleProviderBase<T extends JSNamedElement> implements FileStructureGroupRuleProvider {
-    @Override
     @Nullable
-    public UsageGroupingRule getUsageGroupingRule(final Project project) {
+    @Override
+    public UsageGroupingRule getUsageGroupingRule(Project project) {
         return new UsageGroupingRule() {
-            @Override
             @Nullable
-            public UsageGroup groupUsage(final Usage usage) {
-                if (usage instanceof PsiElementUsage) {
-                    PsiElement psiElement = ((PsiElementUsage)usage).getElement();
+            @Override
+            @RequiredReadAction
+            @SuppressWarnings("unchecked")
+            public UsageGroup groupUsage(@Nonnull Usage usage) {
+                if (usage instanceof PsiElementUsage elementUsage) {
+                    PsiElement psiElement = elementUsage.getElement();
 
                     if (!psiElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE)) {
                         return null;
                     }
-                    final JSNamedElement element = PsiTreeUtil.getParentOfType(psiElement, getUsageClass());
+                    JSNamedElement element = PsiTreeUtil.getParentOfType(psiElement, getUsageClass());
 
                     if (isAcceptableElement(element)) {
                         return createUsageGroup((T)element);
@@ -76,12 +79,14 @@ protected boolean isAcceptableElement(JSNamedElement element) {
 
     protected abstract Class<? extends JSNamedElement> getUsageClass();
 
-    protected abstract UsageGroup createUsageGroup(final T t);
+    protected abstract UsageGroup createUsageGroup(T t);
 
     /**
      * @author Maxim.Mossienko
      */
-    abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement & NavigationItem> implements UsageGroup, TypeSafeDataProvider {
+    abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement & NavigationItem>
+        implements UsageGroup, TypeSafeDataProvider {
+
         private SmartPsiElementPointer myElementPointer;
         private String myName;
         private Image myIcon;
@@ -119,7 +124,7 @@ public FileStatus getFileStatus() {
 
         @Override
         public boolean isValid() {
-            final T element = getElement();
+            T element = getElement();
             return element != null && element.isValid();
         }
 
@@ -145,20 +150,19 @@ public void update() {
         }
 
         @Override
-        public int compareTo(final UsageGroup o) {
+        public int compareTo(UsageGroup o) {
             return myName.compareTo(((PsiNamedElementUsageGroupBase)o).myName);
         }
 
         @Override
-        public boolean equals(final Object obj) {
-            if (!(obj instanceof PsiNamedElementUsageGroupBase)) {
-                return false;
-            }
-            PsiNamedElementUsageGroupBase group = (PsiNamedElementUsageGroupBase)obj;
-            if (isValid() && group.isValid()) {
-                return getElement().getManager().areElementsEquivalent(getElement(), group.getElement());
+        public boolean equals(Object obj) {
+            if (obj instanceof PsiNamedElementUsageGroupBase group) {
+                if (isValid() && group.isValid()) {
+                    return getElement().getManager().areElementsEquivalent(getElement(), group.getElement());
+                }
+                return Comparing.equal(myName, group.myName);
             }
-            return Comparing.equal(myName, ((PsiNamedElementUsageGroupBase)obj).myName);
+            return false;
         }
 
         @Override
@@ -167,7 +171,7 @@ public int hashCode() {
         }
 
         @Override
-        public void calcData(final Key<?> key, final DataSink sink) {
+        public void calcData(Key<?> key, DataSink sink) {
             if (!isValid()) {
                 return;
             }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
index d04ec5de..db4bb86c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -21,7 +21,9 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.impl.JSPsiImplUtils;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import consulo.application.ApplicationManager;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.application.Application;
 import consulo.codeEditor.Editor;
 import consulo.codeEditor.EditorPopupHelper;
 import consulo.document.util.TextRange;
@@ -41,15 +43,16 @@
 import consulo.language.psi.resolve.PsiElementProcessor;
 import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.language.util.ModuleUtilCore;
+import consulo.localize.LocalizeValue;
 import consulo.module.Module;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.popup.JBPopup;
 import consulo.undoRedo.CommandProcessor;
 import consulo.util.collection.Sets;
 import consulo.util.collection.SmartList;
 import consulo.util.lang.StringUtil;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -57,8 +60,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Apr 25, 2008
- * Time: 8:36:38 PM
+ * @since 2008-04-25
  */
 public class AddImportECMAScriptClassOrFunctionAction implements HintAction, QuestionAction, LocalQuickFix {
     private final PsiPolyVariantReference myReference;
@@ -67,17 +69,17 @@ public class AddImportECMAScriptClassOrFunctionAction implements HintAction, Que
     private boolean isAvailableCalculated;
     private long modificationCount = -1;
     private String calculatedClass;
-    @NonNls
     private static final String HAS_MORE_SUFFIX = ", ...";
     private boolean isFunction;
 
-    public AddImportECMAScriptClassOrFunctionAction(Editor editor, final PsiPolyVariantReference psiReference) {
+    public AddImportECMAScriptClassOrFunctionAction(Editor editor, PsiPolyVariantReference psiReference) {
         myReference = psiReference;
         myEditor = editor;
     }
 
     @Override
-    public boolean showHint(final Editor editor) {
+    @RequiredUIAccess
+    public boolean showHint(@Nonnull Editor editor) {
         myEditor = editor;
         final PsiElement element = myReference.getElement();
         TextRange textRange = InjectedLanguageManager.getInstance(element.getProject()).injectedToHost(element, element.getTextRange());
@@ -107,12 +109,14 @@ public String getFamilyName() {
     }
 
     @Override
-    public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
+    @RequiredWriteAction
+    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
         invoke(project, myEditor, descriptor.getPsiElement().getContainingFile());
     }
 
     @Override
-    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+    @RequiredReadAction
+    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
         if (!myReference.getElement().isValid()) {
             return false;
         }
@@ -135,7 +139,7 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
                 isAvailableCalculated = true;
                 isAvailable = candidates.size() > 0;
                 if (isAvailable) {
-                    final JSQualifiedNamedElement element = candidates.iterator().next();
+                    JSQualifiedNamedElement element = candidates.iterator().next();
                     calculatedClass = element.getQualifiedName();
                     isFunction = element instanceof JSFunction;
                     if (candidates.size() > 1) {
@@ -157,6 +161,7 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
         return isAvailable;
     }
 
+    @RequiredReadAction
     private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile file) {
         final Collection<JSQualifiedNamedElement> candidates;
 
@@ -170,12 +175,12 @@ private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile
 
             for (ResolveResult r : myReference.multiResolve(false)) {
                 PsiElement element = r.getElement();
-                if (element instanceof JSQualifiedNamedElement) {
-                    invalidResult = (JSQualifiedNamedElement) element;
+                if (element instanceof JSQualifiedNamedElement qualifiedNamedElement) {
+                    invalidResult = qualifiedNamedElement;
                 }
             }
             if (invalidResult != null) {
-                candidates = new SmartList<JSQualifiedNamedElement>();
+                candidates = new SmartList<>();
                 candidates.add(invalidResult);
             }
             else {
@@ -185,7 +190,8 @@ private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile
         return candidates;
     }
 
-    public static Collection<JSQualifiedNamedElement> getCandidates(final Editor editor, final PsiFile file, final String name) {
+    @RequiredReadAction
+    public static Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile file, String name) {
         final Module element = ModuleUtilCore.findModuleForPsiElement(file);
         if (element != null) {
             return JSResolveUtil.findElementsByName(
@@ -200,6 +206,7 @@ public static Collection<JSQualifiedNamedElement> getCandidates(final Editor edi
     }
 
     @Override
+    @RequiredWriteAction
     public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) {
         final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
 
@@ -209,15 +216,19 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
                     candidates.toArray(new JSQualifiedNamedElement[candidates.size()]),
                     new PsiElementListCellRenderer<>() {
                         @Override
+                        @RequiredReadAction
                         public String getElementText(final JSQualifiedNamedElement element) {
                             return element.getName();
                         }
 
                         @Override
+                        @RequiredReadAction
                         protected String getContainerText(final JSQualifiedNamedElement element, final String name) {
                             final String qName = element.getQualifiedName();
                             final String elementName = element.getName();
-                            String s = qName.equals(elementName) ? "" : qName.substring(0, qName.length() - elementName.length() - 1);
+                            String s = qName.equals(elementName)
+                                ? ""
+                                : qName.substring(0, qName.length() - elementName.length() - 1);
                             if ("".equals(s)) {
                                 s = element.getContainingFile().getName();
                             }
@@ -232,13 +243,12 @@ protected int getIconFlags() {
                     JavaScriptLocalize.chooseClassTitle().get(),
                     new PsiElementProcessor<>() {
                         @Override
-                        public boolean execute(final JSQualifiedNamedElement element) {
-                            CommandProcessor.getInstance().executeCommand(
-                                project,
-                                () -> doImport(editor, element.getQualifiedName()),
-                                getClass().getName(),
-                                this
-                            );
+                        public boolean execute(@Nonnull JSQualifiedNamedElement element) {
+                            CommandProcessor.getInstance().newCommand()
+                                .project(project)
+                                .name(LocalizeValue.ofNullable(getClass().getName()))
+                                .groupId(this)
+                                .run(() -> doImport(editor, element.getQualifiedName()));
 
                             return false;
                         }
@@ -253,8 +263,9 @@ public boolean execute(final JSQualifiedNamedElement element) {
         }
     }
 
-    private void doImport(final Editor editor, final String qName) {
-        ApplicationManager.getApplication().runWriteAction(() -> {
+    @RequiredWriteAction
+    private void doImport(Editor editor, final String qName) {
+        Application.get().runWriteAction(() -> {
             final PsiElement element = myReference.getElement();
             ImportUtils.doImport(element, qName);
         });
@@ -266,6 +277,7 @@ public boolean startInWriteAction() {
     }
 
     @Override
+    @RequiredWriteAction
     public boolean execute() {
         final PsiFile containingFile = myReference.getElement().getContainingFile();
         invoke(containingFile.getProject(), myEditor, containingFile);
@@ -273,6 +285,7 @@ public boolean execute() {
         return true;
     }
 
+    @RequiredReadAction
     private static void filterDefaultPackage(Collection<JSQualifiedNamedElement> candidates) {
         for (Iterator<JSQualifiedNamedElement> i = candidates.iterator(); i.hasNext(); ) {
             if (!i.next().getQualifiedName().contains(".")) {
@@ -280,6 +293,4 @@ private static void filterDefaultPackage(Collection<JSQualifiedNamedElement> can
             }
         }
     }
-
-
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
index e6f3001d..5e6a6f71 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
@@ -23,6 +23,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.validation.JSUnusedImportsHelper;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.document.util.TextRange;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -34,6 +35,7 @@
 import consulo.language.psi.*;
 import consulo.project.Project;
 import consulo.util.collection.MultiMap;
+import consulo.util.lang.Couple;
 import consulo.util.lang.EmptyRunnable;
 import consulo.util.lang.Pair;
 
@@ -43,12 +45,12 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 23, 2008
- * Time: 12:10:44 AM
+ * @since 2008-07-23
  */
 @ExtensionImpl
 public class ECMAScriptImportOptimizer implements ImportOptimizer {
     @Override
+    @RequiredReadAction
     public boolean supports(PsiFile file) {
         return file.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4 || JavaScriptSupportLoader.isFlexMxmFile(file);
     }
@@ -62,21 +64,21 @@ public Runnable processFile(final PsiFile file) {
 
         return new Runnable() {
             @Override
-            @RequiredReadAction
+            @RequiredWriteAction
             public void run() {
-                final JSUnusedImportsHelper.Results unusedImportsResults = JSUnusedImportsHelper.getUnusedImports(file);
+                JSUnusedImportsHelper.Results unusedImportsResults = JSUnusedImportsHelper.getUnusedImports(file);
 
-                MultiMap<JSElement, String> importsByHolder = new MultiMap<JSElement, String>() {
+                MultiMap<JSElement, String> importsByHolder = new MultiMap<>() {
                     @Override
                     protected Collection<String> createCollection() {
-                        return new HashSet<String>();
+                        return new HashSet<>();
                     }
                 };
 
                 Project project = file.getProject();
-                final SmartPointerManager pointerManager = SmartPointerManager.getInstance(project);
-                final List<SmartPsiElementPointer> oldImportsPointers =
-                    new ArrayList<SmartPsiElementPointer>(unusedImportsResults.allImports.size());
+                SmartPointerManager pointerManager = SmartPointerManager.getInstance(project);
+                List<SmartPsiElementPointer> oldImportsPointers =
+                    new ArrayList<>(unusedImportsResults.allImports.size());
                 for (JSImportStatement anImport : unusedImportsResults.allImports) {
                     oldImportsPointers.add(pointerManager.createSmartPsiElementPointer(anImport));
                     if (unusedImportsResults.unusedImports.contains(anImport)) {
@@ -89,11 +91,11 @@ protected Collection<String> createCollection() {
                     importsByHolder.putValue(importHolder, anImport.getImportText());
                 }
 
-                final List<SmartPsiElementPointer> replaceWithShortName = new ArrayList<SmartPsiElementPointer>();
+                List<SmartPsiElementPointer> replaceWithShortName = new ArrayList<>();
                 for (Map.Entry<JSReferenceExpression, String> e : unusedImportsResults.fqnsToReplaceWithImport.entrySet()) {
-                    final Collection<String> importsInScope;
-                    final Collection<String> importsInEnclosingScope;
-                    final JSElement importHolder;
+                    Collection<String> importsInScope;
+                    Collection<String> importsInEnclosingScope;
+                    JSElement importHolder;
 
                     JSElement enclosingFunction = ImportUtils.getImportHolder(e.getKey(), JSFunction.class);
                     JSElement enclosingPackage = ImportUtils.getImportHolder(e.getKey(), JSPackageStatement.class);
@@ -129,8 +131,8 @@ else if ((resolve == ResolveResult.ThisOne || resolve == ResolveResult.None)
                     }
                 }
 
-                final Collection<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>> importsByHolderPointer =
-                    new ArrayList<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>>(importsByHolder.size());
+                Collection<Pair<SmartPsiElementPointer<JSElement>, Collection<String>>> importsByHolderPointer =
+                    new ArrayList<>(importsByHolder.size());
                 for (JSElement holder : importsByHolder.keySet()) {
                     importsByHolderPointer.add(Pair.create(
                         pointerManager.createSmartPsiElementPointer(holder),
@@ -147,7 +149,7 @@ else if ((resolve == ResolveResult.ThisOne || resolve == ResolveResult.None)
                     PsiElement insertionPlace = defaultInsertionPlace.first;
 
                     PsiElement earlyImport = ImportUtils.findEarlyImport(before ? insertionPlace : insertionPlace.getNextSibling());
-                    Pair<PsiElement, PsiElement> elementToDelete = null;
+                    Couple<PsiElement> elementToDelete = null;
                     if (earlyImport != null) {
                         for (PsiElement e = (before ? insertionPlace : insertionPlace.getNextSibling()); e != earlyImport;
                              e = e.getNextSibling()) {
@@ -162,15 +164,14 @@ else if ((resolve == ResolveResult.ThisOne || resolve == ResolveResult.None)
                             || deleteTo.getNextSibling() instanceof JSImportStatement) {
                             deleteTo = deleteTo.getNextSibling();
                         }
-                        elementToDelete = Pair.create(insertionPlace, deleteTo);
+                        elementToDelete = Couple.of(insertionPlace, deleteTo);
                     }
                     else if (before && insertionPlace instanceof PsiWhiteSpace) {
                         insertionPlace =
                             insertionPlace.replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
                     }
-                    else if (insertionPlace.getNextSibling() instanceof PsiWhiteSpace) {
-                        insertionPlace.getNextSibling()
-                            .replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
+                    else if (insertionPlace.getNextSibling() instanceof PsiWhiteSpace whiteSpace) {
+                        whiteSpace.replace(JSChangeUtil.createJSTreeFromText(insertionPlace.getProject(), " ").getPsi());
                     }
 
                     String importBlock = ImportUtils.createImportBlock(project, entry.getSecond());
@@ -192,7 +193,7 @@ else if (insertionPlace.getNextSibling() instanceof PsiWhiteSpace) {
                     }
 
                     PsiElement lastAdded = firstAdded;
-                    final String lastImportText = newImports.getLastChild().getText();
+                    String lastImportText = newImports.getLastChild().getText();
                     while (!lastImportText.equals(lastAdded.getText())) {
                         lastAdded = lastAdded.getNextSibling();
                     }
@@ -208,14 +209,14 @@ else if (insertionPlace.getNextSibling() instanceof PsiWhiteSpace) {
                 }
 
                 for (SmartPsiElementPointer pointer : oldImportsPointers) {
-                    final JSImportStatement statement = (JSImportStatement)pointer.getElement();
+                    JSImportStatement statement = (JSImportStatement)pointer.getElement();
                     if (statement != null) {
                         deleteImport(statement);
                     }
                 }
 
                 for (SmartPsiElementPointer pointer : replaceWithShortName) {
-                    final JSReferenceExpression fqn = (JSReferenceExpression)pointer.getElement();
+                    JSReferenceExpression fqn = (JSReferenceExpression)pointer.getElement();
                     if (fqn == null || !fqn.isValid()) {
                         continue;
                     }
@@ -238,6 +239,7 @@ private enum ResolveResult {
         OtherOne
     }
 
+    @RequiredReadAction
     private static ResolveResult resolveUsingImports(Collection<String> imports, String fqnToCheck, PsiElement context) {
         String shortName = fqnToCheck.substring(fqnToCheck.lastIndexOf('.') + 1);
         String firstOneResolved = null;
@@ -272,28 +274,30 @@ else if ("*".equals(name)) {
         }
     }
 
-    private static void deleteImport(final JSImportStatement anImport) {
+    @RequiredWriteAction
+    private static void deleteImport(JSImportStatement anImport) {
         if (!anImport.isValid()) {
             return;
         }
         PsiElement nextSibling = anImport.getNextSibling();
-        if (nextSibling instanceof PsiWhiteSpace) {
+        if (nextSibling instanceof PsiWhiteSpace whiteSpace) {
             // remove with the following whitespace
-            String whitespace = nextSibling.getText();
+            String whitespace = whiteSpace.getText();
             if (whitespace.contains("]]>")) {
-                nextSibling.replace(JSChangeUtil.createJSTreeFromText(anImport.getProject(), "]]>").getPsi());
+                whiteSpace.replace(JSChangeUtil.createJSTreeFromText(anImport.getProject(), "]]>").getPsi());
             }
             // don't remove trailing line break if it is an injection suffix
-            else if (nextSibling.getNextSibling() == null
-                || nextSibling.getNextSibling().getNode().getElementType() != JSTokenTypes.RBRACE
-                || !(nextSibling.getParent() instanceof JSBlockStatement)
-                || !ImportUtils.isAnonymousEventHandler((JSBlockStatement)nextSibling.getParent())) {
+            else if (whiteSpace.getNextSibling() == null
+                || whiteSpace.getNextSibling().getNode().getElementType() != JSTokenTypes.RBRACE
+                || !(whiteSpace.getParent() instanceof JSBlockStatement block)
+                || !ImportUtils.isAnonymousEventHandler(block)) {
                 nextSibling.delete();
             }
         }
         anImport.delete();
     }
 
+    @RequiredReadAction
     private static void deleteRange(PsiElement first, PsiElement last) {
         PsiElement e = first;
         while (true) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
index 9aa6a080..1b8515b5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
@@ -21,6 +21,8 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.document.Document;
 import consulo.document.util.TextRange;
 import consulo.language.codeStyle.CodeStyleManager;
@@ -40,8 +42,6 @@
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlText;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -49,13 +49,10 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: May 3, 2008
- * Time: 8:35:33 PM
+ * @since 2008-03-03
  */
 public class ImportUtils {
-    @NonNls
     private static final String CDATA = "<![CDATA[";
-    @NonNls
     private static final String SCRIPT_TAG_NAME = "Script";
 
     private static final List<Class<? extends JSElement>> ANONYMOUS_EVENT_LISTENER_CLASSES = Arrays.asList(JSBlockStatement.class,
@@ -63,7 +60,8 @@ public class ImportUtils {
     );
 
     @Nullable
-    private static PsiElement findLBrace(final JSElement holder) {
+    @RequiredReadAction
+    private static PsiElement findLBrace(JSElement holder) {
         for (PsiElement child = holder.getFirstChild(); child != null; child = child.getNextSibling()) {
             if (child.getNode().getElementType() == JSTokenTypes.LBRACE) {
                 return child;
@@ -72,6 +70,7 @@ private static PsiElement findLBrace(final JSElement holder) {
         return null;
     }
 
+    @RequiredReadAction
     private static PsiElement specifyInsertionPlace(PsiElement insertBefore, String fqn) {
         JSImportStatement earlyImport = findEarlyImport(insertBefore);
         if (earlyImport == null) {
@@ -79,12 +78,12 @@ private static PsiElement specifyInsertionPlace(PsiElement insertBefore, String
         }
 
         while (compareImports(fqn, earlyImport.getImportText()) > 0) {
-            if (earlyImport.getNextSibling() instanceof JSImportStatement) {
-                earlyImport = (JSImportStatement)earlyImport.getNextSibling();
+            if (earlyImport.getNextSibling() instanceof JSImportStatement importStatement) {
+                earlyImport = importStatement;
             }
-            else if (earlyImport.getNextSibling() instanceof PsiWhiteSpace && earlyImport.getNextSibling()
-                .getNextSibling() instanceof JSImportStatement) {
-                earlyImport = (JSImportStatement)earlyImport.getNextSibling().getNextSibling();
+            else if (earlyImport.getNextSibling() instanceof PsiWhiteSpace whiteSpace
+                && whiteSpace.getNextSibling() instanceof JSImportStatement importStatement) {
+                earlyImport = importStatement;
             }
             else {
                 return earlyImport.getNextSibling();
@@ -93,7 +92,8 @@ else if (earlyImport.getNextSibling() instanceof PsiWhiteSpace && earlyImport.ge
         return earlyImport;
     }
 
-    public static void doImport(@Nonnull PsiElement subject, final @Nonnull String fqn) {
+    @RequiredWriteAction
+    public static void doImport(@Nonnull PsiElement subject, @Nonnull String fqn) {
         assert fqn.contains(".") : "Qualified name belongs to default package: " + fqn;
 
         if (!FileModificationService.getInstance().prepareFileForWrite(subject.getContainingFile())) {
@@ -101,7 +101,7 @@ public static void doImport(@Nonnull PsiElement subject, final @Nonnull String f
         }
         Project project = subject.getProject();
 
-        final JSReferenceExpression refExpr = PsiTreeUtil.getNonStrictParentOfType(subject, JSReferenceExpression.class);
+        JSReferenceExpression refExpr = PsiTreeUtil.getNonStrictParentOfType(subject, JSReferenceExpression.class);
         if (refExpr != null && JSResolveUtil.referenceExpressionShouldBeQualified(refExpr)) {
             refExpr.replace(JSChangeUtil.createExpressionFromText(project, fqn)); // TODO should commit corresponding document before?
             return;
@@ -123,15 +123,14 @@ public static void doImport(@Nonnull PsiElement subject, final @Nonnull String f
             insertionPlace = Pair.create(insertionPlace.first.getNextSibling(), true);
         }
 
-        final int offset;
-        final String prefix;
-        final String suffix;
+        int offset;
+        String prefix;
+        String suffix;
         if (insertionPlace.second) {
             PsiElement insertBefore = specifyInsertionPlace(insertionPlace.first, fqn);
             offset = insertBefore.getTextRange().getStartOffset();
-            prefix =
-                (insertBefore.getPrevSibling() == null && file.getContext() == null) || insertBefore.getPrevSibling() instanceof PsiWhiteSpace ? "" :
-                    "\n";
+            prefix = (insertBefore.getPrevSibling() == null && file.getContext() == null)
+                || insertBefore.getPrevSibling() instanceof PsiWhiteSpace ? "" : "\n";
             suffix = insertBefore instanceof PsiWhiteSpace ? "" : " ";
         }
         else {
@@ -145,8 +144,8 @@ public static void doImport(@Nonnull PsiElement subject, final @Nonnull String f
 
         PsiElement inserted = file.findElementAt(offset);
         if (prefix.length() > 0) {
-            if (inserted.getNextSibling() instanceof JSImportStatement) {
-                inserted = inserted.getNextSibling();
+            if (inserted.getNextSibling() instanceof JSImportStatement importStatement) {
+                inserted = importStatement;
             }
         }
         else {
@@ -155,34 +154,29 @@ public static void doImport(@Nonnull PsiElement subject, final @Nonnull String f
                 inserted = importStatement;
             }
         }
-        PsiElement formatFrom = inserted.getPrevSibling() instanceof PsiWhiteSpace ? inserted.getPrevSibling() : inserted;
-        PsiElement formatTo = inserted.getNextSibling() instanceof PsiWhiteSpace ? inserted.getNextSibling() : inserted;
+        PsiElement formatFrom = inserted.getPrevSibling() instanceof PsiWhiteSpace prevWhiteSpace ? prevWhiteSpace : inserted;
+        PsiElement formatTo = inserted.getNextSibling() instanceof PsiWhiteSpace nextWhiteSpace ? nextWhiteSpace : inserted;
 
         PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
-        final TextRange injectionOffset = InjectedLanguageManager.getInstance(project).injectedToHost(inserted, inserted.getTextRange());
+        TextRange injectionOffset = InjectedLanguageManager.getInstance(project).injectedToHost(inserted, inserted.getTextRange());
 
-        CodeStyleManager.getInstance(project)
-            .reformatText(realFile, injectionOffset.getStartOffset() + formatFrom.getTextRange().getStartOffset(),
-                injectionOffset.getEndOffset() + formatTo.getTextRange().getEndOffset()
-            );
+        CodeStyleManager.getInstance(project).reformatText(
+            realFile,
+            injectionOffset.getStartOffset() + formatFrom.getTextRange().getStartOffset(),
+            injectionOffset.getEndOffset() + formatTo.getTextRange().getEndOffset()
+        );
     }
 
+    @RequiredReadAction
     private static JSElement getAnonymousEventHandlerBody(JSFile injectedFile) {
-        // TODO more elegant way?!
-        if (injectedFile.getFirstChild() instanceof JSExpressionStatement) {
-            JSExpressionStatement expressionStatement = (JSExpressionStatement)injectedFile.getFirstChild();
-            if (expressionStatement.getExpression() instanceof JSCallExpression) {
-                JSCallExpression callExpression = (JSCallExpression)expressionStatement.getExpression();
-                if (callExpression.getMethodExpression() instanceof JSParenthesizedExpression) {
-                    JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression)callExpression.getMethodExpression();
-                    if (parenthesizedExpression.getInnerExpression() instanceof JSFunctionExpression) {
-                        JSFunctionExpression functionExpression = (JSFunctionExpression)parenthesizedExpression.getInnerExpression();
-                        JSFunction function = functionExpression.getFunction();
-                        if (function.getBody().length > 0) {
-                            return function.getBody()[0];
-                        }
-                    }
-                }
+        if (injectedFile.getFirstChild() instanceof JSExpressionStatement expression
+            && expression.getExpression() instanceof JSCallExpression call
+            && call.getMethodExpression() instanceof JSParenthesizedExpression parenthesized
+            && parenthesized.getInnerExpression() instanceof JSFunctionExpression functionExpr) {
+
+            JSFunction function = functionExpr.getFunction();
+            if (function.getBody().length > 0) {
+                return function.getBody()[0];
             }
         }
         assert false : "Couldn't find anonymous event handler body: " + injectedFile;
@@ -191,7 +185,7 @@ private static JSElement getAnonymousEventHandlerBody(JSFile injectedFile) {
 
     private static boolean isAnonymousEventHandlerTag(JSFile jsFile) {
         PsiElement context = jsFile.getContext();
-        return context instanceof XmlText && !SCRIPT_TAG_NAME.equals(((XmlTag)context.getParent()).getLocalName());
+        return context instanceof XmlText xmlText && !SCRIPT_TAG_NAME.equals(((XmlTag)xmlText.getParent()).getLocalName());
     }
 
     private static boolean isAnonymousEventHandlerAttribute(JSFile jsFile) {
@@ -219,12 +213,13 @@ private static PsiElement iterateUp(PsiElement element, List<Class<? extends JSE
     }
 
     @Nullable
-    private static JSElement getImportHolderFromXmlBackedClass(final XmlBackedJSClassImpl jsClass) {
+    @RequiredReadAction
+    private static JSElement getImportHolderFromXmlBackedClass(XmlBackedJSClassImpl jsClass) {
         try {
             return jsClass.createOrGetFirstScriptTag();
         }
         catch (IncorrectOperationException ex) {
-            Logger.getInstance(ImportUtils.class.getName()).error(ex);
+            Logger.getInstance(ImportUtils.class).error(ex);
         }
         return null;
     }
@@ -235,62 +230,65 @@ private static int compareImports(String qname1, String qname2) {
         return Comparing.compare(qname1, qname2);
     }
 
+    @RequiredReadAction
     public static Pair<PsiElement, Boolean /*before*/> getImportInsertionPlace(JSElement holder) {
         PsiElement insertionPlace;
-        final boolean before;
-        if (holder instanceof JSPackageStatement) {
-            insertionPlace = findLBrace(holder);
+        boolean before;
+        if (holder instanceof JSPackageStatement packageStatement) {
+            insertionPlace = findLBrace(packageStatement);
             assert insertionPlace != null : "LBrace not found";
             before = false;
         }
-        else if (holder instanceof JSFunction) {
-            final JSBlockStatement block = PsiTreeUtil.getChildOfType(holder, JSBlockStatement.class);
+        else if (holder instanceof JSFunction function) {
+            JSBlockStatement block = PsiTreeUtil.getChildOfType(function, JSBlockStatement.class);
             assert block != null : "Function block not found";
             insertionPlace = findLBrace(block);
             before = false;
         }
-        else { //JSFile
-            if (isAnonymousEventHandlerTag((JSFile)holder)) {
-                holder = getAnonymousEventHandlerBody((JSFile)holder);
-                insertionPlace = findLBrace(holder);
-                if (hasCDATA(insertionPlace.getNextSibling())) {
-                    insertionPlace = insertionPlace.getNextSibling();
-                }
+        else if (holder instanceof JSFile jsFile && isAnonymousEventHandlerTag(jsFile)) {
+            holder = getAnonymousEventHandlerBody(jsFile);
+            insertionPlace = findLBrace(holder);
+            if (hasCDATA(insertionPlace.getNextSibling())) {
+                insertionPlace = insertionPlace.getNextSibling();
+            }
+            before = false;
+        }
+        else {
+            JSPackageStatement aPackage = PsiTreeUtil.getChildOfType(holder, JSPackageStatement.class);
+            if (aPackage != null) {
+                insertionPlace = aPackage;
                 before = false;
             }
             else {
-                JSPackageStatement aPackage = PsiTreeUtil.getChildOfType(holder, JSPackageStatement.class);
-                if (aPackage != null) {
-                    insertionPlace = aPackage;
-                    before = false;
-                }
-                else {
-                    insertionPlace = holder.getFirstChild();
-                    before = !hasCDATA(insertionPlace);
-                }
+                insertionPlace = holder.getFirstChild();
+                before = !hasCDATA(insertionPlace);
             }
         }
         return Pair.create(insertionPlace, before);
     }
 
+    @RequiredReadAction
     private static boolean hasCDATA(@Nullable PsiElement element) {
-        return element instanceof PsiWhiteSpace && element.getText().contains(CDATA);
+        return element instanceof PsiWhiteSpace whiteSpace && whiteSpace.getText().contains(CDATA);
     }
 
     @Nullable
+    @RequiredReadAction
+    @SafeVarargs
     public static JSElement getImportHolder(PsiElement origin, Class<? extends JSElement>... classes) {
-        if (origin instanceof XmlBackedJSClassImpl) {
-            return getImportHolderFromXmlBackedClass((XmlBackedJSClassImpl)origin);
+        if (origin instanceof XmlBackedJSClassImpl xmlBackedJSClass) {
+            return getImportHolderFromXmlBackedClass(xmlBackedJSClass);
         }
 
         JSElement importHolder = PsiTreeUtil.getParentOfType(origin, classes);
-        if (importHolder instanceof JSFunctionExpression && (isAnonymousEventHandlerTag((JSFile)importHolder.getContainingFile()) ||
-            isAnonymousEventHandlerAttribute((JSFile)importHolder.getContainingFile()))) {
-            importHolder = ArrayUtil.contains(JSFile.class, classes) ? (JSElement)importHolder.getContainingFile() : null;
+        if (importHolder instanceof JSFunctionExpression functionExpr
+            && functionExpr.getContainingFile() instanceof JSFile jsFile
+            && (isAnonymousEventHandlerTag(jsFile) || isAnonymousEventHandlerAttribute(jsFile))) {
+            importHolder = ArrayUtil.contains(JSFile.class, classes) ? jsFile : null;
         }
 
-        if (importHolder instanceof JSFile && isAnonymousEventHandlerAttribute((JSFile)importHolder)) {
-            XmlBackedJSClassImpl jsClass = JSResolveUtil.getXmlBackedClass((JSFile)importHolder);
+        if (importHolder instanceof JSFile jsFile && isAnonymousEventHandlerAttribute(jsFile)) {
+            XmlBackedJSClassImpl jsClass = JSResolveUtil.getXmlBackedClass(jsFile);
             assert jsClass != null;
             importHolder = getImportHolderFromXmlBackedClass(jsClass);
         }
@@ -298,16 +296,8 @@ public static JSElement getImportHolder(PsiElement origin, Class<? extends JSEle
     }
 
     public static String createImportBlock(Project project, Collection<String> fqns) {
-        List<String> sorted = new ArrayList<String>(fqns);
-        Collections.sort(
-            sorted,
-            new Comparator<String>() {
-                @Override
-                public int compare(final String o1, final String o2) {
-                    return compareImports(o1, o2);
-                }
-            }
-        );
+        List<String> sorted = new ArrayList<>(fqns);
+        Collections.sort(sorted, ImportUtils::compareImports);
 
         final String semicolon = JSChangeUtil.getSemicolon(project);
         StringBuilder s = new StringBuilder();
@@ -318,10 +308,11 @@ public int compare(final String o1, final String o2) {
     }
 
     @Nullable
+    @RequiredReadAction
     public static JSImportStatement findEarlyImport(@Nullable PsiElement startFrom) {
         for (PsiElement element = startFrom; element != null; element = element.getNextSibling()) {
-            if (element instanceof JSImportStatement) {
-                return (JSImportStatement)element;
+            if (element instanceof JSImportStatement importStatement) {
+                return importStatement;
             }
             if (element instanceof JSClass || element instanceof JSStatement || element instanceof JSFunction) {
                 break;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
index 25e1b265..e0d2f1f1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
@@ -16,8 +16,6 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -25,35 +23,28 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:02:29 PM
+ * @since 2008-10-20
  */
 class AS3InterfaceDumper extends AbstractDumpProcessor {
     private int memberCount;
     private boolean isInterface;
 
     @Override
-    public void dumpStat(@Nonnull final String stat) {
+    public void dumpStat(@Nonnull String stat) {
     }
 
     @Override
-    public void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m) {
+    public void dumpToplevelAnonymousMethod(@Nonnull Abc abc, @Nonnull MethodInfo m) {
     }
 
     @Override
-    public void dumpTopLevelTraits(final Abc abc, final @Nonnull Traits t, final String indent) {
+    public void dumpTopLevelTraits(@Nonnull Abc abc, @Nonnull Traits t, String indent) {
         t.dump(abc, indent, "", this);
     }
 
     @Override
-    public boolean doDumpMember(final @Nonnull MemberInfo memberInfo) {
-        if (memberInfo.name == null) {
-            return false;
-        }
-        if (memberInfo.name.name != null && memberInfo.name.name.indexOf(Abc.$CINIT) >= 0) {
-            return false;
-        }
-        return true;
+    public boolean doDumpMember(@Nonnull MemberInfo memberInfo) {
+        return memberInfo.name != null && (memberInfo.name.name == null || !memberInfo.name.name.contains(Abc.$CINIT));
     }
 
     @Override
@@ -72,7 +63,7 @@ public String getAbcInSwfIndent() {
     }
 
     @Override
-    public void processValue(final Multiname typeName, final Object valueObject) {
+    public void processValue(Multiname typeName, Object valueObject) {
         append(" = ");
         append(getValueRepr(valueObject));
     }
@@ -81,7 +72,7 @@ protected static String getValueRepr(Object valueObject) {
         if (valueObject == null) {
             return null;
         }
-        @NonNls String value = valueObject.toString();
+        String value = valueObject.toString();
         char ch;
 
         if (needsQuoting(value)) {
@@ -92,7 +83,7 @@ protected static String getValueRepr(Object valueObject) {
                     Double.parseDouble(value);
                     doQoute = false;
                 }
-                catch (NumberFormatException ex) {
+                catch (NumberFormatException ignored) {
                 }
             }
             else if (value.length() > 0 && (Character.isDigit(
@@ -102,7 +93,7 @@ else if (value.length() > 0 && (Character.isDigit(
                     Integer.parseInt(value);
                     doQoute = false;
                 }
-                catch (NumberFormatException ex) {
+                catch (NumberFormatException ignored) {
                 }
             }
 
@@ -113,17 +104,16 @@ else if (value.length() > 0 && (Character.isDigit(
         return value;
     }
 
-    private static
-    @NonNls
-    Set<String> doNotNeedQoting = Set.of("null", "NaN", "undefined", "true", "false", "Infinity", "-Infinity");
+    private static final Set<String> DO_NOT_NEED_QOTING =
+        Set.of("null", "NaN", "undefined", "true", "false", "Infinity", "-Infinity");
 
-    private static boolean needsQuoting(final String value) {
-        return !doNotNeedQoting.contains(value);
+    private static boolean needsQuoting(String value) {
+        return !DO_NOT_NEED_QOTING.contains(value);
     }
 
     @Override
-    public boolean doDumpMetaData(final @Nonnull MetaData md) {
-        return md.name.indexOf("__") == -1;
+    public boolean doDumpMetaData(@Nonnull MetaData md) {
+        return !md.name.contains("__");
     }
 
     @Override
@@ -159,17 +149,17 @@ public boolean doStarMetaAttrNameDump() {
     }
 
     @Override
-    public void setProcessingInterface(final boolean anInterface) {
+    public void setProcessingInterface(boolean anInterface) {
         isInterface = anInterface;
     }
 
     @Override
-    public void hasError(@Nonnull final String error) {
-        sb.append("/*" + error + "*/");
+    public void hasError(@Nonnull String error) {
+        sb.append("/*").append(error).append("*/");
     }
 
     @Override
-    public void processMultinameAsPackageName(Multiname name, String parentName, boolean verbose) {
+    public void processMultinameAsPackageName(@Nonnull Multiname name, String parentName, boolean verbose) {
         append(getMultinameAsPackageName(name, parentName, verbose));
     }
 
@@ -188,7 +178,7 @@ protected static String getMultinameAsPackageName(Multiname name, String parentN
 
     @Override
     protected String appendModifiers(MemberInfo member, String attr) {
-        @NonNls String s = attr;
+        String s = attr;
 
         s += "native ";
         boolean hasNs = false;
@@ -197,8 +187,8 @@ protected String appendModifiers(MemberInfo member, String attr) {
             s += member.name.getNsName() + " ";
         }
 
-        if (s.indexOf("private") == -1 && !hasNs && !isInterface) {
-            @NonNls String parentName;
+        if (!s.contains("private") && !hasNs && !isInterface) {
+            String parentName;
 
             if (member.isPublic ||
                 member.name.nsset[0].length() == 0 ||
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
index ccc2b853..b9f2e711 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
@@ -16,23 +16,19 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import java.util.LinkedList;
-
-import org.jetbrains.annotations.NonNls;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.stubs.impl.JSAttributeNameValuePairStubImpl;
 import com.intellij.lang.javascript.psi.stubs.impl.JSReferenceListStubImpl;
-import consulo.util.lang.StringUtil;
 import consulo.language.psi.stub.StubElement;
+import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
+import java.util.LinkedList;
 
 /**
- * Created by IntelliJ IDEA.
- * User: Maxim.Mossienko
- * Date: 05.03.2009
- * Time: 0:43:37
- * To change this template use File | Settings | File Templates.
+ * @author Maxim.Mossienko
+ * @since 2009-03-05
  */
 class AS3InterfaceStubDumper extends AS3InterfaceDumper {
     final LinkedList<StubElement> parents;
@@ -46,7 +42,7 @@ public AS3InterfaceStubDumper(StubElement parent) {
     public void processMetadata(MetaData metaData) {
         /*parents.addLast(new JSAttributeStubImpl(metaData.name, parents.getLast()));
         super.processMetadata(metaData);
-		parents.removeLast();     */
+        parents.removeLast();*/
     }
 
     @Override
@@ -56,9 +52,9 @@ public void addMetaDataValue(String s, String s1) {
 
     @Override
     protected void processArgumentList(MethodInfo methodInfo, String parentName) {
-		/*parents.add(new JSParameterListStubImpl(parents.getLast()));
-		super.processArgumentList(methodInfo, parentName);
-		parents.removeLast();   */
+        /*parents.add(new JSParameterListStubImpl(parents.getLast()));
+        super.processArgumentList(methodInfo, parentName);
+        parents.removeLast();*/
     }
 
     @Override
@@ -69,89 +65,110 @@ public void processParameter(
         @Nullable Multiname value,
         boolean rest
     ) {
-		/*new JSParameterStubImpl(name, rest ? JSParameterStubImpl.REST_MASK : 0, getMultinameAsPackageName(type, parentName, true),
-			getValueRepr(value),
-				parents.getLast());*/
+        /*new JSParameterStubImpl(
+            name,
+            rest ? JSParameterStubImpl.REST_MASK : 0,
+            getMultinameAsPackageName(type, parentName, true),
+            getValueRepr(value),
+            parents.getLast()
+        );*/
     }
 
     @Override
-    public void append(@Nonnull @NonNls String str) {
+    public void append(@Nonnull String str) {
     }
 
     @Override
     public void processFunction(MethodInfo methodInfo, boolean referenceNameRequested, Abc abc, String indent, String attr) {
-		/*parents.add(new JSFunctionStubImpl(methodInfo.name.name, methodInfo.isGetMethod() ? JSFunctionStubImpl.GET_PROPERTY_MASK : methodInfo
-			.isSetMethod
-				() ? JSFunctionStubImpl.SET_PROPERTY_MASK : methodInfo.parentTraits != null && methodInfo.parentTraits.name == methodInfo.name ?
-				JSFunctionStubImpl.CONSTRUCTOR_MASK : 0, getMultinameAsPackageName(methodInfo.name, methodInfo.parentTraits != null ? methodInfo.parentTraits
-				.getClassName() : null, referenceNameRequested), getMultinameAsPackageName(methodInfo.returnType, methodInfo.getParentName(),
-				referenceNameRequested), parents.getLast()));
-		super.processFunction(methodInfo, referenceNameRequested, abc, indent, attr);
-		parents.removeLast();    */
+        /*parents.add(new JSFunctionStubImpl(
+            methodInfo.name.name,
+            methodInfo.isGetMethod()
+                ? JSFunctionStubImpl.GET_PROPERTY_MASK
+                : methodInfo.isSetMethod()
+                ? JSFunctionStubImpl.SET_PROPERTY_MASK
+                : methodInfo.parentTraits != null && methodInfo.parentTraits.name == methodInfo.name
+                ? JSFunctionStubImpl.CONSTRUCTOR_MASK
+                : 0,
+            getMultinameAsPackageName(
+                methodInfo.name,
+                methodInfo.parentTraits != null ? methodInfo.parentTraits.getClassName() : null,
+                referenceNameRequested
+            ),
+            getMultinameAsPackageName(
+                methodInfo.returnType,
+                methodInfo.getParentName(),
+                referenceNameRequested
+            ),
+            parents.getLast()
+        ));
+        super.processFunction(methodInfo, referenceNameRequested, abc, indent, attr);
+        parents.removeLast();*/
     }
 
     @Override
     public void processVariable(SlotInfo info, String indent, String attr) {
-		/*parents.add(new JSVarStatementStubImpl(parents.getLast()));
-		super.processVariable(info, indent, attr);
-		String parentName = info.getParentName();
-		String qName = getMultinameAsPackageName(info.name, parentName, false);
-		new JSVariableStubImpl(qName.substring(qName.lastIndexOf('.') + 1), info.isConst() ? JSVariableStubImpl.CONST_MASK : 0,
-				getMultinameAsPackageName(info.type, parentName, false), getValueRepr(info.value), qName, parents.getLast());
-		parents.removeLast();  */
+        /*parents.add(new JSVarStatementStubImpl(parents.getLast()));
+        super.processVariable(info, indent, attr);
+        String parentName = info.getParentName();
+        String qName = getMultinameAsPackageName(info.name, parentName, false);
+        new JSVariableStubImpl(
+            qName.substring(qName.lastIndexOf('.') + 1), info.isConst() ? JSVariableStubImpl.CONST_MASK : 0,
+            getMultinameAsPackageName(info.type, parentName, false), getValueRepr(info.value), qName, parents.getLast()
+        );
+        parents.removeLast();*/
     }
 
     @Override
     public void processClass(SlotInfo slotInfo, Abc abc, String attr, String indent) {
-		/*parents.add(new JSClassStubImpl(slotInfo.name.name, slotInfo.isInterfaceClass() ? JSClassStubImpl.INTERFACE_MASK : 0,
-				getMultinameAsPackageName(slotInfo.name, null, false), parents.getLast()));
-		super.processClass(slotInfo, abc, attr, indent);
-		parents.removeLast();   */
+        /*parents.add(
+            new JSClassStubImpl(slotInfo.name.name, slotInfo.isInterfaceClass() ? JSClassStubImpl.INTERFACE_MASK : 0,
+            getMultinameAsPackageName(slotInfo.name, null, false), parents.getLast())
+        );
+        super.processClass(slotInfo, abc, attr, indent);
+        parents.removeLast();*/
     }
 
     @Override
     protected void processModifierList(MemberInfo memberInfo, String attr, String indent) {
-		/*StringTokenizer tokenizer = new StringTokenizer(attr, " ");
-		List<JSAttributeList.ModifierType> modifiers = new SmartList<JSAttributeList.ModifierType>();
-		JSAttributeList.AccessType accessType = null;
-		String ns = null;
-
-		while(tokenizer.hasMoreTokens())
-		{
-			String next = tokenizer.nextToken();
-			boolean foundModifier = false;
-
-			for(JSAttributeList.AccessType type : JSAttributeList.AccessType.values())
-			{
-				if(next.equalsIgnoreCase(type.name()))
-				{
-					accessType = type;
-					foundModifier = true;
-					break;
-				}
-			}
-
-			if(!foundModifier)
-			{
-				for(JSAttributeList.ModifierType type : JSAttributeList.ModifierType.values())
-				{
-					if(next.equalsIgnoreCase(type.name()))
-					{
-						modifiers.add(type);
-						foundModifier = true;
-						break;
-					}
-				}
-			}
-
-			if(!foundModifier)
-			{
-				ns = next;
-			}
-		}
-		parents.add(new JSAttributeListStubImpl(parents.getLast(), ns, accessType, modifiers.toArray(new JSAttributeList.ModifierType[modifiers.size()])));
-		super.processModifierList(memberInfo, attr, indent);
-		parents.removeLast();  */
+        /*StringTokenizer tokenizer = new StringTokenizer(attr, " ");
+        List<JSAttributeList.ModifierType> modifiers = new SmartList<JSAttributeList.ModifierType>();
+        JSAttributeList.AccessType accessType = null;
+        String ns = null;
+
+        while(tokenizer.hasMoreTokens()) {
+            String next = tokenizer.nextToken();
+            boolean foundModifier = false;
+
+            for (JSAttributeList.AccessType type : JSAttributeList.AccessType.values()) {
+                if (next.equalsIgnoreCase(type.name())) {
+                    accessType = type;
+                    foundModifier = true;
+                    break;
+                }
+            }
+
+            if (!foundModifier) {
+                for (JSAttributeList.ModifierType type : JSAttributeList.ModifierType.values()) {
+                    if (next.equalsIgnoreCase(type.name())) {
+                        modifiers.add(type);
+                        foundModifier = true;
+                        break;
+                    }
+                }
+            }
+
+            if(!foundModifier) {
+                ns = next;
+            }
+        }
+        parents.add(new JSAttributeListStubImpl(
+            parents.getLast(),
+            ns,
+            accessType,
+            modifiers.toArray(new JSAttributeList.ModifierType[modifiers.size()])
+        ));
+        super.processModifierList(memberInfo, attr, indent);
+        parents.removeLast();*/
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
index 23f9a447..e80c423c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
@@ -16,26 +16,20 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import consulo.util.collection.ArrayUtil;
-import org.jetbrains.annotations.NonNls;
-import jakarta.annotation.Nonnull;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
+
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:01:16 PM
+ * @since 2008-10-20
  */
 class Abc {
-    static final
-    @NonNls
-    String TAB = "  ";
-    @NonNls
+    static final String TAB = "  ";
     static final String $CINIT = "$cinit";
-    @NonNls
     static final String $ = "$";
 
     private static final int ATTR_final = 0x01; // 1=final, 0=virtual
@@ -48,7 +42,6 @@ class Abc {
     static final int CLASS_FLAG_interface = 0x04;
     static final int CLASS_FLAG_protected = 0x08;
 
-
     // method flags
     private static final int NEED_ARGUMENTS = 0x01;
     static final int NEED_ACTIVATION = 0x02;
@@ -87,9 +80,7 @@ class Abc {
     private static final int CONSTANT_MultinameLA = 0x1C;
     private static final int CONSTANT_TypeName = 0x1D;
 
-    static final
-    @NonNls
-    String[] constantKinds = {
+    static final String[] constantKinds = {
         "0",
         "utf8",
         "2",
@@ -122,9 +113,7 @@ class Abc {
     private static final int TRAIT_Function = 0x05;
     static final int TRAIT_Const = 0x06;
 
-    static final
-    @NonNls
-    String[] traitKinds = {
+    static final String[] traitKinds = {
         "var",
         "function",
         "function get",
@@ -294,9 +283,7 @@ class Abc {
     static final int OP_debugfile = 0xF1;
     private static final int OP_bkptline = 0xF2;
 
-    static final
-    @NonNls
-    String[] opNames = {
+    static final String[] opNames = {
         "OP_0x00       ",
         "bkpt          ",
         "nop           ",
@@ -559,7 +546,7 @@ class Abc {
     int totalSize;
     final int opSizes[] = new int[256];
 
-    public Abc(final @Nonnull ByteBuffer _data, @Nonnull FlexByteCodeInformationProcessor _processor) {
+    public Abc(@Nonnull ByteBuffer _data, @Nonnull FlexByteCodeInformationProcessor _processor) {
         data = _data;
         processor = _processor;
 
@@ -598,8 +585,8 @@ public Abc(final @Nonnull ByteBuffer _data, @Nonnull FlexByteCodeInformationProc
         parseMethodBodies();
     }
 
-    private static Object[] buildSparseArray(int index, @NonNls String s1) {
-        final Object[] result = new Object[index + 1];
+    private static Object[] buildSparseArray(int index, String s1) {
+        Object[] result = new Object[index + 1];
         result[index] = s1;
         return result;
     }
@@ -616,7 +603,7 @@ public void dump(String indent) {
         }
 
         processor.dumpStat("OPCODE\tSIZE\t% OF " + totalSize + "\n");
-        final Set<Integer> done = new HashSet<Integer>();
+        Set<Integer> done = new HashSet<>();
         while (true) {
             int max = -1;
             int maxsize = 0;
@@ -641,11 +628,8 @@ public void dump(String indent) {
     Integer[] ints;
     Integer[] uints;
     Double[] doubles;
-    @NonNls
     String[] strings;
-    @NonNls
     String[] namespaces;
-    @NonNls
     String[][] nssets;
     Multiname[] names;
 
@@ -657,9 +641,7 @@ public void dump(String indent) {
     Traits[] scripts;
     MetaData metadata[];
 
-    @NonNls
     String publicNs = "";
-    @NonNls
     String anyNs = "*";
 
     final int magic;
@@ -803,11 +785,11 @@ void parseCpool() {
                                 nsName += ",";
                             }
                             nameId = readU32();
-                            final Multiname typeArgName = names[nameId];
+                            Multiname typeArgName = names[nameId];
                             String typeArgNameString;
 
                             if (processor instanceof AS3InterfaceDumper) {
-                                final boolean vector = typeArgName.hasNotEmptyNs() && typeArgName.nsset[0].equals("__AS3__.vec");
+                                boolean vector = typeArgName.hasNotEmptyNs() && typeArgName.nsset[0].equals("__AS3__.vec");
                                 typeArgNameString = vector ? typeArgName.name : typeArgName.toString();
                                 typeArgNameString = typeArgNameString.replaceAll("::", ".") + (vector ? " " : "");
                             }
@@ -820,7 +802,7 @@ void parseCpool() {
                         nsName += ">";
                     }
 
-                    final int index = nsName.indexOf("::");
+                    int index = nsName.indexOf("::");
 
                     names[i] = new Multiname(
                         new String[]{index != -1 ? nsName.substring(0, index) : ""},
@@ -867,8 +849,8 @@ void parseMethodInfos() {
 
                     if (index == 0) {
                         // kind is ignored, default value is based on type
-                        @NonNls String value;
-                        final @NonNls String type = m.paramTypes[k].toString();
+                        String value;
+                        String type = m.paramTypes[k].toString();
 
                         if ("Number".equals(type) || "decimal".equals(type)) {
                             value = "0";
@@ -884,21 +866,19 @@ else if ("String".equals(type)) {
                         }
                         m.optionalValues[k] = new Multiname(null, value);
                     }
+                    else if (defaults[kind] == null) {
+                        processor.hasError("ERROR kind=" + kind + " method_id " + i + "\n");
+                    }
                     else {
-                        if (defaults[kind] == null) {
-                            processor.hasError("ERROR kind=" + kind + " method_id " + i + "\n");
-                        }
-                        else {
-                            m.optionalValues[k] = new Multiname(null, defaults[kind][index].toString());
-                        }
+                        m.optionalValues[k] = new Multiname(null, defaults[kind][index].toString());
                     }
                 }
             }
             if ((m.flags & HAS_ParamNames) != 0) {
                 m.paramNames = new String[param_count];
                 for (int k = 0; k < param_count; ++k) {
-                    final int index = readU32();
-                    final String name = strings[index];
+                    int index = readU32();
+                    String name = strings[index];
                     m.paramNames[k] = StringUtil.isJavaIdentifier(name) ? name : "_" + index;
                 }
             }
@@ -1012,7 +992,7 @@ void parseTraits(Traits t) {
             t.names.put(name.toString(), member);
             member.parentTraits = t;
 
-            final int val = tag >> 4;
+            int val = tag >> 4;
             if ((val & ATTR_metadata) != 0) {
                 int mdCount = readU32();
                 member.metadata = new MetaData[mdCount];
@@ -1111,5 +1091,4 @@ void parseMethodBodies() {
     private static void reportAboutPercentage(String s, ByteBuffer data, int start, @Nonnull FlexByteCodeInformationProcessor processor) {
         processor.dumpStat(s + (data.getPosition() - start) + " " + (int)100f * (data.getPosition() - start) / data.bytesSize() + " %\n");
     }
-
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
index 1a724ff5..e46484b4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:02:22 PM
+ * @since 2008-10-20
  */
 class AbcDumper extends AbstractDumpProcessor {
     private boolean dumpCode;
@@ -32,44 +31,44 @@ public AbcDumper(final boolean _dumpCode) {
     }
 
     @Override
-    public void dumpStat(@Nonnull final String stat) {
+    public void dumpStat(@Nonnull String stat) {
         sb.append(stat);
     }
 
     @Override
-    public void hasError(@Nonnull final String error) {
+    public void hasError(@Nonnull String error) {
         sb.append(error);
     }
 
     @Override
     protected String appendModifiers(MemberInfo member, String attr) {
-        attr += (member instanceof MethodInfo && (((MethodInfo)member).flags & Abc.NATIVE) != 0 ? "native " : "");
+        attr += member instanceof MethodInfo methodInfo && (methodInfo.flags & Abc.NATIVE) != 0 ? "native " : "";
         return attr;
     }
 
     @Override
     public void processMultinameAsPackageName(
-        @Nonnull final Multiname name,
-        @Nullable final String parentName,
-        final boolean referenceNameRequested
+        @Nonnull Multiname name,
+        @Nullable String parentName,
+        boolean referenceNameRequested
     ) {
         append(name.toString());
     }
 
     @Override
-    public void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m) {
+    public void dumpToplevelAnonymousMethod(@Nonnull Abc abc, @Nonnull MethodInfo m) {
         m.dump(abc, "", "", this);
     }
 
     @Override
-    public void dumpTopLevelTraits(final Abc abc, final @Nonnull Traits t, final String indent) {
-        sb.append(indent + t.name + "\n");
+    public void dumpTopLevelTraits(@Nonnull Abc abc, @Nonnull Traits t, String indent) {
+        sb.append(indent).append(t.name).append("\n");
         t.dump(abc, indent, "", this);
         t.init.dump(abc, indent, "", this);
     }
 
     @Override
-    public boolean doDumpMember(final @Nonnull MemberInfo memberInfo) {
+    public boolean doDumpMember(@Nonnull MemberInfo memberInfo) {
         return true;
     }
 
@@ -89,12 +88,12 @@ public String getAbcInSwfIndent() {
     }
 
     @Override
-    public void processValue(final Multiname type, final Object value) {
+    public void processValue(Multiname type, Object value) {
         append(" = " + String.valueOf(value instanceof String ? ('"' + value.toString() + '"') : value));
     }
 
     @Override
-    public boolean doDumpMetaData(final @Nonnull MetaData md) {
+    public boolean doDumpMetaData(@Nonnull MetaData md) {
         return true;
     }
 
@@ -120,7 +119,7 @@ public boolean doStarMetaAttrNameDump() {
     }
 
     @Override
-    public void setProcessingInterface(final boolean anInterface) {
+    public void setProcessingInterface(boolean anInterface) {
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
index 42fa8194..7eecd220 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
@@ -17,17 +17,13 @@
 package com.intellij.lang.javascript.impl.flex.importer;
 
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:02:13 PM
+ * @since 2008-10-20
  */
 abstract class AbstractDumpProcessor implements FlexByteCodeInformationProcessor {
-    protected
-    @NonNls
-    StringBuilder sb = new StringBuilder();
+    protected StringBuilder sb = new StringBuilder();
     private boolean firstMetaDataMember;
 
     String getResult() {
@@ -35,21 +31,17 @@ String getResult() {
     }
 
     @Override
-    public void append(@Nonnull @NonNls String str) {
+    public void append(@Nonnull String str) {
         sb.append(str);
     }
 
     @Override
-    public String getParentName(final MemberInfo member) {
+    public String getParentName(MemberInfo member) {
         String parentName = null;
 
         if (member.parentTraits != null) {
-            if (member.parentTraits.name instanceof Multiname) {
-                final Multiname multiname = (Multiname)member.parentTraits.name;
-
-                if (multiname.hasNamespace()) {
-                    parentName = multiname.name;
-                }
+            if (member.parentTraits.name instanceof Multiname multiname && multiname.hasNamespace()) {
+                parentName = multiname.name;
             }
             if (parentName == null) {
                 parentName = member.parentTraits.name.toString().replaceAll("::", ".");
@@ -96,13 +88,13 @@ public void processFunction(MethodInfo methodInfo, boolean referenceNameRequeste
         append(indent + attr);
 
         processMemberKindAndName(methodInfo);
-        final String parentName = methodInfo.getParentName();
+        String parentName = methodInfo.getParentName();
         processArgumentList(methodInfo, parentName);
         append(":");
         processMultinameAsPackageName(methodInfo.returnType, parentName, referenceNameRequested);
     }
 
-    protected void processMemberKindAndName(@Nonnull final MemberInfo member) {
+    protected void processMemberKindAndName(@Nonnull MemberInfo member) {
         append(Abc.traitKinds[member.kind]);
         append(" ");
 
@@ -122,8 +114,8 @@ protected void processArgumentList(MethodInfo methodInfo, String parentName) {
         append("(");
 
         for (int i = 0; i < methodInfo.paramTypes.length; ++i) {
-            final Multiname paramType = methodInfo.paramTypes[i];
-            final boolean restParameter = FlexByteCodeInformationProcessor.REST_PARAMETER_TYPE.equals(paramType.name);
+            Multiname paramType = methodInfo.paramTypes[i];
+            boolean restParameter = FlexByteCodeInformationProcessor.REST_PARAMETER_TYPE.equals(paramType.name);
             if (restParameter && !dumpRestParameter()) {
                 break; // original one do not dump
             }
@@ -131,7 +123,8 @@ protected void processArgumentList(MethodInfo methodInfo, String parentName) {
                 append(",");
             }
 
-            processParameter(methodInfo.paramNames != null ? methodInfo.paramNames[i] : "a" + (i > 0 ? "" + (i + 1) : ""),
+            processParameter(
+                methodInfo.paramNames != null ? methodInfo.paramNames[i] : "a" + (i > 0 ? "" + (i + 1) : ""),
                 methodInfo.paramTypes[i],
                 parentName,
                 methodInfo.optionalValues != null && i < methodInfo.optionalValues.length ? methodInfo.optionalValues[i] : null,
@@ -164,8 +157,8 @@ public void processMetadata(MetaData metaData) {
     public void processClass(SlotInfo slotInfo, Abc abc, String attr, String indent) {
         append("\n");
 
-        @NonNls String def;
-        final boolean isInterface = slotInfo.isInterfaceClass();
+        String def;
+        boolean isInterface = slotInfo.isInterfaceClass();
         if (isInterface) {
             def = "interface";
         }
@@ -174,7 +167,7 @@ public void processClass(SlotInfo slotInfo, Abc abc, String attr, String indent)
         }
 
         if (!doStarTypeDumpInExtends()) {
-            final String ns = slotInfo.name.hasNamespace() ? slotInfo.name.getNsName() : null;
+            String ns = slotInfo.name.hasNamespace() ? slotInfo.name.getNsName() : null;
 
             if (ns != null && ns.length() > 0) {
                 attr += ns;
@@ -245,14 +238,14 @@ protected void dumpInterfacesList(String indent, Traits it, boolean anInterface)
         }
     }
 
-    protected static String quote(final String s) {
+    protected static String quote(String s) {
         if (s.length() == 0) {
             return s;
         }
-        final StringBuilder b = new StringBuilder(s.length());
+        StringBuilder b = new StringBuilder(s.length());
 
         for (int i = 0; i < s.length(); ++i) {
-            final char ch = s.charAt(i);
+            char ch = s.charAt(i);
 
             if (ch == '\\' || ch == '"') {
                 b.append('\\');
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
index a3b58bde..2a250b8e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
@@ -26,8 +26,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:02:53 PM
+ * @since 2008-10-20
  */
 class ByteBuffer {
     private byte[] bytes;
@@ -69,7 +68,7 @@ public int readUnsignedInt() {
         return readInt();
     }
 
-    public void setPosition(final int i) {
+    public void setPosition(int i) {
         position = i;
     }
 
@@ -78,15 +77,15 @@ public int bytesSize() {
     }
 
     public void uncompress() throws IOException {
-        final InflaterInputStream zipInputStream = new InflaterInputStream(new ByteArrayInputStream(bytes));
+        InflaterInputStream zipInputStream = new InflaterInputStream(new ByteArrayInputStream(bytes));
 
         bytes = readStream(zipInputStream);
 
         zipInputStream.close();
     }
 
-    private static byte[] readStream(final InputStream zipInputStream) throws IOException {
-        final byte[] buf = new byte[8192];
+    private static byte[] readStream(InputStream zipInputStream) throws IOException {
+        byte[] buf = new byte[8192];
         byte[] result = new byte[8192];
         int total = 0;
 
@@ -105,7 +104,7 @@ private static byte[] readStream(final InputStream zipInputStream) throws IOExce
             total += read;
         }
 
-        final byte[] realResult = new byte[total];
+        byte[] realResult = new byte[total];
         System.arraycopy(result, 0, realResult, 0, total);
         return realResult;
     }
@@ -142,7 +141,7 @@ public boolean eof() {
 
     public String readUTFBytes(int i) {
         try {
-            final byte[] buf = new byte[i];
+            byte[] buf = new byte[i];
             while (i > 0) {
                 buf[buf.length - i] = (byte)readByte();
                 --i;
@@ -188,7 +187,7 @@ public int getPosition() {
         return position;
     }
 
-    public void incPosition(final int length) {
+    public void incPosition(int length) {
         position += length;
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
index 50b3de24..247e7cef 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
@@ -16,29 +16,27 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import org.jetbrains.annotations.NonNls;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:02:07 PM
+ * @since 2008-10-20
  */
 interface FlexByteCodeInformationProcessor {
-    void dumpStat(@Nonnull @NonNls String stat);
+    void dumpStat(@Nonnull String stat);
 
     void hasError(@Nonnull String error);
 
-    void append(@Nonnull @NonNls String str);
+    void append(@Nonnull String str);
 
     void processMultinameAsPackageName(@Nonnull Multiname name, @Nullable String parentName, boolean referenceNameRequested);
 
-    void dumpToplevelAnonymousMethod(final @Nonnull Abc abc, final @Nonnull MethodInfo m);
+    void dumpToplevelAnonymousMethod(@Nonnull Abc abc, @Nonnull MethodInfo m);
 
-    void dumpTopLevelTraits(final @Nonnull Abc abc, final @Nonnull Traits t, final String indent);
+    void dumpTopLevelTraits(@Nonnull Abc abc, @Nonnull Traits t, String indent);
 
-    boolean doDumpMember(final @Nonnull MemberInfo memberInfo);
+    boolean doDumpMember(@Nonnull MemberInfo memberInfo);
 
     void appendMethodSeparator();
 
@@ -46,19 +44,19 @@ interface FlexByteCodeInformationProcessor {
 
     String getAbcInSwfIndent();
 
-    boolean doDumpMetaData(final @Nonnull MetaData md);
+    boolean doDumpMetaData(@Nonnull MetaData md);
 
     String REST_PARAMETER_TYPE = "...";
 
-    void processParameter(final @Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest);
+    void processParameter(@Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest);
 
     boolean doStarTypeDumpInExtends();
 
     boolean doStarMetaAttrNameDump();
 
-    void setProcessingInterface(final boolean anInterface);
+    void setProcessingInterface(boolean anInterface);
 
-    String getParentName(final MemberInfo member);
+    String getParentName(MemberInfo member);
 
     void processVariable(SlotInfo info, String indent, String attr);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
index 701abf3a..be190018 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
@@ -16,15 +16,10 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
 import consulo.language.psi.stub.StubElement;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
+
+import java.io.*;
 
 /**
  * Produced from abcdump.as
@@ -51,28 +46,23 @@ public static void main(String[] args) throws IOException {
         }
     }
 
-    private static void saveStringAsFile(final String result, final String fileName) throws IOException {
-        final FileOutputStream fileOutputStream = new FileOutputStream(fileName);
-        try {
+    private static void saveStringAsFile(String result, String fileName) throws IOException {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(fileName)) {
             fileOutputStream.write(result.getBytes());
         }
-        finally {
-            fileOutputStream.close();
-        }
     }
 
-    public static String dumpContentsFromStream(final InputStream in, boolean _dumpCode) throws IOException {
-        final AbstractDumpProcessor abcDumper = new AbcDumper(_dumpCode);
+    public static String dumpContentsFromStream(InputStream in, boolean _dumpCode) throws IOException {
+        AbstractDumpProcessor abcDumper = new AbcDumper(_dumpCode);
         processFlexByteCode(in, abcDumper);
         return abcDumper.getResult();
     }
 
-    @NonNls
-    public static String buildInterfaceFromStream(final InputStream in) {
+    public static String buildInterfaceFromStream(InputStream in) {
         try {
-            final AbstractDumpProcessor abcDumper = new AS3InterfaceDumper();
+            AbstractDumpProcessor abcDumper = new AS3InterfaceDumper();
             processFlexByteCode(in, abcDumper);
-            final String s = abcDumper.getResult();
+            String s = abcDumper.getResult();
             //saveStringAsFile(s, File.createTempFile("fleximport", ".as").getPath());
             return s;
         }
@@ -84,13 +74,12 @@ public static String buildInterfaceFromStream(final InputStream in) {
         }
     }
 
-    @NonNls
-    public static void buildStubsInterfaceFromStream(final InputStream in, final StubElement parent) throws Exception {
+    public static void buildStubsInterfaceFromStream(InputStream in, StubElement parent) throws Exception {
         processFlexByteCode(in, new AS3InterfaceStubDumper(parent));
     }
 
     private static void processFlexByteCode(
-        @Nonnull final InputStream in,
+        @Nonnull InputStream in,
         @Nonnull FlexByteCodeInformationProcessor processor
     ) throws IOException {
         ByteBuffer data = new ByteBuffer();
@@ -110,7 +99,7 @@ private static void processFlexByteCode(
             case 67 | 87 << 8 | 83 << 16 | 8 << 24: // SWC8
             case 67 | 87 << 8 | 83 << 16 | 7 << 24: // SWC7
             case 67 | 87 << 8 | 83 << 16 | 6 << 24: // SWC6
-                final int delta = 8;
+                int delta = 8;
                 data.setPosition(delta);
                 ByteBuffer udata = new ByteBuffer();
                 udata.setLittleEndian();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java
index 76d15adb..769a0609 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/LabelInfo.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:00:45 PM
+ * @since 2008-10-20
  */
 class LabelInfo extends LinkedHashMap<Integer, String> {
     int count;
@@ -30,7 +29,7 @@ String labelFor(int target) {
         if (containsKey(target)) {
             return get(target);
         }
-        final String s = "L" + (++count);
+        String s = "L" + (++count);
         put(target, s);
         return s;
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
index 38737b61..12b910a3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:00:39 PM
+ * @since 2008-10-20
  */
 abstract class MemberInfo {
     Traits parentTraits;
@@ -33,9 +32,9 @@ abstract class MemberInfo {
     boolean isPublic;
     boolean isFinal;
 
-    abstract void dump(Abc abc, String indent, String attr, final @Nonnull FlexByteCodeInformationProcessor processor);
+    abstract void dump(Abc abc, String indent, String attr, @Nonnull FlexByteCodeInformationProcessor processor);
 
-    protected void dumpMetaData(String indent, final @Nonnull FlexByteCodeInformationProcessor processor) {
+    protected void dumpMetaData(String indent, @Nonnull FlexByteCodeInformationProcessor processor) {
         if (metadata != null) {
             for (MetaData md : metadata) {
                 if (processor.doDumpMetaData(md)) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java
index 7f0f2496..9daf422e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MetaData.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:00:50 PM
+ * @since 2008-10-20
  */
 class MetaData extends LinkedHashMap<String, String> {
     String name;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java
index be026f7b..ec270bd3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MethodInfo.java
@@ -20,8 +20,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:00:56 PM
+ * @since 2008-10-20
  */
 class MethodInfo extends MemberInfo {
     int flags;
@@ -39,7 +38,7 @@ class MethodInfo extends MemberInfo {
     boolean anon;
 
     @Override
-    void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProcessor processor) {
+    void dump(Abc abc, String indent, String attr, FlexByteCodeInformationProcessor processor) {
         if (!processor.doDumpMember(this)) {
             return;
         }
@@ -244,10 +243,10 @@ int readS24() {
     }
 
     boolean isGetMethod() {
-        return traitKinds[kind].indexOf(" get") != -1;
+        return traitKinds[kind].contains(" get");
     }
 
     boolean isSetMethod() {
-        return traitKinds[kind].indexOf(" set") != -1;
+        return traitKinds[kind].contains(" set");
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java
index a32003f1..8f5b4a5e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Multiname.java
@@ -18,8 +18,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:03:18 PM
+ * @since 2008-10-20
  */
 class Multiname {
     String[] nsset;
@@ -47,7 +46,7 @@ boolean hasNotEmptyNs() {
 
     public boolean hasNamespace() {
         return hasNotEmptyNs() && (nsset[0].startsWith("http://") || nsset[0].equals("private") || nsset[0].equals("__AS3__.vec") ||
-            nsset[0].indexOf('$') != -1 || nsset[0].indexOf("/private:") != -1);
+            nsset[0].indexOf('$') != -1 || nsset[0].contains("/private:"));
     }
 
     public String getNsName() {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java
index 4fbf3d5e..8caea010 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/SlotInfo.java
@@ -18,15 +18,14 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:01:03 PM
+ * @since 2008-10-20
  */
 class SlotInfo extends MemberInfo {
     Multiname type;
     Object value;
 
     @Override
-    void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProcessor processor) {
+    void dump(Abc abc, String indent, String attr, FlexByteCodeInformationProcessor processor) {
         if (!processor.doDumpMember(this)) {
             return;
         }
@@ -40,13 +39,10 @@ void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProc
     }
 
     boolean isInterfaceClass() {
-        if (!(value instanceof Traits)) {
-            return false;
-        }
-        return (((Traits)value).itraits.flags & Abc.CLASS_FLAG_interface) != 0;
+        return value instanceof Traits traits && (traits.itraits.flags & Abc.CLASS_FLAG_interface) != 0;
     }
 
     public boolean isConst() {
-        return Abc.traitKinds[kind].indexOf("const") != -1;
+        return Abc.traitKinds[kind].contains("const");
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java
index 1ede8c29..477b4bca 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Swf.java
@@ -16,12 +16,9 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import org.jetbrains.annotations.NonNls;
-
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:01:59 PM
+ * @since 2008-10-20
  */
 class Swf {
     private static class Rect {
@@ -30,9 +27,7 @@ private static class Rect {
         int yMin, yMax;
 
         @Override
-        public
-        @NonNls
-        String toString() {
+        public String toString() {
             return "[Rect " + xMin + " " + yMin + " " + xMax + " " + yMax + "]";
         }
     }
@@ -43,12 +38,10 @@ String toString() {
 
     private ByteBuffer data;
 
-    private static final int stagDoABC = 72;   // embedded .abc (AVM+) bytecode
-    private static final int stagDoABC2 = 82;   // revised ABC version with a name
+    private static final int STAG_DO_ABC = 72;   // embedded .abc (AVM+) bytecode
+    private static final int STAG_DO_ABC_2 = 82; // revised ABC version with a name
 
-    private static final
-    @NonNls
-    String[] tagNames = {
+    private static final String[] TAG_NAMES = {
         "End",
         // 00
         "ShowFrame",
@@ -261,14 +254,13 @@ String toString() {
         // end
     };
 
-
-    public Swf(final ByteBuffer _data, final FlexByteCodeInformationProcessor _processor) {
+    public Swf(ByteBuffer _data, FlexByteCodeInformationProcessor _processor) {
         data = _data;
         processor = _processor;
 
-        final Rect rect = decodeRect();
-        final int rate = data.readUnsignedByte() << 8 | data.readUnsignedByte();
-        final int count = data.readUnsignedShort();
+        Rect rect = decodeRect();
+        int rate = data.readUnsignedByte() << 8 | data.readUnsignedByte();
+        int count = data.readUnsignedShort();
 
         processor.dumpStat("size " + rect + "\n");
         processor.dumpStat("frame rate " + rate + "\n");
@@ -287,20 +279,20 @@ private void decodeTags() {
                 length = data.readInt();
             }
 
-            processor.dumpStat((type < tagNames.length ? tagNames[type] : "undefined") + " " + length + "b " + ((int)100f * length / data.bytesSize()) +
+            processor.dumpStat((type < TAG_NAMES.length ? TAG_NAMES[type] : "undefined") + " " + length + "b " + ((int)100f * length / data.bytesSize()) +
                 "%\n");
 
             switch (type) {
                 case 0:
                     return;
-                case stagDoABC2:
+                case STAG_DO_ABC_2:
                     int pos1 = data.getPosition();
                     data.readInt();
-                    final String abcName = readString();
+                    String abcName = readString();
                     processor.dumpStat("\nabc name " + abcName + "\n");
                     length -= (data.getPosition() - pos1);
                     // fall through
-                case stagDoABC:
+                case STAG_DO_ABC:
                     ByteBuffer data2 = new ByteBuffer();
                     data2.setLittleEndian();
                     data.readBytes(data2, length);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java
index 5b31f74b..d399cde7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Traits.java
@@ -21,8 +21,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Oct 20, 2008
- * Time: 7:01:09 PM
+ * @since 2008-10-20
  */
 class Traits {
     Object name;
@@ -32,24 +31,24 @@ class Traits {
     int flags;
     String protectedNs;
     Multiname interfaces[];
-    Map<String, MemberInfo> names = new LinkedHashMap<String, MemberInfo>();
-    Map<Integer, SlotInfo> slots = new LinkedHashMap<Integer, SlotInfo>();
-    Map<Integer, MethodInfo> methods = new LinkedHashMap<Integer, MethodInfo>();
-    Map<Integer, MemberInfo> members = new LinkedHashMap<Integer, MemberInfo>();
+    Map<String, MemberInfo> names = new LinkedHashMap<>();
+    Map<Integer, SlotInfo> slots = new LinkedHashMap<>();
+    Map<Integer, MethodInfo> methods = new LinkedHashMap<>();
+    Map<Integer, MemberInfo> members = new LinkedHashMap<>();
 
     @Override
     public String toString() {
         return name.toString();
     }
 
-    public void dump(Abc abc, String indent, String attr, final FlexByteCodeInformationProcessor processor) {
+    public void dump(Abc abc, String indent, String attr, FlexByteCodeInformationProcessor processor) {
         for (MemberInfo m : members.values()) {
             m.dump(abc, indent, attr, processor);
         }
     }
 
     String getClassName() {
-        final String s = name.toString();
+        String s = name.toString();
         if (s.endsWith(Abc.$)) {
             return s.substring(0, s.length() - 1);
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
index 9b3e2bf0..800aa297 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
@@ -46,9 +46,9 @@
  */
 @ExtensionImpl
 public class JavaScriptFoldingBuilder implements FoldingBuilder {
-    @RequiredReadAction
     @Nonnull
     @Override
+    @RequiredReadAction
     public FoldingDescriptor[] buildFoldRegions(@Nonnull ASTNode node, @Nonnull Document document) {
         List<FoldingDescriptor> descriptors = new ArrayList<>();
         appendDescriptors(node, document, descriptors);
@@ -56,8 +56,8 @@ public FoldingDescriptor[] buildFoldRegions(@Nonnull ASTNode node, @Nonnull Docu
     }
 
     @RequiredReadAction
-    private static ASTNode appendDescriptors(final ASTNode node, final Document document, final List<FoldingDescriptor> descriptors) {
-        final IElementType type = node.getElementType();
+    private static ASTNode appendDescriptors(ASTNode node, Document document, List<FoldingDescriptor> descriptors) {
+        IElementType type = node.getElementType();
         if (type == JSElementTypes.BLOCK_STATEMENT
             || type == JSElementTypes.OBJECT_LITERAL_EXPRESSION
             || type == JSElementTypes.ARRAY_LITERAL_EXPRESSION
@@ -114,9 +114,9 @@ private static void addDescriptorForNode(ASTNode node, List<FoldingDescriptor> d
 
     @RequiredReadAction
     private static ASTNode collapseConsequentNodesOfSpecifiedType(
-        final ASTNode node,
-        final List<FoldingDescriptor> descriptors,
-        final IElementType endOfLineComment
+        ASTNode node,
+        List<FoldingDescriptor> descriptors,
+        IElementType endOfLineComment
     ) {
         PsiElement lastEoLComment = node.getPsi();
         PsiElement current = lastEoLComment.getNextSibling();
@@ -148,7 +148,7 @@ private static ASTNode collapseConsequentNodesOfSpecifiedType(
     @RequiredReadAction
     @Override
     public String getPlaceholderText(ASTNode node) {
-        final IElementType type = node.getElementType();
+        IElementType type = node.getElementType();
         if (type == JSTokenTypes.DOC_COMMENT) {
             return "/**...*/";
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
index 8184e5c4..d31a677e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
@@ -25,21 +25,17 @@
 import consulo.language.editor.highlight.EditorHighlighterFactory;
 import consulo.language.file.light.LightVirtualFile;
 import consulo.language.psi.PsiFile;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.event.DocumentAdapter;
 import consulo.virtualFileSystem.fileType.FileType;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 12, 2008
- * Time: 10:39:21 PM
+ * @since 2008-03-12
  */
 public class JSCodeStylePanel extends CodeStyleAbstractPanel {
     private JPanel myPanel;
@@ -50,25 +46,23 @@ public class JSCodeStylePanel extends CodeStyleAbstractPanel {
     private JCheckBox myUseSemicolon;
     private boolean myInsideUpdate = false;
 
+    @RequiredUIAccess
     public JSCodeStylePanel(final CodeStyleSettings settings) {
         super(settings);
 
         installPreviewPanel(myPreviewPanel);
         addPanelToWatch(myPanel);
 
-        myUseSemicolon.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(final ItemEvent e) {
-                if (!myInsideUpdate) {
-                    //updatePreviewEditor();
-                    somethingChanged();
-                }
+        myUseSemicolon.addItemListener(e -> {
+            if (!myInsideUpdate) {
+                //updatePreviewEditor();
+                somethingChanged();
             }
         });
 
         final DocumentAdapter adapter = new DocumentAdapter() {
             @Override
-            protected void textChanged(final DocumentEvent e) {
+            protected void textChanged(DocumentEvent e) {
                 if (!myInsideUpdate) {
                     //updatePreviewEditor();
                     somethingChanged();
@@ -81,7 +75,7 @@ protected void textChanged(final DocumentEvent e) {
     }
 
     @Override
-    protected EditorHighlighter createHighlighter(final EditorColorsScheme scheme) {
+    protected EditorHighlighter createHighlighter(EditorColorsScheme scheme) {
         return EditorHighlighterFactory.getInstance().createEditorHighlighter(new LightVirtualFile("a.as"), scheme, null);
     }
 
@@ -91,7 +85,7 @@ protected int getRightMargin() {
     }
 
     @Override
-    protected void prepareForReformat(final PsiFile psiFile) {
+    protected void prepareForReformat(PsiFile psiFile) {
     }
 
     @Override
@@ -102,40 +96,42 @@ protected FileType getFileType() {
 
     @Override
     protected String getPreviewText() {
-        final JSCodeStyleSettings jsCodeStyleSettings = getSettings().getCustomSettings(JSCodeStyleSettings.class);
-        @NonNls String baseName = "field";
-        @NonNls String propertyName =
+        JSCodeStyleSettings jsCodeStyleSettings = getSettings().getCustomSettings(JSCodeStyleSettings.class);
+        String baseName = "field";
+        String propertyName =
             (myPropertyPrefixTextField != null ? myPropertyPrefixTextField.getText() : jsCodeStyleSettings.PROPERTY_PREFIX) +
                 baseName;
-        @NonNls String varName =
+        String varName =
             (myFieldPrefixTextField != null ? myFieldPrefixTextField.getText() : jsCodeStyleSettings.FIELD_PREFIX) + baseName;
-        @NonNls String semiColon =
+        String semiColon =
             (myUseSemicolon != null ? myUseSemicolon.isSelected() : jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT) ? ";" : "";
 
-        return "package aaa {\nclass XXX {\n" +
+        return "package aaa {\n" +
+            "class XXX {\n" +
             "private var " + varName + semiColon + "\n" +
-            "function get " + propertyName + "() {\nreturn " + varName + semiColon + "\n" +
+            "function get " + propertyName + "() {\n" +
+            "return " + varName + semiColon + "\n" +
             "}\n}\n}";
     }
 
     @Override
-    public void apply(final CodeStyleSettings settings) {
-        final JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
-        jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN =
-            myIndentPackageChildren.isSelected() ? JSCodeStyleSettings.INDENT : JSCodeStyleSettings
-                .DO_NOT_INDENT;
+    public void apply(CodeStyleSettings settings) {
+        JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
+        jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN = myIndentPackageChildren.isSelected()
+            ? JSCodeStyleSettings.INDENT
+            : JSCodeStyleSettings.DO_NOT_INDENT;
         jsCodeStyleSettings.FIELD_PREFIX = myFieldPrefixTextField.getText();
         jsCodeStyleSettings.PROPERTY_PREFIX = myPropertyPrefixTextField.getText();
         jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT = myUseSemicolon.isSelected();
     }
 
     @Override
-    public boolean isModified(final CodeStyleSettings settings) {
-        final JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
-        return (jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT) != myIndentPackageChildren.isSelected() ||
-            !jsCodeStyleSettings.FIELD_PREFIX.equals(myFieldPrefixTextField.getText()) ||
-            !jsCodeStyleSettings.PROPERTY_PREFIX.equals(myPropertyPrefixTextField.getText()) ||
-            jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT != (myUseSemicolon.isSelected());
+    public boolean isModified(CodeStyleSettings settings) {
+        JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
+        return (jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT) != myIndentPackageChildren.isSelected()
+            || !jsCodeStyleSettings.FIELD_PREFIX.equals(myFieldPrefixTextField.getText())
+            || !jsCodeStyleSettings.PROPERTY_PREFIX.equals(myPropertyPrefixTextField.getText())
+            || jsCodeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT != (myUseSemicolon.isSelected());
     }
 
     @Override
@@ -144,10 +140,10 @@ public JComponent getPanel() {
     }
 
     @Override
-    protected void resetImpl(final CodeStyleSettings settings) {
+    protected void resetImpl(CodeStyleSettings settings) {
         try {
             myInsideUpdate = true;
-            final JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
+            JSCodeStyleSettings jsCodeStyleSettings = settings.getCustomSettings(JSCodeStyleSettings.class);
             myIndentPackageChildren.setSelected(jsCodeStyleSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT);
             myFieldPrefixTextField.setText(jsCodeStyleSettings.FIELD_PREFIX);
             myPropertyPrefixTextField.setText(jsCodeStyleSettings.PROPERTY_PREFIX);
@@ -159,7 +155,7 @@ protected void resetImpl(final CodeStyleSettings settings) {
     }
 
     @Override
-    protected String getFileTypeExtension(final FileType fileType) {
+    protected String getFileTypeExtension(FileType fileType) {
         return "js2";
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
index 26225fe1..74f7eba2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
@@ -30,13 +30,12 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Mar 12, 2008
- * Time: 10:32:33 PM
+ * @since 2008-03-12
  */
 @ExtensionImpl
 public class JSCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
     @Override
-    public CustomCodeStyleSettings createCustomSettings(final CodeStyleSettings settings) {
+    public CustomCodeStyleSettings createCustomSettings(CodeStyleSettings settings) {
         return new JSCodeStyleSettings(settings);
     }
 
@@ -48,7 +47,7 @@ public Language getLanguage() {
 
     @Override
     @Nonnull
-    public Configurable createSettingsPage(final CodeStyleSettings settings, final CodeStyleSettings originalSettings) {
+    public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSettings originalSettings) {
         return new JavaScriptCodeStyleConfigurable(settings, originalSettings);
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
index 662442fb..958cd10e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
@@ -32,7 +32,7 @@
 public class JSFormattingModel implements FormattingModel {
     private FormattingModel myModel;
 
-    public JSFormattingModel(final PsiFile file, CodeStyleSettings settings, final Block rootBlock) {
+    public JSFormattingModel(PsiFile file, CodeStyleSettings settings, Block rootBlock) {
         myModel = FormattingModelProvider.createFormattingModelForPsiFile(file, rootBlock, settings);
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
index 176d312d..29a14380 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSImportStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
@@ -46,7 +47,7 @@ public class JSSpacingProcessor extends JSNodeVisitor {
     private final IElementType type1;
     private final IElementType type2;
 
-    public JSSpacingProcessor(final ASTNode parent, final ASTNode child1, final ASTNode child2, final CommonCodeStyleSettings settings) {
+    public JSSpacingProcessor(ASTNode parent, ASTNode child1, ASTNode child2, CommonCodeStyleSettings settings) {
         myParent = parent;
         myChild1 = child1;
         myChild2 = child2;
@@ -61,34 +62,44 @@ public Spacing getResult() {
     }
 
     @Override
-    public void visitObjectLiteralExpression(final ASTNode node) {
+    public void visitObjectLiteralExpression(ASTNode node) {
         if (((type1 == JSTokenTypes.LBRACE && type2 != JSTokenTypes.RBRACE)
             || type1 == JSTokenTypes.COMMA
             || (type1 != JSTokenTypes.LBRACE && type2 == JSTokenTypes.RBRACE))
             && shouldFormatObjectLiteralExpression()) {
-            myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+            myResult = Spacing.createSpacing(
+                0,
+                0,
+                1,
+                mySettings.KEEP_LINE_BREAKS,
+                mySettings.KEEP_BLANK_LINES_IN_CODE
+            );
         }
     }
 
     private boolean shouldFormatObjectLiteralExpression() {
         IElementType grandParentType = myParent.getTreeParent().getElementType();
-        if (grandParentType == JSElementTypes.ARRAY_LITERAL_EXPRESSION) {
-            return true;
-        }
-
-        return false;
+        return grandParentType == JSElementTypes.ARRAY_LITERAL_EXPRESSION;
     }
 
     @Override
-    public void visitArrayLiteralExpression(final ASTNode node) {
+    @RequiredReadAction
+    public void visitArrayLiteralExpression(ASTNode node) {
         if (((type1 == JSTokenTypes.LBRACKET && type2 != JSTokenTypes.RBRACKET)
             || type1 == JSTokenTypes.COMMA
             || (type1 != JSTokenTypes.LBRACKET && type2 == JSTokenTypes.RBRACKET))
             && shouldFormatArrayLiteralExpression()) {
-            myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+            myResult = Spacing.createSpacing(
+                0,
+                0,
+                1,
+                mySettings.KEEP_LINE_BREAKS,
+                mySettings.KEEP_BLANK_LINES_IN_CODE
+            );
         }
     }
 
+    @RequiredReadAction
     private boolean shouldFormatArrayLiteralExpression() {
         JSExpression jsExpression = PsiTreeUtil.findChildOfType(myParent.getPsi(), JSExpression.class);
         if (jsExpression != null) {
@@ -115,27 +126,51 @@ private boolean shouldFormatXmlLiteralExpression() {
     @Override
     public void visitAttributeList(final ASTNode node) {
         if (type1 == JSElementTypes.ATTRIBUTE || type2 == JSElementTypes.ATTRIBUTE) {
-            myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+            myResult = Spacing.createSpacing(
+                0,
+                0,
+                1,
+                mySettings.KEEP_LINE_BREAKS,
+                mySettings.KEEP_BLANK_LINES_IN_CODE
+            );
         }
         else {
-            myResult = Spacing.createSpacing(1, 1, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+            myResult = Spacing.createSpacing(
+                1,
+                1,
+                0,
+                mySettings.KEEP_LINE_BREAKS,
+                mySettings.KEEP_BLANK_LINES_IN_CODE
+            );
         }
     }
 
     @Override
     public void visitEmbeddedContent(final ASTNode node) {
         if (type2 == JSTokenTypes.END_OF_LINE_COMMENT) {
-            myResult = Spacing.createSpacing(0, Integer.MAX_VALUE, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+            myResult = Spacing.createSpacing(
+                0,
+                Integer.MAX_VALUE,
+                0,
+                mySettings.KEEP_LINE_BREAKS,
+                mySettings.KEEP_BLANK_LINES_IN_CODE
+            );
         }
         else if (JSElementTypes.SOURCE_ELEMENTS.contains(type1)
             || JSElementTypes.SOURCE_ELEMENTS.contains(type2) && type1 != JSTokenTypes.DOT
             || type2 == JSTokenTypes.RBRACE) {
-            myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+            myResult = Spacing.createSpacing(
+                0,
+                0,
+                1,
+                mySettings.KEEP_LINE_BREAKS,
+                mySettings.KEEP_BLANK_LINES_IN_CODE
+            );
         }
     }
 
     @Override
-    public void visitParameterList(final ASTNode node) {
+    public void visitParameterList(ASTNode node) {
         if (type1 == JSTokenTypes.LPAR && type2 == JSTokenTypes.RPAR) {
             setSingleSpace(false);
         }
@@ -151,7 +186,8 @@ else if (type2 == JSTokenTypes.COMMA) {
     }
 
     @Override
-    public void visitPackageStatement(final ASTNode node) {
+    @RequiredReadAction
+    public void visitPackageStatement(ASTNode node) {
         if (shouldMakeLBraceOnNextLine()) {
             myResult = Spacing.createSpacing(
                 0,
@@ -166,7 +202,8 @@ public void visitPackageStatement(final ASTNode node) {
     }
 
     @Override
-    public void visitClass(final ASTNode node) {
+    @RequiredReadAction
+    public void visitClass(ASTNode node) {
         if (shouldMakeLBraceOnNextLine()) {
             myResult = Spacing.createSpacing(
                 0,
@@ -185,11 +222,13 @@ private boolean shouldMakeLBraceOnNextLine() {
     }
 
     @Override
-    public void visitBlock(final ASTNode node) {
+    @RequiredReadAction
+    public void visitBlock(ASTNode node) {
         processBlock(node);
     }
 
-    private void processBlock(final ASTNode node) {
+    @RequiredReadAction
+    private void processBlock(ASTNode node) {
         if (JSElementTypes.SOURCE_ELEMENTS.contains(type1) || JSElementTypes.SOURCE_ELEMENTS.contains(type2) ||
             type2 == JSTokenTypes.RBRACE) {
             if (isInjectedJSHack(type1, type2) || isInjectedJSHack(type2, type1)
@@ -198,7 +237,7 @@ && isInlineEndOfLineCommentOnLeft() && type1 != JSElementTypes.ES4_IMPORT_STATEM
                 myResult = Spacing.getReadOnlySpacing();
             }
             else {
-                final boolean keepOneLine = myParent.getPsi() instanceof JSFunction
+                boolean keepOneLine = myParent.getPsi() instanceof JSFunction
                     ? mySettings.KEEP_SIMPLE_METHODS_IN_ONE_LINE
                     : mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE;
 
@@ -252,6 +291,7 @@ private boolean shouldPlaceExtraLinesAroundMethod() {
             || (type1 == JSElementTypes.VAR_STATEMENT && type2 == JSElementTypes.FUNCTION_DECLARATION);
     }
 
+    @RequiredReadAction
     private Spacing getSpacingBetweenImports() {
         String fqn1 = ((JSImportStatement)myChild1.getPsi()).getImportText();
         String fqn2 = ((JSImportStatement)myChild2.getPsi()).getImportText();
@@ -267,13 +307,14 @@ private Spacing getSpacingBetweenImports() {
         );
     }
 
-    private static boolean isInjectedJSHack(final IElementType type1, final IElementType type2) {
+    private static boolean isInjectedJSHack(IElementType type1, IElementType type2) {
         // Following code attempts NOT to reformat '@xxx:bbb.ccc' in var initializers
         return type1 == JSTokenTypes.BAD_CHARACTER && JSElementTypes.SOURCE_ELEMENTS.contains(type2);
     }
 
     @Override
-    public void visitFile(final ASTNode node) {
+    @RequiredReadAction
+    public void visitFile(ASTNode node) {
         if (JSElementTypes.SOURCE_ELEMENTS.contains(type1) || JSElementTypes.SOURCE_ELEMENTS.contains(type2)) {
             if (type2 == JSTokenTypes.END_OF_LINE_COMMENT
                 && isInlineEndOfLineCommentOnLeft()
@@ -315,18 +356,13 @@ else if (shouldPlaceExtraLinesAroundMethod() && node.getPsi().getContext() insta
     }
 
     private boolean isInlineEndOfLineCommentOnLeft() {
-        final ASTNode prev = myChild2.getTreePrev();
-        if (prev == myChild1) {
-            return true;
-        }
-        if (prev != null && prev.getPsi() instanceof PsiWhiteSpace) {
-            return !prev.textContains('\n');
-        }
-        return false;
+        ASTNode prev = myChild2.getTreePrev();
+        return prev == myChild1
+            || prev != null && prev.getPsi() instanceof PsiWhiteSpace && !prev.textContains('\n');
     }
 
     @Override
-    public void visitFunctionDeclaration(final ASTNode node) {
+    public void visitFunctionDeclaration(ASTNode node) {
         if (type1 == JSTokenTypes.FUNCTION_KEYWORD && type2 == JSElementTypes.REFERENCE_EXPRESSION) {
             setSingleSpace(true);
         }
@@ -342,12 +378,12 @@ else if (type1 == JSElementTypes.ATTRIBUTE_LIST && type2 == JSTokenTypes.FUNCTIO
     }
 
     @Override
-    public void visitFunctionExpression(final ASTNode node) {
+    public void visitFunctionExpression(ASTNode node) {
         visitFunctionDeclaration(node);
     }
 
     @Override
-    public void visitReferenceExpression(final ASTNode node) {
+    public void visitReferenceExpression(ASTNode node) {
         if (type1 == JSTokenTypes.NEW_KEYWORD) {
             setSingleSpace(true);
         }
@@ -357,7 +393,7 @@ public void visitReferenceExpression(final ASTNode node) {
     }
 
     @Override
-    public void visitDocComment(final ASTNode node) {
+    public void visitDocComment(ASTNode node) {
         //myResult = Spacing.createKeepingFirstColumnSpacing(
         //    0,
         //    Integer.MAX_VALUE,
@@ -367,7 +403,7 @@ public void visitDocComment(final ASTNode node) {
     }
 
     @Override
-    public void visitIfStatement(final ASTNode node) {
+    public void visitIfStatement(ASTNode node) {
         if (type1 == JSTokenTypes.IF_KEYWORD && type2 == JSTokenTypes.LPAR) {
             setSingleSpace(mySettings.SPACE_BEFORE_IF_PARENTHESES);
         }
@@ -387,14 +423,14 @@ else if (type1 == JSTokenTypes.ELSE_KEYWORD && type2 == JSElementTypes.BLOCK_STA
     }
 
     @Override
-    public void visitCallExpression(final ASTNode node) {
+    public void visitCallExpression(ASTNode node) {
         if (type2 == JSElementTypes.ARGUMENT_LIST) {
             setSingleSpace(mySettings.SPACE_BEFORE_METHOD_CALL_PARENTHESES);
         }
     }
 
     @Override
-    public void visitNewExpression(final ASTNode node) {
+    public void visitNewExpression(ASTNode node) {
         if (type1 == JSTokenTypes.NEW_KEYWORD) {
             setSingleSpace(true);
         }
@@ -404,7 +440,7 @@ else if (type2 == JSElementTypes.ARGUMENT_LIST) {
     }
 
     @Override
-    public void visitForStatement(final ASTNode node) {
+    public void visitForStatement(ASTNode node) {
         if (type1 == JSTokenTypes.SEMICOLON) {
             setSingleSpace(true);
         }
@@ -425,7 +461,7 @@ else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
     }
 
     @Override
-    public void visitDoWhileStatement(final ASTNode node) {
+    public void visitDoWhileStatement(ASTNode node) {
         if (type2 == JSTokenTypes.WHILE_KEYWORD) {
             if (mySettings.WHILE_ON_NEW_LINE) {
                 myResult = Spacing.createSpacing(
@@ -459,7 +495,7 @@ else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
     }
 
     @Override
-    public void visitForInStatement(final ASTNode node) {
+    public void visitForInStatement(ASTNode node) {
         if (type1 == JSTokenTypes.VAR_KEYWORD || type2 == JSTokenTypes.VAR_KEYWORD) {
             setSingleSpace(true);
         }
@@ -476,7 +512,7 @@ else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
     }
 
     @Override
-    public void visitWhileStatement(final ASTNode node) {
+    public void visitWhileStatement(ASTNode node) {
         if (type1 == JSTokenTypes.WHILE_KEYWORD && type2 == JSTokenTypes.LPAR) {
             setSingleSpace(mySettings.SPACE_BEFORE_WHILE_PARENTHESES);
         }
@@ -490,7 +526,7 @@ else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
     }
 
     @Override
-    public void visitWithStatement(final ASTNode node) {
+    public void visitWithStatement(ASTNode node) {
         if (type1 == JSTokenTypes.WITH_KEYWORD && type2 == JSTokenTypes.LPAR) {
             setSingleSpace(mySettings.SPACE_BEFORE_WHILE_PARENTHESES);
         }
@@ -508,7 +544,7 @@ else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
     );
 
     @Override
-    public void visitTryStatement(final ASTNode node) {
+    public void visitTryStatement(ASTNode node) {
         if (type1 == JSTokenTypes.TRY_KEYWORD && type2 == JSElementTypes.BLOCK_STATEMENT) {
             setBraceSpace(mySettings.SPACE_BEFORE_TRY_LBRACE, mySettings.BRACE_STYLE, null);
         }
@@ -524,7 +560,7 @@ else if (type1 == JSTokenTypes.FINALLY_KEYWORD) {
     }
 
     @Override
-    public void visitCatchBlock(final ASTNode node) {
+    public void visitCatchBlock(ASTNode node) {
         if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
             setSingleSpace(mySettings.SPACE_WITHIN_CATCH_PARENTHESES);
         }
@@ -540,7 +576,7 @@ public void visitCatchBlock(final ASTNode node) {
     }
 
     @Override
-    public void visitSwitchStatement(final ASTNode node) {
+    public void visitSwitchStatement(ASTNode node) {
         if (type1 == JSTokenTypes.SWITCH_KEYWORD && type2 == JSTokenTypes.LPAR) {
             setSingleSpace(mySettings.SPACE_BEFORE_SWITCH_PARENTHESES);
         }
@@ -554,7 +590,7 @@ else if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
     }
 
     @Override
-    public void visitArgumentList(final ASTNode node) {
+    public void visitArgumentList(ASTNode node) {
         if (type1 == JSTokenTypes.LPAR || type2 == JSTokenTypes.RPAR) {
             setSingleSpace(false);
         }
@@ -567,28 +603,28 @@ else if (type2 == JSTokenTypes.COMMA) {
     }
 
     @Override
-    public void visitStatement(final ASTNode node) {
+    public void visitStatement(ASTNode node) {
         if (type2 == JSTokenTypes.SEMICOLON) {
             setSingleSpace(false);
         }
     }
 
     @Override
-    public void visitVarStatement(final ASTNode node) {
+    public void visitVarStatement(ASTNode node) {
         if (type1 == JSTokenTypes.VAR_KEYWORD) {
             setSingleSpace(true);
         }
     }
 
     @Override
-    public void visitVariable(final ASTNode node) {
+    public void visitVariable(ASTNode node) {
         if (type1 == JSTokenTypes.EQ || type2 == JSTokenTypes.EQ) { // Initializer
             setSingleSpace(mySettings.SPACE_AROUND_ASSIGNMENT_OPERATORS);
         }
     }
 
     @Override
-    public void visitBinaryExpression(final ASTNode node) {
+    public void visitBinaryExpression(ASTNode node) {
         IElementType opSign = null;
         if (JSTokenTypes.OPERATIONS.contains(type1)) {
             opSign = type1;
@@ -603,7 +639,7 @@ else if (JSTokenTypes.OPERATIONS.contains(type2)) {
     }
 
     @Override
-    public void visitConditionalExpression(final ASTNode node) {
+    public void visitConditionalExpression(ASTNode node) {
         if (type1 == JSTokenTypes.QUEST) {
             setSingleSpace(mySettings.SPACE_AFTER_QUEST);
         }
@@ -618,7 +654,7 @@ else if (type2 == JSTokenTypes.COLON) {
         }
     }
 
-    private boolean getSpaceAroundOption(final IElementType opSign) {
+    private boolean getSpaceAroundOption(IElementType opSign) {
         boolean option = false;
         if (JSTokenTypes.ADDITIVE_OPERATIONS.contains(opSign)) {
             option = mySettings.SPACE_AROUND_ADDITIVE_OPERATORS;
@@ -651,7 +687,7 @@ else if (opSign == JSTokenTypes.IS_KEYWORD || opSign == JSTokenTypes.AS_KEYWORD)
     }
 
     private void setSingleSpace(boolean needSpace) {
-        final int spaces = needSpace ? 1 : 0;
+        int spaces = needSpace ? 1 : 0;
         myResult = Spacing.createSpacing(spaces, spaces, 0, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
     }
 
@@ -672,8 +708,8 @@ private void setBraceSpace(boolean needSpaceSetting, int braceStyleSetting, Text
         }
     }
 
-    private void setLineBreakSpace(final boolean needLineBreak) {
-        final int breaks = needLineBreak || myChild1.getElementType() == JSTokenTypes.END_OF_LINE_COMMENT ? 1 : 0;
+    private void setLineBreakSpace(boolean needLineBreak) {
+        int breaks = needLineBreak || myChild1.getElementType() == JSTokenTypes.END_OF_LINE_COMMENT ? 1 : 0;
         myResult = Spacing.createSpacing(1, 1, breaks, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
index 40a96eea..229ede1c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
@@ -24,6 +24,7 @@
 import consulo.language.codeStyle.ui.setting.SmartIndentOptionsEditor;
 import consulo.language.psi.PsiFile;
 import consulo.virtualFileSystem.fileType.FileType;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author yole
@@ -45,6 +46,7 @@ public IndentOptionsEditor createOptionsEditor() {
         return new SmartIndentOptionsEditor();
     }
 
+    @Nonnull
     @Override
     public String getPreviewText() {
         return "function a() {\n" +
@@ -53,6 +55,6 @@ public String getPreviewText() {
     }
 
     @Override
-    public void prepareForReformat(final PsiFile psiFile) {
+    public void prepareForReformat(PsiFile psiFile) {
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
index 4e93fb4d..53c0eb3b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
@@ -33,19 +33,26 @@
 @ExtensionImpl
 public class JavascriptFormattingModelBuilder implements FormattingModelBuilder {
     @Nonnull
+    @Override
     public FormattingModel createModel(@Nonnull FormattingContext formattingContext) {
         PsiElement element = formattingContext.getPsiElement();
 
         CodeStyleSettings settings = formattingContext.getCodeStyleSettings();
 
-        final PsiFile psiFile = element.getContainingFile();
+        PsiFile psiFile = element.getContainingFile();
 
         CommonCodeStyleSettings commonSettings = settings.getCommonSettings(JavaScriptLanguage.INSTANCE);
 
         return new JSFormattingModel(
             psiFile,
             settings,
-            new JSBlock(psiFile instanceof JSFile ? psiFile.getNode() : element.getNode(), null, null, null, commonSettings)
+            new JSBlock(
+                psiFile instanceof JSFile jsFile ? jsFile.getNode() : element.getNode(),
+                null,
+                null,
+                null,
+                commonSettings
+            )
         );
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
index 7addfa96..66f3a0db 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.impl.formatter.blocks;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -47,11 +48,11 @@ public class JSBlock implements Block {
     private List<Block> mySubBlocks = null;
 
     public JSBlock(
-        final ASTNode node,
-        final Alignment alignment,
-        final Indent indent,
-        final Wrap wrap,
-        final CommonCodeStyleSettings settings
+        ASTNode node,
+        Alignment alignment,
+        Indent indent,
+        Wrap wrap,
+        CommonCodeStyleSettings settings
     ) {
         myAlignment = alignment;
         myIndent = indent;
@@ -110,16 +111,16 @@ public Spacing getSpacing(Block child1, Block child2) {
 
     @Override
     @Nonnull
-    public ChildAttributes getChildAttributes(final int newChildIndex) {
+    public ChildAttributes getChildAttributes(int newChildIndex) {
         Indent indent = null;
-        final IElementType blockElementType = myNode.getElementType();
+        IElementType blockElementType = myNode.getElementType();
 
         if (blockElementType == JSTokenTypes.DOC_COMMENT) {
             return new ChildAttributes(Indent.getSpaceIndent(1), null);
         }
 
         if (blockElementType == JSElementTypes.PACKAGE_STATEMENT) {
-            final JSCodeStyleSettings customSettings =
+            JSCodeStyleSettings customSettings =
                 CodeStyleSettingsManager.getSettings(myNode.getPsi().getProject()).getCustomSettings(JSCodeStyleSettings.class);
             if (customSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT) {
                 indent = Indent.getNormalIndent();
@@ -143,12 +144,12 @@ else if (JSElementTypes.SOURCE_ELEMENTS.contains(blockElementType)
         }
 
         Alignment alignment = null;
-        final List<Block> subBlocks = getSubBlocks();
+        List<Block> subBlocks = getSubBlocks();
         for (int i = 0; i < newChildIndex; i++) {
             if (i == subBlocks.size()) {
                 break;
             }
-            final Alignment childAlignment = subBlocks.get(i).getAlignment();
+            Alignment childAlignment = subBlocks.get(i).getAlignment();
             if (childAlignment != null) {
                 alignment = childAlignment;
                 break;
@@ -169,10 +170,12 @@ else if (JSElementTypes.SOURCE_ELEMENTS.contains(blockElementType)
     }
 
     @Override
+    @RequiredReadAction
     public boolean isIncomplete() {
         return isIncomplete(myNode);
     }
 
+    @RequiredReadAction
     private boolean isIncomplete(ASTNode node) {
         node.getPsi().getFirstChild(); // expand chameleon
         ASTNode lastChild = node.getLastChildNode();
@@ -184,10 +187,7 @@ private boolean isIncomplete(ASTNode node) {
             return false;
         }
 
-        if (lastChild.getPsi() instanceof PsiErrorElement) {
-            return true;
-        }
-        return isIncomplete(lastChild);
+        return lastChild.getPsi() instanceof PsiErrorElement || isIncomplete(lastChild);
     }
 
     public CommonCodeStyleSettings getSettings() {
@@ -196,9 +196,6 @@ public CommonCodeStyleSettings getSettings() {
 
     @Override
     public boolean isLeaf() {
-        if (myNode.getElementType() == JSTokenTypes.DOC_COMMENT) {
-            return false;
-        }
-        return myNode.getFirstChildNode() == null;
+        return myNode.getElementType() != JSTokenTypes.DOC_COMMENT && myNode.getFirstChildNode() == null;
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
index 22f4af2d..11b5a2ec 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
@@ -16,20 +16,14 @@
 
 package com.intellij.lang.javascript.impl.formatter.blocks;
 
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
+import consulo.language.codeStyle.*;
+import jakarta.annotation.Nonnull;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.annotation.Nonnull;
-import consulo.language.codeStyle.Alignment;
-import consulo.language.codeStyle.Block;
-import consulo.language.codeStyle.Indent;
-import consulo.language.codeStyle.Spacing;
-import consulo.language.codeStyle.Wrap;
-import consulo.language.ast.ASTNode;
-import consulo.document.util.TextRange;
-import consulo.language.codeStyle.ChildAttributes;
-import jakarta.annotation.Nullable;
-
 /**
  * @author yole
  */
@@ -38,54 +32,54 @@ public class JSDocCommentBlock implements Block {
     private int myStartOffset;
     private int myEndOffset;
     private Indent myIndent;
-    private static final List<Block> EMPTY_BLOCK_LIST = new ArrayList<Block>();
+    private static final List<Block> EMPTY_BLOCK_LIST = new ArrayList<>();
 
-    public JSDocCommentBlock(final ASTNode node, final int startOffset, final int endOffset, final Indent indent) {
+    public JSDocCommentBlock(ASTNode node, int startOffset, int endOffset, Indent indent) {
         myNode = node;
         myStartOffset = startOffset;
         myEndOffset = endOffset;
         myIndent = indent;
     }
 
-    @Override
     @Nonnull
+    @Override
     public TextRange getTextRange() {
         return new TextRange(myNode.getStartOffset() + myStartOffset, myNode.getStartOffset() + myEndOffset);
     }
 
-    @Override
     @Nonnull
+    @Override
     public List<Block> getSubBlocks() {
         return EMPTY_BLOCK_LIST;
     }
 
+    @Nonnull
     @Override
-    @Nullable
     public Wrap getWrap() {
         return null;
     }
 
+    @Nonnull
     @Override
-    @Nullable
     public Indent getIndent() {
         return myIndent;
     }
 
+    @Nonnull
     @Override
-    @Nullable
     public Alignment getAlignment() {
         return null;
     }
 
+    @Nonnull
     @Override
-    @Nullable
-    public Spacing getSpacing(Block child1, Block child2) {
+    public Spacing getSpacing(Block child1, @Nonnull Block child2) {
         return null;
     }
 
-    @Override
     @Nonnull
-    public ChildAttributes getChildAttributes(final int newChildIndex) {
+    @Override
+    public ChildAttributes getChildAttributes(int newChildIndex) {
         return null;
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
index 89afd838..18aff29c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
@@ -51,13 +51,13 @@ public List<Block> getBlocks() {
 
     @Override
     @RequiredReadAction
-    public void visitElement(final ASTNode node) {
+    public void visitElement(ASTNode node) {
         Alignment alignment = getDefaultAlignment(node);
 
         PsiElement elt = node.getPsi().getFirstChild(); // expand chameleon
 
         while (elt != null) {
-            final ASTNode child = elt.getNode();
+            ASTNode child = elt.getNode();
             assert child != null;
 
             if (child.getElementType() != JSTokenTypes.WHITE_SPACE && child.getTextRange().getLength() > 0) {
@@ -73,8 +73,8 @@ public void visitElement(final ASTNode node) {
 
 
     @Override
-    public void visitDocComment(final ASTNode node) {
-        final ASTNode child = node.getFirstChildNode();
+    public void visitDocComment(ASTNode node) {
+        ASTNode child = node.getFirstChildNode();
         if (child != null && child.getElementType() == JSTokenTypes.DOC_COMMENT) {
             visit(child);
         }
@@ -84,11 +84,11 @@ public void visitDocComment(final ASTNode node) {
     }
 
     @Override
-    public void visitComment(final ASTNode node) {
+    public void visitComment(ASTNode node) {
         buildCommentBlocks(node);
     }
 
-    private void buildCommentBlocks(final ASTNode node) {
+    private void buildCommentBlocks(ASTNode node) {
         String commentText = node.getText();
         int pos = 0;
         while (pos < commentText.length()) {
@@ -98,7 +98,7 @@ private void buildCommentBlocks(final ASTNode node) {
             }
 
             if (pos != nextPos) {
-                final Indent childIndent = (pos == 0) ? Indent.getNoneIndent() : Indent.getSpaceIndent(1);
+                Indent childIndent = (pos == 0) ? Indent.getNoneIndent() : Indent.getSpaceIndent(1);
                 myBlocks.add(new JSDocCommentBlock(node, pos, nextPos, childIndent));
             }
             pos = nextPos + 1;
@@ -111,12 +111,13 @@ private void buildCommentBlocks(final ASTNode node) {
     }
 
     @Nullable
-    static Alignment getDefaultAlignment(final ASTNode node) {
-        if (node.getElementType() == JSElementTypes.FOR_STATEMENT
-            || node.getElementType() == JSElementTypes.PARAMETER_LIST
-            || node.getElementType() == JSElementTypes.BINARY_EXPRESSION
-            || node.getElementType() == JSElementTypes.ASSIGNMENT_EXPRESSION
-            || node.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION) {
+    static Alignment getDefaultAlignment(ASTNode node) {
+        IElementType elementType = node.getElementType();
+        if (elementType == JSElementTypes.FOR_STATEMENT
+            || elementType == JSElementTypes.PARAMETER_LIST
+            || elementType == JSElementTypes.BINARY_EXPRESSION
+            || elementType == JSElementTypes.ASSIGNMENT_EXPRESSION
+            || elementType == JSElementTypes.CONDITIONAL_EXPRESSION) {
             return Alignment.createAlignment();
         }
 
@@ -124,25 +125,26 @@ static Alignment getDefaultAlignment(final ASTNode node) {
     }
 
     @Nullable
-    private Indent getIndent(final ASTNode node, final ASTNode child) {
-        final IElementType nodeElementType = node.getElementType();
+    @RequiredReadAction
+    private Indent getIndent(ASTNode node, ASTNode child) {
+        IElementType nodeElementType = node.getElementType();
 
         if (nodeElementType instanceof JSFileElementType || nodeElementType == JSElementTypes.EMBEDDED_CONTENT) {
             return Indent.getNoneIndent();
         }
 
         if (nodeElementType == JSTokenTypes.DOC_COMMENT) {
-            final ASTNode treePrev = child.getTreePrev();
-            if (treePrev != null && treePrev.getPsi() instanceof PsiWhiteSpace && treePrev.getText().indexOf("\n") != -1) {
+            ASTNode treePrev = child.getTreePrev();
+            if (treePrev != null && treePrev.getPsi() instanceof PsiWhiteSpace && treePrev.getText().contains("\n")) {
                 return Indent.getSpaceIndent(1);
             }
             return Indent.getNoneIndent();
         }
 
-        final IElementType childElementType = child.getElementType();
+        IElementType childElementType = child.getElementType();
 
         if (nodeElementType == JSElementTypes.PACKAGE_STATEMENT && !JSSpacingProcessor.NOT_A_PACKAGE_CONTENT.contains(childElementType)) {
-            final JSCodeStyleSettings customSettings =
+            JSCodeStyleSettings customSettings =
                 CodeStyleSettingsManager.getSettings(node.getPsi().getProject()).getCustomSettings(JSCodeStyleSettings.class);
             if (customSettings.INDENT_PACKAGE_CHILDREN == JSCodeStyleSettings.INDENT) {
                 return Indent.getNormalIndent();
@@ -203,12 +205,12 @@ private Indent getIndent(final ASTNode node, final ASTNode child) {
             return Indent.getNoneIndent();
         }
 
-        if (nodeElementType == JSElementTypes.BLOCK_STATEMENT ||
-            nodeElementType == JSElementTypes.CLASS ||
-            nodeElementType == JSElementTypes.PACKAGE_STATEMENT) {
-            final ASTNode parent = node.getTreeParent();
-            if (parent != null && parent.getElementType() == JSElementTypes.FUNCTION_DECLARATION &&
-                mySettings.METHOD_BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED) {
+        if (nodeElementType == JSElementTypes.BLOCK_STATEMENT
+            || nodeElementType == JSElementTypes.CLASS
+            || nodeElementType == JSElementTypes.PACKAGE_STATEMENT) {
+            ASTNode parent = node.getTreeParent();
+            if (parent != null && parent.getElementType() == JSElementTypes.FUNCTION_DECLARATION
+                && mySettings.METHOD_BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED) {
                 return Indent.getNoneIndent();
             }
             if (mySettings.BRACE_STYLE == CodeStyleSettings.NEXT_LINE_SHIFTED) {
@@ -219,14 +221,9 @@ private Indent getIndent(final ASTNode node, final ASTNode child) {
             }
             return Indent.getNoneIndent();
         }
-        else if (node.getPsi() instanceof JSLoopStatement) {
-            if (child.getPsi() == ((JSLoopStatement)node.getPsi()).getBody()) {
-                if (childElementType == JSElementTypes.BLOCK_STATEMENT) {
-                    return Indent.getNoneIndent();
-                }
-                else {
-                    return Indent.getNormalIndent();
-                }
+        else if (node.getPsi() instanceof JSLoopStatement loop) {
+            if (child.getPsi() == loop.getBody()) {
+                return childElementType == JSElementTypes.BLOCK_STATEMENT ? Indent.getNoneIndent() : Indent.getNormalIndent();
             }
         }
 
@@ -265,7 +262,7 @@ else if (node.getPsi() instanceof JSLoopStatement) {
     }
 
     @Nullable
-    private static Alignment alignmentProjection(final Alignment defaultAlignment, final ASTNode parent, final ASTNode child) {
+    private static Alignment alignmentProjection(Alignment defaultAlignment, ASTNode parent, ASTNode child) {
         if (parent.getElementType() == JSElementTypes.FOR_STATEMENT
             && (JSElementTypes.EXPRESSIONS.contains(child.getElementType())
             || child.getElementType() == JSElementTypes.VAR_STATEMENT)) {
@@ -286,17 +283,18 @@ else if (parent.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION
     }
 
     @Nullable
-    private Wrap getWrap(final ASTNode node, final ASTNode child) {
+    @RequiredReadAction
+    private Wrap getWrap(ASTNode node, ASTNode child) {
         WrapType wrapType = null;
         if (node.getElementType() == JSElementTypes.ASSIGNMENT_EXPRESSION) {
-            final JSAssignmentExpression assignment = (JSAssignmentExpression)node.getPsi();
+            JSAssignmentExpression assignment = (JSAssignmentExpression)node.getPsi();
             if (child.getElementType() == assignment.getOperationSign() && mySettings.PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE
                 || child.getPsi() == assignment.getROperand() && !mySettings.PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE) {
                 wrapType = WrapType.byLegacyRepresentation(mySettings.ASSIGNMENT_WRAP);
             }
         }
         else if (node.getElementType() == JSElementTypes.BINARY_EXPRESSION) {
-            final JSBinaryExpression binary = (JSBinaryExpression)node.getPsi();
+            JSBinaryExpression binary = (JSBinaryExpression)node.getPsi();
             if (child.getElementType() == binary.getOperationSign() && mySettings.BINARY_OPERATION_SIGN_ON_NEXT_LINE
                 || child.getPsi() == binary.getROperand() && !mySettings.BINARY_OPERATION_SIGN_ON_NEXT_LINE) {
                 wrapType = WrapType.byLegacyRepresentation(mySettings.BINARY_OPERATION_WRAP);
@@ -319,7 +317,7 @@ else if (child == node.findChildByType(JSTokenTypes.RPAR) && mySettings.ARRAY_IN
             }
         }
         else if (node.getElementType() == JSElementTypes.CONDITIONAL_EXPRESSION) {
-            final IElementType elementType = child.getElementType();
+            IElementType elementType = child.getElementType();
             if ((mySettings.TERNARY_OPERATION_SIGNS_ON_NEXT_LINE
                 && (elementType == JSTokenTypes.QUEST || elementType == JSTokenTypes.COLON))
                 || (!mySettings.TERNARY_OPERATION_SIGNS_ON_NEXT_LINE && child.getPsi() instanceof JSExpression)) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
index f924a331..fc6a811f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
@@ -43,7 +43,7 @@ public void actionPerformed(final AnActionEvent e) {
         PsiFile psifile = e.getData(LangDataKeys.PSI_FILE);
         Project project = e.getData(PlatformDataKeys.PROJECT);
 
-        final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE);
+        VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE);
         if (JavaScriptSupportLoader.isFlexMxmFile(file)) {
             editor = BaseCodeInsightAction.getInjectedEditor(project, editor);
             psifile = PsiUtilBase.getPsiFileInEditor(editor, project);
@@ -57,15 +57,15 @@ public void actionPerformed(final AnActionEvent e) {
 
     @Override
     @RequiredUIAccess
-    public void update(final AnActionEvent e) {
-        final VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE);
+    public void update(AnActionEvent e) {
+        VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE);
 
         boolean status = false;
 
         if (file != null) {
             if (file.getFileType() == JavaScriptFileType.INSTANCE) {
-                final Editor editor = e.getData(PlatformDataKeys.EDITOR);
-                final PsiFile psifile = e.getData(LangDataKeys.PSI_FILE);
+                Editor editor = e.getData(PlatformDataKeys.EDITOR);
+                PsiFile psifile = e.getData(LangDataKeys.PSI_FILE);
 
                 if (editor != null && psifile != null) {
                     status = psifile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
index a6e8bec7..7105a2eb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
@@ -54,14 +54,14 @@ public Language getLanguage() {
 
     @Override
     @RequiredUIAccess
-    public void invoke(@Nonnull final Project project, @Nonnull final Editor editor, @Nonnull final PsiFile file) {
+    public void invoke(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiFile file) {
         JSClass clazz = findClass(file, editor);
 
         if (clazz == null) {
             return;
         }
 
-        final Collection<JSNamedElementNode> candidates = new ArrayList<>();
+        Collection<JSNamedElementNode> candidates = new ArrayList<>();
         collectCandidates(clazz, candidates);
 
         MemberChooserBuilder<JSNamedElementNode> builder =
@@ -70,20 +70,20 @@ public void invoke(@Nonnull final Project project, @Nonnull final Editor editor,
             builder.withEmptySelection();
         }
 
-        builder.withTitle(getTitle());
-        builder.showAsync(
-            project,
-            dataHolder -> {
-                List data = dataHolder.getUserData(ClassMember.KEY_OF_LIST);
+        builder.withTitle(getTitle())
+            .showAsync(
+                project,
+                dataHolder -> {
+                    List data = dataHolder.getUserData(ClassMember.KEY_OF_LIST);
 
-                run(clazz, data, project, editor, file);
-            }
-        );
+                    run(clazz, data, project, editor, file);
+                }
+            );
     }
 
-    private void run(JSClass clazz, Collection<JSNamedElementNode> selectedElements, Project project, Editor editor, PsiFile file) {
-        final JSClass jsClass = clazz;
-        final Collection<JSNamedElementNode> selectedElements1 = selectedElements;
+    @RequiredUIAccess
+    private void run(JSClass clazz, final Collection<JSNamedElementNode> selectedElements, Project project, Editor editor, PsiFile file) {
+        JSClass jsClass = clazz;
         Runnable runnable = new Runnable() {
             @Override
             @RequiredUIAccess
@@ -93,7 +93,7 @@ public void run() {
                     public void run() {
                         try {
                             final BaseCreateMethodsFix createMethodsFix = createFix(jsClass);
-                            createMethodsFix.addElementsToProcessFrom(selectedElements1);
+                            createMethodsFix.addElementsToProcessFrom(selectedElements);
                             createMethodsFix.invoke(project, editor, file);
                         }
                         catch (IncorrectOperationException ex) {
@@ -106,7 +106,10 @@ public void run() {
 
         CommandProcessor processor = CommandProcessor.getInstance();
         if (processor.hasCurrentCommand()) {
-            processor.executeCommand(project, runnable, getClass().getName(), null);
+            processor.newCommand()
+                .project(project)
+                .name(LocalizeValue.of(getClass().getName()))
+                .run(runnable);
         }
         else {
             runnable.run();
@@ -122,15 +125,15 @@ protected boolean canHaveEmptySelectedElements() {
 
     @RequiredReadAction
     static JSClass findClass(PsiFile file, Editor editor) {
-        final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
+        PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
         if (at == null) {
             return null;
         }
 
         JSClass clazz = PsiTreeUtil.getParentOfType(at, JSClass.class);
         if (clazz == null) {
-            final PsiFile containingFile = at.getContainingFile();
-            final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(containingFile);
+            PsiFile containingFile = at.getContainingFile();
+            PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(containingFile);
             if (element instanceof JSClass jsClass) {
                 clazz = jsClass;
             }
@@ -146,7 +149,7 @@ else if (JSResolveUtil.isArtificialClassUsedForReferenceList(clazz)) {
 
     protected abstract BaseCreateMethodsFix createFix(JSClass clazz);
 
-    protected abstract void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates);
+    protected abstract void collectCandidates(JSClass clazz, final Collection<JSNamedElementNode> candidates);
 
     @Override
     public boolean startInWriteAction() {
@@ -154,7 +157,7 @@ public boolean startInWriteAction() {
     }
 
     @Override
-    public boolean isValidFor(final Editor editor, final PsiFile file) {
+    public boolean isValidFor(Editor editor, PsiFile file) {
         return true;
     }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
index d21646af..1e708059 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JSNamedElementNode.java
@@ -20,12 +20,12 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.application.AllIcons;
 import consulo.language.editor.generation.ClassMember;
 import consulo.language.editor.generation.MemberChooserObject;
 import consulo.language.editor.generation.PsiElementMemberChooserObject;
 import consulo.language.icon.IconDescriptorUpdaters;
 import consulo.language.psi.PsiElement;
+import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.image.Image;
 import consulo.ui.image.ImageEffects;
 
@@ -40,17 +40,17 @@ public JSNamedElementNode(JSNamedElement node) {
     }
 
     @RequiredReadAction
-    private static Image buildIcon(final JSNamedElement node) {
+    private static Image buildIcon(JSNamedElement node) {
         Image icon = IconDescriptorUpdaters.getIcon(node, 0);
 
         if (node instanceof JSFunction function) {
-            final Image accessIcon;
+            Image accessIcon;
 
             if (function.isGetProperty()) {
-                accessIcon = AllIcons.Nodes.Read_access;
+                accessIcon = PlatformIconGroup.nodesRead_access();
             }
             else if (function.isSetProperty()) {
-                accessIcon = AllIcons.Nodes.Write_access;
+                accessIcon = PlatformIconGroup.nodesWrite_access();
             }
             else {
                 accessIcon = null;
@@ -64,12 +64,12 @@ else if (function.isSetProperty()) {
     }
 
     @RequiredReadAction
-    private static String buildTextFor(final JSNamedElement node) {
+    private static String buildTextFor(JSNamedElement node) {
         StringBuilder text = new StringBuilder(node.getName());
 
         if (node instanceof JSFunction function) {
             text.append("(");
-            final JSParameterList parameterList = function.getParameterList();
+            JSParameterList parameterList = function.getParameterList();
 
             if (parameterList != null) {
                 boolean first = true;
@@ -83,13 +83,13 @@ private static String buildTextFor(final JSNamedElement node) {
             }
 
             text.append(")");
-            final String typeString = function.getReturnTypeString();
+            String typeString = function.getReturnTypeString();
             if (typeString != null) {
                 text.append(":").append(typeString);
             }
         }
         else if (node instanceof JSVariable var) {
-            final String typeString = var.getTypeString();
+            String typeString = var.getTypeString();
             if (typeString != null) {
                 text.append(":").append(typeString);
             }
@@ -100,7 +100,7 @@ else if (node instanceof JSVariable var) {
     @Override
     @RequiredReadAction
     public MemberChooserObject getParentNodeDelegate() {
-        final PsiElement element = getPsiElement();
+        PsiElement element = getPsiElement();
         PsiElement parent = JSResolveUtil.findParent(element);
         return new JSNamedElementNode((JSNamedElement)parent);
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
index b28ebcb2..046db4ac 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
@@ -24,6 +24,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.application.Application;
 import consulo.codeEditor.Editor;
 import consulo.javascript.localize.JavaScriptLocalize;
@@ -87,7 +88,7 @@ protected void appendOwnOptions(List<JComponent> jComponentList) {
     }
 
     @Override
-    protected BaseCreateMethodsFix createFix(final JSClass jsClass) {
+    protected BaseCreateMethodsFix createFix(JSClass jsClass) {
         if (mode == GenerationMode.GETTERS_AND_SETTERS) {
             return new BaseCreateMethodsFix<JSVariable>(jsClass) {
                 private boolean toCreateBindableProperties = myCreateBindableProperties != null
@@ -100,8 +101,8 @@ protected BaseCreateMethodsFix createFix(final JSClass jsClass) {
 
                 @Override
                 @RequiredUIAccess
-                public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
-                    throws IncorrectOperationException {
+                @RequiredWriteAction
+                public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
                     evalAnchor(editor, file);
 
                     for (JSVariable e : getElementsToProcess()) {
@@ -115,9 +116,9 @@ else if (mode == GenerationMode.CONSTRUCTOR) {
             return new BaseCreateMethodsFix<JSVariable>(jsClass) {
                 @Override
                 @RequiredUIAccess
-                public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
-                    throws IncorrectOperationException {
-                    final JSCodeStyleSettings codeStyleSettings =
+                @RequiredWriteAction
+                public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+                    JSCodeStyleSettings codeStyleSettings =
                         CodeStyleSettingsManager.getSettings(project).getCustomSettings(JSCodeStyleSettings.class);
                     evalAnchor(editor, file);
                     StringBuilder functionText = new StringBuilder("public function ").append(jsClass.getName()).append("(");
@@ -194,8 +195,8 @@ else if (mode == GenerationMode.TOSTRING) {
             return new BaseCreateMethodsFix<JSVariable>(jsClass) {
                 @Override
                 @RequiredUIAccess
-                public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
-                    throws IncorrectOperationException {
+                @RequiredWriteAction
+                public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
                     evalAnchor(editor, file);
 
                     final boolean[] needOverride = new boolean[1];
@@ -204,7 +205,10 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
                         (processor, scope, className) -> {
                             needOverride[0] = !"Object".equals(className);
                             return false;
-                        }, "toString", null, myJsClass
+                        },
+                        "toString",
+                        null,
+                        myJsClass
                     );
 
                     StringBuilder functionText = new StringBuilder().append("public ")
@@ -212,7 +216,7 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
                         .append("function toString():String {\nreturn ")
                         .append(needOverride[0] ? "super.toString() + \"" : "\"" + jsClass.getName())
                         .append("{");
-                    final String semicolon = JSChangeUtil.getSemicolon(project);
+                    String semicolon = JSChangeUtil.getSemicolon(project);
 
                     boolean first = true;
 
@@ -240,11 +244,11 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
 
     @Override
     @RequiredReadAction
-    protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates) {
+    protected void collectCandidates(JSClass clazz, final Collection<JSNamedElementNode> candidates) {
         final LinkedHashMap<String, JSNamedElement> candidatesMap = new LinkedHashMap<>();
         final JSCodeStyleSettings codeStyleSettings =
             CodeStyleSettingsManager.getSettings(clazz.getProject()).getCustomSettings(JSCodeStyleSettings.class);
-        final ResolveProcessor processor = new ResolveProcessor(null) {
+        ResolveProcessor processor = new ResolveProcessor(null) {
             {
                 setToProcessMembers(true);
                 setToProcessHierarchy(false);
@@ -253,13 +257,13 @@ protected void collectCandidates(final JSClass clazz, final Collection<JSNamedEl
 
             @Override
             @RequiredReadAction
-            public boolean execute(@Nonnull final PsiElement element, final ResolveState state) {
+            public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                 if (element instanceof JSVariable variable) {
                     if (variable.isConst()) {
                         return true;
                     }
-                    final String name = variable.getName();
-                    final String accessorName = transformVarNameToAccessorName(name, codeStyleSettings);
+                    String name = variable.getName();
+                    String accessorName = transformVarNameToAccessorName(name, codeStyleSettings);
                     if (/*!name.equals(accessorName) &&*/ !candidatesMap.containsKey(accessorName)) {
                         candidatesMap.put(accessorName, variable);
                     }
@@ -275,8 +279,8 @@ else if (element instanceof JSFunction function
 
         clazz.processDeclarations(processor, ResolveState.initial(), clazz, clazz);
         for (JSNamedElement n : candidatesMap.values()) {
-            if (n instanceof JSVariable) {
-                candidates.add(new JSNamedElementNode(n));
+            if (n instanceof JSVariable variable) {
+                candidates.add(new JSNamedElementNode(variable));
             }
         }
     }
@@ -287,7 +291,7 @@ private static class MyBaseCreateMethodsFix extends BaseCreateMethodsFix<JSVaria
         private boolean bindableProperties;
         private static final String PARAMETER_NAME = "value";
 
-        public MyBaseCreateMethodsFix(final GenerationMode mode, final JSClass jsClass, boolean _bindableProperties) {
+        public MyBaseCreateMethodsFix(GenerationMode mode, JSClass jsClass, boolean _bindableProperties) {
             super(jsClass);
             this.myMode = mode;
             codeStyleSettings = CodeStyleSettingsManager.getSettings(jsClass.getProject()).getCustomSettings(JSCodeStyleSettings.class);
@@ -296,8 +300,8 @@ public MyBaseCreateMethodsFix(final GenerationMode mode, final JSClass jsClass,
 
         @Override
         @RequiredReadAction
-        protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSVariable func) {
-            final String semicolon = codeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT ? ";" : "";
+        protected String buildFunctionBodyText(String retType, JSParameterList parameterList, JSVariable func) {
+            String semicolon = codeStyleSettings.USE_SEMICOLON_AFTER_STATEMENT ? ";" : "";
             String varName = func.getName();
             if (myMode == GenerationMode.SETTERS) {
                 String checkNeedEvent = "";
@@ -317,14 +321,13 @@ else if (myMode == GenerationMode.GETTERS) {
 
         @Override
         @RequiredReadAction
-        protected String buildFunctionAttrText(final String attrText, final JSAttributeList attributeList, final JSVariable function) {
+        protected String buildFunctionAttrText(String attrText, JSAttributeList attributeList, JSVariable function) {
             StringBuilder baseText = new StringBuilder();
 
             if (bindableProperties && myMode == GenerationMode.GETTERS) {
-                baseText.append("[Bindable(event=\"").append(getEventName(transformVarNameToAccessorName(
-                    function.getName(),
-                    codeStyleSettings
-                ))).append("\")]\n");
+                baseText.append("[Bindable(event=\"")
+                    .append(getEventName(transformVarNameToAccessorName(function.getName(), codeStyleSettings)))
+                    .append("\")]\n");
             }
 
             baseText.append("public");
@@ -341,7 +344,7 @@ private static String getEventName(String name) {
 
         @Override
         @RequiredReadAction
-        protected String buildFunctionKind(final JSVariable fun) {
+        protected String buildFunctionKind(JSVariable fun) {
             if (myMode == GenerationMode.GETTERS) {
                 return "get ";
             }
@@ -352,7 +355,7 @@ protected String buildFunctionKind(final JSVariable fun) {
         }
 
         @Override
-        protected String buildReturnType(final String typeString) {
+        protected String buildReturnType(String typeString) {
             if (myMode == GenerationMode.SETTERS) {
                 return "void";
             }
@@ -361,22 +364,22 @@ protected String buildReturnType(final String typeString) {
 
         @Override
         @RequiredReadAction
-        protected String buildName(final JSVariable fun) {
+        protected String buildName(JSVariable fun) {
             return transformVarNameToAccessorName(super.buildName(fun), codeStyleSettings);
         }
 
         @Override
         @RequiredReadAction
-        protected String buildParameterList(final JSParameterList parameterList, final JSVariable fun) {
+        protected String buildParameterList(JSParameterList parameterList, JSVariable fun) {
             if (myMode == GenerationMode.SETTERS) {
-                final String s = fun.getTypeString();
+                String s = fun.getTypeString();
                 return "(" + PARAMETER_NAME + (s != null ? ":" + s : "") + ")";
             }
             return (parameterList != null ? parameterList.getText() : "()");
         }
     }
 
-    private static String transformVarNameToAccessorName(String s, final JSCodeStyleSettings codeStyleSettings) {
+    private static String transformVarNameToAccessorName(String s, JSCodeStyleSettings codeStyleSettings) {
         if (StringUtil.startsWith(s, codeStyleSettings.FIELD_PREFIX)) {
             s = s.substring(codeStyleSettings.FIELD_PREFIX.length());
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
index e9b2b7e6..f915e3db 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptImplementMethodsHandler.java
@@ -36,11 +36,11 @@
 @ExtensionImpl
 public class JavaScriptImplementMethodsHandler extends BaseJSGenerateHandler implements ImplementMethodHandler {
     @Override
-    protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates) {
+    protected void collectCandidates(JSClass clazz, final Collection<JSNamedElementNode> candidates) {
         ImplementedMethodProcessor processor = new ImplementedMethodProcessor(clazz) {
             @Override
             @RequiredReadAction
-            protected void addNonimplementedFunction(final JSFunction function) {
+            protected void addNonimplementedFunction(JSFunction function) {
                 candidates.add(new JSNamedElementNode(function));
             }
         };
@@ -54,7 +54,7 @@ protected LocalizeValue getTitle() {
     }
 
     @Override
-    protected BaseCreateMethodsFix createFix(final JSClass clazz) {
+    protected BaseCreateMethodsFix createFix(JSClass clazz) {
         return new ImplementMethodsFix(clazz);
     }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
index 26c7d771..d48c9083 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
@@ -46,16 +46,16 @@ protected LocalizeValue getTitle() {
     }
 
     @Override
-    protected BaseCreateMethodsFix createFix(final JSClass clazz) {
+    protected BaseCreateMethodsFix createFix(JSClass clazz) {
         return new OverrideMethodsFix(clazz);
     }
 
     @Override
     @RequiredReadAction
-    protected void collectCandidates(final JSClass clazz, final Collection<JSNamedElementNode> candidates) {
+    protected void collectCandidates(JSClass clazz, final Collection<JSNamedElementNode> candidates) {
         Map<String, Object> _functionsToOverride = null;
-        final Function<JSFunction, Boolean> functionFilter = function -> {
-            final JSAttributeList attributeList = function.getAttributeList();
+        Function<JSFunction, Boolean> functionFilter = function -> {
+            JSAttributeList attributeList = function.getAttributeList();
 
             if (attributeList != null && (attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
                 || attributeList.hasModifier(JSAttributeList.ModifierType.FINAL))) {
@@ -70,7 +70,7 @@ protected void collectCandidates(final JSClass clazz, final Collection<JSNamedEl
         }
 
         final Map<String, Object> functionsToOverride = _functionsToOverride;
-        final ResolveProcessor collectOwnFunctions = new ResolveProcessor(null, clazz) {
+        ResolveProcessor collectOwnFunctions = new ResolveProcessor(null, clazz) {
             {
                 setToProcessMembers(true);
                 setToProcessHierarchy(false);
@@ -78,13 +78,13 @@ protected void collectCandidates(final JSClass clazz, final Collection<JSNamedEl
 
             @Override
             @RequiredReadAction
-            public boolean execute(@Nonnull final PsiElement element, final ResolveState state) {
+            public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                 if (element instanceof JSFunction function) {
                     if (function.isConstructor() || functionsToOverride == null) {
                         return true;
                     }
-                    final String funName = function.getName();
-                    final Object o = functionsToOverride.get(funName);
+                    String funName = function.getName();
+                    Object o = functionsToOverride.get(funName);
                     if (o instanceof JSFunction oFun && oFun.getKind() == function.getKind()) {
                         functionsToOverride.remove(funName);
                     }
@@ -100,7 +100,7 @@ else if (o instanceof JSFunction[] oFuns) {
 
         if (functionsToOverride != null) {
             for (Map.Entry<String, Object> entry : functionsToOverride.entrySet()) {
-                final Object value = entry.getValue();
+                Object value = entry.getValue();
                 if (value instanceof JSFunction[] functions) {
                     for (JSFunction function : functions) {
                         candidates.add(new JSNamedElementNode(function));
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
index 1d42b7f3..528c48d7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/OverrideMethodsFix.java
@@ -28,13 +28,13 @@
  * @since 2008-07-17
  */
 public class OverrideMethodsFix extends BaseCreateMethodsFix<JSFunction> {
-    public OverrideMethodsFix(final JSClass jsClass) {
+    public OverrideMethodsFix(JSClass jsClass) {
         super(jsClass);
     }
 
     @Override
     @RequiredReadAction
-    protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func) {
+    protected String buildFunctionBodyText(String retType, JSParameterList parameterList, JSFunction func) {
         StringBuilder functionText = new StringBuilder();
         functionText.append("{\n");
 
@@ -71,17 +71,17 @@ else if (func.isSetProperty()) {
 
     @Override
     @RequiredReadAction
-    protected String buildFunctionAttrText(String attrText, final JSAttributeList attributeList, final JSFunction function) {
+    protected String buildFunctionAttrText(String attrText, JSAttributeList attributeList, JSFunction function) {
         attrText = super.buildFunctionAttrText(attrText, attributeList, function);
-        final PsiElement element = JSResolveUtil.findParent(function);
+        PsiElement element = JSResolveUtil.findParent(function);
         if (attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
             if (element instanceof JSClass jsClass && !"Object".equals(jsClass.getQualifiedName())) {
-                final PsiElement typeElement = attributeList != null ? attributeList.findAccessTypeElement() : null;
+                PsiElement typeElement = attributeList != null ? attributeList.findAccessTypeElement() : null;
                 if (typeElement == null) {
                     attrText += " override";
                 }
                 else {
-                    final int index = attrText.indexOf(typeElement.getText());
+                    int index = attrText.indexOf(typeElement.getText());
                     attrText = attrText.substring(0, index) + ((index > 0) ? " " : "") + "override " + attrText.substring(index);
                 }
             }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
index b14a5ac2..03950783 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
@@ -28,9 +28,8 @@
 import jakarta.annotation.Nullable;
 
 /**
- * User: max
- * Date: Feb 2, 2005
- * Time: 12:10:44 PM
+ * @author max
+ * @since 2005-02-02
  */
 @ExtensionImpl
 public class JSBraceMatcher implements PairedBraceMatcher {
@@ -46,10 +45,15 @@ public BracePair[] getPairs() {
     }
 
     @Override
-    public boolean isPairedBracesAllowedBeforeType(@Nonnull final IElementType lbraceType, @Nullable final IElementType tokenType) {
-        return JSTokenTypes.WHITE_SPACE == tokenType || JSTokenTypes.COMMENTS.contains(tokenType) || tokenType == JSTokenTypes.SEMICOLON || tokenType ==
-            JSTokenTypes.COMMA || tokenType == JSTokenTypes.RPAR || tokenType == JSTokenTypes.RBRACKET || tokenType == JSTokenTypes.RBRACE || null ==
-            tokenType;
+    public boolean isPairedBracesAllowedBeforeType(@Nonnull IElementType lbraceType, @Nullable IElementType tokenType) {
+        return tokenType == JSTokenTypes.WHITE_SPACE
+            || JSTokenTypes.COMMENTS.contains(tokenType)
+            || tokenType == JSTokenTypes.SEMICOLON
+            || tokenType == JSTokenTypes.COMMA
+            || tokenType == JSTokenTypes.RPAR
+            || tokenType == JSTokenTypes.RBRACKET
+            || tokenType == JSTokenTypes.RBRACE
+            || tokenType == null;
     }
 
     @Nonnull
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
index 97b3c457..6eceb33f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
@@ -25,24 +25,20 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.colorScheme.setting.ColorSettingsPage;
 import consulo.language.editor.highlight.SyntaxHighlighter;
-import org.jetbrains.annotations.NonNls;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * User: Maxim.Mossienko
- * Date: Nov 2, 2005
- * Time: 10:12:13 PM
+ * @author Maxim.Mossienko
+ * @since 2005-11-02
  */
 @ExtensionImpl
 public class JavaScriptColorsAndFontsPage implements ColorSettingsPage {
     private static final AttributesDescriptor[] ATTRS;
 
-    @NonNls
-    private static Map<String, TextAttributesKey> ADDITIONAL_HIGHLIGHT_DESCRIPTORS = new HashMap<String, TextAttributesKey>();
+    private static Map<String, TextAttributesKey> ADDITIONAL_HIGHLIGHT_DESCRIPTORS = new HashMap<>();
 
     static {
         ATTRS = new AttributesDescriptor[]{
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
index dc8fd4e9..6817e0f1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
@@ -35,9 +35,7 @@
 import consulo.language.editor.rawHighlight.HighlightVisitor;
 import consulo.language.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
-import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -46,7 +44,7 @@ public class JavaScriptHighlightVisitor extends JSElementVisitor implements High
 
     @Override
     @RequiredReadAction
-    public void visitJSBinaryExpression(JSBinaryExpression node) {
+    public void visitJSBinaryExpression(@Nonnull JSBinaryExpression node) {
         super.visitJSBinaryExpression(node);
 
         IElementType operationSign = node.getOperationSign();
@@ -57,7 +55,7 @@ public void visitJSBinaryExpression(JSBinaryExpression node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSAssignmentExpression(JSAssignmentExpression node) {
+    public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression node) {
         super.visitJSAssignmentExpression(node);
 
         IElementType operationSign = node.getOperationSign();
@@ -74,8 +72,8 @@ public void visitElement(PsiElement element) {
         PsiElement parent = element.getParent();
         IElementType elementType = PsiUtilCore.getElementType(element);
         if ((JavaScriptTokenSets.STRING_LITERALS.contains(elementType) || elementType == JSTokenTypes.IDENTIFIER)
-            && parent instanceof JSProperty && ((JSProperty)parent).getNameIdentifier() == element) {
-            highlightPropertyName((JSProperty)parent, element);
+            && parent instanceof JSProperty property && property.getNameIdentifier() == element) {
+            highlightPropertyName(property, element);
         }
         else if (elementType == JSTokenTypes.IDENTIFIER) {
             addElementHighlight(parent, element);
@@ -91,17 +89,18 @@ else if (JavaScriptContextKeywordElementType.containsKeyword(elementType)) {
     }
 
     @Override
-    public void visitJSProperty(JSProperty node) {
+    @RequiredReadAction
+    public void visitJSProperty(@Nonnull JSProperty node) {
         super.visitJSProperty(node);
 
-        if (node instanceof JSFunction) {
-            reportFeatureUsage(node.getNameIdentifier(), JavaScriptFeature.FUNCTION_PROPERTY);
+        if (node instanceof JSFunction function) {
+            reportFeatureUsage(function.getNameIdentifier(), JavaScriptFeature.FUNCTION_PROPERTY);
         }
     }
 
     @Override
     @RequiredReadAction
-    public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
+    public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression node) {
         super.visitJSLiteralExpression(node);
         if (node.getLiteralElementType() == JSTokenTypes.NUMERIC_LITERAL) {
             String text = node.getText();
@@ -116,15 +115,11 @@ else if (StringUtil.startsWithIgnoreCase(text, "0b")) {
 
     @RequiredReadAction
     private void highlightPropertyName(@Nonnull JSProperty property, @Nonnull PsiElement nameIdentifier) {
-        final JSExpression expression = property.getValue();
-        TextAttributesKey type;
+        JSExpression expression = property.getValue();
+        TextAttributesKey type = expression instanceof JSFunctionExpression
+            ? JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION
+            : JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
 
-        if (expression instanceof JSFunctionExpression) {
-            type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION;
-        }
-        else {
-            type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
-        }
         myHighlightInfoHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION)
             .needsUpdateOnTyping(false)
             .range(nameIdentifier)
@@ -134,7 +129,7 @@ private void highlightPropertyName(@Nonnull JSProperty property, @Nonnull PsiEle
 
     @Override
     @RequiredReadAction
-    public void visitJSAttribute(JSAttribute jsAttribute) {
+    public void visitJSAttribute(@Nonnull JSAttribute jsAttribute) {
         super.visitJSAttribute(jsAttribute);
 
         myHighlightInfoHolder.add(
@@ -148,7 +143,7 @@ public void visitJSAttribute(JSAttribute jsAttribute) {
 
     @Override
     @RequiredReadAction
-    public void visitJSParameter(JSParameter parameter) {
+    public void visitJSParameter(@Nonnull JSParameter parameter) {
         super.visitJSParameter(parameter);
 
         JSExpression initializer = parameter.getInitializer();
@@ -164,16 +159,16 @@ public void visitJSParameter(JSParameter parameter) {
 
     @Override
     @RequiredReadAction
-    public void visitJSReferenceExpression(JSReferenceExpression element) {
+    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression element) {
         super.visitJSReferenceExpression(element);
 
         PsiElement parent = element.getParent();
 
-        if (parent instanceof PsiNameIdentifierOwner && ((PsiNameIdentifierOwner)parent).getNameIdentifier() == element) {
+        if (parent instanceof PsiNameIdentifierOwner nameIdentifierOwner && nameIdentifierOwner.getNameIdentifier() == element) {
             return;
         }
 
-        final ResolveResult[] results = element.multiResolve(false);
+        ResolveResult[] results = element.multiResolve(false);
 
         PsiElement validResult = null;
         for (ResolveResult result : results) {
@@ -196,7 +191,7 @@ public void visitJSReferenceExpression(JSReferenceExpression element) {
 
     @Override
     @RequiredReadAction
-    public void visitJSPrefixExpression(JSPrefixExpression expression) {
+    public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
         super.visitJSPrefixExpression(expression);
 
         if (expression.getOperationSign() == JSTokenTypes.DOT_DOT_DOT) {
@@ -214,29 +209,27 @@ private void addElementHighlight(@Nonnull PsiElement resolvedElement, @Nonnull P
         boolean isField = false;
         TextAttributesKey type = null;
 
-        if (resolvedElement instanceof JSAttributeListOwner) {
-            if (resolvedElement instanceof JSClass) {
+        if (resolvedElement instanceof JSAttributeListOwner attributeListOwner) {
+            if (attributeListOwner instanceof JSClass) {
                 type = DefaultLanguageHighlighterColors.CLASS_NAME;
             }
             else {
-                final JSAttributeList attributeList = ((JSAttributeListOwner)resolvedElement).getAttributeList();
+                JSAttributeList attributeList = attributeListOwner.getAttributeList();
 
                 if (attributeList != null) {
                     isStatic = attributeList.hasModifier(JSAttributeList.ModifierType.STATIC);
                 }
 
-                isMethod = resolvedElement instanceof JSFunction;
-                if (isMethod && !isClass(resolvedElement.getParent())) {
+                isMethod = attributeListOwner instanceof JSFunction;
+                if (isMethod && !isClass(attributeListOwner.getParent())) {
                     isMethod = false;
                     isFunction = true;
                 }
             }
         }
-        else if (resolvedElement instanceof JSDefinitionExpression) {
-            final PsiElement parent = resolvedElement.getParent();
-            if (parent instanceof JSAssignmentExpression) {
-                final JSExpression jsExpression = ((JSAssignmentExpression)parent).getROperand();
-                if (jsExpression instanceof JSFunctionExpression) {
+        else if (resolvedElement instanceof JSDefinitionExpression definition) {
+            if (definition.getParent() instanceof JSAssignmentExpression assignment) {
+                if (assignment.getROperand() instanceof JSFunctionExpression) {
                     isMethod = true;
                 }
                 else {
@@ -244,10 +237,8 @@ else if (resolvedElement instanceof JSDefinitionExpression) {
                 }
             }
         }
-        else if (resolvedElement instanceof JSProperty) {
-            final JSExpression expression = ((JSProperty)resolvedElement).getValue();
-
-            if (expression instanceof JSFunctionExpression) {
+        else if (resolvedElement instanceof JSProperty property) {
+            if (property.getValue() instanceof JSFunctionExpression) {
                 isMethod = true;
             }
             else {
@@ -256,12 +247,9 @@ else if (resolvedElement instanceof JSProperty) {
         }
 
         if (isMethod) {
-            if (isStatic) {
-                type = JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_FUNCTION;
-            }
-            else {
-                type = JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION;
-            }
+            type = isStatic
+                ? JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_FUNCTION
+                : JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION;
         }
         else if (isFunction) {
             type = JavaScriptSyntaxHighlightKeys.JS_GLOBAL_FUNCTION;
@@ -271,8 +259,8 @@ else if (isField) {
         }
 
         if (type == null) {
-            if (resolvedElement instanceof JSVariable) {
-                myHighlightInfoHolder.add(buildHighlightForVariable(resolvedElement, targetForHighlight));
+            if (resolvedElement instanceof JSVariable variable) {
+                myHighlightInfoHolder.add(buildHighlightForVariable(variable, targetForHighlight));
             }
             return;
         }
@@ -288,15 +276,15 @@ else if (isField) {
 
     @Nullable
     @RequiredReadAction
-    private static HighlightInfo buildHighlightForVariable(@Nonnull final PsiElement element, @Nonnull final PsiElement markerAddTo) {
+    private static HighlightInfo buildHighlightForVariable(@Nonnull PsiElement element, @Nonnull PsiElement markerAddTo) {
         TextAttributesKey type;
 
         if (element instanceof JSParameter) {
             type = JavaScriptSyntaxHighlightKeys.JS_PARAMETER;
         }
         else if (isClass(element.getParent().getParent())) {
-            final JSAttributeList attributeList = ((JSAttributeListOwner)element).getAttributeList();
-            final boolean isStatic = attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC);
+            JSAttributeList attributeList = ((JSAttributeListOwner)element).getAttributeList();
+            boolean isStatic = attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC);
             type = isStatic
                 ? JavaScriptSyntaxHighlightKeys.JS_STATIC_MEMBER_VARIABLE
                 : JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_VARIABLE;
@@ -308,10 +296,6 @@ else if (PsiTreeUtil.getParentOfType(element, JSFunction.class) != null) {
             type = JavaScriptSyntaxHighlightKeys.JS_GLOBAL_VARIABLE;
         }
 
-        if (type == null) {
-            return null;
-        }
-
         return HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION)
             .range(markerAddTo)
             .needsUpdateOnTyping(false)
@@ -319,17 +303,16 @@ else if (PsiTreeUtil.getParentOfType(element, JSFunction.class) != null) {
             .create();
     }
 
+    @RequiredReadAction
     private void reportFeatureUsage(@Nonnull PsiElement element, @Nonnull JavaScriptFeature javaScriptFeature) {
         if (JavaScriptVersionUtil.containsFeature(element, javaScriptFeature)) {
             return;
         }
 
-        LocalizeValue message = JavaScriptLocalize.thisFeatureIsNotSupportedByCurrentLanguage(javaScriptFeature.getName());
-
         myHighlightInfoHolder.add(
             HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
                 .range(element)
-                .descriptionAndTooltip(message)
+                .descriptionAndTooltip(JavaScriptLocalize.thisFeatureIsNotSupportedByCurrentLanguage(javaScriptFeature.getName()))
                 .create()
         );
     }
@@ -351,7 +334,7 @@ public boolean analyze(
         return true;
     }
 
-    private static boolean isClass(final PsiElement element) {
+    private static boolean isClass(PsiElement element) {
         return element instanceof JSClass || element instanceof JSFile && element.getContext() != null;
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
index 7c024ead..515180c5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
@@ -10,7 +10,7 @@
 
 /**
  * @author VISTALL
- * @since 25/03/2023
+ * @since 2023-03-25
  */
 @ExtensionImpl
 public class JavaScriptHighlightVisitorFactory implements HighlightVisitorFactory {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
index a1eeeef7..9b5b39c8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
@@ -21,9 +21,8 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import com.intellij.lang.javascript.search.JSClassSearch;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.application.AllIcons;
-import consulo.application.ApplicationManager;
 import consulo.application.progress.ProgressManager;
 import consulo.application.util.function.Processor;
 import consulo.application.util.query.CollectionQuery;
@@ -40,10 +39,11 @@
 import consulo.language.psi.NavigatablePsiElement;
 import consulo.language.psi.PsiElement;
 import consulo.navigation.NavigationItem;
+import consulo.platform.base.icon.PlatformIconGroup;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.RelativePoint;
 import consulo.util.dataholder.Key;
-import consulo.util.lang.ref.Ref;
-
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -53,70 +53,72 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Apr 14, 2008
- * Time: 11:43:47 PM
+ * @since 2008-04-14
  */
 @ExtensionImpl
 public class JavaScriptLineMarkerProvider implements LineMarkerProvider {
     private static final String OVERRIDES_METHOD_IN = "overrides method in ";
 
-    private static final Function<JSClass, String> ourClassInheritorsTooltipProvider = clazz -> "Has subclasses";
+    private static final Function<JSClass, String> CLASS_INHERITORS_TOOLTIP_PROVIDER = clazz -> "Has subclasses";
 
-    private static final Function<JSClass, String> ourImplementedInterfacesTooltipProvider = clazz -> "Has implementations";
+    private static final Function<JSClass, String> IMPLEMENTED_INTERFACES_TOOLTIP_PROVIDER = clazz -> "Has implementations";
 
-    private static final Function<JSFunction, String> ourOverriddenFunctionsTooltipProvider = psiElement -> "Is overridden";
+    private static final Function<JSFunction, String> OVERRIDDEN_FUNCTIONS_TOOLTIP_PROVIDER = psiElement -> "Is overridden";
 
-    private static final Function<JSFunction, String> ourImplementingFunctionsTooltipProvider = psiElement -> "Is implemented";
+    private static final Function<JSFunction, String> IMPLEMENTING_FUNCTIONS_TOOLTIP_PROVIDER = psiElement -> "Is implemented";
 
-    private static final BasicGutterIconNavigationHandler<JSClass> ourClassInheritorsNavHandler =
-        new BasicGutterIconNavigationHandler<JSClass>() {
+    private static final BasicGutterIconNavigationHandler<JSClass> CLASS_INHERITORS_NAV_HANDLER =
+        new BasicGutterIconNavigationHandler<>() {
             @Override
-            protected String getTitle(final JSClass elt) {
+            @RequiredReadAction
+            protected String getTitle(JSClass elt) {
                 return "Choose Subclass of " + elt.getName();
             }
 
             @Override
-            protected Query<JSClass> search(final JSClass elt) {
+            protected Query<JSClass> search(JSClass elt) {
                 return JSClassSearch.searchClassInheritors(elt, true);
             }
         };
 
-    private static final BasicGutterIconNavigationHandler<JSClass> ourInterfaceImplementationsNavHandler = new
-        BasicGutterIconNavigationHandler<JSClass>() {
+    private static final BasicGutterIconNavigationHandler<JSClass> INTERFACE_IMPLEMENTATIONS_NAV_HANDLER =
+        new BasicGutterIconNavigationHandler<>() {
             @Override
-            protected String getTitle(final JSClass elt) {
+            @RequiredReadAction
+            protected String getTitle(JSClass elt) {
                 return "Choose Implementation of " + elt.getName();
             }
 
             @Override
-            protected Query<JSClass> search(final JSClass elt) {
+            protected Query<JSClass> search(JSClass elt) {
                 return JSClassSearch.searchInterfaceImplementations(elt, true);
             }
         };
 
-    private static final BasicGutterIconNavigationHandler<JSFunction> ourOverriddenFunctionsNavHandler = new
-        BasicGutterIconNavigationHandler<JSFunction>() {
+    private static final BasicGutterIconNavigationHandler<JSFunction> OVERRIDDEN_FUNCTIONS_NAV_HANDLER =
+        new BasicGutterIconNavigationHandler<>() {
             @Override
-            protected String getTitle(final JSFunction elt) {
+            @RequiredReadAction
+            protected String getTitle(JSFunction elt) {
                 return "Choose Overriden Function of " + elt.getName();
             }
 
             @Override
-            protected Query<JSFunction> search(final JSFunction elt) {
+            @RequiredReadAction
+            protected Query<JSFunction> search(JSFunction elt) {
                 return doFindOverridenFunctionStatic(elt);
             }
         };
-    private final boolean myUnitTestMode = ApplicationManager.getApplication().isUnitTestMode();
-
 
-    public static Query<JSFunction> doFindOverridenFunctionStatic(final JSFunction elt) {
+    @RequiredReadAction
+    public static Query<JSFunction> doFindOverridenFunctionStatic(JSFunction elt) {
         PsiElement parent = JSResolveUtil.findParent(elt);
         if (parent instanceof JSClass) {
             return JSFunctionsSearch.searchOverridingFunctions(elt, true);
         }
-        final String qName = JSResolveUtil.getQNameToStartHierarchySearch(elt);
+        String qName = JSResolveUtil.getQNameToStartHierarchySearch(elt);
         if (qName != null) {
-            final ArrayList<JSFunction> result = new ArrayList<>();
+            ArrayList<JSFunction> result = new ArrayList<>();
 
             return new CollectionQuery<>(result);
         }
@@ -124,15 +126,16 @@ public static Query<JSFunction> doFindOverridenFunctionStatic(final JSFunction e
         return new CollectionQuery<>(Collections.<JSFunction>emptyList());
     }
 
-    private static final BasicGutterIconNavigationHandler<JSFunction> ourImplementingFunctionsNavHandler = new
-        BasicGutterIconNavigationHandler<JSFunction>() {
+    private static final BasicGutterIconNavigationHandler<JSFunction> IMPLEMENTING_FUNCTIONS_NAV_HANDLER =
+        new BasicGutterIconNavigationHandler<>() {
             @Override
-            protected String getTitle(final JSFunction elt) {
+            @RequiredReadAction
+            protected String getTitle(JSFunction elt) {
                 return "Choose Implementation of " + elt.getName();
             }
 
             @Override
-            protected Query<JSFunction> search(final JSFunction elt) {
+            protected Query<JSFunction> search(JSFunction elt) {
                 return JSFunctionsSearch.searchImplementingFunctions(elt, true);
             }
         };
@@ -140,9 +143,9 @@ protected Query<JSFunction> search(final JSFunction elt) {
     public static Key<Boolean> ourParticipatesInHierarchyKey = Key.create("js.named.item.participates.in.hierarchy");
 
     @Override
+    @RequiredReadAction
     public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element) {
-        if (element instanceof JSFunction) {
-            final JSFunction function = (JSFunction)element;
+        if (element instanceof JSFunction function) {
             function.putUserData(ourParticipatesInHierarchyKey, null);
             if (function.getNameIdentifier() == null) {
                 return null;
@@ -151,19 +154,19 @@ public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element) {
 
             if (qName != null) {
                 PsiElement parentNode = element.getParent();
-                if (parentNode instanceof JSFile) {
-                    JSClass xmlBackedClass = JSResolveUtil.getXmlBackedClass((JSFile)parentNode);
+                if (parentNode instanceof JSFile jsFile) {
+                    JSClass xmlBackedClass = JSResolveUtil.getXmlBackedClass(jsFile);
                     if (xmlBackedClass != null) {
                         parentNode = xmlBackedClass;
                     }
                 }
 
-                if (element instanceof JSFunctionExpression) {
-                    parentNode = element.getContainingFile();
+                if (element instanceof JSFunctionExpression functionExpr) {
+                    parentNode = functionExpr.getContainingFile();
                 }
 
                 final MyOverrideHandler overrideHandler = new MyOverrideHandler();
-                final String typeName = parentNode instanceof JSClass ? ((JSClass)parentNode).getQualifiedName() : qName;
+                final String typeName = parentNode instanceof JSClass jsClass ? jsClass.getQualifiedName() : qName;
                 JSResolveUtil.iterateType(function, parentNode, typeName, overrideHandler);
 
                 if (overrideHandler.className != null) {
@@ -173,41 +176,31 @@ public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element) {
                     return new LineMarkerInfo<>(
                         function,
                         function.getNameIdentifier().getTextRange().getStartOffset(),
-                        AllIcons.Gutter.OverridingMethod,
+                        PlatformIconGroup.gutterOverridingmethod(),
                         Pass.UPDATE_ALL,
                         psiElement -> OVERRIDES_METHOD_IN + overrideHandler.className,
-                        new GutterIconNavigationHandler<JSFunction>() {
-                            @Override
-                            public void navigate(final MouseEvent e, final JSFunction elt) {
-                                final Set<NavigationItem> results = new HashSet<>();
-                                JSResolveUtil.iterateType(
-                                    function,
-                                    parentNode1,
-                                    typeName,
-                                    new JSResolveUtil.OverrideHandler() {
-                                        @Override
-                                        public boolean process(
-                                            final ResolveProcessor processor,
-                                            final PsiElement scope,
-                                            final String className
-                                        ) {
-                                            for (PsiElement e : processor.getResults()) {
-                                                results.add((NavigationItem)e);
-                                            }
-                                            return true;
-                                        }
+                        (e, elt) -> {
+                            final Set<NavigationItem> results = new HashSet<>();
+                            JSResolveUtil.iterateType(
+                                function,
+                                parentNode1,
+                                typeName,
+                                (processor, scope, className) -> {
+                                    for (PsiElement e1 : processor.getResults()) {
+                                        results.add((NavigationItem)e1);
                                     }
-                                );
-
-                                if (results.size() == 1) {
-                                    results.iterator().next().navigate(true);
-                                }
-                                else if (results.size() > 1) {
-                                    PopupNavigationUtil.getPsiElementPopup(
-                                        results.toArray(new PsiElement[results.size()]),
-                                        "Choose super class or interface"
-                                    ).show(new RelativePoint(e));
+                                    return true;
                                 }
+                            );
+
+                            if (results.size() == 1) {
+                                results.iterator().next().navigate(true);
+                            }
+                            else if (results.size() > 1) {
+                                PopupNavigationUtil.getPsiElementPopup(
+                                    results.toArray(new PsiElement[results.size()]),
+                                    "Choose super class or interface"
+                                ).show(new RelativePoint(e));
                             }
                         }
                     );
@@ -219,6 +212,7 @@ else if (results.size() > 1) {
     }
 
     @Override
+    @RequiredReadAction
     public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @Nonnull final Collection<LineMarkerInfo> result) {
         final Map<String, Set<JSFunction>> jsFunctionsToProcess = new HashMap<>();
         final Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new HashMap<>();
@@ -226,30 +220,27 @@ public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @No
         for (final PsiElement el : elements) {
             ProgressManager.getInstance().checkCanceled();
 
-            if (el instanceof JSFunction) {
-                final JSFunction function = (JSFunction)el;
+            if (el instanceof JSFunction function) {
                 if (isNotApplicableForOverride(function)) {
                     continue;
                 }
 
                 PsiElement parent = function.getParent();
-                if (parent instanceof JSFile) {
-                    parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+                if (parent instanceof JSFile jsFile) {
+                    parent = JSResolveUtil.getClassReferenceForXmlFromContext(jsFile);
                 }
 
-                if (parent instanceof JSClass) {
-                    final JSClass clazz = (JSClass)parent;
-
-                    Set<JSFunction> functions = jsMethodsToProcess.get(clazz);
+                if (parent instanceof JSClass jsClass) {
+                    Set<JSFunction> functions = jsMethodsToProcess.get(jsClass);
                     if (functions == null) {
                         functions = new HashSet<>();
-                        jsMethodsToProcess.put(clazz, functions);
+                        jsMethodsToProcess.put(jsClass, functions);
                     }
 
                     functions.add(function);
                 }
                 else if (parent instanceof JSFile || function instanceof JSFunctionExpression) {
-                    final String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
+                    String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
                     if (qName != null) {
                         Set<JSFunction> functions = jsFunctionsToProcess.get(qName);
 
@@ -262,10 +253,9 @@ else if (parent instanceof JSFile || function instanceof JSFunctionExpression) {
                     }
                 }
             }
-            else if (el instanceof JSClass) {
-                final JSClass clazz = (JSClass)el;
-                if (!jsMethodsToProcess.containsKey(clazz)) {
-                    jsMethodsToProcess.put(clazz, null);
+            else if (el instanceof JSClass jsClass) {
+                if (!jsMethodsToProcess.containsKey(jsClass)) {
+                    jsMethodsToProcess.put(jsClass, null);
                 }
             }
         }
@@ -277,39 +267,39 @@ else if (el instanceof JSClass) {
 
             Query<JSClass> classQuery = JSClassSearch.searchClassInheritors(clazz, methods != null);
 
-            classQuery.forEach(new Processor<JSClass>() {
+            classQuery.forEach(new Processor<>() {
                 boolean addedClassMarker;
                 final Set<JSFunction> methodsClone = methods == null || clazz.isInterface() ? null : new HashSet<>(methods);
 
                 @Override
-                public boolean process(final JSClass jsClass) {
+                public boolean process(JSClass jsClass) {
                     if (!addedClassMarker) {
                         result.add(new LineMarkerInfo<>(
                             clazz,
                             clazz.getTextOffset(),
-                            AllIcons.Gutter.OverridenMethod,
+                            PlatformIconGroup.gutterOverridenmethod(),
                             Pass.LINE_MARKERS,
-                            ourClassInheritorsTooltipProvider,
-                            ourClassInheritorsNavHandler
+                            CLASS_INHERITORS_TOOLTIP_PROVIDER,
+                            CLASS_INHERITORS_NAV_HANDLER
                         ));
                         addedClassMarker = true;
                     }
 
                     if (methodsClone != null) {
                         for (final Iterator<JSFunction> functionIterator = methodsClone.iterator(); functionIterator.hasNext(); ) {
-                            final JSFunction function = functionIterator.next();
+                            JSFunction function = functionIterator.next();
 
-                            final JSFunction byName = jsClass.findFunctionByNameAndKind(function.getName(), function.getKind());
+                            JSFunction byName = jsClass.findFunctionByNameAndKind(function.getName(), function.getKind());
                             if (byName != null && !isNotApplicableForOverride(byName)) {
                                 // TODO: more correct check for override
                                 function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
                                 result.add(new LineMarkerInfo<>(
                                     function,
                                     function.getTextOffset(),
-                                    AllIcons.Gutter.OverridenMethod,
+                                    PlatformIconGroup.gutterOverridenmethod(),
                                     Pass.LINE_MARKERS,
-                                    ourOverriddenFunctionsTooltipProvider,
-                                    ourOverriddenFunctionsNavHandler
+                                    OVERRIDDEN_FUNCTIONS_TOOLTIP_PROVIDER,
+                                    OVERRIDDEN_FUNCTIONS_NAV_HANDLER
                                 ));
                                 functionIterator.remove();
                             }
@@ -327,10 +317,10 @@ public boolean process(final JSClass jsClass) {
                     result.add(new LineMarkerInfo<>(
                         clazz,
                         clazz.getTextOffset(),
-                        AllIcons.Gutter.ImplementedMethod,
+                        PlatformIconGroup.gutterImplementedmethod(),
                         Pass.LINE_MARKERS,
-                        ourImplementedInterfacesTooltipProvider,
-                        ourInterfaceImplementationsNavHandler
+                        IMPLEMENTED_INTERFACES_TOOLTIP_PROVIDER,
+                        INTERFACE_IMPLEMENTATIONS_NAV_HANDLER
                     ));
                 }
             }
@@ -339,45 +329,42 @@ public boolean process(final JSClass jsClass) {
                 continue;
             }
 
-            for (final JSFunction function : methods) {
+            for (JSFunction function : methods) {
                 if (clazz.isInterface()) {
-                    final Query<JSFunction> query = JSFunctionsSearch.searchImplementingFunctions(function, false);
+                    Query<JSFunction> query = JSFunctionsSearch.searchImplementingFunctions(function, false);
                     if (query.findFirst() != null) {
                         function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
                         result.add(new LineMarkerInfo<>(
                             function,
                             function.getTextOffset(),
-                            AllIcons.Gutter.ImplementedMethod,
+                            PlatformIconGroup.gutterImplementedmethod(),
                             Pass.LINE_MARKERS,
-                            ourImplementingFunctionsTooltipProvider,
-                            ourImplementingFunctionsNavHandler
+                            IMPLEMENTING_FUNCTIONS_TOOLTIP_PROVIDER,
+                            IMPLEMENTING_FUNCTIONS_NAV_HANDLER
                         ));
                     }
                 }
                 else {
-                    final JSAttributeList attributeList = function.getAttributeList();
+                    JSAttributeList attributeList = function.getAttributeList();
                     if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)) {
                         continue;
                     }
 
-                    final JSFunction implementedFunction = findImplementedFunction(function);
+                    JSFunction implementedFunction = findImplementedFunction(function);
                     if (implementedFunction != null) {
                         function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
 
                         result.add(new LineMarkerInfo<>(
                             function,
                             function.getTextOffset(),
-                            AllIcons.Gutter.ImplementingMethod,
+                            PlatformIconGroup.gutterImplementingmethod(),
                             Pass.LINE_MARKERS,
                             jsFunction -> "Implementation of " + jsFunction.getName() + " in " +
                                 ((NavigationItem)implementedFunction.getParent()).getName(),
-                            new GutterIconNavigationHandler<JSFunction>() {
-                                @Override
-                                public void navigate(final MouseEvent e, final JSFunction elt) {
-                                    final JSFunction implementedFunction = findImplementedFunction(elt);
-                                    if (implementedFunction != null) {
-                                        implementedFunction.navigate(true);
-                                    }
+                            (e, elt) -> {
+                                JSFunction implementedFunction1 = findImplementedFunction(elt);
+                                if (implementedFunction1 != null) {
+                                    implementedFunction1.navigate(true);
                                 }
                             }
                         ));
@@ -387,17 +374,12 @@ public void navigate(final MouseEvent e, final JSFunction elt) {
         }
     }
 
-    private static boolean isClass(final PsiElement element) {
-        if (element instanceof JSClass) {
-            return true;
-        }
-        if (element instanceof JSFile && element.getContext() != null) {
-            return true;
-        }
-        return false;
+    private static boolean isClass(PsiElement element) {
+        return element instanceof JSClass || element instanceof JSFile jsFile && jsFile.getContext() != null;
     }
 
     @Nullable
+    @RequiredReadAction
     private static JSFunction findImplementedFunction(JSFunction implementingFunction) {
         PsiElement clazz = implementingFunction.getParent();
         if (!(clazz instanceof JSClass)) {
@@ -406,22 +388,26 @@ private static JSFunction findImplementedFunction(JSFunction implementingFunctio
         if (!(clazz instanceof JSClass)) {
             return null;
         }
-        final Ref<JSFunction> result = new Ref<>();
-        JSResolveUtil.processInterfaceMethods((JSClass)clazz, new JSResolveUtil.CollectMethodsToImplementProcessor(
-            implementingFunction.getName(),
-            implementingFunction
-        ) {
-            @Override
-            protected boolean process(final ResolveProcessor processor) {
-                result.set((JSFunction)processor.getResult());
-                return false;
+        final SimpleReference<JSFunction> result = new SimpleReference<>();
+        JSResolveUtil.processInterfaceMethods(
+            (JSClass)clazz,
+            new JSResolveUtil.CollectMethodsToImplementProcessor(
+                implementingFunction.getName(),
+                implementingFunction
+            ) {
+                @Override
+                protected boolean process(ResolveProcessor processor) {
+                    result.set((JSFunction)processor.getResult());
+                    return false;
+                }
             }
-        });
+        );
         return result.get();
     }
 
-    private static boolean isNotApplicableForOverride(final JSFunction function) {
-        final JSAttributeList attributeList = function.getAttributeList();
+    @RequiredReadAction
+    private static boolean isNotApplicableForOverride(JSFunction function) {
+        JSAttributeList attributeList = function.getAttributeList();
 
         return function.isConstructor() || (attributeList != null
             && (attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE
@@ -433,7 +419,7 @@ static class MyOverrideHandler implements JSResolveUtil.OverrideHandler {
         String className;
 
         @Override
-        public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className) {
+        public boolean process(ResolveProcessor processor, PsiElement scope, String className) {
             this.className = className;
             return true;
         }
@@ -441,22 +427,20 @@ public boolean process(final ResolveProcessor processor, final PsiElement scope,
 
     private abstract static class BasicGutterIconNavigationHandler<T extends PsiElement> implements GutterIconNavigationHandler<T> {
         @Override
-        public void navigate(final MouseEvent e, final T elt) {
+        @RequiredUIAccess
+        public void navigate(MouseEvent e, T elt) {
             final List<NavigatablePsiElement> navElements = new ArrayList<>();
             Query<T> elementQuery = search(elt);
             if (elementQuery == null) {
                 return;
             }
-            elementQuery.forEach(new Processor<T>() {
-                @Override
-                public boolean process(final T psiElement) {
-                    if (psiElement instanceof NavigatablePsiElement) {
-                        navElements.add((NavigatablePsiElement)psiElement);
-                    }
-                    return true;
+            elementQuery.forEach(psiElement -> {
+                if (psiElement instanceof NavigatablePsiElement navigatablePsiElement) {
+                    navElements.add(navigatablePsiElement);
                 }
+                return true;
             });
-            final NavigatablePsiElement[] methods = navElements.toArray(new NavigatablePsiElement[navElements.size()]);
+            NavigatablePsiElement[] methods = navElements.toArray(new NavigatablePsiElement[navElements.size()]);
             PsiElementListNavigator.openTargets(e, methods, getTitle(elt), "", new DefaultPsiElementCellRenderer());
         }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java
index f3a84c6b..aac698b0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/index/predefined/Marker.java
@@ -17,11 +17,8 @@
 package com.intellij.lang.javascript.impl.index.predefined;
 
 /**
- * Created by IntelliJ IDEA.
- * User: Maxim.Mossienko
- * Date: Apr 22, 2006
- * Time: 8:09:53 PM
- * To change this template use File | Settings | File Templates.
+ * @author Maxim.Mossienko
+ * @since 2006-04-22
  */
 public class Marker {
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
index c69295ec..775bb5f7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionDialog.java
@@ -23,8 +23,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Aug 9, 2008
- * Time: 9:22:10 AM
+ * @since 2008-08-09
  */
 public class JSExtractFunctionDialog extends DialogWrapper implements JSExtractFunctionSettings {
     private JPanel myPanel;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
index 15089216..aee13a49 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
@@ -24,44 +24,41 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.undoRedo.CommandProcessor;
-
 import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
- * Date: May 29, 2008
- * Time: 8:19:48 PM
+ * @since 2008-05-29
  */
 public class JSExtractFunctionHandler implements RefactoringActionHandler {
     @Override
+    @RequiredUIAccess
     public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file, DataContext dataContext) {
         if (!editor.getSelectionModel().hasSelection()) {
             editor.getSelectionModel().selectLineAtCaret();
         }
-        int start = editor.getSelectionModel().getSelectionStart();
-        int end = editor.getSelectionModel().getSelectionEnd();
 
         if (!CommonRefactoringUtil.checkReadOnlyStatus(project, file)) {
             return;
         }
 
-        final JSExtractFunctionSettings settings = getSettings(project, editor);
+        JSExtractFunctionSettings settings = getSettings(project, editor);
         if (settings == null) {
             return;
         }
 
-        CommandProcessor.getInstance().executeCommand(
-            project,
-            () -> project.getApplication().runWriteAction(() -> doRefactoring(project, editor, settings)),
-            JavaScriptLocalize.javascriptExtractMethodTitle().get(),
-            null
-        );
+        CommandProcessor.getInstance().newCommand()
+            .project(project)
+            .name(JavaScriptLocalize.javascriptExtractMethodTitle())
+            .run(() -> project.getApplication().runWriteAction(() -> doRefactoring(project, editor, settings)));
     }
 
-    protected JSExtractFunctionSettings getSettings(final Project project, final Editor editor) {
-        final JSExtractFunctionDialog dialog = new JSExtractFunctionDialog();
+    @RequiredUIAccess
+    protected JSExtractFunctionSettings getSettings(Project project, Editor editor) {
+        JSExtractFunctionDialog dialog = new JSExtractFunctionDialog();
         dialog.show();
         if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
             return null;
@@ -69,11 +66,12 @@ protected JSExtractFunctionSettings getSettings(final Project project, final Edi
         return dialog;
     }
 
-    private void doRefactoring(final Project project, final Editor editor, final JSExtractFunctionSettings settings) {
+    private void doRefactoring(Project project, Editor editor, JSExtractFunctionSettings settings) {
     }
 
     @Override
-    public void invoke(@Nonnull final Project project, @Nonnull final PsiElement[] elements, final DataContext dataContext) {
+    @RequiredUIAccess
+    public void invoke(@Nonnull Project project, @Nonnull PsiElement[] elements, DataContext dataContext) {
         throw new UnsupportedOperationException();
     }
 }

From 199536935604b5e906aecc799cf2e1a1b029a12c Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Tue, 14 Jan 2025 12:34:03 +0300
Subject: [PATCH 273/340] Refactoring the rest of classes in consulo-javascript
 module (part 2).

---
 .../lang/javascript/impl/JSNodeVisitor.java   | 106 +++---
 .../impl/JSSmartEnterProcessor.java           |  41 +--
 .../impl/JavaScriptCodeContextType.java       |  24 +-
 .../impl/JavaScriptTargetElementUtilEx.java   |   7 +-
 .../javascript/impl/JavascriptCommenter.java  |   2 +-
 .../JSDuplicatedDeclarationInspection.java    |   2 +-
 .../JSUndeclaredVariableInspection.java       |   2 +-
 .../JSUnresolvedFunctionInspection.java       |   7 +-
 .../JSUnresolvedVariableInspection.java       |   4 +-
 .../JSUntypedDeclarationInspection.java       |   6 +-
 .../JSUnusedLocalSymbolsInspection.java       |   3 +-
 .../JavaScriptGotoSuperHandler.java           |  51 ++-
 .../JSBaseClassBasedIntroduceDialog.java      |  13 +-
 .../refactoring/JSBaseIntroduceDialog.java    | 106 +++---
 .../refactoring/JSBaseIntroduceHandler.java   | 159 ++++-----
 .../impl/refactoring/JSNamesValidator.java    |   9 +-
 .../JavascriptRefactoringSupportProvider.java |   4 +-
 .../JSIntroduceConstantDialog.java            |   9 +-
 .../JSIntroduceConstantHandler.java           |  46 ++-
 .../JSIntroduceFieldDialog.java               |  35 +-
 .../JSIntroduceFieldHandler.java              |  49 +--
 .../JSIntroduceVariableDialog.java            |   9 +-
 .../JSIntroduceVariableHandler.java           |   8 +-
 .../search/JSDeclarationRangeHandler.java     |  10 +-
 .../search/JSDefinitionsSearchExecutor.java   |  25 +-
 .../impl/search/JSFunctionsSearch.java        |  34 +-
 .../search/JSGotoTargetRendererProvider.java  |  18 +-
 .../JSStructureItemPresentation.java          |  45 ++-
 .../JSStructureViewBuilderFactory.java        |   2 +-
 .../structureView/JSStructureViewElement.java | 157 +++++----
 .../structureView/JSStructureViewModel.java   | 139 ++++----
 .../impl/structureView/JSSuperGroup.java      |   8 +-
 .../impl/structureView/JSSuperGrouper.java    |  38 ++-
 .../JSExpressionSurroundDescriptor.java       |  16 +-
 .../surroundWith/JSStatementSurrounder.java   |  34 +-
 .../JSStatementsSurroundDescriptor.java       |  29 +-
 .../surroundWith/JSWithBlockSurrounder.java   |   9 +-
 .../surroundWith/JSWithDoWhileSurrounder.java |   9 +-
 .../surroundWith/JSWithForSurrounder.java     |  15 +-
 .../JSWithFunctionExpressionSurrounder.java   |  16 +-
 .../JSWithFunctionSurrounder.java             |   9 +-
 .../surroundWith/JSWithIfElseSurrounder.java  |   2 +-
 .../impl/surroundWith/JSWithIfSurrounder.java |  11 +-
 .../JSWithParenthesesSurrounder.java          |   4 +-
 .../JSWithTryCatchFinallySurrounder.java      |  13 +-
 .../JSWithTryCatchSurrounder.java             |   4 +-
 .../JSWithTryFinallySurrounder.java           |   4 +-
 .../surroundWith/JSWithWhileSurrounder.java   |   7 +-
 .../surroundWith/JSWithWithSurrounder.java    |  16 +-
 .../impl/validation/BaseCreateMethodsFix.java | 114 +++----
 .../impl/validation/ImplementMethodsFix.java  |  10 +-
 .../ImplementedMethodProcessor.java           |  34 +-
 .../impl/validation/JSAnnotatingVisitor.java  | 314 +++++++++---------
 53 files changed, 931 insertions(+), 917 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java
index 990c8836..7e03efd3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSNodeVisitor.java
@@ -28,7 +28,7 @@
  */
 public abstract class JSNodeVisitor {
     public final void visit(ASTNode node) {
-        final IElementType type = node.getElementType();
+        IElementType type = node.getElementType();
         if (type instanceof JSFileElementType) {
             visitFile(node);
         }
@@ -188,210 +188,210 @@ public void visitXmlLiteralExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitAttributeList(final ASTNode node) {
+    public void visitAttributeList(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitPackageStatement(final ASTNode node) {
+    public void visitPackageStatement(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitClass(final ASTNode node) {
+    public void visitClass(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitFile(final ASTNode node) {
+    public void visitFile(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitCallExpression(final ASTNode node) {
+    public void visitCallExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitIndexedPropertyAccessExpression(final ASTNode node) {
+    public void visitIndexedPropertyAccessExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitNewExpression(final ASTNode node) {
+    public void visitNewExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitFunctionExpression(final ASTNode node) {
+    public void visitFunctionExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitPrefixExpression(final ASTNode node) {
+    public void visitPrefixExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitPostfixExpression(final ASTNode node) {
+    public void visitPostfixExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitConditionalExpression(final ASTNode node) {
+    public void visitConditionalExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitCommaExpression(final ASTNode node) {
+    public void visitCommaExpression(ASTNode node) {
         visitBinaryExpression(node);
     }
 
-    public void visitAssignmentExpression(final ASTNode node) {
+    public void visitAssignmentExpression(ASTNode node) {
         visitBinaryExpression(node);
     }
 
-    public void visitBinaryExpression(final ASTNode node) {
+    public void visitBinaryExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitProperty(final ASTNode node) {
+    public void visitProperty(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitObjectLiteralExpression(final ASTNode node) {
+    public void visitObjectLiteralExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitArrayLiteralExpression(final ASTNode node) {
+    public void visitArrayLiteralExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitParenthesizedExpression(final ASTNode node) {
+    public void visitParenthesizedExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitReferenceExpression(final ASTNode node) {
+    public void visitReferenceExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitLiteralExpression(final ASTNode node) {
+    public void visitLiteralExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitThisExpression(final ASTNode node) {
+    public void visitThisExpression(ASTNode node) {
         visitExpression(node);
     }
 
-    public void visitForInStatement(final ASTNode node) {
+    public void visitForInStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitForStatement(final ASTNode node) {
+    public void visitForStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitDoWhileStatement(final ASTNode node) {
+    public void visitDoWhileStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitWhileStatement(final ASTNode node) {
+    public void visitWhileStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitCaseClause(final ASTNode node) {
+    public void visitCaseClause(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitSwitchStatement(final ASTNode node) {
+    public void visitSwitchStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitCatchBlock(final ASTNode node) {
+    public void visitCatchBlock(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitTryStatement(final ASTNode node) {
+    public void visitTryStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitThrowStatement(final ASTNode node) {
+    public void visitThrowStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitReturnStatement(final ASTNode node) {
+    public void visitReturnStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitWithStatement(final ASTNode node) {
+    public void visitWithStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitBreakStatement(final ASTNode node) {
+    public void visitBreakStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitContinueStatement(final ASTNode node) {
+    public void visitContinueStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitIfStatement(final ASTNode node) {
+    public void visitIfStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitEmptyStatement(final ASTNode node) {
+    public void visitEmptyStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitVarStatement(final ASTNode node) {
+    public void visitVarStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitExpressionStatement(final ASTNode node) {
+    public void visitExpressionStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitLabeledStatement(final ASTNode node) {
+    public void visitLabeledStatement(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitBlock(final ASTNode node) {
+    public void visitBlock(ASTNode node) {
         visitStatement(node);
     }
 
-    public void visitArgumentList(final ASTNode node) {
+    public void visitArgumentList(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitParameter(final ASTNode node) {
+    public void visitParameter(ASTNode node) {
         visitVariable(node);
     }
 
-    public void visitVariable(final ASTNode node) {
+    public void visitVariable(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitParameterList(final ASTNode node) {
+    public void visitParameterList(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitEmbeddedContent(final ASTNode node) {
+    public void visitEmbeddedContent(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitElement(final ASTNode node) {
+    public void visitElement(ASTNode node) {
     }
 
-    public void visitSourceElement(final ASTNode node) {
+    public void visitSourceElement(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitFunctionDeclaration(final ASTNode node) {
+    public void visitFunctionDeclaration(ASTNode node) {
         visitSourceElement(node);
     }
 
-    public void visitStatement(final ASTNode node) {
+    public void visitStatement(ASTNode node) {
         visitSourceElement(node);
     }
 
-    public void visitExpression(final ASTNode node) {
+    public void visitExpression(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitDocComment(final ASTNode node) {
+    public void visitDocComment(ASTNode node) {
         visitElement(node);
     }
 
-    public void visitComment(final ASTNode node) {
+    public void visitComment(ASTNode node) {
         visitElement(node);
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
index a9a810f9..a318e0db 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.codeEditor.Editor;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -41,8 +42,8 @@
 @ExtensionImpl
 public class JSSmartEnterProcessor extends SmartEnterProcessor {
     @Override
-    @RequiredReadAction
-    public boolean process(@Nonnull final Project project, @Nonnull final Editor editor, @Nonnull final PsiFile psiFile) {
+    @RequiredWriteAction
+    public boolean process(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiFile psiFile) {
         int offset = editor.getCaretModel().getOffset();
         PsiElement at = psiFile.findElementAt(offset);
         if (at == null && offset > 0) {
@@ -52,13 +53,13 @@ public boolean process(@Nonnull final Project project, @Nonnull final Editor edi
             return false;
         }
 
-        PsiElement element = at instanceof PsiWhiteSpace ? PsiTreeUtil.prevLeaf(at) : at;
+        PsiElement element = at instanceof PsiWhiteSpace whiteSpace ? PsiTreeUtil.prevLeaf(whiteSpace) : at;
 
         if (element != null && !(element instanceof PsiErrorElement)) {
-            final PsiElement nextMeaningfulElement = evalMeaningfulElement(at, true);
-            if (nextMeaningfulElement instanceof PsiErrorElement) {
-                element = nextMeaningfulElement;
-                offset = element.getTextOffset();
+            PsiElement nextMeaningfulElement = evalMeaningfulElement(at, true);
+            if (nextMeaningfulElement instanceof PsiErrorElement errorElement) {
+                element = errorElement;
+                offset = errorElement.getTextOffset();
             }
         }
 
@@ -89,7 +90,7 @@ public boolean process(@Nonnull final Project project, @Nonnull final Editor edi
             }
         }
 
-        final PsiElement prevMeaningfulElement = evalMeaningfulElement(element, false);
+        PsiElement prevMeaningfulElement = evalMeaningfulElement(element, false);
         if (element != null && !(element instanceof PsiErrorElement) && prevMeaningfulElement != null) {
             element = prevMeaningfulElement;
         }
@@ -101,9 +102,10 @@ public boolean process(@Nonnull final Project project, @Nonnull final Editor edi
 
             if (element.getParent() instanceof JSFunctionExpression) {
                 @SuppressWarnings("unchecked")
-                final JSElement base =
+                JSElement base =
                     PsiTreeUtil.getParentOfType(element, JSArgumentList.class, JSIndexedPropertyAccessExpression.class, JSStatement.class);
-                if (base instanceof JSStatement && base.getLastChild().getNode().getElementType() != JSTokenTypes.SEMICOLON) {
+                if (base instanceof JSStatement baseStatement
+                    && baseStatement.getLastChild().getNode().getElementType() != JSTokenTypes.SEMICOLON) {
                     semicolon = JSChangeUtil.getSemicolon(project);
                 }
             }
@@ -118,14 +120,14 @@ else if (JavaScriptLocalize.javascriptParserMessageExpectedLparen().equals(error
         return false;
     }
 
-    @RequiredReadAction
+    @RequiredWriteAction
     private void insertCommitReformat(
-        final Project project,
-        final Editor editor,
-        final PsiFile psiFile,
-        final int offset,
-        final String str,
-        final int shiftOffset,
+        Project project,
+        Editor editor,
+        PsiFile psiFile,
+        int offset,
+        String str,
+        int shiftOffset,
         boolean adjustLineIndent
     ) {
         editor.getDocument().insertString(offset, str);
@@ -134,7 +136,7 @@ private void insertCommitReformat(
 
         PsiElement at = psiFile.findElementAt(offset + shiftOffset - 1);
         @SuppressWarnings("unchecked")
-        final PsiElement parentOfType = PsiTreeUtil.getParentOfType(at, JSStatement.class, JSFunction.class, JSClass.class, JSFile.class);
+        PsiElement parentOfType = PsiTreeUtil.getParentOfType(at, JSStatement.class, JSFunction.class, JSClass.class, JSFile.class);
 
         reformat(parentOfType);
         if (adjustLineIndent) {
@@ -142,7 +144,8 @@ private void insertCommitReformat(
         }
     }
 
-    private static PsiElement evalMeaningfulElement(final PsiElement element, boolean forward) {
+    @RequiredReadAction
+    private static PsiElement evalMeaningfulElement(PsiElement element, boolean forward) {
         if (element == null) {
             return null;
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
index a4353e10..3a6aa70e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
@@ -33,14 +33,13 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiLanguageInjectionHost;
 import consulo.language.psi.util.PsiTreeUtil;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import consulo.xml.lang.xml.XMLLanguage;
 import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
- * Date: Apr 14, 2008
- * Time: 6:01:09 PM
+ * @since 2008-04-14
  */
 @ExtensionImpl
 public class JavaScriptCodeContextType extends BaseTemplateContextType {
@@ -55,7 +54,7 @@ public JavaScriptCodeContextType() {
     public boolean isInContext(@Nonnull TemplateActionContext context) {
         PsiFile file = context.getFile();
         int offset = context.getStartOffset();
-        
+
         PsiElement at = file.findElementAt(offset);
         if (at == null && offset == file.getTextLength()) {
             at = file.findElementAt(offset - 1);
@@ -63,17 +62,20 @@ public boolean isInContext(@Nonnull TemplateActionContext context) {
         Language language = at != null ? at.getParent().getLanguage() : null;
 
         if (language instanceof XMLLanguage) {
-            final PsiLanguageInjectionHost host = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class, false);
+            PsiLanguageInjectionHost host = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class, false);
 
             if (host != null) {
-                final Ref<Boolean> hasJsInjection = new Ref<>(Boolean.FALSE);
+                final SimpleReference<Boolean> hasJsInjection = new SimpleReference<>(Boolean.FALSE);
 
-                InjectedLanguageManager.getInstance(at.getProject()).enumerate(host, new JSResolveUtil.JSInjectedFilesVisitor() {
-                    @Override
-                    protected void process(final JSFile file) {
-                        hasJsInjection.set(Boolean.TRUE);
+                InjectedLanguageManager.getInstance(at.getProject()).enumerate(
+                    host,
+                    new JSResolveUtil.JSInjectedFilesVisitor() {
+                        @Override
+                        protected void process(JSFile file) {
+                            hasJsInjection.set(Boolean.TRUE);
+                        }
                     }
-                });
+                );
 
                 if (hasJsInjection.get()) {
                     language = JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
index 5ed820e6..48ac5f6d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
@@ -31,10 +31,9 @@
 @ExtensionImpl
 public class JavaScriptTargetElementUtilEx implements TargetElementUtilExtender {
     @Override
-    public boolean includeSelfInGotoImplementation(@Nonnull final PsiElement element) {
-        if (element instanceof JSFunction) {
-            final PsiElement parent = JSResolveUtil.findParent(element);
-            if (parent instanceof JSClass jsClass && jsClass.isInterface()) {
+    public boolean includeSelfInGotoImplementation(@Nonnull PsiElement element) {
+        if (element instanceof JSFunction function) {
+            if (JSResolveUtil.findParent(function) instanceof JSClass jsClass && jsClass.isInterface()) {
                 return false;
             }
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
index 3c4f5828..5bd8592c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
@@ -87,7 +87,7 @@ public String getDocumentationCommentSuffix() {
     }
 
     @Override
-    public boolean isDocumentationComment(final PsiComment element) {
+    public boolean isDocumentationComment(PsiComment element) {
         return element.getTokenType() == JSTokenTypes.DOC_COMMENT;
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
index be739b32..653f65f4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
@@ -63,7 +63,7 @@ public String getShortName() {
     }
 
     @Override
-    protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
+    protected JSElementVisitor createVisitor(ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
             @RequiredReadAction
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
index 0d7032fb..eb42a421 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
@@ -63,7 +63,7 @@ public String getShortName() {
     }
 
     @Override
-    protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
+    protected JSElementVisitor createVisitor(ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
             public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
index 9043095b..610b8871 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
@@ -46,6 +46,7 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.xml.ide.highlighter.XmlFileType;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -140,8 +141,8 @@ else if (element instanceof JSFunction function && function.isGetProperty()) {
                         List<LocalQuickFix> quickFixes = new ArrayList<>();
                         String refName = methodRefExpr.getReferencedName();
 
-                        if (myOnTheFly && ((qualifier == null || qualifier instanceof JSThisExpression)
-                            || JSUtils.isLHSExpression(qualifier))) {
+                        if (myOnTheFly
+                            && (qualifier == null || qualifier instanceof JSThisExpression || JSUtils.isLHSExpression(qualifier))) {
                             if (node.getMethodExpression().getParent() instanceof JSCallExpression) {
                                 boolean simpleJs = !JavaScriptVersionUtil.containsFeature(methodRefExpr, JavaScriptFeature.CLASS);
 
@@ -599,7 +600,7 @@ public String getFamilyName() {
         }
 
         @Override
-        @RequiredReadAction
+        @RequiredUIAccess
         public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
             PsiElement element = descriptor.getPsiElement();
             Editor editor = BaseCreateFix.getEditor(project, element.getContainingFile());
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
index 1765e1ac..1fb617f2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
@@ -155,8 +155,8 @@ protected void addReturnType(
 
                                         JSClass targetClass = contextClass;
 
-                                        if (qualifier instanceof JSReferenceExpression) {
-                                            JSClass clazz = JSResolveUtil.findClassOfQualifier(qualifier, containingFile);
+                                        if (qualifier instanceof JSReferenceExpression qualifierRefExpr) {
+                                            JSClass clazz = JSResolveUtil.findClassOfQualifier(qualifierRefExpr, containingFile);
                                             if (clazz != null) {
                                                 targetClass = clazz;
                                             }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
index 5663e8d1..117ff905 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
@@ -111,9 +111,9 @@ private static void process(JSNamedElement node, ProblemsHolder holder) {
         }
         PsiElement nameIdentifier = node.getNameIdentifier();
 
-        if (nameIdentifier != null &&
-            JSPsiImplUtils.getTypeFromDeclaration(node) == null &&
-            !(node instanceof JSParameter parameter && parameter.isRest())) {
+        if (nameIdentifier != null
+            && JSPsiImplUtils.getTypeFromDeclaration(node) == null
+            && !(node instanceof JSParameter parameter && parameter.isRest())) {
             LocalizeValue description = node instanceof JSFunction
                 ? JavaScriptLocalize.jsUntypedFunctionProblem(nameIdentifier.getText())
                 : JavaScriptLocalize.jsUntypedVariableProblem(nameIdentifier.getText());
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
index d3d0d5d4..4ede17ae 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
@@ -24,6 +24,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.inspection.*;
@@ -377,7 +378,7 @@ public String getFamilyName() {
         }
 
         @Override
-        @RequiredReadAction
+        @RequiredWriteAction
         public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
             try {
                 PsiElement element = descriptor.getPsiElement();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
index 1d9e7b55..72f9a78a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
@@ -34,48 +34,48 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.navigation.NavigationItem;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.popup.JBPopup;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JavaScriptGotoSuperHandler implements GotoSuperActionHander {
     @Override
-    public void invoke(final Project project, final Editor editor, final PsiFile file) {
-        final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
+    @RequiredUIAccess
+    public void invoke(Project project, Editor editor, PsiFile file) {
+        PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
         if (at == null) {
             return;
         }
         JSNamedElement namedElement = PsiTreeUtil.getParentOfType(at, JSNamedElement.class);
-        PsiElement parent = namedElement != null ? namedElement.getParent() : null;
 
-        if (namedElement instanceof JSDefinitionExpression && parent instanceof JSAssignmentExpression) {
-            PsiElement rOperand = ((JSAssignmentExpression)parent).getROperand();
-            if (rOperand instanceof JSFunctionExpression) {
-                namedElement = (JSNamedElement)rOperand;
+        if (namedElement instanceof JSDefinitionExpression definition
+            && definition.getParent() instanceof JSAssignmentExpression assignment) {
+            PsiElement rOperand = assignment.getROperand();
+            if (rOperand instanceof JSFunctionExpression functionExpr) {
+                namedElement = functionExpr;
             }
         }
 
-        if (namedElement instanceof JSFunction) {
-            final JSFunction function = (JSFunction)namedElement;
-            final String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
+        if (namedElement instanceof JSFunction function) {
+            String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
+
+            PsiElement parent = function.getParent();
 
             if (qName != null) {
-                if (parent instanceof JSFile) {
-                    JSClass xmlBackedClass = JSResolveUtil.getXmlBackedClass((JSFile)parent);
+                if (parent instanceof JSFile jsFile) {
+                    JSClass xmlBackedClass = JSResolveUtil.getXmlBackedClass(jsFile);
                     if (xmlBackedClass != null) {
                         parent = xmlBackedClass;
                     }
                 }
                 boolean result = JSResolveUtil.iterateType(
                     function,
-                    parent instanceof JSClass ? parent : parent.getContainingFile(),
+                    parent instanceof JSClass jsClass ? jsClass : parent.getContainingFile(),
                     qName,
-                    new JSResolveUtil.OverrideHandler() {
-                        @Override
-                        public boolean process(final ResolveProcessor processor, final PsiElement scope, final String className) {
-                            ((NavigationItem)processor.getResult()).navigate(true);
-                            return false;
-                        }
+                    (processor, scope, className) -> {
+                        ((NavigationItem)processor.getResult()).navigate(true);
+                        return false;
                     }
                 );
 
@@ -84,12 +84,12 @@ public boolean process(final ResolveProcessor processor, final PsiElement scope,
                 }
             }
 
-            if (parent instanceof JSClass) {
+            if (parent instanceof JSClass jsClass) {
                 JSResolveUtil.processInterfaceMethods(
-                    (JSClass)parent,
+                    jsClass,
                     new JSResolveUtil.CollectMethodsToImplementProcessor(function.getName(), function) {
                         @Override
-                        protected boolean process(final ResolveProcessor processor) {
+                        protected boolean process(ResolveProcessor processor) {
                             ((NavigationItem)processor.getResult()).navigate(true);
                             return true;
                         }
@@ -97,9 +97,8 @@ protected boolean process(final ResolveProcessor processor) {
                 );
             }
         }
-        else if (namedElement instanceof JSClass) {
-            final JSClass clazz = (JSClass)namedElement;
-            final JSClass[] classes = clazz.getSupers();
+        else if (namedElement instanceof JSClass jsClass) {
+            JSClass[] classes = jsClass.getSupers();
 
             if (classes.length == 0) {
                 return;
@@ -121,7 +120,7 @@ public boolean startInWriteAction() {
     }
 
     @Override
-    public boolean isValidFor(final Editor editor, final PsiFile file) {
+    public boolean isValidFor(Editor editor, PsiFile file) {
         return true;
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
index efbc9d22..288b6575 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseClassBasedIntroduceDialog.java
@@ -21,8 +21,10 @@
 
 import com.intellij.lang.javascript.psi.JSAttributeList;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 
 /**
  * @author ven
@@ -30,20 +32,17 @@
 public abstract class JSBaseClassBasedIntroduceDialog extends JSBaseIntroduceDialog {
     private static JSAttributeList.AccessType lastType;
 
-    protected JSBaseClassBasedIntroduceDialog(
-        final Project project,
-        final JSExpression[] occurences,
-        final JSExpression mainOccurence,
-        LocalizeValue title
-    ) {
+    @RequiredUIAccess
+    protected JSBaseClassBasedIntroduceDialog(Project project, JSExpression[] occurences, JSExpression mainOccurence, LocalizeValue title) {
         super(project, occurences, mainOccurence, title);
     }
 
     @Override
+    @RequiredReadAction
     protected void doInit() {
         super.doInit();
 
-        final ButtonGroup group = new ButtonGroup();
+        ButtonGroup group = new ButtonGroup();
         group.add(getPrivateRadioButton());
         group.add(getPublicRadioButton());
         group.add(getPackageLocalRadioButton());
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
index 3afb64ba..13698493 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.application.Application;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.Language;
@@ -32,10 +33,12 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.ui.ex.awt.Messages;
 import consulo.ui.ex.awt.util.Alarm;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
+import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 import java.awt.event.KeyAdapter;
@@ -53,10 +56,11 @@ public abstract class JSBaseIntroduceDialog extends DialogWrapper implements Bas
 
     private Alarm myAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
 
+    @RequiredUIAccess
     protected JSBaseIntroduceDialog(
-        final Project project,
-        final JSExpression[] occurences,
-        final JSExpression mainOccurence,
+        Project project,
+        JSExpression[] occurences,
+        JSExpression mainOccurence,
         LocalizeValue title
     ) {
         super(project, false);
@@ -67,6 +71,7 @@ protected JSBaseIntroduceDialog(
         setTitle(title);
     }
 
+    @RequiredReadAction
     protected void doInit() {
         JCheckBox replaceAllCheckBox = getReplaceAllCheckBox();
         if (myOccurences.length > 1) {
@@ -76,7 +81,7 @@ protected void doInit() {
             replaceAllCheckBox.setVisible(false);
         }
 
-        final JTextField nameField = getNameField();
+        JTextField nameField = getNameField();
         nameField.setText(suggestCandidateName(myMainOccurence));
         nameField.selectAll();
 
@@ -89,49 +94,46 @@ public void keyPressed(KeyEvent e) {
 
         replaceAllCheckBox.setFocusable(false);
 
-        final JComboBox typeField = getVarTypeField();
+        JComboBox typeField = getVarTypeField();
 
-        final List<String> possibleTypes = new ArrayList<String>();
-        final String type = JSResolveUtil.getExpressionType(myMainOccurence, myMainOccurence.getContainingFile());
+        List<String> possibleTypes = new ArrayList<>();
+        String type = JSResolveUtil.getExpressionType(myMainOccurence, myMainOccurence.getContainingFile());
         possibleTypes.add(type);
 
         typeField.setModel(new DefaultComboBoxModel(possibleTypes.toArray(new Object[possibleTypes.size()])));
 
         init();
 
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                initiateValidation();
-            }
-        });
+        SwingUtilities.invokeLater(this::initiateValidation);
     }
 
+    @RequiredReadAction
     protected String suggestCandidateName(JSExpression mainOccurence) {
-        final String s = evaluateCandidate(mainOccurence);
+        String s = evaluateCandidate(mainOccurence);
         return s != null ? s.replace('.', '_') : null;
     }
 
+    @RequiredReadAction
     private static String evaluateCandidate(JSExpression mainOccurence) {
-        if (mainOccurence instanceof JSCallExpression) {
-            mainOccurence = ((JSCallExpression)mainOccurence).getMethodExpression();
+        if (mainOccurence instanceof JSCallExpression call) {
+            mainOccurence = call.getMethodExpression();
         }
 
-        if (mainOccurence instanceof JSReferenceExpression) {
-            final ResolveResult[] results = ((JSReferenceExpression)mainOccurence).multiResolve(false);
+        if (mainOccurence instanceof JSReferenceExpression refExpr) {
+            ResolveResult[] results = refExpr.multiResolve(false);
 
             if (results.length > 0) {
-                final PsiElement element = results[0].getElement();
+                PsiElement element = results[0].getElement();
 
-                if (element instanceof JSFunction) {
-                    String typeString = ((JSFunction)element).getReturnTypeString();
+                if (element instanceof JSFunction function) {
+                    String typeString = function.getReturnTypeString();
                     if (isValidIdentifier(typeString, mainOccurence)) {
                         return typeString;
                     }
-                    return ((JSFunction)element).getName();
+                    return function.getName();
                 }
-                else if (element instanceof JSVariable) {
-                    String typeString = ((JSVariable)element).getTypeString();
+                else if (element instanceof JSVariable variable) {
+                    String typeString = variable.getTypeString();
                     if (isValidIdentifier(typeString, mainOccurence)) {
                         return typeString;
                     }
@@ -151,6 +153,7 @@ else if (mainOccurence.getParent() instanceof JSArgumentList) {
         return JSResolveUtil.getExpressionType(mainOccurence, mainOccurence.getContainingFile());
     }
 
+    @RequiredReadAction
     private static boolean isValidIdentifier(String typeString, PsiElement context) {
         if (typeString == null) {
             return false;
@@ -167,16 +170,18 @@ private static boolean isValidIdentifier(String typeString, PsiElement context)
 
     private void initiateValidation() {
         myAlarm.cancelAllRequests();
-        myAlarm.addRequest(new Runnable() {
-            @Override
-            public void run() {
+        myAlarm.addRequest(
+            () -> {
                 final String nameCandidate = getNameField().getText();
                 setOKActionEnabled(nameCandidate.length() != 0 && isValidName(nameCandidate));
-            }
-        }, 100, Application.get().getCurrentModalityState());
+            },
+            100,
+            Application.get().getCurrentModalityState()
+        );
     }
 
     @Override
+    @RequiredUIAccess
     public JComponent getPreferredFocusedComponent() {
         return getNameField();
     }
@@ -187,8 +192,9 @@ protected JComponent createCenterPanel() {
     }
 
     @Override
+    @RequiredUIAccess
     protected void doOKAction() {
-        final String name = getVariableName();
+        String name = getVariableName();
         if (name.length() == 0 || !isValidName(name)) {
             Messages.showErrorDialog(
                 myProject,
@@ -206,23 +212,25 @@ protected void doOKAction() {
         super.doOKAction();
     }
 
-    private boolean checkConflicts(final String name) {
+    @RequiredUIAccess
+    private boolean checkConflicts(String name) {
         PsiElement tmp = isReplaceAllOccurences() ? PsiTreeUtil.findCommonParent(myOccurences) : myMainOccurence;
         assert tmp != null;
         JSElement scope = PsiTreeUtil.getNonStrictParentOfType(tmp, JSBlockStatement.class, JSFile.class, JSEmbeddedContentImpl.class);
         assert scope != null;
 
-        final Ref<JSNamedElement> existing = new Ref<JSNamedElement>();
+        final SimpleReference<JSNamedElement> existing = new SimpleReference<>();
         scope.accept(new JSElementVisitor() {
             @Override
-            public void visitJSElement(final JSElement node) {
+            public void visitJSElement(@Nonnull JSElement node) {
                 if (existing.isNull()) {
                     node.acceptChildren(this);
                 }
             }
 
             @Override
-            public void visitJSVariable(final JSVariable node) {
+            @RequiredReadAction
+            public void visitJSVariable(@Nonnull JSVariable node) {
                 if (name.equals(node.getName())) {
                     existing.set(node);
                 }
@@ -230,7 +238,8 @@ public void visitJSVariable(final JSVariable node) {
             }
 
             @Override
-            public void visitJSFunctionDeclaration(final JSFunction node) {
+            @RequiredReadAction
+            public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
                 if (name.equals(node.getName())) {
                     existing.set(node);
                 }
@@ -239,26 +248,23 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
         });
 
         if (existing.isNull()) {
-            final ResolveProcessor processor = new ResolveProcessor(name);
+            ResolveProcessor processor = new ResolveProcessor(name);
             JSResolveUtil.treeWalkUp(processor, scope, null, scope);
-            final PsiElement resolved = processor.getResult();
-            if (resolved instanceof JSNamedElement) {
-                existing.set((JSNamedElement)resolved);
+            PsiElement resolved = processor.getResult();
+            if (resolved instanceof JSNamedElement namedElement) {
+                existing.set(namedElement);
             }
         }
 
-        if (!existing.isNull()) {
-            return showConflictsDialog(existing.get(), name);
-        }
-
-        return true;
+        return existing.isNull() || showConflictsDialog(existing.get(), name);
     }
 
-    private boolean showConflictsDialog(final JSNamedElement existing, final String name) {
-        final LocalizeValue message = existing instanceof JSFunction
+    @RequiredUIAccess
+    private boolean showConflictsDialog(JSNamedElement existing, String name) {
+        LocalizeValue message = existing instanceof JSFunction
             ? JavaScriptLocalize.javascriptIntroduceVariableFunctionAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name))
             : JavaScriptLocalize.javascriptIntroduceVariableVariableAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name));
-        final ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, message.get());
+        ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, message.get());
         conflictsDialog.show();
         return conflictsDialog.isOK();
     }
@@ -278,8 +284,8 @@ public String getVariableType() {
         return (String)getVarTypeField().getSelectedItem();
     }
 
-    private boolean isValidName(final String name) {
-        final PsiFile containingFile = myMainOccurence.getContainingFile();
+    private boolean isValidName(String name) {
+        PsiFile containingFile = myMainOccurence.getContainingFile();
         return NamesValidator.forLanguage(containingFile.getLanguage()).isIdentifier(name, myProject);
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
index e60c5d41..a2c12284 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
@@ -21,7 +21,8 @@
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
-import consulo.application.ApplicationManager;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.codeEditor.Editor;
 import consulo.codeEditor.EditorColors;
 import consulo.codeEditor.markup.RangeHighlighter;
@@ -44,11 +45,11 @@
 import consulo.logging.Logger;
 import consulo.project.Project;
 import consulo.project.ui.wm.WindowManager;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.undoRedo.CommandProcessor;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,14 +62,15 @@ public abstract class JSBaseIntroduceHandler<T extends JSElement, S extends Base
 
     protected static final Logger LOG = Logger.getInstance("#com.intellij.lang.javascript.refactoring.JSBaseIntroduceHandler");
 
+    @RequiredReadAction
     protected static JSExpression findExpressionInRange(PsiFile file, int startOffset, int endOffset) {
         PsiElement element1 = file.findElementAt(startOffset);
         PsiElement element2 = file.findElementAt(endOffset - 1);
-        if (element1 instanceof PsiWhiteSpace) {
-            startOffset = element1.getTextRange().getEndOffset();
+        if (element1 instanceof PsiWhiteSpace whiteSpace) {
+            startOffset = whiteSpace.getTextRange().getEndOffset();
         }
-        if (element2 instanceof PsiWhiteSpace) {
-            endOffset = element2.getTextRange().getStartOffset();
+        if (element2 instanceof PsiWhiteSpace whiteSpace) {
+            endOffset = whiteSpace.getTextRange().getStartOffset();
         }
 
         JSExpression expression = PsiTreeUtil.findElementOfClassAtRange(file, startOffset, endOffset, JSExpression.class);
@@ -82,7 +84,7 @@ protected static JSExpression findExpressionInRange(PsiFile file, int startOffse
             return null;
         }
 
-        if (expression instanceof JSReferenceExpression && expression.getParent() instanceof JSCallExpression) {
+        if (expression instanceof JSReferenceExpression refExpr && refExpr.getParent() instanceof JSCallExpression) {
             return null;
         }
         /*if (file.getLanguage() == JavaScriptSupportLoader.JSON) {
@@ -92,30 +94,32 @@ protected static JSExpression findExpressionInRange(PsiFile file, int startOffse
     }
 
     protected static JSExpression unparenthesize(JSExpression expression) {
-        while (expression instanceof JSParenthesizedExpression) {
-            expression = ((JSParenthesizedExpression)expression).getInnerExpression();
+        while (expression instanceof JSParenthesizedExpression parenthesized) {
+            expression = parenthesized.getInnerExpression();
         }
 
         return expression;
     }
 
+    @RequiredReadAction
     public static JSExpression[] findExpressionOccurrences(JSElement scope, JSExpression expr) {
-        List<JSExpression> array = new ArrayList<JSExpression>();
+        List<JSExpression> array = new ArrayList<>();
         addExpressionOccurrences(unparenthesize(expr), array, scope);
         return array.toArray(new JSExpression[array.size()]);
     }
 
+    @RequiredReadAction
     protected static void addExpressionOccurrences(JSExpression expr, List<JSExpression> array, PsiElement scope) {
         PsiElement[] children = scope.getChildren();
 
         for (PsiElement child : children) {
-            if (child instanceof JSExpression) {
-                final JSExpression childExpression = unparenthesize((JSExpression)child);
+            if (child instanceof JSExpression childExpr) {
+                JSExpression childUnparenExpr = unparenthesize(childExpr);
 
-                if (childExpression != null
-                    && PsiEquivalenceUtil.areElementsEquivalent(childExpression, expr)
-                    && !JSResolveUtil.isSelfReference(scope, child)) {
-                    array.add((JSExpression)child);
+                if (childUnparenExpr != null
+                    && PsiEquivalenceUtil.areElementsEquivalent(childUnparenExpr, expr)
+                    && !JSResolveUtil.isSelfReference(scope, childExpr)) {
+                    array.add(childExpr);
                     continue;
                 }
             }
@@ -127,14 +131,15 @@ protected static void addExpressionOccurrences(JSExpression expr, List<JSExpress
     }
 
     @Override
-    public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file, DataContext dataContext) {
+    @RequiredWriteAction
+    public void invoke(@Nonnull Project project, Editor editor, PsiFile file, DataContext dataContext) {
         if (!editor.getSelectionModel().hasSelection()) {
             editor.getSelectionModel().selectLineAtCaret();
         }
         int start = editor.getSelectionModel().getSelectionStart();
         int end = editor.getSelectionModel().getSelectionEnd();
 
-        final JSExpression expression = findIntroducedExpression(file, start, end, editor);
+        JSExpression expression = findIntroducedExpression(file, start, end, editor);
         if (expression == null) {
             return;
         }
@@ -146,20 +151,17 @@ public void invoke(@Nonnull final Project project, final Editor editor, PsiFile
         editor.getSelectionModel().removeSelection();
         JSElement scope = findIntroducedScope(expression);
         LOG.assertTrue(scope != null);
-        final JSExpression[] occurrences = findExpressionOccurrences(scope, expression);
-        final S settings = getSettings(project, editor, expression, occurrences);
+        JSExpression[] occurrences = findExpressionOccurrences(scope, expression);
+        S settings = getSettings(project, editor, expression, occurrences);
         if (settings == null) {
             return;
         }
 
-        CommandProcessor.getInstance().executeCommand(
-            project,
-            () -> ApplicationManager.getApplication().runWriteAction(
-                () -> doRefactoring(project, editor, new BaseIntroduceContext<>(expression, occurrences, settings))
-            ),
-            getRefactoringName(),
-            null
-        );
+        CommandProcessor.getInstance().newCommand()
+            .project(project)
+            .name(LocalizeValue.ofNullable(getRefactoringName()))
+            .inWriteAction()
+            .run(() -> doRefactoring(project, editor, new BaseIntroduceContext<>(expression, occurrences, settings)));
     }
 
     protected static final class BaseIntroduceContext<S> {
@@ -167,14 +169,14 @@ protected static final class BaseIntroduceContext<S> {
         final JSExpression[] occurences;
         public final JSExpression expression;
 
-        public BaseIntroduceContext(JSExpression _mainoccurence, final JSExpression[] _occurences, S _settings) {
+        public BaseIntroduceContext(JSExpression _mainoccurence, JSExpression[] _occurences, S _settings) {
             occurences = _occurences;
             expression = _mainoccurence;
             settings = _settings;
         }
     }
 
-    protected JSElement findIntroducedScope(final JSExpression expression) {
+    protected JSElement findIntroducedScope(JSExpression expression) {
         return PsiTreeUtil.getParentOfType(expression, JSFunction.class, JSFile.class, JSEmbeddedContentImpl.class);
     }
 
@@ -183,8 +185,9 @@ protected JSElement findIntroducedScope(final JSExpression expression) {
     protected abstract LocalizeValue getCannotIntroduceMessage();
 
     @Nullable
-    protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor) {
-        final JSExpression expression = findExpressionInRange(file, start, end);
+    @RequiredUIAccess
+    protected JSExpression findIntroducedExpression(PsiFile file, int start, int end, Editor editor) {
+        JSExpression expression = findExpressionInRange(file, start, end);
         if (expression == null) {
             CommonRefactoringUtil.showErrorHint(
                 file.getProject(),
@@ -198,13 +201,14 @@ protected JSExpression findIntroducedExpression(final PsiFile file, final int st
     }
 
     @Nullable
-    protected S getSettings(Project project, Editor editor, JSExpression expression, final JSExpression[] occurrences) {
+    @RequiredUIAccess
+    protected S getSettings(Project project, Editor editor, JSExpression expression, JSExpression[] occurrences) {
         ArrayList<RangeHighlighter> highlighters = null;
         if (occurrences.length > 1) {
             highlighters = highlightOccurences(project, editor, occurrences);
         }
 
-        final D dialog = createDialog(project, expression, occurrences);
+        D dialog = createDialog(project, expression, occurrences);
         dialog.show();
         if (highlighters != null) {
             for (RangeHighlighter highlighter : highlighters) {
@@ -219,21 +223,24 @@ protected S getSettings(Project project, Editor editor, JSExpression expression,
         return createSettings(dialog);
     }
 
-    protected S createSettings(final D dialog) {
+    @SuppressWarnings("unchecked")
+    protected S createSettings(D dialog) {
         return (S)dialog;
     }
 
-    protected abstract D createDialog(final Project project, final JSExpression expression, final JSExpression[] occurrences);
+    protected abstract D createDialog(Project project, JSExpression expression, JSExpression[] occurrences);
 
-    private void doRefactoring(final Project project, final Editor editor, BaseIntroduceContext<S> introduceContext) {
-        final S settings = introduceContext.settings;
+    @RequiredWriteAction
+    @SuppressWarnings("unchecked")
+    private void doRefactoring(Project project, Editor editor, BaseIntroduceContext<S> introduceContext) {
+        S settings = introduceContext.settings;
         JSExpression expression = introduceContext.expression;
-        final JSExpression[] occurrences = introduceContext.occurences;
+        JSExpression[] occurrences = introduceContext.occurences;
 
-        final boolean replaceAllOccurences = settings.isReplaceAllOccurences();
-        @NonNls String varDeclText = getDeclText(settings);
-        final PsiFile containingFile = expression.getContainingFile();
-        final boolean ecma = false;
+        boolean replaceAllOccurences = settings.isReplaceAllOccurences();
+        String varDeclText = getDeclText(settings);
+        PsiFile containingFile = expression.getContainingFile();
+        boolean ecma = false;
         if (ecma) {
             String type = settings.getVariableType();
             if (type == null) {
@@ -250,24 +257,24 @@ private void doRefactoring(final Project project, final Editor editor, BaseIntro
 
             boolean replacedOriginal = false;
 
-            if (anchorStatement == expression.getParent() && anchorStatement instanceof JSExpressionStatement) {
-                declaration = (JSVarStatement)anchorStatement.replace(declaration);
+            if (anchorStatement == expression.getParent() && anchorStatement instanceof JSExpressionStatement anchorExpression) {
+                declaration = (JSVarStatement)anchorExpression.replace(declaration);
                 editor.getCaretModel().moveToOffset(declaration.getTextRange().getEndOffset());
                 replacedOriginal = true;
             }
             else {
                 JSExpression oldExpression = expression;
-                final TextRange expressionTextRange = expression.getTextRange();
-                final TextRange statementTextRange = anchorStatement.getTextRange();
+                TextRange expressionTextRange = expression.getTextRange();
+                TextRange statementTextRange = anchorStatement.getTextRange();
 
                 RangeMarker marker = editor.getDocument().createRangeMarker(expressionTextRange);
 
                 // Adding declaration to anchorStatement may invalidate original expression so we need to find it in new tree
-                final T jsStatement = addStatementBefore(anchorStatement, declaration);
+                T jsStatement = addStatementBefore(anchorStatement, declaration);
 
                 if (!expression.isValid()) {
-                    final T newAnchorStatement = (T)PsiTreeUtil.getNextSiblingOfType(jsStatement, anchorStatement.getClass());
-                    final int relativeOffset = marker.getStartOffset() - statementTextRange.getStartOffset();
+                    T newAnchorStatement = (T)PsiTreeUtil.getNextSiblingOfType(jsStatement, anchorStatement.getClass());
+                    int relativeOffset = marker.getStartOffset() - statementTextRange.getStartOffset();
                     JSExpression newExpression =
                         PsiTreeUtil.getParentOfType(newAnchorStatement.findElementAt(relativeOffset), oldExpression.getClass());
 
@@ -299,7 +306,7 @@ private void doRefactoring(final Project project, final Editor editor, BaseIntro
                 }
             }
 
-            final JSExpression refExpr = JSChangeUtil.createExpressionFromText(project, settings.getVariableName());
+            JSExpression refExpr = JSChangeUtil.createExpressionFromText(project, settings.getVariableName());
             if (replaceAllOccurences) {
                 List<JSExpression> toHighight = new ArrayList<>();
                 for (JSExpression occurence : occurrences) {
@@ -322,7 +329,8 @@ else if (!replacedOriginal) {
         }
     }
 
-    protected JSVarStatement prepareDeclaration(final String varDeclText, BaseIntroduceContext<S> context, final Project project)
+    @RequiredWriteAction
+    protected JSVarStatement prepareDeclaration(String varDeclText, BaseIntroduceContext<S> context, Project project)
         throws IncorrectOperationException {
         JSVarStatement declaration = (JSVarStatement)JSChangeUtil.createStatementFromText(
             project,
@@ -332,24 +340,25 @@ protected JSVarStatement prepareDeclaration(final String varDeclText, BaseIntrod
         return declaration;
     }
 
-    @NonNls
     protected String getDeclText(S settings) {
         return "var " + settings.getVariableName();
     }
 
-    protected T addStatementBefore(final T anchorStatement, final JSVarStatement declaration) throws IncorrectOperationException {
+    @RequiredWriteAction
+    @SuppressWarnings("unchecked")
+    protected T addStatementBefore(T anchorStatement, JSVarStatement declaration) throws IncorrectOperationException {
         return (T)((JSStatement)anchorStatement).addStatementBefore(declaration);
     }
 
-    protected T findAnchor(final BaseIntroduceContext<S> context, final boolean replaceAllOccurences) {
-        JSStatement anchorStatement = replaceAllOccurences ? getAnchorToInsert(context.occurences) : PsiTreeUtil.getParentOfType(
-            context.expression,
-            JSStatement.class
-        );
-        if (anchorStatement instanceof JSVarStatement &&
-            anchorStatement.getParent() instanceof JSStatement &&
-            !(anchorStatement.getParent() instanceof JSBlockStatement)) {
-            anchorStatement = (JSStatement)anchorStatement.getParent();
+    @SuppressWarnings("unchecked")
+    protected T findAnchor(BaseIntroduceContext<S> context, boolean replaceAllOccurences) {
+        JSStatement anchorStatement = replaceAllOccurences
+            ? getAnchorToInsert(context.occurences)
+            : PsiTreeUtil.getParentOfType(context.expression, JSStatement.class);
+        if (anchorStatement instanceof JSVarStatement varStatement
+            && varStatement.getParent() instanceof JSStatement statement
+            && !(statement instanceof JSBlockStatement)) {
+            anchorStatement = statement;
         }
         return (T)anchorStatement;
     }
@@ -364,14 +373,14 @@ private static ArrayList<RangeHighlighter> highlightOccurences(Project project,
         return result;
     }
 
-    private static JSStatement getAnchorToInsert(final JSExpression[] expressions) {
+    private static JSStatement getAnchorToInsert(JSExpression[] expressions) {
         JSElement place = expressions[0];
         next:
         do {
             JSStatement statement = PsiTreeUtil.getParentOfType(place, JSStatement.class); //this is the first expression textually
             LOG.assertTrue(statement != null);
 
-            final PsiElement parent = statement.getParent();
+            PsiElement parent = statement.getParent();
             for (JSExpression expression : expressions) {
                 if (!PsiTreeUtil.isAncestor(parent, expression, true)) {
                     place = statement;
@@ -384,10 +393,10 @@ private static JSStatement getAnchorToInsert(final JSExpression[] expressions) {
         while (true);
     }
 
-    protected static JSElement findClassAnchor(final PsiElement expression) {
+    protected static JSElement findClassAnchor(PsiElement expression) {
         PsiElement nearestParent = PsiTreeUtil.getParentOfType(expression, JSVarStatement.class, JSFunction.class);
         while (nearestParent != null) {
-            final PsiElement nextParent = PsiTreeUtil.getParentOfType(nearestParent, JSVarStatement.class, JSFunction.class);
+            PsiElement nextParent = PsiTreeUtil.getParentOfType(nearestParent, JSVarStatement.class, JSFunction.class);
             if (nextParent == null) {
                 break;
             }
@@ -400,28 +409,24 @@ protected static JSElement findClassAnchor(final PsiElement expression) {
 
         JSElement parent = PsiTreeUtil.getParentOfType(expression, JSFile.class, JSClass.class);
 
-        if (parent instanceof JSFile) {
-            final PsiElement classRef = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
-            if (classRef instanceof JSClass jsClass) {
-                parent = jsClass;
-            }
+        if (parent instanceof JSFile jsFile && JSResolveUtil.getClassReferenceForXmlFromContext(jsFile) instanceof JSClass jsClass) {
+            parent = jsClass;
         }
 
         return parent;
     }
 
-    protected static JSElement addToClassAnchor(
-        final JSElement anchorStatement,
-        final JSVarStatement declaration
-    ) throws IncorrectOperationException {
+    @RequiredWriteAction
+    protected static JSElement addToClassAnchor(JSElement anchorStatement, JSVarStatement declaration) throws IncorrectOperationException {
         if (!(anchorStatement instanceof JSClass)) {
-            final JSElement element = findClassAnchor(anchorStatement);
+            JSElement element = findClassAnchor(anchorStatement);
             return (JSElement)element.addBefore(declaration, anchorStatement);
         }
         return (JSElement)anchorStatement.add(declaration);
     }
 
     @Override
+    @RequiredUIAccess
     public void invoke(@Nonnull Project project, @Nonnull PsiElement[] elements, DataContext dataContext) {
         throw new RuntimeException("Not implemented");
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java
index 86d9beb1..6fed157e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSNamesValidator.java
@@ -24,11 +24,8 @@
 import consulo.language.editor.refactoring.NamesValidator;
 
 /**
- * Created by IntelliJ IDEA.
- * User: Maxim.Mossienko
- * Date: Jun 27, 2006
- * Time: 8:28:35 PM
- * To change this template use File | Settings | File Templates.
+ * @author Maxim.Mossienko
+ * @since 2006-06-27
  */
 abstract class JSNamesValidator implements NamesValidator {
     protected final Lexer myLexer;
@@ -37,7 +34,7 @@ abstract class JSNamesValidator implements NamesValidator {
         myLexer = createLexer(optionHolder);
     }
 
-    protected Lexer createLexer(final DialectOptionHolder optionHolder) {
+    protected Lexer createLexer(DialectOptionHolder optionHolder) {
         return new JSFlexAdapter(false, optionHolder);
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
index ba1980db..8676d7ec 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
@@ -24,6 +24,7 @@
 import com.intellij.lang.javascript.impl.refactoring.introduceField.JSIntroduceFieldHandler;
 import com.intellij.lang.javascript.impl.refactoring.introduceVariable.JSIntroduceVariableHandler;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
@@ -37,6 +38,7 @@
 @ExtensionImpl
 public class JavascriptRefactoringSupportProvider extends RefactoringSupportProvider {
     @Override
+    @RequiredReadAction
     public boolean isSafeDeleteAvailable(PsiElement element) {
         boolean simpleElement = element instanceof JSFunction
             || element instanceof JSVariable
@@ -71,7 +73,7 @@ public RefactoringActionHandler getIntroduceFieldHandler() {
 
     @Override
     public boolean isInplaceRenameAvailable(PsiElement element, PsiElement context) {
-        return element instanceof JSNamedElement && element.getUseScope() instanceof LocalSearchScope;
+        return element instanceof JSNamedElement namedElement && namedElement.getUseScope() instanceof LocalSearchScope;
     }
 
     @Nonnull
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
index 1d560f59..602ae5a7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
@@ -18,6 +18,7 @@
 
 import com.intellij.lang.javascript.impl.refactoring.JSBaseClassBasedIntroduceDialog;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.project.Project;
 
@@ -25,8 +26,7 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 24, 2008
- * Time: 8:48:34 PM
+ * @since 2008-07-24
  */
 class JSIntroduceConstantDialog extends JSBaseClassBasedIntroduceDialog implements JSIntroduceConstantSettings {
     private JTextField myNameField;
@@ -38,7 +38,7 @@ class JSIntroduceConstantDialog extends JSBaseClassBasedIntroduceDialog implemen
     private JRadioButton myPublic;
     private JComboBox myVarType;
 
-    protected JSIntroduceConstantDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence) {
+    protected JSIntroduceConstantDialog(Project project, JSExpression[] occurences, JSExpression mainOccurence) {
         super(project, occurences, mainOccurence, JavaScriptLocalize.javascriptIntroduceConstantTitle());
 
         doInit();
@@ -85,7 +85,8 @@ public JComboBox getVarTypeField() {
     }
 
     @Override
-    protected String suggestCandidateName(final JSExpression mainOccurence) {
+    @RequiredReadAction
+    protected String suggestCandidateName(JSExpression mainOccurence) {
         return super.suggestCandidateName(mainOccurence).toUpperCase();
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
index fb6a6e44..dacf8c47 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
@@ -19,6 +19,8 @@
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
 import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.codeEditor.Editor;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
@@ -27,13 +29,13 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import consulo.util.lang.ref.Ref;
-import org.jetbrains.annotations.NonNls;
+import consulo.ui.annotation.RequiredUIAccess;
+import consulo.util.lang.ref.SimpleReference;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
- * Date: May 29, 2008
- * Time: 8:20:03 PM
+ * @since 2008-05-29
  */
 public class JSIntroduceConstantHandler extends JSBaseIntroduceHandler<JSElement, JSIntroduceConstantSettings, JSIntroduceConstantDialog> {
     @Override
@@ -47,17 +49,13 @@ protected LocalizeValue getCannotIntroduceMessage() {
     }
 
     @Override
-    protected JSIntroduceConstantDialog createDialog(
-        final Project project,
-        final JSExpression expression,
-        final JSExpression[] occurrences
-    ) {
+    protected JSIntroduceConstantDialog createDialog(Project project, JSExpression expression, JSExpression[] occurrences) {
         return new JSIntroduceConstantDialog(project, occurrences, expression);
     }
 
     @Override
-    protected String getDeclText(final JSIntroduceConstantSettings settings) {
-        @NonNls String baseDeclText = "static const " + settings.getVariableName();
+    protected String getDeclText(JSIntroduceConstantSettings settings) {
+        String baseDeclText = "static const " + settings.getVariableName();
         final JSAttributeList.AccessType type = settings.getAccessType();
         if (type != JSAttributeList.AccessType.PACKAGE_LOCAL) {
             baseDeclText = type.toString().toLowerCase() + " " + baseDeclText;
@@ -67,20 +65,19 @@ protected String getDeclText(final JSIntroduceConstantSettings settings) {
     }
 
     @Override
-    protected JSElement findAnchor(final BaseIntroduceContext<JSIntroduceConstantSettings> context, final boolean replaceAllOccurences) {
+    protected JSElement findAnchor(BaseIntroduceContext<JSIntroduceConstantSettings> context, boolean replaceAllOccurences) {
         return findClassAnchor(context.expression);
     }
 
     @Override
-    protected JSElement addStatementBefore(
-        final JSElement anchorStatement,
-        final JSVarStatement declaration
-    ) throws IncorrectOperationException {
+    @RequiredWriteAction
+    protected JSElement addStatementBefore(JSElement anchorStatement, JSVarStatement declaration) throws IncorrectOperationException {
         return addToClassAnchor(anchorStatement, declaration);
     }
 
     @Override
-    protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor) {
+    @RequiredUIAccess
+    protected JSExpression findIntroducedExpression(PsiFile file, int start, int end, Editor editor) {
         if (file.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
             CommonRefactoringUtil.showErrorHint(
                 file.getProject(),
@@ -92,20 +89,21 @@ protected JSExpression findIntroducedExpression(final PsiFile file, final int st
             return null;
         }
 
-        final JSExpression expression = super.findIntroducedExpression(file, start, end, editor);
+        JSExpression expression = super.findIntroducedExpression(file, start, end, editor);
         if (expression == null) {
             return null;
         }
 
-        final Ref<Boolean> hasAccesibilityProblem = new Ref<Boolean>();
+        final SimpleReference<Boolean> hasAccesibilityProblem = new SimpleReference<>();
         expression.accept(new JSElementVisitor() {
             @Override
-            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+            @RequiredReadAction
+            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
                 if (node.getQualifier() == null) {
-                    final PsiElement element = node.resolve();
+                    PsiElement element = node.resolve();
 
-                    if (element instanceof JSAttributeListOwner && !(element instanceof JSClass)) {
-                        final JSAttributeList attributeList = ((JSAttributeListOwner)element).getAttributeList();
+                    if (element instanceof JSAttributeListOwner attributeListOwner && !(element instanceof JSClass)) {
+                        JSAttributeList attributeList = attributeListOwner.getAttributeList();
                         if (attributeList == null || !attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
                             hasAccesibilityProblem.set(Boolean.TRUE);
                         }
@@ -118,7 +116,7 @@ else if (element == null) {
             }
 
             @Override
-            public void visitJSElement(final JSElement node) {
+            public void visitJSElement(@Nonnull JSElement node) {
                 node.acceptChildren(this);
             }
         });
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
index 22f7cefd..7d66126f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
@@ -19,20 +19,22 @@
 import com.intellij.lang.javascript.formatter.JSCodeStyleSettings;
 import com.intellij.lang.javascript.impl.refactoring.JSBaseClassBasedIntroduceDialog;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.codeStyle.CodeStyleSettingsManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.ResolveResult;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.util.lang.StringUtil;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
+import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 24, 2008
- * Time: 8:46:13 PM
+ * @author 2008-07-24
  */
 class JSIntroduceFieldDialog extends JSBaseClassBasedIntroduceDialog implements JSIntroduceFieldSettings {
     private JCheckBox myReplaceAllCheckBox;
@@ -50,27 +52,30 @@ class JSIntroduceFieldDialog extends JSBaseClassBasedIntroduceDialog implements
 
     private static InitializationPlace lastInitializationPlace = InitializationPlace.FieldDeclaration;
 
-    public JSIntroduceFieldDialog(final Project project, final JSExpression[] occurrences, final JSExpression expression) {
+    @RequiredUIAccess
+    public JSIntroduceFieldDialog(Project project, JSExpression[] occurrences, JSExpression expression) {
         super(project, occurrences, expression, JavaScriptLocalize.javascriptIntroduceFieldTitle());
         doInit();
     }
 
     @Override
+    @RequiredReadAction
     protected void doInit() {
         super.doInit();
 
-        final Ref<Boolean> localContextDependent = new Ref<Boolean>();
+        final SimpleReference<Boolean> localContextDependent = new SimpleReference<>();
         myMainOccurence.accept(new JSElementVisitor() {
             @Override
-            public void visitJSReferenceExpression(final JSReferenceExpression node) {
+            @RequiredReadAction
+            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
                 if (node.getQualifier() == null) {
-                    final ResolveResult[] results = node.multiResolve(true);
+                    ResolveResult[] results = node.multiResolve(true);
                     if (results.length == 0) {
                         localContextDependent.set(Boolean.TRUE);
                     }
                     else {
-                        final PsiElement element = results[0].getElement();
-                        if (element instanceof JSVariable && !(element.getParent().getParent() instanceof JSClass)) {
+                        PsiElement element = results[0].getElement();
+                        if (element instanceof JSVariable variable && !(variable.getParent().getParent() instanceof JSClass)) {
                             localContextDependent.set(Boolean.TRUE);
                         }
                     }
@@ -79,7 +84,7 @@ public void visitJSReferenceExpression(final JSReferenceExpression node) {
             }
 
             @Override
-            public void visitJSElement(final JSElement node) {
+            public void visitJSElement(@Nonnull JSElement node) {
                 node.acceptChildren(this);
             }
         });
@@ -147,16 +152,18 @@ public InitializationPlace getInitializationPlace() {
     }
 
     @Override
+    @RequiredUIAccess
     protected void doOKAction() {
         super.doOKAction();
         lastInitializationPlace = getInitializationPlace();
     }
 
     @Override
-    protected String suggestCandidateName(final JSExpression mainOccurence) {
-        final String s = super.suggestCandidateName(mainOccurence);
-        final JSCodeStyleSettings jsCodeStyleSettings = CodeStyleSettingsManager.getSettings(mainOccurence.getProject()).getCustomSettings
-            (JSCodeStyleSettings.class);
+    @RequiredReadAction
+    protected String suggestCandidateName(JSExpression mainOccurence) {
+        String s = super.suggestCandidateName(mainOccurence);
+        JSCodeStyleSettings jsCodeStyleSettings = CodeStyleSettingsManager.getSettings(mainOccurence.getProject())
+            .getCustomSettings(JSCodeStyleSettings.class);
         if (jsCodeStyleSettings.FIELD_PREFIX.length() > 0) {
             return jsCodeStyleSettings.FIELD_PREFIX + s;
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
index 0440d94c..d045fb06 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
@@ -21,6 +21,7 @@
 import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceHandler;
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.codeEditor.Editor;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.codeStyle.CodeStyleManager;
@@ -31,13 +32,12 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.xml.psi.xml.XmlFile;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author Maxim.Mossienko
- * Date: May 29, 2008
- * Time: 8:20:03 PM
+ * @since 2008-05-29
  */
 public class JSIntroduceFieldHandler extends JSBaseIntroduceHandler<JSElement, JSIntroduceFieldSettings, JSIntroduceFieldDialog> {
     @Override
@@ -51,27 +51,26 @@ protected LocalizeValue getCannotIntroduceMessage() {
     }
 
     @Override
-    protected JSIntroduceFieldDialog createDialog(final Project project, final JSExpression expression, final JSExpression[] occurrences) {
+    @RequiredUIAccess
+    protected JSIntroduceFieldDialog createDialog(Project project, JSExpression expression, JSExpression[] occurrences) {
         return new JSIntroduceFieldDialog(project, occurrences, expression);
     }
 
     @Override
-    protected JSElement findAnchor(final BaseIntroduceContext<JSIntroduceFieldSettings> context, final boolean replaceAllOccurences) {
+    protected JSElement findAnchor(BaseIntroduceContext<JSIntroduceFieldSettings> context, boolean replaceAllOccurences) {
         return findClassAnchor(context.expression);
     }
 
     @Override
-    protected JSElement addStatementBefore(
-        final JSElement anchorStatement,
-        final JSVarStatement declaration
-    ) throws IncorrectOperationException {
+    @RequiredWriteAction
+    protected JSElement addStatementBefore(JSElement anchorStatement, JSVarStatement declaration) throws IncorrectOperationException {
         return addToClassAnchor(anchorStatement, declaration);
     }
 
     @Override
     protected String getDeclText(final JSIntroduceFieldSettings settings) {
-        @NonNls String baseDeclText = super.getDeclText(settings);
-        final JSAttributeList.AccessType type = settings.getAccessType();
+        String baseDeclText = super.getDeclText(settings);
+        JSAttributeList.AccessType type = settings.getAccessType();
         if (type != JSAttributeList.AccessType.PACKAGE_LOCAL) {
             baseDeclText = type.toString().toLowerCase() + " " + baseDeclText;
         }
@@ -80,7 +79,8 @@ protected String getDeclText(final JSIntroduceFieldSettings settings) {
     }
 
     @Override
-    protected JSExpression findIntroducedExpression(final PsiFile file, final int start, final int end, Editor editor) {
+    @RequiredUIAccess
+    protected JSExpression findIntroducedExpression(PsiFile file, int start, int end, Editor editor) {
         if (file.getLanguage() != JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
             CommonRefactoringUtil.showErrorHint(
                 file.getProject(),
@@ -96,41 +96,42 @@ protected JSExpression findIntroducedExpression(final PsiFile file, final int st
     }
 
     @Override
+    @RequiredWriteAction
     protected JSVarStatement prepareDeclaration(
-        final String varDeclText,
+        String varDeclText,
         BaseIntroduceContext<JSIntroduceFieldSettings> context,
-        final Project project
+        Project project
     ) throws IncorrectOperationException {
-        final JSIntroduceFieldSettings.InitializationPlace place = context.settings.getInitializationPlace();
+        JSIntroduceFieldSettings.InitializationPlace place = context.settings.getInitializationPlace();
 
         if (place == JSIntroduceFieldSettings.InitializationPlace.FieldDeclaration) {
             return super.prepareDeclaration(varDeclText, context, project);
         }
         else {
-            final String assignmentText =
+            String assignmentText =
                 context.settings.getVariableName() + "=" + context.expression.getText() + JSChangeUtil.getSemicolon(project);
-            final PsiElement psiToInsert = JSChangeUtil.createStatementFromText(project, assignmentText).getPsi();
+            PsiElement psiToInsert = JSChangeUtil.createStatementFromText(project, assignmentText).getPsi();
 
             if (place == JSIntroduceFieldSettings.InitializationPlace.CurrentMethod) {
-                final JSElement element = super.findAnchor(context, context.settings.isReplaceAllOccurences());
-                final PsiElement parent = element.getParent();
-                final PsiElement addedElement = parent.addBefore(psiToInsert, element);
+                JSElement element = super.findAnchor(context, context.settings.isReplaceAllOccurences());
+                PsiElement parent = element.getParent();
+                PsiElement addedElement = parent.addBefore(psiToInsert, element);
                 CodeStyleManager.getInstance(project).reformatNewlyAddedElement(parent.getNode(), addedElement.getNode());
             }
             else {
                 PsiElement parent = PsiTreeUtil.getParentOfType(context.expression, JSClass.class, JSFile.class);
-                if (parent instanceof JSFile) {
-                    final PsiFile containingFile = parent.getContext().getContainingFile();
+                if (parent instanceof JSFile jsFile) {
+                    PsiFile containingFile = jsFile.getContext().getContainingFile();
                     assert containingFile instanceof XmlFile;
                     parent = XmlBackedJSClassImpl.getXmlBackedClass((XmlFile)containingFile);
                 }
 
                 assert parent instanceof JSClass;
-                final JSClass clazz = (JSClass)parent;
+                JSClass clazz = (JSClass)parent;
                 JSFunction fun = clazz.findFunctionByName(clazz.getName());
 
                 if (fun == null) {
-                    @NonNls String constr = "function " + clazz.getName() + "() {}";
+                    String constr = "function " + clazz.getName() + "() {}";
                     if (clazz.getAttributeList() != null && clazz.getAttributeList().getAccessType() == JSAttributeList.AccessType.PUBLIC) {
                         constr = "public " + constr;
                     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
index 81f2e46b..f6754041 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
@@ -18,8 +18,10 @@
 
 import com.intellij.lang.javascript.impl.refactoring.JSBaseIntroduceDialog;
 import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.util.lang.StringUtil;
 
 import javax.swing.*;
@@ -41,7 +43,8 @@ public class JSIntroduceVariableDialog extends JSBaseIntroduceDialog implements
     private static IntroducedVarType ourLastIntroduceType = IntroducedVarType.VAR;
     private IntroducedVarType myIntroducedVarType;
 
-    protected JSIntroduceVariableDialog(final Project project, final JSExpression[] occurences, final JSExpression mainOccurence) {
+    @RequiredUIAccess
+    protected JSIntroduceVariableDialog(Project project, JSExpression[] occurences, JSExpression mainOccurence) {
         super(project, occurences, mainOccurence, JavaScriptLocalize.javascriptIntroduceVariableTitle());
 
         if (ourLastIntroduceType == Settings.IntroducedVarType.CONST) {
@@ -73,6 +76,7 @@ protected JCheckBox getReplaceAllCheckBox() {
     }
 
     @Override
+    @RequiredUIAccess
     protected void doOKAction() {
         super.doOKAction();
 
@@ -100,7 +104,8 @@ public IntroducedVarType getIntroducedVarType() {
     }
 
     @Override
-    protected String suggestCandidateName(final JSExpression mainOccurence) {
+    @RequiredReadAction
+    protected String suggestCandidateName(JSExpression mainOccurence) {
         return StringUtil.decapitalize(super.suggestCandidateName(mainOccurence));
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
index 657e4707..37a1b58d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableHandler.java
@@ -22,6 +22,7 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 
 /**
  * @author ven
@@ -43,11 +44,8 @@ protected String getDeclText(Settings settings) {
     }
 
     @Override
-    protected JSIntroduceVariableDialog createDialog(
-        final Project project,
-        final JSExpression expression,
-        final JSExpression[] occurrences
-    ) {
+    @RequiredUIAccess
+    protected JSIntroduceVariableDialog createDialog(Project project, JSExpression expression, JSExpression[] occurrences) {
         return new JSIntroduceVariableDialog(project, occurrences, expression);
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
index 2871ba11..315a3711 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.search;
 
 import com.intellij.lang.javascript.psi.JSNamedElement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.document.util.TextRange;
 import consulo.language.editor.hint.DeclarationRangeHandler;
@@ -36,12 +37,13 @@ public Class<JSNamedElement> getElementClass() {
         return JSNamedElement.class;
     }
 
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public TextRange getDeclarationRange(@Nonnull JSNamedElement namedElement) {
-        final TextRange textRange = namedElement.getTextRange();
-        final PsiElement nameIdentifier = namedElement.getNameIdentifier();
-        final TextRange nameIdentifierRange = nameIdentifier != null ? nameIdentifier.getTextRange() : null;
+        TextRange textRange = namedElement.getTextRange();
+        PsiElement nameIdentifier = namedElement.getNameIdentifier();
+        TextRange nameIdentifierRange = nameIdentifier != null ? nameIdentifier.getTextRange() : null;
         int startOffset = nameIdentifierRange != null ? nameIdentifierRange.getStartOffset() : textRange.getStartOffset();
         int endOffset = nameIdentifierRange != null ? nameIdentifierRange.getEndOffset() : textRange.getEndOffset();
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
index 2dd89ac1..c62edcbb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.search.JSClassSearch;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.application.util.function.Processor;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -37,29 +38,29 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Apr 28, 2008
- * Time: 8:34:30 PM
+ * @since 2008-04-28
  */
 @ExtensionImpl
 public class JSDefinitionsSearchExecutor implements DefinitionsScopedSearchExecutor {
     @Override
+    @RequiredReadAction
     public boolean execute(
         @Nonnull final DefinitionsScopedSearch.SearchParameters parameters,
         @Nonnull final Processor<? super PsiElement> consumer
     ) {
         final PsiElement sourceElement = parameters.getElement();
-        if (sourceElement instanceof PsiNamedElement && sourceElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE)) {
+        if (sourceElement instanceof PsiNamedElement namedElement && namedElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE)) {
             ReferencesSearch.search(sourceElement, GlobalSearchScope.projectScope(sourceElement.getProject())).forEach(t -> {
-                if (t instanceof JSReferenceExpression referenceExpression) {
-                    final PsiElement parent = referenceExpression.getParent();
-                    final ResolveResult[] resolveResults = referenceExpression.multiResolve(true);
+                if (t instanceof JSReferenceExpression refExpr) {
+                    PsiElement parent = refExpr.getParent();
+                    ResolveResult[] resolveResults = refExpr.multiResolve(true);
 
                     for (ResolveResult r : resolveResults) {
                         PsiElement psiElement = r.getElement();
 
-                        if (psiElement != null &&
-                            !JavaScriptIndex.isFromPredefinedFile(psiElement.getContainingFile()) &&
-                            sourceElement != psiElement) {
+                        if (psiElement != null
+                            && !JavaScriptIndex.isFromPredefinedFile(psiElement.getContainingFile())
+                            && sourceElement != psiElement) {
                             if (psiElement instanceof JSFunction fun && sourceElement instanceof JSFunction sourceFun) {
                                 if ((sourceFun.isGetProperty() && fun.isSetProperty()) || (sourceFun.isSetProperty() && fun.isGetProperty())) {
                                     return true;
@@ -80,7 +81,7 @@ public boolean execute(
             });
 
             if (sourceElement instanceof JSClass clazz) {
-                final Processor<JSClass> delegatingProcessor = jsClass -> consumer.process(jsClass);
+                Processor<JSClass> delegatingProcessor = consumer::process;
                 JSClassSearch.searchClassInheritors(clazz, true).forEach(delegatingProcessor);
 
                 if (clazz.isInterface()) {
@@ -88,10 +89,10 @@ public boolean execute(
                 }
             }
             else if (sourceElement instanceof JSFunction baseFunction) {
-                final Processor<JSFunction> delegatingProcessor = jsFunction -> consumer.process(jsFunction);
+                Processor<JSFunction> delegatingProcessor = consumer::process;
                 JSFunctionsSearch.searchOverridingFunctions(baseFunction, true).forEach(delegatingProcessor);
 
-                final PsiElement parent = baseFunction.getParent();
+                PsiElement parent = baseFunction.getParent();
                 if (parent instanceof JSClass jsClass && jsClass.isInterface()) {
                     JSFunctionsSearch.searchImplementingFunctions(baseFunction, true).forEach(delegatingProcessor);
                 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
index f7df2064..da3c2c11 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
@@ -20,18 +20,20 @@
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.search.JSClassSearch;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.application.util.function.Processor;
 import consulo.application.util.query.Query;
 import consulo.application.util.query.QueryExecutor;
 import consulo.application.util.query.QueryFactory;
 import consulo.language.psi.PsiElement;
+import jakarta.annotation.Nonnull;
 
 public abstract class JSFunctionsSearch implements QueryExecutor<JSFunction, JSFunctionsSearch.SearchParameters> {
     public static class SearchParameters {
         private JSFunction myBaseFunction;
         private boolean myCheckDeepInheritance;
 
-        public SearchParameters(final JSFunction baseFunction, final boolean checkDeepInheritance) {
+        public SearchParameters(JSFunction baseFunction, boolean checkDeepInheritance) {
             myBaseFunction = baseFunction;
             myCheckDeepInheritance = checkDeepInheritance;
         }
@@ -45,25 +47,23 @@ public boolean isCheckDeepInheritance() {
         }
     }
 
-    public static Query<JSFunction> searchOverridingFunctions(final JSFunction baseFunction, final boolean checkDeepInheritance) {
-        final SearchParameters parameters = new SearchParameters(baseFunction, checkDeepInheritance);
+    public static Query<JSFunction> searchOverridingFunctions(JSFunction baseFunction, boolean checkDeepInheritance) {
+        SearchParameters parameters = new SearchParameters(baseFunction, checkDeepInheritance);
         return OVERRIDDEN_FUNCTIONS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
     }
 
-    public static Query<JSFunction> searchImplementingFunctions(final JSFunction baseFunction, final boolean checkDeepInheritance) {
-        final SearchParameters parameters = new SearchParameters(baseFunction, checkDeepInheritance);
+    public static Query<JSFunction> searchImplementingFunctions(JSFunction baseFunction, boolean checkDeepInheritance) {
+        SearchParameters parameters = new SearchParameters(baseFunction, checkDeepInheritance);
         return IMPLEMENTING_FUNCTIONS_QUERY_FACTORY.createUniqueResultsQuery(parameters);
     }
 
-    private static QueryFactory<JSFunction, SearchParameters> OVERRIDDEN_FUNCTIONS_QUERY_FACTORY =
-        new QueryFactory<JSFunction, SearchParameters>();
-    private static QueryFactory<JSFunction, SearchParameters> IMPLEMENTING_FUNCTIONS_QUERY_FACTORY =
-        new QueryFactory<JSFunction, SearchParameters>();
+    private static QueryFactory<JSFunction, SearchParameters> OVERRIDDEN_FUNCTIONS_QUERY_FACTORY = new QueryFactory<>();
+    private static QueryFactory<JSFunction, SearchParameters> IMPLEMENTING_FUNCTIONS_QUERY_FACTORY = new QueryFactory<>();
 
     static {
         OVERRIDDEN_FUNCTIONS_QUERY_FACTORY.registerExecutor(new JSFunctionsSearch() {
             @Override
-            protected Query<JSClass> makeQuery(final SearchParameters queryParameters, final PsiElement parent) {
+            protected Query<JSClass> makeQuery(SearchParameters queryParameters, PsiElement parent) {
                 return JSClassSearch.searchClassInheritors((JSClass)parent, queryParameters.isCheckDeepInheritance());
             }
         });
@@ -72,7 +72,7 @@ protected Query<JSClass> makeQuery(final SearchParameters queryParameters, final
     }
 
     @Override
-    public boolean execute(final SearchParameters queryParameters, final Processor<? super JSFunction> consumer) {
+    public boolean execute(SearchParameters queryParameters, final @Nonnull Processor<? super JSFunction> consumer) {
         final JSFunction baseFunction = queryParameters.getBaseFunction();
         PsiElement clazz = JSResolveUtil.findParent(baseFunction);
 
@@ -80,23 +80,21 @@ public boolean execute(final SearchParameters queryParameters, final Processor<?
             return true;
         }
 
-        return makeQuery(queryParameters, clazz).forEach(new Processor<JSClass>() {
+        return makeQuery(queryParameters, clazz).forEach(new Processor<>() {
             @Override
+            @RequiredReadAction
             public boolean process(final JSClass jsClass) {
                 JSFunction function = jsClass.findFunctionByNameAndKind(baseFunction.getName(), baseFunction.getKind());
-                if (function != null) {
-                    return consumer.process(function);
-                }
-                return true;
+                return function == null || consumer.process(function);
             }
         });
     }
 
-    protected abstract Query<JSClass> makeQuery(final SearchParameters queryParameters, final PsiElement parent);
+    protected abstract Query<JSClass> makeQuery(SearchParameters queryParameters, PsiElement parent);
 
     private static class ImplementingFunctionsSearch extends JSFunctionsSearch {
         @Override
-        protected Query<JSClass> makeQuery(final SearchParameters queryParameters, final PsiElement parent) {
+        protected Query<JSClass> makeQuery(SearchParameters queryParameters, PsiElement parent) {
             return JSClassSearch.searchInterfaceImplementations((JSClass)parent, true);
         }
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
index c3f10c20..cc950f91 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
@@ -17,30 +17,30 @@
 package com.intellij.lang.javascript.impl.search;
 
 import com.intellij.lang.javascript.psi.JSNamedElement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.ide.navigation.GotoTargetRendererProvider;
 import consulo.language.editor.ui.PsiElementListCellRenderer;
 import consulo.language.psi.PsiElement;
 import consulo.navigation.ItemPresentation;
-import consulo.navigation.NavigationItem;
 import jakarta.annotation.Nullable;
 
 /**
  * @author Maxim.Mossienko
- * Date: Apr 28, 2008
- * Time: 8:14:14 PM
+ * @since 2008-04-28
  */
 @ExtensionImpl
 public class JSGotoTargetRendererProvider implements GotoTargetRendererProvider {
     static class JSClassListCellRenderer extends PsiElementListCellRenderer<JSNamedElement> {
         @Override
-        public String getElementText(final JSNamedElement element) {
+        @RequiredReadAction
+        public String getElementText(JSNamedElement element) {
             return element.getName();
         }
 
         @Override
-        protected String getContainerText(final JSNamedElement element, final String name) {
-            final ItemPresentation presentation = ((NavigationItem)element).getPresentation();
+        protected String getContainerText(JSNamedElement element, String name) {
+            ItemPresentation presentation = element.getPresentation();
             return presentation != null ? presentation.getLocationString() : null;
         }
 
@@ -53,10 +53,6 @@ protected int getIconFlags() {
     @Nullable
     @Override
     public PsiElementListCellRenderer getRenderer(PsiElement element) {
-        if (!(element instanceof JSNamedElement)) {
-            return null;
-        }
-
-        return new JSClassListCellRenderer();
+        return element instanceof JSNamedElement ? new JSClassListCellRenderer() : null;
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
index 90b11892..17f448b6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
@@ -28,11 +28,10 @@
 
 /**
  * @author Maxim.Mossienko
- * Date: Jul 23, 2008
- * Time: 6:54:27 PM
+ * @since 2008-07-23
  */
 public class JSStructureItemPresentation extends JSStructureViewElement.JSStructureItemPresentationBase {
-    public JSStructureItemPresentation(final JSStructureViewElement jsStructureViewElement) {
+    public JSStructureItemPresentation(JSStructureViewElement jsStructureViewElement) {
         super(jsStructureViewElement);
     }
 
@@ -49,28 +48,26 @@ public String getPresentableText() {
 
     @RequiredReadAction
     public static String getName(@Nonnull PsiElement psiElement) {
-        if (psiElement instanceof JSObjectLiteralExpression) {
-            if (psiElement.getParent() instanceof JSAssignmentExpression assignmentExpression) {
-                final JSExpression expression = ((JSDefinitionExpression)assignmentExpression.getLOperand()).getExpression();
-                return JSResolveUtil.findClassIdentifier(expression).getText();
+        if (psiElement instanceof JSObjectLiteralExpression objectLiteral) {
+            if (objectLiteral.getParent() instanceof JSAssignmentExpression assignment) {
+                JSDefinitionExpression lOperand = (JSDefinitionExpression)assignment.getLOperand();
+                return JSResolveUtil.findClassIdentifier(lOperand.getExpression()).getText();
             }
             else {
                 return JavaScriptLocalize.javascriptLanguageTermPrototype().get();
             }
         }
 
-        if (psiElement instanceof JSDefinitionExpression definitionExpression) {
-            psiElement = definitionExpression.getExpression();
+        if (psiElement instanceof JSDefinitionExpression definition) {
+            psiElement = definition.getExpression();
         }
 
-        if (psiElement instanceof JSReferenceExpression expression) {
-            String s = expression.getReferencedName();
+        if (psiElement instanceof JSReferenceExpression refExpr) {
+            String s = refExpr.getReferencedName();
 
-            if (JSResolveUtil.PROTOTYPE_FIELD_NAME.equals(s)) {
-                final JSExpression jsExpression = expression.getQualifier();
-                if (jsExpression instanceof JSReferenceExpression referenceExpression) {
-                    s = referenceExpression.getReferencedName();
-                }
+            if (JSResolveUtil.PROTOTYPE_FIELD_NAME.equals(s)
+                && refExpr.getQualifier() instanceof JSReferenceExpression qualifierRefExpr) {
+                s = qualifierRefExpr.getReferencedName();
             }
             return s;
         }
@@ -85,12 +82,12 @@ public static String getName(@Nonnull PsiElement psiElement) {
             psiElement = property.getValue();
         }
 
-        if (psiElement instanceof JSFunction) {
+        if (psiElement instanceof JSFunction function) {
             if (name == null) {
                 name = "<anonymous>";
             }
             name += "(";
-            JSParameterList parameterList = ((JSFunction)psiElement).getParameterList();
+            JSParameterList parameterList = function.getParameterList();
             if (parameterList != null) {
                 for (JSParameter p : parameterList.getParameters()) {
                     if (!name.endsWith("(")) {
@@ -105,17 +102,17 @@ public static String getName(@Nonnull PsiElement psiElement) {
             }
             name += ")";
 
-            final String type = ((JSFunction)psiElement).getReturnTypeString();
+            String type = function.getReturnTypeString();
             if (type != null) {
                 name += ":" + type;
             }
         }
 
-        if (name == null && psiElement.getParent() instanceof JSAssignmentExpression assignmentExpression) {
-            JSExpression lOperand = ((JSDefinitionExpression)assignmentExpression.getLOperand()).getExpression();
+        if (name == null && psiElement.getParent() instanceof JSAssignmentExpression assignment) {
+            JSExpression lOperand = ((JSDefinitionExpression)assignment.getLOperand()).getExpression();
             lOperand = JSResolveUtil.findClassIdentifier(lOperand);
-            if (lOperand instanceof JSReferenceExpression referenceExpression) {
-                return referenceExpression.getReferencedName();
+            if (lOperand instanceof JSReferenceExpression lOperandRefExpr) {
+                return lOperandRefExpr.getReferencedName();
             }
             return lOperand.getText();
         }
@@ -125,7 +122,7 @@ public static String getName(@Nonnull PsiElement psiElement) {
     @Override
     @RequiredReadAction
     public Image getIcon() {
-        final PsiElement psiElement = this.element.getRealElement();
+        PsiElement psiElement = this.element.getRealElement();
         if (!psiElement.isValid()) {
             return null;
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
index e0c6677b..265e641b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
@@ -33,7 +33,7 @@
 @ExtensionImpl
 public class JSStructureViewBuilderFactory implements PsiStructureViewFactory {
     @Override
-    public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+    public StructureViewBuilder getStructureViewBuilder(PsiFile psiFile) {
         return new TreeBasedStructureViewBuilder() {
             @Override
             @Nonnull
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
index afe01ee2..6433b7f0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.impl.structureView;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.fileEditor.structureView.StructureViewTreeElement;
 import consulo.language.inject.InjectedLanguageManager;
@@ -31,6 +32,7 @@
 import consulo.util.collection.primitive.ints.IntMaps;
 import consulo.util.collection.primitive.ints.IntObjectMap;
 
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 import java.util.*;
@@ -42,7 +44,7 @@ public class JSStructureViewElement implements StructureViewTreeElement {
     protected PsiElement myElement;
     private boolean myInherited;
 
-    public JSStructureViewElement(final PsiElement element) {
+    public JSStructureViewElement(PsiElement element) {
         myElement = element;
     }
 
@@ -70,27 +72,28 @@ public boolean canNavigateToSource() {
         return canNavigate();
     }
 
+    @Nonnull
     @Override
+    @RequiredReadAction
     public StructureViewTreeElement[] getChildren() {
-        final PsiElement element = getUpToDateElement();
+        PsiElement element = getUpToDateElement();
         // since we use proxies for StructureViewElement then real element may invalidate due to structural change
         if (element == null) {
             return EMPTY_ARRAY;
         }
 
-        final Set<String> referencedNamedIds = new HashSet<String>();
-
+        Set<String> referencedNamedIds = new HashSet<>();
 
         List<StructureViewTreeElement> children = collectMyElements(referencedNamedIds);
 
         ArrayList<StructureViewTreeElement> elementsFromSupers = null;
 
-        if (element instanceof JSClass) {
-            for (JSClass clazz : ((JSClass)element).getSuperClasses()) {
-                final StructureViewTreeElement[] structureViewTreeElements = createStructureViewElement(clazz).getChildren();
+        if (element instanceof JSClass jsClass) {
+            for (JSClass superClass : jsClass.getSuperClasses()) {
+                StructureViewTreeElement[] structureViewTreeElements = createStructureViewElement(superClass).getChildren();
 
                 if (elementsFromSupers == null) {
-                    elementsFromSupers = new ArrayList<StructureViewTreeElement>(structureViewTreeElements.length);
+                    elementsFromSupers = new ArrayList<>(structureViewTreeElements.length);
                 }
                 else {
                     elementsFromSupers.ensureCapacity(elementsFromSupers.size() + structureViewTreeElements.length);
@@ -111,10 +114,9 @@ public StructureViewTreeElement[] getChildren() {
             }
         }
 
-
-        Collections.sort(children, new Comparator<StructureViewTreeElement>() {
-            @Override
-            public int compare(final StructureViewTreeElement _o1, final StructureViewTreeElement _o2) {
+        Collections.sort(
+            children,
+            (_o1, _o2) -> {
                 PsiElement e = getPsiElement(_o1);
                 PsiElement e2 = getPsiElement(_o2);
 
@@ -125,14 +127,13 @@ public int compare(final StructureViewTreeElement _o1, final StructureViewTreeEl
 
                 return offset - offset2;
             }
-        });
+        );
 
         if (elementsFromSupers != null) {
-            Map<String, JSFunction> functionsByNames = new HashMap<String, JSFunction>();
+            Map<String, JSFunction> functionsByNames = new HashMap<>();
             for (StructureViewTreeElement child : children) {
                 PsiElement el = getPsiElementResolveProxy(child);
-                if (el instanceof JSFunction) {
-                    JSFunction function = (JSFunction)el;
+                if (el instanceof JSFunction function) {
                     functionsByNames.put(function.getName(), function);
                 }
             }
@@ -140,8 +141,7 @@ public int compare(final StructureViewTreeElement _o1, final StructureViewTreeEl
             for (StructureViewTreeElement superTreeElement : elementsFromSupers) {
                 PsiElement superElement = getPsiElementResolveProxy(superTreeElement);
                 boolean addSuperElement = true;
-                if (superElement instanceof JSFunction) {
-                    JSFunction superFunction = (JSFunction)superElement;
+                if (superElement instanceof JSFunction superFunction) {
                     JSFunction function = functionsByNames.get(superFunction.getName());
                     if (function != null) {
                         // TODO check signature
@@ -162,49 +162,40 @@ protected JSStructureViewElement createStructureViewElement(PsiElement element)
     }
 
     private static PsiElement getPsiElement(StructureViewTreeElement element) {
-        PsiElement e;
-        if (element instanceof JSStructureViewElement) {
-            final JSStructureViewElement o1 = (JSStructureViewElement)element;
-            e = o1.myElement;
-        }
-        else {
-            e = (PsiElement)element.getValue();
-        }
-        return e;
+        return element instanceof JSStructureViewElement structureViewElement
+            ? structureViewElement.myElement
+            : (PsiElement)element.getValue();
     }
 
     public static PsiElement getPsiElementResolveProxy(StructureViewTreeElement element) {
         return getPsiElement(element);
     }
 
-
-    protected List<StructureViewTreeElement> collectMyElements(final Set<String> referencedNamedIds) {
-        final IntObjectMap<PsiElement> offset2Element = IntMaps.newIntObjectHashMap();
+    protected List<StructureViewTreeElement> collectMyElements(Set<String> referencedNamedIds) {
+        IntObjectMap<PsiElement> offset2Element = IntMaps.newIntObjectHashMap();
 
         collectChildrenFromElement(myElement, referencedNamedIds, offset2Element);
 
-        final List<StructureViewTreeElement> children = new ArrayList<StructureViewTreeElement>(offset2Element.size());
+        List<StructureViewTreeElement> children = new ArrayList<>(offset2Element.size());
         offset2Element.forEach((textOffset, element) -> children.add(createStructureViewElement(element)));
         return children;
     }
 
-    private static boolean isVisible(PsiElement namedElement, final PsiElement element) {
-        if (namedElement instanceof JSAttributeListOwner) {
-            final JSAttributeListOwner attributeListOwner = (JSAttributeListOwner)namedElement;
-            final JSAttributeList attributeList = attributeListOwner.getAttributeList();
+    @RequiredReadAction
+    private static boolean isVisible(PsiElement namedElement, PsiElement element) {
+        if (namedElement instanceof JSAttributeListOwner attributeListOwner) {
+            JSAttributeList attributeList = attributeListOwner.getAttributeList();
 
             if (attributeList != null) {
-                final JSAttributeList.AccessType type = attributeList.getAccessType();
+                JSAttributeList.AccessType type = attributeList.getAccessType();
 
                 if (type == JSAttributeList.AccessType.PACKAGE_LOCAL) {
-                    final JSPackageStatement packageStatement = PsiTreeUtil.getParentOfType(namedElement, JSPackageStatement.class);
-                    final JSPackageStatement packageStatement2 = PsiTreeUtil.getParentOfType(element, JSPackageStatement.class);
-                    String packageQName;
-
-                    return packageStatement == packageStatement2 || (packageStatement != null &&
-                        packageStatement2 != null &&
-                        (packageQName = packageStatement.getQualifiedName()) != null &&
-                        packageQName.equals(packageStatement2.getQualifiedName()));
+                    JSPackageStatement packageStatement = PsiTreeUtil.getParentOfType(namedElement, JSPackageStatement.class);
+                    JSPackageStatement packageStatement2 = PsiTreeUtil.getParentOfType(element, JSPackageStatement.class);
+
+                    return packageStatement == packageStatement2
+                        || (packageStatement != null && packageStatement2 != null
+                        && Objects.equals(packageStatement.getQualifiedName(), packageStatement2.getQualifiedName()));
                 }
                 return type != JSAttributeList.AccessType.PRIVATE;
             }
@@ -213,18 +204,19 @@ private static boolean isVisible(PsiElement namedElement, final PsiElement eleme
     }
 
     private static void collectChildrenFromElement(
-        final PsiElement element,
-        final Set<String> referencedNamedIds,
-        final IntObjectMap<PsiElement> offset2Element
+        PsiElement element,
+        Set<String> referencedNamedIds,
+        IntObjectMap<PsiElement> offset2Element
     ) {
         element.acceptChildren(new JSElementVisitor() {
             Set<PsiFile> visited;
             PsiElement context = element;
 
             @Override
+            @RequiredReadAction
             public void visitElement(PsiElement element) {
-                if (element instanceof JSNamedElement
-                    && ((JSNamedElement)element).getName() != null
+                if (element instanceof JSNamedElement namedElement
+                    && namedElement.getName() != null
                     && !(element instanceof JSDefinitionExpression)
                     && !(element instanceof JSLabeledStatement)
                     && !(element instanceof JSPackageStatement)
@@ -242,33 +234,33 @@ public void visitElement(PsiElement element) {
             }
 
             @Override
-            public void visitJSParameter(final JSParameter node) {
+            public void visitJSParameter(@Nonnull JSParameter node) {
                 // Do not add parameters to structure view
             }
 
             @Override
-            public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
-                final PsiFile file = includeDirective.resolveFile();
-                if (file instanceof JSFile) {
-                    if (visited != null && visited.contains(file)) {
+            @RequiredReadAction
+            public void visitJSIncludeDirective(@Nonnull JSIncludeDirective includeDirective) {
+                if (includeDirective.resolveFile() instanceof JSFile jsFile) {
+                    if (visited != null && visited.contains(jsFile)) {
                         return;
                     }
                     if (visited == null) {
-                        visited = new HashSet<PsiFile>();
+                        visited = new HashSet<>();
                     }
-                    visited.add(file);
+                    visited.add(jsFile);
 
-                    final PsiElement prevContext = context;
-                    context = file;
+                    PsiElement prevContext = context;
+                    context = jsFile;
                     context.putUserData(JSResolveUtil.contextKey, element);
-                    file.acceptChildren(this);
+                    jsFile.acceptChildren(this);
                     context = prevContext;
                 }
             }
 
             @Override
-            public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node) {
-                final PsiElement parent = node.getParent();
+            public void visitJSObjectLiteralExpression(@Nonnull JSObjectLiteralExpression node) {
+                PsiElement parent = node.getParent();
                 if (parent instanceof JSVariable
                     || parent instanceof JSProperty
                     || parent instanceof JSFile
@@ -277,8 +269,8 @@ public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node)
                     node.acceptChildren(this);
                     return;
                 }
-                if (parent instanceof JSArgumentList) {
-                    final JSElement expression = JSSymbolUtil.findQualifyingExpressionFromArgumentList((JSArgumentList)parent);
+                if (parent instanceof JSArgumentList argumentList) {
+                    JSElement expression = JSSymbolUtil.findQualifyingExpressionFromArgumentList(argumentList);
                     if (expression != null) {
                         return;
                     }
@@ -290,7 +282,7 @@ public void visitJSObjectLiteralExpression(final JSObjectLiteralExpression node)
             }
 
             @Override
-            public void visitJSVariable(final JSVariable node) {
+            public void visitJSVariable(@Nonnull JSVariable node) {
                 if (element instanceof JSFunction) {
                     return;
                 }
@@ -298,35 +290,37 @@ public void visitJSVariable(final JSVariable node) {
             }
 
             @Override
-            public void visitJSAssignmentExpression(final JSAssignmentExpression node) {
+            @RequiredReadAction
+            public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression node) {
                 JSExpression rOperand = node.getROperand();
-                final JSExpression lOperand = node.getLOperand();
+                JSExpression lOperand = node.getLOperand();
 
-                final boolean outsideFunction = PsiTreeUtil.getParentOfType(node, JSFunction.class) == null;
+                boolean outsideFunction = PsiTreeUtil.getParentOfType(node, JSFunction.class) == null;
                 if (!outsideFunction) {
                     return;
                 }
 
-                if (rOperand instanceof JSCallExpression) {
-                    rOperand = ((JSCallExpression)rOperand).getMethodExpression();
+                if (rOperand instanceof JSCallExpression call) {
+                    rOperand = call.getMethodExpression();
                 }
 
-                if (rOperand instanceof JSFunction) {
+                if (rOperand instanceof JSFunction function) {
                     JSExpression qualifier = null;
-                    final JSExpression operand = ((JSDefinitionExpression)lOperand).getExpression();
+                    JSExpression operand = ((JSDefinitionExpression)lOperand).getExpression();
 
-                    if (operand instanceof JSReferenceExpression) {
-                        qualifier = ((JSReferenceExpression)operand).getQualifier();
+                    if (operand instanceof JSReferenceExpression operandRefExpr) {
+                        qualifier = operandRefExpr.getQualifier();
                     }
 
-                    if ((qualifier == null || qualifier instanceof JSThisExpression)) {
-                        addElement(rOperand);
+                    if (qualifier == null || qualifier instanceof JSThisExpression) {
+                        addElement(function);
                     }
                 }
                 else if (lOperand != null) {
-                    final JSExpression operand = ((JSDefinitionExpression)lOperand).getExpression();
-                    if (operand instanceof JSReferenceExpression && ((JSReferenceExpression)operand).getQualifier() instanceof JSThisExpression) {
-                        final PsiElement resolved = ((JSReferenceExpression)operand).resolve();
+                    JSExpression operand = ((JSDefinitionExpression)lOperand).getExpression();
+                    if (operand instanceof JSReferenceExpression operandRefExpr
+                        && operandRefExpr.getQualifier() instanceof JSThisExpression) {
+                        PsiElement resolved = operandRefExpr.resolve();
                         if (resolved == lOperand) {
                             addElement(lOperand);
                         }
@@ -335,9 +329,10 @@ else if (lOperand != null) {
                 }
             }
 
-            private void addElement(final PsiElement lOperand) {
-                if (lOperand instanceof JSNamedElement) {
-                    final String namedId = ((JSNamedElement)lOperand).getName();
+            @RequiredReadAction
+            private void addElement(PsiElement lOperand) {
+                if (lOperand instanceof JSNamedElement namedElement) {
+                    String namedId = namedElement.getName();
                     if (referencedNamedIds.contains(namedId)) {
                         return;
                     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
index d82f7a40..ba4e1634 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
@@ -18,6 +18,7 @@
 
 import com.intellij.lang.javascript.index.JavaScriptIndex;
 import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.application.AllIcons;
 import consulo.codeEditor.Editor;
 import consulo.fileEditor.structureView.StructureViewTreeElement;
@@ -32,44 +33,40 @@
 import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.ex.action.Shortcut;
 import consulo.ui.ex.keymap.KeymapManager;
-import consulo.util.lang.ref.Ref;
-import org.jetbrains.annotations.NonNls;
-
+import consulo.util.lang.ref.SimpleReference;
 import jakarta.annotation.Nonnull;
 
 import java.util.Comparator;
-import java.util.List;
 
 /**
- * @by max, maxim
+ * @author max
+ * @author maxim
  */
 public class JSStructureViewModel extends TextEditorBasedStructureViewModel {
     private PsiElement myRoot;
     private Filter[] myFilters = new Filter[]{
         ourFieldsFilter,
-        ourInheritedFilter
+        INHERITED_FILTER
     };
 
-    @NonNls
     private static final String ID = "KIND";
     private static Sorter ourKindSorter = new Sorter() {
         private Comparator myComparator = new Comparator() {
             @Override
-            public int compare(final Object o, final Object o2) {
+            @RequiredReadAction
+            public int compare(Object o, Object o2) {
                 return getWeight(o) - getWeight(o2);
             }
 
-            private int getWeight(final Object s) {
+            @RequiredReadAction
+            private int getWeight(Object s) {
                 if (s instanceof JSSuperGroup) {
                     return 5;
                 }
                 Object o = ((StructureViewTreeElement)s).getValue();
 
-                if (o instanceof JSProperty) {
-                    JSElement propertyValue = ((JSProperty)o).getValue();
-                    if (propertyValue instanceof JSFunction) {
-                        o = propertyValue;
-                    }
+                if (o instanceof JSProperty property && property.getValue() instanceof JSFunction function) {
+                    o = function;
                 }
 
                 if (o instanceof JSClass) {
@@ -108,23 +105,18 @@ public String getName() {
     };
 
     private static Filter ourFieldsFilter = new Filter() {
-        @NonNls
         public static final String ID = "SHOW_FIELDS";
 
         @Override
+        @RequiredReadAction
         public boolean isVisible(TreeElement treeNode) {
-            if (!(treeNode instanceof JSStructureViewElement)) {
-                return true;
+            if (treeNode instanceof JSStructureViewElement structureViewElement) {
+                PsiElement element = structureViewElement.getRealElement();
+                return element instanceof JSClass || element instanceof JSFunction
+                    || (element instanceof JSProperty property && property.getValue() instanceof JSFunction)
+                    || element instanceof JSObjectLiteralExpression;
             }
-            final PsiElement element = ((JSStructureViewElement)treeNode).getRealElement();
-
-            if (element instanceof JSClass) {
-                return true;
-            }
-
-            return element instanceof JSFunction ||
-                (element instanceof JSProperty && ((JSProperty)element).getValue() instanceof JSFunction) ||
-                element instanceof JSObjectLiteralExpression;
+            return true;
         }
 
         @Override
@@ -145,18 +137,12 @@ public String getName() {
         }
     };
 
-    private static final Filter ourInheritedFilter = new FileStructureFilter() {
-        @NonNls
+    private static final Filter INHERITED_FILTER = new FileStructureFilter() {
         public static final String ID = "SHOW_INHERITED";
 
         @Override
         public boolean isVisible(TreeElement treeNode) {
-            if (treeNode instanceof JSStructureViewElement) {
-                return !((JSStructureViewElement)treeNode).isInherited();
-            }
-            else {
-                return true;
-            }
+            return !(treeNode instanceof JSStructureViewElement structureViewElement && structureViewElement.isInherited());
         }
 
         @Override
@@ -191,12 +177,9 @@ public Shortcut[] getShortcut() {
         }
     };
 
-    private static Grouper myInheritedGrouper = new JSSuperGrouper();
+    private static final Grouper INHERITED_GROUPER = new JSSuperGrouper();
 
-    private Grouper[] myGroupers = new Grouper[]{
-        myInheritedGrouper
-    };
-    private final Class[] myClasses = new Class[]{
+    private static final Class[] SUITABLE_CLASSES = new Class[]{
         JSFunction.class,
         JSVariable.class,
         JSDefinitionExpression.class,
@@ -204,12 +187,15 @@ public Shortcut[] getShortcut() {
         JSProperty.class
     };
 
-    public JSStructureViewModel(final PsiElement root) {
+    private Grouper[] myGroupers = new Grouper[]{INHERITED_GROUPER};
+
+
+    public JSStructureViewModel(PsiElement root) {
         super(root.getContainingFile());
         myRoot = root;
     }
 
-    public JSStructureViewModel(PsiElement root, final Editor editor) {
+    public JSStructureViewModel(PsiElement root, Editor editor) {
         super(editor);
         myRoot = root;
     }
@@ -239,38 +225,36 @@ public Filter[] getFilters() {
     }
 
     @Override
-    protected boolean isSuitable(final PsiElement element) {
+    protected boolean isSuitable(PsiElement element) {
         return super.isSuitable(element)
-            && (!(element instanceof JSVariable) || PsiTreeUtil.getParentOfType(element, JSFunction.class) == null);
+            && !(element instanceof JSVariable variable && PsiTreeUtil.getParentOfType(variable, JSFunction.class) != null);
     }
 
     @Override
+    @RequiredReadAction
     public Object getCurrentEditorElement() {
         Object editorElement = super.getCurrentEditorElement();
 
-        final PsiFile file = getPsiFile();
+        PsiFile file = getPsiFile();
         if (editorElement == null && !(file instanceof JSFile)) {
             final int offset = getEditor().getCaretModel().getOffset();
-            final PsiElement at = file.findElementAt(offset);
-            final PsiLanguageInjectionHost injectionHost = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class);
+            PsiElement at = file.findElementAt(offset);
+            PsiLanguageInjectionHost injectionHost = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class);
 
             if (injectionHost != null) {
-                final Ref<PsiElement> ref = new Ref<PsiElement>();
+                final SimpleReference<PsiElement> ref = new SimpleReference<>();
                 InjectedLanguageManager.getInstance(file.getProject()).enumerate(
                     injectionHost,
-                    new PsiLanguageInjectionHost.InjectedPsiVisitor() {
-                        @Override
-                        public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places) {
-                            final PsiLanguageInjectionHost.Shred shred = places.get(0);
-                            final int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
-                            final int offsetInInjected = offset - injectedStart;
-
-                            ref.set(injectedPsi.findElementAt(offsetInInjected));
-                        }
+                    (injectedPsi, places) -> {
+                        PsiLanguageInjectionHost.Shred shred = places.get(0);
+                        int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
+                        int offsetInInjected = offset - injectedStart;
+
+                        ref.set(injectedPsi.findElementAt(offsetInInjected));
                     }
                 );
 
-                final PsiElement element = ref.get();
+                PsiElement element = ref.get();
                 if (element != null) {
                     editorElement = findAcceptableElement(element);
                     return editorElement;
@@ -278,30 +262,25 @@ public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLan
             }
         }
 
-        if (editorElement instanceof JSDefinitionExpression) {
-            final PsiElement element = ((PsiElement)editorElement).getParent();
-
-            if (element instanceof JSAssignmentExpression) {
-                final JSExpression roperand = ((JSAssignmentExpression)element).getROperand();
-                if (roperand instanceof JSFunctionExpression) {
-                    editorElement = roperand;
-                }
-            }
+        if (editorElement instanceof JSDefinitionExpression definition
+            && definition.getParent() instanceof JSAssignmentExpression assignment
+            && assignment.getROperand() instanceof JSFunctionExpression functionExpr) {
+            editorElement = functionExpr;
         }
 
-        if (editorElement instanceof JSNamedElement) {
-            final PsiFile containingFile = ((PsiElement)editorElement).getContainingFile();
-            final PsiElement context = containingFile.getContext();
-            final int offset = ((PsiElement)editorElement).getTextOffset();
-            final PsiElement element;
+        if (editorElement instanceof JSNamedElement namedElement) {
+            PsiFile containingFile = namedElement.getContainingFile();
+            PsiElement context = containingFile.getContext();
+            int offset = namedElement.getTextOffset();
+            PsiElement element;
 
             if (context != null) {
-                element = JavaScriptIndex.findSymbolWithNameAndOffsetInEntry(((JSNamedElement)editorElement).getName(), offset);
+                element = JavaScriptIndex.findSymbolWithNameAndOffsetInEntry(namedElement.getName(), offset);
             }
             else {
                 element = JavaScriptIndex.findSymbolByFileAndNameAndOffset(
                     containingFile.getVirtualFile().getPath(),
-                    ((JSNamedElement)editorElement).getName(),
+                    namedElement.getName(),
                     offset
                 );
             }
@@ -318,30 +297,30 @@ protected PsiFile getPsiFile() {
         return myRoot.getContainingFile();
     }
 
-    @Override
     @Nonnull
+    @Override
     protected Class[] getSuitableClasses() {
-        return myClasses;
+        return SUITABLE_CLASSES;
     }
 
-    public void setFilters(final Filter[] filters) {
+    public void setFilters(Filter[] filters) {
         myFilters = filters;
     }
 
-    public void setGroupers(final Grouper[] groupers) {
+    public void setGroupers(Grouper[] groupers) {
         myGroupers = groupers;
     }
 
-    public void setSorters(final Sorter[] sorters) {
+    public void setSorters(Sorter[] sorters) {
         mySorters = sorters;
     }
 
     @Override
-    public boolean shouldEnterElement(final Object element) {
+    public boolean shouldEnterElement(Object element) {
         return shouldEnterElementStatic(element);
     }
 
-    public static boolean shouldEnterElementStatic(final Object element) {
+    public static boolean shouldEnterElementStatic(Object element) {
         return element instanceof JSClass;
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
index 47151a44..3053b8a3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
@@ -20,10 +20,10 @@
 import java.util.Collection;
 import java.util.List;
 
-import consulo.application.AllIcons;
 import consulo.fileEditor.structureView.tree.Group;
 import consulo.navigation.ItemPresentation;
 import consulo.fileEditor.structureView.tree.TreeElement;
+import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.image.Image;
 import jakarta.annotation.Nullable;
 
@@ -34,9 +34,9 @@ public class JSSuperGroup implements Group, ItemPresentation {
     private final String myName;
     private final List<TreeElement> myChildren;
 
-    public JSSuperGroup(final String name) {
+    public JSSuperGroup(String name) {
         myName = name;
-        myChildren = new ArrayList<TreeElement>();
+        myChildren = new ArrayList<>();
     }
 
     @Override
@@ -63,7 +63,7 @@ public String getLocationString() {
     @Override
     @Nullable
     public Image getIcon() {
-        return AllIcons.General.InheritedMethod;
+        return PlatformIconGroup.hierarchySubtypes();
     }
 
     void addChild(TreeElement element) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
index e779c2ca..d0813dfa 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
@@ -16,18 +16,18 @@
 
 package com.intellij.lang.javascript.impl.structureView;
 
-import consulo.fileEditor.structureView.tree.*;
-import consulo.ide.localize.IdeLocalize;
-import consulo.project.ui.view.tree.AbstractTreeNode;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSVarStatement;
 import com.intellij.lang.javascript.psi.JSVariable;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.fileEditor.structureView.tree.*;
+import consulo.ide.localize.IdeLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.platform.base.icon.PlatformIconGroup;
+import consulo.project.ui.view.tree.AbstractTreeNode;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -38,50 +38,52 @@
  * @author Maxim.Mossienko
  */
 class JSSuperGrouper implements Grouper {
-    @NonNls
     private static final String SHOW_CLASSES = "SHOW_CLASSES";
 
-    @Override
     @Nonnull
-    public Collection<Group> group(final Object parent, final Collection<TreeElement> children) {
-        if (isParentGrouped((AbstractTreeNode)parent)) {
+    @Override
+    @RequiredReadAction
+    public Collection<Group> group(Object parent, Collection<TreeElement> children) {
+        AbstractTreeNode parentNode = (AbstractTreeNode)parent;
+        if (isParentGrouped(parentNode)) {
             return Collections.emptyList();
         }
-        final Map<String, Group> groups = new HashMap<>();
+        Map<String, Group> groups = new HashMap<>();
 
         for (TreeElement _child : children) {
             if (!(_child instanceof JSStructureViewElement)) {
                 continue;
             }
             JSStructureViewElement child = (JSStructureViewElement)_child;
-            final PsiElement value = child.getValue();
+            PsiElement value = child.getValue();
 
-            if (value instanceof JSVariable) {
+            if (value instanceof JSVariable variable) {
                 if (!child.isInherited()) {
                     continue;
                 }
-                PsiElement parentElement = value.getParent();
-                if (parentElement instanceof JSVarStatement) {
-                    parentElement = parentElement.getParent();
+                PsiElement parentElement = variable.getParent();
+                if (parentElement instanceof JSVarStatement varStatement) {
+                    parentElement = varStatement.getParent();
                 }
                 if (parentElement instanceof JSClass jsClass) {
                     addGroup(groups, _child, jsClass.getQualifiedName());
                 }
             }
-            else if (value instanceof JSFunction) {
-                processFunction((JSStructureViewElement)((AbstractTreeNode)parent).getValue(), groups, _child, value);
+            else if (value instanceof JSFunction function) {
+                processFunction((JSStructureViewElement)parentNode.getValue(), groups, _child, function);
             }
         }
         return groups.values();
     }
 
+    @RequiredReadAction
     private static void processFunction(
         JSStructureViewElement parentElement,
         Map<String, Group> groups,
         TreeElement _child,
         PsiElement value
     ) {
-        final PsiElement element = JSStructureViewElement.getPsiElementResolveProxy(parentElement);
+        PsiElement element = JSStructureViewElement.getPsiElementResolveProxy(parentElement);
         if (element instanceof JSClass parentClass) {
             JSClass declaringClass = JSResolveUtil.findDeclaringClass((JSFunction)value);
             if (parentClass != declaringClass) {
@@ -90,7 +92,7 @@ private static void processFunction(
         }
     }
 
-    private static void addGroup(final Map<String, Group> groups, final TreeElement _child, final String qName) {
+    private static void addGroup(Map<String, Group> groups, TreeElement _child, String qName) {
         JSSuperGroup group = (JSSuperGroup)groups.get(qName);
         if (group == null) {
             groups.put(qName, group = new JSSuperGroup(qName));
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
index c4f9b9ac..7553bc8e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
@@ -31,9 +32,8 @@
 import jakarta.annotation.Nonnull;
 
 /**
- * User: yole
- * Date: 12.07.2005
- * Time: 12:46:24
+ * @author yole
+ * @since 2005-07-12
  */
 @ExtensionImpl
 public class JSExpressionSurroundDescriptor implements SurroundDescriptor {
@@ -43,6 +43,7 @@ public class JSExpressionSurroundDescriptor implements SurroundDescriptor {
 
     @Override
     @Nonnull
+    @RequiredReadAction
     public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
         final JSExpression expr = findExpressionInRange(file, startOffset, endOffset);
         if (expr == null) {
@@ -62,14 +63,15 @@ public boolean isExclusive() {
         return false;
     }
 
+    @RequiredReadAction
     private static JSExpression findExpressionInRange(PsiFile file, int startOffset, int endOffset) {
         PsiElement element1 = file.findElementAt(startOffset);
         PsiElement element2 = file.findElementAt(endOffset - 1);
-        if (element1 instanceof PsiWhiteSpace) {
-            startOffset = element1.getTextRange().getEndOffset();
+        if (element1 instanceof PsiWhiteSpace whiteSpace) {
+            startOffset = whiteSpace.getTextRange().getEndOffset();
         }
-        if (element2 instanceof PsiWhiteSpace) {
-            endOffset = element2.getTextRange().getStartOffset();
+        if (element2 instanceof PsiWhiteSpace whiteSpace) {
+            endOffset = whiteSpace.getTextRange().getStartOffset();
         }
         JSExpression expression = PsiTreeUtil.findElementOfClassAtRange(file, startOffset, endOffset, JSExpression.class);
         if (expression == null || expression.getTextRange().getEndOffset() != endOffset) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
index f70002a6..d14f1cd3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
@@ -16,20 +16,18 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
-import jakarta.annotation.Nonnull;
-
+import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.codeEditor.Editor;
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.surroundWith.Surrounder;
-import consulo.project.Project;
+import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-import org.jetbrains.annotations.NonNls;
-
+import consulo.project.Project;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
-import consulo.language.ast.ASTNode;
-import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
-import consulo.document.util.TextRange;
-import consulo.language.psi.PsiElement;
 
 /**
  * @author yole
@@ -43,32 +41,34 @@ public boolean isApplicable(@Nonnull PsiElement[] elements) {
 
     @Override
     @Nullable
+    @RequiredReadAction
     public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements)
         throws IncorrectOperationException {
         ASTNode node = JSChangeUtil.createStatementFromText(project, getStatementTemplate(project, elements[0]));
 
         PsiElement container = elements[0].getParent();
         container.getNode().addChild(node, elements[0].getNode());
-        final ASTNode insertBeforeNode = getInsertBeforeNode(node);
+        ASTNode insertBeforeNode = getInsertBeforeNode(node);
 
-        for (int i = 0; i < elements.length; i++) {
-            final ASTNode childNode = elements[i].getNode();
+        for (PsiElement element : elements) {
+            final ASTNode childNode = element.getNode();
             final ASTNode childNodeCopy = childNode.copyElement();
 
             container.getNode().removeChild(childNode);
             insertBeforeNode.getTreeParent().addChild(childNodeCopy, insertBeforeNode);
         }
 
-        final CodeStyleManager csManager = CodeStyleManager.getInstance(project);
+        CodeStyleManager csManager = CodeStyleManager.getInstance(project);
         csManager.reformat(node.getPsi());
 
         return getSurroundSelectionRange(node);
     }
 
-    @NonNls
-    protected abstract String getStatementTemplate(final Project project, PsiElement context);
+    protected abstract String getStatementTemplate(Project project, PsiElement context);
 
-    protected abstract ASTNode getInsertBeforeNode(final ASTNode statementNode);
+    @RequiredReadAction
+    protected abstract ASTNode getInsertBeforeNode(ASTNode statementNode);
 
-    protected abstract TextRange getSurroundSelectionRange(final ASTNode statementNode);
+    @RequiredReadAction
+    protected abstract TextRange getSurroundSelectionRange(ASTNode statementNode);
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
index 533fe40a..aa71ff34 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.impl.JSEmbeddedContentImpl;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
@@ -60,6 +61,7 @@ public class JSStatementsSurroundDescriptor implements SurroundDescriptor {
 
     @Override
     @Nonnull
+    @RequiredReadAction
     public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
         final PsiElement[] statements = findStatementsInRange(file, startOffset, endOffset);
         if (statements == null) {
@@ -79,23 +81,26 @@ public boolean isExclusive() {
         return false;
     }
 
+    @RequiredReadAction
     private PsiElement[] findStatementsInRange(PsiFile file, int startOffset, int endOffset) {
         PsiElement element1 = file.findElementAt(startOffset);
         PsiElement element2 = file.findElementAt(endOffset - 1);
-        if (element1 instanceof PsiWhiteSpace) {
-            startOffset = element1.getTextRange().getEndOffset();
+        if (element1 instanceof PsiWhiteSpace whiteSpace) {
+            startOffset = whiteSpace.getTextRange().getEndOffset();
             element1 = file.findElementAt(startOffset);
         }
-        if (element2 instanceof PsiWhiteSpace) {
-            endOffset = element2.getTextRange().getStartOffset();
+
+        if (element2 instanceof PsiWhiteSpace whiteSpace) {
+            endOffset = whiteSpace.getTextRange().getStartOffset();
             element2 = file.findElementAt(endOffset - 1);
         }
+
         if (element1 == null || element2 == null) {
             return null;
         }
 
-        final JSStatement statement = PsiTreeUtil.getParentOfType(element1, JSStatement.class);
-        final JSStatement statement2 = PsiTreeUtil.getParentOfType(element2, JSStatement.class);
+        JSStatement statement = PsiTreeUtil.getParentOfType(element1, JSStatement.class);
+        JSStatement statement2 = PsiTreeUtil.getParentOfType(element2, JSStatement.class);
 
         PsiElement parent = PsiTreeUtil.findCommonParent(element1, element2);
         while (true) {
@@ -104,8 +109,8 @@ private PsiElement[] findStatementsInRange(PsiFile file, int startOffset, int en
                 && PsiTreeUtil.isAncestor(parent, statement2, false)))) {
                 break;
             }
-            if (parent instanceof JSStatement) {
-                parent = parent.getParent();
+            if (parent instanceof JSStatement parentStatement) {
+                parent = parentStatement.getParent();
                 break;
             }
             if (parent instanceof PsiFile) {
@@ -114,10 +119,10 @@ private PsiElement[] findStatementsInRange(PsiFile file, int startOffset, int en
             parent = parent.getParent();
         }
 
-
         while (!element1.getParent().equals(parent)) {
             element1 = element1.getParent();
         }
+
         if (startOffset != element1.getTextRange().getStartOffset()) {
             return null;
         }
@@ -129,13 +134,13 @@ private PsiElement[] findStatementsInRange(PsiFile file, int startOffset, int en
             return null;
         }
 
-        final ASTNode[] astNodes = parent.getNode().getChildren(null);
-        List<PsiElement> children = new ArrayList<PsiElement>(astNodes.length);
+        ASTNode[] astNodes = parent.getNode().getChildren(null);
+        List<PsiElement> children = new ArrayList<>(astNodes.length);
         for (ASTNode node : astNodes) {
             children.add(node.getPsi());
         }
 
-        ArrayList<PsiElement> array = new ArrayList<PsiElement>();
+        ArrayList<PsiElement> array = new ArrayList<>();
         boolean flag = false;
         for (PsiElement child : children) {
             if (child.equals(element1)) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
index e8a61738..375c4d87 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.language.ast.ASTNode;
 import consulo.project.Project;
@@ -32,17 +33,19 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "{ }";
     }
 
     @Override
-    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
         return statementNode.getLastChildNode();
     }
 
     @Override
-    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         int endOffset = statementNode.getTextRange().getEndOffset();
         return new TextRange(endOffset, endOffset);
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
index 3deb26ef..14ac48de 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.surroundWith;
 
 import com.intellij.lang.javascript.psi.JSDoWhileStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
@@ -34,18 +35,20 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "do { } while (true);";
     }
 
     @Override
-    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
         JSDoWhileStatement stmt = (JSDoWhileStatement)statementNode.getPsi();
         return stmt.getBody().getLastChild().getNode();
     }
 
     @Override
-    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         JSDoWhileStatement stmt = (JSDoWhileStatement)statementNode.getPsi();
         return stmt.getCondition().getTextRange();
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
index ec2cb53c..c0aaecf0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSForStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
@@ -37,22 +38,24 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "for(i=0; i<1; i++) { }";
     }
 
     @Override
-    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
         JSForStatement forStatement = (JSForStatement)statementNode.getPsi();
         return forStatement.getBody().getLastChild().getNode();
     }
 
     @Override
-    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         for (ASTNode childNode : statementNode.getChildren(null)) {
-            if (childNode.getElementType() == JSTokenTypes.SEMICOLON ||
-                childNode.getPsi() instanceof PsiWhiteSpace ||
-                childNode.getPsi() instanceof JSExpression) {
+            if (childNode.getElementType() == JSTokenTypes.SEMICOLON
+                || childNode.getPsi() instanceof PsiWhiteSpace
+                || childNode.getPsi() instanceof JSExpression) {
                 statementNode.removeChild(childNode);
             }
             else if (childNode.getElementType() == JSTokenTypes.RPAR) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
index 1f648288..5171456b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
@@ -20,6 +20,7 @@
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
@@ -33,22 +34,27 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "aaa = function () { }" + JSChangeUtil.getSemicolon(project);
     }
 
     @Override
-    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
         JSFunctionExpression stmt = getFunctionExpr(statementNode);
         return stmt.getBody()[0].getLastChild().getNode();
     }
 
-    private static JSFunctionExpression getFunctionExpr(final ASTNode statementNode) {
-        return (JSFunctionExpression)((JSAssignmentExpression)((JSExpressionStatement)statementNode.getPsi()).getExpression()).getROperand();
+    @RequiredReadAction
+    private static JSFunctionExpression getFunctionExpr(ASTNode statementNode) {
+        JSExpressionStatement expression = (JSExpressionStatement)statementNode.getPsi();
+        JSAssignmentExpression assignment = (JSAssignmentExpression)expression.getExpression();
+        return (JSFunctionExpression)assignment.getROperand();
     }
 
     @Override
-    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         JSFunctionExpression stmt = getFunctionExpr(statementNode);
         ASTNode conditionNode = stmt.getNameIdentifier().getNode();
         int offset = conditionNode.getStartOffset();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
index 3d15810b..9403cb83 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.surroundWith;
 
 import com.intellij.lang.javascript.psi.JSFunction;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
@@ -30,18 +31,20 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "function $name$() { }";
     }
 
     @Override
-    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
         JSFunction stmt = (JSFunction)statementNode.getPsi();
         return stmt.getBody()[0].getLastChild().getNode();
     }
 
     @Override
-    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         JSFunction stmt = (JSFunction)statementNode.getPsi();
         ASTNode conditionNode = stmt.getNameIdentifier().getNode();
         int offset = conditionNode.getStartOffset();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
index edf1dc8d..327bc4bc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
@@ -31,7 +31,7 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "if (a) { } else { }";
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
index d5e4a826..4a5ce6f6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
@@ -17,12 +17,12 @@
 package com.intellij.lang.javascript.impl.surroundWith;
 
 import com.intellij.lang.javascript.psi.JSIfStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author yole
@@ -35,19 +35,20 @@ public String getTemplateDescription() {
     }
 
     @Override
-    @NonNls
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "if(a) { }";
     }
 
     @Override
-    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
         JSIfStatement stmt = (JSIfStatement)statementNode.getPsi();
         return stmt.getThen().getNode().getLastChildNode();
     }
 
     @Override
-    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         JSIfStatement stmt = (JSIfStatement)statementNode.getPsi();
         ASTNode conditionNode = stmt.getCondition().getNode();
         int offset = conditionNode.getStartOffset();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
index 5ed80841..5d9c66dc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
@@ -18,6 +18,7 @@
 
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.codeEditor.Editor;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
@@ -45,8 +46,9 @@ public boolean isApplicable(@Nonnull PsiElement[] elements) {
         return true;
     }
 
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements)
         throws IncorrectOperationException {
         JSExpression expr = (JSExpression)elements[0];
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
index 64ee1929..fe0f766e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -20,13 +20,13 @@
 import com.intellij.lang.javascript.psi.JSCatchBlock;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSTryStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author yole
@@ -39,11 +39,12 @@ public String getTemplateDescription() {
     }
 
     @Override
-    @NonNls
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    @RequiredReadAction
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "try { } catch(e" + getExceptionVarTypeBasedOnContext(context) + ") { } finally { }";
     }
 
+    @RequiredReadAction
     protected static String getExceptionVarTypeBasedOnContext(@Nonnull PsiElement context) {
         if (context.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
             return ":Error";
@@ -52,13 +53,15 @@ protected static String getExceptionVarTypeBasedOnContext(@Nonnull PsiElement co
     }
 
     @Override
-    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
         JSTryStatement stmt = (JSTryStatement)statementNode.getPsi();
         return stmt.getStatement().getLastChild().getNode();
     }
 
     @Override
-    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         JSTryStatement stmt = (JSTryStatement)statementNode.getPsi();
         final JSCatchBlock catchBlock = stmt.getCatchBlock();
         if (catchBlock != null) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
index 44397c6b..9a1893bf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
@@ -31,7 +32,8 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    @RequiredReadAction
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "try { } catch(e" + getExceptionVarTypeBasedOnContext(context) + ") { }";
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
index 9c56f549..1c0db9a7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.impl.surroundWith;
 
+import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
@@ -31,7 +32,8 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    @RequiredReadAction
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "try { } finally { }";
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
index f7b1a6ac..750da8ec 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.surroundWith;
 
 import com.intellij.lang.javascript.psi.JSWhileStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
@@ -34,18 +35,20 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "while(true) { }";
     }
 
     @Override
+    @RequiredReadAction
     protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
         JSWhileStatement stmt = (JSWhileStatement)statementNode.getPsi();
         return stmt.getBody().getLastChild().getNode();
     }
 
     @Override
-    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         JSWhileStatement stmt = (JSWhileStatement)statementNode.getPsi();
         return stmt.getCondition().getTextRange();
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
index 2f1b2044..d02ddb1d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.impl.surroundWith;
 
 import com.intellij.lang.javascript.psi.JSWithStatement;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
@@ -24,11 +25,8 @@
 import consulo.project.Project;
 
 /**
- * Created by IntelliJ IDEA.
- * User: yole
- * Date: 12.07.2005
- * Time: 19:34:54
- * To change this template use File | Settings | File Templates.
+ * @author yole
+ * @since 2005-07-12
  */
 public class JSWithWithSurrounder extends JSStatementSurrounder {
     @Override
@@ -37,18 +35,20 @@ public String getTemplateDescription() {
     }
 
     @Override
-    protected String getStatementTemplate(final Project project, PsiElement context) {
+    protected String getStatementTemplate(Project project, PsiElement context) {
         return "with(a) { }";
     }
 
     @Override
-    protected ASTNode getInsertBeforeNode(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
         JSWithStatement stmt = (JSWithStatement)statementNode.getPsi();
         return stmt.getStatement().getLastChild().getNode();
     }
 
     @Override
-    protected TextRange getSurroundSelectionRange(final ASTNode statementNode) {
+    @RequiredReadAction
+    protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         JSWithStatement stmt = (JSWithStatement)statementNode.getPsi();
         ASTNode conditionNode = stmt.getExpression().getNode();
         int offset = conditionNode.getStartOffset();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
index c748e778..b4547379 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
@@ -16,40 +16,25 @@
 
 package com.intellij.lang.javascript.impl.validation;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.language.ast.ASTNode;
-import consulo.language.util.IncorrectOperationException;
-import consulo.util.lang.StringUtil;
-import org.jetbrains.annotations.NonNls;
-import jakarta.annotation.Nonnull;
-
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.impl.flex.ImportUtils;
 import com.intellij.lang.javascript.impl.generation.JSNamedElementNode;
-import com.intellij.lang.javascript.psi.JSAttributeList;
-import com.intellij.lang.javascript.psi.JSAttributeListOwner;
-import com.intellij.lang.javascript.psi.JSClass;
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSFunction;
-import com.intellij.lang.javascript.psi.JSNamedElement;
-import com.intellij.lang.javascript.psi.JSParameter;
-import com.intellij.lang.javascript.psi.JSParameterList;
-import com.intellij.lang.javascript.psi.JSVariable;
+import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.codeEditor.Editor;
-import consulo.project.Project;
+import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.util.IncorrectOperationException;
+import consulo.project.Project;
+import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
+
+import java.util.*;
 
 /**
  * @author Maxim.Mossienko
@@ -64,7 +49,8 @@ public BaseCreateMethodsFix(final JSClass jsClass) {
         myJsClass = jsClass;
     }
 
-    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
+    @RequiredWriteAction
+    public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
         evalAnchor(editor, file);
         for (T e : getElementsToProcess()) {
             anchor = doAddOneMethod(project, buildFunctionText(e), anchor);
@@ -72,14 +58,15 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
     }
 
     @RequiredReadAction
-    protected void evalAnchor(final Editor editor, final PsiFile file) {
+    protected void evalAnchor(Editor editor, PsiFile file) {
         anchor = null;
-        final PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
+        PsiElement at = file.findElementAt(editor.getCaretModel().getOffset());
         PsiElement parent = at != null ? at.getParent() : null;
 
-        if (parent == myJsClass || (parent instanceof JSFile
-            && myJsClass.getParent().getContainingFile() == parent.getContext().getContainingFile())) {
-            final ASTNode atNode = at.getNode();
+        if (parent == myJsClass || (parent instanceof JSFile jsFile
+            && myJsClass.getParent().getContainingFile() == jsFile.getContext().getContainingFile())) {
+
+            ASTNode atNode = at.getNode();
             if (atNode.getElementType() == JSTokenTypes.RBRACE) {
                 return;
             }
@@ -93,13 +80,13 @@ protected void evalAnchor(final Editor editor, final PsiFile file) {
         }
     }
 
-    @RequiredReadAction
-    protected PsiElement doAddOneMethod(final Project project, final String functionText, PsiElement anchor)
+    @RequiredWriteAction
+    protected PsiElement doAddOneMethod(Project project, String functionText, PsiElement anchor)
         throws IncorrectOperationException {
         if (StringUtil.isNotEmpty(functionText)) {
             PsiElement element = JSChangeUtil.createJSTreeFromText(project, functionText).getPsi();
-            if (element instanceof PsiWhiteSpace) {
-                element = element.getNextSibling();
+            if (element instanceof PsiWhiteSpace whiteSpace) {
+                element = whiteSpace.getNextSibling();
             }
 
             boolean defaultAdd = true;
@@ -121,19 +108,19 @@ protected PsiElement doAddOneMethod(final Project project, final String function
         return anchor;
     }
 
-    @RequiredReadAction
-    public String buildFunctionText(final T fun) {
-        final JSAttributeList attributeList = fun.getAttributeList();
+    @RequiredWriteAction
+    public String buildFunctionText(T fun) {
+        JSAttributeList attributeList = fun.getAttributeList();
         String attrText = attributeList != null ? attributeList.getText() : "";
 
         attrText = buildFunctionAttrText(attrText, attributeList, fun);
 
-        final JSFunction function = fun instanceof JSFunction jsFun ? jsFun : null;
-        final JSVariable var = fun instanceof JSVariable jsVar ? jsVar : null;
+        JSFunction function = fun instanceof JSFunction jsFun ? jsFun : null;
+        JSVariable var = fun instanceof JSVariable jsVar ? jsVar : null;
         assert var != null || function != null;
 
-        final JSParameterList parameterList = (function != null) ? function.getParameterList() : null;
-        final String typeString = importType(function != null ? function.getReturnTypeString() : var.getTypeString(), fun);
+        JSParameterList parameterList = (function != null) ? function.getParameterList() : null;
+        String typeString = importType(function != null ? function.getReturnTypeString() : var.getTypeString(), fun);
         StringBuilder functionText = new StringBuilder(attrText);
         if (!functionText.isEmpty()) {
             functionText.append(" ");
@@ -151,18 +138,17 @@ public String buildFunctionText(final T fun) {
         return functionText.toString();
     }
 
-    protected
-    @NonNls
-    String buildReturnType(final String typeString) {
+    protected String buildReturnType(String typeString) {
         return typeString;
     }
 
-    protected String importType(final String s, T fun) {
+    @RequiredWriteAction
+    protected String importType(String s, T fun) {
         if (s == null) {
             return null;
         }
-        if (fun instanceof JSFunction) {
-            final String resolvedTypeName = JSImportHandlingUtil.resolveTypeName(s, fun);
+        if (fun instanceof JSFunction function) {
+            String resolvedTypeName = JSImportHandlingUtil.resolveTypeName(s, function);
 
             if (!resolvedTypeName.equals(s)) {
                 ImportUtils.doImport(myJsClass, resolvedTypeName);
@@ -171,11 +157,11 @@ protected String importType(final String s, T fun) {
         return s;
     }
 
-    @RequiredReadAction
-    protected String buildParameterList(final JSParameterList parameterList, final T fun) {
+    @RequiredWriteAction
+    protected String buildParameterList(JSParameterList parameterList, T fun) {
         if (parameterList != null) {
             for (JSParameter param : parameterList.getParameters()) {
-                final String s = param.getTypeString();
+                String s = param.getTypeString();
                 if (s != null) {
                     importType(s, fun);
                 }
@@ -185,12 +171,12 @@ protected String buildParameterList(final JSParameterList parameterList, final T
     }
 
     @RequiredReadAction
-    protected String buildName(final T fun) {
+    protected String buildName(T fun) {
         return fun.getName();
     }
 
     @RequiredReadAction
-    protected String buildFunctionKind(final T fun) {
+    protected String buildFunctionKind(T fun) {
         if (fun instanceof JSFunction function) {
             if (function.isGetProperty()) {
                 return "get ";
@@ -202,20 +188,20 @@ else if (function.isSetProperty()) {
         return "";
     }
 
-    protected String buildFunctionBodyText(String retType, final JSParameterList parameterList, final T func) {
+    protected String buildFunctionBodyText(String retType, JSParameterList parameterList, T func) {
         return " {}";
     }
 
-    protected String buildFunctionAttrText(String attrText, final JSAttributeList attributeList, final T function) {
+    protected String buildFunctionAttrText(String attrText, JSAttributeList attributeList, T function) {
         return attrText.replace("native", "").trim();
     }
 
-    public void addElementToProcess(final T function) {
+    public void addElementToProcess(T function) {
         elementsToProcess.add(function);
     }
 
     @SuppressWarnings("unchecked")
-    public void addElementsToProcessFrom(final Collection<JSNamedElementNode> selectedElements) {
+    public void addElementsToProcessFrom(Collection<JSNamedElementNode> selectedElements) {
         for (JSNamedElementNode el : selectedElements) {
             addElementToProcess((T)el.getPsiElement());
         }
@@ -223,17 +209,17 @@ public void addElementsToProcessFrom(final Collection<JSNamedElementNode> select
 
     @SuppressWarnings("unchecked")
     public Set<T> getElementsToProcess() {
-        final T[] objects = (T[])elementsToProcess.toArray(new JSNamedElement[elementsToProcess.size()]);
-        final Comparator<T> tComparator = (o1, o2) -> o1.getTextOffset() - o2.getTextOffset();
+        T[] objects = (T[])elementsToProcess.toArray(new JSNamedElement[elementsToProcess.size()]);
+        Comparator<T> tComparator = (o1, o2) -> o1.getTextOffset() - o2.getTextOffset();
 
-        final int size = elementsToProcess.size();
-        final LinkedHashSet<T> result = new LinkedHashSet<>(size);
-        final List<T> objectsFromSameFile = new ArrayList<>();
+        int size = elementsToProcess.size();
+        LinkedHashSet<T> result = new LinkedHashSet<>(size);
+        List<T> objectsFromSameFile = new ArrayList<>();
         PsiFile containingFile = null;
 
         for (int i = 0; i < size; ++i) {
-            final T object = objects[i];
-            final PsiFile currentContainingFile = object.getContainingFile();
+            T object = objects[i];
+            PsiFile currentContainingFile = object.getContainingFile();
 
             if (currentContainingFile != containingFile) {
                 if (containingFile != null) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
index ffaaf52d..9b28068c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
@@ -34,7 +34,7 @@
  * @since 2008-07-17
  */
 public class ImplementMethodsFix extends BaseCreateMethodsFix<JSFunction> implements SyntheticIntentionAction {
-    public ImplementMethodsFix(final JSClass jsClass) {
+    public ImplementMethodsFix(JSClass jsClass) {
         super(jsClass);
     }
 
@@ -45,19 +45,19 @@ public String getText() {
     }
 
     @Override
-    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
         return myJsClass.isValid();
     }
 
     @Override
-    protected String buildFunctionAttrText(String attrText, final JSAttributeList attributeList, final JSFunction function) {
+    protected String buildFunctionAttrText(String attrText, JSAttributeList attributeList, JSFunction function) {
         return attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC
             ? "public"
             : super.buildFunctionAttrText(attrText, attributeList, function);
     }
 
     @Override
-    protected String buildFunctionBodyText(final String retType, final JSParameterList parameterList, final JSFunction func) {
+    protected String buildFunctionBodyText(String retType, JSParameterList parameterList, JSFunction func) {
         StringBuilder s = new StringBuilder("{\n");
         if (retType != null && !"void".equals(retType)) {
             s.append("return ").append(defaultValueOfType(retType)).append(JSChangeUtil.getSemicolon(func.getProject())).append("\n");
@@ -65,7 +65,7 @@ protected String buildFunctionBodyText(final String retType, final JSParameterLi
         return s.append("}").toString();
     }
 
-    private static String defaultValueOfType(final String retType) {
+    private static String defaultValueOfType(String retType) {
         return switch (retType) {
             case "int", "uint", "Number" -> "0";
             case "Boolean" -> "false";
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
index 75963498..72137e98 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
@@ -25,6 +25,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 import java.util.LinkedHashMap;
@@ -38,27 +39,27 @@
 public abstract class ImplementedMethodProcessor extends JSResolveUtil.CollectMethodsToImplementProcessor {
     protected final JSClass myJsClass;
 
-    public ImplementedMethodProcessor(final JSClass jsClass) {
+    public ImplementedMethodProcessor(JSClass jsClass) {
         super(null, null);
         myJsClass = jsClass;
     }
 
     @Override
-    protected boolean process(final ResolveProcessor processor) {
+    protected boolean process(ResolveProcessor processor) {
         Map<String, Object> functions = null;
 
         for (PsiElement _function : processor.getResults()) {
             if (!(_function instanceof JSFunction function)) {
                 continue;
             }
-            final String name = function.getName();
+            String name = function.getName();
 
             if (functions == null) {
                 functions = collectAllVisibleClassFunctions(
                     myJsClass,
                     null,
                     jsFunction -> {
-                        final JSAttributeList attributeList = jsFunction.getAttributeList();
+                        JSAttributeList attributeList = jsFunction.getAttributeList();
                         PsiElement parentClass = JSResolveUtil.findParent(jsFunction);
                         if ((attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC)
                             && myJsClass != parentClass) {
@@ -90,15 +91,11 @@ protected boolean process(final ResolveProcessor processor) {
         return true;
     }
 
-    protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction) {
+    protected void addImplementedFunction(JSFunction interfaceFunction, JSFunction implementationFunction) {
     }
 
     @RequiredReadAction
-    public static JSFunction findFunctionWithTheSameKind(
-        final Map<String, Object> functions,
-        final JSFunction function,
-        final String name
-    ) {
+    public static JSFunction findFunctionWithTheSameKind(Map<String, Object> functions, JSFunction function, String name) {
         Object o = functions.get(name);
         if (o instanceof JSFunction fun) {
             return fun.getKind() == function.getKind() ? fun : null;
@@ -128,13 +125,13 @@ public static Map<String, Object> collectAllVisibleClassFunctions(
 
                 @Override
                 @RequiredReadAction
-                public boolean execute(final PsiElement element, final ResolveState state) {
+                public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                     if (element instanceof JSFunction function) {
                         if (function.isConstructor()) {
                             return true; // SWC stubs have constructor methods :(
                         }
 
-                        final JSAttributeList attributeList = function.getAttributeList();
+                        JSAttributeList attributeList = function.getAttributeList();
                         if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PRIVATE) {
                             return true;
                         }
@@ -143,16 +140,15 @@ public boolean execute(final PsiElement element, final ResolveState state) {
                         if (filterValue != null && !filterValue) {
                             return true;
                         }
-                        final String s = function.getName();
-                        final Object function1 = functions.get(s);
+                        String s = function.getName();
+                        Object function1 = functions.get(s);
 
                         if (function1 == null) {
                             functions.put(s, function);
                         }
-                        else if (function1 instanceof JSFunction function2) {
-                            if (findFunctionWithTheSameKind(functions, function, s) == null) {
-                                functions.put(s, new JSFunction[]{function2, function});
-                            }
+                        else if (function1 instanceof JSFunction function2
+                            && findFunctionWithTheSameKind(functions, function, s) == null) {
+                            functions.put(s, new JSFunction[]{function2, function});
                         }
                     }
                     return true;
@@ -165,5 +161,5 @@ else if (function1 instanceof JSFunction function2) {
         return functions;
     }
 
-    protected abstract void addNonimplementedFunction(final JSFunction function);
+    protected abstract void addNonimplementedFunction(JSFunction function);
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index f8042216..9d7d6e16 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -25,6 +25,7 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.util.JSUtils;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.codeEditor.Editor;
 import consulo.document.util.TextRange;
 import consulo.javascript.localize.JavaScriptLocalize;
@@ -51,7 +52,7 @@
 import consulo.module.content.ProjectRootManager;
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
-import consulo.util.lang.ref.Ref;
+import consulo.util.lang.ref.SimpleReference;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTagChild;
@@ -60,7 +61,8 @@
 import java.util.*;
 
 /**
- * @by max, maxim.mossienko
+ * @author max
+ * @author maxim.mossienko
  */
 public class JSAnnotatingVisitor extends JSElementVisitor implements Annotator {
     private AnnotationHolder myHolder;
@@ -74,13 +76,13 @@ public synchronized void annotate(PsiElement psiElement, @Nonnull AnnotationHold
 
     @Override
     @RequiredReadAction
-    public void visitJSAttributeNameValuePair(final JSAttributeNameValuePair attributeNameValuePair) {
+    public void visitJSAttributeNameValuePair(JSAttributeNameValuePair attributeNameValuePair) {
         checkReferences(attributeNameValuePair, HighlightSeverity.ERROR);
     }
 
     @Override
     @RequiredReadAction
-    public void visitJSIncludeDirective(final JSIncludeDirective includeDirective) {
+    public void visitJSIncludeDirective(JSIncludeDirective includeDirective) {
         checkReferences(includeDirective, HighlightSeverity.ERROR);
     }
 
@@ -91,19 +93,18 @@ public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
     }
 
     @RequiredReadAction
-    private void checkReferences(final PsiElement includeDirective, HighlightSeverity kind) {
+    private void checkReferences(PsiElement includeDirective, HighlightSeverity kind) {
         for (PsiReference ref : includeDirective.getReferences()) {
             if (!ref.isSoft() && hasBadResolve(ref)) {
-                final TextRange elementRange = ref.getElement().getTextRange();
-                final TextRange textRange = ref.getRangeInElement();
+                TextRange elementRange = ref.getElement().getTextRange();
+                TextRange textRange = ref.getRangeInElement();
 
-                final TextRange range = new TextRange(
+                TextRange range = new TextRange(
                     elementRange.getStartOffset() + textRange.getStartOffset(),
                     elementRange.getStartOffset() + textRange.getEndOffset()
                 );
-                final LocalizeValue value = ((EmptyResolveMessageProvider)ref).buildUnresolvedMessage(ref.getCanonicalText());
-                AnnotationBuilder builder = myHolder.newAnnotation(kind, value)
-                    .range(range);
+                LocalizeValue value = ((EmptyResolveMessageProvider)ref).buildUnresolvedMessage(ref.getCanonicalText());
+                AnnotationBuilder builder = myHolder.newAnnotation(kind, value).range(range);
 
                 if (ref instanceof LocalQuickFixProvider localQuickFixProvider) {
                     for (LocalQuickFix fix : localQuickFixProvider.getQuickFixes()) {
@@ -118,7 +119,7 @@ private void checkReferences(final PsiElement includeDirective, HighlightSeverit
     }
 
     @RequiredReadAction
-    private boolean hasBadResolve(final PsiReference ref) {
+    private boolean hasBadResolve(PsiReference ref) {
         return ref instanceof PsiPolyVariantReference psiPolyVariantReference
             ? psiPolyVariantReference.multiResolve(false).length == 0
             : ref.resolve() == null;
@@ -126,38 +127,38 @@ private boolean hasBadResolve(final PsiReference ref) {
 
     @Override
     @RequiredReadAction
-    public void visitJSCallExpression(final JSCallExpression node) {
-        final JSExpression methodExpression = node.getMethodExpression();
+    public void visitJSCallExpression(JSCallExpression node) {
+        JSExpression methodExpression = node.getMethodExpression();
 
-        if (methodExpression instanceof JSLiteralExpression) {
+        if (methodExpression instanceof JSLiteralExpression literal) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptParserMessageExpectedFunctionName())
-                .range(methodExpression)
+                .range(literal)
                 .create();
         }
     }
 
     @Override
     @RequiredReadAction
-    public void visitJSDocTagValue(final JSDocTagValue tagValue) {
+    public void visitJSDocTagValue(@Nonnull JSDocTagValue tagValue) {
         checkReferences(tagValue, HighlightSeverity.WARNING);
     }
 
     @Override
     @RequiredReadAction
-    public void visitJSDocTag(final JSDocTag tagValue) {
+    public void visitJSDocTag(@Nonnull JSDocTag tagValue) {
         checkReferences(tagValue, HighlightSeverity.WARNING);
     }
 
     @Override
     @RequiredReadAction
-    public void visitJSReferenceList(final JSReferenceList referenceList) {
-        final JSClass jsClass = (JSClass)referenceList.getParent();
+    public void visitJSReferenceList(JSReferenceList referenceList) {
+        JSClass jsClass = (JSClass)referenceList.getParent();
         if (JSResolveUtil.isArtificialClassUsedForReferenceList(jsClass)) {
             return; // implements="MyInterface" in mxml has artificial class created
         }
 
-        final boolean withinExtends = jsClass.getExtendsList() == referenceList;
-        final boolean withinImplements = jsClass.getImplementsList() == referenceList;
+        boolean withinExtends = jsClass.getExtendsList() == referenceList;
+        boolean withinImplements = jsClass.getImplementsList() == referenceList;
 
         if (withinImplements && jsClass.isInterface()) {
             myHolder.newAnnotation(
@@ -169,12 +170,12 @@ public void visitJSReferenceList(final JSReferenceList referenceList) {
             return;
         }
 
-        final Map<String, JSReferenceExpression> nameToExprMap = new HashMap<>();
+        Map<String, JSReferenceExpression> nameToExprMap = new HashMap<>();
 
-        final JSReferenceExpression[] referenceExpressions = referenceList.getExpressions();
+        JSReferenceExpression[] referenceExpressions = referenceList.getExpressions();
         if (referenceExpressions != null) {
             for (JSReferenceExpression expr : referenceExpressions) {
-                final String s = expr.getReferencedName();
+                String s = expr.getReferencedName();
                 if (s != null) {
                     nameToExprMap.put(s, expr);
                 }
@@ -182,8 +183,8 @@ public void visitJSReferenceList(final JSReferenceList referenceList) {
         }
 
         for (JSClass clazz : referenceList.getReferencedClasses()) {
-            final boolean isInterface = clazz.isInterface();
-            final JSReferenceExpression expr = nameToExprMap.get(clazz.getName());
+            boolean isInterface = clazz.isInterface();
+            JSReferenceExpression expr = nameToExprMap.get(clazz.getName());
 
             if (!isInterface && withinImplements) {
                 myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageInterfaceNameExpectedHere())
@@ -214,13 +215,13 @@ else if (withinExtends && isInterface != jsClass.isInterface()) {
     }
 
     public static void checkImplementedMethods(final JSClass jsClass, final AnnotationHolder holder) {
-        final JSResolveUtil.CollectMethodsToImplementProcessor implementedMethodProcessor = new ImplementedMethodProcessor(jsClass) {
+        JSResolveUtil.CollectMethodsToImplementProcessor implementedMethodProcessor = new ImplementedMethodProcessor(jsClass) {
             ImplementMethodsFix implementMethodsFix = null;
 
             @Override
             @RequiredReadAction
-            protected void addNonimplementedFunction(final JSFunction function) {
-                final PsiElement node = myJsClass.getNameIdentifier();
+            protected void addNonimplementedFunction(JSFunction function) {
+                PsiElement node = myJsClass.getNameIdentifier();
                 if (node == null) {
                     return;
                 }
@@ -242,10 +243,10 @@ protected void addNonimplementedFunction(final JSFunction function) {
 
             @Override
             @RequiredReadAction
-            protected void addImplementedFunction(final JSFunction interfaceFunction, final JSFunction implementationFunction) {
+            protected void addImplementedFunction(JSFunction interfaceFunction, JSFunction implementationFunction) {
                 final JSAttributeList attributeList = implementationFunction.getAttributeList();
                 if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
-                    final ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
+                    ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
                     holder.newAnnotation(
                             HighlightSeverity.ERROR,
                             JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidAccessModifier()
@@ -254,12 +255,12 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
                         .create(); // TODO: quickfix
                 }
 
-                final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(implementationFunction, interfaceFunction);
+                SignatureMatchResult incompatibleSignature = checkCompatibleSignature(implementationFunction, interfaceFunction);
 
                 if (incompatibleSignature != SignatureMatchResult.COMPATIBLE_SIGNATURE) {
                     PsiElement parent = JSResolveUtil.findParent(implementationFunction);
-                    if (parent instanceof JSFile) {
-                        parent = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+                    if (parent instanceof JSFile jsFile) {
+                        parent = JSResolveUtil.getClassReferenceForXmlFromContext(jsFile);
                     }
 
                     if (parent != myJsClass) {
@@ -269,8 +270,8 @@ protected void addImplementedFunction(final JSFunction interfaceFunction, final
                     }
 
                     if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
-                        final JSParameterList parameterList = implementationFunction.getParameterList();
-                        final JSParameterList expectedParameterList = interfaceFunction.getParameterList();
+                        JSParameterList parameterList = implementationFunction.getParameterList();
+                        JSParameterList expectedParameterList = interfaceFunction.getParameterList();
                         holder.newAnnotation(
                                 HighlightSeverity.ERROR,
                                 JavaScriptLocalize.javascriptValidationMessageInterfaceMethodInvalidSignature(
@@ -302,9 +303,10 @@ else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
         JSResolveUtil.processInterfaceMethods(jsClass, implementedMethodProcessor);
     }
 
-    private static ASTNode findElementForAccessModifierError(final @Nonnull JSFunction o, final JSAttributeList attributeList) {
+    @RequiredReadAction
+    private static ASTNode findElementForAccessModifierError(@Nonnull JSFunction o, JSAttributeList attributeList) {
         if (attributeList != null) {
-            final PsiElement accessTypeElement = attributeList.findAccessTypeElement();
+            PsiElement accessTypeElement = attributeList.findAccessTypeElement();
             if (accessTypeElement != null) {
                 return accessTypeElement.getNode();
             }
@@ -380,7 +382,7 @@ else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
                 if (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL
                     || attributeList.getNode().findChildByType(JSTokenTypes.INTERNAL_KEYWORD) != null
                 ) {
-                    final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.ACCESS_MODIFIERS);
+                    ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.ACCESS_MODIFIERS);
                     myHolder.newAnnotation(
                             HighlightSeverity.ERROR,
                             JavaScriptLocalize.javascriptValidationMessageInterfaceMembersCannotHaveAccessModifiers()
@@ -395,11 +397,11 @@ else if (((JSClass)parentForCheckingNsOrAccessModifier).isInterface()) {
 
     @Override
     @RequiredReadAction
-    public void visitJSReferenceExpression(final JSReferenceExpression node) {
-        final PsiElement parent = node.getParent();
+    public void visitJSReferenceExpression(JSReferenceExpression node) {
+        PsiElement parent = node.getParent();
 
         if (parent instanceof JSNamedElement namedElement) {
-            final PsiElement nameIdentifier = namedElement.getNameIdentifier();
+            PsiElement nameIdentifier = namedElement.getNameIdentifier();
 
             if (nameIdentifier != null && nameIdentifier == node) {
                 if (parent instanceof JSPackageStatement packageStatement) {
@@ -410,7 +412,7 @@ else if (!(parent instanceof JSImportStatement) && parent.getParent() instanceof
                 }
                 else if (parent instanceof JSFunction function) {
                     if (function.isConstructor()) {
-                        final JSClass clazz;
+                        JSClass clazz;
                         if (parent.getParent() instanceof JSClass jsClass) {
                             clazz = jsClass;
                         }
@@ -475,7 +477,7 @@ else if (function.isGetProperty()) {
                 }
 
                 if (parent instanceof JSClass jsClass) {
-                    final JSFunction constructor = jsClass.findFunctionByName(jsClass.getName());
+                    JSFunction constructor = jsClass.findFunctionByName(jsClass.getName());
                     if (constructor == null) {
                         checkMissedSuperCall(node, constructor, jsClass);
                     }
@@ -544,13 +546,13 @@ private boolean hasSuperConstructorCall(JSFunction jsFunction) {
         if (jsFunction == null) {
             return false;
         }
-        final JSSourceElement[] body = (jsFunction).getBody();
-        final JSStatement[] statements = body.length > 0 ? ((JSBlockStatement)body[0]).getStatements() : JSStatement.EMPTY;
+        JSSourceElement[] body = jsFunction.getBody();
+        JSStatement[] statements = body.length > 0 ? ((JSBlockStatement)body[0]).getStatements() : JSStatement.EMPTY;
 
         for (JSStatement st : statements) {
-            if (st instanceof JSExpressionStatement expressionStatement
-                && expressionStatement.getExpression() instanceof JSCallExpression callExpression
-                && callExpression.getMethodExpression() instanceof JSSuperExpression) {
+            if (st instanceof JSExpressionStatement expression
+                && expression.getExpression() instanceof JSCallExpression call
+                && call.getMethodExpression() instanceof JSSuperExpression) {
                 return true;
             }
         }
@@ -560,13 +562,13 @@ private boolean hasSuperConstructorCall(JSFunction jsFunction) {
 
     @RequiredReadAction
     public static JSFunction getNontrivialSuperClassConstructor(JSClass clazz) {
-        final JSClass[] classes = clazz.getSuperClasses();
+        JSClass[] classes = clazz.getSuperClasses();
 
         if (classes.length > 0) {
-            final JSFunction constructor = classes[0].findFunctionByName(classes[0].getName());
+            JSFunction constructor = classes[0].findFunctionByName(classes[0].getName());
 
             if (constructor != null) {
-                final JSParameter[] jsParameters = constructor.getParameterList().getParameters();
+                JSParameter[] jsParameters = constructor.getParameterList().getParameters();
                 boolean hasRequiredParameters = false;
                 for (JSParameter p : jsParameters) {
                     if (!p.isRest() && !p.hasInitializer()) {
@@ -650,9 +652,9 @@ private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq)
         PsiElement element = initializer.getPrevSibling();
         PsiElement lastElement = element;
 
-        if (element instanceof PsiWhiteSpace) {
-            nodes.add(element.getNode());
-            lastElement = element.getPrevSibling();
+        if (element instanceof PsiWhiteSpace whiteSpace) {
+            nodes.add(whiteSpace.getNode());
+            lastElement = whiteSpace.getPrevSibling();
         }
 
         if (lastElement != null && lastElement.getNode().getElementType() == eq) {
@@ -665,7 +667,7 @@ private static ASTNode[] getNodesBefore(PsiElement initializer, IElementType eq)
 
     @Override
     @RequiredReadAction
-    public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
+    public void visitJSPackageStatement(JSPackageStatement packageStatement) {
         for (PsiElement el = packageStatement.getPrevSibling(); el != null; el = el.getPrevSibling()) {
             if (!(el instanceof PsiWhiteSpace || el instanceof PsiComment)) {
                 myHolder.newAnnotation(
@@ -677,7 +679,7 @@ public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
                 break;
             }
         }
-        final PsiElement node = packageStatement.getNameIdentifier();
+        PsiElement node = packageStatement.getNameIdentifier();
         if (node == null) {
             checkPackageStatement(packageStatement);
         }
@@ -685,7 +687,7 @@ public void visitJSPackageStatement(final JSPackageStatement packageStatement) {
 
     @Override
     @RequiredReadAction
-    public void visitJSAssignmentExpression(final JSAssignmentExpression expression) {
+    public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
         JSExpression lExpr = expression.getLOperand();
         if (lExpr == null) {
             return;
@@ -712,11 +714,11 @@ public void visitJSAssignmentExpression(final JSAssignmentExpression expression)
 
     @Override
     @RequiredReadAction
-    public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
-        final PsiElement lastChild = node.getLastChild();
+    public void visitJSArrayLiteralExpression(JSArrayLiteralExpression node) {
+        PsiElement lastChild = node.getLastChild();
         PsiElement child = lastChild != null ? lastChild.getPrevSibling() : null;
-        if (child instanceof PsiWhiteSpace) {
-            child = child.getPrevSibling();
+        if (child instanceof PsiWhiteSpace whiteSpace) {
+            child = whiteSpace.getPrevSibling();
         }
         ASTNode childNode;
 
@@ -730,14 +732,14 @@ public void visitJSArrayLiteralExpression(final JSArrayLiteralExpression node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSTryStatement(final JSTryStatement node) {
-        final JSCatchBlock[] blocks = node.getAllCatchBlocks();
+    public void visitJSTryStatement(JSTryStatement node) {
+        JSCatchBlock[] blocks = node.getAllCatchBlocks();
 
         if (blocks.length > 1) {
-            final Set<String> typeToCatch = new HashSet<>();
+            Set<String> typeToCatch = new HashSet<>();
 
             for (JSCatchBlock block : blocks) {
-                final JSParameter p = block.getParameter();
+                JSParameter p = block.getParameter();
                 if (p == null) {
                     continue;
                 }
@@ -765,7 +767,7 @@ public void visitJSTryStatement(final JSTryStatement node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSVariable(final JSVariable var) {
+    public void visitJSVariable(JSVariable var) {
         if (var.isConst() && var.getInitializer() == null) {
             if (var.getParent() instanceof JSVarStatement varStatement && varStatement.getParent() instanceof JSForInStatement) {
                 return;
@@ -789,7 +791,7 @@ public void visitJSVariable(final JSVariable var) {
 
     @Override
     @RequiredReadAction
-    public void visitJSContinueStatement(final JSContinueStatement node) {
+    public void visitJSContinueStatement(JSContinueStatement node) {
         if (node.getStatementToContinue() == null) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageContinueWithoutTarget())
                 .range(node)
@@ -799,7 +801,7 @@ public void visitJSContinueStatement(final JSContinueStatement node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSBreakStatement(final JSBreakStatement node) {
+    public void visitJSBreakStatement(JSBreakStatement node) {
         if (node.getStatementToBreak() == null) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageBreakWithoutTarget())
                 .range(node)
@@ -809,13 +811,13 @@ public void visitJSBreakStatement(final JSBreakStatement node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSThisExpression(final JSThisExpression node) {
+    public void visitJSThisExpression(@Nonnull JSThisExpression node) {
         checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageThisReferencedFromStaticContext());
     }
 
     @RequiredReadAction
     @SuppressWarnings("unchecked")
-    private void checkClassReferenceInStaticContext(final JSExpression node, LocalizeValue message) {
+    private void checkClassReferenceInStaticContext(JSExpression node, LocalizeValue message) {
         PsiElement element = PsiTreeUtil.getParentOfType(
             node,
             JSFunction.class,
@@ -826,7 +828,7 @@ private void checkClassReferenceInStaticContext(final JSExpression node, Localiz
         );
 
         if (element instanceof JSFunction function) {
-            final JSAttributeList attributeList = function.getAttributeList();
+            JSAttributeList attributeList = function.getAttributeList();
             if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)) {
                 myHolder.newAnnotation(HighlightSeverity.ERROR, message)
                     .range(node)
@@ -841,7 +843,7 @@ private void checkClassReferenceInStaticContext(final JSExpression node, Localiz
 
         PsiElement elementParent = element != null ? element.getParent() : null;
         if (element == null
-            || !(elementParent instanceof JSClass || elementParent instanceof JSFile && elementParent.getContext() != null)) {
+            || !(elementParent instanceof JSClass || elementParent instanceof JSFile jsFile && jsFile.getContext() != null)) {
             myHolder.newAnnotation(
                     HighlightSeverity.ERROR,
                     JavaScriptLocalize.javascriptValidationMessageSuperReferencedWithoutClassInstanceContext()
@@ -853,7 +855,7 @@ private void checkClassReferenceInStaticContext(final JSExpression node, Localiz
 
     @Override
     @RequiredReadAction
-    public void visitJSSuperExpression(final JSSuperExpression node) {
+    public void visitJSSuperExpression(@Nonnull JSSuperExpression node) {
         checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageSuperReferencedFromStaticContext());
     }
 
@@ -894,7 +896,7 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
                 final String qName = clazz.getQualifiedName();
                 final boolean hasOverride = attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE);
 
-                final Ref<JSFunction> set = new Ref<>();
+                final SimpleReference<JSFunction> set = new SimpleReference<>();
                 boolean b = JSResolveUtil.iterateType(
                     node,
                     parent,
@@ -907,7 +909,7 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
                         if ("Object".equals(className)) {
                             /*native modifier is written always*/
                             if (hasOverride && !attributeList.hasModifier(JSAttributeList.ModifierType.NATIVE)) {
-                                final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
+                                ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
                                 //noinspection RequiredXAction
                                 myHolder.newAnnotation(
                                         HighlightSeverity.ERROR,
@@ -934,7 +936,7 @@ else if (!hasOverride) {
                 );
 
                 if (b && hasOverride) {
-                    final ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
+                    ASTNode astNode = attributeList.getNode().findChildByType(JSTokenTypes.OVERRIDE_KEYWORD);
                     myHolder.newAnnotation(
                             HighlightSeverity.ERROR,
                             JavaScriptLocalize.javascriptValidationMessageFunctionOverrideWithoutParentMethod()
@@ -945,8 +947,8 @@ else if (!hasOverride) {
                 }
 
                 if (!b && hasOverride) {
-                    final JSFunction override = set.get();
-                    final JSAttributeList overrideAttrList = override.getAttributeList();
+                    JSFunction override = set.get();
+                    JSAttributeList overrideAttrList = override.getAttributeList();
                     String overrideNs = null;
 
                     if ((overrideAttrList == null && (attributeList.getAccessType() != JSAttributeList.AccessType.PACKAGE_LOCAL))
@@ -971,11 +973,11 @@ else if (!hasOverride) {
                         //);
                     }
 
-                    final SignatureMatchResult incompatibleSignature = checkCompatibleSignature(node, override);
+                    SignatureMatchResult incompatibleSignature = checkCompatibleSignature(node, override);
 
                     if (incompatibleSignature == SignatureMatchResult.PARAMETERS_DIFFERS) {
-                        final JSParameterList nodeParameterList = node.getParameterList();
-                        final JSParameterList overrideParameterList = override.getParameterList();
+                        JSParameterList nodeParameterList = node.getParameterList();
+                        JSParameterList overrideParameterList = override.getParameterList();
 
                         String params = overrideParameterList != null ? overrideParameterList.getText() : "()";
                         myHolder.newAnnotation(
@@ -1018,11 +1020,11 @@ enum SignatureMatchResult {
     }
 
     @RequiredReadAction
-    private static SignatureMatchResult checkCompatibleSignature(final JSFunction fun, final JSFunction override) {
+    private static SignatureMatchResult checkCompatibleSignature(JSFunction fun, JSFunction override) {
         JSParameterList nodeParameterList = fun.getParameterList();
         JSParameterList overrideParameterList = override.getParameterList();
-        final JSParameter[] parameters = nodeParameterList != null ? nodeParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
-        final JSParameter[] overrideParameters = overrideParameterList != null
+        JSParameter[] parameters = nodeParameterList != null ? nodeParameterList.getParameters() : JSParameter.EMPTY_ARRAY;
+        JSParameter[] overrideParameters = overrideParameterList != null
             ? overrideParameterList.getParameters()
             : JSParameter.EMPTY_ARRAY;
 
@@ -1074,8 +1076,8 @@ else if (overrideParameterType == null && parameterType != null && !"*".equals(p
     @Override
     @RequiredReadAction
     @SuppressWarnings("unchecked")
-    public void visitJSReturnStatement(final JSReturnStatement node) {
-        final PsiElement element = PsiTreeUtil.getParentOfType(
+    public void visitJSReturnStatement(@Nonnull JSReturnStatement node) {
+        PsiElement element = PsiTreeUtil.getParentOfType(
             node,
             JSFunction.class,
             XmlTagChild.class,
@@ -1083,15 +1085,15 @@ public void visitJSReturnStatement(final JSReturnStatement node) {
             JSFile.class,
             JavaScriptLambdaExpression.class
         );
-        if ((element instanceof JSFile && !(element.getContext() instanceof PsiLanguageInjectionHost))
-            || (element instanceof XmlTagChild && !(element.getParent() instanceof XmlAttributeValue))) {
+        if ((element instanceof JSFile jsFile && !(jsFile.getContext() instanceof PsiLanguageInjectionHost))
+            || (element instanceof XmlTagChild xmlTagChild && !(xmlTagChild.getParent() instanceof XmlAttributeValue))) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageReturnOutsideFunctionDefinition())
                 .range(node)
                 .create();
         }
 
         if (element instanceof JSFunction function) {
-            final String typeString = function.getReturnTypeString();
+            String typeString = function.getReturnTypeString();
             if (typeString != null && !"void".equals(typeString) && node.getExpression() == null) {
                 myHolder.newAnnotation(
                         HighlightSeverity.ERROR,
@@ -1105,18 +1107,16 @@ public void visitJSReturnStatement(final JSReturnStatement node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSLabeledStatement(final JSLabeledStatement node) {
-        final String label = node.getLabel();
+    public void visitJSLabeledStatement(JSLabeledStatement node) {
+        String label = node.getLabel();
         if (label != null) {
             PsiElement run = node.getParent();
             while (run != null) {
-                if (run instanceof JSLabeledStatement labeledStatement) {
-                    if (label.equals(labeledStatement.getLabel())) {
-                        myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageDuplicateLabel())
-                            .range(node.getNameIdentifier())
-                            .create();
-                        break;
-                    }
+                if (run instanceof JSLabeledStatement labeledStatement && label.equals(labeledStatement.getLabel())) {
+                    myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageDuplicateLabel())
+                        .range(node.getNameIdentifier())
+                        .create();
+                    break;
                 }
 
                 if (run instanceof JSFunction) {
@@ -1128,21 +1128,21 @@ public void visitJSLabeledStatement(final JSLabeledStatement node) {
     }
 
     @RequiredReadAction
-    private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass) {
-        final PsiFile containingFile = aClass.getContainingFile();
+    private void checkNamedObjectIsInCorrespondingFile(JSNamedElement aClass) {
+        PsiFile containingFile = aClass.getContainingFile();
 
         if (containingFile.getContext() != null) {
             return;
         }
-        final VirtualFile file = containingFile.getVirtualFile();
+        VirtualFile file = containingFile.getVirtualFile();
 
         if (file != null && !file.getNameWithoutExtension().equals(aClass.getName())) {
-            final PsiElement node = aClass.getNameIdentifier();
+            PsiElement node = aClass.getNameIdentifier();
 
             if (node != null) {
-                final String name = aClass.getName();
+                String name = aClass.getName();
                 String nameWithExtension = name + "." + file.getExtension();
-                final LocalizeValue message = aClass instanceof JSClass
+                LocalizeValue message = aClass instanceof JSClass
                     ? JavaScriptLocalize.javascriptValidationMessageClassShouldBeInFile(name, nameWithExtension)
                     : aClass instanceof JSNamespaceDeclaration
                     ? JavaScriptLocalize.javascriptValidationMessageNamespaceShouldBeInFile(name, nameWithExtension)
@@ -1153,27 +1153,28 @@ private void checkNamedObjectIsInCorrespondingFile(final JSNamedElement aClass)
                     .range(node)
                     .withFix(new RenameFileFix(nameWithExtension))
                     .create();
-    /*annotation.registerFix(new RenamePublicClassFix(aClass) {
-          final String text;
-          final String familyName;
-
-          {
-            String term = getTerm(message);
-            text = super.getText().replace("class", StringUtil.decapitalize(term));
-            familyName = super.getFamilyName().replace("Class", term);
-          }
-          @NotNull
-          @Override
-          public String getText() {
-            return text;
-          }
-
-          @NotNull
-          @Override
-          public String getFamilyName() {
-            return familyName;
-          }
-        }); */
+                /*annotation.registerFix(new RenamePublicClassFix(aClass) {
+                      String text;
+                      String familyName;
+
+                      {
+                          String term = getTerm(message);
+                          text = super.getText().replace("class", StringUtil.decapitalize(term));
+                          familyName = super.getFamilyName().replace("Class", term);
+                      }
+
+                      @NotNull
+                      @Override
+                      public String getText() {
+                          return text;
+                      }
+
+                      @NotNull
+                      @Override
+                      public String getFamilyName() {
+                          return familyName;
+                      }
+                    });*/
             }
         }
 
@@ -1186,19 +1187,18 @@ private String getTerm(String message) {
     }
 
     @RequiredReadAction
-    public static void checkFileUnderSourceRoot(final JSNamedElement aClass, AnnotationHolder holder) {
+    public static void checkFileUnderSourceRoot(JSNamedElement aClass, AnnotationHolder holder) {
         PsiElement nameIdentifier = aClass.getNameIdentifier();
         if (nameIdentifier == null) {
             nameIdentifier = aClass.getFirstChild();
         }
 
-        final PsiFile containingFile = aClass.getContainingFile();
-        final VirtualFile file = containingFile.getVirtualFile();
+        PsiFile containingFile = aClass.getContainingFile();
+        VirtualFile file = containingFile.getVirtualFile();
         if (file == null) {
             return;
         }
-        final VirtualFile rootForFile =
-            ProjectRootManager.getInstance(containingFile.getProject()).getFileIndex().getSourceRootForFile(file);
+        VirtualFile rootForFile = ProjectRootManager.getInstance(containingFile.getProject()).getFileIndex().getSourceRootForFile(file);
 
         if (rootForFile == null) {
             holder.newAnnotation(HighlightSeverity.WARNING, JavaScriptLocalize.javascriptValidationMessageFileShouldBeUnderSourceRoot())
@@ -1208,18 +1208,18 @@ public static void checkFileUnderSourceRoot(final JSNamedElement aClass, Annotat
     }
 
     @RequiredReadAction
-    private void checkPackageStatement(final JSPackageStatement packageStatement) {
-        final String s = packageStatement.getQualifiedName();
+    private void checkPackageStatement(JSPackageStatement packageStatement) {
+        String s = packageStatement.getQualifiedName();
 
-        final PsiFile containingFile = packageStatement.getContainingFile();
-        final String expected = JSResolveUtil.getExpectedPackageNameFromFile(
+        PsiFile containingFile = packageStatement.getContainingFile();
+        String expected = JSResolveUtil.getExpectedPackageNameFromFile(
             containingFile.getVirtualFile(),
             containingFile.getProject(),
             true
         );
 
         if (expected != null && ((s == null && expected.length() != 0) || (s != null && !expected.equals(s)))) {
-            final PsiElement nameIdentifier = packageStatement.getNameIdentifier();
+            PsiElement nameIdentifier = packageStatement.getNameIdentifier();
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageIncorrectPackageName(s, expected))
                 .range(nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild())
                 .withFix(new SyntheticIntentionAction() {
@@ -1230,13 +1230,13 @@ public String getText() {
                     }
 
                     @Override
-                    public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+                    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
                         return packageStatement.isValid();
                     }
 
                     @Override
-                    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file)
-                        throws IncorrectOperationException {
+                    @RequiredWriteAction
+                    public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
                         JSPackageStatementImpl.doChangeName(project, packageStatement, expected);
                     }
 
@@ -1248,7 +1248,7 @@ public boolean startInWriteAction() {
                 .create();
         }
 
-        final Set<JSNamedElement> elements = new HashSet<>();
+        Set<JSNamedElement> elements = new HashSet<>();
 
         for (JSSourceElement statement : packageStatement.getStatements()) {
             if (statement instanceof JSNamedElement namedElement && !(statement instanceof JSImportStatement)) {
@@ -1258,7 +1258,7 @@ public boolean startInWriteAction() {
 
         if (elements.size() > 1) {
             for (JSNamedElement el : elements) {
-                final PsiElement nameIdentifier = el.getNameIdentifier();
+                PsiElement nameIdentifier = el.getNameIdentifier();
                 myHolder.newAnnotation(
                         HighlightSeverity.ERROR,
                         JavaScriptLocalize.javascriptValidationMessageMoreThanOneExternallyVisibleSymbol()
@@ -1273,14 +1273,14 @@ public boolean startInWriteAction() {
     }
 
     public static class RemoveASTNodeFix implements SyntheticIntentionAction, LocalQuickFix {
-        private final ASTNode[] myAstNodes;
-        private final LocalizeValue myProp;
+        private ASTNode[] myAstNodes;
+        private LocalizeValue myProp;
 
-        public RemoveASTNodeFix(final ASTNode astNode, LocalizeValue prop) {
+        public RemoveASTNodeFix(ASTNode astNode, LocalizeValue prop) {
             this(prop, astNode);
         }
 
-        public RemoveASTNodeFix(LocalizeValue prop, final ASTNode... astNodes) {
+        public RemoveASTNodeFix(LocalizeValue prop, ASTNode... astNodes) {
             myProp = prop;
             myAstNodes = astNodes;
         }
@@ -1310,7 +1310,7 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri
         }
 
         @Override
-        public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+        public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
             for (ASTNode astNode : myAstNodes) {
                 if (!astNode.getPsi().isValid()) {
                     return false;
@@ -1322,7 +1322,7 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
 
         @Override
         @RequiredUIAccess
-        public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
+        public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
             }
@@ -1342,7 +1342,7 @@ public boolean startInWriteAction() {
     private static class AddOverrideIntentionAction implements SyntheticIntentionAction {
         private final JSFunction myNode;
 
-        public AddOverrideIntentionAction(final JSFunction node) {
+        public AddOverrideIntentionAction(JSFunction node) {
             myNode = node;
         }
 
@@ -1353,19 +1353,19 @@ public String getText() {
         }
 
         @Override
-        public boolean isAvailable(@Nonnull final Project project, final Editor editor, final PsiFile file) {
+        public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
             return myNode.isValid();
         }
 
         @Override
         @RequiredUIAccess
-        public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
+        public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
             }
-            final ASTNode fromText = JSChangeUtil.createJSTreeFromText(project, "override class A {}");
-            final JSAttributeList jsAttributeList = myNode.getAttributeList();
-            final JSAttributeList createdAttrList = ((JSClass)fromText.getPsi()).getAttributeList();
+            ASTNode fromText = JSChangeUtil.createJSTreeFromText(project, "override class A {}");
+            JSAttributeList jsAttributeList = myNode.getAttributeList();
+            JSAttributeList createdAttrList = ((JSClass)fromText.getPsi()).getAttributeList();
 
             if (jsAttributeList != null) {
                 jsAttributeList.add(createdAttrList.getFirstChild());
@@ -1471,11 +1471,11 @@ public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
             }
-            final JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
+            JSClass jsClass = PsiTreeUtil.getParentOfType(node, JSClass.class);
             if (jsClass == null) {
                 return;
             }
-            final JSAttributeList attributeList = jsClass.getAttributeList();
+            JSAttributeList attributeList = jsClass.getAttributeList();
             StringBuilder fun = new StringBuilder();
 
             if (attributeList != null && attributeList.getAccessType() == JSAttributeList.AccessType.PUBLIC) {
@@ -1484,7 +1484,7 @@ public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws
 
             fun.append("function ");
 
-            final JSParameterList parameterList = superConstructor.getParameterList();
+            JSParameterList parameterList = superConstructor.getParameterList();
             fun.append(jsClass.getName()).append(parameterList.getText()).append("{\n");
             fun.append("super(");
             int i = 0;

From 20fa5a211ff7162f5e41d509a5b0cbe8669f0755 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 26 Jan 2025 16:00:35 +0400
Subject: [PATCH 274/340] reformat

---
 lang-version-impl/ecmascript-impl/pom.xml | 121 ++++++++++------------
 1 file changed, 56 insertions(+), 65 deletions(-)

diff --git a/lang-version-impl/ecmascript-impl/pom.xml b/lang-version-impl/ecmascript-impl/pom.xml
index 10bd6993..1da08fbb 100644
--- a/lang-version-impl/ecmascript-impl/pom.xml
+++ b/lang-version-impl/ecmascript-impl/pom.xml
@@ -15,75 +15,66 @@
   - limitations under the License.
   -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.ide-api-provided</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-ecmascript.impl</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript-ecmascript.impl</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.io/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>consulo.maven</groupId>
-				<artifactId>maven-consulo-plugin</artifactId>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate-lexers</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>consulo.maven</groupId>
+                <artifactId>maven-consulo-plugin</artifactId>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate-lexers</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-base.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>consulo</groupId>
-			<artifactId>consulo-language-editor-impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-editor-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!--This dependency fix problem with compilation JSXTagTreeHighlightingPassFactory, due dep from XML plugin-->
-		<dependency>
-			<groupId>consulo</groupId>
-			<artifactId>consulo-ide-impl</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file

From dc667e73af0d1912d37ddab33ba92903d535e50a Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 26 Jan 2025 16:04:57 +0400
Subject: [PATCH 275/340] disable magic number inspection by default

---
 .../confusing/MagicNumberJSInspection.java     | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index 3c9cae8b..a3950054 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -13,28 +13,22 @@
 import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
 @ExtensionImpl
 public class MagicNumberJSInspection extends JavaScriptInspection {
     @NonNls
-    private static final String[] s_specialCaseLiteralArray = new String[]{
+    private static final Set<String> s_specialCaseLiterals = Set.of(
         "0", "1", "2", "3", "4",
         "5", "6", "7", "8", "9",
         "10", "0L", "1L", "2L", "0l",
         "1l", "2l", "0.0", "1.0", "0.0F",
         "1.0F", "0.0f", "1.0f"
-    };
+    );
 
-    /**
-     * @noinspection StaticCollection
-     */
-    private static final Set<String> s_specialCaseLiterals = new HashSet<>(23);
-
-    static {
-        Collections.addAll(s_specialCaseLiterals, s_specialCaseLiteralArray);
+    @Override
+    public boolean isEnabledByDefault() {
+        return false;
     }
 
     @Override
@@ -67,6 +61,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class MagicNumberVisitor extends BaseInspectionVisitor {
         @Override
+        @RequiredReadAction
         public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression expression) {
             super.visitJSLiteralExpression(expression);
 
@@ -92,6 +87,7 @@ private static boolean isNumeric(String text) {
         return Character.isDigit(firstChar) || firstChar == '.';
     }
 
+    @RequiredReadAction
     private static boolean isDeclaredConstant(JSLiteralExpression expression) {
         final JSFunction containingFunction = PsiTreeUtil.getParentOfType(expression, JSFunction.class);
         if (containingFunction != null) {

From a90b0e2da630cd85643534ba163fc4e238faf92d Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 26 Jan 2025 16:12:51 +0400
Subject: [PATCH 276/340] miss dep

---
 lang-version-impl/ecmascript-impl/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lang-version-impl/ecmascript-impl/pom.xml b/lang-version-impl/ecmascript-impl/pom.xml
index 1da08fbb..59c8795b 100644
--- a/lang-version-impl/ecmascript-impl/pom.xml
+++ b/lang-version-impl/ecmascript-impl/pom.xml
@@ -75,6 +75,15 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>com.intellij.xml</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--This dependency fix problem with compilation JSXTagTreeHighlightingPassFactory, due dep from XML plugin-->
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-ide-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

From b5362ccbfc0dceda8fd3718c1866e09f82968c1e Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 30 Jan 2025 12:54:04 +0400
Subject: [PATCH 277/340] simplified pusher

---
 .../lang/JavaScriptLanguageVersionPusher.java | 41 +------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
index 993ede74..2570f9f8 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
@@ -11,8 +11,6 @@
 import consulo.module.Module;
 import consulo.module.content.FilePropertyPusher;
 import consulo.module.content.PushedFilePropertiesUpdater;
-import consulo.module.extension.ModuleExtension;
-import consulo.module.extension.event.ModuleExtensionChangeListener;
 import consulo.project.Project;
 import consulo.util.dataholder.Key;
 import consulo.util.lang.ObjectUtil;
@@ -24,8 +22,6 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * @author VISTALL
@@ -35,32 +31,6 @@
 public class JavaScriptLanguageVersionPusher implements FilePropertyPusher<LanguageVersion> {
     private static final FileAttribute ourFileAttribute = new FileAttribute("javascript-version", 2, false);
 
-    private static final Key<Set<String>> ourChangedModulesKey = Key.create("javascript-change-marker");
-
-    @Override
-    public void initExtra(@Nonnull Project project) {
-        project.getMessageBus().connect().subscribe(
-            ModuleExtensionChangeListener.class,
-            (oldExtension, newExtension) -> {
-            if (oldExtension instanceof JavaScriptModuleExtension oldJsExtension && newExtension instanceof JavaScriptModuleExtension newJsExtension) {
-                if (((JavaScriptModuleExtension)oldExtension).getLanguageVersion() != ((JavaScriptModuleExtension)newExtension).getLanguageVersion()) {
-                    addChanged(project, newExtension);
-                }
-            }
-        });
-    }
-
-    private void addChanged(Project project, ModuleExtension<?> newExtension) {
-        Set<String> changedModules = project.getUserData(ourChangedModulesKey);
-        if (changedModules == null) {
-            changedModules = new HashSet<>();
-        }
-
-        project.putUserData(ourChangedModulesKey, changedModules);
-
-        changedModules.add(newExtension.getModule().getName());
-    }
-
     @Nonnull
     @Override
     public Key<LanguageVersion> getFileDataKey() {
@@ -141,16 +111,7 @@ public void persistAttribute(
 
     @Override
     public void afterRootsChanged(@Nonnull Project project) {
-        Set<String> changedModules = project.getUserData(ourChangedModulesKey);
-        if (changedModules == null) {
-            return;
-        }
-
-        project.putUserData(ourChangedModulesKey, null);
-
-        if (!changedModules.isEmpty()) {
-            PushedFilePropertiesUpdater.getInstance(project).pushAll(this);
-        }
+        PushedFilePropertiesUpdater.getInstance(project).pushAll(this);
     }
 
     @Nonnull

From 4a04082e5d86381b0fdd8d9329f13999d7178b49 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 27 Mar 2025 11:40:24 +0400
Subject: [PATCH 278/340] fix javascript bad character lexing

---
 .../src/main/java/com/intellij/lang/javascript/JavaScript.flex  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
index 2f062db9..5c81669b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScript.flex
@@ -412,4 +412,4 @@ FIELD_OR_METHOD={IDENTIFIER} ("(" [^ \\)]* ")"? )?
 
 <YYINITIAL,DIV_OR_GT> "]]>" { yybegin(YYINITIAL); return JSTokenTypes.CDATA_END; }
 <YYINITIAL,DIV_OR_GT> "<![CDATA[" { yybegin(YYINITIAL); return JSTokenTypes.CDATA_START; }
-.                     { yybegin(YYINITIAL); return JSTokenTypes.BAD_CHARACTER; }
\ No newline at end of file
+[^]                     { yybegin(YYINITIAL); return JSTokenTypes.BAD_CHARACTER; }
\ No newline at end of file

From 38aadbb9c74cee386fd4bff0b1cf2781952c64fd Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 12 Apr 2025 18:21:18 +0300
Subject: [PATCH 279/340] Refactoring JSClassSearch.

---
 .../lang/javascript/search/JSClassSearch.java | 58 +++++++++----------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index 2e3eeb2c..f755a218 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -20,23 +20,21 @@
 import com.intellij.lang.javascript.psi.JSReferenceList;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.application.util.function.CommonProcessors;
-import consulo.application.util.function.Processor;
 import consulo.application.util.query.Query;
 import consulo.application.util.query.QueryExecutor;
 import consulo.application.util.query.QueryFactory;
-import consulo.component.extension.Extensions;
 import consulo.content.scope.SearchScope;
 import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.language.psi.stub.StubIndex;
 import consulo.language.psi.stub.StubIndexKey;
 import consulo.project.Project;
-
 import jakarta.annotation.Nonnull;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.function.Predicate;
 
 public abstract class JSClassSearch implements QueryExecutor<JSClass, JSClassSearch.SearchParameters> {
     public static class SearchParameters {
@@ -97,16 +95,16 @@ protected JSClass[] getSupers(JSClass candidate) {
 
             @Override
             @RequiredReadAction
-            public boolean execute(@Nonnull SearchParameters queryParameters, @Nonnull Processor<? super JSClass> consumer) {
-                final Set<JSClass> visited = new HashSet<>();         // no abstract classes in ActionScript !
+            public boolean execute(@Nonnull SearchParameters queryParameters, @Nonnull Predicate<? super JSClass> consumer) {
+                Set<JSClass> visited = new HashSet<>();         // no abstract classes in ActionScript !
 
                 if (queryParameters.isCheckDeepInheritance()) {
-                    Processor<? super JSClass> consumerCopy = consumer;
-                    consumer = new Processor<>() {
+                    Predicate<? super JSClass> consumerCopy = consumer;
+                    consumer = new Predicate<>() {
                         @Override
                         @RequiredReadAction
-                        public boolean process(JSClass jsClass) {
-                            return consumerCopy.process(jsClass) && CLASS_SEARCH_EXECUTOR.processDirectInheritors(
+                        public boolean test(JSClass jsClass) {
+                            return consumerCopy.test(jsClass) && CLASS_SEARCH_EXECUTOR.processDirectInheritors(
                                 jsClass,
                                 this,
                                 false,
@@ -117,7 +115,7 @@ public boolean process(JSClass jsClass) {
                     };
                 }
 
-                Processor<? super JSClass> consumerToUse = consumer;
+                Predicate<? super JSClass> consumerToUse = consumer;
                 boolean b = processDirectInheritors(
                     queryParameters.getTargetClass(),
                     consumerToUse,
@@ -129,15 +127,13 @@ public boolean process(JSClass jsClass) {
                     return searchClassInheritors(
                         queryParameters.getTargetClass(),
                         queryParameters.isCheckDeepInheritance()
-                    ).forEach(jsClass -> {
-                        return processDirectInheritors(
-                            jsClass,
-                            consumerToUse,
-                            queryParameters.isCheckDeepInheritance(),
-                            visited,
-                            queryParameters.getScope()
-                        );
-                    });
+                    ).forEach((Predicate<? super JSClass>)jsClass -> processDirectInheritors(
+                        jsClass,
+                        consumerToUse,
+                        queryParameters.isCheckDeepInheritance(),
+                        visited,
+                        queryParameters.getScope()
+                    ));
                 }
                 return b;
             }
@@ -179,7 +175,7 @@ protected Collection<JSClass> getInheritors(
 
     @Override
     @RequiredReadAction
-    public boolean execute(@Nonnull SearchParameters queryParameters, @Nonnull Processor<? super JSClass> consumer) {
+    public boolean execute(@Nonnull SearchParameters queryParameters, @Nonnull Predicate<? super JSClass> consumer) {
         return processDirectInheritors(
             queryParameters.getTargetClass(),
             consumer,
@@ -191,11 +187,11 @@ public boolean execute(@Nonnull SearchParameters queryParameters, @Nonnull Proce
 
     @RequiredReadAction
     protected boolean processDirectInheritors(
-        final JSClass superClass,
-        final Processor<? super JSClass> consumer,
-        final boolean checkDeep,
+        JSClass superClass,
+        Predicate<? super JSClass> consumer,
+        boolean checkDeep,
         Set<JSClass> processed,
-        final GlobalSearchScope scope
+        GlobalSearchScope scope
     ) {
         if (processed != null) {
             if (processed.contains(superClass)) {
@@ -214,15 +210,13 @@ protected boolean processDirectInheritors(
         }
 
         Set<JSClass> temp = processed;
-        Processor<JSClass> processor = candidate -> {
+        Predicate<JSClass> processor = candidate -> {
             JSClass[] classes = getSupers(candidate);
             if (classes != null) {
                 for (JSClass superClassCandidate : classes) {
                     if (superClassCandidate.isEquivalentTo(superClass)) {
-                        if (!consumer.process(candidate)) {
-                            return false;
-                        }
-                        if (checkDeep && !processDirectInheritors(candidate, consumer, checkDeep, temp, scope)) {
+                        if (!consumer.test(candidate)
+                            || checkDeep && !processDirectInheritors(candidate, consumer, checkDeep, temp, scope)) {
                             return false;
                         }
                     }
@@ -238,15 +232,15 @@ protected boolean processDirectInheritors(
 
         for (JSReferenceList referenceList : collectProcessor.getResults()) {
             JSClass parent = (JSClass)referenceList.getParent();
-            if (!processor.process(parent)) {
+            if (!processor.test(parent)) {
                 return false;
             }
         }
 
-        for (JSClassInheritorsProvider provider : Extensions.getExtensions(JSClassInheritorsProvider.EP_NAME)) {
+        for (JSClassInheritorsProvider provider : JSClassInheritorsProvider.EP_NAME.getExtensionList()) {
             Collection<JSClass> inheritors = getInheritors(provider, name, project, scope);
             for (JSClass inheritor : inheritors) {
-                if (!processor.process(inheritor)) {
+                if (!processor.test(inheritor)) {
                     return false;
                 }
             }

From e1e6518f915785c3675f093fbea0e891da373475 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 13 Apr 2025 03:55:43 +0300
Subject: [PATCH 280/340] Refactoring query executors.

---
 .../search/JSDefinitionsSearchExecutor.java     | 17 ++++++++++-------
 .../impl/search/JSFunctionsSearch.java          | 12 +++++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
index c62edcbb..018c3cb1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
@@ -36,6 +36,8 @@
 
 import jakarta.annotation.Nonnull;
 
+import java.util.function.Predicate;
+
 /**
  * @author Maxim.Mossienko
  * @since 2008-04-28
@@ -45,10 +47,10 @@ public class JSDefinitionsSearchExecutor implements DefinitionsScopedSearchExecu
     @Override
     @RequiredReadAction
     public boolean execute(
-        @Nonnull final DefinitionsScopedSearch.SearchParameters parameters,
-        @Nonnull final Processor<? super PsiElement> consumer
+        @Nonnull DefinitionsScopedSearch.SearchParameters parameters,
+        @Nonnull Predicate<? super PsiElement> consumer
     ) {
-        final PsiElement sourceElement = parameters.getElement();
+        PsiElement sourceElement = parameters.getElement();
         if (sourceElement instanceof PsiNamedElement namedElement && namedElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE)) {
             ReferencesSearch.search(sourceElement, GlobalSearchScope.projectScope(sourceElement.getProject())).forEach(t -> {
                 if (t instanceof JSReferenceExpression refExpr) {
@@ -62,12 +64,13 @@ public boolean execute(
                             && !JavaScriptIndex.isFromPredefinedFile(psiElement.getContainingFile())
                             && sourceElement != psiElement) {
                             if (psiElement instanceof JSFunction fun && sourceElement instanceof JSFunction sourceFun) {
-                                if ((sourceFun.isGetProperty() && fun.isSetProperty()) || (sourceFun.isSetProperty() && fun.isGetProperty())) {
+                                if ((sourceFun.isGetProperty() && fun.isSetProperty())
+                                    || (sourceFun.isSetProperty() && fun.isGetProperty())) {
                                     return true;
                                 }
                             }
 
-                            if ((psiElement != sourceElement || !(psiElement instanceof JSClass)) && !consumer.process(psiElement)) {
+                            if ((psiElement != sourceElement || !(psiElement instanceof JSClass)) && !consumer.test(psiElement)) {
                                 return false;
                             }
                         }
@@ -81,7 +84,7 @@ public boolean execute(
             });
 
             if (sourceElement instanceof JSClass clazz) {
-                Processor<JSClass> delegatingProcessor = consumer::process;
+                Predicate<JSClass> delegatingProcessor = consumer::test;
                 JSClassSearch.searchClassInheritors(clazz, true).forEach(delegatingProcessor);
 
                 if (clazz.isInterface()) {
@@ -89,7 +92,7 @@ public boolean execute(
                 }
             }
             else if (sourceElement instanceof JSFunction baseFunction) {
-                Processor<JSFunction> delegatingProcessor = consumer::process;
+                Predicate<JSFunction> delegatingProcessor = consumer::test;
                 JSFunctionsSearch.searchOverridingFunctions(baseFunction, true).forEach(delegatingProcessor);
 
                 PsiElement parent = baseFunction.getParent();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
index da3c2c11..adcc72f2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
@@ -21,13 +21,14 @@
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.search.JSClassSearch;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.application.util.function.Processor;
 import consulo.application.util.query.Query;
 import consulo.application.util.query.QueryExecutor;
 import consulo.application.util.query.QueryFactory;
 import consulo.language.psi.PsiElement;
 import jakarta.annotation.Nonnull;
 
+import java.util.function.Predicate;
+
 public abstract class JSFunctionsSearch implements QueryExecutor<JSFunction, JSFunctionsSearch.SearchParameters> {
     public static class SearchParameters {
         private JSFunction myBaseFunction;
@@ -72,20 +73,21 @@ protected Query<JSClass> makeQuery(SearchParameters queryParameters, PsiElement
     }
 
     @Override
-    public boolean execute(SearchParameters queryParameters, final @Nonnull Processor<? super JSFunction> consumer) {
+    public boolean execute(SearchParameters queryParameters, final @Nonnull Predicate<? super JSFunction> consumer) {
         final JSFunction baseFunction = queryParameters.getBaseFunction();
         PsiElement clazz = JSResolveUtil.findParent(baseFunction);
 
+        //noinspection SimplifiableIfStatement
         if (!(clazz instanceof JSClass)) {
             return true;
         }
 
-        return makeQuery(queryParameters, clazz).forEach(new Processor<>() {
+        return makeQuery(queryParameters, clazz).forEach(new Predicate<>() {
             @Override
             @RequiredReadAction
-            public boolean process(final JSClass jsClass) {
+            public boolean test(final JSClass jsClass) {
                 JSFunction function = jsClass.findFunctionByNameAndKind(baseFunction.getName(), baseFunction.getKind());
-                return function == null || consumer.process(function);
+                return function == null || consumer.test(function);
             }
         });
     }

From 767a3642237333ae5cdd3e7540819d816a0b8dc8 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 20 Apr 2025 12:58:17 +0300
Subject: [PATCH 281/340] Reformatting web-browser-impl.

---
 .../ClientJavaScriptModuleExtension.java      | 160 ++++++++----------
 .../ClientJavaScriptModuleExtensionPanel.java |  58 +++----
 ...ientJavaScriptModuleExtensionProvider.java |  77 ++++-----
 ...lientJavaScriptMutableModuleExtension.java |  87 +++++-----
 ...ntJavaScriptPredefinedBundlesProvider.java |  75 ++++----
 .../module/sdk/ClientJavaScriptSdkType.java   |  88 +++++-----
 .../src/main/java/module-info.java            |   6 +-
 7 files changed, 252 insertions(+), 299 deletions(-)

diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index c2646b17..9fa2f390 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -23,104 +23,88 @@
  * @author VISTALL
  * @since 29.06.14
  */
-public class ClientJavaScriptModuleExtension extends ModuleExtensionBase<ClientJavaScriptModuleExtension> implements JavaScriptModuleExtension<ClientJavaScriptModuleExtension>
-{
-	private SdkModuleInheritableNamedPointerImpl myPointer;
+public class ClientJavaScriptModuleExtension extends ModuleExtensionBase<ClientJavaScriptModuleExtension> implements JavaScriptModuleExtension<ClientJavaScriptModuleExtension> {
+    private SdkModuleInheritableNamedPointerImpl myPointer;
 
-	protected LanguageVersion myLanguageVersion = StandardJavaScriptVersions.getInstance().getDefaultVersion();
+    protected LanguageVersion myLanguageVersion = StandardJavaScriptVersions.getInstance().getDefaultVersion();
 
-	public ClientJavaScriptModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootLayer)
-	{
-		super(id, rootLayer);
-		myPointer = new SdkModuleInheritableNamedPointerImpl(rootLayer, id)
-		{
-			@Nullable
-			@Override
-			public String getItemNameFromModule(@Nonnull Module module)
-			{
-				ClientJavaScriptModuleExtension extension = ModuleUtilCore.getExtension(module, ClientJavaScriptModuleExtension.class);
-				if(extension == null)
-				{
-					return null;
-				}
-				return extension.getSdkName();
-			}
+    public ClientJavaScriptModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootLayer) {
+        super(id, rootLayer);
+        myPointer = new SdkModuleInheritableNamedPointerImpl(rootLayer, id) {
+            @Nullable
+            @Override
+            public String getItemNameFromModule(@Nonnull Module module) {
+                ClientJavaScriptModuleExtension extension = ModuleUtilCore.getExtension(module, ClientJavaScriptModuleExtension.class);
+                if (extension == null) {
+                    return null;
+                }
+                return extension.getSdkName();
+            }
 
-			@Nullable
-			@Override
-			public Sdk getItemFromModule(@Nonnull Module module)
-			{
-				ClientJavaScriptModuleExtension extension = ModuleUtilCore.getExtension(module, ClientJavaScriptModuleExtension.class);
-				if(extension == null)
-				{
-					return null;
-				}
-				return extension.getSdk();
-			}
-		};
+            @Nullable
+            @Override
+            public Sdk getItemFromModule(@Nonnull Module module) {
+                ClientJavaScriptModuleExtension extension = ModuleUtilCore.getExtension(module, ClientJavaScriptModuleExtension.class);
+                if (extension == null) {
+                    return null;
+                }
+                return extension.getSdk();
+            }
+        };
 
-		Sdk sdkByType = SdkTable.getInstance().findPredefinedSdkByType(ClientJavaScriptSdkType.getInstance());
-		myPointer.set(null, sdkByType);
-	}
+        Sdk sdkByType = SdkTable.getInstance().findPredefinedSdkByType(ClientJavaScriptSdkType.getInstance());
+        myPointer.set(null, sdkByType);
+    }
 
-	@RequiredReadAction
-	@Override
-	protected void loadStateImpl(@Nonnull Element element)
-	{
-		super.loadStateImpl(element);
-		myLanguageVersion = StandardJavaScriptVersions.getInstance().findVersionById(element.getAttributeValue("language-version"));
-	}
+    @RequiredReadAction
+    @Override
+    protected void loadStateImpl(@Nonnull Element element) {
+        super.loadStateImpl(element);
+        myLanguageVersion = StandardJavaScriptVersions.getInstance().findVersionById(element.getAttributeValue("language-version"));
+    }
 
-	@Override
-	protected void getStateImpl(@Nonnull Element element)
-	{
-		super.getStateImpl(element);
-		if(myLanguageVersion != StandardJavaScriptVersions.getInstance().getDefaultVersion())
-		{
-			element.setAttribute("language-version", myLanguageVersion.getId());
-		}
-	}
+    @Override
+    protected void getStateImpl(@Nonnull Element element) {
+        super.getStateImpl(element);
+        if (myLanguageVersion != StandardJavaScriptVersions.getInstance().getDefaultVersion()) {
+            element.setAttribute("language-version", myLanguageVersion.getId());
+        }
+    }
 
-	@Nonnull
-	@Override
-	public ModuleInheritableNamedPointer<Sdk> getInheritableSdk()
-	{
-		return myPointer;
-	}
+    @Nonnull
+    @Override
+    public ModuleInheritableNamedPointer<Sdk> getInheritableSdk() {
+        return myPointer;
+    }
 
-	@Nullable
-	@Override
-	public Sdk getSdk()
-	{
-		return myPointer.get();
-	}
+    @Nullable
+    @Override
+    public Sdk getSdk() {
+        return myPointer.get();
+    }
 
-	@Nullable
-	@Override
-	public String getSdkName()
-	{
-		return myPointer.getName();
-	}
+    @Nullable
+    @Override
+    public String getSdkName() {
+        return myPointer.getName();
+    }
 
-	@Nonnull
-	@Override
-	public Class<? extends SdkType> getSdkTypeClass()
-	{
-		throw new IllegalArgumentException();
-	}
+    @Nonnull
+    @Override
+    public Class<? extends SdkType> getSdkTypeClass() {
+        throw new IllegalArgumentException();
+    }
 
-	@Nonnull
-	@Override
-	public LanguageVersion getLanguageVersion()
-	{
-		return myLanguageVersion;
-	}
+    @Nonnull
+    @Override
+    public LanguageVersion getLanguageVersion() {
+        return myLanguageVersion;
+    }
 
-	@RequiredReadAction
-	@Override
-	public void commit(@Nonnull ClientJavaScriptModuleExtension mutableModuleExtension)
-	{
-		super.commit(mutableModuleExtension);
-		myLanguageVersion = mutableModuleExtension.getLanguageVersion();
-	}
+    @RequiredReadAction
+    @Override
+    public void commit(@Nonnull ClientJavaScriptModuleExtension mutableModuleExtension) {
+        super.commit(mutableModuleExtension);
+        myLanguageVersion = mutableModuleExtension.getLanguageVersion();
+    }
 }
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index a56d4e46..66a1881f 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -32,36 +32,36 @@
  * @author VISTALL
  * @since 12.12.2015
  */
-public class ClientJavaScriptModuleExtensionPanel extends JPanel
-{
-	public ClientJavaScriptModuleExtensionPanel(final JavaScriptMutableModuleExtension<?> extension)
-	{
-		super(new VerticalFlowLayout(true, false));
+public class ClientJavaScriptModuleExtensionPanel extends JPanel {
+    public ClientJavaScriptModuleExtensionPanel(final JavaScriptMutableModuleExtension<?> extension) {
+        super(new VerticalFlowLayout(true, false));
 
-		List<JavaScriptLanguageVersion> validLanguageVersions = StandardJavaScriptVersions.getInstance().getValidLanguageVersions();
+        List<JavaScriptLanguageVersion> validLanguageVersions = StandardJavaScriptVersions.getInstance().getValidLanguageVersions();
 
-		ComboBox<JavaScriptLanguageVersion> languageVersionComboBox = new ComboBox(new CollectionComboBoxModel(validLanguageVersions, extension.getLanguageVersion()));
-		languageVersionComboBox.addItemListener(new ItemListener()
-		{
-			@Override
-			public void itemStateChanged(ItemEvent e)
-			{
-				if(e.getStateChange() == ItemEvent.SELECTED)
-				{
-					//noinspection unchecked
-					extension.setLanguageVersion((LanguageVersion) e.getItem());
-				}
-			}
-		});
-		languageVersionComboBox.setRenderer(new ColoredListCellRenderer<>()
-		{
-			@Override
-			protected void customizeCellRenderer(@Nonnull JList list, JavaScriptLanguageVersion value, int index, boolean selected, boolean hasFocus)
-			{
-				append(value.getPresentableName());
-			}
-		});
+        ComboBox<JavaScriptLanguageVersion> languageVersionComboBox =
+            new ComboBox(new CollectionComboBoxModel(validLanguageVersions, extension.getLanguageVersion()));
+        languageVersionComboBox.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    //noinspection unchecked
+                    extension.setLanguageVersion((LanguageVersion)e.getItem());
+                }
+            }
+        });
+        languageVersionComboBox.setRenderer(new ColoredListCellRenderer<>() {
+            @Override
+            protected void customizeCellRenderer(
+                @Nonnull JList list,
+                JavaScriptLanguageVersion value,
+                int index,
+                boolean selected,
+                boolean hasFocus
+            ) {
+                append(value.getPresentableName());
+            }
+        });
 
-		add(LabeledComponent.create(languageVersionComboBox, "Default Version"));
-	}
+        add(LabeledComponent.create(languageVersionComboBox, "Default Version"));
+    }
 }
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
index c44f06b1..d52f0a32 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
@@ -16,46 +16,39 @@
  * @since 29-Aug-22
  */
 @ExtensionImpl
-public class ClientJavaScriptModuleExtensionProvider implements ModuleExtensionProvider<ClientJavaScriptModuleExtension>
-{
-	@Nonnull
-	@Override
-	public String getId()
-	{
-		return "client-javascript";
-	}
-
-	@Override
-	public boolean isAllowMixin()
-	{
-		return true;
-	}
-
-	@Nonnull
-	@Override
-	public LocalizeValue getName()
-	{
-		return LocalizeValue.localizeTODO("JavaScript (Client)");
-	}
-
-	@Nonnull
-	@Override
-	public Image getIcon()
-	{
-		return JavaScriptIconGroup.javascriptmodule();
-	}
-
-	@Nonnull
-	@Override
-	public ModuleExtension<ClientJavaScriptModuleExtension> createImmutableExtension(@Nonnull ModuleRootLayer moduleRootLayer)
-	{
-		return new ClientJavaScriptModuleExtension(getId(), moduleRootLayer);
-	}
-
-	@Nonnull
-	@Override
-	public MutableModuleExtension<ClientJavaScriptModuleExtension> createMutableExtension(@Nonnull ModuleRootLayer moduleRootLayer)
-	{
-		return new ClientJavaScriptMutableModuleExtension(getId(), moduleRootLayer);
-	}
+public class ClientJavaScriptModuleExtensionProvider implements ModuleExtensionProvider<ClientJavaScriptModuleExtension> {
+    @Nonnull
+    @Override
+    public String getId() {
+        return "client-javascript";
+    }
+
+    @Override
+    public boolean isAllowMixin() {
+        return true;
+    }
+
+    @Nonnull
+    @Override
+    public LocalizeValue getName() {
+        return LocalizeValue.localizeTODO("JavaScript (Client)");
+    }
+
+    @Nonnull
+    @Override
+    public Image getIcon() {
+        return JavaScriptIconGroup.javascriptmodule();
+    }
+
+    @Nonnull
+    @Override
+    public ModuleExtension<ClientJavaScriptModuleExtension> createImmutableExtension(@Nonnull ModuleRootLayer moduleRootLayer) {
+        return new ClientJavaScriptModuleExtension(getId(), moduleRootLayer);
+    }
+
+    @Nonnull
+    @Override
+    public MutableModuleExtension<ClientJavaScriptModuleExtension> createMutableExtension(@Nonnull ModuleRootLayer moduleRootLayer) {
+        return new ClientJavaScriptMutableModuleExtension(getId(), moduleRootLayer);
+    }
 }
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index 83ee3396..a5870ab0 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -14,57 +14,50 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import javax.swing.*;
 
 /**
  * @author VISTALL
  * @since 29.06.14
  */
-public class ClientJavaScriptMutableModuleExtension extends ClientJavaScriptModuleExtension implements JavaScriptMutableModuleExtension<ClientJavaScriptModuleExtension>, SwingMutableModuleExtension
-{
-	public ClientJavaScriptMutableModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootModel)
-	{
-		super(id, rootModel);
-	}
-
-	@Nonnull
-	@Override
-	public MutableModuleInheritableNamedPointer<Sdk> getInheritableSdk()
-	{
-		return (MutableModuleInheritableNamedPointer<Sdk>) super.getInheritableSdk();
-	}
-
-	@RequiredUIAccess
-	@Nullable
-	@Override
-	public Component createConfigurationComponent(@Nonnull Disposable disposable, @Nonnull Runnable runnable)
-	{
-		return VerticalLayout.create().add(Label.create("Unsupported UI"));
-	}
-
-	@RequiredUIAccess
-	@Nullable
-	@Override
-	public JComponent createConfigurablePanel(@Nonnull Disposable disposable, @Nonnull Runnable runnable)
-	{
-		return new ClientJavaScriptModuleExtensionPanel(this);
-	}
-
-	@Override
-	public void setEnabled(boolean val)
-	{
-		myIsEnabled = val;
-	}
-
-	@Override
-	public boolean isModified(@Nonnull ClientJavaScriptModuleExtension originalExtension)
-	{
-		return myIsEnabled != originalExtension.isEnabled() || myLanguageVersion != originalExtension.getLanguageVersion();
-	}
-
-	@Override
-	public void setLanguageVersion(@Nonnull LanguageVersion languageVersion)
-	{
-		myLanguageVersion = languageVersion;
-	}
+public class ClientJavaScriptMutableModuleExtension extends ClientJavaScriptModuleExtension implements JavaScriptMutableModuleExtension<ClientJavaScriptModuleExtension>, SwingMutableModuleExtension {
+    public ClientJavaScriptMutableModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootModel) {
+        super(id, rootModel);
+    }
+
+    @Nonnull
+    @Override
+    public MutableModuleInheritableNamedPointer<Sdk> getInheritableSdk() {
+        return (MutableModuleInheritableNamedPointer<Sdk>)super.getInheritableSdk();
+    }
+
+    @RequiredUIAccess
+    @Nullable
+    @Override
+    public Component createConfigurationComponent(@Nonnull Disposable disposable, @Nonnull Runnable runnable) {
+        return VerticalLayout.create().add(Label.create("Unsupported UI"));
+    }
+
+    @RequiredUIAccess
+    @Nullable
+    @Override
+    public JComponent createConfigurablePanel(@Nonnull Disposable disposable, @Nonnull Runnable runnable) {
+        return new ClientJavaScriptModuleExtensionPanel(this);
+    }
+
+    @Override
+    public void setEnabled(boolean val) {
+        myIsEnabled = val;
+    }
+
+    @Override
+    public boolean isModified(@Nonnull ClientJavaScriptModuleExtension originalExtension) {
+        return myIsEnabled != originalExtension.isEnabled() || myLanguageVersion != originalExtension.getLanguageVersion();
+    }
+
+    @Override
+    public void setLanguageVersion(@Nonnull LanguageVersion languageVersion) {
+        myLanguageVersion = languageVersion;
+    }
 }
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index ee53edc7..0fd13cda 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -19,45 +19,38 @@
  * @since 29.06.14
  */
 @ExtensionImpl
-public class ClientJavaScriptPredefinedBundlesProvider extends PredefinedBundlesProvider
-{
-	public static final String ANY_JAVASCRIPT_SDK = "JavaScript SDK (Any Browser)";
-
-	private Map<String, String> ourMapping = Map.of("clientAny", ANY_JAVASCRIPT_SDK);
-
-	@Override
-	public void createBundles(@Nonnull Context context)
-	{
-		File sdkDir = new File(PluginManager.getPluginPath(ClientJavaScriptPredefinedBundlesProvider.class), "sdk");
-		if(!sdkDir.exists())
-		{
-			return;
-		}
-
-		for(File file : sdkDir.listFiles())
-		{
-			String name = ourMapping.get(file.getName());
-			if(name == null)
-			{
-				continue;
-			}
-
-			VirtualFile fileByIoFile = LocalFileSystem.getInstance().findFileByIoFile(file);
-			if(fileByIoFile == null)
-			{
-				continue;
-			}
-			Sdk sdk = context.createSdkWithName(ClientJavaScriptSdkType.getInstance(), name);
-
-			SdkModificator modificator = sdk.getSdkModificator();
-			modificator.setHomePath(fileByIoFile.getPath());
-			modificator.setVersionString("1");
-			for(VirtualFile child : fileByIoFile.getChildren())
-			{
-				modificator.addRoot(child, BinariesOrderRootType.getInstance());
-				modificator.addRoot(child, SourcesOrderRootType.getInstance());
-			}
-			modificator.commitChanges();
-		}
-	}
+public class ClientJavaScriptPredefinedBundlesProvider extends PredefinedBundlesProvider {
+    public static final String ANY_JAVASCRIPT_SDK = "JavaScript SDK (Any Browser)";
+
+    private Map<String, String> ourMapping = Map.of("clientAny", ANY_JAVASCRIPT_SDK);
+
+    @Override
+    public void createBundles(@Nonnull Context context) {
+        File sdkDir = new File(PluginManager.getPluginPath(ClientJavaScriptPredefinedBundlesProvider.class), "sdk");
+        if (!sdkDir.exists()) {
+            return;
+        }
+
+        for (File file : sdkDir.listFiles()) {
+            String name = ourMapping.get(file.getName());
+            if (name == null) {
+                continue;
+            }
+
+            VirtualFile fileByIoFile = LocalFileSystem.getInstance().findFileByIoFile(file);
+            if (fileByIoFile == null) {
+                continue;
+            }
+            Sdk sdk = context.createSdkWithName(ClientJavaScriptSdkType.getInstance(), name);
+
+            SdkModificator modificator = sdk.getSdkModificator();
+            modificator.setHomePath(fileByIoFile.getPath());
+            modificator.setVersionString("1");
+            for (VirtualFile child : fileByIoFile.getChildren()) {
+                modificator.addRoot(child, BinariesOrderRootType.getInstance());
+                modificator.addRoot(child, SourcesOrderRootType.getInstance());
+            }
+            modificator.commitChanges();
+        }
+    }
 }
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index 1d0f215a..0189b20c 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -16,61 +16,51 @@
  * @since 29.06.14
  */
 @ExtensionImpl
-public class ClientJavaScriptSdkType extends SdkType
-{
-	@Nonnull
-	public static ClientJavaScriptSdkType getInstance()
-	{
-		return EP_NAME.findExtensionOrFail(ClientJavaScriptSdkType.class);
-	}
+public class ClientJavaScriptSdkType extends SdkType {
+    @Nonnull
+    public static ClientJavaScriptSdkType getInstance() {
+        return EP_NAME.findExtensionOrFail(ClientJavaScriptSdkType.class);
+    }
 
-	public ClientJavaScriptSdkType()
-	{
-		super("CLIENT_JAVASCRIPT_SDK_TYPE");
-	}
+    public ClientJavaScriptSdkType() {
+        super("CLIENT_JAVASCRIPT_SDK_TYPE");
+    }
 
-	@Override
-	public boolean supportsUserAdd()
-	{
-		return false;
-	}
+    @Override
+    public boolean supportsUserAdd() {
+        return false;
+    }
 
-	@Override
-	public boolean isRootTypeApplicable(OrderRootType type)
-	{
-		return type == BinariesOrderRootType.getInstance() || type == SourcesOrderRootType.getInstance();
-	}
+    @Override
+    public boolean isRootTypeApplicable(OrderRootType type) {
+        return type == BinariesOrderRootType.getInstance() || type == SourcesOrderRootType.getInstance();
+    }
 
-	@Nonnull
-	@Override
-	public Image getIcon()
-	{
-		return JavaScriptIconGroup.javascriptmodule();
-	}
+    @Nonnull
+    @Override
+    public Image getIcon() {
+        return JavaScriptIconGroup.javascriptmodule();
+    }
 
-	@Override
-	public boolean isValidSdkHome(String path)
-	{
-		return false;
-	}
+    @Override
+    public boolean isValidSdkHome(String path) {
+        return false;
+    }
 
-	@Nullable
-	@Override
-	public String getVersionString(String sdkHome)
-	{
-		return "1";
-	}
+    @Nullable
+    @Override
+    public String getVersionString(String sdkHome) {
+        return "1";
+    }
 
-	@Override
-	public String suggestSdkName(String currentSdkName, String sdkHome)
-	{
-		return currentSdkName;
-	}
+    @Override
+    public String suggestSdkName(String currentSdkName, String sdkHome) {
+        return currentSdkName;
+    }
 
-	@Nonnull
-	@Override
-	public String getPresentableName()
-	{
-		return "Client JavaScript";
-	}
+    @Nonnull
+    @Override
+    public String getPresentableName() {
+        return "Client JavaScript";
+    }
 }
diff --git a/web-browser-impl/src/main/java/module-info.java b/web-browser-impl/src/main/java/module-info.java
index 84b86bbd..3d1a5e0d 100644
--- a/web-browser-impl/src/main/java/module-info.java
+++ b/web-browser-impl/src/main/java/module-info.java
@@ -4,8 +4,8 @@
  */
 module consulo.javascript.web.browser.impl
 {
-	// TODO remove in future
-	requires java.desktop;
+    // TODO remove in future
+    requires java.desktop;
 
-	requires consulo.javascript.base.impl;
+    requires consulo.javascript.base.impl;
 }
\ No newline at end of file

From 8b7d8568c9a563a2672c558206244e69f63f6f07 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 20 Apr 2025 13:08:54 +0300
Subject: [PATCH 282/340] Compilation fix. Some refactoring.

---
 .../ClientJavaScriptModuleExtension.java       |  2 +-
 .../ClientJavaScriptModuleExtensionPanel.java  | 18 +++++++-----------
 ...lientJavaScriptModuleExtensionProvider.java |  2 +-
 ...ClientJavaScriptMutableModuleExtension.java |  2 +-
 ...entJavaScriptPredefinedBundlesProvider.java |  2 +-
 .../module/sdk/ClientJavaScriptSdkType.java    |  5 +++--
 .../src/main/java/module-info.java             |  2 +-
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index 9fa2f390..a59d185e 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -21,7 +21,7 @@
 
 /**
  * @author VISTALL
- * @since 29.06.14
+ * @since 2014-06-29
  */
 public class ClientJavaScriptModuleExtension extends ModuleExtensionBase<ClientJavaScriptModuleExtension> implements JavaScriptModuleExtension<ClientJavaScriptModuleExtension> {
     private SdkModuleInheritableNamedPointerImpl myPointer;
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index 66a1881f..fbaf1e38 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -25,28 +25,24 @@
 
 import javax.swing.*;
 import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.util.List;
 
 /**
  * @author VISTALL
- * @since 12.12.2015
+ * @since 2015-12-12
  */
 public class ClientJavaScriptModuleExtensionPanel extends JPanel {
-    public ClientJavaScriptModuleExtensionPanel(final JavaScriptMutableModuleExtension<?> extension) {
+    public ClientJavaScriptModuleExtensionPanel(JavaScriptMutableModuleExtension<?> extension) {
         super(new VerticalFlowLayout(true, false));
 
         List<JavaScriptLanguageVersion> validLanguageVersions = StandardJavaScriptVersions.getInstance().getValidLanguageVersions();
 
         ComboBox<JavaScriptLanguageVersion> languageVersionComboBox =
-            new ComboBox(new CollectionComboBoxModel(validLanguageVersions, extension.getLanguageVersion()));
-        languageVersionComboBox.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                if (e.getStateChange() == ItemEvent.SELECTED) {
-                    //noinspection unchecked
-                    extension.setLanguageVersion((LanguageVersion)e.getItem());
-                }
+            new ComboBox<>(new CollectionComboBoxModel<>(validLanguageVersions, (JavaScriptLanguageVersion)extension.getLanguageVersion()));
+        languageVersionComboBox.addItemListener(e -> {
+            if (e.getStateChange() == ItemEvent.SELECTED) {
+                //noinspection unchecked
+                extension.setLanguageVersion((LanguageVersion)e.getItem());
             }
         });
         languageVersionComboBox.setRenderer(new ColoredListCellRenderer<>() {
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
index d52f0a32..b2876acb 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
@@ -13,7 +13,7 @@
 
 /**
  * @author VISTALL
- * @since 29-Aug-22
+ * @since 2022-08-29
  */
 @ExtensionImpl
 public class ClientJavaScriptModuleExtensionProvider implements ModuleExtensionProvider<ClientJavaScriptModuleExtension> {
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index a5870ab0..0608aa3f 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -19,7 +19,7 @@
 
 /**
  * @author VISTALL
- * @since 29.06.14
+ * @since 2014-06-29
  */
 public class ClientJavaScriptMutableModuleExtension extends ClientJavaScriptModuleExtension implements JavaScriptMutableModuleExtension<ClientJavaScriptModuleExtension>, SwingMutableModuleExtension {
     public ClientJavaScriptMutableModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootModel) {
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index 0fd13cda..7c376ece 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -16,7 +16,7 @@
 
 /**
  * @author VISTALL
- * @since 29.06.14
+ * @since 2014-06-29
  */
 @ExtensionImpl
 public class ClientJavaScriptPredefinedBundlesProvider extends PredefinedBundlesProvider {
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index 0189b20c..60a95978 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -1,6 +1,7 @@
 package consulo.javascript.client.module.sdk;
 
 import consulo.annotation.component.ExtensionImpl;
+import consulo.application.Application;
 import consulo.content.OrderRootType;
 import consulo.content.base.BinariesOrderRootType;
 import consulo.content.base.SourcesOrderRootType;
@@ -13,13 +14,13 @@
 
 /**
  * @author VISTALL
- * @since 29.06.14
+ * @since 2014-06-29
  */
 @ExtensionImpl
 public class ClientJavaScriptSdkType extends SdkType {
     @Nonnull
     public static ClientJavaScriptSdkType getInstance() {
-        return EP_NAME.findExtensionOrFail(ClientJavaScriptSdkType.class);
+        return Application.get().getExtensionPoint(SdkType.class).findExtensionOrFail(ClientJavaScriptSdkType.class);
     }
 
     public ClientJavaScriptSdkType() {
diff --git a/web-browser-impl/src/main/java/module-info.java b/web-browser-impl/src/main/java/module-info.java
index 3d1a5e0d..4aea4fec 100644
--- a/web-browser-impl/src/main/java/module-info.java
+++ b/web-browser-impl/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 /**
  * @author VISTALL
- * @since 29-Aug-22
+ * @since 2022-08-29
  */
 module consulo.javascript.web.browser.impl
 {

From 73d13b20b793085bcc575a6c6b493ae8f2f3a047 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 23 May 2025 15:29:01 +0400
Subject: [PATCH 283/340] migrate to new highlight manager api

---
 .../javascript/impl/refactoring/JSBaseIntroduceHandler.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
index a2c12284..690fe597 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
@@ -365,10 +365,8 @@ protected T findAnchor(BaseIntroduceContext<S> context, boolean replaceAllOccure
 
     private static ArrayList<RangeHighlighter> highlightOccurences(Project project, Editor editor, JSExpression[] occurences) {
         HighlightManager highlightManager = HighlightManager.getInstance(project);
-        EditorColorsManager colorsManager = EditorColorsManager.getInstance();
-        TextAttributes attributes = colorsManager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES);
         ArrayList<RangeHighlighter> result = new ArrayList<>();
-        highlightManager.addOccurrenceHighlights(editor, occurences, attributes, true, result);
+        highlightManager.addOccurrenceHighlights(editor, occurences, EditorColors.SEARCH_RESULT_ATTRIBUTES, true, result);
         WindowManager.getInstance().getStatusBar(project).setInfo(RefactoringLocalize.pressEscapeToRemoveTheHighlighting().get());
         return result;
     }

From 3392de5dee457654ec4245cf0dba5a0e72f07597 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 29 May 2025 15:22:16 +0400
Subject: [PATCH 284/340] don't use focused editor, use it from method call

---
 .../impl/structureView/JSStructureViewBuilderFactory.java   | 2 +-
 .../javascript/impl/structureView/JSStructureViewModel.java | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
index 265e641b..7c5f0a6f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
@@ -38,7 +38,7 @@ public StructureViewBuilder getStructureViewBuilder(PsiFile psiFile) {
             @Override
             @Nonnull
             public StructureViewModel createStructureViewModel(Editor editor) {
-                return new JSStructureViewModel(psiFile);
+                return new JSStructureViewModel(psiFile, editor);
             }
 
             @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
index ba4e1634..e81fd20e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
@@ -189,12 +189,6 @@ public Shortcut[] getShortcut() {
 
     private Grouper[] myGroupers = new Grouper[]{INHERITED_GROUPER};
 
-
-    public JSStructureViewModel(PsiElement root) {
-        super(root.getContainingFile());
-        myRoot = root;
-    }
-
     public JSStructureViewModel(PsiElement root, Editor editor) {
         super(editor);
         myRoot = root;

From b0c98bcfe81c61d2e094e6c6a16d4074f7168818 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 24 Jun 2025 11:26:53 +0400
Subject: [PATCH 285/340] drop status bar info

---
 .../lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
index 690fe597..b92c039a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
@@ -367,7 +367,6 @@ private static ArrayList<RangeHighlighter> highlightOccurences(Project project,
         HighlightManager highlightManager = HighlightManager.getInstance(project);
         ArrayList<RangeHighlighter> result = new ArrayList<>();
         highlightManager.addOccurrenceHighlights(editor, occurences, EditorColors.SEARCH_RESULT_ATTRIBUTES, true, result);
-        WindowManager.getInstance().getStatusBar(project).setInfo(RefactoringLocalize.pressEscapeToRemoveTheHighlighting().get());
         return result;
     }
 

From a240dc2ac594504bbb220ca46d2e6e64b7fb085a Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 11 Jul 2025 11:46:54 +0400
Subject: [PATCH 286/340] fixed wrong assertion on code style change

---
 .../impl/formatter/blocks/JSDocCommentBlock.java         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
index 11b5a2ec..cfb29528 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
@@ -20,6 +20,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.codeStyle.*;
 import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,7 +54,7 @@ public List<Block> getSubBlocks() {
         return EMPTY_BLOCK_LIST;
     }
 
-    @Nonnull
+    @Nullable
     @Override
     public Wrap getWrap() {
         return null;
@@ -65,13 +66,13 @@ public Indent getIndent() {
         return myIndent;
     }
 
-    @Nonnull
+    @Nullable
     @Override
     public Alignment getAlignment() {
         return null;
     }
 
-    @Nonnull
+    @Nullable
     @Override
     public Spacing getSpacing(Block child1, @Nonnull Block child2) {
         return null;
@@ -80,7 +81,7 @@ public Spacing getSpacing(Block child1, @Nonnull Block child2) {
     @Nonnull
     @Override
     public ChildAttributes getChildAttributes(int newChildIndex) {
-        return null;
+        return new ChildAttributes(null, null);
     }
 
     @Override

From 3d7bc11275f46098c26d72544d1b1cb6a9f9fb9d Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 9 Aug 2025 17:29:25 +0400
Subject: [PATCH 287/340] move to api

---
 .../jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
index 46947a8a..424fe19c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
@@ -5,11 +5,10 @@
 import consulo.codeEditor.EditorEx;
 import consulo.javascript.jsx.language.JSXJavaScriptVersion;
 import consulo.language.editor.Pass;
-import consulo.language.editor.impl.highlight.TextEditorHighlightingPass;
-import consulo.language.editor.impl.highlight.TextEditorHighlightingPassFactory;
+import consulo.language.editor.highlight.TextEditorHighlightingPass;
+import consulo.language.editor.highlight.TextEditorHighlightingPassFactory;
 import consulo.language.psi.PsiFile;
 import consulo.xml.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeHighlightingPass;
-
 import jakarta.annotation.Nonnull;
 
 /**

From 0a28992b95fd3c6c9ba45c923c86e1b0d49e0825 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 10 Aug 2025 14:05:21 +0400
Subject: [PATCH 288/340] migrate to localize

---
 .../language/JavaScriptLanguage.java          |   9 +-
 ...consulo.javascript.JavaScriptLocalize.yaml | 994 +++++++++---------
 .../JavaScriptColorsAndFontsPage.java         |  12 +-
 .../JavaScriptCodeStyleConfigurable.java      |   3 +-
 4 files changed, 511 insertions(+), 507 deletions(-)

diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
index cbaac2a5..bb073bb0 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
@@ -16,10 +16,11 @@
 
 package consulo.javascript.language;
 
+import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.Language;
 import consulo.language.file.LanguageFileType;
 import consulo.language.version.LanguageVersion;
-
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -56,6 +57,12 @@ public LanguageVersion getVersionById(@Nonnull String id) {
         return oldMap.get(id);
     }
 
+    @Nonnull
+    @Override
+    public LocalizeValue getDisplayName() {
+        return JavaScriptLocalize.javascriptName();
+    }
+
     @Nullable
     @Override
     public LanguageFileType getAssociatedFileType() {
diff --git a/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml b/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
index 4a232a38..a55d46c1 100644
--- a/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
+++ b/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
@@ -1,538 +1,540 @@
+action.JavaScript.File.text:
+    text: JavaScript File
+building.index.message:
+    text: Building JavaScript indices
+choose.class.title:
+    text: Choose Class
+create.class.dialog.title:
+    text: Create Class
+create.interface.dialog.title:
+    text: Create Interface
+flex.import.class:
+    text: Import Class {0}
+flex.import.function:
+    text: Import Function {0}
+generate.constructor.fields.chooser.title:
+    text: Choose Fields to Initialize by Constructor
+generate.getter.fields.bindable.properties:
+    text: '&Bindable properties'
+generate.getter.fields.chooser.title:
+    text: Select Fields to Generate Getters
+generate.getter.setter.chooser.title:
+    text: Select Fields to Generate Getters and Setters
+generate.setter.fields.chooser.title:
+    text: Select Fields to Generate Setters
+generate.to.string.chooser.title:
+    text: Select Fields to Use in toString function
+interface.function.declaration.should.have.no.body:
+    text: Interface functions declaration should have no body
+interface.should.have.no.variable.declarations:
+    text: Interface should have no variable declarations
+invalid.identifier.value:
+    text: invalid identifier value
+javascript.argument.type.mismatch:
+    text: Argument type {1} is not assignable to parameter type {0}
+javascript.assigned.expression.type.mismatch:
+    text: Assigned expression type {1} is not assignable to type {0}
+javascript.badcharacter:
+    text: Bad character
+javascript.binary.operand.type.mismatch:
+    text: Binary operation argument type {1} is not assignable to type {0}
+javascript.blockcomment:
+    text: Block comment
+javascript.braces:
+    text: Braces
+javascript.brackets:
+    text: Brackets
+javascript.comma:
+    text: Comma
+javascript.create.class.intention.name:
+    text: Create Class {0}
+javascript.create.constant.field.intention.name:
+    text: Create Constant Field {0}
+javascript.create.constant.intention.name:
+    text: Create Constant {0}
+javascript.create.event.handler.intention.name:
+    text: Create Event Handler {0}
+javascript.create.function.intention.family:
+    text: Create JavaScript Function or Method
+javascript.create.function.intention.name:
+    text: Create Function {0}
+javascript.create.get.property.intention.name:
+    text: Create Get Property {0}
+javascript.create.interface.intention.name:
+    text: Create Interface {0}
+javascript.create.method.intention.name:
+    text: Create Method {0}
+javascript.create.namespace.intention.name:
+    text: Create Namespace {0}
+javascript.create.property.intention.name:
+    text: Create Field {0}
+javascript.create.set.property.intention.name:
+    text: Create Set Property {0}
+javascript.create.variable.intention.family:
+    text: Create JavaScript Variable Or Property
+javascript.create.variable.intention.name:
+    text: Create Variable {0}
+javascript.declare.variable.intention.name:
+    text: Insert Var Declaration for {0}
+javascript.deprecated.symbol.used.name.message:
+    text: 'Deprecated symbol used, consult docs for better alternative #loc'
+javascript.doccomment:
+    text: Doc comment
+javascript.docmarkup:
+    text: Documentation markup
+javascript.doctag:
+    text: Documentation tag
+javascript.dot:
+    text: Dot
+javascript.extract.method.title:
+    text: Extract Function
 javascript.filetype.description:
-  text: JavaScript files
-typescript.filetype.description:
-  text: TypeScript files
-javascript.language.term.function:
-  text: function
+    text: JavaScript files
+javascript.fix.add.override.modifier:
+    text: Add override modifier
+javascript.fix.create.constructor.invoke.super:
+    text: Create constructor matching super
+javascript.fix.create.invoke.super:
+    text: Insert super class constructor invokation
+javascript.fix.implement.methods:
+    text: Implement Methods
+javascript.fix.optimize.imports:
+    text: Optimize imports
+javascript.fix.package.name:
+    text: Set package name to ''{0}''
+javascript.fix.remove.access.modifier:
+    text: Remove access modifier
+javascript.fix.remove.circular.dependency:
+    text: Remove circular dependency
+javascript.fix.remove.constructor:
+    text: Remove constructor
+javascript.fix.remove.externally.visible.symbol:
+    text: Remove externally visible symbol
+javascript.fix.remove.initializer:
+    text: Remove initializer
+javascript.fix.remove.namespace.reference:
+    text: Remove namespace reference
+javascript.fix.remove.override.modifier:
+    text: Remove override modifier
+javascript.fix.remove.parameter:
+    text: Remove parameter
+javascript.fix.remove.type.reference:
+    text: Remove type reference
+javascript.formatting.options.panel.title:
+    text: Formatting options
+javascript.global.function:
+    text: Global function
+javascript.global.variable:
+    text: Global variable
+javascript.incorrect.array.type.in.forin:
+    text: Array key type should be String
+javascript.incorrect.variable.type.mismatch:
+    text: Variable type {1} is not assignable to type {0}
+javascript.initializer.type.mismatch:
+    text: Initializer type {1} is not assignable to variable type {0}
+javascript.insert.cast.fix:
+    text: Insert cast
+javascript.instance.member.function:
+    text: Instance member function
+javascript.instance.member.variable:
+    text: Instance member variable
+javascript.interface.can.not.be.instantiated.message:
+    text: Interface can not be instantiated
+javascript.introduce.constant.error.no.expression.selected:
+    text: |-
+        Cannot introduce constant.
+        Selection does not form an expression.
+javascript.introduce.constant.error.not.available.in.javascript.code:
+    text: Introduce Constant is not available in JavaScript code
+javascript.introduce.constant.error.not.constant.expression.selected:
+    text: |-
+        Cannot introduce constant.
+        Selection is not constant expression.
+javascript.introduce.constant.title:
+    text: Introduce Constant
+javascript.introduce.field.error.no.expression.selected:
+    text: |-
+        Cannot introduce field.
+        Selection does not form an expression.
+javascript.introduce.field.error.not.available.in.javascript.code:
+    text: Introduce Field is not available in JavaScript code
+javascript.introduce.field.title:
+    text: Introduce Field
+javascript.introduce.variable.error.no.expression.selected:
+    text: |-
+        Cannot introduce variable.
+        Selection does not form an expression.
+javascript.introduce.variable.function.already.exists:
+    text: Function with name {0} already exists in the scope.
+javascript.introduce.variable.invalid.name:
+    text: Please enter a valid name.
+javascript.introduce.variable.name.prompt:
+    text: '&Name:'
+javascript.introduce.variable.replace.all.occurrences:
+    text: Replace &all occurrences ({0} occurrences found)
+javascript.introduce.variable.title:
+    text: Introduce Variable
+javascript.introduce.variable.variable.already.exists:
+    text: Variable with name {0} already exists in the scope.
+javascript.invalid.number.of.parameters:
+    text: Invalid number of parameters, expected {0}
+javascript.invalid.string.escape:
+    text: Invalid string escape
+javascript.keyword:
+    text: Keyword
+javascript.language.term.attribute.value:
+    text: Attribute value
 javascript.language.term.class:
-  text: class
+    text: class
+javascript.language.term.function:
+    text: function
+javascript.language.term.label:
+    text: label
 javascript.language.term.namespace:
-  text: namespace
+    text: namespace
+javascript.language.term.package:
+    text: package
 javascript.language.term.parameter:
-  text: parameter
+    text: parameter
 javascript.language.term.property:
-  text: property
-javascript.language.term.variable:
-  text: variable
-javascript.language.term.value:
-  text: value
-javascript.language.term.tag:
-  text: tag
-javascript.language.term.label:
-  text: label
+    text: property
 javascript.language.term.prototype:
-  text: prototype
+    text: prototype
+javascript.language.term.tag:
+    text: tag
+javascript.language.term.value:
+    text: value
+javascript.language.term.variable:
+    text: variable
+javascript.linecomment:
+    text: Line comment
+javascript.local.variable:
+    text: Local variable
+javascript.metadata:
+    text: Metadata
+javascript.name:
+    text: JavaScript
+javascript.number:
+    text: Number
+javascript.operation:
+    text: Operation
+javascript.parameter:
+    text: Parameter
+javascript.parens:
+    text: Parenthesis
+javascript.parser.message.expected.catch.or.default:
+    text: catch or default expected
+javascript.parser.message.expected.colon:
+    text: ': expected'
+javascript.parser.message.expected.comma:
+    text: ', expected'
+javascript.parser.message.expected.comma.or.rparen:
+    text: ', or ) expected'
+javascript.parser.message.expected.doc.tag.name:
+    text: Expected doc tag name
+javascript.parser.message.expected.doc.tag.value:
+    text: Expected doc tag value
+javascript.parser.message.expected.eof:
+    text: End of file expected
+javascript.parser.message.expected.equal:
+    text: expected =
 javascript.parser.message.expected.expression:
-  text: expression expected
-javascript.parser.message.expected.xml.element:
-  text: xml element expected
-javascript.parser.property.expected:
-  text: property expected
+    text: expression expected
+javascript.parser.message.expected.forloop.in.of.or.semicolon:
+    text: '''in'', ''of'' or ; expected'
+javascript.parser.message.expected.forloop.in.or.semicolon:
+    text: '''in'' or ; expected'
+javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration:
+    text: left hand side expression or variable declaration expected before 'in'
+javascript.parser.message.expected.formal.parameter.name:
+    text: formal parameter name expected
+javascript.parser.message.expected.function.name:
+    text: function name expected
+javascript.parser.message.expected.function.var.class.interface.namespace:
+    text: Expected function, variable, class, interface or namespace declaration
+javascript.parser.message.expected.identifer.or.value:
+    text: Identifier or value expected
+javascript.parser.message.expected.identifier:
+    text: Expected identifier
+javascript.parser.message.expected.identifier.string.literal.or.numeric.literal:
+    text: identifier or string literal or numeric literal expected
+javascript.parser.message.expected.instanceof:
+    text: Expected instanceof
 javascript.parser.message.expected.lbrace:
-  text: "'{' expected"
+    text: '''{'' expected'
+javascript.parser.message.expected.lbrace.or.lbracket:
+    text: '''{'' or ''['' expected'
+javascript.parser.message.expected.lparen:
+    text: ( expected
+javascript.parser.message.expected.lt:
+    text: Expected >
+javascript.parser.message.expected.name:
+    text: name expected
+javascript.parser.message.expected.name.or.lbrace:
+    text: Expected package name or '{'
+javascript.parser.message.expected.namespace:
+    text: Namespace keyword expected
+javascript.parser.message.expected.parameter.name:
+    text: parameter name expected
 javascript.parser.message.expected.rbrace:
-  text: "'}' expected"
-javascript.parser.message.expected.identifier.string.literal.or.numeric.literal:
-  text: identifier or string literal or numeric literal expected
-javascript.parser.message.expected.colon:
-  text: ': expected'
-javascript.parser.message.expected.semicolon:
-  text: ; expected
+    text: '''}'' expected'
 javascript.parser.message.expected.rbracket:
-  text: '] expected'
-javascript.parser.message.expected.lparen:
-  text: ( expected
+    text: '] expected'
 javascript.parser.message.expected.rparen:
-  text: ) expected
-javascript.parser.message.expected.name:
-  text: name expected
-javascript.parser.message.expected.comma.or.rparen:
-  text: ', or ) expected'
-javascript.parser.message.expected.function.name:
-  text: function name expected
-javascript.parser.message.expected.formal.parameter.name:
-  text: formal parameter name expected
+    text: ) expected
+javascript.parser.message.expected.semicolon:
+    text: ; expected
 javascript.parser.message.expected.statement:
-  text: statement expected
-javascript.parser.message.expected.parameter.name:
-  text: parameter name expected
-javascript.parser.message.expected.catch.or.default:
-  text: catch or default expected
-javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration:
-  text: left hand side expression or variable declaration expected before 'in'
-javascript.parser.message.expected.forloop.in.or.semicolon:
-  text: '''in'' or ; expected'
-javascript.parser.message.expected.forloop.in.of.or.semicolon:
-  text: '''in'', ''of'' or ; expected'
-javascript.parser.message.expected.while.keyword:
-  text: while expected
-javascript.parser.message.expected.comma:
-  text: ', expected'
+    text: statement expected
+javascript.parser.message.expected.string.literal:
+    text: String literal expected
+javascript.parser.message.expected.typename:
+    text: '* or type name expected'
+javascript.parser.message.expected.value:
+    text: value expected
 javascript.parser.message.expected.variable.name:
-  text: variable name expected
+    text: variable name expected
+javascript.parser.message.expected.while.keyword:
+    text: while expected
+javascript.parser.message.expected.xml:
+    text: xml context keyword expected
+javascript.parser.message.expected.xml.element:
+    text: xml element expected
 javascript.parser.message.missing.rbrace:
-  text: missing }
-javascript.parser.message.unexpected.end.of.file:
-  text: unexpected end of file
+    text: missing }
 javascript.parser.message.unclosed.string.literal:
-  text: Unclosed string literal
-javascript.validation.message.duplicate.declaration:
-  text: Duplicate declaration
-javascript.validation.message.assignment.to.const:
-  text: Attempt to assign to const variable
-javascript.validation.message.arguments.out.of.function:
-  text: Using function arguments object outside function
-javascript.validation.message.must.be.lvalue:
-  text: Must be lvalue
-javascript.validation.message.const.variable.without.initializer.:
-  text: const variable without initializer. It won't be possible to assign meaningful value later.
-javascript.validation.message.continue.without.target:
-  text: Cannot determine target for 'continue'
-javascript.validation.message.break.without.target:
-  text: Cannot determine target for 'break'
-javascript.validation.message.return.outside.function.definition:
-  text: '''return'' outside function definition'
-javascript.validation.message.duplicate.label:
-  text: Duplicate label
+    text: Unclosed string literal
+javascript.parser.message.unexpected.end.of.file:
+    text: unexpected end of file
+javascript.parser.property.expected:
+    text: property expected
+javascript.regexp:
+    text: Regular expression
+javascript.returned.expression.type.mismatch:
+    text: Returned expression type {1} is not assignable to type {0}
+javascript.semicolon:
+    text: Semicolon
+javascript.static.member.function:
+    text: Static member function
+javascript.static.member.variable:
+    text: Static member variable
+javascript.string:
+    text: String
 javascript.surround.with.do.while:
-  text: do / while
+    text: do / while
 javascript.surround.with.for:
-  text: for
+    text: for
+javascript.surround.with.function:
+    text: function
+javascript.surround.with.function.expression:
+    text: function expression
 javascript.surround.with.if:
-  text: if
+    text: if
 javascript.surround.with.if.else:
-  text: if / else
+    text: if / else
 javascript.surround.with.parenthesis:
-  text: (expr)
+    text: (expr)
 javascript.surround.with.try.catch:
-  text: try / catch
-javascript.surround.with.try.finally:
-  text: try / finally
+    text: try / catch
 javascript.surround.with.try.catch.finally:
-  text: try / catch / finally
+    text: try / catch / finally
+javascript.surround.with.try.finally:
+    text: try / finally
 javascript.surround.with.while:
-  text: while
+    text: while
 javascript.surround.with.with:
-  text: with
-javascript.surround.with.function:
-  text: function
-javascript.surround.with.function.expression:
-  text: function expression
-javascript.introduce.variable.title:
-  text: Introduce Variable
-javascript.introduce.variable.error.no.expression.selected:
-  text: |-
-    Cannot introduce variable.
-    Selection does not form an expression.
-javascript.introduce.variable.name.prompt:
-  text: '&Name:'
-javascript.introduce.variable.replace.all.occurrences:
-  text: Replace &all occurrences ({0} occurrences found)
-javascript.introduce.variable.invalid.name:
-  text: Please enter a valid name.
-javascript.introduce.variable.variable.already.exists:
-  text: Variable with name {0} already exists in the scope.
-javascript.introduce.variable.function.already.exists:
-  text: Function with name {0} already exists in the scope.
-javascript.introduce.field.title:
-  text: Introduce Field
-javascript.introduce.field.error.no.expression.selected:
-  text: |-
-    Cannot introduce field.
-    Selection does not form an expression.
-javascript.introduce.constant.title:
-  text: Introduce Constant
-javascript.introduce.constant.error.no.expression.selected:
-  text: |-
-    Cannot introduce constant.
-    Selection does not form an expression.
-javascript.introduce.constant.error.not.constant.expression.selected:
-  text: |-
-    Cannot introduce constant.
-    Selection is not constant expression.
-javascript.keyword:
-  text: Keyword
-javascript.string:
-  text: String
-javascript.number:
-  text: Number
-javascript.linecomment:
-  text: Line comment
-javascript.doccomment:
-  text: Doc comment
-javascript.blockcomment:
-  text: Block comment
-javascript.regexp:
-  text: Regular expression
-javascript.operation:
-  text: Operation
-javascript.parens:
-  text: Parenthesis
-javascript.brackets:
-  text: Brackets
-javascript.braces:
-  text: Braces
-javascript.semicolon:
-  text: Semicolon
-javascript.badcharacter:
-  text: Bad character
-javascript.docmarkup:
-  text: Documentation markup
-javascript.doctag:
-  text: Documentation tag
-javascript.valid.string.escape:
-  text: Valid string escape
-javascript.invalid.string.escape:
-  text: Invalid string escape
-javascript.comma:
-  text: Comma
-javascript.dot:
-  text: Dot
-building.index.message:
-  text: Building JavaScript indices
-loading.index.message:
-  text: Loading JavaScript indices
+    text: with
+javascript.template.context.type:
+    text: Java Sc&ript
+javascript.term.does.not.evaluate.to.function:
+    text: Method expression is not of Function type
+javascript.term.does.not.evaluate.to.function2:
+    text: Property can not be invoked as function
+javascript.term.does.not.evaluate.to.function2.fix:
+    text: Remove argument list
+javascript.undeclared.variable.name.message:
+    text: 'Variable {0} implicitly declared #loc'
 javascript.unresolved.function.name.message:
-  text: 'Unresolved function or method {0}() #loc'
-javascript.unresolved.variable.name.message:
-  text: 'Unresolved variable {0} #loc'
+    text: 'Unresolved function or method {0}() #loc'
 javascript.unresolved.type.name.message:
-  text: 'Unresolved type {0} #loc'
+    text: 'Unresolved type {0} #loc'
+javascript.unresolved.variable.name.message:
+    text: 'Unresolved variable {0} #loc'
 javascript.unresolved.variable.or.type.name.message:
-  text: 'Unresolved variable or type {0} #loc'
+    text: 'Unresolved variable or type {0} #loc'
 javascript.unresolved.variable.or.type.name.message2:
-  text: Unresolved variable or type {0}
-javascript.undeclared.variable.name.message:
-  text: 'Variable {0} implicitly declared #loc'
-javascript.create.function.intention.name:
-  text: Create Function {0}
-javascript.create.variable.intention.name:
-  text: Create Variable {0}
-javascript.create.constant.intention.name:
-  text: Create Constant {0}
-javascript.declare.variable.intention.name:
-  text: Insert Var Declaration for {0}
-javascript.create.namespace.intention.name:
-  text: Create Namespace {0}
-javascript.create.property.intention.name:
-  text: Create Field {0}
-javascript.create.constant.field.intention.name:
-  text: Create Constant Field {0}
-javascript.create.method.intention.name:
-  text: Create Method {0}
-javascript.create.get.property.intention.name:
-  text: Create Get Property {0}
-javascript.create.set.property.intention.name:
-  text: Create Set Property {0}
-javascript.create.function.intention.family:
-  text: Create JavaScript Function or Method
-javascript.create.variable.intention.family:
-  text: Create JavaScript Variable Or Property
-js.inspection.group.name:
-  text: JavaScript
-js.unresolved.variable.inspection.name:
-  text: Unresolved JavaScript variable
-js.undeclared.variable.inspection.name:
-  text: Implicitly declared JavaScript variable
-js.duplicated.declaration.inspection.name:
-  text: Duplicated JavaScript declaration
-js.unused.local.symbol.inspection.name:
-  text: Unused JavaScript local symbol
-js.unresolved.function.inspection.name:
-  text: Unresolved JavaScript function
-js.deprecated.symbols.inspection.name:
-  text: Deprecated JavaScript symbol
-javascript.parser.message.expected.typename:
-  text: '* or type name expected'
-javascript.parser.message.expected.name.or.lbrace:
-  text: "Expected package name or '{'"
-javascript.parser.message.expected.function.var.class.interface.namespace:
-  text: Expected function, variable, class, interface or namespace declaration
-interface.function.declaration.should.have.no.body:
-  text: Interface functions declaration should have no body
-javascript.parser.message.expected.namespace:
-  text: Namespace keyword expected
-javascript.parser.message.expected.string.literal:
-  text: String literal expected
-javascript.parser.message.expected.xml:
-  text: xml context keyword expected
-javascript.parser.message.expected.equal:
-  text: expected =
-javascript.parser.message.expected.lbrace.or.lbracket:
-  text: "'{' or '[' expected"
-javascript.parser.message.expected.eof:
-  text: End of file expected
-javascript.deprecated.symbol.used.name.message:
-  text: 'Deprecated symbol used, consult docs for better alternative #loc'
-js.classname.macro.description:
-  text: jsClassName()
-js.methodname.macro.description:
-  text: jsMethodName()
-js.unused.parameter:
-  text: Unused parameter
-js.unused.function.declaration:
-  text: Unused function declaration
-js.unused.local.variable:
-  text: Unused local variable declaration
-js.unused.symbol.remove:
-  text: Remove unused symbol
-javascript.parser.message.expected.identifier:
-  text: Expected identifier
-javascript.parser.message.expected.instanceof:
-  text: Expected instanceof
-javascript.parser.message.expected.value:
-  text: value expected
-javascript.parser.message.expected.identifer.or.value:
-  text: Identifier or value expected
-js.show.overriding.markers.inspection.name:
-  text: Shows function overriding markers in JavaScript
-js.untyped.declaration.inspection.name:
-  text: Declaration with no type
-js.untyped.variable.problem:
-  text: Variable {0} has no type
-js.untyped.function.problem:
-  text: Function {0} has no return type
-js.untyped.declaration.problem.addtype.fix:
-  text: Add Type to Declaration
-invalid.identifier.value:
-  text: invalid identifier value
-javascript.validation.message.this.referenced.from.static.context:
-  text: '''this'' referenced in static context'
-javascript.validation.message.super.referenced.without.class.instance.context:
-  text: '''super'' referenced without class instance context'
-javascript.validation.message.super.referenced.from.static.context:
-  text: '''super'' referenced in static context'
-javascript.validation.message.function.override.without.override.modifier:
-  text: Method overrides method in superclass {0} without override keyword
-javascript.language.term.attribute.value:
-  text: Attribute value
-javascript.validation.message.class.should.be.in.file:
-  text: Class ''{0}'' should be defined in file ''{1}''
-javascript.validation.message.function.should.be.in.file:
-  text: Function ''{0}'' should be defined in file ''{1}''
-javascript.validation.message.namespace.should.be.in.file:
-  text: Namespace ''{0}'' should be defined in file ''{1}''
-javascript.validation.message.variable.should.be.in.file:
-  text: Variable ''{0}'' should be defined in file ''{1}''
-javascript.validation.message.incorrect.package.name:
-  text: Package name ''{0}'' does not correspond to file path ''{1}''
-javascript.fix.package.name:
-  text: Set package name to ''{0}''
-javascript.fix.add.override.modifier:
-  text: Add override modifier
-js.code.style.tab.name:
-  text: JavaScript / ECMAScript / ActionScript
-to.indent.package.statement.children:
-  text: '&Indent package statement children'
-javascript.formatting.options.panel.title:
-  text: Formatting options
-preview.panel.title:
-  text: Preview
-javascript.validation.message.interface.members.cannot.have.access.modifiers:
-  text: Interface members cannot have access modifiers
-javascript.template.context.type:
-  text: Java Sc&ript
-flex.import.class:
-  text: Import Class {0}
-flex.import.function:
-  text: Import Function {0}
-interface.should.have.no.variable.declarations:
-  text: Interface should have no variable declarations
-javascript.validation.message.implements.for.interface.not.allowed:
-  text: Implements list is not allowed for interface
-javascript.validation.message.interface.name.expected.here:
-  text: Interface name expected here
-javascript.validation.message.class.name.expected.here:
-  text: Class name expected here
+    text: Unresolved variable or type {0}
+javascript.valid.string.escape:
+    text: Valid string escape
+javascript.validation.message.access.modifier.allowed.only.for.class.members:
+    text: Access modifier allowed for class members only
+javascript.validation.message.access.modifier.allowed.only.for.package.members:
+    text: Only public / internal modifiers allowed for package members
+javascript.validation.message.arguments.out.of.function:
+    text: Using function arguments object outside function
+javascript.validation.message.arguments.with.rest.parameter:
+    text: '''arguments'' object is not available when using rest parameter'
+javascript.validation.message.assignment.to.const:
+    text: Attempt to assign to const variable
+javascript.validation.message.break.without.target:
+    text: Cannot determine target for 'break'
 javascript.validation.message.circular.dependency:
-  text: Circular dependency
-javascript.fix.remove.circular.dependency:
-  text: Remove circular dependency
-javascript.validation.message.more.than.one.externally.visible.symbol:
-  text: More than one externally visible symbol defined in file
-javascript.validation.message.interface.method.not.implemented:
-  text: Method {0} from interface {1} is not implemented
-javascript.fix.remove.externally.visible.symbol:
-  text: Remove externally visible symbol
-javascript.fix.implement.methods:
-  text: Implement Methods
-javascript.parameter:
-  text: Parameter
-javascript.local.variable:
-  text: Local variable
-javascript.global.variable:
-  text: Global variable
-javascript.global.function:
-  text: Global function
-javascript.static.member.function:
-  text: Static member function
-javascript.static.member.variable:
-  text: Static member variable
-javascript.instance.member.variable:
-  text: Instance member variable
-javascript.instance.member.function:
-  text: Instance member function
-javascript.create.class.intention.name:
-  text: Create Class {0}
-javascript.create.interface.intention.name:
-  text: Create Interface {0}
-create.class.dialog.title:
-  text: Create Class
-create.interface.dialog.title:
-  text: Create Interface
-choose.class.title:
-  text: Choose Class
-javascript.fix.remove.override.modifier:
-  text: Remove override modifier
+    text: Circular dependency
+javascript.validation.message.class.name.expected.here:
+    text: Class name expected here
+javascript.validation.message.class.should.be.in.file:
+    text: Class ''{0}'' should be defined in file ''{1}''
+javascript.validation.message.const.variable.without.initializer.:
+    text: const variable without initializer. It won't be possible to assign meaningful value later.
+javascript.validation.message.constructor.in.mxml.is.not.allowed:
+    text: Constructor is not allowed for MXML class
+javascript.validation.message.continue.without.target:
+    text: Cannot determine target for 'continue'
+javascript.validation.message.duplicate.declaration:
+    text: Duplicate declaration
+javascript.validation.message.duplicate.label:
+    text: Duplicate label
+javascript.validation.message.duplicated.catch.block:
+    text: 'Duplicated catch block #loc'
+javascript.validation.message.duplicated.catch.block.fix:
+    text: Remove duplicated catch block
+javascript.validation.message.file.should.be.under.source.root:
+    text: Object is located in file out of source root, certain functionality will not be available
 javascript.validation.message.function.override.for.object.method:
-  text: Method inherited from Object does not need override
-javascript.validation.message.function.override.without.parent.method:
-  text: Method does not override method from super class
-javascript.parser.message.expected.lt:
-  text: Expected >
-generate.constructor.fields.chooser.title:
-  text: Choose Fields to Initialize by Constructor
-generate.getter.setter.chooser.title:
-  text: Select Fields to Generate Getters and Setters
-generate.to.string.chooser.title:
-  text: Select Fields to Use in toString function
-generate.getter.fields.chooser.title:
-  text: Select Fields to Generate Getters
-generate.setter.fields.chooser.title:
-  text: Select Fields to Generate Setters
-methods.to.implement.chooser.title:
-  text: Select Methods to Implement
-methods.to.override.chooser.title:
-  text: Select Methods to Override
-use.semicolon.to.terminate.statement:
-  text: Use &semicolon to terminate statements
-javascript.validation.unused.import:
-  text: Unused import
-javascript.fix.optimize.imports:
-  text: Optimize imports
-javascript.parser.message.expected.doc.tag.value:
-  text: Expected doc tag value
-javascript.validation.message.incorrect.tag.value:
-  text: Incorrect Tag Value
-javascript.validation.message.incorrect.parameter.name:
-  text: Incorrect parameter name
-javascript.parser.message.expected.doc.tag.name:
-  text: Expected doc tag name
-javascript.invalid.number.of.parameters:
-  text: Invalid number of parameters, expected {0}
-javascript.argument.type.mismatch:
-  text: Argument type {1} is not assignable to parameter type {0}
-javascript.initializer.type.mismatch:
-  text: Initializer type {1} is not assignable to variable type {0}
-javascript.binary.operand.type.mismatch:
-  text: Binary operation argument type {1} is not assignable to type {0}
-javascript.incorrect.variable.type.mismatch:
-  text: Variable type {1} is not assignable to type {0}
-javascript.term.does.not.evaluate.to.function:
-  text: Method expression is not of Function type
-javascript.term.does.not.evaluate.to.function2:
-  text: Property can not be invoked as function
-javascript.term.does.not.evaluate.to.function2.fix:
-  text: Remove argument list
-javascript.assigned.expression.type.mismatch:
-  text: Assigned expression type {1} is not assignable to type {0}
-javascript.returned.expression.type.mismatch:
-  text: Returned expression type {1} is not assignable to type {0}
-javascript.insert.cast.fix:
-  text: Insert cast
-javascript.introduce.constant.error.not.available.in.javascript.code:
-  text: Introduce Constant is not available in JavaScript code
-javascript.introduce.field.error.not.available.in.javascript.code:
-  text: Introduce Field is not available in JavaScript code
-javascript.extract.method.title:
-  text: Extract Function
+    text: Method inherited from Object does not need override
 javascript.validation.message.function.override.incompatible.access.modifier:
-  text: Incompatible override, should have ''{0}'' access modifier
+    text: Incompatible override, should have ''{0}'' access modifier
 javascript.validation.message.function.override.incompatible.signature:
-  text: Incompatible override, should have signature ''{0}''
+    text: Incompatible override, should have signature ''{0}''
 javascript.validation.message.function.override.incompatible.signature2:
-  text: Incompatible override, should have return type ''{0}''
+    text: Incompatible override, should have return type ''{0}''
+javascript.validation.message.function.override.without.override.modifier:
+    text: Method overrides method in superclass {0} without override keyword
+javascript.validation.message.function.override.without.parent.method:
+    text: Method does not override method from super class
+javascript.validation.message.function.should.be.in.file:
+    text: Function ''{0}'' should be defined in file ''{1}''
+javascript.validation.message.get.method.should.be.valid.type:
+    text: Return type of a getter definition should not be {0}
+javascript.validation.message.get.method.should.have.no.parameter:
+    text: A getter definition must have no parameters
+javascript.validation.message.implements.for.interface.not.allowed:
+    text: Implements list is not allowed for interface
+javascript.validation.message.incorrect.package.name:
+    text: Package name ''{0}'' does not correspond to file path ''{1}''
+javascript.validation.message.incorrect.parameter.name:
+    text: Incorrect parameter name
+javascript.validation.message.incorrect.tag.value:
+    text: Incorrect Tag Value
+javascript.validation.message.interface.members.cannot.have.access.modifiers:
+    text: Interface members cannot have access modifiers
 javascript.validation.message.interface.method.invalid.access.modifier:
-  text: Incompatible implementation, should have 'public' access modifier
+    text: Incompatible implementation, should have 'public' access modifier
 javascript.validation.message.interface.method.invalid.signature:
-  text: Incompatible implementation, should have signature ''{0}''
+    text: Incompatible implementation, should have signature ''{0}''
 javascript.validation.message.interface.method.invalid.signature2:
-  text: Incompatible implementation, should have return type ''{0}''
-javascript.validation.message.duplicated.catch.block:
-  text: 'Duplicated catch block #loc'
-javascript.validation.message.duplicated.catch.block.fix:
-  text: Remove duplicated catch block
-javascript.validation.message.return.value.of.type.is.required:
-  text: Return value of type {0} is required
-javascript.validation.message.constructor.in.mxml.is.not.allowed:
-  text: Constructor is not allowed for MXML class
-javascript.fix.remove.constructor:
-  text: Remove constructor
-javascript.validation.message.package.shouldbe.first.statement:
-  text: Package should be first statement in file
-javascript.metadata:
-  text: Metadata
-javascript.validation.message.file.should.be.under.source.root:
-  text: Object is located in file out of source root, certain functionality will not be available
-javascript.validation.message.unneeded.comma:
-  text: Unneeded comma
-javascript.validation.message.remove.unneeded.comma.fix:
-  text: Remove unneeded comma
-javascript.create.event.handler.intention.name:
-  text: Create Event Handler {0}
+    text: Incompatible implementation, should have return type ''{0}''
+javascript.validation.message.interface.method.not.implemented:
+    text: Method {0} from interface {1} is not implemented
+javascript.validation.message.interface.name.expected.here:
+    text: Interface name expected here
 javascript.validation.message.missed.super.constructor.call:
-  text: Missed superclass's constructor invokation
-javascript.fix.create.constructor.invoke.super:
-  text: Create constructor matching super
-javascript.fix.create.invoke.super:
-  text: Insert super class constructor invokation
-javascript.interface.can.not.be.instantiated.message:
-  text: Interface can not be instantiated
-javascript.validation.message.set.method.should.be.void.or.without.type:
-  text: Return type of a setter definition must be unspecified or void
-javascript.validation.message.set.method.should.have.one.parameter:
-  text: A setter definition must have exactly one parameter
-javascript.validation.message.get.method.should.have.no.parameter:
-  text: A getter definition must have no parameters
-javascript.validation.message.get.method.should.be.valid.type:
-  text: Return type of a getter definition should not be {0}
-javascript.validation.message.access.modifier.allowed.only.for.class.members:
-  text: Access modifier allowed for class members only
+    text: Missed superclass's constructor invokation
+javascript.validation.message.more.than.one.externally.visible.symbol:
+    text: More than one externally visible symbol defined in file
+javascript.validation.message.must.be.lvalue:
+    text: Must be lvalue
 javascript.validation.message.namespace.allowed.only.for.class.members:
-  text: Namespace allowed for class members only
-javascript.validation.message.access.modifier.allowed.only.for.package.members:
-  text: Only public / internal modifiers allowed for package members
-javascript.validation.message.use.namespace.reference.or.access.modifier:
-  text: Use namespace OR access modifier
-javascript.fix.remove.access.modifier:
-  text: Remove access modifier
-javascript.fix.remove.namespace.reference:
-  text: Remove namespace reference
-javascript.incorrect.array.type.in.forin:
-  text: Array key type should be String
-javascript.validation.message.unexpected.type.for.rest.parameter:
-  text: Rest parameter should have no type
-javascript.fix.remove.type.reference:
-  text: Remove type reference
+    text: Namespace allowed for class members only
+javascript.validation.message.namespace.should.be.in.file:
+    text: Namespace ''{0}'' should be defined in file ''{1}''
+javascript.validation.message.nested.classes.are.not.allowed:
+    text: Nested classes are not allowed
+javascript.validation.message.package.shouldbe.first.statement:
+    text: Package should be first statement in file
 javascript.validation.message.parameter.is.not.allowed.after.rest.parameter:
-  text: No parameter is allowed after rest parameter
-javascript.fix.remove.parameter:
-  text: Remove parameter
-javascript.fix.remove.initializer:
-  text: Remove initializer
+    text: No parameter is allowed after rest parameter
 javascript.validation.message.parameter.should.be.initialized:
-  text: Parameter should be initialized
+    text: Parameter should be initialized
+javascript.validation.message.remove.unneeded.comma.fix:
+    text: Remove unneeded comma
 javascript.validation.message.rest.parameter.should.not.be.initialized:
-  text: Rest parameter should not be initialized
-javascript.validation.message.nested.classes.are.not.allowed:
-  text: Nested classes are not allowed
-generate.getter.fields.bindable.properties:
-  text: '&Bindable properties'
-javascript.language.term.package:
-  text: package
-javascript.validation.message.arguments.with.rest.parameter:
-  text: '''arguments'' object is not available when using rest parameter'
-action.JavaScript.File.text:
-  text: JavaScript File
+    text: Rest parameter should not be initialized
+javascript.validation.message.return.outside.function.definition:
+    text: '''return'' outside function definition'
+javascript.validation.message.return.value.of.type.is.required:
+    text: Return value of type {0} is required
+javascript.validation.message.set.method.should.be.void.or.without.type:
+    text: Return type of a setter definition must be unspecified or void
+javascript.validation.message.set.method.should.have.one.parameter:
+    text: A setter definition must have exactly one parameter
+javascript.validation.message.super.referenced.from.static.context:
+    text: '''super'' referenced in static context'
+javascript.validation.message.super.referenced.without.class.instance.context:
+    text: '''super'' referenced without class instance context'
+javascript.validation.message.this.referenced.from.static.context:
+    text: '''this'' referenced in static context'
+javascript.validation.message.unexpected.type.for.rest.parameter:
+    text: Rest parameter should have no type
+javascript.validation.message.unneeded.comma:
+    text: Unneeded comma
+javascript.validation.message.use.namespace.reference.or.access.modifier:
+    text: Use namespace OR access modifier
+javascript.validation.message.variable.should.be.in.file:
+    text: Variable ''{0}'' should be defined in file ''{1}''
+javascript.validation.unused.import:
+    text: Unused import
+js.classname.macro.description:
+    text: jsClassName()
+js.code.style.tab.name:
+    text: JavaScript / ECMAScript / ActionScript
+js.deprecated.symbols.inspection.name:
+    text: Deprecated JavaScript symbol
+js.duplicated.declaration.inspection.name:
+    text: Duplicated JavaScript declaration
+js.inspection.group.name:
+    text: JavaScript
+js.methodname.macro.description:
+    text: jsMethodName()
+js.show.overriding.markers.inspection.name:
+    text: Shows function overriding markers in JavaScript
+js.undeclared.variable.inspection.name:
+    text: Implicitly declared JavaScript variable
+js.unresolved.function.inspection.name:
+    text: Unresolved JavaScript function
+js.unresolved.variable.inspection.name:
+    text: Unresolved JavaScript variable
+js.untyped.declaration.inspection.name:
+    text: Declaration with no type
+js.untyped.declaration.problem.addtype.fix:
+    text: Add Type to Declaration
+js.untyped.function.problem:
+    text: Function {0} has no return type
+js.untyped.variable.problem:
+    text: Variable {0} has no type
+js.unused.function.declaration:
+    text: Unused function declaration
+js.unused.local.symbol.inspection.name:
+    text: Unused JavaScript local symbol
+js.unused.local.variable:
+    text: Unused local variable declaration
+js.unused.parameter:
+    text: Unused parameter
+js.unused.symbol.remove:
+    text: Remove unused symbol
+loading.index.message:
+    text: Loading JavaScript indices
+methods.to.implement.chooser.title:
+    text: Select Methods to Implement
+methods.to.override.chooser.title:
+    text: Select Methods to Override
+preview.panel.title:
+    text: Preview
 this.feature.is.not.supported.by.current.language:
-  text: '''''{0}'''' is not supported by current language version'
+    text: '''''{0}'''' is not supported by current language version'
+to.indent.package.statement.children:
+    text: '&Indent package statement children'
+typescript.filetype.description:
+    text: TypeScript files
+use.semicolon.to.terminate.statement:
+    text: Use &semicolon to terminate statements
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
index 6eceb33f..296abfcf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
@@ -19,12 +19,12 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.colorScheme.TextAttributesKey;
 import consulo.colorScheme.setting.AttributesDescriptor;
-import consulo.colorScheme.setting.ColorDescriptor;
 import consulo.javascript.ide.hightlight.JavaScriptSyntaxHighlightKeys;
 import consulo.javascript.lang.JavaScript15LanguageVersion;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.colorScheme.setting.ColorSettingsPage;
 import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 import java.util.HashMap;
@@ -100,8 +100,8 @@ public class JavaScriptColorsAndFontsPage implements ColorSettingsPage {
 
     @Override
     @Nonnull
-    public String getDisplayName() {
-        return "JavaScript";
+    public LocalizeValue getDisplayName() {
+        return JavaScriptLocalize.javascriptName();
     }
 
     @Override
@@ -110,12 +110,6 @@ public AttributesDescriptor[] getAttributeDescriptors() {
         return ATTRS;
     }
 
-    @Override
-    @Nonnull
-    public ColorDescriptor[] getColorDescriptors() {
-        return ColorDescriptor.EMPTY_ARRAY;
-    }
-
     @Override
     @Nonnull
     public SyntaxHighlighter getHighlighter() {
diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
index 63d90bed..64d75048 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
@@ -1,5 +1,6 @@
 package consulo.javascript.impl.formatter;
 
+import consulo.javascript.localize.JavaScriptLocalize;
 import jakarta.annotation.Nonnull;
 
 import consulo.language.codeStyle.ui.setting.CodeStyleAbstractConfigurable;
@@ -12,7 +13,7 @@
  */
 public class JavaScriptCodeStyleConfigurable extends CodeStyleAbstractConfigurable {
     public JavaScriptCodeStyleConfigurable(@Nonnull CodeStyleSettings settings, CodeStyleSettings cloneSettings) {
-        super(settings, cloneSettings, "JavaScript");
+        super(settings, cloneSettings, JavaScriptLocalize.javascriptName());
     }
 
     @Override

From 0cdd7bbc892385f3d5573c847eeef1735edd6899 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 26 Aug 2025 18:30:03 +0400
Subject: [PATCH 289/340] migrate to localize

---
 .../en_US/consulo.javascript.JavaScriptLocalize.yaml   |  4 ++++
 .../impl/ide/actions/JavaScriptCreateFileAction.java   | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml b/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
index a55d46c1..5dc70d92 100644
--- a/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
+++ b/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
@@ -1,5 +1,9 @@
+action.JavaScript.File.empty.file.kind:
+    text: Empty File
 action.JavaScript.File.text:
     text: JavaScript File
+action.JavaScript.File.title.text:
+    text: Create JavaScript File
 building.index.message:
     text: Building JavaScript indices
 choose.class.title:
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
index 94aba41c..c2697f75 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
@@ -17,6 +17,7 @@
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.virtualFileSystem.fileType.FileType;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 /**
@@ -72,13 +73,14 @@ private static Module findModule(DataContext dataContext) {
 
     @Override
     protected void buildDialog(Project project, PsiDirectory directory, CreateFileFromTemplateDialog.Builder builder) {
-        builder.setTitle("Create JavaScript File");
+        builder.setTitle(JavaScriptLocalize.actionJavascriptFileTitleText());
 
-        builder.addKind("Empty File", JavaScriptFileType.INSTANCE.getIcon(), "JavaScriptFile");
+        builder.addKind(JavaScriptLocalize.actionJavascriptFileEmptyFileKind(), JavaScriptFileType.INSTANCE.getIcon(), "JavaScriptFile");
     }
 
+    @Nonnull
     @Override
-    protected String getActionName(PsiDirectory directory, String newName, String templateName) {
-        return "Create JavaScript File";
+    protected LocalizeValue getActionName(PsiDirectory directory, String newName, String templateName) {
+        return JavaScriptLocalize.actionJavascriptFileTitleText();
     }
 }

From 8b140872ace7d77effd64507e3198e8c9033535d Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 10 Sep 2025 21:29:43 +0400
Subject: [PATCH 290/340] add read action for correct reading

---
 .../impl/ide/actions/JavaScriptCreateFileAction.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
index c2697f75..9747e4cc 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
@@ -1,21 +1,20 @@
 package consulo.javascript.impl.ide.actions;
 
-import consulo.javascript.language.JavaScriptFileType;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.application.ReadAction;
 import consulo.dataContext.DataContext;
 import consulo.ide.IdeView;
 import consulo.ide.action.CreateFileFromTemplateAction;
 import consulo.ide.action.CreateFileFromTemplateDialog;
+import consulo.javascript.language.JavaScriptFileType;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
-import consulo.language.editor.CommonDataKeys;
 import consulo.language.psi.PsiDirectory;
 import consulo.language.util.ModuleUtilCore;
 import consulo.localize.LocalizeValue;
 import consulo.module.Module;
 import consulo.module.content.NewFileModuleResolver;
 import consulo.project.Project;
-import consulo.ui.annotation.RequiredUIAccess;
 import consulo.virtualFileSystem.fileType.FileType;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -34,12 +33,11 @@ public JavaScriptCreateFileAction() {
     }
 
     @Override
-    @RequiredUIAccess
     protected boolean isAvailable(DataContext dataContext) {
         if (!super.isAvailable(dataContext)) {
             return false;
         }
-        Module module = findModule(dataContext);
+        Module module = ReadAction.compute(() -> findModule(dataContext));
         return module != null && ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class) != null;
     }
 
@@ -51,7 +49,7 @@ protected FileType getFileTypeForModuleResolve() {
 
     @RequiredReadAction
     private static Module findModule(DataContext dataContext) {
-        Project project = dataContext.getData(CommonDataKeys.PROJECT);
+        Project project = dataContext.getData(Project.KEY);
         assert project != null;
         final IdeView view = dataContext.getData(IdeView.KEY);
         if (view == null) {

From 3c675a450a9d396b7aea61786e339d2b28d64e8a Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 9 Oct 2025 22:59:44 +0300
Subject: [PATCH 291/340] Localizing inspections and their fixes (part 1).

---
 .../bugs/DivideByZeroJSInspection.java        |  21 +-
 ...ityComparisonWithCoercionJSInspection.java |  25 +-
 .../bugs/InfiniteLoopJSInspection.java        |  15 +-
 .../bugs/InfiniteRecursionJSInspection.java   |  20 +-
 ...tCircuitBooleanExpressionJSInspection.java |  23 +-
 .../ObjectAllocationIgnoredJSInspection.java  |  21 +-
 ...extLabelInSwitchStatementJSInspection.java |  17 +-
 .../AnonymousFunctionJSInspection.java        |  17 +-
 .../confusing/BlockStatementJSInspection.java |  17 +-
 .../confusing/CallerJSInspection.java         |  17 +-
 .../CommaExpressionJSInspection.java          |  17 +-
 .../ConditionalExpressionJSInspection.java    |  17 +-
 ...usingFloatingPointLiteralJSInspection.java |  25 +-
 .../ConfusingPlusesOrMinusesJSInspection.java |  17 +-
 .../DynamicallyGeneratedCodeJSInspection.java |  17 +-
 .../EmptyStatementBodyJSInspection.java       |  19 +-
 ...rementDecrementResultUsedJSInspection.java |  17 +-
 ...atedConditionalExpressionJSInspection.java |  23 +-
 .../NegatedIfStatementJSInspection.java       |  23 +-
 ...stedConditionalExpressionJSInspection.java |  17 +-
 .../confusing/NestedFunctionJSInspection.java |  17 +-
 .../confusing/OctalIntegerJSInspection.java   |  17 +-
 ...yComplexBooleanExpressionJSInspection.java | 248 ++++++++----------
 ...tlessArithmeticExpressionJSInspection.java |  15 +-
 ...ointlessBooleanExpressionJSInspection.java |  21 +-
 .../confusing/VoidExpressionJSInspection.java |  17 +-
 .../confusing/WithStatementJSInspection.java  |  17 +-
 .../control/BreakStatementJSInspection.java   |  17 +-
 .../BreakStatementWithLabelJSInspection.java  |  18 +-
 ...sionWithIdenticalBranchesJSInspection.java |  19 +-
 ...tantConditionalExpressionJSInspection.java |  19 +-
 .../ConstantIfStatementJSInspection.java      |  26 +-
 .../ContinueStatementJSInspection.java        |  18 +-
 ...ontinueStatementWithLabelJSInspection.java |  17 +-
 ...efaultNotLastCaseInSwitchJSInspection.java |  22 +-
 .../DuplicateConditionJSInspection.java       |  15 +-
 ...lthroughInSwitchStatementJSInspection.java |  20 +-
 ...ForLoopReplaceableByWhileJSInspection.java | 201 +++++++-------
 ...ThatDoesntUseLoopVariableJSInspection.java |  17 +-
 ...mentWithIdenticalBranchesJSInspection.java |  21 +-
 ...tementWithTooManyBranchesJSInspection.java | 127 ++++-----
 .../control/LabeledStatementJSInspection.java |  20 +-
 ...opStatementThatDoesntLoopJSInspection.java |  13 +-
 .../NestedSwitchStatementJSInspection.java    |  17 +-
 ...tementWithNoDefaultBranchJSInspection.java |  17 +-
 .../control/TailRecursionJSInspection.java    |  41 +--
 .../TrivialConditionalJSInspection.java       |  23 +-
 .../control/TrivialIfJSInspection.java        | 102 +++----
 .../UnnecessaryContinueJSInspection.java      |  24 +-
 .../control/UnnecessaryLabelJSInspection.java |  26 +-
 50 files changed, 781 insertions(+), 796 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index 5c52f92f..c35c780b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -11,32 +11,35 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class DivideByZeroJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "DivideByZeroJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.divideByZeroDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.divideByZeroDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.divisionByZeroErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index 6a266764..a26f831d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -14,33 +14,36 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class EqualityComparisonWithCoercionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "EqualityComparisonWithCoercionJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.equalityComparisonWithCoercionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.equalityComparisonWithCoercionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.equalityComparisonWithCoercionErrorString().get();
     }
@@ -67,8 +70,8 @@ public EqualityComparisonWithCoercionFix(String sign) {
 
         @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.equalityComparisonWithCoercionFix(sign).get();
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.equalityComparisonWithCoercionFix(sign);
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
index f93eba5b..20da4d90 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
@@ -10,20 +10,21 @@
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class InfiniteLoopJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.infiniteLoopStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.infiniteLoopStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BUGS_GROUP_NAME;
     }
 
     @Override
@@ -31,8 +32,8 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.infiniteLoopErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
index fb15c7e0..0cd3d4a2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
@@ -7,28 +7,26 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.logging.Logger;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class InfiniteRecursionJSInspection extends JavaScriptInspection {
-    private static Logger logger = Logger.getInstance("ULVJS");
-
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.infiniteRecursionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.infiniteRecursionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.infiniteRecursionProblemDescriptor().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index 4767dbe9..38da0c59 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -14,27 +14,28 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NonShortCircuitBooleanExpressionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.nonShortCircuitBooleanExpressionDisplayName().get();
+    @Override
+        public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.nonShortCircuitBooleanExpressionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.nonShortCircuitBooleanExpressionErrorString().get();
     }
@@ -45,10 +46,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class NonShortCircuitBooleanFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.replaceWithShortCircuitExpressionFixString().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.replaceWithShortCircuitExpressionFixString();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
index eb1ecf94..de05cd2b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
@@ -9,31 +9,34 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ObjectAllocationIgnoredJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ObjectAllocationIgnored";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.resultOfObjectAllocationIgnoredDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.resultOfObjectAllocationIgnoredDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.resultOfObjectAllocationIgnoredErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index 79a5777a..00e0b70a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -11,25 +11,26 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class TextLabelInSwitchStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.textLabelInSwitchStatementDisplayName().get();
+    @Override
+        public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.textLabelInSwitchStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.textLabelInSwitchStatementErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index 99c35a13..9f3afa5e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -10,26 +10,27 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class AnonymousFunctionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.anonymousFunctionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.anonymousFunctionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.anonymousFunctionErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index 3d7d3981..a0975734 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -8,26 +8,27 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class BlockStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.unnecessaryBlockStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.unnecessaryBlockStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.unnecessaryBlockStatementErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
index 329d273f..117f2a67 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
@@ -7,26 +7,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class CallerJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.callerDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.callerDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.callerErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
index 476c4e0a..ace1a064 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
@@ -8,26 +8,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class CommaExpressionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.commaExpressionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.commaExpressionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.commaExpressionErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index 9382e806..ddda634f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -7,6 +7,7 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -17,21 +18,21 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.conditionalExpressionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.conditionalExpressionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.conditionalExpressionErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index ebf96143..cd041198 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -13,33 +13,32 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 @ExtensionImpl
 public class ConfusingFloatingPointLiteralJSInspection extends JavaScriptInspection {
-    @NonNls
     private static final Pattern PICKY_FLOATING_POINT_PATTERN = Pattern.compile("[0-9]+\\.[0-9]+((e|E)(-)?[0-9]+)?(f|F|d|D)?");
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.confusingFloatingPointLiteralDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.confusingFloatingPointLiteralDisplayName();
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.confusingFloatingPointLiteralProblemDescriptor().get();
     }
@@ -50,10 +49,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class ConfusingFloatingPointLiteralFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.confusingFloatingPointLiteralChangeQuickfix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.confusingFloatingPointLiteralChangeQuickfix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index 100ea9b8..459f9bab 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -12,26 +12,27 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ConfusingPlusesOrMinusesJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.confusingPlusesOrMinusesDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.confusingPlusesOrMinusesDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.confusingPlusesOrMinusesErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 69dc1d8b..974bd4da 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -10,27 +10,28 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class DynamicallyGeneratedCodeJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.dynamicallyGeneratedCodeDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.dynamicallyGeneratedCodeDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.dynamicallyGeneratedCodeErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index f09b3b0b..e6fbea49 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -8,26 +8,29 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class EmptyStatementBodyJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "StatementWithEmptyBodyJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.statementWithEmptyBodyDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.statementWithEmptyBodyDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @Override
@@ -35,8 +38,8 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return args[0] instanceof JSIfStatement
             ? InspectionJSLocalize.statementHasEmptyBranchErrorString().get()
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index b8b9715b..5d24522b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -10,26 +10,27 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class IncrementDecrementResultUsedJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.resultOfIncrementOrDecrementUsedDisplayName().get();
+    @Override
+        public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.resultOfIncrementOrDecrementUsedDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.resultOfIncrementOrDecrementExpressionUsedErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index ce88c93a..d70557dc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -17,6 +17,7 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -25,21 +26,21 @@
 public class NegatedConditionalExpressionJSInspection extends JavaScriptInspection {
     private final NegatedConditionalFix fix = new NegatedConditionalFix();
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.negatedConditionalExpressionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.negatedConditionalExpressionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.negatedConditionalExpressionErrorString().get();
     }
@@ -50,10 +51,10 @@ protected InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class NegatedConditionalFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.invertConditionFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.invertConditionFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index 2e960e83..f5038b21 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -19,6 +19,7 @@
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -28,21 +29,21 @@
 public class NegatedIfStatementJSInspection extends JavaScriptInspection {
     private final NegatedIfElseFix fix = new NegatedIfElseFix();
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.negatedIfStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.negatedIfStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.negatedRefStatementErrorString().get();
     }
@@ -58,10 +59,10 @@ protected InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class NegatedIfElseFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.invertIfConditionFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.invertIfConditionFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
index 01093511..50e26bf0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
@@ -8,26 +8,27 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NestedConditionalExpressionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.nestedConditionalExpressionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.nestedConditionalExpressionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.nestedConditionalExpressionErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index 8e0dbdf5..9bdc1c5b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -11,26 +11,27 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NestedFunctionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.nestedFunctionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.nestedFunctionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         if (functionHasIdentifier(function)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index dd3465e5..0c029c65 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -7,27 +7,28 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class OctalIntegerJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.octalIntegerDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.octalIntegerDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.octalIntegerErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
index 9960e2ce..152788fc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
@@ -14,157 +14,131 @@
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class OverlyComplexBooleanExpressionJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.overlyComplexBooleanExpressionDisplayName().get();
-	}
+public class OverlyComplexBooleanExpressionJSInspection extends JavaScriptInspection {
+    @Nonnull
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.overlyComplexBooleanExpressionDisplayName();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.CONFUSING_GROUP_NAME.get();
-	}
+    @Nonnull
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new OverlyComplexBooleanExpressionJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new OverlyComplexBooleanExpressionJSInspectionState();
+    }
 
-	@Override
-	protected boolean buildQuickFixesOnlyForOnTheFlyErrors()
-	{
-		return true;
-	}
+    @Override
+    protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
+        return true;
+    }
 
-	@RequiredReadAction
-	@Override
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.overlyComplexBooleanExpressionErrorString().get();
-	}
+    @RequiredReadAction
+    @Override
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.overlyComplexBooleanExpressionErrorString().get();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private class Visitor extends BaseInspectionVisitor<OverlyComplexBooleanExpressionJSInspectionState>
-	{
+    private class Visitor extends BaseInspectionVisitor<OverlyComplexBooleanExpressionJSInspectionState> {
 
-		@Override
-		public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression)
-		{
-			super.visitJSBinaryExpression(expression);
-			checkExpression(expression);
-		}
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+            super.visitJSBinaryExpression(expression);
+            checkExpression(expression);
+        }
 
-		@Override
-		public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression)
-		{
-			super.visitJSPrefixExpression(expression);
-			checkExpression(expression);
-		}
+        @Override
+        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+            super.visitJSPrefixExpression(expression);
+            checkExpression(expression);
+        }
 
-		@Override
-		public void visitJSParenthesizedExpression(JSParenthesizedExpression expression)
-		{
-			super.visitJSParenthesizedExpression(expression);
-			checkExpression(expression);
-		}
+        @Override
+        public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
+            super.visitJSParenthesizedExpression(expression);
+            checkExpression(expression);
+        }
 
-		private void checkExpression(JSExpression expression)
-		{
-			if(!isBoolean(expression))
-			{
-				return;
-			}
-			if(isParentBoolean(expression))
-			{
-				return;
-			}
-			final int numTerms = countTerms(expression);
-			if(numTerms <= myState.m_limit)
-			{
-				return;
-			}
-			registerError(expression);
-		}
+        private void checkExpression(JSExpression expression) {
+            if (!isBoolean(expression)) {
+                return;
+            }
+            if (isParentBoolean(expression)) {
+                return;
+            }
+            final int numTerms = countTerms(expression);
+            if (numTerms <= myState.m_limit) {
+                return;
+            }
+            registerError(expression);
+        }
 
-		private int countTerms(JSExpression expression)
-		{
-			if(expression == null)
-			{
-				return 0;
-			}
-			if(!isBoolean(expression))
-			{
-				return 1;
-			}
-			if(expression instanceof JSBinaryExpression)
-			{
-				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-				final JSExpression lhs = binaryExpression.getLOperand();
-				final JSExpression rhs = binaryExpression.getROperand();
-				return countTerms(lhs) + countTerms(rhs);
-			}
-			else if(expression instanceof JSPrefixExpression)
-			{
-				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-				final JSExpression operand = prefixExpression.getExpression();
-				return countTerms(operand);
-			}
-			else if(expression instanceof JSParenthesizedExpression)
-			{
-				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-				final JSExpression contents = parenthesizedExpression.getInnerExpression();
-				return countTerms(contents);
-			}
-			return 1;
-		}
+        private int countTerms(JSExpression expression) {
+            if (expression == null) {
+                return 0;
+            }
+            if (!isBoolean(expression)) {
+                return 1;
+            }
+            if (expression instanceof JSBinaryExpression) {
+                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+                final JSExpression lhs = binaryExpression.getLOperand();
+                final JSExpression rhs = binaryExpression.getROperand();
+                return countTerms(lhs) + countTerms(rhs);
+            }
+            else if (expression instanceof JSPrefixExpression) {
+                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+                final JSExpression operand = prefixExpression.getExpression();
+                return countTerms(operand);
+            }
+            else if (expression instanceof JSParenthesizedExpression) {
+                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+                final JSExpression contents = parenthesizedExpression.getInnerExpression();
+                return countTerms(contents);
+            }
+            return 1;
+        }
 
-		private boolean isParentBoolean(JSExpression expression)
-		{
-			final PsiElement parent = expression.getParent();
-			if(!(parent instanceof JSExpression))
-			{
-				return false;
-			}
-			return isBoolean((JSExpression) parent);
-		}
+        private boolean isParentBoolean(JSExpression expression) {
+            final PsiElement parent = expression.getParent();
+            if (!(parent instanceof JSExpression)) {
+                return false;
+            }
+            return isBoolean((JSExpression) parent);
+        }
 
-		private boolean isBoolean(JSExpression expression)
-		{
-			if(expression instanceof JSBinaryExpression)
-			{
-				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-				final IElementType sign = binaryExpression.getOperationSign();
-				return JSTokenTypes.ANDAND.equals(sign) ||
-						JSTokenTypes.OROR.equals(sign);
-			}
-			else if(expression instanceof JSPrefixExpression)
-			{
-				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-				final IElementType sign = prefixExpression.getOperationSign();
-				return JSTokenTypes.EXCL.equals(sign);
-			}
-			else if(expression instanceof JSParenthesizedExpression)
-			{
-				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-				final JSExpression contents = parenthesizedExpression.getInnerExpression();
-				return isBoolean(contents);
-			}
-			return false;
-		}
-	}
+        private boolean isBoolean(JSExpression expression) {
+            if (expression instanceof JSBinaryExpression) {
+                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+                final IElementType sign = binaryExpression.getOperationSign();
+                return JSTokenTypes.ANDAND.equals(sign) ||
+                    JSTokenTypes.OROR.equals(sign);
+            }
+            else if (expression instanceof JSPrefixExpression) {
+                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+                final IElementType sign = prefixExpression.getOperationSign();
+                return JSTokenTypes.EXCL.equals(sign);
+            }
+            else if (expression instanceof JSParenthesizedExpression) {
+                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+                final JSExpression contents = parenthesizedExpression.getInnerExpression();
+                return isBoolean(contents);
+            }
+            return false;
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
index 6d562ef0..a7395eb1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
@@ -15,6 +15,7 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 import org.jetbrains.annotations.NonNls;
@@ -28,14 +29,14 @@ public class PointlessArithmeticExpressionJSInspection extends JavaScriptInspect
 
     @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.pointlessArithmeticExpressionDisplayName().get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.pointlessArithmeticExpressionDisplayName();
     }
 
     @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
     @Override
@@ -89,10 +90,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private class PointlessArithmeticFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.simplifyFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.simplifyFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
index 9c718127..316d0dcb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
@@ -18,6 +18,7 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -30,16 +31,16 @@
 public class PointlessBooleanExpressionJSInspection extends JavaScriptInspection {
     private final BooleanLiteralComparisonFix fix = new BooleanLiteralComparisonFix();
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.pointlessBooleanExpressionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.pointlessBooleanExpressionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
@@ -52,8 +53,8 @@ public BaseInspectionVisitor buildVisitor() {
         return new PointlessBooleanExpressionVisitor();
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return args[0] instanceof JSBinaryExpression binaryExpression
             ? InspectionJSLocalize.pointlessBooleanErrorString(calculateSimplifiedBinaryExpression(binaryExpression)).get()
@@ -131,10 +132,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private class BooleanLiteralComparisonFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.simplifyFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.simplifyFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
index 4b67ebb8..1a8517af 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
@@ -8,27 +8,28 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class VoidExpressionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.voidExpressionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.voidExpressionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.voidExpressionErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
index 943d63eb..09943822 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
@@ -7,26 +7,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class WithStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.withStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.withStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.withExpressionErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
index 96b335bc..6132a168 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
@@ -8,26 +8,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class BreakStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.breakStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.breakStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.breakStatementErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
index 8c46d114..a83c3bf8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
@@ -7,26 +7,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class BreakStatementWithLabelJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.breakStatementWithLabelDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.breakStatementWithLabelDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.breakStatementWithLabelErrorString().get();
     }
@@ -37,7 +38,6 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
         @Override public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (statement.getLabel() == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
index f1dd5375..f6509334 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
@@ -13,6 +13,7 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
@@ -20,16 +21,16 @@
 public class ConditionalExpressionWithIdenticalBranchesJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new CollapseConditional();
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.conditionalExpressionWithIdenticalBranchesDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.conditionalExpressionWithIdenticalBranchesDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @RequiredReadAction
@@ -44,10 +45,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class CollapseConditional extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.collapseConditionalExpressionFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.collapseConditionalExpressionFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
index 454da65b..3cd1cc9b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
@@ -13,21 +13,22 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConstantConditionalExpressionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.constantConditionalExpressionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.constantConditionalExpressionDisplayName();
     }
 
     @Override
@@ -66,10 +67,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class ConstantConditionalFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.simplifyFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.simplifyFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
index 30110186..f95a54a9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
@@ -14,31 +14,27 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConstantIfStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.constantIfStatementDisplayName().get();
-    }
-
     @Override
-    @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.constantIfStatementDisplayName();
     }
 
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.constantIfStatementProblemDescriptor().get();
     }
@@ -54,10 +50,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class ConstantIfStatementFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.constantConditionalExpressionSimplifyQuickfix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.constantConditionalExpressionSimplifyQuickfix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
index d67138cc..5193b3cd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
@@ -8,26 +8,27 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ContinueStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.continueStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.continueStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.continueStatementErrorString().get();
     }
@@ -38,7 +39,6 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-
         @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             registerStatementError(statement);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
index fe810264..7e282523 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
@@ -7,26 +7,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ContinueStatementWithLabelJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.continueStatementWithLabelDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.continueStatementWithLabelDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.continueStatementWithLabelErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index 4b7b8bd4..1c875630 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -8,25 +8,26 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class DefaultNotLastCaseInSwitchJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.defaultNotLastCaseInSwitchDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.defaultNotLastCaseInSwitchDisplayName();
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.defaultBranchNotLastCaseInSwitchErrorString().get();
     }
@@ -44,10 +45,9 @@ public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
             if (caseClauses == null) {
                 return;
             }
-            for (int i = 0; i < caseClauses.length-1; i++) {
+            for (int i = 0; i < caseClauses.length - 1; i++) {
                 final JSCaseClause caseClause = caseClauses[i];
-                if(caseClause.isDefault())
-                {
+                if (caseClause.isDefault()) {
                     registerError(caseClause.getFirstChild());
                 }
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
index 0c6644d4..1fd1f21f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
@@ -11,6 +11,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
@@ -19,20 +20,20 @@
 
 @ExtensionImpl
 public class DuplicateConditionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.duplicateConditionInIfStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.duplicateConditionInIfStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.duplicateConditionErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
index 14276956..42092197 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
@@ -11,31 +11,27 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class FallthroughInSwitchStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.fallThroughInSwitchStatementDisplayName().get();
-    }
-
     @Override
-    @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.fallThroughInSwitchStatementDisplayName();
     }
 
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.fallThroughInSwitchStatementErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
index a98f2b71..5a8c64ee 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
@@ -15,128 +15,109 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
-public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.forLoopReplaceableByWhileDisplayName().get();
-	}
+public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection {
+    @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
+    public String getID() {
+        return "ForLoopReplaceableByWhile";
+    }
 
-	@Override
-	@Nonnull
-	public String getID()
-	{
-		return "ForLoopReplaceableByWhile";
-	}
+    @Nonnull
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.forLoopReplaceableByWhileDisplayName();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
-	}
+    @Override
+    @Nonnull
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+    }
 
-	@RequiredReadAction
-	@Override
-	@Nonnull
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.forLoopReplaceableByWhileProblemDescriptor().get();
-	}
+    @Nonnull
+    @Override
+    @RequiredReadAction
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.forLoopReplaceableByWhileProblemDescriptor().get();
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new ForLoopReplaceableByWhileJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new ForLoopReplaceableByWhileJSInspectionState();
+    }
 
-	@Override
-	public InspectionJSFix buildFix(PsiElement location, Object state)
-	{
-		return new ReplaceForByWhileFix();
-	}
+    @Override
+    public InspectionJSFix buildFix(PsiElement location, Object state) {
+        return new ReplaceForByWhileFix();
+    }
 
-	private static class ReplaceForByWhileFix extends InspectionJSFix
-	{
+    private static class ReplaceForByWhileFix extends InspectionJSFix {
+        @Nonnull
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.forLoopReplaceableByWhileReplaceQuickfix();
+        }
 
-		@Override
-		@Nonnull
-		public String getName()
-		{
-			return InspectionJSLocalize.forLoopReplaceableByWhileReplaceQuickfix().get();
-		}
+        @Override
+        public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+            final PsiElement forKeywordElement = descriptor.getPsiElement();
+            final JSForStatement forStatement = (JSForStatement) forKeywordElement.getParent();
+            assert forStatement != null;
+            final JSExpression condition = forStatement.getCondition();
+            final JSStatement body = forStatement.getBody();
+            final String bodyText = body == null ? "" : body.getText();
+            @NonNls final String whileStatement;
+            if (condition == null) {
+                whileStatement = "while(true)" + bodyText;
+            }
+            else {
+                whileStatement = "while(" + condition.getText() + ')' + bodyText;
+            }
+            replaceStatement(forStatement, whileStatement);
+        }
+    }
 
-		@Override
-		public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException
-		{
-			final PsiElement forKeywordElement = descriptor.getPsiElement();
-			final JSForStatement forStatement = (JSForStatement) forKeywordElement.getParent();
-			assert forStatement != null;
-			final JSExpression condition = forStatement.getCondition();
-			final JSStatement body = forStatement.getBody();
-			final String bodyText = body == null ? "" : body.getText();
-			@NonNls final String whileStatement;
-			if(condition == null)
-			{
-				whileStatement = "while(true)" + bodyText;
-			}
-			else
-			{
-				whileStatement = "while(" + condition.getText() + ')' + bodyText;
-			}
-			replaceStatement(forStatement, whileStatement);
-		}
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new ForLoopReplaceableByWhileVisitor();
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new ForLoopReplaceableByWhileVisitor();
-	}
-
-	private class ForLoopReplaceableByWhileVisitor extends BaseInspectionVisitor<ForLoopReplaceableByWhileJSInspectionState>
-	{
-		@Override
-		public void visitJSForStatement(@Nonnull JSForStatement statement)
-		{
-			super.visitJSForStatement(statement);
-			final JSVarStatement varStatement = statement.getVarDeclaration();
-			if(varStatement != null)
-			{
-				return;
-			}
-			final JSExpression initialization = statement.getInitialization();
-			if(initialization != null)
-			{
-				return;
-			}
-			final JSExpression update = statement.getUpdate();
-			if(update != null)
-			{
-				return;
-			}
-			if(myState.m_ignoreLoopsWithoutConditions)
-			{
-				final JSExpression condition = statement.getCondition();
-				if(condition == null)
-				{
-					return;
-				}
-				final String conditionText = condition.getText();
-				if("true".equals(conditionText))
-				{
-					return;
-				}
-			}
-			registerStatementError(statement);
-		}
-	}
+    private class ForLoopReplaceableByWhileVisitor extends BaseInspectionVisitor<ForLoopReplaceableByWhileJSInspectionState> {
+        @Override
+        public void visitJSForStatement(@Nonnull JSForStatement statement) {
+            super.visitJSForStatement(statement);
+            final JSVarStatement varStatement = statement.getVarDeclaration();
+            if (varStatement != null) {
+                return;
+            }
+            final JSExpression initialization = statement.getInitialization();
+            if (initialization != null) {
+                return;
+            }
+            final JSExpression update = statement.getUpdate();
+            if (update != null) {
+                return;
+            }
+            if (myState.m_ignoreLoopsWithoutConditions) {
+                final JSExpression condition = statement.getCondition();
+                if (condition == null) {
+                    return;
+                }
+                final String conditionText = condition.getText();
+                if ("true".equals(conditionText)) {
+                    return;
+                }
+            }
+            registerStatementError(statement);
+        }
+    }
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
index 6eb6e85e..54a1051d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
@@ -7,25 +7,26 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ForLoopThatDoesntUseLoopVariableJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.forLoopNotUseLoopVariableDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.forLoopNotUseLoopVariableDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BUGS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         final boolean condition = (Boolean) args[0];
         final boolean update = (Boolean) args[1];
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
index c8ee89f0..48b9c965 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
@@ -13,6 +13,7 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
@@ -20,20 +21,20 @@
 public class IfStatementWithIdenticalBranchesJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new CollapseIfFix();
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.ifStatementWithIdenticalBranchesDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.ifStatementWithIdenticalBranchesDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.refStatementWithIdenticalBranchesErrorString().get();
     }
@@ -44,10 +45,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class CollapseIfFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.collapseIfStatementFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.collapseIfStatementFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
index 9143eaaa..789f8778 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
@@ -10,83 +10,70 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
-public class IfStatementWithTooManyBranchesJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.ifStatementWithTooManyBranchesDisplayName().get();
-	}
+public class IfStatementWithTooManyBranchesJSInspection extends JavaScriptInspection {
+    @Nonnull
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.ifStatementWithTooManyBranchesDisplayName();
+    }
 
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
-	}
+    @Nonnull
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
+    }
 
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new IfStatementWithTooManyBranchesJSInspectionState();
-	}
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new IfStatementWithTooManyBranchesJSInspectionState();
+    }
 
-	@RequiredReadAction
-	@Override
-	protected String buildErrorString(Object state, Object... args)
-	{
-		final JSIfStatement statement = (JSIfStatement) args[0];
-		final int branches = calculateNumBranches(statement);
-		return InspectionJSLocalize.ifStatementWithTooManyBranchesErrorString(branches).get();
-	}
+    @Override
+    @RequiredReadAction
+    protected String buildErrorString(Object state, Object... args) {
+        final JSIfStatement statement = (JSIfStatement) args[0];
+        final int branches = calculateNumBranches(statement);
+        return InspectionJSLocalize.ifStatementWithTooManyBranchesErrorString(branches).get();
+    }
 
-	private static int calculateNumBranches(JSIfStatement statement)
-	{
-		final JSStatement branch = statement.getElse();
-		if(branch == null)
-		{
-			return 1;
-		}
-		if(!(branch instanceof JSIfStatement))
-		{
-			return 2;
-		}
-		return 1 + calculateNumBranches((JSIfStatement) branch);
-	}
+    private static int calculateNumBranches(JSIfStatement statement) {
+        final JSStatement branch = statement.getElse();
+        if (branch == null) {
+            return 1;
+        }
+        if (!(branch instanceof JSIfStatement)) {
+            return 2;
+        }
+        return 1 + calculateNumBranches((JSIfStatement) branch);
+    }
 
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
 
-	private class Visitor extends BaseInspectionVisitor<IfStatementWithTooManyBranchesJSInspectionState>
-	{
-		@Override
-		public void visitJSIfStatement(@Nonnull JSIfStatement statement)
-		{
-			super.visitJSIfStatement(statement);
-			final PsiElement parent = statement.getParent();
-			if(parent instanceof JSIfStatement)
-			{
-				final JSIfStatement parentStatement = (JSIfStatement) parent;
-				final JSStatement elseBranch = parentStatement.getElse();
-				if(statement.equals(elseBranch))
-				{
-					return;
-				}
-			}
-			final int branches = calculateNumBranches(statement);
-			if(branches <= myState.m_limit)
-			{
-				return;
-			}
-			registerStatementError(statement, statement);
-		}
-	}
+    private class Visitor extends BaseInspectionVisitor<IfStatementWithTooManyBranchesJSInspectionState> {
+        @Override
+        public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+            super.visitJSIfStatement(statement);
+            final PsiElement parent = statement.getParent();
+            if (parent instanceof JSIfStatement) {
+                final JSIfStatement parentStatement = (JSIfStatement) parent;
+                final JSStatement elseBranch = parentStatement.getElse();
+                if (statement.equals(elseBranch)) {
+                    return;
+                }
+            }
+            final int branches = calculateNumBranches(statement);
+            if (branches <= myState.m_limit) {
+                return;
+            }
+            registerStatementError(statement, statement);
+        }
+    }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
index c2952f68..59a91756 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
@@ -7,27 +7,28 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class LabeledStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.labeledStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.labeledStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.statementLabelErrorString().get();
     }
@@ -42,8 +43,7 @@ private static class Visitor extends BaseInspectionVisitor {
         public void visitJSLabeledStatement(@Nonnull JSLabeledStatement statement) {
             super.visitJSLabeledStatement(statement);
             @NonNls final String label = statement.getLabel();
-            if("javascript".equals(label))
-            {
+            if ("javascript".equals(label)) {
                 return;
             }
             registerStatementError(statement);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
index a927aab4..66c5d5d5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
@@ -8,20 +8,21 @@
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class LoopStatementThatDoesntLoopJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.loopStatementThatDoesnTLoopDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.loopStatementThatDoesnTLoopDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
index e9070b90..29b286d3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
@@ -8,26 +8,27 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class NestedSwitchStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.nestedSwitchStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.nestedSwitchStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.nestedSwitchStatementErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
index 71701535..f61f33a1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
@@ -8,26 +8,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class SwitchStatementWithNoDefaultBranchJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.switchStatementWithNoDefaultBranchDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.switchStatementWithNoDefaultBranchDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.switchStatementWithNoDefaultBranchErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
index b26d2c19..4224cdca 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
@@ -9,25 +9,26 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class TailRecursionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.tailRecursionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.tailRecursionDisplayName();
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.tailRecursionProblemDescriptor().get();
     }
@@ -171,37 +172,39 @@ private static boolean isTailCallReturn(PsiElement element,
     */
 
     @Override
-	public BaseInspectionVisitor buildVisitor() {
+    public BaseInspectionVisitor buildVisitor() {
         return new TailRecursionVisitor();
     }
 
     private static class TailRecursionVisitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSReturnStatement(
-                @Nonnull JSReturnStatement statement) {
+        @Override
+        public void visitJSReturnStatement(
+            @Nonnull JSReturnStatement statement
+        ) {
             super.visitJSReturnStatement(statement);
             final JSExpression returnValue = statement.getExpression();
             if (!(returnValue instanceof JSCallExpression)) {
                 return;
             }
             final JSFunction containingMethod =
-                    PsiTreeUtil.getParentOfType(statement,
-                            JSFunction.class);
+                PsiTreeUtil.getParentOfType(
+                    statement,
+                    JSFunction.class
+                );
             if (containingMethod == null) {
                 return;
             }
             final JSCallExpression returnCall =
-                    (JSCallExpression) returnValue;
+                (JSCallExpression) returnValue;
             final JSExpression methodExpression = returnCall.getMethodExpression();
-            if(!(methodExpression  instanceof JSReferenceExpression))
-            {
+            if (!(methodExpression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression reference =(JSReferenceExpression) methodExpression;
+            final JSReferenceExpression reference = (JSReferenceExpression) methodExpression;
 
             final PsiElement referent = reference.resolve();
-            if(!(referent instanceof JSFunction))
-            {
+            if (!(referent instanceof JSFunction)) {
                 return;
             }
             final JSFunction method = (JSFunction) referent;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
index cd87e5f1..4c87d710 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
@@ -14,30 +14,33 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class TrivialConditionalJSInspection extends JavaScriptInspection {
     private final TrivialConditionalFix fix = new TrivialConditionalFix();
 
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "RedundantConditionalExpressionJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.redundantConditionalExpressionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.redundantConditionalExpressionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
@@ -75,10 +78,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class TrivialConditionalFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.simplifyFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.simplifyFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
index 2b9d22f8..707af81a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
@@ -18,30 +18,33 @@
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class TrivialIfJSInspection extends JavaScriptInspection {
     private final TrivialIfFix fix = new TrivialIfFix();
 
+    @Nonnull
     @Override
-	@Nonnull
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "RedundantIfStatementJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.redundantIfStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.redundantIfStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
@@ -66,10 +69,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class TrivialIfFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.simplifyFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.simplifyFix();
         }
 
         @Override
@@ -78,19 +81,26 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
             final JSIfStatement statement = (JSIfStatement) ifKeywordElement.getParent();
             if (isSimplifiableAssignment(statement)) {
                 replaceSimplifiableAssignment(statement);
-            } else if (isSimplifiableReturn(statement)) {
+            }
+            else if (isSimplifiableReturn(statement)) {
                 repaceSimplifiableReturn(statement);
-            } else if (isSimplifiableImplicitReturn(statement)) {
+            }
+            else if (isSimplifiableImplicitReturn(statement)) {
                 replaceSimplifiableImplicitReturn(statement);
-            } else if (isSimplifiableAssignmentNegated(statement)) {
+            }
+            else if (isSimplifiableAssignmentNegated(statement)) {
                 replaceSimplifiableAssignmentNegated(statement);
-            } else if (isSimplifiableReturnNegated(statement)) {
+            }
+            else if (isSimplifiableReturnNegated(statement)) {
                 repaceSimplifiableReturnNegated(statement);
-            } else if (isSimplifiableImplicitReturnNegated(statement)) {
+            }
+            else if (isSimplifiableImplicitReturnNegated(statement)) {
                 replaceSimplifiableImplicitReturnNegated(statement);
-            } else if (isSimplifiableImplicitAssignment(statement)) {
+            }
+            else if (isSimplifiableImplicitAssignment(statement)) {
                 replaceSimplifiableImplicitAssignment(statement);
-            } else if (isSimplifiableImplicitAssignmentNegated(statement)) {
+            }
+            else if (isSimplifiableImplicitAssignmentNegated(statement)) {
                 replaceSimplifiableImplicitAssignmentNegated(statement);
             }
         }
@@ -302,7 +312,8 @@ public static boolean isSimplifiableAssignment(JSIfStatement ifStatement) {
             final JSExpression thenLhs = thenExpression.getLOperand();
             final JSExpression elseLhs = elseExpression.getLOperand();
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -323,7 +334,8 @@ public static boolean isSimplifiableAssignmentNegated(JSIfStatement ifStatement)
             final JSExpression thenLhs = thenExpression.getLOperand();
             final JSExpression elseLhs = elseExpression.getLOperand();
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -352,7 +364,8 @@ public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement
             final JSExpression thenLhs = thenExpression.getLOperand();
             final JSExpression elseLhs = elseExpression.getLOperand();
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -381,80 +394,81 @@ public static boolean isSimplifiableImplicitAssignmentNegated(JSIfStatement ifSt
             final JSExpression thenLhs = thenExpression.getLOperand();
             final JSExpression elseLhs = elseExpression.getLOperand();
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
-        } else {
+        }
+        else {
             return false;
         }
     }
 
     @NonNls
     private static String getTextForOperator(IElementType operator) {
-        if(JSTokenTypes.EQ.equals(operator)) {
+        if (JSTokenTypes.EQ.equals(operator)) {
             return "=";
         }
-        if(JSTokenTypes.NE.equals(operator)) {
+        if (JSTokenTypes.NE.equals(operator)) {
             return "!=";
         }
-        if(JSTokenTypes.LE.equals(operator)) {
+        if (JSTokenTypes.LE.equals(operator)) {
             return "<=";
         }
-        if(JSTokenTypes.GE.equals(operator)) {
+        if (JSTokenTypes.GE.equals(operator)) {
             return ">=";
         }
-        if(JSTokenTypes.LT.equals(operator)) {
+        if (JSTokenTypes.LT.equals(operator)) {
             return "<=";
         }
-        if(JSTokenTypes.GT.equals(operator)) {
+        if (JSTokenTypes.GT.equals(operator)) {
             return ">=";
         }
-        if(JSTokenTypes.EQEQ.equals(operator)) {
+        if (JSTokenTypes.EQEQ.equals(operator)) {
             return "==";
         }
-        if(JSTokenTypes.EQEQEQ.equals(operator)) {
+        if (JSTokenTypes.EQEQEQ.equals(operator)) {
             return "===";
         }
-        if(JSTokenTypes.NEQEQ.equals(operator)) {
+        if (JSTokenTypes.NEQEQ.equals(operator)) {
             return "!==";
         }
-        if(JSTokenTypes.PLUSEQ.equals(operator)) {
+        if (JSTokenTypes.PLUSEQ.equals(operator)) {
             return "+=";
         }
-        if(JSTokenTypes.MINUSEQ.equals(operator)) {
+        if (JSTokenTypes.MINUSEQ.equals(operator)) {
             return "-=";
         }
-        if(JSTokenTypes.MULTEQ.equals(operator)) {
+        if (JSTokenTypes.MULTEQ.equals(operator)) {
             return "*=";
         }
-        if(JSTokenTypes.DIVEQ.equals(operator)) {
+        if (JSTokenTypes.DIVEQ.equals(operator)) {
             return "/=";
         }
-        if(JSTokenTypes.PERCEQ.equals(operator)) {
+        if (JSTokenTypes.PERCEQ.equals(operator)) {
             return "%=";
         }
-        if(JSTokenTypes.XOREQ.equals(operator)) {
+        if (JSTokenTypes.XOREQ.equals(operator)) {
             return "^=";
         }
-        if(JSTokenTypes.ANDEQ.equals(operator)) {
+        if (JSTokenTypes.ANDEQ.equals(operator)) {
             return "&=";
         }
-        if(JSTokenTypes.OREQ.equals(operator)) {
+        if (JSTokenTypes.OREQ.equals(operator)) {
             return "|=";
         }
-        if(JSTokenTypes.LTLT.equals(operator)) {
+        if (JSTokenTypes.LTLT.equals(operator)) {
             return "<<";
         }
-        if(JSTokenTypes.LTLTEQ.equals(operator)) {
+        if (JSTokenTypes.LTLTEQ.equals(operator)) {
             return "<<=";
         }
-        if(JSTokenTypes.GTGT.equals(operator)) {
+        if (JSTokenTypes.GTGT.equals(operator)) {
             return ">>";
         }
-        if(JSTokenTypes.GTGTEQ.equals(operator)) {
+        if (JSTokenTypes.GTGTEQ.equals(operator)) {
             return ">>=";
         }
-        if(JSTokenTypes.GTGTGT.equals(operator)) {
+        if (JSTokenTypes.GTGTGT.equals(operator)) {
             return ">>>";
         }
-        if(JSTokenTypes.GTGTGTEQ.equals(operator)) {
+        if (JSTokenTypes.GTGTGTEQ.equals(operator)) {
             return ">>>=";
         }
         return "unknown";
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
index a51a7dfd..fc2b589e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
@@ -12,6 +12,7 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
@@ -19,25 +20,20 @@
 public class UnnecessaryContinueJSInspection extends JavaScriptInspection {
     private final UnnecessaryContinueFix fix = new UnnecessaryContinueFix();
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.unnecessaryContinueStatementDisplayName().get();
-    }
-
     @Override
-    @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.unnecessaryContinueStatementDisplayName();
     }
 
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.unnecessaryContinueErrorString().get();
     }
@@ -53,10 +49,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnnecessaryContinueFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.removeUnnecessaryContinueFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.removeUnnecessaryContinueFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
index 46447904..0ef8d14c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
@@ -11,26 +11,22 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnnecessaryLabelJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.unnecessaryLabelDisplayName().get();
-    }
-
     @Override
-    @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.unnecessaryLabelDisplayName();
     }
 
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
@@ -38,9 +34,9 @@ public BaseInspectionVisitor buildVisitor() {
         return new UnusedLabelVisitor();
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.unnecessaryLabelErrorString().get();
     }
@@ -51,10 +47,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnusedLabelFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.removeLabelFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.removeLabelFix();
         }
 
         @Override

From 71db860b4fab8f5bd18177b07f2f33242efc17f8 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Thu, 9 Oct 2025 23:15:18 +0300
Subject: [PATCH 292/340] Localizing inspections and their fixes (part 2).

---
 .../qucikFixes/CreateJSFunctionFixBase.java   | 15 ++-----
 .../bitwise/ShiftOutOfRangeJSInspection.java  | 19 +++++----
 ...saryLabelOnBreakStatementJSInspection.java | 22 ++++------
 ...yLabelOnContinueStatementJSInspection.java | 23 +++++-----
 .../UnnecessaryReturnJSInspection.java        | 23 +++++-----
 .../ReuseOfLocalVariableJSInspection.java     | 17 ++++----
 .../UnnecessaryLocalVariableJSInspection.java | 42 +++++++++----------
 .../dom/DocumentWriteJSInspection.java        | 17 ++++----
 .../inspectjs/dom/InnerHTMLJSInspection.java  | 17 ++++----
 .../XHTMLIncompatabilitiesJSInspection.java   | 17 ++++----
 ...ueOrBreakFromFinallyBlockJSInspection.java | 18 ++++----
 .../EmptyCatchBlockJSInspection.java          | 17 ++++----
 .../EmptyFinallyBlockJSInspection.java        | 17 ++++----
 .../exception/EmptyTryBlockJSInspection.java  | 17 ++++----
 .../ExceptionCaughtLocallyJSInspection.java   | 19 ++++-----
 .../ReturnFromFinallyBlockJSInspection.java   | 19 +++++----
 .../ThrowFromFinallyBlockJSInspection.java    | 22 +++++-----
 .../UnusedCatchParameterJSInspection.java     | 17 ++++----
 .../com/sixrr/inspectjs/fix/RenameFix.java    |  7 ++--
 .../CyclomaticComplexityJSInspection.java     | 19 +++++----
 ...FunctionWithMultipleLoopsJSInspection.java |  9 ++--
 ...nWithMultipleReturnPointsJSInspection.java | 15 +++----
 .../NestingDepthJSInspection.java             | 19 +++++----
 .../ParametersPerFunctionJSInspection.java    | 19 +++++----
 .../StatementsPerFunctionJSInspection.java    |  9 ++--
 ...ThreeNegationsPerFunctionJSInspection.java |  9 ++--
 .../FunctionNamingConventionJSInspection.java | 19 +++++----
 ...lVariableNamingConventionJSInspection.java | 19 +++++----
 ...ParameterNamingConventionJSInspection.java | 23 +++++-----
 .../style/ChainedEqualityJSInspection.java    | 20 +++++----
 .../ChainedFunctionCallJSInspection.java      | 20 ++++-----
 ...ConstantOnLHSOfComparisonJSInspection.java | 27 ++++++------
 ...ConstantOnRHSOfComparisonJSInspection.java | 25 ++++++-----
 .../style/NestedFunctionCallJSInspection.java | 10 ++---
 .../NonBlockStatementBodyJSInspection.java    | 13 +++---
 .../UnterminatedStatementJSInspection.java    | 13 +++---
 .../BadExpressionStatementJSInspection.java   | 17 ++++----
 .../DebuggerStatementJSInspection.java        |  9 ++--
 .../DuplicateCaseLabelJSInspection.java       | 15 +++----
 ...onWithInconsistentReturnsJSInspection.java | 17 ++++----
 .../StringLiteralBreaksHTMLJSInspection.java  | 17 ++++----
 ...ionReferencesGlobalObjectJSInspection.java | 17 ++++----
 .../validity/UnreachableCodeJSInspection.java | 17 ++++----
 43 files changed, 392 insertions(+), 370 deletions(-)

diff --git a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index 9ec0c147..72c482d4 100644
--- a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package consulo.javascript.inspections.qucikFixes;
 
 import com.intellij.lang.javascript.inspections.qucikFixes.BaseCreateFix;
@@ -22,7 +21,6 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.JavaScriptFeature;
-import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.template.Template;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -37,22 +35,17 @@
  * @since 2016-02-24
  */
 public abstract class CreateJSFunctionFixBase extends BaseCreateFix {
+    @Nonnull
     private final LocalizeValue myMessage;
 
-    public CreateJSFunctionFixBase(LocalizeValue message) {
+    public CreateJSFunctionFixBase(@Nonnull LocalizeValue message) {
         myMessage = message;
     }
 
     @Override
     @Nonnull
-    public String getName() {
-        return myMessage.get();
-    }
-
-    @Override
-    @Nonnull
-    public String getFamilyName() {
-        return JavaScriptLocalize.javascriptCreateFunctionIntentionFamily().get();
+    public LocalizeValue getName() {
+        return myMessage;
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index 82465591..b0a6c23d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -11,27 +11,28 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ShiftOutOfRangeJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.shiftOperationByInappropriateConstantDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.shiftOperationByInappropriateConstantDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BITWISE_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        final Integer value = (Integer)args[0];
+        Integer value = (Integer)args[0];
         return value > 0
             ? InspectionJSLocalize.shiftOperationByInappropriateConstantProblemDescriptorTooLarge().get()
             : InspectionJSLocalize.shiftOperationByInappropriateConstantProblemDescriptorNegative().get();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
index 468c23d3..6c609489 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
@@ -15,6 +15,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -23,21 +24,16 @@
 public class UnnecessaryLabelOnBreakStatementJSInspection extends JavaScriptInspection {
     private final UnnecessaryLabelOnBreakStatementFix fix = new UnnecessaryLabelOnBreakStatementFix();
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.unnecessaryLabelOnBreakStatementDisplayName().get();
-    }
-
     @Override
-    @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.unnecessaryLabelOnBreakStatementDisplayName();
     }
 
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
@@ -46,10 +42,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnnecessaryLabelOnBreakStatementFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.removeLabelFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.removeLabelFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
index 5ef4c212..265d71df 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
@@ -14,6 +14,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -22,16 +23,16 @@
 public class UnnecessaryLabelOnContinueStatementJSInspection extends JavaScriptInspection {
     private final UnnecessaryLabelOnContinueStatementFix fix = new UnnecessaryLabelOnContinueStatementFix();
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.unnecessaryLabelOnContinueStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.unnecessaryLabelOnContinueStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
@@ -39,9 +40,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.unnecessaryLabelOnContinueErrorString().get();
     }
@@ -57,10 +58,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnnecessaryLabelOnContinueStatementFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.removeLabelFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.removeLabelFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
index 1d20dbb3..62a7fed6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
@@ -13,29 +13,32 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class  UnnecessaryReturnJSInspection extends JavaScriptInspection {
     private final UnnecessaryReturnFix fix = new UnnecessaryReturnFix();
 
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "UnnecessaryReturnStatementJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.unnecessaryReturnStatementDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.unnecessaryReturnStatementDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONTROL_FLOW_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
     @Override
@@ -60,10 +63,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnnecessaryReturnFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.removeUnnecessaryReturnFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.removeUnnecessaryReturnFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index b1ec4b53..b80be1ef 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -12,26 +12,27 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ReuseOfLocalVariableJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.reuseOfLocalVariableDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.reuseOfLocalVariableDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.DATA_FLOW_ISSUES.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.DATA_FLOW_ISSUES;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.reuseOfLocalVariableProblemDescriptor().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index 2547e0a8..f727b460 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -12,20 +12,21 @@
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
 
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.redundantLocalVariableDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.redundantLocalVariableDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.DATA_FLOW_ISSUES.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.DATA_FLOW_ISSUES;
     }
 
     @Nonnull
@@ -34,14 +35,9 @@ public InspectionToolState<?> createStateProvider() {
         return new UnnecessaryLocalVariableJSInspectionState();
     }
 
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
-    }
-
     @RequiredReadAction
-    @Override
-    @Nonnull
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.unnecessaryLocalVariableProblemDescriptor().get();
     }
@@ -89,7 +85,7 @@ private boolean isCopyVariable(JSVariable variable) {
                 return false;
             }
             final JSReferenceExpression reference =
-                (JSReferenceExpression)initializer;
+                (JSReferenceExpression) initializer;
             final PsiElement referent = reference.resolve();
             if (referent == null) {
                 return false;
@@ -107,7 +103,7 @@ private boolean isCopyVariable(JSVariable variable) {
             if (visitor.isAssigned()) {
                 return false;
             }
-            final JSVariable initialization = (JSVariable)referent;
+            final JSVariable initialization = (JSVariable) referent;
             final VariableAssignedVisitor visitor2 = new VariableAssignedVisitor(initialization);
             containingScope.accept(visitor2);
             if (visitor2.isAssigned()) {
@@ -148,7 +144,7 @@ private boolean isImmediatelyReturned(JSVariable variable) {
             if (!(nextStatement instanceof JSReturnStatement)) {
                 return false;
             }
-            final JSReturnStatement returnStatement = (JSReturnStatement)nextStatement;
+            final JSReturnStatement returnStatement = (JSReturnStatement) nextStatement;
             final JSExpression returnValue = returnStatement.getExpression();
             if (returnValue == null) {
                 return false;
@@ -156,7 +152,7 @@ private boolean isImmediatelyReturned(JSVariable variable) {
             if (!(returnValue instanceof JSReferenceExpression)) {
                 return false;
             }
-            final PsiElement referent = ((PsiReference)returnValue).resolve();
+            final PsiElement referent = ((PsiReference) returnValue).resolve();
             return !(referent == null || !referent.equals(variable));
         }
 
@@ -182,7 +178,7 @@ private boolean isImmediatelyThrown(JSVariable variable) {
             if (!(nextStatement instanceof JSThrowStatement)) {
                 return false;
             }
-            final JSThrowStatement throwStatement = (JSThrowStatement)nextStatement;
+            final JSThrowStatement throwStatement = (JSThrowStatement) nextStatement;
             final JSExpression returnValue = throwStatement.getExpression();
             if (returnValue == null) {
                 return false;
@@ -190,7 +186,7 @@ private boolean isImmediatelyThrown(JSVariable variable) {
             if (!(returnValue instanceof JSReferenceExpression)) {
                 return false;
             }
-            final PsiElement referent = ((PsiReference)returnValue).resolve();
+            final PsiElement referent = ((PsiReference) returnValue).resolve();
             return !(referent == null || !referent.equals(variable));
         }
 
@@ -218,12 +214,12 @@ private boolean isImmediatelyAssigned(JSVariable variable) {
             if (!(nextStatement instanceof JSExpressionStatement)) {
                 return false;
             }
-            final JSExpressionStatement expressionStatement = (JSExpressionStatement)nextStatement;
+            final JSExpressionStatement expressionStatement = (JSExpressionStatement) nextStatement;
             final JSExpression expression = expressionStatement.getExpression();
             if (!(expression instanceof JSAssignmentExpression)) {
                 return false;
             }
-            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression)expression;
+            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) expression;
             final JSExpression rhs = assignmentExpression.getROperand();
             if (rhs == null) {
                 return false;
@@ -231,7 +227,7 @@ private boolean isImmediatelyAssigned(JSVariable variable) {
             if (!(rhs instanceof JSReferenceExpression)) {
                 return false;
             }
-            final JSReferenceExpression reference = (JSReferenceExpression)rhs;
+            final JSReferenceExpression reference = (JSReferenceExpression) rhs;
             final PsiElement referent = reference.resolve();
             if (referent == null || !referent.equals(variable)) {
                 return false;
@@ -272,7 +268,7 @@ private boolean isImmediatelyAssignedAsDeclaration(JSVariable variable) {
             if (!(nextStatement instanceof JSVarStatement)) {
                 return false;
             }
-            final JSVarStatement declaration = (JSVarStatement)nextStatement;
+            final JSVarStatement declaration = (JSVarStatement) nextStatement;
             final JSVariable[] declarations = declaration.getVariables();
             if (declarations.length != 1) {
                 return false;
@@ -284,7 +280,7 @@ private boolean isImmediatelyAssignedAsDeclaration(JSVariable variable) {
             if (!(rhs instanceof JSReferenceExpression)) {
                 return false;
             }
-            final PsiElement referent = ((PsiReference)rhs).resolve();
+            final PsiElement referent = ((PsiReference) rhs).resolve();
             if (referent == null || !referent.equals(variable)) {
                 return false;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index c517e030..4a7a2234 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -9,6 +9,7 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
@@ -16,21 +17,21 @@
 
 @ExtensionImpl
 public class DocumentWriteJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.callToDocumentWriteDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.callToDocumentWriteDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.DOM_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.DOM_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.documentWriteErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index bb2a0750..e0d5e28f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -7,26 +7,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class InnerHTMLJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.useOfInnerhtmlPropertyDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.useOfInnerhtmlPropertyDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.DOM_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.DOM_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.innerHtmlErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
index 40b7f7f3..7b176314 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
@@ -8,26 +8,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class XHTMLIncompatabilitiesJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.xhtmlIncompatibilitiesDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.xhtmlIncompatibilitiesDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.DOM_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.DOM_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.xhtmlIncompatabilitiesErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
index 89a3366c..a115d4a6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
@@ -10,29 +10,25 @@
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ContinueOrBreakFromFinallyBlockJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.continueOrBreakInsideFinallyBlockDisplayName().get();
-    }
-
     @Override
-    @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.continueOrBreakInsideFinallyBlockDisplayName();
     }
 
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.continueOrBreakInsideFinallyBlockErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index 64df0d7f..4baf9163 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -11,26 +11,27 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class EmptyCatchBlockJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.emptyCatchBlockDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.emptyCatchBlockDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.emptyCatchBlockErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
index a23d13c3..1e98753d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
@@ -9,26 +9,27 @@
 import com.sixrr.inspectjs.utils.StatementUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class EmptyFinallyBlockJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.emptyFinallyBlockDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.emptyFinallyBlockDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.emptyFinallyBlockErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index a94a2dfc..4b61111a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -9,26 +9,27 @@
 import com.sixrr.inspectjs.utils.StatementUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class EmptyTryBlockJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.emptyTryBlockDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.emptyTryBlockDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.emptyTryBlockErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index b484cb7c..42a39765 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -11,30 +11,25 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
-
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ExceptionCaughtLocallyJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.exceptionUsedForLocalControlFlowDisplayName().get();
-    }
-
     @Override
-    @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.exceptionUsedForLocalControlFlowDisplayName();
     }
 
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.exceptionCaughtLocallyErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
index 5c3cb01f..632d88cf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
@@ -8,26 +8,29 @@
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ReturnFromFinallyBlockJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ReturnInsideFinallyBlockJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.returnInsideFinallyBlockDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.returnInsideFinallyBlockDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
     @Override
@@ -35,8 +38,8 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.returnInsideFinallyBlockErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
index cd5a42bb..9a3a57ac 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
@@ -8,35 +8,33 @@
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ThrowFromFinallyBlockJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ThrowInsideFinallyBlockJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.throwInsideFinallyBlockDisplayName().get();
-    }
-
     @Override
-    @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.throwInsideFinallyBlockDisplayName();
     }
 
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.throwInsideFinallyBlockErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
index db2d49c9..63376932 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
@@ -13,20 +13,21 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnusedCatchParameterJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.unusedCatchParameterDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.unusedCatchParameterDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ERRORHANDLING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
     @Nonnull
@@ -35,9 +36,9 @@ public InspectionToolState<?> createStateProvider() {
         return new UnusedCatchParameterJSInspectionState();
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.unusedCatchParameterProblemDescriptor().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
index d866d58c..186a24cc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
@@ -9,6 +9,7 @@
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.editor.refactoring.action.RefactoringActionHandlerFactory;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
@@ -27,10 +28,10 @@ public RenameFix(String targetName) {
 
     @Override
     @Nonnull
-    public String getName() {
+    public LocalizeValue getName() {
         return m_targetName == null
-            ? InspectionJSLocalize.renameFix().get()
-            : InspectionJSLocalize.renameToFix(m_targetName).get();
+            ? InspectionJSLocalize.renameFix()
+            : InspectionJSLocalize.renameToFix(m_targetName);
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index 4c95d4b7..4ac1983e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -10,26 +10,29 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class CyclomaticComplexityJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "OverlyComplexFunctionJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.overlyComplexFunctionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.overlyComplexFunctionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
     @Nonnull
@@ -38,8 +41,8 @@ public InspectionToolState<?> createStateProvider() {
         return new CyclomaticComplexityJSInspectionState();
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index 4a38e949..a9c5e3e6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -9,20 +9,21 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class FunctionWithMultipleLoopsJSInspection extends JavaScriptInspection {
     @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.functionWithMultipleLoopsDisplayName().get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.functionWithMultipleLoopsDisplayName();
     }
 
     @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index cbc5f23c..b4e5da65 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -10,6 +10,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -19,20 +20,20 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.functionWithMultipleReturnPointsDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.functionWithMultipleReturnPointsDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index affa50a2..fe4786ec 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -9,26 +9,29 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class NestingDepthJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "OverlyNestedFunctionJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.overlyNestedFunctionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.overlyNestedFunctionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
     @Nonnull
@@ -37,8 +40,8 @@ public InspectionToolState<?> createStateProvider() {
         return new NestingDepthJSInspectionState();
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index 18d7e084..b68a1664 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -11,26 +11,29 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ParametersPerFunctionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "OverlyComplexFunctionJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.functionWithTooManyParametersDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.functionWithTooManyParametersDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
     @Nonnull
@@ -39,8 +42,8 @@ public InspectionToolState<?> createStateProvider() {
         return new ParametersPerFunctionJSInspectionState();
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index 2f83d82c..9ba21acf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -10,6 +10,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -22,14 +23,14 @@ public String getID() {
 
     @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.overlyLongFunctionDisplayName().get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.overlyLongFunctionDisplayName();
     }
 
     @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
     @Nonnull
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index c09f68a4..8a13cc43 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -9,6 +9,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -21,14 +22,14 @@ public String getID() {
 
     @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.functionWithMoreThanThreeNegationsDisplayName().get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.functionWithMoreThanThreeNegationsDisplayName();
     }
 
     @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME.get();
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index 979614d6..7daf5d37 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -11,6 +11,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -28,16 +29,16 @@ public InspectionToolState<?> createStateProvider() {
         return new FunctionNamingConventionJSInspectionState();
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.functionNamingConventionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.functionNamingConventionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
     }
 
     @Override
@@ -50,11 +51,11 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
         return true;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        ConventionInspectionState inspectionState = (ConventionInspectionState)state;
-        final String functionName = ((PsiElement)args[0]).getText();
+        ConventionInspectionState inspectionState = (ConventionInspectionState) state;
+        final String functionName = ((PsiElement) args[0]).getText();
 
         assert functionName != null;
         if (functionName.length() < inspectionState.m_minLength) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index 61a85512..0f9a3971 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -11,6 +11,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -22,16 +23,16 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.localVariableNamingConventionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.localVariableNamingConventionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
     }
 
     @Override
@@ -44,12 +45,12 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
         return true;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        LocalVariableNamingConventionJSInspectionState inspectionState = (LocalVariableNamingConventionJSInspectionState)state;
+        LocalVariableNamingConventionJSInspectionState inspectionState = (LocalVariableNamingConventionJSInspectionState) state;
 
-        final JSVariable variable = (JSVariable)((PsiElement)args[0]).getParent();
+        final JSVariable variable = (JSVariable) ((PsiElement) args[0]).getParent();
         assert variable != null;
         final String variableName = variable.getName();
         if (variableName.length() < inspectionState.m_minLength) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index e29f331c..2959c105 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -13,6 +13,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
@@ -24,22 +25,22 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.functionParameterNamingConventionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.functionParameterNamingConventionDisplayName();
     }
 
     @Nonnull
     @Override
-    public InspectionToolState<?> createStateProvider() {
-        return new ParameterNamingConventionJSInspectionState();
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME.get();
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new ParameterNamingConventionJSInspectionState();
     }
 
     @Override
@@ -52,12 +53,12 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
         return true;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        ParameterNamingConventionJSInspectionState inspectionState = (ParameterNamingConventionJSInspectionState)state;
+        ParameterNamingConventionJSInspectionState inspectionState = (ParameterNamingConventionJSInspectionState) state;
 
-        final JSParameter parameter = (JSParameter)((PsiElement)args[0]).getParent();
+        final JSParameter parameter = (JSParameter) ((PsiElement) args[0]).getParent();
         assert parameter != null;
         final String parameterName = parameter.getName();
         if (parameterName.length() < inspectionState.m_minLength) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index bf361813..3b6c7d4f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -10,30 +10,34 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ChainedEqualityJSInspection extends JavaScriptInspection {
+    @Nonnull
     @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ChainedEqualityComparisonsJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.chainedEqualityDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.chainedEqualityDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.chainedEqualityErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index db98c53b..24bec2b2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -10,30 +10,26 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ChainedFunctionCallJSInspection extends JavaScriptInspection {
+    @Nonnull
     @Override
-    public boolean isEnabledByDefault() {
-        return true;
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME;
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME.get();
-    }
-
     @Override
-    @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.chainedFunctionCallDisplayName().get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.chainedFunctionCallDisplayName();
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.chainedFunctionCallProblemDescriptor().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index c901b5ee..89920df6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -12,34 +12,37 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ConstantOnLHSOfComparisonJSInspection extends JavaScriptInspection {
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ConstantOnLefSideOfComparisonJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.constantOnLeftSideOfComparisonDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.constantOnLeftSideOfComparisonDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.constantOnLeftSideOfComparisonErrorString().get();
     }
@@ -55,15 +58,15 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class SwapComparisonFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.flipComparisonFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.flipComparisonFix();
         }
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
+            final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
             final JSExpression rhs = expression.getROperand();
             final JSExpression lhs = expression.getLOperand();
             final IElementType sign = expression.getOperationSign();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index 245fb0d0..25a3ef58 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -15,33 +15,36 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ConstantOnRHSOfComparisonJSInspection extends JavaScriptInspection {
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ConstantOnRightSideOfComparisonJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.constantOnRightSideOfComparisonDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.constantOnRightSideOfComparisonDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.constantOnRightSideOfComparisonErrorString().get();
     }
@@ -57,10 +60,10 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class SwapComparisonFix extends InspectionJSFix {
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.flipComparisonFix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.flipComparisonFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index ee42f20e..7419f503 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -10,7 +10,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
+import consulo.localize.LocalizeValue;import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NestedFunctionCallJSInspection extends JavaScriptInspection {
@@ -21,14 +21,14 @@ public boolean isEnabledByDefault() {
 
     @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME.get();
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.nestedFunctionCallDisplayName().get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.nestedFunctionCallDisplayName();
     }
 
     @RequiredReadAction
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
index 81b82d4f..72bfa47b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
@@ -11,6 +11,7 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
@@ -20,14 +21,14 @@ public class NonBlockStatementBodyJSInspection extends JavaScriptInspection {
 
     @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.nonBlockStatementBodyDisplayName().get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.nonBlockStatementBodyDisplayName();
     }
 
     @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME.get();
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @Override
@@ -51,8 +52,8 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     private static class WrapBodyFix extends InspectionJSFix {
         @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.wrapStatementBodyFix().get();
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.wrapStatementBodyFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index 1fd3da62..e40b1670 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -13,6 +13,7 @@
 import consulo.language.psi.PsiErrorElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTagChild;
@@ -30,14 +31,14 @@ public boolean isEnabledByDefault() {
 
     @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.unterminatedStatementDisplayName().get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.unterminatedStatementDisplayName();
     }
 
     @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.STYLE_GROUP_NAME.get();
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @RequiredReadAction
@@ -60,8 +61,8 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     private static class TerminateStatementFix extends InspectionJSFix {
         @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.terminateStatementFix().get();
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.terminateStatementFix();
         }
 
         @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index 0d6fba68..62b68f07 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -15,22 +15,23 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class BadExpressionStatementJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.expressionStatementWhichIsNotAssignmentOrCallDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.expressionStatementWhichIsNotAssignmentOrCallDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @Override
@@ -38,9 +39,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.expressionStatementIsNotAssignmentOrCallErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
index 0939d572..e7c3e8fc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
@@ -9,6 +9,7 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
@@ -17,14 +18,14 @@
 public class DebuggerStatementJSInspection extends JavaScriptInspection {
     @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.debuggerStatementDisplayName().get();
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.debuggerStatementDisplayName();
     }
 
     @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index 6e2f7fae..c85057e6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -10,6 +10,7 @@
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
@@ -18,20 +19,20 @@
 
 @ExtensionImpl
 public class DuplicateCaseLabelJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.duplicateCaseLabelDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.duplicateCaseLabelDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.duplicateCaseLabelErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index adf4f829..573c9165 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -13,21 +13,22 @@
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.functionWithInconsistentReturnsDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.functionWithInconsistentReturnsDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @Override
@@ -35,9 +36,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index bb46f3d0..c7eb9358 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -7,21 +7,22 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class StringLiteralBreaksHTMLJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.stringLiteralBreaksHtmlDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.stringLiteralBreaksHtmlDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @Override
@@ -29,9 +30,9 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.stringLiteralBreaksHtmlErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index 83b5a899..3448be2b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -12,22 +12,23 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.xml.psi.xml.XmlAttributeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class ThisExpressionReferencesGlobalObjectJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.thisExpressionWhichReferencesTheGlobalObjectDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.thisExpressionWhichReferencesTheGlobalObjectDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @Override
@@ -35,9 +36,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.thisExpressionReferencesGlobalObjectErrorString().get();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
index 2a2f2fa3..cf04d041 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
@@ -9,21 +9,22 @@
 import com.sixrr.inspectjs.utils.ControlFlowUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class UnreachableCodeJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.unreachableCodeDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.unreachableCodeDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
     @Override
@@ -31,9 +32,9 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.unreachableCodeErrorString().get();
     }

From 5baeddedbcdc07a23655fca283fb256faec5aa16 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 10 Oct 2025 11:06:02 +0300
Subject: [PATCH 293/340] Localizing inspections and their fixes (part 3).

---
 .../AssignmentResultUsedJSInspection.java     | 21 +++++++-------
 .../NestedAssignmentJSInspection.java         | 19 ++++++------
 .../dom/PlatformDetectionJSInspection.java    | 19 ++++++------
 .../style/NestedFunctionCallJSInspection.java |  3 +-
 ...DuplicatePropertyOnObjectJSInspection.java | 20 +++++--------
 ...cmaScript6CreateJSFunctionOrMethodFix.java |  3 +-
 ...ImportECMAScriptClassOrFunctionAction.java | 15 +++-------
 .../CreateClassOrInterfaceAction.java         | 13 +++------
 .../JSDeprecatedSymbolsInspection.java        | 10 ++++---
 .../JSDuplicatedDeclarationInspection.java    | 10 ++++---
 .../JSUndeclaredVariableInspection.java       | 20 +++++--------
 .../JSUnresolvedFunctionInspection.java       | 19 +++++-------
 .../JSUntypedDeclarationInspection.java       | 19 +++++-------
 .../JSUnusedLocalSymbolsInspection.java       | 19 +++++-------
 .../impl/validation/ImplementMethodsFix.java  |  6 ++--
 .../impl/validation/JSAnnotatingVisitor.java  | 29 +++++++------------
 16 files changed, 105 insertions(+), 140 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
index 8c42c676..9774695d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
@@ -8,26 +8,27 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class AssignmentResultUsedJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.resultOfAssignmentUsedDisplayname().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.resultOfAssignmentUsedDisplayname();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.resultOfAssignmentExpressionUsedErrorString().get();
     }
@@ -39,9 +40,9 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpression) {
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression jsAssignmentExpression) {
             super.visitJSAssignmentExpression(jsAssignmentExpression);
-            final PsiElement parent = jsAssignmentExpression.getParent();
+            PsiElement parent = jsAssignmentExpression.getParent();
             if (parent == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
index 770a0455..f35dd09a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
@@ -8,25 +8,26 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NestedAssignmentJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.nestedAssignmentDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.nestedAssignmentDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.nestedAssignmentErrorString().get();
     }
@@ -40,7 +41,7 @@ private static class NestedAssignmentVisitor extends BaseInspectionVisitor {
         @Override
         public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
-            final PsiElement parent = expression.getParent();
+            PsiElement parent = expression.getParent();
             if (parent == null || !(parent instanceof JSAssignmentExpression)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index bf9cdd6f..f7cec916 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -8,26 +8,27 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class PlatformDetectionJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.platformDetectionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.platformDetectionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.DOM_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.DOM_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nullable
+    @Override
+    @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.platformDetectionErrorString().get();
     }
@@ -38,8 +39,8 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @SuppressWarnings({"HardCodedStringLiteral"})
         @Override
+        @SuppressWarnings({"HardCodedStringLiteral"})
         public void visitJSReferenceExpression(JSReferenceExpression referenceExpression) {
             super.visitJSReferenceExpression(referenceExpression);
             final JSExpression qualifier = referenceExpression.getQualifier();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index 7419f503..5a4a6d7e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -10,7 +10,8 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-import consulo.localize.LocalizeValue;import jakarta.annotation.Nonnull;
+import consulo.localize.LocalizeValue;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NestedFunctionCallJSInspection extends JavaScriptInspection {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index 4e82967e..08d23291 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -8,35 +8,31 @@
 import com.sixrr.inspectjs.localize.InspectionJSLocalize;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
 
 @ExtensionImpl
 public class DuplicatePropertyOnObjectJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.duplicatePropertyOnObjectLiteralDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.duplicatePropertyOnObjectLiteralDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.VALIDITY_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.VALIDITY_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.duplicateObjectPropertyErrorString().get();
     }
 
-    @Override
-    public boolean isEnabledByDefault() {
-        return true;
-    }
-
     @Override
     public BaseInspectionVisitor buildVisitor() {
         return new Visitor();
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
index 5a3a5581..bf74c723 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/quickFixes/EcmaScript6CreateJSFunctionOrMethodFix.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package consulo.javascript.ecmascript.codeInsight.quickFixes;
 
 import com.intellij.lang.javascript.inspections.qucikFixes.CreateJSFunctionOrMethodFix;
 
 /**
  * @author VISTALL
- * @since 24.02.2016
+ * @since 2016-02-24
  */
 public class EcmaScript6CreateJSFunctionOrMethodFix extends CreateJSFunctionOrMethodFix {
     public EcmaScript6CreateJSFunctionOrMethodFix(String name, boolean isMethod) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
index db4bb86c..ed2daf06 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.lang.javascript.impl.flex;
 
 import com.intellij.lang.javascript.psi.JSFunction;
@@ -89,22 +88,16 @@ public boolean showHint(@Nonnull Editor editor) {
 
     @Override
     @Nonnull
-    public String getText() {
+    public LocalizeValue getText() {
         String className = StringUtil.notNullize(calculatedClass);
         return isFunction
-            ? JavaScriptLocalize.flexImportFunction(className).get()
-            : JavaScriptLocalize.flexImportClass(className).get();
-    }
-
-    @Override
-    @Nonnull
-    public String getName() {
-        return getText();
+            ? JavaScriptLocalize.flexImportFunction(className)
+            : JavaScriptLocalize.flexImportClass(className);
     }
 
     @Override
     @Nonnull
-    public String getFamilyName() {
+    public LocalizeValue getName() {
         return getText();
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
index ff20b657..a482f32b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
@@ -32,6 +32,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiManager;
 import consulo.language.util.ModuleUtilCore;
+import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.module.Module;
 import consulo.module.content.ModuleRootManager;
@@ -63,16 +64,10 @@ public CreateClassOrInterfaceAction(JSReferenceExpression context, boolean isInt
 
     @Override
     @Nonnull
-    public String getName() {
+    public LocalizeValue getName() {
         return myIsInterface
-            ? JavaScriptLocalize.javascriptCreateInterfaceIntentionName(classNameToCreate).get()
-            : JavaScriptLocalize.javascriptCreateClassIntentionName(classNameToCreate).get();
-    }
-
-    @Override
-    @Nonnull
-    public String getFamilyName() {
-        return getName();
+            ? JavaScriptLocalize.javascriptCreateInterfaceIntentionName(classNameToCreate)
+            : JavaScriptLocalize.javascriptCreateClassIntentionName(classNameToCreate);
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
index 1a425404..90c74e58 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
@@ -26,8 +26,10 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.inspection.localize.InspectionLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.ResolveResult;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 /**
@@ -39,14 +41,14 @@ public class JSDeprecatedSymbolsInspection extends JSInspection {
 
     @Nonnull
     @Override
-    public String getGroupDisplayName() {
-        return "General";
+    public LocalizeValue getGroupDisplayName() {
+        return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
     @Nonnull
     @Override
-    public String getDisplayName() {
-        return JavaScriptLocalize.jsDeprecatedSymbolsInspectionName().get();
+    public LocalizeValue getDisplayName() {
+        return JavaScriptLocalize.jsDeprecatedSymbolsInspectionName();
     }
 
     @Nonnull
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
index 653f65f4..38cd63f8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
@@ -27,6 +27,7 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.inspection.localize.InspectionLocalize;
 import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -35,6 +36,7 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.util.PsiTreeUtil;
 
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 /**
@@ -46,14 +48,14 @@ public class JSDuplicatedDeclarationInspection extends JSInspection {
 
     @Nonnull
     @Override
-    public String getGroupDisplayName() {
-        return "General";
+    public LocalizeValue getGroupDisplayName() {
+        return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
     @Nonnull
     @Override
-    public String getDisplayName() {
-        return JavaScriptLocalize.jsDuplicatedDeclarationInspectionName().get();
+    public LocalizeValue getDisplayName() {
+        return JavaScriptLocalize.jsDuplicatedDeclarationInspectionName();
     }
 
     @Nonnull
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
index eb42a421..1c7d8ce3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
@@ -27,12 +27,14 @@
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.FileModificationService;
 import consulo.language.editor.inspection.*;
+import consulo.language.editor.inspection.localize.InspectionLocalize;
 import consulo.language.psi.PsiDocumentManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 import jakarta.annotation.Nonnull;
@@ -46,14 +48,14 @@ public class JSUndeclaredVariableInspection extends JSInspection {
 
     @Nonnull
     @Override
-    public String getGroupDisplayName() {
-        return "General";
+    public LocalizeValue getGroupDisplayName() {
+        return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
     @Nonnull
     @Override
-    public String getDisplayName() {
-        return JavaScriptLocalize.jsUndeclaredVariableInspectionName().get();
+    public LocalizeValue getDisplayName() {
+        return JavaScriptLocalize.jsUndeclaredVariableInspectionName();
     }
 
     @Nonnull
@@ -136,14 +138,8 @@ private static class DeclareJSVariableIntentionAction implements LocalQuickFix {
 
         @Nonnull
         @Override
-        public String getName() {
-            return JavaScriptLocalize.javascriptDeclareVariableIntentionName(myReferenceExpression.getReferencedName()).get();
-        }
-
-        @Nonnull
-        @Override
-        public String getFamilyName() {
-            return JavaScriptLocalize.javascriptCreateVariableIntentionFamily().get();
+        public LocalizeValue getName() {
+            return JavaScriptLocalize.javascriptDeclareVariableIntentionName(myReferenceExpression.getReferencedName());
         }
 
         @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
index 610b8871..ad97e773 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
@@ -38,6 +38,7 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.inspection.localize.InspectionLocalize;
 import consulo.language.editor.template.Template;
 import consulo.language.editor.template.TemplateManager;
 import consulo.language.psi.PsiElement;
@@ -64,14 +65,14 @@ public class JSUnresolvedFunctionInspection extends JSInspection {
 
     @Nonnull
     @Override
-    public String getGroupDisplayName() {
-        return "General";
+    public LocalizeValue getGroupDisplayName() {
+        return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
     @Nonnull
     @Override
-    public String getDisplayName() {
-        return JavaScriptLocalize.jsUnresolvedFunctionInspectionName().get();
+    public LocalizeValue getDisplayName() {
+        return JavaScriptLocalize.jsUnresolvedFunctionInspectionName();
     }
 
     @Nonnull
@@ -589,14 +590,8 @@ public JSInsertCastFix(String type) {
 
         @Override
         @Nonnull
-        public String getName() {
-            return JavaScriptLocalize.javascriptInsertCastFix().get();
-        }
-
-        @Override
-        @Nonnull
-        public String getFamilyName() {
-            return getName();
+        public LocalizeValue getName() {
+            return JavaScriptLocalize.javascriptInsertCastFix();
         }
 
         @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
index 117ff905..1ce5743a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
@@ -32,6 +32,7 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.editor.inspection.ProblemsHolder;
+import consulo.language.editor.inspection.localize.InspectionLocalize;
 import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
 import consulo.language.editor.template.Template;
 import consulo.language.editor.template.TemplateManager;
@@ -56,14 +57,14 @@ public class JSUntypedDeclarationInspection extends JSInspection {
 
     @Nonnull
     @Override
-    public String getGroupDisplayName() {
-        return "General";
+    public LocalizeValue getGroupDisplayName() {
+        return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
     @Nonnull
     @Override
-    public String getDisplayName() {
-        return JavaScriptLocalize.jsUntypedDeclarationInspectionName().get();
+    public LocalizeValue getDisplayName() {
+        return JavaScriptLocalize.jsUntypedDeclarationInspectionName();
     }
 
     @Nonnull
@@ -129,14 +130,8 @@ private static void process(JSNamedElement node, ProblemsHolder holder) {
     private static class AddTypeToDclFix implements LocalQuickFix {
         @Nonnull
         @Override
-        public String getName() {
-            return JavaScriptLocalize.jsUntypedDeclarationProblemAddtypeFix().get();
-        }
-
-        @Nonnull
-        @Override
-        public String getFamilyName() {
-            return getName();
+        public LocalizeValue getName() {
+            return JavaScriptLocalize.jsUntypedDeclarationProblemAddtypeFix();
         }
 
         @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
index 4ede17ae..d0a2bcc9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
@@ -28,6 +28,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.inspection.*;
+import consulo.language.editor.inspection.localize.InspectionLocalize;
 import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -58,14 +59,14 @@ public class JSUnusedLocalSymbolsInspection extends JSInspection {
 
     @Nonnull
     @Override
-    public String getGroupDisplayName() {
-        return "General";
+    public LocalizeValue getGroupDisplayName() {
+        return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
     @Nonnull
     @Override
-    public String getDisplayName() {
-        return JavaScriptLocalize.jsUnusedLocalSymbolInspectionName().get();
+    public LocalizeValue getDisplayName() {
+        return JavaScriptLocalize.jsUnusedLocalSymbolInspectionName();
     }
 
     @Nonnull
@@ -367,14 +368,8 @@ public HighlightDisplayLevel getDefaultLevel() {
     private static class RemoveElementLocalQuickFix implements LocalQuickFix {
         @Nonnull
         @Override
-        public String getName() {
-            return JavaScriptLocalize.jsUnusedSymbolRemove().get();
-        }
-
-        @Nonnull
-        @Override
-        public String getFamilyName() {
-            return getName();
+        public LocalizeValue getName() {
+            return JavaScriptLocalize.jsUnusedSymbolRemove();
         }
 
         @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
index 9b28068c..5fc6bbad 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
@@ -25,9 +25,9 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.intention.SyntheticIntentionAction;
 import consulo.language.psi.PsiFile;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author Maxim.Mossienko
@@ -40,8 +40,8 @@ public ImplementMethodsFix(JSClass jsClass) {
 
     @Override
     @Nonnull
-    public String getText() {
-        return JavaScriptLocalize.javascriptFixImplementMethods().get();
+    public LocalizeValue getText() {
+        return JavaScriptLocalize.javascriptFixImplementMethods();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index 9d7d6e16..5ee877d3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.lang.javascript.impl.validation;
 
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -1225,8 +1224,8 @@ private void checkPackageStatement(JSPackageStatement packageStatement) {
                 .withFix(new SyntheticIntentionAction() {
                     @Nonnull
                     @Override
-                    public String getText() {
-                        return JavaScriptLocalize.javascriptFixPackageName(expected).get();
+                    public LocalizeValue getText() {
+                        return JavaScriptLocalize.javascriptFixPackageName(expected);
                     }
 
                     @Override
@@ -1287,19 +1286,13 @@ public RemoveASTNodeFix(LocalizeValue prop, ASTNode... astNodes) {
 
         @Override
         @Nonnull
-        public String getText() {
-            return myProp.get();
-        }
-
-        @Override
-        @Nonnull
-        public String getName() {
-            return getText();
+        public LocalizeValue getText() {
+            return myProp;
         }
 
         @Override
         @Nonnull
-        public String getFamilyName() {
+        public LocalizeValue getName() {
             return getText();
         }
 
@@ -1348,8 +1341,8 @@ public AddOverrideIntentionAction(JSFunction node) {
 
         @Override
         @Nonnull
-        public String getText() {
-            return JavaScriptLocalize.javascriptFixAddOverrideModifier().get();
+        public LocalizeValue getText() {
+            return JavaScriptLocalize.javascriptFixAddOverrideModifier();
         }
 
         @Override
@@ -1392,8 +1385,8 @@ public AddSuperInvokationFix(JSReferenceExpression node, JSFunction superConstru
 
         @Override
         @Nonnull
-        public String getText() {
-            return JavaScriptLocalize.javascriptFixCreateInvokeSuper().get();
+        public LocalizeValue getText() {
+            return JavaScriptLocalize.javascriptFixCreateInvokeSuper();
         }
 
         @Override
@@ -1456,8 +1449,8 @@ private static class AddConstructorAndSuperInvokationFix implements SyntheticInt
 
         @Override
         @Nonnull
-        public String getText() {
-            return JavaScriptLocalize.javascriptFixCreateConstructorInvokeSuper().get();
+        public LocalizeValue getText() {
+            return JavaScriptLocalize.javascriptFixCreateConstructorInvokeSuper();
         }
 
         @Override

From 7198126c6fdcc8f751c9c656a954bf553296fcb4 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 10 Oct 2025 11:17:54 +0300
Subject: [PATCH 294/340] Localizing inspections and their fixes (part 4).
 Refactoring.

---
 .../sixrr/inspectjs/InspectionComparator.java |  37 +-
 .../com/sixrr/inspectjs/InspectionJSFix.java  |  67 ++-
 ...ignmentToForLoopParameterJSInspection.java |  83 ++--
 ...gnmentToFunctionParameterJSInspection.java |  46 +-
 ...entWithOperatorAssignmentJSInspection.java | 140 +++---
 .../SillyAssignmentJSInspection.java          |  66 ++-
 .../bitwise/IncompatibleMaskJSInspection.java |  71 ++--
 ...ointlessBitwiseExpressionJSInspection.java |  46 +-
 .../confusing/MagicNumberJSInspection.java    |  23 +-
 ...mplexArithmeticExpressionJSInspection.java | 402 ++++++++----------
 .../JSUnresolvedVariableInspection.java       |  45 +-
 11 files changed, 459 insertions(+), 567 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
index ccd9cfe2..a4893a4e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionComparator.java
@@ -1,19 +1,20 @@
 package com.sixrr.inspectjs;
 
 import consulo.language.editor.inspection.LocalInspectionTool;
+import consulo.localize.LocalizeManager;
+import consulo.localize.LocalizeValue;
 
 import java.util.Comparator;
-
+import java.util.function.BiFunction;
 
 class InspectionComparator implements Comparator<Class<? extends LocalInspectionTool>> {
-    InspectionComparator() {
-        super();
-    }
+    private static final BiFunction<LocalizeManager, String, String> UPPERCASE_STRIP_QUOTES =
+        (localizeManager, string) -> stripQuotes(string.toUpperCase());
 
     @Override
     public int compare(Class<? extends LocalInspectionTool> class1, Class<? extends LocalInspectionTool> class2) {
-        final LocalInspectionTool inspection1;
-        final LocalInspectionTool inspection2;
+        LocalInspectionTool inspection1;
+        LocalInspectionTool inspection2;
         try {
             inspection1 = class1.newInstance();
             inspection2 = class2.newInstance();
@@ -24,18 +25,14 @@ public int compare(Class<? extends LocalInspectionTool> class1, Class<? extends
         catch (IllegalAccessException ignore) {
             return -1;
         }
-        final String groupName1 = inspection1.getGroupDisplayName();
-        final String groupName2 = inspection2.getGroupDisplayName();
-        final int groupNameComparison = groupName1.compareTo(groupName2);
+        LocalizeValue groupName1 = inspection1.getGroupDisplayName();
+        LocalizeValue groupName2 = inspection2.getGroupDisplayName();
+        int groupNameComparison = groupName1.compareTo(groupName2);
         if (groupNameComparison != 0) {
             return groupNameComparison;
         }
-        String displayName1 = inspection1.getDisplayName();
-        String displayName2 = inspection2.getDisplayName();
-        displayName1 = displayName1.toUpperCase();
-        displayName2 = displayName2.toUpperCase();
-        displayName1 = stripQuotes(displayName1);
-        displayName2 = stripQuotes(displayName2);
+        LocalizeValue displayName1 = inspection1.getDisplayName().map(UPPERCASE_STRIP_QUOTES);
+        LocalizeValue displayName2 = inspection2.getDisplayName().map(UPPERCASE_STRIP_QUOTES);
 
         return displayName1.compareTo(displayName2);
     }
@@ -44,14 +41,14 @@ private static String stripQuotes(String str) {
         if (str.indexOf((int)'\'') < 0 && str.indexOf((int)'"') < 0) {
             return str;
         }
-        final int length = str.length();
-        final StringBuffer buffer = new StringBuffer(length);
+        int length = str.length();
+        StringBuilder sb = new StringBuilder(length);
         for (int i = 0; i < length; i++) {
-            final char ch = str.charAt(i);
+            char ch = str.charAt(i);
             if (ch != '"' && ch != '\'') {
-                buffer.append(ch);
+                sb.append(ch);
             }
         }
-        return buffer.toString();
+        return sb.toString();
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
index 41dcf73f..bb629d9a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.language.ast.ASTNode;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -12,23 +13,17 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.logging.Logger;
 import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
 import consulo.virtualFileSystem.ReadonlyStatusHandler;
 import consulo.virtualFileSystem.VirtualFile;
-import org.jetbrains.annotations.NonNls;
 
 import jakarta.annotation.Nonnull;
 
 public abstract class InspectionJSFix implements LocalQuickFix {
-    //to appear in "Apply Fix" statement when multiple Quick Fixes exist
-    @Override
-    @Nonnull
-    public String getFamilyName() {
-        return "";
-    }
-
     @Override
+    @RequiredUIAccess
     public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
-        final PsiElement problemElement = descriptor.getPsiElement();
+        PsiElement problemElement = descriptor.getPsiElement();
         if (problemElement == null || !problemElement.isValid()) {
             return;
         }
@@ -39,9 +34,9 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri
             doFix(project, descriptor);
         }
         catch (IncorrectOperationException e) {
-            final Class<? extends InspectionJSFix> aClass = getClass();
-            final String className = aClass.getName();
-            final Logger logger = Logger.getInstance(className);
+            Class<? extends InspectionJSFix> aClass = getClass();
+            String className = aClass.getName();
+            Logger logger = Logger.getInstance(className);
             logger.error(e);
         }
     }
@@ -50,55 +45,57 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri
 
     protected static void deleteElement(@Nonnull PsiElement element)
         throws IncorrectOperationException {
-        final ASTNode node = element.getNode();
-        final ASTNode parent = element.getParent().getNode();
+        ASTNode node = element.getNode();
+        ASTNode parent = element.getParent().getNode();
         parent.removeChild(node);
     }
 
+    @RequiredWriteAction
     protected static void replaceExpression(JSExpression expression, String newExpression) throws IncorrectOperationException {
-        final ASTNode fromText = JSChangeUtil.createStatementFromText(expression.getProject(), newExpression + ';');
-        final PsiElement element = fromText != null ? fromText.getPsi() : null;
+        ASTNode fromText = JSChangeUtil.createStatementFromText(expression.getProject(), newExpression + ';');
+        PsiElement element = fromText != null ? fromText.getPsi() : null;
 
-        final JSExpressionStatement expressionStatement = element instanceof JSExpressionStatement expr ? expr : null;
+        JSExpressionStatement expressionStatement = element instanceof JSExpressionStatement expr ? expr : null;
         if (expressionStatement == null) {
             return;
         }
-        final JSExpression newExp = expressionStatement.getExpression();
-        final ASTNode newExpressionNode = newExp.getNode();
-        final ASTNode expressionNode = expression.getNode();
-        final PsiElement parent = expression.getParent();
-        final ASTNode parentNode = parent.getNode();
+        JSExpression newExp = expressionStatement.getExpression();
+        ASTNode newExpressionNode = newExp.getNode();
+        ASTNode expressionNode = expression.getNode();
+        PsiElement parent = expression.getParent();
+        ASTNode parentNode = parent.getNode();
         parentNode.replaceChild(expressionNode, newExpressionNode);
         // final CodeStyleManager styleManager = manager.getCodeStyleManager();
         // styleManager.reformat(newExpressionNode.getPsi());
     }
 
-    protected static void replaceStatement(JSStatement statement, @NonNls String newStatement) throws IncorrectOperationException {
-        final ASTNode fromText = JSChangeUtil.createStatementFromText(statement.getProject(), newStatement);
-        final PsiElement element = fromText != null ? fromText.getPsi() : null;
-        final JSStatement newStmt = element instanceof JSStatement ? (JSStatement)element : null;
+    @RequiredWriteAction
+    protected static void replaceStatement(JSStatement statement, String newStatement) throws IncorrectOperationException {
+        ASTNode fromText = JSChangeUtil.createStatementFromText(statement.getProject(), newStatement);
+        PsiElement element = fromText != null ? fromText.getPsi() : null;
+        JSStatement newStmt = element instanceof JSStatement newStmt1 ? newStmt1 : null;
 
         if (newStmt == null) {
             return;
         }
-        final PsiElement parent = statement.getParent();
-        final ASTNode parentNode = parent.getNode();
-        final ASTNode statementNode = statement.getNode();
-        final ASTNode newStatementNode = newStmt.getNode();
+        PsiElement parent = statement.getParent();
+        ASTNode parentNode = parent.getNode();
+        ASTNode statementNode = statement.getNode();
+        ASTNode newStatementNode = newStmt.getNode();
         parentNode.replaceChild(statementNode, newStatementNode);
         // final CodeStyleManager styleManager = manager.getCodeStyleManager();
         // styleManager.reformat(newStatementNode.getPsi());
     }
 
     private static boolean isQuickFixOnReadOnlyFile(PsiElement problemElement) {
-        final PsiFile containingPsiFile = problemElement.getContainingFile();
+        PsiFile containingPsiFile = problemElement.getContainingFile();
         if (containingPsiFile == null) {
             return false;
         }
-        final VirtualFile virtualFile = containingPsiFile.getVirtualFile();
-        final Project project = problemElement.getProject();
-        final ReadonlyStatusHandler handler = ReadonlyStatusHandler.getInstance(project);
-        final ReadonlyStatusHandler.OperationStatus status = handler.ensureFilesWritable(virtualFile);
+        VirtualFile virtualFile = containingPsiFile.getVirtualFile();
+        Project project = problemElement.getProject();
+        ReadonlyStatusHandler handler = ReadonlyStatusHandler.getInstance(project);
+        ReadonlyStatusHandler.OperationStatus status = handler.ensureFilesWritable(virtualFile);
         return status.hasReadonlyFiles();
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
index b9adedf3..ccf261d2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
@@ -9,26 +9,26 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
-import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class AssignmentToForLoopParameterJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.assignmentToForLoopParameterDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.assignmentToForLoopParameterDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.assignmentToForLoopParameterErrorString().get();
     }
@@ -40,26 +40,28 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
+        @RequiredReadAction
         public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
-            final JSExpression rhs = expression.getROperand();
+            JSExpression rhs = expression.getROperand();
             if (rhs == null) {
                 return;
             }
-            final JSExpression lhs = expression.getLOperand();
+            JSExpression lhs = expression.getLOperand();
             checkForForLoopParam(lhs);
             checkForForeachLoopParam(lhs);
         }
 
         @Override
+        @RequiredReadAction
         public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
                 !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
-            final JSExpression operand = expression.getExpression();
+            JSExpression operand = expression.getExpression();
             if (operand == null) {
                 return;
             }
@@ -68,13 +70,14 @@ public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
         }
 
         @Override
+        @RequiredReadAction
         public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
             super.visitJSPostfixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
-            final JSExpression operand = expression.getExpression();
+            JSExpression operand = expression.getExpression();
             if (operand == null) {
                 return;
             }
@@ -82,53 +85,29 @@ public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
             checkForForeachLoopParam(operand);
         }
 
+        @RequiredReadAction
         private void checkForForLoopParam(JSExpression expression) {
-            if (!(expression instanceof JSReferenceExpression)) {
-                return;
-            }
-            final JSReferenceExpression ref = (JSReferenceExpression)expression;
-            final PsiElement element = ref.resolve();
-            if (!(element instanceof JSVariable)) {
-                return;
-            }
-            final JSVariable variable = (JSVariable)element;
-            if (!(variable.getParent() instanceof JSVarStatement)) {
-                return;
+            if (expression instanceof JSReferenceExpression ref
+                && ref.resolve() instanceof JSVariable variable
+                && variable.getParent() instanceof JSVarStatement decl
+                && decl.getParent() instanceof JSForStatement forStmt
+                && isInForStatementBody(expression, forStmt)) {
+                registerError(expression);
             }
-            final JSVarStatement decl = (JSVarStatement)variable.getParent();
-            if (decl == null) {
-                return;
-            }
-            if (!(decl.getParent() instanceof JSForStatement)) {
-                return;
-            }
-            final JSForStatement forStatement = (JSForStatement)decl.getParent();
-            assert forStatement != null;
-            if (!isInForStatementBody(expression, forStatement)) {
-                return;
-            }
-            registerError(expression);
         }
 
+        @RequiredReadAction
         private void checkForForeachLoopParam(JSExpression expression) {
-            if (!(expression instanceof JSReferenceExpression)) {
-                return;
-            }
-            final JSReferenceExpression ref = (JSReferenceExpression)expression;
-            final PsiElement element = ref.resolve();
-            if (!(element instanceof JSVariable)) {
-                return;
-            }
-            final JSVariable parameter = (JSVariable)element;
-            final PsiElement JSVarStatement = parameter.getParent();
-            if (!(JSVarStatement.getParent() instanceof JSForInStatement)) {
-                return;
+            if (expression instanceof JSReferenceExpression ref
+                && ref.resolve() instanceof JSVariable parameter
+                && parameter.getParent().getParent() instanceof JSForInStatement) {
+                registerError(expression);
             }
-            registerError(expression);
         }
 
+        @RequiredReadAction
         private static boolean isInForStatementBody(JSExpression expression, JSForStatement statement) {
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             return PsiTreeUtil.isAncestor(body, expression, true);
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
index 07727a87..09ea81be 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
@@ -9,22 +9,22 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
-import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 @ExtensionImpl
 public class AssignmentToFunctionParameterJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.assignmentToFunctionParameterDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.assignmentToFunctionParameterDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
     @RequiredReadAction
@@ -41,42 +41,46 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpression) {
+        @RequiredReadAction
+        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression jsAssignmentExpression) {
             super.visitJSAssignmentExpression(jsAssignmentExpression);
-            final JSExpression lhs = jsAssignmentExpression.getLOperand();
+            JSExpression lhs = jsAssignmentExpression.getLOperand();
             checkOperand(lhs);
         }
 
         @Override
-        public void visitJSPrefixExpression(JSPrefixExpression expression) {
+        @RequiredReadAction
+        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
-            final JSExpression operand = expression.getExpression();
+            JSExpression operand = expression.getExpression();
             checkOperand(operand);
         }
 
         @Override
-        public void visitJSPostfixExpression(JSPostfixExpression jsPostfixExpression) {
-            super.visitJSPostfixExpression(jsPostfixExpression);
-            final IElementType sign = jsPostfixExpression.getOperationSign();
+        @RequiredReadAction
+        public void visitJSPostfixExpression(@Nonnull JSPostfixExpression postfixExpr) {
+            super.visitJSPostfixExpression(postfixExpr);
+            IElementType sign = postfixExpr.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
-            final JSExpression operand = jsPostfixExpression.getExpression();
+            JSExpression operand = postfixExpr.getExpression();
             checkOperand(operand);
         }
 
+        @RequiredReadAction
         private void checkOperand(JSExpression operand) {
-            if (operand instanceof JSDefinitionExpression definitionExpression
-                && definitionExpression.getExpression() instanceof JSReferenceExpression referenceExpression
-                && referenceExpression.resolve() instanceof JSParameter) {
+            if (operand instanceof JSDefinitionExpression defExpr
+                && defExpr.getExpression() instanceof JSReferenceExpression refExpr
+                && refExpr.resolve() instanceof JSParameter) {
                 registerError(operand);
             }
-            if (operand instanceof JSReferenceExpression referenceExpression
-                && referenceExpression.resolve() instanceof JSParameter) {
+            if (operand instanceof JSReferenceExpression refExpr
+                && refExpr.resolve() instanceof JSParameter) {
                 registerError(operand);
             }
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
index a02c3790..6b41de8d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
@@ -13,48 +13,54 @@
 import com.sixrr.inspectjs.utils.EquivalenceChecker;
 import com.sixrr.inspectjs.utils.SideEffectChecker;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
+import org.intellij.lang.annotations.Pattern;
+
+import java.util.Map;
 
 @ExtensionImpl
 public class ReplaceAssignmentWithOperatorAssignmentJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "AssignmentReplaceableWithOperatorAssignmentJS";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.assignmentReplaceableWithOperatorAssignmentDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.assignmentReplaceableWithOperatorAssignmentDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        String expression = calculateReplacementExpression((JSAssignmentExpression)args[0]);
+        String expression = calculateReplacementExpression((JSAssignmentExpression) args[0]);
         return InspectionJSLocalize.assignmentReplaceableWithOperatorAssignmentErrorString(expression).get();
     }
 
+    @RequiredReadAction
     private static String calculateReplacementExpression(JSAssignmentExpression expression) {
-        final JSBinaryExpression rhs = (JSBinaryExpression) expression.getROperand();
-        final JSExpression lhs = expression.getLOperand();
+        JSBinaryExpression rhs = (JSBinaryExpression) expression.getROperand();
+        JSExpression lhs = expression.getLOperand();
         assert rhs != null;
-        final IElementType sign = rhs.getOperationSign();
-        final JSExpression rhsRhs = rhs.getROperand();
+        IElementType sign = rhs.getOperationSign();
+        JSExpression rhsRhs = rhs.getROperand();
         assert rhsRhs != null;
         String signText = getTextForOperator(sign);
         return lhs.getText() + ' ' + signText + "= " + rhsRhs.getText();
@@ -66,69 +72,67 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     @Override
+    @RequiredReadAction
     public InspectionJSFix buildFix(PsiElement location, Object state) {
         return new ReplaceAssignmentWithOperatorAssignmentFix((JSAssignmentExpression) location);
     }
 
     private static class ReplaceAssignmentWithOperatorAssignmentFix extends InspectionJSFix {
-        private final String m_name;
+        @Nonnull
+        private final LocalizeValue myName;
 
+        @RequiredReadAction
         private ReplaceAssignmentWithOperatorAssignmentFix(JSAssignmentExpression expression) {
             super();
-            final JSBinaryExpression rhs = (JSBinaryExpression) expression.getROperand();
+            JSBinaryExpression rhs = (JSBinaryExpression) expression.getROperand();
             assert rhs != null;
-            final IElementType sign = rhs.getOperationSign();
+            IElementType sign = rhs.getOperationSign();
             String signText = getTextForOperator(sign);
-            m_name = InspectionJSLocalize.replaceWithOperatorAssignFix(signText).get();
+            myName = InspectionJSLocalize.replaceWithOperatorAssignFix(signText);
         }
 
-        @Override
         @Nonnull
-        public String getName() {
-            return m_name;
+        @Override
+        public LocalizeValue getName() {
+            return myName;
         }
 
         @Override
+        @RequiredWriteAction
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSAssignmentExpression expression = (JSAssignmentExpression) descriptor.getPsiElement();
-            final String newExpression = calculateReplacementExpression(expression);
+            JSAssignmentExpression expression = (JSAssignmentExpression) descriptor.getPsiElement();
+            String newExpression = calculateReplacementExpression(expression);
             replaceExpression(expression, newExpression);
         }
     }
 
     private static class ReplaceAssignmentWithOperatorAssignmentVisitor extends BaseInspectionVisitor {
         @Override
+        @RequiredReadAction
         public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
 
-            final IElementType sign = assignment.getOperationSign();
+            IElementType sign = assignment.getOperationSign();
             if (!JSTokenTypes.EQ.equals(sign)) {
                 return;
             }
             JSExpression lhs = assignment.getLOperand();
-            final JSExpression rhs = assignment.getROperand();
-            if (rhs == null || lhs == null) {
-                return;
-            }
-            if (!(rhs instanceof JSBinaryExpression)) {
+            if (lhs == null) {
                 return;
             }
-            final JSBinaryExpression binaryRhs = (JSBinaryExpression) rhs;
-            if (!(binaryRhs.getROperand() != null)) {
+            if (!(assignment.getROperand() instanceof JSBinaryExpression binaryRhs && binaryRhs.getROperand() != null)) {
                 return;
             }
             IElementType operationSign = binaryRhs.getOperationSign();
-            if (operationSign == JSTokenTypes.ANDAND ||
-                operationSign == JSTokenTypes.OROR) {
+            if (operationSign == JSTokenTypes.ANDAND || operationSign == JSTokenTypes.OROR) {
                 return;
             }
-            final JSExpression lOperand = binaryRhs.getLOperand();
+            JSExpression lOperand = binaryRhs.getLOperand();
             if (SideEffectChecker.mayHaveSideEffects(lhs)) {
                 return;
             }
-            if(lhs instanceof JSDefinitionExpression)
-            {
-                lhs = ((JSDefinitionExpression)lhs).getExpression();
+            if (lhs instanceof JSDefinitionExpression defExpr) {
+                lhs = defExpr.getExpression();
             }
             if (!EquivalenceChecker.expressionsAreEquivalent(lhs, lOperand)) {
                 return;
@@ -137,50 +141,24 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignme
         }
     }
 
-    @NonNls
+    private static final Map<IElementType, String> TEXT_FOR_OPERATOR = Map.ofEntries(
+        Map.entry(JSTokenTypes.PLUS, "+"),
+        Map.entry(JSTokenTypes.MINUS, "-"),
+        Map.entry(JSTokenTypes.MULT, "*"),
+        Map.entry(JSTokenTypes.DIV, "/"),
+        Map.entry(JSTokenTypes.PERC, "%"),
+        Map.entry(JSTokenTypes.XOR, "^"),
+        Map.entry(JSTokenTypes.ANDAND, "&&"),
+        Map.entry(JSTokenTypes.OROR, "||"),
+        Map.entry(JSTokenTypes.AND, "&"),
+        Map.entry(JSTokenTypes.OR, "|"),
+        Map.entry(JSTokenTypes.LTLT, "<<"),
+        Map.entry(JSTokenTypes.LTLTEQ, "<<="),
+        Map.entry(JSTokenTypes.GTGT, ">>"),
+        Map.entry(JSTokenTypes.GTGTGT, ">>>")
+    );
+
     private static String getTextForOperator(IElementType operator) {
-        if (JSTokenTypes.PLUS.equals(operator)) {
-            return "+";
-        }
-        if (JSTokenTypes.MINUS.equals(operator)) {
-            return "-";
-        }
-        if (JSTokenTypes.MULT.equals(operator)) {
-            return "*";
-        }
-        if (JSTokenTypes.DIV.equals(operator)) {
-            return "/";
-        }
-        if (JSTokenTypes.PERC.equals(operator)) {
-            return "%";
-        }
-        if (JSTokenTypes.XOR.equals(operator)) {
-            return "^";
-        }
-        if (JSTokenTypes.ANDAND.equals(operator)) {
-            return "&&";
-        }
-        if (JSTokenTypes.OROR.equals(operator)) {
-            return "||";
-        }
-        if (JSTokenTypes.AND.equals(operator)) {
-            return "&";
-        }
-        if (JSTokenTypes.OR.equals(operator)) {
-            return "|";
-        }
-        if (JSTokenTypes.LTLT.equals(operator)) {
-            return "<<";
-        }
-        if (JSTokenTypes.LTLTEQ.equals(operator)) {
-            return "<<=";
-        }
-        if (JSTokenTypes.GTGT.equals(operator)) {
-            return ">>";
-        }
-        if (JSTokenTypes.GTGTGT.equals(operator)) {
-            return ">>>";
-        }
-        return "unknown";
+        return TEXT_FOR_OPERATOR.getOrDefault(operator, "unknown");
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
index b5e60b18..52065941 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
@@ -14,24 +14,25 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class SillyAssignmentJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.sillyAssignmentDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.sillyAssignmentDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.ASSIGNMENT_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @RequiredReadAction
     @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.sillyAssignmentErrorString().get();
     }
@@ -48,60 +49,49 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
+        @RequiredReadAction
         public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
 
-            final IElementType sign = assignment.getOperationSign();
+            IElementType sign = assignment.getOperationSign();
             if (!JSTokenTypes.EQ.equals(sign)) {
                 return;
             }
             JSExpression lhs = assignment.getLOperand();
-            if(lhs instanceof JSDefinitionExpression)
-            {
-                lhs = ((JSDefinitionExpression)lhs).getExpression();
+            if (lhs instanceof JSDefinitionExpression lhsDef) {
+                lhs = lhsDef.getExpression();
             }
-            final JSExpression rhs = assignment.getROperand();
-            if(rhs == null || lhs == null)
-            {
+            JSExpression rhs = assignment.getROperand();
+            if (rhs == null || lhs == null) {
                 return;
             }
-            if(!(rhs instanceof JSReferenceExpression) ||
-                    !(lhs instanceof JSReferenceExpression) )
-            {
+            if (!(rhs instanceof JSReferenceExpression rhsRef && lhs instanceof JSReferenceExpression lhsRef)) {
                 return;
             }
-            final JSReferenceExpression rhsReference = (JSReferenceExpression) rhs;
-            final JSReferenceExpression lhsReference = (JSReferenceExpression) lhs;
-            final JSExpression rhsQualifier = rhsReference.getQualifier();
-            final JSExpression lhsQualifier = lhsReference.getQualifier();
-            if(rhsQualifier !=null || lhsQualifier !=null)
-            {
-                if(!EquivalenceChecker.expressionsAreEquivalent(rhsQualifier, lhsQualifier))
-                {
+            JSExpression rhsQualifier = rhsRef.getQualifier();
+            JSExpression lhsQualifier = lhsRef.getQualifier();
+            if (rhsQualifier != null || lhsQualifier != null) {
+                if (!EquivalenceChecker.expressionsAreEquivalent(rhsQualifier, lhsQualifier)) {
                     return;
                 }
             }
-            final String rhsName = rhsReference.getReferencedName();
-            final String lhsName = lhsReference.getReferencedName();
-            if(rhsName == null || lhsName == null)
-            {
+            String rhsName = rhsRef.getReferencedName();
+            String lhsName = lhsRef.getReferencedName();
+            if (rhsName == null || lhsName == null) {
                 return;
             }
-            if(!rhsName.equals(lhsName))
-            {
+            if (!rhsName.equals(lhsName)) {
                 return;
             }
-            final PsiElement rhsReferent = rhsReference.resolve();
-            final PsiElement lhsReferent = lhsReference.resolve();
-            if(rhsReferent != null && lhsReferent != null &&
-                    !rhsReferent.equals(lhsReferent))
-            {
+            PsiElement rhsReferent = rhsRef.resolve();
+            PsiElement lhsReferent = lhsRef.resolve();
+            if (rhsReferent != null && lhsReferent != null && !rhsReferent.equals(lhsReferent)) {
                 return;
             }
 
             if (lhsName.equals("location") && lhsQualifier != null && lhsQualifier.getText().equals("document")) {
-              // document.location = document.location causes browser refresh
-              return;
+                // document.location = document.location causes browser refresh
+                return;
             }
             registerError(assignment);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
index 4c1d36a8..ab4fbdc1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
@@ -13,34 +13,37 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
+import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class IncompatibleMaskJSInspection extends JavaScriptInspection {
-    @Override
     @Nonnull
+    @Override
+    @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "IncompatibleBitwiseMaskOperation";
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.incompatibleMaskOperationDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.incompatibleMaskOperationDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BITWISE_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression)args[0];
-        final IElementType tokenType = binaryExpression.getOperationSign();
+        JSBinaryExpression binaryExpression = (JSBinaryExpression) args[0];
+        IElementType tokenType = binaryExpression.getOperationSign();
         if (JSTokenTypes.EQEQ.equals(tokenType)) {
             return InspectionJSLocalize.incompatibleMaskOperationProblemDescriptorAlwaysFalse().get();
         }
@@ -61,59 +64,59 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class IncompatibleMaskVisitor extends BaseInspectionVisitor {
         @Override
+        @RequiredReadAction
         public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
-            final JSExpression rhs = expression.getROperand();
+            JSExpression rhs = expression.getROperand();
             if (!ComparisonUtils.isEqualityComparison(expression)) {
                 return;
             }
-            final JSExpression strippedRhs = ParenthesesUtils.stripParentheses(rhs);
+            JSExpression strippedRhs = ParenthesesUtils.stripParentheses(rhs);
             if (strippedRhs == null) {
                 return;
             }
-            final JSExpression lhs = expression.getLOperand();
-            final JSExpression strippedLhs = ParenthesesUtils.stripParentheses(lhs);
+            JSExpression lhs = expression.getLOperand();
+            JSExpression strippedLhs = ParenthesesUtils.stripParentheses(lhs);
             if (strippedLhs == null) {
                 return;
             }
             if (isConstantMask(strippedLhs) && ExpressionUtil.isConstantExpression(strippedRhs)) {
-                if (isIncompatibleMask((JSBinaryExpression)strippedLhs, strippedRhs)) {
+                if (isIncompatibleMask((JSBinaryExpression) strippedLhs, strippedRhs)) {
                     registerError(expression, expression);
                 }
             }
             else if (isConstantMask(strippedRhs) && ExpressionUtil.isConstantExpression(strippedLhs)) {
-                if (isIncompatibleMask((JSBinaryExpression)strippedRhs, strippedLhs)) {
+                if (isIncompatibleMask((JSBinaryExpression) strippedRhs, strippedLhs)) {
                     registerError(expression, expression);
                 }
             }
         }
 
+        @RequiredReadAction
         private static boolean isIncompatibleMask(JSBinaryExpression maskExpression, JSExpression constantExpression) {
-            final IElementType tokenType = maskExpression.getOperationSign();
-            final Object constantValue = ExpressionUtil.computeConstantExpression(constantExpression);
+            IElementType tokenType = maskExpression.getOperationSign();
+            Object constantValue = ExpressionUtil.computeConstantExpression(constantExpression);
             if (!(constantValue instanceof Integer)) {
                 return false;
             }
-            final int constantLongValue = (Integer)constantValue;
-            final JSExpression maskRhs = maskExpression.getROperand();
-            final JSExpression maskLhs = maskExpression.getLOperand();
-            final int constantMaskValue;
+            int constantLongValue = (Integer) constantValue;
+            JSExpression maskRhs = maskExpression.getROperand();
+            JSExpression maskLhs = maskExpression.getLOperand();
+            int constantMaskValue;
             if (ExpressionUtil.isConstantExpression(maskRhs)) {
-                final Object rhsValue =
-                    ExpressionUtil.computeConstantExpression(maskRhs);
+                Object rhsValue = ExpressionUtil.computeConstantExpression(maskRhs);
                 if (!(rhsValue instanceof Integer)) {
                     return false; // Might indeed be the case with "null" literal
                     // whoes constant value evaluates to null. Check out (a|null) case.
                 }
-                constantMaskValue = (Integer)rhsValue;
+                constantMaskValue = (Integer) rhsValue;
             }
             else {
-                final Object lhsValue =
-                    ExpressionUtil.computeConstantExpression(maskLhs);
+                Object lhsValue = ExpressionUtil.computeConstantExpression(maskLhs);
                 if (!(lhsValue instanceof Integer)) {
                     return false;
                 }
-                constantMaskValue = (Integer)lhsValue;
+                constantMaskValue = (Integer) lhsValue;
             }
 
             if (JSTokenTypes.OR.equals(tokenType)) {
@@ -129,23 +132,23 @@ private static boolean isIncompatibleMask(JSBinaryExpression maskExpression, JSE
             return false;
         }
 
+        @RequiredReadAction
         private static boolean isConstantMask(JSExpression expression) {
             if (expression == null) {
                 return false;
             }
-            if (!(expression instanceof JSBinaryExpression)) {
+            if (!(expression instanceof JSBinaryExpression binaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
-            final IElementType tokenType = binaryExpression.getOperationSign();
+            IElementType tokenType = binaryExpression.getOperationSign();
             if (!JSTokenTypes.OR.equals(tokenType) && !JSTokenTypes.AND.equals(tokenType)) {
                 return false;
             }
-            final JSExpression rhs = binaryExpression.getROperand();
+            JSExpression rhs = binaryExpression.getROperand();
             if (ExpressionUtil.isConstantExpression(rhs)) {
                 return true;
             }
-            final JSExpression lhs = binaryExpression.getLOperand();
+            JSExpression lhs = binaryExpression.getLOperand();
             return ExpressionUtil.isConstantExpression(lhs);
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index b7f817af..0a7b7f08 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -17,42 +17,40 @@
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
-import java.util.HashSet;
 import java.util.Set;
 
 @ExtensionImpl
 public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection {
-    static final Set<IElementType> bitwiseTokens = new HashSet<>(6);
-
-    static {
-        bitwiseTokens.add(JSTokenTypes.AND);
-        bitwiseTokens.add(JSTokenTypes.OR);
-        bitwiseTokens.add(JSTokenTypes.XOR);
-        bitwiseTokens.add(JSTokenTypes.LTLT);
-        bitwiseTokens.add(JSTokenTypes.GTGT);
-        bitwiseTokens.add(JSTokenTypes.GTGTGT);
-    }
+    static final Set<IElementType> OUR_BITWISE_TOKENS = Set.of(
+        JSTokenTypes.AND,
+        JSTokenTypes.OR,
+        JSTokenTypes.XOR,
+        JSTokenTypes.LTLT,
+        JSTokenTypes.GTGT,
+        JSTokenTypes.GTGTGT
+    );
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.pointlessBitwiseExpressionDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.pointlessBitwiseExpressionDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.BITWISE_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        final String replacementExpression =
+        String replacementExpression =
             calculateReplacementExpression((JSExpression)args[0], (PointlessBitwiseExpressionJSInspectionState)state);
         return InspectionJSLocalize.pointlessBitwiseExpressionProblemDescriptor(replacementExpression).get();
     }
@@ -132,10 +130,10 @@ public PointlessBitwiseFix(Object state) {
             myState = (PointlessBitwiseExpressionJSInspectionState)state;
         }
 
-        @Override
         @Nonnull
-        public String getName() {
-            return InspectionJSLocalize.pointlessBitwiseExpressionSimplifyQuickfix().get();
+        @Override
+        public LocalizeValue getName() {
+            return InspectionJSLocalize.pointlessBitwiseExpressionSimplifyQuickfix();
         }
 
         @Override
@@ -153,7 +151,7 @@ private class PointlessBitwiseVisitor extends BaseInspectionVisitor<PointlessBit
         public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             final IElementType sign = expression.getOperationSign();
-            if (!bitwiseTokens.contains(sign)) {
+            if (!OUR_BITWISE_TOKENS.contains(sign)) {
                 return;
             }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index a3950054..22df8b9e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -10,15 +10,14 @@
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.Set;
 
 @ExtensionImpl
 public class MagicNumberJSInspection extends JavaScriptInspection {
-    @NonNls
-    private static final Set<String> s_specialCaseLiterals = Set.of(
+    private static final Set<String> OUR_SPECIAL_CASE_LITERALS = Set.of(
         "0", "1", "2", "3", "4",
         "5", "6", "7", "8", "9",
         "10", "0L", "1L", "2L", "0l",
@@ -31,27 +30,27 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Override
     @Nonnull
-    public String getDisplayName() {
-        return InspectionJSLocalize.magicNumberDisplayName().get();
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.magicNumberDisplayName();
     }
 
-    @Override
     @Nonnull
-    public String getGroupDisplayName() {
-        return JSGroupNames.CONFUSING_GROUP_NAME.get();
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @RequiredReadAction
-    @Override
     @Nonnull
+    @Override
+    @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.magicNumberProblemDescriptor().get();
     }
 
     static boolean isSpecialCaseLiteral(String text) {
-        return s_specialCaseLiterals.contains(text);
+        return OUR_SPECIAL_CASE_LITERALS.contains(text);
     }
 
     @Override
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
index e511953e..37ca2a37 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
@@ -11,231 +11,189 @@
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
-import java.util.HashSet;
 import java.util.Set;
 
 @ExtensionImpl
-public class OverlyComplexArithmeticExpressionJSInspection extends JavaScriptInspection
-{
-	@Override
-	@Nonnull
-	public String getDisplayName()
-	{
-		return InspectionJSLocalize.overlyComplexArithmeticExpressionDisplayName().get();
-	}
-
-	@Override
-	@Nonnull
-	public String getGroupDisplayName()
-	{
-		return JSGroupNames.CONFUSING_GROUP_NAME.get();
-	}
-
-	@Nonnull
-	@Override
-	public InspectionToolState<?> createStateProvider()
-	{
-		return new OverlyComplexArithmeticExpressionJSInspectionState();
-	}
-
-	@RequiredReadAction
-	@Override
-	protected String buildErrorString(Object state, Object... args)
-	{
-		return InspectionJSLocalize.overlyComplexArithmeticExpressionErrorString().get();
-	}
-
-	@Override
-	public BaseInspectionVisitor buildVisitor()
-	{
-		return new Visitor();
-	}
-
-	private class Visitor extends BaseInspectionVisitor<OverlyComplexArithmeticExpressionJSInspectionState>
-	{
-		private final Set<IElementType> arithmeticTokens = new HashSet<>(5);
-
-		public Visitor()
-		{
-			arithmeticTokens.add(JSTokenTypes.PLUS);
-			arithmeticTokens.add(JSTokenTypes.MINUS);
-			arithmeticTokens.add(JSTokenTypes.MULT);
-			arithmeticTokens.add(JSTokenTypes.DIV);
-			arithmeticTokens.add(JSTokenTypes.PERC);
-		}
-
-		@Override
-		public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression)
-		{
-			super.visitJSBinaryExpression(expression);
-			checkExpression(expression);
-		}
-
-		@Override
-		public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression)
-		{
-			super.visitJSPrefixExpression(expression);
-			checkExpression(expression);
-		}
-
-		@Override
-		public void visitJSParenthesizedExpression(JSParenthesizedExpression expression)
-		{
-			super.visitJSParenthesizedExpression(expression);
-			checkExpression(expression);
-		}
-
-		private void checkExpression(JSExpression expression)
-		{
-			if(isParentArithmetic(expression))
-			{
-				return;
-			}
-			if(!isArithmetic(expression))
-			{
-				return;
-			}
-			if(containsStringConcatenation(expression))
-			{
-				return;
-			}
-			final int numTerms = countTerms(expression);
-			if(numTerms <= myState.m_limit)
-			{
-				return;
-			}
-			registerError(expression);
-		}
-
-		private int countTerms(JSExpression expression)
-		{
-			if(expression == null)
-			{
-				return 0;
-			}
-			if(!isArithmetic(expression))
-			{
-				return 1;
-			}
-			if(expression instanceof JSBinaryExpression)
-			{
-				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-				final JSExpression lhs = binaryExpression.getLOperand();
-				final JSExpression rhs = binaryExpression.getROperand();
-				return countTerms(lhs) + countTerms(rhs);
-			}
-			else if(expression instanceof JSPrefixExpression)
-			{
-				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-				final JSExpression operand = prefixExpression.getExpression();
-				return countTerms(operand);
-			}
-			else if(expression instanceof JSParenthesizedExpression)
-			{
-				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-				final JSExpression contents = parenthesizedExpression.getInnerExpression();
-				return countTerms(contents);
-			}
-			return 1;
-		}
-
-		private boolean isParentArithmetic(JSExpression expression)
-		{
-			final PsiElement parent = expression.getParent();
-			if(!(parent instanceof JSExpression))
-			{
-				return false;
-			}
-			return isArithmetic((JSExpression) parent);
-		}
-
-		private boolean isArithmetic(JSExpression expression)
-		{
-			if(expression instanceof JSBinaryExpression)
-			{
-
-				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-				final IElementType sign = binaryExpression.getOperationSign();
-				return arithmeticTokens.contains(sign);
-			}
-			else if(expression instanceof JSPrefixExpression)
-			{
-				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-				final IElementType sign = prefixExpression.getOperationSign();
-				return arithmeticTokens.contains(sign);
-			}
-			else if(expression instanceof JSParenthesizedExpression)
-			{
-				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-				final JSExpression contents = parenthesizedExpression.getInnerExpression();
-				return isArithmetic(contents);
-			}
-			return false;
-		}
-
-		private boolean containsStringConcatenation(JSExpression expression)
-		{
-			if(isStringLiteral(expression))
-			{
-				return true;
-			}
-			if(expression instanceof JSBinaryExpression)
-			{
-
-				final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-				final JSExpression lhs = binaryExpression.getLOperand();
-
-				if(containsStringConcatenation(lhs))
-				{
-					return true;
-				}
-				final JSExpression rhs = binaryExpression.getROperand();
-				return containsStringConcatenation(rhs);
-			}
-			else if(expression instanceof JSPrefixExpression)
-			{
-				final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-				final IElementType sign = prefixExpression.getOperationSign();
-				return arithmeticTokens.contains(sign);
-			}
-			else if(expression instanceof JSParenthesizedExpression)
-			{
-				final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-				final JSExpression contents = parenthesizedExpression.getInnerExpression();
-				return containsStringConcatenation(contents);
-			}
-			return false;
-		}
-
-		private boolean isStringLiteral(JSExpression expression)
-		{
-			if(expression instanceof JSLiteralExpression)
-			{
-				final JSLiteralExpression literal = (JSLiteralExpression) expression;
-				final String text = literal.getText();
-				return text.startsWith("'") || text.startsWith("\"");
-			}
-			if(expression instanceof JSReferenceExpression)
-			{
-				final JSReferenceExpression reference = (JSReferenceExpression) expression;
-				final PsiElement referent = reference.resolve();
-				if(referent instanceof JSVariable)
-				{
-					final JSVariable variable = (JSVariable) referent;
-					if(variable.isConst())
-					{
-						final JSExpression initializer = variable.getInitializer();
-						if(initializer != null)
-						{
-							final String text = initializer.getText();
-							return text.startsWith("'") || text.startsWith("\"");
-						}
-					}
-				}
-			}
-			return false;
-		}
-	}
+public class OverlyComplexArithmeticExpressionJSInspection extends JavaScriptInspection {
+    protected static final Set<IElementType> OUR_ARITHMETIC_TOKENS = Set.of(
+        JSTokenTypes.PLUS,
+        JSTokenTypes.MINUS,
+        JSTokenTypes.MULT,
+        JSTokenTypes.DIV,
+        JSTokenTypes.PERC
+    );
+
+    @Nonnull
+    @Override
+    public LocalizeValue getDisplayName() {
+        return InspectionJSLocalize.overlyComplexArithmeticExpressionDisplayName();
+    }
+
+    @Nonnull
+    @Override
+    public LocalizeValue getGroupDisplayName() {
+        return JSGroupNames.CONFUSING_GROUP_NAME;
+    }
+
+    @Nonnull
+    @Override
+    public InspectionToolState<?> createStateProvider() {
+        return new OverlyComplexArithmeticExpressionJSInspectionState();
+    }
+
+    @Override
+    @RequiredReadAction
+    protected String buildErrorString(Object state, Object... args) {
+        return InspectionJSLocalize.overlyComplexArithmeticExpressionErrorString().get();
+    }
+
+    @Override
+    public BaseInspectionVisitor buildVisitor() {
+        return new Visitor();
+    }
+
+    private class Visitor extends BaseInspectionVisitor<OverlyComplexArithmeticExpressionJSInspectionState> {
+        @Override
+        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+            super.visitJSBinaryExpression(expression);
+            checkExpression(expression);
+        }
+
+        @Override
+        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+            super.visitJSPrefixExpression(expression);
+            checkExpression(expression);
+        }
+
+        @Override
+        public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
+            super.visitJSParenthesizedExpression(expression);
+            checkExpression(expression);
+        }
+
+        private void checkExpression(JSExpression expression) {
+            if (isParentArithmetic(expression)) {
+                return;
+            }
+            if (!isArithmetic(expression)) {
+                return;
+            }
+            if (containsStringConcatenation(expression)) {
+                return;
+            }
+            final int numTerms = countTerms(expression);
+            if (numTerms <= myState.m_limit) {
+                return;
+            }
+            registerError(expression);
+        }
+
+        private int countTerms(JSExpression expression) {
+            if (expression == null) {
+                return 0;
+            }
+            if (!isArithmetic(expression)) {
+                return 1;
+            }
+            if (expression instanceof JSBinaryExpression) {
+                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+                final JSExpression lhs = binaryExpression.getLOperand();
+                final JSExpression rhs = binaryExpression.getROperand();
+                return countTerms(lhs) + countTerms(rhs);
+            }
+            else if (expression instanceof JSPrefixExpression) {
+                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+                final JSExpression operand = prefixExpression.getExpression();
+                return countTerms(operand);
+            }
+            else if (expression instanceof JSParenthesizedExpression) {
+                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+                final JSExpression contents = parenthesizedExpression.getInnerExpression();
+                return countTerms(contents);
+            }
+            return 1;
+        }
+
+        private boolean isParentArithmetic(JSExpression expression) {
+            final PsiElement parent = expression.getParent();
+            if (!(parent instanceof JSExpression)) {
+                return false;
+            }
+            return isArithmetic((JSExpression) parent);
+        }
+
+        private boolean isArithmetic(JSExpression expression) {
+            if (expression instanceof JSBinaryExpression) {
+
+                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+                final IElementType sign = binaryExpression.getOperationSign();
+                return OUR_ARITHMETIC_TOKENS.contains(sign);
+            }
+            else if (expression instanceof JSPrefixExpression) {
+                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+                final IElementType sign = prefixExpression.getOperationSign();
+                return OUR_ARITHMETIC_TOKENS.contains(sign);
+            }
+            else if (expression instanceof JSParenthesizedExpression) {
+                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+                final JSExpression contents = parenthesizedExpression.getInnerExpression();
+                return isArithmetic(contents);
+            }
+            return false;
+        }
+
+        private boolean containsStringConcatenation(JSExpression expression) {
+            if (isStringLiteral(expression)) {
+                return true;
+            }
+            if (expression instanceof JSBinaryExpression) {
+
+                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+                final JSExpression lhs = binaryExpression.getLOperand();
+
+                if (containsStringConcatenation(lhs)) {
+                    return true;
+                }
+                final JSExpression rhs = binaryExpression.getROperand();
+                return containsStringConcatenation(rhs);
+            }
+            else if (expression instanceof JSPrefixExpression) {
+                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+                final IElementType sign = prefixExpression.getOperationSign();
+                return OUR_ARITHMETIC_TOKENS.contains(sign);
+            }
+            else if (expression instanceof JSParenthesizedExpression) {
+                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+                final JSExpression contents = parenthesizedExpression.getInnerExpression();
+                return containsStringConcatenation(contents);
+            }
+            return false;
+        }
+
+        private boolean isStringLiteral(JSExpression expression) {
+            if (expression instanceof JSLiteralExpression) {
+                final JSLiteralExpression literal = (JSLiteralExpression) expression;
+                final String text = literal.getText();
+                return text.startsWith("'") || text.startsWith("\"");
+            }
+            if (expression instanceof JSReferenceExpression) {
+                final JSReferenceExpression reference = (JSReferenceExpression) expression;
+                final PsiElement referent = reference.resolve();
+                if (referent instanceof JSVariable) {
+                    final JSVariable variable = (JSVariable) referent;
+                    if (variable.isConst()) {
+                        final JSExpression initializer = variable.getInitializer();
+                        if (initializer != null) {
+                            final String text = initializer.getText();
+                            return text.startsWith("'") || text.startsWith("\"");
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
index 1fb617f2..56c6bedf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.lang.javascript.impl.inspections;
 
 import com.intellij.lang.javascript.JavaScriptSupportLoader;
@@ -37,6 +36,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
 import jakarta.annotation.Nonnull;
 
@@ -53,14 +53,14 @@ public class JSUnresolvedVariableInspection extends JSInspection {
 
     @Nonnull
     @Override
-    public String getGroupDisplayName() {
-        return "General";
+    public LocalizeValue getGroupDisplayName() {
+        return LocalizeValue.localizeTODO("General");
     }
 
     @Nonnull
     @Override
-    public String getDisplayName() {
-        return JavaScriptLocalize.jsUnresolvedVariableInspectionName().get();
+    public LocalizeValue getDisplayName() {
+        return JavaScriptLocalize.jsUnresolvedVariableInspectionName();
     }
 
     @Nonnull
@@ -244,12 +244,6 @@ private abstract static class BaseCreateJSVariableIntentionAction extends BaseCr
         BaseCreateJSVariableIntentionAction(String referencedName) {
             myReferencedName = referencedName;
         }
-
-        @Override
-        @Nonnull
-        public String getFamilyName() {
-            return JavaScriptLocalize.javascriptCreateVariableIntentionFamily().get();
-        }
     }
 
     private static class CreateJSNamespaceIntentionAction extends BaseCreateJSVariableIntentionAction {
@@ -257,14 +251,14 @@ private static class CreateJSNamespaceIntentionAction extends BaseCreateJSVariab
             super(referencedName);
         }
 
-        @Override
         @Nonnull
-        public String getName() {
-            return JavaScriptLocalize.javascriptCreateNamespaceIntentionName(myReferencedName).get();
+        @Override
+        public LocalizeValue getName() {
+            return JavaScriptLocalize.javascriptCreateNamespaceIntentionName(myReferencedName);
         }
 
-        @RequiredReadAction
         @Override
+        @RequiredReadAction
         protected void buildTemplate(
             Template template,
             JSReferenceExpression referenceExpression,
@@ -291,20 +285,20 @@ private static class CreateJSVariableIntentionAction extends BaseCreateJSVariabl
             this.isConstant = isConstant;
         }
 
-        @Override
         @Nonnull
-        public String getName() {
+        @Override
+        public LocalizeValue getName() {
             return isField
                 ? isConstant
-                ? JavaScriptLocalize.javascriptCreateConstantFieldIntentionName(myReferencedName).get()
-                : JavaScriptLocalize.javascriptCreatePropertyIntentionName(myReferencedName).get()
+                ? JavaScriptLocalize.javascriptCreateConstantFieldIntentionName(myReferencedName)
+                : JavaScriptLocalize.javascriptCreatePropertyIntentionName(myReferencedName)
                 : isConstant
-                ? JavaScriptLocalize.javascriptCreateConstantIntentionName(myReferencedName).get()
-                : JavaScriptLocalize.javascriptCreateVariableIntentionName(myReferencedName).get();
+                ? JavaScriptLocalize.javascriptCreateConstantIntentionName(myReferencedName)
+                : JavaScriptLocalize.javascriptCreateVariableIntentionName(myReferencedName);
         }
 
-        @RequiredReadAction
         @Override
+        @RequiredReadAction
         protected void buildTemplate(
             Template template,
             JSReferenceExpression referenceExpression,
@@ -322,12 +316,7 @@ protected void buildTemplate(
 
             template.addTextSegment(classFeature ? referenceExpression.getReferencedName() : referenceExpression.getText());
             template.addEndVariable();
-            if (classFeature) {
-                template.addTextSegment(":");
-            }
-            else {
-                template.addTextSegment(" = ");
-            }
+            template.addTextSegment(classFeature ? ":" : " = ");
 
             if (classFeature) {
                 guessTypeAndAddTemplateVariable(template, referenceExpression, file);

From 1b40fdb0b1e39215b32845eed9efd41167df3d7e Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 10 Oct 2025 12:28:26 +0300
Subject: [PATCH 295/340] Localizing intentions.

---
 .../TextLabelInSwitchStatementJSInspection.java    |  4 ++--
 .../IncrementDecrementResultUsedJSInspection.java  |  2 +-
 .../lang/javascript/intention/JSIntention.java     |  3 ++-
 .../intention/JSMutablyNamedIntention.java         |  8 ++++----
 .../comment/JSChangeToCStyleCommentIntention.java  |  5 +++--
 .../JSChangeToEndOfLineCommentIntention.java       |  5 +++--
 .../JSMoveCommentToSeparateLineIntention.java      |  5 +++--
 .../conditional/JSFlipConditionalIntention.java    |  5 +++--
 .../intention/conditional/JSFlipIfIntention.java   |  5 +++--
 .../conditional/JSRemoveConditionalIntention.java  |  5 +++--
 .../JSReplaceConditionalWithIfIntention.java       |  5 +++--
 .../constant/JSConstantExpressionIntention.java    |  5 +++--
 ...MergeDeclarationAndInitializationIntention.java |  5 +++--
 ...SplitDeclarationAndInitializationIntention.java |  5 +++--
 .../loop/JSMergeParallelForInLoopsIntention.java   |  5 +++--
 .../loop/JSMergeParallelForLoopsIntention.java     |  5 +++--
 .../number/JSConvertIntegerToDecimalIntention.java |  5 +++--
 .../number/JSConvertIntegerToHexIntention.java     |  5 +++--
 .../number/JSConvertIntegerToOctalIntention.java   |  5 +++--
 .../JSRemoveUnnecessaryParenthesesIntention.java   |  5 +++--
 .../JSDoubleToSingleQuotedStringIntention.java     |  5 +++--
 .../JSJoinConcatenatedStringLiteralsIntention.java |  5 +++--
 .../JSSingleToDoubleQuotedStringIntention.java     |  5 +++--
 .../switchtoif/JSReplaceIfWithSwitchIntention.java |  5 +++--
 .../switchtoif/JSReplaceSwitchWithIfIntention.java |  5 +++--
 .../trivialif/JSMergeElseIfIntention.java          |  5 +++--
 .../intention/trivialif/JSMergeIfAndIntention.java |  5 +++--
 .../intention/trivialif/JSMergeIfOrIntention.java  |  5 +++--
 .../trivialif/JSMergeParallelIfsIntention.java     |  5 +++--
 .../trivialif/JSRemoveRedundantElseIntention.java  |  5 +++--
 .../JSReplaceIfWithConditionalIntention.java       |  5 +++--
 .../trivialif/JSSimplifyIfElseIntention.java       |  5 +++--
 .../trivialif/JSSplitElseIfIntention.java          |  5 +++--
 .../intention/trivialif/JSSplitIfAndIntention.java |  5 +++--
 .../intention/trivialif/JSSplitIfOrIntention.java  |  5 +++--
 .../inspections/PropertyValidationInspection.java  | 14 +++++++-------
 36 files changed, 109 insertions(+), 77 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index 00e0b70a..42f5bdf2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -18,7 +18,7 @@
 public class TextLabelInSwitchStatementJSInspection extends JavaScriptInspection {
     @Nonnull
     @Override
-        public LocalizeValue getDisplayName() {
+    public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.textLabelInSwitchStatementDisplayName();
     }
 
@@ -57,7 +57,7 @@ private void checkForLabel(JSStatement statement) {
             if (!(statement instanceof JSLabeledStatement)) {
                 return;
             }
-            final JSLabeledStatement labeledStatement = (JSLabeledStatement)statement;
+            final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
             final PsiElement label = labeledStatement.getLabelIdentifier();
             registerError(label);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index 5d24522b..49ee02eb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -18,7 +18,7 @@
 public class IncrementDecrementResultUsedJSInspection extends JavaScriptInspection {
     @Nonnull
     @Override
-        public LocalizeValue getDisplayName() {
+    public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.resultOfIncrementOrDecrementUsedDisplayName();
     }
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index af999150..cff14f7a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlElement;
 import jakarta.annotation.Nonnull;
@@ -83,5 +84,5 @@ public boolean startInWriteAction() {
 
     @Override
     @Nonnull
-    public abstract String getText();
+    public abstract LocalizeValue getText();
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 5ff58ac0..2a0ae625 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -23,14 +23,14 @@
 import jakarta.annotation.Nullable;
 
 public abstract class JSMutablyNamedIntention extends JSIntention {
-    private String myText;
+    private LocalizeValue myText;
 
     protected abstract LocalizeValue getTextForElement(PsiElement element);
 
     @Override
     @Nonnull
-    public String getText() {
-        return myText != null ? myText : getBasicText().get();
+    public LocalizeValue getText() {
+        return myText != null ? myText : getBasicText();
     }
 
     @Nonnull
@@ -40,7 +40,7 @@ public String getText() {
     public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node) {
         final PsiElement element = findMatchingElement(node);
         if (element != null) {
-            myText = getTextForElement(element).get();
+            myText = getTextForElement(element);
             return true;
         }
         else {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index 10cd0301..52c56e41 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -23,6 +23,7 @@
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
@@ -41,8 +42,8 @@
 public class JSChangeToCStyleCommentIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.commentChangeToCstyleComment().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.commentChangeToCstyleComment();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 48ac087c..28fc84a9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -40,8 +41,8 @@
 public class JSChangeToEndOfLineCommentIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.commentChangeToEndOfLineComment().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.commentChangeToEndOfLineComment();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index e0fbfef0..88b48b9d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -40,8 +41,8 @@
 public class JSMoveCommentToSeparateLineIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.commentMoveCommentToSeparateLine().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.commentMoveCommentToSeparateLine();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 197bd9bf..afdf85b4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -40,8 +41,8 @@
 public class JSFlipConditionalIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.conditionalFlipConditional().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.conditionalFlipConditional();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index f19c94a2..7f0ae331 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -41,8 +42,8 @@
 public class JSFlipIfIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.conditionalFlipIf().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.conditionalFlipIf();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 1eb93d0b..42f80dc7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -23,6 +23,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -40,8 +41,8 @@
 public class JSRemoveConditionalIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.conditionalRemoveConditional().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.conditionalRemoveConditional();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 439ecc40..531ce789 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -21,6 +21,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -35,8 +36,8 @@
 public class JSReplaceConditionalWithIfIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.conditionalReplaceConditionalWithIf().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.conditionalReplaceConditionalWithIf();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index bf3b677b..b56590e9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
@@ -41,8 +42,8 @@
 public class JSConstantExpressionIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.constantComputeExpression().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.constantComputeExpression();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 25f8a8a1..1c84429b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -40,8 +41,8 @@
 public class JSMergeDeclarationAndInitializationIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.initializationMergeDeclarationAndInitialization().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.initializationMergeDeclarationAndInitialization();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index 510ab000..e710883e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -26,6 +26,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -48,8 +49,8 @@ public class JSSplitDeclarationAndInitializationIntention extends JSIntention {
 
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.initializationSplitDeclarationAndInitialization().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.initializationSplitDeclarationAndInitialization();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index ba5e9cb4..a0821dd4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -27,6 +27,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -44,8 +45,8 @@
 public class JSMergeParallelForInLoopsIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.loopMergeParallelForInLoops().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.loopMergeParallelForInLoops();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index d3711b24..9717648e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -42,8 +43,8 @@
 public class JSMergeParallelForLoopsIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.loopMergeParallelForLoops().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.loopMergeParallelForLoops();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index 356b707b..a312b38a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -37,8 +38,8 @@
 public class JSConvertIntegerToDecimalIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.numberConvertIntegerToDecimal().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.numberConvertIntegerToDecimal();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index d1648972..bece8d28 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -37,8 +38,8 @@
 public class JSConvertIntegerToHexIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.numberConvertIntegerToHex().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.numberConvertIntegerToHex();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 29e25724..5455e906 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -37,8 +38,8 @@
 public class JSConvertIntegerToOctalIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.numberConvertIntegerToOctal().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.numberConvertIntegerToOctal();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index c6ce7a08..65921e48 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -26,6 +26,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -42,8 +43,8 @@
 public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.parenthesisRemoveUnnecessaryParentheses().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.parenthesisRemoveUnnecessaryParentheses();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index 126a8612..7c7008bb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -36,8 +37,8 @@
 public class JSDoubleToSingleQuotedStringIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.stringDoubleQuotedToSingleQuoted().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.stringDoubleQuotedToSingleQuoted();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 449e652c..475d1833 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -27,6 +27,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -41,8 +42,8 @@
 public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.stringJoinConcatenatedStringLiterals().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.stringJoinConcatenatedStringLiterals();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index 6999720b..2fd021fd 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -22,6 +22,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -36,8 +37,8 @@
 public class JSSingleToDoubleQuotedStringIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.stringSingleToDoubleQuotedString().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.stringSingleToDoubleQuotedString();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index d6371ffa..23bf7220 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -52,8 +53,8 @@ public class JSReplaceIfWithSwitchIntention extends JSIntention {
 
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.switchtoifReplaceIfWithSwitch().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.switchtoifReplaceIfWithSwitch();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index 498ea5ff..9ad1f20d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -26,6 +26,7 @@
 import consulo.language.psi.PsiManager;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -58,8 +59,8 @@ public class JSReplaceSwitchWithIfIntention extends JSIntention {
 
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.switchtoifReplaceSwitchWithIf().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.switchtoifReplaceSwitchWithIf();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index e645d590..8029b032 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -39,8 +40,8 @@
 public class JSMergeElseIfIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.trivialifMergeElseIf().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifMergeElseIf();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index 1327aabc..a4e0ae40 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -42,8 +43,8 @@
 public class JSMergeIfAndIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.trivialifMergeIfAnd().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifMergeIfAnd();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index 3cc8c917..c25bed92 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -39,8 +40,8 @@
 public class JSMergeIfOrIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.trivialifMergeIfOr().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifMergeIfOr();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index ea22ab92..5b3fd0c1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -41,8 +42,8 @@
 public class JSMergeParallelIfsIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.trivialifMergeParallelIfs().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifMergeParallelIfs();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index 365d4796..fd89ad2d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -25,6 +25,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -40,8 +41,8 @@
 public class JSRemoveRedundantElseIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.trivialifRemoveRedundantElse().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifRemoveRedundantElse();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index b6574e79..2365c92f 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -24,6 +24,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -38,8 +39,8 @@
 public class JSReplaceIfWithConditionalIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.trivialifReplaceIfWithConditional().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifReplaceIfWithConditional();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 9f1dc29c..78167562 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -23,6 +23,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -38,8 +39,8 @@
 public class JSSimplifyIfElseIntention extends JSIntention {
     @Nonnull
     @Override
-    public String getText() {
-        return JSIntentionLocalize.trivialifSimplifyIfElse().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifSimplifyIfElse();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index cf5b4d33..666fcc06 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -23,6 +23,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -38,8 +39,8 @@
 public class JSSplitElseIfIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.trivialifSplitElseIf().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifSplitElseIf();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index 484da6ca..f1b0f6b6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -26,6 +26,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -42,8 +43,8 @@
 public class JSSplitIfAndIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.trivialifSplitIfAnd().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifSplitIfAnd();
     }
 
     @Override
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index f2e3f8f5..f51450a2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -26,6 +26,7 @@
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -42,8 +43,8 @@
 public class JSSplitIfOrIntention extends JSIntention {
     @Override
     @Nonnull
-    public String getText() {
-        return JSIntentionLocalize.trivialifSplitIfOr().get();
+    public LocalizeValue getText() {
+        return JSIntentionLocalize.trivialifSplitIfOr();
     }
 
     @Override
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index 787c239b..15ae5c91 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package consulo.json.validation.inspections;
 
 import com.intellij.lang.javascript.JSTokenTypes;
@@ -38,6 +37,7 @@
 import consulo.language.psi.PsiModificationTracker;
 import consulo.language.psi.PsiUtilCore;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.util.collection.ContainerUtil;
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.function.PairProcessor;
@@ -49,7 +49,7 @@
 
 /**
  * @author VISTALL
- * @since 10.11.2015
+ * @since 2015-11-10
  */
 @ExtensionImpl
 public class PropertyValidationInspection extends LocalInspectionTool {
@@ -338,20 +338,20 @@ else if (o instanceof NativeArray nativeArray) {
 
     @Nonnull
     @Override
-    public String[] getGroupPath() {
-        return new String[]{"JSON"};
+    public LocalizeValue[] getGroupPath() {
+        return new LocalizeValue[]{LocalizeValue.localizeTODO("JSON")};
     }
 
     @Nonnull
     @Override
-    public String getGroupDisplayName() {
+    public LocalizeValue getGroupDisplayName() {
         throw new UnsupportedOperationException();
     }
 
     @Nonnull
     @Override
-    public String getDisplayName() {
-        return "Property validation";
+    public LocalizeValue getDisplayName() {
+        return LocalizeValue.localizeTODO("Property validation");
     }
 
     @Nonnull

From 3a5a1346d2bc7afbd68f2c4edb30739f47621209 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 10 Oct 2025 13:11:54 +0300
Subject: [PATCH 296/340] Fixed null LocalizeValue in JSMutablyNamedIntention.

---
 .../lang/javascript/intention/JSMutablyNamedIntention.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 2a0ae625..02074099 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -23,14 +23,14 @@
 import jakarta.annotation.Nullable;
 
 public abstract class JSMutablyNamedIntention extends JSIntention {
-    private LocalizeValue myText;
+    private LocalizeValue myText = LocalizeValue.empty();
 
     protected abstract LocalizeValue getTextForElement(PsiElement element);
 
     @Override
     @Nonnull
     public LocalizeValue getText() {
-        return myText != null ? myText : getBasicText();
+        return myText != LocalizeValue.empty() ? myText : getBasicText();
     }
 
     @Nonnull
@@ -38,7 +38,7 @@ public LocalizeValue getText() {
 
     @Override
     public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node) {
-        final PsiElement element = findMatchingElement(node);
+        PsiElement element = findMatchingElement(node);
         if (element != null) {
             myText = getTextForElement(element);
             return true;

From 68aece68f213c6fdcd7d0aa044a6e1362b06d6c0 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Wed, 15 Oct 2025 00:09:05 +0300
Subject: [PATCH 297/340] Fixing NPE in
 OverlyComplexArithmeticExpressionJSInspection. Refactoring.

---
 ...mplexArithmeticExpressionJSInspection.java | 110 +++++++-----------
 ...ArithmeticExpressionJSInspectionState.java |  44 ++++---
 2 files changed, 63 insertions(+), 91 deletions(-)

diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
index 37ca2a37..8800159d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
@@ -10,7 +10,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.InspectionToolState;
-import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 
@@ -57,23 +56,27 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor<OverlyComplexArithmeticExpressionJSInspectionState> {
         @Override
+        @RequiredReadAction
         public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             checkExpression(expression);
         }
 
         @Override
+        @RequiredReadAction
         public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             checkExpression(expression);
         }
 
         @Override
-        public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
+        @RequiredReadAction
+        public void visitJSParenthesizedExpression(@Nonnull JSParenthesizedExpression expression) {
             super.visitJSParenthesizedExpression(expression);
             checkExpression(expression);
         }
 
+        @RequiredReadAction
         private void checkExpression(JSExpression expression) {
             if (isParentArithmetic(expression)) {
                 return;
@@ -84,13 +87,14 @@ private void checkExpression(JSExpression expression) {
             if (containsStringConcatenation(expression)) {
                 return;
             }
-            final int numTerms = countTerms(expression);
-            if (numTerms <= myState.m_limit) {
+            int numTerms = countTerms(expression);
+            if (numTerms <= myState.myMLimit) {
                 return;
             }
             registerError(expression);
         }
 
+        @RequiredReadAction
         private int countTerms(JSExpression expression) {
             if (expression == null) {
                 return 0;
@@ -98,99 +102,71 @@ private int countTerms(JSExpression expression) {
             if (!isArithmetic(expression)) {
                 return 1;
             }
-            if (expression instanceof JSBinaryExpression) {
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final JSExpression lhs = binaryExpression.getLOperand();
-                final JSExpression rhs = binaryExpression.getROperand();
-                return countTerms(lhs) + countTerms(rhs);
+            if (expression instanceof JSBinaryExpression binaryExpr) {
+                return countTerms(binaryExpr.getLOperand()) + countTerms(binaryExpr.getROperand());
             }
-            else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final JSExpression operand = prefixExpression.getExpression();
-                return countTerms(operand);
+            else if (expression instanceof JSPrefixExpression prefixExpr) {
+                return countTerms(prefixExpr.getExpression());
             }
-            else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
-                return countTerms(contents);
+            else if (expression instanceof JSParenthesizedExpression parenthesized) {
+                return countTerms(parenthesized.getInnerExpression());
             }
             return 1;
         }
 
+        @RequiredReadAction
         private boolean isParentArithmetic(JSExpression expression) {
-            final PsiElement parent = expression.getParent();
-            if (!(parent instanceof JSExpression)) {
-                return false;
-            }
-            return isArithmetic((JSExpression) parent);
+            return expression.getParent() instanceof JSExpression parentExpr && isArithmetic(parentExpr);
         }
 
+        @RequiredReadAction
         private boolean isArithmetic(JSExpression expression) {
-            if (expression instanceof JSBinaryExpression) {
-
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final IElementType sign = binaryExpression.getOperationSign();
-                return OUR_ARITHMETIC_TOKENS.contains(sign);
+            if (expression instanceof JSBinaryExpression binaryExpr) {
+                IElementType sign = binaryExpr.getOperationSign();
+                return sign != null && OUR_ARITHMETIC_TOKENS.contains(sign);
             }
-            else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final IElementType sign = prefixExpression.getOperationSign();
-                return OUR_ARITHMETIC_TOKENS.contains(sign);
+            else if (expression instanceof JSPrefixExpression prefixExpr) {
+                IElementType sign = prefixExpr.getOperationSign();
+                return sign != null && OUR_ARITHMETIC_TOKENS.contains(sign);
             }
-            else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
+            else if (expression instanceof JSParenthesizedExpression parenthesizedExpression) {
+                JSExpression contents = parenthesizedExpression.getInnerExpression();
                 return isArithmetic(contents);
             }
             return false;
         }
 
+        @RequiredReadAction
         private boolean containsStringConcatenation(JSExpression expression) {
             if (isStringLiteral(expression)) {
                 return true;
             }
-            if (expression instanceof JSBinaryExpression) {
-
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final JSExpression lhs = binaryExpression.getLOperand();
-
-                if (containsStringConcatenation(lhs)) {
-                    return true;
-                }
-                final JSExpression rhs = binaryExpression.getROperand();
-                return containsStringConcatenation(rhs);
+            if (expression instanceof JSBinaryExpression binaryExpr) {
+                return containsStringConcatenation(binaryExpr.getLOperand())
+                    || containsStringConcatenation(binaryExpr.getROperand());
             }
-            else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final IElementType sign = prefixExpression.getOperationSign();
-                return OUR_ARITHMETIC_TOKENS.contains(sign);
+            else if (expression instanceof JSPrefixExpression prefixExpr) {
+                IElementType sign = prefixExpr.getOperationSign();
+                return sign != null && OUR_ARITHMETIC_TOKENS.contains(sign);
             }
-            else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
-                return containsStringConcatenation(contents);
+            else if (expression instanceof JSParenthesizedExpression parenthesized) {
+                return containsStringConcatenation(parenthesized.getInnerExpression());
             }
             return false;
         }
 
+        @RequiredReadAction
         private boolean isStringLiteral(JSExpression expression) {
-            if (expression instanceof JSLiteralExpression) {
-                final JSLiteralExpression literal = (JSLiteralExpression) expression;
-                final String text = literal.getText();
+            if (expression instanceof JSLiteralExpression literal) {
+                String text = literal.getText();
                 return text.startsWith("'") || text.startsWith("\"");
             }
-            if (expression instanceof JSReferenceExpression) {
-                final JSReferenceExpression reference = (JSReferenceExpression) expression;
-                final PsiElement referent = reference.resolve();
-                if (referent instanceof JSVariable) {
-                    final JSVariable variable = (JSVariable) referent;
-                    if (variable.isConst()) {
-                        final JSExpression initializer = variable.getInitializer();
-                        if (initializer != null) {
-                            final String text = initializer.getText();
-                            return text.startsWith("'") || text.startsWith("\"");
-                        }
-                    }
+            if (expression instanceof JSReferenceExpression reference
+                && reference.resolve() instanceof JSVariable variable && variable.isConst()) {
+                JSExpression initializer = variable.getInitializer();
+                if (initializer != null) {
+                    String text = initializer.getText();
+                    return text.startsWith("'") || text.startsWith("\"");
                 }
             }
             return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
index da05920e..7d2cb32f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
@@ -12,32 +12,28 @@
 
 /**
  * @author VISTALL
- * @since 18/03/2023
+ * @since 2023-03-18
  */
-public class OverlyComplexArithmeticExpressionJSInspectionState implements InspectionToolState<OverlyComplexArithmeticExpressionJSInspectionState>
-{
-	public int m_limit = 6;
+public class OverlyComplexArithmeticExpressionJSInspectionState implements InspectionToolState<OverlyComplexArithmeticExpressionJSInspectionState> {
+    public int myMLimit = 6;
 
-	@Nullable
-	@Override
-	public UnnamedConfigurable createConfigurable()
-	{
-		ConfigurableBuilder<ConfigurableBuilderState> builder = ConfigurableBuilder.newBuilder();
-		builder.component(() -> Label.create(InspectionJSLocalize.maximumNumberOfTermsParameter()));
-		builder.intBox(() -> m_limit, value -> m_limit = value);
-		return builder.buildUnnamed();
-	}
+    @Nullable
+    @Override
+    public UnnamedConfigurable createConfigurable() {
+        return ConfigurableBuilder.newBuilder()
+            .component(() -> Label.create(InspectionJSLocalize.maximumNumberOfTermsParameter()))
+            .intBox(() -> myMLimit, value -> myMLimit = value)
+            .buildUnnamed();
+    }
 
-	@Nullable
-	@Override
-	public OverlyComplexArithmeticExpressionJSInspectionState getState()
-	{
-		return this;
-	}
+    @Nullable
+    @Override
+    public OverlyComplexArithmeticExpressionJSInspectionState getState() {
+        return this;
+    }
 
-	@Override
-	public void loadState(OverlyComplexArithmeticExpressionJSInspectionState state)
-	{
-		XmlSerializerUtil.copyBean(state, this);
-	}
+    @Override
+    public void loadState(OverlyComplexArithmeticExpressionJSInspectionState state) {
+        XmlSerializerUtil.copyBean(state, this);
+    }
 }

From 1d24e9508fe2b132037e7c7939c611909dc2d4a1 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 18 Oct 2025 16:04:01 +0400
Subject: [PATCH 298/340] migrate to localize value

---
 .../javascript/impl/surroundWith/JSWithBlockSurrounder.java  | 5 +++--
 .../impl/surroundWith/JSWithDoWhileSurrounder.java           | 5 +++--
 .../javascript/impl/surroundWith/JSWithForSurrounder.java    | 5 +++--
 .../surroundWith/JSWithFunctionExpressionSurrounder.java     | 5 +++--
 .../impl/surroundWith/JSWithFunctionSurrounder.java          | 5 +++--
 .../javascript/impl/surroundWith/JSWithIfElseSurrounder.java | 5 +++--
 .../javascript/impl/surroundWith/JSWithIfSurrounder.java     | 5 +++--
 .../impl/surroundWith/JSWithParenthesesSurrounder.java       | 5 +++--
 .../impl/surroundWith/JSWithTryCatchFinallySurrounder.java   | 5 +++--
 .../impl/surroundWith/JSWithTryCatchSurrounder.java          | 5 +++--
 .../impl/surroundWith/JSWithTryFinallySurrounder.java        | 5 +++--
 .../javascript/impl/surroundWith/JSWithWhileSurrounder.java  | 5 +++--
 .../javascript/impl/surroundWith/JSWithWithSurrounder.java   | 5 +++--
 13 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
index 375c4d87..a432e959 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithBlockSurrounder.java
@@ -19,6 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.document.util.TextRange;
 import consulo.language.ast.ASTNode;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.language.psi.PsiElement;
 
@@ -28,8 +29,8 @@
  */
 public class JSWithBlockSurrounder extends JSStatementSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return "{ }";
+    public LocalizeValue getTemplateDescription() {
+        return LocalizeValue.localizeTODO("{ }");
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
index 14ac48de..2a3f142d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithDoWhileSurrounder.java
@@ -22,6 +22,7 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -30,8 +31,8 @@
  */
 public class JSWithDoWhileSurrounder extends JSStatementSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithDoWhile().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithDoWhile();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
index c0aaecf0..70f453bf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithForSurrounder.java
@@ -25,6 +25,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiWhiteSpace;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -33,8 +34,8 @@
  */
 public class JSWithForSurrounder extends JSStatementSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithFor().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithFor();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
index 5171456b..9aee08d0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionExpressionSurrounder.java
@@ -25,12 +25,13 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 public class JSWithFunctionExpressionSurrounder extends JSStatementSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithFunctionExpression().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithFunctionExpression();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
index 9403cb83..055f8da2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithFunctionSurrounder.java
@@ -22,12 +22,13 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 public class JSWithFunctionSurrounder extends JSStatementSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithFunction().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithFunction();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
index 327bc4bc..14e1dccf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfElseSurrounder.java
@@ -18,6 +18,7 @@
 
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -26,8 +27,8 @@
  */
 public class JSWithIfElseSurrounder extends JSWithIfSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithIfElse().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithIfElse();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
index 4a5ce6f6..944c28dd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithIfSurrounder.java
@@ -22,6 +22,7 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -30,8 +31,8 @@
  */
 public class JSWithIfSurrounder extends JSStatementSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithIf().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithIf();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
index 5d9c66dc..b9576dea 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
@@ -26,6 +26,7 @@
 import consulo.language.editor.surroundWith.Surrounder;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 import jakarta.annotation.Nonnull;
@@ -37,8 +38,8 @@
  */
 public class JSWithParenthesesSurrounder implements Surrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithParenthesis().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithParenthesis();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
index fe0f766e..a7df3aa7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -25,6 +25,7 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import jakarta.annotation.Nonnull;
 
@@ -34,8 +35,8 @@
  */
 public class JSWithTryCatchFinallySurrounder extends JSStatementSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithTryCatchFinally().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithTryCatchFinally();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
index 9a1893bf..ce116642 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchSurrounder.java
@@ -19,6 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -27,8 +28,8 @@
  */
 public class JSWithTryCatchSurrounder extends JSWithTryCatchFinallySurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithTryCatch().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithTryCatch();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
index 1c0db9a7..7b393c2c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryFinallySurrounder.java
@@ -19,6 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -27,8 +28,8 @@
  */
 public class JSWithTryFinallySurrounder extends JSWithTryCatchFinallySurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithTryFinally().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithTryFinally();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
index 750da8ec..3c0a0341 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWhileSurrounder.java
@@ -22,6 +22,7 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -30,8 +31,8 @@
  */
 public class JSWithWhileSurrounder extends JSStatementSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithWhile().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithWhile();
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
index d02ddb1d..9c33351e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithWithSurrounder.java
@@ -22,6 +22,7 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
 /**
@@ -30,8 +31,8 @@
  */
 public class JSWithWithSurrounder extends JSStatementSurrounder {
     @Override
-    public String getTemplateDescription() {
-        return JavaScriptLocalize.javascriptSurroundWithWith().get();
+    public LocalizeValue getTemplateDescription() {
+        return JavaScriptLocalize.javascriptSurroundWithWith();
     }
 
     @Override

From 03e5b436f906b9f0bb13c0d9e726b4f7cfcf7dca Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 19 Oct 2025 22:03:54 +0400
Subject: [PATCH 299/340] update debug changes

---
 .../run/debug/v8/V8BaseDebugProcess.java      | 10 +--
 .../run/debug/v8/V8DebugProcess.java          | 65 +++++++++----------
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
index 80059353..3c67500b 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
@@ -34,6 +34,7 @@
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
 import consulo.javascript.debugger.JavaScriptListPanel;
 import consulo.javascript.icon.JavaScriptIconGroup;
+import consulo.localize.LocalizeValue;
 import consulo.process.ExecutionException;
 import consulo.process.ProcessHandler;
 import consulo.ui.ex.awt.UIUtil;
@@ -221,17 +222,18 @@ public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui) {
         };
     }
 
+    @Nonnull
     @Override
-    public String getCurrentStateMessage() {
+    public LocalizeValue getCurrentStateMessage() {
         if (myVm == null) {
-            return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
+            return XDebuggerLocalize.debuggerStateMessageDisconnected();
         }
         else {
             if (myVm.isAttached()) {
-                return "Attached";
+                return LocalizeValue.localizeTODO("Attached");
             }
             else {
-                return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
+                return XDebuggerLocalize.debuggerStateMessageDisconnected();
             }
         }
     }
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
index 32d71423..7abd4ab7 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
@@ -20,6 +20,7 @@
 import consulo.execution.ExecutionResult;
 import consulo.execution.debug.XDebugSession;
 import consulo.execution.debug.localize.XDebuggerLocalize;
+import consulo.localize.LocalizeValue;
 import consulo.process.ExecutionException;
 import jakarta.annotation.Nonnull;
 import org.chromium.sdk.JavascriptVmFactory;
@@ -32,43 +33,35 @@
  * @since 20.03.14
  */
 @UsedInPlugin
-public class V8DebugProcess extends V8BaseDebugProcess<StandaloneVm>
-{
-	public V8DebugProcess(@Nonnull XDebugSession session, ExecutionResult result, int port) throws ExecutionException
-	{
-		super(session, result);
+public class V8DebugProcess extends V8BaseDebugProcess<StandaloneVm> {
+    public V8DebugProcess(@Nonnull XDebugSession session, ExecutionResult result, int port) throws ExecutionException {
+        super(session, result);
 
-		myVm = JavascriptVmFactory.getInstance().createStandalone(new InetSocketAddress("localhost", port), null);
-	}
+        myVm = JavascriptVmFactory.getInstance().createStandalone(new InetSocketAddress("localhost", port), null);
+    }
 
-	@UsedInPlugin
-	public void attach() throws Exception
-	{
-		myVm.attach(new V8DebugEventListener(this));
-	}
+    @UsedInPlugin
+    public void attach() throws Exception {
+        myVm.attach(new V8DebugEventListener(this));
+    }
 
-	@Override
-	public String getCurrentStateMessage()
-	{
-		if(myVm == null)
-		{
-			return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
-		}
-		else
-		{
-			if(myVm.isAttached())
-			{
-				return "Attached";
-			}
-			else
-			{
-				String disconnectReason = myVm.getDisconnectReason();
-				if(disconnectReason == null)
-				{
-					return XDebuggerLocalize.debuggerStateMessageDisconnected().get();
-				}
-				return "Disconnected: " + disconnectReason;
-			}
-		}
-	}
+    @Nonnull
+    @Override
+    public LocalizeValue getCurrentStateMessage() {
+        if (myVm == null) {
+            return XDebuggerLocalize.debuggerStateMessageDisconnected();
+        }
+        else {
+            if (myVm.isAttached()) {
+                return LocalizeValue.localizeTODO("Attached");
+            }
+            else {
+                String disconnectReason = myVm.getDisconnectReason();
+                if (disconnectReason == null) {
+                    return XDebuggerLocalize.debuggerStateMessageDisconnected();
+                }
+                return LocalizeValue.localizeTODO("Disconnected: " + disconnectReason);
+            }
+        }
+    }
 }

From 8710b02a5b3a73e9cbd1d8a978fb76f46a200587 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 7 Dec 2025 13:26:23 +0200
Subject: [PATCH 300/340] migrate to dev

---
 base-api/pom.xml                               | 2 +-
 base-impl/pom.xml                              | 2 +-
 debugger/debugger-impl/pom.xml                 | 2 +-
 debugger/v8-debugger-impl/pom.xml              | 2 +-
 inspections/pom.xml                            | 2 +-
 intentions/pom.xml                             | 2 +-
 lang-version-impl/actionscript-impl/pom.xml    | 2 +-
 lang-version-impl/ecmascript-impl/pom.xml      | 2 +-
 lang-version-impl/ecmascript4-impl/pom.xml     | 2 +-
 lang-version-impl/javascript16-impl/pom.xml    | 2 +-
 lang-version-impl/javascript17-impl/pom.xml    | 2 +-
 lang-version-impl/javascript18-impl/pom.xml    | 2 +-
 lang-version-impl/json-javascript-impl/pom.xml | 2 +-
 lang-version-impl/typescript-impl/pom.xml      | 2 +-
 plugin/pom.xml                                 | 2 +-
 pom.xml                                        | 2 +-
 regexp-impl/pom.xml                            | 2 +-
 web-browser-impl/pom.xml                       | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/base-api/pom.xml b/base-api/pom.xml
index 24095d66..b7bc90b0 100644
--- a/base-api/pom.xml
+++ b/base-api/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/base-impl/pom.xml b/base-impl/pom.xml
index 1aad098f..48887e2e 100644
--- a/base-impl/pom.xml
+++ b/base-impl/pom.xml
@@ -50,7 +50,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>always</updatePolicy>
diff --git a/debugger/debugger-impl/pom.xml b/debugger/debugger-impl/pom.xml
index d61b7628..bfe4827d 100644
--- a/debugger/debugger-impl/pom.xml
+++ b/debugger/debugger-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/debugger/v8-debugger-impl/pom.xml b/debugger/v8-debugger-impl/pom.xml
index 219d1689..5cca4523 100644
--- a/debugger/v8-debugger-impl/pom.xml
+++ b/debugger/v8-debugger-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/inspections/pom.xml b/inspections/pom.xml
index 69216c1d..0e894a39 100644
--- a/inspections/pom.xml
+++ b/inspections/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/intentions/pom.xml b/intentions/pom.xml
index ab35b940..817d978e 100644
--- a/intentions/pom.xml
+++ b/intentions/pom.xml
@@ -32,7 +32,7 @@
     <repositories>
         <repository>
             <id>consulo</id>
-            <url>https://maven.consulo.io/repository/snapshots/</url>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
             <snapshots>
                 <enabled>true</enabled>
                 <updatePolicy>interval:60</updatePolicy>
diff --git a/lang-version-impl/actionscript-impl/pom.xml b/lang-version-impl/actionscript-impl/pom.xml
index 92eca256..4b9975c1 100644
--- a/lang-version-impl/actionscript-impl/pom.xml
+++ b/lang-version-impl/actionscript-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/lang-version-impl/ecmascript-impl/pom.xml b/lang-version-impl/ecmascript-impl/pom.xml
index 59c8795b..dd2a4e34 100644
--- a/lang-version-impl/ecmascript-impl/pom.xml
+++ b/lang-version-impl/ecmascript-impl/pom.xml
@@ -32,7 +32,7 @@
     <repositories>
         <repository>
             <id>consulo</id>
-            <url>https://maven.consulo.io/repository/snapshots/</url>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
             <snapshots>
                 <enabled>true</enabled>
                 <updatePolicy>always</updatePolicy>
diff --git a/lang-version-impl/ecmascript4-impl/pom.xml b/lang-version-impl/ecmascript4-impl/pom.xml
index 85c15b93..29438c5b 100644
--- a/lang-version-impl/ecmascript4-impl/pom.xml
+++ b/lang-version-impl/ecmascript4-impl/pom.xml
@@ -33,7 +33,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/lang-version-impl/javascript16-impl/pom.xml b/lang-version-impl/javascript16-impl/pom.xml
index aa705801..cfcf5dea 100644
--- a/lang-version-impl/javascript16-impl/pom.xml
+++ b/lang-version-impl/javascript16-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/lang-version-impl/javascript17-impl/pom.xml b/lang-version-impl/javascript17-impl/pom.xml
index 07a4cd2b..5682cc44 100644
--- a/lang-version-impl/javascript17-impl/pom.xml
+++ b/lang-version-impl/javascript17-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/lang-version-impl/javascript18-impl/pom.xml b/lang-version-impl/javascript18-impl/pom.xml
index a56a5593..513cfbcc 100644
--- a/lang-version-impl/javascript18-impl/pom.xml
+++ b/lang-version-impl/javascript18-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/lang-version-impl/json-javascript-impl/pom.xml b/lang-version-impl/json-javascript-impl/pom.xml
index 02047047..e7f69813 100644
--- a/lang-version-impl/json-javascript-impl/pom.xml
+++ b/lang-version-impl/json-javascript-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/lang-version-impl/typescript-impl/pom.xml b/lang-version-impl/typescript-impl/pom.xml
index 680b80d6..18e4bbab 100644
--- a/lang-version-impl/typescript-impl/pom.xml
+++ b/lang-version-impl/typescript-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index d749a997..4f94d8df 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/pom.xml b/pom.xml
index 246448a6..67f38dcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/regexp-impl/pom.xml b/regexp-impl/pom.xml
index 7e6beacc..de8bd5d2 100644
--- a/regexp-impl/pom.xml
+++ b/regexp-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>
diff --git a/web-browser-impl/pom.xml b/web-browser-impl/pom.xml
index 17aeac49..0a293587 100644
--- a/web-browser-impl/pom.xml
+++ b/web-browser-impl/pom.xml
@@ -32,7 +32,7 @@
 	<repositories>
 		<repository>
 			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
+			<url>https://maven.consulo.dev/repository/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>interval:60</updatePolicy>

From c65a3f3fbd4835cbd6450200c44729148b191b7a Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 7 Dec 2025 22:37:34 +0300
Subject: [PATCH 301/340] Compilation fix for calling ConflictsDialog. Some
 refactoring.

---
 .../refactoring/JSBaseIntroduceDialog.java    | 54 +++++++++----------
 .../JSIntroduceConstantDialog.java            |  4 +-
 .../JSIntroduceFieldDialog.java               |  8 +--
 .../JSIntroduceVariableDialog.java            |  4 +-
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
index 13698493..8ab69979 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
@@ -51,38 +51,38 @@
  */
 public abstract class JSBaseIntroduceDialog extends DialogWrapper implements BaseIntroduceSettings {
     private final Project myProject;
-    private final JSExpression[] myOccurences;
-    protected final JSExpression myMainOccurence;
+    private final JSExpression[] myOccurrences;
+    protected final JSExpression myMainOccurrence;
 
     private Alarm myAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
 
     @RequiredUIAccess
     protected JSBaseIntroduceDialog(
         Project project,
-        JSExpression[] occurences,
-        JSExpression mainOccurence,
-        LocalizeValue title
+        JSExpression[] occurrences,
+        JSExpression mainOccurrence,
+        @Nonnull LocalizeValue title
     ) {
         super(project, false);
 
         myProject = project;
-        myOccurences = occurences;
-        myMainOccurence = mainOccurence;
+        myOccurrences = occurrences;
+        myMainOccurrence = mainOccurrence;
         setTitle(title);
     }
 
     @RequiredReadAction
     protected void doInit() {
         JCheckBox replaceAllCheckBox = getReplaceAllCheckBox();
-        if (myOccurences.length > 1) {
-            replaceAllCheckBox.setText(JavaScriptLocalize.javascriptIntroduceVariableReplaceAllOccurrences(myOccurences.length).get());
+        if (myOccurrences.length > 1) {
+            replaceAllCheckBox.setText(JavaScriptLocalize.javascriptIntroduceVariableReplaceAllOccurrences(myOccurrences.length).get());
         }
         else {
             replaceAllCheckBox.setVisible(false);
         }
 
         JTextField nameField = getNameField();
-        nameField.setText(suggestCandidateName(myMainOccurence));
+        nameField.setText(suggestCandidateName(myMainOccurrence));
         nameField.selectAll();
 
         nameField.addKeyListener(new KeyAdapter() {
@@ -97,7 +97,7 @@ public void keyPressed(KeyEvent e) {
         JComboBox typeField = getVarTypeField();
 
         List<String> possibleTypes = new ArrayList<>();
-        String type = JSResolveUtil.getExpressionType(myMainOccurence, myMainOccurence.getContainingFile());
+        String type = JSResolveUtil.getExpressionType(myMainOccurrence, myMainOccurrence.getContainingFile());
         possibleTypes.add(type);
 
         typeField.setModel(new DefaultComboBoxModel(possibleTypes.toArray(new Object[possibleTypes.size()])));
@@ -108,18 +108,18 @@ public void keyPressed(KeyEvent e) {
     }
 
     @RequiredReadAction
-    protected String suggestCandidateName(JSExpression mainOccurence) {
-        String s = evaluateCandidate(mainOccurence);
+    protected String suggestCandidateName(JSExpression mainOccurrence) {
+        String s = evaluateCandidate(mainOccurrence);
         return s != null ? s.replace('.', '_') : null;
     }
 
     @RequiredReadAction
-    private static String evaluateCandidate(JSExpression mainOccurence) {
-        if (mainOccurence instanceof JSCallExpression call) {
-            mainOccurence = call.getMethodExpression();
+    private static String evaluateCandidate(JSExpression mainOccurrence) {
+        if (mainOccurrence instanceof JSCallExpression call) {
+            mainOccurrence = call.getMethodExpression();
         }
 
-        if (mainOccurence instanceof JSReferenceExpression refExpr) {
+        if (mainOccurrence instanceof JSReferenceExpression refExpr) {
             ResolveResult[] results = refExpr.multiResolve(false);
 
             if (results.length > 0) {
@@ -127,30 +127,30 @@ private static String evaluateCandidate(JSExpression mainOccurence) {
 
                 if (element instanceof JSFunction function) {
                     String typeString = function.getReturnTypeString();
-                    if (isValidIdentifier(typeString, mainOccurence)) {
+                    if (isValidIdentifier(typeString, refExpr)) {
                         return typeString;
                     }
                     return function.getName();
                 }
                 else if (element instanceof JSVariable variable) {
                     String typeString = variable.getTypeString();
-                    if (isValidIdentifier(typeString, mainOccurence)) {
+                    if (isValidIdentifier(typeString, refExpr)) {
                         return typeString;
                     }
                     return typeString;
                 }
             }
 
-            return ((JSReferenceExpression)mainOccurence).getReferencedName();
+            return refExpr.getReferencedName();
         }
-        else if (mainOccurence.getParent() instanceof JSArgumentList) {
-            JSParameter param = JSResolveUtil.findParameterForUsedArgument(mainOccurence, (JSArgumentList)mainOccurence.getParent());
+        else if (mainOccurrence.getParent() instanceof JSArgumentList argList) {
+            JSParameter param = JSResolveUtil.findParameterForUsedArgument(mainOccurrence, argList);
             if (param != null) {
                 return param.getName();
             }
         }
 
-        return JSResolveUtil.getExpressionType(mainOccurence, mainOccurence.getContainingFile());
+        return JSResolveUtil.getExpressionType(mainOccurrence, mainOccurrence.getContainingFile());
     }
 
     @RequiredReadAction
@@ -172,7 +172,7 @@ private void initiateValidation() {
         myAlarm.cancelAllRequests();
         myAlarm.addRequest(
             () -> {
-                final String nameCandidate = getNameField().getText();
+                String nameCandidate = getNameField().getText();
                 setOKActionEnabled(nameCandidate.length() != 0 && isValidName(nameCandidate));
             },
             100,
@@ -214,7 +214,7 @@ protected void doOKAction() {
 
     @RequiredUIAccess
     private boolean checkConflicts(String name) {
-        PsiElement tmp = isReplaceAllOccurences() ? PsiTreeUtil.findCommonParent(myOccurences) : myMainOccurence;
+        PsiElement tmp = isReplaceAllOccurences() ? PsiTreeUtil.findCommonParent(myOccurrences) : myMainOccurrence;
         assert tmp != null;
         JSElement scope = PsiTreeUtil.getNonStrictParentOfType(tmp, JSBlockStatement.class, JSFile.class, JSEmbeddedContentImpl.class);
         assert scope != null;
@@ -264,7 +264,7 @@ private boolean showConflictsDialog(JSNamedElement existing, String name) {
         LocalizeValue message = existing instanceof JSFunction
             ? JavaScriptLocalize.javascriptIntroduceVariableFunctionAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name))
             : JavaScriptLocalize.javascriptIntroduceVariableVariableAlreadyExists(CommonRefactoringUtil.htmlEmphasize(name));
-        ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, message.get());
+        ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, message);
         conflictsDialog.show();
         return conflictsDialog.isOK();
     }
@@ -285,7 +285,7 @@ public String getVariableType() {
     }
 
     private boolean isValidName(String name) {
-        PsiFile containingFile = myMainOccurence.getContainingFile();
+        PsiFile containingFile = myMainOccurrence.getContainingFile();
         return NamesValidator.forLanguage(containingFile.getLanguage()).isIdentifier(name, myProject);
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
index 602ae5a7..685f703e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantDialog.java
@@ -86,7 +86,7 @@ public JComboBox getVarTypeField() {
 
     @Override
     @RequiredReadAction
-    protected String suggestCandidateName(JSExpression mainOccurence) {
-        return super.suggestCandidateName(mainOccurence).toUpperCase();
+    protected String suggestCandidateName(JSExpression mainOccurrence) {
+        return super.suggestCandidateName(mainOccurrence).toUpperCase();
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
index 7d66126f..80440c96 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
@@ -64,7 +64,7 @@ protected void doInit() {
         super.doInit();
 
         final SimpleReference<Boolean> localContextDependent = new SimpleReference<>();
-        myMainOccurence.accept(new JSElementVisitor() {
+        myMainOccurrence.accept(new JSElementVisitor() {
             @Override
             @RequiredReadAction
             public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
@@ -160,9 +160,9 @@ protected void doOKAction() {
 
     @Override
     @RequiredReadAction
-    protected String suggestCandidateName(JSExpression mainOccurence) {
-        String s = super.suggestCandidateName(mainOccurence);
-        JSCodeStyleSettings jsCodeStyleSettings = CodeStyleSettingsManager.getSettings(mainOccurence.getProject())
+    protected String suggestCandidateName(JSExpression mainOccurrence) {
+        String s = super.suggestCandidateName(mainOccurrence);
+        JSCodeStyleSettings jsCodeStyleSettings = CodeStyleSettingsManager.getSettings(mainOccurrence.getProject())
             .getCustomSettings(JSCodeStyleSettings.class);
         if (jsCodeStyleSettings.FIELD_PREFIX.length() > 0) {
             return jsCodeStyleSettings.FIELD_PREFIX + s;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
index f6754041..61eae939 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceVariable/JSIntroduceVariableDialog.java
@@ -105,7 +105,7 @@ public IntroducedVarType getIntroducedVarType() {
 
     @Override
     @RequiredReadAction
-    protected String suggestCandidateName(JSExpression mainOccurence) {
-        return StringUtil.decapitalize(super.suggestCandidateName(mainOccurence));
+    protected String suggestCandidateName(JSExpression mainOccurrence) {
+        return StringUtil.decapitalize(super.suggestCandidateName(mainOccurrence));
     }
 }

From 16ea5a4236ac91f92b85d1a76e092038e6ab14a1 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 25 Dec 2025 17:10:37 +0200
Subject: [PATCH 302/340] final cleanup

---
 .../javascript/index/JavaScriptIndexer.java   |   2 +-
 .../documentation/JSDocumentationBuilder.java |  42 +--
 .../documentation/JSDocumentationUtils.java   |  40 +--
 .../lang/javascript/DialectOptionHolder.java  |   2 +-
 .../lang/javascript/JSElementTypes.java       |   2 +-
 .../lang/javascript/JSFlexAdapter.java        |   2 +-
 .../lang/javascript/JSLanguageInjector.java   |  84 +++---
 .../lang/javascript/JSTokenTypes.java         |  14 +-
 .../JavaScriptHighlightingLexer.java          |   8 +-
 .../javascript/JavaScriptSupportLoader.java   |  14 +-
 .../javascript/flex/XmlBackedJSClassImpl.java |   2 +-
 .../JavaScriptHighlightingLexer.java          |   6 +-
 .../javascript/index/JSItemPresentation.java  |   4 +-
 .../lang/javascript/index/JSSymbolUtil.java   |   2 +-
 .../javascript/index/JavaScriptIndex.java     |   6 +-
 .../CreateJSFunctionOrMethodFix.java          |  10 +-
 .../lang/javascript/parsing/JSDocParsing.java |  22 +-
 .../JSStatementWithLabelReferenceImpl.java    |   2 +-
 .../psi/resolve/BaseJSSymbolProcessor.java    | 140 ++++-----
 .../psi/resolve/JSImportHandlingUtil.java     | 100 +++----
 .../JSImportedElementResolveResult.java       |   2 +-
 .../psi/resolve/ResolveProcessor.java         |  72 ++---
 .../psi/resolve/VariantsProcessor.java        |  56 ++--
 .../psi/resolve/WalkUpResolveProcessor.java   |  48 ++--
 .../stubs/impl/JSAttributeListStubImpl.java   |  14 +-
 .../JSAttributeNameValuePairStubImpl.java     |   2 +-
 .../psi/stubs/impl/JSAttributeStubImpl.java   |   2 +-
 .../psi/stubs/impl/JSClassStubImpl.java       |   4 +-
 .../psi/stubs/impl/JSFunctionStubImpl.java    |  10 +-
 .../stubs/impl/JSImportStatementStubImpl.java |   6 +-
 .../impl/JSIncludeDirectiveStubImpl.java      |   6 +-
 .../psi/stubs/impl/JSNamedObjectStubBase.java |   2 +-
 .../psi/stubs/impl/JSParameterStubImpl.java   |   4 +-
 .../stubs/impl/JSQualifiedObjectStubBase.java |   4 +-
 .../stubs/impl/JSReferenceListStubImpl.java   |   6 +-
 .../stubs/impl/JSVariableStubBaseImpl.java    |   8 +-
 .../lang/javascript/psi/util/JSUtils.java     |  20 +-
 .../javascript/types/JSFileElementType.java   |   6 +-
 .../types/JSFunctionElementType.java          |   4 +-
 .../types/JSVarStatementElementType.java      |   2 +-
 .../types/JSVariableElementType.java          |   6 +-
 .../validation/JSUnusedImportsHelper.java     |  16 +-
 .../impl/language/psi/JSStubElementType.java  |   2 +-
 .../lang/lexer/JavaScriptFlexAdapter.java     |   2 +-
 .../lang/parsing/ExpressionParsing.java       |  98 +++----
 .../lang/parsing/FunctionParsing.java         |  10 +-
 .../javascript/lang/parsing/JSXParser.java    |  28 +-
 .../lang/parsing/JavaScriptParser.java        |   2 +-
 .../javascript/lang/parsing/Parsing.java      |   4 +-
 .../lang/parsing/StatementParsing.java        | 122 ++++----
 .../lang/psi/impl/resolve/ResolveHelper.java  |   2 +-
 .../types/JSQualifiedStubElementType.java     |   8 +-
 .../debugger/JSDebuggerSupportUtils.java      |  32 +--
 .../run/debug/v8/V8BaseDebugProcess.java      |   2 +-
 .../com/sixrr/inspectjs/BaseInspection.java   |  10 +-
 .../inspectjs/BaseInspectionVisitor.java      |  26 +-
 ...ointlessBitwiseExpressionJSInspection.java |  24 +-
 .../bitwise/ShiftOutOfRangeJSInspection.java  |   8 +-
 .../bugs/DivideByZeroJSInspection.java        |  10 +-
 ...ityComparisonWithCoercionJSInspection.java |  18 +-
 ...tCircuitBooleanExpressionJSInspection.java |  12 +-
 .../ObjectAllocationIgnoredJSInspection.java  |   4 +-
 .../sixrr/inspectjs/bugs/RecursionUtils.java  | 130 ++++-----
 .../inspectjs/bugs/RecursionVisitor.java      |  10 +-
 ...extLabelInSwitchStatementJSInspection.java |   8 +-
 .../AnonymousFunctionJSInspection.java        |   4 +-
 .../confusing/BlockStatementJSInspection.java |   2 +-
 ...usingFloatingPointLiteralJSInspection.java |  32 +--
 .../ConfusingPlusesOrMinusesJSInspection.java |  14 +-
 .../DynamicallyGeneratedCodeJSInspection.java |  16 +-
 .../EmptyStatementBodyJSInspection.java       |  16 +-
 ...rementDecrementResultUsedJSInspection.java |   8 +-
 .../confusing/MagicNumberJSInspection.java    |  12 +-
 ...atedConditionalExpressionJSInspection.java |  16 +-
 .../NegatedIfStatementJSInspection.java       |  28 +-
 ...stedConditionalExpressionJSInspection.java |   2 +-
 .../confusing/NestedFunctionJSInspection.java |   6 +-
 .../confusing/OctalIntegerJSInspection.java   |   2 +-
 ...yComplexBooleanExpressionJSInspection.java |  30 +-
 ...tlessArithmeticExpressionJSInspection.java |  26 +-
 ...ointlessBooleanExpressionJSInspection.java |  46 +--
 .../confusing/VoidExpressionJSInspection.java |   4 +-
 ...sionWithIdenticalBranchesJSInspection.java |  10 +-
 ...tantConditionalExpressionJSInspection.java |  16 +-
 .../ConstantIfStatementJSInspection.java      |  16 +-
 ...efaultNotLastCaseInSwitchJSInspection.java |   4 +-
 .../DuplicateConditionJSInspection.java       |  32 +--
 ...lthroughInSwitchStatementJSInspection.java |  10 +-
 ...ForLoopReplaceableByWhileJSInspection.java |  22 +-
 ...ThatDoesntUseLoopVariableJSInspection.java |  20 +-
 ...mentWithIdenticalBranchesJSInspection.java |  12 +-
 ...tementWithTooManyBranchesJSInspection.java |  14 +-
 .../control/LabeledStatementJSInspection.java |   2 +-
 ...opStatementThatDoesntLoopJSInspection.java |   8 +-
 .../NestedSwitchStatementJSInspection.java    |   2 +-
 ...tementWithNoDefaultBranchJSInspection.java |   2 +-
 .../control/TailRecursionJSInspection.java    |  14 +-
 .../TrivialConditionalJSInspection.java       |  20 +-
 .../control/TrivialIfJSInspection.java        | 168 +++++------
 .../UnnecessaryContinueJSInspection.java      |   6 +-
 .../control/UnnecessaryLabelJSInspection.java |  14 +-
 ...saryLabelOnBreakStatementJSInspection.java |  10 +-
 ...yLabelOnContinueStatementJSInspection.java |  10 +-
 .../UnnecessaryReturnJSInspection.java        |  10 +-
 .../ReuseOfLocalVariableJSInspection.java     |  24 +-
 .../UnnecessaryLocalVariableJSInspection.java |  80 +++---
 .../dataflow/VariableAccessUtils.java         |  12 +-
 .../dataflow/VariableAssignedVisitor.java     |  10 +-
 .../VariableUsedInInnerFunctionVisitor.java   |   4 +-
 .../dataflow/VariableUsedVisitor.java         |   2 +-
 .../dom/DocumentWriteJSInspection.java        |  10 +-
 .../inspectjs/dom/InnerHTMLJSInspection.java  |   2 +-
 .../dom/PlatformDetectionJSInspection.java    |   8 +-
 .../XHTMLIncompatabilitiesJSInspection.java   |   6 +-
 .../exception/CatchParameterUsedVisitor.java  |   2 +-
 ...ueOrBreakFromFinallyBlockJSInspection.java |   4 +-
 .../EmptyCatchBlockJSInspection.java          |   6 +-
 .../EmptyFinallyBlockJSInspection.java        |   2 +-
 .../exception/EmptyTryBlockJSInspection.java  |   2 +-
 .../ExceptionCaughtLocallyJSInspection.java   |   4 +-
 .../UnusedCatchParameterJSInspection.java     |  14 +-
 .../com/sixrr/inspectjs/fix/RenameFix.java    |  12 +-
 .../CyclomaticComplexityJSInspection.java     |  14 +-
 .../CyclomaticComplexityVisitor.java          |   4 +-
 ...FunctionWithMultipleLoopsJSInspection.java |  14 +-
 ...nWithMultipleReturnPointsJSInspection.java |  12 +-
 .../functionmetrics/NegationCountVisitor.java |   4 +-
 .../NestingDepthJSInspection.java             |  10 +-
 .../functionmetrics/NestingDepthVisitor.java  |   4 +-
 .../ParametersPerFunctionJSInspection.java    |  14 +-
 .../StatementsPerFunctionJSInspection.java    |  14 +-
 ...ThreeNegationsPerFunctionJSInspection.java |  14 +-
 .../naming/ConventionInspection.java          |   4 +-
 .../FunctionNamingConventionJSInspection.java |   6 +-
 ...lVariableNamingConventionJSInspection.java |   8 +-
 ...ParameterNamingConventionJSInspection.java |  10 +-
 .../style/ChainedEqualityJSInspection.java    |   4 +-
 .../ChainedFunctionCallJSInspection.java      |   6 +-
 ...ConstantOnLHSOfComparisonJSInspection.java |  18 +-
 ...ConstantOnRHSOfComparisonJSInspection.java |  18 +-
 .../style/NestedFunctionCallJSInspection.java |   2 +-
 .../NonBlockStatementBodyJSInspection.java    |  26 +-
 .../UnterminatedStatementJSInspection.java    |   8 +-
 .../ui/FormattedTextFieldMacFix.java          |  14 +-
 .../sixrr/inspectjs/ui/RegExFormatter.java    |   2 +-
 .../inspectjs/ui/RegExInputVerifier.java      |   4 +-
 .../ui/SingleCheckboxOptionsPanel.java        |  10 +-
 .../ui/SingleIntegerFieldOptionsPanel.java    |   8 +-
 .../com/sixrr/inspectjs/utils/BoolUtils.java  |  26 +-
 .../inspectjs/utils/ComparisonUtils.java      |   6 +-
 .../inspectjs/utils/ConditionalUtils.java     |  18 +-
 .../inspectjs/utils/ControlFlowUtils.java     |  84 +++---
 .../inspectjs/utils/EquivalenceChecker.java   | 268 +++++++++---------
 .../sixrr/inspectjs/utils/ExpressionUtil.java |  22 +-
 .../inspectjs/utils/ParenthesesUtils.java     |   2 +-
 .../inspectjs/utils/SideEffectChecker.java    |   6 +-
 .../sixrr/inspectjs/utils/StatementUtils.java |   2 +-
 .../BadExpressionStatementJSInspection.java   |  26 +-
 .../DebuggerStatementJSInspection.java        |   4 +-
 .../DuplicateCaseLabelJSInspection.java       |  20 +-
 ...DuplicatePropertyOnObjectJSInspection.java |  12 +-
 ...onWithInconsistentReturnsJSInspection.java |  12 +-
 .../StringLiteralBreaksHTMLJSInspection.java  |   2 +-
 ...ionReferencesGlobalObjectJSInspection.java |   8 +-
 .../validity/UnreachableCodeJSInspection.java |   2 +-
 .../lang/javascript/JSAbstractBundle.java     |   8 +-
 .../intention/JSElementIterator.java          |   8 +-
 .../intention/JSFunctionVisitor.java          |   8 +-
 .../javascript/intention/JSIntention.java     |   2 +-
 .../intention/bool/ComparisonPredicate.java   |   4 +-
 .../intention/bool/ConjunctionPredicate.java  |   4 +-
 .../bool/JSDeMorgansLawIntention.java         |  12 +-
 .../bool/JSFlipComparisonIntention.java       |  12 +-
 .../bool/JSFlipConjunctionIntention.java      |  10 +-
 .../bool/JSNegateComparisonIntention.java     |  16 +-
 .../JSRemoveBooleanEqualityIntention.java     |  22 +-
 .../braces/JSAddBracesIntention.java          |  12 +-
 .../braces/JSRemoveBracesIntention.java       |  24 +-
 .../JSChangeToCStyleCommentIntention.java     |  14 +-
 .../JSChangeToEndOfLineCommentIntention.java  |  28 +-
 .../JSMoveCommentToSeparateLineIntention.java |  16 +-
 .../JSFlipConditionalIntention.java           |  12 +-
 .../conditional/JSFlipIfIntention.java        |  18 +-
 .../JSRemoveConditionalIntention.java         |  18 +-
 .../JSConstantExpressionIntention.java        |  10 +-
 .../JSConstantSubexpressionIntention.java     |  46 +--
 .../JSExtractIncrementIntention.java          |   8 +-
 ...DeclarationAndInitializationIntention.java |  14 +-
 ...DeclarationAndInitializationIntention.java |   8 +-
 .../JSMergeParallelForInLoopsIntention.java   |  38 +--
 .../JSMergeParallelForLoopsIntention.java     |  40 +--
 .../JSConvertIntegerToDecimalIntention.java   |   4 +-
 .../JSConvertIntegerToHexIntention.java       |   2 +-
 .../JSConvertIntegerToOctalIntention.java     |   4 +-
 .../JSReplaceMultiplyWithShiftIntention.java  |  32 +--
 .../JSReplaceShiftWithMultiplyIntention.java  |  32 +--
 .../intention/number/ShiftUtils.java          |  10 +-
 ...eplaceWithOperatorAssignmentIntention.java |  32 +--
 ...RemoveUnnecessaryParenthesesIntention.java |  14 +-
 ...JSDoubleToSingleQuotedStringIntention.java |   2 +-
 ...inConcatenatedStringLiteralsIntention.java |  12 +-
 ...JSSingleToDoubleQuotedStringIntention.java |   2 +-
 .../intention/string/StringUtil.java          |   4 +-
 .../intention/switchtoif/CaseUtil.java        |  40 +--
 .../JSReplaceIfWithSwitchIntention.java       |  72 ++---
 .../JSReplaceSwitchWithIfIntention.java       |  70 ++---
 .../switchtoif/LabelSearchVisitor.java        |   2 +-
 .../switchtoif/LocalVariableUsageVisitor.java |   2 +-
 .../trivialif/JSMergeElseIfIntention.java     |   6 +-
 .../trivialif/JSMergeIfAndIntention.java      |  22 +-
 .../trivialif/JSMergeIfOrIntention.java       |  44 +--
 .../JSMergeParallelIfsIntention.java          |  30 +-
 .../JSRemoveRedundantElseIntention.java       |  12 +-
 .../JSReplaceIfWithConditionalIntention.java  |  82 +++---
 .../trivialif/JSSimplifyIfElseIntention.java  |   6 +-
 .../trivialif/JSSplitElseIfIntention.java     |  14 +-
 .../trivialif/JSSplitIfAndIntention.java      |  26 +-
 .../trivialif/JSSplitIfOrIntention.java       |  22 +-
 .../psiutil/BinaryOperatorUtils.java          |   6 +-
 .../lang/javascript/psiutil/BoolUtils.java    |  38 +--
 .../javascript/psiutil/ConditionalUtils.java  | 130 ++++-----
 .../javascript/psiutil/ControlFlowUtils.java  |  84 +++---
 .../javascript/psiutil/DeclarationUtils.java  |  10 +-
 .../psiutil/EquivalenceChecker.java           |  64 ++---
 .../lang/javascript/psiutil/ErrorUtil.java    |   2 +-
 .../javascript/psiutil/ExpressionUtil.java    |   6 +-
 .../javascript/psiutil/FindReferenceUtil.java |  20 +-
 .../javascript/psiutil/JSElementFactory.java  |  96 +++----
 .../psiutil/JSRecursionVisitor.java           |  10 +-
 .../javascript/psiutil/ParenthesesUtils.java  |  68 ++---
 .../javascript/psiutil/RecursionUtil.java     | 120 ++++----
 .../javascript/psiutil/SideEffectChecker.java |   6 +-
 .../lang/javascript/psiutil/TreeUtil.java     |  12 +-
 .../psiutil/VariableAccessUtil.java           |  40 +--
 .../parsing/EcmaScriptExpressionParsing.java  |   2 +-
 .../parsing/EcmaScriptStatementParsing.java   |  22 +-
 .../JSXTagTreeHighlightingPassFactory.java    |   2 +-
 .../parsing/EcmaScript4ExpressionParsing.java |  10 +-
 .../parsing/EcmaScript4FunctionParsing.java   |  14 +-
 .../parsing/EcmaScript4StatementParsing.java  |  44 +--
 .../lang/lexer/JavaScript16Lexer.java         |   4 +-
 .../lang/lexer/JavaScript17Lexer.java         |   4 +-
 .../jom/proxy/JomProxyInvocationHandler.java  |   2 +-
 .../json/lang/JsonJavaScriptParser.java       |  22 +-
 .../consulo/json/lang/lexer/JsonLexer.java    |   4 +-
 .../completion/JsonCompletionContributor.java |   4 +-
 ...ByAnotherPsiElementEditorNotification.java |   2 +-
 ...scriptionByAnotherPsiElementRegistrar.java |   2 +-
 ...DescriptionByAnotherPsiElementService.java |   4 +-
 .../descriptor/JsonObjectDescriptor.java      |   8 +-
 .../intellij/javascript/JSClassNameMacro.java |  14 +-
 .../javascript/JSMethodNameMacro.java         |   4 +-
 .../javascript/JSParameterInfoHandler.java    |  70 ++---
 .../JSAbstractElementManipulator.java         |   4 +-
 .../JSAttributeNameValuePairManipulator.java  |   4 +-
 .../manipulators/JSDocTagManipulator.java     |   4 +-
 .../JSIncludeDirectiveManipulator.java        |   2 +-
 ...ImportECMAScriptClassOrFunctionAction.java |  30 +-
 .../javascript/impl/flex/ImportUtils.java     |   2 +-
 .../impl/flex/importer/AbcDumper.java         |   2 +-
 .../impl/formatter/JSCodeStylePanel.java      |   4 +-
 .../impl/formatter/JSSpacingProcessor.java    |   4 +-
 .../impl/generation/BaseJSGenerateAction.java |   2 +-
 .../generation/BaseJSGenerateHandler.java     |   4 +-
 .../JavaScriptGenerateAccessorHandler.java    |  10 +-
 .../JavaScriptOverrideMethodsHandler.java     |   2 +-
 .../JavaScriptLineMarkerProvider.java         |  24 +-
 .../JSExtractFunctionHandler.java             |   2 +-
 .../JSIntroduceConstantHandler.java           |   2 +-
 .../JSIntroduceFieldHandler.java              |   2 +-
 .../impl/search/JSFunctionsSearch.java        |   2 +-
 .../JSStructureItemPresentation.java          |   2 +-
 .../structureView/JSStructureViewElement.java |   4 +-
 .../structureView/JSStructureViewModel.java   |   4 +-
 .../JSExpressionSurroundDescriptor.java       |   2 +-
 .../surroundWith/JSStatementSurrounder.java   |   4 +-
 .../JSStatementsSurroundDescriptor.java       |   2 +-
 .../JSWithTryCatchFinallySurrounder.java      |   4 +-
 .../impl/validation/BaseCreateMethodsFix.java |   2 +-
 .../impl/validation/JSAnnotatingVisitor.java  |  14 +-
 .../impl/JavaScriptIconDescriptorUpdater.java |  12 +-
 .../UpdateJavaScriptFileCopyright.java        |   2 +-
 .../actions/JavaScriptCreateFileAction.java   |   4 +-
 .../lang/JavaScriptParsingDefinition.java     |   4 +-
 284 files changed, 2583 insertions(+), 2583 deletions(-)

diff --git a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
index e2c5226c..cfbae972 100644
--- a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
+++ b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
@@ -15,7 +15,7 @@
 public abstract class JavaScriptIndexer {
     public static final ExtensionPointName<JavaScriptIndexer> EP_NAME = ExtensionPointName.create(JavaScriptIndexer.class);
 
-    public void indexFile(@Nonnull JSFileStub fileStub, @Nonnull final IndexSink sink) {
+    public void indexFile(@Nonnull JSFileStub fileStub, @Nonnull IndexSink sink) {
     }
 
     public int getVersion() {
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
index b246fc8b..2091c800 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
@@ -82,7 +82,7 @@ private static class ParameterInfo extends SymbolInfo {
     JSDocumentationBuilder(PsiElement element, PsiElement _contextElement) {
         myElement = element;
         contextElement = _contextElement;
-        final PsiElement parent = element.getParent();
+        PsiElement parent = element.getParent();
         if (element instanceof JSVariable variable
             && variable.getInitializer() instanceof JSFunctionExpression functionExpression) {
             element = functionExpression;
@@ -97,7 +97,7 @@ private static class ParameterInfo extends SymbolInfo {
             }
 
             for (JSParameter parameter : function.getParameterList().getParameters()) {
-                final ParameterInfo paramInfo = new ParameterInfo();
+                ParameterInfo paramInfo = new ParameterInfo();
                 ((MethodInfo)generationInfo).parameterInfoMap.put(parameter.getName(), paramInfo);
                 paramInfo.type = parameter.getTypeString();
                 paramInfo.initialValue = parameter.getInitializerText();
@@ -152,7 +152,7 @@ public boolean onCommentLine(@Nonnull String line) {
                 return true;
             }
 
-            final int maxSubsequentBr = parametersStarted && !parametersEnded ? 0 : 2;
+            int maxSubsequentBr = parametersStarted && !parametersEnded ? 0 : 2;
             if (myNewLinesPendingCount < maxSubsequentBr) {
                 ++myNewLinesPendingCount;
             }
@@ -174,8 +174,8 @@ public boolean onCommentLine(@Nonnull String line) {
             int offset = 0;
 
             while (matcher.find()) {
-                final boolean isTagEnd = matcher.start(1) != matcher.end(1);
-                final String s = matcher.group(2);
+                boolean isTagEnd = matcher.start(1) != matcher.end(1);
+                String s = matcher.group(2);
                 // tags that do not need escaping
                 if (tagNameThatDoNotNeedEscaping(s)) {
                     continue;
@@ -195,12 +195,12 @@ public boolean onCommentLine(@Nonnull String line) {
         return true;
     }
 
-    private static boolean tagNameThatDoNotNeedEscaping(final @NonNls String s) {
+    private static boolean tagNameThatDoNotNeedEscaping(@NonNls String s) {
         return s.equalsIgnoreCase("p") || s.equalsIgnoreCase("i") || s.equalsIgnoreCase("code")
             || s.equalsIgnoreCase("ul") || s.equalsIgnoreCase("li") || s.equalsIgnoreCase("b");
     }
 
-    private void setResult(final StringBuilder builder) {
+    private void setResult(StringBuilder builder) {
         result = builder;
         myNewLinesPendingCount = 0;
     }
@@ -211,8 +211,8 @@ public boolean onPatternMatch(
         @Nullable String matchName,
         @Nullable String matchValue,
         @Nullable String remainingLineContent,
-        @Nonnull final String line,
-        final String patternMatched
+        @Nonnull String line,
+        String patternMatched
     ) {
         if (metaDocType == MetaDocType.DEFAULT) {
             boolean color = remainingLineContent.startsWith("0x") && remainingLineContent.length() == 8;
@@ -300,7 +300,7 @@ else if (myEventsStarted) {
             metaDocType == MetaDocType.PUBLIC ||
             metaDocType == MetaDocType.PROTECTED ||
             metaDocType == MetaDocType.STATIC) {
-            final String s = metaDocType.name().toLowerCase();
+            String s = metaDocType.name().toLowerCase();
             if (generationInfo.visibility == null) {
                 generationInfo.visibility = s;
             }
@@ -327,7 +327,7 @@ else if (metaDocType == MetaDocType.NAMESPACE) {
         }
 
         if (function != null) {
-            final MethodInfo methodGenerationInfo = ((MethodInfo)generationInfo);
+            MethodInfo methodGenerationInfo = ((MethodInfo)generationInfo);
 
             if (metaDocType == MetaDocType.CONSTRUCTOR) {
                 methodGenerationInfo.methodType = "contructor";
@@ -439,7 +439,7 @@ String getDoc() {
             result.append(generationInfo.description.toString());
 
             result.append("\n<DL>");
-            final MethodInfo methodInfo = ((MethodInfo)generationInfo);
+            MethodInfo methodInfo = ((MethodInfo)generationInfo);
 
             if (methodInfo.parameterInfoMap.size() > 0) {
                 result.append("<DT><b>");
@@ -481,7 +481,7 @@ String getDoc() {
         }
 
         if (contextElement != null) {
-            final String text = contextElement.getText();
+            String text = contextElement.getText();
             if (text.startsWith("#") && text.length() == 7) {
                 appendCurrentOrDefaultValue(text.substring(1), true, false);
             }
@@ -490,10 +490,10 @@ String getDoc() {
         return result.toString();
     }
 
-    public String getParameterDoc(final String name) {
+    public String getParameterDoc(String name) {
         if (function != null) {
-            final MethodInfo methodInfo = ((MethodInfo)generationInfo);
-            final ParameterInfo parameterInfo = methodInfo.parameterInfoMap.get(name);
+            MethodInfo methodInfo = ((MethodInfo)generationInfo);
+            ParameterInfo parameterInfo = methodInfo.parameterInfoMap.get(name);
 
             if (parameterInfo != null && parameterInfo.description.length() > 0) {
                 result = new StringBuilder();
@@ -570,7 +570,7 @@ private void startFunction(JSFunction function) {
 
             result.append(parameterInfo.getKey());
 
-            final String initialValue = parameterInfo.getValue().initialValue;
+            String initialValue = parameterInfo.getValue().initialValue;
             if (initialValue != null) {
                 result.append(" = ").append(initialValue);
             }
@@ -584,11 +584,11 @@ private void endNamedItem() {
         result.append("</PRE>");
     }
 
-    private int startNamedItem(final String functionName) {
+    private int startNamedItem(String functionName) {
         return startNamedItem(functionName, generationInfo);
     }
 
-    private int startNamedItem(final String functionName, SymbolInfo generationInfo) {
+    private int startNamedItem(String functionName, SymbolInfo generationInfo) {
         result.append("<PRE>");
 
         StringBuffer options = new StringBuffer();
@@ -604,7 +604,7 @@ private int startNamedItem(final String functionName, SymbolInfo generationInfo)
                 options.append(returnType);
             }
 
-            final String type = ((MethodInfo)generationInfo).methodType;
+            String type = ((MethodInfo)generationInfo).methodType;
             if (type != null) {
                 if (options.length() > 0) {
                     options.append(", ");
@@ -641,7 +641,7 @@ private int startNamedItem(final String functionName, SymbolInfo generationInfo)
         return offset;
     }
 
-    private void addVisibilityAndAccess(final StringBuffer options, SymbolInfo generationInfo) {
+    private void addVisibilityAndAccess(StringBuffer options, SymbolInfo generationInfo) {
         if (generationInfo.visibility != null) {
             if (options.length() > 0) {
                 options.append(", ");
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
index aace368b..41c3a360 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
@@ -198,7 +198,7 @@ public String nextElement() {
                         commentNode = null;
                     }
 
-                    final String text = resultCommentNode.getText();
+                    String text = resultCommentNode.getText();
                     if (text.startsWith("//")) {
                         return text.substring(2);
                     }
@@ -213,10 +213,10 @@ public String nextElement() {
             commentLineIterator = new StringTokenizer(text, "\r\n");
         }
 
-        final boolean needPlainCharData = processor.needsPlainCommentData();
+        boolean needPlainCharData = processor.needsPlainCommentData();
 
         while (commentLineIterator.hasMoreElements()) {
-            final String s = (String)commentLineIterator.nextElement();
+            String s = (String)commentLineIterator.nextElement();
             if (s.indexOf('@') == -1 && s.indexOf(':') == -1 && !needPlainCharData) {
                 continue;
             }
@@ -224,7 +224,7 @@ public String nextElement() {
             String commentText = s.replace('\t', ' ');
 
             for (Map.Entry<Pattern, String> entry : prefixToPatternToHintMap.entrySet()) {
-                final Matcher matcher = commentText.contains(entry.getValue()) ? entry.getKey().matcher(commentText) : null;
+                Matcher matcher = commentText.contains(entry.getValue()) ? entry.getKey().matcher(commentText) : null;
                 if (matcher == null) {
                     continue;
                 }
@@ -238,15 +238,15 @@ public String nextElement() {
             boolean matchedSomething = false;
 
             for (Map.Entry<Pattern, String> entry : PATTERN_TO_HINT_MAP.entrySet()) {
-                final Matcher matcher = commentText.contains(entry.getValue()) ? entry.getKey().matcher(commentText) : null;
+                Matcher matcher = commentText.contains(entry.getValue()) ? entry.getKey().matcher(commentText) : null;
                 if (matcher == null) {
                     continue;
                 }
 
                 if (matcher.matches()) {
-                    final JSDocumentationProcessor.MetaDocType docType = PATTERN_TO_META_DOC_TYPE_MAP.get(entry.getKey());
+                    JSDocumentationProcessor.MetaDocType docType = PATTERN_TO_META_DOC_TYPE_MAP.get(entry.getKey());
                     if (docType != null) {
-                        final int groupCount = matcher.groupCount();
+                        int groupCount = matcher.groupCount();
                         String remainingLineContent = groupCount > 0 ? matcher.group(groupCount) : null;
                         String matchName = groupCount > 1 ? matcher.group(1) : null;
                         String matchValue = groupCount > 2 ? matcher.group(2) : null;
@@ -255,8 +255,8 @@ public String nextElement() {
                         boolean reportAboutFieldInParameter = false;
                         boolean reportAboutDefaultValue = false;
 
-                        final int groupForInitialValue = 6;
-                        final int groupForFieldName = 5;
+                        int groupForInitialValue = 6;
+                        int groupForFieldName = 5;
                         String fieldName = null;
 
                         if (groupCount == 7 && entry.getKey() == JS_DOC_PARAMETERS_PATTERN) {
@@ -573,7 +573,7 @@ public boolean needsPlainCommentData() {
                         }
 
                         @Override
-                        public boolean onCommentLine(@Nonnull final String line) {
+                        public boolean onCommentLine(@Nonnull String line) {
                             return true;
                         }
 
@@ -590,7 +590,7 @@ public boolean onPatternMatch(
                             for (MetaDocType expectedType : expectedTypes) {
                                 if (type == expectedType) {
                                     if (type == MetaDocType.TYPE && _anchor instanceof JSFunction function) {
-                                        final JSParameterList jsParameterList = function.getParameterList();
+                                        JSParameterList jsParameterList = function.getParameterList();
                                         if (jsParameterList != null && jsParameterList.getParameters().length > 0) {
                                             return true;
                                         }
@@ -618,7 +618,7 @@ else if (type == MetaDocType.RETURN) {
     }
 
     @RequiredReadAction
-    public static String findType(final PsiElement def) {
+    public static String findType(PsiElement def) {
         return findDocForAnchor(def, JSDocumentationProcessor.MetaDocType.TYPE);
     }
 
@@ -646,7 +646,7 @@ public static boolean calculateDeprecated(PsiElement element) {
             element = PsiTreeUtil.getParentOfType(element, JSStatement.class, JSProperty.class);
         }
 
-        final PsiElement docComment = element != null ? findDocComment(element) : null;
+        PsiElement docComment = element != null ? findDocComment(element) : null;
         if (docComment != null) {
             final boolean[] deprecatedStatus = new boolean[1];
 
@@ -659,7 +659,7 @@ public boolean needsPlainCommentData() {
                     }
 
                     @Override
-                    public boolean onCommentLine(@Nonnull final String line) {
+                    public boolean onCommentLine(@Nonnull String line) {
                         return true;
                     }
 
@@ -693,7 +693,7 @@ public static void appendHyperLinkToElement(
         String presentableName,
         @Nullable String presentableFileName
     ) {
-        final PsiFile containingFile = element != null ? element.getContainingFile() : null;
+        PsiFile containingFile = element != null ? element.getContainingFile() : null;
         String fileName = containingFile == null
             ? null
             : !JSResolveUtil.isPredefinedFile(containingFile)
@@ -710,7 +710,7 @@ public static void appendHyperLinkToElement(
     }
 
     @RequiredReadAction
-    private static String evaluateTypeFromParameter(final JSParameter parameter) {
+    private static String evaluateTypeFromParameter(JSParameter parameter) {
         String s = evaluateTypeFromVariable(parameter);
 
         if (s == null) {
@@ -735,8 +735,8 @@ private static PsiElement findFunctionComment(JSParameter parameter) {
     }
 
     @RequiredReadAction
-    private static String evaluateTypeFromFunction(final JSFunction function) {
-        final ASTNode lastCommentInFunctionBody = findTrailingCommentInFunctionBody(function);
+    private static String evaluateTypeFromFunction(JSFunction function) {
+        ASTNode lastCommentInFunctionBody = findTrailingCommentInFunctionBody(function);
 
         String typeString = null;
         if (lastCommentInFunctionBody != null) {
@@ -750,7 +750,7 @@ private static String evaluateTypeFromFunction(final JSFunction function) {
     }
 
     @RequiredReadAction
-    private static String evaluateTypeFromVariable(final JSVariable variable) {
+    private static String evaluateTypeFromVariable(JSVariable variable) {
         PsiElement prevSibling = variable.getFirstChild();
         if (prevSibling != null && prevSibling.getNode().getElementType() == JSTokenTypes.IDENTIFIER) {
             prevSibling = variable.getPrevSibling();
@@ -786,7 +786,7 @@ private static String evaluateTypeFromVariable(final JSVariable variable) {
     }
 
     @RequiredReadAction
-    public static String findTypeFromComments(final JSNamedElement element) {
+    public static String findTypeFromComments(JSNamedElement element) {
         if (element instanceof JSParameter parameter) {
             return evaluateTypeFromParameter(parameter);
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java b/base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
index c885ad25..602fe876 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/DialectOptionHolder.java
@@ -36,7 +36,7 @@ public DialectOptionHolder(boolean _ecma, boolean _gwt) {
         this(_ecma, _gwt, true);
     }
 
-    public DialectOptionHolder(boolean _ecma, boolean _gwt, final boolean _e4x) {
+    public DialectOptionHolder(boolean _ecma, boolean _gwt, boolean _e4x) {
         isECMAL4Level = _ecma;
         isGwt = _gwt;
         isJavaScript1_7_OrBetter = _e4x;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 13239801..0a47c155 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -60,7 +60,7 @@ public interface JSElementTypes {
     IElementType EMBEDDED_CONTENT = new ILazyParseableElementType("EMBEDDED_CONTENT", JavaScriptLanguage.INSTANCE) {
         @Override
         @RequiredReadAction
-        protected ASTNode doParseContents(@Nonnull final ASTNode chameleon, @Nonnull final PsiElement psi) {
+        protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElement psi) {
             LanguageVersion languageVersion = LanguageVersionUtil.findLanguageVersion(getLanguage(), psi);
             Project project = psi.getProject();
             Language languageForParser = getLanguageForParser(psi);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
index 1cab2e1e..6419949f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSFlexAdapter.java
@@ -30,7 +30,7 @@ public JSFlexAdapter(boolean highlight, DialectOptionHolder optionHolder) {
     }
 
     @Override
-    public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState) {
+    public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
         super.start(buffer, startOffset, endOffset, initialState & BASE_STATE_MASK);
         ((_JavaScriptLexer)getFlex()).setTagCount(initialState >> TAG_COUNT_SHIFT);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index 2055a8ab..bac1ba0f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -53,8 +53,8 @@ public abstract class JSLanguageInjector implements MultiHostInjector {
     @Override
     public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement host) {
         if (host instanceof XmlAttributeValue attributeValue) {
-            final PsiElement attribute = attributeValue.getParent();
-            final PsiElement tag = attribute.getParent();
+            PsiElement attribute = attributeValue.getParent();
+            PsiElement tag = attribute.getParent();
 
             if (attribute instanceof XmlAttribute xmlAttribute && tag instanceof XmlTag xmlTag) {
                 if (attributeValue.getTextLength() == 0) {
@@ -69,7 +69,7 @@ public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiE
                     injectJSIntoAttributeValue(registrar, attributeValue, true);
                 }
                 else if (attrName.startsWith("on")) {
-                    final String ns = xmlTag.getNamespace();
+                    String ns = xmlTag.getNamespace();
                     if (JavaScriptSupportLoader.BINDOWS_URI.equals(ns)
                         || JavaScriptSupportLoader.isBindowsFile(attributeValue)
                         || isMozillaXulOrXblNs(ns)) {
@@ -116,10 +116,10 @@ else if (attrName.equalsIgnoreCase("djConfig")) {
             }
         }
         else if (host instanceof XmlText && host.getParent() instanceof XmlTag tag) {
-            final @NonNls String localName = tag.getLocalName();
+            @NonNls String localName = tag.getLocalName();
 
             if ("attribute".equals(localName) && JSP_URI.equals(tag.getNamespace())) {
-                @NonNls final String name = tag.getAttributeValue("name");
+                @NonNls String name = tag.getAttributeValue("name");
                 if (name != null && name.startsWith("on")) {
                     Language language = JavaScriptLanguage.INSTANCE;
                     injectToXmlText(registrar, host, language, null, null);
@@ -165,12 +165,12 @@ && isMozillaXulOrXblNs(tag.getNamespace())) {
                     @NonNls String suffix = null;
 
                     if (getter || setter) {
-                        final String name = getNameFromTag(tag.getParentTag(), "property");
+                        String name = getNameFromTag(tag.getParentTag(), "property");
                         prefix = "function " + (getter ? "get " : "set ") + name + "(" + (setter ? "val" : "") + ") {";
                         suffix = "}";
                     }
                     else if (body) {
-                        final XmlTag parentTag = tag.getParentTag();
+                        XmlTag parentTag = tag.getParentTag();
                         String name = getNameFromTag(parentTag, "method");
                         String signature = "";
                         for (XmlTag ptag : parentTag.findSubTags("parameter")) {
@@ -190,8 +190,8 @@ else if (handler) {
                         suffix = "}";
                     }
                     else if (constructor) {
-                        final XmlTag parentTag = tag.getParentTag();
-                        final XmlTag grandParentTag = parentTag != null ? parentTag.getParentTag() : null;
+                        XmlTag parentTag = tag.getParentTag();
+                        XmlTag grandParentTag = parentTag != null ? parentTag.getParentTag() : null;
                         prefix = "function " + (grandParentTag != null ? grandParentTag.getAttributeValue("id") : null) + "() {";
                         suffix = "}";
                     }
@@ -202,51 +202,51 @@ else if (constructor) {
         }
     }
 
-    private boolean doInjectTo(final XmlTag tag) {
-        final XmlTagValue value = tag.getValue();
-        final XmlTagChild[] tagChildren = value.getChildren();
+    private boolean doInjectTo(XmlTag tag) {
+        XmlTagValue value = tag.getValue();
+        XmlTagChild[] tagChildren = value.getChildren();
 
         return tagChildren.length == 1
             && (tagChildren[0].getNode().getElementType() == XmlElementType.XML_CDATA || !tagChildren[0].textContains('<'));
     }
 
     private static void checkMxmlInjection(
-        final MultiHostRegistrar registrar,
-        final PsiElement host,
-        final PsiElement attribute,
-        final PsiElement _tag
+        MultiHostRegistrar registrar,
+        PsiElement host,
+        PsiElement attribute,
+        PsiElement _tag
     ) {
-        final PsiFile containingFile = _tag.getContainingFile();
+        PsiFile containingFile = _tag.getContainingFile();
         if (JavaScriptSupportLoader.isFlexMxmFile(containingFile)) {
             injectInMxmlFile(registrar, host, ((XmlAttribute)attribute).getDescriptor(), (XmlTag)_tag);
         }
     }
 
     private static void injectToXmlText(
-        final MultiHostRegistrar registrar,
-        final PsiElement host,
-        final Language language,
-        final String prefix,
-        final String suffix
+        MultiHostRegistrar registrar,
+        PsiElement host,
+        Language language,
+        String prefix,
+        String suffix
     ) {
         TextRange range = new TextRange(0, host.getTextLength());
         registrar.startInjecting(language).addPlace(prefix, suffix, (PsiLanguageInjectionHost)host, range).doneInjecting();
     }
 
-    private static String getNameFromTag(final XmlTag parentTag, final @NonNls String s) {
+    private static String getNameFromTag(XmlTag parentTag, @NonNls String s) {
         return parentTag != null && s.equals(parentTag.getLocalName()) ? parentTag.getAttributeValue("name") : "";
     }
 
-    public static boolean isMozillaXulOrXblNs(final @NonNls String ns) {
+    public static boolean isMozillaXulOrXblNs(@NonNls String ns) {
         return "http://www.mozilla.org/xbl".equals(ns) || "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul".equals(ns);
     }
 
     public static void injectJSIntoAttributeValue(
-        final MultiHostRegistrar registrar,
-        final XmlAttributeValue host,
-        final boolean startsWithPrefix
+        MultiHostRegistrar registrar,
+        XmlAttributeValue host,
+        boolean startsWithPrefix
     ) {
-        final PsiElement[] myChildren = host.getChildren();
+        PsiElement[] myChildren = host.getChildren();
         int valueIndex = myChildren.length - 2;
         int valueTokenNumber = 1;
         if (valueIndex < 0) {
@@ -254,7 +254,7 @@ public static void injectJSIntoAttributeValue(
             valueTokenNumber = 0;
         }
 
-        final PsiElement valueChild = myChildren[valueIndex];
+        PsiElement valueChild = myChildren[valueIndex];
 
         if (valueChild instanceof XmlToken && ((XmlToken)valueChild).getTokenType() == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN) {
             boolean injectFromTheBeginning = valueIndex == valueTokenNumber;
@@ -264,7 +264,7 @@ public static void injectJSIntoAttributeValue(
                 boolean badlyFormed = false;
 
                 for (int i = valueTokenNumber; i < valueIndex; ++i) {
-                    final PsiElement currentElement = myChildren[i];
+                    PsiElement currentElement = myChildren[i];
 
                     if (currentElement instanceof XmlToken && ((XmlToken)currentElement).getTokenType() == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN) {
                         // ok child
@@ -272,8 +272,8 @@ public static void injectJSIntoAttributeValue(
                     }
                     else {
                         if (currentElement instanceof OuterLanguageElement) {
-                            final String prevText = myChildren[i - 1].getText();
-                            final String nextText = myChildren[i + 1].getText();
+                            String prevText = myChildren[i - 1].getText();
+                            String nextText = myChildren[i + 1].getText();
 
                             if ((StringUtil.endsWithChar(prevText, '\"') && StringUtil.startsWithChar(nextText, '\"'))
                                 || (StringUtil.endsWithChar(prevText, '\'') && StringUtil.startsWithChar(nextText, '\''))) {
@@ -285,7 +285,7 @@ else if ((StringUtil.endsWithChar(prevText, '(') && StringUtil.startsWithChar(ne
                                 badlyFormed = true;
                             }
                             else if (currentElement.textContains('$')) {
-                                final String s = currentElement.getText();
+                                String s = currentElement.getText();
                                 if (s.startsWith("${") && s.endsWith("}") && s.length() > 2) {
                                     continue;
                                 }
@@ -319,16 +319,16 @@ else if (currentElement.textContains('%')) {
     }
 
     private static void injectInMxmlFile(
-        final MultiHostRegistrar registrar,
-        final PsiElement host,
-        final PsiMetaData descriptor,
+        MultiHostRegistrar registrar,
+        PsiElement host,
+        PsiMetaData descriptor,
         XmlTag tag
     ) {
         int offset = host instanceof XmlText ? 0 : 1;
 
         if (descriptor instanceof AnnotationBackedDescriptor annotationBackedDescriptor
             && annotationBackedDescriptor.requiresCdataBracesInContext(tag)) {
-            final int length = host.getTextLength();
+            int length = host.getTextLength();
             if (length < 2 * offset) {
                 return;
             }
@@ -336,8 +336,8 @@ private static void injectInMxmlFile(
             if (type == null) {
                 type = "*";
             }
-            final @NonNls String prefix = "(function (event:" + type + ") {";
-            final @NonNls String suffix = "})();";
+            @NonNls String prefix = "(function (event:" + type + ") {";
+            @NonNls String suffix = "})();";
 
             if (host instanceof XmlText) {
                 injectToXmlText(registrar, host, JavaScriptSupportLoader.ECMA_SCRIPT_L4, prefix, suffix);
@@ -356,14 +356,14 @@ private static void injectInMxmlFile(
             }
         }
         else {
-            final String text = StringUtil.stripQuotesAroundValue(host.getText());
+            String text = StringUtil.stripQuotesAroundValue(host.getText());
             int openedBraces = 0;
             int start = -1;
             boolean addedSomething = false;
             boolean quoted = false;
 
             for (int i = 0; i < text.length(); ++i) {
-                final char ch = text.charAt(i);
+                char ch = text.charAt(i);
 
                 if (quoted) {
                     quoted = false;
@@ -396,7 +396,7 @@ else if (ch == '}') {
             }
 
             if (!addedSomething) {
-                final String trimmedText = text.trim();
+                String trimmedText = text.trim();
                 start = trimmedText.indexOf("@Embed");
                 if (start == 0) {
                     offset += text.indexOf(trimmedText);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 58ba3407..c348cd60 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -157,7 +157,7 @@ protected void doParse(JavaScriptParsingContext context, PsiBuilder builder) {
             parseScriptExpression(context, builder);
         }
 
-        public void parseScriptExpression(JavaScriptParsingContext context, final PsiBuilder builder) {
+        public void parseScriptExpression(JavaScriptParsingContext context, PsiBuilder builder) {
             PsiBuilder.Marker root = builder.mark();
             Parsing.checkMatches(builder, JSTokenTypes.LBRACE, JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
             if (builder.getTokenType() != JSTokenTypes.RBRACE) {
@@ -450,13 +450,13 @@ public JSChameleonElementType(@NonNls String name) {
         @Override
         @RequiredReadAction
         protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElement psi) {
-            final Project project = psi.getProject();
-            final Language languageForParser = getLanguageForParser(psi);
-            final LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
-            final LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
-            final PsiBuilder builder = PsiBuilderFactory.getInstance()
+            Project project = psi.getProject();
+            Language languageForParser = getLanguageForParser(psi);
+            LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
+            LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
+            PsiBuilder builder = PsiBuilderFactory.getInstance()
                 .createBuilder(project, chameleon, createLexer(), languageForParser, languageVersion, chameleon.getChars());
-            final JavaScriptParser parser = (JavaScriptParser)ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
+            JavaScriptParser parser = (JavaScriptParser)ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
 
             JavaScriptParsingContext parsingContext = parser.createParsingContext();
             doParse(parsingContext, builder);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
index 4cecae82..cb5a40c7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
@@ -51,7 +51,7 @@ private JavaScriptHighlightingLexer(DialectOptionHolder optionHolder, boolean wi
                 new IElementType[]{JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL}, IElementType.EMPTY_ARRAY
             );
 
-            final LayeredLexer docLexer = new LayeredLexer(new FlexAdapter(new _JSDocLexer(true)));
+            LayeredLexer docLexer = new LayeredLexer(new FlexAdapter(new _JSDocLexer(true)));
             final Lexer lexer = getHtmlHighlightingLexer();
 
             // Force html highlighting lexer not to return tag content type since it causes token type collision in javascript embedded to html
@@ -60,7 +60,7 @@ private JavaScriptHighlightingLexer(DialectOptionHolder optionHolder, boolean wi
 
 
                 @Override
-                public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState) {
+                public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
                     lexer.start(buffer, startOffset, endOffset, initialState);
                 }
 
@@ -71,7 +71,7 @@ public int getState() {
 
                 @Override
                 public IElementType getTokenType() {
-                    final IElementType tokenType = lexer.getTokenType();
+                    IElementType tokenType = lexer.getTokenType();
                     if (tokenType == tagContentType) {
                         return JSTokenTypes.JSDOC_TAG_DATA;
                     }
@@ -113,7 +113,7 @@ public int getBufferEnd() {
     }
 
     public static IElementType getTagContentTokenType() {
-        final Lexer highlightingLexer = getHtmlHighlightingLexer();
+        Lexer highlightingLexer = getHtmlHighlightingLexer();
         highlightingLexer.start("a", 0, 1, 0);
         return highlightingLexer.getTokenType();
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
index d6adfe35..9cac359d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
@@ -70,15 +70,15 @@ public class JavaScriptSupportLoader {
     @NonNls
     public static final String MXML_COMPONENT_TEMPLATE_NAME = "Mxml Component";
 
-    public static boolean isFlexMxmFile(final PsiFile file) {
+    public static boolean isFlexMxmFile(PsiFile file) {
         return file.getFileType() == XmlFileType.INSTANCE && nameHasMxmlExtension(file.getName());
     }
 
-    public static boolean isFlexMxmFile(final VirtualFile file) {
+    public static boolean isFlexMxmFile(VirtualFile file) {
         return file.getFileType() == XmlFileType.INSTANCE && nameHasMxmlExtension(file.getName());
     }
 
-    private static boolean nameHasMxmlExtension(final String s) {
+    private static boolean nameHasMxmlExtension(String s) {
         return s.endsWith(MXML_FILE_EXTENSION_DOT) || s.endsWith(MXML_FILE_EXTENSION2_DOT);
     }
 
@@ -86,9 +86,9 @@ public static boolean isFlexMxmFile(String filename) {
         return FileTypeManager.getInstance().getFileTypeByFileName(filename) == XmlFileType.INSTANCE && nameHasMxmlExtension(filename);
     }
 
-    public static boolean isBindowsFile(final PsiElement element) {
-        final PsiFile containingFile = element.getContainingFile();
-        final PsiElement tag = element.getParent().getParent();
+    public static boolean isBindowsFile(PsiElement element) {
+        PsiFile containingFile = element.getContainingFile();
+        PsiElement tag = element.getParent().getParent();
         if (!(tag instanceof XmlTag)) {
             return false;
         }
@@ -102,7 +102,7 @@ public static boolean isBindowsFile(final PsiElement element) {
         return "Application".equals(((XmlFile)containingFile).getDocument().getRootTag().getName());
     }
 
-    public static boolean isMxmlNs(final String ns) {
+    public static boolean isMxmlNs(String ns) {
         return ArrayUtil.contains(ns, MXML_URIS);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index 4eadc096..05165794 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -324,7 +324,7 @@ protected CachedValue<JSFile[]> compute(XmlTag tag, Object p) {
     private static final UserDataCache<CachedValue<Map<String, String>>, XmlFile, Object> CACHED_COMPONENT_IMPORTS_CACHE =
         new UserDataCache<>() {
             @Override
-            protected CachedValue<Map<String, String>> compute(final XmlFile file, final Object p) {
+            protected CachedValue<Map<String, String>> compute(final XmlFile file, Object p) {
                 return CachedValuesManager.getManager(file.getProject()).createCachedValue(
                     new CachedValueProvider<Map<String, String>>() {
                         @Override
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
index 9a52047e..03207bce 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
@@ -56,7 +56,7 @@ private JavaScriptHighlightingLexer(Supplier<Lexer> baseLexerFactory, boolean wi
                 new IElementType[]{JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL}, IElementType.EMPTY_ARRAY
             );
 
-            final LayeredLexer docLexer = new LayeredLexer(new FlexAdapter(new _JSDocLexer(true)));
+            LayeredLexer docLexer = new LayeredLexer(new FlexAdapter(new _JSDocLexer(true)));
             final Lexer lexer = getHtmlHighlightingLexer();
 
             // Force html highlighting lexer not to return tag content type
@@ -66,7 +66,7 @@ private JavaScriptHighlightingLexer(Supplier<Lexer> baseLexerFactory, boolean wi
                     final IElementType tagContentType = getTagContentTokenType();
 
                     @Override
-                    public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState) {
+                    public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
                         lexer.start(buffer, startOffset, endOffset, initialState);
                     }
 
@@ -77,7 +77,7 @@ public int getState() {
 
                     @Override
                     public IElementType getTokenType() {
-                        final IElementType tokenType = lexer.getTokenType();
+                        IElementType tokenType = lexer.getTokenType();
                         if (tokenType == tagContentType) {
                             return JSTokenTypes.JSDOC_TAG_DATA;
                         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index 78645637..5d49a008 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -37,7 +37,7 @@
 public class JSItemPresentation implements ItemPresentation {
     private JSNamedElement myElement;
 
-    public JSItemPresentation(final JSNamedElement elementProxy) {
+    public JSItemPresentation(JSNamedElement elementProxy) {
         this.myElement = elementProxy;
     }
 
@@ -50,7 +50,7 @@ public String getPresentableText() {
     @Override
     @RequiredReadAction
     public String getLocationString() {
-        final PsiFile psiFile = myElement.getContainingFile();
+        PsiFile psiFile = myElement.getContainingFile();
         if (myElement instanceof JSVariable || myElement instanceof JSFunction) {
             if (JSResolveUtil.findParent(myElement) instanceof JSClass possibleJsClass) {
                 StringBuilder presentation = new StringBuilder();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
index 8c5d5f08..75991d37 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
@@ -120,7 +120,7 @@ public void processUnresolvedThis() {
                     }
 
                     @Override
-                    public boolean isTopLevel(final JSReferenceExpression expression) {
+                    public boolean isTopLevel(JSReferenceExpression expression) {
                         return expr1 == expression;
                     }
                 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
index 83d0debf..6b66c27a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JavaScriptIndex.java
@@ -26,15 +26,15 @@
 public final class JavaScriptIndex {
     public static final String ECMASCRIPT_JS2 = "ECMAScript.js2";
 
-    public static boolean isFromPredefinedFile(final PsiFile containingFile) {
+    public static boolean isFromPredefinedFile(PsiFile containingFile) {
         return false;
     }
 
-    public static PsiElement findSymbolByFileAndNameAndOffset(final String fileName, final String name, final int offset) {
+    public static PsiElement findSymbolByFileAndNameAndOffset(String fileName, String name, int offset) {
         return null;
     }
 
-    public static PsiElement findSymbolWithNameAndOffsetInEntry(final String nameId, final int offset) {
+    public static PsiElement findSymbolWithNameAndOffsetInEntry(String nameId, int offset) {
         return null;
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
index ebe1f0a2..91880392 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/CreateJSFunctionOrMethodFix.java
@@ -65,8 +65,8 @@ protected void addParameters(
         Set<JavaScriptFeature> features
     ) {
         JSCallExpression methodInvokation = (JSCallExpression)referenceExpression.getParent();
-        final JSArgumentList list = methodInvokation.getArgumentList();
-        final JSExpression[] expressions = list.getArguments();
+        JSArgumentList list = methodInvokation.getArgumentList();
+        JSExpression[] expressions = list.getArguments();
         int paramCount = expressions.length;
 
         for (int i = 0; i < paramCount; ++i) {
@@ -75,7 +75,7 @@ protected void addParameters(
             }
             String var = null;
 
-            final JSExpression passedParameterValue = expressions[i];
+            JSExpression passedParameterValue = expressions[i];
             if (passedParameterValue instanceof JSReferenceExpression parameterRefExpr) {
                 var = parameterRefExpr.getReferencedName();
             }
@@ -84,7 +84,7 @@ protected void addParameters(
                 var = "param" + (i != 0 ? Integer.toString(i + 1) : "");
             }
 
-            final String var1 = var;
+            String var1 = var;
             Expression expression = new MyExpression(var1);
 
             template.addVariable(var, expression, expression, true);
@@ -109,7 +109,7 @@ protected void addBody(Template template, JSReferenceExpression refExpr, PsiFile
     @RequiredReadAction
     @Override
     protected void buildTemplate(
-        final Template template,
+        Template template,
         JSReferenceExpression referenceExpression,
         Set<JavaScriptFeature> features,
         boolean staticContext,
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
index 96dff2ce..838d44c8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
@@ -29,11 +29,11 @@
  * Time: 3:55:54 PM
  */
 public class JSDocParsing {
-    public static void parseJSDoc(final PsiBuilder builder) {
-        final PsiBuilder.Marker root = builder.mark();
+    public static void parseJSDoc(PsiBuilder builder) {
+        PsiBuilder.Marker root = builder.mark();
 
         while (!builder.eof()) {
-            final IElementType tokenType = builder.getTokenType();
+            IElementType tokenType = builder.getTokenType();
 
             if (tokenType == JSDocTokenTypes.DOC_TAG_NAME) {
                 if (parseDocTag(builder)) {
@@ -47,12 +47,12 @@ public static void parseJSDoc(final PsiBuilder builder) {
         root.done(JSTokenTypes.DOC_COMMENT);
     }
 
-    private static boolean parseDocTag(final PsiBuilder builder) {
+    private static boolean parseDocTag(PsiBuilder builder) {
         assert builder.getTokenType() == JSDocTokenTypes.DOC_TAG_NAME;
-        final PsiBuilder.Marker docTagMarker = builder.mark();
+        PsiBuilder.Marker docTagMarker = builder.mark();
 
         try {
-            final @NonNls String tagName = builder.getTokenText();
+            @NonNls String tagName = builder.getTokenText();
 
             builder.advanceLexer();
             if ("@param".equals(tagName)) {
@@ -83,7 +83,7 @@ else if (!currentText.startsWith("{")) {
                 }
             }
             else {
-                final boolean hasDocTagValue = isToCreateDocTagValue(tagName);
+                boolean hasDocTagValue = isToCreateDocTagValue(tagName);
                 if (!hasDocTagValue) {
                     return true;
                 }
@@ -103,18 +103,18 @@ else if (!currentText.startsWith("{")) {
         return true;
     }
 
-    private static void createDocTagValue(final PsiBuilder builder) {
+    private static void createDocTagValue(PsiBuilder builder) {
         PsiBuilder.Marker marker = builder.mark();
         builder.advanceLexer();
         marker.done(JSDocTokenTypes.DOC_TAG_VALUE);
     }
 
-    private static boolean isInvalidTokenType(final PsiBuilder builder) {
-        final IElementType tokenType = builder.getTokenType();
+    private static boolean isInvalidTokenType(PsiBuilder builder) {
+        IElementType tokenType = builder.getTokenType();
         return builder.eof() || tokenType == JSDocTokenTypes.DOC_COMMENT_LEADING_ASTERISK || tokenType == JSDocTokenTypes.DOC_COMMENT_END;
     }
 
-    private static boolean isToCreateDocTagValue(final @NonNls String tokenText) {
+    private static boolean isToCreateDocTagValue(@NonNls String tokenText) {
         return tokenText.equals("@see") ||
             tokenText.equals("@class") ||
             tokenText.equals("@member") ||
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
index 3a826e53..e05e49e1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
@@ -146,7 +146,7 @@ public boolean isReferenceTo(PsiElement element) {
         @Override
         @RequiredReadAction
         public Object[] getVariants() {
-            final List<String> labels = new ArrayList<>(1);
+            List<String> labels = new ArrayList<>(1);
             processElements(element -> {
                 labels.add(element.getLabel());
                 return true;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index ec9f0a91..6db49aa8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -85,9 +85,9 @@ abstract public class BaseJSSymbolProcessor implements PsiScopeProcessor {
     protected String myIteratedTypeName;
 
     protected BaseJSSymbolProcessor(
-        final PsiFile targetFile,
-        final boolean skipDclsInTargetFile,
-        final PsiElement context,
+        PsiFile targetFile,
+        boolean skipDclsInTargetFile,
+        PsiElement context,
         String[] contextIds
     ) {
         myTargetFile = targetFile;
@@ -110,7 +110,7 @@ protected BaseJSSymbolProcessor(
 
         myContextNameIds = contextIds;
 
-        final boolean notWithinWithStatement = PsiTreeUtil.getParentOfType(myContext, JSWithStatement.class) == null;
+        boolean notWithinWithStatement = PsiTreeUtil.getParentOfType(myContext, JSWithStatement.class) == null;
 
         if (((contextIds == null || contextIds.length == 0)
             && myContext instanceof JSReferenceExpression referenceExpression
@@ -126,16 +126,16 @@ protected BaseJSSymbolProcessor(
         }
     }
 
-    protected abstract String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression);
+    protected abstract String[] calculateContextIds(JSReferenceExpression jsReferenceExpression);
 
-    public void setAddOnlyCompleteMatches(final boolean addOnlyCompleteMatches) {
+    public void setAddOnlyCompleteMatches(boolean addOnlyCompleteMatches) {
         myAddOnlyCompleteMatches = addOnlyCompleteMatches;
         myAllowPartialResults = false;
     }
 
 
     protected boolean isFromRelevantFileOrDirectory() {
-        final PsiFile psiFile = myCurrentFile;
+        PsiFile psiFile = myCurrentFile;
 
         return myTargetFile == psiFile || false;
         //(myTargetFile != null &&
@@ -147,7 +147,7 @@ protected boolean isFromRelevantFileOrDirectory() {
     private static ThreadLocal<EvaluateContext> contextHolder = new ThreadLocal<>();
 
     @RequiredReadAction
-    public static void doEvalForExpr(JSExpression rawqualifier, final PsiFile myTargetFile, TypeProcessor typeProcessor) {
+    public static void doEvalForExpr(JSExpression rawqualifier, PsiFile myTargetFile, TypeProcessor typeProcessor) {
         EvaluateContext context = contextHolder.get();
         boolean contextHolderInitialized = false;
 
@@ -179,9 +179,9 @@ else if (context.isAlreadyProcessingItem(rawqualifier)) {
     @RequiredReadAction
     public static JSExpression getOriginalQualifier(JSExpression rawQualifier) {
         if (rawQualifier instanceof JSReferenceExpression qualifier) {
-            final TextRange textRange = qualifier.getTextRange();
+            TextRange textRange = qualifier.getTextRange();
             PsiFile targetFile = rawQualifier.getContainingFile();
-            final PsiElement context = targetFile.getContext();
+            PsiElement context = targetFile.getContext();
             if (context != null) {
                 targetFile = context.getContainingFile();
             }
@@ -191,7 +191,7 @@ public static JSExpression getOriginalQualifier(JSExpression rawQualifier) {
             if (!targetFile.isPhysical() && originalFile != null) {
                 PsiElement startElement;
                 if (context != null) {
-                    final PsiElement at = PsiTreeUtil.getNonStrictParentOfType(
+                    PsiElement at = PsiTreeUtil.getNonStrictParentOfType(
                         originalFile.findElementAt(context.getTextOffset()),
                         PsiLanguageInjectionHost.class
                     );
@@ -223,18 +223,18 @@ public static JSExpression getOriginalQualifier(JSExpression rawQualifier) {
             rawQualifier = qualifier;
         }
         else if (rawQualifier instanceof JSIndexedPropertyAccessExpression indexedPropertyAccessExpression) {
-            final JSExpression qualifier = indexedPropertyAccessExpression.getQualifier();
+            JSExpression qualifier = indexedPropertyAccessExpression.getQualifier();
             if (qualifier != null) {
-                final JSExpression jsExpression = getOriginalQualifier(qualifier);
+                JSExpression jsExpression = getOriginalQualifier(qualifier);
                 if (jsExpression != null && jsExpression.getParent() instanceof JSIndexedPropertyAccessExpression) {
                     return (JSExpression)jsExpression.getParent();
                 }
             }
         }
         else if (rawQualifier instanceof JSCallExpression call) {
-            final JSExpression qualifier = call.getMethodExpression();
+            JSExpression qualifier = call.getMethodExpression();
             if (qualifier != null) {
-                final JSExpression jsExpression = getOriginalQualifier(qualifier);
+                JSExpression jsExpression = getOriginalQualifier(qualifier);
                 if (jsExpression != null && jsExpression.getParent() instanceof JSCallExpression parentCall) {
                     return parentCall;
                 }
@@ -274,7 +274,7 @@ private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeP
             boolean wasPrototype = false;
 
             if (qualifier != null && "prototype".equals(qualifier.getReferencedName())) {
-                final JSExpression expression = qualifier.getQualifier();
+                JSExpression expression = qualifier.getQualifier();
                 if (expression instanceof JSReferenceExpression refExpr) {
                     qualifier = refExpr;
                     wasPrototype = true;
@@ -284,7 +284,7 @@ private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeP
             boolean topLevelQualifier = qualifier.getQualifier() == null;
 
             if (topLevelQualifier) {
-                final JSReferenceExpression expression =
+                JSReferenceExpression expression =
                     typeProcessor.ecma() ? qualifier : JSSymbolUtil.findReferenceExpressionUsedForClassExtending(qualifier);
                 if (!typeProcessor.ecma() && expression != qualifier && expression.getQualifier() == null) {
                     addType(expression.getText(), typeProcessor, context, qualifier);
@@ -292,7 +292,7 @@ private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeP
                 }
             }
 
-            final ResolveResult[] resolveResults = qualifier != null ? qualifier.multiResolve(false) : ResolveResult.EMPTY_ARRAY;
+            ResolveResult[] resolveResults = qualifier != null ? qualifier.multiResolve(false) : ResolveResult.EMPTY_ARRAY;
 
             if (resolveResults.length > 0) {
                 for (ResolveResult r : resolveResults) {
@@ -328,7 +328,7 @@ private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeP
                             }
 
                             if (!typeProcessor.ecma() || parameterType == null) {
-                                final JSExpression expression = jsVariable.getInitializer();
+                                JSExpression expression = jsVariable.getInitializer();
                                 if (expression != null) {
                                     doEvalForExpr(expression, context.targetFile, typeProcessor);
                                 }
@@ -336,7 +336,7 @@ private static void doEvalForExpr(JSExpression rawQualifier, TypeProcessor typeP
                                     boolean hasSomeInfoAboutVar = false;
 
                                     if (topLevelQualifier) {
-                                        final ResolveProcessor processor = new ResolveProcessor(qualifier.getText(), true);
+                                        ResolveProcessor processor = new ResolveProcessor(qualifier.getText(), true);
                                         hasSomeInfoAboutVar = findDef(typeProcessor, context, qualifier, processor);
                                     }
 
@@ -390,9 +390,9 @@ else if (psiElement instanceof JSDefinitionExpression) {
                             else if (psiElement instanceof XmlToken xmlToken) {
                                 hasSomeType = true;
 
-                                final TagContextBuilder builder = new TagContextBuilder(xmlToken, HTML_ELEMENT_TYPE_NAME);
-                                final PsiElement element = builder.element;
-                                final String typeName = builder.typeName;
+                                TagContextBuilder builder = new TagContextBuilder(xmlToken, HTML_ELEMENT_TYPE_NAME);
+                                PsiElement element = builder.element;
+                                String typeName = builder.typeName;
 
                                 if (HTML_ELEMENT_TYPE_NAME.equals(typeName)) {
                                     hasSomeType = false;
@@ -402,13 +402,13 @@ else if (psiElement instanceof XmlToken xmlToken) {
                             }
                             else if (psiElement instanceof JSNamedElement namedElement) {
                                 if (namedElement instanceof JSFunction function) {
-                                    final boolean inCall = rawQualifier.getParent() instanceof JSCallExpression;
+                                    boolean inCall = rawQualifier.getParent() instanceof JSCallExpression;
 
                                     if (!inCall && (!function.isGetProperty() && !function.isSetProperty())) {
                                         addType(FUNCTION_TYPE_NAME, typeProcessor, context, function);
                                         hasSomeType = true;
                                         if (wasPrototype) {
-                                            final String name = function.getName();
+                                            String name = function.getName();
                                             if (name != null) {
                                                 addType(name, typeProcessor, context, null);
                                             }
@@ -424,8 +424,8 @@ else if (function.isConstructor()) {
                                     else {
                                         String s = null;
                                         if (function.isSetProperty()) {
-                                            final JSParameterList parameterList = function.getParameterList();
-                                            final JSParameter[] parameters =
+                                            JSParameterList parameterList = function.getParameterList();
+                                            JSParameter[] parameters =
                                                 parameterList != null ? parameterList.getParameters() : JSParameter.EMPTY_ARRAY;
                                             s = parameters.length == 1 ? parameters[0].getTypeString() : null;
                                         }
@@ -523,8 +523,8 @@ else if (JSTokenTypes.ADDITIVE_OPERATIONS.contains(sign)
                     || JSTokenTypes.MULTIPLICATIVE_OPERATIONS.contains(sign)
                     || sign == JSTokenTypes.ANDAND || sign == JSTokenTypes.OROR) {
 
-                    final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
-                    final SimpleTypeProcessor rprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+                    SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+                    SimpleTypeProcessor rprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
                     doEvalForExpr(lOperand, lprocessor, context);
                     doEvalForExpr(rOperand, rprocessor, context);
 
@@ -537,7 +537,7 @@ else if (JSTokenTypes.ADDITIVE_OPERATIONS.contains(sign)
                     }
                 }
                 else if (sign == JSTokenTypes.EQ) {
-                    final SimpleTypeProcessor rprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+                    SimpleTypeProcessor rprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
                     doEvalForExpr(rOperand, rprocessor, context);
 
                     String evaluatedType = rprocessor.type;
@@ -560,7 +560,7 @@ else if (rawQualifier instanceof JSArrayLiteralExpression arrayLiteral) {
             }
         }
         else if (rawQualifier instanceof JSIndexedPropertyAccessExpression propertyAccess) {
-            final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+            SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
 
             doEvalForExpr(propertyAccess.getQualifier(), lprocessor, context);
 
@@ -592,7 +592,7 @@ else if (rawQualifier instanceof JSThisExpression thisExpr) {
         else if (rawQualifier instanceof JSSuperExpression superExpr) {
             JSClass jsClass = JSResolveUtil.getClassOfContext(superExpr);
             if (jsClass != null) {
-                final JSClass[] classes = jsClass.getSuperClasses();
+                JSClass[] classes = jsClass.getSuperClasses();
                 if (classes.length > 0) {
                     addType(classes[0].getQualifiedName(), typeProcessor, context, classes[0]);
                 }
@@ -645,7 +645,7 @@ private static String evalComponentTypeFromArrayExpression(
                 return null;
             }
             context.addProcessingItem(rawqualifier);
-            final SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
+            SimpleTypeProcessor lprocessor = new SimpleTypeProcessor(typeProcessor.getFeatures());
             doEvalForExpr(collectionExpression, lprocessor, context);
             return addComponentTypeFromProcessor(rawqualifier, typeProcessor, context, lprocessor);
         }
@@ -673,12 +673,12 @@ private static boolean isValidType(String parameterType) {
     }
 
     private static boolean findDef(
-        final TypeProcessor typeProcessor,
-        final EvaluateContext context,
-        final JSReferenceExpression qualifier,
-        final ResolveProcessor processor
+        TypeProcessor typeProcessor,
+        EvaluateContext context,
+        JSReferenceExpression qualifier,
+        ResolveProcessor processor
     ) {
-        final PsiElement parent = qualifier.getParent();
+        PsiElement parent = qualifier.getParent();
         JSResolveUtil.treeWalkUp(processor, qualifier, parent, qualifier);
 
         PsiElement jsElement = processor.getResult();
@@ -708,7 +708,7 @@ private static void tryAddBindowsType(JSReferenceExpression qualifier, TypeProce
         PsiElement contextElement = qualifier.getContainingFile().getContext();
 
         if (contextElement != null) {
-            final PsiFile containingFile = contextElement.getContainingFile();
+            PsiFile containingFile = contextElement.getContainingFile();
 
             if (isBindowsXml(containingFile)) {
             }
@@ -716,7 +716,7 @@ private static void tryAddBindowsType(JSReferenceExpression qualifier, TypeProce
     }
 
     @RequiredReadAction
-    private static boolean isBindowsXml(final PsiFile containingFile) {
+    private static boolean isBindowsXml(PsiFile containingFile) {
         return containingFile.getName().endsWith(".xml") && containingFile instanceof XmlFile;
     }
 
@@ -740,7 +740,7 @@ private static void addTypeFromDefExpr(TypeProcessor typeProcessor, EvaluateCont
 
         if (!context.visitedTypes.contains(type)) {
             context.visitedTypes.add(type);
-            final PsiElement parentElement = psiElement.getParent();
+            PsiElement parentElement = psiElement.getParent();
             if (parentElement instanceof JSAssignmentExpression assignment) {
                 JSExpression expr = assignment.getROperand();
                 while (expr instanceof JSAssignmentExpression rOperandAssignment) {
@@ -756,8 +756,8 @@ private static void addTypeFromDefExpr(TypeProcessor typeProcessor, EvaluateCont
         }
     }
 
-    private static void getTypeFromConstant(final JSExpression rawqualifier, TypeProcessor typeProcessor, EvaluateContext context) {
-        final ASTNode childNode = rawqualifier.getNode().getFirstChildNode();
+    private static void getTypeFromConstant(JSExpression rawqualifier, TypeProcessor typeProcessor, EvaluateContext context) {
+        ASTNode childNode = rawqualifier.getNode().getFirstChildNode();
         IElementType constantType = childNode.getElementType();
 
         String type = JavaScriptTokenSets.STRING_LITERALS.contains(constantType)
@@ -775,7 +775,7 @@ private static void getTypeFromConstant(final JSExpression rawqualifier, TypePro
             : null;
 
         if (type == NUMBER_TYPE_NAME && typeProcessor.ecma()) {
-            final String text = childNode.getText();
+            String text = childNode.getText();
             if (text.indexOf('.') == -1) {
                 type = INT_TYPE;
             }
@@ -789,15 +789,15 @@ private static void getTypeFromConstant(final JSExpression rawqualifier, TypePro
         }
     }
 
-    protected void addPackageScope(final List<String[]> possibleNameIds, final JSClass jsClass, final PsiElement expression) {
-        final String packageQualifier = JSResolveUtil.findPackageStatementQualifier(expression);
+    protected void addPackageScope(List<String[]> possibleNameIds, JSClass jsClass, PsiElement expression) {
+        String packageQualifier = JSResolveUtil.findPackageStatementQualifier(expression);
         String qName;
 
         if (packageQualifier != null) {
             buildIndexListFromQNameAndCorrectQName(packageQualifier, jsClass, possibleNameIds);
         }
         else if (jsClass != null && (qName = jsClass.getQualifiedName()) != null && !qName.equals(jsClass.getName())) {
-            final int index = qName.lastIndexOf('.');
+            int index = qName.lastIndexOf('.');
             if (index > 0) {
                 buildIndexListFromQNameAndCorrectQName(qName.substring(0, index), jsClass, possibleNameIds);
             }
@@ -810,15 +810,15 @@ else if (jsClass == null) {
         }
     }
 
-    protected String buildIndexListFromQNameAndCorrectQName(String type, final PsiElement source, List<String[]> possibleNameIds) {
-        final List<String> list = new ArrayList<>();
+    protected String buildIndexListFromQNameAndCorrectQName(String type, PsiElement source, List<String[]> possibleNameIds) {
+        List<String> list = new ArrayList<>();
         type = addIndexListFromQName(type, source, list);
 
         possibleNameIds.add(ArrayUtil.toStringArray(list));
         return type;
     }
 
-    public static String addIndexListFromQName(String type, final PsiElement source, final List<String> list) {
+    public static String addIndexListFromQName(String type, PsiElement source, List<String> list) {
         int i = type.indexOf('.');
         int lastI = 0;
 
@@ -841,7 +841,7 @@ public static String addIndexListFromQName(String type, final PsiElement source,
         return type;
     }
 
-    private static void addType(String type, TypeProcessor typeProcessor, EvaluateContext context, final PsiElement source) {
+    private static void addType(String type, TypeProcessor typeProcessor, EvaluateContext context, PsiElement source) {
         if (type == null) {
             return;
         }
@@ -851,7 +851,7 @@ private static void addType(String type, TypeProcessor typeProcessor, EvaluateCo
         }
 
         if (!(typeProcessor instanceof GenericTypeParametersClient)) {
-            final int gtPos = type.indexOf('<');
+            int gtPos = type.indexOf('<');
             if (gtPos > 0 && type.charAt(gtPos - 1) == '.') {
                 type = type.substring(0, gtPos - 1);
             }
@@ -864,7 +864,7 @@ private static void addType(String type, TypeProcessor typeProcessor, EvaluateCo
     }
 
     @Override
-    public <T> T getHint(final Key<T> hintClass) {
+    public <T> T getHint(Key<T> hintClass) {
         return null;
     }
 
@@ -884,7 +884,7 @@ interface HierarchyProcessor {
         boolean processClass(JSClass clazz);
     }
 
-    protected void doIterateTypeHierarchy(final String[] contextIds, final HierarchyProcessor processor) {
+    protected void doIterateTypeHierarchy(String[] contextIds, HierarchyProcessor processor) {
         StringBuilder builder = new StringBuilder();
         for (String cnameId : contextIds) {
             if (builder.length() > 0) {
@@ -893,7 +893,7 @@ protected void doIterateTypeHierarchy(final String[] contextIds, final Hierarchy
             builder.append(cnameId);
         }
 
-        final String typeName = builder.toString();
+        String typeName = builder.toString();
         if (typeName.length() == 0) {
             return;
         }
@@ -903,8 +903,8 @@ protected void doIterateTypeHierarchy(final String[] contextIds, final Hierarchy
         myIteratedTypeName = null;
     }
 
-    protected void doIterateHierarchy(final String typeName, final HierarchyProcessor processor) {
-        final PsiElement clazz = JSResolveUtil.findClassByQName(typeName, myContext);
+    protected void doIterateHierarchy(String typeName, final HierarchyProcessor processor) {
+        PsiElement clazz = JSResolveUtil.findClassByQName(typeName, myContext);
         if (clazz instanceof JSClass jsClass) {
             for (JSClass superClazz : jsClass.getSuperClasses()) {
                 superClazz.processDeclarations(
@@ -917,7 +917,7 @@ protected void doIterateHierarchy(final String typeName, final HierarchyProcesso
 
                         @Override
                         @RequiredReadAction
-                        public boolean execute(@Nonnull PsiElement element, final ResolveState state) {
+                        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                             return !(element instanceof JSClass jsClass && !processor.processClass(jsClass));
                         }
                     },
@@ -935,22 +935,22 @@ public static class EvaluateContext {
         private Set<JSExpression> processingItems;
         private PsiElement source;
 
-        public EvaluateContext(final PsiFile targetFile) {
+        public EvaluateContext(PsiFile targetFile) {
             this.targetFile = targetFile;
         }
 
-        public boolean isAlreadyProcessingItem(final JSExpression rawqualifier) {
+        public boolean isAlreadyProcessingItem(JSExpression rawqualifier) {
             return processingItems != null && processingItems.contains(rawqualifier);
         }
 
-        public void addProcessingItem(final JSExpression rawqualifier) {
+        public void addProcessingItem(JSExpression rawqualifier) {
             if (processingItems == null) {
                 processingItems = new HashSet<>();
             }
             processingItems.add(rawqualifier);
         }
 
-        public void removeProcessingItem(final JSExpression rawqualifier) {
+        public void removeProcessingItem(JSExpression rawqualifier) {
             processingItems.remove(rawqualifier);
         }
 
@@ -958,13 +958,13 @@ public PsiElement getSource() {
             return source;
         }
 
-        public void setSource(final PsiElement source) {
+        public void setSource(PsiElement source) {
             this.source = source;
         }
     }
 
     public interface TypeProcessor {
-        void process(@Nonnull String type, @Nonnull EvaluateContext evaluateContext, final PsiElement source);
+        void process(@Nonnull String type, @Nonnull EvaluateContext evaluateContext, PsiElement source);
 
         @Deprecated
         boolean ecma();
@@ -989,11 +989,11 @@ public SimpleTypeProcessor(Set<JavaScriptFeature> features) {
         }
 
         @Override
-        public void process(@Nonnull final String _type, @Nonnull final EvaluateContext evaluateContext, final PsiElement _source) {
+        public void process(@Nonnull String _type, @Nonnull EvaluateContext evaluateContext, PsiElement _source) {
             setType(type != null && !type.equals(_type) ? ANY_TYPE : _type, _source);
         }
 
-        private void setType(final String s, final PsiElement _source) {
+        private void setType(String s, PsiElement _source) {
             type = s;
             source = _source;
         }
@@ -1010,13 +1010,13 @@ public boolean ecma() {
 
         @Override
         @RequiredReadAction
-        public boolean execute(@Nonnull PsiElement element, final ResolveState state) {
+        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
             result = element;
             return true;
         }
 
         @Override
-        public void setUnknownElement(@Nonnull final PsiElement _element) {
+        public void setUnknownElement(@Nonnull PsiElement _element) {
             setType(ANY_TYPE, _element);
         }
 
@@ -1035,11 +1035,11 @@ public static class TagContextBuilder {
 
         public TagContextBuilder(PsiElement psiElement, String defaultName) {
             String typeName = null;
-            final XmlTag tag = PsiTreeUtil.getParentOfType(psiElement, XmlTag.class);
+            XmlTag tag = PsiTreeUtil.getParentOfType(psiElement, XmlTag.class);
             JSClass element = null;
 
             if (tag != null) {
-                final PsiFile containingFile = tag.getContainingFile();
+                PsiFile containingFile = tag.getContainingFile();
 
                 if (isBindowsXml(containingFile)) {
                     typeName = "Bi" + tag.getLocalName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index c672acb8..1545185c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -66,7 +66,7 @@ public class JSImportHandlingUtil {
         IMPORT_RESOLVE_CACHE =
         new UserDataCache<>() {
             @Override
-            protected CachedValue<Map<String, JSImportedElementResolveResult>> compute(final PsiElement psiElement, final Object p) {
+            protected CachedValue<Map<String, JSImportedElementResolveResult>> compute(PsiElement psiElement, Object p) {
                 return CachedValuesManager.getManager(psiElement.getProject()).createCachedValue(
                     () -> new CachedValueProvider.Result<Map<String, JSImportedElementResolveResult>>(
                         new ConcurrentHashMap<>(),
@@ -77,8 +77,8 @@ protected CachedValue<Map<String, JSImportedElementResolveResult>> compute(final
             }
         };
 
-    public static String resolveTypeName(final String _str, @Nonnull PsiElement context) {
-        final JSImportedElementResolveResult resolveResult = _resolveTypeName(_str, context);
+    public static String resolveTypeName(String _str, @Nonnull PsiElement context) {
+        JSImportedElementResolveResult resolveResult = _resolveTypeName(_str, context);
         if (resolveResult == null) {
             return _str;
         }
@@ -86,16 +86,16 @@ public static String resolveTypeName(final String _str, @Nonnull PsiElement cont
     }
 
     // TODO _str should be JSReferenceExpression for caching!
-    private static JSImportedElementResolveResult _resolveTypeName(final String _name, @Nonnull PsiElement context) {
+    private static JSImportedElementResolveResult _resolveTypeName(String _name, @Nonnull PsiElement context) {
         String name = _name;
         if (name == null) {
             return null;
         }
-        final int i = name.indexOf('<');
+        int i = name.indexOf('<');
         String signature = null;
 
         if (i != -1) {
-            final int index = name.lastIndexOf('.', i);
+            int index = name.lastIndexOf('.', i);
             if (index == -1) {
                 return null;
             }
@@ -107,9 +107,9 @@ private static JSImportedElementResolveResult _resolveTypeName(final String _nam
             return null;
         }
 
-        final Ref<JSImportedElementResolveResult> resultRef = new Ref<JSImportedElementResolveResult>();
+        Ref<JSImportedElementResolveResult> resultRef = new Ref<JSImportedElementResolveResult>();
 
-        final String name1 = name;
+        String name1 = name;
         JSResolveUtil.walkOverStructure(
             context,
             context1 -> {
@@ -117,13 +117,13 @@ private static JSImportedElementResolveResult _resolveTypeName(final String _nam
 
                 if (context1 instanceof XmlBackedJSClassImpl xmlBackedJSClass) { // reference list in mxml
                     XmlTag rootTag = xmlBackedJSClass.getParent();
-                    final XmlElementDescriptor descriptor = rootTag != null ? rootTag.getDescriptor() : null;
+                    XmlElementDescriptor descriptor = rootTag != null ? rootTag.getDescriptor() : null;
                     PsiElement element = descriptor != null ? descriptor.getDeclaration() : null;
                     if (element instanceof XmlFile xmlFile) {
                         element = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
                     }
 
-                    final String s = element instanceof JSClass jsClass ? jsClass.getQualifiedName() : rootTag.getLocalName();
+                    String s = element instanceof JSClass jsClass ? jsClass.getQualifiedName() : rootTag.getLocalName();
                     resolved = new JSImportedElementResolveResult(s);
                 }
                 else if (context1 instanceof JSQualifiedNamedElement qualifiedNamedElement) {
@@ -134,13 +134,13 @@ else if (context1 instanceof JSQualifiedNamedElement qualifiedNamedElement) {
                         resolved = resolveTypeNameUsingImports(name1, qualifiedNamedElement);
 
                         if (resolved == null) {
-                            final String qName = qualifiedNamedElement.getQualifiedName();
-                            final String packageName = qName != null ? context1 instanceof JSPackageStatement
+                            String qName = qualifiedNamedElement.getQualifiedName();
+                            String packageName = qName != null ? context1 instanceof JSPackageStatement
                                 ? qName + "."
                                 : qName.substring(0, qName.lastIndexOf('.') + 1) : "";
 
                             if (packageName.length() != 0) {
-                                final PsiElement byQName = JSClassBase.findClassFromNamespace(packageName + name1, context1);
+                                PsiElement byQName = JSClassBase.findClassFromNamespace(packageName + name1, context1);
 
                                 if (byQName instanceof JSQualifiedNamedElement byQNameNamed) {
                                     resolved = new JSImportedElementResolveResult(byQNameNamed.getQualifiedName());
@@ -189,9 +189,9 @@ else if (context1 instanceof JSQualifiedNamedElement qualifiedNamedElement) {
         return result;
     }
 
-    private static JSQualifiedNamedElement resolveTypeNameInTheSamePackage(final String str, final PsiElement context) {
-        final String packageQualifierText = JSResolveUtil.findPackageStatementQualifier(context);
-        final String candidateText = packageQualifierText != null ? packageQualifierText + "." + str : str;
+    private static JSQualifiedNamedElement resolveTypeNameInTheSamePackage(String str, PsiElement context) {
+        String packageQualifierText = JSResolveUtil.findPackageStatementQualifier(context);
+        String candidateText = packageQualifierText != null ? packageQualifierText + "." + str : str;
 
         PsiElement byQName = JSClassBase.findClassFromNamespace(candidateText, context);
         if (byQName instanceof JSQualifiedNamedElement) {
@@ -210,7 +210,7 @@ private static JSQualifiedNamedElement resolveTypeNameInTheSamePackage(final Str
 
     public static
     @Nullable
-    JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull final JSReferenceExpression expr) {
+    JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull JSReferenceExpression expr) {
         if (expr.getQualifier() != null) {
             return null;
         }
@@ -227,7 +227,7 @@ JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull final JSRefe
 
     private static
     @Nullable
-    JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String referencedName, PsiNamedElement parent) {
+    JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull String referencedName, PsiNamedElement parent) {
         LanguageVersion languageVersion = parent.getLanguageVersion();
         if (languageVersion instanceof JavaScriptVersionWithHelper javaScriptVersionWithHelper) {
             ResolveHelper helper = javaScriptVersionWithHelper.getHelper();
@@ -238,7 +238,7 @@ JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String
             }
         }
 
-        final Map<String, JSImportedElementResolveResult> map = IMPORT_RESOLVE_CACHE.get(IMPORT_RESOLVE_CACHE_KEY, parent, null).getValue();
+        Map<String, JSImportedElementResolveResult> map = IMPORT_RESOLVE_CACHE.get(IMPORT_RESOLVE_CACHE_KEY, parent, null).getValue();
         JSImportedElementResolveResult result = map.get(referencedName);
 
         if (result == null) {
@@ -250,10 +250,10 @@ JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String
     }
 
     private static JSImportedElementResolveResult resolveTypeNameUsingImportsInner(
-        final String referencedName,
-        final PsiNamedElement parent
+        String referencedName,
+        PsiNamedElement parent
     ) {
-        final Map<String, Object> value = IMPORT_LIST_CACHE.get(IMPORT_LIST_CACHE_KEY, parent, null).getValue();
+        Map<String, Object> value = IMPORT_LIST_CACHE.get(IMPORT_LIST_CACHE_KEY, parent, null).getValue();
         JSImportedElementResolveResult expression = FlexImportSupport.tryFindInMap(referencedName, parent, value);
         if (expression != null) {
             return expression;
@@ -263,22 +263,22 @@ private static JSImportedElementResolveResult resolveTypeNameUsingImportsInner(
             return checkTheSamePackageOrGlobal(referencedName, parent);
         }
         else if (parent instanceof JSFile && parent.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4)) {
-            final PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
+            PsiElement element = JSResolveUtil.getClassReferenceForXmlFromContext(parent);
 
             if (element instanceof XmlBackedJSClassImpl xmlBackedJSClass) {
-                final ResolveProcessor processor = new ResolveProcessor(referencedName);
-                final boolean b = xmlBackedJSClass.doImportFromScripts(processor, parent);
+                ResolveProcessor processor = new ResolveProcessor(referencedName);
+                boolean b = xmlBackedJSClass.doImportFromScripts(processor, parent);
 
                 if (!b) {
-                    final JSQualifiedNamedElement jsClass = (JSQualifiedNamedElement)processor.getResult();
+                    JSQualifiedNamedElement jsClass = (JSQualifiedNamedElement)processor.getResult();
                     return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, processor.getImportUsed());
                 }
 
                 JSQualifiedNamedElement jsClass = resolveTypeNameInTheSamePackage(referencedName, element);
 
                 if (jsClass == null) {
-                    final JSClass parentClass = (JSClass)element;
-                    final JSClass[] classes = parentClass.getSuperClasses();
+                    JSClass parentClass = (JSClass)element;
+                    JSClass[] classes = parentClass.getSuperClasses();
 
                     if (classes != null && classes.length > 0 && referencedName.equals(classes[0].getName())) {
                         jsClass = classes[0];
@@ -290,7 +290,7 @@ else if (parent instanceof JSFile && parent.getLanguage().isKindOf(JavaScriptSup
                 }
             }
             else {
-                final JSImportedElementResolveResult resolveResult = checkTheSamePackageOrGlobal(referencedName, parent);
+                JSImportedElementResolveResult resolveResult = checkTheSamePackageOrGlobal(referencedName, parent);
                 if (resolveResult != null) {
                     return resolveResult;
                 }
@@ -307,7 +307,7 @@ else if (parent instanceof XmlBackedJSClassImpl xmlBackedJSClass) {
                 return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, null);
             }
 
-            final Ref<JSImportedElementResolveResult> result = new Ref<JSImportedElementResolveResult>();
+            Ref<JSImportedElementResolveResult> result = new Ref<JSImportedElementResolveResult>();
             processInlineComponentsInScope(
                 xmlBackedJSClass,
                 inlineComponent -> {
@@ -337,8 +337,8 @@ private static boolean processInlineComponentsInScope(XmlBackedJSClassImpl conte
         return true;
     }
 
-    private static JSImportedElementResolveResult checkTheSamePackageOrGlobal(final String referencedName, final PsiNamedElement parent) {
-        final JSQualifiedNamedElement jsClass = resolveTypeNameInTheSamePackage(referencedName, parent);
+    private static JSImportedElementResolveResult checkTheSamePackageOrGlobal(String referencedName, PsiNamedElement parent) {
+        JSQualifiedNamedElement jsClass = resolveTypeNameInTheSamePackage(referencedName, parent);
 
         if (jsClass != null) {
             return new JSImportedElementResolveResult(jsClass.getQualifiedName(), jsClass, null);
@@ -346,20 +346,20 @@ private static JSImportedElementResolveResult checkTheSamePackageOrGlobal(final
         return null;
     }
 
-    public static boolean tryResolveImports(final PsiScopeProcessor processor, PsiNamedElement parent, @Nonnull PsiElement place) {
+    public static boolean tryResolveImports(PsiScopeProcessor processor, PsiNamedElement parent, @Nonnull PsiElement place) {
         return !isAdequatePlaceForImport(parent, place) || !importClass(processor, parent);
     }
 
-    public static boolean importClass(final PsiScopeProcessor processor, final PsiNamedElement parent) {
+    public static boolean importClass(PsiScopeProcessor processor, PsiNamedElement parent) {
         if (processor instanceof ResolveProcessor resolveProcessor && resolveProcessor.isLocalResolve()) {
             return false;
         }
         ResolveProcessor resolveProcessor = (ResolveProcessor)processor;
-        final String s = resolveProcessor.getName();
+        String s = resolveProcessor.getName();
 
         if (s != null) {
             if (resolveProcessor.specificallyAskingToResolveQualifiedNames()) {
-                final Map<String, Object> value = IMPORT_LIST_CACHE.get(IMPORT_LIST_CACHE_KEY, parent, null).getValue();
+                Map<String, Object> value = IMPORT_LIST_CACHE.get(IMPORT_LIST_CACHE_KEY, parent, null).getValue();
                 JSImportedElementResolveResult resolveResult =
                     FlexImportSupport.tryFindInMap(s, parent, value, resolveProcessor.getQualifiedNameToImport());
                 if (dispatchResult(resolveResult, processor)) {
@@ -367,7 +367,7 @@ public static boolean importClass(final PsiScopeProcessor processor, final PsiNa
                 }
             }
 
-            final JSImportedElementResolveResult expression = resolveTypeNameUsingImports(s, parent);
+            JSImportedElementResolveResult expression = resolveTypeNameUsingImports(s, parent);
 
             if (dispatchResult(expression, processor)) {
                 return true;
@@ -380,7 +380,7 @@ public static boolean importClass(final PsiScopeProcessor processor, final PsiNa
             )) {
                 return false;
             }
-            final String packageQualifierText = JSResolveUtil.findPackageStatementQualifier(parent);
+            String packageQualifierText = JSResolveUtil.findPackageStatementQualifier(parent);
             importClassViaHelper(processor, parent, packageQualifierText);
         }
 
@@ -389,7 +389,7 @@ public static boolean importClass(final PsiScopeProcessor processor, final PsiNa
 
     private static boolean dispatchResult(JSImportedElementResolveResult expression, PsiScopeProcessor processor) {
         if (expression != null) {
-            final PsiElement element = expression.resolvedElement;
+            PsiElement element = expression.resolvedElement;
 
             if (element != null) {
                 ResolveState state = ResolveState.initial();
@@ -404,25 +404,25 @@ private static boolean dispatchResult(JSImportedElementResolveResult expression,
     }
 
     public static void importClassViaHelper(
-        final PsiScopeProcessor processor,
-        final PsiNamedElement file,
-        final String packageQualifierText
+        PsiScopeProcessor processor,
+        PsiNamedElement file,
+        String packageQualifierText
     ) {
         for (JSResolveHelper helper : Extensions.getExtensions(JSResolveHelper.EP_NAME)) {
             helper.importClass(processor, file, packageQualifierText);
         }
     }
 
-    public static boolean isAdequatePlaceForImport(final PsiNamedElement parent, @Nonnull PsiElement place) {
+    public static boolean isAdequatePlaceForImport(PsiNamedElement parent, @Nonnull PsiElement place) {
         if (parent instanceof JSFile && !parent.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4)) {
             return false;
         }
 
         if (place instanceof JSReferenceExpression) {
-            final PsiElement placeParent = place.getParent();
+            PsiElement placeParent = place.getParent();
 
             if (placeParent instanceof JSReferenceExpression) {
-                final PsiElement currentParent = JSResolveUtil.getTopReferenceParent(placeParent);
+                PsiElement currentParent = JSResolveUtil.getTopReferenceParent(placeParent);
 
                 if (JSResolveUtil.isSelfReference(currentParent, place) ||
                     //currentParent instanceof JSDefinitionExpression ||
@@ -443,10 +443,10 @@ else if (!(place instanceof JSFile)) {
 
     private static class ImportListDataCache extends UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object> {
         @Override
-        protected final CachedValue<Map<String, Object>> compute(final PsiElement owner, Object o) {
+        protected final CachedValue<Map<String, Object>> compute(PsiElement owner, Object o) {
             return CachedValuesManager.getManager(owner.getProject()).createCachedValue(
                 () -> {
-                    final Map<String, Object> result = new HashMap<>();
+                    Map<String, Object> result = new HashMap<>();
                     collect(result, owner, null);
                     return new CachedValueProvider.Result<>(result, owner);
                 },
@@ -454,11 +454,11 @@ protected final CachedValue<Map<String, Object>> compute(final PsiElement owner,
             );
         }
 
-        private static void collect(final Map<String, Object> result, final PsiElement owner, Set<PsiFile> visitedIncludes) {
+        private static void collect(Map<String, Object> result, PsiElement owner, Set<PsiFile> visitedIncludes) {
             PsiElement[] children = PsiElement.EMPTY_ARRAY;
 
             if (owner instanceof JSIncludeDirective includeDirective) {
-                final PsiFile file = includeDirective.resolveFile();
+                PsiFile file = includeDirective.resolveFile();
                 if (file != null && (visitedIncludes == null || !visitedIncludes.contains(file))) {
                     if (visitedIncludes == null) {
                         visitedIncludes = new HashSet<>();
@@ -476,7 +476,7 @@ else if (owner instanceof JSFile || owner instanceof JSStubElementImpl) {
 
             for (PsiElement c : children) {
                 if (c instanceof JSImportStatement) {
-                    final JSImportStatement s = ((JSImportStatement)c);
+                    JSImportStatement s = ((JSImportStatement)c);
 
                     if (s.getImportText() != null) {
                         FlexImportSupport.appendToMap(result, s);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
index 97421ed4..4b98a3ab 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportedElementResolveResult.java
@@ -39,7 +39,7 @@ public JSImportedElementResolveResult(String _qualifiedName, PsiElement _resolve
         importStatement = _importString;
     }
 
-    public JSImportedElementResolveResult appendSignature(final String s) {
+    public JSImportedElementResolveResult appendSignature(String s) {
         return new JSImportedElementResolveResult(qualifiedName + s, resolvedElement, importStatement);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 0f64fb11..767b0989 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -97,24 +97,24 @@ public class ResolveProcessor extends UserDataHolderBase implements PsiScopeProc
 
     private ResolveHelper myResolveHelper;
 
-    public ResolveProcessor(final String name) {
+    public ResolveProcessor(String name) {
         this(name, false);
     }
 
-    public ResolveProcessor(final String name, boolean toStopOnAssignment) {
+    public ResolveProcessor(String name, boolean toStopOnAssignment) {
         myName = name;
         myToStopOnAssignment = toStopOnAssignment;
         place = null;
     }
 
-    public ResolveProcessor(final String name, PsiElement _place) {
+    public ResolveProcessor(String name, PsiElement _place) {
         myName = name;
         place = _place;
-        final boolean b = place instanceof JSReferenceExpression && ((JSReferenceExpression)place).getQualifier() == null;
+        boolean b = place instanceof JSReferenceExpression && ((JSReferenceExpression)place).getQualifier() == null;
         allowUnqualifiedStaticsFromInstance = b;
 
         if (myName != null && place instanceof JSReferenceExpression placeRefExpr) {
-            final ASTNode node = place.getNode().findChildByType(JSTokenTypes.COLON_COLON);
+            ASTNode node = place.getNode().findChildByType(JSTokenTypes.COLON_COLON);
             String explicitNs = null;
 
             // TODO: e.g. protected is also ns
@@ -144,7 +144,7 @@ else if (qualifier instanceof JSReferenceExpression qualifierRefExpr
 
             if (parent instanceof JSReferenceList) {
                 if (parent.getNode().getElementType() == JSElementTypes.EXTENDS_LIST) {
-                    final PsiElement element = parent.getParent();
+                    PsiElement element = parent.getParent();
                     if (element instanceof JSClass jsClass) {
                         if (jsClass.isInterface()) {
                             myAcceptOnlyClasses = false;
@@ -190,7 +190,7 @@ public List<PsiElement> getResults() {
     @RequiredReadAction
     public boolean execute(@Nonnull PsiElement element, ResolveState state) {
         if ((element instanceof JSVariable && !(element instanceof JSParameter)) || element instanceof JSFunction) {
-            final JSAttributeList attributeList = ((JSAttributeListOwner)element).getAttributeList();
+            JSAttributeList attributeList = ((JSAttributeListOwner)element).getAttributeList();
 
             // TODO: we should accept such values during resolve but make them invalid
             if (!acceptPrivateMembers
@@ -234,7 +234,7 @@ else if (!allowUnqualifiedStaticsFromInstance && attributeList != null
 
         if (myAcceptOnlyClasses || myAcceptOnlyInterfaces) {
             if (element instanceof JSClass jsClass) {
-                final boolean isInterface = jsClass.isInterface();
+                boolean isInterface = jsClass.isInterface();
 
                 if ((myAcceptOnlyClasses && isInterface) || (myAcceptOnlyInterfaces && !isInterface)) {
                     return true;
@@ -254,7 +254,7 @@ else if (!allowUnqualifiedStaticsFromInstance && attributeList != null
         }
 
         if (place != null && element instanceof JSFunction function && !(element instanceof JSFunctionExpression)) {
-            final PsiElement placeParent = place.getParent();
+            PsiElement placeParent = place.getParent();
 
             if (placeParent instanceof JSDefinitionExpression
                 || (myName == null && placeParent instanceof JSExpressionStatement /* when complete of setter*/)
@@ -273,7 +273,7 @@ else if (function.isSetProperty()) {
 
         if (place != null && (place.getParent() instanceof JSNewExpression || place instanceof JSSuperExpression)) {
             if (element instanceof JSClass jsClass) {
-                final JSFunction byName = jsClass.findFunctionByName(jsClass.getName());
+                JSFunction byName = jsClass.findFunctionByName(jsClass.getName());
                 if (byName != null) {
                     element = byName;
                 }
@@ -369,7 +369,7 @@ private JavaScriptImportStatementBase checkQualifiedNameHasNecessaryImport(
                 final String qName = ((JSQualifiedNamedElement)element).getQualifiedName();
 
                 if (qName != null && qName.indexOf('.') != -1) {
-                    final ResolveProcessor processor = new ResolveProcessor(myName) {
+                    ResolveProcessor processor = new ResolveProcessor(myName) {
                         @Override
                         @RequiredReadAction
                         public boolean execute(@Nonnull PsiElement element, ResolveState state) {
@@ -401,7 +401,7 @@ public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                             myResolveStatus.add(Boolean.FALSE);
                         }
                         else {
-                            final ResolveResult[] resultsAsResolveResults = processor.getResultsAsResolveResults();
+                            ResolveResult[] resultsAsResolveResults = processor.getResultsAsResolveResults();
                             if (resultsAsResolveResults.length != 0) {
                                 s = ((JSResolveUtil.MyResolveResult)resultsAsResolveResults[0]).getImportUsed();
                             }
@@ -414,7 +414,7 @@ public boolean execute(@Nonnull PsiElement element, ResolveState state) {
     }
 
     @RequiredReadAction
-    private static PsiElement getElement(final PsiElement element) {
+    private static PsiElement getElement(PsiElement element) {
         return element instanceof XmlTag xmlTag
             ? xmlTag.getAttribute("name").getValueElement().getChildren()[1]
             : element;
@@ -431,11 +431,11 @@ public <T> T getHint(@Nonnull Key<T> hintClass) {
         return null;
     }
 
-    protected void setTypeName(final String qualifiedName) {
+    protected void setTypeName(String qualifiedName) {
         myTypeName = qualifiedName;
     }
 
-    public void configureClassScope(final JSClass jsClass) {
+    public void configureClassScope(JSClass jsClass) {
         if (jsClass != null) {
             myClassScopeTypeName = jsClass.getQualifiedName();
         }
@@ -450,11 +450,11 @@ public void handleEvent(Event event, Object associated) {
         if (event == Event.SET_DECLARATION_HOLDER) {
             if (associated instanceof JSClass) {
                 myClassDeclarationStarted = true;
-                final JSClass jsClass = (JSClass)associated;
+                JSClass jsClass = (JSClass)associated;
                 final String qName = jsClass.getQualifiedName();
 
                 if (!encounteredDynamicClassesSet) {
-                    final JSAttributeList attributeList = jsClass.getAttributeList();
+                    JSAttributeList attributeList = jsClass.getAttributeList();
                     if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
                         encounteredDynamicClasses = true;
                     }
@@ -472,9 +472,9 @@ public void handleEvent(Event event, Object associated) {
                         acceptProtectedMembers = myClassScopeTypeName.equals(qName);
 
                         if (!acceptProtectedMembers) {
-                            final PsiElement element = JSClassImpl.findClassFromNamespace(myClassScopeTypeName, place);
+                            PsiElement element = JSClassImpl.findClassFromNamespace(myClassScopeTypeName, place);
                             if (element instanceof JSClass) {
-                                final boolean b = element.processDeclarations(
+                                boolean b = element.processDeclarations(
                                     new ResolveProcessor(null) {
                                         {
                                             setTypeContext(true);
@@ -514,7 +514,7 @@ public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                 }
             }
             else if (associated instanceof JSAttributeListOwner attributeListOwner) {
-                final JSAttributeList attributeList = attributeListOwner.getAttributeList();
+                JSAttributeList attributeList = attributeListOwner.getAttributeList();
 
                 if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
                     && (place == null || !(place.getParent() instanceof JSNewExpression))) {
@@ -522,7 +522,7 @@ else if (associated instanceof JSAttributeListOwner attributeListOwner) {
                 }
 
                 if (associated instanceof JSFunctionExpression functionExpression) {
-                    final PsiElement context = functionExpression.getContainingFile().getContext();
+                    PsiElement context = functionExpression.getContainingFile().getContext();
                     if (!(context instanceof XmlAttributeValue)) {
                         encounteredFunctionExpression = true; // we create anonymous fun exprs for event handlers
                     }
@@ -539,7 +539,7 @@ public boolean isToProcessHierarchy() {
         return toProcessHierarchy;
     }
 
-    public void setToProcessHierarchy(final boolean toProcessHierarchy) {
+    public void setToProcessHierarchy(boolean toProcessHierarchy) {
         this.toProcessHierarchy = toProcessHierarchy;
     }
 
@@ -547,7 +547,7 @@ public boolean isToSkipClassDeclarationOnce() {
         return toSkipClassDeclarationOnce;
     }
 
-    public void setToSkipClassDeclarationsOnce(final boolean toSkipClassDeclarationOnce) {
+    public void setToSkipClassDeclarationsOnce(boolean toSkipClassDeclarationOnce) {
         this.toSkipClassDeclarationOnce = toSkipClassDeclarationOnce;
     }
 
@@ -555,7 +555,7 @@ public boolean foundAllValidResults() {
         return !encounteredFunctionExpression; // TODO: with statement too?
     }
 
-    public void setTypeContext(final boolean b) {
+    public void setTypeContext(boolean b) {
         myTypeContext = b;
     }
 
@@ -564,14 +564,14 @@ public boolean isTypeContext() {
     }
 
     public ResolveResult[] getResultsAsResolveResults() {
-        final List<PsiElement> processorResults = getResults();
+        List<PsiElement> processorResults = getResults();
         if (processorResults == null) {
             return ResolveResult.EMPTY_ARRAY;
         }
-        final ResolveResult[] results = new ResolveResult[processorResults.size()];
+        ResolveResult[] results = new ResolveResult[processorResults.size()];
 
         for (int i = 0; i < results.length; ++i) {
-            final PsiElement element = processorResults.get(i);
+            PsiElement element = processorResults.get(i);
             results[i] = new JSResolveUtil.MyResolveResult(
                 element,
                 myImportsUsed != null ? myImportsUsed.get(i) : null,
@@ -591,17 +591,17 @@ public Object[] getResultsAsObjects() {
 
     @RequiredReadAction
     public Object[] getResultsAsObjects(String qualifiedNameToSkip) {
-        final List<PsiElement> processorResults = getResults();
+        List<PsiElement> processorResults = getResults();
         if (processorResults == null) {
             return ArrayUtil.EMPTY_OBJECT_ARRAY;
         }
-        final int numberOfVariants = processorResults.size();
-        final List<Object> objects = new ArrayList<>(numberOfVariants);
-        final Set<String> processedCandidateNames = new HashSet<>(numberOfVariants);
+        int numberOfVariants = processorResults.size();
+        List<Object> objects = new ArrayList<>(numberOfVariants);
+        Set<String> processedCandidateNames = new HashSet<>(numberOfVariants);
 
         for (int i = 0; i < numberOfVariants; ++i) {
-            final PsiElement namedElement = processorResults.get(i);
-            final String name = getName((PsiNamedElement)namedElement);
+            PsiElement namedElement = processorResults.get(i);
+            String name = getName((PsiNamedElement)namedElement);
             if (name == null) {
                 continue;
             }
@@ -628,7 +628,7 @@ public boolean isToProcessMembers() {
         return toProcessMembers;
     }
 
-    public void setToProcessMembers(final boolean toProcessMembers) {
+    public void setToProcessMembers(boolean toProcessMembers) {
         this.toProcessMembers = toProcessMembers;
     }
 
@@ -640,7 +640,7 @@ public boolean checkVisited(String className) {
         return false;
     }
 
-    public void setProcessStatics(final boolean processStatics) {
+    public void setProcessStatics(boolean processStatics) {
         this.processStatics = processStatics;
     }
 
@@ -648,7 +648,7 @@ public boolean isLocalResolve() {
         return localResolve;
     }
 
-    public void setLocalResolve(final boolean localResolve) {
+    public void setLocalResolve(boolean localResolve) {
         this.localResolve = localResolve;
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index e5213079..4e573ca7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -57,17 +57,17 @@ public VariantsProcessor(String[] nameIds, PsiFile targetFile, boolean skipDclsI
         nameIds = myContextNameIds;
 
         boolean hasSomeInfoAvailable = nameIds != null && nameIds.length > 0;
-        final List<String[]> possibleNameComponents = new ArrayList<>(1);
+        List<String[]> possibleNameComponents = new ArrayList<>(1);
         myCurrentFile = targetFile.getOriginalFile();
         //myTargetFiles = new HashSet<PsiFile>();
 
         boolean allTypesResolved = false;
         boolean doAddContextIds = true;
 
-        final JSClass jsClass = PsiTreeUtil.getParentOfType(context, JSClass.class);
+        JSClass jsClass = PsiTreeUtil.getParentOfType(context, JSClass.class);
 
         if (context instanceof JSReferenceExpression) {
-            final JSReferenceExpression refExpr = (JSReferenceExpression)context;
+            JSReferenceExpression refExpr = (JSReferenceExpression)context;
             JSExpression qualifier = refExpr.getQualifier();
 
             if (qualifier != null) {
@@ -82,12 +82,12 @@ else if (JSResolveUtil.getTypeFromTagNameInMxml(myCurrentFile.getContext()) != n
                     }
                 }
 
-                final CompletionTypeProcessor processor = new CompletionTypeProcessor(possibleNameComponents);
+                CompletionTypeProcessor processor = new CompletionTypeProcessor(possibleNameComponents);
                 doEvalForExpr(getOriginalQualifier(qualifier), myTargetFile, processor);
                 allTypesResolved = processor.getAllTypesResolved();
             }
             else {
-                final PsiElement parent = refExpr.getParent();
+                PsiElement parent = refExpr.getParent();
 
                 if (parent instanceof JavaScriptImportStatementBase) {
                     myProcessOnlyTypes = true;
@@ -130,8 +130,8 @@ else if (jsClass != null) {
     }
 
     @RequiredReadAction
-    private void updateCanUseOnlyCompleteMatchesFromString(final String qName, Object source, PsiElement clazz) {
-        final boolean wasSet = myAddOnlyCompleteMatchesSet;
+    private void updateCanUseOnlyCompleteMatchesFromString(String qName, Object source, PsiElement clazz) {
+        boolean wasSet = myAddOnlyCompleteMatchesSet;
 
         if (myAddOnlyCompleteMatches || !wasSet) {
             myAddOnlyCompleteMatchesSet = true;
@@ -155,7 +155,7 @@ private void updateCanUseOnlyCompleteMatchesFromString(final String qName, Objec
                         myAddOnlyCompleteMatches = true;
                     }
 
-                    final JSAttributeList attributeList = jsClass.getAttributeList();
+                    JSAttributeList attributeList = jsClass.getAttributeList();
                     if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)
                         && !OBJECT_CLASS_NAME.equals(qName)) {
                         myAddOnlyCompleteMatches = false;
@@ -165,25 +165,25 @@ private void updateCanUseOnlyCompleteMatchesFromString(final String qName, Objec
         }
     }
 
-    private static boolean isObjectSourceThatDoesNotGiveExactKnowledgeAboutFunctionType(final Object source) {
+    private static boolean isObjectSourceThatDoesNotGiveExactKnowledgeAboutFunctionType(Object source) {
         return source instanceof JSFunctionExpression;
     }
 
     @RequiredReadAction
-    private void updateCanUseOnlyCompleteMatches(final JSClass jsClass) {
-        final JSAttributeList attributeList = jsClass != null ? jsClass.getAttributeList() : null;
+    private void updateCanUseOnlyCompleteMatches(JSClass jsClass) {
+        JSAttributeList attributeList = jsClass != null ? jsClass.getAttributeList() : null;
         if (attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.DYNAMIC)) {
             myAddOnlyCompleteMatches = false;
         }
     }
 
     @RequiredReadAction
-    public void addLocalResults(final List<PsiElement> results) {
+    public void addLocalResults(List<PsiElement> results) {
         if (results == null) {
             return;
         }
 
-        final Set<String> processedCandidateNames = new HashSet<>(results.size());
+        Set<String> processedCandidateNames = new HashSet<>(results.size());
 
         for (PsiElement e : results) {
             if (e instanceof PsiNamedElement namedElement) {
@@ -245,8 +245,8 @@ public boolean getAllTypesResolved() {
         }
     }
 
-    private void addSupers(final String type, final List<String[]> possibleNameIds, final EvaluateContext context) {
-        final String iteratedType = myIteratedTypeName;
+    private void addSupers(String type, List<String[]> possibleNameIds, EvaluateContext context) {
+        String iteratedType = myIteratedTypeName;
         myIteratedTypeName = type;
         doIterateHierarchy(
             type,
@@ -291,8 +291,8 @@ public boolean execute(@Nonnull PsiElement element, ResolveState state) {
         return true;
     }
 
-    private void doAdd(final String nameId, final PsiElement element) {
-        final String name = nameId != null ? nameId : null;
+    private void doAdd(String nameId, PsiElement element) {
+        String name = nameId != null ? nameId : null;
 
         boolean seemsToBePrivateSymbol =
             name != null && name.length() > 0 && name.charAt(0) == '_' && name.length() > 1 && name.charAt(1) != '_';
@@ -328,13 +328,13 @@ else if (matchType == MatchType.COMPLETE) {
     }
 
     @RequiredReadAction
-    private LookupElement addLookupValue(PsiElement element, final String name, JSLookupUtil.LookupPriority priority) {
+    private LookupElement addLookupValue(PsiElement element, String name, JSLookupUtil.LookupPriority priority) {
         return JSLookupUtil.createLookupItem(element, name, priority);
     }
 
     @Override
     @RequiredReadAction
-    protected String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression) {
+    protected String[] calculateContextIds(JSReferenceExpression jsReferenceExpression) {
         return JSResolveUtil.buildNameIdsForQualifier(JSResolveUtil.getRealRefExprQualifier(jsReferenceExpression));
     }
 
@@ -343,14 +343,14 @@ protected boolean isFromRelevantFileOrDirectory() {
         return super.isFromRelevantFileOrDirectory(); // || myTargetFiles.contains(myCurrentFile);
     }
 
-    private void addCompleteMatch(final PsiElement _element, String nameId) {
+    private void addCompleteMatch(PsiElement _element, String nameId) {
         addCompleteMatch(_element, nameId, true);
     }
 
-    private void addCompleteMatch(final PsiElement _element, String nameId, boolean doFilterting) {
+    private void addCompleteMatch(PsiElement _element, String nameId, boolean doFilterting) {
         if (!doAdd(_element, nameId, doFilterting)) {
             boolean removedFromPartialNames = false;
-            final Object el = myNames2CandidatesMap.get(nameId);
+            Object el = myNames2CandidatesMap.get(nameId);
 
             if (el != null) {
                 removedFromPartialNames =
@@ -364,7 +364,7 @@ private void addCompleteMatch(final PsiElement _element, String nameId, boolean
         PsiElement element = _element;
 
         if (isFromRelevantFileOrDirectory() && !myAddOnlyCompleteMatches) {
-            final Object o = addLookupValue(element, nameId, JSLookupUtil.LookupPriority.HIGHEST);
+            Object o = addLookupValue(element, nameId, JSLookupUtil.LookupPriority.HIGHEST);
             if (o != null) {
                 myNamesList.add(myThisFileNameListCount++, o);
             }
@@ -373,7 +373,7 @@ private void addCompleteMatch(final PsiElement _element, String nameId, boolean
             }
         }
         else {
-            final Object o = addLookupValue(element, nameId, JSLookupUtil.LookupPriority.HIGH);
+            Object o = addLookupValue(element, nameId, JSLookupUtil.LookupPriority.HIGH);
             if (o != null) {
                 myNamesList.add(o);
             }
@@ -391,7 +391,7 @@ private boolean doAdd(Object element, String nameId, boolean doFilterting) {
         return true;
     }
 
-    private void addPartialMatch(final PsiElement _element, String nameId) {
+    private void addPartialMatch(PsiElement _element, String nameId) {
         if (myAddOnlyCompleteMatches) {
             return;
         }
@@ -401,8 +401,8 @@ private void addPartialMatch(final PsiElement _element, String nameId) {
 
         PsiElement element = _element;
 
-        final Map<String, Object> targetNamesMap;
-        final JSLookupUtil.LookupPriority priority;
+        Map<String, Object> targetNamesMap;
+        JSLookupUtil.LookupPriority priority;
 
         if (isFromRelevantFileOrDirectory()) {
             priority = hasSomeSmartnessAvailable ? JSLookupUtil.LookupPriority.HIGHER : JSLookupUtil.LookupPriority.HIGHEST;
@@ -414,7 +414,7 @@ private void addPartialMatch(final PsiElement _element, String nameId) {
             targetNamesMap = myPartialMatchNamesMap;
         }
 
-        final Object o = addLookupValue(element, nameId, priority);
+        Object o = addLookupValue(element, nameId, priority);
 
         if (o != null) {
             targetNamesMap.put(nameId, o);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
index 3548cd81..13e6e3f8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
@@ -70,11 +70,11 @@ public WalkUpResolveProcessor(
             myInNewExpression = context.getParent() instanceof JSNewExpression;
 
             final List<String[]> possibleNameIds = new ArrayList<>(1);
-            final JSExpression originalQualifier = refExpr.getQualifier();
-            final JSExpression qualifier = JSResolveUtil.getRealRefExprQualifier(refExpr);
+            JSExpression originalQualifier = refExpr.getQualifier();
+            JSExpression qualifier = JSResolveUtil.getRealRefExprQualifier(refExpr);
 
-            final JSClass jsClass = PsiTreeUtil.getParentOfType(context, JSClass.class); // get rid of it!
-            final JSElement file = PsiTreeUtil.getParentOfType(context, JSEmbeddedContentImpl.class, JSFile.class);
+            JSClass jsClass = PsiTreeUtil.getParentOfType(context, JSClass.class); // get rid of it!
+            JSElement file = PsiTreeUtil.getParentOfType(context, JSEmbeddedContentImpl.class, JSFile.class);
 
             if ((file instanceof JSFile && file.getContext() instanceof XmlAttributeValue) || file instanceof JSEmbeddedContentImpl) {
                 embeddedToHtmlAttr = true;
@@ -87,8 +87,8 @@ public WalkUpResolveProcessor(
 
                 if (qualifier instanceof JSThisExpression) {
                     JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(qualifier);
-                    final String contextQualifierText = resolver.getQualifierAsString();
-                    final PsiElement clazz = contextQualifierText != null
+                    String contextQualifierText = resolver.getQualifierAsString();
+                    PsiElement clazz = contextQualifierText != null
                         ? JSClassImpl.findClassFromNamespace(contextQualifierText, context)
                         : null;
 
@@ -96,7 +96,7 @@ public WalkUpResolveProcessor(
                         JSAttributeList attrList = jsClass1.getAttributeList();
 
                         if (attrList != null) {
-                            final boolean clazzIsDynamic = attrList.hasModifier(JSAttributeList.ModifierType.DYNAMIC);
+                            boolean clazzIsDynamic = attrList.hasModifier(JSAttributeList.ModifierType.DYNAMIC);
                             if (clazzIsDynamic) {
                                 haveNotEncounteredDynamics = false;
                             }
@@ -110,7 +110,7 @@ public WalkUpResolveProcessor(
                 }
 
                 if (qualifier == null) {
-                    final JSImportedElementResolveResult expression = JSImportHandlingUtil.resolveTypeNameUsingImports(refExpr);
+                    JSImportedElementResolveResult expression = JSImportHandlingUtil.resolveTypeNameUsingImports(refExpr);
 
                     if (expression != null) {
                         possibleNameIds.add(JSResolveUtil.buildNameIdsForQualifier(JSResolveUtil.getRealRefExprQualifierFromResult(
@@ -147,7 +147,7 @@ public Set<JavaScriptFeature> getFeatures() {
                         }
 
                         @Override
-                        public void process(@Nonnull String type, @Nonnull final EvaluateContext context, final PsiElement source) {
+                        public void process(@Nonnull String type, @Nonnull EvaluateContext context, PsiElement source) {
                             if (context.visitedTypes.contains(type)) {
                                 return;
                             }
@@ -169,7 +169,7 @@ public void process(@Nonnull String type, @Nonnull final EvaluateContext context
                         }
 
                         @Override
-                        public void setUnknownElement(@Nonnull final PsiElement element) {
+                        public void setUnknownElement(@Nonnull PsiElement element) {
                         }
 
                         @Override
@@ -189,14 +189,14 @@ else if (myContextIds == null && contextIds != null) {
             }
         }
         else if (contextIds != null) {
-            final List<String[]> possibleNameIds = new ArrayList<>(1);
+            List<String[]> possibleNameIds = new ArrayList<>(1);
             possibleNameIds.add(contextIds);
             iterateContextIds(contextIds, possibleNameIds, false);
             myContextIds = possibleNameIds.toArray(new String[possibleNameIds.size()][]);
         }
     }
 
-    private void iterateContextIds(final String[] contextIds, final List<String[]> possibleNameIds, final boolean allowObject) {
+    private void iterateContextIds(String[] contextIds, List<String[]> possibleNameIds, boolean allowObject) {
         doIterateTypeHierarchy(
             contextIds,
             clazz -> {
@@ -207,7 +207,7 @@ private void iterateContextIds(final String[] contextIds, final List<String[]> p
     }
 
     protected MatchType isAcceptableQualifiedItem(String nameId, PsiElement element) {
-        final boolean partialMatch = myReferenceName.equals(nameId);
+        boolean partialMatch = myReferenceName.equals(nameId);
 
         if (partialMatch) {
             int i = -1;
@@ -216,7 +216,7 @@ protected MatchType isAcceptableQualifiedItem(String nameId, PsiElement element)
                 int maxContextScanCount = myBestMatchedContextId == -1 ? myContextIds.length : myBestMatchedContextId + 1;
 
                 for (int currentContextIndex = 0; currentContextIndex < maxContextScanCount; ++currentContextIndex) {
-                    final String[] contextIds = myContextIds[currentContextIndex];
+                    String[] contextIds = myContextIds[currentContextIndex];
 
                     if (i < 0) {
                         if (myBestMatchedContextId == -1) {
@@ -240,8 +240,8 @@ else if (currentContextIndex < myBestMatchedContextId) {
         return partialMatch ? MatchType.PARTIAL : MatchType.NOMATCH;
     }
 
-    private void doQualifiedCheck(String nameId, final PsiElement element) {
-        final MatchType matchType = isAcceptableQualifiedItem(nameId, element);
+    private void doQualifiedCheck(String nameId, PsiElement element) {
+        MatchType matchType = isAcceptableQualifiedItem(nameId, element);
 
         if (matchType == MatchType.PARTIAL) {
             addPartialResult(element);
@@ -252,7 +252,7 @@ else if (matchType == MatchType.COMPLETE) {
     }
 
     private void addCompleteResult(PsiElement element) {
-        final JSResolveUtil.MyResolveResult o = new JSResolveUtil.MyResolveResult(element);
+        JSResolveUtil.MyResolveResult o = new JSResolveUtil.MyResolveResult(element);
         addCompleteResult(o);
     }
 
@@ -272,7 +272,7 @@ private void addPartialResult(PsiElement element) {
         if (myPartialMatchResults == null) {
             myPartialMatchResults = new ArrayList<>(1);
         }
-        final JSResolveUtil.MyResolveResult o = new JSResolveUtil.MyResolveResult(element, !myAddOnlyCompleteMatches);
+        JSResolveUtil.MyResolveResult o = new JSResolveUtil.MyResolveResult(element, !myAddOnlyCompleteMatches);
 
         if (isFromRelevantFileOrDirectory()) {
             myPartialMatchResults.add(myFilePartialResultsCount++, o);
@@ -291,12 +291,12 @@ public ResolveResult[] getResults() {
         if (myCompleteMatchResults != null) {
             resultCount += myCompleteMatchResults.size();
         }
-        final boolean addPartialResults = !myAddOnlyCompleteMatches || (resultCount == 0 && myAllowPartialResults);
+        boolean addPartialResults = !myAddOnlyCompleteMatches || (resultCount == 0 && myAllowPartialResults);
         if (myPartialMatchResults != null && addPartialResults) {
             resultCount += myPartialMatchResults.size();
         }
 
-        final ResolveResult[] result = resultCount != 0 ? new ResolveResult[resultCount] : ResolveResult.EMPTY_ARRAY;
+        ResolveResult[] result = resultCount != 0 ? new ResolveResult[resultCount] : ResolveResult.EMPTY_ARRAY;
 
         if (myCompleteMatchResults != null) {
             for (int i = 0; i < myCompleteMatchResults.size(); ++i) {
@@ -308,7 +308,7 @@ public ResolveResult[] getResults() {
         if (myPartialMatchResults != null && addPartialResults) {
             int offset = myCompleteMatchResults != null ? myCompleteMatchResults.size() : 0;
             for (int i = 0; i < myPartialMatchResults.size(); ++i) {
-                final JSResolveUtil.MyResolveResult resolveResult = (JSResolveUtil.MyResolveResult)myPartialMatchResults.get(i);
+                JSResolveUtil.MyResolveResult resolveResult = (JSResolveUtil.MyResolveResult)myPartialMatchResults.get(i);
 
                 assert resolveResult != null;
                 result[offset + i] = resolveResult;
@@ -320,7 +320,7 @@ public ResolveResult[] getResults() {
 
     @Override
     @RequiredReadAction
-    protected String[] calculateContextIds(final JSReferenceExpression jsReferenceExpression) {
+    protected String[] calculateContextIds(JSReferenceExpression jsReferenceExpression) {
         String[] contextNameIds = null;
         JSExpression qualifier = JSResolveUtil.getRealRefExprQualifier(jsReferenceExpression);
 
@@ -334,7 +334,7 @@ else if (qualifier instanceof JSThisExpression || qualifier instanceof JSSuperEx
         return contextNameIds;
     }
 
-    public void addLocalResults(final ResolveResult results[]) {
+    public void addLocalResults(ResolveResult results[]) {
         if (results == null) {
             return;
         }
@@ -349,7 +349,7 @@ public int getCompleteResultCount() {
 
     @Override
     @RequiredReadAction
-    public boolean execute(@Nonnull PsiElement element, final ResolveState state) {
+    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
         if ((element instanceof JSNamedElement namedElement && myReferenceName.equals(namedElement.getName())) || element == myContext) {
             addCompleteResult(element);
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
index e945d416..936c126c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeListStubImpl.java
@@ -41,7 +41,7 @@ public class JSAttributeListStubImpl extends StubBase<JSAttributeList> implement
     private int myFlags;
     private String myNamespace;
 
-    public JSAttributeListStubImpl(String namespace, int flags, final StubElement parent, final IStubElementType elementType) {
+    public JSAttributeListStubImpl(String namespace, int flags, StubElement parent, IStubElementType elementType) {
         super(parent, elementType);
         myNamespace = namespace;
         myFlags = flags;
@@ -49,14 +49,14 @@ public JSAttributeListStubImpl(String namespace, int flags, final StubElement pa
 
     @Override
     public JSAttributeList.AccessType getAccessType() {
-        final int i = (myFlags >> VISIBILITY_TAG_SHIFT) & VISIBILITY_TAG_MASK;
+        int i = (myFlags >> VISIBILITY_TAG_SHIFT) & VISIBILITY_TAG_MASK;
         return types[i];
     }
 
     private static final JSAttributeList.AccessType[] types = JSAttributeList.AccessType.values();
 
     @Override
-    public boolean hasModifier(final JSAttributeList.ModifierType modifier) {
+    public boolean hasModifier(JSAttributeList.ModifierType modifier) {
         return ((myFlags >> getFlagShift(modifier)) & 0x1) != 0;
     }
 
@@ -71,8 +71,8 @@ public int getFlags() {
     }
 
     public static int getFlags(JSAttributeList attributeList) {
-        final JSAttributeList.AccessType accessType = attributeList.getAccessType();
-        final int ord = accessType.ordinal();
+        JSAttributeList.AccessType accessType = attributeList.getAccessType();
+        int ord = accessType.ordinal();
 
         int flags = (ord << VISIBILITY_TAG_SHIFT);
 
@@ -82,7 +82,7 @@ public static int getFlags(JSAttributeList attributeList) {
         return flags;
     }
 
-    private static int getFlagShift(final JSAttributeList.ModifierType modifier) {
+    private static int getFlagShift(JSAttributeList.ModifierType modifier) {
         int shift = -1;
         if (modifier == JSAttributeList.ModifierType.STATIC) {
             shift = STATIC_PROPERTY_SHIFT;
@@ -108,7 +108,7 @@ else if (modifier == JSAttributeList.ModifierType.VIRTUAL) {
         return shift;
     }
 
-    private static int setFlag(int old, final JSAttributeList.ModifierType modifier, boolean value) {
+    private static int setFlag(int old, JSAttributeList.ModifierType modifier, boolean value) {
         if (value) {
             return old | (1 << getFlagShift(modifier));
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
index 546e426b..7de0571b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeNameValuePairStubImpl.java
@@ -30,7 +30,7 @@
 public class JSAttributeNameValuePairStubImpl extends JSNamedObjectStubBase<JSAttributeNameValuePair> implements JSAttributeNameValuePairStub {
     private String myValue;
 
-    public JSAttributeNameValuePairStubImpl(String name, final String value, final StubElement parentStub) {
+    public JSAttributeNameValuePairStubImpl(String name, String value, StubElement parentStub) {
         super(name, 0, parentStub, JSElementTypes.ATTRIBUTE_NAME_VALUE_PAIR);
         myValue = value;
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
index ae627430..cc71dba3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSAttributeStubImpl.java
@@ -28,7 +28,7 @@
  * Time: 11:29:19 PM
  */
 public class JSAttributeStubImpl extends JSNamedObjectStubBase<JSAttribute> implements JSAttributeStub {
-    public JSAttributeStubImpl(final String name, int flags, final StubElement parentStub) {
+    public JSAttributeStubImpl(String name, int flags, StubElement parentStub) {
         super(name, flags, parentStub, JSElementTypes.ATTRIBUTE);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
index 60534e83..5c91f281 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSClassStubImpl.java
@@ -35,8 +35,8 @@ public JSClassStubImpl(
         String name,
         int flags,
         String qName,
-        final StubElement parentStub,
-        final IStubElementType<JSClassStub, JSClass> elementType
+        StubElement parentStub,
+        IStubElementType<JSClassStub, JSClass> elementType
     ) {
         super(name, flags, qName, parentStub, elementType);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
index 68d35578..8bfe4f1d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSFunctionStubImpl.java
@@ -36,19 +36,19 @@ public class JSFunctionStubImpl extends JSQualifiedObjectStubBase<JSFunction> im
     private static final int REFERENCES_ARGUMENTS_MASK = 16;
 
     public JSFunctionStubImpl(
-        final String name,
+        String name,
         int flags,
         String qName,
         String returnType,
-        final StubElement parentStub,
-        final JSStubElementType elementType
+        StubElement parentStub,
+        JSStubElementType elementType
     ) {
         super(name, flags, qName, parentStub, elementType);
         myReturnType = returnType;
     }
 
-    public static int buildFlags(final JSFunction clazz) {
-        final int val = clazz.isConstructor()
+    public static int buildFlags(JSFunction clazz) {
+        int val = clazz.isConstructor()
             ? CONSTRUCTOR_MASK
             : clazz.isGetProperty()
             ? GET_PROPERTY_MASK
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
index 1fa7d547..0ebcdc57 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSImportStatementStubImpl.java
@@ -32,9 +32,9 @@ public class JSImportStatementStubImpl extends StubBase<JSImportStatement> imple
     private final String myImportText;
 
     public JSImportStatementStubImpl(
-        final String importText,
-        final StubElement parentStub,
-        final JSStubElementType<JSImportStatementStub, JSImportStatement> type
+        String importText,
+        StubElement parentStub,
+        JSStubElementType<JSImportStatementStub, JSImportStatement> type
     ) {
         super(parentStub, type);
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
index 90860a6f..240e4c2e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSIncludeDirectiveStubImpl.java
@@ -32,9 +32,9 @@ public class JSIncludeDirectiveStubImpl extends StubBase<JSIncludeDirective> imp
     private final String myIncludeText;
 
     public JSIncludeDirectiveStubImpl(
-        final String includeText,
-        final StubElement parentStub,
-        final JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> type
+        String includeText,
+        StubElement parentStub,
+        JSStubElementType<JSIncludeDirectiveStub, JSIncludeDirective> type
     ) {
         super(parentStub, type);
         myIncludeText = includeText;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
index 426a5f74..152ac25f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSNamedObjectStubBase.java
@@ -31,7 +31,7 @@ public abstract class JSNamedObjectStubBase<T extends PsiNamedElement> extends S
     protected final String myName;
     protected final int myFlags;
 
-    protected JSNamedObjectStubBase(String name, int flags, final StubElement parent, final IStubElementType elementType) {
+    protected JSNamedObjectStubBase(String name, int flags, StubElement parent, IStubElementType elementType) {
         super(parent, elementType);
 
         myName = name;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
index 625c065b..dd72be9f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSParameterStubImpl.java
@@ -43,8 +43,8 @@ public JSParameterStubImpl(
         super(name, flags, type, initial, qName, parentStub, elementType);
     }
 
-    public static int buildFlags(final JSParameter clazz) {
-        final int i = JSVariableStubBaseImpl.buildFlags(clazz);
+    public static int buildFlags(JSParameter clazz) {
+        int i = JSVariableStubBaseImpl.buildFlags(clazz);
         return i | (clazz.isRest() ? REST_MASK : 0) | (clazz.isOptional() ? OPTIONAL_MASK : 0);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
index 86fd103d..017793d0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSQualifiedObjectStubBase.java
@@ -34,8 +34,8 @@ protected JSQualifiedObjectStubBase(
         String name,
         int flags,
         String qName,
-        final StubElement parent,
-        final IStubElementType elementType
+        StubElement parent,
+        IStubElementType elementType
     ) {
         super(name, flags, parent, elementType);
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
index 9ce9fea9..e7af41a0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSReferenceListStubImpl.java
@@ -32,9 +32,9 @@ public class JSReferenceListStubImpl extends StubBase<JSReferenceList> implement
     private String[] myRefs;
 
     public JSReferenceListStubImpl(
-        final String[] refs,
-        final StubElement parentStub,
-        final JSStubElementType<JSReferenceListStub, JSReferenceList> type
+        String[] refs,
+        StubElement parentStub,
+        JSStubElementType<JSReferenceListStub, JSReferenceList> type
     ) {
         super(parentStub, type);
         myRefs = refs;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
index abf649a4..9e83b1e8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/stubs/impl/JSVariableStubBaseImpl.java
@@ -36,20 +36,20 @@ public abstract class JSVariableStubBaseImpl<T extends JSVariable> extends JSQua
     private String myInitializerText;
 
     public JSVariableStubBaseImpl(
-        final String name,
+        String name,
         int flags,
         String type,
         String initial,
         String qName,
-        final StubElement parentStub,
-        final IStubElementType elementType
+        StubElement parentStub,
+        IStubElementType elementType
     ) {
         super(name, flags, qName, parentStub, elementType);
         myTypeString = type;
         myInitializerText = initial;
     }
 
-    public static int buildFlags(final JSVariable clazz) {
+    public static int buildFlags(JSVariable clazz) {
         return (clazz.isDeprecated() ? DEPRECATED_MASK : 0) | (clazz.isConst() ? CONST_MASK : clazz.isLocal() ? LOCAL_MASK : 0);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
index bfb5530c..c74d193c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
@@ -64,7 +64,7 @@ public static boolean isLHSExpression(JSExpression expr) {
 
     public static boolean isNeedParenthesis(JSExpression oldExpr, JSExpression newExpr) {
         int priority = getExpressionPrecedence(newExpr);
-        final PsiElement parent = oldExpr.getParent();
+        PsiElement parent = oldExpr.getParent();
         if (!(parent instanceof JSExpression)) {
             return false;
         }
@@ -73,7 +73,7 @@ public static boolean isNeedParenthesis(JSExpression oldExpr, JSExpression newEx
             return true;
         }
         if (priority == parentPriority && parent instanceof JSBinaryExpression binaryExpression) {
-            final IElementType operationSign = binaryExpression.getOperationSign();
+            IElementType operationSign = binaryExpression.getOperationSign();
             if (oldExpr != binaryExpression.getROperand()) {
                 return false;
             }
@@ -140,28 +140,28 @@ else if (i == POSTFIX_EXPRESSION) {
         return 14;
     }
 
-    public static PsiElement findStatementAnchor(final JSReferenceExpression referenceExpression, final PsiFile file) {
+    public static PsiElement findStatementAnchor(JSReferenceExpression referenceExpression, PsiFile file) {
         PsiElement anchor = PsiTreeUtil.getParentOfType(referenceExpression, JSStatement.class);
 
         if (file instanceof XmlFile root) {
-            final XmlAttributeValue attributeValue = PsiTreeUtil.getParentOfType(referenceExpression, XmlAttributeValue.class);
+            XmlAttributeValue attributeValue = PsiTreeUtil.getParentOfType(referenceExpression, XmlAttributeValue.class);
 
             if (attributeValue != null) {
                 if (root.getViewProvider() instanceof TemplateLanguageFileViewProvider) {
-                    final TemplateLanguageFileViewProvider viewProvider = (TemplateLanguageFileViewProvider)root.getViewProvider();
-                    final PsiFile psi = viewProvider.getPsi(viewProvider.getTemplateDataLanguage());
+                    TemplateLanguageFileViewProvider viewProvider = (TemplateLanguageFileViewProvider)root.getViewProvider();
+                    PsiFile psi = viewProvider.getPsi(viewProvider.getTemplateDataLanguage());
                     if (psi instanceof XmlFile) {
                         root = (XmlFile)psi;
                     }
                 }
 
-                final XmlTag tag = root.getDocument().getRootTag();
+                XmlTag tag = root.getDocument().getRootTag();
 
                 if (tag != null) {
-                    final XmlTag headTag = tag.findFirstSubTag("head");
+                    XmlTag headTag = tag.findFirstSubTag("head");
 
                     if (headTag != null) {
-                        final XmlTag scriptTag = headTag.findFirstSubTag("script");
+                        XmlTag scriptTag = headTag.findFirstSubTag("script");
 
                         if (scriptTag != null) {
                             PsiElement statementInScript = PsiTreeUtil.getChildOfType(scriptTag, JSStatement.class);
@@ -169,7 +169,7 @@ public static PsiElement findStatementAnchor(final JSReferenceExpression referen
                                 anchor = statementInScript;
                             }
                             else {
-                                final XmlTagChild tagChild = PsiTreeUtil.getChildOfType(scriptTag, XmlTagChild.class);
+                                XmlTagChild tagChild = PsiTreeUtil.getChildOfType(scriptTag, XmlTagChild.class);
                                 if (tagChild != null) {
                                     anchor = tagChild;
                                 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index cf1aade1..9699527b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -33,12 +33,12 @@
  * @author peter
  */
 public class JSFileElementType extends IStubFileElementType<JSFileStub> {
-    public JSFileElementType(final Language language) {
+    public JSFileElementType(Language language) {
         super(language);
     }
 
     @Override
-    public void indexStub(@Nonnull final JSFileStub stub, @Nonnull final IndexSink sink) {
+    public void indexStub(@Nonnull JSFileStub stub, @Nonnull IndexSink sink) {
         for (JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList()) {
             javaScriptIndexer.indexFile(stub, sink);
         }
@@ -64,7 +64,7 @@ public void serialize(@Nonnull JSFileStub stub, @Nonnull StubOutputStream dataSt
 
     @Nonnull
     @Override
-    public JSFileStub deserialize(@Nonnull final StubInputStream dataStream, final StubElement parentStub) throws IOException {
+    public JSFileStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
         return new JSFileStubImpl(null, name);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
index 9e4ef41b..71997c1c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
@@ -43,8 +43,8 @@ public JSFunctionElementType(@Nonnull String name) {
     }
 
     @Override
-    protected boolean doIndexName(JSFunctionStub stub, final String name, final String fqn) {
-        final IStubElementType stubType = stub.getParentStub().getStubType();
+    protected boolean doIndexName(JSFunctionStub stub, String name, String fqn) {
+        IStubElementType stubType = stub.getParentStub().getStubType();
 
         return stubType instanceof JSPackageStatementElementType || stubType == null;
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
index 4c60f987..e280a7f5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
@@ -48,7 +48,7 @@ public JSVarStatementElementType() {
 
     @Override
     public boolean shouldCreateStub(ASTNode node) {
-        final PsiElement element = node.getTreeParent().getPsi();
+        PsiElement element = node.getTreeParent().getPsi();
         return element instanceof JSClass || element instanceof JSPackageStatement || element instanceof JSFile;
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
index 5ab1675d..9b81468e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
@@ -49,7 +49,7 @@ public JSVariableElementType() {
 
     @Override
     protected boolean doIndexName(JSVariableStub stub, String name, String fqn) {
-        final IStubElementType stubType = stub.getParentStub().getParentStub().getStubType();
+        IStubElementType stubType = stub.getParentStub().getParentStub().getStubType();
 
         return stubType instanceof JSPackageStatementElementType || stubType == null;
     }
@@ -60,8 +60,8 @@ protected boolean doIndexQualifiedName(JSVariableStub stub, String name, String
     }
 
     @Override
-    public boolean shouldCreateStub(final ASTNode node) {
-        final IElementType discriminatingParentType = node.getTreeParent().getTreeParent().getElementType();
+    public boolean shouldCreateStub(ASTNode node) {
+        IElementType discriminatingParentType = node.getTreeParent().getTreeParent().getElementType();
         return discriminatingParentType == JSElementTypes.PACKAGE_STATEMENT
             || discriminatingParentType == JSElementTypes.CLASS
             || discriminatingParentType instanceof JSFileElementType;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index 8e5ba59b..5ee4f4c8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -81,10 +81,10 @@ private JSUnusedImportsHelper(PsiFile containingFile, Collection<PsiElement> ele
         myElements = elements;
     }
 
-    private void registerUnused(final JSImportStatement importStatement) {
+    private void registerUnused(JSImportStatement importStatement) {
         allImports.add(importStatement);
 
-        final String importText = importStatement.getImportText();
+        String importText = importStatement.getImportText();
         if (importText == null) {
             return;
         }
@@ -225,10 +225,10 @@ public static Results getUnusedImports(PsiFile file) {
 
         CachedValue<Results> data = containingFile.getUserData(ourUnusedImportsKey);
         if (data == null) {
-            final PsiFile containingFile1 = containingFile;
+            PsiFile containingFile1 = containingFile;
             data = CachedValuesManager.getManager(file.getProject()).createCachedValue(
                 () -> {
-                    final Map<XmlTag, Collection<PsiElement>> allElements = new HashMap<>();
+                    Map<XmlTag, Collection<PsiElement>> allElements = new HashMap<>();
                     Collection<JSFile> processedFiles = new HashSet<>();
                     collectElements(null, containingFile1, allElements, processedFiles);
 
@@ -269,10 +269,10 @@ else if (e instanceof JSReferenceExpression) {
     }
 
     private static void collectElements(
-        @Nullable final XmlTag rootTag,
-        final PsiFile file,
-        final Map<XmlTag, Collection<PsiElement>> result,
-        final Collection<JSFile> processedFiles
+        @Nullable XmlTag rootTag,
+        PsiFile file,
+        Map<XmlTag, Collection<PsiElement>> result,
+        Collection<JSFile> processedFiles
     ) {
         if (processedFiles.contains(file)) {
             return;
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
index d3a9de95..0c282b79 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
@@ -40,7 +40,7 @@ public String toString() {
     }
 
     @Override
-    public void indexStub(@Nonnull final StubT stub, @Nonnull final IndexSink sink) {
+    public void indexStub(@Nonnull StubT stub, @Nonnull IndexSink sink) {
     }
 
     @Nonnull
diff --git a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
index 6bcdb8a9..4a0056f7 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/lexer/JavaScriptFlexAdapter.java
@@ -31,7 +31,7 @@ public JavaScriptFlexAdapter(FlexLexer lexer) {
     }
 
     @Override
-    public void start(final CharSequence buffer, final int startOffset, final int endOffset, final int initialState) {
+    public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
         super.start(buffer, startOffset, endOffset, initialState & BASE_STATE_MASK);
         ((JavaScriptFlexLexer)getFlex()).setTagCount(initialState >> TAG_COUNT_SHIFT);
     }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index e3df93bb..bae3e641 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -143,23 +143,23 @@ else if (tokenType == JSTokenTypes.LBRACKET) {
         }
     }
 
-    private void parseLetExpression(final PsiBuilder builder) {
-        final PsiBuilder.Marker marker = getStatementParsing().parseLetExpressionStart(builder);
+    private void parseLetExpression(PsiBuilder builder) {
+        PsiBuilder.Marker marker = getStatementParsing().parseLetExpressionStart(builder);
         parseExpression(builder);
         marker.done(JSElementTypes.LET_EXPRESSION);
     }
 
-    private void parseTag(final PsiBuilder builder) {
+    private void parseTag(PsiBuilder builder) {
         myJSXParser.setBuilder(builder);
 
         myJSXParser.parseTag(false);
     }
 
     @Nullable
-    public static LocalizeValue validateLiteral(final PsiBuilder builder) {
-        final IElementType ttype = builder.getTokenType();
+    public static LocalizeValue validateLiteral(PsiBuilder builder) {
+        IElementType ttype = builder.getTokenType();
         if (ttype == JSTokenTypes.STRING_LITERAL || ttype == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL) {
-            final String ttext = builder.getTokenText();
+            String ttext = builder.getTokenText();
             assert ttext != null;
 
             if (lastSymbolEscaped(ttext) ||
@@ -190,9 +190,9 @@ private static boolean lastSymbolEscaped(String text) {
         return escapes || escaped;
     }
 
-    public void parseObjectLiteralExpression(final PsiBuilder builder) {
+    public void parseObjectLiteralExpression(PsiBuilder builder) {
         ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
-        final PsiBuilder.Marker expr = builder.mark();
+        PsiBuilder.Marker expr = builder.mark();
         builder.advanceLexer();
 
         IElementType elementType = builder.getTokenType();
@@ -234,9 +234,9 @@ public boolean isNotPropertyStart(PsiBuilder builder, IElementType elementType)
             && elementType != JSTokenTypes.NUMERIC_LITERAL;
     }
 
-    protected void parseProperty(final PsiBuilder builder) {
-        final IElementType nameToken = builder.getTokenType();
-        final PsiBuilder.Marker property = builder.mark();
+    protected void parseProperty(PsiBuilder builder) {
+        IElementType nameToken = builder.getTokenType();
+        PsiBuilder.Marker property = builder.mark();
 
         if (isNotPropertyStart(builder, nameToken)) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
@@ -254,9 +254,9 @@ protected void parseProperty(final PsiBuilder builder) {
         property.done(JSElementTypes.PROPERTY);
     }
 
-    public void parseArrayLiteralExpression(final PsiBuilder builder) {
+    public void parseArrayLiteralExpression(PsiBuilder builder) {
         ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
-        final PsiBuilder.Marker expr = builder.mark();
+        PsiBuilder.Marker expr = builder.mark();
         builder.advanceLexer();
         boolean commaExpected = false;
 
@@ -268,7 +268,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder) {
 
             while (builder.getTokenType() != JSTokenTypes.RBRACKET) {
                 if (commaExpected) {
-                    final boolean b =
+                    boolean b =
                         Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
                     if (!b) {
                         break;
@@ -412,7 +412,7 @@ public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, Tok
             boolean stop = false;
             builder.advanceLexer();
 
-            final IElementType tokenType = builder.getTokenType();
+            IElementType tokenType = builder.getTokenType();
             if (tokenType == JSTokenTypes.ANY_IDENTIFIER && allowStar) {
                 builder.advanceLexer();
                 stop = true;
@@ -450,9 +450,9 @@ protected boolean parseNewExpression(PsiBuilder builder) {
         return false;
     }
 
-    protected void parseArgumentList(final PsiBuilder builder) {
+    protected void parseArgumentList(PsiBuilder builder) {
         ExpressionParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LPAR);
-        final PsiBuilder.Marker arglist = builder.mark();
+        PsiBuilder.Marker arglist = builder.mark();
         builder.advanceLexer();
         boolean first = true;
         while (builder.getTokenType() != JSTokenTypes.RPAR) {
@@ -481,16 +481,16 @@ public void parseExpression(PsiBuilder builder) {
         }
     }
 
-    public boolean parseAssignmentExpressionNoIn(final PsiBuilder builder) {
+    public boolean parseAssignmentExpressionNoIn(PsiBuilder builder) {
         return parseAssignmentExpression(builder, false);
     }
 
-    public boolean parseAssignmentExpression(final PsiBuilder builder) {
+    public boolean parseAssignmentExpression(PsiBuilder builder) {
         return parseAssignmentExpression(builder, true);
     }
 
-    private boolean parseAssignmentExpression(final PsiBuilder builder, boolean allowIn) {
-        final PsiBuilder.Marker expr = builder.mark();
+    private boolean parseAssignmentExpression(PsiBuilder builder, boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
 
         if (JSTokenTypes.ASSIGNMENT_OPERATIONS.contains(builder.getTokenType()) && builder.getUserData(WITHIN_OBJECT_LITERAL_EXPRESSION) == null) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
@@ -502,7 +502,7 @@ private boolean parseAssignmentExpression(final PsiBuilder builder, boolean allo
             return true;
         }
 
-        final PsiBuilder.Marker definitionExpr = builder.mark();
+        PsiBuilder.Marker definitionExpr = builder.mark();
         if (!parseConditionalExpression(builder, allowIn)) {
             definitionExpr.drop();
             expr.drop();
@@ -524,14 +524,14 @@ private boolean parseAssignmentExpression(final PsiBuilder builder, boolean allo
         return true;
     }
 
-    private boolean parseConditionalExpression(final PsiBuilder builder, final boolean allowIn) {
-        final PsiBuilder.Marker expr = builder.mark();
+    private boolean parseConditionalExpression(PsiBuilder builder, boolean allowIn) {
+        PsiBuilder.Marker expr = builder.mark();
         if (!parseORExpression(builder, allowIn)) {
             expr.drop();
             return false;
         }
 
-        final IElementType nextTokenType = builder.getTokenType();
+        IElementType nextTokenType = builder.getTokenType();
 
         if (nextTokenType == JSTokenTypes.QUEST) {
             builder.advanceLexer();
@@ -554,7 +554,7 @@ else if (nextTokenType == JSTokenTypes.FOR_KEYWORD && builder.getUserData(WITHIN
         return true;
     }
 
-    private boolean parseORExpression(final PsiBuilder builder, final boolean allowIn) {
+    private boolean parseORExpression(PsiBuilder builder, boolean allowIn) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseANDExpression(builder, allowIn)) {
             expr.drop();
@@ -574,7 +574,7 @@ private boolean parseORExpression(final PsiBuilder builder, final boolean allowI
         return true;
     }
 
-    private boolean parseANDExpression(final PsiBuilder builder, final boolean allowIn) {
+    private boolean parseANDExpression(PsiBuilder builder, boolean allowIn) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseBitwiseORExpression(builder, allowIn)) {
             expr.drop();
@@ -594,7 +594,7 @@ private boolean parseANDExpression(final PsiBuilder builder, final boolean allow
         return true;
     }
 
-    private boolean parseBitwiseORExpression(final PsiBuilder builder, final boolean allowIn) {
+    private boolean parseBitwiseORExpression(PsiBuilder builder, boolean allowIn) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseBitwiseXORExpression(builder, allowIn)) {
             expr.drop();
@@ -614,7 +614,7 @@ private boolean parseBitwiseORExpression(final PsiBuilder builder, final boolean
         return true;
     }
 
-    private boolean parseBitwiseXORExpression(final PsiBuilder builder, final boolean allowIn) {
+    private boolean parseBitwiseXORExpression(PsiBuilder builder, boolean allowIn) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseBitwiseANDExpression(builder, allowIn)) {
             expr.drop();
@@ -634,7 +634,7 @@ private boolean parseBitwiseXORExpression(final PsiBuilder builder, final boolea
         return true;
     }
 
-    private boolean parseBitwiseANDExpression(final PsiBuilder builder, final boolean allowIn) {
+    private boolean parseBitwiseANDExpression(PsiBuilder builder, boolean allowIn) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseEqualityExpression(builder, allowIn)) {
             expr.drop();
@@ -654,7 +654,7 @@ private boolean parseBitwiseANDExpression(final PsiBuilder builder, final boolea
         return true;
     }
 
-    private boolean parseEqualityExpression(final PsiBuilder builder, final boolean allowIn) {
+    private boolean parseEqualityExpression(PsiBuilder builder, boolean allowIn) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseRelationalExpression(builder, allowIn)) {
             expr.drop();
@@ -674,7 +674,7 @@ private boolean parseEqualityExpression(final PsiBuilder builder, final boolean
         return true;
     }
 
-    private boolean parseRelationalExpression(final PsiBuilder builder, final boolean allowIn) {
+    private boolean parseRelationalExpression(PsiBuilder builder, boolean allowIn) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseShiftExpression(builder)) {
             expr.drop();
@@ -694,7 +694,7 @@ private boolean parseRelationalExpression(final PsiBuilder builder, final boolea
         return true;
     }
 
-    private boolean parseShiftExpression(final PsiBuilder builder) {
+    private boolean parseShiftExpression(PsiBuilder builder) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseAdditiveExpression(builder)) {
             expr.drop();
@@ -713,7 +713,7 @@ private boolean parseShiftExpression(final PsiBuilder builder) {
         return true;
     }
 
-    private boolean parseAdditiveExpression(final PsiBuilder builder) {
+    private boolean parseAdditiveExpression(PsiBuilder builder) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseMultiplicativeExpression(builder)) {
             expr.drop();
@@ -732,7 +732,7 @@ private boolean parseAdditiveExpression(final PsiBuilder builder) {
         return true;
     }
 
-    private boolean parseIsAsExpression(final PsiBuilder builder) {
+    private boolean parseIsAsExpression(PsiBuilder builder) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseUnaryExpression(builder)) {
             expr.drop();
@@ -752,11 +752,11 @@ private boolean parseIsAsExpression(final PsiBuilder builder) {
         return true;
     }
 
-    protected boolean parseMultiplicativeExpression(final PsiBuilder builder) {
+    protected boolean parseMultiplicativeExpression(PsiBuilder builder) {
         return parseMultiplicativeExpression(builder, JSTokenTypes.MULTIPLICATIVE_OPERATIONS);
     }
 
-    protected boolean parseMultiplicativeExpression(final PsiBuilder builder, TokenSet operatorSet) {
+    protected boolean parseMultiplicativeExpression(PsiBuilder builder, TokenSet operatorSet) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseIsAsExpression(builder)) {
             expr.drop();
@@ -776,10 +776,10 @@ protected boolean parseMultiplicativeExpression(final PsiBuilder builder, TokenS
         return true;
     }
 
-    private boolean parseUnaryExpression(final PsiBuilder builder) {
-        final IElementType tokenType = builder.getTokenType();
+    private boolean parseUnaryExpression(PsiBuilder builder) {
+        IElementType tokenType = builder.getTokenType();
         if (JSTokenTypes.UNARY_OPERATIONS.contains(tokenType)) {
-            final PsiBuilder.Marker expr = builder.mark();
+            PsiBuilder.Marker expr = builder.mark();
             builder.advanceLexer();
             if (!parseUnaryExpression(builder)) {
                 builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
@@ -793,13 +793,13 @@ private boolean parseUnaryExpression(final PsiBuilder builder) {
     }
 
     private boolean parsePostfixExpression(PsiBuilder builder) {
-        final PsiBuilder.Marker expr = builder.mark();
+        PsiBuilder.Marker expr = builder.mark();
         if (!parseMemberExpression(builder, true)) {
             expr.drop();
             return false;
         }
 
-        final IElementType tokenType = builder.getTokenType();
+        IElementType tokenType = builder.getTokenType();
         if (tokenType == JSTokenTypes.PLUSPLUS || tokenType == JSTokenTypes.MINUSMINUS) {
             builder.advanceLexer();
             expr.done(JSElementTypes.POSTFIX_EXPRESSION);
@@ -810,15 +810,15 @@ private boolean parsePostfixExpression(PsiBuilder builder) {
         return true;
     }
 
-    public boolean parseExpressionOptional(final PsiBuilder builder) {
+    public boolean parseExpressionOptional(PsiBuilder builder) {
         return parseExpressionOptional(builder, true);
     }
 
-    public boolean parseExpressionOptionalNoIn(final PsiBuilder builder) {
+    public boolean parseExpressionOptionalNoIn(PsiBuilder builder) {
         return parseExpressionOptional(builder, false);
     }
 
-    public boolean parseExpressionOptional(final PsiBuilder builder, final boolean allowIn) {
+    public boolean parseExpressionOptional(PsiBuilder builder, boolean allowIn) {
         PsiBuilder.Marker expr = builder.mark();
         if (!parseAssignmentExpression(builder, allowIn)) {
             expr.drop();
@@ -845,12 +845,12 @@ public boolean parseExpressionOptional(final PsiBuilder builder, final boolean a
         return true;
     }
 
-    public boolean tryParseType(final PsiBuilder builder) {
+    public boolean tryParseType(PsiBuilder builder) {
         return false;
     }
 
-    public boolean parseType(final PsiBuilder builder) {
-        final IElementType tokenType = builder.getTokenType();
+    public boolean parseType(PsiBuilder builder) {
+        IElementType tokenType = builder.getTokenType();
         if (JSDocumentationUtils.PRIMITIVE_TYPE_FILTER.contains(tokenType)) {
             builder.advanceLexer();
         }
@@ -860,7 +860,7 @@ else if (!parseQualifiedTypeName(builder)) {
         return true;
     }
 
-    public boolean parseSimpleExpression(final PsiBuilder builder) {
+    public boolean parseSimpleExpression(PsiBuilder builder) {
         if (!parseUnaryExpression(builder)) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
             return false;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index 86f5b818..c62641f2 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -44,9 +44,9 @@ private void parseFunction(PsiBuilder builder, boolean expressionContext) {
     }
 
     public void parseFunctionNoMarker(
-        final PsiBuilder builder,
-        final boolean expressionContext,
-        final @Nonnull PsiBuilder.Marker functionMarker
+        PsiBuilder builder,
+        boolean expressionContext,
+        @Nonnull PsiBuilder.Marker functionMarker
     ) {
         if (builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD) {
             // function keyword may be ommited in context of get/set property definition
@@ -85,8 +85,8 @@ else if (!expressionContext && builder.getTokenType() != JSTokenTypes.LPAR /*get
         functionMarker.done(expressionContext ? JSElementTypes.FUNCTION_EXPRESSION : JSElementTypes.FUNCTION_DECLARATION);
     }
 
-    public void parseParameterList(final PsiBuilder builder) {
-        final PsiBuilder.Marker parameterList;
+    public void parseParameterList(PsiBuilder builder) {
+        PsiBuilder.Marker parameterList;
         if (builder.getTokenType() != JSTokenTypes.LPAR) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLparen());
             parameterList = builder.mark(); // To have non-empty parameters list at all the time.
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index ddc48296..fb578ffa 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -53,9 +53,9 @@ private boolean eof() {
     }
 
     @Nullable
-    private String parseTagHeader(final boolean multipleRootTagError, final PsiBuilder.Marker tag) {
+    private String parseTagHeader(boolean multipleRootTagError, PsiBuilder.Marker tag) {
         if (multipleRootTagError) {
-            final PsiBuilder.Marker error = mark();
+            PsiBuilder.Marker error = mark();
             advance();
             error.error(XmlErrorLocalize.xmlParsingMultipleRootTags());
         }
@@ -63,7 +63,7 @@ private String parseTagHeader(final boolean multipleRootTagError, final PsiBuild
             advance();
         }
 
-        final String tagName;
+        String tagName;
         if (token() != JSTokenTypes.XML_NAME || myBuilder.rawLookup(-1) == TokenType.WHITE_SPACE) {
             error(XmlErrorLocalize.xmlParsingTagNameExpected());
             tagName = "";
@@ -76,7 +76,7 @@ private String parseTagHeader(final boolean multipleRootTagError, final PsiBuild
         myTagNamesStack.push(tagName);
 
         do {
-            final IElementType tt = token();
+            IElementType tt = token();
             if (tt == JSTokenTypes.XML_NAME) {
                 parseAttribute();
             }
@@ -117,7 +117,7 @@ else if (tt == JSTokenTypes.XML_JS_SCRIPT) {
 
     private void parseAttribute() {
         assert token() == XmlTokenType.XML_NAME;
-        final PsiBuilder.Marker att = mark();
+        PsiBuilder.Marker att = mark();
         advance();
         if (token() == XmlTokenType.XML_EQ) {
             advance();
@@ -127,17 +127,17 @@ private void parseAttribute() {
     }
 
     private void parseAttributeValue() {
-        final PsiBuilder.Marker attValue = mark();
+        PsiBuilder.Marker attValue = mark();
         if (token() == XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER) {
             while (true) {
-                final IElementType tt = token();
+                IElementType tt = token();
                 if (tt == null || tt == XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER || tt == XmlTokenType.XML_END_TAG_START
                     || tt == XmlTokenType.XML_EMPTY_ELEMENT_END || tt == JSTokenTypes.XML_START_TAG_START) {
                     break;
                 }
 
                 if (tt == JSTokenTypes.BAD_CHARACTER) {
-                    final PsiBuilder.Marker error = mark();
+                    PsiBuilder.Marker error = mark();
                     advance();
                     error.error(XmlErrorLocalize.unescapedAmpersandOrNonterminatedCharacterEntityReference());
                 }
@@ -166,7 +166,7 @@ else if (token() != XmlTokenType.XML_TAG_END && token() != XmlTokenType.XML_EMPT
     public void parseTagContent() {
         PsiBuilder.Marker xmlText = null;
         while (true) {
-            final IElementType tt = token();
+            IElementType tt = token();
             if (tt == null || tt == XmlTokenType.XML_END_TAG_START) {
                 break;
             }
@@ -177,7 +177,7 @@ public void parseTagContent() {
             }
             else if (tt == JSTokenTypes.BAD_CHARACTER) {
                 xmlText = startText(xmlText);
-                final PsiBuilder.Marker error = mark();
+                PsiBuilder.Marker error = mark();
                 advance();
                 error.error(XmlErrorLocalize.unescapedAmpersandOrNonterminatedCharacterEntityReference());
             }
@@ -212,18 +212,18 @@ private PsiBuilder.Marker startText(@Nullable PsiBuilder.Marker xmlText) {
 
     protected void parseTag(boolean multipleRootTagError) {
         assert token() == JSTokenTypes.XML_START_TAG_START : "Tag start expected";
-        final PsiBuilder.Marker tag = mark();
+        PsiBuilder.Marker tag = mark();
 
-        final String tagName = parseTagHeader(multipleRootTagError, tag);
+        String tagName = parseTagHeader(multipleRootTagError, tag);
         if (tagName == null) {
             return;
         }
 
-        final PsiBuilder.Marker content = mark();
+        PsiBuilder.Marker content = mark();
         parseTagContent();
 
         if (token() == JSTokenTypes.XML_END_TAG_START) {
-            final PsiBuilder.Marker footer = mark();
+            PsiBuilder.Marker footer = mark();
             advance();
 
             if (token() == JSTokenTypes.XML_NAME) {
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
index a7094490..e3478429 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
@@ -20,7 +20,7 @@ public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder originalBui
 
         JavaScriptParserBuilder builder = createBuilder(originalBuilder);
 
-        final PsiBuilder.Marker rootMarker = builder.mark();
+        PsiBuilder.Marker rootMarker = builder.mark();
         while (!builder.eof()) {
             parsingContext.getStatementParsing().parseSourceElement(builder);
         }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index c5669e89..d66d8c16 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -100,12 +100,12 @@ public ExpressionParsing getExpressionParsing() {
     }
 
     public static void buildTokenElement(IElementType type, PsiBuilder builder) {
-        final PsiBuilder.Marker marker = builder.mark();
+        PsiBuilder.Marker marker = builder.mark();
         builder.advanceLexer();
         marker.done(type);
     }
 
-    public static boolean checkMatches(final PsiBuilder builder, final IElementType token, final LocalizeValue message) {
+    public static boolean checkMatches(PsiBuilder builder, IElementType token, LocalizeValue message) {
         if (builder.getTokenType() == token) {
             builder.advanceLexer();
             return true;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index a72bb175..9a8f6079 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -36,7 +36,7 @@ public StatementParsing(JavaScriptParsingContext context) {
     }
 
     public void parseSourceElement(PsiBuilder builder) {
-        final IElementType tokenType = builder.getTokenType();
+        IElementType tokenType = builder.getTokenType();
         if (tokenType == JSTokenTypes.FUNCTION_KEYWORD) {
             getFunctionParsing().parseFunctionDeclaration(builder);
         }
@@ -53,8 +53,8 @@ public void parseStatement(PsiBuilder builder) {
         doParseStatement(builder, false);
     }
 
-    protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses) {
-        final IElementType firstToken = builder.getTokenType();
+    protected void doParseStatement(PsiBuilder builder, boolean canHaveClasses) {
+        IElementType firstToken = builder.getTokenType();
 
         if (firstToken == null) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
@@ -146,7 +146,7 @@ protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses
 
         if (firstToken == JSTokenTypes.IDENTIFIER) {
             // Try labeled statement:
-            final PsiBuilder.Marker labeledStatement = builder.mark();
+            PsiBuilder.Marker labeledStatement = builder.mark();
             builder.advanceLexer();
             if (builder.getTokenType() == JSTokenTypes.COLON) {
                 builder.advanceLexer();
@@ -173,7 +173,7 @@ protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses
 
     protected boolean parseExpressionStatement(PsiBuilder builder) {
         // Try expression statement
-        final PsiBuilder.Marker exprStatement = builder.mark();
+        PsiBuilder.Marker exprStatement = builder.mark();
         if (getExpressionParsing().parseExpressionOptional(builder)) {
             checkForSemicolon(builder);
             exprStatement.done(JSElementTypes.EXPRESSION_STATEMENT);
@@ -185,9 +185,9 @@ protected boolean parseExpressionStatement(PsiBuilder builder) {
         return false;
     }
 
-    protected void parseYieldStatement(final PsiBuilder builder) {
+    protected void parseYieldStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.YIELD_KEYWORD);
-        final PsiBuilder.Marker marker = builder.mark();
+        PsiBuilder.Marker marker = builder.mark();
         builder.advanceLexer();
 
         getExpressionParsing().parseExpressionOptional(builder);
@@ -195,16 +195,16 @@ protected void parseYieldStatement(final PsiBuilder builder) {
         marker.done(JSElementTypes.YIELD_STATEMENT);
     }
 
-    protected void parseLetStatement(final PsiBuilder builder) {
-        final PsiBuilder.Marker marker = parseLetExpressionStart(builder);
+    protected void parseLetStatement(PsiBuilder builder) {
+        PsiBuilder.Marker marker = parseLetExpressionStart(builder);
 
         parseBlock(builder);
         marker.done(JSElementTypes.LET_STATEMENT);
     }
 
-    PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder) {
+    PsiBuilder.Marker parseLetExpressionStart(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LET_KEYWORD);
-        final PsiBuilder.Marker marker = builder.mark();
+        PsiBuilder.Marker marker = builder.mark();
         builder.advanceLexer();
 
         if (builder.getTokenType() == JSTokenTypes.LPAR) {
@@ -224,9 +224,9 @@ PsiBuilder.Marker parseLetExpressionStart(final PsiBuilder builder) {
     }
 
 
-    public void parseIncludeDirective(final PsiBuilder builder) {
+    public void parseIncludeDirective(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.INCLUDE_KEYWORD);
-        final PsiBuilder.Marker useNSStatement = builder.mark();
+        PsiBuilder.Marker useNSStatement = builder.mark();
         builder.advanceLexer();
         Parsing.checkMatches(builder, JSTokenTypes.STRING_LITERAL, JavaScriptLocalize.javascriptParserMessageExpectedStringLiteral());
         checkForSemicolon(builder);
@@ -234,9 +234,9 @@ public void parseIncludeDirective(final PsiBuilder builder) {
         useNSStatement.done(JSElementTypes.INCLUDE_DIRECTIVE);
     }
 
-    protected void parseTryStatement(final PsiBuilder builder) {
+    protected void parseTryStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.TRY_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
         builder.advanceLexer();
         parseBlock(builder);
 
@@ -252,16 +252,16 @@ protected void parseTryStatement(final PsiBuilder builder) {
         statement.done(JSElementTypes.TRY_STATEMENT);
     }
 
-    private void parseCatchBlock(final PsiBuilder builder) {
+    private void parseCatchBlock(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CATCH_KEYWORD);
-        final PsiBuilder.Marker block = builder.mark();
+        PsiBuilder.Marker block = builder.mark();
         builder.advanceLexer();
         Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
 
-        final IElementType identifierType = builder.getTokenType();
+        IElementType identifierType = builder.getTokenType();
 
         if (JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(identifierType)) {
-            final PsiBuilder.Marker param = builder.mark();
+            PsiBuilder.Marker param = builder.mark();
             builder.advanceLexer();
 
             if (!getExpressionParsing().tryParseType(builder) && builder.getTokenType() == JSTokenTypes.IF_KEYWORD) {
@@ -287,9 +287,9 @@ private void parseCatchBlock(final PsiBuilder builder) {
         block.done(JSElementTypes.CATCH_BLOCK);
     }
 
-    protected void parseThrowStatement(final PsiBuilder builder) {
+    protected void parseThrowStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.THROW_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
         builder.advanceLexer();
 
         getExpressionParsing().parseExpressionOptional(builder);
@@ -298,9 +298,9 @@ protected void parseThrowStatement(final PsiBuilder builder) {
         statement.done(JSElementTypes.THROW_STATEMENT);
     }
 
-    protected void parseSwitchStatement(final PsiBuilder builder) {
+    protected void parseSwitchStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.SWITCH_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
         builder.advanceLexer();
 
         Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
@@ -321,9 +321,9 @@ protected void parseSwitchStatement(final PsiBuilder builder) {
         statement.done(JSElementTypes.SWITCH_STATEMENT);
     }
 
-    private void parseCaseOrDefaultClause(final PsiBuilder builder) {
-        final IElementType firstToken = builder.getTokenType();
-        final PsiBuilder.Marker clause = builder.mark();
+    private void parseCaseOrDefaultClause(PsiBuilder builder) {
+        IElementType firstToken = builder.getTokenType();
+        PsiBuilder.Marker clause = builder.mark();
         if (firstToken != JSTokenTypes.CASE_KEYWORD && firstToken != JSTokenTypes.DEFAULT_KEYWORD) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedCatchOrDefault());
         }
@@ -343,9 +343,9 @@ private void parseCaseOrDefaultClause(final PsiBuilder builder) {
         clause.done(JSElementTypes.CASE_CLAUSE);
     }
 
-    protected void parseWithStatement(final PsiBuilder builder) {
+    protected void parseWithStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.WITH_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
         builder.advanceLexer();
 
         Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
@@ -357,9 +357,9 @@ protected void parseWithStatement(final PsiBuilder builder) {
         statement.done(JSElementTypes.WITH_STATEMENT);
     }
 
-    protected void parseReturnStatement(final PsiBuilder builder) {
+    protected void parseReturnStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.RETURN_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
         boolean hasNewLine = hasSemanticLineBeforeNextToken(builder);
         builder.advanceLexer();
         if (!hasNewLine) {
@@ -370,9 +370,9 @@ protected void parseReturnStatement(final PsiBuilder builder) {
         statement.done(JSElementTypes.RETURN_STATEMENT);
     }
 
-    protected void parseBreakStatement(final PsiBuilder builder) {
+    protected void parseBreakStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.BREAK_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
 
         boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
         builder.advanceLexer();
@@ -388,9 +388,9 @@ protected void parseBreakStatement(final PsiBuilder builder) {
         statement.done(JSElementTypes.BREAK_STATEMENT);
     }
 
-    protected void parseContinueStatement(final PsiBuilder builder) {
+    protected void parseContinueStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.CONTINUE_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
         boolean hasSemanticLineBeforeNextToken = hasSemanticLineBeforeNextToken(builder);
         builder.advanceLexer();
 
@@ -405,7 +405,7 @@ protected void parseContinueStatement(final PsiBuilder builder) {
         statement.done(JSElementTypes.CONTINUE_STATEMENT);
     }
 
-    protected boolean hasSemanticLineBeforeNextToken(final PsiBuilder builder) {
+    protected boolean hasSemanticLineBeforeNextToken(PsiBuilder builder) {
         IElementType tokenType = builder.getTokenType();
         if (tokenType == null) {
             return true;
@@ -441,8 +441,8 @@ else if (!Character.isWhitespace(c)) {
         return false;
     }
 
-    protected void parseIterationStatement(final PsiBuilder builder) {
-        final IElementType tokenType = builder.getTokenType();
+    protected void parseIterationStatement(PsiBuilder builder) {
+        IElementType tokenType = builder.getTokenType();
         if (tokenType == JSTokenTypes.DO_KEYWORD) {
             parseDoWhileStatement(builder);
         }
@@ -457,23 +457,23 @@ else if (tokenType == JSTokenTypes.FOR_KEYWORD) {
         }
     }
 
-    private void parseForStatement(final PsiBuilder builder) {
+    private void parseForStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.FOR_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
-        final boolean forin = parseForLoopHeader(builder);
+        PsiBuilder.Marker statement = builder.mark();
+        boolean forin = parseForLoopHeader(builder);
 
         parseStatement(builder);
         statement.done(forin ? JSElementTypes.FOR_IN_STATEMENT : JSElementTypes.FOR_STATEMENT);
     }
 
-    protected boolean parseForLoopHeader(final PsiBuilder builder) {
+    protected boolean parseForLoopHeader(PsiBuilder builder) {
         builder.advanceLexer();
         if (builder.getTokenType() == JSTokenTypes.EACH_KEYWORD) {
             builder.advanceLexer();
         }
 
         Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-        final boolean empty;
+        boolean empty;
         if (builder.getTokenType() == JSTokenTypes.VAR_KEYWORD || builder.getTokenType() == JSTokenTypes.LET_KEYWORD) {
             parseVarStatement(builder, true);
             empty = false;
@@ -511,9 +511,9 @@ else if (builder.getTokenType() == JSTokenTypes.IN_KEYWORD) {
         return forin;
     }
 
-    private void parseWhileStatement(final PsiBuilder builder) {
+    private void parseWhileStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.WHILE_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
         builder.advanceLexer();
 
         Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
@@ -524,9 +524,9 @@ private void parseWhileStatement(final PsiBuilder builder) {
         statement.done(JSElementTypes.WHILE_STATEMENT);
     }
 
-    private void parseDoWhileStatement(final PsiBuilder builder) {
+    private void parseDoWhileStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.DO_KEYWORD);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
         builder.advanceLexer();
 
         parseStatement(builder);
@@ -539,9 +539,9 @@ private void parseDoWhileStatement(final PsiBuilder builder) {
         statement.done(JSElementTypes.DOWHILE_STATEMENT);
     }
 
-    protected void parseIfStatement(final PsiBuilder builder) {
+    protected void parseIfStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.IF_KEYWORD);
-        final PsiBuilder.Marker ifStatement = builder.mark();
+        PsiBuilder.Marker ifStatement = builder.mark();
         builder.advanceLexer();
 
         Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
@@ -564,23 +564,23 @@ protected void parseIfStatement(final PsiBuilder builder) {
         ifStatement.done(JSElementTypes.IF_STATEMENT);
     }
 
-    protected void parseEmptyStatement(final PsiBuilder builder) {
+    protected void parseEmptyStatement(PsiBuilder builder) {
         StatementParsing.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.SEMICOLON);
-        final PsiBuilder.Marker statement = builder.mark();
+        PsiBuilder.Marker statement = builder.mark();
         builder.advanceLexer();
         statement.done(JSElementTypes.EMPTY_STATEMENT);
     }
 
-    protected void parseVarStatement(final PsiBuilder builder, final boolean inForInitializationContext) {
+    protected void parseVarStatement(PsiBuilder builder, boolean inForInitializationContext) {
         parseVarStatementWithMarker(builder, inForInitializationContext, builder.mark());
     }
 
     protected void parseVarStatementWithMarker(
-        final PsiBuilder builder,
-        final boolean inForInitializationContext,
-        final @Nonnull PsiBuilder.Marker var
+        PsiBuilder builder,
+        boolean inForInitializationContext,
+        @Nonnull PsiBuilder.Marker var
     ) {
-        final IElementType declType = builder.getTokenType();
+        IElementType declType = builder.getTokenType();
         LOG.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
             declType == JSTokenTypes.CONST_KEYWORD ||
             declType == JSTokenTypes.LET_KEYWORD);
@@ -656,13 +656,13 @@ protected void parseDeconstructionElement(PsiBuilder builder) {
         mark.done(JSElementTypes.DESTRUCTURING_ELEMENT);
     }
 
-    protected void checkForSemicolon(final PsiBuilder builder) {
+    protected void checkForSemicolon(PsiBuilder builder) {
         if (builder.getTokenType() == JSTokenTypes.SEMICOLON) {
             builder.advanceLexer();
         }
     }
 
-    protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn) {
+    protected void parseVarDeclaration(PsiBuilder builder, boolean allowIn) {
         if (!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType())) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName());
             builder.advanceLexer();
@@ -696,11 +696,11 @@ protected void parseVarInitializer(PsiBuilder builder, boolean allowIn) {
         }
     }
 
-    public void parseBlock(final PsiBuilder builder) {
+    public void parseBlock(PsiBuilder builder) {
         parseBlockOrFunctionBody(builder, BlockType.BLOCK);
     }
 
-    public void parseFunctionBody(final PsiBuilder builder) {
+    public void parseFunctionBody(PsiBuilder builder) {
         parseBlockOrFunctionBody(builder, BlockType.FUNCTION_BODY);
     }
 
@@ -710,8 +710,8 @@ public enum BlockType {
         PACKAGE_OR_CLASS_BODY
     }
 
-    protected void parseBlockOrFunctionBody(final PsiBuilder builder, BlockType type) {
-        final PsiBuilder.Marker block = type != BlockType.PACKAGE_OR_CLASS_BODY ? builder.mark() : null;
+    protected void parseBlockOrFunctionBody(PsiBuilder builder, BlockType type) {
+        PsiBuilder.Marker block = type != BlockType.PACKAGE_OR_CLASS_BODY ? builder.mark() : null;
         if (builder.getTokenType() != JSTokenTypes.LBRACE) {
             if (block != null) {
                 block.rollbackTo();
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
index 845f878b..d8c7ad4c 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
@@ -28,7 +28,7 @@ public static ResolveHelper find(PsiElement element) {
     }
 
     @Nullable
-    public JSImportedElementResolveResult resolveTypeNameUsingImports(final @Nonnull String referencedName, PsiNamedElement parent) {
+    public JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull String referencedName, PsiNamedElement parent) {
         return null;
     }
 
diff --git a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
index ac741347..0f900285 100644
--- a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
@@ -37,8 +37,8 @@ public JSQualifiedStubElementType(@NonNls String debugName) {
 
     @Override
     public void indexStub(@Nonnull StubT stub, @Nonnull IndexSink sink) {
-        final String name = stub.getName();
-        final String fqn = stub.getQualifiedName();
+        String name = stub.getName();
+        String fqn = stub.getQualifiedName();
 
         if (name != null && doIndexName(stub, name, fqn)) {
             sink.occurrence(JavaScriptIndexKeys.ELEMENTS_BY_NAME, name);
@@ -49,11 +49,11 @@ public void indexStub(@Nonnull StubT stub, @Nonnull IndexSink sink) {
         }
     }
 
-    protected boolean doIndexQualifiedName(StubT stub, final String name, final String fqn) {
+    protected boolean doIndexQualifiedName(StubT stub, String name, String fqn) {
         return true;
     }
 
-    protected boolean doIndexName(StubT stub, final String name, final String fqn) {
+    protected boolean doIndexName(StubT stub, String name, String fqn) {
         return true;
     }
 }
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
index 5ee8a267..9b822207 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
@@ -56,7 +56,7 @@ public static TextRange getExpressionAtOffset(@Nonnull Project project, @Nonnull
 
 		if(ref == null)
 		{
-			final PsiElement at = file.findElementAt(offset);
+			PsiElement at = file.findElementAt(offset);
 
 			TextRange rangeForNamedElement = getRangeForNamedElement(at, 0);
 			if(rangeForNamedElement != null)
@@ -64,7 +64,7 @@ public static TextRange getExpressionAtOffset(@Nonnull Project project, @Nonnull
 				return rangeForNamedElement;
 			}
 
-			final PsiLanguageInjectionHost psiLanguageInjectionHost = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class);
+			PsiLanguageInjectionHost psiLanguageInjectionHost = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class);
 
 			if(psiLanguageInjectionHost != null)
 			{
@@ -75,11 +75,11 @@ public static TextRange getExpressionAtOffset(@Nonnull Project project, @Nonnull
 				InjectedLanguageManager.getInstance(project).enumerate(psiLanguageInjectionHost, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
-					public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
+					public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places)
 					{
-						final PsiLanguageInjectionHost.Shred shred = places.get(0);
-						final int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
-						final int offsetInInjected = offset - injectedStart;
+						PsiLanguageInjectionHost.Shred shred = places.get(0);
+						int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
+						int offsetInInjected = offset - injectedStart;
 
 						result.set(injectedPsi.findReferenceAt(offsetInInjected));
 						eltInInjected.set(injectedPsi.findElementAt(offsetInInjected));
@@ -109,7 +109,7 @@ public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLan
 			}
 		}
 
-		final PsiElement element = ref.getElement();
+		PsiElement element = ref.getElement();
 		if(!element.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE))
 		{
 			return null;
@@ -118,13 +118,13 @@ public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLan
 		return element.getTextRange().shiftRight(injectionOffsetCorrection);
 	}
 
-	private static TextRange getRangeForNamedElement(final PsiElement at, int offset)
+	private static TextRange getRangeForNamedElement(PsiElement at, int offset)
 	{
-		final PsiElement parent = at != null ? at.getParent() : null;
+		PsiElement parent = at != null ? at.getParent() : null;
 
 		if(parent instanceof JSNamedElement)
 		{
-			final PsiElement node = ((JSNamedElement) parent).getNameIdentifier();
+			PsiElement node = ((JSNamedElement) parent).getNameIdentifier();
 
 			if(node != null)
 			{
@@ -134,7 +134,7 @@ private static TextRange getRangeForNamedElement(final PsiElement at, int offset
 		return null;
 	}
 
-	public static Document createDocument(final String text, final Project project, @Nullable VirtualFile contextVirtualFile, int contextOffset)
+	public static Document createDocument(String text, Project project, @Nullable VirtualFile contextVirtualFile, int contextOffset)
 	{
 		PsiElement context = null;
 		if(contextVirtualFile != null)
@@ -146,7 +146,7 @@ public static Document createDocument(final String text, final Project project,
 	}
 
 	@Nullable
-	public static PsiElement getContextElement(VirtualFile virtualFile, int offset, final @Nonnull Project project)
+	public static PsiElement getContextElement(VirtualFile virtualFile, int offset, @Nonnull Project project)
 	{
 		Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
 		PsiFile file = PsiManager.getInstance(project).findFile(virtualFile);
@@ -197,11 +197,11 @@ public static PsiElement getContextElement(VirtualFile virtualFile, int offset,
 				InjectedLanguageManager.getInstance(project).enumerate(parent, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
-					public void visit(@Nonnull final PsiFile injectedPsi, @Nonnull final List<PsiLanguageInjectionHost.Shred> places)
+					public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places)
 					{
-						final PsiLanguageInjectionHost.Shred shred = places.get(0);
-						final int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
-						final int offsetInInjected = finalOffset - injectedStart;
+						PsiLanguageInjectionHost.Shred shred = places.get(0);
+						int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
+						int offsetInInjected = finalOffset - injectedStart;
 
 						resultInInjected.set(injectedPsi.findElementAt(offsetInInjected));
 					}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
index 3c67500b..c1edc2dc 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
@@ -238,7 +238,7 @@ public LocalizeValue getCurrentStateMessage() {
         }
     }
 
-    public void addScript(final Script script) {
+    public void addScript(Script script) {
         UIUtil.invokeLaterIfNeeded(() -> myScriptListPanel.add(script));
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
index 3b7adf8a..1b756f09 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
@@ -31,7 +31,7 @@ public PsiElementVisitor buildVisitor(
             return PsiElementVisitor.EMPTY_VISITOR;
         }
 
-        final BaseInspectionVisitor visitor = buildVisitor();
+        BaseInspectionVisitor visitor = buildVisitor();
         visitor.setProblemsHolder(problemsHolder);
         visitor.setOnTheFly(onTheFly);
         visitor.setInspection(this);
@@ -78,24 +78,24 @@ protected InspectionJSFix[] buildFixes(PsiElement location) {
     public abstract BaseInspectionVisitor buildVisitor();
 
     protected boolean functionHasIdentifier(JSFunction function) {
-        final PsiElement identifier = function.getNameIdentifier();
+        PsiElement identifier = function.getNameIdentifier();
         return identifier != null && PsiTreeUtil.isAncestor(function, identifier, true);
     }
 
     @Override
-    public PsiNamedElement getProblemElement(final PsiElement psiElement) {
+    public PsiNamedElement getProblemElement(PsiElement psiElement) {
         return PsiTreeUtil.getNonStrictParentOfType(psiElement, PsiFile.class);
     }
 
     @Override
-    public SuppressIntentionAction[] getSuppressActions(@Nullable final PsiElement element) {
+    public SuppressIntentionAction[] getSuppressActions(@Nullable PsiElement element) {
         return new SuppressIntentionAction[]{
             /* new AddNoInspectionCommentFix(HighlightDisplayKey.find(getShortName()), JSSuppressionHolder.class),  */
         };
     }
 
     @Override
-    public boolean isSuppressedFor(@Nonnull final PsiElement element) {
+    public boolean isSuppressedFor(@Nonnull PsiElement element) {
         return SuppressionUtil.isSuppressedInStatement(element, getID(), JSSuppressionHolder.class);
     }
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
index 93d32e6e..09f6029b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
@@ -36,14 +36,14 @@ public void setOnTheFly(boolean onTheFly) {
 
     @RequiredReadAction
     protected void registerFunctionCallError(JSCallExpression expression) {
-        final JSExpression methodExpression = expression.getMethodExpression();
+        JSExpression methodExpression = expression.getMethodExpression();
         PsiElement errorLocation = null;
 
         if (methodExpression instanceof JSReferenceExpression referenceExpression) {
             errorLocation = referenceExpression.getReferenceNameElement();
         }
         else if (methodExpression instanceof JSFunction function) {
-            final PsiElement node = function.getNameIdentifier();
+            PsiElement node = function.getNameIdentifier();
             if (node != null) {
                 errorLocation = node;
             }
@@ -56,12 +56,12 @@ else if (methodExpression instanceof JSFunction function) {
     }
 
     protected void registerStatementError(JSStatement statement, Object... args) {
-        final PsiElement statementToken = statement.getFirstChild();
+        PsiElement statementToken = statement.getFirstChild();
         registerError(statementToken, args);
     }
 
     protected void registerFunctionError(JSFunction function) {
-        final PsiElement identifier = function.getNameIdentifier();
+        PsiElement identifier = function.getNameIdentifier();
         if (identifier == null ||
             !PsiTreeUtil.isAncestor(function, identifier, true)) {
             registerError(function.getFirstChild());
@@ -72,7 +72,7 @@ protected void registerFunctionError(JSFunction function) {
     }
 
     protected void registerVariableError(JSVariable variable) {
-        final PsiElement nameIdentifier = variable.getFirstChild();
+        PsiElement nameIdentifier = variable.getFirstChild();
         registerError(nameIdentifier);
     }
 
@@ -80,8 +80,8 @@ protected void registerError(PsiElement location) {
         if (location == null) {
             return;
         }
-        final LocalQuickFix[] fix = createFixes(location, myState);
-        final String description = inspection.buildErrorString(myState, location);
+        LocalQuickFix[] fix = createFixes(location, myState);
+        String description = inspection.buildErrorString(myState, location);
         registerError(location, description, fix);
     }
 
@@ -99,13 +99,13 @@ protected ProblemHighlightType getProblemHighlightType(PsiElement location) {
         return ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
     }
 
-    protected PsiElement getEditorErrorLocation(final @Nonnull PsiElement location) {
+    protected PsiElement getEditorErrorLocation(@Nonnull PsiElement location) {
         return location;
     }
 
     protected void registerError(PsiElement location, Object... args) {
-        final LocalQuickFix[] fix = createFixes(location, myState);
-        final String description = inspection.buildErrorString(myState, args);
+        LocalQuickFix[] fix = createFixes(location, myState);
+        String description = inspection.buildErrorString(myState, args);
         registerError(location, description, fix);
     }
 
@@ -114,11 +114,11 @@ private LocalQuickFix[] createFixes(PsiElement location, Object state) {
         if (!onTheFly && inspection.buildQuickFixesOnlyForOnTheFlyErrors()) {
             return null;
         }
-        final InspectionJSFix[] fixes = inspection.buildFixes(location);
+        InspectionJSFix[] fixes = inspection.buildFixes(location);
         if (fixes != null) {
             return fixes;
         }
-        final InspectionJSFix fix = inspection.buildFix(location, state);
+        InspectionJSFix fix = inspection.buildFix(location, state);
         if (fix == null) {
             return null;
         }
@@ -131,7 +131,7 @@ public ProblemDescriptor[] getErrors() {
             return null;
         }
         else {
-            final int numErrors = errors.size();
+            int numErrors = errors.size();
             return errors.toArray(new ProblemDescriptor[numErrors]);
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index 0a7b7f08..829c5838 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -68,10 +68,10 @@ public InspectionToolState<?> createStateProvider() {
 
     @RequiredReadAction
     String calculateReplacementExpression(JSExpression expression, PointlessBitwiseExpressionJSInspectionState state) {
-        final JSBinaryExpression exp = (JSBinaryExpression)expression;
-        final JSExpression lhs = exp.getLOperand();
-        final JSExpression rhs = exp.getROperand();
-        final IElementType tokenType = exp.getOperationSign();
+        JSBinaryExpression exp = (JSBinaryExpression)expression;
+        JSExpression lhs = exp.getLOperand();
+        JSExpression rhs = exp.getROperand();
+        IElementType tokenType = exp.getOperationSign();
         assert rhs != null;
         if (tokenType.equals(JSTokenTypes.AND)) {
             if (isZero(lhs, state) || isAllOnes(rhs, state)) {
@@ -139,8 +139,8 @@ public LocalizeValue getName() {
         @Override
         @RequiredReadAction
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSExpression expression = (JSExpression)descriptor.getPsiElement();
-            final String newExpression = calculateReplacementExpression(expression, myState);
+            JSExpression expression = (JSExpression)descriptor.getPsiElement();
+            String newExpression = calculateReplacementExpression(expression, myState);
             replaceExpression(expression, newExpression);
         }
     }
@@ -150,19 +150,19 @@ private class PointlessBitwiseVisitor extends BaseInspectionVisitor<PointlessBit
         @RequiredReadAction
         public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (!OUR_BITWISE_TOKENS.contains(sign)) {
                 return;
             }
 
-            final JSExpression rhs = expression.getROperand();
+            JSExpression rhs = expression.getROperand();
             if (rhs == null) {
                 return;
             }
 
-            final JSExpression lhs = expression.getLOperand();
+            JSExpression lhs = expression.getLOperand();
 
-            final boolean isPointless;
+            boolean isPointless;
             if (JSTokenTypes.AND.equals(sign)) {
                 isPointless = andExpressionIsPointless(lhs, rhs);
             }
@@ -209,7 +209,7 @@ private boolean isZero(JSExpression expression, PointlessBitwiseExpressionJSInsp
         if (state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression)) {
             return false;
         }
-        final Object value =
+        Object value =
             ExpressionUtil.computeConstantExpression(expression);
         return value instanceof Integer && (Integer)value == 0;
     }
@@ -218,7 +218,7 @@ private boolean isAllOnes(JSExpression expression, PointlessBitwiseExpressionJSI
         if (state.m_ignoreExpressionsContainingConstants && !(expression instanceof JSLiteralExpression)) {
             return false;
         }
-        final Object value = ExpressionUtil.computeConstantExpression(expression);
+        Object value = ExpressionUtil.computeConstantExpression(expression);
         return value instanceof Integer intValue && intValue == 0xffffffff;
     }
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index b0a6c23d..53040635 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -52,23 +52,23 @@ private static class ShiftOutOfRange extends BaseInspectionVisitor {
         @Override
         public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
-            final IElementType tokenType = expression.getOperationSign();
+            IElementType tokenType = expression.getOperationSign();
             if (tokenType == null || (!JSTokenTypes.LTLT.equals(tokenType)
                 && !JSTokenTypes.GTGT.equals(tokenType) && !JSTokenTypes.GTGTGT.equals(tokenType))) {
                 return;
             }
-            final JSExpression rhs = expression.getROperand();
+            JSExpression rhs = expression.getROperand();
             if (rhs == null) {
                 return;
             }
             if (!ExpressionUtil.isConstantExpression(rhs)) {
                 return;
             }
-            final Object valueObject = ExpressionUtil.computeConstantExpression(rhs);
+            Object valueObject = ExpressionUtil.computeConstantExpression(rhs);
             if (!(valueObject instanceof Integer)) {
                 return;
             }
-            final int value = (Integer)valueObject;
+            int value = (Integer)valueObject;
             if (value < 0 || value > 31) {
                 registerError(expression, value);
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index c35c780b..309e40c5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -53,11 +53,11 @@ private static class DivisionByZeroVisitor extends BaseInspectionVisitor {
         @Override
         public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
-            final JSExpression rhs = expression.getROperand();
+            JSExpression rhs = expression.getROperand();
             if (rhs == null) {
                 return;
             }
-            final IElementType tokenType = expression.getOperationSign();
+            IElementType tokenType = expression.getOperationSign();
             if (!JSTokenTypes.DIV.equals(tokenType) &&
                 !JSTokenTypes.PERC.equals(tokenType)) {
                 return;
@@ -71,11 +71,11 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
         @Override
         public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
-            final JSExpression rhs = expression.getROperand();
+            JSExpression rhs = expression.getROperand();
             if (rhs == null) {
                 return;
             }
-            final IElementType tokenType = expression.getOperationSign();
+            IElementType tokenType = expression.getOperationSign();
             if (!JSTokenTypes.DIVEQ.equals(tokenType)
                 && !JSTokenTypes.PERCEQ.equals(tokenType)) {
                 return;
@@ -88,7 +88,7 @@ public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
     }
 
     private static boolean isZero(JSExpression expression) {
-        @NonNls final String text = expression.getText();
+        @NonNls String text = expression.getText();
         return "0".equals(text)
             || "0x0".equals(text)
             || "0X0".equals(text)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index a26f831d..09b7c961 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -50,8 +50,8 @@ protected String buildErrorString(Object state, Object... args) {
 
     @Override
     protected InspectionJSFix buildFix(PsiElement location, Object state) {
-        final JSBinaryExpression expression = (JSBinaryExpression)location;
-        final IElementType sign = expression.getOperationSign();
+        JSBinaryExpression expression = (JSBinaryExpression)location;
+        IElementType sign = expression.getOperationSign();
         if (JSTokenTypes.EQEQ == sign) {
             return new EqualityComparisonWithCoercionFix("===");
         }
@@ -76,9 +76,9 @@ public LocalizeValue getName() {
 
         @Override
         protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
-            final JSExpression lhs = expression.getLOperand();
-            final JSExpression rhs = expression.getROperand();
+            JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
+            JSExpression lhs = expression.getLOperand();
+            JSExpression rhs = expression.getROperand();
             replaceExpression(expression, lhs.getText() + sign + rhs.getText());
         }
     }
@@ -92,15 +92,15 @@ private static class EqualityComparisonWithCoercionVisitor extends BaseInspectio
         @Override
         public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
-            final JSExpression lhs = expression.getLOperand();
+            JSExpression lhs = expression.getLOperand();
             if (lhs == null) {
                 return;
             }
-            final JSExpression rhs = expression.getROperand();
+            JSExpression rhs = expression.getROperand();
             if (rhs == null) {
                 return;
             }
-            final IElementType tokenType = expression.getOperationSign();
+            IElementType tokenType = expression.getOperationSign();
             if (!JSTokenTypes.EQEQ.equals(tokenType) && !JSTokenTypes.NE.equals(tokenType)) {
                 return;
             }
@@ -112,7 +112,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
     }
 
     private static boolean mayCauseCoercion(JSExpression expression) {
-        @NonNls final String text = expression.getText();
+        @NonNls String text = expression.getText();
         return "0".equals(text)
             || "0x0".equals(text)
             || "0X0".equals(text)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index 38da0c59..55ffa13b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -54,12 +54,12 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
-            final JSExpression lhs = expression.getLOperand();
-            final JSExpression rhs = expression.getROperand();
-            final IElementType operationSign = expression.getOperationSign();
+            JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
+            JSExpression lhs = expression.getLOperand();
+            JSExpression rhs = expression.getROperand();
+            IElementType operationSign = expression.getOperationSign();
             assert rhs != null;
-            final String newExpression = lhs.getText() + getShortCircuitOperand(operationSign) + rhs.getText();
+            String newExpression = lhs.getText() + getShortCircuitOperand(operationSign) + rhs.getText();
             replaceExpression(expression, newExpression);
         }
 
@@ -80,7 +80,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             if (!(expression.getROperand() != null)) {
                 return;
             }
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.AND.equals(sign) && !JSTokenTypes.OR.equals(sign)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
index de05cd2b..f262ec1b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
@@ -53,8 +53,8 @@ public void visitJSExpressionStatement(@Nonnull JSExpressionStatement statement)
             if (!(statement.getExpression()instanceof JSNewExpression)) {
                 return;
             }
-            final JSNewExpression newExpression = (JSNewExpression) statement.getExpression();
-            final JSExpression methodExpression = newExpression.getMethodExpression();
+            JSNewExpression newExpression = (JSNewExpression) statement.getExpression();
+            JSExpression methodExpression = newExpression.getMethodExpression();
             if (methodExpression == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
index 40a40537..354f7115 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
@@ -26,7 +26,7 @@ public static boolean statementMayReturnBeforeRecursing(JSStatement statement, J
             return false;
         }
         else if (statement instanceof JSReturnStatement returnStatement) {
-            final JSExpression returnValue = returnStatement.getExpression();
+            JSExpression returnValue = returnStatement.getExpression();
             return returnValue == null || !expressionDefinitelyRecurses(returnValue, function);
         }
         else if (statement instanceof JSForStatement forStatement) {
@@ -63,49 +63,49 @@ else if (statement instanceof JSSwitchStatement switchStatement) {
     }
 
     private static boolean doWhileStatementMayReturnBeforeRecursing(JSDoWhileStatement loopStatement, JSFunction function) {
-        final JSStatement body = loopStatement.getBody();
+        JSStatement body = loopStatement.getBody();
         return statementMayReturnBeforeRecursing(body, function);
     }
 
     private static boolean whileStatementMayReturnBeforeRecursing(JSWhileStatement loopStatement, JSFunction function) {
-        final JSExpression test = loopStatement.getCondition();
+        JSExpression test = loopStatement.getCondition();
         if (expressionDefinitelyRecurses(test, function)) {
             return false;
         }
-        final JSStatement body = loopStatement.getBody();
+        JSStatement body = loopStatement.getBody();
         return statementMayReturnBeforeRecursing(body, function);
     }
 
     private static boolean forStatementMayReturnBeforeRecursing(JSForStatement loopStatement, JSFunction function) {
-        final JSExpression initialization = loopStatement.getInitialization();
+        JSExpression initialization = loopStatement.getInitialization();
 
         if (expressionDefinitelyRecurses(initialization, function)) {
             return false;
         }
-        final JSExpression test = loopStatement.getCondition();
+        JSExpression test = loopStatement.getCondition();
         if (expressionDefinitelyRecurses(test, function)) {
             return false;
         }
-        final JSStatement body = loopStatement.getBody();
+        JSStatement body = loopStatement.getBody();
         return statementMayReturnBeforeRecursing(body, function);
     }
 
     private static boolean foreachStatementMayReturnBeforeRecursing(JSForInStatement loopStatement, JSFunction function) {
-        final JSExpression test = loopStatement.getCollectionExpression();
+        JSExpression test = loopStatement.getCollectionExpression();
         if (expressionDefinitelyRecurses(test, function)) {
             return false;
         }
-        final JSStatement body = loopStatement.getBody();
+        JSStatement body = loopStatement.getBody();
         return statementMayReturnBeforeRecursing(body, function);
     }
 
     private static boolean switchStatementMayReturnBeforeRecursing(JSSwitchStatement switchStatement, JSFunction function) {
-        final JSCaseClause[] clauses = switchStatement.getCaseClauses();
+        JSCaseClause[] clauses = switchStatement.getCaseClauses();
         if (clauses == null) {
             return true;
         }
         for (JSCaseClause clause : clauses) {
-            final JSStatement[] statements = clause.getStatements();
+            JSStatement[] statements = clause.getStatements();
             for (JSStatement statement : statements) {
                 if (statementMayReturnBeforeRecursing(statement, function)) {
                     return true;
@@ -117,7 +117,7 @@ private static boolean switchStatementMayReturnBeforeRecursing(JSSwitchStatement
     }
 
     private static boolean tryStatementMayReturnBeforeRecursing(JSTryStatement tryStatement, JSFunction function) {
-        final JSStatement finallyBlock = tryStatement.getFinallyStatement();
+        JSStatement finallyBlock = tryStatement.getFinallyStatement();
         if (finallyBlock != null) {
             if (statementMayReturnBeforeRecursing(finallyBlock, function)) {
                 return true;
@@ -126,33 +126,33 @@ private static boolean tryStatementMayReturnBeforeRecursing(JSTryStatement trySt
                 return false;
             }
         }
-        final JSStatement tryBlock = tryStatement.getStatement();
+        JSStatement tryBlock = tryStatement.getStatement();
         if (statementMayReturnBeforeRecursing(tryBlock, function)) {
             return true;
         }
-        final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+        JSCatchBlock catchBlock = tryStatement.getCatchBlock();
         if (catchBlock == null) {
             return false;
         }
-        final JSStatement catchBlockStatement = catchBlock.getStatement();
+        JSStatement catchBlockStatement = catchBlock.getStatement();
         return statementMayReturnBeforeRecursing(catchBlockStatement, function);
     }
 
     private static boolean ifStatementMayReturnBeforeRecursing(JSIfStatement ifStatement, JSFunction function) {
-        final JSExpression test = ifStatement.getCondition();
+        JSExpression test = ifStatement.getCondition();
         if (expressionDefinitelyRecurses(test, function)) {
             return false;
         }
-        final JSStatement thenBranch = ifStatement.getThen();
+        JSStatement thenBranch = ifStatement.getThen();
         if (statementMayReturnBeforeRecursing(thenBranch, function)) {
             return true;
         }
-        final JSStatement elseBranch = ifStatement.getElse();
+        JSStatement elseBranch = ifStatement.getElse();
         return elseBranch != null && statementMayReturnBeforeRecursing(elseBranch, function);
     }
 
     private static boolean labeledStatementMayReturnBeforeRecursing(JSLabeledStatement labeledStatement, JSFunction function) {
-        final JSStatement statement = labeledStatement.getStatement();
+        JSStatement statement = labeledStatement.getStatement();
         return statementMayReturnBeforeRecursing(statement, function);
     }
 
@@ -160,8 +160,8 @@ private static boolean codeBlockMayReturnBeforeRecursing(JSBlockStatement block,
         if (block == null) {
             return true;
         }
-        final JSStatement[] statements = block.getStatements();
-        for (final JSStatement statement : statements) {
+        JSStatement[] statements = block.getStatements();
+        for (JSStatement statement : statements) {
             if (statementMayReturnBeforeRecursing(statement, function)) {
                 return true;
             }
@@ -173,7 +173,7 @@ private static boolean codeBlockMayReturnBeforeRecursing(JSBlockStatement block,
     }
 
     public static boolean functionMayRecurse(@Nonnull JSFunction function) {
-        final RecursionVisitor recursionVisitor = new RecursionVisitor(function);
+        RecursionVisitor recursionVisitor = new RecursionVisitor(function);
         function.accept(recursionVisitor);
         return recursionVisitor.isRecursive();
     }
@@ -216,31 +216,31 @@ private static boolean expressionDefinitelyRecurses(JSExpression exp, JSFunction
     }
 
     private static boolean conditionalExpressionDefinitelyRecurses(JSConditionalExpression expression, JSFunction function) {
-        final JSExpression condExpression = expression.getCondition();
+        JSExpression condExpression = expression.getCondition();
         if (expressionDefinitelyRecurses(condExpression, function)) {
             return true;
         }
-        final JSExpression thenExpression = expression.getThen();
-        final JSExpression elseExpression = expression.getElse();
+        JSExpression thenExpression = expression.getThen();
+        JSExpression elseExpression = expression.getElse();
         return expressionDefinitelyRecurses(thenExpression, function) && expressionDefinitelyRecurses(elseExpression, function);
     }
 
     private static boolean binaryExpressionDefinitelyRecurses(JSBinaryExpression expression, JSFunction function) {
-        final JSExpression lhs = expression.getLOperand();
+        JSExpression lhs = expression.getLOperand();
         if (expressionDefinitelyRecurses(lhs, function)) {
             return true;
         }
-        final IElementType tokenType = expression.getOperationSign();
+        IElementType tokenType = expression.getOperationSign();
         if (JSTokenTypes.ANDAND.equals(tokenType) || JSTokenTypes.OROR.equals(tokenType)) {
             return false;
         }
-        final JSExpression rhs = expression.getROperand();
+        JSExpression rhs = expression.getROperand();
         return expressionDefinitelyRecurses(rhs, function);
     }
 
     private static boolean arrayInitializerExpressionDefinitelyRecurses(JSArrayLiteralExpression expression, JSFunction function) {
-        final JSExpression[] initializers = expression.getExpressions();
-        for (final JSExpression initializer : initializers) {
+        JSExpression[] initializers = expression.getExpressions();
+        for (JSExpression initializer : initializers) {
             if (expressionDefinitelyRecurses(initializer, function)) {
                 return true;
             }
@@ -249,40 +249,40 @@ private static boolean arrayInitializerExpressionDefinitelyRecurses(JSArrayLiter
     }
 
     private static boolean prefixExpressionDefinitelyRecurses(JSPrefixExpression expression, JSFunction function) {
-        final JSExpression operand = expression.getExpression();
+        JSExpression operand = expression.getExpression();
         return expressionDefinitelyRecurses(operand, function);
     }
 
     private static boolean postfixExpressionDefinitelyRecurses(JSPostfixExpression expression, JSFunction function) {
-        final JSExpression operand = expression.getExpression();
+        JSExpression operand = expression.getExpression();
         return expressionDefinitelyRecurses(operand, function);
     }
 
     private static boolean parenthesizedExpressionDefinitelyRecurses(JSParenthesizedExpression expression, JSFunction function) {
-        final JSExpression innerExpression = expression.getInnerExpression();
+        JSExpression innerExpression = expression.getInnerExpression();
         return expressionDefinitelyRecurses(innerExpression, function);
     }
 
     private static boolean referenceExpressionDefinitelyRecurses(JSReferenceExpression expression, JSFunction function) {
-        final JSExpression qualifierExpression = expression.getQualifier();
+        JSExpression qualifierExpression = expression.getQualifier();
         return qualifierExpression != null && expressionDefinitelyRecurses(qualifierExpression, function);
     }
 
     private static boolean assignmentExpressionDefinitelyRecurses(JSAssignmentExpression assignmentExpression, JSFunction function) {
-        final JSExpression rhs = assignmentExpression.getROperand();
-        final JSExpression lhs = assignmentExpression.getLOperand();
+        JSExpression rhs = assignmentExpression.getROperand();
+        JSExpression lhs = assignmentExpression.getLOperand();
         return expressionDefinitelyRecurses(rhs, function) || expressionDefinitelyRecurses(lhs, function);
     }
 
 
     private static boolean functionCallExpressionDefinitelyRecurses(JSCallExpression exp, JSFunction function) {
-        final JSExpression functionExpression = exp.getMethodExpression();
+        JSExpression functionExpression = exp.getMethodExpression();
         if (functionExpression instanceof JSReferenceExpression reference) {
-            final PsiElement referent = reference.resolve();
+            PsiElement referent = reference.resolve();
             if (referent != null && referent.equals(function)) {
                 return true;
             }
-            final JSExpression qualifier = reference.getQualifier();
+            JSExpression qualifier = reference.getQualifier();
             if (qualifier == null || qualifier instanceof JSThisExpression) {
                 return reference.getText().equals(function.getName());
             }
@@ -291,9 +291,9 @@ private static boolean functionCallExpressionDefinitelyRecurses(JSCallExpression
         if (expressionDefinitelyRecurses(functionExpression, function)) {
             return true;
         }
-        final JSArgumentList argumentList = exp.getArgumentList();
-        final JSExpression[] args = argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
-        for (final JSExpression arg : args) {
+        JSArgumentList argumentList = exp.getArgumentList();
+        JSExpression[] args = argumentList != null ? argumentList.getArguments() : JSExpression.EMPTY_ARRAY;
+        for (JSExpression arg : args) {
             if (expressionDefinitelyRecurses(arg, function)) {
                 return true;
             }
@@ -312,13 +312,13 @@ private static boolean statementDefinitelyRecurses(JSStatement statement, JSFunc
             return false;
         }
         else if (statement instanceof JSExpressionStatement expressionStatement) {
-            final JSExpression expression = expressionStatement.getExpression();
+            JSExpression expression = expressionStatement.getExpression();
             return expressionDefinitelyRecurses(expression, function);
         }
         else if (statement instanceof JSVarStatement declaration) {
-            final JSVariable[] declaredElements = declaration.getVariables();
-            for (final JSVariable variable : declaredElements) {
-                final JSExpression initializer = variable.getInitializer();
+            JSVariable[] declaredElements = declaration.getVariables();
+            for (JSVariable variable : declaredElements) {
+                JSExpression initializer = variable.getInitializer();
                 if (expressionDefinitelyRecurses(initializer, function)) {
                     return true;
                 }
@@ -326,7 +326,7 @@ else if (statement instanceof JSVarStatement declaration) {
             return false;
         }
         else if (statement instanceof JSReturnStatement returnStatement) {
-            final JSExpression returnValue = returnStatement.getExpression();
+            JSExpression returnValue = returnStatement.getExpression();
             return returnValue != null && expressionDefinitelyRecurses(returnValue, function);
         }
         else if (statement instanceof JSForStatement forStatement) {
@@ -363,16 +363,16 @@ else if (statement instanceof JSSwitchStatement switchStatement) {
     }
 
     private static boolean switchStatementDefinitelyRecurses(JSSwitchStatement switchStatement, JSFunction function) {
-        final JSExpression switchExpression = switchStatement.getSwitchExpression();
+        JSExpression switchExpression = switchStatement.getSwitchExpression();
         return expressionDefinitelyRecurses(switchExpression, function);
     }
 
     private static boolean tryStatementDefinitelyRecurses(JSTryStatement tryStatement, JSFunction function) {
-        final JSStatement tryBlock = tryStatement.getStatement();
+        JSStatement tryBlock = tryStatement.getStatement();
         if (statementDefinitelyRecurses(tryBlock, function)) {
             return true;
         }
-        final JSStatement finallyBlock = tryStatement.getFinallyStatement();
+        JSStatement finallyBlock = tryStatement.getFinallyStatement();
         return statementDefinitelyRecurses(finallyBlock, function);
     }
 
@@ -380,8 +380,8 @@ private static boolean codeBlockDefinitelyRecurses(JSBlockStatement block, JSFun
         if (block == null) {
             return false;
         }
-        final JSStatement[] statements = block.getStatements();
-        for (final JSStatement statement : statements) {
+        JSStatement[] statements = block.getStatements();
+        for (JSStatement statement : statements) {
             if (statementDefinitelyRecurses(statement, function)) {
                 return true;
             }
@@ -393,66 +393,66 @@ else if (statementMayReturnBeforeRecursing(statement, function)) {
     }
 
     private static boolean ifStatementDefinitelyRecurses(JSIfStatement ifStatement, JSFunction function) {
-        final JSExpression condition = ifStatement.getCondition();
+        JSExpression condition = ifStatement.getCondition();
         if (expressionDefinitelyRecurses(condition, function)) {
             return true;
         }
-        final JSStatement thenBranch = ifStatement.getThen();
-        final JSStatement elseBranch = ifStatement.getElse();
+        JSStatement thenBranch = ifStatement.getThen();
+        JSStatement elseBranch = ifStatement.getElse();
         return thenBranch != null && elseBranch != null
             && statementDefinitelyRecurses(thenBranch, function)
             && statementDefinitelyRecurses(elseBranch, function);
     }
 
     private static boolean forStatementDefinitelyRecurses(JSForStatement forStatement, JSFunction function) {
-        final JSExpression initialization = forStatement.getInitialization();
+        JSExpression initialization = forStatement.getInitialization();
         if (expressionDefinitelyRecurses(initialization, function)) {
             return true;
         }
-        final JSExpression condition = forStatement.getCondition();
+        JSExpression condition = forStatement.getCondition();
         if (expressionDefinitelyRecurses(condition, function)) {
             return true;
         }
         if (BoolUtils.isTrue(condition)) {
-            final JSStatement body = forStatement.getBody();
+            JSStatement body = forStatement.getBody();
             return statementDefinitelyRecurses(body, function);
         }
         return false;
     }
 
     private static boolean foreachStatementDefinitelyRecurses(JSForInStatement foreachStatement, JSFunction function) {
-        final JSExpression iteration = foreachStatement.getCollectionExpression();
+        JSExpression iteration = foreachStatement.getCollectionExpression();
         return expressionDefinitelyRecurses(iteration, function);
     }
 
     private static boolean whileStatementDefinitelyRecurses(JSWhileStatement whileStatement, JSFunction function) {
-        final JSExpression condition = whileStatement.getCondition();
+        JSExpression condition = whileStatement.getCondition();
         if (expressionDefinitelyRecurses(condition, function)) {
             return true;
         }
         if (BoolUtils.isTrue(condition)) {
-            final JSStatement body = whileStatement.getBody();
+            JSStatement body = whileStatement.getBody();
             return statementDefinitelyRecurses(body, function);
         }
         return false;
     }
 
     private static boolean doWhileStatementDefinitelyRecurses(JSDoWhileStatement doWhileStatement, JSFunction function) {
-        final JSStatement body = doWhileStatement.getBody();
+        JSStatement body = doWhileStatement.getBody();
         if (statementDefinitelyRecurses(body, function)) {
             return true;
         }
-        final JSExpression condition = doWhileStatement.getCondition();
+        JSExpression condition = doWhileStatement.getCondition();
         return expressionDefinitelyRecurses(condition, function);
     }
 
     private static boolean labeledStatementDefinitelyRecurses(JSLabeledStatement labeledStatement, JSFunction function) {
-        final JSStatement body = labeledStatement.getStatement();
+        JSStatement body = labeledStatement.getStatement();
         return statementDefinitelyRecurses(body, function);
     }
 
     public static boolean functionDefinitelyRecurses(@Nonnull JSFunction function) {
-        final JSSourceElement[] body = function.getBody();
+        JSSourceElement[] body = function.getBody();
         if (body == null) {
             return false;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
index 9b699424..fb18b567 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
@@ -30,14 +30,14 @@ public void visitJSCallExpression(@Nonnull JSCallExpression call) {
             return;
         }
         super.visitJSCallExpression(call);
-        final JSExpression methodExpression = call.getMethodExpression();
+        JSExpression methodExpression = call.getMethodExpression();
 
         // method expression could be e.g. a["1"]
         if (!(methodExpression instanceof JSReferenceExpression)) {
             return;
         }
-        final JSReferenceExpression functionExpression = (JSReferenceExpression)methodExpression;
-        final String calledFunctionName = functionExpression.getReferencedName();
+        JSReferenceExpression functionExpression = (JSReferenceExpression)methodExpression;
+        String calledFunctionName = functionExpression.getReferencedName();
 
         if (calledFunctionName == null) {
             return;
@@ -45,11 +45,11 @@ public void visitJSCallExpression(@Nonnull JSCallExpression call) {
         if (!calledFunctionName.equals(functionName)) {
             return;
         }
-        final PsiElement referent = functionExpression.resolve();
+        PsiElement referent = functionExpression.resolve();
         if (!function.equals(referent)) {
             return;
         }
-        final JSExpression qualifier = functionExpression.getQualifier();
+        JSExpression qualifier = functionExpression.getQualifier();
         if (qualifier == null || qualifier instanceof JSThisExpression) {
             recursive = true;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index 42f5bdf2..bbad0d12 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -44,9 +44,9 @@ private static class TextLabelInSwitchStatementVisitor extends BaseInspectionVis
         @Override
         public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
-            final JSCaseClause[] caseClauses = statement.getCaseClauses();
+            JSCaseClause[] caseClauses = statement.getCaseClauses();
             for (JSCaseClause caseClause : caseClauses) {
-                final JSStatement[] statements = caseClause.getStatements();
+                JSStatement[] statements = caseClause.getStatements();
                 for (JSStatement statement1 : statements) {
                     checkForLabel(statement1);
                 }
@@ -57,8 +57,8 @@ private void checkForLabel(JSStatement statement) {
             if (!(statement instanceof JSLabeledStatement)) {
                 return;
             }
-            final JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
-            final PsiElement label = labeledStatement.getLabelIdentifier();
+            JSLabeledStatement labeledStatement = (JSLabeledStatement) statement;
+            PsiElement label = labeledStatement.getLabelIdentifier();
             registerError(label);
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index 9f3afa5e..7f62d480 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -44,8 +44,8 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSFunctionExpression(JSFunctionExpression jsFunctionExpression) {
             super.visitJSFunctionExpression(jsFunctionExpression);
-            final JSFunction function = jsFunctionExpression.getFunction();
-            final PsiElement identifier = function.getNameIdentifier();
+            JSFunction function = jsFunctionExpression.getFunction();
+            PsiElement identifier = function.getNameIdentifier();
             if (identifier == null || PsiTreeUtil.isAncestor(function, identifier, true)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index a0975734..b7af7c48 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -42,7 +42,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSBlock(JSBlockStatement jsBlockStatement) {
             super.visitJSBlock(jsBlockStatement);
-            final PsiElement parent = jsBlockStatement.getParent();
+            PsiElement parent = jsBlockStatement.getParent();
             if (parent instanceof JSIfStatement
                 || parent instanceof JSLoopStatement
                 || parent instanceof JSWithStatement
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index cd041198..a2a7327a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -57,42 +57,42 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSExpression literalExpression = (JSExpression)descriptor.getPsiElement();
-            final String text = literalExpression.getText();
-            final String newText = getCanonicalForm(text);
+            JSExpression literalExpression = (JSExpression)descriptor.getPsiElement();
+            String text = literalExpression.getText();
+            String newText = getCanonicalForm(text);
             replaceExpression(literalExpression, newText);
         }
 
         private static String getCanonicalForm(String text) {
-            final String suffix;
-            final String prefix;
+            String suffix;
+            String prefix;
             if (text.indexOf((int)'e') > 0) {
-                final int breakPoint = text.indexOf((int)'e');
+                int breakPoint = text.indexOf((int)'e');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
             }
             else if (text.indexOf((int)'E') > 0) {
-                final int breakPoint = text.indexOf((int)'E');
+                int breakPoint = text.indexOf((int)'E');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
             }
             else if (text.indexOf((int)'f') > 0) {
-                final int breakPoint = text.indexOf((int)'f');
+                int breakPoint = text.indexOf((int)'f');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
             }
             else if (text.indexOf((int)'F') > 0) {
-                final int breakPoint = text.indexOf((int)'F');
+                int breakPoint = text.indexOf((int)'F');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
             }
             else if (text.indexOf((int)'d') > 0) {
-                final int breakPoint = text.indexOf((int)'d');
+                int breakPoint = text.indexOf((int)'d');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
             }
             else if (text.indexOf((int)'D') > 0) {
-                final int breakPoint = text.indexOf((int)'D');
+                int breakPoint = text.indexOf((int)'D');
                 suffix = text.substring(breakPoint);
                 prefix = text.substring(0, breakPoint);
             }
@@ -100,7 +100,7 @@ else if (text.indexOf((int)'D') > 0) {
                 suffix = "";
                 prefix = text;
             }
-            final int indexPoint = prefix.indexOf((int)'.');
+            int indexPoint = prefix.indexOf((int)'.');
             if (indexPoint < 0) {
                 return prefix + ".0" + suffix;
             }
@@ -122,7 +122,7 @@ private static class ConfusingFloatingPointLiteralVisitor extends BaseInspection
         @Override
         public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression literal) {
             super.visitJSLiteralExpression(literal);
-            final String text = literal.getText();
+            String text = literal.getText();
             if (text == null) {
                 return;
             }
@@ -137,13 +137,13 @@ public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression literal)
     }
 
     private static boolean isConfusing(String text) {
-        final Matcher matcher = PICKY_FLOATING_POINT_PATTERN.matcher(text);
+        Matcher matcher = PICKY_FLOATING_POINT_PATTERN.matcher(text);
         return !matcher.matches();
     }
 
     private static boolean isFloatingPoint(JSLiteralExpression literal) {
-        final String text = literal.getText();
-        final char firstChar = text.charAt(0);
+        String text = literal.getText();
+        char firstChar = text.charAt(0);
         if (firstChar != '.' && !Character.isDigit(firstChar)) {
             return false;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index 459f9bab..ec38242f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -46,29 +46,29 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSBinaryExpression(JSBinaryExpression jsBinaryExpression) {
             super.visitJSBinaryExpression(jsBinaryExpression);
-            final IElementType sign = jsBinaryExpression.getOperationSign();
+            IElementType sign = jsBinaryExpression.getOperationSign();
             if (!JSTokenTypes.PLUS.equals(sign) && !JSTokenTypes.MINUS.equals(sign)) {
                 return;
             }
-            final JSExpression rhs = jsBinaryExpression.getROperand();
+            JSExpression rhs = jsBinaryExpression.getROperand();
             if (rhs == null) {
                 return;
             }
-            final JSExpression lhs = jsBinaryExpression.getLOperand();
+            JSExpression lhs = jsBinaryExpression.getLOperand();
             if (lhs == null) {
                 return;
             }
             if (lhs instanceof JSPostfixExpression) {
-                final JSPostfixExpression postfixExpression = (JSPostfixExpression)lhs;
-                final IElementType innerSign = postfixExpression.getOperationSign();
+                JSPostfixExpression postfixExpression = (JSPostfixExpression)lhs;
+                IElementType innerSign = postfixExpression.getOperationSign();
                 if (matches(sign, innerSign)) {
                     registerError(jsBinaryExpression);
                     return;
                 }
             }
             if (rhs instanceof JSPrefixExpression) {
-                final JSPrefixExpression postfixExpression = (JSPrefixExpression)rhs;
-                final IElementType innerSign = postfixExpression.getOperationSign();
+                JSPrefixExpression postfixExpression = (JSPrefixExpression)rhs;
+                IElementType innerSign = postfixExpression.getOperationSign();
                 if (matches(sign, innerSign)) {
                     registerError(jsBinaryExpression);
                 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 974bd4da..05975f76 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -45,7 +45,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             super.visitJSCallExpression(jsCallExpression);
-            final JSExpression methodExpression;
+            JSExpression methodExpression;
             try {
                 methodExpression = jsCallExpression.getMethodExpression();
             }
@@ -55,10 +55,10 @@ public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             if (!(methodExpression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
-            final JSExpression qualifier = referenceExpression.getQualifier();
+            JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
+            JSExpression qualifier = referenceExpression.getQualifier();
 
-            @NonNls final String methodName = referenceExpression.getReferencedName();
+            @NonNls String methodName = referenceExpression.getReferencedName();
             if (!"eval".equals(methodName) && !"setTimeout".equals(methodName) && !"setInterval".equals(methodName)) {
                 return;
             }
@@ -68,7 +68,7 @@ public void visitJSCallExpression(JSCallExpression jsCallExpression) {
         @Override
         public void visitJSNewExpression(JSNewExpression jsNewExpression) {
             super.visitJSNewExpression(jsNewExpression);
-            final JSExpression methodExpression;
+            JSExpression methodExpression;
             try {
                 methodExpression = jsNewExpression.getMethodExpression();
             }
@@ -78,13 +78,13 @@ public void visitJSNewExpression(JSNewExpression jsNewExpression) {
             if (!(methodExpression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
-            final JSExpression qualifier = referenceExpression.getQualifier();
+            JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
+            JSExpression qualifier = referenceExpression.getQualifier();
 
             if (qualifier != null) {
                 return;
             }
-            @NonNls final String methodName = referenceExpression.getReferencedName();
+            @NonNls String methodName = referenceExpression.getReferencedName();
             if (!"Function".equals(methodName)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index e6fbea49..7714ec9d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -62,7 +62,7 @@ private class EmptyStatementVisitor extends BaseInspectionVisitor<EmptyStatement
         public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
 
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -76,7 +76,7 @@ public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
         public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
 
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -90,7 +90,7 @@ public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
         public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
 
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -104,7 +104,7 @@ public void visitJSForStatement(@Nonnull JSForStatement statement) {
         public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
             super.visitJSForInStatement(statement);
 
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -118,14 +118,14 @@ public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
         public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
 
-            final JSStatement thenBranch = statement.getThen();
+            JSStatement thenBranch = statement.getThen();
             if (thenBranch != null) {
                 if (isEmpty(thenBranch)) {
                     registerStatementError(statement, statement);
                     return;
                 }
             }
-            final JSStatement elseBranch = statement.getElse();
+            JSStatement elseBranch = statement.getElse();
 
             if (elseBranch != null && isEmpty(elseBranch)) {
                 registerStatementError(statement, statement);
@@ -137,8 +137,8 @@ private boolean isEmpty(JSElement body) {
                 return true;
             }
             else if (myState.m_reportEmptyBlocks && body instanceof JSBlockStatement) {
-                final JSBlockStatement block = (JSBlockStatement)body;
-                final JSStatement[] statements = block.getStatements();
+                JSBlockStatement block = (JSBlockStatement)body;
+                JSStatement[] statements = block.getStatements();
                 return statements.length == 0;
             }
             return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index 49ee02eb..841e6046 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -43,11 +43,11 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSPrefixExpression(JSPrefixExpression expression) {
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
-            final PsiElement parent = expression.getParent();
+            PsiElement parent = expression.getParent();
             if (parent == null) {
                 return;
             }
@@ -63,11 +63,11 @@ public void visitJSPrefixExpression(JSPrefixExpression expression) {
 
         @Override
         public void visitJSPostfixExpression(JSPostfixExpression jsPostfixExpression) {
-            final IElementType sign = jsPostfixExpression.getOperationSign();
+            IElementType sign = jsPostfixExpression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
                 return;
             }
-            final PsiElement parent = jsPostfixExpression.getParent();
+            PsiElement parent = jsPostfixExpression.getParent();
             if (parent == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index 22df8b9e..1ee75ef9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -64,11 +64,11 @@ private static class MagicNumberVisitor extends BaseInspectionVisitor {
         public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression expression) {
             super.visitJSLiteralExpression(expression);
 
-            final String text = expression.getText();
+            String text = expression.getText();
             if (text == null || !isNumeric(text) || isSpecialCaseLiteral(text) || isDeclaredConstant(expression)) {
                 return;
             }
-            final PsiElement parent = expression.getParent();
+            PsiElement parent = expression.getParent();
             if (parent instanceof JSPrefixExpression) {
                 registerError(parent);
             }
@@ -82,21 +82,21 @@ private static boolean isNumeric(String text) {
         if (text.isEmpty()) {
             return false;
         }
-        final char firstChar = text.charAt(0);
+        char firstChar = text.charAt(0);
         return Character.isDigit(firstChar) || firstChar == '.';
     }
 
     @RequiredReadAction
     private static boolean isDeclaredConstant(JSLiteralExpression expression) {
-        final JSFunction containingFunction = PsiTreeUtil.getParentOfType(expression, JSFunction.class);
+        JSFunction containingFunction = PsiTreeUtil.getParentOfType(expression, JSFunction.class);
         if (containingFunction != null) {
             return false;
         }
-        final JSVarStatement varStatement = PsiTreeUtil.getParentOfType(expression, JSVarStatement.class);
+        JSVarStatement varStatement = PsiTreeUtil.getParentOfType(expression, JSVarStatement.class);
         if (varStatement == null) {
             return false;
         }
-        final JSVariable[] variables = varStatement.getVariables();
+        JSVariable[] variables = varStatement.getVariables();
         for (JSVariable variable : variables) {
             if (expression.equals(variable.getInitializer())) {
                 return true;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index d70557dc..6b8989cf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -59,15 +59,15 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSConditionalExpression exp = (JSConditionalExpression)descriptor.getPsiElement();
+            JSConditionalExpression exp = (JSConditionalExpression)descriptor.getPsiElement();
             assert exp != null;
-            final JSExpression elseBranch = exp.getElse();
-            final JSExpression thenBranch = exp.getThen();
-            final JSExpression condition = exp.getCondition();
-            final String negatedCondition = BoolUtils.getNegatedExpressionText(condition);
+            JSExpression elseBranch = exp.getElse();
+            JSExpression thenBranch = exp.getThen();
+            JSExpression condition = exp.getCondition();
+            String negatedCondition = BoolUtils.getNegatedExpressionText(condition);
             assert elseBranch != null;
             assert thenBranch != null;
-            final String newStatement = negatedCondition + '?' + elseBranch.getText() + ':' + thenBranch.getText();
+            String newStatement = negatedCondition + '?' + elseBranch.getText() + ':' + thenBranch.getText();
             replaceExpression(exp, newStatement);
         }
     }
@@ -93,8 +93,8 @@ private boolean isNotEquals(JSExpression expression) {
             if (!(expression instanceof JSBinaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
-            final IElementType sign = binaryExpression.getOperationSign();
+            JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
+            IElementType sign = binaryExpression.getOperationSign();
             return JSTokenTypes.NE.equals(sign) || JSTokenTypes.NEQEQ.equals(sign);
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index f5038b21..42df60f5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -67,23 +67,23 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement ifToken = descriptor.getPsiElement();
-            final JSIfStatement ifStatement = (JSIfStatement)ifToken.getParent();
+            PsiElement ifToken = descriptor.getPsiElement();
+            JSIfStatement ifStatement = (JSIfStatement)ifToken.getParent();
             assert ifStatement != null;
-            final JSStatement elseBranch = ifStatement.getElse();
-            final JSStatement thenBranch = ifStatement.getThen();
-            final JSExpression condition = ifStatement.getCondition();
-            final String negatedCondition = BoolUtils.getNegatedExpressionText(condition);
+            JSStatement elseBranch = ifStatement.getElse();
+            JSStatement thenBranch = ifStatement.getThen();
+            JSExpression condition = ifStatement.getCondition();
+            String negatedCondition = BoolUtils.getNegatedExpressionText(condition);
             String elseText = elseBranch.getText();
-            final PsiElement lastChild = elseBranch.getLastChild();
+            PsiElement lastChild = elseBranch.getLastChild();
             if (lastChild instanceof PsiComment) {
-                final PsiComment comment = (PsiComment)lastChild;
-                final IElementType tokenType = comment.getTokenType();
+                PsiComment comment = (PsiComment)lastChild;
+                IElementType tokenType = comment.getTokenType();
                 if (JSTokenTypes.END_OF_LINE_COMMENT.equals(tokenType)) {
                     elseText += '\n';
                 }
             }
-            @NonNls final String newStatement = "if(" + negatedCondition + ')' + elseText + " else " + thenBranch.getText();
+            @NonNls String newStatement = "if(" + negatedCondition + ')' + elseText + " else " + thenBranch.getText();
             replaceStatement(ifStatement, newStatement);
         }
     }
@@ -92,9 +92,9 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSIfStatement(JSIfStatement statement) {
             super.visitJSIfStatement(statement);
-            final PsiElement parent = statement.getParent();
+            PsiElement parent = statement.getParent();
             if (parent instanceof JSIfStatement parentStatement) {
-                final JSStatement elseBranch = parentStatement.getElse();
+                JSStatement elseBranch = parentStatement.getElse();
                 if (statement.equals(elseBranch)) {
                     return;
                 }
@@ -115,8 +115,8 @@ private boolean isNotEquals(JSExpression expression) {
             if (!(expression instanceof JSBinaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
-            final IElementType sign = binaryExpression.getOperationSign();
+            JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
+            IElementType sign = binaryExpression.getOperationSign();
             return JSTokenTypes.NE.equals(sign) || JSTokenTypes.NEQEQ.equals(sign);
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
index 50e26bf0..192b4edf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
@@ -42,7 +42,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSConditionalExpression(JSConditionalExpression jsConditionalExpression) {
             super.visitJSConditionalExpression(jsConditionalExpression);
-            final JSConditionalExpression containingConditionalExpression =
+            JSConditionalExpression containingConditionalExpression =
                 PsiTreeUtil.getParentOfType(jsConditionalExpression, JSConditionalExpression.class, true);
             if (containingConditionalExpression == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index 9bdc1c5b..e85927f6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -33,7 +33,7 @@ public LocalizeValue getGroupDisplayName() {
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         if (functionHasIdentifier(function)) {
             return InspectionJSLocalize.nestedFunctionErrorString().get();
         }
@@ -58,7 +58,7 @@ public void visitJSFunctionDeclaration(JSFunction function) {
             if (!myState.m_includeAnonymousFunctions && function.getName() == null) {
                 return;
             }
-            final JSFunction containingFunction = PsiTreeUtil.getParentOfType(function, JSFunction.class, true);
+            JSFunction containingFunction = PsiTreeUtil.getParentOfType(function, JSFunction.class, true);
             if (containingFunction == null) {
                 return;
             }
@@ -66,7 +66,7 @@ public void visitJSFunctionDeclaration(JSFunction function) {
         }
 
         @Override
-        public void visitJSFunctionExpression(final JSFunctionExpression node) {
+        public void visitJSFunctionExpression(JSFunctionExpression node) {
             visitJSFunctionDeclaration(node.getFunction());
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index 0c029c65..18c06c70 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -42,7 +42,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSLiteralExpression(JSSimpleLiteralExpression jsLiteralExpression) {
             super.visitJSLiteralExpression(jsLiteralExpression);
-            @NonNls final String text = jsLiteralExpression.getText();
+            @NonNls String text = jsLiteralExpression.getText();
             if (text.startsWith("0") && !"0".equals(text)
                 && !text.startsWith("0x") && !text.startsWith("0X")
                 && !text.contains(".") && !text.contains("e") && !text.contains("E"))
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
index 152788fc..4cdcfcb1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
@@ -80,7 +80,7 @@ private void checkExpression(JSExpression expression) {
             if (isParentBoolean(expression)) {
                 return;
             }
-            final int numTerms = countTerms(expression);
+            int numTerms = countTerms(expression);
             if (numTerms <= myState.m_limit) {
                 return;
             }
@@ -95,26 +95,26 @@ private int countTerms(JSExpression expression) {
                 return 1;
             }
             if (expression instanceof JSBinaryExpression) {
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final JSExpression lhs = binaryExpression.getLOperand();
-                final JSExpression rhs = binaryExpression.getROperand();
+                JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+                JSExpression lhs = binaryExpression.getLOperand();
+                JSExpression rhs = binaryExpression.getROperand();
                 return countTerms(lhs) + countTerms(rhs);
             }
             else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final JSExpression operand = prefixExpression.getExpression();
+                JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+                JSExpression operand = prefixExpression.getExpression();
                 return countTerms(operand);
             }
             else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
+                JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+                JSExpression contents = parenthesizedExpression.getInnerExpression();
                 return countTerms(contents);
             }
             return 1;
         }
 
         private boolean isParentBoolean(JSExpression expression) {
-            final PsiElement parent = expression.getParent();
+            PsiElement parent = expression.getParent();
             if (!(parent instanceof JSExpression)) {
                 return false;
             }
@@ -123,19 +123,19 @@ private boolean isParentBoolean(JSExpression expression) {
 
         private boolean isBoolean(JSExpression expression) {
             if (expression instanceof JSBinaryExpression) {
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
-                final IElementType sign = binaryExpression.getOperationSign();
+                JSBinaryExpression binaryExpression = (JSBinaryExpression) expression;
+                IElementType sign = binaryExpression.getOperationSign();
                 return JSTokenTypes.ANDAND.equals(sign) ||
                     JSTokenTypes.OROR.equals(sign);
             }
             else if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
-                final IElementType sign = prefixExpression.getOperationSign();
+                JSPrefixExpression prefixExpression = (JSPrefixExpression) expression;
+                IElementType sign = prefixExpression.getOperationSign();
                 return JSTokenTypes.EXCL.equals(sign);
             }
             else if (expression instanceof JSParenthesizedExpression) {
-                final JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
+                JSParenthesizedExpression parenthesizedExpression = (JSParenthesizedExpression) expression;
+                JSExpression contents = parenthesizedExpression.getInnerExpression();
                 return isBoolean(contents);
             }
             return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
index a7395eb1..f5257fea 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
@@ -51,10 +51,10 @@ public String buildErrorString(Object state, Object... args) {
     }
 
     private String calculateReplacementExpression(JSExpression expression) {
-        final JSBinaryExpression exp = (JSBinaryExpression) expression;
-        final IElementType sign = exp.getOperationSign();
-        final JSExpression lhs = exp.getLOperand();
-        final JSExpression rhs = exp.getROperand();
+        JSBinaryExpression exp = (JSBinaryExpression) expression;
+        IElementType sign = exp.getOperationSign();
+        JSExpression lhs = exp.getLOperand();
+        JSExpression rhs = exp.getROperand();
         assert rhs != null;
         if (JSTokenTypes.PLUS.equals(sign)) {
             if (isZero(lhs)) {
@@ -98,8 +98,8 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSExpression expression = (JSExpression) descriptor.getPsiElement();
-            final String newExpression = calculateReplacementExpression(expression);
+            JSExpression expression = (JSExpression) descriptor.getPsiElement();
+            String newExpression = calculateReplacementExpression(expression);
             replaceExpression(expression, newExpression);
         }
     }
@@ -120,18 +120,18 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             if (!(expression.getROperand() != null)) {
                 return;
             }
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (!arithmeticTokens.contains(sign)) {
                 return;
             }
-            final JSExpression rhs = expression.getROperand();
-            final JSExpression lhs = expression.getLOperand();
+            JSExpression rhs = expression.getROperand();
+            JSExpression lhs = expression.getLOperand();
 
             if (rhs == null) {
                 return;
             }
 
-            final boolean isPointless;
+            boolean isPointless;
             if (sign.equals(JSTokenTypes.PLUS)) {
                 isPointless = additionExpressionIsPointless(lhs, rhs);
             } else if (sign.equals(JSTokenTypes.MINUS)) {
@@ -171,7 +171,7 @@ private boolean divideExpressionIsPointless(JSExpression rhs) {
      * @noinspection FloatingPointEquality
      */
     private static boolean isZero(JSExpression expression) {
-        @NonNls final String text = expression.getText();
+        @NonNls String text = expression.getText();
         return text.equals("0")||
                 text.equals("0x0")||
                 text.equals("0X0")||
@@ -182,7 +182,7 @@ private static boolean isZero(JSExpression expression) {
 
     private static boolean isString(JSExpression expression) {
         if (expression instanceof JSLiteralExpression) {
-            final String s = expression.getText();
+            String s = expression.getText();
             return s.startsWith("'") || s.startsWith("\"");
         }
         return false;
@@ -192,7 +192,7 @@ private static boolean isString(JSExpression expression) {
      * @noinspection FloatingPointEquality
      */
     private static boolean isOne(JSExpression expression) {
-        @NonNls final String text = expression.getText();
+        @NonNls String text = expression.getText();
         return text.equals("1") ||
                 text.equals("0x1") ||
                 text.equals("0X1") ||
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
index 316d0dcb..d98c595f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
@@ -63,15 +63,15 @@ public String buildErrorString(Object state, Object... args) {
 
     @Nullable
     private String calculateSimplifiedBinaryExpression(JSBinaryExpression expression) {
-        final IElementType sign = expression.getOperationSign();
-        final JSExpression lhs = expression.getLOperand();
+        IElementType sign = expression.getOperationSign();
+        JSExpression lhs = expression.getLOperand();
 
-        final JSExpression rhs = expression.getROperand();
+        JSExpression rhs = expression.getROperand();
         if (rhs == null) {
             return null;
         }
-        final String rhsText = rhs.getText();
-        final String lhsText = lhs.getText();
+        String rhsText = rhs.getText();
+        String lhsText = lhs.getText();
         if (JSTokenTypes.ANDAND.equals(sign) || JSTokenTypes.AND.equals(sign)) {
             return isTrue(lhs) ? rhsText : lhsText;
         } else if (JSTokenTypes.OROR.equals(sign) || JSTokenTypes.OR.equals(sign)) {
@@ -106,11 +106,11 @@ private String calculateSimplifiedBinaryExpression(JSBinaryExpression expression
 
     private static String createStringForNegatedExpression(JSExpression exp) {
         if (ComparisonUtils.isComparison(exp)) {
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression) exp;
-            final IElementType sign = binaryExpression.getOperationSign();
-            final String negatedComparison = ComparisonUtils.getNegatedComparison(sign);
-            final JSExpression lhs = binaryExpression.getLOperand();
-            final JSExpression rhs = binaryExpression.getROperand();
+            JSBinaryExpression binaryExpression = (JSBinaryExpression) exp;
+            IElementType sign = binaryExpression.getOperationSign();
+            String negatedComparison = ComparisonUtils.getNegatedComparison(sign);
+            JSExpression lhs = binaryExpression.getLOperand();
+            JSExpression rhs = binaryExpression.getROperand();
             assert rhs != null;
             return lhs.getText() + negatedComparison + rhs.getText();
         } else {
@@ -122,7 +122,7 @@ private static String createStringForNegatedExpression(JSExpression exp) {
 
     @NonNls
     private static String calculateSimplifiedPrefixExpression(JSPrefixExpression expression) {
-        final JSExpression operand = expression.getExpression();
+        JSExpression operand = expression.getExpression();
         return isTrue(operand) ? "false" : "true";
     }
 
@@ -140,13 +140,13 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement element = descriptor.getPsiElement();
+            PsiElement element = descriptor.getPsiElement();
             if (element instanceof JSBinaryExpression expression) {
-                final String replacementString = calculateSimplifiedBinaryExpression(expression);
+                String replacementString = calculateSimplifiedBinaryExpression(expression);
                 replaceExpression(expression, replacementString);
             } else {
-                final JSPrefixExpression expression = (JSPrefixExpression) element;
-                final String replacementString = calculateSimplifiedPrefixExpression(expression);
+                JSPrefixExpression expression = (JSPrefixExpression) element;
+                String replacementString = calculateSimplifiedPrefixExpression(expression);
                 replaceExpression(expression, replacementString);
             }
         }
@@ -173,13 +173,13 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             if (!(expression.getROperand() != null)) {
                 return;
             }
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (!booleanTokens.contains(sign)) {
                 return;
             }
-            final JSExpression rhs = expression.getROperand();
-            final JSExpression lhs = expression.getLOperand();
-            final boolean isPointless;
+            JSExpression rhs = expression.getROperand();
+            JSExpression lhs = expression.getLOperand();
+            boolean isPointless;
             if (JSTokenTypes.EQEQ.equals(sign) /*||
                     JSTokenTypes.EQEQEQ.equals(sign) ||
                     JSTokenTypes.NE.equals(sign) ||
@@ -205,11 +205,11 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
         @Override
         public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (sign == null) {
                 return;
             }
-            final JSExpression operand = expression.getExpression();
+            JSExpression operand = expression.getExpression();
             if (JSTokenTypes.EXCL.equals(sign) &&
                     notExpressionIsPointless(operand)) {
                 registerError(expression);
@@ -241,7 +241,7 @@ private static boolean isTrue(JSExpression expression) {
         if (expression == null || !(expression instanceof JSLiteralExpression)) {
             return false;
         }
-        @NonNls final String text = expression.getText();
+        @NonNls String text = expression.getText();
         return "true".equals(text);
     }
 
@@ -249,7 +249,7 @@ private static boolean isFalse(JSExpression expression) {
         if (expression == null || !(expression instanceof JSLiteralExpression)) {
             return false;
         }
-        @NonNls final String text = expression.getText();
+        @NonNls String text = expression.getText();
         return "false".equals(text);
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
index 1a8517af..388647ed 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
@@ -43,12 +43,12 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
-            final PsiElement firstChild = expression.getFirstChild();
+            PsiElement firstChild = expression.getFirstChild();
             if(firstChild == null)
             {
                 return;
             }
-            @NonNls final String text = firstChild.getText();
+            @NonNls String text = firstChild.getText();
             if (!"void".equals(text)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
index f6509334..9a305356 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
@@ -53,11 +53,11 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSConditionalExpression expression = (JSConditionalExpression) descriptor.getPsiElement();
+            JSConditionalExpression expression = (JSConditionalExpression) descriptor.getPsiElement();
 
-            final JSExpression thenExpression = expression.getThen();
+            JSExpression thenExpression = expression.getThen();
             assert thenExpression != null;
-            final String bodyText = thenExpression.getText();
+            String bodyText = thenExpression.getText();
             replaceExpression(expression, bodyText);
         }
     }
@@ -71,8 +71,8 @@ private static class ConditionalExpressionWithIdenticalBranchesVisitor extends B
         @Override
         public void visitJSConditionalExpression(JSConditionalExpression expression) {
             super.visitJSConditionalExpression(expression);
-            final JSExpression thenExpression = expression.getThen();
-            final JSExpression elseExpression = expression.getElse();
+            JSExpression thenExpression = expression.getThen();
+            JSExpression elseExpression = expression.getElse();
             if (EquivalenceChecker.expressionsAreEquivalent(thenExpression, elseExpression)) {
                 registerError(expression);
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
index 3cd1cc9b..2f19b654 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
@@ -49,9 +49,9 @@ public String buildErrorString(Object state, Object... args) {
     }
 
     static String calculateReplacementExpression(JSConditionalExpression exp) {
-        final JSExpression thenExpression = exp.getThen();
-        final JSExpression elseExpression = exp.getElse();
-        final JSExpression condition = exp.getCondition();
+        JSExpression thenExpression = exp.getThen();
+        JSExpression elseExpression = exp.getElse();
+        JSExpression condition = exp.getCondition();
         assert thenExpression != null;
         assert elseExpression != null;
         if (BoolUtils.isTrue(condition)) {
@@ -75,8 +75,8 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSConditionalExpression expression = (JSConditionalExpression) descriptor.getPsiElement();
-            final String newExpression = calculateReplacementExpression(expression);
+            JSConditionalExpression expression = (JSConditionalExpression) descriptor.getPsiElement();
+            String newExpression = calculateReplacementExpression(expression);
             replaceExpression(expression, newExpression);
         }
     }
@@ -85,12 +85,12 @@ private static class ConstantConditionalExpressionVisitor extends BaseInspection
         @Override
         public void visitJSConditionalExpression(JSConditionalExpression expression) {
             super.visitJSConditionalExpression(expression);
-            final JSExpression condition = expression.getCondition();
-            final JSExpression thenExpression = expression.getThen();
+            JSExpression condition = expression.getCondition();
+            JSExpression thenExpression = expression.getThen();
             if (thenExpression == null) {
                 return;
             }
-            final JSExpression elseExpression = expression.getElse();
+            JSExpression elseExpression = expression.getElse();
             if (elseExpression == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
index f95a54a9..c938877a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
@@ -58,12 +58,12 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement ifKeyword = descriptor.getPsiElement();
-            final JSIfStatement statement = (JSIfStatement) ifKeyword.getParent();
+            PsiElement ifKeyword = descriptor.getPsiElement();
+            JSIfStatement statement = (JSIfStatement) ifKeyword.getParent();
             assert statement != null;
-            final JSStatement thenBranch = statement.getThen();
-            final JSStatement elseBranch = statement.getElse();
-            final JSExpression condition = statement.getCondition();
+            JSStatement thenBranch = statement.getThen();
+            JSStatement elseBranch = statement.getElse();
+            JSExpression condition = statement.getCondition();
             if (BoolUtils.isFalse(condition)) {
                 if (elseBranch != null) {
                     replaceStatementWithUnwrapping(elseBranch, statement);
@@ -76,7 +76,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
         }
 
         private static void replaceStatementWithUnwrapping(JSStatement branch, JSIfStatement statement) throws IncorrectOperationException {
-            final String elseText = branch.getText();
+            String elseText = branch.getText();
             replaceStatement(statement, elseText);
         }
     }
@@ -85,11 +85,11 @@ private static class ConstantIfStatementVisitor extends BaseInspectionVisitor {
         @Override
         public void visitJSIfStatement(JSIfStatement statement) {
             super.visitJSIfStatement(statement);
-            final JSExpression condition = statement.getCondition();
+            JSExpression condition = statement.getCondition();
             if (condition == null) {
                 return;
             }
-            final JSStatement thenBranch = statement.getThen();
+            JSStatement thenBranch = statement.getThen();
             if (thenBranch == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index 1c875630..39e7a9c3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -41,12 +41,12 @@ private static class DefaultNotLastCaseInSwitchVisitor extends BaseInspectionVis
         @Override
         public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
-            final JSCaseClause[] caseClauses = statement.getCaseClauses();
+            JSCaseClause[] caseClauses = statement.getCaseClauses();
             if (caseClauses == null) {
                 return;
             }
             for (int i = 0; i < caseClauses.length - 1; i++) {
-                final JSCaseClause caseClause = caseClauses[i];
+                JSCaseClause caseClause = caseClauses[i];
                 if (caseClause.isDefault()) {
                     registerError(caseClause.getFirstChild());
                 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
index 1fd1f21f..5a8a88b4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
@@ -47,34 +47,34 @@ private static class DuplicateConditionVisitor extends BaseInspectionVisitor {
         @Override
         public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
-            final PsiElement parent = statement.getParent();
+            PsiElement parent = statement.getParent();
             if (parent instanceof JSIfStatement) {
-                final JSIfStatement parentStatement = (JSIfStatement) parent;
-                final JSStatement elseBranch = parentStatement.getElse();
+                JSIfStatement parentStatement = (JSIfStatement) parent;
+                JSStatement elseBranch = parentStatement.getElse();
                 if (statement.equals(elseBranch)) {
                     return;
                 }
             }
-            final Set<JSExpression> conditions = new HashSet<JSExpression>();
+            Set<JSExpression> conditions = new HashSet<JSExpression>();
             collectConditionsForIfStatement(statement, conditions);
-            final int numConditions = conditions.size();
+            int numConditions = conditions.size();
             if (numConditions < 2) {
                 return;
             }
-            final JSExpression[] conditionArray = conditions.toArray(new JSExpression[numConditions]);
-            final boolean[] matched = new boolean[conditionArray.length];
+            JSExpression[] conditionArray = conditions.toArray(new JSExpression[numConditions]);
+            boolean[] matched = new boolean[conditionArray.length];
             Arrays.fill(matched, false);
             for (int i = 0; i < conditionArray.length; i++) {
                 if (matched[i]) {
                     continue;
                 }
-                final JSExpression condition = conditionArray[i];
+                JSExpression condition = conditionArray[i];
                 for (int j = i + 1; j < conditionArray.length; j++) {
                     if (matched[j]) {
                         continue;
                     }
-                    final JSExpression testCondition = conditionArray[j];
-                    final boolean areEquivalent =
+                    JSExpression testCondition = conditionArray[j];
+                    boolean areEquivalent =
                             EquivalenceChecker.expressionsAreEquivalent(condition,
                                     testCondition);
                     if (areEquivalent) {
@@ -90,9 +90,9 @@ public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
         }
 
         private void collectConditionsForIfStatement(JSIfStatement statement, Set<JSExpression> conditions) {
-            final JSExpression condition = statement.getCondition();
+            JSExpression condition = statement.getCondition();
             collectConditionsForExpression(condition, conditions);
-            final JSStatement branch = statement.getElse();
+            JSStatement branch = statement.getElse();
             if (branch instanceof JSIfStatement) {
                 collectConditionsForIfStatement((JSIfStatement) branch, conditions);
             }
@@ -103,16 +103,16 @@ private void collectConditionsForExpression(JSExpression condition, Set<JSExpres
                 return;
             }
             if (condition instanceof JSParenthesizedExpression parenthesizedExpression) {
-                final JSExpression contents = parenthesizedExpression.getInnerExpression();
+                JSExpression contents = parenthesizedExpression.getInnerExpression();
                 collectConditionsForExpression(contents, conditions);
                 return;
             }
             if (condition instanceof JSBinaryExpression binaryExpression) {
-                final IElementType sign = binaryExpression.getOperationSign();
+                IElementType sign = binaryExpression.getOperationSign();
                 if (JSTokenTypes.OROR.equals(sign)) {
-                    final JSExpression lhs = binaryExpression.getLOperand();
+                    JSExpression lhs = binaryExpression.getLOperand();
                     collectConditionsForExpression(lhs, conditions);
-                    final JSExpression rhs = binaryExpression.getROperand();
+                    JSExpression rhs = binaryExpression.getROperand();
                     collectConditionsForExpression(rhs, conditions);
                     return;
                 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
index 42092197..7c643d61 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
@@ -44,14 +44,14 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSSwitchStatement(JSSwitchStatement jsSwitchStatement) {
-            final JSCaseClause[] caseClauses = jsSwitchStatement.getCaseClauses();
+            JSCaseClause[] caseClauses = jsSwitchStatement.getCaseClauses();
             for (int i = 0; i < caseClauses.length-1; i++) {
-                final JSCaseClause clause = caseClauses[i];
-                final JSStatement[] statements = clause.getStatements();
+                JSCaseClause clause = caseClauses[i];
+                JSStatement[] statements = clause.getStatements();
                 if (statements != null && statements.length != 0) {
-                    final JSStatement lastStatementOfClause = statements[statements.length - 1];
+                    JSStatement lastStatementOfClause = statements[statements.length - 1];
                     if (ControlFlowUtils.statementMayCompleteNormally(lastStatementOfClause)) {
-                        final PsiElement caseIdentifier = caseClauses[i+1].getFirstChild();
+                        PsiElement caseIdentifier = caseClauses[i+1].getFirstChild();
                         registerError(caseIdentifier);
                     }
                 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
index 5a8c64ee..c73ee53e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
@@ -69,13 +69,13 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement forKeywordElement = descriptor.getPsiElement();
-            final JSForStatement forStatement = (JSForStatement) forKeywordElement.getParent();
+            PsiElement forKeywordElement = descriptor.getPsiElement();
+            JSForStatement forStatement = (JSForStatement) forKeywordElement.getParent();
             assert forStatement != null;
-            final JSExpression condition = forStatement.getCondition();
-            final JSStatement body = forStatement.getBody();
-            final String bodyText = body == null ? "" : body.getText();
-            @NonNls final String whileStatement;
+            JSExpression condition = forStatement.getCondition();
+            JSStatement body = forStatement.getBody();
+            String bodyText = body == null ? "" : body.getText();
+            @NonNls String whileStatement;
             if (condition == null) {
                 whileStatement = "while(true)" + bodyText;
             }
@@ -95,24 +95,24 @@ private class ForLoopReplaceableByWhileVisitor extends BaseInspectionVisitor<For
         @Override
         public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
-            final JSVarStatement varStatement = statement.getVarDeclaration();
+            JSVarStatement varStatement = statement.getVarDeclaration();
             if (varStatement != null) {
                 return;
             }
-            final JSExpression initialization = statement.getInitialization();
+            JSExpression initialization = statement.getInitialization();
             if (initialization != null) {
                 return;
             }
-            final JSExpression update = statement.getUpdate();
+            JSExpression update = statement.getUpdate();
             if (update != null) {
                 return;
             }
             if (myState.m_ignoreLoopsWithoutConditions) {
-                final JSExpression condition = statement.getCondition();
+                JSExpression condition = statement.getCondition();
                 if (condition == null) {
                     return;
                 }
-                final String conditionText = condition.getText();
+                String conditionText = condition.getText();
                 if ("true".equals(conditionText)) {
                     return;
                 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
index 54a1051d..57b6b4b0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
@@ -28,8 +28,8 @@ public LocalizeValue getGroupDisplayName() {
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        final boolean condition = (Boolean) args[0];
-        final boolean update = (Boolean) args[1];
+        boolean condition = (Boolean) args[0];
+        boolean update = (Boolean) args[1];
         if (condition && update) {
             return InspectionJSLocalize.forLoopNotUseLoopVariableProblemDescriptorBothConditionAndUpdate().get();
         }
@@ -64,15 +64,15 @@ public void visitJSForStatement(@Nonnull JSForStatement statement) {
         }
 
         private static boolean conditionUsesInitializer(JSForStatement statement) {
-            final JSExpression condition = statement.getCondition();
+            JSExpression condition = statement.getCondition();
             if (condition == null) {
                 return true;
             }
-            final JSVarStatement initialization = statement.getVarDeclaration();
+            JSVarStatement initialization = statement.getVarDeclaration();
             if (initialization == null) {
                 return true;
             }
-            final JSVariable[] variables = initialization.getVariables();
+            JSVariable[] variables = initialization.getVariables();
             if(variables.length !=1)
             {
                 return false;
@@ -81,15 +81,15 @@ private static boolean conditionUsesInitializer(JSForStatement statement) {
         }
 
         private static boolean updateUsesInitializer(JSForStatement statement) {
-            final JSExpression update = statement.getUpdate();
+            JSExpression update = statement.getUpdate();
             if (update == null) {
                 return true;
             }
-            final JSVarStatement initialization = statement.getVarDeclaration();
+            JSVarStatement initialization = statement.getVarDeclaration();
             if (initialization == null) {
                 return true;
             }
-            final JSVariable[] variables = initialization.getVariables();
+            JSVariable[] variables = initialization.getVariables();
             if (variables.length != 1) {
                 return false;
             }
@@ -97,7 +97,7 @@ private static boolean updateUsesInitializer(JSForStatement statement) {
         }
 
         private static boolean expressionUsesVariable(JSExpression expression, JSVariable localVar) {
-            final UseVisitor useVisitor = new UseVisitor(localVar);
+            UseVisitor useVisitor = new UseVisitor(localVar);
             expression.accept(useVisitor);
             return useVisitor.isUsed();
         }
@@ -124,7 +124,7 @@ private UseVisitor(JSVariable var) {
                 return;
             }
             super.visitJSReferenceExpression(ref);
-            final PsiElement resolvedElement = ref.resolve();
+            PsiElement resolvedElement = ref.resolve();
             if (variable.equals(resolvedElement)) {
                 used = true;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
index 48b9c965..f57efea6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
@@ -53,11 +53,11 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement identifier = descriptor.getPsiElement();
-            final JSIfStatement statement = (JSIfStatement) identifier.getParent();
+            PsiElement identifier = descriptor.getPsiElement();
+            JSIfStatement statement = (JSIfStatement) identifier.getParent();
             assert statement != null;
-            final JSStatement thenBranch = statement.getThen();
-            final String bodyText = thenBranch.getText();
+            JSStatement thenBranch = statement.getThen();
+            String bodyText = thenBranch.getText();
             replaceStatement(statement, bodyText);
         }
     }
@@ -71,8 +71,8 @@ private static class IfStatementWithIdenticalBranchesVisitor extends BaseInspect
 
         @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
-            final JSStatement thenBranch = statement.getThen();
-            final JSStatement elseBranch = statement.getElse();
+            JSStatement thenBranch = statement.getThen();
+            JSStatement elseBranch = statement.getElse();
             if(thenBranch == null || elseBranch == null)
             {
                 return ;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
index 789f8778..4cac958f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
@@ -36,13 +36,13 @@ public InspectionToolState<?> createStateProvider() {
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
-        final JSIfStatement statement = (JSIfStatement) args[0];
-        final int branches = calculateNumBranches(statement);
+        JSIfStatement statement = (JSIfStatement) args[0];
+        int branches = calculateNumBranches(statement);
         return InspectionJSLocalize.ifStatementWithTooManyBranchesErrorString(branches).get();
     }
 
     private static int calculateNumBranches(JSIfStatement statement) {
-        final JSStatement branch = statement.getElse();
+        JSStatement branch = statement.getElse();
         if (branch == null) {
             return 1;
         }
@@ -61,15 +61,15 @@ private class Visitor extends BaseInspectionVisitor<IfStatementWithTooManyBranch
         @Override
         public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
-            final PsiElement parent = statement.getParent();
+            PsiElement parent = statement.getParent();
             if (parent instanceof JSIfStatement) {
-                final JSIfStatement parentStatement = (JSIfStatement) parent;
-                final JSStatement elseBranch = parentStatement.getElse();
+                JSIfStatement parentStatement = (JSIfStatement) parent;
+                JSStatement elseBranch = parentStatement.getElse();
                 if (statement.equals(elseBranch)) {
                     return;
                 }
             }
-            final int branches = calculateNumBranches(statement);
+            int branches = calculateNumBranches(statement);
             if (branches <= myState.m_limit) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
index 59a91756..90c4c50b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
@@ -42,7 +42,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSLabeledStatement(@Nonnull JSLabeledStatement statement) {
             super.visitJSLabeledStatement(statement);
-            @NonNls final String label = statement.getLabel();
+            @NonNls String label = statement.getLabel();
             if ("javascript".equals(label)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
index 66c5d5d5..a39b9cdd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
@@ -45,7 +45,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -61,7 +61,7 @@ public void visitJSForStatement(@Nonnull JSForStatement statement) {
         @Override
         public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
             super.visitJSForInStatement(statement);
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -77,7 +77,7 @@ public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
         @Override
         public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null
                 || ControlFlowUtils.statementMayCompleteNormally(body)
                 || ControlFlowUtils.statementIsContinueTarget(statement)) {
@@ -88,7 +88,7 @@ public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
 
         @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null
                 || ControlFlowUtils.statementMayCompleteNormally(body)
                 || ControlFlowUtils.statementIsContinueTarget(statement)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
index 29b286d3..c574d692 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
@@ -42,7 +42,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSSwitchStatement(JSSwitchStatement jsSwitchStatement) {
             super.visitJSSwitchStatement(jsSwitchStatement);
-            final JSSwitchStatement containingSwitchStatement =
+            JSSwitchStatement containingSwitchStatement =
                 PsiTreeUtil.getParentOfType(jsSwitchStatement, JSSwitchStatement.class, true);
             if (containingSwitchStatement == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
index f61f33a1..80e74256 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
@@ -49,7 +49,7 @@ public void visitJSSwitchStatement(JSSwitchStatement jsSwitchStatement) {
         }
 
         private static boolean hasDefaultBranch(JSSwitchStatement jsSwitchStatement) {
-            final JSCaseClause[] caseClauses = jsSwitchStatement.getCaseClauses();
+            JSCaseClause[] caseClauses = jsSwitchStatement.getCaseClauses();
             for (JSCaseClause clause : caseClauses) {
                 if (clause.isDefault()) {
                     return true;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
index 4224cdca..ce960c91 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
@@ -183,11 +183,11 @@ public void visitJSReturnStatement(
             @Nonnull JSReturnStatement statement
         ) {
             super.visitJSReturnStatement(statement);
-            final JSExpression returnValue = statement.getExpression();
+            JSExpression returnValue = statement.getExpression();
             if (!(returnValue instanceof JSCallExpression)) {
                 return;
             }
-            final JSFunction containingMethod =
+            JSFunction containingMethod =
                 PsiTreeUtil.getParentOfType(
                     statement,
                     JSFunction.class
@@ -195,19 +195,19 @@ public void visitJSReturnStatement(
             if (containingMethod == null) {
                 return;
             }
-            final JSCallExpression returnCall =
+            JSCallExpression returnCall =
                 (JSCallExpression) returnValue;
-            final JSExpression methodExpression = returnCall.getMethodExpression();
+            JSExpression methodExpression = returnCall.getMethodExpression();
             if (!(methodExpression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression reference = (JSReferenceExpression) methodExpression;
+            JSReferenceExpression reference = (JSReferenceExpression) methodExpression;
 
-            final PsiElement referent = reference.resolve();
+            PsiElement referent = reference.resolve();
             if (!(referent instanceof JSFunction)) {
                 return;
             }
-            final JSFunction method = (JSFunction) referent;
+            JSFunction method = (JSFunction) referent;
 
             if (!method.equals(containingMethod)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
index 4c87d710..83fc3d00 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
@@ -56,14 +56,14 @@ public BaseInspectionVisitor buildVisitor() {
     @RequiredReadAction
     @Override
     public String buildErrorString(Object state, Object... args) {
-        final JSConditionalExpression exp = (JSConditionalExpression) args[0];
+        JSConditionalExpression exp = (JSConditionalExpression) args[0];
         return InspectionJSLocalize.trivialConditionalErrorString(exp.getText(), calculateReplacementExpression(exp)).get();
     }
 
     private static String calculateReplacementExpression(JSConditionalExpression exp) {
-        final JSExpression thenExpression = exp.getThen();
-        final JSExpression elseExpression = exp.getElse();
-        final JSExpression condition = exp.getCondition();
+        JSExpression thenExpression = exp.getThen();
+        JSExpression elseExpression = exp.getElse();
+        JSExpression condition = exp.getCondition();
 
         if (isFalse(thenExpression) && isTrue(elseExpression)) {
             return BoolUtils.getNegatedExpressionText(condition);
@@ -86,8 +86,8 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSConditionalExpression expression = (JSConditionalExpression) descriptor.getPsiElement();
-            final String newExpression = calculateReplacementExpression(expression);
+            JSConditionalExpression expression = (JSConditionalExpression) descriptor.getPsiElement();
+            String newExpression = calculateReplacementExpression(expression);
             replaceExpression(expression, newExpression);
         }
     }
@@ -96,11 +96,11 @@ private static class UnnecessaryConditionalExpressionVisitor extends BaseInspect
         @Override
         public void visitJSConditionalExpression(JSConditionalExpression exp) {
             super.visitJSConditionalExpression(exp);
-            final JSExpression thenExpression = exp.getThen();
+            JSExpression thenExpression = exp.getThen();
             if (thenExpression == null) {
                 return;
             }
-            final JSExpression elseExpression = exp.getElse();
+            JSExpression elseExpression = exp.getElse();
             if (elseExpression == null) {
                 return;
             }
@@ -114,12 +114,12 @@ public void visitJSConditionalExpression(JSConditionalExpression exp) {
     }
 
     private static boolean isFalse(JSExpression expression) {
-        @NonNls final String text = expression.getText();
+        @NonNls String text = expression.getText();
         return "false".equals(text);
     }
 
     private static boolean isTrue(JSExpression expression) {
-        @NonNls final String text = expression.getText();
+        @NonNls String text = expression.getText();
         return "true".equals(text);
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
index 707af81a..a6749409 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
@@ -77,8 +77,8 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement ifKeywordElement = descriptor.getPsiElement();
-            final JSIfStatement statement = (JSIfStatement) ifKeywordElement.getParent();
+            PsiElement ifKeywordElement = descriptor.getPsiElement();
+            JSIfStatement statement = (JSIfStatement) ifKeywordElement.getParent();
             if (isSimplifiableAssignment(statement)) {
                 replaceSimplifiableAssignment(statement);
             }
@@ -106,98 +106,98 @@ else if (isSimplifiableImplicitAssignmentNegated(statement)) {
         }
 
         private void replaceSimplifiableImplicitReturn(JSIfStatement statement) throws IncorrectOperationException {
-            final JSExpression condition = statement.getCondition();
-            final String conditionText = condition.getText();
-            final PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(statement, new Class[]{PsiWhiteSpace.class});
-            @NonNls final String newStatement = "return " + conditionText + ';';
+            JSExpression condition = statement.getCondition();
+            String conditionText = condition.getText();
+            PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(statement, new Class[]{PsiWhiteSpace.class});
+            @NonNls String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
             assert nextStatement != null;
             deleteElement(nextStatement);
         }
 
         private void repaceSimplifiableReturn(JSIfStatement statement) throws IncorrectOperationException {
-            final JSExpression condition = statement.getCondition();
-            final String conditionText = condition.getText();
-            @NonNls final String newStatement = "return " + conditionText + ';';
+            JSExpression condition = statement.getCondition();
+            String conditionText = condition.getText();
+            @NonNls String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
         }
 
         private void replaceSimplifiableAssignment(JSIfStatement statement) throws IncorrectOperationException {
-            final JSExpression condition = statement.getCondition();
-            final String conditionText = condition.getText();
-            final JSStatement thenBranch = statement.getThen();
-            final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
-            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-            final IElementType operator = assignmentExpression.getOperationSign();
-            final String operatorText = getTextForOperator(operator);
-            final JSExpression lhs = assignmentExpression.getLOperand();
-            final String lhsText = lhs.getText();
+            JSExpression condition = statement.getCondition();
+            String conditionText = condition.getText();
+            JSStatement thenBranch = statement.getThen();
+            JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
+            JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+            IElementType operator = assignmentExpression.getOperationSign();
+            String operatorText = getTextForOperator(operator);
+            JSExpression lhs = assignmentExpression.getLOperand();
+            String lhsText = lhs.getText();
             replaceStatement(statement, lhsText + operatorText + conditionText + ';');
         }
 
         private void replaceSimplifiableImplicitAssignment(JSIfStatement statement) throws IncorrectOperationException {
-            final PsiElement prevStatement = PsiTreeUtil.skipSiblingsBackward(statement, new Class[]{PsiWhiteSpace.class});
+            PsiElement prevStatement = PsiTreeUtil.skipSiblingsBackward(statement, new Class[]{PsiWhiteSpace.class});
             if (prevStatement == null) {
                 return;
             }
-            final JSExpression condition = statement.getCondition();
-            final String conditionText = condition.getText();
-            final JSStatement thenBranch = statement.getThen();
-            final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
-            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-            final IElementType operator = assignmentExpression.getOperationSign();
-            final JSExpression lhs = assignmentExpression.getLOperand();
-            final String lhsText = lhs.getText();
+            JSExpression condition = statement.getCondition();
+            String conditionText = condition.getText();
+            JSStatement thenBranch = statement.getThen();
+            JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
+            JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+            IElementType operator = assignmentExpression.getOperationSign();
+            JSExpression lhs = assignmentExpression.getLOperand();
+            String lhsText = lhs.getText();
             replaceStatement(statement, lhsText + operator + conditionText + ';');
             deleteElement(prevStatement);
         }
 
         private void replaceSimplifiableImplicitAssignmentNegated(JSIfStatement statement) throws IncorrectOperationException {
-            final PsiElement prevStatement = PsiTreeUtil.skipSiblingsBackward(statement, new Class[]{PsiWhiteSpace.class});
-            final JSExpression condition = statement.getCondition();
-            final String conditionText = BoolUtils.getNegatedExpressionText(condition);
-            final JSStatement thenBranch = statement.getThen();
-            final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
-            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-            final IElementType operator = assignmentExpression.getOperationSign();
-            final String operatorText = getTextForOperator(operator);
-            final JSExpression lhs = assignmentExpression.getLOperand();
-            final String lhsText = lhs.getText();
+            PsiElement prevStatement = PsiTreeUtil.skipSiblingsBackward(statement, new Class[]{PsiWhiteSpace.class});
+            JSExpression condition = statement.getCondition();
+            String conditionText = BoolUtils.getNegatedExpressionText(condition);
+            JSStatement thenBranch = statement.getThen();
+            JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
+            JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+            IElementType operator = assignmentExpression.getOperationSign();
+            String operatorText = getTextForOperator(operator);
+            JSExpression lhs = assignmentExpression.getLOperand();
+            String lhsText = lhs.getText();
             replaceStatement(statement, lhsText + operatorText + conditionText + ';');
             assert prevStatement != null;
             deleteElement(prevStatement);
         }
 
         private void replaceSimplifiableImplicitReturnNegated(JSIfStatement statement) throws IncorrectOperationException {
-            final JSExpression condition = statement.getCondition();
+            JSExpression condition = statement.getCondition();
 
-            final String conditionText = BoolUtils.getNegatedExpressionText(condition);
-            final PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(statement, new Class[]{PsiWhiteSpace.class});
+            String conditionText = BoolUtils.getNegatedExpressionText(condition);
+            PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(statement, new Class[]{PsiWhiteSpace.class});
             if (nextStatement == null) {
                 return;
             }
-            @NonNls final String newStatement = "return " + conditionText + ';';
+            @NonNls String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
             deleteElement(nextStatement);
         }
 
         private void repaceSimplifiableReturnNegated(JSIfStatement statement) throws IncorrectOperationException {
-            final JSExpression condition = statement.getCondition();
-            final String conditionText = BoolUtils.getNegatedExpressionText(condition);
-            @NonNls final String newStatement = "return " + conditionText + ';';
+            JSExpression condition = statement.getCondition();
+            String conditionText = BoolUtils.getNegatedExpressionText(condition);
+            @NonNls String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
         }
 
         private void replaceSimplifiableAssignmentNegated(JSIfStatement statement) throws IncorrectOperationException {
-            final JSExpression condition = statement.getCondition();
-            final String conditionText = BoolUtils.getNegatedExpressionText(condition);
-            final JSStatement thenBranch = statement.getThen();
-            final JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
-            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
-            final IElementType operator = assignmentExpression.getOperationSign();
-            final String operatorText = getTextForOperator(operator);
-            final JSExpression lhs = assignmentExpression.getLOperand();
-            final String lhsText = lhs.getText();
+            JSExpression condition = statement.getCondition();
+            String conditionText = BoolUtils.getNegatedExpressionText(condition);
+            JSStatement thenBranch = statement.getThen();
+            JSExpressionStatement assignmentStatement = (JSExpressionStatement) ConditionalUtils.stripBraces(thenBranch);
+            JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) assignmentStatement.getExpression();
+            IElementType operator = assignmentExpression.getOperationSign();
+            String operatorText = getTextForOperator(operator);
+            JSExpression lhs = assignmentExpression.getLOperand();
+            String lhsText = lhs.getText();
             replaceStatement(statement, lhsText + operatorText + conditionText + ';');
         }
 
@@ -207,7 +207,7 @@ private static class TrivialIfVisitor extends BaseInspectionVisitor {
         @Override
         public void visitJSIfStatement(@Nonnull JSIfStatement ifStatement) {
             super.visitJSIfStatement(ifStatement);
-            final JSExpression condition = ifStatement.getCondition();
+            JSExpression condition = ifStatement.getCondition();
             if (condition == null) {
                 return;
             }
@@ -256,12 +256,12 @@ public static boolean isSimplifiableImplicitReturn(JSIfStatement ifStatement) {
         }
         JSStatement thenBranch = ifStatement.getThen();
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
-        final PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(ifStatement, new Class[]{PsiWhiteSpace.class});
+        PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(ifStatement, new Class[]{PsiWhiteSpace.class});
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
 
-        final JSStatement elseBranch = (JSStatement) nextStatement;
+        JSStatement elseBranch = (JSStatement) nextStatement;
         return ConditionalUtils.isReturn(thenBranch, "true") && ConditionalUtils.isReturn(elseBranch, "false");
     }
 
@@ -272,11 +272,11 @@ public static boolean isSimplifiableImplicitReturnNegated(JSIfStatement ifStatem
         JSStatement thenBranch = ifStatement.getThen();
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
 
-        final PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(ifStatement, new Class[]{PsiWhiteSpace.class});
+        PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(ifStatement, new Class[]{PsiWhiteSpace.class});
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
-        final JSStatement elseBranch = (JSStatement) nextStatement;
+        JSStatement elseBranch = (JSStatement) nextStatement;
         return ConditionalUtils.isReturn(thenBranch, "false") && ConditionalUtils.isReturn(elseBranch, "true");
     }
 
@@ -302,15 +302,15 @@ public static boolean isSimplifiableAssignment(JSIfStatement ifStatement) {
         JSStatement elseBranch = ifStatement.getElse();
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
         if (ConditionalUtils.isAssignment(thenBranch, "true") && ConditionalUtils.isAssignment(elseBranch, "false")) {
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-            final IElementType thenSign = thenExpression.getOperationSign();
-            final IElementType elseSign = elseExpression.getOperationSign();
+            JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+            JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+            IElementType thenSign = thenExpression.getOperationSign();
+            IElementType elseSign = elseExpression.getOperationSign();
             if (!thenSign.equals(elseSign)) {
                 return false;
             }
-            final JSExpression thenLhs = thenExpression.getLOperand();
-            final JSExpression elseLhs = elseExpression.getLOperand();
+            JSExpression thenLhs = thenExpression.getLOperand();
+            JSExpression elseLhs = elseExpression.getLOperand();
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         }
         else {
@@ -324,15 +324,15 @@ public static boolean isSimplifiableAssignmentNegated(JSIfStatement ifStatement)
         JSStatement elseBranch = ifStatement.getElse();
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
         if (ConditionalUtils.isAssignment(thenBranch, "false") && ConditionalUtils.isAssignment(elseBranch, "true")) {
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-            final IElementType thenSign = thenExpression.getOperationSign();
-            final IElementType elseSign = elseExpression.getOperationSign();
+            JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+            JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+            IElementType thenSign = thenExpression.getOperationSign();
+            IElementType elseSign = elseExpression.getOperationSign();
             if (!thenSign.equals(elseSign)) {
                 return false;
             }
-            final JSExpression thenLhs = thenExpression.getLOperand();
-            final JSExpression elseLhs = elseExpression.getLOperand();
+            JSExpression thenLhs = thenExpression.getLOperand();
+            JSExpression elseLhs = elseExpression.getLOperand();
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         }
         else {
@@ -346,7 +346,7 @@ public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement
         }
         JSStatement thenBranch = ifStatement.getThen();
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
-        final PsiElement nextStatement = PsiTreeUtil.skipSiblingsBackward(ifStatement, new Class[]{PsiWhiteSpace.class});
+        PsiElement nextStatement = PsiTreeUtil.skipSiblingsBackward(ifStatement, new Class[]{PsiWhiteSpace.class});
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
@@ -354,15 +354,15 @@ public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement
 
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
         if (ConditionalUtils.isAssignment(thenBranch, "true") && ConditionalUtils.isAssignment(elseBranch, "false")) {
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-            final IElementType thenSign = thenExpression.getOperationSign();
-            final IElementType elseSign = elseExpression.getOperationSign();
+            JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+            JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+            IElementType thenSign = thenExpression.getOperationSign();
+            IElementType elseSign = elseExpression.getOperationSign();
             if (!thenSign.equals(elseSign)) {
                 return false;
             }
-            final JSExpression thenLhs = thenExpression.getLOperand();
-            final JSExpression elseLhs = elseExpression.getLOperand();
+            JSExpression thenLhs = thenExpression.getLOperand();
+            JSExpression elseLhs = elseExpression.getLOperand();
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         }
         else {
@@ -376,7 +376,7 @@ public static boolean isSimplifiableImplicitAssignmentNegated(JSIfStatement ifSt
         }
         JSStatement thenBranch = ifStatement.getThen();
         thenBranch = ConditionalUtils.stripBraces(thenBranch);
-        final PsiElement nextStatement = PsiTreeUtil.skipSiblingsBackward(ifStatement, new Class[]{PsiWhiteSpace.class});
+        PsiElement nextStatement = PsiTreeUtil.skipSiblingsBackward(ifStatement, new Class[]{PsiWhiteSpace.class});
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
@@ -384,15 +384,15 @@ public static boolean isSimplifiableImplicitAssignmentNegated(JSIfStatement ifSt
 
         elseBranch = ConditionalUtils.stripBraces(elseBranch);
         if (ConditionalUtils.isAssignment(thenBranch, "false") && ConditionalUtils.isAssignment(elseBranch, "true")) {
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
-            final IElementType thenSign = thenExpression.getOperationSign();
-            final IElementType elseSign = elseExpression.getOperationSign();
+            JSAssignmentExpression thenExpression = (JSAssignmentExpression) ((JSExpressionStatement) thenBranch).getExpression();
+            JSAssignmentExpression elseExpression = (JSAssignmentExpression) ((JSExpressionStatement) elseBranch).getExpression();
+            IElementType thenSign = thenExpression.getOperationSign();
+            IElementType elseSign = elseExpression.getOperationSign();
             if (!thenSign.equals(elseSign)) {
                 return false;
             }
-            final JSExpression thenLhs = thenExpression.getLOperand();
-            final JSExpression elseLhs = elseExpression.getLOperand();
+            JSExpression thenLhs = thenExpression.getLOperand();
+            JSExpression elseLhs = elseExpression.getLOperand();
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         }
         else {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
index fc2b589e..56d2f3e1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
@@ -57,8 +57,8 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement continueKeywordElement = descriptor.getPsiElement();
-            final PsiElement continueStatement = continueKeywordElement.getParent();
+            PsiElement continueKeywordElement = descriptor.getPsiElement();
+            PsiElement continueStatement = continueKeywordElement.getParent();
             assert continueStatement != null;
             deleteElement(continueStatement);
         }
@@ -78,7 +78,7 @@ public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             if (!(continuedStatement instanceof JSLoopStatement)) {
                 return;
             }
-            final JSStatement body = ((JSLoopStatement) continuedStatement).getBody();
+            JSStatement body = ((JSLoopStatement) continuedStatement).getBody();
             if (body == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
index 0ef8d14c..fcb2b956 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
@@ -55,14 +55,14 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement label = descriptor.getPsiElement();
-            final JSLabeledStatement statement = (JSLabeledStatement) label.getParent();
+            PsiElement label = descriptor.getPsiElement();
+            JSLabeledStatement statement = (JSLabeledStatement) label.getParent();
             assert statement != null;
-            final JSStatement labeledStatement = statement.getStatement();
+            JSStatement labeledStatement = statement.getStatement();
             if (labeledStatement == null) {
                 return;
             }
-            final String statementText = labeledStatement.getText();
+            String statementText = labeledStatement.getText();
             replaceStatement(statement, statementText);
         }
     }
@@ -73,12 +73,12 @@ public void visitJSLabeledStatement(JSLabeledStatement statement) {
             if (containsBreakOrContinueForLabel(statement)) {
                 return;
             }
-            final PsiElement labelIdentifier = statement.getLabelIdentifier();
+            PsiElement labelIdentifier = statement.getLabelIdentifier();
             registerError(labelIdentifier);
         }
 
         private static boolean containsBreakOrContinueForLabel(JSLabeledStatement statement) {
-            final LabelFinder labelFinder = new LabelFinder(statement);
+            LabelFinder labelFinder = new LabelFinder(statement);
             statement.accept(labelFinder);
             return labelFinder.jumpFound();
         }
@@ -90,7 +90,7 @@ private static class LabelFinder extends JSRecursiveElementVisitor {
 
         private LabelFinder(JSLabeledStatement target) {
             super();
-            final PsiElement labelIdentifier = target.getLabelIdentifier();
+            PsiElement labelIdentifier = target.getLabelIdentifier();
             label = labelIdentifier.getText();
         }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
index 6c609489..57847380 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
@@ -50,8 +50,8 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement breakKeywordElement = descriptor.getPsiElement();
-            final JSBreakStatement breakStatement = (JSBreakStatement) breakKeywordElement.getParent();
+            PsiElement breakKeywordElement = descriptor.getPsiElement();
+            JSBreakStatement breakStatement = (JSBreakStatement) breakKeywordElement.getParent();
             replaceStatement(breakStatement, "break;");
         }
     }
@@ -75,15 +75,15 @@ public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             if (statement.getLabel() == null) {
                 return;
             }
-            final JSStatement statementToBreak = statement.getStatementToBreak();
+            JSStatement statementToBreak = statement.getStatementToBreak();
             if (statementToBreak == null) {
                 return;
             }
-            final JSStatement containingStatement = PsiTreeUtil.getParentOfType(statement, JSLoopStatement.class, JSSwitchStatement.class);
+            JSStatement containingStatement = PsiTreeUtil.getParentOfType(statement, JSLoopStatement.class, JSSwitchStatement.class);
             if (containingStatement == null) {
                 return;
             }
-            final PsiElement parent = containingStatement.getParent();
+            PsiElement parent = containingStatement.getParent();
             if (!statementToBreak.equals(parent)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
index 265d71df..d54fedc6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
@@ -66,8 +66,8 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement continueKeywordElement = descriptor.getPsiElement();
-            final JSContinueStatement continueStatement = (JSContinueStatement) continueKeywordElement.getParent();
+            PsiElement continueKeywordElement = descriptor.getPsiElement();
+            JSContinueStatement continueStatement = (JSContinueStatement) continueKeywordElement.getParent();
             replaceStatement(continueStatement, "continue;");
         }
     }
@@ -79,15 +79,15 @@ public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             if (statement.getLabel() == null) {
                 return;
             }
-            final JSStatement statementToContinue = statement.getStatementToContinue();
+            JSStatement statementToContinue = statement.getStatementToContinue();
             if (statementToContinue == null) {
                 return;
             }
-            final JSLoopStatement containingLoop = PsiTreeUtil.getParentOfType(statement, JSLoopStatement.class);
+            JSLoopStatement containingLoop = PsiTreeUtil.getParentOfType(statement, JSLoopStatement.class);
             if (containingLoop == null) {
                 return;
             }
-            final PsiElement parent = containingLoop.getParent();
+            PsiElement parent = containingLoop.getParent();
             if (!statementToContinue.equals(parent)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
index 62a7fed6..2e2874e1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
@@ -71,8 +71,8 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement returnKeywordElement = descriptor.getPsiElement();
-            final PsiElement returnStatement = returnKeywordElement.getParent();
+            PsiElement returnKeywordElement = descriptor.getPsiElement();
+            PsiElement returnStatement = returnKeywordElement.getParent();
             assert returnStatement != null;
             deleteElement(returnStatement);
         }
@@ -83,16 +83,16 @@ private static class UnnecessaryReturnVisitor extends BaseInspectionVisitor {
         public void visitJSReturnStatement(@Nonnull JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
 
-            final JSExpression returnValue = statement.getExpression();
+            JSExpression returnValue = statement.getExpression();
             if(returnValue!=null)
             {
                 return;
             }
-            final JSFunction function = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
+            JSFunction function = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
             if (function == null) {
                 return;
             }
-            final PsiElement body = function.getLastChild();
+            PsiElement body = function.getLastChild();
             if (body == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index b80be1ef..a4ac5fa5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -49,38 +49,38 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignme
             if (assignment.getROperand() == null) {
                 return;
             }
-            final PsiElement assignmentParent = assignment.getParent();
+            PsiElement assignmentParent = assignment.getParent();
             if (!(assignmentParent instanceof JSExpressionStatement)) {
                 return;
             }
-            final JSExpression lhs = assignment.getLOperand();
+            JSExpression lhs = assignment.getLOperand();
             if (!(lhs instanceof JSDefinitionExpression)) {
                 return;
             }
-            final JSDefinitionExpression def = (JSDefinitionExpression)lhs;
-            final JSExpression defExpression = def.getExpression();
+            JSDefinitionExpression def = (JSDefinitionExpression)lhs;
+            JSExpression defExpression = def.getExpression();
             if (!(defExpression instanceof JSReferenceExpression)) {
                 return;
             }
-            final PsiElement referent = ((PsiReference)defExpression).resolve();
+            PsiElement referent = ((PsiReference)defExpression).resolve();
             if (!(referent instanceof JSVariable)) {
                 return;
             }
-            final JSVariable variable = (JSVariable)referent;
+            JSVariable variable = (JSVariable)referent;
 
             if (variable.getInitializer() == null) {
                 return;
             }
-            final IElementType tokenType = assignment.getOperationSign();
+            IElementType tokenType = assignment.getOperationSign();
 
             if (!JSTokenTypes.EQ.equals(tokenType)) {
                 return;
             }
-            final JSExpression rhs = assignment.getROperand();
+            JSExpression rhs = assignment.getROperand();
             if (VariableAccessUtils.variableIsUsed(variable, rhs)) {
                 return;
             }
-            final JSBlockStatement variableBlock = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            JSBlockStatement variableBlock = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
             if (variableBlock == null) {
                 return;
             }
@@ -93,7 +93,7 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignme
                 // that a variable is used in only one branch of a try statement
                 return;
             }
-            final PsiElement assignmentBlock = assignmentParent.getParent();
+            PsiElement assignmentBlock = assignmentParent.getParent();
             if (assignmentBlock == null) {
                 return;
             }
@@ -101,8 +101,8 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignme
                 registerError(lhs);
                 return;
             }
-            final JSStatement[] statements = variableBlock.getStatements();
-            final PsiElement containingStatement = getChildWhichContainsElement(variableBlock, assignment);
+            JSStatement[] statements = variableBlock.getStatements();
+            PsiElement containingStatement = getChildWhichContainsElement(variableBlock, assignment);
             int statementPosition = -1;
             for (int i = 0; i < statements.length; i++) {
                 if (statements[i].equals(containingStatement)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index f727b460..ce67f5c9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -56,7 +56,7 @@ private class UnnecessaryLocalVariableVisitor extends BaseInspectionVisitor<Unne
         @Override
         public void visitJSVarStatement(@Nonnull JSVarStatement varStatement) {
             super.visitJSVarStatement(varStatement);
-            final JSVariable[] variables = varStatement.getVariables();
+            JSVariable[] variables = varStatement.getVariables();
             for (JSVariable variable : variables) {
                 if (isCopyVariable(variable)) {
                     registerVariableError(variable);
@@ -77,34 +77,34 @@ else if (isImmediatelyAssignedAsDeclaration(variable)) {
         }
 
         private boolean isCopyVariable(JSVariable variable) {
-            final JSExpression initializer = variable.getInitializer();
+            JSExpression initializer = variable.getInitializer();
             if (initializer == null) {
                 return false;
             }
             if (!(initializer instanceof JSReferenceExpression)) {
                 return false;
             }
-            final JSReferenceExpression reference =
+            JSReferenceExpression reference =
                 (JSReferenceExpression) initializer;
-            final PsiElement referent = reference.resolve();
+            PsiElement referent = reference.resolve();
             if (referent == null) {
                 return false;
             }
             if (!(referent instanceof JSVariable)) {
                 return false;
             }
-            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
             if (containingScope == null || isClassMember(referent)) {
                 return false;
             }
-            final VariableAssignedVisitor visitor =
+            VariableAssignedVisitor visitor =
                 new VariableAssignedVisitor(variable);
             containingScope.accept(visitor);
             if (visitor.isAssigned()) {
                 return false;
             }
-            final JSVariable initialization = (JSVariable) referent;
-            final VariableAssignedVisitor visitor2 = new VariableAssignedVisitor(initialization);
+            JSVariable initialization = (JSVariable) referent;
+            VariableAssignedVisitor visitor2 = new VariableAssignedVisitor(initialization);
             containingScope.accept(visitor2);
             if (visitor2.isAssigned()) {
                 return false;
@@ -113,17 +113,17 @@ private boolean isCopyVariable(JSVariable variable) {
             return !variableIsUsedInInnerFunction(containingScope, variable);
         }
 
-        private boolean isClassMember(final PsiElement referent) {
-            final PsiElement grandParent = referent.getParent().getParent();
+        private boolean isClassMember(PsiElement referent) {
+            PsiElement grandParent = referent.getParent().getParent();
             return grandParent instanceof JSClass || (grandParent instanceof JSFile && grandParent.getContext() != null);
         }
 
         private boolean isImmediatelyReturned(JSVariable variable) {
-            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
             if (containingScope == null) {
                 return false;
             }
-            final JSVarStatement declarationStatement =
+            JSVarStatement declarationStatement =
                 PsiTreeUtil.getParentOfType(
                     variable,
                     JSVarStatement.class
@@ -132,7 +132,7 @@ private boolean isImmediatelyReturned(JSVariable variable) {
                 return false;
             }
             JSStatement nextStatement = null;
-            final JSStatement[] statements = containingScope.getStatements();
+            JSStatement[] statements = containingScope.getStatements();
             for (int i = 0; i < statements.length - 1; i++) {
                 if (statements[i].equals(declarationStatement)) {
                     nextStatement = statements[i + 1];
@@ -144,29 +144,29 @@ private boolean isImmediatelyReturned(JSVariable variable) {
             if (!(nextStatement instanceof JSReturnStatement)) {
                 return false;
             }
-            final JSReturnStatement returnStatement = (JSReturnStatement) nextStatement;
-            final JSExpression returnValue = returnStatement.getExpression();
+            JSReturnStatement returnStatement = (JSReturnStatement) nextStatement;
+            JSExpression returnValue = returnStatement.getExpression();
             if (returnValue == null) {
                 return false;
             }
             if (!(returnValue instanceof JSReferenceExpression)) {
                 return false;
             }
-            final PsiElement referent = ((PsiReference) returnValue).resolve();
+            PsiElement referent = ((PsiReference) returnValue).resolve();
             return !(referent == null || !referent.equals(variable));
         }
 
         private boolean isImmediatelyThrown(JSVariable variable) {
-            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
             if (containingScope == null) {
                 return false;
             }
-            final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
+            JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
             if (declarationStatement == null) {
                 return false;
             }
             JSStatement nextStatement = null;
-            final JSStatement[] statements = containingScope.getStatements();
+            JSStatement[] statements = containingScope.getStatements();
             for (int i = 0; i < statements.length - 1; i++) {
                 if (statements[i].equals(declarationStatement)) {
                     nextStatement = statements[i + 1];
@@ -178,30 +178,30 @@ private boolean isImmediatelyThrown(JSVariable variable) {
             if (!(nextStatement instanceof JSThrowStatement)) {
                 return false;
             }
-            final JSThrowStatement throwStatement = (JSThrowStatement) nextStatement;
-            final JSExpression returnValue = throwStatement.getExpression();
+            JSThrowStatement throwStatement = (JSThrowStatement) nextStatement;
+            JSExpression returnValue = throwStatement.getExpression();
             if (returnValue == null) {
                 return false;
             }
             if (!(returnValue instanceof JSReferenceExpression)) {
                 return false;
             }
-            final PsiElement referent = ((PsiReference) returnValue).resolve();
+            PsiElement referent = ((PsiReference) returnValue).resolve();
             return !(referent == null || !referent.equals(variable));
         }
 
         private boolean isImmediatelyAssigned(JSVariable variable) {
-            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
             if (containingScope == null) {
                 return false;
             }
-            final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
+            JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
             if (declarationStatement == null) {
                 return false;
             }
             JSStatement nextStatement = null;
             int followingStatementNumber = 0;
-            final JSStatement[] statements = containingScope.getStatements();
+            JSStatement[] statements = containingScope.getStatements();
             for (int i = 0; i < statements.length - 1; i++) {
                 if (statements[i].equals(declarationStatement)) {
                     nextStatement = statements[i + 1];
@@ -214,25 +214,25 @@ private boolean isImmediatelyAssigned(JSVariable variable) {
             if (!(nextStatement instanceof JSExpressionStatement)) {
                 return false;
             }
-            final JSExpressionStatement expressionStatement = (JSExpressionStatement) nextStatement;
-            final JSExpression expression = expressionStatement.getExpression();
+            JSExpressionStatement expressionStatement = (JSExpressionStatement) nextStatement;
+            JSExpression expression = expressionStatement.getExpression();
             if (!(expression instanceof JSAssignmentExpression)) {
                 return false;
             }
-            final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) expression;
-            final JSExpression rhs = assignmentExpression.getROperand();
+            JSAssignmentExpression assignmentExpression = (JSAssignmentExpression) expression;
+            JSExpression rhs = assignmentExpression.getROperand();
             if (rhs == null) {
                 return false;
             }
             if (!(rhs instanceof JSReferenceExpression)) {
                 return false;
             }
-            final JSReferenceExpression reference = (JSReferenceExpression) rhs;
-            final PsiElement referent = reference.resolve();
+            JSReferenceExpression reference = (JSReferenceExpression) rhs;
+            PsiElement referent = reference.resolve();
             if (referent == null || !referent.equals(variable)) {
                 return false;
             }
-            final JSExpression lhs = assignmentExpression.getLOperand();
+            JSExpression lhs = assignmentExpression.getLOperand();
             if (VariableAccessUtils.variableIsUsed(variable, lhs)) {
                 return false;
             }
@@ -245,17 +245,17 @@ private boolean isImmediatelyAssigned(JSVariable variable) {
         }
 
         private boolean isImmediatelyAssignedAsDeclaration(JSVariable variable) {
-            final JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
+            JSBlockStatement containingScope = PsiTreeUtil.getParentOfType(variable, JSBlockStatement.class);
             if (containingScope == null) {
                 return false;
             }
-            final JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
+            JSVarStatement declarationStatement = PsiTreeUtil.getParentOfType(variable, JSVarStatement.class);
             if (declarationStatement == null) {
                 return false;
             }
             JSStatement nextStatement = null;
             int followingStatementNumber = 0;
-            final JSStatement[] statements = containingScope.getStatements();
+            JSStatement[] statements = containingScope.getStatements();
             for (int i = 0; i < statements.length - 1; i++) {
                 if (statements[i].equals(declarationStatement)) {
                     nextStatement = statements[i + 1];
@@ -268,19 +268,19 @@ private boolean isImmediatelyAssignedAsDeclaration(JSVariable variable) {
             if (!(nextStatement instanceof JSVarStatement)) {
                 return false;
             }
-            final JSVarStatement declaration = (JSVarStatement) nextStatement;
-            final JSVariable[] declarations = declaration.getVariables();
+            JSVarStatement declaration = (JSVarStatement) nextStatement;
+            JSVariable[] declarations = declaration.getVariables();
             if (declarations.length != 1) {
                 return false;
             }
-            final JSExpression rhs = declarations[0].getInitializer();
+            JSExpression rhs = declarations[0].getInitializer();
             if (rhs == null) {
                 return false;
             }
             if (!(rhs instanceof JSReferenceExpression)) {
                 return false;
             }
-            final PsiElement referent = ((PsiReference) rhs).resolve();
+            PsiElement referent = ((PsiReference) rhs).resolve();
             if (referent == null || !referent.equals(variable)) {
                 return false;
             }
@@ -293,7 +293,7 @@ private boolean isImmediatelyAssignedAsDeclaration(JSVariable variable) {
         }
 
         private boolean variableIsUsedInInnerFunction(JSBlockStatement block, JSVariable variable) {
-            final VariableUsedInInnerFunctionVisitor visitor = new VariableUsedInInnerFunctionVisitor(variable);
+            VariableUsedInInnerFunctionVisitor visitor = new VariableUsedInInnerFunctionVisitor(variable);
             block.accept(visitor);
             return visitor.isUsedInInnerFunction();
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
index 3c4d8d45..f24bf6ba 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAccessUtils.java
@@ -10,22 +10,22 @@ public static boolean mayEvaluateToVariable(JSExpression expression, JSVariable
             return false;
         }
         if (expression instanceof JSParenthesizedExpression parenthesized) {
-            final JSExpression containedExpression = parenthesized.getInnerExpression();
+            JSExpression containedExpression = parenthesized.getInnerExpression();
             return mayEvaluateToVariable(containedExpression, variable);
         }
         if (expression instanceof JSDefinitionExpression definition) {
-            final JSExpression containedExpression = definition.getExpression();
+            JSExpression containedExpression = definition.getExpression();
             return mayEvaluateToVariable(containedExpression, variable);
         }
         if (expression instanceof JSConditionalExpression conditional) {
-            final JSExpression thenExpression = conditional.getThen();
-            final JSExpression elseExpression = conditional.getElse();
+            JSExpression thenExpression = conditional.getThen();
+            JSExpression elseExpression = conditional.getElse();
             return mayEvaluateToVariable(thenExpression, variable) || mayEvaluateToVariable(elseExpression, variable);
         }
         if (!(expression instanceof JSReferenceExpression)) {
             return false;
         }
-        final PsiElement referent = ((PsiReference)expression).resolve();
+        PsiElement referent = ((PsiReference)expression).resolve();
         if (referent == null) {
             return false;
         }
@@ -33,7 +33,7 @@ public static boolean mayEvaluateToVariable(JSExpression expression, JSVariable
     }
 
     public static boolean variableIsUsed(JSVariable variable, PsiElement context) {
-        final VariableUsedVisitor visitor = new VariableUsedVisitor(variable);
+        VariableUsedVisitor visitor = new VariableUsedVisitor(variable);
         context.accept(visitor);
         return visitor.isUsed();
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
index 15784ef0..69dadd9b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
@@ -30,7 +30,7 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignme
             return;
         }
         super.visitJSAssignmentExpression(assignment);
-        final JSExpression arg = assignment.getLOperand();
+        JSExpression arg = assignment.getLOperand();
         if (VariableAccessUtils.mayEvaluateToVariable(arg, variable)) {
             assigned = true;
         }
@@ -42,12 +42,12 @@ public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
             return;
         }
         super.visitJSPrefixExpression(expression);
-        final IElementType operationSign = expression.getOperationSign();
+        IElementType operationSign = expression.getOperationSign();
         if (!JSTokenTypes.PLUSPLUS.equals(operationSign) &&
             !JSTokenTypes.MINUSMINUS.equals(operationSign)) {
             return;
         }
-        final JSExpression operand = expression.getExpression();
+        JSExpression operand = expression.getExpression();
         if (VariableAccessUtils.mayEvaluateToVariable(operand, variable)) {
             assigned = true;
         }
@@ -59,12 +59,12 @@ public void visitJSPostfixExpression(@Nonnull JSPostfixExpression postfixExpress
             return;
         }
         super.visitJSPostfixExpression(postfixExpression);
-        final IElementType operationSign = postfixExpression.getOperationSign();
+        IElementType operationSign = postfixExpression.getOperationSign();
         if (!JSTokenTypes.PLUSPLUS.equals(operationSign) &&
             !JSTokenTypes.MINUSMINUS.equals(operationSign)) {
             return;
         }
-        final JSExpression operand = postfixExpression.getExpression();
+        JSExpression operand = postfixExpression.getExpression();
         if (VariableAccessUtils.mayEvaluateToVariable(operand, variable)) {
             assigned = true;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
index 5b5c9e4f..f6ac1f85 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
@@ -30,7 +30,7 @@ public void visitJSFunctionExpression(@Nonnull JSFunctionExpression funcExpr) {
         if (usedInInnerFunction) {
             return;
         }
-        final boolean wasInInnerFunction = inInnerFunction;
+        boolean wasInInnerFunction = inInnerFunction;
         inInnerFunction = true;
         super.visitJSFunctionExpression(funcExpr);
         inInnerFunction = wasInInnerFunction;
@@ -43,7 +43,7 @@ public void visitJSReferenceExpression(@Nonnull JSReferenceExpression reference)
         }
         super.visitJSReferenceExpression(reference);
         if (inInnerFunction) {
-            final PsiElement element = reference.resolve();
+            PsiElement element = reference.resolve();
             if (variable.equals(element)) {
                 usedInInnerFunction = true;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
index 3a2b971f..fccabc8a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
@@ -32,7 +32,7 @@ public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
         }
         super.visitJSReferenceExpression(ref);
         PsiElement element = ref.resolve();
-        final JSElement referent = element instanceof JSElement jsElement ? jsElement : null;
+        JSElement referent = element instanceof JSElement jsElement ? jsElement : null;
         if (referent == null) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index 4a7a2234..65e3fdd5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -45,7 +45,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             super.visitJSCallExpression(jsCallExpression);
-            final JSExpression methodExpression;
+            JSExpression methodExpression;
             try {
                 methodExpression = jsCallExpression.getMethodExpression();
             }
@@ -55,16 +55,16 @@ public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             if (!(methodExpression instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
-            final JSExpression qualifier = referenceExpression.getQualifier();
+            JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
+            JSExpression qualifier = referenceExpression.getQualifier();
             if (qualifier == null) {
                 return;
             }
-            @NonNls final String qualifierText = qualifier.getText();
+            @NonNls String qualifierText = qualifier.getText();
             if (!"document".equals(qualifierText)) {
                 return;
             }
-            @NonNls final String methodName = referenceExpression.getReferencedName();
+            @NonNls String methodName = referenceExpression.getReferencedName();
             if (!"write".equals(methodName) && !"writeln".equals(methodName)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index e0d5e28f..08dfecd4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -42,7 +42,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSReferenceExpression(JSReferenceExpression expression) {
             super.visitJSReferenceExpression(expression);
-            final String referenceName = expression.getReferencedName();
+            String referenceName = expression.getReferencedName();
             if (!"innerHTML".equalsIgnoreCase(referenceName)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index f7cec916..ef032d48 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -43,13 +43,13 @@ private static class Visitor extends BaseInspectionVisitor {
         @SuppressWarnings({"HardCodedStringLiteral"})
         public void visitJSReferenceExpression(JSReferenceExpression referenceExpression) {
             super.visitJSReferenceExpression(referenceExpression);
-            final JSExpression qualifier = referenceExpression.getQualifier();
+            JSExpression qualifier = referenceExpression.getQualifier();
             if (qualifier == null) {
                 return;
             }
-            final String qualifierText = qualifier.getText();
+            String qualifierText = qualifier.getText();
             if ("navigator".equalsIgnoreCase(qualifierText)) {
-                final String methodName = referenceExpression.getReferencedName();
+                String methodName = referenceExpression.getReferencedName();
                 if (!"userAgent".equalsIgnoreCase(methodName) &&
                     !"appName".equalsIgnoreCase(methodName) &&
                     !"appCodeName".equalsIgnoreCase(methodName) &&
@@ -61,7 +61,7 @@ public void visitJSReferenceExpression(JSReferenceExpression referenceExpression
                 registerError(referenceExpression);
             }
             else if ("document".equalsIgnoreCase(qualifierText)) {
-                final String methodName = referenceExpression.getReferencedName();
+                String methodName = referenceExpression.getReferencedName();
                 if (!"all".equalsIgnoreCase(methodName) &&
                     !"layers".equalsIgnoreCase(methodName)) {
                     return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
index 7b176314..be8e8370 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
@@ -43,16 +43,16 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSReferenceExpression(JSReferenceExpression referenceExpression) {
             super.visitJSReferenceExpression(referenceExpression);
-            final JSExpression qualifier = referenceExpression.getQualifier();
+            JSExpression qualifier = referenceExpression.getQualifier();
             if (qualifier == null) {
                 return;
             }
-            final String qualifierText = qualifier.getText();
+            String qualifierText = qualifier.getText();
 
             if (!"document".equalsIgnoreCase(qualifierText)) {
                 return;
             }
-            final String methodName = referenceExpression.getReferencedName();
+            String methodName = referenceExpression.getReferencedName();
             if (!"images".equalsIgnoreCase(methodName) &&
                 !"body".equalsIgnoreCase(methodName) &&
                 !"applets".equalsIgnoreCase(methodName) &&
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
index d909e58f..8e1456db 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
@@ -29,7 +29,7 @@ public void visitJSReferenceExpression(@Nonnull JSReferenceExpression reference)
             return;
         }
         super.visitJSReferenceExpression(reference);
-        final PsiElement element = reference.resolve();
+        PsiElement element = reference.resolve();
         if (parameter.equals(element)) {
             used = true;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
index a115d4a6..05c67748 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
@@ -45,7 +45,7 @@ public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
             }
-            final JSStatement continuedStatement = statement.getStatementToContinue();
+            JSStatement continuedStatement = statement.getStatementToContinue();
             if (continuedStatement == null) {
                 return;
             }
@@ -61,7 +61,7 @@ public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
             }
-            final JSStatement exitedStatement = statement.getStatementToBreak();
+            JSStatement exitedStatement = statement.getStatementToBreak();
             if (exitedStatement == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index 4baf9163..f8ace4f6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -45,13 +45,13 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSTryStatement(JSTryStatement jsTryStatement) {
             super.visitJSTryStatement(jsTryStatement);
-            final JSCatchBlock catchBlock = jsTryStatement.getCatchBlock();
+            JSCatchBlock catchBlock = jsTryStatement.getCatchBlock();
             if (catchBlock == null) {
                 return;
             }
-            final JSStatement body = catchBlock.getStatement();
+            JSStatement body = catchBlock.getStatement();
             if (StatementUtils.isEmpty(body)) {
-                final PsiElement catchToken = catchBlock.getFirstChild();
+                PsiElement catchToken = catchBlock.getFirstChild();
                 registerError(catchToken);
             }
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
index 1e98753d..b820d9a9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
@@ -43,7 +43,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSTryStatement(JSTryStatement jsTryStatement) {
             super.visitJSTryStatement(jsTryStatement);
-            final JSStatement finallyStatement = jsTryStatement.getFinallyStatement();
+            JSStatement finallyStatement = jsTryStatement.getFinallyStatement();
             if (finallyStatement == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index 4b61111a..11abc999 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -43,7 +43,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSTryStatement(JSTryStatement jsTryStatement) {
             super.visitJSTryStatement(jsTryStatement);
-            final JSStatement statement = jsTryStatement.getStatement();
+            JSStatement statement = jsTryStatement.getStatement();
             if (statement == null) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index 42a39765..6939c368 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -53,12 +53,12 @@ public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
     public static boolean isCaughtLocally(@Nonnull JSThrowStatement throwStatement) {
         JSElement currentElement = throwStatement;
         while (true) {
-            final JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
+            JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
             if (tryStatement == null) {
                 return false;
             }
             if (tryStatement.getCatchBlock() != null) {
-                final JSStatement tryBlock = tryStatement.getStatement();
+                JSStatement tryBlock = tryStatement.getStatement();
                 if (tryBlock != null) {
                     if (PsiTreeUtil.isAncestor(tryBlock, currentElement, true)) {
                         return true;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
index 63376932..818fa71b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
@@ -52,7 +52,7 @@ private class EmptyCatchBlockVisitor extends BaseInspectionVisitor<UnusedCatchPa
         @Override
         public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
             super.visitJSTryStatement(statement);
-            final JSCatchBlock jsCatchBlock = statement.getCatchBlock();
+            JSCatchBlock jsCatchBlock = statement.getCatchBlock();
             if (jsCatchBlock == null) {
                 return;
             }
@@ -60,24 +60,24 @@ public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
         }
 
         private void checkCatchSection(JSCatchBlock section) {
-            final JSParameter param = section.getParameter();
-            final JSStatement block = section.getStatement();
+            JSParameter param = section.getParameter();
+            JSStatement block = section.getStatement();
             if (param == null || block == null) {
                 return;
             }
-            final String paramName = param.getName();
+            String paramName = param.getName();
             if ("ignore".equals(paramName) || "ignored".equals(paramName)) {
                 return;
             }
             if (myState.m_ignoreCatchBlocksWithComments) {
-                final PsiElement[] children = block.getChildren();
-                for (final PsiElement child : children) {
+                PsiElement[] children = block.getChildren();
+                for (PsiElement child : children) {
                     if (child instanceof PsiComment) {
                         return;
                     }
                 }
             }
-            final CatchParameterUsedVisitor visitor = new CatchParameterUsedVisitor(param);
+            CatchParameterUsedVisitor visitor = new CatchParameterUsedVisitor(param);
             block.accept(visitor);
             if (!visitor.isUsed()) {
                 registerVariableError(param);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
index 186a24cc..890f480d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
@@ -36,16 +36,16 @@ public LocalizeValue getName() {
 
     @Override
     public void doFix(Project project, ProblemDescriptor descriptor) {
-        final PsiElement nameIdentifier = descriptor.getPsiElement();
-        final PsiElement elementToRename = nameIdentifier.getParent();
+        PsiElement nameIdentifier = descriptor.getPsiElement();
+        PsiElement elementToRename = nameIdentifier.getParent();
         if (m_targetName == null) {
-            final RefactoringActionHandlerFactory factory = RefactoringActionHandlerFactory.getInstance();
-            final RefactoringActionHandler renameHandler = factory.createRenameHandler();
+            RefactoringActionHandlerFactory factory = RefactoringActionHandlerFactory.getInstance();
+            RefactoringActionHandler renameHandler = factory.createRenameHandler();
             renameHandler.invoke(project, new PsiElement[]{elementToRename}, DataManager.getInstance().getDataContext());
         }
         else {
-            final RefactoringFactory factory = RefactoringFactory.getInstance(project);
-            final RenameRefactoring renameRefactoring = factory.createRename(elementToRename, m_targetName);
+            RefactoringFactory factory = RefactoringFactory.getInstance(project);
+            RenameRefactoring renameRefactoring = factory.createRename(elementToRename, m_targetName);
             renameRefactoring.run();
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index 4ac1983e..f3ce8bd3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -44,13 +44,13 @@ public InspectionToolState<?> createStateProvider() {
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
-        final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
-        final PsiElement lastChild = function.getLastChild();
+        CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
+        PsiElement lastChild = function.getLastChild();
         assert lastChild != null;
         lastChild.accept(visitor);
-        final int coupling = visitor.getComplexity();
+        int coupling = visitor.getComplexity();
         return functionHasIdentifier(function)
             ? InspectionJSLocalize.functionRefIsOverlyComplexCyclomaticComplexityErrorString(coupling).get()
             : InspectionJSLocalize.anonymousFunctionIsOverlyComplexCyclomaticComplexityErrorString(coupling).get();
@@ -64,13 +64,13 @@ public BaseInspectionVisitor buildVisitor() {
     private class Visitor extends BaseInspectionVisitor<CyclomaticComplexityJSInspectionState> {
         @Override
         public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
-            final PsiElement lastChild = function.getLastChild();
+            PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
                 return;
             }
-            final CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
+            CyclomaticComplexityVisitor visitor = new CyclomaticComplexityVisitor();
             lastChild.accept(visitor);
-            final int complexity = visitor.getComplexity();
+            int complexity = visitor.getComplexity();
 
             if (complexity <= myState.getLimit()) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
index d8a2ba9e..084e8445 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
@@ -53,9 +53,9 @@ public void visitJSConditionalExpression(JSConditionalExpression expression) {
     @Override
     public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
         super.visitJSSwitchStatement(statement);
-        final JSCaseClause[] caseClauses = statement.getCaseClauses();
+        JSCaseClause[] caseClauses = statement.getCaseClauses();
         for (JSCaseClause clause : caseClauses) {
-            final JSStatement[] statements = clause.getStatements();
+            JSStatement[] statements = clause.getStatements();
             if (statements != null && statements.length != 0) {
                 complexity++;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index a9c5e3e6..41d08d98 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -29,13 +29,13 @@ public LocalizeValue getGroupDisplayName() {
     @RequiredReadAction
     @Override
     public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
-        final LoopCountVisitor visitor = new LoopCountVisitor();
-        final PsiElement lastChild = function.getLastChild();
+        LoopCountVisitor visitor = new LoopCountVisitor();
+        PsiElement lastChild = function.getLastChild();
         assert lastChild != null;
         lastChild.accept(visitor);
-        final int loopCount = visitor.getCount();
+        int loopCount = visitor.getCount();
         return functionHasIdentifier(function)
             ? InspectionJSLocalize.functionContainsMultipleLoopsErrorString(loopCount).get()
             : InspectionJSLocalize.anonymousFunctionContainsMultipleLoopsErrorString(loopCount).get();
@@ -50,13 +50,13 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
             // note: no call to super
-            final PsiElement lastChild = function.getLastChild();
+            PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
                 return;
             }
-            final LoopCountVisitor visitor = new LoopCountVisitor();
+            LoopCountVisitor visitor = new LoopCountVisitor();
             lastChild.accept(visitor);
-            final int negationCount = visitor.getCount();
+            int negationCount = visitor.getCount();
             if (negationCount <= 1) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index b4e5da65..725a2bc8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -35,9 +35,9 @@ public LocalizeValue getGroupDisplayName() {
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
-        final int returnPointCount = countReturnPoints(function);
+        int returnPointCount = countReturnPoints(function);
         if (functionHasIdentifier(function)) {
             return InspectionJSLocalize.functionContainsMultipleReturnPointsErrorString(returnPointCount).get();
         }
@@ -47,7 +47,7 @@ public String buildErrorString(Object state, Object... args) {
     }
 
     private static int countReturnPoints(JSFunction function) {
-        final PsiElement lastChild = function.getLastChild();
+        PsiElement lastChild = function.getLastChild();
         if (!(lastChild instanceof JSBlockStatement)) {
             return 0;
         }
@@ -55,10 +55,10 @@ private static int countReturnPoints(JSFunction function) {
         if (ControlFlowUtils.statementMayCompleteNormally((JSStatement)lastChild)) {
             hasFallthroughReturn = true;
         }
-        final ReturnCountVisitor visitor = new ReturnCountVisitor();
+        ReturnCountVisitor visitor = new ReturnCountVisitor();
         lastChild.accept(visitor);
 
-        final int returnCount = visitor.getReturnCount();
+        int returnCount = visitor.getReturnCount();
         return hasFallthroughReturn ? returnCount + 1 : returnCount;
     }
 
@@ -70,7 +70,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
-            final int returnPointCount = countReturnPoints(function);
+            int returnPointCount = countReturnPoints(function);
             if (returnPointCount <= 1) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
index 0ec54ac1..0f25aaee 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
@@ -28,7 +28,7 @@ public void visitJSElement(JSElement jsElement) {
     @Override
     public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
         super.visitJSBinaryExpression(expression);
-        final IElementType sign = expression.getOperationSign();
+        IElementType sign = expression.getOperationSign();
         if (JSTokenTypes.NE.equals(sign) || JSTokenTypes.NEQEQ.equals(sign)) {
             negationCount++;
         }
@@ -37,7 +37,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
     @Override
     public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
         super.visitJSPrefixExpression(expression);
-        final IElementType sign = expression.getOperationSign();
+        IElementType sign = expression.getOperationSign();
         if (JSTokenTypes.EXCL.equals(sign)) {
             negationCount++;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index fe4786ec..9553c20c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -43,11 +43,11 @@ public InspectionToolState<?> createStateProvider() {
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
-        final NestingDepthVisitor visitor = new NestingDepthVisitor();
+        NestingDepthVisitor visitor = new NestingDepthVisitor();
         function.accept(visitor);
-        final int nestingDepth = visitor.getMaximumDepth();
+        int nestingDepth = visitor.getMaximumDepth();
         return functionHasIdentifier(function)
             ? InspectionJSLocalize.functionIsOverlyNestedErrorString(nestingDepth).get()
             : InspectionJSLocalize.anonymousFunctionIsOverlyNestedErrorString(nestingDepth).get();
@@ -61,9 +61,9 @@ public BaseInspectionVisitor buildVisitor() {
     private class Visitor extends BaseInspectionVisitor<NestingDepthJSInspectionState> {
         @Override
         public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
-            final NestingDepthVisitor visitor = new NestingDepthVisitor();
+            NestingDepthVisitor visitor = new NestingDepthVisitor();
             function.accept(visitor);
-            final int count = visitor.getMaximumDepth();
+            int count = visitor.getMaximumDepth();
 
             if (count > myState.getLimit()) {
                 registerFunctionError(function);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
index e87bcaac..6583b7df 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
@@ -43,9 +43,9 @@ public void visitJSForStatement(@Nonnull JSForStatement statement) {
     public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
         boolean isAlreadyCounted = false;
         if (statement.getParent() instanceof JSIfStatement) {
-            final JSIfStatement parent = (JSIfStatement)statement.getParent();
+            JSIfStatement parent = (JSIfStatement)statement.getParent();
             assert parent != null;
-            final JSStatement elseBranch = parent.getElse();
+            JSStatement elseBranch = parent.getElse();
             if (statement.equals(elseBranch)) {
                 isAlreadyCounted = true;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index b68a1664..0395ad9b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -45,11 +45,11 @@ public InspectionToolState<?> createStateProvider() {
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
-        final JSParameterList parameterList = function.getParameterList();
-        final JSParameter[] parameters = parameterList.getParameters();
-        final int numParameters = parameters.length;
+        JSParameterList parameterList = function.getParameterList();
+        JSParameter[] parameters = parameterList.getParameters();
+        int numParameters = parameters.length;
         return functionHasIdentifier(function)
             ? InspectionJSLocalize.functionHasTooManyParametersErrorString(numParameters).get()
             : InspectionJSLocalize.anonymousFunctionHasTooManyParametersErrorString(numParameters).get();
@@ -63,15 +63,15 @@ public BaseInspectionVisitor buildVisitor() {
     private class Visitor extends BaseInspectionVisitor<ParametersPerFunctionJSInspectionState> {
         @Override
         public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
-            final JSParameterList parameterList = function.getParameterList();
+            JSParameterList parameterList = function.getParameterList();
             if (parameterList == null) {
                 return;
             }
-            final JSParameter[] parameters = parameterList.getParameters();
+            JSParameter[] parameters = parameterList.getParameters();
             if (parameters == null) {
                 return;
             }
-            final int numParameters = parameters.length;
+            int numParameters = parameters.length;
             if (numParameters <= myState.getLimit()) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index 9ba21acf..3e5ee30a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -42,13 +42,13 @@ public InspectionToolState<?> createStateProvider() {
     @RequiredReadAction
     @Override
     public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
-        final PsiElement lastChild = function.getLastChild();
-        final StatementCountVisitor visitor = new StatementCountVisitor();
+        PsiElement lastChild = function.getLastChild();
+        StatementCountVisitor visitor = new StatementCountVisitor();
         assert lastChild != null;
         lastChild.accept(visitor);
-        final int coupling = visitor.getStatementCount();
+        int coupling = visitor.getStatementCount();
         return functionHasIdentifier(function)
             ? InspectionJSLocalize.functionIsOverlyLongStatementErrorString(coupling).get()
             : InspectionJSLocalize.anonymousFunctionIsOverlyLongStatementErrorString(coupling).get();
@@ -63,13 +63,13 @@ private class Visitor extends BaseInspectionVisitor<StatementsPerFunctionJSInspe
         @Override
         public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
 
-            final PsiElement lastChild = function.getLastChild();
+            PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
                 return;
             }
-            final StatementCountVisitor visitor = new StatementCountVisitor();
+            StatementCountVisitor visitor = new StatementCountVisitor();
             lastChild.accept(visitor);
-            final int statementCount = visitor.getStatementCount();
+            int statementCount = visitor.getStatementCount();
 
             if (statementCount <= myState.getLimit()) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index 8a13cc43..35df8f98 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -35,13 +35,13 @@ public LocalizeValue getGroupDisplayName() {
     @RequiredReadAction
     @Override
     public String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
-        final PsiElement lastChild = function.getLastChild();
-        final NegationCountVisitor visitor = new NegationCountVisitor();
+        PsiElement lastChild = function.getLastChild();
+        NegationCountVisitor visitor = new NegationCountVisitor();
         assert lastChild != null;
         lastChild.accept(visitor);
-        final int negationCount = visitor.getNegationCount();
+        int negationCount = visitor.getNegationCount();
         return functionHasIdentifier(function)
             ? InspectionJSLocalize.functionContainsTooManyNegationErrorString(negationCount).get()
             : InspectionJSLocalize.anonymousFunctionContainsTooManyNegationErrorString(negationCount).get();
@@ -55,13 +55,13 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
-            final NegationCountVisitor visitor = new NegationCountVisitor();
-            final PsiElement lastChild = function.getLastChild();
+            NegationCountVisitor visitor = new NegationCountVisitor();
+            PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
                 return;
             }
             lastChild.accept(visitor);
-            final int negationCount = visitor.getNegationCount();
+            int negationCount = visitor.getNegationCount();
             if (negationCount <= 3) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
index ba3a1695..c5100f05 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspection.java
@@ -6,7 +6,7 @@
 
 public abstract class ConventionInspection extends JavaScriptInspection {
     boolean isValid(String name, ConventionInspectionState state) {
-        final int length = name.length();
+        int length = name.length();
         if (length < state.m_minLength) {
             return false;
         }
@@ -16,7 +16,7 @@ boolean isValid(String name, ConventionInspectionState state) {
         if ("serialVersionUID".equals(name)) {
             return true;
         }
-        final Matcher matcher = state.getPattern().matcher(name);
+        Matcher matcher = state.getPattern().matcher(name);
         return matcher.matches();
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index 7daf5d37..c821bcf1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -55,7 +55,7 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
         ConventionInspectionState inspectionState = (ConventionInspectionState) state;
-        final String functionName = ((PsiElement) args[0]).getText();
+        String functionName = ((PsiElement) args[0]).getText();
 
         assert functionName != null;
         if (functionName.length() < inspectionState.m_minLength) {
@@ -77,14 +77,14 @@ private class Visitor extends BaseInspectionVisitor<ConventionInspectionState> {
         public void visitJSFunctionDeclaration(JSFunction function) {
             super.visitJSFunctionDeclaration(function);
 
-            final String name = function.getName();
+            String name = function.getName();
             if (name == null) {
                 return;
             }
             if (isValid(name, myState)) {
                 return;
             }
-            final PsiElement identifier = function.getNameIdentifier();
+            PsiElement identifier = function.getNameIdentifier();
             if (identifier == null || !PsiTreeUtil.isAncestor(function, identifier, true)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index 0f9a3971..b42ecffa 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -50,9 +50,9 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
     public String buildErrorString(Object state, Object... args) {
         LocalVariableNamingConventionJSInspectionState inspectionState = (LocalVariableNamingConventionJSInspectionState) state;
 
-        final JSVariable variable = (JSVariable) ((PsiElement) args[0]).getParent();
+        JSVariable variable = (JSVariable) ((PsiElement) args[0]).getParent();
         assert variable != null;
-        final String variableName = variable.getName();
+        String variableName = variable.getName();
         if (variableName.length() < inspectionState.m_minLength) {
             return InspectionJSLocalize.variableNameIsTooShortErrorString().get();
         }
@@ -77,9 +77,9 @@ private class Visitor extends BaseInspectionVisitor<LocalVariableNamingConventio
         @Override
         public void visitJSVarStatement(JSVarStatement jsVarStatement) {
             super.visitJSVarStatement(jsVarStatement);
-            final JSVariable[] variables = jsVarStatement.getVariables();
+            JSVariable[] variables = jsVarStatement.getVariables();
             for (JSVariable variable : variables) {
-                final String name = variable.getName();
+                String name = variable.getName();
                 if (name == null) {
                     continue;
                 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index 2959c105..575ebccc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -58,9 +58,9 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
     public String buildErrorString(Object state, Object... args) {
         ParameterNamingConventionJSInspectionState inspectionState = (ParameterNamingConventionJSInspectionState) state;
 
-        final JSParameter parameter = (JSParameter) ((PsiElement) args[0]).getParent();
+        JSParameter parameter = (JSParameter) ((PsiElement) args[0]).getParent();
         assert parameter != null;
-        final String parameterName = parameter.getName();
+        String parameterName = parameter.getName();
         if (parameterName.length() < inspectionState.m_minLength) {
             return InspectionJSLocalize.parameterNameIsTooShortErrorString().get();
         }
@@ -79,13 +79,13 @@ private class Visitor extends BaseInspectionVisitor<ParameterNamingConventionJSI
         @Override
         public void visitJSFunctionDeclaration(JSFunction function) {
             super.visitJSFunctionDeclaration(function);
-            final JSParameterList parameterList = function.getParameterList();
+            JSParameterList parameterList = function.getParameterList();
             if (parameterList == null) {
                 return;
             }
-            final JSParameter[] parameters = parameterList.getParameters();
+            JSParameter[] parameters = parameterList.getParameters();
             for (JSVariable variable : parameters) {
-                final String name = variable.getName();
+                String name = variable.getName();
                 if (name == null) {
                     continue;
                 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index 3b6c7d4f..238a65da 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -57,7 +57,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             if (!isEqualityComparison(expression)) {
                 return;
             }
-            final JSExpression lhs = expression.getLOperand();
+            JSExpression lhs = expression.getLOperand();
             if (!(lhs instanceof JSBinaryExpression)) {
                 return;
             }
@@ -68,7 +68,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
         }
 
         private static boolean isEqualityComparison(@Nonnull JSBinaryExpression expression) {
-            final IElementType tokenType = expression.getOperationSign();
+            IElementType tokenType = expression.getOperationSign();
             return JSTokenTypes.EQEQ.equals(tokenType) || JSTokenTypes.NE.equals(tokenType);
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index 24bec2b2..a7a31bec 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -43,11 +43,11 @@ private static class NestedMethodCallVisitor extends BaseInspectionVisitor {
         @Override
         public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
             super.visitJSCallExpression(expression);
-            final JSExpression reference = expression.getMethodExpression();
+            JSExpression reference = expression.getMethodExpression();
             if (!(reference instanceof JSReferenceExpression)) {
                 return;
             }
-            final JSExpression qualifier = ((JSReferenceExpression)reference).getQualifier();
+            JSExpression qualifier = ((JSReferenceExpression)reference).getQualifier();
             if (qualifier == null) {
                 return;
             }
@@ -62,7 +62,7 @@ private static boolean isCallExpression(JSExpression expression) {
                 return true;
             }
             if (expression instanceof JSParenthesizedExpression parenthesizedExpression) {
-                final JSExpression containedExpression = parenthesizedExpression.getInnerExpression();
+                JSExpression containedExpression = parenthesizedExpression.getInnerExpression();
                 return isCallExpression(containedExpression);
             }
             return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index 89920df6..05d975d9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -66,14 +66,14 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
-            final JSExpression rhs = expression.getROperand();
-            final JSExpression lhs = expression.getLOperand();
-            final IElementType sign = expression.getOperationSign();
+            JSBinaryExpression expression = (JSBinaryExpression) descriptor.getPsiElement();
+            JSExpression rhs = expression.getROperand();
+            JSExpression lhs = expression.getLOperand();
+            IElementType sign = expression.getOperationSign();
             assert rhs != null;
-            final String rhsText = rhs.getText();
-            final String flippedComparison = ComparisonUtils.getFlippedComparison(sign);
-            final String lhsText = lhs.getText();
+            String rhsText = rhs.getText();
+            String flippedComparison = ComparisonUtils.getFlippedComparison(sign);
+            String lhsText = lhs.getText();
             replaceExpression(expression, rhsText + ' ' + flippedComparison + ' ' + lhsText);
         }
     }
@@ -88,8 +88,8 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             if (!ComparisonUtils.isComparison(expression)) {
                 return;
             }
-            final JSExpression lhs = expression.getLOperand();
-            final JSExpression rhs = expression.getROperand();
+            JSExpression lhs = expression.getLOperand();
+            JSExpression rhs = expression.getROperand();
             if (!(lhs instanceof JSLiteralExpression) || rhs instanceof JSLiteralExpression) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index 25a3ef58..c9169dd4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -68,14 +68,14 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
-            final JSExpression rhs = expression.getROperand();
-            final JSExpression lhs = expression.getLOperand();
-            final IElementType sign = expression.getOperationSign();
+            JSBinaryExpression expression = (JSBinaryExpression)descriptor.getPsiElement();
+            JSExpression rhs = expression.getROperand();
+            JSExpression lhs = expression.getLOperand();
+            IElementType sign = expression.getOperationSign();
             assert rhs != null;
-            final String rhsText = rhs.getText();
-            final String flippedComparison = ComparisonUtils.getFlippedComparison(sign);
-            final String lhsText = lhs.getText();
+            String rhsText = rhs.getText();
+            String flippedComparison = ComparisonUtils.getFlippedComparison(sign);
+            String lhsText = lhs.getText();
             replaceExpression(expression, rhsText + ' ' + flippedComparison + ' ' + lhsText);
         }
     }
@@ -90,8 +90,8 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             if (!ComparisonUtils.isComparison(expression)) {
                 return;
             }
-            final JSExpression lhs = expression.getLOperand();
-            final JSExpression rhs = expression.getROperand();
+            JSExpression lhs = expression.getLOperand();
+            JSExpression rhs = expression.getROperand();
             if (lhs instanceof JSLiteralExpression ||
                 !(rhs instanceof JSLiteralExpression)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index 5a4a6d7e..32252f56 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -55,7 +55,7 @@ public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
             if (outerExpression == null) {
                 return;
             }
-            final PsiElement parent = outerExpression.getParent();
+            PsiElement parent = outerExpression.getParent();
             if (!(parent instanceof JSArgumentList && parent.getParent() instanceof JSCallExpression)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
index 72bfa47b..3ab7e1c3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
@@ -58,18 +58,18 @@ public LocalizeValue getName() {
 
         @Override
         public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
-            final PsiElement statementIdentifier = descriptor.getPsiElement();
-            final JSStatement statement = (JSStatement) statementIdentifier.getParent();
+            PsiElement statementIdentifier = descriptor.getPsiElement();
+            JSStatement statement = (JSStatement) statementIdentifier.getParent();
             if (statement instanceof JSLoopStatement loopStatement) {
-                final JSStatement body = loopStatement.getBody();
+                JSStatement body = loopStatement.getBody();
                 wrapStatement(body);
             } else {
-                final JSIfStatement ifStatement = (JSIfStatement) statement;
-                final JSStatement thenBranch = ifStatement.getThen();
+                JSIfStatement ifStatement = (JSIfStatement) statement;
+                JSStatement thenBranch = ifStatement.getThen();
                 if (thenBranch != null && !(thenBranch instanceof JSBlockStatement)) {
                     wrapStatement(thenBranch);
                 }
-                final JSStatement elseBranch = ifStatement.getElse();
+                JSStatement elseBranch = ifStatement.getElse();
                 if (elseBranch != null && !(elseBranch instanceof JSBlockStatement)) {
                     wrapStatement(elseBranch);
                 }
@@ -77,7 +77,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
         }
 
         private static void wrapStatement(JSStatement statement) throws IncorrectOperationException {
-            final String text = statement.getText();
+            String text = statement.getText();
             replaceStatement(statement, '{' + text + '}');
         }
     }
@@ -92,7 +92,7 @@ private static class Visitor extends BaseInspectionVisitor {
         public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
 
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -107,7 +107,7 @@ public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
         public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
 
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -122,7 +122,7 @@ public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
         public void visitJSForStatement(@Nonnull JSForStatement statement) {
             super.visitJSForStatement(statement);
 
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -137,7 +137,7 @@ public void visitJSForStatement(@Nonnull JSForStatement statement) {
         public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
             super.visitJSForInStatement(statement);
 
-            final JSStatement body = statement.getBody();
+            JSStatement body = statement.getBody();
             if (body == null) {
                 return;
             }
@@ -152,14 +152,14 @@ public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
         public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
             super.visitJSIfStatement(statement);
 
-            final JSStatement thenBranch = statement.getThen();
+            JSStatement thenBranch = statement.getThen();
             if (thenBranch != null) {
                 if (!(thenBranch instanceof JSBlockStatement)) {
                     registerStatementError(statement, statement);
                     return;
                 }
             }
-            final JSStatement elseBranch = statement.getElse();
+            JSStatement elseBranch = statement.getElse();
 
             if (elseBranch != null && !(elseBranch instanceof JSBlockStatement || elseBranch instanceof JSIfStatement)) {
                 registerStatementError(statement, statement);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index e40b1670..78e661e4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -74,7 +74,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
             if (expression == null) {
                 return;
             }
-            final String text = expression.getText();
+            String text = expression.getText();
             replaceStatement(expression, text + ';');
         }
     }
@@ -144,7 +144,7 @@ public void visitJSVarStatement(JSVarStatement jsVarStatement) {
         }
 
         @Override
-        protected PsiElement getEditorErrorLocation(final PsiElement location) {
+        protected PsiElement getEditorErrorLocation(PsiElement location) {
             PsiElement editorErrorLocation = PsiTreeUtil.lastChild(location);
             while (editorErrorLocation instanceof PsiErrorElement
                 || (editorErrorLocation != null && editorErrorLocation.getTextLength() == 0)) {
@@ -156,11 +156,11 @@ protected PsiElement getEditorErrorLocation(final PsiElement location) {
     }
 
     private static boolean isTerminated(JSStatement statement) {
-        final PsiElement parent = statement.getParent();
+        PsiElement parent = statement.getParent();
         if (parent instanceof JSForInStatement || parent instanceof JSForStatement) {
             return true;
         }
-        final String text = statement.getText();
+        String text = statement.getText();
         if (text == null) {
             return true;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java
index f41210a2..0477f3c9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java
@@ -13,21 +13,21 @@ private FormattedTextFieldMacFix() {
 
     public static void apply(JFormattedTextField field) {
         if (isMacOs()) {
-            final Toolkit toolkit = Toolkit.getDefaultToolkit();
-            final int commandKeyMask = toolkit.getMenuShortcutKeyMask();
-            @NonNls final InputMap inputMap = field.getInputMap();
-            final KeyStroke copyKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C, commandKeyMask);
+            Toolkit toolkit = Toolkit.getDefaultToolkit();
+            int commandKeyMask = toolkit.getMenuShortcutKeyMask();
+            @NonNls InputMap inputMap = field.getInputMap();
+            KeyStroke copyKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C, commandKeyMask);
             inputMap.put(copyKeyStroke, "copy-to-clipboard");
-            final KeyStroke pasteKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V, commandKeyMask);
+            KeyStroke pasteKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V, commandKeyMask);
             inputMap.put(pasteKeyStroke, "paste-from-clipboard");
-            final KeyStroke cutKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X, commandKeyMask);
+            KeyStroke cutKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X, commandKeyMask);
             inputMap.put(cutKeyStroke, "cut-to-clipboard");
         }
     }
 
     @SuppressWarnings({"HardCodedStringLiteral"})
     private static boolean isMacOs() {
-        final String osName = System.getProperty("os.name").toLowerCase();
+        String osName = System.getProperty("os.name").toLowerCase();
         if (osName == null) {
             return false;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java
index 45e22855..71be13c1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExFormatter.java
@@ -16,7 +16,7 @@ public Object stringToValue(String text) throws ParseException {
         try {
             return Pattern.compile(text);
         }
-        catch (final PatternSyntaxException e) {
+        catch (PatternSyntaxException e) {
             throw new ParseException(e.getMessage(), e.getIndex());
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
index f587cb05..d272e0b1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/RegExInputVerifier.java
@@ -15,12 +15,12 @@ public boolean verify(JComponent input) {
     @Override
     public boolean shouldYieldFocus(JComponent input) {
         if (input instanceof JFormattedTextField ftf) {
-            final JFormattedTextField.AbstractFormatter formatter = ftf.getFormatter();
+            JFormattedTextField.AbstractFormatter formatter = ftf.getFormatter();
             if (formatter != null) {
                 try {
                     formatter.stringToValue(ftf.getText());
                 }
-                catch (final ParseException e) {
+                catch (ParseException e) {
                     SwingUtilities.invokeLater(
                         () -> Messages.showErrorDialog(e.getMessage(), InspectionJSLocalize.malformedNamingPatternAlert().get())
                     );
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
index b8ceb269..a8b30e2f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
@@ -10,14 +10,14 @@
 import org.jetbrains.annotations.NonNls;
 
 public class SingleCheckboxOptionsPanel extends JPanel {
-    public SingleCheckboxOptionsPanel(String label, final BaseInspection owner, @NonNls final String property) {
+    public SingleCheckboxOptionsPanel(String label, BaseInspection owner, @NonNls String property) {
         super(new GridBagLayout());
-        final boolean selected = getPropertyValue(owner, property);
-        final JCheckBox checkBox = new JCheckBox(label, selected);
-        final ButtonModel model = checkBox.getModel();
+        boolean selected = getPropertyValue(owner, property);
+        JCheckBox checkBox = new JCheckBox(label, selected);
+        ButtonModel model = checkBox.getModel();
         model.addChangeListener(e -> setPropertyValue(owner, property, model.isSelected()));
 
-        final GridBagConstraints constraints = new GridBagConstraints();
+        GridBagConstraints constraints = new GridBagConstraints();
         constraints.gridx = 0;
         constraints.gridy = 0;
         constraints.weightx = 1.0;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
index ae072da2..9693f3e5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
@@ -14,13 +14,13 @@
 public class SingleIntegerFieldOptionsPanel extends JPanel {
     public SingleIntegerFieldOptionsPanel(String labelString, final BaseInspection owner, @NonNls final String property) {
         super(new GridBagLayout());
-        final JLabel label = new JLabel(labelString);
-        final NumberFormat formatter = NumberFormat.getIntegerInstance();
+        JLabel label = new JLabel(labelString);
+        NumberFormat formatter = NumberFormat.getIntegerInstance();
         formatter.setParseIntegerOnly(true);
         final JFormattedTextField valueField = new JFormattedTextField(formatter);
         valueField.setValue(getPropertyValue(owner, property));
         valueField.setColumns(2);
-        final Document document = valueField.getDocument();
+        Document document = valueField.getDocument();
         document.addDocumentListener(new DocumentListener() {
             @Override
             public void changedUpdate(DocumentEvent e) {
@@ -41,7 +41,7 @@ private void textChanged() {
                 setPropertyValue(owner, property, ((Number)valueField.getValue()).intValue());
             }
         });
-        final GridBagConstraints constraints = new GridBagConstraints();
+        GridBagConstraints constraints = new GridBagConstraints();
         constraints.gridx = 0;
         constraints.gridy = 0;
         constraints.weightx = 1.0;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
index 2307b8d0..d138448b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
@@ -21,8 +21,8 @@ public static boolean isNegation(@Nonnull JSExpression exp) {
         if (!(exp instanceof JSPrefixExpression)) {
             return false;
         }
-        final JSPrefixExpression prefixExp = (JSPrefixExpression)exp;
-        final IElementType sign = prefixExp.getOperationSign();
+        JSPrefixExpression prefixExp = (JSPrefixExpression)exp;
+        IElementType sign = prefixExp.getOperationSign();
         return JSTokenTypes.EXCL.equals(sign);
     }
 
@@ -31,7 +31,7 @@ public static boolean isTrue(@Nullable JSExpression test) {
         if (test == null) {
             return false;
         }
-        @NonNls final String text = test.getText();
+        @NonNls String text = test.getText();
         return "true".equals(text);
     }
 
@@ -39,25 +39,25 @@ public static boolean isFalse(@Nullable JSExpression test) {
         if (test == null) {
             return false;
         }
-        @NonNls final String text = test.getText();
+        @NonNls String text = test.getText();
         return "false".equals(text);
     }
 
     public static String getNegatedExpressionText(@Nonnull JSExpression condition) {
         if (condition instanceof JSParenthesizedExpression) {
-            final JSExpression contentExpression = ((JSParenthesizedExpression)condition).getInnerExpression();
+            JSExpression contentExpression = ((JSParenthesizedExpression)condition).getInnerExpression();
             return '(' + getNegatedExpressionText(contentExpression) + ')';
         }
         else if (BoolUtils.isNegation(condition)) {
-            final JSExpression negated = getNegated(condition);
+            JSExpression negated = getNegated(condition);
             return negated.getText();
         }
         else if (ComparisonUtils.isComparison(condition)) {
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression)condition;
-            final IElementType sign = binaryExpression.getOperationSign();
-            final String negatedComparison = ComparisonUtils.getNegatedComparison(sign);
-            final JSExpression lhs = binaryExpression.getLOperand();
-            final JSExpression rhs = binaryExpression.getROperand();
+            JSBinaryExpression binaryExpression = (JSBinaryExpression)condition;
+            IElementType sign = binaryExpression.getOperationSign();
+            String negatedComparison = ComparisonUtils.getNegatedComparison(sign);
+            JSExpression lhs = binaryExpression.getLOperand();
+            JSExpression rhs = binaryExpression.getROperand();
             assert rhs != null;
             return lhs.getText() + negatedComparison + rhs.getText();
         }
@@ -71,8 +71,8 @@ else if (ParenthesesUtils.getPrecendence(condition) >
     }
 
     private static JSExpression getNegated(@Nonnull JSExpression exp) {
-        final JSPrefixExpression prefixExp = (JSPrefixExpression)exp;
-        final JSExpression operand = prefixExp.getExpression();
+        JSPrefixExpression prefixExp = (JSPrefixExpression)exp;
+        JSExpression operand = prefixExp.getExpression();
         return ParenthesesUtils.stripParentheses(operand);
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
index 9e48d508..8a36203d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
@@ -54,8 +54,8 @@ public static boolean isComparison(@Nullable JSExpression exp) {
         if (!(exp instanceof JSBinaryExpression)) {
             return false;
         }
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression)exp;
-        final IElementType sign = binaryExpression.getOperationSign();
+        JSBinaryExpression binaryExpression = (JSBinaryExpression)exp;
+        IElementType sign = binaryExpression.getOperationSign();
         return s_comparisonStrings.contains(sign);
     }
 
@@ -64,7 +64,7 @@ public static String getFlippedComparison(@Nonnull IElementType str) {
     }
 
     public static boolean isEqualityComparison(@Nonnull JSBinaryExpression operator) {
-        final IElementType sign = operator.getOperationSign();
+        IElementType sign = operator.getOperationSign();
         return JSTokenTypes.EQEQ.equals(sign) || JSTokenTypes.NE.equals(sign);
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
index 205e2a66..6baac9e3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
@@ -11,7 +11,7 @@ private ConditionalUtils() {
 
     public static JSStatement stripBraces(JSStatement branch) {
         if (branch instanceof JSBlockStatement block) {
-            final JSStatement[] statements = block.getStatements();
+            JSStatement[] statements = block.getStatements();
             return statements.length == 1 ? statements[0] : block;
         }
         else {
@@ -26,12 +26,12 @@ public static boolean isReturn(JSStatement statement, String value) {
         if (!(statement instanceof JSReturnStatement)) {
             return false;
         }
-        final JSReturnStatement returnStatement = (JSReturnStatement)statement;
+        JSReturnStatement returnStatement = (JSReturnStatement)statement;
         if (returnStatement.getExpression() == null) {
             return false;
         }
-        final JSExpression returnValue = returnStatement.getExpression();
-        final String returnValueText = returnValue.getText();
+        JSExpression returnValue = returnStatement.getExpression();
+        String returnValueText = returnValue.getText();
         return value.equals(returnValueText);
     }
 
@@ -42,17 +42,17 @@ public static boolean isAssignment(JSStatement statement, String value) {
         if (!(statement instanceof JSExpressionStatement)) {
             return false;
         }
-        final JSExpressionStatement expressionStatement = (JSExpressionStatement)statement;
-        final JSExpression expression = expressionStatement.getExpression();
+        JSExpressionStatement expressionStatement = (JSExpressionStatement)statement;
+        JSExpression expression = expressionStatement.getExpression();
         if (!(expression instanceof JSAssignmentExpression)) {
             return false;
         }
-        final JSAssignmentExpression assignment = (JSAssignmentExpression)expression;
-        final JSExpression rhs = assignment.getROperand();
+        JSAssignmentExpression assignment = (JSAssignmentExpression)expression;
+        JSExpression rhs = assignment.getROperand();
         if (rhs == null) {
             return false;
         }
-        final String rhsText = rhs.getText();
+        String rhsText = rhs.getText();
         return value.equals(rhsText);
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
index 27e917a3..c53eec6e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
@@ -64,23 +64,23 @@ else if (statement instanceof JSWithStatement withStatement) {
     }
 
     private static boolean withStatementMayReturnNormally(JSWithStatement jsWithStatement) {
-        final JSStatement body = jsWithStatement.getStatement();
+        JSStatement body = jsWithStatement.getStatement();
         return statementMayCompleteNormally(body);
     }
 
     private static boolean doWhileStatementMayReturnNormally(@Nonnull JSDoWhileStatement loopStatement) {
-        final JSExpression test = loopStatement.getCondition();
-        final JSStatement body = loopStatement.getBody();
+        JSExpression test = loopStatement.getCondition();
+        JSStatement body = loopStatement.getBody();
         return statementMayCompleteNormally(body) && !BoolUtils.isTrue(test) || statementIsBreakTarget(loopStatement);
     }
 
     private static boolean whileStatementMayReturnNormally(@Nonnull JSWhileStatement loopStatement) {
-        final JSExpression test = loopStatement.getCondition();
+        JSExpression test = loopStatement.getCondition();
         return !BoolUtils.isTrue(test) || statementIsBreakTarget(loopStatement);
     }
 
     private static boolean forStatementMayReturnNormally(@Nonnull JSForStatement loopStatement) {
-        final JSExpression test = loopStatement.getCondition();
+        JSExpression test = loopStatement.getCondition();
         if (statementIsBreakTarget(loopStatement)) {
             return true;
         }
@@ -98,7 +98,7 @@ private static boolean switchStatementMayReturnNormally(@Nonnull JSSwitchStateme
         if (statementIsBreakTarget(switchStatement)) {
             return true;
         }
-        final JSCaseClause[] caseClauses = switchStatement.getCaseClauses();
+        JSCaseClause[] caseClauses = switchStatement.getCaseClauses();
 
         if (caseClauses.length == 0) {
             return true;
@@ -113,8 +113,8 @@ private static boolean switchStatementMayReturnNormally(@Nonnull JSSwitchStateme
         if (!hasDefaultCase) {
             return true;
         }
-        final JSCaseClause lastClause = caseClauses[caseClauses.length - 1];
-        final JSStatement[] statements = lastClause.getStatements();
+        JSCaseClause lastClause = caseClauses[caseClauses.length - 1];
+        JSStatement[] statements = lastClause.getStatements();
         if (statements.length == 0) {
             return true;
         }
@@ -122,33 +122,33 @@ private static boolean switchStatementMayReturnNormally(@Nonnull JSSwitchStateme
     }
 
     private static boolean tryStatementMayReturnNormally(@Nonnull JSTryStatement tryStatement) {
-        final JSStatement finallyBlock = tryStatement.getFinallyStatement();
+        JSStatement finallyBlock = tryStatement.getFinallyStatement();
         if (finallyBlock != null && !statementMayCompleteNormally(finallyBlock)) {
             return false;
         }
-        final JSStatement tryBlock = tryStatement.getStatement();
+        JSStatement tryBlock = tryStatement.getStatement();
         if (statementMayCompleteNormally(tryBlock)) {
             return true;
         }
-        final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+        JSCatchBlock catchBlock = tryStatement.getCatchBlock();
         if (catchBlock == null) {
             return false;
         }
-        final JSStatement catchStatement = catchBlock.getStatement();
+        JSStatement catchStatement = catchBlock.getStatement();
         return statementMayCompleteNormally(catchStatement);
     }
 
     private static boolean ifStatementMayReturnNormally(@Nonnull JSIfStatement ifStatement) {
-        final JSStatement thenBranch = ifStatement.getThen();
+        JSStatement thenBranch = ifStatement.getThen();
         if (statementMayCompleteNormally(thenBranch)) {
             return true;
         }
-        final JSStatement elseBranch = ifStatement.getElse();
+        JSStatement elseBranch = ifStatement.getElse();
         return elseBranch == null || statementMayCompleteNormally(elseBranch);
     }
 
     private static boolean labeledStatementMayCompleteNormally(@Nonnull JSLabeledStatement labeledStatement) {
-        final JSStatement statement = labeledStatement.getStatement();
+        JSStatement statement = labeledStatement.getStatement();
         return statementMayCompleteNormally(statement) || statementIsBreakTarget(statement);
     }
 
@@ -156,8 +156,8 @@ public static boolean blockMayCompleteNormally(@Nullable JSBlockStatement block)
         if (block == null) {
             return true;
         }
-        final JSStatement[] statements = block.getStatements();
-        for (final JSStatement statement : statements) {
+        JSStatement[] statements = block.getStatements();
+        for (JSStatement statement : statements) {
             if (!statementMayCompleteNormally(statement)) {
                 return false;
             }
@@ -166,19 +166,19 @@ public static boolean blockMayCompleteNormally(@Nullable JSBlockStatement block)
     }
 
     private static boolean statementIsBreakTarget(@Nonnull JSStatement statement) {
-        final BreakFinder breakFinder = new BreakFinder(statement);
+        BreakFinder breakFinder = new BreakFinder(statement);
         statement.accept(breakFinder);
         return breakFinder.breakFound();
     }
 
     public static boolean statementContainsReturn(@Nonnull JSStatement statement) {
-        final ReturnFinder returnFinder = new ReturnFinder();
+        ReturnFinder returnFinder = new ReturnFinder();
         statement.accept(returnFinder);
         return returnFinder.returnFound();
     }
 
     public static boolean statementIsContinueTarget(@Nonnull JSStatement statement) {
-        final ContinueFinder continueFinder = new ContinueFinder(statement);
+        ContinueFinder continueFinder = new ContinueFinder(statement);
         statement.accept(continueFinder);
         return continueFinder.continueFound();
     }
@@ -193,11 +193,11 @@ public static boolean isInLoop(@Nonnull JSElement element) {
     public static boolean isInFinallyBlock(@Nonnull JSElement element) {
         JSElement currentElement = element;
         while (true) {
-            final JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
+            JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
             if (tryStatement == null) {
                 return false;
             }
-            final JSStatement finallyBlock = tryStatement.getFinallyStatement();
+            JSStatement finallyBlock = tryStatement.getFinallyStatement();
             if (finallyBlock != null) {
                 if (PsiTreeUtil.isAncestor(finallyBlock, currentElement, true)) {
                     return true;
@@ -210,13 +210,13 @@ public static boolean isInFinallyBlock(@Nonnull JSElement element) {
     public static boolean isInCatchBlock(@Nonnull JSElement element) {
         JSElement currentElement = element;
         while (true) {
-            final JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
+            JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
             if (tryStatement == null) {
                 return false;
             }
-            final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+            JSCatchBlock catchBlock = tryStatement.getCatchBlock();
             if (catchBlock != null) {
-                final JSStatement catchStatement = catchBlock.getStatement();
+                JSStatement catchStatement = catchBlock.getStatement();
                 if (PsiTreeUtil.isAncestor(catchStatement, currentElement, true)) {
                     return true;
                 }
@@ -226,44 +226,44 @@ public static boolean isInCatchBlock(@Nonnull JSElement element) {
     }
 
     private static boolean isInWhileStatementBody(@Nonnull JSElement element) {
-        final JSWhileStatement whileStatement = PsiTreeUtil.getParentOfType(element, JSWhileStatement.class);
+        JSWhileStatement whileStatement = PsiTreeUtil.getParentOfType(element, JSWhileStatement.class);
         if (whileStatement == null) {
             return false;
         }
-        final JSStatement body = whileStatement.getBody();
+        JSStatement body = whileStatement.getBody();
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
     private static boolean isInDoWhileStatementBody(@Nonnull JSElement element) {
-        final JSDoWhileStatement doWhileStatement = PsiTreeUtil.getParentOfType(element, JSDoWhileStatement.class);
+        JSDoWhileStatement doWhileStatement = PsiTreeUtil.getParentOfType(element, JSDoWhileStatement.class);
         if (doWhileStatement == null) {
             return false;
         }
-        final JSStatement body = doWhileStatement.getBody();
+        JSStatement body = doWhileStatement.getBody();
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
     private static boolean isInForStatementBody(@Nonnull JSElement element) {
-        final JSForStatement forStatement = PsiTreeUtil.getParentOfType(element, JSForStatement.class);
+        JSForStatement forStatement = PsiTreeUtil.getParentOfType(element, JSForStatement.class);
         if (forStatement == null) {
             return false;
         }
-        final JSStatement body = forStatement.getBody();
+        JSStatement body = forStatement.getBody();
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
     private static boolean isInForeachStatementBody(@Nonnull JSElement element) {
-        final JSForInStatement foreachStatement = PsiTreeUtil.getParentOfType(element, JSForInStatement.class);
+        JSForInStatement foreachStatement = PsiTreeUtil.getParentOfType(element, JSForInStatement.class);
         if (foreachStatement == null) {
             return false;
         }
-        final JSStatement body = foreachStatement.getBody();
+        JSStatement body = foreachStatement.getBody();
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
     public static JSStatement stripBraces(@Nonnull JSStatement branch) {
         if (branch instanceof JSBlockStatement block) {
-            final JSStatement[] statements = block.getStatements();
+            JSStatement[] statements = block.getStatements();
             return statements.length == 1 ? statements[0] : block;
         }
         else {
@@ -277,7 +277,7 @@ public static boolean statementCompletesWithStatement(@Nonnull JSStatement conta
             if (statementToCheck.equals(containingStatement)) {
                 return true;
             }
-            final JSElement container = getContainingStatement(statementToCheck);
+            JSElement container = getContainingStatement(statementToCheck);
             if (container == null) {
                 return false;
             }
@@ -298,7 +298,7 @@ public static boolean blockCompletesWithStatement(@Nonnull JSBlockStatement body
             if (statementToCheck == null) {
                 return false;
             }
-            final JSElement container = getContainingStatement(statementToCheck);
+            JSElement container = getContainingStatement(statementToCheck);
             if (container == null) {
                 return false;
             }
@@ -330,9 +330,9 @@ private static JSElement getContainingStatement(@Nonnull JSElement statement) {
     }
 
     private static boolean statementIsLastInBlock(@Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
-        final JSStatement[] statements = block.getStatements();
+        JSStatement[] statements = block.getStatements();
         for (int i = statements.length - 1; i >= 0; i--) {
-            final JSStatement childStatement = statements[i];
+            JSStatement childStatement = statements[i];
             if (statement.equals(childStatement)) {
                 return true;
             }
@@ -379,7 +379,7 @@ public void visitJSBreakStatement(@Nonnull JSBreakStatement breakStatement) {
                 return;
             }
             super.visitJSBreakStatement(breakStatement);
-            final JSStatement exitedStatement = breakStatement.getStatementToBreak();
+            JSStatement exitedStatement = breakStatement.getStatementToBreak();
             if (exitedStatement == null) {
                 return;
             }
@@ -408,7 +408,7 @@ public void visitJSContinueStatement(@Nonnull JSContinueStatement continueStatem
                 return;
             }
             super.visitJSContinueStatement(continueStatement);
-            final JSStatement exitedStatement = continueStatement.getStatementToContinue();
+            JSStatement exitedStatement = continueStatement.getStatementToContinue();
             if (exitedStatement == null) {
                 return;
             }
@@ -423,12 +423,12 @@ public static boolean isInExitStatement(@Nonnull JSExpression expression) {
     }
 
     private static boolean isInReturnStatementArgument(@Nonnull JSExpression expression) {
-        final JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(expression, JSReturnStatement.class);
+        JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(expression, JSReturnStatement.class);
         return returnStatement != null;
     }
 
     private static boolean isInThrowStatementArgument(@Nonnull JSExpression expression) {
-        final JSThrowStatement throwStatement = PsiTreeUtil.getParentOfType(expression, JSThrowStatement.class);
+        JSThrowStatement throwStatement = PsiTreeUtil.getParentOfType(expression, JSThrowStatement.class);
         return throwStatement != null;
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
index 68371cab..cd888afe 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
@@ -63,8 +63,8 @@ public static boolean statementsAreEquivalent(@Nullable JSStatement exp1, @Nulla
         if (exp1 == null || exp2 == null) {
             return false;
         }
-        final int type1 = getStatementType(exp1);
-        final int type2 = getStatementType(exp2);
+        int type1 = getStatementType(exp1);
+        int type2 = getStatementType(exp2);
         if (type1 != type2) {
             return false;
         }
@@ -91,19 +91,19 @@ public static boolean statementsAreEquivalent(@Nullable JSStatement exp1, @Nulla
     }
 
     private static boolean withStatementsAreEquivalent(JSWithStatement statement1, JSWithStatement statement2) {
-        final JSExpression expression1 = statement1.getExpression();
-        final JSExpression expression2 = statement2.getExpression();
+        JSExpression expression1 = statement1.getExpression();
+        JSExpression expression2 = statement2.getExpression();
         if (!expressionsAreEquivalent(expression1, expression2)) {
             return false;
         }
-        final JSStatement body1 = statement1.getStatement();
-        final JSStatement body2 = statement2.getStatement();
+        JSStatement body1 = statement1.getStatement();
+        JSStatement body2 = statement2.getStatement();
         return statementsAreEquivalent(body1, body2);
     }
 
     private static boolean varStatementsAreEquivalent(@Nonnull JSVarStatement statement1, @Nonnull JSVarStatement statement2) {
-        final JSVariable[] variables1 = statement1.getVariables();
-        final JSVariable[] variables2 = statement2.getVariables();
+        JSVariable[] variables1 = statement1.getVariables();
+        JSVariable[] variables2 = statement2.getVariables();
         if (variables1.length != variables2.length) {
             return false;
         }
@@ -116,18 +116,18 @@ private static boolean varStatementsAreEquivalent(@Nonnull JSVarStatement statem
     }
 
     private static boolean variablesAreEquivalent(@Nonnull JSVariable var1, @Nonnull JSVariable var2) {
-        final JSExpression initializer1 = var1.getInitializer();
-        final JSExpression initializer2 = var2.getInitializer();
+        JSExpression initializer1 = var1.getInitializer();
+        JSExpression initializer2 = var2.getInitializer();
         if (!expressionsAreEquivalent(initializer1, initializer2)) {
             return false;
         }
-        final JavaScriptType type1 = var1.getType();
-        final JavaScriptType type2 = var2.getType();
+        JavaScriptType type1 = var1.getType();
+        JavaScriptType type2 = var2.getType();
         if (!typesAreEquivalent(type1, type2)) {
             return false;
         }
-        final String name1 = var1.getName();
-        final String name2 = var2.getName();
+        String name1 = var1.getName();
+        String name2 = var2.getName();
         if (name1 == null) {
             return name2 == null;
         }
@@ -135,42 +135,42 @@ private static boolean variablesAreEquivalent(@Nonnull JSVariable var1, @Nonnull
     }
 
     private static boolean tryStatementsAreEquivalent(@Nonnull JSTryStatement statement1, @Nonnull JSTryStatement statement2) {
-        final JSStatement tryBlock1 = statement1.getStatement();
-        final JSStatement tryBlock2 = statement2.getStatement();
+        JSStatement tryBlock1 = statement1.getStatement();
+        JSStatement tryBlock2 = statement2.getStatement();
         if (!statementsAreEquivalent(tryBlock1, tryBlock2)) {
             return false;
         }
-        final JSStatement finallyBlock1 = statement1.getFinallyStatement();
-        final JSStatement finallyBlock2 = statement2.getFinallyStatement();
+        JSStatement finallyBlock1 = statement1.getFinallyStatement();
+        JSStatement finallyBlock2 = statement2.getFinallyStatement();
         if (!statementsAreEquivalent(finallyBlock1, finallyBlock2)) {
             return false;
         }
-        final JSCatchBlock catchBlock1 = statement1.getCatchBlock();
-        final JSCatchBlock catchBlock2 = statement2.getCatchBlock();
+        JSCatchBlock catchBlock1 = statement1.getCatchBlock();
+        JSCatchBlock catchBlock2 = statement2.getCatchBlock();
         if (catchBlock1 == null) {
             return catchBlock2 == null;
         }
         if (catchBlock2 == null) {
             return false;
         }
-        final JSParameter parameter1 = catchBlock1.getParameter();
-        final JSParameter parameter2 = catchBlock2.getParameter();
+        JSParameter parameter1 = catchBlock1.getParameter();
+        JSParameter parameter2 = catchBlock2.getParameter();
         if (!parametersAreEquivalent(parameter1, parameter2)) {
             return false;
         }
-        final JSStatement catchStatement1 = catchBlock1.getStatement();
-        final JSStatement catchStatement2 = catchBlock2.getStatement();
+        JSStatement catchStatement1 = catchBlock1.getStatement();
+        JSStatement catchStatement2 = catchBlock2.getStatement();
         return statementsAreEquivalent(catchStatement1, catchStatement2);
     }
 
     private static boolean parametersAreEquivalent(@Nonnull JSParameter parameter1, @Nonnull JSParameter parameter2) {
-        final JavaScriptType type1 = parameter1.getType();
-        final JavaScriptType type2 = parameter2.getType();
+        JavaScriptType type1 = parameter1.getType();
+        JavaScriptType type2 = parameter2.getType();
         if (!typesAreEquivalent(type1, type2)) {
             return false;
         }
-        final String name1 = parameter1.getName();
-        final String name2 = parameter2.getName();
+        String name1 = parameter1.getName();
+        String name2 = parameter2.getName();
         if (name1 == null) {
             return name2 == null;
         }
@@ -188,64 +188,64 @@ private static boolean typesAreEquivalent(@Nullable JavaScriptType type1, @Nulla
     }
 
     private static boolean whileStatementsAreEquivalent(@Nonnull JSWhileStatement statement1, @Nonnull JSWhileStatement statement2) {
-        final JSExpression condition1 = statement1.getCondition();
-        final JSExpression condition2 = statement2.getCondition();
-        final JSStatement body1 = statement1.getBody();
-        final JSStatement body2 = statement2.getBody();
+        JSExpression condition1 = statement1.getCondition();
+        JSExpression condition2 = statement2.getCondition();
+        JSStatement body1 = statement1.getBody();
+        JSStatement body2 = statement2.getBody();
         return expressionsAreEquivalent(condition1, condition2) && statementsAreEquivalent(body1, body2);
     }
 
     private static boolean forStatementsAreEquivalent(@Nonnull JSForStatement statement1, @Nonnull JSForStatement statement2) {
-        final JSExpression condition1 = statement1.getCondition();
-        final JSExpression condition2 = statement2.getCondition();
+        JSExpression condition1 = statement1.getCondition();
+        JSExpression condition2 = statement2.getCondition();
         if (!expressionsAreEquivalent(condition1, condition2)) {
             return false;
         }
-        final JSExpression initialization1 = statement1.getInitialization();
-        final JSExpression initialization2 = statement2.getInitialization();
+        JSExpression initialization1 = statement1.getInitialization();
+        JSExpression initialization2 = statement2.getInitialization();
         if (!expressionsAreEquivalent(initialization1, initialization2)) {
             return false;
         }
-        final JSExpression update1 = statement1.getUpdate();
-        final JSExpression update2 = statement2.getUpdate();
+        JSExpression update1 = statement1.getUpdate();
+        JSExpression update2 = statement2.getUpdate();
         if (!expressionsAreEquivalent(update1, update2)) {
             return false;
         }
-        final JSStatement body1 = statement1.getBody();
-        final JSStatement body2 = statement2.getBody();
+        JSStatement body1 = statement1.getBody();
+        JSStatement body2 = statement2.getBody();
         return statementsAreEquivalent(body1, body2);
     }
 
     private static boolean forInStatementsAreEquivalent(@Nonnull JSForInStatement statement1, @Nonnull JSForInStatement statement2) {
-        final JSExpression value1 = statement1.getCollectionExpression();
-        final JSExpression value2 = statement2.getCollectionExpression();
+        JSExpression value1 = statement1.getCollectionExpression();
+        JSExpression value2 = statement2.getCollectionExpression();
         if (!expressionsAreEquivalent(value1, value2)) {
             return false;
         }
-        final JSVarStatement parameter1 = statement1.getDeclarationStatement();
-        final JSVarStatement parameter2 = statement1.getDeclarationStatement();
+        JSVarStatement parameter1 = statement1.getDeclarationStatement();
+        JSVarStatement parameter2 = statement1.getDeclarationStatement();
         if (statementsAreEquivalent(parameter1, parameter2)) {
             return false;
         }
-        final JSStatement body1 = statement1.getBody();
-        final JSStatement body2 = statement2.getBody();
+        JSStatement body1 = statement1.getBody();
+        JSStatement body2 = statement2.getBody();
         return statementsAreEquivalent(body1, body2);
     }
 
     private static boolean switchStatementsAreEquivalent(@Nonnull JSSwitchStatement statement1, @Nonnull JSSwitchStatement statement2) {
-        final JSExpression switchExpression1 = statement1.getSwitchExpression();
-        final JSExpression swithcExpression2 = statement2.getSwitchExpression();
+        JSExpression switchExpression1 = statement1.getSwitchExpression();
+        JSExpression swithcExpression2 = statement2.getSwitchExpression();
         if (!expressionsAreEquivalent(switchExpression1, swithcExpression2)) {
             return false;
         }
-        final JSCaseClause[] clauses1 = statement1.getCaseClauses();
-        final JSCaseClause[] clauses2 = statement2.getCaseClauses();
+        JSCaseClause[] clauses1 = statement1.getCaseClauses();
+        JSCaseClause[] clauses2 = statement2.getCaseClauses();
         if (clauses1.length != clauses2.length) {
             return false;
         }
         for (int i = 0; i < clauses1.length; i++) {
-            final JSCaseClause clause1 = clauses1[i];
-            final JSCaseClause clause2 = clauses2[i];
+            JSCaseClause clause1 = clauses1[i];
+            JSCaseClause clause2 = clauses2[i];
             if (!caseClausesAreEquivalent(clause1, clause2)) {
                 return false;
             }
@@ -257,13 +257,13 @@ private static boolean caseClausesAreEquivalent(JSCaseClause clause1, JSCaseClau
         if (clause1.isDefault() != clause2.isDefault()) {
             return false;
         }
-        final JSExpression exp1 = clause1.getCaseExpression();
-        final JSExpression exp2 = clause2.getCaseExpression();
+        JSExpression exp1 = clause1.getCaseExpression();
+        JSExpression exp2 = clause2.getCaseExpression();
         if (!expressionsAreEquivalent(exp1, exp2)) {
             return false;
         }
-        final JSStatement[] statements1 = clause1.getStatements();
-        final JSStatement[] statements2 = clause2.getStatements();
+        JSStatement[] statements1 = clause1.getStatements();
+        JSStatement[] statements2 = clause2.getStatements();
         if (statements1.length != statements2.length) {
             return false;
         }
@@ -276,16 +276,16 @@ private static boolean caseClausesAreEquivalent(JSCaseClause clause1, JSCaseClau
     }
 
     private static boolean doWhileStatementsAreEquivalent(@Nonnull JSDoWhileStatement statement1, @Nonnull JSDoWhileStatement statement2) {
-        final JSExpression condition1 = statement1.getCondition();
-        final JSExpression condition2 = statement2.getCondition();
-        final JSStatement body1 = statement1.getBody();
-        final JSStatement body2 = statement2.getBody();
+        JSExpression condition1 = statement1.getCondition();
+        JSExpression condition2 = statement2.getCondition();
+        JSStatement body1 = statement1.getBody();
+        JSStatement body2 = statement2.getBody();
         return expressionsAreEquivalent(condition1, condition2) && statementsAreEquivalent(body1, body2);
     }
 
     private static boolean blockStatementsAreEquivalent(@Nonnull JSBlockStatement statement1, @Nonnull JSBlockStatement statement2) {
-        final JSStatement[] statements1 = statement1.getStatements();
-        final JSStatement[] statements2 = statement2.getStatements();
+        JSStatement[] statements1 = statement1.getStatements();
+        JSStatement[] statements2 = statement2.getStatements();
         if (statements1.length != statements2.length) {
             return false;
         }
@@ -298,8 +298,8 @@ private static boolean blockStatementsAreEquivalent(@Nonnull JSBlockStatement st
     }
 
     private static boolean breakStatementsAreEquivalent(@Nonnull JSBreakStatement statement1, @Nonnull JSBreakStatement statement2) {
-        final String identifier1 = statement1.getLabel();
-        final String identifier2 = statement2.getLabel();
+        String identifier1 = statement1.getLabel();
+        String identifier2 = statement2.getLabel();
         if (identifier1 == null) {
             return identifier2 == null;
         }
@@ -313,8 +313,8 @@ private static boolean continueStatementsAreEquivalent(
         @Nonnull JSContinueStatement statement1,
         @Nonnull JSContinueStatement statement2
     ) {
-        final String identifier1 = statement1.getLabel();
-        final String identifier2 = statement2.getLabel();
+        String identifier1 = statement1.getLabel();
+        String identifier2 = statement2.getLabel();
         if (identifier1 == null) {
             return identifier2 == null;
         }
@@ -325,26 +325,26 @@ private static boolean continueStatementsAreEquivalent(
     }
 
     private static boolean labeledStatementsAreEquivalent(@Nonnull JSLabeledStatement statement1, @Nonnull JSLabeledStatement statement2) {
-        final PsiElement identifier1 = statement1.getLabelIdentifier();
-        final PsiElement identifier2 = statement2.getLabelIdentifier();
+        PsiElement identifier1 = statement1.getLabelIdentifier();
+        PsiElement identifier2 = statement2.getLabelIdentifier();
         if (identifier1 == null) {
             return identifier2 == null;
         }
         if (identifier2 == null) {
             return false;
         }
-        final String text1 = identifier1.getText();
-        final String text2 = identifier2.getText();
+        String text1 = identifier1.getText();
+        String text2 = identifier2.getText();
         return text1.equals(text2);
     }
 
     private static boolean ifStatementsAreEquivalent(@Nonnull JSIfStatement statement1, @Nonnull JSIfStatement statement2) {
-        final JSExpression condition1 = statement1.getCondition();
-        final JSExpression condition2 = statement2.getCondition();
-        final JSStatement thenBranch1 = statement1.getThen();
-        final JSStatement thenBranch2 = statement2.getThen();
-        final JSStatement elseBranch1 = statement1.getElse();
-        final JSStatement elseBranch2 = statement2.getElse();
+        JSExpression condition1 = statement1.getCondition();
+        JSExpression condition2 = statement2.getCondition();
+        JSStatement thenBranch1 = statement1.getThen();
+        JSStatement thenBranch2 = statement2.getThen();
+        JSStatement elseBranch1 = statement1.getElse();
+        JSStatement elseBranch2 = statement2.getElse();
         return expressionsAreEquivalent(condition1, condition2)
             && statementsAreEquivalent(thenBranch1, thenBranch2)
             && statementsAreEquivalent(elseBranch1, elseBranch2);
@@ -354,20 +354,20 @@ private static boolean expressionStatementsAreEquivalent(
         @Nonnull JSExpressionStatement statement1,
         @Nonnull JSExpressionStatement statement2
     ) {
-        final JSExpression expression1 = statement1.getExpression();
-        final JSExpression expression2 = statement2.getExpression();
+        JSExpression expression1 = statement1.getExpression();
+        JSExpression expression2 = statement2.getExpression();
         return expressionsAreEquivalent(expression1, expression2);
     }
 
     private static boolean returnStatementsAreEquivalent(@Nonnull JSReturnStatement statement1, @Nonnull JSReturnStatement statement2) {
-        final JSExpression returnValue1 = statement1.getExpression();
-        final JSExpression returnValue2 = statement2.getExpression();
+        JSExpression returnValue1 = statement1.getExpression();
+        JSExpression returnValue2 = statement2.getExpression();
         return expressionsAreEquivalent(returnValue1, returnValue2);
     }
 
     private static boolean throwStatementsAreEquivalent(@Nonnull JSThrowStatement statement1, @Nonnull JSThrowStatement statement2) {
-        final JSExpression exception1 = statement1.getExpression();
-        final JSExpression exception2 = statement2.getExpression();
+        JSExpression exception1 = statement1.getExpression();
+        JSExpression exception2 = statement2.getExpression();
         return expressionsAreEquivalent(exception1, exception2);
     }
 
@@ -386,8 +386,8 @@ public static boolean expressionsAreEquivalent(@Nullable JSExpression exp1, @Nul
         while (expToCompare2 instanceof JSParenthesizedExpression parenExp2) {
             expToCompare2 = parenExp2.getInnerExpression();
         }
-        final int type1 = getExpressionType(expToCompare1);
-        final int type2 = getExpressionType(expToCompare2);
+        int type1 = getExpressionType(expToCompare1);
+        int type2 = getExpressionType(expToCompare2);
         if (type1 != type2) {
             return false;
         }
@@ -439,19 +439,19 @@ private static boolean functionExpressionsAreEquivalent(JSFunctionExpression exp
     }
 
     private static boolean objectLiteralExpressionsAreEquivalent(JSObjectLiteralExpression exp1, JSObjectLiteralExpression exp2) {
-        final JSProperty[] properties1 = exp1.getProperties();
-        final JSProperty[] properties2 = exp2.getProperties();
+        JSProperty[] properties1 = exp1.getProperties();
+        JSProperty[] properties2 = exp2.getProperties();
         if (properties1.length != properties2.length) {
             return false;
         }
         for (int i = 0; i < properties2.length; i++) {
-            final JSProperty property1 = properties1[i];
-            final JSProperty property2 = properties2[i];
+            JSProperty property1 = properties1[i];
+            JSProperty property2 = properties2[i];
             if (!property2.getName().equals(property1.getName())) {
                 return false;
             }
-            final JSExpression value1 = property1.getValue();
-            final JSExpression value2 = property2.getValue();
+            JSExpression value1 = property1.getValue();
+            JSExpression value2 = property2.getValue();
             if (!expressionsAreEquivalent(value1, value2)) {
                 return false;
             }
@@ -463,13 +463,13 @@ private static boolean indexedAccessExpressionsAreEquivalent(
         JSIndexedPropertyAccessExpression exp1,
         JSIndexedPropertyAccessExpression exp2
     ) {
-        final JSExpression index1 = exp1.getIndexExpression();
-        final JSExpression index2 = exp2.getIndexExpression();
+        JSExpression index1 = exp1.getIndexExpression();
+        JSExpression index2 = exp2.getIndexExpression();
         if (!expressionsAreEquivalent(index1, index2)) {
             return false;
         }
-        final JSExpression qualifier1 = exp1.getQualifier();
-        final JSExpression qualifier2 = exp2.getQualifier();
+        JSExpression qualifier1 = exp1.getQualifier();
+        JSExpression qualifier2 = exp2.getQualifier();
         return expressionsAreEquivalent(qualifier1, qualifier2);
     }
 
@@ -477,8 +477,8 @@ private static boolean methodCallExpressionsAreEquivalent(
         @Nonnull JSCallExpression methodExp1,
         @Nonnull JSCallExpression methodExp2
     ) {
-        final JSExpression methodExpression1;
-        final JSExpression methodExpression2;
+        JSExpression methodExpression1;
+        JSExpression methodExpression2;
         try {
             methodExpression1 = methodExp1.getMethodExpression();
             methodExpression2 = methodExp2.getMethodExpression();
@@ -489,35 +489,35 @@ private static boolean methodCallExpressionsAreEquivalent(
         if (!expressionsAreEquivalent(methodExpression1, methodExpression2)) {
             return false;
         }
-        final JSArgumentList argumentList1 = methodExp1.getArgumentList();
+        JSArgumentList argumentList1 = methodExp1.getArgumentList();
         if (argumentList1 == null) {
             return false;
         }
-        final JSExpression[] args1 = argumentList1.getArguments();
-        final JSArgumentList argumentList2 = methodExp2.getArgumentList();
+        JSExpression[] args1 = argumentList1.getArguments();
+        JSArgumentList argumentList2 = methodExp2.getArgumentList();
         if (argumentList2 == null) {
             return false;
         }
-        final JSExpression[] args2 = argumentList2.getArguments();
+        JSExpression[] args2 = argumentList2.getArguments();
         return expressionListsAreEquivalent(args1, args2);
     }
 
     private static boolean newExpressionsAreEquivalent(@Nonnull JSNewExpression newExp1, @Nonnull JSNewExpression newExp2) {
-        final JSExpression methodExpression1 = newExp1.getMethodExpression();
-        final JSExpression methodExpression2 = newExp2.getMethodExpression();
+        JSExpression methodExpression1 = newExp1.getMethodExpression();
+        JSExpression methodExpression2 = newExp2.getMethodExpression();
         if (!expressionsAreEquivalent(methodExpression1, methodExpression2)) {
             return false;
         }
-        final JSArgumentList argumentList1 = newExp1.getArgumentList();
+        JSArgumentList argumentList1 = newExp1.getArgumentList();
         if (argumentList1 == null) {
             return false;
         }
-        final JSExpression[] args1 = argumentList1.getArguments();
-        final JSArgumentList argumentList2 = newExp1.getArgumentList();
+        JSExpression[] args1 = argumentList1.getArguments();
+        JSArgumentList argumentList2 = newExp1.getArgumentList();
         if (argumentList2 == null) {
             return false;
         }
-        final JSExpression[] args2 = argumentList2.getArguments();
+        JSExpression[] args2 = argumentList2.getArguments();
         return expressionListsAreEquivalent(args1, args2);
     }
 
@@ -525,8 +525,8 @@ private static boolean arrayInitializerExpressionsAreEquivalent(
         @Nonnull JSArrayLiteralExpression arrInitExp1,
         @Nonnull JSArrayLiteralExpression arrInitExp2
     ) {
-        final JSExpression[] initializers1 = arrInitExp1.getExpressions();
-        final JSExpression[] initializers2 = arrInitExp2.getExpressions();
+        JSExpression[] initializers1 = arrInitExp1.getExpressions();
+        JSExpression[] initializers2 = arrInitExp2.getExpressions();
         return expressionListsAreEquivalent(initializers1, initializers2);
     }
 
@@ -534,16 +534,16 @@ private static boolean prefixExpressionsAreEquivalent(
         @Nonnull JSPrefixExpression prefixExp1,
         @Nonnull JSPrefixExpression prefixExp2
     ) {
-        final IElementType sign1 = prefixExp1.getOperationSign();
-        final IElementType sign2 = prefixExp2.getOperationSign();
+        IElementType sign1 = prefixExp1.getOperationSign();
+        IElementType sign2 = prefixExp2.getOperationSign();
         if (sign1 == null) {
             return sign1 == sign2;
         }
         if (!sign1.equals(sign2)) {
             return false;
         }
-        final JSExpression operand1 = prefixExp1.getExpression();
-        final JSExpression operand2 = prefixExp2.getExpression();
+        JSExpression operand1 = prefixExp1.getExpression();
+        JSExpression operand2 = prefixExp2.getExpression();
         return expressionsAreEquivalent(operand1, operand2);
     }
 
@@ -551,26 +551,26 @@ private static boolean postfixExpressionsAreEquivalent(
         @Nonnull JSPostfixExpression postfixExp1,
         @Nonnull JSPostfixExpression postfixExp2
     ) {
-        final IElementType sign1 = postfixExp1.getOperationSign();
-        final IElementType sign2 = postfixExp2.getOperationSign();
+        IElementType sign1 = postfixExp1.getOperationSign();
+        IElementType sign2 = postfixExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
             return false;
         }
-        final JSExpression operand1 = postfixExp1.getExpression();
-        final JSExpression operand2 = postfixExp2.getExpression();
+        JSExpression operand1 = postfixExp1.getExpression();
+        JSExpression operand2 = postfixExp2.getExpression();
         return expressionsAreEquivalent(operand1, operand2);
     }
 
     private static boolean binaryExpressionsAreEquivalent(@Nonnull JSBinaryExpression binaryExp1, @Nonnull JSBinaryExpression binaryExp2) {
-        final IElementType sign1 = binaryExp1.getOperationSign();
-        final IElementType sign2 = binaryExp2.getOperationSign();
+        IElementType sign1 = binaryExp1.getOperationSign();
+        IElementType sign2 = binaryExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
             return false;
         }
-        final JSExpression lhs1 = binaryExp1.getLOperand();
-        final JSExpression lhs2 = binaryExp2.getLOperand();
-        final JSExpression rhs1 = binaryExp1.getROperand();
-        final JSExpression rhs2 = binaryExp2.getROperand();
+        JSExpression lhs1 = binaryExp1.getLOperand();
+        JSExpression lhs2 = binaryExp2.getLOperand();
+        JSExpression rhs1 = binaryExp1.getROperand();
+        JSExpression rhs2 = binaryExp2.getROperand();
         return expressionsAreEquivalent(lhs1, lhs2) && expressionsAreEquivalent(rhs1, rhs2);
     }
 
@@ -578,15 +578,15 @@ private static boolean assignmentExpressionsAreEquivalent(
         @Nonnull JSAssignmentExpression assignExp1,
         @Nonnull JSAssignmentExpression assignExp2
     ) {
-        final IElementType sign1 = assignExp1.getOperationSign();
-        final IElementType sign2 = assignExp2.getOperationSign();
+        IElementType sign1 = assignExp1.getOperationSign();
+        IElementType sign2 = assignExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
             return false;
         }
-        final JSExpression lhs1 = assignExp1.getLOperand();
-        final JSExpression lhs2 = assignExp2.getLOperand();
-        final JSExpression rhs1 = assignExp1.getROperand();
-        final JSExpression rhs2 = assignExp2.getROperand();
+        JSExpression lhs1 = assignExp1.getLOperand();
+        JSExpression lhs2 = assignExp2.getLOperand();
+        JSExpression rhs1 = assignExp1.getROperand();
+        JSExpression rhs2 = assignExp2.getROperand();
         return expressionsAreEquivalent(lhs1, lhs2)
             && expressionsAreEquivalent(rhs1, rhs2);
     }
@@ -595,12 +595,12 @@ private static boolean conditionalExpressionsAreEquivalent(
         @Nonnull JSConditionalExpression condExp1,
         @Nonnull JSConditionalExpression condExp2
     ) {
-        final JSExpression condition1 = condExp1.getCondition();
-        final JSExpression condition2 = condExp2.getCondition();
-        final JSExpression thenExpression1 = condExp1.getThen();
-        final JSExpression thenExpression2 = condExp2.getThen();
-        final JSExpression elseExpression1 = condExp1.getElse();
-        final JSExpression elseExpression2 = condExp2.getElse();
+        JSExpression condition1 = condExp1.getCondition();
+        JSExpression condition2 = condExp2.getCondition();
+        JSExpression thenExpression1 = condExp1.getThen();
+        JSExpression thenExpression2 = condExp2.getThen();
+        JSExpression elseExpression1 = condExp1.getElse();
+        JSExpression elseExpression2 = condExp2.getElse();
         return expressionsAreEquivalent(condition1, condition2)
             && expressionsAreEquivalent(thenExpression1, thenExpression2)
             && expressionsAreEquivalent(elseExpression1, elseExpression2);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
index d95fa2d0..5c6100f9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
@@ -17,7 +17,7 @@ public static boolean isConstantExpression(JSExpression expression) {
         if (expression == null) {
             return false;
         }
-        final IsConstantExpressionVisitor visitor = new IsConstantExpressionVisitor();
+        IsConstantExpressionVisitor visitor = new IsConstantExpressionVisitor();
         expression.accept(visitor);
         return visitor.isConstant;
     }
@@ -42,7 +42,7 @@ public void visitJSLiteralExpression(JSSimpleLiteralExpression expression) {
 
         @Override
         public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
-            final JSExpression expr = expression.getInnerExpression();
+            JSExpression expr = expression.getInnerExpression();
             if (expr != null) {
                 expr.accept(this);
             }
@@ -50,7 +50,7 @@ public void visitJSParenthesizedExpression(JSParenthesizedExpression expression)
 
         @Override
         public void visitJSPrefixExpression(JSPrefixExpression expression) {
-            final JSExpression operand = expression.getExpression();
+            JSExpression operand = expression.getExpression();
             if (operand == null) {
                 isConstant = false;
                 return;
@@ -61,7 +61,7 @@ public void visitJSPrefixExpression(JSPrefixExpression expression) {
                 return;
             }
 
-            final IElementType opType = expression.getOperationSign();
+            IElementType opType = expression.getOperationSign();
 
             if (JSTokenTypes.PLUS.equals(opType)
                 || JSTokenTypes.MINUS.equals(opType)
@@ -78,7 +78,7 @@ public void visitJSBinaryExpression(JSBinaryExpression expression) {
             if (!isConstant) {
                 return;
             }
-            final JSExpression rOperand = expression.getROperand();
+            JSExpression rOperand = expression.getROperand();
             if (rOperand != null) {
                 rOperand.accept(this);
             }
@@ -86,8 +86,8 @@ public void visitJSBinaryExpression(JSBinaryExpression expression) {
 
         @Override
         public void visitJSConditionalExpression(JSConditionalExpression expression) {
-            final JSExpression thenExpr = expression.getThen();
-            final JSExpression elseExpr = expression.getElse();
+            JSExpression thenExpr = expression.getThen();
+            JSExpression elseExpr = expression.getElse();
             if (thenExpr == null || elseExpr == null) {
                 isConstant = false;
                 return;
@@ -106,15 +106,15 @@ public void visitJSConditionalExpression(JSConditionalExpression expression) {
 
         @Override
         public void visitJSReferenceExpression(JSReferenceExpression expression) {
-            final JSElement refElement = (JSElement)expression.resolve();
+            JSElement refElement = (JSElement)expression.resolve();
 
             if (!(refElement instanceof JSVariable)) {
                 isConstant = false;
                 return;
             }
 
-            final JSVariable variable = (JSVariable)refElement;
-            final Boolean isConst = isVariableConstant.get(variable);
+            JSVariable variable = (JSVariable)refElement;
+            Boolean isConst = isVariableConstant.get(variable);
 
             if (isConst != null) {
                 isConstant &= isConst;
@@ -127,7 +127,7 @@ public void visitJSReferenceExpression(JSReferenceExpression expression) {
                 return;
             }
 
-            final JSExpression initializer = variable.getInitializer();
+            JSExpression initializer = variable.getInitializer();
 
             initializer.accept(this);
             isVariableConstant.put(variable, isConstant);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
index 6c870274..ea4ae5d3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ParenthesesUtils.java
@@ -87,7 +87,7 @@ public static int getPrecendence(JSExpression exp) {
             return POSTFIX_PRECEDENCE;
         }
         if (exp instanceof JSBinaryExpression && !(exp instanceof JSAssignmentExpression)) {
-            final IElementType sign = ((JSBinaryExpression)exp)
+            IElementType sign = ((JSBinaryExpression)exp)
                 .getOperationSign();
             return precedenceForBinaryOperator(sign);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
index 18295993..b1ed42c3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
@@ -13,7 +13,7 @@ private SideEffectChecker() {
     }
 
     public static boolean mayHaveSideEffects(@Nonnull JSExpression exp) {
-        final SideEffectsVisitor visitJSor = new SideEffectsVisitor();
+        SideEffectsVisitor visitJSor = new SideEffectsVisitor();
         exp.accept(visitJSor);
         return visitJSor.mayHaveSideEffects();
     }
@@ -61,7 +61,7 @@ public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
                 return;
             }
             super.visitJSPostfixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (JSTokenTypes.PLUSPLUS.equals(sign) ||
                 JSTokenTypes.MINUSMINUS.equals(sign)) {
                 mayHaveSideEffects = true;
@@ -74,7 +74,7 @@ public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
                 return;
             }
             super.visitJSPrefixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
             if (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign)) {
                 mayHaveSideEffects = true;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java
index c6cce4e1..7ae11b65 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/StatementUtils.java
@@ -14,7 +14,7 @@ public static boolean isEmpty(JSStatement body) {
             return true;
         }
         else if (body instanceof JSBlockStatement block) {
-            final JSStatement[] statements = block.getStatements();
+            JSStatement[] statements = block.getStatements();
             return statements == null || statements.length == 0;
         }
         return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index 62b68f07..6fa43149 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -56,7 +56,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @RequiredReadAction
         public void visitJSExpressionStatement(JSExpressionStatement jsExpressionStatement) {
             super.visitJSExpressionStatement(jsExpressionStatement);
-            final JSExpression expression = jsExpressionStatement.getExpression();
+            JSExpression expression = jsExpressionStatement.getExpression();
             if (isNotPointless(expression) || jsExpressionStatement.getParent() instanceof ES6ExportDefaultAssignment) {
                 return;
             }
@@ -73,7 +73,7 @@ public void visitJSExpressionStatement(JSExpressionStatement jsExpressionStateme
             registerError(jsExpressionStatement);
         }
 
-        private boolean isNotPointless(final JSExpression expression) {
+        private boolean isNotPointless(JSExpression expression) {
             if (expression instanceof JSCallExpression) {
                 return true;
             }
@@ -82,14 +82,14 @@ private boolean isNotPointless(final JSExpression expression) {
             }
 
             if (expression instanceof JSPrefixExpression) {
-                final JSPrefixExpression prefix = (JSPrefixExpression)expression;
-                final IElementType sign = prefix.getOperationSign();
+                JSPrefixExpression prefix = (JSPrefixExpression)expression;
+                IElementType sign = prefix.getOperationSign();
                 if (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign)) {
                     return true;
                 }
-                final PsiElement signElement = expression.getFirstChild();
+                PsiElement signElement = expression.getFirstChild();
                 if (signElement != null) {
-                    @NonNls final String text = signElement.getText();
+                    @NonNls String text = signElement.getText();
                     if ("delete".equals(text)) {
                         return true;
                     }
@@ -103,19 +103,19 @@ private boolean isNotPointless(final JSExpression expression) {
                 }
             }
             if (expression instanceof JSPostfixExpression) {
-                final JSPostfixExpression prefix = (JSPostfixExpression)expression;
-                final IElementType sign = prefix.getOperationSign();
+                JSPostfixExpression prefix = (JSPostfixExpression)expression;
+                IElementType sign = prefix.getOperationSign();
                 if (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign)) {
                     return true;
                 }
             }
 
             if (expression instanceof JSBinaryExpression) {
-                final JSBinaryExpression binary = (JSBinaryExpression)expression;
-                final IElementType sign = binary.getOperationSign();
+                JSBinaryExpression binary = (JSBinaryExpression)expression;
+                IElementType sign = binary.getOperationSign();
 
                 if (sign == JSTokenTypes.ANDAND || sign == JSTokenTypes.OROR) {
-                    final JSExpression leftOp = binary.getLOperand();
+                    JSExpression leftOp = binary.getLOperand();
 
                     if ((leftOp instanceof JSReferenceExpression || leftOp instanceof JSIndexedPropertyAccessExpression)
                         && isNotPointless(binary.getROperand())) {
@@ -134,9 +134,9 @@ else if (sign == JSTokenTypes.COMMA) {
             if (expression instanceof JSReferenceExpression referenceExpression) {
                 if (expression.getParent().getParent() instanceof JSClass
                     || PsiTreeUtil.getParentOfType(expression, PsiFile.class).getContext() != null) {
-                    final ResolveResult[] results = referenceExpression.multiResolve(false);
+                    ResolveResult[] results = referenceExpression.multiResolve(false);
                     if (results.length > 0) {
-                        final PsiElement element = results[0].getElement();
+                        PsiElement element = results[0].getElement();
                         if (element instanceof JSClass || element instanceof JSFunction) {
                             return true; // class A { import B; B; } // x = "foo"
                         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
index e7c3e8fc..723ba1a6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
@@ -49,12 +49,12 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSExpressionStatement(JSExpressionStatement jsExpressionStatement) {
             super.visitJSExpressionStatement(jsExpressionStatement);
-            final JSExpression expression = jsExpressionStatement.getExpression();
+            JSExpression expression = jsExpressionStatement.getExpression();
 
             if (!(expression instanceof JSReferenceExpression)) {
                 return;
             }
-            @NonNls final String text = expression.getText();
+            @NonNls String text = expression.getText();
             if (!"debugger".equals(text)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index c85057e6..f70a5825 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -52,26 +52,26 @@ private static class Visitor extends BaseInspectionVisitor {
         public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
 
-            final Set<JSExpression> conditions = new HashSet<>();
+            Set<JSExpression> conditions = new HashSet<>();
             collectCaseLabels(statement, conditions);
-            final int numConditions = conditions.size();
+            int numConditions = conditions.size();
             if (numConditions < 2) {
                 return;
             }
-            final JSExpression[] conditionArray = conditions.toArray(new JSExpression[numConditions]);
-            final boolean[] matched = new boolean[conditionArray.length];
+            JSExpression[] conditionArray = conditions.toArray(new JSExpression[numConditions]);
+            boolean[] matched = new boolean[conditionArray.length];
             Arrays.fill(matched, false);
             for (int i = 0; i < conditionArray.length; i++) {
                 if (matched[i]) {
                     continue;
                 }
-                final JSExpression condition = conditionArray[i];
+                JSExpression condition = conditionArray[i];
                 for (int j = i + 1; j < conditionArray.length; j++) {
                     if (matched[j]) {
                         continue;
                     }
-                    final JSExpression testCondition = conditionArray[j];
-                    final boolean areEquivalent = EquivalenceChecker.expressionsAreEquivalent(condition, testCondition);
+                    JSExpression testCondition = conditionArray[j];
+                    boolean areEquivalent = EquivalenceChecker.expressionsAreEquivalent(condition, testCondition);
                     if (areEquivalent) {
                         registerError(testCondition);
                         if (!matched[i]) {
@@ -83,7 +83,7 @@ public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
                 }
             }
             int numDefaults = 0;
-            final JSCaseClause[] clauses = statement.getCaseClauses();
+            JSCaseClause[] clauses = statement.getCaseClauses();
             for (JSCaseClause clause : clauses) {
                 if (clause.isDefault()) {
                     numDefaults++;
@@ -99,10 +99,10 @@ public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
         }
 
         private static void collectCaseLabels(JSSwitchStatement statement, Set<JSExpression> conditions) {
-            final JSCaseClause[] clauses = statement.getCaseClauses();
+            JSCaseClause[] clauses = statement.getCaseClauses();
             for (JSCaseClause clause : clauses) {
                 if (!clause.isDefault()) {
-                    final JSExpression caseExpression = clause.getCaseExpression();
+                    JSExpression caseExpression = clause.getCaseExpression();
                     if (caseExpression != null) {
                         conditions.add(caseExpression);
                     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index 08d23291..4b856f74 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -42,21 +42,21 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSObjectLiteralExpression(JSObjectLiteralExpression jsObjectLiteralExpression) {
             super.visitJSObjectLiteralExpression(jsObjectLiteralExpression);
-            final JSProperty[] properties = jsObjectLiteralExpression.getProperties();
-            final boolean[] matched = new boolean[properties.length];
+            JSProperty[] properties = jsObjectLiteralExpression.getProperties();
+            boolean[] matched = new boolean[properties.length];
             Arrays.fill(matched, false);
             for (int i = 0; i < properties.length; i++) {
                 if (matched[i]) {
                     continue;
                 }
-                final JSProperty property1 = properties[i];
+                JSProperty property1 = properties[i];
                 for (int j = i + 1; j < properties.length; j++) {
                     if (matched[j]) {
                         continue;
                     }
-                    final JSProperty property2 = properties[j];
-                    final String property1Name = property1.getName();
-                    final String property2Name = property2.getName();
+                    JSProperty property2 = properties[j];
+                    String property1Name = property1.getName();
+                    String property2Name = property2.getName();
                     if (property1Name != null && property2Name != null &&
                         property1Name.equals(property2Name)) {
                         registerError(property2.getFirstChild());
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index 573c9165..5ea1c207 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -40,7 +40,7 @@ public boolean isEnabledByDefault() {
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
-        final JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
+        JSFunction function = (JSFunction)((PsiElement)args[0]).getParent();
         assert function != null;
         return functionHasIdentifier(function)
             ? InspectionJSLocalize.functionHasInconsistentReturnPointsErrorString().get()
@@ -88,19 +88,19 @@ public void visitJSFunctionExpression(JSFunctionExpression node) {
     }
 
     private static boolean functionHasReturnValues(JSFunction function) {
-        final ReturnValuesVisitor visitor = new ReturnValuesVisitor(function);
+        ReturnValuesVisitor visitor = new ReturnValuesVisitor(function);
         function.accept(visitor);
         return visitor.hasReturnValues();
     }
 
     private static boolean functionHasValuelessReturns(JSFunction function) {
-        final PsiElement lastChild = function.getLastChild();
+        PsiElement lastChild = function.getLastChild();
         if (lastChild instanceof JSBlockStatement) {
             if (ControlFlowUtils.statementMayCompleteNormally((JSStatement)lastChild)) {
                 return true;
             }
         }
-        final ValuelessReturnVisitor visitor = new ValuelessReturnVisitor(function);
+        ValuelessReturnVisitor visitor = new ValuelessReturnVisitor(function);
         function.acceptChildren(visitor);
         return visitor.hasValuelessReturns();
     }
@@ -117,7 +117,7 @@ private static class ReturnValuesVisitor extends JSRecursiveElementVisitor {
         public void visitJSReturnStatement(JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
             if (statement.getExpression() != null) {
-                final JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
+                JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
                 if (function.equals(containingFunction)) {
                     hasReturnValues = true;
                 }
@@ -141,7 +141,7 @@ private static class ValuelessReturnVisitor extends JSRecursiveElementVisitor {
         public void visitJSReturnStatement(JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
             if (statement.getExpression() == null) {
-                final JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
+                JSFunction containingFunction = PsiTreeUtil.getParentOfType(statement, JSFunction.class);
                 if (function.equals(containingFunction)) {
                     hasValuelessReturns = true;
                 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index c7eb9358..ce68eac3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -46,7 +46,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSLiteralExpression(JSSimpleLiteralExpression jsLiteralExpression) {
             super.visitJSLiteralExpression(jsLiteralExpression);
-            final String text = jsLiteralExpression.getText();
+            String text = jsLiteralExpression.getText();
             if (!text.startsWith("\"") && !text.startsWith("'")) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index 3448be2b..77d24482 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -52,21 +52,21 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSThisExpression(JSThisExpression jsThisExpression) {
             super.visitJSThisExpression(jsThisExpression);
-            final JSObjectLiteralExpression containingObject =
+            JSObjectLiteralExpression containingObject =
                 PsiTreeUtil.getParentOfType(jsThisExpression, JSObjectLiteralExpression.class);
             if (containingObject != null) {
                 return;
             }
-            final JSFunction containingFunction = PsiTreeUtil.getParentOfType(jsThisExpression, JSFunction.class);
+            JSFunction containingFunction = PsiTreeUtil.getParentOfType(jsThisExpression, JSFunction.class);
             if (containingFunction != null) {
                 return;
             }
-            final XmlAttributeValue containingAttribute = PsiTreeUtil.getParentOfType(jsThisExpression, XmlAttributeValue.class);
+            XmlAttributeValue containingAttribute = PsiTreeUtil.getParentOfType(jsThisExpression, XmlAttributeValue.class);
             if (containingAttribute != null) {
                 return;
             }
 
-            final PsiFile containingFile = jsThisExpression.getContainingFile();
+            PsiFile containingFile = jsThisExpression.getContainingFile();
             if (containingFile instanceof JSExpressionCodeFragment ||
                 containingFile.getContext() instanceof XmlAttributeValue) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
index cf04d041..ddebabb8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
@@ -49,7 +49,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSBlock(JSBlockStatement statement) {
             super.visitJSBlock(statement);
-            final JSStatement[] statements = statement.getStatements();
+            JSStatement[] statements = statement.getStatements();
             for (int i = 0; i < statements.length - 1; i++) {
                 if (!ControlFlowUtils.statementMayCompleteNormally(statements[i])) {
                     registerStatementError(statements[i + 1]);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
index cb91c16a..8a43af13 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/JSAbstractBundle.java
@@ -36,12 +36,12 @@ public static String getKey(String className, String classNameSuffix, String alt
             name = name.substring(0, name.length() - alternateClassNameSuffix.length());
         }
 
-        final int length = name.length();
-        final StringBuilder buffer = new StringBuilder(length + 10);
+        int length = name.length();
+        StringBuilder buffer = new StringBuilder(length + 10);
         boolean addWordSeparator = false;
 
         for (int index = 0; index < length; index++) {
-            final char c = name.charAt(index);
+            char c = name.charAt(index);
 
             if (Character.isUpperCase(c)) {
                 if (addWordSeparator) {
@@ -56,7 +56,7 @@ public static String getKey(String className, String classNameSuffix, String alt
             }
         }
 
-        for (final Object suffix : suffixes) {
+        for (Object suffix : suffixes) {
             buffer.append(suffix);
         }
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
index 01f2cfe9..8764d83d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
@@ -82,8 +82,8 @@ private void findNext() {
             do {
                 element = this.elementStack.pop();
 
-                final int elementTextOffset = element.getTextOffset();
-                final int elementTextEndOffset = elementTextOffset + element.getTextLength();
+                int elementTextOffset = element.getTextOffset();
+                int elementTextEndOffset = elementTextOffset + element.getTextLength();
 
                 if (elementTextEndOffset >= this.minTextOffset &&
                     elementTextOffset <= this.maxTextOffset) {
@@ -108,7 +108,7 @@ private void pushChildren(PsiElement[] children, int elementTextOffset) {
             int index = 0;
 
             while (index < children.length && childTextOffset <= this.maxTextOffset) {
-                final PsiElement child = children[index];
+                PsiElement child = children[index];
 
                 childTextOffset = child.getTextOffset();
                 if (childTextOffset <= this.maxTextOffset) {
@@ -121,7 +121,7 @@ private void pushChildren(PsiElement[] children, int elementTextOffset) {
             int index = children.length - 1;
 
             while (index >= 0 && childTextOffset >= this.minTextOffset) {
-                final PsiElement child = children[index];
+                PsiElement child = children[index];
 
                 childTextOffset = child.getTextOffset() + child.getTextLength();
                 if (childTextOffset >= this.minTextOffset) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
index 6cebb058..c65b552d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
@@ -38,7 +38,7 @@ public void visitElement(PsiElement element) {
         }
         else if (element instanceof JSReferenceExpression) {
             if (element == element.getParent().getChildren()[0]) {
-                final PsiElement firstChild = element.getParent().getFirstChild();
+                PsiElement firstChild = element.getParent().getFirstChild();
 
                 if (firstChild != null && firstChild.toString().indexOf(JSTokenTypes.NEW_KEYWORD.toString()) >= 0) {
                     this.visitJSNewExpression(new JSNewExpressionImpl(element.getParent().getNode()));
@@ -51,7 +51,7 @@ else if (element instanceof XmlFile xmlFile) {
 
         super.visitElement(element);
 
-        for (final PsiElement childElement : element.getChildren()) {
+        for (PsiElement childElement : element.getChildren()) {
             childElement.accept(this);
         }
     }
@@ -66,7 +66,7 @@ private void processFile(XmlFile file) {
         int count = 0;
         long start = System.currentTimeMillis();
 
-        for (final JSElement element : getEmbeddedJSElements(file)) {
+        for (JSElement element : getEmbeddedJSElements(file)) {
             this.visitElement(element);
             count++;
         }
@@ -76,7 +76,7 @@ private void processFile(XmlFile file) {
         );
     }
 
-    static Iterable<JSElement> getEmbeddedJSElements(final XmlFile file) {
+    static Iterable<JSElement> getEmbeddedJSElements(XmlFile file) {
         return () -> new EmbeddedJSElementIterator(file);
     }
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index cff14f7a..05ad4b10 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -55,7 +55,7 @@ protected PsiElement findMatchingElement(@Nullable PsiElement element) {
             return null;
         }
 
-        final Language language = element.getLanguage();
+        Language language = element.getLanguage();
         if (language != Language.ANY && language != JavaScriptLanguage.INSTANCE) {
             return null;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
index 89f22aff..349c43b2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
@@ -34,8 +34,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             return false;
         }
 
-        final JSBinaryExpression expression = (JSBinaryExpression)element;
-        final JSExpression rhs = expression.getROperand();
+        JSBinaryExpression expression = (JSBinaryExpression)element;
+        JSExpression rhs = expression.getROperand();
 
         return (rhs != null && ComparisonUtils.isComparisonOperator((JSExpression)element));
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
index e5dccfe0..76b3c996 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
@@ -33,8 +33,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             return false;
         }
 
-        final JSBinaryExpression expression = (JSBinaryExpression)element;
-        final IElementType sign = expression.getOperationSign();
+        JSBinaryExpression expression = (JSBinaryExpression)element;
+        IElementType sign = expression.getOperationSign();
 
         return (JSTokenTypes.ANDAND.equals(sign) || JSTokenTypes.OROR.equals(sign));
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 08e290bf..39d43962 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -49,7 +49,7 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     protected LocalizeValue getTextForElement(PsiElement element) {
-        final IElementType tokenType = ((JSBinaryExpression)element).getOperationSign();
+        IElementType tokenType = ((JSBinaryExpression)element).getOperationSign();
 
         return JSTokenTypes.ANDAND.equals(tokenType)
             ? JSIntentionLocalize.boolDeMorgansLawAndToOr()
@@ -66,7 +66,7 @@ public JSElementPredicate getElementPredicate() {
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         JSBinaryExpression exp = (JSBinaryExpression)element;
-        final IElementType tokenType = exp.getOperationSign();
+        IElementType tokenType = exp.getOperationSign();
         JSElement parent = (JSElement)exp.getParent();
 
         while (isConjunctionExpression(parent, tokenType)) {
@@ -75,16 +75,16 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
             parent = (JSElement)exp.getParent();
         }
 
-        final String newExpression = this.convertConjunctionExpression(exp, tokenType);
+        String newExpression = this.convertConjunctionExpression(exp, tokenType);
 
         JSElementFactory.replaceExpressionWithNegatedExpressionString(exp, newExpression);
     }
 
     @RequiredReadAction
     private String convertConjunctionExpression(JSBinaryExpression exp, IElementType tokenType) {
-        final String leftText = this.getOperandText(exp.getLOperand(), tokenType);
-        final String rightText = this.getOperandText(exp.getROperand(), tokenType);
-        final String flippedConjunction = tokenType.equals(JSTokenTypes.ANDAND) ? "||" : "&&";
+        String leftText = this.getOperandText(exp.getLOperand(), tokenType);
+        String rightText = this.getOperandText(exp.getROperand(), tokenType);
+        String flippedConjunction = tokenType.equals(JSTokenTypes.ANDAND) ? "||" : "&&";
 
         return leftText + flippedConjunction + rightText;
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 375158c4..4f2a03ef 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -47,7 +47,7 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     public LocalizeValue getTextForElement(PsiElement element) {
-        final JSBinaryExpression exp = (JSBinaryExpression)element;
+        JSBinaryExpression exp = (JSBinaryExpression)element;
         String operatorText = null;
         String flippedOperatorText = null;
 
@@ -76,14 +76,14 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSBinaryExpression exp = (JSBinaryExpression)element;
-        final JSExpression lhs = exp.getLOperand();
-        final JSExpression rhs = exp.getROperand();
-        final IElementType sign = exp.getOperationSign();
+        JSBinaryExpression exp = (JSBinaryExpression)element;
+        JSExpression lhs = exp.getLOperand();
+        JSExpression rhs = exp.getROperand();
+        IElementType sign = exp.getOperationSign();
 
         assert (rhs != null);
 
-        final String expString = rhs.getText() + ComparisonUtils.getFlippedOperatorText(sign) + lhs.getText();
+        String expString = rhs.getText() + ComparisonUtils.getFlippedOperatorText(sign) + lhs.getText();
         JSElementFactory.replaceExpression(exp, expString);
     }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 77aa1d0a..7449f1dc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -48,8 +48,8 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     protected LocalizeValue getTextForElement(PsiElement element) {
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
-        final IElementType sign = binaryExpression.getOperationSign();
+        JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
+        IElementType sign = binaryExpression.getOperationSign();
 
         return JSIntentionLocalize.boolFlipConjunctionMessage(BinaryOperatorUtils.getOperatorText(sign));
     }
@@ -63,10 +63,10 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
+        JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
         JSExpression exp = binaryExpression;
 
-        final IElementType sign = binaryExpression.getOperationSign();
+        IElementType sign = binaryExpression.getOperationSign();
         JSElement parent = (JSElement)exp.getParent();
 
         while (isConjunctionExpression(parent, sign)) {
@@ -80,7 +80,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     @RequiredReadAction
     private String flipExpression(JSExpression exp, IElementType conjunctionType) {
         if (isConjunctionExpression(exp, conjunctionType)) {
-            final JSBinaryExpression andExpression = (JSBinaryExpression)exp;
+            JSBinaryExpression andExpression = (JSBinaryExpression)exp;
 
             return this.flipExpression(andExpression.getROperand(), conjunctionType) + ' ' +
                 BinaryOperatorUtils.getOperatorText(conjunctionType) + ' ' +
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index d53ba2aa..19f43d00 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -47,12 +47,12 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     public LocalizeValue getTextForElement(PsiElement element) {
-        final JSBinaryExpression expression = (JSBinaryExpression)element;
+        JSBinaryExpression expression = (JSBinaryExpression)element;
         String operatorText = "";
         String negatedOperatorText = "";
 
         if (expression != null) {
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
 
             operatorText = ComparisonUtils.getOperatorText(sign);
             negatedOperatorText = ComparisonUtils.getNegatedOperatorText(sign);
@@ -72,12 +72,12 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSBinaryExpression exp = (JSBinaryExpression)element;
-        final JSExpression lhs = exp.getLOperand();
-        final JSExpression rhs = exp.getROperand();
-        final IElementType sign = exp.getOperationSign();
-        final String negatedOperator = ComparisonUtils.getNegatedOperatorText(sign);
-        final String lhsText = lhs.getText();
+        JSBinaryExpression exp = (JSBinaryExpression)element;
+        JSExpression lhs = exp.getLOperand();
+        JSExpression rhs = exp.getROperand();
+        IElementType sign = exp.getOperationSign();
+        String negatedOperator = ComparisonUtils.getNegatedOperatorText(sign);
+        String lhsText = lhs.getText();
 
         assert (rhs != null);
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index 73baf36f..37c00599 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -50,7 +50,7 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     protected LocalizeValue getTextForElement(PsiElement element) {
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
+        JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
 
         return JSIntentionLocalize.boolRemoveBooleanEqualityMessage(
             BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign())
@@ -65,16 +65,16 @@ public JSElementPredicate getElementPredicate() {
 
     @Override
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSBinaryExpression exp = (JSBinaryExpression)element;
-        final boolean isEquals = exp.getOperationSign().equals(JSTokenTypes.EQEQ);
-        final JSExpression lhs = exp.getLOperand();
-        final JSExpression rhs = exp.getROperand();
+        JSBinaryExpression exp = (JSBinaryExpression)element;
+        boolean isEquals = exp.getOperationSign().equals(JSTokenTypes.EQEQ);
+        JSExpression lhs = exp.getLOperand();
+        JSExpression rhs = exp.getROperand();
 
         assert (lhs != null);
         assert (rhs != null);
 
-        final String lhsText = lhs.getText();
-        final String rhsText = rhs.getText();
+        String lhsText = lhs.getText();
+        String rhsText = rhs.getText();
 
         if (BoolUtils.TRUE.equals(lhsText)) {
             if (isEquals) {
@@ -117,15 +117,15 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final JSBinaryExpression expression = (JSBinaryExpression)element;
-            final IElementType sign = expression.getOperationSign();
+            JSBinaryExpression expression = (JSBinaryExpression)element;
+            IElementType sign = expression.getOperationSign();
 
             if (!(JSTokenTypes.EQEQ.equals(sign) || JSTokenTypes.NE.equals(sign))) {
                 return false;
             }
 
-            final JSExpression lhs = expression.getLOperand();
-            final JSExpression rhs = expression.getROperand();
+            JSExpression lhs = expression.getLOperand();
+            JSExpression rhs = expression.getROperand();
 
             return lhs != null && rhs != null && (BoolUtils.isBooleanLiteral(lhs) || BoolUtils.isBooleanLiteral(rhs));
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index 5779b100..04e2948e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -51,18 +51,18 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     protected LocalizeValue getTextForElement(PsiElement element) {
-        final JSElement parent = (JSElement)element.getParent();
-        final String keyword;
+        JSElement parent = (JSElement)element.getParent();
+        String keyword;
 
         assert (parent != null);
 
         if (parent instanceof JSIfStatement ifStatement) {
-            final JSStatement elseBranch = ifStatement.getElse();
+            JSStatement elseBranch = ifStatement.getElse();
 
             keyword = (element.equals(elseBranch) ? "else" : "if");
         }
         else {
-            final PsiElement firstChild = parent.getFirstChild();
+            PsiElement firstChild = parent.getFirstChild();
 
             assert (firstChild != null);
             keyword = firstChild.getText();
@@ -77,8 +77,8 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe
         if (!(element instanceof JSStatement statement)) {
             return;
         }
-        final JSElement parent = (JSElement)element.getParent();
-        final String text = element.getText();
+        JSElement parent = (JSElement)element.getParent();
+        String text = element.getText();
         String newText = parent.getLastChild() instanceof PsiComment
             ? '{' + text + "\n}"
             : '{' + text + '}';
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index 764954cb..ad0843f9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -51,18 +51,18 @@ protected JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     protected LocalizeValue getTextForElement(PsiElement element) {
-        final JSElement parent = (JSElement)element.getParent();
-        final String keyword;
+        JSElement parent = (JSElement)element.getParent();
+        String keyword;
 
         assert (parent != null);
 
         if (parent instanceof JSIfStatement ifStatement) {
-            final JSStatement elseBranch = ifStatement.getElse();
+            JSStatement elseBranch = ifStatement.getElse();
 
             keyword = element.equals(elseBranch) ? "else" : "if";
         }
         else {
-            final PsiElement keywordChild = parent.getFirstChild();
+            PsiElement keywordChild = parent.getFirstChild();
 
             assert (keywordChild != null);
             keyword = keywordChild.getText();
@@ -74,16 +74,16 @@ protected LocalizeValue getTextForElement(PsiElement element) {
     @Override
     @RequiredReadAction
     protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSBlockStatement blockStatement = (JSBlockStatement)element;
-        final JSStatement[] statements = blockStatement.getStatements();
-        final JSStatement statement = statements[0];
+        JSBlockStatement blockStatement = (JSBlockStatement)element;
+        JSStatement[] statements = blockStatement.getStatements();
+        JSStatement statement = statements[0];
 
         // handle comments
-        final JSElement parent = (JSElement)blockStatement.getParent();
+        JSElement parent = (JSElement)blockStatement.getParent();
 
         assert (parent != null);
 
-        final JSElement grandParent = (JSElement)parent.getParent();
+        JSElement grandParent = (JSElement)parent.getParent();
 
         assert (grandParent != null);
 
@@ -99,10 +99,10 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe
             sibling = sibling.getNextSibling();
         }
 
-        final PsiElement lastChild = blockStatement.getLastChild();
+        PsiElement lastChild = blockStatement.getLastChild();
 
         if (lastChild instanceof PsiComment) {
-            final JSElement nextSibling = (JSElement)parent.getNextSibling();
+            JSElement nextSibling = (JSElement)parent.getNextSibling();
 
             grandParent.addAfter(lastChild, nextSibling);
         }
@@ -118,7 +118,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final PsiElement parent = blockStatement.getParent();
+            PsiElement parent = blockStatement.getParent();
 
             return (parent instanceof JSIfStatement || parent instanceof JSWhileStatement || parent instanceof JSDoWhileStatement
                 || parent instanceof JSForStatement || parent instanceof JSForInStatement)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index 52c56e41..f81b34c9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -58,7 +58,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
         PsiComment firstComment = (PsiComment)element;
 
         while (true) {
-            final PsiElement prevComment = JSElementFactory.getNonWhiteSpaceSibling(firstComment, false);
+            PsiElement prevComment = JSElementFactory.getNonWhiteSpaceSibling(firstComment, false);
 
             if (!isEndOfLineComment(prevComment)) {
                 break;
@@ -67,8 +67,8 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
             firstComment = (PsiComment)prevComment;
         }
 
-        final StringBuilder buffer = new StringBuilder(getCommentContents(firstComment));
-        final List<PsiElement> elementsToDelete = new ArrayList<>();
+        StringBuilder buffer = new StringBuilder(getCommentContents(firstComment));
+        List<PsiElement> elementsToDelete = new ArrayList<>();
         PsiElement nextComment = firstComment;
 
         while (true) {
@@ -80,7 +80,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
             }
             assert (nextComment != null);
 
-            final PsiElement prevSibling = nextComment.getPrevSibling();
+            PsiElement prevSibling = nextComment.getPrevSibling();
 
             assert (prevSibling != null);
             elementsToDelete.add(prevSibling);
@@ -89,13 +89,13 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
                 .append(getCommentContents((PsiComment)nextComment));
         }
 
-        final String text = StringUtil.replace(buffer.toString(), "*/", "* /");
-        final String newCommentString = text.indexOf('\n') >= 0
+        String text = StringUtil.replace(buffer.toString(), "*/", "* /");
+        String newCommentString = text.indexOf('\n') >= 0
             ? "/*\n" + text + "\n*/"
             : "/*" + text + "*/";
 
         JSElementFactory.addElementBefore(firstComment, newCommentString);
-        for (final PsiElement elementToDelete : elementsToDelete) {
+        for (PsiElement elementToDelete : elementsToDelete) {
             JSElementFactory.removeElement(elementToDelete);
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index 28fc84a9..d22df3f6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -54,15 +54,15 @@ protected JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement parent = element.getParent();
+        PsiElement parent = element.getParent();
 
         assert (parent != null);
 
-        final String commentText = element.getText();
-        final PsiElement whitespace = element.getNextSibling();
-        final String text = commentText.substring(2, commentText.length() - 2);
-        final String[] lines = text.split("\n");
-        final String[] newComments = buildCommentStrings(lines);
+        String commentText = element.getText();
+        PsiElement whitespace = element.getNextSibling();
+        String text = commentText.substring(2, commentText.length() - 2);
+        String[] lines = text.split("\n");
+        String[] newComments = buildCommentStrings(lines);
         PsiElement currentElement = element;
 
         for (int index = newComments.length; --index >= 0; ) {
@@ -81,7 +81,7 @@ private static String[] buildCommentStrings(String[] lines) {
         int lastNonEmtpyLine = -1;
 
         for (int i = lines.length - 1; i >= 0 && lastNonEmtpyLine == -1; i--) {
-            final String line = lines[i].trim();
+            String line = lines[i].trim();
             if (!line.isEmpty()) {
                 lastNonEmtpyLine = i;
             }
@@ -90,11 +90,11 @@ private static String[] buildCommentStrings(String[] lines) {
             return new String[]{"//"};
         }
 
-        final StringBuilder buffer = new StringBuilder();
-        final String[] commentStrings = new String[lastNonEmtpyLine + 1];
+        StringBuilder buffer = new StringBuilder();
+        String[] commentStrings = new String[lastNonEmtpyLine + 1];
 
         for (int i = 0; i <= lastNonEmtpyLine; i++) {
-            final String line = lines[i];
+            String line = lines[i];
 
             if (line.trim().length() != 0) {
                 buffer.replace(0, buffer.length(), "//");
@@ -123,17 +123,17 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final PsiComment comment = (PsiComment)element;
-            final IElementType type = comment.getTokenType();
+            PsiComment comment = (PsiComment)element;
+            IElementType type = comment.getTokenType();
 
             if (!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.C_STYLE_COMMENT.equals(type))) {
                 return false;
             }
-            final PsiElement sibling = TreeUtil.getNextLeaf(comment);
+            PsiElement sibling = TreeUtil.getNextLeaf(comment);
             if (!(sibling instanceof PsiWhiteSpace)) {
                 return false;
             }
-            final String whitespaceText = sibling.getText();
+            String whitespaceText = sibling.getText();
             return whitespaceText.indexOf((int)'\n') >= 0 || whitespaceText.indexOf((int)'\r') >= 0;
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index 88b48b9d..12d0ebf8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -54,9 +54,9 @@ protected JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiComment selectedComment = (PsiComment)element;
+        PsiComment selectedComment = (PsiComment)element;
         PsiElement elementToCheck = selectedComment;
-        final PsiWhiteSpace whiteSpace;
+        PsiWhiteSpace whiteSpace;
 
         while (true) {
             elementToCheck = TreeUtil.getPrevLeaf(elementToCheck);
@@ -91,26 +91,26 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof PsiComment)) {
                 return false;
             }
-            final PsiComment comment = (PsiComment)element;
-            final IElementType type = comment.getTokenType();
+            PsiComment comment = (PsiComment)element;
+            IElementType type = comment.getTokenType();
 
             if (!(JSTokenTypes.C_STYLE_COMMENT.equals(type) || JSTokenTypes.END_OF_LINE_COMMENT.equals(type))) {
                 return false; // can't move JSP comments
             }
 
-            final PsiElement prevSibling = TreeUtil.getPrevLeaf(element);
+            PsiElement prevSibling = TreeUtil.getPrevLeaf(element);
             if (!(prevSibling instanceof PsiWhiteSpace)) {
                 return true;
             }
-            final String prevSiblingText = prevSibling.getText();
+            String prevSiblingText = prevSibling.getText();
             if (prevSiblingText.indexOf('\n') < 0 && prevSiblingText.indexOf('\r') < 0) {
                 return true;
             }
-            final PsiElement nextSibling = TreeUtil.getNextLeaf(element);
+            PsiElement nextSibling = TreeUtil.getNextLeaf(element);
             if (!(nextSibling instanceof PsiWhiteSpace)) {
                 return true;
             }
-            final String nextSiblingText = nextSibling.getText();
+            String nextSiblingText = nextSibling.getText();
             return (nextSiblingText.indexOf('\n') < 0 && nextSiblingText.indexOf('\r') < 0);
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index afdf85b4..0b1b6af9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -54,15 +54,15 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSConditionalExpression exp = (JSConditionalExpression)element;
-        final JSExpression condition = exp.getCondition();
-        final JSExpression elseExpression = exp.getElse();
-        final JSExpression thenExpression = exp.getThen();
+        JSConditionalExpression exp = (JSConditionalExpression)element;
+        JSExpression condition = exp.getCondition();
+        JSExpression elseExpression = exp.getElse();
+        JSExpression thenExpression = exp.getThen();
 
         assert (elseExpression != null);
         assert (thenExpression != null);
 
-        final String newExpression = BoolUtils.getNegatedExpressionText(condition) + '?' +
+        String newExpression = BoolUtils.getNegatedExpressionText(condition) + '?' +
             elseExpression.getText() + ':' + thenExpression.getText();
 
         JSElementFactory.replaceExpression(exp, newExpression);
@@ -75,7 +75,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final JSConditionalExpression condition = (JSConditionalExpression)element;
+            JSConditionalExpression condition = (JSConditionalExpression)element;
 
             return condition.getCondition() != null && condition.getThen() != null && condition.getElse() != null;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index 7f0ae331..52f78d4c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -55,17 +55,17 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement exp = (JSIfStatement)element;
-        final JSExpression condition = exp.getCondition();
-        final JSStatement thenBranch = exp.getThen();
-        final JSStatement elseBranch = exp.getElse();
-        final String negatedText = BoolUtils.getNegatedExpressionText(condition);
-        final boolean emptyThenBranch =
+        JSIfStatement exp = (JSIfStatement)element;
+        JSExpression condition = exp.getCondition();
+        JSStatement thenBranch = exp.getThen();
+        JSStatement elseBranch = exp.getElse();
+        String negatedText = BoolUtils.getNegatedExpressionText(condition);
+        boolean emptyThenBranch =
             (thenBranch == null || (thenBranch instanceof JSBlockStatement blockStatement && blockStatement.getStatements().length == 0));
-        final String thenText = emptyThenBranch ? "" : "else " + thenBranch.getText();
-        final String elseText = elseBranch == null ? "{}" : elseBranch.getText();
+        String thenText = emptyThenBranch ? "" : "else " + thenBranch.getText();
+        String elseText = elseBranch == null ? "{}" : elseBranch.getText();
 
-        final String newStatement = "if (" + negatedText + ')' + elseText + thenText;
+        String newStatement = "if (" + negatedText + ')' + elseText + thenText;
 
         JSElementFactory.replaceStatement(exp, newStatement);
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 42f80dc7..9d925cb5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -54,14 +54,14 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSConditionalExpression exp = (JSConditionalExpression)element;
-        final JSExpression condition = exp.getCondition();
-        final JSExpression thenExpression = exp.getThen();
+        JSConditionalExpression exp = (JSConditionalExpression)element;
+        JSExpression condition = exp.getCondition();
+        JSExpression thenExpression = exp.getThen();
 
         assert (thenExpression != null);
 
-        final String thenExpressionText = thenExpression.getText();
-        final String newExpression;
+        String thenExpressionText = thenExpression.getText();
+        String newExpression;
 
         newExpression = thenExpressionText.equals(BoolUtils.TRUE)
             ? condition.getText()
@@ -74,15 +74,15 @@ private static class RemoveConditionalPredicate implements JSElementPredicate {
         @RequiredReadAction
         public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (element instanceof JSConditionalExpression condition && !ErrorUtil.containsError(element)) {
-                final JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
-                final JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
+                JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
+                JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
 
                 if (condition.getCondition() == null || thenExpression == null || elseExpression == null) {
                     return false;
                 }
 
-                final String thenText = thenExpression.getText();
-                final String elseText = elseExpression.getText();
+                String thenText = thenExpression.getText();
+                String elseText = elseExpression.getText();
 
                 return (BoolUtils.TRUE.equals(elseText) && BoolUtils.FALSE.equals(thenText))
                     || (BoolUtils.TRUE.equals(thenText) && BoolUtils.FALSE.equals(elseText));
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index b56590e9..4a3f7540 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -54,9 +54,9 @@ protected JSElementPredicate getElementPredicate() {
 
     @Override
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSExpression expression = (JSExpression)element;
-        final Object value = ExpressionUtil.computeConstantExpression(expression);
-        final String newExpression = value instanceof String strValue
+        JSExpression expression = (JSExpression)element;
+        Object value = ExpressionUtil.computeConstantExpression(expression);
+        String newExpression = value instanceof String strValue
             ? '"' + StringUtil.escapeStringCharacters(strValue) + '"'
             : String.valueOf(value);
         JSElementFactory.replaceExpression(expression, newExpression);
@@ -68,7 +68,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSExpression) || ErrorUtil.containsError(element)) {
                 return false;
             }
-            final JSExpression expression = (JSExpression)element;
+            JSExpression expression = (JSExpression)element;
 
             if (element instanceof JSLiteralExpression
                 || (element instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() != null)
@@ -78,7 +78,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final PsiElement parent = element.getParent();
+            PsiElement parent = element.getParent();
 
             return !(parent instanceof JSExpression parentExpression && ExpressionUtil.isConstantExpression(parentExpression));
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index a55dfbdb..c98c59ea 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -59,12 +59,12 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     protected LocalizeValue getTextForElement(PsiElement element) {
-        final PsiElement parent = element.getParent();
-        final JSBinaryExpression binaryExpression = (JSBinaryExpression)(parent instanceof JSBinaryExpression ? parent : element);
-        final JSExpression lhs = binaryExpression.getLOperand();
-        final JSExpression leftSide = lhs instanceof JSBinaryExpression lhsBinaryExpression ? lhsBinaryExpression.getROperand() : lhs;
-        final IElementType operationSign = binaryExpression.getOperationSign();
-        final JSExpression rhs = binaryExpression.getROperand();
+        PsiElement parent = element.getParent();
+        JSBinaryExpression binaryExpression = (JSBinaryExpression)(parent instanceof JSBinaryExpression ? parent : element);
+        JSExpression lhs = binaryExpression.getLOperand();
+        JSExpression leftSide = lhs instanceof JSBinaryExpression lhsBinaryExpression ? lhsBinaryExpression.getROperand() : lhs;
+        IElementType operationSign = binaryExpression.getOperationSign();
+        JSExpression rhs = binaryExpression.getROperand();
 
         assert (rhs != null);
         assert (leftSide != null);
@@ -79,17 +79,17 @@ protected LocalizeValue getTextForElement(PsiElement element) {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement parent = element.getParent();
-        final JSExpression expression = (JSExpression)(parent instanceof JSBinaryExpression ? parent : element);
+        PsiElement parent = element.getParent();
+        JSExpression expression = (JSExpression)(parent instanceof JSBinaryExpression ? parent : element);
         String newExpression = "";
-        final Object constantValue;
+        Object constantValue;
 
         if (expression instanceof JSBinaryExpression) {
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
-            final JSExpression lhs = binaryExpression.getLOperand();
+            JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
+            JSExpression lhs = binaryExpression.getLOperand();
 
             if (lhs instanceof JSBinaryExpression lhsBinaryExpression) {
-                final JSExpression rightSide = lhsBinaryExpression.getROperand();
+                JSExpression rightSide = lhsBinaryExpression.getROperand();
 
                 newExpression += getLeftSideText(lhsBinaryExpression);
 
@@ -124,30 +124,30 @@ private static String getLeftSideText(JSBinaryExpression binaryExpression) {
     @Nullable
     @RequiredReadAction
     private static JSBinaryExpression getSubexpression(JSBinaryExpression expression) {
-        final JSExpression rhs = expression.getROperand();
-        final IElementType sign = expression.getOperationSign();
-        final int parentPrecendence = ParenthesesUtils.getPrecendence(expression);
+        JSExpression rhs = expression.getROperand();
+        IElementType sign = expression.getOperationSign();
+        int parentPrecendence = ParenthesesUtils.getPrecendence(expression);
 
         if (rhs == null) {
             return null;
         }
 
-        final JSExpression lhs = expression.getLOperand();
+        JSExpression lhs = expression.getLOperand();
 
         if (!(lhs instanceof JSBinaryExpression)) {
             return expression;
         }
 
-        final JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression)lhs;
-        final int childPrecendence = ParenthesesUtils.getPrecendence(lhsBinaryExpression);
-        final JSExpression leftSide = lhsBinaryExpression.getROperand();
+        JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression)lhs;
+        int childPrecendence = ParenthesesUtils.getPrecendence(lhsBinaryExpression);
+        JSExpression leftSide = lhsBinaryExpression.getROperand();
 
         if (leftSide == null || parentPrecendence > childPrecendence) {
             return null;
         }
 
         try {
-            final String subExpressionText = leftSide.getText() + BinaryOperatorUtils.getOperatorText(sign) + rhs.getText();
+            String subExpressionText = leftSide.getText() + BinaryOperatorUtils.getOperatorText(sign) + rhs.getText();
             return (JSBinaryExpression)JSChangeUtil.createExpressionFromText(expression.getProject(), subExpressionText);
         }
         catch (Throwable ignore) {
@@ -174,9 +174,9 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                     return false;
                 }
             }
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression)parent;
+            JSBinaryExpression binaryExpression = (JSBinaryExpression)parent;
 
-            final JSBinaryExpression subexpression = getSubexpression(binaryExpression);
+            JSBinaryExpression subexpression = getSubexpression(binaryExpression);
             if (subexpression == null) {
                 return false;
             }
@@ -189,7 +189,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
         }
 
         private static boolean isPartOfConstantExpression(JSBinaryExpression binaryExpression) {
-            final PsiElement containingElement = binaryExpression.getParent();
+            PsiElement containingElement = binaryExpression.getParent();
 
             return containingElement instanceof JSExpression expression && ExpressionUtil.isConstantExpression(expression);
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index bfbdf265..73faa4da 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -57,11 +57,11 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final boolean isPostfix = (element instanceof JSPostfixExpression);
-        final JSExpression operand = isPostfix
+        boolean isPostfix = (element instanceof JSPostfixExpression);
+        JSExpression operand = isPostfix
             ? ((JSPostfixExpression)element).getExpression()
             : ((JSPrefixExpression)element).getExpression();
-        final JSStatement statement = TreeUtil.getParentOfType(element, JSStatement.class);
+        JSStatement statement = TreeUtil.getParentOfType(element, JSStatement.class);
 
         assert (statement != null);
 
@@ -90,7 +90,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final JSStatement containingStatement = TreeUtil.getParentOfType(element, JSStatement.class);
+            JSStatement containingStatement = TreeUtil.getParentOfType(element, JSStatement.class);
 
             if (element instanceof JSPostfixExpression
                 && (containingStatement instanceof JSReturnStatement || containingStatement instanceof JSThrowStatement)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 1c84429b..405df98c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -56,23 +56,23 @@ protected JSElementPredicate getElementPredicate() {
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSVarStatement);
 
-        final JSVarStatement varStatement = (JSVarStatement)element;
+        JSVarStatement varStatement = (JSVarStatement)element;
         StringBuilder declarationBuffer = new StringBuilder();
 
-        for (final JSVariable variable : varStatement.getVariables()) {
+        for (JSVariable variable : varStatement.getVariables()) {
             if (variable.hasInitializer()) {
                 declarationBuffer.append(declarationBuffer.isEmpty() ? "var " : ", ")
                     .append(variable.getName()).append(" = ").append(variable.getInitializer().getText());
             }
             else {
-                final Iterator<PsiElement> referenceIterator =
+                Iterator<PsiElement> referenceIterator =
                     FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
-                final JSReferenceExpression firstReference =
+                JSReferenceExpression firstReference =
                     (JSReferenceExpression)(referenceIterator.hasNext() ? referenceIterator.next() : null);
                 //final JSReferenceExpression firstReference = FindReferenceUtil.findFirstReference(variable);
 
                 if (firstReference != null && firstReference.getParent() instanceof JSDefinitionExpression definitionExpression) {
-                    final JSExpressionStatement assignmentStatement = (JSExpressionStatement)definitionExpression.getParent().getParent();
+                    JSExpressionStatement assignmentStatement = (JSExpressionStatement)definitionExpression.getParent().getParent();
 
                     // Replace assignment statement by var statement.
                     JSElementFactory.replaceStatement(assignmentStatement, "var " + assignmentStatement.getText());
@@ -104,9 +104,9 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                         continue;
                     }
 
-                    final Iterator<PsiElement> referenceIterator =
+                    Iterator<PsiElement> referenceIterator =
                         FindReferenceUtil.getReferencesAfter(variable, variable.getTextRange().getEndOffset()).iterator();
-                    final JSReferenceExpression firstReference =
+                    JSReferenceExpression firstReference =
                         (JSReferenceExpression)(referenceIterator.hasNext() ? referenceIterator.next() : null);
 
                     if (firstReference != null
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index e710883e..a6094183 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -64,7 +64,7 @@ protected JSElementPredicate getElementPredicate() {
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSVarStatement);
 
-        final JSVarStatement varStatement = (JSVarStatement)element;
+        JSVarStatement varStatement = (JSVarStatement)element;
         StringBuilder declarationBuffer = new StringBuilder();
         List<String> initializations = new ArrayList<>();
 
@@ -73,7 +73,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
                 .append(variable.getName());
 
             String s = JSPsiImplUtils.getTypeFromDeclaration(variable);
-            final PsiFile containingFile = element.getContainingFile();
+            PsiFile containingFile = element.getContainingFile();
 
             if (s == null && containingFile.getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
                 s = JSResolveUtil.getExpressionType(variable.getInitializer(), containingFile);
@@ -91,7 +91,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
         // Do replacement.
         JSStatement newStatement = JSElementFactory.replaceStatement(varStatement, declarationBuffer.toString());
 
-        for (final String initialization : initializations) {
+        for (String initialization : initializations) {
             newStatement = JSElementFactory.addStatementAfter(newStatement, initialization);
         }
     }
@@ -108,7 +108,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final JSVarStatement varStatement = (JSVarStatement)element;
+            JSVarStatement varStatement = (JSVarStatement)element;
             if (ErrorUtil.containsError(varStatement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index a0821dd4..bb50ad48 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -58,13 +58,13 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+        PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
 
-        final JSForInStatement firstStatement = (JSForInStatement)element;
-        final JSForInStatement secondStatement = (JSForInStatement)nextElement;
-        final StringBuilder statementBuffer = new StringBuilder();
+        JSForInStatement firstStatement = (JSForInStatement)element;
+        JSForInStatement secondStatement = (JSForInStatement)nextElement;
+        StringBuilder statementBuffer = new StringBuilder();
 
         this.mergeForInStatements(statementBuffer, firstStatement, secondStatement);
         JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
@@ -73,11 +73,11 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     @RequiredReadAction
     private void mergeForInStatements(StringBuilder statementBuffer, JSForInStatement firstStatement, JSForInStatement secondStatement) {
-        final JSExpression variableExpression = getVariableExpression(firstStatement);
-        final JSVarStatement declaration = firstStatement.getDeclarationStatement();
-        final JSExpression collectionExpression = getCollectionExpression(firstStatement);
-        final JSStatement firstBody = firstStatement.getBody();
-        final JSStatement secondBody = secondStatement.getBody();
+        JSExpression variableExpression = getVariableExpression(firstStatement);
+        JSVarStatement declaration = firstStatement.getDeclarationStatement();
+        JSExpression collectionExpression = getCollectionExpression(firstStatement);
+        JSStatement firstBody = firstStatement.getBody();
+        JSStatement secondBody = secondStatement.getBody();
 
         statementBuffer.append("for (")
             .append((declaration == null) ? variableExpression.getText() : declaration.getText())
@@ -98,26 +98,26 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
         }
 
         public static boolean forInStatementsCanBeMerged(JSForInStatement statement1, JSForInStatement statement2) {
-            final JSExpression firstVarExpression = getVariableExpression(statement1);
-            final JSExpression secondVarExpression = getVariableExpression(statement2);
+            JSExpression firstVarExpression = getVariableExpression(statement1);
+            JSExpression secondVarExpression = getVariableExpression(statement2);
             if (!EquivalenceChecker.expressionsAreEquivalent(firstVarExpression, secondVarExpression)) {
                 return false;
             }
 
-            final JSVarStatement firstDeclaration = statement1.getDeclarationStatement();
-            final JSVarStatement secondDeclaration = statement2.getDeclarationStatement();
+            JSVarStatement firstDeclaration = statement1.getDeclarationStatement();
+            JSVarStatement secondDeclaration = statement2.getDeclarationStatement();
             if (!EquivalenceChecker.statementsAreEquivalent(firstDeclaration, secondDeclaration)) {
                 return false;
             }
 
-            final JSExpression firstCollection = getCollectionExpression(statement1);
-            final JSExpression secondCollection = getCollectionExpression(statement2);
+            JSExpression firstCollection = getCollectionExpression(statement1);
+            JSExpression secondCollection = getCollectionExpression(statement2);
             if (!EquivalenceChecker.expressionsAreEquivalent(firstCollection, secondCollection)) {
                 return false;
             }
 
-            final JSStatement firstBody = statement1.getBody();
-            final JSStatement secondBody = statement2.getBody();
+            JSStatement firstBody = statement1.getBody();
+            JSStatement secondBody = statement2.getBody();
             return firstBody == null || secondBody == null || ControlFlowUtils.canBeMerged(firstBody, secondBody);
         }
     }
@@ -129,7 +129,7 @@ public static boolean forInStatementsCanBeMerged(JSForInStatement statement1, JS
      * @return the for-in statement collection expression
      */
     private static JSExpression getCollectionExpression(JSForInStatement forInStatement) {
-        final ASTNode statementNode = forInStatement.getNode();
+        ASTNode statementNode = forInStatement.getNode();
         ASTNode child = (statementNode == null) ? null : statementNode.getFirstChildNode();
         boolean inPassed = false;
 
@@ -153,7 +153,7 @@ private static JSExpression getCollectionExpression(JSForInStatement forInStatem
      * @return the for-in statement collection expression
      */
     private static JSExpression getVariableExpression(JSForInStatement forInStatement) {
-        final ASTNode statementNode = forInStatement.getNode();
+        ASTNode statementNode = forInStatement.getNode();
         ASTNode child = (statementNode == null) ? null : statementNode.getFirstChildNode();
 
         while (child != null) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 9717648e..4289c261 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -56,13 +56,13 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+        PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
 
-        final JSForStatement firstStatement = (JSForStatement)element;
-        final JSForStatement secondStatement = (JSForStatement)nextElement;
-        final StringBuilder statementBuffer = new StringBuilder();
+        JSForStatement firstStatement = (JSForStatement)element;
+        JSForStatement secondStatement = (JSForStatement)nextElement;
+        StringBuilder statementBuffer = new StringBuilder();
 
         this.mergeForStatements(statementBuffer, firstStatement, secondStatement);
         JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
@@ -71,12 +71,12 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     @RequiredReadAction
     private void mergeForStatements(StringBuilder statementBuffer, JSForStatement firstStatement, JSForStatement secondStatement) {
-        final JSExpression initialization = firstStatement.getInitialization();
-        final JSVarStatement varStatement = firstStatement.getVarDeclaration();
-        final JSExpression condition = firstStatement.getCondition();
-        final JSExpression update = firstStatement.getUpdate();
-        final JSStatement firstBody = firstStatement.getBody();
-        final JSStatement secondBody = secondStatement.getBody();
+        JSExpression initialization = firstStatement.getInitialization();
+        JSVarStatement varStatement = firstStatement.getVarDeclaration();
+        JSExpression condition = firstStatement.getCondition();
+        JSExpression update = firstStatement.getUpdate();
+        JSStatement firstBody = firstStatement.getBody();
+        JSStatement secondBody = secondStatement.getBody();
 
         statementBuffer.append("for (")
             .append((initialization == null) ? varStatement.getText() : initialization.getText())
@@ -99,32 +99,32 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
         }
 
         public static boolean forStatementsCanBeMerged(JSForStatement statement1, JSForStatement statement2) {
-            final JSExpression firstInitialization = statement1.getInitialization();
-            final JSExpression secondInitialization = statement2.getInitialization();
+            JSExpression firstInitialization = statement1.getInitialization();
+            JSExpression secondInitialization = statement2.getInitialization();
             if (!EquivalenceChecker.expressionsAreEquivalent(firstInitialization, secondInitialization)) {
                 return false;
             }
 
-            final JSVarStatement firstVarStatement = statement1.getVarDeclaration();
-            final JSVarStatement secondVarStatement = statement2.getVarDeclaration();
+            JSVarStatement firstVarStatement = statement1.getVarDeclaration();
+            JSVarStatement secondVarStatement = statement2.getVarDeclaration();
             if (!EquivalenceChecker.statementsAreEquivalent(firstVarStatement, secondVarStatement)) {
                 return false;
             }
 
-            final JSExpression firstCondition = statement1.getCondition();
-            final JSExpression secondCondition = statement2.getCondition();
+            JSExpression firstCondition = statement1.getCondition();
+            JSExpression secondCondition = statement2.getCondition();
             if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition, secondCondition)) {
                 return false;
             }
 
-            final JSExpression firstUpdate = statement1.getUpdate();
-            final JSExpression secondUpdate = statement2.getUpdate();
+            JSExpression firstUpdate = statement1.getUpdate();
+            JSExpression secondUpdate = statement2.getUpdate();
             if (!EquivalenceChecker.expressionsAreEquivalent(firstUpdate, secondUpdate)) {
                 return false;
             }
 
-            final JSStatement firstBody = statement1.getBody();
-            final JSStatement secondBody = statement2.getBody();
+            JSStatement firstBody = statement1.getBody();
+            JSStatement secondBody = statement2.getBody();
             return (firstBody == null || secondBody == null || ControlFlowUtils.canBeMerged(firstBody, secondBody));
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index a312b38a..6d0abc25 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -50,7 +50,7 @@ public JSElementPredicate getElementPredicate() {
 
     @Override
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression exp = (JSLiteralExpression)element;
+        JSLiteralExpression exp = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(exp, NumberUtil.getLiteralNumber(exp).toString());
     }
@@ -63,7 +63,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final String elementText = element.getText();
+            String elementText = element.getText();
 
             return NumberUtil.isHex(elementText) || NumberUtil.isOctal(elementText);
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index bece8d28..b039d78c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -50,7 +50,7 @@ public JSElementPredicate getElementPredicate() {
 
     @Override
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression exp = (JSLiteralExpression)element;
+        JSLiteralExpression exp = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(exp, "0x" + NumberUtil.getLiteralNumber(exp).toString(16));
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 5455e906..00ab0b65 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -50,7 +50,7 @@ public JSElementPredicate getElementPredicate() {
 
     @Override
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression exp = (JSLiteralExpression)element;
+        JSLiteralExpression exp = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(exp, '0' + NumberUtil.getLiteralNumber(exp).toString(8));
     }
@@ -63,7 +63,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final String elementText = element.getText();
+            String elementText = element.getText();
 
             return NumberUtil.isHex(elementText) || (NumberUtil.isDecimal(elementText) && !NumberUtil.isOctal(elementText));
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index 556c7d8b..2a41a99b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -48,8 +48,8 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     protected LocalizeValue getTextForElement(PsiElement element) {
-        final IElementType tokenType = ((JSBinaryExpression)element).getOperationSign();
-        final String operatorString;
+        IElementType tokenType = ((JSBinaryExpression)element).getOperationSign();
+        String operatorString;
 
         if (element instanceof JSAssignmentExpression) {
             operatorString = JSTokenTypes.MULTEQ.equals(tokenType) ? "<<=" : ">>=";
@@ -80,11 +80,11 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     @RequiredReadAction
     private void replaceMultiplyOrDivideAssignWithShiftAssign(JSAssignmentExpression exp) throws IncorrectOperationException {
-        final JSExpression lhs = exp.getLOperand();
-        final JSExpression rhs = exp.getROperand();
-        final IElementType tokenType = exp.getOperationSign();
-        final String assignString = JSTokenTypes.MULTEQ.equals(tokenType) ? "<<=" : ">>=";
-        final String expString = lhs.getText() + assignString + ShiftUtils.getLogBase2(rhs);
+        JSExpression lhs = exp.getLOperand();
+        JSExpression rhs = exp.getROperand();
+        IElementType tokenType = exp.getOperationSign();
+        String assignString = JSTokenTypes.MULTEQ.equals(tokenType) ? "<<=" : ">>=";
+        String expString = lhs.getText() + assignString + ShiftUtils.getLogBase2(rhs);
 
         JSElementFactory.replaceExpression(exp, expString);
     }
@@ -93,8 +93,8 @@ private void replaceMultiplyOrDivideAssignWithShiftAssign(JSAssignmentExpression
     private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp) throws IncorrectOperationException {
         JSExpression lhs = exp.getLOperand();
         JSExpression rhs = exp.getROperand();
-        final IElementType tokenType = exp.getOperationSign();
-        final String operatorString = JSTokenTypes.MULT.equals(tokenType) ? "<<" : ">>";
+        IElementType tokenType = exp.getOperationSign();
+        String operatorString = JSTokenTypes.MULT.equals(tokenType) ? "<<" : ">>";
 
         if (ShiftUtils.isPowerOfTwo(lhs) && JSTokenTypes.MULT.equals(tokenType)) {
             JSExpression swap = lhs;
@@ -103,9 +103,9 @@ private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp) throws Inc
             rhs = swap;
         }
 
-        final String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.SHIFT_PRECENDENCE);
+        String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.SHIFT_PRECENDENCE);
         String expString = lhsText + operatorString + ShiftUtils.getLogBase2(rhs);
-        final JSElement parent = (JSElement)exp.getParent();
+        JSElement parent = (JSElement)exp.getParent();
 
         if (parent != null && parent instanceof JSExpression parentExpression && !(parent instanceof JSParenthesizedExpression)
             && ParenthesesUtils.getPrecendence(parentExpression) < ParenthesesUtils.SHIFT_PRECENDENCE) {
@@ -125,27 +125,27 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
 
         @RequiredReadAction
         private static boolean isMultiplyByPowerOfTwo(JSAssignmentExpression expression) {
-            final IElementType operator = expression.getOperationSign();
+            IElementType operator = expression.getOperationSign();
 
             if (operator == null || !(operator.equals(JSTokenTypes.MULTEQ) || operator.equals(JSTokenTypes.DIVEQ))) {
                 return false;
             }
 
-            final JSExpression rightExpression = expression.getROperand();
+            JSExpression rightExpression = expression.getROperand();
 
             return rightExpression != null && ShiftUtils.isPowerOfTwo(rightExpression);
         }
 
         @RequiredReadAction
         private static boolean isMultiplyByPowerOfTwo(JSBinaryExpression expression) {
-            final IElementType operator = expression.getOperationSign();
+            IElementType operator = expression.getOperationSign();
 
             if (operator == null || !(JSTokenTypes.MULT.equals(operator) || JSTokenTypes.DIV.equals(operator))) {
                 return false;
             }
 
-            final JSExpression leftOperand = expression.getLOperand();
-            final JSExpression rightOperand = expression.getROperand();
+            JSExpression leftOperand = expression.getLOperand();
+            JSExpression rightOperand = expression.getROperand();
 
             return leftOperand != null && rightOperand != null
                 && (ShiftUtils.isPowerOfTwo(leftOperand) || ShiftUtils.isPowerOfTwo(rightOperand));
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index 9e462d5a..ea0e3401 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -48,8 +48,8 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     protected LocalizeValue getTextForElement(PsiElement element) {
-        final IElementType tokenType = ((JSBinaryExpression)element).getOperationSign();
-        final String operatorString;
+        IElementType tokenType = ((JSBinaryExpression)element).getOperationSign();
+        String operatorString;
 
         if (element instanceof JSAssignmentExpression) {
             operatorString = JSTokenTypes.LTLTEQ.equals(tokenType) ? "*=" : "/=";
@@ -81,25 +81,25 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     @RequiredReadAction
     private void replaceShiftAssignWithMultiplyOrDivideAssign(JSAssignmentExpression exp) throws IncorrectOperationException {
-        final JSExpression lhs = exp.getLOperand();
-        final JSExpression rhs = exp.getROperand();
-        final IElementType tokenType = exp.getOperationSign();
-        final String assignString = JSTokenTypes.LTLTEQ.equals(tokenType) ? "*=" : "/=";
+        JSExpression lhs = exp.getLOperand();
+        JSExpression rhs = exp.getROperand();
+        IElementType tokenType = exp.getOperationSign();
+        String assignString = JSTokenTypes.LTLTEQ.equals(tokenType) ? "*=" : "/=";
 
-        final String expString = lhs.getText() + assignString + ShiftUtils.getExpBase2(rhs);
+        String expString = lhs.getText() + assignString + ShiftUtils.getExpBase2(rhs);
 
         JSElementFactory.replaceExpression(exp, expString);
     }
 
     @RequiredReadAction
     private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp) throws IncorrectOperationException {
-        final JSExpression lhs = exp.getLOperand();
-        final JSExpression rhs = exp.getROperand();
-        final IElementType tokenType = exp.getOperationSign();
-        final String operatorString = JSTokenTypes.LTLT.equals(tokenType) ? "*" : "/";
-        final String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE);
+        JSExpression lhs = exp.getLOperand();
+        JSExpression rhs = exp.getROperand();
+        IElementType tokenType = exp.getOperationSign();
+        String operatorString = JSTokenTypes.LTLT.equals(tokenType) ? "*" : "/";
+        String lhsText = ParenthesesUtils.getParenthesized(lhs, ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE);
         String expString = lhsText + operatorString + ShiftUtils.getExpBase2(rhs);
-        final JSElement parent = (JSElement)exp.getParent();
+        JSElement parent = (JSElement)exp.getParent();
 
         if (parent != null && parent instanceof JSExpression parentExpression && !(parent instanceof JSParenthesizedExpression)
             && ParenthesesUtils.getPrecendence(parentExpression) < ParenthesesUtils.MULTIPLICATIVE_PRECENDENCE) {
@@ -119,20 +119,20 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
 
         @RequiredReadAction
         private boolean isAssignmentShiftByLiteral(JSAssignmentExpression expression) {
-            final IElementType tokenType = expression.getOperationSign();
+            IElementType tokenType = expression.getOperationSign();
 
             if (tokenType == null || !(JSTokenTypes.LTLTEQ.equals(tokenType) || JSTokenTypes.GTGTEQ.equals(tokenType))) {
                 return false;
             }
 
-            final JSExpression rhs = expression.getROperand();
+            JSExpression rhs = expression.getROperand();
 
             return rhs != null && ShiftUtils.isIntLiteral(rhs);
         }
 
         @RequiredReadAction
         private boolean isBinaryShiftByLiteral(JSBinaryExpression expression) {
-            final IElementType tokenType = expression.getOperationSign();
+            IElementType tokenType = expression.getOperationSign();
 
             return (JSTokenTypes.LTLT.equals(tokenType) || JSTokenTypes.GTGT.equals(tokenType))
                 && ShiftUtils.isIntLiteral(expression.getROperand());
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
index 9974fce8..67dc1b84 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/ShiftUtils.java
@@ -26,7 +26,7 @@ public static boolean isPowerOfTwo(JSExpression expression) {
         if (!(expression instanceof JSLiteralExpression)) {
             return false;
         }
-        final String value = expression.getText();
+        String value = expression.getText();
         long intValue;
 
         try {
@@ -46,7 +46,7 @@ public static boolean isPowerOfTwo(JSExpression expression) {
     }
 
     public static int getLogBase2(JSExpression rhs) {
-        final String value = rhs.getText();
+        String value = rhs.getText();
         long intValue;
 
         try {
@@ -66,8 +66,8 @@ public static int getLogBase2(JSExpression rhs) {
     }
 
     public static int getExpBase2(JSExpression rhs) {
-        final String value = rhs.getText();
-        final long intValue;
+        String value = rhs.getText();
+        long intValue;
 
         try {
             intValue = Integer.decode(value).longValue();
@@ -89,7 +89,7 @@ public static boolean isIntLiteral(JSExpression expression) {
             return false;
         }
 
-        final String value = expression.getText();
+        String value = expression.getText();
 
         try {
             Integer.decode(value);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index 675499c0..21480878 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -49,10 +49,10 @@ protected LocalizeValue getBasicText() {
     @Override
     @RequiredReadAction
     public LocalizeValue getTextForElement(PsiElement element) {
-        final JSAssignmentExpression exp = (JSAssignmentExpression)element;
-        final JSBinaryExpression rhs = (JSBinaryExpression)exp.getROperand();
+        JSAssignmentExpression exp = (JSAssignmentExpression)element;
+        JSBinaryExpression rhs = (JSBinaryExpression)exp.getROperand();
         assert (rhs != null);
-        final IElementType sign = rhs.getOperationSign();
+        IElementType sign = rhs.getOperationSign();
 
         return JSIntentionLocalize.opassignReplaceWithOperatorAssignmentMessage(BinaryOperatorUtils.getOperatorText(sign));
     }
@@ -66,15 +66,15 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSAssignmentExpression exp = (JSAssignmentExpression)element;
-        final JSBinaryExpression rhs = (JSBinaryExpression)exp.getROperand();
-        final JSExpression lhs = exp.getLOperand();
+        JSAssignmentExpression exp = (JSAssignmentExpression)element;
+        JSBinaryExpression rhs = (JSBinaryExpression)exp.getROperand();
+        JSExpression lhs = exp.getLOperand();
 
         assert (rhs != null);
 
-        final IElementType sign = rhs.getOperationSign();
-        final String operand = BinaryOperatorUtils.getOperatorText(sign);
-        final JSExpression rhsrhs = rhs.getROperand();
+        IElementType sign = rhs.getOperationSign();
+        String operand = BinaryOperatorUtils.getOperatorText(sign);
+        JSExpression rhsrhs = rhs.getROperand();
 
         assert (rhsrhs != null);
 
@@ -88,13 +88,13 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (!(element instanceof JSAssignmentExpression) || ErrorUtil.containsError(element)) {
                 return false;
             }
-            final JSAssignmentExpression assignment = (JSAssignmentExpression)element;
-            final IElementType tokenType = assignment.getOperationSign();
+            JSAssignmentExpression assignment = (JSAssignmentExpression)element;
+            IElementType tokenType = assignment.getOperationSign();
             if (!JSTokenTypes.EQ.equals(tokenType)) {
                 return false;
             }
             JSExpression lhs = assignment.getLOperand();
-            final JSExpression rhs = assignment.getROperand();
+            JSExpression rhs = assignment.getROperand();
 
             if (lhs instanceof JSDefinitionExpression definitionExpression) {
                 lhs = definitionExpression.getExpression();
@@ -102,15 +102,15 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
             if (lhs == null || !(rhs instanceof JSBinaryExpression)) {
                 return false;
             }
-            final JSBinaryExpression binaryRhs = (JSBinaryExpression)rhs;
-            final JSExpression rhsRhs = binaryRhs.getROperand();
-            final JSExpression rhsLhs = binaryRhs.getLOperand();
+            JSBinaryExpression binaryRhs = (JSBinaryExpression)rhs;
+            JSExpression rhsRhs = binaryRhs.getROperand();
+            JSExpression rhsLhs = binaryRhs.getLOperand();
 
             if (rhsRhs == null) {
                 return false;
             }
 
-            final IElementType rhsTokenType = binaryRhs.getOperationSign();
+            IElementType rhsTokenType = binaryRhs.getOperationSign();
 
             return !JSTokenTypes.OROR.equals(rhsTokenType)
                 && !JSTokenTypes.ANDAND.equals(rhsTokenType)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 65921e48..7e8d7506 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -61,7 +61,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
             exp = parentExp;
         }
 
-        final String newExpression = ParenthesesUtils.removeParentheses(exp);
+        String newExpression = ParenthesesUtils.removeParentheses(exp);
 
         JSElementFactory.replaceExpression(exp, newExpression);
     }
@@ -75,14 +75,14 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                     return true;
                 }
 
-                final JSExpression body = expression.getInnerExpression();
+                JSExpression body = expression.getInnerExpression();
 
                 if (body instanceof JSParenthesizedExpression) {
                     return true;
                 }
 
-                final int parentPrecendence = ParenthesesUtils.getPrecendence(parentExpression);
-                final int childPrecendence = ParenthesesUtils.getPrecendence(body);
+                int parentPrecendence = ParenthesesUtils.getPrecendence(parentExpression);
+                int childPrecendence = ParenthesesUtils.getPrecendence(body);
 
                 if (parentPrecendence > childPrecendence) {
                     return !(body instanceof JSFunctionExpression);
@@ -90,9 +90,9 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 else if (parentPrecendence == childPrecendence
                     && parentExpression instanceof JSBinaryExpression parentBinaryExpression
                     && body instanceof JSBinaryExpression bodyBinaryExpression) {
-                    final IElementType parentOperator = parentBinaryExpression.getOperationSign();
-                    final IElementType childOperator = bodyBinaryExpression.getOperationSign();
-                    final JSExpression lhs = parentBinaryExpression.getLOperand();
+                    IElementType parentOperator = parentBinaryExpression.getOperationSign();
+                    IElementType childOperator = bodyBinaryExpression.getOperationSign();
+                    JSExpression lhs = parentBinaryExpression.getLOperand();
 
                     return lhs.equals(expression) && parentOperator.equals(childOperator);
                 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index 7c7008bb..49877e27 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -50,7 +50,7 @@ protected JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression stringLiteral = (JSLiteralExpression)element;
+        JSLiteralExpression stringLiteral = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(stringLiteral, changeQuotes(stringLiteral.getText()));
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index 475d1833..c603fcc6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -55,17 +55,17 @@ protected JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSBinaryExpression expression = (JSBinaryExpression)element;
-        final JSExpression lhs = expression.getLOperand();
-        final JSExpression rhs = expression.getROperand();
+        JSBinaryExpression expression = (JSBinaryExpression)element;
+        JSExpression lhs = expression.getLOperand();
+        JSExpression rhs = expression.getROperand();
 
         assert (lhs instanceof JSLiteralExpression && rhs instanceof JSLiteralExpression);
 
-        final JSLiteralExpression leftLiteral = (JSLiteralExpression)lhs;
-        final JSLiteralExpression rightLiteral = (JSLiteralExpression)rhs;
+        JSLiteralExpression leftLiteral = (JSLiteralExpression)lhs;
+        JSLiteralExpression rightLiteral = (JSLiteralExpression)rhs;
         String lhsText = lhs.getText();
         String rhsText = rhs.getText();
-        final String newExpression;
+        String newExpression;
 
         if (StringUtil.isSimpleQuoteStringLiteral(leftLiteral)
             && StringUtil.isDoubleQuoteStringLiteral(rightLiteral)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index 2fd021fd..b8b7a940 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -50,7 +50,7 @@ protected JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSLiteralExpression charLiteral = (JSLiteralExpression)element;
+        JSLiteralExpression charLiteral = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(charLiteral, changeQuotes(charLiteral.getText()));
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
index 8373939b..383431ab 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/StringUtil.java
@@ -26,7 +26,7 @@ private StringUtil() {
     }
 
     public static boolean isSimpleQuoteStringLiteral(JSLiteralExpression expression) {
-        final String value = expression.getText();
+        String value = expression.getText();
 
         return (value != null &&
             value.charAt(0) == SIMPLE_QUOTE &&
@@ -34,7 +34,7 @@ public static boolean isSimpleQuoteStringLiteral(JSLiteralExpression expression)
     }
 
     public static boolean isDoubleQuoteStringLiteral(JSLiteralExpression expression) {
-        final String value = expression.getText();
+        String value = expression.getText();
 
         return (value != null &&
             value.charAt(0) == DOUBLE_QUOTE &&
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
index 0d383a6a..ada6aebc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/CaseUtil.java
@@ -46,7 +46,7 @@ public static boolean containsHiddenBreak(JSCaseClause caseClause) {
     }
 
     public static boolean containsHiddenBreak(List<PsiElement> elements) {
-        for (final PsiElement element : elements) {
+        for (PsiElement element : elements) {
             if (element instanceof JSStatement statement && containsHiddenBreak(statement, true)) {
                 return true;
             }
@@ -60,7 +60,7 @@ public static boolean containsHiddenBreak(JSStatement statement) {
 
     private static boolean containsHiddenBreak(JSStatement statement, boolean isTopLevel) {
         if (statement instanceof JSBlockStatement blockStatement) {
-            for (final JSStatement childStatement : blockStatement.getStatements()) {
+            for (JSStatement childStatement : blockStatement.getStatements()) {
                 if (containsHiddenBreak(childStatement, false)) {
                     return true;
                 }
@@ -74,7 +74,7 @@ else if (statement instanceof JSBreakStatement breakStatement) {
                 return false;
             }
 
-            final String identifier = breakStatement.getLabel();
+            String identifier = breakStatement.getLabel();
 
             return (identifier == null || identifier.length() == 0);
         }
@@ -92,7 +92,7 @@ public static boolean isUsedByStatementList(JSVariable var, List<PsiElement> ele
     }
 
     private static boolean isUsedByStatement(JSVariable var, JSElement statement) {
-        final LocalVariableUsageVisitor visitor = new LocalVariableUsageVisitor(var);
+        LocalVariableUsageVisitor visitor = new LocalVariableUsageVisitor(var);
         statement.accept(visitor);
         return visitor.isUsed();
     }
@@ -114,7 +114,7 @@ public static String findUniqueLabel(JSStatement statement, String baseName) {
         int val = 1;
 
         while (true) {
-            final String name = baseName + val;
+            String name = baseName + val;
 
             if (!checkForLabel(name, ancestor)) {
                 return name;
@@ -124,22 +124,22 @@ public static String findUniqueLabel(JSStatement statement, String baseName) {
     }
 
     private static boolean checkForLabel(String name, JSElement ancestor) {
-        final LabelSearchVisitor visitor = new LabelSearchVisitor(name);
+        LabelSearchVisitor visitor = new LabelSearchVisitor(name);
         ancestor.accept(visitor);
         return visitor.isUsed();
     }
 
     public static JSExpression getCaseExpression(JSIfStatement statement) {
-        final JSExpression condition = statement.getCondition();
-        final List<JSExpression> possibleCaseExpressions = determinePossibleCaseExpressions(condition);
+        JSExpression condition = statement.getCondition();
+        List<JSExpression> possibleCaseExpressions = determinePossibleCaseExpressions(condition);
 
         if (possibleCaseExpressions != null) {
-            for (final JSExpression caseExpression : possibleCaseExpressions) {
+            for (JSExpression caseExpression : possibleCaseExpressions) {
                 if (!SideEffectChecker.mayHaveSideEffects(caseExpression)) {
                     JSIfStatement statementToCheck = statement;
 
                     while (canBeMadeIntoCase(statementToCheck.getCondition(), caseExpression)) {
-                        final JSStatement elseBranch = statementToCheck.getElse();
+                        JSStatement elseBranch = statementToCheck.getElse();
 
                         if (elseBranch == null || !(elseBranch instanceof JSIfStatement)) {
                             return caseExpression;
@@ -153,13 +153,13 @@ public static JSExpression getCaseExpression(JSIfStatement statement) {
     }
 
     private static List<JSExpression> determinePossibleCaseExpressions(JSExpression exp) {
-        final JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
-        final List<JSExpression> out = new ArrayList<>(10);
+        JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
+        List<JSExpression> out = new ArrayList<>(10);
 
         if (expToCheck instanceof JSBinaryExpression binaryExp) {
-            final IElementType operation = binaryExp.getOperationSign();
-            final JSExpression lhs = binaryExp.getLOperand();
-            final JSExpression rhs = binaryExp.getROperand();
+            IElementType operation = binaryExp.getOperationSign();
+            JSExpression lhs = binaryExp.getLOperand();
+            JSExpression rhs = binaryExp.getROperand();
 
             if (JSTokenTypes.OROR.equals(operation)) {
                 return determinePossibleCaseExpressions(lhs);
@@ -177,16 +177,16 @@ else if (JSTokenTypes.EQEQ.equals(operation)) {
     }
 
     private static boolean canBeMadeIntoCase(JSExpression exp, JSExpression caseExpression) {
-        final JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
+        JSExpression expToCheck = ParenthesesUtils.stripParentheses(exp);
 
         if (!(expToCheck instanceof JSBinaryExpression)) {
             return false;
         }
 
-        final JSBinaryExpression binaryExp = (JSBinaryExpression)expToCheck;
-        final IElementType operation = binaryExp.getOperationSign();
-        final JSExpression leftOperand = binaryExp.getLOperand();
-        final JSExpression rightOperand = binaryExp.getROperand();
+        JSBinaryExpression binaryExp = (JSBinaryExpression)expToCheck;
+        IElementType operation = binaryExp.getOperationSign();
+        JSExpression leftOperand = binaryExp.getLOperand();
+        JSExpression rightOperand = binaryExp.getROperand();
 
         if (JSTokenTypes.OROR.equals(operation)) {
             return canBeMadeIntoCase(leftOperand, caseExpression) && canBeMadeIntoCase(rightOperand, caseExpression);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 23bf7220..84819e80 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -93,38 +93,38 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
                 breaksNeedRelabeled = true;
             }
         }
-        final JSIfStatement statementToReplace = ifStatement;
-        final JSExpression caseExpression = CaseUtil.getCaseExpression(ifStatement);
+        JSIfStatement statementToReplace = ifStatement;
+        JSExpression caseExpression = CaseUtil.getCaseExpression(ifStatement);
 
         assert (caseExpression != null);
 
-        final StringBuilder switchStatementBuffer = new StringBuilder(1024);
+        StringBuilder switchStatementBuffer = new StringBuilder(1024);
 
         switchStatementBuffer.append("switch(").append(caseExpression.getText()).append(')')
             .append('{');
 
-        final List<IfStatementBranch> branches = new ArrayList<>(20);
+        List<IfStatementBranch> branches = new ArrayList<>(20);
 
         while (true) {
-            final Set<String> topLevelVariables = new HashSet<>(5);
-            final Set<String> innerVariables = new HashSet<>(5);
-            final JSExpression condition = ifStatement.getCondition();
-            final JSExpression[] labels = getValuesFromCondition(condition, caseExpression);
-            final JSStatement thenBranch = ifStatement.getThen();
+            Set<String> topLevelVariables = new HashSet<>(5);
+            Set<String> innerVariables = new HashSet<>(5);
+            JSExpression condition = ifStatement.getCondition();
+            JSExpression[] labels = getValuesFromCondition(condition, caseExpression);
+            JSStatement thenBranch = ifStatement.getThen();
 
             DeclarationUtils.calculateVariablesDeclared(thenBranch, topLevelVariables, innerVariables, true);
 
-            final IfStatementBranch ifBranch = new IfStatementBranch();
+            IfStatementBranch ifBranch = new IfStatementBranch();
 
             ifBranch.setInnerVariables(innerVariables);
             ifBranch.setTopLevelVariables(topLevelVariables);
             ifBranch.setStatement(thenBranch);
-            for (final JSExpression label : labels) {
+            for (JSExpression label : labels) {
                 ifBranch.addCondition(label.getText());
             }
             branches.add(ifBranch);
 
-            final JSStatement elseBranch = ifStatement.getElse();
+            JSStatement elseBranch = ifStatement.getElse();
 
             if (elseBranch instanceof JSIfStatement elseIfStatement) {
                 ifStatement = elseIfStatement;
@@ -133,12 +133,12 @@ else if (elseBranch == null) {
                 break;
             }
             else {
-                final Set<String> elseTopLevelVariables = new HashSet<>(5);
-                final Set<String> elseInnerVariables = new HashSet<>(5);
+                Set<String> elseTopLevelVariables = new HashSet<>(5);
+                Set<String> elseInnerVariables = new HashSet<>(5);
 
                 DeclarationUtils.calculateVariablesDeclared(elseBranch, elseTopLevelVariables, elseInnerVariables, true);
 
-                final IfStatementBranch elseIfBranch = new IfStatementBranch();
+                IfStatementBranch elseIfBranch = new IfStatementBranch();
 
                 elseIfBranch.setInnerVariables(elseInnerVariables);
                 elseIfBranch.setTopLevelVariables(elseTopLevelVariables);
@@ -157,13 +157,13 @@ else if (elseBranch == null) {
                 }
             }
 
-            final JSStatement branchStatement = branch.getStatement();
+            JSStatement branchStatement = branch.getStatement();
 
             if (branch.isElse()) {
                 dumpDefaultBranch(switchStatementBuffer, branchStatement, hasConflicts, breaksNeedRelabeled, labelString);
             }
             else {
-                final List<String> conditions = branch.getConditions();
+                List<String> conditions = branch.getConditions();
 
                 dumpBranch(switchStatementBuffer, conditions, branchStatement, hasConflicts, breaksNeedRelabeled, labelString);
             }
@@ -171,11 +171,11 @@ else if (elseBranch == null) {
 
         switchStatementBuffer.append('}');
 
-        final String switchStatementString = switchStatementBuffer.toString();
+        String switchStatementString = switchStatementBuffer.toString();
 
         if (breaksNeedRelabeled) {
-            final int length = switchStatementBuffer.length();
-            final StringBuilder out = new StringBuilder(length);
+            int length = switchStatementBuffer.length();
+            StringBuilder out = new StringBuilder(length);
 
             out.append(labelString).append(':');
             termReplace(out, breakTarget, statementToReplace, switchStatementString);
@@ -192,20 +192,20 @@ private static void termReplace(StringBuilder out, JSElement target, JSElement r
             out.append(stringToReplaceWith);
         }
         else if (target.getChildren().length != 0) {
-            final JSElement[] children = (JSElement[])target.getChildren();
-            for (final JSElement child : children) {
+            JSElement[] children = (JSElement[])target.getChildren();
+            for (JSElement child : children) {
                 termReplace(out, child, replace, stringToReplaceWith);
             }
         }
         else {
-            final String text = target.getText();
+            String text = target.getText();
             out.append(text);
         }
     }
 
     @RequiredReadAction
     private static JSExpression[] getValuesFromCondition(JSExpression condition, JSExpression caseExpression) {
-        final List<JSExpression> values = new ArrayList<>(10);
+        List<JSExpression> values = new ArrayList<>(10);
 
         getValuesFromExpression(condition, caseExpression, values);
         return values.toArray(new JSExpression[values.size()]);
@@ -214,9 +214,9 @@ private static JSExpression[] getValuesFromCondition(JSExpression condition, JSE
     @RequiredReadAction
     private static void getValuesFromExpression(JSExpression expression, JSExpression caseExpression, List<JSExpression> values) {
         if (expression instanceof JSBinaryExpression binaryExpression) {
-            final JSExpression lhs = binaryExpression.getLOperand();
-            final JSExpression rhs = binaryExpression.getROperand();
-            final IElementType tokenType = binaryExpression.getOperationSign();
+            JSExpression lhs = binaryExpression.getLOperand();
+            JSExpression rhs = binaryExpression.getROperand();
+            IElementType tokenType = binaryExpression.getOperationSign();
 
             if (JSTokenTypes.OROR.equals(tokenType)) {
                 getValuesFromExpression(lhs, caseExpression, values);
@@ -230,7 +230,7 @@ else if (EquivalenceChecker.expressionsAreEquivalent(caseExpression, rhs)) {
             }
         }
         else if (expression instanceof JSParenthesizedExpression parenExpression) {
-            final JSExpression contents = parenExpression.getInnerExpression();
+            JSExpression contents = parenExpression.getInnerExpression();
 
             getValuesFromExpression(contents, caseExpression, values);
         }
@@ -281,7 +281,7 @@ private static void dumpBody(
             }
             else {
                 // Skip the first and last characters to unwrap the block
-                final String bodyText = bodyStatement.getText();
+                String bodyText = bodyStatement.getText();
                 switchStatementString.append(bodyText.substring(1, bodyText.length() - 1));
             }
         }
@@ -308,13 +308,13 @@ private static void appendElement(
         boolean renameBreakElements,
         String breakLabelString
     ) {
-        final String text = element.getText();
+        String text = element.getText();
 
         if (!renameBreakElements) {
             switchStatementString.append(text);
         }
         else if (element instanceof JSBreakStatement breakStatement) {
-            final String identifier = breakStatement.getLabel();
+            String identifier = breakStatement.getLabel();
             if (identifier == null || identifier.isEmpty()) {
                 switchStatementString.append(LABELED_BREAK_STATEMENT_PREFIX);
                 switchStatementString.append(breakLabelString);
@@ -325,8 +325,8 @@ else if (element instanceof JSBreakStatement breakStatement) {
             }
         }
         else if (element instanceof JSBlockStatement || element instanceof JSIfStatement) {
-            final JSElement[] children = (JSElement[])element.getChildren();
-            for (final JSElement child : children) {
+            JSElement[] children = (JSElement[])element.getChildren();
+            for (JSElement child : children) {
                 appendElement(switchStatementString, child, renameBreakElements, breakLabelString);
             }
         }
@@ -394,15 +394,15 @@ private Set<String> getInnerVariables() {
         }
 
         public boolean topLevelDeclarationsConfictWith(IfStatementBranch testBranch) {
-            final Set<String> innerVariables = testBranch.getInnerVariables();
-            final Set<String> topLevel = testBranch.getTopLevelVariables();
+            Set<String> innerVariables = testBranch.getInnerVariables();
+            Set<String> topLevel = testBranch.getTopLevelVariables();
 
             return hasNonEmptyIntersection(this.topLevelVariables, topLevel)
                 || hasNonEmptyIntersection(this.topLevelVariables, innerVariables);
         }
 
         private static boolean hasNonEmptyIntersection(Set<String> set1, Set<String> set2) {
-            for (final String set1Element : set1) {
+            for (String set1Element : set1) {
                 if (set2.contains(set1Element)) {
                     return true;
                 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index 9ad1f20d..c8e3d184 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -72,19 +72,19 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSSwitchStatement switchStatement = (JSSwitchStatement)element.getParent();
+        JSSwitchStatement switchStatement = (JSSwitchStatement)element.getParent();
 
         assert (switchStatement != null);
 
-        final PsiManager mgr = switchStatement.getManager();
-        final JSExpression switchExpression = switchStatement.getSwitchExpression();
-        final CodeStyleManager codeStyleMgr = CodeStyleManager.getInstance(element.getProject());
-        final boolean hadSideEffects = SideEffectChecker.mayHaveSideEffects(switchExpression);
-        final String declarationString;
-        final String expressionText;
+        PsiManager mgr = switchStatement.getManager();
+        JSExpression switchExpression = switchStatement.getSwitchExpression();
+        CodeStyleManager codeStyleMgr = CodeStyleManager.getInstance(element.getProject());
+        boolean hadSideEffects = SideEffectChecker.mayHaveSideEffects(switchExpression);
+        String declarationString;
+        String expressionText;
 
         if (hadSideEffects) {
-            final String variableName =
+            String variableName =
                 "i"; // TODO JavaCodeStyleManager.getInstance(switchExpression.getProject()).suggestUniqueVariableName("i", switchExpression, true);
 
             expressionText = variableName;
@@ -104,7 +104,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
             }
         }
 
-        final StringBuilder ifStatementBuffer = new StringBuilder(1024);
+        StringBuilder ifStatementBuffer = new StringBuilder(1024);
         String breakLabel = null;
 
         if (renameBreaks) {
@@ -112,13 +112,13 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
             ifStatementBuffer.append(breakLabel).append(':');
         }
 
-        final List<SwitchStatementBranch> openBranches = new ArrayList<>();
-        final Set<JSVariable> declaredVars = new HashSet<>(5);
-        final List<SwitchStatementBranch> allBranches = new ArrayList<>();
+        List<SwitchStatementBranch> openBranches = new ArrayList<>();
+        Set<JSVariable> declaredVars = new HashSet<>(5);
+        List<SwitchStatementBranch> allBranches = new ArrayList<>();
         SwitchStatementBranch currentBranch = null;
 
         for (JSCaseClause caseClause : switchStatement.getCaseClauses()) {
-            final PsiElement[] caseClauseChildren = caseClause.getChildren();
+            PsiElement[] caseClauseChildren = caseClause.getChildren();
 
             for (PsiElement child : caseClauseChildren) {
                 if (child == caseClauseChildren[0]) {
@@ -142,22 +142,22 @@ else if (currentBranch.hasStatements()) {
 
                 if (child instanceof JSExpression) {
                     // Processes case clause expression
-                    final JSExpression value = ParenthesesUtils.stripParentheses(caseClause.getCaseExpression());
+                    JSExpression value = ParenthesesUtils.stripParentheses(caseClause.getCaseExpression());
 
                     assert (currentBranch != null);
                     currentBranch.addLabel(value.getText());
                 }
                 else if (child instanceof JSStatement) {
                     // Processes case clause statements
-                    final JSStatement statement = (JSStatement)child;
+                    JSStatement statement = (JSStatement)child;
 
                     if (statement instanceof JSVarStatement) {
                         Collections.addAll(declaredVars, ((JSVarStatement)statement).getVariables());
                     }
                     else if (statement instanceof JSBlockStatement) {
                         for (PsiElement blockElement : statement.getChildren()) {
-                            final boolean isJsElement = (blockElement instanceof JSElement);
-                            final boolean isWhiteSpace = (blockElement instanceof PsiWhiteSpace);
+                            boolean isJsElement = (blockElement instanceof JSElement);
+                            boolean isWhiteSpace = (blockElement instanceof PsiWhiteSpace);
 
                             for (SwitchStatementBranch branch : openBranches) {
                                 if (isJsElement) {
@@ -183,7 +183,7 @@ else if (isWhiteSpace) {
                     }
                 }
                 else {
-                    final boolean isWhiteSpace = (child instanceof PsiWhiteSpace);
+                    boolean isWhiteSpace = (child instanceof PsiWhiteSpace);
 
                     for (SwitchStatementBranch openBranch : openBranches) {
                         if (isWhiteSpace) {
@@ -205,9 +205,9 @@ else if (isWhiteSpace) {
                 defaultBranch = branch;
             }
             else {
-                final List<String> labels = branch.getLabels();
-                final List<PsiElement> bodyElements = branch.getBodyElements();
-                final Set<JSVariable> pendingVariableDeclarations = branch.getPendingVariableDeclarations();
+                List<String> labels = branch.getLabels();
+                List<PsiElement> bodyElements = branch.getBodyElements();
+                Set<JSVariable> pendingVariableDeclarations = branch.getPendingVariableDeclarations();
 
                 dumpBranch(
                     ifStatementBuffer,
@@ -223,8 +223,8 @@ else if (isWhiteSpace) {
             }
         }
         if (defaultBranch != null) {
-            final List<PsiElement> bodyElements = defaultBranch.getBodyElements();
-            final Set<JSVariable> pendingVariableDeclarations = defaultBranch.getPendingVariableDeclarations();
+            List<PsiElement> bodyElements = defaultBranch.getBodyElements();
+            Set<JSVariable> pendingVariableDeclarations = defaultBranch.getPendingVariableDeclarations();
 
             dumpDefaultBranch(
                 ifStatementBuffer,
@@ -237,10 +237,10 @@ else if (isWhiteSpace) {
         }
 
         if (hadSideEffects) {
-            final String ifStatementString = ifStatementBuffer.toString();
-            final JSStatement declarationStatement =
+            String ifStatementString = ifStatementBuffer.toString();
+            JSStatement declarationStatement =
                 (JSStatement)JSChangeUtil.createStatementFromText(element.getProject(), declarationString).getPsi();
-            final JSStatement ifStatement =
+            JSStatement ifStatement =
                 (JSStatement)JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
 
             codeStyleMgr.reformat(declarationStatement);
@@ -248,8 +248,8 @@ else if (isWhiteSpace) {
             JSElementFactory.replaceStatement(switchStatement, declarationStatement.getText() + '\n' + ifStatement.getText());
         }
         else {
-            final String ifStatementString = ifStatementBuffer.toString();
-            final JSStatement newStatement =
+            String ifStatementString = ifStatementBuffer.toString();
+            JSStatement newStatement =
                 (JSStatement)JSChangeUtil.createStatementFromText(element.getProject(), ifStatementString).getPsi();
 
             codeStyleMgr.reformat(newStatement);
@@ -314,7 +314,7 @@ private static void dumpBody(
         Set<JSVariable> variableDecls
     ) {
         ifStatementString.append('{');
-        for (final JSVariable var : variableDecls) {
+        for (JSVariable var : variableDecls) {
             if (CaseUtil.isUsedByStatementList(var, bodyStatements)) {
                 ifStatementString.append(VAR_PREFIX)
                     .append(var.getName())
@@ -322,7 +322,7 @@ private static void dumpBody(
             }
         }
 
-        for (final PsiElement bodyStatement : bodyStatements) {
+        for (PsiElement bodyStatement : bodyStatements) {
             if (!(bodyStatement instanceof JSBreakStatement)) {
                 appendElement(ifStatementString, bodyStatement, renameBreaks,
                     breakLabel
@@ -340,12 +340,12 @@ private static void appendElement(
         String breakLabelString
     ) {
         if (!renameBreakElements) {
-            final String text = element.getText();
+            String text = element.getText();
 
             ifStatementString.append(text);
         }
         else if (element instanceof JSBreakStatement breakStatement) {
-            final String identifier = breakStatement.getLabel();
+            String identifier = breakStatement.getLabel();
 
             if (identifier == null || identifier.isEmpty()) {
                 ifStatementString.append(BREAK_KEYWORD).append(breakLabelString).append(';');
@@ -355,7 +355,7 @@ else if (element instanceof JSBreakStatement breakStatement) {
             }
         }
         else if (element instanceof JSBlockStatement) {
-            for (final PsiElement child : element.getChildren()) {
+            for (PsiElement child : element.getChildren()) {
                 appendElement(ifStatementString, child, renameBreakElements, breakLabelString);
             }
         }
@@ -380,14 +380,14 @@ else if (element instanceof JSIfStatement ifStatement) {
     private static class SwitchPredicate implements JSElementPredicate {
         @Override
         public boolean satisfiedBy(@Nonnull PsiElement element) {
-            final PsiElement parent = element.getParent();
+            PsiElement parent = element.getParent();
 
             if (parent instanceof JSSwitchStatement switchStatement) {
                 if (ErrorUtil.containsError(switchStatement)) {
                     return false;
                 }
 
-                final JSExpression expression = switchStatement.getSwitchExpression();
+                JSExpression expression = switchStatement.getSwitchExpression();
 
                 return expression != null && expression.isValid();
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
index 29302983..d73122df 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LabelSearchVisitor.java
@@ -33,7 +33,7 @@ public void visitJSReferenceExpression(JSReferenceExpression expression) {
 
     @Override
     public void visitJSLabeledStatement(JSLabeledStatement statement) {
-        final String labelText = statement.getLabel();
+        String labelText = statement.getLabel();
 
         this.used = labelText != null && labelText.equals(this.labelName);
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
index 787ede47..aa13b4b8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/LocalVariableUsageVisitor.java
@@ -30,7 +30,7 @@ class LocalVariableUsageVisitor extends JSRecursiveElementVisitor {
 
     @Override
     public void visitJSReferenceExpression(JSReferenceExpression expression) {
-        final JSElement reference = (JSElement)expression.resolve();
+        JSElement reference = (JSElement)expression.resolve();
         if (this.variable.equals(reference)) {
             this.used = true;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index 8029b032..954207da 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -52,12 +52,12 @@ public JSElementPredicate getElementPredicate() {
 
     @Override
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement parentStatement = (JSIfStatement)element.getParent();
+        JSIfStatement parentStatement = (JSIfStatement)element.getParent();
 
         assert (parentStatement != null);
 
-        final JSBlockStatement elseBranch = (JSBlockStatement)parentStatement.getElse();
-        final JSStatement elseBranchContents = elseBranch.getStatements()[0];
+        JSBlockStatement elseBranch = (JSBlockStatement)parentStatement.getElse();
+        JSStatement elseBranchContents = elseBranch.getStatements()[0];
 
         JSElementFactory.replaceStatement(elseBranch, elseBranchContents.getText());
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index a4e0ae40..931d4ec3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -59,14 +59,14 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
         assert (element.getParent() != null);
         assert (element.getParent() instanceof JSIfStatement || element instanceof JSIfStatement);
 
-        final JSIfStatement parentStatement = (JSIfStatement)(element.getParent() instanceof JSIfStatement ? element.getParent() : element);
-        final JSIfStatement childStatement = (JSIfStatement)ConditionalUtils.stripBraces(parentStatement.getThen());
-        final JSExpression childCondition = childStatement.getCondition();
-        final JSExpression parentCondition = parentStatement.getCondition();
-        final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.AND_PRECENDENCE);
-        final String parentConditionText = ParenthesesUtils.getParenthesized(parentCondition, ParenthesesUtils.AND_PRECENDENCE);
-        final JSStatement childThenBranch = childStatement.getThen();
-        final String statement = "if (" + parentConditionText + " && " + childConditionText + ')' + childThenBranch.getText();
+        JSIfStatement parentStatement = (JSIfStatement)(element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+        JSIfStatement childStatement = (JSIfStatement)ConditionalUtils.stripBraces(parentStatement.getThen());
+        JSExpression childCondition = childStatement.getCondition();
+        JSExpression parentCondition = parentStatement.getCondition();
+        String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.AND_PRECENDENCE);
+        String parentConditionText = ParenthesesUtils.getParenthesized(parentCondition, ParenthesesUtils.AND_PRECENDENCE);
+        JSStatement childThenBranch = childStatement.getThen();
+        String statement = "if (" + parentConditionText + " && " + childConditionText + ')' + childThenBranch.getText();
 
         JSElementFactory.replaceStatement(parentStatement, statement);
     }
@@ -90,14 +90,14 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 }
             }
 
-            final JSIfStatement ifStatement = (JSIfStatement)parent;
+            JSIfStatement ifStatement = (JSIfStatement)parent;
 
             if (ErrorUtil.containsError(ifStatement)) {
                 return false;
             }
 
-            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-            final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+            JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+            JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
 
             return elseBranch == null && thenBranch instanceof JSIfStatement childIfStatement && childIfStatement.getElse() == null;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index c25bed92..a82725e7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -65,23 +65,23 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     @RequiredReadAction
     private static void replaceMergeableExplicitIf(JSElement token) throws IncorrectOperationException {
-        final JSIfStatement parentStatement = (JSIfStatement)(token.getParent() instanceof JSIfStatement ? token.getParent() : token);
+        JSIfStatement parentStatement = (JSIfStatement)(token.getParent() instanceof JSIfStatement ? token.getParent() : token);
 
         assert (parentStatement != null);
 
-        final JSIfStatement childStatement = (JSIfStatement)parentStatement.getElse();
-        final JSExpression childCondition = childStatement.getCondition();
-        final JSExpression condition = parentStatement.getCondition();
-        final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
-        final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
-        final JSStatement parentThenBranch = parentStatement.getThen();
-        final StringBuilder statement = new StringBuilder("if (")
+        JSIfStatement childStatement = (JSIfStatement)parentStatement.getElse();
+        JSExpression childCondition = childStatement.getCondition();
+        JSExpression condition = parentStatement.getCondition();
+        String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
+        String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
+        JSStatement parentThenBranch = parentStatement.getThen();
+        StringBuilder statement = new StringBuilder("if (")
             .append(parentConditionText)
             .append(" || ")
             .append(childConditionText)
             .append(')')
             .append(parentThenBranch.getText());
-        final JSStatement childElseBranch = childStatement.getElse();
+        JSStatement childElseBranch = childStatement.getElse();
 
         if (childElseBranch != null) {
             statement.append("else ").append(childElseBranch.getText());
@@ -92,18 +92,18 @@ private static void replaceMergeableExplicitIf(JSElement token) throws Incorrect
 
     @RequiredReadAction
     private static void replaceMergeableImplicitIf(JSElement token) throws IncorrectOperationException {
-        final JSIfStatement parentStatement = (JSIfStatement)(token.getParent() instanceof JSIfStatement ? token.getParent() : token);
-        final JSIfStatement childStatement = (JSIfStatement)JSElementFactory.getNonWhiteSpaceSibling(parentStatement, true);
+        JSIfStatement parentStatement = (JSIfStatement)(token.getParent() instanceof JSIfStatement ? token.getParent() : token);
+        JSIfStatement childStatement = (JSIfStatement)JSElementFactory.getNonWhiteSpaceSibling(parentStatement, true);
 
         assert (childStatement != null);
         assert (parentStatement != null);
 
-        final JSExpression childCondition = childStatement.getCondition();
-        final JSExpression condition = parentStatement.getCondition();
-        final String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
-        final String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
-        final JSStatement parentThenBranch = parentStatement.getThen();
-        final JSStatement childElseBranch = childStatement.getElse();
+        JSExpression childCondition = childStatement.getCondition();
+        JSExpression condition = parentStatement.getCondition();
+        String childConditionText = ParenthesesUtils.getParenthesized(childCondition, ParenthesesUtils.OR_PRECENDENCE);
+        String parentConditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.OR_PRECENDENCE);
+        JSStatement parentThenBranch = parentStatement.getThen();
+        JSStatement childElseBranch = childStatement.getElse();
         StringBuilder statement = new StringBuilder("if (")
             .append(parentConditionText)
             .append(" || ")
@@ -138,13 +138,13 @@ public static boolean isMergableExplicitIf(JSElement element) {
                 }
             }
 
-            final JSIfStatement ifStatement = (JSIfStatement)parent;
+            JSIfStatement ifStatement = (JSIfStatement)parent;
 
             if (ErrorUtil.containsError(ifStatement)) {
                 return false;
             }
 
-            final JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
+            JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
 
             return thenBranch != null
                 && elseBranch instanceof JSIfStatement childIfStatement
@@ -163,14 +163,14 @@ private static boolean isMergableImplicitIf(JSElement element) {
                 }
             }
 
-            final JSIfStatement ifStatement = (JSIfStatement)parent;
-            final JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
+            JSIfStatement ifStatement = (JSIfStatement)parent;
+            JSStatement thenBranch = ifStatement.getThen(), elseBranch = ifStatement.getElse();
 
             if (thenBranch == null || elseBranch != null || ControlFlowUtils.statementMayCompleteNormally(thenBranch)) {
                 return false;
             }
 
-            final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
+            PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
 
             return nextStatement instanceof JSIfStatement childIfStatement
                 && EquivalenceChecker.statementsAreEquivalent(thenBranch, childIfStatement.getThen());
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index 5b3fd0c1..bbca23e4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -55,13 +55,13 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
+        PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
 
-        final JSIfStatement firstStatement = (JSIfStatement)element;
-        final JSIfStatement secondStatement = (JSIfStatement)nextElement;
-        final StringBuilder statementBuffer = new StringBuilder();
+        JSIfStatement firstStatement = (JSIfStatement)element;
+        JSIfStatement secondStatement = (JSIfStatement)nextElement;
+        StringBuilder statementBuffer = new StringBuilder();
 
         this.mergeIfStatements(statementBuffer, firstStatement, secondStatement);
         JSElementFactory.replaceStatement(firstStatement, statementBuffer.toString());
@@ -70,11 +70,11 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     @RequiredReadAction
     private void mergeIfStatements(StringBuilder statementBuffer, JSIfStatement firstStatement, JSIfStatement secondStatement) {
-        final JSExpression condition = firstStatement.getCondition();
-        final JSStatement firstThenBranch = firstStatement.getThen();
-        final JSStatement secondThenBranch = secondStatement.getThen();
-        final JSStatement firstElseBranch = firstStatement.getElse();
-        final JSStatement secondElseBranch = secondStatement.getElse();
+        JSExpression condition = firstStatement.getCondition();
+        JSStatement firstThenBranch = firstStatement.getThen();
+        JSStatement secondThenBranch = secondStatement.getThen();
+        JSStatement firstElseBranch = firstStatement.getElse();
+        JSStatement secondElseBranch = secondStatement.getElse();
 
         statementBuffer.append("if (").append(condition.getText()).append(')');
         ControlFlowUtils.appendStatementsInSequence(statementBuffer, firstThenBranch, secondThenBranch);
@@ -103,23 +103,23 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
         }
 
         public static boolean ifStatementsCanBeMerged(JSIfStatement statement1, JSIfStatement statement2) {
-            final JSStatement thenBranch = statement1.getThen();
-            final JSStatement elseBranch = statement1.getElse();
+            JSStatement thenBranch = statement1.getThen();
+            JSStatement elseBranch = statement1.getElse();
             if (thenBranch == null) {
                 return false;
             }
-            final JSExpression firstCondition = statement1.getCondition();
-            final JSExpression secondCondition = statement2.getCondition();
+            JSExpression firstCondition = statement1.getCondition();
+            JSExpression secondCondition = statement2.getCondition();
             if (!EquivalenceChecker.expressionsAreEquivalent(firstCondition, secondCondition)) {
                 return false;
             }
 
-            final JSStatement nextThenBranch = statement2.getThen();
+            JSStatement nextThenBranch = statement2.getThen();
             if (!ControlFlowUtils.canBeMerged(thenBranch, nextThenBranch)) {
                 return false;
             }
 
-            final JSStatement nextElseBranch = statement2.getElse();
+            JSStatement nextElseBranch = statement2.getElse();
             return (elseBranch == null || nextElseBranch == null || ControlFlowUtils.canBeMerged(elseBranch, nextElseBranch));
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index fd89ad2d..b50242d3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -54,16 +54,16 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement ifStatement = (JSIfStatement)element;
-        final JSStatement thenBranch = ifStatement.getThen();
-        final JSStatement elseBranch = ifStatement.getElse();
+        JSIfStatement ifStatement = (JSIfStatement)element;
+        JSStatement thenBranch = ifStatement.getThen();
+        JSStatement elseBranch = ifStatement.getElse();
 
         assert (thenBranch != null);
         assert (elseBranch != null);
 
-        final String newIfText = "if (" + ifStatement.getCondition().getText() + ')' + thenBranch.getText();
-        final String elseText = elseBranch.getText();
-        final String newStatement = elseBranch instanceof JSBlockStatement
+        String newIfText = "if (" + ifStatement.getCondition().getText() + ')' + thenBranch.getText();
+        String elseText = elseBranch.getText();
+        String newStatement = elseBranch instanceof JSBlockStatement
             ? elseText.substring(elseText.indexOf('{') + 1, elseText.lastIndexOf('}') - 1).trim()
             : elseText;
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index 2365c92f..c7538b0b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -52,29 +52,29 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement ifStatement = (JSIfStatement)(element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+        JSIfStatement ifStatement = (JSIfStatement)(element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         assert (ifStatement != null);
 
         if (ReplaceIfWithConditionalPredicate.isReplaceableAssignment(ifStatement)) {
-            final StringBuilder newStatement = new StringBuilder();
+            StringBuilder newStatement = new StringBuilder();
 
             getAssignmentReplacement(newStatement, ifStatement);
             newStatement.append(';');
             JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
         }
         else if (ReplaceIfWithConditionalPredicate.isReplaceableReturn(ifStatement)) {
-            final StringBuilder newStatement = new StringBuilder("return ");
+            StringBuilder newStatement = new StringBuilder("return ");
 
             getReturnReplacement(newStatement, ifStatement);
             newStatement.append(';');
             JSElementFactory.replaceStatement(ifStatement, newStatement.toString());
         }
         else if (ReplaceIfWithConditionalPredicate.isReplaceableImplicitReturn(ifStatement)) {
-            final JSExpression condition = ifStatement.getCondition();
-            final JSReturnStatement thenBranch = (JSReturnStatement)ConditionalUtils.stripBraces(ifStatement.getThen());
-            final JSReturnStatement elseBranch = PsiTreeUtil.getNextSiblingOfType(ifStatement, JSReturnStatement.class);
-            final String newStatement = getImplicitReturnReplacement(condition, thenBranch, elseBranch);
+            JSExpression condition = ifStatement.getCondition();
+            JSReturnStatement thenBranch = (JSReturnStatement)ConditionalUtils.stripBraces(ifStatement.getThen());
+            JSReturnStatement elseBranch = PsiTreeUtil.getNextSiblingOfType(ifStatement, JSReturnStatement.class);
+            String newStatement = getImplicitReturnReplacement(condition, thenBranch, elseBranch);
 
             JSElementFactory.replaceStatement(ifStatement, newStatement);
             if (elseBranch != null) {
@@ -85,12 +85,12 @@ else if (ReplaceIfWithConditionalPredicate.isReplaceableImplicitReturn(ifStateme
 
     @RequiredReadAction
     private static void getAssignmentReplacement(StringBuilder buffer, JSIfStatement ifStatement) {
-        final JSExpression condition = ifStatement.getCondition();
-        final JSExpressionStatement thenBranch = (JSExpressionStatement)ConditionalUtils.stripBraces(ifStatement.getThen());
-        final JSAssignmentExpression thenAssign = (JSAssignmentExpression)thenBranch.getExpression();
-        final JSExpression thenRhs = thenAssign.getROperand();
-        final String operator = BinaryOperatorUtils.getOperatorText(thenAssign.getOperationSign());
-        final JSStatement elseBranch = ifStatement.getElse();
+        JSExpression condition = ifStatement.getCondition();
+        JSExpressionStatement thenBranch = (JSExpressionStatement)ConditionalUtils.stripBraces(ifStatement.getThen());
+        JSAssignmentExpression thenAssign = (JSAssignmentExpression)thenBranch.getExpression();
+        JSExpression thenRhs = thenAssign.getROperand();
+        String operator = BinaryOperatorUtils.getOperatorText(thenAssign.getOperationSign());
+        JSStatement elseBranch = ifStatement.getElse();
 
         assert (thenRhs != null);
 
@@ -106,9 +106,9 @@ private static void getAssignmentReplacement(StringBuilder buffer, JSIfStatement
             return;
         }
 
-        final JSExpressionStatement strippedElseBranch = (JSExpressionStatement)ConditionalUtils.stripBraces(elseBranch);
-        final JSAssignmentExpression elseAssign = (JSAssignmentExpression)strippedElseBranch.getExpression();
-        final JSExpression elseRhs = elseAssign.getROperand();
+        JSExpressionStatement strippedElseBranch = (JSExpressionStatement)ConditionalUtils.stripBraces(elseBranch);
+        JSAssignmentExpression elseAssign = (JSAssignmentExpression)strippedElseBranch.getExpression();
+        JSExpression elseRhs = elseAssign.getROperand();
 
         assert (elseRhs != null);
 
@@ -116,9 +116,9 @@ private static void getAssignmentReplacement(StringBuilder buffer, JSIfStatement
     }
 
     private static void getReturnReplacement(StringBuilder buffer, JSIfStatement ifStatement) {
-        final JSStatement thenBranch = ifStatement.getThen();
-        final JSReturnStatement thenReturn = (JSReturnStatement)ConditionalUtils.stripBraces(thenBranch);
-        final JSStatement elseBranch = ifStatement.getElse();
+        JSStatement thenBranch = ifStatement.getThen();
+        JSReturnStatement thenReturn = (JSReturnStatement)ConditionalUtils.stripBraces(thenBranch);
+        JSStatement elseBranch = ifStatement.getElse();
 
         buffer.append(ParenthesesUtils.getParenthesized(ifStatement.getCondition(), ParenthesesUtils.CONDITIONAL_PRECENDENCE))
             .append('?')
@@ -130,7 +130,7 @@ private static void getReturnReplacement(StringBuilder buffer, JSIfStatement ifS
             return;
         }
 
-        final JSReturnStatement elseReturn = (JSReturnStatement)ConditionalUtils.stripBraces(elseBranch);
+        JSReturnStatement elseReturn = (JSReturnStatement)ConditionalUtils.stripBraces(elseBranch);
 
         buffer.append(ParenthesesUtils.getParenthesized(elseReturn.getExpression(), ParenthesesUtils.CONDITIONAL_PRECENDENCE));
     }
@@ -139,12 +139,12 @@ private static String getImplicitReturnReplacement(JSExpression condition, JSRet
         assert (thenBranch != null);
         assert (elseBranch != null);
 
-        final JSExpression thenReturnValue = thenBranch.getExpression();
-        final JSExpression elseReturnValue = elseBranch.getExpression();
+        JSExpression thenReturnValue = thenBranch.getExpression();
+        JSExpression elseReturnValue = elseBranch.getExpression();
 
-        final String thenValue = ParenthesesUtils.getParenthesized(thenReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
-        final String elseValue = ParenthesesUtils.getParenthesized(elseReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
-        final String conditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
+        String thenValue = ParenthesesUtils.getParenthesized(thenReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
+        String elseValue = ParenthesesUtils.getParenthesized(elseReturnValue, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
+        String conditionText = ParenthesesUtils.getParenthesized(condition, ParenthesesUtils.CONDITIONAL_PRECENDENCE);
 
         return "return " + conditionText + '?' + thenValue + ':' + elseValue + ';';
     }
@@ -171,8 +171,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final JSIfStatement ifStatement = (JSIfStatement)parent;
-            final JSExpression condition = ifStatement.getCondition();
+            JSIfStatement ifStatement = (JSIfStatement)parent;
+            JSExpression condition = ifStatement.getCondition();
 
             if (condition == null || !condition.isValid()) {
                 return false;
@@ -183,13 +183,13 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
         }
 
         public static boolean isReplaceableImplicitReturn(JSIfStatement ifStatement) {
-            final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
+            PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
 
             if (!(nextStatement instanceof JSReturnStatement nextReturnStatement)) {
                 return false;
             }
 
-            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+            JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
 
             return thenBranch instanceof JSReturnStatement thenReturnStatement
                 && thenReturnStatement.getExpression() != null
@@ -197,8 +197,8 @@ public static boolean isReplaceableImplicitReturn(JSIfStatement ifStatement) {
         }
 
         public static boolean isReplaceableReturn(JSIfStatement ifStatement) {
-            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-            final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+            JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+            JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
 
             if (!(thenBranch instanceof JSReturnStatement thenReturnStatement)) {
                 return false;
@@ -215,7 +215,7 @@ public static boolean isReplaceableReturn(JSIfStatement ifStatement) {
 
         @RequiredReadAction
         public static boolean isReplaceableAssignment(JSIfStatement ifStatement) {
-            final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+            JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
             if (thenBranch == null) {
                 return false;
             }
@@ -223,7 +223,7 @@ public static boolean isReplaceableAssignment(JSIfStatement ifStatement) {
             if (!ConditionalUtils.isAssignment(thenBranch)) {
                 return false;
             }
-            final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+            JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
 
             if (elseBranch == null) {
                 return false;
@@ -237,31 +237,31 @@ public static boolean isReplaceableAssignment(JSIfStatement ifStatement) {
                 return false;
             }
 
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression)((JSExpressionStatement)thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression)((JSExpressionStatement)elseBranch).getExpression();
-            final IElementType thenSign = thenExpression.getOperationSign();
-            final IElementType elseSign = elseExpression.getOperationSign();
+            JSAssignmentExpression thenExpression = (JSAssignmentExpression)((JSExpressionStatement)thenBranch).getExpression();
+            JSAssignmentExpression elseExpression = (JSAssignmentExpression)((JSExpressionStatement)elseBranch).getExpression();
+            IElementType thenSign = thenExpression.getOperationSign();
+            IElementType elseSign = elseExpression.getOperationSign();
 
             if (!thenSign.equals(elseSign)) {
                 return false;
             }
 
-            final JSExpression thenLhs = thenExpression.getLOperand();
+            JSExpression thenLhs = thenExpression.getLOperand();
 
             if (thenExpression.getROperand() == null
                 || elseExpression.getROperand() == null
                 || elseExpression.getLOperand() == null) {
                 return false;
             }
-            final JSExpression thenRhs = thenExpression.getROperand();
+            JSExpression thenRhs = thenExpression.getROperand();
             assert thenRhs != null;
 
-            final JSExpression elseRhs = elseExpression.getROperand();
+            JSExpression elseRhs = elseExpression.getROperand();
             if (elseRhs == null) {
                 return false;
             }
 
-            final JSExpression elseLhs = elseExpression.getLOperand();
+            JSExpression elseLhs = elseExpression.getLOperand();
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index 78167562..bf63c521 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -51,7 +51,7 @@ public JSElementPredicate getElementPredicate() {
 
     @Override
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement statement = element.getParent() instanceof JSIfStatement ? element.getParent() : element;
+        PsiElement statement = element.getParent() instanceof JSIfStatement ? element.getParent() : element;
 
         ConditionalUtils.replaceAssignmentOrReturnIfSimplifiable((JSIfStatement)statement);
     }
@@ -77,8 +77,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 return false;
             }
 
-            final JSIfStatement ifStatement = (JSIfStatement)parent;
-            final JSExpression condition = ifStatement.getCondition();
+            JSIfStatement ifStatement = (JSIfStatement)parent;
+            JSExpression condition = ifStatement.getCondition();
 
             if (condition == null || !condition.isValid()) {
                 return false;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index 666fcc06..4596975c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -52,12 +52,12 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final JSIfStatement parentStatement = (JSIfStatement)element.getParent();
+        JSIfStatement parentStatement = (JSIfStatement)element.getParent();
 
         assert (parentStatement != null);
 
-        final JSStatement elseBranch = parentStatement.getElse();
-        final String newStatement = '{' + elseBranch.getText() + '}';
+        JSStatement elseBranch = parentStatement.getElse();
+        String newStatement = '{' + elseBranch.getText() + '}';
 
         JSElementFactory.replaceStatement(elseBranch, newStatement);
     }
@@ -65,19 +65,19 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class SplitElseIfPredicate implements JSElementPredicate {
         @Override
         public boolean satisfiedBy(@Nonnull PsiElement element) {
-            final PsiElement parent = element.getParent();
+            PsiElement parent = element.getParent();
 
             if (!(parent instanceof JSIfStatement)) {
                 return false;
             }
 
-            final JSIfStatement ifStatement = (JSIfStatement)parent;
+            JSIfStatement ifStatement = (JSIfStatement)parent;
 
             if (ErrorUtil.containsError(ifStatement)) {
                 return false;
             }
-            final JSStatement thenBranch = ifStatement.getThen();
-            final JSStatement elseBranch = ifStatement.getElse();
+            JSStatement thenBranch = ifStatement.getThen();
+            JSStatement elseBranch = ifStatement.getElse();
 
             return thenBranch != null && elseBranch != null && elseBranch instanceof JSIfStatement;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index f1b0f6b6..c1cbad4c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -56,27 +56,27 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+        PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         assert (jsElement != null);
         assert (jsElement instanceof JSIfStatement);
 
-        final JSIfStatement ifStatement = (JSIfStatement)jsElement;
+        JSIfStatement ifStatement = (JSIfStatement)jsElement;
 
         assert (ifStatement.getCondition() instanceof JSBinaryExpression);
 
-        final JSBinaryExpression condition = (JSBinaryExpression)ifStatement.getCondition();
-        final String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
-        final String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
-        final JSStatement thenBranch = ifStatement.getThen();
-        final JSStatement elseBranch = ifStatement.getElse();
-        final String thenText = thenBranch.getText();
-        final String elseText = (elseBranch == null) ? null : elseBranch.getText();
-        final int elseLength = (elseBranch == null) ? 0 : elseText.length();
+        JSBinaryExpression condition = (JSBinaryExpression)ifStatement.getCondition();
+        String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
+        String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
+        JSStatement thenBranch = ifStatement.getThen();
+        JSStatement elseBranch = ifStatement.getElse();
+        String thenText = thenBranch.getText();
+        String elseText = (elseBranch == null) ? null : elseBranch.getText();
+        int elseLength = (elseBranch == null) ? 0 : elseText.length();
 
         assert JSTokenTypes.ANDAND.equals(condition.getOperationSign());
 
-        final StringBuilder statement = new StringBuilder(ifStatement.getTextLength() + elseLength + 30);
+        StringBuilder statement = new StringBuilder(ifStatement.getTextLength() + elseLength + 30);
 
         statement.append("if (")
             .append(lhsText)
@@ -110,8 +110,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 }
             }
 
-            final JSIfStatement ifStatement = (JSIfStatement)parent;
-            final JSExpression condition = ifStatement.getCondition();
+            JSIfStatement ifStatement = (JSIfStatement)parent;
+            JSExpression condition = ifStatement.getCondition();
 
             return condition != null
                 && !ErrorUtil.containsError(condition)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index f51450a2..3d6ba289 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -56,25 +56,25 @@ public JSElementPredicate getElementPredicate() {
     @Override
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        final PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
+        PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         assert (jsElement != null);
         assert (jsElement instanceof JSIfStatement);
 
-        final JSIfStatement ifStatement = (JSIfStatement)jsElement;
+        JSIfStatement ifStatement = (JSIfStatement)jsElement;
 
         assert (ifStatement.getCondition() instanceof JSBinaryExpression);
 
-        final JSBinaryExpression condition = (JSBinaryExpression)ifStatement.getCondition();
-        final String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
-        final String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
-        final JSStatement thenBranch = ifStatement.getThen();
-        final JSStatement elseBranch = ifStatement.getElse();
-        final String thenText = thenBranch.getText();
+        JSBinaryExpression condition = (JSBinaryExpression)ifStatement.getCondition();
+        String lhsText = ParenthesesUtils.removeParentheses(condition.getLOperand());
+        String rhsText = ParenthesesUtils.removeParentheses(condition.getROperand());
+        JSStatement thenBranch = ifStatement.getThen();
+        JSStatement elseBranch = ifStatement.getElse();
+        String thenText = thenBranch.getText();
 
         assert JSTokenTypes.OROR.equals(condition.getOperationSign());
 
-        final StringBuilder statement = new StringBuilder(ifStatement.getTextLength());
+        StringBuilder statement = new StringBuilder(ifStatement.getTextLength());
 
         statement.append("if (").append(lhsText).append(')')
             .append(thenText)
@@ -103,8 +103,8 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                 }
             }
 
-            final JSIfStatement ifStatement = (JSIfStatement)parent;
-            final JSExpression condition = ifStatement.getCondition();
+            JSIfStatement ifStatement = (JSIfStatement)parent;
+            JSExpression condition = ifStatement.getCondition();
 
             return condition != null
                 && !ErrorUtil.containsError(condition)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
index 5aeb2e64..5fd6db38 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
@@ -37,7 +37,7 @@ public static boolean isBinaryOperator(JSExpression expression) {
 
     public static boolean isShiftOperator(JSExpression expression) {
         if (expression instanceof JSBinaryExpression binaryExpression) {
-            final IElementType sign = binaryExpression.getOperationSign();
+            IElementType sign = binaryExpression.getOperationSign();
 
             return JSTokenTypes.LTLT.equals(sign) ||
                 JSTokenTypes.GTGT.equals(sign) ||
@@ -52,7 +52,7 @@ public static String getOperatorText(IElementType operator) {
         if (operator == null) {
             return "";
         }
-        final OperatorProperties operatorProperties = operators.get(operator);
+        OperatorProperties operatorProperties = operators.get(operator);
         assert operatorProperties != null : "Operator properties is null for " + operator;
         return operatorProperties.text;
     }
@@ -61,7 +61,7 @@ public static boolean isCommutative(IElementType operator) {
         if (operator == null) {
             return false;
         }
-        final OperatorProperties operatorProperties = operators.get(operator);
+        OperatorProperties operatorProperties = operators.get(operator);
         assert operatorProperties != null : "Operator properties is null for " + operator;
         return operatorProperties.commutative;
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
index d30446cb..8e78ff10 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
@@ -44,7 +44,7 @@ public static JSExpression findNegation(JSExpression condition) {
         }
 
         if (ancestor.getParent() instanceof JSPrefixExpression) {
-            final JSPrefixExpression prefixAncestor = (JSPrefixExpression)ancestor.getParent();
+            JSPrefixExpression prefixAncestor = (JSPrefixExpression)ancestor.getParent();
             if (JSTokenTypes.EXCL.equals(prefixAncestor.getOperationSign())) {
                 return prefixAncestor;
             }
@@ -59,14 +59,14 @@ public static boolean isNegation(JSExpression condition) {
 
     public static boolean isNegation(JSExpression condition, boolean ignoreNegatedNullComparison) {
         if (condition instanceof JSPrefixExpression prefixExpression) {
-            final IElementType sign = prefixExpression.getOperationSign();
+            IElementType sign = prefixExpression.getOperationSign();
 
             return JSTokenTypes.EXCL.equals(sign);
         }
         else if (condition instanceof JSBinaryExpression binaryExpression) {
-            final IElementType sign = binaryExpression.getOperationSign();
-            final JSExpression lhs = binaryExpression.getLOperand();
-            final JSExpression rhs = binaryExpression.getROperand();
+            IElementType sign = binaryExpression.getOperationSign();
+            JSExpression lhs = binaryExpression.getLOperand();
+            JSExpression rhs = binaryExpression.getROperand();
 
             if (rhs != null && JSTokenTypes.NE.equals(sign)) {
                 if (!ignoreNegatedNullComparison) {
@@ -87,22 +87,22 @@ else if (condition instanceof JSParenthesizedExpression parenExp) {
         }
     }
 
-    private static boolean isNullLiteral(final JSExpression lhs) {
+    private static boolean isNullLiteral(JSExpression lhs) {
         return lhs.getNode() != null && JSTokenTypes.NULL_KEYWORD.equals(lhs.getNode().getElementType());
     }
 
     public static JSExpression getNegated(JSExpression condition) {
         if (condition instanceof JSPrefixExpression prefixExp) {
-            final JSExpression operand = prefixExp.getExpression();
+            JSExpression operand = prefixExp.getExpression();
 
             return ParenthesesUtils.stripParentheses(operand);
         }
         else if (condition instanceof JSBinaryExpression binaryExpression) {
-            final IElementType sign = binaryExpression.getOperationSign();
-            final JSExpression lhs = binaryExpression.getLOperand();
-            final JSExpression rhs = binaryExpression.getROperand();
-            final String negatedSign = ComparisonUtils.getNegatedOperatorText(sign);
-            final String negatedText = lhs.getText() + negatedSign + rhs.getText();
+            IElementType sign = binaryExpression.getOperationSign();
+            JSExpression lhs = binaryExpression.getLOperand();
+            JSExpression rhs = binaryExpression.getROperand();
+            String negatedSign = ComparisonUtils.getNegatedOperatorText(sign);
+            String negatedText = lhs.getText() + negatedSign + rhs.getText();
 
             return JSChangeUtil.createExpressionFromText(condition.getProject(), negatedText);
         }
@@ -117,7 +117,7 @@ public static boolean isBooleanLiteral(JSExpression condition) {
             return false;
         }
 
-        final String text = condition.getText();
+        String text = condition.getText();
 
         return (TRUE.equals(text) || FALSE.equals(text));
     }
@@ -127,7 +127,7 @@ public static Boolean getBooleanLiteral(JSExpression condition) {
             return null;
         }
 
-        final String text = condition.getText();
+        String text = condition.getText();
 
         return TRUE.equals(text) ? Boolean.TRUE
             : FALSE.equals(text) ? Boolean.FALSE
@@ -147,11 +147,11 @@ public static String getNegatedExpressionText(JSExpression condition) {
             return ParenthesesUtils.getParenthesized(BoolUtils.getNegated(condition), ParenthesesUtils.OR_PRECENDENCE);
         }
         else if (ComparisonUtils.isComparisonOperator(condition)) {
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression)condition;
-            final IElementType sign = binaryExpression.getOperationSign();
-            final String negatedComparison = ComparisonUtils.getNegatedOperatorText(sign);
-            final JSExpression leftOperand = binaryExpression.getLOperand();
-            final JSExpression rightOperand = binaryExpression.getROperand();
+            JSBinaryExpression binaryExpression = (JSBinaryExpression)condition;
+            IElementType sign = binaryExpression.getOperationSign();
+            String negatedComparison = ComparisonUtils.getNegatedOperatorText(sign);
+            JSExpression leftOperand = binaryExpression.getLOperand();
+            JSExpression rightOperand = binaryExpression.getROperand();
 
             return leftOperand.getText() + negatedComparison + (rightOperand != null ? rightOperand.getText() : "");
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
index 45452eac..8e10ef32 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
@@ -29,7 +29,7 @@ private ConditionalUtils() {
 
     public static JSStatement stripBraces(JSStatement branch) {
         if (branch != null && branch instanceof JSBlockStatement block) {
-            final JSStatement[] statements = block.getStatements();
+            JSStatement[] statements = block.getStatements();
 
             if (statements.length == 1) {
                 return statements[0];
@@ -50,7 +50,7 @@ public static boolean isReturn(JSStatement statement, String value) {
             return false;
         }
 
-        final JSExpression returnExpression = ((JSReturnStatement)statement).getExpression();
+        JSExpression returnExpression = ((JSReturnStatement)statement).getExpression();
 
         return (returnExpression != null && value.equals(returnExpression.getText()));
     }
@@ -60,13 +60,13 @@ public static boolean isAssignment(JSStatement statement, String value) {
             return false;
         }
 
-        final JSExpression expression = ((JSExpressionStatement)statement).getExpression();
+        JSExpression expression = ((JSExpressionStatement)statement).getExpression();
 
         if (!(expression instanceof JSAssignmentExpression)) {
             return false;
         }
 
-        final JSExpression rhs = ((JSAssignmentExpression)expression).getROperand();
+        JSExpression rhs = ((JSAssignmentExpression)expression).getROperand();
 
         return (rhs != null && rhs.getText().equals(value));
     }
@@ -76,7 +76,7 @@ public static boolean isAssignment(JSStatement statement) {
             return false;
         }
 
-        final JSExpressionStatement expressionStatement = (JSExpressionStatement)statement;
+        JSExpressionStatement expressionStatement = (JSExpressionStatement)statement;
 
         return (expressionStatement.getExpression() instanceof JSAssignmentExpression);
     }
@@ -93,8 +93,8 @@ public static boolean isConditional(JSExpression expression) {
         }
 
         if (expression instanceof JSBinaryExpression) {
-            final JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
-            final IElementType sign = binaryExpression.getOperationSign();
+            JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
+            IElementType sign = binaryExpression.getOperationSign();
 
             if (JSTokenTypes.XOR.equals(sign)) {
                 return (isConditional(binaryExpression.getLOperand()) &&
@@ -111,14 +111,14 @@ public static boolean isConditional(JSExpression expression) {
     }
 
     public static boolean isSimplifiableImplicitReturn(JSIfStatement ifStatement, boolean negated) {
-        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-        final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
+        JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+        PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, true);
 
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
 
-        final JSStatement elseBranch = (JSStatement)nextStatement;
+        JSStatement elseBranch = (JSStatement)nextStatement;
 
         if (negated) {
             return ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE)
@@ -131,8 +131,8 @@ public static boolean isSimplifiableImplicitReturn(JSIfStatement ifStatement, bo
     }
 
     public static boolean isSimplifiableReturn(JSIfStatement ifStatement, boolean negated) {
-        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-        final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+        JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+        JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
 
         if (negated) {
             return ConditionalUtils.isReturn(thenBranch, BoolUtils.FALSE)
@@ -145,10 +145,10 @@ public static boolean isSimplifiableReturn(JSIfStatement ifStatement, boolean ne
     }
 
     public static boolean isSimplifiableAssignment(JSIfStatement ifStatement, boolean negated) {
-        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-        final JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
+        JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+        JSStatement elseBranch = ConditionalUtils.stripBraces(ifStatement.getElse());
 
-        final boolean isAssignment;
+        boolean isAssignment;
 
         if (negated) {
             isAssignment = ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE)
@@ -160,17 +160,17 @@ public static boolean isSimplifiableAssignment(JSIfStatement ifStatement, boolea
         }
 
         if (isAssignment) {
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression)((JSExpressionStatement)thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression)((JSExpressionStatement)elseBranch).getExpression();
-            final IElementType thenSign = thenExpression.getOperationSign();
-            final IElementType elseSign = elseExpression.getOperationSign();
+            JSAssignmentExpression thenExpression = (JSAssignmentExpression)((JSExpressionStatement)thenBranch).getExpression();
+            JSAssignmentExpression elseExpression = (JSAssignmentExpression)((JSExpressionStatement)elseBranch).getExpression();
+            IElementType thenSign = thenExpression.getOperationSign();
+            IElementType elseSign = elseExpression.getOperationSign();
 
             if (!thenSign.equals(elseSign)) {
                 return false;
             }
 
-            final JSExpression thenLhs = thenExpression.getLOperand();
-            final JSExpression elseLhs = elseExpression.getLOperand();
+            JSExpression thenLhs = thenExpression.getLOperand();
+            JSExpression elseLhs = elseExpression.getLOperand();
 
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         }
@@ -183,31 +183,31 @@ public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement
         if (ifStatement.getElse() != null) {
             return false;
         }
-        final JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
-        final PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, false);
+        JSStatement thenBranch = ConditionalUtils.stripBraces(ifStatement.getThen());
+        PsiElement nextStatement = JSElementFactory.getNonWhiteSpaceSibling(ifStatement, false);
 
         if (!(nextStatement instanceof JSStatement)) {
             return false;
         }
 
-        final JSStatement elseBranch = ConditionalUtils.stripBraces((JSStatement)nextStatement);
+        JSStatement elseBranch = ConditionalUtils.stripBraces((JSStatement)nextStatement);
 
-        final boolean isAssignment = negated
+        boolean isAssignment = negated
             ? ConditionalUtils.isAssignment(thenBranch, BoolUtils.FALSE) && ConditionalUtils.isAssignment(elseBranch, BoolUtils.TRUE)
             : ConditionalUtils.isAssignment(thenBranch, BoolUtils.TRUE) && ConditionalUtils.isAssignment(elseBranch, BoolUtils.FALSE);
 
         if (isAssignment) {
-            final JSAssignmentExpression thenExpression = (JSAssignmentExpression)((JSExpressionStatement)thenBranch).getExpression();
-            final JSAssignmentExpression elseExpression = (JSAssignmentExpression)((JSExpressionStatement)elseBranch).getExpression();
-            final IElementType thenSign = thenExpression.getOperationSign();
-            final IElementType elseSign = elseExpression.getOperationSign();
+            JSAssignmentExpression thenExpression = (JSAssignmentExpression)((JSExpressionStatement)thenBranch).getExpression();
+            JSAssignmentExpression elseExpression = (JSAssignmentExpression)((JSExpressionStatement)elseBranch).getExpression();
+            IElementType thenSign = thenExpression.getOperationSign();
+            IElementType elseSign = elseExpression.getOperationSign();
 
             if (!thenSign.equals(elseSign)) {
                 return false;
             }
 
-            final JSExpression thenLhs = thenExpression.getLOperand();
-            final JSExpression elseLhs = elseExpression.getLOperand();
+            JSExpression thenLhs = thenExpression.getLOperand();
+            JSExpression elseLhs = elseExpression.getLOperand();
 
             return EquivalenceChecker.expressionsAreEquivalent(thenLhs, elseLhs);
         }
@@ -218,10 +218,10 @@ public static boolean isSimplifiableImplicitAssignment(JSIfStatement ifStatement
 
     public static void replaceSimplifiableImplicitReturn(JSIfStatement statement, boolean negated)
         throws IncorrectOperationException {
-        final JSExpression condition = statement.getCondition();
-        final String conditionText = negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText();
-        final JSElement nextStatement = (JSElement)JSElementFactory.getNonWhiteSpaceSibling(statement, true);
-        @NonNls final String newStatement = "return " + conditionText + ';';
+        JSExpression condition = statement.getCondition();
+        String conditionText = negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText();
+        JSElement nextStatement = (JSElement)JSElementFactory.getNonWhiteSpaceSibling(statement, true);
+        @NonNls String newStatement = "return " + conditionText + ';';
 
         JSElementFactory.replaceStatement(statement, newStatement);
         assert (nextStatement != null);
@@ -230,38 +230,38 @@ public static void replaceSimplifiableImplicitReturn(JSIfStatement statement, bo
 
     public static void replaceSimplifiableReturn(JSIfStatement statement, boolean negated)
         throws IncorrectOperationException {
-        final JSExpression condition = statement.getCondition();
-        final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-        @NonNls final String newStatement = "return " + conditionText + ';';
+        JSExpression condition = statement.getCondition();
+        String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
+        @NonNls String newStatement = "return " + conditionText + ';';
 
         JSElementFactory.replaceStatement(statement, newStatement);
     }
 
     public static void replaceSimplifiableAssignment(JSIfStatement statement, boolean negated)
         throws IncorrectOperationException {
-        final JSExpression condition = statement.getCondition();
-        final String conditionText = negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText();
-        final JSExpressionStatement assignmentStatement = (JSExpressionStatement)ConditionalUtils.stripBraces(statement.getThen());
-        final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression)assignmentStatement.getExpression();
-        final IElementType operator = assignmentExpression.getOperationSign();
-        final String operand = BinaryOperatorUtils.getOperatorText(operator);
-        final JSExpression lhs = assignmentExpression.getLOperand();
-        final String lhsText = lhs.getText();
+        JSExpression condition = statement.getCondition();
+        String conditionText = negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText();
+        JSExpressionStatement assignmentStatement = (JSExpressionStatement)ConditionalUtils.stripBraces(statement.getThen());
+        JSAssignmentExpression assignmentExpression = (JSAssignmentExpression)assignmentStatement.getExpression();
+        IElementType operator = assignmentExpression.getOperationSign();
+        String operand = BinaryOperatorUtils.getOperatorText(operator);
+        JSExpression lhs = assignmentExpression.getLOperand();
+        String lhsText = lhs.getText();
 
         JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
     }
 
     public static void replaceSimplifiableImplicitAssignment(JSIfStatement statement, boolean negated)
         throws IncorrectOperationException {
-        final JSElement prevStatement = (JSElement)JSElementFactory.getNonWhiteSpaceSibling(statement, false);
-        final JSExpression condition = statement.getCondition();
-        final String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-        final JSExpressionStatement assignmentStatement = (JSExpressionStatement)ConditionalUtils.stripBraces(statement.getThen());
-        final JSAssignmentExpression assignmentExpression = (JSAssignmentExpression)assignmentStatement.getExpression();
-        final IElementType operator = assignmentExpression.getOperationSign();
-        final String operand = BinaryOperatorUtils.getOperatorText(operator);
-        final JSExpression lhs = assignmentExpression.getLOperand();
-        final String lhsText = lhs.getText();
+        JSElement prevStatement = (JSElement)JSElementFactory.getNonWhiteSpaceSibling(statement, false);
+        JSExpression condition = statement.getCondition();
+        String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
+        JSExpressionStatement assignmentStatement = (JSExpressionStatement)ConditionalUtils.stripBraces(statement.getThen());
+        JSAssignmentExpression assignmentExpression = (JSAssignmentExpression)assignmentStatement.getExpression();
+        IElementType operator = assignmentExpression.getOperationSign();
+        String operand = BinaryOperatorUtils.getOperatorText(operator);
+        JSExpression lhs = assignmentExpression.getLOperand();
+        String lhsText = lhs.getText();
 
         JSElementFactory.replaceStatement(statement, lhsText + operand + conditionText + ';');
 
@@ -300,20 +300,20 @@ else if (isSimplifiableImplicitAssignment(statement, true)) {
 
     public static void replaceConditionalWithIf(JSConditionalExpression conditional)
         throws IncorrectOperationException {
-        final JSStatement statement = PsiTreeUtil.getParentOfType(conditional, JSStatement.class);
+        JSStatement statement = PsiTreeUtil.getParentOfType(conditional, JSStatement.class);
 
         assert (statement != null);
 
-        final String statementText = statement.getText();
-        final String conditionalText = ParenthesesUtils.unstripParentheses(conditional).getText();
-        final int conditionalIndex = statementText.indexOf(conditionalText);
-        final String statementStart = statementText.substring(0, conditionalIndex);
-        final String statementEnd = statementText.substring(conditionalIndex + conditionalText.length());
-        final JSExpression condition = ParenthesesUtils.stripParentheses(conditional.getCondition());
-        final JSExpression thenExpression = ParenthesesUtils.stripParentheses(conditional.getThen());
-        final JSExpression elseExpression = ParenthesesUtils.stripParentheses(conditional.getElse());
+        String statementText = statement.getText();
+        String conditionalText = ParenthesesUtils.unstripParentheses(conditional).getText();
+        int conditionalIndex = statementText.indexOf(conditionalText);
+        String statementStart = statementText.substring(0, conditionalIndex);
+        String statementEnd = statementText.substring(conditionalIndex + conditionalText.length());
+        JSExpression condition = ParenthesesUtils.stripParentheses(conditional.getCondition());
+        JSExpression thenExpression = ParenthesesUtils.stripParentheses(conditional.getThen());
+        JSExpression elseExpression = ParenthesesUtils.stripParentheses(conditional.getElse());
 
-        @NonNls final String ifStatementText = "if (" + condition.getText() + ") {" +
+        @NonNls String ifStatementText = "if (" + condition.getText() + ") {" +
             statementStart + thenExpression.getText() + statementEnd +
             "} else {" +
             statementStart + elseExpression.getText() + statementEnd +
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
index 2f882b00..ee57b6f7 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
@@ -47,7 +47,7 @@ else if (statement instanceof JSExpressionStatement
             return true;
         }
         else if (statement instanceof JSForStatement loopStatement) {
-            final JSExpression condition = loopStatement.getCondition();
+            JSExpression condition = loopStatement.getCondition();
 
             return condition != null && !isBooleanConstant(condition, false) || statementIsBreakTarget(loopStatement);
         }
@@ -65,14 +65,14 @@ else if (statement instanceof JSBlockStatement blockStatement) {
             return codeBlockMayCompleteNormally(blockStatement.getStatements());
         }
         else if (statement instanceof JSLabeledStatement) {
-            final JSLabeledStatement labeledStatement = (JSLabeledStatement)statement;
-            final JSStatement body = labeledStatement.getStatement();
+            JSLabeledStatement labeledStatement = (JSLabeledStatement)statement;
+            JSStatement body = labeledStatement.getStatement();
 
             return (statementMayCompleteNormally(body) || statementIsBreakTarget(body));
         }
         else if (statement instanceof JSIfStatement ifStatement) {
-            final JSStatement thenBranch = ifStatement.getThen();
-            final JSStatement elseBranch = ifStatement.getElse();
+            JSStatement thenBranch = ifStatement.getThen();
+            JSStatement elseBranch = ifStatement.getElse();
 
             return elseBranch == null ||
                 statementMayCompleteNormally(thenBranch) ||
@@ -86,7 +86,7 @@ else if (statement instanceof JSTryStatement tryStatement) {
                 return true;
             }
 
-            final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+            JSCatchBlock catchBlock = tryStatement.getCatchBlock();
 
             return catchBlock != null && statementMayCompleteNormally(catchBlock.getStatement());
         }
@@ -109,7 +109,7 @@ else if (statement instanceof JSSwitchStatement switchStatement) {
 
     public static boolean codeBlockMayCompleteNormally(@Nullable JSStatement[] statements) {
         if (statements != null) {
-            for (final JSStatement statement : statements) {
+            for (JSStatement statement : statements) {
                 if (!statementMayCompleteNormally(statement)) {
                     return false;
                 }
@@ -123,7 +123,7 @@ private static boolean isBooleanConstant(JSExpression test, boolean val) {
         if (!ExpressionUtil.isConstantExpression(test)) {
             return false;
         }
-        final Object value = ExpressionUtil.computeConstantExpression(test);
+        Object value = ExpressionUtil.computeConstantExpression(test);
         return value != null && value instanceof Boolean && ((Boolean)value).booleanValue() == val;
     }
 
@@ -132,7 +132,7 @@ private static boolean statementIsBreakTarget(@Nullable JSStatement statement) {
             return false;
         }
 
-        final BreakTargetFinder breakFinder = new BreakTargetFinder(statement);
+        BreakTargetFinder breakFinder = new BreakTargetFinder(statement);
 
         statement.accept(breakFinder);
         return breakFinder.breakFound();
@@ -143,7 +143,7 @@ public static boolean statementContainsExitingBreak(@Nullable JSStatement statem
             return false;
         }
 
-        final ExitingBreakFinder breakFinder = new ExitingBreakFinder();
+        ExitingBreakFinder breakFinder = new ExitingBreakFinder();
 
         statement.accept(breakFinder);
         return breakFinder.breakFound();
@@ -154,7 +154,7 @@ public static boolean statementIsContinueTarget(@Nullable JSStatement statement)
             return false;
         }
 
-        final ContinueTargetFinder continueFinder = new ContinueTargetFinder(statement);
+        ContinueTargetFinder continueFinder = new ContinueTargetFinder(statement);
 
         statement.accept(continueFinder);
         return continueFinder.continueFound();
@@ -165,7 +165,7 @@ public static boolean statementContainsReturn(@Nullable JSStatement statement) {
             return false;
         }
 
-        final ReturnFinder returnFinder = new ReturnFinder();
+        ReturnFinder returnFinder = new ReturnFinder();
 
         statement.accept(returnFinder);
         return returnFinder.returnFound();
@@ -179,7 +179,7 @@ public static boolean statementCompletesWithStatement(@Nonnull JSStatement conta
                 return true;
             }
 
-            final JSStatement container = PsiTreeUtil.getParentOfType(statementToCheck, JSStatement.class);
+            JSStatement container = PsiTreeUtil.getParentOfType(statementToCheck, JSStatement.class);
 
             if (container == null) {
                 return false;
@@ -207,7 +207,7 @@ private static boolean elementCompletesWithStatement(@Nonnull JSElement element,
                 return true;
             }
 
-            final JSElement container = PsiTreeUtil.getParentOfType(statementToCheck, JSElement.class);
+            JSElement container = PsiTreeUtil.getParentOfType(statementToCheck, JSElement.class);
 
             if (container == null || container instanceof JSLoopStatement) {
                 return false;
@@ -237,11 +237,11 @@ public static boolean blockCompletesWithStatement(@Nonnull JSBlockStatement bloc
     }
 
     private static boolean statementIsLastInBlock(@Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
-        final JSStatement[] statements = block.getStatements();
+        JSStatement[] statements = block.getStatements();
 
         //noinspection ForLoopWithMissingComponent
         for (int index = statements.length; --index >= 0; ) {
-            final JSStatement childStatement = statements[index];
+            JSStatement childStatement = statements[index];
 
             if (statement.equals(childStatement)) {
                 return true;
@@ -259,14 +259,14 @@ public static JSVariable resolveVariable(@Nullable JSExpression expression) {
             return null;
         }
         else if (expression instanceof JSReferenceExpression referenceExpression) {
-            final PsiElement variable = referenceExpression.resolve();
+            PsiElement variable = referenceExpression.resolve();
 
             return variable != null && variable instanceof JSVariable jsVariable ? jsVariable : null;
         }
         else if (expression instanceof JSDefinitionExpression definitionExpression) {
-            final JSExpression referentExpression = definitionExpression.getExpression();
-            final PsiReference reference = (referentExpression == null) ? null : referentExpression.getReference();
-            final PsiElement variable = (reference == null) ? null : reference.resolve();
+            JSExpression referentExpression = definitionExpression.getExpression();
+            PsiReference reference = (referentExpression == null) ? null : referentExpression.getReference();
+            PsiElement variable = (reference == null) ? null : reference.resolve();
 
             return variable != null && variable instanceof JSVariable jsVariable ? jsVariable : null;
         }
@@ -277,10 +277,10 @@ else if (expression instanceof JSDefinitionExpression definitionExpression) {
 
     @Nullable
     public static JSFunction resolveMethod(JSCallExpression expression) {
-        final JSExpression methodExpression = (expression == null) ? null : expression.getMethodExpression();
+        JSExpression methodExpression = (expression == null) ? null : expression.getMethodExpression();
 
         if (methodExpression != null && methodExpression instanceof JSReferenceExpression referenceExpression) {
-            final PsiElement referent = referenceExpression.resolve();
+            PsiElement referent = referenceExpression.resolve();
 
             return referent != null && referent instanceof JSFunction function ? function : null;
         }
@@ -291,54 +291,54 @@ public static boolean canBeMerged(JSStatement statement1, JSStatement statement2
         if (!ControlFlowUtils.statementMayCompleteNormally(statement1)) {
             return false;
         }
-        final Set<String> statement1Declarations = calculateTopLevelDeclarations(statement1);
+        Set<String> statement1Declarations = calculateTopLevelDeclarations(statement1);
         if (containsConflictingDeclarations(statement1Declarations, statement2)) {
             return false;
         }
-        final Set<String> statement2Declarations = calculateTopLevelDeclarations(statement2);
+        Set<String> statement2Declarations = calculateTopLevelDeclarations(statement2);
         return (!containsConflictingDeclarations(statement2Declarations, statement1));
     }
 
     public static boolean isInLoopStatementBody(@Nonnull PsiElement element) {
-        final JSLoopStatement forStatement = PsiTreeUtil.getParentOfType(element, JSLoopStatement.class);
+        JSLoopStatement forStatement = PsiTreeUtil.getParentOfType(element, JSLoopStatement.class);
 
         if (forStatement == null) {
             return false;
         }
 
-        final JSStatement body = forStatement.getBody();
+        JSStatement body = forStatement.getBody();
 
         return (body != null && PsiTreeUtil.isAncestor(body, element, true));
     }
 
     @Nonnull
     public static List<JSCallExpression> getRecursiveCalls(@Nonnull JSFunction function) {
-        final RecursiveCallVisitor recursiveCallVisitor = new RecursiveCallVisitor(function);
+        RecursiveCallVisitor recursiveCallVisitor = new RecursiveCallVisitor(function);
 
         function.accept(recursiveCallVisitor);
         return recursiveCallVisitor.getCalls();
     }
 
     private static boolean containsConflictingDeclarations(Set<String> declarations, JSStatement statement) {
-        final DeclarationUtils.DeclarationConflictVisitor visitor =
+        DeclarationUtils.DeclarationConflictVisitor visitor =
             new DeclarationUtils.DeclarationConflictVisitor(declarations);
         statement.accept(visitor);
         return visitor.hasConflict();
     }
 
     public static boolean containsConflictingDeclarations(JSBlockStatement block, JSBlockStatement parentBlock) {
-        final JSStatement[] statements = block.getStatements();
-        final Set<JSVariable> declaredVars = new HashSet<>();
+        JSStatement[] statements = block.getStatements();
+        Set<JSVariable> declaredVars = new HashSet<>();
 
-        for (final JSStatement statement : statements) {
+        for (JSStatement statement : statements) {
             if (statement instanceof JSVarStatement declaration) {
-                for (final JSVariable var : declaration.getVariables()) {
+                for (JSVariable var : declaration.getVariables()) {
                     declaredVars.add(var);
                 }
             }
         }
 
-        for (final JSVariable variable : declaredVars) {
+        for (JSVariable variable : declaredVars) {
             if (conflictingDeclarationExists(variable.getName(), parentBlock, block)) {
                 return true;
             }
@@ -348,13 +348,13 @@ public static boolean containsConflictingDeclarations(JSBlockStatement block, JS
     }
 
     private static boolean conflictingDeclarationExists(String name, JSBlockStatement parentBlock, JSBlockStatement exceptBlock) {
-        final ConflictingDeclarationVisitor visitor = new ConflictingDeclarationVisitor(name, exceptBlock);
+        ConflictingDeclarationVisitor visitor = new ConflictingDeclarationVisitor(name, exceptBlock);
         parentBlock.accept(visitor);
         return visitor.hasConflictingDeclaration();
     }
 
     private static Set<String> calculateTopLevelDeclarations(JSStatement statement) {
-        final Set<String> out = new HashSet<>();
+        Set<String> out = new HashSet<>();
 
         if (statement instanceof JSVarStatement varStatement) {
             addDeclarations(varStatement, out);
@@ -370,7 +370,7 @@ else if (statement instanceof JSBlockStatement blockStatement) {
     }
 
     private static void addDeclarations(JSVarStatement statement, Set<String> declaredVars) {
-        for (final JSVariable variable : statement.getVariables()) {
+        for (JSVariable variable : statement.getVariables()) {
             declaredVars.add(variable.getName());
         }
     }
@@ -422,7 +422,7 @@ public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpressi
         @Override
         public void visitJSBreakStatement(JSBreakStatement breakStatement) {
             super.visitJSBreakStatement(breakStatement);
-            final JSStatement exitedStatement = breakStatement.getStatementToBreak();
+            JSStatement exitedStatement = breakStatement.getStatementToBreak();
             if (exitedStatement == null) {
                 return;
             }
@@ -449,7 +449,7 @@ public void visitJSReferenceExpression(JSReferenceExpression JSReferenceExpressi
         @Override
         public void visitJSContinueStatement(JSContinueStatement continueStatement) {
             super.visitJSContinueStatement(continueStatement);
-            final JSStatement statement = continueStatement.getStatementToContinue();
+            JSStatement statement = continueStatement.getStatementToContinue();
             if (statement == null) {
                 return;
             }
@@ -554,7 +554,7 @@ public void visitJSBlock(JSBlockStatement block) {
         public void visitJSVariable(JSVariable variable) {
             if (!this.hasConflictingDeclaration) {
                 super.visitJSVariable(variable);
-                final String name = variable.getName();
+                String name = variable.getName();
                 this.hasConflictingDeclaration = (name != null && name.equals(this.variableName));
             }
         }
@@ -577,19 +577,19 @@ private static class RecursiveCallVisitor extends JSRecursiveElementVisitor {
         public void visitJSCallExpression(JSCallExpression callExpression) {
             super.visitJSCallExpression(callExpression);
 
-            final JSExpression methodExpression = callExpression.getMethodExpression();
+            JSExpression methodExpression = callExpression.getMethodExpression();
 
             if (methodExpression == null || !(methodExpression instanceof JSReferenceExpression)) {
                 return;
             }
 
-            final JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(callExpression, JSReturnStatement.class);
+            JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(callExpression, JSReturnStatement.class);
 
             if (returnStatement == null) {
                 return;
             }
 
-            final PsiElement calledFunction = ((JSReferenceExpression)methodExpression).resolve();
+            PsiElement calledFunction = ((JSReferenceExpression)methodExpression).resolve();
 
             if (calledFunction == null ||
                 (!(calledFunction instanceof JSFunction) || !calledFunction.equals(this.function))) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
index 502aaf0e..414a2439 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/DeclarationUtils.java
@@ -93,8 +93,8 @@ else if (statement instanceof JSLabeledStatement labeledStatement) {
             );
         }
         else if (statement instanceof JSIfStatement ifStatement) {
-            final JSStatement thenBranch = ifStatement.getThen();
-            final JSStatement elseBranch = ifStatement.getElse();
+            JSStatement thenBranch = ifStatement.getThen();
+            JSStatement elseBranch = ifStatement.getElse();
 
             calculateVariablesDeclared(thenBranch, variablesDeclaredAtTopLevel,
                 variablesDeclaredAtLowerLevels, false
@@ -117,7 +117,7 @@ else if (statement instanceof JSTryStatement tryStatement) {
                 false
             );
 
-            final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+            JSCatchBlock catchBlock = tryStatement.getCatchBlock();
 
             if (catchBlock != null) {
                 calculateVariablesDeclared(
@@ -147,7 +147,7 @@ private static void calculateVariablesDeclared(
         boolean isTopLevel
     ) {
         for (JSVariable variable : statement.getVariables()) {
-            final String variableName = variable.getName();
+            String variableName = variable.getName();
 
             if (isTopLevel) {
                 variablesDeclaredAtTopLevel.add(variableName);
@@ -188,7 +188,7 @@ public DeclarationConflictVisitor(Set<String> declarations) {
         public void visitJSVariable(JSVariable variable) {
             super.visitJSVariable(variable);
 
-            final String name = variable.getName();
+            String name = variable.getName();
 
             for (String declaration : this.declarations) {
                 if (declaration.equals(name)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
index 001e0dc2..c5fef4e4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/EquivalenceChecker.java
@@ -69,8 +69,8 @@ public static boolean statementsAreEquivalent(JSStatement exp1, JSStatement exp2
             return false;
         }
 
-        final int type1 = getStatementType(exp1);
-        final int type2 = getStatementType(exp2);
+        int type1 = getStatementType(exp1);
+        int type2 = getStatementType(exp2);
 
         if (type1 != type2) {
             return false;
@@ -207,8 +207,8 @@ private static boolean switchStatementsAreEquivalent(JSSwitchStatement statement
             return false;
         }
 
-        final JSCaseClause[] caseClauses1 = statement1.getCaseClauses();
-        final JSCaseClause[] caseClauses2 = statement2.getCaseClauses();
+        JSCaseClause[] caseClauses1 = statement1.getCaseClauses();
+        JSCaseClause[] caseClauses2 = statement2.getCaseClauses();
 
         if (caseClauses1.length != caseClauses2.length) {
             return false;
@@ -231,8 +231,8 @@ private static boolean caseClausesAreEquivalent(JSCaseClause caseClause1, JSCase
             return false;
         }
 
-        final JSStatement[] statements1 = caseClause1.getStatements();
-        final JSStatement[] statements2 = caseClause2.getStatements();
+        JSStatement[] statements1 = caseClause1.getStatements();
+        JSStatement[] statements2 = caseClause2.getStatements();
 
         if (statements1.length != statements2.length) {
             return false;
@@ -271,8 +271,8 @@ private static boolean continueStatementsAreEquivalent(JSContinueStatement state
     }
 
     private static boolean labeledStatementsAreEquivalent(JSLabeledStatement statement1, JSLabeledStatement statement2) {
-        final PsiElement element1 = statement1.getLabelIdentifier();
-        final PsiElement element2 = statement2.getLabelIdentifier();
+        PsiElement element1 = statement1.getLabelIdentifier();
+        PsiElement element2 = statement2.getLabelIdentifier();
 
         return element1 == null
             ? element2 == null
@@ -322,10 +322,10 @@ public static boolean expressionsAreEquivalent(JSExpression exp1, JSExpression e
             return false;
         }
 
-        final JSExpression expToCompare1 = ParenthesesUtils.stripParentheses(exp1);
-        final JSExpression expToCompare2 = ParenthesesUtils.stripParentheses(exp2);
-        final int type1 = getExpressionType(expToCompare1);
-        final int type2 = getExpressionType(expToCompare2);
+        JSExpression expToCompare1 = ParenthesesUtils.stripParentheses(exp1);
+        JSExpression expToCompare2 = ParenthesesUtils.stripParentheses(exp2);
+        int type1 = getExpressionType(expToCompare1);
+        int type2 = getExpressionType(expToCompare2);
 
         if (type1 != type2) {
             return false;
@@ -397,18 +397,18 @@ private static boolean objectLiteralExpressionsAreEquivalent(
         JSObjectLiteralExpression objectLiteralExp1,
         JSObjectLiteralExpression objectLiteralExp2
     ) {
-        final JSProperty[] properties1 = objectLiteralExp1.getProperties();
-        final JSProperty[] properties2 = objectLiteralExp2.getProperties();
+        JSProperty[] properties1 = objectLiteralExp1.getProperties();
+        JSProperty[] properties2 = objectLiteralExp2.getProperties();
 
         if (properties1.length != properties2.length) {
             return false;
         }
 
         for (int index = 0; index < properties2.length; index++) {
-            final JSProperty property1 = properties1[index];
-            final JSProperty property2 = properties2[index];
-            final String propertyName1 = property1.getName();
-            final String propertyName2 = property2.getName();
+            JSProperty property1 = properties1[index];
+            JSProperty property2 = properties2[index];
+            String propertyName1 = property1.getName();
+            String propertyName2 = property2.getName();
 
             if (!(propertyName1 != null && propertyName2 != null &&
                 propertyName2.equals(propertyName1) &&
@@ -444,23 +444,23 @@ private static boolean callExpressionsAreEquivalent(JSCallExpression methodExp1,
             return false;
         }
 
-        final JSArgumentList argumentList1 = methodExp1.getArgumentList();
-        final JSArgumentList argumentList2 = methodExp2.getArgumentList();
+        JSArgumentList argumentList1 = methodExp1.getArgumentList();
+        JSArgumentList argumentList2 = methodExp2.getArgumentList();
 
         return argumentList1 != null && argumentList2 != null
             && expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments());
     }
 
     private static boolean newExpressionsAreEquivalent(JSNewExpression newExp1, JSNewExpression newExp2) {
-        final JSExpression exp1 = newExp1.getMethodExpression();
-        final JSExpression exp2 = newExp2.getMethodExpression();
+        JSExpression exp1 = newExp1.getMethodExpression();
+        JSExpression exp2 = newExp2.getMethodExpression();
 
         if (!expressionsAreEquivalent(exp1, exp2)) {
             return false;
         }
 
-        final JSArgumentList argumentList1 = newExp1.getArgumentList();
-        final JSArgumentList argumentList2 = newExp2.getArgumentList();
+        JSArgumentList argumentList1 = newExp1.getArgumentList();
+        JSArgumentList argumentList2 = newExp2.getArgumentList();
 
         return argumentList1 != null && argumentList2 != null
             && expressionListsAreEquivalent(argumentList1.getArguments(), argumentList2.getArguments());
@@ -474,8 +474,8 @@ private static boolean arrayLiteralExpressionsAreEquivalent(
     }
 
     private static boolean prefixExpressionsAreEquivalent(JSPrefixExpression prefixExp1, JSPrefixExpression prefixExp2) {
-        final IElementType operator1 = prefixExp1.getOperationSign();
-        final IElementType operator2 = prefixExp2.getOperationSign();
+        IElementType operator1 = prefixExp1.getOperationSign();
+        IElementType operator2 = prefixExp2.getOperationSign();
 
         return (operator1 != null && operator2 != null &&
             operator1.equals(operator2) &&
@@ -483,15 +483,15 @@ private static boolean prefixExpressionsAreEquivalent(JSPrefixExpression prefixE
     }
 
     private static boolean postfixExpressionsAreEquivalent(JSPostfixExpression postfixExp1, JSPostfixExpression postfixExp2) {
-        final IElementType operator1 = postfixExp1.getOperationSign();
-        final IElementType operator2 = postfixExp2.getOperationSign();
+        IElementType operator1 = postfixExp1.getOperationSign();
+        IElementType operator2 = postfixExp2.getOperationSign();
 
         return operator1.equals(operator2) && expressionsAreEquivalent(postfixExp1.getExpression(), postfixExp2.getExpression());
     }
 
     private static boolean binaryExpressionsAreEquivalent(JSBinaryExpression binaryExp1, JSBinaryExpression binaryExp2) {
-        final IElementType operator1 = binaryExp1.getOperationSign();
-        final IElementType operator2 = binaryExp2.getOperationSign();
+        IElementType operator1 = binaryExp1.getOperationSign();
+        IElementType operator2 = binaryExp2.getOperationSign();
 
         return operator1.equals(operator2)
             && expressionsAreEquivalent(binaryExp1.getLOperand(), binaryExp2.getLOperand())
@@ -499,8 +499,8 @@ && expressionsAreEquivalent(binaryExp1.getLOperand(), binaryExp2.getLOperand())
     }
 
     private static boolean assignmentExpressionsAreEquivalent(JSAssignmentExpression assignExp1, JSAssignmentExpression assignExp2) {
-        final IElementType operator1 = assignExp1.getOperationSign();
-        final IElementType operator2 = assignExp2.getOperationSign();
+        IElementType operator1 = assignExp1.getOperationSign();
+        IElementType operator2 = assignExp2.getOperationSign();
 
         return operator1.equals(operator2)
             && expressionsAreEquivalent(assignExp1.getLOperand(), assignExp2.getLOperand())
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
index adcd38ba..62050497 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
@@ -30,7 +30,7 @@ private ErrorUtil() {
     public static boolean containsError(@Nonnull PsiElement element) {
         // check only immediate children, full tree traversal is too expensive
         if (fullTraversal) {
-            final ErrorElementVisitor visitor = new ErrorElementVisitor();
+            ErrorElementVisitor visitor = new ErrorElementVisitor();
 
             element.accept(visitor);
             return visitor.containsErrorElement();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
index 78aae5b7..f4a9d1d5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
@@ -42,11 +42,11 @@ public static boolean isConstantExpression(JSExpression expression) {
 
     public static boolean isIncrementDecrementExpression(@Nonnull PsiElement expression) {
         if (expression instanceof JSPostfixExpression postfixExpression) {
-            final IElementType operator = postfixExpression.getOperationSign();
+            IElementType operator = postfixExpression.getOperationSign();
             return JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator);
         }
         else if (expression instanceof JSPrefixExpression prefixExpression) {
-            final IElementType operator = prefixExpression.getOperationSign();
+            IElementType operator = prefixExpression.getOperationSign();
             return JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator);
         }
         else {
@@ -112,7 +112,7 @@ public void visitJSPrefixOrPostfixExpression(JSExpression operand, IElementType
 
         @Override
         public void visitJSBinaryExpression(JSBinaryExpression expression) {
-            final JSExpression jsExpression = expression.getLOperand();
+            JSExpression jsExpression = expression.getLOperand();
             if (jsExpression == null) {
                 return;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
index d9d5f155..46db52b5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
@@ -36,7 +36,7 @@ private FindReferenceUtil() {
     }
 
     public static JSReferenceExpression[] findReferences(@Nonnull JSVariable variable) {
-        final JSReferenceVisitor visitor = new JSReferenceVisitor(variable, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
+        JSReferenceVisitor visitor = new JSReferenceVisitor(variable, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
         JSElement scope = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
 
         if (scope == null) {
@@ -84,7 +84,7 @@ public JSReferenceVisitor(@Nonnull JSVariable variable, int maxCount, int minTex
         @Override
         public void visitElement(PsiElement element) {
             if (this.references.size() < this.maxCount) {
-                final int elementTextOffset = element.getTextOffset();
+                int elementTextOffset = element.getTextOffset();
 
                 if (elementTextOffset + element.getTextLength() >= this.minTextOffset &&
                     elementTextOffset <= this.maxTextOffset) {
@@ -94,11 +94,11 @@ public void visitElement(PsiElement element) {
         }
 
         @Override
-        public void visitJSReferenceExpression(final JSReferenceExpression expression) {
+        public void visitJSReferenceExpression(JSReferenceExpression expression) {
             super.visitJSReferenceExpression(expression);
 
             if (expression.getText().equals(this.variableName)) {
-                final JSVariable referent = ControlFlowUtils.resolveVariable(expression);
+                JSVariable referent = ControlFlowUtils.resolveVariable(expression);
 
                 if (referent != null && this.variable.equals(referent)) {
                     this.references.add(expression);
@@ -135,12 +135,12 @@ public static Iterable<PsiElement> getReferencesAfter(@Nonnull JSVariable variab
     }
 
     private static Iterable<PsiElement> getReferences(
-        @Nonnull final JSVariable variable,
-        @Nullable final PsiElement scope,
-        final int minTextOffset,
-        final int maxTextOffset
+        @Nonnull JSVariable variable,
+        @Nullable PsiElement scope,
+        int minTextOffset,
+        int maxTextOffset
     ) {
-        final PsiElement iteratedScope;
+        PsiElement iteratedScope;
 
         if (scope == null) {
             JSElement function = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
@@ -176,7 +176,7 @@ public boolean visitElement(PsiElement element) {
                 return false;
             }
 
-            final JSVariable referent = ControlFlowUtils.resolveVariable((JSReferenceExpression)element);
+            JSVariable referent = ControlFlowUtils.resolveVariable((JSReferenceExpression)element);
 
             return referent != null && this.variable.equals(referent);
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
index 1cfd392e..3fd24921 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
@@ -45,10 +45,10 @@ private JSElementFactory() {
     }
 
     public static PsiElement addElementBefore(@Nonnull PsiElement element, @Nonnull PsiElement newElement) {
-        final ASTNode oldElementParentNode = element.getNode();
-        final PsiElement parentNode = element.getParent();
-        final ASTNode newElementParentNode = parentNode.getNode();
-        final ASTNode newElementNode = newElement.getNode();
+        ASTNode oldElementParentNode = element.getNode();
+        PsiElement parentNode = element.getParent();
+        ASTNode newElementParentNode = parentNode.getNode();
+        ASTNode newElementNode = newElement.getNode();
 
         if (newElementParentNode == null || newElementNode == null) {
             return null;
@@ -58,11 +58,11 @@ public static PsiElement addElementBefore(@Nonnull PsiElement element, @Nonnull
     }
 
     public static PsiElement addElementAfter(@Nonnull PsiElement element, @Nonnull PsiElement newElement) {
-        final ASTNode elementNode = element.getNode();
-        final ASTNode oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
-        final PsiElement parentNode = element.getParent();
-        final ASTNode newElementParentNode = parentNode.getNode();
-        final ASTNode newElementNode = newElement.getNode();
+        ASTNode elementNode = element.getNode();
+        ASTNode oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
+        PsiElement parentNode = element.getParent();
+        ASTNode newElementParentNode = parentNode.getNode();
+        ASTNode newElementNode = newElement.getNode();
 
         if (newElementParentNode == null || newElementNode == null) {
             return null;
@@ -73,21 +73,21 @@ public static PsiElement addElementAfter(@Nonnull PsiElement element, @Nonnull P
     }
 
     public static PsiElement addElementBefore(@Nonnull PsiElement element, @NonNls @Nonnull String elementText) {
-        final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
+        PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
 
         assert (newElement != null);
         return addElementBefore(element, newElement);
     }
 
     public static PsiElement addElementAfter(@Nonnull PsiElement element, @Nonnull String elementText) {
-        final PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
+        PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
 
         assert (newElement != null);
         return addElementAfter(element, newElement);
     }
 
     public static ASTNode createElementFromText(Project project, String text) {
-        final PsiElement element = createDummyFile(project, text).getFirstChild();
+        PsiElement element = createDummyFile(project, text).getFirstChild();
 
         assert (element != null);
         return element.getNode();
@@ -95,7 +95,7 @@ public static ASTNode createElementFromText(Project project, String text) {
 
     @Nonnull
     private static PsiFile createDummyFile(Project project, String text) {
-        final ParserDefinition def = ParserDefinition.forLanguage(JavaScriptLanguage.INSTANCE);
+        ParserDefinition def = ParserDefinition.forLanguage(JavaScriptLanguage.INSTANCE);
 
         assert (def != null);
         return PsiFileFactory.getInstance(project)
@@ -104,14 +104,14 @@ private static PsiFile createDummyFile(Project project, String text) {
 
     public static JSStatement replaceElementWithStatement(@Nonnull JSElement element, @NonNls @Nonnull String statementText)
         throws IncorrectOperationException {
-        final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+        ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
             element.getProject(),
             statementText
         );
 
-        final ASTNode oldStatementParentNode = element.getNode();
-        final PsiElement parentNode = element.getParent();
-        final ASTNode newStatementParentNode = parentNode.getNode();
+        ASTNode oldStatementParentNode = element.getNode();
+        PsiElement parentNode = element.getParent();
+        ASTNode newStatementParentNode = parentNode.getNode();
 
         if (newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null) {
             return null;
@@ -124,7 +124,7 @@ public static JSStatement replaceElementWithStatement(@Nonnull JSElement element
 
     public static JSExpression replaceExpression(@Nonnull JSExpression expression, @NonNls @Nonnull String text)
         throws IncorrectOperationException {
-        final JSExpression newExpressionNode = JSChangeUtil.createExpressionFromText(
+        JSExpression newExpressionNode = JSChangeUtil.createExpressionFromText(
             expression.getProject(),
             text
         );
@@ -134,10 +134,10 @@ public static JSExpression replaceExpression(@Nonnull JSExpression expression, @
 
     public static JSExpression replaceExpression(@Nonnull JSExpression expression, @Nonnull JSExpression newExpression)
         throws IncorrectOperationException {
-        final ASTNode newExpressionNode = newExpression.getNode();
-        final ASTNode oldExpressionNode = expression.getNode();
-        final PsiElement parentNode = expression.getParent();
-        final ASTNode grandParentNode = parentNode.getNode();
+        ASTNode newExpressionNode = newExpression.getNode();
+        ASTNode oldExpressionNode = expression.getNode();
+        PsiElement parentNode = expression.getParent();
+        ASTNode grandParentNode = parentNode.getNode();
 
         if (grandParentNode == null || oldExpressionNode == null || newExpressionNode == null) {
             return null;
@@ -151,14 +151,14 @@ public static JSExpression replaceExpression(@Nonnull JSExpression expression, @
 
     public static JSStatement replaceStatement(@Nonnull JSStatement statement, @NonNls @Nonnull String text)
         throws IncorrectOperationException {
-        final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+        ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
             statement.getProject(),
             text
         );
 
-        final ASTNode oldStatementParentNode = statement.getNode();
-        final PsiElement parentNode = statement.getParent();
-        final ASTNode newStatementParentNode = parentNode.getNode();
+        ASTNode oldStatementParentNode = statement.getNode();
+        PsiElement parentNode = statement.getParent();
+        ASTNode newStatementParentNode = parentNode.getNode();
 
         if (newStatementParentNode == null || oldStatementParentNode == null || newStatementNode == null) {
             return null;
@@ -172,13 +172,13 @@ public static JSStatement replaceStatement(@Nonnull JSStatement statement, @NonN
 
     public static JSStatement addStatementBefore(@Nonnull JSStatement statement, @NonNls @Nonnull String previousStatementText)
         throws IncorrectOperationException {
-        final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+        ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
             statement.getProject(),
             previousStatementText
         );
-        final ASTNode oldStatementParentNode = statement.getNode();
-        final PsiElement parentNode = statement.getParent();
-        final ASTNode newStatementParentNode = parentNode.getNode();
+        ASTNode oldStatementParentNode = statement.getNode();
+        PsiElement parentNode = statement.getParent();
+        ASTNode newStatementParentNode = parentNode.getNode();
 
         if (newStatementParentNode == null || newStatementNode == null) {
             return null;
@@ -192,14 +192,14 @@ public static JSStatement addStatementBefore(@Nonnull JSStatement statement, @No
 
     public static JSStatement addStatementAfter(@Nonnull JSStatement statement, @NonNls @Nonnull String nextStatementText)
         throws IncorrectOperationException {
-        final ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
+        ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
             statement.getProject(),
             nextStatementText
         );
-        final ASTNode statementNode = statement.getNode();
-        final ASTNode oldStatementParentNode = ((statementNode == null) ? null : statementNode.getTreeNext());
-        final PsiElement parentNode = statement.getParent();
-        final ASTNode newStatementParentNode = parentNode.getNode();
+        ASTNode statementNode = statement.getNode();
+        ASTNode oldStatementParentNode = ((statementNode == null) ? null : statementNode.getTreeNext());
+        PsiElement parentNode = statement.getParent();
+        ASTNode newStatementParentNode = parentNode.getNode();
 
         if (newStatementParentNode == null || newStatementNode == null) {
             return null;
@@ -238,17 +238,17 @@ public static void addRangeAfter(JSStatement[] statements, int start, int length
     public static void replaceExpressionWithNegatedExpression(@Nonnull JSExpression newExpression, @Nonnull JSExpression exp)
         throws IncorrectOperationException {
         JSExpression expressionToReplace = BoolUtils.findNegation(exp);
-        final String replacementString;
+        String replacementString;
 
         if (expressionToReplace == null) {
             expressionToReplace = exp;
 
             if (ComparisonUtils.isComparisonOperator(newExpression)) {
-                final JSBinaryExpression binaryExpression = (JSBinaryExpression)newExpression;
-                final IElementType operationSign = binaryExpression.getOperationSign();
-                final String negatedComparison = ComparisonUtils.getNegatedOperatorText(operationSign);
-                final JSExpression leftOperand = binaryExpression.getLOperand();
-                final JSExpression rightOperand = binaryExpression.getROperand();
+                JSBinaryExpression binaryExpression = (JSBinaryExpression)newExpression;
+                IElementType operationSign = binaryExpression.getOperationSign();
+                String negatedComparison = ComparisonUtils.getNegatedOperatorText(operationSign);
+                JSExpression leftOperand = binaryExpression.getLOperand();
+                JSExpression rightOperand = binaryExpression.getROperand();
 
                 assert (rightOperand != null);
 
@@ -285,21 +285,21 @@ public static void replaceStatementWithUnwrapping(JSStatement statement, JSState
             return;
         }
 
-        final JSBlockStatement parentBlock = PsiTreeUtil.getParentOfType(newBranch, JSBlockStatement.class);
+        JSBlockStatement parentBlock = PsiTreeUtil.getParentOfType(newBranch, JSBlockStatement.class);
 
         if (parentBlock == null) {
             JSElementFactory.replaceStatement(statement, newBranch.getText());
             return;
         }
 
-        final JSBlockStatement block = (JSBlockStatement)newBranch;
+        JSBlockStatement block = (JSBlockStatement)newBranch;
 
         if (ControlFlowUtils.containsConflictingDeclarations(block, parentBlock)) {
             JSElementFactory.replaceStatement(statement, newBranch.getText());
             return;
         }
 
-        final PsiElement containingElement = statement.getParent();
+        PsiElement containingElement = statement.getParent();
 
         assert (containingElement instanceof JSStatement);
 
@@ -308,8 +308,8 @@ public static void replaceStatementWithUnwrapping(JSStatement statement, JSState
     }
 
     public static void removeElement(PsiElement element) {
-        final ASTNode node = element.getNode();
-        final ASTNode parentNode = element.getParent().getNode();
+        ASTNode node = element.getNode();
+        ASTNode parentNode = element.getParent().getNode();
 
         if (node != null && parentNode != null) {
             parentNode.removeChild(node);
@@ -330,8 +330,8 @@ public static PsiElement getNonWhiteSpaceSibling(PsiElement element, boolean for
     }
 
     public static boolean isFileReadOnly(Project project, PsiFile file) {
-        final ReadonlyStatusHandler instance = ReadonlyStatusHandler.getInstance(project);
-        final VirtualFile virtualFile = file.getVirtualFile();
+        ReadonlyStatusHandler instance = ReadonlyStatusHandler.getInstance(project);
+        VirtualFile virtualFile = file.getVirtualFile();
 
         return virtualFile != null && instance.ensureFilesWritable(virtualFile).hasReadonlyFiles();
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
index aa1adf0d..51b94fde 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSRecursionVisitor.java
@@ -41,13 +41,13 @@ public void visitJSCallExpression(JSCallExpression call) {
         if (!this.recursive) {
             super.visitJSCallExpression(call);
 
-            final JSExpression methodExpression = call.getMethodExpression();
-            final String qualifiedMethodText = methodExpression.getText();
-            final String methodText = qualifiedMethodText.substring(qualifiedMethodText.lastIndexOf('.') + 1);
+            JSExpression methodExpression = call.getMethodExpression();
+            String qualifiedMethodText = methodExpression.getText();
+            String methodText = qualifiedMethodText.substring(qualifiedMethodText.lastIndexOf('.') + 1);
 
             if (methodText.equals(this.functionName)) {
-                final PsiReference methodReference = methodExpression.getReference();
-                final PsiElement referent = methodReference == null ? null : methodReference.resolve();
+                PsiReference methodReference = methodExpression.getReference();
+                PsiElement referent = methodReference == null ? null : methodReference.resolve();
 
                 if (referent != null) {
                     if (referent instanceof JSFunction) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
index c8f6ff95..9d099475 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ParenthesesUtils.java
@@ -196,7 +196,7 @@ public static String removeParentheses(JSExpression expression) {
     }
 
     private static String removeParensFromReferenceExpression(JSReferenceExpression expression) {
-        final JSExpression qualifier = expression.getQualifier();
+        JSExpression qualifier = expression.getQualifier();
 
         if (qualifier != null) {
             return removeParentheses(qualifier) + '.' + expression.getReferencedName();
@@ -207,24 +207,24 @@ private static String removeParensFromReferenceExpression(JSReferenceExpression
     }
 
     private static String removeParensFromParenthesizedExpression(JSParenthesizedExpression parenthesizedExp) {
-        final JSExpression body = stripParentheses(parenthesizedExp.getInnerExpression());
+        JSExpression body = stripParentheses(parenthesizedExp.getInnerExpression());
 
         if (!(parenthesizedExp.getParent() instanceof JSExpression)) {
             return removeParentheses(body);
         }
 
-        final JSExpression parentExp = (JSExpression)parenthesizedExp.getParent();
-        final int parentPrecendence = getPrecendence(parentExp);
-        final int childPrecendence = getPrecendence(body);
+        JSExpression parentExp = (JSExpression)parenthesizedExp.getParent();
+        int parentPrecendence = getPrecendence(parentExp);
+        int childPrecendence = getPrecendence(body);
 
         if (parentPrecendence < childPrecendence) {
             return '(' + removeParentheses(body) + ')';
         }
         else if (parentPrecendence == childPrecendence) {
             if (parentExp instanceof JSBinaryExpression parentBiExp && body instanceof JSBinaryExpression bodyBiExp) {
-                final IElementType parentOperator = parentBiExp.getOperationSign();
-                final IElementType bodyOperator = bodyBiExp.getOperationSign();
-                final JSExpression lhs = parentBiExp.getLOperand();
+                IElementType parentOperator = parentBiExp.getOperationSign();
+                IElementType bodyOperator = bodyBiExp.getOperationSign();
+                JSExpression lhs = parentBiExp.getLOperand();
 
                 if (lhs.equals(parenthesizedExp) && parentOperator.equals(bodyOperator)) {
                     return removeParentheses(body);
@@ -243,9 +243,9 @@ else if (parentPrecendence == childPrecendence) {
     }
 
     private static String removeParensFromConditionalExpression(JSConditionalExpression conditionalExp) {
-        final JSExpression condition = conditionalExp.getCondition();
-        final JSExpression thenBranch = conditionalExp.getThen();
-        final JSExpression elseBranch = conditionalExp.getElse();
+        JSExpression condition = conditionalExp.getCondition();
+        JSExpression thenBranch = conditionalExp.getThen();
+        JSExpression elseBranch = conditionalExp.getElse();
 
         return removeParentheses(condition) + " ? " +
             removeParentheses(thenBranch) + " : " +
@@ -253,25 +253,25 @@ private static String removeParensFromConditionalExpression(JSConditionalExpress
     }
 
     private static String removeParensFromBinaryExpression(JSBinaryExpression binaryExp) {
-        final JSExpression lhs = binaryExp.getLOperand();
-        final JSExpression rhs = binaryExp.getROperand();
-        final IElementType sign = binaryExp.getOperationSign();
+        JSExpression lhs = binaryExp.getLOperand();
+        JSExpression rhs = binaryExp.getROperand();
+        IElementType sign = binaryExp.getOperationSign();
 
         return removeParentheses(lhs) + ' ' + BinaryOperatorUtils.getOperatorText(sign) + ' ' + removeParentheses(rhs);
     }
 
     private static String removeParensFromPostfixExpression(JSPostfixExpression postfixExp) {
-        final JSExpression body = postfixExp.getExpression();
-        final IElementType sign = postfixExp.getOperationSign();
+        JSExpression body = postfixExp.getExpression();
+        IElementType sign = postfixExp.getOperationSign();
 
         return removeParentheses(body) + BinaryOperatorUtils.getOperatorText(sign);
     }
 
     private static String removeParensFromPrefixExpression(JSPrefixExpression prefixExp) {
-        final JSExpression body = prefixExp.getExpression();
+        JSExpression body = prefixExp.getExpression();
         IElementType sign = prefixExp.getOperationSign();
         if (sign == null) {
-            final ASTNode[] astNodes = prefixExp.getNode().getChildren(JSTokenTypes.UNARY_OPERATIONS); // hack for 8.1
+            ASTNode[] astNodes = prefixExp.getNode().getChildren(JSTokenTypes.UNARY_OPERATIONS); // hack for 8.1
             sign = astNodes.length == 1 ? astNodes[0].getElementType() : null;
         }
 
@@ -279,14 +279,14 @@ private static String removeParensFromPrefixExpression(JSPrefixExpression prefix
     }
 
     private static String removeParensFromArrayLiteralExpression(JSArrayLiteralExpression init) {
-        final JSExpression[] contents = init.getExpressions();
-        final String text = init.getText();
-        final int textLength = text.length();
-        final StringBuilder out = new StringBuilder(textLength);
+        JSExpression[] contents = init.getExpressions();
+        String text = init.getText();
+        int textLength = text.length();
+        StringBuilder out = new StringBuilder(textLength);
 
         out.append('(');
         for (int index = 0; index < contents.length; index++) {
-            final JSExpression arg = contents[index];
+            JSExpression arg = contents[index];
 
             if (index != 0) {
                 out.append(',');
@@ -298,30 +298,30 @@ private static String removeParensFromArrayLiteralExpression(JSArrayLiteralExpre
     }
 
     private static String removeParensFromAssignmentExpression(JSAssignmentExpression assignment) {
-        final JSExpression lhs = assignment.getLOperand();
-        final JSExpression rhs = assignment.getROperand();
-        final IElementType sign = assignment.getOperationSign();
+        JSExpression lhs = assignment.getLOperand();
+        JSExpression rhs = assignment.getROperand();
+        IElementType sign = assignment.getOperationSign();
         return removeParentheses(lhs) + ' ' +
             BinaryOperatorUtils.getOperatorText(sign) + ' ' +
             removeParentheses(rhs);
     }
 
     private static String removeParensFromFunctionCallExpression(JSCallExpression functionCall) {
-        final JSExpression target = functionCall.getMethodExpression();
-        final JSArgumentList argumentList = functionCall.getArgumentList();
+        JSExpression target = functionCall.getMethodExpression();
+        JSArgumentList argumentList = functionCall.getArgumentList();
 
         assert (argumentList != null);
 
-        final JSExpression[] args = argumentList.getArguments();
-        final String methodCallText = functionCall.getText();
-        final int length = methodCallText.length();
-        final StringBuilder out = new StringBuilder(length);
-        final String strippedTarget = removeParentheses(target);
+        JSExpression[] args = argumentList.getArguments();
+        String methodCallText = functionCall.getText();
+        int length = methodCallText.length();
+        StringBuilder out = new StringBuilder(length);
+        String strippedTarget = removeParentheses(target);
 
         out.append(strippedTarget);
         out.append('(');
         for (int index = 0; index < args.length; index++) {
-            final JSExpression arg = args[index];
+            JSExpression arg = args[index];
             if (index != 0) {
                 out.append(',');
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
index dac655d9..e2711dd3 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
@@ -38,7 +38,7 @@ public static boolean statementMayReturnBeforeRecursing(JSStatement statement, J
             return false;
         }
         else if (statement instanceof JSReturnStatement returnStatement) {
-            final JSExpression returnValue = returnStatement.getExpression();
+            JSExpression returnValue = returnStatement.getExpression();
             return returnValue == null || !RecursionUtil.expressionDefinitelyRecurses(returnValue, method);
         }
         else if (statement instanceof JSForStatement forStatement) {
@@ -75,16 +75,16 @@ else if (statement instanceof JSSwitchStatement switchStatement) {
     }
 
     private static boolean doWhileStatementMayReturnBeforeRecursing(JSDoWhileStatement loopStatement, JSFunction method) {
-        final JSStatement body = loopStatement.getBody();
+        JSStatement body = loopStatement.getBody();
         return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
     }
 
     private static boolean whileStatementMayReturnBeforeRecursing(JSWhileStatement loopStatement, JSFunction method) {
-        final JSExpression test = loopStatement.getCondition();
+        JSExpression test = loopStatement.getCondition();
         if (RecursionUtil.expressionDefinitelyRecurses(test, method)) {
             return false;
         }
-        final JSStatement body = loopStatement.getBody();
+        JSStatement body = loopStatement.getBody();
         return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
     }
 
@@ -102,17 +102,17 @@ private static boolean forStatementMayReturnBeforeRecursing(JSForStatement loopS
     }
 
     private static boolean forInStatementMayReturnBeforeRecursing(JSForInStatement loopStatement, JSFunction method) {
-        final JSExpression collection = loopStatement.getCollectionExpression();
+        JSExpression collection = loopStatement.getCollectionExpression();
         if (RecursionUtil.expressionDefinitelyRecurses(collection, method)) {
             return false;
         }
-        final JSStatement body = loopStatement.getBody();
+        JSStatement body = loopStatement.getBody();
         return RecursionUtil.statementMayReturnBeforeRecursing(body, method);
     }
 
     private static boolean switchStatementMayReturnBeforeRecursing(JSSwitchStatement switchStatement, JSFunction method) {
-        for (final JSCaseClause clause : switchStatement.getCaseClauses()) {
-            for (final JSStatement statement : clause.getStatements()) {
+        for (JSCaseClause clause : switchStatement.getCaseClauses()) {
+            for (JSStatement statement : clause.getStatements()) {
                 if (RecursionUtil.statementMayReturnBeforeRecursing(statement, method)) {
                     return true;
                 }
@@ -122,7 +122,7 @@ private static boolean switchStatementMayReturnBeforeRecursing(JSSwitchStatement
     }
 
     private static boolean tryStatementMayReturnBeforeRecursing(JSTryStatement tryStatement, JSFunction method) {
-        final JSStatement finallyStatement = tryStatement.getFinallyStatement();
+        JSStatement finallyStatement = tryStatement.getFinallyStatement();
 
         if (finallyStatement != null) {
             if (RecursionUtil.statementMayReturnBeforeRecursing(finallyStatement, method)) {
@@ -133,16 +133,16 @@ private static boolean tryStatementMayReturnBeforeRecursing(JSTryStatement trySt
             }
         }
 
-        final JSStatement statement = tryStatement.getStatement();
+        JSStatement statement = tryStatement.getStatement();
 
         if (RecursionUtil.statementMayReturnBeforeRecursing(statement, method)) {
             return true;
         }
 
-        final JSCatchBlock catchBlock = tryStatement.getCatchBlock();
+        JSCatchBlock catchBlock = tryStatement.getCatchBlock();
 
         if (catchBlock != null) {
-            final JSStatement catchStatement = catchBlock.getStatement();
+            JSStatement catchStatement = catchBlock.getStatement();
 
             if (RecursionUtil.statementMayReturnBeforeRecursing(catchStatement, method)) {
                 return true;
@@ -152,20 +152,20 @@ private static boolean tryStatementMayReturnBeforeRecursing(JSTryStatement trySt
     }
 
     private static boolean ifStatementMayReturnBeforeRecursing(JSIfStatement ifStatement, JSFunction method) {
-        final JSExpression test = ifStatement.getCondition();
+        JSExpression test = ifStatement.getCondition();
         if (RecursionUtil.expressionDefinitelyRecurses(test, method)) {
             return false;
         }
-        final JSStatement thenBranch = ifStatement.getThen();
+        JSStatement thenBranch = ifStatement.getThen();
         if (RecursionUtil.statementMayReturnBeforeRecursing(thenBranch, method)) {
             return true;
         }
-        final JSStatement elseBranch = ifStatement.getElse();
+        JSStatement elseBranch = ifStatement.getElse();
         return elseBranch != null && RecursionUtil.statementMayReturnBeforeRecursing(elseBranch, method);
     }
 
     private static boolean labeledStatementMayReturnBeforeRecursing(JSLabeledStatement labeledStatement, JSFunction method) {
-        final JSStatement statement = labeledStatement.getStatement();
+        JSStatement statement = labeledStatement.getStatement();
         return RecursionUtil.statementMayReturnBeforeRecursing(statement, method);
     }
 
@@ -174,9 +174,9 @@ private static boolean blockStatementMayReturnBeforeRecursing(JSBlockStatement b
             return true;
         }
 
-        final JSStatement[] statements = block.getStatements();
+        JSStatement[] statements = block.getStatements();
 
-        for (final JSStatement statement : statements) {
+        for (JSStatement statement : statements) {
             if (RecursionUtil.statementMayReturnBeforeRecursing(statement, method)) {
                 return true;
             }
@@ -188,7 +188,7 @@ private static boolean blockStatementMayReturnBeforeRecursing(JSBlockStatement b
     }
 
     public static boolean functionMayRecurse(@Nonnull JSFunction function) {
-        final JSRecursionVisitor recursionVisitor = new JSRecursionVisitor(function);
+        JSRecursionVisitor recursionVisitor = new JSRecursionVisitor(function);
 
         if (recursionVisitor.isFunctionNamed()) {
             function.accept(recursionVisitor);
@@ -240,7 +240,7 @@ private static boolean expressionDefinitelyRecurses(JSExpression exp, JSFunction
     }
 
     private static boolean conditionalExpressionDefinitelyRecurses(JSConditionalExpression expression, JSFunction method) {
-        final JSExpression condExpression = expression.getCondition();
+        JSExpression condExpression = expression.getCondition();
 
         return RecursionUtil.expressionDefinitelyRecurses(condExpression, method) ||
             (RecursionUtil.expressionDefinitelyRecurses(expression.getThen(), method) &&
@@ -248,13 +248,13 @@ private static boolean conditionalExpressionDefinitelyRecurses(JSConditionalExpr
     }
 
     private static boolean binaryExpressionDefinitelyRecurses(JSBinaryExpression expression, JSFunction method) {
-        final JSExpression lhs = expression.getLOperand();
+        JSExpression lhs = expression.getLOperand();
 
         if (RecursionUtil.expressionDefinitelyRecurses(lhs, method)) {
             return true;
         }
 
-        final IElementType tokenType = expression.getOperationSign();
+        IElementType tokenType = expression.getOperationSign();
 
         if (JSTokenTypes.ANDAND.equals(tokenType) || JSTokenTypes.OROR.equals(tokenType)) {
             return false;
@@ -267,14 +267,14 @@ private static boolean indexedPropertyAccessExpressionDefinitelyRecurses(
         JSIndexedPropertyAccessExpression expression,
         JSFunction method
     ) {
-        final JSExpression arrayExp = expression.getQualifier();
-        final JSExpression indexExp = expression.getIndexExpression();
+        JSExpression arrayExp = expression.getQualifier();
+        JSExpression indexExp = expression.getIndexExpression();
         return RecursionUtil.expressionDefinitelyRecurses(arrayExp, method)
             || RecursionUtil.expressionDefinitelyRecurses(indexExp, method);
     }
 
     private static boolean arrayLiteralExpressionDefinitelyRecurses(JSArrayLiteralExpression expression, JSFunction method) {
-        for (final JSExpression initializer : expression.getExpressions()) {
+        for (JSExpression initializer : expression.getExpressions()) {
             if (RecursionUtil.expressionDefinitelyRecurses(initializer, method)) {
                 return true;
             }
@@ -283,38 +283,38 @@ private static boolean arrayLiteralExpressionDefinitelyRecurses(JSArrayLiteralEx
     }
 
     private static boolean prefixExpressionDefinitelyRecurses(JSPrefixExpression expression, JSFunction method) {
-        final JSExpression operand = expression.getExpression();
+        JSExpression operand = expression.getExpression();
         return RecursionUtil.expressionDefinitelyRecurses(operand, method);
     }
 
     private static boolean postfixExpressionDefinitelyRecurses(JSPostfixExpression expression, JSFunction method) {
-        final JSExpression operand = expression.getExpression();
+        JSExpression operand = expression.getExpression();
         return RecursionUtil.expressionDefinitelyRecurses(operand, method);
     }
 
     private static boolean parenthesizedExpressionDefinitelyRecurses(JSParenthesizedExpression expression, JSFunction method) {
-        final JSExpression innerExpression = expression.getInnerExpression();
+        JSExpression innerExpression = expression.getInnerExpression();
         return RecursionUtil.expressionDefinitelyRecurses(innerExpression, method);
     }
 
     private static boolean referenceExpressionDefinitelyRecurses(JSReferenceExpression expression, JSFunction method) {
-        final JSExpression qualifierExpression = expression.getQualifier();
+        JSExpression qualifierExpression = expression.getQualifier();
         return (qualifierExpression != null &&
             RecursionUtil.expressionDefinitelyRecurses(qualifierExpression, method));
     }
 
     private static boolean assignmentExpressionDefinitelyRecurses(JSAssignmentExpression assignmentExpression, JSFunction method) {
-        final JSExpression lhs = assignmentExpression.getLOperand();
-        final JSExpression rhs = assignmentExpression.getROperand();
+        JSExpression lhs = assignmentExpression.getLOperand();
+        JSExpression rhs = assignmentExpression.getROperand();
         return RecursionUtil.expressionDefinitelyRecurses(rhs, method)
             || RecursionUtil.expressionDefinitelyRecurses(lhs, method);
     }
 
     private static boolean newExpressionDefinitelyRecurses(JSNewExpression exp, JSFunction method) {
-        final JSArgumentList argumentList = exp.getArgumentList();
+        JSArgumentList argumentList = exp.getArgumentList();
         if (argumentList != null) {
-            final JSExpression[] args = argumentList.getArguments();
-            for (final JSExpression arg : args) {
+            JSExpression[] args = argumentList.getArguments();
+            for (JSExpression arg : args) {
                 if (RecursionUtil.expressionDefinitelyRecurses(arg, method)) {
                     return true;
                 }
@@ -324,13 +324,13 @@ private static boolean newExpressionDefinitelyRecurses(JSNewExpression exp, JSFu
     }
 
     private static boolean callExpressionDefinitelyRecurses(JSCallExpression exp, JSFunction method) {
-        final JSFunction calledMethod = ControlFlowUtils.resolveMethod(exp);
+        JSFunction calledMethod = ControlFlowUtils.resolveMethod(exp);
 
         if (calledMethod != null && calledMethod.equals(method)) {
             return true;
         }
 
-        final JSExpression methodExpression = exp.getMethodExpression();
+        JSExpression methodExpression = exp.getMethodExpression();
 
         if (methodExpression == null) {
             return false;
@@ -339,7 +339,7 @@ else if (RecursionUtil.expressionDefinitelyRecurses(methodExpression, method)) {
             return true;
         }
 
-        for (final JSExpression arg : exp.getArgumentList().getArguments()) {
+        for (JSExpression arg : exp.getArgumentList().getArguments()) {
             if (RecursionUtil.expressionDefinitelyRecurses(arg, method)) {
                 return true;
             }
@@ -358,12 +358,12 @@ private static boolean statementDefinitelyRecurses(JSStatement statement, JSFunc
             return false;
         }
         else if (statement instanceof JSExpressionStatement expressionStatement) {
-            final JSExpression expression = expressionStatement.getExpression();
+            JSExpression expression = expressionStatement.getExpression();
             return RecursionUtil.expressionDefinitelyRecurses(expression, method);
         }
         else if (statement instanceof JSVarStatement varStatement) {
-            for (final JSVariable variable : varStatement.getVariables()) {
-                final JSExpression initializer = variable.getInitializer();
+            for (JSVariable variable : varStatement.getVariables()) {
+                JSExpression initializer = variable.getInitializer();
                 if (RecursionUtil.expressionDefinitelyRecurses(initializer, method)) {
                     return true;
                 }
@@ -371,7 +371,7 @@ else if (statement instanceof JSVarStatement varStatement) {
             return false;
         }
         else if (statement instanceof JSReturnStatement returnStatement) {
-            final JSExpression returnValue = returnStatement.getExpression();
+            JSExpression returnValue = returnStatement.getExpression();
             if (returnValue != null) {
                 if (RecursionUtil.expressionDefinitelyRecurses(returnValue, method)) {
                     return true;
@@ -413,22 +413,22 @@ else if (statement instanceof JSSwitchStatement switchStatement) {
     }
 
     private static boolean switchStatementDefinitelyRecurses(JSSwitchStatement switchStatement, JSFunction method) {
-        final JSExpression switchExpression = switchStatement.getSwitchExpression();
+        JSExpression switchExpression = switchStatement.getSwitchExpression();
         return RecursionUtil.expressionDefinitelyRecurses(switchExpression, method);
     }
 
     private static boolean tryStatementDefinitelyRecurses(JSTryStatement tryStatement, JSFunction method) {
-        final JSStatement statement = tryStatement.getStatement();
+        JSStatement statement = tryStatement.getStatement();
         if (RecursionUtil.statementDefinitelyRecurses(statement, method)) {
             return true;
         }
-        final JSStatement finallyStatement = tryStatement.getFinallyStatement();
+        JSStatement finallyStatement = tryStatement.getFinallyStatement();
         return RecursionUtil.statementDefinitelyRecurses(finallyStatement, method);
     }
 
     private static boolean blockStatementDefinitelyRecurses(JSBlockStatement block, JSFunction method) {
         if (block != null) {
-            for (final JSStatement statement : block.getStatements()) {
+            for (JSStatement statement : block.getStatements()) {
                 if (RecursionUtil.statementDefinitelyRecurses(statement, method)) {
                     return true;
                 }
@@ -438,12 +438,12 @@ private static boolean blockStatementDefinitelyRecurses(JSBlockStatement block,
     }
 
     private static boolean ifStatementDefinitelyRecurses(JSIfStatement ifStatement, JSFunction method) {
-        final JSExpression condition = ifStatement.getCondition();
+        JSExpression condition = ifStatement.getCondition();
         if (RecursionUtil.expressionDefinitelyRecurses(condition, method)) {
             return true;
         }
-        final JSStatement thenBranch = ifStatement.getThen();
-        final JSStatement elseBranch = ifStatement.getElse();
+        JSStatement thenBranch = ifStatement.getThen();
+        JSStatement elseBranch = ifStatement.getElse();
         if (thenBranch == null || elseBranch == null) {
             return false;
         }
@@ -452,8 +452,8 @@ private static boolean ifStatementDefinitelyRecurses(JSIfStatement ifStatement,
     }
 
     private static boolean forStatementDefinitelyRecurses(JSForStatement forStatement, JSFunction method) {
-        final JSStatement declaration = forStatement.getVarDeclaration();
-        final JSExpression initialization = forStatement.getInitialization();
+        JSStatement declaration = forStatement.getVarDeclaration();
+        JSExpression initialization = forStatement.getInitialization();
 
         if (declaration != null &&
             RecursionUtil.statementDefinitelyRecurses(declaration, method)) {
@@ -464,54 +464,54 @@ else if (initialization != null &&
             return true;
         }
 
-        final JSExpression condition = forStatement.getCondition();
+        JSExpression condition = forStatement.getCondition();
 
         if (RecursionUtil.expressionDefinitelyRecurses(condition, method)) {
             return true;
         }
         if (BoolUtils.isTrue(condition)) {
-            final JSStatement body = forStatement.getBody();
+            JSStatement body = forStatement.getBody();
             return RecursionUtil.statementDefinitelyRecurses(body, method);
         }
         return false;
     }
 
     private static boolean forInStatementDefinitelyRecurses(JSForInStatement foreachStatement, JSFunction method) {
-        final JSExpression collection = foreachStatement.getCollectionExpression();
+        JSExpression collection = foreachStatement.getCollectionExpression();
         return RecursionUtil.expressionDefinitelyRecurses(collection, method);
     }
 
     private static boolean whileStatementDefinitelyRecurses(JSWhileStatement whileStatement, JSFunction method) {
-        final JSExpression condition = whileStatement.getCondition();
+        JSExpression condition = whileStatement.getCondition();
         if (RecursionUtil.expressionDefinitelyRecurses(condition, method)) {
             return true;
         }
         if (BoolUtils.isTrue(condition)) {
-            final JSStatement body = whileStatement.getBody();
+            JSStatement body = whileStatement.getBody();
             return RecursionUtil.statementDefinitelyRecurses(body, method);
         }
         return false;
     }
 
     private static boolean doWhileStatementDefinitelyRecurses(JSDoWhileStatement doWhileStatement, JSFunction method) {
-        final JSStatement body = doWhileStatement.getBody();
+        JSStatement body = doWhileStatement.getBody();
         if (RecursionUtil.statementDefinitelyRecurses(body, method)) {
             return true;
         }
-        final JSExpression condition = doWhileStatement.getCondition();
+        JSExpression condition = doWhileStatement.getCondition();
         return RecursionUtil.expressionDefinitelyRecurses(condition, method);
     }
 
     private static boolean labeledStatementDefinitelyRecurses(JSLabeledStatement labeledStatement, JSFunction method) {
-        final JSStatement body = labeledStatement.getStatement();
+        JSStatement body = labeledStatement.getStatement();
         return RecursionUtil.statementDefinitelyRecurses(body, method);
     }
 
     public static boolean functionDefinitelyRecurses(@Nonnull JSFunction method) {
-        final JSSourceElement[] body = method.getBody();
+        JSSourceElement[] body = method.getBody();
 
         if (body != null) {
-            for (final JSSourceElement element : body) {
+            for (JSSourceElement element : body) {
                 if (element instanceof JSStatement &&
                     RecursionUtil.statementDefinitelyRecurses((JSStatement)element, method)) {
                     return true;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
index 5fe9c4e9..a6d853fa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/SideEffectChecker.java
@@ -24,7 +24,7 @@ private SideEffectChecker() {
     }
 
     public static boolean mayHaveSideEffects(JSExpression exp) {
-        final SideEffectsVisitor visitor = new SideEffectsVisitor();
+        SideEffectsVisitor visitor = new SideEffectsVisitor();
         exp.accept(visitor);
         return visitor.mayHaveSideEffects();
     }
@@ -57,7 +57,7 @@ public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
         @Override
         public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
 
             if (sign != null && (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign))) {
                 this.mayHaveSideEffects = true;
@@ -67,7 +67,7 @@ public void visitJSPrefixExpression(JSPrefixExpression expression) {
         @Override
         public void visitJSPostfixExpression(JSPostfixExpression expression) {
             super.visitJSPostfixExpression(expression);
-            final IElementType sign = expression.getOperationSign();
+            IElementType sign = expression.getOperationSign();
 
             if (sign != null && (JSTokenTypes.PLUSPLUS.equals(sign) || JSTokenTypes.MINUSMINUS.equals(sign))) {
                 this.mayHaveSideEffects = true;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
index bd66915b..fa1d2e14 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
@@ -29,16 +29,16 @@ public static PsiElement getNextLeaf(PsiElement element) {
         if (element == null) {
             return null;
         }
-        final PsiElement sibling = element.getNextSibling();
+        PsiElement sibling = element.getNextSibling();
         if (sibling == null) {
-            final PsiElement parent = element.getParent();
+            PsiElement parent = element.getParent();
             return getNextLeaf(parent);
         }
         return getFirstLeaf(sibling);
     }
 
     private static PsiElement getFirstLeaf(PsiElement element) {
-        final PsiElement[] children = element.getChildren();
+        PsiElement[] children = element.getChildren();
         if (children.length == 0) {
             return element;
         }
@@ -49,16 +49,16 @@ public static PsiElement getPrevLeaf(PsiElement element) {
         if (element == null) {
             return null;
         }
-        final PsiElement sibling = element.getPrevSibling();
+        PsiElement sibling = element.getPrevSibling();
         if (sibling == null) {
-            final PsiElement parent = element.getParent();
+            PsiElement parent = element.getParent();
             return getPrevLeaf(parent);
         }
         return getLastLeaf(sibling);
     }
 
     private static PsiElement getLastLeaf(PsiElement element) {
-        final PsiElement[] children = element.getChildren();
+        PsiElement[] children = element.getChildren();
         if (children.length == 0) {
             return element;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
index 7618f850..e2a6e067 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
@@ -35,7 +35,7 @@ public static boolean variableIsAssignedFrom(
         JSVariable variable,
         JSElement context
     ) {
-        final VariableAssignedFromVisitor visitor = new VariableAssignedFromVisitor(variable);
+        VariableAssignedFromVisitor visitor = new VariableAssignedFromVisitor(variable);
         context.accept(visitor);
         return visitor.isAssignedFrom();
     }
@@ -72,7 +72,7 @@ private static boolean variableIsAssigned(
         Set<JSVariable> notUpdatedSymbols,
         Set<JSVariable> candidateSymbols
     ) {
-        final VariableAssignedVisitor visitor = new VariableAssignedVisitor(variable, context, notUpdatedSymbols,
+        VariableAssignedVisitor visitor = new VariableAssignedVisitor(variable, context, notUpdatedSymbols,
             candidateSymbols
         );
         context.accept(visitor);
@@ -80,25 +80,25 @@ private static boolean variableIsAssigned(
     }
 
     public static boolean variableIsReturned(JSVariable variable, JSElement context) {
-        final VariableReturnedVisitor visitor = new VariableReturnedVisitor(variable);
+        VariableReturnedVisitor visitor = new VariableReturnedVisitor(variable);
         context.accept(visitor);
         return visitor.isReturned();
     }
 
     public static boolean arrayContentsAreAccessed(JSVariable variable, JSElement context) {
-        final ArrayContentsAccessedVisitor visitor = new ArrayContentsAccessedVisitor(variable);
+        ArrayContentsAccessedVisitor visitor = new ArrayContentsAccessedVisitor(variable);
         context.accept(visitor);
         return visitor.isAccessed();
     }
 
     public static boolean arrayContentsAreAssigned(JSVariable variable, JSElement context) {
-        final ArrayContentsAssignedVisitor visitor = new ArrayContentsAssignedVisitor(variable);
+        ArrayContentsAssignedVisitor visitor = new ArrayContentsAssignedVisitor(variable);
         context.accept(visitor);
         return visitor.isAssigned();
     }
 
     public static boolean mayEvaluateToVariable(JSExpression expression, JSVariable variable) {
-        final String variableName = variable.getName();
+        String variableName = variable.getName();
         JSExpression expr = expression;
 
         if (variableName == null) {
@@ -123,7 +123,7 @@ else if (expr instanceof JSDefinitionExpression defExpr) {
                 expr = defExpr.getExpression();
             }
             else if (expr instanceof JSReferenceExpression refExpr) {
-                final PsiElement referent = refExpr.resolve();
+                PsiElement referent = refExpr.resolve();
 
                 return referent != null && referent.equals(variable);
             }
@@ -139,7 +139,7 @@ public static boolean variableIsUsed(JSVariable variable, PsiElement context) {
     }
 
     public static Set<JSVariable> getUsedVariables(PsiElement context) {
-        final UsedVariableVisitor visitor = new UsedVariableVisitor();
+        UsedVariableVisitor visitor = new UsedVariableVisitor();
         context.accept(visitor);
         return visitor.getVariables();
     }
@@ -188,11 +188,11 @@ public void visitJSAssignmentExpression(JSAssignmentExpression assignment) {
             if (!this.assigned) {
                 super.visitJSAssignmentExpression(assignment);
 
-                final JSExpression arg = assignment.getLOperand();
+                JSExpression arg = assignment.getLOperand();
 
                 if (VariableAccessUtil.mayEvaluateToVariable(arg, this.variable)) {
-                    final Set<JSVariable> usedVariables = getUsedVariables(assignment.getROperand());
-                    final Set<JSVariable> newCandidateSet = new LinkedHashSet<>();
+                    Set<JSVariable> usedVariables = getUsedVariables(assignment.getROperand());
+                    Set<JSVariable> newCandidateSet = new LinkedHashSet<>();
                     boolean assigned = false;
 
                     newCandidateSet.addAll(this.candidateSymbols);
@@ -222,14 +222,14 @@ public void visitJSPrefixExpression(JSPrefixExpression expression) {
             if (!this.assigned) {
                 super.visitJSPrefixExpression(expression);
 
-                final IElementType tokenType = expression.getOperationSign();
+                IElementType tokenType = expression.getOperationSign();
 
                 if (!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
                     tokenType.equals(JSTokenTypes.MINUSMINUS))) {
                     return;
                 }
 
-                final JSExpression operand = expression.getExpression();
+                JSExpression operand = expression.getExpression();
 
                 this.assigned = VariableAccessUtil.mayEvaluateToVariable(operand, this.variable);
             }
@@ -240,14 +240,14 @@ public void visitJSPostfixExpression(JSPostfixExpression postfixExpression) {
             if (!this.assigned) {
                 super.visitJSPostfixExpression(postfixExpression);
 
-                final IElementType tokenType = postfixExpression.getOperationSign();
+                IElementType tokenType = postfixExpression.getOperationSign();
 
                 if (!(tokenType.equals(JSTokenTypes.PLUSPLUS) ||
                     tokenType.equals(JSTokenTypes.MINUSMINUS))) {
                     return;
                 }
 
-                final JSExpression operand = postfixExpression.getExpression();
+                JSExpression operand = postfixExpression.getExpression();
 
                 this.assigned = VariableAccessUtil.mayEvaluateToVariable(operand, this.variable);
             }
@@ -288,7 +288,7 @@ public void visitJSVarStatement(@Nonnull JSVarStatement statement) {
                 super.visitJSVarStatement(statement);
 
                 for (JSVariable declaredVariable : statement.getVariables()) {
-                    final JSExpression initializer = declaredVariable.getInitializer();
+                    JSExpression initializer = declaredVariable.getInitializer();
 
                     if (initializer != null) {
                         this.assignedFrom = VariableAccessUtil.mayEvaluateToVariable(initializer, this.variable);
@@ -353,7 +353,7 @@ public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAcc
             if (!this.accessed) {
                 super.visitJSIndexedPropertyAccessExpression(accessExpression);
 
-                final PsiElement parent = accessExpression.getParent();
+                PsiElement parent = accessExpression.getParent();
 
                 if (!(parent instanceof JSAssignmentExpression ||
                     ((JSAssignmentExpression)parent).getLOperand().equals(accessExpression))) {
@@ -364,7 +364,7 @@ public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAcc
 
         private void checkQualifier(JSExpression qualifier) {
             if (qualifier instanceof JSReferenceExpression referenceExpression) {
-                final PsiElement referent = referenceExpression.resolve();
+                PsiElement referent = referenceExpression.resolve();
 
                 this.accessed = (referent != null && referent.equals(this.variable));
             }
@@ -422,7 +422,7 @@ private void checkExpression(IElementType tokenType, JSExpression expression) {
             }
 
             if (arrayExpression instanceof JSReferenceExpression referenceExpression) {
-                final String referencedName = referenceExpression.getReferencedName();
+                String referencedName = referenceExpression.getReferencedName();
 
                 // TODO maybe it's better to check ((JSReferenceExpression) arrayExpression).isReferenceTo(variable) ?
                 this.assigned = referencedName != null && referencedName.equals(this.variable.getName());
@@ -446,7 +446,7 @@ public UsedVariableVisitor() {
         public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
             super.visitJSReferenceExpression(ref);
 
-            final PsiElement referent = ref.resolve();
+            PsiElement referent = ref.resolve();
 
             if (referent != null && referent instanceof JSVariable variable) {
                 this.variables.add(variable);
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
index 0cdf5924..edeb6577 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptExpressionParsing.java
@@ -123,7 +123,7 @@ else if (tokenType == JSTokenTypes.LPAR) {
 
     @Override
     protected void parseProperty(PsiBuilder builder) {
-        final IElementType nameTokenType = builder.getTokenType();
+        IElementType nameTokenType = builder.getTokenType();
         PsiBuilder.Marker propertyMark = builder.mark();
 
         IElementType isSetterOrGetterType = null;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index ae2ce722..7bf16e9b 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -43,7 +43,7 @@ public EcmaScriptStatementParsing(EcmaScriptParsingContext context) {
 
     @Override
     public void parseSourceElement(PsiBuilder builder) {
-        final IElementType tokenType = builder.getTokenType();
+        IElementType tokenType = builder.getTokenType();
         if (tokenType == JSTokenTypes.FUNCTION_KEYWORD) {
             getFunctionParsing().parseFunctionDeclaration(builder);
         }
@@ -84,11 +84,11 @@ else if (nextType == JSTokenTypes.VAR_KEYWORD ||
     }
 
     @Override
-    protected boolean parseForLoopHeader(final PsiBuilder builder) {
+    protected boolean parseForLoopHeader(PsiBuilder builder) {
         builder.advanceLexer();
 
         Parsing.checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
-        final boolean empty;
+        boolean empty;
         if (builder.getTokenType() == JSTokenTypes.VAR_KEYWORD
             || builder.getTokenType() == JSTokenTypes.LET_KEYWORD
             || builder.getTokenType() == JSTokenTypes.CONST_KEYWORD) {
@@ -146,8 +146,8 @@ protected void doParseStatement(PsiBuilder builder, boolean canHaveClasses) {
         super.doParseStatement(builder, canHaveClasses);
     }
 
-    private void parseImportStatement(final PsiBuilder builder) {
-        final PsiBuilder.Marker importStatement = builder.mark();
+    private void parseImportStatement(PsiBuilder builder) {
+        PsiBuilder.Marker importStatement = builder.mark();
         try {
             builder.advanceLexer();
 
@@ -288,11 +288,11 @@ protected boolean doParseStatementSub(PsiBuilder builder, boolean canHaveClasses
         return false;
     }
 
-    private void parseClass(final PsiBuilder builder, boolean nameRequired) {
+    private void parseClass(PsiBuilder builder, boolean nameRequired) {
         parseClassWithMarker(builder, builder.mark(), nameRequired);
     }
 
-    public void parseClassWithMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz, boolean nameRequired) {
+    public void parseClassWithMarker(PsiBuilder builder, @Nonnull PsiBuilder.Marker clazz, boolean nameRequired) {
         builder.advanceLexer();
 
         if (builder.getTokenType() != JSTokenTypes.IDENTIFIER) {
@@ -312,7 +312,7 @@ public void parseClassWithMarker(final PsiBuilder builder, final @Nonnull PsiBui
         clazz.done(JSElementTypes.CLASS);
     }
 
-    protected void parseClassBody(final PsiBuilder builder, BlockType type) {
+    protected void parseClassBody(PsiBuilder builder, BlockType type) {
         if (builder.getTokenType() != JSTokenTypes.LBRACE) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbrace());
             return;
@@ -410,10 +410,10 @@ else if (isContextKeyword(builder, TokenSet.create(JSTokenTypes.STATIC_KEYWORD))
         return false;
     }
 
-    private void parseReferenceList(final PsiBuilder builder) {
-        final IElementType tokenType = builder.getTokenType();
+    private void parseReferenceList(PsiBuilder builder) {
+        IElementType tokenType = builder.getTokenType();
         LOGGER.assertTrue(tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD);
-        final PsiBuilder.Marker referenceList = builder.mark();
+        PsiBuilder.Marker referenceList = builder.mark();
         builder.advanceLexer();
 
         if (getExpressionParsing().parseSimpleExpression(builder)) {
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
index 424fe19c..e966e3e4 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
@@ -23,7 +23,7 @@ public void register(@Nonnull Registrar registrar) {
     }
 
     @Override
-    public TextEditorHighlightingPass createHighlightingPass(@Nonnull final PsiFile file, @Nonnull final Editor editor) {
+    public TextEditorHighlightingPass createHighlightingPass(@Nonnull PsiFile file, @Nonnull Editor editor) {
         if (editor.isOneLineMode() || !(editor instanceof EditorEx) || !(file.getLanguageVersion() instanceof JSXJavaScriptVersion)) {
             return null;
         }
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
index 4bddc76c..48bcd749 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ExpressionParsing.java
@@ -23,11 +23,11 @@ protected boolean parseMemberExpression(PsiBuilder builder, boolean allowCallSyn
         PsiBuilder.Marker expr = builder.mark();
         boolean isNew;
 
-        final IElementType type = builder.getTokenType();
+        IElementType type = builder.getTokenType();
 
         if (type == JSTokenTypes.NEW_KEYWORD) {
             isNew = true;
-            final boolean isfunction = parseNewExpression(builder);
+            boolean isfunction = parseNewExpression(builder);
 
             if (isfunction) {
                 expr.done(JSElementTypes.NEW_EXPRESSION);
@@ -121,7 +121,7 @@ public boolean parseQualifiedTypeName(PsiBuilder builder, boolean allowStar, Tok
             boolean stop = false;
             builder.advanceLexer();
 
-            final IElementType tokenType = builder.getTokenType();
+            IElementType tokenType = builder.getTokenType();
             if (tokenType == JSTokenTypes.ANY_IDENTIFIER && allowStar) {
                 builder.advanceLexer();
                 stop = true;
@@ -157,7 +157,7 @@ else if (tokenType == JSTokenTypes.DEFAULT_KEYWORD
     }
 
     @Override
-    public boolean tryParseType(final PsiBuilder builder) {
+    public boolean tryParseType(PsiBuilder builder) {
         if (builder.getTokenType() == JSTokenTypes.COLON) {
             builder.advanceLexer();
 
@@ -167,7 +167,7 @@ public boolean tryParseType(final PsiBuilder builder) {
         return false;
     }
 
-    private void parseGenericSignature(final PsiBuilder builder) {
+    private void parseGenericSignature(PsiBuilder builder) {
         assert builder.getTokenType() == JSTokenTypes.LT;
         PsiBuilder.Marker genericTypeSignature = builder.mark();
         builder.advanceLexer();
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
index 9436a68f..04a53b46 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4FunctionParsing.java
@@ -17,8 +17,8 @@ public EcmaScript4FunctionParsing(JavaScriptParsingContext context) {
         super(context);
     }
 
-    public void parseAttributeWithoutBrackets(final PsiBuilder builder) {
-        final PsiBuilder.Marker attribute = builder.mark();
+    public void parseAttributeWithoutBrackets(PsiBuilder builder) {
+        PsiBuilder.Marker attribute = builder.mark();
         if (!checkMatches(builder, JSTokenTypes.IDENTIFIER, JavaScriptLocalize.javascriptParserMessageExpectedIdentifier())) {
             attribute.drop();
             return;
@@ -27,8 +27,8 @@ public void parseAttributeWithoutBrackets(final PsiBuilder builder) {
         attribute.done(JSElementTypes.ATTRIBUTE);
     }
 
-    void parseAttributesList(final PsiBuilder builder) {
-        final PsiBuilder.Marker modifierList = builder.mark();
+    void parseAttributesList(PsiBuilder builder) {
+        PsiBuilder.Marker modifierList = builder.mark();
 
         boolean seenNs = false;
         boolean seenAnyAttributes = false;
@@ -93,7 +93,7 @@ void parseAttributesList(final PsiBuilder builder) {
             }
         }
         finally {
-            final IElementType currentTokenType = builder.getTokenType();
+            IElementType currentTokenType = builder.getTokenType();
 
             if (seenNs && !seenAnyAttributes
                 && currentTokenType != JSTokenTypes.VAR_KEYWORD
@@ -108,8 +108,8 @@ void parseAttributesList(final PsiBuilder builder) {
         }
     }
 
-    private void parseAttributeBody(final PsiBuilder builder) {
-        final boolean haveLParen = checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
+    private void parseAttributeBody(PsiBuilder builder) {
+        boolean haveLParen = checkMatches(builder, JSTokenTypes.LPAR, JavaScriptLocalize.javascriptParserMessageExpectedLparen());
         boolean hasName;
 
         while (haveLParen) {
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
index 73530063..385a02cb 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
@@ -28,7 +28,7 @@ public EcmaScript4FunctionParsing getFunctionParsing() {
 
     @Override
     public void parseSourceElement(PsiBuilder builder) {
-        final IElementType tokenType = builder.getTokenType();
+        IElementType tokenType = builder.getTokenType();
         if (tokenType == JSTokenTypes.FUNCTION_KEYWORD) {
             getFunctionParsing().parseFunctionDeclaration(builder);
         }
@@ -45,7 +45,7 @@ else if (tokenType == JSTokenTypes.AT) {
     }
 
     @Override
-    protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn) {
+    protected void parseVarDeclaration(PsiBuilder builder, boolean allowIn) {
         if (!JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(builder.getTokenType())) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedVariableName());
             builder.advanceLexer();
@@ -75,8 +75,8 @@ protected void parseVarDeclaration(final PsiBuilder builder, boolean allowIn) {
     }
 
     @Override
-    protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses) {
-        final IElementType firstToken = builder.getTokenType();
+    protected void doParseStatement(PsiBuilder builder, boolean canHaveClasses) {
+        IElementType firstToken = builder.getTokenType();
 
         if (firstToken == null) {
             builder.error(JavaScriptLocalize.javascriptParserMessageExpectedStatement());
@@ -203,7 +203,7 @@ protected void doParseStatement(final PsiBuilder builder, boolean canHaveClasses
                     return;
                 }
 
-                final IElementType tokenType = builder.getTokenType();
+                IElementType tokenType = builder.getTokenType();
                 if (tokenType == JSTokenTypes.FUNCTION_KEYWORD) {
                     getFunctionParsing().parseFunctionNoMarker(builder, false, marker);
                     return;
@@ -242,7 +242,7 @@ else if (JSTokenTypes.COLON_COLON == builder.getTokenType()) {
 
         if (firstToken == JSTokenTypes.IDENTIFIER) {
             // Try labeled statement:
-            final PsiBuilder.Marker labeledStatement = builder.mark();
+            PsiBuilder.Marker labeledStatement = builder.mark();
             builder.advanceLexer();
             if (builder.getTokenType() == JSTokenTypes.COLON) {
                 builder.advanceLexer();
@@ -265,9 +265,9 @@ else if (JSTokenTypes.COLON_COLON == builder.getTokenType()) {
         builder.advanceLexer();
     }
 
-    private void parseDefaultNsStatement(final PsiBuilder builder) {
+    private void parseDefaultNsStatement(PsiBuilder builder) {
         EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.DEFAULT_KEYWORD);
-        final PsiBuilder.Marker marker = builder.mark();
+        PsiBuilder.Marker marker = builder.mark();
         builder.advanceLexer();
 
         if (builder.getTokenType() == JSTokenTypes.IDENTIFIER && "xml".equals(builder.getTokenText())) {
@@ -285,12 +285,12 @@ private void parseDefaultNsStatement(final PsiBuilder builder) {
         marker.done(JSElementTypes.ASSIGNMENT_EXPRESSION);
     }
 
-    private void parseImportStatement(final PsiBuilder builder) {
-        final PsiBuilder.Marker importStatement = builder.mark();
+    private void parseImportStatement(PsiBuilder builder) {
+        PsiBuilder.Marker importStatement = builder.mark();
         try {
             builder.advanceLexer();
 
-            final PsiBuilder.Marker nsAssignment = builder.mark();
+            PsiBuilder.Marker nsAssignment = builder.mark();
             if (!getExpressionParsing().parseQualifiedTypeName(builder, true)) {
                 builder.error(JavaScriptLocalize.javascriptParserMessageExpectedTypename());
                 nsAssignment.drop();
@@ -316,7 +316,7 @@ private void parseImportStatement(final PsiBuilder builder) {
         }
     }
 
-    private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker useNSStatement) {
+    private boolean parseNamespaceNoMarker(PsiBuilder builder, @Nonnull PsiBuilder.Marker useNSStatement) {
         EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NAMESPACE_KEYWORD);
 
         builder.advanceLexer();
@@ -337,8 +337,8 @@ private boolean parseNamespaceNoMarker(final PsiBuilder builder, final @Nonnull
         return true;
     }
 
-    private void parseUseNamespaceDirective(final PsiBuilder builder) {
-        final PsiBuilder.Marker useNSStatement = builder.mark();
+    private void parseUseNamespaceDirective(PsiBuilder builder) {
+        PsiBuilder.Marker useNSStatement = builder.mark();
         builder.advanceLexer();
 
         if (builder.getTokenType() != JSTokenTypes.NAMESPACE_KEYWORD) {
@@ -363,12 +363,12 @@ private void parseUseNamespaceDirective(final PsiBuilder builder) {
         useNSStatement.done(JSElementTypes.USE_NAMESPACE_DIRECTIVE);
     }
 
-    private void parseClass(final PsiBuilder builder) {
+    private void parseClass(PsiBuilder builder) {
         parseClassNoMarker(builder, builder.mark());
     }
 
-    private void parseClassNoMarker(final PsiBuilder builder, final @Nonnull PsiBuilder.Marker clazz) {
-        final IElementType tokenType = builder.getTokenType();
+    private void parseClassNoMarker(PsiBuilder builder, @Nonnull PsiBuilder.Marker clazz) {
+        IElementType tokenType = builder.getTokenType();
         EcmaScript4StatementParsing.LOGGER.assertTrue(
             JSTokenTypes.CLASS_KEYWORD == tokenType || JSTokenTypes.INTERFACE_KEYWORD == tokenType
         );
@@ -390,12 +390,12 @@ private void parseClassNoMarker(final PsiBuilder builder, final @Nonnull PsiBuil
         clazz.done(JSElementTypes.CLASS);
     }
 
-    private void parseReferenceList(final PsiBuilder builder) {
-        final IElementType tokenType = builder.getTokenType();
+    private void parseReferenceList(PsiBuilder builder) {
+        IElementType tokenType = builder.getTokenType();
         EcmaScript4StatementParsing.LOGGER.assertTrue(
             tokenType == JSTokenTypes.EXTENDS_KEYWORD || tokenType == JSTokenTypes.IMPLEMENTS_KEYWORD
         );
-        final PsiBuilder.Marker referenceList = builder.mark();
+        PsiBuilder.Marker referenceList = builder.mark();
         builder.advanceLexer();
 
         if (getExpressionParsing().parseQualifiedTypeName(builder)) {
@@ -409,8 +409,8 @@ private void parseReferenceList(final PsiBuilder builder) {
         referenceList.done(tokenType == JSTokenTypes.EXTENDS_KEYWORD ? JSElementTypes.EXTENDS_LIST : JSElementTypes.IMPLEMENTS_LIST);
     }
 
-    private void parsePackage(final PsiBuilder builder) {
-        final PsiBuilder.Marker packageMarker = builder.mark();
+    private void parsePackage(PsiBuilder builder) {
+        PsiBuilder.Marker packageMarker = builder.mark();
         builder.advanceLexer();
         if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
             getExpressionParsing().parseQualifiedTypeName(builder);
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java
index 031c2052..53525432 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/lexer/JavaScript16Lexer.java
@@ -627,7 +627,7 @@ public int getState() {
     }
 
     @Override
-    public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
+    public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
         reset(buffer, startOffset, endOffset, initialState);
         myTokenType = null;
     }
@@ -664,7 +664,7 @@ private void locateToken() {
         catch (java.io.IOException e) { /*Can't happen*/ }
         catch (Error e) {
             // add lexer class name to the error
-            final Error error = new Error(getClass().getName() + ": " + e.getMessage());
+            Error error = new Error(getClass().getName() + ": " + e.getMessage());
             error.setStackTrace(e.getStackTrace());
             throw error;
         }
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java
index b57964f2..71c3eb15 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/lexer/JavaScript17Lexer.java
@@ -640,7 +640,7 @@ public int getState() {
     }
 
     @Override
-    public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
+    public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
         reset(buffer, startOffset, endOffset, initialState);
         myTokenType = null;
     }
@@ -677,7 +677,7 @@ private void locateToken() {
         catch (java.io.IOException e) { /*Can't happen*/ }
         catch (Error e) {
             // add lexer class name to the error
-            final Error error = new Error(getClass().getName() + ": " + e.getMessage());
+            Error error = new Error(getClass().getName() + ": " + e.getMessage());
             error.setStackTrace(e.getStackTrace());
             throw error;
         }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
index f14e766b..f788cc73 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
@@ -21,7 +21,7 @@ public class JomProxyInvocationHandler implements InvocationHandler {
     @Nonnull
     public static JomElement createProxy(
         @Nonnull Class<?> interfaceClass,
-        @Nullable final JSObjectLiteralExpression objectLiteralExpression
+        @Nullable JSObjectLiteralExpression objectLiteralExpression
     ) {
         return (JomElement)Proxy.newProxyInstance(
             interfaceClass.getClassLoader(),
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
index 0f2c53c9..1f591018 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
@@ -28,7 +28,7 @@ public class JsonJavaScriptParser implements PsiParser {
     @Nonnull
     @Override
     public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder builder, @Nonnull LanguageVersion languageVersion) {
-        final PsiBuilder.Marker rootMarker = builder.mark();
+        PsiBuilder.Marker rootMarker = builder.mark();
         parseRoot(builder);
         rootMarker.done(root);
         return builder.getTreeBuilt();
@@ -56,7 +56,7 @@ else if (builder.getTokenType() == JSTokenTypes.LBRACE) {
         }
     }
 
-    private void parseProperty(final PsiBuilder builder) {
+    private void parseProperty(PsiBuilder builder) {
         if (myPropertyDepth > 1000) {
             builder.error("Too big depth for property");
             int braceCount = 0;
@@ -85,8 +85,8 @@ else if (tokenType == JSTokenTypes.RBRACKET) {
             }
         }
 
-        final IElementType nameToken = builder.getTokenType();
-        final PsiBuilder.Marker property = builder.mark();
+        IElementType nameToken = builder.getTokenType();
+        PsiBuilder.Marker property = builder.mark();
         myPropertyDepth++;
 
         if (isNotPropertyStart(nameToken)) {
@@ -103,9 +103,9 @@ else if (tokenType == JSTokenTypes.RBRACKET) {
         property.done(JSElementTypes.PROPERTY);
     }
 
-    public void parseObjectLiteralExpression(final PsiBuilder builder) {
+    public void parseObjectLiteralExpression(PsiBuilder builder) {
         LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
-        final PsiBuilder.Marker expr = builder.mark();
+        PsiBuilder.Marker expr = builder.mark();
         builder.advanceLexer();
 
         IElementType elementType = builder.getTokenType();
@@ -141,21 +141,21 @@ else if (isNotPropertyStart(elementType)) {
         expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
     }
 
-    public static boolean isNotPropertyStart(final IElementType elementType) {
+    public static boolean isNotPropertyStart(IElementType elementType) {
         return !JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(elementType)
             && !JavaScriptTokenSets.STRING_LITERALS.contains(elementType)
             && elementType != JSTokenTypes.NUMERIC_LITERAL;
     }
 
-    public void parseArrayLiteralExpression(final PsiBuilder builder) {
+    public void parseArrayLiteralExpression(PsiBuilder builder) {
         JsonJavaScriptParser.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
-        final PsiBuilder.Marker expr = builder.mark();
+        PsiBuilder.Marker expr = builder.mark();
         builder.advanceLexer();
         boolean commaExpected = false;
 
         while (builder.getTokenType() != JSTokenTypes.RBRACKET) {
             if (commaExpected) {
-                final boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
+                boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
                 if (!b) {
                     break;
                 }
@@ -181,7 +181,7 @@ public void parseArrayLiteralExpression(final PsiBuilder builder) {
     }
 
     private boolean parseValue(PsiBuilder builder) {
-        final IElementType firstToken = builder.getTokenType();
+        IElementType firstToken = builder.getTokenType();
         if (firstToken == JSTokenTypes.NUMERIC_LITERAL ||
             firstToken == JSTokenTypes.STRING_LITERAL ||
             firstToken == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL ||
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
index 8d513cde..4f6b8b9a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
@@ -408,7 +408,7 @@ public int getState() {
     }
 
     @Override
-    public void start(final CharSequence buffer, int startOffset, int endOffset, final int initialState) {
+    public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
         reset(buffer, startOffset, endOffset, initialState);
         myTokenType = null;
     }
@@ -445,7 +445,7 @@ private void locateToken() {
         catch (java.io.IOException e) { /*Can't happen*/ }
         catch (Error e) {
             // add lexer class name to the error
-            final Error error = new Error(getClass().getName() + ": " + e.getMessage());
+            Error error = new Error(getClass().getName() + ": " + e.getMessage());
             error.setStackTrace(e.getStackTrace());
             throw error;
         }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
index 7ac3c06d..d1361234 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
@@ -127,7 +127,7 @@ private static void addVariants(@Nonnull CompletionParameters parameters, @Nonnu
         }
 
         PsiElement position = parameters.getPosition();
-        final PsiElement jsProperty = position.getParent();
+        PsiElement jsProperty = position.getParent();
         if (!(jsProperty instanceof JSProperty)) {
             return;
         }
@@ -189,7 +189,7 @@ else if (currentProperty.getValue() instanceof NativeArray nativeArray) {
             }
         }
 
-        for (final Map.Entry<String, JsonPropertyDescriptor> entry : properties.entrySet()) {
+        for (Map.Entry<String, JsonPropertyDescriptor> entry : properties.entrySet()) {
             String key = entry.getKey();
             if (key == null || alreadyDefined.contains(key)) {
                 continue;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
index 6ee8c95f..fa4ccf2f 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
@@ -73,7 +73,7 @@ public EditorNotificationBuilder buildNotification(
             return null;
         }
 
-        final PsiFile psiFile = PsiManager.getInstance(myProject).findFile(file);
+        PsiFile psiFile = PsiManager.getInstance(myProject).findFile(file);
         if (psiFile == null) {
             return null;
         }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
index f2142121..27a9818a 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
@@ -38,7 +38,7 @@ public class DescriptionByAnotherPsiElementRegistrar implements ExtensionExtende
     public void extend(@Nonnull ComponentManager componentManager, @Nonnull Consumer<EditorNotificationProvider> consumer) {
         ExtensionPoint<DescriptionByAnotherPsiElementProvider> extensionPoint =
             componentManager.getExtensionPoint(DescriptionByAnotherPsiElementProvider.class);
-        for (final DescriptionByAnotherPsiElementProvider<?> provider : extensionPoint) {
+        for (DescriptionByAnotherPsiElementProvider<?> provider : extensionPoint) {
             consumer.accept(new DescriptionByAnotherPsiElementEditorNotification((Project)componentManager, provider));
         }
     }
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
index 8818b69f..b4cf1c2d 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
@@ -79,7 +79,7 @@ public Info(
             myElementPointer = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
         }
 
-        public Info(@Nonnull Project project, @Nonnull String url, @Nonnull final String providerId, @Nonnull String psiElementId) {
+        public Info(@Nonnull Project project, @Nonnull String url, @Nonnull String providerId, @Nonnull String psiElementId) {
             myProject = project;
             myVirtualFilePointer = VirtualFilePointerManager.getInstance().create(url, this, null);
 
@@ -238,7 +238,7 @@ public <T extends PsiElement> Pair<DescriptionByAnotherPsiElementProvider<T>, T>
     @Override
     public Element getState() {
         Element stateElement = new Element("state");
-        for (final Info registeredFile : myRegisteredFiles) {
+        for (Info registeredFile : myRegisteredFiles) {
             String psiElementId = registeredFile.getPsiElementId();
             if (psiElementId == null) {
                 continue;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
index c06a7d4e..039b7c0c 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
@@ -32,7 +32,7 @@ public class JsonObjectDescriptor {
     private Map<String, JsonPropertyDescriptor> myProperties = new HashMap<>();
 
     @Nonnull
-    public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final Class<?> value) {
+    public JsonPropertyDescriptor addProperty(@Nullable String propertyName, @Nonnull Class<?> value) {
         if (value == Object.class) {
             throw new IllegalArgumentException("We cant add object type, use JsonObjectDescriptor as parameter");
         }
@@ -41,17 +41,17 @@ public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @
     }
 
     @Nonnull
-    public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final JsonObjectDescriptor value) {
+    public JsonPropertyDescriptor addProperty(@Nullable String propertyName, @Nonnull JsonObjectDescriptor value) {
         return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
     }
 
     @Nonnull
-    public JsonPropertyDescriptor addProperty(@Nullable final String propertyName, @Nonnull final NativeArray value) {
+    public JsonPropertyDescriptor addProperty(@Nullable String propertyName, @Nonnull NativeArray value) {
         return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
     }
 
     @Nullable
-    public JsonPropertyDescriptor getProperty(@Nonnull final String propertyName) {
+    public JsonPropertyDescriptor getProperty(@Nonnull String propertyName) {
         JsonPropertyDescriptor propertyDescriptor = myProperties.get(propertyName);
         if (propertyDescriptor != null) {
             return propertyDescriptor;
diff --git a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
index 0aa0e2b8..30823044 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
@@ -55,13 +55,13 @@ public String getDefaultValue() {
     }
 
     @Override
-    public Result calculateResult(@Nonnull final Expression[] params, final ExpressionContext context) {
-        final PsiElement elementAtCaret = findElementAtCaret(context);
-        final JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(elementAtCaret);
+    public Result calculateResult(@Nonnull Expression[] params, ExpressionContext context) {
+        PsiElement elementAtCaret = findElementAtCaret(context);
+        JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(elementAtCaret);
 
         String text = resolver.getQualifierAsString();
         if (text == null) {
-            final JSFunction previousFunction = PsiTreeUtil.getPrevSiblingOfType(elementAtCaret, JSFunction.class);
+            JSFunction previousFunction = PsiTreeUtil.getPrevSiblingOfType(elementAtCaret, JSFunction.class);
 
             if (previousFunction != null) {
                 text = previousFunction.getName();
@@ -75,7 +75,7 @@ public Result calculateResult(@Nonnull final Expression[] params, final Expressi
         return null;
     }
 
-    public static PsiElement findElementAtCaret(final ExpressionContext context) {
+    public static PsiElement findElementAtCaret(ExpressionContext context) {
         Project project = context.getProject();
         int templateStartOffset = context.getTemplateStartOffset();
         int offset = templateStartOffset > 0 ? context.getTemplateStartOffset() - 1 : context.getTemplateStartOffset();
@@ -87,12 +87,12 @@ public static PsiElement findElementAtCaret(final ExpressionContext context) {
     }
 
     @Override
-    public Result calculateQuickResult(@Nonnull final Expression[] params, final ExpressionContext context) {
+    public Result calculateQuickResult(@Nonnull Expression[] params, ExpressionContext context) {
         return null;
     }
 
     @Override
-    public LookupElement[] calculateLookupItems(@Nonnull final Expression[] params, final ExpressionContext context) {
+    public LookupElement[] calculateLookupItems(@Nonnull Expression[] params, ExpressionContext context) {
         return null;
     }
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
index 02ad8535..19c845e8 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
@@ -50,7 +50,7 @@ public String getDefaultValue() {
 
     @Override
     public Result calculateResult(@Nonnull Expression[] params, ExpressionContext context) {
-        final PsiElement elementAtCaret = JSClassNameMacro.findElementAtCaret(context);
+        PsiElement elementAtCaret = JSClassNameMacro.findElementAtCaret(context);
         if (elementAtCaret != null) {
             JSFunction function = PsiTreeUtil.getParentOfType(elementAtCaret, JSFunction.class);
             if (function instanceof JSFunctionExpression functionExpression) {
@@ -58,7 +58,7 @@ public Result calculateResult(@Nonnull Expression[] params, ExpressionContext co
             }
 
             if (function != null) {
-                final String name = function.getName();
+                String name = function.getName();
                 if (name != null) {
                     return new TextResult(name);
                 }
diff --git a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
index 24bffda6..ee3290e9 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
@@ -50,15 +50,15 @@ public boolean couldShowInLookup() {
     }
 
     @Override
-    public Object[] getParametersForLookup(final LookupElement item, final ParameterInfoContext context) {
+    public Object[] getParametersForLookup(LookupElement item, ParameterInfoContext context) {
         if (!(item instanceof MutableLookupElement)) {
             return null;
         }
 
         PsiElement element = item.getPsiElement();
         if (element instanceof JSFunction) {
-            final JSFunction originalFunction = (JSFunction)element;
-            final List<JSFunction> lookupItems = new ArrayList<>();
+            JSFunction originalFunction = (JSFunction)element;
+            List<JSFunction> lookupItems = new ArrayList<>();
             Set<String> availableSignatures = new HashSet<>();
 
             for (PsiElement el : DefinitionsScopedSearch.search(originalFunction)) {
@@ -75,13 +75,13 @@ public Object[] getParametersForLookup(final LookupElement item, final Parameter
         return ArrayUtil.EMPTY_OBJECT_ARRAY;
     }
 
-    private static void doAddSignature(final List<JSFunction> lookupItems, final Set<String> availableSignatures, final PsiElement el) {
+    private static void doAddSignature(List<JSFunction> lookupItems, Set<String> availableSignatures, PsiElement el) {
         if (el instanceof JSFunction function) {
-            final JSParameterList parameterList = function.getParameterList();
+            JSParameterList parameterList = function.getParameterList();
 
             if (parameterList != null) {
-                final String typedSignature = buildSignature(parameterList.getParameters(), false, -1).text;
-                final String untypedSignature = buildSignature(parameterList.getParameters(), true, -1).text;
+                String typedSignature = buildSignature(parameterList.getParameters(), false, -1).text;
+                String untypedSignature = buildSignature(parameterList.getParameters(), true, -1).text;
 
                 if (!availableSignatures.contains(typedSignature) && !availableSignatures.contains(untypedSignature)) {
                     lookupItems.add(function);
@@ -93,7 +93,7 @@ private static void doAddSignature(final List<JSFunction> lookupItems, final Set
     }
 
     @Override
-    public JSArgumentList findElementForParameterInfo(final CreateParameterInfoContext context) {
+    public JSArgumentList findElementForParameterInfo(CreateParameterInfoContext context) {
         JSArgumentList argList = findArgumentList(context.getFile(), context.getOffset());
 
         if (argList != null) {
@@ -103,10 +103,10 @@ public JSArgumentList findElementForParameterInfo(final CreateParameterInfoConte
     }
 
     @Nullable
-    public static JSArgumentList findArgumentList(final PsiFile file, final int offset) {
+    public static JSArgumentList findArgumentList(PsiFile file, int offset) {
         JSArgumentList argList = ParameterInfoUtils.findParentOfType(file, offset, JSArgumentList.class);
         if (argList == null) {
-            final JSCallExpression callExpression = ParameterInfoUtils.findParentOfType(file, offset, JSCallExpression.class);
+            JSCallExpression callExpression = ParameterInfoUtils.findParentOfType(file, offset, JSCallExpression.class);
             if (callExpression != null) {
                 argList = callExpression.getArgumentList();
             }
@@ -116,19 +116,19 @@ public static JSArgumentList findArgumentList(final PsiFile file, final int offs
 
     @Nullable
     private static JSArgumentList fillSignaturesForArgumentList(
-        final CreateParameterInfoContext context,
-        final @Nonnull JSArgumentList argList
+        CreateParameterInfoContext context,
+        @Nonnull JSArgumentList argList
     ) {
-        final PsiElement psiElement = argList.getParent();
+        PsiElement psiElement = argList.getParent();
         if (!(psiElement instanceof JSCallExpression)) {
             return null;
         }
 
-        final JSCallExpression parent = (JSCallExpression)psiElement;
-        final JSExpression methodExpression = parent.getMethodExpression();
+        JSCallExpression parent = (JSCallExpression)psiElement;
+        JSExpression methodExpression = parent.getMethodExpression();
 
         if (methodExpression instanceof JSReferenceExpression referenceExpression) {
-            final ResolveResult[] resolveResults = referenceExpression.multiResolve(true);
+            ResolveResult[] resolveResults = referenceExpression.multiResolve(true);
 
             if (resolveResults.length > 0) {
                 List<JSFunction> items = new ArrayList<JSFunction>(resolveResults.length);
@@ -148,7 +148,7 @@ private static JSArgumentList fillSignaturesForArgumentList(
             }
         }
         else if (methodExpression instanceof JSSuperExpression) {
-            final PsiElement clazz = methodExpression.getReference().resolve();
+            PsiElement clazz = methodExpression.getReference().resolve();
             if (clazz instanceof JSFunction) {
                 context.setItemsToShow(new Object[]{clazz});
                 return argList;
@@ -158,36 +158,36 @@ else if (methodExpression instanceof JSSuperExpression) {
     }
 
     @Override
-    public void showParameterInfo(@Nonnull final JSArgumentList element, final CreateParameterInfoContext context) {
+    public void showParameterInfo(@Nonnull JSArgumentList element, CreateParameterInfoContext context) {
         context.showHint(element, element.getTextOffset(), this);
     }
 
     @Override
-    public JSArgumentList findElementForUpdatingParameterInfo(final UpdateParameterInfoContext context) {
+    public JSArgumentList findElementForUpdatingParameterInfo(UpdateParameterInfoContext context) {
         return findArgumentList(context.getFile(), context.getOffset());
     }
 
     @Override
-    public void updateParameterInfo(@Nonnull final JSArgumentList o, final UpdateParameterInfoContext context) {
+    public void updateParameterInfo(@Nonnull JSArgumentList o, UpdateParameterInfoContext context) {
         if (context.getParameterOwner() != o) {
             context.removeHint();
             return;
         }
-        final int currentParameterIndex = ParameterInfoUtils.getCurrentParameterIndex(o.getNode(), context.getOffset(), JSTokenTypes.COMMA);
+        int currentParameterIndex = ParameterInfoUtils.getCurrentParameterIndex(o.getNode(), context.getOffset(), JSTokenTypes.COMMA);
         context.setCurrentParameter(currentParameterIndex);
     }
 
     @Override
-    public void updateUI(final JSFunction p, final ParameterInfoUIContext context) {
-        final JSParameterList parameterList = p.getParameterList();
-        final JSParameter[] params = parameterList != null ? parameterList.getParameters() : new JSParameter[0];
-        final int currentParameterIndex = context.getCurrentParameterIndex() >= 0 ? context.getCurrentParameterIndex() : params.length;
-        final JSParameter parameter = currentParameterIndex < params.length ? params[currentParameterIndex] : null;
+    public void updateUI(JSFunction p, ParameterInfoUIContext context) {
+        JSParameterList parameterList = p.getParameterList();
+        JSParameter[] params = parameterList != null ? parameterList.getParameters() : new JSParameter[0];
+        int currentParameterIndex = context.getCurrentParameterIndex() >= 0 ? context.getCurrentParameterIndex() : params.length;
+        JSParameter parameter = currentParameterIndex < params.length ? params[currentParameterIndex] : null;
 
-        final SignatureInfo signatureInfo = buildSignature(params, false, currentParameterIndex);
-        final String name = signatureInfo.text;
+        SignatureInfo signatureInfo = buildSignature(params, false, currentParameterIndex);
+        String name = signatureInfo.text;
 
-        final String currentParameterSignature = parameter != null ? getSignatureForParameter(parameter, false) : null;
+        String currentParameterSignature = parameter != null ? getSignatureForParameter(parameter, false) : null;
         int highlightStart = parameter != null ? signatureInfo.selectedParameterStart : 0;
         int highlightEnd = parameter != null ? highlightStart + currentParameterSignature.length() : 0;
         context.setupUIComponentPresentation(name, highlightStart, highlightEnd, false, false, false, context.getDefaultParameterColor());
@@ -200,7 +200,7 @@ private static class SignatureInfo {
 
     private static
     @Nonnull
-    SignatureInfo buildSignature(final JSParameter[] params, final boolean skipType, int selectedParameterIndex) {
+    SignatureInfo buildSignature(JSParameter[] params, boolean skipType, int selectedParameterIndex) {
         SignatureInfo info = new SignatureInfo();
         if (params.length > 0) {
             StringBuilder result = new StringBuilder();
@@ -222,11 +222,11 @@ SignatureInfo buildSignature(final JSParameter[] params, final boolean skipType,
         return info;
     }
 
-    public static String getSignatureForParameter(final JSParameter p, boolean skipType) {
-        final String s = skipType ? null : p.getTypeString();
+    public static String getSignatureForParameter(JSParameter p, boolean skipType) {
+        String s = skipType ? null : p.getTypeString();
 
         if (s != null && s.length() > 0) {
-            final boolean ecmal4 = p.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
+            boolean ecmal4 = p.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4;
             String result;
 
             if (ecmal4) {
@@ -240,7 +240,7 @@ public static String getSignatureForParameter(final JSParameter p, boolean skipT
             else {
                 result = "[" + s + "] " + p.getName();
             }
-            final String initializerText = p.getInitializerText();
+            String initializerText = p.getInitializerText();
             if (initializerText != null) {
                 result += " = " + initializerText;
             }
@@ -251,7 +251,7 @@ public static String getSignatureForParameter(final JSParameter p, boolean skipT
 
     @Override
     @Nonnull
-    public JSExpression[] getActualParameters(@Nonnull final JSArgumentList jsArgumentList) {
+    public JSExpression[] getActualParameters(@Nonnull JSArgumentList jsArgumentList) {
         return jsArgumentList.getArguments();
     }
 
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
index 6f991038..551e93c9 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
@@ -27,7 +27,7 @@
  */
 abstract class JSAbstractElementManipulator<T extends PsiElement> extends AbstractElementManipulator<T> {
     @Override
-    public T handleContentChange(final T element, final TextRange range, String newContent) throws IncorrectOperationException {
+    public T handleContentChange(T element, TextRange range, String newContent) throws IncorrectOperationException {
         String oldText = element.getText();
         newContent = StringUtil.escapeStringCharacters(newContent);
         String newText = oldText.substring(0, range.getStartOffset()) + newContent + oldText.substring(range.getEndOffset());
@@ -35,5 +35,5 @@ public T handleContentChange(final T element, final TextRange range, String newC
         return (T)element.replace(createTree(newText, element.getProject()));
     }
 
-    protected abstract T createTree(final String newText, final Project project);
+    protected abstract T createTree(String newText, Project project);
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
index a3bbee6b..463eb7b7 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
@@ -31,9 +31,9 @@
 @ExtensionImpl
 public class JSAttributeNameValuePairManipulator extends JSAbstractElementManipulator<JSAttributeNameValuePair> {
     @Override
-    protected JSAttributeNameValuePair createTree(final String newText, final Project project) {
+    protected JSAttributeNameValuePair createTree(String newText, Project project) {
         @NonNls String ToCreate = "[A(" + newText + ")] class C {}";
-        final PsiElement element = JSChangeUtil.createStatementFromText(project, ToCreate).getPsi();
+        PsiElement element = JSChangeUtil.createStatementFromText(project, ToCreate).getPsi();
         return ((JSClass)element).getAttributeList().getAttributes()[0].getValues()[0];
     }
 
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
index 6288ea6c..21cb5543 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
@@ -26,9 +26,9 @@
 @ExtensionImpl
 public class JSDocTagManipulator extends JSAbstractElementManipulator<JSDocTag> {
     @Override
-    protected JSDocTag createTree(final String newText, final Project project) {
+    protected JSDocTag createTree(String newText, Project project) {
         String ToCreate = "/** " + newText + " */";
-        final PsiElement element = JSChangeUtil.createJSTreeFromText(project, ToCreate).getPsi();
+        PsiElement element = JSChangeUtil.createJSTreeFromText(project, ToCreate).getPsi();
         return ((JSDocComment)element).getTags()[0];
     }
 
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
index fa35041c..a66bc687 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
@@ -28,7 +28,7 @@
 @ExtensionImpl
 public class JSIncludeDirectiveManipulator extends JSAbstractElementManipulator<JSIncludeDirectiveImpl> {
     @Override
-    protected JSIncludeDirectiveImpl createTree(final String newText, final Project project) {
+    protected JSIncludeDirectiveImpl createTree(String newText, Project project) {
         return (JSIncludeDirectiveImpl)JSChangeUtil.createStatementFromText(project, newText).getPsi();
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
index ed2daf06..406641e6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -80,7 +80,7 @@ public AddImportECMAScriptClassOrFunctionAction(Editor editor, PsiPolyVariantRef
     @RequiredUIAccess
     public boolean showHint(@Nonnull Editor editor) {
         myEditor = editor;
-        final PsiElement element = myReference.getElement();
+        PsiElement element = myReference.getElement();
         TextRange textRange = InjectedLanguageManager.getInstance(element.getProject()).injectedToHost(element, element.getTextRange());
         HintManager.getInstance().showQuestionHint(editor, getText(), textRange.getStartOffset(), textRange.getEndOffset(), this);
         return true;
@@ -113,10 +113,10 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
         if (!myReference.getElement().isValid()) {
             return false;
         }
-        final long modL = myReference.getElement().getManager().getModificationTracker().getModificationCount();
+        long modL = myReference.getElement().getManager().getModificationTracker().getModificationCount();
 
         if (!isAvailableCalculated || modL != modificationCount) {
-            final ResolveResult[] results = myReference.multiResolve(false);
+            ResolveResult[] results = myReference.multiResolve(false);
             boolean hasValidResult = false;
 
             for (ResolveResult r : results) {
@@ -127,7 +127,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
             }
 
             if (!hasValidResult) {
-                final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
+                Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
 
                 isAvailableCalculated = true;
                 isAvailable = candidates.size() > 0;
@@ -156,7 +156,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
 
     @RequiredReadAction
     private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile file) {
-        final Collection<JSQualifiedNamedElement> candidates;
+        Collection<JSQualifiedNamedElement> candidates;
 
         if (myReference instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() == null) {
             Collection<JSQualifiedNamedElement> c = getCandidates(editor, file, myReference.getCanonicalText());
@@ -185,7 +185,7 @@ private Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile
 
     @RequiredReadAction
     public static Collection<JSQualifiedNamedElement> getCandidates(Editor editor, PsiFile file, String name) {
-        final Module element = ModuleUtilCore.findModuleForPsiElement(file);
+        Module element = ModuleUtilCore.findModuleForPsiElement(file);
         if (element != null) {
             return JSResolveUtil.findElementsByName(
                 name,
@@ -200,8 +200,8 @@ public static Collection<JSQualifiedNamedElement> getCandidates(Editor editor, P
 
     @Override
     @RequiredWriteAction
-    public void invoke(@Nonnull final Project project, final Editor editor, final PsiFile file) {
-        final Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
+    public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file) {
+        Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
 
         if (candidates.size() > 0) {
             if (candidates.size() > 1) {
@@ -210,15 +210,15 @@ public void invoke(@Nonnull final Project project, final Editor editor, final Ps
                     new PsiElementListCellRenderer<>() {
                         @Override
                         @RequiredReadAction
-                        public String getElementText(final JSQualifiedNamedElement element) {
+                        public String getElementText(JSQualifiedNamedElement element) {
                             return element.getName();
                         }
 
                         @Override
                         @RequiredReadAction
-                        protected String getContainerText(final JSQualifiedNamedElement element, final String name) {
-                            final String qName = element.getQualifiedName();
-                            final String elementName = element.getName();
+                        protected String getContainerText(JSQualifiedNamedElement element, String name) {
+                            String qName = element.getQualifiedName();
+                            String elementName = element.getName();
                             String s = qName.equals(elementName)
                                 ? ""
                                 : qName.substring(0, qName.length() - elementName.length() - 1);
@@ -257,9 +257,9 @@ public boolean execute(@Nonnull JSQualifiedNamedElement element) {
     }
 
     @RequiredWriteAction
-    private void doImport(Editor editor, final String qName) {
+    private void doImport(Editor editor, String qName) {
         Application.get().runWriteAction(() -> {
-            final PsiElement element = myReference.getElement();
+            PsiElement element = myReference.getElement();
             ImportUtils.doImport(element, qName);
         });
     }
@@ -272,7 +272,7 @@ public boolean startInWriteAction() {
     @Override
     @RequiredWriteAction
     public boolean execute() {
-        final PsiFile containingFile = myReference.getElement().getContainingFile();
+        PsiFile containingFile = myReference.getElement().getContainingFile();
         invoke(containingFile.getProject(), myEditor, containingFile);
 
         return true;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
index 1b8515b5..b372684c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
@@ -299,7 +299,7 @@ public static String createImportBlock(Project project, Collection<String> fqns)
         List<String> sorted = new ArrayList<>(fqns);
         Collections.sort(sorted, ImportUtils::compareImports);
 
-        final String semicolon = JSChangeUtil.getSemicolon(project);
+        String semicolon = JSChangeUtil.getSemicolon(project);
         StringBuilder s = new StringBuilder();
         for (String fqn : sorted) {
             s.append("import ").append(fqn).append(semicolon);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
index e46484b4..6bcbbf2d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
@@ -26,7 +26,7 @@
 class AbcDumper extends AbstractDumpProcessor {
     private boolean dumpCode;
 
-    public AbcDumper(final boolean _dumpCode) {
+    public AbcDumper(boolean _dumpCode) {
         dumpCode = _dumpCode;
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
index d31a677e..65eb68cf 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
@@ -47,7 +47,7 @@ public class JSCodeStylePanel extends CodeStyleAbstractPanel {
     private boolean myInsideUpdate = false;
 
     @RequiredUIAccess
-    public JSCodeStylePanel(final CodeStyleSettings settings) {
+    public JSCodeStylePanel(CodeStyleSettings settings) {
         super(settings);
 
         installPreviewPanel(myPreviewPanel);
@@ -60,7 +60,7 @@ public JSCodeStylePanel(final CodeStyleSettings settings) {
             }
         });
 
-        final DocumentAdapter adapter = new DocumentAdapter() {
+        DocumentAdapter adapter = new DocumentAdapter() {
             @Override
             protected void textChanged(DocumentEvent e) {
                 if (!myInsideUpdate) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
index 29a14380..6073d735 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
@@ -124,7 +124,7 @@ private boolean shouldFormatXmlLiteralExpression() {
     }
 
     @Override
-    public void visitAttributeList(final ASTNode node) {
+    public void visitAttributeList(ASTNode node) {
         if (type1 == JSElementTypes.ATTRIBUTE || type2 == JSElementTypes.ATTRIBUTE) {
             myResult = Spacing.createSpacing(
                 0,
@@ -146,7 +146,7 @@ public void visitAttributeList(final ASTNode node) {
     }
 
     @Override
-    public void visitEmbeddedContent(final ASTNode node) {
+    public void visitEmbeddedContent(ASTNode node) {
         if (type2 == JSTokenTypes.END_OF_LINE_COMMENT) {
             myResult = Spacing.createSpacing(
                 0,
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
index fc6a811f..9f4dfb47 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
@@ -38,7 +38,7 @@
 abstract class BaseJSGenerateAction extends AnAction {
     @Override
     @RequiredUIAccess
-    public void actionPerformed(final AnActionEvent e) {
+    public void actionPerformed(AnActionEvent e) {
         Editor editor = e.getData(PlatformDataKeys.EDITOR);
         PsiFile psifile = e.getData(LangDataKeys.PSI_FILE);
         Project project = e.getData(PlatformDataKeys.PROJECT);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
index 7105a2eb..6d4cf14e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
@@ -92,7 +92,7 @@ public void run() {
                     @Override
                     public void run() {
                         try {
-                            final BaseCreateMethodsFix createMethodsFix = createFix(jsClass);
+                            BaseCreateMethodsFix createMethodsFix = createFix(jsClass);
                             createMethodsFix.addElementsToProcessFrom(selectedElements);
                             createMethodsFix.invoke(project, editor, file);
                         }
@@ -149,7 +149,7 @@ else if (JSResolveUtil.isArtificialClassUsedForReferenceList(clazz)) {
 
     protected abstract BaseCreateMethodsFix createFix(JSClass clazz);
 
-    protected abstract void collectCandidates(JSClass clazz, final Collection<JSNamedElementNode> candidates);
+    protected abstract void collectCandidates(JSClass clazz, Collection<JSNamedElementNode> candidates);
 
     @Override
     public boolean startInWriteAction() {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
index 046db4ac..1088f29e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
@@ -124,7 +124,7 @@ public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws
                     StringBuilder functionText = new StringBuilder("public function ").append(jsClass.getName()).append("(");
                     StringBuilder initialization = new StringBuilder();
                     boolean first = true;
-                    final String semicolon = JSChangeUtil.getSemicolon(project);
+                    String semicolon = JSChangeUtil.getSemicolon(project);
 
                     Set<JSVariable> toProcess = getElementsToProcess();
                     Iterator<JSVariable> variableIterator = toProcess.iterator();
@@ -138,10 +138,10 @@ public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws
 
                         first = false;
 
-                        final String name = var.getName();
+                        String name = var.getName();
                         String parameterName = transformVarNameToAccessorName(name, codeStyleSettings);
 
-                        final String typeString = var.getTypeString();
+                        String typeString = var.getTypeString();
                         functionText.append(parameterName).append(typeString != null ? ":" + typeString : "");
 
                         if (JSResolveUtil.findParent(var) == jsClass) {
@@ -199,7 +199,7 @@ else if (mode == GenerationMode.TOSTRING) {
                 public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
                     evalAnchor(editor, file);
 
-                    final boolean[] needOverride = new boolean[1];
+                    boolean[] needOverride = new boolean[1];
                     JSResolveUtil.processOverrides(
                         jsClass,
                         (processor, scope, className) -> {
@@ -244,7 +244,7 @@ public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws
 
     @Override
     @RequiredReadAction
-    protected void collectCandidates(JSClass clazz, final Collection<JSNamedElementNode> candidates) {
+    protected void collectCandidates(JSClass clazz, Collection<JSNamedElementNode> candidates) {
         final LinkedHashMap<String, JSNamedElement> candidatesMap = new LinkedHashMap<>();
         final JSCodeStyleSettings codeStyleSettings =
             CodeStyleSettingsManager.getSettings(clazz.getProject()).getCustomSettings(JSCodeStyleSettings.class);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
index d48c9083..b2a900e2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
@@ -52,7 +52,7 @@ protected BaseCreateMethodsFix createFix(JSClass clazz) {
 
     @Override
     @RequiredReadAction
-    protected void collectCandidates(JSClass clazz, final Collection<JSNamedElementNode> candidates) {
+    protected void collectCandidates(JSClass clazz, Collection<JSNamedElementNode> candidates) {
         Map<String, Object> _functionsToOverride = null;
         Function<JSFunction, Boolean> functionFilter = function -> {
             JSAttributeList attributeList = function.getAttributeList();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
index 9b5b39c8..dc07ca21 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
@@ -144,13 +144,13 @@ protected Query<JSFunction> search(JSFunction elt) {
 
     @Override
     @RequiredReadAction
-    public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element) {
+    public LineMarkerInfo getLineMarkerInfo(@Nonnull PsiElement element) {
         if (element instanceof JSFunction function) {
             function.putUserData(ourParticipatesInHierarchyKey, null);
             if (function.getNameIdentifier() == null) {
                 return null;
             }
-            final String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
+            String qName = JSResolveUtil.getQNameToStartHierarchySearch(function);
 
             if (qName != null) {
                 PsiElement parentNode = element.getParent();
@@ -165,12 +165,12 @@ public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element) {
                     parentNode = functionExpr.getContainingFile();
                 }
 
-                final MyOverrideHandler overrideHandler = new MyOverrideHandler();
-                final String typeName = parentNode instanceof JSClass jsClass ? jsClass.getQualifiedName() : qName;
+                MyOverrideHandler overrideHandler = new MyOverrideHandler();
+                String typeName = parentNode instanceof JSClass jsClass ? jsClass.getQualifiedName() : qName;
                 JSResolveUtil.iterateType(function, parentNode, typeName, overrideHandler);
 
                 if (overrideHandler.className != null) {
-                    final PsiElement parentNode1 = parentNode;
+                    PsiElement parentNode1 = parentNode;
                     function.putUserData(ourParticipatesInHierarchyKey, Boolean.TRUE);
 
                     return new LineMarkerInfo<>(
@@ -180,7 +180,7 @@ public LineMarkerInfo getLineMarkerInfo(@Nonnull final PsiElement element) {
                         Pass.UPDATE_ALL,
                         psiElement -> OVERRIDES_METHOD_IN + overrideHandler.className,
                         (e, elt) -> {
-                            final Set<NavigationItem> results = new HashSet<>();
+                            Set<NavigationItem> results = new HashSet<>();
                             JSResolveUtil.iterateType(
                                 function,
                                 parentNode1,
@@ -213,11 +213,11 @@ else if (results.size() > 1) {
 
     @Override
     @RequiredReadAction
-    public void collectSlowLineMarkers(@Nonnull final List<PsiElement> elements, @Nonnull final Collection<LineMarkerInfo> result) {
-        final Map<String, Set<JSFunction>> jsFunctionsToProcess = new HashMap<>();
-        final Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new HashMap<>();
+    public void collectSlowLineMarkers(@Nonnull List<PsiElement> elements, @Nonnull final Collection<LineMarkerInfo> result) {
+        Map<String, Set<JSFunction>> jsFunctionsToProcess = new HashMap<>();
+        Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new HashMap<>();
 
-        for (final PsiElement el : elements) {
+        for (PsiElement el : elements) {
             ProgressManager.getInstance().checkCanceled();
 
             if (el instanceof JSFunction function) {
@@ -286,7 +286,7 @@ public boolean process(JSClass jsClass) {
                     }
 
                     if (methodsClone != null) {
-                        for (final Iterator<JSFunction> functionIterator = methodsClone.iterator(); functionIterator.hasNext(); ) {
+                        for (Iterator<JSFunction> functionIterator = methodsClone.iterator(); functionIterator.hasNext(); ) {
                             JSFunction function = functionIterator.next();
 
                             JSFunction byName = jsClass.findFunctionByNameAndKind(function.getName(), function.getKind());
@@ -429,7 +429,7 @@ private abstract static class BasicGutterIconNavigationHandler<T extends PsiElem
         @Override
         @RequiredUIAccess
         public void navigate(MouseEvent e, T elt) {
-            final List<NavigatablePsiElement> navElements = new ArrayList<>();
+            List<NavigatablePsiElement> navElements = new ArrayList<>();
             Query<T> elementQuery = search(elt);
             if (elementQuery == null) {
                 return;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
index aee13a49..bf35c2ef 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
@@ -36,7 +36,7 @@
 public class JSExtractFunctionHandler implements RefactoringActionHandler {
     @Override
     @RequiredUIAccess
-    public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file, DataContext dataContext) {
+    public void invoke(@Nonnull Project project, Editor editor, PsiFile file, DataContext dataContext) {
         if (!editor.getSelectionModel().hasSelection()) {
             editor.getSelectionModel().selectLineAtCaret();
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
index dacf8c47..f5a2dceb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
@@ -56,7 +56,7 @@ protected JSIntroduceConstantDialog createDialog(Project project, JSExpression e
     @Override
     protected String getDeclText(JSIntroduceConstantSettings settings) {
         String baseDeclText = "static const " + settings.getVariableName();
-        final JSAttributeList.AccessType type = settings.getAccessType();
+        JSAttributeList.AccessType type = settings.getAccessType();
         if (type != JSAttributeList.AccessType.PACKAGE_LOCAL) {
             baseDeclText = type.toString().toLowerCase() + " " + baseDeclText;
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
index d045fb06..e6d1aec1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
@@ -68,7 +68,7 @@ protected JSElement addStatementBefore(JSElement anchorStatement, JSVarStatement
     }
 
     @Override
-    protected String getDeclText(final JSIntroduceFieldSettings settings) {
+    protected String getDeclText(JSIntroduceFieldSettings settings) {
         String baseDeclText = super.getDeclText(settings);
         JSAttributeList.AccessType type = settings.getAccessType();
         if (type != JSAttributeList.AccessType.PACKAGE_LOCAL) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
index adcc72f2..81cf7f89 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
@@ -85,7 +85,7 @@ public boolean execute(SearchParameters queryParameters, final @Nonnull Predicat
         return makeQuery(queryParameters, clazz).forEach(new Predicate<>() {
             @Override
             @RequiredReadAction
-            public boolean test(final JSClass jsClass) {
+            public boolean test(JSClass jsClass) {
                 JSFunction function = jsClass.findFunctionByNameAndKind(baseFunction.getName(), baseFunction.getKind());
                 return function == null || consumer.test(function);
             }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
index 17f448b6..e95f58d8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
@@ -94,7 +94,7 @@ public static String getName(@Nonnull PsiElement psiElement) {
                         name += ", ";
                     }
                     name += p.getName();
-                    final String variableType = p.getTypeString();
+                    String variableType = p.getTypeString();
                     if (variableType != null) {
                         name += ":" + variableType;
                     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
index 6433b7f0..475312e3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
@@ -122,8 +122,8 @@ public StructureViewTreeElement[] getChildren() {
 
                 TextRange t1 = InjectedLanguageManager.getInstance(e.getProject()).injectedToHost(e, e.getTextRange());
                 TextRange t2 = InjectedLanguageManager.getInstance(e.getProject()).injectedToHost(e, e.getTextRange());
-                final int offset = e.getTextOffset() + t1.getStartOffset();
-                final int offset2 = e2.getTextOffset() + t2.getStartOffset();
+                int offset = e.getTextOffset() + t1.getStartOffset();
+                int offset2 = e2.getTextOffset() + t2.getStartOffset();
 
                 return offset - offset2;
             }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
index e81fd20e..e0b3a7b9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
@@ -231,12 +231,12 @@ public Object getCurrentEditorElement() {
 
         PsiFile file = getPsiFile();
         if (editorElement == null && !(file instanceof JSFile)) {
-            final int offset = getEditor().getCaretModel().getOffset();
+            int offset = getEditor().getCaretModel().getOffset();
             PsiElement at = file.findElementAt(offset);
             PsiLanguageInjectionHost injectionHost = PsiTreeUtil.getParentOfType(at, PsiLanguageInjectionHost.class);
 
             if (injectionHost != null) {
-                final SimpleReference<PsiElement> ref = new SimpleReference<>();
+                SimpleReference<PsiElement> ref = new SimpleReference<>();
                 InjectedLanguageManager.getInstance(file.getProject()).enumerate(
                     injectionHost,
                     (injectedPsi, places) -> {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
index 7553bc8e..4a9ee296 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
@@ -45,7 +45,7 @@ public class JSExpressionSurroundDescriptor implements SurroundDescriptor {
     @Nonnull
     @RequiredReadAction
     public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
-        final JSExpression expr = findExpressionInRange(file, startOffset, endOffset);
+        JSExpression expr = findExpressionInRange(file, startOffset, endOffset);
         if (expr == null) {
             return PsiElement.EMPTY_ARRAY;
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
index d14f1cd3..92ec0112 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
@@ -51,8 +51,8 @@ public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor edit
         ASTNode insertBeforeNode = getInsertBeforeNode(node);
 
         for (PsiElement element : elements) {
-            final ASTNode childNode = element.getNode();
-            final ASTNode childNodeCopy = childNode.copyElement();
+            ASTNode childNode = element.getNode();
+            ASTNode childNodeCopy = childNode.copyElement();
 
             container.getNode().removeChild(childNode);
             insertBeforeNode.getTreeParent().addChild(childNodeCopy, insertBeforeNode);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
index aa71ff34..145b8c48 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
@@ -63,7 +63,7 @@ public class JSStatementsSurroundDescriptor implements SurroundDescriptor {
     @Nonnull
     @RequiredReadAction
     public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
-        final PsiElement[] statements = findStatementsInRange(file, startOffset, endOffset);
+        PsiElement[] statements = findStatementsInRange(file, startOffset, endOffset);
         if (statements == null) {
             return PsiElement.EMPTY_ARRAY;
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
index a7df3aa7..01e7f987 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -64,12 +64,12 @@ protected ASTNode getInsertBeforeNode(ASTNode statementNode) {
     @RequiredReadAction
     protected TextRange getSurroundSelectionRange(ASTNode statementNode) {
         JSTryStatement stmt = (JSTryStatement)statementNode.getPsi();
-        final JSCatchBlock catchBlock = stmt.getCatchBlock();
+        JSCatchBlock catchBlock = stmt.getCatchBlock();
         if (catchBlock != null) {
             int offset = catchBlock.getStatement().getFirstChild().getNode().getStartOffset() + 1;
             return new TextRange(offset, offset);
         }
-        final JSStatement finallyStmt = stmt.getFinallyStatement();
+        JSStatement finallyStmt = stmt.getFinallyStatement();
         if (finallyStmt != null) {
             int offset = finallyStmt.getFirstChild().getNode().getStartOffset() + 1;
             return new TextRange(offset, offset);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
index b4547379..129eff78 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
@@ -45,7 +45,7 @@ public abstract class BaseCreateMethodsFix<T extends JSNamedElement & JSAttribut
     protected final JSClass myJsClass;
     protected PsiElement anchor;
 
-    public BaseCreateMethodsFix(final JSClass jsClass) {
+    public BaseCreateMethodsFix(JSClass jsClass) {
         myJsClass = jsClass;
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index 5ee877d3..6a84a4fd 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -243,7 +243,7 @@ protected void addNonimplementedFunction(JSFunction function) {
             @Override
             @RequiredReadAction
             protected void addImplementedFunction(JSFunction interfaceFunction, JSFunction implementationFunction) {
-                final JSAttributeList attributeList = implementationFunction.getAttributeList();
+                JSAttributeList attributeList = implementationFunction.getAttributeList();
                 if (attributeList == null || attributeList.getAccessType() != JSAttributeList.AccessType.PUBLIC) {
                     ASTNode node = findElementForAccessModifierError(implementationFunction, attributeList);
                     holder.newAnnotation(
@@ -860,8 +860,8 @@ public void visitJSSuperExpression(@Nonnull JSSuperExpression node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSFunctionDeclaration(final JSFunction node) {
-        final PsiElement nameIdentifier = node.getNameIdentifier();
+    public void visitJSFunctionDeclaration(JSFunction node) {
+        PsiElement nameIdentifier = node.getNameIdentifier();
         if (nameIdentifier == null) {
             return;
         }
@@ -887,15 +887,15 @@ public void visitJSFunctionDeclaration(final JSFunction node) {
         }
 
         if (parent instanceof JSClass clazz && !node.isConstructor()) {
-            final JSAttributeList attributeList = node.getAttributeList();
+            JSAttributeList attributeList = node.getAttributeList();
 
             if (attributeList == null || (!attributeList.hasModifier(JSAttributeList.ModifierType.STATIC)
                 && (attributeList.getAccessType() != JSAttributeList.AccessType.PRIVATE
                 || attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE)))) {
-                final String qName = clazz.getQualifiedName();
-                final boolean hasOverride = attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE);
+                String qName = clazz.getQualifiedName();
+                boolean hasOverride = attributeList != null && attributeList.hasModifier(JSAttributeList.ModifierType.OVERRIDE);
 
-                final SimpleReference<JSFunction> set = new SimpleReference<>();
+                SimpleReference<JSFunction> set = new SimpleReference<>();
                 boolean b = JSResolveUtil.iterateType(
                     node,
                     parent,
diff --git a/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
index 3b40f86a..98f6e6e6 100644
--- a/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
+++ b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
@@ -62,13 +62,13 @@ else if (element instanceof JSFunction && ((JSFunction)element).isSetProperty())
             }
         }
         else if (element instanceof JSClass) {
-            final JSAttributeList attributeList = ((JSClass)element).getAttributeList();
+            JSAttributeList attributeList = ((JSClass)element).getAttributeList();
 
             iconDescriptor.setMainIcon(((JSClass)element).isInterface() ? AllIcons.Nodes.Interface : AllIcons.Nodes.Class);
             addStaticAndFinalIcons(iconDescriptor, attributeList);
 
             if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
-                final JSAttributeList.AccessType accessType =
+                JSAttributeList.AccessType accessType =
                     attributeList != null ? attributeList.getAccessType() : JSAttributeList.AccessType.PACKAGE_LOCAL;
                 iconDescriptor.setRightIcon(getAccessIcon(accessType));
             }
@@ -82,10 +82,10 @@ else if (element instanceof JSParameter) {
         else if (element instanceof JSVariable) {
             iconDescriptor.setMainIcon(AllIcons.Nodes.Variable);
 
-            final PsiElement grandParent = JSResolveUtil.findParent(element);
+            PsiElement grandParent = JSResolveUtil.findParent(element);
 
             if (grandParent instanceof JSClass) {
-                final JSAttributeList attributeList = ((JSVariable)element).getAttributeList();
+                JSAttributeList attributeList = ((JSVariable)element).getAttributeList();
                 if (attributeList != null) {
                     addStaticAndFinalIcons(iconDescriptor, attributeList);
 
@@ -112,14 +112,14 @@ else if (element instanceof JSNamespaceDeclaration) {
         else if (element instanceof JSFunction) {
             iconDescriptor.setMainIcon(AllIcons.Nodes.Function);
 
-            final PsiElement parent = JSResolveUtil.findParent(element);
+            PsiElement parent = JSResolveUtil.findParent(element);
             if (parent instanceof JSBlockStatement) {
                 if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
                     iconDescriptor.setRightIcon(AllIcons.Nodes.C_private);
                 }
             }
             else if (parent instanceof JSClass) {
-                final JSAttributeList attributeList = ((JSFunction)element).getAttributeList();
+                JSAttributeList attributeList = ((JSFunction)element).getAttributeList();
                 if (attributeList != null) {
                     addStaticAndFinalIcons(iconDescriptor, attributeList);
                     if (BitUtil.isSet(flags, Iconable.ICON_FLAG_VISIBILITY)) {
diff --git a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
index b7dcfa0d..176d4aa1 100644
--- a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
+++ b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
@@ -33,7 +33,7 @@ public UpdateJavaScriptFileCopyright(@Nonnull PsiFile psiFile, @Nonnull Copyrigh
     protected void scanFile() {
         PsiElement first = getFile().getFirstChild();
         if (first != null) {
-            final PsiElement child = first.getFirstChild();
+            PsiElement child = first.getFirstChild();
             if (child instanceof PsiComment) {
                 first = child;
             }
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
index 9747e4cc..cbf8fc69 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
@@ -51,12 +51,12 @@ protected FileType getFileTypeForModuleResolve() {
     private static Module findModule(DataContext dataContext) {
         Project project = dataContext.getData(Project.KEY);
         assert project != null;
-        final IdeView view = dataContext.getData(IdeView.KEY);
+        IdeView view = dataContext.getData(IdeView.KEY);
         if (view == null) {
             return null;
         }
 
-        final PsiDirectory directory = view.getOrChooseDirectory();
+        PsiDirectory directory = view.getOrChooseDirectory();
         if (directory == null) {
             return null;
         }
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
index 8969acfa..85aae054 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
@@ -57,7 +57,7 @@ public IFileElementType getFileNodeType() {
     @Nonnull
     @Override
     public PsiElement createElement(ASTNode node) {
-        final IElementType type = node.getElementType();
+        IElementType type = node.getElementType();
 
         if (type == JSElementTypes.EMBEDDED_CONTENT) {
             return new JSEmbeddedContentImpl(node);
@@ -81,7 +81,7 @@ public PsiFile createFile(FileViewProvider fileViewProvider) {
     @Override
     public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
         PsiElement leftPsi = left.getPsi();
-        final Lexer lexer = createLexer(leftPsi.getLanguageVersion());
+        Lexer lexer = createLexer(leftPsi.getLanguageVersion());
         return LanguageUtil.canStickTokensTogetherByLexer(left, right, lexer);
     }
 }

From 1fc0f7cc08ce4306695eee4b489eca2e8c77e593 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 25 Dec 2025 17:36:11 +0200
Subject: [PATCH 303/340] fix #115

---
 .../runConfigurations/consulo_run_desktop_awt.xml     |  2 +-
 .../lang/javascript/types/JSFileElementType.java      |  8 ++++----
 .../consulo/javascript/lang/parsing/JSXParser.java    | 11 ++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.consulo/runConfigurations/consulo_run_desktop_awt.xml b/.consulo/runConfigurations/consulo_run_desktop_awt.xml
index 9e5dd1e0..45d7fbfd 100644
--- a/.consulo/runConfigurations/consulo_run_desktop_awt.xml
+++ b/.consulo/runConfigurations/consulo_run_desktop_awt.xml
@@ -14,7 +14,7 @@
           <option name="passParentEnv" value="true" />
           <option name="runMavenInBackground" value="true" />
           <option name="skipTests" value="false" />
-          <option name="vmOptions" value="--add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED" />
+          <option name="vmOptions" value="--add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED -ea" />
         </MavenRunnerSettings>
       </option>
       <option name="myRunnerParameters">
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index 9699527b..ab2a97e2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -17,6 +17,7 @@
 package com.intellij.lang.javascript.types;
 
 import com.intellij.lang.javascript.psi.JSFile;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.index.io.StringRef;
 import consulo.language.psi.stub.*;
 import consulo.javascript.index.JavaScriptIndexer;
@@ -39,9 +40,7 @@ public JSFileElementType(Language language) {
 
     @Override
     public void indexStub(@Nonnull JSFileStub stub, @Nonnull IndexSink sink) {
-        for (JavaScriptIndexer javaScriptIndexer : JavaScriptIndexer.EP_NAME.getExtensionList()) {
-            javaScriptIndexer.indexFile(stub, sink);
-        }
+        JavaScriptIndexer.EP_NAME.forEachExtensionSafe(it -> it.indexFile(stub, sink));
     }
 
     @Override
@@ -49,6 +48,7 @@ public StubBuilder getBuilder() {
         return new DefaultStubBuilder() {
             @Nonnull
             @Override
+            @RequiredReadAction
             protected StubElement createStubForFile(@Nonnull PsiFile file) {
                 return file instanceof JSFile jsFile
                     ? new JSFileStubImpl(jsFile, file.getName())
@@ -77,7 +77,7 @@ public String getExternalId() {
 
     @Override
     public int getStubVersion() {
-        int[] version = new int[]{47};
+        int[] version = new int[]{48};
         JavaScriptIndexer.EP_NAME.forEachExtensionSafe(javaScriptIndexer -> version[0]++);
         return version[0];
     }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index fb578ffa..dccdf96c 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -23,6 +23,8 @@
  * @since 2019-12-17
  */
 public class JSXParser {
+    public static final String FRAGMENT_TAG = "<<<FRAGMENT TAG>>>";
+
     private final Stack<String> myTagNamesStack = new Stack<>();
     private static final int BALANCING_DEPTH_THRESHOLD = 1000;
 
@@ -54,6 +56,12 @@ private boolean eof() {
 
     @Nullable
     private String parseTagHeader(boolean multipleRootTagError, PsiBuilder.Marker tag) {
+        if (token() == JSTokenTypes.XML_START_TAG_LIST) {
+            myTagNamesStack.push(FRAGMENT_TAG);
+            advance();
+            return FRAGMENT_TAG;
+        }
+
         if (multipleRootTagError) {
             PsiBuilder.Marker error = mark();
             advance();
@@ -70,7 +78,6 @@ private String parseTagHeader(boolean multipleRootTagError, PsiBuilder.Marker ta
         }
         else {
             tagName = myBuilder.getTokenText();
-            assert tagName != null;
             advance();
         }
         myTagNamesStack.push(tagName);
@@ -116,7 +123,6 @@ else if (tt == JSTokenTypes.XML_JS_SCRIPT) {
     }
 
     private void parseAttribute() {
-        assert token() == XmlTokenType.XML_NAME;
         PsiBuilder.Marker att = mark();
         advance();
         if (token() == XmlTokenType.XML_EQ) {
@@ -211,7 +217,6 @@ private PsiBuilder.Marker startText(@Nullable PsiBuilder.Marker xmlText) {
     }
 
     protected void parseTag(boolean multipleRootTagError) {
-        assert token() == JSTokenTypes.XML_START_TAG_START : "Tag start expected";
         PsiBuilder.Marker tag = mark();
 
         String tagName = parseTagHeader(multipleRootTagError, tag);

From 628dced486916f778f9f754970e938a2d9c6ecc0 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 26 Dec 2025 14:29:44 +0200
Subject: [PATCH 304/340] remove duplicates while resolving

---
 .../psi/resolve/ResolveProcessor.java         | 53 +++++++++----------
 .../psi/resolve/VariantsProcessor.java        |  2 +-
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 767b0989..1c1016fc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -38,14 +38,10 @@
 import consulo.util.dataholder.UserDataHolderBase;
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTag;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author Maxim.Mossienko
@@ -60,7 +56,7 @@ public class ResolveProcessor extends UserDataHolderBase implements PsiScopeProc
     protected final String myName;
     private PsiElement myResult;
     private PsiElement myCandidateResult;
-    private List<PsiElement> myResults;
+    private Set<PsiElement> myResults;
     private List<JavaScriptImportStatementBase> myImportsUsed;
     private List<Boolean> myResolveStatus;
 
@@ -110,7 +106,7 @@ public ResolveProcessor(String name, boolean toStopOnAssignment) {
     public ResolveProcessor(String name, PsiElement _place) {
         myName = name;
         place = _place;
-        boolean b = place instanceof JSReferenceExpression && ((JSReferenceExpression)place).getQualifier() == null;
+        boolean b = place instanceof JSReferenceExpression && ((JSReferenceExpression) place).getQualifier() == null;
         allowUnqualifiedStaticsFromInstance = b;
 
         if (myName != null && place instanceof JSReferenceExpression placeRefExpr) {
@@ -178,9 +174,9 @@ public JavaScriptImportStatementBase getImportUsed() {
         return myImportsUsed != null ? myImportsUsed.get(0) : null;
     }
 
-    public List<PsiElement> getResults() {
+    public Collection<PsiElement> getResults() {
         if (myResults == null && myResult == null && myCandidateResult != null) {
-            myResults = new ArrayList<>(1);
+            myResults = new LinkedHashSet<>(1);
             myResults.add(myCandidateResult);
         }
         return myResults;
@@ -190,7 +186,7 @@ public List<PsiElement> getResults() {
     @RequiredReadAction
     public boolean execute(@Nonnull PsiElement element, ResolveState state) {
         if ((element instanceof JSVariable && !(element instanceof JSParameter)) || element instanceof JSFunction) {
-            JSAttributeList attributeList = ((JSAttributeListOwner)element).getAttributeList();
+            JSAttributeList attributeList = ((JSAttributeListOwner) element).getAttributeList();
 
             // TODO: we should accept such values during resolve but make them invalid
             if (!acceptPrivateMembers
@@ -345,7 +341,7 @@ else if (element instanceof JSFunction function && function.isConstructor() && !
                     }
                 }
                 if (myResults == null) {
-                    myResults = new ArrayList<>(1);
+                    myResults = new LinkedHashSet<>();
                 }
                 myResults.add(element);
                 myResult = element;
@@ -366,7 +362,7 @@ private JavaScriptImportStatementBase checkQualifiedNameHasNecessaryImport(
 
             if (placeTopParent instanceof JSReferenceExpression placeTopParentRefExpr
                 && !(placeTopParent.getParent() instanceof JavaScriptImportStatementBase)) {
-                final String qName = ((JSQualifiedNamedElement)element).getQualifiedName();
+                final String qName = ((JSQualifiedNamedElement) element).getQualifiedName();
 
                 if (qName != null && qName.indexOf('.') != -1) {
                     ResolveProcessor processor = new ResolveProcessor(myName) {
@@ -403,7 +399,7 @@ public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                         else {
                             ResolveResult[] resultsAsResolveResults = processor.getResultsAsResolveResults();
                             if (resultsAsResolveResults.length != 0) {
-                                s = ((JSResolveUtil.MyResolveResult)resultsAsResolveResults[0]).getImportUsed();
+                                s = ((JSResolveUtil.MyResolveResult) resultsAsResolveResults[0]).getImportUsed();
                             }
                         }
                     }
@@ -422,8 +418,8 @@ private static PsiElement getElement(PsiElement element) {
 
     @Nullable
     @RequiredReadAction
-    public static String getName(PsiNamedElement element) {
-        return element instanceof JSNamedElement ? element.getName() : null;
+    public static String getName(PsiElement element) {
+        return element instanceof JSNamedElement namedElement ? namedElement.getName() : null;
     }
 
     @Override
@@ -446,11 +442,12 @@ public void configureClassScope(JSClass jsClass) {
     }
 
     @Override
+    @RequiredReadAction
     public void handleEvent(Event event, Object associated) {
         if (event == Event.SET_DECLARATION_HOLDER) {
             if (associated instanceof JSClass) {
                 myClassDeclarationStarted = true;
-                JSClass jsClass = (JSClass)associated;
+                JSClass jsClass = (JSClass) associated;
                 final String qName = jsClass.getQualifiedName();
 
                 if (!encounteredDynamicClassesSet) {
@@ -491,7 +488,7 @@ public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                                                 return true;
                                             }
                                             String classQName = jsClass.getQualifiedName();
-                                            return qName == classQName || (qName != null && !qName.equals(classQName));
+                                            return Objects.equals(qName, classQName);
                                         }
                                     },
                                     ResolveState.initial(),
@@ -564,20 +561,23 @@ public boolean isTypeContext() {
     }
 
     public ResolveResult[] getResultsAsResolveResults() {
-        List<PsiElement> processorResults = getResults();
+        Collection<PsiElement> processorResults = getResults();
         if (processorResults == null) {
             return ResolveResult.EMPTY_ARRAY;
         }
         ResolveResult[] results = new ResolveResult[processorResults.size()];
 
-        for (int i = 0; i < results.length; ++i) {
-            PsiElement element = processorResults.get(i);
-            results[i] = new JSResolveUtil.MyResolveResult(
+        int i = 0;
+        for (PsiElement element : processorResults) {
+            int pos = i++;
+
+            results[pos] = new JSResolveUtil.MyResolveResult(
                 element,
-                myImportsUsed != null ? myImportsUsed.get(i) : null,
-                myResolveStatus != null ? myResolveStatus.get(i) : true
+                myImportsUsed != null ? myImportsUsed.get(pos) : null,
+                myResolveStatus != null ? myResolveStatus.get(pos) : true
             );
         }
+
         return results;
     }
 
@@ -591,7 +591,7 @@ public Object[] getResultsAsObjects() {
 
     @RequiredReadAction
     public Object[] getResultsAsObjects(String qualifiedNameToSkip) {
-        List<PsiElement> processorResults = getResults();
+        Collection<PsiElement> processorResults = getResults();
         if (processorResults == null) {
             return ArrayUtil.EMPTY_OBJECT_ARRAY;
         }
@@ -599,9 +599,8 @@ public Object[] getResultsAsObjects(String qualifiedNameToSkip) {
         List<Object> objects = new ArrayList<>(numberOfVariants);
         Set<String> processedCandidateNames = new HashSet<>(numberOfVariants);
 
-        for (int i = 0; i < numberOfVariants; ++i) {
-            PsiElement namedElement = processorResults.get(i);
-            String name = getName((PsiNamedElement)namedElement);
+        for (PsiElement namedElement : processorResults) {
+            String name = getName(namedElement);
             if (name == null) {
                 continue;
             }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index 4e573ca7..5a21d1ca 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -178,7 +178,7 @@ private void updateCanUseOnlyCompleteMatches(JSClass jsClass) {
     }
 
     @RequiredReadAction
-    public void addLocalResults(List<PsiElement> results) {
+    public void addLocalResults(Collection<PsiElement> results) {
         if (results == null) {
             return;
         }

From 220b9e188c93f3d1909eb0821258a45a15d930de Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 3 Jan 2026 15:33:56 +0200
Subject: [PATCH 305/340] drop usage deprecated counters

---
 .../com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java   | 2 +-
 .../src/main/java/consulo/json/jom/JomManager.java              | 2 +-
 .../consulo/json/validation/JsonFileDescriptorProviders.java    | 2 +-
 .../validation/inspections/PropertyValidationInspection.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index eba657a0..c77acb83 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -61,7 +61,7 @@ public Result<PsiReference[]> compute() {
                 return Result.create(
                     buildReferences(),
                     JSPropertyImpl.this,
-                    PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT
+                    PsiModificationTracker.MODIFICATION_COUNT
                 );
             }
         });
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
index 1239c116..967a44cd 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
@@ -79,7 +79,7 @@ public Result<JomFileElement<?>> compute() {
                     if (fileDescriptor != null) {
                         value = new JomFileElement((JSFile)psiFile, fileDescriptor);
                     }
-                    return Result.<JomFileElement<?>>create(value, psiFile, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+                    return Result.<JomFileElement<?>>create(value, psiFile, PsiModificationTracker.MODIFICATION_COUNT);
                 }
             }, false);
 
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
index e6e675cb..27206849 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
@@ -47,7 +47,7 @@ public Result<JsonObjectDescriptor> compute() {
                             JsonObjectDescriptor objectDescriptor = new JsonObjectDescriptor();
                             provider.fillRootObject(objectDescriptor, file);
 
-                            return Result.create(objectDescriptor, file, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+                            return Result.create(objectDescriptor, file, PsiModificationTracker.MODIFICATION_COUNT);
                         }
                     }
                     return null;
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
index 15ae5c91..09833881 100644
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
@@ -216,7 +216,7 @@ public Result<JsonPropertyDescriptor> compute() {
                 return Result.create(
                     findPropertyDescriptorImpl(jsProperty),
                     jsProperty,
-                    PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT
+                    PsiModificationTracker.MODIFICATION_COUNT
                 );
             }
         }, false).getValue();

From 70ad1d77df64d7981651c562b6d69520350f78bd Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sun, 11 Jan 2026 23:47:05 +0300
Subject: [PATCH 306/340] Refactoring usage of LocalizeValue.empty().

---
 .../idea/lang/javascript/intention/JSMutablyNamedIntention.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 02074099..5b4bc7c4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -30,7 +30,7 @@ public abstract class JSMutablyNamedIntention extends JSIntention {
     @Override
     @Nonnull
     public LocalizeValue getText() {
-        return myText != LocalizeValue.empty() ? myText : getBasicText();
+        return myText.orIfEmpty(getBasicText());
     }
 
     @Nonnull

From 1837639293ef6b09a66686578ee9beda2619c928 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 7 Feb 2026 18:52:21 +0200
Subject: [PATCH 307/340] json impl moved to own json plugin

---
 .../json-javascript-impl/pom.xml              |  50 --
 .../main/java/consulo/json/JsonFileType.java  |  74 --
 .../consulo/json/JsonFileTypeFactory.java     |  18 -
 .../java/consulo/json/jom/JomElement.java     |  24 -
 .../consulo/json/jom/JomFileDescriptor.java   |  50 --
 .../java/consulo/json/jom/JomFileElement.java |  61 --
 .../json/jom/JomIconDescriptorUpdater.java    |  43 -
 .../java/consulo/json/jom/JomManager.java     | 103 ---
 .../JomModeAsJsonFileDescriptorProvider.java  | 165 ----
 .../consulo/json/jom/JomPropertyGetter.java   |  32 -
 .../main/java/consulo/json/jom/JomUtil.java   |  30 -
 .../proxy/JomBadValueExpressionException.java |  22 -
 .../jom/proxy/JomProxyInvocationHandler.java  |  72 --
 .../json/jom/proxy/JomValueConverter.java     | 124 ---
 .../json/jom/proxy/impl/JomBooleanValue.java  |  50 --
 .../jom/proxy/impl/JomCollectionValue.java    |  74 --
 .../json/jom/proxy/impl/JomMapConverter.java  |  58 --
 .../proxy/impl/JomNullableNumberValue.java    |  65 --
 .../json/jom/proxy/impl/JomNumberValue.java   |  24 -
 .../jom/proxy/impl/JomStringConverter.java    |  42 -
 .../json/lang/JsonJavaScriptParser.java       | 222 -----
 .../json/lang/JsonJavaScriptVersion.java      |  59 --
 .../consulo/json/lang/JsonQuoteHandler.java   |  21 -
 .../consulo/json/lang/lexer/JsonLexer.java    | 766 ------------------
 .../java/consulo/json/lang/lexer/json.flex    |  77 --
 .../JsonFileDescriptorProvider.java           |  41 -
 .../JsonFileDescriptorProviders.java          |  59 --
 .../consulo/json/validation/NativeArray.java  |  36 -
 .../completion/JsonCompletionContributor.java | 262 ------
 ...ByAnotherPsiElementEditorNotification.java | 135 ---
 ...therPsiElementJsonDescriptionProvider.java |  65 --
 ...escriptionByAnotherPsiElementProvider.java |  58 --
 ...scriptionByAnotherPsiElementRegistrar.java |  56 --
 ...DescriptionByAnotherPsiElementService.java | 286 -------
 .../descriptor/JsonObjectDescriptor.java      |  66 --
 .../descriptor/JsonPropertyDescriptor.java    |  83 --
 .../PropertyValidationInspection.java         | 362 ---------
 .../reference/JsonPropertyNameReference.java  |  62 --
 .../JsonPropertyNameReferenceProvider.java    |  49 --
 .../src/main/java/module-info.java            |  23 -
 plugin/pom.xml                                | 350 ++++----
 pom.xml                                       |  83 +-
 42 files changed, 213 insertions(+), 4189 deletions(-)
 delete mode 100644 lang-version-impl/json-javascript-impl/pom.xml
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/json.flex
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
 delete mode 100644 lang-version-impl/json-javascript-impl/src/main/java/module-info.java

diff --git a/lang-version-impl/json-javascript-impl/pom.xml b/lang-version-impl/json-javascript-impl/pom.xml
deleted file mode 100644
index e7f69813..00000000
--- a/lang-version-impl/json-javascript-impl/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  - Copyright 2013-2017 consulo.io
-  -
-  - 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.
-  -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-json.javascript.impl</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.dev/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-base.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
deleted file mode 100644
index 7c31e6dc..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2013-2014 must-be.org
- *
- * 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.
- */
-
-package consulo.json;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.icon.JavaScriptIconGroup;
-import consulo.javascript.language.JavaScriptFileTypeWithVersion;
-import consulo.javascript.language.JavaScriptLanguage;
-import consulo.json.lang.JsonJavaScriptVersion;
-import consulo.language.file.LanguageFileType;
-import consulo.localize.LocalizeValue;
-import consulo.module.Module;
-import consulo.ui.image.Image;
-import consulo.virtualFileSystem.VirtualFile;
-import jakarta.annotation.Nonnull;
-
-import jakarta.annotation.Nullable;
-
-/**
- * @author VISTALL
- * @since 02.12.13.
- */
-public class JsonFileType extends LanguageFileType implements JavaScriptFileTypeWithVersion {
-    public static final JsonFileType INSTANCE = new JsonFileType();
-
-    private JsonFileType() {
-        super(JavaScriptLanguage.INSTANCE);
-    }
-
-    @Nonnull
-    @Override
-    public String getId() {
-        return "JSON";
-    }
-
-    @Nonnull
-    @Override
-    public LocalizeValue getDescription() {
-        return LocalizeValue.localizeTODO("Json files");
-    }
-
-    @Nonnull
-    @Override
-    public String getDefaultExtension() {
-        return "json";
-    }
-
-    @Nullable
-    @Override
-    public Image getIcon() {
-        return JavaScriptIconGroup.json();
-    }
-
-    @RequiredReadAction
-    @Nonnull
-    @Override
-    public JsonJavaScriptVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
-        return JsonJavaScriptVersion.getInstance();
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
deleted file mode 100644
index 7651431c..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/JsonFileTypeFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package consulo.json;
-
-import consulo.annotation.component.ExtensionImpl;
-import consulo.virtualFileSystem.fileType.FileTypeConsumer;
-import consulo.virtualFileSystem.fileType.FileTypeFactory;
-import jakarta.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 05.03.2015
- */
-@ExtensionImpl
-public class JsonFileTypeFactory extends FileTypeFactory {
-    @Override
-    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
-        consumer.consume(JsonFileType.INSTANCE);
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java
deleted file mode 100644
index a832ee47..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomElement.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.jom;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-public interface JomElement {
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
deleted file mode 100644
index c614fd6a..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileDescriptor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.jom;
-
-import consulo.annotation.component.ComponentScope;
-import consulo.annotation.component.ExtensionAPI;
-import consulo.component.extension.ExtensionPointName;
-import consulo.language.psi.PsiFile;
-import consulo.ui.image.Image;
-
-import jakarta.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-@ExtensionAPI(ComponentScope.APPLICATION)
-public abstract class JomFileDescriptor<T extends JomElement> {
-    public static ExtensionPointName<JomFileDescriptor> EP_NAME = ExtensionPointName.create(JomFileDescriptor.class);
-
-    private Class<T> myDefinitionClass;
-
-    public JomFileDescriptor(@Nonnull Class<T> definitionClass) {
-        myDefinitionClass = definitionClass;
-    }
-
-    @Nonnull
-    public Class<T> getDefinitionClass() {
-        return myDefinitionClass;
-    }
-
-    @Nonnull
-    public abstract Image getIcon();
-
-    public abstract boolean isMyFile(@Nonnull PsiFile psiFile);
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
deleted file mode 100644
index 4c99508a..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomFileElement.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.jom;
-
-import com.intellij.lang.javascript.psi.JSFile;
-import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import consulo.json.jom.proxy.JomProxyInvocationHandler;
-import consulo.language.psi.util.PsiTreeUtil;
-import consulo.util.lang.lazy.LazyValue;
-
-import jakarta.annotation.Nonnull;
-
-import java.util.function.Supplier;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-public class JomFileElement<T extends JomElement> {
-    private final JomFileDescriptor<T> myFileDescriptor;
-    private final JSFile myPsiFile;
-    private final Supplier<T> myRootValue;
-
-    public JomFileElement(JSFile psiFile, JomFileDescriptor<T> fileDescriptor) {
-        myPsiFile = psiFile;
-        myFileDescriptor = fileDescriptor;
-        myRootValue = LazyValue.notNull(() -> (T)JomProxyInvocationHandler.createProxy(
-            myFileDescriptor.getDefinitionClass(),
-            PsiTreeUtil.findChildOfType(myPsiFile, JSObjectLiteralExpression.class)
-        ));
-    }
-
-    @Nonnull
-    public T getRootElement() {
-        return myRootValue.get();
-    }
-
-    @Nonnull
-    public JomFileDescriptor<T> getFileDescriptor() {
-        return myFileDescriptor;
-    }
-
-    @Nonnull
-    public JSFile getFile() {
-        return myPsiFile;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
deleted file mode 100644
index bdbf79da..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomIconDescriptorUpdater.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.jom;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.language.icon.IconDescriptor;
-import consulo.language.icon.IconDescriptorUpdater;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiFile;
-import jakarta.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-@ExtensionImpl
-public class JomIconDescriptorUpdater implements IconDescriptorUpdater {
-    @RequiredReadAction
-    @Override
-    public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiElement element, int flags) {
-        if (element instanceof PsiFile file) {
-            JomFileElement<JomElement> fileElement = JomManager.getInstance(element.getProject()).getFileElement(file);
-            if (fileElement != null) {
-                iconDescriptor.setMainIcon(fileElement.getFileDescriptor().getIcon());
-            }
-        }
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
deleted file mode 100644
index 967a44cd..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomManager.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.jom;
-
-import com.intellij.lang.javascript.psi.JSFile;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ComponentScope;
-import consulo.annotation.component.ServiceAPI;
-import consulo.annotation.component.ServiceImpl;
-import consulo.application.util.CachedValue;
-import consulo.application.util.CachedValueProvider;
-import consulo.application.util.CachedValuesManager;
-import consulo.ide.ServiceManager;
-import consulo.json.JsonFileType;
-import consulo.language.psi.PsiFile;
-import consulo.language.psi.PsiModificationTracker;
-import consulo.project.Project;
-import consulo.util.dataholder.Key;
-import consulo.virtualFileSystem.fileType.FileType;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-@Singleton
-@ServiceAPI(ComponentScope.PROJECT)
-@ServiceImpl
-public class JomManager {
-    @Nonnull
-    public static JomManager getInstance(@Nonnull Project project) {
-        return ServiceManager.getService(project, JomManager.class);
-    }
-
-    private static final Key<CachedValue<JomFileElement<?>>> JOM_FILE_ELEMENT = Key.create("jom.file.lement");
-
-    private final Project myProject;
-
-    @Inject
-    public JomManager(Project project) {
-        myProject = project;
-    }
-
-    @Nullable
-    @RequiredReadAction
-    @SuppressWarnings("unchecked")
-    public <T extends JomElement> JomFileElement<T> getFileElement(@Nonnull final PsiFile psiFile) {
-        FileType fileType = psiFile.getFileType();
-        if (fileType != JsonFileType.INSTANCE) {
-            return null;
-        }
-
-        CachedValue<JomFileElement<?>> cachedValue = psiFile.getUserData(JOM_FILE_ELEMENT);
-        if (cachedValue == null) {
-            cachedValue = CachedValuesManager.getManager(myProject).createCachedValue(new CachedValueProvider<JomFileElement<?>>() {
-                @Nullable
-                @Override
-                public Result<JomFileElement<?>> compute() {
-                    JomFileElement<?> value = null;
-                    JomFileDescriptor fileDescriptor = findFileDescriptor(psiFile);
-                    if (fileDescriptor != null) {
-                        value = new JomFileElement((JSFile)psiFile, fileDescriptor);
-                    }
-                    return Result.<JomFileElement<?>>create(value, psiFile, PsiModificationTracker.MODIFICATION_COUNT);
-                }
-            }, false);
-
-            psiFile.putUserData(JOM_FILE_ELEMENT, cachedValue);
-        }
-
-        return (JomFileElement<T>)cachedValue.getValue();
-    }
-
-    @Nullable
-    private static JomFileDescriptor findFileDescriptor(@Nonnull PsiFile psiFile) {
-        JomFileDescriptor jomFileDescriptor = null;
-        for (JomFileDescriptor temp : JomFileDescriptor.EP_NAME.getExtensions()) {
-            if (temp.isMyFile(psiFile)) {
-                jomFileDescriptor = temp;
-                break;
-            }
-        }
-        return jomFileDescriptor;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
deleted file mode 100644
index 3d576f66..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomModeAsJsonFileDescriptorProvider.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.jom;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.json.validation.JsonFileDescriptorProvider;
-import consulo.json.validation.NativeArray;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import consulo.language.psi.PsiFile;
-import consulo.util.collection.ContainerUtil;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.math.BigInteger;
-import java.util.*;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-@ExtensionImpl
-public class JomModeAsJsonFileDescriptorProvider implements JsonFileDescriptorProvider {
-    @RequiredReadAction
-    @Override
-    public boolean isMyFile(@Nonnull PsiFile file) {
-        return JomManager.getInstance(file.getProject()).getFileElement(file) != null;
-    }
-
-    @RequiredReadAction
-    @Override
-    public void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file) {
-        JomFileElement<JomElement> fileElement = JomManager.getInstance(file.getProject()).getFileElement(file);
-        if (fileElement == null) {
-            return;
-        }
-
-        fillDescriptor(root, fileElement.getFileDescriptor().getDefinitionClass());
-    }
-
-    private static void fillDescriptor(JsonObjectDescriptor objectDescriptor, Class<?> clazz) {
-        Set<Method> methods = new HashSet<Method>();
-        collectMethods(clazz, methods, new HashSet<Class<?>>());
-
-        for (Method method : methods) {
-            String jsonGetPropertyName = JomUtil.getJsonGetPropertyName(method);
-            if (jsonGetPropertyName == null) {
-                continue;
-            }
-
-            JsonPropertyDescriptor propertyDescriptor =
-                fillObjectDescriptor(objectDescriptor, method.getReturnType(), method.getGenericReturnType(), jsonGetPropertyName);
-
-            if (method.isAnnotationPresent(Deprecated.class)) {
-                propertyDescriptor.deprecated();
-            }
-        }
-    }
-
-    @Nonnull
-    private static JsonPropertyDescriptor fillObjectDescriptor(
-        JsonObjectDescriptor objectDescriptor,
-        @Nonnull Class<?> classType,
-        @Nonnull Type genericType,
-        @Nullable String propertyName
-    ) {
-        if (classType.isArray()) {
-            Class<?> componentType = classType.getComponentType();
-
-            return objectDescriptor.addProperty(propertyName, new NativeArray(componentType));
-        }
-        else if (classType == Collection.class || classType == Set.class || classType == List.class) {
-            if (!(genericType instanceof ParameterizedType)) {
-                throw new IllegalArgumentException();
-            }
-
-            Type[] actualTypeArguments = ((ParameterizedType)genericType).getActualTypeArguments();
-
-            return objectDescriptor.addProperty(propertyName, new NativeArray(actualTypeArguments[0]));
-        }
-        else if (classType == boolean.class) {
-            return objectDescriptor.addProperty(propertyName, Boolean.class);
-        }
-        else if (classType == Boolean.class) {
-            return objectDescriptor.addProperty(propertyName, Boolean.class).notNull();
-        }
-        else if (classType == String.class) {
-            return objectDescriptor.addProperty(propertyName, String.class);
-        }
-        else if (classType == byte.class ||
-            classType == short.class ||
-            classType == int.class ||
-            classType == long.class ||
-            classType == float.class ||
-            classType == double.class) {
-            return objectDescriptor.addProperty(propertyName, Number.class).notNull();
-        }
-        else if (classType == Byte.class ||
-            classType == Short.class ||
-            classType == Integer.class ||
-            classType == Long.class ||
-            classType == Float.class ||
-            classType == Double.class ||
-            classType == BigInteger.class) {
-            return objectDescriptor.addProperty(propertyName, Number.class);
-        }
-        else if (classType == Map.class) {
-            if (!(genericType instanceof ParameterizedType)) {
-                throw new IllegalArgumentException();
-            }
-
-            Type[] actualTypeArguments = ((ParameterizedType)genericType).getActualTypeArguments();
-
-            Type actualTypeArgument = actualTypeArguments[1];
-            Class rawType = actualTypeArgument instanceof ParameterizedType actualParameterizedType
-                ? (Class)actualParameterizedType.getRawType()
-                : (Class)actualTypeArgument;
-
-            JsonObjectDescriptor child = new JsonObjectDescriptor();
-            fillObjectDescriptor(child, rawType, actualTypeArguments[1], null);
-
-            return objectDescriptor.addProperty(propertyName, child);
-        }
-        else {
-            JsonObjectDescriptor another = new JsonObjectDescriptor();
-            fillDescriptor(another, classType);
-            return objectDescriptor.addProperty(propertyName, another);
-        }
-    }
-
-    private static void collectMethods(Class<?> clazz, Set<Method> methods, Set<Class<?>> processClasses) {
-        if (processClasses.contains(clazz)) {
-            return;
-        }
-
-        processClasses.add(clazz);
-
-        Method[] declaredMethods = clazz.getDeclaredMethods();
-        ContainerUtil.addAllNotNull(methods, declaredMethods);
-
-        Class<?>[] interfaces = clazz.getInterfaces();
-        for (Class<?> anInterface : interfaces) {
-            collectMethods(anInterface, methods, processClasses);
-        }
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java
deleted file mode 100644
index 24f44afb..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomPropertyGetter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.jom;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface JomPropertyGetter {
-    String value() default "";
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
deleted file mode 100644
index ad59a248..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/JomUtil.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package consulo.json.jom;
-
-import consulo.util.lang.ObjectUtil;
-import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
-
-import jakarta.annotation.Nullable;
-
-import java.lang.reflect.Method;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomUtil {
-    @Nullable
-    public static String getJsonGetPropertyName(@Nonnull Method method) {
-        JomPropertyGetter annotation = method.getAnnotation(JomPropertyGetter.class);
-        if (annotation == null) {
-            return null;
-        }
-
-        String propertyName = StringUtil.getPropertyName(method.getName());
-        propertyName = ObjectUtil.notNull(propertyName, method.getName());
-        if (!StringUtil.isEmpty(annotation.value())) {
-            propertyName = annotation.value();
-        }
-        return propertyName;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java
deleted file mode 100644
index c76fca2e..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomBadValueExpressionException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package consulo.json.jom.proxy;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomBadValueExpressionException extends RuntimeException {
-    public JomBadValueExpressionException() {
-    }
-
-    public JomBadValueExpressionException(String message) {
-        super(message);
-    }
-
-    public JomBadValueExpressionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public JomBadValueExpressionException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
deleted file mode 100644
index f788cc73..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomProxyInvocationHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package consulo.json.jom.proxy;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.json.jom.JomElement;
-import consulo.json.jom.JomUtil;
-import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import com.intellij.lang.javascript.psi.JSProperty;
-import consulo.util.lang.Comparing;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomProxyInvocationHandler implements InvocationHandler {
-    @Nonnull
-    public static JomElement createProxy(
-        @Nonnull Class<?> interfaceClass,
-        @Nullable JSObjectLiteralExpression objectLiteralExpression
-    ) {
-        return (JomElement)Proxy.newProxyInstance(
-            interfaceClass.getClassLoader(),
-            new Class[]{interfaceClass},
-            new JomProxyInvocationHandler(objectLiteralExpression)
-        );
-    }
-
-    private JSObjectLiteralExpression myObjectLiteralExpression;
-
-    public JomProxyInvocationHandler(@Nullable JSObjectLiteralExpression objectLiteralExpression) {
-        myObjectLiteralExpression = objectLiteralExpression;
-    }
-
-    @Override
-    @RequiredReadAction
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        String propertyName = JomUtil.getJsonGetPropertyName(method);
-        if (propertyName != null) {
-            JSProperty jsProperty = findProperty(myObjectLiteralExpression, propertyName);
-            if (jsProperty == null) {
-                return JomValueConverter.getDefaultValueForType(method.getReturnType());
-            }
-            else {
-                try {
-                    return JomValueConverter.convertToObject(method.getReturnType(), method.getGenericReturnType(), jsProperty.getValue());
-                }
-                catch (JomBadValueExpressionException e) {
-                    return JomValueConverter.getDefaultValueForType(method.getReturnType());
-                }
-            }
-        }
-        return null;
-    }
-
-    @Nullable
-    private static JSProperty findProperty(@Nullable JSObjectLiteralExpression objectLiteralExpression, String name) {
-        if (objectLiteralExpression == null) {
-            return null;
-        }
-        for (JSProperty property : objectLiteralExpression.getProperties()) {
-            if (Comparing.equal(property.getName(), name)) {
-                return property;
-            }
-        }
-        return null;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
deleted file mode 100644
index a15d9f4b..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/JomValueConverter.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package consulo.json.jom.proxy;
-
-import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.json.jom.JomElement;
-import consulo.json.jom.proxy.impl.*;
-import consulo.language.psi.PsiElement;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.Type;
-import java.util.*;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomValueConverter {
-    public interface Converter<T> {
-        T getDefaultValue();
-
-        @RequiredReadAction
-        T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException;
-    }
-
-    private static Map<Class, Converter> ourDefaultConverters = new HashMap<Class, Converter>();
-
-    static {
-        // primitives
-        ourDefaultConverters.put(byte.class, new JomNumberValue<Byte>(Byte.class));
-        ourDefaultConverters.put(short.class, new JomNumberValue<Short>(Short.class));
-        ourDefaultConverters.put(int.class, new JomNumberValue<Integer>(Integer.class));
-        ourDefaultConverters.put(long.class, new JomNumberValue<Long>(Long.class));
-        ourDefaultConverters.put(float.class, new JomNumberValue<Float>(Float.class));
-        ourDefaultConverters.put(double.class, new JomNumberValue<Double>(Double.class));
-        ourDefaultConverters.put(boolean.class, new JomBooleanValue(Boolean.FALSE));
-
-        // primitive wrappers
-        ourDefaultConverters.put(Byte.class, new JomNullableNumberValue<Byte>(Byte.class));
-        ourDefaultConverters.put(Short.class, new JomNullableNumberValue<Short>(Short.class));
-        ourDefaultConverters.put(Integer.class, new JomNullableNumberValue<Integer>(Integer.class));
-        ourDefaultConverters.put(Long.class, new JomNullableNumberValue<Long>(Long.class));
-        ourDefaultConverters.put(Float.class, new JomNullableNumberValue<Float>(Float.class));
-        ourDefaultConverters.put(Double.class, new JomNullableNumberValue<Double>(Double.class));
-        ourDefaultConverters.put(Boolean.class, new JomBooleanValue(null));
-
-        ourDefaultConverters.put(String.class, new JomStringConverter());
-
-        // collections
-        ourDefaultConverters.put(Map.class, new JomMapConverter());
-        ourDefaultConverters.put(Collection.class, new JomCollectionValue<Collection>(ArrayList.class));
-        ourDefaultConverters.put(List.class, new JomCollectionValue<List>(ArrayList.class));
-        ourDefaultConverters.put(Set.class, new JomCollectionValue<Set>(LinkedHashSet.class));
-    }
-
-    @RequiredReadAction
-    @SuppressWarnings("unchecked")
-    public static Object convertToObject(
-        @Nonnull Class type,
-        @Nonnull Type genericType,
-        @Nullable JSExpression value
-    ) throws JomBadValueExpressionException {
-        if (value == null) {
-            throw new JomBadValueExpressionException("No value for property");
-        }
-
-        JomValueConverter.Converter converter = JomValueConverter.ourDefaultConverters.get(type);
-        if (converter != null) {
-            return converter.parseValue(type, genericType, value);
-        }
-
-        if (type.isArray()) {
-            if (value instanceof JSArrayLiteralExpression) {
-                Class componentType = type.getComponentType();
-
-                JSExpression[] expressions = ((JSArrayLiteralExpression)value).getExpressions();
-
-                List list = new ArrayList(expressions.length);
-                for (JSExpression expression : expressions) {
-                    try {
-                        Object o = JomValueConverter.convertToObject(componentType, componentType, expression);
-                        list.add(o);
-                    }
-                    catch (JomBadValueExpressionException e) {
-                        // we dont interest in bad value
-                    }
-                }
-
-                return list.toArray((Object[])Array.newInstance(componentType, list.size()));
-            }
-        }
-
-        if (JomElement.class.isAssignableFrom(type)) {
-            return JomProxyInvocationHandler.createProxy(
-                type,
-                value instanceof JSObjectLiteralExpression ? (JSObjectLiteralExpression)value : null
-            );
-        }
-
-        throw new UnsupportedOperationException("Unsupported type: " + genericType);
-    }
-
-    @Nullable
-    public static Object getDefaultValueForType(@Nonnull Class type) {
-        JomValueConverter.Converter converter = JomValueConverter.ourDefaultConverters.get(type);
-        if (converter != null) {
-            return converter.getDefaultValue();
-        }
-
-        if (type.isArray()) {
-            return Array.newInstance(type.getComponentType(), 0);
-        }
-
-        if (JomElement.class.isAssignableFrom(type)) {
-            return null;
-        }
-
-        throw new UnsupportedOperationException("Unsupported type: " + type);
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
deleted file mode 100644
index cab77251..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomBooleanValue.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package consulo.json.jom.proxy.impl;
-
-import java.lang.reflect.Type;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.json.jom.proxy.JomBadValueExpressionException;
-import consulo.json.jom.proxy.JomValueConverter;
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.language.ast.IElementType;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiUtilCore;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomBooleanValue implements JomValueConverter.Converter<Boolean> {
-    private Boolean myDefaultValue;
-
-    public JomBooleanValue(@Nullable Boolean defaultValue) {
-        myDefaultValue = defaultValue;
-    }
-
-    @Override
-    public Boolean getDefaultValue() {
-        return myDefaultValue;
-    }
-
-    @RequiredReadAction
-    @Override
-    public Boolean parseValue(
-        @Nonnull Class type,
-        @Nonnull Type genericType,
-        @Nonnull PsiElement value
-    ) throws JomBadValueExpressionException {
-        if (value instanceof JSLiteralExpression) {
-            IElementType elementType = PsiUtilCore.getElementType(value.getFirstChild());
-            if (elementType == JSTokenTypes.TRUE_KEYWORD) {
-                return Boolean.TRUE;
-            }
-            else if (elementType == JSTokenTypes.FALSE_KEYWORD) {
-                return Boolean.FALSE;
-            }
-        }
-        throw new JomBadValueExpressionException();
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
deleted file mode 100644
index 6d33d0aa..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomCollectionValue.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package consulo.json.jom.proxy.impl;
-
-import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
-import com.intellij.lang.javascript.psi.JSExpression;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.json.jom.proxy.JomBadValueExpressionException;
-import consulo.json.jom.proxy.JomValueConverter;
-import consulo.language.psi.PsiElement;
-import consulo.util.lang.Pair;
-import consulo.util.lang.reflect.ReflectionUtil;
-import jakarta.annotation.Nonnull;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Collection;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomCollectionValue<T extends Collection> implements JomValueConverter.Converter<T> {
-    private Class<? extends T> myNewInstanceClass;
-
-    public JomCollectionValue(Class<? extends T> newInstanceClass) {
-        myNewInstanceClass = newInstanceClass;
-    }
-
-    @Override
-    public T getDefaultValue() {
-        return ReflectionUtil.newInstance(myNewInstanceClass);
-    }
-
-    @RequiredReadAction
-    @Override
-    @SuppressWarnings("unchecked")
-    public T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException {
-        if (value instanceof JSArrayLiteralExpression) {
-            JSExpression[] expressions = ((JSArrayLiteralExpression)value).getExpressions();
-            T collection = ReflectionUtil.newInstance(myNewInstanceClass);
-
-            Pair<Class, Type> valueType = findValueTypeInsideGeneric(genericType, 0); // E
-
-            for (JSExpression expression : expressions) {
-                try {
-                    Object o = JomValueConverter.convertToObject(valueType.getFirst(), valueType.getSecond(), expression);
-                    collection.add(o);
-                }
-                catch (JomBadValueExpressionException e) {
-                    // we dont interest in bad value
-                }
-            }
-            return collection;
-        }
-        throw new JomBadValueExpressionException();
-    }
-
-
-    public static Pair<Class, Type> findValueTypeInsideGeneric(@Nonnull Type genericType, int index) {
-        if (!(genericType instanceof ParameterizedType)) {
-            throw new JomBadValueExpressionException();
-        }
-
-        Type[] actualTypeArguments = ((ParameterizedType)genericType).getActualTypeArguments();
-        if (actualTypeArguments.length <= index) {
-            throw new JomBadValueExpressionException();
-        }
-
-        Type valueType = actualTypeArguments[index];
-        Class rawType = valueType instanceof ParameterizedType parameterizedType
-            ? (Class)parameterizedType.getRawType()
-            : (Class)valueType;
-        return Pair.create(rawType, valueType);
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
deleted file mode 100644
index 8575084d..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomMapConverter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package consulo.json.jom.proxy.impl;
-
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import jakarta.annotation.Nonnull;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.json.jom.proxy.JomBadValueExpressionException;
-import consulo.json.jom.proxy.JomValueConverter;
-import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import com.intellij.lang.javascript.psi.JSProperty;
-import consulo.language.psi.PsiElement;
-import consulo.util.lang.Pair;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomMapConverter implements JomValueConverter.Converter<Map> {
-    @Override
-    public Map getDefaultValue() {
-        return Collections.emptyMap();
-    }
-
-    @RequiredReadAction
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException {
-        if (!(value instanceof JSObjectLiteralExpression)) {
-            throw new JomBadValueExpressionException();
-        }
-
-        Pair<Class, Type> valueType = JomCollectionValue.findValueTypeInsideGeneric(genericType, 1); // K, V
-
-        JSProperty[] properties = ((JSObjectLiteralExpression)value).getProperties();
-
-        Map map = new LinkedHashMap(properties.length);
-
-        for (JSProperty property : properties) {
-            String name = property.getName();
-            if (name == null) {
-                continue;
-            }
-
-            try {
-                Object object = JomValueConverter.convertToObject(valueType.getFirst(), valueType.getSecond(), property.getValue());
-                map.put(name, object);
-            }
-            catch (JomBadValueExpressionException e) {
-                // we dont interest in bad value
-            }
-        }
-
-        return map;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
deleted file mode 100644
index 2a268036..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNullableNumberValue.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package consulo.json.jom.proxy.impl;
-
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.json.jom.proxy.JomBadValueExpressionException;
-import consulo.json.jom.proxy.JomValueConverter;
-import consulo.language.ast.IElementType;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiUtilCore;
-import consulo.util.lang.StringUtil;
-import consulo.util.lang.lazy.LazyValue;
-import consulo.util.lang.reflect.ReflectionUtil;
-
-import jakarta.annotation.Nonnull;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.function.Supplier;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomNullableNumberValue<T> implements JomValueConverter.Converter<T> {
-    protected Class<T> myClass;
-
-    protected Supplier<Method> myParseMethodValue;
-
-    public JomNullableNumberValue(Class<T> aClass) {
-        myClass = aClass;
-        myParseMethodValue = LazyValue.notNull(() -> {
-            Class primitiveType = ReflectionUtil.getStaticFieldValue(myClass, Class.class, "TYPE");
-
-            String methodName = "parse" + StringUtil.capitalize(primitiveType.getSimpleName());
-            Method method = ReflectionUtil.getMethod(myClass, methodName, String.class);
-            assert method != null;
-            return method;
-        });
-    }
-
-    @Override
-    public T getDefaultValue() {
-        return null;
-    }
-
-    @RequiredReadAction
-    @Override
-    @SuppressWarnings("unchecked")
-    public T parseValue(@Nonnull Class type, @Nonnull Type genericType, @Nonnull PsiElement value) throws JomBadValueExpressionException {
-        if (value instanceof JSLiteralExpression) {
-            IElementType elementType = PsiUtilCore.getElementType(value.getFirstChild());
-            if (elementType == JSTokenTypes.NUMERIC_LITERAL) {
-                try {
-                    return (T)myParseMethodValue.get().invoke(null, value.getText());
-                }
-                catch (Exception e) {
-                    throw new JomBadValueExpressionException(e);
-                }
-            }
-        }
-
-        throw new JomBadValueExpressionException();
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
deleted file mode 100644
index 50d53688..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomNumberValue.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package consulo.json.jom.proxy.impl;
-
-import consulo.json.jom.proxy.JomBadValueExpressionException;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomNumberValue<T> extends JomNullableNumberValue<T> {
-    public JomNumberValue(Class<T> aClass) {
-        super(aClass);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public T getDefaultValue() {
-        try {
-            return (T)myParseMethodValue.get().invoke(null, "0");
-        }
-        catch (Exception e) {
-            throw new JomBadValueExpressionException(e);
-        }
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
deleted file mode 100644
index dbcde025..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/jom/proxy/impl/JomStringConverter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package consulo.json.jom.proxy.impl;
-
-import java.lang.reflect.Type;
-
-import jakarta.annotation.Nonnull;
-
-import consulo.javascript.psi.JSSimpleLiteralExpression;
-import consulo.language.psi.PsiElement;
-import consulo.language.ast.IElementType;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.json.jom.proxy.JomBadValueExpressionException;
-import consulo.json.jom.proxy.JomValueConverter;
-import consulo.util.lang.StringUtil;
-
-/**
- * @author VISTALL
- * @since 13.11.2015
- */
-public class JomStringConverter implements JomValueConverter.Converter<String> {
-    @Override
-    public String getDefaultValue() {
-        return null;
-    }
-
-    @RequiredReadAction
-    @Override
-    public String parseValue(
-        @Nonnull Class type,
-        @Nonnull Type genericType,
-        @Nonnull PsiElement value
-    ) throws JomBadValueExpressionException {
-        if (value instanceof JSSimpleLiteralExpression simpleLiteralExpression) {
-            IElementType elementType = simpleLiteralExpression.getLiteralElementType();
-            if (JavaScriptTokenSets.STRING_LITERALS.contains(elementType)) {
-                return StringUtil.unquoteString(value.getText());
-            }
-        }
-
-        throw new JomBadValueExpressionException();
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
deleted file mode 100644
index 1f591018..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptParser.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package consulo.json.lang;
-
-import com.intellij.lang.javascript.JSElementTypes;
-import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.lang.parsing.ExpressionParsing;
-import consulo.javascript.lang.parsing.Parsing;
-import consulo.javascript.localize.JavaScriptLocalize;
-import consulo.language.ast.ASTNode;
-import consulo.language.ast.IElementType;
-import consulo.language.parser.PsiBuilder;
-import consulo.language.parser.PsiParser;
-import consulo.language.version.LanguageVersion;
-import consulo.localize.LocalizeValue;
-import consulo.logging.Logger;
-
-import jakarta.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 05.03.2015
- */
-public class JsonJavaScriptParser implements PsiParser {
-    private static final Logger LOG = Logger.getInstance(JsonJavaScriptParser.class);
-
-    private int myPropertyDepth;
-
-    @Nonnull
-    @Override
-    public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder builder, @Nonnull LanguageVersion languageVersion) {
-        PsiBuilder.Marker rootMarker = builder.mark();
-        parseRoot(builder);
-        rootMarker.done(root);
-        return builder.getTreeBuilt();
-    }
-
-    private void parseRoot(PsiBuilder builder) {
-        if (builder.getTokenType() == JSTokenTypes.LBRACKET) {
-            parseArrayLiteralExpression(builder);
-            if (builder.getTokenType() != null) {
-                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof());
-            }
-        }
-        else if (builder.getTokenType() == JSTokenTypes.LBRACE) {
-            parseObjectLiteralExpression(builder);
-            if (builder.getTokenType() != null) {
-                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedEof());
-            }
-        }
-        else {
-            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedLbraceOrLbracket());
-        }
-
-        while (builder.getTokenType() != null) {
-            builder.advanceLexer();
-        }
-    }
-
-    private void parseProperty(PsiBuilder builder) {
-        if (myPropertyDepth > 1000) {
-            builder.error("Too big depth for property");
-            int braceCount = 0;
-            int bracketCount = 0;
-            while (!builder.eof()) {
-                IElementType tokenType = builder.getTokenType();
-                if (tokenType == JSTokenTypes.LBRACE) {
-                    braceCount++;
-                }
-                else if (tokenType == JSTokenTypes.LBRACKET) {
-                    bracketCount++;
-                }
-                else if (tokenType == JSTokenTypes.RBRACE) {
-                    braceCount--;
-                    if (braceCount < 0) {
-                        break;
-                    }
-                }
-                else if (tokenType == JSTokenTypes.RBRACKET) {
-                    bracketCount--;
-                    if (bracketCount < 0) {
-                        break;
-                    }
-                }
-                builder.advanceLexer();
-            }
-        }
-
-        IElementType nameToken = builder.getTokenType();
-        PsiBuilder.Marker property = builder.mark();
-        myPropertyDepth++;
-
-        if (isNotPropertyStart(nameToken)) {
-            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedIdentifierStringLiteralOrNumericLiteral());
-        }
-        builder.advanceLexer();
-        Parsing.checkMatches(builder, JSTokenTypes.COLON, JavaScriptLocalize.javascriptParserMessageExpectedColon());
-
-        if (!parseValue(builder)) {
-            builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-        }
-        myPropertyDepth--;
-
-        property.done(JSElementTypes.PROPERTY);
-    }
-
-    public void parseObjectLiteralExpression(PsiBuilder builder) {
-        LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACE);
-        PsiBuilder.Marker expr = builder.mark();
-        builder.advanceLexer();
-
-        IElementType elementType = builder.getTokenType();
-
-        while (elementType != JSTokenTypes.RBRACE && elementType != null) {
-            parseProperty(builder);
-
-            elementType = builder.getTokenType();
-            if (elementType == JSTokenTypes.RBRACE) {
-                break;
-            }
-            else if (elementType == JSTokenTypes.COMMA) {
-                builder.advanceLexer();
-
-                if (builder.getTokenType() == JSTokenTypes.RBRACE) {
-                    break;
-                }
-            }
-            else {
-                builder.error(JavaScriptLocalize.javascriptParserMessageExpectedComma());
-            }
-
-            elementType = builder.getTokenType();
-            if (elementType == JSTokenTypes.RBRACE) {
-                break;
-            }
-            else if (isNotPropertyStart(elementType)) {
-                break;
-            }
-        }
-
-        Parsing.checkMatches(builder, JSTokenTypes.RBRACE, JavaScriptLocalize.javascriptParserMessageExpectedRbrace());
-        expr.done(JSElementTypes.OBJECT_LITERAL_EXPRESSION);
-    }
-
-    public static boolean isNotPropertyStart(IElementType elementType) {
-        return !JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(elementType)
-            && !JavaScriptTokenSets.STRING_LITERALS.contains(elementType)
-            && elementType != JSTokenTypes.NUMERIC_LITERAL;
-    }
-
-    public void parseArrayLiteralExpression(PsiBuilder builder) {
-        JsonJavaScriptParser.LOG.assertTrue(builder.getTokenType() == JSTokenTypes.LBRACKET);
-        PsiBuilder.Marker expr = builder.mark();
-        builder.advanceLexer();
-        boolean commaExpected = false;
-
-        while (builder.getTokenType() != JSTokenTypes.RBRACKET) {
-            if (commaExpected) {
-                boolean b = Parsing.checkMatches(builder, JSTokenTypes.COMMA, JavaScriptLocalize.javascriptParserMessageExpectedComma());
-                if (!b) {
-                    break;
-                }
-            }
-
-            while (builder.getTokenType() == JSTokenTypes.COMMA) {
-                builder.advanceLexer();
-            }
-
-            commaExpected = false;
-            if (builder.getTokenType() != JSTokenTypes.RBRACKET) {
-                if (!parseValue(builder)) {
-                    builder.error(JavaScriptLocalize.javascriptParserMessageExpectedExpression());
-                    break;
-                }
-                else {
-                    commaExpected = true;
-                }
-            }
-        }
-        Parsing.checkMatches(builder, JSTokenTypes.RBRACKET, JavaScriptLocalize.javascriptParserMessageExpectedRbracket());
-        expr.done(JSElementTypes.ARRAY_LITERAL_EXPRESSION);
-    }
-
-    private boolean parseValue(PsiBuilder builder) {
-        IElementType firstToken = builder.getTokenType();
-        if (firstToken == JSTokenTypes.NUMERIC_LITERAL ||
-            firstToken == JSTokenTypes.STRING_LITERAL ||
-            firstToken == JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL ||
-            firstToken == JSTokenTypes.NULL_KEYWORD ||
-            firstToken == JSTokenTypes.FALSE_KEYWORD ||
-            firstToken == JSTokenTypes.TRUE_KEYWORD) {
-            LocalizeValue errorMessage = ExpressionParsing.validateLiteral(builder);
-            Parsing.buildTokenElement(JSElementTypes.LITERAL_EXPRESSION, builder);
-            if (errorMessage != null) {
-                builder.error(errorMessage);
-            }
-            return true;
-        }
-        if (firstToken == JSTokenTypes.LBRACKET) {
-            parseArrayLiteralExpression(builder);
-            return true;
-        }
-        else if (firstToken == JSTokenTypes.MINUS) {
-            PsiBuilder.Marker marker = builder.mark();
-            builder.advanceLexer();
-            if (builder.getTokenType() == JSTokenTypes.NUMERIC_LITERAL) {
-                builder.advanceLexer();
-                marker.done(JSElementTypes.PREFIX_EXPRESSION);
-            }
-            else {
-                marker.error("Unexpected token");
-            }
-            return true;
-        }
-        else if (firstToken == JSTokenTypes.LBRACE) {
-            parseObjectLiteralExpression(builder);
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
deleted file mode 100644
index effbc675..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonJavaScriptVersion.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package consulo.json.lang;
-
-import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
-import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
-import consulo.javascript.language.JavaScriptLanguage;
-import consulo.json.JsonFileType;
-import consulo.json.lang.lexer.JsonLexer;
-import consulo.language.editor.highlight.SyntaxHighlighter;
-import consulo.language.lexer.Lexer;
-import consulo.language.parser.PsiParser;
-import consulo.virtualFileSystem.fileType.FileType;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-import java.util.function.Supplier;
-
-/**
- * @author VISTALL
- * @since 05.03.2015
- */
-@ExtensionImpl
-public class JsonJavaScriptVersion extends BaseJavaScriptLanguageVersion {
-    private static final Supplier<Lexer> ourLexerFactory = JsonLexer::new;
-
-    @Nonnull
-    public static JsonJavaScriptVersion getInstance() {
-        return JavaScriptLanguage.INSTANCE.findVersionByClass(JsonJavaScriptVersion.class);
-    }
-
-    public JsonJavaScriptVersion() {
-        super("JSON", "application/json");
-    }
-
-    @Nullable
-    @Override
-    public FileType getAssociatedFileType() {
-        return JsonFileType.INSTANCE;
-    }
-
-    @Nonnull
-    @Override
-    public SyntaxHighlighter getSyntaxHighlighter() {
-        return new JavaScriptHighlighter(ourLexerFactory);
-    }
-
-    @Nonnull
-    @Override
-    public Lexer createLexer() {
-        return ourLexerFactory.get();
-    }
-
-    @Nonnull
-    @Override
-    public PsiParser createParser() {
-        return new JsonJavaScriptParser();
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
deleted file mode 100644
index b64def48..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/JsonQuoteHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package consulo.json.lang;
-
-import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.impl.language.JavaScriptQuoteHandler;
-import consulo.json.JsonFileType;
-import consulo.virtualFileSystem.fileType.FileType;
-
-import jakarta.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 29-Aug-22
- */
-@ExtensionImpl
-public class JsonQuoteHandler extends JavaScriptQuoteHandler {
-    @Nonnull
-    @Override
-    public FileType getFileType() {
-        return JsonFileType.INSTANCE;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
deleted file mode 100644
index 4f6b8b9a..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/JsonLexer.java
+++ /dev/null
@@ -1,766 +0,0 @@
-/* The following code was generated by JFlex 1.4.4 on 15.02.16 12:22 */
-
-package consulo.json.lang.lexer;
-
-import com.intellij.lang.javascript.JSTokenTypes;
-import consulo.language.ast.IElementType;
-import consulo.language.lexer.LexerBase;
-
-/**
- * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.4.4
- * on 15.02.16 12:22 from the specification file
- * <tt>R:/_github.com/consulo/consulo-javascript/json-javascript-impl/src/org/mustbe/consulo/json/lang/lexer/json.flex</tt>
- */
-public class JsonLexer extends LexerBase {
-    /** initial size of the lookahead buffer */
-    private static final int ZZ_BUFFERSIZE = 16384;
-
-    /** lexical states */
-    public static final int YYINITIAL = 0;
-
-    /**
-     * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-     * at the beginning of a line
-     * l is of the form l = 2*k, k a non negative integer
-     */
-    private static final int ZZ_LEXSTATE[] = {
-        0, 0
-    };
-
-    /**
-     * Translates characters to character classes
-     */
-    private static final String ZZ_CMAP_PACKED =
-        "\11\5\1\3\1\16\1\0\1\3\1\10\16\5\4\0\1\3\1\0" +
-            "\1\21\1\0\1\4\2\0\1\17\2\0\1\7\1\15\1\37\1\41" +
-            "\1\13\1\6\1\11\7\1\2\1\1\40\6\0\4\2\1\14\1\2" +
-            "\21\4\1\12\2\4\1\35\1\20\1\36\1\0\1\4\1\0\1\27" +
-            "\3\2\1\25\1\26\5\4\1\30\1\4\1\32\3\4\1\23\1\31" +
-            "\1\22\1\24\2\4\1\12\2\4\1\33\1\0\1\34\1\0\41\5" +
-            "\2\0\4\4\4\0\1\4\2\0\1\5\7\0\1\4\4\0\1\4" +
-            "\5\0\27\4\1\0\37\4\1\0\u013f\4\31\0\162\4\4\0\14\4" +
-            "\16\0\5\4\11\0\1\4\21\0\130\5\5\0\23\5\12\0\1\4" +
-            "\13\0\1\4\1\0\3\4\1\0\1\4\1\0\24\4\1\0\54\4" +
-            "\1\0\46\4\1\0\5\4\4\0\202\4\1\0\4\5\3\0\105\4" +
-            "\1\0\46\4\2\0\2\4\6\0\20\4\41\0\46\4\2\0\1\4" +
-            "\7\0\47\4\11\0\21\5\1\0\27\5\1\0\3\5\1\0\1\5" +
-            "\1\0\2\5\1\0\1\5\13\0\33\4\5\0\3\4\15\0\4\5" +
-            "\14\0\6\5\13\0\32\4\5\0\13\4\16\5\7\0\12\5\4\0" +
-            "\2\4\1\5\143\4\1\0\1\4\10\5\1\0\6\5\2\4\2\5" +
-            "\1\0\4\5\2\4\12\5\3\4\2\0\1\4\17\0\1\5\1\4" +
-            "\1\5\36\4\33\5\2\0\3\4\60\0\46\4\13\5\1\4\u014f\0" +
-            "\3\5\66\4\2\0\1\5\1\4\20\5\2\0\1\4\4\5\3\0" +
-            "\12\4\2\5\2\0\12\5\21\0\3\5\1\0\10\4\2\0\2\4" +
-            "\2\0\26\4\1\0\7\4\1\0\1\4\3\0\4\4\2\0\1\5" +
-            "\1\4\7\5\2\0\2\5\2\0\3\5\11\0\1\5\4\0\2\4" +
-            "\1\0\3\4\2\5\2\0\12\5\4\4\15\0\3\5\1\0\6\4" +
-            "\4\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\2\4" +
-            "\1\0\2\4\2\0\1\5\1\0\5\5\4\0\2\5\2\0\3\5" +
-            "\13\0\4\4\1\0\1\4\7\0\14\5\3\4\14\0\3\5\1\0" +
-            "\11\4\1\0\3\4\1\0\26\4\1\0\7\4\1\0\2\4\1\0" +
-            "\5\4\2\0\1\5\1\4\10\5\1\0\3\5\1\0\3\5\2\0" +
-            "\1\4\17\0\2\4\2\5\2\0\12\5\1\0\1\4\17\0\3\5" +
-            "\1\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4" +
-            "\1\0\5\4\2\0\1\5\1\4\6\5\3\0\2\5\2\0\3\5" +
-            "\10\0\2\5\4\0\2\4\1\0\3\4\4\0\12\5\1\0\1\4" +
-            "\20\0\1\5\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0" +
-            "\2\4\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0" +
-            "\10\4\1\0\3\4\4\0\5\5\3\0\3\5\1\0\4\5\11\0" +
-            "\1\5\17\0\11\5\11\0\1\4\7\0\3\5\1\0\10\4\1\0" +
-            "\3\4\1\0\27\4\1\0\12\4\1\0\5\4\4\0\7\5\1\0" +
-            "\3\5\1\0\4\5\7\0\2\5\11\0\2\4\4\0\12\5\22\0" +
-            "\2\5\1\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4\1\0" +
-            "\5\4\2\0\1\5\1\4\7\5\1\0\3\5\1\0\4\5\7\0" +
-            "\2\5\7\0\1\4\1\0\2\4\4\0\12\5\22\0\2\5\1\0" +
-            "\10\4\1\0\3\4\1\0\27\4\1\0\20\4\4\0\6\5\2\0" +
-            "\3\5\1\0\4\5\11\0\1\5\10\0\2\4\4\0\12\5\22\0" +
-            "\2\5\1\0\22\4\3\0\30\4\1\0\11\4\1\0\1\4\2\0" +
-            "\7\4\3\0\1\5\4\0\6\5\1\0\1\5\1\0\10\5\22\0" +
-            "\2\5\15\0\60\4\1\5\2\4\7\5\4\0\10\4\10\5\1\0" +
-            "\12\5\47\0\2\4\1\0\1\4\2\0\2\4\1\0\1\4\2\0" +
-            "\1\4\6\0\4\4\1\0\7\4\1\0\3\4\1\0\1\4\1\0" +
-            "\1\4\2\0\2\4\1\0\4\4\1\5\2\4\6\5\1\0\2\5" +
-            "\1\4\2\0\5\4\1\0\1\4\1\0\6\5\2\0\12\5\2\0" +
-            "\2\4\42\0\1\4\27\0\2\5\6\0\12\5\13\0\1\5\1\0" +
-            "\1\5\1\0\1\5\4\0\2\5\10\4\1\0\42\4\6\0\24\5" +
-            "\1\0\2\5\4\4\4\0\10\5\1\0\44\5\11\0\1\5\71\0" +
-            "\42\4\1\0\5\4\1\0\2\4\1\0\7\5\3\0\4\5\6\0" +
-            "\12\5\6\0\6\4\4\5\106\0\46\4\12\0\51\4\7\0\132\4" +
-            "\5\0\104\4\5\0\122\4\6\0\7\4\1\0\77\4\1\0\1\4" +
-            "\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0\47\4" +
-            "\1\0\1\4\1\0\4\4\2\0\37\4\1\0\1\4\1\0\4\4" +
-            "\2\0\7\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\7\4" +
-            "\1\0\27\4\1\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4" +
-            "\1\0\47\4\1\0\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4" +
-            "\2\0\10\4\12\0\32\4\5\0\113\4\3\0\3\4\17\0\15\4" +
-            "\1\0\4\4\3\5\13\0\22\4\3\5\13\0\22\4\2\5\14\0" +
-            "\15\4\1\0\3\4\1\0\2\5\14\0\64\4\40\5\3\0\1\4" +
-            "\3\0\2\4\1\5\2\0\12\5\41\0\3\5\2\0\12\5\6\0" +
-            "\130\4\10\0\51\4\1\5\126\0\35\4\3\0\14\5\4\0\14\5" +
-            "\12\0\12\5\36\4\2\0\5\4\u038b\0\154\4\224\0\234\4\4\0" +
-            "\132\4\6\0\26\4\2\0\6\4\2\0\46\4\2\0\6\4\2\0" +
-            "\10\4\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4\2\0" +
-            "\65\4\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4\3\0" +
-            "\4\4\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4\17\0" +
-            "\4\5\32\0\5\5\20\0\2\4\23\0\1\4\13\0\4\5\6\0" +
-            "\6\5\1\0\1\4\15\0\1\4\40\0\22\4\36\0\15\5\4\0" +
-            "\1\5\3\0\6\5\27\0\1\4\4\0\1\4\2\0\12\4\1\0" +
-            "\1\4\3\0\5\4\6\0\1\4\1\0\1\4\1\0\1\4\1\0" +
-            "\4\4\1\0\3\4\1\0\7\4\3\0\3\4\5\0\5\4\26\0" +
-            "\44\4\u0e81\0\3\4\31\0\11\4\6\5\1\0\5\4\2\0\5\4" +
-            "\4\0\126\4\2\0\2\5\2\0\3\4\1\0\137\4\5\0\50\4" +
-            "\4\0\136\4\21\0\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4" +
-            "\132\0\u048d\4\u0773\0\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4" +
-            "\14\0\5\4\5\0\1\4\1\5\12\4\1\0\15\4\1\0\5\4" +
-            "\1\0\1\4\1\0\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4" +
-            "\22\0\100\4\2\0\66\4\50\0\15\4\3\0\20\5\20\0\4\5" +
-            "\17\0\2\4\30\0\3\4\31\0\1\4\6\0\5\4\1\0\207\4" +
-            "\2\0\1\5\4\0\1\4\13\0\12\5\7\0\32\4\4\0\1\4" +
-            "\1\0\32\4\12\0\132\4\3\0\6\4\2\0\6\4\2\0\6\4" +
-            "\2\0\3\4\3\0\2\4\3\0\2\4\22\0\3\5\4\0";
-
-    /**
-     * Translates characters to character classes
-     */
-    private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
-
-    /**
-     * Translates DFA states to action switch labels.
-     */
-    private static final int[] ZZ_ACTION = zzUnpackAction();
-
-    private static final String ZZ_ACTION_PACKED_0 =
-        "\1\0\1\1\1\2\1\3\1\4\1\1\1\2\1\1" +
-            "\1\5\1\6\3\3\1\7\1\10\1\11\1\12\1\13" +
-            "\1\14\1\15\2\2\1\16\1\17\1\2\2\5\2\6" +
-            "\3\3\1\2\1\17\2\5\2\6\3\3\1\0\1\20" +
-            "\1\3\1\21\1\17\1\22";
-
-    private static int[] zzUnpackAction() {
-        int[] result = new int[47];
-        int offset = 0;
-        offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-        return result;
-    }
-
-    private static int zzUnpackAction(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
-        int j = offset;  /* index in unpacked array */
-        int l = packed.length();
-        while (i < l) {
-            int count = packed.charAt(i++);
-            int value = packed.charAt(i++);
-            do {
-                result[j++] = value;
-            }
-            while (--count > 0);
-        }
-        return j;
-    }
-
-
-    /**
-     * Translates a state to a row index in the transition table
-     */
-    private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
-
-    private static final String ZZ_ROWMAP_PACKED_0 =
-        "\0\0\0\42\0\104\0\146\0\210\0\252\0\314\0\356" +
-            "\0\u0110\0\u0132\0\u0154\0\u0176\0\u0198\0\42\0\42\0\42" +
-            "\0\42\0\42\0\42\0\42\0\u01ba\0\u01dc\0\u01fe\0\u0220" +
-            "\0\u0242\0\42\0\u0264\0\u0286\0\42\0\u02a8\0\u02ca\0\u02ec" +
-            "\0\u030e\0\u0330\0\u0352\0\u0374\0\u0396\0\u03b8\0\u03da\0\u03fc" +
-            "\0\u041e\0\u0440\0\146\0\u0462\0\146\0\42\0\146";
-
-    private static int[] zzUnpackRowMap() {
-        int[] result = new int[47];
-        int offset = 0;
-        offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-        return result;
-    }
-
-    private static int zzUnpackRowMap(String packed, int offset, int[] result) {
-        int i = 0;  /* index in packed string  */
-        int j = offset;  /* index in unpacked array */
-        int l = packed.length();
-        while (i < l) {
-            int high = packed.charAt(i++) << 16;
-            result[j++] = high | packed.charAt(i++);
-        }
-        return j;
-    }
-
-    /**
-     * The transition table of the DFA
-     */
-    private static final int[] ZZ_TRANS = zzUnpackTrans();
-
-    private static final String ZZ_TRANS_PACKED_0 =
-        "\1\2\1\3\1\4\1\5\1\4\1\2\1\6\1\2" +
-            "\1\5\1\7\1\4\1\10\1\4\1\2\1\5\1\11" +
-            "\1\2\1\12\1\13\3\4\1\14\3\4\1\15\1\16" +
-            "\1\17\1\20\1\21\1\22\1\23\1\24\43\0\1\3" +
-            "\7\0\1\3\1\0\1\25\1\26\10\0\1\26\15\0" +
-            "\2\4\1\0\2\4\3\0\2\4\1\0\1\4\5\0" +
-            "\11\4\12\0\1\5\4\0\1\5\5\0\1\5\31\0" +
-            "\1\27\1\30\33\0\1\3\7\0\1\3\1\31\1\25" +
-            "\1\26\10\0\1\26\15\0\1\25\7\0\1\25\30\0" +
-            "\10\11\1\0\5\11\1\0\1\32\1\33\21\11\10\12" +
-            "\1\0\5\12\1\0\1\12\1\34\1\35\20\12\1\0" +
-            "\2\4\1\0\2\4\3\0\2\4\1\0\1\4\5\0" +
-            "\1\4\1\36\7\4\10\0\2\4\1\0\2\4\3\0" +
-            "\2\4\1\0\1\4\5\0\5\4\1\37\3\4\10\0" +
-            "\2\4\1\0\2\4\3\0\2\4\1\0\1\4\5\0" +
-            "\2\4\1\40\6\4\10\0\1\25\7\0\1\25\2\0" +
-            "\1\26\10\0\1\26\15\0\1\41\7\0\1\41\3\0" +
-            "\1\41\23\0\1\41\10\27\1\0\5\27\1\0\23\27" +
-            "\7\42\1\0\32\42\1\0\2\31\6\0\1\31\2\0" +
-            "\1\31\10\0\3\31\12\0\3\11\1\43\4\11\1\44" +
-            "\31\11\3\12\1\45\4\12\1\46\31\12\1\0\2\4" +
-            "\1\0\2\4\3\0\2\4\1\0\1\4\5\0\2\4" +
-            "\1\47\6\4\10\0\2\4\1\0\2\4\3\0\2\4" +
-            "\1\0\1\4\5\0\6\4\1\50\2\4\10\0\2\4" +
-            "\1\0\2\4\3\0\2\4\1\0\1\4\5\0\6\4" +
-            "\1\51\2\4\10\0\1\41\7\0\1\41\30\0\7\42" +
-            "\1\52\32\42\3\11\1\43\4\11\1\44\6\11\1\32" +
-            "\1\33\31\11\1\0\6\11\1\32\1\33\21\11\3\12" +
-            "\1\45\4\12\1\46\7\12\1\34\1\35\30\12\1\0" +
-            "\7\12\1\34\1\35\20\12\1\0\2\4\1\0\2\4" +
-            "\3\0\2\4\1\0\1\4\5\0\3\4\1\53\5\4" +
-            "\10\0\2\4\1\0\2\4\3\0\2\4\1\0\1\4" +
-            "\5\0\7\4\1\54\1\4\10\0\2\4\1\0\2\4" +
-            "\3\0\2\4\1\0\1\4\5\0\6\4\1\55\2\4" +
-            "\7\0\6\42\1\56\1\52\32\42\1\0\2\4\1\0" +
-            "\2\4\3\0\2\4\1\0\1\4\5\0\3\4\1\57" +
-            "\5\4\7\0";
-
-    private static int[] zzUnpackTrans() {
-        int[] result = new int[1156];
-        int offset = 0;
-        offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-        return result;
-    }
-
-    private static int zzUnpackTrans(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
-        int j = offset;  /* index in unpacked array */
-        int l = packed.length();
-        while (i < l) {
-            int count = packed.charAt(i++);
-            int value = packed.charAt(i++);
-            value--;
-            do {
-                result[j++] = value;
-            }
-            while (--count > 0);
-        }
-        return j;
-    }
-
-
-    /* error codes */
-    private static final int ZZ_UNKNOWN_ERROR = 0;
-    private static final int ZZ_NO_MATCH = 1;
-    private static final int ZZ_PUSHBACK_2BIG = 2;
-    private static final char[] EMPTY_BUFFER = new char[0];
-    private static final int YYEOF = -1;
-
-    /* error messages for the codes above */
-    private static final String ZZ_ERROR_MSG[] = {
-        "Unkown internal scanner error",
-        "Error: could not match input",
-        "Error: pushback value was too large"
-    };
-
-    /**
-     * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-     */
-    private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-    private static final String ZZ_ATTRIBUTE_PACKED_0 =
-        "\1\0\1\11\13\1\7\11\5\1\1\11\2\1\1\11" +
-            "\14\1\1\0\3\1\1\11\1\1";
-
-    private static int[] zzUnpackAttribute() {
-        int[] result = new int[47];
-        int offset = 0;
-        offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-        return result;
-    }
-
-    private static int zzUnpackAttribute(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
-        int j = offset;  /* index in unpacked array */
-        int l = packed.length();
-        while (i < l) {
-            int count = packed.charAt(i++);
-            int value = packed.charAt(i++);
-            do {
-                result[j++] = value;
-            }
-            while (--count > 0);
-        }
-        return j;
-    }
-
-    /** the current state of the DFA */
-    private int zzState;
-
-    /** the current lexical state */
-    private int zzLexicalState = YYINITIAL;
-
-    /** this buffer contains the current text to be matched and is
-        the source of the yytext() string */
-    private CharSequence zzBuffer = "";
-
-    /** the textposition at the last accepting state */
-    private int zzMarkedPos;
-
-    /** the textposition at the last state to be included in yytext */
-    private int zzPushbackPos;
-
-    /** the current text position in the buffer */
-    private int zzCurrentPos;
-
-    /** startRead marks the beginning of the yytext() string in the buffer */
-    private int zzStartRead;
-
-    /** endRead marks the last character in the buffer, that has been read
-        from input */
-    private int zzEndRead;
-
-    /**
-     * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-     */
-    private boolean zzAtBOL = true;
-
-    /** zzAtEOF == true <=> the scanner is at the EOF */
-    private boolean zzAtEOF;
-
-    private IElementType myTokenType;
-    private int myState;
-
-    /** denotes if the user-EOF-code has already been executed */
-    private boolean zzEOFDone;
-
-
-    /**
-     * Unpacks the compressed character translation table.
-     *
-     * @param packed the packed character translation table
-     * @return the unpacked character translation table
-     */
-    private static char[] zzUnpackCMap(String packed) {
-        char[] map = new char[0x10000];
-        int i = 0;  /* index in packed string  */
-        int j = 0;  /* index in unpacked array */
-        while (i < 1738) {
-            int count = packed.charAt(i++);
-            char value = packed.charAt(i++);
-            do {
-                map[j++] = value;
-            }
-            while (--count > 0);
-        }
-        return map;
-    }
-
-    @Override
-    public IElementType getTokenType() {
-        if (myTokenType == null) {
-           locateToken();
-        }
-        return myTokenType;
-    }
-
-    @Override
-    public final int getTokenStart() {
-        if (myTokenType == null) {
-            locateToken();
-        }
-        return zzStartRead;
-    }
-
-    @Override
-    public final int getTokenEnd() {
-        if (myTokenType == null) {
-            locateToken();
-        }
-        return getTokenStart() + yylength();
-    }
-
-    @Override
-    public void advance() {
-        if (myTokenType == null) {
-            locateToken();
-        }
-        myTokenType = null;
-    }
-
-    @Override
-    public int getState() {
-        if (myTokenType == null) {
-          locateToken();
-        }
-        return myState;
-    }
-
-    @Override
-    public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
-        reset(buffer, startOffset, endOffset, initialState);
-        myTokenType = null;
-    }
-
-    @Override
-    public CharSequence getBufferSequence() {
-        return zzBuffer;
-    }
-
-    @Override
-    public int getBufferEnd() {
-        return zzEndRead;
-    }
-
-    public void reset(CharSequence buffer, int start, int end, int initialState) {
-        zzBuffer = buffer;
-        zzCurrentPos = zzMarkedPos = zzStartRead = start;
-        zzPushbackPos = 0;
-        zzAtEOF = false;
-        zzAtBOL = true;
-        zzEndRead = end;
-        yybegin(initialState);
-        myTokenType = null;
-    }
-
-    private void locateToken() {
-        if (myTokenType != null) {
-            return;
-        }
-        try {
-            myState = yystate();
-            myTokenType = advanceImpl();
-        }
-        catch (java.io.IOException e) { /*Can't happen*/ }
-        catch (Error e) {
-            // add lexer class name to the error
-            Error error = new Error(getClass().getName() + ": " + e.getMessage());
-            error.setStackTrace(e.getStackTrace());
-            throw error;
-        }
-    }
-
-    /**
-     * Refills the input buffer.
-     *
-     * @return <code>false</code>, iff there was new input.
-     * @throws java.io.IOException if any I/O-Error occurs
-     */
-    private boolean zzRefill() throws java.io.IOException {
-        return true;
-    }
-
-
-    /**
-     * Returns the current lexical state.
-     */
-    public final int yystate() {
-        return zzLexicalState;
-    }
-
-
-    /**
-     * Enters a new lexical state
-     *
-     * @param newState the new lexical state
-     */
-    public final void yybegin(int newState) {
-        zzLexicalState = newState;
-    }
-
-
-    /**
-     * Returns the text matched by the current regular expression.
-     */
-    public final CharSequence yytext() {
-        return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-    }
-
-
-    /**
-     * Returns the character at position <tt>pos</tt> from the
-     * matched text.
-     *
-     * It is equivalent to yytext().charAt(pos), but faster
-     *
-     * @param pos the position of the character to fetch.
-     *            A value from 0 to yylength()-1.
-     *
-     * @return the character at position pos
-     */
-    public final char yycharat(int pos) {
-        return zzBuffer.charAt(zzStartRead + pos);
-    }
-
-
-    /**
-     * Returns the length of the matched text region.
-     */
-    public final int yylength() {
-        return zzMarkedPos - zzStartRead;
-    }
-
-
-    /**
-     * Reports an error that occured while scanning.
-     *
-     * In a wellformed scanner (no or only correct usage of
-     * yypushback(int) and a match-all fallback rule) this method
-     * will only be called with things that "Can't Possibly Happen".
-     * If this method is called, something is seriously wrong
-     * (e.g. a JFlex bug producing a faulty scanner etc.).
-     *
-     * Usual syntax/scanner level error handling should be done
-     * in error fallback rules.
-     *
-     * @param errorCode the code of the errormessage to display
-     */
-    private void zzScanError(int errorCode) {
-        String message;
-        try {
-            message = ZZ_ERROR_MSG[errorCode];
-        }
-        catch (ArrayIndexOutOfBoundsException e) {
-            message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-        }
-
-        throw new Error(message);
-    }
-
-
-    /**
-     * Pushes the specified amount of characters back into the input stream.
-     *
-     * They will be read again by then next call of the scanning method
-     *
-     * @param number the number of characters to be read again.
-     *               This number must not be greater than yylength()!
-     */
-    public void yypushback(int number) {
-        if (number > yylength()) {
-          zzScanError(ZZ_PUSHBACK_2BIG);
-        }
-
-        zzMarkedPos -= number;
-    }
-
-
-    /**
-     * Contains user EOF-code, which will be executed exactly once,
-     * when the end of file is reached
-     */
-    private void zzDoEOF() {
-        if (!zzEOFDone) {
-            zzEOFDone = true;
-
-        }
-    }
-
-
-    /**
-     * Resumes scanning until the next regular expression is matched,
-     * the end of input is encountered or an I/O-Error occurs.
-     *
-     * @return the next token
-     * @throws java.io.IOException if any I/O-Error occurs
-     */
-    public IElementType advanceImpl() throws java.io.IOException {
-        int zzInput;
-        int zzAction;
-
-        // cached fields:
-        int zzCurrentPosL;
-        int zzMarkedPosL;
-        int zzEndReadL = zzEndRead;
-        CharSequence zzBufferL = zzBuffer;
-        char[] zzCMapL = ZZ_CMAP;
-
-        int[] zzTransL = ZZ_TRANS;
-        int[] zzRowMapL = ZZ_ROWMAP;
-        int[] zzAttrL = ZZ_ATTRIBUTE;
-
-        while (true) {
-            zzMarkedPosL = zzMarkedPos;
-
-            zzAction = -1;
-
-            zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-
-            zzState = ZZ_LEXSTATE[zzLexicalState];
-
-
-            zzForAction: {
-                while (true) {
-                    if (zzCurrentPosL < zzEndReadL) {
-                        zzInput = zzBufferL.charAt(zzCurrentPosL++);
-                    }
-                    else if (zzAtEOF) {
-                        zzInput = YYEOF;
-                        break zzForAction;
-                    }
-                    else {
-                        // store back cached positions
-                        zzCurrentPos = zzCurrentPosL;
-                        zzMarkedPos = zzMarkedPosL;
-                        boolean eof = zzRefill();
-                        // get translated positions and possibly new buffer
-                        zzCurrentPosL = zzCurrentPos;
-                        zzMarkedPosL = zzMarkedPos;
-                        zzBufferL = zzBuffer;
-                        zzEndReadL = zzEndRead;
-                        if (eof) {
-                            zzInput = YYEOF;
-                            break zzForAction;
-                        }
-                        else {
-                            zzInput = zzBufferL.charAt(zzCurrentPosL++);
-                        }
-                    }
-                    int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]];
-                    if (zzNext == -1) {
-                        break zzForAction;
-                    }
-                    zzState = zzNext;
-
-                    int zzAttributes = zzAttrL[zzState];
-                    if ((zzAttributes & 1) == 1) {
-                        zzAction = zzState;
-                        zzMarkedPosL = zzCurrentPosL;
-                        if ((zzAttributes & 8) == 8) {
-                            break zzForAction;
-                        }
-                    }
-                }
-            }
-
-            // store back cached position
-            zzMarkedPos = zzMarkedPosL;
-
-            switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-                case 13: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.MINUS;
-                }
-                case 19:
-                    break;
-                case 7: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.LBRACE;
-                }
-                case 20:
-                    break;
-                case 6: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.STRING_LITERAL;
-                }
-                case 21:
-                    break;
-                case 9: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.LBRACKET;
-                }
-                case 22:
-                    break;
-                case 16: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.TRUE_KEYWORD;
-                }
-                case 23:
-                    break;
-                case 12: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.COLON;
-                }
-                case 24:
-                    break;
-                case 4: {
-                    return JSTokenTypes.WHITE_SPACE;
-                }
-                case 25:
-                    break;
-                case 17: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.NULL_KEYWORD;
-                }
-                case 26:
-                    break;
-                case 1: {
-                    return JSTokenTypes.BAD_CHARACTER;
-                }
-                case 27:
-                    break;
-                case 18: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.FALSE_KEYWORD;
-                }
-                case 28:
-                    break;
-                case 10: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.RBRACKET;
-                }
-                case 29:
-                    break;
-                case 15: {
-                    return JSTokenTypes.C_STYLE_COMMENT;
-                }
-                case 30:
-                    break;
-                case 3: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.IDENTIFIER;
-                }
-                case 31:
-                    break;
-                case 14: {
-                    return JSTokenTypes.END_OF_LINE_COMMENT;
-                }
-                case 32:
-                    break;
-                case 2: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.NUMERIC_LITERAL;
-                }
-                case 33:
-                    break;
-                case 8: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.RBRACE;
-                }
-                case 34:
-                    break;
-                case 11: {
-                    yybegin(YYINITIAL);
-                    return JSTokenTypes.COMMA;
-                }
-                case 35:
-                    break;
-                case 5: {
-                    return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL;
-                }
-                case 36:
-                    break;
-                default:
-                    if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-                        zzAtEOF = true;
-                        zzDoEOF();
-                        return null;
-                    }
-                    else {
-                        zzScanError(ZZ_NO_MATCH);
-                    }
-            }
-        }
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/json.flex b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/json.flex
deleted file mode 100644
index b53b99dc..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/lang/lexer/json.flex
+++ /dev/null
@@ -1,77 +0,0 @@
-package consulo.json.lang.lexer;
-
-import com.intellij.lexer.LexerBase;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.lang.javascript.JSTokenTypes;
-
-%%
-
-%public
-%class JsonLexer
-%extends LexerBase
-%unicode
-%function advanceImpl
-%type IElementType
-%eof{  return;
-%eof}
-
-DIGIT=[0-9]
-OCTAL_DIGIT=[0-7]
-HEX_DIGIT=[0-9A-Fa-f]
-WHITE_SPACE_CHAR=[\ \n\r\t\f]+
-
-IDENTIFIER=[:jletter:] [:jletterdigit:]*
-
-C_STYLE_COMMENT=("/*"[^"*"]{COMMENT_TAIL})|"/*"
-DOC_COMMENT="/*""*"+("/"|([^"/""*"]{COMMENT_TAIL}))?
-COMMENT_TAIL=([^"*"]*("*"+[^"*""/"])?)*("*"+"/")?
-END_OF_LINE_COMMENT="/""/"[^\r\n]*
-
-INTEGER_LITERAL={DECIMAL_INTEGER_LITERAL}|{HEX_INTEGER_LITERAL}
-DECIMAL_INTEGER_LITERAL=(0|([1-9]({DIGIT})*))
-HEX_INTEGER_LITERAL=0[Xx]({HEX_DIGIT})*
-
-FLOAT_LITERAL=({FLOATING_POINT_LITERAL1})|({FLOATING_POINT_LITERAL2})|({FLOATING_POINT_LITERAL3})|({FLOATING_POINT_LITERAL4})
-FLOATING_POINT_LITERAL1=({DIGIT})+"."({DIGIT})*({EXPONENT_PART})?
-FLOATING_POINT_LITERAL2="."({DIGIT})+({EXPONENT_PART})?
-FLOATING_POINT_LITERAL3=({DIGIT})+({EXPONENT_PART})
-FLOATING_POINT_LITERAL4=({DIGIT})+
-EXPONENT_PART=[Ee]["+""-"]?({DIGIT})*
-
-CRLF= [\ \t \f]* (\n | \r | \r\n)
-QUOTED_LITERAL="'"([^\\\'\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*("'"|\\)?
-DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
-ESCAPE_SEQUENCE=\\[^\r\n]
-
-DIGIT=[0-9]
-
-%%
-
-<YYINITIAL> {WHITE_SPACE_CHAR}   { return JSTokenTypes.WHITE_SPACE; }
-
-<YYINITIAL> {C_STYLE_COMMENT}     { return JSTokenTypes.C_STYLE_COMMENT; }
-<YYINITIAL> {END_OF_LINE_COMMENT} { return JSTokenTypes.END_OF_LINE_COMMENT; }
-
-<YYINITIAL> {INTEGER_LITERAL}     { yybegin(YYINITIAL); return JSTokenTypes.NUMERIC_LITERAL; }
-<YYINITIAL> {FLOAT_LITERAL}       { yybegin(YYINITIAL); return JSTokenTypes.NUMERIC_LITERAL; }
-
-<YYINITIAL> {QUOTED_LITERAL}      { return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL; }
-
-<YYINITIAL> {DOUBLE_QUOTED_LITERAL}      { yybegin(YYINITIAL); return JSTokenTypes.STRING_LITERAL; }
-
-<YYINITIAL> "true"                { yybegin(YYINITIAL); return JSTokenTypes.TRUE_KEYWORD; }
-<YYINITIAL> "false"               { yybegin(YYINITIAL); return JSTokenTypes.FALSE_KEYWORD; }
-<YYINITIAL> "null"                { yybegin(YYINITIAL); return JSTokenTypes.NULL_KEYWORD; }
-
-<YYINITIAL> {IDENTIFIER}          { yybegin(YYINITIAL);       return JSTokenTypes.IDENTIFIER; }
-
-<YYINITIAL> "{"                   { yybegin(YYINITIAL); return JSTokenTypes.LBRACE; }
-<YYINITIAL> "}"                   { yybegin(YYINITIAL); return JSTokenTypes.RBRACE; }
-<YYINITIAL> "["                   { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET; }
-<YYINITIAL> "]"                   { yybegin(YYINITIAL); return JSTokenTypes.RBRACKET; }
-<YYINITIAL> ","                   { yybegin(YYINITIAL); return JSTokenTypes.COMMA; }
-<YYINITIAL> ":"                   { yybegin(YYINITIAL); return JSTokenTypes.COLON; }
-<YYINITIAL> "-"                   { yybegin(YYINITIAL); return JSTokenTypes.MINUS; }
-
-
-<YYINITIAL> [^] {return JSTokenTypes.BAD_CHARACTER; }
\ No newline at end of file
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
deleted file mode 100644
index b0f64ff4..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ComponentScope;
-import consulo.annotation.component.ExtensionAPI;
-import consulo.component.extension.ExtensionPointName;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.language.psi.PsiFile;
-
-import jakarta.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-@ExtensionAPI(ComponentScope.APPLICATION)
-public interface JsonFileDescriptorProvider {
-    ExtensionPointName<JsonFileDescriptorProvider> EP_NAME = ExtensionPointName.create(JsonFileDescriptorProvider.class);
-
-    @RequiredReadAction
-    boolean isMyFile(@Nonnull PsiFile file);
-
-    @RequiredReadAction
-    void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file);
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
deleted file mode 100644
index 27206849..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/JsonFileDescriptorProviders.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.application.util.CachedValuesManager;
-import consulo.json.JsonFileType;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.language.psi.PsiFile;
-import consulo.application.util.CachedValueProvider;
-import consulo.language.psi.PsiModificationTracker;
-import jakarta.annotation.Nullable;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-public class JsonFileDescriptorProviders {
-    @Nullable
-    @RequiredReadAction
-    public static JsonObjectDescriptor getRootDescriptor(@Nullable final PsiFile file) {
-        if (file == null || file.getFileType() != JsonFileType.INSTANCE) {
-            return null;
-        }
-        return CachedValuesManager.getManager(file.getProject()).createCachedValue(
-            new CachedValueProvider<JsonObjectDescriptor>() {
-                @Nullable
-                @Override
-                @RequiredReadAction
-                public Result<JsonObjectDescriptor> compute() {
-                    for (JsonFileDescriptorProvider provider : JsonFileDescriptorProvider.EP_NAME.getExtensions()) {
-                        if (provider.isMyFile(file)) {
-                            JsonObjectDescriptor objectDescriptor = new JsonObjectDescriptor();
-                            provider.fillRootObject(objectDescriptor, file);
-
-                            return Result.create(objectDescriptor, file, PsiModificationTracker.MODIFICATION_COUNT);
-                        }
-                    }
-                    return null;
-                }
-            },
-            false
-        ).getValue();
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
deleted file mode 100644
index 65f1aed9..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/NativeArray.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation;
-
-import jakarta.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 25.11.2015
- */
-public class NativeArray {
-    private final Object myComponentType;
-
-    public NativeArray(@Nonnull Object componentType) {
-        myComponentType = componentType;
-    }
-
-    @Nonnull
-    public Object getComponentType() {
-        return myComponentType;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
deleted file mode 100644
index d1361234..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/completion/JsonCompletionContributor.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.completion;
-
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import com.intellij.lang.javascript.psi.JSProperty;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.application.AllIcons;
-import consulo.javascript.language.JavaScriptLanguage;
-import consulo.json.validation.JsonFileDescriptorProviders;
-import consulo.json.validation.NativeArray;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import consulo.json.validation.inspections.PropertyValidationInspection;
-import consulo.language.Language;
-import consulo.language.codeStyle.CodeStyleManager;
-import consulo.language.editor.completion.*;
-import consulo.language.editor.completion.lookup.InsertHandler;
-import consulo.language.editor.completion.lookup.InsertionContext;
-import consulo.language.editor.completion.lookup.LookupElement;
-import consulo.language.editor.completion.lookup.LookupElementBuilder;
-import consulo.language.pattern.StandardPatterns;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiFile;
-import consulo.language.util.ProcessingContext;
-import consulo.ui.image.Image;
-import consulo.util.collection.ContainerUtil;
-import consulo.util.lang.StringUtil;
-
-import jakarta.annotation.Nonnull;
-
-import java.util.*;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-@ExtensionImpl
-public class JsonCompletionContributor extends CompletionContributor {
-    public JsonCompletionContributor() {
-        extend(
-            CompletionType.BASIC,
-            StandardPatterns.psiElement(JSTokenTypes.IDENTIFIER),
-            new CompletionProvider() {
-                @RequiredReadAction
-                @Override
-                public void addCompletions(
-                    @Nonnull CompletionParameters parameters,
-                    ProcessingContext context,
-                    @Nonnull CompletionResultSet result
-                ) {
-                    addVariants(parameters, result, true);
-                }
-            }
-        );
-
-        extend(
-            CompletionType.BASIC,
-            StandardPatterns.psiElement(JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL),
-            new CompletionProvider() {
-                @RequiredReadAction
-                @Override
-                public void addCompletions(
-                    @Nonnull CompletionParameters parameters,
-                    ProcessingContext context,
-                    @Nonnull CompletionResultSet result
-                ) {
-                    PsiElement originalPosition = parameters.getOriginalPosition();
-                    if (originalPosition == null) {
-                        return;
-                    }
-                    if (!"\'\'".equals(originalPosition.getText())) {
-                        return;
-                    }
-                    addVariants(parameters, result, false);
-                }
-            }
-        );
-
-        extend(
-            CompletionType.BASIC,
-            StandardPatterns.psiElement(JSTokenTypes.STRING_LITERAL),
-            new CompletionProvider() {
-                @RequiredReadAction
-                @Override
-                public void addCompletions(
-                    @Nonnull CompletionParameters parameters,
-                    ProcessingContext context,
-                    @Nonnull CompletionResultSet result
-                ) {
-                    PsiElement originalPosition = parameters.getOriginalPosition();
-                    if (originalPosition == null) {
-                        return;
-                    }
-                    if (!"\"\"".equals(originalPosition.getText())) {
-                        return;
-                    }
-                    addVariants(parameters, result, false);
-                }
-            }
-        );
-    }
-
-    @RequiredReadAction
-    private static void addVariants(@Nonnull CompletionParameters parameters, @Nonnull CompletionResultSet result, boolean quotes) {
-        final PsiFile originalFile = parameters.getOriginalFile();
-
-        JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(originalFile);
-        if (rootDescriptor == null) {
-            return;
-        }
-
-        PsiElement position = parameters.getPosition();
-        PsiElement jsProperty = position.getParent();
-        if (!(jsProperty instanceof JSProperty)) {
-            return;
-        }
-
-        Collection<JSProperty> jsProperties = PropertyValidationInspection.buildPropertiesAsTree(position, rootDescriptor);
-        if (jsProperties.isEmpty()) {
-            return;
-        }
-
-        JsonObjectDescriptor parentObject = null;
-        JsonPropertyDescriptor currentProperty = null;
-        JsonObjectDescriptor currentObject = rootDescriptor;
-        for (JSProperty property : jsProperties) {
-            String name = property.getName();
-            if (name == null) {
-                return;
-            }
-
-            currentProperty = currentObject.getProperty(name);
-            if (currentProperty == null) {
-                if (property == jsProperty) {
-                    parentObject = currentObject;
-                    break;
-                }
-                else {
-                    return;
-                }
-            }
-            else if (currentProperty.getValue() instanceof JsonObjectDescriptor objectDescriptor) {
-                currentObject = objectDescriptor;
-            }
-            else if (currentProperty.getValue() instanceof NativeArray nativeArray) {
-                Object componentType = nativeArray.getComponentType();
-                if (componentType instanceof JsonObjectDescriptor objectDescriptor) {
-                    currentObject = objectDescriptor;
-                }
-                else {
-                    return;
-                }
-            }
-            else {
-                break;
-            }
-        }
-
-        if (parentObject == null) {
-            return;
-        }
-
-        Map<String, JsonPropertyDescriptor> properties = parentObject.getProperties();
-
-        Set<String> alreadyDefined = Collections.emptySet();
-        PsiElement parent = jsProperty.getParent();
-        if (parent instanceof JSObjectLiteralExpression objectLiteralExpression) {
-            JSProperty[] parentProperties = objectLiteralExpression.getProperties();
-            alreadyDefined = new HashSet<>(parentProperties.length);
-            for (JSProperty parentProperty : parentProperties) {
-                ContainerUtil.addIfNotNull(alreadyDefined, parentProperty.getName());
-            }
-        }
-
-        for (Map.Entry<String, JsonPropertyDescriptor> entry : properties.entrySet()) {
-            String key = entry.getKey();
-            if (key == null || alreadyDefined.contains(key)) {
-                continue;
-            }
-            LookupElementBuilder builder = LookupElementBuilder.create(quotes ? StringUtil.QUOTER.apply(key) : key);
-            builder = builder.withPresentableText(quotes ? StringUtil.QUOTER.apply(key) : key);
-            builder = builder.withIcon(AllIcons.Nodes.Property);
-            final JsonPropertyDescriptor value = entry.getValue();
-            if (value.isDeprecated()) {
-                builder = builder.strikeout();
-            }
-            final Object type = value.getValue();
-            builder = builder.withTypeText(formatValue(type), true);
-
-            if (quotes && ((JSProperty)jsProperty).getValue() == null) {
-                builder = builder.withInsertHandler(new InsertHandler<LookupElement>() {
-                    @Override
-                    public void handleInsert(InsertionContext context, LookupElement item) {
-                        if (type == Object.class) {
-                            context.getDocument().insertString(context.getTailOffset(), ": {\n}");
-                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset() - 2);
-
-                            context.commitDocument();
-                            CodeStyleManager.getInstance(context.getProject())
-                                .reformatRange(originalFile, context.getStartOffset(), context.getTailOffset());
-                        }
-                        else if (type == Boolean.class) {
-                            context.getDocument().insertString(context.getTailOffset(), ": false");
-                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset());
-                        }
-                        else if (type == String.class) {
-                            context.getDocument().insertString(context.getTailOffset(), ": \"\"");
-                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset() - 1);
-                        }
-                        else if (type == Number.class) {
-                            context.getDocument().insertString(context.getTailOffset(), ": 0");
-                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset());
-                        }
-                        else if (value.getValue() instanceof NativeArray) {
-                            context.getDocument().insertString(context.getTailOffset(), ": []");
-                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset() - 1);
-                        }
-                        else {
-                            context.getDocument().insertString(context.getTailOffset(), ": ");
-                            context.getEditor().getCaretModel().moveToOffset(context.getTailOffset());
-                        }
-                    }
-                });
-            }
-            result.addElement(builder);
-        }
-    }
-
-    private static String formatValue(Object value) {
-        if (value instanceof Class aClass) {
-            return StringUtil.decapitalize(aClass.getSimpleName());
-        }
-        else if (value instanceof NativeArray nativeArray) {
-            return formatValue(nativeArray.getComponentType()) + "[]";
-        }
-        // JsonObjectDescriptor
-        return "object";
-    }
-
-    @Nonnull
-    @Override
-    public Language getLanguage() {
-        return JavaScriptLanguage.INSTANCE;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
deleted file mode 100644
index fa4ccf2f..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementEditorNotification.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.descriptionByAnotherPsiElement;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.fileEditor.EditorNotificationBuilder;
-import consulo.fileEditor.EditorNotificationProvider;
-import consulo.fileEditor.EditorNotifications;
-import consulo.fileEditor.FileEditor;
-import consulo.json.JsonFileType;
-import consulo.json.jom.JomElement;
-import consulo.json.jom.JomFileElement;
-import consulo.json.jom.JomManager;
-import consulo.language.editor.DaemonCodeAnalyzer;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiFile;
-import consulo.language.psi.PsiManager;
-import consulo.language.psi.PsiModificationTracker;
-import consulo.localize.LocalizeValue;
-import consulo.project.Project;
-import consulo.util.lang.StringUtil;
-import consulo.virtualFileSystem.VirtualFile;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-import java.util.function.Supplier;
-
-/**
- * @author VISTALL
- * @since 12.11.2015
- */
-public class DescriptionByAnotherPsiElementEditorNotification<T extends PsiElement> implements EditorNotificationProvider {
-    private Project myProject;
-    private DescriptionByAnotherPsiElementProvider<T> myProvider;
-
-    public DescriptionByAnotherPsiElementEditorNotification(
-        @Nonnull Project project,
-        @Nonnull DescriptionByAnotherPsiElementProvider<T> provider
-    ) {
-        myProject = project;
-        myProvider = provider;
-    }
-
-    @Nonnull
-    @Override
-    public String getId() {
-        return myProvider.getId();
-    }
-
-    @Override
-    @Nullable
-    @RequiredReadAction
-    public EditorNotificationBuilder buildNotification(
-        @Nonnull VirtualFile file,
-        @Nonnull FileEditor fileEditor,
-        @Nonnull Supplier<EditorNotificationBuilder> supplier
-    ) {
-        if (file.getFileType() != JsonFileType.INSTANCE) {
-            return null;
-        }
-
-        PsiFile psiFile = PsiManager.getInstance(myProject).findFile(file);
-        if (psiFile == null) {
-            return null;
-        }
-
-        JomFileElement<JomElement> fileElement = JomManager.getInstance(myProject).getFileElement(psiFile);
-        if (fileElement != null) {
-            return null;
-        }
-
-        if (!myProvider.isAvailable(myProject)) {
-            return null;
-        }
-
-        String registeredPsiElementId = DescriptionByAnotherPsiElementService.getInstance(myProject).getRegisteredPsiElementId(file);
-        if (registeredPsiElementId == null) {
-            EditorNotificationBuilder panel = supplier.get();
-            panel.withText(LocalizeValue.localizeTODO(StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) + " model description is available for this file"));
-            panel.withAction(
-                LocalizeValue.localizeTODO("Choose " + myProvider.getPsiElementName()),
-                e -> {
-                    T chooseElement = myProvider.chooseElement(myProject);
-                    if (chooseElement == null) {
-                        return;
-                    }
-
-                    DescriptionByAnotherPsiElementService.getInstance(myProject).registerFile(file, chooseElement, myProvider);
-
-                    wantUpdate(psiFile);
-                }
-            );
-            return panel;
-        }
-        else {
-            EditorNotificationBuilder panel = supplier.get();
-            panel.withText(LocalizeValue.localizeTODO(
-                StringUtil.SINGLE_QUOTER.apply(myProvider.getId()) +
-                    " model description is registered for this file. " +
-                    myProvider.getPsiElementName() + ": " + registeredPsiElementId
-            ));
-            panel.withAction(
-                LocalizeValue.localizeTODO("Cancel"),
-                e -> {
-                    if(DescriptionByAnotherPsiElementService.getInstance(myProject).removeFile(file)) {
-                        wantUpdate(psiFile);
-                    }
-                }
-            );
-            return panel;
-        }
-    }
-
-    private void wantUpdate(PsiFile psiFile) {
-        PsiModificationTracker.getInstance(myProject).incCounter();
-
-        DaemonCodeAnalyzer.getInstance(myProject).restart(psiFile);
-
-        EditorNotifications.getInstance(psiFile.getProject()).updateNotifications(psiFile.getVirtualFile());
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
deleted file mode 100644
index 5eaea206..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementJsonDescriptionProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.descriptionByAnotherPsiElement;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.json.validation.JsonFileDescriptorProvider;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiFile;
-import consulo.language.psi.PsiUtilCore;
-import consulo.util.lang.Pair;
-import consulo.virtualFileSystem.VirtualFile;
-
-import jakarta.annotation.Nonnull;
-
-/**
- * @author VISTALL
- * @since 12.11.2015
- */
-@ExtensionImpl
-public class DescriptionByAnotherPsiElementJsonDescriptionProvider implements JsonFileDescriptorProvider {
-    @RequiredReadAction
-    @Override
-    public boolean isMyFile(@Nonnull PsiFile file) {
-        VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
-        if (virtualFile == null) {
-            return false;
-        }
-        return DescriptionByAnotherPsiElementService.getInstance(file.getProject()).getRegisteredPsiElementId(virtualFile) != null;
-    }
-
-    @RequiredReadAction
-    @Override
-    public void fillRootObject(@Nonnull JsonObjectDescriptor root, @Nonnull PsiFile file) {
-        VirtualFile virtualFile = PsiUtilCore.getVirtualFile(file);
-        if (virtualFile == null) {
-            return;
-        }
-
-        Pair<DescriptionByAnotherPsiElementProvider<PsiElement>, PsiElement> pair =
-            DescriptionByAnotherPsiElementService.getInstance(file.getProject()).getRegisteredPsiElementInfo(virtualFile);
-
-        PsiElement psiElement = pair.getSecond();
-        if (psiElement == null) {
-            return;
-        }
-
-        pair.getFirst().fillRootObject(psiElement, root);
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
deleted file mode 100644
index 7bf30d43..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.descriptionByAnotherPsiElement;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ComponentScope;
-import consulo.annotation.component.ExtensionAPI;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.language.psi.PsiElement;
-import consulo.project.Project;
-import consulo.ui.annotation.RequiredUIAccess;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-/**
- * @author VISTALL
- * @since 12.11.2015
- */
-@ExtensionAPI(ComponentScope.APPLICATION)
-public interface DescriptionByAnotherPsiElementProvider<T extends PsiElement> {
-    @Nonnull
-    String getId();
-
-    @Nonnull
-    String getPsiElementName();
-
-    @Nonnull
-    @RequiredReadAction
-    String getIdFromPsiElement(@Nonnull T element);
-
-    @Nullable
-    @RequiredReadAction
-    T getPsiElementById(@Nonnull String id, @Nonnull Project project);
-
-    @RequiredUIAccess
-    @Nullable
-    T chooseElement(@Nonnull Project project);
-
-    @RequiredReadAction
-    boolean isAvailable(@Nonnull Project project);
-
-    void fillRootObject(@Nonnull T psiElement, @Nonnull JsonObjectDescriptor root);
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
deleted file mode 100644
index 27a9818a..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementRegistrar.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.descriptionByAnotherPsiElement;
-
-import consulo.annotation.component.ExtensionImpl;
-import consulo.component.ComponentManager;
-import consulo.component.extension.ExtensionExtender;
-import consulo.component.extension.ExtensionPoint;
-import consulo.fileEditor.EditorNotificationProvider;
-import consulo.project.Project;
-
-import jakarta.annotation.Nonnull;
-
-import java.util.function.Consumer;
-
-/**
- * @author VISTALL
- * @since 12.11.2015
- */
-@ExtensionImpl
-@SuppressWarnings("unchecked")
-public class DescriptionByAnotherPsiElementRegistrar implements ExtensionExtender<EditorNotificationProvider> {
-    @Override
-    public void extend(@Nonnull ComponentManager componentManager, @Nonnull Consumer<EditorNotificationProvider> consumer) {
-        ExtensionPoint<DescriptionByAnotherPsiElementProvider> extensionPoint =
-            componentManager.getExtensionPoint(DescriptionByAnotherPsiElementProvider.class);
-        for (DescriptionByAnotherPsiElementProvider<?> provider : extensionPoint) {
-            consumer.accept(new DescriptionByAnotherPsiElementEditorNotification((Project)componentManager, provider));
-        }
-    }
-
-    @Nonnull
-    @Override
-    public Class<EditorNotificationProvider> getExtensionClass() {
-        return EditorNotificationProvider.class;
-    }
-
-    @Override
-    public boolean hasAnyExtensions(ComponentManager componentManager) {
-        return componentManager.getExtensionPoint(DescriptionByAnotherPsiElementProvider.class).hasAnyExtensions();
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
deleted file mode 100644
index b4cf1c2d..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptionByAnotherPsiElement/DescriptionByAnotherPsiElementService.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.descriptionByAnotherPsiElement;
-
-import consulo.annotation.component.ComponentScope;
-import consulo.annotation.component.ServiceAPI;
-import consulo.annotation.component.ServiceImpl;
-import consulo.application.ApplicationManager;
-import consulo.application.util.function.Computable;
-import consulo.component.persist.PersistentStateComponent;
-import consulo.component.persist.State;
-import consulo.component.persist.Storage;
-import consulo.component.persist.StoragePathMacros;
-import consulo.disposer.Disposable;
-import consulo.disposer.Disposer;
-import consulo.ide.ServiceManager;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.SmartPointerManager;
-import consulo.language.psi.SmartPsiElementPointer;
-import consulo.project.Project;
-import consulo.util.collection.ContainerUtil;
-import consulo.util.lang.Pair;
-import consulo.virtualFileSystem.VirtualFile;
-import consulo.virtualFileSystem.pointer.VirtualFilePointer;
-import consulo.virtualFileSystem.pointer.VirtualFilePointerManager;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import org.jdom.Element;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author VISTALL
- * @since 12.11.2015
- */
-@Singleton
-@State(name = "JSONDescriptionByAnotherPsiElementService", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
-@ServiceAPI(ComponentScope.PROJECT)
-@ServiceImpl
-public class DescriptionByAnotherPsiElementService implements PersistentStateComponent<Element>, Disposable {
-    private static class Info implements Disposable {
-        private final VirtualFilePointer myVirtualFilePointer;
-        private SmartPsiElementPointer<? extends PsiElement> myElementPointer;
-        private final DescriptionByAnotherPsiElementProvider myProvider;
-
-        private final String myId;
-        private String myPsiElementId;
-        private Project myProject;
-
-        public Info(
-            @Nonnull Project project,
-            @Nonnull VirtualFile virtualFile,
-            @Nonnull PsiElement element,
-            @Nonnull DescriptionByAnotherPsiElementProvider<?> provider
-        ) {
-            myProject = project;
-            myId = provider.getId();
-            myProvider = provider;
-            myVirtualFilePointer = VirtualFilePointerManager.getInstance().create(virtualFile, this, null);
-            myElementPointer = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
-        }
-
-        public Info(@Nonnull Project project, @Nonnull String url, @Nonnull String providerId, @Nonnull String psiElementId) {
-            myProject = project;
-            myVirtualFilePointer = VirtualFilePointerManager.getInstance().create(url, this, null);
-
-            myProvider = ContainerUtil.find(
-                ApplicationManager.getApplication().getExtensionList(DescriptionByAnotherPsiElementProvider.class),
-                it -> it.getId().equals(providerId)
-            );
-
-            myId = providerId;
-            myPsiElementId = psiElementId;
-        }
-
-        public void tryToInit() {
-            if (myProvider == null || myElementPointer != null) {
-                return;
-            }
-
-            ApplicationManager.getApplication().runReadAction(new Runnable() {
-                @Override
-                public void run() {
-                    PsiElement psiElementById = myProvider.getPsiElementById(myPsiElementId, myProject);
-                    if (psiElementById == null) {
-                        return;
-                    }
-                    myElementPointer = SmartPointerManager.getInstance(myProject).createSmartPsiElementPointer(psiElementById);
-                }
-            });
-        }
-
-        @Nonnull
-        public String getId() {
-            if (myId != null) {
-                return myId;
-            }
-            return myProvider.getId();
-        }
-
-        @Nonnull
-        public String getUrl() {
-            return myVirtualFilePointer.getUrl();
-        }
-
-        @Nullable
-        @SuppressWarnings("unchecked")
-        public String getPsiElementId() {
-            if (myPsiElementId != null) {
-                return myPsiElementId;
-            }
-
-            return ApplicationManager.getApplication().runReadAction(new Computable<String>() {
-                @Override
-                public String compute() {
-                    PsiElement element = myElementPointer.getElement();
-                    if (element == null) {
-                        return null;
-                    }
-                    return myProvider.getIdFromPsiElement(element);
-                }
-            });
-        }
-
-        @Nullable
-        public PsiElement getPsiElement() {
-            if (myElementPointer == null) {
-                if (myProvider == null) {
-                    return null;
-                }
-                return ApplicationManager.getApplication().runReadAction(new Computable<PsiElement>() {
-                    @Override
-                    public PsiElement compute() {
-                        PsiElement element = myElementPointer == null ? null : myElementPointer.getElement();
-                        if (element == null) {
-                            return null;
-                        }
-                        return myProvider.getPsiElementById(myPsiElementId, myProject);
-                    }
-                });
-            }
-            else {
-                return myElementPointer.getElement();
-            }
-        }
-
-        @Override
-        public void dispose() {
-        }
-    }
-
-    @Nonnull
-    public static DescriptionByAnotherPsiElementService getInstance(@Nonnull Project project) {
-        return ServiceManager.getService(project, DescriptionByAnotherPsiElementService.class);
-    }
-
-    private final Project myProject;
-    private final List<Info> myRegisteredFiles = new ArrayList<>();
-
-    @Inject
-    public DescriptionByAnotherPsiElementService(Project project) {
-        myProject = project;
-    }
-
-    public <T extends PsiElement> void registerFile(
-        @Nonnull VirtualFile virtualFile,
-        @Nonnull T element,
-        @Nonnull DescriptionByAnotherPsiElementProvider<?> provider
-    ) {
-        Info info = new Info(myProject, virtualFile, element, provider);
-        Disposer.register(this, info);
-        myRegisteredFiles.add(info);
-    }
-
-
-    public boolean removeFile(@Nonnull VirtualFile file) {
-        Iterator<Info> iterator = myRegisteredFiles.iterator();
-        while (iterator.hasNext()) {
-            Info info = iterator.next();
-            if (file.equals(info.myVirtualFilePointer.getFile())) {
-                iterator.remove();
-                Disposer.dispose(info);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Nullable
-    public String getRegisteredPsiElementId(@Nonnull VirtualFile virtualFile) {
-        for (Info registeredFile : myRegisteredFiles) {
-            VirtualFile file = registeredFile.myVirtualFilePointer.getFile();
-            if (virtualFile.equals(file)) {
-                return registeredFile.getPsiElementId();
-            }
-        }
-        return null;
-    }
-
-    @Nonnull
-    @SuppressWarnings("unchecked")
-    public <T extends PsiElement> Pair<DescriptionByAnotherPsiElementProvider<T>, T> getRegisteredPsiElementInfo(
-        @Nonnull VirtualFile virtualFile
-    ) {
-        for (Info info : myRegisteredFiles) {
-            VirtualFile file = info.myVirtualFilePointer.getFile();
-            if (virtualFile.equals(file)) {
-                PsiElement psiElement = info.getPsiElement();
-                if (psiElement == null) {
-                    return Pair.empty();
-                }
-                return new Pair.NonNull(info.myProvider, psiElement);
-            }
-        }
-        return Pair.empty();
-    }
-
-    @Nullable
-    @Override
-    public Element getState() {
-        Element stateElement = new Element("state");
-        for (Info registeredFile : myRegisteredFiles) {
-            String psiElementId = registeredFile.getPsiElementId();
-            if (psiElementId == null) {
-                continue;
-            }
-
-            Element fileElement = new Element("file");
-            fileElement.setAttribute("id", registeredFile.getId());
-            fileElement.setAttribute("url", registeredFile.getUrl());
-            fileElement.setAttribute("psiElementId", psiElementId);
-            stateElement.addContent(fileElement);
-        }
-        return stateElement;
-    }
-
-    @Override
-    public void loadState(Element state) {
-        if (!myRegisteredFiles.isEmpty()) {
-            for (Info registeredFile : myRegisteredFiles) {
-                Disposer.dispose(registeredFile);
-            }
-            myRegisteredFiles.clear();
-        }
-
-        for (Element element : state.getChildren("file")) {
-            String id = element.getAttributeValue("id");
-            String url = element.getAttributeValue("url");
-            String psiElementId = element.getAttributeValue("psiElementId");
-
-            final Info info = new Info(myProject, url, id, psiElementId);
-            ApplicationManager.getApplication().runReadAction(new Runnable() {
-                @Override
-                public void run() {
-                    info.tryToInit();
-                }
-            });
-            Disposer.register(this, info);
-            myRegisteredFiles.add(info);
-        }
-    }
-
-    @Override
-    public void dispose() {
-        myRegisteredFiles.clear();
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
deleted file mode 100644
index 039b7c0c..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonObjectDescriptor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.descriptor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-import consulo.json.validation.NativeArray;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-public class JsonObjectDescriptor {
-    private Map<String, JsonPropertyDescriptor> myProperties = new HashMap<>();
-
-    @Nonnull
-    public JsonPropertyDescriptor addProperty(@Nullable String propertyName, @Nonnull Class<?> value) {
-        if (value == Object.class) {
-            throw new IllegalArgumentException("We cant add object type, use JsonObjectDescriptor as parameter");
-        }
-
-        return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
-    }
-
-    @Nonnull
-    public JsonPropertyDescriptor addProperty(@Nullable String propertyName, @Nonnull JsonObjectDescriptor value) {
-        return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
-    }
-
-    @Nonnull
-    public JsonPropertyDescriptor addProperty(@Nullable String propertyName, @Nonnull NativeArray value) {
-        return myProperties.computeIfAbsent(propertyName, p -> new JsonPropertyDescriptor(p, value));
-    }
-
-    @Nullable
-    public JsonPropertyDescriptor getProperty(@Nonnull String propertyName) {
-        JsonPropertyDescriptor propertyDescriptor = myProperties.get(propertyName);
-        if (propertyDescriptor != null) {
-            return propertyDescriptor;
-        }
-
-        return myProperties.get(null);
-    }
-
-    public Map<String, JsonPropertyDescriptor> getProperties() {
-        return myProperties;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
deleted file mode 100644
index f7c1fa0f..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/descriptor/JsonPropertyDescriptor.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.descriptor;
-
-import consulo.language.psi.SmartPointerManager;
-import consulo.annotation.UsedInPlugin;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.SmartPsiElementPointer;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-/**
- * @author VISTALL
- * @since 10.11.2015
- */
-public class JsonPropertyDescriptor {
-    private SmartPsiElementPointer<?> myNavigationElement;
-
-    private String myName;
-    private Object myValue;
-    private boolean myDeprecated;
-    private boolean myNullable = true;
-
-    public JsonPropertyDescriptor(@Nullable String name, @Nonnull Object value) {
-        myName = name;
-        myValue = value;
-    }
-
-    public boolean isNullable() {
-        return myNullable;
-    }
-
-    public boolean isDeprecated() {
-        return myDeprecated;
-    }
-
-    @Nonnull
-    public JsonPropertyDescriptor deprecated() {
-        myDeprecated = true;
-        return this;
-    }
-
-    @Nonnull
-    public JsonPropertyDescriptor notNull() {
-        myNullable = false;
-        return this;
-    }
-
-    @Nonnull
-    public Object getValue() {
-        return myValue;
-    }
-
-    @Nullable
-    public String getName() {
-        return myName;
-    }
-
-    @UsedInPlugin
-    public void setNavigationElement(@Nonnull PsiElement element) {
-        myNavigationElement = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
-    }
-
-    @Nullable
-    public PsiElement getNavigationElement() {
-        return myNavigationElement == null ? null : myNavigationElement.getElement();
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
deleted file mode 100644
index 09833881..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/inspections/PropertyValidationInspection.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-package consulo.json.validation.inspections;
-
-import com.intellij.lang.javascript.JSTokenTypes;
-import com.intellij.lang.javascript.psi.*;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.application.util.CachedValueProvider;
-import consulo.application.util.CachedValuesManager;
-import consulo.javascript.lang.JavaScriptTokenSets;
-import consulo.javascript.psi.JSSimpleLiteralExpression;
-import consulo.json.validation.JsonFileDescriptorProviders;
-import consulo.json.validation.NativeArray;
-import consulo.json.validation.descriptor.JsonObjectDescriptor;
-import consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import consulo.language.ast.IElementType;
-import consulo.language.editor.inspection.LocalInspectionTool;
-import consulo.language.editor.inspection.ProblemHighlightType;
-import consulo.language.editor.inspection.ProblemsHolder;
-import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiElementVisitor;
-import consulo.language.psi.PsiModificationTracker;
-import consulo.language.psi.PsiUtilCore;
-import consulo.language.psi.util.PsiTreeUtil;
-import consulo.localize.LocalizeValue;
-import consulo.util.collection.ContainerUtil;
-import consulo.util.lang.StringUtil;
-import consulo.util.lang.function.PairProcessor;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-import java.util.*;
-
-/**
- * @author VISTALL
- * @since 2015-11-10
- */
-@ExtensionImpl
-public class PropertyValidationInspection extends LocalInspectionTool {
-    @Nonnull
-    @Override
-    public PsiElementVisitor buildVisitor(@Nonnull final ProblemsHolder holder, boolean isOnTheFly) {
-        return new JSElementVisitor() {
-            @Override
-            @RequiredReadAction
-            public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
-                validateValue(node, holder);
-            }
-
-            @Override
-            @RequiredReadAction
-            public void visitJSPrefixExpression(JSPrefixExpression expression) {
-                validateValue(expression, holder);
-            }
-
-            @Override
-            @RequiredReadAction
-            public void visitJSObjectLiteralExpression(JSObjectLiteralExpression node) {
-                validateValue(node, holder);
-            }
-
-            @Override
-            @RequiredReadAction
-            public void visitJSArrayLiteralExpression(JSArrayLiteralExpression node) {
-                validateValue(node, holder);
-            }
-
-            @Override
-            @RequiredReadAction
-            public void visitJSProperty(JSProperty node) {
-                JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(node.getContainingFile());
-                if (rootDescriptor == null) {
-                    return;
-                }
-
-                Collection<JSProperty> jsProperties = buildPropertiesAsTree(node, rootDescriptor);
-                if (jsProperties.isEmpty()) {
-                    return;
-                }
-
-                JsonObjectDescriptor currentObject = rootDescriptor;
-                for (JSProperty property : jsProperties) {
-                    String name = property.getName();
-                    if (name == null) {
-                        return;
-                    }
-
-                    JsonPropertyDescriptor propertyDescriptor = currentObject.getProperty(name);
-                    if (propertyDescriptor == null) {
-                        if (node == property) {
-                            PsiElement nameIdentifier = node.getNameIdentifier();
-                            assert nameIdentifier != null;
-
-                            holder.registerProblem(nameIdentifier, "Undefined property", ProblemHighlightType.ERROR);
-                        }
-                        return;
-                    }
-                    else if (propertyDescriptor.getValue() instanceof JsonObjectDescriptor) {
-                        currentObject = (JsonObjectDescriptor)propertyDescriptor.getValue();
-                    }
-                    else {
-                        return;
-                    }
-                }
-            }
-        };
-    }
-
-    @RequiredReadAction
-    public static Collection<JSProperty> buildPropertiesAsTree(PsiElement element, @Nullable JsonObjectDescriptor objectDescriptor) {
-        JsonObjectDescriptor rootDescriptor =
-            objectDescriptor == null ? JsonFileDescriptorProviders.getRootDescriptor(element.getContainingFile()) : objectDescriptor;
-        if (rootDescriptor == null) {
-            return Collections.emptyList();
-        }
-
-        final Deque<JSProperty> queue = new ArrayDeque<>();
-        PsiTreeUtil.treeWalkUp(element, null, new PairProcessor<PsiElement, PsiElement>() {
-            @Override
-            public boolean process(PsiElement element, PsiElement element2) {
-                if (element instanceof JSProperty) {
-                    queue.addFirst((JSProperty)element);
-                }
-                return true;
-            }
-        });
-        return queue;
-    }
-
-    @Nullable
-    @RequiredReadAction
-    private static Object getTypeOfExpression(@Nonnull PsiElement node) {
-        if (node instanceof JSLiteralExpression) {
-            PsiElement firstChild = node.getFirstChild();
-            IElementType elementType = PsiUtilCore.getElementType(firstChild);
-            if (elementType == null) {
-                return null;
-            }
-
-            Class<?> propertyType = null;
-            if (elementType == JSTokenTypes.NUMERIC_LITERAL) {
-                propertyType = Number.class;
-            }
-            else if (JavaScriptTokenSets.STRING_LITERALS.contains(elementType)) {
-                propertyType = String.class;
-            }
-            else if (elementType == JSTokenTypes.NULL_KEYWORD) {
-                propertyType = Void.class;
-            }
-            else if (elementType == JSTokenTypes.TRUE_KEYWORD || elementType == JSTokenTypes.FALSE_KEYWORD) {
-                propertyType = Boolean.class;
-            }
-
-            if (propertyType == null) {
-                return null;
-            }
-            return propertyType;
-        }
-        else if (node instanceof JSPrefixExpression) {
-            return Number.class;
-        }
-        else if (node instanceof JSObjectLiteralExpression) {
-            return Object.class;
-        }
-        else if (node instanceof JSArrayLiteralExpression) {
-            Set<Object> types = new HashSet<>();
-            JSExpression[] expressions = ((JSArrayLiteralExpression)node).getExpressions();
-            for (JSExpression expression : expressions) {
-                if (expression == null) {
-                    continue;
-                }
-
-                Object typeOfExpression = getTypeOfExpression(expression);
-                ContainerUtil.addIfNotNull(types, typeOfExpression);
-            }
-
-            int size = types.size();
-            switch (size) {
-                case 0:
-                    return null;
-                case 1:
-                    Object firstItem = ContainerUtil.getFirstItem(types);
-                    assert firstItem != null;
-                    return new NativeArray(firstItem);
-                default:
-                    return new NativeArray(Object.class);
-            }
-        }
-        return null;
-    }
-
-    @Nullable
-    @RequiredReadAction
-    public static JsonPropertyDescriptor findPropertyDescriptor(@Nonnull final JSProperty jsProperty) {
-        return CachedValuesManager.getManager(jsProperty.getProject()).createCachedValue(new CachedValueProvider<JsonPropertyDescriptor>() {
-            @Nullable
-            @Override
-            @RequiredReadAction
-            public Result<JsonPropertyDescriptor> compute() {
-                return Result.create(
-                    findPropertyDescriptorImpl(jsProperty),
-                    jsProperty,
-                    PsiModificationTracker.MODIFICATION_COUNT
-                );
-            }
-        }, false).getValue();
-    }
-
-    @Nullable
-    @RequiredReadAction
-    private static JsonPropertyDescriptor findPropertyDescriptorImpl(@Nonnull JSProperty jsProperty) {
-        JsonObjectDescriptor rootDescriptor = JsonFileDescriptorProviders.getRootDescriptor(jsProperty.getContainingFile());
-        if (rootDescriptor == null) {
-            return null;
-        }
-
-        Collection<JSProperty> jsProperties = buildPropertiesAsTree(jsProperty, rootDescriptor);
-        if (jsProperties.isEmpty()) {
-            return null;
-        }
-
-        JsonPropertyDescriptor currentProperty = null;
-        JsonObjectDescriptor currentObject = rootDescriptor;
-        for (JSProperty property : jsProperties) {
-            String name = property.getName();
-            if (name == null) {
-                return null;
-            }
-
-            currentProperty = currentObject.getProperty(name);
-            if (currentProperty == null) {
-                return null;
-            }
-
-            Object value = currentProperty.getValue();
-            if (value instanceof JsonObjectDescriptor objectDescriptor) {
-                currentObject = objectDescriptor;
-            }
-            else if (value instanceof NativeArray nativeArray) {
-                Object componentType = nativeArray.getComponentType();
-                if (componentType instanceof JsonObjectDescriptor objectDescriptor) {
-                    currentObject = objectDescriptor;
-                }
-            }
-            else {
-                break;
-            }
-        }
-
-        return currentProperty;
-    }
-
-    @RequiredReadAction
-    private static void validateValue(@Nonnull PsiElement value, @Nonnull ProblemsHolder holder) {
-        Object actualType = getTypeOfExpression(value);
-        if (actualType == null) {
-            return;
-        }
-        PsiElement parent = value.getParent();
-        if (!(parent instanceof JSProperty)) {
-            return;
-        }
-
-        JsonPropertyDescriptor currentProperty = findPropertyDescriptor((JSProperty)parent);
-        if (currentProperty == null) {
-            return;
-        }
-
-        Object expectedValue = currentProperty.getValue();
-        if (!isInheritable(currentProperty, expectedValue, actualType)) {
-            holder.registerProblem(
-                value,
-                "Wrong property value. Expected: " + getSimpleName(expectedValue) +
-                    ", actual: " + getSimpleName(actualType),
-                ProblemHighlightType.GENERIC_ERROR
-            );
-        }
-
-        if (currentProperty.isDeprecated()) {
-            PsiElement nameIdentifier = ((JSProperty)parent).getNameIdentifier();
-            assert nameIdentifier != null;
-            holder.registerProblem(nameIdentifier, "Deprecated property", ProblemHighlightType.LIKE_DEPRECATED);
-        }
-    }
-
-    public static boolean isInheritable(JsonPropertyDescriptor currentProperty, Object expected, Object actual) {
-        // null value
-        if (currentProperty.isNullable() && actual == Void.class) {
-            return true;
-        }
-
-        if (expected instanceof Class && actual instanceof Class) {
-            return expected == actual;
-        }
-
-        if (expected instanceof JsonObjectDescriptor && actual == Object.class) {
-            return true;
-        }
-
-        if (expected instanceof NativeArray expectedArray && actual instanceof NativeArray actualArray) {
-            return isInheritable(currentProperty, expectedArray.getComponentType(), actualArray.getComponentType());
-        }
-        return false;
-    }
-
-    @Nonnull
-    private static String getSimpleName(Object o) {
-        if (o instanceof Class aClass) {
-            if (o == Void.class) {
-                return "null";
-            }
-            return StringUtil.decapitalize(aClass.getSimpleName());
-        }
-        else if (o instanceof JsonObjectDescriptor) {
-            return getSimpleName(Object.class);
-        }
-        else if (o instanceof NativeArray nativeArray) {
-            return getSimpleName(nativeArray.getComponentType()) + "[]";
-        }
-        return "null";
-    }
-
-    @Nonnull
-    @Override
-    public LocalizeValue[] getGroupPath() {
-        return new LocalizeValue[]{LocalizeValue.localizeTODO("JSON")};
-    }
-
-    @Nonnull
-    @Override
-    public LocalizeValue getGroupDisplayName() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Nonnull
-    @Override
-    public LocalizeValue getDisplayName() {
-        return LocalizeValue.localizeTODO("Property validation");
-    }
-
-    @Nonnull
-    @Override
-    public HighlightDisplayLevel getDefaultLevel() {
-        return HighlightDisplayLevel.ERROR;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
deleted file mode 100644
index 563b5008..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReference.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.psi.reference;
-
-import consulo.annotation.access.RequiredReadAction;
-import consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import consulo.json.validation.inspections.PropertyValidationInspection;
-import com.intellij.lang.javascript.psi.JSProperty;
-import com.intellij.lang.javascript.psi.impl.reference.JSPropertyNameReference;
-import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nullable;
-
-/**
- * @author VISTALL
- * @since 02.12.2015
- */
-public class JsonPropertyNameReference extends JSPropertyNameReference {
-    private JsonPropertyDescriptor myPropertyDescriptor;
-
-    public JsonPropertyNameReference(JSProperty property, PsiElement nameIdentifier, JsonPropertyDescriptor propertyDescriptor) {
-        super(property, nameIdentifier);
-        myPropertyDescriptor = propertyDescriptor;
-    }
-
-    @Nullable
-    @Override
-    @RequiredReadAction
-    public PsiElement resolve() {
-        PsiElement navigationElement = myPropertyDescriptor.getNavigationElement();
-        if (navigationElement != null) {
-            return navigationElement;
-        }
-        return super.resolve();
-    }
-
-    @RequiredReadAction
-    @Override
-    public boolean isReferenceTo(PsiElement element) {
-        if (element instanceof JSProperty property) {
-            JsonPropertyDescriptor propertyDescriptor = PropertyValidationInspection.findPropertyDescriptor(property);
-            return myPropertyDescriptor == propertyDescriptor;
-        }
-        else if (element == myPropertyDescriptor.getNavigationElement()) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java b/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
deleted file mode 100644
index d834d8f5..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/consulo/json/validation/psi/reference/JsonPropertyNameReferenceProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.json.validation.psi.reference;
-
-import com.intellij.lang.javascript.psi.JSProperty;
-import consulo.annotation.access.RequiredReadAction;
-import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.psi.impl.reference.JSPropertyNameReferenceProvider;
-import consulo.json.validation.descriptor.JsonPropertyDescriptor;
-import consulo.json.validation.inspections.PropertyValidationInspection;
-import consulo.language.psi.PsiElement;
-import consulo.language.psi.PsiReference;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-/**
- * @author VISTALL
- * @since 02.12.2015
- */
-@ExtensionImpl(order = "before default")
-public class JsonPropertyNameReferenceProvider implements JSPropertyNameReferenceProvider {
-    @RequiredReadAction
-    @Nullable
-    @Override
-    public PsiReference getReference(@Nonnull JSProperty property) {
-        JsonPropertyDescriptor propertyDescriptor = PropertyValidationInspection.findPropertyDescriptor(property);
-        if (propertyDescriptor == null) {
-            return null;
-        }
-
-        PsiElement nameIdentifier = property.getNameIdentifier();
-        assert nameIdentifier != null;
-        return new JsonPropertyNameReference(property, nameIdentifier, propertyDescriptor);
-    }
-}
diff --git a/lang-version-impl/json-javascript-impl/src/main/java/module-info.java b/lang-version-impl/json-javascript-impl/src/main/java/module-info.java
deleted file mode 100644
index e04aa4a5..00000000
--- a/lang-version-impl/json-javascript-impl/src/main/java/module-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author VISTALL
- * @since 29-Aug-22
- */
-module consulo.javascript.json.javascript.impl {
-    // TODO remove in future
-    requires java.desktop;
-
-    requires consulo.javascript.base.impl;
-
-    exports consulo.json;
-    exports consulo.json.jom;
-    exports consulo.json.jom.proxy;
-    exports consulo.json.jom.proxy.impl;
-    exports consulo.json.lang;
-    exports consulo.json.lang.lexer;
-    exports consulo.json.validation;
-    exports consulo.json.validation.completion;
-    exports consulo.json.validation.descriptionByAnotherPsiElement;
-    exports consulo.json.validation.descriptor;
-    exports consulo.json.validation.inspections;
-    exports consulo.json.validation.psi.reference;
-}
\ No newline at end of file
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 4f94d8df..50f609bc 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -15,182 +15,176 @@
   - limitations under the License.
   -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>consulo-plugin</packaging>
-
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.dev/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>consulo.maven</groupId>
-				<artifactId>maven-consulo-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<repositoryChannel>nightly</repositoryChannel>
-					<dependencies>
-						<dependency>com.intellij.xml</dependency>
-						<dependency>com.intellij.regexp</dependency>
-					</dependencies>
-					<packaging>
-						<skip>${dev.mode}</skip>
-						<version>${build.number}</version>
-					</packaging>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>workspace</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-base.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-base.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-web.browser.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-actionscript.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-ecmascript4.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-ecmascript.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-javascript16.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-javascript17.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-javascript18.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-json.javascript.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-typescript.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-inspections</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-intentions</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.googlecode.json-simple</groupId>
-			<artifactId>json-simple</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-debugger.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-v8.debugger.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-regexp.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>consulo.internal</groupId>
-			<artifactId>lib.org.chromium.sdk</artifactId>
-			<version>1.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>consulo.internal</groupId>
-			<artifactId>forms_rt</artifactId>
-			<scope>provided</scope>
-			<optional>true</optional>
-		</dependency>
-		
-		<!--provided-->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.ide-api-provided</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>consulo-plugin</packaging>
+
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>interval:60</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>consulo.maven</groupId>
+                <artifactId>maven-consulo-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <repositoryChannel>nightly</repositoryChannel>
+                    <dependencies>
+                        <dependency>com.intellij.xml</dependency>
+                        <dependency>com.intellij.regexp</dependency>
+                    </dependencies>
+                    <packaging>
+                        <skip>${dev.mode}</skip>
+                        <version>${build.number}</version>
+                    </packaging>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>workspace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-web.browser.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-actionscript.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-ecmascript4.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-ecmascript.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-javascript16.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-javascript17.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-javascript18.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-typescript.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-inspections</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-intentions</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-debugger.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-v8.debugger.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-regexp.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>consulo.internal</groupId>
+            <artifactId>lib.org.chromium.sdk</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>consulo.internal</groupId>
+            <artifactId>forms_rt</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <!--provided-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 67f38dcf..ae29a9e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,50 +15,49 @@
   - limitations under the License.
   -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.managment</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.managment</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.dev/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>interval:60</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript.parent</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript.parent</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<modules>
-		<module>base-api</module>
-		<module>base-impl</module>
-		<module>inspections</module>
-		<module>intentions
-		</module>
-		<module>web-browser-impl</module>
-		<module>debugger/debugger-impl</module>
-		<module>debugger/v8-debugger-impl</module>
-		<module>lang-version-impl/javascript16-impl</module>
-		<module>lang-version-impl/javascript17-impl</module>
-		<module>lang-version-impl/javascript18-impl</module>
-		<module>lang-version-impl/typescript-impl</module>
-		<module>lang-version-impl/actionscript-impl</module>
-		<module>lang-version-impl/ecmascript4-impl</module>
-		<module>lang-version-impl/ecmascript-impl</module>
-		<module>lang-version-impl/json-javascript-impl</module>
-		<module>regexp-impl</module>
-		<module>plugin</module>
-	</modules>
+    <modules>
+        <module>base-api</module>
+        <module>base-impl</module>
+        <module>inspections</module>
+        <module>intentions
+        </module>
+        <module>web-browser-impl</module>
+        <module>debugger/debugger-impl</module>
+        <module>debugger/v8-debugger-impl</module>
+        <module>lang-version-impl/javascript16-impl</module>
+        <module>lang-version-impl/javascript17-impl</module>
+        <module>lang-version-impl/javascript18-impl</module>
+        <module>lang-version-impl/typescript-impl</module>
+        <module>lang-version-impl/actionscript-impl</module>
+        <module>lang-version-impl/ecmascript4-impl</module>
+        <module>lang-version-impl/ecmascript-impl</module>
+        <module>regexp-impl</module>
+        <module>plugin</module>
+    </modules>
 </project>
\ No newline at end of file

From 46b13f7e705c582fb7498ee7ffe2354255a2b8d2 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 12 Feb 2026 14:19:36 +0200
Subject: [PATCH 308/340] fix bundle api

---
 .../module/sdk/ClientJavaScriptSdkType.java    | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index 60a95978..e7add553 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -7,8 +7,7 @@
 import consulo.content.base.SourcesOrderRootType;
 import consulo.content.bundle.SdkType;
 import consulo.javascript.icon.JavaScriptIconGroup;
-import consulo.ui.image.Image;
-
+import consulo.localize.LocalizeValue;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -24,7 +23,7 @@ public static ClientJavaScriptSdkType getInstance() {
     }
 
     public ClientJavaScriptSdkType() {
-        super("CLIENT_JAVASCRIPT_SDK_TYPE");
+        super("CLIENT_JAVASCRIPT_SDK_TYPE", LocalizeValue.localizeTODO("Client JavaScript"), JavaScriptIconGroup.javascriptmodule());
     }
 
     @Override
@@ -37,12 +36,6 @@ public boolean isRootTypeApplicable(OrderRootType type) {
         return type == BinariesOrderRootType.getInstance() || type == SourcesOrderRootType.getInstance();
     }
 
-    @Nonnull
-    @Override
-    public Image getIcon() {
-        return JavaScriptIconGroup.javascriptmodule();
-    }
-
     @Override
     public boolean isValidSdkHome(String path) {
         return false;
@@ -54,14 +47,9 @@ public String getVersionString(String sdkHome) {
         return "1";
     }
 
+    @Nonnull
     @Override
     public String suggestSdkName(String currentSdkName, String sdkHome) {
         return currentSdkName;
     }
-
-    @Nonnull
-    @Override
-    public String getPresentableName() {
-        return "Client JavaScript";
-    }
 }

From 64e2163ee1bf2a7d561336e3d78975ffff17042d Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Feb 2026 19:29:01 +0200
Subject: [PATCH 309/340] cdt debugger - initial

---
 debugger/browser-debugger-impl/pom.xml        |  94 +++---
 .../browser/BrowserDebuggerProcess.java       |  36 +++
 .../browser/ChromeDevToolsFactory.java        |  46 +++
 .../JavaScriptBrowserConfiguration.java       | 168 ++++++-----
 .../JavaScriptBrowserConfigurationEditor.java |  64 +++--
 .../JavaScriptBrowserConfigurationType.java   |  51 ++--
 .../browser/JavaScriptBrowserDebugRunner.java |  58 ++--
 .../browser/ProxyWebSocketService.java        |  54 ++++
 .../debugger/browser/SessionHolder.java       | 103 +++++++
 .../browser/process/CDTBreakpointInfo.java    |  36 +++
 .../browser/process/CDTExecutionStack.java    |  39 +++
 .../debugger/browser/process/CDTProcess.java  | 272 ++++++++++++++++++
 .../browser/process/CDTRemoteObjectValue.java |  87 ++++++
 .../browser/process/CDTScopeValue.java        |  26 ++
 .../debugger/browser/process/CDTScript.java   |  27 ++
 .../browser/process/CDTScriptHolder.java      |  28 ++
 .../browser/process/CDTStackFrame.java        |  83 ++++++
 .../browser/process/CDTSuspendContext.java    |  29 ++
 .../transport/AttachDebuggerResponse.java     |  14 +
 .../transport/DebuggerCommandRequest.java     |  13 +
 .../transport/DetachDebuggerRequest.java      |  14 +
 .../transport/ExtensionWebSocketAccepter.java | 136 +++++++--
 .../browser/transport/InitResponse.java       |  17 ++
 .../src/main/java/module-info.java            |  16 ++
 .../debugger/JavaScriptListPanel.java         | 131 ++++-----
 plugin/pom.xml                                |  35 +++
 pom.xml                                       |   1 +
 27 files changed, 1406 insertions(+), 272 deletions(-)
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ChromeDevToolsFactory.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ProxyWebSocketService.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/SessionHolder.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTBreakpointInfo.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTExecutionStack.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTRemoteObjectValue.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScopeValue.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScript.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScriptHolder.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTStackFrame.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTSuspendContext.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/AttachDebuggerResponse.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/DebuggerCommandRequest.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/DetachDebuggerRequest.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/InitResponse.java
 create mode 100644 debugger/browser-debugger-impl/src/main/java/module-info.java

diff --git a/debugger/browser-debugger-impl/pom.xml b/debugger/browser-debugger-impl/pom.xml
index e036b09c..32040926 100644
--- a/debugger/browser-debugger-impl/pom.xml
+++ b/debugger/browser-debugger-impl/pom.xml
@@ -15,43 +15,67 @@
   - limitations under the License.
   -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-provided</artifactId>
-		<version>2-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.ide-api-provided</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-browser.debugger.impl</artifactId>
-	<version>2-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript-browser.debugger.impl</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.io/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>interval:60</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-base.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-debugger.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.kklisura.cdt</groupId>
+            <artifactId>cdt-java-client</artifactId>
+            <version>2.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java
new file mode 100644
index 00000000..6ac3c935
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java
@@ -0,0 +1,36 @@
+package consulo.javascript.debugger.browser;
+
+import consulo.builtinWebServer.webSocket.WebSocketConnection;
+import consulo.execution.debug.DefaultDebugProcessHandler;
+import consulo.javascript.debugger.browser.process.CDTProcess;
+import consulo.javascript.debugger.browser.transport.DetachDebuggerRequest;
+import consulo.javascript.debugger.browser.transport.ExtensionWebSocketAccepter;
+import jakarta.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class BrowserDebuggerProcess extends DefaultDebugProcessHandler {
+    private final SessionHolder.BrowserSession myBrowserSession;
+
+    public BrowserDebuggerProcess(@Nonnull SessionHolder.BrowserSession browserSession) {
+        myBrowserSession = browserSession;
+    }
+
+    public void setDebugProcess(CDTProcess cdtProcess) {
+        myBrowserSession.setDebugProcess(cdtProcess);
+    }
+
+    @Override
+    protected void destroyProcessImpl() {
+        super.destroyProcessImpl();
+
+        WebSocketConnection connection = myBrowserSession.getWebSocketConnection();
+        if (connection != null) {
+            connection.send(ExtensionWebSocketAccepter.GSON.toJson(new DetachDebuggerRequest(myBrowserSession.getTabId())));
+        }
+
+        myBrowserSession.close();
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ChromeDevToolsFactory.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ChromeDevToolsFactory.java
new file mode 100644
index 00000000..687efbfb
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ChromeDevToolsFactory.java
@@ -0,0 +1,46 @@
+package consulo.javascript.debugger.browser;
+
+import com.github.kklisura.cdt.services.WebSocketService;
+import com.github.kklisura.cdt.services.config.ChromeDevToolsServiceConfiguration;
+import com.github.kklisura.cdt.services.impl.ChromeDevToolsServiceImpl;
+import com.github.kklisura.cdt.services.invocation.CommandInvocationHandler;
+import com.github.kklisura.cdt.services.utils.ProxyUtils;
+import consulo.proxy.advanced.AdvancedProxyBuilder;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class ChromeDevToolsFactory {
+    public static ChromeDevToolsServiceImpl create(SessionHolder.BrowserSession browserSession) {
+        ChromeDevToolsServiceConfiguration conf = new ChromeDevToolsServiceConfiguration();
+
+        WebSocketService webSocketService = new ProxyWebSocketService(browserSession);
+
+        // Create invocation handler
+        CommandInvocationHandler commandInvocationHandler = new CommandInvocationHandler();
+
+        // Setup command cache for this session
+        Map<Method, Object> commandsCache = new ConcurrentHashMap<>();
+
+        ChromeDevToolsServiceImpl service = AdvancedProxyBuilder.create(ChromeDevToolsServiceImpl.class)
+            .withSuperConstructorArguments(webSocketService, conf)
+            .withInvocationHandler((proxy, method, args) -> {
+                return commandsCache.computeIfAbsent(
+                    method,
+                    key -> {
+                        Class<?> returnType = method.getReturnType();
+                        return ProxyUtils.createProxy(returnType, commandInvocationHandler);
+                    });
+            })
+            .build();
+
+        commandInvocationHandler.setChromeDevToolsService(service);
+
+        return service;
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java
index d6259d8c..154737be 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java
@@ -1,29 +1,32 @@
 package consulo.javascript.debugger.browser;
 
-import com.intellij.compiler.options.CompileStepBeforeRun;
-import com.intellij.execution.DefaultExecutionResult;
-import com.intellij.execution.ExecutionException;
-import com.intellij.execution.ExecutionResult;
-import com.intellij.execution.Executor;
-import com.intellij.execution.configurations.*;
-import com.intellij.execution.filters.TextConsoleBuilder;
-import com.intellij.execution.filters.TextConsoleBuilderFactory;
-import com.intellij.execution.runners.ExecutionEnvironment;
-import com.intellij.execution.runners.ProgramRunner;
-import com.intellij.execution.runners.RunConfigurationWithSuppressedDefaultRunAction;
-import com.intellij.execution.ui.ConsoleView;
-import com.intellij.ide.browsers.BrowserFamily;
-import com.intellij.ide.browsers.BrowserLauncher;
-import com.intellij.ide.browsers.WebBrowser;
-import com.intellij.ide.browsers.WebBrowserManager;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleManager;
-import com.intellij.openapi.options.SettingsEditor;
-import com.intellij.xdebugger.DefaultDebugProcessHandler;
 import consulo.annotation.access.RequiredReadAction;
+import consulo.application.Application;
+import consulo.compiler.execution.CompileStepBeforeRun;
+import consulo.execution.DefaultExecutionResult;
+import consulo.execution.ExecutionResult;
+import consulo.execution.configuration.*;
+import consulo.execution.configuration.ui.SettingsEditor;
+import consulo.execution.executor.Executor;
+import consulo.execution.runner.ExecutionEnvironment;
+import consulo.execution.runner.ProgramRunner;
+import consulo.execution.ui.console.ConsoleView;
+import consulo.execution.ui.console.TextConsoleBuilder;
+import consulo.execution.ui.console.TextConsoleBuilderFactory;
+import consulo.module.Module;
+import consulo.module.ModuleManager;
+import consulo.process.ExecutionException;
+import consulo.util.lang.StringUtil;
+import consulo.util.xml.serializer.InvalidDataException;
+import consulo.util.xml.serializer.WriteExternalException;
+import consulo.util.xml.serializer.XmlSerializer;
+import consulo.webBrowser.BrowserLauncher;
+import consulo.webBrowser.WebBrowser;
+import consulo.webBrowser.WebBrowserManager;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import org.jdom.Element;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -31,58 +34,71 @@
  * @author VISTALL
  * @since 2020-06-15
  */
-public class JavaScriptBrowserConfiguration extends ModuleBasedConfiguration<RunConfigurationModule> implements RunConfigurationWithSuppressedDefaultRunAction, CompileStepBeforeRun.Suppressor
-{
-	public JavaScriptBrowserConfiguration(String name, RunConfigurationModule configurationModule, ConfigurationFactory factory)
-	{
-		super(name, configurationModule, factory);
-	}
-
-	public JavaScriptBrowserConfiguration(RunConfigurationModule configurationModule, ConfigurationFactory factory)
-	{
-		super(configurationModule, factory);
-	}
-
-	@Override
-	@RequiredReadAction
-	public Collection<Module> getValidModules()
-	{
-		ModuleManager manager = ModuleManager.getInstance(getProject());
-		return Arrays.asList(manager.getModules());
-	}
-
-	@Nonnull
-	@Override
-	public SettingsEditor<? extends RunConfiguration> getConfigurationEditor()
-	{
-		return new JavaScriptBrowserConfigurationEditor();
-	}
-
-	@Nullable
-	@Override
-	public RunProfileState getState(@Nonnull Executor executor, @Nonnull ExecutionEnvironment environment) throws ExecutionException
-	{
-		return new RunProfileState()
-		{
-			@Nullable
-			@Override
-			public ExecutionResult execute(Executor executor, @Nonnull ProgramRunner programRunner) throws ExecutionException
-			{
-				TextConsoleBuilder builder = TextConsoleBuilderFactory.getInstance().createBuilder(environment.getProject());
-
-				ConsoleView console = builder.getConsole();
-
-				WebBrowser browser = WebBrowserManager.getInstance().getFirstBrowserOrNull(BrowserFamily.CHROME);
-
-				if(browser == null)
-				{
-					throw new ExecutionException("Can't find Chrome browser");
-				}
-
-				BrowserLauncher.getInstance().browse("http://localhost", browser, environment.getProject());
-
-				return new DefaultExecutionResult(console, new DefaultDebugProcessHandler());
-			}
-		};
-	}
+public class JavaScriptBrowserConfiguration extends ModuleBasedConfiguration<RunConfigurationModule> implements RunConfigurationWithSuppressedDefaultRunAction, CompileStepBeforeRun.Suppressor {
+    public String URL = "http://localhost";
+
+    public JavaScriptBrowserConfiguration(String name, RunConfigurationModule configurationModule, ConfigurationFactory factory) {
+        super(name, configurationModule, factory);
+    }
+
+    public JavaScriptBrowserConfiguration(RunConfigurationModule configurationModule, ConfigurationFactory factory) {
+        super(configurationModule, factory);
+    }
+
+    @Override
+    public void readExternal(Element element) throws InvalidDataException {
+        super.readExternal(element);
+        XmlSerializer.deserializeInto(this, element);
+    }
+
+    @Override
+    public void writeExternal(Element element) throws WriteExternalException {
+        super.writeExternal(element);
+        XmlSerializer.serializeInto(this, element);
+    }
+
+    @Override
+    @RequiredReadAction
+    public Collection<Module> getValidModules() {
+        ModuleManager manager = ModuleManager.getInstance(getProject());
+        return Arrays.asList(manager.getModules());
+    }
+
+    @Nonnull
+    @Override
+    public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
+        return new JavaScriptBrowserConfigurationEditor();
+    }
+
+    @Nullable
+    @Override
+    public RunProfileState getState(@Nonnull Executor executor, @Nonnull ExecutionEnvironment environment) throws ExecutionException {
+        return new RunProfileState() {
+            @Override
+            public ExecutionResult execute(Executor executor, @Nonnull ProgramRunner programRunner) throws ExecutionException {
+                TextConsoleBuilder builder = TextConsoleBuilderFactory.getInstance().createBuilder(environment.getProject());
+
+                ConsoleView console = builder.getConsole();
+
+                WebBrowserManager manager = WebBrowserManager.getInstance();
+                WebBrowser webBrowser = manager.getFirstActiveBrowser();
+
+                if (webBrowser == null) {
+                    throw new ExecutionException("Can't find Chrome browser");
+                }
+
+                if (StringUtil.isEmpty(URL)) {
+                    throw new ExecutionException("URL is empty");
+                }
+
+                BrowserLauncher.getInstance().browse(URL, webBrowser, environment.getProject());
+
+                SessionHolder holder = Application.get().getInstance(SessionHolder.class);
+
+                SessionHolder.BrowserSession browserSession = holder.prepareSession(URL);
+
+                return new DefaultExecutionResult(console, new BrowserDebuggerProcess(browserSession));
+            }
+        };
+    }
 }
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java
index 6128fc69..2e4f9779 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java
@@ -1,37 +1,49 @@
 package consulo.javascript.debugger.browser;
 
-import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.options.SettingsEditor;
+import consulo.configurable.ConfigurationException;
+import consulo.execution.configuration.ui.SettingsEditor;
+import consulo.localize.LocalizeValue;
 import consulo.ui.Component;
-import consulo.ui.Label;
+import consulo.ui.TextBox;
 import consulo.ui.annotation.RequiredUIAccess;
-import consulo.ui.layout.VerticalLayout;
+import consulo.ui.util.FormBuilder;
+import jakarta.annotation.Nullable;
 
-import javax.annotation.Nullable;
+import java.util.Objects;
 
 /**
  * @author VISTALL
  * @since 2020-06-15
  */
-public class JavaScriptBrowserConfigurationEditor extends SettingsEditor<JavaScriptBrowserConfiguration>
-{
-	@Nullable
-	@Override
-	@RequiredUIAccess
-	protected Component createUIComponent()
-	{
-		return VerticalLayout.create().add(Label.create("test"));
-	}
-
-	@Override
-	protected void resetEditorFrom(JavaScriptBrowserConfiguration javaScriptBrowserConfiguration)
-	{
-
-	}
-
-	@Override
-	protected void applyEditorTo(JavaScriptBrowserConfiguration javaScriptBrowserConfiguration) throws ConfigurationException
-	{
-
-	}
+public class JavaScriptBrowserConfigurationEditor extends SettingsEditor<JavaScriptBrowserConfiguration> {
+    private TextBox myUrlBox;
+
+    private FormBuilder myFormBuilder = FormBuilder.create();
+
+    private Component myRoot;
+
+    public JavaScriptBrowserConfigurationEditor() {
+        myUrlBox = TextBox.create();
+
+        myFormBuilder.addLabeled(LocalizeValue.localizeTODO("URL:"), myUrlBox);
+
+        myRoot = myFormBuilder.build();
+    }
+
+    @Nullable
+    @Override
+    @RequiredUIAccess
+    protected Component createUIComponent() {
+        return myRoot;
+    }
+
+    @Override
+    protected void resetEditorFrom(JavaScriptBrowserConfiguration javaScriptBrowserConfiguration) {
+        myUrlBox.setValue(Objects.requireNonNullElse(javaScriptBrowserConfiguration.URL, ""));
+    }
+
+    @Override
+    protected void applyEditorTo(JavaScriptBrowserConfiguration javaScriptBrowserConfiguration) throws ConfigurationException {
+        javaScriptBrowserConfiguration.URL = myUrlBox.getValue();
+    }
 }
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java
index 33d66b6b..fb726895 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java
@@ -1,39 +1,36 @@
 package consulo.javascript.debugger.browser;
 
-import com.intellij.execution.configurations.ConfigurationFactory;
-import com.intellij.execution.configurations.ConfigurationTypeBase;
-import com.intellij.execution.configurations.RunConfiguration;
-import com.intellij.execution.configurations.RunConfigurationModule;
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.project.Project;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.application.AllIcons;
+import consulo.execution.configuration.ConfigurationFactory;
+import consulo.execution.configuration.ConfigurationTypeBase;
+import consulo.execution.configuration.RunConfiguration;
+import consulo.execution.configuration.RunConfigurationModule;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.localize.LocalizeValue;
 import consulo.module.extension.ModuleExtensionHelper;
-
-import javax.annotation.Nonnull;
+import consulo.project.Project;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2020-06-15
  */
-public class JavaScriptBrowserConfigurationType extends ConfigurationTypeBase
-{
-	public JavaScriptBrowserConfigurationType()
-	{
-		super("JavaScriptBrowserConfigurationType", "JavaScript Debug", "", AllIcons.RunConfigurations.Web_app);
+@ExtensionImpl
+public class JavaScriptBrowserConfigurationType extends ConfigurationTypeBase {
+    public JavaScriptBrowserConfigurationType() {
+        super("JavaScriptBrowserConfigurationType", LocalizeValue.localizeTODO("JavaScript Debug"), AllIcons.RunConfigurations.Web_app);
 
-		addFactory(new ConfigurationFactory(this)
-		{
-			@Override
-			public RunConfiguration createTemplateConfiguration(Project project)
-			{
-				return new JavaScriptBrowserConfiguration(new RunConfigurationModule(project), this);
-			}
+        addFactory(new ConfigurationFactory(this) {
+            @Override
+            public RunConfiguration createTemplateConfiguration(Project project) {
+                return new JavaScriptBrowserConfiguration(new RunConfigurationModule(project), this);
+            }
 
-			@Override
-			public boolean isApplicable(@Nonnull Project project)
-			{
-				return ModuleExtensionHelper.getInstance(project).hasModuleExtension(JavaScriptModuleExtension.class);
-			}
-		});
-	}
+            @Override
+            public boolean isApplicable(@Nonnull Project project) {
+                return ModuleExtensionHelper.getInstance(project).hasModuleExtension(JavaScriptModuleExtension.class);
+            }
+        });
+    }
 }
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
index 6f51fcfc..360c0886 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
@@ -1,27 +1,49 @@
 package consulo.javascript.debugger.browser;
 
-import com.intellij.execution.configurations.RunProfile;
-import com.intellij.execution.executors.DefaultDebugExecutor;
-import com.intellij.execution.runners.DefaultProgramRunner;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.execution.ExecutionResult;
+import consulo.execution.configuration.RunProfile;
+import consulo.execution.configuration.RunProfileState;
+import consulo.execution.debug.DefaultDebugExecutor;
+import consulo.execution.debug.XDebuggerManager;
+import consulo.execution.runner.DefaultProgramRunner;
+import consulo.execution.runner.ExecutionEnvironment;
+import consulo.execution.ui.RunContentDescriptor;
+import consulo.javascript.debugger.browser.process.CDTProcess;
+import consulo.process.ExecutionException;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
+import java.util.Objects;
 
 /**
  * @author VISTALL
  * @since 2020-06-15
  */
-public class JavaScriptBrowserDebugRunner extends DefaultProgramRunner
-{
-	@Nonnull
-	@Override
-	public String getRunnerId()
-	{
-		return "browser-javascript-debug";
-	}
-
-	@Override
-	public boolean canRun(@Nonnull String executorId, @Nonnull RunProfile runProfile)
-	{
-		return  executorId.equals(DefaultDebugExecutor.EXECUTOR_ID) && runProfile instanceof JavaScriptBrowserConfiguration;
-	}
+@ExtensionImpl
+public class JavaScriptBrowserDebugRunner extends DefaultProgramRunner {
+    @Nonnull
+    @Override
+    public String getRunnerId() {
+        return "browser-javascript-debug";
+    }
+
+    @Override
+    protected RunContentDescriptor doExecute(@Nonnull RunProfileState state, @Nonnull ExecutionEnvironment env) throws ExecutionException {
+        return XDebuggerManager.getInstance(env.getProject()).startSession(env, xDebugSession -> {
+            ExecutionResult result = Objects.requireNonNull(state.execute(env.getExecutor(), env.getRunner()));
+
+            BrowserDebuggerProcess processHandler = (BrowserDebuggerProcess) result.getProcessHandler();
+
+            CDTProcess process = new CDTProcess(xDebugSession, result);
+
+            processHandler.setDebugProcess(process);
+            
+            return process;
+        }).getRunContentDescriptor();
+    }
+
+    @Override
+    public boolean canRun(@Nonnull String executorId, @Nonnull RunProfile runProfile) {
+        return executorId.equals(DefaultDebugExecutor.EXECUTOR_ID) && runProfile instanceof JavaScriptBrowserConfiguration;
+    }
 }
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ProxyWebSocketService.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ProxyWebSocketService.java
new file mode 100644
index 00000000..90b0b17f
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ProxyWebSocketService.java
@@ -0,0 +1,54 @@
+package consulo.javascript.debugger.browser;
+
+import com.github.kklisura.cdt.services.WebSocketService;
+import com.github.kklisura.cdt.services.exceptions.WebSocketServiceException;
+import consulo.builtinWebServer.webSocket.WebSocketConnection;
+import consulo.javascript.debugger.browser.transport.DebuggerCommandRequest;
+import consulo.javascript.debugger.browser.transport.ExtensionWebSocketAccepter;
+
+import java.net.URI;
+import java.util.function.Consumer;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class ProxyWebSocketService implements WebSocketService {
+    private final SessionHolder.BrowserSession myBrowserSession;
+
+    public ProxyWebSocketService(SessionHolder.BrowserSession browserSession) {
+        myBrowserSession = browserSession;
+    }
+
+    @Override
+    public void connect(URI uri) throws WebSocketServiceException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void send(String message) throws WebSocketServiceException {
+        WebSocketConnection connection = myBrowserSession.getWebSocketConnection();
+
+        DebuggerCommandRequest request = new DebuggerCommandRequest();
+        request.tabId = myBrowserSession.getTabId();
+        request.command = ExtensionWebSocketAccepter.GSON.fromJson(message, Object.class);
+
+        String json = ExtensionWebSocketAccepter.GSON.toJson(request);
+
+        connection.send(json);
+    }
+
+    @Override
+    public void addMessageHandler(Consumer<String> consumer) throws WebSocketServiceException {
+        myBrowserSession.addHandler(consumer);
+    }
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public boolean closed() {
+        return false;
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/SessionHolder.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/SessionHolder.java
new file mode 100644
index 00000000..3a5950df
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/SessionHolder.java
@@ -0,0 +1,103 @@
+package consulo.javascript.debugger.browser;
+
+import consulo.annotation.component.ComponentScope;
+import consulo.annotation.component.ServiceAPI;
+import consulo.annotation.component.ServiceImpl;
+import consulo.builtinWebServer.webSocket.WebSocketConnection;
+import consulo.javascript.debugger.browser.process.CDTProcess;
+import consulo.util.collection.Lists;
+import consulo.util.collection.SmartList;
+import jakarta.inject.Singleton;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+@Singleton
+@ServiceAPI(ComponentScope.APPLICATION)
+@ServiceImpl
+public class SessionHolder {
+    public class BrowserSession {
+        private final String myUrl;
+
+        private int myTabId;
+
+        private WebSocketConnection myWebSocketConnection;
+
+        private CDTProcess myDebugProcess;
+
+        private List<Consumer<String>> myHandlers = new SmartList<>();
+
+        public BrowserSession(String url) {
+            myUrl = url;
+        }
+
+        public int getTabId() {
+            return myTabId;
+        }
+
+        public void addHandler(Consumer<String> consumer) {
+            myHandlers.add(consumer);
+        }
+
+        public void fireHandlers(String message) {
+            for (Consumer<String> handler : myHandlers) {
+                handler.accept(message);
+            }
+        }
+
+        public void close() {
+            myBrowserSessions.remove(this);
+        }
+
+        public void setDebugProcess(CDTProcess debugProcess) {
+            myDebugProcess = debugProcess;
+        }
+
+        public WebSocketConnection getWebSocketConnection() {
+            return myWebSocketConnection;
+        }
+
+        public CDTProcess getDebugProcess() {
+            return myDebugProcess;
+        }
+    }
+
+    private List<BrowserSession> myBrowserSessions = Lists.newLockFreeCopyOnWriteList();
+
+    public BrowserSession prepareSession(String url) {
+        BrowserSession session = new BrowserSession(url);
+        myBrowserSessions.add(session);
+        return session;
+    }
+
+    public BrowserSession find(int tabId) {
+        for (BrowserSession browserSession : myBrowserSessions) {
+            if (browserSession.myTabId == tabId) {
+                return browserSession;
+            }
+        }
+
+        return null;
+    }
+
+    public BrowserSession initNew(String url, int tabId, WebSocketConnection connection) {
+        for (BrowserSession session : myBrowserSessions.reversed()) {
+            if (session.myTabId != 0) {
+                continue;
+            }
+
+            if (Objects.equals(session.myUrl, url)) {
+                session.myTabId = tabId;
+                session. myWebSocketConnection = connection;
+                return session;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTBreakpointInfo.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTBreakpointInfo.java
new file mode 100644
index 00000000..00622390
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTBreakpointInfo.java
@@ -0,0 +1,36 @@
+package consulo.javascript.debugger.browser.process;
+
+import com.github.kklisura.cdt.protocol.types.debugger.Location;
+import consulo.execution.debug.breakpoint.XBreakpoint;
+
+import java.util.List;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class CDTBreakpointInfo {
+    private List<Location> myLocations;
+    private XBreakpoint<?> myBreakpoint;
+
+    public CDTBreakpointInfo(List<Location> locations, XBreakpoint<?> breakpoint) {
+        myLocations = locations;
+        myBreakpoint = breakpoint;
+    }
+
+    public List<Location> getLocations() {
+        return myLocations;
+    }
+
+    public void setLocations(List<Location> locations) {
+        myLocations = locations;
+    }
+
+    public XBreakpoint<?> getBreakpoint() {
+        return myBreakpoint;
+    }
+
+    public void setBreakpoint(XBreakpoint<?> breakpoint) {
+        myBreakpoint = breakpoint;
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTExecutionStack.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTExecutionStack.java
new file mode 100644
index 00000000..72c12aed
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTExecutionStack.java
@@ -0,0 +1,39 @@
+package consulo.javascript.debugger.browser.process;
+
+import com.github.kklisura.cdt.protocol.types.debugger.CallFrame;
+import consulo.execution.debug.frame.XExecutionStack;
+import consulo.execution.debug.frame.XStackFrame;
+import jakarta.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class CDTExecutionStack extends XExecutionStack {
+    private final List<CDTStackFrame> myFrames;
+
+    public CDTExecutionStack(String displayName,
+                             List<CallFrame> callFrames,
+                             CDTProcess process) {
+        super(displayName);
+
+        myFrames = new ArrayList<>(callFrames.size());
+        for (CallFrame callFrame : callFrames) {
+            myFrames.add(new CDTStackFrame(callFrame, process));
+        }
+    }
+
+    @Nullable
+    @Override
+    public XStackFrame getTopFrame() {
+        return myFrames.isEmpty() ? null : myFrames.getFirst();
+    }
+
+    @Override
+    public void computeStackFrames(XStackFrameContainer container) {
+        container.addStackFrames(myFrames, true);
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java
new file mode 100644
index 00000000..c9760d8b
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java
@@ -0,0 +1,272 @@
+package consulo.javascript.debugger.browser.process;
+
+import com.github.kklisura.cdt.protocol.ChromeDevTools;
+import com.github.kklisura.cdt.protocol.commands.Debugger;
+import com.github.kklisura.cdt.protocol.types.debugger.Location;
+import com.github.kklisura.cdt.protocol.types.debugger.SetBreakpointByUrl;
+import consulo.application.Application;
+import consulo.application.concurrent.ApplicationConcurrency;
+import consulo.execution.ExecutionResult;
+import consulo.execution.debug.*;
+import consulo.execution.debug.breakpoint.*;
+import consulo.execution.debug.evaluation.XDebuggerEditorsProvider;
+import consulo.execution.debug.frame.XSuspendContext;
+import consulo.execution.debug.icon.ExecutionDebugIconGroup;
+import consulo.execution.debug.localize.XDebuggerLocalize;
+import consulo.execution.debug.ui.XDebugTabLayouter;
+import consulo.execution.ui.ExecutionConsole;
+import consulo.execution.ui.layout.RunnerLayoutUi;
+import consulo.javascript.debugger.JavaScriptEditorsProvider;
+import consulo.javascript.debugger.JavaScriptLineBreakpointType;
+import consulo.javascript.debugger.JavaScriptListPanel;
+import consulo.javascript.debugger.browser.ChromeDevToolsFactory;
+import consulo.javascript.debugger.browser.SessionHolder;
+import consulo.javascript.icon.JavaScriptIconGroup;
+import consulo.localize.LocalizeValue;
+import consulo.process.ExecutionException;
+import consulo.process.ProcessHandler;
+import consulo.ui.ex.content.Content;
+import consulo.util.io.Url;
+import consulo.util.io.Urls;
+import consulo.virtualFileSystem.VirtualFile;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class CDTProcess extends XDebugProcess {
+    private final ExecutionResult myResult;
+
+    private CDTScriptHolder myScripts = new CDTScriptHolder();
+
+    private JavaScriptListPanel<CDTScript> myScriptListPanel;
+
+    private final XBreakpointManager myXBreakpointManager;
+
+    private ChromeDevTools myChromeDevTools;
+
+    private Executor myExecutor;
+
+    private Map<String, CDTBreakpointInfo> myBreakpoints = new HashMap<>();
+
+    public CDTProcess(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException {
+        super(session);
+        myScriptListPanel = new JavaScriptListPanel<>(session.getProject()) {
+            @Nullable
+            @Override
+            public VirtualFile toVirtualFile(@Nonnull CDTScript value, boolean toOpen) {
+                return value.toVirtualFile();
+            }
+        };
+        myExecutor = Application.get().getInstance(ApplicationConcurrency.class).createBoundedScheduledExecutorService("CDTProcess", 1);
+
+        myResult = result;
+        myXBreakpointManager = XDebuggerManager.getInstance(getSession().getProject()).getBreakpointManager();
+        getSession().setPauseActionSupported(true);
+    }
+
+    public void init(SessionHolder.BrowserSession session) {
+        myChromeDevTools = ChromeDevToolsFactory.create(session);
+
+        Debugger debugger = myChromeDevTools.getDebugger();
+
+        debugger.onScriptParsed(event -> {
+            CDTScript cdtScript = new CDTScript(event);
+
+            myScripts.add(cdtScript);
+
+            getSession().getProject().getUIAccess().execute(() -> myScriptListPanel.add(cdtScript));
+        });
+
+        debugger.onPaused(event -> {
+            XBreakpoint<?> breakpoint = null;
+            List<String> hitBreakpoints = event.getHitBreakpoints();
+            if (hitBreakpoints != null) {
+                for (String hitBreakpoint : hitBreakpoints) {
+                    CDTBreakpointInfo info = myBreakpoints.get(hitBreakpoint);
+                    if (info != null) {
+                        breakpoint = info.getBreakpoint();
+                        break;
+                    }
+                }
+            }
+
+            XDebugSession debugSession = getSession();
+            if (breakpoint != null) {
+                debugSession.breakpointReached(breakpoint, null, new CDTSuspendContext(event, this));
+            }
+            else {
+                debugSession.positionReached(new CDTSuspendContext(event, this));
+            }
+        });
+    }
+
+    public CDTScriptHolder getScripts() {
+        return myScripts;
+    }
+
+    public void invoke(Consumer<ChromeDevTools> runnable) {
+        if (myChromeDevTools == null) {
+            return;
+        }
+
+        myExecutor.execute(() -> runnable.accept(myChromeDevTools));
+    }
+
+    @Nullable
+    @Override
+    protected ProcessHandler doGetProcessHandler() {
+        return myResult.getProcessHandler();
+    }
+
+    @Override
+    public boolean checkCanPerformCommands() {
+        return myChromeDevTools != null;
+    }
+
+    @Nonnull
+    @Override
+    public XDebuggerEditorsProvider getEditorsProvider() {
+        return JavaScriptEditorsProvider.INSTANCE;
+    }
+
+    @Nonnull
+    @Override
+    public ExecutionConsole createConsole() {
+        return myResult.getExecutionConsole();
+    }
+
+    @Override
+    public boolean checkCanInitBreakpoints() {
+        return false;
+    }
+
+    @Nonnull
+    @Override
+    public XBreakpointHandler<?>[] getBreakpointHandlers() {
+        return new XBreakpointHandler[]{
+            new XBreakpointHandler<XLineBreakpoint<XBreakpointProperties>>(JavaScriptLineBreakpointType.class) {
+                @Override
+                public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint) {
+                    String presentableFilePath = lineBreakpoint.getFileUrl();
+                    int line = lineBreakpoint.getLine();
+                    XExpression conditionExpression = lineBreakpoint.getConditionExpression();
+                    String expression = conditionExpression == null ? null : conditionExpression.getExpression();
+
+                    invoke((devTools) -> {
+                        Url url = Urls.newFromIdea(lineBreakpoint.getFileUrl());
+
+                        String externalForm = url.toExternalForm();
+
+                        SetBreakpointByUrl setBreakpointByUrl = devTools.getDebugger().setBreakpointByUrl(line, externalForm, null, null, null, expression);
+
+                        List<Location> locations = setBreakpointByUrl.getLocations();
+
+                        myBreakpoints.put(setBreakpointByUrl.getBreakpointId(), new CDTBreakpointInfo(locations, lineBreakpoint));
+
+                        if (!locations.isEmpty()) {
+                            myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, ExecutionDebugIconGroup.breakpointBreakpointvalid(), null);
+                        }
+
+                        // TODO error handler
+                    });
+                }
+
+                @Override
+                public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint, boolean b) {
+                    String presentableFilePath = breakpoint.getPresentableFilePath();
+                    // myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), breakpoint.getLine(), Breakpoint.EMPTY_VALUE, false, null, null, null);
+                }
+            }
+        };
+    }
+
+    @Override
+    public void startPausing() {
+        ChromeDevTools chromeDevTools = myChromeDevTools;
+
+        if (chromeDevTools != null) {
+            invoke((devTools) -> devTools.getDebugger().pause());
+        }
+    }
+
+    @Override
+    public void startStepOver(@Nullable XSuspendContext context) {
+        invoke((chromeDevTools) -> chromeDevTools.getDebugger().stepOver());
+    }
+
+    @Override
+    public void startStepInto(@Nullable XSuspendContext context) {
+        invoke((chromeDevTools) -> chromeDevTools.getDebugger().stepInto());
+    }
+
+    @Override
+    public void startStepOut(@Nullable XSuspendContext context) {
+        invoke((chromeDevTools) -> chromeDevTools.getDebugger().stepOut());
+    }
+
+    @Override
+    public void stop() {
+        // TODO !myVm.detach();
+        myBreakpoints.clear();
+
+        Application.get().runReadAction(new Runnable() {
+            @Override
+            public void run() {
+                Collection<? extends XLineBreakpoint<XBreakpointProperties>> breakpoints = myXBreakpointManager.getBreakpoints(JavaScriptLineBreakpointType
+                    .class);
+                for (XLineBreakpoint<XBreakpointProperties> breakpoint : breakpoints) {
+                    myXBreakpointManager.updateBreakpointPresentation(breakpoint, null, null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void resume(@Nullable XSuspendContext context) {
+        invoke((chromeDevTools) -> chromeDevTools.getDebugger().resume());
+    }
+
+    @Override
+    public void runToPosition(@Nonnull XSourcePosition position, @Nullable XSuspendContext context) {
+    }
+
+    @Nonnull
+    @Override
+    public XDebugTabLayouter createTabLayouter() {
+        return new XDebugTabLayouter() {
+            @Override
+            public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui) {
+                Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIconGroup.javascript(), null);
+                content.setCloseable(false);
+
+                ui.addContent(content);
+            }
+        };
+    }
+
+    @Nonnull
+    @Override
+    public LocalizeValue getCurrentStateMessage() {
+        if (myChromeDevTools == null) {
+            return XDebuggerLocalize.debuggerStateMessageDisconnected();
+        }
+        else {
+            return LocalizeValue.localizeTODO("Attached");
+        }
+    }
+
+//    @Nullable
+//    public XLineBreakpoint<?> getXBreakpointByVmBreakpoint(Breakpoint breakpoint) {
+//        return myBreakpoints.get(breakpoint);
+//    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTRemoteObjectValue.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTRemoteObjectValue.java
new file mode 100644
index 00000000..4ae49cba
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTRemoteObjectValue.java
@@ -0,0 +1,87 @@
+package consulo.javascript.debugger.browser.process;
+
+import com.github.kklisura.cdt.protocol.types.runtime.Properties;
+import com.github.kklisura.cdt.protocol.types.runtime.PropertyDescriptor;
+import com.github.kklisura.cdt.protocol.types.runtime.RemoteObject;
+import com.github.kklisura.cdt.protocol.types.runtime.RemoteObjectType;
+import consulo.execution.debug.frame.*;
+import consulo.execution.debug.frame.presentation.XValuePresentation;
+import consulo.execution.debug.icon.ExecutionDebugIconGroup;
+import consulo.ui.image.Image;
+import jakarta.annotation.Nonnull;
+
+import java.util.List;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class CDTRemoteObjectValue extends XNamedValue {
+    @Nonnull
+    private final RemoteObject myRemoteObject;
+
+    private final CDTProcess myProcess;
+
+    public CDTRemoteObjectValue(@Nonnull String name, @Nonnull RemoteObject remoteObject, CDTProcess process) {
+        super(name);
+        myRemoteObject = remoteObject;
+        myProcess = process;
+    }
+
+    @Override
+    public void computeChildren(@Nonnull XCompositeNode node) {
+        if (myRemoteObject.getType() != RemoteObjectType.OBJECT) {
+            node.addChildren(XValueChildrenList.EMPTY, true);
+            return;
+        }
+
+        myProcess.invoke(devTools -> {
+            String objectId = myRemoteObject.getObjectId();
+
+            Properties properties = devTools.getRuntime().getProperties(objectId);
+
+            List<PropertyDescriptor> result = properties.getResult();
+
+            XValueChildrenList list = new XValueChildrenList();
+
+            for (PropertyDescriptor propertyDescriptor : result) {
+                RemoteObject value = propertyDescriptor.getValue();
+
+                list.add(new CDTRemoteObjectValue(propertyDescriptor.getName(), value, myProcess));
+            }
+
+            node.addChildren(list, true);
+        });
+    }
+
+    @Nonnull
+    protected Image getObjectIcon() {
+        return ExecutionDebugIconGroup.nodeValue();
+    }
+
+    @Override
+    public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace place) {
+        if (myRemoteObject.getType() == RemoteObjectType.OBJECT) {
+            node.setPresentation(getObjectIcon(), "", "", true);
+        }
+        else {
+            node.setPresentation(ExecutionDebugIconGroup.nodePrimitive(), new XValuePresentation() {
+                @Override
+                public void renderValue(@Nonnull XValueTextRenderer renderer) {
+                    switch (myRemoteObject.getType()) {
+                        case STRING:
+                            renderer.renderStringValue(String.valueOf(myRemoteObject.getValue()));
+                            break;
+                        case NUMBER:
+                        case BIGINT:
+                            renderer.renderNumericValue(String.valueOf(myRemoteObject.getValue()));
+                            break;
+                        case BOOLEAN:
+                            renderer.renderKeywordValue(String.valueOf(myRemoteObject.getValue()));
+                            break;
+                    }
+                }
+            }, myRemoteObject.getType() == RemoteObjectType.OBJECT);
+        }
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScopeValue.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScopeValue.java
new file mode 100644
index 00000000..23ca18b6
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScopeValue.java
@@ -0,0 +1,26 @@
+package consulo.javascript.debugger.browser.process;
+
+import com.github.kklisura.cdt.protocol.types.debugger.Scope;
+import com.github.kklisura.cdt.protocol.types.runtime.RemoteObject;
+import consulo.platform.base.icon.PlatformIconGroup;
+import consulo.ui.image.Image;
+import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
+
+import java.util.Locale;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class CDTScopeValue extends CDTRemoteObjectValue {
+    public CDTScopeValue(@Nonnull Scope scope, @Nonnull RemoteObject remoteObject, CDTProcess process) {
+        super(StringUtil.capitalize(scope.getType().name().toLowerCase(Locale.ROOT)), remoteObject, process);
+    }
+
+    @Nonnull
+    @Override
+    protected Image getObjectIcon() {
+        return PlatformIconGroup.nodesFolder();
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScript.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScript.java
new file mode 100644
index 00000000..631285fa
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScript.java
@@ -0,0 +1,27 @@
+package consulo.javascript.debugger.browser.process;
+
+import com.github.kklisura.cdt.protocol.events.debugger.ScriptParsed;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.virtualFileSystem.VirtualFileManager;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class CDTScript {
+    private final String myId;
+    private final String myUrl;
+
+    public CDTScript(ScriptParsed scriptParsed) {
+        myId = scriptParsed.getScriptId();
+        myUrl = scriptParsed.getUrl();
+    }
+
+    public String getId() {
+        return myId;
+    }
+
+    public VirtualFile toVirtualFile() {
+        return VirtualFileManager.getInstance().findFileByUrl(myUrl);
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScriptHolder.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScriptHolder.java
new file mode 100644
index 00000000..db20c752
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScriptHolder.java
@@ -0,0 +1,28 @@
+package consulo.javascript.debugger.browser.process;
+
+import consulo.util.collection.Lists;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class CDTScriptHolder {
+    private final List<CDTScript> myScripts = Lists.newLockFreeCopyOnWriteList();
+
+    public void add(CDTScript script) {
+        myScripts.add(script);
+    }
+
+    public CDTScript find(String scriptId) {
+        for (CDTScript script : myScripts) {
+            if (Objects.equals(scriptId, script.getId())) {
+                return script;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTStackFrame.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTStackFrame.java
new file mode 100644
index 00000000..23f9a67d
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTStackFrame.java
@@ -0,0 +1,83 @@
+package consulo.javascript.debugger.browser.process;
+
+import com.github.kklisura.cdt.protocol.types.debugger.CallFrame;
+import com.github.kklisura.cdt.protocol.types.debugger.Location;
+import com.github.kklisura.cdt.protocol.types.debugger.Scope;
+import com.github.kklisura.cdt.protocol.types.runtime.RemoteObject;
+import com.github.kklisura.cdt.protocol.types.runtime.RemoteObjectType;
+import consulo.application.Application;
+import consulo.execution.debug.XSourcePosition;
+import consulo.execution.debug.XSourcePositionFactory;
+import consulo.execution.debug.frame.XCompositeNode;
+import consulo.execution.debug.frame.XStackFrame;
+import consulo.execution.debug.frame.XValueChildrenList;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
+import java.util.List;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class CDTStackFrame extends XStackFrame {
+    private final CallFrame myCallFrame;
+    private final CDTProcess myProcess;
+
+    private XSourcePosition mySourcePosition;
+
+    public CDTStackFrame(CallFrame callFrame, CDTProcess process) {
+        myCallFrame = callFrame;
+        myProcess = process;
+
+        Location location = callFrame.getLocation();
+
+        if (location != null) {
+            String scriptId = location.getScriptId();
+
+            CDTScript script = process.getScripts().find(scriptId);
+            if (script != null) {
+                mySourcePosition = Application.get().getInstance(XSourcePositionFactory.class).createPosition(
+                    script.toVirtualFile(),
+                    location.getLineNumber(),
+                    location.getColumnNumber()
+                );
+            }
+        }
+    }
+
+    @Nullable
+    @Override
+    public XSourcePosition getSourcePosition() {
+        return mySourcePosition;
+    }
+
+    @Nullable
+    @Override
+    public Object getEqualityObject() {
+        return myCallFrame.getCallFrameId();
+    }
+
+    @Override
+    public void computeChildren(@Nonnull XCompositeNode node) {
+        myProcess.invoke(devTools -> {
+            List<Scope> scopeChain = myCallFrame.getScopeChain();
+
+            XValueChildrenList list = new XValueChildrenList();
+            for (Scope scope : scopeChain) {
+                RemoteObject object = scope.getObject();
+                if (object == null) {
+                    continue;
+                }
+
+                if (object.getType() != RemoteObjectType.OBJECT) {
+                    continue;
+                }
+
+                list.add(new CDTScopeValue(scope, object, myProcess));
+            }
+
+            node.addChildren(list, true);
+        });
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTSuspendContext.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTSuspendContext.java
new file mode 100644
index 00000000..b1d2b475
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTSuspendContext.java
@@ -0,0 +1,29 @@
+package consulo.javascript.debugger.browser.process;
+
+import com.github.kklisura.cdt.protocol.events.debugger.Paused;
+import consulo.execution.debug.frame.XExecutionStack;
+import consulo.execution.debug.frame.XSuspendContext;
+import jakarta.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class CDTSuspendContext extends XSuspendContext {
+    private CDTExecutionStack myStack;
+
+    public CDTSuspendContext(Paused event, CDTProcess process) {
+        myStack = new CDTExecutionStack("", event.getCallFrames(), process);
+    }
+
+    @Nullable
+    @Override
+    public XExecutionStack getActiveExecutionStack() {
+        return myStack;
+    }
+
+    @Override
+    public XExecutionStack[] getExecutionStacks() {
+        return new XExecutionStack[] {myStack};
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/AttachDebuggerResponse.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/AttachDebuggerResponse.java
new file mode 100644
index 00000000..0bbc3072
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/AttachDebuggerResponse.java
@@ -0,0 +1,14 @@
+package consulo.javascript.debugger.browser.transport;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class AttachDebuggerResponse {
+    public String message = "attach_debugger";
+    public int tabId;
+
+    public AttachDebuggerResponse(int tabId) {
+        this.tabId = tabId;
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/DebuggerCommandRequest.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/DebuggerCommandRequest.java
new file mode 100644
index 00000000..ccee75bc
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/DebuggerCommandRequest.java
@@ -0,0 +1,13 @@
+package consulo.javascript.debugger.browser.transport;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class DebuggerCommandRequest {
+    public String message = "debugger_command";
+
+    public int tabId;
+
+    public Object command;
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/DetachDebuggerRequest.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/DetachDebuggerRequest.java
new file mode 100644
index 00000000..13deb032
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/DetachDebuggerRequest.java
@@ -0,0 +1,14 @@
+package consulo.javascript.debugger.browser.transport;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class DetachDebuggerRequest {
+    public String message = "detach_debugger";
+    public final int tabId;
+
+    public DetachDebuggerRequest(int tabId) {
+        this.tabId = tabId;
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
index efa9b8b7..7d768870 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
@@ -1,25 +1,129 @@
 package consulo.javascript.debugger.browser.transport;
 
-import consulo.builtInServer.websocket.WebSocketAccepter;
-import consulo.builtInServer.websocket.WebSocketConnection;
+import com.google.gson.Gson;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.application.ReadAction;
+import consulo.builtinWebServer.webSocket.WebSocketAccepter;
+import consulo.builtinWebServer.webSocket.WebSocketConnection;
+import consulo.execution.debug.XDebugSession;
+import consulo.execution.ui.console.ConsoleViewContentType;
+import consulo.javascript.debugger.browser.SessionHolder;
+import consulo.javascript.debugger.browser.process.CDTProcess;
+import jakarta.annotation.Nonnull;
+import jakarta.inject.Inject;
 
-import javax.annotation.Nonnull;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
 
 /**
  * @author VISTALL
  * @since 2020-06-15
  */
-public class ExtensionWebSocketAccepter implements WebSocketAccepter
-{
-	@Override
-	public void accept(@Nonnull WebSocketConnection webSocketConnection, @Nonnull byte[] bytes)
-	{
-		System.out.println(bytes.toString());
-	}
-
-	@Override
-	public void accept(@Nonnull WebSocketConnection webSocketConnection, @Nonnull String text)
-	{
-		System.out.println(text);
-	}
+@ExtensionImpl
+public class ExtensionWebSocketAccepter implements WebSocketAccepter {
+    public static final Gson GSON = new Gson();
+
+    private final SessionHolder mySessionHolder;
+
+    @Inject
+    public ExtensionWebSocketAccepter(SessionHolder sessionHolder) {
+        mySessionHolder = sessionHolder;
+    }
+
+    @Override
+    public void accept(@Nonnull WebSocketConnection webSocketConnection, @Nonnull byte[] bytes) {
+        accept(webSocketConnection, new String(bytes, StandardCharsets.UTF_8));
+    }
+
+    @Override
+    public void accept(@Nonnull WebSocketConnection conn, @Nonnull String text) {
+        try {
+            SessionHolder.BrowserSession session = null;
+
+            Object jsonObject = GSON.fromJson(text, Object.class);
+            if (jsonObject instanceof Map map) {
+                Object message = map.get("message");
+
+                if (message instanceof String messageStr) {
+                    switch (messageStr) {
+                        case "init": {
+                            String url = (String) map.get("url");
+                            int tabId = getInt(map.get("tabId"));
+
+                            session = mySessionHolder.initNew(url, tabId, conn);
+
+                            conn.send(GSON.toJson(new InitResponse(tabId, session != null)));
+                            if (session != null) {
+                                conn.send(GSON.toJson(new AttachDebuggerResponse(tabId)));
+                            }
+                            break;
+                        }
+                        case "debugger_detached": {
+                            int tabId = getInt(map.get("tabId"));
+
+                            session = mySessionHolder.find(tabId);
+
+                            if (session != null) {
+                                CDTProcess debugProcess = session.getDebugProcess();
+
+                                XDebugSession xDebugSession = debugProcess.getSession();
+
+                                xDebugSession.getConsoleView().print("Browser disconnected\n", ConsoleViewContentType.LOG_INFO_OUTPUT);
+
+                                debugProcess.getProcessHandler().destroyProcess();
+                            }
+                            break;
+                        }
+                        case "debugger_command_response": {
+                            int tabId = getInt(map.get("tabId"));
+
+                            session = mySessionHolder.find(tabId);
+
+                            if (session != null) {
+                                Object response = map.get("response");
+
+                                String responseJson = GSON.toJson(response);
+
+                                session.fireHandlers(responseJson);
+                            }
+                            break;
+                        }
+                        case "debugger_attached": {
+                            int tabId = getInt(map.get("tabId"));
+
+                            session = mySessionHolder.find(tabId);
+
+                            if (session != null) {
+                                CDTProcess debugProcess = session.getDebugProcess();
+
+                                XDebugSession xDebugSession = debugProcess.getSession();
+
+                                debugProcess.init(session);
+
+                                xDebugSession.getConsoleView().print("Browser connected\n", ConsoleViewContentType.LOG_INFO_OUTPUT);
+
+                                ReadAction.nonBlocking(xDebugSession::initBreakpoints).submitDefault();
+                            }
+
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        catch (Exception ignored) {
+        }
+    }
+
+    private static int getInt(Object value) {
+        if (value instanceof Number number) {
+            return number.intValue();
+        }
+
+        if (value instanceof String str) {
+            return Integer.parseInt(str);
+        }
+
+        throw new UnsupportedOperationException(value + " is not number");
+    }
 }
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/InitResponse.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/InitResponse.java
new file mode 100644
index 00000000..49f2b5ab
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/InitResponse.java
@@ -0,0 +1,17 @@
+package consulo.javascript.debugger.browser.transport;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class InitResponse {
+    public String message = "init";
+    public int tabId;
+    public String status = "accepted";
+    public String version = "7.4";
+
+    public InitResponse(int tabId, boolean accepted) {
+        this.tabId = tabId;
+        this.status = accepted ? "accepted" : "";
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/module-info.java b/debugger/browser-debugger-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..e402d2f2
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/module-info.java
@@ -0,0 +1,16 @@
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+module consulo.javascript.browser.debugger.impl {
+    requires consulo.javascript.debugger.impl;
+
+    requires com.google.gson;
+
+    requires cdt.java.client;
+    
+    exports consulo.javascript.debugger.browser;
+    exports consulo.javascript.debugger.browser.process;
+    exports consulo.javascript.debugger.browser.transport;
+    
+}
\ No newline at end of file
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
index de39449a..b838e732 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
@@ -25,7 +25,6 @@
 import consulo.ui.ex.awt.SortedListModel;
 import consulo.util.io.FileUtil;
 import consulo.virtualFileSystem.VirtualFile;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -39,84 +38,68 @@
  * @author VISTALL
  * @since 21.03.14
  */
-public abstract class JavaScriptListPanel<T> extends JPanel
-{
-	@Nonnull
-	private final Project myProject;
-	private SortedListModel<T> myModel = SortedListModel.create(new Comparator<T>()
-	{
-		@Override
-		public int compare(T o1, T o2)
-		{
-			VirtualFile v1 = toVirtualFile(o1, false);
-			VirtualFile v2 = toVirtualFile(o2, false);
-			if(v1 == null || v2 == null)
-			{
-				return -1;
-			}
-			return FileUtil.comparePaths(v1.getPath(), v2.getPath());
-		}
-	});
+public abstract class JavaScriptListPanel<T> extends JPanel {
+    @Nonnull
+    private final Project myProject;
+    private SortedListModel<T> myModel = SortedListModel.create(new Comparator<T>() {
+        @Override
+        public int compare(T o1, T o2) {
+            VirtualFile v1 = toVirtualFile(o1, false);
+            VirtualFile v2 = toVirtualFile(o2, false);
+            if (v1 == null || v2 == null) {
+                return -1;
+            }
+            return FileUtil.comparePaths(v1.getPath(), v2.getPath());
+        }
+    });
 
-	public JavaScriptListPanel(@Nonnull Project project)
-	{
-		super(new BorderLayout());
-		init();
-		myProject = project;
-	}
+    public JavaScriptListPanel(@Nonnull Project project) {
+        super(new BorderLayout());
+        init();
+        myProject = project;
+    }
 
-	private void init()
-	{
-		final JBList<T> jbList = new JBList<>(myModel);
-		jbList.setCellRenderer(new ColoredListCellRenderer<T>()
-		{
-			@Override
-			protected void customizeCellRenderer(@Nonnull JList<? extends T> jList, T t, int i, boolean b, boolean b1)
-			{
-				VirtualFile virtualFile = toVirtualFile(t, false);
-				if(virtualFile == null)
-				{
-					append("<invalid>");
-				}
-				else
-				{
-					setBackground(FileColorManager.getInstance(myProject).getFileColor(virtualFile));
-					append(virtualFile.getPath());
-					setIcon(virtualFile.getFileType().getIcon());
-				}
-			}
-		});
-		jbList.addMouseListener(new MouseAdapter()
-		{
-			@Override
-			public void mouseClicked(MouseEvent e)
-			{
-				if(e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1)
-				{
-					T selectedValue = jbList.getSelectedValue();
-					if(selectedValue == null)
-					{
-						return;
-					}
+    private void init() {
+        final JBList<T> jbList = new JBList<>(myModel);
+        jbList.setCellRenderer(new ColoredListCellRenderer<T>() {
+            @Override
+            protected void customizeCellRenderer(@Nonnull JList<? extends T> jList, T t, int i, boolean b, boolean b1) {
+                VirtualFile virtualFile = toVirtualFile(t, false);
+                if (virtualFile == null) {
+                    append("<invalid>");
+                }
+                else {
+                    setBackground(FileColorManager.getInstance(myProject).getFileColor(virtualFile));
+                    append(virtualFile.getPath());
+                    setIcon(virtualFile.getFileType().getIcon());
+                }
+            }
+        });
+        jbList.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
+                    T selectedValue = jbList.getSelectedValue();
+                    if (selectedValue == null) {
+                        return;
+                    }
 
-					VirtualFile virtualFile = toVirtualFile(selectedValue, true);
+                    VirtualFile virtualFile = toVirtualFile(selectedValue, true);
 
-					if(virtualFile != null)
-					{
-						OpenFileDescriptorFactory.getInstance(myProject).builder(virtualFile).build().navigate(true);
-					}
-				}
-			}
-		});
+                    if (virtualFile != null) {
+                        OpenFileDescriptorFactory.getInstance(myProject).builder(virtualFile).build().navigate(true);
+                    }
+                }
+            }
+        });
 
-		add(new JBScrollPane(jbList), BorderLayout.CENTER);
-	}
+        add(new JBScrollPane(jbList), BorderLayout.CENTER);
+    }
 
-	@Nullable
-	public abstract VirtualFile toVirtualFile(@Nonnull T value, boolean toOpen);
+    @Nullable
+    public abstract VirtualFile toVirtualFile(@Nonnull T value, boolean toOpen);
 
-	public void add(T value)
-	{
-		myModel.add(value);
-	}
+    public void add(T value) {
+        myModel.add(value);
+    }
 }
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 50f609bc..6fbd31e2 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -166,6 +166,41 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-browser.debugger.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.kklisura.cdt</groupId>
+            <artifactId>cdt-java-client</artifactId>
+            <version>2.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>consulo.internal</groupId>
             <artifactId>lib.org.chromium.sdk</artifactId>
diff --git a/pom.xml b/pom.xml
index ae29a9e3..73d0ef45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
         <module>web-browser-impl</module>
         <module>debugger/debugger-impl</module>
         <module>debugger/v8-debugger-impl</module>
+        <module>debugger/browser-debugger-impl</module>
         <module>lang-version-impl/javascript16-impl</module>
         <module>lang-version-impl/javascript17-impl</module>
         <module>lang-version-impl/javascript18-impl</module>

From 96280968b7408d02547ac55ae45288570b3b2278 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Feb 2026 19:45:02 +0200
Subject: [PATCH 310/340] add shutdown of executor

---
 .../javascript/debugger/browser/process/CDTProcess.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java
index c9760d8b..a9e6942d 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java
@@ -36,7 +36,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.function.Consumer;
 
 /**
@@ -54,7 +54,7 @@ public class CDTProcess extends XDebugProcess {
 
     private ChromeDevTools myChromeDevTools;
 
-    private Executor myExecutor;
+    private ExecutorService myExecutor;
 
     private Map<String, CDTBreakpointInfo> myBreakpoints = new HashMap<>();
 
@@ -216,7 +216,8 @@ public void startStepOut(@Nullable XSuspendContext context) {
 
     @Override
     public void stop() {
-        // TODO !myVm.detach();
+        myExecutor.shutdown();
+
         myBreakpoints.clear();
 
         Application.get().runReadAction(new Runnable() {

From af23e9d1c54eaa6ec0bc718a93368f2dfde3b8ed Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Feb 2026 21:46:30 +0400
Subject: [PATCH 311/340] Update README to include Browser Debugging section

Added section for Browser Debugging with link.
---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 075c9a79..496ebd2e 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
-[![Build Status](https://ci.consulo.io/job/consulo-javascript/badge/icon)](https://ci.consulo.io/job/consulo-javascript)
\ No newline at end of file
+[![Build Status](https://ci.consulo.io/job/consulo-javascript/badge/icon)](https://ci.consulo.io/job/consulo-javascript)
+
+
+# Browser Debugging
+ * For `Chrome Like` browsers visit [https://github.com/consulo/chrome-consulo-debugger-extension](link)

From 76852df94feea0e0cca2bda7165e91b4222d178f Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Feb 2026 20:20:05 +0200
Subject: [PATCH 312/340] extract cdt impl to own module - need to use inside
 nodejs

---
 debugger/browser-debugger-impl/pom.xml        |  6 ++
 .../browser/BrowserCDTDebugProcess.java       | 22 +++++
 .../browser/BrowserDebuggerProcess.java       |  3 +-
 .../browser/JavaScriptBrowserDebugRunner.java |  4 +-
 .../debugger/browser/SessionHolder.java       |  7 +-
 .../transport/ExtensionWebSocketAccepter.java |  7 +-
 .../src/main/java/module-info.java            |  7 +-
 debugger/cdt-debugger-impl/pom.xml            | 81 +++++++++++++++++++
 .../debugger/cdt}/CDTBreakpointInfo.java      |  2 +-
 .../debugger/cdt}/CDTExecutionStack.java      |  4 +-
 .../debugger/cdt/CDTProcessBase.java}         | 12 ++-
 .../debugger/cdt}/CDTRemoteObjectValue.java   |  6 +-
 .../debugger/cdt}/CDTScopeValue.java          |  4 +-
 .../javascript/debugger/cdt}/CDTScript.java   |  2 +-
 .../debugger/cdt}/CDTScriptHolder.java        |  2 +-
 .../debugger/cdt}/CDTStackFrame.java          |  6 +-
 .../debugger/cdt}/CDTSuspendContext.java      |  4 +-
 .../debugger/cdt}/ChromeDevToolsFactory.java  |  6 +-
 .../src/main/java/module-info.java            | 13 +++
 plugin/pom.xml                                |  6 ++
 pom.xml                                       |  1 +
 21 files changed, 163 insertions(+), 42 deletions(-)
 create mode 100644 debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserCDTDebugProcess.java
 create mode 100644 debugger/cdt-debugger-impl/pom.xml
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt}/CDTBreakpointInfo.java (93%)
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt}/CDTExecutionStack.java (90%)
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java} (95%)
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt}/CDTRemoteObjectValue.java (95%)
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt}/CDTScopeValue.java (88%)
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt}/CDTScript.java (92%)
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt}/CDTScriptHolder.java (91%)
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt}/CDTStackFrame.java (93%)
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt}/CDTSuspendContext.java (85%)
 rename debugger/{browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser => cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt}/ChromeDevToolsFactory.java (87%)
 create mode 100644 debugger/cdt-debugger-impl/src/main/java/module-info.java

diff --git a/debugger/browser-debugger-impl/pom.xml b/debugger/browser-debugger-impl/pom.xml
index 32040926..ef96f44d 100644
--- a/debugger/browser-debugger-impl/pom.xml
+++ b/debugger/browser-debugger-impl/pom.xml
@@ -53,6 +53,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-cdt.debugger.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>com.intellij.xml</artifactId>
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserCDTDebugProcess.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserCDTDebugProcess.java
new file mode 100644
index 00000000..e0865745
--- /dev/null
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserCDTDebugProcess.java
@@ -0,0 +1,22 @@
+package consulo.javascript.debugger.browser;
+
+import consulo.execution.ExecutionResult;
+import consulo.execution.debug.XDebugSession;
+import consulo.javascript.debugger.cdt.CDTProcessBase;
+import consulo.javascript.debugger.cdt.ChromeDevToolsFactory;
+import consulo.process.ExecutionException;
+import jakarta.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+public class BrowserCDTDebugProcess extends CDTProcessBase {
+    public BrowserCDTDebugProcess(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException {
+        super(session, result);
+    }
+
+    public void init(SessionHolder.BrowserSession session) {
+        initTools(ChromeDevToolsFactory.create(new ProxyWebSocketService(session)));
+    }
+}
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java
index 6ac3c935..9e7e8048 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java
@@ -2,7 +2,6 @@
 
 import consulo.builtinWebServer.webSocket.WebSocketConnection;
 import consulo.execution.debug.DefaultDebugProcessHandler;
-import consulo.javascript.debugger.browser.process.CDTProcess;
 import consulo.javascript.debugger.browser.transport.DetachDebuggerRequest;
 import consulo.javascript.debugger.browser.transport.ExtensionWebSocketAccepter;
 import jakarta.annotation.Nonnull;
@@ -18,7 +17,7 @@ public BrowserDebuggerProcess(@Nonnull SessionHolder.BrowserSession browserSessi
         myBrowserSession = browserSession;
     }
 
-    public void setDebugProcess(CDTProcess cdtProcess) {
+    public void setDebugProcess(BrowserCDTDebugProcess cdtProcess) {
         myBrowserSession.setDebugProcess(cdtProcess);
     }
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
index 360c0886..bcc582f0 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
@@ -9,7 +9,7 @@
 import consulo.execution.runner.DefaultProgramRunner;
 import consulo.execution.runner.ExecutionEnvironment;
 import consulo.execution.ui.RunContentDescriptor;
-import consulo.javascript.debugger.browser.process.CDTProcess;
+import consulo.javascript.debugger.cdt.CDTProcessBase;
 import consulo.process.ExecutionException;
 import jakarta.annotation.Nonnull;
 
@@ -34,7 +34,7 @@ protected RunContentDescriptor doExecute(@Nonnull RunProfileState state, @Nonnul
 
             BrowserDebuggerProcess processHandler = (BrowserDebuggerProcess) result.getProcessHandler();
 
-            CDTProcess process = new CDTProcess(xDebugSession, result);
+            BrowserCDTDebugProcess process = new BrowserCDTDebugProcess(xDebugSession, result);
 
             processHandler.setDebugProcess(process);
             
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/SessionHolder.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/SessionHolder.java
index 3a5950df..186e9f37 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/SessionHolder.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/SessionHolder.java
@@ -4,7 +4,6 @@
 import consulo.annotation.component.ServiceAPI;
 import consulo.annotation.component.ServiceImpl;
 import consulo.builtinWebServer.webSocket.WebSocketConnection;
-import consulo.javascript.debugger.browser.process.CDTProcess;
 import consulo.util.collection.Lists;
 import consulo.util.collection.SmartList;
 import jakarta.inject.Singleton;
@@ -28,7 +27,7 @@ public class BrowserSession {
 
         private WebSocketConnection myWebSocketConnection;
 
-        private CDTProcess myDebugProcess;
+        private BrowserCDTDebugProcess myDebugProcess;
 
         private List<Consumer<String>> myHandlers = new SmartList<>();
 
@@ -54,7 +53,7 @@ public void close() {
             myBrowserSessions.remove(this);
         }
 
-        public void setDebugProcess(CDTProcess debugProcess) {
+        public void setDebugProcess(BrowserCDTDebugProcess debugProcess) {
             myDebugProcess = debugProcess;
         }
 
@@ -62,7 +61,7 @@ public WebSocketConnection getWebSocketConnection() {
             return myWebSocketConnection;
         }
 
-        public CDTProcess getDebugProcess() {
+        public BrowserCDTDebugProcess getDebugProcess() {
             return myDebugProcess;
         }
     }
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
index 7d768870..e8d932c3 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
@@ -7,8 +7,9 @@
 import consulo.builtinWebServer.webSocket.WebSocketConnection;
 import consulo.execution.debug.XDebugSession;
 import consulo.execution.ui.console.ConsoleViewContentType;
+import consulo.javascript.debugger.browser.BrowserCDTDebugProcess;
 import consulo.javascript.debugger.browser.SessionHolder;
-import consulo.javascript.debugger.browser.process.CDTProcess;
+import consulo.javascript.debugger.cdt.CDTProcessBase;
 import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 
@@ -64,7 +65,7 @@ public void accept(@Nonnull WebSocketConnection conn, @Nonnull String text) {
                             session = mySessionHolder.find(tabId);
 
                             if (session != null) {
-                                CDTProcess debugProcess = session.getDebugProcess();
+                                CDTProcessBase debugProcess = session.getDebugProcess();
 
                                 XDebugSession xDebugSession = debugProcess.getSession();
 
@@ -94,7 +95,7 @@ public void accept(@Nonnull WebSocketConnection conn, @Nonnull String text) {
                             session = mySessionHolder.find(tabId);
 
                             if (session != null) {
-                                CDTProcess debugProcess = session.getDebugProcess();
+                                BrowserCDTDebugProcess debugProcess = session.getDebugProcess();
 
                                 XDebugSession xDebugSession = debugProcess.getSession();
 
diff --git a/debugger/browser-debugger-impl/src/main/java/module-info.java b/debugger/browser-debugger-impl/src/main/java/module-info.java
index e402d2f2..acb30dcf 100644
--- a/debugger/browser-debugger-impl/src/main/java/module-info.java
+++ b/debugger/browser-debugger-impl/src/main/java/module-info.java
@@ -8,9 +8,6 @@
     requires com.google.gson;
 
     requires cdt.java.client;
-    
-    exports consulo.javascript.debugger.browser;
-    exports consulo.javascript.debugger.browser.process;
-    exports consulo.javascript.debugger.browser.transport;
-    
+
+    requires consulo.javascript.cdt.debugger.impl;
 }
\ No newline at end of file
diff --git a/debugger/cdt-debugger-impl/pom.xml b/debugger/cdt-debugger-impl/pom.xml
new file mode 100644
index 00000000..5dd94b39
--- /dev/null
+++ b/debugger/cdt-debugger-impl/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Copyright 2013-2017 consulo.io
+  -
+  - 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.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.ide-api-provided</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript-cdt.debugger.impl</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>interval:60</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-debugger.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.kklisura.cdt</groupId>
+            <artifactId>cdt-java-client</artifactId>
+            <version>2.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTBreakpointInfo.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTBreakpointInfo.java
similarity index 93%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTBreakpointInfo.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTBreakpointInfo.java
index 00622390..99759ad1 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTBreakpointInfo.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTBreakpointInfo.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser.process;
+package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.types.debugger.Location;
 import consulo.execution.debug.breakpoint.XBreakpoint;
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTExecutionStack.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTExecutionStack.java
similarity index 90%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTExecutionStack.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTExecutionStack.java
index 72c12aed..1be641d2 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTExecutionStack.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTExecutionStack.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser.process;
+package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.types.debugger.CallFrame;
 import consulo.execution.debug.frame.XExecutionStack;
@@ -17,7 +17,7 @@ public class CDTExecutionStack extends XExecutionStack {
 
     public CDTExecutionStack(String displayName,
                              List<CallFrame> callFrames,
-                             CDTProcess process) {
+                             CDTProcessBase process) {
         super(displayName);
 
         myFrames = new ArrayList<>(callFrames.size());
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
similarity index 95%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
index a9e6942d..4aea9cda 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTProcess.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser.process;
+package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.ChromeDevTools;
 import com.github.kklisura.cdt.protocol.commands.Debugger;
@@ -19,8 +19,6 @@
 import consulo.javascript.debugger.JavaScriptEditorsProvider;
 import consulo.javascript.debugger.JavaScriptLineBreakpointType;
 import consulo.javascript.debugger.JavaScriptListPanel;
-import consulo.javascript.debugger.browser.ChromeDevToolsFactory;
-import consulo.javascript.debugger.browser.SessionHolder;
 import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.localize.LocalizeValue;
 import consulo.process.ExecutionException;
@@ -43,7 +41,7 @@
  * @author VISTALL
  * @since 2026-02-15
  */
-public class CDTProcess extends XDebugProcess {
+public abstract class CDTProcessBase extends XDebugProcess {
     private final ExecutionResult myResult;
 
     private CDTScriptHolder myScripts = new CDTScriptHolder();
@@ -58,7 +56,7 @@ public class CDTProcess extends XDebugProcess {
 
     private Map<String, CDTBreakpointInfo> myBreakpoints = new HashMap<>();
 
-    public CDTProcess(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException {
+    public CDTProcessBase(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException {
         super(session);
         myScriptListPanel = new JavaScriptListPanel<>(session.getProject()) {
             @Nullable
@@ -74,8 +72,8 @@ public VirtualFile toVirtualFile(@Nonnull CDTScript value, boolean toOpen) {
         getSession().setPauseActionSupported(true);
     }
 
-    public void init(SessionHolder.BrowserSession session) {
-        myChromeDevTools = ChromeDevToolsFactory.create(session);
+    public void initTools(ChromeDevTools devTools) {
+        myChromeDevTools = devTools;
 
         Debugger debugger = myChromeDevTools.getDebugger();
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTRemoteObjectValue.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java
similarity index 95%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTRemoteObjectValue.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java
index 4ae49cba..d156b7ef 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTRemoteObjectValue.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser.process;
+package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.types.runtime.Properties;
 import com.github.kklisura.cdt.protocol.types.runtime.PropertyDescriptor;
@@ -20,9 +20,9 @@ public class CDTRemoteObjectValue extends XNamedValue {
     @Nonnull
     private final RemoteObject myRemoteObject;
 
-    private final CDTProcess myProcess;
+    private final CDTProcessBase myProcess;
 
-    public CDTRemoteObjectValue(@Nonnull String name, @Nonnull RemoteObject remoteObject, CDTProcess process) {
+    public CDTRemoteObjectValue(@Nonnull String name, @Nonnull RemoteObject remoteObject, CDTProcessBase process) {
         super(name);
         myRemoteObject = remoteObject;
         myProcess = process;
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScopeValue.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
similarity index 88%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScopeValue.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
index 23ca18b6..7ed6f467 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScopeValue.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser.process;
+package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.types.debugger.Scope;
 import com.github.kklisura.cdt.protocol.types.runtime.RemoteObject;
@@ -14,7 +14,7 @@
  * @since 2026-02-15
  */
 public class CDTScopeValue extends CDTRemoteObjectValue {
-    public CDTScopeValue(@Nonnull Scope scope, @Nonnull RemoteObject remoteObject, CDTProcess process) {
+    public CDTScopeValue(@Nonnull Scope scope, @Nonnull RemoteObject remoteObject, CDTProcessBase process) {
         super(StringUtil.capitalize(scope.getType().name().toLowerCase(Locale.ROOT)), remoteObject, process);
     }
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScript.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java
similarity index 92%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScript.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java
index 631285fa..1e977e79 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScript.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser.process;
+package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.events.debugger.ScriptParsed;
 import consulo.virtualFileSystem.VirtualFile;
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScriptHolder.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScriptHolder.java
similarity index 91%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScriptHolder.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScriptHolder.java
index db20c752..2dbe5154 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTScriptHolder.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScriptHolder.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser.process;
+package consulo.javascript.debugger.cdt;
 
 import consulo.util.collection.Lists;
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTStackFrame.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java
similarity index 93%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTStackFrame.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java
index 23f9a67d..872dae25 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTStackFrame.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser.process;
+package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.types.debugger.CallFrame;
 import com.github.kklisura.cdt.protocol.types.debugger.Location;
@@ -22,11 +22,11 @@
  */
 public class CDTStackFrame extends XStackFrame {
     private final CallFrame myCallFrame;
-    private final CDTProcess myProcess;
+    private final CDTProcessBase myProcess;
 
     private XSourcePosition mySourcePosition;
 
-    public CDTStackFrame(CallFrame callFrame, CDTProcess process) {
+    public CDTStackFrame(CallFrame callFrame, CDTProcessBase process) {
         myCallFrame = callFrame;
         myProcess = process;
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTSuspendContext.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTSuspendContext.java
similarity index 85%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTSuspendContext.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTSuspendContext.java
index b1d2b475..e5068a90 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/process/CDTSuspendContext.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTSuspendContext.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser.process;
+package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.events.debugger.Paused;
 import consulo.execution.debug.frame.XExecutionStack;
@@ -12,7 +12,7 @@
 public class CDTSuspendContext extends XSuspendContext {
     private CDTExecutionStack myStack;
 
-    public CDTSuspendContext(Paused event, CDTProcess process) {
+    public CDTSuspendContext(Paused event, CDTProcessBase process) {
         myStack = new CDTExecutionStack("", event.getCallFrames(), process);
     }
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ChromeDevToolsFactory.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java
similarity index 87%
rename from debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ChromeDevToolsFactory.java
rename to debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java
index 687efbfb..8aa32b44 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/ChromeDevToolsFactory.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java
@@ -1,4 +1,4 @@
-package consulo.javascript.debugger.browser;
+package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.services.WebSocketService;
 import com.github.kklisura.cdt.services.config.ChromeDevToolsServiceConfiguration;
@@ -16,11 +16,9 @@
  * @since 2026-02-15
  */
 public class ChromeDevToolsFactory {
-    public static ChromeDevToolsServiceImpl create(SessionHolder.BrowserSession browserSession) {
+    public static ChromeDevToolsServiceImpl create(WebSocketService webSocketService) {
         ChromeDevToolsServiceConfiguration conf = new ChromeDevToolsServiceConfiguration();
 
-        WebSocketService webSocketService = new ProxyWebSocketService(browserSession);
-
         // Create invocation handler
         CommandInvocationHandler commandInvocationHandler = new CommandInvocationHandler();
 
diff --git a/debugger/cdt-debugger-impl/src/main/java/module-info.java b/debugger/cdt-debugger-impl/src/main/java/module-info.java
new file mode 100644
index 00000000..bcb862d6
--- /dev/null
+++ b/debugger/cdt-debugger-impl/src/main/java/module-info.java
@@ -0,0 +1,13 @@
+/**
+ * @author VISTALL
+ * @since 2026-02-15
+ */
+module consulo.javascript.cdt.debugger.impl {
+    requires consulo.javascript.debugger.impl;
+
+    requires com.google.gson;
+
+    requires cdt.java.client;
+
+    exports consulo.javascript.debugger.cdt;
+}
\ No newline at end of file
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 6fbd31e2..9ab137b7 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -172,6 +172,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-cdt.debugger.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.github.kklisura.cdt</groupId>
             <artifactId>cdt-java-client</artifactId>
diff --git a/pom.xml b/pom.xml
index 73d0ef45..65f9f2ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
         <module>debugger/debugger-impl</module>
         <module>debugger/v8-debugger-impl</module>
         <module>debugger/browser-debugger-impl</module>
+        <module>debugger/cdt-debugger-impl</module>
         <module>lang-version-impl/javascript16-impl</module>
         <module>lang-version-impl/javascript17-impl</module>
         <module>lang-version-impl/javascript18-impl</module>

From 241c2cda9295f9aaa89e5aadfba6900cd07b3d64 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Feb 2026 21:50:49 +0200
Subject: [PATCH 313/340] use internal impl fix fix

---
 debugger/cdt-debugger-impl/pom.xml | 4 ++--
 plugin/pom.xml                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debugger/cdt-debugger-impl/pom.xml b/debugger/cdt-debugger-impl/pom.xml
index 5dd94b39..a2f8a1d3 100644
--- a/debugger/cdt-debugger-impl/pom.xml
+++ b/debugger/cdt-debugger-impl/pom.xml
@@ -61,9 +61,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.kklisura.cdt</groupId>
+            <groupId>consulo.internal.com.github.kklisura.cdt</groupId>
             <artifactId>cdt-java-client</artifactId>
-            <version>2.1.0</version>
+            <version>4.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.javassist</groupId>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 9ab137b7..41a95d98 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -179,9 +179,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.kklisura.cdt</groupId>
+            <groupId>consulo.internal.com.github.kklisura.cdt</groupId>
             <artifactId>cdt-java-client</artifactId>
-            <version>2.1.0</version>
+            <version>4.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.javassist</groupId>

From 55a810a71ccb48f53543da0932558636cd457f0c Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Feb 2026 21:54:14 +0200
Subject: [PATCH 314/340] move on pause for method for later replace

---
 .../debugger/cdt/CDTProcessBase.java          | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
index 4aea9cda..6072eb53 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
@@ -2,6 +2,7 @@
 
 import com.github.kklisura.cdt.protocol.ChromeDevTools;
 import com.github.kklisura.cdt.protocol.commands.Debugger;
+import com.github.kklisura.cdt.protocol.events.debugger.Paused;
 import com.github.kklisura.cdt.protocol.types.debugger.Location;
 import com.github.kklisura.cdt.protocol.types.debugger.SetBreakpointByUrl;
 import consulo.application.Application;
@@ -85,27 +86,7 @@ public void initTools(ChromeDevTools devTools) {
             getSession().getProject().getUIAccess().execute(() -> myScriptListPanel.add(cdtScript));
         });
 
-        debugger.onPaused(event -> {
-            XBreakpoint<?> breakpoint = null;
-            List<String> hitBreakpoints = event.getHitBreakpoints();
-            if (hitBreakpoints != null) {
-                for (String hitBreakpoint : hitBreakpoints) {
-                    CDTBreakpointInfo info = myBreakpoints.get(hitBreakpoint);
-                    if (info != null) {
-                        breakpoint = info.getBreakpoint();
-                        break;
-                    }
-                }
-            }
-
-            XDebugSession debugSession = getSession();
-            if (breakpoint != null) {
-                debugSession.breakpointReached(breakpoint, null, new CDTSuspendContext(event, this));
-            }
-            else {
-                debugSession.positionReached(new CDTSuspendContext(event, this));
-            }
-        });
+        debugger.onPaused(this::onPause);
     }
 
     public CDTScriptHolder getScripts() {
@@ -120,6 +101,28 @@ public void invoke(Consumer<ChromeDevTools> runnable) {
         myExecutor.execute(() -> runnable.accept(myChromeDevTools));
     }
 
+    protected void onPause(Paused event) {
+        XBreakpoint<?> breakpoint = null;
+        List<String> hitBreakpoints = event.getHitBreakpoints();
+        if (hitBreakpoints != null) {
+            for (String hitBreakpoint : hitBreakpoints) {
+                CDTBreakpointInfo info = myBreakpoints.get(hitBreakpoint);
+                if (info != null) {
+                    breakpoint = info.getBreakpoint();
+                    break;
+                }
+            }
+        }
+
+        XDebugSession debugSession = getSession();
+        if (breakpoint != null) {
+            debugSession.breakpointReached(breakpoint, null, new CDTSuspendContext(event, this));
+        }
+        else {
+            debugSession.positionReached(new CDTSuspendContext(event, this));
+        }
+    }
+
     @Nullable
     @Override
     protected ProcessHandler doGetProcessHandler() {
@@ -152,10 +155,9 @@ public boolean checkCanInitBreakpoints() {
     @Override
     public XBreakpointHandler<?>[] getBreakpointHandlers() {
         return new XBreakpointHandler[]{
-            new XBreakpointHandler<XLineBreakpoint<XBreakpointProperties>>(JavaScriptLineBreakpointType.class) {
+            new XBreakpointHandler<>(JavaScriptLineBreakpointType.class) {
                 @Override
                 public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint) {
-                    String presentableFilePath = lineBreakpoint.getFileUrl();
                     int line = lineBreakpoint.getLine();
                     XExpression conditionExpression = lineBreakpoint.getConditionExpression();
                     String expression = conditionExpression == null ? null : conditionExpression.getExpression();

From 623b61991fb08f14db39d946bb1653925c20898f Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 16 Feb 2026 18:56:29 +0200
Subject: [PATCH 315/340] better script support and more debugging support

---
 .../transport/ExtensionWebSocketAccepter.java |  3 -
 debugger/cdt-debugger-impl/pom.xml            |  2 +-
 .../debugger/cdt/CDTProcessBase.java          | 45 ++++++++++---
 .../debugger/cdt/CDTRemoteObjectValue.java    | 26 +++++--
 .../debugger/cdt/CDTScopeValue.java           | 32 ++++++---
 .../javascript/debugger/cdt/CDTScript.java    | 54 ++++++++++++++-
 .../debugger/cdt/CDTStackFrame.java           | 44 +++++++++---
 .../debugger/cdt/ChromeDevToolsFactory.java   | 16 +++++
 .../debugger/cdt/LoggingWebSocketService.java | 48 +++++++++++++
 .../debugger/JavaScriptFileInfo.java          | 22 ++++++
 .../debugger/JavaScriptListPanel.java         | 67 +++++++------------
 plugin/pom.xml                                | 14 +---
 pom.xml                                       |  1 -
 13 files changed, 279 insertions(+), 95 deletions(-)
 create mode 100644 debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/LoggingWebSocketService.java
 create mode 100644 debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptFileInfo.java

diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
index e8d932c3..98a87253 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.Gson;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.application.ReadAction;
 import consulo.builtinWebServer.webSocket.WebSocketAccepter;
 import consulo.builtinWebServer.webSocket.WebSocketConnection;
 import consulo.execution.debug.XDebugSession;
@@ -102,8 +101,6 @@ public void accept(@Nonnull WebSocketConnection conn, @Nonnull String text) {
                                 debugProcess.init(session);
 
                                 xDebugSession.getConsoleView().print("Browser connected\n", ConsoleViewContentType.LOG_INFO_OUTPUT);
-
-                                ReadAction.nonBlocking(xDebugSession::initBreakpoints).submitDefault();
                             }
 
                             break;
diff --git a/debugger/cdt-debugger-impl/pom.xml b/debugger/cdt-debugger-impl/pom.xml
index a2f8a1d3..56c8ba66 100644
--- a/debugger/cdt-debugger-impl/pom.xml
+++ b/debugger/cdt-debugger-impl/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>consulo.internal.com.github.kklisura.cdt</groupId>
             <artifactId>cdt-java-client</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.javassist</groupId>
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
index 6072eb53..2c3dbf61 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
@@ -6,6 +6,7 @@
 import com.github.kklisura.cdt.protocol.types.debugger.Location;
 import com.github.kklisura.cdt.protocol.types.debugger.SetBreakpointByUrl;
 import consulo.application.Application;
+import consulo.application.ReadAction;
 import consulo.application.concurrent.ApplicationConcurrency;
 import consulo.execution.ExecutionResult;
 import consulo.execution.debug.*;
@@ -27,10 +28,10 @@
 import consulo.ui.ex.content.Content;
 import consulo.util.io.Url;
 import consulo.util.io.Urls;
-import consulo.virtualFileSystem.VirtualFile;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
+import java.net.SocketException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -59,13 +60,8 @@ public abstract class CDTProcessBase extends XDebugProcess {
 
     public CDTProcessBase(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException {
         super(session);
-        myScriptListPanel = new JavaScriptListPanel<>(session.getProject()) {
-            @Nullable
-            @Override
-            public VirtualFile toVirtualFile(@Nonnull CDTScript value, boolean toOpen) {
-                return value.toVirtualFile();
-            }
-        };
+        myScriptListPanel = new JavaScriptListPanel<>();
+
         myExecutor = Application.get().getInstance(ApplicationConcurrency.class).createBoundedScheduledExecutorService("CDTProcess", 1);
 
         myResult = result;
@@ -79,7 +75,7 @@ public void initTools(ChromeDevTools devTools) {
         Debugger debugger = myChromeDevTools.getDebugger();
 
         debugger.onScriptParsed(event -> {
-            CDTScript cdtScript = new CDTScript(event);
+            CDTScript cdtScript = new CDTScript(getSession().getProject(), event);
 
             myScripts.add(cdtScript);
 
@@ -87,6 +83,20 @@ public void initTools(ChromeDevTools devTools) {
         });
 
         debugger.onPaused(this::onPause);
+
+        devTools.getRuntime().onExecutionContextDestroyed(executionContextDestroyed -> {
+            getProcessHandler().destroyProcess();
+        });
+
+        initOthers();
+    }
+
+    protected void initOthers() {
+        invoke(devTools -> {
+            ReadAction.run(() -> getSession().initBreakpoints());
+
+            devTools.getRuntime().runIfWaitingForDebugger();
+        });
     }
 
     public CDTScriptHolder getScripts() {
@@ -98,7 +108,14 @@ public void invoke(Consumer<ChromeDevTools> runnable) {
             return;
         }
 
-        myExecutor.execute(() -> runnable.accept(myChromeDevTools));
+        myExecutor.execute(() -> {
+            try {
+                runnable.accept(myChromeDevTools);
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
     }
 
     protected void onPause(Paused event) {
@@ -216,6 +233,14 @@ public void startStepOut(@Nullable XSuspendContext context) {
 
     @Override
     public void stop() {
+        if (myChromeDevTools instanceof AutoCloseable closeable) {
+            try {
+                closeable.close();
+            }
+            catch (Exception ignored) {
+            }
+        }
+
         myExecutor.shutdown();
 
         myBreakpoints.clear();
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java
index d156b7ef..e3256c6a 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java
@@ -9,6 +9,7 @@
 import consulo.execution.debug.icon.ExecutionDebugIconGroup;
 import consulo.ui.image.Image;
 import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 
@@ -17,12 +18,12 @@
  * @since 2026-02-15
  */
 public class CDTRemoteObjectValue extends XNamedValue {
-    @Nonnull
+    @Nullable
     private final RemoteObject myRemoteObject;
 
     private final CDTProcessBase myProcess;
 
-    public CDTRemoteObjectValue(@Nonnull String name, @Nonnull RemoteObject remoteObject, CDTProcessBase process) {
+    public CDTRemoteObjectValue(@Nonnull String name, @Nullable RemoteObject remoteObject, CDTProcessBase process) {
         super(name);
         myRemoteObject = remoteObject;
         myProcess = process;
@@ -30,13 +31,21 @@ public CDTRemoteObjectValue(@Nonnull String name, @Nonnull RemoteObject remoteOb
 
     @Override
     public void computeChildren(@Nonnull XCompositeNode node) {
-        if (myRemoteObject.getType() != RemoteObjectType.OBJECT) {
+        fill(myRemoteObject, node, myProcess);
+    }
+
+    public static void fill(RemoteObject remoteObject, XCompositeNode node, CDTProcessBase process) {
+        if (remoteObject == null) {
+            return;
+        }
+
+        if (remoteObject.getType() != RemoteObjectType.OBJECT) {
             node.addChildren(XValueChildrenList.EMPTY, true);
             return;
         }
 
-        myProcess.invoke(devTools -> {
-            String objectId = myRemoteObject.getObjectId();
+        process.invoke(devTools -> {
+            String objectId = remoteObject.getObjectId();
 
             Properties properties = devTools.getRuntime().getProperties(objectId);
 
@@ -47,7 +56,7 @@ public void computeChildren(@Nonnull XCompositeNode node) {
             for (PropertyDescriptor propertyDescriptor : result) {
                 RemoteObject value = propertyDescriptor.getValue();
 
-                list.add(new CDTRemoteObjectValue(propertyDescriptor.getName(), value, myProcess));
+                list.add(new CDTRemoteObjectValue(propertyDescriptor.getName(), value, process));
             }
 
             node.addChildren(list, true);
@@ -61,6 +70,11 @@ protected Image getObjectIcon() {
 
     @Override
     public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace place) {
+        if (myRemoteObject == null) {
+            node.setPresentation(getObjectIcon(), null, "null", false);
+            return;
+        }
+
         if (myRemoteObject.getType() == RemoteObjectType.OBJECT) {
             node.setPresentation(getObjectIcon(), "", "", true);
         }
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
index 7ed6f467..788f0658 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
@@ -1,9 +1,10 @@
 package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.types.debugger.Scope;
+import com.github.kklisura.cdt.protocol.types.debugger.ScopeType;
 import com.github.kklisura.cdt.protocol.types.runtime.RemoteObject;
-import consulo.platform.base.icon.PlatformIconGroup;
-import consulo.ui.image.Image;
+import consulo.execution.debug.frame.XCompositeNode;
+import consulo.execution.debug.frame.XValueGroup;
 import consulo.util.lang.StringUtil;
 import jakarta.annotation.Nonnull;
 
@@ -13,14 +14,29 @@
  * @author VISTALL
  * @since 2026-02-15
  */
-public class CDTScopeValue extends CDTRemoteObjectValue {
-    public CDTScopeValue(@Nonnull Scope scope, @Nonnull RemoteObject remoteObject, CDTProcessBase process) {
-        super(StringUtil.capitalize(scope.getType().name().toLowerCase(Locale.ROOT)), remoteObject, process);
+public class CDTScopeValue extends XValueGroup {
+    @Nonnull
+    private final Scope myScope;
+    @Nonnull
+    private final RemoteObject myRemoteObject;
+    private final CDTProcessBase myProcess;
+
+    public CDTScopeValue(@Nonnull Scope scope,
+                         @Nonnull RemoteObject remoteObject,
+                         CDTProcessBase process) {
+        super(StringUtil.capitalize(scope.getType().name().toLowerCase(Locale.ROOT)));
+        myScope = scope;
+        myRemoteObject = remoteObject;
+        myProcess = process;
+    }
+
+    @Override
+    public void computeChildren(@Nonnull XCompositeNode node) {
+        CDTRemoteObjectValue.fill(myRemoteObject, node, myProcess);
     }
 
-    @Nonnull
     @Override
-    protected Image getObjectIcon() {
-        return PlatformIconGroup.nodesFolder();
+    public boolean isAutoExpand() {
+        return myScope.getType() == ScopeType.LOCAL;
     }
 }
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java
index 1e977e79..c4c0510e 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java
@@ -1,20 +1,35 @@
 package consulo.javascript.debugger.cdt;
 
 import com.github.kklisura.cdt.protocol.events.debugger.ScriptParsed;
+import com.github.kklisura.cdt.protocol.types.debugger.ScriptLanguage;
+import consulo.javascript.debugger.JavaScriptFileInfo;
+import consulo.javascript.icon.JavaScriptIconGroup;
+import consulo.language.editor.FileColorManager;
+import consulo.navigation.OpenFileDescriptorFactory;
+import consulo.project.Project;
+import consulo.ui.color.ColorValue;
+import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.VirtualFileManager;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * @author VISTALL
  * @since 2026-02-15
  */
-public class CDTScript {
+public class CDTScript implements JavaScriptFileInfo {
     private final String myId;
     private final String myUrl;
+    private final Project myProject;
+    private final ScriptLanguage myScriptLanguage;
 
-    public CDTScript(ScriptParsed scriptParsed) {
+    public CDTScript(Project project, ScriptParsed scriptParsed) {
+        myProject = project;
         myId = scriptParsed.getScriptId();
         myUrl = scriptParsed.getUrl();
+        myScriptLanguage = scriptParsed.getScriptLanguage();
     }
 
     public String getId() {
@@ -24,4 +39,39 @@ public String getId() {
     public VirtualFile toVirtualFile() {
         return VirtualFileManager.getInstance().findFileByUrl(myUrl);
     }
+
+    @Nonnull
+    @Override
+    public String getPath() {
+        return/* myId + ":" +*/ VirtualFileUtil.urlToPath(myUrl);
+    }
+
+    @Nonnull
+    @Override
+    public Image getIcon() {
+        return switch (myScriptLanguage) {
+            case JAVA_SCRIPT -> JavaScriptIconGroup.javascript();
+            case WEB_ASSEMBLY ->
+                // TODO web assembly icon
+                JavaScriptIconGroup.javascript();
+        };
+    }
+
+    @Nullable
+    @Override
+    public ColorValue getFileStatusColor() {
+        VirtualFile virtualFile = toVirtualFile();
+        if (virtualFile != null) {
+            return FileColorManager.getInstance(myProject).getFileColorValue(virtualFile);
+        }
+        return null;
+    }
+
+    @Override
+    public void navigate(boolean focus) {
+        VirtualFile file = toVirtualFile();
+        if (file != null) {
+            OpenFileDescriptorFactory.getInstance(myProject).newBuilder(file).build().navigate(focus);
+        }
+    }
 }
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java
index 872dae25..fef896b3 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java
@@ -11,6 +11,8 @@
 import consulo.execution.debug.frame.XCompositeNode;
 import consulo.execution.debug.frame.XStackFrame;
 import consulo.execution.debug.frame.XValueChildrenList;
+import consulo.ui.ex.ColoredTextContainer;
+import consulo.ui.ex.SimpleTextAttributes;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -26,24 +28,32 @@ public class CDTStackFrame extends XStackFrame {
 
     private XSourcePosition mySourcePosition;
 
+    private final Location myLocation;
+    private final CDTScript myScript;
+    private final String myScriptId;
+
     public CDTStackFrame(CallFrame callFrame, CDTProcessBase process) {
         myCallFrame = callFrame;
         myProcess = process;
 
-        Location location = callFrame.getLocation();
+        myLocation = callFrame.getLocation();
 
-        if (location != null) {
-            String scriptId = location.getScriptId();
+        if (myLocation != null) {
+            myScriptId = myLocation.getScriptId();
+            myScript = process.getScripts().find(myScriptId);
 
-            CDTScript script = process.getScripts().find(scriptId);
-            if (script != null) {
+            if (myScript != null) {
                 mySourcePosition = Application.get().getInstance(XSourcePositionFactory.class).createPosition(
-                    script.toVirtualFile(),
-                    location.getLineNumber(),
-                    location.getColumnNumber()
+                    myScript.toVirtualFile(),
+                    myLocation.getLineNumber(),
+                    myLocation.getColumnNumber()
                 );
             }
         }
+        else {
+            myScript = null;
+            myScriptId = null;
+        }
     }
 
     @Nullable
@@ -58,6 +68,22 @@ public Object getEqualityObject() {
         return myCallFrame.getCallFrameId();
     }
 
+    @Override
+    public void customizePresentation(ColoredTextContainer component) {
+        XSourcePosition position = getSourcePosition();
+        if (position != null) {
+            component.append(position.getFile().getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
+            component.append(":" + (position.getLine() + 1), SimpleTextAttributes.REGULAR_ATTRIBUTES);
+        }
+        else if (myScript != null) {
+            component.append(myScript.getPath(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
+            component.append(":" + (myLocation.getLineNumber() + 1), SimpleTextAttributes.REGULAR_ATTRIBUTES);
+        }
+        else {
+            component.append(myScriptId, SimpleTextAttributes.REGULAR_ATTRIBUTES);
+        }
+    }
+
     @Override
     public void computeChildren(@Nonnull XCompositeNode node) {
         myProcess.invoke(devTools -> {
@@ -74,7 +100,7 @@ public void computeChildren(@Nonnull XCompositeNode node) {
                     continue;
                 }
 
-                list.add(new CDTScopeValue(scope, object, myProcess));
+                list.addTopGroup(new CDTScopeValue(scope, object, myProcess));
             }
 
             node.addChildren(list, true);
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java
index 8aa32b44..3a21046a 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java
@@ -2,6 +2,7 @@
 
 import com.github.kklisura.cdt.services.WebSocketService;
 import com.github.kklisura.cdt.services.config.ChromeDevToolsServiceConfiguration;
+import com.github.kklisura.cdt.services.executors.EventExecutorService;
 import com.github.kklisura.cdt.services.impl.ChromeDevToolsServiceImpl;
 import com.github.kklisura.cdt.services.invocation.CommandInvocationHandler;
 import com.github.kklisura.cdt.services.utils.ProxyUtils;
@@ -18,6 +19,21 @@
 public class ChromeDevToolsFactory {
     public static ChromeDevToolsServiceImpl create(WebSocketService webSocketService) {
         ChromeDevToolsServiceConfiguration conf = new ChromeDevToolsServiceConfiguration();
+        conf.setEventExecutorService(new EventExecutorService() {
+            @Override
+            public void execute(Runnable runnable) {
+                runnable.run();
+            }
+
+            @Override
+            public void shutdown() {
+
+            }
+        });
+
+        if (Boolean.FALSE) {
+            webSocketService = new LoggingWebSocketService(webSocketService);
+        }
 
         // Create invocation handler
         CommandInvocationHandler commandInvocationHandler = new CommandInvocationHandler();
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/LoggingWebSocketService.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/LoggingWebSocketService.java
new file mode 100644
index 00000000..c6786585
--- /dev/null
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/LoggingWebSocketService.java
@@ -0,0 +1,48 @@
+package consulo.javascript.debugger.cdt;
+
+import com.github.kklisura.cdt.services.WebSocketService;
+import com.github.kklisura.cdt.services.exceptions.WebSocketServiceException;
+
+import java.net.URI;
+import java.util.function.Consumer;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-16
+ */
+public class LoggingWebSocketService implements WebSocketService {
+    private final WebSocketService myDelegate;
+
+    public LoggingWebSocketService(WebSocketService delegate) {
+        myDelegate = delegate;
+    }
+
+    @Override
+    public void connect(URI uri) throws WebSocketServiceException {
+        myDelegate.connect(uri);
+    }
+
+    @Override
+    public void send(String s) throws WebSocketServiceException {
+        System.out.println("send " + s);
+        myDelegate.send(s);
+    }
+
+    @Override
+    public void addMessageHandler(Consumer<String> consumer) throws WebSocketServiceException {
+        myDelegate.addMessageHandler(s -> {
+            System.out.println("rec: " + s);
+            consumer.accept(s);
+        });
+    }
+
+    @Override
+    public void close() {
+        myDelegate.close();
+    }
+
+    @Override
+    public boolean closed() {
+        return myDelegate.closed();
+    }
+}
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptFileInfo.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptFileInfo.java
new file mode 100644
index 00000000..beb65238
--- /dev/null
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptFileInfo.java
@@ -0,0 +1,22 @@
+package consulo.javascript.debugger;
+
+import consulo.navigation.Navigatable;
+import consulo.ui.color.ColorValue;
+import consulo.ui.image.Image;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-02-16
+ */
+public interface JavaScriptFileInfo extends Navigatable {
+    @Nonnull
+    String getPath();
+
+    @Nonnull
+    Image getIcon();
+
+    @Nullable
+    ColorValue getFileStatusColor();
+}
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
index b838e732..7ce337f2 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
@@ -16,17 +16,15 @@
 
 package consulo.javascript.debugger;
 
-import consulo.language.editor.FileColorManager;
-import consulo.navigation.OpenFileDescriptorFactory;
-import consulo.project.Project;
+import consulo.ui.annotation.RequiredUIAccess;
+import consulo.ui.color.ColorValue;
 import consulo.ui.ex.awt.ColoredListCellRenderer;
 import consulo.ui.ex.awt.JBList;
 import consulo.ui.ex.awt.JBScrollPane;
 import consulo.ui.ex.awt.SortedListModel;
+import consulo.ui.ex.awtUnsafe.TargetAWT;
 import consulo.util.io.FileUtil;
-import consulo.virtualFileSystem.VirtualFile;
 import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
@@ -38,67 +36,52 @@
  * @author VISTALL
  * @since 21.03.14
  */
-public abstract class JavaScriptListPanel<T> extends JPanel {
-    @Nonnull
-    private final Project myProject;
-    private SortedListModel<T> myModel = SortedListModel.create(new Comparator<T>() {
-        @Override
-        public int compare(T o1, T o2) {
-            VirtualFile v1 = toVirtualFile(o1, false);
-            VirtualFile v2 = toVirtualFile(o2, false);
-            if (v1 == null || v2 == null) {
-                return -1;
-            }
-            return FileUtil.comparePaths(v1.getPath(), v2.getPath());
-        }
-    });
+public class JavaScriptListPanel<T extends JavaScriptFileInfo> extends JPanel {
+    private SortedListModel<T> myModel = SortedListModel.create((Comparator<T>) (o1, o2) -> FileUtil.comparePaths(o1.getPath(), o2.getPath()));
 
-    public JavaScriptListPanel(@Nonnull Project project) {
+    public JavaScriptListPanel() {
         super(new BorderLayout());
         init();
-        myProject = project;
     }
 
     private void init() {
-        final JBList<T> jbList = new JBList<>(myModel);
-        jbList.setCellRenderer(new ColoredListCellRenderer<T>() {
+        final JBList<T> list = new JBList<>(myModel);
+        list.setCellRenderer(new ColoredListCellRenderer<T>() {
             @Override
-            protected void customizeCellRenderer(@Nonnull JList<? extends T> jList, T t, int i, boolean b, boolean b1) {
-                VirtualFile virtualFile = toVirtualFile(t, false);
-                if (virtualFile == null) {
-                    append("<invalid>");
-                }
-                else {
-                    setBackground(FileColorManager.getInstance(myProject).getFileColor(virtualFile));
-                    append(virtualFile.getPath());
-                    setIcon(virtualFile.getFileType().getIcon());
+            protected void customizeCellRenderer(@Nonnull JList<? extends T> list, T value, int index, boolean selected, boolean hasFocus) {
+                append(value.getPath());
+
+                setIcon(value.getIcon());
+
+                if (!selected) {
+                    ColorValue fileStatusColor = value.getFileStatusColor();
+                    if (fileStatusColor != null) {
+                        setBackground(TargetAWT.to(fileStatusColor));
+                    }
                 }
             }
         });
-        jbList.addMouseListener(new MouseAdapter() {
+
+        list.addMouseListener(new MouseAdapter() {
             @Override
+            @RequiredUIAccess
             public void mouseClicked(MouseEvent e) {
                 if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
-                    T selectedValue = jbList.getSelectedValue();
+                    T selectedValue = list.getSelectedValue();
                     if (selectedValue == null) {
                         return;
                     }
 
-                    VirtualFile virtualFile = toVirtualFile(selectedValue, true);
-
-                    if (virtualFile != null) {
-                        OpenFileDescriptorFactory.getInstance(myProject).builder(virtualFile).build().navigate(true);
+                    if (selectedValue.canNavigate()) {
+                        selectedValue.navigate(true);
                     }
                 }
             }
         });
 
-        add(new JBScrollPane(jbList), BorderLayout.CENTER);
+        add(new JBScrollPane(list), BorderLayout.CENTER);
     }
 
-    @Nullable
-    public abstract VirtualFile toVirtualFile(@Nonnull T value, boolean toOpen);
-
     public void add(T value) {
         myModel.add(value);
     }
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 41a95d98..74fc1fb3 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -142,24 +142,12 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>consulo.javascript-debugger.impl</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>consulo.javascript-v8.debugger.impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>consulo.javascript-regexp.impl</artifactId>
@@ -181,7 +169,7 @@
         <dependency>
             <groupId>consulo.internal.com.github.kklisura.cdt</groupId>
             <artifactId>cdt-java-client</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.javassist</groupId>
diff --git a/pom.xml b/pom.xml
index 65f9f2ff..bf86e0aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,6 @@
         </module>
         <module>web-browser-impl</module>
         <module>debugger/debugger-impl</module>
-        <module>debugger/v8-debugger-impl</module>
         <module>debugger/browser-debugger-impl</module>
         <module>debugger/cdt-debugger-impl</module>
         <module>lang-version-impl/javascript16-impl</module>

From 18e43b895a28c6622337b8747ccf6c589662fdbc Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 18 Feb 2026 19:33:17 +0200
Subject: [PATCH 316/340] add missed exports

---
 debugger/browser-debugger-impl/pom.xml               | 12 ------------
 .../src/main/java/module-info.java                   |  2 ++
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/debugger/browser-debugger-impl/pom.xml b/debugger/browser-debugger-impl/pom.xml
index ef96f44d..5ebf640d 100644
--- a/debugger/browser-debugger-impl/pom.xml
+++ b/debugger/browser-debugger-impl/pom.xml
@@ -66,18 +66,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.kklisura.cdt</groupId>
-            <artifactId>cdt-java-client</artifactId>
-            <version>2.1.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.javassist</groupId>
-                    <artifactId>javassist</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/debugger/browser-debugger-impl/src/main/java/module-info.java b/debugger/browser-debugger-impl/src/main/java/module-info.java
index acb30dcf..2aed0f0e 100644
--- a/debugger/browser-debugger-impl/src/main/java/module-info.java
+++ b/debugger/browser-debugger-impl/src/main/java/module-info.java
@@ -10,4 +10,6 @@
     requires cdt.java.client;
 
     requires consulo.javascript.cdt.debugger.impl;
+
+    opens consulo.javascript.debugger.browser to consulo.util.xml.serializer;
 }
\ No newline at end of file

From d51c7547c09e5175ca18b9679910b7183892c3b5 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 1 Mar 2026 12:56:38 +0200
Subject: [PATCH 317/340] compile fix

---
 .../javascript/impl/ide/actions/JavaScriptCreateFileAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
index cbf8fc69..8448d550 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
@@ -3,12 +3,12 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.application.ReadAction;
 import consulo.dataContext.DataContext;
-import consulo.ide.IdeView;
 import consulo.ide.action.CreateFileFromTemplateAction;
 import consulo.ide.action.CreateFileFromTemplateDialog;
 import consulo.javascript.language.JavaScriptFileType;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.javascript.module.extension.JavaScriptModuleExtension;
+import consulo.language.editor.util.IdeView;
 import consulo.language.psi.PsiDirectory;
 import consulo.language.util.ModuleUtilCore;
 import consulo.localize.LocalizeValue;

From 647d59877a7be5368218aad41bfc78dee8615bd3 Mon Sep 17 00:00:00 2001
From: Nikolay Yurchenko <nikolay@yurchenko.su>
Date: Mon, 2 Mar 2026 12:57:29 +0300
Subject: [PATCH 318/340] Merge pull request #118 from
 unv-unv/string-escape-performance

Improving performance of escapeStringCharacters call by using StringBuilder variant
---
 .../JSConstantExpressionIntention.java        | 34 +++++------
 .../JSConstantSubexpressionIntention.java     | 58 +++++++++----------
 .../JSAbstractElementManipulator.java         | 18 ++++--
 .../flex/importer/AS3InterfaceDumper.java     | 12 ++--
 .../flex/importer/AbstractDumpProcessor.java  | 26 ---------
 5 files changed, 60 insertions(+), 88 deletions(-)

diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 4a3f7540..09d36b54 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -25,7 +25,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import consulo.util.lang.StringUtil;
+import consulo.util.lang.StringEscapeUtil;
 import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
@@ -40,24 +40,24 @@
     fileExtensions = "js"
 )
 public class JSConstantExpressionIntention extends JSIntention {
-    @Override
     @Nonnull
+    @Override
     public LocalizeValue getText() {
         return JSIntentionLocalize.constantComputeExpression();
     }
 
-    @Override
     @Nonnull
+    @Override
     protected JSElementPredicate getElementPredicate() {
         return new ConstantExpressionPredicate();
     }
 
     @Override
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
-        JSExpression expression = (JSExpression)element;
+        JSExpression expression = (JSExpression) element;
         Object value = ExpressionUtil.computeConstantExpression(expression);
         String newExpression = value instanceof String strValue
-            ? '"' + StringUtil.escapeStringCharacters(strValue) + '"'
+            ? StringEscapeUtil.quote(strValue, '"')
             : String.valueOf(value);
         JSElementFactory.replaceExpression(expression, newExpression);
     }
@@ -65,22 +65,14 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class ConstantExpressionPredicate implements JSElementPredicate {
         @Override
         public boolean satisfiedBy(@Nonnull PsiElement element) {
-            if (!(element instanceof JSExpression) || ErrorUtil.containsError(element)) {
-                return false;
-            }
-            JSExpression expression = (JSExpression)element;
-
-            if (element instanceof JSLiteralExpression
-                || (element instanceof JSReferenceExpression referenceExpression && referenceExpression.getQualifier() != null)
-                || expression instanceof JSCallExpression
-                || !ExpressionUtil.isConstantExpression(expression)
-                || ExpressionUtil.computeConstantExpression(expression) == null) {
-                return false;
-            }
-
-            PsiElement parent = element.getParent();
-
-            return !(parent instanceof JSExpression parentExpression && ExpressionUtil.isConstantExpression(parentExpression));
+            return element instanceof JSExpression expression
+                && !ErrorUtil.containsError(element)
+                && !(element instanceof JSLiteralExpression)
+                && !(element instanceof JSReferenceExpression refExpr && refExpr.getQualifier() != null)
+                && !(expression instanceof JSCallExpression)
+                && ExpressionUtil.isConstantExpression(expression)
+                && ExpressionUtil.computeConstantExpression(expression) != null
+                && !(element.getParent() instanceof JSExpression parentExpr && ExpressionUtil.isConstantExpression(parentExpr));
         }
     }
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index c98c59ea..e9372468 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -27,7 +27,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import consulo.util.lang.StringUtil;
+import consulo.util.lang.StringEscapeUtil;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
@@ -44,8 +44,8 @@
     fileExtensions = "js"
 )
 public class JSConstantSubexpressionIntention extends JSMutablyNamedIntention {
-    @Override
     @Nonnull
+    @Override
     protected JSElementPredicate getElementPredicate() {
         return new ConstantSubexpressionPredicate();
     }
@@ -60,14 +60,14 @@ protected LocalizeValue getBasicText() {
     @RequiredReadAction
     protected LocalizeValue getTextForElement(PsiElement element) {
         PsiElement parent = element.getParent();
-        JSBinaryExpression binaryExpression = (JSBinaryExpression)(parent instanceof JSBinaryExpression ? parent : element);
+        JSBinaryExpression binaryExpression = (JSBinaryExpression) (parent instanceof JSBinaryExpression ? parent : element);
         JSExpression lhs = binaryExpression.getLOperand();
         JSExpression leftSide = lhs instanceof JSBinaryExpression lhsBinaryExpression ? lhsBinaryExpression.getROperand() : lhs;
         IElementType operationSign = binaryExpression.getOperationSign();
         JSExpression rhs = binaryExpression.getROperand();
 
-        assert (rhs != null);
-        assert (leftSide != null);
+        assert rhs != null;
+        assert leftSide != null;
 
         return JSIntentionLocalize.constantComputeSubexpressionMessage(
             leftSide.getText(),
@@ -80,20 +80,17 @@ protected LocalizeValue getTextForElement(PsiElement element) {
     @RequiredReadAction
     public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
         PsiElement parent = element.getParent();
-        JSExpression expression = (JSExpression)(parent instanceof JSBinaryExpression ? parent : element);
-        String newExpression = "";
+        JSExpression expression = (JSExpression) (parent instanceof JSBinaryExpression ? parent : element);
+        StringBuilder newExpression = new StringBuilder();
         Object constantValue;
 
-        if (expression instanceof JSBinaryExpression) {
-            JSBinaryExpression binaryExpression = (JSBinaryExpression)expression;
-            JSExpression lhs = binaryExpression.getLOperand();
-
-            if (lhs instanceof JSBinaryExpression lhsBinaryExpression) {
-                JSExpression rightSide = lhsBinaryExpression.getROperand();
+        if (expression instanceof JSBinaryExpression binaryExpression) {
+            if (binaryExpression.getLOperand() instanceof JSBinaryExpression lhsBinaryExpr) {
+                JSExpression rightSide = lhsBinaryExpr.getROperand();
 
-                newExpression += getLeftSideText(lhsBinaryExpression);
+                appendLeftSideText(lhsBinaryExpr, newExpression);
 
-                assert (rightSide != null);
+                assert rightSide != null;
             }
             constantValue = ExpressionUtil.computeConstantExpression(getSubexpression(binaryExpression));
         }
@@ -101,20 +98,23 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
             constantValue = ExpressionUtil.computeConstantExpression(expression);
         }
 
-        newExpression += constantValue instanceof String strValue
-            ? '"' + StringUtil.escapeStringCharacters(strValue) + '"'
-            : String.valueOf(constantValue);
-        JSElementFactory.replaceExpression(expression, newExpression);
+        if (constantValue instanceof String strValue) {
+            StringEscapeUtil.escape(strValue, '"', newExpression);
+        }
+        else {
+            newExpression.append(constantValue);
+        }
+        JSElementFactory.replaceExpression(expression, newExpression.toString());
     }
 
     @RequiredReadAction
-    private static String getLeftSideText(JSBinaryExpression binaryExpression) {
-        return binaryExpression.getLOperand().getText() +
-            BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign());
+    private static void appendLeftSideText(JSBinaryExpression binaryExpression, StringBuilder builder) {
+        builder.append(binaryExpression.getLOperand().getText())
+            .append(BinaryOperatorUtils.getOperatorText(binaryExpression.getOperationSign()));
     }
 
     /**
-     * Returns the smallest subexpression (if precendence allows it). For instance:
+     * Returns the smallest subexpression (if precedence allows it). For instance:
      * variable + 2 + 3 normally gets evaluated left to right -> (variable + 2)
      * + 3 this method returns the right most legal subexpression -> 2 + 3
      *
@@ -126,7 +126,7 @@ private static String getLeftSideText(JSBinaryExpression binaryExpression) {
     private static JSBinaryExpression getSubexpression(JSBinaryExpression expression) {
         JSExpression rhs = expression.getROperand();
         IElementType sign = expression.getOperationSign();
-        int parentPrecendence = ParenthesesUtils.getPrecendence(expression);
+        int parentPrecedence = ParenthesesUtils.getPrecendence(expression);
 
         if (rhs == null) {
             return null;
@@ -138,17 +138,17 @@ private static JSBinaryExpression getSubexpression(JSBinaryExpression expression
             return expression;
         }
 
-        JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression)lhs;
-        int childPrecendence = ParenthesesUtils.getPrecendence(lhsBinaryExpression);
+        JSBinaryExpression lhsBinaryExpression = (JSBinaryExpression) lhs;
+        int childPrecedence = ParenthesesUtils.getPrecendence(lhsBinaryExpression);
         JSExpression leftSide = lhsBinaryExpression.getROperand();
 
-        if (leftSide == null || parentPrecendence > childPrecendence) {
+        if (leftSide == null || parentPrecedence > childPrecedence) {
             return null;
         }
 
         try {
             String subExpressionText = leftSide.getText() + BinaryOperatorUtils.getOperatorText(sign) + rhs.getText();
-            return (JSBinaryExpression)JSChangeUtil.createExpressionFromText(expression.getProject(), subExpressionText);
+            return (JSBinaryExpression) JSChangeUtil.createExpressionFromText(expression.getProject(), subExpressionText);
         }
         catch (Throwable ignore) {
             return null;
@@ -174,7 +174,7 @@ public boolean satisfiedBy(@Nonnull PsiElement element) {
                     return false;
                 }
             }
-            JSBinaryExpression binaryExpression = (JSBinaryExpression)parent;
+            JSBinaryExpression binaryExpression = (JSBinaryExpression) parent;
 
             JSBinaryExpression subexpression = getSubexpression(binaryExpression);
             if (subexpression == null) {
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
index 551e93c9..f823a0dd 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAbstractElementManipulator.java
@@ -15,24 +15,30 @@
  */
 package com.intellij.javascript.manipulators;
 
+import consulo.annotation.access.RequiredWriteAction;
 import consulo.document.util.TextRange;
-import consulo.language.psi.PsiElement;
-import consulo.project.Project;
 import consulo.language.psi.AbstractElementManipulator;
+import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-import consulo.util.lang.StringUtil;
+import consulo.project.Project;
+import consulo.util.lang.StringEscapeUtil;
 
 /**
  * @author peter
  */
 abstract class JSAbstractElementManipulator<T extends PsiElement> extends AbstractElementManipulator<T> {
     @Override
+    @RequiredWriteAction
+    @SuppressWarnings("unchecked")
     public T handleContentChange(T element, TextRange range, String newContent) throws IncorrectOperationException {
         String oldText = element.getText();
-        newContent = StringUtil.escapeStringCharacters(newContent);
-        String newText = oldText.substring(0, range.getStartOffset()) + newContent + oldText.substring(range.getEndOffset());
+        int oldLength = oldText.length();
+        StringBuilder newText = new StringBuilder(oldLength);
+        newText.append(oldText, 0, range.getStartOffset());
+        StringEscapeUtil.escape(newContent, '"', newText);
+        newText.append(oldText, range.getEndOffset(), oldLength);
 
-        return (T)element.replace(createTree(newText, element.getProject()));
+        return (T) element.replace(createTree(newText.toString(), element.getProject()));
     }
 
     protected abstract T createTree(String newText, Project project);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
index e0d2f1f1..098574c3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
@@ -16,6 +16,7 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
+import consulo.util.lang.StringEscapeUtil;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -86,9 +87,8 @@ protected static String getValueRepr(Object valueObject) {
                 catch (NumberFormatException ignored) {
                 }
             }
-            else if (value.length() > 0 && (Character.isDigit(
-                ch = value.charAt(0)) || (ch == '-' && value.length() > 1 && Character.isDigit(value.charAt(1)
-            )))) {
+            else if (value.length() > 0
+                && (Character.isDigit(ch = value.charAt(0)) || ch == '-' && value.length() > 1 && Character.isDigit(value.charAt(1)))) {
                 try {
                     Integer.parseInt(value);
                     doQoute = false;
@@ -98,17 +98,17 @@ else if (value.length() > 0 && (Character.isDigit(
             }
 
             if (doQoute) {
-                value = "\"" + quote(value) + "\"";
+                value = StringEscapeUtil.quote(value, '"');
             }
         }
         return value;
     }
 
-    private static final Set<String> DO_NOT_NEED_QOTING =
+    private static final Set<String> DO_NOT_NEED_QUOTING =
         Set.of("null", "NaN", "undefined", "true", "false", "Infinity", "-Infinity");
 
     private static boolean needsQuoting(String value) {
-        return !DO_NOT_NEED_QOTING.contains(value);
+        return !DO_NOT_NEED_QUOTING.contains(value);
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
index 7eecd220..6a3ccfac 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.lang.javascript.impl.flex.importer;
 
 import jakarta.annotation.Nonnull;
@@ -237,29 +236,4 @@ protected void dumpInterfacesList(String indent, Traits it, boolean anInterface)
             append("\n");
         }
     }
-
-    protected static String quote(String s) {
-        if (s.length() == 0) {
-            return s;
-        }
-        StringBuilder b = new StringBuilder(s.length());
-
-        for (int i = 0; i < s.length(); ++i) {
-            char ch = s.charAt(i);
-
-            if (ch == '\\' || ch == '"') {
-                b.append('\\');
-            }
-            else if (ch == '\n') {
-                b.append("\\n");
-                continue;
-            }
-            else if (ch == '\r') {
-                b.append("\\r");
-                continue;
-            }
-            b.append(ch);
-        }
-        return b.toString();
-    }
 }

From 376c40eb3e889992986d656368c706f9abdb31af Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Mar 2026 14:21:24 +0200
Subject: [PATCH 319/340] hide debug

---
 .../debugger/cdt/ChromeDevToolsFactory.java           |  3 +--
 .../debugger/cdt/LoggingWebSocketService.java         | 11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java
index 3a21046a..b64b0fba 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/ChromeDevToolsFactory.java
@@ -27,11 +27,10 @@ public void execute(Runnable runnable) {
 
             @Override
             public void shutdown() {
-
             }
         });
 
-        if (Boolean.FALSE) {
+        if (LoggingWebSocketService.DEBUG) {
             webSocketService = new LoggingWebSocketService(webSocketService);
         }
 
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/LoggingWebSocketService.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/LoggingWebSocketService.java
index c6786585..52f1e8a9 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/LoggingWebSocketService.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/LoggingWebSocketService.java
@@ -11,6 +11,8 @@
  * @since 2026-02-16
  */
 public class LoggingWebSocketService implements WebSocketService {
+    public static final Boolean DEBUG = false;
+
     private final WebSocketService myDelegate;
 
     public LoggingWebSocketService(WebSocketService delegate) {
@@ -24,14 +26,19 @@ public void connect(URI uri) throws WebSocketServiceException {
 
     @Override
     public void send(String s) throws WebSocketServiceException {
-        System.out.println("send " + s);
+        if (DEBUG) {
+            System.out.println("send " + s);
+        }
+
         myDelegate.send(s);
     }
 
     @Override
     public void addMessageHandler(Consumer<String> consumer) throws WebSocketServiceException {
         myDelegate.addMessageHandler(s -> {
-            System.out.println("rec: " + s);
+            if (DEBUG) {
+                System.out.println("rec: " + s);
+            }
             consumer.accept(s);
         });
     }

From f52497b6e1eca9857dfba5fca86ae38055e1839c Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 15 Mar 2026 21:56:05 +0200
Subject: [PATCH 320/340] migrate to jspecify

---
 .../lang/javascript/psi/JSAttribute.java      |   2 -
 .../lang/javascript/psi/JSAttributeList.java  |   6 +-
 .../javascript/psi/JSAttributeListOwner.java  |   2 +-
 .../psi/JSAttributeNameValuePair.java         |   2 +-
 .../javascript/psi/JSBinaryExpression.java    |   2 +-
 .../intellij/lang/javascript/psi/JSClass.java |   2 +-
 .../javascript/psi/JSClassExpression.java     |   2 -
 .../psi/JSDestructuringElement.java           |   4 +-
 .../javascript/psi/JSDestructuringObject.java |   2 -
 .../psi/JSDestructuringParameter.java         |   2 +-
 .../JSDestructuringShorthandedProperty.java   |   2 -
 .../lang/javascript/psi/JSDocTag.java         |   2 +-
 .../lang/javascript/psi/JSElementVisitor.java | 133 +++++++++---------
 .../lang/javascript/psi/JSExpression.java     |   3 -
 .../javascript/psi/JSExpressionStatement.java |   2 +-
 .../lang/javascript/psi/JSFunction.java       |   5 +-
 .../javascript/psi/JSFunctionExpression.java  |   2 -
 .../psi/JSNamespaceDeclaration.java           |   2 +-
 .../lang/javascript/psi/JSParameter.java      |   2 +-
 .../javascript/psi/JSPostfixExpression.java   |   2 +-
 .../javascript/psi/JSPrefixExpression.java    |   2 +-
 .../lang/javascript/psi/JSProperty.java       |   4 +-
 .../javascript/psi/JSReferenceExpression.java |   2 +-
 .../lang/javascript/psi/JSReferenceList.java  |   4 -
 .../lang/javascript/psi/JSTryStatement.java   |   4 +-
 .../lang/javascript/psi/JSVarStatement.java   |   2 +-
 .../lang/javascript/psi/JSVariable.java       |   4 +-
 .../lang/javascript/psi/JSYieldStatement.java |   2 +-
 .../stubs/JSAttributeNameValuePairStub.java   |   2 +-
 .../JavaScriptKeywordCompletionExtender.java  |   3 +-
 .../javascript/index/JavaScriptIndexer.java   |   3 +-
 .../language/JavaScriptFeature.java           |   2 -
 .../language/JavaScriptFileType.java          |   8 +-
 .../JavaScriptFileTypeWithVersion.java        |   4 +-
 .../language/JavaScriptLanguage.java          |   6 +-
 .../language/JavaScriptLanguageVersion.java   |   5 +-
 .../language/JavaScriptVersionUtil.java       |   5 +-
 .../language/StandardJavaScriptVersions.java  |   7 +-
 .../language/psi/JavaScriptPrimitiveType.java |   4 +-
 .../language/psi/JavaScriptType.java          |   5 +-
 .../language/psi/JavaScriptTypeElement.java   |   2 -
 .../stub/JSImplementedInterfacesIndex.java    |   2 -
 .../language/psi/stub/JSNameIndex.java        |   2 -
 .../psi/stub/JSQualifiedElementIndex.java     |   2 -
 .../language/psi/stub/JSSuperClassIndex.java  |   2 -
 .../extension/JavaScriptModuleExtension.java  |   2 -
 .../JavaScriptMutableModuleExtension.java     |   3 +-
 .../javascript/psi/JSComputedName.java        |   2 +-
 .../psi/JSSimpleLiteralExpression.java        |   2 -
 .../JSPropertyNameReferenceProvider.java      |   5 +-
 .../javascript/psi/stubs/JSFileStub.java      |   2 -
 .../documentation/JSDocumentationBuilder.java |  13 +-
 .../JSDocumentationProcessor.java             |   9 +-
 .../JSDocumentationProvider.java              |  12 +-
 .../documentation/JSDocumentationUtils.java   |  33 +++--
 .../lang/javascript/JSDocElementType.java     |   4 +-
 .../lang/javascript/JSElementType.java        |   4 +-
 .../lang/javascript/JSElementTypes.java       |   8 +-
 .../lang/javascript/JSLanguageInjector.java   |  24 ++--
 .../lang/javascript/JSStubElementTypes.java   |   6 +-
 .../lang/javascript/JSTokenTypes.java         |   8 +-
 .../JavaScriptStubElementHolder.java          |   4 +-
 .../javascript/JavaScriptSupportLoader.java   |  14 --
 .../XmlAttributeValueJSInjector.java          |   2 -
 .../lang/javascript/XmlTextJSInjector.java    |   2 -
 .../javascript/flex/FlexImportSupport.java    |   3 +-
 .../lang/javascript/flex/JSResolveHelper.java |   2 +-
 .../javascript/flex/XmlBackedJSClassImpl.java |  20 ++-
 .../highlighting/JSHighlighter.java           |   5 +-
 .../javascript/index/JSItemPresentation.java  |   2 +-
 .../lang/javascript/index/JSSymbolUtil.java   |   2 +-
 .../inspections/qucikFixes/BaseCreateFix.java |   5 +-
 .../lang/javascript/parsing/JSDocParsing.java |   5 +-
 .../psi/impl/JSArgumentListImpl.java          |   3 +-
 .../impl/JSArrayLiteralExpressionImpl.java    |   3 +-
 .../psi/impl/JSAssignmentExpressionImpl.java  |   3 +-
 .../javascript/psi/impl/JSAttributeImpl.java  |  14 +-
 .../psi/impl/JSAttributeListImpl.java         |  10 +-
 .../impl/JSAttributeNameValuePairImpl.java    |   6 +-
 .../psi/impl/JSBinaryExpressionImpl.java      |  11 +-
 .../psi/impl/JSBlockStatementImpl.java        |   5 +-
 .../psi/impl/JSBreakStatementImpl.java        |   3 +-
 .../psi/impl/JSCallExpressionImpl.java        |   3 +-
 .../javascript/psi/impl/JSCaseClauseImpl.java |   3 +-
 .../javascript/psi/impl/JSCatchBlockImpl.java |   9 +-
 .../javascript/psi/impl/JSChangeUtil.java     |  17 +--
 .../lang/javascript/psi/impl/JSClassBase.java |  23 ++-
 .../psi/impl/JSClassExpressionImpl.java       |   5 +-
 .../lang/javascript/psi/impl/JSClassImpl.java |  14 +-
 .../psi/impl/JSCommaExpressionImpl.java       |   3 +-
 .../psi/impl/JSConditionalExpressionImpl.java |   3 +-
 .../psi/impl/JSContinueStatementImpl.java     |   3 +-
 .../psi/impl/JSDefinitionExpressionImpl.java  |  11 +-
 .../psi/impl/JSDoWhileStatementImpl.java      |   3 +-
 .../javascript/psi/impl/JSDocCommentImpl.java |   3 +-
 .../javascript/psi/impl/JSDocTagImpl.java     |  14 +-
 .../psi/impl/JSDocTagValueImpl.java           |   4 +-
 .../psi/impl/JSEmbeddedContentImpl.java       |   9 +-
 .../psi/impl/JSEmptyStatementImpl.java        |   3 +-
 .../impl/JSExpressionCodeFragmentImpl.java    |   5 +-
 .../javascript/psi/impl/JSExpressionImpl.java |   3 -
 .../psi/impl/JSExpressionStatementImpl.java   |   9 +-
 .../lang/javascript/psi/impl/JSFileImpl.java  |  21 ++-
 .../psi/impl/JSForInStatementImpl.java        |   9 +-
 .../psi/impl/JSForStatementImpl.java          |   9 +-
 .../psi/impl/JSFunctionBaseImpl.java          |  12 +-
 .../psi/impl/JSFunctionExpressionImpl.java    |   5 +-
 .../javascript/psi/impl/JSFunctionImpl.java   |   7 +-
 .../psi/impl/JSFunctionPropertyImpl.java      |   4 +-
 .../psi/impl/JSGenericSignatureImpl.java      |   3 +-
 .../psi/impl/JSIfStatementImpl.java           |   3 +-
 .../psi/impl/JSImportStatementImpl.java       |   9 +-
 .../psi/impl/JSIncludeDirectiveImpl.java      |   4 +-
 ...JSIndexedPropertyAccessExpressionImpl.java |   3 +-
 .../psi/impl/JSLabeledStatementImpl.java      |   5 +-
 .../psi/impl/JSLetExpressionImpl.java         |   3 +-
 .../psi/impl/JSLetStatementImpl.java          |   3 +-
 .../psi/impl/JSLiteralExpressionImpl.java     |   9 +-
 .../psi/impl/JSNamespaceDeclarationImpl.java  |  11 +-
 .../psi/impl/JSNewExpressionImpl.java         |   4 +-
 .../impl/JSObjectLiteralExpressionImpl.java   |   9 +-
 .../psi/impl/JSPackageStatementImpl.java      |  15 +-
 .../javascript/psi/impl/JSParameterImpl.java  |  11 +-
 .../psi/impl/JSParameterListImpl.java         |   3 +-
 .../impl/JSParenthesizedExpressionImpl.java   |   3 +-
 .../psi/impl/JSPostfixExpressionImpl.java     |   4 +-
 .../psi/impl/JSPrefixExpressionImpl.java      |   6 +-
 .../javascript/psi/impl/JSPropertyImpl.java   |  10 +-
 .../javascript/psi/impl/JSPsiImplUtils.java   |  18 ++-
 .../psi/impl/JSReferenceExpressionImpl.java   |  21 +--
 .../psi/impl/JSReferenceListImpl.java         |   6 +-
 .../javascript/psi/impl/JSReferenceSet.java   |  15 +-
 .../psi/impl/JSReturnStatementImpl.java       |   3 +-
 .../JSSmartCompletionVariantsHandler.java     |   7 +-
 .../JSStatementWithLabelReferenceImpl.java    |  11 +-
 .../psi/impl/JSStubElementImpl.java           |  15 +-
 .../psi/impl/JSSuperExpressionImpl.java       |  11 +-
 .../psi/impl/JSSwitchStatementImpl.java       |   3 +-
 .../psi/impl/JSThisExpressionImpl.java        |   3 +-
 .../psi/impl/JSThrowStatementImpl.java        |   3 +-
 .../psi/impl/JSTryStatementImpl.java          |   6 +-
 .../psi/impl/JSUseNamespaceDirectiveImpl.java |   9 +-
 .../psi/impl/JSVarStatementImpl.java          |  11 +-
 .../psi/impl/JSVariableBaseImpl.java          |  13 +-
 .../javascript/psi/impl/JSVariableImpl.java   |   4 +-
 .../psi/impl/JSWhileStatementImpl.java        |   3 +-
 .../psi/impl/JSWithStatementImpl.java         |   3 +-
 .../psi/impl/JSXmlLiteralExpressionImpl.java  |  24 +---
 .../psi/impl/JSYieldStatementImpl.java        |   3 +-
 .../psi/impl/JavaScriptSimpleType.java        |   6 +-
 .../reference/JSPropertyNameReference.java    |   7 +-
 .../psi/resolve/BaseJSSymbolProcessor.java    |  13 +-
 .../psi/resolve/JSImportHandlingUtil.java     |  15 +-
 .../javascript/psi/resolve/JSResolveUtil.java |  43 +++---
 .../psi/resolve/ResolveProcessor.java         |  11 +-
 .../psi/resolve/VariantsProcessor.java        |   7 +-
 .../psi/resolve/WalkUpResolveProcessor.java   |   7 +-
 .../javascript/psi/util/JSLookupUtil.java     |   5 +-
 .../lang/javascript/search/JSClassSearch.java |   5 +-
 .../types/JSAttributeElementType.java         |  13 +-
 .../types/JSAttributeListElementType.java     |  13 +-
 .../types/JSAttributeNameValuePairType.java   |  13 +-
 .../javascript/types/JSClassElementType.java  |  15 +-
 .../javascript/types/JSFileElementType.java   |  12 +-
 .../types/JSFunctionElementType.java          |  10 +-
 .../types/JSImportStatementElementType.java   |  13 +-
 .../types/JSIncludeDirectiveElementType.java  |  13 +-
 .../JSNamespaceDeclarationElementType.java    |  13 +-
 .../types/JSPackageStatementElementType.java  |  13 +-
 .../types/JSParameterElementType.java         |  13 +-
 .../types/JSParameterListElementType.java     |  13 +-
 .../types/JSReferenceListElementType.java     |  18 +--
 .../types/JSUseNamespaceDirectiveType.java    |  13 +-
 .../types/JSVarStatementElementType.java      |  13 +-
 .../types/JSVariableElementType.java          |  13 +-
 .../validation/JSUnusedImportsHelper.java     |   2 +-
 .../JavaScriptQuickFixFactory.java            |   6 +-
 .../ide/hightlight/JavaScriptHighlighter.java |   5 +-
 .../JavaScriptSyntaxHighlightFactory.java     |   5 +-
 .../impl/language/JavaScriptQuoteHandler.java |   4 +-
 .../impl/language/psi/JSComputedNameImpl.java |   5 +-
 .../impl/language/psi/JSElementFactory.java   |   4 +-
 .../impl/language/psi/JSStubElementType.java  |   4 +-
 .../psi/JavaScriptLambdaExpressionImpl.java   |  15 +-
 .../psi/JavaScriptSpreadExpressionImpl.java   |   5 +-
 .../language/psi/stub/JSFileStubImpl.java     |   8 +-
 .../psi/stub/JavaScriptClassNameIndex.java    |   2 -
 .../qucikFixes/CreateJSFunctionFixBase.java   |   5 +-
 .../lang/BaseJavaScriptLanguageVersion.java   |   9 +-
 .../lang/JavaScript15LanguageVersion.java     |   5 -
 .../JavaScriptContextKeywordElementType.java  |   7 +-
 .../lang/StandardJavaScriptVersionsImpl.java  |   6 +-
 .../lang/parsing/ExpressionParsing.java       |   2 +-
 .../lang/parsing/FunctionParsing.java         |   7 +-
 .../javascript/lang/parsing/JSXParser.java    |   9 +-
 .../lang/parsing/JavaScriptParser.java        |   6 +-
 .../parsing/JavaScriptParsingContext.java     |   7 -
 .../javascript/lang/parsing/Parsing.java      |  11 +-
 .../lang/parsing/StatementParsing.java        |   3 +-
 .../JavaSciptDestructuringElementImpl.java    |   5 +-
 .../JavaSciptDestructuringObjectImpl.java     |   4 +-
 .../JavaScriptDestructuringParameterImpl.java |  15 +-
 ...tDestructuringShorthandedPropertyImpl.java |   4 +-
 .../impl/JavaScriptStrictParserBuilder.java   |   2 +-
 .../lang/psi/impl/JavaScriptClassType.java    |   4 +-
 .../BaseJavaScriptElementType.java            |   3 +-
 .../resolve/JavaScriptVersionWithHelper.java  |   2 -
 .../lang/psi/impl/resolve/ResolveHelper.java  |   5 +-
 .../JSFileViewProviderFactory.java            |  14 +-
 .../types/JSQualifiedStubElementType.java     |   6 +-
 .../browser/BrowserCDTDebugProcess.java       |   3 +-
 .../browser/BrowserDebuggerProcess.java       |   3 +-
 .../JavaScriptBrowserConfiguration.java       |   8 +-
 .../JavaScriptBrowserConfigurationEditor.java |   2 +-
 .../JavaScriptBrowserConfigurationType.java   |   3 +-
 .../browser/JavaScriptBrowserDebugRunner.java |   6 +-
 .../transport/ExtensionWebSocketAccepter.java |   5 +-
 .../debugger/cdt/CDTExecutionStack.java       |   2 +-
 .../debugger/cdt/CDTProcessBase.java          |  18 +--
 .../debugger/cdt/CDTRemoteObjectValue.java    |  12 +-
 .../debugger/cdt/CDTScopeValue.java           |   9 +-
 .../javascript/debugger/cdt/CDTScript.java    |   5 +-
 .../debugger/cdt/CDTStackFrame.java           |   5 +-
 .../debugger/cdt/CDTSuspendContext.java       |   2 +-
 .../debugger/JSDebuggerSupportUtils.java      |  11 +-
 .../debugger/JavaScriptEditorsProvider.java   |   6 +-
 .../debugger/JavaScriptFileInfo.java          |   5 +-
 .../JavaScriptLineBreakpointType.java         |   8 +-
 .../JavaScriptLineBreakpointTypeResolver.java |   6 +-
 .../debugger/JavaScriptListPanel.java         |   3 +-
 .../run/debug/v8/V8BaseDebugProcess.java      |  20 +--
 .../run/debug/v8/V8BaseVariableValue.java     |  14 +-
 .../run/debug/v8/V8DebugProcess.java          |   4 +-
 .../run/debug/v8/V8ExecutionStack.java        |   2 +-
 .../javascript/run/debug/v8/V8ScriptUtil.java |   4 +-
 .../javascript/run/debug/v8/V8StackFrame.java |   7 +-
 .../run/debug/v8/V8SuspendContext.java        |   2 +-
 .../run/debug/v8/V8VariableValue.java         |  10 +-
 .../javascript/run/debug/v8/V8WatchValue.java |   5 +-
 .../com/sixrr/inspectjs/BaseInspection.java   |  11 +-
 .../inspectjs/BaseInspectionVisitor.java      |   5 +-
 .../com/sixrr/inspectjs/InspectionJSFix.java  |   5 +-
 .../AssignmentResultUsedJSInspection.java     |   7 +-
 ...ignmentToForLoopParameterJSInspection.java |   9 +-
 ...gnmentToFunctionParameterJSInspection.java |  11 +-
 .../NestedAssignmentJSInspection.java         |   6 +-
 ...entWithOperatorAssignmentJSInspection.java |   8 +-
 .../SillyAssignmentJSInspection.java          |   5 +-
 .../bitwise/IncompatibleMaskJSInspection.java |   7 +-
 ...ointlessBitwiseExpressionJSInspection.java |   8 +-
 ...essBitwiseExpressionJSInspectionState.java |   2 +-
 .../bitwise/ShiftOutOfRangeJSInspection.java  |   6 +-
 .../bugs/DivideByZeroJSInspection.java        |  10 +-
 ...ityComparisonWithCoercionJSInspection.java |  11 +-
 .../bugs/InfiniteLoopJSInspection.java        |   9 +-
 .../bugs/InfiniteRecursionJSInspection.java   |   6 +-
 ...tCircuitBooleanExpressionJSInspection.java |   8 +-
 .../ObjectAllocationIgnoredJSInspection.java  |   7 +-
 .../sixrr/inspectjs/bugs/RecursionUtils.java  |   5 +-
 .../inspectjs/bugs/RecursionVisitor.java      |   7 +-
 ...extLabelInSwitchStatementJSInspection.java |   6 +-
 .../AnonymousFunctionJSInspection.java        |   5 +-
 .../confusing/BlockStatementJSInspection.java |   5 +-
 .../confusing/CallerJSInspection.java         |   5 +-
 .../CommaExpressionJSInspection.java          |   5 +-
 .../ConditionalExpressionJSInspection.java    |   5 +-
 ...usingFloatingPointLiteralJSInspection.java |   7 +-
 .../ConfusingPlusesOrMinusesJSInspection.java |   5 +-
 .../DynamicallyGeneratedCodeJSInspection.java |  10 +-
 .../EmptyStatementBodyJSInspection.java       |  15 +-
 .../EmptyStatementBodyJSInspectionState.java  |   2 +-
 ...rementDecrementResultUsedJSInspection.java |   5 +-
 .../confusing/MagicNumberJSInspection.java    |   6 +-
 ...atedConditionalExpressionJSInspection.java |   6 +-
 .../NegatedIfStatementJSInspection.java       |   9 +-
 ...stedConditionalExpressionJSInspection.java |   5 +-
 .../confusing/NestedFunctionJSInspection.java |   6 +-
 .../NestedFunctionJSInspectionState.java      |   2 +-
 .../confusing/OctalIntegerJSInspection.java   |   8 +-
 ...mplexArithmeticExpressionJSInspection.java |  10 +-
 ...ArithmeticExpressionJSInspectionState.java |   2 +-
 ...yComplexBooleanExpressionJSInspection.java |   8 +-
 ...lexBooleanExpressionJSInspectionState.java |   2 +-
 ...tlessArithmeticExpressionJSInspection.java |  11 +-
 ...ointlessBooleanExpressionJSInspection.java |  16 +--
 .../confusing/VoidExpressionJSInspection.java |   8 +-
 .../confusing/WithStatementJSInspection.java  |   7 +-
 .../control/BreakStatementJSInspection.java   |   7 +-
 .../BreakStatementWithLabelJSInspection.java  |   7 +-
 ...sionWithIdenticalBranchesJSInspection.java |   4 -
 ...tantConditionalExpressionJSInspection.java |   5 -
 .../ConstantIfStatementJSInspection.java      |   5 -
 .../ContinueStatementJSInspection.java        |   7 +-
 ...ontinueStatementWithLabelJSInspection.java |   7 +-
 ...efaultNotLastCaseInSwitchJSInspection.java |   6 +-
 .../DuplicateConditionJSInspection.java       |   5 +-
 ...lthroughInSwitchStatementJSInspection.java |   5 +-
 ...ForLoopReplaceableByWhileJSInspection.java |  12 +-
 ...opReplaceableByWhileJSInspectionState.java |   2 +-
 ...ThatDoesntUseLoopVariableJSInspection.java |  10 +-
 ...mentWithIdenticalBranchesJSInspection.java |   6 +-
 ...tementWithTooManyBranchesJSInspection.java |   6 +-
 ...tWithTooManyBranchesJSInspectionState.java |   2 +-
 .../control/LabeledStatementJSInspection.java |  10 +-
 ...opStatementThatDoesntLoopJSInspection.java |  11 +-
 .../NestedSwitchStatementJSInspection.java    |   5 +-
 ...tementWithNoDefaultBranchJSInspection.java |   5 +-
 .../control/TailRecursionJSInspection.java    |   7 +-
 .../TrivialConditionalJSInspection.java       |  10 +-
 .../control/TrivialIfJSInspection.java        |  17 +--
 .../UnnecessaryContinueJSInspection.java      |   6 +-
 .../control/UnnecessaryLabelJSInspection.java |  11 +-
 ...saryLabelOnBreakStatementJSInspection.java |   8 +-
 ...yLabelOnContinueStatementJSInspection.java |   8 +-
 .../UnnecessaryReturnJSInspection.java        |   7 +-
 .../ReuseOfLocalVariableJSInspection.java     |  10 +-
 .../UnnecessaryLocalVariableJSInspection.java |   7 +-
 ...cessaryLocalVariableJSInspectionState.java |   2 +-
 .../dataflow/VariableAssignedVisitor.java     |  12 +-
 .../VariableUsedInInnerFunctionVisitor.java   |   7 +-
 .../dataflow/VariableUsedVisitor.java         |   8 +-
 .../dom/DocumentWriteJSInspection.java        |  10 +-
 .../inspectjs/dom/InnerHTMLJSInspection.java  |   5 +-
 .../dom/PlatformDetectionJSInspection.java    |   5 +-
 .../XHTMLIncompatabilitiesJSInspection.java   |   5 +-
 .../exception/CatchParameterUsedVisitor.java  |   5 +-
 ...ueOrBreakFromFinallyBlockJSInspection.java |   7 +-
 .../EmptyCatchBlockJSInspection.java          |   5 +-
 .../EmptyFinallyBlockJSInspection.java        |   5 +-
 .../exception/EmptyTryBlockJSInspection.java  |   5 +-
 .../ExceptionCaughtLocallyJSInspection.java   |   7 +-
 .../ReturnFromFinallyBlockJSInspection.java   |   6 +-
 .../ThrowFromFinallyBlockJSInspection.java    |   6 +-
 .../UnusedCatchParameterJSInspection.java     |   7 +-
 ...UnusedCatchParameterJSInspectionState.java |   2 +-
 .../com/sixrr/inspectjs/fix/RenameFix.java    |   2 -
 .../CyclomaticComplexityJSInspection.java     |   7 +-
 .../CyclomaticComplexityVisitor.java          |  13 +-
 ...FunctionWithMultipleLoopsJSInspection.java |   5 +-
 ...nWithMultipleReturnPointsJSInspection.java |   5 +-
 .../functionmetrics/LoopCountVisitor.java     |   9 +-
 .../functionmetrics/NegationCountVisitor.java |   5 +-
 .../NestingDepthJSInspection.java             |   7 +-
 .../functionmetrics/NestingDepthVisitor.java  |  13 +-
 .../ParametersPerFunctionJSInspection.java    |   7 +-
 .../StatementCountVisitor.java                |   3 +-
 .../StatementsPerFunctionJSInspection.java    |   7 +-
 ...ThreeNegationsPerFunctionJSInspection.java |   6 +-
 .../naming/ConventionInspectionState.java     |   2 +-
 .../FunctionNamingConventionJSInspection.java |   4 -
 ...lVariableNamingConventionJSInspection.java |   4 -
 ...ParameterNamingConventionJSInspection.java |   4 -
 .../style/ChainedEqualityJSInspection.java    |   9 +-
 .../ChainedFunctionCallJSInspection.java      |   6 +-
 ...ConstantOnLHSOfComparisonJSInspection.java |   7 +-
 ...ConstantOnRHSOfComparisonJSInspection.java |   7 +-
 .../style/NestedFunctionCallJSInspection.java |   6 +-
 .../NonBlockStatementBodyJSInspection.java    |  14 +-
 .../UnterminatedStatementJSInspection.java    |   6 +-
 .../ui/FormattedTextFieldMacFix.java          |   3 +-
 .../ui/SingleCheckboxOptionsPanel.java        |   3 +-
 .../ui/SingleIntegerFieldOptionsPanel.java    |   3 +-
 .../com/sixrr/inspectjs/utils/BoolUtils.java  |  14 +-
 .../inspectjs/utils/ComparisonUtils.java      |   9 +-
 .../inspectjs/utils/ConditionalUtils.java     |   2 -
 .../inspectjs/utils/ControlFlowUtils.java     |  67 +++++----
 .../inspectjs/utils/EquivalenceChecker.java   |  69 +++++----
 .../sixrr/inspectjs/utils/ExpressionUtil.java |   2 +-
 .../inspectjs/utils/SideEffectChecker.java    |  15 +-
 .../BadExpressionStatementJSInspection.java   |   8 +-
 .../DebuggerStatementJSInspection.java        |   8 +-
 .../DuplicateCaseLabelJSInspection.java       |   5 +-
 ...DuplicatePropertyOnObjectJSInspection.java |   3 -
 ...onWithInconsistentReturnsJSInspection.java |   5 +-
 .../StringLiteralBreaksHTMLJSInspection.java  |   5 +-
 ...ionReferencesGlobalObjectJSInspection.java |   5 +-
 .../validity/UnreachableCodeJSInspection.java |   5 +-
 .../intention/JSElementPredicate.java         |   3 +-
 .../intention/JSFunctionVisitor.java          |   4 -
 .../javascript/intention/JSIntention.java     |  11 +-
 .../intention/JSMutablyNamedIntention.java    |   7 +-
 .../intention/bool/ComparisonPredicate.java   |   3 +-
 .../intention/bool/ConjunctionPredicate.java  |   3 +-
 .../bool/JSDeMorgansLawIntention.java         |   5 +-
 .../bool/JSFlipComparisonIntention.java       |   5 +-
 .../bool/JSFlipConjunctionIntention.java      |   5 +-
 .../bool/JSNegateComparisonIntention.java     |   5 +-
 .../JSRemoveBooleanEqualityIntention.java     |   7 +-
 .../braces/JSAddBracesIntention.java          |   7 +-
 .../braces/JSRemoveBracesIntention.java       |   7 +-
 .../JSChangeToCStyleCommentIntention.java     |   7 +-
 .../JSChangeToEndOfLineCommentIntention.java  |   7 +-
 .../JSMoveCommentToSeparateLineIntention.java |   7 +-
 .../JSFlipConditionalIntention.java           |   7 +-
 .../conditional/JSFlipIfIntention.java        |   7 +-
 .../JSRemoveConditionalIntention.java         |   7 +-
 .../JSReplaceConditionalWithIfIntention.java  |   7 +-
 .../JSConstantExpressionIntention.java        |   7 +-
 .../JSConstantSubexpressionIntention.java     |   9 +-
 .../JSExtractIncrementIntention.java          |   7 +-
 ...DeclarationAndInitializationIntention.java |   7 +-
 ...DeclarationAndInitializationIntention.java |   9 +-
 .../JSMergeParallelForInLoopsIntention.java   |   7 +-
 .../JSMergeParallelForLoopsIntention.java     |   7 +-
 .../JSConvertIntegerToDecimalIntention.java   |   7 +-
 .../JSConvertIntegerToHexIntention.java       |   7 +-
 .../JSConvertIntegerToOctalIntention.java     |   7 +-
 .../JSReplaceMultiplyWithShiftIntention.java  |   7 +-
 .../JSReplaceShiftWithMultiplyIntention.java  |   7 +-
 ...eplaceWithOperatorAssignmentIntention.java |   7 +-
 ...RemoveUnnecessaryParenthesesIntention.java |   7 +-
 ...JSDoubleToSingleQuotedStringIntention.java |   7 +-
 ...inConcatenatedStringLiteralsIntention.java |   7 +-
 ...JSSingleToDoubleQuotedStringIntention.java |   7 +-
 .../JSReplaceIfWithSwitchIntention.java       |  13 +-
 .../JSReplaceSwitchWithIfIntention.java       |  15 +-
 .../trivialif/JSMergeElseIfIntention.java     |   7 +-
 .../trivialif/JSMergeIfAndIntention.java      |   7 +-
 .../trivialif/JSMergeIfOrIntention.java       |   7 +-
 .../JSMergeParallelIfsIntention.java          |   7 +-
 .../JSRemoveRedundantElseIntention.java       |   7 +-
 .../JSReplaceIfWithConditionalIntention.java  |   7 +-
 .../trivialif/JSSimplifyIfElseIntention.java  |   7 +-
 .../trivialif/JSSplitElseIfIntention.java     |   7 +-
 .../trivialif/JSSplitIfAndIntention.java      |   7 +-
 .../trivialif/JSSplitIfOrIntention.java       |   7 +-
 .../psiutil/BinaryOperatorUtils.java          |   3 +-
 .../lang/javascript/psiutil/BoolUtils.java    |   5 +-
 .../javascript/psiutil/ConditionalUtils.java  |   7 +-
 .../javascript/psiutil/ControlFlowUtils.java  |  18 ++-
 .../lang/javascript/psiutil/ErrorUtil.java    |   3 +-
 .../javascript/psiutil/ExpressionUtil.java    |   5 +-
 .../javascript/psiutil/FindReferenceUtil.java |  23 ++-
 .../javascript/psiutil/JSElementFactory.java  |  25 ++--
 .../lang/javascript/psiutil/NumberUtil.java   |   4 -
 .../javascript/psiutil/RecursionUtil.java     |   5 +-
 .../lang/javascript/psiutil/TreeUtil.java     |  11 +-
 .../psiutil/VariableAccessUtil.java           |  45 +++---
 .../actionscript/ActionScriptFileType.java    |   7 +-
 .../ActionScriptFileTypeFactory.java          |   3 +-
 .../lang/ActionScriptLanguageVersion.java     |   6 -
 .../EcmaScript6QuickFixFactory.java           |   3 +-
 .../EcmaScript6KeywordCompletionExtender.java |   3 +-
 .../lang/BaseEcmaScriptJavaScriptVersion.java |   7 +-
 .../lang/EcmaScript10JavaScriptVersion.java   |   2 -
 .../lang/EcmaScript11JavaScriptVersion.java   |   2 -
 .../lang/EcmaScript12JavaScriptVersion.java   |   3 -
 .../lang/EcmaScript6JavaScriptVersion.java    |   5 +-
 .../lang/EcmaScript7JavaScriptVersion.java    |   2 -
 .../lang/EcmaScript8JavaScriptVersion.java    |   2 -
 .../lang/EcmaScript9JavaScriptVersion.java    |   2 -
 .../ecmascript/lang/EcmaScriptFileType.java   |   7 +-
 .../lang/EcmaScriptFileTypeFactory.java       |   3 +-
 .../lang/parsing/EcmaScriptParser.java        |   3 -
 .../parsing/EcmaScriptParsingContext.java     |   3 -
 .../parsing/EcmaScriptStatementParsing.java   |   3 +-
 .../ecmascript/psi/ES6ImportedBinding.java    |   2 +-
 .../ecmascript/psi/ES6NamedImports.java       |   2 -
 .../impl/ES6ExportDefaultAssignmentImpl.java  |  11 +-
 .../psi/impl/ES6ImportDeclarationImpl.java    |   9 +-
 .../psi/impl/ES6ImportSpecifierImpl.java      |   7 +-
 .../psi/impl/ES6ImportedBindingImpl.java      |  13 +-
 .../psi/impl/ES6NamedImportsImpl.java         |  10 +-
 .../resolve/EcmaScript6ResolveHelper.java     |   7 +-
 .../JSXTagTreeHighlightingPassFactory.java    |   5 +-
 .../JSXCreateFromTemplateHandler.java         |   2 -
 .../javascript/jsx/language/JSXFileType.java  |   7 +-
 .../jsx/language/JSXFileTypeFactory.java      |   3 +-
 .../jsx/language/JSXJavaScriptVersion.java    |   3 -
 .../language/psi/impl/JSXmlTagReference.java  |   6 +-
 .../impl/JSXmlTagReferenceContributor.java    |   5 +-
 .../lang/EcmaScript4JavaScriptVersion.java    |   4 -
 .../lang/parsing/EcmaScript4Parser.java       |   2 -
 .../parsing/EcmaScript4ParsingContext.java    |   4 -
 .../parsing/EcmaScript4StatementParsing.java  |   5 +-
 .../lang/JavaScript16LanguageVersion.java     |   5 -
 .../lang/JavaScript17LanguageVersion.java     |   5 -
 .../lang/JavaScript185LanguageVersion.java    |   5 -
 .../lang/JavaScript18LanguageVersion.java     |   5 -
 .../typescript/TypeScriptFileType.java        |   7 +-
 .../typescript/TypeScriptFileTypeFactory.java |   3 +-
 .../version/TypeScriptLanguageVersion.java    |   3 -
 .../intellij/javascript/JSClassNameMacro.java |  10 +-
 .../JSImplementationTextSelectioner.java      |   6 +-
 .../javascript/JSMethodNameMacro.java         |   7 +-
 .../javascript/JSParameterInfoHandler.java    |  19 +--
 .../JSAttributeNameValuePairManipulator.java  |   5 +-
 .../manipulators/JSDocTagManipulator.java     |   2 -
 .../JSIncludeDirectiveManipulator.java        |   2 -
 .../impl/JSSmartEnterProcessor.java           |   4 +-
 .../impl/JavaScriptCodeContextType.java       |   3 +-
 .../impl/JavaScriptTargetElementUtilEx.java   |   3 +-
 .../javascript/impl/JavascriptCommenter.java  |   4 +-
 .../JavaScriptClassGroupRuleProvider.java     |   3 +-
 .../JavaScriptFindUsagesProvider.java         |  13 +-
 .../JavaScriptFunctionGroupRuleProvider.java  |   3 +-
 .../JavaScriptGroupRuleProviderBase.java      |   8 +-
 ...ImportECMAScriptClassOrFunctionAction.java |  13 +-
 .../impl/flex/ECMAScriptImportOptimizer.java  |   3 -
 .../javascript/impl/flex/ImportUtils.java     |   5 +-
 .../flex/importer/AS3InterfaceDumper.java     |  19 ++-
 .../flex/importer/AS3InterfaceStubDumper.java |   7 +-
 .../javascript/impl/flex/importer/Abc.java    |   5 +-
 .../impl/flex/importer/AbcDumper.java         |  19 ++-
 .../flex/importer/AbstractDumpProcessor.java  |   5 +-
 .../impl/flex/importer/ByteBuffer.java        |   3 +-
 .../FlexByteCodeInformationProcessor.java     |  21 ++-
 .../impl/flex/importer/FlexImporter.java      |   5 +-
 .../impl/flex/importer/MemberInfo.java        |   5 +-
 .../folding/JavaScriptFoldingBuilder.java     |   5 +-
 .../impl/formatter/JSCodeStylePanel.java      |   2 -
 .../JSCodeStyleSettingsProvider.java          |   4 +-
 .../impl/formatter/JSFormattingModel.java     |   3 -
 .../JavaScriptIndentOptionsProvider.java      |   2 -
 .../JavascriptFormattingModelBuilder.java     |   5 +-
 .../impl/formatter/blocks/JSBlock.java        |   6 +-
 .../formatter/blocks/JSDocCommentBlock.java   |   9 +-
 .../formatter/blocks/SubBlockVisitor.java     |   2 +-
 .../impl/generation/BaseJSGenerateAction.java |   2 -
 .../generation/BaseJSGenerateHandler.java     |   4 +-
 .../JavaScriptGenerateAccessorHandler.java    |   9 +-
 .../JavaScriptGenerateConstructorAction.java  |   2 -
 .../JavaScriptGenerateGetAccessorAction.java  |   2 -
 ...avaScriptGenerateGetSetAccessorAction.java |   2 -
 .../JavaScriptGenerateSetAccessorAction.java  |   2 -
 .../JavaScriptGenerateToStringAction.java     |   2 -
 .../JavaScriptOverrideMethodsHandler.java     |   3 +-
 .../impl/highlighting/JSBraceMatcher.java     |   6 +-
 .../JavaScriptColorsAndFontsPage.java         |   5 -
 .../JavaScriptHighlightVisitor.java           |  35 +++--
 .../JavaScriptHighlightVisitorFactory.java    |   4 +-
 .../JavaScriptLineMarkerProvider.java         |   8 +-
 .../CreateClassOrInterfaceAction.java         |   4 +-
 .../JSDeprecatedSymbolsInspection.java        |   6 +-
 .../JSDuplicatedDeclarationInspection.java    |  15 +-
 .../impl/inspections/JSInspection.java        |  10 +-
 .../JSUndeclaredVariableInspection.java       |   9 +-
 .../JSUnresolvedFunctionInspection.java       |  25 ++--
 .../JSUnresolvedVariableInspection.java       |   8 +-
 .../JSUntypedDeclarationInspection.java       |  14 +-
 .../JSUnusedLocalSymbolsInspection.java       |  24 ++--
 .../JavaScriptGotoSuperHandler.java           |   2 -
 .../JavaScriptSymbolContributor.java          |  11 +-
 .../BasicJavascriptNamesValidator.java        |   2 -
 .../refactoring/JSBaseIntroduceDialog.java    |   9 +-
 .../refactoring/JSBaseIntroduceHandler.java   |   7 +-
 .../JavascriptRefactoringSupportProvider.java |   4 +-
 .../JSExtractFunctionHandler.java             |   5 +-
 .../JSIntroduceConstantHandler.java           |   5 +-
 .../JSIntroduceFieldDialog.java               |   5 +-
 .../search/JSDeclarationRangeHandler.java     |   5 +-
 .../search/JSDefinitionsSearchExecutor.java   |   5 +-
 .../impl/search/JSFunctionsSearch.java        |   3 +-
 .../search/JSGotoTargetRendererProvider.java  |   2 +-
 .../JSStructureItemPresentation.java          |   3 +-
 .../JSStructureViewBuilderFactory.java        |   3 -
 .../structureView/JSStructureViewElement.java |  14 +-
 .../structureView/JSStructureViewModel.java   |  12 --
 .../impl/structureView/JSSuperGroup.java      |   2 +-
 .../impl/structureView/JSSuperGrouper.java    |   4 -
 .../JSExpressionSurroundDescriptor.java       |   4 -
 .../surroundWith/JSStatementSurrounder.java   |   7 +-
 .../JSStatementsSurroundDescriptor.java       |   4 -
 .../JSWithParenthesesSurrounder.java          |   7 +-
 .../JSWithTryCatchFinallySurrounder.java      |   3 +-
 .../impl/validation/BaseCreateMethodsFix.java |   3 +-
 .../impl/validation/ImplementMethodsFix.java  |   4 +-
 .../ImplementedMethodProcessor.java           |   5 +-
 .../impl/validation/JSAnnotatingVisitor.java  |  43 +++---
 .../impl/validation/JSAnnotatorFactory.java   |   4 +-
 .../impl/JavaScriptIconDescriptorUpdater.java |   5 +-
 .../UpdateJavaScriptFileCopyright.java        |   3 +-
 ...UpdateJavaScriptFileCopyrightProvider.java |  13 +-
 .../JavaScriptFindUsagesHandlerFactory.java   |   7 +-
 .../JavaScriptCodeStyleConfigurable.java      |   3 +-
 ...riptLanguageCodeStyleSettingsProvider.java |   6 +-
 .../JavaScriptEmbeddedTokenHighlighter.java   |   4 +-
 .../JavaScriptHtmlScriptContentProvider.java  |   4 +-
 .../actions/JavaScriptCreateFileAction.java   |   4 +-
 .../JavaScriptFileTemplateContributor.java    |   3 +-
 ...avaScriptKeywordCompletionContributor.java |   6 +-
 .../JavaScriptSkipAutopopupInStrings.java     |   2 -
 .../JavaScriptNavBarModelExtension.java       |   4 +-
 .../impl/lang/JavaScriptFileTypeFactory.java  |   3 +-
 .../lang/JavaScriptLanguageVersionPusher.java |  22 ++-
 .../JavaScriptLanguageVersionResolver.java    |  10 +-
 .../lang/JavaScriptParsingDefinition.java     |   5 -
 .../JavaScriptClassContributor.java           |  11 +-
 ...efaultJSPropertyNameReferenceProvider.java |   5 +-
 .../JavaScriptRegExpLiteralLanguageHost.java  |   8 +-
 .../JavaScriptRegexpMultiHostInjector.java    |   4 +-
 .../ClientJavaScriptModuleExtension.java      |  18 +--
 .../ClientJavaScriptModuleExtensionPanel.java |   3 +-
 ...ientJavaScriptModuleExtensionProvider.java |  10 +-
 ...lientJavaScriptMutableModuleExtension.java |  14 +-
 ...ntJavaScriptPredefinedBundlesProvider.java |   3 +-
 .../module/sdk/ClientJavaScriptSdkType.java   |   5 +-
 597 files changed, 1423 insertions(+), 2922 deletions(-)

diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
index 697dfcf5..8a96bc2e 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttribute.java
@@ -21,7 +21,6 @@
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.StubBasedPsiElement;
 import consulo.util.collection.ArrayFactory;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -30,7 +29,6 @@ public interface JSAttribute extends JSElement, PsiNamedElement, StubBasedPsiEle
     JSAttribute[] EMPTY_ARRAY = new JSAttribute[0];
 
     ArrayFactory<JSAttribute> ARRAY_FACTORY = new ArrayFactory<>() {
-        @Nonnull
         @Override
         public JSAttribute[] create(int count) {
             return count == 0 ? EMPTY_ARRAY : new JSAttribute[count];
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
index a2aae4cf..83e83d41 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeList.java
@@ -17,12 +17,11 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.StubBasedPsiElement;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -38,9 +37,8 @@ public interface JSAttributeList extends JSElement, StubBasedPsiElement<JSAttrib
 
     JSAttribute[] getAttributes();
 
-    @Nonnull
     @RequiredReadAction
-    JSAttribute[] getAttributesByName(@Nonnull String name);
+    JSAttribute[] getAttributesByName(String name);
 
     enum AccessType {
         PACKAGE_LOCAL,
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
index cf325a78..f431f513 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeListOwner.java
@@ -18,7 +18,7 @@
 
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
index b2147f49..eb48aa30 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSAttributeNameValuePair.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSAttributeNameValuePairStub;
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.StubBasedPsiElement;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
index a13a2643..50eeec22 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSBinaryExpression.java
@@ -19,7 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
index 3d98321f..5b8fb3d0 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClass.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import com.intellij.lang.javascript.psi.stubs.JSClassStub;
 import consulo.language.psi.StubBasedPsiElement;
 import consulo.navigation.Navigatable;
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
index 7b971391..1c9c8c31 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSClassExpression.java
@@ -2,14 +2,12 @@
 
 import consulo.annotation.access.RequiredReadAction;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2021-12-11
  */
 public interface JSClassExpression extends JSExpression {
-    @Nonnull
     @RequiredReadAction
     JSClass getClassElement();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
index e672c092..351a8042 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringElement.java
@@ -1,16 +1,14 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
  * @since 2019-12-14
  */
 public interface JSDestructuringElement extends JSElement {
-    @Nonnull
     @RequiredReadAction
     default JSVariable[] getVariables() {
         JSDestructuringObject object = getDestructuringObject();
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
index 56b3e92a..ca7ffb60 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringObject.java
@@ -2,14 +2,12 @@
 
 import consulo.annotation.access.RequiredReadAction;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2019-12-14
  */
 public interface JSDestructuringObject extends JSElement {
-    @Nonnull
     @RequiredReadAction
     JSVariable[] getVariables();
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
index d2618005..7ae20827 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringParameter.java
@@ -1,7 +1,7 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
index 1b48d22e..42d3ba9c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDestructuringShorthandedProperty.java
@@ -1,14 +1,12 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2019-12-14
  */
 public interface JSDestructuringShorthandedProperty extends JSElement {
-    @Nonnull
     @RequiredReadAction
     JSVariable getVariable();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
index 858b322f..bd798364 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSDocTag.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import consulo.language.psi.PsiNamedElement;
 
 public interface JSDocTag extends PsiNamedElement, JSElement {
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
index 0c781bee..2bfcc848 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSElementVisitor.java
@@ -19,273 +19,272 @@
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.javascript.psi.JavaScriptLambdaExpression;
 import consulo.language.psi.PsiElementVisitor;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
  * @since 2005-02-03
  */
 public class JSElementVisitor extends PsiElementVisitor {
-    public void visitJSCallExpression(@Nonnull JSCallExpression node) {
+    public void visitJSCallExpression(JSCallExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAccessExpression node) {
+    public void visitJSIndexedPropertyAccessExpression(JSIndexedPropertyAccessExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSNewExpression(@Nonnull JSNewExpression node) {
+    public void visitJSNewExpression(JSNewExpression node) {
         visitJSCallExpression(node);
     }
 
-    public void visitJSFunctionExpression(@Nonnull JSFunctionExpression node) {
+    public void visitJSFunctionExpression(JSFunctionExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+    public void visitJSPrefixExpression(JSPrefixExpression expression) {
         visitJSExpression(expression);
     }
 
-    public void visitJSPostfixExpression(@Nonnull JSPostfixExpression node) {
+    public void visitJSPostfixExpression(JSPostfixExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSConditionalExpression(@Nonnull JSConditionalExpression node) {
+    public void visitJSConditionalExpression(JSConditionalExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSCommaExpression(@Nonnull JSCommaExpression node) {
+    public void visitJSCommaExpression(JSCommaExpression node) {
         visitJSBinaryExpression(node);
     }
 
-    public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression node) {
+    public void visitJSAssignmentExpression(JSAssignmentExpression node) {
         visitJSBinaryExpression(node);
     }
 
-    public void visitJSBinaryExpression(@Nonnull JSBinaryExpression node) {
+    public void visitJSBinaryExpression(JSBinaryExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSProperty(@Nonnull JSProperty node) {
+    public void visitJSProperty(JSProperty node) {
         visitJSElement(node);
     }
 
-    public void visitJSObjectLiteralExpression(@Nonnull JSObjectLiteralExpression node) {
+    public void visitJSObjectLiteralExpression(JSObjectLiteralExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSArrayLiteralExpression(@Nonnull JSArrayLiteralExpression node) {
+    public void visitJSArrayLiteralExpression(JSArrayLiteralExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSParenthesizedExpression(@Nonnull JSParenthesizedExpression node) {
+    public void visitJSParenthesizedExpression(JSParenthesizedExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
+    public void visitJSReferenceExpression(JSReferenceExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSDefinitionExpression(@Nonnull JSDefinitionExpression node) {
+    public void visitJSDefinitionExpression(JSDefinitionExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression node) {
+    public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSThisExpression(@Nonnull JSThisExpression node) {
+    public void visitJSThisExpression(JSThisExpression node) {
         visitJSExpression(node);
     }
 
-    public void visitJSForInStatement(@Nonnull JSForInStatement node) {
+    public void visitJSForInStatement(JSForInStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSForStatement(@Nonnull JSForStatement node) {
+    public void visitJSForStatement(JSForStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement node) {
+    public void visitJSDoWhileStatement(JSDoWhileStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSWhileStatement(@Nonnull JSWhileStatement node) {
+    public void visitJSWhileStatement(JSWhileStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSCaseClause(@Nonnull JSCaseClause node) {
+    public void visitJSCaseClause(JSCaseClause node) {
         visitJSElement(node);
     }
 
-    public void visitJSSwitchStatement(@Nonnull JSSwitchStatement node) {
+    public void visitJSSwitchStatement(JSSwitchStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSCatchBlock(@Nonnull JSCatchBlock node) {
+    public void visitJSCatchBlock(JSCatchBlock node) {
         visitJSElement(node);
     }
 
-    public void visitJSTryStatement(@Nonnull JSTryStatement node) {
+    public void visitJSTryStatement(JSTryStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSThrowStatement(@Nonnull JSThrowStatement node) {
+    public void visitJSThrowStatement(JSThrowStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSReturnStatement(@Nonnull JSReturnStatement node) {
+    public void visitJSReturnStatement(JSReturnStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSWithStatement(@Nonnull JSWithStatement node) {
+    public void visitJSWithStatement(JSWithStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSBreakStatement(@Nonnull JSBreakStatement node) {
+    public void visitJSBreakStatement(JSBreakStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSContinueStatement(@Nonnull JSContinueStatement node) {
+    public void visitJSContinueStatement(JSContinueStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSIfStatement(@Nonnull JSIfStatement node) {
+    public void visitJSIfStatement(JSIfStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSEmptyStatement(@Nonnull JSEmptyStatement node) {
+    public void visitJSEmptyStatement(JSEmptyStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSVarStatement(@Nonnull JSVarStatement node) {
+    public void visitJSVarStatement(JSVarStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSExpressionStatement(@Nonnull JSExpressionStatement node) {
+    public void visitJSExpressionStatement(JSExpressionStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSLabeledStatement(@Nonnull JSLabeledStatement node) {
+    public void visitJSLabeledStatement(JSLabeledStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSBlock(@Nonnull JSBlockStatement node) {
+    public void visitJSBlock(JSBlockStatement node) {
         visitJSStatement(node);
     }
 
-    public void visitJSArgumentList(@Nonnull JSArgumentList node) {
+    public void visitJSArgumentList(JSArgumentList node) {
         visitJSElement(node);
     }
 
-    public void visitJSParameter(@Nonnull JSParameter parameter) {
+    public void visitJSParameter(JSParameter parameter) {
         visitJSVariable(parameter);
     }
 
-    public void visitJSVariable(@Nonnull JSVariable node) {
+    public void visitJSVariable(JSVariable node) {
         visitJSElement(node);
     }
 
-    public void visitJSParameterList(@Nonnull JSParameterList node) {
+    public void visitJSParameterList(JSParameterList node) {
         visitJSElement(node);
     }
 
-    public void visitJSElement(@Nonnull JSElement node) {
+    public void visitJSElement(JSElement node) {
         visitElement(node);
     }
 
-    public void visitJSSourceElement(@Nonnull JSElement node) {
+    public void visitJSSourceElement(JSElement node) {
         visitJSElement(node);
     }
 
-    public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
+    public void visitJSFunctionDeclaration(JSFunction node) {
         visitJSSourceElement(node);
     }
 
-    public void visitJSStatement(@Nonnull JSStatement node) {
+    public void visitJSStatement(JSStatement node) {
         visitJSSourceElement(node);
     }
 
-    public void visitJSExpression(@Nonnull JSExpression node) {
+    public void visitJSExpression(JSExpression node) {
         visitJSElement(node);
     }
 
-    public void visitJSAttributeList(@Nonnull JSAttributeList attributeList) {
+    public void visitJSAttributeList(JSAttributeList attributeList) {
         visitJSElement(attributeList);
     }
 
-    public void visitJSPackageStatement(@Nonnull JSPackageStatement packageStatement) {
+    public void visitJSPackageStatement(JSPackageStatement packageStatement) {
         visitJSStatement(packageStatement);
     }
 
-    public void visitJSImportStatement(@Nonnull JSImportStatement importStatement) {
+    public void visitJSImportStatement(JSImportStatement importStatement) {
         visitJSStatement(importStatement);
     }
 
-    public void visitJSUseNamespaceDirective(@Nonnull JSUseNamespaceDirective useNamespaceDirective) {
+    public void visitJSUseNamespaceDirective(JSUseNamespaceDirective useNamespaceDirective) {
         visitJSStatement(useNamespaceDirective);
     }
 
-    public void visitJSNamespaceDeclaration(@Nonnull JSNamespaceDeclaration namespaceDeclaration) {
+    public void visitJSNamespaceDeclaration(JSNamespaceDeclaration namespaceDeclaration) {
         visitJSStatement(namespaceDeclaration);
     }
 
-    public void visitJSClass(@Nonnull JSClass aClass) {
+    public void visitJSClass(JSClass aClass) {
         visitJSElement(aClass);
     }
 
-    public void visitJSClassExpression(@Nonnull JSClassExpression expression) {
+    public void visitJSClassExpression(JSClassExpression expression) {
         visitJSExpression(expression);
     }
 
-    public void visitJSReferenceList(@Nonnull JSReferenceList referenceList) {
+    public void visitJSReferenceList(JSReferenceList referenceList) {
         visitJSElement(referenceList);
     }
 
-    public void visitJSSuperExpression(@Nonnull JSSuperExpression superExpression) {
+    public void visitJSSuperExpression(JSSuperExpression superExpression) {
         visitJSExpression(superExpression);
     }
 
-    public void visitJSIncludeDirective(@Nonnull JSIncludeDirective includeDirective) {
+    public void visitJSIncludeDirective(JSIncludeDirective includeDirective) {
         visitJSStatement(includeDirective);
     }
 
-    public void visitJSAttribute(@Nonnull JSAttribute jsAttribute) {
+    public void visitJSAttribute(JSAttribute jsAttribute) {
         visitJSElement(jsAttribute);
     }
 
-    public void visitJSAttributeNameValuePair(@Nonnull JSAttributeNameValuePair attributeNameValuePair) {
+    public void visitJSAttributeNameValuePair(JSAttributeNameValuePair attributeNameValuePair) {
     }
 
-    public void visitJSYieldStatement(@Nonnull JSYieldStatement statement) {
+    public void visitJSYieldStatement(JSYieldStatement statement) {
         visitJSStatement(statement);
     }
 
-    public void visitJSLetStatement(@Nonnull JSLetStatement statement) {
+    public void visitJSLetStatement(JSLetStatement statement) {
         visitJSStatement(statement);
     }
 
-    public void visitJSLetExpression(@Nonnull JSLetExpression expression) {
+    public void visitJSLetExpression(JSLetExpression expression) {
         visitJSExpression(expression);
     }
 
-    public void visitJSGenericSignature(@Nonnull JSGenericSignature signature) {
+    public void visitJSGenericSignature(JSGenericSignature signature) {
         visitJSElement(signature);
     }
 
-    public void visitJSDocTagValue(@Nonnull JSDocTagValue tagValue) {
+    public void visitJSDocTagValue(JSDocTagValue tagValue) {
         visitJSElement(tagValue);
     }
 
-    public void visitJSDocTag(@Nonnull JSDocTag docTag) {
+    public void visitJSDocTag(JSDocTag docTag) {
         visitJSElement(docTag);
     }
 
-    public void visitJSDocComment(@Nonnull JSDocComment docComment) {
+    public void visitJSDocComment(JSDocComment docComment) {
         visitComment(docComment);
     }
 
-    public void visitLambdaExpression(@Nonnull JavaScriptLambdaExpression expression) {
+    public void visitLambdaExpression(JavaScriptLambdaExpression expression) {
         visitJSExpression(expression);
     }
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
index 717fdbf0..4b1d2d1f 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpression.java
@@ -20,7 +20,6 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -31,10 +30,8 @@ public interface JSExpression extends JSElement {
 
     ArrayFactory<JSExpression> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new JSExpression[count];
 
-    @Nonnull
     JSExpression replace(JSExpression other);
 
-    @Nonnull
     @RequiredReadAction
     JavaScriptType getType();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
index 2fd6b943..db98d248 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSExpressionStatement.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
index a12519e9..248a2f21 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunction.java
@@ -21,8 +21,7 @@
 import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.util.collection.ArrayFactory;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -54,7 +53,6 @@ default boolean isConstructor() {
         return false;
     }
 
-    @Nonnull
     JavaScriptType getReturnType();
 
     String getReturnTypeString();
@@ -69,7 +67,6 @@ enum FunctionKind {
         SIMPLE
     }
 
-    @Nonnull
     @RequiredReadAction
     default FunctionKind getKind() {
         if (isGetProperty()) {
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
index 8d6bc703..07c6684a 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSFunctionExpression.java
@@ -16,14 +16,12 @@
 
 package com.intellij.lang.javascript.psi;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
  * @since 2005-01-30
  */
 public interface JSFunctionExpression extends JSFunction, JSExpression {
-    @Nonnull
     default JSFunction getFunction() {
         return this;
     }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
index f8bd8cda..d52fd45c 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSNamespaceDeclaration.java
@@ -18,7 +18,7 @@
 
 import com.intellij.lang.javascript.psi.stubs.JSNamespaceDeclarationStub;
 import consulo.language.psi.StubBasedPsiElement;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
index e4551b72..b16c3378 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSParameter.java
@@ -19,7 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.util.collection.ArrayFactory;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
index 324e2090..4fcb83a5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPostfixExpression.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import consulo.language.ast.IElementType;
 
 /**
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
index 804f4c98..4709103b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSPrefixExpression.java
@@ -19,7 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
index 8a2858c4..ffdd1727 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSProperty.java
@@ -17,13 +17,12 @@
 
 package com.intellij.lang.javascript.psi;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.psi.JSComputedName;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -42,7 +41,6 @@ public interface JSProperty extends JSNamedElement {
     @RequiredReadAction
     JSComputedName getComputedName();
 
-    @Nonnull
     @RequiredReadAction
     JavaScriptType getType();
 }
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
index 0c43a695..a97eab96 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceExpression.java
@@ -19,7 +19,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiPolyVariantReference;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
index 765577a4..e38df205 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSReferenceList.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.psi;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
@@ -26,15 +25,12 @@
  * @author Maxim.Mossienko
  */
 public interface JSReferenceList extends JSElement, StubBasedPsiElement<JSReferenceListStub> {
-    @Nonnull
     @RequiredReadAction
     JSReferenceExpression[] getExpressions();
 
-    @Nonnull
     @RequiredReadAction
     String[] getReferenceTexts();
 
-    @Nonnull
     @RequiredReadAction
     JSClass[] getReferencedClasses();
 }
\ No newline at end of file
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
index d30a4597..51d46043 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSTryStatement.java
@@ -17,8 +17,7 @@
 package com.intellij.lang.javascript.psi;
 
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -28,7 +27,6 @@ public interface JSTryStatement extends JSStatement {
     @RequiredReadAction
     JSStatement getStatement();
 
-    @Nonnull
     @RequiredReadAction
     JSCatchBlock[] getAllCatchBlocks();
 
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
index 5292b603..74b2d283 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVarStatement.java
@@ -19,7 +19,7 @@
 import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.StubBasedPsiElement;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
index e183f311..97e757f8 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSVariable.java
@@ -20,9 +20,8 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.language.util.IncorrectOperationException;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -42,7 +41,6 @@ public interface JSVariable extends JSQualifiedNamedElement, JSAttributeListOwne
 
     void setInitializer(JSExpression expr) throws IncorrectOperationException;
 
-    @Nonnull
     JavaScriptType getType();
 
     @Nullable
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
index ae7463a0..96670f8b 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/JSYieldStatement.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
index 18b51cfa..25ef10b5 100644
--- a/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
+++ b/base-api/src/main/java/com/intellij/lang/javascript/psi/stubs/JSAttributeNameValuePairStub.java
@@ -16,7 +16,7 @@
 
 package com.intellij.lang.javascript.psi.stubs;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import consulo.language.psi.stub.StubElement;
 
diff --git a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
index 8425e016..14b40260 100644
--- a/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
+++ b/base-api/src/main/java/consulo/javascript/ide/completion/JavaScriptKeywordCompletionExtender.java
@@ -7,7 +7,6 @@
 import consulo.language.editor.completion.CompletionResultSet;
 import consulo.language.util.ProcessingContext;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -17,5 +16,5 @@
 public interface JavaScriptKeywordCompletionExtender {
     ExtensionPointName<JavaScriptKeywordCompletionExtender> EP_NAME = ExtensionPointName.create(JavaScriptKeywordCompletionExtender.class);
 
-    void fillCompletion(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result);
+    void fillCompletion(CompletionParameters parameters, ProcessingContext context, CompletionResultSet result);
 }
diff --git a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
index cfbae972..54c731c0 100644
--- a/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
+++ b/base-api/src/main/java/consulo/javascript/index/JavaScriptIndexer.java
@@ -5,7 +5,6 @@
 import consulo.component.extension.ExtensionPointName;
 import consulo.javascript.psi.stubs.JSFileStub;
 import consulo.language.psi.stub.IndexSink;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -15,7 +14,7 @@
 public abstract class JavaScriptIndexer {
     public static final ExtensionPointName<JavaScriptIndexer> EP_NAME = ExtensionPointName.create(JavaScriptIndexer.class);
 
-    public void indexFile(@Nonnull JSFileStub fileStub, @Nonnull IndexSink sink) {
+    public void indexFile(JSFileStub fileStub, IndexSink sink) {
     }
 
     public int getVersion() {
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
index 439be46b..1107bdde 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFeature.java
@@ -16,7 +16,6 @@
 
 package consulo.javascript.language;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -39,7 +38,6 @@ public enum JavaScriptFeature {
         myName = name;
     }
 
-    @Nonnull
     public String getName() {
         return myName;
     }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
index 0f1ca167..3feef4ac 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileType.java
@@ -28,8 +28,7 @@
 import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -43,30 +42,25 @@ public JavaScriptFileType() {
     }
 
     @Override
-    @Nonnull
     public String getId() {
         return "JavaScript";
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getDescription() {
         return JavaScriptLocalize.javascriptFiletypeDescription();
     }
 
     @Override
-    @Nonnull
     public String getDefaultExtension() {
         return "js";
     }
 
-    @Nonnull
     @Override
     public Image getIcon() {
         return JavaScriptIconGroup.javascript();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
index e6a74307..236f0fe4 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptFileTypeWithVersion.java
@@ -21,15 +21,13 @@
 import consulo.module.Module;
 import consulo.virtualFileSystem.VirtualFile;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
  * @since 2015-12-11
  */
 public interface JavaScriptFileTypeWithVersion {
-    @Nonnull
     @RequiredReadAction
     LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile);
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
index bb073bb0..ccde4395 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguage.java
@@ -21,8 +21,7 @@
 import consulo.language.file.LanguageFileType;
 import consulo.language.version.LanguageVersion;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -41,7 +40,7 @@ public JavaScriptLanguage() {
     }
 
     @Nullable
-    public LanguageVersion getVersionById(@Nonnull String id) {
+    public LanguageVersion getVersionById(String id) {
         Map<String, LanguageVersion> oldMap = myVersionsById;
         if (oldMap == null) {
             Map<String, LanguageVersion> newMap = new HashMap<>();
@@ -57,7 +56,6 @@ public LanguageVersion getVersionById(@Nonnull String id) {
         return oldMap.get(id);
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return JavaScriptLocalize.javascriptName();
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
index ac37a2bd..1bf43f9d 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
@@ -4,7 +4,6 @@
 import consulo.language.version.LanguageVersion;
 import consulo.language.version.LanguageVersionWithParsing;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.Set;
 
@@ -13,14 +12,12 @@
  * @since 2017-12-23
  */
 public abstract class JavaScriptLanguageVersion extends LanguageVersion implements LanguageVersionWithParsing {
-    public JavaScriptLanguageVersion(@Nonnull String id, @Nonnull String name, @Nonnull Language language, String... mimeTypes) {
+    public JavaScriptLanguageVersion(String id, String name, Language language, String... mimeTypes) {
         super(id, name, language, mimeTypes);
     }
 
-    @Nonnull
     public abstract Set<JavaScriptFeature> getFeatures();
 
-    @Nonnull
     public String getPresentableName() {
         return getName();
     }
diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
index bb09748a..41c4d59c 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptVersionUtil.java
@@ -20,7 +20,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.version.LanguageVersion;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.Collections;
 import java.util.Set;
@@ -31,12 +30,12 @@
  */
 public class JavaScriptVersionUtil {
     @RequiredReadAction
-    public static boolean containsFeature(@Nonnull PsiElement element, @Nonnull JavaScriptFeature feature) {
+    public static boolean containsFeature(PsiElement element, JavaScriptFeature feature) {
         return getFeatures(element).contains(feature);
     }
 
     @RequiredReadAction
-    public static Set<JavaScriptFeature> getFeatures(@Nonnull PsiElement element) {
+    public static Set<JavaScriptFeature> getFeatures(PsiElement element) {
         LanguageVersion languageVersion = element.getLanguageVersion();
         return languageVersion instanceof JavaScriptLanguageVersion ? ((JavaScriptLanguageVersion)languageVersion).getFeatures() : Collections.<JavaScriptFeature>emptySet();
     }
diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
index af7a6ede..a5658331 100644
--- a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
@@ -20,8 +20,7 @@
 import consulo.annotation.component.ServiceAPI;
 import consulo.ide.ServiceManager;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
@@ -32,17 +31,13 @@
 @ServiceAPI(ComponentScope.APPLICATION)
 public abstract class StandardJavaScriptVersions {
 
-    @Nonnull
     public static StandardJavaScriptVersions getInstance() {
         return ServiceManager.getService(StandardJavaScriptVersions.class);
     }
 
-    @Nonnull
     public abstract JavaScriptLanguageVersion getDefaultVersion();
 
-    @Nonnull
     public abstract List<JavaScriptLanguageVersion> getValidLanguageVersions();
 
-    @Nonnull
     public abstract JavaScriptLanguageVersion findVersionById(@Nullable String id);
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
index 046180f9..0db8b73e 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptPrimitiveType.java
@@ -18,8 +18,7 @@
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -38,7 +37,6 @@ public JavaScriptPrimitiveType(String name) {
         myName = name;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String getPresentableText() {
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
index 3b1bc07c..74ddb1da 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptType.java
@@ -18,8 +18,7 @@
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -27,7 +26,6 @@
  */
 public interface JavaScriptType {
     JavaScriptType UNKNOWN = new JavaScriptType() {
-        @Nonnull
         @Override
         @RequiredReadAction
         public String getPresentableText() {
@@ -41,7 +39,6 @@ public PsiElement getTargetElement() {
         }
     };
 
-    @Nonnull
     @RequiredReadAction
     String getPresentableText();
 
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
index dc7da63f..3a0d2ebd 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/JavaScriptTypeElement.java
@@ -16,7 +16,6 @@
 
 package consulo.javascript.language.psi;
 
-import jakarta.annotation.Nonnull;
 import com.intellij.lang.javascript.psi.JSElement;
 
 /**
@@ -24,6 +23,5 @@
  * @since 2016-02-29
  */
 public interface JavaScriptTypeElement extends JSElement {
-    @Nonnull
     JavaScriptType getType();
 }
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
index 6bafd932..f6ddf188 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSImplementedInterfacesIndex.java
@@ -21,11 +21,9 @@
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSImplementedInterfacesIndex extends StringStubIndexExtension<JSReferenceList> {
-    @Nonnull
     @Override
     public StubIndexKey<String, JSReferenceList> getKey() {
         return JavaScriptIndexKeys.IMPLEMENTED_INDEX;
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
index 4ae07b1c..79e4fafe 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSNameIndex.java
@@ -24,11 +24,9 @@
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSNameIndex extends StringStubIndexExtension<JSQualifiedNamedElement> {
-    @Nonnull
     @Override
     public StubIndexKey<String, JSQualifiedNamedElement> getKey() {
         return JavaScriptIndexKeys.ELEMENTS_BY_NAME;
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
index 248c122b..fda5ea2b 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSQualifiedElementIndex.java
@@ -23,11 +23,9 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSQualifiedElementIndex extends StringStubIndexExtension<JSQualifiedNamedElement> {
-    @Nonnull
     @Override
     public StubIndexKey<String, JSQualifiedNamedElement> getKey() {
         return JavaScriptIndexKeys.ELEMENTS_BY_QNAME;
diff --git a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
index e8840c49..7dc3d55f 100644
--- a/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
+++ b/base-api/src/main/java/consulo/javascript/language/psi/stub/JSSuperClassIndex.java
@@ -20,11 +20,9 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSSuperClassIndex extends StringStubIndexExtension<JSReferenceList> {
-    @Nonnull
     @Override
     public StubIndexKey<String, JSReferenceList> getKey() {
         return JavaScriptIndexKeys.EXTENDS_INDEX;
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
index db766505..e1e58df1 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptModuleExtension.java
@@ -2,13 +2,11 @@
 
 import consulo.language.version.LanguageVersion;
 import consulo.module.extension.ModuleExtensionWithSdk;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2014-06-29
  */
 public interface JavaScriptModuleExtension<T extends JavaScriptModuleExtension<T>> extends ModuleExtensionWithSdk<T> {
-    @Nonnull
     LanguageVersion getLanguageVersion();
 }
diff --git a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
index 752ecbff..98013714 100644
--- a/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
+++ b/base-api/src/main/java/consulo/javascript/module/extension/JavaScriptMutableModuleExtension.java
@@ -18,12 +18,11 @@
 
 import consulo.language.version.LanguageVersion;
 import consulo.module.extension.MutableModuleExtensionWithSdk;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2015-12-12
  */
 public interface JavaScriptMutableModuleExtension<T extends JavaScriptModuleExtension<T>> extends JavaScriptModuleExtension<T>, MutableModuleExtensionWithSdk<T> {
-    void setLanguageVersion(@Nonnull LanguageVersion languageVersion);
+    void setLanguageVersion(LanguageVersion languageVersion);
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
index c70dde79..45e63ace 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSComputedName.java
@@ -16,7 +16,7 @@
 
 package consulo.javascript.psi;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
diff --git a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
index ab5d457f..ffc8616d 100644
--- a/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
+++ b/base-api/src/main/java/consulo/javascript/psi/JSSimpleLiteralExpression.java
@@ -20,14 +20,12 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.IElementType;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2015-12-11
  */
 public interface JSSimpleLiteralExpression extends JSLiteralExpression {
-    @Nonnull
     @RequiredReadAction
     IElementType getLiteralElementType();
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
index 5fdf53db..254ca21e 100644
--- a/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
+++ b/base-api/src/main/java/consulo/javascript/psi/impl/reference/JSPropertyNameReferenceProvider.java
@@ -24,8 +24,7 @@
 import consulo.component.extension.ExtensionPointName;
 import consulo.language.psi.PsiReference;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -37,5 +36,5 @@ public interface JSPropertyNameReferenceProvider {
 
     @Nullable
     @RequiredReadAction
-    PsiReference getReference(@Nonnull JSProperty property);
+    PsiReference getReference(JSProperty property);
 }
diff --git a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
index 59d08d1d..6d4c14a7 100644
--- a/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
+++ b/base-api/src/main/java/consulo/javascript/psi/stubs/JSFileStub.java
@@ -3,13 +3,11 @@
 import com.intellij.lang.javascript.psi.JSFile;
 import consulo.language.psi.stub.PsiFileStub;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2015-07-19
  */
 public interface JSFileStub extends PsiFileStub<JSFile> {
-    @Nonnull
     String getName();
 }
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
index 2091c800..85ab585c 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationBuilder.java
@@ -29,9 +29,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.util.io.URLUtil;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -65,7 +63,6 @@ private static class ParameterInfo extends SymbolInfo {
     private SymbolInfo generationInfo;
     private ParameterInfo currentParameterInfo;
     private
-    @NonNls
     StringBuilder result;
 
     private JSFunction function;
@@ -137,7 +134,7 @@ public boolean needsPlainCommentData() {
     }
 
     @Override
-    public boolean onCommentLine(@Nonnull String line) {
+    public boolean onCommentLine(String line) {
         String trimmedLine = line.trim();
         boolean parametersStarted = false;
         boolean parametersEnded = false;
@@ -195,7 +192,7 @@ public boolean onCommentLine(@Nonnull String line) {
         return true;
     }
 
-    private static boolean tagNameThatDoNotNeedEscaping(@NonNls String s) {
+    private static boolean tagNameThatDoNotNeedEscaping(String s) {
         return s.equalsIgnoreCase("p") || s.equalsIgnoreCase("i") || s.equalsIgnoreCase("code")
             || s.equalsIgnoreCase("ul") || s.equalsIgnoreCase("li") || s.equalsIgnoreCase("b");
     }
@@ -207,11 +204,11 @@ private void setResult(StringBuilder builder) {
 
     @Override
     public boolean onPatternMatch(
-        @Nonnull MetaDocType metaDocType,
+        MetaDocType metaDocType,
         @Nullable String matchName,
         @Nullable String matchValue,
         @Nullable String remainingLineContent,
-        @Nonnull String line,
+        String line,
         String patternMatched
     ) {
         if (metaDocType == MetaDocType.DEFAULT) {
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
index c79a645b..4afc3d29 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProcessor.java
@@ -22,8 +22,7 @@
  */
 package com.intellij.javascript.documentation;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public interface JSDocumentationProcessor {
     enum MetaDocType {
@@ -53,14 +52,14 @@ enum MetaDocType {
 
     boolean needsPlainCommentData();
 
-    boolean onCommentLine(@Nonnull String line);
+    boolean onCommentLine(String line);
 
     boolean onPatternMatch(
-        @Nonnull MetaDocType type,
+        MetaDocType type,
         @Nullable String matchName,
         @Nullable String matchValue,
         @Nullable String remainingLineContent,
-        @Nonnull String line,
+        String line,
         String patternMatched
     );
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index d47e3897..14d114c0 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -41,8 +41,7 @@
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ref.SimpleReference;
 import consulo.xml.psi.xml.XmlToken;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.File;
 import java.lang.reflect.Method;
@@ -349,7 +348,7 @@ private static void appendAttrList(JSAttributeListOwner jsClass, StringBuilder r
 
     @Nullable
     @RequiredReadAction
-    private static String generateReferenceTargetList(@Nullable JSReferenceList implementsList, @Nonnull String packageName) {
+    private static String generateReferenceTargetList(@Nullable JSReferenceList implementsList, String packageName) {
         if (implementsList == null) {
             return null;
         }
@@ -641,7 +640,7 @@ public PsiElement getDocumentationElementForLink(PsiManager psiManager, String l
     }
 
     @Nullable
-    private static PsiElement getDocumentationElementForLinkStatic(PsiManager psiManager, String link, @Nonnull PsiElement context) {
+    private static PsiElement getDocumentationElementForLinkStatic(PsiManager psiManager, String link, PsiElement context) {
         int delimiterIndex = link.lastIndexOf(':');
 
         String attributeType = null;
@@ -721,7 +720,7 @@ protected static JSAttributeNameValuePair findNamedAttribute(JSClass clazz, Stri
         JSResolveUtil.processMetaAttributesForClass(clazz, new JSResolveUtil.MetaDataProcessor() {
             @Override
             @RequiredReadAction
-            public boolean process(@Nonnull JSAttribute jsAttribute) {
+            public boolean process(JSAttribute jsAttribute) {
                 if (type.equals(jsAttribute.getName())) {
                     JSAttributeNameValuePair jsAttributeNameValuePair = jsAttribute.getValueByName("name");
                     if (jsAttributeNameValuePair != null && name.equals(jsAttributeNameValuePair.getSimpleValue())) {
@@ -764,7 +763,7 @@ public PsiComment findExistingDocComment(PsiComment contextElement) {
 
     @Nullable
     @Override
-    public Pair<PsiElement, PsiComment> parseContext(@Nonnull PsiElement element) {
+    public Pair<PsiElement, PsiComment> parseContext(PsiElement element) {
         return null;
     }
 
@@ -926,7 +925,6 @@ else if (element instanceof JSAttributeNameValuePair nameValuePair) {
         return null;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
index 41c3a360..812f6de4 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationUtils.java
@@ -36,8 +36,7 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ref.SimpleReference;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -353,7 +352,7 @@ else if (text.startsWith("/*") || text.startsWith("//")) {
     }
 
     @Nullable
-    static ASTNode findTrailingCommentInFunctionBody(@Nonnull JSFunction function) {
+    static ASTNode findTrailingCommentInFunctionBody(JSFunction function) {
         ASTNode block = function.getNode().findChildByType(JSElementTypes.BLOCK_STATEMENT);
         if (block == null) {
             return null;
@@ -371,7 +370,7 @@ else if (prev.getPsi() instanceof JSStatement) {
     }
 
     @Nullable
-    static ASTNode findLeadingCommentInFunctionBody(@Nonnull PsiElement element) {
+    static ASTNode findLeadingCommentInFunctionBody(PsiElement element) {
         ASTNode functionNode = element.getNode();
         ASTNode block = functionNode.findChildByType(JSElementTypes.BLOCK_STATEMENT);
         if (block == null) {
@@ -481,7 +480,7 @@ else if (shouldSkipPrevExprStatement &&
 
     @Nullable
     @RequiredReadAction
-    private static String getPropertyNameFromExprStatement(@Nonnull PsiElement element) {
+    private static String getPropertyNameFromExprStatement(PsiElement element) {
         String propName = null;
 
         if (element instanceof JSExpressionStatement expressionStatement
@@ -511,17 +510,17 @@ public boolean needsPlainCommentData() {
                     }
 
                     @Override
-                    public boolean onCommentLine(@Nonnull String line) {
+                    public boolean onCommentLine(String line) {
                         return true;
                     }
 
                     @Override
                     public boolean onPatternMatch(
-                        @Nonnull MetaDocType type,
+                        MetaDocType type,
                         @Nullable String matchName,
                         @Nullable String matchValue,
                         @Nullable String remainingLineContent,
-                        @Nonnull String line,
+                        String line,
                         String patternMatched
                     ) {
                         if (isparameter && type == MetaDocType.PARAMETER && matchName != null && matchName.equals(name)) {
@@ -573,18 +572,18 @@ public boolean needsPlainCommentData() {
                         }
 
                         @Override
-                        public boolean onCommentLine(@Nonnull String line) {
+                        public boolean onCommentLine(String line) {
                             return true;
                         }
 
                         @Override
                         @RequiredReadAction
                         public boolean onPatternMatch(
-                            @Nonnull MetaDocType type,
+                            MetaDocType type,
                             @Nullable String matchName,
                             @Nullable String matchValue,
                             @Nullable String remainingLineContent,
-                            @Nonnull String line,
+                            String line,
                             String patternMatched
                         ) {
                             for (MetaDocType expectedType : expectedTypes) {
@@ -659,17 +658,17 @@ public boolean needsPlainCommentData() {
                     }
 
                     @Override
-                    public boolean onCommentLine(@Nonnull String line) {
+                    public boolean onCommentLine(String line) {
                         return true;
                     }
 
                     @Override
                     public boolean onPatternMatch(
-                        @Nonnull MetaDocType type,
+                        MetaDocType type,
                         @Nullable String matchName,
                         @Nullable String matchValue,
                         @Nullable String remainingLineContent,
-                        @Nonnull String line,
+                        String line,
                         String patternMatched
                     ) {
                         if (type == MetaDocType.DEPRECATED) {
@@ -828,17 +827,17 @@ public boolean needsPlainCommentData() {
                 }
 
                 @Override
-                public boolean onCommentLine(@Nonnull String line) {
+                public boolean onCommentLine(String line) {
                     return true;
                 }
 
                 @Override
                 public boolean onPatternMatch(
-                    @Nonnull MetaDocType type,
+                    MetaDocType type,
                     @Nullable String matchName,
                     @Nullable String matchValue,
                     @Nullable String remainingLineContent,
-                    @Nonnull String line,
+                    String line,
                     String patternMatched
                 ) {
                     if (type == MetaDocType.OPTIONAL_PARAMETERS && matchName != null && matchName.equals(name) && matchValue == null) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
index 246dd974..149097ab 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSDocElementType.java
@@ -16,14 +16,12 @@
 
 package com.intellij.lang.javascript;
 
-import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author yole
  */
 public class JSDocElementType extends JSElementType {
-    public JSDocElementType(@Nonnull @NonNls String debugName) {
+    public JSDocElementType(String debugName) {
         super(debugName);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
index 8ae120d2..e87a8c42 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementType.java
@@ -18,8 +18,6 @@
 
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.ast.IElementType;
-import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * Created by IntelliJ IDEA.
@@ -28,7 +26,7 @@
  * Time: 6:38:56 PM
  */
 public class JSElementType extends IElementType {
-    public JSElementType(@NonNls @Nonnull String debugName) {
+    public JSElementType(String debugName) {
         super(debugName, JavaScriptLanguage.INSTANCE);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
index 0a47c155..bc6e9970 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSElementTypes.java
@@ -47,7 +47,6 @@
 import consulo.language.version.LanguageVersionUtil;
 import consulo.project.Project;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * User: max
@@ -60,7 +59,7 @@ public interface JSElementTypes {
     IElementType EMBEDDED_CONTENT = new ILazyParseableElementType("EMBEDDED_CONTENT", JavaScriptLanguage.INSTANCE) {
         @Override
         @RequiredReadAction
-        protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElement psi) {
+        protected ASTNode doParseContents(ASTNode chameleon, PsiElement psi) {
             LanguageVersion languageVersion = LanguageVersionUtil.findLanguageVersion(getLanguage(), psi);
             Project project = psi.getProject();
             Language languageForParser = getLanguageForParser(psi);
@@ -233,13 +232,12 @@ protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElemen
         new ElementTypeAsPsiFactory("COMMA_EXPRESSION", JavaScriptLanguage.INSTANCE, JSCommaExpressionImpl::new);
     JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_EXPRESSION = new JSFunctionElementType("FUNCTION_EXPRESSION") {
         @Override
-        public JSFunction createPsi(@Nonnull JSFunctionStub stub) {
+        public JSFunction createPsi(JSFunctionStub stub) {
             return new JSFunctionExpressionImpl(stub, this);
         }
 
-        @Nonnull
         @Override
-        public PsiElement createElement(@Nonnull ASTNode astNode) {
+        public PsiElement createElement(ASTNode astNode) {
             return new JSFunctionExpressionImpl(astNode);
         }
     };
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index bac1ba0f..92507d9a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -33,9 +33,7 @@
 import consulo.util.lang.StringUtil;
 import consulo.xml.psi.html.HtmlTag;
 import consulo.xml.psi.xml.*;
-import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -43,15 +41,13 @@
  * Time: 8:40:38 PM
  */
 public abstract class JSLanguageInjector implements MultiHostInjector {
-    @NonNls
     private static final String JAVASCRIPT_PREFIX = "javascript:";
-    @NonNls
     public static final String JSP_URI = "http://java.sun.com/JSP/Page";
 
     private static final NamedPointer<Language> CSS_LANGUAGE = LanguagePointerUtil.createPointer("CSS");
 
     @Override
-    public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement host) {
+    public void injectLanguages(MultiHostRegistrar registrar, PsiElement host) {
         if (host instanceof XmlAttributeValue attributeValue) {
             PsiElement attribute = attributeValue.getParent();
             PsiElement tag = attribute.getParent();
@@ -60,7 +56,7 @@ public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiE
                 if (attributeValue.getTextLength() == 0) {
                     return;
                 }
-                @NonNls String attrName = xmlAttribute.getName();
+                String attrName = xmlAttribute.getName();
                 if (tag instanceof HtmlTag) {
                     attrName = attrName.toLowerCase();
                 }
@@ -116,10 +112,10 @@ else if (attrName.equalsIgnoreCase("djConfig")) {
             }
         }
         else if (host instanceof XmlText && host.getParent() instanceof XmlTag tag) {
-            @NonNls String localName = tag.getLocalName();
+            String localName = tag.getLocalName();
 
             if ("attribute".equals(localName) && JSP_URI.equals(tag.getNamespace())) {
-                @NonNls String name = tag.getAttributeValue("name");
+                String name = tag.getAttributeValue("name");
                 if (name != null && name.startsWith("on")) {
                     Language language = JavaScriptLanguage.INSTANCE;
                     injectToXmlText(registrar, host, language, null, null);
@@ -161,8 +157,8 @@ else if (!(tag instanceof HtmlTag) && JavaScriptSupportLoader.isFlexMxmFile(tag.
                     //|| (property = ("property".equals(localName) && tag.getSubTags().length == 0))
                     || (constructor = "constructor".equals(localName)))
                     && isMozillaXulOrXblNs(tag.getNamespace())) {
-                    @NonNls String prefix = null;
-                    @NonNls String suffix = null;
+                    String prefix = null;
+                    String suffix = null;
 
                     if (getter || setter) {
                         String name = getNameFromTag(tag.getParentTag(), "property");
@@ -233,11 +229,11 @@ private static void injectToXmlText(
         registrar.startInjecting(language).addPlace(prefix, suffix, (PsiLanguageInjectionHost)host, range).doneInjecting();
     }
 
-    private static String getNameFromTag(XmlTag parentTag, @NonNls String s) {
+    private static String getNameFromTag(XmlTag parentTag, String s) {
         return parentTag != null && s.equals(parentTag.getLocalName()) ? parentTag.getAttributeValue("name") : "";
     }
 
-    public static boolean isMozillaXulOrXblNs(@NonNls String ns) {
+    public static boolean isMozillaXulOrXblNs(String ns) {
         return "http://www.mozilla.org/xbl".equals(ns) || "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul".equals(ns);
     }
 
@@ -336,8 +332,8 @@ private static void injectInMxmlFile(
             if (type == null) {
                 type = "*";
             }
-            @NonNls String prefix = "(function (event:" + type + ") {";
-            @NonNls String suffix = "})();";
+            String prefix = "(function (event:" + type + ") {";
+            String suffix = "})();";
 
             if (host instanceof XmlText) {
                 injectToXmlText(registrar, host, JavaScriptSupportLoader.ECMA_SCRIPT_L4, prefix, suffix);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
index 6e71b179..42d88f68 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSStubElementTypes.java
@@ -8,7 +8,6 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -17,13 +16,12 @@
 public interface JSStubElementTypes {
     JSStubElementType<JSFunctionStub, JSFunction> FUNCTION_DECLARATION = new JSFunctionElementType("FUNCTION_DECLARATION") {
         @Override
-        public JSFunction createPsi(@Nonnull JSFunctionStub stub) {
+        public JSFunction createPsi(JSFunctionStub stub) {
             return new JSFunctionImpl(stub, this);
         }
 
-        @Nonnull
         @Override
-        public PsiElement createElement(@Nonnull ASTNode astNode) {
+        public PsiElement createElement(ASTNode astNode) {
             return new JSFunctionImpl(astNode);
         }
     };
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index c348cd60..0d1a0a20 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -38,10 +38,8 @@
 import consulo.language.version.LanguageVersion;
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlTokenType;
-import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max, maxim.mossienko
@@ -441,7 +439,7 @@ public void parseScriptExpression(JavaScriptParsingContext context, PsiBuilder b
     TokenSet IDENTIFIER_TOKENS_SET = TokenSet.create(IDENTIFIER);
 
     abstract class JSChameleonElementType extends ILazyParseableElementType {
-        public JSChameleonElementType(@NonNls String name) {
+        public JSChameleonElementType(String name) {
             super(name, JavaScriptLanguage.INSTANCE);
         }
 
@@ -449,7 +447,7 @@ public JSChameleonElementType(@NonNls String name) {
 
         @Override
         @RequiredReadAction
-        protected ASTNode doParseContents(@Nonnull ASTNode chameleon, @Nonnull PsiElement psi) {
+        protected ASTNode doParseContents(ASTNode chameleon, PsiElement psi) {
             Project project = psi.getProject();
             Language languageForParser = getLanguageForParser(psi);
             LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
index 2ccdfcdc..14ea02bb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptStubElementHolder.java
@@ -3,8 +3,7 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.stub.ObjectStubSerializerProvider;
 import consulo.language.psi.stub.StubElementTypeHolder;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -21,7 +20,6 @@ public String getExternalIdPrefix() {
         return "js.";
     }
 
-    @Nonnull
     @Override
     public List<ObjectStubSerializerProvider> loadSerializers() {
         return allFromStaticFields(JSStubElementTypes.class, Field::get);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
index 9cac359d..1923e16c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
@@ -25,7 +25,6 @@
 import consulo.xml.ide.highlighter.XmlFileType;
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @by max, maxim.mossienko
@@ -36,23 +35,14 @@ public class JavaScriptSupportLoader {
     public static final Language ECMA_SCRIPT_L4 = new Language("ECMA4_DEPRECATED") {
     };
 
-    @NonNls
     public static final String MXML_FILE_EXTENSION_DOT = ".mxml";
-    @NonNls
     public static final String MXML_FILE_EXTENSION2_DOT = ".mxm";
-    @NonNls
     public static final String MXML_URI = "http://www.adobe.com/2006/mxml";
-    @NonNls
     public static final String MXML_URI2 = "http://www.macromedia.com/2003/mxml";
-    @NonNls
     public static final String MXML_URI3 = "http://ns.adobe.com/mxml/2009";
-    @NonNls
     public static final String MXML_URI4 = "library://ns.adobe.com/flex/spark";
-    @NonNls
     public static final String MXML_URI5 = "library://ns.adobe.com/flex/halo";
-    @NonNls
     public static final String MXML_URI6 = "http://ns.adobe.com/fxg/2008";
-    @NonNls
     public static final String[] MXML_URIS = {
         MXML_URI,
         MXML_URI2,
@@ -61,13 +51,9 @@ public class JavaScriptSupportLoader {
         MXML_URI5,
         MXML_URI6
     };
-    @NonNls
     public static final String BINDOWS_URI = "http://www.bindows.net";
-    @NonNls
     public static final String ACTION_SCRIPT_CLASS_TEMPLATE_NAME = "ActionScript Class";
-    @NonNls
     public static final String ACTION_SCRIPT_INTERFACE_TEMPLATE_NAME = "ActionScript Interface";
-    @NonNls
     public static final String MXML_COMPONENT_TEMPLATE_NAME = "Mxml Component";
 
     public static boolean isFlexMxmFile(PsiFile file) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
index 71e4d4aa..90eea90f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
@@ -4,7 +4,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.xml.psi.xml.XmlAttributeValue;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -12,7 +11,6 @@
  */
 @ExtensionImpl
 public class XmlAttributeValueJSInjector extends JSLanguageInjector {
-    @Nonnull
     @Override
     public Class<? extends PsiElement> getElementClass() {
         return XmlAttributeValue.class;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
index 5de93482..330e6b35 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
@@ -4,7 +4,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.xml.psi.xml.XmlText;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -12,7 +11,6 @@
  */
 @ExtensionImpl
 public class XmlTextJSInjector extends JSLanguageInjector {
-    @Nonnull
     @Override
     public Class<? extends PsiElement> getElementClass() {
         return XmlText.class;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
index 8abcc576..ea26c247 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/FlexImportSupport.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.PsiNamedElement;
 import consulo.util.collection.ArrayUtil;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -117,7 +116,7 @@ else if (o instanceof Object[] objects) {
         }
     }
 
-    public static JSImportedElementResolveResult resolveTypeNameUsingImplicitImports(@Nonnull String referenceName, @Nonnull JSFile file) {
+    public static JSImportedElementResolveResult resolveTypeNameUsingImplicitImports(String referenceName, JSFile file) {
         PsiElement context = file.getContext();
 
         if (context != null) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
index 94ea4f99..8377eb4c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/JSResolveHelper.java
@@ -28,7 +28,7 @@
 import consulo.project.Project;
 import consulo.virtualFileSystem.VirtualFile;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author yole
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index 05165794..d866f4e5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -45,8 +45,7 @@
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.XmlRecursiveElementVisitor;
 import consulo.xml.psi.xml.*;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.*;
 
@@ -103,7 +102,6 @@ public JSReferenceList getImplementsList() {
         return refList;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiElement getNavigationElement() {
@@ -172,7 +170,7 @@ public PsiElement getNameIdentifier() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         int i = name.lastIndexOf('.');
         if (i != -1) {
             name = name.substring(0, i);
@@ -206,10 +204,10 @@ protected boolean processMembers(
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState substitutor,
+        PsiScopeProcessor processor,
+        ResolveState substitutor,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
 
@@ -444,7 +442,7 @@ public boolean isEquivalentTo(PsiElement element2) {
 
     @Override
     @RequiredWriteAction
-    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public PsiElement add(PsiElement element) throws IncorrectOperationException {
         if (element instanceof JSFunction || element instanceof JSVarStatement) {
             JSFile jsFile = createOrGetFirstScriptTag();
 
@@ -510,7 +508,7 @@ public static String findScriptNs(XmlTag rootTag) {
 
     @Override
     @RequiredWriteAction
-    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addBefore(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (anchor == null) {
             return add(element);
         }
@@ -558,7 +556,7 @@ public static Collection<XmlBackedJSClassImpl> getChildInlineComponents(XmlTag r
         rootTag.processElements(
             new PsiElementProcessor() {
                 @Override
-                public boolean execute(@Nonnull PsiElement element) {
+                public boolean execute(PsiElement element) {
                     if (element instanceof XmlTag tag) {
                         if (isInlineComponentTag(tag)) {
                             result.add(getXmlBackedClass(tag));
@@ -609,7 +607,7 @@ public void go() {
 
         @Override
         @RequiredReadAction
-        public boolean execute(@Nonnull PsiElement element) {
+        public boolean execute(PsiElement element) {
             if (element instanceof XmlTag tag) {
                 if (myVisitAllTags || SCRIPT_TAG_NAME.equals(tag.getLocalName())) {
                     String srcLocation = tag.getAttributeValue("source");
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
index c39bef90..badfc26d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JSHighlighter.java
@@ -25,7 +25,6 @@
 import consulo.language.editor.highlight.SyntaxHighlighterBase;
 import consulo.language.lexer.Lexer;
 import consulo.xml.editor.XmlHighlighterColors;
-import jakarta.annotation.Nonnull;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -44,7 +43,6 @@ public JSHighlighter(DialectOptionHolder dialectOptionsHolder) {
         myDialectOptionsHolder = dialectOptionsHolder;
     }
 
-    @Nonnull
     @Override
     public Lexer getHighlightingLexer() {
         return new JavaScriptHighlightingLexer(myDialectOptionsHolder);
@@ -117,9 +115,8 @@ public Lexer getHighlightingLexer() {
         KEYS_1.put(JSTokenTypes.XML_TAG_CONTENT, XmlHighlighterColors.XML_TAG_DATA);
     }
 
-    @Nonnull
     @Override
-    public TextAttributesKey[] getTokenHighlights(@Nonnull IElementType tokenType) {
+    public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
         return pack(KEYS_1.get(tokenType), KEYS_2.get(tokenType));
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
index 5d49a008..e4868e0e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSItemPresentation.java
@@ -28,7 +28,7 @@
 import consulo.navigation.ItemPresentation;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.image.Image;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
index 75991d37..bc1aea97 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/index/JSSymbolUtil.java
@@ -21,7 +21,7 @@
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index 4f1abc69..1867246d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -46,8 +46,7 @@
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlText;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.Set;
@@ -61,7 +60,7 @@ public abstract class BaseCreateFix implements LocalQuickFix {
 
     @Override
     @RequiredReadAction
-    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+    public void applyFix(Project project, ProblemDescriptor descriptor) {
         PsiElement psiElement = descriptor.getPsiElement();
         PsiFile file = psiElement.getContainingFile();
         PsiFile realFile = file.getContext() != null ? file.getContext().getContainingFile() : file;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
index 838d44c8..8f70c9da 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/parsing/JSDocParsing.java
@@ -21,7 +21,6 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.ast.IElementType;
 import consulo.language.parser.PsiBuilder;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author Maxim.Mossienko
@@ -52,7 +51,7 @@ private static boolean parseDocTag(PsiBuilder builder) {
         PsiBuilder.Marker docTagMarker = builder.mark();
 
         try {
-            @NonNls String tagName = builder.getTokenText();
+            String tagName = builder.getTokenText();
 
             builder.advanceLexer();
             if ("@param".equals(tagName)) {
@@ -114,7 +113,7 @@ private static boolean isInvalidTokenType(PsiBuilder builder) {
         return builder.eof() || tokenType == JSDocTokenTypes.DOC_COMMENT_LEADING_ASTERISK || tokenType == JSDocTokenTypes.DOC_COMMENT_END;
     }
 
-    private static boolean isToCreateDocTagValue(@NonNls String tokenText) {
+    private static boolean isToCreateDocTagValue(String tokenText) {
         return tokenText.equals("@see") ||
             tokenText.equals("@class") ||
             tokenText.equals("@member") ||
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
index 9863dda9..5e38ccf4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArgumentListImpl.java
@@ -24,7 +24,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -41,7 +40,7 @@ public JSExpression[] getArguments() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSArgumentList(this);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
index 6b8860bb..acb68248 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSArrayLiteralExpressionImpl.java
@@ -24,7 +24,6 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -65,7 +64,7 @@ else if (type == JSTokenTypes.COMMA) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSArrayLiteralExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
index 50485990..12a7ba1c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAssignmentExpressionImpl.java
@@ -20,7 +20,6 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -32,7 +31,7 @@ public JSAssignmentExpressionImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSAssignmentExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
index d5d8a3c1..8d5e0f78 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeImpl.java
@@ -32,7 +32,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.util.collection.ArrayUtil;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -71,7 +70,7 @@ public JSAttributeImpl(JSAttributeStub node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSAttribute(this);
     }
 
@@ -88,7 +87,7 @@ public String getName() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         throw new IncorrectOperationException();
     }
 
@@ -109,7 +108,6 @@ public JSAttributeNameValuePair getValueByName(String name) {
         return null;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiReference[] getReferences() {
@@ -143,7 +141,6 @@ public PsiElement getElement() {
             return JSAttributeImpl.this;
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public TextRange getRangeInElement() {
@@ -157,7 +154,6 @@ public PsiElement resolve() {
             return ArrayUtil.indexOf(POSSIBLE_META_DATA, s) >= 0 ? JSAttributeImpl.this : null;
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public String getCanonicalText() {
@@ -172,7 +168,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
 
         @Override
         @RequiredWriteAction
-        public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+        public PsiElement bindToElement(PsiElement element) throws IncorrectOperationException {
             return null;
         }
 
@@ -186,7 +182,6 @@ public boolean isReferenceTo(PsiElement element) {
             return false;
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public Object[] getVariants() {
@@ -199,9 +194,8 @@ public boolean isSoft() {
             return true;
         }
 
-        @Nonnull
         @Override
-        public LocalizeValue buildUnresolvedMessage(@Nonnull String referenceText) {
+        public LocalizeValue buildUnresolvedMessage(String referenceText) {
             return LocalizeValue.localizeTODO("Unknown metadata tag");
         }
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
index 1aee060a..1572c38b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeListImpl.java
@@ -30,8 +30,7 @@
 import consulo.language.ast.TokenSet;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -64,7 +63,7 @@ public JSAttributeListImpl(JSAttributeListStub stub) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSAttributeList(this);
     }
 
@@ -92,10 +91,9 @@ public JSAttribute[] getAttributes() {
         return getStubOrPsiChildren(JSElementTypes.ATTRIBUTE, JSAttribute.ARRAY_FACTORY);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
-    public JSAttribute[] getAttributesByName(@Nonnull String name) {
+    public JSAttribute[] getAttributesByName(String name) {
         List<JSAttribute> attributes = null;
         for (JSAttribute attr : getAttributes()) {
             if (name.equals(attr.getName())) {
@@ -152,7 +150,7 @@ public boolean hasModifier(ModifierType modifier) {
 
     @Override
     @RequiredWriteAction
-    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public PsiElement add(PsiElement element) throws IncorrectOperationException {
         if (element.getNode().getElementType() == JSTokenTypes.OVERRIDE_KEYWORD) {
             return JSChangeUtil.doDoAddBefore(this, element, getFirstChild());
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
index 1be66e9a..b1669241 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSAttributeNameValuePairImpl.java
@@ -30,7 +30,6 @@
 import consulo.language.psi.PsiReference;
 import consulo.language.util.IncorrectOperationException;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -48,7 +47,7 @@ public JSAttributeNameValuePairImpl(JSAttributeNameValuePairStub node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSAttributeNameValuePair(this);
     }
 
@@ -65,7 +64,7 @@ public String getName() {
 
     @Override
     @RequiredReadAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         throw new IncorrectOperationException();
     }
 
@@ -93,7 +92,6 @@ private ASTNode findValueNode() {
     }
 
     @Override
-    @Nonnull
     @RequiredReadAction
     public PsiReference[] getReferences() {
         String name = getName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
index ce95d814..9bfc4116 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBinaryExpressionImpl.java
@@ -30,8 +30,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -73,17 +72,17 @@ public PsiElement getOperationElement() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSBinaryExpression(this);
     }
 
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         IElementType operationType = getOperationSign();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
index 3d1e4da7..64a366d2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBlockStatementImpl.java
@@ -26,7 +26,6 @@
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -47,13 +46,13 @@ public JSLabeledStatement setLabel(String label) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSBlock(this);
     }
 
     @Override
     @RequiredWriteAction
-    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public PsiElement add(PsiElement element) throws IncorrectOperationException {
         if (element instanceof JSStatement statement) {
             ASTNode node = getNode().findChildByType(JSTokenTypes.RBRACE);
             if (node != null) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
index ce33bbba..92aa8704 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSBreakStatementImpl.java
@@ -20,7 +20,6 @@
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -32,7 +31,7 @@ public JSBreakStatementImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSBreakStatement(this);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
index f6bab133..e5c60b16 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCallExpressionImpl.java
@@ -24,7 +24,6 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -48,7 +47,7 @@ public JSArgumentList getArgumentList() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSCallExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
index 25c89e04..503efdea 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCaseClauseImpl.java
@@ -23,7 +23,6 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -52,7 +51,7 @@ public JSStatement[] getStatements() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSCaseClause(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
index 81655477..00faf817 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCatchBlockImpl.java
@@ -28,7 +28,6 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -52,17 +51,17 @@ public JSStatement getStatement() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSCatchBlock(this);
     }
 
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         if (lastParent != null) {
             JSParameter param = getParameter();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
index 33aff1e0..6ba99c53 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSChangeUtil.java
@@ -34,10 +34,8 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -68,9 +66,8 @@ public static ASTNode createNameIdentifier(Project project, String name) {
         return refExpr.getNode().getFirstChildNode();
     }
 
-    @Nonnull
     @RequiredReadAction
-    public static JSExpression createExpressionFromText(Project project, @NonNls String text) {
+    public static JSExpression createExpressionFromText(Project project, String text) {
         text = "{\n" + text + "\n}";
         PsiElement element = createJSTreeFromTextImpl(project, text);
         assert element instanceof JSBlockStatement : "\"" + text + "\" was not parsed as BlockStatement";
@@ -273,7 +270,7 @@ public static boolean isBlockStatementContainer(JSElement jsElement) {
     }
 
     @RequiredWriteAction
-    public static PsiElement blockDoAddRangeBefore(PsiElement first, PsiElement last, @Nonnull PsiElement anchor)
+    public static PsiElement blockDoAddRangeBefore(PsiElement first, PsiElement last, PsiElement anchor)
         throws IncorrectOperationException {
         BlockAddContext addContext = new BlockAddContext(anchor) {
             @Override
@@ -286,7 +283,7 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
     }
 
     @RequiredWriteAction
-    public static PsiElement blockDoAddRangeAfter(PsiElement first, PsiElement last, @Nonnull PsiElement anchor)
+    public static PsiElement blockDoAddRangeAfter(PsiElement first, PsiElement last, PsiElement anchor)
         throws IncorrectOperationException {
         BlockAddContext addContext = new BlockAddContext(anchor) {
             @Override
@@ -299,7 +296,7 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
     }
 
     @RequiredWriteAction
-    public static PsiElement blockDoAddAfter(PsiElement element, @Nonnull PsiElement anchor) throws IncorrectOperationException {
+    public static PsiElement blockDoAddAfter(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         BlockAddContext addContext = new BlockAddContext(anchor) {
             @Override
             PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException {
@@ -311,7 +308,7 @@ PsiElement doAddElement(PsiElement... element) throws IncorrectOperationExceptio
     }
 
     @RequiredWriteAction
-    public static PsiElement blockDoAddBefore(PsiElement element, @Nonnull PsiElement anchor) throws IncorrectOperationException {
+    public static PsiElement blockDoAddBefore(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         BlockAddContext addContext = new BlockAddContext(anchor) {
             @Override
             PsiElement doAddElement(PsiElement... element) throws IncorrectOperationException {
@@ -332,7 +329,7 @@ abstract static class BlockAddContext {
         final PsiElement codeBlockAnchor;
 
         @RequiredWriteAction
-        BlockAddContext(@Nonnull PsiElement _anchor) throws IncorrectOperationException {
+        BlockAddContext(PsiElement _anchor) throws IncorrectOperationException {
             ASTNode codeBlockNode = JSChangeUtil.createStatementFromText(_anchor.getProject(), "{ a }");
 
             newlyAddedBlock = (JSBlockStatement)_anchor.replace(codeBlockNode.getPsi());
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index e0b3116d..efe2ecfe 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -39,8 +39,7 @@
 import consulo.util.collection.ArrayFactory;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.dataholder.Key;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.*;
 
@@ -67,7 +66,7 @@ public JSClassBase(JSClassStub stub, JSStubElementType<JSClassStub, JSClass> aCl
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSClass(this);
     }
 
@@ -104,7 +103,7 @@ public JSFunction[] getFunctions() {
             processDeclarations(
                 new PsiScopeProcessor() {
                     @Override
-                    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                    public boolean execute(PsiElement element, ResolveState state) {
                         if (element instanceof JSFunction function) {
                             functions.add(function);
                         }
@@ -112,7 +111,7 @@ public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                     }
 
                     @Override
-                    public <T> T getHint(@Nonnull Key<T> hintClass) {
+                    public <T> T getHint(Key<T> hintClass) {
                         return null;
                     }
 
@@ -160,7 +159,7 @@ public JSVariable[] getFields() {
             processDeclarations(
                 new PsiScopeProcessor() {
                     @Override
-                    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                    public boolean execute(PsiElement element, ResolveState state) {
                         if (element instanceof JSVariable variable) {
                             vars.add(variable);
                         }
@@ -168,7 +167,7 @@ public boolean execute(@Nonnull PsiElement element, ResolveState state) {
                     }
 
                     @Override
-                    public <T> T getHint(@Nonnull Key<T> hintClass) {
+                    public <T> T getHint(Key<T> hintClass) {
                         return null;
                     }
 
@@ -190,7 +189,6 @@ public JSVariable findFieldByName(String name) {
         return initFields().get(name);
     }
 
-    @Nonnull
     @RequiredReadAction
     private Map<String, JSVariable> initFields() {
         Map<String, JSVariable> name2FieldsMap = myName2FieldsMap;
@@ -216,7 +214,6 @@ private Map<String, JSVariable> initFields() {
         return name2FieldsMap;
     }
 
-    @Nonnull
     @RequiredReadAction
     private Map<String, Object> initFunctions() {
         Map<String, Object> name2FunctionMap = myName2FunctionMap;
@@ -280,7 +277,7 @@ public JSClass[] getSupers() {
         return superClasses.toArray(new JSClass[superClasses.size()]);
     }
 
-    private List<JSClass> getClassesFromReferenceList(@Nullable JSReferenceList extendsList, @Nonnull IElementType type) {
+    private List<JSClass> getClassesFromReferenceList(@Nullable JSReferenceList extendsList, IElementType type) {
         PsiElement element = extendsList != null ? extendsList : this;
 
         if (type == JSElementTypes.EXTENDS_LIST) {
@@ -294,10 +291,10 @@ private List<JSClass> getClassesFromReferenceList(@Nullable JSReferenceList exte
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState substitutor,
+        PsiScopeProcessor processor,
+        ResolveState substitutor,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         ResolveProcessor resolveProcessor = processor instanceof ResolveProcessor rProcessor ? rProcessor : null;
         boolean toProcessClass = resolveProcessor != null && resolveProcessor.isTypeContext();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
index e934fa45..12cc0bc9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassExpressionImpl.java
@@ -8,7 +8,6 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.lang.psi.impl.JavaScriptClassType;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -20,18 +19,16 @@ public JSClassExpressionImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSExpression(this);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JSClass getClassElement() {
         return findNotNullChildByClass(JSClass.class);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JavaScriptType getType() {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
index 5d86428d..24f5fad5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassImpl.java
@@ -33,7 +33,6 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -79,7 +78,7 @@ else if (nameIdentifier != null) {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String newName) throws IncorrectOperationException {
+    public PsiElement setName(String newName) throws IncorrectOperationException {
         newName = newName.substring(newName.lastIndexOf('.') + 1);
         String oldName = getName();
         if (newName.equals(oldName)) {
@@ -150,10 +149,10 @@ protected boolean processMembers(PsiScopeProcessor processor, ResolveState subst
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState substitutor,
+        PsiScopeProcessor processor,
+        ResolveState substitutor,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         boolean b = super.processDeclarations(processor, substitutor, lastParent, place);
 
@@ -165,7 +164,7 @@ public boolean processDeclarations(
 
     @Override
     @RequiredWriteAction
-    public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addAfter(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (anchor == null) {
             ASTNode node = getNode().findChildByType(JSTokenTypes.RBRACE);
             if (node != null) {
@@ -182,7 +181,7 @@ public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throw
 
     @Override
     @RequiredWriteAction
-    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addBefore(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         PsiElement superElement = super.addBefore(element, anchor);
         CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), superElement.getNode());
         return superElement;
@@ -198,7 +197,6 @@ public boolean isEquivalentTo(PsiElement another) {
             || JSPsiImplUtils.isTheSameClass(another, this);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiElement getNavigationElement() {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
index cfd6fd3c..ea5c3c07 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSCommaExpressionImpl.java
@@ -19,7 +19,6 @@
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSCommaExpression;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -31,7 +30,7 @@ public JSCommaExpressionImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSCommaExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
index aba3db4e..4c6755f8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSConditionalExpressionImpl.java
@@ -25,7 +25,6 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.language.ast.IElementType;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -99,7 +98,7 @@ public JSExpression getElse() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSConditionalExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
index 72e9f1da..31b718c5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSContinueStatementImpl.java
@@ -21,7 +21,6 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -45,7 +44,7 @@ public JSStatement getStatementToContinue() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSContinueStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
index 1ad69372..acd6172b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDefinitionExpressionImpl.java
@@ -25,7 +25,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author maxim.mossienko
@@ -51,23 +50,23 @@ public String getName() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         return getExpression() instanceof JSReferenceExpressionImpl referenceExpression
             ? referenceExpression.handleElementRenameInternal(name)
             : null;
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSDefinitionExpression(this);
     }
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         return lastParent != null || processor.execute(this, state);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
index e1bbd0a5..1186e4a0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDoWhileStatementImpl.java
@@ -22,7 +22,6 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -45,7 +44,7 @@ public JSStatement getBody() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSDoWhileStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
index 865d2b80..2506df8c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocCommentImpl.java
@@ -23,7 +23,6 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.IElementType;
 import consulo.language.ast.ASTNode;
-import jakarta.annotation.Nonnull;
 
 public class JSDocCommentImpl extends JSElementImpl implements JSDocComment {
     public JSDocCommentImpl(ASTNode node) {
@@ -37,7 +36,7 @@ public IElementType getTokenType() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSDocComment(this);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
index 44acae55..1a527fc7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagImpl.java
@@ -30,7 +30,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.util.collection.ArrayUtil;
-import jakarta.annotation.Nonnull;
 
 public class JSDocTagImpl extends JSElementImpl implements JSDocTag {
     private volatile PsiReference[] myRefs;
@@ -49,12 +48,12 @@ public String getName() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         throw new IncorrectOperationException();
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSDocTag(this);
     }
 
@@ -63,7 +62,6 @@ public JSDocTagValue getValue() {
         return findChildByClass(JSDocTagValue.class);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiReference[] getReferences() {
@@ -141,14 +139,12 @@ public PsiElement getElement() {
             return myJsDocTagValue.getParent();
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public TextRange getRangeInElement() {
             return myRange;
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public String getCanonicalText() {
@@ -168,7 +164,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
 
         @Override
         @RequiredWriteAction
-        public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+        public PsiElement bindToElement(PsiElement element) throws IncorrectOperationException {
             return null;
         }
 
@@ -256,7 +252,6 @@ public PsiElement resolve() {
             return null;
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public Object[] getVariants() {
@@ -276,9 +271,8 @@ public Object[] getVariants() {
             return ArrayUtil.EMPTY_OBJECT_ARRAY;
         }
 
-        @Nonnull
         @Override
-        public LocalizeValue buildUnresolvedMessage(@Nonnull String referenceText) {
+        public LocalizeValue buildUnresolvedMessage(String referenceText) {
             return JavaScriptLocalize.javascriptValidationMessageIncorrectParameterName();
         }
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
index 23eae001..7aca3164 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSDocTagValueImpl.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.PsiReference;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.text.StringTokenizer;
-import jakarta.annotation.Nonnull;
 
 public class JSDocTagValueImpl extends JSElementImpl implements JSDocTagValue {
     private volatile PsiReference[] myRefs;
@@ -35,7 +34,6 @@ public JSDocTagValueImpl(ASTNode node) {
         super(node);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiReference[] getReferences() {
@@ -109,7 +107,7 @@ else if ("returns".equals(name)) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSDocTagValue(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
index 75f03772..f9905bfc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
@@ -31,7 +31,6 @@
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlTagChild;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -43,7 +42,7 @@ public JSEmbeddedContentImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
@@ -75,10 +74,10 @@ public boolean processElements(PsiElementProcessor processor, PsiElement place)
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         return JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
index 3e1691b4..e52e1ef1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmptyStatementImpl.java
@@ -19,7 +19,6 @@
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSEmptyStatement;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -31,7 +30,7 @@ public JSEmptyStatementImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSEmptyStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
index d6b753f1..4bd29261 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionCodeFragmentImpl.java
@@ -26,9 +26,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiManager;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author nik
@@ -38,7 +36,7 @@ public class JSExpressionCodeFragmentImpl extends JSFileImpl implements JSExpres
     private boolean myPhysical;
     private FileViewProvider myViewProvider;
 
-    public JSExpressionCodeFragmentImpl(Project project, @NonNls String name, CharSequence text, boolean isPhysical) {
+    public JSExpressionCodeFragmentImpl(Project project, String name, CharSequence text, boolean isPhysical) {
         super(new SingleRootFileViewProvider(
             PsiManager.getInstance(project),
             new LightVirtualFile(name, FileTypeManager.getInstance().getFileTypeByFileName(name), text),
@@ -68,7 +66,6 @@ public PsiElement getContext() {
     }
 
     @Override
-    @Nonnull
     public FileViewProvider getViewProvider() {
         return myViewProvider != null ? myViewProvider : super.getViewProvider();
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
index 4f50f921..d866bc91 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionImpl.java
@@ -21,7 +21,6 @@
 import consulo.annotation.access.RequiredWriteAction;
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.ast.ASTNode;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author ven
@@ -31,14 +30,12 @@ public JSExpressionImpl(ASTNode node) {
         super(node);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JavaScriptType getType() {
         return JavaScriptType.UNKNOWN;
     }
 
-    @Nonnull
     @Override
     @RequiredWriteAction
     public JSExpression replace(JSExpression newExpr) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
index 28125ffd..aa5443fd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSExpressionStatementImpl.java
@@ -28,7 +28,6 @@
 import consulo.navigation.ItemPresentation;
 import consulo.ui.image.Image;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -46,17 +45,17 @@ public JSExpression getExpression() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSExpressionStatement(this);
     }
 
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         if (lastParent == null) {
             JSExpression expression = getExpression();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
index 92837d37..9ac3b9e9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFileImpl.java
@@ -19,7 +19,6 @@
 import java.util.List;
 
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
@@ -38,7 +37,7 @@
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.file.FileViewProvider;
 import consulo.language.impl.psi.PsiFileBase;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -58,10 +57,10 @@ public String toString() {
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         @Nullable PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         boolean result = JSResolveUtil.processDeclarationsInScope(this, processor, state, lastParent, place);
         if (lastParent == null) {
@@ -86,7 +85,7 @@ public boolean processDeclarations(
     }
 
     @Override
-    public void accept(@Nonnull PsiElementVisitor visitor) {
+    public void accept(PsiElementVisitor visitor) {
         if (visitor instanceof JSElementVisitor elementVisitor) {
             elementVisitor.visitJSElement(this);
         }
@@ -97,8 +96,8 @@ public void accept(@Nonnull PsiElementVisitor visitor) {
 
     @Override
     public PsiElement addRangeBefore(
-        @Nonnull PsiElement first,
-        @Nonnull PsiElement last,
+        PsiElement first,
+        PsiElement last,
         PsiElement anchor
     ) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(first)) {
@@ -113,7 +112,7 @@ public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOp
     }
 
     @Override
-    public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addAfter(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
             return JSChangeUtil.doAddAfter(this, element, anchor);
         }
@@ -121,7 +120,7 @@ public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throw
     }
 
     @Override
-    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addBefore(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
             return JSChangeUtil.doAddBefore(this, element, anchor);
         }
@@ -138,7 +137,7 @@ public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement an
     }
 
     @Override
-    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public PsiElement add(PsiElement element) throws IncorrectOperationException {
         return addAfter(element, null);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
index 809fcb4f..d0da0afd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForInStatementImpl.java
@@ -25,7 +25,6 @@
 import consulo.language.ast.TokenSet;
 import consulo.annotation.access.RequiredReadAction;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -103,10 +102,10 @@ else if (passedRParen && child.getPsi() instanceof JSStatement statement) {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         if (lastParent != null) {
             JSVarStatement statement = getDeclarationStatement();
@@ -124,7 +123,7 @@ public boolean processDeclarations(
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSForInStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
index 09454ef8..a2a0803e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSForStatementImpl.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.resolve.PsiScopeProcessor;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -116,10 +115,10 @@ else if (passedRParen && child.getPsi() instanceof JSStatement statement) {
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         if (lastParent != null) {
             JSVarStatement statement = getVarDeclaration();
@@ -137,7 +136,7 @@ public boolean processDeclarations(
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSForStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
index 6cf4fcb4..83ebd141 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionBaseImpl.java
@@ -36,7 +36,6 @@
 import consulo.javascript.language.psi.JavaScriptTypeElement;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -81,7 +80,6 @@ public JSSourceElement[] getBody() {
         return result;
     }
 
-    @Nonnull
     @Override
     public JavaScriptType getReturnType() {
         return JavaScriptType.UNKNOWN;
@@ -105,7 +103,7 @@ public JavaScriptTypeElement getReturnTypeElement() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         ASTNode newNameElement = createNameIdentifier(name);
         ASTNode nameIdentifier = getNameIdentifier().getNode();
         nameIdentifier.getTreeParent().replaceChild(nameIdentifier, newNameElement);
@@ -151,10 +149,10 @@ public int getTextOffset() {
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         if (lastParent != null && lastParent.getParent() == this) {
             if (place instanceof JSReferenceExpression referenceExpression) {
@@ -183,7 +181,7 @@ public boolean processDeclarations(
 
     @Override
     @RequiredWriteAction
-    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addBefore(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (anchor == getFirstChild() && element instanceof JSAttributeList attributeList
             && anchor.getNode().getElementType() == JSTokenTypes.FUNCTION_KEYWORD) {
             return JSChangeUtil.doDoAddBefore(this, attributeList, anchor);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
index 7d0e61f7..92259ce0 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionExpressionImpl.java
@@ -27,7 +27,6 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -43,7 +42,7 @@ public JSFunctionExpressionImpl(JSFunctionStub stub, IStubElementType type) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSFunctionExpression(this);
     }
 
@@ -53,14 +52,12 @@ protected ASTNode createNameIdentifier(String name) {
         return JSChangeUtil.createNameIdentifier(getProject(), name);
     }
 
-    @Nonnull
     @Override
     @RequiredWriteAction
     public JSExpression replace(JSExpression newExpr) {
         return JSChangeUtil.replaceExpression(this, newExpr);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JavaScriptType getType() {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
index eed6ebbe..ea6313a4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionImpl.java
@@ -30,7 +30,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.util.lang.Comparing;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -82,7 +81,7 @@ public JSAttributeList getAttributeList() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSFunctionDeclaration(this);
     }
 
@@ -109,7 +108,6 @@ public String getQualifiedName() {
         }
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public SearchScope getUseScope() {
@@ -119,7 +117,6 @@ public SearchScope getUseScope() {
         return JSResolveUtil.findUseScope(this);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiElement getNavigationElement() {
@@ -136,7 +133,7 @@ public PsiElement getNavigationElement() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         String oldName = getName();
         PsiElement element = super.setName(name);
         if (getParent() instanceof JSPackageStatement) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
index 988906f4..de9c7745 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSFunctionPropertyImpl.java
@@ -11,8 +11,7 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.javascript.language.psi.JavaScriptTypeElement;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -56,7 +55,6 @@ public JSSourceElement[] getBody() {
         return result;
     }
 
-    @Nonnull
     @Override
     public JavaScriptType getReturnType() {
         return JavaScriptType.UNKNOWN;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
index c398fb18..42c783dd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSGenericSignatureImpl.java
@@ -20,7 +20,6 @@
 import com.intellij.lang.javascript.psi.JSGenericSignature;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 public class JSGenericSignatureImpl extends JSElementImpl implements JSGenericSignature {
     public JSGenericSignatureImpl(ASTNode node) {
@@ -28,7 +27,7 @@ public JSGenericSignatureImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSGenericSignature(this);
     }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
index dd465852..ff31f8ab 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIfStatementImpl.java
@@ -24,7 +24,6 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIfStatement;
 import com.intellij.lang.javascript.psi.JSStatement;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -70,7 +69,7 @@ public void setCondition(JSExpression expr) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSIfStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
index e0303e1a..c577894e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSImportStatementImpl.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -41,16 +40,16 @@ public JSImportStatementImpl(JSImportStatementStub stub) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSImportStatement(this);
     }
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         return true;
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
index ebbee666..46458356 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIncludeDirectiveImpl.java
@@ -29,7 +29,6 @@
 import consulo.language.psi.path.FileReference;
 import consulo.language.psi.path.FileReferenceSet;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -44,11 +43,10 @@ public JSIncludeDirectiveImpl(JSIncludeDirectiveStub stub) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSIncludeDirective(this);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiReference[] getReferences() {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
index bbf2c2cd..9c1be01b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSIndexedPropertyAccessExpressionImpl.java
@@ -23,7 +23,6 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSIndexedPropertyAccessExpression;
 import consulo.language.ast.IElementType;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -70,7 +69,7 @@ public JSExpression getIndexExpression() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSIndexedPropertyAccessExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
index 3ebf274c..ee825ccc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLabeledStatementImpl.java
@@ -27,7 +27,6 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -65,7 +64,7 @@ public JSLabeledStatement setLabel(String label) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSLabeledStatement(this);
     }
 
@@ -77,7 +76,7 @@ public String getName() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         JSChangeUtil.doIdentifierReplacement(this, getLabelIdentifier(), name);
         return this;
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
index cf82c557..363147f8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetExpressionImpl.java
@@ -20,7 +20,6 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSLetExpression;
 import consulo.language.ast.ASTNode;
-import jakarta.annotation.Nonnull;
 
 /**
  * Created by IntelliJ IDEA.
@@ -38,7 +37,7 @@ public JSExpression getExpression() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSLetExpression(this);
     }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
index f111a911..5ba7dd7a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLetStatementImpl.java
@@ -22,7 +22,6 @@
 import com.intellij.lang.javascript.psi.JSLetStatement;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author maxim
@@ -33,7 +32,7 @@ public JSLetStatementImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSLetStatement(this);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
index 5f324282..1b6cc08a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSLiteralExpressionImpl.java
@@ -31,7 +31,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiLanguageInjectionHost;
 import consulo.language.psi.PsiReference;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -46,7 +45,6 @@ public JSLiteralExpressionImpl(ASTNode node) {
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public IElementType getLiteralElementType() {
         PsiElement firstChild = getFirstChild();
@@ -55,7 +53,6 @@ public IElementType getLiteralElementType() {
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public JavaScriptType getType() {
         IElementType literalElementType = getLiteralElementType();
@@ -77,7 +74,6 @@ else if (JavaScriptTokenSets.STRING_LITERALS.contains(literalElementType)) {
         return super.getType();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiReference[] getReferences() {
@@ -110,7 +106,7 @@ public PsiReference[] getReferences() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSLiteralExpression(this);
     }
 
@@ -121,12 +117,11 @@ public boolean isValidHost() {
 
     @Override
     @RequiredWriteAction
-    public PsiLanguageInjectionHost updateText(@Nonnull String text) {
+    public PsiLanguageInjectionHost updateText(String text) {
         JSExpression expressionFromText = JSChangeUtil.createExpressionFromText(getProject(), text);
         return (PsiLanguageInjectionHost)replace(expressionFromText);
     }
 
-    @Nonnull
     @Override
     public LiteralTextEscaper<? extends PsiLanguageInjectionHost> createLiteralTextEscaper() {
         return LiteralTextEscaper.createSimple(this);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
index 0b500e08..424da798 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNamespaceDeclarationImpl.java
@@ -30,7 +30,6 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -45,7 +44,7 @@ public JSNamespaceDeclarationImpl(JSNamespaceDeclarationStub node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSNamespaceDeclaration(this);
     }
 
@@ -56,7 +55,7 @@ public JSAttributeList getAttributeList() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String newName) throws IncorrectOperationException {
+    public PsiElement setName(String newName) throws IncorrectOperationException {
         String oldName = getName();
         if (newName.equals(oldName)) {
             return this;
@@ -132,10 +131,10 @@ public boolean isDeprecated() {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         return processor.execute(lastParent, state);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
index 55243527..bab32ce8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSNewExpressionImpl.java
@@ -23,7 +23,6 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -34,7 +33,6 @@ public JSNewExpressionImpl(ASTNode node) {
         super(node);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JavaScriptType getType() {
@@ -66,7 +64,7 @@ public JSArgumentList getArgumentList() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSNewExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
index 900a5757..a884cd83 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSObjectLiteralExpressionImpl.java
@@ -24,7 +24,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -41,16 +40,16 @@ public JSProperty[] getProperties() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSObjectLiteralExpression(this);
     }
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         if (lastParent == null || !(place instanceof JSProperty)) {
             return true;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
index 6da72905..9595aac4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPackageStatementImpl.java
@@ -36,7 +36,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 import consulo.virtualFileSystem.VirtualFile;
-import jakarta.annotation.Nonnull;
 
 import java.io.IOException;
 
@@ -53,7 +52,7 @@ public JSPackageStatementImpl(JSPackageStatementStub stub) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSPackageStatement(this);
     }
 
@@ -96,7 +95,7 @@ public void setQualifiedName(String expectedPackageNameFromFile) {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         VirtualFile virtualFile = getContainingFile().getVirtualFile();
         String expectedPackageNameFromFile =
             JSResolveUtil.getExpectedPackageNameFromFile(virtualFile, getProject(), false);
@@ -122,10 +121,10 @@ public PsiElement setName(@Nonnull String name) throws IncorrectOperationExcepti
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState substitutor,
+        PsiScopeProcessor processor,
+        ResolveState substitutor,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         return !(lastParent != null && lastParent.getParent() == this)
             || JSImportHandlingUtil.tryResolveImports(processor, this, place);
@@ -139,7 +138,7 @@ public PsiElement getNameIdentifier() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addBefore(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
             PsiElement insertedElement = JSChangeUtil.doAddBefore(this, element, anchor);
             CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), insertedElement.getNode());
@@ -150,7 +149,7 @@ public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) thro
 
     @Override
     @RequiredWriteAction
-    public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addAfter(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
             PsiElement insertedElement = JSChangeUtil.doAddAfter(this, element, anchor);
             CodeStyleManager.getInstance(getProject()).reformatNewlyAddedElement(getNode(), insertedElement.getNode());
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
index 80501d68..c3e99858 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterImpl.java
@@ -32,8 +32,7 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -79,7 +78,7 @@ public boolean isOptional() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSParameter(this);
     }
 
@@ -123,10 +122,10 @@ protected String doGetType() {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         return processor.execute(this, state);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
index 3108d08b..7ec8e865 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParameterListImpl.java
@@ -23,7 +23,6 @@
 import com.intellij.lang.javascript.psi.stubs.JSParameterListStub;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -44,7 +43,7 @@ public JSParameter[] getParameters() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSParameterList(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
index 0604a6b5..4d03adf9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSParenthesizedExpressionImpl.java
@@ -20,7 +20,6 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
 import consulo.language.ast.ASTNode;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -37,7 +36,7 @@ public JSExpression getInnerExpression() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSParenthesizedExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
index faf52c14..a42bda04 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPostfixExpressionImpl.java
@@ -25,7 +25,6 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.IElementType;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -36,7 +35,6 @@ public JSPostfixExpressionImpl(ASTNode node) {
         super(node);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JavaScriptType getType() {
@@ -57,7 +55,7 @@ public IElementType getOperationSign() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSPostfixExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
index 1ad0a8ff..b1925126 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPrefixExpressionImpl.java
@@ -26,8 +26,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -59,12 +58,11 @@ public PsiElement getOperatorElement() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSPrefixExpression(this);
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public JavaScriptType getType() {
         JSExpression expression = getExpression();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
index c77acb83..27b77ada 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPropertyImpl.java
@@ -36,8 +36,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.util.lang.StringUtil;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -51,7 +50,6 @@ public JSPropertyImpl(ASTNode node) {
     }
 
     @Override
-    @Nonnull
     public PsiReference[] getReferences() {
         return LanguageCachedValueUtil.getCachedValue(this, new CachedValueProvider<PsiReference[]>() {
             @Nullable
@@ -67,7 +65,6 @@ public Result<PsiReference[]> compute() {
         });
     }
 
-    @Nonnull
     @RequiredReadAction
     private PsiReference[] buildReferences() {
         PsiElement nameIdentifier = getNameIdentifier();
@@ -90,7 +87,7 @@ public String getName() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         PsiElement nameNode = getNameIdentifier();
         assert nameNode != null;
         ASTNode nameElement = JSChangeUtil.createNameIdentifier(getProject(), name, nameNode.getNode().getElementType());
@@ -99,7 +96,6 @@ public PsiElement setName(@Nonnull String name) throws IncorrectOperationExcepti
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public JavaScriptType getType() {
         JSExpression value = getValue();
@@ -130,7 +126,7 @@ public JSComputedName getComputedName() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSProperty(this);
     }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 6227bcf3..5a410b23 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -45,8 +45,7 @@
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.xml.XmlFile;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -65,7 +64,7 @@ public class JSPsiImplUtils {
 
     @Nullable
     @RequiredReadAction
-    public static JavaScriptTypeElement findTypeElement(@Nonnull PsiElement element) {
+    public static JavaScriptTypeElement findTypeElement(PsiElement element) {
         if (element instanceof StubBasedPsiElement stubBasedPsiElement) {
             StubElement<?> stub = stubBasedPsiElement.getStub();
             if (stub != null) {
@@ -85,7 +84,7 @@ public static JavaScriptTypeElement findTypeElement(@Nonnull PsiElement element)
     @Nullable
     @RequiredReadAction
     @SuppressWarnings("unchecked")
-    private static <T> T findChildrenByClass(@Nonnull PsiElement element, Class<T> aClass) {
+    private static <T> T findChildrenByClass(PsiElement element, Class<T> aClass) {
         for (PsiElement cur = element.getFirstChild(); cur != null; cur = cur.getNextSibling()) {
             if (aClass.isInstance(cur)) {
                 return (T)cur;
@@ -188,9 +187,8 @@ public static JSPackageStatement findPackageStatement(JSFile file) {
         return packageStatement;
     }
 
-    @Nonnull
     @RequiredReadAction
-    static PsiElement findTopLevelNavigatableElement(@Nonnull JSQualifiedNamedElement jsClass) {
+    static PsiElement findTopLevelNavigatableElement(JSQualifiedNamedElement jsClass) {
         PsiElement sourceElement = findTopLevelNavigatableElementWithSource(jsClass, null);
         if (sourceElement != null) {
             return sourceElement;
@@ -201,7 +199,7 @@ static PsiElement findTopLevelNavigatableElement(@Nonnull JSQualifiedNamedElemen
     @Nullable
     @RequiredReadAction
     public static PsiElement findTopLevelNavigatableElementWithSource(
-        @Nonnull JSQualifiedNamedElement jsClass,
+        JSQualifiedNamedElement jsClass,
         @Nullable Consumer<JSQualifiedNamedElement> candidatesConsumer
     ) {
         if (candidatesConsumer != null) {
@@ -335,8 +333,8 @@ static String getQName(JSNamedElement element) {
     @Nullable
     @RequiredReadAction
     public static String getTypeFromAnnotationParameter(
-        @Nonnull JSAttributeList attributeList,
-        @Nonnull String annotationName,
+        JSAttributeList attributeList,
+        String annotationName,
         @Nullable String annotationParameter
     ) {
         String arrayType = null;
@@ -386,7 +384,7 @@ static void doRenameParentDirectoryIfNeeded(VirtualFile file, String name, Objec
 
     @Nullable
     @RequiredReadAction
-    static String getQNameForMove(@Nonnull PsiElement targetElement, PsiElement elementToBind) {
+    static String getQNameForMove(PsiElement targetElement, PsiElement elementToBind) {
         String qName = null;
         Project project = targetElement.getProject();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index aedafc52..0f135737 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -40,8 +40,7 @@
 import consulo.util.collection.ArrayUtil;
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlToken;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Set;
 
@@ -54,7 +53,6 @@ public JSReferenceExpressionImpl(ASTNode node) {
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public JavaScriptType getType() {
         PsiElement resolvedElement = resolve();
@@ -101,7 +99,6 @@ public PsiReference getReference() {
         return this;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public TextRange getRangeInElement() {
@@ -130,7 +127,6 @@ public PsiElement resolve() {
         return resolveResults.length == 0 || resolveResults.length > 1 ? null : resolveResults[0].getElement();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String getCanonicalText() {
@@ -165,7 +161,7 @@ PsiElement handleElementRenameInternal(String newElementName) throws IncorrectOp
 
     @Override
     @RequiredReadAction
-    public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public PsiElement bindToElement(PsiElement element) throws IncorrectOperationException {
         PsiElement parent = getParent();
 
         if (parent instanceof JSClass || parent instanceof JSNamespaceDeclaration || parent instanceof JSFunction) {
@@ -338,7 +334,6 @@ private static JSClass findEnclosingClass(PsiElement elt) {
         return jsClass;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public Object[] getVariants() {
@@ -389,11 +384,10 @@ public Object[] getVariants() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSReferenceExpression(this);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public ResolveResult[] multiResolve(boolean incompleteCode) {
@@ -404,10 +398,9 @@ public ResolveResult[] multiResolve(boolean incompleteCode) {
     private static class MyResolver implements ResolveCache.PolyVariantResolver<JSReferenceExpressionImpl> {
         private static final MyResolver INSTANCE = new MyResolver();
 
-        @Nonnull
         @Override
         @RequiredReadAction
-        public ResolveResult[] resolve(@Nonnull JSReferenceExpressionImpl referenceExpression, boolean incompleteCode) {
+        public ResolveResult[] resolve(JSReferenceExpressionImpl referenceExpression, boolean incompleteCode) {
             return referenceExpression.doResolve();
         }
     }
@@ -594,7 +587,7 @@ public Set<JavaScriptFeature> getFeatures() {
 
         @Override
         @RequiredReadAction
-        public void process(@Nonnull String type, @Nonnull BaseJSSymbolProcessor.EvaluateContext evaluateContext, PsiElement source) {
+        public void process(String type, BaseJSSymbolProcessor.EvaluateContext evaluateContext, PsiElement source) {
             if (evaluateContext.visitedTypes.contains(type)) {
                 return;
             }
@@ -663,7 +656,7 @@ else if (ecma()) {
 
         @Override
         @RequiredReadAction
-        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+        public boolean execute(PsiElement element, ResolveState state) {
             boolean b = super.execute(element, state);
             if (ecma() && getResult() != null) {
                 resolved = MyTypeProcessor.TypeResolveState.Resolved;
@@ -677,7 +670,7 @@ public boolean ecma() {
         }
 
         @Override
-        public void setUnknownElement(@Nonnull PsiElement element) {
+        public void setUnknownElement(PsiElement element) {
             if (!(element instanceof XmlToken)) {
                 boolean currentIsNotResolved =
                     element == BaseJSSymbolProcessor.getOriginalQualifier(((JSReferenceExpression)place).getQualifier());
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
index 75a99596..601dcd09 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceListImpl.java
@@ -27,7 +27,6 @@
 import consulo.language.psi.stub.StubIndex;
 import consulo.project.Project;
 import consulo.util.collection.ArrayUtil;
-import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,18 +44,16 @@ public JSReferenceListImpl(JSReferenceListStub stub, IStubElementType stubElemen
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSReferenceList(this);
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public JSReferenceExpression[] getExpressions() {
         return findChildrenByClass(JSReferenceExpression.class);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String[] getReferenceTexts() {
@@ -78,7 +75,6 @@ public String[] getReferenceTexts() {
         return result;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JSClass[] getReferencedClasses() {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index 79e6f10d..0ea099da 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -34,8 +34,7 @@
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.StringUtil;
 import consulo.xml.psi.xml.*;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -170,7 +169,6 @@ public PsiElement getElement() {
             return element;
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public TextRange getRangeInElement() {
@@ -185,7 +183,6 @@ public PsiElement resolve() {
             return resolveResults.length == 1 ? resolveResults[0].getElement() : null;
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public String getCanonicalText() {
@@ -204,7 +201,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
 
         @Override
         @RequiredWriteAction
-        public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+        public PsiElement bindToElement(PsiElement element) throws IncorrectOperationException {
             String qName = JSPsiImplUtils.getQNameForMove(getElement(), element);
             if (qName != null) {
                 handleContentChange(
@@ -223,7 +220,6 @@ public boolean isReferenceTo(PsiElement element) {
                 && JSResolveUtil.isReferenceTo(this, myText, element);
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public Object[] getVariants() {
@@ -307,7 +303,6 @@ public boolean isSoft() {
         }
 
         @Override
-        @Nonnull
         @RequiredReadAction
         public ResolveResult[] multiResolve(boolean incompleteCode) {
             PsiFile containingFile = element.getContainingFile();
@@ -489,9 +484,8 @@ private ResolveResult[] doOldResolve(PsiFile psiFile) {
             return processor.getResults();
         }
 
-        @Nonnull
         @Override
-        public LocalizeValue buildUnresolvedMessage(@Nonnull String text) {
+        public LocalizeValue buildUnresolvedMessage(String text) {
             text = "'" + text.replace("'", "''") + "'";
             return JavaScriptLocalize.javascriptUnresolvedVariableOrTypeNameMessage2(text);
         }
@@ -500,10 +494,9 @@ public LocalizeValue buildUnresolvedMessage(@Nonnull String text) {
     static class MyResolver implements ResolveCache.PolyVariantContextResolver<MyPsiReference> {
         private static final MyResolver INSTANCE = new MyResolver();
 
-        @Nonnull
         @Override
         @RequiredReadAction
-        public ResolveResult[] resolve(@Nonnull MyPsiReference ref, @Nonnull PsiFile containingFile, boolean incompleteCode) {
+        public ResolveResult[] resolve(MyPsiReference ref, PsiFile containingFile, boolean incompleteCode) {
             return ref.doResolve(containingFile);
         }
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
index 86b170e8..4fede073 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReturnStatementImpl.java
@@ -20,7 +20,6 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReturnStatement;
 import consulo.language.ast.ASTNode;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -37,7 +36,7 @@ public JSExpression getExpression() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSReturnStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
index 6d140991..29e054be 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
@@ -34,7 +34,6 @@
 import consulo.util.lang.ref.SimpleReference;
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
-import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -47,7 +46,7 @@
  */
 public class JSSmartCompletionVariantsHandler {
     @RequiredReadAction
-    static Object[] getSmartVariants(@Nonnull PsiElement expr, boolean ecma) {
+    static Object[] getSmartVariants(PsiElement expr, boolean ecma) {
         PsiElement parent = expr.getParent();
 
         if (parent instanceof JSArgumentList argumentList && argumentList.getArguments()[0] == expr && ecma
@@ -94,7 +93,7 @@ public boolean process(JSClass clazz) {
 
         @Override
         @RequiredReadAction
-        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+        public boolean execute(PsiElement element, ResolveState state) {
             if (element instanceof JSVariable variable) {
                 JSAttributeList attributeList = variable.getAttributeList();
 
@@ -173,7 +172,7 @@ else if (qualifier instanceof JSReferenceExpression referenceExpression) {
 
         @Override
         @RequiredReadAction
-        public boolean process(@Nonnull JSAttribute jsAttribute) {
+        public boolean process(JSAttribute jsAttribute) {
             if ("Event".equals(jsAttribute.getName())) {
                 JSAttributeNameValuePair eventName = jsAttribute.getValueByName("name");
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
index e05e49e1..07c539a1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStatementWithLabelReferenceImpl.java
@@ -29,8 +29,7 @@
 import consulo.language.ast.ASTNode;
 import consulo.util.collection.ArrayUtil;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,7 +52,6 @@ public String getLabel() {
         return label != null ? label.getText() : null;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiReference[] getReferences() {
@@ -85,7 +83,6 @@ public PsiElement getElement() {
             return JSStatementWithLabelReferenceImpl.this;
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public TextRange getRangeInElement() {
@@ -104,7 +101,7 @@ public PsiElement resolve() {
 
                 @Override
                 @RequiredReadAction
-                public boolean execute(@Nonnull JSLabeledStatement element) {
+                public boolean execute(JSLabeledStatement element) {
                     if (label.equals(element.getLabel())) {
                         result[0] = element;
                         return false;
@@ -116,7 +113,6 @@ public boolean execute(@Nonnull JSLabeledStatement element) {
             return result[0];
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public String getCanonicalText() {
@@ -132,7 +128,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
 
         @Override
         @RequiredWriteAction
-        public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+        public PsiElement bindToElement(PsiElement element) throws IncorrectOperationException {
             return null;
         }
 
@@ -142,7 +138,6 @@ public boolean isReferenceTo(PsiElement element) {
             return getManager().areElementsEquivalent(resolve(), element);
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public Object[] getVariants() {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
index e7644816..88ddf4c6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSStubElementImpl.java
@@ -33,7 +33,6 @@
 import consulo.navigation.ItemPresentation;
 import consulo.navigation.NavigationItem;
 import consulo.util.dataholder.Key;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -50,10 +49,10 @@ public JSStubElementImpl(T t, IStubElementType type) {
         super(t, type);
     }
 
-    protected abstract void accept(@Nonnull JSElementVisitor visitor);
+    protected abstract void accept(JSElementVisitor visitor);
 
     @Override
-    public final void accept(@Nonnull PsiElementVisitor visitor) {
+    public final void accept(PsiElementVisitor visitor) {
         if (visitor instanceof JSElementVisitor elementVisitor) {
             accept(elementVisitor);
         }
@@ -77,7 +76,7 @@ public ItemPresentation getPresentation() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement addBefore(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addBefore(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
             if (JSChangeUtil.isStatementContainer(this)) {
                 return JSChangeUtil.doAddBefore(this, element, anchor);
@@ -92,7 +91,7 @@ else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
 
     @Override
     @RequiredWriteAction
-    public PsiElement addAfter(@Nonnull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
+    public PsiElement addAfter(PsiElement element, PsiElement anchor) throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(element)) {
             if (JSChangeUtil.isStatementContainer(this)) {
                 return JSChangeUtil.doAddAfter(this, element, anchor);
@@ -106,7 +105,7 @@ else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
 
     @Override
     @RequiredWriteAction
-    public PsiElement addRangeBefore(@Nonnull PsiElement first, @Nonnull PsiElement last, PsiElement anchor)
+    public PsiElement addRangeBefore(PsiElement first, PsiElement last, PsiElement anchor)
         throws IncorrectOperationException {
         if (JSChangeUtil.isStatementOrComment(first)) {
             if (JSChangeUtil.isStatementContainer(this)) {
@@ -136,7 +135,7 @@ else if (JSChangeUtil.isBlockStatementContainer(this) && anchor != null) {
 
     @Override
     @RequiredWriteAction
-    public PsiElement add(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public PsiElement add(PsiElement element) throws IncorrectOperationException {
         return addAfter(element, null);
     }
 
@@ -148,7 +147,7 @@ public PsiElement addRange(PsiElement first, PsiElement last) throws IncorrectOp
 
     @Override
     @RequiredReadAction
-    public PsiElement replace(@Nonnull PsiElement newElement) throws IncorrectOperationException {
+    public PsiElement replace(PsiElement newElement) throws IncorrectOperationException {
         ASTNode myNode = getNode();
         ASTNode result = newElement.getNode().copyElement();
         myNode.getTreeParent().replaceChild(myNode, result);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
index 0c89e2d8..7bb83a3f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSuperExpressionImpl.java
@@ -31,8 +31,7 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.util.collection.ArrayUtil;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -44,7 +43,7 @@ public JSSuperExpressionImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSSuperExpression(this);
     }
 
@@ -54,7 +53,6 @@ public PsiReference getReference() {
     }
 
     @Override
-    @Nonnull
     public PsiReference[] getReferences() {
         PsiReference[] refs = {
             new PsiReference() {
@@ -64,7 +62,6 @@ public PsiElement getElement() {
                     return JSSuperExpressionImpl.this;
                 }
 
-                @Nonnull
                 @Override
                 @RequiredReadAction
                 public TextRange getRangeInElement() {
@@ -112,7 +109,6 @@ private PsiElement findClass() {
                     return null;
                 }
 
-                @Nonnull
                 @Override
                 @RequiredReadAction
                 public String getCanonicalText() {
@@ -127,7 +123,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
 
                 @Override
                 @RequiredWriteAction
-                public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+                public PsiElement bindToElement(PsiElement element) throws IncorrectOperationException {
                     return null;
                 }
 
@@ -137,7 +133,6 @@ public boolean isReferenceTo(PsiElement element) {
                     return false;
                 }
 
-                @Nonnull
                 @Override
                 @RequiredReadAction
                 public Object[] getVariants() {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
index d8dcd6ef..0e24b6a7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSwitchStatementImpl.java
@@ -23,7 +23,6 @@
 import com.intellij.lang.javascript.psi.JSSwitchStatement;
 import consulo.language.ast.ASTNode;
 import consulo.language.ast.TokenSet;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -47,7 +46,7 @@ public JSCaseClause[] getCaseClauses() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSSwitchStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
index 66777356..69e60861 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThisExpressionImpl.java
@@ -20,7 +20,6 @@
 import com.intellij.lang.javascript.psi.JSThisExpression;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -32,7 +31,7 @@ public JSThisExpressionImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSThisExpression(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
index 3aaf49f5..b68d308c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSThrowStatementImpl.java
@@ -20,7 +20,6 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSThrowStatement;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -37,7 +36,7 @@ public JSExpression getExpression() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSThrowStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
index 8e6da9f5..b7ba4372 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSTryStatementImpl.java
@@ -27,8 +27,7 @@
 import consulo.language.ast.IElementType;
 import consulo.language.ast.TokenSet;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -69,7 +68,6 @@ public JSCatchBlock getCatchBlock() {
         return (JSCatchBlock)catchChild.getPsi();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JSCatchBlock[] getAllCatchBlocks() {
@@ -95,7 +93,7 @@ public JSStatement getFinallyStatement() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSTryStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
index 7cf92043..a0eb51bd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSUseNamespaceDirectiveImpl.java
@@ -27,7 +27,6 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -42,7 +41,7 @@ public JSUseNamespaceDirectiveImpl(JSUseNamespaceDirectiveStub stub) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSUseNamespaceDirective(this);
     }
 
@@ -59,10 +58,10 @@ public String getNamespaceToBeUsed() {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         return !(processor instanceof ResolveProcessor resolveProcessor && resolveProcessor.lookingForUseNamespaces())
             || processor.execute(this, state);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
index 8d313d9e..39239c23 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVarStatementImpl.java
@@ -25,8 +25,7 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.annotation.access.RequiredReadAction;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -64,17 +63,17 @@ public void declareVariable(String name, JSExpression initializer) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSVarStatement(this);
     }
 
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         JSVariable[] vars = getVariables();
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
index 4779bf23..7d3c0733 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableBaseImpl.java
@@ -36,7 +36,6 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
-import jakarta.annotation.Nonnull;
 
 import java.util.function.Supplier;
 
@@ -88,7 +87,6 @@ public String getInitializerText() {
         return expression != null ? expression.getText() : null;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public SearchScope getUseScope() {
@@ -123,7 +121,6 @@ public void setInitializer(JSExpression expr) throws IncorrectOperationException
         throw new UnsupportedOperationException("TODO: implement");
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JavaScriptType getType() {
@@ -169,7 +166,7 @@ protected String doGetType() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         PsiElement nameNode = getNameIdentifier();
         if (nameNode == null) {
             return this;
@@ -180,7 +177,7 @@ public PsiElement setName(@Nonnull String name) throws IncorrectOperationExcepti
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSVariable(this);
     }
 
@@ -261,10 +258,10 @@ public void delete() throws IncorrectOperationException {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         if (lastParent != null && lastParent.getParent() == this) {
             processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
index 3b0ade94..70c95874 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSVariableImpl.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.ast.ASTNode;
 import consulo.language.util.IncorrectOperationException;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -41,7 +40,6 @@ public JSVariableImpl(JSVariableStub stub) {
         super(stub, JSElementTypes.VARIABLE);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public PsiElement getNavigationElement() {
@@ -58,7 +56,7 @@ public PsiElement getNavigationElement() {
 
     @Override
     @RequiredWriteAction
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         String oldName = getName();
         PsiElement element = super.setName(name);
         if (getParent().getParent() instanceof JSPackageStatement) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
index a6fc239f..dd600eb7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWhileStatementImpl.java
@@ -23,7 +23,6 @@
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSWhileStatement;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -46,7 +45,7 @@ public JSStatement getBody() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSWhileStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
index 890faccd..d11a0102 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSWithStatementImpl.java
@@ -21,7 +21,6 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSStatement;
 import com.intellij.lang.javascript.psi.JSWithStatement;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -43,7 +42,7 @@ public JSStatement getStatement() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSWithStatement(this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index d6b1df99..84c85019 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -32,8 +32,7 @@
 import consulo.language.psi.resolve.PsiElementProcessor;
 import consulo.language.util.IncorrectOperationException;
 import consulo.xml.psi.xml.*;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -49,14 +48,12 @@ protected LightXmlValue(PsiManager manager, Language language) {
             super(manager, language);
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public TextRange getTextRange() {
             return TextRange.EMPTY_RANGE;
         }
 
-        @Nonnull
         @Override
         @RequiredReadAction
         public XmlTagChild[] getChildren() {
@@ -73,13 +70,11 @@ public int getTextOffset() {
             return 0;
         }
 
-        @Nonnull
         @Override
         public XmlText[] getTextElements() {
             return new XmlText[0];
         }
 
-        @Nonnull
         @Override
         public String getTrimmedText() {
             return "";
@@ -105,14 +100,12 @@ public JSXmlLiteralExpressionImpl(ASTNode node) {
         super(node);
     }
 
-    @Nonnull
     @Override
     public PsiReference[] getReferences() {
         return ReferenceProvidersRegistry.getReferencesFromProviders(this);
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public PsiElement[] getChildren() {
         PsiElement psiChild = getFirstChild();
@@ -130,11 +123,10 @@ public PsiElement[] getChildren() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String getName() {
@@ -144,17 +136,15 @@ public String getName() {
 
     @RequiredWriteAction
     @Override
-    public PsiElement setName(@Nonnull String s) throws IncorrectOperationException {
+    public PsiElement setName(String s) throws IncorrectOperationException {
         return null;
     }
 
-    @Nonnull
     @Override
     public String getNamespace() {
         return "";
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String getLocalName() {
@@ -167,7 +157,6 @@ public XmlElementDescriptor getDescriptor() {
         return null;
     }
 
-    @Nonnull
     @Override
     public XmlAttribute[] getAttributes() {
         return new XmlAttribute[0];
@@ -218,19 +207,16 @@ public XmlTag addSubTag(XmlTag subTag, boolean first) {
         return null;
     }
 
-    @Nonnull
     @Override
     public XmlTag[] getSubTags() {
         return new XmlTag[0];
     }
 
-    @Nonnull
     @Override
     public XmlTag[] findSubTags(String qname) {
         return new XmlTag[0];
     }
 
-    @Nonnull
     @Override
     public XmlTag[] findSubTags(String localName, @Nullable String namespace) {
         return new XmlTag[0];
@@ -242,13 +228,11 @@ public XmlTag findFirstSubTag(String qname) {
         return null;
     }
 
-    @Nonnull
     @Override
     public String getNamespacePrefix() {
         return "";
     }
 
-    @Nonnull
     @Override
     public String getNamespaceByPrefix(String prefix) {
         return "";
@@ -270,7 +254,6 @@ public boolean hasNamespaceDeclarations() {
         return false;
     }
 
-    @Nonnull
     @Override
     public Map<String, String> getLocalNamespaceDeclarations() {
         return Collections.emptyMap();
@@ -282,7 +265,6 @@ public int getTextOffset() {
         return 0;
     }
 
-    @Nonnull
     @Override
     public XmlTagValue getValue() {
         return new LightXmlValue(getManager(), getLanguage());
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
index 97410bc5..484fc4bc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSYieldStatementImpl.java
@@ -21,7 +21,6 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSYieldStatement;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author maxim
@@ -37,7 +36,7 @@ public JSExpression getExpression() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSYieldStatement(this);
     }
 }
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java
index 52cb8d41..51f0ce4f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JavaScriptSimpleType.java
@@ -19,8 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -30,13 +29,12 @@ public class JavaScriptSimpleType implements JavaScriptType {
     private String myReferenceName;
     private PsiElement myElement;
 
-    public JavaScriptSimpleType(@Nonnull String referenceName, @Nullable PsiElement element) {
+    public JavaScriptSimpleType(String referenceName, @Nullable PsiElement element) {
         myReferenceName = referenceName;
         myElement = element;
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public String getPresentableText() {
         return myReferenceName;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
index 4f967f5f..b5a8cb78 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/reference/JSPropertyNameReference.java
@@ -31,8 +31,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.util.lang.StringUtil;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class JSPropertyNameReference implements PsiReference {
     private final JSProperty myProperty;
@@ -67,7 +66,6 @@ public PsiElement resolve() {
         return myProperty;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String getCanonicalText() {
@@ -81,7 +79,7 @@ public PsiElement handleElementRename(String newElementName) throws IncorrectOpe
     }
 
     @Override
-    public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public PsiElement bindToElement(PsiElement element) throws IncorrectOperationException {
         return null;
     }
 
@@ -102,7 +100,6 @@ public boolean isReferenceTo(PsiElement element) {
         return proxyExpanded && element == element2;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public Object[] getVariants() {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index 6db49aa8..9152d471 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -44,7 +44,6 @@
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlToken;
-import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -917,7 +916,7 @@ protected void doIterateHierarchy(String typeName, final HierarchyProcessor proc
 
                         @Override
                         @RequiredReadAction
-                        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                        public boolean execute(PsiElement element, ResolveState state) {
                             return !(element instanceof JSClass jsClass && !processor.processClass(jsClass));
                         }
                     },
@@ -964,14 +963,14 @@ public void setSource(PsiElement source) {
     }
 
     public interface TypeProcessor {
-        void process(@Nonnull String type, @Nonnull EvaluateContext evaluateContext, PsiElement source);
+        void process(String type, EvaluateContext evaluateContext, PsiElement source);
 
         @Deprecated
         boolean ecma();
 
         Set<JavaScriptFeature> getFeatures();
 
-        void setUnknownElement(@Nonnull PsiElement element);
+        void setUnknownElement(PsiElement element);
     }
 
     public interface GenericTypeParametersClient {
@@ -989,7 +988,7 @@ public SimpleTypeProcessor(Set<JavaScriptFeature> features) {
         }
 
         @Override
-        public void process(@Nonnull String _type, @Nonnull EvaluateContext evaluateContext, PsiElement _source) {
+        public void process(String _type, EvaluateContext evaluateContext, PsiElement _source) {
             setType(type != null && !type.equals(_type) ? ANY_TYPE : _type, _source);
         }
 
@@ -1010,13 +1009,13 @@ public boolean ecma() {
 
         @Override
         @RequiredReadAction
-        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+        public boolean execute(PsiElement element, ResolveState state) {
             result = element;
             return true;
         }
 
         @Override
-        public void setUnknownElement(@Nonnull PsiElement _element) {
+        public void setUnknownElement(PsiElement _element) {
             setType(ANY_TYPE, _element);
         }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index 1545185c..e0d8e2cc 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -44,8 +44,7 @@
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -77,7 +76,7 @@ protected CachedValue<Map<String, JSImportedElementResolveResult>> compute(PsiEl
             }
         };
 
-    public static String resolveTypeName(String _str, @Nonnull PsiElement context) {
+    public static String resolveTypeName(String _str, PsiElement context) {
         JSImportedElementResolveResult resolveResult = _resolveTypeName(_str, context);
         if (resolveResult == null) {
             return _str;
@@ -86,7 +85,7 @@ public static String resolveTypeName(String _str, @Nonnull PsiElement context) {
     }
 
     // TODO _str should be JSReferenceExpression for caching!
-    private static JSImportedElementResolveResult _resolveTypeName(String _name, @Nonnull PsiElement context) {
+    private static JSImportedElementResolveResult _resolveTypeName(String _name, PsiElement context) {
         String name = _name;
         if (name == null) {
             return null;
@@ -210,7 +209,7 @@ private static JSQualifiedNamedElement resolveTypeNameInTheSamePackage(String st
 
     public static
     @Nullable
-    JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull JSReferenceExpression expr) {
+    JSImportedElementResolveResult resolveTypeNameUsingImports(JSReferenceExpression expr) {
         if (expr.getQualifier() != null) {
             return null;
         }
@@ -227,7 +226,7 @@ JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull JSReferenceE
 
     private static
     @Nullable
-    JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull String referencedName, PsiNamedElement parent) {
+    JSImportedElementResolveResult resolveTypeNameUsingImports(String referencedName, PsiNamedElement parent) {
         LanguageVersion languageVersion = parent.getLanguageVersion();
         if (languageVersion instanceof JavaScriptVersionWithHelper javaScriptVersionWithHelper) {
             ResolveHelper helper = javaScriptVersionWithHelper.getHelper();
@@ -346,7 +345,7 @@ private static JSImportedElementResolveResult checkTheSamePackageOrGlobal(String
         return null;
     }
 
-    public static boolean tryResolveImports(PsiScopeProcessor processor, PsiNamedElement parent, @Nonnull PsiElement place) {
+    public static boolean tryResolveImports(PsiScopeProcessor processor, PsiNamedElement parent, PsiElement place) {
         return !isAdequatePlaceForImport(parent, place) || !importClass(processor, parent);
     }
 
@@ -413,7 +412,7 @@ public static void importClassViaHelper(
         }
     }
 
-    public static boolean isAdequatePlaceForImport(PsiNamedElement parent, @Nonnull PsiElement place) {
+    public static boolean isAdequatePlaceForImport(PsiNamedElement parent, PsiElement place) {
         if (parent instanceof JSFile && !parent.getLanguage().isKindOf(JavaScriptSupportLoader.ECMA_SCRIPT_L4)) {
             return false;
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index d1a8124a..a4062d8e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -82,8 +82,7 @@
 import consulo.virtualFileSystem.util.VirtualFileUtil;
 import consulo.xml.ide.highlighter.XmlFileType;
 import consulo.xml.psi.xml.*;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.*;
 
@@ -101,7 +100,7 @@ public class JSResolveUtil {
 
     public static final String COMMENT_DELIMITERS = "|/";
 
-    public static void processInjectedFileForTag(@Nonnull XmlTag tag, @Nonnull JSInjectedFilesVisitor visitor) {
+    public static void processInjectedFileForTag(XmlTag tag, JSInjectedFilesVisitor visitor) {
         InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(tag.getProject());
 
         for (XmlTagChild child : tag.getValue().getChildren()) {
@@ -357,7 +356,7 @@ public static boolean isAssignableType(String expectedType, String type, PsiElem
 
                 @Override
                 @RequiredReadAction
-                public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                public boolean execute(PsiElement element, ResolveState state) {
                     if (!(element instanceof JSClass jsClass)) {
                         return true;
                     }
@@ -418,7 +417,7 @@ public static PsiElement getTopReferenceParent(PsiElement parent) {
         return currentParent;
     }
 
-    public static PsiElement getTopReferenceExpression(@Nonnull PsiElement parent) {
+    public static PsiElement getTopReferenceExpression(PsiElement parent) {
         PsiElement element = parent;
 
         for (PsiElement currentParent = parent.getParent(); currentParent instanceof JSReferenceExpression;
@@ -563,7 +562,7 @@ public static String getTypeFromSetAccessor(JSNamedElement jsNamedElement) {
         return jsParameters[0].getTypeString();
     }
 
-    public static boolean shouldProcessTopLevelGlobalContext(@Nonnull PsiElement place, @Nonnull PsiScopeProcessor processor) {
+    public static boolean shouldProcessTopLevelGlobalContext(PsiElement place, PsiScopeProcessor processor) {
         PsiElement placeParent = null;
 
         return shouldProcessImports(place, processor) && (
@@ -573,7 +572,7 @@ public static boolean shouldProcessTopLevelGlobalContext(@Nonnull PsiElement pla
                 || placeParent instanceof JSNewExpression);
     }
 
-    public static boolean shouldProcessImports(@Nonnull PsiElement place, @Nonnull PsiScopeProcessor processor) {
+    public static boolean shouldProcessImports(PsiElement place, PsiScopeProcessor processor) {
         if (!(processor instanceof ResolveProcessor resolveProcessor && !resolveProcessor.isLocalResolve())) {
             return false;
         }
@@ -642,7 +641,7 @@ public static boolean processTopLevelClasses(
         return result;
     }
 
-    static boolean walkOverStructure(@Nonnull PsiElement context, Processor<PsiNamedElement> processor) {
+    static boolean walkOverStructure(PsiElement context, Processor<PsiNamedElement> processor) {
         PsiNamedElement parent = PsiTreeUtil.getNonStrictParentOfType(context, JSQualifiedNamedElement.class, PsiFile.class);
 
         if (parent instanceof JSClass jsClass) {
@@ -711,7 +710,7 @@ public boolean process(PsiNamedElement psiNamedElement) {
 
                                 @Override
                                 @RequiredReadAction
-                                public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                                public boolean execute(PsiElement element, ResolveState state) {
                                     if (!(element instanceof JSUseNamespaceDirective)) {
                                         return true;
                                     }
@@ -766,7 +765,7 @@ public static boolean processGlobalThings(PsiScopeProcessor processor, ResolveSt
 
     @Nullable
     @RequiredReadAction
-    public static JSParameter findParameterForUsedArgument(@Nonnull JSExpression mainOccurence, @Nonnull JSArgumentList parent) {
+    public static JSParameter findParameterForUsedArgument(JSExpression mainOccurence, JSArgumentList parent) {
         int paramIndex = 0;
 
         for (JSExpression expr : parent.getArguments()) {
@@ -798,7 +797,7 @@ public static abstract class JSInjectedFilesVisitor
         implements PsiLanguageInjectionHost.InjectedPsiVisitor, XmlBackedJSClassImpl.InjectedFileVisitor {
         @Override
         @RequiredReadAction
-        public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places) {
+        public void visit(PsiFile injectedPsi, List<PsiLanguageInjectionHost.Shred> places) {
             if (injectedPsi instanceof JSFile jsFile) {
                 process(jsFile);
             }
@@ -1017,7 +1016,7 @@ private static PsiElement[] getChildren(PsiElement element) {
 
     @Nullable
     @RequiredReadAction
-    private static PsiElement processFunctionDeclarations(@Nonnull PsiScopeProcessor processor, @Nullable PsiElement context) {
+    private static PsiElement processFunctionDeclarations(PsiScopeProcessor processor, @Nullable PsiElement context) {
         if (!(context instanceof JSElement)) {
             return null;
         }
@@ -1084,7 +1083,7 @@ public static JSClass findDeclaringClass(JSFunction method) {
      */
     private static boolean visitAllImplementedInterfaces(
         JSClass clazz,
-        @Nonnull Collection<JSClass> visited,
+        Collection<JSClass> visited,
         Processor<JSClass> processor
     ) {
         if (visited.contains(clazz)) {
@@ -1401,13 +1400,13 @@ public static boolean isExprInTypeContext(JSReferenceExpression expr) {
 
     @Nullable
     @RequiredReadAction
-    public static PsiElement findClassByQName(String link, @Nonnull PsiElement context) {
+    public static PsiElement findClassByQName(String link, PsiElement context) {
         return findClassByQName(link, context.getProject(), context.getResolveScope());
     }
 
     @Nullable
     @RequiredReadAction
-    public static PsiElement findClassByQName(String link, @Nonnull GlobalSearchScope scope, @Nonnull Project project) {
+    public static PsiElement findClassByQName(String link, GlobalSearchScope scope, Project project) {
         return findClassByQName(link, project, scope);
     }
 
@@ -1541,7 +1540,7 @@ public static boolean processOverrides(
 
             @Override
             @RequiredReadAction
-            public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+            public boolean execute(PsiElement element, ResolveState state) {
                 if (!(element instanceof JSFunction)) {
                     return true;
                 }
@@ -2353,7 +2352,7 @@ public interface OverrideHandler {
 
     public interface MetaDataProcessor {
         @RequiredReadAction
-        boolean process(@Nonnull JSAttribute jsAttribute);
+        boolean process(JSAttribute jsAttribute);
 
         boolean handleOtherElement(PsiElement el, PsiElement context, @Nullable SimpleReference<PsiElement> continuePassElement);
     }
@@ -2373,11 +2372,11 @@ public CollectMethodsToImplementProcessor(String name, PsiElement context) {
 
         @Override
         @RequiredReadAction
-        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+        public boolean execute(PsiElement element, ResolveState state) {
             ResolveProcessor processor = new ResolveProcessor(myName, place) {
                 @Override
                 @RequiredReadAction
-                public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                public boolean execute(PsiElement element, ResolveState state) {
                     if (element instanceof JSFunction function) {
                         if (OBJECT_CLASS_NAME.equals(((JSClass)findParent(function)).getQualifiedName()) || function.isConstructor()) {
                             return true;
@@ -2507,7 +2506,7 @@ public String getText() {
         }
 
         @Override
-        public void accept(@Nonnull PsiElementVisitor visitor) {
+        public void accept(PsiElementVisitor visitor) {
             if (visitor instanceof JSElementVisitor elementVisitor) {
                 elementVisitor.visitJSVariable(this);
             }
@@ -2531,7 +2530,6 @@ public boolean isPhysical() {
             return false;
         }
 
-        @Nonnull
         @Override
         public ASTNode getNode() {
             return null;
@@ -2558,7 +2556,6 @@ public String getInitializerText() {
         public void setInitializer(JSExpression expr) throws IncorrectOperationException {
         }
 
-        @Nonnull
         @Override
         public JavaScriptType getType() {
             return JavaScriptType.UNKNOWN;
@@ -2604,7 +2601,7 @@ public String getName() {
 
         @Override
         @RequiredWriteAction
-        public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+        public PsiElement setName(String name) throws IncorrectOperationException {
             throw new IncorrectOperationException();
         }
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 1c1016fc..4a244501 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -38,8 +38,7 @@
 import consulo.util.dataholder.UserDataHolderBase;
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTag;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.*;
 
@@ -184,7 +183,7 @@ public Collection<PsiElement> getResults() {
 
     @Override
     @RequiredReadAction
-    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+    public boolean execute(PsiElement element, ResolveState state) {
         if ((element instanceof JSVariable && !(element instanceof JSParameter)) || element instanceof JSFunction) {
             JSAttributeList attributeList = ((JSAttributeListOwner) element).getAttributeList();
 
@@ -368,7 +367,7 @@ private JavaScriptImportStatementBase checkQualifiedNameHasNecessaryImport(
                     ResolveProcessor processor = new ResolveProcessor(myName) {
                         @Override
                         @RequiredReadAction
-                        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                        public boolean execute(PsiElement element, ResolveState state) {
                             if (element instanceof JSQualifiedNamedElement qualifiedNamedElement) {
                                 if (!qName.equals(qualifiedNamedElement.getQualifiedName())) {
                                     return true;
@@ -423,7 +422,7 @@ public static String getName(PsiElement element) {
     }
 
     @Override
-    public <T> T getHint(@Nonnull Key<T> hintClass) {
+    public <T> T getHint(Key<T> hintClass) {
         return null;
     }
 
@@ -483,7 +482,7 @@ public void handleEvent(Event event, Object associated) {
 
                                         @Override
                                         @RequiredReadAction
-                                        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                                        public boolean execute(PsiElement element, ResolveState state) {
                                             if (!(element instanceof JSClass jsClass)) {
                                                 return true;
                                             }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
index 5a21d1ca..8058710c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/VariantsProcessor.java
@@ -29,7 +29,6 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.collection.ArrayUtil;
-import jakarta.annotation.Nonnull;
 
 import java.util.*;
 
@@ -212,7 +211,7 @@ class CompletionTypeProcessor implements TypeProcessor {
 
         @Override
         @RequiredReadAction
-        public void process(@Nonnull String type, EvaluateContext context, PsiElement source) {
+        public void process(String type, EvaluateContext context, PsiElement source) {
             if (context.visitedTypes.contains(type)) {
                 return;
             }
@@ -236,7 +235,7 @@ public boolean ecma() {
         }
 
         @Override
-        public void setUnknownElement(@Nonnull PsiElement element) {
+        public void setUnknownElement(PsiElement element) {
             myUnknownElement = element;
         }
 
@@ -283,7 +282,7 @@ public Object[] getResult() {
 
     @Override
     @RequiredReadAction
-    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+    public boolean execute(PsiElement element, ResolveState state) {
         if (element instanceof JSNamedElement namedElement) {
             addCompleteMatch(namedElement, namedElement.getName());
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
index 13e6e3f8..9090b844 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
@@ -31,7 +31,6 @@
 import consulo.util.collection.ArrayUtil;
 import consulo.xml.psi.xml.XmlAttributeValue;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -147,7 +146,7 @@ public Set<JavaScriptFeature> getFeatures() {
                         }
 
                         @Override
-                        public void process(@Nonnull String type, @Nonnull EvaluateContext context, PsiElement source) {
+                        public void process(String type, EvaluateContext context, PsiElement source) {
                             if (context.visitedTypes.contains(type)) {
                                 return;
                             }
@@ -169,7 +168,7 @@ public void process(@Nonnull String type, @Nonnull EvaluateContext context, PsiE
                         }
 
                         @Override
-                        public void setUnknownElement(@Nonnull PsiElement element) {
+                        public void setUnknownElement(PsiElement element) {
                         }
 
                         @Override
@@ -349,7 +348,7 @@ public int getCompleteResultCount() {
 
     @Override
     @RequiredReadAction
-    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+    public boolean execute(PsiElement element, ResolveState state) {
         if ((element instanceof JSNamedElement namedElement && myReferenceName.equals(namedElement.getName())) || element == myContext) {
             addCompleteResult(element);
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
index 81704a96..40df5ffb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSLookupUtil.java
@@ -28,8 +28,7 @@
 import consulo.language.icon.IconDescriptorUpdaters;
 import consulo.javascript.language.psi.JavaScriptType;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class JSLookupUtil {
     public static enum LookupPriority {
@@ -41,7 +40,7 @@ public static enum LookupPriority {
 
     @Nullable
     @RequiredReadAction
-    public static LookupElement createLookupItem(@Nonnull PsiElement value, @Nonnull String name, @Nonnull LookupPriority priority) {
+    public static LookupElement createLookupItem(PsiElement value, String name, LookupPriority priority) {
         LookupElementBuilder builder = LookupElementBuilder.create(name);
         builder = builder.withIcon(IconDescriptorUpdaters.getIcon(value, Iconable.ICON_FLAG_VISIBILITY));
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
index f755a218..14ad0e02 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/search/JSClassSearch.java
@@ -29,7 +29,6 @@
 import consulo.language.psi.stub.StubIndex;
 import consulo.language.psi.stub.StubIndexKey;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -95,7 +94,7 @@ protected JSClass[] getSupers(JSClass candidate) {
 
             @Override
             @RequiredReadAction
-            public boolean execute(@Nonnull SearchParameters queryParameters, @Nonnull Predicate<? super JSClass> consumer) {
+            public boolean execute(SearchParameters queryParameters, Predicate<? super JSClass> consumer) {
                 Set<JSClass> visited = new HashSet<>();         // no abstract classes in ActionScript !
 
                 if (queryParameters.isCheckDeepInheritance()) {
@@ -175,7 +174,7 @@ protected Collection<JSClass> getInheritors(
 
     @Override
     @RequiredReadAction
-    public boolean execute(@Nonnull SearchParameters queryParameters, @Nonnull Predicate<? super JSClass> consumer) {
+    public boolean execute(SearchParameters queryParameters, Predicate<? super JSClass> consumer) {
         return processDirectInheritors(
             queryParameters.getTargetClass(),
             consumer,
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
index ef2e5db0..73982bc8 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeElementType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
@@ -44,31 +43,29 @@ public JSAttributeElementType() {
         super("ATTRIBUTE");
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSAttributeImpl(astNode);
     }
 
     @Override
-    public JSAttribute createPsi(@Nonnull JSAttributeStub stub) {
+    public JSAttribute createPsi(JSAttributeStub stub) {
         return new JSAttributeImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSAttributeStub createStub(@Nonnull JSAttribute psi, StubElement parentStub) {
+    public JSAttributeStub createStub(JSAttribute psi, StubElement parentStub) {
         return new JSAttributeStubImpl(psi.getName(), 0, parentStub);
     }
 
     @Override
-    public void serialize(@Nonnull JSAttributeStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSAttributeStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
     }
 
-    @Nonnull
     @Override
-    public JSAttributeStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSAttributeStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
         return new JSAttributeStubImpl(StringRef.toString(name), 0, parentStub);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
index 211e5976..c498b90d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeListElementType.java
@@ -30,7 +30,6 @@
 import consulo.language.psi.stub.StubInputStream;
 import consulo.language.psi.stub.StubOutputStream;
 
-import jakarta.annotation.Nonnull;
 
 import java.io.IOException;
 
@@ -44,34 +43,32 @@ public JSAttributeListElementType() {
         super("ATTRIBUTE_LIST");
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSAttributeListImpl(astNode);
     }
 
     @Override
-    public JSAttributeList createPsi(@Nonnull JSAttributeListStub stub) {
+    public JSAttributeList createPsi(JSAttributeListStub stub) {
         return new JSAttributeListImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSAttributeListStub createStub(@Nonnull JSAttributeList psi, StubElement parentStub) {
+    public JSAttributeListStub createStub(JSAttributeList psi, StubElement parentStub) {
         String namespace = psi.getNamespace();
         int flags = JSAttributeListStubImpl.getFlags(psi);
         return new JSAttributeListStubImpl(namespace, flags, parentStub, this);
     }
 
     @Override
-    public void serialize(@Nonnull JSAttributeListStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSAttributeListStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getNamespace());
         dataStream.writeInt(stub.getFlags());
     }
 
-    @Nonnull
     @Override
-    public JSAttributeListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSAttributeListStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef namespaceRef = dataStream.readName();
         int i = dataStream.readInt();
         return new JSAttributeListStubImpl(StringRef.toString(namespaceRef), i, parentStub, this);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
index 8a7e8da8..a57eedc2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSAttributeNameValuePairType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
@@ -44,34 +43,32 @@ public JSAttributeNameValuePairType() {
         super("ATTRIBUTE_NAME_VALUE_PAIR");
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSAttributeNameValuePairImpl(astNode);
     }
 
     @Override
-    public JSAttributeNameValuePair createPsi(@Nonnull JSAttributeNameValuePairStub stub) {
+    public JSAttributeNameValuePair createPsi(JSAttributeNameValuePairStub stub) {
         return new JSAttributeNameValuePairImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSAttributeNameValuePairStub createStub(@Nonnull JSAttributeNameValuePair psi, StubElement parentStub) {
+    public JSAttributeNameValuePairStub createStub(JSAttributeNameValuePair psi, StubElement parentStub) {
         String name = psi.getName();
         String simpleValue = psi.getSimpleValue();
         return new JSAttributeNameValuePairStubImpl(name, simpleValue, parentStub);
     }
 
     @Override
-    public void serialize(@Nonnull JSAttributeNameValuePairStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSAttributeNameValuePairStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
         dataStream.writeName(stub.getValue());
     }
 
-    @Nonnull
     @Override
-    public JSAttributeNameValuePairStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSAttributeNameValuePairStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
         StringRef value = dataStream.readName();
         return new JSAttributeNameValuePairStubImpl(StringRef.toString(name), StringRef.toString(value), parentStub);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
index d67a589b..cd8b96e7 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSClassElementType.java
@@ -32,7 +32,6 @@
 import consulo.language.psi.stub.StubInputStream;
 import consulo.language.psi.stub.StubOutputStream;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 
 import java.io.IOException;
 
@@ -46,7 +45,7 @@ public JSClassElementType() {
     }
 
     @Override
-    public void indexStub(@Nonnull JSClassStub stub, @Nonnull IndexSink sink) {
+    public void indexStub(JSClassStub stub, IndexSink sink) {
         super.indexStub(stub, sink);
 
         String name = stub.getName();
@@ -55,20 +54,19 @@ public void indexStub(@Nonnull JSClassStub stub, @Nonnull IndexSink sink) {
         }
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSClassImpl(astNode);
     }
 
     @Override
-    public JSClass createPsi(@Nonnull JSClassStub stub) {
+    public JSClass createPsi(JSClassStub stub) {
         return new JSClassImpl(stub, this);
     }
 
     @RequiredReadAction
     @Override
-    public JSClassStub createStub(@Nonnull JSClass psi, StubElement parentStub) {
+    public JSClassStub createStub(JSClass psi, StubElement parentStub) {
         String name = psi.getName();
         int flags = JSClassStubImpl.getFlags(psi);
         String qualifiedName = psi.getQualifiedName();
@@ -76,15 +74,14 @@ public JSClassStub createStub(@Nonnull JSClass psi, StubElement parentStub) {
     }
 
     @Override
-    public void serialize(@Nonnull JSClassStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSClassStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
         dataStream.writeName(stub.getQualifiedName());
         dataStream.writeInt(stub.getFlags());
     }
 
-    @Nonnull
     @Override
-    public JSClassStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSClassStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef nameRef = dataStream.readName();
         StringRef qualifiedRef = dataStream.readName();
         int flags = dataStream.readInt();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
index ab2a97e2..8df2cd86 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFileElementType.java
@@ -26,7 +26,6 @@
 import consulo.language.Language;
 import consulo.language.psi.PsiFile;
 
-import jakarta.annotation.Nonnull;
 
 import java.io.IOException;
 
@@ -39,17 +38,16 @@ public JSFileElementType(Language language) {
     }
 
     @Override
-    public void indexStub(@Nonnull JSFileStub stub, @Nonnull IndexSink sink) {
+    public void indexStub(JSFileStub stub, IndexSink sink) {
         JavaScriptIndexer.EP_NAME.forEachExtensionSafe(it -> it.indexFile(stub, sink));
     }
 
     @Override
     public StubBuilder getBuilder() {
         return new DefaultStubBuilder() {
-            @Nonnull
             @Override
             @RequiredReadAction
-            protected StubElement createStubForFile(@Nonnull PsiFile file) {
+            protected StubElement createStubForFile(PsiFile file) {
                 return file instanceof JSFile jsFile
                     ? new JSFileStubImpl(jsFile, file.getName())
                     : super.createStubForFile(file);
@@ -58,18 +56,16 @@ protected StubElement createStubForFile(@Nonnull PsiFile file) {
     }
 
     @Override
-    public void serialize(@Nonnull JSFileStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSFileStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
     }
 
-    @Nonnull
     @Override
-    public JSFileStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSFileStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
         return new JSFileStubImpl(null, name);
     }
 
-    @Nonnull
     @Override
     public String getExternalId() {
         return getLanguage() + ":" + toString();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
index 71997c1c..f0be1148 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSFunctionElementType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSFunction;
@@ -38,7 +37,7 @@
  * Time: 10:50:34 PM
  */
 public abstract class JSFunctionElementType extends JSQualifiedStubElementType<JSFunctionStub, JSFunction> {
-    public JSFunctionElementType(@Nonnull String name) {
+    public JSFunctionElementType(String name) {
         super(name);
     }
 
@@ -56,7 +55,7 @@ protected boolean doIndexQualifiedName(JSFunctionStub stub, String name, String
 
     @RequiredReadAction
     @Override
-    public JSFunctionStub createStub(@Nonnull JSFunction psi, StubElement parentStub) {
+    public JSFunctionStub createStub(JSFunction psi, StubElement parentStub) {
         String name = psi.getName();
         String qualifiedName = psi.getQualifiedName();
         String returnTypeString = psi.getReturnTypeString();
@@ -65,16 +64,15 @@ public JSFunctionStub createStub(@Nonnull JSFunction psi, StubElement parentStub
     }
 
     @Override
-    public void serialize(@Nonnull JSFunctionStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSFunctionStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
         dataStream.writeName(stub.getQualifiedName());
         dataStream.writeName(stub.getReturnTypeString());
         dataStream.writeVarInt(stub.getFlags());
     }
 
-    @Nonnull
     @Override
-    public JSFunctionStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSFunctionStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef nameRef = dataStream.readName();
         StringRef qualifiedRef = dataStream.readName();
         StringRef returnTypeRef = dataStream.readName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
index 4b1e5ab8..9b90c5bb 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSImportStatementElementType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSImportStatement;
@@ -44,32 +43,30 @@ public JSImportStatementElementType() {
         super("IMPORT_STATEMENT");
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSImportStatementImpl(astNode);
     }
 
     @Override
-    public JSImportStatement createPsi(@Nonnull JSImportStatementStub stub) {
+    public JSImportStatement createPsi(JSImportStatementStub stub) {
         return new JSImportStatementImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSImportStatementStub createStub(@Nonnull JSImportStatement psi, StubElement parentStub) {
+    public JSImportStatementStub createStub(JSImportStatement psi, StubElement parentStub) {
         String importText = psi.getImportText();
         return new JSImportStatementStubImpl(importText, parentStub, this);
     }
 
     @Override
-    public void serialize(@Nonnull JSImportStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSImportStatementStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getImportText());
     }
 
-    @Nonnull
     @Override
-    public JSImportStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSImportStatementStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef importText = dataStream.readName();
         return new JSImportStatementStubImpl(StringRef.toString(importText), parentStub, this);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
index 2fada8f3..c9703ef2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSIncludeDirectiveElementType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.index.io.StringRef;
@@ -45,32 +44,30 @@ public JSIncludeDirectiveElementType() {
     }
 
     @Override
-    public void serialize(@Nonnull JSIncludeDirectiveStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSIncludeDirectiveStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getIncludeText());
     }
 
-    @Nonnull
     @Override
-    public JSIncludeDirectiveStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSIncludeDirectiveStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef includeText = dataStream.readName();
         return new JSIncludeDirectiveStubImpl(StringRef.toString(includeText), parentStub, this);
     }
 
     @RequiredReadAction
     @Override
-    public JSIncludeDirectiveStub createStub(@Nonnull JSIncludeDirective psi, StubElement parentStub) {
+    public JSIncludeDirectiveStub createStub(JSIncludeDirective psi, StubElement parentStub) {
         String includeText = psi.getIncludeText();
         return new JSIncludeDirectiveStubImpl(includeText, parentStub, this);
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSIncludeDirectiveImpl(astNode);
     }
 
     @Override
-    public JSIncludeDirective createPsi(@Nonnull JSIncludeDirectiveStub stub) {
+    public JSIncludeDirective createPsi(JSIncludeDirectiveStub stub) {
         return new JSIncludeDirectiveImpl(stub);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
index f8b105a7..c8400aa2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSNamespaceDeclarationElementType.java
@@ -31,7 +31,6 @@
 import consulo.language.psi.stub.StubElement;
 import consulo.language.psi.stub.StubInputStream;
 import consulo.language.psi.stub.StubOutputStream;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -43,20 +42,19 @@ public JSNamespaceDeclarationElementType() {
         super("NAMESPACE_DECLARATION");
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSNamespaceDeclarationImpl(astNode);
     }
 
     @Override
-    public JSNamespaceDeclaration createPsi(@Nonnull JSNamespaceDeclarationStub stub) {
+    public JSNamespaceDeclaration createPsi(JSNamespaceDeclarationStub stub) {
         return new JSNamespaceDeclarationImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSNamespaceDeclarationStub createStub(@Nonnull JSNamespaceDeclaration psi, StubElement parentStub) {
+    public JSNamespaceDeclarationStub createStub(JSNamespaceDeclaration psi, StubElement parentStub) {
         String name = psi.getName();
         String qualifiedName = psi.getQualifiedName();
         String initialValueString = psi.getInitialValueString();
@@ -64,15 +62,14 @@ public JSNamespaceDeclarationStub createStub(@Nonnull JSNamespaceDeclaration psi
     }
 
     @Override
-    public void serialize(@Nonnull JSNamespaceDeclarationStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSNamespaceDeclarationStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
         dataStream.writeName(stub.getQualifiedName());
         dataStream.writeName(stub.getInitialValueString());
     }
 
-    @Nonnull
     @Override
-    public JSNamespaceDeclarationStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSNamespaceDeclarationStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef nameRef = dataStream.readName();
         StringRef qualifiedRef = dataStream.readName();
         StringRef initialValueRef = dataStream.readName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
index 0307170b..55cb25ac 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSPackageStatementElementType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSPackageStatement;
@@ -44,34 +43,32 @@ public JSPackageStatementElementType() {
         super("PACKAGE_STATEMENT");
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSPackageStatementImpl(astNode);
     }
 
     @Override
-    public JSPackageStatement createPsi(@Nonnull JSPackageStatementStub stub) {
+    public JSPackageStatement createPsi(JSPackageStatementStub stub) {
         return new JSPackageStatementImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSPackageStatementStub createStub(@Nonnull JSPackageStatement psi, StubElement parentStub) {
+    public JSPackageStatementStub createStub(JSPackageStatement psi, StubElement parentStub) {
         String name = psi.getName();
         String qualifiedName = psi.getQualifiedName();
         return new JSPackageStatementStubImpl(name, qualifiedName, parentStub, this);
     }
 
     @Override
-    public void serialize(@Nonnull JSPackageStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSPackageStatementStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
         dataStream.writeName(stub.getQualifiedName());
     }
 
-    @Nonnull
     @Override
-    public JSPackageStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSPackageStatementStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef nameRef = dataStream.readName();
         StringRef qualifiedRef = dataStream.readName();
         return new JSPackageStatementStubImpl(StringRef.toString(nameRef), StringRef.toString(qualifiedRef), parentStub, this);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
index 04ff5e0b..5ece379c 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterElementType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.psi.JSParameter;
 import consulo.javascript.impl.language.psi.JSStubElementType;
@@ -43,20 +42,19 @@ public JSParameterElementType() {
         super("FORMAL_PARAMETER");
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSParameterImpl(astNode);
     }
 
     @Override
-    public JSParameter createPsi(@Nonnull JSParameterStub stub) {
+    public JSParameter createPsi(JSParameterStub stub) {
         return new JSParameterImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSParameterStub createStub(@Nonnull JSParameter psi, StubElement parentStub) {
+    public JSParameterStub createStub(JSParameter psi, StubElement parentStub) {
         String name = psi.getName();
         int flags = JSParameterStubImpl.buildFlags(psi);
         String typeString = psi.getTypeString();
@@ -66,7 +64,7 @@ public JSParameterStub createStub(@Nonnull JSParameter psi, StubElement parentSt
     }
 
     @Override
-    public void serialize(@Nonnull JSParameterStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSParameterStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
         dataStream.writeVarInt(stub.getFlags());
         dataStream.writeName(stub.getTypeString());
@@ -74,9 +72,8 @@ public void serialize(@Nonnull JSParameterStub stub, @Nonnull StubOutputStream d
         dataStream.writeName(stub.getQualifiedName());
     }
 
-    @Nonnull
     @Override
-    public JSParameterStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSParameterStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef nameRef = dataStream.readName();
         int flags = dataStream.readVarInt();
         StringRef typeRef = dataStream.readName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
index 58b6d2b3..da402b65 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSParameterListElementType.java
@@ -29,7 +29,6 @@
 import consulo.language.psi.stub.StubInputStream;
 import consulo.language.psi.stub.StubOutputStream;
 
-import jakarta.annotation.Nonnull;
 
 import java.io.IOException;
 
@@ -43,31 +42,29 @@ public JSParameterListElementType() {
         super("PARAMETER_LIST");
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSParameterListImpl(astNode);
     }
 
     @Override
-    public JSParameterList createPsi(@Nonnull JSParameterListStub stub) {
+    public JSParameterList createPsi(JSParameterListStub stub) {
         return new JSParameterListImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSParameterListStub createStub(@Nonnull JSParameterList psi, StubElement parentStub) {
+    public JSParameterListStub createStub(JSParameterList psi, StubElement parentStub) {
         return new JSParameterListStubImpl(parentStub, this);
     }
 
     @Override
-    public void serialize(@Nonnull JSParameterListStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSParameterListStub stub, StubOutputStream dataStream) throws IOException {
 
     }
 
-    @Nonnull
     @Override
-    public JSParameterListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSParameterListStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         return new JSParameterListStubImpl(parentStub, this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
index 72c13075..46e59d62 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSReferenceListElementType.java
@@ -19,11 +19,9 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.stub.*;
-import org.jetbrains.annotations.NonNls;
 import consulo.language.ast.ASTNode;
 import com.intellij.lang.javascript.JSElementTypes;
 import com.intellij.lang.javascript.psi.JSReferenceList;
@@ -43,12 +41,12 @@
  * Time: 7:51:24 PM
  */
 public class JSReferenceListElementType extends JSStubElementType<JSReferenceListStub, JSReferenceList> {
-    public JSReferenceListElementType(@NonNls String name) {
+    public JSReferenceListElementType(String name) {
         super(name);
     }
 
     @Override
-    public void indexStub(@Nonnull JSReferenceListStub stub, @Nonnull IndexSink sink) {
+    public void indexStub(JSReferenceListStub stub, IndexSink sink) {
         if (this == JSElementTypes.EXTENDS_LIST) {
             doIndex(sink, stub, JavaScriptIndexKeys.EXTENDS_INDEX);
         }
@@ -65,26 +63,25 @@ private static void doIndex(IndexSink sink, JSReferenceListStub stub, StubIndexK
         }
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSReferenceListImpl(astNode);
     }
 
     @Override
-    public JSReferenceList createPsi(@Nonnull JSReferenceListStub stub) {
+    public JSReferenceList createPsi(JSReferenceListStub stub) {
         return new JSReferenceListImpl(stub, this);
     }
 
     @RequiredReadAction
     @Override
-    public JSReferenceListStub createStub(@Nonnull JSReferenceList psi, StubElement parentStub) {
+    public JSReferenceListStub createStub(JSReferenceList psi, StubElement parentStub) {
         String[] referenceTexts = psi.getReferenceTexts();
         return new JSReferenceListStubImpl(referenceTexts, parentStub, this);
     }
 
     @Override
-    public void serialize(@Nonnull JSReferenceListStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSReferenceListStub stub, StubOutputStream dataStream) throws IOException {
         String[] referenceTexts = stub.getReferenceTexts();
         dataStream.writeVarInt(referenceTexts.length);
         for (String referenceText : referenceTexts) {
@@ -92,9 +89,8 @@ public void serialize(@Nonnull JSReferenceListStub stub, @Nonnull StubOutputStre
         }
     }
 
-    @Nonnull
     @Override
-    public JSReferenceListStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSReferenceListStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         int count = dataStream.readVarInt();
         String[] refs = ArrayUtil.newStringArray(count);
         for (int i = 0; i < count; i++) {
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
index c2a325de..c62e6e76 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSUseNamespaceDirectiveType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.index.io.StringRef;
@@ -44,31 +43,29 @@ public JSUseNamespaceDirectiveType() {
         super("USE_NAMESPACE_DIRECTIVE");
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSUseNamespaceDirectiveImpl(astNode);
     }
 
     @Override
-    public JSUseNamespaceDirective createPsi(@Nonnull JSUseNamespaceDirectiveStub stub) {
+    public JSUseNamespaceDirective createPsi(JSUseNamespaceDirectiveStub stub) {
         return new JSUseNamespaceDirectiveImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSUseNamespaceDirectiveStub createStub(@Nonnull JSUseNamespaceDirective psi, StubElement parentStub) {
+    public JSUseNamespaceDirectiveStub createStub(JSUseNamespaceDirective psi, StubElement parentStub) {
         return new JSUseNamespaceDirectiveStubImpl(psi.getNamespaceToBeUsed(), parentStub, this);
     }
 
     @Override
-    public void serialize(@Nonnull JSUseNamespaceDirectiveStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSUseNamespaceDirectiveStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getNamespaceToUse());
     }
 
-    @Nonnull
     @Override
-    public JSUseNamespaceDirectiveStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSUseNamespaceDirectiveStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef nameRef = dataStream.readName();
         return new JSUseNamespaceDirectiveStubImpl(StringRef.toString(nameRef), parentStub, this);
     }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
index e280a7f5..53a83927 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVarStatementElementType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
@@ -52,31 +51,29 @@ public boolean shouldCreateStub(ASTNode node) {
         return element instanceof JSClass || element instanceof JSPackageStatement || element instanceof JSFile;
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSVarStatementImpl(astNode);
     }
 
     @Override
-    public JSVarStatement createPsi(@Nonnull JSVarStatementStub stub) {
+    public JSVarStatement createPsi(JSVarStatementStub stub) {
         return new JSVarStatementImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSVarStatementStub createStub(@Nonnull JSVarStatement psi, StubElement parentStub) {
+    public JSVarStatementStub createStub(JSVarStatement psi, StubElement parentStub) {
         return new JSVarStatementStubImpl(parentStub, this);
     }
 
     @Override
-    public void serialize(@Nonnull JSVarStatementStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSVarStatementStub stub, StubOutputStream dataStream) throws IOException {
 
     }
 
-    @Nonnull
     @Override
-    public JSVarStatementStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSVarStatementStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         return new JSVarStatementStubImpl(parentStub, this);
     }
 }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
index 9b81468e..374b954a 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/types/JSVariableElementType.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.annotation.access.RequiredReadAction;
 import com.intellij.lang.javascript.JSElementTypes;
@@ -67,20 +66,19 @@ public boolean shouldCreateStub(ASTNode node) {
             || discriminatingParentType instanceof JSFileElementType;
     }
 
-    @Nonnull
     @Override
-    public PsiElement createElement(@Nonnull ASTNode astNode) {
+    public PsiElement createElement(ASTNode astNode) {
         return new JSVariableImpl(astNode);
     }
 
     @Override
-    public JSVariable createPsi(@Nonnull JSVariableStub stub) {
+    public JSVariable createPsi(JSVariableStub stub) {
         return new JSVariableImpl(stub);
     }
 
     @RequiredReadAction
     @Override
-    public JSVariableStub createStub(@Nonnull JSVariable psi, StubElement parentStub) {
+    public JSVariableStub createStub(JSVariable psi, StubElement parentStub) {
         String name = psi.getName();
         int flags = JSVariableStubImpl.buildFlags(psi);
         String typeString = psi.getTypeString();
@@ -90,7 +88,7 @@ public JSVariableStub createStub(@Nonnull JSVariable psi, StubElement parentStub
     }
 
     @Override
-    public void serialize(@Nonnull JSVariableStub stub, @Nonnull StubOutputStream dataStream) throws IOException {
+    public void serialize(JSVariableStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
         dataStream.writeVarInt(stub.getFlags());
         dataStream.writeName(stub.getTypeString());
@@ -98,9 +96,8 @@ public void serialize(@Nonnull JSVariableStub stub, @Nonnull StubOutputStream da
         dataStream.writeName(stub.getQualifiedName());
     }
 
-    @Nonnull
     @Override
-    public JSVariableStub deserialize(@Nonnull StubInputStream dataStream, StubElement parentStub) throws IOException {
+    public JSVariableStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef nameRef = dataStream.readName();
         int flags = dataStream.readVarInt();
         StringRef typeRef = dataStream.readName();
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index 5ee4f4c8..a7b84c93 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -38,7 +38,7 @@
 import consulo.xml.psi.xml.XmlFile;
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlText;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.*;
 
diff --git a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
index fbf95279..96ee6d9c 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/codeInsight/JavaScriptQuickFixFactory.java
@@ -24,7 +24,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.version.LanguageVersion;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.List;
 
@@ -36,12 +35,11 @@
 public abstract class JavaScriptQuickFixFactory {
     private static final JavaScriptQuickFixFactory ourDefaultImpl = new JavaScriptQuickFixFactory() {
         @Override
-        public boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version) {
+        public boolean isMyVersion(JavaScriptLanguageVersion version) {
             return true;
         }
     };
 
-    @Nonnull
     public static JavaScriptQuickFixFactory byElement(PsiElement element) {
         LanguageVersion languageVersion = element.getLanguageVersion();
         if (languageVersion instanceof BaseJavaScriptLanguageVersion jsVersion) {
@@ -61,5 +59,5 @@ public CreateJSFunctionOrMethodFix createFunctionOrMethodFix(String referenceNam
         return new CreateJSFunctionOrMethodFix(referenceName, isMethod);
     }
 
-    public abstract boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version);
+    public abstract boolean isMyVersion(JavaScriptLanguageVersion version);
 }
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
index b76d25e0..b29f3eaa 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptHighlighter.java
@@ -28,7 +28,6 @@
 import consulo.language.lexer.Lexer;
 import consulo.util.collection.MultiMap;
 import consulo.xml.editor.XmlHighlighterColors;
-import jakarta.annotation.Nonnull;
 
 import java.util.function.Supplier;
 
@@ -107,20 +106,18 @@ public static void storeDefaults(MultiMap<IElementType, TextAttributesKey> keys)
     private final Supplier<Lexer> myFactory;
     private final MultiMap<IElementType, TextAttributesKey> keys = MultiMap.createLinked();
 
-    public JavaScriptHighlighter(@Nonnull Supplier<Lexer> factory) {
+    public JavaScriptHighlighter(Supplier<Lexer> factory) {
         myFactory = factory;
 
         storeDefaults(keys);
     }
 
-    @Nonnull
     @Override
     public Lexer getHighlightingLexer() {
         return new JavaScriptHighlightingLexer(myFactory);
     }
 
     @Override
-    @Nonnull
     public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
         return keys.get(tokenType).toArray(new TextAttributesKey[0]);
     }
diff --git a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
index 817306e6..451b59ea 100644
--- a/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/ide/hightlight/JavaScriptSyntaxHighlightFactory.java
@@ -8,7 +8,6 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.version.LanguageVersion;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -19,15 +18,13 @@ public class JavaScriptSyntaxHighlightFactory extends LanguageVersionableSyntaxH
     public JavaScriptSyntaxHighlightFactory() {
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
     }
 
-    @Nonnull
     @Override
-    public SyntaxHighlighter getSyntaxHighlighter(@Nonnull LanguageVersion languageVersion) {
+    public SyntaxHighlighter getSyntaxHighlighter(LanguageVersion languageVersion) {
         if (languageVersion instanceof BaseJavaScriptLanguageVersion baseJavaScriptLanguageVersion) {
             return baseJavaScriptLanguageVersion.getSyntaxHighlighter();
         }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java b/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
index 68f444f7..76acd025 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/JavaScriptQuoteHandler.java
@@ -27,7 +27,6 @@
 import consulo.language.editor.action.SimpleTokenSetQuoteHandler;
 import consulo.language.psi.PsiElement;
 import consulo.virtualFileSystem.fileType.FileType;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -55,7 +54,7 @@ public TokenSet getStringTokenTypes() {
     }
 
     @Override
-    public boolean isAppropriateElementTypeForLiteral(@Nonnull IElementType tokenType) {
+    public boolean isAppropriateElementTypeForLiteral(IElementType tokenType) {
         return JavaScriptTokenSets.COMMENTS.contains(tokenType)
             || tokenType == JSTokenTypes.WHITE_SPACE
             || tokenType == JSTokenTypes.SEMICOLON
@@ -72,7 +71,6 @@ public boolean needParenthesesAroundConcatenation(PsiElement element) {
         return false;
     }
 
-    @Nonnull
     @Override
     public FileType getFileType() {
         return JavaScriptFileType.INSTANCE;
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
index c4ffeca9..75621763 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSComputedNameImpl.java
@@ -22,8 +22,7 @@
 import consulo.javascript.psi.JSComputedName;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -35,7 +34,7 @@ public JSComputedNameImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
index caf081d8..49d05060 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSElementFactory.java
@@ -20,7 +20,6 @@
 import com.intellij.lang.javascript.psi.impl.JSExpressionCodeFragmentImpl;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author nik
@@ -29,8 +28,7 @@ public class JSElementFactory {
     private JSElementFactory() {
     }
 
-    @Nonnull
-    public static JSFile createExpressionCodeFragment(@Nonnull Project project, CharSequence text, PsiElement context, boolean isPhysical) {
+    public static JSFile createExpressionCodeFragment(Project project, CharSequence text, PsiElement context, boolean isPhysical) {
         JSExpressionCodeFragmentImpl codeFragment = new JSExpressionCodeFragmentImpl(project, "fragment.js", text, isPhysical);
         codeFragment.setContext(context);
         return codeFragment;
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
index 0c282b79..67698033 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JSStubElementType.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.stub.IStubElementType;
 import consulo.language.psi.stub.IndexSink;
 
-import jakarta.annotation.Nonnull;
 
 public abstract class JSStubElementType<StubT extends JSStubElement<PsiT>, PsiT extends JSElement> extends IStubElementType<StubT, PsiT>
     implements IElementTypeAsPsiFactory {
@@ -40,10 +39,9 @@ public String toString() {
     }
 
     @Override
-    public void indexStub(@Nonnull StubT stub, @Nonnull IndexSink sink) {
+    public void indexStub(StubT stub, IndexSink sink) {
     }
 
-    @Nonnull
     @Override
     public String getExternalId() {
         return toString();
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
index 6096157e..fd73e7f3 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptLambdaExpressionImpl.java
@@ -30,8 +30,7 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -45,10 +44,10 @@ public JavaScriptLambdaExpressionImpl(ASTNode node) {
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         if (lastParent != null && lastParent.getParent() == this) {
             JSParameter[] params = getParameterList().getParameters();
@@ -69,12 +68,11 @@ public boolean processDeclarations(
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitLambdaExpression(this);
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public JSParameterList getParameterList() {
         return findNotNullChildByClass(JSParameterList.class);
@@ -94,7 +92,6 @@ public JSSourceElement[] getBody() {
         return result;
     }
 
-    @Nonnull
     @Override
     public JavaScriptType getReturnType() {
         return JavaScriptType.UNKNOWN;
@@ -137,7 +134,7 @@ public PsiElement getNameIdentifier() {
 
     @RequiredWriteAction
     @Override
-    public PsiElement setName(@Nonnull String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         return null;
     }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
index 899eb54f..09c45a4b 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/JavaScriptSpreadExpressionImpl.java
@@ -8,7 +8,6 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -24,21 +23,19 @@ public JSExpression getInnerExpression() {
         return findNotNullChildByClass(JSExpression.class);
     }
 
-    @Nonnull
     @Override
     public JSExpression replace(JSExpression other) {
         return this;
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public JavaScriptType getType() {
         return JavaScriptType.UNKNOWN;
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
index 6b07f129..bb785b22 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JSFileStubImpl.java
@@ -7,8 +7,7 @@
 import consulo.language.psi.stub.IStubFileElementType;
 import consulo.language.psi.stub.PsiFileStubImpl;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -17,12 +16,12 @@
 public class JSFileStubImpl extends PsiFileStubImpl<JSFile> implements JSFileStub {
     private StringRef myName;
 
-    public JSFileStubImpl(@Nullable JSFile file, @Nonnull String name) {
+    public JSFileStubImpl(@Nullable JSFile file, String name) {
         super(file);
         myName = StringRef.fromString(name);
     }
 
-    public JSFileStubImpl(@Nullable JSFile file, @Nonnull StringRef name) {
+    public JSFileStubImpl(@Nullable JSFile file, StringRef name) {
         super(file);
         myName = name;
     }
@@ -32,7 +31,6 @@ public IStubFileElementType getType() {
         return JSElementTypes.FILE;
     }
 
-    @Nonnull
     @Override
     public String getName() {
         return StringRef.toString(myName);
diff --git a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
index fcbe10c6..2e3ed3ec 100644
--- a/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
+++ b/base-impl/src/main/java/consulo/javascript/impl/language/psi/stub/JavaScriptClassNameIndex.java
@@ -25,14 +25,12 @@
 import consulo.language.psi.stub.StringStubIndexExtension;
 import consulo.language.psi.stub.StubIndexKey;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  */
 @ExtensionImpl
 public class JavaScriptClassNameIndex extends StringStubIndexExtension<JSClass> {
-    @Nonnull
     @Override
     public StubIndexKey<String, JSClass> getKey() {
         return JavaScriptIndexKeys.CLASSES_BY_NAME;
diff --git a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
index 72c482d4..23402718 100644
--- a/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
+++ b/base-impl/src/main/java/consulo/javascript/inspections/qucikFixes/CreateJSFunctionFixBase.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiFile;
 import consulo.localize.LocalizeValue;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.Set;
 
@@ -35,15 +34,13 @@
  * @since 2016-02-24
  */
 public abstract class CreateJSFunctionFixBase extends BaseCreateFix {
-    @Nonnull
     private final LocalizeValue myMessage;
 
-    public CreateJSFunctionFixBase(@Nonnull LocalizeValue message) {
+    public CreateJSFunctionFixBase(LocalizeValue message) {
         myMessage = message;
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getName() {
         return myMessage;
     }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index d5d79e22..5ea2daaa 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -9,7 +9,6 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.parser.PsiParser;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -28,37 +27,31 @@ public BaseJavaScriptLanguageVersion(String name, String... mimeTypes) {
         super(name, name, JavaScriptLanguage.INSTANCE, mimeTypes);
     }
 
-    protected void addFeature(@Nonnull JavaScriptFeature feature) {
+    protected void addFeature(JavaScriptFeature feature) {
         myFeatures.add(feature);
     }
 
-    @Nonnull
     public Set<JavaScriptFeature> getFeatures() {
         return myFeatures;
     }
 
-    @Nonnull
     public abstract SyntaxHighlighter getSyntaxHighlighter();
 
-    @Nonnull
     @Override
     public PsiParser createParser() {
         return new JavaScriptParser();
     }
 
-    @Nonnull
     @Override
     public TokenSet getWhitespaceTokens() {
         return JavaScriptTokenSets.WHITE_SPACES;
     }
 
-    @Nonnull
     @Override
     public TokenSet getCommentTokens() {
         return JSTokenTypes.COMMENTS;
     }
 
-    @Nonnull
     @Override
     public TokenSet getStringLiteralElements() {
         return ourLiterals;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
index 79efc92b..54ac60f6 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScript15LanguageVersion.java
@@ -8,7 +8,6 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.function.Supplier;
 
@@ -20,7 +19,6 @@
 public class JavaScript15LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
     private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript15Lexer();
 
-    @Nonnull
     public static JavaScript15LanguageVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript15LanguageVersion.class);
     }
@@ -29,19 +27,16 @@ public JavaScript15LanguageVersion() {
         super("JAVASCRIPT_1_5");
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "JavaScript 1.5";
     }
 
-    @Nonnull
     @Override
     public Lexer createLexer() {
         return ourLexerFactory.get();
     }
 
-    @Nonnull
     @Override
     public SyntaxHighlighter getSyntaxHighlighter() {
         return new JavaScriptHighlighter(ourLexerFactory);
diff --git a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
index e0e18729..9657fc76 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/JavaScriptContextKeywordElementType.java
@@ -5,8 +5,7 @@
 import com.intellij.lang.javascript.JSElementType;
 import consulo.language.ast.IElementType;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -20,11 +19,11 @@ public static IElementType getKeywordByText(String text) {
         return ourCache.get(text);
     }
 
-    public static boolean containsKeyword(@Nonnull IElementType e) {
+    public static boolean containsKeyword(IElementType e) {
         return ourCache.inverse().containsKey(e);
     }
 
-    public JavaScriptContextKeywordElementType(@Nonnull String id, @Nonnull String keyword) {
+    public JavaScriptContextKeywordElementType(String id, String keyword) {
         super(id);
 
         ourCache.put(keyword, this);
diff --git a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
index c136a5df..2ed64de3 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/StandardJavaScriptVersionsImpl.java
@@ -8,8 +8,7 @@
 import consulo.javascript.language.StandardJavaScriptVersions;
 import consulo.language.version.LanguageVersion;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import jakarta.inject.Singleton;
 
 import java.util.ArrayList;
@@ -22,7 +21,6 @@
 @Singleton
 @ServiceImpl
 public class StandardJavaScriptVersionsImpl extends StandardJavaScriptVersions {
-    @Nonnull
     public JavaScriptLanguageVersion getDefaultVersion() {
         LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
         for (LanguageVersion version : versions) {
@@ -33,7 +31,6 @@ public JavaScriptLanguageVersion getDefaultVersion() {
         return JavaScript15LanguageVersion.getInstance();
     }
 
-    @Nonnull
     public List<JavaScriptLanguageVersion> getValidLanguageVersions() {
         List<JavaScriptLanguageVersion> list = new ArrayList<>();
         LanguageVersion[] versions = JavaScriptLanguage.INSTANCE.getVersions();
@@ -47,7 +44,6 @@ public List<JavaScriptLanguageVersion> getValidLanguageVersions() {
         return list;
     }
 
-    @Nonnull
     public JavaScriptLanguageVersion findVersionById(@Nullable String id) {
         if (StringUtil.isEmpty(id)) {
             return getDefaultVersion();
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
index bae3e641..69cc1424 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/ExpressionParsing.java
@@ -28,7 +28,7 @@
 import consulo.logging.Logger;
 import consulo.util.dataholder.Key;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 
 /**
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
index c62641f2..408b72c8 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/FunctionParsing.java
@@ -20,8 +20,7 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.parser.PsiBuilder;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -46,7 +45,7 @@ private void parseFunction(PsiBuilder builder, boolean expressionContext) {
     public void parseFunctionNoMarker(
         PsiBuilder builder,
         boolean expressionContext,
-        @Nonnull PsiBuilder.Marker functionMarker
+        PsiBuilder.Marker functionMarker
     ) {
         if (builder.getTokenType() == JSTokenTypes.FUNCTION_KEYWORD) {
             // function keyword may be ommited in context of get/set property definition
@@ -121,7 +120,7 @@ else if (builder.getTokenType() == JSTokenTypes.COMMA) {
         parameterList.done(JSElementTypes.PARAMETER_LIST);
     }
 
-    public void parseParameter(@Nonnull PsiBuilder builder, @Nullable PsiBuilder.Marker parameterMarker) {
+    public void parseParameter(PsiBuilder builder, PsiBuilder.@Nullable Marker parameterMarker) {
         if (parameterMarker == null) {
             parameterMarker = builder.mark();
         }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index dccdf96c..f3f0c579 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -11,8 +11,7 @@
 import consulo.xml.impl.localize.XmlErrorLocalize;
 import consulo.xml.psi.xml.XmlElementType;
 import consulo.xml.psi.xml.XmlTokenType;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Stack;
 
@@ -200,16 +199,14 @@ else if (tt instanceof ICustomParsingType || tt instanceof ILazyParseableElement
         terminateText(xmlText);
     }
 
-    @Nullable
-    private static PsiBuilder.Marker terminateText(@Nullable PsiBuilder.Marker xmlText) {
+    private static PsiBuilder.@Nullable Marker terminateText(PsiBuilder.@Nullable Marker xmlText) {
         if (xmlText != null) {
             xmlText.done(XmlElementType.XML_TEXT);
         }
         return null;
     }
 
-    @Nonnull
-    private PsiBuilder.Marker startText(@Nullable PsiBuilder.Marker xmlText) {
+    private PsiBuilder.Marker startText(PsiBuilder.@Nullable Marker xmlText) {
         if (xmlText == null) {
             xmlText = mark();
         }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
index e3478429..beda70f3 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParser.java
@@ -6,16 +6,14 @@
 import consulo.language.parser.PsiParser;
 import consulo.language.version.LanguageVersion;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 24.08.14
  */
 public class JavaScriptParser implements PsiParser {
-    @Nonnull
     @Override
-    public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder originalBuilder, @Nonnull LanguageVersion languageVersion) {
+    public ASTNode parse(IElementType root, PsiBuilder originalBuilder, LanguageVersion languageVersion) {
         JavaScriptParsingContext parsingContext = createParsingContext();
 
         JavaScriptParserBuilder builder = createBuilder(originalBuilder);
@@ -28,12 +26,10 @@ public ASTNode parse(@Nonnull IElementType root, @Nonnull PsiBuilder originalBui
         return builder.getTreeBuilt();
     }
 
-    @Nonnull
     public JavaScriptParserBuilder createBuilder(PsiBuilder builder) {
         return new JavaScriptParserBuilder(builder);
     }
 
-    @Nonnull
     public JavaScriptParsingContext createParsingContext() {
         return new JavaScriptParsingContext();
     }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
index 1a726ad2..0ab5684c 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JavaScriptParsingContext.java
@@ -3,7 +3,6 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import consulo.language.ast.IElementType;
 import consulo.language.parser.PsiBuilder;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -36,32 +35,26 @@ public boolean isIdentifierName(PsiBuilder builder, IElementType tokenType) {
         return JSTokenTypes.IDENTIFIER_TOKENS_SET.contains(tokenType);
     }
 
-    @Nonnull
     protected FunctionParsing createFunctionParsing() {
         return new FunctionParsing(this);
     }
 
-    @Nonnull
     protected StatementParsing createStatementParsing() {
         return new StatementParsing(this);
     }
 
-    @Nonnull
     protected ExpressionParsing createExpressionParsing() {
         return new ExpressionParsing(this);
     }
 
-    @Nonnull
     public FunctionParsing getFunctionParsing() {
         return myFunctionParsing;
     }
 
-    @Nonnull
     public ExpressionParsing getExpressionParsing() {
         return myExpressionParsing;
     }
 
-    @Nonnull
     public StatementParsing getStatementParsing() {
         return myStatementParsing;
     }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
index d66d8c16..10e34dcc 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/Parsing.java
@@ -24,8 +24,7 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.localize.LocalizeValue;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * User: max
@@ -39,7 +38,7 @@ public Parsing(C context) {
         myContext = context;
     }
 
-    public boolean isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType) {
+    public boolean isContextKeyword(PsiBuilder builder, IElementType elementType) {
         if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
             IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
             if (contextKeywordElementType == null) {
@@ -53,7 +52,7 @@ public boolean isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementTy
     }
 
     @Nullable
-    public IElementType isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet) {
+    public IElementType isContextKeyword(PsiBuilder builder, TokenSet tokenSet) {
         if (builder.getTokenType() == JSTokenTypes.IDENTIFIER) {
             IElementType contextKeywordElementType = JavaScriptContextKeywordElementType.getKeywordByText(builder.getTokenText());
             if (contextKeywordElementType == null) {
@@ -66,7 +65,7 @@ public IElementType isContextKeyword(@Nonnull PsiBuilder builder, @Nonnull Token
         return null;
     }
 
-    public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElementType elementType) {
+    public void advanceContextKeyword(PsiBuilder builder, IElementType elementType) {
         if (isContextKeyword(builder, elementType)) {
             if (builder instanceof JavaScriptStrictParserBuilder parserBuilder) {
                 parserBuilder.disableNonStrictRemap(builder.getCurrentOffset());
@@ -76,7 +75,7 @@ public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull IElement
         }
     }
 
-    public void advanceContextKeyword(@Nonnull PsiBuilder builder, @Nonnull TokenSet tokenSet) {
+    public void advanceContextKeyword(PsiBuilder builder, TokenSet tokenSet) {
         IElementType elementType = isContextKeyword(builder, tokenSet);
         if (elementType != null) {
             if (builder instanceof JavaScriptStrictParserBuilder strictParserBuilder) {
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
index 9a8f6079..f92160b3 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/StatementParsing.java
@@ -23,7 +23,6 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -578,7 +577,7 @@ protected void parseVarStatement(PsiBuilder builder, boolean inForInitialization
     protected void parseVarStatementWithMarker(
         PsiBuilder builder,
         boolean inForInitializationContext,
-        @Nonnull PsiBuilder.Marker var
+        PsiBuilder.Marker var
     ) {
         IElementType declType = builder.getTokenType();
         LOG.assertTrue(declType == JSTokenTypes.VAR_KEYWORD ||
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
index 6d5d5b92..70d6e00b 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringElementImpl.java
@@ -6,9 +6,8 @@
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import consulo.annotation.access.RequiredReadAction;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -20,7 +19,7 @@ public JavaSciptDestructuringElementImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
index 40e4bf4a..a55fa3a4 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaSciptDestructuringObjectImpl.java
@@ -8,7 +8,6 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.ast.ASTNode;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
 
@@ -22,11 +21,10 @@ public JavaSciptDestructuringObjectImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JSVariable[] getVariables() {
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
index 09e6ec25..5c7fe03d 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringParameterImpl.java
@@ -12,10 +12,8 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
-import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -29,10 +27,10 @@ public JavaScriptDestructuringParameterImpl(ASTNode node) {
     @Override
     @RequiredReadAction
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         JSDestructuringObject destructuringObject = getDestructuringObject();
         if (destructuringObject == null) {
@@ -53,7 +51,7 @@ public JSVariableStubBase getStub() {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
@@ -109,7 +107,6 @@ public void setInitializer(JSExpression expr) throws IncorrectOperationException
 
     }
 
-    @Nonnull
     @Override
     public JavaScriptType getType() {
         return JavaScriptType.UNKNOWN;
@@ -164,7 +161,7 @@ public PsiElement getNameIdentifier() {
 
     @RequiredWriteAction
     @Override
-    public PsiElement setName(@Nonnull @NonNls String name) throws IncorrectOperationException {
+    public PsiElement setName(String name) throws IncorrectOperationException {
         return null;
     }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
index 84df1b61..c161eaf3 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptDestructuringShorthandedPropertyImpl.java
@@ -7,7 +7,6 @@
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import consulo.annotation.access.RequiredReadAction;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -19,11 +18,10 @@ public JavaScriptDestructuringShorthandedPropertyImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public JSVariable getVariable() {
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
index 23d27f2f..ed9bce04 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/impl/JavaScriptStrictParserBuilder.java
@@ -10,7 +10,7 @@
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ThreeState;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
index b8d2fc05..c8d3c374 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/JavaScriptClassType.java
@@ -21,8 +21,7 @@
 import consulo.javascript.language.psi.JavaScriptType;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -36,7 +35,6 @@ public JavaScriptClassType(JSClass aClass) {
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public String getPresentableText() {
         String name = myClass.getName();
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
index 7b2fcb06..0e93243f 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/elementType/BaseJavaScriptElementType.java
@@ -16,7 +16,6 @@
 
 package consulo.javascript.lang.psi.impl.elementType;
 
-import org.jetbrains.annotations.NonNls;
 import consulo.javascript.impl.language.psi.JSStubElementType;
 import com.intellij.lang.javascript.psi.stubs.JSStubElement;
 import consulo.javascript.language.psi.JavaScriptTypeElement;
@@ -27,7 +26,7 @@
  */
 public abstract class BaseJavaScriptElementType<S extends JSStubElement<P>, P extends JavaScriptTypeElement>
     extends JSStubElementType<S, P> {
-    public BaseJavaScriptElementType(@NonNls String debugName) {
+    public BaseJavaScriptElementType(String debugName) {
         super(debugName);
     }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
index 2611c0be..5cdcf914 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/JavaScriptVersionWithHelper.java
@@ -1,12 +1,10 @@
 package consulo.javascript.lang.psi.impl.resolve;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2019-12-14
  */
 public interface JavaScriptVersionWithHelper {
-    @Nonnull
     ResolveHelper getHelper();
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
index d8c7ad4c..6426edda 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/psi/impl/resolve/ResolveHelper.java
@@ -8,9 +8,8 @@
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.version.LanguageVersion;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -28,7 +27,7 @@ public static ResolveHelper find(PsiElement element) {
     }
 
     @Nullable
-    public JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull String referencedName, PsiNamedElement parent) {
+    public JSImportedElementResolveResult resolveTypeNameUsingImports(String referencedName, PsiNamedElement parent) {
         return null;
     }
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
index aab1014a..c14bc84c 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/viewProvider/JSFileViewProviderFactory.java
@@ -12,7 +12,6 @@
 import consulo.util.lang.reflect.ReflectionUtil;
 import consulo.virtualFileSystem.VirtualFile;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -22,17 +21,17 @@
 public class JSFileViewProviderFactory implements LanguageFileViewProviderFactory {
     private static class JSFileViewProvider extends SingleRootFileViewProvider {
         private JSFileViewProvider(
-            @Nonnull PsiManager manager,
-            @Nonnull VirtualFile virtualFile,
+            PsiManager manager,
+            VirtualFile virtualFile,
             boolean eventSystemEnabled,
-            @Nonnull Language language
+            Language language
         ) {
             super(manager, virtualFile, eventSystemEnabled, language);
         }
 
         @Override
         @RequiredReadAction
-        public PsiElement findElementAt(int offset, @Nonnull Class<? extends Language> lang) {
+        public PsiElement findElementAt(int offset, Class<? extends Language> lang) {
             PsiElement elementAt = findElementAt(offset);
             if (elementAt != null && ReflectionUtil.isAssignable(lang, elementAt.getLanguage().getClass())) {
                 return elementAt;
@@ -43,15 +42,14 @@ public PsiElement findElementAt(int offset, @Nonnull Class<? extends Language> l
 
     @Override
     public FileViewProvider createFileViewProvider(
-        @Nonnull VirtualFile virtualFile,
+        VirtualFile virtualFile,
         Language language,
-        @Nonnull PsiManager psiManager,
+        PsiManager psiManager,
         boolean eventSystemEnabled
     ) {
         return new JSFileViewProvider(psiManager, virtualFile, eventSystemEnabled, language);
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
index 0f900285..18c49cc8 100644
--- a/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
+++ b/base-impl/src/main/java/consulo/javascript/types/JSQualifiedStubElementType.java
@@ -22,8 +22,6 @@
 import com.intellij.lang.javascript.psi.stubs.JSQualifiedStub;
 import consulo.javascript.language.psi.stub.JavaScriptIndexKeys;
 import consulo.language.psi.stub.IndexSink;
-import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author VISTALL
@@ -31,12 +29,12 @@
  */
 public abstract class JSQualifiedStubElementType<StubT extends JSQualifiedStub<PsiT>, PsiT extends JSQualifiedNamedElement>
     extends JSStubElementType<StubT, PsiT> {
-    public JSQualifiedStubElementType(@NonNls String debugName) {
+    public JSQualifiedStubElementType(String debugName) {
         super(debugName);
     }
 
     @Override
-    public void indexStub(@Nonnull StubT stub, @Nonnull IndexSink sink) {
+    public void indexStub(StubT stub, IndexSink sink) {
         String name = stub.getName();
         String fqn = stub.getQualifiedName();
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserCDTDebugProcess.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserCDTDebugProcess.java
index e0865745..a45c44da 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserCDTDebugProcess.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserCDTDebugProcess.java
@@ -5,14 +5,13 @@
 import consulo.javascript.debugger.cdt.CDTProcessBase;
 import consulo.javascript.debugger.cdt.ChromeDevToolsFactory;
 import consulo.process.ExecutionException;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 2026-02-15
  */
 public class BrowserCDTDebugProcess extends CDTProcessBase {
-    public BrowserCDTDebugProcess(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException {
+    public BrowserCDTDebugProcess(XDebugSession session, ExecutionResult result) throws ExecutionException {
         super(session, result);
     }
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java
index 9e7e8048..89834365 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/BrowserDebuggerProcess.java
@@ -4,7 +4,6 @@
 import consulo.execution.debug.DefaultDebugProcessHandler;
 import consulo.javascript.debugger.browser.transport.DetachDebuggerRequest;
 import consulo.javascript.debugger.browser.transport.ExtensionWebSocketAccepter;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -13,7 +12,7 @@
 public class BrowserDebuggerProcess extends DefaultDebugProcessHandler {
     private final SessionHolder.BrowserSession myBrowserSession;
 
-    public BrowserDebuggerProcess(@Nonnull SessionHolder.BrowserSession browserSession) {
+    public BrowserDebuggerProcess(SessionHolder.BrowserSession browserSession) {
         myBrowserSession = browserSession;
     }
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java
index 154737be..c67b4361 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfiguration.java
@@ -23,8 +23,7 @@
 import consulo.webBrowser.BrowserLauncher;
 import consulo.webBrowser.WebBrowser;
 import consulo.webBrowser.WebBrowserManager;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.jdom.Element;
 
 import java.util.Arrays;
@@ -64,7 +63,6 @@ public Collection<Module> getValidModules() {
         return Arrays.asList(manager.getModules());
     }
 
-    @Nonnull
     @Override
     public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
         return new JavaScriptBrowserConfigurationEditor();
@@ -72,10 +70,10 @@ public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
 
     @Nullable
     @Override
-    public RunProfileState getState(@Nonnull Executor executor, @Nonnull ExecutionEnvironment environment) throws ExecutionException {
+    public RunProfileState getState(Executor executor, ExecutionEnvironment environment) throws ExecutionException {
         return new RunProfileState() {
             @Override
-            public ExecutionResult execute(Executor executor, @Nonnull ProgramRunner programRunner) throws ExecutionException {
+            public ExecutionResult execute(Executor executor, ProgramRunner programRunner) throws ExecutionException {
                 TextConsoleBuilder builder = TextConsoleBuilderFactory.getInstance().createBuilder(environment.getProject());
 
                 ConsoleView console = builder.getConsole();
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java
index 2e4f9779..7013f0be 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationEditor.java
@@ -7,7 +7,7 @@
 import consulo.ui.TextBox;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.util.FormBuilder;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java
index fb726895..dacacac4 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserConfigurationType.java
@@ -10,7 +10,6 @@
 import consulo.localize.LocalizeValue;
 import consulo.module.extension.ModuleExtensionHelper;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -28,7 +27,7 @@ public RunConfiguration createTemplateConfiguration(Project project) {
             }
 
             @Override
-            public boolean isApplicable(@Nonnull Project project) {
+            public boolean isApplicable(Project project) {
                 return ModuleExtensionHelper.getInstance(project).hasModuleExtension(JavaScriptModuleExtension.class);
             }
         });
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
index bcc582f0..0d734f7b 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/JavaScriptBrowserDebugRunner.java
@@ -11,7 +11,6 @@
 import consulo.execution.ui.RunContentDescriptor;
 import consulo.javascript.debugger.cdt.CDTProcessBase;
 import consulo.process.ExecutionException;
-import jakarta.annotation.Nonnull;
 
 import java.util.Objects;
 
@@ -21,14 +20,13 @@
  */
 @ExtensionImpl
 public class JavaScriptBrowserDebugRunner extends DefaultProgramRunner {
-    @Nonnull
     @Override
     public String getRunnerId() {
         return "browser-javascript-debug";
     }
 
     @Override
-    protected RunContentDescriptor doExecute(@Nonnull RunProfileState state, @Nonnull ExecutionEnvironment env) throws ExecutionException {
+    protected RunContentDescriptor doExecute(RunProfileState state, ExecutionEnvironment env) throws ExecutionException {
         return XDebuggerManager.getInstance(env.getProject()).startSession(env, xDebugSession -> {
             ExecutionResult result = Objects.requireNonNull(state.execute(env.getExecutor(), env.getRunner()));
 
@@ -43,7 +41,7 @@ protected RunContentDescriptor doExecute(@Nonnull RunProfileState state, @Nonnul
     }
 
     @Override
-    public boolean canRun(@Nonnull String executorId, @Nonnull RunProfile runProfile) {
+    public boolean canRun(String executorId, RunProfile runProfile) {
         return executorId.equals(DefaultDebugExecutor.EXECUTOR_ID) && runProfile instanceof JavaScriptBrowserConfiguration;
     }
 }
diff --git a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
index 98a87253..fed41bd4 100644
--- a/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
+++ b/debugger/browser-debugger-impl/src/main/java/consulo/javascript/debugger/browser/transport/ExtensionWebSocketAccepter.java
@@ -9,7 +9,6 @@
 import consulo.javascript.debugger.browser.BrowserCDTDebugProcess;
 import consulo.javascript.debugger.browser.SessionHolder;
 import consulo.javascript.debugger.cdt.CDTProcessBase;
-import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 
 import java.nio.charset.StandardCharsets;
@@ -31,12 +30,12 @@ public ExtensionWebSocketAccepter(SessionHolder sessionHolder) {
     }
 
     @Override
-    public void accept(@Nonnull WebSocketConnection webSocketConnection, @Nonnull byte[] bytes) {
+    public void accept(WebSocketConnection webSocketConnection, byte[] bytes) {
         accept(webSocketConnection, new String(bytes, StandardCharsets.UTF_8));
     }
 
     @Override
-    public void accept(@Nonnull WebSocketConnection conn, @Nonnull String text) {
+    public void accept(WebSocketConnection conn, String text) {
         try {
             SessionHolder.BrowserSession session = null;
 
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTExecutionStack.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTExecutionStack.java
index 1be641d2..240b29e5 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTExecutionStack.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTExecutionStack.java
@@ -3,7 +3,7 @@
 import com.github.kklisura.cdt.protocol.types.debugger.CallFrame;
 import consulo.execution.debug.frame.XExecutionStack;
 import consulo.execution.debug.frame.XStackFrame;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
index 2c3dbf61..5a8c50bb 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTProcessBase.java
@@ -28,8 +28,7 @@
 import consulo.ui.ex.content.Content;
 import consulo.util.io.Url;
 import consulo.util.io.Urls;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.net.SocketException;
 import java.util.Collection;
@@ -58,7 +57,7 @@ public abstract class CDTProcessBase extends XDebugProcess {
 
     private Map<String, CDTBreakpointInfo> myBreakpoints = new HashMap<>();
 
-    public CDTProcessBase(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException {
+    public CDTProcessBase(XDebugSession session, ExecutionResult result) throws ExecutionException {
         super(session);
         myScriptListPanel = new JavaScriptListPanel<>();
 
@@ -151,13 +150,11 @@ public boolean checkCanPerformCommands() {
         return myChromeDevTools != null;
     }
 
-    @Nonnull
     @Override
     public XDebuggerEditorsProvider getEditorsProvider() {
         return JavaScriptEditorsProvider.INSTANCE;
     }
 
-    @Nonnull
     @Override
     public ExecutionConsole createConsole() {
         return myResult.getExecutionConsole();
@@ -168,13 +165,12 @@ public boolean checkCanInitBreakpoints() {
         return false;
     }
 
-    @Nonnull
     @Override
     public XBreakpointHandler<?>[] getBreakpointHandlers() {
         return new XBreakpointHandler[]{
             new XBreakpointHandler<>(JavaScriptLineBreakpointType.class) {
                 @Override
-                public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint) {
+                public void registerBreakpoint(final XLineBreakpoint lineBreakpoint) {
                     int line = lineBreakpoint.getLine();
                     XExpression conditionExpression = lineBreakpoint.getConditionExpression();
                     String expression = conditionExpression == null ? null : conditionExpression.getExpression();
@@ -199,7 +195,7 @@ public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint) {
                 }
 
                 @Override
-                public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint, boolean b) {
+                public void unregisterBreakpoint(XLineBreakpoint breakpoint, boolean b) {
                     String presentableFilePath = breakpoint.getPresentableFilePath();
                     // myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), breakpoint.getLine(), Breakpoint.EMPTY_VALUE, false, null, null, null);
                 }
@@ -263,15 +259,14 @@ public void resume(@Nullable XSuspendContext context) {
     }
 
     @Override
-    public void runToPosition(@Nonnull XSourcePosition position, @Nullable XSuspendContext context) {
+    public void runToPosition(XSourcePosition position, @Nullable XSuspendContext context) {
     }
 
-    @Nonnull
     @Override
     public XDebugTabLayouter createTabLayouter() {
         return new XDebugTabLayouter() {
             @Override
-            public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui) {
+            public void registerAdditionalContent(RunnerLayoutUi ui) {
                 Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIconGroup.javascript(), null);
                 content.setCloseable(false);
 
@@ -280,7 +275,6 @@ public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui) {
         };
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getCurrentStateMessage() {
         if (myChromeDevTools == null) {
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java
index e3256c6a..6a188eaa 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTRemoteObjectValue.java
@@ -8,8 +8,7 @@
 import consulo.execution.debug.frame.presentation.XValuePresentation;
 import consulo.execution.debug.icon.ExecutionDebugIconGroup;
 import consulo.ui.image.Image;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
@@ -23,14 +22,14 @@ public class CDTRemoteObjectValue extends XNamedValue {
 
     private final CDTProcessBase myProcess;
 
-    public CDTRemoteObjectValue(@Nonnull String name, @Nullable RemoteObject remoteObject, CDTProcessBase process) {
+    public CDTRemoteObjectValue(String name, @Nullable RemoteObject remoteObject, CDTProcessBase process) {
         super(name);
         myRemoteObject = remoteObject;
         myProcess = process;
     }
 
     @Override
-    public void computeChildren(@Nonnull XCompositeNode node) {
+    public void computeChildren(XCompositeNode node) {
         fill(myRemoteObject, node, myProcess);
     }
 
@@ -63,13 +62,12 @@ public static void fill(RemoteObject remoteObject, XCompositeNode node, CDTProce
         });
     }
 
-    @Nonnull
     protected Image getObjectIcon() {
         return ExecutionDebugIconGroup.nodeValue();
     }
 
     @Override
-    public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace place) {
+    public void computePresentation(XValueNode node, XValuePlace place) {
         if (myRemoteObject == null) {
             node.setPresentation(getObjectIcon(), null, "null", false);
             return;
@@ -81,7 +79,7 @@ public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace p
         else {
             node.setPresentation(ExecutionDebugIconGroup.nodePrimitive(), new XValuePresentation() {
                 @Override
-                public void renderValue(@Nonnull XValueTextRenderer renderer) {
+                public void renderValue(XValueTextRenderer renderer) {
                     switch (myRemoteObject.getType()) {
                         case STRING:
                             renderer.renderStringValue(String.valueOf(myRemoteObject.getValue()));
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
index 788f0658..a98d0797 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
@@ -6,7 +6,6 @@
 import consulo.execution.debug.frame.XCompositeNode;
 import consulo.execution.debug.frame.XValueGroup;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 
 import java.util.Locale;
 
@@ -15,14 +14,12 @@
  * @since 2026-02-15
  */
 public class CDTScopeValue extends XValueGroup {
-    @Nonnull
     private final Scope myScope;
-    @Nonnull
     private final RemoteObject myRemoteObject;
     private final CDTProcessBase myProcess;
 
-    public CDTScopeValue(@Nonnull Scope scope,
-                         @Nonnull RemoteObject remoteObject,
+    public CDTScopeValue(Scope scope,
+                         RemoteObject remoteObject,
                          CDTProcessBase process) {
         super(StringUtil.capitalize(scope.getType().name().toLowerCase(Locale.ROOT)));
         myScope = scope;
@@ -31,7 +28,7 @@ public CDTScopeValue(@Nonnull Scope scope,
     }
 
     @Override
-    public void computeChildren(@Nonnull XCompositeNode node) {
+    public void computeChildren(XCompositeNode node) {
         CDTRemoteObjectValue.fill(myRemoteObject, node, myProcess);
     }
 
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java
index c4c0510e..c9d4b020 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScript.java
@@ -12,8 +12,7 @@
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.VirtualFileManager;
 import consulo.virtualFileSystem.util.VirtualFileUtil;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -40,13 +39,11 @@ public VirtualFile toVirtualFile() {
         return VirtualFileManager.getInstance().findFileByUrl(myUrl);
     }
 
-    @Nonnull
     @Override
     public String getPath() {
         return/* myId + ":" +*/ VirtualFileUtil.urlToPath(myUrl);
     }
 
-    @Nonnull
     @Override
     public Image getIcon() {
         return switch (myScriptLanguage) {
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java
index fef896b3..c19e3856 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTStackFrame.java
@@ -13,8 +13,7 @@
 import consulo.execution.debug.frame.XValueChildrenList;
 import consulo.ui.ex.ColoredTextContainer;
 import consulo.ui.ex.SimpleTextAttributes;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
@@ -85,7 +84,7 @@ else if (myScript != null) {
     }
 
     @Override
-    public void computeChildren(@Nonnull XCompositeNode node) {
+    public void computeChildren(XCompositeNode node) {
         myProcess.invoke(devTools -> {
             List<Scope> scopeChain = myCallFrame.getScopeChain();
 
diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTSuspendContext.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTSuspendContext.java
index e5068a90..112b134b 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTSuspendContext.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTSuspendContext.java
@@ -3,7 +3,7 @@
 import com.github.kklisura.cdt.protocol.events.debugger.Paused;
 import consulo.execution.debug.frame.XExecutionStack;
 import consulo.execution.debug.frame.XSuspendContext;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
index 9b822207..0cd1b831 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
@@ -30,9 +30,8 @@
 import consulo.util.lang.ref.Ref;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.lang.xml.XMLLanguage;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.List;
 
 /**
@@ -43,7 +42,7 @@
 public class JSDebuggerSupportUtils
 {
 	@Nullable
-	public static TextRange getExpressionAtOffset(@Nonnull Project project, @Nonnull Document document, final int offset)
+	public static TextRange getExpressionAtOffset(Project project, Document document, final int offset)
 	{
 		PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(document);
 		if(file == null)
@@ -75,7 +74,7 @@ public static TextRange getExpressionAtOffset(@Nonnull Project project, @Nonnull
 				InjectedLanguageManager.getInstance(project).enumerate(psiLanguageInjectionHost, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
-					public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places)
+					public void visit(PsiFile injectedPsi, List<PsiLanguageInjectionHost.Shred> places)
 					{
 						PsiLanguageInjectionHost.Shred shred = places.get(0);
 						int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
@@ -146,7 +145,7 @@ public static Document createDocument(String text, Project project, @Nullable Vi
 	}
 
 	@Nullable
-	public static PsiElement getContextElement(VirtualFile virtualFile, int offset, @Nonnull Project project)
+	public static PsiElement getContextElement(VirtualFile virtualFile, int offset, Project project)
 	{
 		Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
 		PsiFile file = PsiManager.getInstance(project).findFile(virtualFile);
@@ -197,7 +196,7 @@ public static PsiElement getContextElement(VirtualFile virtualFile, int offset,
 				InjectedLanguageManager.getInstance(project).enumerate(parent, new PsiLanguageInjectionHost.InjectedPsiVisitor()
 				{
 					@Override
-					public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places)
+					public void visit(PsiFile injectedPsi, List<PsiLanguageInjectionHost.Shred> places)
 					{
 						PsiLanguageInjectionHost.Shred shred = places.get(0);
 						int injectedStart = shred.getRangeInsideHost().getStartOffset() + shred.getHost().getTextOffset();
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
index 174b2797..5e6e47f4 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptEditorsProvider.java
@@ -16,7 +16,6 @@
 
 package consulo.javascript.debugger;
 
-import jakarta.annotation.Nonnull;
 import consulo.javascript.language.JavaScriptFileType;
 import consulo.javascript.impl.language.psi.JSElementFactory;
 import consulo.execution.debug.evaluation.XDebuggerEditorsProviderBase;
@@ -24,7 +23,7 @@
 import consulo.project.Project;
 import consulo.language.psi.PsiFile;
 import consulo.virtualFileSystem.fileType.FileType;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -35,12 +34,11 @@ public class JavaScriptEditorsProvider extends XDebuggerEditorsProviderBase
 	public static final JavaScriptEditorsProvider INSTANCE = new JavaScriptEditorsProvider();
 
 	@Override
-	protected PsiFile createExpressionCodeFragment(@Nonnull Project project, @Nonnull String text, @Nullable PsiElement element, boolean isPhysical)
+	protected PsiFile createExpressionCodeFragment(Project project, String text, @Nullable PsiElement element, boolean isPhysical)
 	{
 		return JSElementFactory.createExpressionCodeFragment(project, text, element, isPhysical);
 	}
 
-	@Nonnull
 	@Override
 	public FileType getFileType()
 	{
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptFileInfo.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptFileInfo.java
index beb65238..c2733a66 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptFileInfo.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptFileInfo.java
@@ -3,18 +3,15 @@
 import consulo.navigation.Navigatable;
 import consulo.ui.color.ColorValue;
 import consulo.ui.image.Image;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
  * @since 2026-02-16
  */
 public interface JavaScriptFileInfo extends Navigatable {
-    @Nonnull
     String getPath();
 
-    @Nonnull
     Image getIcon();
 
     @Nullable
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
index 1754d81c..a90822a7 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointType.java
@@ -26,8 +26,7 @@
 import consulo.project.Project;
 import consulo.virtualFileSystem.fileType.FileType;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -36,7 +35,6 @@
 @ExtensionImpl
 public class JavaScriptLineBreakpointType extends XLineBreakpointTypeBase
 {
-	@Nonnull
 	public static JavaScriptLineBreakpointType getInstance()
 	{
 		return EXTENSION_POINT_NAME.findExtensionOrFail(JavaScriptLineBreakpointType.class);
@@ -46,16 +44,14 @@ public JavaScriptLineBreakpointType()
 	{
 		super("javascript", "JavaScript Breakpoints", new XDebuggerEditorsProvider()
 		{
-			@Nonnull
 			@Override
 			public FileType getFileType()
 			{
 				return JavaScriptFileType.INSTANCE;
 			}
 
-			@Nonnull
 			@Override
-			public Document createDocument(@Nonnull Project project, @Nonnull String s, @Nullable XSourcePosition sourcePosition, @Nonnull EvaluationMode evaluationMode)
+			public Document createDocument(Project project, String s, @Nullable XSourcePosition sourcePosition, EvaluationMode evaluationMode)
 			{
 				return JSDebuggerSupportUtils.createDocument(s, project, sourcePosition == null ? null : sourcePosition.getFile(), sourcePosition == null ? 0 : sourcePosition.getOffset());
 			}
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
index e4911172..f1062585 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptLineBreakpointTypeResolver.java
@@ -24,9 +24,8 @@
 import consulo.project.Project;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.fileType.FileType;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -38,12 +37,11 @@ public class JavaScriptLineBreakpointTypeResolver implements XLineBreakpointType
 	@RequiredReadAction
 	@Nullable
 	@Override
-	public XLineBreakpointType<?> resolveBreakpointType(@Nonnull Project project, @Nonnull VirtualFile virtualFile, int line)
+	public XLineBreakpointType<?> resolveBreakpointType(Project project, VirtualFile virtualFile, int line)
 	{
 		return JavaScriptLineBreakpointType.getInstance();
 	}
 
-	@Nonnull
 	@Override
 	public FileType getFileType()
 	{
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
index 7ce337f2..f7fbce31 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JavaScriptListPanel.java
@@ -24,7 +24,6 @@
 import consulo.ui.ex.awt.SortedListModel;
 import consulo.ui.ex.awtUnsafe.TargetAWT;
 import consulo.util.io.FileUtil;
-import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -48,7 +47,7 @@ private void init() {
         final JBList<T> list = new JBList<>(myModel);
         list.setCellRenderer(new ColoredListCellRenderer<T>() {
             @Override
-            protected void customizeCellRenderer(@Nonnull JList<? extends T> list, T value, int index, boolean selected, boolean hasFocus) {
+            protected void customizeCellRenderer(JList<? extends T> list, T value, int index, boolean selected, boolean hasFocus) {
                 append(value.getPath());
 
                 setIcon(value.getIcon());
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
index c1edc2dc..a8600736 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
@@ -40,8 +40,7 @@
 import consulo.ui.ex.awt.UIUtil;
 import consulo.ui.ex.content.Content;
 import consulo.virtualFileSystem.VirtualFile;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.chromium.sdk.Breakpoint;
 import org.chromium.sdk.DebugContext;
 import org.chromium.sdk.JavascriptVm;
@@ -66,12 +65,12 @@ public abstract class V8BaseDebugProcess<V extends JavascriptVm> extends XDebugP
 
     private Map<Breakpoint, XLineBreakpoint> myBreakpoints = new HashMap<>();
 
-    public V8BaseDebugProcess(@Nonnull XDebugSession session, ExecutionResult result) throws ExecutionException {
+    public V8BaseDebugProcess(XDebugSession session, ExecutionResult result) throws ExecutionException {
         super(session);
         myScriptListPanel = new JavaScriptListPanel<Script>(session.getProject()) {
             @Nullable
             @Override
-            public VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen) {
+            public VirtualFile toVirtualFile(Script value, boolean toOpen) {
                 return V8ScriptUtil.toVirtualFile(value, toOpen);
             }
         };
@@ -91,13 +90,11 @@ public boolean checkCanPerformCommands() {
         return myVm != null && myVm.isAttached();
     }
 
-    @Nonnull
     @Override
     public XDebuggerEditorsProvider getEditorsProvider() {
         return JavaScriptEditorsProvider.INSTANCE;
     }
 
-    @Nonnull
     @Override
     public ExecutionConsole createConsole() {
         return myResult.getExecutionConsole();
@@ -108,13 +105,12 @@ public boolean checkCanInitBreakpoints() {
         return false;
     }
 
-    @Nonnull
     @Override
     public XBreakpointHandler<?>[] getBreakpointHandlers() {
         return new XBreakpointHandler[]{
             new XBreakpointHandler<XLineBreakpoint<XBreakpointProperties>>(JavaScriptLineBreakpointType.class) {
                 @Override
-                public void registerBreakpoint(@Nonnull final XLineBreakpoint lineBreakpoint) {
+                public void registerBreakpoint(final XLineBreakpoint lineBreakpoint) {
                     String presentableFilePath = lineBreakpoint.getPresentableFilePath();
                     int line = lineBreakpoint.getLine();
                     XExpression conditionExpression = lineBreakpoint.getConditionExpression();
@@ -134,7 +130,7 @@ public void failure(String s) {
                 }
 
                 @Override
-                public void unregisterBreakpoint(@Nonnull XLineBreakpoint breakpoint, boolean b) {
+                public void unregisterBreakpoint(XLineBreakpoint breakpoint, boolean b) {
                     String presentableFilePath = breakpoint.getPresentableFilePath();
                     myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), breakpoint.getLine(), Breakpoint.EMPTY_VALUE, false, null, null, null);
                 }
@@ -205,15 +201,14 @@ public void resume(@Nullable XSuspendContext context) {
     }
 
     @Override
-    public void runToPosition(@Nonnull XSourcePosition position, @Nullable XSuspendContext context) {
+    public void runToPosition(XSourcePosition position, @Nullable XSuspendContext context) {
     }
 
-    @Nonnull
     @Override
     public XDebugTabLayouter createTabLayouter() {
         return new XDebugTabLayouter() {
             @Override
-            public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui) {
+            public void registerAdditionalContent(RunnerLayoutUi ui) {
                 Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIconGroup.javascript(), null);
                 content.setCloseable(false);
 
@@ -222,7 +217,6 @@ public void registerAdditionalContent(@Nonnull RunnerLayoutUi ui) {
         };
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getCurrentStateMessage() {
         if (myVm == null) {
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
index 25d17828..5bcbabf0 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
@@ -20,8 +20,7 @@
 import consulo.execution.debug.frame.presentation.XValuePresentation;
 import consulo.execution.debug.icon.ExecutionDebugIconGroup;
 import consulo.ui.image.Image;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.chromium.sdk.*;
 
 import java.util.Collection;
@@ -31,19 +30,17 @@
  * @since 20.03.14
  */
 public abstract class V8BaseVariableValue extends XNamedValue {
-    @Nonnull
     protected final JsEvaluateContext myEvaluateContext;
 
-    protected V8BaseVariableValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull String name) {
+    protected V8BaseVariableValue(JsEvaluateContext evaluateContext, String name) {
         super(name);
         myEvaluateContext = evaluateContext;
     }
 
-    @Nonnull
     protected abstract JsValue getValue();
 
     @Override
-    public void computeChildren(@Nonnull XCompositeNode node) {
+    public void computeChildren(XCompositeNode node) {
         XValueChildrenList valueChildrenList = new XValueChildrenList();
 
         JsValue value = getValue();
@@ -62,7 +59,6 @@ else if (value instanceof JsObject) {
         node.addChildren(valueChildrenList, true);
     }
 
-    @Nonnull
     protected Image getIconForValue(JsValue value, JsValue.Type valueType) {
         if (value instanceof JsArray) {
             return ExecutionDebugIconGroup.nodeArray();
@@ -96,7 +92,7 @@ private static boolean canHaveChildren(JsValue value, JsValue.Type valueType) {
     }
 
     @Override
-    public void computePresentation(@Nonnull XValueNode valueNode, @Nonnull XValuePlace xValuePlace) {
+    public void computePresentation(XValueNode valueNode, XValuePlace xValuePlace) {
         final JsValue value = getValue();
         final JsValue.Type valueType = value.getType();
 
@@ -125,7 +121,7 @@ else if (value instanceof JsObject) {
             }
 
             @Override
-            public void renderValue(@Nonnull XValueTextRenderer textRenderer) {
+            public void renderValue(XValueTextRenderer textRenderer) {
                 switch (value.getType()) {
                     case TYPE_NUMBER:
                         textRenderer.renderValue(value.getValueString());
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
index 7abd4ab7..9bbdce69 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
@@ -22,7 +22,6 @@
 import consulo.execution.debug.localize.XDebuggerLocalize;
 import consulo.localize.LocalizeValue;
 import consulo.process.ExecutionException;
-import jakarta.annotation.Nonnull;
 import org.chromium.sdk.JavascriptVmFactory;
 import org.chromium.sdk.StandaloneVm;
 
@@ -34,7 +33,7 @@
  */
 @UsedInPlugin
 public class V8DebugProcess extends V8BaseDebugProcess<StandaloneVm> {
-    public V8DebugProcess(@Nonnull XDebugSession session, ExecutionResult result, int port) throws ExecutionException {
+    public V8DebugProcess(XDebugSession session, ExecutionResult result, int port) throws ExecutionException {
         super(session, result);
 
         myVm = JavascriptVmFactory.getInstance().createStandalone(new InetSocketAddress("localhost", port), null);
@@ -45,7 +44,6 @@ public void attach() throws Exception {
         myVm.attach(new V8DebugEventListener(this));
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getCurrentStateMessage() {
         if (myVm == null) {
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
index 3ee5e58b..e7bf3d3a 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
@@ -18,7 +18,7 @@
 
 import consulo.execution.debug.frame.XExecutionStack;
 import consulo.execution.debug.frame.XStackFrame;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.chromium.sdk.CallFrame;
 import org.chromium.sdk.DebugContext;
 
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
index 99597f63..d89dac4a 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
@@ -24,7 +24,6 @@
 import consulo.util.dataholder.Key;
 import org.chromium.sdk.Script;
 
-import jakarta.annotation.Nonnull;
 import java.io.File;
 
 /**
@@ -35,8 +34,7 @@ public class V8ScriptUtil
 {
 	private static final Key<Object> SOME_VALUE_TO_EQUALS = Key.create("some-value-to-equals");
 
-	@Nonnull
-	public static VirtualFile toVirtualFile(@Nonnull Script value, boolean toOpen)
+	public static VirtualFile toVirtualFile(Script value, boolean toOpen)
 	{
 		String scriptName = value.getName();
 		assert scriptName != null;
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
index b4699719..f2577b7f 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
@@ -25,8 +25,7 @@
 import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.ex.ColoredTextContainer;
 import consulo.ui.ex.SimpleTextAttributes;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.chromium.sdk.*;
 
 import java.util.Collections;
@@ -48,7 +47,7 @@ public V8StackFrame(CallFrame callFrame) {
     public XDebuggerEvaluator getEvaluator() {
         return new XDebuggerEvaluator() {
             @Override
-            public void evaluate(@Nonnull final String expression, @Nonnull final XEvaluationCallback callback, @Nullable XSourcePosition expressionPosition) {
+            public void evaluate(final String expression, final XEvaluationCallback callback, @Nullable XSourcePosition expressionPosition) {
                 final JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
                 evaluateContext.evaluateSync(expression, Collections.<String, JsValue>emptyMap(), new JsEvaluateContext.EvaluateCallback() {
                     @Override
@@ -77,7 +76,7 @@ public boolean isCodeFragmentEvaluationSupported() {
     }
 
     @Override
-    public void computeChildren(@Nonnull XCompositeNode node) {
+    public void computeChildren(XCompositeNode node) {
         JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
         List<? extends JsScope> variableScopes = myCallFrame.getVariableScopes();
 
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
index 67e97114..e2cd098f 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
@@ -20,7 +20,7 @@
 import consulo.execution.debug.frame.XSuspendContext;
 import org.chromium.sdk.DebugContext;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
index e8fd3c90..175c2040 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
@@ -20,8 +20,7 @@
 import consulo.execution.debug.frame.XValueModifier;
 import org.chromium.sdk.*;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -29,7 +28,7 @@
  */
 public class V8VariableValue extends V8BaseVariableValue
 {
-	public static void addValue(@Nonnull XValueChildrenList valueChildrenList, @Nonnull JsEvaluateContext debugContext, @Nonnull JsVariable jsVariable)
+	public static void addValue(XValueChildrenList valueChildrenList, JsEvaluateContext debugContext, JsVariable jsVariable)
 	{
 		JsValue value = jsVariable.getValue();
 		if(value instanceof JsFunction)
@@ -41,7 +40,7 @@ public static void addValue(@Nonnull XValueChildrenList valueChildrenList, @Nonn
 
 	private JsVariable myJsVariable;
 
-	public V8VariableValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull JsVariable jsVariable)
+	public V8VariableValue(JsEvaluateContext evaluateContext, JsVariable jsVariable)
 	{
 		super(evaluateContext, jsVariable.getName());
 		myJsVariable = jsVariable;
@@ -71,7 +70,7 @@ public XValueModifier getModifier()
 				return new XValueModifier()
 				{
 					@Override
-					public void setValue(@Nonnull String expression, @Nonnull final XModificationCallback callback)
+					public void setValue(String expression, final XModificationCallback callback)
 					{
 						JsEvaluateContext.PrimitiveValueFactory valueFactory = myEvaluateContext.getValueFactory();
 						JsValue value = null;
@@ -146,7 +145,6 @@ public void calculateInitialValueEditorText(XInitialValueCallback callback)
 		}
 	}
 
-	@Nonnull
 	@Override
 	protected JsValue getValue()
 	{
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
index 3014c12f..9e989ef7 100644
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
+++ b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
@@ -18,7 +18,6 @@
 
 import consulo.execution.debug.icon.ExecutionDebugIconGroup;
 import consulo.ui.image.Image;
-import jakarta.annotation.Nonnull;
 import org.chromium.sdk.JsEvaluateContext;
 import org.chromium.sdk.JsValue;
 
@@ -29,18 +28,16 @@
 public class V8WatchValue extends V8BaseVariableValue {
     private JsValue myValue;
 
-    public V8WatchValue(@Nonnull JsEvaluateContext evaluateContext, @Nonnull String text, @Nonnull JsValue value) {
+    public V8WatchValue(JsEvaluateContext evaluateContext, String text, JsValue value) {
         super(evaluateContext, text);
         myValue = value;
     }
 
-    @Nonnull
     @Override
     protected Image getIconForValue(JsValue value, JsValue.Type valueType) {
         return ExecutionDebugIconGroup.nodeWatch();
     }
 
-    @Nonnull
     @Override
     protected JsValue getValue() {
         return myValue;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
index 1b756f09..0c3f6f3a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspection.java
@@ -14,15 +14,13 @@
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public abstract class BaseInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool {
     @Override
-    @Nonnull
     @SuppressWarnings("unchecked")
     public PsiElementVisitor buildVisitor(
-        @Nonnull ProblemsHolder problemsHolder,
+        ProblemsHolder problemsHolder,
         boolean onTheFly,
         LocalInspectionToolSession session,
         Object state
@@ -45,13 +43,12 @@ public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
     }
 
-    @Nonnull
     @Override
     public HighlightDisplayLevel getDefaultLevel() {
         return HighlightDisplayLevel.WARNING;
     }
 
-    public boolean canBuildVisitor(@Nonnull PsiFile psiFile) {
+    public boolean canBuildVisitor(PsiFile psiFile) {
         return true;
     }
 
@@ -95,7 +92,7 @@ public SuppressIntentionAction[] getSuppressActions(@Nullable PsiElement element
     }
 
     @Override
-    public boolean isSuppressedFor(@Nonnull PsiElement element) {
+    public boolean isSuppressedFor(PsiElement element) {
         return SuppressionUtil.isSuppressedInStatement(element, getID(), JSSuppressionHolder.class);
     }
 }
\ No newline at end of file
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
index 09f6029b..6f20bd84 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/BaseInspectionVisitor.java
@@ -6,8 +6,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.util.PsiTreeUtil;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
@@ -99,7 +98,7 @@ protected ProblemHighlightType getProblemHighlightType(PsiElement location) {
         return ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
     }
 
-    protected PsiElement getEditorErrorLocation(@Nonnull PsiElement location) {
+    protected PsiElement getEditorErrorLocation(PsiElement location) {
         return location;
     }
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
index bb629d9a..6dac231b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/InspectionJSFix.java
@@ -17,12 +17,11 @@
 import consulo.virtualFileSystem.ReadonlyStatusHandler;
 import consulo.virtualFileSystem.VirtualFile;
 
-import jakarta.annotation.Nonnull;
 
 public abstract class InspectionJSFix implements LocalQuickFix {
     @Override
     @RequiredUIAccess
-    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+    public void applyFix(Project project, ProblemDescriptor descriptor) {
         PsiElement problemElement = descriptor.getPsiElement();
         if (problemElement == null || !problemElement.isValid()) {
             return;
@@ -43,7 +42,7 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri
 
     protected abstract void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException;
 
-    protected static void deleteElement(@Nonnull PsiElement element)
+    protected static void deleteElement(PsiElement element)
         throws IncorrectOperationException {
         ASTNode node = element.getNode();
         ASTNode parent = element.getParent().getNode();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
index 9774695d..76424dd5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentResultUsedJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class AssignmentResultUsedJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.resultOfAssignmentUsedDisplayname();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
@@ -40,7 +37,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression jsAssignmentExpression) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpression) {
             super.visitJSAssignmentExpression(jsAssignmentExpression);
             PsiElement parent = jsAssignmentExpression.getParent();
             if (parent == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
index ccf261d2..daaf113d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToForLoopParameterJSInspection.java
@@ -11,17 +11,14 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class AssignmentToForLoopParameterJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.assignmentToForLoopParameterDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
@@ -41,7 +38,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor extends BaseInspectionVisitor {
         @Override
         @RequiredReadAction
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
             JSExpression rhs = expression.getROperand();
             if (rhs == null) {
@@ -54,7 +51,7 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expressi
 
         @Override
         @RequiredReadAction
-        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) &&
@@ -71,7 +68,7 @@ public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
 
         @Override
         @RequiredReadAction
-        public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
+        public void visitJSPostfixExpression(JSPostfixExpression expression) {
             super.visitJSPostfixExpression(expression);
             IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
index 09ea81be..4a734819 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/AssignmentToFunctionParameterJSInspection.java
@@ -10,18 +10,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class AssignmentToFunctionParameterJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.assignmentToFunctionParameterDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
@@ -42,7 +39,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor extends BaseInspectionVisitor {
         @Override
         @RequiredReadAction
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression jsAssignmentExpression) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression jsAssignmentExpression) {
             super.visitJSAssignmentExpression(jsAssignmentExpression);
             JSExpression lhs = jsAssignmentExpression.getLOperand();
             checkOperand(lhs);
@@ -50,7 +47,7 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression jsAssign
 
         @Override
         @RequiredReadAction
-        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             IElementType sign = expression.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
@@ -62,7 +59,7 @@ public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
 
         @Override
         @RequiredReadAction
-        public void visitJSPostfixExpression(@Nonnull JSPostfixExpression postfixExpr) {
+        public void visitJSPostfixExpression(JSPostfixExpression postfixExpr) {
             super.visitJSPostfixExpression(postfixExpr);
             IElementType sign = postfixExpr.getOperationSign();
             if (!JSTokenTypes.PLUSPLUS.equals(sign) && !JSTokenTypes.MINUSMINUS.equals(sign)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
index f35dd09a..3d7b4dc7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/NestedAssignmentJSInspection.java
@@ -9,23 +9,19 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NestedAssignmentJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.nestedAssignmentDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -39,7 +35,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class NestedAssignmentVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
             super.visitJSAssignmentExpression(expression);
             PsiElement parent = expression.getParent();
             if (parent == null || !(parent instanceof JSAssignmentExpression)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
index 6b41de8d..adf73389 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/ReplaceAssignmentWithOperatorAssignmentJSInspection.java
@@ -21,27 +21,23 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 import java.util.Map;
 
 @ExtensionImpl
 public class ReplaceAssignmentWithOperatorAssignmentJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "AssignmentReplaceableWithOperatorAssignmentJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.assignmentReplaceableWithOperatorAssignmentDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
@@ -78,7 +74,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class ReplaceAssignmentWithOperatorAssignmentFix extends InspectionJSFix {
-        @Nonnull
         private final LocalizeValue myName;
 
         @RequiredReadAction
@@ -91,7 +86,6 @@ private ReplaceAssignmentWithOperatorAssignmentFix(JSAssignmentExpression expres
             myName = InspectionJSLocalize.replaceWithOperatorAssignFix(signText);
         }
 
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return myName;
@@ -109,7 +103,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
     private static class ReplaceAssignmentWithOperatorAssignmentVisitor extends BaseInspectionVisitor {
         @Override
         @RequiredReadAction
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
 
             IElementType sign = assignment.getOperationSign();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
index 52065941..85e686b0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/assignment/SillyAssignmentJSInspection.java
@@ -15,17 +15,14 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class SillyAssignmentJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.sillyAssignmentDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ASSIGNMENT_GROUP_NAME;
@@ -50,7 +47,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class Visitor extends BaseInspectionVisitor {
         @Override
         @RequiredReadAction
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
 
             IElementType sign = assignment.getOperationSign();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
index ab4fbdc1..45bbee92 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/IncompatibleMaskJSInspection.java
@@ -14,31 +14,26 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class IncompatibleMaskJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "IncompatibleBitwiseMaskOperation";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.incompatibleMaskOperationDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -65,7 +60,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class IncompatibleMaskVisitor extends BaseInspectionVisitor {
         @Override
         @RequiredReadAction
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             JSExpression rhs = expression.getROperand();
             if (!ComparisonUtils.isEqualityComparison(expression)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
index 829c5838..ab0ab473 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspection.java
@@ -19,7 +19,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 import java.util.Set;
 
@@ -34,19 +33,16 @@ public class PointlessBitwiseExpressionJSInspection extends JavaScriptInspection
         JSTokenTypes.GTGTGT
     );
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.pointlessBitwiseExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -60,7 +56,6 @@ public boolean isEnabledByDefault() {
         return true;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new PointlessBitwiseExpressionJSInspectionState();
@@ -130,7 +125,6 @@ public PointlessBitwiseFix(Object state) {
             myState = (PointlessBitwiseExpressionJSInspectionState)state;
         }
 
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.pointlessBitwiseExpressionSimplifyQuickfix();
@@ -148,7 +142,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
     private class PointlessBitwiseVisitor extends BaseInspectionVisitor<PointlessBitwiseExpressionJSInspectionState> {
         @Override
         @RequiredReadAction
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             IElementType sign = expression.getOperationSign();
             if (!OUR_BITWISE_TOKENS.contains(sign)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
index cce1aa1a..0b3ab727 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/PointlessBitwiseExpressionJSInspectionState.java
@@ -7,7 +7,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
index 53040635..d2eb91bc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bitwise/ShiftOutOfRangeJSInspection.java
@@ -12,23 +12,19 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ShiftOutOfRangeJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.shiftOperationByInappropriateConstantDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BITWISE_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -50,7 +46,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class ShiftOutOfRange extends BaseInspectionVisitor {
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             IElementType tokenType = expression.getOperationSign();
             if (tokenType == null || (!JSTokenTypes.LTLT.equals(tokenType)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
index 309e40c5..26c1d23a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/DivideByZeroJSInspection.java
@@ -12,32 +12,26 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class DivideByZeroJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "DivideByZeroJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.divideByZeroDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -51,7 +45,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class DivisionByZeroVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             JSExpression rhs = expression.getROperand();
             if (rhs == null) {
@@ -88,7 +82,7 @@ public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
     }
 
     private static boolean isZero(JSExpression expression) {
-        @NonNls String text = expression.getText();
+        String text = expression.getText();
         return "0".equals(text)
             || "0x0".equals(text)
             || "0X0".equals(text)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
index 09b7c961..8d3b0a1d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/EqualityComparisonWithCoercionJSInspection.java
@@ -16,32 +16,26 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class EqualityComparisonWithCoercionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "EqualityComparisonWithCoercionJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.equalityComparisonWithCoercionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -69,7 +63,6 @@ public EqualityComparisonWithCoercionFix(String sign) {
         }
 
         @Override
-        @Nonnull
         public LocalizeValue getName() {
             return InspectionJSLocalize.equalityComparisonWithCoercionFix(sign);
         }
@@ -90,7 +83,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class EqualityComparisonWithCoercionVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             JSExpression lhs = expression.getLOperand();
             if (lhs == null) {
@@ -112,7 +105,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
     }
 
     private static boolean mayCauseCoercion(JSExpression expression) {
-        @NonNls String text = expression.getText();
+        String text = expression.getText();
         return "0".equals(text)
             || "0x0".equals(text)
             || "0X0".equals(text)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
index 20da4d90..30e0117e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteLoopJSInspection.java
@@ -11,17 +11,14 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class InfiniteLoopJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.infiniteLoopStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
@@ -45,7 +42,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSForStatement(@Nonnull JSForStatement statement) {
+        public void visitJSForStatement(JSForStatement statement) {
             super.visitJSForStatement(statement);
             if (ControlFlowUtils.statementMayCompleteNormally(statement)) {
                 return;
@@ -57,7 +54,7 @@ public void visitJSForStatement(@Nonnull JSForStatement statement) {
         }
 
         @Override
-        public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+        public void visitJSWhileStatement(JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
             if (ControlFlowUtils.statementMayCompleteNormally(statement)
                 || ControlFlowUtils.statementContainsReturn(statement)) {
@@ -67,7 +64,7 @@ public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
         }
 
         @Override
-        public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+        public void visitJSDoWhileStatement(JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
             if (ControlFlowUtils.statementMayCompleteNormally(statement)
                 || ControlFlowUtils.statementContainsReturn(statement)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
index 0cd3d4a2..1bc0f9c4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/InfiniteRecursionJSInspection.java
@@ -8,23 +8,19 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class InfiniteRecursionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.infiniteRecursionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -43,7 +39,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class InfiniteRecursionVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        public void visitJSFunctionDeclaration(JSFunction function) {
             super.visitJSFunctionDeclaration(function);
 
             if (!RecursionUtils.functionMayRecurse(function)
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
index 55ffa13b..d5e6fed9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/NonShortCircuitBooleanExpressionJSInspection.java
@@ -16,18 +16,15 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class NonShortCircuitBooleanExpressionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
         public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.nonShortCircuitBooleanExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
@@ -46,7 +43,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class NonShortCircuitBooleanFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.replaceWithShortCircuitExpressionFixString();
@@ -75,7 +71,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class NonShortCircuitBooleanVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
index f262ec1b..f1c160db 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/ObjectAllocationIgnoredJSInspection.java
@@ -10,31 +10,26 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ObjectAllocationIgnoredJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ObjectAllocationIgnored";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.resultOfObjectAllocationIgnoredDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -48,7 +43,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class ObjectAllocationIgnoredVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSExpressionStatement(@Nonnull JSExpressionStatement statement) {
+        public void visitJSExpressionStatement(JSExpressionStatement statement) {
             super.visitJSExpressionStatement(statement);
             if (!(statement.getExpression()instanceof JSNewExpression)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
index 354f7115..9d9b7dc9 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionUtils.java
@@ -1,6 +1,5 @@
 package com.sixrr.inspectjs.bugs;
 
-import jakarta.annotation.Nonnull;
 
 import consulo.language.ast.IElementType;
 import com.intellij.lang.javascript.psi.*;
@@ -172,7 +171,7 @@ private static boolean codeBlockMayReturnBeforeRecursing(JSBlockStatement block,
         return endsInImplicitReturn;
     }
 
-    public static boolean functionMayRecurse(@Nonnull JSFunction function) {
+    public static boolean functionMayRecurse(JSFunction function) {
         RecursionVisitor recursionVisitor = new RecursionVisitor(function);
         function.accept(recursionVisitor);
         return recursionVisitor.isRecursive();
@@ -451,7 +450,7 @@ private static boolean labeledStatementDefinitelyRecurses(JSLabeledStatement lab
         return statementDefinitelyRecurses(body, function);
     }
 
-    public static boolean functionDefinitelyRecurses(@Nonnull JSFunction function) {
+    public static boolean functionDefinitelyRecurses(JSFunction function) {
         JSSourceElement[] body = function.getBody();
         if (body == null) {
             return false;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
index fb18b567..2d4a8d7e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/RecursionVisitor.java
@@ -3,7 +3,6 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.PsiElement;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import jakarta.annotation.Nonnull;
 
 public class RecursionVisitor extends JSRecursiveElementVisitor {
 
@@ -11,21 +10,21 @@ public class RecursionVisitor extends JSRecursiveElementVisitor {
     private final JSFunction function;
     private String functionName;
 
-    public RecursionVisitor(@Nonnull JSFunction function) {
+    public RecursionVisitor(JSFunction function) {
         super();
         this.function = function;
         functionName = function.getName();
     }
 
     @Override
-    public void visitElement(@Nonnull PsiElement element) {
+    public void visitElement(PsiElement element) {
         if (!recursive) {
             super.visitElement(element);
         }
     }
 
     @Override
-    public void visitJSCallExpression(@Nonnull JSCallExpression call) {
+    public void visitJSCallExpression(JSCallExpression call) {
         if (recursive) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
index bbad0d12..194ae74c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/bugs/TextLabelInSwitchStatementJSInspection.java
@@ -12,23 +12,19 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class TextLabelInSwitchStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.textLabelInSwitchStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -42,7 +38,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class TextLabelInSwitchStatementVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
+        public void visitJSSwitchStatement(JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
             JSCaseClause[] caseClauses = statement.getCaseClauses();
             for (JSCaseClause caseClause : caseClauses) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
index 7f62d480..915c1391 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/AnonymousFunctionJSInspection.java
@@ -11,18 +11,15 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class AnonymousFunctionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.anonymousFunctionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
index b7af7c48..33afe38b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/BlockStatementJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class BlockStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.unnecessaryBlockStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
index 117f2a67..a62b1fc7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CallerJSInspection.java
@@ -8,18 +8,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class CallerJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.callerDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
index ace1a064..c7d96bbb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/CommaExpressionJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class CommaExpressionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.commaExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
index ddda634f..29a9423d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConditionalExpressionJSInspection.java
@@ -8,8 +8,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class ConditionalExpressionJSInspection extends JavaScriptInspection {
@@ -18,13 +17,11 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.conditionalExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
index a2a7327a..c4165766 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingFloatingPointLiteralJSInspection.java
@@ -15,7 +15,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -24,19 +23,16 @@
 public class ConfusingFloatingPointLiteralJSInspection extends JavaScriptInspection {
     private static final Pattern PICKY_FLOATING_POINT_PATTERN = Pattern.compile("[0-9]+\\.[0-9]+((e|E)(-)?[0-9]+)?(f|F|d|D)?");
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.confusingFloatingPointLiteralDisplayName();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -49,7 +45,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class ConfusingFloatingPointLiteralFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.confusingFloatingPointLiteralChangeQuickfix();
@@ -120,7 +115,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class ConfusingFloatingPointLiteralVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression literal) {
+        public void visitJSLiteralExpression(JSSimpleLiteralExpression literal) {
             super.visitJSLiteralExpression(literal);
             String text = literal.getText();
             if (text == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
index ec38242f..e4f6c11a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/ConfusingPlusesOrMinusesJSInspection.java
@@ -13,18 +13,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class ConfusingPlusesOrMinusesJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.confusingPlusesOrMinusesDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
index 05975f76..9cbbccd8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/DynamicallyGeneratedCodeJSInspection.java
@@ -11,19 +11,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class DynamicallyGeneratedCodeJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.dynamicallyGeneratedCodeDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
@@ -58,7 +54,7 @@ public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             JSReferenceExpression referenceExpression = (JSReferenceExpression)methodExpression;
             JSExpression qualifier = referenceExpression.getQualifier();
 
-            @NonNls String methodName = referenceExpression.getReferencedName();
+            String methodName = referenceExpression.getReferencedName();
             if (!"eval".equals(methodName) && !"setTimeout".equals(methodName) && !"setInterval".equals(methodName)) {
                 return;
             }
@@ -84,7 +80,7 @@ public void visitJSNewExpression(JSNewExpression jsNewExpression) {
             if (qualifier != null) {
                 return;
             }
-            @NonNls String methodName = referenceExpression.getReferencedName();
+            String methodName = referenceExpression.getReferencedName();
             if (!"Function".equals(methodName)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
index 7714ec9d..6d970f75 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspection.java
@@ -9,25 +9,21 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class EmptyStatementBodyJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "StatementWithEmptyBodyJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.statementWithEmptyBodyDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
@@ -46,7 +42,6 @@ public String buildErrorString(Object state, Object... args) {
             : InspectionJSLocalize.statementHasEmptyBodyErrorString().get();
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new EmptyStatementBodyJSInspectionState();
@@ -59,7 +54,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class EmptyStatementVisitor extends BaseInspectionVisitor<EmptyStatementBodyJSInspectionState> {
         @Override
-        public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+        public void visitJSDoWhileStatement(JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
 
             JSStatement body = statement.getBody();
@@ -73,7 +68,7 @@ public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
         }
 
         @Override
-        public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+        public void visitJSWhileStatement(JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
 
             JSStatement body = statement.getBody();
@@ -87,7 +82,7 @@ public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
         }
 
         @Override
-        public void visitJSForStatement(@Nonnull JSForStatement statement) {
+        public void visitJSForStatement(JSForStatement statement) {
             super.visitJSForStatement(statement);
 
             JSStatement body = statement.getBody();
@@ -101,7 +96,7 @@ public void visitJSForStatement(@Nonnull JSForStatement statement) {
         }
 
         @Override
-        public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+        public void visitJSForInStatement(JSForInStatement statement) {
             super.visitJSForInStatement(statement);
 
             JSStatement body = statement.getBody();
@@ -115,7 +110,7 @@ public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
         }
 
         @Override
-        public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+        public void visitJSIfStatement(JSIfStatement statement) {
             super.visitJSIfStatement(statement);
 
             JSStatement thenBranch = statement.getThen();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
index f582848e..c2901aaa 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/EmptyStatementBodyJSInspectionState.java
@@ -7,7 +7,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
index 841e6046..e237fd30 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/IncrementDecrementResultUsedJSInspection.java
@@ -11,18 +11,15 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class IncrementDecrementResultUsedJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.resultOfIncrementOrDecrementUsedDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
index 1ee75ef9..5a10eef5 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/MagicNumberJSInspection.java
@@ -11,7 +11,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 import java.util.Set;
 
@@ -30,19 +29,16 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.magicNumberDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -61,7 +57,7 @@ public BaseInspectionVisitor buildVisitor() {
     private static class MagicNumberVisitor extends BaseInspectionVisitor {
         @Override
         @RequiredReadAction
-        public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression expression) {
+        public void visitJSLiteralExpression(JSSimpleLiteralExpression expression) {
             super.visitJSLiteralExpression(expression);
 
             String text = expression.getText();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
index 6b8989cf..e9b65a12 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedConditionalExpressionJSInspection.java
@@ -19,20 +19,17 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class NegatedConditionalExpressionJSInspection extends JavaScriptInspection {
     private final NegatedConditionalFix fix = new NegatedConditionalFix();
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.negatedConditionalExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
@@ -51,7 +48,6 @@ protected InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class NegatedConditionalFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.invertConditionFix();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
index 42df60f5..103006d7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NegatedIfStatementJSInspection.java
@@ -21,21 +21,17 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class NegatedIfStatementJSInspection extends JavaScriptInspection {
     private final NegatedIfElseFix fix = new NegatedIfElseFix();
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.negatedIfStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
@@ -59,7 +55,6 @@ protected InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class NegatedIfElseFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.invertIfConditionFix();
@@ -83,7 +78,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
                     elseText += '\n';
                 }
             }
-            @NonNls String newStatement = "if(" + negatedCondition + ')' + elseText + " else " + thenBranch.getText();
+            String newStatement = "if(" + negatedCondition + ')' + elseText + " else " + thenBranch.getText();
             replaceStatement(ifStatement, newStatement);
         }
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
index 192b4edf..bcad3a8c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedConditionalExpressionJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class NestedConditionalExpressionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.nestedConditionalExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
index e85927f6..2698111b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspection.java
@@ -12,18 +12,15 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class NestedFunctionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.nestedFunctionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
@@ -40,7 +37,6 @@ protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.nestedAnonymousFunctionErrorString().get();
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new NestedFunctionJSInspectionState();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
index c90fcd28..6c392f3d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/NestedFunctionJSInspectionState.java
@@ -6,7 +6,7 @@
 import consulo.configurable.UnnamedConfigurable;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
index 18c06c70..da7e1a4a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OctalIntegerJSInspection.java
@@ -8,19 +8,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class OctalIntegerJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.octalIntegerDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
@@ -42,7 +38,7 @@ private static class Visitor extends BaseInspectionVisitor {
         @Override
         public void visitJSLiteralExpression(JSSimpleLiteralExpression jsLiteralExpression) {
             super.visitJSLiteralExpression(jsLiteralExpression);
-            @NonNls String text = jsLiteralExpression.getText();
+            String text = jsLiteralExpression.getText();
             if (text.startsWith("0") && !"0".equals(text)
                 && !text.startsWith("0x") && !text.startsWith("0X")
                 && !text.contains(".") && !text.contains("e") && !text.contains("E"))
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
index 8800159d..c9e76827 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspection.java
@@ -11,7 +11,6 @@
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 import java.util.Set;
 
@@ -25,19 +24,16 @@ public class OverlyComplexArithmeticExpressionJSInspection extends JavaScriptIns
         JSTokenTypes.PERC
     );
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.overlyComplexArithmeticExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new OverlyComplexArithmeticExpressionJSInspectionState();
@@ -57,21 +53,21 @@ public BaseInspectionVisitor buildVisitor() {
     private class Visitor extends BaseInspectionVisitor<OverlyComplexArithmeticExpressionJSInspectionState> {
         @Override
         @RequiredReadAction
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             checkExpression(expression);
         }
 
         @Override
         @RequiredReadAction
-        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             checkExpression(expression);
         }
 
         @Override
         @RequiredReadAction
-        public void visitJSParenthesizedExpression(@Nonnull JSParenthesizedExpression expression) {
+        public void visitJSParenthesizedExpression(JSParenthesizedExpression expression) {
             super.visitJSParenthesizedExpression(expression);
             checkExpression(expression);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
index 7d2cb32f..a82673a0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexArithmeticExpressionJSInspectionState.java
@@ -8,7 +8,7 @@
 import consulo.ui.Label;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
index 4cdcfcb1..4ece6fc8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspection.java
@@ -15,23 +15,19 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class OverlyComplexBooleanExpressionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.overlyComplexBooleanExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new OverlyComplexBooleanExpressionJSInspectionState();
@@ -56,13 +52,13 @@ public BaseInspectionVisitor buildVisitor() {
     private class Visitor extends BaseInspectionVisitor<OverlyComplexBooleanExpressionJSInspectionState> {
 
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             checkExpression(expression);
         }
 
         @Override
-        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             checkExpression(expression);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java
index 5449eaf7..3644c03e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/OverlyComplexBooleanExpressionJSInspectionState.java
@@ -8,7 +8,7 @@
 import consulo.ui.Label;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
index f5257fea..2ef5d83d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessArithmeticExpressionJSInspection.java
@@ -17,8 +17,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -28,13 +26,11 @@ public class PointlessArithmeticExpressionJSInspection extends JavaScriptInspect
     private final PointlessArithmeticFix fix = new PointlessArithmeticFix();
 
     @Override
-    @Nonnull
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.pointlessArithmeticExpressionDisplayName();
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
     }
@@ -90,7 +86,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private class PointlessArithmeticFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.simplifyFix();
@@ -115,7 +110,7 @@ private class PointlessArithmeticVisitor extends BaseInspectionVisitor {
         }
 
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
@@ -171,7 +166,7 @@ private boolean divideExpressionIsPointless(JSExpression rhs) {
      * @noinspection FloatingPointEquality
      */
     private static boolean isZero(JSExpression expression) {
-        @NonNls String text = expression.getText();
+        String text = expression.getText();
         return text.equals("0")||
                 text.equals("0x0")||
                 text.equals("0X0")||
@@ -192,7 +187,7 @@ private static boolean isString(JSExpression expression) {
      * @noinspection FloatingPointEquality
      */
     private static boolean isOne(JSExpression expression) {
-        @NonNls String text = expression.getText();
+        String text = expression.getText();
         return text.equals("1") ||
                 text.equals("0x1") ||
                 text.equals("0X1") ||
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
index d98c595f..19182f49 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/PointlessBooleanExpressionJSInspection.java
@@ -20,9 +20,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -31,13 +29,11 @@
 public class PointlessBooleanExpressionJSInspection extends JavaScriptInspection {
     private final BooleanLiteralComparisonFix fix = new BooleanLiteralComparisonFix();
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.pointlessBooleanExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -120,7 +116,6 @@ private static String createStringForNegatedExpression(JSExpression exp) {
         }
     }
 
-    @NonNls
     private static String calculateSimplifiedPrefixExpression(JSPrefixExpression expression) {
         JSExpression operand = expression.getExpression();
         return isTrue(operand) ? "false" : "true";
@@ -132,7 +127,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private class BooleanLiteralComparisonFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.simplifyFix();
@@ -168,7 +162,7 @@ private class PointlessBooleanExpressionVisitor extends BaseInspectionVisitor {
         }
 
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
@@ -203,7 +197,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
         }
 
         @Override
-        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             super.visitJSPrefixExpression(expression);
             IElementType sign = expression.getOperationSign();
             if (sign == null) {
@@ -241,7 +235,7 @@ private static boolean isTrue(JSExpression expression) {
         if (expression == null || !(expression instanceof JSLiteralExpression)) {
             return false;
         }
-        @NonNls String text = expression.getText();
+        String text = expression.getText();
         return "true".equals(text);
     }
 
@@ -249,7 +243,7 @@ private static boolean isFalse(JSExpression expression) {
         if (expression == null || !(expression instanceof JSLiteralExpression)) {
             return false;
         }
-        @NonNls String text = expression.getText();
+        String text = expression.getText();
         return "false".equals(text);
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
index 388647ed..20f7bb02 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/VoidExpressionJSInspection.java
@@ -9,19 +9,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class VoidExpressionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.voidExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
@@ -48,7 +44,7 @@ public void visitJSPrefixExpression(JSPrefixExpression expression) {
             {
                 return;
             }
-            @NonNls String text = firstChild.getText();
+            String text = firstChild.getText();
             if (!"void".equals(text)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
index 09943822..ec62c818 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/confusing/WithStatementJSInspection.java
@@ -8,18 +8,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class WithStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.withStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONFUSING_GROUP_NAME;
@@ -39,7 +36,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSWithStatement(@Nonnull JSWithStatement statement) {
+        public void visitJSWithStatement(JSWithStatement statement) {
             super.visitJSWithStatement(statement);
             registerStatementError(statement);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
index 6132a168..0a9f5c38 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class BreakStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.breakStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -40,7 +37,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
+        public void visitJSBreakStatement(JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (statement.getParent() instanceof JSCaseClause) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
index a83c3bf8..ac15ce36 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/BreakStatementWithLabelJSInspection.java
@@ -8,18 +8,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class BreakStatementWithLabelJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.breakStatementWithLabelDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -38,7 +35,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
+        @Override public void visitJSBreakStatement(JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (statement.getLabel() == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
index 9a305356..d0d58034 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConditionalExpressionWithIdenticalBranchesJSInspection.java
@@ -15,19 +15,16 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConditionalExpressionWithIdenticalBranchesJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new CollapseConditional();
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.conditionalExpressionWithIdenticalBranchesDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -45,7 +42,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class CollapseConditional extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.collapseConditionalExpressionFix();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
index 2f19b654..278b28ef 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantConditionalExpressionJSInspection.java
@@ -15,17 +15,14 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConstantConditionalExpressionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.constantConditionalExpressionDisplayName();
@@ -43,7 +40,6 @@ public BaseInspectionVisitor buildVisitor() {
 
     @RequiredReadAction
     @Override
-    @Nonnull
     public String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.constantConditionalExpressionErrorString().get();
     }
@@ -67,7 +63,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class ConstantConditionalFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.simplifyFix();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
index c938877a..28a866fb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ConstantIfStatementJSInspection.java
@@ -16,23 +16,19 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ConstantIfStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.constantIfStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -50,7 +46,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class ConstantIfStatementFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.constantConditionalExpressionSimplifyQuickfix();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
index 5193b3cd..8e57badf 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.component.ExtensionImpl;
 
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class ContinueStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.continueStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -39,7 +36,7 @@ public BaseInspectionVisitor buildVisitor() {
     }
 
     private static class Visitor extends BaseInspectionVisitor {
-        @Override public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
+        @Override public void visitJSContinueStatement(JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             registerStatementError(statement);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
index 7e282523..5f289b61 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ContinueStatementWithLabelJSInspection.java
@@ -8,18 +8,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class ContinueStatementWithLabelJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.continueStatementWithLabelDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -39,7 +36,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
+        public void visitJSContinueStatement(JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             if (statement.getLabel() == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
index 39e7a9c3..e869485a 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DefaultNotLastCaseInSwitchJSInspection.java
@@ -9,23 +9,19 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class DefaultNotLastCaseInSwitchJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.defaultNotLastCaseInSwitchDisplayName();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -39,7 +35,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class DefaultNotLastCaseInSwitchVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
+        public void visitJSSwitchStatement(JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
             JSCaseClause[] caseClauses = statement.getCaseClauses();
             if (caseClauses == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
index 5a8a88b4..02806505 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/DuplicateConditionJSInspection.java
@@ -12,7 +12,6 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -20,13 +19,11 @@
 
 @ExtensionImpl
 public class DuplicateConditionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.duplicateConditionInIfStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -45,7 +42,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class DuplicateConditionVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+        public void visitJSIfStatement(JSIfStatement statement) {
             super.visitJSIfStatement(statement);
             PsiElement parent = statement.getParent();
             if (parent instanceof JSIfStatement) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
index 7c643d61..31e5aee6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/FallthroughInSwitchStatementJSInspection.java
@@ -12,18 +12,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class FallthroughInSwitchStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.fallThroughInSwitchStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
index c73ee53e..f5261432 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspection.java
@@ -17,39 +17,32 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class ForLoopReplaceableByWhileJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ForLoopReplaceableByWhile";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.forLoopReplaceableByWhileDisplayName();
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.forLoopReplaceableByWhileProblemDescriptor().get();
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new ForLoopReplaceableByWhileJSInspectionState();
@@ -61,7 +54,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class ReplaceForByWhileFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.forLoopReplaceableByWhileReplaceQuickfix();
@@ -75,7 +67,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
             JSExpression condition = forStatement.getCondition();
             JSStatement body = forStatement.getBody();
             String bodyText = body == null ? "" : body.getText();
-            @NonNls String whileStatement;
+            String whileStatement;
             if (condition == null) {
                 whileStatement = "while(true)" + bodyText;
             }
@@ -93,7 +85,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class ForLoopReplaceableByWhileVisitor extends BaseInspectionVisitor<ForLoopReplaceableByWhileJSInspectionState> {
         @Override
-        public void visitJSForStatement(@Nonnull JSForStatement statement) {
+        public void visitJSForStatement(JSForStatement statement) {
             super.visitJSForStatement(statement);
             JSVarStatement varStatement = statement.getVarDeclaration();
             if (varStatement != null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java
index af40113c..f0116b6e 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopReplaceableByWhileJSInspectionState.java
@@ -6,7 +6,7 @@
 import consulo.configurable.UnnamedConfigurable;
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
index 57b6b4b0..3f3857a6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/ForLoopThatDoesntUseLoopVariableJSInspection.java
@@ -8,23 +8,19 @@
 import consulo.language.psi.PsiElement;
 
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ForLoopThatDoesntUseLoopVariableJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.forLoopNotUseLoopVariableDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.BUGS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -48,7 +44,7 @@ public BaseInspectionVisitor buildVisitor() {
     //TODO: make it work with an implicit declaration as well
     private static class ForLoopThatDoesntUseLoopVariableVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSForStatement(@Nonnull JSForStatement statement) {
+        public void visitJSForStatement(JSForStatement statement) {
             super.visitJSForStatement(statement);
             if (conditionUsesInitializer(statement)) {
                 if (!updateUsesInitializer(statement)) {
@@ -112,14 +108,14 @@ private UseVisitor(JSVariable var) {
             variable = var;
         }
 
-        @Override public void visitElement(@Nonnull PsiElement element) {
+        @Override public void visitElement(PsiElement element) {
             if (!used) {
                 super.visitElement(element);
             }
         }
 
         @Override public void visitJSReferenceExpression(
-                @Nonnull JSReferenceExpression ref) {
+                JSReferenceExpression ref) {
             if (used) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
index f57efea6..08e813ea 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithIdenticalBranchesJSInspection.java
@@ -15,19 +15,16 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class IfStatementWithIdenticalBranchesJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new CollapseIfFix();
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.ifStatementWithIdenticalBranchesDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -45,7 +42,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class CollapseIfFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.collapseIfStatementFix();
@@ -69,7 +65,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class IfStatementWithIdenticalBranchesVisitor extends BaseInspectionVisitor {
 
-        @Override public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+        @Override public void visitJSIfStatement(JSIfStatement statement) {
             super.visitJSIfStatement(statement);
             JSStatement thenBranch = statement.getThen();
             JSStatement elseBranch = statement.getElse();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
index 4cac958f..edf5eedd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspection.java
@@ -11,23 +11,19 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class IfStatementWithTooManyBranchesJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.ifStatementWithTooManyBranchesDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new IfStatementWithTooManyBranchesJSInspectionState();
@@ -59,7 +55,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor<IfStatementWithTooManyBranchesJSInspectionState> {
         @Override
-        public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+        public void visitJSIfStatement(JSIfStatement statement) {
             super.visitJSIfStatement(statement);
             PsiElement parent = statement.getParent();
             if (parent instanceof JSIfStatement) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java
index 8900fb5e..e960d7de 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/IfStatementWithTooManyBranchesJSInspectionState.java
@@ -8,7 +8,7 @@
 import consulo.ui.IntBox;
 import consulo.ui.Label;
 import consulo.util.xml.serializer.XmlSerializerUtil;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
index 90c4c50b..d23fd0fb 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LabeledStatementJSInspection.java
@@ -8,19 +8,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class LabeledStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.labeledStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -40,9 +36,9 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSLabeledStatement(@Nonnull JSLabeledStatement statement) {
+        public void visitJSLabeledStatement(JSLabeledStatement statement) {
             super.visitJSLabeledStatement(statement);
-            @NonNls String label = statement.getLabel();
+            String label = statement.getLabel();
             if ("javascript".equals(label)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
index a39b9cdd..e6218171 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/LoopStatementThatDoesntLoopJSInspection.java
@@ -9,17 +9,14 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class LoopStatementThatDoesntLoopJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.loopStatementThatDoesnTLoopDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -43,7 +40,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSForStatement(@Nonnull JSForStatement statement) {
+        public void visitJSForStatement(JSForStatement statement) {
             super.visitJSForStatement(statement);
             JSStatement body = statement.getBody();
             if (body == null) {
@@ -59,7 +56,7 @@ public void visitJSForStatement(@Nonnull JSForStatement statement) {
         }
 
         @Override
-        public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+        public void visitJSForInStatement(JSForInStatement statement) {
             super.visitJSForInStatement(statement);
             JSStatement body = statement.getBody();
             if (body == null) {
@@ -75,7 +72,7 @@ public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
         }
 
         @Override
-        public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+        public void visitJSWhileStatement(JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
             JSStatement body = statement.getBody();
             if (body == null
@@ -86,7 +83,7 @@ public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
             registerStatementError(statement);
         }
 
-        @Override public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+        @Override public void visitJSDoWhileStatement(JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
             JSStatement body = statement.getBody();
             if (body == null
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
index c574d692..4cb84307 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/NestedSwitchStatementJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class NestedSwitchStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.nestedSwitchStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
index 80e74256..533f2d06 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/SwitchStatementWithNoDefaultBranchJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class SwitchStatementWithNoDefaultBranchJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.switchStatementWithNoDefaultBranchDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
index ce960c91..24ff8276 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TailRecursionJSInspection.java
@@ -10,23 +10,20 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class TailRecursionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.tailRecursionDisplayName();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -180,7 +177,7 @@ private static class TailRecursionVisitor extends BaseInspectionVisitor {
 
         @Override
         public void visitJSReturnStatement(
-            @Nonnull JSReturnStatement statement
+            JSReturnStatement statement
         ) {
             super.visitJSReturnStatement(statement);
             JSExpression returnValue = statement.getExpression();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
index 83fc3d00..9deffe92 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialConditionalJSInspection.java
@@ -16,28 +16,23 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class TrivialConditionalJSInspection extends JavaScriptInspection {
     private final TrivialConditionalFix fix = new TrivialConditionalFix();
 
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "RedundantConditionalExpressionJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.redundantConditionalExpressionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -78,7 +73,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class TrivialConditionalFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.simplifyFix();
@@ -114,12 +108,12 @@ public void visitJSConditionalExpression(JSConditionalExpression exp) {
     }
 
     private static boolean isFalse(JSExpression expression) {
-        @NonNls String text = expression.getText();
+        String text = expression.getText();
         return "false".equals(text);
     }
 
     private static boolean isTrue(JSExpression expression) {
-        @NonNls String text = expression.getText();
+        String text = expression.getText();
         return "true".equals(text);
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
index a6749409..aa66ef86 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/TrivialIfJSInspection.java
@@ -20,28 +20,23 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
-import org.jetbrains.annotations.NonNls;
 
 @ExtensionImpl
 public class TrivialIfJSInspection extends JavaScriptInspection {
     private final TrivialIfFix fix = new TrivialIfFix();
 
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "RedundantIfStatementJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.redundantIfStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -69,7 +64,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class TrivialIfFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.simplifyFix();
@@ -109,7 +103,7 @@ private void replaceSimplifiableImplicitReturn(JSIfStatement statement) throws I
             JSExpression condition = statement.getCondition();
             String conditionText = condition.getText();
             PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(statement, new Class[]{PsiWhiteSpace.class});
-            @NonNls String newStatement = "return " + conditionText + ';';
+            String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
             assert nextStatement != null;
             deleteElement(nextStatement);
@@ -118,7 +112,7 @@ private void replaceSimplifiableImplicitReturn(JSIfStatement statement) throws I
         private void repaceSimplifiableReturn(JSIfStatement statement) throws IncorrectOperationException {
             JSExpression condition = statement.getCondition();
             String conditionText = condition.getText();
-            @NonNls String newStatement = "return " + conditionText + ';';
+            String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
         }
 
@@ -176,7 +170,7 @@ private void replaceSimplifiableImplicitReturnNegated(JSIfStatement statement) t
             if (nextStatement == null) {
                 return;
             }
-            @NonNls String newStatement = "return " + conditionText + ';';
+            String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
             deleteElement(nextStatement);
         }
@@ -184,7 +178,7 @@ private void replaceSimplifiableImplicitReturnNegated(JSIfStatement statement) t
         private void repaceSimplifiableReturnNegated(JSIfStatement statement) throws IncorrectOperationException {
             JSExpression condition = statement.getCondition();
             String conditionText = BoolUtils.getNegatedExpressionText(condition);
-            @NonNls String newStatement = "return " + conditionText + ';';
+            String newStatement = "return " + conditionText + ';';
             replaceStatement(statement, newStatement);
         }
 
@@ -205,7 +199,7 @@ private void replaceSimplifiableAssignmentNegated(JSIfStatement statement) throw
 
     private static class TrivialIfVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSIfStatement(@Nonnull JSIfStatement ifStatement) {
+        public void visitJSIfStatement(JSIfStatement ifStatement) {
             super.visitJSIfStatement(ifStatement);
             JSExpression condition = ifStatement.getCondition();
             if (condition == null) {
@@ -400,7 +394,6 @@ public static boolean isSimplifiableImplicitAssignmentNegated(JSIfStatement ifSt
         }
     }
 
-    @NonNls
     private static String getTextForOperator(IElementType operator) {
         if (JSTokenTypes.EQ.equals(operator)) {
             return "=";
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
index 56d2f3e1..59d714d7 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryContinueJSInspection.java
@@ -14,19 +14,16 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnnecessaryContinueJSInspection extends JavaScriptInspection {
     private final UnnecessaryContinueFix fix = new UnnecessaryContinueFix();
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.unnecessaryContinueStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -49,7 +46,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnnecessaryContinueFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.removeUnnecessaryContinueFix();
@@ -66,7 +62,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
+        public void visitJSContinueStatement(JSContinueStatement statement) {
             JSStatement continuedStatement = statement.getStatementToContinue();
             if (continuedStatement == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
index fcb2b956..0f8d9ec2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelJSInspection.java
@@ -13,17 +13,14 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnnecessaryLabelJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.unnecessaryLabelDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -34,7 +31,6 @@ public BaseInspectionVisitor buildVisitor() {
         return new UnusedLabelVisitor();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -47,7 +43,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnusedLabelFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.removeLabelFix();
@@ -95,14 +90,14 @@ private LabelFinder(JSLabeledStatement target) {
         }
 
         @Override
-        public void visitElement(@Nonnull PsiElement element) {
+        public void visitElement(PsiElement element) {
             if (!found) {
                 super.visitElement(element);
             }
         }
 
         @Override
-        public void visitJSContinueStatement(@Nonnull JSContinueStatement continueStatement) {
+        public void visitJSContinueStatement(JSContinueStatement continueStatement) {
             if (found) {
                 return;
             }
@@ -114,7 +109,7 @@ public void visitJSContinueStatement(@Nonnull JSContinueStatement continueStatem
         }
 
         @Override
-        public void visitJSBreakStatement(@Nonnull JSBreakStatement breakStatement) {
+        public void visitJSBreakStatement(JSBreakStatement breakStatement) {
             if (found) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
index 57847380..a53f7016 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnBreakStatementJSInspection.java
@@ -17,20 +17,17 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class UnnecessaryLabelOnBreakStatementJSInspection extends JavaScriptInspection {
     private final UnnecessaryLabelOnBreakStatementFix fix = new UnnecessaryLabelOnBreakStatementFix();
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.unnecessaryLabelOnBreakStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -42,7 +39,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnnecessaryLabelOnBreakStatementFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.removeLabelFix();
@@ -70,7 +66,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
+        public void visitJSBreakStatement(JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (statement.getLabel() == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
index d54fedc6..f28803cd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryLabelOnContinueStatementJSInspection.java
@@ -16,20 +16,17 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class UnnecessaryLabelOnContinueStatementJSInspection extends JavaScriptInspection {
     private final UnnecessaryLabelOnContinueStatementFix fix = new UnnecessaryLabelOnContinueStatementFix();
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.unnecessaryLabelOnContinueStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -58,7 +55,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnnecessaryLabelOnContinueStatementFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.removeLabelFix();
@@ -74,7 +70,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
+        public void visitJSContinueStatement(JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             if (statement.getLabel() == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
index 2e2874e1..6dd5becd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/control/UnnecessaryReturnJSInspection.java
@@ -15,27 +15,23 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class  UnnecessaryReturnJSInspection extends JavaScriptInspection {
     private final UnnecessaryReturnFix fix = new UnnecessaryReturnFix();
 
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "UnnecessaryReturnStatementJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.unnecessaryReturnStatementDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.CONTROL_FLOW_GROUP_NAME;
@@ -63,7 +59,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class UnnecessaryReturnFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.removeUnnecessaryReturnFix();
@@ -80,7 +75,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
 
     private static class UnnecessaryReturnVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSReturnStatement(@Nonnull JSReturnStatement statement) {
+        public void visitJSReturnStatement(JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
 
             JSExpression returnValue = statement.getExpression();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
index a4ac5fa5..3cbf2b93 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/ReuseOfLocalVariableJSInspection.java
@@ -13,24 +13,20 @@
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class ReuseOfLocalVariableJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.reuseOfLocalVariableDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.DATA_FLOW_ISSUES;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -44,7 +40,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class ReuseOfLocalVariableVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression assignment) {
             super.visitJSAssignmentExpression(assignment);
             if (assignment.getROperand() == null) {
                 return;
@@ -153,7 +149,7 @@ private static boolean tryExistsBetween(JSAssignmentExpression assignment, JSBlo
          * @noinspection AssignmentToMethodParameter
          */
         @Nullable
-        public static PsiElement getChildWhichContainsElement(@Nonnull JSBlockStatement ancestor, @Nonnull PsiElement descendant) {
+        public static PsiElement getChildWhichContainsElement(JSBlockStatement ancestor, PsiElement descendant) {
             PsiElement element = descendant;
             while (!element.equals(ancestor)) {
                 descendant = element;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
index ce67f5c9..370023e2 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspection.java
@@ -13,29 +13,24 @@
 import consulo.language.psi.util.PsiTreeUtil;
 
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnnecessaryLocalVariableJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.redundantLocalVariableDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.DATA_FLOW_ISSUES;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new UnnecessaryLocalVariableJSInspectionState();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -54,7 +49,7 @@ protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
 
     private class UnnecessaryLocalVariableVisitor extends BaseInspectionVisitor<UnnecessaryLocalVariableJSInspectionState> {
         @Override
-        public void visitJSVarStatement(@Nonnull JSVarStatement varStatement) {
+        public void visitJSVarStatement(JSVarStatement varStatement) {
             super.visitJSVarStatement(varStatement);
             JSVariable[] variables = varStatement.getVariables();
             for (JSVariable variable : variables) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
index 25472038..c148019d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/UnnecessaryLocalVariableJSInspectionState.java
@@ -7,7 +7,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
index 69dadd9b..3fe309c6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableAssignedVisitor.java
@@ -5,27 +5,25 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import jakarta.annotation.Nonnull;
 
 public class VariableAssignedVisitor extends JSRecursiveElementVisitor {
     private boolean assigned = false;
-    @Nonnull
     private final JSVariable variable;
 
-    public VariableAssignedVisitor(@Nonnull JSVariable variable) {
+    public VariableAssignedVisitor(JSVariable variable) {
         super();
         this.variable = variable;
     }
 
     @Override
-    public void visitElement(@Nonnull PsiElement element) {
+    public void visitElement(PsiElement element) {
         if (!assigned) {
             super.visitElement(element);
         }
     }
 
     @Override
-    public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+    public void visitJSAssignmentExpression(JSAssignmentExpression assignment) {
         if (assigned) {
             return;
         }
@@ -37,7 +35,7 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignme
     }
 
     @Override
-    public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+    public void visitJSPrefixExpression(JSPrefixExpression expression) {
         if (assigned) {
             return;
         }
@@ -54,7 +52,7 @@ public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
     }
 
     @Override
-    public void visitJSPostfixExpression(@Nonnull JSPostfixExpression postfixExpression) {
+    public void visitJSPostfixExpression(JSPostfixExpression postfixExpression) {
         if (assigned) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
index f6ac1f85..5867c640 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedInInnerFunctionVisitor.java
@@ -5,7 +5,6 @@
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
 
 public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisitor {
     private final JSVariable variable;
@@ -18,7 +17,7 @@ public class VariableUsedInInnerFunctionVisitor extends JSRecursiveElementVisito
     }
 
     @Override
-    public void visitElement(@Nonnull PsiElement element) {
+    public void visitElement(PsiElement element) {
         if (usedInInnerFunction) {
             return;
         }
@@ -26,7 +25,7 @@ public void visitElement(@Nonnull PsiElement element) {
     }
 
     @Override
-    public void visitJSFunctionExpression(@Nonnull JSFunctionExpression funcExpr) {
+    public void visitJSFunctionExpression(JSFunctionExpression funcExpr) {
         if (usedInInnerFunction) {
             return;
         }
@@ -37,7 +36,7 @@ public void visitJSFunctionExpression(@Nonnull JSFunctionExpression funcExpr) {
     }
 
     @Override
-    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression reference) {
+    public void visitJSReferenceExpression(JSReferenceExpression reference) {
         if (usedInInnerFunction) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
index fccabc8a..8b1baca0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dataflow/VariableUsedVisitor.java
@@ -1,6 +1,5 @@
 package com.sixrr.inspectjs.dataflow;
 
-import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -10,23 +9,22 @@
 
 public class VariableUsedVisitor extends JSRecursiveElementVisitor {
     private boolean used = false;
-    @Nonnull
     private final JSVariable variable;
 
-    public VariableUsedVisitor(@Nonnull JSVariable variable) {
+    public VariableUsedVisitor(JSVariable variable) {
         super();
         this.variable = variable;
     }
 
     @Override
-    public void visitElement(@Nonnull PsiElement element) {
+    public void visitElement(PsiElement element) {
         if (!used) {
             super.visitElement(element);
         }
     }
 
     @Override
-    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
+    public void visitJSReferenceExpression(JSReferenceExpression ref) {
         if (used) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
index 65e3fdd5..addfdb25 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/DocumentWriteJSInspection.java
@@ -10,20 +10,16 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class DocumentWriteJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.callToDocumentWriteDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
@@ -60,11 +56,11 @@ public void visitJSCallExpression(JSCallExpression jsCallExpression) {
             if (qualifier == null) {
                 return;
             }
-            @NonNls String qualifierText = qualifier.getText();
+            String qualifierText = qualifier.getText();
             if (!"document".equals(qualifierText)) {
                 return;
             }
-            @NonNls String methodName = referenceExpression.getReferencedName();
+            String methodName = referenceExpression.getReferencedName();
             if (!"write".equals(methodName) && !"writeln".equals(methodName)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
index 08dfecd4..62236abc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/InnerHTMLJSInspection.java
@@ -8,18 +8,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class InnerHTMLJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.useOfInnerhtmlPropertyDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
index ef032d48..bfa6a955 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/PlatformDetectionJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class PlatformDetectionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.platformDetectionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
index be8e8370..5a9375c8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/dom/XHTMLIncompatabilitiesJSInspection.java
@@ -9,18 +9,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class XHTMLIncompatabilitiesJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.xhtmlIncompatibilitiesDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.DOM_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
index 8e1456db..a0b6916b 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/CatchParameterUsedVisitor.java
@@ -5,7 +5,6 @@
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
 
 class CatchParameterUsedVisitor extends JSRecursiveElementVisitor {
     private final JSParameter parameter;
@@ -17,14 +16,14 @@ class CatchParameterUsedVisitor extends JSRecursiveElementVisitor {
     }
 
     @Override
-    public void visitElement(@Nonnull PsiElement element) {
+    public void visitElement(PsiElement element) {
         if (!used) {
             super.visitElement(element);
         }
     }
 
     @Override
-    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression reference) {
+    public void visitJSReferenceExpression(JSReferenceExpression reference) {
         if (used) {
             return;
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
index 05c67748..0d49b2b1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ContinueOrBreakFromFinallyBlockJSInspection.java
@@ -11,17 +11,14 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ContinueOrBreakFromFinallyBlockJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.continueOrBreakInsideFinallyBlockDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
@@ -40,7 +37,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
+        public void visitJSContinueStatement(JSContinueStatement statement) {
             super.visitJSContinueStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
@@ -56,7 +53,7 @@ public void visitJSContinueStatement(@Nonnull JSContinueStatement statement) {
         }
 
         @Override
-        public void visitJSBreakStatement(@Nonnull JSBreakStatement statement) {
+        public void visitJSBreakStatement(JSBreakStatement statement) {
             super.visitJSBreakStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
index f8ace4f6..a2bc1a86 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyCatchBlockJSInspection.java
@@ -12,18 +12,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class EmptyCatchBlockJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.emptyCatchBlockDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
index b820d9a9..9d4d442d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyFinallyBlockJSInspection.java
@@ -10,18 +10,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class EmptyFinallyBlockJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.emptyFinallyBlockDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
index 11abc999..1b1e9400 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/EmptyTryBlockJSInspection.java
@@ -10,18 +10,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class EmptyTryBlockJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.emptyTryBlockDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
index 6939c368..a048385d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ExceptionCaughtLocallyJSInspection.java
@@ -12,17 +12,14 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ExceptionCaughtLocallyJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.exceptionUsedForLocalControlFlowDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
@@ -41,7 +38,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
+        public void visitJSThrowStatement(JSThrowStatement statement) {
             super.visitJSThrowStatement(statement);
             if (!isCaughtLocally(statement)) {
                 return;
@@ -50,7 +47,7 @@ public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
         }
     }
 
-    public static boolean isCaughtLocally(@Nonnull JSThrowStatement throwStatement) {
+    public static boolean isCaughtLocally(JSThrowStatement throwStatement) {
         JSElement currentElement = throwStatement;
         while (true) {
             JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
index 632d88cf..44710502 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ReturnFromFinallyBlockJSInspection.java
@@ -9,25 +9,21 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ReturnFromFinallyBlockJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ReturnInsideFinallyBlockJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.returnInsideFinallyBlockDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
@@ -51,7 +47,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSReturnStatement(@Nonnull JSReturnStatement statement) {
+        public void visitJSReturnStatement(JSReturnStatement statement) {
             super.visitJSReturnStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
index 9a3a57ac..31203615 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/ThrowFromFinallyBlockJSInspection.java
@@ -9,25 +9,21 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ThrowFromFinallyBlockJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ThrowInsideFinallyBlockJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.throwInsideFinallyBlockDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
@@ -46,7 +42,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSThrowStatement(@Nonnull JSThrowStatement statement) {
+        public void visitJSThrowStatement(JSThrowStatement statement) {
             super.visitJSThrowStatement(statement);
             if (!ControlFlowUtils.isInFinallyBlock(statement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
index 818fa71b..f11ddf56 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspection.java
@@ -14,29 +14,24 @@
 import consulo.language.psi.PsiComment;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class UnusedCatchParameterJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.unusedCatchParameterDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.ERRORHANDLING_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new UnusedCatchParameterJSInspectionState();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -50,7 +45,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class EmptyCatchBlockVisitor extends BaseInspectionVisitor<UnusedCatchParameterJSInspectionState> {
         @Override
-        public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
+        public void visitJSTryStatement(JSTryStatement statement) {
             super.visitJSTryStatement(statement);
             JSCatchBlock jsCatchBlock = statement.getCatchBlock();
             if (jsCatchBlock == null) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
index 3426c1f5..ac49860f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/exception/UnusedCatchParameterJSInspectionState.java
@@ -7,7 +7,7 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.util.xml.serializer.XmlSerializerUtil;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
index 890f480d..f5ca8363 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/fix/RenameFix.java
@@ -11,7 +11,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 public class RenameFix extends InspectionJSFix {
     private final String m_targetName;
@@ -27,7 +26,6 @@ public RenameFix(String targetName) {
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getName() {
         return m_targetName == null
             ? InspectionJSLocalize.renameFix()
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
index f3ce8bd3..f05b92a1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityJSInspection.java
@@ -11,31 +11,26 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class CyclomaticComplexityJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "OverlyComplexFunctionJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.overlyComplexFunctionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new CyclomaticComplexityJSInspectionState();
@@ -63,7 +58,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor<CyclomaticComplexityJSInspectionState> {
         @Override
-        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        public void visitJSFunctionDeclaration(JSFunction function) {
             PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
index 084e8445..d36495fc 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/CyclomaticComplexityVisitor.java
@@ -2,7 +2,6 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import jakarta.annotation.Nonnull;
 
 class CyclomaticComplexityVisitor extends JSRecursiveElementVisitor {
     private int complexity = 1;
@@ -21,25 +20,25 @@ public void visitJSElement(JSElement jsElement) {
     }
 
     @Override
-    public void visitJSForStatement(@Nonnull JSForStatement statement) {
+    public void visitJSForStatement(JSForStatement statement) {
         super.visitJSForStatement(statement);
         complexity++;
     }
 
     @Override
-    public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+    public void visitJSForInStatement(JSForInStatement statement) {
         super.visitJSForInStatement(statement);
         complexity++;
     }
 
     @Override
-    public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+    public void visitJSIfStatement(JSIfStatement statement) {
         super.visitJSIfStatement(statement);
         complexity++;
     }
 
     @Override
-    public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+    public void visitJSDoWhileStatement(JSDoWhileStatement statement) {
         super.visitJSDoWhileStatement(statement);
         complexity++;
     }
@@ -51,7 +50,7 @@ public void visitJSConditionalExpression(JSConditionalExpression expression) {
     }
 
     @Override
-    public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
+    public void visitJSSwitchStatement(JSSwitchStatement statement) {
         super.visitJSSwitchStatement(statement);
         JSCaseClause[] caseClauses = statement.getCaseClauses();
         for (JSCaseClause clause : caseClauses) {
@@ -63,7 +62,7 @@ public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
     }
 
     @Override
-    public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+    public void visitJSWhileStatement(JSWhileStatement statement) {
         super.visitJSWhileStatement(statement);
         complexity++;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
index 41d08d98..5d5833ae 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleLoopsJSInspection.java
@@ -10,18 +10,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class FunctionWithMultipleLoopsJSInspection extends JavaScriptInspection {
     @Override
-    @Nonnull
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.functionWithMultipleLoopsDisplayName();
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
@@ -48,7 +45,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        public void visitJSFunctionDeclaration(JSFunction function) {
             // note: no call to super
             PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
index 725a2bc8..0773c897 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/FunctionWithMultipleReturnPointsJSInspection.java
@@ -11,7 +11,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class FunctionWithMultipleReturnPointsJSInspection extends JavaScriptInspection {
@@ -20,13 +19,11 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.functionWithMultipleReturnPointsDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
@@ -69,7 +66,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        public void visitJSFunctionDeclaration(JSFunction function) {
             int returnPointCount = countReturnPoints(function);
             if (returnPointCount <= 1) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
index 04d827b6..5f854bd4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/LoopCountVisitor.java
@@ -2,7 +2,6 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import jakarta.annotation.Nonnull;
 
 class LoopCountVisitor extends JSRecursiveElementVisitor {
     private int loopCount = 0;
@@ -21,25 +20,25 @@ public void visitJSElement(JSElement jsElement) {
     }
 
     @Override
-    public void visitJSForStatement(@Nonnull JSForStatement jsForStatement) {
+    public void visitJSForStatement(JSForStatement jsForStatement) {
         super.visitJSForStatement(jsForStatement);
         loopCount++;
     }
 
     @Override
-    public void visitJSForInStatement(@Nonnull JSForInStatement jsForStatement) {
+    public void visitJSForInStatement(JSForInStatement jsForStatement) {
         super.visitJSForInStatement(jsForStatement);
         loopCount++;
     }
 
     @Override
-    public void visitJSWhileStatement(@Nonnull JSWhileStatement jsWhileStatement) {
+    public void visitJSWhileStatement(JSWhileStatement jsWhileStatement) {
         super.visitJSWhileStatement(jsWhileStatement);
         loopCount++;
     }
 
     @Override
-    public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement jsDoWhileStatement) {
+    public void visitJSDoWhileStatement(JSDoWhileStatement jsDoWhileStatement) {
         super.visitJSDoWhileStatement(jsDoWhileStatement);
         loopCount++;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
index 0f25aaee..2fd95394 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NegationCountVisitor.java
@@ -7,7 +7,6 @@
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import consulo.language.ast.IElementType;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import jakarta.annotation.Nonnull;
 
 class NegationCountVisitor extends JSRecursiveElementVisitor {
     private int negationCount = 0;
@@ -26,7 +25,7 @@ public void visitJSElement(JSElement jsElement) {
     }
 
     @Override
-    public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+    public void visitJSBinaryExpression(JSBinaryExpression expression) {
         super.visitJSBinaryExpression(expression);
         IElementType sign = expression.getOperationSign();
         if (JSTokenTypes.NE.equals(sign) || JSTokenTypes.NEQEQ.equals(sign)) {
@@ -35,7 +34,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
     }
 
     @Override
-    public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+    public void visitJSPrefixExpression(JSPrefixExpression expression) {
         super.visitJSPrefixExpression(expression);
         IElementType sign = expression.getOperationSign();
         if (JSTokenTypes.EXCL.equals(sign)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
index 9553c20c..3e5da7e4 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthJSInspection.java
@@ -10,31 +10,26 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class NestingDepthJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "OverlyNestedFunctionJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.overlyNestedFunctionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new NestingDepthJSInspectionState();
@@ -60,7 +55,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor<NestingDepthJSInspectionState> {
         @Override
-        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        public void visitJSFunctionDeclaration(JSFunction function) {
             NestingDepthVisitor visitor = new NestingDepthVisitor();
             function.accept(visitor);
             int count = visitor.getMaximumDepth();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
index 6583b7df..374bb26f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/NestingDepthVisitor.java
@@ -2,7 +2,6 @@
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
-import jakarta.annotation.Nonnull;
 
 class NestingDepthVisitor extends JSRecursiveElementVisitor {
     private int m_maximumDepth = 0;
@@ -26,21 +25,21 @@ class NestingDepthVisitor extends JSRecursiveElementVisitor {
     //}
 
     @Override
-    public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+    public void visitJSDoWhileStatement(JSDoWhileStatement statement) {
         enterScope();
         super.visitJSDoWhileStatement(statement);
         exitScope();
     }
 
     @Override
-    public void visitJSForStatement(@Nonnull JSForStatement statement) {
+    public void visitJSForStatement(JSForStatement statement) {
         enterScope();
         super.visitJSForStatement(statement);
         exitScope();
     }
 
     @Override
-    public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+    public void visitJSIfStatement(JSIfStatement statement) {
         boolean isAlreadyCounted = false;
         if (statement.getParent() instanceof JSIfStatement) {
             JSIfStatement parent = (JSIfStatement)statement.getParent();
@@ -60,21 +59,21 @@ public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
     }
 
     @Override
-    public void visitJSTryStatement(@Nonnull JSTryStatement statement) {
+    public void visitJSTryStatement(JSTryStatement statement) {
         enterScope();
         super.visitJSTryStatement(statement);
         exitScope();
     }
 
     @Override
-    public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
+    public void visitJSSwitchStatement(JSSwitchStatement statement) {
         enterScope();
         super.visitJSSwitchStatement(statement);
         exitScope();
     }
 
     @Override
-    public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+    public void visitJSWhileStatement(JSWhileStatement statement) {
         enterScope();
         super.visitJSWhileStatement(statement);
         exitScope();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
index 0395ad9b..e22d15d6 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ParametersPerFunctionJSInspection.java
@@ -12,31 +12,26 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ParametersPerFunctionJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "OverlyComplexFunctionJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.functionWithTooManyParametersDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new ParametersPerFunctionJSInspectionState();
@@ -62,7 +57,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor<ParametersPerFunctionJSInspectionState> {
         @Override
-        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        public void visitJSFunctionDeclaration(JSFunction function) {
             JSParameterList parameterList = function.getParameterList();
             if (parameterList == null) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
index e25f696c..0d1b523c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementCountVisitor.java
@@ -1,6 +1,5 @@
 package com.sixrr.inspectjs.functionmetrics;
 
-import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.*;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
@@ -22,7 +21,7 @@ public void visitJSElement(JSElement jsElement) {
     }
 
     @Override
-    public void visitJSStatement(@Nonnull JSStatement statement) {
+    public void visitJSStatement(JSStatement statement) {
         super.visitJSStatement(statement);
         if (statement instanceof JSEmptyStatement || statement instanceof JSBlockStatement) {
             return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
index 3e5ee30a..30990d42 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/StatementsPerFunctionJSInspection.java
@@ -11,29 +11,24 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class StatementsPerFunctionJSInspection extends JavaScriptInspection {
     @Override
-    @Nonnull
     public String getID() {
         return "FunctionTooLongJS";
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.overlyLongFunctionDisplayName();
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new StatementsPerFunctionJSInspectionState();
@@ -61,7 +56,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private class Visitor extends BaseInspectionVisitor<StatementsPerFunctionJSInspectionState> {
         @Override
-        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        public void visitJSFunctionDeclaration(JSFunction function) {
 
             PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
index 35df8f98..b6fcf20f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/functionmetrics/ThreeNegationsPerFunctionJSInspection.java
@@ -10,24 +10,20 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ThreeNegationsPerFunctionJSInspection extends JavaScriptInspection {
     @Override
-    @Nonnull
     public String getID() {
         return "FunctionWithMoreThanThreeNegationsJS";
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.functionWithMoreThanThreeNegationsDisplayName();
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.FUNCTIONMETRICS_GROUP_NAME;
     }
@@ -54,7 +50,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSFunctionDeclaration(@Nonnull JSFunction function) {
+        public void visitJSFunctionDeclaration(JSFunction function) {
             NegationCountVisitor visitor = new NegationCountVisitor();
             PsiElement lastChild = function.getLastChild();
             if (!(lastChild instanceof JSBlockStatement)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
index 358f9375..24d90a5c 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ConventionInspectionState.java
@@ -8,7 +8,7 @@
 import consulo.util.xml.serializer.XmlSerializerUtil;
 import consulo.util.xml.serializer.annotation.Transient;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.regex.Pattern;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
index c821bcf1..6b4c5fa3 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/FunctionNamingConventionJSInspection.java
@@ -12,7 +12,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class FunctionNamingConventionJSInspection extends ConventionInspection {
@@ -23,19 +22,16 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new FunctionNamingConventionJSInspectionState();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.functionNamingConventionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
index b42ecffa..8aeaf145 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/LocalVariableNamingConventionJSInspection.java
@@ -12,7 +12,6 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class LocalVariableNamingConventionJSInspection extends ConventionInspection {
@@ -23,13 +22,11 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.localVariableNamingConventionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
@@ -62,7 +59,6 @@ else if (variableName.length() > inspectionState.m_maxLength) {
         return InspectionJSLocalize.variableNameDoesntMatchRegexErrorString(inspectionState.m_regex).get();
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new LocalVariableNamingConventionJSInspectionState();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
index 575ebccc..6eee0f99 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/naming/ParameterNamingConventionJSInspection.java
@@ -14,7 +14,6 @@
 import consulo.language.editor.inspection.InspectionToolState;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ParameterNamingConventionJSInspection extends ConventionInspection {
@@ -25,19 +24,16 @@ public boolean isEnabledByDefault() {
         return false;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.functionParameterNamingConventionDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.NAMING_CONVENTIONS_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public InspectionToolState<?> createStateProvider() {
         return new ParameterNamingConventionJSInspectionState();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
index 238a65da..4e7a1256 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedEqualityJSInspection.java
@@ -11,31 +11,26 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.ast.IElementType;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ChainedEqualityJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ChainedEqualityComparisonsJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.chainedEqualityDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public String buildErrorString(Object state, Object... args) {
@@ -49,7 +44,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class ChainedEqualityVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
@@ -67,7 +62,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
             registerError(expression);
         }
 
-        private static boolean isEqualityComparison(@Nonnull JSBinaryExpression expression) {
+        private static boolean isEqualityComparison(JSBinaryExpression expression) {
             IElementType tokenType = expression.getOperationSign();
             return JSTokenTypes.EQEQ.equals(tokenType) || JSTokenTypes.NE.equals(tokenType);
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
index a7a31bec..7fab25ea 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ChainedFunctionCallJSInspection.java
@@ -11,23 +11,19 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class ChainedFunctionCallJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.chainedFunctionCallDisplayName();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     protected String buildErrorString(Object state, Object... args) {
@@ -41,7 +37,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class NestedMethodCallVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
+        public void visitJSCallExpression(JSCallExpression expression) {
             super.visitJSCallExpression(expression);
             JSExpression reference = expression.getMethodExpression();
             if (!(reference instanceof JSReferenceExpression)) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
index 05d975d9..83e70e34 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnLHSOfComparisonJSInspection.java
@@ -15,27 +15,23 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ConstantOnLHSOfComparisonJSInspection extends JavaScriptInspection {
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ConstantOnLefSideOfComparisonJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.constantOnLeftSideOfComparisonDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
@@ -58,7 +54,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class SwapComparisonFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.flipComparisonFix();
@@ -80,7 +75,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
 
     private static class ConstantOnRHSOfComparisonVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
index c9169dd4..4ce0ed56 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/ConstantOnRHSOfComparisonJSInspection.java
@@ -17,27 +17,23 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 import org.intellij.lang.annotations.Pattern;
 
 @ExtensionImpl
 public class ConstantOnRHSOfComparisonJSInspection extends JavaScriptInspection {
     private final SwapComparisonFix fix = new SwapComparisonFix();
 
-    @Nonnull
     @Override
     @Pattern(value = "[a-zA-Z_0-9.-]+")
     public String getID() {
         return "ConstantOnRightSideOfComparisonJS";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.constantOnRightSideOfComparisonDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
@@ -60,7 +56,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
     }
 
     private static class SwapComparisonFix extends InspectionJSFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return InspectionJSLocalize.flipComparisonFix();
@@ -82,7 +77,7 @@ public void doFix(Project project, ProblemDescriptor descriptor) throws Incorrec
 
     private static class ConstantOnRHSOfComparisonVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSBinaryExpression(@Nonnull JSBinaryExpression expression) {
+        public void visitJSBinaryExpression(JSBinaryExpression expression) {
             super.visitJSBinaryExpression(expression);
             if (!(expression.getROperand() != null)) {
                 return;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
index 32252f56..9e193d54 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NestedFunctionCallJSInspection.java
@@ -11,7 +11,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NestedFunctionCallJSInspection extends JavaScriptInspection {
@@ -21,20 +20,17 @@ public boolean isEnabledByDefault() {
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.nestedFunctionCallDisplayName();
     }
 
     @RequiredReadAction
     @Override
-    @Nonnull
     protected String buildErrorString(Object state, Object... args) {
         return InspectionJSLocalize.nestedFunctionCallProblemDescriptor().get();
     }
@@ -46,7 +42,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class NestedMethodCallVisitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
+        public void visitJSCallExpression(JSCallExpression expression) {
             super.visitJSCallExpression(expression);
             JSExpression outerExpression = expression;
             while (outerExpression != null && outerExpression.getParent() instanceof JSExpression parentExpression) {
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
index 3ab7e1c3..f2488120 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/NonBlockStatementBodyJSInspection.java
@@ -13,20 +13,17 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class NonBlockStatementBodyJSInspection extends JavaScriptInspection {
     private InspectionJSFix fix = new WrapBodyFix();
 
     @Override
-    @Nonnull
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.nonBlockStatementBodyDisplayName();
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
@@ -51,7 +48,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
 
     private static class WrapBodyFix extends InspectionJSFix {
         @Override
-        @Nonnull
         public LocalizeValue getName() {
             return InspectionJSLocalize.wrapStatementBodyFix();
         }
@@ -89,7 +85,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
+        public void visitJSDoWhileStatement(JSDoWhileStatement statement) {
             super.visitJSDoWhileStatement(statement);
 
             JSStatement body = statement.getBody();
@@ -104,7 +100,7 @@ public void visitJSDoWhileStatement(@Nonnull JSDoWhileStatement statement) {
         }
 
         @Override
-        public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
+        public void visitJSWhileStatement(JSWhileStatement statement) {
             super.visitJSWhileStatement(statement);
 
             JSStatement body = statement.getBody();
@@ -119,7 +115,7 @@ public void visitJSWhileStatement(@Nonnull JSWhileStatement statement) {
         }
 
         @Override
-        public void visitJSForStatement(@Nonnull JSForStatement statement) {
+        public void visitJSForStatement(JSForStatement statement) {
             super.visitJSForStatement(statement);
 
             JSStatement body = statement.getBody();
@@ -134,7 +130,7 @@ public void visitJSForStatement(@Nonnull JSForStatement statement) {
         }
 
         @Override
-        public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+        public void visitJSForInStatement(JSForInStatement statement) {
             super.visitJSForInStatement(statement);
 
             JSStatement body = statement.getBody();
@@ -149,7 +145,7 @@ public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
         }
 
         @Override
-        public void visitJSIfStatement(@Nonnull JSIfStatement statement) {
+        public void visitJSIfStatement(JSIfStatement statement) {
             super.visitJSIfStatement(statement);
 
             JSStatement thenBranch = statement.getThen();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index 78e661e4..97ae8456 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -17,8 +17,7 @@
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTagChild;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class UnterminatedStatementJSInspection extends JavaScriptInspection {
@@ -30,13 +29,11 @@ public boolean isEnabledByDefault() {
     private final TerminateStatementFix fix = new TerminateStatementFix();
 
     @Override
-    @Nonnull
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.unterminatedStatementDisplayName();
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.STYLE_GROUP_NAME;
     }
@@ -60,7 +57,6 @@ public InspectionJSFix buildFix(PsiElement location, Object state) {
 
     private static class TerminateStatementFix extends InspectionJSFix {
         @Override
-        @Nonnull
         public LocalizeValue getName() {
             return InspectionJSLocalize.terminateStatementFix();
         }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java
index 0477f3c9..c1f41152 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/FormattedTextFieldMacFix.java
@@ -1,6 +1,5 @@
 package com.sixrr.inspectjs.ui;
 
-import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
 import java.awt.*;
@@ -15,7 +14,7 @@ public static void apply(JFormattedTextField field) {
         if (isMacOs()) {
             Toolkit toolkit = Toolkit.getDefaultToolkit();
             int commandKeyMask = toolkit.getMenuShortcutKeyMask();
-            @NonNls InputMap inputMap = field.getInputMap();
+            InputMap inputMap = field.getInputMap();
             KeyStroke copyKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_C, commandKeyMask);
             inputMap.put(copyKeyStroke, "copy-to-clipboard");
             KeyStroke pasteKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_V, commandKeyMask);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
index a8b30e2f..ff12b4dd 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleCheckboxOptionsPanel.java
@@ -7,10 +7,9 @@
 import javax.swing.event.ChangeListener;
 import java.awt.*;
 
-import org.jetbrains.annotations.NonNls;
 
 public class SingleCheckboxOptionsPanel extends JPanel {
-    public SingleCheckboxOptionsPanel(String label, BaseInspection owner, @NonNls String property) {
+    public SingleCheckboxOptionsPanel(String label, BaseInspection owner, String property) {
         super(new GridBagLayout());
         boolean selected = getPropertyValue(owner, property);
         JCheckBox checkBox = new JCheckBox(label, selected);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
index 9693f3e5..45519012 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/ui/SingleIntegerFieldOptionsPanel.java
@@ -9,10 +9,9 @@
 import java.awt.*;
 import java.text.NumberFormat;
 
-import org.jetbrains.annotations.NonNls;
 
 public class SingleIntegerFieldOptionsPanel extends JPanel {
-    public SingleIntegerFieldOptionsPanel(String labelString, final BaseInspection owner, @NonNls final String property) {
+    public SingleIntegerFieldOptionsPanel(String labelString, final BaseInspection owner, final String property) {
         super(new GridBagLayout());
         JLabel label = new JLabel(labelString);
         NumberFormat formatter = NumberFormat.getIntegerInstance();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
index d138448b..2951b6b8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/BoolUtils.java
@@ -1,6 +1,5 @@
 package com.sixrr.inspectjs.utils;
 
-import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
@@ -9,15 +8,14 @@
 import com.intellij.lang.javascript.psi.JSPrefixExpression;
 import consulo.language.ast.IElementType;
 
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 public class BoolUtils {
     private BoolUtils() {
         super();
     }
 
-    public static boolean isNegation(@Nonnull JSExpression exp) {
+    public static boolean isNegation(JSExpression exp) {
         if (!(exp instanceof JSPrefixExpression)) {
             return false;
         }
@@ -31,7 +29,7 @@ public static boolean isTrue(@Nullable JSExpression test) {
         if (test == null) {
             return false;
         }
-        @NonNls String text = test.getText();
+        String text = test.getText();
         return "true".equals(text);
     }
 
@@ -39,11 +37,11 @@ public static boolean isFalse(@Nullable JSExpression test) {
         if (test == null) {
             return false;
         }
-        @NonNls String text = test.getText();
+        String text = test.getText();
         return "false".equals(text);
     }
 
-    public static String getNegatedExpressionText(@Nonnull JSExpression condition) {
+    public static String getNegatedExpressionText(JSExpression condition) {
         if (condition instanceof JSParenthesizedExpression) {
             JSExpression contentExpression = ((JSParenthesizedExpression)condition).getInnerExpression();
             return '(' + getNegatedExpressionText(contentExpression) + ')';
@@ -70,7 +68,7 @@ else if (ParenthesesUtils.getPrecendence(condition) >
         }
     }
 
-    private static JSExpression getNegated(@Nonnull JSExpression exp) {
+    private static JSExpression getNegated(JSExpression exp) {
         JSPrefixExpression prefixExp = (JSPrefixExpression)exp;
         JSExpression operand = prefixExp.getExpression();
         return ParenthesesUtils.stripParentheses(operand);
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
index 8a36203d..7a81b7b8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ComparisonUtils.java
@@ -4,8 +4,7 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.language.ast.IElementType;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,16 +58,16 @@ public static boolean isComparison(@Nullable JSExpression exp) {
         return s_comparisonStrings.contains(sign);
     }
 
-    public static String getFlippedComparison(@Nonnull IElementType str) {
+    public static String getFlippedComparison(IElementType str) {
         return s_swappedComparisons.get(str);
     }
 
-    public static boolean isEqualityComparison(@Nonnull JSBinaryExpression operator) {
+    public static boolean isEqualityComparison(JSBinaryExpression operator) {
         IElementType sign = operator.getOperationSign();
         return JSTokenTypes.EQEQ.equals(sign) || JSTokenTypes.NE.equals(sign);
     }
 
-    public static String getNegatedComparison(@Nonnull IElementType str) {
+    public static String getNegatedComparison(IElementType str) {
         return s_invertedComparisons.get(str);
     }
 }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
index 6baac9e3..cbb3e2a1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ConditionalUtils.java
@@ -1,9 +1,7 @@
 package com.sixrr.inspectjs.utils;
 
 import com.intellij.lang.javascript.psi.*;
-import org.jetbrains.annotations.NonNls;
 
-@NonNls
 public class ConditionalUtils {
     private ConditionalUtils() {
         super();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
index c53eec6e..7fe13382 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ControlFlowUtils.java
@@ -1,12 +1,11 @@
 package com.sixrr.inspectjs.utils;
 
-import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
 import com.sixrr.inspectjs.JSRecursiveElementVisitor;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ControlFlowUtils {
     private ControlFlowUtils() {
@@ -68,18 +67,18 @@ private static boolean withStatementMayReturnNormally(JSWithStatement jsWithStat
         return statementMayCompleteNormally(body);
     }
 
-    private static boolean doWhileStatementMayReturnNormally(@Nonnull JSDoWhileStatement loopStatement) {
+    private static boolean doWhileStatementMayReturnNormally(JSDoWhileStatement loopStatement) {
         JSExpression test = loopStatement.getCondition();
         JSStatement body = loopStatement.getBody();
         return statementMayCompleteNormally(body) && !BoolUtils.isTrue(test) || statementIsBreakTarget(loopStatement);
     }
 
-    private static boolean whileStatementMayReturnNormally(@Nonnull JSWhileStatement loopStatement) {
+    private static boolean whileStatementMayReturnNormally(JSWhileStatement loopStatement) {
         JSExpression test = loopStatement.getCondition();
         return !BoolUtils.isTrue(test) || statementIsBreakTarget(loopStatement);
     }
 
-    private static boolean forStatementMayReturnNormally(@Nonnull JSForStatement loopStatement) {
+    private static boolean forStatementMayReturnNormally(JSForStatement loopStatement) {
         JSExpression test = loopStatement.getCondition();
         if (statementIsBreakTarget(loopStatement)) {
             return true;
@@ -90,11 +89,11 @@ private static boolean forStatementMayReturnNormally(@Nonnull JSForStatement loo
         return !BoolUtils.isTrue(test);
     }
 
-    private static boolean foreachStatementMayReturnNormally(@Nonnull JSForInStatement loopStatement) {
+    private static boolean foreachStatementMayReturnNormally(JSForInStatement loopStatement) {
         return true;
     }
 
-    private static boolean switchStatementMayReturnNormally(@Nonnull JSSwitchStatement switchStatement) {
+    private static boolean switchStatementMayReturnNormally(JSSwitchStatement switchStatement) {
         if (statementIsBreakTarget(switchStatement)) {
             return true;
         }
@@ -121,7 +120,7 @@ private static boolean switchStatementMayReturnNormally(@Nonnull JSSwitchStateme
         return statementMayCompleteNormally(statements[statements.length - 1]);
     }
 
-    private static boolean tryStatementMayReturnNormally(@Nonnull JSTryStatement tryStatement) {
+    private static boolean tryStatementMayReturnNormally(JSTryStatement tryStatement) {
         JSStatement finallyBlock = tryStatement.getFinallyStatement();
         if (finallyBlock != null && !statementMayCompleteNormally(finallyBlock)) {
             return false;
@@ -138,7 +137,7 @@ private static boolean tryStatementMayReturnNormally(@Nonnull JSTryStatement try
         return statementMayCompleteNormally(catchStatement);
     }
 
-    private static boolean ifStatementMayReturnNormally(@Nonnull JSIfStatement ifStatement) {
+    private static boolean ifStatementMayReturnNormally(JSIfStatement ifStatement) {
         JSStatement thenBranch = ifStatement.getThen();
         if (statementMayCompleteNormally(thenBranch)) {
             return true;
@@ -147,7 +146,7 @@ private static boolean ifStatementMayReturnNormally(@Nonnull JSIfStatement ifSta
         return elseBranch == null || statementMayCompleteNormally(elseBranch);
     }
 
-    private static boolean labeledStatementMayCompleteNormally(@Nonnull JSLabeledStatement labeledStatement) {
+    private static boolean labeledStatementMayCompleteNormally(JSLabeledStatement labeledStatement) {
         JSStatement statement = labeledStatement.getStatement();
         return statementMayCompleteNormally(statement) || statementIsBreakTarget(statement);
     }
@@ -165,32 +164,32 @@ public static boolean blockMayCompleteNormally(@Nullable JSBlockStatement block)
         return true;
     }
 
-    private static boolean statementIsBreakTarget(@Nonnull JSStatement statement) {
+    private static boolean statementIsBreakTarget(JSStatement statement) {
         BreakFinder breakFinder = new BreakFinder(statement);
         statement.accept(breakFinder);
         return breakFinder.breakFound();
     }
 
-    public static boolean statementContainsReturn(@Nonnull JSStatement statement) {
+    public static boolean statementContainsReturn(JSStatement statement) {
         ReturnFinder returnFinder = new ReturnFinder();
         statement.accept(returnFinder);
         return returnFinder.returnFound();
     }
 
-    public static boolean statementIsContinueTarget(@Nonnull JSStatement statement) {
+    public static boolean statementIsContinueTarget(JSStatement statement) {
         ContinueFinder continueFinder = new ContinueFinder(statement);
         statement.accept(continueFinder);
         return continueFinder.continueFound();
     }
 
-    public static boolean isInLoop(@Nonnull JSElement element) {
+    public static boolean isInLoop(JSElement element) {
         return isInForStatementBody(element)
             || isInForeachStatementBody(element)
             || isInWhileStatementBody(element)
             || isInDoWhileStatementBody(element);
     }
 
-    public static boolean isInFinallyBlock(@Nonnull JSElement element) {
+    public static boolean isInFinallyBlock(JSElement element) {
         JSElement currentElement = element;
         while (true) {
             JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
@@ -207,7 +206,7 @@ public static boolean isInFinallyBlock(@Nonnull JSElement element) {
         }
     }
 
-    public static boolean isInCatchBlock(@Nonnull JSElement element) {
+    public static boolean isInCatchBlock(JSElement element) {
         JSElement currentElement = element;
         while (true) {
             JSTryStatement tryStatement = PsiTreeUtil.getParentOfType(currentElement, JSTryStatement.class);
@@ -225,7 +224,7 @@ public static boolean isInCatchBlock(@Nonnull JSElement element) {
         }
     }
 
-    private static boolean isInWhileStatementBody(@Nonnull JSElement element) {
+    private static boolean isInWhileStatementBody(JSElement element) {
         JSWhileStatement whileStatement = PsiTreeUtil.getParentOfType(element, JSWhileStatement.class);
         if (whileStatement == null) {
             return false;
@@ -234,7 +233,7 @@ private static boolean isInWhileStatementBody(@Nonnull JSElement element) {
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
-    private static boolean isInDoWhileStatementBody(@Nonnull JSElement element) {
+    private static boolean isInDoWhileStatementBody(JSElement element) {
         JSDoWhileStatement doWhileStatement = PsiTreeUtil.getParentOfType(element, JSDoWhileStatement.class);
         if (doWhileStatement == null) {
             return false;
@@ -243,7 +242,7 @@ private static boolean isInDoWhileStatementBody(@Nonnull JSElement element) {
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
-    private static boolean isInForStatementBody(@Nonnull JSElement element) {
+    private static boolean isInForStatementBody(JSElement element) {
         JSForStatement forStatement = PsiTreeUtil.getParentOfType(element, JSForStatement.class);
         if (forStatement == null) {
             return false;
@@ -252,7 +251,7 @@ private static boolean isInForStatementBody(@Nonnull JSElement element) {
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
-    private static boolean isInForeachStatementBody(@Nonnull JSElement element) {
+    private static boolean isInForeachStatementBody(JSElement element) {
         JSForInStatement foreachStatement = PsiTreeUtil.getParentOfType(element, JSForInStatement.class);
         if (foreachStatement == null) {
             return false;
@@ -261,7 +260,7 @@ private static boolean isInForeachStatementBody(@Nonnull JSElement element) {
         return PsiTreeUtil.isAncestor(body, element, true);
     }
 
-    public static JSStatement stripBraces(@Nonnull JSStatement branch) {
+    public static JSStatement stripBraces(JSStatement branch) {
         if (branch instanceof JSBlockStatement block) {
             JSStatement[] statements = block.getStatements();
             return statements.length == 1 ? statements[0] : block;
@@ -271,7 +270,7 @@ public static JSStatement stripBraces(@Nonnull JSStatement branch) {
         }
     }
 
-    public static boolean statementCompletesWithStatement(@Nonnull JSStatement containingStatement, @Nonnull JSStatement statement) {
+    public static boolean statementCompletesWithStatement(JSStatement containingStatement, JSStatement statement) {
         JSElement statementToCheck = statement;
         while (true) {
             if (statementToCheck.equals(containingStatement)) {
@@ -292,7 +291,7 @@ public static boolean statementCompletesWithStatement(@Nonnull JSStatement conta
         }
     }
 
-    public static boolean blockCompletesWithStatement(@Nonnull JSBlockStatement body, @Nonnull JSStatement statement) {
+    public static boolean blockCompletesWithStatement(JSBlockStatement body, JSStatement statement) {
         JSElement statementToCheck = statement;
         while (true) {
             if (statementToCheck == null) {
@@ -320,16 +319,16 @@ public static boolean blockCompletesWithStatement(@Nonnull JSBlockStatement body
         }
     }
 
-    private static boolean isLoop(@Nonnull JSElement element) {
+    private static boolean isLoop(JSElement element) {
         return element instanceof JSLoopStatement;
     }
 
     @Nullable
-    private static JSElement getContainingStatement(@Nonnull JSElement statement) {
+    private static JSElement getContainingStatement(JSElement statement) {
         return PsiTreeUtil.getParentOfType(statement, JSStatement.class);
     }
 
-    private static boolean statementIsLastInBlock(@Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
+    private static boolean statementIsLastInBlock(JSBlockStatement block, JSStatement statement) {
         JSStatement[] statements = block.getStatements();
         for (int i = statements.length - 1; i >= 0; i--) {
             JSStatement childStatement = statements[i];
@@ -351,7 +350,7 @@ public boolean returnFound() {
         }
 
         @Override
-        public void visitJSReturnStatement(@Nonnull JSReturnStatement returnStatement) {
+        public void visitJSReturnStatement(JSReturnStatement returnStatement) {
             if (m_found) {
                 return;
             }
@@ -364,7 +363,7 @@ private static class BreakFinder extends JSRecursiveElementVisitor {
         private boolean m_found = false;
         private final JSStatement m_target;
 
-        private BreakFinder(@Nonnull JSStatement target) {
+        private BreakFinder(JSStatement target) {
             super();
             m_target = target;
         }
@@ -374,7 +373,7 @@ public boolean breakFound() {
         }
 
         @Override
-        public void visitJSBreakStatement(@Nonnull JSBreakStatement breakStatement) {
+        public void visitJSBreakStatement(JSBreakStatement breakStatement) {
             if (m_found) {
                 return;
             }
@@ -393,7 +392,7 @@ private static class ContinueFinder extends JSRecursiveElementVisitor {
         private boolean m_found = false;
         private final JSStatement m_target;
 
-        private ContinueFinder(@Nonnull JSStatement target) {
+        private ContinueFinder(JSStatement target) {
             super();
             m_target = target;
         }
@@ -403,7 +402,7 @@ public boolean continueFound() {
         }
 
         @Override
-        public void visitJSContinueStatement(@Nonnull JSContinueStatement continueStatement) {
+        public void visitJSContinueStatement(JSContinueStatement continueStatement) {
             if (m_found) {
                 return;
             }
@@ -418,16 +417,16 @@ public void visitJSContinueStatement(@Nonnull JSContinueStatement continueStatem
         }
     }
 
-    public static boolean isInExitStatement(@Nonnull JSExpression expression) {
+    public static boolean isInExitStatement(JSExpression expression) {
         return isInReturnStatementArgument(expression) || isInThrowStatementArgument(expression);
     }
 
-    private static boolean isInReturnStatementArgument(@Nonnull JSExpression expression) {
+    private static boolean isInReturnStatementArgument(JSExpression expression) {
         JSReturnStatement returnStatement = PsiTreeUtil.getParentOfType(expression, JSReturnStatement.class);
         return returnStatement != null;
     }
 
-    private static boolean isInThrowStatementArgument(@Nonnull JSExpression expression) {
+    private static boolean isInThrowStatementArgument(JSExpression expression) {
         JSThrowStatement throwStatement = PsiTreeUtil.getParentOfType(expression, JSThrowStatement.class);
         return throwStatement != null;
     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
index cd888afe..b43d50a1 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/EquivalenceChecker.java
@@ -1,7 +1,6 @@
 package com.sixrr.inspectjs.utils;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import consulo.javascript.language.psi.JavaScriptType;
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.psi.PsiElement;
@@ -101,7 +100,7 @@ private static boolean withStatementsAreEquivalent(JSWithStatement statement1, J
         return statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean varStatementsAreEquivalent(@Nonnull JSVarStatement statement1, @Nonnull JSVarStatement statement2) {
+    private static boolean varStatementsAreEquivalent(JSVarStatement statement1, JSVarStatement statement2) {
         JSVariable[] variables1 = statement1.getVariables();
         JSVariable[] variables2 = statement2.getVariables();
         if (variables1.length != variables2.length) {
@@ -115,7 +114,7 @@ private static boolean varStatementsAreEquivalent(@Nonnull JSVarStatement statem
         return true;
     }
 
-    private static boolean variablesAreEquivalent(@Nonnull JSVariable var1, @Nonnull JSVariable var2) {
+    private static boolean variablesAreEquivalent(JSVariable var1, JSVariable var2) {
         JSExpression initializer1 = var1.getInitializer();
         JSExpression initializer2 = var2.getInitializer();
         if (!expressionsAreEquivalent(initializer1, initializer2)) {
@@ -134,7 +133,7 @@ private static boolean variablesAreEquivalent(@Nonnull JSVariable var1, @Nonnull
         return name1.equals(name2);
     }
 
-    private static boolean tryStatementsAreEquivalent(@Nonnull JSTryStatement statement1, @Nonnull JSTryStatement statement2) {
+    private static boolean tryStatementsAreEquivalent(JSTryStatement statement1, JSTryStatement statement2) {
         JSStatement tryBlock1 = statement1.getStatement();
         JSStatement tryBlock2 = statement2.getStatement();
         if (!statementsAreEquivalent(tryBlock1, tryBlock2)) {
@@ -163,7 +162,7 @@ private static boolean tryStatementsAreEquivalent(@Nonnull JSTryStatement statem
         return statementsAreEquivalent(catchStatement1, catchStatement2);
     }
 
-    private static boolean parametersAreEquivalent(@Nonnull JSParameter parameter1, @Nonnull JSParameter parameter2) {
+    private static boolean parametersAreEquivalent(JSParameter parameter1, JSParameter parameter2) {
         JavaScriptType type1 = parameter1.getType();
         JavaScriptType type2 = parameter2.getType();
         if (!typesAreEquivalent(type1, type2)) {
@@ -187,7 +186,7 @@ private static boolean typesAreEquivalent(@Nullable JavaScriptType type1, @Nulla
         return type1.equals(type2);
     }
 
-    private static boolean whileStatementsAreEquivalent(@Nonnull JSWhileStatement statement1, @Nonnull JSWhileStatement statement2) {
+    private static boolean whileStatementsAreEquivalent(JSWhileStatement statement1, JSWhileStatement statement2) {
         JSExpression condition1 = statement1.getCondition();
         JSExpression condition2 = statement2.getCondition();
         JSStatement body1 = statement1.getBody();
@@ -195,7 +194,7 @@ private static boolean whileStatementsAreEquivalent(@Nonnull JSWhileStatement st
         return expressionsAreEquivalent(condition1, condition2) && statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean forStatementsAreEquivalent(@Nonnull JSForStatement statement1, @Nonnull JSForStatement statement2) {
+    private static boolean forStatementsAreEquivalent(JSForStatement statement1, JSForStatement statement2) {
         JSExpression condition1 = statement1.getCondition();
         JSExpression condition2 = statement2.getCondition();
         if (!expressionsAreEquivalent(condition1, condition2)) {
@@ -216,7 +215,7 @@ private static boolean forStatementsAreEquivalent(@Nonnull JSForStatement statem
         return statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean forInStatementsAreEquivalent(@Nonnull JSForInStatement statement1, @Nonnull JSForInStatement statement2) {
+    private static boolean forInStatementsAreEquivalent(JSForInStatement statement1, JSForInStatement statement2) {
         JSExpression value1 = statement1.getCollectionExpression();
         JSExpression value2 = statement2.getCollectionExpression();
         if (!expressionsAreEquivalent(value1, value2)) {
@@ -232,7 +231,7 @@ private static boolean forInStatementsAreEquivalent(@Nonnull JSForInStatement st
         return statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean switchStatementsAreEquivalent(@Nonnull JSSwitchStatement statement1, @Nonnull JSSwitchStatement statement2) {
+    private static boolean switchStatementsAreEquivalent(JSSwitchStatement statement1, JSSwitchStatement statement2) {
         JSExpression switchExpression1 = statement1.getSwitchExpression();
         JSExpression swithcExpression2 = statement2.getSwitchExpression();
         if (!expressionsAreEquivalent(switchExpression1, swithcExpression2)) {
@@ -275,7 +274,7 @@ private static boolean caseClausesAreEquivalent(JSCaseClause clause1, JSCaseClau
         return false;
     }
 
-    private static boolean doWhileStatementsAreEquivalent(@Nonnull JSDoWhileStatement statement1, @Nonnull JSDoWhileStatement statement2) {
+    private static boolean doWhileStatementsAreEquivalent(JSDoWhileStatement statement1, JSDoWhileStatement statement2) {
         JSExpression condition1 = statement1.getCondition();
         JSExpression condition2 = statement2.getCondition();
         JSStatement body1 = statement1.getBody();
@@ -283,7 +282,7 @@ private static boolean doWhileStatementsAreEquivalent(@Nonnull JSDoWhileStatemen
         return expressionsAreEquivalent(condition1, condition2) && statementsAreEquivalent(body1, body2);
     }
 
-    private static boolean blockStatementsAreEquivalent(@Nonnull JSBlockStatement statement1, @Nonnull JSBlockStatement statement2) {
+    private static boolean blockStatementsAreEquivalent(JSBlockStatement statement1, JSBlockStatement statement2) {
         JSStatement[] statements1 = statement1.getStatements();
         JSStatement[] statements2 = statement2.getStatements();
         if (statements1.length != statements2.length) {
@@ -297,7 +296,7 @@ private static boolean blockStatementsAreEquivalent(@Nonnull JSBlockStatement st
         return true;
     }
 
-    private static boolean breakStatementsAreEquivalent(@Nonnull JSBreakStatement statement1, @Nonnull JSBreakStatement statement2) {
+    private static boolean breakStatementsAreEquivalent(JSBreakStatement statement1, JSBreakStatement statement2) {
         String identifier1 = statement1.getLabel();
         String identifier2 = statement2.getLabel();
         if (identifier1 == null) {
@@ -310,8 +309,8 @@ private static boolean breakStatementsAreEquivalent(@Nonnull JSBreakStatement st
     }
 
     private static boolean continueStatementsAreEquivalent(
-        @Nonnull JSContinueStatement statement1,
-        @Nonnull JSContinueStatement statement2
+        JSContinueStatement statement1,
+        JSContinueStatement statement2
     ) {
         String identifier1 = statement1.getLabel();
         String identifier2 = statement2.getLabel();
@@ -324,7 +323,7 @@ private static boolean continueStatementsAreEquivalent(
         return identifier1.equals(identifier2);
     }
 
-    private static boolean labeledStatementsAreEquivalent(@Nonnull JSLabeledStatement statement1, @Nonnull JSLabeledStatement statement2) {
+    private static boolean labeledStatementsAreEquivalent(JSLabeledStatement statement1, JSLabeledStatement statement2) {
         PsiElement identifier1 = statement1.getLabelIdentifier();
         PsiElement identifier2 = statement2.getLabelIdentifier();
         if (identifier1 == null) {
@@ -338,7 +337,7 @@ private static boolean labeledStatementsAreEquivalent(@Nonnull JSLabeledStatemen
         return text1.equals(text2);
     }
 
-    private static boolean ifStatementsAreEquivalent(@Nonnull JSIfStatement statement1, @Nonnull JSIfStatement statement2) {
+    private static boolean ifStatementsAreEquivalent(JSIfStatement statement1, JSIfStatement statement2) {
         JSExpression condition1 = statement1.getCondition();
         JSExpression condition2 = statement2.getCondition();
         JSStatement thenBranch1 = statement1.getThen();
@@ -351,21 +350,21 @@ && statementsAreEquivalent(thenBranch1, thenBranch2)
     }
 
     private static boolean expressionStatementsAreEquivalent(
-        @Nonnull JSExpressionStatement statement1,
-        @Nonnull JSExpressionStatement statement2
+        JSExpressionStatement statement1,
+        JSExpressionStatement statement2
     ) {
         JSExpression expression1 = statement1.getExpression();
         JSExpression expression2 = statement2.getExpression();
         return expressionsAreEquivalent(expression1, expression2);
     }
 
-    private static boolean returnStatementsAreEquivalent(@Nonnull JSReturnStatement statement1, @Nonnull JSReturnStatement statement2) {
+    private static boolean returnStatementsAreEquivalent(JSReturnStatement statement1, JSReturnStatement statement2) {
         JSExpression returnValue1 = statement1.getExpression();
         JSExpression returnValue2 = statement2.getExpression();
         return expressionsAreEquivalent(returnValue1, returnValue2);
     }
 
-    private static boolean throwStatementsAreEquivalent(@Nonnull JSThrowStatement statement1, @Nonnull JSThrowStatement statement2) {
+    private static boolean throwStatementsAreEquivalent(JSThrowStatement statement1, JSThrowStatement statement2) {
         JSExpression exception1 = statement1.getExpression();
         JSExpression exception2 = statement2.getExpression();
         return expressionsAreEquivalent(exception1, exception2);
@@ -474,8 +473,8 @@ private static boolean indexedAccessExpressionsAreEquivalent(
     }
 
     private static boolean methodCallExpressionsAreEquivalent(
-        @Nonnull JSCallExpression methodExp1,
-        @Nonnull JSCallExpression methodExp2
+        JSCallExpression methodExp1,
+        JSCallExpression methodExp2
     ) {
         JSExpression methodExpression1;
         JSExpression methodExpression2;
@@ -502,7 +501,7 @@ private static boolean methodCallExpressionsAreEquivalent(
         return expressionListsAreEquivalent(args1, args2);
     }
 
-    private static boolean newExpressionsAreEquivalent(@Nonnull JSNewExpression newExp1, @Nonnull JSNewExpression newExp2) {
+    private static boolean newExpressionsAreEquivalent(JSNewExpression newExp1, JSNewExpression newExp2) {
         JSExpression methodExpression1 = newExp1.getMethodExpression();
         JSExpression methodExpression2 = newExp2.getMethodExpression();
         if (!expressionsAreEquivalent(methodExpression1, methodExpression2)) {
@@ -522,8 +521,8 @@ private static boolean newExpressionsAreEquivalent(@Nonnull JSNewExpression newE
     }
 
     private static boolean arrayInitializerExpressionsAreEquivalent(
-        @Nonnull JSArrayLiteralExpression arrInitExp1,
-        @Nonnull JSArrayLiteralExpression arrInitExp2
+        JSArrayLiteralExpression arrInitExp1,
+        JSArrayLiteralExpression arrInitExp2
     ) {
         JSExpression[] initializers1 = arrInitExp1.getExpressions();
         JSExpression[] initializers2 = arrInitExp2.getExpressions();
@@ -531,8 +530,8 @@ private static boolean arrayInitializerExpressionsAreEquivalent(
     }
 
     private static boolean prefixExpressionsAreEquivalent(
-        @Nonnull JSPrefixExpression prefixExp1,
-        @Nonnull JSPrefixExpression prefixExp2
+        JSPrefixExpression prefixExp1,
+        JSPrefixExpression prefixExp2
     ) {
         IElementType sign1 = prefixExp1.getOperationSign();
         IElementType sign2 = prefixExp2.getOperationSign();
@@ -548,8 +547,8 @@ private static boolean prefixExpressionsAreEquivalent(
     }
 
     private static boolean postfixExpressionsAreEquivalent(
-        @Nonnull JSPostfixExpression postfixExp1,
-        @Nonnull JSPostfixExpression postfixExp2
+        JSPostfixExpression postfixExp1,
+        JSPostfixExpression postfixExp2
     ) {
         IElementType sign1 = postfixExp1.getOperationSign();
         IElementType sign2 = postfixExp2.getOperationSign();
@@ -561,7 +560,7 @@ private static boolean postfixExpressionsAreEquivalent(
         return expressionsAreEquivalent(operand1, operand2);
     }
 
-    private static boolean binaryExpressionsAreEquivalent(@Nonnull JSBinaryExpression binaryExp1, @Nonnull JSBinaryExpression binaryExp2) {
+    private static boolean binaryExpressionsAreEquivalent(JSBinaryExpression binaryExp1, JSBinaryExpression binaryExp2) {
         IElementType sign1 = binaryExp1.getOperationSign();
         IElementType sign2 = binaryExp2.getOperationSign();
         if (!sign1.equals(sign2)) {
@@ -575,8 +574,8 @@ private static boolean binaryExpressionsAreEquivalent(@Nonnull JSBinaryExpressio
     }
 
     private static boolean assignmentExpressionsAreEquivalent(
-        @Nonnull JSAssignmentExpression assignExp1,
-        @Nonnull JSAssignmentExpression assignExp2
+        JSAssignmentExpression assignExp1,
+        JSAssignmentExpression assignExp2
     ) {
         IElementType sign1 = assignExp1.getOperationSign();
         IElementType sign2 = assignExp2.getOperationSign();
@@ -592,8 +591,8 @@ private static boolean assignmentExpressionsAreEquivalent(
     }
 
     private static boolean conditionalExpressionsAreEquivalent(
-        @Nonnull JSConditionalExpression condExp1,
-        @Nonnull JSConditionalExpression condExp2
+        JSConditionalExpression condExp1,
+        JSConditionalExpression condExp2
     ) {
         JSExpression condition1 = condExp1.getCondition();
         JSExpression condition2 = condExp2.getCondition();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
index 5c6100f9..ba0f6ca0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/ExpressionUtil.java
@@ -4,7 +4,7 @@
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.ast.IElementType;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
index b1ed42c3..85c9169d 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/utils/SideEffectChecker.java
@@ -1,6 +1,5 @@
 package com.sixrr.inspectjs.utils;
 
-import jakarta.annotation.Nonnull;
 
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
@@ -12,7 +11,7 @@ private SideEffectChecker() {
         super();
     }
 
-    public static boolean mayHaveSideEffects(@Nonnull JSExpression exp) {
+    public static boolean mayHaveSideEffects(JSExpression exp) {
         SideEffectsVisitor visitJSor = new SideEffectsVisitor();
         exp.accept(visitJSor);
         return visitJSor.mayHaveSideEffects();
@@ -22,14 +21,14 @@ private static class SideEffectsVisitor extends JSRecursiveElementVisitor {
         private boolean mayHaveSideEffects = false;
 
         @Override
-        public void visitJSElement(@Nonnull JSElement element) {
+        public void visitJSElement(JSElement element) {
             if (!mayHaveSideEffects) {
                 super.visitJSElement(element);
             }
         }
 
         @Override
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expression) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -38,7 +37,7 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression expressi
         }
 
         @Override
-        public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
+        public void visitJSCallExpression(JSCallExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -47,7 +46,7 @@ public void visitJSCallExpression(@Nonnull JSCallExpression expression) {
         }
 
         @Override
-        public void visitJSNewExpression(@Nonnull JSNewExpression expression) {
+        public void visitJSNewExpression(JSNewExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -56,7 +55,7 @@ public void visitJSNewExpression(@Nonnull JSNewExpression expression) {
         }
 
         @Override
-        public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
+        public void visitJSPostfixExpression(JSPostfixExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
@@ -69,7 +68,7 @@ public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
         }
 
         @Override
-        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             if (mayHaveSideEffects) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
index 6fa43149..667a197f 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/BadExpressionStatementJSInspection.java
@@ -16,19 +16,15 @@
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class BadExpressionStatementJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.expressionStatementWhichIsNotAssignmentOrCallDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
@@ -89,7 +85,7 @@ private boolean isNotPointless(JSExpression expression) {
                 }
                 PsiElement signElement = expression.getFirstChild();
                 if (signElement != null) {
-                    @NonNls String text = signElement.getText();
+                    String text = signElement.getText();
                     if ("delete".equals(text)) {
                         return true;
                     }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
index 723ba1a6..99202c86 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DebuggerStatementJSInspection.java
@@ -10,20 +10,16 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class DebuggerStatementJSInspection extends JavaScriptInspection {
     @Override
-    @Nonnull
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.debuggerStatementDisplayName();
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
     }
@@ -54,7 +50,7 @@ public void visitJSExpressionStatement(JSExpressionStatement jsExpressionStateme
             if (!(expression instanceof JSReferenceExpression)) {
                 return;
             }
-            @NonNls String text = expression.getText();
+            String text = expression.getText();
             if (!"debugger".equals(text)) {
                 return;
             }
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
index f70a5825..b45557f8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicateCaseLabelJSInspection.java
@@ -11,7 +11,6 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -19,13 +18,11 @@
 
 @ExtensionImpl
 public class DuplicateCaseLabelJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.duplicateCaseLabelDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
@@ -49,7 +46,7 @@ public BaseInspectionVisitor buildVisitor() {
 
     private static class Visitor extends BaseInspectionVisitor {
         @Override
-        public void visitJSSwitchStatement(@Nonnull JSSwitchStatement statement) {
+        public void visitJSSwitchStatement(JSSwitchStatement statement) {
             super.visitJSSwitchStatement(statement);
 
             Set<JSExpression> conditions = new HashSet<>();
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
index 4b856f74..d974fbd8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/DuplicatePropertyOnObjectJSInspection.java
@@ -9,19 +9,16 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 import java.util.Arrays;
 
 @ExtensionImpl
 public class DuplicatePropertyOnObjectJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.duplicatePropertyOnObjectLiteralDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
index 5ea1c207..b4aa3cee 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/FunctionWithInconsistentReturnsJSInspection.java
@@ -14,18 +14,15 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class FunctionWithInconsistentReturnsJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.functionWithInconsistentReturnsDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
index ce68eac3..b9c490d0 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/StringLiteralBreaksHTMLJSInspection.java
@@ -8,18 +8,15 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class StringLiteralBreaksHTMLJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.stringLiteralBreaksHtmlDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index 77d24482..fe4ccb93 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -14,18 +14,15 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
 import consulo.xml.psi.xml.XmlAttributeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class ThisExpressionReferencesGlobalObjectJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.thisExpressionWhichReferencesTheGlobalObjectDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
index ddebabb8..a543f472 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/UnreachableCodeJSInspection.java
@@ -10,18 +10,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class UnreachableCodeJSInspection extends JavaScriptInspection {
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return InspectionJSLocalize.unreachableCodeDisplayName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return JSGroupNames.VALIDITY_GROUP_NAME;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
index 6fd19076..ebc856e6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementPredicate.java
@@ -17,8 +17,7 @@
 
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
 
 public interface JSElementPredicate {
-    boolean satisfiedBy(@Nonnull PsiElement element);
+    boolean satisfiedBy(PsiElement element);
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
index c65b552d..92409c56 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
@@ -25,7 +25,6 @@
 import consulo.logging.Logger;
 import consulo.xml.psi.xml.XmlFile;
 import org.intellij.idea.lang.javascript.psiutil.FindReferenceUtil;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -86,11 +85,8 @@ static Iterable<JSElement> getEmbeddedJSElements(XmlFile file) {
      * this.visitElement() can be called.
      */
     private static class EmbeddedJSElementIterator implements Iterator<JSElement> {
-        @NonNls
         private static final String SCRIPT_START = "<SCRIPT";
-        @NonNls
         private static final String SCRIPT_END = "</SCRIPT>";
-        @NonNls
         private static final String HTML_TAG_END = ">";
 
         final XmlFile file;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index 05ad4b10..e4410eb1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -25,8 +25,7 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlElement;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public abstract class JSIntention extends PsiElementBaseIntentionAction {
     private final JSElementPredicate predicate;
@@ -36,7 +35,7 @@ protected JSIntention() {
     }
 
     @Override
-    public void invoke(@Nonnull Project project, Editor editor, @Nonnull PsiElement element) throws IncorrectOperationException {
+    public void invoke(Project project, Editor editor, PsiElement element) throws IncorrectOperationException {
         PsiElement matchingElement = findMatchingElement(element);
         if (matchingElement == null) {
             return;
@@ -44,9 +43,8 @@ public void invoke(@Nonnull Project project, Editor editor, @Nonnull PsiElement
         processIntention(matchingElement);
     }
 
-    protected abstract void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException;
+    protected abstract void processIntention(PsiElement element) throws IncorrectOperationException;
 
-    @Nonnull
     protected abstract JSElementPredicate getElementPredicate();
 
     @Nullable
@@ -73,7 +71,7 @@ protected PsiElement findMatchingElement(@Nullable PsiElement element) {
     }
 
     @Override
-    public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement element) {
+    public boolean isAvailable(Project project, Editor editor, @Nullable PsiElement element) {
         return element != null && findMatchingElement(element) != null;
     }
 
@@ -83,6 +81,5 @@ public boolean startInWriteAction() {
     }
 
     @Override
-    @Nonnull
     public abstract LocalizeValue getText();
 }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
index 5b4bc7c4..2d560b45 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSMutablyNamedIntention.java
@@ -19,8 +19,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public abstract class JSMutablyNamedIntention extends JSIntention {
     private LocalizeValue myText = LocalizeValue.empty();
@@ -28,16 +27,14 @@ public abstract class JSMutablyNamedIntention extends JSIntention {
     protected abstract LocalizeValue getTextForElement(PsiElement element);
 
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return myText.orIfEmpty(getBasicText());
     }
 
-    @Nonnull
     protected abstract LocalizeValue getBasicText();
 
     @Override
-    public boolean isAvailable(@Nonnull Project project, Editor editor, @Nullable PsiElement node) {
+    public boolean isAvailable(Project project, Editor editor, @Nullable PsiElement node) {
         PsiElement element = findMatchingElement(node);
         if (element != null) {
             myText = getTextForElement(element);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
index 349c43b2..7d660473 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ComparisonPredicate.java
@@ -22,11 +22,10 @@
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 
-import jakarta.annotation.Nonnull;
 
 class ComparisonPredicate implements JSElementPredicate {
     @Override
-    public boolean satisfiedBy(@Nonnull PsiElement element) {
+    public boolean satisfiedBy(PsiElement element) {
         if (!(element instanceof JSBinaryExpression)) {
             return false;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
index 76b3c996..a8ae110a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/ConjunctionPredicate.java
@@ -19,13 +19,12 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 
 class ConjunctionPredicate implements JSElementPredicate {
     @Override
-    public boolean satisfiedBy(@Nonnull PsiElement element) {
+    public boolean satisfiedBy(PsiElement element) {
         if (!(element instanceof JSBinaryExpression)) {
             return false;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
index 39d43962..9fce1f34 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSDeMorgansLawIntention.java
@@ -27,7 +27,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
@@ -41,7 +40,6 @@
 )
 public class JSDeMorgansLawIntention extends JSMutablyNamedIntention {
     @Override
-    @Nonnull
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.boolDeMorgansLaw();
     }
@@ -57,14 +55,13 @@ protected LocalizeValue getTextForElement(PsiElement element) {
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ConjunctionPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSBinaryExpression exp = (JSBinaryExpression)element;
         IElementType tokenType = exp.getOperationSign();
         JSElement parent = (JSElement)exp.getParent();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
index 4f2a03ef..8a66adbc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipComparisonIntention.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
@@ -38,7 +37,6 @@
     fileExtensions = "js"
 )
 public class JSFlipComparisonIntention extends JSMutablyNamedIntention {
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.boolFlipComparison();
@@ -68,14 +66,13 @@ else if (operatorText.equals(flippedOperatorText)) {
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ComparisonPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSBinaryExpression exp = (JSBinaryExpression)element;
         JSExpression lhs = exp.getLOperand();
         JSExpression rhs = exp.getROperand();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
index 7449f1dc..b3695445 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSFlipConjunctionIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -39,7 +38,6 @@
     fileExtensions = "js"
 )
 public class JSFlipConjunctionIntention extends JSMutablyNamedIntention {
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.boolFlipConjunction();
@@ -55,14 +53,13 @@ protected LocalizeValue getTextForElement(PsiElement element) {
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ConjunctionPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSBinaryExpression binaryExpression = (JSBinaryExpression)element;
         JSExpression exp = binaryExpression;
 
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
index 19f43d00..06a82903 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSNegateComparisonIntention.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.ComparisonUtils;
@@ -38,7 +37,6 @@
     fileExtensions = "js"
 )
 public class JSNegateComparisonIntention extends JSMutablyNamedIntention {
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.boolNegateComparison();
@@ -64,14 +62,13 @@ public LocalizeValue getTextForElement(PsiElement element) {
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ComparisonPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSBinaryExpression exp = (JSBinaryExpression)element;
         JSExpression lhs = exp.getLOperand();
         JSExpression rhs = exp.getROperand();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
index 37c00599..e8ecc2e0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/bool/JSRemoveBooleanEqualityIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -41,7 +40,6 @@
     fileExtensions = "js"
 )
 public class JSRemoveBooleanEqualityIntention extends JSMutablyNamedIntention {
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.boolRemoveBooleanEquality();
@@ -58,13 +56,12 @@ protected LocalizeValue getTextForElement(PsiElement element) {
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new BooleanLiteralEqualityPredicate();
     }
 
     @Override
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSBinaryExpression exp = (JSBinaryExpression)element;
         boolean isEquals = exp.getOperationSign().equals(JSTokenTypes.EQEQ);
         JSExpression lhs = exp.getLOperand();
@@ -112,7 +109,7 @@ else if (BoolUtils.TRUE.equals(rhsText)) {
 
     private static class BooleanLiteralEqualityPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSBinaryExpression) || ErrorUtil.containsError(element)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
index 04e2948e..08122f3c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSAddBracesIntention.java
@@ -24,7 +24,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -37,12 +36,10 @@
 )
 public class JSAddBracesIntention extends JSMutablyNamedIntention {
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new AddBracesPredicate();
     }
 
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.bracesAdd();
@@ -73,7 +70,7 @@ protected LocalizeValue getTextForElement(PsiElement element) {
 
     @Override
     @RequiredReadAction
-    protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    protected void processIntention(PsiElement element) throws IncorrectOperationException {
         if (!(element instanceof JSStatement statement)) {
             return;
         }
@@ -87,7 +84,7 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe
 
     private static class AddBracesPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSStatement)
                 || element instanceof JSBlockStatement
                 || !(element.getParent() instanceof JSElement parent)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
index ad0843f9..31dc257c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/braces/JSRemoveBracesIntention.java
@@ -24,7 +24,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -36,14 +35,12 @@
     fileExtensions = "js"
 )
 public class JSRemoveBracesIntention extends JSMutablyNamedIntention {
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.bracesRemove();
     }
 
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new RemoveBracesPredicate();
     }
@@ -73,7 +70,7 @@ protected LocalizeValue getTextForElement(PsiElement element) {
 
     @Override
     @RequiredReadAction
-    protected void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    protected void processIntention(PsiElement element) throws IncorrectOperationException {
         JSBlockStatement blockStatement = (JSBlockStatement)element;
         JSStatement[] statements = blockStatement.getStatements();
         JSStatement statement = statements[0];
@@ -113,7 +110,7 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe
 
     public static class RemoveBracesPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSBlockStatement blockStatement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
index f81b34c9..413c769d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToCStyleCommentIntention.java
@@ -25,7 +25,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -41,20 +40,18 @@
 )
 public class JSChangeToCStyleCommentIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.commentChangeToCstyleComment();
     }
 
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new EndOfLineCommentPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiComment firstComment = (PsiComment)element;
 
         while (true) {
@@ -112,7 +109,7 @@ private static String getCommentContents(PsiComment comment) {
     private static class EndOfLineCommentPredicate implements JSElementPredicate {
 
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof PsiComment comment && JSTokenTypes.END_OF_LINE_COMMENT.equals(comment.getTokenType());
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
index d22df3f6..b9986e60 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSChangeToEndOfLineCommentIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -40,20 +39,18 @@
 )
 public class JSChangeToEndOfLineCommentIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.commentChangeToEndOfLineComment();
     }
 
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new CStyleCommentPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiElement parent = element.getParent();
 
         assert (parent != null);
@@ -118,7 +115,7 @@ else if (line.startsWith("*")) {
     private static class CStyleCommentPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof PsiComment)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
index 12d0ebf8..d53e6b0c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/comment/JSMoveCommentToSeparateLineIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -40,20 +39,18 @@
 )
 public class JSMoveCommentToSeparateLineIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.commentMoveCommentToSeparateLine();
     }
 
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new CommentOnLineWithSourcePredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiComment selectedComment = (PsiComment)element;
         PsiElement elementToCheck = selectedComment;
         PsiWhiteSpace whiteSpace;
@@ -87,7 +84,7 @@ private static boolean containsLineBreak(String text) {
     private static class CommentOnLineWithSourcePredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof PsiComment)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
index 0b1b6af9..34036457 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipConditionalIntention.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
@@ -40,20 +39,18 @@
 )
 public class JSFlipConditionalIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.conditionalFlipConditional();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new FlipConditionalPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSConditionalExpression exp = (JSConditionalExpression)element;
         JSExpression condition = exp.getCondition();
         JSExpression elseExpression = exp.getElse();
@@ -70,7 +67,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     private static class FlipConditionalPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSConditionalExpression) || ErrorUtil.containsError(element)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
index 52f78d4c..97d48829 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSFlipIfIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
@@ -41,20 +40,18 @@
 )
 public class JSFlipIfIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.conditionalFlipIf();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new FlipIfPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSIfStatement exp = (JSIfStatement)element;
         JSExpression condition = exp.getCondition();
         JSStatement thenBranch = exp.getThen();
@@ -72,7 +69,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     private static class FlipIfPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSIfStatement ifStatement
                 && !ErrorUtil.containsError(ifStatement)
                 && ifStatement.getCondition() != null;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
index 9d925cb5..312f15d1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSRemoveConditionalIntention.java
@@ -24,7 +24,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.BoolUtils;
@@ -40,20 +39,18 @@
 )
 public class JSRemoveConditionalIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.conditionalRemoveConditional();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new RemoveConditionalPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSConditionalExpression exp = (JSConditionalExpression)element;
         JSExpression condition = exp.getCondition();
         JSExpression thenExpression = exp.getThen();
@@ -72,7 +69,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class RemoveConditionalPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (element instanceof JSConditionalExpression condition && !ErrorUtil.containsError(element)) {
                 JSExpression thenExpression = ParenthesesUtils.stripParentheses(condition.getThen());
                 JSExpression elseExpression = ParenthesesUtils.stripParentheses(condition.getElse());
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
index 531ce789..b11e2129 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/conditional/JSReplaceConditionalWithIfIntention.java
@@ -22,7 +22,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
@@ -35,26 +34,24 @@
 )
 public class JSReplaceConditionalWithIfIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.conditionalReplaceConditionalWithIf();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ReplaceConditionalWithIfPredicate();
     }
 
     @Override
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSConditionalExpression);
         ConditionalUtils.replaceConditionalWithIf((JSConditionalExpression)element);
     }
 
     private static class ReplaceConditionalWithIfPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return (element instanceof JSConditionalExpression);
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
index 09d36b54..2d9dd130 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantExpressionIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringEscapeUtil;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -40,20 +39,18 @@
     fileExtensions = "js"
 )
 public class JSConstantExpressionIntention extends JSIntention {
-    @Nonnull
     @Override
     public LocalizeValue getText() {
         return JSIntentionLocalize.constantComputeExpression();
     }
 
-    @Nonnull
     @Override
     protected JSElementPredicate getElementPredicate() {
         return new ConstantExpressionPredicate();
     }
 
     @Override
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSExpression expression = (JSExpression) element;
         Object value = ExpressionUtil.computeConstantExpression(expression);
         String newExpression = value instanceof String strValue
@@ -64,7 +61,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     private static class ConstantExpressionPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSExpression expression
                 && !ErrorUtil.containsError(element)
                 && !(element instanceof JSLiteralExpression)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
index e9372468..e346a2cc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/constant/JSConstantSubexpressionIntention.java
@@ -28,8 +28,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringEscapeUtil;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -44,13 +43,11 @@
     fileExtensions = "js"
 )
 public class JSConstantSubexpressionIntention extends JSMutablyNamedIntention {
-    @Nonnull
     @Override
     protected JSElementPredicate getElementPredicate() {
         return new ConstantSubexpressionPredicate();
     }
 
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.constantComputeSubexpression();
@@ -78,7 +75,7 @@ protected LocalizeValue getTextForElement(PsiElement element) {
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiElement parent = element.getParent();
         JSExpression expression = (JSExpression) (parent instanceof JSBinaryExpression ? parent : element);
         StringBuilder newExpression = new StringBuilder();
@@ -158,7 +155,7 @@ private static JSBinaryExpression getSubexpression(JSBinaryExpression expression
     private static class ConstantSubexpressionPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSElement || element.getPrevSibling() instanceof JSElement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
index 73faa4da..009a8ed1 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/increment/JSExtractIncrementIntention.java
@@ -24,7 +24,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
@@ -37,7 +36,6 @@
 )
 public class JSExtractIncrementIntention extends JSMutablyNamedIntention {
     @Override
-    @Nonnull
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.incrementExtract();
     }
@@ -49,14 +47,13 @@ public LocalizeValue getTextForElement(PsiElement element) {
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ExtractIncrementPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         boolean isPostfix = (element instanceof JSPostfixExpression);
         JSExpression operand = isPostfix
             ? ((JSPostfixExpression)element).getExpression()
@@ -83,7 +80,7 @@ private static IElementType getOperationSign(PsiElement element) {
 
     private static class ExtractIncrementPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!ExpressionUtil.isIncrementDecrementExpression(element)
                 || ErrorUtil.containsError(element)
                 || element.getParent() instanceof JSExpressionStatement) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
index 405df98c..f9096d42 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSMergeDeclarationAndInitializationIntention.java
@@ -23,7 +23,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -40,20 +39,18 @@
 )
 public class JSMergeDeclarationAndInitializationIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.initializationMergeDeclarationAndInitialization();
     }
 
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new Predicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSVarStatement);
 
         JSVarStatement varStatement = (JSVarStatement)element;
@@ -97,7 +94,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class Predicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (element instanceof JSVarStatement varStatement && !ErrorUtil.containsError(varStatement)) {
                 for (JSVariable variable : varStatement.getVariables()) {
                     if (variable.hasInitializer()) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
index a6094183..a1e0dc67 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/initialization/JSSplitDeclarationAndInitializationIntention.java
@@ -27,12 +27,10 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,24 +42,21 @@
     fileExtensions = "js"
 )
 public class JSSplitDeclarationAndInitializationIntention extends JSIntention {
-    @NonNls
     private static final String VAR_KEYWORD = "var ";
 
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.initializationSplitDeclarationAndInitialization();
     }
 
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new Predicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSVarStatement);
 
         JSVarStatement varStatement = (JSVarStatement)element;
@@ -98,7 +93,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     private static class Predicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             PsiElement elementParent;
 
             if (!(element instanceof JSVarStatement)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
index bb50ad48..75df6e0b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForInLoopsIntention.java
@@ -28,7 +28,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -44,20 +43,18 @@
 )
 public class JSMergeParallelForInLoopsIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.loopMergeParallelForInLoops();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeParallelForInLoopsPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
@@ -89,7 +86,7 @@ private void mergeForInStatements(StringBuilder statementBuffer, JSForInStatemen
 
     private static class MergeParallelForInLoopsPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSForInStatement forInStatement
                 && !ErrorUtil.containsError(element)
                 && JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSForInStatement nextForInStatement
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
index 4289c261..bcfaa1b5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/loop/JSMergeParallelForLoopsIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -42,20 +41,18 @@
 )
 public class JSMergeParallelForLoopsIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.loopMergeParallelForLoops();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeParallelForLoopsPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
@@ -90,7 +87,7 @@ private void mergeForStatements(StringBuilder statementBuffer, JSForStatement fi
 
     private static class MergeParallelForLoopsPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSForStatement forStatement
                 && !ErrorUtil.containsError(forStatement)
                 && JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSForStatement nextForStatement
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
index 6d0abc25..829ac4d2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToDecimalIntention.java
@@ -23,7 +23,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -37,19 +36,17 @@
 )
 public class JSConvertIntegerToDecimalIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.numberConvertIntegerToDecimal();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ConvertIntegerToDecimalPredicate();
     }
 
     @Override
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSLiteralExpression exp = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(exp, NumberUtil.getLiteralNumber(exp).toString());
@@ -58,7 +55,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class ConvertIntegerToDecimalPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSLiteralExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
index b039d78c..58beeef9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToHexIntention.java
@@ -23,7 +23,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -37,19 +36,17 @@
 )
 public class JSConvertIntegerToHexIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.numberConvertIntegerToHex();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ConvertIntegerToHexPredicate();
     }
 
     @Override
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSLiteralExpression exp = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(exp, "0x" + NumberUtil.getLiteralNumber(exp).toString(16));
@@ -58,7 +55,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class ConvertIntegerToHexPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSLiteralExpression && NumberUtil.isDecimal(element.getText());
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
index 00ab0b65..15e0a1e5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSConvertIntegerToOctalIntention.java
@@ -23,7 +23,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -37,19 +36,17 @@
 )
 public class JSConvertIntegerToOctalIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.numberConvertIntegerToOctal();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ConvertIntegerToOctalPredicate();
     }
 
     @Override
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSLiteralExpression exp = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(exp, '0' + NumberUtil.getLiteralNumber(exp).toString(8));
@@ -58,7 +55,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class ConvertIntegerToOctalPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSLiteralExpression)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
index 2a41a99b..d14e0012 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceMultiplyWithShiftIntention.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -39,7 +38,6 @@
     fileExtensions = "js"
 )
 public class JSReplaceMultiplyWithShiftIntention extends JSMutablyNamedIntention {
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.numberReplaceMultiplyWithShift();
@@ -62,14 +60,13 @@ protected LocalizeValue getTextForElement(PsiElement element) {
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MultiplyByPowerOfTwoPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         if (element instanceof JSAssignmentExpression assignmentExpression) {
             this.replaceMultiplyOrDivideAssignWithShiftAssign(assignmentExpression);
         }
@@ -117,7 +114,7 @@ private void replaceMultiplyOrDivideWithShift(JSBinaryExpression exp) throws Inc
     private static class MultiplyByPowerOfTwoPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSAssignmentExpression assignmentExpression
                 ? isMultiplyByPowerOfTwo(assignmentExpression)
                 : element instanceof JSBinaryExpression binaryExpression && isMultiplyByPowerOfTwo(binaryExpression);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
index ea0e3401..11b3ded8 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/number/JSReplaceShiftWithMultiplyIntention.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.BinaryOperatorUtils;
@@ -39,7 +38,6 @@
     fileExtensions = "js"
 )
 public class JSReplaceShiftWithMultiplyIntention extends JSMutablyNamedIntention {
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.numberReplaceShiftWithMultiply();
@@ -62,14 +60,13 @@ protected LocalizeValue getTextForElement(PsiElement element) {
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ShiftByLiteralPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         if (element instanceof JSAssignmentExpression assignmentExpression) {
             this.replaceShiftAssignWithMultiplyOrDivideAssign(assignmentExpression);
         }
@@ -111,7 +108,7 @@ private void replaceShiftWithMultiplyOrDivide(JSBinaryExpression exp) throws Inc
     private static class ShiftByLiteralPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSAssignmentExpression assignmentExpression
                 ? this.isAssignmentShiftByLiteral(assignmentExpression)
                 : element instanceof JSBinaryExpression binaryExpression && this.isBinaryShiftByLiteral(binaryExpression);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
index 21480878..7e2714b0 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/opassign/JSReplaceWithOperatorAssignmentIntention.java
@@ -28,7 +28,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSMutablyNamedIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
@@ -40,7 +39,6 @@
     fileExtensions = "js"
 )
 public class JSReplaceWithOperatorAssignmentIntention extends JSMutablyNamedIntention {
-    @Nonnull
     @Override
     protected LocalizeValue getBasicText() {
         return JSIntentionLocalize.opassignReplaceWithOperatorAssignment();
@@ -58,14 +56,13 @@ public LocalizeValue getTextForElement(PsiElement element) {
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new Predicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSAssignmentExpression exp = (JSAssignmentExpression)element;
         JSBinaryExpression rhs = (JSBinaryExpression)exp.getROperand();
         JSExpression lhs = exp.getLOperand();
@@ -84,7 +81,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class Predicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSAssignmentExpression) || ErrorUtil.containsError(element)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
index 7e8d7506..4f3cf4e4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/parenthesis/JSRemoveUnnecessaryParenthesesIntention.java
@@ -27,7 +27,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -42,19 +41,17 @@
 )
 public class JSRemoveUnnecessaryParenthesesIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.parenthesisRemoveUnnecessaryParentheses();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new UnnecessaryParenthesesPredicate();
     }
 
     @Override
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSExpression exp = (JSExpression)element;
 
         while (exp.getParent() instanceof JSExpression parentExp) {
@@ -69,7 +66,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class UnnecessaryParenthesesPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (element instanceof JSParenthesizedExpression expression && !ErrorUtil.containsError(element)) {
                 if (!(expression.getParent() instanceof JSExpression parentExpression)) {
                     return true;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
index 49877e27..8f4f845e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSDoubleToSingleQuotedStringIntention.java
@@ -23,7 +23,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -36,20 +35,18 @@
 )
 public class JSDoubleToSingleQuotedStringIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.stringDoubleQuotedToSingleQuoted();
     }
 
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new DoubleToSingleQuotedStringPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSLiteralExpression stringLiteral = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(stringLiteral, changeQuotes(stringLiteral.getText()));
@@ -82,7 +79,7 @@ static String changeQuotes(String stringLiteral) {
 
     private static class DoubleToSingleQuotedStringPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSLiteralExpression literalExpression && StringUtil.isDoubleQuoteStringLiteral(literalExpression);
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
index c603fcc6..6b45637c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSJoinConcatenatedStringLiteralsIntention.java
@@ -28,7 +28,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -41,20 +40,18 @@
 )
 public class JSJoinConcatenatedStringLiteralsIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.stringJoinConcatenatedStringLiterals();
     }
 
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new StringConcatPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSBinaryExpression expression = (JSBinaryExpression)element;
         JSExpression lhs = expression.getLOperand();
         JSExpression rhs = expression.getROperand();
@@ -83,7 +80,7 @@ else if (StringUtil.isDoubleQuoteStringLiteral(leftLiteral)
     private static class StringConcatPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSBinaryExpression expression
                 && JSTokenTypes.PLUS.equals(expression.getOperationSign())
                 && isApplicableLiteral(expression.getLOperand())
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
index b8b7a940..9713aaf4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/string/JSSingleToDoubleQuotedStringIntention.java
@@ -23,7 +23,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.JSElementFactory;
@@ -36,20 +35,18 @@
 )
 public class JSSingleToDoubleQuotedStringIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.stringSingleToDoubleQuotedString();
     }
 
     @Override
-    @Nonnull
     protected JSElementPredicate getElementPredicate() {
         return new SingleToDoubleQuotedStringPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSLiteralExpression charLiteral = (JSLiteralExpression)element;
 
         JSElementFactory.replaceExpression(charLiteral, changeQuotes(charLiteral.getText()));
@@ -82,7 +79,7 @@ static String changeQuotes(String charLiteral) {
 
     private static class SingleToDoubleQuotedStringPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSLiteralExpression expression && StringUtil.isSimpleQuoteStringLiteral(expression);
         }
     }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
index 84819e80..4f26bdd2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceIfWithSwitchIntention.java
@@ -25,11 +25,9 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.*;
 
@@ -40,32 +38,25 @@
     fileExtensions = "js"
 )
 public class JSReplaceIfWithSwitchIntention extends JSIntention {
-    @NonNls
     private static final String IF_KEYWORD = "if";
-    @NonNls
     private static final String DEFAULT_LABEL_NAME = "Label";
-    @NonNls
     private static final String DEFAULT_CASE_CLAUSE_EXPRESSION = "default: ";
-    @NonNls
     private static final String LABELED_BREAK_STATEMENT_PREFIX = "break ";
-    @NonNls
     private static final String BREAK_STATEMENT = "\nbreak;";
 
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.switchtoifReplaceIfWithSwitch();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new IfToSwitchPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSIfStatement ifStatement = (JSIfStatement)element.getParent();
 
         assert (ifStatement != null);
@@ -338,7 +329,7 @@ else if (element instanceof JSBlockStatement || element instanceof JSIfStatement
     private static class IfToSwitchPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element.getParent() instanceof JSIfStatement statement
                 && IF_KEYWORD.equals(element.getText())
                 && !ErrorUtil.containsError(statement)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
index c8e3d184..b9352384 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/switchtoif/JSReplaceSwitchWithIfIntention.java
@@ -27,11 +27,9 @@
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.*;
 
@@ -42,36 +40,27 @@
     fileExtensions = "js"
 )
 public class JSReplaceSwitchWithIfIntention extends JSIntention {
-    @NonNls
     private static final String IF_PREFIX = "if (";
-    @NonNls
     private static final String IF_SUFFIX = ") {";
-    @NonNls
     private static final String ELSE = "} else {";
-    @NonNls
     private static final String ELSE_KEYWORD = "else ";
-    @NonNls
     private static final String VAR_PREFIX = "var ";
-    @NonNls
     private static final String BREAK_KEYWORD = "break ";
-    @NonNls
     private static final String DEFAULT_LABEL_NAME = "Label";
 
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.switchtoifReplaceSwitchWithIf();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SwitchPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSSwitchStatement switchStatement = (JSSwitchStatement)element.getParent();
 
         assert (switchStatement != null);
@@ -379,7 +368,7 @@ else if (element instanceof JSIfStatement ifStatement) {
 
     private static class SwitchPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             PsiElement parent = element.getParent();
 
             if (parent instanceof JSSwitchStatement switchStatement) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
index 954207da..e91d9330 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeElseIfIntention.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -39,19 +38,17 @@
 )
 public class JSMergeElseIfIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifMergeElseIf();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeElseIfPredicate();
     }
 
     @Override
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSIfStatement parentStatement = (JSIfStatement)element.getParent();
 
         assert (parentStatement != null);
@@ -64,7 +61,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     private static class MergeElseIfPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSElement
                 && element.getParent() instanceof JSIfStatement ifStatement
                 && !ErrorUtil.containsError(ifStatement)
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
index 931d4ec3..4f9a7ea5 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfAndIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
@@ -42,20 +41,18 @@
 )
 public class JSMergeIfAndIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifMergeIfAnd();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeIfAndPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         assert (element.getParent() != null);
         assert (element.getParent() instanceof JSIfStatement || element instanceof JSIfStatement);
 
@@ -74,7 +71,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class MergeIfAndPredicate implements JSElementPredicate {
 
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSElement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
index a82725e7..263dbbaa 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeIfOrIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
@@ -39,20 +38,18 @@
 )
 public class JSMergeIfOrIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifMergeIfOr();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeIfOrPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         assert (element instanceof JSElement);
         JSElement jsElement = (JSElement)element;
         if (MergeIfOrPredicate.isMergableExplicitIf(jsElement)) {
@@ -121,7 +118,7 @@ private static void replaceMergeableImplicitIf(JSElement token) throws Incorrect
 
     private static class MergeIfOrPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSElement jsElement
                 && (isMergableExplicitIf(jsElement) || isMergableImplicitIf(jsElement));
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
index bbca23e4..2bcf39ba 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSMergeParallelIfsIntention.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ControlFlowUtils;
@@ -41,20 +40,18 @@
 )
 public class JSMergeParallelIfsIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifMergeParallelIfs();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new MergeParallelIfsPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiElement nextElement = JSElementFactory.getNonWhiteSpaceSibling(element, true);
 
         assert (nextElement != null);
@@ -94,7 +91,7 @@ private void mergeIfStatements(StringBuilder statementBuffer, JSIfStatement firs
 
     private static class MergeParallelIfsPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             return element instanceof JSIfStatement ifStatement
                 && !ErrorUtil.containsError(element)
                 && JSElementFactory.getNonWhiteSpaceSibling(element, true) instanceof JSIfStatement nextIfStatement
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
index b50242d3..c1d8d318 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSRemoveRedundantElseIntention.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -40,20 +39,18 @@
 )
 public class JSRemoveRedundantElseIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifRemoveRedundantElse();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new RemoveRedundantElsePredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSIfStatement ifStatement = (JSIfStatement)element;
         JSStatement thenBranch = ifStatement.getThen();
         JSStatement elseBranch = ifStatement.getElse();
@@ -73,7 +70,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     private static class RemoveRedundantElsePredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (element instanceof JSIfStatement ifStatement && !ErrorUtil.containsError(ifStatement) && ifStatement.getElse() != null) {
                 JSStatement thenBranch = ifStatement.getThen();
                 while (thenBranch instanceof JSBlockStatement thenBlockStatement) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
index c7538b0b..6f8d54e2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSReplaceIfWithConditionalIntention.java
@@ -25,7 +25,6 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.*;
@@ -38,20 +37,18 @@
 )
 public class JSReplaceIfWithConditionalIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifReplaceIfWithConditional();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new ReplaceIfWithConditionalPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSIfStatement ifStatement = (JSIfStatement)(element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         assert (ifStatement != null);
@@ -151,7 +148,7 @@ private static String getImplicitReturnReplacement(JSExpression condition, JSRet
 
     private static class ReplaceIfWithConditionalPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSElement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
index bf63c521..8c79270a 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSimplifyIfElseIntention.java
@@ -24,7 +24,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ConditionalUtils;
@@ -37,20 +36,18 @@
     fileExtensions = "js"
 )
 public class JSSimplifyIfElseIntention extends JSIntention {
-    @Nonnull
     @Override
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifSimplifyIfElse();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SimplifyIfElsePredicate();
     }
 
     @Override
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiElement statement = element.getParent() instanceof JSIfStatement ? element.getParent() : element;
 
         ConditionalUtils.replaceAssignmentOrReturnIfSimplifiable((JSIfStatement)statement);
@@ -58,7 +55,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     private static class SimplifyIfElsePredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             if (!(element instanceof JSElement)) {
                 return false;
             }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
index 4596975c..91cb679b 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitElseIfIntention.java
@@ -24,7 +24,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -38,20 +37,18 @@
 )
 public class JSSplitElseIfIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifSplitElseIf();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SplitElseIfPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         JSIfStatement parentStatement = (JSIfStatement)element.getParent();
 
         assert (parentStatement != null);
@@ -64,7 +61,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
 
     private static class SplitElseIfPredicate implements JSElementPredicate {
         @Override
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             PsiElement parent = element.getParent();
 
             if (!(parent instanceof JSIfStatement)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
index c1cbad4c..ec17661e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfAndIntention.java
@@ -27,7 +27,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -42,20 +41,18 @@
 )
 public class JSSplitIfAndIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifSplitIfAnd();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SplitIfAndPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         assert (jsElement != null);
@@ -98,7 +95,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class SplitIfAndPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             PsiElement parent = element.getParent();
 
             if (!(parent instanceof JSIfStatement)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
index 3d6ba289..f8f772cb 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/trivialif/JSSplitIfOrIntention.java
@@ -27,7 +27,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 import org.intellij.idea.lang.javascript.intention.JSElementPredicate;
 import org.intellij.idea.lang.javascript.intention.JSIntention;
 import org.intellij.idea.lang.javascript.psiutil.ErrorUtil;
@@ -42,20 +41,18 @@
 )
 public class JSSplitIfOrIntention extends JSIntention {
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JSIntentionLocalize.trivialifSplitIfOr();
     }
 
     @Override
-    @Nonnull
     public JSElementPredicate getElementPredicate() {
         return new SplitIfOrPredicate();
     }
 
     @Override
     @RequiredReadAction
-    public void processIntention(@Nonnull PsiElement element) throws IncorrectOperationException {
+    public void processIntention(PsiElement element) throws IncorrectOperationException {
         PsiElement jsElement = (element.getParent() instanceof JSIfStatement ? element.getParent() : element);
 
         assert (jsElement != null);
@@ -91,7 +88,7 @@ public void processIntention(@Nonnull PsiElement element) throws IncorrectOperat
     private static class SplitIfOrPredicate implements JSElementPredicate {
         @Override
         @RequiredReadAction
-        public boolean satisfiedBy(@Nonnull PsiElement element) {
+        public boolean satisfiedBy(PsiElement element) {
             PsiElement parent = element.getParent();
 
             if (!(parent instanceof JSIfStatement)) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
index 5fd6db38..ff29154d 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BinaryOperatorUtils.java
@@ -19,7 +19,6 @@
 import com.intellij.lang.javascript.psi.JSBinaryExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import consulo.language.ast.IElementType;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -118,7 +117,7 @@ private static class OperatorProperties {
         String text;
         boolean commutative;
 
-        public OperatorProperties(@NonNls String text, boolean commutative) {
+        public OperatorProperties(String text, boolean commutative) {
             this.text = text;
             this.commutative = commutative;
         }
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
index 8e78ff10..2bfac6dc 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/BoolUtils.java
@@ -19,13 +19,10 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.language.ast.IElementType;
-import jakarta.annotation.Nullable;
-import org.jetbrains.annotations.NonNls;
+import org.jspecify.annotations.Nullable;
 
 public class BoolUtils {
-    @NonNls
     public static final String TRUE = "true";
-    @NonNls
     public static final String FALSE = "false";
 
     private BoolUtils() {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
index 8e10ef32..7b03ca55 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ConditionalUtils.java
@@ -21,7 +21,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
-import org.jetbrains.annotations.NonNls;
 
 public class ConditionalUtils {
     private ConditionalUtils() {
@@ -221,7 +220,7 @@ public static void replaceSimplifiableImplicitReturn(JSIfStatement statement, bo
         JSExpression condition = statement.getCondition();
         String conditionText = negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText();
         JSElement nextStatement = (JSElement)JSElementFactory.getNonWhiteSpaceSibling(statement, true);
-        @NonNls String newStatement = "return " + conditionText + ';';
+        String newStatement = "return " + conditionText + ';';
 
         JSElementFactory.replaceStatement(statement, newStatement);
         assert (nextStatement != null);
@@ -232,7 +231,7 @@ public static void replaceSimplifiableReturn(JSIfStatement statement, boolean ne
         throws IncorrectOperationException {
         JSExpression condition = statement.getCondition();
         String conditionText = (negated ? BoolUtils.getNegatedExpressionText(condition) : condition.getText());
-        @NonNls String newStatement = "return " + conditionText + ';';
+        String newStatement = "return " + conditionText + ';';
 
         JSElementFactory.replaceStatement(statement, newStatement);
     }
@@ -313,7 +312,7 @@ public static void replaceConditionalWithIf(JSConditionalExpression conditional)
         JSExpression thenExpression = ParenthesesUtils.stripParentheses(conditional.getThen());
         JSExpression elseExpression = ParenthesesUtils.stripParentheses(conditional.getElse());
 
-        @NonNls String ifStatementText = "if (" + condition.getText() + ") {" +
+        String ifStatementText = "if (" + condition.getText() + ") {" +
             statementStart + thenExpression.getText() + statementEnd +
             "} else {" +
             statementStart + elseExpression.getText() + statementEnd +
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
index ee57b6f7..5d134804 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ControlFlowUtils.java
@@ -20,8 +20,7 @@
 import consulo.language.psi.PsiReference;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -171,7 +170,7 @@ public static boolean statementContainsReturn(@Nullable JSStatement statement) {
         return returnFinder.returnFound();
     }
 
-    public static boolean statementCompletesWithStatement(@Nonnull JSStatement containingStatement, @Nonnull JSStatement statement) {
+    public static boolean statementCompletesWithStatement(JSStatement containingStatement, JSStatement statement) {
         JSElement statementToCheck = statement;
 
         while (true) {
@@ -196,7 +195,7 @@ public static boolean statementCompletesWithStatement(@Nonnull JSStatement conta
         }
     }
 
-    private static boolean elementCompletesWithStatement(@Nonnull JSElement element, @Nonnull JSStatement statement) {
+    private static boolean elementCompletesWithStatement(JSElement element, JSStatement statement) {
         PsiElement statementToCheck = statement;
 
         while (true) {
@@ -228,15 +227,15 @@ private static boolean elementCompletesWithStatement(@Nonnull JSElement element,
         }
     }
 
-    public static boolean functionCompletesWithStatement(@Nonnull JSFunction function, @Nonnull JSStatement statement) {
+    public static boolean functionCompletesWithStatement(JSFunction function, JSStatement statement) {
         return elementCompletesWithStatement(function, statement);
     }
 
-    public static boolean blockCompletesWithStatement(@Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
+    public static boolean blockCompletesWithStatement(JSBlockStatement block, JSStatement statement) {
         return elementCompletesWithStatement(block, statement);
     }
 
-    private static boolean statementIsLastInBlock(@Nonnull JSBlockStatement block, @Nonnull JSStatement statement) {
+    private static boolean statementIsLastInBlock(JSBlockStatement block, JSStatement statement) {
         JSStatement[] statements = block.getStatements();
 
         //noinspection ForLoopWithMissingComponent
@@ -299,7 +298,7 @@ public static boolean canBeMerged(JSStatement statement1, JSStatement statement2
         return (!containsConflictingDeclarations(statement2Declarations, statement1));
     }
 
-    public static boolean isInLoopStatementBody(@Nonnull PsiElement element) {
+    public static boolean isInLoopStatementBody(PsiElement element) {
         JSLoopStatement forStatement = PsiTreeUtil.getParentOfType(element, JSLoopStatement.class);
 
         if (forStatement == null) {
@@ -311,8 +310,7 @@ public static boolean isInLoopStatementBody(@Nonnull PsiElement element) {
         return (body != null && PsiTreeUtil.isAncestor(body, element, true));
     }
 
-    @Nonnull
-    public static List<JSCallExpression> getRecursiveCalls(@Nonnull JSFunction function) {
+    public static List<JSCallExpression> getRecursiveCalls(JSFunction function) {
         RecursiveCallVisitor recursiveCallVisitor = new RecursiveCallVisitor(function);
 
         function.accept(recursiveCallVisitor);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
index 62050497..277dd506 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ErrorUtil.java
@@ -19,7 +19,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiErrorElement;
 import consulo.language.psi.PsiRecursiveElementVisitor;
-import jakarta.annotation.Nonnull;
 
 public class ErrorUtil {
     private ErrorUtil() {
@@ -27,7 +26,7 @@ private ErrorUtil() {
 
     private static final boolean fullTraversal = false;
 
-    public static boolean containsError(@Nonnull PsiElement element) {
+    public static boolean containsError(PsiElement element) {
         // check only immediate children, full tree traversal is too expensive
         if (fullTraversal) {
             ErrorElementVisitor visitor = new ErrorElementVisitor();
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
index f4a9d1d5..07921d8e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/ExpressionUtil.java
@@ -21,8 +21,7 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -40,7 +39,7 @@ public static boolean isConstantExpression(JSExpression expression) {
         return visitor.isConstant;
     }
 
-    public static boolean isIncrementDecrementExpression(@Nonnull PsiElement expression) {
+    public static boolean isIncrementDecrementExpression(PsiElement expression) {
         if (expression instanceof JSPostfixExpression postfixExpression) {
             IElementType operator = postfixExpression.getOperationSign();
             return JSTokenTypes.PLUSPLUS.equals(operator) || JSTokenTypes.MINUSMINUS.equals(operator);
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
index 46db52b5..26970c6c 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
@@ -22,8 +22,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.xml.psi.xml.XmlFile;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.intellij.idea.lang.javascript.intention.JSElementIterator;
 import org.intellij.idea.lang.javascript.intention.JSFunctionVisitor;
 
@@ -35,7 +34,7 @@ public class FindReferenceUtil {
     private FindReferenceUtil() {
     }
 
-    public static JSReferenceExpression[] findReferences(@Nonnull JSVariable variable) {
+    public static JSReferenceExpression[] findReferences(JSVariable variable) {
         JSReferenceVisitor visitor = new JSReferenceVisitor(variable, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
         JSElement scope = PsiTreeUtil.getParentOfType(variable, JSFunction.class);
 
@@ -47,7 +46,7 @@ public static JSReferenceExpression[] findReferences(@Nonnull JSVariable variabl
         return visitor.getReferences();
     }
 
-    public static <T extends PsiElement> T getFarthestAncestor(@Nonnull PsiElement element, @Nonnull Class<T> aClass) {
+    public static <T extends PsiElement> T getFarthestAncestor(PsiElement element, Class<T> aClass) {
         PsiElement previousElement = element;
         PsiElement currentElement;
 
@@ -72,7 +71,7 @@ private static final class JSReferenceVisitor extends JSFunctionVisitor {
         private final int maxTextOffset;
         private List<JSReferenceExpression> references;
 
-        public JSReferenceVisitor(@Nonnull JSVariable variable, int maxCount, int minTextOffset, int maxTextOffset) {
+        public JSReferenceVisitor(JSVariable variable, int maxCount, int minTextOffset, int maxTextOffset) {
             this.variable = variable;
             this.variableName = variable.getName();
             this.maxCount = maxCount;
@@ -118,24 +117,24 @@ public JSReferenceExpression getReference(int index) {
     }
 
 
-    public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable) {
+    public static Iterable<PsiElement> getReferences(JSVariable variable) {
         return getReferences(variable, null, 0, Integer.MAX_VALUE);
     }
 
-    public static Iterable<PsiElement> getReferences(@Nonnull JSVariable variable, @Nullable PsiElement scope) {
+    public static Iterable<PsiElement> getReferences(JSVariable variable, @Nullable PsiElement scope) {
         return getReferences(variable, scope, 0, Integer.MAX_VALUE);
     }
 
-    public static Iterable<PsiElement> getReferencesBefore(@Nonnull JSVariable variable, int textOffset) {
+    public static Iterable<PsiElement> getReferencesBefore(JSVariable variable, int textOffset) {
         return getReferences(variable, null, 0, textOffset);
     }
 
-    public static Iterable<PsiElement> getReferencesAfter(@Nonnull JSVariable variable, int textOffset) {
+    public static Iterable<PsiElement> getReferencesAfter(JSVariable variable, int textOffset) {
         return getReferences(variable, null, textOffset, Integer.MAX_VALUE);
     }
 
     private static Iterable<PsiElement> getReferences(
-        @Nonnull JSVariable variable,
+        JSVariable variable,
         @Nullable PsiElement scope,
         int minTextOffset,
         int maxTextOffset
@@ -160,10 +159,10 @@ public static final class JSReferenceIterator extends JSElementIterator {
         private final String variableName;
 
         public JSReferenceIterator(
-            @Nonnull JSVariable variable,
+            JSVariable variable,
             int minTextOffset,
             int maxTextOffset,
-            @Nonnull PsiElement element
+            PsiElement element
         ) {
             super(element, false, minTextOffset, maxTextOffset);
             this.variable = variable;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
index 3fd24921..e65cd547 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/JSElementFactory.java
@@ -31,9 +31,7 @@
 import consulo.project.Project;
 import consulo.virtualFileSystem.ReadonlyStatusHandler;
 import consulo.virtualFileSystem.VirtualFile;
-import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
 
 /**
  *
@@ -44,7 +42,7 @@ public class JSElementFactory {
     private JSElementFactory() {
     }
 
-    public static PsiElement addElementBefore(@Nonnull PsiElement element, @Nonnull PsiElement newElement) {
+    public static PsiElement addElementBefore(PsiElement element, PsiElement newElement) {
         ASTNode oldElementParentNode = element.getNode();
         PsiElement parentNode = element.getParent();
         ASTNode newElementParentNode = parentNode.getNode();
@@ -57,7 +55,7 @@ public static PsiElement addElementBefore(@Nonnull PsiElement element, @Nonnull
         return newElement;
     }
 
-    public static PsiElement addElementAfter(@Nonnull PsiElement element, @Nonnull PsiElement newElement) {
+    public static PsiElement addElementAfter(PsiElement element, PsiElement newElement) {
         ASTNode elementNode = element.getNode();
         ASTNode oldElementParentNode = ((elementNode == null) ? null : elementNode.getTreeNext());
         PsiElement parentNode = element.getParent();
@@ -72,14 +70,14 @@ public static PsiElement addElementAfter(@Nonnull PsiElement element, @Nonnull P
         return newElement;
     }
 
-    public static PsiElement addElementBefore(@Nonnull PsiElement element, @NonNls @Nonnull String elementText) {
+    public static PsiElement addElementBefore(PsiElement element, String elementText) {
         PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
 
         assert (newElement != null);
         return addElementBefore(element, newElement);
     }
 
-    public static PsiElement addElementAfter(@Nonnull PsiElement element, @Nonnull String elementText) {
+    public static PsiElement addElementAfter(PsiElement element, String elementText) {
         PsiElement newElement = createDummyFile(element.getProject(), elementText).getFirstChild();
 
         assert (newElement != null);
@@ -93,7 +91,6 @@ public static ASTNode createElementFromText(Project project, String text) {
         return element.getNode();
     }
 
-    @Nonnull
     private static PsiFile createDummyFile(Project project, String text) {
         ParserDefinition def = ParserDefinition.forLanguage(JavaScriptLanguage.INSTANCE);
 
@@ -102,7 +99,7 @@ private static PsiFile createDummyFile(Project project, String text) {
             .createFileFromText("dummy.js", text);
     }
 
-    public static JSStatement replaceElementWithStatement(@Nonnull JSElement element, @NonNls @Nonnull String statementText)
+    public static JSStatement replaceElementWithStatement(JSElement element, String statementText)
         throws IncorrectOperationException {
         ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
             element.getProject(),
@@ -122,7 +119,7 @@ public static JSStatement replaceElementWithStatement(@Nonnull JSElement element
         return (JSStatement)newStatementNode.getPsi();
     }
 
-    public static JSExpression replaceExpression(@Nonnull JSExpression expression, @NonNls @Nonnull String text)
+    public static JSExpression replaceExpression(JSExpression expression, String text)
         throws IncorrectOperationException {
         JSExpression newExpressionNode = JSChangeUtil.createExpressionFromText(
             expression.getProject(),
@@ -132,7 +129,7 @@ public static JSExpression replaceExpression(@Nonnull JSExpression expression, @
         return replaceExpression(expression, newExpressionNode);
     }
 
-    public static JSExpression replaceExpression(@Nonnull JSExpression expression, @Nonnull JSExpression newExpression)
+    public static JSExpression replaceExpression(JSExpression expression, JSExpression newExpression)
         throws IncorrectOperationException {
         ASTNode newExpressionNode = newExpression.getNode();
         ASTNode oldExpressionNode = expression.getNode();
@@ -149,7 +146,7 @@ public static JSExpression replaceExpression(@Nonnull JSExpression expression, @
         return (JSExpression)newExpressionNode.getPsi();
     }
 
-    public static JSStatement replaceStatement(@Nonnull JSStatement statement, @NonNls @Nonnull String text)
+    public static JSStatement replaceStatement(JSStatement statement, String text)
         throws IncorrectOperationException {
         ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
             statement.getProject(),
@@ -170,7 +167,7 @@ public static JSStatement replaceStatement(@Nonnull JSStatement statement, @NonN
         return (JSStatement)newStatementNode.getPsi();
     }
 
-    public static JSStatement addStatementBefore(@Nonnull JSStatement statement, @NonNls @Nonnull String previousStatementText)
+    public static JSStatement addStatementBefore(JSStatement statement, String previousStatementText)
         throws IncorrectOperationException {
         ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
             statement.getProject(),
@@ -190,7 +187,7 @@ public static JSStatement addStatementBefore(@Nonnull JSStatement statement, @No
         return (JSStatement)newStatementNode.getPsi();
     }
 
-    public static JSStatement addStatementAfter(@Nonnull JSStatement statement, @NonNls @Nonnull String nextStatementText)
+    public static JSStatement addStatementAfter(JSStatement statement, String nextStatementText)
         throws IncorrectOperationException {
         ASTNode newStatementNode = JSChangeUtil.createStatementFromText(
             statement.getProject(),
@@ -235,7 +232,7 @@ public static void addRangeAfter(JSStatement[] statements, int start, int length
         }
     }
 
-    public static void replaceExpressionWithNegatedExpression(@Nonnull JSExpression newExpression, @Nonnull JSExpression exp)
+    public static void replaceExpressionWithNegatedExpression(JSExpression newExpression, JSExpression exp)
         throws IncorrectOperationException {
         JSExpression expressionToReplace = BoolUtils.findNegation(exp);
         String replacementString;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
index fcceb313..5bd19da2 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/NumberUtil.java
@@ -16,7 +16,6 @@
 package org.intellij.idea.lang.javascript.psiutil;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import org.jetbrains.annotations.NonNls;
 
 import java.math.BigInteger;
 import java.util.regex.Pattern;
@@ -28,11 +27,8 @@ public class NumberUtil {
     private NumberUtil() {
     }
 
-    @NonNls
     public static final Pattern decimalPattern = Pattern.compile("[0-9]+");
-    @NonNls
     public static final Pattern octalPattern = Pattern.compile("0[0-7]+");
-    @NonNls
     public static final Pattern hexPattern = Pattern.compile("0[xX][0-9a-fA-F]+");
 
     public static BigInteger getLiteralNumber(JSLiteralExpression expression) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
index e2711dd3..96c8858e 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/RecursionUtil.java
@@ -18,7 +18,6 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.*;
 import consulo.language.ast.IElementType;
-import jakarta.annotation.Nonnull;
 
 public class RecursionUtil {
     private RecursionUtil() {
@@ -187,7 +186,7 @@ private static boolean blockStatementMayReturnBeforeRecursing(JSBlockStatement b
         return endsInImplicitReturn;
     }
 
-    public static boolean functionMayRecurse(@Nonnull JSFunction function) {
+    public static boolean functionMayRecurse(JSFunction function) {
         JSRecursionVisitor recursionVisitor = new JSRecursionVisitor(function);
 
         if (recursionVisitor.isFunctionNamed()) {
@@ -507,7 +506,7 @@ private static boolean labeledStatementDefinitelyRecurses(JSLabeledStatement lab
         return RecursionUtil.statementDefinitelyRecurses(body, method);
     }
 
-    public static boolean functionDefinitelyRecurses(@Nonnull JSFunction method) {
+    public static boolean functionDefinitelyRecurses(JSFunction method) {
         JSSourceElement[] body = method.getBody();
 
         if (body != null) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
index fa1d2e14..098f85c6 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/TreeUtil.java
@@ -18,8 +18,7 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class TreeUtil {
     private TreeUtil() {
@@ -68,7 +67,7 @@ private static PsiElement getLastLeaf(PsiElement element) {
     @Nullable
     public static <ParentType extends PsiElement> ParentType getParentOfType(
         @Nullable PsiElement element,
-        @Nonnull Class<ParentType> aClass
+        Class<ParentType> aClass
     ) {
         return getParentOfType(element, aClass, true);
     }
@@ -95,7 +94,7 @@ public static <ParentType extends PsiElement> ParentType getParentOfType(
     @Nullable
     public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(
         @Nullable PsiElement element,
-        @Nonnull Class<ParentType> aClass
+        Class<ParentType> aClass
     ) {
         return getPrevLeafOfType(element, aClass, true);
     }
@@ -122,7 +121,7 @@ public static <ParentType extends PsiElement> ParentType getPrevLeafOfType(
     @Nullable
     public static <ParentType extends PsiElement> ParentType getNextLeafOfType(
         @Nullable PsiElement element,
-        @Nonnull Class<ParentType> aClass
+        Class<ParentType> aClass
     ) {
         return getNextLeafOfType(element, aClass, true);
     }
@@ -146,7 +145,7 @@ public static <ParentType extends PsiElement> ParentType getNextLeafOfType(
         return (ParentType)element;
     }
 
-    public static boolean isAncestor(@Nonnull JSElement ancestor, @Nonnull JSElement element, boolean strict) {
+    public static boolean isAncestor(JSElement ancestor, JSElement element, boolean strict) {
         PsiElement parent = strict ? element.getParent() : element;
 
         while (parent != null && parent instanceof JSElement) {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
index e2a6e067..a2df4f29 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/VariableAccessUtil.java
@@ -20,7 +20,6 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -152,9 +151,9 @@ private static class VariableAssignedVisitor extends JSRecursiveElementVisitor {
         private boolean assigned;
 
         public VariableAssignedVisitor(
-            @Nonnull JSVariable variable,
-            @Nonnull JSElement context,
-            @Nonnull Set<JSVariable> notUpdatedSymbols
+            JSVariable variable,
+            JSElement context,
+            Set<JSVariable> notUpdatedSymbols
         ) {
             this.variable = variable;
             this.context = context;
@@ -165,10 +164,10 @@ public VariableAssignedVisitor(
         }
 
         private VariableAssignedVisitor(
-            @Nonnull JSVariable variable,
-            @Nonnull JSElement context,
-            @Nonnull Set<JSVariable> notUpdatedSymbols,
-            @Nonnull Set<JSVariable> candidateSymbols
+            JSVariable variable,
+            JSElement context,
+            Set<JSVariable> notUpdatedSymbols,
+            Set<JSVariable> candidateSymbols
         ) {
             this.variable = variable;
             this.context = context;
@@ -262,19 +261,19 @@ private static class VariableAssignedFromVisitor extends JSRecursiveElementVisit
         private final JSVariable variable;
         private boolean assignedFrom;
 
-        public VariableAssignedFromVisitor(@Nonnull JSVariable variable) {
+        public VariableAssignedFromVisitor(JSVariable variable) {
             this.variable = variable;
         }
 
         @Override
-        public void visitJSElement(@Nonnull JSElement element) {
+        public void visitJSElement(JSElement element) {
             if (!this.assignedFrom) {
                 super.visitJSElement(element);
             }
         }
 
         @Override
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression assignment) {
             if (!this.assignedFrom) {
                 super.visitJSAssignmentExpression(assignment);
 
@@ -283,7 +282,7 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignme
         }
 
         @Override
-        public void visitJSVarStatement(@Nonnull JSVarStatement statement) {
+        public void visitJSVarStatement(JSVarStatement statement) {
             if (!this.assignedFrom) {
                 super.visitJSVarStatement(statement);
 
@@ -311,16 +310,15 @@ public boolean isAssignedFrom() {
     }
 
     private static class VariableReturnedVisitor extends JSRecursiveElementVisitor {
-        @Nonnull
         private final JSVariable variable;
         private boolean returned;
 
-        public VariableReturnedVisitor(@Nonnull JSVariable variable) {
+        public VariableReturnedVisitor(JSVariable variable) {
             this.variable = variable;
         }
 
         @Override
-        public void visitJSReturnStatement(@Nonnull JSReturnStatement returnStatement) {
+        public void visitJSReturnStatement(JSReturnStatement returnStatement) {
             if (!this.returned) {
                 super.visitJSReturnStatement(returnStatement);
                 this.returned = VariableAccessUtil.mayEvaluateToVariable(returnStatement.getExpression(), this.variable);
@@ -336,12 +334,12 @@ private static class ArrayContentsAccessedVisitor extends JSRecursiveElementVisi
         private final JSVariable variable;
         private boolean accessed;
 
-        public ArrayContentsAccessedVisitor(@Nonnull JSVariable variable) {
+        public ArrayContentsAccessedVisitor(JSVariable variable) {
             this.variable = variable;
         }
 
         @Override
-        public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
+        public void visitJSForInStatement(JSForInStatement statement) {
             if (!this.accessed) {
                 super.visitJSForInStatement(statement);
                 this.checkQualifier(statement.getCollectionExpression());
@@ -349,7 +347,7 @@ public void visitJSForInStatement(@Nonnull JSForInStatement statement) {
         }
 
         @Override
-        public void visitJSIndexedPropertyAccessExpression(@Nonnull JSIndexedPropertyAccessExpression accessExpression) {
+        public void visitJSIndexedPropertyAccessExpression(JSIndexedPropertyAccessExpression accessExpression) {
             if (!this.accessed) {
                 super.visitJSIndexedPropertyAccessExpression(accessExpression);
 
@@ -379,12 +377,12 @@ private static class ArrayContentsAssignedVisitor extends JSRecursiveElementVisi
         private final JSVariable variable;
         private boolean assigned;
 
-        public ArrayContentsAssignedVisitor(@Nonnull JSVariable variable) {
+        public ArrayContentsAssignedVisitor(JSVariable variable) {
             this.variable = variable;
         }
 
         @Override
-        public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignment) {
+        public void visitJSAssignmentExpression(JSAssignmentExpression assignment) {
             if (!this.assigned) {
                 super.visitJSAssignmentExpression(assignment);
                 this.checkExpression(null, assignment.getLOperand());
@@ -392,7 +390,7 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression assignme
         }
 
         @Override
-        public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+        public void visitJSPrefixExpression(JSPrefixExpression expression) {
             if (!this.assigned) {
                 super.visitJSPrefixExpression(expression);
                 this.checkExpression(expression.getOperationSign(), expression.getExpression());
@@ -400,7 +398,7 @@ public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
         }
 
         @Override
-        public void visitJSPostfixExpression(@Nonnull JSPostfixExpression expression) {
+        public void visitJSPostfixExpression(JSPostfixExpression expression) {
             if (!this.assigned) {
                 super.visitJSPostfixExpression(expression);
                 this.checkExpression(expression.getOperationSign(), expression.getExpression());
@@ -435,7 +433,6 @@ public boolean isAssigned() {
     }
 
     private static class UsedVariableVisitor extends JSRecursiveElementVisitor {
-        @Nonnull
         private final Set<JSVariable> variables;
 
         public UsedVariableVisitor() {
@@ -443,7 +440,7 @@ public UsedVariableVisitor() {
         }
 
         @Override
-        public void visitJSReferenceExpression(@Nonnull JSReferenceExpression ref) {
+        public void visitJSReferenceExpression(JSReferenceExpression ref) {
             super.visitJSReferenceExpression(ref);
 
             PsiElement referent = ref.resolve();
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
index 68b0dc9d..76af4fba 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileType.java
@@ -28,8 +28,7 @@
 import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -42,19 +41,16 @@ private ActionScriptFileType() {
         super(JavaScriptLanguage.INSTANCE);
     }
 
-    @Nonnull
     @Override
     public String getId() {
         return "ACTIONSCRIPT";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDescription() {
         return LocalizeValue.localizeTODO("ActionScript files");
     }
 
-    @Nonnull
     @Override
     public String getDefaultExtension() {
         return "as";
@@ -67,7 +63,6 @@ public Image getIcon() {
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
         return ActionScriptLanguageVersion.getInstance();
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
index d13d334e..5ee8ae66 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/ActionScriptFileTypeFactory.java
@@ -3,7 +3,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -12,7 +11,7 @@
 @ExtensionImpl
 public class ActionScriptFileTypeFactory extends FileTypeFactory {
     @Override
-    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
+    public void createFileTypes(FileTypeConsumer consumer) {
         consumer.consume(ActionScriptFileType.INSTANCE);
     }
 }
diff --git a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
index 7ad902a1..7dc0c9ae 100644
--- a/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
+++ b/lang-version-impl/actionscript-impl/src/main/java/consulo/actionscript/lang/ActionScriptLanguageVersion.java
@@ -10,7 +10,6 @@
 import consulo.language.lexer.Lexer;
 import consulo.language.parser.PsiParser;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -18,7 +17,6 @@
  */
 @ExtensionImpl
 public class ActionScriptLanguageVersion extends BaseJavaScriptLanguageVersion {
-    @Nonnull
     public static ActionScriptLanguageVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(ActionScriptLanguageVersion.class);
     }
@@ -29,25 +27,21 @@ public ActionScriptLanguageVersion() {
         super("ACTIONSCRIPT");
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "ActionScript";
     }
 
-    @Nonnull
     @Override
     public PsiParser createParser() {
         return new EcmaScript4Parser();
     }
 
-    @Nonnull
     @Override
     public JSHighlighter getSyntaxHighlighter() {
         return new JSHighlighter(myDialectOptionHolder);
     }
 
-    @Nonnull
     @Override
     public Lexer createLexer() {
         return new JavaScriptParsingFlexLexer(myDialectOptionHolder);
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
index a4b7d28b..f4032881 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/codeInsight/EcmaScript6QuickFixFactory.java
@@ -22,7 +22,6 @@
 import consulo.javascript.ecmascript.lang.BaseEcmaScriptJavaScriptVersion;
 import consulo.javascript.ide.codeInsight.JavaScriptQuickFixFactory;
 import consulo.javascript.language.JavaScriptLanguageVersion;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -36,7 +35,7 @@ public CreateJSFunctionOrMethodFix createFunctionOrMethodFix(String referenceNam
     }
 
     @Override
-    public boolean isMyVersion(@Nonnull JavaScriptLanguageVersion version) {
+    public boolean isMyVersion(JavaScriptLanguageVersion version) {
         return version instanceof BaseEcmaScriptJavaScriptVersion;
     }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
index 6c88e784..43f2fe82 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/completion/EcmaScript6KeywordCompletionExtender.java
@@ -7,7 +7,6 @@
 import consulo.language.editor.completion.lookup.LookupElementBuilder;
 import consulo.language.util.ProcessingContext;
 import consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -16,7 +15,7 @@
 @ExtensionImpl
 public class EcmaScript6KeywordCompletionExtender implements JavaScriptKeywordCompletionExtender {
     @Override
-    public void fillCompletion(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result) {
+    public void fillCompletion(CompletionParameters parameters, ProcessingContext context, CompletionResultSet result) {
         result.addElement(LookupElementBuilder.create("let").withInsertHandler(AddSpaceInsertHandler.INSTANCE).bold());
     }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
index 4cefcee5..c4ef891f 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -16,14 +16,13 @@
 import consulo.language.lexer.MergingLexerAdapter;
 import consulo.language.parser.PsiParser;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 06/12/2021
  */
 public abstract class BaseEcmaScriptJavaScriptVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion, JavaScriptVersionWithHelper {
-    protected BaseEcmaScriptJavaScriptVersion(@Nonnull String id) {
+    protected BaseEcmaScriptJavaScriptVersion(String id) {
         super(id);
     }
 
@@ -31,13 +30,11 @@ protected BaseEcmaScriptJavaScriptVersion(String name, String... mimeTypes) {
         super(name, mimeTypes);
     }
 
-    @Nonnull
     @Override
     public Lexer createLexer() {
         return createLexer(false);
     }
 
-    @Nonnull
     @Override
     public SyntaxHighlighter getSyntaxHighlighter() {
         return new JavaScriptHighlighter(() -> createLexer(true));
@@ -50,13 +47,11 @@ private Lexer createLexer(boolean hightlight) {
         );
     }
 
-    @Nonnull
     @Override
     public PsiParser createParser() {
         return new EcmaScriptParser();
     }
 
-    @Nonnull
     @Override
     public ResolveHelper getHelper() {
         return EcmaScript6ResolveHelper.INSTANCE;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
index 2baaabe4..da25ad1e 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript10JavaScriptVersion.java
@@ -3,7 +3,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import jakarta.inject.Inject;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -16,7 +15,6 @@ public EcmaScript10JavaScriptVersion() {
         super("ECMASCRIPT_10");
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "ECMAScript 10";
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
index 06f6e281..9c76c777 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript11JavaScriptVersion.java
@@ -2,7 +2,6 @@
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptFeature;
-import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 
 /**
@@ -18,7 +17,6 @@ public EcmaScript11JavaScriptVersion() {
         addFeature(JavaScriptFeature.OPTIONAL_CHAINING_OPERATOR);
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "ECMAScript 11";
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
index e6d5bc0c..33f87215 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript12JavaScriptVersion.java
@@ -5,7 +5,6 @@
 import consulo.javascript.language.JavaScriptLanguage;
 import jakarta.inject.Inject;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -13,7 +12,6 @@
  */
 @ExtensionImpl
 public class EcmaScript12JavaScriptVersion extends EcmaScript6JavaScriptVersion implements DefaultJavaScriptVersion {
-    @Nonnull
     public static EcmaScript12JavaScriptVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript12JavaScriptVersion.class);
     }
@@ -23,7 +21,6 @@ public EcmaScript12JavaScriptVersion() {
         super("ECMASCRIPT_12");
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "ECMAScript 12";
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
index d48013ee..805644c4 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript6JavaScriptVersion.java
@@ -23,7 +23,6 @@
 import consulo.javascript.language.StandardJavaScriptVersion;
 import jakarta.inject.Inject;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -31,7 +30,6 @@
  */
 @ExtensionImpl
 public class EcmaScript6JavaScriptVersion extends BaseEcmaScriptJavaScriptVersion implements StandardJavaScriptVersion, JavaScriptVersionWithHelper {
-    @Nonnull
     public static EcmaScript6JavaScriptVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(EcmaScript6JavaScriptVersion.class);
     }
@@ -41,7 +39,7 @@ public EcmaScript6JavaScriptVersion() {
         super("ECMASCRIPT_6");
     }
 
-    public EcmaScript6JavaScriptVersion(@Nonnull String id) {
+    public EcmaScript6JavaScriptVersion(String id) {
         super(id);
 
         addFeature(JavaScriptFeature.CLASS);
@@ -52,7 +50,6 @@ public EcmaScript6JavaScriptVersion(@Nonnull String id) {
         addFeature(JavaScriptFeature.FUNCTION_PROPERTY);
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "ECMAScript 6";
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
index 502aae46..aca15f4c 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript7JavaScriptVersion.java
@@ -4,7 +4,6 @@
 import consulo.javascript.language.JavaScriptFeature;
 import jakarta.inject.Inject;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -19,7 +18,6 @@ public EcmaScript7JavaScriptVersion() {
         addFeature(JavaScriptFeature.EXPONENTIATION_OPERATOR);
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "ECMAScript 7";
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
index 891e9b45..7aedbc79 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript8JavaScriptVersion.java
@@ -1,7 +1,6 @@
 package consulo.javascript.ecmascript.lang;
 
 import consulo.annotation.component.ExtensionImpl;
-import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 
 /**
@@ -15,7 +14,6 @@ public EcmaScript8JavaScriptVersion() {
         super("ECMASCRIPT_8");
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "ECMAScript 8";
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
index aa53f532..ba1e0185 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScript9JavaScriptVersion.java
@@ -2,7 +2,6 @@
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptFeature;
-import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 
 /**
@@ -20,7 +19,6 @@ public EcmaScript9JavaScriptVersion()
 		addFeature(JavaScriptFeature.SPREAD_OPERATOR);
 	}
 
-	@Nonnull
 	@Override
 	public String getPresentableName()
 	{
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
index 79e9e536..e77548c8 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileType.java
@@ -29,8 +29,7 @@
 import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -43,19 +42,16 @@ private EcmaScriptFileType() {
         super(JavaScriptLanguage.INSTANCE);
     }
 
-    @Nonnull
     @Override
     public String getId() {
         return "ECMASCRIPT";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDescription() {
         return LocalizeValue.localizeTODO("ECMAScript files");
     }
 
-    @Nonnull
     @Override
     public String getDefaultExtension() {
         return "es";
@@ -68,7 +64,6 @@ public Image getIcon() {
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
         if (module == null) {
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
index 2ae27109..a8549666 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/EcmaScriptFileTypeFactory.java
@@ -4,7 +4,6 @@
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -13,7 +12,7 @@
 @ExtensionImpl
 public class EcmaScriptFileTypeFactory extends FileTypeFactory {
     @Override
-    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
+    public void createFileTypes(FileTypeConsumer consumer) {
         consumer.consume(EcmaScriptFileType.INSTANCE, "es;js2");
     }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
index 8a0133e0..bc6004f0 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParser.java
@@ -21,20 +21,17 @@
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 import consulo.language.parser.PsiBuilder;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 15.02.2016
  */
 public class EcmaScriptParser extends JavaScriptParser {
-    @Nonnull
     @Override
     public JavaScriptParsingContext createParsingContext() {
         return new EcmaScriptParsingContext();
     }
 
-    @Nonnull
     @Override
     public JavaScriptParserBuilder createBuilder(PsiBuilder builder) {
         return new EcmaScriptStrictParserBuilder(builder);
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
index 0270a2e0..d63bf175 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptParsingContext.java
@@ -20,20 +20,17 @@
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 import consulo.javascript.lang.parsing.StatementParsing;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 15.02.2016
  */
 public class EcmaScriptParsingContext extends JavaScriptParsingContext {
-    @Nonnull
     @Override
     protected StatementParsing createStatementParsing() {
         return new EcmaScriptStatementParsing(this);
     }
 
-    @Nonnull
     @Override
     protected ExpressionParsing createExpressionParsing() {
         return new EcmaScriptExpressionParsing(this);
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
index 7bf16e9b..cbf95abf 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/parsing/EcmaScriptStatementParsing.java
@@ -28,7 +28,6 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -292,7 +291,7 @@ private void parseClass(PsiBuilder builder, boolean nameRequired) {
         parseClassWithMarker(builder, builder.mark(), nameRequired);
     }
 
-    public void parseClassWithMarker(PsiBuilder builder, @Nonnull PsiBuilder.Marker clazz, boolean nameRequired) {
+    public void parseClassWithMarker(PsiBuilder builder, PsiBuilder.Marker clazz, boolean nameRequired) {
         builder.advanceLexer();
 
         if (builder.getTokenType() != JSTokenTypes.IDENTIFIER) {
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
index de9c92ba..ea75b7c1 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6ImportedBinding.java
@@ -3,7 +3,7 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiNameIdentifierOwner;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
index 52ad21e0..3e124769 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/ES6NamedImports.java
@@ -3,7 +3,6 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import consulo.annotation.access.RequiredReadAction;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -13,7 +12,6 @@
  * .......^^^^^^^ named imports group
  */
 public interface ES6NamedImports extends JSElement {
-    @Nonnull
     @RequiredReadAction
     ES6ImportedBinding[] getBindings();
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
index c721f470..8bbe0c4d 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ExportDefaultAssignmentImpl.java
@@ -10,8 +10,7 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -23,7 +22,7 @@ public ES6ExportDefaultAssignmentImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
@@ -34,10 +33,10 @@ public JSElement getElement() {
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         JSElement element = getElement();
         if (element != null && !element.processDeclarations(processor, state, lastParent, place)) {
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
index ef0d54d4..77b0689d 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportDeclarationImpl.java
@@ -8,7 +8,6 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -20,16 +19,16 @@ public ES6ImportDeclarationImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         for (PsiElement child : getChildren()) {
             if (!child.processDeclarations(processor, state, lastParent, place)) {
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
index 22fd511a..d6f16f30 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportSpecifierImpl.java
@@ -10,8 +10,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -23,7 +22,7 @@ public ES6ImportSpecifierImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
@@ -36,7 +35,7 @@ public PsiElement getNameIdentifier() {
 
     @RequiredWriteAction
     @Override
-    public PsiElement setName(@Nonnull String s) throws IncorrectOperationException {
+    public PsiElement setName(String s) throws IncorrectOperationException {
         return null;
     }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
index 70f5b3b2..889b6b51 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6ImportedBindingImpl.java
@@ -13,8 +13,7 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -26,7 +25,7 @@ public ES6ImportedBindingImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
@@ -57,16 +56,16 @@ public int getTextOffset() {
 
     @RequiredWriteAction
     @Override
-    public PsiElement setName(@Nonnull String s) throws IncorrectOperationException {
+    public PsiElement setName(String s) throws IncorrectOperationException {
         return null;
     }
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         return processor.execute(this, state);
     }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
index 04f126ac..00bba168 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/ES6NamedImportsImpl.java
@@ -10,7 +10,6 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -22,16 +21,16 @@ public ES6NamedImportsImpl(ASTNode node) {
     }
 
     @Override
-    protected void accept(@Nonnull JSElementVisitor visitor) {
+    protected void accept(JSElementVisitor visitor) {
         visitor.visitJSElement(this);
     }
 
     @Override
     public boolean processDeclarations(
-        @Nonnull PsiScopeProcessor processor,
-        @Nonnull ResolveState state,
+        PsiScopeProcessor processor,
+        ResolveState state,
         PsiElement lastParent,
-        @Nonnull PsiElement place
+        PsiElement place
     ) {
         for (PsiElement child : getChildren()) {
             if (!child.processDeclarations(processor, state, lastParent, place)) {
@@ -42,7 +41,6 @@ public boolean processDeclarations(
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public ES6ImportedBinding[] getBindings() {
         return findChildrenByClass(ES6ImportedBinding.class);
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
index 1c29d353..8532e846 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/psi/impl/resolve/EcmaScript6ResolveHelper.java
@@ -15,9 +15,8 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.Comparing;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -35,7 +34,7 @@ public ImportProcessor(String referencedName) {
         }
 
         @Override
-        public boolean execute(@Nonnull PsiElement psiElement, ResolveState resolveState) {
+        public boolean execute(PsiElement psiElement, ResolveState resolveState) {
             if (psiElement instanceof ES6ImportedBinding es6ImportedBinding && myReferencedName.equals(es6ImportedBinding.getName())) {
                 myResult = new JSImportedElementResolveResult(
                     myReferencedName,
@@ -50,7 +49,7 @@ public boolean execute(@Nonnull PsiElement psiElement, ResolveState resolveState
 
     @Nullable
     @Override
-    public JSImportedElementResolveResult resolveTypeNameUsingImports(@Nonnull String referencedName, PsiNamedElement parent) {
+    public JSImportedElementResolveResult resolveTypeNameUsingImports(String referencedName, PsiNamedElement parent) {
         ImportProcessor processor = new ImportProcessor(referencedName);
 
         PsiFile containingFile = parent.getContainingFile();
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
index e966e3e4..7412f072 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
@@ -9,7 +9,6 @@
 import consulo.language.editor.highlight.TextEditorHighlightingPassFactory;
 import consulo.language.psi.PsiFile;
 import consulo.xml.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeHighlightingPass;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -18,12 +17,12 @@
 @ExtensionImpl
 public class JSXTagTreeHighlightingPassFactory implements TextEditorHighlightingPassFactory {
     @Override
-    public void register(@Nonnull Registrar registrar) {
+    public void register(Registrar registrar) {
         registrar.registerTextEditorHighlightingPass(this, new int[]{Pass.UPDATE_ALL}, null, false, -1);
     }
 
     @Override
-    public TextEditorHighlightingPass createHighlightingPass(@Nonnull PsiFile file, @Nonnull Editor editor) {
+    public TextEditorHighlightingPass createHighlightingPass(PsiFile file, Editor editor) {
         if (editor.isOneLineMode() || !(editor instanceof EditorEx) || !(file.getLanguageVersion() instanceof JSXJavaScriptVersion)) {
             return null;
         }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
index d1b90062..ff2a1e0a 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/fileTemplate/JSXCreateFromTemplateHandler.java
@@ -5,7 +5,6 @@
 import consulo.fileTemplate.CreateFromTemplateHandler;
 import consulo.fileTemplate.FileTemplate;
 import consulo.javascript.jsx.language.JSXFileType;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -18,7 +17,6 @@ public boolean handlesTemplate(FileTemplate template) {
         return template.getExtension().equals(JavaScriptFileType.INSTANCE.getDefaultExtension());
     }
 
-    @Nonnull
     @Override
     public String checkAppendExtension(String fileName, FileTemplate template) {
         if (fileName.endsWith("." + JSXFileType.INSTANCE.getDefaultExtension())) {
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
index eea40447..4095ed25 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileType.java
@@ -11,8 +11,7 @@
 import consulo.ui.image.Image;
 import consulo.virtualFileSystem.VirtualFile;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -25,19 +24,16 @@ private JSXFileType() {
         super(JavaScriptLanguage.INSTANCE);
     }
 
-    @Nonnull
     @Override
     public String getId() {
         return "JSX";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDescription() {
         return LocalizeValue.localizeTODO("JSX files");
     }
 
-    @Nonnull
     @Override
     public String getDefaultExtension() {
         return "jsx";
@@ -50,7 +46,6 @@ public Image getIcon() {
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
         return JSXJavaScriptVersion.getInstance();
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
index 3db5b739..c810a18e 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXFileTypeFactory.java
@@ -4,7 +4,6 @@
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -13,7 +12,7 @@
 @ExtensionImpl
 public class JSXFileTypeFactory extends FileTypeFactory {
     @Override
-    public void createFileTypes(@Nonnull FileTypeConsumer fileTypeConsumer) {
+    public void createFileTypes(FileTypeConsumer fileTypeConsumer) {
         fileTypeConsumer.consume(JSXFileType.INSTANCE);
     }
 }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
index ffd168ab..5abc955b 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/JSXJavaScriptVersion.java
@@ -3,7 +3,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ecmascript.lang.EcmaScript6JavaScriptVersion;
 import consulo.javascript.language.JavaScriptLanguage;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -11,7 +10,6 @@
  */
 @ExtensionImpl
 public class JSXJavaScriptVersion extends EcmaScript6JavaScriptVersion {
-    @Nonnull
     public static EcmaScript6JavaScriptVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(JSXJavaScriptVersion.class);
     }
@@ -25,7 +23,6 @@ public int getWeight() {
         return 60;
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "JSX";
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
index 0cb87032..07473d91 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReference.java
@@ -3,16 +3,15 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReferenceBase;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
  * @since 2019-12-17
  */
 public class JSXmlTagReference extends PsiReferenceBase<PsiElement> {
-    public JSXmlTagReference(@Nonnull PsiElement element) {
+    public JSXmlTagReference(PsiElement element) {
         super(element);
     }
 
@@ -24,7 +23,6 @@ public PsiElement resolve() {
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public Object[] getVariants() {
         return new Object[0];
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
index 7b441d58..3f87e873 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/language/psi/impl/JSXmlTagReferenceContributor.java
@@ -8,7 +8,6 @@
 import consulo.language.psi.*;
 import consulo.language.util.ProcessingContext;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -19,9 +18,8 @@ public class JSXmlTagReferenceContributor extends PsiReferenceContributor {
     @Override
     public void registerReferenceProviders(PsiReferenceRegistrar registrar) {
         registrar.registerReferenceProvider(StandardPatterns.psiElement(JSXmlLiteralExpressionImpl.class), new PsiReferenceProvider() {
-            @Nonnull
             @Override
-            public PsiReference[] getReferencesByElement(@Nonnull PsiElement psiElement, @Nonnull ProcessingContext processingContext) {
+            public PsiReference[] getReferencesByElement(PsiElement psiElement, ProcessingContext processingContext) {
                 return PsiReference.EMPTY_ARRAY;
                 // TODO
 //				ASTNode[] children = psiElement.getNode().getChildren(TokenSet.create(JSTokenTypes.XML_NAME));
@@ -34,7 +32,6 @@ public PsiReference[] getReferencesByElement(@Nonnull PsiElement psiElement, @No
         });
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
index b08e4b56..fa27a5d2 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/EcmaScript4JavaScriptVersion.java
@@ -10,7 +10,6 @@
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.language.lexer.Lexer;
 import consulo.language.parser.PsiParser;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -27,19 +26,16 @@ public EcmaScript4JavaScriptVersion() {
         addFeature(JavaScriptFeature.CLASS);
     }
 
-    @Nonnull
     @Override
     public PsiParser createParser() {
         return new EcmaScript4Parser();
     }
 
-    @Nonnull
     @Override
     public JSHighlighter getSyntaxHighlighter() {
         return new JSHighlighter(myDialectOptionHolder);
     }
 
-    @Nonnull
     @Override
     public Lexer createLexer() {
         return new JavaScriptParsingFlexLexer(myDialectOptionHolder);
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
index 44560b9a..5c451f27 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4Parser.java
@@ -3,14 +3,12 @@
 import consulo.javascript.lang.parsing.JavaScriptParser;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 24.08.14
  */
 public class EcmaScript4Parser extends JavaScriptParser {
-    @Nonnull
     @Override
     public JavaScriptParsingContext createParsingContext() {
         return new EcmaScript4ParsingContext();
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
index 18a97942..8525e322 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4ParsingContext.java
@@ -4,26 +4,22 @@
 import consulo.javascript.lang.parsing.FunctionParsing;
 import consulo.javascript.lang.parsing.JavaScriptParsingContext;
 import consulo.javascript.lang.parsing.StatementParsing;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
  * @since 24.08.14
  */
 public class EcmaScript4ParsingContext extends JavaScriptParsingContext {
-    @Nonnull
     @Override
     protected StatementParsing createStatementParsing() {
         return new EcmaScript4StatementParsing(this);
     }
 
-    @Nonnull
     @Override
     protected FunctionParsing createFunctionParsing() {
         return new EcmaScript4FunctionParsing(this);
     }
 
-    @Nonnull
     @Override
     protected ExpressionParsing createExpressionParsing() {
         return new EcmaScript4ExpressionParsing(this);
diff --git a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
index 385a02cb..3e269cdc 100644
--- a/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
+++ b/lang-version-impl/ecmascript4-impl/src/main/java/consulo/javascript/ecmascript4/lang/parsing/EcmaScript4StatementParsing.java
@@ -8,7 +8,6 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.logging.Logger;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -316,7 +315,7 @@ private void parseImportStatement(PsiBuilder builder) {
         }
     }
 
-    private boolean parseNamespaceNoMarker(PsiBuilder builder, @Nonnull PsiBuilder.Marker useNSStatement) {
+    private boolean parseNamespaceNoMarker(PsiBuilder builder, PsiBuilder.Marker useNSStatement) {
         EcmaScript4StatementParsing.LOGGER.assertTrue(builder.getTokenType() == JSTokenTypes.NAMESPACE_KEYWORD);
 
         builder.advanceLexer();
@@ -367,7 +366,7 @@ private void parseClass(PsiBuilder builder) {
         parseClassNoMarker(builder, builder.mark());
     }
 
-    private void parseClassNoMarker(PsiBuilder builder, @Nonnull PsiBuilder.Marker clazz) {
+    private void parseClassNoMarker(PsiBuilder builder, PsiBuilder.Marker clazz) {
         IElementType tokenType = builder.getTokenType();
         EcmaScript4StatementParsing.LOGGER.assertTrue(
             JSTokenTypes.CLASS_KEYWORD == tokenType || JSTokenTypes.INTERFACE_KEYWORD == tokenType
diff --git a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
index b6c51243..c53f7d7b 100644
--- a/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
+++ b/lang-version-impl/javascript16-impl/src/main/java/consulo/javascript/javascript16/lang/JavaScript16LanguageVersion.java
@@ -25,7 +25,6 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.function.Supplier;
 
@@ -37,7 +36,6 @@
 public class JavaScript16LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
     private static final Supplier<Lexer> ourLexerFactory = () -> new JavaScript16Lexer();
 
-    @Nonnull
     public static JavaScript16LanguageVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript16LanguageVersion.class);
     }
@@ -46,19 +44,16 @@ public JavaScript16LanguageVersion() {
         super("JAVASCRIPT_1_6");
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "JavaScript 1.6";
     }
 
-    @Nonnull
     @Override
     public Lexer createLexer() {
         return ourLexerFactory.get();
     }
 
-    @Nonnull
     @Override
     public SyntaxHighlighter getSyntaxHighlighter() {
         return new JavaScriptHighlighter(ourLexerFactory);
diff --git a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
index bc892773..824bfa7b 100644
--- a/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
+++ b/lang-version-impl/javascript17-impl/src/main/java/consulo/javascript/javascript17/lang/JavaScript17LanguageVersion.java
@@ -25,7 +25,6 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.function.Supplier;
 
@@ -37,7 +36,6 @@
 public class JavaScript17LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
     private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
-    @Nonnull
     public static JavaScript17LanguageVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript17LanguageVersion.class);
     }
@@ -46,19 +44,16 @@ public JavaScript17LanguageVersion() {
         super("JAVASCRIPT_1_7");
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "JavaScript 1.7";
     }
 
-    @Nonnull
     @Override
     public Lexer createLexer() {
         return ourLexerFactory.get();
     }
 
-    @Nonnull
     @Override
     public SyntaxHighlighter getSyntaxHighlighter() {
         return new JavaScriptHighlighter(ourLexerFactory);
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
index 6fb550dc..4f3baa5a 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript185LanguageVersion.java
@@ -25,7 +25,6 @@
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.function.Supplier;
 
@@ -37,7 +36,6 @@
 public class JavaScript185LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
     private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
-    @Nonnull
     public static JavaScript185LanguageVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript185LanguageVersion.class);
     }
@@ -46,19 +44,16 @@ public JavaScript185LanguageVersion() {
         super("JAVASCRIPT_1_8_5");
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "JavaScript 1.8.5";
     }
 
-    @Nonnull
     @Override
     public Lexer createLexer() {
         return ourLexerFactory.get();
     }
 
-    @Nonnull
     @Override
     public SyntaxHighlighter getSyntaxHighlighter() {
         return new JavaScriptHighlighter(ourLexerFactory);
diff --git a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
index 98f9195a..4da4df81 100644
--- a/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
+++ b/lang-version-impl/javascript18-impl/src/main/java/consulo/javascript/javascript18/lang/JavaScript18LanguageVersion.java
@@ -24,7 +24,6 @@
 import consulo.javascript.language.StandardJavaScriptVersion;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
-import jakarta.annotation.Nonnull;
 
 import java.util.function.Supplier;
 
@@ -36,7 +35,6 @@
 public class JavaScript18LanguageVersion extends BaseJavaScriptLanguageVersion implements StandardJavaScriptVersion {
     private static final Supplier<Lexer> ourLexerFactory = JavaScript17Lexer::new;
 
-    @Nonnull
     public static JavaScript18LanguageVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(JavaScript18LanguageVersion.class);
     }
@@ -45,19 +43,16 @@ public JavaScript18LanguageVersion() {
         super("JAVASCRIPT_1_8");
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "JavaScript 1.8";
     }
 
-    @Nonnull
     @Override
     public Lexer createLexer() {
         return ourLexerFactory.get();
     }
 
-    @Nonnull
     @Override
     public SyntaxHighlighter getSyntaxHighlighter() {
         return new JavaScriptHighlighter(ourLexerFactory);
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index ead84fcc..bccf924a 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -29,8 +29,7 @@
 import consulo.typescript.version.TypeScriptLanguageVersion;
 import consulo.ui.image.Image;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -43,19 +42,16 @@ private TypeScriptFileType() {
         super(JavaScriptLanguage.INSTANCE);
     }
 
-    @Nonnull
     @Override
     public String getId() {
         return "TypeScript";
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDescription() {
         return JavaScriptLocalize.typescriptFiletypeDescription();
     }
 
-    @Nonnull
     @Override
     public String getDefaultExtension() {
         return "ts";
@@ -68,7 +64,6 @@ public Image getIcon() {
     }
 
     @RequiredReadAction
-    @Nonnull
     @Override
     public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
         return TypeScriptLanguageVersion.getInstance();
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
index e74068ec..9c304e35 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileTypeFactory.java
@@ -19,7 +19,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -28,7 +27,7 @@
 @ExtensionImpl
 public class TypeScriptFileTypeFactory extends FileTypeFactory {
     @Override
-    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
+    public void createFileTypes(FileTypeConsumer consumer) {
         consumer.consume(TypeScriptFileType.INSTANCE);
     }
 }
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
index f6259a92..ba7ab683 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
@@ -5,7 +5,6 @@
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptLanguage;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -13,7 +12,6 @@
  */
 @ExtensionImpl
 public class TypeScriptLanguageVersion extends BaseEcmaScriptJavaScriptVersion {
-    @Nonnull
     public static TypeScriptLanguageVersion getInstance() {
         return JavaScriptLanguage.INSTANCE.findVersionByClass(TypeScriptLanguageVersion.class);
     }
@@ -28,7 +26,6 @@ public TypeScriptLanguageVersion() {
         addFeature(JavaScriptFeature.FUNCTION_PROPERTY);
     }
 
-    @Nonnull
     @Override
     public String getPresentableName() {
         return "TypeScript";
diff --git a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
index 30823044..4e89b065 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
@@ -31,14 +31,11 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.project.Project;
-import org.jetbrains.annotations.NonNls;
 
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSClassNameMacro extends Macro {
     @Override
-    @NonNls
     public String getName() {
         return "jsClassName";
     }
@@ -49,13 +46,12 @@ public String getPresentableName() {
     }
 
     @Override
-    @NonNls
     public String getDefaultValue() {
         return "";
     }
 
     @Override
-    public Result calculateResult(@Nonnull Expression[] params, ExpressionContext context) {
+    public Result calculateResult(Expression[] params, ExpressionContext context) {
         PsiElement elementAtCaret = findElementAtCaret(context);
         JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(elementAtCaret);
 
@@ -87,12 +83,12 @@ public static PsiElement findElementAtCaret(ExpressionContext context) {
     }
 
     @Override
-    public Result calculateQuickResult(@Nonnull Expression[] params, ExpressionContext context) {
+    public Result calculateQuickResult(Expression[] params, ExpressionContext context) {
         return null;
     }
 
     @Override
-    public LookupElement[] calculateLookupItems(@Nonnull Expression[] params, ExpressionContext context) {
+    public LookupElement[] calculateLookupItems(Expression[] params, ExpressionContext context) {
         return null;
     }
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
index 3f80953a..05180d83 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSImplementationTextSelectioner.java
@@ -30,26 +30,24 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSImplementationTextSelectioner implements ImplementationTextSelectioner {
     @RequiredReadAction
     @Override
-    public int getTextStartOffset(@Nonnull PsiElement element) {
+    public int getTextStartOffset(PsiElement element) {
         return element.getTextOffset();
     }
 
     @RequiredReadAction
     @Override
-    public int getTextEndOffset(@Nonnull PsiElement element) {
+    public int getTextEndOffset(PsiElement element) {
         if (element instanceof JSDefinitionExpression) {
             element = PsiTreeUtil.getParentOfType(element, JSExpressionStatement.class);
         }
         return element.getTextRange().getEndOffset();
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
index 19c845e8..7987b69c 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
@@ -29,7 +29,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSMethodNameMacro extends Macro {
@@ -49,7 +48,7 @@ public String getDefaultValue() {
     }
 
     @Override
-    public Result calculateResult(@Nonnull Expression[] params, ExpressionContext context) {
+    public Result calculateResult(Expression[] params, ExpressionContext context) {
         PsiElement elementAtCaret = JSClassNameMacro.findElementAtCaret(context);
         if (elementAtCaret != null) {
             JSFunction function = PsiTreeUtil.getParentOfType(elementAtCaret, JSFunction.class);
@@ -68,12 +67,12 @@ public Result calculateResult(@Nonnull Expression[] params, ExpressionContext co
     }
 
     @Override
-    public Result calculateQuickResult(@Nonnull Expression[] params, ExpressionContext context) {
+    public Result calculateQuickResult(Expression[] params, ExpressionContext context) {
         return null;
     }
 
     @Override
-    public LookupElement[] calculateLookupItems(@Nonnull Expression[] params, ExpressionContext context) {
+    public LookupElement[] calculateLookupItems(Expression[] params, ExpressionContext context) {
         return null;
     }
 }
diff --git a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
index ee3290e9..246499e4 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSParameterInfoHandler.java
@@ -32,8 +32,7 @@
 import consulo.language.psi.ResolveResult;
 import consulo.language.psi.search.DefinitionsScopedSearch;
 import consulo.util.collection.ArrayUtil;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.*;
 
@@ -117,7 +116,7 @@ public static JSArgumentList findArgumentList(PsiFile file, int offset) {
     @Nullable
     private static JSArgumentList fillSignaturesForArgumentList(
         CreateParameterInfoContext context,
-        @Nonnull JSArgumentList argList
+        JSArgumentList argList
     ) {
         PsiElement psiElement = argList.getParent();
         if (!(psiElement instanceof JSCallExpression)) {
@@ -158,7 +157,7 @@ else if (methodExpression instanceof JSSuperExpression) {
     }
 
     @Override
-    public void showParameterInfo(@Nonnull JSArgumentList element, CreateParameterInfoContext context) {
+    public void showParameterInfo(JSArgumentList element, CreateParameterInfoContext context) {
         context.showHint(element, element.getTextOffset(), this);
     }
 
@@ -168,7 +167,7 @@ public JSArgumentList findElementForUpdatingParameterInfo(UpdateParameterInfoCon
     }
 
     @Override
-    public void updateParameterInfo(@Nonnull JSArgumentList o, UpdateParameterInfoContext context) {
+    public void updateParameterInfo(JSArgumentList o, UpdateParameterInfoContext context) {
         if (context.getParameterOwner() != o) {
             context.removeHint();
             return;
@@ -199,7 +198,6 @@ private static class SignatureInfo {
     }
 
     private static
-    @Nonnull
     SignatureInfo buildSignature(JSParameter[] params, boolean skipType, int selectedParameterIndex) {
         SignatureInfo info = new SignatureInfo();
         if (params.length > 0) {
@@ -250,42 +248,35 @@ public static String getSignatureForParameter(JSParameter p, boolean skipType) {
     }
 
     @Override
-    @Nonnull
-    public JSExpression[] getActualParameters(@Nonnull JSArgumentList jsArgumentList) {
+    public JSExpression[] getActualParameters(JSArgumentList jsArgumentList) {
         return jsArgumentList.getArguments();
     }
 
     @Override
-    @Nonnull
     public IElementType getActualParameterDelimiterType() {
         return JSTokenTypes.COMMA;
     }
 
     @Override
-    @Nonnull
     public IElementType getActualParametersRBraceType() {
         return JSTokenTypes.RBRACE;
     }
 
     @Override
-    @Nonnull
     public Set<Class<?>> getArgumentListAllowedParentClasses() {
         return ourArgumentListAllowedParentClassesSet;
     }
 
-    @Nonnull
     @Override
     public Set<? extends Class<?>> getArgListStopSearchClasses() {
         return Collections.emptySet();
     }
 
     @Override
-    @Nonnull
     public Class<JSArgumentList> getArgumentListClass() {
         return JSArgumentList.class;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
index 463eb7b7..0e86cd1e 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSAttributeNameValuePairManipulator.java
@@ -17,13 +17,11 @@
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-import org.jetbrains.annotations.NonNls;
 import com.intellij.lang.javascript.psi.JSAttributeNameValuePair;
 import com.intellij.lang.javascript.psi.JSClass;
 import com.intellij.lang.javascript.psi.impl.JSChangeUtil;
 import consulo.project.Project;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author peter
@@ -32,12 +30,11 @@
 public class JSAttributeNameValuePairManipulator extends JSAbstractElementManipulator<JSAttributeNameValuePair> {
     @Override
     protected JSAttributeNameValuePair createTree(String newText, Project project) {
-        @NonNls String ToCreate = "[A(" + newText + ")] class C {}";
+        String ToCreate = "[A(" + newText + ")] class C {}";
         PsiElement element = JSChangeUtil.createStatementFromText(project, ToCreate).getPsi();
         return ((JSClass)element).getAttributeList().getAttributes()[0].getValues()[0];
     }
 
-    @Nonnull
     @Override
     public Class<JSAttributeNameValuePair> getElementClass() {
         return JSAttributeNameValuePair.class;
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
index 21cb5543..8f571580 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSDocTagManipulator.java
@@ -21,7 +21,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSDocTagManipulator extends JSAbstractElementManipulator<JSDocTag> {
@@ -32,7 +31,6 @@ protected JSDocTag createTree(String newText, Project project) {
         return ((JSDocComment)element).getTags()[0];
     }
 
-    @Nonnull
     @Override
     public Class<JSDocTag> getElementClass() {
         return JSDocTag.class;
diff --git a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
index a66bc687..3287b818 100644
--- a/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
+++ b/plugin/src/main/java/com/intellij/javascript/manipulators/JSIncludeDirectiveManipulator.java
@@ -20,7 +20,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.project.Project;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author peter
@@ -32,7 +31,6 @@ protected JSIncludeDirectiveImpl createTree(String newText, Project project) {
         return (JSIncludeDirectiveImpl)JSChangeUtil.createStatementFromText(project, newText).getPsi();
     }
 
-    @Nonnull
     @Override
     public Class<JSIncludeDirectiveImpl> getElementClass() {
         return JSIncludeDirectiveImpl.class;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
index a318e0db..63c6ec9e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JSSmartEnterProcessor.java
@@ -33,7 +33,6 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -43,7 +42,7 @@
 public class JSSmartEnterProcessor extends SmartEnterProcessor {
     @Override
     @RequiredWriteAction
-    public boolean process(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiFile psiFile) {
+    public boolean process(Project project, Editor editor, PsiFile psiFile) {
         int offset = editor.getCaretModel().getOffset();
         PsiElement at = psiFile.findElementAt(offset);
         if (at == null && offset > 0) {
@@ -159,7 +158,6 @@ private static PsiElement evalMeaningfulElement(PsiElement element, boolean forw
         return prev;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
index 3a6aa70e..b2096c0e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
@@ -35,7 +35,6 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.ref.SimpleReference;
 import consulo.xml.lang.xml.XMLLanguage;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -51,7 +50,7 @@ public JavaScriptCodeContextType() {
 
     @Override
     @RequiredReadAction
-    public boolean isInContext(@Nonnull TemplateActionContext context) {
+    public boolean isInContext(TemplateActionContext context) {
         PsiFile file = context.getFile();
         int offset = context.getStartOffset();
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
index 48ac5f6d..f0e922cb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptTargetElementUtilEx.java
@@ -22,7 +22,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.editor.TargetElementUtilExtender;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -31,7 +30,7 @@
 @ExtensionImpl
 public class JavaScriptTargetElementUtilEx implements TargetElementUtilExtender {
     @Override
-    public boolean includeSelfInGotoImplementation(@Nonnull PsiElement element) {
+    public boolean includeSelfInGotoImplementation(PsiElement element) {
         if (element instanceof JSFunction function) {
             if (JSResolveUtil.findParent(function) instanceof JSClass jsClass && jsClass.isInterface()) {
                 return false;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
index 5bd8592c..e1f15cda 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavascriptCommenter.java
@@ -24,8 +24,7 @@
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiComment;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -97,7 +96,6 @@ public IElementType getDocumentationCommentTokenType() {
         return JSTokenTypes.DOC_COMMENT;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
index 58d08e6e..e71dfec0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptClassGroupRuleProvider.java
@@ -22,7 +22,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.application.AllIcons;
 import consulo.usage.UsageGroup;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -45,7 +44,7 @@ protected boolean isAcceptableElement(JSNamedElement element) {
     }
 
     private static class ClassUsageGroup extends JavaScriptGroupRuleProviderBase.PsiNamedElementUsageGroupBase<JSClass> {
-        public ClassUsageGroup(@Nonnull JSClass clazz) {
+        public ClassUsageGroup(JSClass clazz) {
             super(clazz, AllIcons.Nodes.Class);
         }
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
index 93a87a93..79c5bdd2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
@@ -28,7 +28,6 @@
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlToken;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author max
@@ -37,13 +36,12 @@
 @ExtensionImpl
 public class JavaScriptFindUsagesProvider implements FindUsagesProvider {
     @Override
-    public boolean canFindUsagesFor(@Nonnull PsiElement psiElement) {
+    public boolean canFindUsagesFor(PsiElement psiElement) {
         return psiElement instanceof PsiNamedElement;
     }
 
     @Override
-    @Nonnull
-    public String getType(@Nonnull PsiElement element) {
+    public String getType(PsiElement element) {
         if (element instanceof JSFunction) {
             return JavaScriptLocalize.javascriptLanguageTermFunction().get();
         }
@@ -81,15 +79,13 @@ public String getType(@Nonnull PsiElement element) {
     }
 
     @Override
-    @Nonnull
-    public String getDescriptiveName(@Nonnull PsiElement element) {
+    public String getDescriptiveName(PsiElement element) {
         String name = ((PsiNamedElement)element).getName();
         return name != null ? name : "";
     }
 
     @Override
-    @Nonnull
-    public String getNodeText(@Nonnull PsiElement element, boolean useFullName) {
+    public String getNodeText(PsiElement element, boolean useFullName) {
         return getDescriptiveName(element);
     }
 
@@ -98,7 +94,6 @@ public WordsScanner getWordsScanner() {
         return new JSWordsScanner();
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
index 4f37ea46..82f74c76 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFunctionGroupRuleProvider.java
@@ -21,7 +21,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.application.AllIcons;
 import consulo.usage.UsageGroup;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -39,7 +38,7 @@ protected UsageGroup createUsageGroup(JSFunction jsFunction) {
     }
 
     private static class FunctionUsageGroup extends JavaScriptGroupRuleProviderBase.PsiNamedElementUsageGroupBase<JSFunction> {
-        public FunctionUsageGroup(@Nonnull JSFunction function) {
+        public FunctionUsageGroup(JSFunction function) {
             super(function, AllIcons.Nodes.Function);
         }
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
index 19158a11..2874545d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -40,8 +40,7 @@
 import consulo.util.dataholder.Key;
 import consulo.util.lang.Comparing;
 import consulo.virtualFileSystem.status.FileStatus;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
@@ -55,7 +54,7 @@ public UsageGroupingRule getUsageGroupingRule(Project project) {
             @Override
             @RequiredReadAction
             @SuppressWarnings("unchecked")
-            public UsageGroup groupUsage(@Nonnull Usage usage) {
+            public UsageGroup groupUsage(Usage usage) {
                 if (usage instanceof PsiElementUsage elementUsage) {
                     PsiElement psiElement = elementUsage.getElement();
 
@@ -91,7 +90,7 @@ abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement &
         private String myName;
         private Image myIcon;
 
-        PsiNamedElementUsageGroupBase(@Nonnull T element, Image icon) {
+        PsiNamedElementUsageGroupBase(T element, Image icon) {
             myIcon = icon;
 
             myName = element.getName();
@@ -111,7 +110,6 @@ public T getElement() {
         }
 
         @Override
-        @Nonnull
         public String getText(UsageView view) {
             return myName;
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
index 406641e6..492c35ff 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/AddImportECMAScriptClassOrFunctionAction.java
@@ -51,7 +51,6 @@
 import consulo.util.collection.Sets;
 import consulo.util.collection.SmartList;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -78,7 +77,7 @@ public AddImportECMAScriptClassOrFunctionAction(Editor editor, PsiPolyVariantRef
 
     @Override
     @RequiredUIAccess
-    public boolean showHint(@Nonnull Editor editor) {
+    public boolean showHint(Editor editor) {
         myEditor = editor;
         PsiElement element = myReference.getElement();
         TextRange textRange = InjectedLanguageManager.getInstance(element.getProject()).injectedToHost(element, element.getTextRange());
@@ -87,7 +86,6 @@ public boolean showHint(@Nonnull Editor editor) {
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         String className = StringUtil.notNullize(calculatedClass);
         return isFunction
@@ -96,20 +94,19 @@ public LocalizeValue getText() {
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getName() {
         return getText();
     }
 
     @Override
     @RequiredWriteAction
-    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+    public void applyFix(Project project, ProblemDescriptor descriptor) {
         invoke(project, myEditor, descriptor.getPsiElement().getContainingFile());
     }
 
     @Override
     @RequiredReadAction
-    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+    public boolean isAvailable(Project project, Editor editor, PsiFile file) {
         if (!myReference.getElement().isValid()) {
             return false;
         }
@@ -200,7 +197,7 @@ public static Collection<JSQualifiedNamedElement> getCandidates(Editor editor, P
 
     @Override
     @RequiredWriteAction
-    public void invoke(@Nonnull final Project project, final Editor editor, PsiFile file) {
+    public void invoke(final Project project, final Editor editor, PsiFile file) {
         Collection<JSQualifiedNamedElement> candidates = getCandidates(editor, file);
 
         if (candidates.size() > 0) {
@@ -236,7 +233,7 @@ protected int getIconFlags() {
                     JavaScriptLocalize.chooseClassTitle().get(),
                     new PsiElementProcessor<>() {
                         @Override
-                        public boolean execute(@Nonnull JSQualifiedNamedElement element) {
+                        public boolean execute(JSQualifiedNamedElement element) {
                             CommandProcessor.getInstance().newCommand()
                                 .project(project)
                                 .name(LocalizeValue.ofNullable(getClass().getName()))
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
index 5e6a6f71..ccc6fc0c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ECMAScriptImportOptimizer.java
@@ -39,7 +39,6 @@
 import consulo.util.lang.EmptyRunnable;
 import consulo.util.lang.Pair;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.*;
 
@@ -56,7 +55,6 @@ public boolean supports(PsiFile file) {
     }
 
     @Override
-    @Nonnull
     public Runnable processFile(final PsiFile file) {
         if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
             return EmptyRunnable.INSTANCE;
@@ -227,7 +225,6 @@ else if (insertionPlace.getNextSibling() instanceof PsiWhiteSpace whiteSpace) {
         };
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
index b372684c..65957919 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
@@ -42,8 +42,7 @@
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTag;
 import consulo.xml.psi.xml.XmlText;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.*;
 
@@ -93,7 +92,7 @@ else if (earlyImport.getNextSibling() instanceof PsiWhiteSpace whiteSpace
     }
 
     @RequiredWriteAction
-    public static void doImport(@Nonnull PsiElement subject, @Nonnull String fqn) {
+    public static void doImport(PsiElement subject, String fqn) {
         assert fqn.contains(".") : "Qualified name belongs to default package: " + fqn;
 
         if (!FileModificationService.getInstance().prepareFileForWrite(subject.getContainingFile())) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
index 098574c3..c7771e23 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceDumper.java
@@ -17,8 +17,7 @@
 package com.intellij.lang.javascript.impl.flex.importer;
 
 import consulo.util.lang.StringEscapeUtil;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Set;
 
@@ -31,20 +30,20 @@ class AS3InterfaceDumper extends AbstractDumpProcessor {
     private boolean isInterface;
 
     @Override
-    public void dumpStat(@Nonnull String stat) {
+    public void dumpStat(String stat) {
     }
 
     @Override
-    public void dumpToplevelAnonymousMethod(@Nonnull Abc abc, @Nonnull MethodInfo m) {
+    public void dumpToplevelAnonymousMethod(Abc abc, MethodInfo m) {
     }
 
     @Override
-    public void dumpTopLevelTraits(@Nonnull Abc abc, @Nonnull Traits t, String indent) {
+    public void dumpTopLevelTraits(Abc abc, Traits t, String indent) {
         t.dump(abc, indent, "", this);
     }
 
     @Override
-    public boolean doDumpMember(@Nonnull MemberInfo memberInfo) {
+    public boolean doDumpMember(MemberInfo memberInfo) {
         return memberInfo.name != null && (memberInfo.name.name == null || !memberInfo.name.name.contains(Abc.$CINIT));
     }
 
@@ -112,13 +111,13 @@ private static boolean needsQuoting(String value) {
     }
 
     @Override
-    public boolean doDumpMetaData(@Nonnull MetaData md) {
+    public boolean doDumpMetaData(MetaData md) {
         return !md.name.contains("__");
     }
 
     @Override
     public void processParameter(
-        @Nonnull String name,
+        String name,
         @Nullable Multiname type,
         String parentName,
         @Nullable Multiname value,
@@ -154,12 +153,12 @@ public void setProcessingInterface(boolean anInterface) {
     }
 
     @Override
-    public void hasError(@Nonnull String error) {
+    public void hasError(String error) {
         sb.append("/*").append(error).append("*/");
     }
 
     @Override
-    public void processMultinameAsPackageName(@Nonnull Multiname name, String parentName, boolean verbose) {
+    public void processMultinameAsPackageName(Multiname name, String parentName, boolean verbose) {
         append(getMultinameAsPackageName(name, parentName, verbose));
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
index b9f2e711..42f12cd8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AS3InterfaceStubDumper.java
@@ -21,8 +21,7 @@
 import com.intellij.lang.javascript.psi.stubs.impl.JSReferenceListStubImpl;
 import consulo.language.psi.stub.StubElement;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.LinkedList;
 
@@ -59,7 +58,7 @@ protected void processArgumentList(MethodInfo methodInfo, String parentName) {
 
     @Override
     public void processParameter(
-        @Nonnull String name,
+        String name,
         @Nullable Multiname type,
         String parentName,
         @Nullable Multiname value,
@@ -75,7 +74,7 @@ public void processParameter(
     }
 
     @Override
-    public void append(@Nonnull String str) {
+    public void append(String str) {
     }
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
index e80c423c..c3d166c3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/Abc.java
@@ -18,7 +18,6 @@
 
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -546,7 +545,7 @@ class Abc {
     int totalSize;
     final int opSizes[] = new int[256];
 
-    public Abc(@Nonnull ByteBuffer _data, @Nonnull FlexByteCodeInformationProcessor _processor) {
+    public Abc(ByteBuffer _data, FlexByteCodeInformationProcessor _processor) {
         data = _data;
         processor = _processor;
 
@@ -1088,7 +1087,7 @@ void parseMethodBodies() {
         reportAboutPercentage("MethodBodies size ", data, start, processor);
     }
 
-    private static void reportAboutPercentage(String s, ByteBuffer data, int start, @Nonnull FlexByteCodeInformationProcessor processor) {
+    private static void reportAboutPercentage(String s, ByteBuffer data, int start, FlexByteCodeInformationProcessor processor) {
         processor.dumpStat(s + (data.getPosition() - start) + " " + (int)100f * (data.getPosition() - start) / data.bytesSize() + " %\n");
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
index 6bcbbf2d..469b38f1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbcDumper.java
@@ -16,8 +16,7 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
@@ -31,12 +30,12 @@ public AbcDumper(boolean _dumpCode) {
     }
 
     @Override
-    public void dumpStat(@Nonnull String stat) {
+    public void dumpStat(String stat) {
         sb.append(stat);
     }
 
     @Override
-    public void hasError(@Nonnull String error) {
+    public void hasError(String error) {
         sb.append(error);
     }
 
@@ -48,7 +47,7 @@ protected String appendModifiers(MemberInfo member, String attr) {
 
     @Override
     public void processMultinameAsPackageName(
-        @Nonnull Multiname name,
+        Multiname name,
         @Nullable String parentName,
         boolean referenceNameRequested
     ) {
@@ -56,19 +55,19 @@ public void processMultinameAsPackageName(
     }
 
     @Override
-    public void dumpToplevelAnonymousMethod(@Nonnull Abc abc, @Nonnull MethodInfo m) {
+    public void dumpToplevelAnonymousMethod(Abc abc, MethodInfo m) {
         m.dump(abc, "", "", this);
     }
 
     @Override
-    public void dumpTopLevelTraits(@Nonnull Abc abc, @Nonnull Traits t, String indent) {
+    public void dumpTopLevelTraits(Abc abc, Traits t, String indent) {
         sb.append(indent).append(t.name).append("\n");
         t.dump(abc, indent, "", this);
         t.init.dump(abc, indent, "", this);
     }
 
     @Override
-    public boolean doDumpMember(@Nonnull MemberInfo memberInfo) {
+    public boolean doDumpMember(MemberInfo memberInfo) {
         return true;
     }
 
@@ -93,13 +92,13 @@ public void processValue(Multiname type, Object value) {
     }
 
     @Override
-    public boolean doDumpMetaData(@Nonnull MetaData md) {
+    public boolean doDumpMetaData(MetaData md) {
         return true;
     }
 
     @Override
     public void processParameter(
-        @Nonnull String name,
+        String name,
         @Nullable Multiname type,
         String parentName,
         @Nullable Multiname value,
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
index 6a3ccfac..7aa9625c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/AbstractDumpProcessor.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -30,7 +29,7 @@ String getResult() {
     }
 
     @Override
-    public void append(@Nonnull String str) {
+    public void append(String str) {
         sb.append(str);
     }
 
@@ -93,7 +92,7 @@ public void processFunction(MethodInfo methodInfo, boolean referenceNameRequeste
         processMultinameAsPackageName(methodInfo.returnType, parentName, referenceNameRequested);
     }
 
-    protected void processMemberKindAndName(@Nonnull MemberInfo member) {
+    protected void processMemberKindAndName(MemberInfo member) {
         append(Abc.traitKinds[member.kind]);
         append(" ");
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
index 2a250b8e..4927d37e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/ByteBuffer.java
@@ -22,7 +22,6 @@
 import java.io.UnsupportedEncodingException;
 import java.util.zip.InflaterInputStream;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -33,7 +32,7 @@ class ByteBuffer {
     private int position;
     private boolean littleEndian;
 
-    void read(@Nonnull InputStream inputStream) throws IOException {
+    void read(InputStream inputStream) throws IOException {
         try {
             bytes = readStream(inputStream);
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
index 247e7cef..6986f4d1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexByteCodeInformationProcessor.java
@@ -16,27 +16,26 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
  * @since 2008-10-20
  */
 interface FlexByteCodeInformationProcessor {
-    void dumpStat(@Nonnull String stat);
+    void dumpStat(String stat);
 
-    void hasError(@Nonnull String error);
+    void hasError(String error);
 
-    void append(@Nonnull String str);
+    void append(String str);
 
-    void processMultinameAsPackageName(@Nonnull Multiname name, @Nullable String parentName, boolean referenceNameRequested);
+    void processMultinameAsPackageName(Multiname name, @Nullable String parentName, boolean referenceNameRequested);
 
-    void dumpToplevelAnonymousMethod(@Nonnull Abc abc, @Nonnull MethodInfo m);
+    void dumpToplevelAnonymousMethod(Abc abc, MethodInfo m);
 
-    void dumpTopLevelTraits(@Nonnull Abc abc, @Nonnull Traits t, String indent);
+    void dumpTopLevelTraits(Abc abc, Traits t, String indent);
 
-    boolean doDumpMember(@Nonnull MemberInfo memberInfo);
+    boolean doDumpMember(MemberInfo memberInfo);
 
     void appendMethodSeparator();
 
@@ -44,11 +43,11 @@ interface FlexByteCodeInformationProcessor {
 
     String getAbcInSwfIndent();
 
-    boolean doDumpMetaData(@Nonnull MetaData md);
+    boolean doDumpMetaData(MetaData md);
 
     String REST_PARAMETER_TYPE = "...";
 
-    void processParameter(@Nonnull String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest);
+    void processParameter(String name, @Nullable Multiname type, String parentName, @Nullable Multiname value, boolean rest);
 
     boolean doStarTypeDumpInExtends();
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
index be190018..56944e1e 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/FlexImporter.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript.impl.flex.importer;
 
 import consulo.language.psi.stub.StubElement;
-import jakarta.annotation.Nonnull;
 
 import java.io.*;
 
@@ -79,8 +78,8 @@ public static void buildStubsInterfaceFromStream(InputStream in, StubElement par
     }
 
     private static void processFlexByteCode(
-        @Nonnull InputStream in,
-        @Nonnull FlexByteCodeInformationProcessor processor
+        InputStream in,
+        FlexByteCodeInformationProcessor processor
     ) throws IOException {
         ByteBuffer data = new ByteBuffer();
         data.read(in);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
index 12b910a3..fb2aaf47 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/importer/MemberInfo.java
@@ -16,7 +16,6 @@
 
 package com.intellij.lang.javascript.impl.flex.importer;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -32,9 +31,9 @@ abstract class MemberInfo {
     boolean isPublic;
     boolean isFinal;
 
-    abstract void dump(Abc abc, String indent, String attr, @Nonnull FlexByteCodeInformationProcessor processor);
+    abstract void dump(Abc abc, String indent, String attr, FlexByteCodeInformationProcessor processor);
 
-    protected void dumpMetaData(String indent, @Nonnull FlexByteCodeInformationProcessor processor) {
+    protected void dumpMetaData(String indent, FlexByteCodeInformationProcessor processor) {
         if (metadata != null) {
             for (MetaData md : metadata) {
                 if (processor.doDumpMetaData(md)) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
index 800aa297..a60e5d80 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/folding/JavaScriptFoldingBuilder.java
@@ -36,7 +36,6 @@
 import consulo.language.editor.folding.FoldingBuilder;
 import consulo.language.psi.PsiWhiteSpace;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,10 +45,9 @@
  */
 @ExtensionImpl
 public class JavaScriptFoldingBuilder implements FoldingBuilder {
-    @Nonnull
     @Override
     @RequiredReadAction
-    public FoldingDescriptor[] buildFoldRegions(@Nonnull ASTNode node, @Nonnull Document document) {
+    public FoldingDescriptor[] buildFoldRegions(ASTNode node, Document document) {
         List<FoldingDescriptor> descriptors = new ArrayList<>();
         appendDescriptors(node, document, descriptors);
         return descriptors.toArray(new FoldingDescriptor[descriptors.size()]);
@@ -190,7 +188,6 @@ public boolean isCollapsedByDefault(ASTNode node) {
         return CodeFoldingSettings.getInstance().COLLAPSE_DOC_COMMENTS && node.getElementType() == JSTokenTypes.DOC_COMMENT;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
index 65eb68cf..1676d523 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStylePanel.java
@@ -28,7 +28,6 @@
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.event.DocumentAdapter;
 import consulo.virtualFileSystem.fileType.FileType;
-import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -89,7 +88,6 @@ protected void prepareForReformat(PsiFile psiFile) {
     }
 
     @Override
-    @Nonnull
     protected FileType getFileType() {
         return JavaScriptFileType.INSTANCE;
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
index 74f7eba2..2cc9b9ad 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSCodeStyleSettingsProvider.java
@@ -25,8 +25,7 @@
 import consulo.language.codeStyle.CodeStyleSettings;
 import consulo.language.codeStyle.CustomCodeStyleSettings;
 import consulo.language.codeStyle.setting.CodeStyleSettingsProvider;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
@@ -46,7 +45,6 @@ public Language getLanguage() {
     }
 
     @Override
-    @Nonnull
     public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSettings originalSettings) {
         return new JavaScriptCodeStyleConfigurable(settings, originalSettings);
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
index 958cd10e..8ff4a609 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSFormattingModel.java
@@ -24,7 +24,6 @@
 import consulo.language.codeStyle.Block;
 import consulo.language.codeStyle.FormattingDocumentModel;
 import consulo.language.psi.PsiFile;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author ven
@@ -37,13 +36,11 @@ public JSFormattingModel(PsiFile file, CodeStyleSettings settings, Block rootBlo
     }
 
     @Override
-    @Nonnull
     public Block getRootBlock() {
         return myModel.getRootBlock();
     }
 
     @Override
-    @Nonnull
     public FormattingDocumentModel getDocumentModel() {
         return myModel.getDocumentModel();
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
index 229ede1c..b61e6fee 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavaScriptIndentOptionsProvider.java
@@ -24,7 +24,6 @@
 import consulo.language.codeStyle.ui.setting.SmartIndentOptionsEditor;
 import consulo.language.psi.PsiFile;
 import consulo.virtualFileSystem.fileType.FileType;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author yole
@@ -46,7 +45,6 @@ public IndentOptionsEditor createOptionsEditor() {
         return new SmartIndentOptionsEditor();
     }
 
-    @Nonnull
     @Override
     public String getPreviewText() {
         return "function a() {\n" +
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
index 53c0eb3b..1c5e1796 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JavascriptFormattingModelBuilder.java
@@ -28,13 +28,11 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JavascriptFormattingModelBuilder implements FormattingModelBuilder {
-    @Nonnull
     @Override
-    public FormattingModel createModel(@Nonnull FormattingContext formattingContext) {
+    public FormattingModel createModel(FormattingContext formattingContext) {
         PsiElement element = formattingContext.getPsiElement();
 
         CodeStyleSettings settings = formattingContext.getCodeStyleSettings();
@@ -56,7 +54,6 @@ public FormattingModel createModel(@Nonnull FormattingContext formattingContext)
         );
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
index 66f3a0db..38a86ca4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSBlock.java
@@ -29,8 +29,7 @@
 import consulo.language.psi.PsiErrorElement;
 import consulo.language.psi.PsiWhiteSpace;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
@@ -66,13 +65,11 @@ public ASTNode getNode() {
     }
 
     @Override
-    @Nonnull
     public TextRange getTextRange() {
         return myNode.getTextRange();
     }
 
     @Override
-    @Nonnull
     public List<Block> getSubBlocks() {
         if (mySubBlocks == null) {
             SubBlockVisitor visitor = new SubBlockVisitor(getSettings());
@@ -110,7 +107,6 @@ public Spacing getSpacing(Block child1, Block child2) {
     }
 
     @Override
-    @Nonnull
     public ChildAttributes getChildAttributes(int newChildIndex) {
         Indent indent = null;
         IElementType blockElementType = myNode.getElementType();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
index cfb29528..c24af085 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/JSDocCommentBlock.java
@@ -19,8 +19,7 @@
 import consulo.document.util.TextRange;
 import consulo.language.ast.ASTNode;
 import consulo.language.codeStyle.*;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,13 +41,11 @@ public JSDocCommentBlock(ASTNode node, int startOffset, int endOffset, Indent in
         myIndent = indent;
     }
 
-    @Nonnull
     @Override
     public TextRange getTextRange() {
         return new TextRange(myNode.getStartOffset() + myStartOffset, myNode.getStartOffset() + myEndOffset);
     }
 
-    @Nonnull
     @Override
     public List<Block> getSubBlocks() {
         return EMPTY_BLOCK_LIST;
@@ -60,7 +57,6 @@ public Wrap getWrap() {
         return null;
     }
 
-    @Nonnull
     @Override
     public Indent getIndent() {
         return myIndent;
@@ -74,11 +70,10 @@ public Alignment getAlignment() {
 
     @Nullable
     @Override
-    public Spacing getSpacing(Block child1, @Nonnull Block child2) {
+    public Spacing getSpacing(Block child1, Block child2) {
         return null;
     }
 
-    @Nonnull
     @Override
     public ChildAttributes getChildAttributes(int newChildIndex) {
         return new ChildAttributes(null, null);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
index 18aff29c..3eead479 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/blocks/SubBlockVisitor.java
@@ -29,7 +29,7 @@
 import consulo.language.ast.IElementType;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
index 9f4dfb47..8dd62f75 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateAction.java
@@ -29,7 +29,6 @@
 import consulo.ui.ex.action.AnAction;
 import consulo.ui.ex.action.AnActionEvent;
 import consulo.virtualFileSystem.VirtualFile;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -52,7 +51,6 @@ public void actionPerformed(AnActionEvent e) {
         new JavaScriptGenerateAccessorHandler(getGenerationMode()).invoke(project, editor, psifile);
     }
 
-    @Nonnull
     protected abstract JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode();
 
     @Override
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
index 6d4cf14e..9d5862bc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/BaseJSGenerateHandler.java
@@ -38,7 +38,6 @@
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.undoRedo.CommandProcessor;
-import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 import java.util.ArrayList;
@@ -46,7 +45,6 @@
 import java.util.List;
 
 abstract class BaseJSGenerateHandler implements LanguageCodeInsightActionHandler {
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
@@ -54,7 +52,7 @@ public Language getLanguage() {
 
     @Override
     @RequiredUIAccess
-    public void invoke(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiFile file) {
+    public void invoke(Project project, Editor editor, PsiFile file) {
         JSClass clazz = findClass(file, editor);
 
         if (clazz == null) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
index 1088f29e..2b721999 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateAccessorHandler.java
@@ -38,7 +38,6 @@
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.NonFocusableCheckBox;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 import java.util.*;
@@ -102,7 +101,7 @@ protected BaseCreateMethodsFix createFix(JSClass jsClass) {
                 @Override
                 @RequiredUIAccess
                 @RequiredWriteAction
-                public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+                public void invoke(Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
                     evalAnchor(editor, file);
 
                     for (JSVariable e : getElementsToProcess()) {
@@ -117,7 +116,7 @@ else if (mode == GenerationMode.CONSTRUCTOR) {
                 @Override
                 @RequiredUIAccess
                 @RequiredWriteAction
-                public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+                public void invoke(Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
                     JSCodeStyleSettings codeStyleSettings =
                         CodeStyleSettingsManager.getSettings(project).getCustomSettings(JSCodeStyleSettings.class);
                     evalAnchor(editor, file);
@@ -196,7 +195,7 @@ else if (mode == GenerationMode.TOSTRING) {
                 @Override
                 @RequiredUIAccess
                 @RequiredWriteAction
-                public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+                public void invoke(Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
                     evalAnchor(editor, file);
 
                     boolean[] needOverride = new boolean[1];
@@ -257,7 +256,7 @@ protected void collectCandidates(JSClass clazz, Collection<JSNamedElementNode> c
 
             @Override
             @RequiredReadAction
-            public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+            public boolean execute(PsiElement element, ResolveState state) {
                 if (element instanceof JSVariable variable) {
                     if (variable.isConst()) {
                         return true;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
index 2310a447..2f5176e8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateConstructorAction.java
@@ -16,14 +16,12 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  * @since 2008-07-19
  */
 public class JavaScriptGenerateConstructorAction extends BaseJSGenerateAction {
-    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.CONSTRUCTOR;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
index f14bc809..5fb3197b 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetAccessorAction.java
@@ -16,14 +16,12 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  * @since 2008-07-19
  */
 public class JavaScriptGenerateGetAccessorAction extends BaseJSGenerateAction {
-    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.GETTERS;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
index 024faa37..94f3a767 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateGetSetAccessorAction.java
@@ -16,14 +16,12 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  * @since 2008-07-19
  */
 public class JavaScriptGenerateGetSetAccessorAction extends BaseJSGenerateAction {
-    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.GETTERS_AND_SETTERS;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
index 1b16e1b3..2dc012f8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateSetAccessorAction.java
@@ -16,14 +16,12 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  * @since 2008-07-19
  */
 public class JavaScriptGenerateSetAccessorAction extends BaseJSGenerateAction {
-    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.SETTERS;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
index f3a3b958..ce483e38 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptGenerateToStringAction.java
@@ -16,14 +16,12 @@
 
 package com.intellij.lang.javascript.impl.generation;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
  * @since 2008-07-19
  */
 public class JavaScriptGenerateToStringAction extends BaseJSGenerateAction {
-    @Nonnull
     @Override
     protected JavaScriptGenerateAccessorHandler.GenerationMode getGenerationMode() {
         return JavaScriptGenerateAccessorHandler.GenerationMode.TOSTRING;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
index b2a900e2..a7332d96 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/generation/JavaScriptOverrideMethodsHandler.java
@@ -32,7 +32,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 import java.util.Collection;
 import java.util.Map;
@@ -78,7 +77,7 @@ protected void collectCandidates(JSClass clazz, Collection<JSNamedElementNode> c
 
             @Override
             @RequiredReadAction
-            public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+            public boolean execute(PsiElement element, ResolveState state) {
                 if (element instanceof JSFunction function) {
                     if (function.isConstructor() || functionsToOverride == null) {
                         return true;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
index 03950783..bc410d54 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JSBraceMatcher.java
@@ -23,9 +23,8 @@
 import consulo.language.Language;
 import consulo.language.PairedBraceMatcher;
 import consulo.language.ast.IElementType;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author max
@@ -45,7 +44,7 @@ public BracePair[] getPairs() {
     }
 
     @Override
-    public boolean isPairedBracesAllowedBeforeType(@Nonnull IElementType lbraceType, @Nullable IElementType tokenType) {
+    public boolean isPairedBracesAllowedBeforeType(IElementType lbraceType, @Nullable IElementType tokenType) {
         return tokenType == JSTokenTypes.WHITE_SPACE
             || JSTokenTypes.COMMENTS.contains(tokenType)
             || tokenType == JSTokenTypes.SEMICOLON
@@ -56,7 +55,6 @@ public boolean isPairedBracesAllowedBeforeType(@Nonnull IElementType lbraceType,
             || tokenType == null;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
index 296abfcf..56f6dd14 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptColorsAndFontsPage.java
@@ -25,7 +25,6 @@
 import consulo.language.editor.colorScheme.setting.ColorSettingsPage;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -99,25 +98,21 @@ public class JavaScriptColorsAndFontsPage implements ColorSettingsPage {
 
 
     @Override
-    @Nonnull
     public LocalizeValue getDisplayName() {
         return JavaScriptLocalize.javascriptName();
     }
 
     @Override
-    @Nonnull
     public AttributesDescriptor[] getAttributeDescriptors() {
         return ATTRS;
     }
 
     @Override
-    @Nonnull
     public SyntaxHighlighter getHighlighter() {
         return JavaScript15LanguageVersion.getInstance().getSyntaxHighlighter();
     }
 
     @Override
-    @Nonnull
     public String getDemoText() {
         return "var <global_variable>globalVar</global_variable>;\n" +
             "/**\n" +
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
index 6817e0f1..4ec45b1c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
@@ -36,15 +36,14 @@
 import consulo.language.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class JavaScriptHighlightVisitor extends JSElementVisitor implements HighlightVisitor {
     private HighlightInfoHolder myHighlightInfoHolder;
 
     @Override
     @RequiredReadAction
-    public void visitJSBinaryExpression(@Nonnull JSBinaryExpression node) {
+    public void visitJSBinaryExpression(JSBinaryExpression node) {
         super.visitJSBinaryExpression(node);
 
         IElementType operationSign = node.getOperationSign();
@@ -55,7 +54,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression node) {
+    public void visitJSAssignmentExpression(JSAssignmentExpression node) {
         super.visitJSAssignmentExpression(node);
 
         IElementType operationSign = node.getOperationSign();
@@ -90,7 +89,7 @@ else if (JavaScriptContextKeywordElementType.containsKeyword(elementType)) {
 
     @Override
     @RequiredReadAction
-    public void visitJSProperty(@Nonnull JSProperty node) {
+    public void visitJSProperty(JSProperty node) {
         super.visitJSProperty(node);
 
         if (node instanceof JSFunction function) {
@@ -100,7 +99,7 @@ public void visitJSProperty(@Nonnull JSProperty node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSLiteralExpression(@Nonnull JSSimpleLiteralExpression node) {
+    public void visitJSLiteralExpression(JSSimpleLiteralExpression node) {
         super.visitJSLiteralExpression(node);
         if (node.getLiteralElementType() == JSTokenTypes.NUMERIC_LITERAL) {
             String text = node.getText();
@@ -114,7 +113,7 @@ else if (StringUtil.startsWithIgnoreCase(text, "0b")) {
     }
 
     @RequiredReadAction
-    private void highlightPropertyName(@Nonnull JSProperty property, @Nonnull PsiElement nameIdentifier) {
+    private void highlightPropertyName(JSProperty property, PsiElement nameIdentifier) {
         JSExpression expression = property.getValue();
         TextAttributesKey type = expression instanceof JSFunctionExpression
             ? JavaScriptSyntaxHighlightKeys.JS_INSTANCE_MEMBER_FUNCTION
@@ -129,7 +128,7 @@ private void highlightPropertyName(@Nonnull JSProperty property, @Nonnull PsiEle
 
     @Override
     @RequiredReadAction
-    public void visitJSAttribute(@Nonnull JSAttribute jsAttribute) {
+    public void visitJSAttribute(JSAttribute jsAttribute) {
         super.visitJSAttribute(jsAttribute);
 
         myHighlightInfoHolder.add(
@@ -143,7 +142,7 @@ public void visitJSAttribute(@Nonnull JSAttribute jsAttribute) {
 
     @Override
     @RequiredReadAction
-    public void visitJSParameter(@Nonnull JSParameter parameter) {
+    public void visitJSParameter(JSParameter parameter) {
         super.visitJSParameter(parameter);
 
         JSExpression initializer = parameter.getInitializer();
@@ -159,7 +158,7 @@ public void visitJSParameter(@Nonnull JSParameter parameter) {
 
     @Override
     @RequiredReadAction
-    public void visitJSReferenceExpression(@Nonnull JSReferenceExpression element) {
+    public void visitJSReferenceExpression(JSReferenceExpression element) {
         super.visitJSReferenceExpression(element);
 
         PsiElement parent = element.getParent();
@@ -191,7 +190,7 @@ public void visitJSReferenceExpression(@Nonnull JSReferenceExpression element) {
 
     @Override
     @RequiredReadAction
-    public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
+    public void visitJSPrefixExpression(JSPrefixExpression expression) {
         super.visitJSPrefixExpression(expression);
 
         if (expression.getOperationSign() == JSTokenTypes.DOT_DOT_DOT) {
@@ -202,7 +201,7 @@ public void visitJSPrefixExpression(@Nonnull JSPrefixExpression expression) {
     }
 
     @RequiredReadAction
-    private void addElementHighlight(@Nonnull PsiElement resolvedElement, @Nonnull PsiElement targetForHighlight) {
+    private void addElementHighlight(PsiElement resolvedElement, PsiElement targetForHighlight) {
         boolean isStatic = false;
         boolean isMethod = false;
         boolean isFunction = false;
@@ -276,7 +275,7 @@ else if (isField) {
 
     @Nullable
     @RequiredReadAction
-    private static HighlightInfo buildHighlightForVariable(@Nonnull PsiElement element, @Nonnull PsiElement markerAddTo) {
+    private static HighlightInfo buildHighlightForVariable(PsiElement element, PsiElement markerAddTo) {
         TextAttributesKey type;
 
         if (element instanceof JSParameter) {
@@ -304,7 +303,7 @@ else if (PsiTreeUtil.getParentOfType(element, JSFunction.class) != null) {
     }
 
     @RequiredReadAction
-    private void reportFeatureUsage(@Nonnull PsiElement element, @Nonnull JavaScriptFeature javaScriptFeature) {
+    private void reportFeatureUsage(PsiElement element, JavaScriptFeature javaScriptFeature) {
         if (JavaScriptVersionUtil.containsFeature(element, javaScriptFeature)) {
             return;
         }
@@ -318,16 +317,16 @@ private void reportFeatureUsage(@Nonnull PsiElement element, @Nonnull JavaScript
     }
 
     @Override
-    public void visit(@Nonnull PsiElement element) {
+    public void visit(PsiElement element) {
         element.acceptChildren(this);
     }
 
     @Override
     public boolean analyze(
-        @Nonnull PsiFile psiFile,
+        PsiFile psiFile,
         boolean b,
-        @Nonnull HighlightInfoHolder highlightInfoHolder,
-        @Nonnull Runnable runnable
+        HighlightInfoHolder highlightInfoHolder,
+        Runnable runnable
     ) {
         myHighlightInfoHolder = highlightInfoHolder;
         runnable.run();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
index 515180c5..a17a8803 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitorFactory.java
@@ -6,7 +6,6 @@
 import consulo.language.editor.rawHighlight.HighlightVisitorFactory;
 import consulo.language.psi.PsiFile;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -15,11 +14,10 @@
 @ExtensionImpl
 public class JavaScriptHighlightVisitorFactory implements HighlightVisitorFactory {
     @Override
-    public boolean suitableForFile(@Nonnull PsiFile psiFile) {
+    public boolean suitableForFile(PsiFile psiFile) {
         return psiFile instanceof JSFile;
     }
 
-    @Nonnull
     @Override
     public HighlightVisitor createVisitor() {
         return new JavaScriptHighlightVisitor();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
index dc07ca21..1eb201ff 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptLineMarkerProvider.java
@@ -44,8 +44,7 @@
 import consulo.ui.ex.RelativePoint;
 import consulo.util.dataholder.Key;
 import consulo.util.lang.ref.SimpleReference;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.awt.event.MouseEvent;
 import java.util.*;
@@ -144,7 +143,7 @@ protected Query<JSFunction> search(JSFunction elt) {
 
     @Override
     @RequiredReadAction
-    public LineMarkerInfo getLineMarkerInfo(@Nonnull PsiElement element) {
+    public LineMarkerInfo getLineMarkerInfo(PsiElement element) {
         if (element instanceof JSFunction function) {
             function.putUserData(ourParticipatesInHierarchyKey, null);
             if (function.getNameIdentifier() == null) {
@@ -213,7 +212,7 @@ else if (results.size() > 1) {
 
     @Override
     @RequiredReadAction
-    public void collectSlowLineMarkers(@Nonnull List<PsiElement> elements, @Nonnull final Collection<LineMarkerInfo> result) {
+    public void collectSlowLineMarkers(List<PsiElement> elements, final Collection<LineMarkerInfo> result) {
         Map<String, Set<JSFunction>> jsFunctionsToProcess = new HashMap<>();
         Map<JSClass, Set<JSFunction>> jsMethodsToProcess = new HashMap<>();
 
@@ -450,7 +449,6 @@ public void navigate(MouseEvent e, T elt) {
         protected abstract Query<T> search(T elt);
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
index a482f32b..a644511c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/CreateClassOrInterfaceAction.java
@@ -42,7 +42,6 @@
 import consulo.util.lang.text.StringTokenizer;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.util.VirtualFileUtil;
-import jakarta.annotation.Nonnull;
 
 import java.util.Properties;
 
@@ -63,7 +62,6 @@ public CreateClassOrInterfaceAction(JSReferenceExpression context, boolean isInt
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getName() {
         return myIsInterface
             ? JavaScriptLocalize.javascriptCreateInterfaceIntentionName(classNameToCreate)
@@ -72,7 +70,7 @@ public LocalizeValue getName() {
 
     @Override
     @RequiredUIAccess
-    public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+    public void applyFix(Project project, ProblemDescriptor descriptor) {
         PsiFile contextFile = myContext.getContainingFile();
         PsiElement context = contextFile.getContext();
         if (context != null) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
index 90c74e58..402b7de1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDeprecatedSymbolsInspection.java
@@ -30,7 +30,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.ResolveResult;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -39,19 +38,16 @@
 public class JSDeprecatedSymbolsInspection extends JSInspection {
     private static final String SHORT_NAME = "JSDeprecatedSymbols";
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return JavaScriptLocalize.jsDeprecatedSymbolsInspectionName();
     }
 
-    @Nonnull
     @Override
     public String getShortName() {
         return SHORT_NAME;
@@ -62,7 +58,7 @@ protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
             @RequiredReadAction
-            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
+            public void visitJSReferenceExpression(JSReferenceExpression node) {
                 for (ResolveResult r : node.multiResolve(false)) {
                     PsiElement element = r.getElement();
                     if (element instanceof JSDefinitionExpression definition && definition.getParent() instanceof JSAssignmentExpression
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
index 38cd63f8..106e9cf8 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSDuplicatedDeclarationInspection.java
@@ -37,7 +37,6 @@
 import consulo.language.psi.util.PsiTreeUtil;
 
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -46,19 +45,16 @@
 public class JSDuplicatedDeclarationInspection extends JSInspection {
     private static final String SHORT_NAME = "JSDuplicatedDeclaration";
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return JavaScriptLocalize.jsDuplicatedDeclarationInspectionName();
     }
 
-    @Nonnull
     @Override
     public String getShortName() {
         return SHORT_NAME;
@@ -69,7 +65,7 @@ protected JSElementVisitor createVisitor(ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
             @RequiredReadAction
-            public void visitJSClass(@Nonnull JSClass node) {
+            public void visitJSClass(JSClass node) {
                 String name = node.getName();
                 if (name == null) {
                     return;
@@ -81,7 +77,7 @@ public void visitJSClass(@Nonnull JSClass node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
+            public void visitJSFunctionDeclaration(JSFunction node) {
                 String name = node.getName();
                 if (name == null) {
                     return;
@@ -114,7 +110,7 @@ private void checkForDuplicateDeclaration(String name, PsiElement decl, PsiEleme
                 ResolveProcessor processor = new ResolveProcessor(name, scope) {
                     @Override
                     @RequiredReadAction
-                    public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                    public boolean execute(PsiElement element, ResolveState state) {
                         if (element == decl) {
                             return true;
                         }
@@ -190,7 +186,7 @@ else if ((attrList != null && attrList.getNamespace() != null)
 
             @Override
             @RequiredReadAction
-            public void visitJSProperty(@Nonnull JSProperty node) {
+            public void visitJSProperty(JSProperty node) {
                 String name = node.getName();
                 if (name == null) {
                     return;
@@ -200,7 +196,7 @@ public void visitJSProperty(@Nonnull JSProperty node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSVariable(@Nonnull JSVariable var) {
+            public void visitJSVariable(JSVariable var) {
                 PsiElement nameIdentifier = var.getNameIdentifier();
                 PsiElement next = nameIdentifier != null ? nameIdentifier.getNextSibling() : null;
                 String name = nameIdentifier != null ? nameIdentifier.getText() : null;
@@ -216,7 +212,6 @@ public void visitJSVariable(@Nonnull JSVariable var) {
     }
 
     @Override
-    @Nonnull
     public HighlightDisplayLevel getDefaultLevel() {
         return HighlightDisplayLevel.WARNING;
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
index 3e304617..857749a7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSInspection.java
@@ -32,8 +32,7 @@
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
@@ -44,9 +43,8 @@ public abstract class JSInspection extends LocalInspectionTool implements Custom
 
     protected abstract JSElementVisitor createVisitor(ProblemsHolder holder);
 
-    @Nonnull
     @Override
-    public PsiElementVisitor buildVisitor(@Nonnull ProblemsHolder holder, boolean isOnTheFly) {
+    public PsiElementVisitor buildVisitor(ProblemsHolder holder, boolean isOnTheFly) {
         myOnTheFly = isOnTheFly;
         return createVisitor(holder);
     }
@@ -62,7 +60,6 @@ public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
     }
 
-    @Nonnull
     @Override
     public HighlightDisplayLevel getDefaultLevel() {
         return HighlightDisplayLevel.WEAK_WARNING;
@@ -73,7 +70,6 @@ public PsiNamedElement getProblemElement(PsiElement psiElement) {
         return PsiTreeUtil.getNonStrictParentOfType(psiElement, JSNamedElement.class);
     }
 
-    @Nonnull
     @Override
     public SuppressIntentionAction[] getSuppressActions(PsiElement element) {
         return new SuppressIntentionAction[]{
@@ -82,7 +78,7 @@ public SuppressIntentionAction[] getSuppressActions(PsiElement element) {
     }
 
     @Override
-    public boolean isSuppressedFor(@Nonnull PsiElement element) {
+    public boolean isSuppressedFor(PsiElement element) {
         return SuppressionUtil.isSuppressedInStatement(element, getID(), JSSuppressionHolder.class);
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
index 1c7d8ce3..e3cd9400 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUndeclaredVariableInspection.java
@@ -37,7 +37,6 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -46,19 +45,16 @@
 public class JSUndeclaredVariableInspection extends JSInspection {
     public static final String SHORT_NAME = "JSUndeclaredVariable";
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return JavaScriptLocalize.jsUndeclaredVariableInspectionName();
     }
 
-    @Nonnull
     @Override
     public String getShortName() {
         return SHORT_NAME;
@@ -68,7 +64,7 @@ public String getShortName() {
     protected JSElementVisitor createVisitor(ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
-            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
+            public void visitJSReferenceExpression(JSReferenceExpression node) {
                 PsiElement parentElement = node.getParent();
 
                 if (!(parentElement instanceof JSCallExpression) && node.shouldCheckReferences()
@@ -136,7 +132,6 @@ private static class DeclareJSVariableIntentionAction implements LocalQuickFix {
             myFile = expression.getContainingFile();
         }
 
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return JavaScriptLocalize.javascriptDeclareVariableIntentionName(myReferenceExpression.getReferencedName());
@@ -144,7 +139,7 @@ public LocalizeValue getName() {
 
         @Override
         @RequiredReadAction
-        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+        public void applyFix(Project project, ProblemDescriptor descriptor) {
             if (!FileModificationService.getInstance().prepareFileForWrite(myFile)) {
                 return;
             }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
index ad97e773..836482ea 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
@@ -49,8 +49,7 @@
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.xml.ide.highlighter.XmlFileType;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,19 +62,16 @@
 public class JSUnresolvedFunctionInspection extends JSInspection {
     private static final String SHORT_NAME = "JSUnresolvedFunction";
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return JavaScriptLocalize.jsUnresolvedFunctionInspectionName();
     }
 
-    @Nonnull
     @Override
     public String getShortName() {
         return SHORT_NAME;
@@ -86,7 +82,7 @@ protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
             @RequiredReadAction
-            public void visitJSCallExpression(@Nonnull JSCallExpression node) {
+            public void visitJSCallExpression(JSCallExpression node) {
                 if (node.getMethodExpression() instanceof JSReferenceExpression methodRefExpr) {
                     ResolveResult[] resolveResults = methodRefExpr.multiResolve(false);
 
@@ -220,7 +216,7 @@ else if (node.getMethodExpression() instanceof JSNewExpression newExpression) {
 
             @Override
             @RequiredReadAction
-            public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression node) {
+            public void visitJSAssignmentExpression(JSAssignmentExpression node) {
                 JSExpression lOperand = node.getLOperand();
                 if (lOperand == null) {
                     return;
@@ -261,7 +257,7 @@ public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSReturnStatement(@Nonnull JSReturnStatement node) {
+            public void visitJSReturnStatement(JSReturnStatement node) {
                 JSExpression expression = node.getExpression();
                 if (expression == null) {
                     return;
@@ -291,7 +287,7 @@ public void visitJSReturnStatement(@Nonnull JSReturnStatement node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSVariable(@Nonnull JSVariable node) {
+            public void visitJSVariable(JSVariable node) {
                 JSExpression initializer = node.getInitializer();
                 if (initializer == null) {
                     return;
@@ -307,7 +303,7 @@ public void visitJSVariable(@Nonnull JSVariable node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSBinaryExpression(@Nonnull JSBinaryExpression node) {
+            public void visitJSBinaryExpression(JSBinaryExpression node) {
                 IElementType sign = node.getOperationSign();
 
                 if (sign == JSTokenTypes.AS_KEYWORD || sign == JSTokenTypes.IS_KEYWORD) {
@@ -323,7 +319,7 @@ public void visitJSBinaryExpression(@Nonnull JSBinaryExpression node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSForInStatement(@Nonnull JSForInStatement node) {
+            public void visitJSForInStatement(JSForInStatement node) {
                 if (!node.isForEach()) {
                     JSVarStatement statement = node.getDeclarationStatement();
 
@@ -393,7 +389,7 @@ private static void checkTypeIs(JSExpression rOperand, PsiElement node, Problems
     }
 
     @RequiredReadAction
-    static ProblemHighlightType getUnresolveReferenceHighlightType(@Nullable JSExpression qualifier, @Nonnull JSExpression node) {
+    static ProblemHighlightType getUnresolveReferenceHighlightType(@Nullable JSExpression qualifier, JSExpression node) {
         JSClass jsClass;
 
         PsiFile containingFile = node.getContainingFile();
@@ -574,7 +570,7 @@ private static void checkExpressionIsAssignableToType(
     }
 
     @RequiredReadAction
-    private static ProblemHighlightType getHighlightTypeForTypeOrSignatureProblem(@Nonnull PsiElement node) {
+    private static ProblemHighlightType getHighlightTypeForTypeOrSignatureProblem(PsiElement node) {
         if (node.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
             return ProblemHighlightType.GENERIC_ERROR;
         }
@@ -589,14 +585,13 @@ public JSInsertCastFix(String type) {
         }
 
         @Override
-        @Nonnull
         public LocalizeValue getName() {
             return JavaScriptLocalize.javascriptInsertCastFix();
         }
 
         @Override
         @RequiredUIAccess
-        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+        public void applyFix(Project project, ProblemDescriptor descriptor) {
             PsiElement element = descriptor.getPsiElement();
             Editor editor = BaseCreateFix.getEditor(project, element.getContainingFile());
             if (editor == null) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
index 56c6bedf..3dc669df 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedVariableInspection.java
@@ -38,7 +38,6 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -51,19 +50,16 @@
 public class JSUnresolvedVariableInspection extends JSInspection {
     private static final String SHORT_NAME = "JSUnresolvedVariable";
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return LocalizeValue.localizeTODO("General");
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return JavaScriptLocalize.jsUnresolvedVariableInspectionName();
     }
 
-    @Nonnull
     @Override
     public String getShortName() {
         return SHORT_NAME;
@@ -74,7 +70,7 @@ protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
             @RequiredReadAction
-            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
+            public void visitJSReferenceExpression(JSReferenceExpression node) {
                 PsiElement parentElement = node.getParent();
 
                 if (node.shouldCheckReferences() && !(parentElement instanceof JSCallExpression)) {
@@ -251,7 +247,6 @@ private static class CreateJSNamespaceIntentionAction extends BaseCreateJSVariab
             super(referencedName);
         }
 
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return JavaScriptLocalize.javascriptCreateNamespaceIntentionName(myReferencedName);
@@ -285,7 +280,6 @@ private static class CreateJSVariableIntentionAction extends BaseCreateJSVariabl
             this.isConstant = isConstant;
         }
 
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return isField
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
index 1ce5743a..405695d7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUntypedDeclarationInspection.java
@@ -44,7 +44,6 @@
 import consulo.navigation.OpenFileDescriptor;
 import consulo.navigation.OpenFileDescriptorFactory;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 import java.util.Collections;
 
@@ -55,26 +54,22 @@
 public class JSUntypedDeclarationInspection extends JSInspection {
     public static final String SHORT_NAME = "JSUntypedDeclaration";
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return JavaScriptLocalize.jsUntypedDeclarationInspectionName();
     }
 
-    @Nonnull
     @Override
     public HighlightDisplayLevel getDefaultLevel() {
         return HighlightDisplayLevel.WARNING;
     }
 
     @Override
-    @Nonnull
     public String getShortName() {
         return SHORT_NAME;
     }
@@ -84,19 +79,19 @@ protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
             @RequiredReadAction
-            public void visitJSVariable(@Nonnull JSVariable node) {
+            public void visitJSVariable(JSVariable node) {
                 process(node, holder);
             }
 
             @Override
             @RequiredReadAction
-            public void visitJSFunctionExpression(@Nonnull JSFunctionExpression node) {
+            public void visitJSFunctionExpression(JSFunctionExpression node) {
                 process(node.getFunction(), holder);
             }
 
             @Override
             @RequiredReadAction
-            public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
+            public void visitJSFunctionDeclaration(JSFunction node) {
                 if (node.isConstructor() || node.isSetProperty()) {
                     return;
                 }
@@ -128,7 +123,6 @@ private static void process(JSNamedElement node, ProblemsHolder holder) {
     }
 
     private static class AddTypeToDclFix implements LocalQuickFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return JavaScriptLocalize.jsUntypedDeclarationProblemAddtypeFix();
@@ -136,7 +130,7 @@ public LocalizeValue getName() {
 
         @Override
         @RequiredReadAction
-        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+        public void applyFix(Project project, ProblemDescriptor descriptor) {
             PsiElement anchor = descriptor.getPsiElement();
             PsiFile containingFile = anchor.getContainingFile();
             if (!FileModificationService.getInstance().prepareFileForWrite(containingFile)) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
index d0a2bcc9..0b67328c 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnusedLocalSymbolsInspection.java
@@ -42,7 +42,6 @@
 import consulo.util.collection.primitive.objects.ObjectIntMap;
 import consulo.util.collection.primitive.objects.ObjectMaps;
 import consulo.util.dataholder.Key;
-import jakarta.annotation.Nonnull;
 
 import java.util.BitSet;
 import java.util.Collections;
@@ -57,19 +56,16 @@ public class JSUnusedLocalSymbolsInspection extends JSInspection {
     private static final Logger LOG = Logger.getInstance("JSUnusedLocalSymbols");
     public static final String SHORT_NAME = "JSUnusedLocalSymbols";
 
-    @Nonnull
     @Override
     public LocalizeValue getGroupDisplayName() {
         return InspectionLocalize.inspectionGeneralToolsGroupName();
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getDisplayName() {
         return JavaScriptLocalize.jsUnusedLocalSymbolInspectionName();
     }
 
-    @Nonnull
     @Override
     public String getShortName() {
         return SHORT_NAME;
@@ -82,12 +78,12 @@ public String getShortName() {
     protected JSElementVisitor createVisitor(final ProblemsHolder holder) {
         return new JSElementVisitor() {
             @Override
-            public void visitJSVariable(@Nonnull JSVariable node) {
+            public void visitJSVariable(JSVariable node) {
                 handleLocalDeclaration(node);
             }
 
             @Override
-            public void visitJSParameterList(@Nonnull JSParameterList node) {
+            public void visitJSParameterList(JSParameterList node) {
                 PsiElement parent = node.getParent();
                 Set<PsiElement> set = parent.getUserData(UNUSED_LOCAL_DECLARATIONS_SET_KEY);
 
@@ -109,7 +105,7 @@ public void visitFile(PsiFile file) {
 
             @Override
             @RequiredReadAction
-            public void visitJSParameter(@Nonnull JSParameter node) {
+            public void visitJSParameter(JSParameter node) {
                 PsiElement scopeNode = PsiTreeUtil.getParentOfType(node, JSFunction.class, JSCatchBlock.class);
 
                 if (scopeNode == null || scopeNode instanceof JSCatchBlock) {
@@ -145,7 +141,7 @@ public void visitJSParameter(@Nonnull JSParameter node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
+            public void visitJSReferenceExpression(JSReferenceExpression node) {
                 if (node.getParent() instanceof JSFunction) {
                     return;
                 }
@@ -197,13 +193,13 @@ public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSFunctionExpression(@Nonnull JSFunctionExpression node) {
+            public void visitJSFunctionExpression(JSFunctionExpression node) {
                 visitJSFunctionDeclaration(node);
             }
 
             @Override
             @RequiredReadAction
-            public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
+            public void visitJSFunctionDeclaration(JSFunction node) {
                 processDeclarationHost(node, holder);
                 handleLocalDeclaration(node);
             }
@@ -233,7 +229,7 @@ private static void processDeclarationHost(PsiElement node, ProblemsHolder holde
                     continue;
                 }
                 LocalizeValue message;
-                @Nonnull PsiElement highlightedElement;
+                PsiElement highlightedElement;
 
                 if (p instanceof JSParameter parameter) {
                     // There are cases of predefined sinatures for which we are not interested in reported unused parameters
@@ -266,7 +262,7 @@ else if (ecma && node instanceof JSFunction function) {
 
                                         @Override
                                         @RequiredReadAction
-                                        public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                                        public boolean execute(PsiElement element, ResolveState state) {
                                             return !(element instanceof JSClass jsClass && myName.equals(jsClass.getQualifiedName()));
                                         }
                                     };
@@ -360,13 +356,11 @@ private static void handleLocalDeclaration(JSNamedElement node) {
     }
 
     @Override
-    @Nonnull
     public HighlightDisplayLevel getDefaultLevel() {
         return HighlightDisplayLevel.WARNING;
     }
 
     private static class RemoveElementLocalQuickFix implements LocalQuickFix {
-        @Nonnull
         @Override
         public LocalizeValue getName() {
             return JavaScriptLocalize.jsUnusedSymbolRemove();
@@ -374,7 +368,7 @@ public LocalizeValue getName() {
 
         @Override
         @RequiredWriteAction
-        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+        public void applyFix(Project project, ProblemDescriptor descriptor) {
             try {
                 PsiElement element = descriptor.getPsiElement();
                 if (!(element instanceof JSNamedElement)) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
index 72f9a78a..b5002ad0 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptGotoSuperHandler.java
@@ -36,7 +36,6 @@
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.popup.JBPopup;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JavaScriptGotoSuperHandler implements GotoSuperActionHander {
@@ -124,7 +123,6 @@ public boolean isValidFor(Editor editor, PsiFile file) {
         return true;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
index ef87fc29..3824c6e1 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/navigation/JavaScriptSymbolContributor.java
@@ -34,8 +34,7 @@
 import consulo.project.Project;
 import consulo.util.io.FileUtil;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 
@@ -45,7 +44,7 @@
 @ExtensionImpl
 public class JavaScriptSymbolContributor implements GotoSymbolContributor {
     @Override
-    public void processNames(@Nonnull Processor<String> processor, @Nonnull SearchScope searchScope, @Nullable IdFilter idFilter) {
+    public void processNames(Processor<String> processor, SearchScope searchScope, @Nullable IdFilter idFilter) {
         StubIndex.getInstance().processAllKeys(JavaScriptIndexKeys.ELEMENTS_BY_NAME, processor, (GlobalSearchScope)searchScope, idFilter);
 
         FileBasedIndex.getInstance().processAllKeys(
@@ -66,9 +65,9 @@ public boolean process(String s) {
 
     @Override
     public void processElementsWithName(
-        @Nonnull String name,
-        @Nonnull Processor<NavigationItem> processor,
-        @Nonnull FindSymbolParameters findSymbolParameters
+        String name,
+        Processor<NavigationItem> processor,
+        FindSymbolParameters findSymbolParameters
     ) {
         Project project = findSymbolParameters.getProject();
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
index 6a76f98a..84014ff7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/BasicJavascriptNamesValidator.java
@@ -23,7 +23,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class BasicJavascriptNamesValidator extends JSNamesValidator {
@@ -31,7 +30,6 @@ public BasicJavascriptNamesValidator() {
         super(DialectOptionHolder.dummy());
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
index 8ab69979..dac12983 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceDialog.java
@@ -38,7 +38,6 @@
 import consulo.ui.ex.awt.Messages;
 import consulo.ui.ex.awt.util.Alarm;
 import consulo.util.lang.ref.SimpleReference;
-import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 import java.awt.event.KeyAdapter;
@@ -61,7 +60,7 @@ protected JSBaseIntroduceDialog(
         Project project,
         JSExpression[] occurrences,
         JSExpression mainOccurrence,
-        @Nonnull LocalizeValue title
+        LocalizeValue title
     ) {
         super(project, false);
 
@@ -222,7 +221,7 @@ private boolean checkConflicts(String name) {
         final SimpleReference<JSNamedElement> existing = new SimpleReference<>();
         scope.accept(new JSElementVisitor() {
             @Override
-            public void visitJSElement(@Nonnull JSElement node) {
+            public void visitJSElement(JSElement node) {
                 if (existing.isNull()) {
                     node.acceptChildren(this);
                 }
@@ -230,7 +229,7 @@ public void visitJSElement(@Nonnull JSElement node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSVariable(@Nonnull JSVariable node) {
+            public void visitJSVariable(JSVariable node) {
                 if (name.equals(node.getName())) {
                     existing.set(node);
                 }
@@ -239,7 +238,7 @@ public void visitJSVariable(@Nonnull JSVariable node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSFunctionDeclaration(@Nonnull JSFunction node) {
+            public void visitJSFunctionDeclaration(JSFunction node) {
                 if (name.equals(node.getName())) {
                     existing.set(node);
                 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
index b92c039a..845666dc 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JSBaseIntroduceHandler.java
@@ -48,8 +48,7 @@
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.undoRedo.CommandProcessor;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -132,7 +131,7 @@ protected static void addExpressionOccurrences(JSExpression expr, List<JSExpress
 
     @Override
     @RequiredWriteAction
-    public void invoke(@Nonnull Project project, Editor editor, PsiFile file, DataContext dataContext) {
+    public void invoke(Project project, Editor editor, PsiFile file, DataContext dataContext) {
         if (!editor.getSelectionModel().hasSelection()) {
             editor.getSelectionModel().selectLineAtCaret();
         }
@@ -424,7 +423,7 @@ protected static JSElement addToClassAnchor(JSElement anchorStatement, JSVarStat
 
     @Override
     @RequiredUIAccess
-    public void invoke(@Nonnull Project project, @Nonnull PsiElement[] elements, DataContext dataContext) {
+    public void invoke(Project project, PsiElement[] elements, DataContext dataContext) {
         throw new RuntimeException("Not implemented");
     }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
index 8676d7ec..308b1702 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/JavascriptRefactoringSupportProvider.java
@@ -32,8 +32,7 @@
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.scope.LocalSearchScope;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
 public class JavascriptRefactoringSupportProvider extends RefactoringSupportProvider {
@@ -76,7 +75,6 @@ public boolean isInplaceRenameAvailable(PsiElement element, PsiElement context)
         return element instanceof JSNamedElement namedElement && namedElement.getUseScope() instanceof LocalSearchScope;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
index bf35c2ef..b0a6f296 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/extractMethod/JSExtractFunctionHandler.java
@@ -27,7 +27,6 @@
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.DialogWrapper;
 import consulo.undoRedo.CommandProcessor;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -36,7 +35,7 @@
 public class JSExtractFunctionHandler implements RefactoringActionHandler {
     @Override
     @RequiredUIAccess
-    public void invoke(@Nonnull Project project, Editor editor, PsiFile file, DataContext dataContext) {
+    public void invoke(Project project, Editor editor, PsiFile file, DataContext dataContext) {
         if (!editor.getSelectionModel().hasSelection()) {
             editor.getSelectionModel().selectLineAtCaret();
         }
@@ -71,7 +70,7 @@ private void doRefactoring(Project project, Editor editor, JSExtractFunctionSett
 
     @Override
     @RequiredUIAccess
-    public void invoke(@Nonnull Project project, @Nonnull PsiElement[] elements, DataContext dataContext) {
+    public void invoke(Project project, PsiElement[] elements, DataContext dataContext) {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
index f5a2dceb..e9972f44 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceConstant/JSIntroduceConstantHandler.java
@@ -31,7 +31,6 @@
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.util.lang.ref.SimpleReference;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -98,7 +97,7 @@ protected JSExpression findIntroducedExpression(PsiFile file, int start, int end
         expression.accept(new JSElementVisitor() {
             @Override
             @RequiredReadAction
-            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
+            public void visitJSReferenceExpression(JSReferenceExpression node) {
                 if (node.getQualifier() == null) {
                     PsiElement element = node.resolve();
 
@@ -116,7 +115,7 @@ else if (element == null) {
             }
 
             @Override
-            public void visitJSElement(@Nonnull JSElement node) {
+            public void visitJSElement(JSElement node) {
                 node.acceptChildren(this);
             }
         });
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
index 80440c96..c7342002 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldDialog.java
@@ -28,7 +28,6 @@
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ref.SimpleReference;
-import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 
@@ -67,7 +66,7 @@ protected void doInit() {
         myMainOccurrence.accept(new JSElementVisitor() {
             @Override
             @RequiredReadAction
-            public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
+            public void visitJSReferenceExpression(JSReferenceExpression node) {
                 if (node.getQualifier() == null) {
                     ResolveResult[] results = node.multiResolve(true);
                     if (results.length == 0) {
@@ -84,7 +83,7 @@ public void visitJSReferenceExpression(@Nonnull JSReferenceExpression node) {
             }
 
             @Override
-            public void visitJSElement(@Nonnull JSElement node) {
+            public void visitJSElement(JSElement node) {
                 node.acceptChildren(this);
             }
         });
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
index 315a3711..f398b072 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDeclarationRangeHandler.java
@@ -23,7 +23,6 @@
 import consulo.language.editor.hint.DeclarationRangeHandler;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -31,16 +30,14 @@
  */
 @ExtensionImpl
 public class JSDeclarationRangeHandler implements DeclarationRangeHandler<JSNamedElement> {
-    @Nonnull
     @Override
     public Class<JSNamedElement> getElementClass() {
         return JSNamedElement.class;
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
-    public TextRange getDeclarationRange(@Nonnull JSNamedElement namedElement) {
+    public TextRange getDeclarationRange(JSNamedElement namedElement) {
         TextRange textRange = namedElement.getTextRange();
         PsiElement nameIdentifier = namedElement.getNameIdentifier();
         TextRange nameIdentifierRange = nameIdentifier != null ? nameIdentifier.getTextRange() : null;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
index 018c3cb1..30aa4d54 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSDefinitionsSearchExecutor.java
@@ -34,7 +34,6 @@
 import consulo.language.psi.search.DefinitionsScopedSearchExecutor;
 import consulo.language.psi.search.ReferencesSearch;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.function.Predicate;
 
@@ -47,8 +46,8 @@ public class JSDefinitionsSearchExecutor implements DefinitionsScopedSearchExecu
     @Override
     @RequiredReadAction
     public boolean execute(
-        @Nonnull DefinitionsScopedSearch.SearchParameters parameters,
-        @Nonnull Predicate<? super PsiElement> consumer
+        DefinitionsScopedSearch.SearchParameters parameters,
+        Predicate<? super PsiElement> consumer
     ) {
         PsiElement sourceElement = parameters.getElement();
         if (sourceElement instanceof PsiNamedElement namedElement && namedElement.getLanguage().isKindOf(JavaScriptLanguage.INSTANCE)) {
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
index 81cf7f89..2e0857e2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSFunctionsSearch.java
@@ -25,7 +25,6 @@
 import consulo.application.util.query.QueryExecutor;
 import consulo.application.util.query.QueryFactory;
 import consulo.language.psi.PsiElement;
-import jakarta.annotation.Nonnull;
 
 import java.util.function.Predicate;
 
@@ -73,7 +72,7 @@ protected Query<JSClass> makeQuery(SearchParameters queryParameters, PsiElement
     }
 
     @Override
-    public boolean execute(SearchParameters queryParameters, final @Nonnull Predicate<? super JSFunction> consumer) {
+    public boolean execute(SearchParameters queryParameters, final Predicate<? super JSFunction> consumer) {
         final JSFunction baseFunction = queryParameters.getBaseFunction();
         PsiElement clazz = JSResolveUtil.findParent(baseFunction);
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
index cc950f91..48786d03 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/search/JSGotoTargetRendererProvider.java
@@ -23,7 +23,7 @@
 import consulo.language.editor.ui.PsiElementListCellRenderer;
 import consulo.language.psi.PsiElement;
 import consulo.navigation.ItemPresentation;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
index e95f58d8..edfbaab6 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureItemPresentation.java
@@ -24,7 +24,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiNamedElement;
 import consulo.ui.image.Image;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -47,7 +46,7 @@ public String getPresentableText() {
     }
 
     @RequiredReadAction
-    public static String getName(@Nonnull PsiElement psiElement) {
+    public static String getName(PsiElement psiElement) {
         if (psiElement instanceof JSObjectLiteralExpression objectLiteral) {
             if (objectLiteral.getParent() instanceof JSAssignmentExpression assignment) {
                 JSDefinitionExpression lOperand = (JSDefinitionExpression)assignment.getLOperand();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
index 7c5f0a6f..2b4c7489 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewBuilderFactory.java
@@ -28,7 +28,6 @@
 import consulo.language.Language;
 import consulo.language.editor.structureView.PsiStructureViewFactory;
 import consulo.language.psi.PsiFile;
-import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class JSStructureViewBuilderFactory implements PsiStructureViewFactory {
@@ -36,7 +35,6 @@ public class JSStructureViewBuilderFactory implements PsiStructureViewFactory {
     public StructureViewBuilder getStructureViewBuilder(PsiFile psiFile) {
         return new TreeBasedStructureViewBuilder() {
             @Override
-            @Nonnull
             public StructureViewModel createStructureViewModel(Editor editor) {
                 return new JSStructureViewModel(psiFile, editor);
             }
@@ -48,7 +46,6 @@ public boolean isRootNodeShown() {
         };
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
index 475312e3..8b6e901a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewElement.java
@@ -32,8 +32,7 @@
 import consulo.util.collection.primitive.ints.IntMaps;
 import consulo.util.collection.primitive.ints.IntObjectMap;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.*;
 
@@ -72,7 +71,6 @@ public boolean canNavigateToSource() {
         return canNavigate();
     }
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public StructureViewTreeElement[] getChildren() {
@@ -234,13 +232,13 @@ public void visitElement(PsiElement element) {
             }
 
             @Override
-            public void visitJSParameter(@Nonnull JSParameter node) {
+            public void visitJSParameter(JSParameter node) {
                 // Do not add parameters to structure view
             }
 
             @Override
             @RequiredReadAction
-            public void visitJSIncludeDirective(@Nonnull JSIncludeDirective includeDirective) {
+            public void visitJSIncludeDirective(JSIncludeDirective includeDirective) {
                 if (includeDirective.resolveFile() instanceof JSFile jsFile) {
                     if (visited != null && visited.contains(jsFile)) {
                         return;
@@ -259,7 +257,7 @@ public void visitJSIncludeDirective(@Nonnull JSIncludeDirective includeDirective
             }
 
             @Override
-            public void visitJSObjectLiteralExpression(@Nonnull JSObjectLiteralExpression node) {
+            public void visitJSObjectLiteralExpression(JSObjectLiteralExpression node) {
                 PsiElement parent = node.getParent();
                 if (parent instanceof JSVariable
                     || parent instanceof JSProperty
@@ -282,7 +280,7 @@ public void visitJSObjectLiteralExpression(@Nonnull JSObjectLiteralExpression no
             }
 
             @Override
-            public void visitJSVariable(@Nonnull JSVariable node) {
+            public void visitJSVariable(JSVariable node) {
                 if (element instanceof JSFunction) {
                     return;
                 }
@@ -291,7 +289,7 @@ public void visitJSVariable(@Nonnull JSVariable node) {
 
             @Override
             @RequiredReadAction
-            public void visitJSAssignmentExpression(@Nonnull JSAssignmentExpression node) {
+            public void visitJSAssignmentExpression(JSAssignmentExpression node) {
                 JSExpression rOperand = node.getROperand();
                 JSExpression lOperand = node.getLOperand();
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
index e0b3a7b9..b9cb1a72 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSStructureViewModel.java
@@ -34,7 +34,6 @@
 import consulo.ui.ex.action.Shortcut;
 import consulo.ui.ex.keymap.KeymapManager;
 import consulo.util.lang.ref.SimpleReference;
-import jakarta.annotation.Nonnull;
 
 import java.util.Comparator;
 
@@ -87,13 +86,11 @@ public boolean isVisible() {
         }
 
         @Override
-        @Nonnull
         public ActionPresentation getPresentation() {
             return null; // will not be shown
         }
 
         @Override
-        @Nonnull
         public String getName() {
             return ID;
         }
@@ -125,13 +122,11 @@ public boolean isReverted() {
         }
 
         @Override
-        @Nonnull
         public ActionPresentation getPresentation() {
             return new ActionPresentationData(IdeLocalize.actionStructureviewShowFields().get(), null, AllIcons.Nodes.Variable);
         }
 
         @Override
-        @Nonnull
         public String getName() {
             return ID;
         }
@@ -146,7 +141,6 @@ public boolean isVisible(TreeElement treeNode) {
         }
 
         @Override
-        @Nonnull
         public ActionPresentation getPresentation() {
             return new ActionPresentationData(
                 IdeLocalize.actionStructureviewShowInherited().get(),
@@ -156,7 +150,6 @@ public ActionPresentation getPresentation() {
         }
 
         @Override
-        @Nonnull
         public String getName() {
             return ID;
         }
@@ -195,25 +188,21 @@ public JSStructureViewModel(PsiElement root, Editor editor) {
     }
 
     @Override
-    @Nonnull
     public StructureViewTreeElement getRoot() {
         return new JSStructureViewElement(myRoot);
     }
 
     @Override
-    @Nonnull
     public Grouper[] getGroupers() {
         return myGroupers;
     }
 
     @Override
-    @Nonnull
     public Sorter[] getSorters() {
         return mySorters;
     }
 
     @Override
-    @Nonnull
     public Filter[] getFilters() {
         return myFilters;
     }
@@ -291,7 +280,6 @@ protected PsiFile getPsiFile() {
         return myRoot.getContainingFile();
     }
 
-    @Nonnull
     @Override
     protected Class[] getSuitableClasses() {
         return SUITABLE_CLASSES;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
index 3053b8a3..3bef4255 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGroup.java
@@ -25,7 +25,7 @@
 import consulo.fileEditor.structureView.tree.TreeElement;
 import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.image.Image;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
index d0813dfa..9704e365 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/structureView/JSSuperGrouper.java
@@ -27,7 +27,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.project.ui.view.tree.AbstractTreeNode;
-import jakarta.annotation.Nonnull;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -40,7 +39,6 @@
 class JSSuperGrouper implements Grouper {
     private static final String SHOW_CLASSES = "SHOW_CLASSES";
 
-    @Nonnull
     @Override
     @RequiredReadAction
     public Collection<Group> group(Object parent, Collection<TreeElement> children) {
@@ -102,7 +100,6 @@ private static void addGroup(Map<String, Group> groups, TreeElement _child, Stri
     }
 
     @Override
-    @Nonnull
     public ActionPresentation getPresentation() {
         return new ActionPresentationData(
             IdeLocalize.actionStructureviewGroupMethodsByDefiningType().get(),
@@ -112,7 +109,6 @@ public ActionPresentation getPresentation() {
     }
 
     @Override
-    @Nonnull
     public String getName() {
         return SHOW_CLASSES;
     }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
index 4a9ee296..371fda2f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSExpressionSurroundDescriptor.java
@@ -29,7 +29,6 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.util.PsiTreeUtil;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author yole
@@ -42,7 +41,6 @@ public class JSExpressionSurroundDescriptor implements SurroundDescriptor {
     };
 
     @Override
-    @Nonnull
     @RequiredReadAction
     public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
         JSExpression expr = findExpressionInRange(file, startOffset, endOffset);
@@ -53,7 +51,6 @@ public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int end
     }
 
     @Override
-    @Nonnull
     public Surrounder[] getSurrounders() {
         return SURROUNDERS;
     }
@@ -83,7 +80,6 @@ private static JSExpression findExpressionInRange(PsiFile file, int startOffset,
         return expression;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
index 92ec0112..468509f5 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementSurrounder.java
@@ -26,8 +26,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author yole
@@ -35,14 +34,14 @@
  */
 public abstract class JSStatementSurrounder implements Surrounder {
     @Override
-    public boolean isApplicable(@Nonnull PsiElement[] elements) {
+    public boolean isApplicable(PsiElement[] elements) {
         return true;
     }
 
     @Override
     @Nullable
     @RequiredReadAction
-    public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements)
+    public TextRange surroundElements(Project project, Editor editor, PsiElement[] elements)
         throws IncorrectOperationException {
         ASTNode node = JSChangeUtil.createStatementFromText(project, getStatementTemplate(project, elements[0]));
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
index 145b8c48..c85b1170 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSStatementsSurroundDescriptor.java
@@ -33,7 +33,6 @@
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.util.PsiTreeUtil;
 
-import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,7 +59,6 @@ public class JSStatementsSurroundDescriptor implements SurroundDescriptor {
     };
 
     @Override
-    @Nonnull
     @RequiredReadAction
     public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) {
         PsiElement[] statements = findStatementsInRange(file, startOffset, endOffset);
@@ -71,7 +69,6 @@ public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int end
     }
 
     @Override
-    @Nonnull
     public Surrounder[] getSurrounders() {
         return SURROUNDERS;
     }
@@ -163,7 +160,6 @@ private PsiElement[] findStatementsInRange(PsiFile file, int startOffset, int en
         return array.toArray(new PsiElement[array.size()]);
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
index b9576dea..0c51b7ca 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithParenthesesSurrounder.java
@@ -29,8 +29,7 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author yole
@@ -43,14 +42,14 @@ public LocalizeValue getTemplateDescription() {
     }
 
     @Override
-    public boolean isApplicable(@Nonnull PsiElement[] elements) {
+    public boolean isApplicable(PsiElement[] elements) {
         return true;
     }
 
     @Nullable
     @Override
     @RequiredReadAction
-    public TextRange surroundElements(@Nonnull Project project, @Nonnull Editor editor, @Nonnull PsiElement[] elements)
+    public TextRange surroundElements(Project project, Editor editor, PsiElement[] elements)
         throws IncorrectOperationException {
         JSExpression expr = (JSExpression)elements[0];
         ASTNode parenthExprNode = JSChangeUtil.createExpressionFromText(project, "(" + expr.getText() + ")").getNode();
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
index 01e7f987..a7040491 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/surroundWith/JSWithTryCatchFinallySurrounder.java
@@ -27,7 +27,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author yole
@@ -46,7 +45,7 @@ protected String getStatementTemplate(Project project, PsiElement context) {
     }
 
     @RequiredReadAction
-    protected static String getExceptionVarTypeBasedOnContext(@Nonnull PsiElement context) {
+    protected static String getExceptionVarTypeBasedOnContext(PsiElement context) {
         if (context.getContainingFile().getLanguage() == JavaScriptSupportLoader.ECMA_SCRIPT_L4) {
             return ":Error";
         }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
index 129eff78..a99b12d4 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/BaseCreateMethodsFix.java
@@ -32,7 +32,6 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 import consulo.util.lang.StringUtil;
-import jakarta.annotation.Nonnull;
 
 import java.util.*;
 
@@ -50,7 +49,7 @@ public BaseCreateMethodsFix(JSClass jsClass) {
     }
 
     @RequiredWriteAction
-    public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+    public void invoke(Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
         evalAnchor(editor, file);
         for (T e : getElementsToProcess()) {
             anchor = doAddOneMethod(project, buildFunctionText(e), anchor);
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
index 5fc6bbad..121ca0a7 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementMethodsFix.java
@@ -27,7 +27,6 @@
 import consulo.language.psi.PsiFile;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author Maxim.Mossienko
@@ -39,13 +38,12 @@ public ImplementMethodsFix(JSClass jsClass) {
     }
 
     @Override
-    @Nonnull
     public LocalizeValue getText() {
         return JavaScriptLocalize.javascriptFixImplementMethods();
     }
 
     @Override
-    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+    public boolean isAvailable(Project project, Editor editor, PsiFile file) {
         return myJsClass.isValid();
     }
 
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
index 72137e98..8368db9a 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/ImplementedMethodProcessor.java
@@ -25,8 +25,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.resolve.ResolveState;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -125,7 +124,7 @@ public static Map<String, Object> collectAllVisibleClassFunctions(
 
                 @Override
                 @RequiredReadAction
-                public boolean execute(@Nonnull PsiElement element, ResolveState state) {
+                public boolean execute(PsiElement element, ResolveState state) {
                     if (element instanceof JSFunction function) {
                         if (function.isConstructor()) {
                             return true; // SWC stubs have constructor methods :(
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index 6a84a4fd..baafd2d3 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -55,7 +55,6 @@
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.xml.XmlAttributeValue;
 import consulo.xml.psi.xml.XmlTagChild;
-import jakarta.annotation.Nonnull;
 
 import java.util.*;
 
@@ -67,7 +66,7 @@ public class JSAnnotatingVisitor extends JSElementVisitor implements Annotator {
     private AnnotationHolder myHolder;
 
     @Override
-    public synchronized void annotate(PsiElement psiElement, @Nonnull AnnotationHolder holder) {
+    public synchronized void annotate(PsiElement psiElement, AnnotationHolder holder) {
         myHolder = holder;
         psiElement.accept(this);
         myHolder = null;
@@ -138,13 +137,13 @@ public void visitJSCallExpression(JSCallExpression node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSDocTagValue(@Nonnull JSDocTagValue tagValue) {
+    public void visitJSDocTagValue(JSDocTagValue tagValue) {
         checkReferences(tagValue, HighlightSeverity.WARNING);
     }
 
     @Override
     @RequiredReadAction
-    public void visitJSDocTag(@Nonnull JSDocTag tagValue) {
+    public void visitJSDocTag(JSDocTag tagValue) {
         checkReferences(tagValue, HighlightSeverity.WARNING);
     }
 
@@ -303,7 +302,7 @@ else if (incompatibleSignature == SignatureMatchResult.RETURN_TYPE_DIFFERS) {
     }
 
     @RequiredReadAction
-    private static ASTNode findElementForAccessModifierError(@Nonnull JSFunction o, JSAttributeList attributeList) {
+    private static ASTNode findElementForAccessModifierError(JSFunction o, JSAttributeList attributeList) {
         if (attributeList != null) {
             PsiElement accessTypeElement = attributeList.findAccessTypeElement();
             if (accessTypeElement != null) {
@@ -810,7 +809,7 @@ public void visitJSBreakStatement(JSBreakStatement node) {
 
     @Override
     @RequiredReadAction
-    public void visitJSThisExpression(@Nonnull JSThisExpression node) {
+    public void visitJSThisExpression(JSThisExpression node) {
         checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageThisReferencedFromStaticContext());
     }
 
@@ -854,7 +853,7 @@ private void checkClassReferenceInStaticContext(JSExpression node, LocalizeValue
 
     @Override
     @RequiredReadAction
-    public void visitJSSuperExpression(@Nonnull JSSuperExpression node) {
+    public void visitJSSuperExpression(JSSuperExpression node) {
         checkClassReferenceInStaticContext(node, JavaScriptLocalize.javascriptValidationMessageSuperReferencedFromStaticContext());
     }
 
@@ -1075,7 +1074,7 @@ else if (overrideParameterType == null && parameterType != null && !"*".equals(p
     @Override
     @RequiredReadAction
     @SuppressWarnings("unchecked")
-    public void visitJSReturnStatement(@Nonnull JSReturnStatement node) {
+    public void visitJSReturnStatement(JSReturnStatement node) {
         PsiElement element = PsiTreeUtil.getParentOfType(
             node,
             JSFunction.class,
@@ -1222,20 +1221,19 @@ private void checkPackageStatement(JSPackageStatement packageStatement) {
             myHolder.newAnnotation(HighlightSeverity.ERROR, JavaScriptLocalize.javascriptValidationMessageIncorrectPackageName(s, expected))
                 .range(nameIdentifier != null ? nameIdentifier : packageStatement.getFirstChild())
                 .withFix(new SyntheticIntentionAction() {
-                    @Nonnull
                     @Override
                     public LocalizeValue getText() {
                         return JavaScriptLocalize.javascriptFixPackageName(expected);
                     }
 
                     @Override
-                    public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+                    public boolean isAvailable(Project project, Editor editor, PsiFile file) {
                         return packageStatement.isValid();
                     }
 
                     @Override
                     @RequiredWriteAction
-                    public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+                    public void invoke(Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
                         JSPackageStatementImpl.doChangeName(project, packageStatement, expected);
                     }
 
@@ -1285,25 +1283,23 @@ public RemoveASTNodeFix(LocalizeValue prop, ASTNode... astNodes) {
         }
 
         @Override
-        @Nonnull
         public LocalizeValue getText() {
             return myProp;
         }
 
         @Override
-        @Nonnull
         public LocalizeValue getName() {
             return getText();
         }
 
         @Override
         @RequiredUIAccess
-        public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
+        public void applyFix(Project project, ProblemDescriptor descriptor) {
             invoke(project, null, descriptor.getPsiElement().getContainingFile());
         }
 
         @Override
-        public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+        public boolean isAvailable(Project project, Editor editor, PsiFile file) {
             for (ASTNode astNode : myAstNodes) {
                 if (!astNode.getPsi().isValid()) {
                     return false;
@@ -1315,7 +1311,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
 
         @Override
         @RequiredUIAccess
-        public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+        public void invoke(Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
             }
@@ -1340,19 +1336,18 @@ public AddOverrideIntentionAction(JSFunction node) {
         }
 
         @Override
-        @Nonnull
         public LocalizeValue getText() {
             return JavaScriptLocalize.javascriptFixAddOverrideModifier();
         }
 
         @Override
-        public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+        public boolean isAvailable(Project project, Editor editor, PsiFile file) {
             return myNode.isValid();
         }
 
         @Override
         @RequiredUIAccess
-        public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+        public void invoke(Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
             }
@@ -1384,19 +1379,18 @@ public AddSuperInvokationFix(JSReferenceExpression node, JSFunction superConstru
         }
 
         @Override
-        @Nonnull
         public LocalizeValue getText() {
             return JavaScriptLocalize.javascriptFixCreateInvokeSuper();
         }
 
         @Override
-        public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+        public boolean isAvailable(Project project, Editor editor, PsiFile file) {
             return superConstructor.isValid() && node.isValid();
         }
 
         @Override
         @RequiredUIAccess
-        public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+        public void invoke(Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
             }
@@ -1448,19 +1442,18 @@ private static class AddConstructorAndSuperInvokationFix implements SyntheticInt
         }
 
         @Override
-        @Nonnull
         public LocalizeValue getText() {
             return JavaScriptLocalize.javascriptFixCreateConstructorInvokeSuper();
         }
 
         @Override
-        public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
+        public boolean isAvailable(Project project, Editor editor, PsiFile file) {
             return node.isValid() && superConstructor.isValid();
         }
 
         @Override
         @RequiredUIAccess
-        public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+        public void invoke(Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
             if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
                 return;
             }
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
index 656c9df2..136d93e2 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatorFactory.java
@@ -6,8 +6,7 @@
 import consulo.language.editor.annotation.Annotator;
 import consulo.language.editor.annotation.AnnotatorFactory;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -21,7 +20,6 @@ public Annotator createAnnotator() {
         return new JSAnnotatingVisitor();
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
index 98f6e6e6..4238a883 100644
--- a/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
+++ b/plugin/src/main/java/consulo/javascript/impl/JavaScriptIconDescriptorUpdater.java
@@ -29,8 +29,7 @@
 import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.image.Image;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -40,7 +39,7 @@
 public class JavaScriptIconDescriptorUpdater implements IconDescriptorUpdater {
     @RequiredReadAction
     @Override
-    public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiElement element, int flags) {
+    public void updateIcon(IconDescriptor iconDescriptor, PsiElement element, int flags) {
         if (element instanceof JSProperty) {
             if (element instanceof JSFunction && ((JSFunction)element).isGetProperty()) {
                 iconDescriptor.setMainIcon(PlatformIconGroup.nodesPropertyread());
diff --git a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
index 176d4aa1..2f01ae3e 100644
--- a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
+++ b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyright.java
@@ -23,10 +23,9 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiWhiteSpace;
-import jakarta.annotation.Nonnull;
 
 public class UpdateJavaScriptFileCopyright extends UpdatePsiFileCopyright<CopyrightFileConfig> {
-    public UpdateJavaScriptFileCopyright(@Nonnull PsiFile psiFile, @Nonnull CopyrightProfile copyrightProfile) {
+    public UpdateJavaScriptFileCopyright(PsiFile psiFile, CopyrightProfile copyrightProfile) {
         super(psiFile, copyrightProfile);
     }
 
diff --git a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
index 585a489c..fbb40614 100644
--- a/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/copyright/UpdateJavaScriptFileCopyrightProvider.java
@@ -11,7 +11,6 @@
 import consulo.project.Project;
 import consulo.virtualFileSystem.fileType.FileType;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -19,30 +18,26 @@
  */
 @ExtensionImpl
 public class UpdateJavaScriptFileCopyrightProvider extends UpdateCopyrightsProvider<CopyrightFileConfig> {
-    @Nonnull
     @Override
     public FileType getFileType() {
         return JavaScriptFileType.INSTANCE;
     }
 
-    @Nonnull
     @Override
-    public UpdatePsiFileCopyright<CopyrightFileConfig> createInstance(@Nonnull PsiFile file, @Nonnull CopyrightProfile copyrightProfile) {
+    public UpdatePsiFileCopyright<CopyrightFileConfig> createInstance(PsiFile file, CopyrightProfile copyrightProfile) {
         return new UpdateJavaScriptFileCopyright(file, copyrightProfile);
     }
 
-    @Nonnull
     @Override
     public CopyrightFileConfig createDefaultOptions() {
         return new CopyrightFileConfig();
     }
 
-    @Nonnull
     @Override
     public TemplateCommentPanel createConfigurable(
-        @Nonnull Project project,
-        @Nonnull TemplateCommentPanel parentPane,
-        @Nonnull FileType fileType
+        Project project,
+        TemplateCommentPanel parentPane,
+        FileType fileType
     ) {
         return new TemplateCommentPanel(fileType, parentPane, project);
     }
diff --git a/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java b/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
index 820a60f0..f8d88b83 100644
--- a/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
+++ b/plugin/src/main/java/consulo/javascript/impl/findUsages/JavaScriptFindUsagesHandlerFactory.java
@@ -6,8 +6,7 @@
 import com.intellij.lang.javascript.psi.JSDefinitionExpression;
 import consulo.language.psi.PsiElement;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -16,13 +15,13 @@
 @ExtensionImpl
 public class JavaScriptFindUsagesHandlerFactory extends FindUsagesHandlerFactory {
     @Override
-    public boolean canFindUsages(@Nonnull PsiElement element) {
+    public boolean canFindUsages(PsiElement element) {
         return element instanceof JSDefinitionExpression;
     }
 
     @Nullable
     @Override
-    public FindUsagesHandler createFindUsagesHandler(@Nonnull PsiElement element, boolean forHighlightUsages) {
+    public FindUsagesHandler createFindUsagesHandler(PsiElement element, boolean forHighlightUsages) {
         return new FindUsagesHandler(element) {
 
         };
diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
index 64d75048..51036822 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptCodeStyleConfigurable.java
@@ -1,7 +1,6 @@
 package consulo.javascript.impl.formatter;
 
 import consulo.javascript.localize.JavaScriptLocalize;
-import jakarta.annotation.Nonnull;
 
 import consulo.language.codeStyle.ui.setting.CodeStyleAbstractConfigurable;
 import consulo.language.codeStyle.CodeStyleSettings;
@@ -12,7 +11,7 @@
  * @since 16.02.2015
  */
 public class JavaScriptCodeStyleConfigurable extends CodeStyleAbstractConfigurable {
-    public JavaScriptCodeStyleConfigurable(@Nonnull CodeStyleSettings settings, CodeStyleSettings cloneSettings) {
+    public JavaScriptCodeStyleConfigurable(CodeStyleSettings settings, CodeStyleSettings cloneSettings) {
         super(settings, cloneSettings, JavaScriptLocalize.javascriptName());
     }
 
diff --git a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
index 3242968a..4ece4c1c 100644
--- a/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/formatter/JavaScriptLanguageCodeStyleSettingsProvider.java
@@ -10,7 +10,6 @@
 import consulo.language.codeStyle.ui.setting.SmartIndentOptionsEditor;
 import consulo.util.io.FileUtil;
 
-import jakarta.annotation.Nonnull;
 
 import java.io.IOException;
 
@@ -38,14 +37,13 @@ public CommonCodeStyleSettings getDefaultCommonSettings() {
         return defaultSettings;
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
     }
 
     @Override
-    public void customizeSettings(@Nonnull CodeStyleSettingsCustomizable consumer, @Nonnull SettingsType settingsType) {
+    public void customizeSettings(CodeStyleSettingsCustomizable consumer, SettingsType settingsType) {
         if (settingsType == SettingsType.SPACING_SETTINGS) {
             consumer.showStandardOptions(
                 "SPACE_BEFORE_METHOD_CALL_PARENTHESES",
@@ -127,7 +125,7 @@ else if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) {
     }
 
     @Override
-    public String getCodeSample(@Nonnull SettingsType settingsType) {
+    public String getCodeSample(SettingsType settingsType) {
         return loadPreview("codeStyle.txt");
     }
 
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
index 5e515c57..5a9698f4 100644
--- a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
@@ -7,7 +7,6 @@
 import consulo.language.ast.IElementType;
 import consulo.util.collection.MultiMap;
 import consulo.xml.lang.xml.XMLLanguage;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -15,9 +14,8 @@
  */
 @ExtensionImpl
 public class JavaScriptEmbeddedTokenHighlighter implements EmbeddedTokenHighlighter {
-    @Nonnull
     @Override
-    public MultiMap<IElementType, TextAttributesKey> getEmbeddedTokenAttributes(@Nonnull XMLLanguage language) {
+    public MultiMap<IElementType, TextAttributesKey> getEmbeddedTokenAttributes(XMLLanguage language) {
         MultiMap<IElementType, TextAttributesKey> keys = MultiMap.createLinked();
         JavaScriptHighlighter.storeDefaults(keys);
         return keys;
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
index 66a6f987..c450d3fb 100644
--- a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
@@ -8,9 +8,8 @@
 import consulo.language.ast.IElementType;
 import consulo.language.lexer.Lexer;
 import consulo.xml.lang.HtmlScriptContentProvider;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -29,7 +28,6 @@ public Lexer getHighlightingLexer() {
         return new JavaScript15Lexer();
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
index 8448d550..0a64290c 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptCreateFileAction.java
@@ -16,8 +16,7 @@
 import consulo.module.content.NewFileModuleResolver;
 import consulo.project.Project;
 import consulo.virtualFileSystem.fileType.FileType;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -76,7 +75,6 @@ protected void buildDialog(Project project, PsiDirectory directory, CreateFileFr
         builder.addKind(JavaScriptLocalize.actionJavascriptFileEmptyFileKind(), JavaScriptFileType.INSTANCE.getIcon(), "JavaScriptFile");
     }
 
-    @Nonnull
     @Override
     protected LocalizeValue getActionName(PsiDirectory directory, String newName, String templateName) {
         return JavaScriptLocalize.actionJavascriptFileTitleText();
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
index 9c216013..47f5b0b9 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/actions/JavaScriptFileTemplateContributor.java
@@ -3,7 +3,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.fileTemplate.FileTemplateContributor;
 import consulo.fileTemplate.FileTemplateRegistrator;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -12,7 +11,7 @@
 @ExtensionImpl
 public class JavaScriptFileTemplateContributor implements FileTemplateContributor {
     @Override
-    public void register(@Nonnull FileTemplateRegistrator fileTemplateRegistrator) {
+    public void register(FileTemplateRegistrator fileTemplateRegistrator) {
         fileTemplateRegistrator.registerInternalTemplate("JavaScriptFile");
     }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
index adad88a8..a394059b 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -30,7 +30,6 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.util.ProcessingContext;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -46,9 +45,9 @@ public JavaScriptKeywordCompletionContributor() {
                 @RequiredReadAction
                 @Override
                 public void addCompletions(
-                    @Nonnull CompletionParameters parameters,
+                    CompletionParameters parameters,
                     ProcessingContext context,
-                    @Nonnull CompletionResultSet result
+                    CompletionResultSet result
                 ) {
                     PsiElement position = parameters.getPosition();
                     JSReferenceExpression parent = (JSReferenceExpression)position.getParent();
@@ -85,7 +84,6 @@ public void addCompletions(
         );
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
index 2d72af51..71cc3d50 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptSkipAutopopupInStrings.java
@@ -5,7 +5,6 @@
 import consulo.language.Language;
 import consulo.language.editor.completion.SkipAutopopupInStrings;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -13,7 +12,6 @@
  */
 @ExtensionImpl
 public class JavaScriptSkipAutopopupInStrings extends SkipAutopopupInStrings {
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java b/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
index 5426ea5c..4bf205b2 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/navigationToolbar/JavaScriptNavBarModelExtension.java
@@ -7,9 +7,8 @@
 import consulo.language.psi.PsiElement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.language.JavaScriptLanguage;
-import jakarta.annotation.Nonnull;
 
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -17,7 +16,6 @@
  */
 @ExtensionImpl
 public class JavaScriptNavBarModelExtension extends StructureAwareNavBarModelExtension {
-    @Nonnull
     @Override
     protected Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
index 5e3500e9..7f5965ec 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptFileTypeFactory.java
@@ -21,7 +21,6 @@
 import consulo.virtualFileSystem.fileType.FileTypeConsumer;
 import consulo.virtualFileSystem.fileType.FileTypeFactory;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -30,7 +29,7 @@
 @ExtensionImpl
 public class JavaScriptFileTypeFactory extends FileTypeFactory {
     @Override
-    public void createFileTypes(@Nonnull FileTypeConsumer consumer) {
+    public void createFileTypes(FileTypeConsumer consumer) {
         consumer.consume(JavaScriptFileType.INSTANCE);
     }
 }
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
index 2570f9f8..20f6b675 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionPusher.java
@@ -16,8 +16,7 @@
 import consulo.util.lang.ObjectUtil;
 import consulo.virtualFileSystem.FileAttribute;
 import consulo.virtualFileSystem.VirtualFile;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -31,7 +30,6 @@
 public class JavaScriptLanguageVersionPusher implements FilePropertyPusher<LanguageVersion> {
     private static final FileAttribute ourFileAttribute = new FileAttribute("javascript-version", 2, false);
 
-    @Nonnull
     @Override
     public Key<LanguageVersion> getFileDataKey() {
         return LanguageVersion.KEY;
@@ -42,7 +40,6 @@ public boolean pushDirectoriesOnly() {
         return false;
     }
 
-    @Nonnull
     @Override
     public LanguageVersion getDefaultValue() {
         return StandardJavaScriptVersions.getInstance().getDefaultVersion();
@@ -51,7 +48,7 @@ public LanguageVersion getDefaultValue() {
     @Nullable
     @Override
     @RequiredReadAction
-    public LanguageVersion getImmediateValue(@Nonnull Project project, @Nullable VirtualFile virtualFile) {
+    public LanguageVersion getImmediateValue(Project project, @Nullable VirtualFile virtualFile) {
         if (virtualFile == null) {
             return getDefaultValue();
         }
@@ -63,7 +60,7 @@ public LanguageVersion getImmediateValue(@Nonnull Project project, @Nullable Vir
     @Nullable
     @Override
     @RequiredReadAction
-    public LanguageVersion getImmediateValue(@Nonnull Module module) {
+    public LanguageVersion getImmediateValue(Module module) {
         JavaScriptModuleExtension<?> extension = ModuleUtilCore.getExtension(module, JavaScriptModuleExtension.class);
         if (extension != null) {
             return extension.getLanguageVersion();
@@ -72,20 +69,20 @@ public LanguageVersion getImmediateValue(@Nonnull Module module) {
     }
 
     @Override
-    public boolean acceptsFile(@Nonnull VirtualFile file, @Nonnull Project project) {
+    public boolean acceptsFile(VirtualFile file, Project project) {
         return file.getFileType() == JavaScriptFileType.INSTANCE;
     }
 
     @Override
-    public boolean acceptsDirectory(@Nonnull VirtualFile virtualFile, @Nonnull Project project) {
+    public boolean acceptsDirectory(VirtualFile virtualFile, Project project) {
         return false;
     }
 
     @Override
     public void persistAttribute(
-        @Nonnull Project project,
-        @Nonnull VirtualFile virtualFile,
-        @Nonnull LanguageVersion newAttribute
+        Project project,
+        VirtualFile virtualFile,
+        LanguageVersion newAttribute
     ) throws IOException {
         DataInputStream inputStream = ourFileAttribute.readAttribute(virtualFile);
         if (inputStream != null) {
@@ -110,11 +107,10 @@ public void persistAttribute(
     }
 
     @Override
-    public void afterRootsChanged(@Nonnull Project project) {
+    public void afterRootsChanged(Project project) {
         PushedFilePropertiesUpdater.getInstance(project).pushAll(this);
     }
 
-    @Nonnull
     private LanguageVersion read(DataInputStream stream) throws IOException {
         String id = stream.readUTF();
         LanguageVersion version = JavaScriptLanguage.INSTANCE.getVersionById(id);
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
index ddfd5c6d..713591a5 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptLanguageVersionResolver.java
@@ -32,8 +32,7 @@
 import consulo.language.version.LanguageVersionResolver;
 import consulo.language.Language;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -42,9 +41,8 @@
 @ExtensionImpl
 public class JavaScriptLanguageVersionResolver implements LanguageVersionResolver {
     @RequiredReadAction
-    @Nonnull
     @Override
-    public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable PsiElement element) {
+    public LanguageVersion getLanguageVersion(Language language, @Nullable PsiElement element) {
         PsiFile containingFile = element == null ? null : element.getContainingFile();
         if (containingFile == null) {
             return StandardJavaScriptVersions.getInstance().getDefaultVersion();
@@ -58,10 +56,9 @@ public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable
         return StandardJavaScriptVersions.getInstance().getDefaultVersion();
     }
 
-    @Nonnull
     @RequiredReadAction
     @Override
-    public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable Project project, @Nullable VirtualFile virtualFile) {
+    public LanguageVersion getLanguageVersion(Language language, @Nullable Project project, @Nullable VirtualFile virtualFile) {
         if (project == null || virtualFile == null) {
             return StandardJavaScriptVersions.getInstance().getDefaultVersion();
         }
@@ -75,7 +72,6 @@ public LanguageVersion getLanguageVersion(@Nonnull Language language, @Nullable
         return StandardJavaScriptVersions.getInstance().getDefaultVersion();
     }
 
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
index 85aae054..72244d74 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/JavaScriptParsingDefinition.java
@@ -34,7 +34,6 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.util.LanguageUtil;
 import consulo.language.version.LanguageVersionableParserDefinition;
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -42,19 +41,16 @@
  */
 @ExtensionImpl
 public class JavaScriptParsingDefinition extends LanguageVersionableParserDefinition {
-    @Nonnull
     @Override
     public Language getLanguage() {
         return JavaScriptLanguage.INSTANCE;
     }
 
-    @Nonnull
     @Override
     public IFileElementType getFileNodeType() {
         return JSElementTypes.FILE;
     }
 
-    @Nonnull
     @Override
     public PsiElement createElement(ASTNode node) {
         IElementType type = node.getElementType();
@@ -77,7 +73,6 @@ public PsiFile createFile(FileViewProvider fileViewProvider) {
         return new JSFileImpl(fileViewProvider);
     }
 
-    @Nonnull
     @Override
     public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
         PsiElement leftPsi = left.getPsi();
diff --git a/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
index 6848bff8..56c966d7 100644
--- a/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/lang/navigation/JavaScriptClassContributor.java
@@ -29,8 +29,7 @@
 import consulo.navigation.NavigationItem;
 import consulo.project.Project;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 
@@ -40,15 +39,15 @@
 @ExtensionImpl
 public class JavaScriptClassContributor implements GotoClassOrTypeContributor {
     @Override
-    public void processNames(@Nonnull Processor<String> processor, @Nonnull SearchScope searchScope, @Nullable IdFilter idFilter) {
+    public void processNames(Processor<String> processor, SearchScope searchScope, @Nullable IdFilter idFilter) {
         StubIndex.getInstance().processAllKeys(JavaScriptIndexKeys.CLASSES_BY_NAME, processor, (GlobalSearchScope)searchScope, idFilter);
     }
 
     @Override
     public void processElementsWithName(
-        @Nonnull String name,
-        @Nonnull Processor<NavigationItem> processor,
-        @Nonnull FindSymbolParameters findSymbolParameters
+        String name,
+        Processor<NavigationItem> processor,
+        FindSymbolParameters findSymbolParameters
     ) {
         Project project = findSymbolParameters.getProject();
         Collection<JSClass> elements = StubIndex.getElements(
diff --git a/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
index 001fda5f..cc1d1c32 100644
--- a/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/psi/impl/reference/DefaultJSPropertyNameReferenceProvider.java
@@ -25,8 +25,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiReference;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -37,7 +36,7 @@ public class DefaultJSPropertyNameReferenceProvider implements JSPropertyNameRef
     @RequiredReadAction
     @Nullable
     @Override
-    public PsiReference getReference(@Nonnull JSProperty property) {
+    public PsiReference getReference(JSProperty property) {
         PsiElement nameIdentifier = property.getNameIdentifier();
         assert nameIdentifier != null;
         return new JSPropertyNameReference(property, nameIdentifier);
diff --git a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
index de39f74e..ec7d9b0f 100644
--- a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
+++ b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegExpLiteralLanguageHost.java
@@ -8,8 +8,7 @@
 import org.intellij.lang.regexp.psi.RegExpGroup;
 import org.intellij.lang.regexp.psi.RegExpNamedGroupRef;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -17,7 +16,6 @@
  */
 @ExtensionImpl
 public class JavaScriptRegExpLiteralLanguageHost implements RegExpLanguageHost {
-    @Nonnull
     @Override
     public Class getHostClass() {
         return JSRegExpLiteralExpressionImpl.class;
@@ -62,11 +60,10 @@ public boolean supportsExtendedHexCharacter(RegExpChar regExpChar) {
     }
 
     @Override
-    public boolean isValidCategory(@Nonnull String category) {
+    public boolean isValidCategory(String category) {
         return DefaultRegExpPropertiesProvider.getInstance().isValidCategory(category);
     }
 
-    @Nonnull
     @Override
     public String[][] getAllKnownProperties() {
         return DefaultRegExpPropertiesProvider.getInstance().getAllKnownProperties();
@@ -78,7 +75,6 @@ public String getPropertyDescription(@Nullable String name) {
         return DefaultRegExpPropertiesProvider.getInstance().getPropertyDescription(name);
     }
 
-    @Nonnull
     @Override
     public String[][] getKnownCharacterClasses() {
         return DefaultRegExpPropertiesProvider.getInstance().getKnownCharacterClasses();
diff --git a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
index ad1f4108..1282e8b4 100644
--- a/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
+++ b/regexp-impl/src/main/java/consulo/javascript/regexp/impl/JavaScriptRegexpMultiHostInjector.java
@@ -26,7 +26,6 @@
 import consulo.language.psi.PsiLanguageInjectionHost;
 import org.intellij.lang.regexp.RegExpLanguage;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -34,7 +33,6 @@
  */
 @ExtensionImpl
 public class JavaScriptRegexpMultiHostInjector implements MultiHostInjector {
-    @Nonnull
     @Override
     public Class<? extends PsiElement> getElementClass() {
         return JSRegExpLiteralExpressionImpl.class;
@@ -42,7 +40,7 @@ public Class<? extends PsiElement> getElementClass() {
 
     @Override
     @RequiredReadAction
-    public void injectLanguages(@Nonnull MultiHostRegistrar registrar, @Nonnull PsiElement context) {
+    public void injectLanguages(MultiHostRegistrar registrar, PsiElement context) {
         if (context instanceof JSRegExpLiteralExpressionImpl) {
             String text = context.getText();
 
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
index a59d185e..1281017e 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtension.java
@@ -16,8 +16,7 @@
 import consulo.module.extension.ModuleInheritableNamedPointer;
 import org.jdom.Element;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -28,12 +27,12 @@ public class ClientJavaScriptModuleExtension extends ModuleExtensionBase<ClientJ
 
     protected LanguageVersion myLanguageVersion = StandardJavaScriptVersions.getInstance().getDefaultVersion();
 
-    public ClientJavaScriptModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootLayer) {
+    public ClientJavaScriptModuleExtension(String id, ModuleRootLayer rootLayer) {
         super(id, rootLayer);
         myPointer = new SdkModuleInheritableNamedPointerImpl(rootLayer, id) {
             @Nullable
             @Override
-            public String getItemNameFromModule(@Nonnull Module module) {
+            public String getItemNameFromModule(Module module) {
                 ClientJavaScriptModuleExtension extension = ModuleUtilCore.getExtension(module, ClientJavaScriptModuleExtension.class);
                 if (extension == null) {
                     return null;
@@ -43,7 +42,7 @@ public String getItemNameFromModule(@Nonnull Module module) {
 
             @Nullable
             @Override
-            public Sdk getItemFromModule(@Nonnull Module module) {
+            public Sdk getItemFromModule(Module module) {
                 ClientJavaScriptModuleExtension extension = ModuleUtilCore.getExtension(module, ClientJavaScriptModuleExtension.class);
                 if (extension == null) {
                     return null;
@@ -58,20 +57,19 @@ public Sdk getItemFromModule(@Nonnull Module module) {
 
     @RequiredReadAction
     @Override
-    protected void loadStateImpl(@Nonnull Element element) {
+    protected void loadStateImpl(Element element) {
         super.loadStateImpl(element);
         myLanguageVersion = StandardJavaScriptVersions.getInstance().findVersionById(element.getAttributeValue("language-version"));
     }
 
     @Override
-    protected void getStateImpl(@Nonnull Element element) {
+    protected void getStateImpl(Element element) {
         super.getStateImpl(element);
         if (myLanguageVersion != StandardJavaScriptVersions.getInstance().getDefaultVersion()) {
             element.setAttribute("language-version", myLanguageVersion.getId());
         }
     }
 
-    @Nonnull
     @Override
     public ModuleInheritableNamedPointer<Sdk> getInheritableSdk() {
         return myPointer;
@@ -89,13 +87,11 @@ public String getSdkName() {
         return myPointer.getName();
     }
 
-    @Nonnull
     @Override
     public Class<? extends SdkType> getSdkTypeClass() {
         throw new IllegalArgumentException();
     }
 
-    @Nonnull
     @Override
     public LanguageVersion getLanguageVersion() {
         return myLanguageVersion;
@@ -103,7 +99,7 @@ public LanguageVersion getLanguageVersion() {
 
     @RequiredReadAction
     @Override
-    public void commit(@Nonnull ClientJavaScriptModuleExtension mutableModuleExtension) {
+    public void commit(ClientJavaScriptModuleExtension mutableModuleExtension) {
         super.commit(mutableModuleExtension);
         myLanguageVersion = mutableModuleExtension.getLanguageVersion();
     }
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
index fbaf1e38..034979f0 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionPanel.java
@@ -21,7 +21,6 @@
 import consulo.javascript.module.extension.JavaScriptMutableModuleExtension;
 import consulo.language.version.LanguageVersion;
 import consulo.ui.ex.awt.*;
-import jakarta.annotation.Nonnull;
 
 import javax.swing.*;
 import java.awt.event.ItemEvent;
@@ -48,7 +47,7 @@ public ClientJavaScriptModuleExtensionPanel(JavaScriptMutableModuleExtension<?>
         languageVersionComboBox.setRenderer(new ColoredListCellRenderer<>() {
             @Override
             protected void customizeCellRenderer(
-                @Nonnull JList list,
+                JList list,
                 JavaScriptLanguageVersion value,
                 int index,
                 boolean selected,
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
index b2876acb..976bb1ca 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptModuleExtensionProvider.java
@@ -9,7 +9,6 @@
 import consulo.module.extension.MutableModuleExtension;
 import consulo.ui.image.Image;
 
-import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
@@ -17,7 +16,6 @@
  */
 @ExtensionImpl
 public class ClientJavaScriptModuleExtensionProvider implements ModuleExtensionProvider<ClientJavaScriptModuleExtension> {
-    @Nonnull
     @Override
     public String getId() {
         return "client-javascript";
@@ -28,27 +26,23 @@ public boolean isAllowMixin() {
         return true;
     }
 
-    @Nonnull
     @Override
     public LocalizeValue getName() {
         return LocalizeValue.localizeTODO("JavaScript (Client)");
     }
 
-    @Nonnull
     @Override
     public Image getIcon() {
         return JavaScriptIconGroup.javascriptmodule();
     }
 
-    @Nonnull
     @Override
-    public ModuleExtension<ClientJavaScriptModuleExtension> createImmutableExtension(@Nonnull ModuleRootLayer moduleRootLayer) {
+    public ModuleExtension<ClientJavaScriptModuleExtension> createImmutableExtension(ModuleRootLayer moduleRootLayer) {
         return new ClientJavaScriptModuleExtension(getId(), moduleRootLayer);
     }
 
-    @Nonnull
     @Override
-    public MutableModuleExtension<ClientJavaScriptModuleExtension> createMutableExtension(@Nonnull ModuleRootLayer moduleRootLayer) {
+    public MutableModuleExtension<ClientJavaScriptModuleExtension> createMutableExtension(ModuleRootLayer moduleRootLayer) {
         return new ClientJavaScriptMutableModuleExtension(getId(), moduleRootLayer);
     }
 }
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
index 0608aa3f..30570b49 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/extension/ClientJavaScriptMutableModuleExtension.java
@@ -12,8 +12,7 @@
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.layout.VerticalLayout;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -22,11 +21,10 @@
  * @since 2014-06-29
  */
 public class ClientJavaScriptMutableModuleExtension extends ClientJavaScriptModuleExtension implements JavaScriptMutableModuleExtension<ClientJavaScriptModuleExtension>, SwingMutableModuleExtension {
-    public ClientJavaScriptMutableModuleExtension(@Nonnull String id, @Nonnull ModuleRootLayer rootModel) {
+    public ClientJavaScriptMutableModuleExtension(String id, ModuleRootLayer rootModel) {
         super(id, rootModel);
     }
 
-    @Nonnull
     @Override
     public MutableModuleInheritableNamedPointer<Sdk> getInheritableSdk() {
         return (MutableModuleInheritableNamedPointer<Sdk>)super.getInheritableSdk();
@@ -35,14 +33,14 @@ public MutableModuleInheritableNamedPointer<Sdk> getInheritableSdk() {
     @RequiredUIAccess
     @Nullable
     @Override
-    public Component createConfigurationComponent(@Nonnull Disposable disposable, @Nonnull Runnable runnable) {
+    public Component createConfigurationComponent(Disposable disposable, Runnable runnable) {
         return VerticalLayout.create().add(Label.create("Unsupported UI"));
     }
 
     @RequiredUIAccess
     @Nullable
     @Override
-    public JComponent createConfigurablePanel(@Nonnull Disposable disposable, @Nonnull Runnable runnable) {
+    public JComponent createConfigurablePanel(Disposable disposable, Runnable runnable) {
         return new ClientJavaScriptModuleExtensionPanel(this);
     }
 
@@ -52,12 +50,12 @@ public void setEnabled(boolean val) {
     }
 
     @Override
-    public boolean isModified(@Nonnull ClientJavaScriptModuleExtension originalExtension) {
+    public boolean isModified(ClientJavaScriptModuleExtension originalExtension) {
         return myIsEnabled != originalExtension.isEnabled() || myLanguageVersion != originalExtension.getLanguageVersion();
     }
 
     @Override
-    public void setLanguageVersion(@Nonnull LanguageVersion languageVersion) {
+    public void setLanguageVersion(LanguageVersion languageVersion) {
         myLanguageVersion = languageVersion;
     }
 }
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index 7c376ece..4a1689f3 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -9,7 +9,6 @@
 import consulo.content.bundle.SdkModificator;
 import consulo.virtualFileSystem.LocalFileSystem;
 import consulo.virtualFileSystem.VirtualFile;
-import jakarta.annotation.Nonnull;
 
 import java.io.File;
 import java.util.Map;
@@ -25,7 +24,7 @@ public class ClientJavaScriptPredefinedBundlesProvider extends PredefinedBundles
     private Map<String, String> ourMapping = Map.of("clientAny", ANY_JAVASCRIPT_SDK);
 
     @Override
-    public void createBundles(@Nonnull Context context) {
+    public void createBundles(Context context) {
         File sdkDir = new File(PluginManager.getPluginPath(ClientJavaScriptPredefinedBundlesProvider.class), "sdk");
         if (!sdkDir.exists()) {
             return;
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index e7add553..396ab521 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -8,8 +8,7 @@
 import consulo.content.bundle.SdkType;
 import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.localize.LocalizeValue;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author VISTALL
@@ -17,7 +16,6 @@
  */
 @ExtensionImpl
 public class ClientJavaScriptSdkType extends SdkType {
-    @Nonnull
     public static ClientJavaScriptSdkType getInstance() {
         return Application.get().getExtensionPoint(SdkType.class).findExtensionOrFail(ClientJavaScriptSdkType.class);
     }
@@ -47,7 +45,6 @@ public String getVersionString(String sdkHome) {
         return "1";
     }
 
-    @Nonnull
     @Override
     public String suggestSdkName(String currentSdkName, String sdkHome) {
         return currentSdkName;

From f8212de27314a5e41ee9b8c325bf93d847df5352 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 18 Mar 2026 16:27:25 +0200
Subject: [PATCH 321/340] initial rework type script

---
 .../language/JavaScriptLanguageVersion.java   |   4 +
 .../lang/BaseJavaScriptLanguageVersion.java   |   6 +
 .../lang/BaseEcmaScriptJavaScriptVersion.java |   4 +
 lang-version-impl/typescript-impl/pom.xml     | 123 ++-
 .../language/grammar/TypeScript.bnf           | 764 ++++++++++++++++++
 .../typescript/TypeScriptFileType.java        |   8 +-
 ...ypeScriptKeywordCompletionContributor.java | 151 ++++
 .../language/TypeScriptElementType.java       |  24 +
 .../language/TypeScriptFeature.java           |  61 ++
 .../language/TypeScriptLanguage.java          |  24 +
 .../language/TypeScriptTokenType.java         |  15 +
 .../language/TypeScriptTokenTypeFactory.java  | 168 ++++
 .../typescript/language/TypeScriptTokens.java |  20 +
 .../impl/TypeScriptParserDefinition.java      |  64 ++
 .../impl/psi/TypeScriptElementImpl.java       |  29 +
 .../mixin/TypeScriptArgumentListMixin.java    |  38 +
 ...TypeScriptArrayLiteralExpressionMixin.java |  37 +
 .../mixin/TypeScriptAttributeListMixin.java   |  90 +++
 .../TypeScriptBinaryExpressionMixin.java      |  83 ++
 .../mixin/TypeScriptBlockStatementMixin.java  |  40 +
 .../mixin/TypeScriptBreakStatementMixin.java  |  47 ++
 .../mixin/TypeScriptCallExpressionMixin.java  |  55 ++
 .../psi/mixin/TypeScriptCaseClauseMixin.java  |  63 ++
 .../psi/mixin/TypeScriptCatchBlockMixin.java  |  52 ++
 .../impl/psi/mixin/TypeScriptClassMixin.java  | 150 ++++
 .../TypeScriptConditionalExpressionMixin.java |  75 ++
 .../TypeScriptContinueStatementMixin.java     |  46 ++
 .../TypeScriptDoWhileStatementMixin.java      |  63 ++
 .../psi/mixin/TypeScriptExpressionMixin.java  |  41 +
 .../TypeScriptExpressionStatementMixin.java   |  43 +
 .../mixin/TypeScriptForInStatementMixin.java  |  87 ++
 .../mixin/TypeScriptForStatementMixin.java    | 102 +++
 .../TypeScriptFunctionExpressionMixin.java    | 128 +++
 .../psi/mixin/TypeScriptFunctionMixin.java    | 120 +++
 .../psi/mixin/TypeScriptIfStatementMixin.java |  88 ++
 ...tIndexedPropertyAccessExpressionMixin.java |  60 ++
 .../psi/mixin/TypeScriptInterfaceMixin.java   | 150 ++++
 .../TypeScriptLabeledStatementMixin.java      |  87 ++
 ...ypeScriptObjectLiteralExpressionMixin.java |  37 +
 .../mixin/TypeScriptParameterListMixin.java   |  52 ++
 .../psi/mixin/TypeScriptParameterMixin.java   |  63 ++
 ...ypeScriptParenthesizedExpressionMixin.java |  43 +
 .../TypeScriptPostfixExpressionMixin.java     |  61 ++
 .../TypeScriptPrefixExpressionMixin.java      |  68 ++
 .../psi/mixin/TypeScriptPropertyMixin.java    | 107 +++
 .../TypeScriptReferenceExpressionMixin.java   | 127 +++
 .../mixin/TypeScriptReferenceListMixin.java   |  73 ++
 .../mixin/TypeScriptReturnStatementMixin.java |  43 +
 .../TypeScriptSpreadExpressionMixin.java      |  44 +
 .../psi/mixin/TypeScriptStatementMixin.java   |  88 ++
 .../mixin/TypeScriptSwitchStatementMixin.java |  52 ++
 .../mixin/TypeScriptThrowStatementMixin.java  |  43 +
 .../mixin/TypeScriptTryStatementMixin.java    |  76 ++
 .../mixin/TypeScriptVarStatementMixin.java    | 137 ++++
 .../psi/mixin/TypeScriptVariableMixin.java    | 144 ++++
 .../mixin/TypeScriptWhileStatementMixin.java  |  58 ++
 .../impl/syntax/TypeScriptParserUtil.java     | 180 +++++
 .../impl/syntax/_TypeScriptLexer.flex         | 243 ++++++
 .../language/psi/TypeScriptElement.java       |  10 +
 .../BaseTypeScriptLanguageVersion.java        |  74 ++
 .../version/TypeScript10LanguageVersion.java  |  33 +
 .../version/TypeScript15LanguageVersion.java  |  33 +
 .../version/TypeScript20LanguageVersion.java  |  30 +
 .../version/TypeScript21LanguageVersion.java  |  31 +
 .../version/TypeScript28LanguageVersion.java  |  29 +
 .../version/TypeScript30LanguageVersion.java  |  29 +
 .../version/TypeScript40LanguageVersion.java  |  29 +
 .../version/TypeScript41LanguageVersion.java  |  29 +
 .../version/TypeScript43LanguageVersion.java  |  28 +
 .../version/TypeScript45LanguageVersion.java  |  28 +
 .../version/TypeScript49LanguageVersion.java  |  28 +
 .../version/TypeScript50LanguageVersion.java  |  29 +
 .../version/TypeScript53LanguageVersion.java  |  28 +
 .../version/TypeScript55LanguageVersion.java  |  26 +
 .../version/TypeScript59LanguageVersion.java  |  28 +
 .../version/TypeScript60LanguageVersion.java  |  28 +
 .../version/TypeScriptLanguageVersion.java    |  33 -
 ...consulo.typescript.TypeScriptLocalize.yaml | 109 +++
 .../JavaScriptHighlightVisitor.java           |   4 +-
 ...avaScriptKeywordCompletionContributor.java |   7 +
 80 files changed, 5576 insertions(+), 76 deletions(-)
 create mode 100644 lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/completion/TypeScriptKeywordCompletionContributor.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptElementType.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptFeature.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptLanguage.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenType.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenTypeFactory.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokens.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/TypeScriptParserDefinition.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/TypeScriptElementImpl.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptArgumentListMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptArrayLiteralExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptAttributeListMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBinaryExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBlockStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBreakStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCallExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCaseClauseMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCatchBlockMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptClassMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptConditionalExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptContinueStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptDoWhileStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptExpressionStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptForInStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptForStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptFunctionExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptFunctionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptIfStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptIndexedPropertyAccessExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptInterfaceMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptLabeledStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptObjectLiteralExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterListMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParenthesizedExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPostfixExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPrefixExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPropertyMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReferenceExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReferenceListMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReturnStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptSpreadExpressionMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptSwitchStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptThrowStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptTryStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVarStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVariableMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptWhileStatementMixin.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/TypeScriptParserUtil.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/psi/TypeScriptElement.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/BaseTypeScriptLanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript10LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript15LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript20LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript21LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript28LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript30LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript40LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript41LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript43LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript45LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript49LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript50LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript53LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript55LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript59LanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript60LanguageVersion.java
 delete mode 100644 lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
 create mode 100644 lang-version-impl/typescript-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.typescript.TypeScriptLocalize.yaml

diff --git a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
index 1bf43f9d..6ca5e4be 100644
--- a/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
+++ b/base-api/src/main/java/consulo/javascript/language/JavaScriptLanguageVersion.java
@@ -21,4 +21,8 @@ public JavaScriptLanguageVersion(String id, String name, Language language, Stri
     public String getPresentableName() {
         return getName();
     }
+
+    public boolean supportsDefaultCompletion() {
+        return true;
+    }
 }
diff --git a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
index 5ea2daaa..15bf3980 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/BaseJavaScriptLanguageVersion.java
@@ -5,6 +5,7 @@
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.language.JavaScriptLanguageVersion;
+import consulo.language.Language;
 import consulo.language.ast.TokenSet;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.parser.PsiParser;
@@ -27,10 +28,15 @@ public BaseJavaScriptLanguageVersion(String name, String... mimeTypes) {
         super(name, name, JavaScriptLanguage.INSTANCE, mimeTypes);
     }
 
+    public BaseJavaScriptLanguageVersion(String name, Language language, String... mimeTypes) {
+        super(name, name, language, mimeTypes);
+    }
+
     protected void addFeature(JavaScriptFeature feature) {
         myFeatures.add(feature);
     }
 
+    @Override
     public Set<JavaScriptFeature> getFeatures() {
         return myFeatures;
     }
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
index c4ef891f..9d6143cf 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/ecmascript/lang/BaseEcmaScriptJavaScriptVersion.java
@@ -30,6 +30,10 @@ protected BaseEcmaScriptJavaScriptVersion(String name, String... mimeTypes) {
         super(name, mimeTypes);
     }
 
+    protected BaseEcmaScriptJavaScriptVersion(String name, consulo.language.Language language, String... mimeTypes) {
+        super(name, language, mimeTypes);
+    }
+
     @Override
     public Lexer createLexer() {
         return createLexer(false);
diff --git a/lang-version-impl/typescript-impl/pom.xml b/lang-version-impl/typescript-impl/pom.xml
index 18e4bbab..0181d13e 100644
--- a/lang-version-impl/typescript-impl/pom.xml
+++ b/lang-version-impl/typescript-impl/pom.xml
@@ -15,42 +15,89 @@
   - limitations under the License.
   -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-typescript.impl</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.dev/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-base.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-ecmascript.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.ide-api-provided</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript-typescript.impl</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>interval:60</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>consulo.maven</groupId>
+                <artifactId>maven-consulo-plugin</artifactId>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>gen</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate-parsers</goal>
+                            <goal>generate-lexers</goal>
+                            <goal>generate-localize</goal>
+                        </goals>
+                        <configuration>
+                            <externalGrammars>
+                                <externalGrammar>
+                                    ${project.basedir}/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
+                                </externalGrammar>
+                            </externalGrammars>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-ecmascript.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-test-junit-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf b/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
new file mode 100644
index 00000000..e523d5ac
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
@@ -0,0 +1,764 @@
+{
+  parserClass            = "consulo.typescript.language.impl.syntax.TypeScriptSyntaxParser"
+  extends                = "consulo.typescript.language.impl.psi.TypeScriptElementImpl"
+
+  psiClassPrefix         = "TypeScript"
+  psiImplClassSuffix     = "Impl"
+  psiPackage             = "consulo.typescript.language.psi"
+  psiImplPackage         = "consulo.typescript.language.impl.psi"
+  psiVisitorName         = "TypeScriptVisitor"
+  
+  elementTypeHolderClass = "consulo.typescript.language.psi.TypeScriptTypes"
+  elementTypeClass       = "consulo.typescript.language.TypeScriptElementType"
+  tokenTypeClass         = "consulo.typescript.language.TypeScriptTokenType"
+  tokenTypeFactory       = "consulo.typescript.language.TypeScriptTokenTypeFactory.getTokenType"
+  parserUtilClass        = "consulo.typescript.language.impl.syntax.TypeScriptParserUtil"
+
+  // === implements: JS base type hierarchy ===
+  // TypeScriptExpression extends JSExpression, TypeScriptStatement extends JSStatement
+  // This enables covariant return types in generated getter methods
+  implements("expression")                                = "com.intellij.lang.javascript.psi.JSExpression"
+  implements("statement")                                 = "com.intellij.lang.javascript.psi.JSStatement"
+
+  // TS-only declarations extend TypeScriptElement (which extends JSElement)
+  implements("interface_declaration|enum_declaration|type_alias_declaration|namespace_declaration") = "consulo.typescript.language.psi.TypeScriptElement"
+
+  // Type elements
+  implements("type_annotation|type_reference|union_type|intersection_type|array_type|tuple_type|function_type|object_type|conditional_type|mapped_type|indexed_access_type|literal_type|typeof_type|keyof_type|infer_type|template_literal_type|parenthesized_type|predefined_type") = "consulo.javascript.language.psi.JavaScriptTypeElement"
+
+  // Individual JS interface conformance — declarations
+  implements("class_declaration|interface_declaration")    = "com.intellij.lang.javascript.psi.JSClass"
+  implements("function_declaration")                     = "com.intellij.lang.javascript.psi.JSFunction"
+  implements("variable_declaration")                     = "com.intellij.lang.javascript.psi.JSVariable"
+  implements("parameter")                                = "com.intellij.lang.javascript.psi.JSParameter"
+  implements("var_statement")                            = "com.intellij.lang.javascript.psi.JSVarStatement"
+  implements("block_statement")                          = "com.intellij.lang.javascript.psi.JSBlockStatement"
+  implements("attribute_list")                           = "com.intellij.lang.javascript.psi.JSAttributeList"
+  implements("parameter_list")                           = "com.intellij.lang.javascript.psi.JSParameterList"
+  implements("property|property_signature_member")        = "com.intellij.lang.javascript.psi.JSProperty"
+  implements("argument_list")                            = "com.intellij.lang.javascript.psi.JSArgumentList"
+  implements("extends_list|implements_list")             = "com.intellij.lang.javascript.psi.JSReferenceList"
+  implements("type_parameter_list")                      = "com.intellij.lang.javascript.psi.JSGenericSignature"
+  implements("import_declaration")                       = "consulo.javascript.psi.JavaScriptImportStatementBase"
+
+  // Individual JS interface conformance — statements
+  implements("if_statement")                             = "com.intellij.lang.javascript.psi.JSIfStatement"
+  implements("for_statement")                            = "com.intellij.lang.javascript.psi.JSForStatement"
+  implements("for_in_statement")                         = "com.intellij.lang.javascript.psi.JSForInStatement"
+  implements("while_statement")                          = "com.intellij.lang.javascript.psi.JSWhileStatement"
+  implements("do_while_statement")                       = "com.intellij.lang.javascript.psi.JSDoWhileStatement"
+  implements("switch_statement")                         = "com.intellij.lang.javascript.psi.JSSwitchStatement"
+  implements("case_clause")                              = "com.intellij.lang.javascript.psi.JSCaseClause"
+  implements("try_statement")                            = "com.intellij.lang.javascript.psi.JSTryStatement"
+  implements("catch_clause")                             = "com.intellij.lang.javascript.psi.JSCatchBlock"
+  implements("return_statement")                         = "com.intellij.lang.javascript.psi.JSReturnStatement"
+  implements("throw_statement")                          = "com.intellij.lang.javascript.psi.JSThrowStatement"
+  implements("break_statement")                          = "com.intellij.lang.javascript.psi.JSBreakStatement"
+  implements("continue_statement")                       = "com.intellij.lang.javascript.psi.JSContinueStatement"
+  implements("labeled_statement")                        = "com.intellij.lang.javascript.psi.JSLabeledStatement"
+  implements("empty_statement")                          = "com.intellij.lang.javascript.psi.JSEmptyStatement"
+  implements("expression_statement")                     = "com.intellij.lang.javascript.psi.JSExpressionStatement"
+
+  // Individual JS interface conformance — expressions
+  implements("reference_expression")                     = "com.intellij.lang.javascript.psi.JSReferenceExpression"
+  implements("binary_expression")                        = "com.intellij.lang.javascript.psi.JSBinaryExpression"
+  implements("assignment_expression")                    = "com.intellij.lang.javascript.psi.JSAssignmentExpression"
+  implements("comma_expression")                         = "com.intellij.lang.javascript.psi.JSCommaExpression"
+  implements("call_expression")                          = "com.intellij.lang.javascript.psi.JSCallExpression"
+  implements("new_expression")                           = "com.intellij.lang.javascript.psi.JSNewExpression"
+  implements("conditional_expression")                   = "com.intellij.lang.javascript.psi.JSConditionalExpression"
+  implements("prefix_expression")                        = "com.intellij.lang.javascript.psi.JSPrefixExpression"
+  implements("postfix_expression")                       = "com.intellij.lang.javascript.psi.JSPostfixExpression"
+  implements("literal_expression")                       = "com.intellij.lang.javascript.psi.JSLiteralExpression"
+  implements("array_literal_expression")                 = "com.intellij.lang.javascript.psi.JSArrayLiteralExpression"
+  implements("object_literal_expression")                = "com.intellij.lang.javascript.psi.JSObjectLiteralExpression"
+  implements("parenthesized_expression")                 = "com.intellij.lang.javascript.psi.JSParenthesizedExpression"
+  implements("this_expression")                          = "com.intellij.lang.javascript.psi.JSThisExpression"
+  implements("spread_expression")                        = "com.intellij.lang.javascript.psi.JSSpreadExpression"
+  implements("indexed_property_access_expression")       = "com.intellij.lang.javascript.psi.JSIndexedPropertyAccessExpression"
+  implements("arrow_function")                           = "consulo.javascript.psi.JavaScriptLambdaExpression"
+  implements("function_expression")                      = "com.intellij.lang.javascript.psi.JSFunctionExpression"
+
+  // === mixins ===
+  // Base rules get their own mixins for the generated Impl
+  mixin("expression")                                   = "consulo.typescript.language.impl.psi.mixin.TypeScriptExpressionMixin"
+  mixin("statement")                                    = "consulo.typescript.language.impl.psi.mixin.TypeScriptStatementMixin"
+
+  // Declaration mixins
+  mixin("class_declaration")                            = "consulo.typescript.language.impl.psi.mixin.TypeScriptClassMixin"
+  mixin("interface_declaration")                        = "consulo.typescript.language.impl.psi.mixin.TypeScriptInterfaceMixin"
+  mixin("function_declaration")                         = "consulo.typescript.language.impl.psi.mixin.TypeScriptFunctionMixin"
+  mixin("variable_declaration")                         = "consulo.typescript.language.impl.psi.mixin.TypeScriptVariableMixin"
+  mixin("parameter")                                    = "consulo.typescript.language.impl.psi.mixin.TypeScriptParameterMixin"
+  mixin("var_statement")                                = "consulo.typescript.language.impl.psi.mixin.TypeScriptVarStatementMixin"
+  mixin("block_statement")                              = "consulo.typescript.language.impl.psi.mixin.TypeScriptBlockStatementMixin"
+  mixin("reference_expression")                         = "consulo.typescript.language.impl.psi.mixin.TypeScriptReferenceExpressionMixin"
+  mixin("binary_expression|assignment_expression|comma_expression") = "consulo.typescript.language.impl.psi.mixin.TypeScriptBinaryExpressionMixin"
+  mixin("attribute_list")                               = "consulo.typescript.language.impl.psi.mixin.TypeScriptAttributeListMixin"
+  mixin("parameter_list")                               = "consulo.typescript.language.impl.psi.mixin.TypeScriptParameterListMixin"
+  mixin("property|property_signature_member")             = "consulo.typescript.language.impl.psi.mixin.TypeScriptPropertyMixin"
+  mixin("argument_list")                                = "consulo.typescript.language.impl.psi.mixin.TypeScriptArgumentListMixin"
+  mixin("extends_list|implements_list")                  = "consulo.typescript.language.impl.psi.mixin.TypeScriptReferenceListMixin"
+
+  // Statement mixins
+  mixin("if_statement")                                 = "consulo.typescript.language.impl.psi.mixin.TypeScriptIfStatementMixin"
+  mixin("for_statement")                                = "consulo.typescript.language.impl.psi.mixin.TypeScriptForStatementMixin"
+  mixin("for_in_statement")                             = "consulo.typescript.language.impl.psi.mixin.TypeScriptForInStatementMixin"
+  mixin("while_statement")                              = "consulo.typescript.language.impl.psi.mixin.TypeScriptWhileStatementMixin"
+  mixin("do_while_statement")                           = "consulo.typescript.language.impl.psi.mixin.TypeScriptDoWhileStatementMixin"
+  mixin("switch_statement")                             = "consulo.typescript.language.impl.psi.mixin.TypeScriptSwitchStatementMixin"
+  mixin("case_clause")                                  = "consulo.typescript.language.impl.psi.mixin.TypeScriptCaseClauseMixin"
+  mixin("try_statement")                                = "consulo.typescript.language.impl.psi.mixin.TypeScriptTryStatementMixin"
+  mixin("catch_clause")                                 = "consulo.typescript.language.impl.psi.mixin.TypeScriptCatchBlockMixin"
+  mixin("return_statement")                             = "consulo.typescript.language.impl.psi.mixin.TypeScriptReturnStatementMixin"
+  mixin("throw_statement")                              = "consulo.typescript.language.impl.psi.mixin.TypeScriptThrowStatementMixin"
+  mixin("break_statement")                              = "consulo.typescript.language.impl.psi.mixin.TypeScriptBreakStatementMixin"
+  mixin("continue_statement")                           = "consulo.typescript.language.impl.psi.mixin.TypeScriptContinueStatementMixin"
+  mixin("labeled_statement")                            = "consulo.typescript.language.impl.psi.mixin.TypeScriptLabeledStatementMixin"
+  mixin("expression_statement")                         = "consulo.typescript.language.impl.psi.mixin.TypeScriptExpressionStatementMixin"
+
+  // Statements that stay on generic TypeScriptStatementMixin (no specific JS interface methods)
+  mixin("for_of_statement|empty_statement|debugger_statement|with_statement|import_declaration") = "consulo.typescript.language.impl.psi.mixin.TypeScriptStatementMixin"
+
+  // Expression mixins
+  mixin("call_expression|new_expression")               = "consulo.typescript.language.impl.psi.mixin.TypeScriptCallExpressionMixin"
+  mixin("conditional_expression")                       = "consulo.typescript.language.impl.psi.mixin.TypeScriptConditionalExpressionMixin"
+  mixin("prefix_expression")                            = "consulo.typescript.language.impl.psi.mixin.TypeScriptPrefixExpressionMixin"
+  mixin("postfix_expression")                           = "consulo.typescript.language.impl.psi.mixin.TypeScriptPostfixExpressionMixin"
+  mixin("array_literal_expression")                     = "consulo.typescript.language.impl.psi.mixin.TypeScriptArrayLiteralExpressionMixin"
+  mixin("object_literal_expression")                    = "consulo.typescript.language.impl.psi.mixin.TypeScriptObjectLiteralExpressionMixin"
+  mixin("parenthesized_expression")                     = "consulo.typescript.language.impl.psi.mixin.TypeScriptParenthesizedExpressionMixin"
+  mixin("spread_expression")                            = "consulo.typescript.language.impl.psi.mixin.TypeScriptSpreadExpressionMixin"
+  mixin("indexed_property_access_expression")           = "consulo.typescript.language.impl.psi.mixin.TypeScriptIndexedPropertyAccessExpressionMixin"
+  mixin("arrow_function|function_expression")           = "consulo.typescript.language.impl.psi.mixin.TypeScriptFunctionExpressionMixin"
+
+  // Expressions that stay on generic TypeScriptExpressionMixin (no specific JS interface methods or marker interfaces)
+  mixin("literal_expression|this_expression|template_literal_expression|as_expression|satisfies_expression|non_null_expression|type_assertion_expression|super_expression|class_expression|yield_expression|await_expression|nullish_coalescing_expression|logical_or_expression|logical_and_expression|bitwise_or_expression|bitwise_xor_expression|bitwise_and_expression|equality_expression|relational_expression|shift_expression|additive_expression|multiplicative_expression|exponentiation_expression") = "consulo.typescript.language.impl.psi.mixin.TypeScriptExpressionMixin"
+
+  // === rule hierarchy ===
+  extends(".*_expression|arrow_function|template_literal_expression") = expression
+  extends(".*_statement")                               = statement
+
+  tokens = [
+    WHITE_SPACE
+    END_OF_LINE_COMMENT
+    C_STYLE_COMMENT
+    DOC_COMMENT
+
+    // Keywords
+    BREAK_KEYWORD       = 'break'
+    CASE_KEYWORD        = 'case'
+    CATCH_KEYWORD       = 'catch'
+    CONST_KEYWORD       = 'const'
+    CONTINUE_KEYWORD    = 'continue'
+    DEBUGGER_KEYWORD    = 'debugger'
+    DEFAULT_KEYWORD     = 'default'
+    DELETE_KEYWORD      = 'delete'
+    DO_KEYWORD          = 'do'
+    ELSE_KEYWORD        = 'else'
+    EXPORT_KEYWORD      = 'export'
+    EXTENDS_KEYWORD     = 'extends'
+    FALSE_KEYWORD       = 'false'
+    FINALLY_KEYWORD     = 'finally'
+    FOR_KEYWORD         = 'for'
+    FUNCTION_KEYWORD    = 'function'
+    IF_KEYWORD          = 'if'
+    IMPORT_KEYWORD      = 'import'
+    IN_KEYWORD          = 'in'
+    INSTANCEOF_KEYWORD  = 'instanceof'
+    LET_KEYWORD         = 'let'
+    NEW_KEYWORD         = 'new'
+    NULL_KEYWORD        = 'null'
+    RETURN_KEYWORD      = 'return'
+    SUPER_KEYWORD       = 'super'
+    SWITCH_KEYWORD      = 'switch'
+    THIS_KEYWORD        = 'this'
+    THROW_KEYWORD       = 'throw'
+    TRUE_KEYWORD        = 'true'
+    TRY_KEYWORD         = 'try'
+    TYPEOF_KEYWORD      = 'typeof'
+    VAR_KEYWORD         = 'var'
+    VOID_KEYWORD        = 'void'
+    WHILE_KEYWORD       = 'while'
+    WITH_KEYWORD        = 'with'
+    YIELD_KEYWORD       = 'yield'
+    CLASS_KEYWORD       = 'class'
+    ENUM_KEYWORD        = 'enum'
+    AWAIT_KEYWORD       = 'await'
+
+    // TS contextual keywords: IDENTIFIER in lexer, remapped by TypeScriptParserUtil
+    INTERFACE_KEYWORD
+    TYPE_KEYWORD
+    NAMESPACE_KEYWORD
+    MODULE_KEYWORD
+    DECLARE_KEYWORD
+    ABSTRACT_KEYWORD
+    ASYNC_KEYWORD
+    FROM_KEYWORD
+    AS_KEYWORD
+    SATISFIES_KEYWORD
+    KEYOF_KEYWORD
+    INFER_KEYWORD
+    READONLY_KEYWORD
+    GET_KEYWORD
+    SET_KEYWORD
+    OF_KEYWORD
+    CONSTRUCTOR_KEYWORD
+    GLOBAL_KEYWORD
+    OVERRIDE_KEYWORD
+    PUBLIC_KEYWORD
+    PRIVATE_KEYWORD
+    PROTECTED_KEYWORD
+    STATIC_KEYWORD
+    IMPLEMENTS_KEYWORD
+
+    // Literals
+    NUMERIC_LITERAL
+    STRING_LITERAL
+    REGEXP_LITERAL
+    NO_SUBSTITUTION_TEMPLATE
+    TEMPLATE_HEAD
+    TEMPLATE_MIDDLE
+    TEMPLATE_TAIL
+
+    // Identifier
+    IDENTIFIER
+
+    // Punctuators
+    LBRACE      = '{'
+    RBRACE      = '}'
+    LPAR        = '('
+    RPAR        = ')'
+    LBRACKET    = '['
+    RBRACKET    = ']'
+    DOT         = '.'
+    DOT_DOT_DOT = '...'
+    SEMICOLON   = ';'
+    COMMA       = ','
+    LT          = '<'
+    GT          = '>'
+    LE          = '<='
+    GE          = '>='
+    EQEQ        = '=='
+    NE          = '!='
+    EQEQEQ      = '==='
+    NEQEQ       = '!=='
+    PLUS        = '+'
+    MINUS       = '-'
+    MULT        = '*'
+    MULTMULT    = '**'
+    PERC        = '%'
+    PLUSPLUS     = '++'
+    MINUSMINUS  = '--'
+    LTLT        = '<<'
+    GTGT        = '>>'
+    GTGTGT      = '>>>'
+    AND         = '&'
+    OR          = '|'
+    XOR         = '^'
+    EXCL        = '!'
+    TILDE       = '~'
+    ANDAND      = '&&'
+    OROR        = '||'
+    QUEST       = '?'
+    QUEST_DOT   = '?.'
+    QUEST_QUEST = '??'
+    COLON       = ':'
+    EQ          = '='
+    PLUSEQ      = '+='
+    MINUSEQ     = '-='
+    MULTEQ      = '*='
+    MULTMULTEQ  = '**='
+    PERCEQ      = '%='
+    LTLTEQ      = '<<='
+    GTGTEQ      = '>>='
+    GTGTGTEQ    = '>>>='
+    ANDEQ       = '&='
+    OREQ        = '|='
+    XOREQ       = '^='
+    DIVEQ       = '/='
+    OROR_EQ     = '||='
+    ANDAND_EQ   = '&&='
+    QUEST_QUEST_EQ = '??='
+    DARROW      = '=>'
+    DIV         = '/'
+    AT          = '@'
+    HASH        = '#'
+  ]
+}
+
+// ==================== Root ====================
+
+typescript_file ::= statement_list
+
+private statement_list ::= statement*
+
+statement ::=
+    block_statement
+  | var_statement
+  | empty_statement
+  | if_statement
+  | for_statement
+  | for_in_statement
+  | for_of_statement
+  | while_statement
+  | do_while_statement
+  | continue_statement
+  | break_statement
+  | return_statement
+  | with_statement
+  | switch_statement
+  | throw_statement
+  | try_statement
+  | labeled_statement
+  | debugger_statement
+  | function_declaration
+  | class_declaration
+  | interface_declaration
+  | enum_declaration
+  | type_alias_declaration
+  | namespace_declaration
+  | import_declaration
+  | export_declaration
+  | ambient_declaration
+  | expression_statement
+  {recoverWhile = statement_recover_}
+
+private statement_recover_ ::= !(
+    IDENTIFIER | LBRACE | RBRACE | SEMICOLON |
+    VAR_KEYWORD | LET_KEYWORD | CONST_KEYWORD |
+    FUNCTION_KEYWORD | CLASS_KEYWORD | IF_KEYWORD |
+    FOR_KEYWORD | WHILE_KEYWORD | DO_KEYWORD |
+    SWITCH_KEYWORD | TRY_KEYWORD | RETURN_KEYWORD |
+    THROW_KEYWORD | BREAK_KEYWORD | CONTINUE_KEYWORD |
+    IMPORT_KEYWORD | EXPORT_KEYWORD | ENUM_KEYWORD | AT |
+    NUMERIC_LITERAL | STRING_LITERAL |
+    LPAR | LBRACKET | PLUS | MINUS | EXCL | TILDE |
+    PLUSPLUS | MINUSMINUS | THIS_KEYWORD | NEW_KEYWORD |
+    DELETE_KEYWORD | TYPEOF_KEYWORD | VOID_KEYWORD |
+    YIELD_KEYWORD | AWAIT_KEYWORD | SUPER_KEYWORD |
+    TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD |
+    NO_SUBSTITUTION_TEMPLATE | TEMPLATE_HEAD
+)
+
+// ==================== Statements ====================
+
+block_statement ::= '{' statement_list '}' {pin=1}
+
+var_statement ::= var_keyword variable_declaration_list semicolon {pin=1}
+
+private var_keyword ::= VAR_KEYWORD | LET_KEYWORD | CONST_KEYWORD
+
+private variable_declaration_list ::= variable_declaration (',' variable_declaration)*
+
+variable_declaration ::= binding_pattern type_annotation? initializer?
+
+private initializer ::= '=' expression
+
+if_statement ::= 'if' '(' expression ')' statement ('else' statement)? {pin=1}
+
+for_statement ::= 'for' '(' for_init? ';' expression? ';' expression? ')' statement {pin=1}
+
+private for_init ::= var_keyword variable_declaration_list | expression
+
+for_in_statement ::= 'for' '(' for_in_target 'in' expression ')' statement {pin=1}
+
+for_of_statement ::= 'for' 'await'? '(' for_in_target OF_KEYWORD expression ')' statement {pin=1}
+
+private for_in_target ::= var_keyword binding_pattern type_annotation? | expression
+
+while_statement ::= 'while' '(' expression ')' statement {pin=1}
+
+do_while_statement ::= 'do' statement 'while' '(' expression ')' semicolon {pin=1}
+
+switch_statement ::= 'switch' '(' expression ')' '{' case_clause* '}' {pin=1}
+
+case_clause ::= ('case' expression ':' | 'default' ':') statement_list
+
+try_statement ::= 'try' block_statement (catch_clause finally_clause? | finally_clause) {pin=1}
+
+catch_clause ::= 'catch' ('(' parameter ')')? block_statement {pin=1}
+
+private finally_clause ::= 'finally' block_statement
+
+return_statement ::= 'return' expression? semicolon {pin=1}
+
+throw_statement ::= 'throw' expression semicolon {pin=1}
+
+break_statement ::= 'break' IDENTIFIER? semicolon {pin=1}
+
+continue_statement ::= 'continue' IDENTIFIER? semicolon {pin=1}
+
+labeled_statement ::= IDENTIFIER ':' statement
+
+expression_statement ::= expression semicolon
+
+empty_statement ::= ';'
+
+debugger_statement ::= 'debugger' semicolon {pin=1}
+
+with_statement ::= 'with' '(' expression ')' statement {pin=1}
+
+private semicolon ::= ';'?
+
+// ==================== Declarations ====================
+
+// --- Class ---
+class_declaration ::= decorator_list? attribute_list? ABSTRACT_KEYWORD? 'class' IDENTIFIER type_parameter_list? extends_clause? implements_clause? class_body {pin="CLASS_KEYWORD"}
+
+class_expression ::= ABSTRACT_KEYWORD? 'class' IDENTIFIER? type_parameter_list? extends_clause? class_body
+
+private extends_clause ::= 'extends' expression_list
+
+private implements_clause ::= IMPLEMENTS_KEYWORD expression_list
+
+extends_list ::= 'extends' type_reference_list
+
+implements_list ::= IMPLEMENTS_KEYWORD type_reference_list
+
+private type_reference_list ::= type_reference (',' type_reference)*
+
+class_body ::= '{' class_member* '}'
+
+private class_member ::= decorator_list? attribute_list? class_member_declaration | ';'
+
+private class_member_declaration ::=
+    index_signature_declaration
+  | constructor_declaration
+  | method_declaration
+  | accessor_declaration
+  | property_declaration
+
+constructor_declaration ::= CONSTRUCTOR_KEYWORD parameter_list block_statement?
+
+method_declaration ::= '*'? property_name '?'? type_parameter_list? parameter_list type_annotation? block_statement?
+
+accessor_declaration ::= (GET_KEYWORD | SET_KEYWORD) property_name parameter_list type_annotation? block_statement?
+
+property_declaration ::= property_name '?'? '!'? type_annotation? initializer? semicolon
+
+index_signature_declaration ::= '[' parameter ':' type_expression ']' type_annotation semicolon
+
+// --- Function ---
+function_declaration ::= attribute_list? ASYNC_KEYWORD? 'function' '*'? IDENTIFIER type_parameter_list? parameter_list type_annotation? block_statement? {pin="FUNCTION_KEYWORD"}
+
+function_expression ::= ASYNC_KEYWORD? 'function' '*'? IDENTIFIER? type_parameter_list? parameter_list type_annotation? block_statement
+
+// --- Arrow function ---
+arrow_function ::= ASYNC_KEYWORD? type_parameter_list? (IDENTIFIER | parameter_list) type_annotation? '=>' (expression | block_statement)
+
+// --- Interface ---
+interface_declaration ::= INTERFACE_KEYWORD IDENTIFIER type_parameter_list? extends_list? interface_body {pin=1}
+
+private interface_body ::= '{' interface_member* '}'
+
+private interface_member ::= (call_signature_member | construct_signature_member | method_signature_member | property_signature_member | index_signature_declaration) semicolon?
+
+call_signature_member ::= type_parameter_list? parameter_list type_annotation?
+
+construct_signature_member ::= 'new' type_parameter_list? parameter_list type_annotation?
+
+method_signature_member ::= property_name '?'? type_parameter_list? parameter_list type_annotation
+
+property_signature_member ::= READONLY_KEYWORD? property_name '?'? type_annotation
+
+// --- Enum ---
+enum_declaration ::= 'const'? 'enum' IDENTIFIER enum_body {pin="ENUM_KEYWORD"}
+
+private enum_body ::= '{' (enum_member (',' enum_member)* ','?)? '}'
+
+enum_member ::= property_name ('=' expression)?
+
+// --- Type alias ---
+type_alias_declaration ::= TYPE_KEYWORD IDENTIFIER type_parameter_list? '=' type_expression semicolon {pin=1}
+
+// --- Namespace ---
+namespace_declaration ::= (NAMESPACE_KEYWORD | MODULE_KEYWORD) qualified_name block_statement {pin=1}
+
+// --- Ambient declaration ---
+ambient_declaration ::= DECLARE_KEYWORD (var_statement | function_declaration | class_declaration | enum_declaration | namespace_declaration | interface_declaration | type_alias_declaration | GLOBAL_KEYWORD block_statement) {pin=1}
+
+// --- Import ---
+import_declaration ::= 'import' TYPE_KEYWORD? import_clause from_clause import_attributes? semicolon
+  | 'import' TYPE_KEYWORD? module_specifier semicolon
+  | 'import' IDENTIFIER '=' (IDENTIFIER '(' module_specifier ')' | qualified_name) semicolon
+  {pin=1}
+
+private import_clause ::= IDENTIFIER (',' (namespace_import | named_imports))?
+  | namespace_import
+  | named_imports
+
+namespace_import ::= '*' AS_KEYWORD IDENTIFIER
+
+named_imports ::= '{' (import_specifier (',' import_specifier)* ','?)? '}'
+
+import_specifier ::= TYPE_KEYWORD? IDENTIFIER (AS_KEYWORD IDENTIFIER)?
+
+private from_clause ::= FROM_KEYWORD module_specifier
+
+private module_specifier ::= STRING_LITERAL
+
+import_attributes ::= (IDENTIFIER | AS_KEYWORD) '{' (import_attribute (',' import_attribute)* ','?)? '}'
+
+import_attribute ::= (IDENTIFIER | STRING_LITERAL) ':' (STRING_LITERAL | IDENTIFIER)
+
+// --- Export ---
+export_declaration ::= 'export' (
+    'default'? (function_declaration | class_declaration | interface_declaration | enum_declaration | type_alias_declaration)
+  | 'default' expression semicolon
+  | var_statement
+  | named_exports from_clause? semicolon
+  | '*' (AS_KEYWORD IDENTIFIER)? from_clause semicolon
+  | '=' IDENTIFIER semicolon
+  | TYPE_KEYWORD? named_exports from_clause? semicolon
+  | TYPE_KEYWORD? '*' (AS_KEYWORD IDENTIFIER)? from_clause semicolon
+) {pin=1}
+
+named_exports ::= '{' (export_specifier (',' export_specifier)* ','?)? '}'
+
+export_specifier ::= TYPE_KEYWORD? IDENTIFIER (AS_KEYWORD IDENTIFIER)?
+
+// ==================== Expressions ====================
+
+expression ::= assignment_expression
+
+assignment_expression ::= conditional_expression (assignment_operator assignment_expression)?
+
+private assignment_operator ::= '=' | '+=' | '-=' | '*=' | '**=' | '/=' | '%='
+  | '<<=' | '>>=' | '>>>=' | '&=' | '|=' | '^=' | '||=' | '&&=' | '??='
+
+conditional_expression ::= nullish_coalescing_expression ('?' assignment_expression ':' assignment_expression)?
+
+nullish_coalescing_expression ::= logical_or_expression ('??' logical_or_expression)*
+
+logical_or_expression ::= logical_and_expression ('||' logical_and_expression)*
+
+logical_and_expression ::= bitwise_or_expression ('&&' bitwise_or_expression)*
+
+bitwise_or_expression ::= bitwise_xor_expression ('|' bitwise_xor_expression)*
+
+bitwise_xor_expression ::= bitwise_and_expression ('^' bitwise_and_expression)*
+
+bitwise_and_expression ::= equality_expression ('&' equality_expression)*
+
+equality_expression ::= relational_expression (('==' | '!=' | '===' | '!==') relational_expression)*
+
+relational_expression ::= shift_expression (('<' | '>' | '<=' | '>=' | 'instanceof' | 'in') shift_expression)*
+
+shift_expression ::= additive_expression (('<<' | '>>' | '>>>') additive_expression)*
+
+additive_expression ::= multiplicative_expression (('+' | '-') multiplicative_expression)*
+
+multiplicative_expression ::= exponentiation_expression (('*' | '/' | '%') exponentiation_expression)*
+
+exponentiation_expression ::= unary_expression ('**' exponentiation_expression)?
+
+private unary_expression ::= prefix_expression | postfix_or_higher
+
+prefix_expression ::= ('+' | '-' | '~' | '!' | 'typeof' | 'void' | 'delete' | '++' | '--') unary_expression
+
+private postfix_or_higher ::= call_or_member_expression postfix_operator?
+
+postfix_expression ::= call_or_member_expression ('++' | '--')
+
+private postfix_operator ::= '++' | '--'
+
+private call_or_member_expression ::= primary_expression member_or_call_tail*
+
+private member_or_call_tail ::=
+    '.' IDENTIFIER
+  | '?.' IDENTIFIER
+  | '[' expression ']'
+  | type_arguments? argument_list
+  | template_literal_expression
+  | '!'
+  | AS_KEYWORD type_expression
+  | SATISFIES_KEYWORD type_expression
+
+call_expression ::= primary_expression member_or_call_tail* type_arguments? argument_list
+
+new_expression ::= 'new' primary_expression type_arguments? argument_list?
+
+indexed_property_access_expression ::= primary_expression member_or_call_tail* '[' expression ']'
+
+as_expression ::= expression AS_KEYWORD type_expression
+
+satisfies_expression ::= expression SATISFIES_KEYWORD type_expression
+
+non_null_expression ::= expression '!'
+
+type_assertion_expression ::= '<' type_expression '>' unary_expression
+
+private primary_expression ::=
+    this_expression
+  | super_expression
+  | literal_expression
+  | array_literal_expression
+  | object_literal_expression
+  | function_expression
+  | arrow_function
+  | class_expression
+  | new_expression
+  | template_literal_expression
+  | parenthesized_expression
+  | reference_expression
+  | type_assertion_expression
+  | yield_expression
+  | await_expression
+
+this_expression ::= 'this'
+super_expression ::= 'super'
+reference_expression ::= IDENTIFIER
+literal_expression ::= NUMERIC_LITERAL | STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD | REGEXP_LITERAL
+
+yield_expression ::= 'yield' '*'? expression?
+
+await_expression ::= 'await' unary_expression
+
+array_literal_expression ::= '[' expression_list_opt ']'
+
+private expression_list_opt ::= (expression (',' expression)* ','?)?
+
+object_literal_expression ::= '{' (property (',' property)* ','?)? '}'
+
+property ::= property_name ':' expression
+  | IDENTIFIER
+  | '...' expression
+  | '*'? property_name type_parameter_list? parameter_list type_annotation? block_statement
+  | (GET_KEYWORD | SET_KEYWORD) property_name parameter_list type_annotation? block_statement
+
+computed_property_name ::= '[' expression ']'
+
+parenthesized_expression ::= '(' expression ')'
+
+template_literal_expression ::= NO_SUBSTITUTION_TEMPLATE
+  | TEMPLATE_HEAD expression (TEMPLATE_MIDDLE expression)* TEMPLATE_TAIL
+
+spread_expression ::= '...' expression
+
+comma_expression ::= expression ',' expression
+
+binary_expression ::= expression binary_operator expression
+
+private binary_operator ::= '+' | '-' | '*' | '/' | '%' | '**'
+  | '==' | '!=' | '===' | '!=='
+  | '<' | '>' | '<=' | '>='
+  | '<<' | '>>' | '>>>'
+  | '&' | '|' | '^'
+  | '&&' | '||' | '??'
+  | 'instanceof' | 'in'
+
+parameter_list ::= '(' (parameter (',' parameter)*)? ')' {pin=1}
+
+parameter ::= decorator_list? attribute_list? '...'? binding_pattern '?'? type_annotation? initializer?
+
+argument_list ::= '(' (expression (',' expression)*)? ')' {pin=1}
+
+private expression_list ::= expression (',' expression)*
+
+// ==================== Type Expressions ====================
+
+private type_expression ::= conditional_type | union_or_intersection_type
+
+type_annotation ::= ':' type_expression
+
+conditional_type ::= union_or_intersection_type 'extends' union_or_intersection_type '?' type_expression ':' type_expression
+
+private union_or_intersection_type ::= union_type | intersection_type | primary_type_or_array
+
+union_type ::= '|'? primary_type_or_array ('|' primary_type_or_array)+
+
+intersection_type ::= '&'? primary_type_or_array ('&' primary_type_or_array)+
+
+private primary_type_or_array ::= primary_type array_type_suffix*
+
+private array_type_suffix ::= '[' ']'
+
+array_type ::= primary_type '[' ']'
+
+private primary_type ::=
+    parenthesized_type
+  | type_reference
+  | tuple_type
+  | function_type
+  | object_type
+  | mapped_type
+  | literal_type
+  | typeof_type
+  | keyof_type
+  | infer_type
+  | template_literal_type
+  | predefined_type
+
+parenthesized_type ::= '(' type_expression ')'
+
+type_reference ::= qualified_name type_arguments?
+
+tuple_type ::= '[' (tuple_element (',' tuple_element)* ','?)? ']'
+
+tuple_element ::= '...'? (IDENTIFIER ':')? type_expression '?'?
+
+function_type ::= type_parameter_list? '(' parameter_type_list? ')' '=>' type_expression
+
+private parameter_type_list ::= parameter_type (',' parameter_type)*
+
+parameter_type ::= '...'? IDENTIFIER '?'? ':' type_expression
+
+object_type ::= '{' (object_type_member (';' | ',')?)*  '}'
+
+private object_type_member ::=
+    property_signature_member
+  | call_signature_member
+  | construct_signature_member
+  | index_signature_member
+  | method_signature_member
+
+index_signature_member ::= READONLY_KEYWORD? '[' IDENTIFIER ':' type_expression ']' type_annotation
+
+mapped_type ::= '{' ('+' | '-')? READONLY_KEYWORD? '[' IDENTIFIER 'in' type_expression (AS_KEYWORD type_expression)? ']' ('+' | '-')? '?'? type_annotation ';'? '}'
+
+indexed_access_type ::= primary_type '[' type_expression ']'
+
+literal_type ::= NUMERIC_LITERAL | STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD
+
+typeof_type ::= 'typeof' reference_expression
+
+keyof_type ::= KEYOF_KEYWORD type_expression
+
+infer_type ::= INFER_KEYWORD IDENTIFIER ('extends' type_expression)?
+
+template_literal_type ::= NO_SUBSTITUTION_TEMPLATE | TEMPLATE_HEAD type_expression (TEMPLATE_MIDDLE type_expression)* TEMPLATE_TAIL
+
+predefined_type ::= IDENTIFIER
+
+type_parameter_list ::= '<' type_parameter (',' type_parameter)* '>' {pin=1}
+
+type_parameter ::= IDENTIFIER? IDENTIFIER ('extends' type_expression)? ('=' type_expression)?
+
+type_arguments ::= '<' type_expression (',' type_expression)* '>'
+
+// ==================== Decorators & Modifiers ====================
+
+private decorator_list ::= decorator+
+
+decorator ::= '@' expression
+
+attribute_list ::= (access_modifier | STATIC_KEYWORD | ABSTRACT_KEYWORD | READONLY_KEYWORD | OVERRIDE_KEYWORD | ASYNC_KEYWORD)*
+
+private access_modifier ::= PUBLIC_KEYWORD | PRIVATE_KEYWORD | PROTECTED_KEYWORD
+
+// ==================== Utility Rules ====================
+
+private property_name ::= IDENTIFIER | STRING_LITERAL | NUMERIC_LITERAL | computed_property_name
+
+qualified_name ::= IDENTIFIER ('.' IDENTIFIER)*
+
+binding_pattern ::= IDENTIFIER | array_binding_pattern | object_binding_pattern
+
+array_binding_pattern ::= '[' (binding_element (',' binding_element)* ','?)? ']'
+
+object_binding_pattern ::= '{' (binding_property (',' binding_property)* ','?)? '}'
+
+private binding_element ::= '...'? binding_pattern type_annotation? initializer?
+
+private binding_property ::= (property_name ':')? binding_pattern initializer?
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
index bccf924a..38042146 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/TypeScriptFileType.java
@@ -21,12 +21,12 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.javascript.language.JavaScriptFileTypeWithVersion;
-import consulo.javascript.language.JavaScriptLanguage;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.version.LanguageVersion;
 import consulo.language.file.LanguageFileType;
 import consulo.localize.LocalizeValue;
-import consulo.typescript.version.TypeScriptLanguageVersion;
+import consulo.typescript.language.TypeScriptLanguage;
+import consulo.typescript.version.BaseTypeScriptLanguageVersion;
 import consulo.ui.image.Image;
 
 import org.jspecify.annotations.Nullable;
@@ -39,7 +39,7 @@ public class TypeScriptFileType extends LanguageFileType implements JavaScriptFi
     public static final TypeScriptFileType INSTANCE = new TypeScriptFileType();
 
     private TypeScriptFileType() {
-        super(JavaScriptLanguage.INSTANCE);
+        super(TypeScriptLanguage.INSTANCE);
     }
 
     @Override
@@ -66,6 +66,6 @@ public Image getIcon() {
     @RequiredReadAction
     @Override
     public LanguageVersion getLanguageVersion(@Nullable Module module, @Nullable VirtualFile virtualFile) {
-        return TypeScriptLanguageVersion.getInstance();
+        return BaseTypeScriptLanguageVersion.getLatest();
     }
 }
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/completion/TypeScriptKeywordCompletionContributor.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/completion/TypeScriptKeywordCompletionContributor.java
new file mode 100644
index 00000000..d44b50e5
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/completion/TypeScriptKeywordCompletionContributor.java
@@ -0,0 +1,151 @@
+package consulo.typescript.completion;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.Language;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenSet;
+import consulo.language.editor.completion.CompletionContributor;
+import consulo.language.editor.completion.CompletionParameters;
+import consulo.language.editor.completion.CompletionResultSet;
+import consulo.language.editor.completion.lookup.LookupElementBuilder;
+import consulo.language.impl.ast.TreeUtil;
+import consulo.language.impl.parser.GeneratedParserUtilBase;
+import consulo.language.psi.PsiFile;
+import consulo.language.psi.PsiFileFactory;
+import consulo.typescript.language.TypeScriptLanguage;
+import consulo.typescript.language.TypeScriptTokens;
+import consulo.typescript.language.psi.TypeScriptTypes;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Grammar-based keyword completion for TypeScript.
+ * Uses {@link GeneratedParserUtilBase.CompletionState} to collect expected keyword tokens
+ * from the BNF-generated parser at the completion offset.
+ *
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+@ExtensionImpl
+public class TypeScriptKeywordCompletionContributor extends CompletionContributor {
+    private static final Map<IElementType, String> KEYWORD_MAP = new LinkedHashMap<>();
+
+    private static final TokenSet KEYWORDS;
+
+    static {
+        // JS hard keywords
+        KEYWORD_MAP.put(JSTokenTypes.BREAK_KEYWORD, "break");
+        KEYWORD_MAP.put(JSTokenTypes.CASE_KEYWORD, "case");
+        KEYWORD_MAP.put(JSTokenTypes.CATCH_KEYWORD, "catch");
+        KEYWORD_MAP.put(JSTokenTypes.CONST_KEYWORD, "const");
+        KEYWORD_MAP.put(JSTokenTypes.CONTINUE_KEYWORD, "continue");
+        KEYWORD_MAP.put(JSTokenTypes.DEFAULT_KEYWORD, "default");
+        KEYWORD_MAP.put(JSTokenTypes.DELETE_KEYWORD, "delete");
+        KEYWORD_MAP.put(JSTokenTypes.DO_KEYWORD, "do");
+        KEYWORD_MAP.put(JSTokenTypes.ELSE_KEYWORD, "else");
+        KEYWORD_MAP.put(JSTokenTypes.EXPORT_KEYWORD, "export");
+        KEYWORD_MAP.put(JSTokenTypes.EXTENDS_KEYWORD, "extends");
+        KEYWORD_MAP.put(JSTokenTypes.FALSE_KEYWORD, "false");
+        KEYWORD_MAP.put(JSTokenTypes.FINALLY_KEYWORD, "finally");
+        KEYWORD_MAP.put(JSTokenTypes.FOR_KEYWORD, "for");
+        KEYWORD_MAP.put(JSTokenTypes.FUNCTION_KEYWORD, "function");
+        KEYWORD_MAP.put(JSTokenTypes.IF_KEYWORD, "if");
+        KEYWORD_MAP.put(JSTokenTypes.IMPORT_KEYWORD, "import");
+        KEYWORD_MAP.put(JSTokenTypes.IN_KEYWORD, "in");
+        KEYWORD_MAP.put(JSTokenTypes.INSTANCEOF_KEYWORD, "instanceof");
+        KEYWORD_MAP.put(JSTokenTypes.LET_KEYWORD, "let");
+        KEYWORD_MAP.put(JSTokenTypes.NEW_KEYWORD, "new");
+        KEYWORD_MAP.put(JSTokenTypes.NULL_KEYWORD, "null");
+        KEYWORD_MAP.put(JSTokenTypes.RETURN_KEYWORD, "return");
+        KEYWORD_MAP.put(JSTokenTypes.SUPER_KEYWORD, "super");
+        KEYWORD_MAP.put(JSTokenTypes.SWITCH_KEYWORD, "switch");
+        KEYWORD_MAP.put(JSTokenTypes.THIS_KEYWORD, "this");
+        KEYWORD_MAP.put(JSTokenTypes.THROW_KEYWORD, "throw");
+        KEYWORD_MAP.put(JSTokenTypes.TRUE_KEYWORD, "true");
+        KEYWORD_MAP.put(JSTokenTypes.TRY_KEYWORD, "try");
+        KEYWORD_MAP.put(JSTokenTypes.TYPEOF_KEYWORD, "typeof");
+        KEYWORD_MAP.put(JSTokenTypes.VAR_KEYWORD, "var");
+        KEYWORD_MAP.put(JSTokenTypes.VOID_KEYWORD, "void");
+        KEYWORD_MAP.put(JSTokenTypes.WHILE_KEYWORD, "while");
+        KEYWORD_MAP.put(JSTokenTypes.WITH_KEYWORD, "with");
+        KEYWORD_MAP.put(JSTokenTypes.YIELD_KEYWORD, "yield");
+        KEYWORD_MAP.put(JSTokenTypes.CLASS_KEYWORD, "class");
+        KEYWORD_MAP.put(JSTokenTypes.ENUM_KEYWORD, "enum");
+
+        // TS hard keywords
+        KEYWORD_MAP.put(TypeScriptTokens.AWAIT_KEYWORD, "await");
+        KEYWORD_MAP.put(TypeScriptTokens.DEBUGGER_KEYWORD, "debugger");
+
+        // TS contextual keywords
+        KEYWORD_MAP.put(TypeScriptTypes.INTERFACE_KEYWORD, "interface");
+        KEYWORD_MAP.put(TypeScriptTypes.TYPE_KEYWORD, "type");
+        KEYWORD_MAP.put(TypeScriptTypes.NAMESPACE_KEYWORD, "namespace");
+        KEYWORD_MAP.put(TypeScriptTypes.MODULE_KEYWORD, "module");
+        KEYWORD_MAP.put(TypeScriptTypes.DECLARE_KEYWORD, "declare");
+        KEYWORD_MAP.put(TypeScriptTypes.ABSTRACT_KEYWORD, "abstract");
+        KEYWORD_MAP.put(TypeScriptTypes.ASYNC_KEYWORD, "async");
+        KEYWORD_MAP.put(TypeScriptTypes.FROM_KEYWORD, "from");
+        KEYWORD_MAP.put(TypeScriptTypes.AS_KEYWORD, "as");
+        KEYWORD_MAP.put(TypeScriptTypes.SATISFIES_KEYWORD, "satisfies");
+        KEYWORD_MAP.put(TypeScriptTypes.KEYOF_KEYWORD, "keyof");
+        KEYWORD_MAP.put(TypeScriptTypes.INFER_KEYWORD, "infer");
+        KEYWORD_MAP.put(TypeScriptTypes.READONLY_KEYWORD, "readonly");
+        KEYWORD_MAP.put(TypeScriptTypes.GET_KEYWORD, "get");
+        KEYWORD_MAP.put(TypeScriptTypes.SET_KEYWORD, "set");
+        KEYWORD_MAP.put(TypeScriptTypes.OF_KEYWORD, "of");
+        KEYWORD_MAP.put(TypeScriptTypes.CONSTRUCTOR_KEYWORD, "constructor");
+        KEYWORD_MAP.put(TypeScriptTypes.GLOBAL_KEYWORD, "global");
+        KEYWORD_MAP.put(TypeScriptTypes.OVERRIDE_KEYWORD, "override");
+        KEYWORD_MAP.put(TypeScriptTypes.PUBLIC_KEYWORD, "public");
+        KEYWORD_MAP.put(TypeScriptTypes.PRIVATE_KEYWORD, "private");
+        KEYWORD_MAP.put(TypeScriptTypes.PROTECTED_KEYWORD, "protected");
+        KEYWORD_MAP.put(TypeScriptTypes.STATIC_KEYWORD, "static");
+        KEYWORD_MAP.put(TypeScriptTypes.IMPLEMENTS_KEYWORD, "implements");
+
+        KEYWORDS = TokenSet.create(KEYWORD_MAP.keySet().toArray(IElementType.EMPTY_ARRAY));
+    }
+
+    @Override
+    public void fillCompletionVariants(@Nonnull CompletionParameters parameters, @Nonnull CompletionResultSet result) {
+        PsiFile posFile = parameters.getOriginalFile();
+        int completionOffset = parameters.getOffset();
+        CharSequence text = posFile.getText();
+
+        Set<IElementType> collected = new LinkedHashSet<>();
+
+        GeneratedParserUtilBase.CompletionState state = new GeneratedParserUtilBase.CompletionState(completionOffset) {
+            @Nullable
+            @Override
+            public String convertItem(Object o) {
+                if (o instanceof IElementType && KEYWORDS.contains((IElementType) o)) {
+                    collected.add((IElementType) o);
+                }
+                return null;
+            }
+        };
+
+        PsiFile file = PsiFileFactory.getInstance(posFile.getProject())
+            .createFileFromText("a.ts", TypeScriptLanguage.INSTANCE, text, true, false);
+        file.putUserData(GeneratedParserUtilBase.COMPLETION_STATE_KEY, state);
+        TreeUtil.ensureParsed(file.getNode());
+
+        for (IElementType type : collected) {
+            String keyword = KEYWORD_MAP.get(type);
+            if (keyword != null) {
+                result.addElement(LookupElementBuilder.create(keyword).bold());
+            }
+        }
+    }
+
+    @Nonnull
+    @Override
+    public Language getLanguage() {
+        return TypeScriptLanguage.INSTANCE;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptElementType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptElementType.java
new file mode 100644
index 00000000..4a9d3a0a
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptElementType.java
@@ -0,0 +1,24 @@
+package consulo.typescript.language;
+
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.IElementTypeAsPsiFactory;
+import consulo.language.psi.PsiElement;
+import consulo.typescript.language.impl.psi.TypeScriptTypesFactory;
+import org.jspecify.annotations.NonNull;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptElementType extends IElementType implements IElementTypeAsPsiFactory {
+    public TypeScriptElementType(@NonNull String debugName) {
+        super(debugName, JavaScriptLanguage.INSTANCE);
+    }
+
+    @Override
+    public PsiElement createElement(ASTNode astNode) {
+        return TypeScriptTypesFactory.createElement(astNode);
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptFeature.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptFeature.java
new file mode 100644
index 00000000..1a1b84ac
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptFeature.java
@@ -0,0 +1,61 @@
+package consulo.typescript.language;
+
+import consulo.localize.LocalizeValue;
+import consulo.typescript.localize.TypeScriptLocalize;
+
+import java.util.function.Supplier;
+
+/**
+ * TypeScript-specific features. Each feature is registered to a version
+ * via {@code addTypeScriptFeature()} in the version class constructor chain.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public enum TypeScriptFeature {
+    INTERFACE(TypeScriptLocalize::featureInterface),
+    ENUM(TypeScriptLocalize::featureEnum),
+    GENERIC(TypeScriptLocalize::featureGeneric),
+    TYPE_ANNOTATION(TypeScriptLocalize::featureTypeAnnotation),
+    ACCESS_MODIFIER(TypeScriptLocalize::featureAccessModifier),
+    NAMESPACE(TypeScriptLocalize::featureNamespace),
+    TYPE_ALIAS(TypeScriptLocalize::featureTypeAlias),
+    UNION_TYPE(TypeScriptLocalize::featureUnionType),
+    INTERSECTION_TYPE(TypeScriptLocalize::featureIntersectionType),
+    DECORATOR(TypeScriptLocalize::featureDecorator),
+    ABSTRACT_CLASS(TypeScriptLocalize::featureAbstractClass),
+    COMPUTED_PROPERTY(TypeScriptLocalize::featureComputedProperty),
+    READONLY_MODIFIER(TypeScriptLocalize::featureReadonlyModifier),
+    NEVER_TYPE(TypeScriptLocalize::featureNeverType),
+    NON_NULL_ASSERTION(TypeScriptLocalize::featureNonNullAssertion),
+    MAPPED_TYPE(TypeScriptLocalize::featureMappedType),
+    KEYOF_OPERATOR(TypeScriptLocalize::featureKeyofOperator),
+    INDEXED_ACCESS_TYPE(TypeScriptLocalize::featureIndexedAccessType),
+    OBJECT_SPREAD(TypeScriptLocalize::featureObjectSpread),
+    CONDITIONAL_TYPE(TypeScriptLocalize::featureConditionalType),
+    INFER_KEYWORD(TypeScriptLocalize::featureInferKeyword),
+    UNKNOWN_TYPE(TypeScriptLocalize::featureUnknownType),
+    REST_TUPLE(TypeScriptLocalize::featureRestTuple),
+    LABELED_TUPLE(TypeScriptLocalize::featureLabeledTuple),
+    VARIADIC_TUPLE(TypeScriptLocalize::featureVariadicTuple),
+    TEMPLATE_LITERAL_TYPE(TypeScriptLocalize::featureTemplateLiteralType),
+    KEY_REMAPPING(TypeScriptLocalize::featureKeyRemapping),
+    OVERRIDE_MODIFIER(TypeScriptLocalize::featureOverrideModifier),
+    TYPE_ONLY_IMPORT_SPECIFIER(TypeScriptLocalize::featureTypeOnlyImportSpecifier),
+    SATISFIES_OPERATOR(TypeScriptLocalize::featureSatisfiesOperator),
+    CONST_TYPE_PARAMETER(TypeScriptLocalize::featureConstTypeParameter),
+    DECORATOR_METADATA(TypeScriptLocalize::featureDecoratorMetadata),
+    IMPORT_ATTRIBUTES(TypeScriptLocalize::featureImportAttributes),
+    IMPORT_DEFER(TypeScriptLocalize::featureImportDefer),
+    SUBPATH_IMPORTS(TypeScriptLocalize::featureSubpathImports);
+
+    private final Supplier<LocalizeValue> myDisplayName;
+
+    TypeScriptFeature(Supplier<LocalizeValue> displayName) {
+        myDisplayName = displayName;
+    }
+
+    public LocalizeValue getDisplayName() {
+        return myDisplayName.get();
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptLanguage.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptLanguage.java
new file mode 100644
index 00000000..3243eb28
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptLanguage.java
@@ -0,0 +1,24 @@
+package consulo.typescript.language;
+
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.Language;
+
+/**
+ * TypeScript language definition. Extends JavaScript as its base language,
+ * so {@code TypeScriptLanguage.INSTANCE.isKindOf(JavaScriptLanguage.INSTANCE)} returns true.
+ *
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptLanguage extends Language {
+    public static final TypeScriptLanguage INSTANCE = new TypeScriptLanguage();
+
+    private TypeScriptLanguage() {
+        super(JavaScriptLanguage.INSTANCE, "TypeScript", "application/typescript");
+    }
+
+    @Override
+    public boolean isCaseSensitive() {
+        return true;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenType.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenType.java
new file mode 100644
index 00000000..ac990663
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenType.java
@@ -0,0 +1,15 @@
+package consulo.typescript.language;
+
+import consulo.javascript.language.JavaScriptLanguage;
+import consulo.language.ast.IElementType;
+import org.jspecify.annotations.NonNull;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptTokenType extends IElementType {
+    public TypeScriptTokenType(@NonNull String debugName) {
+        super(debugName, JavaScriptLanguage.INSTANCE);
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenTypeFactory.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenTypeFactory.java
new file mode 100644
index 00000000..44582550
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenTypeFactory.java
@@ -0,0 +1,168 @@
+package consulo.typescript.language;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.javascript.lang.JavaScriptContextKeywordElementType;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenType;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Token type factory for Grammar-Kit generated parser.
+ * Maps token names to existing JSTokenTypes/TypeScriptTokens instances
+ * so the parser uses the same token type objects as the lexer.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public final class TypeScriptTokenTypeFactory {
+    private static final Map<String, IElementType> TOKEN_MAP = new HashMap<>();
+
+    static {
+        // Whitespace & comments
+        TOKEN_MAP.put("WHITE_SPACE", TokenType.WHITE_SPACE);
+        TOKEN_MAP.put("END_OF_LINE_COMMENT", JSTokenTypes.END_OF_LINE_COMMENT);
+        TOKEN_MAP.put("C_STYLE_COMMENT", JSTokenTypes.C_STYLE_COMMENT);
+        TOKEN_MAP.put("DOC_COMMENT", JSTokenTypes.DOC_COMMENT);
+
+        // Identifiers & literals
+        TOKEN_MAP.put("IDENTIFIER", JSTokenTypes.IDENTIFIER);
+        TOKEN_MAP.put("NUMERIC_LITERAL", JSTokenTypes.NUMERIC_LITERAL);
+        TOKEN_MAP.put("STRING_LITERAL", JSTokenTypes.STRING_LITERAL);
+        TOKEN_MAP.put("REGEXP_LITERAL", JSTokenTypes.REGEXP_LITERAL);
+
+        // Template literals (TypeScript-specific tokens)
+        TOKEN_MAP.put("NO_SUBSTITUTION_TEMPLATE", TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE);
+        TOKEN_MAP.put("TEMPLATE_HEAD", TypeScriptTokens.TEMPLATE_HEAD);
+        TOKEN_MAP.put("TEMPLATE_MIDDLE", TypeScriptTokens.TEMPLATE_MIDDLE);
+        TOKEN_MAP.put("TEMPLATE_TAIL", TypeScriptTokens.TEMPLATE_TAIL);
+
+        // JS Keywords (by their string value - Grammar-Kit passes the 'xxx' value)
+        TOKEN_MAP.put("break", JSTokenTypes.BREAK_KEYWORD);
+        TOKEN_MAP.put("case", JSTokenTypes.CASE_KEYWORD);
+        TOKEN_MAP.put("catch", JSTokenTypes.CATCH_KEYWORD);
+        TOKEN_MAP.put("const", JSTokenTypes.CONST_KEYWORD);
+        TOKEN_MAP.put("continue", JSTokenTypes.CONTINUE_KEYWORD);
+        TOKEN_MAP.put("default", JSTokenTypes.DEFAULT_KEYWORD);
+        TOKEN_MAP.put("delete", JSTokenTypes.DELETE_KEYWORD);
+        TOKEN_MAP.put("do", JSTokenTypes.DO_KEYWORD);
+        TOKEN_MAP.put("else", JSTokenTypes.ELSE_KEYWORD);
+        TOKEN_MAP.put("export", JSTokenTypes.EXPORT_KEYWORD);
+        TOKEN_MAP.put("extends", JSTokenTypes.EXTENDS_KEYWORD);
+        TOKEN_MAP.put("false", JSTokenTypes.FALSE_KEYWORD);
+        TOKEN_MAP.put("finally", JSTokenTypes.FINALLY_KEYWORD);
+        TOKEN_MAP.put("for", JSTokenTypes.FOR_KEYWORD);
+        TOKEN_MAP.put("function", JSTokenTypes.FUNCTION_KEYWORD);
+        TOKEN_MAP.put("if", JSTokenTypes.IF_KEYWORD);
+        TOKEN_MAP.put("import", JSTokenTypes.IMPORT_KEYWORD);
+        TOKEN_MAP.put("in", JSTokenTypes.IN_KEYWORD);
+        TOKEN_MAP.put("instanceof", JSTokenTypes.INSTANCEOF_KEYWORD);
+        TOKEN_MAP.put("let", JSTokenTypes.LET_KEYWORD);
+        TOKEN_MAP.put("new", JSTokenTypes.NEW_KEYWORD);
+        TOKEN_MAP.put("null", JSTokenTypes.NULL_KEYWORD);
+        TOKEN_MAP.put("return", JSTokenTypes.RETURN_KEYWORD);
+        TOKEN_MAP.put("super", JSTokenTypes.SUPER_KEYWORD);
+        TOKEN_MAP.put("switch", JSTokenTypes.SWITCH_KEYWORD);
+        TOKEN_MAP.put("this", JSTokenTypes.THIS_KEYWORD);
+        TOKEN_MAP.put("throw", JSTokenTypes.THROW_KEYWORD);
+        TOKEN_MAP.put("true", JSTokenTypes.TRUE_KEYWORD);
+        TOKEN_MAP.put("try", JSTokenTypes.TRY_KEYWORD);
+        TOKEN_MAP.put("typeof", JSTokenTypes.TYPEOF_KEYWORD);
+        TOKEN_MAP.put("var", JSTokenTypes.VAR_KEYWORD);
+        TOKEN_MAP.put("void", JSTokenTypes.VOID_KEYWORD);
+        TOKEN_MAP.put("while", JSTokenTypes.WHILE_KEYWORD);
+        TOKEN_MAP.put("with", JSTokenTypes.WITH_KEYWORD);
+        TOKEN_MAP.put("yield", JSTokenTypes.YIELD_KEYWORD);
+        TOKEN_MAP.put("class", JSTokenTypes.CLASS_KEYWORD);
+        TOKEN_MAP.put("enum", JSTokenTypes.ENUM_KEYWORD);
+
+        // TS-specific hard keywords (lexer emits these as dedicated tokens)
+        TOKEN_MAP.put("await", TypeScriptTokens.AWAIT_KEYWORD);
+        TOKEN_MAP.put("debugger", TypeScriptTokens.DEBUGGER_KEYWORD);
+
+        // Shared contextual keywords (reuse existing JSTokenTypes instances which are JavaScriptContextKeywordElementType)
+        TOKEN_MAP.put("FROM_KEYWORD", JSTokenTypes.FROM_KEYWORD);
+        TOKEN_MAP.put("STATIC_KEYWORD", JSTokenTypes.STATIC_KEYWORD);
+        TOKEN_MAP.put("AS_KEYWORD", JSTokenTypes.AS_KEYWORD);
+        TOKEN_MAP.put("GET_KEYWORD", JSTokenTypes.GET_KEYWORD);
+        TOKEN_MAP.put("SET_KEYWORD", JSTokenTypes.SET_KEYWORD);
+        TOKEN_MAP.put("OF_KEYWORD", JSTokenTypes.OF_KEYWORD);
+
+        // Punctuators
+        TOKEN_MAP.put("{", JSTokenTypes.LBRACE);
+        TOKEN_MAP.put("}", JSTokenTypes.RBRACE);
+        TOKEN_MAP.put("(", JSTokenTypes.LPAR);
+        TOKEN_MAP.put(")", JSTokenTypes.RPAR);
+        TOKEN_MAP.put("[", JSTokenTypes.LBRACKET);
+        TOKEN_MAP.put("]", JSTokenTypes.RBRACKET);
+        TOKEN_MAP.put(".", JSTokenTypes.DOT);
+        TOKEN_MAP.put("...", JSTokenTypes.DOT_DOT_DOT);
+        TOKEN_MAP.put(";", JSTokenTypes.SEMICOLON);
+        TOKEN_MAP.put(",", JSTokenTypes.COMMA);
+        TOKEN_MAP.put("<", JSTokenTypes.LT);
+        TOKEN_MAP.put(">", JSTokenTypes.GT);
+        TOKEN_MAP.put("<=", JSTokenTypes.LE);
+        TOKEN_MAP.put(">=", JSTokenTypes.GE);
+        TOKEN_MAP.put("==", JSTokenTypes.EQEQ);
+        TOKEN_MAP.put("!=", JSTokenTypes.NE);
+        TOKEN_MAP.put("===", JSTokenTypes.EQEQEQ);
+        TOKEN_MAP.put("!==", JSTokenTypes.NEQEQ);
+        TOKEN_MAP.put("+", JSTokenTypes.PLUS);
+        TOKEN_MAP.put("-", JSTokenTypes.MINUS);
+        TOKEN_MAP.put("*", JSTokenTypes.MULT);
+        TOKEN_MAP.put("**", JSTokenTypes.MULTMULT);
+        TOKEN_MAP.put("%", JSTokenTypes.PERC);
+        TOKEN_MAP.put("++", JSTokenTypes.PLUSPLUS);
+        TOKEN_MAP.put("--", JSTokenTypes.MINUSMINUS);
+        TOKEN_MAP.put("<<", JSTokenTypes.LTLT);
+        TOKEN_MAP.put(">>", JSTokenTypes.GTGT);
+        TOKEN_MAP.put(">>>", JSTokenTypes.GTGTGT);
+        TOKEN_MAP.put("&", JSTokenTypes.AND);
+        TOKEN_MAP.put("|", JSTokenTypes.OR);
+        TOKEN_MAP.put("^", JSTokenTypes.XOR);
+        TOKEN_MAP.put("!", JSTokenTypes.EXCL);
+        TOKEN_MAP.put("~", JSTokenTypes.TILDE);
+        TOKEN_MAP.put("&&", JSTokenTypes.ANDAND);
+        TOKEN_MAP.put("||", JSTokenTypes.OROR);
+        TOKEN_MAP.put("?", JSTokenTypes.QUEST);
+        TOKEN_MAP.put("?.", JSTokenTypes.QUEST_DOT);
+        TOKEN_MAP.put("??", TypeScriptTokens.QUEST_QUEST);
+        TOKEN_MAP.put(":", JSTokenTypes.COLON);
+        TOKEN_MAP.put("=", JSTokenTypes.EQ);
+        TOKEN_MAP.put("+=", JSTokenTypes.PLUSEQ);
+        TOKEN_MAP.put("-=", JSTokenTypes.MINUSEQ);
+        TOKEN_MAP.put("*=", JSTokenTypes.MULTEQ);
+        TOKEN_MAP.put("**=", JSTokenTypes.MULT_MULT_EQ);
+        TOKEN_MAP.put("%=", JSTokenTypes.PERCEQ);
+        TOKEN_MAP.put("<<=", JSTokenTypes.LTLTEQ);
+        TOKEN_MAP.put(">>=", JSTokenTypes.GTGTEQ);
+        TOKEN_MAP.put(">>>=", JSTokenTypes.GTGTGTEQ);
+        TOKEN_MAP.put("&=", JSTokenTypes.ANDEQ);
+        TOKEN_MAP.put("|=", JSTokenTypes.OREQ);
+        TOKEN_MAP.put("^=", JSTokenTypes.XOREQ);
+        TOKEN_MAP.put("/=", JSTokenTypes.DIVEQ);
+        TOKEN_MAP.put("||=", JSTokenTypes.OR_OR_EQ);
+        TOKEN_MAP.put("&&=", JSTokenTypes.AND_AND_EQ);
+        TOKEN_MAP.put("??=", JSTokenTypes.QUEST_QUEST_EQ);
+        TOKEN_MAP.put("=>", JSTokenTypes.DARROW);
+        TOKEN_MAP.put("/", JSTokenTypes.DIV);
+        TOKEN_MAP.put("@", JSTokenTypes.AT);
+        TOKEN_MAP.put("#", TypeScriptTokens.HASH);
+    }
+
+    public static IElementType getTokenType(String name) {
+        IElementType existing = TOKEN_MAP.get(name);
+        if (existing != null) {
+            return existing;
+        }
+        // TS-specific contextual keywords — create JavaScriptContextKeywordElementType
+        // so JavaScriptHighlightVisitor highlights them as keywords
+        if (name.endsWith("_KEYWORD")) {
+            String keyword = name.substring(0, name.length() - "_KEYWORD".length()).toLowerCase(Locale.ROOT);
+            return new JavaScriptContextKeywordElementType(name, keyword);
+        }
+        return new TypeScriptTokenType(name);
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokens.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokens.java
new file mode 100644
index 00000000..c6f93855
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokens.java
@@ -0,0 +1,20 @@
+package consulo.typescript.language;
+
+import consulo.language.ast.IElementType;
+
+/**
+ * TypeScript-specific token types that don't exist in JSTokenTypes.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public interface TypeScriptTokens {
+    IElementType QUEST_QUEST = new TypeScriptTokenType("QUEST_QUEST"); // ??
+    IElementType TEMPLATE_HEAD = new TypeScriptTokenType("TEMPLATE_HEAD");
+    IElementType TEMPLATE_MIDDLE = new TypeScriptTokenType("TEMPLATE_MIDDLE");
+    IElementType TEMPLATE_TAIL = new TypeScriptTokenType("TEMPLATE_TAIL");
+    IElementType NO_SUBSTITUTION_TEMPLATE = new TypeScriptTokenType("NO_SUBSTITUTION_TEMPLATE");
+    IElementType HASH = new TypeScriptTokenType("HASH"); // #
+    IElementType AWAIT_KEYWORD = new TypeScriptTokenType("AWAIT_KEYWORD");
+    IElementType DEBUGGER_KEYWORD = new TypeScriptTokenType("DEBUGGER_KEYWORD");
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/TypeScriptParserDefinition.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/TypeScriptParserDefinition.java
new file mode 100644
index 00000000..e2b10157
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/TypeScriptParserDefinition.java
@@ -0,0 +1,64 @@
+package consulo.typescript.language.impl;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.impl.JSDocCommentImpl;
+import com.intellij.lang.javascript.psi.impl.JSFileImpl;
+import com.intellij.lang.javascript.types.JSFileElementType;
+import consulo.annotation.component.ExtensionImpl;
+import consulo.language.Language;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.ast.IFileElementType;
+import consulo.language.file.FileViewProvider;
+import consulo.language.lexer.Lexer;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiFile;
+import consulo.language.util.LanguageUtil;
+import consulo.language.version.LanguageVersionableParserDefinition;
+import consulo.typescript.language.TypeScriptLanguage;
+import consulo.typescript.language.impl.psi.TypeScriptTypesFactory;
+
+/**
+ * Parser definition for the TypeScript language.
+ * Registered for {@link TypeScriptLanguage} — no version checks needed.
+ *
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+@ExtensionImpl
+public class TypeScriptParserDefinition extends LanguageVersionableParserDefinition {
+    private static final IFileElementType FILE = new JSFileElementType(TypeScriptLanguage.INSTANCE);
+
+    @Override
+    public Language getLanguage() {
+        return TypeScriptLanguage.INSTANCE;
+    }
+
+    @Override
+    public IFileElementType getFileNodeType() {
+        return FILE;
+    }
+
+    @Override
+    public PsiElement createElement(ASTNode node) {
+        IElementType type = node.getElementType();
+
+        if (type == JSTokenTypes.DOC_COMMENT) {
+            return new JSDocCommentImpl(node);
+        }
+
+        return TypeScriptTypesFactory.createElement(node);
+    }
+
+    @Override
+    public PsiFile createFile(FileViewProvider fileViewProvider) {
+        return new JSFileImpl(fileViewProvider);
+    }
+
+    @Override
+    public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
+        PsiElement leftPsi = left.getPsi();
+        Lexer lexer = createLexer(leftPsi.getLanguageVersion());
+        return LanguageUtil.canStickTokensTogetherByLexer(left, right, lexer);
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/TypeScriptElementImpl.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/TypeScriptElementImpl.java
new file mode 100644
index 00000000..767e3ec4
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/TypeScriptElementImpl.java
@@ -0,0 +1,29 @@
+package consulo.typescript.language.impl.psi;
+
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.ast.ASTNode;
+import consulo.language.impl.psi.ASTWrapperPsiElement;
+import org.jspecify.annotations.NonNull;
+
+/**
+ * Base PSI element implementation for TypeScript.
+ * Provides default getType() for JavaScriptTypeElement conformance in type expression subclasses.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptElementImpl extends ASTWrapperPsiElement {
+    public TypeScriptElementImpl(@NonNull ASTNode node) {
+        super(node);
+    }
+
+    /**
+     * Default getType() implementation that satisfies JavaScriptTypeElement and JSExpression contracts.
+     * Override in specific mixins/implementations to provide actual type resolution.
+     */
+    @RequiredReadAction
+    public JavaScriptType getType() {
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptArgumentListMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptArgumentListMixin.java
new file mode 100644
index 00000000..b90215d5
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptArgumentListMixin.java
@@ -0,0 +1,38 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSArgumentList;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.typescript.language.impl.psi.TypeScriptElementImpl;
+import jakarta.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptArgumentListMixin extends TypeScriptElementImpl implements JSArgumentList {
+    public TypeScriptArgumentListMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSArgumentList(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSExpression[] getArguments() {
+        JSExpression[] result = PsiTreeUtil.getChildrenOfType(this, JSExpression.class);
+        return result != null ? result : JSExpression.EMPTY_ARRAY;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptArrayLiteralExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptArrayLiteralExpressionMixin.java
new file mode 100644
index 00000000..b7ecca60
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptArrayLiteralExpressionMixin.java
@@ -0,0 +1,37 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptArrayLiteralExpressionMixin extends TypeScriptExpressionMixin implements JSArrayLiteralExpression {
+    public TypeScriptArrayLiteralExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSArrayLiteralExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSExpression[] getExpressions() {
+        JSExpression[] result = PsiTreeUtil.getChildrenOfType(this, JSExpression.class);
+        return result != null ? result : JSExpression.EMPTY_ARRAY;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptAttributeListMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptAttributeListMixin.java
new file mode 100644
index 00000000..bd3e9b41
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptAttributeListMixin.java
@@ -0,0 +1,90 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.psi.stubs.JSAttributeListStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.impl.psi.stub.StubBasedPsiElementBase;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.stub.IStubElementType;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript attribute lists (modifiers).
+ * Implements JSAttributeList to integrate with JavaScript PSI infrastructure.
+ *
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptAttributeListMixin extends StubBasedPsiElementBase<JSAttributeListStub> implements JSAttributeList {
+    public TypeScriptAttributeListMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public IStubElementType getElementType() {
+        JSAttributeListStub stub = getStub();
+        if (stub != null) {
+            return stub.getStubType();
+        }
+        return null;
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSAttributeList(this);
+        }
+        else {
+            visitor.visitElement(this);
+        }
+    }
+
+    // --- JSAttributeList ---
+
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public String getNamespace() {
+        return null;
+    }
+
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public JSReferenceExpression getNamespaceElement() {
+        return null;
+    }
+
+    @Override
+    public JSAttribute[] getAttributes() {
+        return JSAttribute.EMPTY_ARRAY;
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSAttribute[] getAttributesByName(String name) {
+        return JSAttribute.EMPTY_ARRAY;
+    }
+
+    @RequiredReadAction
+    @Override
+    public AccessType getAccessType() {
+        return AccessType.PACKAGE_LOCAL;
+    }
+
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public PsiElement findAccessTypeElement() {
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean hasModifier(ModifierType modifier) {
+        return false;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBinaryExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBinaryExpressionMixin.java
new file mode 100644
index 00000000..1663d3bb
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBinaryExpressionMixin.java
@@ -0,0 +1,83 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSBinaryExpression;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.PsiComment;
+import consulo.language.psi.PsiWhiteSpace;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript binary expressions and assignment expressions.
+ * Implements JSBinaryExpression (JSAssignmentExpression extends it with no additional methods).
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptBinaryExpressionMixin extends TypeScriptExpressionMixin implements JSBinaryExpression {
+    public TypeScriptBinaryExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSBinaryExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSBinaryExpression ---
+
+    @RequiredReadAction
+    @Override
+    public JSExpression getLOperand() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSExpression getROperand() {
+        JSExpression left = getLOperand();
+        if (left == null) {
+            return null;
+        }
+        for (PsiElement child = left.getNextSibling(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public PsiElement getOperationElement() {
+        JSExpression left = getLOperand();
+        if (left == null) {
+            return null;
+        }
+        for (PsiElement child = left.getNextSibling(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression) {
+                break;
+            }
+            if (!(child instanceof PsiWhiteSpace) && !(child instanceof PsiComment)) {
+                return child;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBlockStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBlockStatementMixin.java
new file mode 100644
index 00000000..f68ed289
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBlockStatementMixin.java
@@ -0,0 +1,40 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSBlockStatement;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+
+/**
+ * Mixin for TypeScript block statements.
+ * Extends TypeScriptStatementMixin for JSStatement methods, implements JSBlockStatement.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptBlockStatementMixin extends TypeScriptStatementMixin implements JSBlockStatement {
+    public TypeScriptBlockStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSBlock(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSBlockStatement ---
+
+    @Override
+    public JSStatement[] getStatements() {
+        JSStatement[] children = PsiTreeUtil.getChildrenOfType(this, JSStatement.class);
+        return children != null ? children : JSStatement.EMPTY;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBreakStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBreakStatementMixin.java
new file mode 100644
index 00000000..2293e6ec
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptBreakStatementMixin.java
@@ -0,0 +1,47 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSBreakStatement;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptBreakStatementMixin extends TypeScriptStatementMixin implements JSBreakStatement {
+    public TypeScriptBreakStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSBreakStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public String getLabel() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getText() : null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getStatementToBreak() {
+        // Would require walking up the tree to find enclosing breakable statement
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCallExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCallExpressionMixin.java
new file mode 100644
index 00000000..728327cc
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCallExpressionMixin.java
@@ -0,0 +1,55 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSArgumentList;
+import com.intellij.lang.javascript.psi.JSCallExpression;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript call expressions and new expressions.
+ * JSNewExpression extends JSCallExpression with no additional methods.
+ *
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptCallExpressionMixin extends TypeScriptExpressionMixin implements JSCallExpression {
+    public TypeScriptCallExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSCallExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getMethodExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSArgumentList getArgumentList() {
+        return PsiTreeUtil.getChildOfType(this, JSArgumentList.class);
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCaseClauseMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCaseClauseMixin.java
new file mode 100644
index 00000000..9ef89823
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCaseClauseMixin.java
@@ -0,0 +1,63 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSCaseClause;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.typescript.language.impl.psi.TypeScriptElementImpl;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptCaseClauseMixin extends TypeScriptElementImpl implements JSCaseClause {
+    public TypeScriptCaseClauseMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSCaseClause(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isDefault() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child.getText().equals("default")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getCaseExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public JSStatement[] getStatements() {
+        JSStatement[] result = PsiTreeUtil.getChildrenOfType(this, JSStatement.class);
+        return result != null ? result : JSStatement.EMPTY;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCatchBlockMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCatchBlockMixin.java
new file mode 100644
index 00000000..0aa4cbed
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptCatchBlockMixin.java
@@ -0,0 +1,52 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSCatchBlock;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSParameter;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.typescript.language.impl.psi.TypeScriptElementImpl;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptCatchBlockMixin extends TypeScriptElementImpl implements JSCatchBlock {
+    public TypeScriptCatchBlockMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSCatchBlock(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSParameter getParameter() {
+        return PsiTreeUtil.getChildOfType(this, JSParameter.class);
+    }
+
+    @Nullable
+    @Override
+    public JSStatement getStatement() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSStatement stmt) {
+                return stmt;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptClassMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptClassMixin.java
new file mode 100644
index 00000000..24326348
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptClassMixin.java
@@ -0,0 +1,150 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.psi.stubs.JSClassStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.impl.psi.stub.StubBasedPsiElementBase;
+import consulo.language.psi.stub.IStubElementType;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript class declarations.
+ * Extends StubBasedPsiElementBase to satisfy JSClass's StubBasedPsiElement contract.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptClassMixin extends StubBasedPsiElementBase<JSClassStub> implements JSClass {
+    public TypeScriptClassMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public IStubElementType getElementType() {
+        JSClassStub stub = getStub();
+        if (stub != null) {
+            return stub.getStubType();
+        }
+        return null;
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSClass(this);
+        }
+        else {
+            visitor.visitElement(this);
+        }
+    }
+
+    // --- JSClass ---
+
+    @Nullable
+    @Override
+    public JSReferenceList getExtendsList() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JSReferenceList getImplementsList() {
+        return null;
+    }
+
+    @Override
+    public boolean isInterface() {
+        return false;
+    }
+
+    @Override
+    public JSClass[] getSuperClasses() {
+        return JSClass.EMPTY_ARRAY;
+    }
+
+    @Override
+    public JSFunction[] getFunctions() {
+        return JSFunction.EMPTY_ARRAY;
+    }
+
+    @Override
+    public JSVariable[] getFields() {
+        return JSVariable.EMPTY_ARRAY;
+    }
+
+    @Nullable
+    @Override
+    public JSFunction findFunctionByName(String name) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JSFunction findFunctionByNameAndKind(String name, JSFunction.FunctionKind kind) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JSVariable findFieldByName(String name) {
+        return null;
+    }
+
+    @Override
+    public JSClass[] getSupers() {
+        return JSClass.EMPTY_ARRAY;
+    }
+
+    @Override
+    public JSClass[] getImplementedInterfaces() {
+        return JSClass.EMPTY_ARRAY;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
+
+    // --- JSQualifiedNamedElement ---
+
+    @RequiredReadAction
+    @Override
+    public String getQualifiedName() {
+        return getName();
+    }
+
+    // --- JSNamedElement / PsiNamedElement / PsiNameIdentifierOwner ---
+
+    @RequiredReadAction
+    @Override
+    public String getName() {
+        PsiElement id = getNameIdentifier();
+        return id != null ? id.getText() : null;
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) {
+        return this;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getPsi() : null;
+    }
+
+    // --- JSAttributeListOwner ---
+
+    @Nullable
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptConditionalExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptConditionalExpressionMixin.java
new file mode 100644
index 00000000..def62a45
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptConditionalExpressionMixin.java
@@ -0,0 +1,75 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSConditionalExpression;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptConditionalExpressionMixin extends TypeScriptExpressionMixin implements JSConditionalExpression {
+    public TypeScriptConditionalExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSConditionalExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getCondition() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getThen() {
+        int count = 0;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression) {
+                count++;
+                if (count == 2) {
+                    return (JSExpression) child;
+                }
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getElse() {
+        int count = 0;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression) {
+                count++;
+                if (count == 3) {
+                    return (JSExpression) child;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptContinueStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptContinueStatementMixin.java
new file mode 100644
index 00000000..f6e6b8c2
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptContinueStatementMixin.java
@@ -0,0 +1,46 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSContinueStatement;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptContinueStatementMixin extends TypeScriptStatementMixin implements JSContinueStatement {
+    public TypeScriptContinueStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSContinueStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @Nullable
+    @Override
+    public String getLabel() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getText() : null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getStatementToContinue() {
+        // Would require walking up the tree to find enclosing loop statement
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptDoWhileStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptDoWhileStatementMixin.java
new file mode 100644
index 00000000..c75c06a1
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptDoWhileStatementMixin.java
@@ -0,0 +1,63 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSDoWhileStatement;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptDoWhileStatementMixin extends TypeScriptStatementMixin implements JSDoWhileStatement {
+    public TypeScriptDoWhileStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSDoWhileStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getCondition() {
+        // In do-while, condition is after the 'while' keyword
+        // do statement while ( expression ) ;
+        // Find the last JSExpression child
+        JSExpression last = null;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                last = expr;
+            }
+        }
+        return last;
+    }
+
+    // --- JSLoopStatement ---
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getBody() {
+        // In do-while, body is the first statement child
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSStatement stmt) {
+                return stmt;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptExpressionMixin.java
new file mode 100644
index 00000000..5dbe0fe4
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptExpressionMixin.java
@@ -0,0 +1,41 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.typescript.language.impl.psi.TypeScriptElementImpl;
+import jakarta.annotation.Nonnull;
+
+/**
+ * Base mixin for all TypeScript expression PSI elements.
+ * Provides default implementations for JSExpression methods.
+ */
+public class TypeScriptExpressionMixin extends TypeScriptElementImpl implements JSExpression {
+    public TypeScriptExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @Override
+    public JSExpression replace(JSExpression other) {
+        return (JSExpression) super.replace(other);
+    }
+
+    @RequiredReadAction
+    @Override
+    public JavaScriptType getType() {
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptExpressionStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptExpressionStatementMixin.java
new file mode 100644
index 00000000..a2171833
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptExpressionStatementMixin.java
@@ -0,0 +1,43 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSExpressionStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptExpressionStatementMixin extends TypeScriptStatementMixin implements JSExpressionStatement {
+    public TypeScriptExpressionStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSExpressionStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptForInStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptForInStatementMixin.java
new file mode 100644
index 00000000..4435a15e
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptForInStatementMixin.java
@@ -0,0 +1,87 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptForInStatementMixin extends TypeScriptStatementMixin implements JSForInStatement {
+    public TypeScriptForInStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSForInStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSForInStatement ---
+
+    @Nullable
+    @Override
+    public JSVarStatement getDeclarationStatement() {
+        return PsiTreeUtil.getChildOfType(this, JSVarStatement.class);
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getVariableExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getCollectionExpression() {
+        // The expression after 'in' keyword
+        JSExpression first = null;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                if (first != null) {
+                    return expr;
+                }
+                first = expr;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean isForEach() {
+        return false;
+    }
+
+    // --- JSLoopStatement ---
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getBody() {
+        JSStatement last = null;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSStatement stmt) {
+                last = stmt;
+            }
+        }
+        return last;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptForStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptForStatementMixin.java
new file mode 100644
index 00000000..7eff402f
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptForStatementMixin.java
@@ -0,0 +1,102 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptForStatementMixin extends TypeScriptStatementMixin implements JSForStatement {
+    public TypeScriptForStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSForStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSForStatement ---
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSVarStatement getVarDeclaration() {
+        return PsiTreeUtil.getChildOfType(this, JSVarStatement.class);
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getInitialization() {
+        // The first expression inside '(' ... ';'
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getCondition() {
+        // The second expression (after first ';')
+        int semicolons = 0;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child.getText().equals(";")) {
+                semicolons++;
+            }
+            if (semicolons == 1 && child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getUpdate() {
+        // The third expression (after second ';')
+        int semicolons = 0;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child.getText().equals(";")) {
+                semicolons++;
+            }
+            if (semicolons == 2 && child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    // --- JSLoopStatement ---
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getBody() {
+        // The last statement child is the body
+        JSStatement last = null;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSStatement stmt) {
+                last = stmt;
+            }
+        }
+        return last;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptFunctionExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptFunctionExpressionMixin.java
new file mode 100644
index 00000000..7295a89c
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptFunctionExpressionMixin.java
@@ -0,0 +1,128 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for arrow_function and function_expression rules.
+ * Extends TypeScriptExpressionMixin (since these are expressions)
+ * and implements JSFunction (since JSFunctionExpression/JavaScriptLambdaExpression extend JSFunction).
+ *
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptFunctionExpressionMixin extends TypeScriptExpressionMixin implements JSFunction {
+    public TypeScriptFunctionExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            // At runtime, 'this' will be the generated impl which implements JSFunctionExpression
+            jsVisitor.visitJSExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSFunction ---
+
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public JSParameterList getParameterList() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSParameterList paramList) {
+                return paramList;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSSourceElement[] getBody() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSBlockStatement block) {
+                return new JSSourceElement[]{block};
+            }
+        }
+        // Arrow functions may have an expression body instead of a block
+        // e.g. (x) => x + 1
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSSourceElement sourceElem && !(child instanceof JSParameterList)) {
+                return new JSSourceElement[]{sourceElem};
+            }
+        }
+        return JSSourceElement.EMPTY_ARRAY;
+    }
+
+    @Override
+    public JavaScriptType getReturnType() {
+        return null;
+    }
+
+    @Override
+    public String getReturnTypeString() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JavaScriptTypeElement getReturnTypeElement() {
+        return null;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
+
+    // --- JSQualifiedNamedElement ---
+
+    @RequiredReadAction
+    @Override
+    public String getQualifiedName() {
+        return getName();
+    }
+
+    // --- JSNamedElement / PsiNamedElement / PsiNameIdentifierOwner ---
+
+    @RequiredReadAction
+    @Override
+    public String getName() {
+        PsiElement id = getNameIdentifier();
+        return id != null ? id.getText() : null;
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) {
+        return this;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getPsi() : null;
+    }
+
+    // --- JSAttributeListOwner ---
+
+    @Nullable
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptFunctionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptFunctionMixin.java
new file mode 100644
index 00000000..7468d5eb
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptFunctionMixin.java
@@ -0,0 +1,120 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.typescript.language.impl.psi.TypeScriptElementImpl;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript function declarations.
+ * Implements JSFunction to integrate with JavaScript PSI infrastructure.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptFunctionMixin extends TypeScriptElementImpl implements JSFunction {
+    public TypeScriptFunctionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSFunctionDeclaration(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSFunction ---
+
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public JSParameterList getParameterList() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSParameterList paramList) {
+                return paramList;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSSourceElement[] getBody() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSBlockStatement block) {
+                return new JSSourceElement[]{block};
+            }
+        }
+        return JSSourceElement.EMPTY_ARRAY;
+    }
+
+    @Override
+    public JavaScriptType getReturnType() {
+        return null;
+    }
+
+    @Override
+    public String getReturnTypeString() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JavaScriptTypeElement getReturnTypeElement() {
+        return null;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
+
+    // --- JSQualifiedNamedElement ---
+
+    @RequiredReadAction
+    @Override
+    public String getQualifiedName() {
+        return getName();
+    }
+
+    // --- JSNamedElement / PsiNamedElement / PsiNameIdentifierOwner ---
+
+    @RequiredReadAction
+    @Override
+    public String getName() {
+        PsiElement id = getNameIdentifier();
+        return id != null ? id.getText() : null;
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) {
+        return this;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getPsi() : null;
+    }
+
+    // --- JSAttributeListOwner ---
+
+    @Nullable
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptIfStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptIfStatementMixin.java
new file mode 100644
index 00000000..4306df0e
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptIfStatementMixin.java
@@ -0,0 +1,88 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSIfStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptIfStatementMixin extends TypeScriptStatementMixin implements JSIfStatement {
+    public TypeScriptIfStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSIfStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getCondition() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getThen() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSStatement stmt) {
+                return stmt;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getElse() {
+        boolean foundFirst = false;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSStatement) {
+                if (foundFirst) {
+                    return (JSStatement) child;
+                }
+                foundFirst = true;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void setThen(JSStatement statement) throws IncorrectOperationException {
+        throw new IncorrectOperationException("Not yet implemented");
+    }
+
+    @Override
+    public void setElse(JSStatement statement) throws IncorrectOperationException {
+        throw new IncorrectOperationException("Not yet implemented");
+    }
+
+    @Override
+    public void setCondition(JSExpression expr) throws IncorrectOperationException {
+        throw new IncorrectOperationException("Not yet implemented");
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptIndexedPropertyAccessExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptIndexedPropertyAccessExpressionMixin.java
new file mode 100644
index 00000000..9a8e31ff
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptIndexedPropertyAccessExpressionMixin.java
@@ -0,0 +1,60 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSIndexedPropertyAccessExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptIndexedPropertyAccessExpressionMixin extends TypeScriptExpressionMixin implements JSIndexedPropertyAccessExpression {
+    public TypeScriptIndexedPropertyAccessExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSIndexedPropertyAccessExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getQualifier() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getIndexExpression() {
+        // The expression inside the brackets (second expression child)
+        int count = 0;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression) {
+                count++;
+                if (count == 2) {
+                    return (JSExpression) child;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptInterfaceMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptInterfaceMixin.java
new file mode 100644
index 00000000..3dc737b2
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptInterfaceMixin.java
@@ -0,0 +1,150 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.psi.stubs.JSClassStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.impl.psi.stub.StubBasedPsiElementBase;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.stub.IStubElementType;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript interface declarations.
+ * Implements JSClass with isInterface() returning true.
+ *
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptInterfaceMixin extends StubBasedPsiElementBase<JSClassStub> implements JSClass {
+    public TypeScriptInterfaceMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public IStubElementType getElementType() {
+        JSClassStub stub = getStub();
+        if (stub != null) {
+            return stub.getStubType();
+        }
+        return null;
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSClass(this);
+        }
+        else {
+            visitor.visitElement(this);
+        }
+    }
+
+    // --- JSClass ---
+
+    @Nullable
+    @Override
+    public JSReferenceList getExtendsList() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JSReferenceList getImplementsList() {
+        return null;
+    }
+
+    @Override
+    public boolean isInterface() {
+        return true;
+    }
+
+    @Override
+    public JSClass[] getSuperClasses() {
+        return JSClass.EMPTY_ARRAY;
+    }
+
+    @Override
+    public JSFunction[] getFunctions() {
+        return JSFunction.EMPTY_ARRAY;
+    }
+
+    @Override
+    public JSVariable[] getFields() {
+        return JSVariable.EMPTY_ARRAY;
+    }
+
+    @Nullable
+    @Override
+    public JSFunction findFunctionByName(String name) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JSFunction findFunctionByNameAndKind(String name, JSFunction.FunctionKind kind) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JSVariable findFieldByName(String name) {
+        return null;
+    }
+
+    @Override
+    public JSClass[] getSupers() {
+        return JSClass.EMPTY_ARRAY;
+    }
+
+    @Override
+    public JSClass[] getImplementedInterfaces() {
+        return JSClass.EMPTY_ARRAY;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
+
+    // --- JSQualifiedNamedElement ---
+
+    @RequiredReadAction
+    @Override
+    public String getQualifiedName() {
+        return getName();
+    }
+
+    // --- JSNamedElement / PsiNamedElement / PsiNameIdentifierOwner ---
+
+    @RequiredReadAction
+    @Override
+    public String getName() {
+        PsiElement id = getNameIdentifier();
+        return id != null ? id.getText() : null;
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) {
+        return this;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getPsi() : null;
+    }
+
+    // --- JSAttributeListOwner ---
+
+    @Nullable
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptLabeledStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptLabeledStatementMixin.java
new file mode 100644
index 00000000..1db5e989
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptLabeledStatementMixin.java
@@ -0,0 +1,87 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSLabeledStatement;
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptLabeledStatementMixin extends TypeScriptStatementMixin implements JSLabeledStatement {
+    public TypeScriptLabeledStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSLabeledStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public String getLabel() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getText() : null;
+    }
+
+    @Deprecated
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getLabelIdentifier() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getPsi() : null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getStatement() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSStatement stmt) {
+                return stmt;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public JSStatement unlabel() {
+        throw new IncorrectOperationException("Not yet implemented");
+    }
+
+    // --- PsiNameIdentifierOwner ---
+
+    @RequiredReadAction
+    @Override
+    public String getName() {
+        return getLabel();
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) {
+        return this;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        return getLabelIdentifier();
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptObjectLiteralExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptObjectLiteralExpressionMixin.java
new file mode 100644
index 00000000..06c5d42f
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptObjectLiteralExpressionMixin.java
@@ -0,0 +1,37 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
+import com.intellij.lang.javascript.psi.JSProperty;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptObjectLiteralExpressionMixin extends TypeScriptExpressionMixin implements JSObjectLiteralExpression {
+    public TypeScriptObjectLiteralExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSObjectLiteralExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSProperty[] getProperties() {
+        JSProperty[] result = PsiTreeUtil.getChildrenOfType(this, JSProperty.class);
+        return result != null ? result : new JSProperty[0];
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterListMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterListMixin.java
new file mode 100644
index 00000000..0f82f66d
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterListMixin.java
@@ -0,0 +1,52 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSParameter;
+import com.intellij.lang.javascript.psi.JSParameterList;
+import com.intellij.lang.javascript.psi.stubs.JSParameterListStub;
+import consulo.language.ast.ASTNode;
+import consulo.language.impl.psi.stub.StubBasedPsiElementBase;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+
+/**
+ * Mixin for TypeScript parameter lists.
+ * Implements JSParameterList to integrate with JavaScript PSI infrastructure.
+ *
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptParameterListMixin extends StubBasedPsiElementBase<JSParameterListStub> implements JSParameterList {
+    public TypeScriptParameterListMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public IStubElementType getElementType() {
+        JSParameterListStub stub = getStub();
+        if (stub != null) {
+            return stub.getStubType();
+        }
+        return null;
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSParameterList(this);
+        }
+        else {
+            visitor.visitElement(this);
+        }
+    }
+
+    // --- JSParameterList ---
+
+    @Override
+    public JSParameter[] getParameters() {
+        JSParameter[] params = PsiTreeUtil.getChildrenOfType(this, JSParameter.class);
+        return params != null ? params : JSParameter.EMPTY_ARRAY;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterMixin.java
new file mode 100644
index 00000000..eebf77ee
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterMixin.java
@@ -0,0 +1,63 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSFunction;
+import com.intellij.lang.javascript.psi.JSParameter;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript parameters.
+ * Extends TypeScriptVariableMixin since JSParameter extends JSVariable.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptParameterMixin extends TypeScriptVariableMixin implements JSParameter {
+    public TypeScriptParameterMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSParameter(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSParameter ---
+
+    @Override
+    public JSFunction getDeclaringFunction() {
+        return PsiTreeUtil.getParentOfType(this, JSFunction.class);
+    }
+
+    @RequiredReadAction
+    @Override
+    public boolean isRest() {
+        return getRestElement() != null;
+    }
+
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public PsiElement getRestElement() {
+        ASTNode dotDotDot = getNode().findChildByType(JSTokenTypes.DOT_DOT_DOT);
+        return dotDotDot != null ? dotDotDot.getPsi() : null;
+    }
+
+    @Override
+    public boolean isOptional() {
+        ASTNode quest = getNode().findChildByType(JSTokenTypes.QUEST);
+        return quest != null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParenthesizedExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParenthesizedExpressionMixin.java
new file mode 100644
index 00000000..79da1273
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParenthesizedExpressionMixin.java
@@ -0,0 +1,43 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSParenthesizedExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptParenthesizedExpressionMixin extends TypeScriptExpressionMixin implements JSParenthesizedExpression {
+    public TypeScriptParenthesizedExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSParenthesizedExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getInnerExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPostfixExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPostfixExpressionMixin.java
new file mode 100644
index 00000000..e434ef57
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPostfixExpressionMixin.java
@@ -0,0 +1,61 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSPostfixExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.PsiComment;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptPostfixExpressionMixin extends TypeScriptExpressionMixin implements JSPostfixExpression {
+    public TypeScriptPostfixExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSPostfixExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @Nullable
+    @Override
+    public JSExpression getExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public IElementType getOperationSign() {
+        // In postfix expression, the operator is after the expression
+        PsiElement lastSignificant = null;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (!(child instanceof PsiWhiteSpace) && !(child instanceof PsiComment)) {
+                lastSignificant = child;
+            }
+        }
+        if (lastSignificant != null && !(lastSignificant instanceof JSExpression)) {
+            return lastSignificant.getNode().getElementType();
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPrefixExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPrefixExpressionMixin.java
new file mode 100644
index 00000000..9847fb2d
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPrefixExpressionMixin.java
@@ -0,0 +1,68 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSPrefixExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.PsiWhiteSpace;
+import consulo.language.psi.PsiComment;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptPrefixExpressionMixin extends TypeScriptExpressionMixin implements JSPrefixExpression {
+    public TypeScriptPrefixExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSPrefixExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @Nullable
+    @Override
+    public JSExpression getExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public IElementType getOperationSign() {
+        PsiElement op = getOperatorElement();
+        return op != null ? op.getNode().getElementType() : null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getOperatorElement() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression) {
+                break;
+            }
+            if (!(child instanceof PsiWhiteSpace) && !(child instanceof PsiComment)) {
+                return child;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPropertyMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPropertyMixin.java
new file mode 100644
index 00000000..2cdb1ca4
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptPropertyMixin.java
@@ -0,0 +1,107 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSProperty;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.psi.JSComputedName;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.typescript.language.impl.psi.TypeScriptElementImpl;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptPropertyMixin extends TypeScriptElementImpl implements JSProperty {
+    public TypeScriptPropertyMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSProperty(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSProperty ---
+
+    @Nullable
+    @Override
+    public JSExpression getValue() {
+        // Value is the expression after the colon
+        boolean afterColon = false;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (afterColon && child instanceof JSExpression expr) {
+                return expr;
+            }
+            if (child.getText().equals(":")) {
+                afterColon = true;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public PsiElement getColonElement() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child.getText().equals(":")) {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JSComputedName getComputedName() {
+        return PsiTreeUtil.getChildOfType(this, JSComputedName.class);
+    }
+
+    @Override
+    public JavaScriptType getType() {
+        return null;
+    }
+
+    // --- JSNamedElement / PsiNamedElement / PsiNameIdentifierOwner ---
+
+    @RequiredReadAction
+    @Override
+    public String getName() {
+        PsiElement id = getNameIdentifier();
+        return id != null ? id.getText() : null;
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) {
+        return this;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        if (idNode != null) {
+            return idNode.getPsi();
+        }
+        // Could also be a string literal property name
+        ASTNode stringNode = getNode().findChildByType(JSTokenTypes.STRING_LITERAL);
+        if (stringNode != null) {
+            return stringNode.getPsi();
+        }
+        ASTNode numNode = getNode().findChildByType(JSTokenTypes.NUMERIC_LITERAL);
+        return numNode != null ? numNode.getPsi() : null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReferenceExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReferenceExpressionMixin.java
new file mode 100644
index 00000000..86d0c13f
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReferenceExpressionMixin.java
@@ -0,0 +1,127 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSReferenceExpression;
+import consulo.document.util.TextRange;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.*;
+import consulo.language.util.IncorrectOperationException;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript reference expressions.
+ * Implements JSReferenceExpression (which extends PsiPolyVariantReference).
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptReferenceExpressionMixin extends TypeScriptExpressionMixin implements JSReferenceExpression {
+    public TypeScriptReferenceExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSReferenceExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSReferenceExpression ---
+
+    @Nullable
+    @Override
+    public JSExpression getQualifier() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getReferencedName() {
+        PsiElement nameElement = getReferenceNameElement();
+        return nameElement != null ? nameElement.getText() : null;
+    }
+
+    @Nullable
+    @Override
+    public PsiElement getReferenceNameElement() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getPsi() : null;
+    }
+
+    @Override
+    public boolean shouldCheckReferences() {
+        return false;
+    }
+
+    // --- PsiPolyVariantReference ---
+
+    @Nonnull
+    @Override
+    public ResolveResult[] multiResolve(boolean incompleteCode) {
+        return ResolveResult.EMPTY_ARRAY;
+    }
+
+    // --- PsiReference ---
+
+    @Nonnull
+    @Override
+    public PsiElement getElement() {
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    public TextRange getRangeInElement() {
+        return TextRange.from(0, getTextLength());
+    }
+
+    @Nullable
+    @Override
+    public PsiElement resolve() {
+        ResolveResult[] results = multiResolve(false);
+        for (ResolveResult result : results) {
+            if (result.isValidResult()) {
+                return result.getElement();
+            }
+        }
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public String getCanonicalText() {
+        return getText();
+    }
+
+    @Override
+    public PsiElement handleElementRename(@Nonnull String newElementName) throws IncorrectOperationException {
+        return this;
+    }
+
+    @Override
+    public PsiElement bindToElement(@Nonnull PsiElement element) throws IncorrectOperationException {
+        return this;
+    }
+
+    @Override
+    public boolean isReferenceTo(@Nonnull PsiElement element) {
+        return false;
+    }
+
+    @Override
+    public boolean isSoft() {
+        return false;
+    }
+
+    @Override
+    public PsiReference getReference() {
+        return this;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReferenceListMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReferenceListMixin.java
new file mode 100644
index 00000000..9aab1145
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReferenceListMixin.java
@@ -0,0 +1,73 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.psi.stubs.JSReferenceListStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.ast.IElementType;
+import consulo.language.impl.psi.stub.StubBasedPsiElementBase;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+
+/**
+ * Mixin for extends_list and implements_list rules.
+ * JSReferenceList extends StubBasedPsiElement.
+ *
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptReferenceListMixin extends StubBasedPsiElementBase<JSReferenceListStub> implements JSReferenceList {
+    public TypeScriptReferenceListMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public IStubElementType getElementType() {
+        JSReferenceListStub stub = getStub();
+        if (stub != null) {
+            return stub.getStubType();
+        }
+        return null;
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSReferenceList(this);
+        }
+        else {
+            visitor.visitElement(this);
+        }
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSReferenceExpression[] getExpressions() {
+        JSReferenceExpression[] result = PsiTreeUtil.getChildrenOfType(this, JSReferenceExpression.class);
+        return result != null ? result : new JSReferenceExpression[0];
+    }
+
+    @RequiredReadAction
+    @Override
+    public String[] getReferenceTexts() {
+        JSReferenceExpression[] exprs = getExpressions();
+        String[] texts = new String[exprs.length];
+        for (int i = 0; i < exprs.length; i++) {
+            texts[i] = exprs[i].getText();
+        }
+        return texts;
+    }
+
+    @Override
+    public JSClass[] getReferencedClasses() {
+        return new JSClass[0];
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ":" + getNode().getElementType();
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReturnStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReturnStatementMixin.java
new file mode 100644
index 00000000..969dd63b
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptReturnStatementMixin.java
@@ -0,0 +1,43 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSReturnStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptReturnStatementMixin extends TypeScriptStatementMixin implements JSReturnStatement {
+    public TypeScriptReturnStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSReturnStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptSpreadExpressionMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptSpreadExpressionMixin.java
new file mode 100644
index 00000000..2a0fa862
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptSpreadExpressionMixin.java
@@ -0,0 +1,44 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSSpreadExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptSpreadExpressionMixin extends TypeScriptExpressionMixin implements JSSpreadExpression {
+    public TypeScriptSpreadExpressionMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            // JSSpreadExpression doesn't have its own visit method; use visitJSExpression
+            jsVisitor.visitJSExpression(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getInnerExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptStatementMixin.java
new file mode 100644
index 00000000..1083c473
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptStatementMixin.java
@@ -0,0 +1,88 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSStatement;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.util.IncorrectOperationException;
+import consulo.typescript.language.impl.psi.TypeScriptElementImpl;
+import consulo.typescript.language.psi.*;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
+/**
+ * Base mixin for all TypeScript statement PSI elements.
+ * Provides default implementations for JSStatement methods and
+ * default null getters for the declaration alternatives in TypeScriptStatement.
+ */
+public class TypeScriptStatementMixin extends TypeScriptElementImpl implements JSStatement {
+    public TypeScriptStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @RequiredWriteAction
+    @Override
+    public JSStatement addStatementBefore(JSStatement toAdd) throws IncorrectOperationException {
+        return (JSStatement) getParent().addBefore(toAdd, this);
+    }
+
+    @RequiredWriteAction
+    @Override
+    public JSStatement addStatementAfter(JSStatement toAdd) throws IncorrectOperationException {
+        return (JSStatement) getParent().addAfter(toAdd, this);
+    }
+
+    @RequiredWriteAction
+    @Override
+    public JSStatement replace(JSStatement with) {
+        return (JSStatement) super.replace(with);
+    }
+
+    // --- Default null getters for declaration alternatives in TypeScriptStatement ---
+    // These are overridden with real implementations in TypeScriptStatementImpl (generated).
+    // Child statement Impls (if_statement, for_statement, etc.) inherit these defaults.
+
+    @Nullable
+    public TypeScriptAmbientDeclaration getAmbientDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptClassDeclaration getClassDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptEnumDeclaration getEnumDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptExportDeclaration getExportDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptFunctionDeclaration getFunctionDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptImportDeclaration getImportDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptInterfaceDeclaration getInterfaceDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptNamespaceDeclaration getNamespaceDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptTypeAliasDeclaration getTypeAliasDeclaration() {
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptSwitchStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptSwitchStatementMixin.java
new file mode 100644
index 00000000..35173f69
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptSwitchStatementMixin.java
@@ -0,0 +1,52 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSCaseClause;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSSwitchStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptSwitchStatementMixin extends TypeScriptStatementMixin implements JSSwitchStatement {
+    public TypeScriptSwitchStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSSwitchStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getSwitchExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSCaseClause[] getCaseClauses() {
+        JSCaseClause[] result = PsiTreeUtil.getChildrenOfType(this, JSCaseClause.class);
+        return result != null ? result : new JSCaseClause[0];
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptThrowStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptThrowStatementMixin.java
new file mode 100644
index 00000000..c87681a5
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptThrowStatementMixin.java
@@ -0,0 +1,43 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSThrowStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptThrowStatementMixin extends TypeScriptStatementMixin implements JSThrowStatement {
+    public TypeScriptThrowStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSThrowStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getExpression() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptTryStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptTryStatementMixin.java
new file mode 100644
index 00000000..2fb2945a
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptTryStatementMixin.java
@@ -0,0 +1,76 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.util.PsiTreeUtil;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptTryStatementMixin extends TypeScriptStatementMixin implements JSTryStatement {
+    public TypeScriptTryStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSTryStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getStatement() {
+        // The first block statement (try body)
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSStatement stmt && !(child instanceof JSCatchBlock)) {
+                return stmt;
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public JSCatchBlock[] getAllCatchBlocks() {
+        JSCatchBlock[] result = PsiTreeUtil.getChildrenOfType(this, JSCatchBlock.class);
+        return result != null ? result : JSCatchBlock.EMPTY_ARRAY;
+    }
+
+    @Deprecated
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSCatchBlock getCatchBlock() {
+        JSCatchBlock[] blocks = getAllCatchBlocks();
+        return blocks.length > 0 ? blocks[0] : null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getFinallyStatement() {
+        // The statement after 'finally' keyword
+        boolean foundFinally = false;
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (foundFinally && child instanceof JSStatement stmt) {
+                return stmt;
+            }
+            if (child.getText().equals("finally")) {
+                foundFinally = true;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVarStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVarStatementMixin.java
new file mode 100644
index 00000000..a71de128
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVarStatementMixin.java
@@ -0,0 +1,137 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.*;
+import com.intellij.lang.javascript.psi.stubs.JSVarStatementStub;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.access.RequiredWriteAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.impl.psi.stub.StubBasedPsiElementBase;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.psi.stub.IStubElementType;
+import consulo.language.psi.util.PsiTreeUtil;
+import consulo.language.util.IncorrectOperationException;
+import consulo.typescript.language.psi.*;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript var/let/const statements.
+ * Extends StubBasedPsiElementBase to satisfy JSVarStatement's StubBasedPsiElement contract.
+ * Implements JSStatement methods directly (can't extend TypeScriptStatementMixin due to single inheritance).
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptVarStatementMixin extends StubBasedPsiElementBase<JSVarStatementStub> implements JSVarStatement {
+    public TypeScriptVarStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public IStubElementType getElementType() {
+        JSVarStatementStub stub = getStub();
+        if (stub != null) {
+            return stub.getStubType();
+        }
+        return null;
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSVarStatement(this);
+        }
+        else {
+            visitor.visitElement(this);
+        }
+    }
+
+    // --- JSVarStatement ---
+
+    @RequiredReadAction
+    @Override
+    public JSVariable[] getVariables() {
+        JSVariable[] vars = PsiTreeUtil.getChildrenOfType(this, JSVariable.class);
+        return vars != null ? vars : JSVariable.EMPTY_ARRAY;
+    }
+
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public JSDestructuringElement getDestructuringElement() {
+        return null;
+    }
+
+    @Override
+    public void declareVariable(String name, JSExpression initializer) {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    // --- JSStatement ---
+
+    @RequiredWriteAction
+    @Override
+    public JSStatement addStatementBefore(JSStatement toAdd) throws IncorrectOperationException {
+        return (JSStatement) getParent().addBefore(toAdd, this);
+    }
+
+    @RequiredWriteAction
+    @Override
+    public JSStatement addStatementAfter(JSStatement toAdd) throws IncorrectOperationException {
+        return (JSStatement) getParent().addAfter(toAdd, this);
+    }
+
+    @RequiredWriteAction
+    @Override
+    public JSStatement replace(JSStatement with) {
+        return (JSStatement) super.replace(with);
+    }
+
+    // --- Default null getters for TypeScriptStatement declaration alternatives ---
+    // (Needed because var_statement extends statement and inherits these from generated interface)
+
+    @Nullable
+    public TypeScriptAmbientDeclaration getAmbientDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptClassDeclaration getClassDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptEnumDeclaration getEnumDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptExportDeclaration getExportDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptFunctionDeclaration getFunctionDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptImportDeclaration getImportDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptInterfaceDeclaration getInterfaceDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptNamespaceDeclaration getNamespaceDeclaration() {
+        return null;
+    }
+
+    @Nullable
+    public TypeScriptTypeAliasDeclaration getTypeAliasDeclaration() {
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVariableMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVariableMixin.java
new file mode 100644
index 00000000..dada5de7
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVariableMixin.java
@@ -0,0 +1,144 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.psi.*;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.javascript.language.psi.JavaScriptType;
+import consulo.javascript.language.psi.JavaScriptTypeElement;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import consulo.language.util.IncorrectOperationException;
+import consulo.typescript.language.impl.psi.TypeScriptElementImpl;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mixin for TypeScript variable declarations.
+ * Implements JSVariable to integrate with JavaScript PSI infrastructure.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptVariableMixin extends TypeScriptElementImpl implements JSVariable {
+    public TypeScriptVariableMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSVariable(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    // --- JSVariable ---
+
+    @Override
+    public boolean hasInitializer() {
+        return getInitializer() != null;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getInitializer() {
+        ASTNode eq = getNode().findChildByType(JSTokenTypes.EQ);
+        if (eq != null) {
+            for (PsiElement child = eq.getPsi().getNextSibling(); child != null; child = child.getNextSibling()) {
+                if (child instanceof JSExpression expr) {
+                    return expr;
+                }
+            }
+        }
+        return null;
+    }
+
+    @RequiredReadAction
+    @Override
+    public String getInitializerText() {
+        JSExpression init = getInitializer();
+        return init != null ? init.getText() : null;
+    }
+
+    @Override
+    public void setInitializer(JSExpression expr) throws IncorrectOperationException {
+        throw new IncorrectOperationException("Not yet implemented");
+    }
+
+    @RequiredReadAction
+    @Override
+    public JavaScriptType getType() {
+        return null;
+    }
+
+    @Deprecated
+    @Nullable
+    @Override
+    public String getTypeString() {
+        return null;
+    }
+
+    @Nullable
+    @RequiredReadAction
+    @Override
+    public JavaScriptTypeElement getTypeElement() {
+        return null;
+    }
+
+    @Override
+    public boolean isConst() {
+        return false;
+    }
+
+    @Override
+    public boolean isLocal() {
+        return false;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return false;
+    }
+
+    // --- JSQualifiedNamedElement ---
+
+    @RequiredReadAction
+    @Override
+    public String getQualifiedName() {
+        return getName();
+    }
+
+    // --- JSNamedElement / PsiNamedElement / PsiNameIdentifierOwner ---
+
+    @RequiredReadAction
+    @Override
+    public String getName() {
+        PsiElement id = getNameIdentifier();
+        return id != null ? id.getText() : null;
+    }
+
+    @Override
+    public PsiElement setName(@Nonnull String name) {
+        return this;
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public PsiElement getNameIdentifier() {
+        ASTNode idNode = getNode().findChildByType(JSTokenTypes.IDENTIFIER);
+        return idNode != null ? idNode.getPsi() : null;
+    }
+
+    // --- JSAttributeListOwner ---
+
+    @Nullable
+    @Override
+    public JSAttributeList getAttributeList() {
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptWhileStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptWhileStatementMixin.java
new file mode 100644
index 00000000..9230abdc
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptWhileStatementMixin.java
@@ -0,0 +1,58 @@
+package consulo.typescript.language.impl.psi.mixin;
+
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSStatement;
+import com.intellij.lang.javascript.psi.JSWhileStatement;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.language.ast.ASTNode;
+import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiElementVisitor;
+import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-18
+ */
+public class TypeScriptWhileStatementMixin extends TypeScriptStatementMixin implements JSWhileStatement {
+    public TypeScriptWhileStatementMixin(@Nonnull ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void accept(@Nonnull PsiElementVisitor visitor) {
+        if (visitor instanceof JSElementVisitor jsVisitor) {
+            jsVisitor.visitJSWhileStatement(this);
+        }
+        else {
+            super.accept(visitor);
+        }
+    }
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSExpression getCondition() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSExpression expr) {
+                return expr;
+            }
+        }
+        return null;
+    }
+
+    // --- JSLoopStatement ---
+
+    @RequiredReadAction
+    @Nullable
+    @Override
+    public JSStatement getBody() {
+        for (PsiElement child = getFirstChild(); child != null; child = child.getNextSibling()) {
+            if (child instanceof JSStatement stmt) {
+                return stmt;
+            }
+        }
+        return null;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/TypeScriptParserUtil.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/TypeScriptParserUtil.java
new file mode 100644
index 00000000..721ddbdb
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/TypeScriptParserUtil.java
@@ -0,0 +1,180 @@
+package consulo.typescript.language.impl.syntax;
+
+import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.language.ast.IElementType;
+import consulo.language.impl.parser.GeneratedParserUtilBase;
+import consulo.language.parser.PsiBuilder;
+import consulo.typescript.language.psi.TypeScriptTypes;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Custom parser utility for TypeScript contextual keywords.
+ * <p>
+ * TypeScript contextual keywords (interface, type, namespace, declare, etc.)
+ * are emitted as IDENTIFIER by the lexer. This util overrides consumeToken/nextTokenIs
+ * so the parser can match them as keyword tokens when expected by grammar rules,
+ * while still allowing them to be used as identifiers elsewhere.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public class TypeScriptParserUtil extends GeneratedParserUtilBase {
+    /**
+     * Maps contextual keyword token types to their text representation.
+     */
+    private static final Map<IElementType, String> CONTEXTUAL_KEYWORDS = new HashMap<>();
+
+    /**
+     * Set of all contextual keyword token types (for fast IDENTIFIER fallback check).
+     */
+    private static final Set<IElementType> CONTEXTUAL_KEYWORD_SET = new HashSet<>();
+
+    static {
+        register(TypeScriptTypes.INTERFACE_KEYWORD, "interface");
+        register(TypeScriptTypes.TYPE_KEYWORD, "type");
+        register(TypeScriptTypes.NAMESPACE_KEYWORD, "namespace");
+        register(TypeScriptTypes.MODULE_KEYWORD, "module");
+        register(TypeScriptTypes.DECLARE_KEYWORD, "declare");
+        register(TypeScriptTypes.ABSTRACT_KEYWORD, "abstract");
+        register(TypeScriptTypes.ASYNC_KEYWORD, "async");
+        register(TypeScriptTypes.FROM_KEYWORD, "from");
+        register(TypeScriptTypes.AS_KEYWORD, "as");
+        register(TypeScriptTypes.SATISFIES_KEYWORD, "satisfies");
+        register(TypeScriptTypes.KEYOF_KEYWORD, "keyof");
+        register(TypeScriptTypes.INFER_KEYWORD, "infer");
+        register(TypeScriptTypes.READONLY_KEYWORD, "readonly");
+        register(TypeScriptTypes.GET_KEYWORD, "get");
+        register(TypeScriptTypes.SET_KEYWORD, "set");
+        register(TypeScriptTypes.OF_KEYWORD, "of");
+        register(TypeScriptTypes.CONSTRUCTOR_KEYWORD, "constructor");
+        register(TypeScriptTypes.GLOBAL_KEYWORD, "global");
+        register(TypeScriptTypes.OVERRIDE_KEYWORD, "override");
+        register(TypeScriptTypes.PUBLIC_KEYWORD, "public");
+        register(TypeScriptTypes.PRIVATE_KEYWORD, "private");
+        register(TypeScriptTypes.PROTECTED_KEYWORD, "protected");
+        register(TypeScriptTypes.STATIC_KEYWORD, "static");
+        register(TypeScriptTypes.IMPLEMENTS_KEYWORD, "implements");
+    }
+
+    private static void register(IElementType token, String text) {
+        CONTEXTUAL_KEYWORDS.put(token, text);
+        CONTEXTUAL_KEYWORD_SET.add(token);
+    }
+
+    /**
+     * Checks if the given token type is a contextual keyword.
+     */
+    private static boolean isContextualKeyword(IElementType token) {
+        return CONTEXTUAL_KEYWORDS.containsKey(token);
+    }
+
+    /**
+     * Checks if the current lexer token matches the expected contextual keyword.
+     */
+    private static boolean isContextualKeywordMatch(PsiBuilder b, IElementType token) {
+        String expectedText = CONTEXTUAL_KEYWORDS.get(token);
+        if (expectedText == null) {
+            return false;
+        }
+        // Match IDENTIFIER with the right text, or already-remapped token
+        IElementType current = b.getTokenType();
+        if (current == token) {
+            return true; // already remapped from a previous attempt
+        }
+        return current == JSTokenTypes.IDENTIFIER && expectedText.equals(b.getTokenText());
+    }
+
+    /**
+     * Override consumeToken to handle contextual keywords and IDENTIFIER fallback.
+     */
+    public static boolean consumeToken(PsiBuilder b, IElementType token) {
+        // Case 1: Parser expects a contextual keyword
+        if (isContextualKeyword(token)) {
+            if (isContextualKeywordMatch(b, token)) {
+                b.remapCurrentToken(token);
+                b.advanceLexer();
+                return true;
+            }
+            return false;
+        }
+
+        // Case 2: Parser expects IDENTIFIER - also match remapped contextual keywords
+        if (token == JSTokenTypes.IDENTIFIER) {
+            IElementType current = b.getTokenType();
+            if (current == JSTokenTypes.IDENTIFIER || CONTEXTUAL_KEYWORD_SET.contains(current)) {
+                b.advanceLexer();
+                return true;
+            }
+            return false;
+        }
+
+        // Case 3: Regular token - delegate to base
+        return GeneratedParserUtilBase.consumeToken(b, token);
+    }
+
+    /**
+     * Override consumeTokens to ensure contextual keyword handling is used for each token.
+     * The base class calls its own consumeToken via invokestatic, bypassing our override.
+     */
+    public static boolean consumeTokens(PsiBuilder b, int pin, IElementType... tokens) {
+        boolean result = true;
+        boolean pinned = false;
+        for (int i = 0; i < tokens.length; i++) {
+            if (pin > 0 && i == pin) {
+                pinned = result;
+            }
+            if (result || pinned) {
+                if (!consumeToken(b, tokens[i])) {
+                    result = false;
+                    if (!pinned) break;
+                }
+            }
+        }
+        return result || pinned;
+    }
+
+    /**
+     * Override nextTokenIs for quick prediction with contextual keywords.
+     */
+    public static boolean nextTokenIs(PsiBuilder b, IElementType token) {
+        // Case 1: Contextual keyword check
+        if (isContextualKeyword(token)) {
+            return isContextualKeywordMatch(b, token);
+        }
+
+        // Case 2: IDENTIFIER also matches remapped contextual keywords
+        if (token == JSTokenTypes.IDENTIFIER) {
+            IElementType current = b.getTokenType();
+            return current == JSTokenTypes.IDENTIFIER || CONTEXTUAL_KEYWORD_SET.contains(current);
+        }
+
+        return GeneratedParserUtilBase.nextTokenIs(b, token);
+    }
+
+    /**
+     * Override nextTokenIs with error name for multi-token prediction.
+     */
+    public static boolean nextTokenIs(PsiBuilder b, String frameName, IElementType... tokens) {
+        IElementType current = b.getTokenType();
+        for (IElementType token : tokens) {
+            if (isContextualKeyword(token)) {
+                if (isContextualKeywordMatch(b, token)) {
+                    return true;
+                }
+            }
+            else if (token == JSTokenTypes.IDENTIFIER) {
+                if (current == JSTokenTypes.IDENTIFIER || CONTEXTUAL_KEYWORD_SET.contains(current)) {
+                    return true;
+                }
+            }
+            else if (current == token) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex
new file mode 100644
index 00000000..d788222e
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex
@@ -0,0 +1,243 @@
+package consulo.typescript.language.impl.syntax;
+
+import consulo.language.ast.IElementType;
+import consulo.language.ast.TokenType;
+import com.intellij.lang.javascript.JSTokenTypes;
+import consulo.typescript.language.TypeScriptTokens;
+
+%%
+
+%{
+    private int templateDepth = 0;
+    private consulo.util.collection.primitive.ints.IntStack templateBraceCount = new consulo.util.collection.primitive.ints.IntStack();
+%}
+
+%public
+%class _TypeScriptLexer
+%extends consulo.language.lexer.LexerBase
+%unicode
+%function advanceImpl
+%type IElementType
+
+DIGIT=[0-9]
+HEX_DIGIT=[0-9A-Fa-f]
+WHITE_SPACE_CHAR=[\ \n\r\t\f]
+
+IDENTIFIER=[:jletter:] [:jletterdigit:]*
+
+C_STYLE_COMMENT=("/*"[^"*"]{COMMENT_TAIL})|"/*"
+DOC_COMMENT="/*""*"+("/"|([^"/""*"]{COMMENT_TAIL}))?
+COMMENT_TAIL=([^"*"]*("*"+[^"*""/"])?)*("*"+"/")?
+END_OF_LINE_COMMENT="/""/"[^\r\n]*
+
+INTEGER_LITERAL={DECIMAL_INTEGER_LITERAL}|{HEX_INTEGER_LITERAL}|{BIN_INTEGER_LITERAL}|{OCTAL_INTEGER_LITERAL}
+BIN_INTEGER_LITERAL=0[Bb][01]([01_]*[01])?
+OCTAL_INTEGER_LITERAL=0[oO]{DIGIT}([0-7_]*[0-7])?
+DECIMAL_INTEGER_LITERAL=(0|([1-9]([0-9_]*[0-9])?))
+HEX_INTEGER_LITERAL=0[Xx]{HEX_DIGIT}({HEX_DIGIT}|_)*
+
+BIGINT_LITERAL={INTEGER_LITERAL}[n]
+
+FLOAT_LITERAL=({FLOATING_POINT_LITERAL1})|({FLOATING_POINT_LITERAL2})|({FLOATING_POINT_LITERAL3})|({FLOATING_POINT_LITERAL4})
+FLOATING_POINT_LITERAL1=({DIGIT})+"."({DIGIT})*({EXPONENT_PART})?
+FLOATING_POINT_LITERAL2="."({DIGIT})+({EXPONENT_PART})?
+FLOATING_POINT_LITERAL3=({DIGIT})+({EXPONENT_PART})
+FLOATING_POINT_LITERAL4=({DIGIT})+
+EXPONENT_PART=[Ee]["+""-"]?({DIGIT})*
+
+CRLF=[\ \t\f]*(\n|\r|\r\n)
+QUOTED_LITERAL="'"([^\\\'\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*("'"|\\)?
+DOUBLE_QUOTED_LITERAL=\"([^\\\"\r\n]|{ESCAPE_SEQUENCE}|\\{CRLF})*(\"|\\)?
+ESCAPE_SEQUENCE=\\[^\r\n]
+GROUP="["[^\]]*"]"
+
+REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})*("/"[gimsuy]*)?
+
+%state DIV_OR_GT
+%state TEMPLATE_STRING
+%state TEMPLATE_STRING_EXPRESSION
+
+%%
+
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {WHITE_SPACE_CHAR}+ { return JSTokenTypes.WHITE_SPACE; }
+
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {C_STYLE_COMMENT}     { return JSTokenTypes.C_STYLE_COMMENT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {END_OF_LINE_COMMENT}  { return JSTokenTypes.END_OF_LINE_COMMENT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {DOC_COMMENT}          { return JSTokenTypes.DOC_COMMENT; }
+
+// === Numeric literals ===
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {BIGINT_LITERAL}    { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {INTEGER_LITERAL}   { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {FLOAT_LITERAL}     { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
+
+// === String literals ===
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {QUOTED_LITERAL}        { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {DOUBLE_QUOTED_LITERAL} { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
+
+// === Template literals ===
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "`" {
+    yybegin(TEMPLATE_STRING);
+    return TypeScriptTokens.TEMPLATE_HEAD;
+}
+
+<TEMPLATE_STRING> {
+    "${"  {
+        templateDepth++;
+        templateBraceCount.push(0);
+        yybegin(TEMPLATE_STRING_EXPRESSION);
+        return TypeScriptTokens.TEMPLATE_HEAD;
+    }
+    "`"   {
+        yybegin(DIV_OR_GT);
+        return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE;
+    }
+    [^`$\\]+      { return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE; }
+    "\\".         { return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE; }
+    "$"           { return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE; }
+}
+
+<TEMPLATE_STRING_EXPRESSION> {
+    "{"  {
+        if (templateDepth > 0) {
+            templateBraceCount.push(templateBraceCount.pop() + 1);
+        }
+        yybegin(YYINITIAL);
+        return JSTokenTypes.LBRACE;
+    }
+    "}"  {
+        if (templateDepth > 0) {
+            int count = templateBraceCount.peek();
+            if (count > 0) {
+                templateBraceCount.push(templateBraceCount.pop() - 1);
+                yybegin(YYINITIAL);
+                return JSTokenTypes.RBRACE;
+            } else {
+                templateDepth--;
+                templateBraceCount.pop();
+                yybegin(TEMPLATE_STRING);
+                return TypeScriptTokens.TEMPLATE_TAIL;
+            }
+        }
+        yybegin(YYINITIAL);
+        return JSTokenTypes.RBRACE;
+    }
+}
+
+// === Keywords (true keywords - always keyword tokens) ===
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "break"       { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "case"        { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "catch"       { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "class"       { yybegin(YYINITIAL); return JSTokenTypes.CLASS_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "const"       { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "continue"    { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "debugger"    { yybegin(YYINITIAL); return TypeScriptTokens.DEBUGGER_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "default"     { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "delete"      { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "do"          { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "else"        { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "enum"        { yybegin(YYINITIAL); return JSTokenTypes.ENUM_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "export"      { yybegin(YYINITIAL); return JSTokenTypes.EXPORT_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "extends"     { yybegin(YYINITIAL); return JSTokenTypes.EXTENDS_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "false"       { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "finally"     { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "for"         { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "function"    { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "if"          { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "import"      { yybegin(YYINITIAL); return JSTokenTypes.IMPORT_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "in"          { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "instanceof"  { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "let"         { yybegin(YYINITIAL); return JSTokenTypes.LET_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "new"         { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "null"        { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "return"      { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "super"       { yybegin(YYINITIAL); return JSTokenTypes.SUPER_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "switch"      { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "this"        { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "throw"       { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "true"        { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "try"         { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "typeof"      { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "var"         { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "void"        { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "while"       { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "with"        { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "yield"       { yybegin(YYINITIAL); return JSTokenTypes.YIELD_KEYWORD; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "await"       { yybegin(YYINITIAL); return TypeScriptTokens.AWAIT_KEYWORD; }
+
+// Contextual keywords emitted as IDENTIFIER - parser resolves them:
+// abstract, as, asserts, async, constructor, declare, defer, from, get, global,
+// implements, infer, interface, is, keyof, module, namespace, never, of,
+// override, private, protected, public, readonly, require, satisfies, set,
+// static, type, undefined, unique, unknown, using
+
+// === Identifiers ===
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {IDENTIFIER}  { yybegin(DIV_OR_GT); return JSTokenTypes.IDENTIFIER; }
+
+// === Multi-char operators (order matters: longer first) ===
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "..."   { yybegin(YYINITIAL); return JSTokenTypes.DOT_DOT_DOT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "==="   { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "!=="   { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">>>"   { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">>>="  { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">>="   { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "<<="   { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "**="   { yybegin(YYINITIAL); return JSTokenTypes.MULT_MULT_EQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "||="   { yybegin(YYINITIAL); return JSTokenTypes.OR_OR_EQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "&&="   { yybegin(YYINITIAL); return JSTokenTypes.AND_AND_EQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "??="   { yybegin(YYINITIAL); return JSTokenTypes.QUEST_QUEST_EQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "=>"    { yybegin(YYINITIAL); return JSTokenTypes.DARROW; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "=="    { yybegin(YYINITIAL); return JSTokenTypes.EQEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "!="    { yybegin(YYINITIAL); return JSTokenTypes.NE; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "++"    { return JSTokenTypes.PLUSPLUS; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "--"    { return JSTokenTypes.MINUSMINUS; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "**"    { yybegin(YYINITIAL); return JSTokenTypes.MULTMULT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "<<"    { yybegin(YYINITIAL); return JSTokenTypes.LTLT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">>"    { yybegin(YYINITIAL); return JSTokenTypes.GTGT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "&&"    { yybegin(YYINITIAL); return JSTokenTypes.ANDAND; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "||"    { yybegin(YYINITIAL); return JSTokenTypes.OROR; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "??"    { yybegin(YYINITIAL); return TypeScriptTokens.QUEST_QUEST; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "?."    { yybegin(YYINITIAL); return JSTokenTypes.QUEST_DOT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "+="    { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "-="    { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ; }
+<DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "*="               { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ; }
+<DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "/="               { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "%="    { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "&="    { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "|="    { yybegin(YYINITIAL); return JSTokenTypes.OREQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "^="    { yybegin(YYINITIAL); return JSTokenTypes.XOREQ; }
+<DIV_OR_GT> "<="                                          { yybegin(YYINITIAL); return JSTokenTypes.LE; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">="    { yybegin(YYINITIAL); return JSTokenTypes.GE; }
+
+// === Single-char operators ===
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "("     { yybegin(YYINITIAL); return JSTokenTypes.LPAR; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ")"     { yybegin(DIV_OR_GT); return JSTokenTypes.RPAR; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "{"     { yybegin(YYINITIAL); return JSTokenTypes.LBRACE; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "}"     { yybegin(YYINITIAL); return JSTokenTypes.RBRACE; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "["     { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "]"     { yybegin(DIV_OR_GT); return JSTokenTypes.RBRACKET; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ";"     { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ","     { yybegin(YYINITIAL); return JSTokenTypes.COMMA; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "."     { return JSTokenTypes.DOT; }
+<DIV_OR_GT> "<"                                           { yybegin(YYINITIAL); return JSTokenTypes.LT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">"     { yybegin(YYINITIAL); return JSTokenTypes.GT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "="     { yybegin(YYINITIAL); return JSTokenTypes.EQ; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "!"     { yybegin(YYINITIAL); return JSTokenTypes.EXCL; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "~"     { yybegin(YYINITIAL); return JSTokenTypes.TILDE; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "?"     { yybegin(YYINITIAL); return JSTokenTypes.QUEST; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ":"     { yybegin(YYINITIAL); return JSTokenTypes.COLON; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "+"     { yybegin(YYINITIAL); return JSTokenTypes.PLUS; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "-"     { yybegin(YYINITIAL); return JSTokenTypes.MINUS; }
+<DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "*"                { yybegin(YYINITIAL); return JSTokenTypes.MULT; }
+<DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "/"                { yybegin(YYINITIAL); return JSTokenTypes.DIV; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "^"     { yybegin(YYINITIAL); return JSTokenTypes.XOR; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "%"     { yybegin(YYINITIAL); return JSTokenTypes.PERC; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "&"     { yybegin(YYINITIAL); return JSTokenTypes.AND; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "|"     { yybegin(YYINITIAL); return JSTokenTypes.OR; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "@"     { return JSTokenTypes.AT; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "#"     { return TypeScriptTokens.HASH; }
+
+// === Regexp (only in YYINITIAL - after operator, not after value) ===
+<YYINITIAL> {REGEXP_LITERAL}  { yybegin(DIV_OR_GT); return JSTokenTypes.REGEXP_LITERAL; }
+
+// === Fallback ===
+[^] { yybegin(YYINITIAL); return TokenType.BAD_CHARACTER; }
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/psi/TypeScriptElement.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/psi/TypeScriptElement.java
new file mode 100644
index 00000000..5f7a45e9
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/psi/TypeScriptElement.java
@@ -0,0 +1,10 @@
+package consulo.typescript.language.psi;
+
+import com.intellij.lang.javascript.psi.JSElement;
+
+/**
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public interface TypeScriptElement extends JSElement {
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/BaseTypeScriptLanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/BaseTypeScriptLanguageVersion.java
new file mode 100644
index 00000000..802a9152
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/BaseTypeScriptLanguageVersion.java
@@ -0,0 +1,74 @@
+package consulo.typescript.version;
+
+import consulo.javascript.ecmascript.lang.BaseEcmaScriptJavaScriptVersion;
+import consulo.javascript.language.JavaScriptFeature;
+import consulo.javascript.language.StandardJavaScriptVersion;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
+import consulo.language.editor.highlight.SyntaxHighlighter;
+import consulo.language.lexer.Lexer;
+import consulo.language.parser.PsiParser;
+import consulo.typescript.language.TypeScriptFeature;
+import consulo.typescript.language.TypeScriptLanguage;
+import consulo.typescript.language.impl.syntax.TypeScriptSyntaxParser;
+import consulo.typescript.language.impl.syntax._TypeScriptLexer;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * Base class for all TypeScript language version implementations.
+ * Versions form a chain (TS 6.0 extends TS 5.9 extends ... extends TS 1.0 extends this),
+ * each adding its own {@link TypeScriptFeature}s via {@link #addTypeScriptFeature}.
+ *
+ * @author VISTALL
+ * @since 2026-03-17
+ */
+public abstract class BaseTypeScriptLanguageVersion extends BaseEcmaScriptJavaScriptVersion implements StandardJavaScriptVersion {
+    private final Set<TypeScriptFeature> myTypeScriptFeatures = EnumSet.noneOf(TypeScriptFeature.class);
+
+    protected BaseTypeScriptLanguageVersion(String id) {
+        super(id, TypeScriptLanguage.INSTANCE, "application/typescript");
+
+        // TypeScript is a superset of JavaScript
+        for (JavaScriptFeature feature : JavaScriptFeature.values()) {
+            addFeature(feature);
+        }
+    }
+
+    public static BaseTypeScriptLanguageVersion getLatest() {
+        return TypeScriptLanguage.INSTANCE.findVersionByClass(TypeScript60LanguageVersion.class);
+    }
+
+    protected void addTypeScriptFeature(TypeScriptFeature feature) {
+        myTypeScriptFeatures.add(feature);
+    }
+
+    public Set<TypeScriptFeature> getTypeScriptFeatures() {
+        return Collections.unmodifiableSet(myTypeScriptFeatures);
+    }
+
+    public boolean isFeatureSupported(TypeScriptFeature feature) {
+        return myTypeScriptFeatures.contains(feature);
+    }
+
+    @Override
+    public boolean supportsDefaultCompletion() {
+        return false;
+    }
+
+    @Override
+    public PsiParser createParser() {
+        return new TypeScriptSyntaxParser();
+    }
+
+    @Override
+    public Lexer createLexer() {
+        return new _TypeScriptLexer();
+    }
+
+    @Override
+    public SyntaxHighlighter getSyntaxHighlighter() {
+        return new JavaScriptHighlighter(_TypeScriptLexer::new);
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript10LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript10LanguageVersion.java
new file mode 100644
index 00000000..bc4c61a4
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript10LanguageVersion.java
@@ -0,0 +1,33 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript10LanguageVersion extends BaseTypeScriptLanguageVersion {
+    @Inject
+    public TypeScript10LanguageVersion() {
+        this("TYPESCRIPT_1_0");
+    }
+
+    public TypeScript10LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.INTERFACE);
+        addTypeScriptFeature(TypeScriptFeature.ENUM);
+        addTypeScriptFeature(TypeScriptFeature.GENERIC);
+        addTypeScriptFeature(TypeScriptFeature.TYPE_ANNOTATION);
+        addTypeScriptFeature(TypeScriptFeature.ACCESS_MODIFIER);
+        addTypeScriptFeature(TypeScriptFeature.NAMESPACE);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 1.0";
+    }
+
+    @Override
+    public int getWeight() {
+        return 100;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript15LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript15LanguageVersion.java
new file mode 100644
index 00000000..0f4e623d
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript15LanguageVersion.java
@@ -0,0 +1,33 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript15LanguageVersion extends TypeScript10LanguageVersion {
+    @Inject
+    public TypeScript15LanguageVersion() {
+        this("TYPESCRIPT_1_5");
+    }
+
+    public TypeScript15LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.TYPE_ALIAS);
+        addTypeScriptFeature(TypeScriptFeature.UNION_TYPE);
+        addTypeScriptFeature(TypeScriptFeature.INTERSECTION_TYPE);
+        addTypeScriptFeature(TypeScriptFeature.DECORATOR);
+        addTypeScriptFeature(TypeScriptFeature.ABSTRACT_CLASS);
+        addTypeScriptFeature(TypeScriptFeature.COMPUTED_PROPERTY);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 1.5";
+    }
+
+    @Override
+    public int getWeight() {
+        return 150;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript20LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript20LanguageVersion.java
new file mode 100644
index 00000000..8c083d31
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript20LanguageVersion.java
@@ -0,0 +1,30 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript20LanguageVersion extends TypeScript15LanguageVersion {
+    @Inject
+    public TypeScript20LanguageVersion() {
+        this("TYPESCRIPT_2_0");
+    }
+
+    public TypeScript20LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.READONLY_MODIFIER);
+        addTypeScriptFeature(TypeScriptFeature.NEVER_TYPE);
+        addTypeScriptFeature(TypeScriptFeature.NON_NULL_ASSERTION);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 2.0";
+    }
+
+    @Override
+    public int getWeight() {
+        return 200;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript21LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript21LanguageVersion.java
new file mode 100644
index 00000000..3bf0475b
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript21LanguageVersion.java
@@ -0,0 +1,31 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript21LanguageVersion extends TypeScript20LanguageVersion {
+    @Inject
+    public TypeScript21LanguageVersion() {
+        this("TYPESCRIPT_2_1");
+    }
+
+    public TypeScript21LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.MAPPED_TYPE);
+        addTypeScriptFeature(TypeScriptFeature.KEYOF_OPERATOR);
+        addTypeScriptFeature(TypeScriptFeature.INDEXED_ACCESS_TYPE);
+        addTypeScriptFeature(TypeScriptFeature.OBJECT_SPREAD);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 2.1";
+    }
+
+    @Override
+    public int getWeight() {
+        return 210;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript28LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript28LanguageVersion.java
new file mode 100644
index 00000000..9b62f173
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript28LanguageVersion.java
@@ -0,0 +1,29 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript28LanguageVersion extends TypeScript21LanguageVersion {
+    @Inject
+    public TypeScript28LanguageVersion() {
+        this("TYPESCRIPT_2_8");
+    }
+
+    public TypeScript28LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.CONDITIONAL_TYPE);
+        addTypeScriptFeature(TypeScriptFeature.INFER_KEYWORD);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 2.8";
+    }
+
+    @Override
+    public int getWeight() {
+        return 280;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript30LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript30LanguageVersion.java
new file mode 100644
index 00000000..85484be2
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript30LanguageVersion.java
@@ -0,0 +1,29 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript30LanguageVersion extends TypeScript28LanguageVersion {
+    @Inject
+    public TypeScript30LanguageVersion() {
+        this("TYPESCRIPT_3_0");
+    }
+
+    public TypeScript30LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.UNKNOWN_TYPE);
+        addTypeScriptFeature(TypeScriptFeature.REST_TUPLE);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 3.0";
+    }
+
+    @Override
+    public int getWeight() {
+        return 300;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript40LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript40LanguageVersion.java
new file mode 100644
index 00000000..f523c42f
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript40LanguageVersion.java
@@ -0,0 +1,29 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript40LanguageVersion extends TypeScript30LanguageVersion {
+    @Inject
+    public TypeScript40LanguageVersion() {
+        this("TYPESCRIPT_4_0");
+    }
+
+    public TypeScript40LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.LABELED_TUPLE);
+        addTypeScriptFeature(TypeScriptFeature.VARIADIC_TUPLE);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 4.0";
+    }
+
+    @Override
+    public int getWeight() {
+        return 400;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript41LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript41LanguageVersion.java
new file mode 100644
index 00000000..a81fd8cf
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript41LanguageVersion.java
@@ -0,0 +1,29 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript41LanguageVersion extends TypeScript40LanguageVersion {
+    @Inject
+    public TypeScript41LanguageVersion() {
+        this("TYPESCRIPT_4_1");
+    }
+
+    public TypeScript41LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.TEMPLATE_LITERAL_TYPE);
+        addTypeScriptFeature(TypeScriptFeature.KEY_REMAPPING);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 4.1";
+    }
+
+    @Override
+    public int getWeight() {
+        return 410;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript43LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript43LanguageVersion.java
new file mode 100644
index 00000000..66a7e7ac
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript43LanguageVersion.java
@@ -0,0 +1,28 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript43LanguageVersion extends TypeScript41LanguageVersion {
+    @Inject
+    public TypeScript43LanguageVersion() {
+        this("TYPESCRIPT_4_3");
+    }
+
+    public TypeScript43LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.OVERRIDE_MODIFIER);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 4.3";
+    }
+
+    @Override
+    public int getWeight() {
+        return 430;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript45LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript45LanguageVersion.java
new file mode 100644
index 00000000..0e01ab2c
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript45LanguageVersion.java
@@ -0,0 +1,28 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript45LanguageVersion extends TypeScript43LanguageVersion {
+    @Inject
+    public TypeScript45LanguageVersion() {
+        this("TYPESCRIPT_4_5");
+    }
+
+    public TypeScript45LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.TYPE_ONLY_IMPORT_SPECIFIER);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 4.5";
+    }
+
+    @Override
+    public int getWeight() {
+        return 450;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript49LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript49LanguageVersion.java
new file mode 100644
index 00000000..83c52b17
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript49LanguageVersion.java
@@ -0,0 +1,28 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript49LanguageVersion extends TypeScript45LanguageVersion {
+    @Inject
+    public TypeScript49LanguageVersion() {
+        this("TYPESCRIPT_4_9");
+    }
+
+    public TypeScript49LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.SATISFIES_OPERATOR);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 4.9";
+    }
+
+    @Override
+    public int getWeight() {
+        return 490;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript50LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript50LanguageVersion.java
new file mode 100644
index 00000000..2fcfc324
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript50LanguageVersion.java
@@ -0,0 +1,29 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript50LanguageVersion extends TypeScript49LanguageVersion {
+    @Inject
+    public TypeScript50LanguageVersion() {
+        this("TYPESCRIPT_5_0");
+    }
+
+    public TypeScript50LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.CONST_TYPE_PARAMETER);
+        addTypeScriptFeature(TypeScriptFeature.DECORATOR_METADATA);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 5.0";
+    }
+
+    @Override
+    public int getWeight() {
+        return 500;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript53LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript53LanguageVersion.java
new file mode 100644
index 00000000..7ed7405f
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript53LanguageVersion.java
@@ -0,0 +1,28 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript53LanguageVersion extends TypeScript50LanguageVersion {
+    @Inject
+    public TypeScript53LanguageVersion() {
+        this("TYPESCRIPT_5_3");
+    }
+
+    public TypeScript53LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.IMPORT_ATTRIBUTES);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 5.3";
+    }
+
+    @Override
+    public int getWeight() {
+        return 530;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript55LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript55LanguageVersion.java
new file mode 100644
index 00000000..adbb1f7f
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript55LanguageVersion.java
@@ -0,0 +1,26 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript55LanguageVersion extends TypeScript53LanguageVersion {
+    @Inject
+    public TypeScript55LanguageVersion() {
+        this("TYPESCRIPT_5_5");
+    }
+
+    public TypeScript55LanguageVersion(String id) {
+        super(id);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 5.5";
+    }
+
+    @Override
+    public int getWeight() {
+        return 550;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript59LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript59LanguageVersion.java
new file mode 100644
index 00000000..36dfd722
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript59LanguageVersion.java
@@ -0,0 +1,28 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript59LanguageVersion extends TypeScript55LanguageVersion {
+    @Inject
+    public TypeScript59LanguageVersion() {
+        this("TYPESCRIPT_5_9");
+    }
+
+    public TypeScript59LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.IMPORT_DEFER);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 5.9";
+    }
+
+    @Override
+    public int getWeight() {
+        return 590;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript60LanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript60LanguageVersion.java
new file mode 100644
index 00000000..d6285188
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScript60LanguageVersion.java
@@ -0,0 +1,28 @@
+package consulo.typescript.version;
+
+import consulo.annotation.component.ExtensionImpl;
+import consulo.typescript.language.TypeScriptFeature;
+import jakarta.inject.Inject;
+
+@ExtensionImpl
+public class TypeScript60LanguageVersion extends TypeScript59LanguageVersion {
+    @Inject
+    public TypeScript60LanguageVersion() {
+        this("TYPESCRIPT_6_0");
+    }
+
+    public TypeScript60LanguageVersion(String id) {
+        super(id);
+        addTypeScriptFeature(TypeScriptFeature.SUBPATH_IMPORTS);
+    }
+
+    @Override
+    public String getPresentableName() {
+        return "TypeScript 6.0";
+    }
+
+    @Override
+    public int getWeight() {
+        return 600;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
deleted file mode 100644
index ba7ab683..00000000
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/TypeScriptLanguageVersion.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package consulo.typescript.version;
-
-import consulo.annotation.component.ExtensionImpl;
-import consulo.javascript.ecmascript.lang.BaseEcmaScriptJavaScriptVersion;
-import consulo.javascript.language.JavaScriptFeature;
-import consulo.javascript.language.JavaScriptLanguage;
-
-
-/**
- * @author VISTALL
- * @since 20-Jul-22
- */
-@ExtensionImpl
-public class TypeScriptLanguageVersion extends BaseEcmaScriptJavaScriptVersion {
-    public static TypeScriptLanguageVersion getInstance() {
-        return JavaScriptLanguage.INSTANCE.findVersionByClass(TypeScriptLanguageVersion.class);
-    }
-
-    public TypeScriptLanguageVersion() {
-        super("TYPESCRIPT", "application/typescript");
-        addFeature(JavaScriptFeature.CLASS);
-        addFeature(JavaScriptFeature.BINARY_LITERAL);
-        addFeature(JavaScriptFeature.OCTAL_LITERAL);
-        addFeature(JavaScriptFeature.PARAMETER_DEFAULT_VALUE);
-        addFeature(JavaScriptFeature.REST_PARAMETER);
-        addFeature(JavaScriptFeature.FUNCTION_PROPERTY);
-    }
-
-    @Override
-    public String getPresentableName() {
-        return "TypeScript";
-    }
-}
diff --git a/lang-version-impl/typescript-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.typescript.TypeScriptLocalize.yaml b/lang-version-impl/typescript-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.typescript.TypeScriptLocalize.yaml
new file mode 100644
index 00000000..7dcb532b
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.typescript.TypeScriptLocalize.yaml
@@ -0,0 +1,109 @@
+# TypeScript Feature Display Names
+feature.interface:
+    text: Interfaces
+feature.enum:
+    text: Enums
+feature.generic:
+    text: Generics
+feature.type.annotation:
+    text: Type annotations
+feature.access.modifier:
+    text: Access modifiers
+feature.namespace:
+    text: Namespaces
+feature.type.alias:
+    text: Type aliases
+feature.union.type:
+    text: Union types
+feature.intersection.type:
+    text: Intersection types
+feature.decorator:
+    text: Decorators
+feature.abstract.class:
+    text: Abstract classes
+feature.computed.property:
+    text: Computed properties
+feature.readonly.modifier:
+    text: Readonly modifier
+feature.never.type:
+    text: Never type
+feature.non.null.assertion:
+    text: Non-null assertion
+feature.mapped.type:
+    text: Mapped types
+feature.keyof.operator:
+    text: keyof operator
+feature.indexed.access.type:
+    text: Indexed access types
+feature.object.spread:
+    text: Object spread
+feature.conditional.type:
+    text: Conditional types
+feature.infer.keyword:
+    text: infer keyword
+feature.unknown.type:
+    text: unknown type
+feature.rest.tuple:
+    text: Rest elements in tuples
+feature.labeled.tuple:
+    text: Labeled tuple elements
+feature.variadic.tuple:
+    text: Variadic tuple types
+feature.template.literal.type:
+    text: Template literal types
+feature.key.remapping:
+    text: Key remapping in mapped types
+feature.override.modifier:
+    text: override modifier
+feature.type.only.import.specifier:
+    text: Type-only import specifiers
+feature.satisfies.operator:
+    text: satisfies operator
+feature.const.type.parameter:
+    text: const type parameters
+feature.decorator.metadata:
+    text: Decorator metadata
+feature.import.attributes:
+    text: Import attributes
+feature.import.defer:
+    text: Deferred imports
+feature.subpath.imports:
+    text: Subpath imports
+
+# Error Messages
+feature.not.supported.by.current.version:
+    text: "''{0}'' requires TypeScript {1} or later"
+
+# Version Names
+version.1.0:
+    text: TypeScript 1.0
+version.1.5:
+    text: TypeScript 1.5
+version.2.0:
+    text: TypeScript 2.0
+version.2.1:
+    text: TypeScript 2.1
+version.2.8:
+    text: TypeScript 2.8
+version.3.0:
+    text: TypeScript 3.0
+version.4.0:
+    text: TypeScript 4.0
+version.4.1:
+    text: TypeScript 4.1
+version.4.3:
+    text: TypeScript 4.3
+version.4.5:
+    text: TypeScript 4.5
+version.4.9:
+    text: TypeScript 4.9
+version.5.0:
+    text: TypeScript 5.0
+version.5.3:
+    text: TypeScript 5.3
+version.5.5:
+    text: TypeScript 5.5
+version.5.9:
+    text: TypeScript 5.9
+version.6.0:
+    text: TypeScript 6.0
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
index 4ec45b1c..d527bf50 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/highlighting/JavaScriptHighlightVisitor.java
@@ -29,6 +29,7 @@
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.javascript.psi.JSSimpleLiteralExpression;
 import consulo.language.ast.IElementType;
+import consulo.language.editor.annotation.HighlightSeverity;
 import consulo.language.editor.rawHighlight.HighlightInfo;
 import consulo.language.editor.rawHighlight.HighlightInfoHolder;
 import consulo.language.editor.rawHighlight.HighlightInfoType;
@@ -77,10 +78,11 @@ public void visitElement(PsiElement element) {
         else if (elementType == JSTokenTypes.IDENTIFIER) {
             addElementHighlight(parent, element);
         }
-        else if (JavaScriptContextKeywordElementType.containsKeyword(elementType)) {
+        else if (elementType instanceof JavaScriptContextKeywordElementType) {
             myHighlightInfoHolder.add(
                 HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION)
                     .textAttributes(JavaScriptSyntaxHighlightKeys.JS_KEYWORD)
+                    .severity(HighlightSeverity.TEXT_ATTRIBUTES)
                     .range(element)
                     .create()
             );
diff --git a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
index a394059b..dede21f5 100644
--- a/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
+++ b/plugin/src/main/java/consulo/javascript/impl/ide/completion/JavaScriptKeywordCompletionContributor.java
@@ -21,6 +21,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.ide.completion.JavaScriptKeywordCompletionExtender;
+import consulo.javascript.lang.BaseJavaScriptLanguageVersion;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
 import consulo.language.editor.completion.*;
@@ -29,6 +30,7 @@
 import consulo.language.pattern.StandardPatterns;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.ProcessingContext;
+import consulo.language.version.LanguageVersion;
 
 
 /**
@@ -55,6 +57,11 @@ public void addCompletions(
                         return;
                     }
 
+                    LanguageVersion languageVersion = parent.getLanguageVersion();
+                    if (languageVersion instanceof BaseJavaScriptLanguageVersion ver && !ver.supportsDefaultCompletion()) {
+                        return;
+                    }
+
                     boolean parentIsStatement = parent.getParent() instanceof JSExpressionStatement;
 
                     LookupElementBuilder functionKeyword = LookupElementBuilder.create("function");

From 33e810d80f6f14a59caaa748a97861632c827876 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 18 Mar 2026 17:56:22 +0200
Subject: [PATCH 322/340] fix import.meta parsing/fix assertions on string
 literals

---
 .../language/grammar/TypeScript.bnf           | 26 +++++++++++--------
 .../language/TypeScriptTokenTypeFactory.java  |  1 +
 .../impl/syntax/_TypeScriptLexer.flex         |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf b/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
index e523d5ac..ea51cacc 100644
--- a/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
+++ b/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
@@ -215,6 +215,7 @@
     // Literals
     NUMERIC_LITERAL
     STRING_LITERAL
+    SINGLE_QUOTE_STRING_LITERAL
     REGEXP_LITERAL
     NO_SUBSTITUTION_TEMPLATE
     TEMPLATE_HEAD
@@ -332,7 +333,7 @@ private statement_recover_ ::= !(
     SWITCH_KEYWORD | TRY_KEYWORD | RETURN_KEYWORD |
     THROW_KEYWORD | BREAK_KEYWORD | CONTINUE_KEYWORD |
     IMPORT_KEYWORD | EXPORT_KEYWORD | ENUM_KEYWORD | AT |
-    NUMERIC_LITERAL | STRING_LITERAL |
+    NUMERIC_LITERAL | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL |
     LPAR | LBRACKET | PLUS | MINUS | EXCL | TILDE |
     PLUSPLUS | MINUSMINUS | THIS_KEYWORD | NEW_KEYWORD |
     DELETE_KEYWORD | TYPEOF_KEYWORD | VOID_KEYWORD |
@@ -479,10 +480,10 @@ namespace_declaration ::= (NAMESPACE_KEYWORD | MODULE_KEYWORD) qualified_name bl
 ambient_declaration ::= DECLARE_KEYWORD (var_statement | function_declaration | class_declaration | enum_declaration | namespace_declaration | interface_declaration | type_alias_declaration | GLOBAL_KEYWORD block_statement) {pin=1}
 
 // --- Import ---
-import_declaration ::= 'import' TYPE_KEYWORD? import_clause from_clause import_attributes? semicolon
-  | 'import' TYPE_KEYWORD? module_specifier semicolon
-  | 'import' IDENTIFIER '=' (IDENTIFIER '(' module_specifier ')' | qualified_name) semicolon
-  {pin=1}
+import_declaration ::= 'import' !('.' | '(') (TYPE_KEYWORD? import_clause from_clause import_attributes? semicolon
+  | TYPE_KEYWORD? module_specifier semicolon
+  | IDENTIFIER '=' (IDENTIFIER '(' module_specifier ')' | qualified_name) semicolon)
+  {pin=2}
 
 private import_clause ::= IDENTIFIER (',' (namespace_import | named_imports))?
   | namespace_import
@@ -496,16 +497,17 @@ import_specifier ::= TYPE_KEYWORD? IDENTIFIER (AS_KEYWORD IDENTIFIER)?
 
 private from_clause ::= FROM_KEYWORD module_specifier
 
-private module_specifier ::= STRING_LITERAL
+private module_specifier ::= STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL
 
 import_attributes ::= (IDENTIFIER | AS_KEYWORD) '{' (import_attribute (',' import_attribute)* ','?)? '}'
 
-import_attribute ::= (IDENTIFIER | STRING_LITERAL) ':' (STRING_LITERAL | IDENTIFIER)
+import_attribute ::= (IDENTIFIER | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL) ':' (STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL | IDENTIFIER)
 
 // --- Export ---
 export_declaration ::= 'export' (
     'default'? (function_declaration | class_declaration | interface_declaration | enum_declaration | type_alias_declaration)
   | 'default' expression semicolon
+  | ambient_declaration
   | var_statement
   | named_exports from_clause? semicolon
   | '*' (AS_KEYWORD IDENTIFIER)? from_clause semicolon
@@ -601,6 +603,7 @@ private primary_expression ::=
   | new_expression
   | template_literal_expression
   | parenthesized_expression
+  | import_meta_expression
   | reference_expression
   | type_assertion_expression
   | yield_expression
@@ -608,8 +611,9 @@ private primary_expression ::=
 
 this_expression ::= 'this'
 super_expression ::= 'super'
+import_meta_expression ::= 'import' '.' IDENTIFIER
 reference_expression ::= IDENTIFIER
-literal_expression ::= NUMERIC_LITERAL | STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD | REGEXP_LITERAL
+literal_expression ::= NUMERIC_LITERAL | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD | REGEXP_LITERAL
 
 yield_expression ::= 'yield' '*'? expression?
 
@@ -719,7 +723,7 @@ mapped_type ::= '{' ('+' | '-')? READONLY_KEYWORD? '[' IDENTIFIER 'in' type_expr
 
 indexed_access_type ::= primary_type '[' type_expression ']'
 
-literal_type ::= NUMERIC_LITERAL | STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD
+literal_type ::= NUMERIC_LITERAL | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD
 
 typeof_type ::= 'typeof' reference_expression
 
@@ -729,7 +733,7 @@ infer_type ::= INFER_KEYWORD IDENTIFIER ('extends' type_expression)?
 
 template_literal_type ::= NO_SUBSTITUTION_TEMPLATE | TEMPLATE_HEAD type_expression (TEMPLATE_MIDDLE type_expression)* TEMPLATE_TAIL
 
-predefined_type ::= IDENTIFIER
+predefined_type ::= IDENTIFIER | VOID_KEYWORD
 
 type_parameter_list ::= '<' type_parameter (',' type_parameter)* '>' {pin=1}
 
@@ -749,7 +753,7 @@ private access_modifier ::= PUBLIC_KEYWORD | PRIVATE_KEYWORD | PROTECTED_KEYWORD
 
 // ==================== Utility Rules ====================
 
-private property_name ::= IDENTIFIER | STRING_LITERAL | NUMERIC_LITERAL | computed_property_name
+private property_name ::= IDENTIFIER | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL | NUMERIC_LITERAL | computed_property_name
 
 qualified_name ::= IDENTIFIER ('.' IDENTIFIER)*
 
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenTypeFactory.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenTypeFactory.java
index 44582550..da54f201 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenTypeFactory.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenTypeFactory.java
@@ -31,6 +31,7 @@ public final class TypeScriptTokenTypeFactory {
         TOKEN_MAP.put("IDENTIFIER", JSTokenTypes.IDENTIFIER);
         TOKEN_MAP.put("NUMERIC_LITERAL", JSTokenTypes.NUMERIC_LITERAL);
         TOKEN_MAP.put("STRING_LITERAL", JSTokenTypes.STRING_LITERAL);
+        TOKEN_MAP.put("SINGLE_QUOTE_STRING_LITERAL", JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL);
         TOKEN_MAP.put("REGEXP_LITERAL", JSTokenTypes.REGEXP_LITERAL);
 
         // Template literals (TypeScript-specific tokens)
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex
index d788222e..d034ef1f 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex
@@ -71,7 +71,7 @@ REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SE
 <YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {FLOAT_LITERAL}     { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
 
 // === String literals ===
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {QUOTED_LITERAL}        { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {QUOTED_LITERAL}        { yybegin(DIV_OR_GT); return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL; }
 <YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {DOUBLE_QUOTED_LITERAL} { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
 
 // === Template literals ===

From 449dc13ea4287b9784f05d49ada6a43582c4b6b0 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 18 Mar 2026 19:47:53 +0200
Subject: [PATCH 323/340] fix cce while parsing jsdoc

---
 .../lang/javascript/JSTokenTypes.java         | 67 +++++++------------
 .../BaseTypeScriptLanguageVersion.java        |  2 +-
 2 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 0d1a0a20..49220400 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -29,7 +29,6 @@
 import consulo.language.Language;
 import consulo.language.ast.*;
 import consulo.language.lexer.FlexAdapter;
-import consulo.language.lexer.Lexer;
 import consulo.language.lexer.MergingLexerAdapter;
 import consulo.language.parser.ParserDefinition;
 import consulo.language.parser.PsiBuilder;
@@ -39,8 +38,6 @@
 import consulo.project.Project;
 import consulo.xml.psi.xml.XmlTokenType;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * @author max, maxim.mossienko
  */
@@ -61,16 +58,19 @@ public interface JSTokenTypes {
     @DeprecationInfo("old xml parsing, es4")
     IElementType XML_STYLE_COMMENT_START = new JSElementType("XML_STYLE_COMMENT_START");
 
-    IElementType DOC_COMMENT = new JSChameleonElementType("DOC_COMMENT") {
+    IElementType DOC_COMMENT = new ILazyParseableElementType("DOC_COMMENT", JavaScriptLanguage.INSTANCE) {
         @Override
-        protected void doParse(JavaScriptParsingContext context, PsiBuilder builder) {
+        @RequiredReadAction
+        protected ASTNode doParseContents(ASTNode chameleon, PsiElement psi) {
+            Project project = psi.getProject();
+            Language languageForParser = getLanguageForParser(psi);
+            LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
+            LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
+            MergingLexerAdapter lexer = new MergingLexerAdapter(new FlexAdapter(new _JSDocLexer(false)), JSDocTokenTypes.TOKENS_TO_MERGE);
+            PsiBuilder builder = PsiBuilderFactory.getInstance()
+                .createBuilder(project, chameleon, lexer, languageForParser, languageVersion, chameleon.getChars());
             JSDocParsing.parseJSDoc(builder);
-        }
-
-        @Override
-        @Nullable
-        protected Lexer createLexer() {
-            return new MergingLexerAdapter(new FlexAdapter(new _JSDocLexer(false)), JSDocTokenTypes.TOKENS_TO_MERGE);
+            return builder.getTreeBuilt();
         }
     };
 
@@ -149,10 +149,21 @@ protected Lexer createLexer() {
     IElementType XML_ATTR_VALUE = XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN;
     IElementType XML_ATTR_VALUE_START = XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
     IElementType XML_ATTR_VALUE_END = XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER;
-    IElementType XML_JS_SCRIPT = new JSChameleonElementType("XML_JS_SCRIPT") {
+    IElementType XML_JS_SCRIPT = new ILazyParseableElementType("XML_JS_SCRIPT") {
         @Override
-        protected void doParse(JavaScriptParsingContext context, PsiBuilder builder) {
-            parseScriptExpression(context, builder);
+        @RequiredReadAction
+        protected ASTNode doParseContents(ASTNode chameleon, PsiElement psi) {
+            Project project = psi.getProject();
+            Language languageForParser = getLanguageForParser(psi);
+            LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
+            LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
+            PsiBuilder builder = PsiBuilderFactory.getInstance()
+                .createBuilder(project, chameleon, null, languageForParser, languageVersion, chameleon.getChars());
+            JavaScriptParser parser = (JavaScriptParser) ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
+
+            JavaScriptParsingContext parsingContext = parser.createParsingContext();
+            parseScriptExpression(parsingContext, builder);
+            return builder.getTreeBuilt();
         }
 
         public void parseScriptExpression(JavaScriptParsingContext context, PsiBuilder builder) {
@@ -437,32 +448,4 @@ public void parseScriptExpression(JavaScriptParsingContext context, PsiBuilder b
 
     @Deprecated
     TokenSet IDENTIFIER_TOKENS_SET = TokenSet.create(IDENTIFIER);
-
-    abstract class JSChameleonElementType extends ILazyParseableElementType {
-        public JSChameleonElementType(String name) {
-            super(name, JavaScriptLanguage.INSTANCE);
-        }
-
-        protected abstract void doParse(JavaScriptParsingContext context, PsiBuilder builder);
-
-        @Override
-        @RequiredReadAction
-        protected ASTNode doParseContents(ASTNode chameleon, PsiElement psi) {
-            Project project = psi.getProject();
-            Language languageForParser = getLanguageForParser(psi);
-            LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
-            LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
-            PsiBuilder builder = PsiBuilderFactory.getInstance()
-                .createBuilder(project, chameleon, createLexer(), languageForParser, languageVersion, chameleon.getChars());
-            JavaScriptParser parser = (JavaScriptParser)ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
-
-            JavaScriptParsingContext parsingContext = parser.createParsingContext();
-            doParse(parsingContext, builder);
-            return builder.getTreeBuilt();
-        }
-
-        protected Lexer createLexer() {
-            return null;
-        }
-    }
 }
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/BaseTypeScriptLanguageVersion.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/BaseTypeScriptLanguageVersion.java
index 802a9152..017d9d77 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/BaseTypeScriptLanguageVersion.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/version/BaseTypeScriptLanguageVersion.java
@@ -1,9 +1,9 @@
 package consulo.typescript.version;
 
 import consulo.javascript.ecmascript.lang.BaseEcmaScriptJavaScriptVersion;
+import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.javascript.language.JavaScriptFeature;
 import consulo.javascript.language.StandardJavaScriptVersion;
-import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.language.editor.highlight.SyntaxHighlighter;
 import consulo.language.lexer.Lexer;
 import consulo.language.parser.PsiParser;

From b37470c47c9f0285fd7bb63301f17ca42067d7ff Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 25 Mar 2026 10:57:31 +0200
Subject: [PATCH 324/340] fix npe while parsing

---
 .../java/com/intellij/lang/javascript/JSTokenTypes.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index 49220400..fd6de360 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -154,12 +154,12 @@ protected ASTNode doParseContents(ASTNode chameleon, PsiElement psi) {
         @RequiredReadAction
         protected ASTNode doParseContents(ASTNode chameleon, PsiElement psi) {
             Project project = psi.getProject();
-            Language languageForParser = getLanguageForParser(psi);
             LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
             LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
             PsiBuilder builder = PsiBuilderFactory.getInstance()
-                .createBuilder(project, chameleon, null, languageForParser, languageVersion, chameleon.getChars());
-            JavaScriptParser parser = (JavaScriptParser) ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
+                .createBuilder(project, chameleon, null, languageVersion.getLanguage(), languageVersion, chameleon.getChars());
+            JavaScriptParser parser = (JavaScriptParser) ParserDefinition.forLanguage(languageVersion.getLanguage())
+                .createParser(languageVersion);
 
             JavaScriptParsingContext parsingContext = parser.createParsingContext();
             parseScriptExpression(parsingContext, builder);

From 1cf08d388eb3604795b594fe297fe3787836d379 Mon Sep 17 00:00:00 2001
From: Nikolay Yurchenko <nikolay@yurchenko.su>
Date: Sun, 29 Mar 2026 11:21:37 +0300
Subject: [PATCH 325/340] Fixing UserDataCache. (#119)

---
 .../javascript/flex/XmlBackedJSClassImpl.java | 26 +++++++------------
 .../lang/javascript/psi/impl/JSClassBase.java | 18 ++++++++-----
 .../psi/resolve/JSImportHandlingUtil.java     | 23 ++++++++--------
 .../javascript/psi/resolve/JSResolveUtil.java | 24 ++++++++---------
 4 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index d866f4e5..5c84db14 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -41,7 +41,6 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
-import consulo.util.dataholder.Key;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.psi.XmlRecursiveElementVisitor;
 import consulo.xml.psi.xml.*;
@@ -193,7 +192,7 @@ protected boolean processMembers(
         PsiElement lastParent,
         PsiElement place
     ) {
-        for (JSFile file : CACHED_SCRIPTS.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue()) {
+        for (JSFile file : CACHED_SCRIPTS.get(getParent(), null).getValue()) {
             if (!file.processDeclarations(processor, ResolveState.initial(), null, place)) {
                 return false;
             }
@@ -241,7 +240,7 @@ public boolean doImportFromScripts(PsiScopeProcessor processor, PsiElement place
             boolean adequatePlace = false;
 
             XmlTag parent = getParent();
-            JSFile[] files = CACHED_SCRIPTS.get(CACHED_SCRIPTS_KEY, parent, null).getValue();
+            JSFile[] files = CACHED_SCRIPTS.get(parent, null).getValue();
             for (JSFile file : files) {
                 if (JSImportHandlingUtil.isAdequatePlaceForImport(file, place)) {
                     if (useImports && JSImportHandlingUtil.importClass(processor, file)) {
@@ -263,8 +262,7 @@ public boolean doImportFromScripts(PsiScopeProcessor processor, PsiElement place
     @RequiredReadAction
     public boolean processComponentNames(ResolveProcessor processor) {
         String s = processor.getName();
-        Map<String, String> value =
-            CACHED_COMPONENT_IMPORTS_CACHE.get(CACHED_SHORT_COMPONENTS_REF_KEY, (XmlFile)getContainingFile(), null).getValue();
+        Map<String, String> value = CACHED_COMPONENT_IMPORTS_CACHE.get((XmlFile)getContainingFile(), null).getValue();
 
         if (s != null) {
             String qName = value.get(s);
@@ -286,12 +284,10 @@ public boolean processComponentNames(ResolveProcessor processor) {
         return true;
     }
 
-    private static final Key<CachedValue<JSFile[]>> CACHED_SCRIPTS_KEY = Key.create("cached.scripts");
-    private static final Key<CachedValue<Map<String, String>>> CACHED_SHORT_COMPONENTS_REF_KEY = Key.create("cached.component.refs");
-
     private static final String SCRIPT_TAG_NAME = "Script";
 
-    private static final UserDataCache<CachedValue<JSFile[]>, XmlTag, Object> CACHED_SCRIPTS = new UserDataCache<>() {
+    private static final UserDataCache<CachedValue<JSFile[]>, XmlTag, Object> CACHED_SCRIPTS =
+        new UserDataCache<CachedValue<JSFile[]>, XmlTag, Object>("cached.scripts") {
             @Override
             protected CachedValue<JSFile[]> compute(XmlTag tag, Object p) {
                 return CachedValuesManager.getManager(tag.getProject()).createCachedValue(
@@ -320,7 +316,7 @@ protected CachedValue<JSFile[]> compute(XmlTag tag, Object p) {
         };
 
     private static final UserDataCache<CachedValue<Map<String, String>>, XmlFile, Object> CACHED_COMPONENT_IMPORTS_CACHE =
-        new UserDataCache<>() {
+        new UserDataCache<CachedValue<Map<String, String>>, XmlFile, Object>("cached.component.refs") {
             @Override
             protected CachedValue<Map<String, String>> compute(final XmlFile file, Object p) {
                 return CachedValuesManager.getManager(file.getProject()).createCachedValue(
@@ -371,8 +367,6 @@ public boolean isValid() {
         return getNode().getPsi().isValid();
     }
 
-    private static Key<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>> ourArtificialPsiKey = Key.create("xml.backed.class");
-
     @Nullable
     public static JSClass getXmlBackedClass(XmlFile xmlFile) {
         XmlTag rootTag = getRootTag(xmlFile);
@@ -386,7 +380,7 @@ private static XmlTag getRootTag(XmlFile xmlFile) {
     }
 
     public static XmlBackedJSClassImpl getXmlBackedClass(XmlTag tag) {
-        return myCachedClassCache.get(ourArtificialPsiKey, tag, null).getValue(tag);
+        return CACHED_CLASS_CACHE.get(tag, null).getValue(tag);
     }
 
     public static Collection<JSClass> getClasses(XmlFile file) {
@@ -415,8 +409,8 @@ public static XmlBackedJSClassImpl getContainingComponent(XmlElement element) {
         return getXmlBackedClass((XmlTag)element);
     }
 
-    private static final UserDataCache<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>, XmlTag, Object> myCachedClassCache =
-        new UserDataCache<>() {
+    private static final UserDataCache<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>, XmlTag, Object> CACHED_CLASS_CACHE =
+        new UserDataCache<ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag>, XmlTag, Object>("xml.backed.class") {
             @Override
             protected ParameterizedCachedValue<XmlBackedJSClassImpl, XmlTag> compute(XmlTag tag, Object p) {
                 return CachedValuesManager.getManager(tag.getProject()).createParameterizedCachedValue(
@@ -518,7 +512,7 @@ public PsiElement addBefore(PsiElement element, PsiElement anchor) throws Incorr
     @Nullable
     @RequiredReadAction
     public JSFile findFirstScriptTag() {
-        JSFile[] value = CACHED_SCRIPTS.get(CACHED_SCRIPTS_KEY, getParent(), null).getValue();
+        JSFile[] value = CACHED_SCRIPTS.get(getParent(), null).getValue();
         if (value.length > 0) {
             return value[0];
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
index efe2ecfe..9578f9d1 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSClassBase.java
@@ -47,12 +47,10 @@
  * @author Maxim.Mossienko
  */
 public abstract class JSClassBase extends JSStubElementImpl<JSClassStub> implements JSClass {
-    private static final Key<ParameterizedCachedValue<List<JSClass>, Object>> IMPLEMENTS_LIST_CACHE_KEY = Key.create("implements.list.cache");
-    private static final Key<ParameterizedCachedValue<List<JSClass>, Object>> EXTENDS_LIST_CACHE_KEY = Key.create("implements.list.cache");
     private static final UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> IMPLEMENTS_LIST_CACHE =
-        new ClassesUserDataCache();
+        new ClassesUserDataCache("implements.list.cache");
     private static final UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> EXTENDS_LIST_CACHE =
-        new ExtendsClassesUserDataCache();
+        new ExtendsClassesUserDataCache("extends.list.cache");
 
     private volatile Map<String, Object> myName2FunctionMap;
     private volatile Map<String, JSVariable> myName2FieldsMap;
@@ -281,10 +279,10 @@ private List<JSClass> getClassesFromReferenceList(@Nullable JSReferenceList exte
         PsiElement element = extendsList != null ? extendsList : this;
 
         if (type == JSElementTypes.EXTENDS_LIST) {
-            return EXTENDS_LIST_CACHE.get(EXTENDS_LIST_CACHE_KEY, this, extendsList).getValue(element);
+            return EXTENDS_LIST_CACHE.get(this, extendsList).getValue(element);
         }
         else {
-            return IMPLEMENTS_LIST_CACHE.get(IMPLEMENTS_LIST_CACHE_KEY, this, extendsList).getValue(element);
+            return IMPLEMENTS_LIST_CACHE.get(this, extendsList).getValue(element);
         }
     }
 
@@ -366,6 +364,10 @@ public JSClass[] getImplementedInterfaces() {
     }
 
     private static class ExtendsClassesUserDataCache extends ClassesUserDataCache {
+        private ExtendsClassesUserDataCache(String keyName) {
+            super(keyName);
+        }
+
         @Override
         @RequiredReadAction
         protected List<JSClass> doCompute(Object extendsList) {
@@ -385,6 +387,10 @@ protected List<JSClass> doCompute(Object extendsList) {
     }
 
     private static class ClassesUserDataCache extends UserDataCache<ParameterizedCachedValue<List<JSClass>, Object>, JSClassBase, Object> {
+        private ClassesUserDataCache(String keyName) {
+            super(keyName);
+        }
+
         @Override
         protected ParameterizedCachedValue<List<JSClass>, Object> compute(JSClassBase jsClassBase, Object p) {
             return CachedValuesManager.getManager(jsClassBase.getProject()).createParameterizedCachedValue(
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index e0d8e2cc..5e7924b3 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -57,13 +57,9 @@
  * @since 2008-07-29
  */
 public class JSImportHandlingUtil {
-    public static final Key<CachedValue<Map<String, Object>>> IMPORT_LIST_CACHE_KEY = Key.create("js.import.list.cache");
-    public static final UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object> IMPORT_LIST_CACHE = new ImportListDataCache();
-    public static final Key<CachedValue<Map<String, JSImportedElementResolveResult>>> IMPORT_RESOLVE_CACHE_KEY =
-        Key.create("js.import.resolve");
-    public static final UserDataCache<CachedValue<Map<String, JSImportedElementResolveResult>>, PsiElement, Object>
-        IMPORT_RESOLVE_CACHE =
-        new UserDataCache<>() {
+    public static final UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object> IMPORT_LIST_CACHE = new ImportListDataCache("js.import.list.cache");
+    public static final UserDataCache<CachedValue<Map<String, JSImportedElementResolveResult>>, PsiElement, Object> IMPORT_RESOLVE_CACHE =
+        new UserDataCache<CachedValue<Map<String, JSImportedElementResolveResult>>, PsiElement, Object>("js.import.resolve") {
             @Override
             protected CachedValue<Map<String, JSImportedElementResolveResult>> compute(PsiElement psiElement, Object p) {
                 return CachedValuesManager.getManager(psiElement.getProject()).createCachedValue(
@@ -237,7 +233,7 @@ JSImportedElementResolveResult resolveTypeNameUsingImports(String referencedName
             }
         }
 
-        Map<String, JSImportedElementResolveResult> map = IMPORT_RESOLVE_CACHE.get(IMPORT_RESOLVE_CACHE_KEY, parent, null).getValue();
+        Map<String, JSImportedElementResolveResult> map = IMPORT_RESOLVE_CACHE.get(parent, null).getValue();
         JSImportedElementResolveResult result = map.get(referencedName);
 
         if (result == null) {
@@ -252,7 +248,7 @@ private static JSImportedElementResolveResult resolveTypeNameUsingImportsInner(
         String referencedName,
         PsiNamedElement parent
     ) {
-        Map<String, Object> value = IMPORT_LIST_CACHE.get(IMPORT_LIST_CACHE_KEY, parent, null).getValue();
+        Map<String, Object> value = IMPORT_LIST_CACHE.get(parent, null).getValue();
         JSImportedElementResolveResult expression = FlexImportSupport.tryFindInMap(referencedName, parent, value);
         if (expression != null) {
             return expression;
@@ -358,7 +354,7 @@ public static boolean importClass(PsiScopeProcessor processor, PsiNamedElement p
 
         if (s != null) {
             if (resolveProcessor.specificallyAskingToResolveQualifiedNames()) {
-                Map<String, Object> value = IMPORT_LIST_CACHE.get(IMPORT_LIST_CACHE_KEY, parent, null).getValue();
+                Map<String, Object> value = IMPORT_LIST_CACHE.get(parent, null).getValue();
                 JSImportedElementResolveResult resolveResult =
                     FlexImportSupport.tryFindInMap(s, parent, value, resolveProcessor.getQualifiedNameToImport());
                 if (dispatchResult(resolveResult, processor)) {
@@ -441,6 +437,10 @@ else if (!(place instanceof JSFile)) {
     }
 
     private static class ImportListDataCache extends UserDataCache<CachedValue<Map<String, Object>>, PsiElement, Object> {
+        private ImportListDataCache(String keyName) {
+            super(keyName);
+        }
+
         @Override
         protected final CachedValue<Map<String, Object>> compute(PsiElement owner, Object o) {
             return CachedValuesManager.getManager(owner.getProject()).createCachedValue(
@@ -474,8 +474,7 @@ else if (owner instanceof JSFile || owner instanceof JSStubElementImpl) {
             }
 
             for (PsiElement c : children) {
-                if (c instanceof JSImportStatement) {
-                    JSImportStatement s = ((JSImportStatement)c);
+                if (c instanceof JSImportStatement s) {
 
                     if (s.getImportText() != null) {
                         FlexImportSupport.appendToMap(result, s);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index a4062d8e..97b4f892 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -90,9 +90,8 @@
  * @author max, maxim.mossienko
  */
 public class JSResolveUtil {
-    private static final Key<CachedValue<IntObjectMap<Object>>> CACHED_STATEMENTS = Key.create("JS.RelevantStatements");
     private static final UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> CACHED_DEFS_CACHE =
-        new RelevantDefsUserDataCache();
+        new RelevantDefsUserDataCache("JS.RelevantStatements");
     public static final String PROTOTYPE_FIELD_NAME = "prototype";
 
     private static final String ARRAY_TYPE_NAME = "Array";
@@ -679,10 +678,8 @@ static boolean walkOverStructure(PsiElement context, Processor<PsiNamedElement>
         return true;
     }
 
-    private static final Key<ParameterizedCachedValue<Set<String>, JSElement>> ourCachedOpenedNsesKey = Key.create("opened.nses");
-
-    private static final UserDataCache<ParameterizedCachedValue<Set<String>, JSElement>, JSElement, Object> ourCachedOpenedNsesCache =
-        new UserDataCache<>() {
+    private static final UserDataCache<ParameterizedCachedValue<Set<String>, JSElement>, JSElement, Object> CACHED_OPENED_NSES_CACHE =
+        new UserDataCache<ParameterizedCachedValue<Set<String>, JSElement>, JSElement, Object>("opened.nses") {
             @Override
             protected ParameterizedCachedValue<Set<String>, JSElement> compute(JSElement jsElement, Object p) {
                 return CachedValuesManager.getManager(jsElement.getProject()).createParameterizedCachedValue(
@@ -737,7 +734,7 @@ public static Set<String> calculateOpenNses(PsiElement place) {
             place,
             psiNamedElement -> {
                 if (psiNamedElement instanceof JSElement element) {
-                    result.set(ourCachedOpenedNsesCache.get(ourCachedOpenedNsesKey, element, null).getValue(element));
+                    result.set(CACHED_OPENED_NSES_CACHE.get(element, null).getValue(element));
                 }
                 return false;
             }
@@ -944,7 +941,7 @@ else if (elt instanceof JSFile jsFile) {
 
                     while (tag != null) {
                         if (XmlBackedJSClassImpl.isInlineComponentTag(tag)) {
-                            for (JSVariable var : ourCachedPredefinedVars.get(ourCachedPredefinedVarsKey, (XmlFile)containingFile, null)
+                            for (JSVariable var : CACHED_PREDEFINED_VARS.get((XmlFile)containingFile, null)
                                 .getValue()) {
                                 if (!processor.execute(var, ResolveState.initial())) {
                                     return;
@@ -974,8 +971,8 @@ else if (elt instanceof JSFile jsFile) {
         treeWalkUp(processor, parentElement, elt, place, terminatingParent, currentScope);
     }
 
-    private static UserDataCache<CachedValue<List<JSVariable>>, XmlFile, Object> ourCachedPredefinedVars =
-        new UserDataCache<>() {
+    private static final UserDataCache<CachedValue<List<JSVariable>>, XmlFile, Object> CACHED_PREDEFINED_VARS =
+        new UserDataCache<CachedValue<List<JSVariable>>, XmlFile, Object>("ourCachedPredefinedVarsKey") {
             @Override
             @RequiredReadAction
             protected CachedValue<List<JSVariable>> compute(final XmlFile xmlFile, Object p) {
@@ -992,8 +989,6 @@ protected CachedValue<List<JSVariable>> compute(final XmlFile xmlFile, Object p)
             }
         };
 
-    private static Key<CachedValue<List<JSVariable>>> ourCachedPredefinedVarsKey = Key.create("ourCachedPredefinedVarsKey");
-
     public static boolean processXmlFile(PsiScopeProcessor processor, XmlFile xmlFile, PsiElement place) {
         JSClass clazz = XmlBackedJSClassImpl.getXmlBackedClass(xmlFile);
         return clazz.processDeclarations(processor, ResolveState.initial(), clazz, place);
@@ -1809,7 +1804,7 @@ public static boolean processDeclarationsInScope(
         }
 
         boolean result = true;
-        IntObjectMap<Object> defsMap = CACHED_DEFS_CACHE.get(CACHED_STATEMENTS, scope, null).getValue();
+        IntObjectMap<Object> defsMap = CACHED_DEFS_CACHE.get(scope, null).getValue();
 
         if (requiredName == null) {
             for (Object value : defsMap.values()) {
@@ -1907,6 +1902,9 @@ public JavaScriptImportStatementBase getImportUsed() {
     public static Key<PsiElement> contextKey = Key.create("context.key"); // JSElement or XmlElement
 
     public static class RelevantDefsUserDataCache extends UserDataCache<CachedValue<IntObjectMap<Object>>, JSElement, Object> {
+        public RelevantDefsUserDataCache(String keyName) {
+            super(keyName);
+        }
 
         @Override
         protected CachedValue<IntObjectMap<Object>> compute(final JSElement jsElement, final Object o) {

From 78f364df423fcd7a6813c2fb9d0804938fe027ca Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Tue, 7 Apr 2026 22:17:09 +0300
Subject: [PATCH 326/340] migrate to xmk new api

---
 .../javascript/language/StandardJavaScriptVersions.java   | 4 ++--
 .../javascript/documentation/JSDocumentationProvider.java | 2 +-
 .../com/intellij/lang/javascript/JSLanguageInjector.java  | 4 +---
 .../java/com/intellij/lang/javascript/JSTokenTypes.java   | 2 +-
 .../intellij/lang/javascript/JavaScriptSupportLoader.java | 4 ++--
 .../lang/javascript/XmlAttributeValueJSInjector.java      | 3 +--
 .../com/intellij/lang/javascript/XmlTextJSInjector.java   | 3 +--
 .../lang/javascript/flex/AnnotationBackedDescriptor.java  | 6 +++---
 .../lang/javascript/flex/XmlBackedJSClassImpl.java        | 5 ++---
 .../javascript/inspections/qucikFixes/BaseCreateFix.java  | 8 ++++----
 .../lang/javascript/psi/impl/JSEmbeddedContentImpl.java   | 5 ++---
 .../intellij/lang/javascript/psi/impl/JSPsiImplUtils.java | 2 +-
 .../javascript/psi/impl/JSReferenceExpressionImpl.java    | 4 ++--
 .../intellij/lang/javascript/psi/impl/JSReferenceSet.java | 2 +-
 .../psi/impl/JSSmartCompletionVariantsHandler.java        | 4 ++--
 .../javascript/psi/impl/JSXmlLiteralExpressionImpl.java   | 6 +++---
 .../javascript/psi/resolve/BaseJSSymbolProcessor.java     | 6 +++---
 .../lang/javascript/psi/resolve/JSImportHandlingUtil.java | 7 +++----
 .../lang/javascript/psi/resolve/JSResolveUtil.java        | 4 ++--
 .../lang/javascript/psi/resolve/ResolveProcessor.java     | 4 ++--
 .../javascript/psi/resolve/WalkUpResolveProcessor.java    | 3 +--
 .../com/intellij/lang/javascript/psi/util/JSUtils.java    | 8 ++++----
 .../lang/javascript/validation/JSUnusedImportsHelper.java | 8 ++++----
 .../java/consulo/javascript/lang/parsing/JSXParser.java   | 4 ++--
 .../javascript/debugger/JSDebuggerSupportUtils.java       | 2 +-
 .../style/UnterminatedStatementJSInspection.java          | 4 ++--
 .../ThisExpressionReferencesGlobalObjectJSInspection.java | 2 +-
 .../idea/lang/javascript/intention/JSElementIterator.java | 2 +-
 .../idea/lang/javascript/intention/JSFunctionVisitor.java | 2 +-
 .../idea/lang/javascript/intention/JSIntention.java       | 2 +-
 .../idea/lang/javascript/psiutil/FindReferenceUtil.java   | 2 +-
 .../lang/javascript/impl/JavaScriptCodeContextType.java   | 2 +-
 .../impl/findUsages/JavaScriptFindUsagesProvider.java     | 5 ++---
 .../intellij/lang/javascript/impl/flex/ImportUtils.java   | 6 +++---
 .../javascript/impl/formatter/JSSpacingProcessor.java     | 2 +-
 .../introduceField/JSIntroduceFieldHandler.java           | 2 +-
 .../javascript/impl/validation/JSAnnotatingVisitor.java   | 4 ++--
 .../impl/html/JavaScriptEmbeddedTokenHighlighter.java     | 2 +-
 38 files changed, 69 insertions(+), 78 deletions(-)

diff --git a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
index a5658331..0ed5cfb0 100644
--- a/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
+++ b/base-api/src/main/java/consulo/javascript/language/StandardJavaScriptVersions.java
@@ -18,7 +18,7 @@
 
 import consulo.annotation.component.ComponentScope;
 import consulo.annotation.component.ServiceAPI;
-import consulo.ide.ServiceManager;
+import consulo.application.Application;
 
 import org.jspecify.annotations.Nullable;
 
@@ -32,7 +32,7 @@
 public abstract class StandardJavaScriptVersions {
 
     public static StandardJavaScriptVersions getInstance() {
-        return ServiceManager.getService(StandardJavaScriptVersions.class);
+        return Application.get().getService(StandardJavaScriptVersions.class);
     }
 
     public abstract JavaScriptLanguageVersion getDefaultVersion();
diff --git a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
index 14d114c0..4c2f6cec 100644
--- a/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
+++ b/base-impl/src/main/java/com/intellij/javascript/documentation/JSDocumentationProvider.java
@@ -40,7 +40,7 @@
 import consulo.util.lang.Pair;
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ref.SimpleReference;
-import consulo.xml.psi.xml.XmlToken;
+import consulo.xml.language.psi.XmlToken;
 import org.jspecify.annotations.Nullable;
 
 import java.io.File;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index 92507d9a..6d14597f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -17,7 +17,6 @@
 package com.intellij.lang.javascript;
 
 import com.intellij.lang.javascript.flex.AnnotationBackedDescriptor;
-import com.intellij.xml.XmlElementDescriptorWithCDataContent;
 import consulo.component.util.pointer.NamedPointer;
 import consulo.document.util.TextRange;
 import consulo.javascript.language.JavaScriptLanguage;
@@ -31,9 +30,8 @@
 import consulo.language.psi.PsiLanguageInjectionHost;
 import consulo.language.psi.meta.PsiMetaData;
 import consulo.util.lang.StringUtil;
+import consulo.xml.language.psi.*;
 import consulo.xml.psi.html.HtmlTag;
-import consulo.xml.psi.xml.*;
-
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
index fd6de360..7ffb4bc5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java
@@ -36,7 +36,7 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.version.LanguageVersion;
 import consulo.project.Project;
-import consulo.xml.psi.xml.XmlTokenType;
+import consulo.xml.language.psi.XmlTokenType;
 
 /**
  * @author max, maxim.mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
index 1923e16c..2a6f87aa 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
@@ -23,8 +23,8 @@
 import consulo.util.collection.ArrayUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.xml.ide.highlighter.XmlFileType;
-import consulo.xml.psi.xml.XmlFile;
-import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.language.psi.XmlFile;
+import consulo.xml.language.psi.XmlTag;
 
 /**
  * @by max, maxim.mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
index 90eea90f..7c9764e9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
@@ -2,8 +2,7 @@
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-import consulo.xml.psi.xml.XmlAttributeValue;
-
+import consulo.xml.language.psi.XmlAttributeValue;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
index 330e6b35..9be6325f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
@@ -2,8 +2,7 @@
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.language.psi.PsiElement;
-import consulo.xml.psi.xml.XmlText;
-
+import consulo.xml.language.psi.XmlText;
 
 /**
  * @author VISTALL
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
index 42e8ba86..97a4ffa4 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/AnnotationBackedDescriptor.java
@@ -16,9 +16,9 @@
 
 package com.intellij.lang.javascript.flex;
 
-import com.intellij.xml.XmlAttributeDescriptor;
-import com.intellij.xml.XmlElementDescriptor;
-import com.intellij.xml.XmlElementDescriptorWithCDataContent;
+import consulo.xml.descriptor.XmlAttributeDescriptor;
+import consulo.xml.descriptor.XmlElementDescriptor;
+import consulo.xml.descriptor.XmlElementDescriptorWithCDataContent;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
index 5c84db14..744423b5 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/flex/XmlBackedJSClassImpl.java
@@ -25,7 +25,6 @@
 import com.intellij.lang.javascript.psi.resolve.JSImportHandlingUtil;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
 import com.intellij.lang.javascript.psi.resolve.ResolveProcessor;
-import com.intellij.xml.XmlElementDescriptor;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.access.RequiredWriteAction;
 import consulo.application.util.*;
@@ -42,8 +41,8 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
 import consulo.virtualFileSystem.VirtualFile;
-import consulo.xml.psi.XmlRecursiveElementVisitor;
-import consulo.xml.psi.xml.*;
+import consulo.xml.descriptor.XmlElementDescriptor;
+import consulo.xml.language.psi.*;
 import org.jspecify.annotations.Nullable;
 
 import java.util.*;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
index 1867246d..5e3712a9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/inspections/qucikFixes/BaseCreateFix.java
@@ -42,10 +42,10 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.navigation.OpenFileDescriptorFactory;
 import consulo.project.Project;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlFile;
-import consulo.xml.psi.xml.XmlTag;
-import consulo.xml.psi.xml.XmlText;
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlFile;
+import consulo.xml.language.psi.XmlTag;
+import consulo.xml.language.psi.XmlText;
 import org.jspecify.annotations.Nullable;
 
 import java.util.Collections;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
index f9905bfc..11a80117 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSEmbeddedContentImpl.java
@@ -28,9 +28,8 @@
 import consulo.language.psi.resolve.PsiScopeProcessor;
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.util.IncorrectOperationException;
-import consulo.xml.psi.xml.XmlTag;
-import consulo.xml.psi.xml.XmlTagChild;
-
+import consulo.xml.language.psi.XmlTag;
+import consulo.xml.language.psi.XmlTagChild;
 
 /**
  * @author max
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index 5a410b23..fb139d8b 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -44,7 +44,7 @@
 import consulo.util.collection.HashingStrategy;
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.VirtualFile;
-import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.language.psi.XmlFile;
 import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
index 0f135737..f835a744 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceExpressionImpl.java
@@ -38,8 +38,8 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
 import consulo.util.collection.ArrayUtil;
-import consulo.xml.psi.xml.XmlFile;
-import consulo.xml.psi.xml.XmlToken;
+import consulo.xml.language.psi.XmlFile;
+import consulo.xml.language.psi.XmlToken;
 import org.jspecify.annotations.Nullable;
 
 import java.util.Set;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
index 0ea099da..0d2837a2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSReferenceSet.java
@@ -33,7 +33,7 @@
 import consulo.project.Project;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.StringUtil;
-import consulo.xml.psi.xml.*;
+import consulo.xml.language.psi.*;
 import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
index 29e054be..b836e74d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSSmartCompletionVariantsHandler.java
@@ -32,8 +32,8 @@
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.ref.Ref;
 import consulo.util.lang.ref.SimpleReference;
-import consulo.xml.psi.xml.XmlFile;
-import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.language.psi.XmlFile;
+import consulo.xml.language.psi.XmlTag;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
index 84c85019..c496268e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSXmlLiteralExpressionImpl.java
@@ -19,8 +19,6 @@
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.xml.XmlElementDescriptor;
-import com.intellij.xml.XmlNSDescriptor;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.access.RequiredWriteAction;
 import consulo.document.util.TextRange;
@@ -31,7 +29,9 @@
 import consulo.language.psi.meta.PsiMetaData;
 import consulo.language.psi.resolve.PsiElementProcessor;
 import consulo.language.util.IncorrectOperationException;
-import consulo.xml.psi.xml.*;
+import consulo.xml.descriptor.XmlElementDescriptor;
+import consulo.xml.descriptor.XmlNSDescriptor;
+import consulo.xml.language.psi.*;
 import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
index 9152d471..19f0ec69 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/BaseJSSymbolProcessor.java
@@ -41,9 +41,9 @@
 import consulo.util.dataholder.Key;
 import consulo.util.lang.Pair;
 import consulo.util.lang.StringUtil;
-import consulo.xml.psi.xml.XmlFile;
-import consulo.xml.psi.xml.XmlTag;
-import consulo.xml.psi.xml.XmlToken;
+import consulo.xml.language.psi.XmlFile;
+import consulo.xml.language.psi.XmlTag;
+import consulo.xml.language.psi.XmlToken;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
index 5e7924b3..77c0af47 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSImportHandlingUtil.java
@@ -23,7 +23,6 @@
 import com.intellij.lang.javascript.psi.*;
 import com.intellij.lang.javascript.psi.impl.JSClassBase;
 import com.intellij.lang.javascript.psi.impl.JSStubElementImpl;
-import com.intellij.xml.XmlElementDescriptor;
 import consulo.application.util.CachedValue;
 import consulo.application.util.CachedValueProvider;
 import consulo.application.util.CachedValuesManager;
@@ -41,9 +40,9 @@
 import consulo.language.version.LanguageVersion;
 import consulo.util.dataholder.Key;
 import consulo.util.lang.ref.Ref;
-import consulo.xml.psi.xml.XmlFile;
-import consulo.xml.psi.xml.XmlTag;
-
+import consulo.xml.descriptor.XmlElementDescriptor;
+import consulo.xml.language.psi.XmlFile;
+import consulo.xml.language.psi.XmlTag;
 import org.jspecify.annotations.Nullable;
 
 import java.util.HashMap;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 97b4f892..d8437c9e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -31,7 +31,6 @@
 import com.intellij.lang.javascript.psi.impl.JSFileImpl;
 import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
 import com.intellij.lang.javascript.psi.impl.JSStubElementImpl;
-import com.intellij.xml.XmlElementDescriptor;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.access.RequiredWriteAction;
 import consulo.application.util.*;
@@ -80,8 +79,9 @@
 import consulo.util.lang.ref.SimpleReference;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.util.VirtualFileUtil;
+import consulo.xml.descriptor.XmlElementDescriptor;
 import consulo.xml.ide.highlighter.XmlFileType;
-import consulo.xml.psi.xml.*;
+import consulo.xml.language.psi.*;
 import org.jspecify.annotations.Nullable;
 
 import java.util.*;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
index 4a244501..ff1c8a25 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/ResolveProcessor.java
@@ -36,8 +36,8 @@
 import consulo.util.collection.SmartList;
 import consulo.util.dataholder.Key;
 import consulo.util.dataholder.UserDataHolderBase;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlTag;
 import org.jspecify.annotations.Nullable;
 
 import java.util.*;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
index 9090b844..01c5f917 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/WalkUpResolveProcessor.java
@@ -29,8 +29,7 @@
 import consulo.language.psi.resolve.ResolveState;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.collection.ArrayUtil;
-import consulo.xml.psi.xml.XmlAttributeValue;
-
+import consulo.xml.language.psi.XmlAttributeValue;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
index c74d193c..193c469e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/util/JSUtils.java
@@ -22,10 +22,10 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.template.TemplateLanguageFileViewProvider;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlFile;
-import consulo.xml.psi.xml.XmlTag;
-import consulo.xml.psi.xml.XmlTagChild;
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlFile;
+import consulo.xml.language.psi.XmlTag;
+import consulo.xml.language.psi.XmlTagChild;
 
 import static com.intellij.lang.javascript.JSElementTypes.*;
 import static com.intellij.lang.javascript.JSTokenTypes.*;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
index a7b84c93..a46c7a5f 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/validation/JSUnusedImportsHelper.java
@@ -34,10 +34,10 @@
 import consulo.util.dataholder.Key;
 import consulo.util.lang.Pair;
 import consulo.util.lang.StringUtil;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlFile;
-import consulo.xml.psi.xml.XmlTag;
-import consulo.xml.psi.xml.XmlText;
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlFile;
+import consulo.xml.language.psi.XmlTag;
+import consulo.xml.language.psi.XmlText;
 import org.jspecify.annotations.Nullable;
 
 import java.util.*;
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index f3f0c579..e88c6c43 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -9,8 +9,8 @@
 import consulo.language.parser.PsiBuilder;
 import consulo.localize.LocalizeValue;
 import consulo.xml.impl.localize.XmlErrorLocalize;
-import consulo.xml.psi.xml.XmlElementType;
-import consulo.xml.psi.xml.XmlTokenType;
+import consulo.xml.language.psi.XmlElementType;
+import consulo.xml.language.psi.XmlTokenType;
 import org.jspecify.annotations.Nullable;
 
 import java.util.Stack;
diff --git a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
index 0cd1b831..d96c57d5 100644
--- a/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
+++ b/debugger/debugger-impl/src/main/java/consulo/javascript/debugger/JSDebuggerSupportUtils.java
@@ -29,8 +29,8 @@
 import consulo.project.Project;
 import consulo.util.lang.ref.Ref;
 import consulo.virtualFileSystem.VirtualFile;
-import consulo.xml.lang.xml.XMLLanguage;
 
+import consulo.xml.language.XMLLanguage;
 import org.jspecify.annotations.Nullable;
 import java.util.List;
 
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
index 97ae8456..1eb48c60 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/style/UnterminatedStatementJSInspection.java
@@ -15,8 +15,8 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlTagChild;
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlTagChild;
 import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
diff --git a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
index fe4ccb93..350406a8 100644
--- a/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
+++ b/inspections/src/main/java/com/sixrr/inspectjs/validity/ThisExpressionReferencesGlobalObjectJSInspection.java
@@ -13,7 +13,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.localize.LocalizeValue;
-import consulo.xml.psi.xml.XmlAttributeValue;
+import consulo.xml.language.psi.XmlAttributeValue;
 import org.jspecify.annotations.Nullable;
 
 @ExtensionImpl
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
index 8764d83d..1b9ad457 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSElementIterator.java
@@ -17,7 +17,7 @@
 
 import com.intellij.lang.javascript.psi.JSElement;
 import consulo.language.psi.PsiElement;
-import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.language.psi.XmlFile;
 import org.intellij.idea.lang.javascript.psiutil.ArrayStack;
 
 import java.util.Iterator;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
index 92409c56..a85318a4 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSFunctionVisitor.java
@@ -23,7 +23,7 @@
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.logging.Logger;
-import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.language.psi.XmlFile;
 import org.intellij.idea.lang.javascript.psiutil.FindReferenceUtil;
 
 import java.util.Iterator;
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
index e4410eb1..5deedcb9 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/intention/JSIntention.java
@@ -24,7 +24,7 @@
 import consulo.language.util.IncorrectOperationException;
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
-import consulo.xml.psi.xml.XmlElement;
+import consulo.xml.language.psi.XmlElement;
 import org.jspecify.annotations.Nullable;
 
 public abstract class JSIntention extends PsiElementBaseIntentionAction {
diff --git a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
index 26970c6c..68a0d2ed 100644
--- a/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
+++ b/intentions/src/main/java/org/intellij/idea/lang/javascript/psiutil/FindReferenceUtil.java
@@ -21,7 +21,7 @@
 import com.intellij.lang.javascript.psi.JSVariable;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.language.psi.XmlFile;
 import org.jspecify.annotations.Nullable;
 import org.intellij.idea.lang.javascript.intention.JSElementIterator;
 import org.intellij.idea.lang.javascript.intention.JSFunctionVisitor;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
index b2096c0e..ae2b8229 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/JavaScriptCodeContextType.java
@@ -34,7 +34,7 @@
 import consulo.language.psi.PsiLanguageInjectionHost;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.ref.SimpleReference;
-import consulo.xml.lang.xml.XMLLanguage;
+import consulo.xml.language.XMLLanguage;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
index 79c5bdd2..0a1e879d 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptFindUsagesProvider.java
@@ -25,9 +25,8 @@
 import consulo.language.findUsage.FindUsagesProvider;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiNamedElement;
-import consulo.xml.psi.xml.XmlTag;
-import consulo.xml.psi.xml.XmlToken;
-
+import consulo.xml.language.psi.XmlTag;
+import consulo.xml.language.psi.XmlToken;
 
 /**
  * @author max
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
index 65957919..52bb6954 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/flex/ImportUtils.java
@@ -39,9 +39,9 @@
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.Comparing;
 import consulo.util.lang.Pair;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlTag;
-import consulo.xml.psi.xml.XmlText;
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlTag;
+import consulo.xml.language.psi.XmlText;
 import org.jspecify.annotations.Nullable;
 
 import java.util.*;
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
index 6073d735..aaa58dda 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/formatter/JSSpacingProcessor.java
@@ -33,7 +33,7 @@
 import consulo.language.psi.PsiUtilCore;
 import consulo.language.psi.PsiWhiteSpace;
 import consulo.language.psi.util.PsiTreeUtil;
-import consulo.xml.psi.xml.XmlText;
+import consulo.xml.language.psi.XmlText;
 
 /**
  * @author ven
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
index e6d1aec1..4d77607f 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/refactoring/introduceField/JSIntroduceFieldHandler.java
@@ -33,7 +33,7 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
-import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.language.psi.XmlFile;
 
 /**
  * @author Maxim.Mossienko
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
index baafd2d3..981343cb 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/validation/JSAnnotatingVisitor.java
@@ -53,8 +53,8 @@
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.util.lang.ref.SimpleReference;
 import consulo.virtualFileSystem.VirtualFile;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlTagChild;
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlTagChild;
 
 import java.util.*;
 
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
index 5a9698f4..68bf58b1 100644
--- a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
@@ -6,7 +6,7 @@
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.language.ast.IElementType;
 import consulo.util.collection.MultiMap;
-import consulo.xml.lang.xml.XMLLanguage;
+import consulo.xml.language.XMLLanguage;
 
 /**
  * @author VISTALL

From 7a08b8dcb31020d51d44dfe812f5b5d31ea48346 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 10 Apr 2026 23:26:53 +0300
Subject: [PATCH 327/340] reorganize dependencies - preparing for TS tests

---
 base-api/pom.xml                              | 101 ++++---
 base-api/src/main/java/module-info.java       |   7 +-
 base-impl/pom.xml                             | 137 ++++++----
 .../lang/javascript/JSLanguageInjector.java   |   2 +-
 .../JavaScriptHighlightingLexer.java          |   2 +-
 .../javascript/JavaScriptSupportLoader.java   |   2 +-
 .../JavaScriptHighlightingLexer.java          |   2 +-
 .../javascript/psi/resolve/JSResolveUtil.java |   2 +-
 .../javascript/lang/parsing/JSXParser.java    |   2 +-
 base-impl/src/main/java/module-info.java      |   7 +-
 debugger/browser-debugger-impl/pom.xml        |   7 -
 .../src/main/java/module-info.java            |   6 +
 debugger/cdt-debugger-impl/pom.xml            |   7 -
 debugger/debugger-impl/pom.xml                |   2 +-
 .../src/main/java/module-info.java            |   2 +-
 debugger/v8-debugger-impl/pom.xml             |  69 -----
 .../run/debug/v8/V8BaseDebugProcess.java      | 247 ------------------
 .../run/debug/v8/V8BaseVariableValue.java     | 155 -----------
 .../run/debug/v8/V8DebugEventListener.java    | 146 -----------
 .../run/debug/v8/V8DebugProcess.java          |  65 -----
 .../run/debug/v8/V8ExecutionStack.java        |  63 -----
 .../javascript/run/debug/v8/V8ScriptUtil.java |  69 -----
 .../javascript/run/debug/v8/V8StackFrame.java | 125 ---------
 .../run/debug/v8/V8SuspendContext.java        |  50 ----
 .../run/debug/v8/V8VariableValue.java         | 153 -----------
 .../javascript/run/debug/v8/V8WatchValue.java |  45 ----
 .../src/main/java/module-info.java            |  12 -
 inspections/pom.xml                           |   2 +-
 inspections/src/main/java/module-info.java    |   6 +-
 intentions/pom.xml                            |   2 +-
 intentions/src/main/java/module-info.java     |   2 +-
 lang-version-impl/ecmascript-impl/pom.xml     |  24 +-
 .../src/main/java/module-info.java            |   4 +-
 lang-version-impl/typescript-impl/pom.xml     |   2 +-
 .../src/main/java/module-info.java            |   2 +
 .../parser/test/TypeScriptParserTest.java     |  26 ++
 .../src/test/resources/parsing/simple.ts      |   3 +
 plugin/pom.xml                                |  34 +++
 .../JSUnresolvedFunctionInspection.java       |   2 +-
 .../JSXTagTreeHighlightingPassFactory.java    |   2 +-
 .../JavaScriptEmbeddedTokenHighlighter.java   |   2 +-
 .../JavaScriptHtmlScriptContentProvider.java  |   2 +-
 plugin/src/main/java/module-info.java         |   7 +
 regexp-impl/pom.xml                           |  77 +++---
 .../src/main/java/module-info.java            |   2 +
 45 files changed, 289 insertions(+), 1399 deletions(-)
 delete mode 100644 debugger/v8-debugger-impl/pom.xml
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugEventListener.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
 delete mode 100644 debugger/v8-debugger-impl/src/main/java/module-info.java
 create mode 100644 lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/simple.ts
 rename {lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx => plugin/src/main/java/consulo/javascript/impl}/codeInsight/JSXTagTreeHighlightingPassFactory.java (96%)

diff --git a/base-api/pom.xml b/base-api/pom.xml
index b7bc90b0..6b621c43 100644
--- a/base-api/pom.xml
+++ b/base-api/pom.xml
@@ -15,51 +15,66 @@
   - limitations under the License.
   -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.bind.java</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-base.api</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript-base.api</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.dev/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>interval:60</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>consulo.maven</groupId>
-				<artifactId>maven-consulo-plugin</artifactId>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<id>gen</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate-icon</goal>
-							<goal>generate-localize</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>consulo.maven</groupId>
+                <artifactId>maven-consulo-plugin</artifactId>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>gen</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate-icon</goal>
+                            <goal>generate-localize</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-	<dependencies>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-editor-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-code-style-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/base-api/src/main/java/module-info.java b/base-api/src/main/java/module-info.java
index 0a8a9b01..a115ca94 100644
--- a/base-api/src/main/java/module-info.java
+++ b/base-api/src/main/java/module-info.java
@@ -2,9 +2,10 @@
  * @author VISTALL
  * @since 2022-08-23
  */
-open module consulo.javascript.base.api
-{
-    requires transitive consulo.ide.api;
+open module consulo.javascript.base.api {
+    requires transitive consulo.language.api;
+    requires transitive consulo.language.editor.api;
+    requires transitive consulo.language.code.style.api;
 
     exports com.intellij.lang.javascript.formatter;
     exports com.intellij.lang.javascript.psi;
diff --git a/base-impl/pom.xml b/base-impl/pom.xml
index 48887e2e..70f1d7f5 100644
--- a/base-impl/pom.xml
+++ b/base-impl/pom.xml
@@ -15,67 +15,90 @@
   - limitations under the License.
   -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.bind.java</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-base.impl</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript-base.impl</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>consulo.maven</groupId>
-				<artifactId>maven-consulo-plugin</artifactId>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate-lexers</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>consulo.maven</groupId>
+                <artifactId>maven-consulo-plugin</artifactId>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate-lexers</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.dev/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-base.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-editor-refactoring-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml.api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml.html.api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml.editor.api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index 6d14597f..0a1ad51d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -19,6 +19,7 @@
 import com.intellij.lang.javascript.flex.AnnotationBackedDescriptor;
 import consulo.component.util.pointer.NamedPointer;
 import consulo.document.util.TextRange;
+import consulo.html.language.psi.HtmlTag;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
 import consulo.language.LanguagePointerUtil;
@@ -31,7 +32,6 @@
 import consulo.language.psi.meta.PsiMetaData;
 import consulo.util.lang.StringUtil;
 import consulo.xml.language.psi.*;
-import consulo.xml.psi.html.HtmlTag;
 
 /**
  * @author Maxim.Mossienko
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
index cb5a40c7..c565d81d 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptHighlightingLexer.java
@@ -16,10 +16,10 @@
 
 package com.intellij.lang.javascript;
 
+import consulo.html.language.HTMLLanguage;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.highlight.SyntaxHighlighterFactory;
 import consulo.language.lexer.*;
-import consulo.xml.lang.html.HTMLLanguage;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
index 2a6f87aa..02139c01 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JavaScriptSupportLoader.java
@@ -22,7 +22,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.util.collection.ArrayUtil;
 import consulo.virtualFileSystem.VirtualFile;
-import consulo.xml.ide.highlighter.XmlFileType;
+import consulo.xml.language.XmlFileType;
 import consulo.xml.language.psi.XmlFile;
 import consulo.xml.language.psi.XmlTag;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
index 03207bce..b472f69e 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/highlighting/JavaScriptHighlightingLexer.java
@@ -20,10 +20,10 @@
 import com.intellij.lang.javascript.JSDocTokenTypes;
 import com.intellij.lang.javascript.JSTokenTypes;
 import com.intellij.lang.javascript._JSDocLexer;
+import consulo.html.language.HTMLLanguage;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.highlight.SyntaxHighlighterFactory;
 import consulo.language.lexer.*;
-import consulo.xml.lang.html.HTMLLanguage;
 
 import java.util.function.Supplier;
 
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index d8437c9e..1d51a3e2 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -80,7 +80,7 @@
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.util.VirtualFileUtil;
 import consulo.xml.descriptor.XmlElementDescriptor;
-import consulo.xml.ide.highlighter.XmlFileType;
+import consulo.xml.language.XmlFileType;
 import consulo.xml.language.psi.*;
 import org.jspecify.annotations.Nullable;
 
diff --git a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
index e88c6c43..0186889f 100644
--- a/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
+++ b/base-impl/src/main/java/consulo/javascript/lang/parsing/JSXParser.java
@@ -8,9 +8,9 @@
 import consulo.language.ast.TokenType;
 import consulo.language.parser.PsiBuilder;
 import consulo.localize.LocalizeValue;
-import consulo.xml.impl.localize.XmlErrorLocalize;
 import consulo.xml.language.psi.XmlElementType;
 import consulo.xml.language.psi.XmlTokenType;
+import consulo.xml.localize.XmlErrorLocalize;
 import org.jspecify.annotations.Nullable;
 
 import java.util.Stack;
diff --git a/base-impl/src/main/java/module-info.java b/base-impl/src/main/java/module-info.java
index dc987e32..64da9047 100644
--- a/base-impl/src/main/java/module-info.java
+++ b/base-impl/src/main/java/module-info.java
@@ -5,8 +5,13 @@
 open module consulo.javascript.base.impl {
     requires transitive consulo.javascript.base.api;
 
+    requires consulo.language.impl;
+    requires consulo.language.editor.refactoring.api;
+
     requires com.google.common;
-    requires com.intellij.xml;
+    requires com.intellij.xml.api;
+    requires com.intellij.xml.editor.api;
+    requires com.intellij.xml.html.api;
 
     exports com.intellij.javascript.documentation;
     exports com.intellij.lang.javascript;
diff --git a/debugger/browser-debugger-impl/pom.xml b/debugger/browser-debugger-impl/pom.xml
index 5ebf640d..760cda83 100644
--- a/debugger/browser-debugger-impl/pom.xml
+++ b/debugger/browser-debugger-impl/pom.xml
@@ -59,13 +59,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>com.intellij.xml</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/debugger/browser-debugger-impl/src/main/java/module-info.java b/debugger/browser-debugger-impl/src/main/java/module-info.java
index 2aed0f0e..2c7df57d 100644
--- a/debugger/browser-debugger-impl/src/main/java/module-info.java
+++ b/debugger/browser-debugger-impl/src/main/java/module-info.java
@@ -11,5 +11,11 @@
 
     requires consulo.javascript.cdt.debugger.impl;
 
+    requires consulo.builtin.web.server.api;
+
+    requires consulo.compiler.api;
+
+    requires consulo.web.browser.api;
+
     opens consulo.javascript.debugger.browser to consulo.util.xml.serializer;
 }
\ No newline at end of file
diff --git a/debugger/cdt-debugger-impl/pom.xml b/debugger/cdt-debugger-impl/pom.xml
index 56c8ba66..2f5cab9f 100644
--- a/debugger/cdt-debugger-impl/pom.xml
+++ b/debugger/cdt-debugger-impl/pom.xml
@@ -53,13 +53,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>com.intellij.xml</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>consulo.internal.com.github.kklisura.cdt</groupId>
             <artifactId>cdt-java-client</artifactId>
diff --git a/debugger/debugger-impl/pom.xml b/debugger/debugger-impl/pom.xml
index bfe4827d..d405ddba 100644
--- a/debugger/debugger-impl/pom.xml
+++ b/debugger/debugger-impl/pom.xml
@@ -49,7 +49,7 @@
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
+			<artifactId>com.intellij.xml.api</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/debugger/debugger-impl/src/main/java/module-info.java b/debugger/debugger-impl/src/main/java/module-info.java
index 0f05d371..5cc612c4 100644
--- a/debugger/debugger-impl/src/main/java/module-info.java
+++ b/debugger/debugger-impl/src/main/java/module-info.java
@@ -13,7 +13,7 @@
 
 	requires transitive consulo.execution.debug.api;
 
-	requires com.intellij.xml;
+	requires com.intellij.xml.api;
 
 	exports consulo.javascript.debugger;
 }
\ No newline at end of file
diff --git a/debugger/v8-debugger-impl/pom.xml b/debugger/v8-debugger-impl/pom.xml
deleted file mode 100644
index 5cca4523..00000000
--- a/debugger/v8-debugger-impl/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  - Copyright 2013-2017 consulo.io
-  -
-  - 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.
-  -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-v8.debugger.impl</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.dev/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-debugger.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.googlecode.json-simple</groupId>
-			<artifactId>json-simple</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>consulo.internal</groupId>
-			<artifactId>lib.org.chromium.sdk</artifactId>
-			<version>1.0-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
deleted file mode 100644
index a8600736..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseDebugProcess.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright 2013-2020 consulo.io
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.application.Application;
-import consulo.execution.ExecutionResult;
-import consulo.execution.debug.*;
-import consulo.execution.debug.breakpoint.XBreakpointHandler;
-import consulo.execution.debug.breakpoint.XBreakpointProperties;
-import consulo.execution.debug.breakpoint.XExpression;
-import consulo.execution.debug.breakpoint.XLineBreakpoint;
-import consulo.execution.debug.evaluation.XDebuggerEditorsProvider;
-import consulo.execution.debug.frame.XSuspendContext;
-import consulo.execution.debug.icon.ExecutionDebugIconGroup;
-import consulo.execution.debug.localize.XDebuggerLocalize;
-import consulo.execution.debug.ui.XDebugTabLayouter;
-import consulo.execution.ui.ExecutionConsole;
-import consulo.execution.ui.layout.RunnerLayoutUi;
-import consulo.javascript.debugger.JavaScriptEditorsProvider;
-import consulo.javascript.debugger.JavaScriptLineBreakpointType;
-import consulo.javascript.debugger.JavaScriptListPanel;
-import consulo.javascript.icon.JavaScriptIconGroup;
-import consulo.localize.LocalizeValue;
-import consulo.process.ExecutionException;
-import consulo.process.ProcessHandler;
-import consulo.ui.ex.awt.UIUtil;
-import consulo.ui.ex.content.Content;
-import consulo.virtualFileSystem.VirtualFile;
-import org.jspecify.annotations.Nullable;
-import org.chromium.sdk.Breakpoint;
-import org.chromium.sdk.DebugContext;
-import org.chromium.sdk.JavascriptVm;
-import org.chromium.sdk.Script;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author VISTALL
- * @since 2020-06-16
- */
-public abstract class V8BaseDebugProcess<V extends JavascriptVm> extends XDebugProcess {
-    protected V myVm;
-
-    private final ExecutionResult myResult;
-    private DebugContext myCurrentDebugContext;
-    private JavaScriptListPanel<Script> myScriptListPanel;
-
-    private final XBreakpointManager myXBreakpointManager;
-
-    private Map<Breakpoint, XLineBreakpoint> myBreakpoints = new HashMap<>();
-
-    public V8BaseDebugProcess(XDebugSession session, ExecutionResult result) throws ExecutionException {
-        super(session);
-        myScriptListPanel = new JavaScriptListPanel<Script>(session.getProject()) {
-            @Nullable
-            @Override
-            public VirtualFile toVirtualFile(Script value, boolean toOpen) {
-                return V8ScriptUtil.toVirtualFile(value, toOpen);
-            }
-        };
-        myResult = result;
-        myXBreakpointManager = XDebuggerManager.getInstance(getSession().getProject()).getBreakpointManager();
-        getSession().setPauseActionSupported(true);
-    }
-
-    @Nullable
-    @Override
-    protected ProcessHandler doGetProcessHandler() {
-        return myResult.getProcessHandler();
-    }
-
-    @Override
-    public boolean checkCanPerformCommands() {
-        return myVm != null && myVm.isAttached();
-    }
-
-    @Override
-    public XDebuggerEditorsProvider getEditorsProvider() {
-        return JavaScriptEditorsProvider.INSTANCE;
-    }
-
-    @Override
-    public ExecutionConsole createConsole() {
-        return myResult.getExecutionConsole();
-    }
-
-    @Override
-    public boolean checkCanInitBreakpoints() {
-        return false;
-    }
-
-    @Override
-    public XBreakpointHandler<?>[] getBreakpointHandlers() {
-        return new XBreakpointHandler[]{
-            new XBreakpointHandler<XLineBreakpoint<XBreakpointProperties>>(JavaScriptLineBreakpointType.class) {
-                @Override
-                public void registerBreakpoint(final XLineBreakpoint lineBreakpoint) {
-                    String presentableFilePath = lineBreakpoint.getPresentableFilePath();
-                    int line = lineBreakpoint.getLine();
-                    XExpression conditionExpression = lineBreakpoint.getConditionExpression();
-                    String expression = conditionExpression == null ? null : conditionExpression.getExpression();
-                    myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), line, Breakpoint.EMPTY_VALUE, true, expression, new JavascriptVm.BreakpointCallback() {
-                        @Override
-                        public void success(Breakpoint breakpoint) {
-                            myBreakpoints.put(breakpoint, lineBreakpoint);
-                            myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, ExecutionDebugIconGroup.breakpointBreakpointvalid(), null);
-                        }
-
-                        @Override
-                        public void failure(String s) {
-                            myXBreakpointManager.updateBreakpointPresentation(lineBreakpoint, ExecutionDebugIconGroup.breakpointBreakpointinvalid(), s);
-                        }
-                    }, null);
-                }
-
-                @Override
-                public void unregisterBreakpoint(XLineBreakpoint breakpoint, boolean b) {
-                    String presentableFilePath = breakpoint.getPresentableFilePath();
-                    myVm.setBreakpoint(new Breakpoint.Target.ScriptName(presentableFilePath), breakpoint.getLine(), Breakpoint.EMPTY_VALUE, false, null, null, null);
-                }
-            }
-        };
-    }
-
-    @Override
-    public void startPausing() {
-        myVm.suspend(new JavascriptVm.SuspendCallback() {
-            @Override
-            public void success() {
-                //
-            }
-
-            @Override
-            public void failure(Exception e) {
-
-            }
-        });
-    }
-
-    @Override
-    public void startStepOver(@Nullable XSuspendContext context) {
-        if (myCurrentDebugContext != null) {
-            myCurrentDebugContext.continueVm(DebugContext.StepAction.OVER, 0, null, null);
-        }
-    }
-
-    @Override
-    public void startStepInto(@Nullable XSuspendContext context) {
-        if (myCurrentDebugContext != null) {
-            myCurrentDebugContext.continueVm(DebugContext.StepAction.IN, 0, null, null);
-        }
-    }
-
-    @Override
-    public void startStepOut(@Nullable XSuspendContext context) {
-        if (myCurrentDebugContext != null) {
-            myCurrentDebugContext.continueVm(DebugContext.StepAction.OUT, 0, null, null);
-        }
-    }
-
-    @Override
-    public void stop() {
-        myVm.detach();
-        myBreakpoints.clear();
-
-        Application.get().runReadAction(new Runnable() {
-            @Override
-            public void run() {
-                Collection<? extends XLineBreakpoint<XBreakpointProperties>> breakpoints = myXBreakpointManager.getBreakpoints(JavaScriptLineBreakpointType
-                    .class);
-                for (XLineBreakpoint<XBreakpointProperties> breakpoint : breakpoints) {
-                    myXBreakpointManager.updateBreakpointPresentation(breakpoint, null, null);
-                }
-            }
-        });
-    }
-
-    @Override
-    public void resume(@Nullable XSuspendContext context) {
-        DebugContext currentDebugContext = myCurrentDebugContext;
-        if (currentDebugContext == null) {
-            return;
-        }
-        currentDebugContext.continueVm(DebugContext.StepAction.CONTINUE, 0, null, null);
-    }
-
-    @Override
-    public void runToPosition(XSourcePosition position, @Nullable XSuspendContext context) {
-    }
-
-    @Override
-    public XDebugTabLayouter createTabLayouter() {
-        return new XDebugTabLayouter() {
-            @Override
-            public void registerAdditionalContent(RunnerLayoutUi ui) {
-                Content content = ui.createContent("ScriptListView", myScriptListPanel, "Scripts", JavaScriptIconGroup.javascript(), null);
-                content.setCloseable(false);
-
-                ui.addContent(content);
-            }
-        };
-    }
-
-    @Override
-    public LocalizeValue getCurrentStateMessage() {
-        if (myVm == null) {
-            return XDebuggerLocalize.debuggerStateMessageDisconnected();
-        }
-        else {
-            if (myVm.isAttached()) {
-                return LocalizeValue.localizeTODO("Attached");
-            }
-            else {
-                return XDebuggerLocalize.debuggerStateMessageDisconnected();
-            }
-        }
-    }
-
-    public void addScript(Script script) {
-        UIUtil.invokeLaterIfNeeded(() -> myScriptListPanel.add(script));
-    }
-
-    @Nullable
-    public XLineBreakpoint<?> getXBreakpointByVmBreakpoint(Breakpoint breakpoint) {
-        return myBreakpoints.get(breakpoint);
-    }
-
-    public void setCurrentDebugContext(DebugContext debugContext) {
-        myCurrentDebugContext = debugContext;
-    }
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
deleted file mode 100644
index 5bcbabf0..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8BaseVariableValue.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.execution.debug.frame.*;
-import consulo.execution.debug.frame.presentation.XValuePresentation;
-import consulo.execution.debug.icon.ExecutionDebugIconGroup;
-import consulo.ui.image.Image;
-import org.jspecify.annotations.Nullable;
-import org.chromium.sdk.*;
-
-import java.util.Collection;
-
-/**
- * @author VISTALL
- * @since 20.03.14
- */
-public abstract class V8BaseVariableValue extends XNamedValue {
-    protected final JsEvaluateContext myEvaluateContext;
-
-    protected V8BaseVariableValue(JsEvaluateContext evaluateContext, String name) {
-        super(name);
-        myEvaluateContext = evaluateContext;
-    }
-
-    protected abstract JsValue getValue();
-
-    @Override
-    public void computeChildren(XCompositeNode node) {
-        XValueChildrenList valueChildrenList = new XValueChildrenList();
-
-        JsValue value = getValue();
-        if (value instanceof JsArray) {
-            long length = ((JsArray) value).getLength();
-            for (int i = 0; i < length; i++) {
-                V8VariableValue.addValue(valueChildrenList, myEvaluateContext, ((JsArray) value).get(i));
-            }
-        }
-        else if (value instanceof JsObject) {
-            Collection<? extends JsVariable> properties = ((JsObject) value).getProperties();
-            for (JsVariable property : properties) {
-                V8VariableValue.addValue(valueChildrenList, myEvaluateContext, property);
-            }
-        }
-        node.addChildren(valueChildrenList, true);
-    }
-
-    protected Image getIconForValue(JsValue value, JsValue.Type valueType) {
-        if (value instanceof JsArray) {
-            return ExecutionDebugIconGroup.nodeArray();
-        }
-        switch (valueType) {
-            case TYPE_NUMBER:
-            case TYPE_NULL:
-            case TYPE_REGEXP:
-            case TYPE_UNDEFINED:
-            case TYPE_BOOLEAN:
-            case TYPE_STRING:
-                return ExecutionDebugIconGroup.nodePrimitive();
-        }
-        return ExecutionDebugIconGroup.nodeValue();
-    }
-
-    private static boolean canHaveChildren(JsValue value, JsValue.Type valueType) {
-        if (value instanceof JsArray) {
-            return ((JsArray) value).getLength() > 0;
-        }
-        switch (valueType) {
-            case TYPE_NUMBER:
-            case TYPE_NULL:
-            case TYPE_REGEXP:
-            case TYPE_UNDEFINED:
-            case TYPE_STRING:
-            case TYPE_BOOLEAN:
-                return false;
-        }
-        return true;
-    }
-
-    @Override
-    public void computePresentation(XValueNode valueNode, XValuePlace xValuePlace) {
-        final JsValue value = getValue();
-        final JsValue.Type valueType = value.getType();
-
-        valueNode.setPresentation(getIconForValue(value, valueType), new XValuePresentation() {
-            @Nullable
-            @Override
-            public String getType() {
-                switch (valueType) {
-                    case TYPE_NUMBER:
-                    case TYPE_STRING:
-                    case TYPE_NULL:
-                    case TYPE_DATE:
-                    case TYPE_REGEXP:
-                    case TYPE_UNDEFINED:
-                    case TYPE_BOOLEAN:
-                        return null;
-                    default:
-                        if (value instanceof JsArray) {
-                            return ((JsArray) value).getClassName() + "[" + ((JsArray) value).getLength() + "]";
-                        }
-                        else if (value instanceof JsObject) {
-                            return ((JsObject) value).getClassName();
-                        }
-                        return null;
-                }
-            }
-
-            @Override
-            public void renderValue(XValueTextRenderer textRenderer) {
-                switch (value.getType()) {
-                    case TYPE_NUMBER:
-                        textRenderer.renderValue(value.getValueString());
-                        break;
-                    case TYPE_STRING:
-                        textRenderer.renderStringValue(value.getValueString());
-                        break;
-                    case TYPE_FUNCTION:
-                        break;
-                    case TYPE_BOOLEAN:
-                        textRenderer.renderValue(value.getValueString());
-                        break;
-                    case TYPE_ERROR:
-                        break;
-                    case TYPE_REGEXP:
-                        textRenderer.renderStringValue(value.getValueString());
-                        break;
-                    case TYPE_DATE:
-                        textRenderer.renderValue(value.getValueString());
-                        break;
-                    case TYPE_UNDEFINED:
-                        textRenderer.renderValue("undefined");
-                        break;
-                    case TYPE_NULL:
-                        textRenderer.renderValue("null");
-                        break;
-                }
-            }
-        }, canHaveChildren(value, valueType));
-    }
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugEventListener.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugEventListener.java
deleted file mode 100644
index 139328e7..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugEventListener.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.execution.debug.XBreakpointManager;
-import consulo.execution.debug.XDebuggerManager;
-import consulo.execution.debug.breakpoint.XBreakpointProperties;
-import consulo.execution.debug.breakpoint.XLineBreakpoint;
-import consulo.application.ApplicationManager;
-import consulo.javascript.debugger.JavaScriptLineBreakpointType;
-import consulo.language.file.light.LightVirtualFile;
-import consulo.util.collection.ContainerUtil;
-import consulo.virtualFileSystem.VirtualFile;
-import org.chromium.sdk.*;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author VISTALL
- * @since 20.03.14
- */
-public class V8DebugEventListener implements DebugEventListener
-{
-	private final V8BaseDebugProcess myV8DebugProcess;
-
-	private boolean myFirstPausing = true;
-
-	public V8DebugEventListener(V8BaseDebugProcess v8DebugProcess)
-	{
-		myV8DebugProcess = v8DebugProcess;
-	}
-
-	@Override
-	public void suspended(DebugContext debugContext)
-	{
-		if(myFirstPausing)
-		{
-			myFirstPausing = false;
-			ApplicationManager.getApplication().runReadAction(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					myV8DebugProcess.getSession().initBreakpoints();
-				}
-			});
-
-			// we need find top file and top first breakpoint
-			List<? extends CallFrame> callFrames = debugContext.getCallFrames();
-			CallFrame callFrame = ContainerUtil.getFirstItem(callFrames);
-			if(callFrame != null)
-			{
-				Script script = callFrame.getScript();
-				if(script.getName() != null)
-				{
-					VirtualFile virtualFile = V8ScriptUtil.toVirtualFile(script, true);
-					if(!(virtualFile instanceof LightVirtualFile))
-					{
-						XBreakpointManager breakpointManager = XDebuggerManager.getInstance(myV8DebugProcess.getSession().getProject()).getBreakpointManager();
-						XLineBreakpoint<XBreakpointProperties> breakpointAtLine = breakpointManager.findBreakpointAtLine(JavaScriptLineBreakpointType.getInstance(), virtualFile, 0);
-						// if we have breakpoint at line 0, we dont need unpause
-						if(breakpointAtLine != null)
-						{
-							myV8DebugProcess.setCurrentDebugContext(debugContext);
-							myV8DebugProcess.getSession().breakpointReached(breakpointAtLine, null, new V8SuspendContext(debugContext));
-							return;
-						}
-					}
-				}
-			}
-
-			debugContext.continueVm(DebugContext.StepAction.CONTINUE, 0, null, null);
-			return;
-		}
-
-		myV8DebugProcess.setCurrentDebugContext(debugContext);
-
-		Collection<? extends Breakpoint> breakpointsHit = debugContext.getBreakpointsHit();
-		if(!breakpointsHit.isEmpty())
-		{
-			XLineBreakpoint<?> lineBreakpoint = myV8DebugProcess.getXBreakpointByVmBreakpoint(breakpointsHit.iterator().next());
-			if(lineBreakpoint != null)
-			{
-				myV8DebugProcess.getSession().breakpointReached(lineBreakpoint, null, new V8SuspendContext(debugContext));
-				return;
-			}
-		}
-		myV8DebugProcess.getSession().positionReached(new V8SuspendContext(debugContext));
-	}
-
-	@Override
-	public void resumed()
-	{
-		myV8DebugProcess.setCurrentDebugContext(null);
-	}
-
-	@Override
-	public void disconnected()
-	{
-		myV8DebugProcess.setCurrentDebugContext(null);
-	}
-
-	@Override
-	public void scriptLoaded(Script script)
-	{
-		String name = script.getName();
-		if(name == null)
-		{
-			return;
-		}
-		myV8DebugProcess.addScript(script);
-	}
-
-	@Override
-	public void scriptCollected(Script script)
-	{
-
-	}
-
-	@Override
-	public VmStatusListener getVmStatusListener()
-	{
-		return null;
-	}
-
-	@Override
-	public void scriptContentChanged(Script script)
-	{
-
-	}
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
deleted file mode 100644
index 9bbdce69..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8DebugProcess.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.annotation.UsedInPlugin;
-import consulo.execution.ExecutionResult;
-import consulo.execution.debug.XDebugSession;
-import consulo.execution.debug.localize.XDebuggerLocalize;
-import consulo.localize.LocalizeValue;
-import consulo.process.ExecutionException;
-import org.chromium.sdk.JavascriptVmFactory;
-import org.chromium.sdk.StandaloneVm;
-
-import java.net.InetSocketAddress;
-
-/**
- * @author VISTALL
- * @since 20.03.14
- */
-@UsedInPlugin
-public class V8DebugProcess extends V8BaseDebugProcess<StandaloneVm> {
-    public V8DebugProcess(XDebugSession session, ExecutionResult result, int port) throws ExecutionException {
-        super(session, result);
-
-        myVm = JavascriptVmFactory.getInstance().createStandalone(new InetSocketAddress("localhost", port), null);
-    }
-
-    @UsedInPlugin
-    public void attach() throws Exception {
-        myVm.attach(new V8DebugEventListener(this));
-    }
-
-    @Override
-    public LocalizeValue getCurrentStateMessage() {
-        if (myVm == null) {
-            return XDebuggerLocalize.debuggerStateMessageDisconnected();
-        }
-        else {
-            if (myVm.isAttached()) {
-                return LocalizeValue.localizeTODO("Attached");
-            }
-            else {
-                String disconnectReason = myVm.getDisconnectReason();
-                if (disconnectReason == null) {
-                    return XDebuggerLocalize.debuggerStateMessageDisconnected();
-                }
-                return LocalizeValue.localizeTODO("Disconnected: " + disconnectReason);
-            }
-        }
-    }
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
deleted file mode 100644
index e7bf3d3a..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ExecutionStack.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.execution.debug.frame.XExecutionStack;
-import consulo.execution.debug.frame.XStackFrame;
-import org.jspecify.annotations.Nullable;
-import org.chromium.sdk.CallFrame;
-import org.chromium.sdk.DebugContext;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author VISTALL
- * @since 20.03.14
- */
-public class V8ExecutionStack extends XExecutionStack
-{
-	private final DebugContext myDebugContext;
-
-	public V8ExecutionStack(DebugContext debugContext)
-	{
-		super("");
-		myDebugContext = debugContext;
-	}
-
-	@Nullable
-	@Override
-	public XStackFrame getTopFrame()
-	{
-		List<? extends CallFrame> callFrames = myDebugContext.getCallFrames();
-		return callFrames.isEmpty() ? null : new V8StackFrame(callFrames.get(0));
-	}
-
-	@Override
-	public void computeStackFrames(XStackFrameContainer frameContainer)
-	{
-		List<? extends CallFrame> callFrames = myDebugContext.getCallFrames();
-		List<V8StackFrame> stackFrames = new ArrayList<V8StackFrame>(callFrames.size());
-
-		for(CallFrame callFrame : callFrames)
-		{
-			stackFrames.add(new V8StackFrame(callFrame));
-		}
-
-		frameContainer.addStackFrames(stackFrames, true);
-	}
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
deleted file mode 100644
index d89dac4a..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8ScriptUtil.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.util.lang.Comparing;
-import consulo.virtualFileSystem.LocalFileSystem;
-import consulo.virtualFileSystem.fileType.FileTypeRegistry;
-import consulo.virtualFileSystem.VirtualFile;
-import consulo.language.file.light.LightVirtualFile;
-import consulo.util.dataholder.Key;
-import org.chromium.sdk.Script;
-
-import java.io.File;
-
-/**
- * @author VISTALL
- * @since 22.03.14
- */
-public class V8ScriptUtil
-{
-	private static final Key<Object> SOME_VALUE_TO_EQUALS = Key.create("some-value-to-equals");
-
-	public static VirtualFile toVirtualFile(Script value, boolean toOpen)
-	{
-		String scriptName = value.getName();
-		assert scriptName != null;
-		VirtualFile fileByPath = LocalFileSystem.getInstance().findFileByPath(scriptName);
-		if(fileByPath != null)
-		{
-			return fileByPath;
-		}
-
-		String name = new File(scriptName).getName();
-		LightVirtualFile virtualFile = new LightVirtualFile(name, FileTypeRegistry.getInstance().getFileTypeByFileName(name), toOpen ? value.getSource() : "")
-		{
-			@Override
-			public boolean equals(Object obj)
-			{
-				if(obj instanceof LightVirtualFile)
-				{
-					if(!Comparing.equal(getPath(), ((LightVirtualFile) obj).getPath()))
-					{
-						return false;
-					}
-					Object userData = ((LightVirtualFile) obj).getUserData(SOME_VALUE_TO_EQUALS);
-					Object userData1 = getUserData(SOME_VALUE_TO_EQUALS);
-					return Comparing.equal(userData1, userData);
-				}
-				return false;
-			}
-		};
-		virtualFile.putUserData(SOME_VALUE_TO_EQUALS, value);
-		return virtualFile;
-	}
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
deleted file mode 100644
index f2577b7f..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8StackFrame.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.execution.debug.XDebuggerUtil;
-import consulo.execution.debug.XSourcePosition;
-import consulo.execution.debug.evaluation.XDebuggerEvaluator;
-import consulo.execution.debug.frame.XCompositeNode;
-import consulo.execution.debug.frame.XStackFrame;
-import consulo.execution.debug.frame.XValueChildrenList;
-import consulo.platform.base.icon.PlatformIconGroup;
-import consulo.ui.ex.ColoredTextContainer;
-import consulo.ui.ex.SimpleTextAttributes;
-import org.jspecify.annotations.Nullable;
-import org.chromium.sdk.*;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author VISTALL
- * @since 20.03.14
- */
-public class V8StackFrame extends XStackFrame {
-    private final CallFrame myCallFrame;
-
-    public V8StackFrame(CallFrame callFrame) {
-        myCallFrame = callFrame;
-    }
-
-    @Nullable
-    @Override
-    public XDebuggerEvaluator getEvaluator() {
-        return new XDebuggerEvaluator() {
-            @Override
-            public void evaluate(final String expression, final XEvaluationCallback callback, @Nullable XSourcePosition expressionPosition) {
-                final JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
-                evaluateContext.evaluateSync(expression, Collections.<String, JsValue>emptyMap(), new JsEvaluateContext.EvaluateCallback() {
-                    @Override
-                    public void success(JsEvaluateContext.ResultOrException e) {
-                        JsValue result = e.getResult() == null ? e.getException() : e.getResult();
-                        if (result != null) {
-                            callback.evaluated(new V8WatchValue(evaluateContext, expression, result));
-                        }
-                        else {
-                            callback.errorOccurred("bad expression");
-                        }
-                    }
-
-                    @Override
-                    public void failure(Exception e) {
-                        callback.errorOccurred(e.getMessage());
-                    }
-                });
-            }
-
-            @Override
-            public boolean isCodeFragmentEvaluationSupported() {
-                return false;
-            }
-        };
-    }
-
-    @Override
-    public void computeChildren(XCompositeNode node) {
-        JsEvaluateContext evaluateContext = myCallFrame.getEvaluateContext();
-        List<? extends JsScope> variableScopes = myCallFrame.getVariableScopes();
-
-        XValueChildrenList valueChildrenList = new XValueChildrenList();
-
-        for (JsScope variableScope : variableScopes) {
-            switch (variableScope.getType()) {
-                case LOCAL:
-                    JsScope.Declarative declarative = variableScope.asDeclarativeScope();
-                    if (declarative == null) {
-                        break;
-                    }
-                    for (JsVariable jsVariable : declarative.getVariables()) {
-                        V8VariableValue.addValue(valueChildrenList, evaluateContext, jsVariable);
-                    }
-                    break;
-            }
-        }
-        node.addChildren(valueChildrenList, true);
-    }
-
-    @Override
-    public void customizePresentation(ColoredTextContainer component) {
-        TextStreamPosition statementStartPosition = myCallFrame.getStatementStartPosition();
-
-        XSourcePosition position = getSourcePosition();
-        if (position != null) {
-            component.append(position.getFile().getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
-        }
-        else {
-            component.append(myCallFrame.getScript().getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
-        }
-
-        component.append(":" + (statementStartPosition.getLine() + 1), SimpleTextAttributes.REGULAR_ATTRIBUTES);
-    }
-
-    @Override
-    @Nullable
-    public XSourcePosition getSourcePosition() {
-        TextStreamPosition statementStartPosition = myCallFrame.getStatementStartPosition();
-        if (myCallFrame.getScript().getName() == null) {
-            return null;
-        }
-        return XDebuggerUtil.getInstance().createPosition(V8ScriptUtil.toVirtualFile(myCallFrame.getScript(), true), statementStartPosition.getLine());
-    }
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
deleted file mode 100644
index e2cd098f..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8SuspendContext.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.execution.debug.frame.XExecutionStack;
-import consulo.execution.debug.frame.XSuspendContext;
-import org.chromium.sdk.DebugContext;
-
-import org.jspecify.annotations.Nullable;
-
-/**
- * @author VISTALL
- * @since 20.03.14
- */
-public class V8SuspendContext extends XSuspendContext
-{
-	private V8ExecutionStack myStack;
-
-	public V8SuspendContext(DebugContext debugContext)
-	{
-		myStack = new V8ExecutionStack(debugContext);
-	}
-
-	@Nullable
-	@Override
-	public XExecutionStack getActiveExecutionStack()
-	{
-		return myStack;
-	}
-
-	@Override
-	public XExecutionStack[] getExecutionStacks()
-	{
-		return new XExecutionStack[] {myStack};
-	}
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
deleted file mode 100644
index 175c2040..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8VariableValue.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.execution.debug.frame.XValueChildrenList;
-import consulo.execution.debug.frame.XValueModifier;
-import org.chromium.sdk.*;
-
-import org.jspecify.annotations.Nullable;
-
-/**
- * @author VISTALL
- * @since 05.12.2015
- */
-public class V8VariableValue extends V8BaseVariableValue
-{
-	public static void addValue(XValueChildrenList valueChildrenList, JsEvaluateContext debugContext, JsVariable jsVariable)
-	{
-		JsValue value = jsVariable.getValue();
-		if(value instanceof JsFunction)
-		{
-			return;
-		}
-		valueChildrenList.add(new V8VariableValue(debugContext, jsVariable));
-	}
-
-	private JsVariable myJsVariable;
-
-	public V8VariableValue(JsEvaluateContext evaluateContext, JsVariable jsVariable)
-	{
-		super(evaluateContext, jsVariable.getName());
-		myJsVariable = jsVariable;
-	}
-
-	@Nullable
-	@Override
-	public XValueModifier getModifier()
-	{
-		final JsDeclarativeVariable declarativeVariable = myJsVariable.asDeclarativeVariable();
-		if(declarativeVariable == null)
-		{
-			return null;
-		}
-		final JsValue value = myJsVariable.getValue();
-		if(!declarativeVariable.isMutable())
-		{
-			return null;
-		}
-		final JsValue.Type valueType = value.getType();
-		switch(valueType)
-		{
-			case TYPE_NUMBER:
-			case TYPE_NULL:
-			case TYPE_STRING:
-			case TYPE_BOOLEAN:
-				return new XValueModifier()
-				{
-					@Override
-					public void setValue(String expression, final XModificationCallback callback)
-					{
-						JsEvaluateContext.PrimitiveValueFactory valueFactory = myEvaluateContext.getValueFactory();
-						JsValue value = null;
-						try
-						{
-							if(expression.equals("null"))
-							{
-								value = valueFactory.getNull();
-							}
-							else if(expression.equals("undefined"))
-							{
-								value = valueFactory.getUndefined();
-							}
-							else
-							{
-								switch(valueType)
-								{
-									case TYPE_NUMBER:
-										value = valueFactory.createNumber(expression);
-										break;
-									case TYPE_STRING:
-										value = valueFactory.createString(expression);
-										break;
-									case TYPE_BOOLEAN:
-										value = valueFactory.createBoolean(Boolean.valueOf(expression));
-										break;
-									case TYPE_ERROR:
-										break;
-									case TYPE_REGEXP:
-										break;
-									case TYPE_DATE:
-										break;
-									case TYPE_ARRAY:
-										break;
-									case TYPE_UNDEFINED:
-										break;
-									case TYPE_NULL:
-										break;
-								}
-							}
-						}
-						catch(Exception e)
-						{
-							callback.errorOccurred("Bad value");
-							return;
-						}
-
-						declarativeVariable.setValue(value, new JsDeclarativeVariable.SetValueCallback()
-						{
-							@Override
-							public void success()
-							{
-								callback.valueModified();
-							}
-
-							@Override
-							public void failure(Exception e)
-							{
-								callback.errorOccurred(e.getMessage());
-							}
-						}, null);
-					}
-
-					@Override
-					public void calculateInitialValueEditorText(XInitialValueCallback callback)
-					{
-						callback.setValue(value.getValueString());
-					}
-				};
-			default:
-				return null;
-		}
-	}
-
-	@Override
-	protected JsValue getValue()
-	{
-		return myJsVariable.getValue();
-	}
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java b/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
deleted file mode 100644
index 9e989ef7..00000000
--- a/debugger/v8-debugger-impl/src/main/java/consulo/javascript/run/debug/v8/V8WatchValue.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2013-2015 must-be.org
- *
- * 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.
- */
-
-package consulo.javascript.run.debug.v8;
-
-import consulo.execution.debug.icon.ExecutionDebugIconGroup;
-import consulo.ui.image.Image;
-import org.chromium.sdk.JsEvaluateContext;
-import org.chromium.sdk.JsValue;
-
-/**
- * @author VISTALL
- * @since 05.12.2015
- */
-public class V8WatchValue extends V8BaseVariableValue {
-    private JsValue myValue;
-
-    public V8WatchValue(JsEvaluateContext evaluateContext, String text, JsValue value) {
-        super(evaluateContext, text);
-        myValue = value;
-    }
-
-    @Override
-    protected Image getIconForValue(JsValue value, JsValue.Type valueType) {
-        return ExecutionDebugIconGroup.nodeWatch();
-    }
-
-    @Override
-    protected JsValue getValue() {
-        return myValue;
-    }
-}
diff --git a/debugger/v8-debugger-impl/src/main/java/module-info.java b/debugger/v8-debugger-impl/src/main/java/module-info.java
deleted file mode 100644
index e9316074..00000000
--- a/debugger/v8-debugger-impl/src/main/java/module-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @author VISTALL
- * @since 29-Aug-22
- */
-module consulo.javascript.v8.debugger.impl
-{
-	requires consulo.javascript.debugger.impl;
-
-	requires lib.org.chromium.sdk;
-
-	exports consulo.javascript.run.debug.v8;
-}
\ No newline at end of file
diff --git a/inspections/pom.xml b/inspections/pom.xml
index 0e894a39..0fb9a85d 100644
--- a/inspections/pom.xml
+++ b/inspections/pom.xml
@@ -73,7 +73,7 @@
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
+			<artifactId>com.intellij.xml.api</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/inspections/src/main/java/module-info.java b/inspections/src/main/java/module-info.java
index a1043b5b..655b9488 100644
--- a/inspections/src/main/java/module-info.java
+++ b/inspections/src/main/java/module-info.java
@@ -6,9 +6,11 @@
     // TODO remove in future
     requires java.desktop;
 
+    requires com.intellij.xml.api;
+
+    requires consulo.language.editor.refactoring.api;
+
     requires consulo.javascript.base.impl;
 
     requires consulo.javascript.ecmascript.impl;
-
-    requires com.intellij.xml;
 }
\ No newline at end of file
diff --git a/intentions/pom.xml b/intentions/pom.xml
index 817d978e..227594cd 100644
--- a/intentions/pom.xml
+++ b/intentions/pom.xml
@@ -67,7 +67,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>com.intellij.xml</artifactId>
+            <artifactId>com.intellij.xml.api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/intentions/src/main/java/module-info.java b/intentions/src/main/java/module-info.java
index 2c22f7dd..35540213 100644
--- a/intentions/src/main/java/module-info.java
+++ b/intentions/src/main/java/module-info.java
@@ -9,5 +9,5 @@
 
     requires consulo.javascript.base.impl;
 
-    requires com.intellij.xml;
+    requires com.intellij.xml.api;
 }
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript-impl/pom.xml b/lang-version-impl/ecmascript-impl/pom.xml
index dd2a4e34..5bc20589 100644
--- a/lang-version-impl/ecmascript-impl/pom.xml
+++ b/lang-version-impl/ecmascript-impl/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>consulo</groupId>
-        <artifactId>arch.ide-api-provided</artifactId>
+        <artifactId>arch.bind.java</artifactId>
         <version>3-SNAPSHOT</version>
         <relativePath/>
     </parent>
@@ -59,31 +59,17 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>consulo.javascript-base.impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>consulo</groupId>
-            <artifactId>consulo-language-editor-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>com.intellij.xml</artifactId>
+            <artifactId>consulo-file-template-api</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-
-        <!--This dependency fix problem with compilation JSXTagTreeHighlightingPassFactory, due dep from XML plugin-->
+        
         <dependency>
-            <groupId>consulo</groupId>
-            <artifactId>consulo-ide-impl</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.impl</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/module-info.java b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
index eeda9ade..085a58e2 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
+++ b/lang-version-impl/ecmascript-impl/src/main/java/module-info.java
@@ -5,9 +5,7 @@
 module consulo.javascript.ecmascript.impl {
     requires transitive consulo.javascript.base.impl;
 
-    requires consulo.language.editor.impl;
-
-    requires com.intellij.xml;
+    requires consulo.file.template.api;
 
     exports consulo.javascript.ecmascript.codeInsight;
     exports consulo.javascript.ecmascript.codeInsight.quickFixes;
diff --git a/lang-version-impl/typescript-impl/pom.xml b/lang-version-impl/typescript-impl/pom.xml
index 0181d13e..0217194a 100644
--- a/lang-version-impl/typescript-impl/pom.xml
+++ b/lang-version-impl/typescript-impl/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>consulo</groupId>
-        <artifactId>arch.ide-api-provided</artifactId>
+        <artifactId>arch.bind.java</artifactId>
         <version>3-SNAPSHOT</version>
         <relativePath/>
     </parent>
diff --git a/lang-version-impl/typescript-impl/src/main/java/module-info.java b/lang-version-impl/typescript-impl/src/main/java/module-info.java
index 35176754..98489dd4 100644
--- a/lang-version-impl/typescript-impl/src/main/java/module-info.java
+++ b/lang-version-impl/typescript-impl/src/main/java/module-info.java
@@ -6,6 +6,8 @@
     requires consulo.javascript.base.impl;
     requires consulo.javascript.ecmascript.impl;
 
+    requires consulo.language.impl;
+
     exports consulo.typescript;
     exports consulo.typescript.version;
 }
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java b/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java
new file mode 100644
index 00000000..774ac2a0
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java
@@ -0,0 +1,26 @@
+package consulo.typescript.parser.test;
+
+import consulo.language.file.LanguageFileType;
+import consulo.test.junit.impl.language.SimpleParsingTest;
+import consulo.typescript.TypeScriptFileType;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author VISTALL
+ * @since 2026-04-06
+ */
+public class TypeScriptParserTest extends SimpleParsingTest<Object> {
+    public TypeScriptParserTest() {
+        super("parsing", "ts");
+    }
+
+    @Test
+    public void testSimple(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Override
+    protected LanguageFileType getFileType(Context context, Object o) {
+        return TypeScriptFileType.INSTANCE;
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/simple.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/simple.ts
new file mode 100644
index 00000000..8fb2c8ad
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/simple.ts
@@ -0,0 +1,3 @@
+class Test {
+
+}
\ No newline at end of file
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 74fc1fb3..b4ae6780 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -209,11 +209,45 @@
         </dependency>
 
         <!--provided-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml.api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml.editor.api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.xml.html.api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-editor-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>com.intellij.xml</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+
+        <!--This dependency fix problem with compilation JSXTagTreeHighlightingPassFactory, due dep from XML plugin-->
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-ide-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
index 836482ea..09525795 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/inspections/JSUnresolvedFunctionInspection.java
@@ -48,7 +48,7 @@
 import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
-import consulo.xml.ide.highlighter.XmlFileType;
+import consulo.xml.language.XmlFileType;
 import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
diff --git a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java b/plugin/src/main/java/consulo/javascript/impl/codeInsight/JSXTagTreeHighlightingPassFactory.java
similarity index 96%
rename from lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
rename to plugin/src/main/java/consulo/javascript/impl/codeInsight/JSXTagTreeHighlightingPassFactory.java
index 7412f072..cfa63abd 100644
--- a/lang-version-impl/ecmascript-impl/src/main/java/consulo/javascript/jsx/codeInsight/JSXTagTreeHighlightingPassFactory.java
+++ b/plugin/src/main/java/consulo/javascript/impl/codeInsight/JSXTagTreeHighlightingPassFactory.java
@@ -1,4 +1,4 @@
-package consulo.javascript.jsx.codeInsight;
+package consulo.javascript.impl.codeInsight;
 
 import consulo.annotation.component.ExtensionImpl;
 import consulo.codeEditor.Editor;
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
index 68bf58b1..c17e2237 100644
--- a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptEmbeddedTokenHighlighter.java
@@ -1,11 +1,11 @@
 package consulo.javascript.impl.html;
 
-import com.intellij.xml.highlighter.EmbeddedTokenHighlighter;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.colorScheme.TextAttributesKey;
 import consulo.javascript.ide.hightlight.JavaScriptHighlighter;
 import consulo.language.ast.IElementType;
 import consulo.util.collection.MultiMap;
+import consulo.xml.editor.EmbeddedTokenHighlighter;
 import consulo.xml.language.XMLLanguage;
 
 /**
diff --git a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
index c450d3fb..318d3830 100644
--- a/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
+++ b/plugin/src/main/java/consulo/javascript/impl/html/JavaScriptHtmlScriptContentProvider.java
@@ -2,12 +2,12 @@
 
 import com.intellij.lang.javascript.JSElementTypes;
 import consulo.annotation.component.ExtensionImpl;
+import consulo.html.language.HtmlScriptContentProvider;
 import consulo.javascript.lang.lexer.JavaScript15Lexer;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
 import consulo.language.ast.IElementType;
 import consulo.language.lexer.Lexer;
-import consulo.xml.lang.HtmlScriptContentProvider;
 
 import org.jspecify.annotations.Nullable;
 
diff --git a/plugin/src/main/java/module-info.java b/plugin/src/main/java/module-info.java
index 25b52a99..f4a6bbeb 100644
--- a/plugin/src/main/java/module-info.java
+++ b/plugin/src/main/java/module-info.java
@@ -8,12 +8,19 @@
 
     requires consulo.language.editor.impl;
 
+    requires com.intellij.xml.api;
+    requires com.intellij.xml.editor.api;
+    requires com.intellij.xml.html.api;
+
+    // JSXTagTreeHighlightingPassFactory
     requires com.intellij.xml;
 
     // TODO remove in future
     requires java.desktop;
     requires forms.rt;
 
+    requires consulo.javascript.ecmascript.impl;
+
     exports com.intellij.javascript;
     exports com.intellij.javascript.manipulators;
     exports com.intellij.lang.javascript.impl;
diff --git a/regexp-impl/pom.xml b/regexp-impl/pom.xml
index de8bd5d2..f94b20c1 100644
--- a/regexp-impl/pom.xml
+++ b/regexp-impl/pom.xml
@@ -15,50 +15,43 @@
   - limitations under the License.
   -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
-		<version>3-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>consulo</groupId>
+        <artifactId>arch.ide-api-provided</artifactId>
+        <version>3-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>consulo.plugin</groupId>
-	<artifactId>consulo.javascript-regexp.impl</artifactId>
-	<version>3-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>consulo.plugin</groupId>
+    <artifactId>consulo.javascript-regexp.impl</artifactId>
+    <version>3-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<repositories>
-		<repository>
-			<id>consulo</id>
-			<url>https://maven.consulo.dev/repository/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>interval:60</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>consulo</id>
+            <url>https://maven.consulo.dev/repository/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>interval:60</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>consulo.javascript-base.impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>consulo.javascript-base.impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.xml</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>com.intellij.regexp</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>com.intellij.regexp</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/web-browser-impl/src/main/java/module-info.java b/web-browser-impl/src/main/java/module-info.java
index 4aea4fec..d97b5f17 100644
--- a/web-browser-impl/src/main/java/module-info.java
+++ b/web-browser-impl/src/main/java/module-info.java
@@ -8,4 +8,6 @@
     requires java.desktop;
 
     requires consulo.javascript.base.impl;
+
+    requires consulo.ui.ex.awt.api;
 }
\ No newline at end of file

From 2692f50b4afd2e53ecc8003bd8fc2f1a40e6425c Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 10 Apr 2026 23:44:03 +0300
Subject: [PATCH 328/340] fix case

---
 .../typescript-impl/src/test/resources/parsing/Simple.ts       | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/Simple.ts

diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/Simple.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/Simple.ts
new file mode 100644
index 00000000..8fb2c8ad
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/Simple.ts
@@ -0,0 +1,3 @@
+class Test {
+
+}
\ No newline at end of file

From ad6d59c172802ce2c3297ab25cfeae4b3855ea18 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 10 Apr 2026 23:46:21 +0300
Subject: [PATCH 329/340] drop

---
 .../typescript-impl/src/test/resources/parsing/simple.ts       | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/simple.ts

diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/simple.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/simple.ts
deleted file mode 100644
index 8fb2c8ad..00000000
--- a/lang-version-impl/typescript-impl/src/test/resources/parsing/simple.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-class Test {
-
-}
\ No newline at end of file

From a62f9f0bd27359d65c33e61887e3e1bd5e0ec2dc Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Fri, 10 Apr 2026 23:54:22 +0300
Subject: [PATCH 330/340] fix tests

---
 .../psi/mixin/TypeScriptAttributeListMixin.java     |  5 +++++
 .../impl/psi/mixin/TypeScriptClassMixin.java        |  5 +++++
 .../src/test/resources/parsing/Simple.txt           | 13 +++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/Simple.txt

diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptAttributeListMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptAttributeListMixin.java
index bd3e9b41..6d8e2d75 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptAttributeListMixin.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptAttributeListMixin.java
@@ -87,4 +87,9 @@ public PsiElement findAccessTypeElement() {
     public boolean hasModifier(ModifierType modifier) {
         return false;
     }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName();
+    }
 }
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptClassMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptClassMixin.java
index 24326348..a2edabb2 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptClassMixin.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptClassMixin.java
@@ -147,4 +147,9 @@ public PsiElement getNameIdentifier() {
     public JSAttributeList getAttributeList() {
         return null;
     }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ": " + getName();
+    }
 }
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/Simple.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/Simple.txt
new file mode 100644
index 00000000..04d486a9
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/Simple.txt
@@ -0,0 +1,13 @@
+JSFile:Simple.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptClassDeclarationImpl: Test
+      TypeScriptAttributeListImpl
+        <empty list>
+      PsiElement(CLASS_KEYWORD)('class')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Test')
+      PsiWhiteSpace(' ')
+      TypeScriptClassBodyImpl(CLASS_BODY)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n\n')
+        PsiElement(RBRACE)('}')
\ No newline at end of file

From 7c3ab89da45c31135e2092fca634f0306ad09040 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 11 Apr 2026 00:20:43 +0300
Subject: [PATCH 331/340] more tests

---
 .../psi/mixin/TypeScriptInterfaceMixin.java   |   5 +
 .../mixin/TypeScriptParameterListMixin.java   |   5 +
 .../mixin/TypeScriptVarStatementMixin.java    |   5 +
 .../parser/test/TypeScriptParserTest.java     |  60 +++++++
 .../resources/parsing/AmbientDeclaration.ts   |   3 +
 .../resources/parsing/AmbientDeclaration.txt  |  81 ++++++++++
 .../test/resources/parsing/ArrowFunction.ts   |   5 +
 .../test/resources/parsing/ArrowFunction.txt  | 147 ++++++++++++++++++
 .../resources/parsing/ClassDeclaration.ts     |  15 ++
 .../resources/parsing/ClassDeclaration.txt    | 125 +++++++++++++++
 .../test/resources/parsing/EnumDeclaration.ts |  10 ++
 .../resources/parsing/EnumDeclaration.txt     |  54 +++++++
 .../resources/parsing/FunctionDeclaration.ts  |   7 +
 .../resources/parsing/FunctionDeclaration.txt |  90 +++++++++++
 .../test/resources/parsing/GenericTypes.ts    |   5 +
 .../test/resources/parsing/GenericTypes.txt   | 118 ++++++++++++++
 .../test/resources/parsing/ImportExport.ts    |   7 +
 .../test/resources/parsing/ImportExport.txt   | 115 ++++++++++++++
 .../src/test/resources/parsing/ImportMeta.ts  |   3 +
 .../src/test/resources/parsing/ImportMeta.txt |  48 ++++++
 .../resources/parsing/InterfaceDeclaration.ts |   9 ++
 .../parsing/InterfaceDeclaration.txt          |  99 ++++++++++++
 .../test/resources/parsing/StringLiterals.ts  |   3 +
 .../test/resources/parsing/StringLiterals.txt |  47 ++++++
 .../src/test/resources/parsing/TypeAlias.ts   |   3 +
 .../src/test/resources/parsing/TypeAlias.txt  |  81 ++++++++++
 .../test/resources/parsing/VarDeclaration.ts  |   3 +
 .../test/resources/parsing/VarDeclaration.txt |  61 ++++++++
 28 files changed, 1214 insertions(+)
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/AmbientDeclaration.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/AmbientDeclaration.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ClassDeclaration.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ClassDeclaration.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/FunctionDeclaration.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/FunctionDeclaration.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ImportMeta.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ImportMeta.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/VarDeclaration.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/VarDeclaration.txt

diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptInterfaceMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptInterfaceMixin.java
index 3dc737b2..ed1a5962 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptInterfaceMixin.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptInterfaceMixin.java
@@ -33,6 +33,11 @@ public IStubElementType getElementType() {
         return null;
     }
 
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ":" + getNode().getElementType();
+    }
+
     @Override
     public void accept(@Nonnull PsiElementVisitor visitor) {
         if (visitor instanceof JSElementVisitor jsVisitor) {
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterListMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterListMixin.java
index 0f82f66d..f74300fb 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterListMixin.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptParameterListMixin.java
@@ -32,6 +32,11 @@ public IStubElementType getElementType() {
         return null;
     }
 
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ":" + getNode().getElementType();
+    }
+
     @Override
     public void accept(@Nonnull PsiElementVisitor visitor) {
         if (visitor instanceof JSElementVisitor jsVisitor) {
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVarStatementMixin.java b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVarStatementMixin.java
index a71de128..05f6d5d0 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVarStatementMixin.java
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/psi/mixin/TypeScriptVarStatementMixin.java
@@ -36,6 +36,11 @@ public IStubElementType getElementType() {
         return null;
     }
 
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ":" + getNode().getElementType();
+    }
+
     @Override
     public void accept(@Nonnull PsiElementVisitor visitor) {
         if (visitor instanceof JSElementVisitor jsVisitor) {
diff --git a/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java b/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java
index 774ac2a0..4bf0576f 100644
--- a/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java
+++ b/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java
@@ -19,6 +19,66 @@ public void testSimple(Context context) throws Exception {
         doTest(context, null);
     }
 
+    @Test
+    public void testVarDeclaration(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testFunctionDeclaration(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testClassDeclaration(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testInterfaceDeclaration(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testEnumDeclaration(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testTypeAlias(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testImportExport(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testImportMeta(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testAmbientDeclaration(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testArrowFunction(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testGenericTypes(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testStringLiterals(Context context) throws Exception {
+        doTest(context, null);
+    }
+
     @Override
     protected LanguageFileType getFileType(Context context, Object o) {
         return TypeScriptFileType.INSTANCE;
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/AmbientDeclaration.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/AmbientDeclaration.ts
new file mode 100644
index 00000000..64d52a8e
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/AmbientDeclaration.ts
@@ -0,0 +1,3 @@
+export declare const applyCss: (target: Node) => void;
+declare function require(module: string): void;
+declare class Buffer {}
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/AmbientDeclaration.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/AmbientDeclaration.txt
new file mode 100644
index 00000000..a9a6ccf3
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/AmbientDeclaration.txt
@@ -0,0 +1,81 @@
+JSFile:AmbientDeclaration.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptExportDeclarationImpl(EXPORT_DECLARATION)
+      PsiElement(EXPORT_KEYWORD)('export')
+      PsiWhiteSpace(' ')
+      TypeScriptAmbientDeclarationImpl(AMBIENT_DECLARATION)
+        PsiElement(DECLARE_KEYWORD)('declare')
+        PsiWhiteSpace(' ')
+        TypeScriptVarStatementImpl:VAR_STATEMENT
+          PsiElement(CONST_KEYWORD)('const')
+          PsiWhiteSpace(' ')
+          TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+            TypeScriptBindingPatternImpl(BINDING_PATTERN)
+              PsiElement(IDENTIFIER)('applyCss')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptFunctionTypeImpl(FUNCTION_TYPE)
+                PsiElement(LPAR)('(')
+                TypeScriptParameterTypeImpl(PARAMETER_TYPE)
+                  PsiElement(IDENTIFIER)('target')
+                  PsiElement(COLON)(':')
+                  PsiWhiteSpace(' ')
+                  TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                    TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                      PsiElement(IDENTIFIER)('Node')
+                PsiElement(RPAR)(')')
+                PsiWhiteSpace(' ')
+                PsiElement(DARROW)('=>')
+                PsiWhiteSpace(' ')
+                TypeScriptPredefinedTypeImpl(PREDEFINED_TYPE)
+                  PsiElement(VOID_KEYWORD)('void')
+          PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptAmbientDeclarationImpl(AMBIENT_DECLARATION)
+      PsiElement(DECLARE_KEYWORD)('declare')
+      PsiWhiteSpace(' ')
+      TypeScriptFunctionDeclarationImpl(FUNCTION_DECLARATION)
+        TypeScriptAttributeListImpl
+          <empty list>
+        PsiElement(FUNCTION_KEYWORD)('function')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('require')
+        TypeScriptParameterListImpl:PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          TypeScriptParameterImpl(PARAMETER)
+            TypeScriptAttributeListImpl
+              <empty list>
+            TypeScriptBindingPatternImpl(BINDING_PATTERN)
+              PsiElement(IDENTIFIER)('module')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                  PsiElement(IDENTIFIER)('string')
+          PsiElement(RPAR)(')')
+        TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptPredefinedTypeImpl(PREDEFINED_TYPE)
+            PsiElement(VOID_KEYWORD)('void')
+  TypeScriptEmptyStatementImpl(EMPTY_STATEMENT)
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptAmbientDeclarationImpl(AMBIENT_DECLARATION)
+      PsiElement(DECLARE_KEYWORD)('declare')
+      PsiWhiteSpace(' ')
+      TypeScriptClassDeclarationImpl: Buffer
+        TypeScriptAttributeListImpl
+          <empty list>
+        PsiElement(CLASS_KEYWORD)('class')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('Buffer')
+        PsiWhiteSpace(' ')
+        TypeScriptClassBodyImpl(CLASS_BODY)
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.ts
new file mode 100644
index 00000000..3989e6fe
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.ts
@@ -0,0 +1,5 @@
+const add = (a: number, b: number): number => a + b;
+const greet = (name: string) => {
+    return "hello " + name;
+};
+const identity = <T>(x: T): T => x;
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.txt
new file mode 100644
index 00000000..fe94377d
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.txt
@@ -0,0 +1,147 @@
+JSFile:ArrowFunction.ts
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(CONST_KEYWORD)('const')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('add')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptArrowFunctionImpl(ARROW_FUNCTION)
+        TypeScriptParameterListImpl:PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          TypeScriptParameterImpl(PARAMETER)
+            TypeScriptAttributeListImpl
+              <empty list>
+            TypeScriptBindingPatternImpl(BINDING_PATTERN)
+              PsiElement(IDENTIFIER)('a')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                  PsiElement(IDENTIFIER)('number')
+          PsiElement(COMMA)(',')
+          PsiWhiteSpace(' ')
+          TypeScriptParameterImpl(PARAMETER)
+            TypeScriptAttributeListImpl
+              <empty list>
+            TypeScriptBindingPatternImpl(BINDING_PATTERN)
+              PsiElement(IDENTIFIER)('b')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                  PsiElement(IDENTIFIER)('number')
+          PsiElement(RPAR)(')')
+        TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('number')
+        PsiWhiteSpace(' ')
+        PsiElement(DARROW)('=>')
+        PsiWhiteSpace(' ')
+        TypeScriptAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
+          TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+            PsiElement(IDENTIFIER)('a')
+          PsiWhiteSpace(' ')
+          PsiElement(PLUS)('+')
+          PsiWhiteSpace(' ')
+          TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+            PsiElement(IDENTIFIER)('b')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(CONST_KEYWORD)('const')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('greet')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptArrowFunctionImpl(ARROW_FUNCTION)
+        TypeScriptParameterListImpl:PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          TypeScriptParameterImpl(PARAMETER)
+            TypeScriptAttributeListImpl
+              <empty list>
+            TypeScriptBindingPatternImpl(BINDING_PATTERN)
+              PsiElement(IDENTIFIER)('name')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                  PsiElement(IDENTIFIER)('string')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(DARROW)('=>')
+        PsiWhiteSpace(' ')
+        TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+          PsiElement(LBRACE)('{')
+          PsiWhiteSpace('\n    ')
+          TypeScriptReturnStatementImpl(RETURN_STATEMENT)
+            PsiElement(RETURN_KEYWORD)('return')
+            PsiWhiteSpace(' ')
+            TypeScriptAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
+              TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+                PsiElement(STRING_LITERAL)('"hello "')
+              PsiWhiteSpace(' ')
+              PsiElement(PLUS)('+')
+              PsiWhiteSpace(' ')
+              TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+                PsiElement(IDENTIFIER)('name')
+            PsiElement(SEMICOLON)(';')
+          PsiWhiteSpace('\n')
+          PsiElement(RBRACE)('}')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(CONST_KEYWORD)('const')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('identity')
+    PsiWhiteSpace(' ')
+    PsiElement(EQ)('=')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:<exponentiation expression> expected, got '<'
+      PsiElement(BAD_CHARACTER)('<')
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptRelationalExpressionImpl(RELATIONAL_EXPRESSION)
+      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+        PsiElement(IDENTIFIER)('T')
+      PsiElement(GT)('>')
+      TypeScriptArrowFunctionImpl(ARROW_FUNCTION)
+        TypeScriptParameterListImpl:PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          TypeScriptParameterImpl(PARAMETER)
+            TypeScriptAttributeListImpl
+              <empty list>
+            TypeScriptBindingPatternImpl(BINDING_PATTERN)
+              PsiElement(IDENTIFIER)('x')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('T')
+        PsiWhiteSpace(' ')
+        PsiElement(DARROW)('=>')
+        PsiWhiteSpace(' ')
+        TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+          PsiElement(IDENTIFIER)('x')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ClassDeclaration.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/ClassDeclaration.ts
new file mode 100644
index 00000000..09bc0404
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ClassDeclaration.ts
@@ -0,0 +1,15 @@
+class Animal {
+    private name: string;
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
+    public getName(): string {
+        return this.name;
+    }
+}
+
+abstract class Shape {
+    abstract area(): number;
+}
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ClassDeclaration.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/ClassDeclaration.txt
new file mode 100644
index 00000000..22fcc972
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ClassDeclaration.txt
@@ -0,0 +1,125 @@
+JSFile:ClassDeclaration.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptClassDeclarationImpl: Animal
+      TypeScriptAttributeListImpl
+        <empty list>
+      PsiElement(CLASS_KEYWORD)('class')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Animal')
+      PsiWhiteSpace(' ')
+      TypeScriptClassBodyImpl(CLASS_BODY)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n    ')
+        TypeScriptAttributeListImpl
+          PsiElement(PRIVATE_KEYWORD)('private')
+        PsiWhiteSpace(' ')
+        TypeScriptPropertyDeclarationImpl(PROPERTY_DECLARATION)
+          PsiElement(IDENTIFIER)('name')
+          TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+            PsiElement(COLON)(':')
+            PsiWhiteSpace(' ')
+            TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+              TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                PsiElement(IDENTIFIER)('string')
+          PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace('\n\n    ')
+        TypeScriptAttributeListImpl
+          <empty list>
+        TypeScriptConstructorDeclarationImpl(CONSTRUCTOR_DECLARATION)
+          PsiElement(CONSTRUCTOR_KEYWORD)('constructor')
+          TypeScriptParameterListImpl:PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            TypeScriptParameterImpl(PARAMETER)
+              TypeScriptAttributeListImpl
+                <empty list>
+              TypeScriptBindingPatternImpl(BINDING_PATTERN)
+                PsiElement(IDENTIFIER)('name')
+              TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+                PsiElement(COLON)(':')
+                PsiWhiteSpace(' ')
+                TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                  TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                    PsiElement(IDENTIFIER)('string')
+            PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+            PsiElement(LBRACE)('{')
+            PsiWhiteSpace('\n        ')
+            TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+              TypeScriptAssignmentExpressionImpl(ASSIGNMENT_EXPRESSION)
+                TypeScriptExponentiationExpressionImpl(EXPONENTIATION_EXPRESSION)
+                  TypeScriptThisExpressionImpl(THIS_EXPRESSION)
+                    PsiElement(THIS_KEYWORD)('this')
+                  PsiElement(DOT)('.')
+                  PsiElement(IDENTIFIER)('name')
+                PsiWhiteSpace(' ')
+                PsiElement(EQ)('=')
+                PsiWhiteSpace(' ')
+                TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+                  PsiElement(IDENTIFIER)('name')
+              PsiElement(SEMICOLON)(';')
+            PsiWhiteSpace('\n    ')
+            PsiElement(RBRACE)('}')
+        PsiWhiteSpace('\n\n    ')
+        TypeScriptAttributeListImpl
+          PsiElement(PUBLIC_KEYWORD)('public')
+        PsiWhiteSpace(' ')
+        TypeScriptMethodDeclarationImpl(METHOD_DECLARATION)
+          PsiElement(IDENTIFIER)('getName')
+          TypeScriptParameterListImpl:PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            PsiElement(RPAR)(')')
+          TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+            PsiElement(COLON)(':')
+            PsiWhiteSpace(' ')
+            TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+              TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                PsiElement(IDENTIFIER)('string')
+          PsiWhiteSpace(' ')
+          TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+            PsiElement(LBRACE)('{')
+            PsiWhiteSpace('\n        ')
+            TypeScriptReturnStatementImpl(RETURN_STATEMENT)
+              PsiElement(RETURN_KEYWORD)('return')
+              PsiWhiteSpace(' ')
+              TypeScriptExponentiationExpressionImpl(EXPONENTIATION_EXPRESSION)
+                TypeScriptThisExpressionImpl(THIS_EXPRESSION)
+                  PsiElement(THIS_KEYWORD)('this')
+                PsiElement(DOT)('.')
+                PsiElement(IDENTIFIER)('name')
+              PsiElement(SEMICOLON)(';')
+            PsiWhiteSpace('\n    ')
+            PsiElement(RBRACE)('}')
+        PsiWhiteSpace('\n')
+        PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptClassDeclarationImpl: Shape
+      TypeScriptAttributeListImpl
+        PsiElement(ABSTRACT_KEYWORD)('abstract')
+      PsiWhiteSpace(' ')
+      PsiElement(CLASS_KEYWORD)('class')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Shape')
+      PsiWhiteSpace(' ')
+      TypeScriptClassBodyImpl(CLASS_BODY)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n    ')
+        TypeScriptAttributeListImpl
+          PsiElement(ABSTRACT_KEYWORD)('abstract')
+        PsiWhiteSpace(' ')
+        TypeScriptMethodDeclarationImpl(METHOD_DECLARATION)
+          PsiElement(IDENTIFIER)('area')
+          TypeScriptParameterListImpl:PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            PsiElement(RPAR)(')')
+          TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+            PsiElement(COLON)(':')
+            PsiWhiteSpace(' ')
+            TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+              TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                PsiElement(IDENTIFIER)('number')
+        PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace('\n')
+        PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.ts
new file mode 100644
index 00000000..3075e308
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.ts
@@ -0,0 +1,10 @@
+enum Color {
+    Red,
+    Green,
+    Blue
+}
+
+const enum Direction {
+    Up = "UP",
+    Down = "DOWN"
+}
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.txt
new file mode 100644
index 00000000..78a3fc9f
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.txt
@@ -0,0 +1,54 @@
+JSFile:EnumDeclaration.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptEnumDeclarationImpl(ENUM_DECLARATION)
+      PsiElement(ENUM_KEYWORD)('enum')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Color')
+      PsiWhiteSpace(' ')
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      TypeScriptEnumMemberImpl(ENUM_MEMBER)
+        PsiElement(IDENTIFIER)('Red')
+      PsiElement(COMMA)(',')
+      PsiWhiteSpace('\n    ')
+      TypeScriptEnumMemberImpl(ENUM_MEMBER)
+        PsiElement(IDENTIFIER)('Green')
+      PsiElement(COMMA)(',')
+      PsiWhiteSpace('\n    ')
+      TypeScriptEnumMemberImpl(ENUM_MEMBER)
+        PsiElement(IDENTIFIER)('Blue')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(CONST_KEYWORD)('const')
+    PsiErrorElement:<binding pattern> expected, got 'enum'
+      <empty list>
+  PsiWhiteSpace(' ')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptEnumDeclarationImpl(ENUM_DECLARATION)
+      PsiElement(ENUM_KEYWORD)('enum')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Direction')
+      PsiWhiteSpace(' ')
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      TypeScriptEnumMemberImpl(ENUM_MEMBER)
+        PsiElement(IDENTIFIER)('Up')
+        PsiWhiteSpace(' ')
+        PsiElement(EQ)('=')
+        PsiWhiteSpace(' ')
+        TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+          PsiElement(STRING_LITERAL)('"UP"')
+      PsiElement(COMMA)(',')
+      PsiWhiteSpace('\n    ')
+      TypeScriptEnumMemberImpl(ENUM_MEMBER)
+        PsiElement(IDENTIFIER)('Down')
+        PsiWhiteSpace(' ')
+        PsiElement(EQ)('=')
+        PsiWhiteSpace(' ')
+        TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+          PsiElement(STRING_LITERAL)('"DOWN"')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/FunctionDeclaration.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/FunctionDeclaration.ts
new file mode 100644
index 00000000..e3c7e5c0
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/FunctionDeclaration.ts
@@ -0,0 +1,7 @@
+function greet(name: string): void {
+    return;
+}
+
+async function fetchData(url: string): Promise<Response> {
+    return fetch(url);
+}
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/FunctionDeclaration.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/FunctionDeclaration.txt
new file mode 100644
index 00000000..732f911f
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/FunctionDeclaration.txt
@@ -0,0 +1,90 @@
+JSFile:FunctionDeclaration.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptFunctionDeclarationImpl(FUNCTION_DECLARATION)
+      TypeScriptAttributeListImpl
+        <empty list>
+      PsiElement(FUNCTION_KEYWORD)('function')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('greet')
+      TypeScriptParameterListImpl:PARAMETER_LIST
+        PsiElement(LPAR)('(')
+        TypeScriptParameterImpl(PARAMETER)
+          TypeScriptAttributeListImpl
+            <empty list>
+          TypeScriptBindingPatternImpl(BINDING_PATTERN)
+            PsiElement(IDENTIFIER)('name')
+          TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+            PsiElement(COLON)(':')
+            PsiWhiteSpace(' ')
+            TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+              TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                PsiElement(IDENTIFIER)('string')
+        PsiElement(RPAR)(')')
+      TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TypeScriptPredefinedTypeImpl(PREDEFINED_TYPE)
+          PsiElement(VOID_KEYWORD)('void')
+      PsiWhiteSpace(' ')
+      TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n    ')
+        TypeScriptReturnStatementImpl(RETURN_STATEMENT)
+          PsiElement(RETURN_KEYWORD)('return')
+          PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace('\n')
+        PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptFunctionDeclarationImpl(FUNCTION_DECLARATION)
+      TypeScriptAttributeListImpl
+        PsiElement(ASYNC_KEYWORD)('async')
+      PsiWhiteSpace(' ')
+      PsiElement(FUNCTION_KEYWORD)('function')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('fetchData')
+      TypeScriptParameterListImpl:PARAMETER_LIST
+        PsiElement(LPAR)('(')
+        TypeScriptParameterImpl(PARAMETER)
+          TypeScriptAttributeListImpl
+            <empty list>
+          TypeScriptBindingPatternImpl(BINDING_PATTERN)
+            PsiElement(IDENTIFIER)('url')
+          TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+            PsiElement(COLON)(':')
+            PsiWhiteSpace(' ')
+            TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+              TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                PsiElement(IDENTIFIER)('string')
+        PsiElement(RPAR)(')')
+      TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+          TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+            PsiElement(IDENTIFIER)('Promise')
+          TypeScriptTypeArgumentsImpl(TYPE_ARGUMENTS)
+            PsiElement(LT)('<')
+            TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+              TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                PsiElement(IDENTIFIER)('Response')
+            PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
+      TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n    ')
+        TypeScriptReturnStatementImpl(RETURN_STATEMENT)
+          PsiElement(RETURN_KEYWORD)('return')
+          PsiWhiteSpace(' ')
+          TypeScriptExponentiationExpressionImpl(EXPONENTIATION_EXPRESSION)
+            TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+              PsiElement(IDENTIFIER)('fetch')
+            TypeScriptArgumentListImpl(ARGUMENT_LIST)
+              PsiElement(LPAR)('(')
+              TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+                PsiElement(IDENTIFIER)('url')
+              PsiElement(RPAR)(')')
+          PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace('\n')
+        PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.ts
new file mode 100644
index 00000000..f667b6ef
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.ts
@@ -0,0 +1,5 @@
+type Result<T, E> = { ok: true; value: T } | { ok: false; error: E };
+function identity<T>(arg: T): T {
+    return arg;
+}
+let list: Array<string> = [];
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.txt
new file mode 100644
index 00000000..88d72020
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.txt
@@ -0,0 +1,118 @@
+JSFile:GenericTypes.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptTypeAliasDeclarationImpl(TYPE_ALIAS_DECLARATION)
+      PsiElement(TYPE_KEYWORD)('type')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Result')
+      TypeScriptTypeParameterListImpl(TYPE_PARAMETER_LIST)
+        PsiElement(LT)('<')
+        PsiErrorElement:'T' unexpected
+          <empty list>
+      TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+        TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+          PsiElement(IDENTIFIER)('T')
+    PsiErrorElement:AND, DOT, EXTENDS_KEYWORD, LBRACKET, LT, OR or SEMICOLON expected, got ','
+      PsiElement(COMMA)(',')
+  PsiWhiteSpace(' ')
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+      PsiElement(IDENTIFIER)('E')
+    PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:<exponentiation expression> expected, got '='
+      PsiElement(EQ)('=')
+  PsiWhiteSpace(' ')
+  TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+    PsiElement(LBRACE)('{')
+    PsiWhiteSpace(' ')
+    TypeScriptLabeledStatementImpl(LABELED_STATEMENT)
+      PsiElement(IDENTIFIER)('ok')
+      PsiElement(COLON)(':')
+      PsiWhiteSpace(' ')
+      TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+        TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+          PsiElement(TRUE_KEYWORD)('true')
+        PsiElement(SEMICOLON)(';')
+    PsiWhiteSpace(' ')
+    TypeScriptLabeledStatementImpl(LABELED_STATEMENT)
+      PsiElement(IDENTIFIER)('value')
+      PsiElement(COLON)(':')
+      PsiWhiteSpace(' ')
+      TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+        TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+          PsiElement(IDENTIFIER)('T')
+    PsiWhiteSpace(' ')
+    PsiElement(RBRACE)('}')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:'|' unexpected
+      PsiElement(OR)('|')
+  PsiWhiteSpace(' ')
+  TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+    PsiElement(LBRACE)('{')
+    PsiWhiteSpace(' ')
+    TypeScriptLabeledStatementImpl(LABELED_STATEMENT)
+      PsiElement(IDENTIFIER)('ok')
+      PsiElement(COLON)(':')
+      PsiWhiteSpace(' ')
+      TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+        TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+          PsiElement(FALSE_KEYWORD)('false')
+        PsiElement(SEMICOLON)(';')
+    PsiWhiteSpace(' ')
+    TypeScriptLabeledStatementImpl(LABELED_STATEMENT)
+      PsiElement(IDENTIFIER)('error')
+      PsiElement(COLON)(':')
+      PsiWhiteSpace(' ')
+      TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+        TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+          PsiElement(IDENTIFIER)('E')
+    PsiWhiteSpace(' ')
+    PsiElement(RBRACE)('}')
+  TypeScriptEmptyStatementImpl(EMPTY_STATEMENT)
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  PsiElement(FUNCTION_KEYWORD)('function')
+  PsiErrorElement:MULT expected, got 'identity'
+    <empty list>
+  PsiWhiteSpace(' ')
+  PsiElement(IDENTIFIER)('identity')
+  PsiElement(DUMMY_BLOCK)
+    PsiElement(LT)('<')
+    PsiElement(IDENTIFIER)('T')
+    PsiElement(GT)('>')
+    PsiElement(LPAR)('(')
+    PsiElement(IDENTIFIER)('arg')
+    PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('T')
+    PsiElement(RPAR)(')')
+    PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('T')
+  PsiElement(DUMMY_BLOCK)
+    PsiWhiteSpace(' ')
+    PsiElement(LBRACE)('{')
+    PsiWhiteSpace('\n    ')
+    PsiElement(RETURN_KEYWORD)('return')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('arg')
+    PsiElement(SEMICOLON)(';')
+    PsiWhiteSpace('\n')
+    PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n')
+    PsiElement(LET_KEYWORD)('let')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('list')
+    PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('Array')
+    PsiElement(LT)('<')
+  PsiElement(IDENTIFIER)('string')
+  PsiElement(GT)('>')
+  PsiWhiteSpace(' ')
+  PsiElement(EQ)('=')
+  PsiWhiteSpace(' ')
+  PsiElement(LBRACKET)('[')
+  PsiElement(RBRACKET)(']')
+  PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.ts
new file mode 100644
index 00000000..ca32494c
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.ts
@@ -0,0 +1,7 @@
+import { Component } from 'react';
+import type { ReactNode } from 'react';
+import * as path from 'path';
+
+export function hello(): void {}
+export default class App {}
+export { Component };
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.txt
new file mode 100644
index 00000000..1ab61fa1
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.txt
@@ -0,0 +1,115 @@
+JSFile:ImportExport.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptImportDeclarationImpl(IMPORT_DECLARATION)
+      PsiElement(IMPORT_KEYWORD)('import')
+      PsiWhiteSpace(' ')
+      TypeScriptNamedImportsImpl(NAMED_IMPORTS)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace(' ')
+        TypeScriptImportSpecifierImpl(IMPORT_SPECIFIER)
+          PsiElement(IDENTIFIER)('Component')
+        PsiWhiteSpace(' ')
+        PsiElement(RBRACE)('}')
+      PsiWhiteSpace(' ')
+      PsiElement(FROM_KEYWORD)('from')
+      PsiWhiteSpace(' ')
+      PsiElement(SINGLE_QUOTE_STRING_LITERAL)(''react'')
+      PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptImportDeclarationImpl(IMPORT_DECLARATION)
+      PsiElement(IMPORT_KEYWORD)('import')
+      PsiWhiteSpace(' ')
+      PsiElement(TYPE_KEYWORD)('type')
+      PsiWhiteSpace(' ')
+      TypeScriptNamedImportsImpl(NAMED_IMPORTS)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace(' ')
+        TypeScriptImportSpecifierImpl(IMPORT_SPECIFIER)
+          PsiElement(IDENTIFIER)('ReactNode')
+        PsiWhiteSpace(' ')
+        PsiElement(RBRACE)('}')
+      PsiWhiteSpace(' ')
+      PsiElement(FROM_KEYWORD)('from')
+      PsiWhiteSpace(' ')
+      PsiElement(SINGLE_QUOTE_STRING_LITERAL)(''react'')
+      PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptImportDeclarationImpl(IMPORT_DECLARATION)
+      PsiElement(IMPORT_KEYWORD)('import')
+      PsiErrorElement:LBRACE or MULT expected, got '*'
+        <empty list>
+    PsiWhiteSpace(' ')
+    PsiElement(BAD_CHARACTER)('*')
+  PsiWhiteSpace(' ')
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+      PsiElement(IDENTIFIER)('as')
+  PsiWhiteSpace(' ')
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+      PsiElement(IDENTIFIER)('path')
+  PsiWhiteSpace(' ')
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+      PsiElement(IDENTIFIER)('from')
+  PsiWhiteSpace(' ')
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+      PsiElement(SINGLE_QUOTE_STRING_LITERAL)(''path'')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptExportDeclarationImpl(EXPORT_DECLARATION)
+      PsiElement(EXPORT_KEYWORD)('export')
+      PsiWhiteSpace(' ')
+      TypeScriptFunctionDeclarationImpl(FUNCTION_DECLARATION)
+        TypeScriptAttributeListImpl
+          <empty list>
+        PsiElement(FUNCTION_KEYWORD)('function')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('hello')
+        TypeScriptParameterListImpl:PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptPredefinedTypeImpl(PREDEFINED_TYPE)
+            PsiElement(VOID_KEYWORD)('void')
+        PsiWhiteSpace(' ')
+        TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptExportDeclarationImpl(EXPORT_DECLARATION)
+      PsiElement(EXPORT_KEYWORD)('export')
+      PsiWhiteSpace(' ')
+      PsiElement(DEFAULT_KEYWORD)('default')
+      PsiWhiteSpace(' ')
+      TypeScriptClassDeclarationImpl: App
+        TypeScriptAttributeListImpl
+          <empty list>
+        PsiElement(CLASS_KEYWORD)('class')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('App')
+        PsiWhiteSpace(' ')
+        TypeScriptClassBodyImpl(CLASS_BODY)
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptExportDeclarationImpl(EXPORT_DECLARATION)
+      PsiElement(EXPORT_KEYWORD)('export')
+      PsiWhiteSpace(' ')
+      TypeScriptNamedExportsImpl(NAMED_EXPORTS)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace(' ')
+        TypeScriptExportSpecifierImpl(EXPORT_SPECIFIER)
+          PsiElement(IDENTIFIER)('Component')
+        PsiWhiteSpace(' ')
+        PsiElement(RBRACE)('}')
+      PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportMeta.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportMeta.ts
new file mode 100644
index 00000000..c4d0e008
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportMeta.ts
@@ -0,0 +1,3 @@
+if (import.meta.hot) {
+    import.meta.hot.on('change', () => {});
+}
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportMeta.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportMeta.txt
new file mode 100644
index 00000000..addd114b
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportMeta.txt
@@ -0,0 +1,48 @@
+JSFile:ImportMeta.ts
+  TypeScriptIfStatementImpl(IF_STATEMENT)
+    PsiElement(IF_KEYWORD)('if')
+    PsiWhiteSpace(' ')
+    PsiElement(LPAR)('(')
+    TypeScriptExponentiationExpressionImpl(EXPONENTIATION_EXPRESSION)
+      TypeScriptImportMetaExpressionImpl(IMPORT_META_EXPRESSION)
+        PsiElement(IMPORT_KEYWORD)('import')
+        PsiElement(DOT)('.')
+        PsiElement(IDENTIFIER)('meta')
+      PsiElement(DOT)('.')
+      PsiElement(IDENTIFIER)('hot')
+    PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+        TypeScriptExponentiationExpressionImpl(EXPONENTIATION_EXPRESSION)
+          TypeScriptImportMetaExpressionImpl(IMPORT_META_EXPRESSION)
+            PsiElement(IMPORT_KEYWORD)('import')
+            PsiElement(DOT)('.')
+            PsiElement(IDENTIFIER)('meta')
+          PsiElement(DOT)('.')
+          PsiElement(IDENTIFIER)('hot')
+          PsiElement(DOT)('.')
+          PsiElement(IDENTIFIER)('on')
+          TypeScriptArgumentListImpl(ARGUMENT_LIST)
+            PsiElement(LPAR)('(')
+            TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+              PsiElement(SINGLE_QUOTE_STRING_LITERAL)(''change'')
+            PsiElement(COMMA)(',')
+            PsiWhiteSpace(' ')
+            TypeScriptArrowFunctionImpl(ARROW_FUNCTION)
+              TypeScriptParameterListImpl:PARAMETER_LIST
+                PsiElement(LPAR)('(')
+                PsiElement(RPAR)(')')
+              PsiWhiteSpace(' ')
+              PsiElement(DARROW)('=>')
+              PsiWhiteSpace(' ')
+              TypeScriptObjectLiteralExpressionImpl(OBJECT_LITERAL_EXPRESSION)
+                PsiElement(LBRACE)('{')
+                PsiElement(RBRACE)('}')
+            PsiElement(RPAR)(')')
+        PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.ts
new file mode 100644
index 00000000..5fececa2
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.ts
@@ -0,0 +1,9 @@
+interface User {
+    name: string;
+    age: number;
+    email?: string;
+}
+
+interface Repository<T> extends Iterable<T> {
+    findById(id: string): T;
+}
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.txt
new file mode 100644
index 00000000..dfe997a9
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.txt
@@ -0,0 +1,99 @@
+JSFile:InterfaceDeclaration.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptInterfaceDeclarationImpl:INTERFACE_DECLARATION
+      PsiElement(INTERFACE_KEYWORD)('interface')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('User')
+      PsiWhiteSpace(' ')
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      TypeScriptPropertySignatureMemberImpl(PROPERTY_SIGNATURE_MEMBER)
+        PsiElement(IDENTIFIER)('name')
+        TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('string')
+      PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n    ')
+      TypeScriptPropertySignatureMemberImpl(PROPERTY_SIGNATURE_MEMBER)
+        PsiElement(IDENTIFIER)('age')
+        TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('number')
+      PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n    ')
+      TypeScriptPropertySignatureMemberImpl(PROPERTY_SIGNATURE_MEMBER)
+        PsiElement(IDENTIFIER)('email')
+        PsiElement(QUEST)('?')
+        TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('string')
+      PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptInterfaceDeclarationImpl:INTERFACE_DECLARATION
+      PsiElement(INTERFACE_KEYWORD)('interface')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Repository')
+      TypeScriptTypeParameterListImpl(TYPE_PARAMETER_LIST)
+        PsiElement(LT)('<')
+        PsiErrorElement:'T' unexpected
+          <empty list>
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+      PsiElement(IDENTIFIER)('T')
+    PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:<exponentiation expression> expected, got 'extends'
+      PsiElement(EXTENDS_KEYWORD)('extends')
+  PsiWhiteSpace(' ')
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptRelationalExpressionImpl(RELATIONAL_EXPRESSION)
+      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+        PsiElement(IDENTIFIER)('Iterable')
+      PsiElement(LT)('<')
+      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+        PsiElement(IDENTIFIER)('T')
+    PsiElement(GT)('>')
+    PsiErrorElement:<literal expression>, <prefix expression>, AWAIT_KEYWORD, IMPORT_KEYWORD, LBRACE, LBRACKET, LPAR, LT, NEW_KEYWORD, SUPER_KEYWORD, THIS_KEYWORD or YIELD_KEYWORD expected, got '{'
+      <empty list>
+  PsiWhiteSpace(' ')
+  TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+    PsiElement(LBRACE)('{')
+    PsiWhiteSpace('\n    ')
+    TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+      TypeScriptExponentiationExpressionImpl(EXPONENTIATION_EXPRESSION)
+        TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+          PsiElement(IDENTIFIER)('findById')
+        TypeScriptArgumentListImpl(ARGUMENT_LIST)
+          PsiElement(LPAR)('(')
+          TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+            PsiElement(IDENTIFIER)('id')
+      PsiElement(COLON)(':')
+      PsiErrorElement:AND, LPAR or OR expected, got 'string'
+        <empty list>
+    PsiWhiteSpace(' ')
+    TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+        PsiElement(IDENTIFIER)('string')
+      PsiErrorElement:AND, ANDAND, ANDEQ, AND_AND_EQ, COLON, DARROW, DIV, DIVEQ, DOT, EQ, EQEQ, EQEQEQ, EXCL, GE, GT, GTGT, GTGTEQ, GTGTGT, GTGTGTEQ, INSTANCEOF_KEYWORD, IN_KEYWORD, LBRACKET, LE, LPAR, LT, LTLT, LTLTEQ, MINUS, MINUSEQ, MULT, MULTEQ, MULTMULT, MULT_MULT_EQ, NE, NEQEQ, OR, OREQ, OROR, OR_OR_EQ, PERC, PERCEQ, PLUS, PLUSEQ, QUEST, QUEST_DOT, QUEST_QUEST, QUEST_QUEST_EQ, SEMICOLON, XOR, XOREQ expected, got ')'
+        PsiElement(RPAR)(')')
+      PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+        PsiElement(IDENTIFIER)('T')
+      PsiElement(SEMICOLON)(';')
+    PsiWhiteSpace('\n')
+    PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.ts
new file mode 100644
index 00000000..09802262
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.ts
@@ -0,0 +1,3 @@
+const single = 'hello';
+const double = "world";
+const template = `hello ${name}`;
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.txt
new file mode 100644
index 00000000..6c446a13
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.txt
@@ -0,0 +1,47 @@
+JSFile:StringLiterals.ts
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(CONST_KEYWORD)('const')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('single')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+        PsiElement(SINGLE_QUOTE_STRING_LITERAL)(''hello'')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(CONST_KEYWORD)('const')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('double')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+        PsiElement(STRING_LITERAL)('"world"')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(CONST_KEYWORD)('const')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('template')
+    PsiWhiteSpace(' ')
+    PsiElement(EQ)('=')
+    PsiErrorElement:<arrow function>, <literal expression>, <prefix expression>, AWAIT_KEYWORD, IMPORT_KEYWORD, LBRACE, LBRACKET, LPAR, LT, NEW_KEYWORD, NO_SUBSTITUTION_TEMPLATE, SUPER_KEYWORD, TEMPLATE_HEAD, THIS_KEYWORD or YIELD_KEYWORD expected, got '`'
+      <empty list>
+  PsiWhiteSpace(' ')
+  PsiElement(TEMPLATE_HEAD)('`')
+  PsiErrorElement:<arrow function>, <literal expression>, <prefix expression>, LBRACE, LBRACKET, NEW_KEYWORD, NO_SUBSTITUTION_TEMPLATE, SUPER_KEYWORD or THIS_KEYWORD expected, got 'hello '
+    <empty list>
+  PsiElement(NO_SUBSTITUTION_TEMPLATE)('hello ')
+  PsiElement(TEMPLATE_HEAD)('${')
+  PsiElement(IDENTIFIER)('name')
+  PsiElement(RBRACE)('}')
+  PsiElement(TEMPLATE_HEAD)('`')
+  PsiElement(NO_SUBSTITUTION_TEMPLATE)(';\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.ts
new file mode 100644
index 00000000..f6882a24
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.ts
@@ -0,0 +1,3 @@
+type StringOrNumber = string | number;
+type Callback = (data: string) => void;
+type Pair<T, U> = [T, U];
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.txt
new file mode 100644
index 00000000..275c1080
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.txt
@@ -0,0 +1,81 @@
+JSFile:TypeAlias.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptTypeAliasDeclarationImpl(TYPE_ALIAS_DECLARATION)
+      PsiElement(TYPE_KEYWORD)('type')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('StringOrNumber')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptUnionTypeImpl(UNION_TYPE)
+        TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+          TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+            PsiElement(IDENTIFIER)('string')
+        PsiWhiteSpace(' ')
+        PsiElement(OR)('|')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+          TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+            PsiElement(IDENTIFIER)('number')
+      PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptTypeAliasDeclarationImpl(TYPE_ALIAS_DECLARATION)
+      PsiElement(TYPE_KEYWORD)('type')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Callback')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptFunctionTypeImpl(FUNCTION_TYPE)
+        PsiElement(LPAR)('(')
+        TypeScriptParameterTypeImpl(PARAMETER_TYPE)
+          PsiElement(IDENTIFIER)('data')
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('string')
+        PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(DARROW)('=>')
+        PsiWhiteSpace(' ')
+        TypeScriptPredefinedTypeImpl(PREDEFINED_TYPE)
+          PsiElement(VOID_KEYWORD)('void')
+      PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptTypeAliasDeclarationImpl(TYPE_ALIAS_DECLARATION)
+      PsiElement(TYPE_KEYWORD)('type')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Pair')
+      TypeScriptTypeParameterListImpl(TYPE_PARAMETER_LIST)
+        PsiElement(LT)('<')
+        PsiErrorElement:'T' unexpected
+          <empty list>
+      TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+        TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+          PsiElement(IDENTIFIER)('T')
+    PsiErrorElement:AND, DOT, EXTENDS_KEYWORD, LBRACKET, LT, OR or SEMICOLON expected, got ','
+      PsiElement(COMMA)(',')
+  PsiWhiteSpace(' ')
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+      PsiElement(IDENTIFIER)('U')
+    PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:<exponentiation expression> expected, got '='
+      PsiElement(EQ)('=')
+  PsiWhiteSpace(' ')
+  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
+    TypeScriptArrayLiteralExpressionImpl(ARRAY_LITERAL_EXPRESSION)
+      PsiElement(LBRACKET)('[')
+      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+        PsiElement(IDENTIFIER)('T')
+      PsiElement(COMMA)(',')
+      PsiWhiteSpace(' ')
+      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+        PsiElement(IDENTIFIER)('U')
+      PsiElement(RBRACKET)(']')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/VarDeclaration.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/VarDeclaration.ts
new file mode 100644
index 00000000..463806c6
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/VarDeclaration.ts
@@ -0,0 +1,3 @@
+let x: number = 10;
+const name: string = "hello";
+var items: string[] = [];
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/VarDeclaration.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/VarDeclaration.txt
new file mode 100644
index 00000000..0eb5d3a2
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/VarDeclaration.txt
@@ -0,0 +1,61 @@
+JSFile:VarDeclaration.ts
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(LET_KEYWORD)('let')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('x')
+      TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+          TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+            PsiElement(IDENTIFIER)('number')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+        PsiElement(NUMERIC_LITERAL)('10')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(CONST_KEYWORD)('const')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('name')
+      TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+          TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+            PsiElement(IDENTIFIER)('string')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+        PsiElement(STRING_LITERAL)('"hello"')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(VAR_KEYWORD)('var')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('items')
+      TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+          TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+            PsiElement(IDENTIFIER)('string')
+        PsiElement(LBRACKET)('[')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptArrayLiteralExpressionImpl(ARRAY_LITERAL_EXPRESSION)
+        PsiElement(LBRACKET)('[')
+        PsiElement(RBRACKET)(']')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
\ No newline at end of file

From a20263a376ea2a003eb9ffe57e75bff2d5f576ff Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sat, 11 Apr 2026 12:04:24 +0300
Subject: [PATCH 332/340] fixes ts issues in grammar

---
 .../language/grammar/TypeScript.bnf           |  28 +-
 .../impl/syntax/_TypeScriptLexer.flex         | 289 +++++++++---------
 .../parser/test/TypeScriptParserTest.java     |  20 ++
 .../test/resources/parsing/ArrowFunction.txt  |  18 +-
 .../test/resources/parsing/DeclareModule.ts   |   5 +
 .../test/resources/parsing/DeclareModule.txt  |  52 ++++
 .../resources/parsing/EnumDeclaration.txt     |   7 +-
 .../src/test/resources/parsing/ExportType.ts  |   3 +
 .../src/test/resources/parsing/ExportType.txt |  60 ++++
 .../test/resources/parsing/GenericTypes.txt   | 221 ++++++++------
 .../src/test/resources/parsing/IfElse.ts      |   5 +
 .../src/test/resources/parsing/IfElse.txt     |  41 +++
 .../test/resources/parsing/ImportExport.txt   |  31 +-
 .../parsing/InterfaceDeclaration.txt          |  89 +++---
 .../resources/parsing/ObjectLiteralMethod.ts  |   6 +
 .../resources/parsing/ObjectLiteralMethod.txt |  59 ++++
 .../test/resources/parsing/StringLiterals.txt |  27 +-
 .../src/test/resources/parsing/TypeAlias.txt  |  45 ++-
 18 files changed, 635 insertions(+), 371 deletions(-)
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/DeclareModule.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/DeclareModule.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ExportType.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ExportType.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/IfElse.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/IfElse.txt
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ObjectLiteralMethod.ts
 create mode 100644 lang-version-impl/typescript-impl/src/test/resources/parsing/ObjectLiteralMethod.txt

diff --git a/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf b/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
index ea51cacc..f04a40b0 100644
--- a/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
+++ b/lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf
@@ -296,6 +296,7 @@ private statement_list ::= statement*
 
 statement ::=
     block_statement
+  | enum_declaration
   | var_statement
   | empty_statement
   | if_statement
@@ -316,7 +317,6 @@ statement ::=
   | function_declaration
   | class_declaration
   | interface_declaration
-  | enum_declaration
   | type_alias_declaration
   | namespace_declaration
   | import_declaration
@@ -328,7 +328,7 @@ statement ::=
 private statement_recover_ ::= !(
     IDENTIFIER | LBRACE | RBRACE | SEMICOLON |
     VAR_KEYWORD | LET_KEYWORD | CONST_KEYWORD |
-    FUNCTION_KEYWORD | CLASS_KEYWORD | IF_KEYWORD |
+    FUNCTION_KEYWORD | CLASS_KEYWORD | IF_KEYWORD | ELSE_KEYWORD |
     FOR_KEYWORD | WHILE_KEYWORD | DO_KEYWORD |
     SWITCH_KEYWORD | TRY_KEYWORD | RETURN_KEYWORD |
     THROW_KEYWORD | BREAK_KEYWORD | CONTINUE_KEYWORD |
@@ -474,7 +474,7 @@ enum_member ::= property_name ('=' expression)?
 type_alias_declaration ::= TYPE_KEYWORD IDENTIFIER type_parameter_list? '=' type_expression semicolon {pin=1}
 
 // --- Namespace ---
-namespace_declaration ::= (NAMESPACE_KEYWORD | MODULE_KEYWORD) qualified_name block_statement {pin=1}
+namespace_declaration ::= (NAMESPACE_KEYWORD | MODULE_KEYWORD) (qualified_name | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL) block_statement {pin=1}
 
 // --- Ambient declaration ---
 ambient_declaration ::= DECLARE_KEYWORD (var_statement | function_declaration | class_declaration | enum_declaration | namespace_declaration | interface_declaration | type_alias_declaration | GLOBAL_KEYWORD block_statement) {pin=1}
@@ -505,15 +505,19 @@ import_attribute ::= (IDENTIFIER | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL)
 
 // --- Export ---
 export_declaration ::= 'export' (
-    'default'? (function_declaration | class_declaration | interface_declaration | enum_declaration | type_alias_declaration)
-  | 'default' expression semicolon
+    'default' (function_declaration | class_declaration | expression semicolon)
   | ambient_declaration
+  | function_declaration
+  | class_declaration
+  | interface_declaration
+  | enum_declaration
   | var_statement
+  | TYPE_KEYWORD named_exports from_clause? semicolon
+  | TYPE_KEYWORD '*' (AS_KEYWORD IDENTIFIER)? from_clause semicolon
+  | type_alias_declaration
   | named_exports from_clause? semicolon
   | '*' (AS_KEYWORD IDENTIFIER)? from_clause semicolon
   | '=' IDENTIFIER semicolon
-  | TYPE_KEYWORD? named_exports from_clause? semicolon
-  | TYPE_KEYWORD? '*' (AS_KEYWORD IDENTIFIER)? from_clause semicolon
 ) {pin=1}
 
 named_exports ::= '{' (export_specifier (',' export_specifier)* ','?)? '}'
@@ -626,17 +630,19 @@ private expression_list_opt ::= (expression (',' expression)* ','?)?
 object_literal_expression ::= '{' (property (',' property)* ','?)? '}'
 
 property ::= property_name ':' expression
-  | IDENTIFIER
   | '...' expression
   | '*'? property_name type_parameter_list? parameter_list type_annotation? block_statement
   | (GET_KEYWORD | SET_KEYWORD) property_name parameter_list type_annotation? block_statement
+  | IDENTIFIER
 
 computed_property_name ::= '[' expression ']'
 
 parenthesized_expression ::= '(' expression ')'
 
-template_literal_expression ::= NO_SUBSTITUTION_TEMPLATE
-  | TEMPLATE_HEAD expression (TEMPLATE_MIDDLE expression)* TEMPLATE_TAIL
+template_literal_expression ::= TEMPLATE_HEAD template_literal_content* TEMPLATE_TAIL
+
+private template_literal_content ::= NO_SUBSTITUTION_TEMPLATE
+  | TEMPLATE_HEAD expression TEMPLATE_MIDDLE
 
 spread_expression ::= '...' expression
 
@@ -737,7 +743,7 @@ predefined_type ::= IDENTIFIER | VOID_KEYWORD
 
 type_parameter_list ::= '<' type_parameter (',' type_parameter)* '>' {pin=1}
 
-type_parameter ::= IDENTIFIER? IDENTIFIER ('extends' type_expression)? ('=' type_expression)?
+type_parameter ::= IDENTIFIER ('extends' type_expression)? ('=' type_expression)?
 
 type_arguments ::= '<' type_expression (',' type_expression)* '>'
 
diff --git a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex
index d034ef1f..0d53b6bf 100644
--- a/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex
+++ b/lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex
@@ -55,114 +55,98 @@ REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SE
 
 %state DIV_OR_GT
 %state TEMPLATE_STRING
-%state TEMPLATE_STRING_EXPRESSION
 
 %%
 
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {WHITE_SPACE_CHAR}+ { return JSTokenTypes.WHITE_SPACE; }
+<YYINITIAL,DIV_OR_GT> {WHITE_SPACE_CHAR}+ { return JSTokenTypes.WHITE_SPACE; }
 
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {C_STYLE_COMMENT}     { return JSTokenTypes.C_STYLE_COMMENT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {END_OF_LINE_COMMENT}  { return JSTokenTypes.END_OF_LINE_COMMENT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {DOC_COMMENT}          { return JSTokenTypes.DOC_COMMENT; }
+<YYINITIAL,DIV_OR_GT> {C_STYLE_COMMENT}     { return JSTokenTypes.C_STYLE_COMMENT; }
+<YYINITIAL,DIV_OR_GT> {END_OF_LINE_COMMENT}  { return JSTokenTypes.END_OF_LINE_COMMENT; }
+<YYINITIAL,DIV_OR_GT> {DOC_COMMENT}          { return JSTokenTypes.DOC_COMMENT; }
 
 // === Numeric literals ===
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {BIGINT_LITERAL}    { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {INTEGER_LITERAL}   { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {FLOAT_LITERAL}     { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
+<YYINITIAL,DIV_OR_GT> {BIGINT_LITERAL}    { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
+<YYINITIAL,DIV_OR_GT> {INTEGER_LITERAL}   { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
+<YYINITIAL,DIV_OR_GT> {FLOAT_LITERAL}     { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
 
 // === String literals ===
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {QUOTED_LITERAL}        { yybegin(DIV_OR_GT); return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {DOUBLE_QUOTED_LITERAL} { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
+<YYINITIAL,DIV_OR_GT> {QUOTED_LITERAL}        { yybegin(DIV_OR_GT); return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL; }
+<YYINITIAL,DIV_OR_GT> {DOUBLE_QUOTED_LITERAL} { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
 
 // === Template literals ===
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "`" {
+// Opening backtick — enters template string scanning mode
+// Token type: TEMPLATE_HEAD (opening delimiter of template literal)
+<YYINITIAL,DIV_OR_GT> "`" {
     yybegin(TEMPLATE_STRING);
     return TypeScriptTokens.TEMPLATE_HEAD;
 }
 
+// Template string state: scans text content between template delimiters
 <TEMPLATE_STRING> {
+    // Interpolation start: ${ — returns TEMPLATE_HEAD and enters expression mode
     "${"  {
         templateDepth++;
         templateBraceCount.push(0);
-        yybegin(TEMPLATE_STRING_EXPRESSION);
+        yybegin(YYINITIAL);
         return TypeScriptTokens.TEMPLATE_HEAD;
     }
+    // Closing backtick — returns TEMPLATE_TAIL and exits template
     "`"   {
         yybegin(DIV_OR_GT);
-        return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE;
+        return TypeScriptTokens.TEMPLATE_TAIL;
     }
+    // Text content: any chars except backtick, dollar, backslash
     [^`$\\]+      { return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE; }
-    "\\".         { return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE; }
+    // Escape sequence: backslash + any char (including newline for line continuation)
+    "\\" [^]      { return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE; }
+    // Dollar followed by non-brace, non-backtick, non-backslash char (not interpolation start)
+    "$" [^{`\\]   { return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE; }
+    // Dollar followed by escape sequence
+    "$" "\\" [^]  { return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE; }
+    // Standalone dollar (before ` or ${, or at EOF)
     "$"           { return TypeScriptTokens.NO_SUBSTITUTION_TEMPLATE; }
 }
 
-<TEMPLATE_STRING_EXPRESSION> {
-    "{"  {
-        if (templateDepth > 0) {
-            templateBraceCount.push(templateBraceCount.pop() + 1);
-        }
-        yybegin(YYINITIAL);
-        return JSTokenTypes.LBRACE;
-    }
-    "}"  {
-        if (templateDepth > 0) {
-            int count = templateBraceCount.peek();
-            if (count > 0) {
-                templateBraceCount.push(templateBraceCount.pop() - 1);
-                yybegin(YYINITIAL);
-                return JSTokenTypes.RBRACE;
-            } else {
-                templateDepth--;
-                templateBraceCount.pop();
-                yybegin(TEMPLATE_STRING);
-                return TypeScriptTokens.TEMPLATE_TAIL;
-            }
-        }
-        yybegin(YYINITIAL);
-        return JSTokenTypes.RBRACE;
-    }
-}
-
 // === Keywords (true keywords - always keyword tokens) ===
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "break"       { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "case"        { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "catch"       { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "class"       { yybegin(YYINITIAL); return JSTokenTypes.CLASS_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "const"       { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "continue"    { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "debugger"    { yybegin(YYINITIAL); return TypeScriptTokens.DEBUGGER_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "default"     { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "delete"      { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "do"          { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "else"        { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "enum"        { yybegin(YYINITIAL); return JSTokenTypes.ENUM_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "export"      { yybegin(YYINITIAL); return JSTokenTypes.EXPORT_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "extends"     { yybegin(YYINITIAL); return JSTokenTypes.EXTENDS_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "false"       { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "finally"     { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "for"         { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "function"    { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "if"          { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "import"      { yybegin(YYINITIAL); return JSTokenTypes.IMPORT_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "in"          { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "instanceof"  { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "let"         { yybegin(YYINITIAL); return JSTokenTypes.LET_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "new"         { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "null"        { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "return"      { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "super"       { yybegin(YYINITIAL); return JSTokenTypes.SUPER_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "switch"      { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "this"        { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "throw"       { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "true"        { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "try"         { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "typeof"      { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "var"         { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "void"        { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "while"       { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "with"        { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "yield"       { yybegin(YYINITIAL); return JSTokenTypes.YIELD_KEYWORD; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "await"       { yybegin(YYINITIAL); return TypeScriptTokens.AWAIT_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "break"       { yybegin(YYINITIAL); return JSTokenTypes.BREAK_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "case"        { yybegin(YYINITIAL); return JSTokenTypes.CASE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "catch"       { yybegin(YYINITIAL); return JSTokenTypes.CATCH_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "class"       { yybegin(YYINITIAL); return JSTokenTypes.CLASS_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "const"       { yybegin(YYINITIAL); return JSTokenTypes.CONST_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "continue"    { yybegin(YYINITIAL); return JSTokenTypes.CONTINUE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "debugger"    { yybegin(YYINITIAL); return TypeScriptTokens.DEBUGGER_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "default"     { yybegin(YYINITIAL); return JSTokenTypes.DEFAULT_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "delete"      { yybegin(YYINITIAL); return JSTokenTypes.DELETE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "do"          { yybegin(YYINITIAL); return JSTokenTypes.DO_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "else"        { yybegin(YYINITIAL); return JSTokenTypes.ELSE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "enum"        { yybegin(YYINITIAL); return JSTokenTypes.ENUM_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "export"      { yybegin(YYINITIAL); return JSTokenTypes.EXPORT_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "extends"     { yybegin(YYINITIAL); return JSTokenTypes.EXTENDS_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "false"       { yybegin(DIV_OR_GT); return JSTokenTypes.FALSE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "finally"     { yybegin(YYINITIAL); return JSTokenTypes.FINALLY_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "for"         { yybegin(YYINITIAL); return JSTokenTypes.FOR_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "function"    { yybegin(YYINITIAL); return JSTokenTypes.FUNCTION_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "if"          { yybegin(YYINITIAL); return JSTokenTypes.IF_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "import"      { yybegin(YYINITIAL); return JSTokenTypes.IMPORT_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "in"          { yybegin(YYINITIAL); return JSTokenTypes.IN_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "instanceof"  { yybegin(YYINITIAL); return JSTokenTypes.INSTANCEOF_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "let"         { yybegin(YYINITIAL); return JSTokenTypes.LET_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "new"         { yybegin(YYINITIAL); return JSTokenTypes.NEW_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "null"        { yybegin(DIV_OR_GT); return JSTokenTypes.NULL_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "return"      { yybegin(YYINITIAL); return JSTokenTypes.RETURN_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "super"       { yybegin(YYINITIAL); return JSTokenTypes.SUPER_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "switch"      { yybegin(YYINITIAL); return JSTokenTypes.SWITCH_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "this"        { yybegin(DIV_OR_GT); return JSTokenTypes.THIS_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "throw"       { yybegin(YYINITIAL); return JSTokenTypes.THROW_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "true"        { yybegin(DIV_OR_GT); return JSTokenTypes.TRUE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "try"         { yybegin(YYINITIAL); return JSTokenTypes.TRY_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "typeof"      { yybegin(YYINITIAL); return JSTokenTypes.TYPEOF_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "var"         { yybegin(YYINITIAL); return JSTokenTypes.VAR_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "void"        { yybegin(YYINITIAL); return JSTokenTypes.VOID_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "while"       { yybegin(YYINITIAL); return JSTokenTypes.WHILE_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "with"        { yybegin(YYINITIAL); return JSTokenTypes.WITH_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "yield"       { yybegin(YYINITIAL); return JSTokenTypes.YIELD_KEYWORD; }
+<YYINITIAL,DIV_OR_GT> "await"       { yybegin(YYINITIAL); return TypeScriptTokens.AWAIT_KEYWORD; }
 
 // Contextual keywords emitted as IDENTIFIER - parser resolves them:
 // abstract, as, asserts, async, constructor, declare, defer, from, get, global,
@@ -171,70 +155,95 @@ REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SE
 // static, type, undefined, unique, unknown, using
 
 // === Identifiers ===
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {IDENTIFIER}  { yybegin(DIV_OR_GT); return JSTokenTypes.IDENTIFIER; }
+<YYINITIAL,DIV_OR_GT> {IDENTIFIER}  { yybegin(DIV_OR_GT); return JSTokenTypes.IDENTIFIER; }
 
 // === Multi-char operators (order matters: longer first) ===
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "..."   { yybegin(YYINITIAL); return JSTokenTypes.DOT_DOT_DOT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "==="   { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "!=="   { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">>>"   { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">>>="  { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">>="   { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "<<="   { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "**="   { yybegin(YYINITIAL); return JSTokenTypes.MULT_MULT_EQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "||="   { yybegin(YYINITIAL); return JSTokenTypes.OR_OR_EQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "&&="   { yybegin(YYINITIAL); return JSTokenTypes.AND_AND_EQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "??="   { yybegin(YYINITIAL); return JSTokenTypes.QUEST_QUEST_EQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "=>"    { yybegin(YYINITIAL); return JSTokenTypes.DARROW; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "=="    { yybegin(YYINITIAL); return JSTokenTypes.EQEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "!="    { yybegin(YYINITIAL); return JSTokenTypes.NE; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "++"    { return JSTokenTypes.PLUSPLUS; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "--"    { return JSTokenTypes.MINUSMINUS; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "**"    { yybegin(YYINITIAL); return JSTokenTypes.MULTMULT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "<<"    { yybegin(YYINITIAL); return JSTokenTypes.LTLT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">>"    { yybegin(YYINITIAL); return JSTokenTypes.GTGT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "&&"    { yybegin(YYINITIAL); return JSTokenTypes.ANDAND; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "||"    { yybegin(YYINITIAL); return JSTokenTypes.OROR; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "??"    { yybegin(YYINITIAL); return TypeScriptTokens.QUEST_QUEST; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "?."    { yybegin(YYINITIAL); return JSTokenTypes.QUEST_DOT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "+="    { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "-="    { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ; }
-<DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "*="               { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ; }
-<DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "/="               { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "%="    { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "&="    { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "|="    { yybegin(YYINITIAL); return JSTokenTypes.OREQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "^="    { yybegin(YYINITIAL); return JSTokenTypes.XOREQ; }
-<DIV_OR_GT> "<="                                          { yybegin(YYINITIAL); return JSTokenTypes.LE; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">="    { yybegin(YYINITIAL); return JSTokenTypes.GE; }
+<YYINITIAL,DIV_OR_GT> "..."   { yybegin(YYINITIAL); return JSTokenTypes.DOT_DOT_DOT; }
+<YYINITIAL,DIV_OR_GT> "==="   { yybegin(YYINITIAL); return JSTokenTypes.EQEQEQ; }
+<YYINITIAL,DIV_OR_GT> "!=="   { yybegin(YYINITIAL); return JSTokenTypes.NEQEQ; }
+<YYINITIAL,DIV_OR_GT> ">>>"   { yybegin(YYINITIAL); return JSTokenTypes.GTGTGT; }
+<YYINITIAL,DIV_OR_GT> ">>>="  { yybegin(YYINITIAL); return JSTokenTypes.GTGTGTEQ; }
+<YYINITIAL,DIV_OR_GT> ">>="   { yybegin(YYINITIAL); return JSTokenTypes.GTGTEQ; }
+<YYINITIAL,DIV_OR_GT> "<<="   { yybegin(YYINITIAL); return JSTokenTypes.LTLTEQ; }
+<YYINITIAL,DIV_OR_GT> "**="   { yybegin(YYINITIAL); return JSTokenTypes.MULT_MULT_EQ; }
+<YYINITIAL,DIV_OR_GT> "||="   { yybegin(YYINITIAL); return JSTokenTypes.OR_OR_EQ; }
+<YYINITIAL,DIV_OR_GT> "&&="   { yybegin(YYINITIAL); return JSTokenTypes.AND_AND_EQ; }
+<YYINITIAL,DIV_OR_GT> "??="   { yybegin(YYINITIAL); return JSTokenTypes.QUEST_QUEST_EQ; }
+<YYINITIAL,DIV_OR_GT> "=>"    { yybegin(YYINITIAL); return JSTokenTypes.DARROW; }
+<YYINITIAL,DIV_OR_GT> "=="    { yybegin(YYINITIAL); return JSTokenTypes.EQEQ; }
+<YYINITIAL,DIV_OR_GT> "!="    { yybegin(YYINITIAL); return JSTokenTypes.NE; }
+<YYINITIAL,DIV_OR_GT> "++"    { return JSTokenTypes.PLUSPLUS; }
+<YYINITIAL,DIV_OR_GT> "--"    { return JSTokenTypes.MINUSMINUS; }
+<YYINITIAL,DIV_OR_GT> "**"    { yybegin(YYINITIAL); return JSTokenTypes.MULTMULT; }
+<YYINITIAL,DIV_OR_GT> "<<"    { yybegin(YYINITIAL); return JSTokenTypes.LTLT; }
+<YYINITIAL,DIV_OR_GT> ">>"    { yybegin(YYINITIAL); return JSTokenTypes.GTGT; }
+<YYINITIAL,DIV_OR_GT> "&&"    { yybegin(YYINITIAL); return JSTokenTypes.ANDAND; }
+<YYINITIAL,DIV_OR_GT> "||"    { yybegin(YYINITIAL); return JSTokenTypes.OROR; }
+<YYINITIAL,DIV_OR_GT> "??"    { yybegin(YYINITIAL); return TypeScriptTokens.QUEST_QUEST; }
+<YYINITIAL,DIV_OR_GT> "?."    { yybegin(YYINITIAL); return JSTokenTypes.QUEST_DOT; }
+<YYINITIAL,DIV_OR_GT> "+="    { yybegin(YYINITIAL); return JSTokenTypes.PLUSEQ; }
+<YYINITIAL,DIV_OR_GT> "-="    { yybegin(YYINITIAL); return JSTokenTypes.MINUSEQ; }
+<DIV_OR_GT> "*="               { yybegin(YYINITIAL); return JSTokenTypes.MULTEQ; }
+<DIV_OR_GT> "/="               { yybegin(YYINITIAL); return JSTokenTypes.DIVEQ; }
+<YYINITIAL,DIV_OR_GT> "%="    { yybegin(YYINITIAL); return JSTokenTypes.PERCEQ; }
+<YYINITIAL,DIV_OR_GT> "&="    { yybegin(YYINITIAL); return JSTokenTypes.ANDEQ; }
+<YYINITIAL,DIV_OR_GT> "|="    { yybegin(YYINITIAL); return JSTokenTypes.OREQ; }
+<YYINITIAL,DIV_OR_GT> "^="    { yybegin(YYINITIAL); return JSTokenTypes.XOREQ; }
+<YYINITIAL,DIV_OR_GT> "<="    { yybegin(YYINITIAL); return JSTokenTypes.LE; }
+<YYINITIAL,DIV_OR_GT> ">="    { yybegin(YYINITIAL); return JSTokenTypes.GE; }
 
 // === Single-char operators ===
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "("     { yybegin(YYINITIAL); return JSTokenTypes.LPAR; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ")"     { yybegin(DIV_OR_GT); return JSTokenTypes.RPAR; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "{"     { yybegin(YYINITIAL); return JSTokenTypes.LBRACE; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "}"     { yybegin(YYINITIAL); return JSTokenTypes.RBRACE; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "["     { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "]"     { yybegin(DIV_OR_GT); return JSTokenTypes.RBRACKET; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ";"     { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ","     { yybegin(YYINITIAL); return JSTokenTypes.COMMA; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "."     { return JSTokenTypes.DOT; }
-<DIV_OR_GT> "<"                                           { yybegin(YYINITIAL); return JSTokenTypes.LT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ">"     { yybegin(YYINITIAL); return JSTokenTypes.GT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "="     { yybegin(YYINITIAL); return JSTokenTypes.EQ; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "!"     { yybegin(YYINITIAL); return JSTokenTypes.EXCL; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "~"     { yybegin(YYINITIAL); return JSTokenTypes.TILDE; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "?"     { yybegin(YYINITIAL); return JSTokenTypes.QUEST; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> ":"     { yybegin(YYINITIAL); return JSTokenTypes.COLON; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "+"     { yybegin(YYINITIAL); return JSTokenTypes.PLUS; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "-"     { yybegin(YYINITIAL); return JSTokenTypes.MINUS; }
-<DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "*"                { yybegin(YYINITIAL); return JSTokenTypes.MULT; }
-<DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "/"                { yybegin(YYINITIAL); return JSTokenTypes.DIV; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "^"     { yybegin(YYINITIAL); return JSTokenTypes.XOR; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "%"     { yybegin(YYINITIAL); return JSTokenTypes.PERC; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "&"     { yybegin(YYINITIAL); return JSTokenTypes.AND; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "|"     { yybegin(YYINITIAL); return JSTokenTypes.OR; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "@"     { return JSTokenTypes.AT; }
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> "#"     { return TypeScriptTokens.HASH; }
+<YYINITIAL,DIV_OR_GT> "("     { yybegin(YYINITIAL); return JSTokenTypes.LPAR; }
+<YYINITIAL,DIV_OR_GT> ")"     { yybegin(DIV_OR_GT); return JSTokenTypes.RPAR; }
+// Brace handling with template depth tracking
+<YYINITIAL,DIV_OR_GT> "{"     {
+    if (templateDepth > 0) {
+        templateBraceCount.push(templateBraceCount.pop() + 1);
+    }
+    yybegin(YYINITIAL);
+    return JSTokenTypes.LBRACE;
+}
+<YYINITIAL,DIV_OR_GT> "}"     {
+    if (templateDepth > 0) {
+        int count = templateBraceCount.peek();
+        if (count > 0) {
+            // Nested brace inside template expression — just decrement count
+            templateBraceCount.push(templateBraceCount.pop() - 1);
+            yybegin(YYINITIAL);
+            return JSTokenTypes.RBRACE;
+        } else {
+            // Closing brace of template interpolation — return to template text scanning
+            templateDepth--;
+            templateBraceCount.pop();
+            yybegin(TEMPLATE_STRING);
+            return TypeScriptTokens.TEMPLATE_MIDDLE;
+        }
+    }
+    yybegin(YYINITIAL);
+    return JSTokenTypes.RBRACE;
+}
+<YYINITIAL,DIV_OR_GT> "["     { yybegin(YYINITIAL); return JSTokenTypes.LBRACKET; }
+<YYINITIAL,DIV_OR_GT> "]"     { yybegin(DIV_OR_GT); return JSTokenTypes.RBRACKET; }
+<YYINITIAL,DIV_OR_GT> ";"     { yybegin(YYINITIAL); return JSTokenTypes.SEMICOLON; }
+<YYINITIAL,DIV_OR_GT> ","     { yybegin(YYINITIAL); return JSTokenTypes.COMMA; }
+<YYINITIAL,DIV_OR_GT> "."     { return JSTokenTypes.DOT; }
+<YYINITIAL,DIV_OR_GT> "<"     { yybegin(YYINITIAL); return JSTokenTypes.LT; }
+<YYINITIAL,DIV_OR_GT> ">"     { yybegin(YYINITIAL); return JSTokenTypes.GT; }
+<YYINITIAL,DIV_OR_GT> "="     { yybegin(YYINITIAL); return JSTokenTypes.EQ; }
+<YYINITIAL,DIV_OR_GT> "!"     { yybegin(YYINITIAL); return JSTokenTypes.EXCL; }
+<YYINITIAL,DIV_OR_GT> "~"     { yybegin(YYINITIAL); return JSTokenTypes.TILDE; }
+<YYINITIAL,DIV_OR_GT> "?"     { yybegin(YYINITIAL); return JSTokenTypes.QUEST; }
+<YYINITIAL,DIV_OR_GT> ":"     { yybegin(YYINITIAL); return JSTokenTypes.COLON; }
+<YYINITIAL,DIV_OR_GT> "+"     { yybegin(YYINITIAL); return JSTokenTypes.PLUS; }
+<YYINITIAL,DIV_OR_GT> "-"     { yybegin(YYINITIAL); return JSTokenTypes.MINUS; }
+<YYINITIAL,DIV_OR_GT> "*"     { yybegin(YYINITIAL); return JSTokenTypes.MULT; }
+<DIV_OR_GT> "/"                { yybegin(YYINITIAL); return JSTokenTypes.DIV; }
+<YYINITIAL,DIV_OR_GT> "^"     { yybegin(YYINITIAL); return JSTokenTypes.XOR; }
+<YYINITIAL,DIV_OR_GT> "%"     { yybegin(YYINITIAL); return JSTokenTypes.PERC; }
+<YYINITIAL,DIV_OR_GT> "&"     { yybegin(YYINITIAL); return JSTokenTypes.AND; }
+<YYINITIAL,DIV_OR_GT> "|"     { yybegin(YYINITIAL); return JSTokenTypes.OR; }
+<YYINITIAL,DIV_OR_GT> "@"     { return JSTokenTypes.AT; }
+<YYINITIAL,DIV_OR_GT> "#"     { return TypeScriptTokens.HASH; }
 
 // === Regexp (only in YYINITIAL - after operator, not after value) ===
 <YYINITIAL> {REGEXP_LITERAL}  { yybegin(DIV_OR_GT); return JSTokenTypes.REGEXP_LITERAL; }
diff --git a/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java b/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java
index 4bf0576f..726a7fb4 100644
--- a/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java
+++ b/lang-version-impl/typescript-impl/src/test/java/consulo/typescript/parser/test/TypeScriptParserTest.java
@@ -79,6 +79,26 @@ public void testStringLiterals(Context context) throws Exception {
         doTest(context, null);
     }
 
+    @Test
+    public void testIfElse(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testObjectLiteralMethod(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testExportType(Context context) throws Exception {
+        doTest(context, null);
+    }
+
+    @Test
+    public void testDeclareModule(Context context) throws Exception {
+        doTest(context, null);
+    }
+
     @Override
     protected LanguageFileType getFileType(Context context, Object o) {
         return TypeScriptFileType.INSTANCE;
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.txt
index fe94377d..8be679fb 100644
--- a/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.txt
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ArrowFunction.txt
@@ -107,17 +107,15 @@ JSFile:ArrowFunction.ts
     TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
       TypeScriptBindingPatternImpl(BINDING_PATTERN)
         PsiElement(IDENTIFIER)('identity')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:<exponentiation expression> expected, got '<'
-      PsiElement(BAD_CHARACTER)('<')
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptRelationalExpressionImpl(RELATIONAL_EXPRESSION)
-      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-        PsiElement(IDENTIFIER)('T')
-      PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
       TypeScriptArrowFunctionImpl(ARROW_FUNCTION)
+        TypeScriptTypeParameterListImpl(TYPE_PARAMETER_LIST)
+          PsiElement(LT)('<')
+          TypeScriptTypeParameterImpl(TYPE_PARAMETER)
+            PsiElement(IDENTIFIER)('T')
+          PsiElement(GT)('>')
         TypeScriptParameterListImpl:PARAMETER_LIST
           PsiElement(LPAR)('(')
           TypeScriptParameterImpl(PARAMETER)
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/DeclareModule.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/DeclareModule.ts
new file mode 100644
index 00000000..6b3ea3b8
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/DeclareModule.ts
@@ -0,0 +1,5 @@
+declare module "orion/editor/textModel" {
+    export class TextModel {
+        constructor(text?: string);
+    }
+}
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/DeclareModule.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/DeclareModule.txt
new file mode 100644
index 00000000..0fc56ea8
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/DeclareModule.txt
@@ -0,0 +1,52 @@
+JSFile:DeclareModule.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptAmbientDeclarationImpl(AMBIENT_DECLARATION)
+      PsiElement(DECLARE_KEYWORD)('declare')
+      PsiWhiteSpace(' ')
+      TypeScriptNamespaceDeclarationImpl(NAMESPACE_DECLARATION)
+        PsiElement(MODULE_KEYWORD)('module')
+        PsiWhiteSpace(' ')
+        PsiElement(STRING_LITERAL)('"orion/editor/textModel"')
+        PsiWhiteSpace(' ')
+        TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+          PsiElement(LBRACE)('{')
+          PsiWhiteSpace('\n    ')
+          TypeScriptStatementImpl(STATEMENT)
+            TypeScriptExportDeclarationImpl(EXPORT_DECLARATION)
+              PsiElement(EXPORT_KEYWORD)('export')
+              PsiWhiteSpace(' ')
+              TypeScriptClassDeclarationImpl: TextModel
+                TypeScriptAttributeListImpl
+                  <empty list>
+                PsiElement(CLASS_KEYWORD)('class')
+                PsiWhiteSpace(' ')
+                PsiElement(IDENTIFIER)('TextModel')
+                PsiWhiteSpace(' ')
+                TypeScriptClassBodyImpl(CLASS_BODY)
+                  PsiElement(LBRACE)('{')
+                  PsiWhiteSpace('\n        ')
+                  TypeScriptAttributeListImpl
+                    <empty list>
+                  TypeScriptConstructorDeclarationImpl(CONSTRUCTOR_DECLARATION)
+                    PsiElement(CONSTRUCTOR_KEYWORD)('constructor')
+                    TypeScriptParameterListImpl:PARAMETER_LIST
+                      PsiElement(LPAR)('(')
+                      TypeScriptParameterImpl(PARAMETER)
+                        TypeScriptAttributeListImpl
+                          <empty list>
+                        TypeScriptBindingPatternImpl(BINDING_PATTERN)
+                          PsiElement(IDENTIFIER)('text')
+                        PsiElement(QUEST)('?')
+                        TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+                          PsiElement(COLON)(':')
+                          PsiWhiteSpace(' ')
+                          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                              PsiElement(IDENTIFIER)('string')
+                      PsiElement(RPAR)(')')
+                  PsiElement(SEMICOLON)(';')
+                  PsiWhiteSpace('\n    ')
+                  PsiElement(RBRACE)('}')
+          PsiWhiteSpace('\n')
+          PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.txt
index 78a3fc9f..ed3c0230 100644
--- a/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.txt
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/EnumDeclaration.txt
@@ -20,13 +20,10 @@ JSFile:EnumDeclaration.ts
       PsiWhiteSpace('\n')
       PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n\n')
-  TypeScriptVarStatementImpl:VAR_STATEMENT
-    PsiElement(CONST_KEYWORD)('const')
-    PsiErrorElement:<binding pattern> expected, got 'enum'
-      <empty list>
-  PsiWhiteSpace(' ')
   TypeScriptStatementImpl(STATEMENT)
     TypeScriptEnumDeclarationImpl(ENUM_DECLARATION)
+      PsiElement(CONST_KEYWORD)('const')
+      PsiWhiteSpace(' ')
       PsiElement(ENUM_KEYWORD)('enum')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('Direction')
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ExportType.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/ExportType.ts
new file mode 100644
index 00000000..70561289
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ExportType.ts
@@ -0,0 +1,3 @@
+export type { EditorOptions, InlayHint } from "./api";
+export type * from "./types";
+export type StringOrNumber = string | number;
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ExportType.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/ExportType.txt
new file mode 100644
index 00000000..e3b56323
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ExportType.txt
@@ -0,0 +1,60 @@
+JSFile:ExportType.ts
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptExportDeclarationImpl(EXPORT_DECLARATION)
+      PsiElement(EXPORT_KEYWORD)('export')
+      PsiWhiteSpace(' ')
+      PsiElement(TYPE_KEYWORD)('type')
+      PsiWhiteSpace(' ')
+      TypeScriptNamedExportsImpl(NAMED_EXPORTS)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace(' ')
+        TypeScriptExportSpecifierImpl(EXPORT_SPECIFIER)
+          PsiElement(IDENTIFIER)('EditorOptions')
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace(' ')
+        TypeScriptExportSpecifierImpl(EXPORT_SPECIFIER)
+          PsiElement(IDENTIFIER)('InlayHint')
+        PsiWhiteSpace(' ')
+        PsiElement(RBRACE)('}')
+      PsiWhiteSpace(' ')
+      PsiElement(FROM_KEYWORD)('from')
+      PsiWhiteSpace(' ')
+      PsiElement(STRING_LITERAL)('"./api"')
+      PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptExportDeclarationImpl(EXPORT_DECLARATION)
+      PsiElement(EXPORT_KEYWORD)('export')
+      PsiWhiteSpace(' ')
+      PsiElement(TYPE_KEYWORD)('type')
+      PsiWhiteSpace(' ')
+      PsiElement(MULT)('*')
+      PsiWhiteSpace(' ')
+      PsiElement(FROM_KEYWORD)('from')
+      PsiWhiteSpace(' ')
+      PsiElement(STRING_LITERAL)('"./types"')
+      PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptExportDeclarationImpl(EXPORT_DECLARATION)
+      PsiElement(EXPORT_KEYWORD)('export')
+      PsiWhiteSpace(' ')
+      TypeScriptTypeAliasDeclarationImpl(TYPE_ALIAS_DECLARATION)
+        PsiElement(TYPE_KEYWORD)('type')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('StringOrNumber')
+        PsiWhiteSpace(' ')
+        PsiElement(EQ)('=')
+        PsiWhiteSpace(' ')
+        TypeScriptUnionTypeImpl(UNION_TYPE)
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('string')
+          PsiWhiteSpace(' ')
+          PsiElement(OR)('|')
+          PsiWhiteSpace(' ')
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('number')
+        PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.txt
index 88d72020..286da908 100644
--- a/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.txt
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/GenericTypes.txt
@@ -6,113 +6,134 @@ JSFile:GenericTypes.ts
       PsiElement(IDENTIFIER)('Result')
       TypeScriptTypeParameterListImpl(TYPE_PARAMETER_LIST)
         PsiElement(LT)('<')
-        PsiErrorElement:'T' unexpected
-          <empty list>
-      TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
-        TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+        TypeScriptTypeParameterImpl(TYPE_PARAMETER)
           PsiElement(IDENTIFIER)('T')
-    PsiErrorElement:AND, DOT, EXTENDS_KEYWORD, LBRACKET, LT, OR or SEMICOLON expected, got ','
-      PsiElement(COMMA)(',')
-  PsiWhiteSpace(' ')
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-      PsiElement(IDENTIFIER)('E')
-    PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:<exponentiation expression> expected, got '='
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeParameterImpl(TYPE_PARAMETER)
+          PsiElement(IDENTIFIER)('E')
+        PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
-  PsiWhiteSpace(' ')
-  TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
-    PsiElement(LBRACE)('{')
-    PsiWhiteSpace(' ')
-    TypeScriptLabeledStatementImpl(LABELED_STATEMENT)
-      PsiElement(IDENTIFIER)('ok')
-      PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
-      TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-        TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
-          PsiElement(TRUE_KEYWORD)('true')
-        PsiElement(SEMICOLON)(';')
-    PsiWhiteSpace(' ')
-    TypeScriptLabeledStatementImpl(LABELED_STATEMENT)
-      PsiElement(IDENTIFIER)('value')
-      PsiElement(COLON)(':')
+      TypeScriptUnionTypeImpl(UNION_TYPE)
+        TypeScriptObjectTypeImpl(OBJECT_TYPE)
+          PsiElement(LBRACE)('{')
+          PsiWhiteSpace(' ')
+          TypeScriptPropertySignatureMemberImpl(PROPERTY_SIGNATURE_MEMBER)
+            PsiElement(IDENTIFIER)('ok')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptLiteralTypeImpl(LITERAL_TYPE)
+                PsiElement(TRUE_KEYWORD)('true')
+          PsiElement(SEMICOLON)(';')
+          PsiWhiteSpace(' ')
+          TypeScriptPropertySignatureMemberImpl(PROPERTY_SIGNATURE_MEMBER)
+            PsiElement(IDENTIFIER)('value')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                  PsiElement(IDENTIFIER)('T')
+          PsiWhiteSpace(' ')
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace(' ')
+        PsiElement(OR)('|')
+        PsiWhiteSpace(' ')
+        TypeScriptObjectTypeImpl(OBJECT_TYPE)
+          PsiElement(LBRACE)('{')
+          PsiWhiteSpace(' ')
+          TypeScriptPropertySignatureMemberImpl(PROPERTY_SIGNATURE_MEMBER)
+            PsiElement(IDENTIFIER)('ok')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptLiteralTypeImpl(LITERAL_TYPE)
+                PsiElement(FALSE_KEYWORD)('false')
+          PsiElement(SEMICOLON)(';')
+          PsiWhiteSpace(' ')
+          TypeScriptPropertySignatureMemberImpl(PROPERTY_SIGNATURE_MEMBER)
+            PsiElement(IDENTIFIER)('error')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                  PsiElement(IDENTIFIER)('E')
+          PsiWhiteSpace(' ')
+          PsiElement(RBRACE)('}')
+      PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  TypeScriptStatementImpl(STATEMENT)
+    TypeScriptFunctionDeclarationImpl(FUNCTION_DECLARATION)
+      TypeScriptAttributeListImpl
+        <empty list>
+      PsiElement(FUNCTION_KEYWORD)('function')
       PsiWhiteSpace(' ')
-      TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-        TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+      PsiElement(IDENTIFIER)('identity')
+      TypeScriptTypeParameterListImpl(TYPE_PARAMETER_LIST)
+        PsiElement(LT)('<')
+        TypeScriptTypeParameterImpl(TYPE_PARAMETER)
           PsiElement(IDENTIFIER)('T')
-    PsiWhiteSpace(' ')
-    PsiElement(RBRACE)('}')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:'|' unexpected
-      PsiElement(OR)('|')
-  PsiWhiteSpace(' ')
-  TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
-    PsiElement(LBRACE)('{')
-    PsiWhiteSpace(' ')
-    TypeScriptLabeledStatementImpl(LABELED_STATEMENT)
-      PsiElement(IDENTIFIER)('ok')
-      PsiElement(COLON)(':')
-      PsiWhiteSpace(' ')
-      TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-        TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
-          PsiElement(FALSE_KEYWORD)('false')
-        PsiElement(SEMICOLON)(';')
-    PsiWhiteSpace(' ')
-    TypeScriptLabeledStatementImpl(LABELED_STATEMENT)
-      PsiElement(IDENTIFIER)('error')
-      PsiElement(COLON)(':')
+        PsiElement(GT)('>')
+      TypeScriptParameterListImpl:PARAMETER_LIST
+        PsiElement(LPAR)('(')
+        TypeScriptParameterImpl(PARAMETER)
+          TypeScriptAttributeListImpl
+            <empty list>
+          TypeScriptBindingPatternImpl(BINDING_PATTERN)
+            PsiElement(IDENTIFIER)('arg')
+          TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+            PsiElement(COLON)(':')
+            PsiWhiteSpace(' ')
+            TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+              TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                PsiElement(IDENTIFIER)('T')
+        PsiElement(RPAR)(')')
+      TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+          TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+            PsiElement(IDENTIFIER)('T')
       PsiWhiteSpace(' ')
-      TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-        TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-          PsiElement(IDENTIFIER)('E')
-    PsiWhiteSpace(' ')
-    PsiElement(RBRACE)('}')
-  TypeScriptEmptyStatementImpl(EMPTY_STATEMENT)
-    PsiElement(SEMICOLON)(';')
+      TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n    ')
+        TypeScriptReturnStatementImpl(RETURN_STATEMENT)
+          PsiElement(RETURN_KEYWORD)('return')
+          PsiWhiteSpace(' ')
+          TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+            PsiElement(IDENTIFIER)('arg')
+          PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace('\n')
+        PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n')
-  PsiElement(FUNCTION_KEYWORD)('function')
-  PsiErrorElement:MULT expected, got 'identity'
-    <empty list>
-  PsiWhiteSpace(' ')
-  PsiElement(IDENTIFIER)('identity')
-  PsiElement(DUMMY_BLOCK)
-    PsiElement(LT)('<')
-    PsiElement(IDENTIFIER)('T')
-    PsiElement(GT)('>')
-    PsiElement(LPAR)('(')
-    PsiElement(IDENTIFIER)('arg')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('T')
-    PsiElement(RPAR)(')')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('T')
-  PsiElement(DUMMY_BLOCK)
-    PsiWhiteSpace(' ')
-    PsiElement(LBRACE)('{')
-    PsiWhiteSpace('\n    ')
-    PsiElement(RETURN_KEYWORD)('return')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('arg')
-    PsiElement(SEMICOLON)(';')
-    PsiWhiteSpace('\n')
-    PsiElement(RBRACE)('}')
-    PsiWhiteSpace('\n')
+  TypeScriptVarStatementImpl:VAR_STATEMENT
     PsiElement(LET_KEYWORD)('let')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('list')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('Array')
-    PsiElement(LT)('<')
-  PsiElement(IDENTIFIER)('string')
-  PsiElement(GT)('>')
-  PsiWhiteSpace(' ')
-  PsiElement(EQ)('=')
-  PsiWhiteSpace(' ')
-  PsiElement(LBRACKET)('[')
-  PsiElement(RBRACKET)(']')
-  PsiElement(SEMICOLON)(';')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('list')
+      TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+          TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+            PsiElement(IDENTIFIER)('Array')
+          TypeScriptTypeArgumentsImpl(TYPE_ARGUMENTS)
+            PsiElement(LT)('<')
+            TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+              TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                PsiElement(IDENTIFIER)('string')
+            PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptArrayLiteralExpressionImpl(ARRAY_LITERAL_EXPRESSION)
+        PsiElement(LBRACKET)('[')
+        PsiElement(RBRACKET)(']')
+    PsiElement(SEMICOLON)(';')
   PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/IfElse.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/IfElse.ts
new file mode 100644
index 00000000..e6e0c00e
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/IfElse.ts
@@ -0,0 +1,5 @@
+if (x < 10) {
+    return x;
+} else {
+    return 10;
+}
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/IfElse.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/IfElse.txt
new file mode 100644
index 00000000..be61d5a6
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/IfElse.txt
@@ -0,0 +1,41 @@
+JSFile:IfElse.ts
+  TypeScriptIfStatementImpl(IF_STATEMENT)
+    PsiElement(IF_KEYWORD)('if')
+    PsiWhiteSpace(' ')
+    PsiElement(LPAR)('(')
+    TypeScriptRelationalExpressionImpl(RELATIONAL_EXPRESSION)
+      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+        PsiElement(IDENTIFIER)('x')
+      PsiWhiteSpace(' ')
+      PsiElement(LT)('<')
+      PsiWhiteSpace(' ')
+      TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+        PsiElement(NUMERIC_LITERAL)('10')
+    PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      TypeScriptReturnStatementImpl(RETURN_STATEMENT)
+        PsiElement(RETURN_KEYWORD)('return')
+        PsiWhiteSpace(' ')
+        TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+          PsiElement(IDENTIFIER)('x')
+        PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')
+    PsiWhiteSpace(' ')
+    PsiElement(ELSE_KEYWORD)('else')
+    PsiWhiteSpace(' ')
+    TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      TypeScriptReturnStatementImpl(RETURN_STATEMENT)
+        PsiElement(RETURN_KEYWORD)('return')
+        PsiWhiteSpace(' ')
+        TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+          PsiElement(NUMERIC_LITERAL)('10')
+        PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.txt
index 1ab61fa1..01a37019 100644
--- a/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.txt
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ImportExport.txt
@@ -38,27 +38,18 @@ JSFile:ImportExport.ts
   TypeScriptStatementImpl(STATEMENT)
     TypeScriptImportDeclarationImpl(IMPORT_DECLARATION)
       PsiElement(IMPORT_KEYWORD)('import')
-      PsiErrorElement:LBRACE or MULT expected, got '*'
-        <empty list>
-    PsiWhiteSpace(' ')
-    PsiElement(BAD_CHARACTER)('*')
-  PsiWhiteSpace(' ')
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-      PsiElement(IDENTIFIER)('as')
-  PsiWhiteSpace(' ')
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-      PsiElement(IDENTIFIER)('path')
-  PsiWhiteSpace(' ')
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-      PsiElement(IDENTIFIER)('from')
-  PsiWhiteSpace(' ')
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+      PsiWhiteSpace(' ')
+      TypeScriptNamespaceImportImpl(NAMESPACE_IMPORT)
+        PsiElement(MULT)('*')
+        PsiWhiteSpace(' ')
+        PsiElement(AS_KEYWORD)('as')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('path')
+      PsiWhiteSpace(' ')
+      PsiElement(FROM_KEYWORD)('from')
+      PsiWhiteSpace(' ')
       PsiElement(SINGLE_QUOTE_STRING_LITERAL)(''path'')
-    PsiElement(SEMICOLON)(';')
+      PsiElement(SEMICOLON)(';')
   PsiWhiteSpace('\n\n')
   TypeScriptStatementImpl(STATEMENT)
     TypeScriptExportDeclarationImpl(EXPORT_DECLARATION)
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.txt
index dfe997a9..33d66996 100644
--- a/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.txt
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/InterfaceDeclaration.txt
@@ -47,53 +47,48 @@ JSFile:InterfaceDeclaration.ts
       PsiElement(IDENTIFIER)('Repository')
       TypeScriptTypeParameterListImpl(TYPE_PARAMETER_LIST)
         PsiElement(LT)('<')
-        PsiErrorElement:'T' unexpected
-          <empty list>
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-      PsiElement(IDENTIFIER)('T')
-    PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:<exponentiation expression> expected, got 'extends'
-      PsiElement(EXTENDS_KEYWORD)('extends')
-  PsiWhiteSpace(' ')
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptRelationalExpressionImpl(RELATIONAL_EXPRESSION)
-      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-        PsiElement(IDENTIFIER)('Iterable')
-      PsiElement(LT)('<')
-      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-        PsiElement(IDENTIFIER)('T')
-    PsiElement(GT)('>')
-    PsiErrorElement:<literal expression>, <prefix expression>, AWAIT_KEYWORD, IMPORT_KEYWORD, LBRACE, LBRACKET, LPAR, LT, NEW_KEYWORD, SUPER_KEYWORD, THIS_KEYWORD or YIELD_KEYWORD expected, got '{'
-      <empty list>
-  PsiWhiteSpace(' ')
-  TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
-    PsiElement(LBRACE)('{')
-    PsiWhiteSpace('\n    ')
-    TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-      TypeScriptExponentiationExpressionImpl(EXPONENTIATION_EXPRESSION)
-        TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-          PsiElement(IDENTIFIER)('findById')
-        TypeScriptArgumentListImpl(ARGUMENT_LIST)
+        TypeScriptTypeParameterImpl(TYPE_PARAMETER)
+          PsiElement(IDENTIFIER)('T')
+        PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
+      TypeScriptExtendsListImpl:EXTENDS_LIST
+        PsiElement(EXTENDS_KEYWORD)('extends')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+          TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+            PsiElement(IDENTIFIER)('Iterable')
+          TypeScriptTypeArgumentsImpl(TYPE_ARGUMENTS)
+            PsiElement(LT)('<')
+            TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+              TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                PsiElement(IDENTIFIER)('T')
+            PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      TypeScriptMethodSignatureMemberImpl(METHOD_SIGNATURE_MEMBER)
+        PsiElement(IDENTIFIER)('findById')
+        TypeScriptParameterListImpl:PARAMETER_LIST
           PsiElement(LPAR)('(')
-          TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-            PsiElement(IDENTIFIER)('id')
-      PsiElement(COLON)(':')
-      PsiErrorElement:AND, LPAR or OR expected, got 'string'
-        <empty list>
-    PsiWhiteSpace(' ')
-    TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-        PsiElement(IDENTIFIER)('string')
-      PsiErrorElement:AND, ANDAND, ANDEQ, AND_AND_EQ, COLON, DARROW, DIV, DIVEQ, DOT, EQ, EQEQ, EQEQEQ, EXCL, GE, GT, GTGT, GTGTEQ, GTGTGT, GTGTGTEQ, INSTANCEOF_KEYWORD, IN_KEYWORD, LBRACKET, LE, LPAR, LT, LTLT, LTLTEQ, MINUS, MINUSEQ, MULT, MULTEQ, MULTMULT, MULT_MULT_EQ, NE, NEQEQ, OR, OREQ, OROR, OR_OR_EQ, PERC, PERCEQ, PLUS, PLUSEQ, QUEST, QUEST_DOT, QUEST_QUEST, QUEST_QUEST_EQ, SEMICOLON, XOR, XOREQ expected, got ')'
-        PsiElement(RPAR)(')')
-      PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-        PsiElement(IDENTIFIER)('T')
+          TypeScriptParameterImpl(PARAMETER)
+            TypeScriptAttributeListImpl
+              <empty list>
+            TypeScriptBindingPatternImpl(BINDING_PATTERN)
+              PsiElement(IDENTIFIER)('id')
+            TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+              PsiElement(COLON)(':')
+              PsiWhiteSpace(' ')
+              TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                  PsiElement(IDENTIFIER)('string')
+          PsiElement(RPAR)(')')
+        TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('T')
       PsiElement(SEMICOLON)(';')
-    PsiWhiteSpace('\n')
-    PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ObjectLiteralMethod.ts b/lang-version-impl/typescript-impl/src/test/resources/parsing/ObjectLiteralMethod.ts
new file mode 100644
index 00000000..68d3213f
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ObjectLiteralMethod.ts
@@ -0,0 +1,6 @@
+const obj = {
+    name: "test",
+    greet(name: string) {
+        return "hello " + name;
+    }
+};
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/ObjectLiteralMethod.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/ObjectLiteralMethod.txt
new file mode 100644
index 00000000..e84a0222
--- /dev/null
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/ObjectLiteralMethod.txt
@@ -0,0 +1,59 @@
+JSFile:ObjectLiteralMethod.ts
+  TypeScriptVarStatementImpl:VAR_STATEMENT
+    PsiElement(CONST_KEYWORD)('const')
+    PsiWhiteSpace(' ')
+    TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
+      TypeScriptBindingPatternImpl(BINDING_PATTERN)
+        PsiElement(IDENTIFIER)('obj')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptObjectLiteralExpressionImpl(OBJECT_LITERAL_EXPRESSION)
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n    ')
+        TypeScriptPropertyImpl(PROPERTY)
+          PsiElement(IDENTIFIER)('name')
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+            PsiElement(STRING_LITERAL)('"test"')
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace('\n    ')
+        TypeScriptPropertyImpl(PROPERTY)
+          PsiElement(IDENTIFIER)('greet')
+          TypeScriptParameterListImpl:PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            TypeScriptParameterImpl(PARAMETER)
+              TypeScriptAttributeListImpl
+                <empty list>
+              TypeScriptBindingPatternImpl(BINDING_PATTERN)
+                PsiElement(IDENTIFIER)('name')
+              TypeScriptTypeAnnotationImpl(TYPE_ANNOTATION)
+                PsiElement(COLON)(':')
+                PsiWhiteSpace(' ')
+                TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+                  TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+                    PsiElement(IDENTIFIER)('string')
+            PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          TypeScriptBlockStatementImpl(BLOCK_STATEMENT)
+            PsiElement(LBRACE)('{')
+            PsiWhiteSpace('\n        ')
+            TypeScriptReturnStatementImpl(RETURN_STATEMENT)
+              PsiElement(RETURN_KEYWORD)('return')
+              PsiWhiteSpace(' ')
+              TypeScriptAdditiveExpressionImpl(ADDITIVE_EXPRESSION)
+                TypeScriptLiteralExpressionImpl(LITERAL_EXPRESSION)
+                  PsiElement(STRING_LITERAL)('"hello "')
+                PsiWhiteSpace(' ')
+                PsiElement(PLUS)('+')
+                PsiWhiteSpace(' ')
+                TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+                  PsiElement(IDENTIFIER)('name')
+              PsiElement(SEMICOLON)(';')
+            PsiWhiteSpace('\n    ')
+            PsiElement(RBRACE)('}')
+        PsiWhiteSpace('\n')
+        PsiElement(RBRACE)('}')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.txt
index 6c446a13..82dc2756 100644
--- a/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.txt
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/StringLiterals.txt
@@ -31,17 +31,16 @@ JSFile:StringLiterals.ts
     TypeScriptVariableDeclarationImpl(VARIABLE_DECLARATION)
       TypeScriptBindingPatternImpl(BINDING_PATTERN)
         PsiElement(IDENTIFIER)('template')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiErrorElement:<arrow function>, <literal expression>, <prefix expression>, AWAIT_KEYWORD, IMPORT_KEYWORD, LBRACE, LBRACKET, LPAR, LT, NEW_KEYWORD, NO_SUBSTITUTION_TEMPLATE, SUPER_KEYWORD, TEMPLATE_HEAD, THIS_KEYWORD or YIELD_KEYWORD expected, got '`'
-      <empty list>
-  PsiWhiteSpace(' ')
-  PsiElement(TEMPLATE_HEAD)('`')
-  PsiErrorElement:<arrow function>, <literal expression>, <prefix expression>, LBRACE, LBRACKET, NEW_KEYWORD, NO_SUBSTITUTION_TEMPLATE, SUPER_KEYWORD or THIS_KEYWORD expected, got 'hello '
-    <empty list>
-  PsiElement(NO_SUBSTITUTION_TEMPLATE)('hello ')
-  PsiElement(TEMPLATE_HEAD)('${')
-  PsiElement(IDENTIFIER)('name')
-  PsiElement(RBRACE)('}')
-  PsiElement(TEMPLATE_HEAD)('`')
-  PsiElement(NO_SUBSTITUTION_TEMPLATE)(';\n')
\ No newline at end of file
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      TypeScriptTemplateLiteralExpressionImpl(TEMPLATE_LITERAL_EXPRESSION)
+        PsiElement(TEMPLATE_HEAD)('`')
+        PsiElement(NO_SUBSTITUTION_TEMPLATE)('hello ')
+        PsiElement(TEMPLATE_HEAD)('${')
+        TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
+          PsiElement(IDENTIFIER)('name')
+        PsiElement(TEMPLATE_MIDDLE)('}')
+        PsiElement(TEMPLATE_TAIL)('`')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
\ No newline at end of file
diff --git a/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.txt b/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.txt
index 275c1080..74ffb57f 100644
--- a/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.txt
+++ b/lang-version-impl/typescript-impl/src/test/resources/parsing/TypeAlias.txt
@@ -51,31 +51,28 @@ JSFile:TypeAlias.ts
       PsiElement(IDENTIFIER)('Pair')
       TypeScriptTypeParameterListImpl(TYPE_PARAMETER_LIST)
         PsiElement(LT)('<')
-        PsiErrorElement:'T' unexpected
-          <empty list>
-      TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
-        TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+        TypeScriptTypeParameterImpl(TYPE_PARAMETER)
           PsiElement(IDENTIFIER)('T')
-    PsiErrorElement:AND, DOT, EXTENDS_KEYWORD, LBRACKET, LT, OR or SEMICOLON expected, got ','
-      PsiElement(COMMA)(',')
-  PsiWhiteSpace(' ')
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-      PsiElement(IDENTIFIER)('U')
-    PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:<exponentiation expression> expected, got '='
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace(' ')
+        TypeScriptTypeParameterImpl(TYPE_PARAMETER)
+          PsiElement(IDENTIFIER)('U')
+        PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
-  PsiWhiteSpace(' ')
-  TypeScriptExpressionStatementImpl(EXPRESSION_STATEMENT)
-    TypeScriptArrayLiteralExpressionImpl(ARRAY_LITERAL_EXPRESSION)
-      PsiElement(LBRACKET)('[')
-      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-        PsiElement(IDENTIFIER)('T')
-      PsiElement(COMMA)(',')
       PsiWhiteSpace(' ')
-      TypeScriptReferenceExpressionImpl(REFERENCE_EXPRESSION)
-        PsiElement(IDENTIFIER)('U')
-      PsiElement(RBRACKET)(']')
-    PsiElement(SEMICOLON)(';')
+      TypeScriptTupleTypeImpl(TUPLE_TYPE)
+        PsiElement(LBRACKET)('[')
+        TypeScriptTupleElementImpl(TUPLE_ELEMENT)
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('T')
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace(' ')
+        TypeScriptTupleElementImpl(TUPLE_ELEMENT)
+          TypeScriptTypeReferenceImpl(TYPE_REFERENCE)
+            TypeScriptQualifiedNameImpl(QUALIFIED_NAME)
+              PsiElement(IDENTIFIER)('U')
+        PsiElement(RBRACKET)(']')
+      PsiElement(SEMICOLON)(';')
   PsiWhiteSpace('\n')
\ No newline at end of file

From b575585092a6f7477f6573a2325948e6ba8ab43c Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 16 Apr 2026 12:34:58 +0300
Subject: [PATCH 333/340] reduce deps to ide.api

---
 debugger/browser-debugger-impl/pom.xml      | 26 ++++++++++-
 debugger/cdt-debugger-impl/pom.xml          |  8 +++-
 debugger/debugger-impl/pom.xml              |  8 +++-
 inspections/pom.xml                         |  2 +-
 intentions/pom.xml                          |  2 +-
 lang-version-impl/actionscript-impl/pom.xml |  2 +-
 lang-version-impl/ecmascript4-impl/pom.xml  |  2 +-
 lang-version-impl/javascript16-impl/pom.xml |  2 +-
 lang-version-impl/javascript17-impl/pom.xml |  2 +-
 lang-version-impl/javascript18-impl/pom.xml |  2 +-
 plugin/pom.xml                              | 50 ++++++++++++++++++++-
 plugin/src/main/java/module-info.java       | 10 +++++
 regexp-impl/pom.xml                         |  2 +-
 web-browser-impl/pom.xml                    |  8 +++-
 14 files changed, 113 insertions(+), 13 deletions(-)

diff --git a/debugger/browser-debugger-impl/pom.xml b/debugger/browser-debugger-impl/pom.xml
index 760cda83..84b1a7b4 100644
--- a/debugger/browser-debugger-impl/pom.xml
+++ b/debugger/browser-debugger-impl/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>consulo</groupId>
-        <artifactId>arch.ide-api-provided</artifactId>
+        <artifactId>arch.bind.java</artifactId>
         <version>3-SNAPSHOT</version>
         <relativePath/>
     </parent>
@@ -41,6 +41,30 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-execution-debug-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-builtin-web-server-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-compiler-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-web-browser-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>consulo.javascript-base.impl</artifactId>
diff --git a/debugger/cdt-debugger-impl/pom.xml b/debugger/cdt-debugger-impl/pom.xml
index 2f5cab9f..13f61b90 100644
--- a/debugger/cdt-debugger-impl/pom.xml
+++ b/debugger/cdt-debugger-impl/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>consulo</groupId>
-        <artifactId>arch.ide-api-provided</artifactId>
+        <artifactId>arch.bind.java</artifactId>
         <version>3-SNAPSHOT</version>
         <relativePath/>
     </parent>
@@ -41,6 +41,12 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-execution-debug-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>consulo.javascript-base.impl</artifactId>
diff --git a/debugger/debugger-impl/pom.xml b/debugger/debugger-impl/pom.xml
index d405ddba..42608370 100644
--- a/debugger/debugger-impl/pom.xml
+++ b/debugger/debugger-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
+		<artifactId>arch.bind.java</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
@@ -41,6 +41,12 @@
 	</repositories>
 
 	<dependencies>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-execution-debug-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>consulo.javascript-base.impl</artifactId>
diff --git a/inspections/pom.xml b/inspections/pom.xml
index 0fb9a85d..2d27e6d4 100644
--- a/inspections/pom.xml
+++ b/inspections/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
+		<artifactId>arch.bind.java</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/intentions/pom.xml b/intentions/pom.xml
index 227594cd..7ebbee4d 100644
--- a/intentions/pom.xml
+++ b/intentions/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>consulo</groupId>
-        <artifactId>arch.ide-api-provided</artifactId>
+        <artifactId>arch.bind.java</artifactId>
         <version>3-SNAPSHOT</version>
         <relativePath/>
     </parent>
diff --git a/lang-version-impl/actionscript-impl/pom.xml b/lang-version-impl/actionscript-impl/pom.xml
index 4b9975c1..cb6646a1 100644
--- a/lang-version-impl/actionscript-impl/pom.xml
+++ b/lang-version-impl/actionscript-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
+		<artifactId>arch.bind.java</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/lang-version-impl/ecmascript4-impl/pom.xml b/lang-version-impl/ecmascript4-impl/pom.xml
index 29438c5b..157d854d 100644
--- a/lang-version-impl/ecmascript4-impl/pom.xml
+++ b/lang-version-impl/ecmascript4-impl/pom.xml
@@ -20,7 +20,7 @@
 
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
+		<artifactId>arch.bind.java</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/lang-version-impl/javascript16-impl/pom.xml b/lang-version-impl/javascript16-impl/pom.xml
index cfcf5dea..f9cd8648 100644
--- a/lang-version-impl/javascript16-impl/pom.xml
+++ b/lang-version-impl/javascript16-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
+		<artifactId>arch.bind.java</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/lang-version-impl/javascript17-impl/pom.xml b/lang-version-impl/javascript17-impl/pom.xml
index 5682cc44..9e0a800e 100644
--- a/lang-version-impl/javascript17-impl/pom.xml
+++ b/lang-version-impl/javascript17-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
+		<artifactId>arch.bind.java</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/lang-version-impl/javascript18-impl/pom.xml b/lang-version-impl/javascript18-impl/pom.xml
index 513cfbcc..540b1146 100644
--- a/lang-version-impl/javascript18-impl/pom.xml
+++ b/lang-version-impl/javascript18-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
+		<artifactId>arch.bind.java</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index b4ae6780..f8bdb471 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>consulo</groupId>
-        <artifactId>arch.ide-api-provided</artifactId>
+        <artifactId>arch.bind.java</artifactId>
         <version>3-SNAPSHOT</version>
         <relativePath/>
     </parent>
@@ -70,6 +70,54 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-ide-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-editor-refactoring-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-editor-ui-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-copyright-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-project-ui-view-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-usage-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-find-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-code-style-ui-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>consulo.javascript-base.api</artifactId>
diff --git a/plugin/src/main/java/module-info.java b/plugin/src/main/java/module-info.java
index f4a6bbeb..41288058 100644
--- a/plugin/src/main/java/module-info.java
+++ b/plugin/src/main/java/module-info.java
@@ -7,6 +7,16 @@
     requires transitive consulo.javascript.base.impl;
 
     requires consulo.language.editor.impl;
+    requires consulo.language.editor.refactoring.api;
+    requires consulo.language.editor.ui.api;
+    requires consulo.language.copyright.api;
+    requires consulo.language.impl;
+    requires consulo.project.ui.view.api;
+    requires consulo.ui.ex.api;
+    requires consulo.usage.api;
+    requires consulo.find.api;
+    requires consulo.ide.api;
+    requires consulo.language.code.style.ui.api;
 
     requires com.intellij.xml.api;
     requires com.intellij.xml.editor.api;
diff --git a/regexp-impl/pom.xml b/regexp-impl/pom.xml
index f94b20c1..15b7d8a3 100644
--- a/regexp-impl/pom.xml
+++ b/regexp-impl/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>consulo</groupId>
-        <artifactId>arch.ide-api-provided</artifactId>
+        <artifactId>arch.bind.java</artifactId>
         <version>3-SNAPSHOT</version>
         <relativePath/>
     </parent>
diff --git a/web-browser-impl/pom.xml b/web-browser-impl/pom.xml
index 0a293587..9cb53652 100644
--- a/web-browser-impl/pom.xml
+++ b/web-browser-impl/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>consulo</groupId>
-		<artifactId>arch.ide-api-provided</artifactId>
+		<artifactId>arch.bind.java</artifactId>
 		<version>3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
@@ -41,6 +41,12 @@
 	</repositories>
 
 	<dependencies>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-ui-ex-awt-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>consulo.javascript-base.impl</artifactId>

From 46f1f632c0eb2093dd2be4fd242ab69367eebed9 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Thu, 16 Apr 2026 12:44:25 +0300
Subject: [PATCH 334/340] missed change

---
 inspections/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/inspections/pom.xml b/inspections/pom.xml
index 2d27e6d4..6b3f0044 100644
--- a/inspections/pom.xml
+++ b/inspections/pom.xml
@@ -59,6 +59,12 @@
 	</build>
 
 	<dependencies>
+        <dependency>
+            <groupId>consulo</groupId>
+            <artifactId>consulo-language-editor-refactoring-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>consulo.javascript-base.impl</artifactId>

From 9e30a0fe751ba2db97ec64b2f58d5c27b5891480 Mon Sep 17 00:00:00 2001
From: Nikolay Yurchenko <nikolay@yurchenko.su>
Date: Tue, 21 Apr 2026 11:05:56 +0300
Subject: [PATCH 335/340] Fixing compilation after platform update. (#120)

---
 .../java/com/intellij/javascript/JSClassNameMacro.java | 10 ++++++----
 .../com/intellij/javascript/JSMethodNameMacro.java     |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
index 4e89b065..7271abcb 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.javascript;
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.completion.lookup.LookupElement;
@@ -30,9 +30,9 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
-
 @ExtensionImpl
 public class JSClassNameMacro extends Macro {
     @Override
@@ -41,8 +41,8 @@ public String getName() {
     }
 
     @Override
-    public String getPresentableName() {
-        return JavaScriptLocalize.jsClassnameMacroDescription().get();
+    public LocalizeValue getPresentableName() {
+        return JavaScriptLocalize.jsClassnameMacroDescription();
     }
 
     @Override
@@ -51,6 +51,7 @@ public String getDefaultValue() {
     }
 
     @Override
+    @RequiredReadAction
     public Result calculateResult(Expression[] params, ExpressionContext context) {
         PsiElement elementAtCaret = findElementAtCaret(context);
         JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(elementAtCaret);
@@ -71,6 +72,7 @@ public Result calculateResult(Expression[] params, ExpressionContext context) {
         return null;
     }
 
+    @RequiredReadAction
     public static PsiElement findElementAtCaret(ExpressionContext context) {
         Project project = context.getProject();
         int templateStartOffset = context.getTemplateStartOffset();
diff --git a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
index 7987b69c..415f8c77 100644
--- a/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
+++ b/plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.javascript;
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.completion.lookup.LookupElement;
@@ -28,7 +28,7 @@
 import consulo.language.editor.template.macro.Macro;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-
+import consulo.localize.LocalizeValue;
 
 @ExtensionImpl
 public class JSMethodNameMacro extends Macro {
@@ -38,8 +38,8 @@ public String getName() {
     }
 
     @Override
-    public String getPresentableName() {
-        return JavaScriptLocalize.jsMethodnameMacroDescription().get();
+    public LocalizeValue getPresentableName() {
+        return JavaScriptLocalize.jsMethodnameMacroDescription();
     }
 
     @Override
@@ -48,6 +48,7 @@ public String getDefaultValue() {
     }
 
     @Override
+    @RequiredReadAction
     public Result calculateResult(Expression[] params, ExpressionContext context) {
         PsiElement elementAtCaret = JSClassNameMacro.findElementAtCaret(context);
         if (elementAtCaret != null) {

From ebbdff6991b805800cb5567586a13611119c16cd Mon Sep 17 00:00:00 2001
From: Nikolay Yurchenko <nikolay@yurchenko.su>
Date: Thu, 23 Apr 2026 15:04:40 +0300
Subject: [PATCH 336/340] Fixing compilation after changes in platform. (#121)

---
 .../consulo/javascript/debugger/cdt/CDTScopeValue.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
index a98d0797..b1e7f25c 100644
--- a/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
+++ b/debugger/cdt-debugger-impl/src/main/java/consulo/javascript/debugger/cdt/CDTScopeValue.java
@@ -5,6 +5,7 @@
 import com.github.kklisura.cdt.protocol.types.runtime.RemoteObject;
 import consulo.execution.debug.frame.XCompositeNode;
 import consulo.execution.debug.frame.XValueGroup;
+import consulo.localize.LocalizeValue;
 import consulo.util.lang.StringUtil;
 
 import java.util.Locale;
@@ -18,10 +19,8 @@ public class CDTScopeValue extends XValueGroup {
     private final RemoteObject myRemoteObject;
     private final CDTProcessBase myProcess;
 
-    public CDTScopeValue(Scope scope,
-                         RemoteObject remoteObject,
-                         CDTProcessBase process) {
-        super(StringUtil.capitalize(scope.getType().name().toLowerCase(Locale.ROOT)));
+    public CDTScopeValue(Scope scope, RemoteObject remoteObject, CDTProcessBase process) {
+        super(LocalizeValue.localizeTODO(StringUtil.capitalize(scope.getType().name().toLowerCase(Locale.ROOT))));
         myScope = scope;
         myRemoteObject = remoteObject;
         myProcess = process;

From c52b927615f57a8b12d7353a99f2deea6b4a7362 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Mon, 18 May 2026 18:46:58 +0300
Subject: [PATCH 337/340] drop usage of #getInstance() ID

---
 .../javascript/psi/impl/JSPsiImplUtils.java    |  2 +-
 .../javascript/psi/impl/ReferenceSupport.java  |  2 +-
 .../javascript/psi/resolve/JSResolveUtil.java  |  2 +-
 ...entJavaScriptPredefinedBundlesProvider.java |  4 ++--
 .../module/sdk/ClientJavaScriptSdkType.java    | 18 ++++++++++++++----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
index fb139d8b..f722dfdd 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/JSPsiImplUtils.java
@@ -273,7 +273,7 @@ private static PsiElement findSourceElement(JSQualifiedNamedElement jsClass) {
         relativeFilePath += ".as";
 
         for (OrderEntry orderEntry : orderEntries) {
-            VirtualFile[] files = orderEntry.getFiles(SourcesOrderRootType.getInstance());
+            VirtualFile[] files = orderEntry.getFiles(SourcesOrderRootType.ID);
 
             for (VirtualFile file : files) {
                 VirtualFile source = file.findFileByRelativePath(relativeFilePath);
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
index 91aa0016..3fcaef25 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/impl/ReferenceSupport.java
@@ -155,7 +155,7 @@ private static void appendSdkAndLibraryClassRoots(List<VirtualFile> dirs, PsiFil
             OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
             for (OrderEntry orderEntry : orderEntries) {
                 if (orderEntry instanceof OrderEntryWithTracking) {
-                    dirs.addAll(Arrays.asList(orderEntry.getFiles(BinariesOrderRootType.getInstance())));
+                    dirs.addAll(Arrays.asList(orderEntry.getFiles(BinariesOrderRootType.ID)));
                 }
             }
         }
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
index 1d51a3e2..bb9649ab 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/psi/resolve/JSResolveUtil.java
@@ -2332,7 +2332,7 @@ private static boolean isInjectedFile(PsiElement element) {
     public static void processGlobalSymbols(PsiElement target, PsiScopeProcessor processor) {
         Sdk sdk = ModuleUtilCore.getSdk(target, JavaScriptModuleExtension.class);
         if (sdk != null) {
-            VirtualFile[] files = sdk.getRootProvider().getFiles(BinariesOrderRootType.getInstance());
+            VirtualFile[] files = sdk.getRootProvider().getFiles(BinariesOrderRootType.ID);
 
             for (VirtualFile file : files) {
                 PsiFile psiFile = PsiManager.getInstance(target.getProject()).findFile(file);
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
index 4a1689f3..a15d5fb0 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptPredefinedBundlesProvider.java
@@ -46,8 +46,8 @@ public void createBundles(Context context) {
             modificator.setHomePath(fileByIoFile.getPath());
             modificator.setVersionString("1");
             for (VirtualFile child : fileByIoFile.getChildren()) {
-                modificator.addRoot(child, BinariesOrderRootType.getInstance());
-                modificator.addRoot(child, SourcesOrderRootType.getInstance());
+                modificator.addRoot(child, BinariesOrderRootType.ID);
+                modificator.addRoot(child, SourcesOrderRootType.ID);
             }
             modificator.commitChanges();
         }
diff --git a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
index 396ab521..ef238b99 100644
--- a/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
+++ b/web-browser-impl/src/main/java/consulo/javascript/client/module/sdk/ClientJavaScriptSdkType.java
@@ -8,20 +8,30 @@
 import consulo.content.bundle.SdkType;
 import consulo.javascript.icon.JavaScriptIconGroup;
 import consulo.localize.LocalizeValue;
+import jakarta.inject.Inject;
 import org.jspecify.annotations.Nullable;
 
+import java.util.Set;
+
 /**
  * @author VISTALL
  * @since 2014-06-29
  */
 @ExtensionImpl
 public class ClientJavaScriptSdkType extends SdkType {
+
     public static ClientJavaScriptSdkType getInstance() {
         return Application.get().getExtensionPoint(SdkType.class).findExtensionOrFail(ClientJavaScriptSdkType.class);
     }
 
-    public ClientJavaScriptSdkType() {
+    private static final Set<String> ourAcceptedRootTypeIds = Set.of(BinariesOrderRootType.ID, SourcesOrderRootType.ID);
+
+    private final Application myApplication;
+
+    @Inject
+    public ClientJavaScriptSdkType(Application application) {
         super("CLIENT_JAVASCRIPT_SDK_TYPE", LocalizeValue.localizeTODO("Client JavaScript"), JavaScriptIconGroup.javascriptmodule());
+        myApplication = application;
     }
 
     @Override
@@ -30,8 +40,8 @@ public boolean supportsUserAdd() {
     }
 
     @Override
-    public boolean isRootTypeApplicable(OrderRootType type) {
-        return type == BinariesOrderRootType.getInstance() || type == SourcesOrderRootType.getInstance();
+    public boolean isRootTypeApplicable(String type) {
+        return ourAcceptedRootTypeIds.contains(type);
     }
 
     @Override
@@ -42,7 +52,7 @@ public boolean isValidSdkHome(String path) {
     @Nullable
     @Override
     public String getVersionString(String sdkHome) {
-        return "1";
+        return myApplication.getBuildNumber().asString();
     }
 
     @Override

From 3d2b05a5b56a34b2f89ffcf44f7aae27ffbd95cf Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 3 Jun 2026 21:36:03 +0300
Subject: [PATCH 338/340] push&pull from verbaria

---
 ...consulo.javascript.JavaScriptLocalize.yaml |   58 +-
 ....sixrr.inspectjs.InspectionJSLocalize.yaml | 1030 ++++++++---------
 ...ascript.intention.JSIntentionLocalize.yaml |  120 +-
 ...consulo.typescript.TypeScriptLocalize.yaml |  113 +-
 verbaria-lock.json                            |   65 ++
 verbaria.json                                 |   12 +
 6 files changed, 735 insertions(+), 663 deletions(-)
 create mode 100644 verbaria-lock.json
 create mode 100644 verbaria.json

diff --git a/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml b/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
index 5dc70d92..84c9890e 100644
--- a/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
+++ b/base-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.JavaScriptLocalize.yaml
@@ -105,7 +105,7 @@ javascript.fix.implement.methods:
 javascript.fix.optimize.imports:
     text: Optimize imports
 javascript.fix.package.name:
-    text: Set package name to ''{0}''
+    text: "Set package name to ''{0}''"
 javascript.fix.remove.access.modifier:
     text: Remove access modifier
 javascript.fix.remove.circular.dependency:
@@ -245,11 +245,11 @@ javascript.parser.message.expected.equal:
 javascript.parser.message.expected.expression:
     text: expression expected
 javascript.parser.message.expected.forloop.in.of.or.semicolon:
-    text: '''in'', ''of'' or ; expected'
+    text: "'in', 'of' or ; expected"
 javascript.parser.message.expected.forloop.in.or.semicolon:
-    text: '''in'' or ; expected'
+    text: "'in' or ; expected"
 javascript.parser.message.expected.forloop.left.hand.side.expression.or.variable.declaration:
-    text: left hand side expression or variable declaration expected before 'in'
+    text: "left hand side expression or variable declaration expected before 'in'"
 javascript.parser.message.expected.formal.parameter.name:
     text: formal parameter name expected
 javascript.parser.message.expected.function.name:
@@ -265,9 +265,9 @@ javascript.parser.message.expected.identifier.string.literal.or.numeric.literal:
 javascript.parser.message.expected.instanceof:
     text: Expected instanceof
 javascript.parser.message.expected.lbrace:
-    text: '''{'' expected'
+    text: "'{' expected"
 javascript.parser.message.expected.lbrace.or.lbracket:
-    text: '''{'' or ''['' expected'
+    text: "'{' or '[' expected"
 javascript.parser.message.expected.lparen:
     text: ( expected
 javascript.parser.message.expected.lt:
@@ -275,13 +275,13 @@ javascript.parser.message.expected.lt:
 javascript.parser.message.expected.name:
     text: name expected
 javascript.parser.message.expected.name.or.lbrace:
-    text: Expected package name or '{'
+    text: "Expected package name or '{'"
 javascript.parser.message.expected.namespace:
     text: Namespace keyword expected
 javascript.parser.message.expected.parameter.name:
     text: parameter name expected
 javascript.parser.message.expected.rbrace:
-    text: '''}'' expected'
+    text: "'}' expected"
 javascript.parser.message.expected.rbracket:
     text: '] expected'
 javascript.parser.message.expected.rparen:
@@ -377,23 +377,23 @@ javascript.validation.message.access.modifier.allowed.only.for.package.members:
 javascript.validation.message.arguments.out.of.function:
     text: Using function arguments object outside function
 javascript.validation.message.arguments.with.rest.parameter:
-    text: '''arguments'' object is not available when using rest parameter'
+    text: "'arguments' object is not available when using rest parameter"
 javascript.validation.message.assignment.to.const:
     text: Attempt to assign to const variable
 javascript.validation.message.break.without.target:
-    text: Cannot determine target for 'break'
+    text: "Cannot determine target for 'break'"
 javascript.validation.message.circular.dependency:
     text: Circular dependency
 javascript.validation.message.class.name.expected.here:
     text: Class name expected here
 javascript.validation.message.class.should.be.in.file:
-    text: Class ''{0}'' should be defined in file ''{1}''
+    text: "Class ''{0}'' should be defined in file ''{1}''"
 javascript.validation.message.const.variable.without.initializer.:
-    text: const variable without initializer. It won't be possible to assign meaningful value later.
+    text: "const variable without initializer. It won't be possible to assign meaningful value later."
 javascript.validation.message.constructor.in.mxml.is.not.allowed:
     text: Constructor is not allowed for MXML class
 javascript.validation.message.continue.without.target:
-    text: Cannot determine target for 'continue'
+    text: "Cannot determine target for 'continue'"
 javascript.validation.message.duplicate.declaration:
     text: Duplicate declaration
 javascript.validation.message.duplicate.label:
@@ -407,17 +407,17 @@ javascript.validation.message.file.should.be.under.source.root:
 javascript.validation.message.function.override.for.object.method:
     text: Method inherited from Object does not need override
 javascript.validation.message.function.override.incompatible.access.modifier:
-    text: Incompatible override, should have ''{0}'' access modifier
+    text: "Incompatible override, should have ''{0}'' access modifier"
 javascript.validation.message.function.override.incompatible.signature:
-    text: Incompatible override, should have signature ''{0}''
+    text: "Incompatible override, should have signature ''{0}''"
 javascript.validation.message.function.override.incompatible.signature2:
-    text: Incompatible override, should have return type ''{0}''
+    text: "Incompatible override, should have return type ''{0}''"
 javascript.validation.message.function.override.without.override.modifier:
     text: Method overrides method in superclass {0} without override keyword
 javascript.validation.message.function.override.without.parent.method:
     text: Method does not override method from super class
 javascript.validation.message.function.should.be.in.file:
-    text: Function ''{0}'' should be defined in file ''{1}''
+    text: "Function ''{0}'' should be defined in file ''{1}''"
 javascript.validation.message.get.method.should.be.valid.type:
     text: Return type of a getter definition should not be {0}
 javascript.validation.message.get.method.should.have.no.parameter:
@@ -425,7 +425,7 @@ javascript.validation.message.get.method.should.have.no.parameter:
 javascript.validation.message.implements.for.interface.not.allowed:
     text: Implements list is not allowed for interface
 javascript.validation.message.incorrect.package.name:
-    text: Package name ''{0}'' does not correspond to file path ''{1}''
+    text: "Package name ''{0}'' does not correspond to file path ''{1}''"
 javascript.validation.message.incorrect.parameter.name:
     text: Incorrect parameter name
 javascript.validation.message.incorrect.tag.value:
@@ -433,17 +433,17 @@ javascript.validation.message.incorrect.tag.value:
 javascript.validation.message.interface.members.cannot.have.access.modifiers:
     text: Interface members cannot have access modifiers
 javascript.validation.message.interface.method.invalid.access.modifier:
-    text: Incompatible implementation, should have 'public' access modifier
+    text: "Incompatible implementation, should have 'public' access modifier"
 javascript.validation.message.interface.method.invalid.signature:
-    text: Incompatible implementation, should have signature ''{0}''
+    text: "Incompatible implementation, should have signature ''{0}''"
 javascript.validation.message.interface.method.invalid.signature2:
-    text: Incompatible implementation, should have return type ''{0}''
+    text: "Incompatible implementation, should have return type ''{0}''"
 javascript.validation.message.interface.method.not.implemented:
     text: Method {0} from interface {1} is not implemented
 javascript.validation.message.interface.name.expected.here:
     text: Interface name expected here
 javascript.validation.message.missed.super.constructor.call:
-    text: Missed superclass's constructor invokation
+    text: "Missed superclass's constructor invokation"
 javascript.validation.message.more.than.one.externally.visible.symbol:
     text: More than one externally visible symbol defined in file
 javascript.validation.message.must.be.lvalue:
@@ -451,7 +451,7 @@ javascript.validation.message.must.be.lvalue:
 javascript.validation.message.namespace.allowed.only.for.class.members:
     text: Namespace allowed for class members only
 javascript.validation.message.namespace.should.be.in.file:
-    text: Namespace ''{0}'' should be defined in file ''{1}''
+    text: "Namespace ''{0}'' should be defined in file ''{1}''"
 javascript.validation.message.nested.classes.are.not.allowed:
     text: Nested classes are not allowed
 javascript.validation.message.package.shouldbe.first.statement:
@@ -465,7 +465,7 @@ javascript.validation.message.remove.unneeded.comma.fix:
 javascript.validation.message.rest.parameter.should.not.be.initialized:
     text: Rest parameter should not be initialized
 javascript.validation.message.return.outside.function.definition:
-    text: '''return'' outside function definition'
+    text: "'return' outside function definition"
 javascript.validation.message.return.value.of.type.is.required:
     text: Return value of type {0} is required
 javascript.validation.message.set.method.should.be.void.or.without.type:
@@ -473,11 +473,11 @@ javascript.validation.message.set.method.should.be.void.or.without.type:
 javascript.validation.message.set.method.should.have.one.parameter:
     text: A setter definition must have exactly one parameter
 javascript.validation.message.super.referenced.from.static.context:
-    text: '''super'' referenced in static context'
+    text: "'super' referenced in static context"
 javascript.validation.message.super.referenced.without.class.instance.context:
-    text: '''super'' referenced without class instance context'
+    text: "'super' referenced without class instance context"
 javascript.validation.message.this.referenced.from.static.context:
-    text: '''this'' referenced in static context'
+    text: "'this' referenced in static context"
 javascript.validation.message.unexpected.type.for.rest.parameter:
     text: Rest parameter should have no type
 javascript.validation.message.unneeded.comma:
@@ -485,7 +485,7 @@ javascript.validation.message.unneeded.comma:
 javascript.validation.message.use.namespace.reference.or.access.modifier:
     text: Use namespace OR access modifier
 javascript.validation.message.variable.should.be.in.file:
-    text: Variable ''{0}'' should be defined in file ''{1}''
+    text: "Variable ''{0}'' should be defined in file ''{1}''"
 javascript.validation.unused.import:
     text: Unused import
 js.classname.macro.description:
@@ -535,7 +535,7 @@ methods.to.override.chooser.title:
 preview.panel.title:
     text: Preview
 this.feature.is.not.supported.by.current.language:
-    text: '''''{0}'''' is not supported by current language version'
+    text: "''{0}'' is not supported by current language version"
 to.indent.package.statement.children:
     text: '&Indent package statement children'
 typescript.filetype.description:
diff --git a/inspections/src/main/resources/LOCALIZE-LIB/en_US/com.sixrr.inspectjs.InspectionJSLocalize.yaml b/inspections/src/main/resources/LOCALIZE-LIB/en_US/com.sixrr.inspectjs.InspectionJSLocalize.yaml
index 83469320..a773e99a 100644
--- a/inspections/src/main/resources/LOCALIZE-LIB/en_US/com.sixrr.inspectjs.InspectionJSLocalize.yaml
+++ b/inspections/src/main/resources/LOCALIZE-LIB/en_US/com.sixrr.inspectjs.InspectionJSLocalize.yaml
@@ -1,556 +1,556 @@
-result.of.assignment.used.displayName:
-  text: Result of assignment used
-result.of.assignment.expression.used.error.string:
-  text: 'Result of assignment expression used #loc'
+anonymous.function.contains.multiple.loops.error.string:
+    text: '#ref contains {0} loops #loc'
+anonymous.function.contains.multiple.return.points.error.string:
+    text: '#ref has {0} return points #loc'
+anonymous.function.contains.too.many.negation.error.string:
+    text: '#ref contains {0} negations #loc'
+anonymous.function.display.name:
+    text: Anonymous function
+anonymous.function.error.string:
+    text: 'Anonymous #ref #loc'
+anonymous.function.has.inconsistent.return.points.error.string:
+    text: '#ref has inconsistent return points #loc'
+anonymous.function.has.too.many.parameters.error.string:
+    text: '#ref has too many parameters (parameter count = {0}) #loc'
+anonymous.function.is.overly.complex.cyclomatic.complexity.error.string:
+    text: '#ref  is overly complex (cyclomatic complexity = {0}) #loc'
+anonymous.function.is.overly.long.statement.error.string:
+    text: '#ref is overly long (statement count = {0}) #loc'
+anonymous.function.is.overly.nested.error.string:
+    text: '#ref is overly nested (maximum nesting depth = {0}) #loc'
+assignment.issues.javascript.group.name:
+    text: Assignment issues
+assignment.replaceable.with.operator.assignment.display.name:
+    text: Assignment replaceable with operator assignment
+assignment.replaceable.with.operator.assignment.error.string:
+    text: '#ref could be simplified to {0} #loc'
 assignment.to.for.loop.parameter.display.name:
-  text: Assignment to 'for' loop parameter
+    text: "Assignment to 'for' loop parameter"
 assignment.to.for.loop.parameter.error.string:
-  text: 'Assignment to for-loop parameter #ref #loc'
+    text: 'Assignment to for-loop parameter #ref #loc'
 assignment.to.function.parameter.display.name:
-  text: Assignment to function parameter
+    text: Assignment to function parameter
 assignment.to.function.parameter.error.string:
-  text: 'Assignment to function parameter ''#ref'' #loc'
-nested.assignment.display.name:
-  text: Nested assignment
-nested.assignment.error.string:
-  text: 'Nested assignment <code>#ref</code> #loc'
-assignment.replaceable.with.operator.assignment.display.name:
-  text: Assignment replaceable with operator assignment
-assignment.replaceable.with.operator.assignment.error.string:
-  text: '#ref could be simplified to {0} #loc'
-silly.assignment.display.name:
-  text: Variable is assigned to itself
-silly.assignment.error.string:
-  text: 'Variable is assigned to itself #loc'
-divide.by.zero.display.name:
-  text: Divide by zero
-division.by.zero.error.string:
-  text: 'Division by zero #loc'
-equality.comparison.with.coercion.display.name:
-  text: Equality comparison which may cause unexpected coercion
-equality.comparison.with.coercion.error.string:
-  text: 'Comparison #ref may cause unexpected type coercion #loc'
-equality.comparison.with.coercion.fix:
-  text: Replace with ''{0}''
-non.short.circuit.boolean.expression.display.name:
-  text: Non short-circuit boolean expression
-non.short.circuit.boolean.expression.error.string:
-  text: 'Non short-circuit boolean expression #loc'
-replace.with.short.circuit.expression.fix.string:
-  text: Replace with short circuit expression
-result.of.object.allocation.ignored.display.name:
-  text: Result of object allocation ignored
-result.of.object.allocation.ignored.error.string:
-  text: 'Result of <code>new #ref()</code> is ignored #loc'
-text.label.in.switch.statement.display.name:
-  text: Text label in 'switch' statement
-text.label.in.switch.statement.error.string:
-  text: 'Text label <code>#ref:</code> in ''switch'' statement #loc'
-anonymous.function.display.name:
-  text: Anonymous function
-anonymous.function.error.string:
-  text: 'Anonymous #ref #loc'
-unnecessary.block.statement.display.name:
-  text: Unnecessary 'block' statement
-comma.expression.display.name:
-  text: Comma expression
-conditional.expression.display.name:
-  text: Conditional expression
-statement.with.empty.body.display.name:
-  text: Statement with empty body
-result.of.increment.or.decrement.used.display.name:
-  text: Result of increment or decrement used
-negated.conditional.expression.display.name:
-  text: Negated conditional expression
-negated.if.statement.display.name:
-  text: Negated 'if' statement
-nested.conditional.expression.display.name:
-  text: Nested conditional expression
-nested.function.display.name:
-  text: Nested function
-octal.integer.display.name:
-  text: Octal Integer
-overly.complex.arithmetic.expression.display.name:
-  text: Overly complex arithmetic expression
-overly.complex.boolean.expression.display.name:
-  text: Overly complex boolean expression
-pointless.arithmetic.expression.display.name:
-  text: Pointless arithmetic expression
-pointless.boolean.expression.display.name:
-  text: Pointless boolean expression
-void.expression.display.name:
-  text: '''void'' expression'
-with.statement.display.name:
-  text: '''with'' statement'
+    text: "Assignment to function parameter '#ref' #loc"
+bitwise.issues.javascript.group.name:
+    text: Bitwise operation issues
 break.statement.display.name:
-  text: '''break'' statement'
+    text: "'break' statement"
+break.statement.error.string:
+    text: "'#ref' statement #loc"
 break.statement.with.label.display.name:
-  text: '''break'' statement with label'
+    text: "'break' statement with label"
+break.statement.with.label.error.string:
+    text: "'#ref' statement with label #loc"
+call.to.document.write.display.name:
+    text: "Call to 'document.write()'"
+caller.display.name:
+    text: "Use of 'caller' property"
+caller.error.string:
+    text: "Use of '#ref' property #loc"
+chained.equality.display.name:
+    text: Chained equality
+chained.equality.error.string:
+    text: 'Chained equality comparison <code>#ref</code> #loc'
+chained.function.call.display.name:
+    text: Chained function call
+chained.function.call.problem.descriptor:
+    text: "Chained call to function '#ref' #loc"
+code.maturity.javascript.group.name:
+    text: Code Maturity
+code.style.issues.javascript.group.name:
+    text: Code style issues
+collapse.conditional.expression.fix:
+    text: Collapse conditional expression
+collapse.if.statement.fix:
+    text: "Collapse 'if' statement"
+comma.expression.display.name:
+    text: Comma expression
+comma.expression.error.string:
+    text: 'Comma expression #loc'
+conditional.expression.display.name:
+    text: Conditional expression
+conditional.expression.error.string:
+    text: 'Conditional expression #loc'
 conditional.expression.with.identical.branches.display.name:
-  text: Conditional expression with identical branches
+    text: Conditional expression with identical branches
+conditional.expression.with.identical.branches.error.string:
+    text: 'Conditional expression #ref with identical branches #loc'
+confusing.floating.point.literal.change.quickfix:
+    text: Change To canonical form
+confusing.floating.point.literal.display.name:
+    text: Confusing floating point literal
+confusing.floating.point.literal.problem.descriptor:
+    text: 'Confusing floating point literal <code>#ref</code> #loc'
+confusing.pluses.or.minuses.display.name:
+    text: "Confusing sequence of '+' or '-'"
+confusing.pluses.or.minuses.error.string:
+    text: "Sequence of '+' or '-' may change meaning if whitespace removed #loc"
 constant.conditional.expression.display.name:
-  text: Constant conditional expression
+    text: Constant conditional expression
+constant.conditional.expression.error.string:
+    text: '#ref can be simplified #loc'
+constant.conditional.expression.simplify.quickfix:
+    text: Simplify
+constant.if.statement.display.name:
+    text: Constant if statement
+constant.if.statement.problem.descriptor:
+    text: '<code>#ref</code> statement can be simplified #loc'
+constant.on.left.side.of.comparison.display.name:
+    text: Constant on left side of comparison
+constant.on.left.side.of.comparison.error.string:
+    text: '#ref: constant on left side of comparison #loc'
+constant.on.right.side.of.comparison.display.name:
+    text: Constant on right side of comparison
+constant.on.right.side.of.comparison.error.string:
+    text: '#ref: constant on right side of comparison #loc'
+continue.or.break.inside.finally.block.display.name:
+    text: "'continue' or 'break' inside 'finally' block"
+continue.or.break.inside.finally.block.error.string:
+    text: "'#ref' inside 'finally' block #loc"
 continue.statement.display.name:
-  text: '''continue'' statement'
+    text: "'continue' statement"
+continue.statement.error.string:
+    text: "'#ref' statement #loc"
 continue.statement.with.label.display.name:
-  text: '''continue'' statement with label'
+    text: "'continue' statement with label"
+continue.statement.with.label.error.string:
+    text: "'#ref' statement with label #loc"
+control.flow.issues.javascript.group.name:
+    text: Control flow issues
+data.flow.issues.javascript.group.name:
+    text: Data flow issues
+debugger.statement.display.name:
+    text: "'debugger' statement"
+debugger.statement.error.string:
+    text: "'#ref' statement #loc"
+default.branch.not.last.case.in.switch.error.string:
+    text: "<code>#ref</code> branch not last case in 'switch' #loc"
 default.not.last.case.in.switch.display.name:
-  text: '''default'' not last case in ''switch'''
+    text: "'default' not last case in 'switch'"
+divide.by.zero.display.name:
+    text: Divide by zero
+division.by.zero.error.string:
+    text: 'Division by zero #loc'
+document.write.error.string:
+    text: "Call to '#ref()' #loc"
+duplicate.case.label.display.name:
+    text: Duplicate case label
+duplicate.case.label.error.string:
+    text: 'Duplicate case label #ref #loc'
+duplicate.condition.error.string:
+    text: 'Duplicate condition #ref #loc'
 duplicate.condition.in.if.statement.display.name:
-  text: Duplicate condition in 'if' statement
-fall.through.in.switch.statement.display.name:
-  text: Fall-through in 'switch' statement
-if.statement.with.identical.branches.display.name:
-  text: '''if'' statement with identical branches'
-if.statement.with.too.many.branches.display.name:
-  text: '''if'' statement with too many branches'
-infinite.loop.statement.display.name:
-  text: Infinite loop statement
-labeled.statement.display.name:
-  text: Labeled statement
-loop.statement.that.doesn.t.loop.display.name:
-  text: Loop statement that doesn't loop
-nested.switch.statement.display.name:
-  text: Nested 'switch' statement
-switch.statement.with.no.default.branch.display.name:
-  text: '''switch'' statement with no default branch'
-redundant.conditional.expression.display.name:
-  text: Redundant conditional expression
-redundant.if.statement.display.name:
-  text: Redundant 'if' statement
-unnecessary.continue.statement.display.name:
-  text: Unnecessary 'continue' statement
-unnecessary.label.display.name:
-  text: Unnecessary label
-unnecessary.label.on.break.statement.display.name:
-  text: Unnecessary label on 'break' statement
-unnecessary.label.on.continue.statement.display.name:
-  text: Unnecessary label on 'continue' statement
-unnecessary.return.statement.display.name:
-  text: Unnecessary 'return' statement
-call.to.document.write.display.name:
-  text: Call to 'document.write()'
-use.of.innerhtml.property.display.name:
-  text: Use of 'innerHTML' property
-platform.detection.display.name:
-  text: Platform detection
-xhtml.incompatibilities.display.name:
-  text: XHTML incompatibilities
-continue.or.break.inside.finally.block.display.name:
-  text: '''continue'' or ''break'' inside ''finally'' block'
+    text: "Duplicate condition in 'if' statement"
+duplicate.object.property.error.string:
+    text: 'Duplicate object property #ref #loc'
+duplicate.property.on.object.literal.display.name:
+    text: Duplicate property on object literal
+dynamically.generated.code.display.name:
+    text: Execution of dynamically generated JavaScript
+dynamically.generated.code.error.string:
+    text: "Function '#ref' indicative of dynamically generated code #loc"
 empty.catch.block.display.name:
-  text: Empty 'catch' block
+    text: "Empty 'catch' block"
+empty.catch.block.error.string:
+    text: "Empty '#ref' block #loc"
 empty.finally.block.display.name:
-  text: Empty 'finally' block
+    text: "Empty 'finally' block"
+empty.finally.block.error.string:
+    text: "Empty 'finally' block #loc"
 empty.try.block.display.name:
-  text: Empty 'try' block
+    text: "Empty 'try' block"
+empty.try.block.error.string:
+    text: "Empty '#ref' block #loc"
+equality.comparison.with.coercion.display.name:
+    text: Equality comparison which may cause unexpected coercion
+equality.comparison.with.coercion.error.string:
+    text: 'Comparison #ref may cause unexpected type coercion #loc'
+equality.comparison.with.coercion.fix:
+    text: "Replace with ''{0}''"
+error.handling.javascript.group.name:
+    text: Error handling
+exception.caught.locally.error.string:
+    text: "'#ref' of exception caught locally #loc"
 exception.used.for.local.control.flow.display.name:
-  text: Exception used for local control-flow
-return.inside.finally.block.display.name:
-  text: '''return'' inside ''finally'' block'
-throw.inside.finally.block.display.name:
-  text: '''throw'' inside ''finally'' block'
-overly.complex.function.display.name:
-  text: Overly complex function
-function.with.multiple.loops.display.name:
-  text: Function with multiple loops
-function.with.multiple.return.points.display.name:
-  text: Function with multiple return points
-overly.nested.function.display.name:
-  text: Overly nested function
-nesting.depth.limit:
-  text: 'Nesting depth limit:'
-function.with.too.many.parameters.display.name:
-  text: Function with too many parameters
-function.parameter.limit:
-  text: 'Function parameter limit:'
-overly.long.function.display.name:
-  text: Overly long function
-maximum.statements.per.function:
-  text: 'Maximum statements per function:'
-function.with.more.than.three.negations.display.name:
-  text: Function with more than three negations
+    text: Exception used for local control-flow
+expression.statement.is.not.assignment.or.call.error.string:
+    text: 'Expression statement is not assignment or call #loc'
+expression.statement.which.is.not.assignment.or.call.display.name:
+    text: Expression statement which is not assignment or call
+fall.through.in.switch.statement.display.name:
+    text: "Fall-through in 'switch' statement"
+fall.through.in.switch.statement.error.string:
+    text: "Fall-through in 'switch' statement #loc"
+flip.comparison.fix:
+    text: Flip comparison
+for.loop.not.use.loop.variable.display.name:
+    text: "'for' loop where update or condition does not use loop variable"
+for.loop.not.use.loop.variable.problem.descriptor.both.condition.and.update:
+    text: '<code>#ref</code> statement has condition and update which do not use the for loop variable #loc'
+for.loop.not.use.loop.variable.problem.descriptor.condition:
+    text: '<code>#ref</code> statement has condition which does not use the for loop variable #loc'
+for.loop.not.use.loop.variable.problem.descriptor.update:
+    text: '<code>#ref</code> statement has update which does not use the for loop variable #loc'
+for.loop.replaceable.by.while.display.name:
+    text: "'for' loop may be replaced by 'while' loop"
+for.loop.replaceable.by.while.ignore.option:
+    text: "Ignore 'infinite' for loops without conditions"
+for.loop.replaceable.by.while.problem.descriptor:
+    text: "<code>#ref</code> loop may be replaced by 'while' loop #loc"
+for.loop.replaceable.by.while.replace.quickfix:
+    text: "Replace with 'while'"
+function.complexity.limit.parameter:
+    text: 'Function complexity limit:'
+function.contains.multiple.loops.error.string:
+    text: "function ''#ref'' contains {0} loops #loc"
+function.contains.multiple.return.points.error.string:
+    text: "function ''#ref'' has {0} return points #loc"
+function.contains.too.many.negation.error.string:
+    text: "function ''#ref'' contains {0} negations #loc"
+function.has.inconsistent.return.points.error.string:
+    text: "function '#ref' has inconsistent return points #loc"
+function.has.too.many.parameters.error.string:
+    text: "function ''#ref'' has too many parameters (parameter count = {0}) #loc"
+function.is.overly.long.statement.error.string:
+    text: "function ''#ref'' is overly long (statement count = {0}) #loc"
+function.is.overly.nested.error.string:
+    text: "function ''#ref'' is overly nested (maximum nesting depth = {0}) #loc"
+function.name.doesnt.match.regex.error.string:
+    text: "Function name ''{0}'' doesn''t match regex ''{1}'' #loc"
+function.name.is.too.long.error.string:
+    text: "Function name ''{0}''is too long #loc"
+function.name.is.too.short.error.string:
+    text: "Function name ''{0}'' is too short #loc"
 function.naming.convention.display.name:
-  text: Function naming convention
-local.variable.naming.convention.display.name:
-  text: Local variable naming convention
+    text: Function naming convention
+function.parameter.limit:
+    text: 'Function parameter limit:'
 function.parameter.naming.convention.display.name:
-  text: Function parameter naming convention
-expression.statement.which.is.not.assignment.or.call.display.name:
-  text: Expression statement which is not assignment or call
-debugger.statement.display.name:
-  text: '''debugger'' statement'
-duplicate.case.label.display.name:
-  text: Duplicate case label
-duplicate.property.on.object.literal.display.name:
-  text: Duplicate property on object literal
+    text: Function parameter naming convention
+function.ref.is.overly.complex.cyclomatic.complexity.error.string:
+    text: "function ''#ref'' is overly complex (cyclomatic complexity = {0}) #loc"
 function.with.inconsistent.returns.display.name:
-  text: Function with inconsistent returns
-reserved.word.used.as.name.display.name:
-  text: Reserved word used as name
-this.expression.which.references.the.global.object.display.name:
-  text: '''this'' expression which references the global object'
-unreachable.code.display.name:
-  text: Unreachable code
-chained.equality.display.name:
-  text: Chained equality
-constant.on.right.side.of.comparison.display.name:
-  text: Constant on right side of comparison
-constant.on.left.side.of.comparison.display.name:
-  text: Constant on left side of comparison
-non.block.statement.body.display.name:
-  text: Non-block statement body
-unterminated.statement.display.name:
-  text: Unterminated statement
-terminate.statement.fix:
-  text: Terminate statement
-unnecessary.block.statement.error.string:
-  text: 'Unnecessary block statement #loc'
-comma.expression.error.string:
-  text: 'Comma expression #loc'
-conditional.expression.error.string:
-  text: 'Conditional expression #loc'
-statement.has.empty.branch.error.string:
-  text: '<code>#ref</code> statement has empty branch #loc'
-statement.has.empty.body.error.string:
-  text: '<code>#ref</code> statement has empty body #loc'
+    text: Function with inconsistent returns
+function.with.more.than.three.negations.display.name:
+    text: Function with more than three negations
+function.with.multiple.loops.display.name:
+    text: Function with multiple loops
+function.with.multiple.return.points.display.name:
+    text: Function with multiple return points
+function.with.too.many.parameters.display.name:
+    text: Function with too many parameters
+if.statement.with.identical.branches.display.name:
+    text: "'if' statement with identical branches"
+if.statement.with.too.many.branches.display.name:
+    text: "'if' statement with too many branches"
+if.statement.with.too.many.branches.error.string:
+    text: "''#ref'' has too many branches ({0}) #loc"
+include.anonymous.functions.parameter:
+    text: Include anonymous functions
 include.statement.bodies.that.are.empty.code.blocks.parameter:
-  text: Include statement bodies that are empty code blocks
-result.of.increment.or.decrement.expression.used.error.string:
-  text: 'Result of increment or decrement expression used #loc'
-negated.conditional.expression.error.string:
-  text: 'Negated conditional expression #loc'
+    text: Include statement bodies that are empty code blocks
+incompatible.mask.operation.display.name:
+    text: Incompatible bitwise mask operation
+incompatible.mask.operation.problem.descriptor.always.false:
+    text: '<code>#ref</code> is always false #loc'
+incompatible.mask.operation.problem.descriptor.always.true:
+    text: '<code>#ref</code> is always true #loc'
+infinite.loop.error.string:
+    text: '<code>#ref</code> statement cannot complete without throwing an exception #loc'
+infinite.loop.statement.display.name:
+    text: Infinite loop statement
+infinite.recursion.display.name:
+    text: Infinite recursion
+infinite.recursion.problem.descriptor:
+    text: 'Function <code>#ref</code> recurses infinitely, and can only end by throwing an exception #loc'
+inner.html.error.string:
+    text: "use of '#ref' property #loc"
 invert.condition.fix:
-  text: Invert condition
-negated.ref.statement.error.string:
-  text: 'Negated ''#ref'' statement #loc'
+    text: Invert condition
 invert.if.condition.fix:
-  text: Invert If Condition
+    text: Invert If Condition
+javascript.dom.issues.group.name:
+    text: JavaScript DOM issues
+javascript.function.metrics.group.name:
+    text: JavaScript function metrics
+javascript.validity.issues.group.name:
+    text: JavaScript validity issues
+labeled.statement.display.name:
+    text: Labeled statement
+local.variable.naming.convention.display.name:
+    text: Local variable naming convention
+loop.statement.that.doesn.t.loop.display.name:
+    text: "Loop statement that doesn't loop"
+loop.statement.that.doesnt.loop.error.string:
+    text: "<code>#ref</code> statement doesn't loop #loc"
+magic.number.display.name:
+    text: Magic number
+magic.number.problem.descriptor:
+    text: "Magic number '#ref' #loc"
+malformed.naming.pattern.alert:
+    text: Malformed Naming Pattern
+max.length.parameter:
+    text: 'Max Length:'
+maximum.number.of.branches.parameter:
+    text: 'Maximum number of branches:'
+maximum.number.of.terms.parameter:
+    text: 'Maximum number of terms:'
+maximum.statements.per.function:
+    text: 'Maximum statements per function:'
+min.length.parameter:
+    text: 'Min Length:'
+naming.conventions.javascript.group.name:
+    text: Naming conventions
+negated.conditional.expression.display.name:
+    text: Negated conditional expression
+negated.conditional.expression.error.string:
+    text: 'Negated conditional expression #loc'
+negated.if.statement.display.name:
+    text: "Negated 'if' statement"
+negated.ref.statement.error.string:
+    text: "Negated '#ref' statement #loc"
+nested.anonymous.function.error.string:
+    text: 'Nested #ref #loc'
+nested.assignment.display.name:
+    text: Nested assignment
+nested.assignment.error.string:
+    text: 'Nested assignment <code>#ref</code> #loc'
+nested.conditional.expression.display.name:
+    text: Nested conditional expression
 nested.conditional.expression.error.string:
-  text: 'Nested conditional expression #loc'
+    text: 'Nested conditional expression #loc'
+nested.function.call.display.name:
+    text: Nested function call
+nested.function.call.problem.descriptor:
+    text: "Nested call to function '#ref' #loc"
+nested.function.display.name:
+    text: Nested function
 nested.function.error.string:
-  text: 'Nested function ''#ref'' #loc'
-nested.anonymous.function.error.string:
-  text: 'Nested #ref #loc'
-include.anonymous.functions.parameter:
-  text: Include anonymous functions
+    text: "Nested function '#ref' #loc"
+nested.switch.statement.display.name:
+    text: "Nested 'switch' statement"
+nested.switch.statement.error.string:
+    text: "Nested '#ref' statement #loc"
+nesting.depth.limit:
+    text: 'Nesting depth limit:'
+non.block.body.error.string:
+    text: '<code>#ref</code> statement has non-block body #loc'
+non.block.branch.error.string:
+    text: '<code>#ref</code> statement has non-block branch #loc'
+non.block.statement.body.display.name:
+    text: Non-block statement body
+non.short.circuit.boolean.expression.display.name:
+    text: Non short-circuit boolean expression
+non.short.circuit.boolean.expression.error.string:
+    text: 'Non short-circuit boolean expression #loc'
+octal.integer.display.name:
+    text: Octal Integer
 octal.integer.error.string:
-  text: 'Octal integer ''#ref'' #loc'
-maximum.number.of.terms.parameter:
-  text: 'Maximum number of terms:'
+    text: "Octal integer '#ref' #loc"
+overly.complex.arithmetic.expression.display.name:
+    text: Overly complex arithmetic expression
 overly.complex.arithmetic.expression.error.string:
-  text: 'Overly complex arithmetic expression #loc'
+    text: 'Overly complex arithmetic expression #loc'
+overly.complex.boolean.expression.display.name:
+    text: Overly complex boolean expression
+overly.complex.boolean.expression.error.string:
+    text: 'Overly complex boolean expression #loc'
+overly.complex.function.display.name:
+    text: Overly complex function
+overly.long.function.display.name:
+    text: Overly long function
+overly.nested.function.display.name:
+    text: Overly nested function
+parameter.name.doesnt.match.regex.error.string:
+    text: "Parameter name ''#ref'' doesn''t match regex ''{0}'' #loc"
+parameter.name.is.too.long.error.string:
+    text: "Parameter name '#ref' is too long #loc"
+parameter.name.is.too.short.error.string:
+    text: "Parameter name '#ref' is too short #loc"
+pattern.parameter:
+    text: 'Pattern:'
+platform.detection.display.name:
+    text: Platform detection
+platform.detection.error.string:
+    text: "'#ref' probably used for platform detection #loc"
 pointless.arithmetic.error.message:
-  text: '#ref can be replaced with {0} #loc'
-simplify.fix:
-  text: Simplify
+    text: '#ref can be replaced with {0} #loc'
+pointless.arithmetic.expression.display.name:
+    text: Pointless arithmetic expression
+pointless.bitwise.expression.display.name:
+    text: Pointless bitwise expression
+pointless.bitwise.expression.ignore.option:
+    text: Ignore named constant in determinining pointless expressions
+pointless.bitwise.expression.problem.descriptor:
+    text: "<code>#ref</code> can be replaced with ''{0}'' #loc"
+pointless.bitwise.expression.simplify.quickfix:
+    text: Simplify
 pointless.boolean.error.string:
-  text: '#ref can be simplified to {0} #loc'
-void.expression.error.string:
-  text: '''#ref'' expression #loc'
-with.expression.error.string:
-  text: '''#ref'' statement #loc'
-break.statement.error.string:
-  text: '''#ref'' statement #loc'
-break.statement.with.label.error.string:
-  text: '''#ref'' statement with label #loc'
-conditional.expression.with.identical.branches.error.string:
-  text: 'Conditional expression #ref with identical branches #loc'
-constant.conditional.expression.error.string:
-  text: '#ref can be simplified #loc'
-continue.statement.error.string:
-  text: '''#ref'' statement #loc'
-continue.statement.with.label.error.string:
-  text: '''#ref'' statement with label #loc'
-default.branch.not.last.case.in.switch.error.string:
-  text: '<code>#ref</code> branch not last case in ''switch'' #loc'
-duplicate.condition.error.string:
-  text: 'Duplicate condition #ref #loc'
-fall.through.in.switch.statement.error.string:
-  text: 'Fall-through in ''switch'' statement #loc'
+    text: '#ref can be simplified to {0} #loc'
+pointless.boolean.expression.display.name:
+    text: Pointless boolean expression
+potentially.confusing.code.constructs.javascript.group.name:
+    text: Potentially confusing code constructs
+probable.bugs.javascript.group.name:
+    text: Probable Bugs
+redundant.conditional.expression.display.name:
+    text: Redundant conditional expression
+redundant.if.statement.display.name:
+    text: "Redundant 'if' statement"
+redundant.local.variable.display.name:
+    text: Redundant local variable
+redundant.local.variable.ignore.option:
+    text: Ignore immediately returned or thrown variables
 ref.statement.with.identical.branches.error.string:
-  text: '<code>#ref</code> statement with identical branches #loc'
-collapse.if.statement.fix:
-  text: Collapse 'if' statement
-maximum.number.of.branches.parameter:
-  text: 'Maximum number of branches:'
-if.statement.with.too.many.branches.error.string:
-  text: '''''#ref'''' has too many branches ({0}) #loc'
-infinite.loop.error.string:
-  text: '<code>#ref</code> statement cannot complete without throwing an exception #loc'
+    text: '<code>#ref</code> statement with identical branches #loc'
+remove.label.fix:
+    text: Remove label
+remove.unnecessary.continue.fix:
+    text: Remove unnecessary continue
+remove.unnecessary.return.fix:
+    text: Remove unnecessary return
+rename.fix:
+    text: Rename
+rename.to.fix:
+    text: "Rename to ''{0}''"
+replace.with.operator.assign.fix:
+    text: Replace = with {0}=
+replace.with.short.circuit.expression.fix.string:
+    text: Replace with short circuit expression
+reserved.word.used.as.name.display.name:
+    text: Reserved word used as name
+reserved.word.used.as.name.error.string:
+    text: "Reserved word '#ref' used as name"
+result.of.assignment.expression.used.error.string:
+    text: 'Result of assignment expression used #loc'
+result.of.assignment.used.displayName:
+    text: Result of assignment used
+result.of.increment.or.decrement.expression.used.error.string:
+    text: 'Result of increment or decrement expression used #loc'
+result.of.increment.or.decrement.used.display.name:
+    text: Result of increment or decrement used
+result.of.object.allocation.ignored.display.name:
+    text: Result of object allocation ignored
+result.of.object.allocation.ignored.error.string:
+    text: 'Result of <code>new #ref()</code> is ignored #loc'
+return.inside.finally.block.display.name:
+    text: "'return' inside 'finally' block"
+return.inside.finally.block.error.string:
+    text: "'#ref' inside 'finally' block #loc"
+reuse.of.local.variable.display.name:
+    text: Reuse of local variable
+reuse.of.local.variable.problem.descriptor:
+    text: 'Reuse of local variable <code>#ref</code> #loc'
+shift.operation.by.inappropriate.constant.display.name:
+    text: Shift operation by inappropriate constant
+shift.operation.by.inappropriate.constant.problem.descriptor.negative:
+    text: 'Shift operation <code>#ref</code> by negative constant value #loc'
+shift.operation.by.inappropriate.constant.problem.descriptor.too.large:
+    text: 'Shift operation <code>#ref</code> by overly large constant value #loc'
+silly.assignment.display.name:
+    text: Variable is assigned to itself
+silly.assignment.error.string:
+    text: 'Variable is assigned to itself #loc'
+simplify.fix:
+    text: Simplify
+statement.has.empty.body.error.string:
+    text: '<code>#ref</code> statement has empty body #loc'
+statement.has.empty.branch.error.string:
+    text: '<code>#ref</code> statement has empty branch #loc'
 statement.label.error.string:
-  text: 'Statement label ''#ref'' #loc'
-loop.statement.that.doesnt.loop.error.string:
-  text: '<code>#ref</code> statement doesn''t loop #loc'
-nested.switch.statement.error.string:
-  text: 'Nested ''#ref'' statement #loc'
+    text: "Statement label '#ref' #loc"
+statement.with.empty.body.display.name:
+    text: Statement with empty body
+string.literal.breaks.html.display.name:
+    text: String literal which breaks HTML parsing
+string.literal.breaks.html.error.string:
+    text: 'String literal #ref may break HTML parsers'
+switch.statement.with.no.default.branch.display.name:
+    text: "'switch' statement with no default branch"
 switch.statement.with.no.default.branch.error.string:
-  text: '''#ref'' statement with no default branch #loc'
+    text: "'#ref' statement with no default branch #loc"
+tail.recursion.display.name:
+    text: Tail recursion
+tail.recursion.problem.descriptor:
+    text: 'Tail recursion #loc'
+terminate.statement.fix:
+    text: Terminate statement
+text.label.in.switch.statement.display.name:
+    text: "Text label in 'switch' statement"
+text.label.in.switch.statement.error.string:
+    text: "Text label <code>#ref:</code> in 'switch' statement #loc"
+this.expression.references.global.object.error.string:
+    text: "Top-level '#ref' expression #loc"
+this.expression.which.references.the.global.object.display.name:
+    text: "'this' expression which references the global object"
+throw.inside.finally.block.display.name:
+    text: "'throw' inside 'finally' block"
+throw.inside.finally.block.error.string:
+    text: "'#ref' inside 'finally' block #loc"
 trivial.conditional.error.string:
-  text: '''''{0}'''' can be simplified to ''''{1}'''' #loc'
+    text: "''{0}'' can be simplified to ''{1}'' #loc"
 trivial.if.error.string:
-  text: '#ref statement can be simplified #loc'
+    text: '#ref statement can be simplified #loc'
+unnecessary.block.statement.display.name:
+    text: "Unnecessary 'block' statement"
+unnecessary.block.statement.error.string:
+    text: 'Unnecessary block statement #loc'
 unnecessary.continue.error.string:
-  text: '#ref is unnecessary as the last statement in a loop #loc'
+    text: '#ref is unnecessary as the last statement in a loop #loc'
+unnecessary.continue.statement.display.name:
+    text: "Unnecessary 'continue' statement"
+unnecessary.label.display.name:
+    text: Unnecessary label
 unnecessary.label.error.string:
-  text: 'Unnecessary label #ref #loc'
-remove.label.fix:
-  text: Remove label
+    text: 'Unnecessary label #ref #loc'
 unnecessary.label.on.break.error.string:
-  text: '''#ref'' statement with unnecessary label #loc'
+    text: "'#ref' statement with unnecessary label #loc"
+unnecessary.label.on.break.statement.display.name:
+    text: "Unnecessary label on 'break' statement"
 unnecessary.label.on.continue.error.string:
-  text: '''#ref'' statement with unnecessary label #loc'
+    text: "'#ref' statement with unnecessary label #loc"
+unnecessary.label.on.continue.statement.display.name:
+    text: "Unnecessary label on 'continue' statement"
+unnecessary.local.variable.problem.descriptor:
+    text: Unnecessary local variable
 unnecessary.return.error.string:
-  text: '#ref is unnecessary as the last statement in a function with no return value #loc'
-document.write.error.string:
-  text: 'Call to ''#ref()'' #loc'
-inner.html.error.string:
-  text: 'use of ''#ref'' property #loc'
-platform.detection.error.string:
-  text: '''#ref'' probably used for platform detection #loc'
-xhtml.incompatabilities.error.string:
-  text: '''#ref'' may produce inconsistent results for XHTML documents #loc'
-continue.or.break.inside.finally.block.error.string:
-  text: '''#ref'' inside ''finally'' block #loc'
-empty.catch.block.error.string:
-  text: 'Empty ''#ref'' block #loc'
-empty.finally.block.error.string:
-  text: 'Empty ''finally'' block #loc'
-empty.try.block.error.string:
-  text: 'Empty ''#ref'' block #loc'
-exception.caught.locally.error.string:
-  text: '''#ref'' of exception caught locally #loc'
-return.inside.finally.block.error.string:
-  text: '''#ref'' inside ''finally'' block #loc'
-throw.inside.finally.block.error.string:
-  text: '''#ref'' inside ''finally'' block #loc'
-rename.fix:
-  text: Rename
-rename.to.fix:
-  text: Rename to ''{0}''
-function.complexity.limit.parameter:
-  text: 'Function complexity limit:'
-function.ref.is.overly.complex.cyclomatic.complexity.error.string:
-  text: 'function ''''#ref'''' is overly complex (cyclomatic complexity = {0}) #loc'
-anonymous.function.is.overly.complex.cyclomatic.complexity.error.string:
-  text: '#ref  is overly complex (cyclomatic complexity = {0}) #loc'
-function.contains.multiple.loops.error.string:
-  text: 'function ''''#ref'''' contains {0} loops #loc'
-anonymous.function.contains.multiple.loops.error.string:
-  text: '#ref contains {0} loops #loc'
-function.contains.multiple.return.points.error.string:
-  text: 'function ''''#ref'''' has {0} return points #loc'
-anonymous.function.contains.multiple.return.points.error.string:
-  text: '#ref has {0} return points #loc'
-function.is.overly.nested.error.string:
-  text: 'function ''''#ref'''' is overly nested (maximum nesting depth = {0}) #loc'
-anonymous.function.is.overly.nested.error.string:
-  text: '#ref is overly nested (maximum nesting depth = {0}) #loc'
-function.has.too.many.parameters.error.string:
-  text: 'function ''''#ref'''' has too many parameters (parameter count = {0}) #loc'
-anonymous.function.has.too.many.parameters.error.string:
-  text: '#ref has too many parameters (parameter count = {0}) #loc'
-function.is.overly.long.statement.error.string:
-  text: 'function ''''#ref'''' is overly long (statement count = {0}) #loc'
-anonymous.function.is.overly.long.statement.error.string:
-  text: '#ref is overly long (statement count = {0}) #loc'
-function.contains.too.many.negation.error.string:
-  text: 'function ''''#ref'''' contains {0} negations #loc'
-anonymous.function.contains.too.many.negation.error.string:
-  text: '#ref contains {0} negations #loc'
-function.name.is.too.short.error.string:
-  text: 'Function name ''''{0}'''' is too short #loc'
-function.name.is.too.long.error.string:
-  text: 'Function name ''''{0}''''is too long #loc'
-function.name.doesnt.match.regex.error.string:
-  text: 'Function name ''''{0}'''' doesn''''t match regex ''''{1}'''' #loc'
-variable.name.is.too.short.error.string:
-  text: 'Variable name ''#ref'' is too short #loc'
-variable.name.is.too.long.error.string:
-  text: 'Variable name ''#ref'' is too long #loc'
-variable.name.doesnt.match.regex.error.string:
-  text: 'Variable name ''''#ref'''' doesn''''t match regex ''''{0}'''' #loc'
-parameter.name.is.too.short.error.string:
-  text: 'Parameter name ''#ref'' is too short #loc'
-parameter.name.is.too.long.error.string:
-  text: 'Parameter name ''#ref'' is too long #loc'
-parameter.name.doesnt.match.regex.error.string:
-  text: 'Parameter name ''''#ref'''' doesn''''t match regex ''''{0}'''' #loc'
-chained.equality.error.string:
-  text: 'Chained equality comparison <code>#ref</code> #loc'
-constant.on.left.side.of.comparison.error.string:
-  text: '#ref: constant on left side of comparison #loc'
-constant.on.right.side.of.comparison.error.string:
-  text: '#ref: constant on right side of comparison #loc'
-flip.comparison.fix:
-  text: Flip comparison
-non.block.branch.error.string:
-  text: '<code>#ref</code> statement has non-block branch #loc'
-non.block.body.error.string:
-  text: '<code>#ref</code> statement has non-block body #loc'
-unterminated.statement.error.string:
-  text: 'Unterminated statement #loc'
-expression.statement.is.not.assignment.or.call.error.string:
-  text: 'Expression statement is not assignment or call #loc'
-debugger.statement.error.string:
-  text: '''#ref'' statement #loc'
-duplicate.case.label.error.string:
-  text: 'Duplicate case label #ref #loc'
-duplicate.object.property.error.string:
-  text: 'Duplicate object property #ref #loc'
-function.has.inconsistent.return.points.error.string:
-  text: 'function ''#ref'' has inconsistent return points #loc'
-anonymous.function.has.inconsistent.return.points.error.string:
-  text: '#ref has inconsistent return points #loc'
-reserved.word.used.as.name.error.string:
-  text: Reserved word '#ref' used as name
-this.expression.references.global.object.error.string:
-  text: 'Top-level ''#ref'' expression #loc'
+    text: '#ref is unnecessary as the last statement in a function with no return value #loc'
+unnecessary.return.statement.display.name:
+    text: "Unnecessary 'return' statement"
+unreachable.code.display.name:
+    text: Unreachable code
 unreachable.code.error.string:
-  text: 'Unreachable code #loc'
-malformed.naming.pattern.alert:
-  text: Malformed Naming Pattern
-replace.with.operator.assign.fix:
-  text: Replace = with {0}=
-overly.complex.boolean.expression.error.string:
-  text: 'Overly complex boolean expression #loc'
-collapse.conditional.expression.fix:
-  text: Collapse conditional expression
-remove.unnecessary.continue.fix:
-  text: Remove unnecessary continue
-remove.unnecessary.return.fix:
-  text: Remove unnecessary return
-pattern.parameter:
-  text: 'Pattern:'
-min.length.parameter:
-  text: 'Min Length:'
-max.length.parameter:
-  text: 'Max Length:'
-wrap.statement.body.fix:
-  text: Wrap statement body
-error.handling.javascript.group.name:
-  text: Error handling
-control.flow.issues.javascript.group.name:
-  text: Control flow issues
-javascript.validity.issues.group.name:
-  text: JavaScript validity issues
-potentially.confusing.code.constructs.javascript.group.name:
-  text: Potentially confusing code constructs
-javascript.function.metrics.group.name:
-  text: JavaScript function metrics
-assignment.issues.javascript.group.name:
-  text: Assignment issues
-naming.conventions.javascript.group.name:
-  text: Naming conventions
-code.style.issues.javascript.group.name:
-  text: Code style issues
-javascript.dom.issues.group.name:
-  text: JavaScript DOM issues
-probable.bugs.javascript.group.name:
-  text: Probable Bugs
-code.maturity.javascript.group.name:
-  text: Code Maturity
-confusing.floating.point.literal.display.name:
-  text: Confusing floating point literal
-confusing.floating.point.literal.problem.descriptor:
-  text: 'Confusing floating point literal <code>#ref</code> #loc'
-confusing.pluses.or.minuses.display.name:
-  text: Confusing sequence of '+' or '-'
-confusing.pluses.or.minuses.error.string:
-  text: 'Sequence of ''+'' or ''-'' may change meaning if whitespace removed #loc'
-confusing.floating.point.literal.change.quickfix:
-  text: Change To canonical form
-string.literal.breaks.html.display.name:
-  text: String literal which breaks HTML parsing
-string.literal.breaks.html.error.string:
-  text: 'String literal #ref may break HTML parsers'
-for.loop.not.use.loop.variable.display.name:
-  text: '''for'' loop where update or condition does not use loop variable'
-for.loop.not.use.loop.variable.problem.descriptor.condition:
-  text: '<code>#ref</code> statement has condition which does not use the for loop variable #loc'
-for.loop.not.use.loop.variable.problem.descriptor.update:
-  text: '<code>#ref</code> statement has update which does not use the for loop variable #loc'
-for.loop.not.use.loop.variable.problem.descriptor.both.condition.and.update:
-  text: '<code>#ref</code> statement has condition and update which do not use the for loop variable #loc'
+    text: 'Unreachable code #loc'
+unterminated.statement.display.name:
+    text: Unterminated statement
+unterminated.statement.error.string:
+    text: 'Unterminated statement #loc'
 unused.catch.parameter.display.name:
-  text: Unused 'catch' parameter
-unused.catch.parameter.problem.descriptor:
-  text: 'Unused catch parameter <code>#ref</code> #loc'
+    text: "Unused 'catch' parameter"
 unused.catch.parameter.ignore.catch.option:
-  text: Ignore catch blocks containing comments
-tail.recursion.display.name:
-  text: Tail recursion
-tail.recursion.problem.descriptor:
-  text: 'Tail recursion #loc'
-redundant.local.variable.display.name:
-  text: Redundant local variable
-data.flow.issues.javascript.group.name:
-  text: Data flow issues
-bitwise.issues.javascript.group.name:
-  text: Bitwise operation issues
-redundant.local.variable.ignore.option:
-  text: Ignore immediately returned or thrown variables
-unnecessary.local.variable.problem.descriptor:
-  text: Unnecessary local variable
-reuse.of.local.variable.display.name:
-  text: Reuse of local variable
-reuse.of.local.variable.problem.descriptor:
-  text: 'Reuse of local variable <code>#ref</code> #loc'
-infinite.recursion.display.name:
-  text: Infinite recursion
-infinite.recursion.problem.descriptor:
-  text: 'Function <code>#ref</code> recurses infinitely, and can only end by throwing an exception #loc'
-constant.if.statement.problem.descriptor:
-  text: '<code>#ref</code> statement can be simplified #loc'
-constant.if.statement.display.name:
-  text: Constant if statement
-constant.conditional.expression.simplify.quickfix:
-  text: Simplify
-caller.error.string:
-  text: 'Use of ''#ref'' property #loc'
-caller.display.name:
-  text: Use of 'caller' property
-dynamically.generated.code.error.string:
-  text: 'Function ''#ref'' indicative of dynamically generated code #loc'
-dynamically.generated.code.display.name:
-  text: Execution of dynamically generated JavaScript
-for.loop.replaceable.by.while.problem.descriptor:
-  text: '<code>#ref</code> loop may be replaced by ''while'' loop #loc'
-for.loop.replaceable.by.while.display.name:
-  text: '''for'' loop may be replaced by ''while'' loop'
-for.loop.replaceable.by.while.replace.quickfix:
-  text: Replace with 'while'
-for.loop.replaceable.by.while.ignore.option:
-  text: Ignore 'infinite' for loops without conditions
-nested.function.call.display.name:
-  text: Nested function call
-nested.function.call.problem.descriptor:
-  text: 'Nested call to function ''#ref'' #loc'
-chained.function.call.display.name:
-  text: Chained function call
-chained.function.call.problem.descriptor:
-  text: 'Chained call to function ''#ref'' #loc'
-magic.number.display.name:
-  text: Magic number
-magic.number.problem.descriptor:
-  text: 'Magic number ''#ref'' #loc'
-incompatible.mask.operation.display.name:
-  text: Incompatible bitwise mask operation
-incompatible.mask.operation.problem.descriptor.always.false:
-  text: '<code>#ref</code> is always false #loc'
-incompatible.mask.operation.problem.descriptor.always.true:
-  text: '<code>#ref</code> is always true #loc'
-pointless.bitwise.expression.display.name:
-  text: Pointless bitwise expression
-pointless.bitwise.expression.ignore.option:
-  text: Ignore named constant in determinining pointless expressions
-pointless.bitwise.expression.problem.descriptor:
-  text: '<code>#ref</code> can be replaced with ''''{0}'''' #loc'
-pointless.bitwise.expression.simplify.quickfix:
-  text: Simplify
-shift.operation.by.inappropriate.constant.display.name:
-  text: Shift operation by inappropriate constant
-shift.operation.by.inappropriate.constant.problem.descriptor.too.large:
-  text: 'Shift operation <code>#ref</code> by overly large constant value #loc'
-shift.operation.by.inappropriate.constant.problem.descriptor.negative:
-  text: 'Shift operation <code>#ref</code> by negative constant value #loc'
+    text: Ignore catch blocks containing comments
+unused.catch.parameter.problem.descriptor:
+    text: 'Unused catch parameter <code>#ref</code> #loc'
+use.of.innerhtml.property.display.name:
+    text: "Use of 'innerHTML' property"
+variable.name.doesnt.match.regex.error.string:
+    text: "Variable name ''#ref'' doesn''t match regex ''{0}'' #loc"
+variable.name.is.too.long.error.string:
+    text: "Variable name '#ref' is too long #loc"
+variable.name.is.too.short.error.string:
+    text: "Variable name '#ref' is too short #loc"
+void.expression.display.name:
+    text: "'void' expression"
+void.expression.error.string:
+    text: "'#ref' expression #loc"
+with.expression.error.string:
+    text: "'#ref' statement #loc"
+with.statement.display.name:
+    text: "'with' statement"
+wrap.statement.body.fix:
+    text: Wrap statement body
+xhtml.incompatabilities.error.string:
+    text: "'#ref' may produce inconsistent results for XHTML documents #loc"
+xhtml.incompatibilities.display.name:
+    text: XHTML incompatibilities
diff --git a/intentions/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.intention.JSIntentionLocalize.yaml b/intentions/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.intention.JSIntentionLocalize.yaml
index 512e713a..72512fa3 100644
--- a/intentions/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.intention.JSIntentionLocalize.yaml
+++ b/intentions/src/main/resources/LOCALIZE-LIB/en_US/consulo.javascript.intention.JSIntentionLocalize.yaml
@@ -1,118 +1,118 @@
 bool.de.morgans.law:
-  text: DeMorgan law
+    text: DeMorgan law
 bool.de.morgans.law.and.to.or:
-  text: Replace && with ||
+    text: Replace && with ||
 bool.de.morgans.law.or.to.and:
-  text: Replace || with &&
+    text: Replace || with &&
 bool.flip.comparison:
-  text: Flip comparison
+    text: Flip comparison
 bool.flip.comparison.equals:
-  text: Flip {0}
+    text: Flip {0}
 bool.flip.comparison.not.equals:
-  text: Flip {0} to {1}
+    text: Flip {0} to {1}
 bool.flip.comparison.unknown:
-  text: Flip comparison
+    text: Flip comparison
 bool.flip.conjunction:
-  text: Flip conjunction operands
+    text: Flip conjunction operands
 bool.flip.conjunction.message:
-  text: Flip {0}
+    text: Flip {0}
 bool.negate.comparison:
-  text: Negate comparison
+    text: Negate comparison
 bool.negate.comparison.equals:
-  text: Negate {0}
+    text: Negate {0}
 bool.negate.comparison.not.equals:
-  text: Negate {0} to {1}
+    text: Negate {0} to {1}
 bool.remove.boolean.equality:
-  text: Remove boolean equality
+    text: Remove boolean equality
 bool.remove.boolean.equality.message:
-  text: Simplify {0}
+    text: Simplify {0}
 braces.add:
-  text: Add braces
+    text: Add braces
 braces.add.message:
-  text: Add braces from ''{0}'' statement
+    text: "Add braces from ''{0}'' statement"
 braces.remove:
-  text: Remove braces
+    text: Remove braces
 braces.remove.message:
-  text: Remove braces from ''{0}'' statement
+    text: "Remove braces from ''{0}'' statement"
 comment.change.to.cstyle.comment:
-  text: Replace with C-style comment
+    text: Replace with C-style comment
 comment.change.to.end.of.line.comment:
-  text: Replace with end-of-line comment
+    text: Replace with end-of-line comment
 comment.move.comment.to.separate.line:
-  text: Move comment to separate line
+    text: Move comment to separate line
 conditional.flip.conditional:
-  text: 'Flip ?:'
+    text: 'Flip ?:'
 conditional.flip.if:
-  text: Flip if-else
+    text: Flip if-else
 conditional.remove.conditional:
-  text: 'Simplify ?:'
+    text: 'Simplify ?:'
 conditional.replace.conditional.with.if:
-  text: 'Replace ?: with if-else'
+    text: 'Replace ?: with if-else'
 constant.compute.expression:
-  text: Compute constant value
+    text: Compute constant value
 constant.compute.subexpression:
-  text: Compute constant value for subexpression
+    text: Compute constant value for subexpression
 constant.compute.subexpression.message:
-  text: Compute constant value of {0} {1} {2}
+    text: Compute constant value of {0} {1} {2}
 increment.extract:
-  text: Extract increment
+    text: Extract increment
 increment.extract.message:
-  text: Extract {0}
+    text: Extract {0}
 initialization.merge.declaration.and.initialization:
-  text: Merge declaration and initialization
+    text: Merge declaration and initialization
 initialization.split.declaration.and.initialization:
-  text: Split into declaration and initialization
-loop.merge.parallel.for.loops:
-  text: Merge 'for' loops
+    text: Split into declaration and initialization
 loop.merge.parallel.for.in.loops:
-  text: Merge 'for-in' loops
+    text: "Merge 'for-in' loops"
+loop.merge.parallel.for.loops:
+    text: "Merge 'for' loops"
 number.convert.integer.to.decimal:
-  text: Convert to decimal
+    text: Convert to decimal
 number.convert.integer.to.hex:
-  text: Convert to hex
+    text: Convert to hex
 number.convert.integer.to.octal:
-  text: Convert to octal
+    text: Convert to octal
 number.replace.multiply.with.shift:
-  text: Replace multiply with shift
+    text: Replace multiply with shift
 number.replace.multiply.with.shift.message:
-  text: Replace {0} with {1}
+    text: Replace {0} with {1}
 number.replace.shift.with.multiply:
-  text: Replace shift with multiply
+    text: Replace shift with multiply
 number.replace.shift.with.multiply.message:
-  text: Replace {0} with {1}
+    text: Replace {0} with {1}
 opassign.replace.with.operator.assignment:
-  text: Replace assignment with operator assignment
+    text: Replace assignment with operator assignment
 opassign.replace.with.operator.assignment.message:
-  text: Replace = with {0}=
+    text: Replace = with {0}=
 parenthesis.remove.unnecessary.parentheses:
-  text: Remove unnecessary parentheses
+    text: Remove unnecessary parentheses
 string.double.quoted.to.single.quoted:
-  text: Replace double-quoted string with single-quoted string
+    text: Replace double-quoted string with single-quoted string
 string.join.concatenated.string.literals:
-  text: Join concatenated String literals
+    text: Join concatenated String literals
 string.single.to.double.quoted.string:
-  text: Replace single-quoted string with double-quoted string
+    text: Replace single-quoted string with double-quoted string
 switchtoif.replace.if.with.switch:
-  text: Replace if with switch
+    text: Replace if with switch
 switchtoif.replace.switch.with.if:
-  text: Replace switch with if
+    text: Replace switch with if
 trivialif.merge.else.if:
-  text: Merge else-if
+    text: Merge else-if
 trivialif.merge.if.and:
-  text: Merge 'if's
+    text: "Merge 'if's"
 trivialif.merge.if.or:
-  text: Merge 'if's
+    text: "Merge 'if's"
 trivialif.merge.parallel.ifs:
-  text: Merge 'if's
+    text: "Merge 'if's"
 trivialif.remove.redundant.else:
-  text: Remove redundant else
+    text: Remove redundant else
 trivialif.replace.if.with.conditional:
-  text: 'Replace if-else with ?:'
+    text: 'Replace if-else with ?:'
 trivialif.simplify.if.else:
-  text: Simplify if-else
+    text: Simplify if-else
 trivialif.split.else.if:
-  text: Split else-if
+    text: Split else-if
 trivialif.split.if.and:
-  text: Split AND-ed if
+    text: Split AND-ed if
 trivialif.split.if.or:
-  text: Split OR-ed if
+    text: Split OR-ed if
diff --git a/lang-version-impl/typescript-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.typescript.TypeScriptLocalize.yaml b/lang-version-impl/typescript-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.typescript.TypeScriptLocalize.yaml
index 7dcb532b..eaaf0365 100644
--- a/lang-version-impl/typescript-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.typescript.TypeScriptLocalize.yaml
+++ b/lang-version-impl/typescript-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.typescript.TypeScriptLocalize.yaml
@@ -1,80 +1,75 @@
-# TypeScript Feature Display Names
-feature.interface:
-    text: Interfaces
+feature.abstract.class:
+    text: Abstract classes
+feature.access.modifier:
+    text: Access modifiers
+feature.computed.property:
+    text: Computed properties
+feature.conditional.type:
+    text: Conditional types
+feature.const.type.parameter:
+    text: const type parameters
+feature.decorator:
+    text: Decorators
+feature.decorator.metadata:
+    text: Decorator metadata
 feature.enum:
     text: Enums
 feature.generic:
     text: Generics
-feature.type.annotation:
-    text: Type annotations
-feature.access.modifier:
-    text: Access modifiers
-feature.namespace:
-    text: Namespaces
-feature.type.alias:
-    text: Type aliases
-feature.union.type:
-    text: Union types
+feature.import.attributes:
+    text: Import attributes
+feature.import.defer:
+    text: Deferred imports
+feature.indexed.access.type:
+    text: Indexed access types
+feature.infer.keyword:
+    text: infer keyword
+feature.interface:
+    text: Interfaces
 feature.intersection.type:
     text: Intersection types
-feature.decorator:
-    text: Decorators
-feature.abstract.class:
-    text: Abstract classes
-feature.computed.property:
-    text: Computed properties
-feature.readonly.modifier:
-    text: Readonly modifier
+feature.key.remapping:
+    text: Key remapping in mapped types
+feature.keyof.operator:
+    text: keyof operator
+feature.labeled.tuple:
+    text: Labeled tuple elements
+feature.mapped.type:
+    text: Mapped types
+feature.namespace:
+    text: Namespaces
 feature.never.type:
     text: Never type
 feature.non.null.assertion:
     text: Non-null assertion
-feature.mapped.type:
-    text: Mapped types
-feature.keyof.operator:
-    text: keyof operator
-feature.indexed.access.type:
-    text: Indexed access types
+feature.not.supported.by.current.version:
+    text: "''{0}'' requires TypeScript {1} or later"
 feature.object.spread:
     text: Object spread
-feature.conditional.type:
-    text: Conditional types
-feature.infer.keyword:
-    text: infer keyword
-feature.unknown.type:
-    text: unknown type
-feature.rest.tuple:
-    text: Rest elements in tuples
-feature.labeled.tuple:
-    text: Labeled tuple elements
-feature.variadic.tuple:
-    text: Variadic tuple types
-feature.template.literal.type:
-    text: Template literal types
-feature.key.remapping:
-    text: Key remapping in mapped types
 feature.override.modifier:
     text: override modifier
-feature.type.only.import.specifier:
-    text: Type-only import specifiers
+feature.readonly.modifier:
+    text: Readonly modifier
+feature.rest.tuple:
+    text: Rest elements in tuples
 feature.satisfies.operator:
     text: satisfies operator
-feature.const.type.parameter:
-    text: const type parameters
-feature.decorator.metadata:
-    text: Decorator metadata
-feature.import.attributes:
-    text: Import attributes
-feature.import.defer:
-    text: Deferred imports
 feature.subpath.imports:
     text: Subpath imports
-
-# Error Messages
-feature.not.supported.by.current.version:
-    text: "''{0}'' requires TypeScript {1} or later"
-
-# Version Names
+feature.template.literal.type:
+    text: Template literal types
+feature.type.alias:
+    text: Type aliases
+feature.type.annotation:
+    text: Type annotations
+feature.type.only.import.specifier:
+    text: Type-only import specifiers
+feature.union.type:
+    text: Union types
+feature.unknown.type:
+    text: unknown type
+feature.variadic.tuple:
+    text: Variadic tuple types
 version.1.0:
     text: TypeScript 1.0
 version.1.5:
diff --git a/verbaria-lock.json b/verbaria-lock.json
new file mode 100644
index 00000000..04d6de04
--- /dev/null
+++ b/verbaria-lock.json
@@ -0,0 +1,65 @@
+{
+  "lockVersion" : 1,
+  "server" : "https://i.verbaria.org/",
+  "project" : "consulo-javascript",
+  "projectVersion" : "master",
+  "generatedAt" : "2026-06-03T18:35:06.070307908Z",
+  "documents" : {
+    "com.sixrr.inspectjs.InspectionJSLocalize" : {
+      "source" : {
+        "revision" : 1,
+        "sig" : "67f2239a8c6400e6e1fd434c6ae43a28"
+      },
+      "translations" : {
+        "en-US" : {
+          "sig" : "9f88e5ce830a83d5d85a2e2b7a8b4d5a",
+          "state" : "Approved",
+          "total" : 278,
+          "translators" : [ "Valery Semenchuk <vistall.valeriy@gmail.com>" ]
+        }
+      }
+    },
+    "consulo.javascript.JavaScriptLocalize" : {
+      "source" : {
+        "revision" : 1,
+        "sig" : "13560c8c98b51abcba569b52b62f114a"
+      },
+      "translations" : {
+        "en-US" : {
+          "sig" : "f14568fd04ac9e74fe69015bee27de4a",
+          "state" : "Approved",
+          "total" : 268,
+          "translators" : [ "Valery Semenchuk <vistall.valeriy@gmail.com>" ]
+        }
+      }
+    },
+    "consulo.javascript.intention.JSIntentionLocalize" : {
+      "source" : {
+        "revision" : 1,
+        "sig" : "a0c1e71d2a5c5fe0ddb17c26fe7ba399"
+      },
+      "translations" : {
+        "en-US" : {
+          "sig" : "d5a581014b4308f8358c23413ba4b41c",
+          "state" : "Approved",
+          "total" : 59,
+          "translators" : [ "Valery Semenchuk <vistall.valeriy@gmail.com>" ]
+        }
+      }
+    },
+    "consulo.typescript.TypeScriptLocalize" : {
+      "source" : {
+        "revision" : 1,
+        "sig" : "65415d82fbab433950bdf9e6658f7767"
+      },
+      "translations" : {
+        "en-US" : {
+          "sig" : "4c793fe4689911ea5d198fcac5a0ec4c",
+          "state" : "Approved",
+          "total" : 52,
+          "translators" : [ "Valery Semenchuk <vistall.valeriy@gmail.com>" ]
+        }
+      }
+    }
+  }
+}
diff --git a/verbaria.json b/verbaria.json
new file mode 100644
index 00000000..9192022d
--- /dev/null
+++ b/verbaria.json
@@ -0,0 +1,12 @@
+{
+    "url": "https://i.verbaria.org/",
+    "project": "consulo-javascript",
+    "projectVersion": "master",
+    "projectType": "consulo",
+    "srcDir": ".",
+    "targetLocales": [
+        "en-US"
+    ],
+    "includes": "**/src/main/resources/LOCALIZE-LIB/en_US/**/*",
+    "excludes": "**/target/**"
+}
\ No newline at end of file

From 5e4012711049598abb518b109f4c9d1278c88647 Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Wed, 17 Jun 2026 21:51:24 +0300
Subject: [PATCH 339/340] migrate to new language api

---
 .../lang/javascript/JSLanguageInjector.java      | 16 ++++++++++------
 .../javascript/XmlAttributeValueJSInjector.java  |  7 +++++++
 .../lang/javascript/XmlTextJSInjector.java       |  7 +++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
index 0a1ad51d..b06a5df6 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/JSLanguageInjector.java
@@ -22,7 +22,7 @@
 import consulo.html.language.psi.HtmlTag;
 import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.Language;
-import consulo.language.LanguagePointerUtil;
+import consulo.language.LanguageRegistry;
 import consulo.language.inject.MultiHostInjector;
 import consulo.language.inject.MultiHostRegistrar;
 import consulo.language.psi.OuterLanguageElement;
@@ -42,7 +42,11 @@ public abstract class JSLanguageInjector implements MultiHostInjector {
     private static final String JAVASCRIPT_PREFIX = "javascript:";
     public static final String JSP_URI = "http://java.sun.com/JSP/Page";
 
-    private static final NamedPointer<Language> CSS_LANGUAGE = LanguagePointerUtil.createPointer("CSS");
+    private final NamedPointer<Language> myCSSLanguagePointer;
+
+    public JSLanguageInjector(LanguageRegistry languageRegistry) {
+        myCSSLanguagePointer = languageRegistry.createLanguagePointer("CSS");
+    }
 
     @Override
     public void injectLanguages(MultiHostRegistrar registrar, PsiElement host) {
@@ -76,8 +80,8 @@ else if (attrName.startsWith("on")) {
                         checkMxmlInjection(registrar, attributeValue, attribute, tag);
                     }
                 }
-                else if ("style".equals(attrName) && isMozillaXulOrXblNs(xmlTag.getNamespace()) && CSS_LANGUAGE.get() != null) {
-                    registrar.startInjecting(CSS_LANGUAGE.get())
+                else if ("style".equals(attrName) && isMozillaXulOrXblNs(xmlTag.getNamespace()) && myCSSLanguagePointer.get() != null) {
+                    registrar.startInjecting(myCSSLanguagePointer.get())
                         .addPlace(
                             "inline.style {",
                             "}",
@@ -119,8 +123,8 @@ else if (host instanceof XmlText && host.getParent() instanceof XmlTag tag) {
                     injectToXmlText(registrar, host, language, null, null);
                 }
             }
-            else if ("Style".equals(localName) && JavaScriptSupportLoader.isMxmlNs(tag.getNamespace()) && CSS_LANGUAGE.get() != null) {
-                injectToXmlText(registrar, host, CSS_LANGUAGE.get(), null, null);
+            else if ("Style".equals(localName) && JavaScriptSupportLoader.isMxmlNs(tag.getNamespace()) && myCSSLanguagePointer.get() != null) {
+                injectToXmlText(registrar, host, myCSSLanguagePointer.get(), null, null);
             }
             else if ((("script".equals(localName) && ((tag.getNamespacePrefix().length() > 0 && doInjectTo(tag))
                 || isMozillaXulOrXblNs(tag.getNamespace()))) || "Script".equals(localName) || "Metadata".equals(localName))
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
index 7c9764e9..40e49aa9 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlAttributeValueJSInjector.java
@@ -1,8 +1,10 @@
 package com.intellij.lang.javascript;
 
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.LanguageRegistry;
 import consulo.language.psi.PsiElement;
 import consulo.xml.language.psi.XmlAttributeValue;
+import jakarta.inject.Inject;
 
 /**
  * @author VISTALL
@@ -10,6 +12,11 @@
  */
 @ExtensionImpl
 public class XmlAttributeValueJSInjector extends JSLanguageInjector {
+    @Inject
+    public XmlAttributeValueJSInjector(LanguageRegistry languageRegistry) {
+        super(languageRegistry);
+    }
+
     @Override
     public Class<? extends PsiElement> getElementClass() {
         return XmlAttributeValue.class;
diff --git a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
index 9be6325f..a04600ce 100644
--- a/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
+++ b/base-impl/src/main/java/com/intellij/lang/javascript/XmlTextJSInjector.java
@@ -1,8 +1,10 @@
 package com.intellij.lang.javascript;
 
 import consulo.annotation.component.ExtensionImpl;
+import consulo.language.LanguageRegistry;
 import consulo.language.psi.PsiElement;
 import consulo.xml.language.psi.XmlText;
+import jakarta.inject.Inject;
 
 /**
  * @author VISTALL
@@ -10,6 +12,11 @@
  */
 @ExtensionImpl
 public class XmlTextJSInjector extends JSLanguageInjector {
+    @Inject
+    public XmlTextJSInjector(LanguageRegistry languageRegistry) {
+        super(languageRegistry);
+    }
+
     @Override
     public Class<? extends PsiElement> getElementClass() {
         return XmlText.class;

From 87534a8f12db9da96a9d26892cc7b13837d0b47c Mon Sep 17 00:00:00 2001
From: Valery Semenchuk <vistall.valeriy@gmail.com>
Date: Sun, 21 Jun 2026 18:13:15 +0300
Subject: [PATCH 340/340] migrate to UiDataProvider

---
 .../JavaScriptGroupRuleProviderBase.java      | 49 ++++++++-----------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
index 2874545d..4700f0c9 100644
--- a/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
+++ b/plugin/src/main/java/com/intellij/lang/javascript/impl/findUsages/JavaScriptGroupRuleProviderBase.java
@@ -19,27 +19,27 @@
 import com.intellij.lang.javascript.psi.JSNamedElement;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.dataContext.DataSink;
-import consulo.dataContext.TypeSafeDataProvider;
+import consulo.dataContext.UiDataProvider;
+import consulo.javascript.language.JavaScriptLanguage;
 import consulo.language.editor.LangDataKeys;
 import consulo.language.psi.PsiElement;
+import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.SmartPointerManager;
+import consulo.language.psi.SmartPsiElementPointer;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.navigation.NavigationItem;
 import consulo.project.Project;
-import consulo.usage.*;
-import consulo.usage.rule.PsiElementUsage;
-import consulo.usage.rule.UsageGroupingRule;
-import consulo.virtualFileSystem.status.FileStatusManager;
-import consulo.language.psi.PsiNamedElement;
-import consulo.language.psi.SmartPsiElementPointer;
+import consulo.ui.image.Image;
+import consulo.usage.Usage;
 import consulo.usage.UsageGroup;
+import consulo.usage.UsageInfo;
 import consulo.usage.UsageView;
 import consulo.usage.rule.FileStructureGroupRuleProvider;
-import consulo.javascript.language.JavaScriptLanguage;
-import consulo.navigation.NavigationItem;
-import consulo.ui.image.Image;
-import consulo.util.dataholder.Key;
+import consulo.usage.rule.PsiElementUsage;
+import consulo.usage.rule.UsageGroupingRule;
 import consulo.util.lang.Comparing;
 import consulo.virtualFileSystem.status.FileStatus;
+import consulo.virtualFileSystem.status.FileStatusManager;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -64,7 +64,7 @@ public UsageGroup groupUsage(Usage usage) {
                     JSNamedElement element = PsiTreeUtil.getParentOfType(psiElement, getUsageClass());
 
                     if (isAcceptableElement(element)) {
-                        return createUsageGroup((T)element);
+                        return createUsageGroup((T) element);
                     }
                 }
                 return null;
@@ -84,7 +84,7 @@ protected boolean isAcceptableElement(JSNamedElement element) {
      * @author Maxim.Mossienko
      */
     abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement & NavigationItem>
-        implements UsageGroup, TypeSafeDataProvider {
+        implements UsageGroup, UiDataProvider {
 
         private SmartPsiElementPointer myElementPointer;
         private String myName;
@@ -97,7 +97,7 @@ abstract static class PsiNamedElementUsageGroupBase<T extends PsiNamedElement &
             if (myName == null) {
                 myName = "<anonymous>";
             }
-            myElementPointer = SmartPointerManager.getInstance(element.getProject()).createLazyPointer(element);
+            myElementPointer = SmartPointerManager.getInstance(element.getProject()).createSmartPsiElementPointer(element);
         }
 
         @Override
@@ -106,7 +106,7 @@ public Image getIcon() {
         }
 
         public T getElement() {
-            return (T)myElementPointer.getElement();
+            return (T) myElementPointer.getElement();
         }
 
         @Override
@@ -149,7 +149,7 @@ public void update() {
 
         @Override
         public int compareTo(UsageGroup o) {
-            return myName.compareTo(((PsiNamedElementUsageGroupBase)o).myName);
+            return myName.compareTo(((PsiNamedElementUsageGroupBase) o).myName);
         }
 
         @Override
@@ -169,19 +169,12 @@ public int hashCode() {
         }
 
         @Override
-        public void calcData(Key<?> key, DataSink sink) {
-            if (!isValid()) {
-                return;
-            }
-            if (LangDataKeys.PSI_ELEMENT == key) {
-                sink.put(LangDataKeys.PSI_ELEMENT, getElement());
-            }
-            if (UsageView.USAGE_INFO_KEY == key) {
+        public void uiDataSnapshot(DataSink sink) {
+            sink.lazy(LangDataKeys.PSI_ELEMENT, this::getElement);
+            sink.lazy(UsageView.USAGE_INFO_KEY, () -> {
                 T element = getElement();
-                if (element != null) {
-                    sink.put(UsageView.USAGE_INFO_KEY, new UsageInfo(element));
-                }
-            }
+                return element == null ? null : new UsageInfo(element);
+            });
         }
     }
 }
\ No newline at end of file